@vendian/cli 0.0.30 → 0.0.31

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.30" : process.env.npm_package_version || "0.0.0-dev";
+var CLI_VERSION = true ? "0.0.31" : process.env.npm_package_version || "0.0.0-dev";
 
 // src/npm-update.js
 var NPM_CHECK_INTERVAL_MS = 30 * 60 * 1e3;
@@ -2398,6 +2398,7 @@ async function loadTerm() {
   term = tk.default.terminal;
 }
 var HEADER_ROWS_BASE = 7;
+var HEADER_ROWS_SERVE = 8;
 var SERVE_CONTENT_ROW = 10;
 function clampListIndex(index, count) {
   if (!Number.isFinite(count) || count <= 0) return 0;
@@ -2988,6 +2989,7 @@ async function runServeDashboard({ env, platform, agentsDir, collectionId }) {
   let child = null;
   let startupError = "";
   let overlayActive = false;
+  let overlayRedraw = null;
   let ctrlCArmed = false;
   let ctrlCArmTimer = null;
   let dashboardClosed = false;
@@ -3005,7 +3007,8 @@ async function runServeDashboard({ env, platform, agentsDir, collectionId }) {
       const status = friendlyStatus(rt.status);
       const path_ = agent.relativePath || ".";
       const runst = state.agentRunState[path_];
-      const errMsg2 = rt.status === "error" ? runst?.errorMessage || "Something went wrong \u2014 no details available" : null;
+      const rawErr = runst?.errorMessage || (rt.status === "error" ? "Something went wrong" : null);
+      const errMsg2 = rawErr ? typeof rawErr === "string" ? rawErr : rawErr.message || JSON.stringify(rawErr) : null;
       return { num: i + 1, name, status, errMsg: errMsg2, path: path_ };
     });
   }
@@ -3024,55 +3027,62 @@ async function runServeDashboard({ env, platform, agentsDir, collectionId }) {
   }
   function redraw() {
     if (dashboardClosed || overlayActive) return;
+    const W = term.width || 80;
+    const H = term.height || 24;
     const agents = agentDisplayList();
     const activity = recentActivityLines();
     const diagnostics = daemonDebugLines();
     const viewport = computeServeDashboardViewport({
-      termHeight: term.height || 24,
+      termHeight: H,
       agentCount: agents.length,
       selectedIdx,
       activityCount: activity.length,
       diagnosticsCount: diagnostics.length
     });
     selectedIdx = viewport.selectedIdx;
-    drawHeader({ env, platform, serveState: state });
-    term.moveTo(1, SERVE_CONTENT_ROW);
-    term.eraseDisplayBelow();
+    term.clear();
     agentRowMap.clear();
+    drawHeader({ env, platform, serveState: state });
+    term("\n");
+    let currentRow = HEADER_ROWS_SERVE + 2;
     if (startupError) {
-      term.red(`  ${fig.cross} ${clip(startupError, (term.width || 80) - 6)}
+      term.red(`  ${fig.cross} ${clip(startupError, W - 6)}
 `);
     } else if (stopRequested) {
-      term.yellow(`  ${fig.warning} ${clip(state.activity || "Stopping your agents\u2026", (term.width || 80) - 6)}
+      term.yellow(`  ${fig.warning} ${clip(state.activity || "Stopping your agents\u2026", W - 6)}
 `);
     } else if (state.stopped) {
       term.yellow(`  ${fig.warning} Your agents have stopped.
 `);
     } else if (state.connected) {
       term.green(`  ${fig.dot} `);
-      term.gray(`${clip(state.activity || "Your agents are running", 55)}
+      term.gray(`${clip(state.activity || "Your agents are running", W - 10)}
 `);
     } else {
       term.cyan(`  ${fig.dotEmpty} `);
-      term.gray(`${clip(state.activity || "Starting up\u2026", 55)}
+      term.gray(`${clip(state.activity || "Starting up\u2026", W - 10)}
 `);
     }
+    currentRow++;
     if (agents.length > 0) {
-      if (viewport.showBlankAfterStatus) term("\n");
+      if (viewport.showBlankAfterStatus) {
+        term("\n");
+        currentRow++;
+      }
       term.bold.gray("  Your agents:\n");
-      let lineOffset = SERVE_CONTENT_ROW + 2 + (viewport.showBlankAfterStatus ? 1 : 0);
+      currentRow++;
       const visibleAgents = agents.slice(
         viewport.agentWindowStart,
         viewport.agentWindowStart + viewport.visibleAgentCount
       );
       for (const ag of visibleAgents) {
         const isSelected = ag.num - 1 === selectedIdx;
-        agentRowMap.set(lineOffset, ag.num - 1);
+        agentRowMap.set(currentRow, ag.num - 1);
         const numStr = String(ag.num).padStart(2);
         const nameStr = clip(ag.name, 28).padEnd(28);
-        const statLine = `  ${numStr}  ${ag.status.icon}  ${nameStr}  ${ag.status.text}`;
-        if (isSelected) term.bgCyan.black.bold(statLine);
-        else {
+        if (isSelected) {
+          term.bgCyan.black.bold(`  ${numStr}  ${ag.status.icon}  ${nameStr}  ${ag.status.text}`);
+        } else {
           term(`  ${numStr}  `);
           switch (ag.status.color) {
             case "green":
@@ -3115,11 +3125,11 @@ async function runServeDashboard({ env, platform, agentsDir, collectionId }) {
           }
         }
         term("\n");
-        lineOffset++;
+        currentRow++;
         if (viewport.showInlineErrors && isSelected && ag.errMsg) {
-          term.red(`       \u2514\u2500 ${clip(ag.errMsg, (term.width || 80) - 14)}
+          term.red(`       \u2514\u2500 ${clip(ag.errMsg, W - 14)}
 `);
-          lineOffset++;
+          currentRow++;
         }
       }
       if (viewport.showAgentRange) {
@@ -3127,24 +3137,31 @@ async function runServeDashboard({ env, platform, agentsDir, collectionId }) {
         const last = viewport.agentWindowStart + visibleAgents.length;
         term.gray(`  Showing agents ${first}\u2013${last} of ${agents.length}
 `);
+        currentRow++;
       }
       if (viewport.showAgentHint) {
         term.gray(`  Click an agent or use \u2191\u2193 + Enter to see its activity log
 `);
+        currentRow++;
       }
     } else {
-      if (viewport.showBlankAfterStatus) term("\n");
+      if (viewport.showBlankAfterStatus) {
+        term("\n");
+        currentRow++;
+      }
       term.gray("  Looking for your agents\u2026\n");
+      currentRow++;
     }
     if (viewport.showActivityHeader) {
       const visibleActivity = activity.slice(-viewport.visibleActivityCount);
-      const divW = Math.min((term.width || 80) - 4, 60);
+      const divW = Math.min(W - 4, 60);
       term.gray(`  ${"\u2500".repeat(3)} Recent activity ${"\u2500".repeat(Math.max(0, divW - 18))}
 `);
+      currentRow++;
       for (const e of visibleActivity) {
         const t = formatLogTime(e.timestamp);
         const name = clip(e._agentName || "Agent", 20);
-        const msg = clip(friendlyActivityLine(e), (term.width || 80) - 30);
+        const msg = clip(friendlyActivityLine(e), W - 32);
         if (e.level === "error" || e.eventType === "completion" && e.success === false) {
           term.gray(`  ${t}  `);
           term.red(`${name} \u2014 ${msg}
@@ -3161,31 +3178,32 @@ async function runServeDashboard({ env, platform, agentsDir, collectionId }) {
           term.gray(`  ${t}  ${name} \u2014 ${msg}
 `);
         }
+        currentRow++;
       }
     }
     if (viewport.showDiagnosticsHeader) {
       const visibleDiagnostics = diagnostics.slice(-viewport.visibleDiagnosticsCount);
-      const divW = Math.min((term.width || 80) - 4, 72);
+      const divW = Math.min(W - 4, 72);
       term.gray(`  ${"\u2500".repeat(3)} Daemon diagnostics ${"\u2500".repeat(Math.max(0, divW - 23))}
 `);
+      currentRow++;
       for (const entry of visibleDiagnostics) {
         const t = formatLogTime(entry.timestamp);
-        const type = clip(entry.eventType || "event", 24).padEnd(24);
-        const msg = clip(entry.message || "", (term.width || 80) - 38);
+        const type = clip(entry.eventType || "event", 22).padEnd(22);
+        const msg = clip(entry.message || "", W - 36);
         term.gray(`  ${t}  `);
-        if (entry.level === "error") {
-          term.red(`${type} ${msg}
+        if (entry.level === "error") term.red(`${type} ${msg}
 `);
-        } else if (entry.level === "warn") {
-          term.yellow(`${type} ${msg}
+        else if (entry.level === "warn") term.yellow(`${type} ${msg}
 `);
-        } else {
-          term.gray(`${type} ${msg}
+        else term.gray(`${type} ${msg}
 `);
-        }
+        currentRow++;
       }
     }
-    term("\n");
+    const footerRow = Math.max(currentRow + 1, H - 1);
+    if (footerRow < H) term.moveTo(1, footerRow);
+    else term("\n");
     if (ctrlCArmed) {
       term.yellow.bold("  Press Ctrl+C again to exit.\n");
     } else if (stopRequested) {
@@ -3202,7 +3220,7 @@ async function runServeDashboard({ env, platform, agentsDir, collectionId }) {
   }
   term.clear();
   drawHeader({ env, platform, serveState: state });
-  term.moveTo(1, SERVE_CONTENT_ROW);
+  term("\n");
   term.cyan(`  ${fig.dotEmpty} Getting your agents ready\u2026
 `);
   try {
@@ -3233,12 +3251,14 @@ async function runServeDashboard({ env, platform, agentsDir, collectionId }) {
       (updater) => {
         if (dashboardClosed) return;
         state = updater(state);
-        redraw();
+        if (overlayActive && typeof overlayRedraw === "function") overlayRedraw();
+        else redraw();
       },
       ({ message } = {}) => {
         if (dashboardClosed) return;
         if (!state.stopped) state = { ...state, stopped: true, activity: message || "Stopped" };
-        redraw();
+        if (overlayActive && typeof overlayRedraw === "function") overlayRedraw();
+        else redraw();
       },
       logStore
     );
@@ -3252,10 +3272,20 @@ async function runServeDashboard({ env, platform, agentsDir, collectionId }) {
       const clampedIdx = clampListIndex(idx, agents.length);
       if (dashboardClosed || exitPromptActive || agents.length === 0 || idx !== clampedIdx) return;
       overlayActive = true;
+      overlayRedraw = null;
       const ag = agents[clampedIdx];
-      showAgentLog({ agent: ag, getState: () => state, env, platform }).then(() => {
+      showAgentLog({
+        agent: ag,
+        getState: () => state,
+        onAttachLiveUpdates: (redrawFn) => {
+          overlayRedraw = redrawFn;
+        },
+        env,
+        platform
+      }).then(() => {
         if (dashboardClosed) return;
         overlayActive = false;
+        overlayRedraw = null;
         term.clear();
         redraw();
       });
@@ -3411,57 +3441,57 @@ async function runServeDashboard({ env, platform, agentsDir, collectionId }) {
     }
   });
 }
-async function showAgentLog({ agent, getState, env, platform }) {
+async function showAgentLog({ agent, getState, onAttachLiveUpdates, env, platform }) {
   const liveState = typeof getState === "function" ? getState : () => getState;
+  const H = term.height || 24;
+  const visibleCount = Math.max(4, H - 14);
   let scrollOffset = 0;
   let autoScroll = true;
-  const visibleCount = Math.max(8, (term.height || 24) - 14);
+  let done = false;
   function currentLogs() {
     return agentLogEntries(liveState().agentLogs, agent.path);
   }
   function draw() {
-    const state = liveState();
+    if (done) return;
+    const curState = liveState();
     const logs = currentLogs();
-    const agentObj = state.agents.find((a) => (a.relativePath || ".") === agent.path);
-    const runtime = agentObj ? agentRuntimeStatus(agentObj, state.agentRunState) : { status: "unknown", label: "offline" };
+    const agentObj = curState.agents.find((a) => (a.relativePath || ".") === agent.path);
+    const runtime = agentObj ? agentRuntimeStatus(agentObj, curState.agentRunState) : { status: "unknown", label: "offline" };
     const status = friendlyStatus(runtime.status);
-    if (autoScroll) {
+    const W = term.width || 80;
+    if (autoScroll || scrollOffset > Math.max(0, logs.length - visibleCount)) {
       scrollOffset = Math.max(0, logs.length - visibleCount);
+      autoScroll = logs.length > 0;
     }
     term.clear();
-    drawHeader({ env, platform, serveState: state });
+    drawHeader({ env, platform, serveState: curState });
     term("\n");
     term.bold(`  ${agent.name}
 `);
-    term.gray(`  ${agent.path}  \u2014  `);
+    term.gray("  ");
     switch (status.color) {
       case "green":
-        term.green(`${status.icon} ${status.text}
-`);
+        term.green(`${status.icon} ${status.text}`);
         break;
       case "brightBlue":
-        term.brightBlue(`${status.icon} ${status.text}
-`);
+        term.brightBlue(`${status.icon} ${status.text}`);
         break;
       case "yellow":
-        term.yellow(`${status.icon} ${status.text}
-`);
+        term.yellow(`${status.icon} ${status.text}`);
         break;
       case "red":
-        term.red(`${status.icon} ${status.text}
-`);
+        term.red(`${status.icon} ${status.text}`);
         break;
       default:
-        term.gray(`${status.icon} ${status.text}
-`);
+        term.gray(`${status.icon} ${status.text}`);
     }
-    term("\n");
+    term("\n\n");
     if (logs.length === 0) {
-      term.gray("  No activity recorded yet. Logs will appear when this agent runs a job.\n");
+      term.gray("  No activity yet \u2014 logs appear here as the agent runs.\n");
     } else {
-      const eff = scrollOffset >= logs.length - visibleCount - 2 ? Math.max(0, logs.length - visibleCount) : scrollOffset;
+      const eff = Math.min(scrollOffset, Math.max(0, logs.length - visibleCount));
       const visible = logs.slice(eff, eff + visibleCount);
-      const msgW = Math.max(40, (term.width || 80) - 16);
+      const msgW = Math.max(30, W - 16);
       for (const entry of visible) {
         const t = formatLogTime(entry.timestamp);
         const text = clip(formatAgentLogEntry(entry), msgW);
@@ -3474,6 +3504,9 @@ async function showAgentLog({ agent, getState, env, platform }) {
 `);
         } else if (entry.eventType === "job_started") {
           term.brightBlue(`\u25B6 ${text}
+`);
+        } else if (entry.eventType === "progress") {
+          term.cyan(`\u2192 ${text}
 `);
         } else {
           term.gray(`\u2014 ${text}
@@ -3481,42 +3514,36 @@ async function showAgentLog({ agent, getState, env, platform }) {
         }
       }
       if (logs.length > visibleCount) {
+        const eff2 = Math.min(eff, Math.max(0, logs.length - visibleCount));
         term.gray(`
-  Showing ${eff + 1}\u2013${eff + visible.length} of ${logs.length} entries
-`);
+  ${eff2 + 1}\u2013${eff2 + visible.length} of ${logs.length}`);
+        if (autoScroll) term.cyan("  \u2193 live");
+        term("\n");
       }
     }
-    term("\n");
+    term.moveTo(1, Math.max(H - 1, 6));
     term.gray("  ");
     term.brightBlue.bold("\u2191\u2193");
-    term.gray(" scroll    ");
-    term.brightBlue.bold("PgUp/PgDn");
-    term.gray(" page    ");
-    if (autoScroll) {
-      term.brightBlue.bold("Esc");
-      term.gray(" back  ");
-      term.cyan("\u2193 live\n");
-    } else {
-      term.brightBlue.bold("Esc");
-      term.gray(" back  ");
-      term.gray("\u2193 ");
+    term.gray("/PgUp/PgDn scroll    ");
+    if (!autoScroll) {
       term.brightBlue.bold("End");
-      term.gray(" resume live\n");
+      term.gray(" resume live    ");
     }
+    term.brightBlue.bold("Esc");
+    term.gray(" back\n");
+  }
+  if (typeof onAttachLiveUpdates === "function") {
+    onAttachLiveUpdates(() => draw());
   }
   draw();
-  let overlayDone = false;
-  const redrawInterval = setInterval(() => {
-    if (!overlayDone) draw();
-  }, 500);
   await new Promise((resolve) => {
     function handler(name) {
+      if (done) return;
       const logs = currentLogs();
       const maxOff = Math.max(0, logs.length - visibleCount);
       if (name === "ESCAPE") {
+        done = true;
         term.off("key", handler);
-        overlayDone = true;
-        clearInterval(redrawInterval);
         resolve();
       } else if (name === "UP") {
         autoScroll = false;
@@ -3528,14 +3555,15 @@ async function showAgentLog({ agent, getState, env, platform }) {
         draw();
       } else if (name === "PAGE_UP") {
         autoScroll = false;
-        scrollOffset = Math.max(0, scrollOffset - visibleCount);
+        scrollOffset = Math.max(0, scrollOffset - Math.max(1, visibleCount - 1));
         draw();
       } else if (name === "PAGE_DOWN") {
-        scrollOffset = Math.min(maxOff, scrollOffset + visibleCount);
+        scrollOffset = Math.min(maxOff, scrollOffset + Math.max(1, visibleCount - 1));
         if (scrollOffset >= maxOff) autoScroll = true;
         draw();
-      } else if (name === "END") {
+      } else if (name === "END" || name === "g") {
         autoScroll = true;
+        scrollOffset = maxOff;
         draw();
       }
     }

package/package.json

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