@code4bug/jarvis-agent 1.0.2 → 1.0.3

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2025 jarvis-agent
+Copyright (c) 2025 Code4Bug
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/dist/cli.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-import { APP_VERSION } from './config/constants.js';
-import { startJarvis } from './index.js';
+import { APP_VERSION } from './config/constants';
+import { startJarvis } from './index';
 const arg = process.argv[2];
 if (arg === '--version' || arg === '-v' || arg === 'version') {
     console.log(APP_VERSION);

package/dist/commands/index.js

@@ -26,8 +26,8 @@ const toolCommands = [
     { name: 'create_skill', description: '创建新的 Skill 到 ~/.jarvis/skills/', category: 'builtin' },
 ];
 /** 智能体子命令：从 agents 目录动态加载（二级菜单） */
-import { loadAllAgents } from '../agents/index.js';
-import { listSkills } from '../skills/index.js';
+import { loadAllAgents } from '../agents/index';
+import { listSkills } from '../skills/index';
 let _agentSubCommands = null;
 export function getAgentSubCommands() {
     if (_agentSubCommands)

package/dist/commands/init.js

@@ -7,7 +7,7 @@
 import fs from 'fs';
 import path from 'path';
 import { execSync } from 'child_process';
-import { APP_NAME, APP_VERSION } from '../config/constants.js';
+import { APP_NAME, APP_VERSION } from '../config/constants';
 // ===== 辅助函数 =====
 /** 安全执行命令 */
 function safeExec(cmd) {

package/dist/components/MessageItem.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Message } from '../types/index.js';
+import { Message } from '../types/index';
 declare function MessageItem({ msg, showDetails }: {
     msg: Message;
     showDetails?: boolean;

package/dist/components/MessageItem.js

@@ -2,7 +2,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React from 'react';
 import { Box, Text } from 'ink';
 import Spinner from 'ink-spinner';
-import MarkdownText from './MarkdownText.js';
+import MarkdownText from './MarkdownText';
 // 状态圆点 icon，根据消息类型 + 状态决定颜色
 // reasoning 完成 → 白色 / tool_exec 成功 → 绿色 / error → 红色 / aborted → 黄色 / pending → 黄色
 function statusDot(status, type) {
@@ -58,8 +58,16 @@ function MessageItem({ msg, showDetails = false }) {
         // Bash 工具直接显示命令内容
         const isBash = msg.toolName === 'Bash';
         const bashCmd = isBash && msg.toolArgs?.command ? String(msg.toolArgs.command) : '';
+        // Skill 工具：skill_xxx → 名称(参数摘要) 格式
+        const isSkill = msg.toolName?.startsWith('skill_');
+        const skillName = isSkill ? msg.toolName.replace(/^skill_/, '') : '';
+        const skillArgsSummary = isSkill && msg.toolArgs
+            ? Object.values(msg.toolArgs).map((v) => String(v)).filter(Boolean).join(', ')
+            : '';
         const toolLabel = isBash && bashCmd ? `Bash(${bashCmd})` : (msg.toolName || 'tool');
-        return (_jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [_jsxs(Box, { children: [_jsxs(Text, { color: dotColor, children: [dot, " "] }), isBash && bashCmd ? (_jsxs(Text, { children: [_jsx(Text, { color: "white", bold: true, children: "Bash" }), _jsxs(Text, { color: "gray", children: ["(", bashCmd, ")"] })] })) : (_jsx(Text, { color: "magenta", bold: true, children: toolLabel }))] }), showDetails && msg.toolArgs && !isBash && (_jsx(Box, { marginLeft: 2, children: _jsx(Text, { color: "gray", dimColor: true, wrap: "wrap", children: JSON.stringify(msg.toolArgs) }) })), showDetails && msg.toolResult && (_jsx(Box, { marginLeft: 2, children: _jsx(Text, { color: "gray", wrap: "wrap", children: msg.toolResult.length > 300 ? msg.toolResult.slice(0, 300) + '…' : msg.toolResult }) })), _jsx(MessageStats, { msg: msg, show: showDetails })] }));
+        // 并行组标识
+        const isParallel = !!msg.parallelGroupId;
+        return (_jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [_jsxs(Box, { children: [isParallel && _jsx(Text, { color: "cyan", dimColor: true, children: "\u21C9 " }), _jsxs(Text, { color: dotColor, children: [dot, " "] }), isBash && bashCmd ? (_jsxs(Text, { children: [_jsx(Text, { color: "white", bold: true, children: "Bash" }), _jsxs(Text, { color: "gray", children: ["(", bashCmd, ")"] })] })) : isSkill ? (_jsxs(Text, { children: [_jsx(Text, { color: "cyan", bold: true, children: skillName }), _jsxs(Text, { color: "gray", children: ["(", skillArgsSummary, ")"] })] })) : (_jsx(Text, { color: "magenta", bold: true, children: toolLabel }))] }), showDetails && msg.toolArgs && !isBash && (_jsx(Box, { marginLeft: 2, children: _jsx(Text, { color: "gray", dimColor: true, wrap: "wrap", children: JSON.stringify(msg.toolArgs) }) })), showDetails && msg.toolResult && (_jsx(Box, { marginLeft: 2, children: _jsx(Text, { color: "gray", wrap: "wrap", children: msg.toolResult.length > 300 ? msg.toolResult.slice(0, 300) + '…' : msg.toolResult }) })), _jsx(MessageStats, { msg: msg, show: showDetails })] }));
     }
     if (msg.type === 'error') {
         return (_jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [_jsxs(Text, { color: "red", children: [_jsx(Text, { color: dotColor, children: dot }), " ", msg.content] }), _jsx(MessageStats, { msg: msg, show: showDetails })] }));

package/dist/components/MultilineInput.d.ts

@@ -19,6 +19,12 @@ interface MultilineInputProps {
     onSlashMenuClose?: () => void;
     /** 输入为空时按 Tab 的回调（用于填入 placeholder） */
     onTabFillPlaceholder?: () => void;
+    /**
+     * 输入框下方的行数（分隔线 + StatusBar 等），用于将终端物理光标
+     * 上移到输入框行，使 IME composing 显示在正确位置而非状态栏上。
+     * 默认值 2（底部分隔线 1 行 + StatusBar 1 行）。
+     */
+    rowsBelow?: number;
 }
 /**
  * 多行文本输入组件，支持光标移动和粘贴折叠。
@@ -30,5 +36,5 @@ interface MultilineInputProps {
  * - Backspace: 删除光标前一个字符（占位符整体删除）
  * - 粘贴多行内容: 折叠为 [Pasted text #N +X lines] 占位符
  */
-export default function MultilineInput({ value, onChange, onSubmit, onUpArrow, onDownArrow, placeholder, isActive, showCursor, slashMenuActive, onSlashMenuUp, onSlashMenuDown, onSlashMenuSelect, onSlashMenuClose, onTabFillPlaceholder, }: MultilineInputProps): import("react/jsx-runtime").JSX.Element;
+export default function MultilineInput({ value, onChange, onSubmit, onUpArrow, onDownArrow, placeholder, isActive, showCursor, slashMenuActive, onSlashMenuUp, onSlashMenuDown, onSlashMenuSelect, onSlashMenuClose, onTabFillPlaceholder, rowsBelow, }: MultilineInputProps): import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/components/MultilineInput.js

@@ -5,6 +5,16 @@ import { Box, Text, useInput, useStdin } from 'ink';
 const PASTE_PLACEHOLDER_RE = /\[Pasted text #(\d+) \+(\d+) lines\]/g;
 /** 粘贴检测的时间窗口（ms），在此窗口内连续到达的数据视为一次粘贴 */
 const PASTE_DETECT_WINDOW_MS = 8;
+/**
+ * IME composing 检测时间窗口（ms）。
+ * 在此窗口内连续到达的可打印字符视为 IME composing 输入，
+ * 延迟渲染以避免拼音字母逐个触发 re-render 导致 TUI 偏移。
+ */
+const IME_COMPOSE_WINDOW_MS = 80;
+/** 判断字符串是否全部为 ASCII 小写字母（拼音输入的典型特征） */
+const isAsciiLowerAlpha = (s) => /^[a-z]+$/.test(s);
+/** 判断字符串是否包含非 ASCII 字符（中文、日文等 CJK 字符） */
+const hasNonAscii = (s) => /[^\x00-\x7F]/.test(s);
 /**
  * 多行文本输入组件，支持光标移动和粘贴折叠。
  *
@@ -15,7 +25,7 @@ const PASTE_DETECT_WINDOW_MS = 8;
  * - Backspace: 删除光标前一个字符（占位符整体删除）
  * - 粘贴多行内容: 折叠为 [Pasted text #N +X lines] 占位符
  */
-export default function MultilineInput({ value, onChange, onSubmit, onUpArrow, onDownArrow, placeholder = '', isActive = true, showCursor = true, slashMenuActive = false, onSlashMenuUp, onSlashMenuDown, onSlashMenuSelect, onSlashMenuClose, onTabFillPlaceholder, }) {
+export default function MultilineInput({ value, onChange, onSubmit, onUpArrow, onDownArrow, placeholder = '', isActive = true, showCursor = true, slashMenuActive = false, onSlashMenuUp, onSlashMenuDown, onSlashMenuSelect, onSlashMenuClose, onTabFillPlaceholder, rowsBelow = 2, }) {
     const { stdin } = useStdin();
     const [cursor, setCursor] = useState(value.length);
     // 粘贴内容存储
@@ -26,10 +36,23 @@ export default function MultilineInput({ value, onChange, onSubmit, onUpArrow, o
     // 时间窗口粘贴检测：收集短时间内连续到达的数据块
     const batchBufferRef = useRef('');
     const batchTimerRef = useRef(null);
-    // 启用 bracketed paste mode
+    // IME composing 缓冲：积累拼音字母，等 composing 结束后再一次性更新
+    // imeBufferRef: 当前正在 composing 的拼音字母
+    // imeTimerRef: composing 超时定时器，超时后将拼音作为普通文本提交
+    // imeInsertedLen: 已经临时插入到 value 中的 composing 文本长度（用于替换）
+    const imeBufferRef = useRef('');
+    const imeTimerRef = useRef(null);
+    const imeInsertedLenRef = useRef(0);
+    // 终端光标重定位定时器（用于 IME composing 位置修正）
+    const cursorRelocTimerRef = useRef(null);
+    // 启用 bracketed paste mode，并在激活时清空 stdin 缓冲区
     useEffect(() => {
         if (!stdin || !isActive)
             return;
+        // 清空 stdin 缓冲区，丢弃 processing 期间积累的输入
+        if (typeof stdin.read === 'function') {
+            while (stdin.read() !== null) { /* drain */ }
+        }
         process.stdout.write('\x1B[?2004h');
         return () => {
             process.stdout.write('\x1B[?2004l');
@@ -273,12 +296,72 @@ export default function MultilineInput({ value, onChange, onSubmit, onUpArrow, o
         // 多行 → 粘贴
         if (cleaned.includes('\n') && cleaned.length > 1) {
             insertPaste(cleaned);
+            return;
         }
-        else {
-            // 单字符或单行短文本，按普通输入处理
+        // 检测是否为 IME composing 输入（连续小写字母 = 拼音）
+        if (isAsciiLowerAlpha(buf)) {
+            // 可能是拼音 composing，进入 IME 缓冲模式
+            imeBufferRef.current += buf;
+            // 不更新 value/不触发 re-render，只重置 IME 超时
+            if (imeTimerRef.current !== null) {
+                clearTimeout(imeTimerRef.current);
+            }
+            imeTimerRef.current = setTimeout(flushImeBuffer, IME_COMPOSE_WINDOW_MS);
+            return;
+        }
+        // 收到非 ASCII 字符（中文等）：如果有 IME 缓冲，说明 composing 结束
+        if (hasNonAscii(buf) && imeBufferRef.current.length > 0) {
+            // 丢弃之前积累的拼音字母（它们只是 composing 中间态），
+            // 回退已临时插入的 composing 文本
+            if (imeTimerRef.current !== null) {
+                clearTimeout(imeTimerRef.current);
+                imeTimerRef.current = null;
+            }
+            const insertedLen = imeInsertedLenRef.current;
+            imeBufferRef.current = '';
+            imeInsertedLenRef.current = 0;
+            if (insertedLen > 0) {
+                // 回退之前临时插入的拼音
+                const v = valueRef.current;
+                const c = cursorRef.current;
+                const newVal = v.slice(0, c - insertedLen) + v.slice(c);
+                emitChange(newVal);
+                setCursor(c - insertedLen);
+            }
+            // 插入最终的中文字符
             handleNormalInput(buf);
+            return;
+        }
+        // 收到非拼音的 ASCII 可打印字符，且有 IME 缓冲：先提交 IME 缓冲
+        if (imeBufferRef.current.length > 0) {
+            commitImeBuffer();
+        }
+        // 单字符或单行短文本，按普通输入处理
+        handleNormalInput(buf);
+    };
+    /** 提交 IME 缓冲区中的拼音为普通文本（composing 超时或被打断时调用） */
+    const commitImeBuffer = () => {
+        if (imeTimerRef.current !== null) {
+            clearTimeout(imeTimerRef.current);
+            imeTimerRef.current = null;
+        }
+        const buf = imeBufferRef.current;
+        const insertedLen = imeInsertedLenRef.current;
+        imeBufferRef.current = '';
+        imeInsertedLenRef.current = 0;
+        if (!buf)
+            return;
+        // 需要插入的是 buf 中尚未被临时插入的部分
+        const remaining = buf.slice(insertedLen);
+        if (remaining.length > 0) {
+            handleNormalInput(remaining);
         }
     };
+    /** IME composing 超时：将积累的拼音作为普通文本提交 */
+    const flushImeBuffer = () => {
+        imeTimerRef.current = null;
+        commitImeBuffer();
+    };
     // Alt+Enter 组合键检测：ESC 可能单独到达，需要等待后续字符
     const escTimerRef = useRef(null);
     const ESC_WAIT_MS = 50; // 等待后续字符的时间窗口
@@ -350,6 +433,10 @@ export default function MultilineInput({ value, onChange, onSubmit, onUpArrow, o
             }
             if (isSingleControl && batchBufferRef.current === '') {
                 // 没有正在积累的缓冲，直接处理控制字符
+                // 如果有 IME 缓冲，先提交
+                if (imeBufferRef.current.length > 0) {
+                    commitImeBuffer();
+                }
                 handleNormalInput(raw);
                 return;
             }
@@ -376,6 +463,10 @@ export default function MultilineInput({ value, onChange, onSubmit, onUpArrow, o
                 clearTimeout(escTimerRef.current);
                 escTimerRef.current = null;
             }
+            if (imeTimerRef.current !== null) {
+                clearTimeout(imeTimerRef.current);
+                imeTimerRef.current = null;
+            }
         };
     }, [stdin, isActive]);
     // 组件卸载时清理
@@ -387,9 +478,61 @@ export default function MultilineInput({ value, onChange, onSubmit, onUpArrow, o
             if (escTimerRef.current !== null) {
                 clearTimeout(escTimerRef.current);
             }
+            if (imeTimerRef.current !== null) {
+                clearTimeout(imeTimerRef.current);
+            }
+            if (cursorRelocTimerRef.current !== null) {
+                clearTimeout(cursorRelocTimerRef.current);
+            }
         };
     }, []);
     useInput(() => { }, { isActive });
+    /**
+     * 将终端物理光标固定到当前行第 3 列，避免 IME composing 从行末溢出。
+     *
+     * 背景：ink 渲染完成后，终端光标停留在最后一行（StatusBar）末尾。
+     * macOS 终端模拟器的内联 IME 会在物理光标位置显示 composing 拼音，
+     * 若光标在行末会导致行宽溢出、TUI 布局被挤压偏移。
+     *
+     * 注意：只能移列，绝对不能移行（\x1B[1A 等）。
+     * ink 增量渲染以当前光标行为起点，移行后每次 re-render 都会导致
+     * TUI 整体上偏移一行（每次输入字符都触发 re-render）。
+     *
+     * 解决方案：仅将列定位到 3（❯ 占 2 列，输入框第一个字符从第 3 列开始），
+     * IME composing 文本从该列开始，不会从行末溢出。
+     */
+    useEffect(() => {
+        // 取消之前的定时器
+        if (cursorRelocTimerRef.current !== null) {
+            clearTimeout(cursorRelocTimerRef.current);
+        }
+        if (!showCursor || !isActive) {
+            // 非输入状态：将物理光标移到列 1（行首），避免 IME 候选框在可见区域弹出
+            cursorRelocTimerRef.current = setTimeout(() => {
+                cursorRelocTimerRef.current = null;
+                process.stdout.write('\x1B[1G');
+            }, 80);
+        }
+        else {
+            // 输入激活状态：
+            // 1. 上移 rowsBelow 行，到达输入框所在行
+            // 2. 将列定位到 3（❯ 占 2 列，输入框第一个字符从第 3 列开始）
+            // 3. 下移 rowsBelow 行，回到原来的光标行（ink 渲染起点不变）
+            // 这样 IME composing 显示在输入框行而非 StatusBar 行
+            cursorRelocTimerRef.current = setTimeout(() => {
+                cursorRelocTimerRef.current = null;
+                const up = rowsBelow > 0 ? `\x1B[${rowsBelow}A` : '';
+                const down = rowsBelow > 0 ? `\x1B[${rowsBelow}B` : '';
+                process.stdout.write(`${up}\x1B[3G${down}`);
+            }, 80);
+        }
+        return () => {
+            if (cursorRelocTimerRef.current !== null) {
+                clearTimeout(cursorRelocTimerRef.current);
+                cursorRelocTimerRef.current = null;
+            }
+        };
+    });
     // --- 渲染 ---
     const isEmpty = value.length === 0;
     if (isEmpty) {
@@ -398,6 +541,7 @@ export default function MultilineInput({ value, onChange, onSubmit, onUpArrow, o
             pasteCountRef.current = 0;
             pastedChunksRef.current.clear();
         }
+        // 更新光标位置信息（空输入时光标在起始位置）
         if (showCursor && placeholder.length > 0) {
             return (_jsxs(Box, { children: [_jsx(Text, { inverse: true, color: "white", children: placeholder[0] }), _jsx(Text, { color: "gray", children: placeholder.slice(1) }), _jsx(Text, { color: "gray", dimColor: true, children: "  [Tab]" })] }));
         }

package/dist/components/SlashCommandMenu.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { SlashCommand } from '../commands/index.js';
+import { SlashCommand } from '../commands/index';
 interface SlashCommandMenuProps {
     commands: SlashCommand[];
     selectedIndex: number;

package/dist/components/StatusBar.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React from 'react';
 import { Box, Text } from 'ink';
-import { MODEL_NAME, PROJECT_NAME, ENABLE_THINKING_MODE_TOGGLE, CONTEXT_TOKEN_LIMIT } from '../config/constants.js';
+import { MODEL_NAME, PROJECT_NAME, ENABLE_THINKING_MODE_TOGGLE, CONTEXT_TOKEN_LIMIT } from '../config/constants';
 /** 生成 token 用量进度条 */
 function tokenProgressBar(used, limit, barWidth) {
     const ratio = Math.min(used / limit, 1);

package/dist/components/StreamingText.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React from 'react';
 import { Box, Text } from 'ink';
-import MarkdownText from './MarkdownText.js';
+import MarkdownText from './MarkdownText';
 function StreamingText({ text }) {
     if (!text)
         return null;

package/dist/components/WelcomeHeader.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React from 'react';
 import { Box, Text } from 'ink';
-import { APP_NAME, APP_VERSION, MODEL_NAME } from '../config/constants.js';
+import { APP_NAME, APP_VERSION, MODEL_NAME } from '../config/constants';
 function truncatePath(p, max) {
     if (p.length <= max)
         return p;

package/dist/config/constants.js

@@ -24,7 +24,7 @@ export const SESSIONS_DIR = path.join(os.homedir(), '.jarvis', 'sessions');
 /** 输入后是否隐藏 WelcomeHeader，默认 false（不隐藏） */
 export const HIDE_WELCOME_AFTER_INPUT = false;
 /** 从配置文件获取当前模型名称 */
-import { loadConfig, getActiveModel } from './loader.js';
+import { loadConfig, getActiveModel } from './loader';
 const _cfg = loadConfig();
 function resolveModelName() {
     try {
@@ -50,8 +50,8 @@ export const DEFAULT_AGENT_COLOR = 'green';
 /** 智能体默认标识符 */
 export const DEFAULT_AGENT_EMOJI = '>';
 // ===== 动态应用名称（跟随激活智能体） =====
-import { getAgent } from '../agents/index.js';
-import { getActiveAgent } from './agentState.js';
+import { getAgent } from '../agents/index';
+import { getActiveAgent } from './agentState';
 /** 当前激活的智能体名称 — 启动时从 ~/.jarvis/agent.json 读取，运行时可切换 */
 export const DEFAULT_AGENT = getActiveAgent(DEFAULT_AGENT_FALLBACK);
 function resolveAppName() {

package/dist/config/loader.d.ts

@@ -11,6 +11,8 @@ export interface ModelConfig {
     model: string;
     temperature?: number;
     max_tokens?: number;
+    /** 额外请求体参数，会直接合并到 API 请求 body 中（如 enable_thinking、chat_template_kwargs 等） */
+    extra_body?: Record<string, unknown>;
 }
 export interface SystemConfig {
     context_token_limit?: number;

package/dist/core/QueryEngine.d.ts

@@ -1,5 +1,5 @@
 import { Message, Session, LoopState } from '../types/index.js';
-import { DangerConfirmResult } from './query.js';
+import { DangerConfirmResult } from './query';
 export interface EngineCallbacks {
     onMessage: (msg: Message) => void;
     onUpdateMessage: (id: string, updates: Partial<Message>) => void;
@@ -15,13 +15,13 @@ export declare class QueryEngine {
     private service;
     private session;
     private transcript;
-    private abortSignal;
+    private workerBridge;
     constructor();
     private createSession;
     private ensureSessionDir;
-    /** 处理用户输入 */
+    /** 处理用户输入（在独立 Worker 线程中执行） */
     handleQuery(userInput: string, callbacks: EngineCallbacks): Promise<void>;
-    /** 终止当前任务 */
+    /** 终止当前任务（通知 Worker 中断） */
     abort(): void;
     /** 重置会话 */
     reset(): void;

package/dist/core/QueryEngine.js

@@ -1,19 +1,18 @@
 import { v4 as uuid } from 'uuid';
 import fs from 'fs';
 import path from 'path';
-import { getAllTools } from '../tools/index.js';
-import { executeQuery } from './query.js';
-import { MockService } from '../services/api/mock.js';
-import { LLMServiceImpl } from '../services/api/llm.js';
-import { loadConfig, getActiveModel } from '../config/loader.js';
-import { SESSIONS_DIR } from '../config/constants.js';
-import { setActiveAgent } from '../config/agentState.js';
-import { clearAuthorizations } from './safeguard.js';
+import { WorkerBridge } from './WorkerBridge';
+import { MockService } from '../services/api/mock';
+import { LLMServiceImpl } from '../services/api/llm';
+import { loadConfig, getActiveModel } from '../config/loader';
+import { SESSIONS_DIR } from '../config/constants';
+import { setActiveAgent } from '../config/agentState';
+import { clearAuthorizations } from './safeguard';
 export class QueryEngine {
     service;
     session;
     transcript = [];
-    abortSignal = { aborted: false };
+    workerBridge = new WorkerBridge();
     constructor() {
         // 尝试从配置文件加载 LLM，失败则回退 MockService
         const config = loadConfig();
@@ -47,9 +46,8 @@ export class QueryEngine {
             fs.mkdirSync(SESSIONS_DIR, { recursive: true });
         }
     }
-    /** 处理用户输入 */
+    /** 处理用户输入（在独立 Worker 线程中执行） */
     async handleQuery(userInput, callbacks) {
-        this.abortSignal = { aborted: false };
         const userMsg = {
             id: uuid(),
             type: 'user',
@@ -59,24 +57,25 @@ export class QueryEngine {
         };
         callbacks.onMessage(userMsg);
         this.session.messages.push(userMsg);
-        const queryCallbacks = {
+        // 将回调包装后传给 WorkerBridge，Worker 事件会映射回这里
+        const bridgeCallbacks = {
             onMessage: (msg) => {
                 callbacks.onMessage(msg);
                 this.session.messages.push(msg);
             },
             onUpdateMessage: callbacks.onUpdateMessage,
             onStreamText: (text) => {
-                // 每收到一个 chunk 视为一个 token，实时递增并通知 UI
                 this.session.totalTokens++;
                 callbacks.onStreamText(text);
                 callbacks.onSessionUpdate(this.session);
             },
             onClearStreamText: callbacks.onClearStreamText,
             onLoopStateChange: callbacks.onLoopStateChange,
+            onSessionUpdate: callbacks.onSessionUpdate,
             onConfirmDangerousCommand: callbacks.onConfirmDangerousCommand,
         };
         try {
-            this.transcript = await executeQuery(userInput, this.transcript, getAllTools(), this.service, queryCallbacks, this.abortSignal);
+            this.transcript = await this.workerBridge.run(userInput, this.transcript, bridgeCallbacks);
         }
         catch (err) {
             const errMsg = {
@@ -92,9 +91,9 @@ export class QueryEngine {
         callbacks.onSessionUpdate(this.session);
         this.saveSession();
     }
-    /** 终止当前任务 */
+    /** 终止当前任务（通知 Worker 中断） */
     abort() {
-        this.abortSignal.aborted = true;
+        this.workerBridge.abort();
     }
     /** 重置会话 */
     reset() {
@@ -182,6 +181,9 @@ export class QueryEngine {
             this.saveSession();
             // 恢复会话状态
             this.session = loaded;
+            // 过滤掉 pending 状态的 thinking 消息（上次会话 abort 时可能残留）
+            const cleanedMessages = loaded.messages.filter((m) => !(m.type === 'thinking' && m.status === 'pending'));
+            this.session.messages = cleanedMessages;
             // 从历史消息重建 transcript
             this.transcript = [];
             for (const msg of loaded.messages) {
@@ -208,7 +210,7 @@ export class QueryEngine {
                     });
                 }
             }
-            return { session: this.session, messages: loaded.messages };
+            return { session: this.session, messages: cleanedMessages };
         }
         catch {
             return null;

package/dist/core/WorkerBridge.d.ts

@@ -0,0 +1,9 @@
+import { TranscriptMessage } from '../types/index';
+import { EngineCallbacks } from './QueryEngine';
+export declare class WorkerBridge {
+    private worker;
+    /** 在独立 Worker 线程中执行查询，返回更新后的 transcript */
+    run(userInput: string, transcript: TranscriptMessage[], callbacks: EngineCallbacks): Promise<TranscriptMessage[]>;
+    /** 向 Worker 发送中断信号 */
+    abort(): void;
+}

package/dist/core/WorkerBridge.js

@@ -0,0 +1,109 @@
+/**
+ * WorkerBridge — 主线程侧封装
+ * 负责创建/复用 Worker、转发回调事件、处理危险命令确认的双向通信
+ */
+import { Worker } from 'worker_threads';
+import { fileURLToPath } from 'url';
+import path from 'path';
+// 兼容 ESM __dirname
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+/**
+ * 构造 Worker 实例：
+ * - tsx 开发模式（__filename 以 .ts 结尾）：用内联脚本通过 tsImport 加载 .ts
+ * - tsc 编译后（__filename 以 .js 结尾）：直接加载 .js
+ */
+function createWorker(workerTsPath) {
+    const isTsx = __filename.endsWith('.ts');
+    if (isTsx) {
+        // tsImport 第二个参数是 parent URL，用 file:// 绝对路径代替 import.meta.url
+        const inlineScript = `
+import { tsImport } from 'tsx/esm/api';
+import { workerData } from 'worker_threads';
+import { pathToFileURL } from 'url';
+await tsImport(workerData.__workerFile, pathToFileURL(workerData.__workerFile).href);
+`;
+        return new Worker(inlineScript, {
+            eval: true,
+            workerData: { __workerFile: workerTsPath },
+        });
+    }
+    const jsPath = workerTsPath.replace(/\.ts$/, '.js');
+    return new Worker(jsPath);
+}
+export class WorkerBridge {
+    worker = null;
+    /** 在独立 Worker 线程中执行查询，返回更新后的 transcript */
+    run(userInput, transcript, callbacks) {
+        return new Promise((resolve, reject) => {
+            const workerTsPath = path.join(__dirname, 'queryWorker.ts');
+            const worker = createWorker(workerTsPath);
+            this.worker = worker;
+            worker.on('message', async (msg) => {
+                switch (msg.type) {
+                    case 'message':
+                        callbacks.onMessage(msg.msg);
+                        break;
+                    case 'update_message':
+                        callbacks.onUpdateMessage(msg.id, msg.updates);
+                        break;
+                    case 'stream_text':
+                        callbacks.onStreamText(msg.text);
+                        break;
+                    case 'clear_stream_text':
+                        callbacks.onClearStreamText?.();
+                        break;
+                    case 'loop_state':
+                        callbacks.onLoopStateChange(msg.state);
+                        break;
+                    case 'session_update':
+                        callbacks.onSessionUpdate(msg.session);
+                        break;
+                    case 'danger_confirm_request': {
+                        // 主线程弹出交互式确认，结果回传 Worker
+                        const choice = callbacks.onConfirmDangerousCommand
+                            ? await callbacks.onConfirmDangerousCommand(msg.command, msg.reason, msg.ruleName)
+                            : 'cancel';
+                        const reply = {
+                            type: 'danger_confirm_result',
+                            requestId: msg.requestId,
+                            choice,
+                        };
+                        worker.postMessage(reply);
+                        break;
+                    }
+                    case 'done':
+                        this.worker = null;
+                        worker.terminate();
+                        resolve(msg.transcript);
+                        break;
+                    case 'error':
+                        this.worker = null;
+                        worker.terminate();
+                        reject(new Error(msg.message));
+                        break;
+                }
+            });
+            worker.on('error', (err) => {
+                this.worker = null;
+                reject(err);
+            });
+            worker.on('exit', (code) => {
+                if (code !== 0 && this.worker) {
+                    this.worker = null;
+                    reject(new Error(`Worker 异常退出，code=${code}`));
+                }
+            });
+            // 启动执行
+            const runMsg = { type: 'run', userInput, transcript };
+            worker.postMessage(runMsg);
+        });
+    }
+    /** 向 Worker 发送中断信号 */
+    abort() {
+        if (this.worker) {
+            const msg = { type: 'abort' };
+            this.worker.postMessage(msg);
+        }
+    }
+}

package/dist/core/hint.js

@@ -6,10 +6,10 @@
  */
 import fs from 'fs';
 import path from 'path';
-import { getAgent } from '../agents/index.js';
-import { DEFAULT_AGENT } from '../config/constants.js';
-import { loadConfig, getActiveModel } from '../config/loader.js';
-import { getDefaultConfig } from '../services/api/llm.js';
+import { getAgent } from '../agents/index';
+import { DEFAULT_AGENT } from '../config/constants';
+import { loadConfig, getActiveModel } from '../config/loader';
+import { getDefaultConfig } from '../services/api/llm';
 /** 安全读取 JSON 文件 */
 function readJsonSafe(filePath) {
     try {