pi-better-harness 0.3.17 → 0.3.18

package/node_modules/pi-better-plan/README.md

@@ -27,6 +27,12 @@ When an explicitly invoked skill declares `workflow-role: coordinator` in its me
 
 For `rush-issues`, call `sync_workflow_plan` with the absolute `.resolve-issues/rush/<run-id>/task-plan.json` path and its persisted `planRevision` after each checkpoint. This binds the active run to the session and displays its fleet stages and actual units in the widget, `/plan`, and `get_plan`. The view reads the file without writing to it; revision mismatches are rejected. The run binding survives Pi session resume, and ownership release restores the prior generic checklist. Other workflow-owned skills retain their own planning and have no generic plan view.
 
+## Plan Display
+
+Native and workflow-synced plans share a `plan` heading, completion counts, aligned identifiers and titles, and status colors. Completed rows use `✓`, active rows `●`, pending rows `○`, and blocked rows `!`. Active and blocked rows also carry text labels; failed workflow rows use `×` and `failed` rather than an active indicator.
+
+Workflow identity, revision, and fleet progress sit on a secondary line that wraps on narrow terminals. `/plan` uses the same styling and shows workflow stage, raw status, worker, dependencies, and notes beneath each issue. Use ↑/↓ to move the selection and Escape or ← to return. The passive widget never captures editor arrow keys.
+
 ## Install
 
 ```sh

package/node_modules/pi-better-plan/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-better-plan",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "description": "Structured execution plans with persistent progress for Pi.",
   "license": "MIT",
   "type": "module",

package/node_modules/pi-better-plan/src/plan-presentation.ts

@@ -0,0 +1,112 @@
+import type { Component } from "@earendil-works/pi-tui";
+import { matchesKey, truncateToWidth, visibleWidth, wrapTextWithAnsi } from "@earendil-works/pi-tui";
+
+export interface PlanRenderTheme {
+  fg(color: string, value: string): string;
+}
+
+export type DisplayStatus = "completed" | "in_progress" | "pending" | "blocked" | "failed" | "skipped" | "unknown";
+export interface PlanRow {
+  label: string;
+  title: string;
+  status: DisplayStatus;
+  statusLabel?: string;
+  details?: string[];
+}
+export interface PlanPresentation {
+  rows: PlanRow[];
+  metadata?: { text: string; color: string }[][];
+}
+
+export const plainPlanTheme: PlanRenderTheme = { fg: (_color, value) => value };
+
+export function statusStyle(status: DisplayStatus): { glyph: string; color: string; label: string } {
+  switch (status) {
+    case "completed": return { glyph: "✓", color: "success", label: "" };
+    case "in_progress": return { glyph: "●", color: "accent", label: "active" };
+    case "blocked": return { glyph: "!", color: "warning", label: "blocked" };
+    case "failed": return { glyph: "×", color: "error", label: "failed" };
+    case "skipped": return { glyph: "—", color: "dim", label: "skipped" };
+    case "unknown": return { glyph: "?", color: "warning", label: "unknown" };
+    case "pending": return { glyph: "○", color: "dim", label: "" };
+  }
+}
+
+// Keep each piece of external text on one terminal row before measuring it.
+export function planText(value: string): string {
+  return value.replace(/[\r\n\t]/g, " ");
+}
+
+export function renderPlanPresentation(
+  plan: PlanPresentation, width: number, theme: PlanRenderTheme,
+  full = false, selectedIndex = -1,
+): string[] {
+  const size = Math.max(1, Math.floor(width));
+  const count = (status: DisplayStatus) => plan.rows.filter((row) => row.status === status).length;
+  const summary = [`${count("completed")}/${plan.rows.length} complete`];
+  for (const [status, label] of [
+    ["in_progress", "in progress"], ["blocked", "blocked"], ["failed", "failed"],
+    ["skipped", "skipped"], ["unknown", "unknown"],
+  ] as const) {
+    if (count(status)) summary.push(`${count(status)} ${label}`);
+  }
+  if (count("pending") && summary.length === 1) summary.push(`${count("pending")} pending`);
+  const lines = [theme.fg("warning", "plan") + theme.fg("dim", `  ${summary.join(" · ")}`)];
+  for (const metadata of plan.metadata ?? []) {
+    const content = metadata.map((part) => theme.fg(part.color, planText(part.text))).join("");
+    for (const line of wrapTextWithAnsi(content, Math.max(1, size - 2))) lines.push(`  ${line}`);
+  }
+  lines.push("");
+
+  const labelWidth = Math.min(12, Math.max(4, ...plan.rows.map((row) => visibleWidth(planText(row.label)))));
+  const statusWidth = Math.min(24, Math.max(0, ...plan.rows.map((row) =>
+    visibleWidth(planText(row.statusLabel ?? statusStyle(row.status).label)))));
+  for (const [index, row] of plan.rows.entries()) {
+    const style = statusStyle(row.status);
+    const label = truncateToWidth(planText(row.label), labelWidth);
+    const prefix = (index === selectedIndex ? theme.fg("accent", "› ") : "  ") +
+      theme.fg(style.color, style.glyph) + " " + theme.fg("dim", label) +
+      " ".repeat(Math.max(0, labelWidth - visibleWidth(label)) + 2);
+    const titleColor = row.status === "blocked" ? "warning" : row.status === "failed" ? "error" :
+      row.status === "in_progress" ? "text" : "muted";
+    const badge = planText(row.statusLabel ?? style.label);
+    const available = size - visibleWidth(prefix);
+    // At narrow widths use an inline status so it survives title truncation.
+    if (badge && available < statusWidth + 14) {
+      lines.push(prefix + theme.fg(style.color, `${badge} · `) + theme.fg(titleColor, planText(row.title)));
+    } else {
+      const titleWidth = Math.max(0, available - (statusWidth ? statusWidth + 2 : 0));
+      const title = truncateToWidth(planText(row.title), titleWidth);
+      lines.push(prefix + theme.fg(titleColor, title) + (badge
+        ? " ".repeat(Math.max(0, titleWidth - visibleWidth(title)) + 2) + theme.fg(style.color, badge)
+        : ""));
+    }
+    if (full) {
+      for (const detail of row.details ?? []) {
+        const indent = Math.min(visibleWidth(prefix), Math.max(0, size - 4));
+        for (const line of wrapTextWithAnsi(planText(detail), Math.max(1, size - indent))) {
+          lines.push(" ".repeat(indent) + theme.fg("dim", line));
+        }
+      }
+    }
+  }
+  if (full) lines.push("", theme.fg("dim", "↑↓ navigate · esc / ← back"));
+  return lines.map((line) => truncateToWidth(line, size));
+}
+
+export function createPlanPresentationComponent(
+  plan: PlanPresentation, theme: PlanRenderTheme, onClose: () => void,
+): Component {
+  let selected = plan.rows.findIndex((row) => row.status === "in_progress");
+  if (selected < 0) selected = plan.rows.findIndex((row) => row.status !== "completed");
+  if (selected < 0) selected = Math.max(0, plan.rows.length - 1);
+  return {
+    render: (width) => renderPlanPresentation(plan, width, theme, true, selected),
+    handleInput(data) {
+      if (matchesKey(data, "up")) selected = Math.max(0, selected - 1);
+      else if (matchesKey(data, "down")) selected = Math.min(Math.max(0, plan.rows.length - 1), selected + 1);
+      else if (matchesKey(data, "escape") || matchesKey(data, "left") || matchesKey(data, "ctrl+c")) onClose();
+    },
+    invalidate() {},
+  };
+}

package/node_modules/pi-better-plan/src/plan-render.ts

@@ -1,94 +1,28 @@
 import type { Component } from "@earendil-works/pi-tui";
-import { matchesKey, truncateToWidth } from "@earendil-works/pi-tui";
+import {
+  createPlanPresentationComponent, renderPlanPresentation,
+  type PlanPresentation, type PlanRenderTheme,
+} from "./plan-presentation.js";
+import type { PlanSnapshot } from "./types.js";
 
-import { planProgress } from "./plan-state.js";
-import type { PlanSnapshot, PlanStep } from "./types.js";
+export type { PlanRenderTheme } from "./plan-presentation.js";
 
-export interface PlanRenderTheme {
-  fg(color: string, value: string): string;
-}
-
-export function renderCompactPlan(
-  plan: PlanSnapshot,
-  width: number,
-  theme: PlanRenderTheme,
-): string[] {
-  const progress = planProgress(plan);
-  const stateLabel = progress.blocked > 0
-    ? `${progress.blocked} blocked`
-    : progress.state === "complete"
-      ? "complete"
-      : progress.state.replace("_", " ");
-  const lines = [
-    theme.fg(progress.blocked > 0 ? "warning" : "accent", `plan ${progress.completed}/${progress.total} steps`) +
-      theme.fg("dim", ` · ${stateLabel}`),
-  ];
-
-  for (let index = 0; index < plan.steps.length; index += 1) {
-    const item = plan.steps[index]!;
-    lines.push(`  ${stepGlyph(item, theme)} ${index + 1}  ${stepText(item, theme)}`);
-  }
-  lines.push("");
-  return lines.map((line) => truncateToWidth(line, Math.max(1, width)));
-}
-
-export function renderFullPlan(plan: PlanSnapshot, width: number, theme: PlanRenderTheme, selectedIndex = -1): string[] {
-  const progress = planProgress(plan);
-  const heading = `Practical Plan · ${progress.completed}/${progress.total} completed`;
-  const lines = [theme.fg("accent", rule(heading, width)), ""];
-  for (let index = 0; index < plan.steps.length; index += 1) {
-    const item = plan.steps[index]!;
-    const prefix = index === selectedIndex ? theme.fg("accent", "› ") : "  ";
-    lines.push(`${prefix}${stepGlyph(item, theme)}  ${String(index + 1).padStart(2, " ")}  ${stepText(item, theme)}`);
-  }
-  lines.push("", theme.fg("dim", rule("", width)));
-  return lines.map((line) => truncateToWidth(line, Math.max(1, width)));
-}
-
-export function createFullPlanComponent(
-  plan: PlanSnapshot,
-  theme: PlanRenderTheme,
-  onClose: () => void,
-): Component {
-  let selected = planProgress(plan).activeIndex ?? firstIncompleteIndex(plan);
+function presentPlan(plan: PlanSnapshot): PlanPresentation {
   return {
-    render: (width) => renderFullPlan(plan, width, theme, selected),
-    handleInput(data) {
-      if (matchesKey(data, "up")) selected = clampIndex(selected - 1, plan.steps.length);
-      else if (matchesKey(data, "down")) selected = clampIndex(selected + 1, plan.steps.length);
-      else if (matchesKey(data, "escape") || matchesKey(data, "left") || matchesKey(data, "ctrl+c")) onClose();
-    },
-    invalidate() {},
+    rows: plan.steps.map((item, index) => ({
+      label: String(index + 1), title: item.step, status: item.status,
+    })),
   };
 }
 
-function firstIncompleteIndex(plan: PlanSnapshot): number {
-  const index = plan.steps.findIndex((item) => item.status !== "completed");
-  return index >= 0 ? index : Math.max(0, plan.steps.length - 1);
-}
-
-function clampIndex(index: number, total: number): number {
-  return Math.min(Math.max(0, index), Math.max(0, total - 1));
+export function renderCompactPlan(plan: PlanSnapshot, width: number, theme: PlanRenderTheme): string[] {
+  return renderPlanPresentation(presentPlan(plan), width, theme);
 }
 
-function stepGlyph(item: PlanStep, theme: PlanRenderTheme): string {
-  switch (item.status) {
-    case "completed": return theme.fg("success", "✓");
-    case "in_progress": return theme.fg("accent", "●");
-    case "blocked": return theme.fg("warning", "!");
-    case "pending": return theme.fg("dim", "○");
-  }
+export function renderFullPlan(plan: PlanSnapshot, width: number, theme: PlanRenderTheme, selectedIndex = -1): string[] {
+  return renderPlanPresentation(presentPlan(plan), width, theme, true, selectedIndex);
 }
 
-function stepText(item: PlanStep, theme: PlanRenderTheme): string {
-  if (item.status === "completed" || item.status === "pending") return theme.fg("muted", item.step);
-  if (item.status === "blocked") return theme.fg("warning", `BLOCKED · ${item.step}`);
-  return item.step;
+export function createFullPlanComponent(plan: PlanSnapshot, theme: PlanRenderTheme, onClose: () => void): Component {
+  return createPlanPresentationComponent(presentPlan(plan), theme, onClose);
 }
-
-function rule(label: string, width: number): string {
-  const size = Math.max(1, Math.floor(width));
-  if (!label) return "━".repeat(size);
-  const prefix = `━━ ${label} `;
-  return prefix + "━".repeat(Math.max(0, size - prefix.length));
-}

package/node_modules/pi-better-plan/src/workflow-plan.ts

@@ -1,7 +1,10 @@
 import { readFileSync, realpathSync, statSync } from "node:fs";
 import { basename, dirname, isAbsolute, relative, resolve, sep } from "node:path";
 import type { Component } from "@earendil-works/pi-tui";
-import { matchesKey, truncateToWidth } from "@earendil-works/pi-tui";
+import {
+  createPlanPresentationComponent, plainPlanTheme, planText, renderPlanPresentation, statusStyle,
+  type DisplayStatus, type PlanPresentation,
+} from "./plan-presentation.js";
 
 export const WORKFLOW_PLAN_ENTRY = "pi-better-workflow-plan";
 
@@ -98,27 +101,51 @@ export function workflowBinding(entries: Iterable<{ type: string; customType?: s
   return binding;
 }
 
+function workflowStatus(status: string): DisplayStatus {
+  switch (status) {
+    case "succeeded": case "completed": return "completed";
+    case "in-flight": case "in_progress": case "running": case "diagnosing": return "in_progress";
+    case "pending": return "pending";
+    case "blocked": return "blocked";
+    case "failed": return "failed";
+    case "skipped": case "not-applicable": case "cancelled": return "skipped";
+    default: return "unknown";
+  }
+}
+
+function presentRushPlan(plan: RushPlan): PlanPresentation {
+  const fleet = ["explore", "combine", "canary", "review", "cicd"].map((stage) => {
+    const status = stage === "canary" && !plan.warehouseCanaryRequired
+      ? "not-applicable" : plan.fleet[stage]?.status ?? "pending";
+    const display = workflowStatus(status);
+    const style = statusStyle(display);
+    return { color: style.color, text: `  ${stage} ${style.glyph}${display === "unknown" ? ` ${planText(status)}` : ""}` };
+  });
+  const metadata = [[{ color: "dim", text: `rush-issues · rev ${plan.planRevision}  ·` }, ...fleet]];
+  if (plan.spec?.title) metadata.push([{ color: "dim", text: plan.spec.title }]);
+  return {
+    metadata,
+    rows: plan.issues.map((unit) => {
+      const status = workflowStatus(unit.status);
+      const details = [`${unit.stage} · ${unit.status}${unit.worker !== undefined ? ` · worker ${unit.worker}` : ""}`];
+      if (unit.dependsOn.length) details.push(`after: ${unit.dependsOn.map((id) => `#${id}`).join(", ")}`);
+      if (unit.note) details.push(unit.note);
+      return {
+        label: `#${unit.id}`, title: unit.title, status, details,
+        ...(status === "unknown" || unit.status === "cancelled" ? { statusLabel: unit.status } : {}),
+      };
+    }),
+  };
+}
+
 export function renderRushPlan(
   plan: RushPlan,
   width: number,
   full = false,
   fg?: (color: string, value: string) => string,
 ): string[] {
-  const completed = plan.issues.filter((unit) => unit.status === "succeeded").length;
-  const summary = `rev ${plan.planRevision}  ${completed}/${plan.issues.length} units${plan.spec?.title ? `  ${plan.spec.title}` : ""}`;
-  const lines = [fg ? `${fg("warning", "rush-issues")}  ${fg("dim", summary)}` : `rush-issues  ${summary}`];
-  const fleet = ["explore", "combine", "canary", "review", "cicd"]
-    .map((stage) => `${stage}: ${stage === "canary" && !plan.warehouseCanaryRequired ? "n/a" : plan.fleet[stage]?.status ?? "pending"}`);
-  lines.push(`fleet  ${fleet.join("  ")}`);
-  for (const unit of plan.issues) {
-    const marker = unit.status === "succeeded" ? "✓" : unit.status === "blocked" ? "!" : unit.status === "pending" ? "○" : "●";
-    lines.push(`${marker} #${unit.id} ${unit.title}  [${unit.stage} · ${unit.status}${unit.worker !== undefined ? ` · worker ${unit.worker}` : ""}]`);
-    if (full) {
-      if (unit.dependsOn.length) lines.push(`    after: ${unit.dependsOn.map((id) => `#${id}`).join(", ")}`);
-      if (unit.note) lines.push(`    ${unit.note}`);
-    }
-  }
-  return lines.map((line) => truncateToWidth(line, Math.max(1, width)));
+  const theme = fg ? { fg } : plainPlanTheme;
+  return renderPlanPresentation(presentRushPlan(plan), width, theme, full);
 }
 
 export function createRushPlanComponent(
@@ -126,11 +153,6 @@ export function createRushPlanComponent(
   onClose: () => void,
   fg?: (color: string, value: string) => string,
 ): Component {
-  return {
-    render: (width) => renderRushPlan(plan, width, true, fg),
-    handleInput(data) {
-      if (matchesKey(data, "escape") || matchesKey(data, "left") || matchesKey(data, "ctrl+c")) onClose();
-    },
-    invalidate() {},
-  };
+  const theme = fg ? { fg } : plainPlanTheme;
+  return createPlanPresentationComponent(presentRushPlan(plan), theme, onClose);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-better-harness",
-  "version": "0.3.17",
+  "version": "0.3.18",
   "description": "Pi extension bundle for a write sandbox, subagents, background tasks, SSH, goals, and structured plans.",
   "license": "MIT",
   "type": "module",
@@ -52,7 +52,7 @@
   "dependencies": {
     "pi-better-background-tasks": "0.2.15",
     "pi-better-goal": "0.4.0",
-    "pi-better-plan": "0.3.3",
+    "pi-better-plan": "0.3.4",
     "pi-better-sandbox": "0.3.0",
     "pi-better-ssh": "0.1.1",
     "pi-better-subagents": "0.1.31",