@dosu/cli 0.33.0 → 0.33.1

package/bin/dosu.js

@@ -2100,6 +2100,16 @@ var init_commander = __esm(() => {
 // src/config/config.ts
 import { existsSync, mkdirSync, readFileSync, renameSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
+function replaceLoginSession(cfg, session) {
+  cfg.access_token = session.access_token;
+  cfg.refresh_token = session.refresh_token;
+  cfg.expires_at = session.expires_at;
+  cfg.deployment_id = undefined;
+  cfg.deployment_name = undefined;
+  cfg.api_key = undefined;
+  cfg.org_id = undefined;
+  cfg.space_id = undefined;
+}
 function getConfigDir() {
   const dirName = process.env.DOSU_DEV === "true" ? "dosu-cli-dev" : "dosu-cli";
   const xdgConfig = process.env.XDG_CONFIG_HOME;
@@ -4577,7 +4587,7 @@ var init_dist4 = __esm(() => {
 function getVersionString() {
   return `v${VERSION}`;
 }
-var VERSION = "0.33.0", INSTALL_CHANNEL = "npm";
+var VERSION = "0.33.1", INSTALL_CHANNEL = "npm";
 
 // src/debug/logger.ts
 import {
@@ -11748,7 +11758,7 @@ async function runSetup(opts = {}) {
     authTab?.close();
   };
   await trackCliOnboardingEvent(cfg, onboardingRunID, "cli_onboarding_auth_completed");
-  const apiClient = new Client(cfg);
+  let apiClient = new Client(cfg);
   let cloudSetupContext = null;
   if (cfg.mode !== MODE_OSS) {
     const s = spinner();
@@ -11779,7 +11789,9 @@ async function runSetup(opts = {}) {
       });
       return;
     }
-    const ok = await bindOnboardingDeployment(apiClient, cfg, cloudSetupContext.targetOrg ?? null);
+    apiClient = new Client(cfg);
+    const targetOrg = await resolveCurrentOnboardingTargetOrg(cfg);
+    const ok = await bindOnboardingDeployment(apiClient, cfg, targetOrg);
     if (!ok) {
       await trackCliOnboardingEvent(cfg, onboardingRunID, "cli_onboarding_failed", {
         reason: "onboarding_deployment_failed"
@@ -11995,9 +12007,11 @@ async function openBrowserForSetup(cfg, onboardingRunID) {
     const token = result.token;
     s.stop("Authenticated");
     logger.info("setup", "Browser auth completed");
-    cfg.access_token = token.access_token;
-    cfg.refresh_token = token.refresh_token;
-    cfg.expires_at = Math.floor(Date.now() / 1000) + token.expires_in;
+    replaceLoginSession(cfg, {
+      access_token: token.access_token,
+      refresh_token: token.refresh_token,
+      expires_at: Math.floor(Date.now() / 1000) + token.expires_in
+    });
     saveConfig(cfg);
     return { cfg, authTab: result.server };
   } catch (err) {
@@ -12042,9 +12056,11 @@ async function stepWebOnboarding(cfg, onboardingRunID, authTab) {
       s.stop("Could not open a browser");
       return false;
     }
-    cfg.access_token = result.token.access_token;
-    cfg.refresh_token = result.token.refresh_token;
-    cfg.expires_at = Math.floor(Date.now() / 1000) + result.token.expires_in;
+    replaceLoginSession(cfg, {
+      access_token: result.token.access_token,
+      refresh_token: result.token.refresh_token,
+      expires_at: Math.floor(Date.now() / 1000) + result.token.expires_in
+    });
     saveConfig(cfg);
     s.stop("Onboarding finished in the browser");
     logger.info("setup", "Web onboarding handoff completed");
@@ -12100,6 +12116,17 @@ async function resolveOnboardingTargetOrg(trpc) {
   }
   return accessibleOrgs[0] ?? null;
 }
+async function resolveCurrentOnboardingTargetOrg(cfg) {
+  try {
+    const { createTypedClient: createTypedClient2 } = await Promise.resolve().then(() => (init_trpc(), exports_trpc));
+    return await resolveOnboardingTargetOrg(createTypedClient2(cfg));
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    logger.error("setup", `Failed to resolve post-onboarding organization: ${msg}`);
+    log.error(`Could not determine your onboarding organization: ${msg}`);
+    return null;
+  }
+}
 async function bindOnboardingDeployment(apiClient, cfg, targetOrg) {
   if (!targetOrg) {
     log.error("Could not determine your onboarding organization.");
@@ -12723,9 +12750,11 @@ async function handleAuthenticate(cfg) {
     }
     const token = result.token;
     s.stop("Authenticated");
-    cfg.access_token = token.access_token;
-    cfg.refresh_token = token.refresh_token;
-    cfg.expires_at = Math.floor(Date.now() / 1000) + token.expires_in;
+    replaceLoginSession(cfg, {
+      access_token: token.access_token,
+      refresh_token: token.refresh_token,
+      expires_at: Math.floor(Date.now() / 1000) + token.expires_in
+    });
     saveConfig(cfg);
   } catch (err) {
     const { OAuthCallbackError: OAuthCallbackError2 } = await Promise.resolve().then(() => (init_errors(), exports_errors));
@@ -12892,9 +12921,11 @@ async function runLoginCheck(opts) {
   }
   if (result.status === "authenticated") {
     const cfg = loadConfig();
-    cfg.access_token = result.access_token ?? "";
-    cfg.refresh_token = result.refresh_token ?? "";
-    cfg.expires_at = Math.floor(Date.now() / 1000) + (result.expires_in ?? 3600);
+    replaceLoginSession(cfg, {
+      access_token: result.access_token ?? "",
+      refresh_token: result.refresh_token ?? "",
+      expires_at: Math.floor(Date.now() / 1000) + (result.expires_in ?? 3600)
+    });
     saveConfig(cfg);
     logger.info("auth.ticket", "Ticket redeemed via dosu login --check");
     if (opts.json) {
@@ -13085,9 +13116,11 @@ async function redeemTicket(ticket, cfg) {
       });
       return { code: 0, cfg, exit: true };
     }
-    cfg.access_token = result.access_token ?? "";
-    cfg.refresh_token = result.refresh_token ?? "";
-    cfg.expires_at = Math.floor(Date.now() / 1000) + (result.expires_in ?? 3600);
+    replaceLoginSession(cfg, {
+      access_token: result.access_token ?? "",
+      refresh_token: result.refresh_token ?? "",
+      expires_at: Math.floor(Date.now() / 1000) + (result.expires_in ?? 3600)
+    });
     saveConfig(cfg);
     logger.info("agent.flow", "Ticket redeemed; session saved");
     emitStep({ step: "auth", email: result.email });
@@ -16291,9 +16324,11 @@ Run 'dosu --help' to see available commands.`;
         token = result.token;
       }
     }
-    cfg.access_token = token.access_token;
-    cfg.refresh_token = token.refresh_token;
-    cfg.expires_at = Math.floor(Date.now() / 1000) + token.expires_in;
+    replaceLoginSession(cfg, {
+      access_token: token.access_token,
+      refresh_token: token.refresh_token,
+      expires_at: Math.floor(Date.now() / 1000) + token.expires_in
+    });
     saveConfig(cfg);
     console.log("Successfully authenticated!");
     console.log(`Credentials saved to ${getConfigPath()}`);

package/package.json

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