codeam-cli 2.4.4 → 2.4.5

package/CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to `codeam-cli` are documented here.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.4.3] — 2026-05-03
+
+### Fixed
+
+- **cli:** Refresh missing `codespace` scope on existing gh logins (v2.4.3)
+
 ## [2.4.2] — 2026-05-03
 
 ### Fixed

package/dist/index.js

@@ -179,7 +179,7 @@ var import_qrcode_terminal = __toESM(require("qrcode-terminal"));
 // package.json
 var package_default = {
   name: "codeam-cli",
-  version: "2.4.4",
+  version: "2.4.5",
   description: "Remote control Claude Code (and other AI coding agents) from your mobile phone. Pair your device, send prompts, stream responses in real-time, and approve commands \u2014 from anywhere.",
   main: "dist/index.js",
   bin: {
@@ -5143,27 +5143,71 @@ var GitHubCodespacesProvider = class {
     }
     const hasScope = await this.hasCodespaceScope();
     if (!hasScope) {
-      wt(
-        [
-          "Your existing GitHub login is missing the `codespace` scope.",
-          "I'll run `gh auth refresh` to add it \u2014 your browser will open",
-          "for a one-tap approval."
-        ].join("\n"),
-        "One more permission needed"
-      );
+      const expectedUser = await this.getActiveGhUser();
+      const noteLines = [
+        "Your existing GitHub login is missing the `codespace` scope.",
+        "I'll run `gh auth refresh` to add it \u2014 your browser will open",
+        "for a one-tap approval."
+      ];
+      if (expectedUser) {
+        noteLines.push("");
+        noteLines.push(
+          `${import_picocolors7.default.yellow("\u26A0")}  Sign in as ${import_picocolors7.default.cyan(expectedUser)} in the browser.`
+        );
+        noteLines.push(
+          "   If a different GitHub account is already signed in, sign out"
+        );
+        noteLines.push(
+          "   of it first \u2014 or open the URL in an incognito/private window."
+        );
+      }
+      wt(noteLines.join("\n"), "One more permission needed");
       resetStdinForChild();
-      await new Promise((resolve2, reject) => {
+      const refreshCode = await new Promise((resolve2, reject) => {
         const proc = (0, import_child_process5.spawn)(
           "gh",
           ["auth", "refresh", "-h", "github.com", "-s", "codespace"],
           { stdio: "inherit" }
         );
-        proc.on("exit", (code) => {
-          if (code === 0) resolve2();
-          else reject(new Error("gh auth refresh failed \u2014 re-run `gh auth refresh -h github.com -s codespace` manually."));
-        });
+        proc.on("exit", (code) => resolve2(code ?? 1));
         proc.on("error", reject);
       });
+      if (refreshCode !== 0) {
+        const lines = [
+          "The browser approval came back for a different GitHub account",
+          `than the one gh is configured for${expectedUser ? ` (${import_picocolors7.default.cyan(expectedUser)})` : ""}.`,
+          "",
+          "To recover:",
+          "  1. Open https://github.com and sign out of any non-target",
+          `     account${expectedUser ? ` (or open the URL in an incognito window)` : ""}.`,
+          "  2. Re-run codeam deploy.",
+          "",
+          "You can also grant the scope manually first and skip this step",
+          "on the next run:",
+          `  ${import_picocolors7.default.cyan("gh auth refresh -h github.com -s codespace")}`
+        ];
+        throw new Error(lines.join("\n"));
+      }
+    }
+  }
+  /**
+   * Return the GitHub login that the current `gh` token belongs to,
+   * or `null` if the call fails. Used to tell the user which account
+   * they need to authenticate as in the browser when refreshing
+   * scopes — multi-account browser sessions are the #1 cause of
+   * `gh auth refresh` failures.
+   */
+  async getActiveGhUser() {
+    try {
+      const { stdout } = await execFileP2(
+        "gh",
+        ["api", "user", "--jq", ".login"],
+        { maxBuffer: MAX_BUFFER }
+      );
+      const login = stdout.trim();
+      return login.length > 0 ? login : null;
+    } catch {
+      return null;
     }
   }
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codeam-cli",
-  "version": "2.4.4",
+  "version": "2.4.5",
   "description": "Remote control Claude Code (and other AI coding agents) from your mobile phone. Pair your device, send prompts, stream responses in real-time, and approve commands — from anywhere.",
   "main": "dist/index.js",
   "bin": {