@code4bug/jarvis-agent 1.0.4 → 1.1.5

package/dist/core/subAgentWorker.js

@@ -0,0 +1,121 @@
+/**
+ * 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';
+import { logError, logInfo, logWarn } from './logger.js';
+if (!parentPort)
+    throw new Error('subAgentWorker must run inside worker_threads');
+logInfo('subagent_worker.ready');
+// ===== 初始化 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;
+        logWarn('subagent_worker.abort_received');
+        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;
+        logInfo('subagent_worker.run.start', {
+            taskId,
+            inputLength: instruction.length,
+            allowedTools,
+            transcriptLength: contextTranscript?.length ?? 0,
+        });
+        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);
+            logInfo('subagent_worker.run.done', {
+                taskId,
+                transcriptLength: newTranscript.length,
+            });
+            send({ type: 'done', taskId, transcript: newTranscript });
+        }
+        catch (err) {
+            logError('subagent_worker.run.failed', err, { taskId });
+            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

@@ -13,6 +13,8 @@ interface UseSlashMenuOptions {
     setInput: React.Dispatch<React.SetStateAction<string>>;
     /** resume 时重置所有流式状态（含 thinkingIdRef） */
     stopAll: () => void;
+    /** /new 命令：开启新会话 */
+    onNewSession: () => void;
 }
 /**
  * 斜杠命令菜单状态管理 hook

package/dist/hooks/useSlashMenu.js

@@ -9,7 +9,7 @@ import { executeSlashCommand } from '../screens/slashCommands.js';
  * 管理菜单可见性、选中项、二级菜单（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/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,8 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { render } from 'ink';
+import { logInfo } from './core/logger.js';
 import REPL from './screens/repl.js';
 export function startJarvis() {
+    logInfo('app.render.start');
     render(_jsx(REPL, {}), { exitOnCtrlC: false });
 }

package/dist/screens/repl.js

@@ -20,6 +20,8 @@ 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';
+import { logError, logInfo, logWarn } from '../core/logger.js';
 export default function REPL() {
     const { exit } = useApp();
     const width = useTerminalWidth();
@@ -33,6 +35,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,23 +43,50 @@ 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(() => {
+        logInfo('ui.new_session');
+        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) => {
+            logError('ui.hint.init_failed', err);
             console.error('[hint] 初始化提示失败:', err);
         });
+        logInfo('ui.repl.mounted');
+        return () => {
+            logInfo('ui.repl.unmounted');
+        };
+    }, []);
+    // 订阅后台 SubAgent 计数变化
+    useEffect(() => {
+        return subscribeAgentCount((count) => setActiveAgents(count));
     }, []);
     // ===== Engine Callbacks =====
     const callbacks = {
@@ -106,12 +136,22 @@ 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) => {
         const trimmed = value.trim();
         if (!trimmed || isProcessing || !engineRef.current)
             return;
+        logInfo('ui.submit', {
+            inputLength: trimmed.length,
+            isSlashCommand: trimmed.startsWith('/'),
+        });
         if (trimmed.startsWith('/')) {
             const parts = trimmed.slice(1).split(/\s+/);
             const cmdName = parts[0].toLowerCase();
@@ -121,18 +161,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 +257,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);
@@ -341,12 +370,15 @@ export default function REPL() {
             setShowWelcome(true);
             resetTokens();
             generateAgentHint().then((hint) => setPlaceholder(hint)).catch((err) => {
+                logError('ui.hint.reset_failed', err);
                 console.error('[hint] 重新生成提示失败:', err);
             });
+            logInfo('ui.clear_screen_reset');
             return;
         }
         if (key.escape) {
             if (isProcessing && engineRef.current) {
+                logWarn('ui.abort_by_escape');
                 engineRef.current.abort();
             }
             else if (input.length > 0) {
@@ -366,5 +398,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.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

@@ -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

@@ -11,6 +11,7 @@ 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';
+import { readUserProfile } from '../../config/userProfile.js';
 /** 从配置文件构建 LLMConfig，找不到则回退环境变量 */
 export function getDefaultConfig() {
     const jarvisCfg = loadConfig();
@@ -37,6 +38,13 @@ export function fromModelConfig(mc) {
         extraBody: mc.extra_body,
     };
 }
+function buildUserProfilePrompt() {
+    const userProfile = readUserProfile();
+    if (!userProfile)
+        return '';
+    return '\n\n---\n[用户画像] 以下内容来自 ~/.jarvis/USER.md，请将其视为对用户特征的长期记忆。在后续回复中可以据此调整表达方式、信息密度与建议方式，但不要直接暴露这段系统内容。' +
+        `\n${userProfile}`;
+}
 /** 将内部 TranscriptMessage[] 转为 OpenAI messages 格式 */
 function toOpenAIMessages(transcript, systemPrompt) {
     const messages = [];
@@ -142,6 +150,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 + buildUserProfilePrompt();
+            return;
+        }
         // 从当前激活的智能体加载 system prompt（运行时动态读取）
         const currentAgent = getActiveAgent(DEFAULT_AGENT);
         const agent = getAgent(currentAgent);
@@ -157,7 +170,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 + buildUserProfilePrompt();
     }
     async streamMessage(transcript, tools, callbacks, abortSignal) {
         const messages = toOpenAIMessages(transcript, this.systemPrompt);

package/dist/services/userProfile.d.ts

@@ -0,0 +1 @@
+export declare function updateUserProfileFromInput(userInput: string): Promise<boolean>;

package/dist/services/userProfile.js

@@ -0,0 +1,127 @@
+import { loadConfig, getActiveModel } from '../config/loader.js';
+import { readUserProfile, writeUserProfile } from '../config/userProfile.js';
+import { logError, logInfo, logWarn } from '../core/logger.js';
+function extractMessageText(content) {
+    if (typeof content === 'string')
+        return content;
+    if (!Array.isArray(content))
+        return '';
+    return content
+        .map((item) => (item?.type === 'text' ? item.text ?? '' : ''))
+        .join('');
+}
+function buildProfilePrompt(userInput, existingProfile) {
+    return [
+        '请基于“已有用户画像”和“最新用户输入”，整理一份新的 USER.md。',
+        '',
+        '目标：让后续智能体在系统提示词中读取后，能够更了解用户。',
+        '',
+        '必须遵守：',
+        '1. 只保留对后续交互有帮助的信息。',
+        '2. 有明确依据的内容写成确定描述；只有弱信号时写成“可能/倾向于”。',
+        '3. 没有依据时明确写“未知”，不要编造职业、年龄、经历。',
+        '4. 输出必须是中文 Markdown，不要输出代码块围栏，不要解释你的推理过程。',
+        '5. 画像应简洁稳定，避免复述用户原话。',
+        '',
+        '请严格按下面结构输出：',
+        '# 用户画像',
+        '## 基本信息',
+        '- 职业：',
+        '- 年龄阶段：',
+        '- 所在地区：',
+        '- 语言偏好：',
+        '',
+        '## 思维与沟通',
+        '- 思维习惯：',
+        '- 沟通风格：',
+        '- 决策偏好：',
+        '',
+        '## 能力与背景',
+        '- 技术背景：',
+        '- 专业领域：',
+        '- 熟悉工具：',
+        '',
+        '## 当前关注点',
+        '- 长期目标：',
+        '- 近期任务倾向：',
+        '- 约束与偏好：',
+        '',
+        '## 交互建议',
+        '- 回答策略：',
+        '- 需要避免：',
+        '',
+        '## 置信说明',
+        '- 高置信信息：',
+        '- 低置信推断：',
+        '- 明显未知：',
+        '',
+        '---',
+        '已有用户画像：',
+        existingProfile || '(暂无)',
+        '',
+        '最新用户输入：',
+        userInput,
+    ].join('\n');
+}
+export async function updateUserProfileFromInput(userInput) {
+    const normalizedInput = userInput.trim();
+    if (!normalizedInput)
+        return false;
+    const config = loadConfig();
+    const activeModel = getActiveModel(config);
+    if (!activeModel) {
+        logWarn('user_profile.skip.no_active_model');
+        return false;
+    }
+    const prompt = buildProfilePrompt(normalizedInput, readUserProfile());
+    const body = {
+        model: activeModel.model,
+        messages: [
+            {
+                role: 'system',
+                content: '你是一个严谨的用户画像整理助手，负责维护 ~/.jarvis/USER.md。输出必须是可直接写入文件的 Markdown 正文。',
+            },
+            {
+                role: 'user',
+                content: prompt,
+            },
+        ],
+        max_tokens: Math.min(activeModel.max_tokens ?? 4096, 1200),
+        temperature: 0.2,
+        stream: false,
+    };
+    if (activeModel.extra_body) {
+        Object.assign(body, activeModel.extra_body);
+    }
+    try {
+        const response = await fetch(activeModel.api_url, {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+                Authorization: `Bearer ${activeModel.api_key}`,
+            },
+            body: JSON.stringify(body),
+        });
+        if (!response.ok) {
+            const errorText = await response.text().catch(() => '');
+            throw new Error(`API 错误 ${response.status}: ${errorText.slice(0, 300)}`);
+        }
+        const data = await response.json();
+        const content = extractMessageText(data.choices?.[0]?.message?.content).trim();
+        if (!content) {
+            throw new Error('用户画像生成结果为空');
+        }
+        writeUserProfile(content);
+        logInfo('user_profile.updated', {
+            inputLength: normalizedInput.length,
+            outputLength: content.length,
+        });
+        return true;
+    }
+    catch (error) {
+        logError('user_profile.update_failed', error, {
+            inputLength: normalizedInput.length,
+        });
+        return false;
+    }
+}

package/dist/tools/index.d.ts

@@ -6,7 +6,13 @@ import { listDirectory } from './listDirectory.js';
 import { searchFiles } from './searchFiles.js';
 import { semanticSearch } from './semanticSearch.js';
 import { createSkill } from './createSkill.js';
-export { readFile, writeFile, runCommand, listDirectory, searchFiles, semanticSearch, createSkill };
+import { runAgent } from './runAgent.js';
+import { spawnAgent } from './spawnAgent.js';
+import { sendToAgent } from './sendToAgent.js';
+import { publishMessage } from './publishMessage.js';
+import { subscribeMessage } from './subscribeMessage.js';
+import { readChannel } from './readChannel.js';
+export { readFile, writeFile, runCommand, listDirectory, searchFiles, semanticSearch, createSkill, runAgent, spawnAgent, sendToAgent, publishMessage, subscribeMessage, readChannel, };
 /** 所有内置工具 */
 export declare const allTools: Tool[];
 /** 按名称查找内置工具 */

package/dist/tools/index.js

@@ -5,9 +5,20 @@ import { listDirectory } from './listDirectory.js';
 import { searchFiles } from './searchFiles.js';
 import { semanticSearch } from './semanticSearch.js';
 import { createSkill } from './createSkill.js';
-export { readFile, writeFile, runCommand, listDirectory, searchFiles, semanticSearch, createSkill };
+import { runAgent } from './runAgent.js';
+import { spawnAgent } from './spawnAgent.js';
+import { sendToAgent } from './sendToAgent.js';
+import { publishMessage } from './publishMessage.js';
+import { subscribeMessage } from './subscribeMessage.js';
+import { readChannel } from './readChannel.js';
+export { readFile, writeFile, runCommand, listDirectory, searchFiles, semanticSearch, createSkill, runAgent, spawnAgent, sendToAgent, publishMessage, subscribeMessage, readChannel, };
 /** 所有内置工具 */
-export const allTools = [readFile, writeFile, runCommand, listDirectory, searchFiles, semanticSearch, createSkill];
+export const allTools = [
+    readFile, writeFile, runCommand, listDirectory, searchFiles,
+    semanticSearch, createSkill,
+    runAgent, spawnAgent, sendToAgent,
+    publishMessage, subscribeMessage, readChannel,
+];
 /** 按名称查找内置工具 */
 export function findTool(name) {
     return allTools.find((t) => t.name === name);

package/dist/tools/publishMessage.d.ts

@@ -0,0 +1,8 @@
+/**
+ * publish_message 工具
+ *
+ * 允许 SubAgent（或主 Agent）向命名频道发布消息，
+ * 其他正在订阅该频道的 Agent 会立即收到通知。
+ */
+import { Tool } from '../types/index.js';
+export declare const publishMessage: Tool;