@bolloon/bolloon-agent 0.4.33 → 0.5.0

package/dist/index.js

@@ -1598,6 +1598,7 @@ async function processInputInner(input, comm) {
         try {
             const { getSupervisor } = await import('./agents/execution-supervisor.js');
             const { wakeReport, listRunnableGoals, formatGoalLine } = await import('./agents/goal-store.js');
+            const { USER_VISIBLE_STATE_LABELS } = await import('./agents/goal-flywheel/types.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}`);
@@ -1637,10 +1638,23 @@ async function processInputInner(input, comm) {
                 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}` : ''}`);
+                // 2026-09-25 (飞轮接线): 把飞轮的**判断**如实打出来 —— 为什么跑/为什么停, 用的是哪一类用户可见态
                 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})` : ''}`);
+                for (const f of rep.flywheel) {
+                    const zh = USER_VISIBLE_STATE_LABELS[f.visibleState]?.zh || f.visibleState;
+                    appendLine(`  ${f.runnable ? C_DIM : C_WARN}飞轮 ${f.goalId}: ${f.decision}/${f.state} 无进展连续 ${f.noProgressStreak} 轮 · 用户可见态=${zh} · ${f.reason}${RESET}`);
+                }
+                for (const c of rep.closures) {
+                    appendLine(`  ${C_DIM}收尾 ${c.goalId}/${c.runId}: ${c.steps} 步 → ${c.decision} (memory ${c.memories} · skill 候选 ${c.candidates})${RESET}`);
+                    appendLine(`    ${C_DIM}用户汇报: ${c.reportPath}${RESET}`);
+                }
+                for (const b of rep.blocks)
+                    appendLine(`  ${C_WARN}阻塞 ${b.goalId}/${b.workId}: ${b.kind} → ${b.action} — ${b.note}${RESET}`);
+                for (const w of rep.workContracts)
+                    appendLine(`  ${C_DIM}工作合同已签发 ${w.goalId}: workId=${w.workId} 能力=${w.capability}${RESET}`);
                 return;
             }
             const rows = await wakeReport();
@@ -1648,8 +1662,12 @@ async function processInputInner(input, comm) {
                 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})` : ''}`);
+            // 界面只上屏**用户可见态** (六类); 内部状态缩到 dim 尾巴里, 只作为排障线索
+            for (const r of rows.slice(0, 12)) {
+                const zh = USER_VISIBLE_STATE_LABELS[r.visible]?.zh || r.visible || r.status;
+                appendLine(`  ${r.goalId}  [${zh}]  唤醒: ${r.wake}${r.nextAction ? `  下一步: ${String(r.nextAction).slice(0, 60)}` : ''}${r.lease ? `  (lease ${r.lease})` : ''}`);
+                appendLine(`${C_DIM}    (内部: status=${r.status} visible=${r.visible})${RESET}`);
+            }
             if (runnable.length) {
                 appendLine(`${C_DIM}现在可推进:${RESET}`);
                 for (const g of runnable.slice(0, 5))
@@ -3112,7 +3130,53 @@ const AVAILABLE_TOOLS = [
     { name: 'update_check', description: '检查 npm 包更新', example: '--update-check' },
     { name: 'update_now', description: '立即更新到最新版本', example: '--update-now [package]' },
 ];
-async function runToolCommand(tool, args, outputJson, comm, model, prompt) {
+/**
+ * 给 `--delegate` 找长期目标上下文 (P5 验收修复)。
+ *
+ * `SubAgentManager.delegateTask` 只在拿到 `goalId` 时才签工作合同 (`issueWorkContractFor`:
+ * "没有长期目标就没有合同上下文"), 而合同是"回报必须带逐条证据"这道门的唯一凭据。
+ *
+ * ★ 之前 CLI 是唯一的生产派遣调用方, **不传 goalId** ⇒ 真路径上一条合同都不签:
+ *   运行时复现过"回一句『全部做完了』就把任务标成 completed, 父目标上什么都没留下"。
+ *
+ * 两种入口:
+ *   - `--goal <goalId>`: 用既有目标 (目标不存在 → 抛错, 让调用方如实报告"没签合同");
+ *   - 没给: 为这次委派**建一个目标** (`createdBy='cli:delegate'`) 并进"等外部回报"态 ——
+ *     委派总是有目标上下文, 合同门不再空转。
+ *
+ * 为什么是 `awaiting_external` + `autoContinue=false`: 这次委派的执行者是**子 Agent**, 不是本节点
+ *   harness。`awaiting_external` 会被 Supervisor 明确跳过 (`listRunnableGoals`: "等外部事件, 不重复
+ *   发送"), 因此不会出现"同一件事被 harness 和子 Agent 各跑一遍"; 同时"没拿到带证据的回报前不自动
+ *   继续"。
+ */
+async function ensureDelegateGoal(explicitGoalId, taskDesc, caps) {
+    const { createGoal, readGoal, setContinuation, updateGoal } = await import('./agents/goal-store.js');
+    if (explicitGoalId) {
+        const g = await readGoal(explicitGoalId);
+        if (!g)
+            throw new Error(`--goal ${explicitGoalId} 不存在 (不签合同)`);
+        return { goalId: g.goalId, note: `合同签在既有目标 ${g.goalId} (状态 ${g.status}) 上` };
+    }
+    const g = await createGoal({
+        objective: `【委派】${taskDesc}`,
+        successCriteria: [taskDesc],
+        createdBy: 'cli:delegate',
+    });
+    await updateGoal(g.goalId, { status: 'awaiting_external' });
+    await setContinuation(g.goalId, {
+        state: 'awaiting_external',
+        wakeReason: 'awaiting_external',
+        autoContinue: false,
+        needsExternal: `等子 Agent 「${caps.join('/')}」交回带逐条证据的回报 (回报核验不过不算完成)`,
+    });
+    return {
+        goalId: g.goalId,
+        note: `已为本次委派建目标 ${g.goalId} (状态=等外部回复: 等子 Agent 的带证据回报)`,
+    };
+}
+async function runToolCommand(tool, args, outputJson, comm, model, prompt, 
+/** `--goal <goalId>` (P5 验收修复: 给 `--delegate` 指目标上下文) */
+goalFlag) {
     const a = await getAgent();
     const startTime = Date.now();
     let response;
@@ -3572,18 +3636,39 @@ async function runToolCommand(tool, args, outputJson, comm, model, prompt) {
             case 'delegate': {
                 const [taskDesc, ...requiredCaps] = args;
                 if (!taskDesc) {
-                    response = '用法: --delegate <任务描述> [能力要求1] [能力要求2] ...';
+                    response = '用法: --delegate <任务描述> [能力要求1] [能力要求2] ... [--goal <goalId>]';
                     error = response;
                     break;
                 }
+                const caps = requiredCaps.length > 0 ? requiredCaps : ['general'];
                 const manager = await createSubAgentManager();
-                const a = await getAgent();
-                const { task, agent } = await manager.delegateTask('cli-user', taskDesc, requiredCaps.length > 0 ? requiredCaps : ['general']);
-                if (agent) {
-                    response = `✅ 任务已委派:\n  任务ID: ${task.id}\n  执行Agent: ${agent.name} (${agent.id})\n  状态: ${task.status}`;
+                // ★ 2026-09-25 (P5 验收修复): 派遣**必须**带 goalId。
+                //   `SubAgentManager` 只在拿到 goalId 时才签工作合同 (没有长期目标就没有合同上下文);
+                //   而在真实运行里复现过: 不签合同 ⇒ 回报核验这道门完全不生效 ——
+                //   一句"全部做完了"就能把任务标成 completed, 父 Goal 上也留不下"等回报"的痕迹。
+                //   显式 `--goal <goalId>` (校验目标存在) 优先; 没给就为这次委派**建一个目标**,
+                //   合同门在生产路径上不再空转 (目标进"等外部回报"态, 见 ensureDelegateGoal)。
+                let goalId = '';
+                let goalNote = '';
+                try {
+                    const g = await ensureDelegateGoal(goalFlag || '', taskDesc, caps);
+                    goalId = g.goalId;
+                    goalNote = g.note;
+                }
+                catch (err) {
+                    goalNote = `目标上下文准备失败 → 本次不签工作合同 (合同门不生效): ${String(err?.message || err).slice(0, 160)}`;
+                }
+                const { task, agent, workContract } = await manager.delegateTask('cli-user', taskDesc, caps, 'normal', undefined, goalId ? { goalId, successCriteria: [taskDesc] } : undefined);
+                const head = agent
+                    ? `✅ 任务已委派:\n  任务ID: ${task.id}\n  执行Agent: ${agent.name} (${agent.id})\n  状态: ${task.status}`
+                    : `⚠️ 未找到合适的Agent，任务已创建:\n  任务ID: ${task.id}\n  状态: ${task.status}`;
+                if (workContract) {
+                    response = `${head}\n  ${goalNote}\n  工作合同: ${workContract.workId} (目标 ${goalId})\n`
+                        + `  完成判据 ${workContract.successCriteria.length} 条 · 必带证据 ${workContract.requiredEvidence.length} 条\n`
+                        + `  ⚠️ 回报必须按判据逐条给证据: 一句"全部做完了"**不会**被接受为完成`;
                 }
                 else {
-                    response = `⚠️ 未找到合适的Agent，任务已创建:\n  任务ID: ${task.id}\n  状态: ${task.status}`;
+                    response = `${head}\n  ⚠️ 未签工作合同: ${goalNote || '没有目标上下文'} —— 无合同的回报不做证据核验`;
                 }
                 break;
             }
@@ -3985,7 +4070,7 @@ async function runNonInteractive(args, comm) {
             outputBuffer += params.join(' ') + '\n';
         };
         if (tool) {
-            await runToolCommand(tool, toolArgs, false, comm, args.model, prompt);
+            await runToolCommand(tool, toolArgs, false, comm, args.model, prompt, args.goal);
         }
         else if (prompt) {
             const a = await getAgent();
@@ -4025,7 +4110,7 @@ async function runNonInteractive(args, comm) {
         return;
     }
     if (tool) {
-        await runToolCommand(tool, toolArgs, !!json, comm, args.model, prompt);
+        await runToolCommand(tool, toolArgs, !!json, comm, args.model, prompt, args.goal);
     }
     else if (prompt) {
         const startTime = Date.now();
@@ -4186,6 +4271,10 @@ function parseArgs() {
                 }
                 result.toolArgs = delArgs;
                 break;
+            // ★ 2026-09-25 (P5 验收修复): 给 --delegate 指定长期目标 (有 goalId 才签工作合同)
+            case '--goal':
+                result.goal = args[++i];
+                break;
             case '--engine':
             case '-e':
                 result.engine = args[++i];
@@ -4389,7 +4478,9 @@ function printHelp() {
   # SubAgent 管理
   --agents                   列出所有 SubAgent
   --register-agent <name> [cap1] [cap2]...  注册新 SubAgent
-  --delegate <任务描述> [能力要求...]  委派任务给最佳 Agent
+  --delegate <任务描述> [能力要求...] [--goal <goalId>]
+                              委派任务给最佳 Agent (签工作合同: 回报必须带逐条证据;
+                              --goal 不给则为本次委派建一个目标)
 
   # 全局共享上下文
   --context                  显示全局共享上下文摘要