@revisium/orchestrator 0.1.0-alpha.3 → 0.1.0-alpha.5

package/control-plane/bootstrap.config.json

@@ -149,6 +149,7 @@
       "id": "steps",
       "schema": {
         "type": "object",
+        "description": "DEPRECATED/unused — runtime path retired (audit §3.1, #86); no live path writes or reads a steps row (DBOS owns progress). Table drop deferred — a schema drop on existing control-planes is riskier than retiring the writes; tracked in docs/roadmap.md → Post-MVP cleanup.",
         "additionalProperties": false,
         "properties": {
           "id": {
@@ -813,6 +814,62 @@
         },
         "required": []
       }
+    },
+    {
+      "id": "run_outputs",
+      "schema": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": {
+          "id": {
+            "type": "string",
+            "default": "",
+            "description": "Deterministic: out_<fnv1a64Hex(runId|nodeId|ordinal)>"
+          },
+          "run_id": {
+            "type": "string",
+            "default": ""
+          },
+          "node_id": {
+            "type": "string",
+            "default": ""
+          },
+          "ordinal": {
+            "type": "number",
+            "default": 0,
+            "description": "Adapter-owned per-(run,node) execution ordinal; 1,2,3 across loop iterations (0016 §4.1)"
+          },
+          "name": {
+            "type": "string",
+            "default": "",
+            "description": "Artifact name from the node's produces.name, e.g. plan"
+          },
+          "schema_ref": {
+            "type": "string",
+            "default": "",
+            "description": "resultSchema the payload was shape-checked against, e.g. schema:plan"
+          },
+          "payload": {
+            "type": "string",
+            "default": "",
+            "description": "Serialized JSON content, secret-redacted + size-capped at the adapter boundary"
+          },
+          "payload_ref": {
+            "type": "string",
+            "default": "",
+            "description": "Set instead of payload when the content exceeds the inline cap (0016 §8)"
+          },
+          "attempt_id": {
+            "type": "string",
+            "default": ""
+          },
+          "produced_at": {
+            "type": "string",
+            "default": ""
+          }
+        },
+        "required": []
+      }
     }
   ],
   "rows": [

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

@@ -11,6 +11,7 @@
       "orchestrator",
       "analyst",
       "reviewer",
+      "triager",
       "developer",
       "integrator",
       "watcher"
@@ -36,7 +37,12 @@
             "approved",
             "clean",
             "blocker",
-            "changes_requested"
+            "changes_requested",
+            "review_changes",
+            "ci_changes",
+            "fix",
+            "wontfix",
+            "question"
           ]
         },
         "nodes": {
@@ -46,15 +52,66 @@
             "roleRef": "role:analyst",
             "next": "planReviewer",
             "onFailure": "abort",
-            "resultSchema": "schema:plan"
+            "resultSchema": "schema:plan",
+            "produces": {
+              "name": "plan"
+            },
+            "incrementCounters": [
+              "planReviewLoop"
+            ]
           },
           "planReviewer": {
             "id": "planReviewer",
             "kind": "agent",
             "roleRef": "role:reviewer",
-            "next": "planGate",
+            "next": "planReviewRouter",
             "onFailure": "abort",
-            "resultSchema": "schema:reviewVerdict"
+            "resultSchema": "schema:reviewVerdict",
+            "consumes": [
+              {
+                "node": "analyst",
+                "as": "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": "blockedEnd"
+              }
+            ]
           },
           "planGate": {
             "id": "planGate",
@@ -82,7 +139,13 @@
             "roleRef": "role:developer",
             "next": "codeReview",
             "onFailure": "abort",
-            "resultSchema": "schema:change"
+            "resultSchema": "schema:change",
+            "consumes": [
+              {
+                "node": "analyst",
+                "as": "plan"
+              }
+            ]
           },
           "codeReview": {
             "id": "codeReview",
@@ -146,7 +209,7 @@
             "id": "integrator",
             "kind": "script",
             "scriptRef": "script:integrator",
-            "next": "watcherPost",
+            "next": "pollPr",
             "catch": [
               {
                 "onError": "revo.ScriptBlocked",
@@ -160,70 +223,219 @@
             "onFailure": "route",
             "resultSchema": "schema:integration"
           },
-          "watcherPost": {
-            "id": "watcherPost",
-            "kind": "agent",
-            "roleRef": "role:watcher",
-            "next": "watcherRouter",
-            "onFailure": "abort",
-            "resultSchema": "schema:watchVerdict"
+          "mergeGate": {
+            "id": "mergeGate",
+            "kind": "humanGate",
+            "reason": "merge-review",
+            "outcomes": [
+              "approved"
+            ],
+            "branches": [
+              {
+                "when": {
+                  "op": "verdict.eq",
+                  "value": "approved"
+                },
+                "goto": "confirmMerge"
+              },
+              {
+                "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"
+          },
+          "mergedEnd": {
+            "id": "mergedEnd",
+            "kind": "terminal",
+            "status": "succeeded"
+          },
+          "failedEnd": {
+            "id": "failedEnd",
+            "kind": "terminal",
+            "status": "failed"
           },
-          "watcherRouter": {
-            "id": "watcherRouter",
+          "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.in",
-                  "value": [
-                    "approved",
-                    "clean"
-                  ]
+                  "op": "verdict.eq",
+                  "value": "clean"
                 },
                 "goto": "mergeGate"
               },
+              {
+                "when": {
+                  "op": "verdict.eq",
+                  "value": "review_changes"
+                },
+                "goto": "triage"
+              },
               {
                 "when": {
                   "op": "all",
                   "of": [
                     {
-                      "op": "verdict.in",
-                      "value": [
-                        "blocker",
-                        "changes_requested"
-                      ]
+                      "op": "verdict.eq",
+                      "value": "ci_changes"
                     },
                     {
                       "op": "counter.lt",
-                      "scope": "watcherLoop",
+                      "scope": "ciLoop",
                       "value": 3
                     }
                   ]
                 },
-                "goto": "watcherRework"
+                "goto": "ciRework"
               },
               {
                 "default": "blockedEnd"
               }
             ]
           },
-          "watcherRework": {
-            "id": "watcherRework",
+          "ciRework": {
+            "id": "ciRework",
             "kind": "agent",
             "roleRef": "role:developer",
             "next": "integrator",
             "onFailure": "abort",
             "resultSchema": "schema:change",
             "incrementCounters": [
-              "watcherLoop"
+              "ciLoop"
+            ],
+            "consumes": [
+              {
+                "node": "pollPr",
+                "as": "feedback"
+              }
             ]
           },
-          "mergeGate": {
-            "id": "mergeGate",
+          "triage": {
+            "id": "triage",
+            "kind": "agent",
+            "roleRef": "role:triager",
+            "next": "triageRouter",
+            "onFailure": "abort",
+            "resultSchema": "schema:triage",
+            "produces": {
+              "name": "triage"
+            },
+            "consumes": [
+              {
+                "node": "analyst",
+                "as": "plan",
+                "staleOk": true
+              },
+              {
+                "node": "pollPr",
+                "as": "feedback"
+              }
+            ]
+          },
+          "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": "merge-review",
+            "reason": "review-question",
             "outcomes": [
-              "approved"
+              "approved",
+              "changes_requested"
+            ],
+            "incrementCounters": [
+              "questionLoop"
             ],
             "branches": [
               {
@@ -231,30 +443,74 @@
                   "op": "verdict.eq",
                   "value": "approved"
                 },
-                "goto": "mergedEnd"
+                "goto": "triage"
               },
               {
                 "default": "blockedEnd"
               }
             ]
           },
-          "mergedEnd": {
-            "id": "mergedEnd",
-            "kind": "terminal",
-            "status": "succeeded"
+          "reviewRework": {
+            "id": "reviewRework",
+            "kind": "agent",
+            "roleRef": "role:developer",
+            "next": "reviewIntegrator",
+            "onFailure": "abort",
+            "resultSchema": "schema:change",
+            "incrementCounters": [
+              "reviewLoop"
+            ],
+            "consumes": [
+              {
+                "node": "triage",
+                "as": "triage"
+              }
+            ]
           },
-          "failedEnd": {
-            "id": "failedEnd",
-            "kind": "terminal",
-            "status": "failed"
+          "reviewIntegrator": {
+            "id": "reviewIntegrator",
+            "kind": "script",
+            "scriptRef": "script:integrator",
+            "next": "respondThreads",
+            "onFailure": "route",
+            "resultSchema": "schema:integration",
+            "catch": [
+              {
+                "onError": "revo.ScriptBlocked",
+                "goto": "blockedEnd"
+              },
+              {
+                "onError": "revo.ScriptFailed",
+                "goto": "failedEnd"
+              }
+            ]
           },
-          "blockedEnd": {
-            "id": "blockedEnd",
-            "kind": "terminal",
-            "status": "blocked"
+          "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"
+              },
+              {
+                "onError": "revo.ScriptFailed",
+                "goto": "failedEnd"
+              }
+            ]
           }
         },
-        "title": "Feature development — plan + merge gates, bounded code-review + watcher rework",
+        "title": "Feature development — plan + merge gates, bounded code-review rework, and a PR review-feedback loop (plan 0018)",
         "policy": {
           "conflicts": [
             [
@@ -265,11 +521,23 @@
           "enforcement": "strict"
         },
         "scopes": {
+          "planReviewLoop": {
+            "cap": 4,
+            "parent": null
+          },
           "codeReviewLoop": {
             "cap": 3,
             "parent": null
           },
-          "watcherLoop": {
+          "ciLoop": {
+            "cap": 3,
+            "parent": null
+          },
+          "reviewLoop": {
+            "cap": 3,
+            "parent": null
+          },
+          "questionLoop": {
             "cap": 3,
             "parent": null
           }

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

@@ -52,5 +52,14 @@
     "allowed_tools": ["Read", "Grep", "Glob", "Bash"],
     "default_model_level": "cheap",
     "runner_id": "claude-code"
+  },
+  {
+    "id": "triager",
+    "path": "prompts/triager.md",
+    "surface": "repo",
+    "rights": "read-only",
+    "allowed_tools": ["Read", "Grep", "Glob", "Bash"],
+    "default_model_level": "deep",
+    "runner_id": "claude-code"
   }
 ]

package/control-plane/default-playbook/prompts/analyst.md

@@ -18,7 +18,9 @@ reviewer can check against. The plan is the artifact a human approves at the pla
 
 ## Output
 
-Emit a structured plan. End your output with a single clear verdict token:
+Put the full ordered plan (problem, scope, files to change, steps, risks, verification) in the result
+`output` — the plan reviewer and the developer receive it verbatim as their input. Set the `verdict` field
+to EXACTLY one of:
 
 - `approved` — the task is well understood and the plan is ready for a developer.
 - `changes_requested` — the request is ambiguous or under-specified; explain what is missing.

package/control-plane/default-playbook/prompts/developer.md

@@ -10,7 +10,8 @@ reviewer can approve it and the integrator can ship it.
 
 ## What to do
 
-1. Implement the plan. Do not gold-plate and do not expand scope beyond what was approved.
+1. Implement the plan provided in the **`## Inputs (from previous steps)`** section (the analyst's
+   `plan`). Do not gold-plate and do not expand scope beyond what was approved.
 2. Follow the existing conventions of the codebase you are editing.
 3. Run the project's verification (build, lint, tests) and fix what you broke.
 4. On a rework pass (reviewer requested changes), address each reviewer finding directly.

package/control-plane/default-playbook/prompts/reviewer.md

@@ -11,17 +11,18 @@ are invoked in the pipeline.
 
 ## What to do
 
-1. Read the plan or diff and the surrounding code it touches.
+1. Read the `plan` provided in the **`## Inputs (from previous steps)`** section (plan review), or
+   the diff in the working tree (code review), and the surrounding code it touches.
 2. Check correctness, scope creep, missing tests/verification, and risk (data, contracts,
    security, migrations, concurrency, public API).
 3. Be specific: cite the file and the concern. Distinguish must-fix from nice-to-have.
 
 ## Output
 
-End your output with a single clear verdict token:
+Set the result `verdict` field (the pipeline routes on it) to EXACTLY one of these tokens:
 
 - `approved` — proceed; the work is correct and complete (nits are acceptable to defer).
 - `changes_requested` — fixable issues that must be addressed before proceeding.
 - `blocker` — a serious defect or risk that must be resolved (drives the bounded rework loop).
 
-Keep findings actionable. You are read-only: never modify the working tree.
+Put your actionable findings in `output`. You are read-only: never modify the working tree.

package/control-plane/default-playbook/prompts/triager.md

@@ -0,0 +1,51 @@
+# Triager
+
+You are the **triager** role in a software delivery pipeline. You run AFTER the PR is open, when a
+poll has found **unresolved review comments** (from human reviewers or review bots like CodeRabbit).
+You read the actual diff and the threads, then decide — per thread — *whether* and *how* to respond.
+You do not edit files; you read and reason.
+
+## Goal
+
+Convert each unresolved review thread into a concrete decision the developer and the reply step can
+act on. Your output drives the next step: a `fix` is implemented by the developer and the threads are
+replied + resolved; a `wontfix` is replied + resolved with your reason; a `question` is escalated to a
+human at the review-question gate.
+
+## Inputs
+
+You receive (in the `## Inputs` section) the approved **plan** and the **prFeedback** the poll produced:
+the PR number, head sha, failing CI checks, and the unresolved `reviewThreads`
+(`{threadId, path, line, author, body}`). Read the diff (`git diff origin/<base>`) in the worktree to
+judge each comment against the real change.
+
+## What to do
+
+1. Read the diff and the files each thread points at.
+2. For EVERY unresolved thread, decide one of: `fix`, `wontfix`, or `question`.
+   - `fix` — the comment is valid; the developer should change the code. Give precise `guidance`.
+   - `wontfix` — the comment does not apply / is out of scope / is already handled. Give a short,
+     respectful `replyText` stating the reason (it is posted and the thread is auto-resolved).
+   - `question` — the comment is genuinely ambiguous and needs a human to decide. Put the question in
+     `replyText`; it is surfaced at the review-question gate.
+3. If CI also failed, summarize the fix direction in `ciGuidance` for the developer.
+
+## Output
+
+Set the result `output` to a `triage` object:
+
+```
+{
+  "items": [ { "threadId": "<id>", "decision": "fix|wontfix|question", "guidance": "<for the dev>", "replyText": "<to post>" } ],
+  "ciGuidance": "<optional>",
+  "needsHuman": <true if any item is a question>
+}
+```
+
+Set the `verdict` field to EXACTLY one of (decision order):
+
+- `question` — at least one thread is a question (the human gate fires first).
+- `fix` — no questions, but at least one thread needs a code change.
+- `wontfix` — every thread is a wontfix (reply + resolve, no code change).
+
+Keep it concise. You are read-only: never modify the working tree.

package/control-plane/default-playbook/prompts/watcher.md

@@ -15,10 +15,10 @@ is not red, and nothing obviously broke.
 
 ## Output
 
-End your output with a single clear verdict token:
+Set the result `verdict` field (the pipeline routes on it) to EXACTLY one of these tokens:
 
 - `clean` — the integrated change is healthy; proceed to the merge gate.
 - `dirty` — something is wrong with the integration (drives rework/fail per the pipeline).
 - `blocker` — a hard problem a human must resolve.
 
-You are read-only: never modify the working tree.
+Put your findings in `output`. You are read-only: never modify the working tree.