@vendian/cli 0.0.19 → 0.0.21

package/cli-wrapper.mjs

@@ -35807,11 +35807,12 @@ function runCapture(command, args, options = {}) {
     shell: false,
     ...options
   });
+  const errorMessage3 = result.error && typeof result.error.message === "string" ? result.error.message : "";
   return {
-    ok: result.status === 0,
+    ok: !result.error && result.status === 0,
     status: result.status ?? 1,
     stdout: result.stdout || "",
-    stderr: result.stderr || ""
+    stderr: result.stderr || errorMessage3
   };
 }
 function runInherit(command, args, options = {}) {
@@ -35916,10 +35917,12 @@ function verifyVendianImports(pythonPath) {
 import { spawnSync as spawnSync2 } from "node:child_process";
 var SERVICE = "Vendian CLI";
 var PACKAGE_TOKEN_ACCOUNT = "gitlab-package-token";
+var SECRET_STORE_TIMEOUT_MS = 5e3;
 function run(command, args, options = {}) {
   return spawnSync2(command, args, {
     encoding: "utf8",
     shell: false,
+    timeout: SECRET_STORE_TIMEOUT_MS,
     ...options
   });
 }
@@ -36675,7 +36678,12 @@ async function forwardToPythonVendian(args, { env: env3 = process.env, platform:
   recordForwardedDocsCommand(args, code, { env: env3, platform: platform2 });
   process.exitCode = code;
 }
-async function preparePythonVendianInvocation(args, { env: env3 = process.env, platform: platform2 = process.platform, onProgress = null } = {}) {
+async function preparePythonVendianInvocation(args, {
+  env: env3 = process.env,
+  platform: platform2 = process.platform,
+  onProgress = null,
+  skipAutoUpdate = false
+} = {}) {
   const venvPath = managedVenvPath(env3, platform2);
   const vendianPath = venvVendian(venvPath, platform2);
   reportProgress(onProgress, "Checking managed Python runtime");
@@ -36688,7 +36696,9 @@ async function preparePythonVendianInvocation(args, { env: env3 = process.env, p
     reportProgress(onProgress, "Refreshing package access");
   }
   const refreshed = requiresPackageAccess ? await refreshPackageAccessFromCloudAuth({ config: loadedConfig, env: env3, platform: platform2 }) : { config: loadedConfig };
-  maybeAutoUpdateManagedEnv({ env: env3, platform: platform2, venvPath, onProgress });
+  if (!skipAutoUpdate) {
+    maybeAutoUpdateManagedEnv({ env: env3, platform: platform2, venvPath, onProgress });
+  }
   const config = refreshed.config;
   reportProgress(onProgress, "Preparing package indexes");
   const registry = registryConfig(config, env3, platform2);
@@ -36794,7 +36804,7 @@ import fs12 from "node:fs";
 import readlinePromises from "node:readline/promises";
 
 // src/version.js
-var CLI_VERSION = true ? "0.0.19" : process.env.npm_package_version || "0.0.0-dev";
+var CLI_VERSION = true ? "0.0.21" : process.env.npm_package_version || "0.0.0-dev";
 
 // src/npm-update.js
 var NPM_CHECK_INTERVAL_MS = 30 * 60 * 1e3;
@@ -37002,6 +37012,34 @@ function findAgentDirectoryCandidates({
 function defaultAgentsDir(candidates = []) {
   return candidates[0]?.path || "./agents";
 }
+function findAgentFolders(root, {
+  cwd: cwd2 = process.cwd(),
+  maxDepth = 6,
+  maxDirs = 1e3,
+  limit = 100
+} = {}) {
+  const start = path6.resolve(cwd2);
+  const resolvedRoot = safeResolve(root || ".");
+  if (!resolvedRoot) {
+    return [];
+  }
+  const seen = /* @__PURE__ */ new Set();
+  const folders = [];
+  for (const manifest of findManifestFiles(resolvedRoot, { maxDepth, maxDirs, limit })) {
+    const folder = path6.dirname(manifest);
+    const resolved = safeResolve(folder);
+    if (!resolved || seen.has(resolved)) {
+      continue;
+    }
+    seen.add(resolved);
+    folders.push({
+      path: displayPath(resolved, start),
+      absolutePath: resolved,
+      name: path6.basename(resolved) || displayPath(resolved, start)
+    });
+  }
+  return folders.sort((a, b) => a.path.localeCompare(b.path)).slice(0, limit);
+}
 function countAgentManifests(root, { maxDepth = 6, maxDirs = 1e3, limit = 100 } = {}) {
   let count = 0;
   for (const _manifest of findManifestFiles(root, { maxDepth, maxDirs, limit })) {
@@ -37730,10 +37768,12 @@ function reconcileInventoryRunState(agentRunState, agents, timestamp) {
         disabledReason: stringValue(agent.disabledReason || "System dependency not met locally"),
         resolutionHints: Array.isArray(agent.resolutionHints) ? agent.resolutionHints : []
       });
-    } else if (agent?.status === "online" && (current?.status === "error" || current?.status === "disabled") && !current?.runId) {
+    } else if (agent?.status === "online" && ["preparing", "error", "disabled"].includes(current?.status) && !current?.runId) {
       next = setAgentRunState(next, path8, {
         status: "ready",
         lastEventAt: timestamp || (/* @__PURE__ */ new Date()).toISOString(),
+        progressMessage: null,
+        progressStage: null,
         errorMessage: null,
         disabledReason: null,
         resolutionHints: null
@@ -37957,10 +37997,21 @@ async function listCloudWorkspaces({
   env: env3 = process.env,
   platform: platform2 = process.platform,
   prepareInvocation = preparePythonVendianInvocation,
-  run: run2 = runCapture
+  run: run2 = runCapture,
+  onProgress = null,
+  timeoutMs = 2e4
 } = {}) {
-  const invocation = await prepareInvocation(["cloud", "collections", "list", "--json"], { env: env3, platform: platform2 });
-  const result = run2(invocation.command, invocation.args, { env: invocation.env });
+  const progress = typeof onProgress === "function" ? onProgress : () => {
+  };
+  progress("Checking managed Python runtime");
+  const invocation = await prepareInvocation(["cloud", "collections", "list", "--json"], {
+    env: env3,
+    platform: platform2,
+    onProgress: progress,
+    skipAutoUpdate: true
+  });
+  progress("Loading workspaces from Vendian");
+  const result = run2(invocation.command, invocation.args, { env: invocation.env, timeout: timeoutMs });
   if (!result.ok) {
     return {
       ok: false,
@@ -38565,6 +38616,7 @@ function ServeScreen({ env: env3, platform: platform2, input, onBack, onState, o
   const [selectingDir, setSelectingDir] = useState5(() => agentDirCandidates.length > 0);
   const [workspaceChoices, setWorkspaceChoices] = useState5([]);
   const [pendingAgentsDir, setPendingAgentsDir] = useState5("");
+  const [serveScopeChoice, setServeScopeChoice] = useState5(null);
   const [loadingWorkspaces, setLoadingWorkspaces] = useState5(false);
   const [started, setStarted] = useState5(false);
   const [state, setState] = useState5(initialServeState());
@@ -38705,7 +38757,13 @@ function ServeScreen({ env: env3, platform: platform2, input, onBack, onState, o
     setStartupError("");
     setLoadingWorkspaces(true);
     try {
-      const result = await listCloudWorkspaces({ env: env3, platform: platform2 });
+      const result = await listCloudWorkspaces({
+        env: env3,
+        platform: platform2,
+        onProgress: (message) => {
+          setState((current) => ({ ...current, activity: message || "Loading workspaces" }));
+        }
+      });
       if (!result.ok) {
         setStartupError(result.error || "Could not list workspaces.");
         return;
@@ -38721,7 +38779,68 @@ function ServeScreen({ env: env3, platform: platform2, input, onBack, onState, o
       setLoadingWorkspaces(false);
     }
   }
+  function chooseServeScope(candidate) {
+    if (!candidate || candidate.value === "__custom__" || candidate.value === "__back__") {
+      return candidate?.value;
+    }
+    return chooseServePath(candidate.path, {
+      absolutePath: candidate.absolutePath,
+      agentCount: candidate.agentCount
+    });
+  }
+  function chooseServePath(selectedPath, { absolutePath = selectedPath, agentCount = null } = {}) {
+    const normalizedPath = selectedPath || "./agents";
+    if (agentCount !== null && Number(agentCount || 0) <= 1) {
+      chooseWorkspaceThenStart(normalizedPath);
+      return "started";
+    }
+    const folders = findAgentFolders(absolutePath || normalizedPath);
+    if (folders.length <= 1) {
+      chooseWorkspaceThenStart(normalizedPath);
+      return "started";
+    }
+    setServeScopeChoice({
+      rootPath: normalizedPath,
+      agentCount: agentCount ?? folders.length,
+      folders
+    });
+    return "scope";
+  }
   if (!started) {
+    if (serveScopeChoice) {
+      const scopeItems = [
+        {
+          label: `All agents in ${serveScopeChoice.rootPath} (${serveScopeChoice.agentCount} agents)`,
+          value: serveScopeChoice.rootPath
+        },
+        ...serveScopeChoice.folders.map((folder) => ({
+          label: `One: ${folder.path}`,
+          value: folder.path
+        })),
+        { label: "Back", value: "__back__" }
+      ];
+      return h(
+        Box2,
+        { flexDirection: "column" },
+        h(Text2, { bold: true }, "Serve one or many agents:"),
+        h(SelectInput2, {
+          items: scopeItems,
+          onSelect: (item) => {
+            if (item.value === "__back__") {
+              setServeScopeChoice(null);
+              return;
+            }
+            chooseWorkspaceThenStart(item.value);
+          }
+        }),
+        h(Text2, null, ""),
+        h(FooterBar, { items: [
+          { key: "\u2191\u2193", label: "Navigate" },
+          { key: "\u23CE", label: "Select" },
+          { key: "esc", label: "Back" }
+        ] })
+      );
+    }
     if (workspaceChoices.length > 1) {
       return h(
         Box2,
@@ -38754,7 +38873,10 @@ function ServeScreen({ env: env3, platform: platform2, input, onBack, onState, o
     const items = [
       ...agentDirCandidates.map((candidate) => ({
         label: `${candidate.path} (${candidate.agentCount} ${candidate.agentCount === 1 ? "agent" : "agents"})`,
-        value: candidate.path
+        value: candidate.path,
+        path: candidate.path,
+        absolutePath: candidate.absolutePath,
+        agentCount: candidate.agentCount
       })),
       { label: "Custom path", value: "__custom__" },
       { label: "Back", value: "__back__" }
@@ -38776,14 +38898,14 @@ function ServeScreen({ env: env3, platform: platform2, input, onBack, onState, o
             return;
           }
           setAgentsDir(item.value);
-          chooseWorkspaceThenStart(item.value);
+          chooseServeScope(item);
         }
       }),
       !selectingDir && h(TextInput2, {
         value: agentsDir,
         placeholder: "./agents",
         onChange: setAgentsDir,
-        onSubmit: (value) => chooseWorkspaceThenStart(value)
+        onSubmit: (value) => chooseServePath(value)
       }),
       loadingWorkspaces && h(
         Box2,

package/package.json

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