@osolmaz/pi-workflows 0.12.0 → 0.12.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@osolmaz/pi-workflows",
-  "version": "0.12.0",
+  "version": "0.12.1",
   "description": "Workflow and controller runtime with a live terminal viewer for the pi coding agent",
   "keywords": [
     "pi-package"
@@ -69,9 +69,9 @@
     "jiti": "^2.7.0"
   },
   "devDependencies": {
-    "@earendil-works/pi-ai": "^0.80.10",
-    "@earendil-works/pi-coding-agent": "^0.80.10",
-    "@earendil-works/pi-tui": "^0.80.10",
+    "@earendil-works/pi-ai": "0.84.2",
+    "@earendil-works/pi-coding-agent": "0.84.2",
+    "@earendil-works/pi-tui": "0.84.2",
     "@types/better-sqlite3": "^7.6.13",
     "@types/node": "^26.1.1",
     "@vitest/coverage-istanbul": "^4.1.10",
@@ -83,9 +83,9 @@
     "vitest": "^4.1.10"
   },
   "peerDependencies": {
-    "@earendil-works/pi-ai": "*",
-    "@earendil-works/pi-coding-agent": "*",
-    "@earendil-works/pi-tui": "*",
+    "@earendil-works/pi-ai": ">=0.84.2 <0.85.0",
+    "@earendil-works/pi-coding-agent": ">=0.84.2 <0.85.0",
+    "@earendil-works/pi-tui": ">=0.84.2 <0.85.0",
     "typebox": "*"
   },
   "engines": {

package/schemas/human-decision-accepted-v1.schema.json

@@ -8,9 +8,11 @@
     "schema",
     "decisionId",
     "requestDigest",
+    "subjectDigest",
+    "presentationDigest",
+    "revision",
     "response",
-    "source",
-    "idempotencyKey",
+    "provenance",
     "acceptedAt",
     "answerDigest"
   ],
@@ -18,6 +20,9 @@
     "schema": { "const": "pi-workflows.human-decision-accepted.v1" },
     "decisionId": { "type": "string" },
     "requestDigest": { "type": "string", "pattern": "^sha256:[a-f0-9]{64}$" },
+    "subjectDigest": { "type": "string", "pattern": "^sha256:[a-f0-9]{64}$" },
+    "presentationDigest": { "type": "string", "pattern": "^sha256:[a-f0-9]{64}$" },
+    "revision": { "type": "integer", "minimum": 1 },
     "response": {
       "type": "object",
       "additionalProperties": false,
@@ -27,6 +32,7 @@
         "input": { "type": "object", "additionalProperties": { "type": "string" } }
       }
     },
+    "provenance": { "enum": ["human", "timeout"] },
     "source": {
       "type": "object",
       "additionalProperties": false,
@@ -40,5 +46,11 @@
     "idempotencyKey": { "type": "string" },
     "acceptedAt": { "type": "string", "format": "date-time" },
     "answerDigest": { "type": "string", "pattern": "^sha256:[a-f0-9]{64}$" }
-  }
+  },
+  "allOf": [
+    {
+      "if": { "properties": { "provenance": { "const": "human" } } },
+      "then": { "required": ["source", "idempotencyKey"] }
+    }
+  ]
 }

package/schemas/human-decision-continuation-v1.schema.json

@@ -4,11 +4,20 @@
   "title": "pi-workflows human decision continuation v1",
   "type": "object",
   "additionalProperties": false,
-  "required": ["schema", "decisionId", "requestDigest", "parentRunId", "runId", "createdAt"],
+  "required": [
+    "schema",
+    "decisionId",
+    "requestDigest",
+    "provenance",
+    "parentRunId",
+    "runId",
+    "createdAt"
+  ],
   "properties": {
     "schema": { "const": "pi-workflows.human-decision-continuation.v1" },
     "decisionId": { "type": "string" },
     "requestDigest": { "type": "string", "pattern": "^sha256:[a-f0-9]{64}$" },
+    "provenance": { "enum": ["human", "timeout"] },
     "parentRunId": { "type": "string" },
     "runId": { "type": "string" },
     "createdAt": { "type": "string", "format": "date-time" }

package/schemas/human-decision-delivery-v1.schema.json

@@ -9,7 +9,9 @@
     "attemptId",
     "decisionId",
     "requestDigest",
+    "presentationDigest",
     "channel",
+    "phase",
     "state",
     "createdAt"
   ],
@@ -18,10 +20,16 @@
     "attemptId": { "type": "string" },
     "decisionId": { "type": "string" },
     "requestDigest": { "type": "string", "pattern": "^sha256:[a-f0-9]{64}$" },
+    "presentationDigest": { "type": "string", "pattern": "^sha256:[a-f0-9]{64}$" },
     "channel": { "type": "string" },
+    "phase": { "enum": ["intent", "part", "complete"] },
     "state": { "enum": ["intent", "confirmed", "failed", "unknown"] },
     "createdAt": { "type": "string", "format": "date-time" },
     "finishedAt": { "type": "string", "format": "date-time" },
+    "recipientIndex": { "type": "integer", "minimum": 1 },
+    "partIndex": { "type": "integer", "minimum": 1 },
+    "partCount": { "type": "integer", "minimum": 1, "maximum": 20 },
+    "contentDigest": { "type": "string", "pattern": "^sha256:[a-f0-9]{64}$" },
     "messageCount": { "type": "integer", "minimum": 0 },
     "errorCode": { "type": "string" }
   }

package/schemas/human-decision-receipt-v1.schema.json

@@ -8,8 +8,12 @@
     "schema",
     "decisionId",
     "requestDigest",
+    "subjectDigest",
+    "presentationDigest",
+    "revision",
     "nodeId",
     "response",
+    "provenance",
     "acceptedAt",
     "answerDigest"
   ],
@@ -17,6 +21,9 @@
     "schema": { "const": "pi-workflows.human-decision-receipt.v1" },
     "decisionId": { "type": "string" },
     "requestDigest": { "type": "string", "pattern": "^sha256:[a-f0-9]{64}$" },
+    "subjectDigest": { "type": "string", "pattern": "^sha256:[a-f0-9]{64}$" },
+    "presentationDigest": { "type": "string", "pattern": "^sha256:[a-f0-9]{64}$" },
+    "revision": { "type": "integer", "minimum": 1 },
     "nodeId": { "type": "string" },
     "response": {
       "type": "object",
@@ -27,6 +34,7 @@
         "input": { "type": "object", "additionalProperties": { "type": "string" } }
       }
     },
+    "provenance": { "enum": ["human", "timeout"] },
     "acceptedAt": { "type": "string", "format": "date-time" },
     "answerDigest": { "type": "string", "pattern": "^sha256:[a-f0-9]{64}$" }
   }

package/schemas/human-decision-request-v1.schema.json

@@ -8,13 +8,17 @@
     "schema",
     "decisionId",
     "requestDigest",
+    "subjectDigest",
+    "presentationDigest",
     "runId",
     "workflowName",
     "nodeId",
     "attemptId",
     "audience",
     "title",
-    "body",
+    "subject",
+    "presentation",
+    "revision",
     "choices",
     "createdAt"
   ],
@@ -22,13 +26,19 @@
     "schema": { "const": "pi-workflows.human-decision-request.v1" },
     "decisionId": { "type": "string", "pattern": "^[A-Za-z0-9][A-Za-z0-9._-]{0,199}$" },
     "requestDigest": { "type": "string", "pattern": "^sha256:[a-f0-9]{64}$" },
+    "subjectDigest": { "type": "string", "pattern": "^sha256:[a-f0-9]{64}$" },
+    "presentationDigest": { "type": "string", "pattern": "^sha256:[a-f0-9]{64}$" },
     "runId": { "type": "string" },
     "workflowName": { "type": "string" },
     "nodeId": { "type": "string" },
     "attemptId": { "type": "string" },
     "audience": { "type": "string" },
     "title": { "type": "string", "minLength": 1 },
-    "body": true,
+    "subject": true,
+    "presentation": {
+      "$ref": "decision-presentation-v1.schema.json"
+    },
+    "revision": { "type": "integer", "minimum": 1 },
     "choices": {
       "type": "object",
       "minProperties": 1,
@@ -54,6 +64,16 @@
       }
     },
     "createdAt": { "type": "string", "format": "date-time" },
-    "expiresAt": { "type": "string", "format": "date-time" }
-  }
+    "expiresAt": { "type": "string", "format": "date-time" },
+    "defaultResponse": {
+      "type": "object",
+      "additionalProperties": false,
+      "required": ["choice"],
+      "properties": {
+        "choice": { "type": "string" },
+        "input": { "type": "object", "additionalProperties": { "type": "string" } }
+      }
+    }
+  },
+  "dependentRequired": { "defaultResponse": ["expiresAt"] }
 }

package/skills/autoimplement/SKILL.md

@@ -20,6 +20,7 @@ Build the input as follows:
 - `baseBranch`: Use the requested base or the repository default branch.
 - `merge`: Set `true` only when the user explicitly requested merge or an applicable standing instruction authorizes it. Otherwise set `false`.
 - `documents`: Include known canonical plan or specification paths. Use an empty array when none are known.
+- `approval`: Omit it for the default behavior: ask on each new plan and continue after 10 minutes without an answer. Use `{ "mode": "required" }` when the user says to block on plan changes. Use `{ "mode": "skip" }` when the user says to continue without asking about plan changes.
 - `concurrency`: Include it only when the conversation gives explicit limits.
 
 When one repository is clearly named, derive the scope without asking the user to restate it. A safe derived scope permits only work needed for the task in that repository, including local verification and normal branch and pull-request publication. It excludes unrelated repositories, merge, release, deployment, credentials, and policy changes unless those actions are explicitly authorized.
@@ -51,6 +52,32 @@ Replace the example values below with facts from the conversation, then make one
 }
 ```
 
+### Plan-change decisions
+
+The workflow gates only plans that it creates or changes after the run starts. A supplied or discovered existing plan does not receive another decision.
+
+Use required approval when the user says to block on plan changes:
+
+```json
+{
+  "approval": {
+    "mode": "required"
+  }
+}
+```
+
+Skip plan decisions when the user says to accept every new plan immediately:
+
+```json
+{
+  "approval": {
+    "mode": "skip"
+  }
+}
+```
+
+Omit `approval` for autonomous mode. It asks the `operator` audience and continues with the exact presented plan after 10 minutes without an accepted answer. The workflow owns this decision. The model must not answer the protected decision through the workflow tool.
+
 Do not manually duplicate stages already owned by the workflow. Autoimplement runs independent pi-reviewer commands, pending CI watches, and local verification commands from separate repositories in bounded batches. It keeps model turns, fixes, pushes, comment changes, merges, and releases ordered. One repository uses the same batch path with concurrency one.
 
 When this skill is loaded inside an active workflow step, do not start another workflow. Complete the current step contract with the available tools.

package/skills/monitor/SKILL.md

@@ -29,7 +29,7 @@ Derive the workflow input from the full conversation:
 - `task`: State the complete objective, the exact current target and stable identifiers, authoritative status sources, durable progress and final-output surfaces, routine actions authorized by the monitor request, other recorded approvals, immutable boundaries, cost and credential rules, and required validation or downstream operations.
 - `everyMinutes`: Use the user's interval when present. Use `30` when the user gives no interval. The built-in workflow accepts intervals from 1 minute through 24 hours.
 - `stopWhen`: Infer verified completion from the full conversation. Describe completion of the complete objective, not only the end of one physical process. Also name material blockers that require human intervention.
-- `repair`: Include this object only when the request or an existing approval authorizes mutation. Set `authorized: true` and record the repository, scope, base branch, merge policy, and constraints that apply. Omit it for observation-only work.
+- `repair`: Include this object only when the request or an existing approval authorizes mutation. Set `authorized: true` and record the repository, scope, base branch, merge policy, and constraints that apply. Omit it for observation-only work. Omit `repair.approval` for the default behavior: ask on each new repair plan and continue after 10 minutes without an answer. Use `{ "mode": "required" }` to block on plan changes or `{ "mode": "skip" }` to continue without asking.
 
 Replace the example values below with facts from the conversation, then make one start call:
 
@@ -65,9 +65,37 @@ When the conversation gives no clear finish criterion, set `stopWhen` to `Stop o
 
 Do not invent a finite check count. Omit `maxChecks` unless the user explicitly requests one. The workflow host can apply its own safety upper bound. Disclose that bound if it appears.
 
-When repair is authorized, route a concrete code or design defect through the monitor's composed repair path. Supply the problem, observed evidence, and a stable fingerprint of the issue plus target state. The workflow runs outer `autoplan`, standalone `autodoc`, optional `plan-approval`, `autoimplement`, and internal redesign when needed, then checks the target again. Do not copy their prompts into the monitor task.
+When repair is authorized, route a concrete code or design defect through the monitor's shared plan-change path. Supply the problem, observed evidence, and a stable fingerprint of the issue plus target state. The path runs Autoplan, Autodoc, the configured plan decision, and Autoimplement, then checks the target again. Autoimplement does not ask again for the plan selected by Monitor. It uses the same shared path if later evidence requires another plan. Do not copy their prompts into the monitor task.
 
-Add `repair.approval` only when the user requests a human plan decision. Set its named `audience` and a bounded `maxReplans`. A verified continue answer starts implementation. Stop ends the repair truthfully. Replan preserves the exact operator text, sends it back to autoplan, documents the revised plan, and asks again. The model-facing workflow answer tool cannot answer this gate.
+### Repair plan decisions
+
+Omit `repair.approval` for autonomous mode. It asks the `operator` audience and continues with the exact presented plan after 10 minutes without an accepted answer.
+
+Block until the operator answers:
+
+```json
+{
+  "repair": {
+    "approval": {
+      "mode": "required"
+    }
+  }
+}
+```
+
+Continue without asking:
+
+```json
+{
+  "repair": {
+    "approval": {
+      "mode": "skip"
+    }
+  }
+}
+```
+
+`continue` starts implementation. `stop` ends the repair truthfully. `replan` preserves the exact operator text, sends it through the shared plan-change workflow, records the revised plan, and asks again. The model-facing workflow answer tool cannot answer this gate.
 
 ## Keep routine work moving
 

package/skills/pi-workflows/SKILL.md

@@ -71,7 +71,8 @@ Follow these rules:
 - Give included workflows named exits, map their input explicitly, and keep parent edges out of child internals.
 - Keep `compute` pure. Put external effects in agent, function-action, or shell-action nodes.
 - Use structured node outputs for routing.
-- Use an ordinary checkpoint for external continuation data that the model may submit. Use `humanDecision()` for a verified human choice, and use the included `plan-approval` workflow for standard continue, stop, and exact-text replan routing.
+- Use an ordinary checkpoint for external continuation data that the model may submit. Use `humanDecision()` for a verified human choice. Use its typed `onTimeout` policy only when the workflow may supply a named automatic response after a durable deadline. A timeout response is recorded as policy provenance, not as a human answer.
+- Use the shared internal plan-change workflow for Autoplan, Autodoc, plan approval, and bounded exact-text replanning. Do not copy that sequence into Autoimplement, Monitor, or another workflow.
 - Set explicit step and command timeouts.
 - Bound ordinary loops with `maxSteps` or another clear finish rule.
 - Use a controller instead of a workflow for indefinite resource reconciliation.

package/skills/sanity-check/SKILL.md

@@ -0,0 +1,44 @@
+---
+name: sanity-check
+description: Use when the user asks for a read-only sanity check of a repository contribution, including whether it is necessary, duplicates existing code, adds justified contracts, or has proportionate scope and tests. Starts the built-in sanity-check workflow and returns an evidence-backed keep, simplify, refactor, drop, or needs-evidence verdict.
+compatibility: Requires pi-workflows and the built-in sanity-check workflow.
+---
+
+# Sanity Check
+
+## Start the workflow
+
+Use the built-in `sanity-check` workflow when it is available. At top level, list workflows, build the complete input, and start `sanity-check` once.
+
+The workflow reviews the repository of the current Pi session. Before starting, confirm that Pi's current working directory is inside the repository that owns the contribution. Do not claim to check a different repository. If the current directory is wrong, start or use a Pi session in the correct repository first.
+
+Build the input as follows:
+
+- `mode`: Use `serial` unless the user explicitly requests parallel review. Serial mode reviews all four areas in one isolated session. Parallel mode runs one isolated review per area with concurrency four. Both modes run a separate verification review.
+- `baseRef`: Use the requested base Git reference. When the base is clear, pass it explicitly, such as `origin/main`. Omit it only when the workflow should derive the base from `origin/HEAD`, the current branch upstream, or `HEAD^`.
+
+Replace the example values below with facts from the conversation, then make one start call:
+
+```json
+{
+  "action": "start",
+  "workflow": "sanity-check",
+  "input": {
+    "mode": "serial",
+    "baseRef": "origin/main"
+  }
+}
+```
+
+The workflow is read-only. It collects committed and working-tree evidence, reads matching pull-request metadata when available, runs isolated reviews, verifies their claims, and reports one verdict. It does not edit files, post comments, or fix findings.
+
+When this skill is loaded inside an active workflow step, do not start another workflow. Complete the current step contract.
+
+Outside Pi, or when the workflow is unavailable:
+
+1. Collect the committed diff from the selected base through `HEAD`, the working-tree diff, untracked files, and matching pull-request context.
+2. Review necessity, duplication, contracts, and scope and tests.
+3. For each area, report pass, concern, or unclear with exact file and symbol evidence.
+4. State the strongest evidence-based case for accepting the contribution.
+5. Verify the findings, remove unsupported claims, and return keep, simplify, refactor, drop, or needs evidence.
+6. Stay read-only unless the user separately asks to implement the required changes.

package/src/builtins/autoimplement.workflow.ts

@@ -27,8 +27,8 @@ import {
   type PublishedRepository,
   type VerificationCommandPlan,
 } from "./autoimplement-command-batches.js";
-import autoplanWorkflow, { type AutoplanInput } from "./autoplan.workflow.js";
-import planApprovalWorkflow, { type PlanApprovalInput } from "./plan-approval.workflow.js";
+import { parsePlanApprovalPolicy, type PlanApprovalPolicy } from "./plan-approval.workflow.js";
+import planChangeWorkflow, { type NormalizedPlanChangeInput } from "./plan-change.workflow.js";
 
 export type AutoimplementInput = {
   task: string;
@@ -44,10 +44,7 @@ export type AutoimplementInput = {
     planDigest: string;
     documents: string[];
   };
-  approval?: {
-    audience: string;
-    maxReplans: number;
-  };
+  approval?: PlanApprovalPolicy;
   concurrency?: Partial<AutoimplementConcurrency>;
 };
 
@@ -465,22 +462,7 @@ function parseInput(value: unknown): AutoimplementInput {
     };
   }
   const concurrency = parseAutoimplementConcurrency(input.concurrency);
-  let approval: AutoimplementInput["approval"];
-  if (input.approval !== undefined) {
-    const raw = requireRecord(input.approval, "autoimplement approval");
-    const maxReplans = raw.maxReplans ?? 3;
-    if (
-      !Number.isInteger(maxReplans) ||
-      (maxReplans as number) < 1 ||
-      (maxReplans as number) > 20
-    ) {
-      throw new Error("autoimplement approval maxReplans must be from 1 through 20");
-    }
-    approval = {
-      audience: requireString(raw.audience, "autoimplement approval audience"),
-      maxReplans: maxReplans as number,
-    };
-  }
+  const approval = parsePlanApprovalPolicy(input.approval);
   return {
     task: requireString(input.task, "autoimplement task"),
     ...(input.plan !== undefined ? { plan: input.plan } : {}),
@@ -495,7 +477,7 @@ function parseInput(value: unknown): AutoimplementInput {
     merge: input.merge === true,
     ...(documents !== undefined ? { documents: [...documents] as string[] } : {}),
     ...(documentation !== undefined ? { documentation } : {}),
-    ...(approval !== undefined ? { approval } : {}),
+    approval,
     concurrency,
   };
 }
@@ -637,20 +619,6 @@ function currentPlan(context: WorkflowNodeContext): unknown {
   return (context.input as AutoimplementInput).plan;
 }
 
-function currentPlanDigest(context: WorkflowNodeContext): string {
-  const adopted = context.outputs.adoptPlan as { planDigest?: unknown } | undefined;
-  if (typeof adopted?.planDigest === "string") return adopted.planDigest;
-  const documented = context.outputs.documentation as
-    | { exit?: string; output?: { planDigest?: unknown } }
-    | undefined;
-  if (documented?.exit === "ready" && typeof documented.output?.planDigest === "string") {
-    return documented.output.planDigest;
-  }
-  const plan = currentPlan(context);
-  if (plan === undefined) throw new Error("autoimplement does not have a selected plan");
-  return digest(plan);
-}
-
 function blockerChallenges(context: WorkflowNodeContext): BlockerChallenge[] {
   return context.state.steps
     .filter((step) => step.nodeId === "challengeBlocker" && step.outcome === "ok")
@@ -688,16 +656,6 @@ function recentWorkflowAttempts(context: WorkflowNodeContext): unknown[] {
 }
 
 function latestIssue(context: WorkflowNodeContext): unknown {
-  const approval = context.outputs.approval as
-    | { exit?: string; output?: { instructions?: unknown } }
-    | undefined;
-  if (approval?.exit === "replan" && typeof approval.output?.instructions === "string") {
-    return {
-      source: "human-replan",
-      instructions: approval.output.instructions,
-      priorPlanDigest: currentPlanDigest(context),
-    };
-  }
   const ids = [
     "challengeBlocker",
     "classifyImplementation",
@@ -1145,11 +1103,10 @@ function latestBlockedReason(context: WorkflowNodeContext): { reason: string; ev
     "classifyImplementation",
     "classifyVerification",
     "triageReview",
-    "replanGuard",
+    "redesign",
     "adoptPlan",
     "findPlan",
     "documentation",
-    "approval",
   ];
   for (let index = context.state.steps.length - 1; index >= 0; index -= 1) {
     const step = context.state.steps[index];
@@ -1191,37 +1148,18 @@ export const autoimplementWorkflow = defineWorkflow({
         };
       },
     }),
-    approval: includeWorkflow(planApprovalWorkflow, {
-      input: (context): PlanApprovalInput => {
+    redesign: includeWorkflow(planChangeWorkflow, {
+      input: (context): NormalizedPlanChangeInput => {
         const request = context.input as AutoimplementInput;
-        if (request.approval === undefined) {
-          throw new Error("autoimplement approval was entered without an approval policy");
-        }
-        const plan = currentPlan(context);
-        if (plan === undefined) throw new Error("autoimplement approval is missing a plan");
-        const revisions = context.state.steps.filter(
-          (step) => step.nodeId === "approval/approve",
-        ).length;
         return {
           task: request.task,
-          plan,
-          planDigest: currentPlanDigest(context),
-          audience: request.approval.audience,
-          revision: revisions + 1,
-        };
-      },
-    }),
-    redesign: includeWorkflow({
-      workflow: "autoplan",
-      contract: autoplanWorkflow,
-      input: (context): AutoplanInput => {
-        const request = context.input as AutoimplementInput;
-        return {
-          problem: request.task,
           ...(request.scope !== undefined ? { scope: request.scope } : {}),
           ...(request.constraints !== undefined ? { constraints: request.constraints } : {}),
+          ...(request.repository !== undefined ? { repository: request.repository } : {}),
+          documents: request.documents ?? request.documentation?.documents ?? [],
           ...(currentPlan(context) !== undefined ? { previousPlan: currentPlan(context) } : {}),
           newEvidence: latestIssue(context),
+          approval: parsePlanApprovalPolicy(request.approval),
         };
       },
     }),
@@ -1285,40 +1223,17 @@ export const autoimplementWorkflow = defineWorkflow({
     }),
     adoptPlan: compute({
       run: ({ outputs }) => {
-        const result = includedResult(autoplanWorkflow, outputs.redesign);
+        const result = includedResult(planChangeWorkflow, outputs.redesign);
         if (result.exit !== "ready") throw new Error("redesign did not return a ready plan");
         return {
-          route: result.output.changed ? "document" : "blocked",
           plan: result.output.plan,
           planDigest: result.output.planDigest,
-          changed: result.output.changed,
-          reason: result.output.changed
-            ? "The plan changed in response to new evidence and must be documented."
-            : "Redesign returned the same plan for the same unresolved evidence.",
+          documents: result.output.documents,
+          approval: result.output.approval,
+          reason: "The changed plan was documented and passed its approval policy.",
         };
       },
     }),
-    maybeApproval: compute({
-      run: ({ input }) => ({
-        route: (input as AutoimplementInput).approval === undefined ? "implement" : "approve",
-      }),
-    }),
-    replanGuard: compute({
-      run: (context) => {
-        const request = context.input as AutoimplementInput;
-        const limit = request.approval?.maxReplans ?? 3;
-        const replans = context.state.steps.filter(
-          (step) => step.nodeId === "approval/replan",
-        ).length;
-        return replans > limit
-          ? {
-              route: "blocked",
-              reason: `Plan approval reached the ${limit}-replan safety limit.`,
-              evidence: context.outputs.approval,
-            }
-          : { route: "redesign", replans, limit };
-      },
-    }),
     timeoutFallbackGuard: compute({
       run: timeoutFallbackGuard,
     }),
@@ -1808,7 +1723,7 @@ export const autoimplementWorkflow = defineWorkflow({
       from: "prepare",
       switch: {
         on: "$.route",
-        cases: { find: "findPlan", document: "documentation", ready: "maybeApproval" },
+        cases: { find: "findPlan", document: "documentation", ready: "implement" },
       },
     },
     {
@@ -1819,28 +1734,14 @@ export const autoimplementWorkflow = defineWorkflow({
       from: "routeFoundPlan",
       switch: {
         on: "$.route",
-        cases: { ready: "maybeApproval", document: "documentation", blocked: "blocked" },
+        cases: { ready: "implement", document: "documentation", blocked: "blocked" },
       },
     },
     { from: "redesign.ready", to: "adoptPlan" },
     { from: "redesign.blocked", to: "blocked" },
-    {
-      from: "adoptPlan",
-      switch: { on: "$.route", cases: { document: "documentation", blocked: "blocked" } },
-    },
-    { from: "documentation.ready", to: "maybeApproval" },
+    { from: "adoptPlan", to: "implement" },
+    { from: "documentation.ready", to: "implement" },
     { from: "documentation.blocked", to: "blocked" },
-    {
-      from: "maybeApproval",
-      switch: { on: "$.route", cases: { approve: "approval", implement: "implement" } },
-    },
-    { from: "approval.continue", to: "implement" },
-    { from: "approval.stop", to: "blocked" },
-    { from: "approval.replan", to: "replanGuard" },
-    {
-      from: "replanGuard",
-      switch: { on: "$.route", cases: { redesign: "redesign", blocked: "blocked" } },
-    },
     {
       from: "timeoutFallbackGuard",
       switch: { on: "$.route", cases: { recover: "timeoutFallback", blocked: "blocked" } },

package/src/builtins/catalog.ts

@@ -9,12 +9,12 @@ import sanityCheckWorkflow from "./sanity-check.workflow.js";
 export const builtinWorkflowCatalog = new BuiltinWorkflowCatalog([
   { id: "autoplan", revision: "1", definition: autoplanWorkflow },
   { id: "autodoc", revision: "1", definition: autodocWorkflow },
-  { id: "autoimplement", revision: "6", definition: autoimplementWorkflow },
-  { id: "plan-approval", revision: "2", definition: planApprovalWorkflow },
-  { id: "sanity-check", revision: "1", definition: sanityCheckWorkflow },
+  { id: "autoimplement", revision: "8", definition: autoimplementWorkflow },
+  { id: "plan-approval", revision: "4", definition: planApprovalWorkflow },
+  { id: "sanity-check", revision: "3", definition: sanityCheckWorkflow },
   {
     id: "monitor",
-    revision: "7",
+    revision: "9",
     definition: monitorWorkflow,
     legacySources: [
       {

package/src/builtins/index.ts

@@ -23,6 +23,12 @@ export {
   type MonitorInput,
   type MonitorRepairPolicy,
 } from "./monitor.workflow.js";
+export {
+  planChangeWorkflow,
+  type PlanChangeBlocked,
+  type PlanChangeInput,
+  type PlanChangeReady,
+} from "./plan-change.workflow.js";
 export { presentPlan } from "./plan-presentation.js";
 export {
   sanityCheckWorkflow,
@@ -38,8 +44,13 @@ export {
 } from "./sanity-check.workflow.js";
 export {
   planApprovalWorkflow,
+  parsePlanApprovalPolicy,
   type PlanApprovalContinue,
   type PlanApprovalInput,
+  type PlanApprovalMode,
+  type PlanApprovalPolicy,
   type PlanApprovalReplan,
+  type PlanApprovalResolution,
   type PlanApprovalStop,
+  type ResolvedPlanApprovalPolicy,
 } from "./plan-approval.workflow.js";