@dosu/cli 0.14.0 → 0.14.2

package/bin/dosu.js

@@ -4341,7 +4341,7 @@ function getSupabaseAnonKey() {
 function getVersionString() {
   return `v${VERSION}`;
 }
-var VERSION = "0.14.0";
+var VERSION = "0.14.2";
 
 // src/debug/logger.ts
 import {
@@ -5165,17 +5165,17 @@ import y2 from "node:process";
 function ce() {
   return y2.platform !== "win32" ? y2.env.TERM !== "linux" : !!y2.env.CI || !!y2.env.WT_SESSION || !!y2.env.TERMINUS_SUBLIME || y2.env.ConEmuTask === "{cmd::Cmder}" || y2.env.TERM_PROGRAM === "Terminus-Sublime" || y2.env.TERM_PROGRAM === "vscode" || y2.env.TERM === "xterm-256color" || y2.env.TERM === "alacritty" || y2.env.TERMINAL_EMULATOR === "JetBrains-JediTerm";
 }
-var import_picocolors8, import_sisteransi2, V2, u = (t, n) => V2 ? t : n, le, L2, W2, C2, ue, o, d2, k2, P2, A2, T, F, $e, _2, me, de, pe, q, D, U, K2, b2 = (t) => {
+var import_picocolors7, import_sisteransi2, V2, u = (t, n) => V2 ? t : n, le, L2, W2, C2, ue, o, d2, k2, P2, A2, T, F, $e, _2, me, de, pe, q, D, U, K2, b2 = (t) => {
   switch (t) {
     case "initial":
     case "active":
-      return import_picocolors8.default.cyan(le);
+      return import_picocolors7.default.cyan(le);
     case "cancel":
-      return import_picocolors8.default.red(L2);
+      return import_picocolors7.default.red(L2);
     case "error":
-      return import_picocolors8.default.yellow(W2);
+      return import_picocolors7.default.yellow(W2);
     case "submit":
-      return import_picocolors8.default.green(C2);
+      return import_picocolors7.default.green(C2);
   }
 }, G2 = (t) => {
   const { cursor: n, options: r, style: i } = t, s = t.maxItems ?? Number.POSITIVE_INFINITY, c = Math.max(process.stdout.rows - 4, 0), a = Math.min(c, Math.max(s, 5));
@@ -5184,23 +5184,23 @@ var import_picocolors8, import_sisteransi2, V2, u = (t, n) => V2 ? t : n, le, L2
   const $2 = a < r.length && l2 > 0, g2 = a < r.length && l2 + a < r.length;
   return r.slice(l2, l2 + a).map((p2, v, f) => {
     const j2 = v === 0 && $2, E = v === f.length - 1 && g2;
-    return j2 || E ? import_picocolors8.default.dim("...") : i(p2, v + l2 === n);
+    return j2 || E ? import_picocolors7.default.dim("...") : i(p2, v + l2 === n);
   });
 }, ye = (t) => {
   const n = t.active ?? "Yes", r = t.inactive ?? "No";
   return new dD({ active: n, inactive: r, initialValue: t.initialValue ?? true, render() {
-    const i = `${import_picocolors8.default.gray(o)}
+    const i = `${import_picocolors7.default.gray(o)}
 ${b2(this.state)}  ${t.message}
 `, s = this.value ? n : r;
     switch (this.state) {
       case "submit":
-        return `${i}${import_picocolors8.default.gray(o)}  ${import_picocolors8.default.dim(s)}`;
+        return `${i}${import_picocolors7.default.gray(o)}  ${import_picocolors7.default.dim(s)}`;
       case "cancel":
-        return `${i}${import_picocolors8.default.gray(o)}  ${import_picocolors8.default.strikethrough(import_picocolors8.default.dim(s))}
-${import_picocolors8.default.gray(o)}`;
+        return `${i}${import_picocolors7.default.gray(o)}  ${import_picocolors7.default.strikethrough(import_picocolors7.default.dim(s))}
+${import_picocolors7.default.gray(o)}`;
       default:
-        return `${i}${import_picocolors8.default.cyan(o)}  ${this.value ? `${import_picocolors8.default.green(k2)} ${n}` : `${import_picocolors8.default.dim(P2)} ${import_picocolors8.default.dim(n)}`} ${import_picocolors8.default.dim("/")} ${this.value ? `${import_picocolors8.default.dim(P2)} ${import_picocolors8.default.dim(r)}` : `${import_picocolors8.default.green(k2)} ${r}`}
-${import_picocolors8.default.cyan(d2)}
+        return `${i}${import_picocolors7.default.cyan(o)}  ${this.value ? `${import_picocolors7.default.green(k2)} ${n}` : `${import_picocolors7.default.dim(P2)} ${import_picocolors7.default.dim(n)}`} ${import_picocolors7.default.dim("/")} ${this.value ? `${import_picocolors7.default.dim(P2)} ${import_picocolors7.default.dim(r)}` : `${import_picocolors7.default.green(k2)} ${r}`}
+${import_picocolors7.default.cyan(d2)}
 `;
     }
   } }).prompt();
@@ -5209,43 +5209,43 @@ ${import_picocolors8.default.cyan(d2)}
     const s = r.label ?? String(r.value);
     switch (i) {
       case "selected":
-        return `${import_picocolors8.default.dim(s)}`;
+        return `${import_picocolors7.default.dim(s)}`;
       case "active":
-        return `${import_picocolors8.default.green(k2)} ${s} ${r.hint ? import_picocolors8.default.dim(`(${r.hint})`) : ""}`;
+        return `${import_picocolors7.default.green(k2)} ${s} ${r.hint ? import_picocolors7.default.dim(`(${r.hint})`) : ""}`;
       case "cancelled":
-        return `${import_picocolors8.default.strikethrough(import_picocolors8.default.dim(s))}`;
+        return `${import_picocolors7.default.strikethrough(import_picocolors7.default.dim(s))}`;
       default:
-        return `${import_picocolors8.default.dim(P2)} ${import_picocolors8.default.dim(s)}`;
+        return `${import_picocolors7.default.dim(P2)} ${import_picocolors7.default.dim(s)}`;
     }
   };
   return new LD({ options: t.options, initialValue: t.initialValue, render() {
-    const r = `${import_picocolors8.default.gray(o)}
+    const r = `${import_picocolors7.default.gray(o)}
 ${b2(this.state)}  ${t.message}
 `;
     switch (this.state) {
       case "submit":
-        return `${r}${import_picocolors8.default.gray(o)}  ${n(this.options[this.cursor], "selected")}`;
+        return `${r}${import_picocolors7.default.gray(o)}  ${n(this.options[this.cursor], "selected")}`;
       case "cancel":
-        return `${r}${import_picocolors8.default.gray(o)}  ${n(this.options[this.cursor], "cancelled")}
-${import_picocolors8.default.gray(o)}`;
+        return `${r}${import_picocolors7.default.gray(o)}  ${n(this.options[this.cursor], "cancelled")}
+${import_picocolors7.default.gray(o)}`;
       default:
-        return `${r}${import_picocolors8.default.cyan(o)}  ${G2({ cursor: this.cursor, options: this.options, maxItems: t.maxItems, style: (i, s) => n(i, s ? "active" : "inactive") }).join(`
-${import_picocolors8.default.cyan(o)}  `)}
-${import_picocolors8.default.cyan(d2)}
+        return `${r}${import_picocolors7.default.cyan(o)}  ${G2({ cursor: this.cursor, options: this.options, maxItems: t.maxItems, style: (i, s) => n(i, s ? "active" : "inactive") }).join(`
+${import_picocolors7.default.cyan(o)}  `)}
+${import_picocolors7.default.cyan(d2)}
 `;
     }
   } }).prompt();
 }, fe = (t) => {
   const n = (r, i) => {
     const s = r.label ?? String(r.value);
-    return i === "active" ? `${import_picocolors8.default.cyan(A2)} ${s} ${r.hint ? import_picocolors8.default.dim(`(${r.hint})`) : ""}` : i === "selected" ? `${import_picocolors8.default.green(T)} ${import_picocolors8.default.dim(s)} ${r.hint ? import_picocolors8.default.dim(`(${r.hint})`) : ""}` : i === "cancelled" ? `${import_picocolors8.default.strikethrough(import_picocolors8.default.dim(s))}` : i === "active-selected" ? `${import_picocolors8.default.green(T)} ${s} ${r.hint ? import_picocolors8.default.dim(`(${r.hint})`) : ""}` : i === "submitted" ? `${import_picocolors8.default.dim(s)}` : `${import_picocolors8.default.dim(F)} ${import_picocolors8.default.dim(s)}`;
+    return i === "active" ? `${import_picocolors7.default.cyan(A2)} ${s} ${r.hint ? import_picocolors7.default.dim(`(${r.hint})`) : ""}` : i === "selected" ? `${import_picocolors7.default.green(T)} ${import_picocolors7.default.dim(s)} ${r.hint ? import_picocolors7.default.dim(`(${r.hint})`) : ""}` : i === "cancelled" ? `${import_picocolors7.default.strikethrough(import_picocolors7.default.dim(s))}` : i === "active-selected" ? `${import_picocolors7.default.green(T)} ${s} ${r.hint ? import_picocolors7.default.dim(`(${r.hint})`) : ""}` : i === "submitted" ? `${import_picocolors7.default.dim(s)}` : `${import_picocolors7.default.dim(F)} ${import_picocolors7.default.dim(s)}`;
   };
   return new SD({ options: t.options, initialValues: t.initialValues, required: t.required ?? true, cursorAt: t.cursorAt, validate(r) {
     if (this.required && r.length === 0)
       return `Please select at least one option.
-${import_picocolors8.default.reset(import_picocolors8.default.dim(`Press ${import_picocolors8.default.gray(import_picocolors8.default.bgWhite(import_picocolors8.default.inverse(" space ")))} to select, ${import_picocolors8.default.gray(import_picocolors8.default.bgWhite(import_picocolors8.default.inverse(" enter ")))} to submit`))}`;
+${import_picocolors7.default.reset(import_picocolors7.default.dim(`Press ${import_picocolors7.default.gray(import_picocolors7.default.bgWhite(import_picocolors7.default.inverse(" space ")))} to select, ${import_picocolors7.default.gray(import_picocolors7.default.bgWhite(import_picocolors7.default.inverse(" enter ")))} to submit`))}`;
   }, render() {
-    const r = `${import_picocolors8.default.gray(o)}
+    const r = `${import_picocolors7.default.gray(o)}
 ${b2(this.state)}  ${t.message}
 `, i = (s, c) => {
       const a = this.value.includes(s.value);
@@ -5253,34 +5253,34 @@ ${b2(this.state)}  ${t.message}
     };
     switch (this.state) {
       case "submit":
-        return `${r}${import_picocolors8.default.gray(o)}  ${this.options.filter(({ value: s }) => this.value.includes(s)).map((s) => n(s, "submitted")).join(import_picocolors8.default.dim(", ")) || import_picocolors8.default.dim("none")}`;
+        return `${r}${import_picocolors7.default.gray(o)}  ${this.options.filter(({ value: s }) => this.value.includes(s)).map((s) => n(s, "submitted")).join(import_picocolors7.default.dim(", ")) || import_picocolors7.default.dim("none")}`;
       case "cancel": {
-        const s = this.options.filter(({ value: c }) => this.value.includes(c)).map((c) => n(c, "cancelled")).join(import_picocolors8.default.dim(", "));
-        return `${r}${import_picocolors8.default.gray(o)}  ${s.trim() ? `${s}
-${import_picocolors8.default.gray(o)}` : ""}`;
+        const s = this.options.filter(({ value: c }) => this.value.includes(c)).map((c) => n(c, "cancelled")).join(import_picocolors7.default.dim(", "));
+        return `${r}${import_picocolors7.default.gray(o)}  ${s.trim() ? `${s}
+${import_picocolors7.default.gray(o)}` : ""}`;
       }
       case "error": {
         const s = this.error.split(`
-`).map((c, a) => a === 0 ? `${import_picocolors8.default.yellow(d2)}  ${import_picocolors8.default.yellow(c)}` : `   ${c}`).join(`
+`).map((c, a) => a === 0 ? `${import_picocolors7.default.yellow(d2)}  ${import_picocolors7.default.yellow(c)}` : `   ${c}`).join(`
 `);
-        return `${r + import_picocolors8.default.yellow(o)}  ${G2({ options: this.options, cursor: this.cursor, maxItems: t.maxItems, style: i }).join(`
-${import_picocolors8.default.yellow(o)}  `)}
+        return `${r + import_picocolors7.default.yellow(o)}  ${G2({ options: this.options, cursor: this.cursor, maxItems: t.maxItems, style: i }).join(`
+${import_picocolors7.default.yellow(o)}  `)}
 ${s}
 `;
       }
       default:
-        return `${r}${import_picocolors8.default.cyan(o)}  ${G2({ options: this.options, cursor: this.cursor, maxItems: t.maxItems, style: i }).join(`
-${import_picocolors8.default.cyan(o)}  `)}
-${import_picocolors8.default.cyan(d2)}
+        return `${r}${import_picocolors7.default.cyan(o)}  ${G2({ options: this.options, cursor: this.cursor, maxItems: t.maxItems, style: i }).join(`
+${import_picocolors7.default.cyan(o)}  `)}
+${import_picocolors7.default.cyan(d2)}
 `;
     }
   } }).prompt();
 }, Ie = (t = "") => {
-  process.stdout.write(`${import_picocolors8.default.gray(ue)}  ${t}
+  process.stdout.write(`${import_picocolors7.default.gray(ue)}  ${t}
 `);
 }, Se = (t = "") => {
-  process.stdout.write(`${import_picocolors8.default.gray(o)}
-${import_picocolors8.default.gray(d2)}  ${t}
+  process.stdout.write(`${import_picocolors7.default.gray(o)}
+${import_picocolors7.default.gray(d2)}  ${t}
 
 `);
 }, M2, J2, Y2 = ({ indicator: t = "dots" } = {}) => {
@@ -5305,14 +5305,14 @@ ${import_picocolors8.default.gray(d2)}  ${t}
     const h2 = (performance.now() - m2) / 1000, w2 = Math.floor(h2 / 60), I2 = Math.floor(h2 % 60);
     return w2 > 0 ? `[${w2}m ${I2}s]` : `[${I2}s]`;
   }, H2 = (m2 = "") => {
-    a = true, s = fD(), l2 = R2(m2), g2 = performance.now(), process.stdout.write(`${import_picocolors8.default.gray(o)}
+    a = true, s = fD(), l2 = R2(m2), g2 = performance.now(), process.stdout.write(`${import_picocolors7.default.gray(o)}
 `);
     let h2 = 0, w2 = 0;
     j2(), c = setInterval(() => {
       if (i && l2 === $2)
         return;
       B2(), $2 = l2;
-      const I2 = import_picocolors8.default.magenta(n[h2]);
+      const I2 = import_picocolors7.default.magenta(n[h2]);
       if (i)
         process.stdout.write(`${I2}  ${l2}...`);
       else if (t === "timer")
@@ -5325,7 +5325,7 @@ ${import_picocolors8.default.gray(d2)}  ${t}
     }, r);
   }, N2 = (m2 = "", h2 = 0) => {
     a = false, clearInterval(c), B2();
-    const w2 = h2 === 0 ? import_picocolors8.default.green(C2) : h2 === 1 ? import_picocolors8.default.red(L2) : import_picocolors8.default.red(W2);
+    const w2 = h2 === 0 ? import_picocolors7.default.green(C2) : h2 === 1 ? import_picocolors7.default.red(L2) : import_picocolors7.default.red(W2);
     l2 = R2(m2 ?? l2), t === "timer" ? process.stdout.write(`${w2}  ${l2} ${O2(g2)}
 `) : process.stdout.write(`${w2}  ${l2}
 `), E(), s();
@@ -5337,7 +5337,7 @@ ${import_picocolors8.default.gray(d2)}  ${t}
 var init_dist6 = __esm(() => {
   init_dist5();
   init_dist5();
-  import_picocolors8 = __toESM(require_picocolors(), 1);
+  import_picocolors7 = __toESM(require_picocolors(), 1);
   import_sisteransi2 = __toESM(require_src(), 1);
   V2 = ce();
   le = u("◆", "*");
@@ -5361,30 +5361,30 @@ var init_dist6 = __esm(() => {
   D = u("◆", "*");
   U = u("▲", "!");
   K2 = u("■", "x");
-  M2 = { message: (t = "", { symbol: n = import_picocolors8.default.gray(o) } = {}) => {
-    const r = [`${import_picocolors8.default.gray(o)}`];
+  M2 = { message: (t = "", { symbol: n = import_picocolors7.default.gray(o) } = {}) => {
+    const r = [`${import_picocolors7.default.gray(o)}`];
     if (t) {
       const [i, ...s] = t.split(`
 `);
-      r.push(`${n}  ${i}`, ...s.map((c) => `${import_picocolors8.default.gray(o)}  ${c}`));
+      r.push(`${n}  ${i}`, ...s.map((c) => `${import_picocolors7.default.gray(o)}  ${c}`));
     }
     process.stdout.write(`${r.join(`
 `)}
 `);
   }, info: (t) => {
-    M2.message(t, { symbol: import_picocolors8.default.blue(q) });
+    M2.message(t, { symbol: import_picocolors7.default.blue(q) });
   }, success: (t) => {
-    M2.message(t, { symbol: import_picocolors8.default.green(D) });
+    M2.message(t, { symbol: import_picocolors7.default.green(D) });
   }, step: (t) => {
-    M2.message(t, { symbol: import_picocolors8.default.green(C2) });
+    M2.message(t, { symbol: import_picocolors7.default.green(C2) });
   }, warn: (t) => {
-    M2.message(t, { symbol: import_picocolors8.default.yellow(U) });
+    M2.message(t, { symbol: import_picocolors7.default.yellow(U) });
   }, warning: (t) => {
     M2.warn(t);
   }, error: (t) => {
-    M2.message(t, { symbol: import_picocolors8.default.red(K2) });
+    M2.message(t, { symbol: import_picocolors7.default.red(K2) });
   } };
-  J2 = `${import_picocolors8.default.gray(o)}  `;
+  J2 = `${import_picocolors7.default.gray(o)}  `;
 });
 
 // src/insights/insights.ts
@@ -9865,7 +9865,7 @@ var exports_flow = {};
 __export(exports_flow, {
   startOAuthFlow: () => startOAuthFlow
 });
-async function startOAuthFlow(signal, path2 = "/cli/auth", params = {}, opts = {}) {
+async function startOAuthFlow(signal, path2 = "/cli/auth", params = {}) {
   const { server, tokenPromise } = await startCallbackServer();
   let timeoutId;
   try {
@@ -9873,12 +9873,9 @@ async function startOAuthFlow(signal, path2 = "/cli/auth", params = {}, opts = {
     logger.debug("auth.flow", `Callback URL: ${callbackURL}`);
     const authURL = buildAuthURL(callbackURL, path2, params);
     logger.info("auth.flow", `Auth URL: ${authURL}`);
-    opts.onAuthURL?.(authURL);
-    if (opts.openBrowser !== false) {
-      const open2 = await Promise.resolve().then(() => (init_open(), exports_open));
-      await open2.default(authURL);
-      logger.info("auth.flow", "Browser open command executed");
-    }
+    const open2 = await Promise.resolve().then(() => (init_open(), exports_open));
+    await open2.default(authURL);
+    logger.info("auth.flow", "Browser open command executed");
     const timeout = new Promise((_3, reject) => {
       timeoutId = setTimeout(() => {
         logger.warn("auth.flow", "Authentication timed out (8min)");
@@ -9938,7 +9935,7 @@ async function runSetup(opts = {}) {
     cfg.mode = undefined;
     saveConfig(cfg);
   }
-  const authedCfg = await stepAuthenticate(cfg, onboardingRunID, opts);
+  const authedCfg = await stepAuthenticate(cfg, onboardingRunID);
   if (!authedCfg)
     return;
   cfg = authedCfg;
@@ -9988,8 +9985,7 @@ async function runSetup(opts = {}) {
   cfg.api_key = apiKey;
   saveConfig(cfg);
   const choices = await stepOneShotConfirm({
-    includeGitHub: cloudSetupContext?.kind === "onboarding",
-    setupOptions: opts
+    includeGitHub: cloudSetupContext?.kind === "onboarding"
   });
   if (!choices) {
     await trackCliOnboardingEvent(cfg, onboardingRunID, "cli_onboarding_cancelled", {
@@ -10007,7 +10003,7 @@ async function runSetup(opts = {}) {
   let skillCompleted = false;
   let docsImported = false;
   if (choices.configureMcp) {
-    const configured = await stepConfigureMcpTools(cfg, opts.toolIDs);
+    const configured = await stepConfigureMcpTools(cfg);
     if (configured === null) {
       await trackCliOnboardingEvent(cfg, onboardingRunID, "cli_onboarding_cancelled", {
         reason: "mcp_selection_cancelled"
@@ -10130,13 +10126,6 @@ function applyModeOverride(cfg, opts) {
   saveConfig(cfg);
 }
 async function stepOneShotConfirm(opts) {
-  if (opts.setupOptions?.yes) {
-    return {
-      configureMcp: !opts.setupOptions.skipMcp,
-      installSkill: !opts.setupOptions.skipSkill,
-      connectGitHub: opts.includeGitHub && !opts.setupOptions.skipGitHub
-    };
-  }
   const items = [
     { value: "configureMcp", label: "Install Dosu MCP" },
     { value: "installSkill", label: "Install Dosu skill" }
@@ -10164,15 +10153,7 @@ async function stepOneShotConfirm(opts) {
     connectGitHub: chosen.has("connectGitHub")
   };
 }
-async function stepConfigureMcpTools(cfg, requestedToolIDs) {
-  if (requestedToolIDs && requestedToolIDs.length > 0) {
-    const selection2 = selectRequestedTools(requestedToolIDs);
-    if (!selection2)
-      return null;
-    const results2 = stepConfigureTools(cfg, selection2);
-    stepShowSummary(results2);
-    return results2;
-  }
+async function stepConfigureMcpTools(cfg) {
   const detected = stepDetectTools();
   if (detected.length === 0) {
     M2.warn(`No supported AI agents detected on your system.
@@ -10204,7 +10185,7 @@ async function runInstallSkill() {
     return false;
   }
 }
-async function stepAuthenticate(existingCfg, onboardingRunID, opts = {}) {
+async function stepAuthenticate(existingCfg, onboardingRunID) {
   logger.info("setup", "Step: authenticate");
   const cfg = existingCfg ?? loadConfig();
   if (cfg.access_token) {
@@ -10234,36 +10215,26 @@ async function stepAuthenticate(existingCfg, onboardingRunID, opts = {}) {
       s.stop("Session verification failed");
     }
   }
-  if (!opts.yes && opts.openBrowser !== false) {
-    const shouldLogin = await ye({ message: "Open browser to log in?" });
-    if (pD(shouldLogin) || !shouldLogin) {
-      if (onboardingRunID) {
-        await trackCliOnboardingPreAuthEvent(onboardingRunID, "cli_onboarding_auth_cancelled", {
-          reason: pD(shouldLogin) ? "prompt_cancelled" : "login_declined"
-        });
-      }
-      return null;
+  const shouldLogin = await ye({ message: "Open browser to log in?" });
+  if (pD(shouldLogin) || !shouldLogin) {
+    if (onboardingRunID) {
+      await trackCliOnboardingPreAuthEvent(onboardingRunID, "cli_onboarding_auth_cancelled", {
+        reason: pD(shouldLogin) ? "prompt_cancelled" : "login_declined"
+      });
     }
+    return null;
   }
   if (onboardingRunID) {
     await trackCliOnboardingPreAuthEvent(onboardingRunID, "cli_onboarding_auth_started");
   }
-  return await openBrowserForSetup(cfg, onboardingRunID, opts);
+  return await openBrowserForSetup(cfg, onboardingRunID);
 }
-async function openBrowserForSetup(cfg, onboardingRunID, opts = {}) {
+async function openBrowserForSetup(cfg, onboardingRunID) {
   try {
     const { startOAuthFlow: startOAuthFlow2 } = await Promise.resolve().then(() => (init_flow(), exports_flow));
     const s = Y2();
     s.start("Waiting for authentication...");
-    const token = await startOAuthFlow2(undefined, "/cli/auth", onboardingRunID ? { onboarding_run_id: onboardingRunID } : {}, {
-      openBrowser: opts.openBrowser !== false,
-      onAuthURL: opts.openBrowser === false ? (url) => {
-        M2.info(`Open this URL to authenticate:
-${url}
-
-Waiting for login to complete...`);
-      } : undefined
-    });
+    const token = await startOAuthFlow2(undefined, "/cli/auth", onboardingRunID ? { onboarding_run_id: onboardingRunID } : {});
     s.stop("Authenticated");
     logger.info("setup", "Browser auth completed");
     cfg.access_token = token.access_token;
@@ -10372,10 +10343,10 @@ async function resolveDeployment(apiClient, cfg, opts) {
     }
     return true;
   }
-  const org = await stepSelectOrg(apiClient, opts.yes === true);
+  const org = await stepSelectOrg(apiClient);
   if (!org)
     return false;
-  const d3 = await stepSelectDeployment(apiClient, org, opts.yes === true);
+  const d3 = await stepSelectDeployment(apiClient, org);
   if (!d3)
     return false;
   cfg.mode = undefined;
@@ -10389,7 +10360,7 @@ async function fetchDeployments(apiClient) {
     return [];
   }
 }
-async function stepSelectOrg(apiClient, noPrompt = false) {
+async function stepSelectOrg(apiClient) {
   try {
     const orgs = await apiClient.getOrgs();
     if (orgs.length === 0) {
@@ -10402,10 +10373,6 @@ async function stepSelectOrg(apiClient, noPrompt = false) {
 ${dim(orgs[0].name)}`);
       return orgs[0];
     }
-    if (noPrompt) {
-      M2.error("Multiple organizations found. Run `dosu deployments list --json`, choose a deployment, then re-run setup with `--deployment <id>`.");
-      return null;
-    }
     const selected = await ve({
       message: "Select an organization",
       options: orgs.map((o2) => ({ label: o2.name, value: o2.org_id }))
@@ -10443,7 +10410,7 @@ ${dim(d3.name)}`);
     return null;
   }
 }
-async function stepSelectDeployment(apiClient, org, noPrompt = false) {
+async function stepSelectDeployment(apiClient, org) {
   try {
     const allDeployments = await apiClient.getDeployments();
     const deployments = allDeployments.filter((d4) => d4.org_id === org.org_id);
@@ -10457,10 +10424,6 @@ async function stepSelectDeployment(apiClient, org, noPrompt = false) {
 ${dim(deployments[0].name)}`);
       return deployments[0];
     }
-    if (noPrompt) {
-      M2.error("Multiple MCPs found. Run `dosu deployments list --json`, choose one, then re-run setup with `--deployment <id>`.");
-      return null;
-    }
     const selected = await ve({
       message: "Select an MCP",
       options: deployments.map((d4) => ({ label: d4.name, value: d4.deployment_id }))
@@ -10508,24 +10471,6 @@ function isStdioOnly(p2) {
 function stepDetectTools() {
   return allSetupProviders().filter((p2) => p2.isInstalled() && !isStdioOnly(p2));
 }
-function selectRequestedTools(requestedToolIDs) {
-  const normalized = [...new Set(requestedToolIDs.map((id) => id.toLowerCase()))];
-  const providers = allSetupProviders();
-  const selected = [];
-  for (const id of normalized) {
-    const provider = providers.find((p2) => p2.id() === id);
-    if (!provider) {
-      M2.error(`Unknown AI tool '${id}'. Run 'dosu mcp list' to see available tools.`);
-      return null;
-    }
-    if (isStdioOnly(provider)) {
-      M2.error(`${provider.name()} is not supported by setup. Use 'dosu mcp add ${id}'.`);
-      return null;
-    }
-    selected.push(provider);
-  }
-  return { toInstall: selected, toRemove: [], skipped: [] };
-}
 async function stepSelectTools(detected) {
   const configuredMap = new Map;
   for (const p2 of detected) {
@@ -11321,15 +11266,17 @@ ${import_picocolors6.default.dim(`Current: ${cfg.deployment_name ?? cfg.deployme
 }
 
 // src/commands/docs.ts
+init_dist6();
+init_dist();
 init_esm();
 init_trpc();
 init_logger();
-var import_picocolors7 = __toESM(require_picocolors(), 1);
+var import_picocolors8 = __toESM(require_picocolors(), 1);
 import { readFileSync as readFileSync3 } from "node:fs";
 function requireConfig4() {
   const cfg = requireLoginConfig();
   if (!cfg.space_id) {
-    console.error(import_picocolors7.default.red("Missing space config. Run 'dosu setup' to reconfigure."));
+    console.error(import_picocolors8.default.red("Missing space config. Run 'dosu setup' to reconfigure."));
     process.exit(1);
   }
   return cfg;
@@ -11339,7 +11286,7 @@ async function getKnowledgeStoreId(client, spaceId) {
     space_id: spaceId
   });
   if (!store) {
-    console.error(import_picocolors7.default.red("No knowledge store found for this deployment."));
+    console.error(import_picocolors8.default.red("No knowledge store found for this deployment."));
     process.exit(1);
   }
   return store.id;
@@ -11349,10 +11296,65 @@ function readBody(opts) {
     return readFileSync3(opts.bodyFile, "utf-8");
   return opts.body;
 }
+var IMPORT_ALREADY_IN_PROGRESS_CODE = "IMPORT_ALREADY_IN_PROGRESS";
+var IMPORT_ALREADY_IN_PROGRESS_LEGACY_DETAIL_PHRASE = "import operation is already in progress";
+function parseSerializedImportError(message) {
+  let text = message;
+  let appCode;
+  try {
+    const parsed = JSON.parse(message);
+    let codeCandidate;
+    if (typeof parsed?.detail === "string") {
+      text = parsed.detail;
+      codeCandidate = parsed.code ?? parsed.dosuCode;
+    } else if (parsed?.detail !== null && typeof parsed.detail === "object") {
+      const inner = parsed.detail;
+      if (typeof inner.detail === "string") {
+        text = inner.detail;
+      } else if (typeof inner.message === "string") {
+        text = inner.message;
+      }
+      codeCandidate = inner.code ?? inner.dosuCode ?? parsed.code ?? parsed.dosuCode;
+    } else {
+      codeCandidate = parsed.code ?? parsed.dosuCode;
+    }
+    if (typeof codeCandidate === "string" && codeCandidate === IMPORT_ALREADY_IN_PROGRESS_CODE) {
+      appCode = IMPORT_ALREADY_IN_PROGRESS_CODE;
+    }
+  } catch {}
+  return {
+    detail: text || "Import failed. Please try again.",
+    appCode
+  };
+}
+function trpcImportConflictAppCode(err) {
+  if (!isTRPCClientError(err))
+    return;
+  const { data } = err;
+  if (data === null || typeof data !== "object")
+    return;
+  const d3 = data;
+  let candidate = d3.code;
+  if (typeof candidate !== "string")
+    candidate = d3.dosuCode;
+  if (typeof candidate !== "string")
+    return;
+  return candidate === IMPORT_ALREADY_IN_PROGRESS_CODE ? IMPORT_ALREADY_IN_PROGRESS_CODE : undefined;
+}
+function isConcurrentImportError(err, msg) {
+  if (trpcImportConflictAppCode(err) === IMPORT_ALREADY_IN_PROGRESS_CODE) {
+    return true;
+  }
+  const { detail, appCode } = parseSerializedImportError(msg);
+  if (appCode === IMPORT_ALREADY_IN_PROGRESS_CODE) {
+    return true;
+  }
+  return detail.includes(IMPORT_ALREADY_IN_PROGRESS_LEGACY_DETAIL_PHRASE);
+}
 async function backendPost(path, apiKey, body) {
   const backendURL = getBackendURL();
   if (!backendURL) {
-    console.error(import_picocolors7.default.red("Backend URL not configured."));
+    console.error(import_picocolors8.default.red("Backend URL not configured."));
     process.exit(1);
   }
   const resp = await fetch(`${backendURL}${path}`, {
@@ -11388,14 +11390,14 @@ function docsCommand() {
       return;
     }
     if (!pages || pages.length === 0) {
-      console.log(import_picocolors7.default.dim("No documents found."));
+      console.log(import_picocolors8.default.dim("No documents found."));
       return;
     }
-    printTable(["ID", "Title", "Status", "Created"], pages.map((p) => [
-      p.id.slice(0, 8),
-      truncate(p.title ?? "(untitled)", 50),
-      p.published ? "published" : "draft",
-      formatDate(p.created_at)
+    printTable(["ID", "Title", "Status", "Created"], pages.map((p2) => [
+      p2.id.slice(0, 8),
+      truncate(p2.title ?? "(untitled)", 50),
+      p2.published ? "published" : "draft",
+      formatDate(p2.created_at)
     ]), { rawData: pages });
   });
   cmd.command("get").description("Get a document").argument("<id>", "Page ID").option("--version <v>", "Specific version number").option("--json", "Output as JSON").action(async (id, opts) => {
@@ -11410,10 +11412,10 @@ function docsCommand() {
       return;
     }
     if (!page) {
-      console.log(import_picocolors7.default.dim("Document not found."));
+      console.log(import_picocolors8.default.dim("Document not found."));
       return;
     }
-    console.log(import_picocolors7.default.bold(page.title ?? "(untitled)"));
+    console.log(import_picocolors8.default.bold(page.title ?? "(untitled)"));
     printInfo([
       ["ID", page.id],
       ["Status", page.published ? "published" : "draft"],
@@ -11438,7 +11440,7 @@ ${page.body}`);
       printResult(result, opts);
       return;
     }
-    console.log(import_picocolors7.default.green(`Document "${opts.title}" created.`));
+    console.log(import_picocolors8.default.green(`Document "${opts.title}" created.`));
   });
   cmd.command("update").description("Update a document").argument("<id>", "Page ID").option("--title <title>", "New title").option("--body <markdown>", "New body (markdown)").option("--body-file <path>", "Read body from file").option("--json", "Output as JSON").action(async (id, opts) => {
     const cfg = requireConfig4();
@@ -11455,7 +11457,7 @@ ${page.body}`);
       printResult(result, opts);
       return;
     }
-    console.log(import_picocolors7.default.green("Document updated."));
+    console.log(import_picocolors8.default.green("Document updated."));
   });
   for (const archived of [true, false]) {
     const name = archived ? "archive" : "unarchive";
@@ -11467,7 +11469,7 @@ ${page.body}`);
         printResult({ success: true, id, archived }, opts);
         return;
       }
-      console.log(import_picocolors7.default.green(`Document ${name}d.`));
+      console.log(import_picocolors8.default.green(`Document ${name}d.`));
     });
   }
   cmd.command("delete").description("Delete a document").argument("<id>", "Page ID").option("--json", "Output as JSON").action(async (id, opts) => {
@@ -11478,7 +11480,7 @@ ${page.body}`);
       printResult({ success: true, id }, opts);
       return;
     }
-    console.log(import_picocolors7.default.green("Document deleted."));
+    console.log(import_picocolors8.default.green("Document deleted."));
   });
   cmd.command("versions").description("List document versions").argument("<id>", "Page ID").option("--json", "Output as JSON").action(async (id, opts) => {
     const cfg = requireConfig4();
@@ -11489,7 +11491,7 @@ ${page.body}`);
       return;
     }
     if (!versions || versions.length === 0) {
-      console.log(import_picocolors7.default.dim("No versions found."));
+      console.log(import_picocolors8.default.dim("No versions found."));
       return;
     }
     printTable(["Version", "Created"], versions.map((v) => [
@@ -11508,7 +11510,7 @@ ${page.body}`);
       printResult({ success: true, id, version: opts.version }, opts);
       return;
     }
-    console.log(import_picocolors7.default.green(`Document restored to version ${opts.version}.`));
+    console.log(import_picocolors8.default.green(`Document restored to version ${opts.version}.`));
   });
   cmd.command("generate").description("Generate a document using AI").requiredOption("--title <title>", "Document title").option("--instructions <text>", "Custom generation instructions").option("--json", "Output as JSON").action(async (opts) => {
     const cfg = requireConfig4();
@@ -11523,7 +11525,7 @@ ${page.body}`);
       printResult(result, opts);
       return;
     }
-    console.log(import_picocolors7.default.green("Document generation started."));
+    console.log(import_picocolors8.default.green("Document generation started."));
   });
   cmd.command("auto-tag").description("Auto-tag a document using AI").argument("<id>", "Page ID").option("--json", "Output as JSON").action(async (id, opts) => {
     const cfg = requireConfig4();
@@ -11532,7 +11534,7 @@ ${page.body}`);
       printResult(result, opts);
       return;
     }
-    console.log(import_picocolors7.default.green("Auto-tagging started."));
+    console.log(import_picocolors8.default.green("Auto-tagging started."));
   });
   cmd.command("import").description("Import documents from an external platform").argument("<platform>", "Platform: github, gitlab, confluence, notion, coda").requiredOption("--files <ids>", "Comma-separated file/page IDs to import").option("--json", "Output as JSON").action(async (platform, opts) => {
     const cfg = requireConfig4();
@@ -11548,20 +11550,38 @@ ${page.body}`);
     };
     const fn = importFn[platform.toLowerCase()];
     if (!fn) {
-      console.error(import_picocolors7.default.red(`Unknown platform: ${platform}. Use: github, gitlab, confluence, notion, coda`));
+      console.error(import_picocolors8.default.red(`Unknown platform: ${platform}. Use: github, gitlab, confluence, notion, coda`));
       process.exit(1);
     }
     const idField = ["confluence", "notion", "coda"].includes(platform.toLowerCase()) ? "page_ids" : "file_ids";
-    const result = await fn({
-      knowledge_store_id: ksId,
-      space_id: cfg.space_id,
-      [idField]: fileIds
-    });
-    if (opts.json) {
-      printResult(result, opts);
-      return;
+    try {
+      const result = await fn({
+        knowledge_store_id: ksId,
+        space_id: cfg.space_id,
+        [idField]: fileIds
+      });
+      if (opts.json) {
+        printResult(result, opts);
+        return;
+      }
+      console.log(import_picocolors8.default.green(`Import started.${result.task_id ? ` Task ID: ${result.task_id}` : ""}`));
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : String(err);
+      logger.warn("docs-import", `Import failed: ${msg}`);
+      const { detail } = parseSerializedImportError(msg);
+      const isConcurrentImport = isConcurrentImportError(err, msg);
+      if (opts.json) {
+        const error = isConcurrentImport ? "An import is already in progress for this organization. Wait for it to complete or check status with: dosu docs import-status <task-id>" : detail;
+        console.error(JSON.stringify({ error }));
+      } else if (isConcurrentImport) {
+        M2.error("An import is already in progress for this organization.");
+        M2.info(`Check status with: ${import_picocolors8.default.cyan("dosu docs import-status <task-id>")}`);
+        M2.info("Only one import can run per organization at a time.");
+      } else {
+        M2.error(detail);
+      }
+      process.exit(1);
     }
-    console.log(import_picocolors7.default.green(`Import started.${result.task_id ? ` Task ID: ${result.task_id}` : ""}`));
   });
   cmd.command("import-status").description("Check import task status").argument("<task-id>", "Import task ID").option("--json", "Output as JSON").action(async (taskId, opts) => {
     const cfg = requireConfig4();
@@ -11572,7 +11592,7 @@ ${page.body}`);
       return;
     }
     if (!status) {
-      console.log(import_picocolors7.default.dim("Import task not found."));
+      console.log(import_picocolors8.default.dim("Import task not found."));
       return;
     }
     console.log(`Status: ${JSON.stringify(status)}`);
@@ -11621,7 +11641,7 @@ ${page.body}`);
     };
     const config = publishMap[platform];
     if (!config) {
-      console.error(import_picocolors7.default.red(`Unknown platform: ${platform}`));
+      console.error(import_picocolors8.default.red(`Unknown platform: ${platform}`));
       process.exit(1);
     }
     logger.debug("docs", `Publishing to ${platform}`);
@@ -11630,7 +11650,7 @@ ${page.body}`);
       printResult(result, opts);
       return;
     }
-    console.log(import_picocolors7.default.green(`Document published to ${platform}.`));
+    console.log(import_picocolors8.default.green(`Document published to ${platform}.`));
   });
   cmd.command("sync-back").description("Sync document back to its source (Notion/Confluence)").argument("<id>", "Page ID").option("--json", "Output as JSON").action(async (id, opts) => {
     const cfg = requireConfig4();
@@ -11640,7 +11660,7 @@ ${page.body}`);
       printResult(result, opts);
       return;
     }
-    console.log(import_picocolors7.default.green("Sync-back initiated."));
+    console.log(import_picocolors8.default.green("Sync-back initiated."));
   });
   return cmd;
 }
@@ -12583,27 +12603,19 @@ function createProgram() {
     const { runTUI: runTUI2 } = await Promise.resolve().then(() => (init_tui(), exports_tui));
     await runTUI2();
   });
-  program2.command("login").description("Authenticate with Dosu via OAuth").option("--no-open", "Print the login URL instead of opening a browser").action(async (opts) => {
+  program2.command("login").description("Authenticate with Dosu via OAuth").action(async () => {
     const cfg = loadConfig();
     if (isAuthenticated(cfg) && !isTokenExpired(cfg)) {
       console.log("You are already logged in.");
       console.log("Run 'dosu logout' first to re-authenticate.");
       return;
     }
-    console.log(opts.open === false ? "Starting authentication..." : "Opening browser for authentication...");
+    console.log("Opening browser for authentication...");
     const { startOAuthFlow: startOAuthFlow2 } = await Promise.resolve().then(() => (init_flow(), exports_flow));
     const { OAuthCallbackError: OAuthCallbackError2 } = await Promise.resolve().then(() => (init_errors(), exports_errors));
     let token;
     try {
-      token = await startOAuthFlow2(undefined, "/cli/auth", {}, {
-        openBrowser: opts.open !== false,
-        onAuthURL: opts.open === false ? (url) => {
-          console.log("Open this URL to authenticate:");
-          console.log(url);
-          console.log(`
-Waiting for login to complete...`);
-        } : undefined
-      });
+      token = await startOAuthFlow2();
     } catch (err) {
       if (err instanceof OAuthCallbackError2) {
         console.error(err.userMessage);
@@ -12657,7 +12669,7 @@ Waiting for login to complete...`);
       console.log(`MCP ID: ${cfg.deployment_id}`);
     } else {
       console.log("MCP: None selected");
-      console.log("Run 'dosu' to open the TUI and select an MCP.");
+      console.log("Run 'dosu deployments list' to see available MCPs, then 'dosu deployments switch <id>' to select one.");
     }
   });
   const mcp = program2.command("mcp").description("Manage MCP server integrations");
@@ -12733,7 +12745,7 @@ Use 'dosu mcp add <agent>' to add Dosu MCP to a tool.`);
   program2.addCommand(tagsCommand());
   program2.addCommand(threadsCommand());
   program2.addCommand(skillCommand());
-  program2.command("setup").description("Set up Dosu MCP for your AI tools").option("--deployment <id>", "Skip to tool configuration for a specific MCP").option("--mode <mode>", "Force OSS or Cloud mode, skipping the interactive prompt (oss|cloud)").option("--agent", "Run an agent-assisted setup with safe defaults", false).option("-y, --yes", "Accept setup defaults and skip confirmation prompts", false).option("--no-open", "Print browser login URLs instead of opening them").option("--tool <agent>", "Configure a specific AI tool; may be repeated", collectValues, []).option("--skip-mcp", "Do not configure AI tool MCP entries", false).option("--skip-skill", "Do not install the Dosu agent skill", false).option("--skip-github", "Do not run GitHub repository/doc onboarding", false).action(async (opts) => {
+  program2.command("setup").description("Set up Dosu MCP for your AI tools").option("--deployment <id>", "Skip to tool configuration for a specific MCP").option("--mode <mode>", "Force OSS or Cloud mode, skipping the interactive prompt (oss|cloud)").action(async (opts) => {
     const { runSetup: runSetup2 } = await Promise.resolve().then(() => (init_flow2(), exports_flow2));
     let mode;
     if (opts.mode !== undefined) {
@@ -12743,16 +12755,7 @@ Use 'dosu mcp add <agent>' to add Dosu MCP to a tool.`);
       }
       mode = normalized;
     }
-    await runSetup2({
-      deploymentID: opts.deployment,
-      mode,
-      yes: opts.agent === true || opts.yes === true,
-      openBrowser: opts.agent === true ? false : opts.open !== false,
-      toolIDs: opts.tool ?? [],
-      skipMcp: opts.skipMcp === true,
-      skipSkill: opts.skipSkill === true,
-      skipGitHub: opts.agent === true || opts.skipGithub === true
-    });
+    await runSetup2({ deploymentID: opts.deployment, mode });
   });
   program2.command("logs").description("View or manage debug logs").option("-t, --tail [n]", "Show last N lines (default: 50)").option("--clear", "Delete the log file").action((opts) => {
     const logPath = logger.getLogPath();
@@ -12782,10 +12785,6 @@ Use 'dosu mcp add <agent>' to add Dosu MCP to a tool.`);
   });
   return program2;
 }
-function collectValues(value, previous) {
-  previous.push(value);
-  return previous;
-}
 async function execute() {
   const program2 = createProgram();
   await program2.parseAsync(process.argv);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dosu/cli",
-  "version": "0.14.0",
+  "version": "0.14.2",
   "type": "module",
   "description": "Dosu CLI - Manage MCP servers for AI tools",
   "license": "MIT",