ronds_ai 0.1.13 → 0.1.17

package/lib/code_record.js

@@ -1,25 +1,30 @@
-const fs = require('fs');
+const fs = require('fs');
 const os = require('os');
 const path = require('path');
 const http = require('http');
 const https = require('https');
-const { execFileSync } = require('child_process');
 const { runGit } = require('./git');
-const { createHash, randomUUID } = require('crypto');
+const { randomUUID } = require('crypto');
 
 const DEFAULT_TIMEOUT_MS = 10000;
 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_EVENTS = new Set(['UserPromptSubmit', 'Stop']);
-const CODEX_SNAPSHOT_DIR = path.join(os.homedir(), '.ronds_ai', 'codex-snapshots');
-const CODEX_SNAPSHOT_TTL_SEC = 86400;
-const GIT_STATUS_ARGS = ['status', '--porcelain=v1', '--untracked-files=all'];
-const CODEX_STOP_OUTPUT = {
-  continue: false,
-};
+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,
+    },
+  };
+}
 
 function readStdin() {
   return new Promise((resolve, reject) => {
@@ -38,7 +43,9 @@ function parseJson(raw, label) {
     return JSON.parse(raw);
   } catch (error) {
     const detail = error instanceof Error ? error.message : String(error);
-    throw new Error(`${label} is not valid JSON: ${detail}`);
+    const wrappedError = new Error(`${label} is not valid JSON: ${detail}`);
+    wrappedError.rawPayload = raw;
+    throw wrappedError;
   }
 }
 
@@ -426,303 +433,134 @@ function buildCursorEvent(payload, source) {
   };
 }
 
-function getCodexSnapshotFilePath(payload, repoRoot) {
-  const sessionId = String(payload.session_id || payload.sessionId || '').trim();
-  const turnId = String(payload.turn_id || payload.turnId || '').trim();
-  if (!sessionId || !turnId || !repoRoot) {
-    return '';
-  }
-
-  const key = `${repoRoot}::${sessionId}::${turnId}`;
-  const fileName = `${createHash('sha1').update(key).digest('hex')}.json`;
-  return path.join(CODEX_SNAPSHOT_DIR, fileName);
-}
-
-function parseGitStatus(repoRoot) {
-  const output = runGit(repoRoot, GIT_STATUS_ARGS, false);
-  const entries = [];
-
-  for (const rawLine of output.split('\n')) {
-    if (!rawLine) {
-      continue;
-    }
-
-    const line = rawLine.replace(/\r$/, '');
-    const statusCode = line.slice(0, 2);
-    const body = line.slice(3);
-    if (!body) {
-      continue;
-    }
-
-    const normalizedBody = body.includes(' -> ') ? body.split(' -> ').pop() : body;
-    if (!normalizedBody) {
-      continue;
-    }
-
-    const state = statusCode.includes('D') ? 'deleted' : 'present';
-    entries.push({
-      path: normalizedBody,
-      state,
-    });
-  }
-
-  return entries;
-}
-
-function readFileState(filePath) {
-  try {
-    const buffer = fs.readFileSync(filePath);
-    if (buffer.includes(0)) {
-      return {
-        exists: true,
-        isBinary: true,
-        content: '',
-      };
-    }
-
-    return {
-      exists: true,
-      isBinary: false,
-      content: buffer.toString('utf8').replace(/\r\n/g, '\n'),
-    };
-  } catch {
-    return {
-      exists: false,
-      isBinary: false,
-      content: '',
-    };
-  }
-}
-
-function readGitRefFileState(repoRoot, ref, relativePath) {
-  try {
-    const buffer = execFileSync('git', ['show', `${ref}:${relativePath}`], {
-      cwd: repoRoot,
-      encoding: null,
-      stdio: ['ignore', 'pipe', 'pipe'],
-    });
-
-    if (buffer.includes(0)) {
-      return {
-        exists: true,
-        isBinary: true,
-        content: '',
-      };
-    }
-
-    return {
-      exists: true,
-      isBinary: false,
-      content: buffer.toString('utf8').replace(/\r\n/g, '\n'),
-    };
-  } catch {
-    return {
-      exists: false,
-      isBinary: false,
-      content: '',
-    };
-  }
-}
-
-function readHeadFileState(repoRoot, relativePath) {
-  return readGitRefFileState(repoRoot, 'HEAD', relativePath);
-}
-
-function readCurrentHead(repoRoot) {
-  return runGit(repoRoot, ['rev-parse', 'HEAD'], false);
-}
-
-function parseGitDiffNameOnly(repoRoot, fromRef, toRef) {
-  const normalizedFromRef = String(fromRef || '').trim();
-  const normalizedToRef = String(toRef || '').trim();
-  if (!normalizedFromRef || !normalizedToRef || normalizedFromRef === normalizedToRef) {
-    return [];
-  }
-
-  const output = runGit(repoRoot, ['diff', '--name-only', `${normalizedFromRef}..${normalizedToRef}`], false);
-  return output.split('\n')
-    .map((line) => line.trim().replace(/\\/g, '/'))
-    .filter(Boolean);
-}
-
-function statesEqual(beforeState, afterState) {
-  return beforeState.exists === afterState.exists
-    && beforeState.isBinary === afterState.isBinary
-    && beforeState.content === afterState.content;
-}
-
-function buildCodexChange(beforeState, afterState) {
-  if (afterState.isBinary || beforeState.isBinary) {
-    const operation = beforeState.exists ? 'edit' : 'write';
-    return {
-      operation,
-      changes: {
-        added_content: '',
-        added: 0,
-        removed: 0,
-      },
-    };
-  }
-
-  const diff = diffLineStats(beforeState.content, afterState.content);
-  return {
-    operation: beforeState.exists ? 'edit' : 'write',
-    changes: {
-      added_content: diff.addedContent,
-      added: diff.added,
-      removed: diff.removed,
-    },
-  };
-}
-
-function cleanupStaleSnapshots() {
-  let entries;
-  try {
-    if (!fs.existsSync(CODEX_SNAPSHOT_DIR)) {
-      return;
-    }
-    entries = fs.readdirSync(CODEX_SNAPSHOT_DIR);
-  } catch {
-    return;
-  }
-
-  const nowSec = Date.now() / 1000;
-  for (const entry of entries) {
-    if (!entry.endsWith('.json')) {
-      continue;
-    }
-
-    const filePath = path.join(CODEX_SNAPSHOT_DIR, entry);
-    try {
-      const raw = fs.readFileSync(filePath, 'utf8');
-      const snapshot = JSON.parse(raw);
-      const createdAt = String(snapshot.created_at || '');
-      const createdSec = new Date(createdAt).getTime() / 1000;
-      if (isNaN(createdSec)) {
-        continue;
-      }
-      if (nowSec - createdSec > CODEX_SNAPSHOT_TTL_SEC) {
-        fs.rmSync(filePath, { force: true });
-      }
-    } catch {
-      continue;
-    }
-  }
-}
-
-function handleCodexUserPromptSubmit(payload) {
-  const cwd = payload.cwd || process.cwd();
-  const repoRoot = findGitRepoRoot(cwd);
-  const snapshotPath = getCodexSnapshotFilePath(payload, repoRoot);
-  if (!repoRoot || !snapshotPath) {
-    return [];
-  }
-
-  const head = readCurrentHead(repoRoot);
-  const baseline = {};
-  for (const entry of parseGitStatus(repoRoot)) {
-    const absolutePath = path.join(repoRoot, entry.path);
-    baseline[entry.path] = entry.state === 'deleted'
-      ? readHeadFileState(repoRoot, entry.path)
-      : readFileState(absolutePath);
-  }
-
-  cleanupStaleSnapshots();
-  fs.mkdirSync(CODEX_SNAPSHOT_DIR, { recursive: true });
-  fs.writeFileSync(snapshotPath, JSON.stringify({
-    version: 1,
-    session_id: payload.session_id || payload.sessionId || '',
-    turn_id: payload.turn_id || payload.turnId || '',
-    repo_root: repoRoot,
-    head,
-    created_at: new Date().toISOString(),
-    baseline,
-  }), 'utf8');
-
-  return [];
-}
-
-function buildCodexStopEvents(payload, source) {
-  const cwd = payload.cwd || process.cwd();
-  const repoRoot = findGitRepoRoot(cwd);
-  const snapshotPath = getCodexSnapshotFilePath(payload, repoRoot);
-  if (!repoRoot || !snapshotPath) {
-    return [];
-  }
-
-  let snapshot = null;
-  if (fs.existsSync(snapshotPath)) {
-    try {
-      snapshot = parseJson(fs.readFileSync(snapshotPath, 'utf8'), 'Codex snapshot');
-    } catch {
-      snapshot = null;
-    }
-  }
-
-  const baseline = snapshot && snapshot.baseline && typeof snapshot.baseline === 'object'
-    ? snapshot.baseline
-    : {};
-  const currentEntries = parseGitStatus(repoRoot);
-  const currentPaths = new Set(currentEntries.map((entry) => entry.path));
-  const baseRef = snapshot && typeof snapshot.head === 'string' && snapshot.head.trim()
-    ? snapshot.head.trim()
-    : 'HEAD';
-  const currentHead = readCurrentHead(repoRoot) || 'HEAD';
-  const committedPaths = new Set(parseGitDiffNameOnly(repoRoot, baseRef, currentHead));
-  const allPaths = new Set([
-    ...Object.keys(baseline),
-    ...currentPaths,
-    ...committedPaths,
-  ]);
-  const workerId = resolveWorkerId(repoRoot);
-  const git = resolveGitMetadata(repoRoot);
-  const events = [];
-
-  for (const repoRelativePath of allPaths) {
-    const absolutePath = path.join(repoRoot, repoRelativePath);
-    const beforeState = baseline[repoRelativePath] || readGitRefFileState(repoRoot, baseRef, repoRelativePath);
-    let afterState = readFileState(absolutePath);
-    if (!afterState.exists && committedPaths.has(repoRelativePath)) {
-      afterState = readGitRefFileState(repoRoot, currentHead, repoRelativePath);
-    }
-
-    if (statesEqual(beforeState, afterState)) {
-      continue;
-    }
-
-    const changeInfo = buildCodexChange(beforeState, afterState);
-    events.push({
-      event_id: randomUUID(),
-      timestamp: new Date().toISOString(),
-      source,
-      worker_id: workerId,
-      git,
-      file: {
-        path: repoRelativePath,
-        operation: changeInfo.operation,
-      },
-      changes: changeInfo.changes,
-    });
-  }
-
-  if (fs.existsSync(snapshotPath)) {
-    fs.rmSync(snapshotPath, { force: true });
-  }
-
-  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;
-  if (!CODEX_SUPPORTED_HOOK_EVENTS.has(hookEvent)) {
+  const toolName = payload.tool_name || payload.toolName;
+  if (hookEvent !== CODEX_SUPPORTED_HOOK_EVENT || toolName !== CODEX_SUPPORTED_TOOL) {
     return [];
   }
 
-  if (hookEvent === 'UserPromptSubmit') {
-    return handleCodexUserPromptSubmit(payload);
+  const toolInput = payload.tool_input || payload.toolInput || {};
+  const patchText = extractApplyPatchText(toolInput.command);
+  if (!patchText) {
+    return [];
   }
 
-  return buildCodexStopEvents(payload, source);
+  return buildCodexApplyPatchEvents(payload, source, parseApplyPatchFiles(patchText));
 }
 
 function loadRequestConfig() {
@@ -790,14 +628,23 @@ function saveCliError(error, context = {}) {
     error: errorMessage,
     context,
   };
+
+  if (error && typeof error.rawPayload === 'string') {
+    record.raw_payload = error.rawPayload;
+  }
+
   return appendFailedRecord('cli', record, timestamp);
 }
 
-function sendJsonRequest(event, config) {
-  if (process.env.HOOK_REQUEST_DRY_RUN === '1') {
-    process.stdout.write(`${JSON.stringify(event, null, 2)}\n`);
-    return Promise.resolve({ statusCode: 0, body: 'dry-run', dryRun: true });
-  }
+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'));
@@ -878,9 +725,19 @@ async function runCodeRecord(source) {
     return;
   }
 
-  const payload = parseJson(raw, 'Hook payload');
+  let payload;
+  try {
+    payload = JSON.parse(raw);
+  } catch (parseError) {
+    const message = parseError instanceof Error ? parseError.message : String(parseError || '');
+    const dumpPath = path.join(os.homedir(), '.ronds_ai', `hook-payload-${Date.now()}.txt`);
+    try {
+      fs.mkdirSync(path.dirname(dumpPath), { recursive: true });
+      fs.writeFileSync(dumpPath, raw, 'utf8');
+    } catch { /* best effort */ }
+    throw new Error(`Hook payload is not valid JSON: ${message}\nRaw payload dumped to ${dumpPath}`);
+  }
   const events = buildEvents(payload, source);
-  const hookEvent = payload.hook_event_name || payload.hookEvent;
   const config = loadRequestConfig();
 
   const results = [];
@@ -902,15 +759,18 @@ async function runCodeRecord(source) {
     }
   }
 
-  if (source === 'codex' && hookEvent === 'Stop') {
-    process.stdout.write(`${JSON.stringify(CODEX_STOP_OUTPUT)}\n`);
-    return;
-  }
-
-  for (const result of results) {
-    process.stdout.write(`${JSON.stringify(result)}\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/doctor.js

@@ -36,8 +36,10 @@ function getConfigChecks(tool, baseDir) {
   if (tool === 'codex') {
     return [
       {
-        label: '.codex/hooks.json',
-        path: path.join(baseDir, '.codex', 'hooks.json'),
+        label: 'Codex requirements.toml',
+        path: process.platform === 'win32'
+          ? 'C:\\ProgramData\\OpenAI\\Codex\\requirements.toml'
+          : '/etc/codex/requirements.toml',
       },
     ];
   }