chatroom-cli 1.38.1 → 1.38.3

package/dist/index.js

@@ -75090,8 +75090,8 @@ async function pushSingleWorkspaceGitState(ctx, workingDir) {
   const stateKey = makeGitStateKey(ctx.machineId, workingDir);
   const isRepo = await isGitRepo(workingDir);
   if (!isRepo) {
-    const stateHash = "not_found";
-    if (ctx.lastPushedGitState.get(stateKey) === stateHash)
+    const stateHash2 = "not_found";
+    if (ctx.lastPushedGitState.get(stateKey) === stateHash2)
       return;
     await ctx.deps.backend.mutation(api.workspaces.upsertWorkspaceGitState, {
       sessionId: ctx.sessionId,
@@ -75099,13 +75099,13 @@ async function pushSingleWorkspaceGitState(ctx, workingDir) {
       workingDir,
       status: "not_found"
     });
-    ctx.lastPushedGitState.set(stateKey, stateHash);
+    ctx.lastPushedGitState.set(stateKey, stateHash2);
     return;
   }
   const branchResult = await getBranch(workingDir);
   if (branchResult.status === "error") {
-    const stateHash = `error:${branchResult.message}`;
-    if (ctx.lastPushedGitState.get(stateKey) === stateHash)
+    const stateHash2 = `error:${branchResult.message}`;
+    if (ctx.lastPushedGitState.get(stateKey) === stateHash2)
       return;
     await ctx.deps.backend.mutation(api.workspaces.upsertWorkspaceGitState, {
       sessionId: ctx.sessionId,
@@ -75114,7 +75114,7 @@ async function pushSingleWorkspaceGitState(ctx, workingDir) {
       status: "error",
       errorMessage: branchResult.message
     });
-    ctx.lastPushedGitState.set(stateKey, stateHash);
+    ctx.lastPushedGitState.set(stateKey, stateHash2);
     return;
   }
   if (branchResult.status === "not_found") {
@@ -75125,23 +75125,36 @@ async function pushSingleWorkspaceGitState(ctx, workingDir) {
   const pipeline2 = new GitStatePipeline(allFields);
   const preCollected = new Map([["branch", branchResult]]);
   const values3 = await pipeline2.collect(workingDir, preCollected);
-  const commits = values3.get("commits");
+  const commits = await getRecentCommits(workingDir, COMMITS_PER_PAGE);
   const hasMoreCommits = commits.length >= COMMITS_PER_PAGE;
-  const hash2 = pipeline2.computeHash(values3, false);
-  if (ctx.lastPushedGitState.get(stateKey) === hash2) {
-    return;
+  const stateHash = pipeline2.computeHash(values3, false);
+  const commitsKey = `${stateKey}:commits`;
+  const commitsHash = JSON.stringify(commits.map((c) => c.sha));
+  if (ctx.lastPushedGitState.get(stateKey) !== stateHash) {
+    await ctx.deps.backend.mutation(api.workspaces.upsertWorkspaceGitState, {
+      sessionId: ctx.sessionId,
+      machineId: ctx.machineId,
+      workingDir,
+      status: "available",
+      ...pipeline2.toMutationArgs(values3, false)
+    });
+    ctx.lastPushedGitState.set(stateKey, stateHash);
+    console.log(`[${formatTimestamp()}] \uD83D\uDD00 Git state pushed: ${workingDir} (${branch}${values3.get("isDirty") ? ", dirty" : ", clean"})`);
+  }
+  if (ctx.lastPushedGitState.get(commitsKey) !== commitsHash) {
+    try {
+      await ctx.deps.backend.mutation(api.workspaces.upsertRecentCommits, {
+        sessionId: ctx.sessionId,
+        machineId: ctx.machineId,
+        workingDir,
+        commits,
+        hasMoreCommits
+      });
+      ctx.lastPushedGitState.set(commitsKey, commitsHash);
+    } catch (err) {
+      console.warn(`[${formatTimestamp()}] ⚠️  Recent commits push failed for ${workingDir}: ${getErrorMessage(err)}`);
+    }
   }
-  await ctx.deps.backend.mutation(api.workspaces.upsertWorkspaceGitState, {
-    sessionId: ctx.sessionId,
-    machineId: ctx.machineId,
-    workingDir,
-    status: "available",
-    ...pipeline2.toMutationArgs(values3, false),
-    recentCommits: commits,
-    hasMoreCommits
-  });
-  ctx.lastPushedGitState.set(stateKey, hash2);
-  console.log(`[${formatTimestamp()}] \uD83D\uDD00 Git state pushed: ${workingDir} (${branch}${values3.get("isDirty") ? ", dirty" : ", clean"})`);
   prefetchMissingCommitDetails(ctx, workingDir, commits).catch((err) => {
     console.warn(`[${formatTimestamp()}] ⚠️  Commit pre-fetch failed for ${workingDir}: ${getErrorMessage(err)}`);
   });
@@ -75321,14 +75334,6 @@ var init_git_heartbeat = __esm(() => {
       },
       defaultValue: { status: "not_found" }
     },
-    {
-      key: "commits",
-      includeInSlim: false,
-      collect: (wd) => getRecentCommits(wd, COMMITS_PER_PAGE),
-      toHashable: (raw) => raw.map((c) => c.sha),
-      toMutationPartial: () => ({}),
-      defaultValue: []
-    },
     {
       key: "commitsAhead",
       includeInSlim: false,
@@ -78788,5 +78793,5 @@ program2.hook("preAction", async (_thisCommand, actionCommand) => {
 });
 program2.parse();
 
-//# debugId=6F78BECED1936ADC64756E2164756E21
+//# debugId=5C16A49415B864E364756E2164756E21
 //# sourceMappingURL=index.js.map