@code4bug/jarvis-agent 1.3.6 → 1.3.7

package/README.md

@@ -131,6 +131,7 @@ jarvis --version
 | `/new` | 开启新会话 |
 | `/resume` | 恢复历史会话 |
 | `/resume <ID>` | 直接恢复指定历史会话 |
+| `/rewind` | 打开当前会话提问列表并回退到指定位置 |
 | `/agent` | 打开智能体切换列表 |
 | `/agent <名称>` | 切换智能体，重启后生效 |
 | `/permissions` | 查看持久化授权 |
@@ -166,6 +167,8 @@ jarvis --version
 - 斜杠菜单中可使用 `↑ / ↓` 切换命令
 - 在斜杠菜单中按 `Tab` 可补全当前命令
 - 在斜杠菜单中按 `Enter` 可提交当前命令
+- 输入 `/rewind` 后可列出当前会话的提问列表，按时间从上到下升序排列
+- 在 `/rewind` 列表中选择某条提问后，会把该提问回填到输入框，并丢弃该位置之后的上下文
 - 对于多行输入，`↑ / ↓` 用于在输入框内移动光标
 - 对于单行输入，`↑ / ↓` 用于切换历史输入
 

package/dist/commands/index.d.ts

@@ -7,6 +7,8 @@
 export interface SlashCommand {
     /** 命令名称（不含 /） */
     name: string;
+    /** 可选：菜单展示名 */
+    displayName?: string;
     /** 简短描述 */
     description: string;
     /** 命令类别 */

package/dist/commands/index.js

@@ -12,6 +12,7 @@ const builtinCommands = [
     { name: 'quit', description: '退出应用程序', category: 'builtin', submitMode: 'action' },
     { name: 'bye', description: '退出应用程序', category: 'builtin', submitMode: 'action' },
     { name: 'resume', description: '恢复历史会话上下文', category: 'builtin', submitMode: 'list' },
+    { name: 'rewind', description: '回退当前会话到指定提问位置', category: 'builtin', submitMode: 'list' },
     { name: 'help', description: '显示帮助信息', category: 'builtin', submitMode: 'action' },
     { name: 'agent', description: '切换智能体', category: 'builtin', submitMode: 'list' },
     { name: 'permissions', description: '查看所有持久化授权列表', category: 'builtin', submitMode: 'action' },

package/dist/components/SlashCommandMenu.js

@@ -37,7 +37,8 @@ function SlashCommandMenu({ commands, selectedIndex, maxVisible = 6, }) {
                 const isSelected = realIndex === selectedIndex;
                 const catColor = categoryColor[cmd.category] ?? 'gray';
                 const catText = categoryLabel[cmd.category] ?? cmd.category;
-                return (_jsxs(Box, { children: [_jsxs(Text, { color: isSelected ? 'cyan' : 'white', children: [' ', "/", cmd.name, ' '] }), _jsxs(Text, { color: isSelected ? 'cyan' : 'gray', children: ["- ", cmd.description, ' '] }), _jsxs(Text, { color: catColor, dimColor: true, children: ["[", catText, "]"] })] }, cmd.name));
+                const displayName = cmd.displayName ?? cmd.name;
+                return (_jsxs(Box, { children: [_jsxs(Text, { color: isSelected ? 'cyan' : 'white', children: [' ', "/", displayName, ' '] }), _jsxs(Text, { color: isSelected ? 'cyan' : 'gray', children: ["- ", cmd.description, ' '] }), _jsxs(Text, { color: catColor, dimColor: true, children: ["[", catText, "]"] })] }, `${cmd.name}-${realIndex}`));
             }), start + visible < total && (_jsxs(Text, { color: "gray", dimColor: true, children: ["  \u2193 \u8FD8\u6709 ", total - start - visible, " \u9879"] }))] }));
 }
 export default React.memo(SlashCommandMenu);

package/dist/core/QueryEngine.d.ts

@@ -30,6 +30,9 @@ export declare class QueryEngine {
     /** 注册持久 UI 回调，供后台 spawn_agent 子 Agent 推送消息 */
     registerUIBus(onMessage: (msg: Message) => void, onUpdateMessage: (id: string, updates: Partial<Message>) => void): void;
     private createSession;
+    private rebuildTranscriptFromMessages;
+    private recomputeSessionSummary;
+    private recomputeSessionTokens;
     private ensureSessionDir;
     private createService;
     /** 处理用户输入（在独立 Worker 线程中执行） */
@@ -62,6 +65,19 @@ export declare class QueryEngine {
         messages: Message[];
     } | null;
     getSession(): Session;
+    getCurrentSessionUserTurns(): Array<{
+        messageId: string;
+        turnIndex: number;
+        input: string;
+        answerPreview: string;
+        timestamp: number;
+    }>;
+    rewindToUserMessage(messageId: string): {
+        session: Session;
+        messages: Message[];
+        input: string;
+        turnIndex: number;
+    } | null;
     /**
      * 清理非当前会话的所有历史会话文件
      * @returns 删除的会话数量

package/dist/core/QueryEngine.js

@@ -51,6 +51,39 @@ export class QueryEngine {
             totalCost: 0,
         };
     }
+    rebuildTranscriptFromMessages(messages) {
+        const transcript = [];
+        for (const msg of messages) {
+            if (msg.type === 'user') {
+                transcript.push({ role: 'user', content: msg.content });
+            }
+            else if (msg.type === 'reasoning' && msg.status === 'success' && msg.content) {
+                transcript.push({
+                    role: 'assistant',
+                    content: [{ type: 'text', text: msg.content }],
+                });
+            }
+            else if (msg.type === 'tool_exec' && msg.toolName && msg.toolResult !== undefined) {
+                transcript.push({
+                    role: 'assistant',
+                    content: [{ type: 'tool_use', id: msg.id, name: msg.toolName, input: msg.toolArgs ?? {} }],
+                });
+                transcript.push({
+                    role: 'tool_result',
+                    content: msg.toolResult,
+                    toolUseId: msg.id,
+                });
+            }
+        }
+        return transcript;
+    }
+    recomputeSessionSummary(messages) {
+        const firstUser = messages.find((m) => m.type === 'user');
+        return firstUser ? firstUser.content.slice(0, 80).replace(/\n/g, ' ') : undefined;
+    }
+    recomputeSessionTokens(messages) {
+        return messages.reduce((sum, msg) => sum + (msg.tokenCount ?? 0), 0);
+    }
     ensureSessionDir() {
         if (!fs.existsSync(SESSIONS_DIR)) {
             fs.mkdirSync(SESSIONS_DIR, { recursive: true });
@@ -321,31 +354,7 @@ export class QueryEngine {
             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) {
-                if (msg.type === 'user') {
-                    this.transcript.push({ role: 'user', content: msg.content });
-                }
-                else if (msg.type === 'reasoning' && msg.status === 'success' && msg.content) {
-                    // assistant 消息的 content 必须是 ContentBlock[]，与 query.ts 中的构建方式一致
-                    this.transcript.push({
-                        role: 'assistant',
-                        content: [{ type: 'text', text: msg.content }],
-                    });
-                }
-                else if (msg.type === 'tool_exec' && msg.toolName && msg.toolResult !== undefined) {
-                    // 工具调用：assistant tool_use + tool_result
-                    this.transcript.push({
-                        role: 'assistant',
-                        content: [{ type: 'tool_use', id: msg.id, name: msg.toolName, input: msg.toolArgs ?? {} }],
-                    });
-                    this.transcript.push({
-                        role: 'tool_result',
-                        content: msg.toolResult,
-                        toolUseId: msg.id,
-                    });
-                }
-            }
+            this.transcript = this.rebuildTranscriptFromMessages(cleanedMessages);
             logInfo('session.loaded', {
                 sessionId,
                 messageCount: cleanedMessages.length,
@@ -362,6 +371,57 @@ export class QueryEngine {
     getSession() {
         return this.session;
     }
+    getCurrentSessionUserTurns() {
+        const cleanedMessages = this.session.messages.filter((m) => !(m.type === 'thinking' && m.status === 'pending'));
+        const userMessages = cleanedMessages.filter((m) => m.type === 'user');
+        return userMessages.map((msg, index) => {
+            const currentIndex = cleanedMessages.findIndex((item) => item.id === msg.id);
+            const nextUserIndex = cleanedMessages.findIndex((item, i) => i > currentIndex && item.type === 'user');
+            const endIndex = nextUserIndex >= 0 ? nextUserIndex : cleanedMessages.length;
+            const answerPreview = cleanedMessages
+                .slice(currentIndex + 1, endIndex)
+                .filter((item) => item.type === 'reasoning' && item.content)
+                .map((item) => item.content.trim())
+                .find(Boolean) ?? '';
+            return {
+                messageId: msg.id,
+                turnIndex: index + 1,
+                input: msg.content,
+                answerPreview,
+                timestamp: msg.timestamp,
+            };
+        });
+    }
+    rewindToUserMessage(messageId) {
+        const cleanedMessages = this.session.messages.filter((m) => !(m.type === 'thinking' && m.status === 'pending'));
+        const targetIndex = cleanedMessages.findIndex((m) => m.id === messageId && m.type === 'user');
+        if (targetIndex < 0)
+            return null;
+        const userTurns = cleanedMessages.filter((m) => m.type === 'user');
+        const turnIndex = userTurns.findIndex((m) => m.id === messageId) + 1;
+        const targetMessage = cleanedMessages[targetIndex];
+        const keptMessages = cleanedMessages.slice(0, targetIndex);
+        this.session.messages = keptMessages;
+        this.session.summary = this.recomputeSessionSummary(keptMessages);
+        this.session.totalTokens = this.recomputeSessionTokens(keptMessages);
+        this.session.updatedAt = Date.now();
+        this.transcript = this.rebuildTranscriptFromMessages(keptMessages);
+        this.touchActivity();
+        this.saveSession();
+        logInfo('session.rewind', {
+            sessionId: this.session.id,
+            targetMessageId: messageId,
+            turnIndex,
+            keptMessageCount: keptMessages.length,
+            transcriptLength: this.transcript.length,
+        });
+        return {
+            session: this.session,
+            messages: keptMessages,
+            input: targetMessage.content,
+            turnIndex,
+        };
+    }
     /**
      * 清理非当前会话的所有历史会话文件
      * @returns 删除的会话数量

package/dist/hooks/useSlashMenu.d.ts

@@ -27,12 +27,13 @@ export declare function useSlashMenu(opts: UseSlashMenuOptions): {
     slashMenuIndex: number;
     agentMenuMode: boolean;
     resumeMenuMode: boolean;
+    rewindMenuMode: boolean;
     handleSlashMenuUp: () => void;
     handleSlashMenuDown: () => void;
     handleSlashMenuClose: () => void;
     getSelectedCommand: () => SlashCommand | null;
     autocompleteSlashMenuSelection: (currentInput: string) => string;
-    openListCommand: (commandName: "agent" | "resume") => "/agent " | "/resume ";
+    openListCommand: (commandName: "agent" | "resume" | "rewind") => "/agent " | "/rewind " | "/resume ";
     updateSlashMenu: (val: string) => void;
     setSlashMenuVisible: import("react").Dispatch<import("react").SetStateAction<boolean>>;
     resumeSession: (sessionId: string) => void;

package/dist/hooks/useSlashMenu.js

@@ -13,6 +13,7 @@ export function useSlashMenu(opts) {
     const [slashMenuIndex, setSlashMenuIndex] = useState(0);
     const [agentMenuMode, setAgentMenuMode] = useState(false);
     const [resumeMenuMode, setResumeMenuMode] = useState(false);
+    const [rewindMenuMode, setRewindMenuMode] = useState(false);
     // 上移
     const handleSlashMenuUp = useCallback(() => {
         setSlashMenuIndex((prev) => (prev > 0 ? prev - 1 : slashMenuItems.length - 1));
@@ -23,9 +24,10 @@ export function useSlashMenu(opts) {
     }, [slashMenuItems.length]);
     // 关闭
     const handleSlashMenuClose = useCallback(() => {
-        if (agentMenuMode || resumeMenuMode) {
+        if (agentMenuMode || resumeMenuMode || rewindMenuMode) {
             setAgentMenuMode(false);
             setResumeMenuMode(false);
+            setRewindMenuMode(false);
             setInput('/');
             const matched = filterCommands('');
             setSlashMenuItems(matched);
@@ -35,7 +37,7 @@ export function useSlashMenu(opts) {
         else {
             setSlashMenuVisible(false);
         }
-    }, [agentMenuMode, resumeMenuMode, setInput]);
+    }, [agentMenuMode, resumeMenuMode, rewindMenuMode, setInput]);
     // 恢复会话的通用逻辑
     const resumeSession = useCallback((sessionId) => {
         if (!engineRef.current)
@@ -76,6 +78,25 @@ export function useSlashMenu(opts) {
             return null;
         return slashMenuItems[slashMenuIndex] ?? null;
     }, [slashMenuItems, slashMenuIndex]);
+    const buildRewindItems = useCallback(() => {
+        if (!engineRef.current)
+            return [];
+        return engineRef.current.getCurrentSessionUserTurns()
+            .slice()
+            .map((turn) => {
+            const date = new Date(turn.timestamp);
+            const dateStr = `${date.getMonth() + 1}/${date.getDate()} ${date.getHours().toString().padStart(2, '0')}:${date.getMinutes().toString().padStart(2, '0')}`;
+            const question = turn.input.replace(/\s+/g, ' ').slice(0, 32);
+            const answer = turn.answerPreview.replace(/\s+/g, ' ').slice(0, 24);
+            return {
+                name: turn.messageId,
+                displayName: `rewind-${turn.turnIndex}`,
+                description: `[Q${turn.turnIndex} ${dateStr}] ${question}${answer ? ` ｜ A: ${answer}` : ''}`,
+                category: 'builtin',
+                submitMode: 'action',
+            };
+        });
+    }, [engineRef]);
     const openListCommand = useCallback((commandName) => {
         if (commandName === 'agent') {
             setInput('/agent ');
@@ -84,9 +105,21 @@ export function useSlashMenu(opts) {
             setSlashMenuIndex(0);
             setAgentMenuMode(true);
             setResumeMenuMode(false);
+            setRewindMenuMode(false);
             setSlashMenuVisible(matched.length > 0);
             return '/agent ';
         }
+        if (commandName === 'rewind') {
+            const items = buildRewindItems();
+            setInput('/rewind ');
+            setSlashMenuItems(items);
+            setSlashMenuIndex(0);
+            setSlashMenuVisible(items.length > 0);
+            setRewindMenuMode(true);
+            setResumeMenuMode(false);
+            setAgentMenuMode(false);
+            return '/rewind ';
+        }
         const sessions = QueryEngine.listSessions().slice(0, 20);
         const items = sessions.map((s) => {
             const date = new Date(s.updatedAt);
@@ -104,8 +137,9 @@ export function useSlashMenu(opts) {
         setSlashMenuVisible(items.length > 0);
         setResumeMenuMode(true);
         setAgentMenuMode(false);
+        setRewindMenuMode(false);
         return '/resume ';
-    }, [setInput]);
+    }, [setInput, buildRewindItems]);
     const autocompleteSlashMenuSelection = useCallback((currentInput) => {
         const cmd = getSelectedCommand();
         if (!cmd)
@@ -124,17 +158,23 @@ export function useSlashMenu(opts) {
             setSlashMenuVisible(false);
             return nextInput;
         }
+        if (rewindMenuMode) {
+            const nextInput = `/rewind ${cmd.name}`;
+            setInput(nextInput);
+            setSlashMenuVisible(false);
+            return nextInput;
+        }
         const match = currentInput.match(/^\/\S*/);
         const suffix = match ? currentInput.slice(match[0].length) : '';
         const needsTrailingSpace = !suffix && (cmd.submitMode === 'context' || cmd.submitMode === 'list');
         const nextInput = `/${cmd.name}${suffix}${needsTrailingSpace ? ' ' : ''}`;
         setInput(nextInput);
-        if (cmd.submitMode === 'list' && (cmd.name === 'agent' || cmd.name === 'resume') && !suffix.trim()) {
+        if (cmd.submitMode === 'list' && (cmd.name === 'agent' || cmd.name === 'resume' || cmd.name === 'rewind') && !suffix.trim()) {
             return openListCommand(cmd.name);
         }
         updateSlashMenu(nextInput);
         return nextInput;
-    }, [agentMenuMode, resumeMenuMode, getSelectedCommand, setInput, openListCommand]);
+    }, [agentMenuMode, resumeMenuMode, rewindMenuMode, getSelectedCommand, setInput, openListCommand]);
     // 输入变化时更新菜单
     const updateSlashMenu = useCallback((val) => {
         if (val.startsWith('/') && !val.includes('\n')) {
@@ -172,6 +212,22 @@ export function useSlashMenu(opts) {
                 setSlashMenuVisible(matched.length > 0);
                 setResumeMenuMode(true);
                 setAgentMenuMode(false);
+                setRewindMenuMode(false);
+                return;
+            }
+            // /rewind 二级菜单
+            if (/^rewind\s/i.test(query)) {
+                const subQuery = query.replace(/^rewind\s*/i, '').toLowerCase();
+                const items = buildRewindItems();
+                const matched = subQuery
+                    ? items.filter((i) => i.name.includes(subQuery) || (i.displayName ?? '').toLowerCase().includes(subQuery) || i.description.toLowerCase().includes(subQuery))
+                    : items;
+                setSlashMenuItems(matched);
+                setSlashMenuIndex(0);
+                setSlashMenuVisible(matched.length > 0);
+                setRewindMenuMode(true);
+                setResumeMenuMode(false);
+                setAgentMenuMode(false);
                 return;
             }
             // 一级菜单
@@ -181,19 +237,22 @@ export function useSlashMenu(opts) {
             setSlashMenuVisible(matched.length > 0);
             setAgentMenuMode(false);
             setResumeMenuMode(false);
+            setRewindMenuMode(false);
         }
         else {
             setSlashMenuVisible(false);
             setAgentMenuMode(false);
             setResumeMenuMode(false);
+            setRewindMenuMode(false);
         }
-    }, []);
+    }, [buildRewindItems]);
     return {
         slashMenuVisible,
         slashMenuItems,
         slashMenuIndex,
         agentMenuMode,
         resumeMenuMode,
+        rewindMenuMode,
         handleSlashMenuUp,
         handleSlashMenuDown,
         handleSlashMenuClose,

package/dist/screens/repl.js

@@ -260,6 +260,49 @@ export default function REPL() {
                 }
                 return;
             }
+            // /rewind
+            if (cmdName === 'rewind') {
+                if (hasArgs && engineRef.current) {
+                    setInput('');
+                    slashMenu.setSlashMenuVisible(false);
+                    const messageId = parts.slice(1).join(' ').trim();
+                    const result = engineRef.current.rewindToUserMessage(messageId);
+                    if (!result) {
+                        const errMsg = {
+                            id: `rewind-err-${Date.now()}`,
+                            type: 'error',
+                            status: 'error',
+                            content: '未找到要回退的会话位置',
+                            timestamp: Date.now(),
+                        };
+                        setMessages((prev) => [...prev, errMsg]);
+                        return;
+                    }
+                    stopAll();
+                    setMessages([
+                        ...result.messages,
+                        {
+                            id: `rewind-${Date.now()}`,
+                            type: 'system',
+                            status: 'success',
+                            content: `已回退到当前会话的第 ${result.turnIndex} 条提问，请确认后重新发送。`,
+                            timestamp: Date.now(),
+                        },
+                    ]);
+                    sessionRef.current = result.session;
+                    tokenCountRef.current = result.session.totalTokens;
+                    syncTokenDisplay(result.session.totalTokens);
+                    setLoopState(null);
+                    setIsProcessing(false);
+                    setShowWelcome(false);
+                    resetNavigation();
+                    setInput(result.input);
+                }
+                else {
+                    slashMenu.openListCommand('rewind');
+                }
+                return;
+            }
             // /create_skill
             if (cmdName === 'create_skill') {
                 setInput('');

package/dist/screens/slashCommands.js

@@ -31,6 +31,7 @@ export async function executeSlashCommand(cmdName) {
                 '  /bye         退出应用程序',
                 '  /resume      恢复历史会话（支持二级菜单选择）',
                 '  /resume <ID> 直接恢复指定会话',
+                '  /rewind      回退当前会话到指定提问位置',
                 '  /help        显示此帮助信息',
                 '  /session_clear 清理所有非当前会话的历史记录',
                 '  /skills      查看当前所有 tools 和 skills',

package/package.json

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