@zhuan-ai/zhuanspec 2.16.4 → 2.16.5

package/dist/core/hooks/record-progress.js

@@ -405,6 +405,55 @@ function generateProposalChangeSummary(toolInput) {
     // Truncate to 120 chars
     return firstLine.length > 120 ? firstLine.substring(0, 117) + '...' : firstLine;
 }
+function parseApplyPatch(command) {
+    const result = { files: [], totalLinesAdded: 0, totalLinesRemoved: 0 };
+    if (!command)
+        return result;
+    const lines = command.split('\n');
+    let currentFile = null;
+    for (const line of lines) {
+        if (line.startsWith('*** Add File: ') || line.startsWith('*** Update File: ')) {
+            if (currentFile)
+                result.files.push(currentFile);
+            const filePath = line.replace(/^\*\*\* (?:Add|Update) File:\s*/, '').trim();
+            currentFile = { path: filePath, linesAdded: 0, linesRemoved: 0 };
+        }
+        else if (line.startsWith('*** Delete File: ')) {
+            if (currentFile)
+                result.files.push(currentFile);
+            const filePath = line.replace(/^\*\*\* Delete File:\s*/, '').trim();
+            currentFile = { path: filePath, linesAdded: 0, linesRemoved: 0 };
+        }
+        else if (line === '*** End Patch' || line === '*** Begin Patch') {
+            if (currentFile) {
+                result.files.push(currentFile);
+                currentFile = null;
+            }
+        }
+        else if (line.startsWith('*** ')) {
+            // Other patch directives (e.g., *** Rename File:) — push current and skip
+            if (currentFile) {
+                result.files.push(currentFile);
+                currentFile = null;
+            }
+        }
+        else if (currentFile) {
+            if (line.startsWith('+'))
+                currentFile.linesAdded++;
+            else if (line.startsWith('-'))
+                currentFile.linesRemoved++;
+            // Context lines (space prefix or @@ markers) are ignored for counting
+        }
+    }
+    if (currentFile)
+        result.files.push(currentFile);
+    // Calculate totals
+    for (const f of result.files) {
+        result.totalLinesAdded += f.linesAdded;
+        result.totalLinesRemoved += f.linesRemoved;
+    }
+    return result;
+}
 async function runRecordProgress(filePath, toolName, success, stdinData) {
     const cwd = resolveZhuanSpecRoot();
     // Priority: filePath-derived > progress.json scan > environment variables
@@ -620,8 +669,31 @@ async function runRecordProgress(filePath, toolName, success, stdinData) {
     progress.currentNode = process.env.ZHUANSPEC_CURRENT_NODE || phase;
     progress.currentTask = currentTask || progress.currentTask;
     progress.toolCalls.push(toolCall);
-    const WRITE_TOOLS = new Set(['Write', 'Edit', 'MultiEdit', 'NotebookEdit']);
-    if (filePath && WRITE_TOOLS.has(toolName) && !progress.filesModified.includes(filePath)) {
+    // === Codex apply_patch 支持 ===
+    // Codex 使用 apply_patch 工具，file_path 为空，实际内容在 command 字段的 patch 格式中
+    let patchResult = null;
+    if (toolName === 'apply_patch') {
+        const command = stdinData.tool_input?.command || '';
+        patchResult = parseApplyPatch(command);
+        // 用第一个文件路径作为 filePath（用于 accuracy 追踪和 change detection）
+        if (patchResult.files.length > 0 && !filePath) {
+            filePath = patchResult.files[0].path;
+        }
+    }
+    const WRITE_TOOLS = new Set(['Write', 'Edit', 'MultiEdit', 'NotebookEdit', 'apply_patch']);
+    if (toolName === 'apply_patch' && patchResult) {
+        // apply_patch 可修改多文件，逐一加入 filesModified
+        const zhuanspecDirPrefix = path.resolve(process.cwd(), 'zhuanspec') + path.sep;
+        for (const f of patchResult.files) {
+            if (!f.path || progress.filesModified.includes(f.path))
+                continue;
+            const absF = path.isAbsolute(f.path) ? f.path : path.resolve(process.cwd(), f.path);
+            if (!absF.startsWith(zhuanspecDirPrefix)) {
+                progress.filesModified.push(f.path);
+            }
+        }
+    }
+    else if (filePath && WRITE_TOOLS.has(toolName) && !progress.filesModified.includes(filePath)) {
         // Exclude ZhuanSpec internal files (spec/metrics/doc files inside zhuanspec/ dir)
         const absFilePath = path.isAbsolute(filePath) ? filePath : path.resolve(process.cwd(), filePath);
         const zhuanspecDirPrefix = path.resolve(process.cwd(), 'zhuanspec') + path.sep;
@@ -631,7 +703,7 @@ async function runRecordProgress(filePath, toolName, success, stdinData) {
     }
     // Detect proposal file changes and record them
     const changePath = path.join(zhuanspecDir, 'changes', changeId);
-    const WRITE_EDIT_TOOLS = new Set(['Write', 'Edit', 'MultiEdit']);
+    const WRITE_EDIT_TOOLS = new Set(['Write', 'Edit', 'MultiEdit', 'apply_patch']);
     if (filePath && WRITE_EDIT_TOOLS.has(toolName) && isProposalFile(filePath, changePath)) {
         const relativeProposalPath = path.relative(changePath, path.isAbsolute(filePath) ? filePath : path.resolve(cwd, filePath));
         // 提案文件变更行数：按工具类型取不同字段，避免 Edit/MultiEdit 全记为 0
@@ -652,6 +724,16 @@ async function runRecordProgress(filePath, toolName, success, stdinData) {
                 contentLines += Math.max(ns, os);
             }
         }
+        else if (toolName === 'apply_patch' && patchResult) {
+            // apply_patch 的提案文件变更行数：用 patch 中涉及该提案文件的行数
+            const absChangePath = path.isAbsolute(changePath) ? changePath : path.resolve(cwd, changePath);
+            for (const f of patchResult.files) {
+                const absF = path.isAbsolute(f.path) ? f.path : path.resolve(cwd, f.path);
+                if (absF.startsWith(absChangePath + path.sep)) {
+                    contentLines += f.linesAdded + f.linesRemoved;
+                }
+            }
+        }
         const record = {
             changeRecordId: `pc-${Date.now()}`,
             timestamp,
@@ -725,6 +807,11 @@ async function runRecordProgress(filePath, toolName, success, stdinData) {
         }
         contentSource = toolInputEdits.length > 0 ? 'edits[]' : 'none';
     }
+    else if (toolName === 'apply_patch' && patchResult) {
+        // Codex apply_patch：统计 patch 中所有 +/- 行
+        changeLines = patchResult.totalLinesAdded + patchResult.totalLinesRemoved;
+        contentSource = patchResult.files.length > 0 ? 'command' : 'none';
+    }
     let estimatedLines = 0;
     // === P0 兜底：post-baseline-fallback ===
     // 正常链路：UserPromptSubmit 的 user-input hook 会在 phaseBaseline 已打标时写入

package/dist/core/hooks/user-input-hook.js

@@ -185,17 +185,19 @@ export async function userInputHook(content, responseTimeMs) {
         logDebug(cwd, { event: 'skip', reason: 'content-too-short', changeId, phase, phaseSource, contentLen });
         return { continue: true };
     }
-    // Skip slash/bang commands (e.g. /zhuanspec:proposal, /compact, /clear, !ls).
-    // 这类 prompt 是命令/workflow 触发，非“用户对 AI 产出的纠偏/濄清/补充”，
+    // Skip slash/bang/dollar commands:
+    //   Claude Code: /zhuanspec:proposal, /compact, /clear, !ls
+    //   Codex: $zhuanspec-proposal, $zhuanspec-techDesign 等 skill 触发
+    // 这类 prompt 是命令/workflow 触发，非"用户对 AI 产出的纠偏/澄清/补充"，
     // 不应计入 user_inputs.json，更不应放进纠偏溯源池影响 accuracyRate。
     // 注意：Claude Code 在 slash 命令前会注入 NAK(U+0015) 等 C0 控制字符做标记，
     // 普通 trim() 不会剥控制字符，必须显式剥掉前缀的 C0/DEL 再做正则判定，
     // 否则像 "\u0015/zhuanspec:proposal" 这种命令会漏过过滤被记成普通用户输入。
     const trimmedContent = content.trim().replace(/^[\x00-\x1F\x7F]+/, '');
-    if (/^[/!][A-Za-z0-9_:/@.\-]+(\s|$)/.test(trimmedContent) || /^\/[\w:\-]+$/.test(trimmedContent)) {
+    if (/^[/!$][A-Za-z0-9_:/@.\-]+(\s|$)/.test(trimmedContent) || /^\/[\w:\-]+$/.test(trimmedContent)) {
         logDebug(cwd, {
             event: 'skip',
-            reason: 'slash-command',
+            reason: 'skill-command',
             changeId,
             phase,
             phaseSource,

package/dist/core/templates/codex-hooks-template.js

@@ -50,7 +50,7 @@ const CODEX_DEFAULT_HOOKS = [
     },
     {
         event: 'PostToolUse',
-        matcher: 'Write|Edit|Read|Grep|Glob|Bash|Skill|Agent|mcp__.*',
+        matcher: 'Write|Edit|apply_patch|Read|Grep|Glob|Bash|Skill|Agent|mcp__.*',
         command: 'ZHUANSPEC_HOST=codex zhuanspec-hook record-progress --json',
         statusMessage: '📝 Recording progress...',
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhuan-ai/zhuanspec",
-  "version": "2.16.4",
+  "version": "2.16.5",
   "description": "AI-native system for spec-driven development",
   "keywords": [
     "zhuanspec",
@@ -39,6 +39,26 @@
     "!dist/**/__tests__",
     "!dist/**/*.map"
   ],
+  "scripts": {
+    "lint": "eslint src/",
+    "build": "node build.js",
+    "dev": "tsc --watch",
+    "dev:cli": "pnpm build && node bin/zhuanspec.js",
+    "test": "vitest run",
+    "test:watch": "vitest",
+    "test:ui": "vitest --ui",
+    "test:coverage": "vitest --coverage",
+    "test:postinstall": "node scripts/postinstall.js",
+    "prepare": "npm run build",
+    "prepublishOnly": "npm run build",
+    "postinstall": "node scripts/postinstall.js",
+    "check:pack-version": "node scripts/pack-version-check.mjs",
+    "diagnose:cursor": "node scripts/diagnose-cursor-commands.js",
+    "release": "pnpm run release:ci",
+    "release:ci": "pnpm run check:pack-version && pnpm exec changeset publish",
+    "release:local": "pnpm exec changeset version && pnpm run check:pack-version && pnpm exec changeset publish",
+    "changeset": "changeset"
+  },
   "engines": {
     "node": ">=20.19.0"
   },
@@ -60,23 +80,5 @@
     "ora": "^8.2.0",
     "yaml": "^2.8.2",
     "zod": "^4.0.17"
-  },
-  "scripts": {
-    "lint": "eslint src/",
-    "build": "node build.js",
-    "dev": "tsc --watch",
-    "dev:cli": "pnpm build && node bin/zhuanspec.js",
-    "test": "vitest run",
-    "test:watch": "vitest",
-    "test:ui": "vitest --ui",
-    "test:coverage": "vitest --coverage",
-    "test:postinstall": "node scripts/postinstall.js",
-    "postinstall": "node scripts/postinstall.js",
-    "check:pack-version": "node scripts/pack-version-check.mjs",
-    "diagnose:cursor": "node scripts/diagnose-cursor-commands.js",
-    "release": "pnpm run release:ci",
-    "release:ci": "pnpm run check:pack-version && pnpm exec changeset publish",
-    "release:local": "pnpm exec changeset version && pnpm run check:pack-version && pnpm exec changeset publish",
-    "changeset": "changeset"
   }
-}
+}