minimal-agent 0.8.2 → 0.10.0

package/src/cli/args.js

@@ -31,6 +31,17 @@ export function extractFlagValue(args, names) {
     }
     return undefined;
 }
+/** 提取可重复带值标志，例如 `--image a.png --image b.png`。 */
+export function extractFlagValues(args, names) {
+    const values = [];
+    for (let i = 0; i < args.length; i++) {
+        if (names.includes(args[i]) && args[i + 1] !== undefined) {
+            values.push(args[i + 1]);
+            i++;
+        }
+    }
+    return values;
+}
 /**
  * CLI 布尔标志（出现即生效、不带值）。集中定义一份，供 print.ts 的 extractPromptArgs
  * 共用 —— 避免 flag 列表在多处各维护一份、新增 flag 时漏改导致「flag 值被当 prompt 污染」。
@@ -44,9 +55,9 @@ export const BOOLEAN_FLAGS = new Set([
     '--help',
     '-V',
     '--version',
-    // stream-json 控制位（webchat broker / 网关用）；出现即生效、不带值。
     '--clear',
     '--compact',
+    '--workspace-doctor',
 ]);
 /**
  * CLI 带值标志（标志本身 + 紧跟的下一个元素都不是位置参数）。
@@ -55,6 +66,11 @@ export const BOOLEAN_FLAGS = new Set([
 export const VALUE_FLAGS = new Set([
     '-d',
     '--cwd',
+    '-s',
+    '--session',
     '--output-format',
     '--max-turns',
+    '--image',
+    '--image-detail',
+    '--image-max-long-side-pixel',
 ]);

package/src/cli/configMenu.js

@@ -0,0 +1,236 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+/**
+ * ============================================================
+ *  src/cli/configMenu.tsx —— 配置主菜单（菜单 + 分段向导 的入口）
+ * ------------------------------------------------------------
+ *  取代旧版一条线走到底的 configWizard.tsx。展示 6 个配置分区 + "完成
+ *  退出"，每项状态从 ConfigService 实时读取；选中一项进入对应子向导，
+ *  子向导做完（成功或 ESC 取消）都回到本菜单。
+ *
+ *  两种模式：
+ *    - mode="first-run"：Root.tsx 在没有 provider 时渲染。基座模型未
+ *      配置时"完成退出"会被拦下（应用没有 provider 跑不起来）；ESC/
+ *      Ctrl+C 在菜单层直接退出整个进程——已完成的子项各自都是即时
+ *      savePatch 落盘的，不会因为中途退出而丢失（相对旧版"一条线走到
+ *      底、中途退出等于全部作废"是个改进）。
+ *    - mode="reconfigure"：App.tsx 的 /config 命令挂载。随时可"完成
+ *      退出"关闭覆盖层回到聊天；ESC/Ctrl+C 在菜单层等价于"完成退出"。
+ *
+ *  模型管理：支持添加多个模型、编辑已有模型、设置基座模型（通过向导完成）；
+ *  运行时切换基座模型使用 /model 命令、切换顾问模型使用 /advisor select，
+ *  无需重启会话即可生效。顾问/搜索/生图/语音/OpenRouter 改动下一次工具
+ *  调用即可读到新值（ConfigService.advisor()/tool() 每次都 fresh reload，
+ *  不缓存）。
+ * ============================================================
+ */
+import { useCallback, useEffect, useState } from 'react';
+import { Box, Text, useApp, useInput } from 'ink';
+import { configService } from '../config/configService.js';
+import { AdvisorWizard } from './wizards/advisorWizard.js';
+import { ImageWizard } from './wizards/imageWizard.js';
+import { OpenRouterWizard } from './wizards/openRouterWizard.js';
+import { ProviderWizard } from './wizards/providerWizard.js';
+import { SearchWizard } from './wizards/searchWizard.js';
+import { TtsWizard } from './wizards/ttsWizard.js';
+const ITEMS = [
+    {
+        screen: 'provider',
+        label: '添加/编辑模型',
+        status: (s) => {
+            const count = s.models.length;
+            const enabled = s.models.filter((m) => m.enabled && m.apiKey).length;
+            if (count === 0)
+                return '尚未添加模型';
+            return `共 ${count} 个模型（${enabled} 个可用）· 基座：${s.provider ? `${s.provider.name}/${s.provider.model}` : '未设置'}`;
+        },
+    },
+    {
+        screen: 'search',
+        label: '配置搜索引擎',
+        status: (s) => (s.webSearch ? '已配置' : '未配置'),
+    },
+    {
+        screen: 'image',
+        label: '配置生图模型',
+        status: (s) => s.imageGeneration ? `已配置 ${s.imageGeneration.provider}/${s.imageGeneration.model}` : '未配置',
+    },
+    {
+        screen: 'advisor',
+        label: '配置顾问模型',
+        status: (s) => s.advisor
+            ? `已配置 ${s.advisor.provider.name}/${s.advisor.provider.model}（${s.advisor.enabled ? '已启用' : '已关闭'}）`
+            : '未配置',
+    },
+    {
+        screen: 'tts',
+        label: '配置语音合成',
+        status: (s) => (s.textToSpeech ? '已配置' : '未配置'),
+    },
+    {
+        screen: 'openrouter',
+        label: '配置 OpenRouter',
+        status: (s) => (s.openRouter ? '已配置' : '未配置'),
+    },
+];
+export function ConfigMenu({ mode, onDone }) {
+    const { exit } = useApp();
+    const [screen, setScreen] = useState('menu');
+    const [snapshot, setSnapshot] = useState(null);
+    const [menuIndex, setMenuIndex] = useState(0);
+    const [blockedMsg, setBlockedMsg] = useState(null);
+    const [editingModelId, setEditingModelId] = useState(null);
+    const [modelListIndex, setModelListIndex] = useState(0);
+    const refresh = useCallback(async () => {
+        const [provider, advisor, webSearch, imageGeneration, textToSpeech, openRouter, config, models] = await Promise.all([
+            configService.provider(),
+            configService.advisor(),
+            configService.tool('webSearch'),
+            configService.tool('imageGeneration'),
+            configService.tool('textToSpeech'),
+            configService.tool('openRouter'),
+            configService.getSnapshot(),
+            configService.models(),
+        ]);
+        setSnapshot({ provider, baseModelId: config.config?.baseModelId ?? null, advisor, models, webSearch, imageGeneration, textToSpeech, openRouter });
+    }, []);
+    useEffect(() => {
+        void refresh();
+    }, [refresh]);
+    const backToMenu = useCallback(() => {
+        setScreen('menu');
+        setEditingModelId(null);
+        void refresh();
+    }, [refresh]);
+    const backToModelList = useCallback(() => {
+        setScreen('provider-list');
+        setEditingModelId(null);
+        void refresh();
+    }, [refresh]);
+    useInput((input, key) => {
+        if (screen === 'provider-list' && snapshot) {
+            const models = snapshot.models;
+            const listLen = models.length + 1; // +1 for "添加新模型"
+            if (key.escape || (key.ctrl && input === 'c')) {
+                setScreen('menu');
+                return;
+            }
+            if (key.upArrow) {
+                setModelListIndex((i) => (i - 1 + listLen) % listLen);
+                return;
+            }
+            if (key.downArrow) {
+                setModelListIndex((i) => (i + 1) % listLen);
+                return;
+            }
+            if (key.return) {
+                if (modelListIndex === models.length) {
+                    // 添加新模型
+                    setEditingModelId(null);
+                    setScreen('provider');
+                }
+                else {
+                    const selected = models[modelListIndex];
+                    if (selected) {
+                        setEditingModelId(selected.id);
+                        setScreen('provider');
+                    }
+                }
+                return;
+            }
+            return;
+        }
+        if (screen !== 'menu')
+            return;
+        if (key.escape || (key.ctrl && input === 'c')) {
+            if (mode === 'first-run')
+                exit();
+            else
+                onDone();
+            return;
+        }
+        if (key.upArrow) {
+            setMenuIndex((i) => (i - 1 + ITEMS.length + 1) % (ITEMS.length + 1));
+            setBlockedMsg(null);
+            return;
+        }
+        if (key.downArrow) {
+            setMenuIndex((i) => (i + 1) % (ITEMS.length + 1));
+            setBlockedMsg(null);
+            return;
+        }
+        if (key.return) {
+            if (menuIndex === ITEMS.length) {
+                // "完成退出"
+                if (mode === 'first-run' && !snapshot?.provider) {
+                    setBlockedMsg('请先添加模型并设置基座模型再退出——应用没有基座模型无法运行。');
+                    return;
+                }
+                if (mode === 'first-run') {
+                    void configService.provider().then((p) => onDone(p ?? undefined));
+                }
+                else {
+                    onDone();
+                }
+                return;
+            }
+            setBlockedMsg(null);
+            const targetScreen = ITEMS[menuIndex].screen;
+            if (targetScreen === 'provider') {
+                // 模型管理：有模型则显示列表供选择编辑，无模型直接进添加向导
+                if (snapshot && snapshot.models.length > 0) {
+                    setModelListIndex(0);
+                    setScreen('provider-list');
+                }
+                else {
+                    setEditingModelId(null);
+                    setScreen('provider');
+                }
+            }
+            else {
+                setScreen(targetScreen);
+            }
+        }
+    });
+    if (!snapshot) {
+        return (_jsx(Box, { paddingX: 1, children: _jsx(Text, { color: "gray", children: "\u6B63\u5728\u8BFB\u53D6\u914D\u7F6E..." }) }));
+    }
+    if (screen === 'provider-list' && snapshot) {
+        const models = snapshot.models;
+        const formatLabel = (f) => f === 'anthropic' ? 'Anthropic' : f === 'openai' ? 'OpenAI兼容' : f;
+        return (_jsxs(Box, { flexDirection: "column", paddingX: 1, children: [_jsx(Box, { marginBottom: 1, children: _jsx(Text, { color: "cyan", bold: true, children: "\u6A21\u578B\u7BA1\u7406" }) }), _jsx(Box, { marginBottom: 1, children: _jsx(Text, { color: "gray", children: "\u2191\u2193 \u9009\u62E9 \u00B7 Enter \u7F16\u8F91/\u6DFB\u52A0 \u00B7 ESC \u8FD4\u56DE\u83DC\u5355" }) }), _jsxs(Box, { flexDirection: "column", children: [models.map((m, i) => (_jsxs(Text, { color: i === modelListIndex ? 'cyan' : undefined, children: [i === modelListIndex ? '> ' : '  ', m.id === snapshot.baseModelId ? '★ ' : '  ', m.displayName || m.model, " ", _jsxs(Text, { color: "gray", children: ["(", formatLabel(m.apiFormat), "/", m.model, !m.enabled ? ' · 已禁用' : !m.apiKey ? ' · 未配置密钥' : '', ")"] })] }, m.id))), _jsxs(Text, { color: modelListIndex === models.length ? 'cyan' : undefined, children: [modelListIndex === models.length ? '> ' : '  ', "\uFF0B \u6DFB\u52A0\u65B0\u6A21\u578B"] })] }), snapshot.baseModelId && (_jsx(Box, { marginTop: 1, children: _jsx(Text, { color: "gray", children: "\u2605 = \u5F53\u524D\u57FA\u5EA7\u6A21\u578B\uFF08\u804A\u5929\u4E2D\u53EF\u7528 /model \u5B9E\u65F6\u5207\u6362\uFF09" }) }))] }));
+    }
+    if (screen === 'provider') {
+        // 根据 editingModelId 决定编辑哪个模型；null = 添加新模型
+        const editingModel = editingModelId
+            ? snapshot?.models.find((m) => m.id === editingModelId)
+            : undefined;
+        // 首次配置模式（无基座）时添加新模型自动设为基座；
+        // 从模型列表添加额外模型时不自动替换基座（用户可用 /model 切换）
+        const shouldSetAsBase = mode === 'first-run' || !snapshot?.baseModelId;
+        return (_jsx(ProviderWizard, { existing: editingModel
+                ? {
+                    id: editingModel.id,
+                    name: editingModel.displayName ?? editingModel.model,
+                    baseURL: editingModel.baseURL,
+                    apiKey: editingModel.apiKey,
+                    model: editingModel.model,
+                }
+                : null, setAsBase: shouldSetAsBase, onDone: snapshot && snapshot.models.length > 0 ? backToModelList : backToMenu, onCancel: snapshot && snapshot.models.length > 0 ? backToModelList : backToMenu }));
+    }
+    if (screen === 'search') {
+        return _jsx(SearchWizard, { existing: snapshot.webSearch ?? null, onDone: backToMenu, onCancel: backToMenu });
+    }
+    if (screen === 'image') {
+        return _jsx(ImageWizard, { existing: snapshot.imageGeneration ?? null, onDone: backToMenu, onCancel: backToMenu });
+    }
+    if (screen === 'advisor') {
+        return _jsx(AdvisorWizard, { existing: snapshot.advisor ?? null, models: snapshot.models, onDone: backToMenu, onCancel: backToMenu });
+    }
+    if (screen === 'tts') {
+        return _jsx(TtsWizard, { existing: snapshot.textToSpeech ?? null, onDone: backToMenu, onCancel: backToMenu });
+    }
+    if (screen === 'openrouter') {
+        return _jsx(OpenRouterWizard, { existing: snapshot.openRouter ?? null, onDone: backToMenu, onCancel: backToMenu });
+    }
+    return (_jsxs(Box, { flexDirection: "column", paddingX: 1, children: [_jsx(Box, { marginBottom: 1, children: _jsxs(Text, { color: "cyan", bold: true, children: ["minimal-agent \u00B7 ", mode === 'first-run' ? '首次配置菜单' : '配置菜单'] }) }), _jsx(Box, { marginBottom: 1, children: _jsxs(Text, { color: "gray", children: ["\u2191\u2193 \u9009\u62E9 \u00B7 Enter \u8FDB\u5165/\u786E\u8BA4 \u00B7 ESC ", mode === 'first-run' ? '退出程序' : '关闭菜单'] }) }), _jsxs(Box, { flexDirection: "column", children: [ITEMS.map((item, i) => (_jsxs(Text, { color: i === menuIndex ? 'cyan' : undefined, children: [i === menuIndex ? '> ' : '  ', i + 1, ". ", item.label, "  ", _jsxs(Text, { color: "gray", children: ["[", item.status(snapshot), "]"] })] }, item.screen))), _jsxs(Text, { color: menuIndex === ITEMS.length ? 'cyan' : undefined, children: [menuIndex === ITEMS.length ? '> ' : '  ', ITEMS.length + 1, ". \u5B8C\u6210\u9000\u51FA"] })] }), blockedMsg && (_jsx(Box, { marginTop: 1, children: _jsxs(Text, { color: "red", children: ["\u2717 ", blockedMsg] }) }))] }));
+}

package/src/cli/configWizard.js

@@ -26,6 +26,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useCallback, useMemo, useState } from 'react';
 import { Box, Text, useApp, useInput } from 'ink';
 import { saveConfig } from '../config/configFile.js';
+import { configService } from '../config/configService.js';
 // 兜底值：custom 或表外 model 都退到这里。
 // 与 src/config.ts 的同名常量含义对齐（"既没 env、saved 也没填 contextWindow" 的最终兜底）。
 const FALLBACK_CONTEXT_WINDOW = 128_000;
@@ -34,7 +35,7 @@ const PRESETS = [
         name: 'minimax',
         label: 'MiniMax (海螺)',
         baseURL: 'https://api.minimax.chat/v1',
-        models: ['MiniMax-M2.7', 'MiniMax-M1', 'abab6.5s-chat'],
+        models: ['MiniMax-M3', 'MiniMax-M2.7', 'MiniMax-M1', 'abab6.5s-chat'],
         contextWindow: 204_800,
     },
     {
@@ -52,9 +53,13 @@ const PRESETS = [
             'glm-5.1',
             'minimax-latest',
             'deepseek-v3.2',
+            'kimi-k2.7-code',
             'kimi-k2.6',
         ],
         contextWindow: 204_800,
+        modelContextWindows: {
+            'kimi-k2.7-code': 512_000,
+        },
     },
     {
         name: 'deepseek',
@@ -175,10 +180,7 @@ export function ConfigWizard({ onSuccess }) {
             contextWindow,
             tavilyApiKey,
         });
-        // 立刻注入当前进程 env，让本会话内的 WebSearch 不必重启就能用
-        if (tavilyApiKey) {
-            process.env.TAVILY_API_KEY = tavilyApiKey;
-        }
+        await configService.reload();
         onSuccess({
             name: preset.name,
             baseURL,

package/src/cli/print.js

@@ -23,8 +23,10 @@
  * ============================================================
  */
 import { getContextPath, saveContext } from '../context/persistContext.js';
+import { updateSessionMetadata } from '../context/sessionRegistry.js';
+import { normalizeImageDetail } from '../multimodal.js';
 import { runWithPlugins } from '../plugins/pluginRunner.js';
-import { BOOLEAN_FLAGS, VALUE_FLAGS } from './args.js';
+import { BOOLEAN_FLAGS, VALUE_FLAGS, extractFlagValue, extractFlagValues, } from './args.js';
 /** stderr 显示工具结果时的截断阈值；超过即末尾加 "..." */
 const TOOL_OUTPUT_PREVIEW_MAX = 200;
 /** stdin 读取超时（ms），防止非 TTY + 无管道时永久挂起 */
@@ -64,6 +66,21 @@ export function extractPromptArgs(args) {
     }
     return result;
 }
+export function extractImageOptions(args) {
+    const imageDetail = normalizeImageDetail(extractFlagValue(args, ['--image-detail']));
+    const rawMaxLongSide = extractFlagValue(args, [
+        '--image-max-long-side-pixel',
+    ]);
+    const imageMaxLongSidePixel = rawMaxLongSide !== undefined && Number.isFinite(Number(rawMaxLongSide))
+        ? Math.floor(Number(rawMaxLongSide))
+        : undefined;
+    const imageInputs = extractFlagValues(args, ['--image']).map((source) => ({
+        source,
+        detail: imageDetail,
+        maxLongSidePixel: imageMaxLongSidePixel,
+    }));
+    return { imageInputs, imageDetail, imageMaxLongSidePixel };
+}
 /**
  * 输出 `-p --output-format json` 的结局契约（**一行** JSON 到 stdout）。
  *
@@ -100,8 +117,13 @@ export function emitJsonResult(result, sessionFile) {
 /**
  * 尝试拿当前会话落盘路径（给 json 契约的 session_file 字段）。
  * 取不到（异常等）返回 undefined，emitJsonResult 据此省略该键（契约允许）。
+ *
+ * override 有值时直接用它（`--session` 解析出的路径）——不重新调用无参的
+ * getContextPath()，否则会跟真正读写的文件不一致。
  */
-function trySessionFile() {
+function trySessionFile(override) {
+    if (override)
+        return override;
     try {
         return getContextPath();
     }
@@ -121,6 +143,7 @@ export async function runPrintMode(provider, args, initialHistory, options) {
     process.stderr.on('error', handleEPIPE(process.stderr));
     const outputFormat = options.outputFormat ?? 'text';
     const isJson = outputFormat === 'json';
+    const imageOptions = extractImageOptions(args);
     const promptArgs = extractPromptArgs(args);
     let prompt;
     if (promptArgs.length > 0) {
@@ -137,6 +160,11 @@ export async function runPrintMode(provider, args, initialHistory, options) {
         console.error('错误: 提示不能为空');
         process.exit(1);
     }
+    if (options.workspace) {
+        await updateSessionMetadata(options.workspace.cwd, options.workspace.sessionId, {
+            lastMessagePreview: prompt.trim(),
+        }).catch(() => { });
+    }
     const abortController = new AbortController();
     let interrupted = false;
     const history = initialHistory;
@@ -158,9 +186,9 @@ export async function runPrintMode(provider, args, initialHistory, options) {
     function finalizeOnce() {
         if (!finalizePromise) {
             finalizePromise = (async () => {
-                await saveContext(history);
+                await saveContext(history, options.sessionFile);
                 if (isJson)
-                    emitJsonResult(result, trySessionFile());
+                    emitJsonResult(result, trySessionFile(options.sessionFile));
             })();
         }
         return finalizePromise;
@@ -182,6 +210,10 @@ export async function runPrintMode(provider, args, initialHistory, options) {
             history,
             signal: abortController.signal,
             maxTurns: options.maxTurns,
+            imageInputs: imageOptions.imageInputs,
+            parseInlineImages: true,
+            imageDetail: imageOptions.imageDetail,
+            imageMaxLongSidePixel: imageOptions.imageMaxLongSidePixel,
         })) {
             // event 是 LoopEvent | PluginEvent；handleEvent 只认 LoopEvent，未识别的插件私有事件走 default 静默忽略
             const handled = handleEvent(event, result, options.verbose, outputFormat);
@@ -295,6 +327,7 @@ export function handleEvent(event, result, verbose, outputFormat = 'text') {
         case 'plugin_progress':
         case 'reasoning':
         case 'stage_change':
+        case 'context_usage':
             return {};
         default:
             // 落到这里 = 插件私有事件（PluginEvent，type 任意字符串）。正常静默忽略；

package/src/cli/streamJson.js

@@ -22,10 +22,12 @@ import crypto from 'node:crypto';
 import { getWorkingDir } from '../bootstrap/workingDir.js';
 import { forceCompact } from '../context/compact.js';
 import { recordRecentDir } from '../context/recentDirs.js';
+import { updateSessionMetadata } from '../context/sessionRegistry.js';
 import { saveContext } from '../context/persistContext.js';
 import { setAskHandler } from '../askBridge.js';
+import { normalizeImageDetail } from '../multimodal.js';
 import { runWithPlugins } from '../plugins/pluginRunner.js';
-import { extractPromptArgs } from './print.js';
+import { extractImageOptions, extractPromptArgs } from './print.js';
 /** 一行一个 JSON 事件写 stdout。EPIPE 时静默。 */
 function emitLine(ev) {
     try {
@@ -37,7 +39,40 @@ function emitLine(ev) {
 }
 function firstUserTitle(history) {
     const u = history.find((m) => m.role === 'user');
-    return u && typeof u.content === 'string' ? u.content : undefined;
+    if (!u)
+        return undefined;
+    if (typeof u.content === 'string')
+        return u.content;
+    return u.content.find((p) => p.type === 'text')?.text;
+}
+function parseWireImages(raw) {
+    if (!Array.isArray(raw))
+        return [];
+    const out = [];
+    for (const item of raw) {
+        if (typeof item === 'string') {
+            out.push({ source: item });
+            continue;
+        }
+        if (!item || typeof item !== 'object')
+            continue;
+        const source = typeof item.source === 'string'
+            ? item.source
+            : typeof item.url === 'string'
+                ? item.url
+                : undefined;
+        if (!source)
+            continue;
+        const detail = typeof item.detail === 'string'
+            ? normalizeImageDetail(item.detail)
+            : undefined;
+        const rawMax = item.maxLongSidePixel ?? item.max_long_side_pixel;
+        const maxLongSidePixel = typeof rawMax === 'number' && Number.isFinite(rawMax)
+            ? Math.floor(rawMax)
+            : undefined;
+        out.push({ source, detail, maxLongSidePixel });
+    }
+    return out;
 }
 /**
  * stdin 控制通道：把 stdin 从「一次性裸 prompt」升级为**逐行 JSON 控制通道**，
@@ -59,11 +94,13 @@ export function attachStdinChannel(opts) {
     const input = opts.input ?? process.stdin;
     return new Promise((resolvePrompt) => {
         let promptResolved = false;
-        const resolveOnce = (text, control) => {
+        const resolveOnce = (text, control, imageInputs) => {
             if (promptResolved)
                 return;
             promptResolved = true;
-            resolvePrompt({ prompt: text, control });
+            resolvePrompt(imageInputs && imageInputs.length > 0
+                ? { prompt: text, control, imageInputs }
+                : { prompt: text, control });
         };
         // argv 给的 prompt：直连 CLI、无控制通道（broker 走 stdin 的 {type:'prompt'}，不用 argv）。
         if (opts.argvPrompt !== undefined)
@@ -95,7 +132,7 @@ export function attachStdinChannel(opts) {
                 }
                 if (!promptResolved) {
                     if (msg && msg.type === 'prompt' && typeof msg.text === 'string') {
-                        resolveOnce(msg.text, true); // 控制行 → 存在控制通道（broker 会回灌 ask_answer）
+                        resolveOnce(msg.text, true, parseWireImages(msg.images)); // 控制行 → 存在控制通道
                     }
                     else {
                         // 首行不是 prompt 控制消息 → legacy：把它放回去，整段当裸 prompt 读到 EOF
@@ -122,23 +159,27 @@ export async function runStreamJsonMode(provider, args, initialHistory, options)
             process.stdout.destroy();
     });
     const history = initialHistory;
-    let finalized = false;
-    const finalize = async () => {
-        if (finalized)
-            return;
-        finalized = true;
-        // 释放 stdin：attachStdinChannel 的 'data' 监听会让进程在本轮结束后**仍存活**
-        // （等下一行输入）→ broker 永远收不到子进程 close、web 端 conn.running 卡死。
-        // turn 已结束（无挂起提问），unref 让 stdout 排空后进程自然退出；中途挂起期间
-        // 不会走到这里，故等答案时进程仍被 stdin 监听保活。
-        try {
-            process.stdin.unref();
-        }
-        catch {
-            /* 某些 stdin 类型无 unref，忽略 */
-        }
-        setAskHandler(null); // 注销 handler，避免全局污染（测试复用 / 同进程多次调用）
-        await saveContext(history);
+    // 收尾守卫用「缓存 promise」而非「布尔 once」（与 print.ts finalizeOnce 同构）：
+    // SIGINT handler 与 for-await 的 AbortError catch 是两条并发退出路径，布尔 once
+    // 会让后到的路径立即返回、抢在 saveContext 落盘完成前 process.exit → 会话丢失。
+    // 缓存 promise 让所有路径 await 同一次真实收尾。
+    let finalizePromise = null;
+    const finalize = () => {
+        finalizePromise ??= (async () => {
+            // 释放 stdin：attachStdinChannel 的 'data' 监听会让进程在本轮结束后**仍存活**
+            // （等下一行输入）→ broker 永远收不到子进程 close、web 端 conn.running 卡死。
+            // turn 已结束（无挂起提问），unref 让 stdout 排空后进程自然退出；中途挂起期间
+            // 不会走到这里，故等答案时进程仍被 stdin 监听保活。
+            try {
+                process.stdin.unref();
+            }
+            catch {
+                /* 某些 stdin 类型无 unref，忽略 */
+            }
+            setAskHandler(null); // 注销 handler，避免全局污染（测试复用 / 同进程多次调用）
+            await saveContext(history, options.sessionFile);
+        })();
+        return finalizePromise;
     };
     // --- 压缩动作（/compact）：不需要 prompt ---
     if (options.compact) {
@@ -165,7 +206,8 @@ export async function runStreamJsonMode(provider, args, initialHistory, options)
         pendingAsks.clear();
     };
     const promptArgs = extractPromptArgs(args);
-    const { prompt, control } = await attachStdinChannel({
+    const cliImageOptions = extractImageOptions(args);
+    const { prompt, control, imageInputs: stdinImageInputs } = await attachStdinChannel({
         argvPrompt: promptArgs.length > 0 ? promptArgs.join(' ') : undefined,
         onAskAnswer: (requestId, answers) => {
             const p = pendingAsks.get(requestId);
@@ -192,6 +234,11 @@ export async function runStreamJsonMode(provider, args, initialHistory, options)
     }
     // 记录最近目录（侧栏用）；title 优先用历史里第一条用户消息（稳定），否则用当前 prompt
     await recordRecentDir(getWorkingDir(), firstUserTitle(history) ?? prompt);
+    if (options.workspace) {
+        await updateSessionMetadata(options.workspace.cwd, options.workspace.sessionId, {
+            lastMessagePreview: prompt,
+        }).catch(() => { });
+    }
     const abortController = new AbortController();
     let interrupted = false;
     process.on('SIGINT', () => {
@@ -209,6 +256,10 @@ export async function runStreamJsonMode(provider, args, initialHistory, options)
             history,
             signal: abortController.signal,
             maxTurns: options.maxTurns,
+            imageInputs: [...cliImageOptions.imageInputs, ...(stdinImageInputs ?? [])],
+            parseInlineImages: true,
+            imageDetail: cliImageOptions.imageDetail,
+            imageMaxLongSidePixel: cliImageOptions.imageMaxLongSidePixel,
         })) {
             // event 是 LoopEvent | PluginEvent，原样逐行 emit；前端不识别的插件私有事件会静默忽略
             emitLine(event);
@@ -216,7 +267,9 @@ export async function runStreamJsonMode(provider, args, initialHistory, options)
     }
     catch (e) {
         if (e.name === 'AbortError') {
-            emitLine({ type: 'interrupted' });
+            // SIGINT 路径已 emit 过 interrupted → 不重发（stdout jsonl 语义：一次中断一行）
+            if (!interrupted)
+                emitLine({ type: 'interrupted' });
             await finalize();
             process.exit(130);
         }