codeam-cli 2.4.4 → 2.4.6

package/CHANGELOG.md

@@ -4,6 +4,18 @@ 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.4] — 2026-05-03
+
+### Fixed
+
+- **cli:** Unblock interactive gh prompts inside codeam deploy (v2.4.4)
+
+## [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.6",
   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;
     }
   }
   /**
@@ -5420,7 +5464,7 @@ var GitHubCodespacesProvider = class {
     return new Promise((resolve2, reject) => {
       const proc = (0, import_child_process5.spawn)(
         "gh",
-        ["codespace", "ssh", "-c", workspaceId, "-t", "--", command2],
+        ["codespace", "ssh", "-c", workspaceId, "--", "-tt", command2],
         { stdio: "inherit" }
       );
       proc.on("exit", (code) => resolve2({ code: code ?? 0 }));
@@ -5428,13 +5472,88 @@ var GitHubCodespacesProvider = class {
     });
   }
   async uploadDirectory(workspaceId, localDir, remoteDir) {
-    await execFileP2(
-      "gh",
-      ["codespace", "cp", "-r", "-c", workspaceId, localDir, `remote:${remoteDir}`],
-      { maxBuffer: MAX_BUFFER, timeout: 3e5 }
-    );
+    const sshArgs = [
+      "codespace",
+      "ssh",
+      "-c",
+      workspaceId,
+      "--",
+      `mkdir -p ${shellQuote(remoteDir)} && tar -xzf - -C ${shellQuote(remoteDir)}`
+    ];
+    await new Promise((resolve2, reject) => {
+      const tar = (0, import_child_process5.spawn)("tar", ["-czf", "-", "-C", localDir, "."], {
+        stdio: ["ignore", "pipe", "pipe"]
+      });
+      const ssh = (0, import_child_process5.spawn)("gh", sshArgs, {
+        stdio: [tar.stdout, "pipe", "pipe"]
+      });
+      let tarErr = "";
+      let sshErr = "";
+      tar.stderr?.on("data", (d3) => {
+        tarErr += d3.toString();
+      });
+      ssh.stderr?.on("data", (d3) => {
+        sshErr += d3.toString();
+      });
+      tar.on("error", reject);
+      ssh.on("error", reject);
+      ssh.on("exit", (code) => {
+        if (code === 0) {
+          resolve2();
+        } else {
+          const reason = (sshErr || tarErr || `exit ${code}`).trim().slice(0, 500);
+          reject(new Error(`Remote tar failed: ${reason}`));
+        }
+      });
+    });
+  }
+  async listExistingWorkspaces(projectId) {
+    try {
+      const { stdout } = await execFileP2(
+        "gh",
+        [
+          "codespace",
+          "list",
+          "--repo",
+          projectId,
+          "--json",
+          "name,displayName,state,lastUsedAt"
+        ],
+        { maxBuffer: MAX_BUFFER }
+      );
+      const list = JSON.parse(stdout);
+      return list.map((c2) => ({
+        id: c2.name,
+        displayName: c2.displayName || c2.name,
+        webUrl: `https://github.com/codespaces/${c2.name}`,
+        state: c2.state,
+        lastUsedAt: c2.lastUsedAt
+      }));
+    } catch {
+      return [];
+    }
+  }
+  async startWorkspace(workspaceId) {
+    try {
+      await execFileP2(
+        "gh",
+        ["api", "-X", "POST", `/user/codespaces/${workspaceId}/start`],
+        { maxBuffer: MAX_BUFFER, timeout: 6e4 }
+      );
+    } catch (err) {
+      void err;
+    }
+    await this.waitUntilAvailable(workspaceId);
+    return {
+      id: workspaceId,
+      displayName: workspaceId,
+      webUrl: `https://github.com/codespaces/${workspaceId}`
+    };
   }
 };
+function shellQuote(s) {
+  return `'${s.replace(/'/g, `'\\''`)}'`;
+}
 
 // src/services/providers/index.ts
 var PROVIDERS = [
@@ -5491,8 +5610,53 @@ async function deploy() {
     process.exit(0);
   }
   const project = projects.find((proj) => proj.id === projectId);
+  let workspace = null;
+  if (provider.listExistingWorkspaces && provider.startWorkspace) {
+    const existingStep = fe();
+    existingStep.start("Checking for existing workspaces\u2026");
+    let existing = [];
+    try {
+      existing = await provider.listExistingWorkspaces(project.id);
+      existingStep.stop(
+        existing.length === 0 ? "\xB7 No existing workspaces \u2014 will create a fresh one" : `\u2713 ${existing.length} existing workspace${existing.length === 1 ? "" : "s"} found`
+      );
+    } catch {
+      existingStep.stop("\xB7 Could not list existing workspaces \u2014 will create a fresh one");
+    }
+    if (existing.length > 0) {
+      const choice = await _t({
+        message: "Reuse an existing workspace or create a new one?",
+        options: [
+          ...existing.map((w3) => ({
+            value: w3.id,
+            label: w3.displayName ?? w3.id,
+            hint: [w3.state, formatLastUsed(w3.lastUsedAt)].filter(Boolean).join(" \xB7 ")
+          })),
+          { value: "__new__", label: import_picocolors8.default.green("+ Create a new workspace"), hint: "fresh codespace" }
+        ]
+      });
+      if (q(choice)) {
+        pt("Cancelled.");
+        process.exit(0);
+      }
+      if (choice !== "__new__") {
+        const reuseStep = fe();
+        const picked = existing.find((w3) => w3.id === choice);
+        const needsStart = picked.state && picked.state !== "Available";
+        reuseStep.start(needsStart ? `Starting ${picked.displayName ?? picked.id}\u2026` : `Connecting to ${picked.displayName ?? picked.id}\u2026`);
+        try {
+          workspace = await provider.startWorkspace(picked.id);
+          reuseStep.stop(`\u2713 Reusing ${workspace.displayName ?? workspace.id}`);
+        } catch (err) {
+          reuseStep.stop("\u2717 Could not start the existing workspace");
+          pt(err instanceof Error ? err.message : String(err));
+          process.exit(1);
+        }
+      }
+    }
+  }
   let machineTypeId;
-  if (provider.listMachineTypes) {
+  if (!workspace && provider.listMachineTypes) {
     const machineStep = fe();
     machineStep.start("Loading machine types\u2026");
     let machines = [];
@@ -5523,16 +5687,17 @@ async function deploy() {
       machineTypeId = machines[0].id;
     }
   }
-  const createStep = fe();
-  createStep.start(`Creating workspace for ${project.fullName}\u2026`);
-  let workspace;
-  try {
-    workspace = await provider.createWorkspace(project.id, machineTypeId);
-    createStep.stop(`\u2713 Workspace ready: ${workspace.displayName ?? workspace.id}`);
-  } catch (err) {
-    createStep.stop(`\u2717 Workspace creation failed`);
-    pt(err instanceof Error ? err.message : String(err));
-    process.exit(1);
+  if (!workspace) {
+    const createStep = fe();
+    createStep.start(`Creating workspace for ${project.fullName}\u2026`);
+    try {
+      workspace = await provider.createWorkspace(project.id, machineTypeId);
+      createStep.stop(`\u2713 Workspace ready: ${workspace.displayName ?? workspace.id}`);
+    } catch (err) {
+      createStep.stop(`\u2717 Workspace creation failed`);
+      pt(err instanceof Error ? err.message : String(err));
+      process.exit(1);
+    }
   }
   const claudeStep = fe();
   claudeStep.start("Installing Claude CLI on workspace\u2026");
@@ -5623,6 +5788,27 @@ async function runRemoteClaudeLogin(provider, workspaceId) {
     );
   }
 }
+function formatLastUsed(iso) {
+  if (!iso) return "";
+  const t2 = Date.parse(iso);
+  if (Number.isNaN(t2)) return "";
+  const diffMs = Date.now() - t2;
+  if (diffMs < 0) return "in the future";
+  const minute = 6e4;
+  const hour = 60 * minute;
+  const day = 24 * hour;
+  if (diffMs < minute) return "just now";
+  if (diffMs < hour) {
+    const m = Math.round(diffMs / minute);
+    return `${m} min${m === 1 ? "" : "s"} ago`;
+  }
+  if (diffMs < day) {
+    const h = Math.round(diffMs / hour);
+    return `${h} hour${h === 1 ? "" : "s"} ago`;
+  }
+  const d3 = Math.round(diffMs / day);
+  return `${d3} day${d3 === 1 ? "" : "s"} ago`;
+}
 async function pickProvider() {
   const ready = PROVIDERS.filter((prov) => prov.available);
   if (ready.length === 1) return ready[0];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codeam-cli",
-  "version": "2.4.4",
+  "version": "2.4.6",
   "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": {