@code4bug/jarvis-agent 1.0.3 → 1.1.4

package/dist/core/spawnRegistry.js

@@ -0,0 +1,32 @@
+/**
+ * spawnRegistry — spawn_subagent IPC 挂起请求注册表
+ *
+ * 独立模块，避免 spawnAgent.ts ↔ queryWorker.ts 循环依赖。
+ * queryWorker.ts 和 spawnAgent.ts 都可以安全 import 此模块。
+ */
+/** 等待主线程完成 SubAgent 启动的挂起 Promise，key = requestId */
+export const pendingSpawnRequests = new Map();
+// ===== 运行中 SubAgent 计数器 =====
+/** 当前运行中的 SubAgent 数量 */
+let _activeAgentCount = 0;
+/** 计数变更订阅者列表 */
+const _countListeners = new Set();
+/** 增加运行中 SubAgent 计数 */
+export function incrementActiveAgents() {
+    _activeAgentCount++;
+    _countListeners.forEach((fn) => fn(_activeAgentCount));
+}
+/** 减少运行中 SubAgent 计数 */
+export function decrementActiveAgents() {
+    _activeAgentCount = Math.max(0, _activeAgentCount - 1);
+    _countListeners.forEach((fn) => fn(_activeAgentCount));
+}
+/** 获取当前运行中 SubAgent 数量 */
+export function getActiveAgentCount() {
+    return _activeAgentCount;
+}
+/** 订阅计数变更，返回取消订阅函数 */
+export function subscribeAgentCount(listener) {
+    _countListeners.add(listener);
+    return () => _countListeners.delete(listener);
+}

package/dist/core/subAgentWorker.d.ts

@@ -0,0 +1,89 @@
+import { DangerConfirmResult } from './query.js';
+import { TranscriptMessage, Message, LoopState, SubAgentTask } from '../types/index.js';
+import { BusMessage } from './AgentMessageBus.js';
+export type SubAgentInbound = {
+    type: 'run';
+    task: SubAgentTask;
+} | {
+    type: 'abort';
+} | {
+    type: 'danger_confirm_result';
+    requestId: string;
+    choice: DangerConfirmResult;
+} | {
+    type: 'bus_publish_ack';
+    requestId: string;
+} | {
+    type: 'bus_subscribe_result';
+    requestId: string;
+    message: BusMessage | null;
+} | {
+    type: 'bus_read_history_result';
+    requestId: string;
+    messages: BusMessage[];
+} | {
+    type: 'bus_get_offset_result';
+    requestId: string;
+    offset: number;
+} | {
+    type: 'bus_list_channels_result';
+    requestId: string;
+    channels: string[];
+};
+export type SubAgentOutbound = {
+    type: 'message';
+    taskId: string;
+    msg: Message;
+} | {
+    type: 'update_message';
+    taskId: string;
+    id: string;
+    updates: Partial<Message>;
+} | {
+    type: 'stream_text';
+    taskId: string;
+    text: string;
+} | {
+    type: 'loop_state';
+    taskId: string;
+    state: LoopState;
+} | {
+    type: 'danger_confirm_request';
+    taskId: string;
+    requestId: string;
+    command: string;
+    reason: string;
+    ruleName: string;
+} | {
+    type: 'bus_publish';
+    requestId: string;
+    from: string;
+    channel: string;
+    payload: string;
+} | {
+    type: 'bus_subscribe';
+    requestId: string;
+    channel: string;
+    timeoutMs: number;
+    fromOffset?: number;
+} | {
+    type: 'bus_read_history';
+    requestId: string;
+    channel: string;
+    limit?: number;
+} | {
+    type: 'bus_get_offset';
+    requestId: string;
+    channel: string;
+} | {
+    type: 'bus_list_channels';
+    requestId: string;
+} | {
+    type: 'done';
+    taskId: string;
+    transcript: TranscriptMessage[];
+} | {
+    type: 'error';
+    taskId: string;
+    message: string;
+};

package/dist/core/subAgentWorker.js

@@ -0,0 +1,107 @@
+/**
+ * SubAgent Worker 线程入口
+ *
+ * 每个 SubAgent 运行在独立线程中，拥有完整的 react_loop 能力。
+ * 通过 parentPort 与主线程（SubAgentBridge）双向通信。
+ *
+ * 消息协议：
+ *   主线程 → Worker：SubAgentInbound
+ *   Worker → 主线程：SubAgentOutbound
+ */
+import { parentPort } from 'worker_threads';
+import { executeQuery } from './query.js';
+import { getAllTools } from '../tools/index.js';
+import { LLMServiceImpl, fromModelConfig } from '../services/api/llm.js';
+import { MockService } from '../services/api/mock.js';
+import { loadConfig, getActiveModel } from '../config/loader.js';
+import { pendingBusRequests } from './workerBusProxy.js';
+if (!parentPort)
+    throw new Error('subAgentWorker must run inside worker_threads');
+// ===== 初始化 LLM 服务 =====
+const config = loadConfig();
+const activeModel = getActiveModel(config);
+function buildSubAgentService(role, customSystemPrompt) {
+    const systemPrompt = customSystemPrompt
+        ?? (role
+            ? `${role}\n\n你是一个专注的子任务执行助手。请严格按照任务指令完成工作，输出结构化结果。`
+            : '你是一个专注的子任务执行助手。请严格按照任务指令完成工作，输出结构化结果。');
+    if (activeModel) {
+        try {
+            return new LLMServiceImpl({ ...fromModelConfig(activeModel), systemPrompt });
+        }
+        catch {
+            return new MockService();
+        }
+    }
+    return new MockService();
+}
+// ===== 中断信号 =====
+const abortSignal = { aborted: false };
+// ===== 危险命令确认：挂起 Promise，等待主线程回复 =====
+const pendingConfirms = new Map();
+// ===== 监听主线程消息 =====
+parentPort.on('message', async (msg) => {
+    if (msg.type === 'abort') {
+        abortSignal.aborted = true;
+        return;
+    }
+    if (msg.type === 'danger_confirm_result') {
+        const resolve = pendingConfirms.get(msg.requestId);
+        if (resolve) {
+            pendingConfirms.delete(msg.requestId);
+            resolve(msg.choice);
+        }
+        return;
+    }
+    // MessageBus IPC 回复分发 → 转发给 workerBusProxy 的 pending map
+    if (msg.type === 'bus_publish_ack' ||
+        msg.type === 'bus_subscribe_result' ||
+        msg.type === 'bus_read_history_result' ||
+        msg.type === 'bus_get_offset_result' ||
+        msg.type === 'bus_list_channels_result') {
+        const resolve = pendingBusRequests.get(msg.requestId);
+        if (resolve) {
+            pendingBusRequests.delete(msg.requestId);
+            if (msg.type === 'bus_publish_ack')
+                resolve(undefined);
+            else if (msg.type === 'bus_subscribe_result')
+                resolve(msg.message);
+            else if (msg.type === 'bus_read_history_result')
+                resolve(msg.messages);
+            else if (msg.type === 'bus_get_offset_result')
+                resolve(msg.offset);
+            else if (msg.type === 'bus_list_channels_result')
+                resolve(msg.channels);
+        }
+        return;
+    }
+    if (msg.type === 'run') {
+        abortSignal.aborted = false;
+        const { task } = msg;
+        const { taskId, instruction, allowedTools, contextTranscript, role, systemPrompt } = task;
+        const send = (out) => parentPort.postMessage(out);
+        const service = buildSubAgentService(role, systemPrompt);
+        const tools = getAllTools().filter((t) => !allowedTools || allowedTools.length === 0 || allowedTools.includes(t.name));
+        const callbacks = {
+            onMessage: (m) => send({ type: 'message', taskId, msg: m }),
+            onUpdateMessage: (id, updates) => send({ type: 'update_message', taskId, id, updates }),
+            onStreamText: (text) => send({ type: 'stream_text', taskId, text }),
+            onClearStreamText: () => { },
+            onLoopStateChange: (state) => send({ type: 'loop_state', taskId, state }),
+            onConfirmDangerousCommand: (command, reason, ruleName) => {
+                return new Promise((resolve) => {
+                    const requestId = `${Date.now()}-${Math.random()}`;
+                    pendingConfirms.set(requestId, resolve);
+                    send({ type: 'danger_confirm_request', taskId, requestId, command, reason, ruleName });
+                });
+            },
+        };
+        try {
+            const newTranscript = await executeQuery(instruction, contextTranscript ?? [], tools, service, callbacks, abortSignal);
+            send({ type: 'done', taskId, transcript: newTranscript });
+        }
+        catch (err) {
+            send({ type: 'error', taskId, message: err.message ?? '未知错误' });
+        }
+    }
+});

package/dist/core/workerBusProxy.d.ts

@@ -0,0 +1,10 @@
+import type { BusMessage } from './AgentMessageBus.js';
+/** 等待中的 bus 请求，key = requestId */
+export declare const pendingBusRequests: Map<string, (result: any) => void>;
+export declare const workerBusProxy: {
+    publish(from: string, channel: string, payload: string): Promise<void>;
+    subscribe(channel: string, timeoutMs?: number, fromOffset?: number): Promise<BusMessage | null>;
+    getHistory(channel: string, limit?: number): Promise<BusMessage[]>;
+    getOffset(channel: string): Promise<number>;
+    listChannels(): Promise<string[]>;
+};

package/dist/core/workerBusProxy.js

@@ -0,0 +1,57 @@
+/**
+ * workerBusProxy — Worker 线程侧 MessageBus IPC 代理
+ *
+ * 在 SubAgent Worker 线程中，通过 parentPort 消息将 bus 操作
+ * 转发给主线程（SubAgentBridge）代理执行，绕过线程内存隔离。
+ *
+ * 此文件独立于 subAgentWorker.ts，避免循环依赖。
+ * subAgentWorker.ts 负责注册 pendingBusRequests 的回复分发。
+ */
+import { parentPort } from 'worker_threads';
+/** 等待中的 bus 请求，key = requestId */
+export const pendingBusRequests = new Map();
+function requestId() {
+    return `bus-${Date.now()}-${Math.random().toString(36).slice(2)}`;
+}
+function send(msg) {
+    if (!parentPort)
+        throw new Error('workerBusProxy: 不在 Worker 线程中');
+    parentPort.postMessage(msg);
+}
+export const workerBusProxy = {
+    publish(from, channel, payload) {
+        return new Promise((resolve) => {
+            const reqId = requestId();
+            pendingBusRequests.set(reqId, () => resolve());
+            send({ type: 'bus_publish', requestId: reqId, from, channel, payload });
+        });
+    },
+    subscribe(channel, timeoutMs = 30_000, fromOffset) {
+        return new Promise((resolve) => {
+            const reqId = requestId();
+            pendingBusRequests.set(reqId, (msg) => resolve(msg));
+            send({ type: 'bus_subscribe', requestId: reqId, channel, timeoutMs, fromOffset });
+        });
+    },
+    getHistory(channel, limit) {
+        return new Promise((resolve) => {
+            const reqId = requestId();
+            pendingBusRequests.set(reqId, (msgs) => resolve(msgs));
+            send({ type: 'bus_read_history', requestId: reqId, channel, limit });
+        });
+    },
+    getOffset(channel) {
+        return new Promise((resolve) => {
+            const reqId = requestId();
+            pendingBusRequests.set(reqId, (offset) => resolve(offset));
+            send({ type: 'bus_get_offset', requestId: reqId, channel });
+        });
+    },
+    listChannels() {
+        return new Promise((resolve) => {
+            const reqId = requestId();
+            pendingBusRequests.set(reqId, (channels) => resolve(channels));
+            send({ type: 'bus_list_channels', requestId: reqId });
+        });
+    },
+};

package/dist/hooks/useSlashMenu.d.ts

@@ -1,18 +1,20 @@
-import { Message } from '../types/index';
-import { QueryEngine } from '../core/QueryEngine';
-import { SlashCommand } from '../commands/index';
+import { Message } from '../types/index.js';
+import { QueryEngine } from '../core/QueryEngine.js';
+import { SlashCommand } from '../commands/index.js';
 interface UseSlashMenuOptions {
     engineRef: React.RefObject<QueryEngine | null>;
-    sessionRef: React.MutableRefObject<import('../types/index').Session>;
+    sessionRef: React.MutableRefObject<import('../types/index.js').Session>;
     tokenCountRef: React.MutableRefObject<number>;
     setMessages: React.Dispatch<React.SetStateAction<Message[]>>;
     setDisplayTokens: (n: number) => void;
-    setLoopState: React.Dispatch<React.SetStateAction<import('../types/index').LoopState | null>>;
+    setLoopState: React.Dispatch<React.SetStateAction<import('../types/index.js').LoopState | null>>;
     setIsProcessing: React.Dispatch<React.SetStateAction<boolean>>;
     setShowWelcome: React.Dispatch<React.SetStateAction<boolean>>;
     setInput: React.Dispatch<React.SetStateAction<string>>;
     /** resume 时重置所有流式状态（含 thinkingIdRef） */
     stopAll: () => void;
+    /** /new 命令：开启新会话 */
+    onNewSession: () => void;
 }
 /**
  * 斜杠命令菜单状态管理 hook

package/dist/hooks/useSlashMenu.js

@@ -1,15 +1,15 @@
 import { useState, useCallback } from 'react';
-import { QueryEngine } from '../core/QueryEngine';
-import { filterCommands, filterAgentCommands } from '../commands/index';
-import { setActiveAgent } from '../config/agentState';
-import { executeSlashCommand } from '../screens/slashCommands';
+import { QueryEngine } from '../core/QueryEngine.js';
+import { filterCommands, filterAgentCommands } from '../commands/index.js';
+import { setActiveAgent } from '../config/agentState.js';
+import { executeSlashCommand } from '../screens/slashCommands.js';
 /**
  * 斜杠命令菜单状态管理 hook
  *
  * 管理菜单可见性、选中项、二级菜单（agent / resume）等。
  */
 export function useSlashMenu(opts) {
-    const { engineRef, sessionRef, tokenCountRef, setMessages, setDisplayTokens, setLoopState, setIsProcessing, setShowWelcome, setInput, stopAll, } = opts;
+    const { engineRef, sessionRef, tokenCountRef, setMessages, setDisplayTokens, setLoopState, setIsProcessing, setShowWelcome, setInput, stopAll, onNewSession, } = opts;
     const [slashMenuVisible, setSlashMenuVisible] = useState(false);
     const [slashMenuItems, setSlashMenuItems] = useState([]);
     const [slashMenuIndex, setSlashMenuIndex] = useState(0);
@@ -138,6 +138,10 @@ export function useSlashMenu(opts) {
         if (cmd.category === 'builtin') {
             setInput('');
             setSlashMenuVisible(false);
+            if (cmd.name === 'new') {
+                onNewSession();
+                return;
+            }
             const msg = executeSlashCommand(cmd.name);
             if (msg)
                 setMessages((prev) => [...prev, msg]);

package/dist/hooks/useStreamThrottle.d.ts

@@ -1,4 +1,4 @@
-import { Message } from '../types/index';
+import { Message } from '../types/index.js';
 /**
  * 流式文本 + thinking 文本节流 hook
  *

package/dist/hooks/useTokenDisplay.d.ts

@@ -9,5 +9,6 @@ export declare function useTokenDisplay(): {
     startTokenTimer: () => void;
     stopTokenTimer: () => void;
     updateTokenCount: (count: number) => void;
+    syncTokenDisplay: (count: number) => void;
     resetTokens: () => void;
 };

package/dist/hooks/useTokenDisplay.js

@@ -25,6 +25,10 @@ export function useTokenDisplay() {
     const updateTokenCount = useCallback((count) => {
         tokenCountRef.current = count;
     }, []);
+    const syncTokenDisplay = useCallback((count) => {
+        tokenCountRef.current = count;
+        setDisplayTokens(count);
+    }, []);
     const resetTokens = useCallback(() => {
         tokenCountRef.current = 0;
         setDisplayTokens(0);
@@ -40,6 +44,7 @@ export function useTokenDisplay() {
         startTokenTimer,
         stopTokenTimer,
         updateTokenCount,
+        syncTokenDisplay,
         resetTokens,
     };
 }

package/dist/index.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { render } from 'ink';
-import REPL from './screens/repl';
+import REPL from './screens/repl.js';
 export function startJarvis() {
     render(_jsx(REPL, {}), { exitOnCtrlC: false });
 }

package/dist/screens/repl.js

@@ -2,24 +2,25 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useState, useCallback, useRef, useEffect } from 'react';
 import { Box, Text, useInput, useApp } from 'ink';
 import Spinner from 'ink-spinner';
-import MultilineInput from '../components/MultilineInput';
-import WelcomeHeader from '../components/WelcomeHeader';
-import MessageItem from '../components/MessageItem';
-import StreamingText from '../components/StreamingText';
-import StatusBar from '../components/StatusBar';
-import SlashCommandMenu from '../components/SlashCommandMenu';
-import DangerConfirm from '../components/DangerConfirm';
-import { useWindowFocus } from '../hooks/useFocus';
-import { useInputHistory } from '../hooks/useInputHistory';
-import { useDoubleCtrlCExit } from '../hooks/useDoubleCtrlCExit';
-import { useTerminalWidth } from '../hooks/useTerminalWidth';
-import { useStreamThrottle } from '../hooks/useStreamThrottle';
-import { useTokenDisplay } from '../hooks/useTokenDisplay';
-import { useSlashMenu } from '../hooks/useSlashMenu';
-import { executeSlashCommand } from './slashCommands';
-import { QueryEngine } from '../core/QueryEngine';
-import { HIDE_WELCOME_AFTER_INPUT } from '../config/constants';
-import { generateAgentHint } from '../core/hint';
+import MultilineInput from '../components/MultilineInput.js';
+import WelcomeHeader from '../components/WelcomeHeader.js';
+import MessageItem from '../components/MessageItem.js';
+import StreamingText from '../components/StreamingText.js';
+import StatusBar from '../components/StatusBar.js';
+import SlashCommandMenu from '../components/SlashCommandMenu.js';
+import DangerConfirm from '../components/DangerConfirm.js';
+import { useWindowFocus } from '../hooks/useFocus.js';
+import { useInputHistory } from '../hooks/useInputHistory.js';
+import { useDoubleCtrlCExit } from '../hooks/useDoubleCtrlCExit.js';
+import { useTerminalWidth } from '../hooks/useTerminalWidth.js';
+import { useStreamThrottle } from '../hooks/useStreamThrottle.js';
+import { useTokenDisplay } from '../hooks/useTokenDisplay.js';
+import { useSlashMenu } from '../hooks/useSlashMenu.js';
+import { executeSlashCommand } from './slashCommands.js';
+import { QueryEngine } from '../core/QueryEngine.js';
+import { HIDE_WELCOME_AFTER_INPUT } from '../config/constants.js';
+import { generateAgentHint } from '../core/hint.js';
+import { subscribeAgentCount, getActiveAgentCount } from '../core/spawnRegistry.js';
 export default function REPL() {
     const { exit } = useApp();
     const width = useTerminalWidth();
@@ -33,6 +34,7 @@ export default function REPL() {
     const [showWelcome, setShowWelcome] = useState(true);
     const [showDetails, setShowDetails] = useState(false);
     const [placeholder, setPlaceholder] = useState('');
+    const [activeAgents, setActiveAgents] = useState(getActiveAgentCount());
     const lastEscRef = useRef(0);
     const sessionRef = useRef({
         id: '', messages: [], createdAt: 0, updatedAt: 0, totalTokens: 0, totalCost: 0,
@@ -40,24 +42,45 @@ export default function REPL() {
     const engineRef = useRef(null);
     // 节流 hooks
     const { streamText, streamBufferRef, startStreamTimer, stopStreamTimer, appendStreamChunk, clearStream, handleThinkingUpdate, finishThinking, thinkingIdRef, stopAll, } = useStreamThrottle(setMessages);
-    const { displayTokens, tokenCountRef, startTokenTimer, stopTokenTimer, updateTokenCount, resetTokens, } = useTokenDisplay();
+    const { displayTokens, tokenCountRef, startTokenTimer, stopTokenTimer, updateTokenCount, syncTokenDisplay, resetTokens, } = useTokenDisplay();
+    // ===== 新会话逻辑 =====
+    const handleNewSession = useCallback(() => {
+        if (engineRef.current) {
+            engineRef.current.reset();
+            sessionRef.current = engineRef.current.getSession();
+        }
+        setMessages([]);
+        clearStream();
+        setLoopState(null);
+        setIsProcessing(false);
+        setShowWelcome(true);
+        resetTokens();
+        generateAgentHint().then((hint) => setPlaceholder(hint)).catch(() => { });
+    }, [clearStream, resetTokens]);
     // 斜杠菜单
     const slashMenu = useSlashMenu({
         engineRef, sessionRef, tokenCountRef,
         setMessages,
-        setDisplayTokens: (n) => updateTokenCount(n),
+        setDisplayTokens: (n) => syncTokenDisplay(n),
         setLoopState, setIsProcessing, setShowWelcome, setInput,
         stopAll,
+        onNewSession: handleNewSession,
     });
     // 危险命令确认
     const [dangerConfirm, setDangerConfirm] = useState(null);
     useEffect(() => {
         engineRef.current = new QueryEngine();
         sessionRef.current = engineRef.current.getSession();
+        // 注册持久 UI 回调，供 spawn_agent 后台子 Agent 跨轮次推送消息
+        engineRef.current.registerUIBus((msg) => setMessages((prev) => [...prev, msg]), (id, updates) => setMessages((prev) => prev.map((m) => (m.id === id ? { ...m, ...updates } : m))));
         generateAgentHint().then((hint) => setPlaceholder(hint)).catch((err) => {
             console.error('[hint] 初始化提示失败:', err);
         });
     }, []);
+    // 订阅后台 SubAgent 计数变化
+    useEffect(() => {
+        return subscribeAgentCount((count) => setActiveAgents(count));
+    }, []);
     // ===== Engine Callbacks =====
     const callbacks = {
         onMessage: (msg) => {
@@ -106,6 +129,12 @@ export default function REPL() {
                 setDangerConfirm({ command, reason, ruleName, resolve });
             });
         },
+        onSubAgentMessage: (msg) => {
+            setMessages((prev) => [...prev, msg]);
+        },
+        onSubAgentUpdateMessage: (id, updates) => {
+            setMessages((prev) => prev.map((msg) => (msg.id === id ? { ...msg, ...updates } : msg)));
+        },
     };
     // ===== 提交处理 =====
     const handleSubmit = useCallback(async (value) => {
@@ -121,18 +150,7 @@ export default function REPL() {
                 setInput('');
                 slashMenu.setSlashMenuVisible(false);
                 if (cmdName === 'new') {
-                    // 新会话：重置引擎 + 清空所有状态
-                    if (engineRef.current) {
-                        engineRef.current.reset();
-                        sessionRef.current = engineRef.current.getSession();
-                    }
-                    setMessages([]);
-                    clearStream();
-                    setLoopState(null);
-                    setIsProcessing(false);
-                    setShowWelcome(true);
-                    resetTokens();
-                    generateAgentHint().then((hint) => setPlaceholder(hint)).catch(() => { });
+                    handleNewSession();
                 }
                 else if (cmdName === 'session_clear') {
                     if (engineRef.current) {
@@ -228,7 +246,7 @@ export default function REPL() {
         setInput('');
         clearStream();
         await engineRef.current.handleQuery(trimmed, callbacks);
-    }, [isProcessing, pushHistory, clearStream, resetTokens, slashMenu]);
+    }, [isProcessing, pushHistory, clearStream, resetTokens, slashMenu, handleNewSession]);
     // ===== 输入处理 =====
     const handleUpArrow = useCallback(() => {
         const result = navigateUp(input);
@@ -366,5 +384,5 @@ export default function REPL() {
     return (_jsxs(Box, { flexDirection: "column", width: width, children: [showWelcome && _jsx(WelcomeHeader, { width: width }), _jsxs(Box, { flexDirection: "column", paddingX: 1, marginTop: showWelcome ? 0 : 1, children: [messages.map((msg) => (_jsx(MessageItem, { msg: msg, showDetails: showDetails }, msg.id))), streamText && _jsx(StreamingText, { text: streamText }), dangerConfirm && (_jsx(DangerConfirm, { command: dangerConfirm.command, reason: dangerConfirm.reason, ruleName: dangerConfirm.ruleName, onSelect: (choice) => {
                             dangerConfirm.resolve(choice);
                             setDangerConfirm(null);
-                        } })), loopState?.isRunning && (_jsxs(Box, { children: [_jsx(Text, { color: "yellow", children: _jsx(Spinner, { type: "dots" }) }), _jsxs(Text, { color: "gray", children: [" iteration ", loopState.iteration, "/", loopState.maxIterations] })] }))] }), _jsxs(Box, { flexDirection: "column", paddingX: 1, children: [_jsx(Text, { color: "gray", children: '─'.repeat(Math.max(width - 2, 1)) }), slashMenu.slashMenuVisible && !isProcessing && (_jsx(SlashCommandMenu, { commands: slashMenu.slashMenuItems, selectedIndex: slashMenu.slashMenuIndex })), _jsx(Box, { children: countdown !== null ? (_jsxs(Box, { children: [_jsx(Text, { color: "gray", dimColor: true, children: "\u276F " }), _jsx(Text, { color: "yellow", children: "Press " }), _jsx(Text, { color: "yellow", bold: true, children: "Ctrl+C" }), _jsx(Text, { color: "yellow", children: " again to exit " }), _jsxs(Text, { color: "gray", dimColor: true, children: ["(", countdown, "s)"] })] })) : isProcessing ? (_jsxs(Box, { children: [_jsx(Text, { color: "cyan", bold: true, children: "\u276F " }), _jsx(Text, { color: "yellow", children: _jsx(Spinner, { type: "dots" }) }), _jsx(Text, { color: "gray", italic: true, children: " processing..." })] })) : (_jsxs(Box, { children: [_jsx(Text, { color: "cyan", bold: true, children: "\u276F " }), _jsx(MultilineInput, { value: input, onChange: handleInputChange, onSubmit: handleSubmit, onUpArrow: handleUpArrow, onDownArrow: handleDownArrow, placeholder: placeholder, isActive: !isProcessing, showCursor: windowFocused && !isProcessing, slashMenuActive: slashMenu.slashMenuVisible, onSlashMenuUp: slashMenu.handleSlashMenuUp, onSlashMenuDown: slashMenu.handleSlashMenuDown, onSlashMenuSelect: slashMenu.handleSlashMenuSelect, onSlashMenuClose: slashMenu.handleSlashMenuClose, onTabFillPlaceholder: handleTabFillPlaceholder })] })) }), _jsx(Text, { color: "gray", children: '─'.repeat(Math.max(width - 2, 1)) }), _jsx(StatusBar, { width: width - 2, totalTokens: displayTokens })] })] }));
+                        } })), loopState?.isRunning && (_jsxs(Box, { children: [_jsx(Text, { color: "yellow", children: _jsx(Spinner, { type: "dots" }) }), _jsxs(Text, { color: "gray", children: [" iteration ", loopState.iteration, "/", loopState.maxIterations] })] }))] }), _jsxs(Box, { flexDirection: "column", paddingX: 1, children: [_jsx(Text, { color: "gray", children: '─'.repeat(Math.max(width - 2, 1)) }), slashMenu.slashMenuVisible && !isProcessing && (_jsx(SlashCommandMenu, { commands: slashMenu.slashMenuItems, selectedIndex: slashMenu.slashMenuIndex })), _jsx(Box, { children: countdown !== null ? (_jsxs(Box, { children: [_jsx(Text, { color: "gray", dimColor: true, children: "\u276F " }), _jsx(Text, { color: "yellow", children: "Press " }), _jsx(Text, { color: "yellow", bold: true, children: "Ctrl+C" }), _jsx(Text, { color: "yellow", children: " again to exit " }), _jsxs(Text, { color: "gray", dimColor: true, children: ["(", countdown, "s)"] })] })) : isProcessing ? (_jsxs(Box, { children: [_jsx(Text, { color: "cyan", bold: true, children: "\u276F " }), _jsx(Text, { color: "yellow", children: _jsx(Spinner, { type: "dots" }) }), _jsx(Text, { color: "gray", italic: true, children: " processing..." })] })) : (_jsxs(Box, { children: [_jsx(Text, { color: "cyan", bold: true, children: "\u276F " }), _jsx(MultilineInput, { value: input, onChange: handleInputChange, onSubmit: handleSubmit, onUpArrow: handleUpArrow, onDownArrow: handleDownArrow, placeholder: placeholder, isActive: !isProcessing, showCursor: windowFocused && !isProcessing, slashMenuActive: slashMenu.slashMenuVisible, onSlashMenuUp: slashMenu.handleSlashMenuUp, onSlashMenuDown: slashMenu.handleSlashMenuDown, onSlashMenuSelect: slashMenu.handleSlashMenuSelect, onSlashMenuClose: slashMenu.handleSlashMenuClose, onTabFillPlaceholder: handleTabFillPlaceholder })] })) }), _jsx(Text, { color: "gray", children: '─'.repeat(Math.max(width - 2, 1)) }), _jsx(StatusBar, { width: width - 2, totalTokens: displayTokens, activeAgents: activeAgents })] })] }));
 }

package/dist/screens/slashCommands.d.ts

@@ -1,4 +1,4 @@
-import { Message } from '../types/index';
+import { Message } from '../types/index.js';
 /**
  * 斜杠命令执行器
  *

package/dist/screens/slashCommands.js

@@ -1,8 +1,8 @@
-import { executeInit } from '../commands/init';
-import { APP_VERSION } from '../config/constants';
-import { allTools } from '../tools/index';
-import { listSkills } from '../skills/index';
-import { getExternalSkillsDir } from '../skills/loader';
+import { executeInit } from '../commands/init.js';
+import { APP_VERSION } from '../config/constants.js';
+import { allTools } from '../tools/index.js';
+import { listSkills } from '../skills/index.js';
+import { getExternalSkillsDir } from '../skills/loader.js';
 import { listPermanentAuthorizations, DANGER_RULES, } from '../core/safeguard.js';
 /**
  * 斜杠命令执行器
@@ -89,7 +89,8 @@ export function executeSlashCommand(cmdName) {
             const parts = [];
             parts.push('### Built-in Tools\n');
             allTools.forEach((t, i) => {
-                parts.push(`${i + 1}. \`${t.name}\` - ${t.description.slice(0, 60)}`);
+                const summary = t.description.split('\n')[0].slice(0, 80);
+                parts.push(`${i + 1}. \`${t.name}\` - ${summary}`);
             });
             parts.push('');
             parts.push(`### External Skills\n`);

package/dist/services/api/llm.d.ts

@@ -6,8 +6,8 @@
  *   2. ~/.jarvis/config.json
  *   3. ./.jarvis/config.json
  */
-import { LLMService, StreamCallbacks, TranscriptMessage, Tool, AbortSignal as AppAbortSignal } from '../../types/index';
-import { ModelConfig } from '../../config/loader';
+import { LLMService, StreamCallbacks, TranscriptMessage, Tool, AbortSignal as AppAbortSignal } from '../../types/index.js';
+import { ModelConfig } from '../../config/loader.js';
 export interface LLMConfig {
     apiKey: string;
     model: string;
@@ -16,6 +16,8 @@ export interface LLMConfig {
     temperature?: number;
     /** 额外请求体参数，直接合并到 API 请求 body */
     extraBody?: Record<string, unknown>;
+    /** 直接指定 system prompt，跳过 agent 文件加载（SubAgent 场景使用） */
+    systemPrompt?: string;
 }
 /** 从配置文件构建 LLMConfig，找不到则回退环境变量 */
 export declare function getDefaultConfig(): LLMConfig;

package/dist/services/api/llm.js

@@ -6,11 +6,11 @@
  *   2. ~/.jarvis/config.json
  *   3. ./.jarvis/config.json
  */
-import { loadConfig, getActiveModel } from '../../config/loader';
-import { getAgent } from '../../agents/index';
-import { DEFAULT_AGENT } from '../../config/constants';
-import { getActiveAgent } from '../../config/agentState';
-import { getSystemInfoPrompt } from '../../config/systemInfo';
+import { loadConfig, getActiveModel } from '../../config/loader.js';
+import { getAgent } from '../../agents/index.js';
+import { DEFAULT_AGENT } from '../../config/constants.js';
+import { getActiveAgent } from '../../config/agentState.js';
+import { getSystemInfoPrompt } from '../../config/systemInfo.js';
 /** 从配置文件构建 LLMConfig，找不到则回退环境变量 */
 export function getDefaultConfig() {
     const jarvisCfg = loadConfig();
@@ -142,6 +142,11 @@ export class LLMServiceImpl {
         if (!this.config.apiKey) {
             throw new Error('API_KEY 未配置。请在 .jarvis/config.json 或环境变量中设置。');
         }
+        // 若外部直接传入 systemPrompt（SubAgent 场景），直接使用，跳过 agent 文件加载
+        if (this.config.systemPrompt) {
+            this.systemPrompt = this.config.systemPrompt;
+            return;
+        }
         // 从当前激活的智能体加载 system prompt（运行时动态读取）
         const currentAgent = getActiveAgent(DEFAULT_AGENT);
         const agent = getAgent(currentAgent);
@@ -157,7 +162,16 @@ export class LLMServiceImpl {
             '安全围栏会自动处理拦截和用户确认流程。';
         // 追加系统环境信息，帮助 LLM 感知用户运行环境
         const systemInfo = getSystemInfoPrompt();
-        this.systemPrompt = agentPrompt + roleBoundary + systemInfo;
+        // 追加当前激活模型信息
+        const jarvisCfg = loadConfig();
+        const activeModelCfg = getActiveModel(jarvisCfg);
+        const activeModelKey = jarvisCfg.system.model ?? 'unknown';
+        const modelInfo = '\n\n---\n[当前模型] 以下是本次会话使用的 LLM 模型信息：' +
+            `\n- 模型标识: ${activeModelKey}` +
+            `\n- 模型名称: ${activeModelCfg?.model ?? 'unknown'}` +
+            `\n- API 地址: ${activeModelCfg?.api_url ?? 'unknown'}` +
+            `\n- 最大 Token: ${activeModelCfg?.max_tokens ?? 'unknown'}`;
+        this.systemPrompt = agentPrompt + roleBoundary + systemInfo + modelInfo;
     }
     async streamMessage(transcript, tools, callbacks, abortSignal) {
         const messages = toOpenAIMessages(transcript, this.systemPrompt);