chatroom-cli 1.51.0 → 1.52.0

package/dist/index.js

@@ -27807,8 +27807,9 @@ ${options.prompt}` : options.prompt;
 `);
               break;
             }
+            const resumePromise = waitForResumeOrAbort(session);
             adapter.finish();
-            const resumePrompt = await waitForResumeOrAbort(session);
+            const resumePrompt = await resumePromise;
             if (resumePrompt === null || session.aborted) {
               if (session.aborted) {
                 exitCode = 1;
@@ -80251,6 +80252,13 @@ async function getCommitsAhead(workingDir) {
   const count3 = parseInt(result.stdout.trim(), 10);
   return Number.isNaN(count3) ? 0 : count3;
 }
+async function getCommitsBehind(workingDir) {
+  const result = await runGit("rev-list --count HEAD..@{upstream}", workingDir);
+  if ("error" in result)
+    return 0;
+  const count3 = parseInt(result.stdout.trim(), 10);
+  return Number.isNaN(count3) ? 0 : count3;
+}
 async function getCommitStatusChecks(cwd, ref) {
   const repoSlug = await getOriginRepoSlug(cwd);
   if (!repoSlug)
@@ -80600,6 +80608,14 @@ var init_git_heartbeat = __esm(() => {
       toMutationPartial: (raw) => ({ commitsAhead: raw }),
       defaultValue: 0
     },
+    {
+      key: "commitsBehind",
+      includeInSlim: false,
+      collect: (wd) => getCommitsBehind(wd),
+      toHashable: (raw) => raw,
+      toMutationPartial: (raw) => ({ commitsBehind: raw }),
+      defaultValue: 0
+    },
     {
       key: "remotes",
       includeInSlim: false,
@@ -84750,6 +84766,37 @@ async function gitPull(workingDir) {
   }
   return { status: "available" };
 }
+async function gitPush(workingDir) {
+  const result = await runGit2("push", workingDir);
+  if ("error" in result) {
+    const message = result.error.message;
+    if (message.includes("no upstream branch")) {
+      return {
+        status: "error",
+        message: "No upstream branch configured. Set upstream with `git push -u`."
+      };
+    }
+    if (message.includes("Authentication failed") || message.includes("could not read")) {
+      return {
+        status: "error",
+        message: "Authentication failed. Run `gh auth status` to check your GitHub credentials."
+      };
+    }
+    return classifyError2(message);
+  }
+  const stderr = result.stderr.trim();
+  if (stderr && !stderr.includes("Everything up-to-date")) {
+    return { status: "available", message: stderr };
+  }
+  return { status: "available" };
+}
+async function gitSync(workingDir) {
+  const pullResult = await gitPull(workingDir);
+  if (pullResult.status === "error") {
+    return pullResult;
+  }
+  return gitPush(workingDir);
+}
 var execAsync4;
 var init_git_writer = __esm(() => {
   execAsync4 = promisify5(exec5);
@@ -84855,6 +84902,20 @@ async function executeLocalAction(action, workingDir) {
       }
       return { success: true, message: result.message ?? "Pull successful" };
     }
+    case "git-push": {
+      const result = await gitPush(workingDir);
+      if (result.status === "error") {
+        return { success: false, error: result.message };
+      }
+      return { success: true, message: result.message ?? "Push successful" };
+    }
+    case "git-sync": {
+      const result = await gitSync(workingDir);
+      if (result.status === "error") {
+        return { success: false, error: result.message };
+      }
+      return { success: true, message: result.message ?? "Sync successful" };
+    }
     default: {
       const _exhaustive = action;
       return { success: false, error: `Unknown action: ${_exhaustive}` };
@@ -85297,6 +85358,9 @@ async function dispatchCommandEvent(ctx, event, tracker) {
     const result = await executeLocalAction(event.action, event.workingDir);
     if (!result.success) {
       console.warn(`[${formatTimestamp()}] ⚠️  Local action failed: ${result.error}`);
+    } else if (event.action === "git-pull" || event.action === "git-push" || event.action === "git-sync" || event.action === "git-discard-all") {
+      ctx.lastPushedGitState.delete(makeGitStateKey(ctx.machineId, event.workingDir));
+      await pushSingleWorkspaceGitState(ctx, event.workingDir);
     }
     tracker.localActionIds.set(eventId, Date.now());
   } else if (eventType === "command.run") {
@@ -86699,4 +86763,4 @@ program2.hook("preAction", async (_thisCommand, actionCommand) => {
 });
 program2.parse();
 
-//# debugId=3E031CCB2CBFFA9464756E2164756E21
+//# debugId=9CDA1F59EFE33D8964756E2164756E21