@bolloon/bolloon-agent 0.4.24 → 0.4.26

package/dist/index.js

@@ -1267,6 +1267,314 @@ async function processInputInner(input, comm) {
         appendLine(`${C_DIM}用法: /net join <链接> | /net status | /net ctx <文本>${RESET}`);
         return;
     }
+    // /runs — 持久化运行记录 (跨重载可读): 谁在跑 / 跑完了 / 被打断 / 卡住了
+    if (cmd === '/runs' || cmd.startsWith('/runs ')) {
+        const arg = trimmed.slice('/runs'.length).trim();
+        try {
+            const { listRuns, formatRunLine, readRun } = await import('./agents/run-store.js');
+            if (arg) {
+                const rec = await readRun(arg);
+                if (!rec) {
+                    appendLine(`${C_ERROR}没有这个运行: ${arg}${RESET}`);
+                    return;
+                }
+                appendLine(`${C_DIM}run ${rec.runId} [${rec.surface}] ${rec.status} · ${rec.steps.length} 步 · pid ${rec.pid}${RESET}`);
+                appendLine(`${C_DIM}目标: ${rec.goal.slice(0, 120)}${RESET}`);
+                for (const s of rec.steps) {
+                    appendLine(`  ${s.ok ? '✓' : '✗'} ${String(s.n).padStart(2)} ${s.tool}${s.ms ? ` (${s.ms}ms)` : ''} ${C_DIM}${(s.summary || s.error || '').slice(0, 80)}${RESET}`);
+                }
+                if (rec.error)
+                    appendLine(`${C_ERROR}结束原因: ${rec.error}${RESET}`);
+                return;
+            }
+            const runs = await listRuns({ limit: 15 });
+            if (!runs.length) {
+                appendLine(`${C_DIM}还没有运行记录 (每次 agent 运行都会落盘到 ~/.bolloon/runs/)${RESET}`);
+                return;
+            }
+            appendLine(`${C_DIM}最近 ${runs.length} 次运行 (落盘记录, 重开也还在):${RESET}`);
+            for (const r of runs)
+                appendLine(`  ${formatRunLine(r)}`);
+            appendLine(`${C_DIM}/runs <runId> 看逐步明细${RESET}`);
+        }
+        catch (e) {
+            appendLine(`${C_ERROR}/runs 失败: ${String(e?.message || e).slice(0, 150)}${RESET}`);
+        }
+        return;
+    }
+    // 2026-09-16 (M2/M5): /resume <runId> · /pause <runId> · /approve <runId> · /goals
+    //   恢复走的是同一条 run (从 checkpoint 继续), 不是"重发原 prompt"; 非幂等动作由重放守卫挡住。
+    if (cmd === '/resume' || cmd.startsWith('/resume ')) {
+        const runId = trimmed.slice('/resume'.length).trim();
+        if (!runId) {
+            const { listRuns, formatRunLine, RESUMABLE_STATUSES } = await import('./agents/run-store.js');
+            const runs = await listRuns({ limit: 30 });
+            const ok = runs.filter((r) => RESUMABLE_STATUSES.includes(r.status));
+            if (!ok.length) {
+                appendLine(`${C_DIM}没有可恢复的运行 (可恢复状态: ${RESUMABLE_STATUSES.join('/')})${RESET}`);
+                return;
+            }
+            appendLine(`${C_DIM}可恢复的运行 (用 /resume <runId> 继续):${RESET}`);
+            for (const r of ok)
+                appendLine(`  ${formatRunLine(r)}`);
+            return;
+        }
+        try {
+            const { readRun, prepareResume, buildResumeInstruction } = await import('./agents/run-store.js');
+            const rec = await readRun(runId);
+            if (!rec) {
+                appendLine(`${C_ERROR}没有这个运行: ${runId}${RESET}`);
+                return;
+            }
+            const agent = await getAgent();
+            const active = String(agent?.currentChannelId || '');
+            if (rec.channelId && active && rec.channelId !== active) {
+                appendLine(`${C_ERROR}该运行属于 channel ${rec.channelId} (当前 ${active}) — 先 /channel 切过去再 /resume${RESET}`);
+                return;
+            }
+            const prep = await prepareResume(runId);
+            if (!prep.ok || !prep.plan) {
+                appendLine(`${C_ERROR}无法恢复: ${prep.reason}${RESET}`);
+                return;
+            }
+            appendLine(`${C_ACCENT}♻️ 从 checkpoint 恢复 ${runId} (已完成 ${prep.plan.completedSteps.length} 步, 非幂等守卫 ${prep.plan.replayGuards.length} 条)${RESET}`);
+            appendLine(`${C_DIM}${buildResumeInstruction(prep.plan).split('\n').slice(0, 6).join('\n')}${RESET}`);
+            if (!agent?.resumeRun) {
+                appendLine(`${C_ERROR}当前 agent 不支持 resumeRun${RESET}`);
+                return;
+            }
+            const r = await agent.resumeRun(runId);
+            appendLine(r.ok ? `${C_ACCENT}✅ 恢复执行完成${RESET}` : `${C_ERROR}恢复失败: ${r.reason}${RESET}`);
+        }
+        catch (e) {
+            appendLine(`${C_ERROR}/resume 失败: ${String(e?.message || e).slice(0, 200)}${RESET}`);
+        }
+        return;
+    }
+    if (cmd === '/pause' || cmd.startsWith('/pause ')) {
+        const runId = trimmed.slice('/pause'.length).trim();
+        if (!runId) {
+            const { listRuns, formatRunLine } = await import('./agents/run-store.js');
+            const runs = (await listRuns({ status: 'running', limit: 10 }));
+            if (!runs.length) {
+                appendLine(`${C_DIM}没有正在运行的 run${RESET}`);
+                return;
+            }
+            appendLine(`${C_DIM}正在运行 (用 /pause <runId> 暂停):${RESET}`);
+            for (const r of runs)
+                appendLine(`  ${formatRunLine(r)}`);
+            return;
+        }
+        try {
+            const { setRunStatus } = await import('./agents/run-store.js');
+            const r = await setRunStatus(runId, 'paused', { error: '外部请求 (pause)' });
+            appendLine(r.ok ? `${C_ACCENT}⏸️ 已请求暂停 ${runId} (运行中的 agent 会在下一轮循环停下)${RESET}` : `${C_ERROR}暂停被拒: ${r.reason}${RESET}`);
+        }
+        catch (e) {
+            appendLine(`${C_ERROR}/pause 失败: ${String(e?.message || e).slice(0, 200)}${RESET}`);
+        }
+        return;
+    }
+    if (cmd === '/approve' || cmd.startsWith('/approve ')) {
+        const runId = trimmed.slice('/approve'.length).trim();
+        if (!runId) {
+            const { listRuns, formatRunLine } = await import('./agents/run-store.js');
+            const runs = (await listRuns({ status: 'needs_human', limit: 10 }));
+            if (!runs.length) {
+                appendLine(`${C_DIM}没有等待人工处置的 run${RESET}`);
+                return;
+            }
+            appendLine(`${C_DIM}等待人工处置 (用 /approve <runId> 批准继续):${RESET}`);
+            for (const r of runs)
+                appendLine(`  ${formatRunLine(r)}`);
+            return;
+        }
+        try {
+            const { readRun, recordRecovery } = await import('./agents/run-store.js');
+            const rec = await readRun(runId);
+            if (!rec) {
+                appendLine(`${C_ERROR}没有这个运行: ${runId}${RESET}`);
+                return;
+            }
+            if (rec.status !== 'needs_human') {
+                appendLine(`${C_ERROR}只有 needs_human 的运行需要批准 (当前 ${rec.status})${RESET}`);
+                return;
+            }
+            await recordRecovery(runId, { errorClass: rec.errorClass || 'unknown', message: '人工批准后继续', action: 'resume' });
+            const agent = await getAgent();
+            if (!agent?.resumeRun) {
+                appendLine(`${C_ERROR}当前 agent 不支持 resumeRun${RESET}`);
+                return;
+            }
+            const r = await agent.resumeRun(runId);
+            appendLine(r.ok ? `${C_ACCENT}✅ 已批准并继续执行${RESET}` : `${C_ERROR}批准后恢复失败: ${r.reason}${RESET}`);
+        }
+        catch (e) {
+            appendLine(`${C_ERROR}/approve 失败: ${String(e?.message || e).slice(0, 200)}${RESET}`);
+        }
+        return;
+    }
+    if (cmd === '/goals' || cmd.startsWith('/goals ')) {
+        const arg = trimmed.slice('/goals'.length).trim();
+        try {
+            const { listGoals, readGoal, formatGoalLine, evaluateGoalCompletion } = await import('./agents/goal-store.js');
+            if (arg) {
+                const g = await readGoal(arg);
+                if (!g) {
+                    appendLine(`${C_ERROR}没有这个目标: ${arg}${RESET}`);
+                    return;
+                }
+                appendLine(`${C_DIM}goal ${g.goalId} [${g.status}] 创建 ${g.createdAt}${RESET}`);
+                appendLine(`  目标: ${g.objective}`);
+                g.successCriteria.forEach((c, i) => appendLine(`  ${g.completedCriteria.includes(i) ? '✓' : '·'} [${i}] ${c}`));
+                appendLine(`  runs: ${g.runs.join(', ') || '(无)'}  当前: ${g.currentRunId || '-'}`);
+                if (g.evidence.length)
+                    appendLine(`  证据: ${g.evidence.slice(-3).join(' | ')}`);
+                const v = evaluateGoalCompletion(g);
+                appendLine(`  完成门: ${v.complete ? '✅ 可判完成' : `❌ ${v.reason}`}`);
+                return;
+            }
+            const goals = await listGoals({ limit: 15 });
+            if (!goals.length) {
+                appendLine(`${C_DIM}还没有目标记录 (每次 prompt 都会建/续一个 Goal, 落盘 ~/.bolloon/goals/)${RESET}`);
+                return;
+            }
+            appendLine(`${C_DIM}最近 ${goals.length} 个目标:${RESET}`);
+            for (const g of goals)
+                appendLine(`  ${formatGoalLine(g)}`);
+            appendLine(`${C_DIM}/goals <goalId> 看判据与证据${RESET}`);
+        }
+        catch (e) {
+            appendLine(`${C_ERROR}/goals 失败: ${String(e?.message || e).slice(0, 200)}${RESET}`);
+        }
+        return;
+    }
+    // 2026-09-16 (2-F): /criteria <goalId> [confirm|propose <text...>] —— 判据：看/确认/改/让 agent 提候选
+    if (cmd === '/criteria' || cmd.startsWith('/criteria ')) {
+        const rest = trimmed.slice('/criteria'.length).trim();
+        try {
+            const { longTermStatus, confirmCriteria, proposeForGoal } = await import('./agents/goal-criteria.js');
+            const { readGoal } = await import('./agents/goal-store.js');
+            const [goalId, action, ...words] = rest.split(/\s+/).filter(Boolean);
+            if (!goalId) {
+                appendLine(`${C_DIM}用法: /criteria <goalId> [confirm | propose | set <判据用;分>]${RESET}`);
+                return;
+            }
+            const g = await readGoal(goalId);
+            if (!g) {
+                appendLine(`${C_ERROR}没有这个目标: ${goalId}${RESET}`);
+                return;
+            }
+            if (action === 'propose') {
+                const p = await proposeForGoal(goalId);
+                appendLine(p.ok ? `${C_DIM}候选判据 (待确认):\n${p.criteria.map((c, i) => `  [${i}] ${c}`).join('\n')}${RESET}` : `${C_ERROR}无法生成判据: ${p.reason}${RESET}`);
+                return;
+            }
+            const list = action === 'set' && words.length ? words.join(' ').split(';').map((x) => x.trim()).filter(Boolean) : undefined;
+            if (action === 'confirm' || list) {
+                const r = await confirmCriteria(goalId, { criteria: list, by: 'cli' });
+                appendLine(r.ok ? `${C_DIM}判据已确认 (v${r.goal?.criteriaVersion}): ${(r.goal?.successCriteria || []).join(' | ')}${RESET}` : `${C_ERROR}${r.reason}${RESET}`);
+                return;
+            }
+            const st = await longTermStatus(goalId);
+            appendLine(`${C_DIM}goal ${g.goalId} [${g.status}] 判据来源=${g.criteriaSource || 'unknown'} 已确认=${g.criteriaConfirmed === true} v${g.criteriaVersion || 1}${RESET}`);
+            g.successCriteria.forEach((c, i) => appendLine(`  ${g.completedCriteria.includes(i) ? '✓' : '·'} [${i}] ${c}`));
+            if (g.proposedCriteria?.length)
+                appendLine(`  ${C_DIM}候选 (未确认): ${g.proposedCriteria.join(' | ')}${RESET}`);
+            appendLine(`  长期完成: ${st.canComplete ? '✅ 可判完成' : `❌ ${st.reason}`}`);
+            appendLine(`  ${C_DIM}检查: ${Object.entries(st.checks).map(([k, v]) => `${k}=${v ? '✓' : '✗'}`).join(' ')}${RESET}`);
+        }
+        catch (e) {
+            appendLine(`${C_ERROR}/criteria 失败: ${String(e?.message || e).slice(0, 200)}${RESET}`);
+        }
+        return;
+    }
+    // 2026-09-16 (M2-B): /supervise — 长期执行层 (状态/唤醒原因/手动推进一个周期) · /wake <goalId> — 外部事件唤醒
+    if (cmd === '/supervise' || cmd.startsWith('/supervise ')) {
+        const arg = trimmed.slice('/supervise'.length).trim();
+        try {
+            const { getSupervisor } = await import('./agents/execution-supervisor.js');
+            const { wakeReport, listRunnableGoals, formatGoalLine } = await import('./agents/goal-store.js');
+            const { runnable, skipped } = await listRunnableGoals({ now: Date.now() });
+            const st = getSupervisor().status();
+            appendLine(`${C_DIM}supervisor: owner=${st.owner} running=${st.running ? 'yes' : 'no'} tick=${st.tickIntervalMs}ms lease=${st.leaseTtlMs}ms dryRun=${st.dryRun ? 'yes' : 'no'} ticks=${st.ticks}${RESET}`);
+            // 2026-09-16 (2-C.2): 宿主状态里的最近一次"执行器解析"阶段报告 —— 回答"这个 Goal 为什么没被执行、卡在哪一阶段"
+            try {
+                const { readSupervisorState } = await import('./agents/supervisor-host.js');
+                const hostState = await readSupervisorState();
+                if (hostState) {
+                    appendLine(`${C_DIM}宿主: worker=${hostState.workerId} pid=${hostState.pid} ticks=${hostState.ticks ?? 0}${hostState.stoppedAt ? ` 已停止(${hostState.stopReason})` : ''}${RESET}`);
+                    appendLine(`${C_DIM}最近一轮: ${hostState.lastSummary || '(无)'}${RESET}`);
+                    const lr = hostState.lastResolution;
+                    if (lr) {
+                        appendLine(`${lr.ok ? C_ACCENT : C_WARN}解析 ${lr.goalId} ${lr.ok ? '✅ 可执行' : `⛔ 卡在 ${lr.failedStage}`}${RESET}${lr.reason ? ` — ${lr.reason}` : ''}`);
+                        appendLine(`  ${C_DIM}阶段: ${lr.stages}${RESET}`);
+                        for (const d of (lr.detail || []))
+                            if (d.note || d.error)
+                                appendLine(`  ${C_DIM}· ${d.stage}: ${d.error || d.note}${RESET}`);
+                    }
+                }
+            }
+            catch { /* 宿主状态可读性不影响诊断 */ }
+            if (arg === 'tick' || arg === 'start') {
+                // CLI 侧执行器: 用当前会话的 agent (没人注入 agent 时只诊断, 不假装跑过)
+                const runner = agent
+                    ? async (req) => {
+                        if (req.kind === 'resume' && req.prevRunId && typeof agent.resumeRun === 'function') {
+                            const r = await agent.resumeRun(req.prevRunId);
+                            return { runId: req.prevRunId, status: r?.ok ? 'done' : 'failed', error: r?.ok ? undefined : r?.reason };
+                        }
+                        agent.setGoalId?.(req.goal.goalId);
+                        agent.setContinuationGuards?.(req.guards || []);
+                        await agent.prompt(req.instruction);
+                        return { runId: agent.getLastRunId?.() || agent.getRunId?.(), status: 'done' };
+                    }
+                    : undefined;
+                const { ExecutionSupervisor } = await import('./agents/execution-supervisor.js');
+                const sup = new ExecutionSupervisor({ runner: runner, maxPerTick: 1, log: (m) => appendLine(`${C_DIM}${m}${RESET}`) });
+                const rep = await sup.tickOnce();
+                appendLine(`${C_ACCENT}调度周期 #${rep.tick}${RESET}  认领 ${rep.claimed.length} · 执行 ${rep.executed.length}${rep.skipped.length ? ` · 跳过 ${rep.skipped.length}` : ''}`);
+                for (const s of rep.skipped.slice(0, 6))
+                    appendLine(`  ${C_DIM}跳过 ${s.goalId}: ${s.reason}${RESET}`);
+                for (const e of rep.executed)
+                    appendLine(`  ▶ ${e.goalId} → run=${e.runId || '-'} ${e.status || ''}${e.error ? ` (${e.error})` : ''}`);
+                return;
+            }
+            const rows = await wakeReport();
+            if (!rows.length) {
+                appendLine(`${C_DIM}还没有目标。${RESET}`);
+                return;
+            }
+            for (const r of rows.slice(0, 12))
+                appendLine(`  ${r.goalId}  [${r.status}]  唤醒: ${r.wake}${r.lease ? `  (lease ${r.lease})` : ''}`);
+            if (runnable.length) {
+                appendLine(`${C_DIM}现在可推进:${RESET}`);
+                for (const g of runnable.slice(0, 5))
+                    appendLine(`  ${formatGoalLine(g)}`);
+            }
+            appendLine(`${C_DIM}/supervise tick 手动推进一个周期${RESET}`);
+        }
+        catch (e) {
+            appendLine(`${C_ERROR}/supervise 失败: ${String(e?.message || e).slice(0, 200)}${RESET}`);
+        }
+        return;
+    }
+    if (cmd === '/wake' || cmd.startsWith('/wake ')) {
+        const goalId = trimmed.slice('/wake'.length).trim();
+        if (!goalId) {
+            appendLine(`${C_ERROR}用法: /wake <goalId> (外部事件到达后唤醒在等它的目标)${RESET}`);
+            return;
+        }
+        try {
+            const { getSupervisor } = await import('./agents/execution-supervisor.js');
+            const woke = await getSupervisor().notifyExternal(goalId);
+            appendLine(woke ? `${C_ACCENT}✅ 已唤醒 ${goalId} (下一次 tick 推进; 不重发已成功的请求)${RESET}` : `${C_DIM}${goalId} 不在等待外部事件 (未改动)${RESET}`);
+        }
+        catch (e) {
+            appendLine(`${C_ERROR}/wake 失败: ${String(e?.message || e).slice(0, 200)}${RESET}`);
+        }
+        return;
+    }
     // /model — 无参: 交互选择器 (ink 渲染, 复用 MentionPopup); 有参: 直接切换/测连通/看状态
     if (cmd === '/model' || cmd.startsWith('/model ')) {
         const modelArg = trimmed.slice('/model'.length).trim();
@@ -1870,40 +2178,39 @@ async function processInputInner(input, comm) {
     // /skills [名] — 查看正式技能 (2026-08-12 Task5): 无参列全部, 带名看详情. 运行时开始前的技能 view.
     if (cmd === '/skills' || cmd.startsWith('/skills ')) {
         try {
-            const { defaultSkillPaths, loadSkillsDir } = await import('./agents/skill-loader.js');
-            const dirs = defaultSkillPaths();
-            const metas = [];
-            for (const d of dirs) {
-                const m = await loadSkillsDir(d);
-                for (const s of m)
-                    if (s.status === 'active' && !metas.some(x => x.name === s.name))
-                        metas.push(s);
-            }
+            // 2026-09-16 (2-G.1): 改走统一 Skills Manager —— CLI / Web / agent 看的是同一份事实
+            const { getSkillsManager, formatSkillLine } = await import('./agents/skills-manager.js');
+            const sm = getSkillsManager();
+            const list = await sm.view();
             const q = cmd.startsWith('/skills ') ? cmd.slice('/skills '.length).trim().toLowerCase() : '';
             if (!q) {
-                appendLine(`${C_ACCENT}技能 (${metas.length}):${RESET}`);
-                if (metas.length === 0)
-                    appendLine(`  ${C_DIM}暂无正式技能 — run-end 经验可沉淀为 skill${RESET}`);
-                for (const s of metas.slice(0, 20)) {
-                    const desc = (s.description || '').slice(0, 60);
-                    appendLine(`  ${C_DIM}·${RESET} ${C_ACCENT}${s.name}${RESET}${desc ? `  ${C_DIM}${desc}${RESET}` : ''}`);
-                }
-                appendLine(`${C_DIM}用法: /skills <名> 查看详情${RESET}`);
+                appendLine(`${C_ACCENT}技能 (${list.length}) [status/source/trust/版本/hash]:${RESET}`);
+                if (list.length === 0)
+                    appendLine(`  ${C_DIM}暂无技能 — run-end 经验可沉淀为 skill${RESET}`);
+                for (const s of list.slice(0, 20))
+                    appendLine(`  ${C_DIM}·${RESET} ${formatSkillLine(s)}`);
+                const h = await sm.health();
+                appendLine(`${C_DIM}健康: ${JSON.stringify(h.byStatus)}${h.drifted.length ? ` · 内容漂移 ${h.drifted.length}` : ''}${h.invalid.length ? ` · 不合格 ${h.invalid.length}` : ''}${RESET}`);
+                appendLine(`${C_DIM}用法: /skills <名> 详情 · /skill health | inspect|enable|disable|approve|validate|import|export <名|链接>${RESET}`);
             }
             else {
-                const hit = metas.find(s => s.name.toLowerCase() === q || s.name.toLowerCase().includes(q));
+                const hit = list.find(s => s.name.toLowerCase() === q) || list.find(s => s.name.toLowerCase().includes(q));
                 if (!hit) {
                     appendLine(`${C_WARN}未找到技能: '${q}'${RESET}`);
                     return;
                 }
                 appendLine(`${C_ACCENT}═ ${hit.name} ═${RESET}`);
+                appendLine(`  ${C_DIM}状态:${RESET} ${hit.status}   ${C_DIM}来源:${RESET} ${hit.source}${hit.sourceRef ? ` (${hit.sourceRef.slice(0, 60)})` : ''}   ${C_DIM}信任:${RESET} ${hit.trust}`);
+                appendLine(`  ${C_DIM}版本:${RESET} v${hit.version}   ${C_DIM}内容哈希:${RESET} ${hit.contentHash}${hit.registryHash ? ` (registry ${hit.registryHash.slice(0, 10)}${hit.registryHash !== hit.contentHash ? ' ⚠ 已漂移' : ''})` : ''}`);
+                appendLine(`  ${C_DIM}目录:${RESET} ${hit.dir}   ${hit.fileCount} 个文件 / ${Math.round(hit.bytes / 1024)}KB`);
                 if (hit.description)
                     appendLine(`  ${C_DIM}描述:${RESET} ${hit.description}`);
-                if (hit.triggers && hit.triggers.length > 0)
+                if (hit.triggers.length)
                     appendLine(`  ${C_DIM}触发:${RESET} ${hit.triggers.join(', ')}`);
-                const body = (hit.body || '').trim().slice(0, 1200);
-                if (body)
-                    appendLine(`  ${C_DIM}---${RESET}\n${body}`);
+                if (hit.issues.length)
+                    appendLine(`  ${C_WARN}问题:${RESET} ${hit.issues.join('; ')}`);
+                const body = (await import('fs/promises')).readFile(hit.skillFile, 'utf-8').catch(() => '');
+                void body;
             }
         }
         catch (e) {
@@ -1911,6 +2218,101 @@ async function processInputInner(input, comm) {
         }
         return;
     }
+    // 2026-09-16 (2-G.1): /skill <子命令> —— 统一管理面 (enable/disable/approve/validate/quarantine/import/export/inspect/health)
+    if (cmd === '/skill' || cmd.startsWith('/skill ')) {
+        const rest = trimmed.slice('/skill'.length).trim();
+        const [sub, ...args] = rest.split(/\s+/).filter(Boolean);
+        const arg = args.join(' ').trim();
+        try {
+            const { getSkillsManager, formatSkillLine } = await import('./agents/skills-manager.js');
+            const sm = getSkillsManager();
+            if (!sub || sub === 'list') {
+                for (const s of await sm.view())
+                    appendLine(`  ${formatSkillLine(s)}`);
+                return;
+            }
+            if (sub === 'health') {
+                const h = await sm.health();
+                appendLine(`${C_ACCENT}技能健康:${RESET} 共 ${h.total}  状态 ${JSON.stringify(h.byStatus)}  来源 ${JSON.stringify(h.bySource)}`);
+                if (h.drifted.length) {
+                    appendLine(`${C_WARN}内容漂移 (SKILL.md 被改过, 与 registry 基线不一致):${RESET}`);
+                    for (const d of h.drifted)
+                        appendLine(`  ${d.name}  registry=${String(d.expected).slice(0, 10)} 现在=${d.actual.slice(0, 10)}`);
+                }
+                if (h.invalid.length) {
+                    appendLine(`${C_WARN}不合格:${RESET}`);
+                    for (const i of h.invalid)
+                        appendLine(`  ${i.name}: ${i.issues.join('; ')}`);
+                }
+                if (h.duplicates.length) {
+                    appendLine(`${C_WARN}同名多处:${RESET}`);
+                    for (const d of h.duplicates)
+                        appendLine(`  ${d.name}: ${d.dirs.join(' | ')}`);
+                }
+                if (h.missing.length)
+                    appendLine(`${C_WARN}registry 里记着但盘上没有:${RESET} ${h.missing.join(', ')}`);
+                return;
+            }
+            if (sub === 'import') {
+                if (!arg) {
+                    appendLine(`${C_ERROR}用法: /skill import <bolloon://skill/<cid> | ipfs://<cid> | <cid>>${RESET}`);
+                    return;
+                }
+                appendLine(`${C_DIM}导入中: ${arg.slice(0, 80)} …${RESET}`);
+                const r = await sm.import(arg);
+                appendLine(r.ok ? `${C_ACCENT}✅ 已导入 ${r.name}@${r.version} (状态 installed, 信任 unverified)${RESET}` : `${C_ERROR}导入失败: ${r.error}${RESET}`);
+                return;
+            }
+            if (sub === 'export') {
+                if (!arg) {
+                    appendLine(`${C_ERROR}用法: /skill export <名>${RESET}`);
+                    return;
+                }
+                const r = await sm.export(arg);
+                if (!r.ok) {
+                    appendLine(`${C_ERROR}导出失败: ${r.error}${RESET}`);
+                    return;
+                }
+                appendLine(`${C_ACCENT}技能包 JSON (${Object.keys(r.bundle.files).length} 个文件):${RESET}`);
+                appendLine(JSON.stringify(r.bundle).slice(0, 400));
+                return;
+            }
+            if (!arg) {
+                appendLine(`${C_ERROR}用法: /skill ${sub} <名>${RESET}`);
+                return;
+            }
+            const act = {
+                enable: () => sm.enable(arg),
+                disable: () => sm.disable(arg),
+                approve: () => sm.approve(arg, 'cli'),
+                validate: () => sm.validate(arg),
+                quarantine: () => sm.quarantine(arg, 'cli 手动隔离'),
+                inspect: async () => ({ ok: true, skill: await sm.inspect(arg) }),
+            };
+            const fn = act[sub];
+            if (!fn) {
+                appendLine(`${C_ERROR}未知子命令: ${sub} (可用: health|import|export|inspect|enable|disable|approve|validate|quarantine)${RESET}`);
+                return;
+            }
+            const r = await fn();
+            if (!r.ok) {
+                appendLine(`${C_WARN}${sub} 未完成: ${r.reason || (r.issues || []).join('; ') || '未知原因'}${RESET}`);
+            }
+            if (r.skill)
+                appendLine(`  ${formatSkillLine(r.skill)}`);
+            else if (r.ok)
+                appendLine(`${C_ACCENT}✅ ${sub} ${arg}${RESET}`);
+            if (sub === 'inspect' && r.skill) {
+                appendLine(`  ${C_DIM}目录:${RESET} ${r.skill.dir}`);
+                appendLine(`  ${C_DIM}SKILL.md:${RESET} ${r.skill.skillFile}`);
+                appendLine(`  ${C_DIM}问题:${RESET} ${r.skill.issues.length ? r.skill.issues.join('; ') : '无'}`);
+            }
+        }
+        catch (e) {
+            appendLine(`${C_ERROR}/skill 失败: ${String(e?.message || e).slice(0, 160)}${RESET}`);
+        }
+        return;
+    }
     // /mcp — MCP 插件/工具列表
     if (cmd === '/mcp') {
         try {
@@ -2260,6 +2662,13 @@ async function processInputInner(input, comm) {
         appendLine(`  ${C_ACCENT}/dequeue${RESET} 出队一条`);
         appendLine(`  ${C_ACCENT}/channel [名字|id|序号]${RESET} 切换当前智能体  ${C_DIM}无参列出所有; 支持名字/ID/序号三种解析${RESET}`);
         appendLine(`  ${C_ACCENT}/model${RESET}    模型供应商选择器  ${C_DIM}无参=选择器 · /model <名> [模型] 直接切换 · /model test 测连通${RESET}`);
+        appendLine(`  ${C_ACCENT}/runs${RESET}     运行记录 (落盘, 跨重载可读)  ${C_DIM}/runs · /runs <runId> 看逐步明细${RESET}`);
+        appendLine(`  ${C_ACCENT}/resume${RESET}   从 checkpoint 继续一次运行  ${C_DIM}/resume · /resume <runId> (不是重发原 prompt)${RESET}`);
+        appendLine(`  ${C_ACCENT}/pause${RESET}    暂停一次运行  ${C_DIM}/pause · /pause <runId>${RESET}`);
+        appendLine(`  ${C_ACCENT}/approve${RESET}  批准等待人工处置的运行  ${C_DIM}/approve · /approve <runId>${RESET}`);
+        appendLine(`  ${C_ACCENT}/supervise${RESET} 长期执行层状态与唤醒原因  ${C_DIM}/supervise · /supervise tick${RESET}`);
+        appendLine(`  ${C_ACCENT}/wake${RESET}     外部事件到达 → 唤醒在等的目标  ${C_DIM}/wake <goalId>${RESET}`);
+        appendLine(`  ${C_ACCENT}/goals${RESET}    目标 (判据/证据/完成门)  ${C_DIM}/goals · /goals <goalId>${RESET}`);
         appendLine(`  ${C_ACCENT}/setup${RESET}    初始化 / 配置总览  ${C_DIM}身份 + 供应商 + 配置文件路径${RESET}`);
         appendLine(`  ${C_ACCENT}/questions${RESET} 待回答的问题  ${C_DIM}智能体 clarify 提问时, 直接输入即回答 (或 /answer <文本>)${RESET}`);
         appendLine(`  ${C_ACCENT}/login${RESET}    登录 GitHub/Google 账号 (骨架)  ${C_DIM}暂无真实 OAuth${RESET}`);
@@ -3528,6 +3937,33 @@ function parseArgs() {
             case '--web':
                 result.web = true;
                 break;
+            // 2026-09-16 (2-C.1): 独立 Supervisor 宿主 —— 长期执行不依附 web 进程
+            case '--supervise':
+                result.supervise = true;
+                break;
+            case '--setup-status':
+                result.setupStatus = true;
+                break;
+            case '--setup-resume':
+                result.setupResume = true;
+                break;
+            case '--setup-repair':
+                result.setupRepair = true;
+                break;
+            case '--setup-reconfigure':
+                result.setupReconfigure = true;
+                break;
+            case '--setup-test':
+                result.setupTest = true;
+                break;
+            case '--supervise-once':
+                result.supervise = true;
+                result.superviseOnce = true;
+                break;
+            case '--supervise-dry-run':
+                result.supervise = true;
+                result.superviseDryRun = true;
+                break;
             case '--help':
             case '-h':
                 result.help = true;
@@ -3950,6 +4386,70 @@ async function main() {
             })();
         }
         const mode = args.web ? 'web' : 'cli';
+        // 2026-09-16 (2-C.1): 独立 Supervisor 宿主 —— `bolloon --supervise [--supervise-once|--supervise-dry-run]`
+        //   长期执行不再依附 web 进程 (页面关掉/CLI 没开也能继续推进 Goal)。
+        // 2026-09-16 (Phase 4): Onboard 统一入口 —— CLI / Web 共用同一条执行器 (src/setup/onboard.ts)
+        //   --setup-status 只读; --setup-resume 从失败阶段继续; --setup-repair 迁移/备份坏文件后就地修;
+        //   --setup-reconfigure 只改选中项 (新配置测通才切 active); --setup-test 重跑连通性 + 运行时。
+        if (args.setupStatus || args.setupResume || args.setupRepair || args.setupReconfigure || args.setupTest) {
+            const mode = args.setupStatus ? 'status' : args.setupRepair ? 'repair' : args.setupReconfigure ? 'reconfigure' : args.setupTest ? 'test' : 'resume';
+            if (mode === 'status') {
+                const { evaluateSetup, describeSetup } = await import('./setup/setup-store.js');
+                const ev = await evaluateSetup();
+                process.stdout.write(describeSetup(ev) + '\n');
+                process.exit(ev.gate === 'ready' ? 0 : 1);
+            }
+            const { defaultWizardIO } = await import('./cli/setup-wizard.js');
+            const { runOnboard } = await import('./setup/onboard.js');
+            const wizIO = defaultWizardIO();
+            const res = await runOnboard({
+                mode: mode,
+                io: {
+                    print: (m) => process.stdout.write(m + '\n'),
+                    ask: async (q, o) => wizIO.ask(q, o?.defaultValue ? { default: o.defaultValue } : undefined),
+                    askHidden: async (q) => wizIO.ask(q, { hidden: true }),
+                    confirm: async (q, d = true) => {
+                        const a = String(await wizIO.ask(`${q} (y/n)`, { default: d ? 'y' : 'n' })).trim().toLowerCase();
+                        return a === '' ? d : /^(y|yes|1|true|是)$/.test(a);
+                    },
+                    select: async (q, choices) => {
+                        process.stdout.write(q + '\n');
+                        choices.forEach((c, i) => process.stdout.write(`  ${i + 1}) ${c.label}${c.hint ? ` — ${c.hint}` : ''}\n`));
+                        const a = String(await wizIO.ask('选择 (序号或名称)', { default: '1' })).trim();
+                        if (!a)
+                            return choices[0]?.value || '';
+                        if (/^\d+$/.test(a) && choices[Number(a) - 1])
+                            return choices[Number(a) - 1].value;
+                        const hit = choices.find((c) => c.value === a) || choices.find((c) => a && c.value.startsWith(a));
+                        return hit?.value || a;
+                    },
+                },
+            });
+            process.exit(res.ok ? 0 : 1);
+        }
+        if (args.supervise) {
+            const { runStandaloneSupervisorHost } = await import('./agents/supervisor-host.js');
+            const res = await runStandaloneSupervisorHost({
+                once: !!args.superviseOnce,
+                dryRun: !!args.superviseDryRun,
+                log: (m) => console.log(m),
+            });
+            if (args.superviseOnce) {
+                const rep = res.lastReport;
+                if (rep) {
+                    console.log(`调度周期 #${rep.tick}: 认领 ${rep.claimed.length} · 执行 ${rep.executed.length} · 跳过 ${rep.skipped.length}${rep.errors.length ? ` · 错误 ${rep.errors.length}` : ''}`);
+                    for (const s of rep.skipped.slice(0, 8))
+                        console.log(`  跳过 ${s.goalId}: ${s.reason}`);
+                    for (const e of rep.executed)
+                        console.log(`  ▶ ${e.goalId} → run=${e.runId || '-'} ${e.status || ''}${e.error ? ` (${e.error})` : ''}`);
+                }
+                console.log(`supervisor 宿主: owner=${res.state.owner} worker=${res.state.workerId} ticks=${res.ticks} 状态文件=~/.bolloon/supervisor.json`);
+            }
+            else {
+                console.log(`[supervisor] 常驻宿主已启动 (owner=${res.state.owner}, worker=${res.state.workerId}); Ctrl-C 优雅停止`);
+            }
+            return;
+        }
         const isNonInteractive = !!(args.tool || args.prompt);
         const originalLog = console.log;
         const originalInfo = console.info;
@@ -3975,14 +4475,37 @@ async function main() {
         // 2026-09-13: 首次运行引导 — 没有可用模型供应商 / 还没有用户身份时, 先走初始化向导
         //   (放在 CLI 启动前: 用户先回答"你是谁 / 用哪个模型", 再进 TUI 面板)
         if (isCLIInteractive) {
+            // 2026-09-16 (M4 启动硬门禁): 先把初始化事实读出来 —— 未就绪就**先修**, 修不好就非零退出。
+            //   旧行为是"向导失败也只 warn, 照常进对话", 结果是半成品配置能进运行态 (看起来启动成功、实际不可执行)。
+            const w = (m) => process.stderr.write(m.endsWith('\n') ? m : m + '\n');
+            let gateEv = null;
             try {
-                const { isFirstRun, runSetupWizard } = await import('./cli/setup-wizard.js');
-                if (await isFirstRun()) {
-                    await runSetupWizard({ interactive: true });
+                const { refreshSetupState, describeSetup } = await import('./setup/setup-store.js');
+                gateEv = await refreshSetupState({ light: true });
+                if (gateEv.gate !== 'ready') {
+                    w(describeSetup(gateEv));
+                    if (process.env.BOLLOON_SKIP_SETUP === '1') {
+                        w('⚠ BOLLOON_SKIP_SETUP=1 → 诊断模式: 可以看状态/修配置, 但 agent 执行被门禁拦住 (不能绕过)');
+                    }
+                    else {
+                        const { runSetupWizard } = await import('./cli/setup-wizard.js');
+                        await runSetupWizard({ interactive: true });
+                        const after = await refreshSetupState({});
+                        if (after.gate !== 'ready') {
+                            w(describeSetup(after));
+                            w('⛔ 初始化未完成 → 退出 (不会以"看起来能跑"的状态进入对话)');
+                            process.exit(1);
+                        }
+                        w('✅ 初始化完成, 进入正常模式');
+                    }
                 }
             }
             catch (e) {
-                console.warn('[setup] 初始化向导失败 (不阻塞启动):', String(e?.message || e).slice(0, 200));
+                // 评估/向导自身异常: fail-closed —— 不假装就绪
+                w(`⛔ 初始化流程失败 (fail-closed): ${String(e?.message || e).slice(0, 200)}`);
+                w(`   当前状态评估: ${gateEv ? gateEv.gate : '未知 (评估都没跑通)'}`);
+                w('   排查: `bolloon setup --status` (或删掉 ~/.bolloon/setup-state.json 后重跑 setup)');
+                process.exit(1);
             }
         }
         if (isNonInteractive) {