@code4bug/jarvis-agent 1.1.8 → 1.3.1

package/dist/skills/index.js

@@ -85,7 +85,6 @@ function buildParamsFromScript(scriptPath, skill) {
  * 通过写入临时 .py 文件再执行，避免 shell 转义问题。
  */
 async function executeSkillScript(scriptPath, skill, args) {
-    const funcName = skill.meta.name.replace(/-/g, '_');
     const kwargs = [];
     for (const [key, value] of Object.entries(args)) {
         if (key === 'arguments') {
@@ -112,8 +111,16 @@ async function executeSkillScript(scriptPath, skill, args) {
     const pyCode = [
         'import sys,os,json',
         `sys.path.insert(0, ${JSON.stringify(path.dirname(scriptPath))})`,
-        `from skill import ${funcName}`,
-        `result = ${funcName}(${kwargs.join(', ')})`,
+        'import skill as skill_module',
+        `tool_name = getattr(skill_module, "TOOL_METADATA", {}).get("name") or ${JSON.stringify(skill.meta.name.replace(/-/g, '_'))}`,
+        'func = getattr(skill_module, tool_name, None)',
+        'if func is None:',
+        '    candidates = [name for name, value in vars(skill_module).items() if callable(value) and not name.startswith("_")]',
+        '    if len(candidates) == 1:',
+        '        func = getattr(skill_module, candidates[0])',
+        '    else:',
+        '        raise ImportError(f"未找到可调用函数: {tool_name}，候选: {candidates}")',
+        `result = func(${kwargs.join(', ')})`,
         'print(json.dumps(result, ensure_ascii=False, indent=2))',
     ].join('\n');
     try {

package/dist/terminal/cursor.d.ts

@@ -0,0 +1,6 @@
+export declare function hideTerminalCursor(): void;
+export declare function showTerminalCursor(): void;
+export declare function enableBracketedPaste(): void;
+export declare function disableBracketedPaste(): void;
+export declare function moveCursorToColumn(column: number): void;
+export declare function relocateCursorToInputLine(rowsBelow: number, column: number): void;

package/dist/terminal/cursor.js

@@ -0,0 +1,21 @@
+const ESC = '\x1B[';
+export function hideTerminalCursor() {
+    process.stdout.write(`${ESC}?25l`);
+}
+export function showTerminalCursor() {
+    process.stdout.write(`${ESC}?25h`);
+}
+export function enableBracketedPaste() {
+    process.stdout.write(`${ESC}?2004h`);
+}
+export function disableBracketedPaste() {
+    process.stdout.write(`${ESC}?2004l`);
+}
+export function moveCursorToColumn(column) {
+    process.stdout.write(`${ESC}${column}G`);
+}
+export function relocateCursorToInputLine(rowsBelow, column) {
+    const up = rowsBelow > 0 ? `${ESC}${rowsBelow}A` : '';
+    const down = rowsBelow > 0 ? `${ESC}${rowsBelow}B` : '';
+    process.stdout.write(`${up}${ESC}${column}G${down}`);
+}

package/dist/tools/createSkill.js

@@ -96,6 +96,64 @@ function ensureFrontmatterDescription(skillMd, description) {
     // 兜底：在 frontmatter 末尾插入
     return skillMd.replace(/\n---/, `\ndescription: ${description}\n---`);
 }
+function decodeLooseJsonString(value) {
+    return value
+        .replace(/\\"/g, '"')
+        .replace(/\\n/g, '\n')
+        .replace(/\\r/g, '\r')
+        .replace(/\\t/g, '\t')
+        .replace(/\\\\/g, '\\');
+}
+function escapeRegExp(value) {
+    return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
+function extractLooseField(jsonStr, key, nextKeys) {
+    const keyPattern = new RegExp(`"${escapeRegExp(key)}"\\s*:\\s*"`, 'm');
+    const keyMatch = keyPattern.exec(jsonStr);
+    if (!keyMatch)
+        return undefined;
+    const valueStart = keyMatch.index + keyMatch[0].length;
+    let valueEnd = jsonStr.length;
+    for (const nextKey of nextKeys) {
+        const nextPattern = new RegExp(`"\\s*,\\s*\\n\\s*"${escapeRegExp(nextKey)}"\\s*:`, 'm');
+        const tail = jsonStr.slice(valueStart);
+        const nextMatch = nextPattern.exec(tail);
+        if (nextMatch) {
+            valueEnd = Math.min(valueEnd, valueStart + nextMatch.index);
+        }
+    }
+    if (nextKeys.length === 0) {
+        const tail = jsonStr.slice(valueStart);
+        const tailMatch = /"\s*\n?\s*}/m.exec(tail);
+        if (tailMatch) {
+            valueEnd = valueStart + tailMatch.index;
+        }
+    }
+    const rawValue = jsonStr.slice(valueStart, valueEnd);
+    return decodeLooseJsonString(rawValue);
+}
+function parseSkillJsonResult(jsonStr) {
+    try {
+        return JSON.parse(jsonStr);
+    }
+    catch {
+        const name = extractLooseField(jsonStr, 'name', ['description', 'argument_hint', 'skill_md', 'skill_py']);
+        const description = extractLooseField(jsonStr, 'description', ['argument_hint', 'skill_md', 'skill_py']);
+        const argument_hint = extractLooseField(jsonStr, 'argument_hint', ['skill_md', 'skill_py']);
+        const skill_md = extractLooseField(jsonStr, 'skill_md', ['skill_py']);
+        const skill_py = extractLooseField(jsonStr, 'skill_py', []);
+        if (!name || !description || !skill_md) {
+            throw new Error('无法从 LLM 输出中提取必要字段 (name, description, skill_md)');
+        }
+        return {
+            name: name.trim(),
+            description: description.trim(),
+            argument_hint: argument_hint?.trim() || undefined,
+            skill_md,
+            skill_py: skill_py || undefined,
+        };
+    }
+}
 /**
  * 调用 LLM 生成 skill 内容
  *
@@ -179,7 +237,7 @@ async function callLLMForSkill(requirement) {
         jsonStr = jsonBlockMatch[1].trim();
     }
     try {
-        const parsed = JSON.parse(jsonStr);
+        const parsed = parseSkillJsonResult(jsonStr);
         if (!parsed.name || !parsed.skill_md) {
             throw new Error('LLM 返回的 JSON 缺少必要字段 (name, skill_md)');
         }

package/dist/tools/readFile.js

@@ -1,17 +1,42 @@
 import fs from 'fs';
+import path from 'path';
+// 单次读取文件大小上限：1MB
+const MAX_FILE_SIZE = 1 * 1024 * 1024;
 export const readFile = {
     name: 'read_file',
     description: '读取指定路径的文件内容',
     parameters: {
-        path: { type: 'string', description: '文件路径', required: true },
+        path: { type: 'string', description: '文件路径（支持绝对路径或相对于当前工作目录的相对路径）', required: true },
     },
     execute: async (args) => {
-        const filePath = args.path;
+        const rawPath = args.path;
+        if (!rawPath || !rawPath.trim()) {
+            throw new Error('path 参数不能为空');
+        }
+        // 统一解析为绝对路径，相对路径基于 process.cwd()
+        const filePath = path.isAbsolute(rawPath) ? rawPath : path.resolve(process.cwd(), rawPath);
         try {
+            const stat = fs.statSync(filePath);
+            if (stat.isDirectory()) {
+                throw new Error(`路径是目录而非文件: ${filePath}`);
+            }
+            if (stat.size > MAX_FILE_SIZE) {
+                throw new Error(`文件过大（${(stat.size / 1024).toFixed(1)} KB），超过读取上限 ${MAX_FILE_SIZE / 1024} KB，请使用 search_files 或分段读取`);
+            }
             return fs.readFileSync(filePath, 'utf-8');
         }
         catch (e) {
-            throw new Error(`读取文件失败: ${e.message}`);
+            // 区分"文件不存在"和其他 IO 错误，给出更明确的提示
+            if (e.code === 'ENOENT') {
+                throw new Error(`文件不存在: ${filePath}`);
+            }
+            if (e.code === 'EACCES') {
+                throw new Error(`无权限读取文件: ${filePath}`);
+            }
+            // 重新抛出已包装的错误（如上面的 size/dir 检查）
+            throw e.message?.startsWith('文件') || e.message?.startsWith('路径')
+                ? e
+                : new Error(`读取文件失败: ${e.message}`);
         }
     },
 };

package/dist/tools/writeFile.js

@@ -73,6 +73,35 @@ function applyUnifiedDiff(original, diff) {
     }
     return result.join('\n');
 }
+/**
+ * 基于文本片段做精确替换，适合只改少量代码的场景。
+ */
+function applyStringReplace(original, oldString, newString, replaceAll, expectedReplacements) {
+    if (!oldString) {
+        throw new Error('replace 模式下 old_string 不能为空');
+    }
+    let matchCount = 0;
+    let searchStart = 0;
+    while (true) {
+        const idx = original.indexOf(oldString, searchStart);
+        if (idx === -1)
+            break;
+        matchCount++;
+        searchStart = idx + oldString.length;
+    }
+    if (matchCount === 0) {
+        throw new Error('replace 模式未找到要替换的内容');
+    }
+    if (expectedReplacements !== undefined && matchCount !== expectedReplacements) {
+        throw new Error(`replace 模式匹配数量不符合预期，期望 ${expectedReplacements}，实际 ${matchCount}`);
+    }
+    if (!replaceAll && matchCount !== 1) {
+        throw new Error(`replace 模式要求目标内容唯一，当前匹配到 ${matchCount} 处。请提供更精确的 old_string，或开启 replace_all`);
+    }
+    return replaceAll
+        ? original.split(oldString).join(newString)
+        : original.replace(oldString, newString);
+}
 /**
  * 写入文件内容（支持安全检测）。
  * 返回写入结果消息。
@@ -95,13 +124,33 @@ function doWrite(filePath, content) {
 }
 export const writeFile = {
     name: 'write_file',
-    description: '写入内容到指定文件。支持两种模式：overwrite（默认）完整替换文件内容；diff 模式接收 unified diff 格式补丁，对文件进行增量更新。',
+    description: '写入内容到指定文件。修改已有文件时优先使用 replace 或 diff 做局部更新，只有新建文件或大范围重写时才使用 overwrite。支持三种模式：overwrite（完整替换）、replace（按文本片段精确替换）、diff（基于 unified diff 增量更新）。',
     parameters: {
         path: { type: 'string', description: '文件路径', required: true },
         content: { type: 'string', description: '文件内容（overwrite 模式必填）', required: false },
         mode: {
             type: 'string',
-            description: '写入模式：overwrite（完整替换，默认）| diff（增量更新）',
+            description: '写入模式：overwrite（完整替换，默认）| replace（局部替换）| diff（增量更新）',
+            required: false,
+        },
+        old_string: {
+            type: 'string',
+            description: 'replace 模式必填：要查找并替换的原始文本片段',
+            required: false,
+        },
+        new_string: {
+            type: 'string',
+            description: 'replace 模式必填：替换后的文本片段',
+            required: false,
+        },
+        replace_all: {
+            type: 'boolean',
+            description: 'replace 模式可选：是否替换所有匹配项，默认 false',
+            required: false,
+        },
+        expected_replacements: {
+            type: 'number',
+            description: 'replace 模式可选：期望匹配数量，不符合时直接报错，防止误替换',
             required: false,
         },
         diff: {
@@ -113,6 +162,18 @@ export const writeFile = {
     execute: async (args) => {
         const filePath = args.path;
         const mode = args.mode || 'overwrite';
+        if (mode === 'replace') {
+            const oldString = args.old_string;
+            const newString = args.new_string ?? '';
+            const replaceAll = Boolean(args.replace_all);
+            const expectedReplacements = args.expected_replacements === undefined ? undefined : Number(args.expected_replacements);
+            if (!fs.existsSync(filePath)) {
+                throw new Error(`replace 模式要求目标文件已存在: ${filePath}`);
+            }
+            const original = fs.readFileSync(filePath, 'utf-8');
+            const replaced = applyStringReplace(original, oldString, newString, replaceAll, expectedReplacements);
+            return doWrite(filePath, replaced);
+        }
         if (mode === 'diff') {
             const diffContent = args.diff;
             if (!diffContent) {

package/package.json

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