minimal-agent 0.12.0 → 0.14.0

package/src/cli/print.js

@@ -27,10 +27,12 @@ import { updateSessionMetadata } from '../context/sessionRegistry.js';
 import { workspaceIndexService } from '../context/workspaceIndex.js';
 import { normalizeImageDetail } from '../multimodal.js';
 import { runWithPlugins } from '../plugins/pluginRunner.js';
-import { buildBaseSystemPrompt, buildTransientPromptBundle } from '../prompts/system.js';
+import { buildTransientPromptBundle } from '../prompts/system.js';
+import { refreshStableSystemPrompt } from '../prompts/stableSystemPrompt.js';
 import { getOrCreateSessionState, sessionStateKey } from '../session/sessionState.js';
 import { hydrateSessionWorktree } from '../tools/worktree/sessionWorktree.js';
 import { ALL_TOOLS } from '../tools/index.js';
+import { classifyComputerAutomationIntent } from '../tools/computeruse/computerIntent.js';
 import { createPromptCacheContext } from '../llm/promptCache.js';
 import { createAgentRuntimeContext, filterToolsForRuntime, memoryContextFromRuntime, } from '../runtime/agentRuntimeContext.js';
 import { createCliComputerRun } from './computerUse.js';
@@ -108,8 +110,16 @@ export function extractImageOptions(args) {
  *   stop_reason = end_turn | max_turns | stalled | error | interrupted | config_error
  *   num_turns   = assistant_message 事件计数
  *   error       = 失败文案（成功时 null）
+ *   warnings    = 本轮所有非致命警告（与 stderr 同源；宿主要结构化的那一份）
  *   session_file（可选）= 当前对话落盘路径；拿得到才填，拿不到省略该键
  *
+ *   completionStatus = 本层从 stop_reason + deliverables 重算：跑完了没、产物验没验
+ *   delivery_status（可选）= 内核 turn_done 的交付判定，**回答的是另一个问题**：
+ *     completed / delivery_incomplete / delivery_unverified / claims_unverified。
+ *     两者并列而非替代 —— `ok:true` 配 `delivery_status:'claims_unverified'` 是
+ *     完全合法的一行：Agent 确实正常收尾了，但它宣称的「测试已通过」没有证据支撑。
+ *     判断「任务是否真做成」的宿主应当读它，而不是只看 ok。
+ *
  * 导出供单测断言。
  */
 export function emitJsonResult(result, sessionFile) {
@@ -136,6 +146,11 @@ export function emitJsonResult(result, sessionFile) {
         num_turns: result.numTurns,
         error: result.error,
         completionStatus,
+        ...(result.deliveryStatus ? { delivery_status: result.deliveryStatus } : {}),
+        // ⚠️ 读了就必须输出。本仓库在 `turn_done.completionStatus` 上正犯过反面错误：
+        // 事件被读进 result 却没进 JSON，于是模型谎报成功时宿主拿到的 JSON
+        // 与一切正常逐字节相同。goal_status 同理，不能只留在进程里。
+        ...(result.goalStatus ? { goal_status: result.goalStatus } : {}),
         deliverables,
         verification: allVerified ? 'passed' : deliverables.length > 0 ? 'not_run' : 'none',
         warnings,
@@ -265,13 +280,10 @@ export async function runPrintMode(provider, args, initialHistory, options) {
             memoryAccess: options.memoryAccess ?? 'read-only',
             interactiveAsk: false,
             computer: computerRun,
+            computerIntent: classifyComputerAutomationIntent(prompt, sessionState.computerAutomation),
         });
         const turnTools = filterToolsForRuntime(ALL_TOOLS, runtimeContext);
-        const stablePrompt = await buildBaseSystemPrompt(cwd, turnTools);
-        if (history[0]?.role === 'system')
-            history[0] = { ...history[0], content: stablePrompt };
-        else
-            history.unshift({ role: 'system', content: stablePrompt });
+        await refreshStableSystemPrompt(history, cwd, turnTools);
         const transientBundle = await buildTransientPromptBundle({
             cwd,
             tools: turnTools,
@@ -353,6 +365,10 @@ export function handleEvent(event, result, verbose, outputFormat = 'text') {
             // 一轮 assistant 消息完整组装 → 回合计数 +1（json 契约的 num_turns）
             result.numTurns++;
             return {};
+        case 'assistant_draft_discarded':
+            if (event.textLength > 0)
+                result.buffer = result.buffer.slice(0, Math.max(0, result.buffer.length - event.textLength));
+            return {};
         case 'tool_start':
             if (verbose) {
                 process.stderr.write(`\n🔧 工具: ${event.toolName}(${event.argsPreview})\n`);
@@ -399,11 +415,23 @@ export function handleEvent(event, result, verbose, outputFormat = 'text') {
             // 通用非致命警告（如 workflow 多余参数、pause 被自动跳过等）始终走 stderr，
             // 不受 verbose 控制 —— 这是用户必须看到的信号，避免静默丢弃语义被忽略。
             process.stderr.write(`${event.message}\n`);
+            // 同时收进结局契约：stderr 是给人看的，spawn 它的宿主要的是结构化的一条。
+            // （此前 PrintResult.warnings 声明了、读了、也输出了，就是没有任何地方写它 ——
+            //  json 那行的 warnings 恒为空数组。）
+            (result.warnings ??= []).push(event.message);
             return {};
         case 'turn_done':
             // text 模式：非 verbose 时这里一次性把累积答案打到 stdout（旧行为，逐字节不变）。
             // json 模式：只记 stopReason='end_turn'，stdout 保持静默。
             result.stopReason = 'end_turn';
+            // 内核的交付判定必须过进程边界：模型谎称「已验证」时，若不记这一笔，
+            // 宿主收到的 JSON 与一切正常逐字节相同，唯一线索只剩 stderr 上一行中文。
+            if (event.completionStatus)
+                result.deliveryStatus = event.completionStatus;
+            // 托管运行时的生命周期状态（goal 等）。同上：读了就必须输出，
+            // 否则「Agent 自检通过但还没人验收」在宿主眼里与「办完了」逐字节相同。
+            if (event.managedStatus)
+                result.goalStatus = event.managedStatus;
             if (!isJson && !verbose)
                 console.log(result.buffer);
             return {};
@@ -435,6 +463,16 @@ export function handleEvent(event, result, verbose, outputFormat = 'text') {
             if (isJson)
                 result.stopReason = 'interrupted';
             return {};
+        case 'workflow_progress': {
+            if (!isJson) {
+                const count = event.current !== undefined && event.total !== undefined
+                    ? ` ${event.current}/${event.total}`
+                    : '';
+                const indent = '  '.repeat(event.depth ?? 0);
+                console.error(`${indent}[${event.workflow}]${count}${event.message ? ` ${event.message}` : ''}`);
+            }
+            return {};
+        }
         // 已知但 -p 模式无需呈现的框架事件：显式忽略，好让 default 只剩"真正未知"的插件私有事件。
         case 'user_message_committed':
         case 'tool_messages_committed':

package/src/cli/print.ts

@@ -29,10 +29,12 @@ import { workspaceIndexService } from '../context/workspaceIndex.js';
 import { normalizeImageDetail } from '../multimodal.js';
 import type { DeliverableManifest, FileActivityMetadata, HarnessDiagnostics, ImageInputSpec, LoopEvent, Message, Provider } from '../types.js';
 import { runWithPlugins } from '../plugins/pluginRunner.js';
-import { buildBaseSystemPrompt, buildTransientPromptBundle } from '../prompts/system.js';
+import { buildTransientPromptBundle } from '../prompts/system.js';
+import { refreshStableSystemPrompt } from '../prompts/stableSystemPrompt.js';
 import { getOrCreateSessionState, sessionStateKey } from '../session/sessionState.js';
 import { hydrateSessionWorktree } from '../tools/worktree/sessionWorktree.js';
 import { ALL_TOOLS } from '../tools/index.js';
+import { classifyComputerAutomationIntent } from '../tools/computeruse/computerIntent.js';
 import { createPromptCacheContext } from '../llm/promptCache.js';
 import {
   createAgentRuntimeContext,
@@ -98,6 +100,26 @@ export interface PrintResult {
   deliverables?: DeliverableManifest['files'];
   warnings?: string[];
   harnessDiagnostics?: HarnessDiagnostics;
+  /**
+   * 内核 `turn_done` 给出的交付判定（loop.ts 的四态词表）。
+   *
+   * 与下面 json 里那个从 stopReason+deliverables 重算的 `completionStatus` **不是**
+   * 一回事：那个只回答「跑完了没、产物验没验」，这个回答「模型宣称的事到底做没做」。
+   * 尤其 `claims_unverified` —— 模型说「测试已全部通过」但本轮证据台账里没有一条
+   * 成功的验证记录 —— 是重不重要全看它能不能过进程边界。
+   */
+  deliveryStatus?: string;
+  /**
+   * Goal 生命周期状态（跑的是 `/workflow goal` 这类托管运行时才有）。
+   *
+   * ⚠️ 它与 `completionStatus` / `delivery_status` 都不是一回事，三者并列：
+   *   · completionStatus  = 本层重算：跑完了没、产物验没验
+   *   · delivery_status   = 内核 turn_done：模型宣称的事做没做
+   *   · goal_status       = **生命周期事实源**：这件事有没有被人验收
+   * `ok:true` + `goal_status:'ready_for_acceptance'` 是正常且重要的组合 ——
+   * 机器自检通过，但还没有人点头。宿主把它当成「办完了」就会错。
+   */
+  goalStatus?: string;
 }
 
 /** handleEvent 返回的结构 */
@@ -191,8 +213,16 @@ export function extractImageOptions(args: string[]): {
  *   stop_reason = end_turn | max_turns | stalled | error | interrupted | config_error
  *   num_turns   = assistant_message 事件计数
  *   error       = 失败文案（成功时 null）
+ *   warnings    = 本轮所有非致命警告（与 stderr 同源；宿主要结构化的那一份）
  *   session_file（可选）= 当前对话落盘路径；拿得到才填，拿不到省略该键
  *
+ *   completionStatus = 本层从 stop_reason + deliverables 重算：跑完了没、产物验没验
+ *   delivery_status（可选）= 内核 turn_done 的交付判定，**回答的是另一个问题**：
+ *     completed / delivery_incomplete / delivery_unverified / claims_unverified。
+ *     两者并列而非替代 —— `ok:true` 配 `delivery_status:'claims_unverified'` 是
+ *     完全合法的一行：Agent 确实正常收尾了，但它宣称的「测试已通过」没有证据支撑。
+ *     判断「任务是否真做成」的宿主应当读它，而不是只看 ok。
+ *
  * 导出供单测断言。
  */
 export function emitJsonResult(result: PrintResult, sessionFile?: string): void {
@@ -220,6 +250,11 @@ export function emitJsonResult(result: PrintResult, sessionFile?: string): void
       num_turns: result.numTurns,
       error: result.error,
       completionStatus,
+      ...(result.deliveryStatus ? { delivery_status: result.deliveryStatus } : {}),
+      // ⚠️ 读了就必须输出。本仓库在 `turn_done.completionStatus` 上正犯过反面错误：
+      // 事件被读进 result 却没进 JSON，于是模型谎报成功时宿主拿到的 JSON
+      // 与一切正常逐字节相同。goal_status 同理，不能只留在进程里。
+      ...(result.goalStatus ? { goal_status: result.goalStatus } : {}),
       deliverables,
       verification: allVerified ? 'passed' : deliverables.length > 0 ? 'not_run' : 'none',
       warnings,
@@ -358,11 +393,13 @@ export async function runPrintMode(
       memoryAccess: options.memoryAccess ?? 'read-only',
       interactiveAsk: false,
       computer: computerRun,
+      computerIntent: classifyComputerAutomationIntent(
+        prompt,
+        sessionState.computerAutomation,
+      ),
     });
     const turnTools = filterToolsForRuntime(ALL_TOOLS, runtimeContext);
-    const stablePrompt = await buildBaseSystemPrompt(cwd, turnTools);
-    if (history[0]?.role === 'system') history[0] = { ...history[0], content: stablePrompt };
-    else history.unshift({ role: 'system', content: stablePrompt });
+    await refreshStableSystemPrompt(history, cwd, turnTools);
     const transientBundle = await buildTransientPromptBundle({
       cwd,
       tools: turnTools,
@@ -457,6 +494,14 @@ export function handleEvent(
       result.numTurns++;
       return {};
 
+    case 'assistant_draft_discarded':
+      if (event.textLength > 0)
+        result.buffer = result.buffer.slice(
+          0,
+          Math.max(0, result.buffer.length - event.textLength),
+        );
+      return {};
+
     case 'tool_start':
       if (verbose) {
         process.stderr.write(`\n🔧 工具: ${event.toolName}(${event.argsPreview})\n`);
@@ -509,12 +554,22 @@ export function handleEvent(
       // 通用非致命警告（如 workflow 多余参数、pause 被自动跳过等）始终走 stderr，
       // 不受 verbose 控制 —— 这是用户必须看到的信号，避免静默丢弃语义被忽略。
       process.stderr.write(`${event.message}\n`);
+      // 同时收进结局契约：stderr 是给人看的，spawn 它的宿主要的是结构化的一条。
+      // （此前 PrintResult.warnings 声明了、读了、也输出了，就是没有任何地方写它 ——
+      //  json 那行的 warnings 恒为空数组。）
+      (result.warnings ??= []).push(event.message);
       return {};
 
     case 'turn_done':
       // text 模式：非 verbose 时这里一次性把累积答案打到 stdout（旧行为，逐字节不变）。
       // json 模式：只记 stopReason='end_turn'，stdout 保持静默。
       result.stopReason = 'end_turn';
+      // 内核的交付判定必须过进程边界：模型谎称「已验证」时，若不记这一笔，
+      // 宿主收到的 JSON 与一切正常逐字节相同，唯一线索只剩 stderr 上一行中文。
+      if (event.completionStatus) result.deliveryStatus = event.completionStatus;
+      // 托管运行时的生命周期状态（goal 等）。同上：读了就必须输出，
+      // 否则「Agent 自检通过但还没人验收」在宿主眼里与「办完了」逐字节相同。
+      if (event.managedStatus) result.goalStatus = event.managedStatus;
       if (!isJson && !verbose) console.log(result.buffer);
       return {};
 
@@ -547,6 +602,20 @@ export function handleEvent(
       if (isJson) result.stopReason = 'interrupted';
       return {};
 
+    case 'workflow_progress': {
+      if (!isJson) {
+        const count =
+          event.current !== undefined && event.total !== undefined
+            ? ` ${event.current}/${event.total}`
+            : '';
+        const indent = '  '.repeat(event.depth ?? 0);
+        console.error(
+          `${indent}[${event.workflow}]${count}${event.message ? ` ${event.message}` : ''}`,
+        );
+      }
+      return {};
+    }
+
     // 已知但 -p 模式无需呈现的框架事件：显式忽略，好让 default 只剩"真正未知"的插件私有事件。
     case 'user_message_committed':
     case 'tool_messages_committed':

package/src/cli/streamJson.js

@@ -28,10 +28,12 @@ import { saveContext } from '../context/persistContext.js';
 import { setAskHandler } from '../askBridge.js';
 import { normalizeImageDetail } from '../multimodal.js';
 import { runWithPlugins } from '../plugins/pluginRunner.js';
-import { buildBaseSystemPrompt, buildTransientPromptBundle } from '../prompts/system.js';
+import { buildTransientPromptBundle } from '../prompts/system.js';
+import { refreshStableSystemPrompt } from '../prompts/stableSystemPrompt.js';
 import { getOrCreateSessionState, sessionStateKey } from '../session/sessionState.js';
 import { hydrateSessionWorktree } from '../tools/worktree/sessionWorktree.js';
 import { ALL_TOOLS } from '../tools/index.js';
+import { classifyComputerAutomationIntent } from '../tools/computeruse/computerIntent.js';
 import { createPromptCacheContext } from '../llm/promptCache.js';
 import { createAgentRuntimeContext, filterToolsForRuntime, memoryContextFromRuntime, } from '../runtime/agentRuntimeContext.js';
 import { extractImageOptions, extractPromptArgs } from './print.js';
@@ -300,13 +302,10 @@ export async function runStreamJsonMode(provider, args, initialHistory, options)
             memoryAccess: options.memoryAccess ?? 'read-only',
             interactiveAsk: control,
             computer: computerRun,
+            computerIntent: classifyComputerAutomationIntent(prompt, sessionState.computerAutomation),
         });
         const turnTools = filterToolsForRuntime(ALL_TOOLS, runtimeContext);
-        const stablePrompt = await buildBaseSystemPrompt(cwd, turnTools);
-        if (history[0]?.role === 'system')
-            history[0] = { ...history[0], content: stablePrompt };
-        else
-            history.unshift({ role: 'system', content: stablePrompt });
+        await refreshStableSystemPrompt(history, cwd, turnTools);
         const transientBundle = await buildTransientPromptBundle({
             cwd,
             tools: turnTools,

package/src/cli/streamJson.ts

@@ -33,10 +33,12 @@ export type { AskAnswer } from '../askBridge.js';
 import { normalizeImageDetail } from '../multimodal.js';
 import type { ImageInputSpec, Message, Provider } from '../types.js';
 import { runWithPlugins } from '../plugins/pluginRunner.js';
-import { buildBaseSystemPrompt, buildTransientPromptBundle } from '../prompts/system.js';
+import { buildTransientPromptBundle } from '../prompts/system.js';
+import { refreshStableSystemPrompt } from '../prompts/stableSystemPrompt.js';
 import { getOrCreateSessionState, sessionStateKey } from '../session/sessionState.js';
 import { hydrateSessionWorktree } from '../tools/worktree/sessionWorktree.js';
 import { ALL_TOOLS } from '../tools/index.js';
+import { classifyComputerAutomationIntent } from '../tools/computeruse/computerIntent.js';
 import { createPromptCacheContext } from '../llm/promptCache.js';
 import {
   createAgentRuntimeContext,
@@ -377,11 +379,13 @@ export async function runStreamJsonMode(
       memoryAccess: options.memoryAccess ?? 'read-only',
       interactiveAsk: control,
       computer: computerRun,
+      computerIntent: classifyComputerAutomationIntent(
+        prompt,
+        sessionState.computerAutomation,
+      ),
     });
     const turnTools = filterToolsForRuntime(ALL_TOOLS, runtimeContext);
-    const stablePrompt = await buildBaseSystemPrompt(cwd, turnTools);
-    if (history[0]?.role === 'system') history[0] = { ...history[0], content: stablePrompt };
-    else history.unshift({ role: 'system', content: stablePrompt });
+    await refreshStableSystemPrompt(history, cwd, turnTools);
     const transientBundle = await buildTransientPromptBundle({
       cwd,
       tools: turnTools,

package/src/cli/wizards/advisorWizard.js

@@ -14,6 +14,8 @@ import { jsx as _jsx } from "react/jsx-runtime";
  */
 import { useState } from 'react';
 import { configService } from '../../config/configService.js';
+import { DEFAULT_ADVISOR_CONFIG } from '../../config/configDefaults.js';
+import { CONFIG_LIMITS, normalizeLimited } from '../../config/numericLimits.js';
 import { FieldForm } from './fieldForm.js';
 const NEW_MODEL_OPTION = '+ 新建模型（作为顾问专用，可与基座用不同 provider）';
 function parsePositiveInt(value, fallback) {
@@ -94,7 +96,7 @@ export function AdvisorWizard({ existing, models, onDone, onCancel }) {
                 key: 'timeoutSeconds',
                 label: '最长等待（秒）',
                 type: 'text',
-                default: String(Math.round((existing?.timeoutMs ?? 180_000) / 1000)),
+                default: String(Math.round((existing?.timeoutMs ?? DEFAULT_ADVISOR_CONFIG.timeoutMs) / 1000)),
                 optional: true,
             },
             {
@@ -140,7 +142,7 @@ export function AdvisorWizard({ existing, models, onDone, onCancel }) {
                     mode: values.mode === 'manual' ? 'manual' : 'auto',
                     modelId,
                     shareSensitive: values.shareSensitive,
-                    timeoutMs: Math.min(180_000, Math.max(15_000, parsePositiveInt(values.timeoutSeconds, 180) * 1000)),
+                    timeoutMs: normalizeLimited(parsePositiveInt(values.timeoutSeconds, DEFAULT_ADVISOR_CONFIG.timeoutMs / 1000) * 1000, CONFIG_LIMITS.advisorTimeoutMs, DEFAULT_ADVISOR_CONFIG.timeoutMs),
                 },
             });
             onDone();

package/src/cli/wizards/advisorWizard.tsx

@@ -16,6 +16,8 @@ import React, { useState } from 'react';
 
 import type { ModelConfig } from '../../config/configFile.js';
 import { configService } from '../../config/configService.js';
+import { DEFAULT_ADVISOR_CONFIG } from '../../config/configDefaults.js';
+import { CONFIG_LIMITS, normalizeLimited } from '../../config/numericLimits.js';
 import { FieldForm, type FieldValues } from './fieldForm.js';
 
 type ResolvedAdvisor = Awaited<ReturnType<typeof configService.advisor>>;
@@ -138,7 +140,7 @@ export function AdvisorWizard({ existing, models, onDone, onCancel }: Props): JS
           key: 'timeoutSeconds',
           label: '最长等待（秒）',
           type: 'text',
-          default: String(Math.round((existing?.timeoutMs ?? 180_000) / 1000)),
+          default: String(Math.round((existing?.timeoutMs ?? DEFAULT_ADVISOR_CONFIG.timeoutMs) / 1000)),
           optional: true,
         },
         {
@@ -184,7 +186,11 @@ export function AdvisorWizard({ existing, models, onDone, onCancel }: Props): JS
             mode: values.mode === 'manual' ? 'manual' : 'auto',
             modelId,
             shareSensitive: values.shareSensitive as boolean,
-            timeoutMs: Math.min(180_000, Math.max(15_000, parsePositiveInt(values.timeoutSeconds, 180) * 1000)),
+            timeoutMs: normalizeLimited(
+              parsePositiveInt(values.timeoutSeconds, DEFAULT_ADVISOR_CONFIG.timeoutMs / 1000) * 1000,
+              CONFIG_LIMITS.advisorTimeoutMs,
+              DEFAULT_ADVISOR_CONFIG.timeoutMs,
+            ),
           },
         });
         onDone();

package/src/cli/wizards/contextAdvisorWizard.js

@@ -1,6 +1,7 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { configService } from '../../config/configService.js';
 import { CONFIG_LIMITS, normalizeLimited } from '../../config/numericLimits.js';
+import { DEFAULT_ADVISOR_CONFIG } from '../../config/configDefaults.js';
 import { FieldForm } from './fieldForm.js';
 function numberValue(value, fallback) {
     const parsed = Number(String(value ?? '').trim());
@@ -48,13 +49,13 @@ export function ContextAdvisorWizard({ compactRatio, advisor, models, onDone, on
                 key: 'inputTokenBudget',
                 label: '顾问输入 Token 预算',
                 type: 'text',
-                default: String(advisor?.inputTokenBudget ?? 128_000),
+                default: String(advisor?.inputTokenBudget ?? DEFAULT_ADVISOR_CONFIG.inputTokenBudget),
             },
             {
                 key: 'timeoutSeconds',
                 label: '最长等待（秒）',
                 type: 'text',
-                default: String(Math.round((advisor?.timeoutMs ?? 180_000) / 1000)),
+                default: String(Math.round((advisor?.timeoutMs ?? DEFAULT_ADVISOR_CONFIG.timeoutMs) / 1000)),
             },
             {
                 key: 'shareSensitive',
@@ -73,8 +74,8 @@ export function ContextAdvisorWizard({ compactRatio, advisor, models, onDone, on
                         enabled: values.enabled === true,
                         mode: values.mode === 'manual' ? 'manual' : 'auto',
                         modelId,
-                        inputTokenBudget: normalizeLimited(numberValue(values.inputTokenBudget, 128_000), CONFIG_LIMITS.advisorInputTokenBudget, 128_000),
-                        timeoutMs: normalizeLimited(numberValue(values.timeoutSeconds, 180) * 1000, CONFIG_LIMITS.advisorTimeoutMs, 180_000),
+                        inputTokenBudget: normalizeLimited(numberValue(values.inputTokenBudget, DEFAULT_ADVISOR_CONFIG.inputTokenBudget), CONFIG_LIMITS.advisorInputTokenBudget, DEFAULT_ADVISOR_CONFIG.inputTokenBudget),
+                        timeoutMs: normalizeLimited(numberValue(values.timeoutSeconds, DEFAULT_ADVISOR_CONFIG.timeoutMs / 1000) * 1000, CONFIG_LIMITS.advisorTimeoutMs, DEFAULT_ADVISOR_CONFIG.timeoutMs),
                         shareSensitive: values.shareSensitive === true,
                     }
                     : { clear: true },

package/src/cli/wizards/contextAdvisorWizard.tsx

@@ -3,6 +3,7 @@ import React from 'react';
 import type { AdvisorConfig, ModelConfig } from '../../config/configFile.js';
 import { configService } from '../../config/configService.js';
 import { CONFIG_LIMITS, normalizeLimited } from '../../config/numericLimits.js';
+import { DEFAULT_ADVISOR_CONFIG } from '../../config/configDefaults.js';
 import { FieldForm } from './fieldForm.js';
 
 interface Props {
@@ -72,13 +73,13 @@ export function ContextAdvisorWizard({
           key: 'inputTokenBudget',
           label: '顾问输入 Token 预算',
           type: 'text',
-          default: String(advisor?.inputTokenBudget ?? 128_000),
+          default: String(advisor?.inputTokenBudget ?? DEFAULT_ADVISOR_CONFIG.inputTokenBudget),
         },
         {
           key: 'timeoutSeconds',
           label: '最长等待（秒）',
           type: 'text',
-          default: String(Math.round((advisor?.timeoutMs ?? 180_000) / 1000)),
+          default: String(Math.round((advisor?.timeoutMs ?? DEFAULT_ADVISOR_CONFIG.timeoutMs) / 1000)),
         },
         {
           key: 'shareSensitive',
@@ -103,14 +104,14 @@ export function ContextAdvisorWizard({
                 mode: values.mode === 'manual' ? 'manual' : 'auto',
                 modelId,
                 inputTokenBudget: normalizeLimited(
-                  numberValue(values.inputTokenBudget, 128_000),
+                  numberValue(values.inputTokenBudget, DEFAULT_ADVISOR_CONFIG.inputTokenBudget),
                   CONFIG_LIMITS.advisorInputTokenBudget,
-                  128_000,
+                  DEFAULT_ADVISOR_CONFIG.inputTokenBudget,
                 ),
                 timeoutMs: normalizeLimited(
-                  numberValue(values.timeoutSeconds, 180) * 1000,
+                  numberValue(values.timeoutSeconds, DEFAULT_ADVISOR_CONFIG.timeoutMs / 1000) * 1000,
                   CONFIG_LIMITS.advisorTimeoutMs,
-                  180_000,
+                  DEFAULT_ADVISOR_CONFIG.timeoutMs,
                 ),
                 shareSensitive: values.shareSensitive === true,
               }

package/src/collaboration/taskFlow.js

@@ -0,0 +1,115 @@
+/**
+ * 旧项目任务板状态机（兼容层）。
+ *
+ * KakadeAI 新群协作主流程使用 CollaborationEvent，并在一次目标确认后直接运行；
+ * 本文件只负责已有 `conversation/workspace` 数据和旧插件的状态/动作兼容。
+ *
+ * ⚠️ 这张表原先内联在 `minimal-server/src/core/collaboration/projects.ts` 里
+ * （`WORK_ITEM_TRANSITIONS`），只有服务端看得到。前端要预测"按钮该不该亮"就得再抄一份，
+ * 两份必然漂移，漂移的后果是「界面能点、点了被拒」——最糟的一类交互。
+ * 所以兼容代码仍共享这一份，避免旧前后端漂移。
+ *
+ * 相对原表只加了一个状态 `proposed`（方案待审）。「待验收」沿用既有的 `review`
+ * （UI 里本来就叫"评审"），不造同义状态。
+ *
+ * 与 projects.ts 里其余守卫的分工：
+ *   这里管「状态怎么流转」和「谁有资格推动」；
+ *   projects.ts 继续管数据完整性类守卫（验收条件必填、执行者不能评审自己、
+ *   进入执行要有仓库/分支/文件范围、完成前要有已接受的交接单）。两者互补，不重叠。
+ */
+/**
+ * 合法流转表。**服务端与前端共用这一份。**
+ *
+ * `ready → in_progress` 是新旧迁移的默认直连。`submitPlan/approvePlan` 仅在旧任务
+ * 显式选择方案评审时使用，服务端不得再把它强制成所有 Agent 任务的第二次人工确认。
+ */
+export const TASK_TRANSITIONS = {
+    backlog: ['ready'],
+    ready: ['backlog', 'proposed', 'in_progress', 'blocked'],
+    proposed: ['ready', 'in_progress', 'blocked'],
+    in_progress: ['review', 'blocked'],
+    blocked: ['in_progress', 'backlog'],
+    review: ['in_progress', 'done', 'blocked'],
+    done: [],
+};
+const TRANSITION = {
+    assign: 'ready',
+    submitPlan: 'proposed',
+    approvePlan: 'in_progress',
+    rejectPlan: 'ready', // 打回回到已派单：同一张卡、同一个执行者重提方案
+    submitHandoff: 'review',
+    accept: 'done',
+    rework: 'in_progress',
+    block: 'blocked',
+    unblock: 'in_progress',
+};
+const ALLOWED_FROM = {
+    assign: ['backlog'],
+    submitPlan: ['ready'],
+    approvePlan: ['proposed'],
+    rejectPlan: ['proposed'],
+    submitHandoff: ['in_progress'],
+    accept: ['review'],
+    rework: ['review'],
+    block: ['ready', 'proposed', 'in_progress', 'review'],
+    unblock: ['blocked'],
+};
+const AGENT_ACTIONS = ['submitPlan', 'submitHandoff'];
+/** 旧任务板中由人触发的动作；新主流程只保留目标确认和最终验收。 */
+const HUMAN_ACTIONS = ['assign', 'approvePlan', 'rejectPlan', 'accept', 'rework', 'block', 'unblock'];
+/** 打回和返工不写原因，对面无从改起。 */
+const REASON_REQUIRED = ['rejectPlan', 'rework'];
+export function isAgentMember(memberId) {
+    return memberId.startsWith('agent:') || memberId.startsWith('agent-session:');
+}
+export function nextStatus(action) {
+    return TRANSITION[action];
+}
+/** 纯粹的流转合法性（不看是谁）。projects.ts 用它替换原先内联的表。 */
+export function canTransition(from, to) {
+    return from === to || TASK_TRANSITIONS[from].includes(to);
+}
+export function canAct(task, action, actor, input = {}) {
+    if (task.status === 'done')
+        return { allowed: false, reason: '任务已完成，不能再改动' };
+    if (!ALLOWED_FROM[action].includes(task.status)) {
+        if (action === 'approvePlan')
+            return { allowed: false, reason: '还没有待审的方案' };
+        if (action === 'accept' || action === 'rework')
+            return { allowed: false, reason: '任务还没有进入待验收' };
+        if (action === 'submitHandoff')
+            return { allowed: false, reason: '进入执行后才能交付' };
+        return { allowed: false, reason: '当前状态不允许该操作' };
+    }
+    if (AGENT_ACTIONS.includes(action)) {
+        if (actor.kind !== 'agent')
+            return { allowed: false, reason: '该动作由被指派的 agent 提交' };
+        if (actor.memberId !== task.ownerMemberId)
+            return { allowed: false, reason: '只有被指派的 agent 能提交' };
+        return { allowed: true };
+    }
+    if (HUMAN_ACTIONS.includes(action)) {
+        // agent 永远不能替人拍板，否则"人只对方案/结果负责"就是空话。
+        if (actor.kind !== 'human')
+            return { allowed: false, reason: '只有人类成员能拍板' };
+        const isVerdict = action === 'approvePlan' || action === 'rejectPlan' || action === 'accept' || action === 'rework';
+        if (isVerdict && task.reviewerIds.length > 0 && !task.reviewerIds.includes(actor.memberId)) {
+            return { allowed: false, reason: '这张卡指定了评审人，只有评审人能拍板' };
+        }
+        if (REASON_REQUIRED.includes(action) && !input.reason?.trim()) {
+            return { allowed: false, reason: '请填写原因，对方才知道要改什么' };
+        }
+        return { allowed: true };
+    }
+    return { allowed: false, reason: '未知操作' };
+}
+/** @deprecated 新主流程在一次目标确认后直接执行；仅保留导出避免旧插件崩溃。 */
+export function requiresPlanApproval(_ownerMemberId, _from, _to) {
+    return false;
+}
+/** 给 UI：当前这个人/agent 在这张卡上能做哪些动作（决定按钮亮不亮）。 */
+export function taskActionsFor(task, actor) {
+    const all = Object.keys(TRANSITION);
+    // 带理由的动作按"已填理由"预判：按钮要先亮出来，用户才有地方填理由。
+    return all.filter((action) => canAct(task, action, actor, { reason: '预检' }).allowed);
+}