npm - @dosu/cli - Versions diffs - 0.13.0 → 0.13.2 - Mend

@dosu/cli 0.13.0 → 0.13.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (2) hide show

package/bin/dosu.js +133 -9
package/package.json +1 -1

package/bin/dosu.js CHANGED Viewed

@@ -4341,7 +4341,7 @@ function getSupabaseAnonKey() {
 function getVersionString() {
   return `v${VERSION}`;
 }
-var VERSION = "0.13.0";
+var VERSION = "0.13.2";
 // src/debug/logger.ts
 import {
@@ -8659,15 +8659,16 @@ async function createDeploymentForRepo(trpc, orgID, spaceID, repo) {
       await deleteOrphanDeployment(trpc, deployment.deployment_id, repo.slug);
       return null;
     }
-    await trpc.dataSource.syncDataSource.mutate(dataSource.data_source_id);
+    const dataSourceID = dataSource.data_source_id;
+    await trpc.dataSource.syncDataSource.mutate(dataSourceID);
     const spaceDeployments = await trpc.workspaces.listForSpace.query(spaceID);
     await Promise.all(spaceDeployments.map((d3) => trpc.deploymentDataSource.create.mutate({
       deployment_id: d3.deployment_id,
-      data_source_id: dataSource.data_source_id
+      data_source_id: dataSourceID
     })));
     return {
       deployment_id: deployment.deployment_id,
-      data_source_id: dataSource.data_source_id
+      data_source_id: dataSourceID
     };
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
@@ -9473,7 +9474,85 @@ var init_github_doc_import_step = __esm(() => {
   init_github_doc_import_prompt();
 });
+// src/auth/errors.ts
+var exports_errors = {};
+__export(exports_errors, {
+  OAuthCallbackError: () => OAuthCallbackError
+});
+var OAuthCallbackError;
+var init_errors = __esm(() => {
+  OAuthCallbackError = class OAuthCallbackError extends Error {
+    error;
+    errorCode;
+    errorDescription;
+    constructor(message, details = {}) {
+      super(message);
+      this.name = "OAuthCallbackError";
+      this.error = details.error;
+      this.errorCode = details.errorCode;
+      this.errorDescription = details.errorDescription;
+    }
+    get userMessage() {
+      const desc = this.errorDescription ?? this.message;
+      if (this.errorCode === "bad_oauth_state" || /state/i.test(desc)) {
+        return `Authentication failed: ${desc}. Run \`dosu login\` again.`;
+      }
+      return `Authentication failed: ${desc}`;
+    }
+  };
+});
 // src/auth/server.ts
+function escapeHtml(value) {
+  return value.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#39;");
+}
+function buildErrorHtml(message) {
+  const safe = escapeHtml(message);
+  return `<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="UTF-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<title>Dosu CLI - Authentication Failed</title>
+<style>
+* { margin: 0; padding: 0; box-sizing: border-box; }
+body {
+    font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
+    background: #fafafa;
+    color: #171717;
+    min-height: 100vh;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 20px;
+}
+.container {
+    max-width: 480px;
+    width: 100%;
+    text-align: center;
+    background: white;
+    border: 1px solid #e5e7eb;
+    border-radius: 12px;
+    padding: 40px 32px;
+    box-shadow: 0 1px 3px rgba(0, 0, 0, 0.05);
+}
+h1 { font-size: 20px; font-weight: 600; color: #b91c1c; margin-bottom: 12px; }
+p { font-size: 14px; color: #4b5563; line-height: 1.5; }
+.detail { margin-top: 16px; padding: 12px; background: #fef2f2; border-radius: 8px; color: #991b1b; font-size: 13px; }
+.next { margin-top: 20px; color: #6b7280; font-size: 13px; }
+code { font-family: ui-monospace, SFMono-Regular, Menlo, monospace; background: #f3f4f6; padding: 2px 6px; border-radius: 4px; color: #111827; }
+</style>
+</head>
+<body>
+<div class="container">
+    <h1>Authentication Failed</h1>
+    <p>The OAuth flow could not be completed.</p>
+    <div class="detail">${safe}</div>
+    <p class="next">You can close this tab. In your terminal, run <code>dosu login</code> again.</p>
+</div>
+</body>
+</html>`;
+}
 function buildSuccessHtml(email) {
   const emailLine = email ? `<p class="email">Signed in as <strong>${email.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;")}</strong></p>` : "";
   return `<!DOCTYPE html>
@@ -9597,8 +9676,10 @@ h1 {
 }
 async function startCallbackServer() {
   let resolveToken;
-  const tokenPromise = new Promise((resolve) => {
+  let rejectToken;
+  const tokenPromise = new Promise((resolve, reject) => {
     resolveToken = resolve;
+    rejectToken = reject;
   });
   const http = __require("node:http");
   const httpServer = http.createServer((req, res) => {
@@ -9612,6 +9693,22 @@ async function startCallbackServer() {
       res.end("Not Found");
       return;
     }
+    const errorParam = url.searchParams.get("error");
+    const errorCodeParam = url.searchParams.get("error_code");
+    const errorDescriptionParam = url.searchParams.get("error_description");
+    if (errorParam || errorCodeParam || errorDescriptionParam) {
+      const rawDescription = errorDescriptionParam ?? errorCodeParam ?? errorParam ?? "OAuth authentication failed";
+      const sanitized = rawDescription.replace(/<[^>]*>/g, "");
+      logger.warn("auth.server", `OAuth callback received error: code=${errorCodeParam ?? "n/a"} description=${sanitized}`);
+      rejectToken?.(new OAuthCallbackError(sanitized, {
+        error: errorParam ?? undefined,
+        errorCode: errorCodeParam ?? undefined,
+        errorDescription: sanitized
+      }));
+      res.writeHead(200, { "Content-Type": "text/html" });
+      res.end(buildErrorHtml(rawDescription));
+      return;
+    }
     const accessToken = url.searchParams.get("access_token");
     const refreshToken = url.searchParams.get("refresh_token");
     const expiresIn = url.searchParams.get("expires_in");
@@ -9719,6 +9816,7 @@ if (hash) {
 </html>`;
 var init_server = __esm(() => {
   init_logger();
+  init_errors();
 });
 // src/auth/flow.ts
@@ -9739,9 +9837,9 @@ async function startOAuthFlow(signal, path2 = "/cli/auth", params = {}) {
     logger.info("auth.flow", "Browser open command executed");
     const timeout = new Promise((_3, reject) => {
       timeoutId = setTimeout(() => {
-        logger.warn("auth.flow", "Authentication timed out (15min)");
-        reject(new Error("authentication timeout - please try again"));
-      }, 900000);
+        logger.warn("auth.flow", "Authentication timed out (8min)");
+        reject(new Error("Authentication did not complete within 8 minutes. The OAuth state may have expired — please run `dosu login` again."));
+      }, 480000);
     });
     const abort = signal ? new Promise((_3, reject) => {
       signal.addEventListener("abort", () => {
@@ -10106,6 +10204,16 @@ async function openBrowserForSetup(cfg, onboardingRunID) {
   } catch (err) {
     const msg = err instanceof Error ? err.stack ?? err.message : String(err);
     logger.error("setup", `Auth failed: ${msg}`);
+    const { OAuthCallbackError: OAuthCallbackError2 } = await Promise.resolve().then(() => (init_errors(), exports_errors));
+    if (err instanceof OAuthCallbackError2) {
+      M2.error(err.userMessage);
+      if (onboardingRunID) {
+        await trackCliOnboardingPreAuthEvent(onboardingRunID, "cli_onboarding_auth_failed", {
+          reason: err.errorCode ?? err.errorDescription ?? "oauth_callback_error"
+        });
+      }
+      return null;
+    }
     M2.error(`Authentication failed: ${err instanceof Error ? err.message : String(err)}`);
     if (onboardingRunID) {
       await trackCliOnboardingPreAuthEvent(onboardingRunID, "cli_onboarding_auth_failed", {
@@ -10791,6 +10899,11 @@ async function handleAuthenticate(cfg) {
     cfg.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));
+    if (err instanceof OAuthCallbackError2) {
+      M2.error(err.userMessage);
+      return;
+    }
     M2.error(`Authentication failed: ${err instanceof Error ? err.message : String(err)}`);
   }
 }
@@ -12383,7 +12496,18 @@ function createProgram() {
     }
     console.log("Opening browser for authentication...");
     const { startOAuthFlow: startOAuthFlow2 } = await Promise.resolve().then(() => (init_flow(), exports_flow));
-    const token = await startOAuthFlow2();
+    const { OAuthCallbackError: OAuthCallbackError2 } = await Promise.resolve().then(() => (init_errors(), exports_errors));
+    let token;
+    try {
+      token = await startOAuthFlow2();
+    } catch (err) {
+      if (err instanceof OAuthCallbackError2) {
+        console.error(err.userMessage);
+        process.exitCode = 1;
+        return;
+      }
+      throw err;
+    }
     cfg.access_token = token.access_token;
     cfg.refresh_token = token.refresh_token;
     cfg.expires_at = Math.floor(Date.now() / 1000) + token.expires_in;

package/package.json CHANGED Viewed

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