octocode-cli 1.2.0 → 1.2.2

package/out/octocode-cli.js

@@ -2,7 +2,7 @@
 import fs, { existsSync, readFileSync, mkdirSync, writeFileSync, statSync } from "node:fs";
 import path, { join, dirname, resolve } from "node:path";
 import childProcess, { spawnSync, exec, execSync, execFile as execFile$2 } from "node:child_process";
-import { isMac, isWindows, getAppDataPath, HOME, getCredentials, isTokenExpired, getCredentialsSync, deleteCredentials, storeCredentials, getCredentialsFilePath, getTokenFromEnv, getEnvTokenSource, isRefreshTokenExpired, updateToken, isUsingSecureStorage as isUsingSecureStorage$1 } from "octocode-shared";
+import { isMac, isWindows, getAppDataPath, HOME, getTokenWithRefresh, hasEnvToken, getEnvTokenSource, getCredentialsSync, isTokenExpired, getCredentials, deleteCredentials, storeCredentials, getCredentialsFilePath, resolveTokenFull, isUsingSecureStorage as isUsingSecureStorage$1 } from "octocode-shared";
 import os, { homedir } from "node:os";
 import { promisify } from "node:util";
 import { fileURLToPath } from "node:url";
@@ -278,10 +278,21 @@ function printWelcome() {
 }
 function printGoodbye() {
   console.log();
-  console.log(c("magenta", "─".repeat(66)));
-  console.log(c("magenta", "  Thanks for using Octocode CLI"));
-  console.log(c("magenta", `  🔍🐙 ${c("underscore", "https://octocode.ai")}`));
-  console.log(c("magenta", "─".repeat(66)));
+  console.log(
+    `  ${c("cyan", "💡")} ${bold("Quick tips for better AI coding with Octocode:")}`
+  );
+  console.log();
+  console.log(
+    `     ${c("green", "▸")} ${dim("Prompts:")}  Use ${c("cyan", "/research")}, ${c("cyan", "/plan")}, ${c("cyan", "/implement")} in chat`
+  );
+  console.log(
+    `     ${c("green", "▸")} ${dim("Skills:")}   Add all via ${c("cyan", "Manage System Skills")} → ${c("cyan", "Octocode Official")}`
+  );
+  console.log(
+    `     ${c("green", "▸")} ${dim("Context:")}  Add ${c("cyan", "AGENTS.md")} to your project ${dim("(you can ask octocode)")}`
+  );
+  console.log();
+  console.log(`  🔍🐙 ${c("underscore", "https://octocode.ai")}`);
   console.log();
 }
 const activeSpinners = /* @__PURE__ */ new Set();
@@ -367,6 +378,11 @@ class Spinner {
     if (text) this.text = text;
     return this.stop("⚠", "yellow");
   }
+  /** Update the spinner text while running */
+  update(text) {
+    this.text = text;
+    return this;
+  }
 }
 function dirExists(dirPath) {
   try {
@@ -7305,7 +7321,7 @@ const SKILLS_MARKETPLACES = [
     branch: "main",
     skillsPath: "packages/octocode-cli/skills",
     skillPattern: "skill-folders",
-    description: "Official research, planning, review, generation & roast skills",
+    description: "Official research, planning, review & roast skills",
     url: "https://github.com/ArekSrorth/octocode-mcp"
   },
   // === COMMUNITY MARKETPLACES ===
@@ -7922,6 +7938,110 @@ async function installSkill(skill) {
   await pressEnterToContinue$2();
   return result.success;
 }
+async function showOfficialFlowMenu(totalSkills, notInstalledCount) {
+  console.log();
+  console.log(`  ${bold("Octocode Official Skills")}`);
+  console.log(`  ${dim(`${totalSkills} skills available`)}`);
+  console.log();
+  const choices = [];
+  if (notInstalledCount > 0) {
+    choices.push({
+      name: `${c("green", "⚡")} Install All Skills (${notInstalledCount} to install)`,
+      value: "install-all",
+      description: dim("One-click install of all Octocode skills")
+    });
+  } else {
+    choices.push({
+      name: `${c("green", "✓")} All skills installed!`,
+      value: "browse",
+      description: dim("Browse to reinstall or view details")
+    });
+  }
+  choices.push({
+    name: `${c("cyan", "📋")} Browse Skills Individually`,
+    value: "browse",
+    description: dim("View details and install one by one")
+  });
+  choices.push(
+    new Separator()
+  );
+  choices.push({
+    name: `${c("dim", "← Back")}`,
+    value: "back"
+  });
+  const choice = await select({
+    message: "",
+    choices,
+    loop: false,
+    theme: {
+      prefix: "  ",
+      style: {
+        highlight: (text) => c("magenta", text)
+      }
+    }
+  });
+  return choice;
+}
+async function installAllSkills(skills) {
+  const destDir = getSkillsDestDir();
+  const skillsToInstall = skills.filter((skill) => !isSkillInstalled(skill.name));
+  if (skillsToInstall.length === 0) {
+    console.log();
+    console.log(`  ${c("green", "✓")} All skills are already installed!`);
+    console.log();
+    await pressEnterToContinue$2();
+    return;
+  }
+  console.log();
+  console.log(
+    `  ${bold("Installing")} ${skillsToInstall.length} ${bold("skills...")}`
+  );
+  console.log();
+  const spinner = new Spinner(
+    `Installing ${skillsToInstall.length} skills...`
+  ).start();
+  let installed = 0;
+  let failed = 0;
+  const errors = [];
+  for (const skill of skillsToInstall) {
+    spinner.update(
+      `Installing ${skill.displayName}... (${installed + failed + 1}/${skillsToInstall.length})`
+    );
+    const result = await installMarketplaceSkill(skill, destDir);
+    if (result.success) {
+      installed++;
+    } else {
+      failed++;
+      errors.push({
+        skill: skill.displayName,
+        error: result.error || "Unknown error"
+      });
+    }
+  }
+  if (failed === 0) {
+    spinner.succeed(`All ${installed} skills installed successfully!`);
+  } else {
+    spinner.warn(`Installed ${installed} skills, ${failed} failed`);
+  }
+  console.log();
+  if (installed > 0) {
+    console.log(
+      `  ${c("green", "✓")} Successfully installed ${installed} skill(s)`
+    );
+    console.log(`  ${dim("Location:")} ${c("cyan", destDir)}`);
+  }
+  if (errors.length > 0) {
+    console.log();
+    console.log(`  ${c("red", "✗")} Failed to install:`);
+    for (const { skill, error } of errors) {
+      console.log(`    ${c("red", "•")} ${skill}: ${dim(error)}`);
+    }
+  }
+  console.log();
+  console.log(`  ${bold("Skills are now available in Claude Code!")}`);
+  console.log();
+  await pressEnterToContinue$2();
+}
 async function runMarketplaceFlow() {
   console.log();
   console.log(
@@ -7982,6 +8102,58 @@ async function runMarketplaceFlow() {
     }
   }
 }
+async function installAllOctocodeSkills() {
+  const source = SKILLS_MARKETPLACES.find((s) => s.id === "octocode-official");
+  if (!source) {
+    return {
+      installed: 0,
+      alreadyInstalled: 0,
+      failed: 0,
+      allInstalled: false
+    };
+  }
+  let skills;
+  try {
+    skills = await fetchMarketplaceSkills(source);
+  } catch {
+    return {
+      installed: 0,
+      alreadyInstalled: 0,
+      failed: 0,
+      allInstalled: false
+    };
+  }
+  if (skills.length === 0) {
+    return { installed: 0, alreadyInstalled: 0, failed: 0, allInstalled: true };
+  }
+  const destDir = getSkillsDestDir();
+  const skillsToInstall = skills.filter((skill) => !isSkillInstalled(skill.name));
+  const alreadyInstalled = skills.length - skillsToInstall.length;
+  if (skillsToInstall.length === 0) {
+    return {
+      installed: 0,
+      alreadyInstalled,
+      failed: 0,
+      allInstalled: true
+    };
+  }
+  let installed = 0;
+  let failed = 0;
+  for (const skill of skillsToInstall) {
+    const result = await installMarketplaceSkill(skill, destDir);
+    if (result.success) {
+      installed++;
+    } else {
+      failed++;
+    }
+  }
+  return {
+    installed,
+    alreadyInstalled,
+    failed,
+    allInstalled: failed === 0
+  };
+}
 async function runOctocodeOfficialFlow() {
   const source = SKILLS_MARKETPLACES.find((s) => s.id === "octocode-official");
   if (!source) {
@@ -8014,16 +8186,39 @@ async function runOctocodeOfficialFlow() {
     await pressEnterToContinue$2();
     return;
   }
-  let inSkillsBrowser = true;
-  while (inSkillsBrowser) {
-    const skillChoice = await browseSkills(source, skills);
-    if (skillChoice === "back") {
-      inSkillsBrowser = false;
-      continue;
-    }
-    const detailChoice = await showSkillDetails(skillChoice);
-    if (detailChoice === "install") {
-      await installSkill(skillChoice);
+  const notInstalledCount = skills.filter(
+    (s) => !isSkillInstalled(s.name)
+  ).length;
+  let inOfficialFlow = true;
+  while (inOfficialFlow) {
+    const menuChoice = await showOfficialFlowMenu(
+      skills.length,
+      notInstalledCount
+    );
+    switch (menuChoice) {
+      case "install-all":
+        await installAllSkills(skills);
+        inOfficialFlow = false;
+        break;
+      case "browse": {
+        let inSkillsBrowser = true;
+        while (inSkillsBrowser) {
+          const skillChoice = await browseSkills(source, skills);
+          if (skillChoice === "back") {
+            inSkillsBrowser = false;
+            continue;
+          }
+          const detailChoice = await showSkillDetails(skillChoice);
+          if (detailChoice === "install") {
+            await installSkill(skillChoice);
+          }
+        }
+        break;
+      }
+      case "back":
+      default:
+        inOfficialFlow = false;
+        break;
     }
   }
 }
@@ -9239,36 +9434,6 @@ async function exchangeDeviceCode(options) {
 function toTimestamp2(apiTimeInMs, expirationInSeconds) {
   return new Date(apiTimeInMs + expirationInSeconds * 1e3).toISOString();
 }
-async function refreshToken(options) {
-  const request$1 = options.request || request;
-  const response = await oauthRequest(
-    request$1,
-    "POST /login/oauth/access_token",
-    {
-      client_id: options.clientId,
-      client_secret: options.clientSecret,
-      grant_type: "refresh_token",
-      refresh_token: options.refreshToken
-    }
-  );
-  const apiTimeInMs = new Date(response.headers.date).getTime();
-  const authentication = {
-    clientType: "github-app",
-    clientId: options.clientId,
-    clientSecret: options.clientSecret,
-    token: response.data.access_token,
-    refreshToken: response.data.refresh_token,
-    expiresAt: toTimestamp3(apiTimeInMs, response.data.expires_in),
-    refreshTokenExpiresAt: toTimestamp3(
-      apiTimeInMs,
-      response.data.refresh_token_expires_in
-    )
-  };
-  return { ...response, authentication };
-}
-function toTimestamp3(apiTimeInMs, expirationInSeconds) {
-  return new Date(apiTimeInMs + expirationInSeconds * 1e3).toISOString();
-}
 async function getOAuthAccessToken(state, options) {
   const cachedAuthentication = getCachedAuthentication(state, options.auth);
   if (cachedAuthentication) return cachedAuthentication;
@@ -9543,60 +9708,57 @@ async function logout(hostname = DEFAULT_HOSTNAME, options) {
   await deleteCredentials(hostname);
   return { success: true };
 }
-async function refreshAuthToken(hostname = DEFAULT_HOSTNAME) {
-  const credentials = await getCredentials(hostname);
-  if (!credentials) {
+function getAuthStatus(hostname = DEFAULT_HOSTNAME) {
+  if (hasEnvToken()) {
+    const envSource = getEnvTokenSource();
     return {
-      success: false,
-      error: `Not logged in to ${hostname}`
+      authenticated: true,
+      hostname,
+      username: void 0,
+      // Can't determine username from env token
+      tokenSource: "env",
+      // Store the specific env var for display (e.g., 'env:GH_TOKEN')
+      envTokenSource: envSource ?? void 0
     };
   }
-  if (!credentials.token.refreshToken) {
+  const credentials = getCredentialsSync(hostname);
+  if (credentials) {
+    const tokenExpired = isTokenExpired(credentials);
     return {
-      success: false,
-      error: "Token does not support refresh (OAuth App tokens do not expire)"
+      authenticated: !tokenExpired,
+      hostname: credentials.hostname,
+      username: credentials.username,
+      tokenExpired,
+      tokenSource: "octocode"
     };
   }
-  if (isRefreshTokenExpired(credentials)) {
+  const ghAuth = checkGitHubAuth();
+  if (ghAuth.authenticated) {
     return {
-      success: false,
-      error: "Refresh token has expired. Please login again."
+      authenticated: true,
+      hostname,
+      username: ghAuth.username,
+      tokenSource: "gh-cli"
     };
   }
-  try {
-    const response = await refreshToken({
-      clientType: "github-app",
-      // Required: refreshToken API only works with GitHub Apps
-      clientId: DEFAULT_CLIENT_ID,
-      clientSecret: "",
-      // Not available for public OAuth apps
-      refreshToken: credentials.token.refreshToken,
-      request: request.defaults({
-        baseUrl: getApiBaseUrl(hostname)
-      })
-    });
-    const newToken = {
-      token: response.authentication.token,
-      tokenType: "oauth",
-      refreshToken: response.authentication.refreshToken,
-      expiresAt: response.authentication.expiresAt,
-      refreshTokenExpiresAt: response.authentication.refreshTokenExpiresAt
-    };
-    await updateToken(hostname, newToken);
-    return {
-      success: true,
-      username: credentials.username,
-      hostname
-    };
-  } catch (error) {
+  return {
+    authenticated: false,
+    tokenSource: "none"
+  };
+}
+async function getAuthStatusAsync(hostname = DEFAULT_HOSTNAME) {
+  if (hasEnvToken()) {
+    const envSource = getEnvTokenSource();
     return {
-      success: false,
-      error: error instanceof Error ? error.message : "Token refresh failed"
+      authenticated: true,
+      hostname,
+      username: void 0,
+      // Can't determine username from env token
+      tokenSource: "env",
+      envTokenSource: envSource ?? void 0
     };
   }
-}
-function getAuthStatus(hostname = DEFAULT_HOSTNAME) {
-  const credentials = getCredentialsSync(hostname);
+  const credentials = await getCredentials(hostname);
   if (credentials) {
     const tokenExpired = isTokenExpired(credentials);
     return {
@@ -9622,31 +9784,12 @@ function getAuthStatus(hostname = DEFAULT_HOSTNAME) {
   };
 }
 async function getOctocodeToken(hostname = DEFAULT_HOSTNAME) {
-  const credentials = await getCredentials(hostname);
-  if (credentials) {
-    if (isTokenExpired(credentials)) {
-      if (credentials.token.refreshToken) {
-        const result = await refreshAuthToken(hostname);
-        if (result.success) {
-          const updated = await getCredentials(hostname);
-          if (updated?.token.token) {
-            return {
-              token: updated.token.token,
-              source: "octocode",
-              username: updated.username
-            };
-          }
-        }
-      }
-      return {
-        token: null,
-        source: "none"
-      };
-    }
+  const result = await getTokenWithRefresh(hostname, DEFAULT_CLIENT_ID);
+  if (result.token) {
     return {
-      token: credentials.token.token,
+      token: result.token,
       source: "octocode",
-      username: credentials.username
+      username: result.username
     };
   }
   return {
@@ -9676,22 +9819,23 @@ async function getToken(hostname = DEFAULT_HOSTNAME, preferredSource = "auto") {
   if (preferredSource === "gh") {
     return getGhCliToken(hostname);
   }
-  const envToken = getTokenFromEnv();
-  if (envToken) {
-    const source = getEnvTokenSource();
+  const result = await resolveTokenFull({
+    hostname,
+    getGhCliToken: getGitHubCLIToken
+  });
+  if (result?.token) {
+    const source = result.source === "gh-cli" ? "gh-cli" : result.source?.startsWith("env:") ? "env" : "octocode";
     return {
-      token: envToken,
-      source: "env",
-      username: void 0,
-      // Include which env var was used for debugging
-      envSource: source ?? void 0
+      token: result.token,
+      source,
+      username: result.username,
+      envSource: result.source?.startsWith("env:") ? result.source : void 0
     };
   }
-  const ghResult = getGhCliToken(hostname);
-  if (ghResult.token) {
-    return ghResult;
-  }
-  return getOctocodeToken(hostname);
+  return {
+    token: null,
+    source: "none"
+  };
 }
 function getStoragePath() {
   return getCredentialsFilePath();
@@ -9699,6 +9843,19 @@ function getStoragePath() {
 function isUsingSecureStorage() {
   return isUsingSecureStorage$1();
 }
+function getTokenType(source, envSource) {
+  switch (source) {
+    case "env":
+      return envSource ?? "env:GITHUB_TOKEN";
+    case "gh-cli":
+      return "gh-cli";
+    case "octocode":
+      return "octocode-storage";
+    case "none":
+    default:
+      return "none";
+  }
+}
 function getOctocodeState() {
   const allClients = getAllClientInstallStatus();
   const installedClients = allClients.filter((c2) => c2.octocodeInstalled);
@@ -9752,12 +9909,12 @@ function getSkillsState() {
     hasSkills: skills.length > 0
   };
 }
-function getAppState() {
+async function getAppState() {
   return {
     octocode: getOctocodeState(),
     skills: getSkillsState(),
     currentClient: detectCurrentClient(),
-    githubAuth: getAuthStatus()
+    githubAuth: await getAuthStatusAsync()
   };
 }
 async function pressEnterToContinue() {
@@ -9795,35 +9952,54 @@ function buildSkillsMenuItem(skills) {
     return {
       name: `🧠 Manage System Skills ${c("green", "✓")}`,
       value: "skills",
-      description: `${skills.totalInstalledCount} installed • ${skills.destDir}`
+      description: `${skills.totalInstalledCount} installed • Research, PR Review & more`
     };
   }
   if (skills.totalInstalledCount > 0) {
     return {
       name: "🧠 Manage System Skills",
       value: "skills",
-      description: `${skills.totalInstalledCount} installed • ${skills.destDir}`
+      description: `${skills.totalInstalledCount}/${skills.skills.length} installed • Get more skills!`
     };
   }
   return {
-    name: "🧠 Manage System Skills",
+    name: `🧠 ${bold("Manage System Skills")} ${c("cyan", "★")}`,
     value: "skills",
-    description: `No skills installed • ${skills.destDir}`
+    description: `${c("cyan", "→")} Install skills for AI-powered coding workflows`
   };
 }
+function getAuthSourceDisplay(auth2) {
+  switch (auth2.tokenSource) {
+    case "gh-cli":
+      return "gh CLI";
+    case "env": {
+      if (auth2.envTokenSource) {
+        const varName = auth2.envTokenSource.replace("env:", "");
+        return `env (${varName})`;
+      }
+      return "env var";
+    }
+    case "octocode":
+      return "Octocode";
+    default:
+      return "unknown";
+  }
+}
 function buildAuthMenuItem(auth2) {
   if (auth2.authenticated) {
-    const source = auth2.tokenSource === "gh-cli" ? "gh CLI" : "Octocode";
+    const source = getAuthSourceDisplay(auth2);
+    const user = auth2.username ? `@${auth2.username}` : "";
+    const userPart = user ? `${user} ` : "";
     return {
       name: `🔑 Manage Auth ${c("green", "✓")}`,
       value: "auth",
-      description: `@${auth2.username || "unknown"} via ${source}`
+      description: `${userPart}via ${source}`
     };
   }
   return {
-    name: `🔑 Manage Auth ${c("red", "✗")}`,
+    name: `🔑 ${bold("Manage Auth")} ${c("red", "✗ Required!")}`,
     value: "auth",
-    description: "Not configured - set up auth"
+    description: `${c("yellow", "→")} Sign in to access GitHub`
   };
 }
 function buildStatusLine(state) {
@@ -9865,9 +10041,52 @@ function buildOctocodeMenuItem(state) {
     description: "Configure Octocode MCP - 0 IDEs configured"
   };
 }
+function printContextualHints(state) {
+  if (!state.githubAuth.authenticated) {
+    console.log();
+    console.log(
+      `  ${c("yellow", "⚠")} ${bold("Auth required!")} Run ${c("cyan", "🔑 Manage Auth")} to access GitHub repos`
+    );
+  } else if (state.octocode.isInstalled && state.skills.totalInstalledCount === 0) {
+    console.log();
+    console.log(
+      `  ${c("cyan", "💡")} ${dim("Boost your AI coding:")} Install ${c("magenta", "Skills")} for research, PR review & more!`
+    );
+  }
+  console.log();
+  console.log(`  ${c("yellow", "Hints:")}`);
+  console.log(
+    c("yellow", `     ▸ Prompts:  Use /research, /plan, /implement in chat`)
+  );
+  console.log(
+    c(
+      "yellow",
+      `     ▸ Skills:   Add all via Manage System Skills → Octocode Official`
+    )
+  );
+  console.log(
+    c(
+      "yellow",
+      `     ▸ Context:  Add AGENTS.md to your project (you can ask octocode)`
+    )
+  );
+  console.log(
+    c(
+      "yellow",
+      `     ▸ Auth:     Supports Octocode OAuth and gh CLI (if installed)`
+    )
+  );
+  console.log(
+    c(
+      "yellow",
+      `     ▸ MCP:      Manage all system MCP servers via Manage System MCP`
+    )
+  );
+}
 async function showMainMenu(state) {
   console.log();
   console.log(`  ${dim("Status:")} ${buildStatusLine(state)}`);
+  printContextualHints(state);
   const choices = [];
   choices.push(buildOctocodeMenuItem(state));
   choices.push(buildSkillsMenuItem(state.skills));
@@ -9925,6 +10144,14 @@ async function showOctocodeMenu(state) {
       description: "Server options & preferences"
     });
   }
+  if (!state.skills.allInstalled && state.skills.hasSkills) {
+    const notInstalled = state.skills.skills.filter((s) => !s.installed).length;
+    choices.push({
+      name: `🧠 Install All Skills ${c("cyan", `(${notInstalled} available)`)}`,
+      value: "install-skills",
+      description: "One-click install of all Octocode skills"
+    });
+  }
   choices.push(
     new Separator()
   );
@@ -9948,7 +10175,7 @@ async function showOctocodeMenu(state) {
 }
 async function runOctocodeFlow() {
   await loadInquirer();
-  let state = getAppState();
+  let state = await getAppState();
   console.log();
   printInstalledIDEs(state.octocode.installedClients);
   let inMenu = true;
@@ -9958,7 +10185,7 @@ async function runOctocodeFlow() {
       firstRun = false;
     } else {
       const spinner = new Spinner("  Refreshing...").start();
-      state = getAppState();
+      state = await getAppState();
       spinner.clear();
     }
     const choice = await showOctocodeMenu(state);
@@ -9971,6 +10198,45 @@ async function runOctocodeFlow() {
         await runConfigOptionsFlow();
         console.log();
         break;
+      case "install-skills": {
+        console.log();
+        const skillsSpinner = new Spinner(
+          "Installing all Octocode skills..."
+        ).start();
+        const result = await installAllOctocodeSkills();
+        if (result.installed > 0) {
+          skillsSpinner.succeed(
+            `Installed ${result.installed} skill${result.installed !== 1 ? "s" : ""}!`
+          );
+          console.log();
+          console.log(
+            `  ${c("green", "✓")} ${result.installed} skill${result.installed !== 1 ? "s" : ""} installed successfully`
+          );
+          if (result.alreadyInstalled > 0) {
+            console.log(
+              `  ${dim(`(${result.alreadyInstalled} already installed)`)}`
+            );
+          }
+          if (result.failed > 0) {
+            console.log(
+              `  ${c("yellow", "⚠")} ${result.failed} skill${result.failed !== 1 ? "s" : ""} failed to install`
+            );
+          }
+          console.log();
+          console.log(`  ${bold("Skills are now available in Claude Code!")}`);
+        } else if (result.allInstalled) {
+          skillsSpinner.succeed("All skills already installed!");
+          console.log();
+          console.log(`  ${c("green", "✓")} All Octocode skills are installed`);
+        } else {
+          skillsSpinner.fail("Failed to install skills");
+          console.log();
+          console.log(`  ${c("red", "✗")} Could not install skills`);
+        }
+        console.log();
+        await pressEnterToContinue();
+        break;
+      }
       case "back":
       default:
         inMenu = false;
@@ -10043,46 +10309,54 @@ async function runMCPConfigFlow() {
 }
 async function showAuthMenu(status) {
   const choices = [];
-  const isUsingOctocode = status.tokenSource === "octocode";
-  const isUsingGhCli = status.tokenSource === "gh-cli";
-  const isAuthenticated = status.authenticated;
-  if (isAuthenticated) {
+  const isUsingEnv = status.tokenSource === "env";
+  const ghCliToken = getGitHubCLIToken();
+  const ghAuth = checkGitHubAuth();
+  const octocodeCredentials = await getCredentials();
+  const hasGhCli = !!ghCliToken;
+  const hasOctocode = !!octocodeCredentials;
+  const hasEnv = hasEnvToken();
+  if (isUsingEnv && hasEnv) {
+    const envVar = status.envTokenSource?.replace("env:", "") || "environment variable";
     choices.push({
-      name: "🔍 Manage Auth Tokens",
-      value: "check-token",
-      description: "View and delete stored tokens"
+      name: `ℹ️  Using ${c("cyan", envVar)} ${dim("(takes priority)")}`,
+      value: "back",
+      // No action, just info
+      description: "Token set via environment variable"
     });
-    if (isUsingGhCli) {
-      choices.push({
-        name: "🔓 Sign Out (gh CLI)",
-        value: "gh-logout",
-        description: "Opens gh auth logout"
-      });
-    } else if (isUsingOctocode) {
-      choices.push({
-        name: "🔓 Sign Out",
-        value: "logout",
-        description: "Remove Octocode token"
-      });
-    }
-  } else {
+    choices.push(
+      new Separator()
+    );
+  }
+  if (hasGhCli) {
+    const userPart = ghAuth.username ? ` (@${ghAuth.username})` : "";
+    choices.push({
+      name: `🗑️  Delete gh CLI token${userPart}`,
+      value: "gh-logout",
+      description: "Opens gh auth logout"
+    });
+  }
+  if (hasOctocode) {
+    const userPart = octocodeCredentials.username ? ` (@${octocodeCredentials.username})` : "";
+    const storageType = isUsingSecureStorage() ? "keychain" : "file";
+    choices.push({
+      name: `🗑️  Delete Octocode token${userPart}`,
+      value: "logout",
+      description: `Remove from ${storageType}`
+    });
+  }
+  if (!hasOctocode) {
     choices.push({
       name: `🔐 Sign In via Octocode ${c("green", "(Recommended)")}`,
       value: "login",
       description: "Quick browser sign in"
     });
+  }
+  if (!hasGhCli) {
     choices.push({
       name: "🔐 Sign In via gh CLI",
       value: "gh-guidance",
-      description: "Use existing GitHub CLI installation"
-    });
-    choices.push(
-      new Separator()
-    );
-    choices.push({
-      name: `${dim("🔍 View all auth methods")}`,
-      value: "check-token",
-      description: "Check env vars, gh CLI, stored tokens"
+      description: ghAuth.installed ? "Use existing GitHub CLI" : "GitHub CLI not installed"
     });
   }
   choices.push(
@@ -10108,43 +10382,82 @@ async function showAuthMenu(status) {
 }
 async function runLoginFlow() {
   console.log();
+  console.log(c("blue", "━".repeat(66)));
   console.log(`  ${bold("🔐 GitHub Authentication")}`);
+  console.log(c("blue", "━".repeat(66)));
   console.log();
   console.log(
     `  ${dim("This will open your browser to authenticate with GitHub.")}`
   );
   console.log();
   let verificationShown = false;
+  let authSpinner = null;
   const spinner = new Spinner("Connecting to GitHub...").start();
   const result = await login({
     onVerification: (verification) => {
       spinner.stop();
       verificationShown = true;
+      console.log();
+      console.log(c("yellow", "  ┌" + "─".repeat(50) + "┐"));
       console.log(
-        `  ${c("yellow", "!")} First copy your one-time code: ${bold(verification.user_code)}`
+        c("yellow", "  │ ") + `${c("yellow", "!")} Your one-time code: ${bold(c("cyan", verification.user_code))}` + " ".repeat(50 - 26 - verification.user_code.length) + c("yellow", "│")
       );
+      console.log(c("yellow", "  └" + "─".repeat(50) + "┘"));
       console.log();
+      console.log(`  ${bold("1.")} Copy the code above`);
       console.log(
-        `  ${bold("Press Enter")} to open ${c("cyan", verification.verification_uri)} in your browser...`
+        `  ${bold("2.")} ${bold("Press Enter")} to open ${c("cyan", verification.verification_uri)}`
       );
+      console.log(`  ${bold("3.")} Paste the code in your browser`);
       console.log();
-      console.log(`  ${dim("Waiting for authentication...")}`);
+      authSpinner = new Spinner(
+        `Waiting for browser authentication... ${dim("(typically 10-30 seconds)")}`
+      ).start();
     }
   });
+  if (authSpinner) {
+    authSpinner.stop();
+  }
   if (!verificationShown) {
     spinner.stop();
   }
   console.log();
   if (result.success) {
-    console.log(`  ${c("green", "✓")} Authentication complete!`);
+    console.log(c("green", "  ┌" + "─".repeat(50) + "┐"));
     console.log(
-      `  ${c("green", "✓")} Logged in as ${c("cyan", result.username || "unknown")}`
+      c("green", "  │ ") + `${c("green", "✓")} ${bold("Authentication successful!")}` + " ".repeat(22) + c("green", "│")
     );
+    console.log(c("green", "  └" + "─".repeat(50) + "┘"));
     console.log();
+    console.log(
+      `  ${c("green", "✓")} Logged in as ${c("cyan", "@" + (result.username || "unknown"))}`
+    );
     console.log(`  ${dim("Credentials stored in:")} ${getStoragePath()}`);
+    console.log();
+    console.log(`  ${c("cyan", "💡")} ${bold("What's next?")}`);
+    console.log(
+      `     ${dim("•")} Install ${c("magenta", "Skills")} for AI-powered research & PR reviews`
+    );
+    console.log(
+      `     ${dim("•")} Use ${c("cyan", "/research")} prompt to explore any GitHub repo`
+    );
+    console.log(
+      `     ${dim("•")} Add ${c("cyan", "AGENTS.md")} to your project for better AI context`
+    );
   } else {
+    console.log(c("red", "  ┌" + "─".repeat(50) + "┐"));
     console.log(
-      `  ${c("red", "✗")} Authentication failed: ${result.error || "Unknown error"}`
+      c("red", "  │ ") + `${c("red", "✗")} ${bold("Authentication failed")}` + " ".repeat(27) + c("red", "│")
+    );
+    console.log(c("red", "  └" + "─".repeat(50) + "┘"));
+    console.log();
+    console.log(`  ${c("red", "Error:")} ${result.error || "Unknown error"}`);
+    console.log();
+    console.log(`  ${bold("Troubleshooting:")}`);
+    console.log(`     ${dim("•")} Make sure you copied the code correctly`);
+    console.log(`     ${dim("•")} Check your browser didn't block the popup`);
+    console.log(
+      `     ${dim("•")} Try running ${c("cyan", "octocode login")} again`
     );
   }
   console.log();
@@ -10152,7 +10465,7 @@ async function runLoginFlow() {
   return result.success;
 }
 async function runLogoutFlow() {
-  const status = getAuthStatus();
+  const status = await getAuthStatusAsync();
   console.log();
   console.log(`  ${bold("🔓 Sign Out")}`);
   console.log(
@@ -10233,192 +10546,64 @@ async function showGhCliGuidance() {
     await pressEnterToContinue();
   }
 }
-async function runCheckTokenFlow() {
-  let inTokenCheck = true;
-  while (inTokenCheck) {
-    console.log();
-    console.log(`  ${bold("🔍 Auth Token Status")}`);
-    console.log();
-    const ghCliToken = getGitHubCLIToken();
-    const ghAuth = checkGitHubAuth();
-    let ghCliAvailable = false;
-    let ghCliUsername = "";
-    if (ghCliToken) {
-      ghCliAvailable = true;
-      ghCliUsername = ghAuth.username || "";
-    }
-    const octocodeCredentials = await getCredentials();
-    let octocodeAvailable = false;
-    let octocodeUsername = "";
-    const storageType = isUsingSecureStorage() ? "keychain" : "encrypted file";
-    if (octocodeCredentials) {
-      octocodeAvailable = true;
-      octocodeUsername = octocodeCredentials.username || "";
-    }
-    if (ghCliAvailable) {
-      const userPart = ghCliUsername ? ` (@${ghCliUsername})` : "";
-      console.log(`  ${c("green", "✓")} gh CLI${userPart}`);
-    } else {
-      const statusText = ghAuth.installed ? "Not authenticated" : "Not installed";
-      console.log(`  ${c("red", "✗")} gh CLI: ${dim(statusText)}`);
-    }
-    if (octocodeAvailable) {
-      const userPart = octocodeUsername ? ` (@${octocodeUsername})` : "";
-      console.log(`  ${c("green", "✓")} Octocode (${storageType})${userPart}`);
-    } else {
-      console.log(
-        `  ${c("red", "✗")} Octocode (${storageType}): ${dim("Not stored")}`
-      );
-    }
-    const availableCount = (ghCliAvailable ? 1 : 0) + (octocodeAvailable ? 1 : 0);
-    console.log();
-    if (availableCount > 0) {
-      console.log(`  ${dim("→")} ${availableCount} auth method(s) available`);
-    } else {
-      console.log(`  ${c("yellow", "⚠")} No authentication methods available`);
-    }
-    console.log();
-    const choices = [];
-    if (ghCliAvailable) {
-      choices.push({
-        name: `🗑️  Delete gh CLI token`,
-        value: "delete-gh",
-        description: ghCliUsername ? `@${ghCliUsername}` : "Opens gh auth logout"
-      });
-    } else {
-      choices.push({
-        name: `🔐 Sign In via gh CLI`,
-        value: "gh-guidance",
-        description: "Use GitHub CLI to authenticate"
-      });
-    }
-    if (octocodeAvailable) {
-      choices.push({
-        name: `🗑️  Delete Octocode token`,
-        value: "delete-octocode",
-        description: octocodeUsername ? `@${octocodeUsername}` : `From ${storageType}`
-      });
-    } else {
-      choices.push({
-        name: `🔐 Sign In via Octocode`,
-        value: "login-octocode",
-        description: "Quick browser sign in"
-      });
-    }
-    choices.push(
-      new Separator()
-    );
-    choices.push({
-      name: `${c("dim", "← Back")}`,
-      value: "back"
-    });
-    const choice = await selectWithCancel({
-      message: "",
-      choices,
-      pageSize: 10,
-      loop: false,
-      theme: {
-        prefix: "  ",
-        style: {
-          highlight: (text) => c("magenta", text)
-        }
-      }
-    });
-    switch (choice) {
-      case "delete-gh": {
-        console.log();
-        const confirmGh = await selectWithCancel({
-          message: `Delete gh CLI token${ghCliUsername ? ` (@${ghCliUsername})` : ""}?`,
-          choices: [
-            { name: "Yes, sign out", value: "yes" },
-            { name: "No, cancel", value: "no" }
-          ],
-          theme: {
-            prefix: "  ",
-            style: {
-              highlight: (text) => c("red", text)
-            }
-          }
-        });
-        if (confirmGh === "yes") {
-          console.log();
-          console.log(`  ${dim("Opening gh auth logout...")}`);
-          const ghResult = runGitHubAuthLogout();
-          if (ghResult.success) {
-            console.log(`  ${c("green", "✓")} Signed out of gh CLI`);
-          } else {
-            console.log(`  ${c("yellow", "!")} Sign out was cancelled`);
-          }
-          console.log();
-          await pressEnterToContinue();
-        }
-        break;
-      }
-      case "delete-octocode": {
-        console.log();
-        const confirmOctocode = await selectWithCancel({
-          message: `Delete Octocode token${octocodeUsername ? ` (@${octocodeUsername})` : ""} from ${storageType}?`,
-          choices: [
-            { name: "Yes, delete", value: "yes" },
-            { name: "No, cancel", value: "no" }
-          ],
-          theme: {
-            prefix: "  ",
-            style: {
-              highlight: (text) => c("red", text)
-            }
-          }
-        });
-        if (confirmOctocode === "yes") {
-          const result = await logout();
-          if (result.success) {
-            console.log();
-            console.log(`  ${c("green", "✓")} Octocode token deleted`);
-          } else {
-            console.log();
-            console.log(
-              `  ${c("red", "✗")} Failed to delete: ${result.error || "Unknown error"}`
-            );
-          }
-          console.log();
-          await pressEnterToContinue();
-        }
-        break;
-      }
-      case "login-octocode": {
-        const success = await runLoginFlow();
-        if (success) {
-          inTokenCheck = false;
-        }
-        break;
-      }
-      case "gh-guidance": {
-        await showGhCliGuidance();
-        break;
+function getDetailedAuthSource(status) {
+  switch (status.tokenSource) {
+    case "gh-cli":
+      return "gh CLI";
+    case "env": {
+      if (status.envTokenSource) {
+        const varName = status.envTokenSource.replace("env:", "");
+        return `${varName} env var`;
       }
-      case "back":
-      default:
-        inTokenCheck = false;
-        break;
+      return "environment variable";
     }
+    case "octocode":
+      return isUsingSecureStorage() ? "keychain" : "file";
+    default:
+      return "unknown";
   }
 }
 function displayAuthStatus(status) {
   console.log(`  ${bold("🔐 GitHub Authentication")}`);
   console.log();
   if (status.authenticated) {
-    const source = status.tokenSource === "gh-cli" ? "gh CLI" : isUsingSecureStorage() ? "keychain" : "file";
-    console.log(
-      `  ${c("green", "✓")} Signed in as ${c("cyan", "@" + (status.username || "unknown"))} ${dim(`via ${source}`)}`
-    );
+    const source = getDetailedAuthSource(status);
+    if (status.tokenSource === "env") {
+      const envVarName = status.envTokenSource ? status.envTokenSource.replace("env:", "") : "environment variable";
+      console.log(
+        `  ${c("green", "✓")} Using ${c("cyan", envVarName)} ${dim("(token configured)")}`
+      );
+    } else {
+      console.log(
+        `  ${c("green", "✓")} Signed in as ${c("cyan", "@" + (status.username || "unknown"))} ${dim(`via ${source}`)}`
+      );
+    }
     if (status.tokenExpired) {
       console.log(
         `  ${c("yellow", "⚠")} Session expired - please sign in again`
       );
     }
+    console.log();
+    console.log(
+      `  ${c("green", "✓")} ${dim("Ready to access GitHub repositories!")}`
+    );
   } else {
-    console.log(`  ${c("yellow", "○")} Not signed in`);
-    console.log(`  ${dim("Sign in to access private repositories.")}`);
+    console.log(c("yellow", "  ┌" + "─".repeat(56) + "┐"));
+    console.log(
+      c("yellow", "  │ ") + `${c("yellow", "⚠")} ${bold("Authentication Required")}` + " ".repeat(31) + c("yellow", "│")
+    );
+    console.log(c("yellow", "  └" + "─".repeat(56) + "┘"));
+    console.log();
+    console.log(`  ${dim("Without auth, Octocode cannot:")}`);
+    console.log(`     ${c("red", "✗")} Access private repositories`);
+    console.log(`     ${c("red", "✗")} Search code in your organization`);
+    console.log(
+      `     ${c("red", "✗")} Provide full GitHub research capabilities`
+    );
+    console.log();
+    console.log(
+      `  ${c("cyan", "→")} Select ${c("green", '"Sign In via Octocode"')} below to authenticate`
+    );
   }
   console.log();
 }
@@ -10427,14 +10612,10 @@ async function runAuthFlow() {
   console.log();
   let inAuthMenu = true;
   while (inAuthMenu) {
-    const status = getAuthStatus();
+    const status = await getAuthStatusAsync();
     displayAuthStatus(status);
     const choice = await showAuthMenu(status);
     switch (choice) {
-      case "check-token":
-        await runCheckTokenFlow();
-        console.log();
-        break;
       case "login":
         await runLoginFlow();
         console.log();
@@ -10447,6 +10628,22 @@ async function runAuthFlow() {
         console.log();
         break;
       case "gh-logout": {
+        const confirmGh = await selectWithCancel({
+          message: "Sign out of gh CLI?",
+          choices: [
+            { name: "Yes, sign out", value: "yes" },
+            { name: "No, cancel", value: "no" }
+          ],
+          theme: {
+            prefix: "  ",
+            style: {
+              highlight: (text) => c("red", text)
+            }
+          }
+        });
+        if (confirmGh !== "yes") {
+          break;
+        }
         console.log();
         console.log(`  ${dim("Opening gh auth logout...")}`);
         console.log();
@@ -10511,10 +10708,10 @@ async function runMenuLoop() {
   while (running) {
     let state;
     if (firstRun) {
-      state = getAppState();
+      state = await getAppState();
     } else {
       const spinner = new Spinner("  Loading...").start();
-      state = getAppState();
+      state = await getAppState();
       spinner.clear();
     }
     if (!firstRun) {
@@ -11203,7 +11400,7 @@ const tokenCommand = {
   name: "token",
   aliases: ["t"],
   description: "Print the GitHub token (matches octocode-mcp priority)",
-  usage: "octocode token [--type <auto|octocode|gh>] [--hostname <host>] [--source]",
+  usage: "octocode token [--type <auto|octocode|gh>] [--hostname <host>] [--source] [--json]",
   options: [
     {
       name: "type",
@@ -11222,12 +11419,18 @@ const tokenCommand = {
       name: "source",
       short: "s",
       description: "Show token source and user info"
+    },
+    {
+      name: "json",
+      short: "j",
+      description: 'Output as JSON: {"token": "...", "type": "..."}'
     }
   ],
   handler: async (args) => {
     const hostnameOpt = args.options["hostname"] ?? args.options["H"];
     const hostname = (typeof hostnameOpt === "string" ? hostnameOpt : void 0) || "github.com";
     const showSource = Boolean(args.options["source"] || args.options["s"]);
+    const jsonOutput = Boolean(args.options["json"] || args.options["j"]);
     const typeOpt = args.options["type"] ?? args.options["t"];
     const typeArg = (typeof typeOpt === "string" ? typeOpt : void 0) || "auto";
     let tokenSource;
@@ -11246,6 +11449,11 @@ const tokenCommand = {
         tokenSource = "auto";
         break;
       default:
+        if (jsonOutput) {
+          console.log(JSON.stringify({ token: null, type: "none" }));
+          process.exitCode = 1;
+          return;
+        }
         console.log();
         console.log(`  ${c("red", "✗")} Invalid token type: ${typeArg}`);
         console.log(`  ${dim("Valid options:")} octocode, gh, auto`);
@@ -11254,6 +11462,17 @@ const tokenCommand = {
         return;
     }
     const result = await getToken(hostname, tokenSource);
+    if (jsonOutput) {
+      const output = {
+        token: result.token,
+        type: getTokenType(result.source, result.envSource)
+      };
+      console.log(JSON.stringify(output));
+      if (!result.token) {
+        process.exitCode = 1;
+      }
+      return;
+    }
     if (!result.token) {
       console.log();
       if (tokenSource === "octocode") {
@@ -11569,7 +11788,7 @@ function showCommandHelp(command) {
   }
 }
 function showVersion() {
-  const version = "1.1.3";
+  const version = "1.2.2";
   console.log(`octocode v${version}`);
 }
 async function runCLI(argv) {