hillclimb 0.5.1 → 0.5.2

package/dist/cli.js

@@ -2319,6 +2319,7 @@ import crypto3 from "crypto";
 import fs11 from "fs";
 import os6 from "os";
 import path15 from "path";
+import readline from "readline";
 
 // src/debug-logs.ts
 import crypto from "crypto";
@@ -13384,8 +13385,8 @@ var DEFAULT_STATE_DIR = path14.join(
   ".hillclimb",
   "agent-uploads"
 );
-var LOCK_RETRIES2 = 120;
-var LOCK_RETRY_DELAY_MS2 = 500;
+var DEFAULT_LOCK_WAIT_MS = 5 * 60 * 1e3;
+var DEFAULT_LOCK_RETRY_DELAY_MS = 500;
 var DEFAULT_STATE_TTL_MS = 24 * 60 * 60 * 1e3;
 function stateDir2() {
   return process.env.HILLCLIMB_UPLOAD_STATE_DIR ?? DEFAULT_STATE_DIR;
@@ -13402,6 +13403,23 @@ function stateTtlMs() {
     DEFAULT_STATE_TTL_MS
   );
 }
+function lockRetryDelayMs() {
+  return Math.max(
+    1,
+    readPositiveEnvMs(
+      "HILLCLIMB_UPLOAD_LOCK_RETRY_DELAY_MS",
+      DEFAULT_LOCK_RETRY_DELAY_MS
+    )
+  );
+}
+function lockRetries() {
+  return Math.max(
+    1,
+    Math.ceil(
+      readPositiveEnvMs("HILLCLIMB_UPLOAD_LOCK_WAIT_MS", DEFAULT_LOCK_WAIT_MS) / lockRetryDelayMs()
+    )
+  );
+}
 function stateFileFor(repoRoot, tool, sessionId) {
   const hash = crypto2.createHash("sha256").update(`${path14.resolve(repoRoot)}\0${tool}\0${sessionId}`).digest("hex").slice(0, 16);
   return path14.join(stateDir2(), `${hash}.json`);
@@ -13437,7 +13455,7 @@ async function deleteUploadState(repoRoot, tool, sessionId) {
   } catch {
   }
 }
-async function acquireLock2(repoRoot, tool, sessionId, retries = LOCK_RETRIES2, delayMs = LOCK_RETRY_DELAY_MS2) {
+async function acquireLock2(repoRoot, tool, sessionId, retries = lockRetries(), delayMs = lockRetryDelayMs()) {
   const lockPath = lockFileFor(repoRoot, tool, sessionId);
   await fs10.promises.mkdir(stateDir2(), { recursive: true, mode: 448 });
   for (let i = 0; i < retries; i++) {
@@ -13457,10 +13475,13 @@ async function acquireLock2(repoRoot, tool, sessionId, retries = LOCK_RETRIES2,
         await new Promise((r) => setTimeout(r, delayMs));
         continue;
       }
+      if (err.code === "EEXIST") break;
       throw err;
     }
   }
-  throw new Error(`Failed to acquire upload lock after ${retries} retries`);
+  throw new Error(
+    `Failed to acquire upload lock for ${tool} session ${sessionId} after ${retries} retries (${delayMs}ms delay, lock=${lockPath})`
+  );
 }
 async function releaseLock2(repoRoot, tool, sessionId) {
   try {
@@ -13588,6 +13609,54 @@ function summarizePayload(payload) {
     cursor_version_present: !!payload.cursor_version
   });
 }
+async function codexSessionIdFromFile(filePath) {
+  const stream = fs11.createReadStream(filePath, { encoding: "utf-8" });
+  const rl = readline.createInterface({ input: stream, crlfDelay: Infinity });
+  try {
+    for await (const line of rl) {
+      if (!line.trim()) continue;
+      try {
+        const obj = JSON.parse(line);
+        if (obj.type === "session_meta") return obj.payload?.id ?? null;
+      } catch {
+        return null;
+      }
+      return null;
+    }
+  } finally {
+    rl.close();
+    stream.destroy();
+  }
+  return null;
+}
+async function findCodexTranscriptPath(sessionId) {
+  const sessionsDir = process.env.HILLCLIMB_CODEX_SESSIONS_DIR ?? path15.join(os6.homedir(), ".codex", "sessions");
+  const candidates = [];
+  async function walk(dir) {
+    let entries;
+    try {
+      entries = await fs11.promises.readdir(dir, { withFileTypes: true });
+    } catch {
+      return;
+    }
+    for (const entry of entries) {
+      const full = path15.join(dir, entry.name);
+      if (entry.isDirectory()) {
+        await walk(full);
+      } else if (entry.isFile() && entry.name.endsWith(".jsonl") && entry.name.includes(sessionId)) {
+        candidates.push(full);
+      }
+    }
+  }
+  await walk(sessionsDir);
+  candidates.sort();
+  for (const filePath of candidates) {
+    if (await codexSessionIdFromFile(filePath) === sessionId) {
+      return filePath;
+    }
+  }
+  return void 0;
+}
 async function selfHealHook(repoRoot, tool) {
   if (process.env.HILLCLIMB_SKIP_HOOK_SELF_HEAL === "1") return;
   try {
@@ -13621,17 +13690,31 @@ function resolveCursorTranscriptPath(payload) {
     `${id}.jsonl`
   );
 }
+async function resolveTranscriptPath(payload, sourceTool, sessionId) {
+  if (payload.transcript_path) return payload.transcript_path;
+  if (sourceTool === "cursor") return resolveCursorTranscriptPath(payload);
+  if (sourceTool === "codex") {
+    const resolved = await findCodexTranscriptPath(sessionId);
+    if (resolved) {
+      appendLog(
+        "info",
+        `[${sessionId}] resolved missing Codex transcript_path via ~/.codex/sessions: ${resolved}`
+      );
+    }
+    return resolved;
+  }
+  return void 0;
+}
 async function runUploadInner(payload) {
   const sessionId = resolveHookSessionId(payload);
-  const transcriptPath = payload.transcript_path ?? resolveCursorTranscriptPath(payload);
   const cwd = resolveHookCwd(payload);
   const eventKind = classifyHookEvent(payload.hook_event_name);
-  if (!sessionId || !transcriptPath || !cwd) {
+  if (!sessionId || !cwd) {
     appendLog(
       "warn",
-      `Skipping upload: missing required hook fields (session_id=${!!sessionId}, transcript_path=${!!transcriptPath}, cwd=${!!cwd})`
+      `Skipping upload: missing required hook fields (session_id=${!!sessionId}, transcript_path=${!!payload.transcript_path}, cwd=${!!cwd})`
     );
-    return;
+    return false;
   }
   const match = await findProjectForCwd(cwd);
   if (!match) {
@@ -13639,13 +13722,13 @@ async function runUploadInner(payload) {
       "warn",
       `Skipping session ${sessionId}: no hillclimb config for cwd ${cwd}. Run \`npx hillclimb\` in the repo.`
     );
-    return;
+    return false;
   }
   const { repoRoot, config } = match;
   const sourceTool = await resolveSourceTool(payload, repoRoot);
   if (!sourceTool) {
     payload.tool = "unknown";
-    return;
+    return false;
   }
   payload.tool = sourceTool;
   appendLog(
@@ -13653,6 +13736,18 @@ async function runUploadInner(payload) {
     `[${sessionId}] payload parsed (tool=${sourceTool}, cwd=${cwd}, event=${eventKind ?? "?"})`
   );
   await selfHealHook(repoRoot, sourceTool);
+  const transcriptPath = await resolveTranscriptPath(
+    payload,
+    sourceTool,
+    sessionId
+  );
+  if (!transcriptPath) {
+    appendLog(
+      "warn",
+      `Skipping upload: missing required hook fields (session_id=true, transcript_path=false, cwd=true)`
+    );
+    return false;
+  }
   const transcriptResolved = path15.resolve(transcriptPath);
   try {
     const stat = await fs11.promises.stat(transcriptResolved);
@@ -13661,23 +13756,23 @@ async function runUploadInner(payload) {
         "warn",
         `Skipping session ${sessionId}: transcript_path is not a file: ${transcriptResolved}`
       );
-      return;
+      return false;
     }
   } catch (err) {
     appendLog(
       "warn",
       `Skipping session ${sessionId}: transcript_path not readable (${transcriptResolved}): ${err instanceof Error ? err.message : String(err)}`
     );
-    return;
+    return false;
   }
   if (!await hasAssistantMessage(transcriptResolved)) {
     appendLog(
       "info",
       `Skipping session ${sessionId}: transcript contains no assistant messages (nothing to upload).`
     );
-    return;
+    return false;
   }
-  await uploadSession({
+  return await uploadSession({
     sessionId,
     transcriptPath: transcriptResolved,
     repoRoot,
@@ -13689,7 +13784,7 @@ async function runUploadInner(payload) {
 async function uploadSession(args) {
   const { sessionId, transcriptPath, repoRoot, config, sourceTool, eventKind } = args;
   const isSessionEnd = eventKind === "sessionEnd";
-  await withUploadLock(repoRoot, sourceTool, sessionId, async () => {
+  return await withUploadLock(repoRoot, sourceTool, sessionId, async () => {
     const prior = await readUploadState(repoRoot, sourceTool, sessionId);
     let transcriptSize;
     let transcriptSha256;
@@ -13706,7 +13801,7 @@ async function uploadSession(args) {
       if (isSessionEnd) {
         await deleteUploadState(repoRoot, sourceTool, sessionId);
       }
-      return;
+      return true;
     }
     const now = /* @__PURE__ */ new Date();
     const sourceFile = {
@@ -13736,7 +13831,7 @@ async function uploadSession(args) {
         "error",
         `Session ${sessionId} upload skipped: no saved login for ${config.apiBaseUrl}. Run \`npx hillclimb login\`.`
       );
-      return;
+      return false;
     }
     const client = new PlatformClient(
       config.apiBaseUrl,
@@ -13803,13 +13898,13 @@ Uploaded: ${now.toISOString()}`;
           "error",
           `Session ${sessionId} upload failed: authentication expired. Re-run \`npx hillclimb\` in ${repoRoot}.`
         );
-        return;
+        return false;
       }
       appendLog(
         "error",
         `Session ${sessionId} upload failed: ${err instanceof Error ? err.message : String(err)}`
       );
-      return;
+      return false;
     }
     const next = {
       schemaVersion: CURRENT_SCHEMA_VERSION2,
@@ -13837,6 +13932,7 @@ Uploaded: ${now.toISOString()}`;
         `[${sessionId}] session complete \u2014 contribution ${contributionId}, ${seq} file(s); local state cleared`
       );
     }
+    return true;
   });
 }
 var WORKER_ENV_FLAG = "HILLCLIMB_UPLOAD_WORKER";
@@ -13940,19 +14036,22 @@ async function runUploadWorker() {
   const toolOverride = process.env[TOOL_ENV_FLAG];
   if (toolOverride) payload.tool = toolOverride;
   appendLog("info", `worker: payload summary: ${summarizePayload(payload)}`);
+  let completed = false;
   try {
-    await runUploadInner(payload);
+    completed = await runUploadInner(payload);
   } catch (err) {
     appendLog(
       "error",
       `worker: unexpected error: ${err instanceof Error ? err.stack ?? err.message : String(err)}`
     );
   } finally {
-    await recordDebugLogCompletion({
-      kind: "agent",
-      tool: fallbackSourceTool(payload),
-      payload
-    });
+    if (completed) {
+      await recordDebugLogCompletion({
+        kind: "agent",
+        tool: fallbackSourceTool(payload),
+        payload
+      });
+    }
     try {
       await sweepStaleUploadStates();
     } catch {
@@ -14527,8 +14626,8 @@ import os8 from "os";
 import path17 from "path";
 var CURRENT_SCHEMA_VERSION3 = 3;
 var DEFAULT_STATE_DIR2 = path17.join(os8.homedir(), ".hillclimb", "git-traces");
-var LOCK_RETRIES3 = 120;
-var LOCK_RETRY_DELAY_MS3 = 500;
+var LOCK_RETRIES2 = 120;
+var LOCK_RETRY_DELAY_MS2 = 500;
 function stateDir3() {
   return process.env.HILLCLIMB_GIT_TRACES_STATE_DIR ?? DEFAULT_STATE_DIR2;
 }
@@ -14656,7 +14755,7 @@ async function deleteSessionState(repoRoot, tool, sessionId) {
   }
   await deleteStateFile(stateFileForRepo(repoRoot, tool));
 }
-async function acquireLock3(repoRoot, tool, retries = LOCK_RETRIES3, delayMs = LOCK_RETRY_DELAY_MS3) {
+async function acquireLock3(repoRoot, tool, retries = LOCK_RETRIES2, delayMs = LOCK_RETRY_DELAY_MS2) {
   const lockPath = lockFileForRepo(repoRoot, tool);
   await fs13.promises.mkdir(stateDir3(), { recursive: true, mode: 448 });
   for (let i = 0; i < retries; i++) {
@@ -16058,7 +16157,7 @@ async function confirmExport(group, output) {
 import fs16 from "fs";
 import os10 from "os";
 import path21 from "path";
-import readline from "readline";
+import readline2 from "readline";
 var SKIP_DIRS = /* @__PURE__ */ new Set(["tool-results"]);
 async function resolveRepoPath(projectDir) {
   const indexPath = path21.join(projectDir, "sessions-index.json");
@@ -16096,7 +16195,7 @@ async function resolveRepoPath(projectDir) {
 }
 async function extractCwdFromJsonl(filePath) {
   const stream = fs16.createReadStream(filePath, { encoding: "utf-8" });
-  const rl = readline.createInterface({ input: stream, crlfDelay: Infinity });
+  const rl = readline2.createInterface({ input: stream, crlfDelay: Infinity });
   try {
     for await (const line of rl) {
       if (!line.trim()) continue;
@@ -16177,10 +16276,10 @@ var ClaudeSource = class {
 import fs17 from "fs";
 import os11 from "os";
 import path22 from "path";
-import readline2 from "readline";
+import readline3 from "readline";
 async function parseSessionMeta(filePath) {
   const stream = fs17.createReadStream(filePath, { encoding: "utf-8" });
-  const rl = readline2.createInterface({ input: stream, crlfDelay: Infinity });
+  const rl = readline3.createInterface({ input: stream, crlfDelay: Infinity });
   try {
     for await (const line of rl) {
       if (!line.trim()) continue;
@@ -16228,7 +16327,7 @@ async function loadHistory(historyPath) {
     return map;
   }
   const stream = fs17.createReadStream(historyPath, { encoding: "utf-8" });
-  const rl = readline2.createInterface({ input: stream, crlfDelay: Infinity });
+  const rl = readline3.createInterface({ input: stream, crlfDelay: Infinity });
   try {
     for await (const line of rl) {
       if (!line.trim()) continue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hillclimb",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "description": "Extract and export AI coding tool logs grouped by repo",
   "license": "MIT",
   "type": "module",