@revisium/orchestrator 0.2.0-alpha.2 → 0.2.0-alpha.4

package/control-plane/default-playbook/catalog/pipelines.json

@@ -46,7 +46,12 @@
             "recheck",
             "approve_anyway",
             "rework",
-            "cancel"
+            "cancel",
+            "address_review_threads",
+            "return_to_development",
+            "override_merge",
+            "merged",
+            "closed"
           ]
         },
         "nodes": {
@@ -395,11 +400,11 @@
             "catch": [
               {
                 "onError": "revo.ScriptBlocked",
-                "goto": "blockedEnd"
+                "goto": "classifyRecovery"
               },
               {
                 "onError": "revo.ScriptFailed",
-                "goto": "failedEnd"
+                "goto": "classifyRecovery"
               }
             ],
             "onFailure": "route",
@@ -435,15 +440,21 @@
             "outcomes": [
               "approved",
               "recheck",
+              "address_review_threads",
+              "return_to_development",
+              "override_merge",
               "cancel"
             ],
+            "produces": {
+              "name": "gateResolution"
+            },
             "branches": [
               {
                 "when": {
                   "op": "verdict.eq",
                   "value": "approved"
                 },
-                "goto": "confirmMerge"
+                "goto": "mergeApproveReverify"
               },
               {
                 "when": {
@@ -452,6 +463,27 @@
                 },
                 "goto": "mergeRecheck"
               },
+              {
+                "when": {
+                  "op": "verdict.eq",
+                  "value": "address_review_threads"
+                },
+                "goto": "triage"
+              },
+              {
+                "when": {
+                  "op": "verdict.eq",
+                  "value": "return_to_development"
+                },
+                "goto": "triage"
+              },
+              {
+                "when": {
+                  "op": "verdict.eq",
+                  "value": "override_merge"
+                },
+                "goto": "overrideMerge"
+              },
               {
                 "when": {
                   "op": "verdict.eq",
@@ -481,11 +513,11 @@
             "catch": [
               {
                 "onError": "revo.ScriptBlocked",
-                "goto": "blockedEnd"
+                "goto": "classifyRecovery"
               },
               {
                 "onError": "revo.ScriptFailed",
-                "goto": "failedEnd"
+                "goto": "classifyRecovery"
               }
             ]
           },
@@ -498,7 +530,21 @@
                   "op": "verdict.eq",
                   "value": "clean"
                 },
-                "goto": "blockedEnd"
+                "goto": "mergeGate"
+              },
+              {
+                "when": {
+                  "op": "verdict.eq",
+                  "value": "merged"
+                },
+                "goto": "cleanupWorktree"
+              },
+              {
+                "when": {
+                  "op": "verdict.eq",
+                  "value": "closed"
+                },
+                "goto": "recoveryGate"
               },
               {
                 "when": {
@@ -532,7 +578,7 @@
                 "goto": "mergeReadiness"
               },
               {
-                "default": "blockedEnd"
+                "default": "recoveryGate"
               }
             ]
           },
@@ -544,18 +590,100 @@
             "catch": [
               {
                 "onError": "revo.ScriptBlocked",
-                "goto": "blockedEnd"
+                "goto": "classifyRecovery"
               },
               {
                 "onError": "revo.ScriptFailed",
-                "goto": "failedEnd"
+                "goto": "classifyRecovery"
               }
             ],
             "onFailure": "route",
             "resultSchema": "schema:integration",
             "consumes": [
               {
-                "node": "mergeReadiness",
+                "node": "mergeApproveReverify",
+                "as": "mergeReadiness"
+              }
+            ]
+          },
+          "overrideMerge": {
+            "id": "overrideMerge",
+            "kind": "script",
+            "scriptRef": "script:overrideMerge",
+            "next": "overrideMergeRouter",
+            "onFailure": "route",
+            "resultSchema": "schema:prFeedback",
+            "produces": {
+              "name": "prFeedback"
+            },
+            "consumes": [
+              {
+                "node": "mergeGate",
+                "as": "gateResolution",
+                "iteration": "latest"
+              }
+            ],
+            "catch": [
+              {
+                "onError": "revo.ScriptBlocked",
+                "goto": "classifyRecovery"
+              },
+              {
+                "onError": "revo.ScriptFailed",
+                "goto": "classifyRecovery"
+              }
+            ]
+          },
+          "overrideMergeRouter": {
+            "id": "overrideMergeRouter",
+            "kind": "choice",
+            "branches": [
+              {
+                "when": {
+                  "op": "verdict.eq",
+                  "value": "clean"
+                },
+                "goto": "overrideConfirmMerge"
+              },
+              {
+                "when": {
+                  "op": "verdict.eq",
+                  "value": "merged"
+                },
+                "goto": "cleanupWorktree"
+              },
+              {
+                "when": {
+                  "op": "verdict.eq",
+                  "value": "closed"
+                },
+                "goto": "recoveryGate"
+              },
+              {
+                "default": "classifyRecovery"
+              }
+            ]
+          },
+          "overrideConfirmMerge": {
+            "id": "overrideConfirmMerge",
+            "kind": "script",
+            "scriptRef": "script:confirmMerge",
+            "next": "cleanupWorktree",
+            "catch": [
+              {
+                "onError": "revo.ScriptBlocked",
+                "goto": "classifyRecovery"
+              },
+              {
+                "onError": "revo.ScriptFailed",
+                "goto": "classifyRecovery"
+              }
+            ],
+            "onFailure": "route",
+            "resultSchema": "schema:integration",
+            "consumes": [
+              {
+                "node": "overrideMerge",
                 "as": "mergeReadiness"
               }
             ]
@@ -565,6 +693,16 @@
             "kind": "script",
             "scriptRef": "script:cleanupWorktree",
             "next": "mergedEnd",
+            "catch": [
+              {
+                "onError": "revo.ScriptBlocked",
+                "goto": "mergedEnd"
+              },
+              {
+                "onError": "revo.ScriptFailed",
+                "goto": "mergedEnd"
+              }
+            ],
             "resultSchema": "schema:integration"
           },
           "mergedEnd": {
@@ -572,11 +710,6 @@
             "kind": "terminal",
             "status": "succeeded"
           },
-          "failedEnd": {
-            "id": "failedEnd",
-            "kind": "terminal",
-            "status": "failed"
-          },
           "blockedEnd": {
             "id": "blockedEnd",
             "kind": "terminal",
@@ -592,14 +725,17 @@
             "produces": {
               "name": "prFeedback"
             },
+            "incrementCounters": [
+              "pollLoop"
+            ],
             "catch": [
               {
                 "onError": "revo.ScriptBlocked",
-                "goto": "blockedEnd"
+                "goto": "classifyRecovery"
               },
               {
                 "onError": "revo.ScriptFailed",
-                "goto": "failedEnd"
+                "goto": "classifyRecovery"
               }
             ]
           },
@@ -617,7 +753,31 @@
               {
                 "when": {
                   "op": "verdict.eq",
-                  "value": "recheck"
+                  "value": "merged"
+                },
+                "goto": "cleanupWorktree"
+              },
+              {
+                "when": {
+                  "op": "verdict.eq",
+                  "value": "closed"
+                },
+                "goto": "recoveryGate"
+              },
+              {
+                "when": {
+                  "op": "all",
+                  "of": [
+                    {
+                      "op": "verdict.eq",
+                      "value": "recheck"
+                    },
+                    {
+                      "op": "counter.lt",
+                      "scope": "pollLoop",
+                      "value": 8
+                    }
+                  ]
                 },
                 "goto": "pollPr"
               },
@@ -646,7 +806,7 @@
                 "goto": "ciRework"
               },
               {
-                "default": "blockedEnd"
+                "default": "recoveryGate"
               }
             ]
           },
@@ -660,14 +820,17 @@
             "produces": {
               "name": "prFeedback"
             },
+            "incrementCounters": [
+              "pollLoop"
+            ],
             "catch": [
               {
                 "onError": "revo.ScriptBlocked",
-                "goto": "blockedEnd"
+                "goto": "classifyRecovery"
               },
               {
                 "onError": "revo.ScriptFailed",
-                "goto": "failedEnd"
+                "goto": "classifyRecovery"
               }
             ]
           },
@@ -685,7 +848,31 @@
               {
                 "when": {
                   "op": "verdict.eq",
-                  "value": "recheck"
+                  "value": "merged"
+                },
+                "goto": "cleanupWorktree"
+              },
+              {
+                "when": {
+                  "op": "verdict.eq",
+                  "value": "closed"
+                },
+                "goto": "recoveryGate"
+              },
+              {
+                "when": {
+                  "op": "all",
+                  "of": [
+                    {
+                      "op": "counter.lt",
+                      "scope": "pollLoop",
+                      "value": 8
+                    },
+                    {
+                      "op": "verdict.eq",
+                      "value": "recheck"
+                    }
+                  ]
                 },
                 "goto": "mergeReadiness"
               },
@@ -714,7 +901,7 @@
                 "goto": "ciRework"
               },
               {
-                "default": "blockedEnd"
+                "default": "recoveryGate"
               }
             ]
           },
@@ -830,7 +1017,7 @@
                 "goto": "respondThreads"
               },
               {
-                "default": "blockedEnd"
+                "default": "recoveryGate"
               }
             ]
           },
@@ -839,22 +1026,40 @@
             "kind": "humanGate",
             "reason": "review-question",
             "outcomes": [
-              "approved",
-              "changes_requested"
+              "fix",
+              "wontfix",
+              "cancel"
             ],
             "incrementCounters": [
               "questionLoop"
             ],
+            "produces": {
+              "name": "gateResolution"
+            },
             "branches": [
               {
                 "when": {
                   "op": "verdict.eq",
-                  "value": "approved"
+                  "value": "fix"
                 },
-                "goto": "triage"
+                "goto": "questionReviewRework"
               },
               {
-                "default": "blockedEnd"
+                "when": {
+                  "op": "verdict.eq",
+                  "value": "wontfix"
+                },
+                "goto": "respondThreads"
+              },
+              {
+                "when": {
+                  "op": "verdict.eq",
+                  "value": "cancel"
+                },
+                "goto": "cancelledEnd"
+              },
+              {
+                "default": "recoveryGate"
               }
             ],
             "gatedArtifact": {
@@ -862,6 +1067,54 @@
               "as": "triage"
             }
           },
+          "questionReviewRework": {
+            "id": "questionReviewRework",
+            "kind": "agent",
+            "roleRef": "role:developer",
+            "next": "questionReviewIntegrator",
+            "onFailure": "abort",
+            "resultSchema": "schema:change",
+            "incrementCounters": [
+              "reviewLoop"
+            ],
+            "produces": {
+              "name": "change"
+            },
+            "consumes": [
+              {
+                "node": "triage",
+                "as": "triage"
+              },
+              {
+                "node": "questionGate",
+                "as": "gateResolution"
+              }
+            ]
+          },
+          "questionReviewIntegrator": {
+            "id": "questionReviewIntegrator",
+            "kind": "script",
+            "scriptRef": "script:integrator",
+            "next": "respondThreads",
+            "onFailure": "route",
+            "resultSchema": "schema:integration",
+            "consumes": [
+              {
+                "node": "questionReviewRework",
+                "as": "reviewChange"
+              }
+            ],
+            "catch": [
+              {
+                "onError": "revo.ScriptBlocked",
+                "goto": "classifyRecovery"
+              },
+              {
+                "onError": "revo.ScriptFailed",
+                "goto": "classifyRecovery"
+              }
+            ]
+          },
           "reviewRework": {
             "id": "reviewRework",
             "kind": "agent",
@@ -898,11 +1151,11 @@
             "catch": [
               {
                 "onError": "revo.ScriptBlocked",
-                "goto": "blockedEnd"
+                "goto": "classifyRecovery"
               },
               {
                 "onError": "revo.ScriptFailed",
-                "goto": "failedEnd"
+                "goto": "classifyRecovery"
               }
             ]
           },
@@ -917,16 +1170,22 @@
               {
                 "node": "triage",
                 "as": "triage"
+              },
+              {
+                "node": "questionGate",
+                "as": "gateResolution",
+                "optional": true,
+                "staleOk": true
               }
             ],
             "catch": [
               {
                 "onError": "revo.ScriptBlocked",
-                "goto": "blockedEnd"
+                "goto": "classifyRecovery"
               },
               {
                 "onError": "revo.ScriptFailed",
-                "goto": "failedEnd"
+                "goto": "classifyRecovery"
               }
             ]
           },
@@ -976,1102 +1235,175 @@
             "id": "cancelledEnd",
             "kind": "terminal",
             "status": "cancelled"
-          }
-        },
-        "title": "Feature development — plan + merge gates, bounded code-review rework, and a PR review-feedback loop (plan 0018)",
-        "policy": {
-          "conflicts": [
-            [
-              "developer",
-              "reviewer"
-            ]
-          ],
-          "enforcement": "strict"
-        },
-        "scopes": {
-          "planReviewLoop": {
-            "cap": 4,
-            "parent": null
           },
-          "codeReviewLoop": {
-            "cap": 3,
-            "parent": "codeStuckRecoveryLoop"
-          },
-          "ciLoop": {
-            "cap": 3,
-            "parent": null
+          "mergeApproveReverify": {
+            "id": "mergeApproveReverify",
+            "kind": "script",
+            "scriptRef": "script:pollPr",
+            "next": "mergeApproveReverifyRouter",
+            "onFailure": "route",
+            "resultSchema": "schema:prFeedback",
+            "produces": {
+              "name": "prFeedback"
+            },
+            "catch": [
+              {
+                "onError": "revo.ScriptBlocked",
+                "goto": "classifyRecovery"
+              },
+              {
+                "onError": "revo.ScriptFailed",
+                "goto": "classifyRecovery"
+              }
+            ]
           },
-          "reviewLoop": {
-            "cap": 3,
-            "parent": null
-          },
-          "questionLoop": {
-            "cap": 3,
-            "parent": null
-          },
-          "codeStuckRecoveryLoop": {
-            "cap": 3,
-            "parent": null
-          }
-        }
-      }
-    }
-  },
-  {
-    "id": "feature-development-codex-consensus",
-    "path": "prompts/orchestrator.md",
-    "triggers": [
-      "codex feature",
-      "codex consensus feature",
-      "codex task-to-PR work"
-    ],
-    "required_roles": [
-      "orchestrator-codex",
-      "analyst-codex",
-      "reviewer-codex",
-      "triager-codex",
-      "developer-codex",
-      "integrator",
-      "watcher-codex"
-    ],
-    "alternative_roles": [],
-    "optional_roles": [],
-    "route_gates": [
-      "task spec approval",
-      "merge approval"
-    ],
-    "platform_invocation": "canonical-only",
-    "execution_policy": {
-      "raw": [
-        "Built-in Codex default: same feature-development control flow, but Codex-bound plan/development roles and parallel reviewer consensus for plan + code review.",
-        "analyst-codex -> reviewer-codex[plan fanout x2] -> developer-codex -> reviewer-codex[code fanout x2] (bounded rework, cap 3) -> integrator(script) -> watcher-codex[post-integrator] -> merge gate."
-      ],
-      "template_json": {
-        "specVersion": "1.0",
-        "pipelineId": "feature-development-codex-consensus",
-        "entry": "analyst",
-        "verdicts": {
-          "domain": [
-            "approved",
-            "clean",
-            "blocker",
-            "changes_requested",
-            "review_changes",
-            "ci_changes",
-            "fix",
-            "wontfix",
-            "question",
-            "recheck",
-            "approve_anyway",
-            "rework",
-            "abort"
-          ]
-        },
-        "nodes": {
-          "analyst": {
-            "id": "analyst",
-            "kind": "agent",
-            "roleRef": "role:analyst-codex",
-            "next": "planReviewFanout",
-            "onFailure": "abort",
-            "resultSchema": "schema:plan",
-            "produces": {
-              "name": "plan"
-            }
-          },
-          "planReviewRouter": {
-            "id": "planReviewRouter",
-            "kind": "choice",
-            "branches": [
-              {
-                "when": {
-                  "op": "verdict.in",
-                  "value": [
-                    "approved",
-                    "clean"
-                  ]
-                },
-                "goto": "planGate"
-              },
-              {
-                "when": {
-                  "op": "all",
-                  "of": [
-                    {
-                      "op": "verdict.in",
-                      "value": [
-                        "blocker",
-                        "changes_requested"
-                      ]
-                    },
-                    {
-                      "op": "counter.lt",
-                      "scope": "planReviewLoop",
-                      "value": 4
-                    }
-                  ]
-                },
-                "goto": "analyst"
-              },
-              {
-                "default": "planStuckGate"
-              }
-            ],
-            "incrementCounters": [
-              "planReviewLoop"
-            ]
-          },
-          "planStuckGate": {
-            "id": "planStuckGate",
-            "kind": "humanGate",
-            "reason": "plan-stuck",
-            "outcomes": [
-              "approved"
-            ],
-            "branches": [
-              {
-                "when": {
-                  "op": "verdict.eq",
-                  "value": "approved"
-                },
-                "goto": "developer"
-              },
-              {
-                "default": "blockedEnd"
-              }
-            ],
-            "gatedArtifact": {
-              "node": "analyst",
-              "as": "plan"
-            }
-          },
-          "planGate": {
-            "id": "planGate",
-            "kind": "humanGate",
-            "reason": "plan-review",
-            "outcomes": [
-              "approved"
-            ],
-            "branches": [
-              {
-                "when": {
-                  "op": "verdict.eq",
-                  "value": "approved"
-                },
-                "goto": "developer"
-              },
-              {
-                "default": "blockedEnd"
-              }
-            ],
-            "gatedArtifact": {
-              "node": "analyst",
-              "as": "plan"
-            }
-          },
-          "developer": {
-            "id": "developer",
-            "kind": "agent",
-            "roleRef": "role:developer-codex",
-            "next": "codeReviewFanout",
-            "onFailure": "abort",
-            "resultSchema": "schema:change",
-            "consumes": [
-              {
-                "node": "analyst",
-                "as": "plan"
-              }
-            ],
-            "produces": {
-              "name": "change"
-            }
-          },
-          "codeReviewRouter": {
-            "id": "codeReviewRouter",
-            "kind": "choice",
-            "branches": [
-              {
-                "when": {
-                  "op": "verdict.in",
-                  "value": [
-                    "approved",
-                    "clean"
-                  ]
-                },
-                "goto": "integrator"
-              },
-              {
-                "when": {
-                  "op": "all",
-                  "of": [
-                    {
-                      "op": "verdict.in",
-                      "value": [
-                        "blocker",
-                        "changes_requested"
-                      ]
-                    },
-                    {
-                      "op": "counter.lt",
-                      "scope": "codeReviewLoop",
-                      "value": 4
-                    }
-                  ]
-                },
-                "goto": "reworkDeveloper"
-              },
-              {
-                "when": {
-                  "op": "counter.gte",
-                  "scope": "codeStuckRecoveryLoop",
-                  "value": 1
-                },
-                "goto": "codeFinalStuckGate"
-              },
-              {
-                "default": "codeStuckGate"
-              }
-            ],
-            "incrementCounters": [
-              "codeReviewLoop"
-            ]
-          },
-          "codeStuckGate": {
-            "id": "codeStuckGate",
-            "kind": "humanGate",
-            "reason": "code-review-stuck",
-            "outcomes": [
-              "approve_anyway",
-              "rework",
-              "abort"
-            ],
-            "branches": [
-              {
-                "when": {
-                  "op": "verdict.eq",
-                  "value": "approve_anyway"
-                },
-                "goto": "integrator"
-              },
-              {
-                "when": {
-                  "op": "all",
-                  "of": [
-                    {
-                      "op": "verdict.eq",
-                      "value": "rework"
-                    },
-                    {
-                      "op": "counter.lt",
-                      "scope": "codeStuckRecoveryLoop",
-                      "value": 1
-                    }
-                  ]
-                },
-                "goto": "stuckReworkDeveloper"
-              },
-              {
-                "when": {
-                  "op": "verdict.eq",
-                  "value": "rework"
-                },
-                "goto": "codeFinalStuckGate"
-              },
-              {
-                "default": "blockedEnd"
-              }
-            ],
-            "gatedArtifact": {
-              "node": "reworkDeveloper",
-              "as": "change"
-            },
-            "produces": {
-              "name": "gateResolution"
-            }
-          },
-          "reworkDeveloper": {
-            "id": "reworkDeveloper",
-            "kind": "agent",
-            "roleRef": "role:developer-codex",
-            "next": "codeReviewFanout",
-            "onFailure": "abort",
-            "resultSchema": "schema:change",
-            "produces": {
-              "name": "change"
-            }
-          },
-          "integrator": {
-            "id": "integrator",
-            "kind": "script",
-            "scriptRef": "script:integrator",
-            "next": "pollPr",
-            "catch": [
-              {
-                "onError": "revo.ScriptBlocked",
-                "goto": "blockedEnd"
-              },
-              {
-                "onError": "revo.ScriptFailed",
-                "goto": "failedEnd"
-              }
-            ],
-            "onFailure": "route",
-            "resultSchema": "schema:integration",
-            "consumes": [
-              {
-                "node": "developer",
-                "as": "developerChange",
-                "staleOk": true
-              },
-              {
-                "node": "reworkDeveloper",
-                "as": "reworkChange",
-                "optional": true
-              },
-              {
-                "node": "stuckReworkDeveloper",
-                "as": "stuckReworkChange",
-                "optional": true
-              },
-              {
-                "node": "ciRework",
-                "as": "ciChange",
-                "optional": true,
-                "staleOk": true
-              }
-            ]
-          },
-          "mergeGate": {
-            "id": "mergeGate",
-            "kind": "humanGate",
-            "reason": "merge-review",
-            "outcomes": [
-              "approved",
-              "recheck"
-            ],
-            "branches": [
-              {
-                "when": {
-                  "op": "verdict.eq",
-                  "value": "approved"
-                },
-                "goto": "confirmMerge"
-              },
-              {
-                "when": {
-                  "op": "verdict.eq",
-                  "value": "recheck"
-                },
-                "goto": "mergeRecheck"
-              },
-              {
-                "default": "blockedEnd"
-              }
-            ],
-            "gatedArtifact": {
-              "node": "mergeReadiness",
-              "as": "prFeedback"
-            }
-          },
-          "mergeRecheck": {
-            "id": "mergeRecheck",
-            "kind": "script",
-            "scriptRef": "script:pollPr",
-            "next": "mergeRecheckRouter",
-            "onFailure": "route",
-            "resultSchema": "schema:prFeedback",
-            "produces": {
-              "name": "prFeedback"
-            },
-            "catch": [
-              {
-                "onError": "revo.ScriptBlocked",
-                "goto": "blockedEnd"
-              },
-              {
-                "onError": "revo.ScriptFailed",
-                "goto": "failedEnd"
-              }
-            ]
-          },
-          "mergeRecheckRouter": {
-            "id": "mergeRecheckRouter",
-            "kind": "choice",
-            "branches": [
-              {
-                "when": {
-                  "op": "verdict.eq",
-                  "value": "clean"
-                },
-                "goto": "blockedEnd"
-              },
-              {
-                "when": {
-                  "op": "verdict.eq",
-                  "value": "review_changes"
-                },
-                "goto": "triage"
-              },
-              {
-                "when": {
-                  "op": "all",
-                  "of": [
-                    {
-                      "op": "verdict.eq",
-                      "value": "ci_changes"
-                    },
-                    {
-                      "op": "counter.lt",
-                      "scope": "ciLoop",
-                      "value": 3
-                    }
-                  ]
-                },
-                "goto": "ciRework"
-              },
-              {
-                "when": {
-                  "op": "verdict.eq",
-                  "value": "recheck"
-                },
-                "goto": "mergeReadiness"
-              },
-              {
-                "default": "blockedEnd"
-              }
-            ]
-          },
-          "confirmMerge": {
-            "id": "confirmMerge",
-            "kind": "script",
-            "scriptRef": "script:confirmMerge",
-            "next": "mergedEnd",
-            "catch": [
-              {
-                "onError": "revo.ScriptBlocked",
-                "goto": "blockedEnd"
-              },
-              {
-                "onError": "revo.ScriptFailed",
-                "goto": "failedEnd"
-              }
-            ],
-            "onFailure": "route",
-            "resultSchema": "schema:integration",
-            "consumes": [
-              {
-                "node": "mergeReadiness",
-                "as": "mergeReadiness"
-              }
-            ]
-          },
-          "mergedEnd": {
-            "id": "mergedEnd",
-            "kind": "terminal",
-            "status": "succeeded"
-          },
-          "failedEnd": {
-            "id": "failedEnd",
-            "kind": "terminal",
-            "status": "failed"
-          },
-          "blockedEnd": {
-            "id": "blockedEnd",
-            "kind": "terminal",
-            "status": "blocked"
-          },
-          "pollPr": {
-            "id": "pollPr",
-            "kind": "script",
-            "scriptRef": "script:pollPr",
-            "next": "prRouter",
-            "onFailure": "route",
-            "resultSchema": "schema:prFeedback",
-            "produces": {
-              "name": "prFeedback"
-            },
-            "catch": [
-              {
-                "onError": "revo.ScriptBlocked",
-                "goto": "blockedEnd"
-              },
-              {
-                "onError": "revo.ScriptFailed",
-                "goto": "failedEnd"
-              }
-            ]
-          },
-          "prRouter": {
-            "id": "prRouter",
-            "kind": "choice",
-            "branches": [
-              {
-                "when": {
-                  "op": "verdict.eq",
-                  "value": "clean"
-                },
-                "goto": "mergeReadiness"
-              },
-              {
-                "when": {
-                  "op": "verdict.eq",
-                  "value": "recheck"
-                },
-                "goto": "pollPr"
-              },
-              {
-                "when": {
-                  "op": "verdict.eq",
-                  "value": "review_changes"
-                },
-                "goto": "triage"
-              },
-              {
-                "when": {
-                  "op": "all",
-                  "of": [
-                    {
-                      "op": "verdict.eq",
-                      "value": "ci_changes"
-                    },
-                    {
-                      "op": "counter.lt",
-                      "scope": "ciLoop",
-                      "value": 3
-                    }
-                  ]
-                },
-                "goto": "ciRework"
-              },
-              {
-                "default": "blockedEnd"
-              }
-            ]
-          },
-          "mergeReadiness": {
-            "id": "mergeReadiness",
-            "kind": "script",
-            "scriptRef": "script:pollPr",
-            "next": "mergeReadinessRouter",
-            "onFailure": "route",
-            "resultSchema": "schema:prFeedback",
-            "produces": {
-              "name": "prFeedback"
-            },
-            "catch": [
-              {
-                "onError": "revo.ScriptBlocked",
-                "goto": "blockedEnd"
-              },
-              {
-                "onError": "revo.ScriptFailed",
-                "goto": "failedEnd"
-              }
-            ]
-          },
-          "mergeReadinessRouter": {
-            "id": "mergeReadinessRouter",
-            "kind": "choice",
-            "branches": [
-              {
-                "when": {
-                  "op": "verdict.eq",
-                  "value": "clean"
-                },
-                "goto": "mergeGate"
-              },
-              {
-                "when": {
-                  "op": "verdict.eq",
-                  "value": "recheck"
-                },
-                "goto": "mergeReadiness"
-              },
-              {
-                "when": {
-                  "op": "verdict.eq",
-                  "value": "review_changes"
-                },
-                "goto": "triage"
-              },
-              {
-                "when": {
-                  "op": "all",
-                  "of": [
-                    {
-                      "op": "verdict.eq",
-                      "value": "ci_changes"
-                    },
-                    {
-                      "op": "counter.lt",
-                      "scope": "ciLoop",
-                      "value": 3
-                    }
-                  ]
-                },
-                "goto": "ciRework"
-              },
-              {
-                "default": "blockedEnd"
-              }
-            ]
-          },
-          "ciRework": {
-            "id": "ciRework",
-            "kind": "agent",
-            "roleRef": "role:developer-codex",
-            "next": "integrator",
-            "onFailure": "abort",
-            "resultSchema": "schema:change",
-            "incrementCounters": [
-              "ciLoop"
-            ],
-            "produces": {
-              "name": "change"
-            },
-            "consumes": [
-              {
-                "node": "pollPr",
-                "as": "feedback"
-              },
-              {
-                "node": "mergeReadiness",
-                "as": "mergeFeedback",
-                "optional": true,
-                "staleOk": true
-              },
-              {
-                "node": "mergeRecheck",
-                "as": "recheckFeedback",
-                "optional": true,
-                "staleOk": true
-              }
-            ]
-          },
-          "triage": {
-            "id": "triage",
-            "kind": "agent",
-            "roleRef": "role:triager-codex",
-            "next": "triageRouter",
-            "onFailure": "abort",
-            "resultSchema": "schema:triage",
-            "produces": {
-              "name": "triage"
-            },
-            "consumes": [
-              {
-                "node": "analyst",
-                "as": "plan",
-                "staleOk": true
-              },
-              {
-                "node": "pollPr",
-                "as": "feedback"
-              },
-              {
-                "node": "mergeReadiness",
-                "as": "mergeFeedback",
-                "optional": true,
-                "staleOk": true
-              },
-              {
-                "node": "mergeRecheck",
-                "as": "recheckFeedback",
-                "optional": true,
-                "staleOk": true
-              }
-            ]
-          },
-          "triageRouter": {
-            "id": "triageRouter",
-            "kind": "choice",
-            "branches": [
-              {
-                "when": {
-                  "op": "all",
-                  "of": [
-                    {
-                      "op": "verdict.eq",
-                      "value": "question"
-                    },
-                    {
-                      "op": "counter.lt",
-                      "scope": "questionLoop",
-                      "value": 3
-                    }
-                  ]
-                },
-                "goto": "questionGate"
-              },
-              {
-                "when": {
-                  "op": "all",
-                  "of": [
-                    {
-                      "op": "verdict.eq",
-                      "value": "fix"
-                    },
-                    {
-                      "op": "counter.lt",
-                      "scope": "reviewLoop",
-                      "value": 3
-                    }
-                  ]
-                },
-                "goto": "reviewRework"
-              },
-              {
-                "when": {
-                  "op": "verdict.eq",
-                  "value": "wontfix"
-                },
-                "goto": "respondThreads"
-              },
-              {
-                "default": "blockedEnd"
-              }
-            ]
-          },
-          "questionGate": {
-            "id": "questionGate",
-            "kind": "humanGate",
-            "reason": "review-question",
-            "outcomes": [
-              "approved",
-              "changes_requested"
-            ],
-            "incrementCounters": [
-              "questionLoop"
-            ],
+          "mergeApproveReverifyRouter": {
+            "id": "mergeApproveReverifyRouter",
+            "kind": "choice",
             "branches": [
               {
                 "when": {
                   "op": "verdict.eq",
-                  "value": "approved"
+                  "value": "clean"
                 },
-                "goto": "triage"
+                "goto": "confirmMerge"
               },
               {
-                "default": "blockedEnd"
-              }
-            ],
-            "gatedArtifact": {
-              "node": "triage",
-              "as": "triage"
-            }
-          },
-          "reviewRework": {
-            "id": "reviewRework",
-            "kind": "agent",
-            "roleRef": "role:developer-codex",
-            "next": "reviewIntegrator",
-            "onFailure": "abort",
-            "resultSchema": "schema:change",
-            "incrementCounters": [
-              "reviewLoop"
-            ],
-            "produces": {
-              "name": "change"
-            },
-            "consumes": [
-              {
-                "node": "triage",
-                "as": "triage"
-              }
-            ]
-          },
-          "reviewIntegrator": {
-            "id": "reviewIntegrator",
-            "kind": "script",
-            "scriptRef": "script:integrator",
-            "next": "respondThreads",
-            "onFailure": "route",
-            "resultSchema": "schema:integration",
-            "consumes": [
-              {
-                "node": "reviewRework",
-                "as": "reviewChange"
-              }
-            ],
-            "catch": [
-              {
-                "onError": "revo.ScriptBlocked",
-                "goto": "blockedEnd"
+                "when": {
+                  "op": "verdict.eq",
+                  "value": "merged"
+                },
+                "goto": "cleanupWorktree"
               },
               {
-                "onError": "revo.ScriptFailed",
-                "goto": "failedEnd"
-              }
-            ]
-          },
-          "respondThreads": {
-            "id": "respondThreads",
-            "kind": "script",
-            "scriptRef": "script:respondThreads",
-            "next": "pollPr",
-            "onFailure": "route",
-            "resultSchema": "schema:respond",
-            "consumes": [
-              {
-                "node": "triage",
-                "as": "triage"
-              }
-            ],
-            "catch": [
-              {
-                "onError": "revo.ScriptBlocked",
-                "goto": "blockedEnd"
+                "when": {
+                  "op": "verdict.eq",
+                  "value": "closed"
+                },
+                "goto": "recoveryGate"
               },
               {
-                "onError": "revo.ScriptFailed",
-                "goto": "failedEnd"
+                "default": "classifyRecovery"
               }
             ]
           },
-          "planReviewFanout": {
-            "id": "planReviewFanout",
-            "kind": "parallel",
-            "branches": [
-              {
-                "id": "primary",
-                "entry": "planReviewPrimary"
-              },
-              {
-                "id": "secondary",
-                "entry": "planReviewSecondary"
-              }
-            ],
-            "join": "planReviewJoin"
-          },
-          "planReviewPrimary": {
-            "id": "planReviewPrimary",
-            "kind": "agent",
-            "roleRef": "role:reviewer-codex",
-            "next": "planReviewJoin",
-            "onFailure": "abort",
-            "resultSchema": "schema:reviewVerdict",
-            "consumes": [
-              {
-                "node": "analyst",
-                "as": "plan"
-              }
-            ],
-            "produces": {
-              "name": "review"
-            }
-          },
-          "planReviewSecondary": {
-            "id": "planReviewSecondary",
+          "classifyRecovery": {
+            "id": "classifyRecovery",
             "kind": "agent",
-            "roleRef": "role:reviewer-codex",
-            "next": "planReviewJoin",
+            "roleRef": "role:triager",
+            "next": "recoveryRouter",
             "onFailure": "abort",
-            "resultSchema": "schema:reviewVerdict",
-            "consumes": [
-              {
-                "node": "analyst",
-                "as": "plan"
-              }
-            ],
+            "resultSchema": "schema:triage",
             "produces": {
-              "name": "review"
-            }
-          },
-          "planReviewJoin": {
-            "id": "planReviewJoin",
-            "kind": "join",
-            "joinMode": {
-              "kind": "all"
-            },
-            "verdictReducer": {
-              "kind": "allIn",
-              "pass": [
-                "approved",
-                "clean"
-              ],
-              "passVerdict": "approved",
-              "failVerdict": "changes_requested"
+              "name": "recoveryTriage"
             },
-            "merge": {
-              "reviews": "appendByBranchOrder"
-            },
-            "next": "planReviewRouter"
-          },
-          "codeReviewFanout": {
-            "id": "codeReviewFanout",
-            "kind": "parallel",
-            "branches": [
-              {
-                "id": "primary",
-                "entry": "codeReviewPrimary"
-              },
-              {
-                "id": "secondary",
-                "entry": "codeReviewSecondary"
-              }
+            "incrementCounters": [
+              "recoveryLoop"
             ],
-            "join": "codeReviewJoin"
-          },
-          "codeReviewPrimary": {
-            "id": "codeReviewPrimary",
-            "kind": "agent",
-            "roleRef": "role:reviewer-codex",
-            "next": "codeReviewJoin",
-            "onFailure": "abort",
-            "resultSchema": "schema:reviewVerdict",
             "consumes": [
               {
-                "node": "developer",
-                "as": "developerChange",
+                "node": "analyst",
+                "as": "plan",
+                "optional": true,
                 "staleOk": true
               },
               {
-                "node": "reworkDeveloper",
-                "as": "reworkChange",
-                "optional": true
-              },
-              {
-                "node": "stuckReworkDeveloper",
-                "as": "stuckReworkChange",
-                "optional": true
-              }
-            ],
-            "produces": {
-              "name": "review"
-            }
-          },
-          "codeReviewSecondary": {
-            "id": "codeReviewSecondary",
-            "kind": "agent",
-            "roleRef": "role:reviewer-codex",
-            "next": "codeReviewJoin",
-            "onFailure": "abort",
-            "resultSchema": "schema:reviewVerdict",
-            "consumes": [
-              {
-                "node": "developer",
-                "as": "developerChange",
+                "node": "pollPr",
+                "as": "feedback",
+                "optional": true,
                 "staleOk": true
               },
               {
-                "node": "reworkDeveloper",
-                "as": "reworkChange",
-                "optional": true
-              },
-              {
-                "node": "stuckReworkDeveloper",
-                "as": "stuckReworkChange",
-                "optional": true
-              }
-            ],
-            "produces": {
-              "name": "review"
-            }
-          },
-          "codeReviewJoin": {
-            "id": "codeReviewJoin",
-            "kind": "join",
-            "joinMode": {
-              "kind": "all"
-            },
-            "verdictReducer": {
-              "kind": "allIn",
-              "pass": [
-                "approved",
-                "clean"
-              ],
-              "passVerdict": "approved",
-              "failVerdict": "changes_requested"
-            },
-            "merge": {
-              "reviews": "appendByBranchOrder"
-            },
-            "next": "codeReviewRouter"
-          },
-          "stuckReworkDeveloper": {
-            "id": "stuckReworkDeveloper",
-            "kind": "agent",
-            "roleRef": "role:developer-codex",
-            "next": "codeReviewFanout",
-            "onFailure": "abort",
-            "resultSchema": "schema:change",
-            "incrementCounters": [
-              "codeStuckRecoveryLoop"
-            ],
-            "produces": {
-              "name": "change"
-            },
-            "consumes": [
-              {
-                "node": "developer",
-                "as": "initialChange",
-                "iteration": "latest",
+                "node": "mergeReadiness",
+                "as": "mergeFeedback",
                 "optional": true,
                 "staleOk": true
               },
               {
-                "node": "reworkDeveloper",
-                "as": "latestRework",
-                "iteration": "latest",
+                "node": "mergeApproveReverify",
+                "as": "approveFeedback",
                 "optional": true,
                 "staleOk": true
               },
               {
-                "node": "codeReviewPrimary",
-                "as": "primaryReview",
-                "iteration": "latest",
+                "node": "overrideMerge",
+                "as": "overrideFeedback",
                 "optional": true,
                 "staleOk": true
               },
               {
-                "node": "codeReviewSecondary",
-                "as": "secondaryReview",
-                "iteration": "latest",
+                "node": "mergeRecheck",
+                "as": "recheckFeedback",
                 "optional": true,
                 "staleOk": true
+              }
+            ]
+          },
+          "recoveryRouter": {
+            "id": "recoveryRouter",
+            "kind": "choice",
+            "branches": [
+              {
+                "when": {
+                  "op": "all",
+                  "of": [
+                    {
+                      "op": "verdict.eq",
+                      "value": "fix"
+                    },
+                    {
+                      "op": "counter.lt",
+                      "scope": "recoveryLoop",
+                      "value": 3
+                    }
+                  ]
+                },
+                "goto": "pollPr"
               },
               {
-                "node": "codeStuckGate",
-                "as": "gateResolution",
-                "iteration": "latest"
+                "default": "recoveryGate"
               }
             ]
           },
-          "codeFinalStuckGate": {
-            "id": "codeFinalStuckGate",
+          "recoveryGate": {
+            "id": "recoveryGate",
             "kind": "humanGate",
-            "reason": "code-review-final-stuck",
+            "reason": "merge-recovery",
             "outcomes": [
-              "approve_anyway",
-              "abort"
+              "recheck",
+              "cancel"
             ],
             "branches": [
               {
                 "when": {
                   "op": "verdict.eq",
-                  "value": "approve_anyway"
+                  "value": "recheck"
                 },
-                "goto": "integrator"
+                "goto": "pollPr"
+              },
+              {
+                "when": {
+                  "op": "verdict.eq",
+                  "value": "cancel"
+                },
+                "goto": "cancelledEnd"
               },
               {
                 "default": "blockedEnd"
               }
             ],
             "gatedArtifact": {
-              "node": "stuckReworkDeveloper",
-              "as": "change"
-            },
-            "produces": {
-              "name": "gateResolution"
+              "node": "pollPr",
+              "as": "prFeedback"
             }
           }
         },
-        "title": "Codex feature development with parallel review consensus",
+        "title": "Feature development — plan + merge gates, bounded code-review rework, and a PR review-feedback loop (plan 0018)",
         "policy": {
           "conflicts": [
             [
-              "developer-codex",
-              "reviewer-codex"
+              "developer",
+              "reviewer"
             ]
           ],
           "enforcement": "strict"
@@ -2082,13 +1414,17 @@
             "parent": null
           },
           "codeReviewLoop": {
-            "cap": 4,
-            "parent": null
+            "cap": 3,
+            "parent": "codeStuckRecoveryLoop"
           },
           "ciLoop": {
             "cap": 3,
             "parent": null
           },
+          "pollLoop": {
+            "cap": 8,
+            "parent": null
+          },
           "reviewLoop": {
             "cap": 3,
             "parent": null
@@ -2098,7 +1434,11 @@
             "parent": null
           },
           "codeStuckRecoveryLoop": {
-            "cap": 1,
+            "cap": 3,
+            "parent": null
+          },
+          "recoveryLoop": {
+            "cap": 3,
             "parent": null
           }
         }