@vendian/cli 0.0.39 → 0.0.41

package/cli-wrapper.mjs

@@ -43,7 +43,9 @@ __export(auth_exports, {
   buildWindowsOpenCommand: () => buildWindowsOpenCommand,
   cloudAuthStatus: () => cloudAuthStatus,
   cloudConfigPath: () => cloudConfigPath,
+  defaultOAuthRedirectUri: () => defaultOAuthRedirectUri,
   fetchPackageCredentials: () => fetchPackageCredentials,
+  formatOAuthError: () => formatOAuthError,
   loadCloudConfig: () => loadCloudConfig,
   loginWithVendianOAuth: () => loginWithVendianOAuth,
   resolveApiUrl: () => resolveApiUrl,
@@ -91,6 +93,11 @@ async function loginWithVendianOAuth({ backend, apiUrl, noBrowser = false, env =
       clerkToken
     });
     return { apiUrl: resolvedApiUrl, ...exchange };
+  } catch (error) {
+    throw new Error(formatOAuthError(error, {
+      apiUrl: resolvedApiUrl,
+      redirectUri: callback.redirectUri
+    }), { cause: error });
   } finally {
     await callback.close();
   }
@@ -175,6 +182,16 @@ function activateCloudProfile({ backend, apiUrl, env = process.env, platform = p
     profiles
   };
 }
+function defaultOAuthRedirectUri(env = process.env) {
+  const port = Number(env.VENDIAN_CLI_OAUTH_REDIRECT_PORT || DEFAULT_OAUTH_REDIRECT_PORT);
+  return `http://127.0.0.1:${port}/callback`;
+}
+function formatOAuthError(error, { apiUrl, redirectUri } = {}) {
+  const message = error && typeof error.message === "string" ? error.message : String(error || "OAuth login failed");
+  const hint = oauthRedirectHint(message, { apiUrl, redirectUri });
+  return hint ? `${message}
+${hint}` : message;
+}
 async function getOAuthConfig(apiUrl, redirectUri) {
   const url = new URL(`${apiUrl}/api/v1/cli/auth/oauth/config`);
   url.searchParams.set("redirectUri", redirectUri);
@@ -256,6 +273,7 @@ async function createCallbackServer(env) {
       const code = url.searchParams.get("code");
       const state = url.searchParams.get("state");
       const error = url.searchParams.get("error");
+      const errorDescription = url.searchParams.get("error_description");
       const body = code ? "Vendian CLI authentication complete. You can close this window." : "Vendian CLI authentication failed. Return to the terminal.";
       res.writeHead(code ? 200 : 400, {
         "Content-Type": "text/plain; charset=utf-8",
@@ -268,7 +286,8 @@ async function createCallbackServer(env) {
       }
       settled = true;
       if (error) {
-        reject(new Error(`OAuth login failed: ${error}`));
+        const details = errorDescription ? `${error} (${errorDescription})` : error;
+        reject(new Error(`OAuth login failed: ${details}`));
         return;
       }
       if (!code) {
@@ -290,6 +309,18 @@ async function createCallbackServer(env) {
     close: () => new Promise((resolve) => server.close(resolve))
   };
 }
+function oauthRedirectHint(message, { apiUrl, redirectUri } = {}) {
+  if (!redirectUri) {
+    return "";
+  }
+  const lower = String(message || "").toLowerCase();
+  const looksLikeRedirectMismatch = lower.includes("redirect_uri") || lower.includes("pre-registered redirect") || lower.includes("oauth login timed out before callback completed") || lower.includes("oauth callback did not include an authorization code");
+  if (!looksLikeRedirectMismatch) {
+    return "";
+  }
+  const target = apiUrl || "this backend";
+  return `If Clerk rejected the CLI callback for ${target}, add this redirect URL in Clerk: ${redirectUri}`;
+}
 function openBrowser(url) {
   const platform = process.platform;
   if (platform === "win32") {
@@ -491,6 +522,29 @@ function spawnForward(command, args, options = {}) {
     });
   });
 }
+function childProcessIsRunning(child) {
+  return Boolean(child) && child.exitCode == null && child.signalCode == null;
+}
+function killProcessTree(child, {
+  platform = process.platform,
+  signal = "SIGTERM",
+  spawnSyncFn = spawnSync
+} = {}) {
+  if (!childProcessIsRunning(child)) return false;
+  if (platform === "win32") {
+    try {
+      spawnSyncFn("taskkill", ["/F", "/T", "/PID", String(child.pid)], { stdio: "ignore" });
+    } catch {
+    }
+    return true;
+  }
+  try {
+    child.kill(signal);
+    return true;
+  } catch {
+    return false;
+  }
+}
 
 // src/python.js
 import fs2 from "node:fs";
@@ -2381,7 +2435,7 @@ function buildLocalServeEventStreamArgs({ agentsDir: agentsDir2 = "./agents", co
 }
 
 // src/version.js
-var CLI_VERSION = true ? "0.0.39" : process.env.npm_package_version || "0.0.0-dev";
+var CLI_VERSION = true ? "0.0.41" : process.env.npm_package_version || "0.0.0-dev";
 
 // src/dev-server.js
 var __dirname = path8.dirname(fileURLToPath(import.meta.url));
@@ -2440,8 +2494,8 @@ async function startDevServer({
 }
 function shutdown(server) {
   console.log("\n  \x1B[90mShutting down...\x1B[0m");
-  if (serveChild && !serveChild.killed) {
-    serveChild.kill("SIGTERM");
+  if (childProcessIsRunning(serveChild)) {
+    killProcessTree(serveChild, { signal: "SIGTERM" });
   }
   server.close();
   process.exit(0);
@@ -2530,7 +2584,7 @@ async function handleApi(req, res, pathname, parsed) {
   }
 }
 function apiStatus(req, res) {
-  const serving = serveChild !== null && !serveChild.killed;
+  const serving = childProcessIsRunning(serveChild);
   jsonResponse(res, {
     serving,
     agentsDir,
@@ -2544,7 +2598,7 @@ function apiStatus(req, res) {
   });
 }
 function apiServeState(req, res) {
-  const serving = serveChild !== null && !serveChild.killed;
+  const serving = childProcessIsRunning(serveChild);
   const agentStatuses = serveState.agents.map((agent) => {
     const relPath = agent.relativePath || ".";
     const runtime = agentRuntimeStatus(agent, serveState.agentRunState);
@@ -2718,7 +2772,7 @@ function devServerStateAfterServeStart(current = {}, target = {}) {
   };
 }
 async function apiServeStart(req, res, body) {
-  if (serveChild && !serveChild.killed) {
+  if (childProcessIsRunning(serveChild)) {
     return jsonResponse(res, { ok: false, error: "Already serving" });
   }
   const target = resolveServeStartTarget(body, { agentsDir, collectionId });
@@ -2790,14 +2844,15 @@ async function apiServeStart(req, res, body) {
   }
 }
 function apiServeStop(req, res) {
-  if (!serveChild || serveChild.killed) {
+  if (!childProcessIsRunning(serveChild)) {
     activeServeAgentsDir = "";
     return jsonResponse(res, { ok: true, wasRunning: false });
   }
-  serveChild.kill("SIGTERM");
+  const stoppingChild = serveChild;
+  killProcessTree(stoppingChild, { signal: "SIGTERM" });
   setTimeout(() => {
-    if (serveChild && !serveChild.killed) {
-      serveChild.kill("SIGKILL");
+    if (childProcessIsRunning(stoppingChild)) {
+      killProcessTree(stoppingChild, { signal: "SIGKILL" });
     }
   }, 3e3);
   jsonResponse(res, { ok: true, wasRunning: true });
@@ -2974,7 +3029,6 @@ function openUrl(url) {
 // src/tui.js
 init_constants();
 init_auth();
-import { spawnSync as spawnSync4 } from "node:child_process";
 import fs12 from "node:fs";
 import path9 from "node:path";
 import readline from "node:readline";
@@ -3685,7 +3739,7 @@ async function runServeDashboard({ env, platform, agentsDir: agentsDir2, collect
         stopSignalAttempt += 1;
         const signal = stopSignalForAttempt(stopSignalAttempt);
         if (process.platform === "win32") {
-          killProcessTree(child);
+          killProcessTree2(child);
         } else {
           try {
             child.kill(signal);
@@ -3707,7 +3761,7 @@ async function runServeDashboard({ env, platform, agentsDir: agentsDir2, collect
       clearTimeout(ctrlCArmTimer);
       ctrlCArmed = false;
       if (process.platform === "win32") {
-        killProcessTree(child);
+        killProcessTree2(child);
       } else {
         try {
           child.kill(stopSignalForAttempt(stopSignalAttempt));
@@ -3721,9 +3775,13 @@ async function runServeDashboard({ env, platform, agentsDir: agentsDir2, collect
         if (!key) return;
         if (key.ctrl && key.name === "c") {
           if (ctrlCArmed) {
-            try {
-              child?.kill("SIGINT");
-            } catch (error) {
+            if (process.platform === "win32") {
+              killProcessTree2(child);
+            } else {
+              try {
+                child?.kill("SIGINT");
+              } catch (error) {
+              }
             }
             finish("exit");
             return;
@@ -3962,19 +4020,8 @@ function stopSignalForAttempt(attempt = 0) {
   if (attempt === 1) return "SIGTERM";
   return "SIGKILL";
 }
-function killProcessTree(child) {
-  if (!child || child.exitCode != null || child.signalCode != null) return;
-  if (process.platform === "win32") {
-    try {
-      spawnSync4("taskkill", ["/F", "/T", "/PID", String(child.pid)], { stdio: "ignore" });
-    } catch {
-    }
-  } else {
-    try {
-      child.kill("SIGTERM");
-    } catch {
-    }
-  }
+function killProcessTree2(child) {
+  killProcessTree(child, { signal: "SIGTERM" });
 }
 function helpText() {
   return [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vendian/cli",
-  "version": "0.0.39",
+  "version": "0.0.41",
   "description": "Public Vendian CLI bootstrapper and launcher",
   "license": "UNLICENSED",
   "private": false,