@code4bug/jarvis-agent 1.3.4 → 1.3.6

package/README.md

@@ -98,7 +98,21 @@ Jarvis 会按下面顺序加载配置，后者覆盖前者：
 
 - `system.model` 对应 `models` 里的 key
 - `extra_body` 会直接合并进请求体，方便兼容不同服务商
-- 如果没有可用模型配置，程序会回退到 Mock Service，适合本地界面联调
+
+### 首次启动配置
+
+如果未检测到可用的全局配置，Jarvis 启动时会先进入首次配置向导，而不是直接进入主界面。
+
+当前配置向导支持两种接入方式：
+
+- OpenAI 兼容接口
+- Ollama / 本地模型
+
+配置写入位置：
+
+- `~/.jarvis/config.json`
+
+项目目录下的 `./.jarvis/config.json` 仍可作为本地覆盖配置使用。
 
 ## 常用命令
 
@@ -116,21 +130,44 @@ jarvis --version
 | `/init` | 扫描当前项目并生成 `JARVIS.md` |
 | `/new` | 开启新会话 |
 | `/resume` | 恢复历史会话 |
-| `/agent` | 切换智能体 |
+| `/resume <ID>` | 直接恢复指定历史会话 |
+| `/agent` | 打开智能体切换列表 |
+| `/agent <名称>` | 切换智能体，重启后生效 |
 | `/permissions` | 查看持久化授权 |
 | `/skills` | 查看当前工具与外部 Skill |
 | `/session_clear` | 清理非当前会话历史 |
 | `/version` | 显示版本 |
 | `/help` | 显示帮助 |
+| `/create_skill <描述>` | 根据描述创建新的 Skill |
+| `/exit` | 退出应用 |
+| `/quit` | 退出应用 |
+| `/bye` | 退出应用 |
+| `/read <路径>` | 以工具方式读取文件 |
+| `/write <路径>` | 以工具方式写入文件 |
+| `/bash <命令>` | 以工具方式执行命令 |
+| `/ls <路径>` | 以工具方式列出目录 |
+| `/search <关键词>` | 以工具方式搜索文件内容 |
 
 ### 快捷键
 
 | 快捷键 | 说明 |
 | --- | --- |
 | `Ctrl + L` | 清屏并开始新会话 |
-| `Ctrl + C` | 退出 |
-| `Esc` | 中断当前任务或清空输入 |
+| `Ctrl + C` | 3 秒内连续按两次退出 |
+| `Ctrl + O` | 切换详情视图 |
+| `Esc` | 中断当前任务；空闲时双击清空输入 |
 | `Alt/Option + Enter` | 输入换行 |
+| `Tab` | 输入为空时填入提示词；在斜杠菜单中补全当前项 |
+| `? + Enter` | 输出快捷键帮助信息 |
+
+### 输入与交互
+
+- 输入 `/` 可打开斜杠菜单
+- 斜杠菜单中可使用 `↑ / ↓` 切换命令
+- 在斜杠菜单中按 `Tab` 可补全当前命令
+- 在斜杠菜单中按 `Enter` 可提交当前命令
+- 对于多行输入，`↑ / ↓` 用于在输入框内移动光标
+- 对于单行输入，`↑ / ↓` 用于切换历史输入
 
 ## 内置工具
 
@@ -209,6 +246,12 @@ Agent 通过 Markdown 文件定义元信息与系统提示词，切换结果会
 
 每次会话会保存消息、摘要、更新时间和累计 Token。
 
+支持能力：
+
+- `/resume` 从列表恢复历史会话
+- `/resume <ID>` 直接恢复指定会话
+- `/session_clear` 清理除当前会话外的历史记录
+
 ### 长期记忆
 
 - 记忆文件：`~/.jarvis/MEMORY.md`

package/dist/agents/jarvis.md

@@ -91,6 +91,7 @@ vibe: 你的全能助手，有问必答，随时待命。
 - 涉及代码时，代码必须可直接运行，无语法错误
 - 多方案时先推荐最优解，再列备选
 - 根据问题类型灵活调整输出格式：代码用代码块、信息用结构化列表、分析用表格等
+- 用户消息里的文件名、路径、命令、参数、扩展名必须逐字保留，不得擅自纠错或改写；若目标不存在，先检查目录或搜索再判断
 
 ### 沟通风格
 - 默认中文回答，代码注释优先中文

package/dist/components/MarkdownText.js

@@ -1,11 +1,13 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import React, { useMemo } from 'react';
-import { Box, Text } from 'ink';
+import { Box, Text, useStdout } from 'ink';
 import { Marked } from 'marked';
 // @ts-ignore — marked-terminal 无内置类型声明
 import { markedTerminal } from 'marked-terminal';
 // @ts-ignore
 import Table from 'cli-table3';
+// @ts-ignore — wrap-ansi 无显式类型声明
+import wrapAnsi from 'wrap-ansi';
 // ===== ANSI 颜色常量 =====
 const RESET = '\x1b[0m';
 const BG_CODE = '\x1b[48;5;236m'; // 深灰背景
@@ -154,6 +156,29 @@ function renderMarkdown(text) {
         return text;
     }
 }
+function wrapRenderedLine(line, width) {
+    if (!line)
+        return [''];
+    const safeWidth = Math.max(width, 12);
+    const plainLine = stripAnsi(line);
+    const listPrefixMatch = plainLine.match(/^(\s*(?:[*+-]|\d+\.)\s+)/);
+    if (!listPrefixMatch) {
+        return wrapAnsi(line, safeWidth, {
+            hard: true,
+            trim: false,
+            wordWrap: false,
+        }).split('\n');
+    }
+    const prefix = listPrefixMatch[1];
+    const content = line.slice(prefix.length);
+    const contentWidth = Math.max(safeWidth - prefix.length, 8);
+    const wrappedContent = wrapAnsi(content, contentWidth, {
+        hard: true,
+        trim: false,
+        wordWrap: false,
+    }).split('\n');
+    return wrappedContent.map((segment, index) => (`${index === 0 ? prefix : ' '.repeat(prefix.length)}${segment}`));
+}
 /**
  * Markdown 终端渲染组件
  * 支持表格（动态列宽+自动换行）、代码块（深色背景+边框）、加粗、列表等
@@ -164,10 +189,14 @@ function renderMarkdown(text) {
  * 与 ANSI 转义序列冲突，出现光标错位和输出错乱。
  */
 function MarkdownText({ text, color }) {
+    const { stdout } = useStdout();
     const lines = useMemo(() => {
         const rendered = renderMarkdown(text);
-        return rendered.split('\n');
-    }, [text]);
-    return (_jsx(Box, { flexDirection: "column", children: lines.map((line, i) => (_jsx(Text, { wrap: "wrap", color: color, children: line }, i))) }));
+        const availableWidth = Math.max(Math.min(stdout?.columns ?? 80, 100) - 6, 20);
+        return rendered
+            .split('\n')
+            .flatMap((line) => wrapRenderedLine(line, availableWidth));
+    }, [text, stdout]);
+    return (_jsx(Box, { flexDirection: "column", children: lines.map((line, i) => (_jsx(Text, { color: color, children: line || ' ' }, i))) }));
 }
 export default React.memo(MarkdownText);

package/dist/components/MessageItem.js

@@ -3,6 +3,7 @@ import React from 'react';
 import { Box, Text } from 'ink';
 import Spinner from 'ink-spinner';
 import MarkdownText from './MarkdownText.js';
+import ShortcutHelpMessage from './ShortcutHelpMessage.js';
 // 状态圆点 icon，根据消息类型 + 状态决定颜色
 // reasoning 完成 → 白色 / tool_exec 成功 → 绿色 / error → 红色 / aborted → 黄色 / pending → 黄色
 function statusDot(status, type) {
@@ -80,7 +81,7 @@ function MessageItem({ msg, showDetails = false }) {
                 _jsxs(_Fragment, { children: [_jsxs(Box, { children: [_jsxs(Text, { color: dotColor, children: [dot, " "] }), _jsxs(Text, { color: "blue", dimColor: true, children: [msg.subAgentId, " \u203A "] })] }), _jsx(Box, { marginLeft: 2, flexDirection: "column", children: _jsx(MarkdownText, { text: msg.content }) })] })) : (_jsxs(Box, { flexDirection: "row", alignItems: "flex-start", children: [_jsxs(Text, { color: dotColor, children: [dot, " "] }), _jsx(Box, { flexDirection: "column", flexShrink: 1, children: _jsx(MarkdownText, { text: msg.content }) })] })), _jsx(MessageStats, { msg: msg, show: showDetails })] }));
     }
     if (msg.type === 'system' && msg.content) {
-        return (_jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [_jsxs(Box, { flexDirection: "row", alignItems: "flex-start", children: [_jsxs(Text, { color: dotColor, children: [dot, " "] }), _jsx(Box, { flexDirection: "column", flexShrink: 1, children: _jsx(MarkdownText, { text: msg.content, color: "gray" }) })] }), _jsx(MessageStats, { msg: msg, show: showDetails })] }));
+        return (_jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [_jsxs(Box, { flexDirection: "row", alignItems: "flex-start", children: [_jsxs(Text, { color: dotColor, children: [dot, " "] }), _jsx(Box, { flexDirection: "column", flexShrink: 1, children: msg.systemKind === 'shortcut_help' ? (_jsx(ShortcutHelpMessage, {})) : (_jsx(MarkdownText, { text: msg.content, color: "gray" })) })] }), _jsx(MessageStats, { msg: msg, show: showDetails })] }));
     }
     if (msg.status !== 'pending' && msg.content) {
         return (_jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [_jsxs(Box, { flexDirection: "row", alignItems: "flex-start", children: [_jsxs(Text, { color: dotColor, children: [dot, " "] }), _jsx(Box, { flexDirection: "column", flexShrink: 1, children: _jsx(MarkdownText, { text: msg.content, color: "gray" }) })] }), _jsx(MessageStats, { msg: msg, show: showDetails })] }));

package/dist/components/ShortcutHelpMessage.d.ts

@@ -0,0 +1,4 @@
+import React from 'react';
+declare function ShortcutHelpMessage(): import("react/jsx-runtime").JSX.Element;
+declare const _default: React.MemoExoticComponent<typeof ShortcutHelpMessage>;
+export default _default;

package/dist/components/ShortcutHelpMessage.js

@@ -0,0 +1,10 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import React from 'react';
+import { Box, Text } from 'ink';
+import { getShortcutPlatformNote, getShortcutSections } from '../config/shortcuts.js';
+function ShortcutHelpMessage() {
+    const sections = getShortcutSections();
+    const note = getShortcutPlatformNote();
+    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { color: "cyan", bold: true, children: "\u5FEB\u6377\u952E\u5E2E\u52A9" }), _jsx(Text, { color: "gray", children: note }), sections.map((section) => (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsx(Text, { color: "yellow", bold: true, children: section.title }), section.items.map((item, index) => (_jsxs(Box, { children: [_jsx(Box, { width: 24, flexShrink: 0, children: _jsx(Text, { color: "green", bold: true, children: item.key }) }), _jsx(Text, { color: "white", children: item.description })] }, `${section.title}-${item.key}-${index}`)))] }, section.title)))] }));
+}
+export default React.memo(ShortcutHelpMessage);

package/dist/components/WelcomeHeader.js

@@ -22,6 +22,6 @@ function WelcomeHeader({ width }) {
     const showLogo = width >= 52;
     const appName = getAppName();
     const modelName = getModelName();
-    return (_jsxs(Box, { flexDirection: "column", paddingX: 1, width: width, children: [showLogo && (_jsx(Box, { flexDirection: "column", children: LOGO_LINES.map((line, i) => (_jsx(Text, { color: LOGO_COLORS[i], children: line }, i))) })), _jsxs(Box, { marginTop: 0, children: [_jsx(Text, { color: "gray" }), _jsx(Text, { color: "white", bold: true, children: "Your AI-Powered Dev Companion" }), _jsx(Text, { color: "gray" })] }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: "gray", children: '─'.repeat(Math.min(width - 4, 48)) }) }), _jsxs(Box, { marginTop: 0, children: [_jsx(Text, { color: "gray", children: "model " }), _jsx(Text, { color: "cyan", children: modelName }), _jsxs(Text, { color: "gray", children: ["  ", appName, " "] }), _jsx(Text, { color: "magenta", children: APP_VERSION })] }), _jsx(Box, { children: _jsx(Text, { color: "gray", children: truncatePath(process.cwd(), maxPath) }) }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: "gray", children: '─'.repeat(Math.min(width - 4, 48)) }) }), _jsxs(Box, { children: [_jsx(Text, { color: "gray", children: "/" }), _jsx(Text, { color: "cyan", children: "init" }), _jsx(Text, { color: "gray", children: " \u521D\u59CB\u5316  " }), _jsx(Text, { color: "gray", children: "/" }), _jsx(Text, { color: "cyan", children: "help" }), _jsx(Text, { color: "gray", children: " \u5E2E\u52A9  " }), _jsx(Text, { color: "gray", children: "/" }), _jsx(Text, { color: "cyan", children: "new" }), _jsx(Text, { color: "gray", children: " \u65B0\u4F1A\u8BDD  " }), _jsx(Text, { color: "gray", children: "/" }), _jsx(Text, { color: "cyan", children: "agent" }), _jsx(Text, { color: "gray", children: " \u5207\u6362" })] }), _jsx(Text, { children: ' ' })] }));
+    return (_jsxs(Box, { flexDirection: "column", paddingX: 1, width: width, children: [showLogo && (_jsx(Box, { flexDirection: "column", children: LOGO_LINES.map((line, i) => (_jsx(Text, { color: LOGO_COLORS[i], children: line }, i))) })), _jsxs(Box, { marginTop: 0, children: [_jsx(Text, { color: "gray" }), _jsx(Text, { color: "white", bold: true, children: "Your AI-Powered Dev Companion" }), _jsx(Text, { color: "gray" })] }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: "gray", children: '─'.repeat(Math.min(width - 4, 48)) }) }), _jsxs(Box, { marginTop: 0, children: [_jsx(Text, { color: "gray", children: "model " }), _jsx(Text, { color: "cyan", children: modelName }), _jsxs(Text, { color: "gray", children: ["  ", appName, " "] }), _jsx(Text, { color: "magenta", children: APP_VERSION })] }), _jsx(Box, { children: _jsx(Text, { color: "gray", children: truncatePath(process.cwd(), maxPath) }) }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: "gray", children: '─'.repeat(Math.min(width - 4, 48)) }) }), _jsxs(Box, { children: [_jsx(Text, { color: "gray", children: "/" }), _jsx(Text, { color: "cyan", children: "init" }), _jsx(Text, { color: "gray", children: " \u521D\u59CB\u5316  " }), _jsx(Text, { color: "gray", children: "/" }), _jsx(Text, { color: "cyan", children: "help" }), _jsx(Text, { color: "gray", children: " \u5E2E\u52A9  " }), _jsx(Text, { color: "gray", children: "/" }), _jsx(Text, { color: "cyan", children: "new" }), _jsx(Text, { color: "gray", children: " \u65B0\u4F1A\u8BDD  " }), _jsx(Text, { color: "gray", children: "/" }), _jsx(Text, { color: "cyan", children: "agent" }), _jsx(Text, { color: "gray", children: " \u5207\u6362  " }), _jsx(Text, { color: "yellow", bold: true, children: "?" }), _jsx(Text, { color: "gray", children: " \u5FEB\u6377\u952E\u63D0\u793A" })] }), _jsx(Text, { children: ' ' })] }));
 }
 export default React.memo(WelcomeHeader);

package/dist/config/shortcuts.d.ts

@@ -0,0 +1,13 @@
+export interface ShortcutItem {
+    key: string;
+    description: string;
+}
+export interface ShortcutSection {
+    title: string;
+    items: ShortcutItem[];
+}
+export declare function getShortcutPlatformLabel(): string;
+export declare function getShortcutAltKeyLabel(): string;
+export declare function getShortcutPlatformNote(): string;
+export declare function getShortcutSections(): ShortcutSection[];
+export declare function buildShortcutHelpText(): string;

package/dist/config/shortcuts.js

@@ -0,0 +1,67 @@
+const isMac = process.platform === 'darwin';
+const isWindows = process.platform === 'win32';
+export function getShortcutPlatformLabel() {
+    if (isMac)
+        return 'macOS';
+    if (isWindows)
+        return 'Windows';
+    return 'Linux';
+}
+export function getShortcutAltKeyLabel() {
+    return isMac ? 'Option' : 'Alt';
+}
+export function getShortcutPlatformNote() {
+    if (isMac)
+        return '当前平台：macOS（终端内快捷键使用 Ctrl / Option，通常不是 Cmd）';
+    if (isWindows)
+        return '当前平台：Windows（快捷键使用 Ctrl / Alt）';
+    return '当前平台：Linux（快捷键使用 Ctrl / Alt）';
+}
+export function getShortcutSections() {
+    const altKey = getShortcutAltKeyLabel();
+    const platform = getShortcutPlatformLabel();
+    return [
+        {
+            title: '通用快捷键',
+            items: [
+                { key: '? + Enter', description: '查看全部快捷键说明' },
+                { key: 'Ctrl + C', description: '退出 Jarvis（需连续按两次）' },
+                { key: 'Ctrl + L', description: '清屏并开始新会话' },
+                { key: 'Ctrl + O', description: '切换详情视图' },
+                { key: 'Esc', description: '中断当前任务；空闲时双击清空输入' },
+                { key: `${altKey} + Enter`, description: '插入换行' },
+                { key: 'Tab', description: '输入为空时填入提示词；斜杠菜单中补全选中项' },
+                { key: 'Enter', description: '发送消息；斜杠菜单中提交当前选中命令' },
+            ],
+        },
+        {
+            title: `输入编辑（${platform}）`,
+            items: [
+                { key: '← / →', description: '左右移动光标' },
+                { key: '↑ / ↓', description: '多行输入时上下移动光标' },
+                { key: '↑ / ↓', description: '单行输入时切换历史记录' },
+            ],
+        },
+        {
+            title: '斜杠菜单',
+            items: [
+                { key: '/', description: '打开命令菜单' },
+                { key: '↑ / ↓', description: '切换命令' },
+                { key: 'Tab / Enter', description: '补全或提交当前命令' },
+                { key: 'Esc', description: '关闭命令菜单' },
+            ],
+        },
+    ];
+}
+export function buildShortcutHelpText() {
+    return [
+        '快捷键帮助',
+        getShortcutPlatformNote(),
+        '',
+        ...getShortcutSections().flatMap((section) => [
+            `${section.title}：`,
+            ...section.items.map((item) => `  ${item.key}  ${item.description}`),
+            '',
+        ]),
+    ].join('\n').trim();
+}

package/dist/screens/repl.js

@@ -19,6 +19,7 @@ import { subscribeAgentCount, getActiveAgentCount } from '../core/spawnRegistry.
 import { logError, logInfo, logWarn } from '../core/logger.js';
 import { getAgentSubCommands } from '../commands/index.js';
 import { setActiveAgent } from '../config/agentState.js';
+import { buildShortcutHelpText } from '../config/shortcuts.js';
 import { hideTerminalCursor, showTerminalCursor } from '../terminal/cursor.js';
 export default function REPL() {
     const { exit } = useApp();
@@ -200,6 +201,22 @@ export default function REPL() {
         const trimmed = value.trim();
         if (!trimmed || isProcessing || !engineRef.current)
             return;
+        if (trimmed === '?') {
+            setInput('');
+            slashMenu.setSlashMenuVisible(false);
+            if (HIDE_WELCOME_AFTER_INPUT)
+                setShowWelcome(false);
+            setMessages((prev) => [...prev, {
+                    id: `shortcut-help-${Date.now()}`,
+                    type: 'system',
+                    status: 'success',
+                    systemKind: 'shortcut_help',
+                    content: buildShortcutHelpText(),
+                    timestamp: Date.now(),
+                }]);
+            logInfo('ui.shortcut_help.open');
+            return;
+        }
         logInfo('ui.submit', {
             inputLength: trimmed.length,
             isSlashCommand: trimmed.startsWith('/'),

package/dist/services/api/llm.js

@@ -186,6 +186,9 @@ export class LLMServiceImpl {
             '\n\n[安全围栏] 系统已内置安全围栏（Safeguard），会自动拦截危险命令并弹出交互式确认菜单。' +
             '当你需要执行任何命令时，直接调用 Bash 工具即可，不要自行判断命令是否危险，不要用文字询问用户"是否确认执行"。' +
             '安全围栏会自动处理拦截和用户确认流程。' +
+            '\n\n[文件与命令保真] 用户消息中出现的文件名、目录名、路径、命令、参数、扩展名，必须按原文逐字使用，不得自行纠错、改写、补全或翻译。' +
+            '即使你怀疑用户有拼写错误，也必须先按原文检查；若原文目标不存在，再基于目录扫描结果给出候选项。' +
+            '尤其不要把相似文件名擅自改成你认为“更正确”的拼写。' +
             '\n\n[文件修改约束] 修改已有文件时，先读取目标文件，再优先使用局部修改方式。' +
             '如果只改少量内容，优先使用 write_file 的 replace 模式；需要结构化补丁时使用 diff 模式；只有新建文件或确实需要大范围重写时才使用 overwrite。';
         // 追加系统环境信息，帮助 LLM 感知用户运行环境

package/dist/types/index.d.ts

@@ -6,6 +6,7 @@ export interface Message {
     status: MessageStatus;
     content: string;
     timestamp: number;
+    systemKind?: 'shortcut_help';
     /** 耗时 ms */
     duration?: number;
     /** token 统计 */

package/package.json

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