ronds_ai 0.1.17 → 0.1.19

package/README.md

@@ -121,12 +121,12 @@ npx ronds_ai@latest record cursor
 
 行为说明：
 
-- 从 `stdin` 读取一段 JSON
-- 根据来源提取文件路径、变更内容、增删行数、仓库信息、worker_id
-- 组装事件后通过 HTTP POST 上报
-- Claude / Cursor 成功时输出一行 JSON
-- Claude / Cursor 失败时会把事件写入本地失败日志，并输出保存位置
-- Codex 作为 `PostToolUse` hook 调用时，标准输出固定为 Codex hook command output schema，避免触发 `invalid post-tool-use JSON output`
+- 从 `stdin` 读取一段 JSON
+- 根据来源提取文件路径、变更内容、增删行数、仓库信息、worker_id
+- 组装事件后通过 HTTP POST 上报
+- Claude / Cursor 成功时输出一行 JSON
+- Claude / Cursor 失败时会把事件写入本地失败日志，并输出保存位置
+- Codex 作为 `PostToolUse` hook 调用时，标准输出固定为 Codex hook command output schema，避免触发 `invalid post-tool-use JSON output`
 
 成功输出示例：
 
@@ -158,13 +158,13 @@ npx ronds_ai@latest record cursor
 - `Edit`
 - `MultiEdit`
 
-Codex 使用 `PostToolUse` hook，在 `apply_patch` 执行后直接解析本次补丁内容并生成变更事件；失败事件同样写入 `~/.ronds_ai/failed-events`。
-
-Codex 输出示例：
-
-```json
-{"continue":true,"suppressOutput":true,"hookSpecificOutput":{"hookEventName":"PostToolUse"}}
-```
+Codex 使用 `PostToolUse` hook，在 `apply_patch` 执行后直接解析本次补丁内容并生成变更事件；失败事件同样写入 `~/.ronds_ai/failed-events`。
+
+Codex 输出示例：
+
+```json
+{"continue":true,"hookSpecificOutput":{"hookEventName":"PostToolUse"}}
+```
 
 ### `doctor`
 
@@ -303,7 +303,7 @@ npx ronds_ai@latest skills install demo-skill --tool codex,cursor --scope projec
 - `HOOK_REPORT_TIMEOUT_MS`: 请求超时时间，默认 `10000`
 - `HOOK_REPORT_TOKEN`: 如果设置，会以 `Authorization: Bearer <token>` 发送
 - `HOOK_REPORT_HEADERS`: 额外请求头，要求是 JSON 字符串
-- `HOOK_REQUEST_DRY_RUN=1`: 不发请求。Claude / Cursor 会把事件打印到标准输出；Codex 仍输出合法的 PostToolUse hook command output schema
+- `HOOK_REQUEST_DRY_RUN=1`: 不发请求。Claude / Cursor 会把事件打印到标准输出；Codex 仍输出合法的 PostToolUse hook command output schema
 
 默认上报地址：
 

package/lib/code_record.js

@@ -11,20 +11,19 @@ const MAX_ADDED_CONTENT_CHARS = 20000;
 const DEFAULT_HOOK_REPORT_URL = 'https://aihub.ronds.com/api/api/v1/ai-code-events';
 const CLAUDE_SUPPORTED_HOOK_EVENT = 'PostToolUse';
 const CLAUDE_SUPPORTED_TOOLS = new Set(['Write', 'Edit', 'MultiEdit']);
-const CURSOR_SUPPORTED_HOOK_EVENT = 'afterFileEdit';
-const CODEX_SUPPORTED_HOOK_EVENT = 'PostToolUse';
-const CODEX_SUPPORTED_TOOL = 'apply_patch';
-
-// 构造 Codex PostToolUse hook 要求的标准输出，避免 stdout 出现 schema 之外的字段。
-function buildCodexPostToolUseOutput() {
-  return {
-    continue: true,
-    suppressOutput: true,
-    hookSpecificOutput: {
-      hookEventName: CODEX_SUPPORTED_HOOK_EVENT,
-    },
-  };
-}
+const CURSOR_SUPPORTED_HOOK_EVENT = 'afterFileEdit';
+const CODEX_SUPPORTED_HOOK_EVENT = 'PostToolUse';
+const CODEX_SUPPORTED_TOOL = 'apply_patch';
+
+// 构造 Codex PostToolUse hook 要求的标准输出，避免 stdout 出现 schema 之外的字段。
+function buildCodexPostToolUseOutput() {
+  return {
+    continue: true,
+    hookSpecificOutput: {
+      hookEventName: CODEX_SUPPORTED_HOOK_EVENT,
+    },
+  };
+}
 
 function readStdin() {
   return new Promise((resolve, reject) => {
@@ -433,119 +432,119 @@ function buildCursorEvent(payload, source) {
   };
 }
 
-// 从 Codex PostToolUse 的 apply_patch 命令中提取补丁正文。
-function extractApplyPatchText(command) {
-  const rawCommand = String(command || '').replace(/\r\n/g, '\n');
-  const beginIndex = rawCommand.indexOf('*** Begin Patch');
-  const endIndex = rawCommand.indexOf('*** End Patch', beginIndex);
-  if (beginIndex === -1 || endIndex === -1) {
-    return '';
-  }
-
-  return rawCommand.slice(beginIndex, endIndex + '*** End Patch'.length);
-}
-
-// 解析 apply_patch 文件头，返回变更类型和目标路径。
-function parseApplyPatchHeader(line) {
-  const match = /^\*\*\* (Add|Update|Delete) File: (.+)$/.exec(line);
-  if (!match) {
-    return null;
-  }
-
-  return {
-    action: match[1],
-    path: match[2].trim(),
-  };
-}
-
-// 按文件聚合 apply_patch 中的新增/删除行，生成后续上报需要的变更摘要。
-function parseApplyPatchFiles(patchText) {
-  const lines = String(patchText || '').replace(/\r\n/g, '\n').split('\n');
-  const files = [];
-  let current = null;
-
-  for (const line of lines) {
-    const header = parseApplyPatchHeader(line);
-    if (header) {
-      current = {
-        path: header.path,
-        action: header.action,
-        movedTo: '',
-        addedLines: [],
-        added: 0,
-        removed: 0,
-      };
-      files.push(current);
-      continue;
-    }
-
-    if (!current) {
-      continue;
-    }
-
-    if (line.startsWith('*** Move to: ')) {
-      current.movedTo = line.slice('*** Move to: '.length).trim();
-      continue;
-    }
-
-    if (line.startsWith('+++') || line.startsWith('---')) {
-      continue;
-    }
-
-    if (line.startsWith('+')) {
-      const addedLine = line.slice(1);
-      if (addedLine !== '') {
-        current.addedLines.push(addedLine);
-        current.added += 1;
-      }
-      continue;
-    }
-
-    if (line.startsWith('-')) {
-      if (line.slice(1) !== '') {
-        current.removed += 1;
-      }
-    }
-  }
-
-  return files;
-}
-
-// 将 Codex apply_patch 的文件级变更转换为统一代码事件。
-function buildCodexApplyPatchEvents(payload, source, patchFiles) {
-  const cwd = payload.cwd || process.cwd();
-  const events = [];
-
-  for (const fileChange of patchFiles) {
-    const eventPath = fileChange.movedTo || fileChange.path;
-    const absoluteFilePath = path.resolve(cwd, eventPath);
-    const { repoRoot, git, repoRelativePath } = getGitInfo(absoluteFilePath);
-    const workerId = resolveWorkerId(repoRoot);
-    let addedContent = fileChange.addedLines.join('\n');
-    if (addedContent.length > MAX_ADDED_CONTENT_CHARS) {
-      addedContent = `${addedContent.slice(0, MAX_ADDED_CONTENT_CHARS)}\n... (truncated)`;
-    }
-
-    events.push({
-      event_id: randomUUID(),
-      timestamp: new Date().toISOString(),
-      source,
-      worker_id: workerId,
-      git,
-      file: {
-        path: repoRelativePath || eventPath.replace(/\\/g, '/'),
-        operation: fileChange.action === 'Add' ? 'write' : 'edit',
-      },
-      changes: {
-        added_content: addedContent,
-        added: fileChange.added,
-        removed: fileChange.removed,
-      },
-    });
-  }
-
-  return events;
-}
+// 从 Codex PostToolUse 的 apply_patch 命令中提取补丁正文。
+function extractApplyPatchText(command) {
+  const rawCommand = String(command || '').replace(/\r\n/g, '\n');
+  const beginIndex = rawCommand.indexOf('*** Begin Patch');
+  const endIndex = rawCommand.indexOf('*** End Patch', beginIndex);
+  if (beginIndex === -1 || endIndex === -1) {
+    return '';
+  }
+
+  return rawCommand.slice(beginIndex, endIndex + '*** End Patch'.length);
+}
+
+// 解析 apply_patch 文件头，返回变更类型和目标路径。
+function parseApplyPatchHeader(line) {
+  const match = /^\*\*\* (Add|Update|Delete) File: (.+)$/.exec(line);
+  if (!match) {
+    return null;
+  }
+
+  return {
+    action: match[1],
+    path: match[2].trim(),
+  };
+}
+
+// 按文件聚合 apply_patch 中的新增/删除行，生成后续上报需要的变更摘要。
+function parseApplyPatchFiles(patchText) {
+  const lines = String(patchText || '').replace(/\r\n/g, '\n').split('\n');
+  const files = [];
+  let current = null;
+
+  for (const line of lines) {
+    const header = parseApplyPatchHeader(line);
+    if (header) {
+      current = {
+        path: header.path,
+        action: header.action,
+        movedTo: '',
+        addedLines: [],
+        added: 0,
+        removed: 0,
+      };
+      files.push(current);
+      continue;
+    }
+
+    if (!current) {
+      continue;
+    }
+
+    if (line.startsWith('*** Move to: ')) {
+      current.movedTo = line.slice('*** Move to: '.length).trim();
+      continue;
+    }
+
+    if (line.startsWith('+++') || line.startsWith('---')) {
+      continue;
+    }
+
+    if (line.startsWith('+')) {
+      const addedLine = line.slice(1);
+      if (addedLine !== '') {
+        current.addedLines.push(addedLine);
+        current.added += 1;
+      }
+      continue;
+    }
+
+    if (line.startsWith('-')) {
+      if (line.slice(1) !== '') {
+        current.removed += 1;
+      }
+    }
+  }
+
+  return files;
+}
+
+// 将 Codex apply_patch 的文件级变更转换为统一代码事件。
+function buildCodexApplyPatchEvents(payload, source, patchFiles) {
+  const cwd = payload.cwd || process.cwd();
+  const events = [];
+
+  for (const fileChange of patchFiles) {
+    const eventPath = fileChange.movedTo || fileChange.path;
+    const absoluteFilePath = path.resolve(cwd, eventPath);
+    const { repoRoot, git, repoRelativePath } = getGitInfo(absoluteFilePath);
+    const workerId = resolveWorkerId(repoRoot);
+    let addedContent = fileChange.addedLines.join('\n');
+    if (addedContent.length > MAX_ADDED_CONTENT_CHARS) {
+      addedContent = `${addedContent.slice(0, MAX_ADDED_CONTENT_CHARS)}\n... (truncated)`;
+    }
+
+    events.push({
+      event_id: randomUUID(),
+      timestamp: new Date().toISOString(),
+      source,
+      worker_id: workerId,
+      git,
+      file: {
+        path: repoRelativePath || eventPath.replace(/\\/g, '/'),
+        operation: fileChange.action === 'Add' ? 'write' : 'edit',
+      },
+      changes: {
+        added_content: addedContent,
+        added: fileChange.added,
+        removed: fileChange.removed,
+      },
+    });
+  }
+
+  return events;
+}
 
 function buildCodexEvents(payload, source) {
   const hookEvent = payload.hook_event_name || payload.hookEvent;
@@ -636,15 +635,15 @@ function saveCliError(error, context = {}) {
   return appendFailedRecord('cli', record, timestamp);
 }
 
-function sendJsonRequest(event, config) {
-  if (process.env.HOOK_REQUEST_DRY_RUN === '1') {
-    return Promise.resolve({
-      statusCode: 0,
-      body: 'dry-run',
-      dryRun: true,
-      event,
-    });
-  }
+function sendJsonRequest(event, config) {
+  if (process.env.HOOK_REQUEST_DRY_RUN === '1') {
+    return Promise.resolve({
+      statusCode: 0,
+      body: 'dry-run',
+      dryRun: true,
+      event,
+    });
+  }
 
   if (!config.url) {
     return Promise.reject(new Error('Missing request URL'));
@@ -759,18 +758,18 @@ async function runCodeRecord(source) {
     }
   }
 
-  for (const result of results) {
-    if (source === 'codex') {
-      continue;
-    }
-
-    process.stdout.write(`${JSON.stringify(result)}\n`);
-  }
-
-  if (source === 'codex') {
-    process.stdout.write(`${JSON.stringify(buildCodexPostToolUseOutput())}\n`);
-  }
-}
+  for (const result of results) {
+    if (source === 'codex') {
+      continue;
+    }
+
+    process.stdout.write(`${JSON.stringify(result)}\n`);
+  }
+
+  if (source === 'codex') {
+    process.stdout.write(`${JSON.stringify(buildCodexPostToolUseOutput())}\n`);
+  }
+}
 
 module.exports = {
   runCodeRecord,

package/lib/hooks_deploy.js

@@ -1,6 +1,7 @@
 const fs = require('fs');
 const os = require('os');
 const path = require('path');
+const commentJson = require('comment-json');
 
 const CURSOR_COMMAND = 'npx ronds_ai@latest record cursor';
 const CLAUDE_COMMAND = 'npx ronds_ai@latest record claude';
@@ -42,7 +43,10 @@ function readJsonFile(filePath, fallback) {
 
   let data;
   try {
-    data = JSON.parse(raw);
+    // comment-json 容忍 JSONC 注释和尾随逗号。~/.claude/settings.json 等
+    // Claude/Cursor 配置文件官方支持 JSONC，必须容忍用户加的注释。
+    // 注意：写回时仍用 JSON.stringify，原文件中的注释会被丢弃。
+    data = commentJson.parse(raw);
   } catch (error) {
     const detail = error instanceof Error ? error.message : String(error);
     throw new Error(`Invalid JSON in ${filePath}: ${detail}`);
@@ -424,19 +428,19 @@ function generateRondsHookBlocks(newline) {
   ].join(newline);
 }
 
-function ensureCodexRequirementsToml(reqPath) {
-  const exists = fs.existsSync(reqPath);
-  let content = exists ? fs.readFileSync(reqPath, 'utf8') : '';
-  if (content.charCodeAt(0) === 0xFEFF) {
-    content = content.slice(1);
-  }
-  const newline = content.includes('\r\n') ? '\r\n' : '\n';
+function ensureCodexRequirementsToml(reqPath) {
+  const exists = fs.existsSync(reqPath);
+  let content = exists ? fs.readFileSync(reqPath, 'utf8') : '';
+  if (content.charCodeAt(0) === 0xFEFF) {
+    content = content.slice(1);
+  }
+  const newline = content.includes('\r\n') ? '\r\n' : '\n';
 
   content = ensureCodexHooksFeatureFlag(content);
   content = ensureCodexManagedDir(content, reqPath);
   content = removeRondsBlocksFromToml(content);
-  content = content.replace(/[\t ]*\r?\n*$/, newline);
-  content += generateRondsHookBlocks(newline);
+  content = content.replace(/[\t ]*\r?\n*$/, newline);
+  content += generateRondsHookBlocks(newline);
 
   const changed = writeTextFileIfChanged(reqPath, content);
   return { exists, changed };
@@ -527,16 +531,16 @@ function cleanupClaudeLocalSettings(localCandidates, result) {
   }
 }
 
-// 将系统级 Codex requirements.toml 的权限错误转换成面向用户的部署提示。
-function wrapCodexPermissionError(error, codexRequirementsPath) {
-  const code = isPlainObject(error) ? error.code : '';
+// 将系统级 Codex requirements.toml 的权限错误转换成面向用户的部署提示。
+function wrapCodexPermissionError(error, codexRequirementsPath) {
+  const code = isPlainObject(error) ? error.code : '';
   if (code !== 'EACCES' && code !== 'EPERM') {
     return error;
   }
 
-  const wrapped = new Error(
-    `Codex 部署需要管理员/root 权限，无法写入 ${codexRequirementsPath}。请以管理员身份重新运行 hooks deploy --scope user。`,
-  );
+  const wrapped = new Error(
+    `Codex 部署需要管理员/root 权限，无法写入 ${codexRequirementsPath}。请以管理员身份重新运行 hooks deploy --scope user。`,
+  );
   wrapped.cause = error;
   wrapped.code = code;
   return wrapped;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ronds_ai",
-  "version": "0.1.17",
+  "version": "0.1.19",
   "description": "CLI for reporting AI code edit events.",
   "bin": {
     "ronds_ai": "bin/ronds_ai.js"
@@ -12,5 +12,8 @@
   "engines": {
     "node": ">=16"
   },
+  "dependencies": {
+    "comment-json": "^4.2.5"
+  },
   "license": "MIT"
 }