@code4bug/jarvis-agent 1.3.1 → 1.3.2

package/dist/components/MultilineInput.js

@@ -18,6 +18,8 @@ const IME_COMPOSE_WINDOW_MS = 80;
 const isAsciiLowerAlpha = (s) => /^[a-z]+$/.test(s);
 /** 判断字符串是否包含非 ASCII 字符（中文、日文等 CJK 字符） */
 const hasNonAscii = (s) => /[^\x00-\x7F]/.test(s);
+const charDisplayWidth = (ch) => /[^\u0000-\u00ff]/.test(ch) ? 2 : 1;
+const textDisplayWidth = (text) => Array.from(text).reduce((sum, ch) => sum + charDisplayWidth(ch), 0);
 /**
  * 多行文本输入组件，支持光标移动和粘贴折叠。
  *
@@ -289,7 +291,19 @@ export default function MultilineInput({ value, onChange, onSubmit, onUpArrow, o
         clearImeBufferWithInsertedLenRollback,
     });
     useInput(() => { }, { isActive });
-    useTerminalCursorSync({ showCursor, isActive, rowsBelow });
+    const lines = value.length > 0 ? value.split('\n') : [''];
+    const { row: cursorRow, col: cursorCol } = getCursorRowCol(value, cursor);
+    const activeLine = lines[cursorRow] ?? '';
+    const beforeCursor = activeLine.slice(0, cursorCol);
+    const cursorColumn = 3 + textDisplayWidth(beforeCursor);
+    useTerminalCursorSync({
+        showCursor,
+        isActive,
+        rowsBelow,
+        cursorRow,
+        rowsInInput: lines.length,
+        cursorColumn,
+    });
     return (_jsx(InputTextView, { value: value, cursor: cursor, placeholder: placeholder, showCursor: showCursor, onResetPastedChunks: () => {
             if (pasteCountRef.current > 0) {
                 pasteCountRef.current = 0;

package/dist/core/WorkerBridge.d.ts

@@ -2,6 +2,9 @@ import { TranscriptMessage } from '../types/index.js';
 import { EngineCallbacks } from './QueryEngine.js';
 export declare class WorkerBridge {
     private worker;
+    private currentRun;
+    private finalizeRun;
+    private buildAbortedTranscript;
     /** 在独立 Worker 线程中执行查询，返回更新后的 transcript */
     run(userInput: string, transcript: TranscriptMessage[], callbacks: EngineCallbacks, options?: {
         includeUserProfile?: boolean;

package/dist/core/WorkerBridge.js

@@ -36,12 +36,61 @@ await tsImport(workerData.__workerFile, pathToFileURL(workerData.__workerFile).h
 }
 export class WorkerBridge {
     worker = null;
+    currentRun = null;
+    finalizeRun(worker, action, payload) {
+        const run = this.currentRun;
+        if (!run || run.worker !== worker || run.settled)
+            return;
+        run.settled = true;
+        if (run.abortTimer) {
+            clearTimeout(run.abortTimer);
+            run.abortTimer = null;
+        }
+        this.currentRun = null;
+        this.worker = null;
+        worker.terminate().catch(() => { });
+        if (action === 'resolve') {
+            run.resolve(payload);
+        }
+        else {
+            run.reject(payload);
+        }
+    }
+    buildAbortedTranscript(transcript, userInput) {
+        const abortNotice = '[系统提示] 用户中断了上一轮回复（按下 ESC）。上一条助手消息可能不完整，请在后续回复中注意这一点。';
+        const nextTranscript = [...transcript];
+        const lastMessage = nextTranscript[nextTranscript.length - 1];
+        if (userInput.trim()) {
+            const hasSameTrailingUserInput = lastMessage?.role === 'user' && lastMessage.content === userInput;
+            if (!hasSameTrailingUserInput) {
+                nextTranscript.push({ role: 'user', content: userInput });
+            }
+        }
+        nextTranscript.push({ role: 'user', content: abortNotice });
+        return nextTranscript;
+    }
     /** 在独立 Worker 线程中执行查询，返回更新后的 transcript */
     run(userInput, transcript, callbacks, options) {
         return new Promise((resolve, reject) => {
             const workerTsPath = path.join(__dirname, 'queryWorker.ts');
             const worker = createWorker(workerTsPath);
             this.worker = worker;
+            this.currentRun = {
+                worker,
+                resolve,
+                reject,
+                transcript,
+                userInput,
+                callbacks,
+                settled: false,
+                abortTimer: null,
+                lastLoopState: {
+                    iteration: 0,
+                    maxIterations: 0,
+                    isRunning: true,
+                    aborted: false,
+                },
+            };
             logInfo('worker_bridge.run.start', {
                 inputLength: userInput.length,
                 transcriptLength: transcript.length,
@@ -61,6 +110,9 @@ export class WorkerBridge {
                         callbacks.onClearStreamText?.();
                         break;
                     case 'loop_state':
+                        if (this.currentRun?.worker === worker) {
+                            this.currentRun.lastLoopState = msg.state;
+                        }
                         callbacks.onLoopStateChange(msg.state);
                         break;
                     case 'session_update':
@@ -146,31 +198,25 @@ export class WorkerBridge {
                         break;
                     }
                     case 'done':
-                        this.worker = null;
-                        worker.terminate();
                         logInfo('worker_bridge.run.done', {
                             transcriptLength: msg.transcript.length,
                         });
-                        resolve(msg.transcript);
+                        this.finalizeRun(worker, 'resolve', msg.transcript);
                         break;
                     case 'error':
-                        this.worker = null;
-                        worker.terminate();
                         logError('worker_bridge.run.error', msg.message);
-                        reject(new Error(msg.message));
+                        this.finalizeRun(worker, 'reject', new Error(msg.message));
                         break;
                 }
             });
             worker.on('error', (err) => {
-                this.worker = null;
                 logError('worker_bridge.worker_error', err);
-                reject(err);
+                this.finalizeRun(worker, 'reject', err);
             });
             worker.on('exit', (code) => {
-                if (code !== 0 && this.worker) {
-                    this.worker = null;
+                if (code !== 0 && this.currentRun?.worker === worker && !this.currentRun.settled) {
                     logError('worker_bridge.worker_exit_abnormal', undefined, { code });
-                    reject(new Error(`Worker 异常退出，code=${code}`));
+                    this.finalizeRun(worker, 'reject', new Error(`Worker 异常退出，code=${code}`));
                 }
             });
             // 启动执行
@@ -180,10 +226,23 @@ export class WorkerBridge {
     }
     /** 向 Worker 发送中断信号 */
     abort() {
-        if (this.worker) {
-            logWarn('worker_bridge.abort_forwarded');
-            const msg = { type: 'abort' };
-            this.worker.postMessage(msg);
-        }
+        const run = this.currentRun;
+        if (!run || run.settled)
+            return;
+        logWarn('worker_bridge.abort_forwarded');
+        const msg = { type: 'abort' };
+        run.worker.postMessage(msg);
+        run.callbacks.onClearStreamText?.();
+        run.callbacks.onLoopStateChange({
+            ...run.lastLoopState,
+            isRunning: false,
+            aborted: true,
+        });
+        run.abortTimer = setTimeout(() => {
+            if (!this.currentRun || this.currentRun.worker !== run.worker || this.currentRun.settled)
+                return;
+            logWarn('worker_bridge.abort_force_resolve');
+            this.finalizeRun(run.worker, 'resolve', this.buildAbortedTranscript(run.transcript, run.userInput));
+        }, 120);
     }
 }

package/dist/core/query.js

@@ -352,21 +352,59 @@ function canRunInParallelDirect(calls) {
 /** 在独立 Worker 线程中执行单个工具，返回结果字符串 */
 function runToolInWorker(tc, abortSignal) {
     return new Promise((resolve, reject) => {
+        let settled = false;
+        let abortForwarded = false;
+        let abortPollTimer = null;
+        let forceTerminateTimer = null;
+        const cleanup = () => {
+            if (abortPollTimer !== null) {
+                clearInterval(abortPollTimer);
+                abortPollTimer = null;
+            }
+            if (forceTerminateTimer !== null) {
+                clearTimeout(forceTerminateTimer);
+                forceTerminateTimer = null;
+            }
+        };
+        const safeResolve = (result) => {
+            if (settled)
+                return;
+            settled = true;
+            cleanup();
+            worker.terminate().catch(() => { });
+            resolve(result);
+        };
+        const safeReject = (err) => {
+            if (settled)
+                return;
+            settled = true;
+            cleanup();
+            worker.terminate().catch(() => { });
+            reject(err);
+        };
         const isTsx = __filename.endsWith('.ts');
         const workerScript = isTsx
             ? `
 import { tsImport } from 'tsx/esm/api';
 import { workerData, parentPort } from 'worker_threads';
 import { pathToFileURL } from 'url';
+const abortSignal = { aborted: Boolean(workerData.abortSignal?.aborted) };
+parentPort.on('message', (msg) => {
+  if (msg?.type === 'abort') abortSignal.aborted = true;
+});
 const mod = await tsImport(workerData.__file, pathToFileURL(workerData.__file).href);
-const result = await mod.runToolDirect(workerData.tc, workerData.abortSignal);
-parentPort.postMessage({ result });
+const result = await mod.runToolDirect(workerData.tc, abortSignal);
+parentPort.postMessage({ type: 'result', result });
 `
             : `
 import { runToolDirect } from '${__filename.replace(/\.ts$/, '.js')}';
 import { workerData, parentPort } from 'worker_threads';
-const result = await runToolDirect(workerData.tc, workerData.abortSignal);
-parentPort.postMessage({ result });
+const abortSignal = { aborted: Boolean(workerData.abortSignal?.aborted) };
+parentPort.on('message', (msg) => {
+  if (msg?.type === 'abort') abortSignal.aborted = true;
+});
+const result = await runToolDirect(workerData.tc, abortSignal);
+parentPort.postMessage({ type: 'result', result });
 `;
         const worker = new Worker(workerScript, {
             eval: true,
@@ -376,17 +414,37 @@ parentPort.postMessage({ result });
                 abortSignal: { aborted: abortSignal.aborted },
             },
         });
+        abortPollTimer = setInterval(() => {
+            if (!abortSignal.aborted || abortForwarded || settled)
+                return;
+            abortForwarded = true;
+            logWarn('tool.worker.abort_forwarded', { toolName: tc.name });
+            worker.postMessage({ type: 'abort' });
+            forceTerminateTimer = setTimeout(() => {
+                if (settled)
+                    return;
+                logWarn('tool.worker.force_terminated', { toolName: tc.name });
+                safeResolve('(工具执行被中断)');
+            }, 1500);
+        }, 50);
         worker.on('message', (msg) => {
-            worker.terminate();
-            resolve(msg.result);
+            if (msg.type === 'result') {
+                safeResolve(msg.result ?? '');
+            }
         });
         worker.on('error', (err) => {
-            worker.terminate();
-            reject(err);
+            safeReject(err);
         });
         worker.on('exit', (code) => {
-            if (code !== 0)
-                reject(new Error(`工具 Worker 异常退出 code=${code}`));
+            if (settled)
+                return;
+            if (abortSignal.aborted) {
+                safeResolve('(工具执行被中断)');
+                return;
+            }
+            if (code !== 0) {
+                safeReject(new Error(`工具 Worker 异常退出 code=${code}`));
+            }
         });
     });
 }

package/dist/hooks/useTerminalCursorSync.d.ts

@@ -2,7 +2,10 @@ interface UseTerminalCursorSyncOptions {
     showCursor: boolean;
     isActive: boolean;
     rowsBelow: number;
+    cursorRow?: number;
+    rowsInInput?: number;
+    cursorColumn?: number;
     delayMs?: number;
 }
-export declare function useTerminalCursorSync({ showCursor, isActive, rowsBelow, delayMs, }: UseTerminalCursorSyncOptions): void;
+export declare function useTerminalCursorSync({ showCursor, isActive, rowsBelow, cursorRow, rowsInInput, cursorColumn, delayMs, }: UseTerminalCursorSyncOptions): void;
 export {};

package/dist/hooks/useTerminalCursorSync.js

@@ -1,6 +1,6 @@
 import { useEffect, useRef } from 'react';
 import { moveCursorToColumn, relocateCursorToInputLine } from '../terminal/cursor.js';
-export function useTerminalCursorSync({ showCursor, isActive, rowsBelow, delayMs = 80, }) {
+export function useTerminalCursorSync({ showCursor, isActive, rowsBelow, cursorRow = 0, rowsInInput = 1, cursorColumn = 3, delayMs = 80, }) {
     const cursorRelocTimerRef = useRef(null);
     const lastCursorCommandRef = useRef('');
     useEffect(() => {
@@ -27,11 +27,13 @@ export function useTerminalCursorSync({ showCursor, isActive, rowsBelow, delayMs
         else {
             cursorRelocTimerRef.current = setTimeout(() => {
                 cursorRelocTimerRef.current = null;
-                const commandKey = `input:${rowsBelow}:3`;
+                const extraRowsUp = Math.max(rowsInInput - 1 - cursorRow, 0);
+                const safeColumn = Math.max(cursorColumn, 1);
+                const commandKey = `input:${rowsBelow}:${extraRowsUp}:${safeColumn}`;
                 if (lastCursorCommandRef.current === commandKey)
                     return;
                 lastCursorCommandRef.current = commandKey;
-                relocateCursorToInputLine(rowsBelow, 3);
+                relocateCursorToInputLine(rowsBelow, safeColumn, extraRowsUp);
             }, delayMs);
         }
         return () => {
@@ -40,5 +42,5 @@ export function useTerminalCursorSync({ showCursor, isActive, rowsBelow, delayMs
                 cursorRelocTimerRef.current = null;
             }
         };
-    }, [showCursor, isActive, rowsBelow, delayMs]);
+    }, [showCursor, isActive, rowsBelow, cursorRow, rowsInInput, cursorColumn, delayMs]);
 }

package/dist/screens/repl.js

@@ -39,6 +39,7 @@ export default function REPL() {
     const [placeholder, setPlaceholder] = useState('');
     const [activeAgents, setActiveAgents] = useState(getActiveAgentCount());
     const lastEscRef = useRef(0);
+    const abortRequestedRef = useRef(false);
     const lastAbortNoticeRef = useRef(0);
     const sessionRef = useRef({
         id: '', messages: [], createdAt: 0, updatedAt: 0, totalTokens: 0, totalCost: 0,
@@ -67,6 +68,34 @@ export default function REPL() {
                 abortHint: '推理已中断（ESC）',
             }]);
     }, []);
+    const markPendingMessagesAborted = useCallback(() => {
+        setMessages((prev) => prev
+            .filter((msg) => !(msg.type === 'thinking' && msg.status === 'pending'))
+            .map((msg) => {
+            if (msg.status !== 'pending')
+                return msg;
+            if (msg.type === 'tool_exec') {
+                return {
+                    ...msg,
+                    status: 'aborted',
+                    content: `${msg.toolName || '工具'} 已中断`,
+                    abortHint: msg.abortHint ?? '命令已中断（ESC）',
+                };
+            }
+            return msg;
+        }));
+        finishThinking();
+        clearStream();
+    }, [clearStream, finishThinking]);
+    const requestAbort = useCallback(() => {
+        if (!isProcessing || !engineRef.current || abortRequestedRef.current)
+            return;
+        abortRequestedRef.current = true;
+        logWarn('ui.abort_by_escape');
+        markPendingMessagesAborted();
+        appendAbortNotice();
+        engineRef.current.abort();
+    }, [appendAbortNotice, isProcessing, markPendingMessagesAborted]);
     // ===== 新会话逻辑 =====
     const handleNewSession = useCallback(() => {
         logInfo('ui.new_session');
@@ -78,6 +107,7 @@ export default function REPL() {
         clearStream();
         setLoopState(null);
         setIsProcessing(false);
+        abortRequestedRef.current = false;
         setShowWelcome(true);
         resetTokens();
         generateAgentHint().then((hint) => setPlaceholder(hint)).catch(() => { });
@@ -145,6 +175,7 @@ export default function REPL() {
                 startStreamTimer();
             }
             else {
+                abortRequestedRef.current = false;
                 stopAll();
             }
         },
@@ -227,6 +258,7 @@ export default function REPL() {
                     setShowWelcome(false);
                 pushHistory(trimmed);
                 clearStream();
+                abortRequestedRef.current = false;
                 await engineRef.current.handleQuery(prompt, callbacks);
                 return;
             }
@@ -285,6 +317,7 @@ export default function REPL() {
         pushHistory(trimmed);
         setInput('');
         clearStream();
+        abortRequestedRef.current = false;
         await engineRef.current.handleQuery(trimmed, callbacks);
     }, [isProcessing, pushHistory, clearStream, slashMenu, handleNewSession]);
     // ===== 输入处理 =====
@@ -380,9 +413,8 @@ export default function REPL() {
                 handleCtrlC();
                 return;
             }
-            if (key.escape && engineRef.current) {
-                appendAbortNotice();
-                engineRef.current.abort();
+            if (key.escape) {
+                requestAbort();
                 return;
             }
             if (key.ctrl && ch === 'o') {
@@ -418,10 +450,8 @@ export default function REPL() {
             return;
         }
         if (key.escape) {
-            if (isProcessing && engineRef.current) {
-                logWarn('ui.abort_by_escape');
-                appendAbortNotice();
-                engineRef.current.abort();
+            if (isProcessing) {
+                requestAbort();
             }
             else if (input.length > 0) {
                 const now = Date.now();

package/dist/terminal/cursor.d.ts

@@ -3,4 +3,4 @@ export declare function showTerminalCursor(): void;
 export declare function enableBracketedPaste(): void;
 export declare function disableBracketedPaste(): void;
 export declare function moveCursorToColumn(column: number): void;
-export declare function relocateCursorToInputLine(rowsBelow: number, column: number): void;
+export declare function relocateCursorToInputLine(rowsBelow: number, column: number, extraRowsUp?: number): void;

package/dist/terminal/cursor.js

@@ -14,8 +14,9 @@ export function disableBracketedPaste() {
 export function moveCursorToColumn(column) {
     process.stdout.write(`${ESC}${column}G`);
 }
-export function relocateCursorToInputLine(rowsBelow, column) {
-    const up = rowsBelow > 0 ? `${ESC}${rowsBelow}A` : '';
-    const down = rowsBelow > 0 ? `${ESC}${rowsBelow}B` : '';
+export function relocateCursorToInputLine(rowsBelow, column, extraRowsUp = 0) {
+    const totalRowsUp = Math.max(rowsBelow + extraRowsUp, 0);
+    const up = totalRowsUp > 0 ? `${ESC}${totalRowsUp}A` : '';
+    const down = totalRowsUp > 0 ? `${ESC}${totalRowsUp}B` : '';
     process.stdout.write(`${up}${ESC}${column}G${down}`);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@code4bug/jarvis-agent",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "基于 React + TypeScript + Ink 构建的命令行智能体交互界面",
   "type": "module",
   "main": "dist/index.js",