@vendian/cli 0.0.37 → 0.0.39

package/cli-wrapper.mjs

@@ -494,17 +494,35 @@ function spawnForward(command, args, options = {}) {
 
 // src/python.js
 import fs2 from "node:fs";
-function findPython(platform = process.platform) {
-  const candidates = platform === "win32" ? [
-    { command: "py", args: ["-3.11"] },
-    { command: "python", args: [] },
-    { command: "python3", args: [] }
-  ] : [
+function pythonCandidates(platform = process.platform) {
+  if (platform === "win32") {
+    return [
+      { command: "py", args: ["-3.11"] },
+      { command: "python", args: [] },
+      { command: "python3", args: [] }
+    ];
+  }
+  if (platform === "darwin") {
+    return [
+      { command: "/opt/homebrew/bin/python3.12", args: [] },
+      { command: "/opt/homebrew/bin/python3.11", args: [] },
+      { command: "/usr/local/bin/python3.12", args: [] },
+      { command: "/usr/local/bin/python3.11", args: [] },
+      { command: "python3.12", args: [] },
+      { command: "python3.11", args: [] },
+      { command: "python3", args: [] },
+      { command: "python", args: [] }
+    ];
+  }
+  return [
     { command: "python3.12", args: [] },
     { command: "python3.11", args: [] },
     { command: "python3", args: [] },
     { command: "python", args: [] }
   ];
+}
+function findPython(platform = process.platform) {
+  const candidates = pythonCandidates(platform);
   for (const candidate of candidates) {
     const version = runCapture(candidate.command, [
       ...candidate.args,
@@ -2363,16 +2381,18 @@ function buildLocalServeEventStreamArgs({ agentsDir: agentsDir2 = "./agents", co
 }
 
 // src/version.js
-var CLI_VERSION = true ? "0.0.37" : process.env.npm_package_version || "0.0.0-dev";
+var CLI_VERSION = true ? "0.0.39" : process.env.npm_package_version || "0.0.0-dev";
 
 // src/dev-server.js
 var __dirname = path8.dirname(fileURLToPath(import.meta.url));
+var DEV_UI_HOST = "127.0.0.1";
 var UI_DIR = fs11.existsSync(path8.join(__dirname, "dev-ui")) ? path8.join(__dirname, "dev-ui") : fs11.existsSync(path8.join(__dirname, "src", "dev-ui")) ? path8.join(__dirname, "src", "dev-ui") : path8.join(__dirname, "dev-ui");
 var serveChild = null;
 var serveState = initialServeState();
 var serveLogs = [];
 var logStore = null;
 var agentsDir = "";
+var activeServeAgentsDir = "";
 var collectionId = "";
 async function startDevServer({
   port = 3859,
@@ -2388,8 +2408,8 @@ async function startDevServer({
     agentsDir = candidates[0]?.absolutePath || path8.resolve("./agents");
   }
   const server = http2.createServer(handleRequest);
-  server.listen(port, "127.0.0.1", () => {
-    const url = `http://localhost:${port}`;
+  server.listen(port, DEV_UI_HOST, () => {
+    const url = devUiUrl(port);
     console.log("");
     console.log("  \x1B[1;36m\u26A1 Vendian Dev UI\x1B[0m");
     console.log(`  \x1B[90m${"\u2500".repeat(44)}\x1B[0m`);
@@ -2514,6 +2534,7 @@ function apiStatus(req, res) {
   jsonResponse(res, {
     serving,
     agentsDir,
+    serveAgentsDir: serving ? activeServeAgentsDir || agentsDir : "",
     collectionId,
     connected: serveState.connected,
     activity: serveState.activity,
@@ -2574,6 +2595,8 @@ function apiServeState(req, res) {
   activity.sort((a, b) => (a.timestamp || "").localeCompare(b.timestamp || ""));
   jsonResponse(res, {
     serving,
+    agentsDir,
+    serveAgentsDir: serving ? activeServeAgentsDir || agentsDir : "",
     connected: serveState.connected,
     stopped: serveState.stopped,
     activity: serveState.activity,
@@ -2679,20 +2702,43 @@ async function apiValidate(req, res, body) {
     });
   }
 }
+function resolveServeStartTarget(body = {}, current = {}) {
+  const targetDir = body.agentsDir || current.agentsDir || "";
+  const targetCollection = body.collectionId || current.collectionId || "";
+  if (!targetCollection) {
+    return { ok: false, error: "Choose a workspace before starting local serve." };
+  }
+  return { ok: true, agentsDir: targetDir, collectionId: targetCollection };
+}
+function devServerStateAfterServeStart(current = {}, target = {}) {
+  return {
+    agentsDir: current.agentsDir || "",
+    activeServeAgentsDir: target.agentsDir || current.agentsDir || "",
+    collectionId: target.collectionId || current.collectionId || ""
+  };
+}
 async function apiServeStart(req, res, body) {
   if (serveChild && !serveChild.killed) {
     return jsonResponse(res, { ok: false, error: "Already serving" });
   }
-  const targetDir = body.agentsDir || agentsDir;
-  const targetCollection = body.collectionId || collectionId;
+  const target = resolveServeStartTarget(body, { agentsDir, collectionId });
+  if (!target.ok) {
+    return jsonResponse(res, target, 400);
+  }
   try {
+    const targetDir = target.agentsDir;
+    const targetCollection = target.collectionId;
     const invocation = await preparePythonVendianInvocation(
       buildLocalServeEventStreamArgs({ agentsDir: targetDir, collectionId: targetCollection }),
       { onProgress: null }
     );
+    const nextState = devServerStateAfterServeStart({ agentsDir, collectionId }, target);
+    agentsDir = nextState.agentsDir;
+    activeServeAgentsDir = nextState.activeServeAgentsDir;
+    collectionId = nextState.collectionId;
     serveState = initialServeState();
     serveLogs = [];
-    logStore = createServeLogStore({ agentsDir: targetDir, collectionId: targetCollection });
+    logStore = createServeLogStore({ agentsDir: activeServeAgentsDir, collectionId });
     serveChild = spawn3(invocation.command, invocation.args, {
       env: invocation.env,
       stdio: ["ignore", "pipe", "pipe"],
@@ -2732,6 +2778,7 @@ async function apiServeStart(req, res, body) {
       serveState = { ...serveState, stopped: true, connected: false };
       serveLogs.push(`[process] Exited code=${code} signal=${signal || "none"}`);
       serveChild = null;
+      activeServeAgentsDir = "";
       try {
         logStore?.compact();
       } catch {
@@ -2744,6 +2791,7 @@ async function apiServeStart(req, res, body) {
 }
 function apiServeStop(req, res) {
   if (!serveChild || serveChild.killed) {
+    activeServeAgentsDir = "";
     return jsonResponse(res, { ok: true, wasRunning: false });
   }
   serveChild.kill("SIGTERM");
@@ -2913,6 +2961,9 @@ function formatDaemonEvent(event) {
       return event.type;
   }
 }
+function devUiUrl(port, host = DEV_UI_HOST) {
+  return `http://${host}:${port}`;
+}
 function openUrl(url) {
   const cmd = process.platform === "win32" ? "start" : process.platform === "darwin" ? "open" : "xdg-open";
   const args = process.platform === "win32" ? ["/c", "start", "", url] : [url];

package/dev-ui/css/app.css

@@ -148,10 +148,26 @@ body { font-family: var(--font); background: var(--bg-page); color: var(--text);
 .serve-controls { display: flex; align-items: center; gap: 12px; }
 .serve-status { display: flex; align-items: center; gap: 8px; font-size: 13px; font-weight: 500; padding: 7px 14px; border-radius: 7px; background: var(--bg-card); border: 1px solid var(--border); color: var(--text-secondary); }
 .serve-status .dot { width: 9px; height: 9px; border-radius: 50%; }
+.serve-section-head { display: flex; align-items: flex-start; justify-content: space-between; gap: 16px; margin-bottom: 10px; }
+.serve-section-title { font-size: 11px; font-weight: 700; color: var(--text-dim); text-transform: uppercase; letter-spacing: 0.5px; }
+.serve-section-desc { font-size: 12.5px; color: var(--text-secondary); margin-top: 3px; }
+.serve-section-meta { font-size: 11.5px; color: var(--text-dim); white-space: nowrap; padding-top: 1px; }
+#workspace-picker { display: grid; grid-template-columns: repeat(auto-fill, minmax(240px, 1fr)); gap: 10px; margin-bottom: 6px; }
 .serve-select-bar { display: flex; align-items: center; gap: 9px; padding: 10px 14px; border-radius: 8px; background: var(--bg-card); border: 1px solid var(--border); box-shadow: var(--shadow); margin-bottom: 14px; font-size: 13px; font-weight: 600; cursor: pointer; user-select: none; }
 .serve-select-bar:hover { background: var(--bg-hover); }
 .serve-select-bar input { width: 16px; height: 16px; accent-color: var(--accent-solid); cursor: pointer; }
 .serve-select-bar .count { margin-left: auto; font-weight: 400; color: var(--text-dim); font-size: 12px; }
+.workspace-card { background: var(--bg-card); border: 1px solid var(--border); border-radius: var(--radius-lg); padding: 14px 16px; text-align: left; cursor: pointer; transition: all var(--transition); box-shadow: var(--shadow); font: inherit; color: inherit; }
+.workspace-card:hover { border-color: var(--border-hover); transform: translateY(-1px); box-shadow: var(--shadow-lg); }
+.workspace-card.selected { border-color: var(--accent); background: var(--accent-bg); }
+.workspace-card-title-row { display: flex; align-items: flex-start; justify-content: space-between; gap: 12px; }
+.workspace-card-title { font-size: 13.5px; font-weight: 650; color: var(--text); }
+.workspace-card-slug { font-size: 11px; color: var(--text-dim); margin-top: 2px; }
+.workspace-card-id { font-size: 11px; font-family: var(--mono); color: var(--text-dim); margin-top: 10px; overflow: hidden; text-overflow: ellipsis; }
+.workspace-card-badge { font-size: 10px; font-weight: 700; padding: 3px 8px; border-radius: 4px; border: 1px solid var(--border); color: var(--text-dim); background: var(--bg-elevated); white-space: nowrap; }
+.workspace-card.selected .workspace-card-badge { color: var(--accent); border-color: var(--accent-border); background: white; }
+.workspace-empty { padding: 14px 16px; border-radius: var(--radius); background: var(--bg-card); border: 1px dashed var(--border); color: var(--text-secondary); font-size: 12.5px; }
+.workspace-empty.workspace-error { color: var(--red); border-color: var(--red-border); background: var(--red-bg); }
 .serve-folder { margin-bottom: 20px; }
 .serve-folder-title { display: flex; align-items: center; gap: 6px; margin-bottom: 8px; font-size: 10.5px; font-weight: 700; color: var(--text-dim); text-transform: uppercase; letter-spacing: 0.5px; }
 .serve-folder-title svg { width: 12px; height: 12px; opacity: 0.5; }

package/dev-ui/index.html

@@ -94,6 +94,21 @@
       </div>
 
       <div id="serve-picker-section">
+        <div class="serve-section-head">
+          <div>
+            <div class="serve-section-title">Workspace</div>
+            <div class="serve-section-desc">Choose the Vendian workspace that should own this daemon and its local runs.</div>
+          </div>
+          <div class="serve-section-meta" id="workspace-summary">Loading workspaces…</div>
+        </div>
+        <div id="workspace-picker"></div>
+
+        <div class="serve-section-head" style="margin-top:20px">
+          <div>
+            <div class="serve-section-title">Agents</div>
+            <div class="serve-section-desc">Pick which local agents this serve session should expose.</div>
+          </div>
+        </div>
         <div class="serve-select-bar" id="serve-select-bar">
           <input type="checkbox" id="cb-all" checked>
           <label for="cb-all" style="cursor:pointer">Select all</label>

package/dev-ui/js/app.js

@@ -1,7 +1,7 @@
 import { state, api } from './state.js';
 import { renderAgents } from './agents.js';
 import { populateValidateGrid, runValidateAll, triggerValidateAgent } from './validate.js';
-import { populateServePicker, toggleAll, startServe, stopServe, setServing, clearLogs } from './serve.js';
+import { populateServePicker, toggleAll, startServe, stopServe, setServing, clearLogs, loadWorkspaces } from './serve.js';
 import { loadAuth } from './settings.js';
 
 // ─── Navigation ───
@@ -20,6 +20,10 @@ window.addEventListener('navigate', (e) => {
   if (page === 'validate' && path) triggerValidateAgent(path);
 });
 
+window.addEventListener('auth-changed', () => {
+  loadWorkspaces();
+});
+
 // ─── Load agents ───
 async function loadAgents() {
   try {
@@ -92,6 +96,8 @@ document.getElementById('serve-select-bar').addEventListener('click', (e) => {
 // ─── Init ───
 loadAgents();
 loadAuth();
+loadWorkspaces();
 checkStatus();
 setInterval(checkStatus, 4000);
 setInterval(loadAgents, 8000);
+setInterval(loadWorkspaces, 15000);

package/dev-ui/js/serve.js

@@ -1,5 +1,80 @@
 import { state, api, esc, groupByFolder, formatTime } from './state.js';
 
+export async function loadWorkspaces() {
+  state.workspacesLoading = true;
+  state.workspacesError = '';
+  renderWorkspacePicker();
+  try {
+    const result = await api('/workspaces');
+    state.workspaces = Array.isArray(result.workspaces) ? result.workspaces : [];
+    const hasSelected = state.workspaces.some((workspace) => workspace.id === state.selectedWorkspaceId);
+    if (!hasSelected) {
+      state.selectedWorkspaceId = state.workspaces[0]?.id || '';
+    }
+    if (!result.ok) {
+      state.workspacesError = result.error || 'Could not load workspaces.';
+    }
+  } catch (error) {
+    state.workspaces = [];
+    state.selectedWorkspaceId = '';
+    state.workspacesError = error?.message || 'Could not load workspaces.';
+  } finally {
+    state.workspacesLoading = false;
+    renderWorkspacePicker();
+  }
+}
+
+export function renderWorkspacePicker() {
+  const container = document.getElementById('workspace-picker');
+  const summary = document.getElementById('workspace-summary');
+  if (!container || !summary) return;
+
+  if (state.workspacesLoading) {
+    summary.textContent = 'Loading workspaces…';
+    container.innerHTML = '<div class="workspace-empty">Loading workspaces from Vendian…</div>';
+    return;
+  }
+
+  if (state.workspacesError) {
+    summary.textContent = 'Workspace required';
+    container.innerHTML = `<div class="workspace-empty workspace-error">${esc(state.workspacesError)}</div>`;
+    return;
+  }
+
+  if (!state.workspaces.length) {
+    summary.textContent = 'No workspace available';
+    container.innerHTML = '<div class="workspace-empty">Sign in to a Vendian environment to load workspaces.</div>';
+    return;
+  }
+
+  const selected = state.workspaces.find((workspace) => workspace.id === state.selectedWorkspaceId) || state.workspaces[0];
+  if (selected && state.selectedWorkspaceId !== selected.id) {
+    state.selectedWorkspaceId = selected.id || '';
+  }
+  summary.textContent = `${state.workspaces.length} workspace${state.workspaces.length === 1 ? '' : 's'}`;
+  container.innerHTML = state.workspaces.map((workspace) => {
+    const selectedClass = workspace.id === state.selectedWorkspaceId ? ' selected' : '';
+    const slug = workspace.slug && workspace.slug !== workspace.name ? `<div class="workspace-card-slug">${esc(workspace.slug)}</div>` : '';
+    return `<button type="button" class="workspace-card${selectedClass}" data-workspace-id="${esc(workspace.id)}">
+      <div class="workspace-card-title-row">
+        <div>
+          <div class="workspace-card-title">${esc(workspace.name || workspace.id)}</div>
+          ${slug}
+        </div>
+        <div class="workspace-card-badge">${workspace.id === state.selectedWorkspaceId ? 'Selected' : 'Choose'}</div>
+      </div>
+      <div class="workspace-card-id">${esc(workspace.id)}</div>
+    </button>`;
+  }).join('');
+
+  container.querySelectorAll('[data-workspace-id]').forEach((button) => {
+    button.addEventListener('click', () => {
+      state.selectedWorkspaceId = button.dataset.workspaceId || '';
+      renderWorkspacePicker();
+    });
+  });
+}
+
 // ─── Picker ───
 let userSelections = null; // null = all selected (default), Set = explicit selections
 
@@ -85,8 +160,9 @@ export function getSelectedPaths() {
 // ─── Controls ───
 export async function startServe() {
   const selected = getSelectedPaths();
+  if (!state.selectedWorkspaceId) { alert('Choose a workspace before starting local serve.'); return; }
   if (!selected.length) { alert('Select at least one agent.'); return; }
-  const body = {};
+  const body = { collectionId: state.selectedWorkspaceId };
   if (selected.length < state.agents.length) {
     body.agentsDir = commonParent(selected);
   }

package/dev-ui/js/settings.js

@@ -78,7 +78,10 @@ function promptLogin(key) {
 
 async function switchBackend(key) {
   const d = await api('/auth/switch', { method: 'POST', body: JSON.stringify({ backend: key }) });
-  if (d.ok) await loadAuth();
+  if (d.ok) {
+    await loadAuth();
+    window.dispatchEvent(new Event('auth-changed'));
+  }
   else if (d.needsLogin) promptLogin(key);
   else alert(d.error || 'Switch failed');
 }

package/dev-ui/js/state.js

@@ -2,6 +2,10 @@
 export const state = {
   agents: [],
   authData: {},
+  workspaces: [],
+  selectedWorkspaceId: '',
+  workspacesLoading: false,
+  workspacesError: '',
   logOffset: 0,
   pollTimer: null,
   isServing: false,

package/package.json

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