aicomputer 0.1.7 → 0.1.8

package/dist/index.js

@@ -1537,7 +1537,7 @@ var CLAUDE_OAUTH_REDIRECT_URL = process.env.CLAUDE_OAUTH_REDIRECT_URL ?? "https:
 var CLAUDE_OAUTH_SCOPES = (process.env.CLAUDE_OAUTH_SCOPES ?? "user:profile user:inference user:sessions:claude_code user:mcp_servers user:file_upload").split(/\s+/).filter(Boolean);
 var readyPollIntervalMs = 2e3;
 var readyPollTimeoutMs = 18e4;
-var claudeAuthCommand = new Command4("claude-auth").alias("claude-login").description("Authenticate Claude Code on a computer").option("--machine <id-or-handle>", "Use a specific computer").option("--keep-helper", "Keep a temporary helper machine if one is created").option("--skip-cross-check", "Skip verification on a second shared machine").action(async (options) => {
+var claudeAuthCommand = new Command4("claude-auth").alias("claude-login").description("Authenticate Claude Code on a computer").option("--machine <id-or-handle>", "Use a specific computer").option("--keep-helper", "Keep a temporary helper machine if one is created").option("--skip-cross-check", "Skip verification on a second shared machine").option("--verbose", "Show step-by-step auth diagnostics").action(async (options) => {
   const todos = createTodoList();
   let target = null;
   let helperCreated = false;
@@ -1573,19 +1573,22 @@ var claudeAuthCommand = new Command4("claude-auth").alias("claude-login").descri
       sharedInstall ? `installed Claude login on shared home via ${target.handle}` : `installed Claude login on ${target.handle}`
     );
     activeTodoID = "verify-primary";
-    await verifyStoredAuth(sshTarget);
-    markTodo(
+    const primaryVerification = await verifyStoredAuth(sshTarget);
+    markVerificationTodo(
       todos,
       "verify-primary",
-      "done",
+      primaryVerification,
       `${target.handle} fresh login shell sees Claude auth`
     );
     activeTodoID = "verify-shared";
-    const sharedCheck = await verifySecondaryMachine(
+    const sharedCheck = primaryVerification.status === "verified" ? await verifySecondaryMachine(
       target.id,
       sharedInstall,
       Boolean(options.skipCrossCheck)
-    );
+    ) : {
+      status: "skipped",
+      reason: "primary verification was inconclusive"
+    };
     if (sharedCheck.status === "verified") {
       markTodo(
         todos,
@@ -1623,7 +1626,9 @@ var claudeAuthCommand = new Command4("claude-auth").alias("claude-login").descri
     } else {
       markTodo(todos, "cleanup", "skipped", "no helper created");
     }
-    printTodoList(todos);
+    if (options.verbose) {
+      printTodoList(todos);
+    }
   }
   if (failureMessage) {
     console.error(chalk5.red(`
@@ -1631,7 +1636,9 @@ ${failureMessage}`));
     process.exit(1);
   }
   if (target) {
-    console.log(chalk5.green(`Claude is ready on ${chalk5.bold(target.handle)}.`));
+    console.log(
+      chalk5.green(`Claude login installed on ${chalk5.bold(target.handle)}.`)
+    );
     console.log();
   }
 });
@@ -1654,6 +1661,13 @@ function markTodo(items, id, state, detail) {
   item.state = state;
   item.detail = detail;
 }
+function markVerificationTodo(items, id, result, successDetail) {
+  if (result.status === "verified") {
+    markTodo(items, id, "done", successDetail);
+    return;
+  }
+  markTodo(items, id, "skipped", result.detail);
+}
 function printTodoList(items) {
   console.log();
   console.log(chalk5.dim("TODO"));
@@ -1889,7 +1903,7 @@ async function installClaudeAuth(target, oauth) {
   const spinner = ora3(`Installing Claude auth on ${chalk5.bold(target.handle)}...`).start();
   try {
     const installScript = buildInstallScript(oauth.refreshToken, oauth.scope);
-    const result = await runRemoteBash(target, ["-s"], installScript);
+    const result = await runRemoteCommand(target, ["bash", "-s"], installScript);
     if (result.stdout.trim()) {
       spinner.succeed(`Installed Claude auth on ${chalk5.bold(target.handle)}`);
       return;
@@ -1922,32 +1936,53 @@ function buildInstallScript(refreshToken, scopes) {
   ].join("\n");
 }
 async function verifyStoredAuth(target) {
-  const command = freshShellCommand("claude auth status --json");
-  const result = await runRemoteBash(target, ["-lc", command]);
-  const payload = parseStatusOutput(result.stdout);
-  if (!payload.loggedIn) {
-    throw new Error(`Claude auth is not visible on ${target.handle}`);
+  try {
+    const result = await runRemoteCommand(target, [
+      "bash",
+      "--noprofile",
+      "--norc",
+      "-lc",
+      "claude auth status --json 2>/dev/null || claude auth status"
+    ]);
+    const payload = parseStatusOutput(result.stdout, result.stderr);
+    if (payload.loggedIn) {
+      return { status: "verified", detail: "verified" };
+    }
+    return {
+      status: "failed",
+      detail: payload.detail ? `verification failed: ${payload.detail}` : "verification failed"
+    };
+  } catch (error) {
+    return {
+      status: "inconclusive",
+      detail: error instanceof Error ? error.message : "verification command did not complete cleanly"
+    };
   }
 }
-function freshShellCommand(inner) {
-  return [
-    "env -i",
-    'HOME="$HOME"',
-    'USER="${USER:-node}"',
-    'SHELL="/bin/bash"',
-    'PATH="$HOME/.local/bin:/usr/local/bin:/usr/bin:/bin"',
-    "bash -lc",
-    shellQuote(inner)
-  ].join(" ");
-}
-function parseStatusOutput(stdout) {
-  const start = stdout.indexOf("{");
-  const end = stdout.lastIndexOf("}");
+function parseStatusOutput(stdout, stderr) {
+  const combined = [stdout, stderr].map((value) => value.trim()).filter(Boolean).join("\n");
+  const start = combined.indexOf("{");
+  const end = combined.lastIndexOf("}");
   if (start === -1 || end === -1 || end <= start) {
-    throw new Error("could not parse claude auth status output");
+    const normalized = combined.toLowerCase();
+    if (normalized.includes("logged in")) {
+      return { loggedIn: true };
+    }
+    if (normalized.includes("not logged in") || normalized.includes("logged out")) {
+      return { loggedIn: false, detail: firstStatusLine(combined) };
+    }
+    throw new Error(
+      combined ? `could not verify Claude auth from status output: ${firstStatusLine(combined)}` : "could not verify Claude auth from empty status output"
+    );
   }
-  const parsed = JSON.parse(stdout.slice(start, end + 1));
-  return { loggedIn: parsed.loggedIn === true };
+  const parsed = JSON.parse(combined.slice(start, end + 1));
+  return {
+    loggedIn: parsed.loggedIn === true,
+    detail: parsed.loggedIn === true ? void 0 : parsed.error
+  };
+}
+function firstStatusLine(value) {
+  return value.split(/\r?\n/).map((line) => line.trim()).find(Boolean) ?? "unknown output";
 }
 async function verifySecondaryMachine(primaryComputerID, sharedInstall, skip) {
   if (!sharedInstall) {
@@ -1968,10 +2003,13 @@ async function verifySecondaryMachine(primaryComputerID, sharedInstall, skip) {
     };
   }
   const sshTarget = await resolveSSHTarget(secondary);
-  await verifyStoredAuth(sshTarget);
+  const verification = await verifyStoredAuth(sshTarget);
+  if (verification.status !== "verified") {
+    return { status: "skipped", reason: verification.detail };
+  }
   return { status: "verified", handle: secondary.handle };
 }
-async function runRemoteBash(target, bashArgs, script) {
+async function runRemoteCommand(target, remoteArgs, script) {
   const args = [
     "-T",
     "-i",
@@ -1979,8 +2017,7 @@ async function runRemoteBash(target, bashArgs, script) {
     "-p",
     String(target.port),
     `${target.user}@${target.host}`,
-    "bash",
-    ...bashArgs
+    ...remoteArgs
   ];
   return new Promise((resolve, reject) => {
     const child = spawn2("ssh", args, {
@@ -2010,9 +2047,6 @@ async function runRemoteBash(target, bashArgs, script) {
     }
   });
 }
-function shellQuote(value) {
-  return `'${value.replace(/'/g, `'\\''`)}'`;
-}
 function base64url(buffer) {
   return buffer.toString("base64").replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/g, "");
 }
@@ -2582,7 +2616,8 @@ _computer() {
           _arguments \\
             '--machine[Use a specific computer]:computer:_computer_handles' \\
             '--keep-helper[Keep a temporary helper machine]' \\
-            '--skip-cross-check[Skip second-machine verification]'
+            '--skip-cross-check[Skip second-machine verification]' \\
+            '--verbose[Show step-by-step auth diagnostics]'
           ;;
         create)
           _arguments \\
@@ -2749,7 +2784,7 @@ var BASH_SCRIPT = `_computer() {
       COMPREPLY=($(compgen -W "--json" -- "$cur"))
       ;;
     claude-auth|claude-login)
-      COMPREPLY=($(compgen -W "--machine --keep-helper --skip-cross-check" -- "$cur"))
+      COMPREPLY=($(compgen -W "--machine --keep-helper --skip-cross-check --verbose" -- "$cur"))
       ;;
     create)
       COMPREPLY=($(compgen -W "--name --tier --interactive --runtime-family --source-kind --image-family --image-ref --use-platform-default --primary-port --primary-path --healthcheck-type --healthcheck-value --ssh-enabled --ssh-disabled --vnc-enabled --vnc-disabled" -- "$cur"))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aicomputer",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "description": "Computer CLI - manage your Agent Computer fleet from the terminal",
   "homepage": "https://agentcomputer.ai",
   "repository": {