@openrig/cli 0.6.5 → 0.6.7

package/tui/dist/render.js

@@ -16,6 +16,8 @@ import { computeExplorerRows, findAgent, findSpec, findAgentBySession, agentsRun
 import { scopesContentLines } from "./scopes/scopes-model.js";
 import { executionContentLines, executionSliceStripLines } from "./execution/execution-model.js";
 import { navigatorDisplay } from "./navigator.js";
+import { specGraph } from "./specs/graph.js";
+import { launchCommand } from "./specs/launch.js";
 import { renderGraphStyle } from "./topology/render-graph.js";
 import { buildPulseModel } from "./pulse/pulse-model.js";
 import { renderPulseView, pulseLaneTargets } from "./pulse/render-pulse.js";
@@ -226,7 +228,7 @@ function workRows(rows, width) {
 function agentDetailLines(snap, found, contentWidth, timeZone = DEFAULT_TIME_ZONE) {
     const { agent, rig, pod } = found;
     const session = agent.session;
-    const specInLibrary = !!agent.spec && !!findSpec(snap, agent.spec);
+    const specInLibrary = !!agent.spec && !!findSpec(snap, agent.spec, "agent");
     const currentRows = session ? rowsForAgent(snap, session, [snap.attention, snap.blocked, snap.inProgress]) : [];
     const pendingRows = session ? rowsForAgent(snap, session, [snap.pending]) : [];
     const recentRows = session ? rowsForAgent(snap, session, [snap.recentlyFinished]) : [];
@@ -268,7 +270,7 @@ function agentDetailLines(snap, found, contentWidth, timeZone = DEFAULT_TIME_ZON
                     fieldLine({ label: "tokens", value: `${number(agent.totalInputTokens)} input · ${number(agent.totalOutputTokens)} output · ${number(agent.contextWindowSize)} window` }),
                     runtimeLine,
                     ...(agent.attach ? [fieldLine({ label: "attach", value: agent.attach })] : []),
-                    fieldLine({ label: "terminal", value: `term ▸ pod ${pod.name}`, link: { type: "act", act: "open-terminal", view: `pod:${rig.name}/${pod.name}` } }),
+                    fieldLine({ label: "terminal", value: `Open terminals ▸ pod ${pod.name}`, link: { type: "act", act: "open-terminal", view: `pod:${rig.name}/${pod.name}` } }),
                 ],
             },
             {
@@ -328,6 +330,10 @@ function agentDetailLines(snap, found, contentWidth, timeZone = DEFAULT_TIME_ZON
         ]),
     ];
 }
+function pendingTag(state) {
+    const pending = state.pendingDrill;
+    return pending ? `  ▸ resolving ${pending.resource} "${pending.name}"…` : "";
+}
 function tabsLine(state, suffix) {
     // Each topology tab is its own click zone (the first zone starts at
     // content col 0, preserving the focus-marker floor); `tab graph` = the
@@ -438,8 +444,8 @@ function timeZoneLines(state, width) {
     ], width);
 }
 function specTabsLine(state) {
-    const active = state.viewTab === "topology" || state.viewTab === "yaml" ? state.viewTab : "configuration";
-    const labels = ["topology", "configuration", "yaml"];
+    const active = state.viewTab === "graph" || state.viewTab === "topology" || state.viewTab === "yaml" ? state.viewTab : "configuration";
+    const labels = ["graph", "topology", "configuration", "yaml"];
     const parts = labels.map((tab) => (tab === active ? `[ ${tab.toUpperCase()} ]` : `  ${tab.toUpperCase()}  `));
     const text = parts.join(" ");
     return {
@@ -746,9 +752,9 @@ function contentLines(state, snap, contentWidth, motion) {
             .filter((a) => !state.filter || a.name.includes(state.filter) || a.pod.includes(state.filter));
         const suffix = `rig ${rig.name}${podFilter ? ` · pod ${podFilter}` : ""}${state.filter ? ` · filter "${state.filter}"` : ""}`;
         lines.push(...tabsLine(state, suffix));
-        // OPR.0.6.0.8: open every live seat of the rig as terminal tiles (Herdr: 4×4 per tab).
+        // Keep the explicit desktop action above the rig's grid.
         if (!podFilter)
-            lines.push(fieldLine({ label: "terminal", value: `term ▸ rig ${rig.name}`, link: { type: "act", act: "open-terminal", view: `rig:${rig.name}` } }));
+            lines.push(fieldLine({ label: "terminal", value: `Open terminals ▸ rig ${rig.name}`, link: { type: "act", act: "open-terminal", view: `rig:${rig.name}` } }));
         const healthScope = { kind: "rig", rigId: rig.id ?? rig.name, rigName: rig.name, local: host === snap.hosts[0] };
         if (state.viewTab === "health")
             return [...lines, { text: "" }, ...healthListLines(snap, healthScope, contentWidth)];
@@ -894,11 +900,53 @@ function contentLines(state, snap, contentWidth, motion) {
     if (state.section === "specs") {
         const leaf = state.drill.at(-1);
         if (leaf?.kind === "spec") {
-            const spec = findSpec(snap, leaf.name);
+            const spec = findSpec(snap, leaf.name, leaf.specKind);
             if (!spec)
                 return [{ text: snap.readErrors.find((error) => error.startsWith("specs-library")) ?? (!snap.specsLoaded ? "Specs catalog read pending" : `spec "${leaf.name}" not in the current catalog`) }];
-            if (spec.kind === "rig")
+            if (spec.kind === "rig") {
                 lines.push(specTabsLine(state));
+                if (state.specLaunch) {
+                    const launch = state.specLaunch;
+                    let command;
+                    let problem;
+                    try {
+                        command = launchCommand(launch);
+                    }
+                    catch (err) {
+                        problem = err.message;
+                    }
+                    return wrapDetailLines([
+                        ...lines, { text: `Launch · ${launch.source}` },
+                        { text: `Working folder: ${launch.folder || "not chosen"}` },
+                        { text: `Host: ${launch.host || "rig up's current selected host (unchanged)"}` },
+                        { text: "Launch also sets OPENRIG_URL to this TUI's daemon." },
+                        { text: "Type: launch-folder /absolute/working/folder (spaces are literal)" },
+                        { text: "Optional: launch-host <host> or launch-host local" },
+                        { text: "Ask your operator agent to choose or adapt the team with you." },
+                        { text: "The existing rig up command handles collisions, prompts and partial results." },
+                        { text: "Its terminal output stays visible until you press Enter to return." },
+                        ...(command ? [{ text: command }, listItem("Launch · run this command", { type: "act", act: "launch-spec" })] : [{ text: problem }]),
+                        listItem("Cancel · Esc", { type: "launch-close" }),
+                    ], contentWidth);
+                }
+                lines.push({ text: `rig spec ${spec.name} · authored topology, not live status` });
+                lines.push(listItem("Launch… · choose working folder", { type: "spec-launch" }));
+                if (state.viewTab === "graph") {
+                    lines.push(...specSourceLines(spec, snap).filter(line => line.action?.type === "file-open"));
+                    if (!spec.graph)
+                        return [...lines, { text: spec.sourceUnavailable ? `Source unavailable: ${spec.sourceUnavailable}` : "Spec graph unavailable in the current library read." }];
+                    const canvas = renderGraphStyle(state.graphStyle, specGraph(spec.graph), { host: "", rig: spec.name }, contentWidth);
+                    const segs = canvas.segLines();
+                    // Preview boxes must not drill into nonexistent live seats.
+                    lines.push(...canvas.plainLines().map((text, i) => ({ text, segs: segs[i] })));
+                    if (!spec.graph.nodes.length)
+                        lines.push({ text: "Spec graph is empty." });
+                    lines.push({ text: "○ declared seat · runtime as authored · context and live status unknown" });
+                    if (spec.graph.nodes.some(n => n.kind === "infrastructure"))
+                        lines.push({ text: "Infrastructure entries are listed in the Topology tab." });
+                    return lines;
+                }
+            }
             lines.push({ text: `${spec.kind} spec ${spec.name}` });
             lines.push(fieldLine({ label: "purpose", value: spec.description ?? "not declared in the available source" }));
             lines.push(fieldLine({ label: "provenance", value: `${sourceProvenance(spec)} · ${spec.sourceState ?? "source state not served"}` }));
@@ -959,7 +1007,7 @@ function contentLines(state, snap, contentWidth, motion) {
                     ...(spec.pods ?? []).map((pod) => ({
                         title: `pod ${pod.namespace ?? pod.id}${pod.label ? ` — ${pod.label}` : ""}`,
                         lines: [
-                            ...pod.members.map((member) => listItem(`${alignedRow([[member.id, 12], [member.agentRef, 34], [member.runtime, 12]])}${member.profile ? ` profile ${member.profile}` : ""}`, { type: "drill", resource: "spec", name: member.agentRef })),
+                            ...pod.members.map((member) => listItem(`${alignedRow([[member.id, 12], [member.agentRef, 34], [member.runtime, 12]])}${member.profile ? ` profile ${member.profile}` : ""}`, { type: "drill", resource: "spec", name: member.agentRef, specKind: "agent" })),
                             ...pod.edges.map((edge) => ({ text: `    ${edge.from} → ${edge.to}  (${edge.kind})` })),
                             // an empty pod still exists — render it honestly, never skip it
                             ...(pod.members.length === 0 && pod.edges.length === 0 ? [{ text: "  (no members)" }] : []),
@@ -1027,7 +1075,7 @@ function contentLines(state, snap, contentWidth, motion) {
                                 : (spec.usedByRigs ?? []).map((rig) => ({
                                     label: "declared by",
                                     value: `rig ${rig}`,
-                                    link: { type: "drill", resource: "spec", name: rig },
+                                    link: { type: "drill", resource: "spec", name: rig, specKind: "rig" },
                                 }))),
                             {
                                 label: "seats now",
@@ -1043,7 +1091,7 @@ function contentLines(state, snap, contentWidth, motion) {
         if (state.filter)
             lines.push({ text: `/ filter specs: ${state.filter} · / replace · esc clear` });
         const selected = computeExplorerRows(state, snap)[state.selection]?.action;
-        const spec = selected?.type === "drill" && selected.resource === "spec" ? findSpec(snap, selected.name) : null;
+        const spec = selected?.type === "drill" && selected.resource === "spec" ? findSpec(snap, selected.name, selected.specKind) : null;
         if (spec) {
             lines.push({ text: `${spec.name} · ${spec.kind} · ${sourceProvenance(spec)}` });
             lines.push({ text: "" }, { text: spec.description?.trim() || "Purpose not declared in the available source." });
@@ -1053,7 +1101,7 @@ function contentLines(state, snap, contentWidth, motion) {
                 lines.push(fieldLine({ label: "contents", value: `${spec.runtime ?? "runtime not declared"} · ${(spec.skills ?? []).length} skills · ${(spec.startupFiles ?? []).length} startup files` }));
             else
                 lines.push(fieldLine({ label: "contents", value: `${spec.rolesCount ?? "unknown"} roles · ${spec.stepsCount ?? "unknown"} steps` }));
-            lines.push({ text: "" }, listItem("Read details · Enter", { type: "drill", resource: "spec", name: spec.name }), ...specSourceLines(spec, snap));
+            lines.push({ text: "" }, listItem("Read details · Enter", { type: "drill", resource: "spec", name: spec.name, specKind: spec.kind }), ...specSourceLines(spec, snap));
             if (spec.sourceUnavailable)
                 lines.push({ text: `Source unavailable: ${spec.sourceUnavailable}` });
         }
@@ -1370,7 +1418,7 @@ function renderPulseScreen(state, snap, options, inputLine) {
     // the footer's live "updated Ns ago" IS the ongoing refresh signal (reader
     // clock), so a settled empty view stays calm. Reduced motion → static "·".
     const loadTag = loading ? `  ${frame} loading` : "";
-    lines.push(pad(`[${state.instanceId}] ${state.section}${drillPath ? " · " + drillPath : ""}${state.lastError ? "  ✗ " + state.lastError : ""}${state.notice ? "  ▸ " + state.notice : ""}${readWarn}${loadTag}${state.timeZoneWarning ? " · ⚠ timezone; run timezone" : ""}`, cols));
+    lines.push(pad(`[${state.instanceId}] ${state.section}${drillPath ? " · " + drillPath : ""}${state.lastError ? "  ✗ " + state.lastError : ""}${state.notice ? "  ▸ " + state.notice : ""}${pendingTag(state)}${readWarn}${loadTag}${state.timeZoneWarning ? " · ⚠ timezone; run timezone" : ""}`, cols));
     while (lines.length < rows)
         lines.push("");
     const anyFlash = model.lanes.some((l) => l.rows.some((r) => r.flashed));
@@ -1496,6 +1544,7 @@ export function renderScreen(state, snap, options = {}, inputLine = "") {
 }
 function renderBody(state, snap, options = {}, inputLine = "") {
     const { cols = 120, rows = 32, nowMs = 0 } = options;
+    const noticeDetail = state.notice?.includes("\n") ? state.notice : null;
     const fullReading = !options.startup?.open && (!!state.file || !!state.externalUrl || (cols <= 90 && state.section === "specs" && state.drill.length > 0));
     const explW = fullReading ? 0 : explorerWidth(cols);
     if (options.startup?.open) {
@@ -1562,7 +1611,7 @@ function renderBody(state, snap, options = {}, inputLine = "") {
     // PULSE (founder Option-B): a content-pane view inside the NORMAL explorer│
     // content chrome — renderPulseScreen builds its own split (sidebar + lanes)
     // and rides the same segRows paint path, so it returns before the table layout.
-    if (state.viewTab === "pulse" && options.load?.settled !== false)
+    if (!noticeDetail && state.viewTab === "pulse" && options.load?.settled !== false)
         return renderPulseScreen(state, snap, options, inputLine);
     // S19 round-5 (guard): one spinner frame per render pass from caller time;
     // `loading` comes from the refresh OWNER (omitted = settled — demo/fixture
@@ -1595,7 +1644,7 @@ function renderBody(state, snap, options = {}, inputLine = "") {
     const sectionTitle = { topology: "TOPOLOGY", specs: "SPECS", scopes: "PROJECTS", needs: "FEED", system: "SYSTEM · HEALTH", config: "SYSTEM · CONFIGURATION", connections: "SYSTEM · CONNECTIONS" }[state.section] ?? state.section.toUpperCase();
     // active-pane emphasis (k9s-class chrome): the focused pane's title is bracketed
     const explorerTitle = state.focusedPane === "explorer" ? "{ EXPLORER }" : "EXPLORER";
-    const contentTitle = state.focusedPane === "content" ? `{ ${sectionTitle} }` : sectionTitle;
+    const contentTitle = noticeDetail ? "{ ACTION RESULT }" : state.focusedPane === "content" ? `{ ${sectionTitle} }` : sectionTitle;
     lines.push(fullReading ? pad(`━ ${state.file ? "READ" : state.externalUrl ? "EXTERNAL URL" : "SPECS"} · Esc / ← Back `, cols) : paneRule(cols, explW, "top", explorerTitle, contentTitle));
     const explorer = fullReading ? [] : computeExplorerRows(state, snap);
     // Slice-17: the file-tree re-skin is a DISPLAY transform only — rows, keys,
@@ -1603,13 +1652,15 @@ function renderBody(state, snap, options = {}, inputLine = "") {
     const { labels: explorerDisplay, metas: explorerMetas } = navigatorDisplay(explorer, snap, explW - 1);
     const contentWidth = Math.max(cols - explW - (fullReading ? 1 : 2), 0);
     const previous = !load.settled && !state.externalUrl ? options.previousPage : undefined;
-    const content = previous
-        ? [...wrapDetailLines([{ text: `Previous: ${previous.state.section} · ${previous.state.file ? `${previous.state.file.root}/${previous.state.file.path}` : previous.state.drill.map(d => d.name).join(" / ") || [previous.state.project?.id, previous.state.scopesMission, previous.state.terminalView].filter(Boolean).join(" / ") || "overview"}` }], contentWidth),
-            { text: `Opening ${sectionTitle.toLowerCase()}… · Explorer remains available` },
-            ...contentLines(previous.state, previous.snapshot, contentWidth, { ...motion, loading: false }).map(line => ({ text: line.text }))]
-        : !load.settled && !state.externalUrl
-            ? [{ text: `${sectionTitle} · choose a location in Explorer` }, { text: `${motion.frame} ${sectionTitle.toLowerCase()} read pending…` }]
-            : contentLines(state, snap, contentWidth, motion);
+    const content = noticeDetail
+        ? wrapContentLines(noticeDetail.split(/\r?\n/).map(text => ({ text })), contentWidth)
+        : previous
+            ? [...wrapDetailLines([{ text: `Previous: ${previous.state.section} · ${previous.state.file ? `${previous.state.file.root}/${previous.state.file.path}` : previous.state.drill.map(d => d.name).join(" / ") || [previous.state.project?.id, previous.state.scopesMission, previous.state.terminalView].filter(Boolean).join(" / ") || "overview"}` }], contentWidth),
+                { text: `Opening ${sectionTitle.toLowerCase()}… · Explorer remains available` },
+                ...contentLines(previous.state, previous.snapshot, contentWidth, { ...motion, loading: false }).map(line => ({ text: line.text }))]
+            : !load.settled && !state.externalUrl
+                ? [{ text: `${sectionTitle} · choose a location in Explorer` }, { text: `${motion.frame} ${sectionTitle.toLowerCase()} read pending…` }]
+                : contentLines(state, snap, contentWidth, motion);
     if (!load.settled && !reduced)
         motion.used = true;
     const footer = state.footerOn ? snap.stream.at(-1) : undefined;
@@ -1713,7 +1764,7 @@ function renderBody(state, snap, options = {}, inputLine = "") {
     const readWarn = snap.readErrors.length > 0 ? `  ⚠ ${snap.readErrors.length} read(s) failed: ${snap.readErrors[0]}` : "";
     lines.push(fullReading ? "━".repeat(cols) : paneRule(cols, explW, "bottom"));
     lines.push(pad(fullReading ? "↑↓ scroll / links · → links · Enter open · Esc Back · refresh · v copy" : keybindHints(state), cols));
-    lines.push(pad(`[${state.instanceId}] ${state.section}${drillPath ? " · " + drillPath : ""}${state.lastError ? "  ✗ " + state.lastError : ""}${state.notice ? "  ▸ " + state.notice : ""}${readWarn}${state.timeZoneWarning ? " · ⚠ timezone; run timezone" : ""}`, cols));
+    lines.push(pad(`[${state.instanceId}] ${state.section}${drillPath ? " · " + drillPath : ""}${state.lastError ? "  ✗ " + state.lastError : ""}${noticeDetail ? "  ▸ action result above" : state.notice ? "  ▸ " + state.notice : ""}${pendingTag(state)}${readWarn}${state.timeZoneWarning ? " · ⚠ timezone; run timezone" : ""}`, cols));
     while (lines.length < rows)
         lines.push("");
     return {