Compare commits
No commits in common. "main" and "v0.44.0" have entirely different histories.
7 changed files with 17 additions and 289 deletions
7
bin/kei
7
bin/kei
|
|
@ -22,7 +22,6 @@
|
|||
# kei mcp-wire --list # show enforcement tier per CLI
|
||||
# kei limits # probe each CLI's subscription quota (best-effort)
|
||||
# # (4 of 5 CLIs have no public API — honest report)
|
||||
# kei onboard # post-install wizard (pick primary + mcp-wire + check)
|
||||
# kei --on=<backend> # one-shot launch of <backend> (does not change primary)
|
||||
# kei [args...] # splash → exec primary CLI (default: claude)
|
||||
#
|
||||
|
|
@ -73,10 +72,6 @@ case "${1:-}" in
|
|||
shift
|
||||
exec "$HOME/.claude/scripts/kei-limits.sh" "$@"
|
||||
;;
|
||||
onboard|setup|wizard)
|
||||
shift
|
||||
exec "$HOME/.claude/scripts/kei-onboard.sh" "$@"
|
||||
;;
|
||||
esac
|
||||
|
||||
# --- one-shot --on=<backend> override (does not write primary.toml) -------
|
||||
|
|
@ -235,7 +230,7 @@ ${C1} ██╔═██╗ ██╔══╝ ██║╚════█
|
|||
${C1} ██║ ██╗███████╗██║███████║███████╗██║${C0}
|
||||
${C1} ╚═╝ ╚═╝╚══════╝╚═╝╚══════╝╚══════╝╚═╝${C0}
|
||||
|
||||
${C2} KeiSeiKit · substrate v0.45${C0}
|
||||
${C2} KeiSeiKit · substrate v0.44${C0}
|
||||
${C3} ─────────────────────────────────────${C0}
|
||||
primary CLI : ${CV}${PRIMARY}${C0}
|
||||
profile : ${CV}${p}${C0}
|
||||
|
|
|
|||
19
bootstrap.sh
19
bootstrap.sh
|
|
@ -204,25 +204,6 @@ log ""
|
|||
log "==========================================================================="
|
||||
log "DONE — KeiSeiKit installed (profile: $PROFILE)"
|
||||
log "==========================================================================="
|
||||
|
||||
# v0.45: post-install onboarding wizard.
|
||||
# Auto-triggers if stdin is a TTY (real terminal). Wizard itself re-checks
|
||||
# and exits cleanly if non-interactive — so curl|bash one-liner runs work too.
|
||||
ONBOARD_SH="$HOME/.claude/scripts/kei-onboard.sh"
|
||||
if [ -x "$ONBOARD_SH" ] && [ -t 0 ] && [ "${KEI_NO_ONBOARD:-0}" != "1" ]; then
|
||||
log ""
|
||||
log "Starting post-install onboarding (pick primary CLI + wire MCP)..."
|
||||
log "Skip with KEI_NO_ONBOARD=1; re-run anytime with 'kei onboard'."
|
||||
log ""
|
||||
"$ONBOARD_SH" || log "(onboarding exited non-zero; re-run with 'kei onboard')"
|
||||
else
|
||||
log ""
|
||||
log "Post-install wizard skipped (no TTY or KEI_NO_ONBOARD=1)."
|
||||
log "Run interactively to configure primary CLI:"
|
||||
log " kei onboard # full wizard"
|
||||
log " kei pick # just pick primary"
|
||||
log " kei mcp-wire # wire MCP into installed CLIs"
|
||||
fi
|
||||
log ""
|
||||
log "Next steps:"
|
||||
log " - Open a new shell so PATH picks up ~/.cargo/bin and the kei-* binaries."
|
||||
|
|
|
|||
|
|
@ -80,29 +80,14 @@ _mint_runner_token() {
|
|||
printf '%s' "$token"
|
||||
}
|
||||
|
||||
# v0.45 fix: brew installs `gitea-runner` (not `act_runner`); the binary is
|
||||
# named `gitea-runner`. Resolver tries both names so future brew packaging
|
||||
# changes don't re-break this. act_runner upstream and gitea-runner fork are
|
||||
# functionally equivalent and both register with Forgejo.
|
||||
_runner_bin() {
|
||||
if command -v act_runner >/dev/null 2>&1; then
|
||||
echo "act_runner"
|
||||
elif command -v gitea-runner >/dev/null 2>&1; then
|
||||
echo "gitea-runner"
|
||||
else
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
# Internal: register the runner with the local Forgejo. Writes ${DATA}/.runner.
|
||||
# Internal: register act_runner with the local Forgejo. Writes ${DATA}/.runner.
|
||||
# Args: <data_dir> <token>.
|
||||
_register_act_runner() {
|
||||
local data_dir="$1"
|
||||
local token="$2"
|
||||
local label="self-hosted,macos-arm64,native"
|
||||
local name="$(hostname -s)-keisei"
|
||||
local runner
|
||||
runner="$(_runner_bin)" || { err "no runner binary found (looked for act_runner + gitea-runner)"; return 1; }
|
||||
( cd "$data_dir" && "$runner" register \
|
||||
( cd "$data_dir" && act_runner register \
|
||||
--no-interactive \
|
||||
--instance http://127.0.0.1:3001 \
|
||||
--token "$token" \
|
||||
|
|
@ -112,19 +97,12 @@ _register_act_runner() {
|
|||
|
||||
# Public entry: install + register + bootstrap the runner.
|
||||
install_dev_hub_forgejo_runner() {
|
||||
say "installing dev-hub-forgejo-runner (Forgejo Actions runner)"
|
||||
say "installing dev-hub-forgejo-runner (act_runner)"
|
||||
_require_forgejo_binary || return 1
|
||||
_require_forgejo_running || return 1
|
||||
|
||||
# Prefer the Forgejo-official runner; fall back to the gitea-runner fork
|
||||
# (which is what `brew install gitea-runner` actually provides today).
|
||||
if ! _runner_bin >/dev/null 2>&1; then
|
||||
say "brew install gitea-runner (Forgejo-compatible)"
|
||||
brew install gitea-runner || {
|
||||
warn "brew install gitea-runner failed — try 'brew tap actions/runner' for act_runner"
|
||||
return 1
|
||||
}
|
||||
fi
|
||||
say "brew install act_runner"
|
||||
brew install act_runner
|
||||
|
||||
local data_dir
|
||||
data_dir="$(_runner_data_dir)"
|
||||
|
|
@ -147,9 +125,7 @@ install_dev_hub_forgejo_runner() {
|
|||
. "$KIT_DIR/install/lib-launchd.sh"
|
||||
install_service forgejo-runner
|
||||
|
||||
local runner_name
|
||||
runner_name="$(_runner_bin 2>/dev/null || echo runner)"
|
||||
say "$runner_name registered + running. Polling http://127.0.0.1:3001 for jobs."
|
||||
say "act_runner registered + running. Polling http://127.0.0.1:3001 for jobs."
|
||||
}
|
||||
|
||||
# Public entry: stop + unload the runner. Keeps ${DATA}/.runner so re-install
|
||||
|
|
|
|||
|
|
@ -97,19 +97,11 @@ _dhf_bootstrap_admin_user() {
|
|||
local kc_token_svc kc_pass_svc
|
||||
config="$(_dhf_app_ini)"
|
||||
username="${KEI_FORGEJO_ADMIN_USER:-${USER:-denis}}"
|
||||
# Single-source Keychain service names (override per-host via env).
|
||||
# Wizard MUST read identical names — see drive-import-wizard.sh.tmpl.
|
||||
kc_token_svc="${KEI_FORGEJO_KC_TOKEN_SERVICE:-forgejo-api-token}"
|
||||
kc_pass_svc="${KEI_FORGEJO_KC_PASS_SERVICE:-forgejo-admin-password}"
|
||||
|
||||
# v0.45 fix: Forgejo on first install needs `migrate` to create the sqlite
|
||||
# schema. Without it, `admin user create` fails with "no such table: user"
|
||||
# (verified bug 2026-05-26 in prod curl|bash test). `migrate` is idempotent
|
||||
# — safe to re-run.
|
||||
if ! forgejo --config "$config" migrate 2>/dev/null; then
|
||||
warn " → forgejo migrate failed; daemon may need restart before admin create"
|
||||
fi
|
||||
|
||||
# Detection: any rows beyond header in `admin user list`? Now safe to
|
||||
# parse since migrate has ensured the user table exists.
|
||||
# Detection: any rows beyond header in `admin user list`?
|
||||
user_count="$(forgejo --config "$config" admin user list 2>/dev/null \
|
||||
| tail -n +2 | grep -cv '^$' || echo 0)"
|
||||
if [ "$user_count" -gt 0 ]; then
|
||||
|
|
|
|||
|
|
@ -41,38 +41,13 @@ _dhz_check_go_runtime() {
|
|||
fi
|
||||
}
|
||||
|
||||
# Step b — install zoekt. Zoekt is NOT in homebrew/core — try tap first,
|
||||
# then fall back to building from source via Go (if installed). On total
|
||||
# failure, skip cleanly rather than aborting the whole install.
|
||||
# v0.45 fix: prior version errored hard ("No formula") and bailed the entire
|
||||
# dev-hub install. Now degrades gracefully.
|
||||
# Step b — brew install zoekt (idempotent).
|
||||
_dhz_brew_install() {
|
||||
say "installing zoekt (idempotent)"
|
||||
if command -v zoekt-webserver >/dev/null 2>&1 && command -v zoekt-index >/dev/null 2>&1; then
|
||||
say " → zoekt already installed; skipping"
|
||||
return 0
|
||||
say "installing zoekt via brew (idempotent)"
|
||||
if ! brew install zoekt; then
|
||||
err "brew install zoekt failed — see brew log above"
|
||||
return 1
|
||||
fi
|
||||
if brew install zoekt 2>/dev/null; then
|
||||
say " → installed via brew core"
|
||||
return 0
|
||||
fi
|
||||
if brew install sourcegraph/zoekt/zoekt 2>/dev/null \
|
||||
|| brew install hyperdiscovery/zoekt/zoekt 2>/dev/null; then
|
||||
say " → installed via tap"
|
||||
return 0
|
||||
fi
|
||||
if command -v go >/dev/null 2>&1; then
|
||||
say " → falling back to 'go install' from sourcegraph/zoekt"
|
||||
if go install github.com/sourcegraph/zoekt/cmd/zoekt-webserver@latest \
|
||||
&& go install github.com/sourcegraph/zoekt/cmd/zoekt-index@latest; then
|
||||
say " → installed via go"
|
||||
return 0
|
||||
fi
|
||||
fi
|
||||
warn "zoekt unavailable: not in brew core/taps + no go fallback."
|
||||
warn "Skipping zoekt service install. Other dev-hub services continue."
|
||||
warn "To install later: brew install --HEAD sourcegraph/zoekt/zoekt"
|
||||
return 2 # signal partial — caller treats as skip, not fatal
|
||||
}
|
||||
|
||||
# Step c — ensure data dir tree (+ index dir).
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
"name": "keisei",
|
||||
"displayName": "KeiSei",
|
||||
"description": "Constructor Pattern multi-LLM agent substrate — 38 agents, 69 skills, 54 hooks, 86 blocks. Cross-CLI policy enforcement (Claude/Grok/Copilot/Agy/Kimi) via kei-mcp + kei_bash/kei_edit/kei_write. Rust primitives via classic ./install.sh.",
|
||||
"version": "0.45.0",
|
||||
"version": "0.44.0",
|
||||
"homepage": "https://keisei.app",
|
||||
"repository": "https://github.com/KeiSeiLab/KeiSeiKit-1.0.git",
|
||||
"author": {
|
||||
|
|
|
|||
|
|
@ -1,191 +0,0 @@
|
|||
#!/usr/bin/env bash
|
||||
# kei-onboard — post-install wizard.
|
||||
#
|
||||
# Runs after install.sh / bootstrap.sh to guide the user through:
|
||||
# Step 1: pick the primary LLM orchestrator (default for `kei` no-args)
|
||||
# Step 2: wire kei-mcp into the chosen CLI (cross-CLI policy + spawn_agent)
|
||||
# Step 3: optional MOONSHOT_API_KEY hint for kei limits
|
||||
# Step 4: quick health check
|
||||
#
|
||||
# Idempotent — safe to re-run anytime via `kei onboard`.
|
||||
# Honors TTY gate: non-interactive runs print summary + exit, no prompts.
|
||||
|
||||
set -eu
|
||||
|
||||
KEI_PRIMARY_CFG="${KEI_PRIMARY_CFG:-$HOME/.claude/config/primary.toml}"
|
||||
PICK_SH="$HOME/.claude/scripts/kei-pick.sh"
|
||||
WIRE_SH="$HOME/.claude/scripts/kei-mcp-wire.sh"
|
||||
|
||||
# Colors only if stdout is a TTY (TTY-INTERACTIVITY-GATE: -t 1 for color is OK).
|
||||
C0= CB= CC= CG= CD= CR=
|
||||
if [ -t 1 ]; then
|
||||
C0=$'\033[0m'
|
||||
CB=$'\033[1;38;5;39m' # blue
|
||||
CC=$'\033[1;38;5;220m' # gold
|
||||
CG=$'\033[32m' # green
|
||||
CR=$'\033[31m' # red
|
||||
CD=$'\033[2m' # dim
|
||||
fi
|
||||
|
||||
# Non-interactive (no stdin TTY): print summary + exit.
|
||||
# Per tty-interactivity-gate.md: -t 0 not -t 1.
|
||||
if [ ! -t 0 ]; then
|
||||
cat <<EOF
|
||||
|
||||
${CB}KeiSeiKit · onboarding${C0} (non-interactive — wizard skipped)
|
||||
|
||||
Next manual steps:
|
||||
${CC}kei onboard${C0} run this wizard interactively
|
||||
${CC}kei pick${C0} pick primary LLM CLI
|
||||
${CC}kei mcp-wire${C0} wire kei-mcp into your CLIs
|
||||
${CC}kei limits${C0} check subscription quotas (honest report)
|
||||
${CC}kei-doctor${C0} substrate health diagnostic
|
||||
|
||||
EOF
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# Banner
|
||||
cat <<EOF
|
||||
|
||||
${CB}╔═══════════════════════════════════════════════════════════════════╗
|
||||
║ KeiSeiKit · post-install onboarding ║
|
||||
╚═══════════════════════════════════════════════════════════════════╝${C0}
|
||||
|
||||
The install put 38 agents, 54 hooks, and 60+ Rust primitives in place.
|
||||
Now let's wire up the LLM CLIs you'll actually use.
|
||||
|
||||
EOF
|
||||
|
||||
# ── Step 1: pick primary ───────────────────────────────────────────
|
||||
echo "${CB}── Step 1/4 — Pick your primary LLM orchestrator ──${C0}"
|
||||
echo
|
||||
echo "When you run ${CC}kei${C0} (no args) it launches your primary CLI."
|
||||
echo "Each agent's manifest can also declare a preferred provider (DNA)."
|
||||
echo
|
||||
|
||||
declare -a BACKENDS=(claude grok agy copilot kimi)
|
||||
declare -A LABELS=(
|
||||
[claude]="Claude Code (Anthropic, full hook enforcement)"
|
||||
[grok]="Grok (xAI, native --agent flag)"
|
||||
[agy]="Antigravity (Google Gemini)"
|
||||
[copilot]="GitHub Copilot (Microsoft, MCP-wrapped)"
|
||||
[kimi]="Kimi (Moonshot, TUI-primary)"
|
||||
)
|
||||
|
||||
i=1
|
||||
for b in "${BACKENDS[@]}"; do
|
||||
if command -v "$b" >/dev/null 2>&1; then
|
||||
mark="${CG}✓${C0}"
|
||||
else
|
||||
mark="${CR}✗${C0} ${CD}(not installed)${C0}"
|
||||
fi
|
||||
printf " ${CB}%d${C0}) %s %-20s %s\n" "$i" "$mark" "$b" "${LABELS[$b]}"
|
||||
i=$((i+1))
|
||||
done
|
||||
echo " ${CB}s${C0}) skip — keep current primary (claude default)"
|
||||
echo
|
||||
|
||||
current=""
|
||||
[ -f "$KEI_PRIMARY_CFG" ] && current=$(awk -F'=' '/^provider/ {gsub(/[" ]/, "", $2); print $2; exit}' "$KEI_PRIMARY_CFG")
|
||||
printf "Current primary: ${CC}%s${C0}\n" "${current:-claude (default)}"
|
||||
printf "Pick [1-${#BACKENDS[@]}/s, default=s]: "
|
||||
read -r choice
|
||||
choice="${choice:-s}"
|
||||
|
||||
primary_set=""
|
||||
case "$choice" in
|
||||
s|S|"")
|
||||
echo " ${CD}— keeping ${current:-claude}${C0}"
|
||||
primary_set="${current:-claude}"
|
||||
;;
|
||||
[1-9])
|
||||
idx=$((choice-1))
|
||||
if [ $idx -ge ${#BACKENDS[@]} ] || [ $idx -lt 0 ]; then
|
||||
echo " ${CR}invalid; keeping ${current:-claude}${C0}"
|
||||
primary_set="${current:-claude}"
|
||||
else
|
||||
new="${BACKENDS[$idx]}"
|
||||
mkdir -p "$(dirname "$KEI_PRIMARY_CFG")"
|
||||
printf '# kei primary — written %s by onboarding\nprovider = "%s"\n' \
|
||||
"$(date -u +%Y-%m-%dT%H:%M:%SZ)" "$new" > "$KEI_PRIMARY_CFG"
|
||||
echo " ${CG}✓${C0} primary set: ${CC}${new}${C0} → $KEI_PRIMARY_CFG"
|
||||
primary_set="$new"
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
echo " ${CR}invalid; keeping ${current:-claude}${C0}"
|
||||
primary_set="${current:-claude}"
|
||||
;;
|
||||
esac
|
||||
|
||||
# ── Step 2: mcp-wire ───────────────────────────────────────────────
|
||||
echo
|
||||
echo "${CB}── Step 2/4 — Wire kei-mcp into installed CLIs ──${C0}"
|
||||
echo
|
||||
echo "kei-mcp exposes ${CC}spawn_agent${C0} + ${CC}kei_bash/kei_edit/kei_write${C0} (with"
|
||||
echo "policy chain) to any MCP-capable CLI. Enables cross-CLI agent invocation"
|
||||
echo "AND hook enforcement on non-Claude backends."
|
||||
echo
|
||||
printf "Run ${CC}kei mcp-wire${C0} now (writes to ~/.grok/, ~/.copilot/, etc.)? [Y/n]: "
|
||||
read -r wire_ans
|
||||
wire_ans="${wire_ans:-Y}"
|
||||
case "$wire_ans" in
|
||||
y|Y|yes)
|
||||
if [ -x "$WIRE_SH" ]; then
|
||||
"$WIRE_SH"
|
||||
else
|
||||
echo " ${CR}— $WIRE_SH not found; skip${C0}"
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
echo " ${CD}— skipped. Run later: ${CC}kei mcp-wire${C0}${CD}${C0}"
|
||||
;;
|
||||
esac
|
||||
|
||||
# ── Step 3: MOONSHOT key hint ──────────────────────────────────────
|
||||
echo
|
||||
echo "${CB}── Step 3/4 — Live subscription limits (optional) ──${C0}"
|
||||
echo
|
||||
echo "${CC}kei limits${C0} probes each CLI's subscription quota. Research found that"
|
||||
echo "only Kimi exposes a public API; the others are dashboard-only."
|
||||
echo
|
||||
if [ -n "${MOONSHOT_API_KEY:-}" ]; then
|
||||
echo " ${CG}✓${C0} MOONSHOT_API_KEY is set — Kimi balance probing enabled"
|
||||
else
|
||||
cat <<EOF
|
||||
${CD}Optional: set ${CC}MOONSHOT_API_KEY${CD} in ${CC}~/.claude/secrets/.env${CD} to enable
|
||||
Kimi balance polling. Other CLIs: see dashboards via ${CC}kei limits${CD}.${C0}
|
||||
EOF
|
||||
fi
|
||||
|
||||
# ── Step 4: health check ───────────────────────────────────────────
|
||||
echo
|
||||
echo "${CB}── Step 4/4 — Health check ──${C0}"
|
||||
echo
|
||||
if command -v kei-doctor >/dev/null 2>&1; then
|
||||
kei-doctor 2>&1 | head -20 || true
|
||||
else
|
||||
echo " ${CD}— kei-doctor not on PATH yet. Open new shell + run: ${CC}kei-doctor${C0}"
|
||||
fi
|
||||
|
||||
# ── Done ───────────────────────────────────────────────────────────
|
||||
cat <<EOF
|
||||
|
||||
${CB}╔═══════════════════════════════════════════════════════════════════╗
|
||||
║ Onboarding complete. ║
|
||||
╚═══════════════════════════════════════════════════════════════════╝${C0}
|
||||
|
||||
Quick-start:
|
||||
${CC}kei${C0} launch ${primary_set} (your primary)
|
||||
${CC}kei agent critic "..."${C0} invoke an agent (DNA → primary)
|
||||
${CC}kei agent --on=grok critic "..."${C0} invoke on a specific backend
|
||||
${CC}kei mcp-wire --list${C0} show enforcement tiers per CLI
|
||||
${CC}kei limits${C0} quota report (where APIs exist)
|
||||
${CC}kei pick${C0} re-pick primary anytime
|
||||
${CC}kei configure${C0} re-pick hook packs / stack profile
|
||||
|
||||
Docs: ${CD}~/.local/share/keisei/docs/encyclopedia/${C0}
|
||||
Logs: ${CD}~/.keisei-install.log${C0}
|
||||
|
||||
EOF
|
||||
Loading…
Reference in a new issue