hillclimb 0.9.0 → 0.9.2

package/dist/main.js

@@ -568,7 +568,7 @@ var PlatformClient = class {
     const sizeBytes = body.kind === "buffer" ? body.buffer.length : body.sizeBytes;
     const prefix = `/api/v1/contributions/${encodeURIComponent(contributionId)}`;
     let digest;
-    const verify = async (uploadId) => {
+    const verify = async (uploadId, options = {}) => {
       if (digest === void 0) {
         const hash = createHash("sha256");
         let localSize = 0;
@@ -590,7 +590,8 @@ var PlatformClient = class {
       return this.verifyReplayArtifact(
         `${prefix}/uploads/${encodeURIComponent(uploadId)}/download`,
         sizeBytes,
-        digest
+        digest,
+        options
       );
     };
     const put = async (target2) => {
@@ -642,7 +643,7 @@ var PlatformClient = class {
           "UPLOAD_REPLAY_MISMATCH"
         );
       }
-      const verified = await verify(existing.id);
+      const verified = await verify(existing.id, { forbiddenIsAbsent: true });
       if (verified.exists) return;
       target = await this.request(
         "POST",
@@ -665,7 +666,7 @@ var PlatformClient = class {
     }
     await put(target);
   }
-  async verifyReplayArtifact(relative, sizeBytes, expectedDigest) {
+  async verifyReplayArtifact(relative, sizeBytes, expectedDigest, options = {}) {
     const redirect = await fetch(this.url(relative), {
       headers: this.headers(),
       redirect: "manual",
@@ -708,8 +709,13 @@ var PlatformClient = class {
     } catch {
       throw new PlatformError("Stored artifact verification request failed");
     }
-    if (response.status === 404) {
+    if (response.status === 404 || response.status === 403 && options.forbiddenIsAbsent) {
       await response.body?.cancel();
+      if (response.status === 403)
+        appendLog(
+          "info",
+          "upload-replay: storage refused the pending artifact (403); treating it as never written and letting the guarded PUT decide"
+        );
       return { exists: false, url: location };
     }
     if (!response.ok) {
@@ -16831,7 +16837,7 @@ async function uploadArtifact(client, contributionId, filename, mimeType, buffer
 }
 
 // package.json
-var version = "0.9.0";
+var version = "0.9.2";
 
 // src/version.ts
 var CLI_VERSION = version;
@@ -16973,13 +16979,14 @@ function isPhantomClaudeHook(payload, toolOverride) {
 var MAX_FORK_SWEEP_THREADS = 8;
 async function runUploadInner(payload, options = {}) {
   const outcome = await runUploadForSession(payload, options);
-  if (!options.sweptFrom && payload.tool === "codex" && (outcome === "uploaded" || outcome === "skipped")) {
+  const settled = outcome === "uploaded" || outcome === "unchanged" || outcome === "skipped";
+  if (!options.sweptFrom && payload.tool === "codex" && settled) {
     await sweepCodexForkTranscripts(payload);
   }
-  if (!options.sweptFrom && payload.tool === "claude" && (outcome === "uploaded" || outcome === "skipped")) {
+  if (!options.sweptFrom && payload.tool === "claude" && settled) {
     await sweepClaudeSubagentTranscripts(payload);
   }
-  if (!options.sweptFrom && (outcome === "uploaded" || outcome === "skipped")) {
+  if (!options.sweptFrom && settled) {
     await sweepStrandedAgentUploads(resolveHookSessionId(payload));
   }
   return outcome;
@@ -17020,7 +17027,13 @@ async function sweepClaudeSubagentTranscripts(payload) {
     const project = await findProjectForCwd(cwd);
     if (!project) return;
     files.sort((a, b) => b.modifiedMs - a.modifiedMs);
-    const tally = { uploaded: 0, pending: 0, skipped: 0, failed: 0 };
+    const tally = {
+      uploaded: 0,
+      unchanged: 0,
+      pending: 0,
+      skipped: 0,
+      failed: 0
+    };
     for (const entry of files.slice(0, MAX_SUBAGENT_SWEEP)) {
       const subagentSessionId = `agent-${entry.agentId}`;
       try {
@@ -17039,6 +17052,7 @@ async function sweepClaudeSubagentTranscripts(payload) {
           }
         );
         if (outcome === "uploaded") tally.uploaded++;
+        else if (outcome === "unchanged") tally.unchanged++;
         else if (outcome === "pending") tally.pending++;
         else tally.skipped++;
         appendLog(
@@ -17055,7 +17069,7 @@ async function sweepClaudeSubagentTranscripts(payload) {
     }
     appendLog(
       "info",
-      `[${parentSessionId}] subagent sweep (found=${files.length}, uploaded=${tally.uploaded}, pending=${tally.pending}, skipped=${tally.skipped}, failed=${tally.failed})`
+      `[${parentSessionId}] subagent sweep (found=${files.length}, uploaded=${tally.uploaded}, unchanged=${tally.unchanged}, pending=${tally.pending}, skipped=${tally.skipped}, failed=${tally.failed})`
     );
   } catch (err) {
     appendLog(
@@ -17178,7 +17192,13 @@ async function sweepCodexForkTranscripts(payload) {
       registeredRoots
     });
     if (discovery.forks.length === 0) return;
-    const tally = { uploaded: 0, pending: 0, skipped: 0, failed: 0 };
+    const tally = {
+      uploaded: 0,
+      unchanged: 0,
+      pending: 0,
+      skipped: 0,
+      failed: 0
+    };
     for (const fork of discovery.forks.slice(0, MAX_FORK_SWEEP_THREADS)) {
       const project = await findProjectForCwd(fork.cwd) ?? parent;
       const forkPayload = {
@@ -17194,6 +17214,7 @@ async function sweepCodexForkTranscripts(payload) {
           sweptFrom: parentSessionId
         });
         if (outcome === "uploaded") tally.uploaded++;
+        else if (outcome === "unchanged") tally.unchanged++;
         else if (outcome === "pending") tally.pending++;
         else tally.skipped++;
         appendLog(
@@ -17210,7 +17231,7 @@ async function sweepCodexForkTranscripts(payload) {
     }
     appendLog(
       "info",
-      `[${parentSessionId}] fork sweep (scannedRollouts=${discovery.scannedRollouts}, forks=${discovery.forks.length}, uploaded=${tally.uploaded}, pending=${tally.pending}, skipped=${tally.skipped}, failed=${tally.failed})`
+      `[${parentSessionId}] fork sweep (scannedRollouts=${discovery.scannedRollouts}, forks=${discovery.forks.length}, uploaded=${tally.uploaded}, unchanged=${tally.unchanged}, pending=${tally.pending}, skipped=${tally.skipped}, failed=${tally.failed})`
     );
   } catch (err) {
     appendLog(
@@ -17219,6 +17240,13 @@ async function sweepCodexForkTranscripts(payload) {
     );
   }
 }
+async function settledOutcome(before, drained, repoRoot, sourceTool, sessionId) {
+  if (!drained) return "pending";
+  const after = await readUploadState(repoRoot, sourceTool, sessionId);
+  if (!after) return "unchanged";
+  if (!before) return "uploaded";
+  return after.uploadCount !== before.uploadCount || after.lastUploadedAt !== before.lastUploadedAt ? "uploaded" : "unchanged";
+}
 async function runUploadForSession(payload, options) {
   if (isPhantomClaudeHook(payload)) {
     appendLog("info", "upload: skipping phantom Claude hook fired by Cursor");
@@ -17265,7 +17293,8 @@ async function runUploadForSession(payload, options) {
       "info",
       `[${sessionId}] replaying ${pending.length} pending capture(s) without reading the live transcript`
     );
-    return await drainCapturedSessions({
+    const before2 = await readUploadState(repoRoot, sourceTool, sessionId);
+    const drained2 = await drainCapturedSessions({
       sessionId,
       repoRoot,
       config,
@@ -17273,7 +17302,8 @@ async function runUploadForSession(payload, options) {
       eventKind: eventKind2,
       recordedAt,
       transcriptPath: firstPending.transcriptPath
-    }) ? "uploaded" : "pending";
+    });
+    return settledOutcome(before2, drained2, repoRoot, sourceTool, sessionId);
   };
   const transcriptPath = await resolveTranscriptPath(
     payload,
@@ -17330,7 +17360,8 @@ async function runUploadForSession(payload, options) {
     );
     return "skipped";
   }
-  const uploaded = await captureAndUploadSession({
+  const before = await readUploadState(repoRoot, sourceTool, sessionId);
+  const drained = await captureAndUploadSession({
     sessionId,
     transcriptPath: transcriptResolved,
     repoRoot,
@@ -17340,7 +17371,7 @@ async function runUploadForSession(payload, options) {
     recordedAt,
     subagent: options.subagent
   });
-  return uploaded ? "uploaded" : "pending";
+  return settledOutcome(before, drained, repoRoot, sourceTool, sessionId);
 }
 var AGENT_MAX_UPLOAD_BYTES = 1024 * 1024 * 1024;
 function makeTranscriptGroup(repoRoot, sourceTool, transcriptPath, content) {
@@ -20402,6 +20433,7 @@ async function sweepCodexForkCaptures(params) {
     worktree: 0,
     sameTree: 0,
     unrelated: 0,
+    deferred: 0,
     initialized: 0,
     uploaded: 0,
     unchanged: 0,
@@ -20409,8 +20441,14 @@ async function sweepCodexForkCaptures(params) {
     failed: 0,
     skipped: 0
   };
-  for (const fork of discovery.forks.slice(0, MAX_FORK_SWEEP_THREADS2)) {
-    const target = await resolveForkTarget(fork.cwd, repos);
+  const targets = /* @__PURE__ */ new Map();
+  const hooked = /* @__PURE__ */ new Set();
+  for (const fork of discovery.forks) {
+    let target = targets.get(fork.cwd);
+    if (target === void 0) {
+      target = await resolveForkTarget(fork.cwd, repos);
+      targets.set(fork.cwd, target);
+    }
     if (!target) {
       tally.unrelated++;
       continue;
@@ -20419,12 +20457,19 @@ async function sweepCodexForkCaptures(params) {
       tally.sameTree++;
       continue;
     }
-    tally.worktree++;
     const repo = {
       repoRoot: target.repoRoot,
       config: target.config
     };
-    await propagateCodexHooks(project.repoRoot, repo.repoRoot);
+    if (!hooked.has(repo.repoRoot)) {
+      hooked.add(repo.repoRoot);
+      await propagateCodexHooks(project.repoRoot, repo.repoRoot);
+    }
+    if (tally.worktree >= MAX_FORK_SWEEP_THREADS2) {
+      tally.deferred++;
+      continue;
+    }
+    tally.worktree++;
     const forkPayload = {
       session_id: fork.threadId,
       cwd: fork.cwd,
@@ -20508,7 +20553,7 @@ async function sweepCodexForkCaptures(params) {
   }
   appendLog(
     "info",
-    `git-traces: fork sweep (parent=${parentSessionId}, event=${event}, triggerRepo=${project.repoRoot}, scannedRollouts=${discovery.scannedRollouts}, forks=${discovery.forks.length}, worktree=${tally.worktree}, sameTree=${tally.sameTree}, unrelated=${tally.unrelated}, initialized=${tally.initialized}, uploaded=${tally.uploaded}, unchanged=${tally.unchanged}, pending=${tally.pending}, failed=${tally.failed}, skipped=${tally.skipped})`
+    `git-traces: fork sweep (parent=${parentSessionId}, event=${event}, triggerRepo=${project.repoRoot}, scannedRollouts=${discovery.scannedRollouts}, forks=${discovery.forks.length}, worktree=${tally.worktree}, sameTree=${tally.sameTree}, unrelated=${tally.unrelated}, initialized=${tally.initialized}, uploaded=${tally.uploaded}, unchanged=${tally.unchanged}, pending=${tally.pending}, failed=${tally.failed}, skipped=${tally.skipped}, deferred=${tally.deferred})`
   );
 }
 async function sweepCodexForksSafely(params) {

package/package.json

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