@kendoo.agentdesk/agentdesk 0.19.6 → 0.19.8

package/CHANGELOG.md

@@ -13,6 +13,17 @@ Internal refactors, infrastructure changes, and architectural notes are not list
 ### Added
 - `[UI]` Private-session sharing flow. When someone visits a session URL they don't own, they now see a friendly "Shh… this one's private" page with a one-click "Request access" button instead of a blank error. The session owner sees pending requests in a new header inbox and can grant viewer access for just that session or the whole project. Viewer-granted sessions show up in the teammate's sidebar tagged as a viewer.
 
+## [0.19.8] — 2026-04-19
+
+### Fixed
+- `[CLI]` `agentdesk init` no longer silently dumps you into the new-project wizard when there's no `.agentdesk.json` and the git remote doesn't auto-match an existing project. It now asks upfront: "Connect this repo to an existing project on my account (bootstrap)" / "Set up this as a new project (full wizard)" / "Cancel". Picking "Connect" opens the project picker from your account — the same flow `agentdesk bootstrap` runs — so a second-machine user can always attach to an existing project without accidentally creating a duplicate. Auto-match still short-circuits to token refresh when it finds a confident single match.
+
+## [0.19.7] — 2026-04-19
+
+### Changed
+- `[CLI]` `agentdesk init` now auto-detects the second-machine / cloned-repo case and switches to a token-refresh flow without opening the wizard. Two fast paths land before the full wizard: (1) when `.agentdesk.json` already has a `projectKey`, the first menu offers "Refresh tokens" as the default action (along with "Tracker only", "Full setup", "Cancel"); (2) when there's no local config but the user's account has a project whose id or name matches the git remote, init writes a minimal `.agentdesk.json` and goes straight to the token-refresh. Pass `--force-full` to bypass both and walk the full wizard. The standalone `agentdesk bootstrap` command is now a thin alias over the same flow.
+- `[CLI]` All interactive menus (tracker picker, re-run action, retry/skip/cancel prompts, team/project picker) now use arrow-key navigation with color highlighting via `@inquirer/prompts` instead of numbered text prompts. Ctrl-C during a menu exits cleanly with status 130.
+
 ## [0.19.6] — 2026-04-19
 
 ### Changed

package/README.md

@@ -45,9 +45,11 @@ agentdesk init
 
 A guided wizard walks you through it: picks up your project type, asks which task tracker you use (Linear, Jira, GitHub Issues, or none), shows the tradeoff between a **dedicated AgentDesk user** and your personal account with step-by-step setup for either, verifies the credentials, echoes "Posting as: …" so you can confirm which identity will appear on tickets, then writes `.agentdesk.json`.
 
-Re-running `agentdesk init` in a project that already has config offers a "tracker only" shortcut. Use `agentdesk init --quick` to skip the narrative copy for scripted setups.
+Re-running `agentdesk init` in a project that already has config offers a four-way menu with **"Refresh tokens"** as the default — so rotating a token or setting up a second machine is a single enter-press, no wizard walk. The other options are "Tracker only", "Full setup", and "Cancel". Use `agentdesk init --quick` to skip the narrative copy for scripted setups, or `--force-full` to bypass the fast paths and walk the full wizard.
 
-**On a second machine** (repo cloned from a teammate's setup): run `agentdesk bootstrap` instead of `init`. It reads the committed `.agentdesk.json` for the project-wide settings (tracker type, team/project key, repo) and only prompts for per-machine secrets (Linear API key, Jira email + token, GitHub token) that end up in `.env`. The other machine's `.env` and the server config are left untouched.
+**On a second machine** (repo cloned from a teammate's setup): just run `agentdesk init`. If no `.agentdesk.json` is committed, `init` fetches your account's project list, auto-matches this clone against the git remote, and switches to token-refresh mode — you only paste the per-machine tokens (Linear API key, Jira email + token, GitHub token) into `.env`. The explicit `agentdesk bootstrap` command still exists as an alias that always runs that flow. The other machine's `.env` and the server config are left untouched.
+
+All menus use arrow-key navigation with color highlighting.
 
 `.agentdesk.json` is kept in sync with the server: every CLI run fetches the authoritative config and rewrites the local file as a credential-free snapshot. Credentials live only on the server, encrypted. If a local edit disagreed with the server's value, a one-line warning lists the overridden fields.
 

package/bin/agentdesk.mjs

@@ -60,13 +60,14 @@ if (!command || command === "help" || command === "--help") {
 
   On a freshly cloned repo (already set up on another machine):
     1. agentdesk login          Sign in
-    2. agentdesk bootstrap      Fill in per-machine secrets (tokens)
+    2. agentdesk init           Auto-detects the project and asks only for tokens
+                                (or run 'agentdesk bootstrap' — same flow)
     3. agentdesk team TASK-123  Run a team session
 
   Commands:
     agentdesk login                        Sign in to AgentDesk
     agentdesk logout                       Sign out and remove credentials
-    agentdesk init [--quick]               Set up project and configure tracker
+    agentdesk init [--quick | --force-full] Set up project (auto-detects cloned repos & offers token refresh)
     agentdesk bootstrap                    Fill in per-machine tokens on a cloned repo
     agentdesk team <TASK-ID>               Run a team session on an existing task
     agentdesk team -d "..."                Create a task and run a session
@@ -148,8 +149,10 @@ else if (command === "logout") {
 
 else if (command === "init") {
   const { runInit } = await import("../cli/init.mjs");
-  const quick = args.slice(1).includes("--quick");
-  await runInit(process.cwd(), { quick });
+  const rest = args.slice(1);
+  const quick = rest.includes("--quick");
+  const forceFull = rest.includes("--force-full") || rest.includes("--full");
+  await runInit(process.cwd(), { quick, forceFull });
 }
 
 else if (command === "bootstrap") {

package/cli/bootstrap.mjs

@@ -7,22 +7,17 @@
 // JIRA_EMAIL/JIRA_API_TOKEN, GITHUB_TOKEN). Bootstrap detects which are
 // missing or invalid and prompts only for those.
 //
-// Hard constraints:
-//   - Never write `.agentdesk.json` (besides the cached-server-state rewrite
-//     that loadConfig already does on every CLI run — we don't add new ones).
-//   - Never push to the server. Project-wide config on machine 1 is untouched.
-//   - Only writes to `.env`.
-//   - Idempotent. Running on a fully-configured machine prints "all set" and
-//     exits 0.
+// This module also exports reusable building blocks so `agentdesk init` can
+// short-circuit to the bootstrap flow when it detects a fresh clone.
 
 import { existsSync, readFileSync, writeFileSync } from "fs";
 import { join } from "path";
-import { createInterface } from "readline";
 import { execSync } from "child_process";
 import { loadConfig } from "./config.mjs";
 import { getStoredApiKey } from "./login.mjs";
 import { checkTrackerPermissions, resolveCredentialsFromEnv } from "./tracker-check.mjs";
 import { assertPushable, PreflightError } from "./session-preflight.mjs";
+import { select, promptRequired } from "./prompts.mjs";
 
 const SERVER = process.env.AGENTDESK_SERVER || "https://agentdesk.live";
 
@@ -65,14 +60,41 @@ function normalizeName(s) {
   return tail.toLowerCase().replace(/[^a-z0-9]/g, "");
 }
 
-// Discover the server-side project for this clone when .agentdesk.json is
-// absent. Strategy (each tier that yields exactly one match auto-selects):
-//   Tier 1 — server-side github.repo equals the local git remote (owner/repo).
-//   Tier 2 — the repo name from the remote matches the project id or name
-//            (case-insensitive, scope-stripped).
-// When 0 or 2+ projects match, fall back to a numbered picker.
-// Returns the chosen projectKey, or null if the user aborts.
-async function discoverProject(rl, cwd, apiKey) {
+// Silent auto-match: returns { projectKey, name, reason } when the caller can
+// pick a server-side project with high confidence without asking the user,
+// or null otherwise. Used by both `agentdesk init` (to decide whether to
+// skip the wizard) and `agentdesk bootstrap` (as step 1 of discovery).
+export async function autoMatchProject(cwd, apiKey) {
+  const remote = detectGitRemote(cwd);
+  if (!remote) return null;
+  const projects = await fetchProjects(apiKey);
+  if (!projects || projects.length === 0) return null;
+
+  const remoteRepoName = remote.split("/").pop();
+  const remoteKey = normalizeName(remoteRepoName);
+
+  // Tier 1: exact github.repo match via settings.
+  const settings = await Promise.all(projects.map(p => fetchProjectSettings(apiKey, p.id)));
+  const tier1 = projects.filter((_, i) => {
+    const repo = settings[i]?.github?.repo;
+    return repo && repo.toLowerCase() === remote.toLowerCase();
+  });
+  if (tier1.length === 1) {
+    return { projectKey: tier1[0].id, name: tier1[0].name, reason: `github.repo matches ${remote}` };
+  }
+
+  // Tier 2: id or name matches the repo name.
+  const tier2 = projects.filter(p => normalizeName(p.id) === remoteKey || normalizeName(p.name) === remoteKey);
+  if (tier2.length === 1) {
+    return { projectKey: tier2[0].id, name: tier2[0].name, reason: `project name matches repo "${remoteRepoName}"` };
+  }
+  return null;
+}
+
+// Full discovery with user fallback: auto-match first, then show a numbered
+// picker. Writes `.agentdesk.json` with the chosen projectKey so subsequent
+// loadConfig calls pick it up. Returns the chosen projectKey or null.
+export async function discoverProject(cwd, apiKey) {
   const remote = detectGitRemote(cwd);
   if (remote) console.log(`  Detected git remote: ${remote}`);
   console.log("  Fetching your projects from the server...");
@@ -86,7 +108,6 @@ async function discoverProject(rl, cwd, apiKey) {
     return null;
   }
 
-  // Fetch settings in parallel so we can display/match the configured repo.
   const settings = await Promise.all(projects.map(p => fetchProjectSettings(apiKey, p.id)));
   const remoteRepoName = remote ? remote.split("/").pop() : null;
   const remoteKey = normalizeName(remoteRepoName);
@@ -116,47 +137,29 @@ async function discoverProject(rl, cwd, apiKey) {
     console.log(`  ✓ Auto-matched: ${chosen.project.name} (${chosen.project.id}) — ${matchReason}`);
   } else {
     console.log("");
-    console.log("  Couldn't auto-match this clone to one of your projects.");
-    console.log("");
-    rows.forEach((r, i) => {
-      const tag = r.tier1 ? " ← repo match" : r.tier2 ? " ← name match" : "";
-      const repoStr = r.repo ? ` [${r.repo}]` : "";
-      console.log(`    ${i + 1}) ${r.project.name} (${r.project.id})${repoStr}${tag}`);
+    const picked = await select({
+      message: "Couldn't auto-match this clone — pick the project it maps to",
+      choices: [
+        ...rows.map(r => {
+          const tag = r.tier1 ? " (repo match)" : r.tier2 ? " (name match)" : "";
+          const repoStr = r.repo ? ` [${r.repo}]` : "";
+          return { name: `${r.project.name} (${r.project.id})${repoStr}${tag}`, value: r.project.id };
+        }),
+        { name: "Cancel", value: "__cancel__" },
+      ],
     });
-    console.log("");
-    while (true) {
-      const answer = await askInline(rl, `  Pick one (1-${rows.length}, or 'c' to cancel): `);
-      const trimmed = answer.trim().toLowerCase();
-      if (trimmed === "c" || trimmed === "cancel") return null;
-      const num = parseInt(trimmed, 10);
-      if (num >= 1 && num <= rows.length) { chosen = rows[num - 1]; break; }
-      console.log(`  Please enter a number between 1 and ${rows.length}`);
-    }
+    if (picked === "__cancel__") return null;
+    chosen = rows.find(r => r.project.id === picked);
   }
 
-  // Write a minimal .agentdesk.json — loadConfig will merge server state
-  // into it on the next call, producing the full cached view.
-  const minimal = { projectKey: chosen.project.id };
-  writeFileSync(join(cwd, ".agentdesk.json"), JSON.stringify(minimal, null, 2) + "\n");
+  writeProjectConfig(cwd, chosen.project.id);
   console.log(`  ✓ Wrote .agentdesk.json (projectKey: ${chosen.project.id})`);
   console.log("    (commit this file so future clones skip discovery)");
   return chosen.project.id;
 }
 
-function askInline(rl, question) {
-  return new Promise(resolve => rl.question(question, resolve));
-}
-
-function ask(rl, question) {
-  return new Promise(resolve => rl.question(question, resolve));
-}
-
-async function promptRequired(rl, label) {
-  while (true) {
-    const v = (await ask(rl, `  ${label}: `)).trim();
-    if (v) return v;
-    console.log(`  ${label} is required. Ctrl+C to abort.`);
-  }
+export function writeProjectConfig(cwd, projectKey) {
+  writeFileSync(join(cwd, ".agentdesk.json"), JSON.stringify({ projectKey }, null, 2) + "\n");
 }
 
 function saveEnvVar(dir, key, value) {
@@ -202,15 +205,13 @@ function printTrackerHint(tracker) {
   }
 }
 
-// Walk missing tracker credentials and prompt for each. Writes to .env.
-// Returns the merged credentials map so the caller can verify.
-async function promptTrackerCreds(rl, cwd, tracker, existing) {
+async function promptTrackerCreds(cwd, tracker, existing) {
   const creds = { ...existing };
   if (tracker === "linear") {
     if (!creds.LINEAR_API_KEY) {
       console.log("");
       printTrackerHint("linear");
-      const v = await promptRequired(rl, "Linear API key");
+      const v = await promptRequired("Linear API key");
       saveEnvVar(cwd, "LINEAR_API_KEY", v);
       creds.LINEAR_API_KEY = v;
       console.log("  ✓ Saved LINEAR_API_KEY to .env");
@@ -219,14 +220,14 @@ async function promptTrackerCreds(rl, cwd, tracker, existing) {
     if (!creds.JIRA_EMAIL) {
       console.log("");
       printTrackerHint("jira");
-      const v = await promptRequired(rl, "Your Atlassian login email");
+      const v = await promptRequired("Your Atlassian login email");
       saveEnvVar(cwd, "JIRA_EMAIL", v);
       creds.JIRA_EMAIL = v;
       console.log("  ✓ Saved JIRA_EMAIL to .env");
     }
     if (!creds.JIRA_API_TOKEN) {
       if (creds.JIRA_EMAIL) console.log("");
-      const v = await promptRequired(rl, "Jira API token");
+      const v = await promptRequired("Jira API token");
       saveEnvVar(cwd, "JIRA_API_TOKEN", v);
       creds.JIRA_API_TOKEN = v;
       console.log("  ✓ Saved JIRA_API_TOKEN to .env");
@@ -235,67 +236,21 @@ async function promptTrackerCreds(rl, cwd, tracker, existing) {
   return creds;
 }
 
-async function promptGitHubToken(rl, cwd) {
+async function promptGitHubToken(cwd) {
   console.log("");
   printTrackerHint("github");
-  const v = await promptRequired(rl, "GitHub token");
+  const v = await promptRequired("GitHub token");
   saveEnvVar(cwd, "GITHUB_TOKEN", v);
   console.log("  ✓ Saved GITHUB_TOKEN to .env");
   return v;
 }
 
-async function selectOption(rl, prompt, options) {
-  console.log(`  ${prompt}`);
-  console.log("");
-  options.forEach((opt, i) => console.log(`    ${i + 1}) ${opt.label}`));
-  console.log("");
-  while (true) {
-    const answer = await ask(rl, `  Choose (1-${options.length}): `);
-    const num = parseInt(answer.trim(), 10);
-    if (num >= 1 && num <= options.length) return options[num - 1];
-    console.log(`  Please enter a number between 1 and ${options.length}`);
-  }
-}
-
-export async function runBootstrap(cwd = process.cwd()) {
-  console.log("");
-  console.log("  AgentDesk — Bootstrap this machine");
-  console.log("  ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━");
-  console.log("");
-
-  // 1. Must be logged in.
-  const apiKey = getStoredApiKey();
-  if (!apiKey) {
-    console.log("  Not logged in. Run `agentdesk login` first.");
-    console.log("");
-    process.exit(1);
-  }
-
-  const rl = createInterface({ input: process.stdin, output: process.stdout });
-
-  // 2. Find the server-side project for this clone. Prefer a committed
-  //    .agentdesk.json (clean path); fall back to discovering from the
-  //    user's server-side project list when the file is missing.
-  let localConfig = readLocalConfig(cwd);
-  let projectKey = localConfig?.projectKey || null;
-
-  if (!projectKey) {
-    if (localConfig) {
-      console.log("  .agentdesk.json has no projectKey — discovering project from server.");
-    } else {
-      console.log("  No .agentdesk.json in this directory — discovering project from server.");
-    }
-    console.log("");
-    projectKey = await discoverProject(rl, cwd, apiKey);
-    if (!projectKey) { rl.close(); process.exit(1); }
-    localConfig = readLocalConfig(cwd);
-    console.log("");
-  }
-
-  // 3. Load merged config (server-authoritative when reachable). This is the
-  //    same call `agentdesk team` makes, so we see the same view.
+// Shared gap-scan: given a cwd with a valid `.agentdesk.json` (or at least
+// a projectKey), load server-authoritative config, figure out which secrets
+// are missing or broken, prompt for them, validate. Writes to `.env` only.
+// Returns { trackerOk, githubOk } for the caller to surface.
+export async function gapScan({ cwd, apiKey, projectKey }) {
   const config = await loadConfig(cwd, { apiKey, serverUrl: SERVER, projectName: projectKey, silent: true });
-
   const tracker = config.tracker || null;
   const repo = config.github?.repo || null;
   const login = config.github?.login || null;
@@ -307,24 +262,19 @@ export async function runBootstrap(cwd = process.cwd()) {
   if (repo) console.log(`  Repo:      ${repo}${login ? ` (@${login})` : ""}`);
   console.log("");
 
-  // 4. Gap scan + prompt loop. We retry tracker + github verification up to
-  //    three times, matching init's retry/skip/cancel UX.
   let creds = resolveCredentialsFromEnv(loadDotEnvLocal(cwd));
-  let trackerOk = !tracker; // no tracker → nothing to verify
+  let trackerOk = !tracker;
   let githubOk = false;
   let attempts = 0;
 
   while (attempts < 5) {
     attempts += 1;
 
-    // Tracker
     if (tracker && !trackerOk) {
       const missing =
         (tracker === "linear" && !creds.LINEAR_API_KEY) ||
         (tracker === "jira" && (!creds.JIRA_EMAIL || !creds.JIRA_API_TOKEN));
-      if (missing) {
-        creds = await promptTrackerCreds(rl, cwd, tracker, creds);
-      }
+      if (missing) creds = await promptTrackerCreds(cwd, tracker, creds);
       process.stdout.write("  Verifying tracker access... ");
       const check = await checkTrackerPermissions({ tracker, config, credentials: creds });
       if (check.ok) {
@@ -338,32 +288,28 @@ export async function runBootstrap(cwd = process.cwd()) {
         console.log("failed");
         for (const e of check.errors || []) console.log(`    • ${e}`);
         console.log("");
-        const next = await selectOption(rl, "What now?", [
-          { label: "Re-enter credentials", value: "retry" },
-          { label: "Skip tracker (fix later in .env)", value: "skip" },
-          { label: "Cancel", value: "cancel" },
-        ]);
+        const next = await select({
+          message: "What now?",
+          choices: [
+            { name: "Re-enter credentials", value: "retry" },
+            { name: "Skip tracker (fix later in .env)", value: "skip" },
+            { name: "Cancel", value: "cancel" },
+          ],
+        });
         console.log("");
-        if (next.value === "cancel") { rl.close(); process.exit(1); }
-        if (next.value === "skip") { trackerOk = true; break; }
-        // retry: clear the tracker-specific creds so the next loop re-prompts
+        if (next === "cancel") process.exit(1);
+        if (next === "skip") { trackerOk = true; break; }
         if (tracker === "linear") delete creds.LINEAR_API_KEY;
         if (tracker === "jira") { delete creds.JIRA_EMAIL; delete creds.JIRA_API_TOKEN; }
         continue;
       }
     }
 
-    // GitHub — always required (agents push code regardless of tracker)
     if (!githubOk) {
-      if (!creds.GITHUB_TOKEN) {
-        creds.GITHUB_TOKEN = await promptGitHubToken(rl, cwd);
-      }
+      if (!creds.GITHUB_TOKEN) creds.GITHUB_TOKEN = await promptGitHubToken(cwd);
       try {
         assertPushable({ cwd, creds: { GITHUB_TOKEN: creds.GITHUB_TOKEN }, projectName: projectKey });
-        // Best-effort gh API check to confirm the token is valid and matches
-        // the configured login. Mirrors init.mjs:495-506.
         try {
-          const { execSync } = await import("child_process");
           const env = { ...process.env, GH_TOKEN: creds.GITHUB_TOKEN };
           const who = execSync("gh api user --jq .login", { env, stdio: ["ignore", "pipe", "ignore"], encoding: "utf-8" }).trim();
           if (who && login && who.toLowerCase() !== login.toLowerCase()) {
@@ -379,14 +325,17 @@ export async function runBootstrap(cwd = process.cwd()) {
         if (err instanceof PreflightError) {
           console.log(`  ✗ ${err.message}`);
           console.log("");
-          const next = await selectOption(rl, "What now?", [
-            { label: "Re-enter GITHUB_TOKEN", value: "retry" },
-            { label: "Skip (sessions will fail until fixed)", value: "skip" },
-            { label: "Cancel", value: "cancel" },
-          ]);
+          const next = await select({
+            message: "What now?",
+            choices: [
+              { name: "Re-enter GITHUB_TOKEN", value: "retry" },
+              { name: "Skip (sessions will fail until fixed)", value: "skip" },
+              { name: "Cancel", value: "cancel" },
+            ],
+          });
           console.log("");
-          if (next.value === "cancel") { rl.close(); process.exit(1); }
-          if (next.value === "skip") { githubOk = true; break; }
+          if (next === "cancel") process.exit(1);
+          if (next === "skip") { githubOk = true; break; }
           delete creds.GITHUB_TOKEN;
           continue;
         }
@@ -397,8 +346,6 @@ export async function runBootstrap(cwd = process.cwd()) {
     if (trackerOk && githubOk) break;
   }
 
-  rl.close();
-
   console.log("");
   if (trackerOk && githubOk) {
     console.log("  Ready. Try:");
@@ -406,7 +353,39 @@ export async function runBootstrap(cwd = process.cwd()) {
     console.log(`    agentdesk team ${prefix}-123`);
     console.log("");
   } else {
-    console.log("  Bootstrap finished with missing pieces — edit .env directly or re-run.");
+    console.log("  Finished with missing pieces — edit .env directly or re-run.");
+    console.log("");
+  }
+  return { trackerOk, githubOk, config };
+}
+
+export async function runBootstrap(cwd = process.cwd()) {
+  console.log("");
+  console.log("  AgentDesk — Bootstrap this machine");
+  console.log("  ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━");
+  console.log("");
+
+  const apiKey = getStoredApiKey();
+  if (!apiKey) {
+    console.log("  Not logged in. Run `agentdesk login` first.");
     console.log("");
+    process.exit(1);
   }
+
+  let localConfig = readLocalConfig(cwd);
+  let projectKey = localConfig?.projectKey || null;
+
+  if (!projectKey) {
+    if (localConfig) {
+      console.log("  .agentdesk.json has no projectKey — discovering project from server.");
+    } else {
+      console.log("  No .agentdesk.json in this directory — discovering project from server.");
+    }
+    console.log("");
+    projectKey = await discoverProject(cwd, apiKey);
+    if (!projectKey) process.exit(1);
+    console.log("");
+  }
+
+  await gapScan({ cwd, apiKey, projectKey });
 }

package/cli/init.mjs

@@ -15,6 +15,8 @@ import { loadConfig, pushConfig } from "./config.mjs";
 import { getStoredApiKey } from "./login.mjs";
 import { registerLocalProject } from "./projects.mjs";
 import { checkTrackerPermissions, resolveCredentialsFromEnv } from "./tracker-check.mjs";
+import { autoMatchProject, discoverProject, gapScan, writeProjectConfig } from "./bootstrap.mjs";
+import { select as promptSelect } from "./prompts.mjs";
 
 const SERVER = process.env.AGENTDESK_SERVER || "https://agentdesk.live";
 
@@ -101,22 +103,6 @@ function ask(rl, question) {
   return new Promise(resolve => rl.question(question, resolve));
 }
 
-async function selectOption(rl, prompt, options) {
-  console.log(`  ${prompt}`);
-  console.log("");
-  options.forEach((opt, i) => {
-    console.log(`    ${i + 1}) ${opt.label}`);
-  });
-  console.log("");
-
-  while (true) {
-    const answer = await ask(rl, `  Choose (1-${options.length}): `);
-    const num = parseInt(answer.trim(), 10);
-    if (num >= 1 && num <= options.length) return options[num - 1];
-    console.log(`  Please enter a number between 1 and ${options.length}`);
-  }
-}
-
 function saveEnvVar(dir, key, value) {
   const envPath = join(dir, ".env");
   let content = existsSync(envPath) ? readFileSync(envPath, "utf-8") : "";
@@ -221,12 +207,12 @@ async function listTrackerProjects({ tracker, creds, location }) {
   return null;
 }
 
-async function pickFromList(rl, prompt, items, { allowManual = true } = {}) {
-  const options = items.map(it => ({ label: it.name, value: it.id }));
-  if (allowManual) options.push({ label: "Type it manually instead", value: "__manual__" });
-  const choice = await selectOption(rl, prompt, options);
-  if (choice.value === "__manual__") return null;
-  return choice.value;
+async function pickFromList(_rl, prompt, items, { allowManual = true } = {}) {
+  const choices = items.map(it => ({ name: it.name, value: it.id }));
+  if (allowManual) choices.push({ name: "Type it manually instead", value: "__manual__" });
+  const value = await promptSelect({ message: prompt, choices });
+  if (value === "__manual__") return null;
+  return value;
 }
 
 // Prompt for a value, showing instructions first, looping until non-empty.
@@ -283,34 +269,94 @@ async function verifyAndPickTrackerProject({ rl, cwd, finalProjectKey, tracker,
 
 export async function runInit(cwd, opts = {}) {
   const quick = !!opts.quick;
+  const forceFull = !!opts.forceFull;
   const project = detectProject(cwd);
   const existingConfig = loadConfig(cwd);
   const projectId = project.name || cwd.split("/").pop();
   const configPath = join(cwd, ".agentdesk.json");
   const hasConfig = existsSync(configPath);
+  let editScope = "full";
 
-  const rl = createInterface({ input: process.stdin, output: process.stdout });
+  // Fast path A: `.agentdesk.json` already has a projectKey. Offer token
+  // refresh (bootstrap) as the default action so second-machine users — or
+  // anyone just rotating a token — don't have to walk the whole wizard.
+  if (hasConfig && !quick && !forceFull) {
+    let localKey = null;
+    try { localKey = JSON.parse(readFileSync(configPath, "utf-8"))?.projectKey || null; } catch {}
+    if (localKey) {
+      console.log("");
+      console.log("  AgentDesk — existing project detected");
+      console.log("  ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━");
+      console.log("");
+      const choice = await promptSelect({
+        message: "What would you like to do?",
+        default: "refresh",
+        choices: [
+          { name: "Refresh tokens (update .env only — recommended)", value: "refresh" },
+          { name: "Tracker only (change tracker or credentials)", value: "tracker" },
+          { name: "Full setup (walk the whole wizard)", value: "full" },
+          { name: "Cancel", value: "cancel" },
+        ],
+      });
+      console.log("");
+      if (choice === "cancel") return;
+      if (choice === "refresh") {
+        const apiKey = getStoredApiKey();
+        await gapScan({ cwd, apiKey, projectKey: localKey });
+        return;
+      }
+      editScope = choice; // "full" or "tracker"
+    }
+  }
 
-  // Re-run mode: if config already exists (and we're not in --quick), let
-  // the user jump to a specific section instead of walking the full wizard.
-  let editScope = "full";
-  if (hasConfig && !quick) {
-    console.log("");
-    console.log("  AgentDesk — existing project detected");
-    console.log("  ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━");
-    console.log("");
-    const choice = await selectOption(rl, "What would you like to do?", [
-      { label: "Full setup (walk the whole wizard again)", value: "full" },
-      { label: "Tracker only (change tracker or credentials)", value: "tracker" },
-      { label: "Cancel", value: "cancel" },
-    ]);
-    if (choice.value === "cancel") {
-      rl.close();
-      return;
+  // Fast path B: no local config, but the user's account has a project that
+  // silently matches this clone (git remote → project id/name). Switch to
+  // bootstrap mode without opening the wizard.
+  if (!hasConfig && !forceFull) {
+    const apiKey = getStoredApiKey();
+    if (apiKey) {
+      const match = await autoMatchProject(cwd, apiKey);
+      if (match) {
+        console.log("");
+        console.log(`  ✓ Detected project "${match.name}" on your account — ${match.reason}`);
+        console.log("    Switching to token-refresh mode. Use `agentdesk init --force-full` to walk the wizard instead.");
+        console.log("");
+        writeProjectConfig(cwd, match.projectKey);
+        await gapScan({ cwd, apiKey, projectKey: match.projectKey });
+        return;
+      }
+
+      // No auto-match. Offer an explicit choice between connecting this
+      // clone to an existing server-side project (bootstrap) and creating
+      // a new one (full wizard). Prevents users from accidentally creating
+      // a duplicate project when they just wanted to attach a second machine.
+      console.log("");
+      console.log("  AgentDesk — new directory");
+      console.log("  ━━━━━━━━━━━━━━━━━━━━━━━━━");
+      console.log("");
+      const topChoice = await promptSelect({
+        message: "What would you like to do?",
+        choices: [
+          { name: "Connect this repo to an existing project on my account (bootstrap)", value: "connect" },
+          { name: "Set up this as a new project (full wizard)", value: "new" },
+          { name: "Cancel", value: "cancel" },
+        ],
+      });
+      console.log("");
+      if (topChoice === "cancel") return;
+      if (topChoice === "connect") {
+        const projectKey = await discoverProject(cwd, apiKey);
+        if (!projectKey) return;
+        console.log("");
+        await gapScan({ cwd, apiKey, projectKey });
+        return;
+      }
+      // "new" falls through to the wizard below.
     }
-    editScope = choice.value;
   }
 
+  const rl = createInterface({ input: process.stdin, output: process.stdout });
+
   console.log("");
   console.log("  AgentDesk — Project Setup");
   console.log("  ━━━━━━━━━━━━━━━━━━━━━━━━");
@@ -336,13 +382,15 @@ export async function runInit(cwd, opts = {}) {
 
   if (!quick) console.log(editScope === "tracker" ? "  Tracker" : "  Step 1 of 3 — Task tracker");
   console.log("");
-  const trackerOptions = [
-    { label: "Linear", value: "linear" },
-    { label: "Jira", value: "jira" },
-    { label: "GitHub Issues", value: "github" },
-    { label: "None (use descriptions only)", value: null },
-  ];
-  const tracker = (await selectOption(rl, "Task tracker:", trackerOptions)).value;
+  const tracker = await promptSelect({
+    message: "Task tracker:",
+    choices: [
+      { name: "Linear", value: "linear" },
+      { name: "Jira", value: "jira" },
+      { name: "GitHub Issues", value: "github" },
+      { name: "None (use descriptions only)", value: null },
+    ],
+  });
   console.log("");
   if (tracker) config.tracker = tracker;
 
@@ -417,17 +465,20 @@ export async function runInit(cwd, opts = {}) {
       verified = await verifyAndPickTrackerProject({ rl, cwd, finalProjectKey, tracker, config, location: trackerLocation });
       if (verified.ok) break;
       console.log("");
-      const next = await selectOption(rl, "What now?", [
-        { label: "Re-enter credentials and try again", value: "retry" },
-        { label: "Save config anyway (will need to fix before `agentdesk team`)", value: "skip" },
-        { label: "Cancel init", value: "cancel" },
-      ]);
+      const next = await promptSelect({
+        message: "What now?",
+        choices: [
+          { name: "Re-enter credentials and try again", value: "retry" },
+          { name: "Save config anyway (will need to fix before `agentdesk team`)", value: "skip" },
+          { name: "Cancel init", value: "cancel" },
+        ],
+      });
       console.log("");
-      if (next.value === "cancel") {
+      if (next === "cancel") {
         rl.close();
         return;
       }
-      if (next.value === "skip") break;
+      if (next === "skip") break;
       // Retry: re-prompt only the tracker auth fields, not the whole wizard.
       if (tracker === "linear") {
         const key = await promptRequired(rl, "Linear API key");

package/cli/prompts.mjs

@@ -0,0 +1,64 @@
+// Terminal prompt helpers.
+//
+// `select` — arrow-key menu via @inquirer/prompts (colored, one-line render).
+// `ask` / `promptRequired` — free-text prompts via a short-lived readline.
+//
+// We deliberately do NOT keep a long-lived readline interface around; each
+// text prompt creates its own so inquirer (which opens its own stdin reader
+// during a select) never races against a parallel `rl.question` handler.
+
+import { createInterface } from "readline";
+import { select as inquirerSelect, input as inquirerInput } from "@inquirer/prompts";
+
+// Ctrl-C inside an inquirer prompt throws `ExitPromptError`. Convert it to
+// a clean exit(130) so the terminal doesn't see a node stack trace.
+function handleExit(err) {
+  if (err?.name === "ExitPromptError") {
+    console.log("");
+    process.exit(130);
+  }
+  throw err;
+}
+
+// Arrow-key select menu. `choices` is an array of { name, value, description? }.
+// Returns the selected value.
+export async function select({ message, choices, default: def }) {
+  try {
+    return await inquirerSelect({
+      message,
+      choices,
+      default: def,
+      loop: false,
+    });
+  } catch (err) { handleExit(err); }
+}
+
+// Free-text prompt. Returns the raw answer (not trimmed).
+export function ask(question) {
+  return new Promise(resolve => {
+    const rl = createInterface({ input: process.stdin, output: process.stdout });
+    rl.question(question, answer => {
+      rl.close();
+      resolve(answer);
+    });
+  });
+}
+
+// Loop until a non-empty trimmed value is entered. `label` is the visible
+// prompt text; we wrap it with the same two-space indent init uses elsewhere.
+export async function promptRequired(label) {
+  while (true) {
+    const v = (await ask(`  ${label}: `)).trim();
+    if (v) return v;
+    console.log(`  ${label} is required. Ctrl+C to abort.`);
+  }
+}
+
+// Inquirer-based free-text prompt — used only where arrow-key UX is nice to
+// have alongside the select menus (e.g. the project-picker fallback in
+// bootstrap). Most text prompts in init still go through `ask`.
+export async function promptInput({ message, default: def }) {
+  try {
+    return await inquirerInput({ message, default: def });
+  } catch (err) { handleExit(err); }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kendoo.agentdesk/agentdesk",
-  "version": "0.19.6",
+  "version": "0.19.8",
   "description": "AI team orchestrator for Claude Code — run collaborative agent sessions from your terminal",
   "type": "module",
   "bin": {
@@ -27,6 +27,7 @@
     "prepublishOnly": "node scripts/lint-changelog.mjs"
   },
   "dependencies": {
+    "@inquirer/prompts": "^7.10.1",
     "@radix-ui/react-avatar": "^1.1.11",
     "@radix-ui/react-dialog": "^1.1.15",
     "@radix-ui/react-dropdown-menu": "^2.1.16",