@vendian/cli 0.0.25 → 0.0.27

package/cli-wrapper.mjs

@@ -1107,7 +1107,7 @@ import path8 from "node:path";
 import readlinePromises from "node:readline/promises";
 
 // src/version.js
-var CLI_VERSION = true ? "0.0.25" : process.env.npm_package_version || "0.0.0-dev";
+var CLI_VERSION = true ? "0.0.27" : process.env.npm_package_version || "0.0.0-dev";
 
 // src/npm-update.js
 var NPM_CHECK_INTERVAL_MS = 30 * 60 * 1e3;
@@ -2588,17 +2588,10 @@ async function showConnect({ env, platform }) {
     }
     const ep = ENDPOINTS[resp.selectedIndex];
     term("\n");
-    term.gray(`  Connecting to ${ep.label}\u2026
-`);
-    try {
-      await switchOrLoginEndpoint({ backend: ep.key, env, platform });
-      term.green(`  ${fig.check} Signed in to ${ep.label} successfully
-`);
-    } catch (error) {
-      term.red(`  ${endpointErrorStatus(error)}
-`);
+    const outcome = await connectEndpointInteractive({ backend: ep.key, label: ep.label, env, platform });
+    if (outcome.promptedInTui) {
+      await pressEnterToContinue();
     }
-    await pressEnterToContinue({ grabActive: false });
   }
 }
 async function connectCustomUrl({ env, platform }) {
@@ -2611,15 +2604,10 @@ async function connectCustomUrl({ env, platform }) {
   if (!url) return;
   term("\n\n");
   term.gray("  Connecting\u2026\n");
-  try {
-    await switchOrLoginEndpoint({ apiUrl: url, env, platform });
-    term.green(`  ${fig.check} Connected successfully
-`);
-  } catch (error) {
-    term.red(`  ${endpointErrorStatus(error)}
-`);
+  const outcome = await connectEndpointInteractive({ apiUrl: url, label: url, env, platform, successLabel: "Connected successfully" });
+  if (outcome.promptedInTui) {
+    await pressEnterToContinue();
   }
-  await pressEnterToContinue({ grabActive: false });
 }
 async function showCreate({ env, platform }) {
   term.clear();
@@ -2823,6 +2811,8 @@ async function runServeDashboard({ env, platform, agentsDir, collectionId }) {
   let overlayActive = false;
   let ctrlCArmed = false;
   let ctrlCArmTimer = null;
+  let dashboardClosed = false;
+  let exitPromptActive = false;
   let selectedIdx = 0;
   const agentRowMap = /* @__PURE__ */ new Map();
   function agentDisplayList() {
@@ -2850,7 +2840,7 @@ async function runServeDashboard({ env, platform, agentsDir, collectionId }) {
     return serveDebugEntries(state.logs, maxLines);
   }
   function redraw() {
-    if (overlayActive) return;
+    if (dashboardClosed || overlayActive) return;
     drawHeader({ env, platform, serveState: state });
     term.moveTo(1, SERVE_CONTENT_ROW);
     term.eraseDisplayBelow();
@@ -3022,6 +3012,7 @@ async function runServeDashboard({ env, platform, agentsDir, collectionId }) {
       env,
       platform,
       onProgress: (msg) => {
+        if (dashboardClosed) return;
         state = { ...state, activity: msg || "Preparing\u2026" };
         redraw();
       }
@@ -3031,10 +3022,12 @@ async function runServeDashboard({ env, platform, agentsDir, collectionId }) {
     attachServeChild(
       child,
       (updater) => {
+        if (dashboardClosed) return;
         state = updater(state);
         redraw();
       },
       ({ message } = {}) => {
+        if (dashboardClosed) return;
         if (!state.stopped) state = { ...state, stopped: true, activity: message || "Stopped" };
         redraw();
       },
@@ -3046,23 +3039,39 @@ async function runServeDashboard({ env, platform, agentsDir, collectionId }) {
   }
   return new Promise((resolve) => {
     function openAgentLog(idx) {
-      if (idx < 0 || idx >= state.agents.length) return;
+      if (dashboardClosed || exitPromptActive || idx < 0 || idx >= state.agents.length) return;
       overlayActive = true;
       const ag = agentDisplayList()[idx];
       showAgentLog({ agent: ag, state, env, platform }).then(() => {
+        if (dashboardClosed) return;
         overlayActive = false;
         term.clear();
         redraw();
       });
     }
+    function clearCtrlCArm() {
+      ctrlCArmed = false;
+      if (ctrlCArmTimer) {
+        clearTimeout(ctrlCArmTimer);
+        ctrlCArmTimer = null;
+      }
+    }
+    function detachDashboardHandlers() {
+      term.off("key", handleKey);
+      term.off("mouse", handleMouse);
+    }
+    function finish(next) {
+      if (dashboardClosed) return;
+      dashboardClosed = true;
+      clearCtrlCArm();
+      detachDashboardHandlers();
+      resolve(next);
+    }
     function handleKey(name) {
       if (name === "CTRL_C") {
         if (ctrlCArmed) {
-          clearTimeout(ctrlCArmTimer);
           child?.kill("SIGINT");
-          term.off("key", handleKey);
-          term.off("mouse", handleMouse);
-          resolve("exit");
+          finish("exit");
           return;
         }
         ctrlCArmed = true;
@@ -3089,9 +3098,7 @@ async function runServeDashboard({ env, platform, agentsDir, collectionId }) {
         openAgentLog(selectedIdx);
       } else if (name === "s" || name === "S") {
         child?.kill("SIGINT");
-        term.off("key", handleKey);
-        term.off("mouse", handleMouse);
-        resolve("home");
+        finish("home");
       }
     }
     function handleMouse(name, data) {
@@ -3112,16 +3119,13 @@ async function runServeDashboard({ env, platform, agentsDir, collectionId }) {
     if (child) {
       child.once("exit", () => {
         setTimeout(() => {
-          if (!overlayActive) {
-            redraw();
-            term("\n");
-            term.gray("  Your agents have stopped. Press any key to go back\u2026");
-            term.once("key", () => {
-              term.off("key", handleKey);
-              term.off("mouse", handleMouse);
-              resolve("home");
-            });
-          }
+          if (dashboardClosed || overlayActive) return;
+          exitPromptActive = true;
+          detachDashboardHandlers();
+          redraw();
+          term("\n");
+          term.gray("  Your agents have stopped. Press any key to go back\u2026");
+          term.once("key", () => finish("home"));
         }, 600);
       });
     }
@@ -3461,6 +3465,36 @@ async function switchOrLoginEndpoint({
   await setupFn({ backend, apiUrl, forceAuth: true, env, platform });
   return { apiUrl: status.apiUrl, reused: false, activated: true };
 }
+async function connectEndpointInteractive({
+  backend,
+  apiUrl,
+  label,
+  env = process.env,
+  platform = process.platform,
+  setupFn = setup,
+  activateFn = activateCloudProfile,
+  successLabel
+} = {}) {
+  const status = cloudAuthStatus({ backend, apiUrl, env, platform });
+  const destination = label || envLabel(status.apiUrl);
+  if (status.authenticated) {
+    term.gray(`  Connecting to ${destination}\u2026
+`);
+    try {
+      await switchOrLoginEndpoint({ backend, apiUrl, env, platform, setupFn, activateFn });
+      term.green(`  ${fig.check} ${successLabel || `Signed in to ${destination} successfully`}
+`);
+    } catch (error) {
+      term.red(`  ${endpointErrorStatus(error)}
+`);
+    }
+    return { promptedInTui: true };
+  }
+  await withOutputMode(`Connecting to ${destination}`, async () => {
+    await switchOrLoginEndpoint({ backend, apiUrl, env, platform, setupFn, activateFn });
+  });
+  return { promptedInTui: false };
+}
 function endpointErrorStatus(error) {
   const message = error && typeof error.message === "string" ? error.message : String(error || "Connection failed");
   return `${fig.cross} ${message}`;

package/package.json

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