@getpipher/armory-fleet 0.9.0 → 0.9.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getpipher/armory-fleet",
-  "version": "0.9.0",
+  "version": "0.9.2",
   "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/engine/spawnSubagent.ts

@@ -221,13 +221,17 @@ export async function spawnSubagent(opts: SpawnOptions): Promise<SpawnResult> {
     });
 
     // SPEC-5b-4: retain a narrow live-session handle on the run record so the panel can
-    // steer/abort mid-flight. Cleared by finishRun in the same patch as the terminal status.
-    opts.runRegistry.update(runId, { session: toLiveHandle(session) });
+    // steer/abort mid-flight. Wrap abort so the local `aborted` flag is set when the panel
+    // calls handle.abort() (not just the signal path) — otherwise finishRun reports
+    // "completed" instead of "aborted" on a user-initiated Stop. Cleared by finishRun.
+    let aborted = false;
+    const handle = toLiveHandle(session);
+    handle.abort = async () => { aborted = true; await session.abort(); };
+    opts.runRegistry.update(runId, { session: handle });
 
     const budget = createTurnBudget(maxTurns);
     let finalText = "";
     let tokenTotal = 0;
-    let aborted = false;
     let turnIdx = -1;
 
     const onSignalAbort = (): void => { aborted = true; void session.abort(); };

package/src/index.ts

@@ -171,7 +171,7 @@ export default async function (pi: ExtensionAPI): Promise<void> {
   const fleetDir = (cwd: string) => join(cwd, ".pi", "fleet");
   const bgRuns = new BgRunsStore();
   const resultsInbox = new ResultsInbox();
-  // SPEC-5b-2: the live widget (above editor) + FleetView (below editor) controller.
+  // SPEC-5b-2: the live widget (above editor) controller.
   // Display-only, independent of the /fleet panel; constructed per-session in session_start.
   let fleetWidget: FleetWidgetController | null = null;
   // The async runner's runLifecycle adapter: call the real runLifecycle with the worktree as the
@@ -275,7 +275,7 @@ export default async function (pi: ExtensionAPI): Promise<void> {
     if (cands.length > 0) {
       ctx.ui.notify(`${cands.length} interrupted fleet run${cands.length > 1 ? "s" : ""} — open /fleet to resume`, "info");
     }
-    // SPEC-5b-2: live widget (above editor) + FleetView (below editor). Display-only, independent
+    // SPEC-5b-2: live widget (above editor). Display-only, independent
     // of the /fleet panel. getTheme is a live getter (EditorTheme gotcha). Disposed on session end.
     fleetWidget = new FleetWidgetController({
       runRegistry: deps.runRegistry,

package/src/panel/fleet-widget.ts

@@ -1,11 +1,15 @@
 // src/panel/fleet-widget.ts
-// SPEC-5b-2 — the live widget (above editor) + FleetView (below editor) controller.
+// SPEC-5b-2 — the live widget (above editor) controller.
 //
 // Display-only (Q1=A): pi widgets render into a layout container; the editor keeps keyboard
 // focus. No input is routed here — /fleet is the action surface.
 //
+// v0.9.2 (fix/spec-5b-2): the below-editor FleetView widget was removed — it duplicated this
+// above-editor widget (same renderer, same rows) and the "navigable list" intent was never
+// achievable via pi widgets. `/fleet` is the action surface; this one widget is the glance surface.
+//
 // Lifecycle (Q5/Q6/Q7=A): visible only while ≥1 active run exists; hidden when idle (editor
-// reclaims both slots). A 1s setInterval re-renders for the live duration clock; it starts
+// reclaims the slot). A 1s setInterval re-renders for the live duration clock; it starts
 // lazily on the first active render and clears when the fleet goes idle + on dispose.
 //
 // Independent of the /fleet panel: constructed at session_start in index.ts, persists whether
@@ -14,11 +18,10 @@ import type { Theme } from "@earendil-works/pi-coding-agent";
 import type { RunRegistry } from "../engine/run-registry.ts";
 import type { BgRunsStore } from "./bg-runs-store.ts";
 import {
-  toWidgetRun, toWidgetRunFromBg, renderWidgetLines, renderFleetViewLines,
+  toWidgetRun, toWidgetRunFromBg, renderWidgetLines,
 } from "./widget-rows.ts";
 
 const WIDGET_KEY = "fleet-active";
-const VIEW_KEY = "fleet-view";
 
 export interface FleetWidgetDeps {
   runRegistry: RunRegistry;
@@ -27,7 +30,7 @@ export interface FleetWidgetDeps {
     setWidget: (
       key: string,
       content: string[] | undefined,
-      opts?: { placement?: "aboveEditor" | "belowEditor" },
+      opts?: { placement?: "aboveEditor" },
     ) => void;
   };
   /** Live theme getter (EditorTheme gotcha: never capture a factory theme arg). */
@@ -72,7 +75,7 @@ export class FleetWidgetController {
     const hasActive = active.some((r) => r.status === "running" || r.status === "queued" || r.status === "paused");
     if (!hasActive) {
       this.clearTimer();
-      this.setBoth(undefined);
+      this.clearWidget();
       return;
     }
     this.ensureTimer();
@@ -80,14 +83,10 @@ export class FleetWidgetController {
     try {
       this.deps.ui.setWidget(WIDGET_KEY, renderWidgetLines(active, now));
     } catch { /* best-effort: a render failure never affects runs */ }
-    try {
-      this.deps.ui.setWidget(VIEW_KEY, renderFleetViewLines(active, now), { placement: "belowEditor" });
-    } catch { /* best-effort */ }
   }
 
-  private setBoth(content: string[] | undefined): void {
-    try { this.deps.ui.setWidget(WIDGET_KEY, content); } catch { /* best-effort */ }
-    try { this.deps.ui.setWidget(VIEW_KEY, content, { placement: "belowEditor" }); } catch { /* best-effort */ }
+  private clearWidget(): void {
+    try { this.deps.ui.setWidget(WIDGET_KEY, undefined); } catch { /* best-effort */ }
   }
 
   private ensureTimer(): void {
@@ -102,13 +101,13 @@ export class FleetWidgetController {
     }
   }
 
-  /** Unsubscribe + clear timer + clear both widgets. Idempotent. */
+  /** Unsubscribe + clear timer + clear the widget. Idempotent. */
   dispose(): void {
     if (this.disposed) return;
     this.disposed = true;
     this.clearTimer();
     for (const u of this.unsubs) u();
     this.unsubs.length = 0;
-    this.setBoth(undefined);
+    this.clearWidget();
   }
 }

package/src/panel/widget-rows.ts

@@ -1,7 +1,12 @@
 // src/panel/widget-rows.ts
-// SPEC-5b-2 — pure render functions for the live widget (above editor) + FleetView (below editor).
-// Both surfaces are display-only; plain strings (no theme) — theming, if wanted, is applied at the
-// setWidget boundary. Mirrors the runs-rows/fleet-items pure-renderer convention (unit-tested, no TUI).
+// SPEC-5b-2 — pure render functions for the live widget (above editor).
+// Display-only; plain strings (no theme) — theming, if wanted, is applied at the setWidget boundary.
+// Mirrors the runs-rows/fleet-items pure-renderer convention (unit-tested, no TUI).
+//
+// v0.9.2 (fix/spec-5b-2): the below-editor FleetView widget was removed — it was a display-only
+// mirror of this same renderer (same `widgetLine`, cap 8 vs 5), and the PRD §5 "navigable agent
+// list below editor" intent was never achievable via pi widgets (editor keeps keyboard focus).
+// `/fleet` is the navigable action surface; this one above-editor widget is the glance surface.
 import { fmtDuration } from "./rows.ts";
 import type { RunRecord } from "../engine/run-registry.ts";
 import type { BgRunStatus } from "./rows.ts";
@@ -72,8 +77,3 @@ export function renderWidgetLines(runs: WidgetRun[], now: number = Date.now()):
   return shown;
 }
 
-/** Below-editor FleetView: active-only list, cap 8, no overflow line (list form). */
-export function renderFleetViewLines(runs: WidgetRun[], now: number = Date.now()): string[] {
-  const active = filterActive(runs);
-  return active.slice(0, 8).map((r) => widgetLine(r, now));
-}

package/src/tools/subagent.ts

@@ -62,7 +62,7 @@ export function createSubagentTool(deps: SubagentToolDeps) {
       "Pass track:false only for trivial throwaway lookups that don't represent real work.",
     ],
     parameters: subagentParams,
-    async execute(_toolCallId: string, params: SubagentInput, signal: AbortSignal, _onUpdate: unknown, ctx: any) {
+    async execute(_toolCallId: string, params: SubagentInput, signal: AbortSignal, _onUpdate: unknown, _ctx: any) {
       // SPEC-5a: background + schedule routing (Q1/Q2/Q5).
       if (params.background && params.schedule) {
         return { isError: true, content: [{ type: "text" as const, text: "A scheduled run is inherently background — pass only one of `background` or `schedule`, not both." }] };
@@ -117,11 +117,6 @@ export function createSubagentTool(deps: SubagentToolDeps) {
         parentCwd: deps.parentCwd,
         runLog: deps.runLog,
         signal,
-        onEvent: (e) => {
-          if (ctx?.ui?.setWidget && e.type === "turn_end") {
-            ctx.ui.setWidget("fleet", [`▶ ${params.agent} · running`]);
-          }
-        },
       });
       const isError = res.status === "failed" || res.status === "aborted";
       return {