hillclimb 0.1.1 → 0.1.2

package/dist/cli.js

@@ -11941,7 +11941,7 @@ function detectTransitionKind(repoRoot, prevHeadSha, nextHeadSha) {
     return "branch-switch";
   }
 }
-function buildBaselineMetadata(repoRoot, sessionId, tool, baselineSha, cliVersion, epoch, prevHeadSha, transitionKind) {
+function buildBaselineMetadata(repoRoot, sessionId, tool, baselineSha, cliVersion, epoch, prevHeadSha, transitionKind, startedAt) {
   const headSha = safeGit(repoRoot, ["rev-parse", "HEAD"]) ?? "unknown";
   const branch = safeGit(repoRoot, ["rev-parse", "--abbrev-ref", "HEAD"]) ?? null;
   const remoteUrl = safeGit(repoRoot, ["config", "--get", "remote.origin.url"]) ?? null;
@@ -11953,7 +11953,7 @@ function buildBaselineMetadata(repoRoot, sessionId, tool, baselineSha, cliVersio
   return {
     sessionId,
     tool,
-    startedAt: (/* @__PURE__ */ new Date()).toISOString(),
+    startedAt,
     cwd: repoRoot,
     patchFormat: "incremental",
     epoch,
@@ -12111,7 +12111,7 @@ import crypto from "crypto";
 import fs10 from "fs";
 import os7 from "os";
 import path13 from "path";
-var CURRENT_SCHEMA_VERSION = 2;
+var CURRENT_SCHEMA_VERSION = 3;
 var STATE_DIR = path13.join(os7.homedir(), ".hillclimb", "git-traces");
 function stateFileForRepo(repoRoot, tool) {
   const hash = crypto.createHash("sha256").update(`${path13.resolve(repoRoot)}\0${tool}`).digest("hex").slice(0, 16);
@@ -12237,7 +12237,16 @@ async function uploadFile(client, contributionId, filename, mimeType, buffer) {
   );
   appendLog("info", `git-traces: uploaded ${filename} (${buffer.byteLength} bytes)`);
 }
-async function openEpoch(params) {
+function pinEpochBaseline(repoRoot, sessionId, epoch) {
+  const baselineSha = captureBaselineSha(repoRoot);
+  pinRef(
+    repoRoot,
+    `refs/hillclimb/baseline/${sessionId}/${epochPrefix(epoch)}`,
+    baselineSha
+  );
+  return { baselineSha, headSha: captureHeadSha(repoRoot) };
+}
+async function uploadEpochBaseline(params) {
   const {
     repoRoot,
     client,
@@ -12245,16 +12254,12 @@ async function openEpoch(params) {
     sessionId,
     tool,
     epoch,
+    baselineSha,
     prevHeadSha,
-    transitionKind
+    transitionKind,
+    startedAt
   } = params;
-  const baselineSha = captureBaselineSha(repoRoot);
   const prefix = epochPrefix(epoch);
-  pinRef(
-    repoRoot,
-    `refs/hillclimb/baseline/${sessionId}/${prefix}`,
-    baselineSha
-  );
   const metadata = buildBaselineMetadata(
     repoRoot,
     sessionId,
@@ -12263,7 +12268,8 @@ async function openEpoch(params) {
     CLI_VERSION,
     epoch,
     prevHeadSha,
-    transitionKind
+    transitionKind,
+    startedAt
   );
   let baselineTreeSha;
   let bundleBuffer;
@@ -12297,11 +12303,17 @@ async function openEpoch(params) {
     "application/x-git-bundle",
     bundleBuffer
   );
-  return {
-    baselineSha,
-    baselineTreeSha,
-    headSha: captureHeadSha(repoRoot)
-  };
+  return { baselineTreeSha };
+}
+async function openEpoch(params) {
+  const { baselineSha, headSha } = pinEpochBaseline(
+    params.repoRoot,
+    params.sessionId,
+    params.epoch
+  );
+  const uploaded = await uploadEpochBaseline({ ...params, baselineSha });
+  if (!uploaded) return null;
+  return { baselineSha, baselineTreeSha: uploaded.baselineTreeSha, headSha };
 }
 async function initializeSession(cwd, tool, sessionId) {
   const project = await findProjectForCwd(cwd);
@@ -12309,57 +12321,25 @@ async function initializeSession(cwd, tool, sessionId) {
     appendLog("warn", "git-traces: no hillclimb project config found, skipping");
     return null;
   }
-  const { config } = project;
-  const identity = await loadIdentity(config.apiBaseUrl);
-  if (!identity) {
-    appendLog(
-      "warn",
-      `git-traces: no saved login for ${config.apiBaseUrl}, skipping`
-    );
-    return null;
-  }
-  const client = new PlatformClient(config.apiBaseUrl, identity.sessionCookie);
-  const toolLabel = TOOL_LABELS[tool] ?? "Claude";
-  const now = /* @__PURE__ */ new Date();
-  const shortId = sessionId.slice(0, 12);
-  const contribution = await client.createContribution(config.workspaceId, {
-    contributionTypeSlug: GIT_TRACES_SLUG,
-    title: `${toolLabel} session ${shortId} \u2014 ${formatTitleTimestamp2(now)}`,
-    body: `Session ID: ${sessionId}
-Tool: ${toolLabel}
-Repo: ${cwd}
-Uploaded: ${now.toISOString()}`
-  });
-  await client.submitContribution(contribution.id);
-  const artifacts = await openEpoch({
-    repoRoot: cwd,
-    client,
-    contributionId: contribution.id,
-    sessionId,
-    tool,
-    epoch: 1,
-    prevHeadSha: null,
-    transitionKind: "initial"
-  });
-  if (!artifacts) return null;
+  const { baselineSha, headSha } = pinEpochBaseline(cwd, sessionId, 1);
   const state = {
     schemaVersion: CURRENT_SCHEMA_VERSION,
     sessionId,
-    contributionId: contribution.id,
-    baselineSha: artifacts.baselineSha,
-    baselineTreeSha: artifacts.baselineTreeSha,
-    lastSnapshotSha: artifacts.baselineSha,
-    lastSnapshotTreeSha: artifacts.baselineTreeSha,
+    contributionId: null,
+    baselineSha,
+    baselineTreeSha: null,
+    lastSnapshotSha: baselineSha,
+    lastSnapshotTreeSha: null,
     startedAt: (/* @__PURE__ */ new Date()).toISOString(),
     epoch: 1,
     turnCount: 0,
-    headSha: artifacts.headSha,
+    headSha,
     repoRoot: cwd
   };
   await writeSessionState(state, tool);
   appendLog(
     "info",
-    `git-traces: session started (epoch=1, baseline=${artifacts.baselineSha.slice(0, 8)}, contribution=${contribution.id})`
+    `git-traces: session pending (baseline=${baselineSha.slice(0, 8)}, awaiting first turn)`
   );
   return state;
 }
@@ -12417,6 +12397,53 @@ async function handleStop(payload, tool) {
       project.config.apiBaseUrl,
       identity.sessionCookie
     );
+    if (state.contributionId === null) {
+      const toolLabel = TOOL_LABELS[tool] ?? "Claude";
+      const now = /* @__PURE__ */ new Date();
+      const shortId = state.sessionId.slice(0, 12);
+      const contribution = await client.createContribution(
+        project.config.workspaceId,
+        {
+          contributionTypeSlug: GIT_TRACES_SLUG,
+          title: `${toolLabel} session ${shortId} \u2014 ${formatTitleTimestamp2(now)}`,
+          body: `Session ID: ${state.sessionId}
+Tool: ${toolLabel}
+Repo: ${cwd}
+Uploaded: ${now.toISOString()}`
+        }
+      );
+      await client.submitContribution(contribution.id);
+      const uploaded = await uploadEpochBaseline({
+        repoRoot: cwd,
+        client,
+        contributionId: contribution.id,
+        sessionId: state.sessionId,
+        tool,
+        epoch: 1,
+        baselineSha: state.baselineSha,
+        prevHeadSha: null,
+        transitionKind: "initial",
+        startedAt: state.startedAt
+      });
+      if (!uploaded) return;
+      state.contributionId = contribution.id;
+      state.baselineTreeSha = uploaded.baselineTreeSha;
+      state.lastSnapshotTreeSha = uploaded.baselineTreeSha;
+      await writeSessionState(state, tool);
+      appendLog(
+        "info",
+        `git-traces: session registered on first turn (epoch=1, baseline=${state.baselineSha.slice(0, 8)}, contribution=${contribution.id})`
+      );
+    }
+    const contributionId = state.contributionId;
+    const lastSnapshotTreeSha = state.lastSnapshotTreeSha;
+    if (contributionId === null || lastSnapshotTreeSha === null) {
+      appendLog(
+        "error",
+        "git-traces: invariant violation \u2014 session state missing contributionId or tree SHA after lazy init"
+      );
+      return;
+    }
     const currentHeadSha = captureHeadSha(cwd);
     if (currentHeadSha !== state.headSha) {
       const transitionKind = detectTransitionKind(
@@ -12432,12 +12459,13 @@ async function handleStop(payload, tool) {
       const artifacts = await openEpoch({
         repoRoot: cwd,
         client,
-        contributionId: state.contributionId,
+        contributionId,
         sessionId: state.sessionId,
         tool,
         epoch: nextEpoch,
         prevHeadSha: state.headSha || null,
-        transitionKind
+        transitionKind,
+        startedAt: state.startedAt
       });
       if (!artifacts) return;
       const next = {
@@ -12457,7 +12485,7 @@ async function handleStop(payload, tool) {
     const currentTreeSha = buildSnapshotTree(cwd, currentSha);
     const patchBuffer = createTreeDiffPatchGz(
       cwd,
-      state.lastSnapshotTreeSha,
+      lastSnapshotTreeSha,
       currentTreeSha
     );
     if (!patchBuffer) {
@@ -12478,7 +12506,7 @@ async function handleStop(payload, tool) {
     const filename = `${prefix}-${turnLabel}-${recordedAt}.patch.gz`;
     await uploadFile(
       client,
-      state.contributionId,
+      contributionId,
       filename,
       "application/gzip",
       patchBuffer

package/package.json

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