ronds_ai 0.1.11 → 0.1.13

package/README.md

@@ -221,6 +221,7 @@ npx ronds_ai@latest hooks deploy
 - 在 `.cursor/hooks.json` 中确保存在 `npx ronds_ai@latest record cursor`
 - 在 `.claude/settings.json` 中确保存在 `npx ronds_ai@latest record claude`
 - 在 `.codex/hooks.json` 中确保存在 `npx ronds_ai@latest record codex`（`UserPromptSubmit` + `Stop` 两个 hook）
+- 在 `.codex/config.toml` 中确保存在 `[features] codex_hooks = true`，启用 Codex hooks
 - 清理旧版 hook 脚本文件
 - 如果存在 `.claude/settings.local.json`，会移除其中由本工具管理的旧 hook，避免重复触发
 - 所有工具的失败事件统一写入 `~/.ronds_ai/failed-events`

package/lib/check_record.js

@@ -2,24 +2,16 @@ const fs = require('fs');
 const os = require('os');
 const path = require('path');
 const { execFileSync } = require('child_process');
+const { runGit } = require('./git');
 
 const ENVIRONMENT_VARIABLE_NAME = process.env.ENVIRONMENT_VARIABLE_NAME || 'MCP_TRACKER_WORKER_ID';
 const MINIMUM_NODE_MAJOR = 16;
 const SUPPORTED_PERSISTENT_PLATFORMS = new Set(['win32', 'linux']);
 
 function readGitUserEmail(baseDir) {
-  try {
-    return execFileSync('git', ['config', 'user.email'], {
-      cwd: baseDir,
-      encoding: 'utf8',
-      stdio: ['ignore', 'pipe', 'pipe'],
-    })
-      .trim()
-      .replace(/^["'“”]+/, '')
-      .replace(/["'“”]+$/, '');
-  } catch {
-    return '';
-  }
+  return runGit(baseDir, ['config', 'user.email'], false)
+    .replace(/^["'“”]+/, '')
+    .replace(/["'“”]+$/, '');
 }
 
 function getProfileFilePath() {

package/lib/code_record.js

@@ -4,6 +4,7 @@ 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 DEFAULT_TIMEOUT_MS = 10000;
@@ -14,6 +15,7 @@ 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,
@@ -135,23 +137,6 @@ function findGitRepoRoot(startDir) {
   }
 }
 
-function runGit(repoRoot, args, required = true) {
-  try {
-    return execFileSync('git', args, {
-      cwd: repoRoot,
-      encoding: 'utf8',
-      stdio: ['ignore', 'pipe', 'pipe'],
-    }).trim();
-  } catch (error) {
-    if (!required) {
-      return '';
-    }
-
-    const stderr = error && error.stderr ? String(error.stderr).trim() : String(error);
-    throw new Error(`git ${args.join(' ')} failed: ${stderr}`);
-  }
-}
-
 function extractRepoNameFromRemoteUrl(remoteUrl) {
   const normalizedUrl = String(remoteUrl || '').trim().replace(/[\\/]+$/, '');
   if (!normalizedUrl) {
@@ -509,9 +494,9 @@ function readFileState(filePath) {
   }
 }
 
-function readHeadFileState(repoRoot, relativePath) {
+function readGitRefFileState(repoRoot, ref, relativePath) {
   try {
-    const buffer = execFileSync('git', ['show', `HEAD:${relativePath}`], {
+    const buffer = execFileSync('git', ['show', `${ref}:${relativePath}`], {
       cwd: repoRoot,
       encoding: null,
       stdio: ['ignore', 'pipe', 'pipe'],
@@ -539,6 +524,27 @@ function readHeadFileState(repoRoot, relativePath) {
   }
 }
 
+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
@@ -569,6 +575,41 @@ function buildCodexChange(beforeState, afterState) {
   };
 }
 
+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);
@@ -577,6 +618,7 @@ function handleCodexUserPromptSubmit(payload) {
     return [];
   }
 
+  const head = readCurrentHead(repoRoot);
   const baseline = {};
   for (const entry of parseGitStatus(repoRoot)) {
     const absolutePath = path.join(repoRoot, entry.path);
@@ -585,12 +627,14 @@ function handleCodexUserPromptSubmit(payload) {
       : 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');
@@ -620,9 +664,15 @@ function buildCodexStopEvents(payload, source) {
     : {};
   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);
@@ -630,8 +680,11 @@ function buildCodexStopEvents(payload, source) {
 
   for (const repoRelativePath of allPaths) {
     const absolutePath = path.join(repoRoot, repoRelativePath);
-    const beforeState = baseline[repoRelativePath] || readHeadFileState(repoRoot, repoRelativePath);
-    const afterState = readFileState(absolutePath);
+    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;

package/lib/doctor.js

@@ -1,45 +1,26 @@
 const fs = require('fs');
 const os = require('os');
 const path = require('path');
-const { execFileSync } = require('child_process');
+const { runGit } = require('./git');
 
 const SUPPORTED_TOOLS = new Set(['claude', 'codex', 'cursor']);
 
-function formatDateStamp(date = new Date()) {
-  const year = String(date.getFullYear());
-  const month = String(date.getMonth() + 1).padStart(2, '0');
-  const day = String(date.getDate()).padStart(2, '0');
-  return `${year}${month}${day}`;
-}
-
 function getFailedEventDir() {
   return path.join(os.homedir(), '.ronds_ai', 'failed-events');
 }
 
-function getRecentLogPaths(tool) {
-  const dateStamp = formatDateStamp();
-  return [
-    path.join(getFailedEventDir(), `${dateStamp}-${tool}-error.jsonl`),
-    path.join(getFailedEventDir(), `${dateStamp}-cli-error.jsonl`),
-  ];
-}
-
-function tailFileLines(filePath, maxLines = 20) {
-  if (!fs.existsSync(filePath)) {
+function readRecentLogs(tool) {
+  const dir = getFailedEventDir();
+  if (!fs.existsSync(dir)) {
     return [];
   }
 
-  const raw = fs.readFileSync(filePath, 'utf8');
-  const lines = raw.split('\n').filter((line) => line.trim() !== '');
-  return lines.slice(-maxLines);
-}
-
-function readRecentLogs(tool) {
-  return getRecentLogPaths(tool).map((filePath) => ({
-    path: filePath,
-    exists: fs.existsSync(filePath),
-    lines: tailFileLines(filePath),
-  }));
+  return fs.readdirSync(dir)
+    .filter((name) => name.endsWith('.jsonl') && (name.includes(`-${tool}-error`) || name.includes('-cli-error')))
+    .sort()
+    .reverse()
+    .slice(0, 3)
+    .map((name) => path.join(dir, name));
 }
 
 function getConfigChecks(tool, baseDir) {
@@ -74,15 +55,11 @@ function getConfigChecks(tool, baseDir) {
 }
 
 function readGitUserEmail(baseDir) {
-  try {
-    return execFileSync('git', ['config', 'user.email'], {
-      cwd: baseDir,
-      encoding: 'utf8',
-      stdio: ['ignore', 'pipe', 'pipe'],
-    }).trim();
-  } catch {
-    return '';
-  }
+  return runGit(baseDir, ['config', 'user.email'], false);
+}
+
+function readGitRemoteUrl(baseDir) {
+  return runGit(baseDir, ['remote', 'get-url', 'origin'], false);
 }
 
 function runDoctor(tool, targetDir = process.cwd()) {
@@ -101,6 +78,7 @@ function runDoctor(tool, targetDir = process.cwd()) {
     tool: normalizedTool,
     targetDir: baseDir,
     gitUserEmail: readGitUserEmail(baseDir),
+    gitRemoteUrl: readGitRemoteUrl(baseDir),
     configChecks,
     recentLogs: readRecentLogs(normalizedTool),
   };

package/lib/git.js

@@ -0,0 +1,22 @@
+const { execFileSync } = require('child_process');
+
+function runGit(repoRoot, args, required = true) {
+  try {
+    return execFileSync('git', args, {
+      cwd: repoRoot,
+      encoding: 'utf8',
+      stdio: ['ignore', 'pipe', 'pipe'],
+    }).trim();
+  } catch (error) {
+    if (!required) {
+      return '';
+    }
+
+    const stderr = error && error.stderr ? String(error.stderr).trim() : String(error);
+    throw new Error(`git ${args.join(' ')} failed: ${stderr}`);
+  }
+}
+
+module.exports = {
+  runGit,
+};

package/lib/hooks_deploy.js

@@ -72,6 +72,19 @@ function writeJsonFile(filePath, data) {
   return true;
 }
 
+function writeTextFileIfChanged(filePath, nextContent) {
+  if (fs.existsSync(filePath)) {
+    const currentContent = fs.readFileSync(filePath, 'utf8');
+    if (currentContent === nextContent) {
+      return false;
+    }
+  }
+
+  ensureDir(path.dirname(filePath));
+  fs.writeFileSync(filePath, nextContent, 'utf8');
+  return true;
+}
+
 function removeFileIfExists(filePath, removedFiles) {
   if (!fs.existsSync(filePath)) {
     return;
@@ -217,6 +230,57 @@ function cleanupCodexManagedHooks(hooks) {
   return removeCommandEntriesByMatcher(withoutManagedCommands, CODEX_OLD_COMMAND_MATCHERS);
 }
 
+function ensureCodexHooksFeatureFlag(toml) {
+  const newline = toml.includes('\r\n') ? '\r\n' : '\n';
+  const desiredLine = `codex_hooks = true${newline}`;
+  const desiredSection = `[features]${newline}${desiredLine}`;
+
+  if (!toml.trim()) {
+    return desiredSection;
+  }
+
+  const featuresHeaderPattern = /^[ \t]*\[features\][ \t]*(?:#.*)?$/m;
+  const featuresHeaderMatch = featuresHeaderPattern.exec(toml);
+  if (!featuresHeaderMatch) {
+    const trimmed = toml.replace(/[ \t\r\n]*$/, '');
+    return `${trimmed}${newline}${newline}${desiredSection}`;
+  }
+
+  const headerStart = featuresHeaderMatch.index;
+  const headerEnd = headerStart + featuresHeaderMatch[0].length;
+  const sectionAfterHeaderStart = toml.indexOf('\n', headerEnd) === -1
+    ? toml.length
+    : toml.indexOf('\n', headerEnd) + 1;
+  const afterHeader = toml.slice(sectionAfterHeaderStart);
+  const nextHeaderMatch = /^[ \t]*\[[^\]]+\][ \t]*(?:#.*)?$/m.exec(afterHeader);
+  const sectionEnd = nextHeaderMatch
+    ? sectionAfterHeaderStart + nextHeaderMatch.index
+    : toml.length;
+  const section = toml.slice(headerStart, sectionEnd);
+  const flagPattern = /^([ \t]*codex_hooks[ \t]*=[ \t]*)(true|false)([ \t]*(?:#.*)?$)/m;
+  const flagMatch = flagPattern.exec(section);
+
+  if (flagMatch) {
+    if (flagMatch[2] === 'true') {
+      return toml;
+    }
+
+    const nextSection = section.replace(flagPattern, '$1true$3');
+    return `${toml.slice(0, headerStart)}${nextSection}${toml.slice(sectionEnd)}`;
+  }
+
+  return `${toml.slice(0, sectionAfterHeaderStart)}${desiredLine}${toml.slice(sectionAfterHeaderStart)}`;
+}
+
+function ensureCodexConfigToml(configPath) {
+  const exists = fs.existsSync(configPath);
+  const currentContent = exists ? fs.readFileSync(configPath, 'utf8') : '';
+  const nextContent = ensureCodexHooksFeatureFlag(currentContent);
+  const changed = writeTextFileIfChanged(configPath, nextContent);
+
+  return { exists, changed };
+}
+
 function ensureCodexHook(config) {
   const next = isPlainObject(config) ? { ...config } : {};
   const hooks = isPlainObject(next.hooks) ? { ...next.hooks } : {};
@@ -289,13 +353,20 @@ function deployHooks(targetDir = process.cwd()) {
     (claudeSettingsResult.exists ? updatedFiles : createdFiles).push(claudeSettingsPath);
   }
 
-  const codexHooksPath = path.join(baseDir, '.codex', 'hooks.json');
+  const codexDir = path.join(baseDir, '.codex');
+  const codexHooksPath = path.join(codexDir, 'hooks.json');
   const codexHooksResult = readJsonFile(codexHooksPath, {});
   const nextCodexHooks = ensureCodexHook(codexHooksResult.data);
   if (writeJsonFile(codexHooksPath, nextCodexHooks)) {
     (codexHooksResult.exists ? updatedFiles : createdFiles).push(codexHooksPath);
   }
 
+  const codexConfigPath = path.join(codexDir, 'config.toml');
+  const codexConfigResult = ensureCodexConfigToml(codexConfigPath);
+  if (codexConfigResult.changed) {
+    (codexConfigResult.exists ? updatedFiles : createdFiles).push(codexConfigPath);
+  }
+
   const localCandidates = [
     path.join(baseDir, '.claude', 'settings.local.json'),
     path.join(baseDir, '.claude', 'setting.local.json'),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ronds_ai",
-  "version": "0.1.11",
+  "version": "0.1.13",
   "description": "CLI for reporting AI code edit events.",
   "bin": {
     "ronds_ai": "bin/ronds_ai.js"