@getpipher/armory-fleet 0.10.1 → 0.10.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getpipher/armory-fleet",
-  "version": "0.10.1",
+  "version": "0.10.3",
   "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/index.ts

@@ -258,7 +258,9 @@ export default async function (pi: ExtensionAPI): Promise<void> {
     // SPEC-5b-1: per-session RunLog at .pi/fleet/conversations/ (separate from the
     // SPEC-5a phase journal at .pi/fleet/runs/ — different granularity, no filename collision).
     deps.runLog = new RunLog(join(dir, "conversations"));
-    const reconciled = reconcileRuns(deps.runLog);
+    // v0.10.2: pass the in-memory RunRegistry so reconcile syncs it too — otherwise orphaned
+    // (process-gone) runs keep status:"running" in memory and the live widget shows a stale ▶ forever.
+    const reconciled = reconcileRuns(deps.runLog, { runRegistry: deps.runRegistry });
     if (reconciled.length > 0) {
       ctx.ui.notify(`reconciled ${reconciled.length} interrupted fleet run${reconciled.length > 1 ? "s" : ""} (marked aborted)`, "info");
     }

package/src/panel/runs-rows.ts

@@ -10,7 +10,9 @@ const STATUS_GLYPH: Record<RunMeta["status"], string> = {
 
 export function runsRow(r: RunMeta, getModelContextWindow?: (model: string) => number | undefined): string {
   const dur = r.endedAt ? fmtDuration(r.endedAt - r.startedAt) : "—";
-  const tok = r.tokenTotal > 0 ? `  ${fmtTokens(r.tokenTotal)} tok` : "";
+  // SPEC-6-1 fix: "tok" is the final context snapshot (contextTokens), NOT cumulative
+  // tokenTotal — it pairs with the ctx% segment (same metric).
+  const tok = r.contextTokens != null && r.contextTokens > 0 ? `  ${fmtTokens(r.contextTokens)} tok` : "";
   const maxCtx = getModelContextWindow?.(r.model);
   const ctx = (r.contextTokens != null && maxCtx != null && maxCtx > 0) ? `  ${Math.round(r.contextTokens / maxCtx * 100)}%` : "";
   const cost = r.costTotal ? `  $${r.costTotal.toFixed(4)}` : "";

package/src/panel/widget-rows.ts

@@ -72,7 +72,10 @@ const STATUS_GLYPH: Record<WidgetRun["status"], string> = {
 function widgetLine(r: WidgetRun, now: number): string {
   const glyph = STATUS_GLYPH[r.status];
   const dur = typeof r.startedAt === "number" ? `  ${fmtDuration(now - r.startedAt)}` : "";
-  const tok = r.tokenTotal ? `  ${fmtTokens(r.tokenTotal)} tok` : "";
+  // SPEC-6-1 fix: "tok" is the live context snapshot (contextTokens), NOT cumulative
+  // tokenTotal — it pairs with the ctx% segment (same metric). Showing tokenTotal here
+  // ballooned to 6.7M on long runs (cumulative re-sends) next to a 35% ctx, looking broken.
+  const tok = r.contextTokens != null ? `  ${fmtTokens(r.contextTokens)} tok` : "";
   const ctx = (r.contextTokens != null && r.maxContext != null && r.maxContext > 0) ? `  ${Math.round(r.contextTokens / r.maxContext * 100)}%` : "";
   const cost = r.costTotal ? `  $${r.costTotal.toFixed(4)}` : "";
 

package/src/runtime/reconcile.ts

@@ -2,19 +2,32 @@
 // SPEC-5b-1 — on pi boot, mark orphan RunLog runs (run:meta with no run:ended whose process
 // is gone) as aborted so the Runs tab doesn't show stale "running" rows across restarts.
 // Foreground orphans; bg/lifecycle orphans are already handled by scanResumeCandidates (SPEC-5a).
+//
+// v0.10.2 patch: reconcile now ALSO syncs the in-memory RunRegistry (opts.runRegistry). Before this,
+// reconcile only wrote run:ended: aborted to the durable RunLog — the in-memory RunRegistry kept
+// status:"running", so the live above-editor widget (filterActive keeps running|queued|paused)
+// rendered a stale ▶ row that ticked forever for every orphaned (process-gone) run.
 import type { RunLog } from "./run-log.ts";
+import type { RunRegistry } from "../engine/run-registry.ts";
 
 export interface ReconcileOpts {
   /** Orphans whose startedAt is older than (now - graceMs) are marked aborted. Default 60000. */
   graceMs?: number;
   /** Test injection. Default Date.now(). */
   now?: number;
+  /**
+   * v0.10.2: the in-memory RunRegistry to sync alongside the durable log. When set, each orphan
+   * reconciled in the log is also transitioned to status:"aborted" in memory so the live widget
+   * clears its stale ▶ row. Optional — existing callers that pass only a RunLog are unaffected.
+   */
+  runRegistry?: RunRegistry;
 }
 
 /** Returns the runIds it marked aborted. Idempotent: a run already ended is skipped. */
 export function reconcileRuns(log: RunLog, opts: ReconcileOpts = {}): string[] {
   const grace = opts.graceMs ?? 60_000;
   const now = opts.now ?? Date.now();
+  const reg = opts.runRegistry;
   const aborted: string[] = [];
   for (const meta of log.scanMeta()) {
     if (meta.status !== "running") continue;
@@ -23,6 +36,10 @@ export function reconcileRuns(log: RunLog, opts: ReconcileOpts = {}): string[] {
       type: "run:ended", runId: meta.runId, status: "aborted",
       endedAt: now, resultSummary: "process-gone", tokenTotal: meta.tokenTotal,
     });
+    // v0.10.2: sync the in-memory registry so the live widget (which reads runRegistry.list(),
+    // not the RunLog) clears the orphan's stale ▶ row. No-op when the run isn't in the registry
+    // (e.g. a cross-cwd orphan from another session — out of scope for this patch).
+    reg?.update(meta.runId, { status: "aborted", endedAt: now });
     aborted.push(meta.runId);
   }
   return aborted;