minimal-agent 0.10.0 → 0.12.0

package/src/cli/print.js

@@ -24,9 +24,17 @@
  */
 import { getContextPath, saveContext } from '../context/persistContext.js';
 import { updateSessionMetadata } from '../context/sessionRegistry.js';
+import { workspaceIndexService } from '../context/workspaceIndex.js';
 import { normalizeImageDetail } from '../multimodal.js';
 import { runWithPlugins } from '../plugins/pluginRunner.js';
-import { BOOLEAN_FLAGS, VALUE_FLAGS, extractFlagValue, extractFlagValues, } from './args.js';
+import { buildBaseSystemPrompt, buildTransientPromptBundle } from '../prompts/system.js';
+import { getOrCreateSessionState, sessionStateKey } from '../session/sessionState.js';
+import { hydrateSessionWorktree } from '../tools/worktree/sessionWorktree.js';
+import { ALL_TOOLS } from '../tools/index.js';
+import { createPromptCacheContext } from '../llm/promptCache.js';
+import { createAgentRuntimeContext, filterToolsForRuntime, memoryContextFromRuntime, } from '../runtime/agentRuntimeContext.js';
+import { createCliComputerRun } from './computerUse.js';
+import { BOOLEAN_FLAGS, VALUE_FLAGS, extractFlagValue, extractFlagValues, normalizeArgs, } from './args.js';
 /** stderr 显示工具结果时的截断阈值；超过即末尾加 "..." */
 const TOOL_OUTPUT_PREVIEW_MAX = 200;
 /** stdin 读取超时（ms），防止非 TTY + 无管道时永久挂起 */
@@ -53,9 +61,12 @@ export function truncateForDisplay(content, max = TOOL_OUTPUT_PREVIEW_MAX) {
 }
 export function extractPromptArgs(args) {
     // flag 定义集中在 cli/args.ts（BOOLEAN_FLAGS / VALUE_FLAGS），这里只消费、不再各维护一份。
+    // 先 normalizeArgs 把 `--flag=value` 展开成空格式，否则整个 token 会被当成 prompt 文本
+    // 喂给模型（main.tsx 已在 argv 入口规范化过；这里重复调是给直接调用方兜底，幂等）。
+    const normalized = normalizeArgs(args);
     const result = [];
-    for (let i = 0; i < args.length; i++) {
-        const a = args[i];
+    for (let i = 0; i < normalized.length; i++) {
+        const a = normalized[i];
         if (BOOLEAN_FLAGS.has(a))
             continue;
         if (VALUE_FLAGS.has(a)) {
@@ -94,7 +105,7 @@ export function extractImageOptions(args) {
  *   ok          = (stop_reason === 'end_turn')
  *   result      = 累积的 assistant 文本
  *   is_error    = !ok
- *   stop_reason = end_turn | max_turns | error | interrupted | config_error
+ *   stop_reason = end_turn | max_turns | stalled | error | interrupted | config_error
  *   num_turns   = assistant_message 事件计数
  *   error       = 失败文案（成功时 null）
  *   session_file（可选）= 当前对话落盘路径；拿得到才填，拿不到省略该键
@@ -104,6 +115,19 @@ export function extractImageOptions(args) {
 export function emitJsonResult(result, sessionFile) {
     const stopReason = result.stopReason ?? 'error';
     const ok = stopReason === 'end_turn';
+    const deliverables = result.deliverables ?? [];
+    const allVerified = deliverables.length > 0 && deliverables.every((file) => file.verification === 'passed');
+    const completionStatus = !ok
+        ? (stopReason === 'interrupted' ? 'interrupted' : 'failed')
+        : allVerified
+            ? 'verified'
+            : 'agent_completed';
+    const warnings = [
+        ...(result.warnings ?? []),
+        ...(ok && deliverables.some((file) => file.verification !== 'passed')
+            ? ['Agent 已正常结束，但部分产物尚未通过结构化验证。']
+            : []),
+    ];
     console.log(JSON.stringify({
         ok,
         result: result.buffer,
@@ -111,6 +135,11 @@ export function emitJsonResult(result, sessionFile) {
         stop_reason: stopReason,
         num_turns: result.numTurns,
         error: result.error,
+        completionStatus,
+        deliverables,
+        verification: allVerified ? 'passed' : deliverables.length > 0 ? 'not_run' : 'none',
+        warnings,
+        ...(result.harnessDiagnostics ? { harness: result.harnessDiagnostics } : {}),
         ...(sessionFile ? { session_file: sessionFile } : {}),
     }));
 }
@@ -205,6 +234,57 @@ export async function runPrintMode(provider, args, initialHistory, options) {
         void finalizeOnce().finally(() => process.exit(130));
     });
     try {
+        const workspaceRoot = options.workspace?.cwd ?? process.cwd();
+        const workspace = await workspaceIndexService.findByPath(workspaceRoot).catch(() => null);
+        const sessionId = options.workspace?.sessionId ?? 'default';
+        const sessionState = getOrCreateSessionState(sessionStateKey({
+            surface: 'cli', workspaceId: workspace?.id,
+            cwd: workspace?.id ? undefined : workspaceRoot, sessionId,
+        }));
+        await hydrateSessionWorktree({ sessionState, workspaceId: workspace?.id, sessionId, cwd: workspaceRoot });
+        const cwd = sessionState.activeWorktree?.path ?? workspaceRoot;
+        const conversationKey = `workspace:${workspace?.id ?? workspaceRoot}:session:${sessionId}`;
+        const computerRun = options.computerUseMode && options.computerUseMode !== 'disabled'
+            ? createCliComputerRun({
+                mode: options.computerUseMode,
+                surface: 'cli',
+                conversationKey,
+                userInput: prompt,
+                allowedFileRoots: [cwd],
+                supervised: true,
+                diagnosticTraceDir: options.computerUseTraceDir,
+            })
+            : undefined;
+        const runtimeContext = createAgentRuntimeContext({
+            surface: 'cli',
+            profile: 'main',
+            cwd,
+            workspaceId: workspace?.id,
+            sessionId,
+            owner: options.memoryAccess === 'denied' ? 'untrusted' : 'local-owner',
+            memoryAccess: options.memoryAccess ?? 'read-only',
+            interactiveAsk: false,
+            computer: computerRun,
+        });
+        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 });
+        const transientBundle = await buildTransientPromptBundle({
+            cwd,
+            tools: turnTools,
+            runtime: {
+                surface: 'cli',
+                cwd,
+                workspaceId: workspace?.id,
+                sessionId,
+                interactiveAsk: false,
+                memoryAccess: runtimeContext.memoryAccess,
+                currentUserInput: prompt,
+            },
+        }).catch(() => undefined);
         for await (const event of runWithPlugins(prompt, {
             provider,
             history,
@@ -214,6 +294,13 @@ export async function runPrintMode(provider, args, initialHistory, options) {
             parseInlineImages: true,
             imageDetail: imageOptions.imageDetail,
             imageMaxLongSidePixel: imageOptions.imageMaxLongSidePixel,
+            allowedTools: turnTools.map((tool) => tool.name),
+            runtimeContext,
+            sessionState,
+            ...(transientBundle ? { transientBundle } : {}),
+            promptCache: createPromptCacheContext(`workspace:${workspace?.id ?? cwd}:session:${sessionId}`),
+            memoryContext: memoryContextFromRuntime(runtimeContext),
+            ...(computerRun ? { computerRun } : {}),
         })) {
             // event 是 LoopEvent | PluginEvent；handleEvent 只认 LoopEvent，未识别的插件私有事件走 default 静默忽略
             const handled = handleEvent(event, result, options.verbose, outputFormat);
@@ -272,10 +359,33 @@ export function handleEvent(event, result, verbose, outputFormat = 'text') {
             }
             return {};
         case 'tool_end':
+            if (event.ok && event.metadata?.kind === 'result_manifest') {
+                result.deliverables = event.metadata.manifest.files;
+            }
+            else if (event.ok && event.metadata?.kind === 'file_activity') {
+                const metadata = event.metadata;
+                const current = new Map((result.deliverables ?? []).map((file) => [file.relativePath, file]));
+                for (const file of metadata.files) {
+                    if (file.purpose !== 'deliverable')
+                        continue;
+                    current.set(file.relativePath, {
+                        relativePath: file.relativePath,
+                        ...(file.sha256 ? { sha256: file.sha256 } : {}),
+                        ...(file.mime ? { mime: file.mime } : {}),
+                        sourceToolCallId: event.toolCallId,
+                        verification: file.verification,
+                        purpose: 'deliverable',
+                    });
+                }
+                result.deliverables = [...current.values()];
+            }
             if (verbose) {
                 process.stderr.write(`${event.ok ? '✅' : '❌'} ${event.toolName}: ${truncateForDisplay(event.content)}\n`);
             }
             return {};
+        case 'harness_diagnostics':
+            result.harnessDiagnostics = event.diagnostics;
+            return {};
         case 'compact_start':
             if (verbose)
                 process.stderr.write('\n📝 正在压缩上下文...\n');
@@ -307,7 +417,11 @@ export function handleEvent(event, result, verbose, outputFormat = 'text') {
             }
             // 其余 error 都是终结性的。
             if (isJson) {
-                result.stopReason = event.code === 'max_turns' ? 'max_turns' : 'error';
+                result.stopReason = event.code === 'max_turns'
+                    ? 'max_turns'
+                    : event.code === 'stalled'
+                        ? 'stalled'
+                        : 'error';
                 result.error = event.error;
                 // json 模式不在这里打 stdout/stderr；由外层 emitJsonResult 统一输出
                 return { exitCode: 1 };