pi-better-harness 0.17.0 → 0.17.1

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

@@ -36,7 +36,7 @@ For a DAG, assign stable ids to prerequisite steps and list those ids in depende
 
 When an explicitly invoked skill declares `workflow-role: coordinator` in its metadata, that skill's task plan takes precedence. The generic checklist stays persisted but is hidden, and `update_plan` refuses generic checklist updates until workflow ownership is released. `/plan` never opens a stale generic checklist during workflow ownership.
 
-For `rush-issues`, call `sync_workflow_plan` once with the absolute `.resolve-issues/rush/<run-id>/task-plan.json` path and its persisted `planRevision`. This binds the run to the session and shows its fleet stages and units in the widget, `/plan`, and `get_plan`; the binding survives Pi session resume, and ownership release restores the prior generic checklist. After that, record every transition with `update_plan` and a `workflow` object instead of editing `task-plan.json` or the profiling log by hand:
+For any workflow using the shared task-plan contract (including `resolve-issues` and `rush-issues`), call `sync_workflow_plan` once with the absolute `.resolve-issues/rush/<run-id>/task-plan.json` path and its persisted `planRevision`. This binds the run to the session and shows its fleet stages and units in the widget, `/plan`, and `get_plan`; the binding survives Pi session resume, and ownership release restores the prior generic checklist. After that, record every transition with `update_plan` and a `workflow` object instead of editing `task-plan.json` or the profiling log by hand:
 
 ```json
 { "workflow": {
@@ -50,7 +50,9 @@ For `rush-issues`, call `sync_workflow_plan` once with the absolute `.resolve-is
 } }
 ```
 
-`changes` addresses units, components, and fleet stages by id (a change without an id sets run-level fields); all changes in one call are one transition. For a scope change, a change with `target` `unit` or `component` and an `add` row appends a new row; existing rows cannot be removed or renamed. The tool checks ids, dependencies (including cycles), worker slots, and status/stage values against the Rush contract (a fleet status of `n/a` is saved as `not-applicable`), refuses a stale `revision`, appends an optional `decision`, then saves the plan atomically with `planRevision + 1` and a new `updatedAt`, and appends one profiling event with the same revision to the log the run already uses (`profiling/run.jsonl` or `profiling.jsonl`). A rejected update changes nothing. The event is appended before the plan is renamed into place, so a crash between the two can leave the log one revision ahead; the next update notices, reuses that revision, and marks its event with `logAheadRevision`. Other workflow-owned skills retain their own planning and have no generic plan view.
+`changes` addresses units, components, and fleet stages by id (a change without an id sets run-level fields); all changes in one call are one transition. For a scope change, a change with `target` `unit` or `component` and an `add` row appends a new row; existing rows cannot be removed or renamed. The tool checks ids, dependencies (including cycles), worker slots, and status/stage values against the shared issue-resolution contract (a fleet status of `n/a` is saved as `not-applicable`), refuses a stale `revision`, appends an optional `decision`, then saves the plan atomically with `planRevision + 1` and a new `updatedAt`, and appends one profiling event with the same revision to the log the run already uses (`profiling/run.jsonl` or `profiling.jsonl`). A rejected update changes nothing. The event is appended before the plan is renamed into place, so a crash between the two can leave the log one revision ahead; the next update notices, reuses that revision, and marks its event with `logAheadRevision`.
+
+The binding records the active workflow's name, which is shown in the plan view. A different workflow cannot read or update that binding; a new invocation or ownership release invalidates it. The skill name is not an allowlist: explicit binding opts a workflow into the shared schema and transition rules, while path confinement to `.resolve-issues/rush/<run-id>/task-plan.json`, run identity, size limits, and revision checks still apply. Workflows using other schemas or storage locations retain their own planning and must not bind incompatible state.
 
 ## Plan Display
 

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

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

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

@@ -134,7 +134,7 @@ export default function planExtension(pi: ExtensionAPI): void {
   const refresh = (force = false): void => refreshWidget?.(force);
 
   const loadRushPlan = (ctx: ExtensionContext): RushPlan | null => {
-    if (!rushBinding || workflowPlanOwner(ctx) !== "rush-issues") return null;
+    if (!rushBinding || workflowPlanOwner(ctx) !== rushBinding.owner) return null;
     try {
       const plan = readRushPlan(rushBinding.path, ctx.cwd);
       if (plan.runId !== rushBinding.runId) throw new Error("Rush run identity changed.");
@@ -181,7 +181,8 @@ export default function planExtension(pi: ExtensionAPI): void {
     const state = reconstructPlanState(ctx.sessionManager.getBranch());
     currentPlan = state.plan;
     displayedWorkflowOwner = workflowPlanOwner(ctx);
-    rushBinding = displayedWorkflowOwner === "rush-issues" ? workflowBinding(ctx.sessionManager.getBranch()) : null;
+    const binding = workflowBinding(ctx.sessionManager.getBranch());
+    rushBinding = binding?.owner === displayedWorkflowOwner ? binding : null;
     rushPlan = null;
     rushError = null;
     if (rushBinding) loadRushPlan(ctx);
@@ -213,13 +214,13 @@ export default function planExtension(pi: ExtensionAPI): void {
         refreshWidget = localRefresh;
         return {
           render(width: number): string[] {
-            if (displayMode === "hidden") return [];
+            if (displayMode === "hidden" || displayedWorkflowOwner !== workflowPlanOwner(ctx)) return [];
             if (displayedWorkflowOwner) {
-              if (displayedWorkflowOwner !== "rush-issues") return [];
+              if (rushBinding?.owner !== displayedWorkflowOwner) return [];
               const fg = typeof theme?.fg === "function"
                 ? (color: string, value: string) => theme.fg(color as never, value)
                 : undefined;
-              return rushPlan ? ["", ...renderRushPlan(rushPlan, width, false, fg)] : [];
+              return rushPlan ? ["", ...renderRushPlan(rushPlan, width, false, fg, displayedWorkflowOwner)] : [];
             }
             if (!currentPlan) return [];
             return ["", ...renderCompactPlan(currentPlan, width, theme as never)];
@@ -237,20 +238,20 @@ export default function planExtension(pi: ExtensionAPI): void {
   const showFullPlan = async (ctx: ExtensionContext): Promise<void> => {
     const owner = workflowPlanOwner(ctx);
     if (owner) {
-      const plan = owner === "rush-issues" ? loadRushPlan(ctx) : null;
+      const plan = loadRushPlan(ctx);
       if (!plan) {
-        ctx.ui.notify(owner === "rush-issues" ? `Rush plan unavailable: ${rushError ?? "not bound"}` : `${owner} owns the task plan.`, "warning");
+        ctx.ui.notify(`${owner} plan unavailable: ${rushError ?? "not bound"}`, "warning");
         return;
       }
       if (ctx.mode !== "tui") {
-        ctx.ui.notify(renderRushPlan(plan, 160, true).join("\n"), "info");
+        ctx.ui.notify(renderRushPlan(plan, 160, true, undefined, owner).join("\n"), "info");
         return;
       }
       await ctx.ui.custom<void>((tui, theme, _keys, done) => {
         const fg = typeof theme?.fg === "function"
           ? (color: string, value: string) => theme.fg(color as never, value)
           : undefined;
-        const component = createRushPlanComponent(plan, () => done(), fg);
+        const component = createRushPlanComponent(plan, () => done(), fg, owner);
         return { render: (width) => component.render(width), handleInput(data) {
           component.handleInput?.(data);
           tui.requestRender();
@@ -284,13 +285,14 @@ export default function planExtension(pi: ExtensionAPI): void {
   pi.registerTool({
     name: "sync_workflow_plan",
     label: "Sync Workflow Plan",
-    description: "Bind and display the persisted rush-issues task plan at its exact checkpoint revision. Record later transitions with update_plan's workflow field.",
+    description: "Bind and display an active workflow's compatible persisted task plan at its exact checkpoint revision. Record later transitions with update_plan's workflow field.",
     parameters: Type.Object({
       path: Type.String({ description: "Absolute path to .resolve-issues/rush/<run-id>/task-plan.json" }),
       revision: Type.Integer({ minimum: 0, description: "Persisted planRevision to display" }),
     }),
     async execute(_id, params, _signal, _onUpdate, ctx) {
-      if (workflowPlanOwner(ctx) !== "rush-issues") throw new Error("Only an active rush-issues workflow can sync its plan.");
+      const owner = workflowPlanOwner(ctx);
+      if (!owner) throw new Error("Only an active workflow can sync its plan.");
       const plan = readRushPlan(params.path, ctx.cwd);
       if (plan.planRevision !== params.revision) {
         rushPlan = null;
@@ -298,22 +300,23 @@ export default function planExtension(pi: ExtensionAPI): void {
         refresh(true);
         throw new Error(`Rush plan ${rushError}.`);
       }
-      const binding: WorkflowPlanBinding = { owner: "rush-issues", path: params.path, runId: plan.runId };
-      if (!rushBinding || rushBinding.path !== binding.path || rushBinding.runId !== binding.runId) {
+      const binding: WorkflowPlanBinding = { owner, path: params.path, runId: plan.runId };
+      if (!rushBinding || rushBinding.owner !== owner || rushBinding.path !== binding.path || rushBinding.runId !== binding.runId) {
         pi.appendEntry(WORKFLOW_PLAN_ENTRY, { version: 1, kind: "set", ...binding });
       }
+      displayedWorkflowOwner = owner;
       rushBinding = binding;
       rushPlan = plan;
       rushError = null;
       refresh(true);
-      return { content: [{ type: "text", text: `Showing rush-issues rev ${plan.planRevision}: ${plan.issues.length} units.` }], details: { runId: plan.runId, revision: plan.planRevision } };
+      return { content: [{ type: "text", text: `Showing ${owner} rev ${plan.planRevision}: ${plan.issues.length} units.` }], details: { runId: plan.runId, revision: plan.planRevision } };
     },
   });
 
   pi.registerTool({
     name: "update_plan",
     label: "Update Plan",
-    description: "Create or atomically replace the current structured execution plan and its step statuses. While rush-issues owns a bound plan, send workflow instead of plan to save one task-plan transition.",
+    description: "Create or atomically replace the current structured execution plan and its step statuses. While a workflow owns a bound plan, send workflow instead of plan to save one task-plan transition.",
     promptSnippet: "Create and update a persistent structured execution plan",
     promptGuidelines: [
       "Use update_plan for work with three or more meaningful steps unless a skill owns planning; update it immediately when a step completes, becomes blocked, or scope changes.",
@@ -322,7 +325,7 @@ export default function planExtension(pi: ExtensionAPI): void {
       "For generic plans, follow the active delegation mode. Manual forbids proactive delegation even in plan mode; adaptive favors substantial independent work; coordinator delegates nontrivial role-owned tasks after agents_catalog discovery.",
       "Use a generic plan as a milestone ledger only when no workflow owns planning. Otherwise follow the workflow's task plan and foreground role.",
       "For generic plans, use separate steps for distinct deliverables, not one step per worker process. Before completing verification or the plan, inspect and integrate every relevant delegated result or failure.",
-      "While rush-issues owns the plan and it is bound with sync_workflow_plan, record every transition with update_plan's workflow field instead of editing task-plan.json or its profiling log; it saves the rows, the next planRevision, and the matching profiling event together.",
+      "While a workflow owns the plan and it is bound with sync_workflow_plan, record every transition with update_plan's workflow field instead of editing task-plan.json or its profiling log; it saves the rows, the next planRevision, and the matching profiling event together.",
     ],
     parameters: UpdatePlanSchema,
     async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
@@ -330,9 +333,8 @@ export default function planExtension(pi: ExtensionAPI): void {
       const input = params as { explanation?: string; plan?: PlanStepInput[]; workflow?: RushPlanUpdate };
       if (input.workflow !== undefined) {
         if (!owner) throw new Error("No workflow owns the task plan; send plan instead of workflow.");
-        if (owner !== "rush-issues") throw new Error(`${owner} owns the task plan and does not accept update_plan workflow changes.`);
         if (input.plan !== undefined) throw new Error("Send either plan or workflow, not both.");
-        if (!rushBinding) throw new Error("No rush-issues plan is bound; call sync_workflow_plan with the task-plan.json path first.");
+        if (!rushBinding || rushBinding.owner !== owner) throw new Error(`No ${owner} plan is bound; call sync_workflow_plan with the task-plan.json path first.`);
         const result = applyRushPlanUpdate(rushBinding.path, ctx.cwd, rushBinding.runId, input.workflow);
         rushPlan = result.plan;
         rushError = null;
@@ -342,7 +344,7 @@ export default function planExtension(pi: ExtensionAPI): void {
         const logNote = result.logAheadRevision === undefined ? ""
           : ` The profiling log already held rev ${result.logAheadRevision} (an earlier write stopped after logging); this event supersedes it.`;
         return {
-          content: [{ type: "text", text: `Saved rush-issues rev ${result.revision} (${input.workflow.event.trim()})${rows.length ? `: ${rows.join(", ")}` : ""}${input.workflow.decision ? `${rows.length ? ";" : ":"} decision ${input.workflow.decision.id}` : ""}. Profiling: ${result.profilingPath}.${logNote}` }],
+          content: [{ type: "text", text: `Saved ${owner} rev ${result.revision} (${input.workflow.event.trim()})${rows.length ? `: ${rows.join(", ")}` : ""}${input.workflow.decision ? `${rows.length ? ";" : ":"} decision ${input.workflow.decision.id}` : ""}. Profiling: ${result.profilingPath}.${logNote}` }],
           details: {
             ok: true, runId: result.plan.runId, revision: result.revision, changed: result.changed, profilingPath: result.profilingPath,
             ...(result.logAheadRevision === undefined ? {} : { logAheadRevision: result.logAheadRevision }),
@@ -350,9 +352,7 @@ export default function planExtension(pi: ExtensionAPI): void {
         };
       }
       if (owner) {
-        throw new Error(owner === "rush-issues"
-          ? "rush-issues owns the task plan. Send workflow (bound with sync_workflow_plan) instead of plan."
-          : `${owner} owns the task plan. Update its workflow plan instead of update_plan.`);
+        throw new Error(`${owner} owns the task plan. Send workflow (bound with sync_workflow_plan) instead of plan.`);
       }
       if (input.plan === undefined) throw new Error("plan is required: send the full list of steps.");
       const plan = replacePlan(currentPlan, input.plan, input.explanation);
@@ -387,10 +387,10 @@ export default function planExtension(pi: ExtensionAPI): void {
     async execute(_toolCallId, _params, _signal, _onUpdate, ctx) {
       const owner = workflowPlanOwner(ctx);
       if (owner) {
-        const workflowPlan = owner === "rush-issues" ? loadRushPlan(ctx) : null;
+        const workflowPlan = loadRushPlan(ctx);
         return {
           content: [{ type: "text", text: workflowPlan
-            ? renderRushPlan(workflowPlan, 160, true).join("\n")
+            ? renderRushPlan(workflowPlan, 160, true, undefined, owner).join("\n")
             : `${owner} owns the task plan; ${rushError ?? "consult its persisted workflow state"}.` }],
           details: { hasPlan: !!workflowPlan, plan: workflowPlan, progress: null, workflowOwner: owner },
         };

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

@@ -28,7 +28,7 @@ export interface RushPlan {
 }
 
 export interface WorkflowPlanBinding {
-  owner: "rush-issues";
+  owner: string;
   path: string;
   runId: string;
 }
@@ -113,9 +113,9 @@ export function workflowBinding(entries: Iterable<{ type: string; customType?: s
     const data = entry.data;
     if (!isRecord(data) || data.version !== 1) continue;
     if (data.kind === "clear") binding = null;
-    else if (data.kind === "set" && data.owner === "rush-issues" &&
+    else if (data.kind === "set" && typeof data.owner === "string" && data.owner.length > 0 &&
              typeof data.path === "string" && typeof data.runId === "string") {
-      binding = { owner: "rush-issues", path: data.path, runId: data.runId };
+      binding = { owner: data.owner, path: data.path, runId: data.runId };
     }
   }
   return binding;
@@ -133,7 +133,7 @@ function workflowStatus(status: string): DisplayStatus {
   }
 }
 
-function presentRushPlan(plan: RushPlan): PlanPresentation {
+function presentRushPlan(plan: RushPlan, owner: string): PlanPresentation {
   // The warehouse canary only applies to data work; hide it otherwise.
   const stages = ["explore", "implement", "review", "ci", ...(plan.warehouseCanaryRequired ? ["canary"] : [])];
   const fleet = stages.map((stage) => {
@@ -142,7 +142,7 @@ function presentRushPlan(plan: RushPlan): PlanPresentation {
     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]];
+  const metadata = [[{ color: "dim", text: `${planText(owner)} · rev ${plan.planRevision}  ·` }, ...fleet]];
   if (plan.spec?.title) metadata.push([{ color: "dim", text: plan.spec.title }]);
   return {
     metadata,
@@ -164,16 +164,18 @@ export function renderRushPlan(
   width: number,
   full = false,
   fg?: (color: string, value: string) => string,
+  owner = "rush-issues",
 ): string[] {
   const theme = fg ? { fg } : plainPlanTheme;
-  return renderPlanPresentation(presentRushPlan(plan), width, theme, full);
+  return renderPlanPresentation(presentRushPlan(plan, owner), width, theme, full);
 }
 
 export function createRushPlanComponent(
   plan: RushPlan,
   onClose: () => void,
   fg?: (color: string, value: string) => string,
+  owner = "rush-issues",
 ): Component {
   const theme = fg ? { fg } : plainPlanTheme;
-  return createPlanPresentationComponent(presentRushPlan(plan), theme, onClose);
+  return createPlanPresentationComponent(presentRushPlan(plan, owner), theme, onClose);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-better-harness",
-  "version": "0.17.0",
+  "version": "0.17.1",
   "description": "Pi extension bundle for a write sandbox, subagents, background tasks, SSH, goals, and structured plans.",
   "license": "MIT",
   "type": "module",
@@ -54,7 +54,7 @@
   "dependencies": {
     "pi-better-background-tasks": "0.6.3",
     "pi-better-goal": "0.6.1",
-    "pi-better-plan": "0.5.2",
+    "pi-better-plan": "0.5.3",
     "pi-better-sandbox": "0.9.0",
     "pi-better-ssh": "0.1.1",
     "pi-better-subagents": "0.13.0",