mocode-ai 1.0.13 → 1.1.0

package/dist/tools/builtins/edit-file.js

@@ -13,37 +13,91 @@ function conflict(path, details) {
 }
 export const editFileTool = {
     name: 'edit_file',
-    description: 'Replace one exact string in a file transactionally. expected_hash is required and must be copied from a fresh read_file artifact header. If the file changes after that read, the edit is rejected without writing.',
+    description: `Replace content in a file transactionally. Supports two modes:
+
+**String replacement mode (default):** Provide old_string that occurs exactly once in the file. The old_string must be copied verbatim from a fresh read_file output — do NOT reconstruct from memory, summaries, or grep output, as these lose whitespace/indentation details. Common failure modes: trailing whitespace, tabs vs spaces, indentation changes, line-ending mismatches (CRLF vs LF).
+
+**Line-range mode:** Provide line_start and line_end (1-based, inclusive) instead of old_string. Use this when the exact text is hard to reproduce or when replacing a large block.
+
+expected_hash is required (sha256 from read_file artifact header) and must match the current file hash. If the file changed after your read, the edit is rejected. Recovery: call read_file again on the same path and copy both the new hash and exact text.
+
+**When to use which mode:**
+- String replacement: small, unique text fragments (function signatures, config keys, error messages)
+- Line-range: large blocks, repeated patterns, or when whitespace precision is critical
+
+**Anti-patterns (will fail):**
+- old_string reconstructed from memory or a summary
+- old_string copied from a previous tool call that may be stale
+- old_string that appears multiple times (add more context to make it unique)
+- expected_hash from a different file or an old read_file call`,
     risk: 'confirm',
     parameters: {
         type: 'object',
         properties: {
-            path: { type: 'string' },
-            old_string: { type: 'string', description: 'The original text; must occur exactly once.' },
-            new_string: { type: 'string', description: 'Replacement text.' },
-            expected_hash: { type: 'string', description: 'sha256 hash from the latest read_file artifact header.' },
+            path: { type: 'string', description: 'Absolute file path.' },
+            old_string: { type: 'string', description: 'String replacement mode: the exact text to replace (must occur once). Mutually exclusive with line_start/line_end.' },
+            new_string: { type: 'string', description: 'The replacement text.' },
+            line_start: { type: 'integer', description: 'Line-range mode: start line (1-based, inclusive). Mutually exclusive with old_string.' },
+            line_end: { type: 'integer', description: 'Line-range mode: end line (1-based, inclusive). Mutually exclusive with old_string.' },
+            expected_hash: { type: 'string', description: 'sha256 hash from the latest read_file artifact header (sha256:<64 hex>).' },
         },
-        required: ['path', 'old_string', 'new_string', 'expected_hash'],
+        required: ['path', 'new_string', 'expected_hash'],
     },
     async execute(args, ctx) {
         const file = String(args.path);
-        const oldString = String(args.old_string);
         const newString = String(args.new_string);
         const expectedHash = normalizeContentHash(String(args.expected_hash));
         if (!expectedHash)
             return conflict(file, 'expected_hash 必须是 sha256:<64 hex>。');
+        const hasOldString = args.old_string !== undefined;
+        const hasLineStart = args.line_start !== undefined;
+        const hasLineEnd = args.line_end !== undefined;
+        // 参数互斥检查
+        if (hasOldString && (hasLineStart || hasLineEnd)) {
+            return conflict(file, 'old_string 和 line_start/line_end 互斥，请选择一种模式。');
+        }
+        if (!hasOldString && (!hasLineStart || !hasLineEnd)) {
+            return conflict(file, '必须提供 old_string 或同时提供 line_start 和 line_end。');
+        }
         const data = await readFile(jailResolve(file), 'utf8');
         const normalized = data.replace(/\r\n/g, '\n').replace(/\r/g, '\n');
-        const oldNormalized = oldString.replace(/\r\n/g, '\n').replace(/\r/g, '\n');
         const newNormalized = newString.replace(/\r\n/g, '\n').replace(/\r/g, '\n');
-        const count = normalized.split(oldNormalized).length - 1;
-        if (count === 0) {
-            return conflict(file, 'old_string 未找到；请重新 read_file 并复制最新内容。');
+        let updated;
+        if (hasOldString) {
+            // String replacement mode
+            const oldString = String(args.old_string);
+            const oldNormalized = oldString.replace(/\r\n/g, '\n').replace(/\r/g, '\n');
+            const count = normalized.split(oldNormalized).length - 1;
+            if (count === 0) {
+                return conflict(file, 'old_string 未找到；请重新 read_file 并复制最新内容。');
+            }
+            if (count > 1) {
+                return conflict(file, `old_string 出现 ${count} 次；请增加上下文使其唯一。`);
+            }
+            updated = normalized.replace(oldNormalized, () => newNormalized);
         }
-        if (count > 1) {
-            return conflict(file, `old_string 出现 ${count} 次；请增加上下文使其唯一。`);
+        else {
+            // Line-range mode
+            const lineStart = Number(args.line_start);
+            const lineEnd = Number(args.line_end);
+            if (!Number.isInteger(lineStart) || !Number.isInteger(lineEnd)) {
+                return conflict(file, 'line_start 和 line_end 必须是整数。');
+            }
+            if (lineStart < 1 || lineEnd < lineStart) {
+                return conflict(file, `无效的 line range: line_start=${lineStart}, line_end=${lineEnd}。要求 line_start >= 1 且 line_end >= line_start。`);
+            }
+            const lines = normalized.split('\n');
+            if (lineEnd > lines.length) {
+                return conflict(file, `line_end=${lineEnd} 超出文件范围 (共 ${lines.length} 行)。`);
+            }
+            // 替换指定行范围（1-based 转 0-based）
+            const startIndex = lineStart - 1;
+            const endIndex = lineEnd - 1;
+            const newLines = newNormalized.split('\n');
+            // 替换 lines[startIndex..endIndex] 为 newLines
+            lines.splice(startIndex, endIndex - startIndex + 1, ...newLines);
+            updated = lines.join('\n');
         }
-        const updated = normalized.replace(oldNormalized, () => newNormalized);
         const replacement = data.includes('\r\n') ? updated.replace(/\n/g, '\r\n') : updated;
         const result = await commitChangeSet(createChangeSet([{
                 path: file,

package/dist/tools/builtins/glob.js

@@ -5,7 +5,7 @@ import { getSandboxRoot, isInsideRoot } from '../../sandbox/index.js';
 export const globTool = {
     name: 'glob',
     description: 'Find files matching a glob pattern (e.g. **/*.ts). Auto-excludes node_modules/.git.' +
-        ' For architecture/call chains, prefer codegraph.',
+        ' For architecture or call chains, prefer loading the `codegraph` skill (use_skill).',
     parameters: {
         type: 'object',
         properties: {

package/dist/tools/builtins/grep.js

@@ -8,7 +8,7 @@ export const grepTool = {
     description: 'Search file contents by regex (recursive, excludes node_modules/.git).\n' +
         'Output: per-file header "<path>: N matches, lines [l1, l2, ...]" + first N matching lines.\n' +
         'Use the line-number list to call read_file(offset=X, limit=Y) for each region — ' +
-        'do NOT read entire files after grepping. Prefer codegraph for call chains.',
+        'do NOT read entire files after grepping. For call chains across many files, prefer loading the `codegraph` skill (use_skill).',
     parameters: {
         type: 'object',
         properties: {

package/dist/tools/builtins/index.js

@@ -8,8 +8,6 @@ import { webSearchTool } from './web-search.js';
 import { webFetchTool } from './web-fetch.js';
 import { useSkillTool } from './use-skill.js';
 import { askHumanTool } from './ask-human.js';
-import { codegraphTool } from './codegraph.js';
-import { switchModeTool } from './switch-mode.js';
 import { dropContextTool } from './drop-context.js';
 import { memorySaveTool } from './memory-save.js';
 import { memorySearchTool } from './memory-search.js';
@@ -17,7 +15,6 @@ import { memoryListTool } from './memory-list.js';
 import { memoryUpdateTool } from './memory-update.js';
 import { memoryForgetTool } from './memory-forget.js';
 import { subAgentTool } from './task.js';
-import { projectSkillUpdateTool } from './project-skill-update.js';
 /**
  * 所有内置工具,按注册顺序排列。
  * 加新工具:在本目录新建 `xxx.ts` 导出一个 Tool,再在下面数组里加一行。无需改 agent / llm。
@@ -41,11 +38,6 @@ const _memoryTools = _memoryEnabledAtBoot
         memoryForgetTool,
     ]
     : [];
-/** 项目专属 Skill 工具:仅在 MOCODE_PROJECT_SKILL=true 时注册,与 memory 同模式。 */
-const _projectSkillEnabledAtBoot = process.env.MOCODE_PROJECT_SKILL === 'true';
-const _projectSkillTools = _projectSkillEnabledAtBoot
-    ? [projectSkillUpdateTool]
-    : [];
 const pathResource = (args) => typeof args.path === 'string' && args.path ? [`file:${args.path}`] : ['workspace'];
 const workspaceResource = () => ['workspace'];
 const memoryResource = () => ['memory-store'];
@@ -56,19 +48,16 @@ const CAPABILITIES = {
     run_command: { effect: 'process', concurrency: 'serial', retry: 'never', resources: workspaceResource, supportsAbort: true },
     glob: { effect: 'read', concurrency: 'parallel', retry: 'safe', resources: workspaceResource },
     grep: { effect: 'read', concurrency: 'parallel', retry: 'safe', resources: workspaceResource },
-    codegraph: { effect: 'read', concurrency: 'parallel', retry: 'safe', resources: workspaceResource, supportsAbort: true },
     web_search: { effect: 'network', concurrency: 'parallel', retry: 'safe', supportsAbort: true },
     web_fetch: { effect: 'network', concurrency: 'parallel', retry: 'safe', supportsAbort: true },
     use_skill: { effect: 'read', concurrency: 'serial', retry: 'safe' },
     ask_human: { effect: 'read', concurrency: 'serial', retry: 'never' },
-    switch_mode: { effect: 'write', concurrency: 'serial', retry: 'never', resources: () => ['agent-mode'] },
     drop_context: { effect: 'write', concurrency: 'serial', retry: 'never', resources: () => ['conversation-context'] },
     memory_save: { effect: 'write', concurrency: 'serial', retry: 'never', resources: memoryResource },
     memory_search: { effect: 'write', concurrency: 'serial', retry: 'never', resources: memoryResource },
     memory_list: { effect: 'read', concurrency: 'serial', retry: 'safe', resources: memoryResource },
     memory_update: { effect: 'write', concurrency: 'serial', retry: 'never', resources: memoryResource },
     memory_forget: { effect: 'write', concurrency: 'serial', retry: 'never', resources: memoryResource },
-    project_skill_update: { effect: 'write', concurrency: 'serial', retry: 'never', resources: workspaceResource },
     // sub-agent 动态协调：只读任务无锁并行；写任务在 overlay 中执行，merge 时由 ChangeSet 持 canonical lock。
     'sub-agent': {
         effect: 'write',
@@ -88,15 +77,12 @@ const rawBuiltinTools = [
     runCommandTool,
     globTool,
     grepTool,
-    codegraphTool,
     webSearchTool,
     webFetchTool,
     useSkillTool,
     askHumanTool,
-    switchModeTool,
     dropContextTool,
     ..._memoryTools,
-    ..._projectSkillTools,
     subAgentTool,
 ];
 /** 所有内置工具均携带显式能力；新增工具遗漏声明时 registry 会保守串行。 */

package/dist/tools/builtins/read-file.js

@@ -12,7 +12,7 @@ export const readFileTool = {
     description: 'Read file content with line numbers. Read before editing.\n' +
         'For files >500 lines: grep first to locate regions, then call read_file multiple times ' +
         'with offset+limit (e.g. offset=350, limit=120). Do NOT read an entire large file in one call.\n' +
-        'Prefer codegraph over reading files one at a time for architecture/call-chain questions.',
+        'For architecture or call-chain questions, prefer loading the `codegraph` skill (use_skill) over reading files one at a time.',
     parameters: {
         type: 'object',
         properties: {

package/dist/tools/constants.js

@@ -28,7 +28,8 @@ export const IGNORE = ['**/node_modules/**', '**/.git/**'];
  * plan 模式下从工具 schema 里剔除的工具(模型根本看不到 → 调不到):
  * 写盘 / 命令 / 记忆写入类 + sub-agent（派生子 agent，plan 模式只读不可有副作用）。单一事实源,
  * 被 llm(planChatTools)与 agent(防御 backstop)共用。
- * 只读工具(read_file/glob/grep/codegraph/web_search/web_fetch/use_skill/ask_human/memory_search/memory_list)保留。
+ * 只读工具(read_file/glob/grep/web_search/web_fetch/use_skill/ask_human/memory_search/memory_list)保留。
+ * 注:codegraph 已 skill 化(用 run_command 调 CLI),不算核心工具,不在此屏蔽集。
  */
 export const PLAN_DISABLED_TOOLS = new Set([
     'write_file',

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "mocode-ai",
-  "version": "1.0.13",
+  "version": "1.1.0",
   "description": "终端编码 agent:LLM + tool-call 循环 + 流式输出(含思考)+ 16 个工具,接任意 OpenAI 兼容后端。",
   "type": "module",
   "bin": {
-    "mocode": "bin/mocode.js"
+    "mocode": "bin/mocode.js",
+    "mocode-agent-host": "bin/mocode-agent-host.js"
   },
   "files": [
     "dist",