@getpipher/armory-fleet 0.7.0 → 0.8.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getpipher/armory-fleet",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "private": false,
   "description": "The armory suite's subagent orchestrator for the pi coding agent — a cross-harness, superpowers-native fleet where every agent is armory-native from birth.",
   "license": "MIT",

package/src/panel/conversation-rows.ts

@@ -0,0 +1,76 @@
+// src/panel/conversation-rows.ts
+// SPEC-5b-3 — pure renderers for the full-message overlay (second level over the 5b-1 timeline).
+// Plain strings, no theme (codebase convention: theming is applied at the SelectList callback layer).
+//
+// Journal fidelity (Q2=C): MessageEvent.text is already the FULL assistant text (5b-1 Q1). Tool
+// args/result are the journaled excerpt (5b-1: args≤200ch, result≤500ch, errors in-full). The
+// toolHeader notes "args/result excerpted" so the asymmetry is honest.
+import type { MessageEvent, ToolEvent } from "../runtime/run-log.ts";
+
+/** Word-wrap `text` to `width` columns. Long tokens (no break opportunity) hard-split at `width`.
+ *  Explicit `\n` is preserved as a row break (multi-line tool results). Empty → [""]; width≤0 → [""].
+ *  Operates on the string by `.length` (UTF-16 code units) — sufficient for the overlay's purposes;
+ *  CJK chars count as 1 col each in most terminals, matching the test expectations. */
+export function wrapToLines(text: string, width: number): string[] {
+  if (width <= 0) return [""];
+  if (text.length === 0) return [""];
+  const out: string[] = [];
+  for (const para of text.split("\n")) {
+    if (para.length === 0) { out.push(""); continue; }
+    const words = para.split(" ");
+    let line = "";
+    for (const w of words) {
+      if (w.length === 0) continue; // collapse runs of spaces
+      if (line.length === 0) {
+        // long token with no break opportunity: hard-split at width
+        let rest = w;
+        while (rest.length > width) {
+          out.push(rest.slice(0, width));
+          rest = rest.slice(width);
+        }
+        line = rest;
+      } else if (line.length + 1 + w.length <= width) {
+        line += " " + w;
+      } else {
+        out.push(line);
+        let rest = w;
+        while (rest.length > width) {
+          out.push(rest.slice(0, width));
+          rest = rest.slice(width);
+        }
+        line = rest;
+      }
+    }
+    out.push(line);
+  }
+  return out;
+}
+
+/** Body for an assistant message: the full text, wrapped. */
+export function messageBody(e: MessageEvent, width: number): string[] {
+  return wrapToLines(e.text, width);
+}
+
+/** Body for a tool event: `args:` + indented args, `result:` + indented result. */
+export function toolBody(e: ToolEvent, width: number): string[] {
+  const inner = Math.max(2, width - 2);
+  const lines: string[] = ["args:"];
+  for (const l of wrapToLines(e.args, inner)) lines.push("  " + l);
+  lines.push("result:");
+  for (const l of wrapToLines(e.result, inner)) lines.push("  " + l);
+  return lines;
+}
+
+/** Header for an assistant message event. Omits the token segment when usage.total is absent. */
+export function messageHeader(e: MessageEvent): string {
+  const turn = Math.max(0, e.turnIndex);
+  const tok = e.usage?.total != null ? ` · ${e.usage.total} tok` : "";
+  return `── assistant · turn ${turn}${tok} ──`;
+}
+
+/** Header for a tool event. Notes "args/result excerpted" (Q2=C honest asymmetry). */
+export function toolHeader(e: ToolEvent): string {
+  const turn = Math.max(0, e.turnIndex);
+  const glyph = e.isError ? "✗" : "✓";
+  return `── tool: ${e.toolName} · turn ${turn} · ${glyph} · args/result excerpted ──`;
+}

package/src/panel/fleet-panel.ts

@@ -13,8 +13,9 @@ import type { AgentDef } from "../registry/frontmatter.ts";
 import { agentsRow, agentInfo, backendsRow, backendInfo, lifecycleRow, lifecyclePhaseTimeline, scheduleRow } from "./rows.ts";
 import { buildFleetItems } from "./fleet-items.ts";
 import { runsRow, runTimelineRow } from "./runs-rows.ts";
+import { messageBody, toolBody, messageHeader, toolHeader } from "./conversation-rows.ts";
 import { buildRunsIndex } from "./runs-index.ts";
-import type { RunLog, RunMeta, RunLogEvent } from "../runtime/run-log.ts";
+import type { RunLog, RunMeta, RunLogEvent, MessageEvent, ToolEvent } from "../runtime/run-log.ts";
 import type { Scheduler, Schedule } from "../scheduling/scheduler.ts";
 import type { BgRunsStore } from "./bg-runs-store.ts";
 import { spawnSubagent, type SpawnResult } from "../engine/spawnSubagent.ts";
@@ -90,6 +91,13 @@ export class FleetPanel extends Container {
   private runTimeline: RunLogEvent[] | null = null;
   private resumeInput: Input | null = null;
   private resumeMode = false;
+  // SPEC-5b-3: full-message overlay (second level over the 5b-1 timeline) + stored SelectList refs
+  // so handleInput can forward keys to the active overlay (Container/TUI routes input only to the
+  // focused component = this panel; children receive keys only if we forward them).
+  private selectedEventIndex: number | null = null;
+  private fullMessageEvent: MessageEvent | ToolEvent | null = null;
+  private timelineList: SelectList | null = null;
+  private messageBodyList: SelectList | null = null;
   /** SPEC-5a proper-fix: store-change subscriptions — fired by RunRegistry + BgRunsStore
    * so the panel re-renders the moment a (fore- or back-ground) run mutates, without a keypress. */
   private readonly unsubs: (() => void)[] = [];
@@ -208,15 +216,50 @@ export class FleetPanel extends Container {
         `nextFire: ${s.nextFire?.toLocaleString() ?? "(none)"}`,
       ]) this.addChild(new Text(this.theme.fg("text", line), 0, 0));
       this.addChild(new Text(this.theme.fg("dim", "  esc:Back"), 0, 0));
+    } else if (this.fullMessageEvent) {
+      // SPEC-5b-3: full-message overlay (top of the stack). Header + scrollable wrapped body.
+      const e = this.fullMessageEvent;
+      const isMsg = e.type === "message";
+      const header = isMsg ? messageHeader(e) : toolHeader(e);
+      this.addChild(new Text(this.theme.fg("dim", `  ${header}`), 0, 0));
+      // Width: the panel renders at the terminal width pi gives ctx.ui.custom. Rows are pre-baked
+      // into SelectItem.label, so wrap now. Fall back to 80 if the live width isn't reachable here
+      // — the list still scrolls; a resize re-wraps on the next renderShell().
+      const width = 80;
+      const bodyLines = isMsg ? messageBody(e, width) : toolBody(e, width);
+      const body = new SelectList(
+        bodyLines.map((line) => ({ value: "", label: line })),
+        Math.min(bodyLines.length, 12),
+        {
+          selectedPrefix: (s: string) => this.theme.fg("accent", s),
+          selectedText: (s: string) => this.theme.fg("accent", s),
+          description: (s: string) => this.theme.fg("muted", s),
+          scrollInfo: (s: string) => this.theme.fg("dim", s),
+          noMatch: (s: string) => this.theme.fg("warning", s),
+        },
+      );
+      // esc → back to timeline. Leave onSelect unset so Enter (tui.select.confirm) is swallowed
+      // silently by SelectList.handleInput — a text line has nothing to drill into.
+      // Do NOT clear selectedEventIndex here: it survives to drive the timeline cursor restore.
+      body.onCancel = () => {
+        this.fullMessageEvent = null;
+        this.messageBodyList = null;
+        this.renderShell();
+      };
+      this.messageBodyList = body;
+      this.addChild(body);
+      this.addChild(new Text(this.theme.fg("dim", "  esc:Back"), 0, 0));
     } else if (this.selectedRun) {
-      // SPEC-5b-1: Runs tab — per-turn timeline replay (read-only); enter reserved for 5b-3 overlay.
+      // SPEC-5b-1/5b-3: Runs tab — per-turn timeline replay. SPEC-5b-3 makes the list interactive
+      // (arrows scroll, enter opens full-message overlay, esc back to Runs list) by forwarding input
+      // to the stored SelectList (see handleInput) — v0.6.0 swallowed all non-escape keys.
       this.addChild(new Text(this.theme.fg("dim", `  ── run ${this.selectedRun.runId} — timeline ──`), 0, 0));
-      const events = (this.runTimeline ?? []).filter((e) => e.type === "message" || e.type === "tool") as Array<RunLogEvent>;
+      const events = (this.runTimeline ?? []).filter((e) => e.type === "message" || e.type === "tool") as Array<MessageEvent | ToolEvent>;
       if (events.length === 0) {
         this.addChild(new Text(this.theme.fg("dim", "  (no conversation events)"), 0, 0));
       } else {
         const tl = new SelectList(
-          events.map((e) => ({ value: "", label: runTimelineRow(e as never) })),
+          events.map((e, idx) => ({ value: String(idx), label: runTimelineRow(e as never) })),
           Math.min(events.length, 12),
           {
             selectedPrefix: (s: string) => this.theme.fg("accent", s),
@@ -226,10 +269,26 @@ export class FleetPanel extends Container {
             noMatch: (s: string) => this.theme.fg("warning", s),
           },
         );
-        tl.onCancel = () => { this.selectedRun = null; this.runTimeline = null; this.renderShell(); };
+        // SPEC-5b-3: enter on a timeline row → open the full-message overlay for that event.
+        tl.onSelect = (item) => {
+          const idx = Number(item.value);
+          const ev = events[idx];
+          if (!ev) { this.onNotify("event no longer available", "warning"); return; }
+          this.selectedEventIndex = idx;
+          this.fullMessageEvent = ev;
+          this.renderShell();
+        };
+        // SPEC-5b-3: restore the cursor to the row we were viewing (one-shot, then clear the token).
+        if (this.selectedEventIndex != null) {
+          tl.setSelectedIndex(this.selectedEventIndex);
+          this.selectedEventIndex = null;
+        }
+        // esc → back to Runs list (replaces the v0.6.0 panel-level escape catch).
+        tl.onCancel = () => { this.selectedRun = null; this.runTimeline = null; this.timelineList = null; this.renderShell(); };
+        this.timelineList = tl;
         this.addChild(tl);
       }
-      this.addChild(new Text(this.theme.fg("dim", "  enter: (5b-3 full message)  esc:Back"), 0, 0));
+      this.addChild(new Text(this.theme.fg("dim", "  enter:Full-message  esc:Back"), 0, 0));
     } else if (this.resumeMode && this.resumeInput) {
       // SPEC-5b-1: Runs tab — resume follow-up input.
       this.addChild(new Text(this.theme.fg("accent", "  follow-up> "), 0, 0));
@@ -260,8 +319,10 @@ export class FleetPanel extends Container {
 
     this.addChild(new Spacer(1));
     const hint =
-      this.infoAgent || this.selectedBackend || this.selectedLifecycle || this.selectedSchedule || this.selectedRun
-        ? (this.selectedRun ? "  enter:(5b-3)  esc:Back" : "  esc:Back")
+      this.fullMessageEvent
+        ? "  esc:Back"
+        : this.infoAgent || this.selectedBackend || this.selectedLifecycle || this.selectedSchedule || this.selectedRun
+          ? (this.selectedRun ? "  enter:Full-message  esc:Back" : "  esc:Back")
         : this.pendingCheckpoint
           ? "  c:Continue  v:Revise  a:Abort"
           : this.lcRevising
@@ -353,6 +414,10 @@ export class FleetPanel extends Container {
     this.selectedSchedule = null;
     this.selectedRun = null;
     this.runTimeline = null;
+    this.selectedEventIndex = null;
+    this.fullMessageEvent = null;
+    this.timelineList = null;
+    this.messageBodyList = null;
     this.list = this.buildList();
     this.renderShell();
   }
@@ -374,9 +439,18 @@ export class FleetPanel extends Container {
       if (matchesKey(data, "escape")) { this.selectedSchedule = null; this.renderShell(); }
       return;
     }
+    if (this.fullMessageEvent) {
+      // SPEC-5b-3: full-message overlay — forward to the body SelectList (arrows scroll; esc via
+      // onCancel back to timeline; enter is a no-op). Replaces the v0.6.0 swallow-all pattern.
+      this.messageBodyList?.handleInput(data);
+      this.invalidate();
+      return;
+    }
     if (this.selectedRun) {
-      // SPEC-5b-1: Runs timeline replay overlay — esc back; enter is a 5b-3 placeholder.
-      if (matchesKey(data, "escape")) { this.selectedRun = null; this.runTimeline = null; this.renderShell(); }
+      // SPEC-5b-3: forward to the timeline SelectList (arrows scroll; enter via onSelect opens the
+      // overlay; esc via onCancel returns to the Runs list). v0.6.0 swallowed all non-escape keys.
+      this.timelineList?.handleInput(data);
+      this.invalidate();
       return;
     }
     if (this.resumeMode && this.resumeInput) {