minimal-agent 0.10.0 → 0.12.0

package/src/ui/App.js

@@ -16,10 +16,14 @@ import { listArchives, restoreArchive } from '../context/archive.js';
 import { saveContext } from '../context/persistContext.js';
 import { sessionFileFor } from '../context/sessionPath.js';
 import { workspaceIndexService } from '../context/workspaceIndex.js';
+import { memoryService } from '../memory/memoryService.js';
 import { createSession, listSessionSummaries, updateSessionMetadata, } from '../context/sessionRegistry.js';
 import { activatePlugins } from '../plugins/pluginLifecycle.js';
 import { runAgentTurn } from '../session/runAgentTurn.js';
-import { runAdvisor } from '../tools/advisor/advisor.js';
+import { writeClipboardText } from '../utils/clipboardImage.js';
+import { createCliComputerRun, readRecentComputerUseAudit, } from '../cli/computerUse.js';
+import { computerUseService } from '../tools/computeruse/computerUseService.js';
+import { advisorHelpText, parseAdvisorCommand } from './advisorCommand.js';
 import { AskQuestion } from './AskQuestion.js';
 import { InputBox } from './InputBox.js';
 import { LiveArea } from './LiveArea.js';
@@ -30,6 +34,7 @@ import { SessionPicker } from './SessionPicker.js';
 import { WorkspacePicker } from './WorkspacePicker.js';
 import { StatusLine } from './StatusLine.js';
 import { theme } from './theme.js';
+import { parseComputerCommand } from './computerCommand.js';
 import { useChat } from './hooks/useChat.js';
 import { useTerminalSize } from './hooks/useTerminalSize.js';
 /**
@@ -221,6 +226,180 @@ export function App({ provider, initialHistory }) {
             await openWorkspacePicker();
             return;
         }
+        if (trimmed === '/copy') {
+            const latest = [...historyRef.current].reverse().find((message) => message.role === 'assistant' && typeof message.content === 'string' && message.content.length > 0);
+            if (!latest || latest.role !== 'assistant' || typeof latest.content !== 'string') {
+                chat.ephemeralLine('[/copy] 当前会话还没有可复制的 AI 最终回复。');
+                return;
+            }
+            try {
+                await writeClipboardText(latest.content);
+                chat.ephemeralLine('[/copy] 已复制最近一条 AI 最终回复。');
+            }
+            catch (error) {
+                chat.ephemeralLine(`[/copy] ${error instanceof Error ? error.message : String(error)}`);
+            }
+            return;
+        }
+        const computerCommand = parseComputerCommand(trimmed);
+        if (computerCommand.matched && !computerCommand.invalid) {
+            const sub = computerCommand.command ?? 'help';
+            if (sub === 'help') {
+                const helperAvailable = computerUseService.available();
+                let helperBackend = '未知';
+                let modeLabel = chat.computerUseMode;
+                try {
+                    const workspace = await workspaceIndexService
+                        .findByPath(getWorkingDir())
+                        .catch(() => null);
+                    const context = createCliComputerRun({
+                        mode: 'observe',
+                        surface: 'tui',
+                        conversationKey: `workspace:${workspace?.id ?? getWorkingDir()}:session:${chat.activeSessionId}`,
+                        userInput: '',
+                        allowedFileRoots: [getWorkingDir()],
+                        supervised: true,
+                    });
+                    const resp = await computerUseService.request(context, { action: 'status' });
+                    if (resp.ok && resp.state?.backend) {
+                        helperBackend = resp.state.backend;
+                    }
+                }
+                catch {
+                    // 探测失败就保持 "未知"
+                }
+                const modeDesc = {
+                    disabled: '已关闭（默认）',
+                    observe: '观察模式（只看不操作）',
+                    interactive: '交互模式（可点击/输入）',
+                };
+                chat.ephemeralLine([
+                    '[/computer] 电脑操控命令帮助',
+                    '',
+                    `  当前模式：${modeLabel}  —  ${modeDesc[modeLabel] ?? modeLabel}`,
+                    `  Helper 状态：${helperAvailable ? '✅ 可用' : '❌ 不可用'}   backend：${helperBackend}`,
+                    '',
+                    '  可用子命令：',
+                    '    /computer help          显示本帮助信息',
+                    '    /computer status        显示当前模式与 helper 状态',
+                    '    /computer permissions   检查辅助功能与屏幕录制权限',
+                    '    /computer observe       进入观察模式（AI 只能看屏幕，不能操作）',
+                    '    /computer interactive   进入交互模式（AI 可点击、输入、滚动等）',
+                    '    /computer stop          关闭电脑操控，回到普通对话',
+                    '    /computer takeover      同 interactive（受监督交互）',
+                    '    /computer resume        恢复上一次电脑操控会话',
+                    '    /computer cancel        取消当前电脑操控任务',
+                    '    /computer apps          列出当前可见应用',
+                    '    /computer audit         查看最近 10 条电脑操控审计记录',
+                    '',
+                    '  使用说明：',
+                    '    1. 首次使用请先运行 /computer permissions 检查权限',
+                    '    2. 输入 /computer observe 或 /computer interactive 开启',
+                    '    3. 开启后，直接描述你想让 AI 做的事即可',
+                    '    4. 随时可输入 /computer stop 关闭',
+                ].join('\n'));
+                return;
+            }
+            if (sub === 'interactive' || sub === 'takeover') {
+                chat.setComputerUseMode('interactive');
+                chat.ephemeralLine('[/computer] ✅ 已切换到交互模式（interactive）。\n' +
+                    '  AI 可以观察屏幕并执行鼠标点击、键盘输入、滚动等操作。\n' +
+                    '  直接描述你想做的事情即可开始。');
+                return;
+            }
+            if (sub === 'observe') {
+                chat.setComputerUseMode('observe');
+                chat.ephemeralLine('[/computer] ✅ 已切换到观察模式（observe）。\n' +
+                    '  AI 只能观察屏幕画面，不会执行任何操作。\n' +
+                    '  直接描述你想让 AI 看什么即可。');
+                return;
+            }
+            if (sub === 'stop') {
+                chat.ephemeralLine(`[/computer] ${await chat.stopComputerUse()}`);
+                return;
+            }
+            if (sub === 'audit') {
+                const records = await readRecentComputerUseAudit(10);
+                chat.ephemeralLine(records.length
+                    ? `[/computer] 最近审计：\n${records.map((line) => `  ${line}`).join('\n')}`
+                    : '[/computer] 暂无本机 Computer Use 审计记录。');
+                return;
+            }
+            if (sub === 'resume') {
+                chat.ephemeralLine(`[/computer] ${await chat.resumeComputerUse()}`);
+                return;
+            }
+            if (sub === 'cancel') {
+                chat.ephemeralLine(`[/computer] ${await chat.cancelComputerUse()}`);
+                return;
+            }
+            const workspace = await workspaceIndexService
+                .findByPath(getWorkingDir())
+                .catch(() => null);
+            const context = createCliComputerRun({
+                mode: 'observe',
+                surface: 'tui',
+                conversationKey: `workspace:${workspace?.id ?? getWorkingDir()}:session:${chat.activeSessionId}`,
+                userInput: '',
+                allowedFileRoots: [getWorkingDir()],
+                supervised: true,
+            });
+            const action = sub === 'apps'
+                ? 'list_apps'
+                : sub === 'permissions'
+                    ? 'permissions'
+                    : 'status';
+            const response = await computerUseService.request(context, { action });
+            if (!response.ok) {
+                chat.ephemeralLine(`[/computer] ${response.error?.message ?? 'Computer Use 不可用'}${response.error?.hint ? `\n  ${response.error.hint}` : ''}`);
+                return;
+            }
+            if (sub === 'apps') {
+                const apps = response.state?.windows
+                    .map((window) => window.appId)
+                    .filter((id, index, all) => all.indexOf(id) === index);
+                chat.ephemeralLine(`[/computer] 可见应用：${apps?.length ? apps.join('、') : response.content ?? '当前没有可见应用'}`);
+                return;
+            }
+            if (sub === 'permissions') {
+                chat.ephemeralLine(`[/computer] 权限：${response.content ?? '原生服务已连接；详细权限状态未报告。'}`);
+                return;
+            }
+            // status
+            chat.ephemeralLine(`[/computer] 状态：\n` +
+                `  模式：${chat.computerUseMode}\n` +
+                `  Helper：${computerUseService.available() ? '✅ 可用' : '❌ 不可用'}\n` +
+                `  Backend：${response.state?.backend ?? '未知'}\n` +
+                `  提示：输入 /computer help 查看所有可用命令`);
+            return;
+        }
+        if (computerCommand.matched) {
+            chat.ephemeralLine('[/computer] 用法：/computer status|apps|permissions|takeover|resume|cancel|stop|audit');
+            return;
+        }
+        if (trimmed === '/memories') {
+            const workspace = await workspaceIndexService.findByPath(getWorkingDir()).catch(() => null);
+            const records = await memoryService.recall('', workspace?.id, 100);
+            if (!records.length) {
+                chat.ephemeralLine('[/memories] 当前没有本机长期记忆。');
+                return;
+            }
+            chat.ephemeralLine(`[/memories] 本机长期记忆：\n${records.map((record) => `  ${record.id} · ${record.scope === 'personal' ? '个人' : '工作区'} · ${record.subject}: ${record.statement}`).join('\n')}\n使用 /forget-memory <id> 删除一条记忆。`);
+            return;
+        }
+        if (trimmed.startsWith('/forget-memory ')) {
+            const id = trimmed.slice('/forget-memory '.length).trim();
+            const workspace = await workspaceIndexService.findByPath(getWorkingDir()).catch(() => null);
+            const records = await memoryService.recall('', workspace?.id, 100);
+            const record = records.find((item) => item.id === id);
+            if (!record) {
+                chat.ephemeralLine(`[/forget-memory] 未找到记忆 ${id}，未做修改。`);
+                return;
+            }
+            await memoryService.forget(record.id, record.scope, record.workspaceId);
+            chat.ephemeralLine(`[/forget-memory] 已删除“${record.subject}”。`);
+            return;
+        }
         if (isBareSessionCmd) {
             const sessions = await listSessionSummaries(getWorkingDir());
             setSessionPicker(sessions);
@@ -325,11 +504,19 @@ export function App({ provider, initialHistory }) {
             setBaseModelPicker({ models: enabledModels, currentId: currentSession?.modelId ?? snap.config?.baseModelId ?? null });
             return;
         }
-        // /advisor status|on|off|ask|select —— 与 Desktop 共用统一配置。
-        const advisorArgMatch = /^\/advisor(?:\s+(status|on|off|ask|select)(?:\s+([\s\S]*))?)?$/.exec(trimmed);
-        if (advisorArgMatch) {
-            const sub = advisorArgMatch[1] ?? 'status';
-            const note = advisorArgMatch[2]?.trim();
+        // /advisor [help|status|on|off|ask|select] —— 与 Desktop 共用统一配置。
+        // 解析在 ui/advisorCommand.ts（纯函数可测）：认不得的子命令一律当咨询内容，
+        // 不再静默掉进 chat.submit() 被当成聊天发给 LLM。
+        const advisorCommand = parseAdvisorCommand(trimmed);
+        if (advisorCommand.matched) {
+            const sub = advisorCommand.command;
+            const note = advisorCommand.note;
+            // help 先于配置读取返回：configService.advisor() 每次都做 fresh reload
+            // （跨进程一致性的有意设计），纯文案命令没必要为此读一次盘。
+            if (sub === 'help') {
+                chat.ephemeralLine(advisorHelpText());
+                return;
+            }
             const advisor = await configService.advisor();
             if (sub === 'status') {
                 if (!advisor) {
@@ -380,9 +567,20 @@ export function App({ provider, initialHistory }) {
                 }
                 return;
             }
-            // sub === 'ask'（或无参数但有 note 文本）：立即请求顾问意见
-            const result = await runAdvisor({ ...(note ? { note } : {}) }, undefined, { history: historyRef.current, advisorCalls: { used: 0, max: 1 }, advisorInvocation: 'manual' });
-            chat.ephemeralLine(result.ok ? `[/advisor] 专家意见：\n${result.content}` : `[/advisor] ${result.error}`);
+            // sub === 'ask'：立即请求顾问意见。走 chat.runManualAdvisor 而不是裸 runAdvisor——
+            // 它负责过程显示（LiveArea 进度行）与 ESC 中断，否则最长 180 秒 TUI 全静默。
+            if (!advisor) {
+                chat.ephemeralLine('[/advisor] 未配置顾问模型：先用 /advisor select 选一个，或在 Desktop 设置 → 模型中配置。');
+                return;
+            }
+            if (!advisor.enabled) {
+                chat.ephemeralLine('[/advisor] 顾问模型当前已关闭；/advisor on 开启后再咨询。');
+                return;
+            }
+            const result = await chat.runManualAdvisor(note);
+            chat.ephemeralLine(result.ok
+                ? `[/advisor] ${advisor.provider.model} 的意见：\n${result.content}`
+                : `[/advisor] ${result.error}`);
             return;
         }
         // /config —— 硬编码配置菜单（取代旧版 LLM 驱动的 skills/config/SKILL.md）。
@@ -404,7 +602,13 @@ export function App({ provider, initialHistory }) {
         chat.switchSession,
         chat.activeSessionId,
         chat.submit,
+        chat.runManualAdvisor,
         chat.setProvider,
+        chat.computerUseMode,
+        chat.setComputerUseMode,
+        chat.stopComputerUse,
+        chat.resumeComputerUse,
+        chat.cancelComputerUse,
         handleSessionSelect,
         handleSessionCreate,
         openWorkspacePicker,
@@ -416,8 +620,8 @@ export function App({ provider, initialHistory }) {
     // 到 stdout（实测看到 banner 反复打印 N 次）。
     // 使用 getCurrentProvider() 获取最新 provider（/model 切换后实时显示）
     const currentProvider = chat.getCurrentProvider();
-    const bannerText = `minimal-agent  · ${currentProvider.name}/${currentProvider.model} · /model 切模型 · /advisor 专家 · /new 清空 · /compact 压缩 · /exit 退出 · Ctrl+C 中断`;
-    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(MessageList, { history: deferredHistory, compactGeneration: chat.compactGeneration, bannerText: bannerText, terminalRows: terminalRows }), _jsxs(Box, { flexDirection: "column", width: Math.max(1, terminalCols - 1), children: [_jsx(LiveArea, { progressStage: chat.progressStage, reasoningPreview: chat.reasoningPreview, streamingText: chat.streamingText, runningTools: chat.runningTools, pluginProgress: chat.pluginProgress, transientError: chat.transientError, terminalCols: terminalCols, terminalRows: terminalRows }), _jsx(QueuedMessagesBanner, { items: chat.queuedItems }), chat.error && (_jsx(Box, { marginBottom: 1, children: _jsxs(Text, { color: theme.error, children: ["\u26A0 ", chat.error] }) })), chat.interrupted && (_jsxs(Box, { marginBottom: 1, children: [_jsx(Text, { color: theme.warning, children: "\u26A1 \u64CD\u4F5C\u88AB\u7528\u6237\u4E2D\u65AD\uFF0C\u7B49\u5F85\u65B0\u7684\u4EFB\u52A1\u8F93\u5165..." }), _jsx(Text, { dimColor: true, children: "  \u8C03\u6574\u4E0A\u4E00\u6B21\u8BA1\u5212\uFF1A\u76F4\u63A5\u8BF4\u8C03\u6574\u5185\u5BB9 / \u91CD\u65B0\u8DD1 /plan \u76EE\u6807 / \u65B0\u4EFB\u52A1\u76F4\u63A5\u8BF4" })] })), configMenuOpen ? (_jsx(ConfigMenu, { mode: "reconfigure", onDone: () => setConfigMenuOpen(false) })) : baseModelPicker ? (_jsx(ModelPicker, { models: baseModelPicker.models, currentModelId: baseModelPicker.currentId, title: "\u9009\u62E9\u57FA\u5EA7\u6A21\u578B", onSelect: handleBaseModelSelect, onCancel: () => setBaseModelPicker(null) })) : advisorModelPicker ? (_jsx(ModelPicker, { models: advisorModelPicker.models, currentModelId: advisorModelPicker.currentId, title: "\u9009\u62E9\u987E\u95EE\u6A21\u578B", nullOptionLabel: "\u25CB \u4E0D\u4F7F\u7528\u987E\u95EE\u6A21\u578B", onSelect: handleAdvisorModelSelect, onCancel: () => setAdvisorModelPicker(null) })) : workspacePicker ? (_jsx(WorkspacePicker, { workspaces: workspacePicker, currentPath: getWorkingDir(), currentSessionId: chat.activeSessionId, onSelect: handleWorkspaceSelect, onCancel: () => setWorkspacePicker(null) })) : sessionPicker ? (_jsx(SessionPicker, { sessions: sessionPicker, activeSessionId: chat.activeSessionId, onSelect: handleSessionSelect, onCreate: handleSessionCreate, onCancel: () => setSessionPicker(null) })) : chat.pendingAsk ? (_jsx(AskQuestion, { questions: chat.pendingAsk, source: chat.pendingAskSource, queuedCount: chat.pendingAskQueueCount, onAnswer: chat.answerAsk, onCancel: chat.cancelAsk })) : (
+    const bannerText = `minimal-agent  · ${currentProvider.name}/${currentProvider.model} · /model 切模型 · /computer 控制桌面 · /copy 复制回复 · /paste-image 添加图片 · /new 清空 · /compact 压缩 · Ctrl+C 中断`;
+    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(MessageList, { history: deferredHistory, compactGeneration: chat.compactGeneration, bannerText: bannerText, terminalRows: terminalRows }), _jsxs(Box, { flexDirection: "column", width: Math.max(1, terminalCols - 1), children: [_jsx(LiveArea, { progressStage: chat.progressStage, reasoningPreview: chat.reasoningPreview, streamingText: chat.streamingText, runningTools: chat.runningTools, pluginProgress: chat.pluginProgress, transientError: chat.transientError, terminalCols: terminalCols, terminalRows: terminalRows }), _jsx(QueuedMessagesBanner, { items: chat.queuedItems }), chat.pendingComputerIntervention && (_jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: theme.warning, paddingX: 1, marginBottom: 1, children: [_jsxs(Text, { color: theme.warning, children: ["\u9700\u8981\u4EBA\u5DE5\u64CD\u4F5C\uFF1A", chat.pendingComputerIntervention.sanitizedSummary] }), _jsx(Text, { dimColor: true, children: "\u8BF7\u76F4\u63A5\u5728\u76EE\u6807\u5E94\u7528\u4E2D\u5904\u7406\uFF1B\u654F\u611F\u5185\u5BB9\u4E0D\u4F1A\u8FDB\u5165\u7EC8\u7AEF\u6216\u6A21\u578B\u3002\u5B8C\u6210\u540E\u8F93\u5165 /computer resume\uFF0C\u53D6\u6D88\u8F93\u5165 /computer cancel\u3002" })] })), chat.error && (_jsx(Box, { marginBottom: 1, children: _jsxs(Text, { color: theme.error, children: ["\u26A0 ", chat.error] }) })), chat.interrupted && (_jsxs(Box, { marginBottom: 1, children: [_jsx(Text, { color: theme.warning, children: "\u26A1 \u64CD\u4F5C\u88AB\u7528\u6237\u4E2D\u65AD\uFF0C\u7B49\u5F85\u65B0\u7684\u4EFB\u52A1\u8F93\u5165..." }), _jsx(Text, { dimColor: true, children: "  \u8C03\u6574\u4E0A\u4E00\u6B21\u8BA1\u5212\uFF1A\u76F4\u63A5\u8BF4\u8C03\u6574\u5185\u5BB9 / \u91CD\u65B0\u8DD1 /plan \u76EE\u6807 / \u65B0\u4EFB\u52A1\u76F4\u63A5\u8BF4" })] })), configMenuOpen ? (_jsx(ConfigMenu, { mode: "reconfigure", onDone: () => setConfigMenuOpen(false) })) : baseModelPicker ? (_jsx(ModelPicker, { models: baseModelPicker.models, currentModelId: baseModelPicker.currentId, title: "\u9009\u62E9\u57FA\u5EA7\u6A21\u578B", onSelect: handleBaseModelSelect, onCancel: () => setBaseModelPicker(null) })) : advisorModelPicker ? (_jsx(ModelPicker, { models: advisorModelPicker.models, currentModelId: advisorModelPicker.currentId, title: "\u9009\u62E9\u987E\u95EE\u6A21\u578B", nullOptionLabel: "\u25CB \u4E0D\u4F7F\u7528\u987E\u95EE\u6A21\u578B", onSelect: handleAdvisorModelSelect, onCancel: () => setAdvisorModelPicker(null) })) : workspacePicker ? (_jsx(WorkspacePicker, { workspaces: workspacePicker, currentPath: getWorkingDir(), currentSessionId: chat.activeSessionId, onSelect: handleWorkspaceSelect, onCancel: () => setWorkspacePicker(null) })) : sessionPicker ? (_jsx(SessionPicker, { sessions: sessionPicker, activeSessionId: chat.activeSessionId, onSelect: handleSessionSelect, onCreate: handleSessionCreate, onCancel: () => setSessionPicker(null) })) : chat.pendingAsk ? (_jsx(AskQuestion, { questions: chat.pendingAsk, source: chat.pendingAskSource, queuedCount: chat.pendingAskQueueCount, onAnswer: chat.answerAsk, onCancel: chat.cancelAsk })) : (
                     /* handleSubmit 包装做 slash 命令拦截，非命令透传 chat.submit */
-                    _jsx(InputBox, { onSubmit: handleSubmit, disabled: chat.isLoading, onAbort: chat.abort, onClear: handleClear, onCompact: chat.compactNow, onWorkspaces: openWorkspacePicker })), _jsx(StatusLine, { provider: currentProvider, history: chat.history, pluginProgress: chat.pluginProgress, contextUsage: chat.contextUsage })] })] }));
+                    _jsx(InputBox, { onSubmit: handleSubmit, disabled: chat.isLoading && !chat.pendingComputerIntervention, onAbort: chat.abort, onClear: handleClear, onCompact: chat.compactNow, onWorkspaces: openWorkspacePicker })), _jsx(StatusLine, { provider: currentProvider, history: chat.history, pluginProgress: chat.pluginProgress, contextUsage: chat.contextUsage })] })] }));
 }