hillclimb 0.8.3 → 0.8.4

package/dist/main.js

@@ -2349,7 +2349,11 @@ var VOLATILE_KEYS = /* @__PURE__ */ new Set([
   "wall_time_ms"
 ]);
 function sessionsDir() {
-  return process.env.HILLCLIMB_CODEX_SESSIONS_DIR ?? path9.join(os3.homedir(), ".codex", "sessions");
+  if (process.env.HILLCLIMB_CODEX_SESSIONS_DIR) {
+    return process.env.HILLCLIMB_CODEX_SESSIONS_DIR;
+  }
+  const codexHome = process.env.CODEX_HOME || path9.join(os3.homedir(), ".codex");
+  return path9.join(codexHome, "sessions");
 }
 function asRecord(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value) ? value : null;
@@ -2519,6 +2523,10 @@ async function findCodexRolloutPath(sessionId) {
   }
   return void 0;
 }
+async function isCodexInternalThread(payload, sessionId) {
+  if (!sessionId || payload.transcript_path) return false;
+  return await findCodexRolloutPath(sessionId) === void 0;
+}
 function commonPrefixLength(a, b) {
   const limit = Math.min(a.length, b.length);
   let count = 0;
@@ -11762,14 +11770,20 @@ function getSourceBaseDir(sourceName) {
   }
 }
 function archivePathFor(file) {
+  return path11.posix.join(file.sourceName, path11.basename(file.absolutePath));
+}
+function legacyArchivePathFor(file) {
   const baseDir = getSourceBaseDir(file.sourceName);
   const relativePath = file.absolutePath.startsWith(baseDir) ? path11.relative(baseDir, file.absolutePath) : path11.basename(file.absolutePath);
   return path11.join(file.sourceName, relativePath);
 }
 function addGroupToArchive(archive, group, selectedSources) {
+  const used = /* @__PURE__ */ new Set();
   for (const file of group.files) {
     if (!selectedSources.has(file.sourceName)) continue;
-    const archivePath = archivePathFor(file);
+    let archivePath = archivePathFor(file);
+    if (used.has(archivePath)) archivePath = legacyArchivePathFor(file);
+    used.add(archivePath);
     if (file.content) {
       archive.append(file.content, { name: archivePath });
     } else {
@@ -13065,7 +13079,7 @@ async function runUploadInner(payload) {
       "warn",
       `Skipping upload: missing required hook fields (session_id=${!!sessionId}, transcript_path=${!!payload.transcript_path}, cwd=${!!cwd})`
     );
-    return false;
+    return "skipped";
   }
   const match = await findProjectForCwd(cwd);
   if (!match) {
@@ -13073,13 +13087,13 @@ async function runUploadInner(payload) {
       "warn",
       `Skipping session ${sessionId}: no hillclimb config for cwd ${cwd}. Run \`npx hillclimb\` in the repo.`
     );
-    return false;
+    return "skipped";
   }
   const { repoRoot, config } = match;
   const sourceTool = await resolveSourceTool(payload, repoRoot);
   if (!sourceTool) {
     payload.tool = "unknown";
-    return false;
+    return "skipped";
   }
   payload.tool = sourceTool;
   appendLog(
@@ -13093,11 +13107,18 @@ async function runUploadInner(payload) {
     sessionId
   );
   if (!transcriptPath) {
+    if (sourceTool === "codex") {
+      appendLog(
+        "info",
+        `Skipping session ${sessionId}: Codex internal thread (no transcript_path and no rollout under ~/.codex/sessions); not a user session`
+      );
+      return "internal-thread";
+    }
     appendLog(
       "warn",
       `Skipping upload: missing required hook fields (session_id=true, transcript_path=false, cwd=true)`
     );
-    return false;
+    return "skipped";
   }
   const transcriptResolved = path15.resolve(transcriptPath);
   try {
@@ -13107,23 +13128,32 @@ async function runUploadInner(payload) {
         "warn",
         `Skipping session ${sessionId}: transcript_path is not a file: ${transcriptResolved}`
       );
-      return false;
+      return "skipped";
     }
   } catch (err) {
+    const detail = err instanceof Error ? err.message : String(err);
+    const missing = err?.code === "ENOENT";
+    if (missing && eventKind2 === "sessionEnd") {
+      appendLog(
+        "info",
+        `Skipping session ${sessionId}: session ended without any turns; transcript was never written (${transcriptResolved})`
+      );
+      return "skipped";
+    }
     appendLog(
       "warn",
-      `Skipping session ${sessionId}: transcript_path not readable (${transcriptResolved}): ${err instanceof Error ? err.message : String(err)}`
+      `Skipping session ${sessionId}: transcript_path not readable (${transcriptResolved}): ${detail}`
     );
-    return false;
+    return "skipped";
   }
   if (!await hasAssistantMessage(transcriptResolved)) {
     appendLog(
       "info",
       `Skipping session ${sessionId}: transcript contains no assistant messages (nothing to upload).`
     );
-    return false;
+    return "skipped";
   }
-  return await uploadSession({
+  const uploaded = await uploadSession({
     sessionId,
     transcriptPath: transcriptResolved,
     repoRoot,
@@ -13132,6 +13162,7 @@ async function runUploadInner(payload) {
     eventKind: eventKind2,
     recordedAt
   });
+  return uploaded ? "uploaded" : "skipped";
 }
 var AGENT_MAX_UPLOAD_BYTES = 1024 * 1024 * 1024;
 var CLI_VERSION = "0.8.0";
@@ -13351,6 +13382,10 @@ async function uploadSession(args) {
       sourceName: sourceTool,
       absolutePath: transcriptPath
     });
+    const legacyTranscriptArchivePath = legacyArchivePathFor({
+      sourceName: sourceTool,
+      absolutePath: transcriptPath
+    });
     const alreadySubmitted = prior?.submitted ?? false;
     const submitThisUpload = config.autoSubmit && !alreadySubmitted;
     if (mode === "meta-refresh" && prior?.contributionId && prior.epochMeta && cursor) {
@@ -13428,7 +13463,7 @@ async function uploadSession(args) {
           epochMeta2 = {
             transitionKind: "legacy-adopted",
             baseline: "legacy-latest-zip",
-            transcriptArchivePath,
+            transcriptArchivePath: legacyTranscriptArchivePath,
             rawByteOffset: baseCursor.rawByteOffset,
             rawPrefixSha256: baseCursor.rawPrefixSha256
           };
@@ -13444,7 +13479,7 @@ async function uploadSession(args) {
               epoch: epoch2,
               transitionKind: "legacy-adopted",
               baseline: "legacy-latest-zip",
-              transcriptArchivePath,
+              transcriptArchivePath: legacyTranscriptArchivePath,
               cursor: baseCursor,
               recordedAt,
               lineage: codexLineage
@@ -13885,16 +13920,16 @@ 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;
+  let outcome = "skipped";
   try {
-    completed = await runUploadInner(payload);
+    outcome = await runUploadInner(payload);
   } catch (err) {
     appendLog(
       "error",
       `worker: unexpected error: ${err instanceof Error ? err.stack ?? err.message : String(err)}`
     );
   } finally {
-    if (completed) {
+    if (outcome !== "internal-thread") {
       await recordDebugLogCompletion({
         kind: "agent",
         tool: fallbackSourceTool(payload),
@@ -16693,6 +16728,13 @@ async function runGitTracesWorker() {
     );
     return;
   }
+  if (tool === "codex" && await isCodexInternalThread(payload, resolveHookSessionId(payload))) {
+    appendLog(
+      "info",
+      `git-traces: skipping Codex internal thread ${resolveHookSessionId(payload)} on ${event} (no transcript_path and no rollout on disk; not a user session)`
+    );
+    return;
+  }
   try {
     await selfHealHook2(payload, tool);
     switch (eventKind2) {

package/package.json

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