@revisium/orchestrator 0.2.0-alpha.1 → 0.2.0-alpha.3

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

@@ -25,7 +25,7 @@
     "platform_invocation": "canonical-only",
     "execution_policy": {
       "raw": [
-        "Built-in default (slice 5, plan 0015): the pipeline graph is DATA — see template_json.",
+        "Built-in default (slice 5, plan 0015): the pipeline graph is DATA \u2014 see template_json.",
         "analyst -> reviewer[plan gate] -> developer -> reviewer[code] (bounded rework, cap 3) -> integrator(script) -> watcher[post-integrator] -> merge gate."
       ],
       "template_json": {
@@ -46,7 +46,10 @@
             "recheck",
             "approve_anyway",
             "rework",
-            "abort"
+            "cancel",
+            "address_review_threads",
+            "return_to_development",
+            "override_merge"
           ]
         },
         "nodes": {
@@ -62,6 +65,36 @@
             },
             "incrementCounters": [
               "planReviewLoop"
+            ],
+            "consumes": [
+              {
+                "node": "analyst",
+                "as": "priorPlan",
+                "iteration": "latest",
+                "optional": true,
+                "staleOk": true
+              },
+              {
+                "node": "planReviewer",
+                "as": "planReview",
+                "iteration": "latest",
+                "optional": true,
+                "staleOk": true
+              },
+              {
+                "node": "planGate",
+                "as": "planGateResolution",
+                "iteration": "latest",
+                "optional": true,
+                "staleOk": true
+              },
+              {
+                "node": "planStuckGate",
+                "as": "planStuckResolution",
+                "iteration": "latest",
+                "optional": true,
+                "staleOk": true
+              }
             ]
           },
           "planReviewer": {
@@ -71,6 +104,9 @@
             "next": "planReviewRouter",
             "onFailure": "abort",
             "resultSchema": "schema:reviewVerdict",
+            "produces": {
+              "name": "planReview"
+            },
             "consumes": [
               {
                 "node": "analyst",
@@ -122,7 +158,9 @@
             "kind": "humanGate",
             "reason": "plan-stuck",
             "outcomes": [
-              "approved"
+              "approved",
+              "rework",
+              "cancel"
             ],
             "branches": [
               {
@@ -132,6 +170,20 @@
                 },
                 "goto": "developer"
               },
+              {
+                "when": {
+                  "op": "verdict.eq",
+                  "value": "rework"
+                },
+                "goto": "analyst"
+              },
+              {
+                "when": {
+                  "op": "verdict.eq",
+                  "value": "cancel"
+                },
+                "goto": "cancelledEnd"
+              },
               {
                 "default": "blockedEnd"
               }
@@ -139,6 +191,9 @@
             "gatedArtifact": {
               "node": "analyst",
               "as": "plan"
+            },
+            "produces": {
+              "name": "planStuckResolution"
             }
           },
           "planGate": {
@@ -146,7 +201,9 @@
             "kind": "humanGate",
             "reason": "plan-review",
             "outcomes": [
-              "approved"
+              "approved",
+              "rework",
+              "cancel"
             ],
             "branches": [
               {
@@ -156,6 +213,20 @@
                 },
                 "goto": "developer"
               },
+              {
+                "when": {
+                  "op": "verdict.eq",
+                  "value": "rework"
+                },
+                "goto": "analyst"
+              },
+              {
+                "when": {
+                  "op": "verdict.eq",
+                  "value": "cancel"
+                },
+                "goto": "cancelledEnd"
+              },
               {
                 "default": "blockedEnd"
               }
@@ -163,6 +234,9 @@
             "gatedArtifact": {
               "node": "analyst",
               "as": "plan"
+            },
+            "produces": {
+              "name": "planGateResolution"
             }
           },
           "developer": {
@@ -244,14 +318,6 @@
                 },
                 "goto": "reworkDeveloper"
               },
-              {
-                "when": {
-                  "op": "counter.gte",
-                  "scope": "codeStuckRecoveryLoop",
-                  "value": 1
-                },
-                "goto": "codeFinalStuckGate"
-              },
               {
                 "default": "codeStuckGate"
               }
@@ -264,7 +330,7 @@
             "outcomes": [
               "approve_anyway",
               "rework",
-              "abort"
+              "cancel"
             ],
             "branches": [
               {
@@ -285,7 +351,7 @@
                     {
                       "op": "counter.lt",
                       "scope": "codeStuckRecoveryLoop",
-                      "value": 1
+                      "value": 3
                     }
                   ]
                 },
@@ -294,9 +360,9 @@
               {
                 "when": {
                   "op": "verdict.eq",
-                  "value": "rework"
+                  "value": "cancel"
                 },
-                "goto": "codeFinalStuckGate"
+                "goto": "cancelledEnd"
               },
               {
                 "default": "blockedEnd"
@@ -371,7 +437,11 @@
             "reason": "merge-review",
             "outcomes": [
               "approved",
-              "recheck"
+              "recheck",
+              "address_review_threads",
+              "return_to_development",
+              "override_merge",
+              "cancel"
             ],
             "branches": [
               {
@@ -388,6 +458,34 @@
                 },
                 "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": "confirmMerge"
+              },
+              {
+                "when": {
+                  "op": "verdict.eq",
+                  "value": "cancel"
+                },
+                "goto": "cancelledEnd"
+              },
               {
                 "default": "blockedEnd"
               }
@@ -901,36 +999,13 @@
               }
             ]
           },
-          "codeFinalStuckGate": {
-            "id": "codeFinalStuckGate",
-            "kind": "humanGate",
-            "reason": "code-review-final-stuck",
-            "outcomes": [
-              "approve_anyway",
-              "abort"
-            ],
-            "branches": [
-              {
-                "when": {
-                  "op": "verdict.eq",
-                  "value": "approve_anyway"
-                },
-                "goto": "integrator"
-              },
-              {
-                "default": "blockedEnd"
-              }
-            ],
-            "gatedArtifact": {
-              "node": "stuckReworkDeveloper",
-              "as": "change"
-            },
-            "produces": {
-              "name": "gateResolution"
-            }
+          "cancelledEnd": {
+            "id": "cancelledEnd",
+            "kind": "terminal",
+            "status": "cancelled"
           }
         },
-        "title": "Feature development — plan + merge gates, bounded code-review rework, and a PR review-feedback loop (plan 0018)",
+        "title": "Feature development \u2014 plan + merge gates, bounded code-review rework, and a PR review-feedback loop (plan 0018)",
         "policy": {
           "conflicts": [
             [
@@ -947,7 +1022,7 @@
           },
           "codeReviewLoop": {
             "cap": 3,
-            "parent": null
+            "parent": "codeStuckRecoveryLoop"
           },
           "ciLoop": {
             "cap": 3,
@@ -962,7 +1037,7 @@
             "parent": null
           },
           "codeStuckRecoveryLoop": {
-            "cap": 1,
+            "cap": 3,
             "parent": null
           }
         }
@@ -1016,7 +1091,11 @@
             "recheck",
             "approve_anyway",
             "rework",
-            "abort"
+            "abort",
+            "address_review_threads",
+            "return_to_development",
+            "override_merge",
+            "cancel"
           ]
         },
         "nodes": {
@@ -1299,7 +1378,11 @@
             "reason": "merge-review",
             "outcomes": [
               "approved",
-              "recheck"
+              "recheck",
+              "address_review_threads",
+              "return_to_development",
+              "override_merge",
+              "cancel"
             ],
             "branches": [
               {
@@ -1316,6 +1399,34 @@
                 },
                 "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": "confirmMerge"
+              },
+              {
+                "when": {
+                  "op": "verdict.eq",
+                  "value": "cancel"
+                },
+                "goto": "cancelledEnd"
+              },
               {
                 "default": "blockedEnd"
               }
@@ -2016,6 +2127,11 @@
             "produces": {
               "name": "gateResolution"
             }
+          },
+          "cancelledEnd": {
+            "id": "cancelledEnd",
+            "kind": "terminal",
+            "status": "cancelled"
           }
         },
         "title": "Codex feature development with parallel review consensus",
@@ -2075,7 +2191,7 @@
     "platform_invocation": "canonical-only",
     "execution_policy": {
       "raw": [
-        "Built-in default (slice 5, plan 0015): the pipeline graph is DATA — see template_json.",
+        "Built-in default (slice 5, plan 0015): the pipeline graph is DATA \u2014 see template_json.",
         "orchestrator routes; the graph runs developer -> done with no gate."
       ],
       "template_json": {
@@ -2102,7 +2218,7 @@
             "status": "succeeded"
           }
         },
-        "title": "Local change — developer only, no gate"
+        "title": "Local change \u2014 developer only, no gate"
       }
     }
   }

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

@@ -16,6 +16,10 @@ reviewer can check against. The plan is the artifact a human approves at the pla
    migrations, concurrency, public API).
 4. Produce a short, ordered implementation plan with verification steps.
 
+On a plan rework pass, the inputs may include a prior plan plus reviewer or human gate comments.
+Revise the existing plan to address that feedback and preserve still-valid structure and decisions;
+do not restart the analysis as a new task.
+
 ## Output
 
 Put the full ordered plan (problem, scope, files to change, steps, risks, verification) in the result

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

@@ -17,6 +17,10 @@ reviewer can approve it and the integrator can ship it.
 4. On a rework pass (reviewer requested changes), address each reviewer finding directly.
 5. On a CI rework pass, use `mergeFeedback` when it is present; otherwise use `feedback`.
 
+On a stuck-gate rework pass, treat the human gate note and latest review findings as an iteration
+on the current change. Continue from the existing branch and worktree, preserve useful work, and do
+not restart the implementation unless the feedback explicitly requires replacing it.
+
 ## Output
 
 Summarize what you changed and how you verified it, then end with a verdict token:

package/dist/api/graphql-api/inbox/inputs/resolve-gate.input.js

@@ -8,11 +8,115 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 import { Field, ID, InputType } from '@nestjs/graphql';
+let ManualAdoptionAuditInput = class ManualAdoptionAuditInput {
+    runId;
+    step;
+    role;
+    targetRepo;
+    targetBranch;
+    actor;
+    scope;
+    risk;
+    verificationResponsibility;
+    artifactRef;
+    worktreeRef;
+};
+__decorate([
+    Field(() => String),
+    __metadata("design:type", String)
+], ManualAdoptionAuditInput.prototype, "runId", void 0);
+__decorate([
+    Field(() => String),
+    __metadata("design:type", String)
+], ManualAdoptionAuditInput.prototype, "step", void 0);
+__decorate([
+    Field(() => String),
+    __metadata("design:type", String)
+], ManualAdoptionAuditInput.prototype, "role", void 0);
+__decorate([
+    Field(() => String),
+    __metadata("design:type", String)
+], ManualAdoptionAuditInput.prototype, "targetRepo", void 0);
+__decorate([
+    Field(() => String),
+    __metadata("design:type", String)
+], ManualAdoptionAuditInput.prototype, "targetBranch", void 0);
+__decorate([
+    Field(() => String),
+    __metadata("design:type", String)
+], ManualAdoptionAuditInput.prototype, "actor", void 0);
+__decorate([
+    Field(() => String),
+    __metadata("design:type", String)
+], ManualAdoptionAuditInput.prototype, "scope", void 0);
+__decorate([
+    Field(() => String),
+    __metadata("design:type", String)
+], ManualAdoptionAuditInput.prototype, "risk", void 0);
+__decorate([
+    Field(() => String),
+    __metadata("design:type", String)
+], ManualAdoptionAuditInput.prototype, "verificationResponsibility", void 0);
+__decorate([
+    Field(() => String, { nullable: true }),
+    __metadata("design:type", String)
+], ManualAdoptionAuditInput.prototype, "artifactRef", void 0);
+__decorate([
+    Field(() => String, { nullable: true }),
+    __metadata("design:type", String)
+], ManualAdoptionAuditInput.prototype, "worktreeRef", void 0);
+ManualAdoptionAuditInput = __decorate([
+    InputType()
+], ManualAdoptionAuditInput);
+export { ManualAdoptionAuditInput };
+let MergeOverrideAuditInput = class MergeOverrideAuditInput {
+    threadIds;
+    actor;
+    reason;
+    risk;
+    verificationResponsibility;
+    headSha;
+    fingerprint;
+};
+__decorate([
+    Field(() => [String]),
+    __metadata("design:type", Array)
+], MergeOverrideAuditInput.prototype, "threadIds", void 0);
+__decorate([
+    Field(() => String),
+    __metadata("design:type", String)
+], MergeOverrideAuditInput.prototype, "actor", void 0);
+__decorate([
+    Field(() => String),
+    __metadata("design:type", String)
+], MergeOverrideAuditInput.prototype, "reason", void 0);
+__decorate([
+    Field(() => String),
+    __metadata("design:type", String)
+], MergeOverrideAuditInput.prototype, "risk", void 0);
+__decorate([
+    Field(() => String),
+    __metadata("design:type", String)
+], MergeOverrideAuditInput.prototype, "verificationResponsibility", void 0);
+__decorate([
+    Field(() => String),
+    __metadata("design:type", String)
+], MergeOverrideAuditInput.prototype, "headSha", void 0);
+__decorate([
+    Field(() => String, { nullable: true }),
+    __metadata("design:type", String)
+], MergeOverrideAuditInput.prototype, "fingerprint", void 0);
+MergeOverrideAuditInput = __decorate([
+    InputType()
+], MergeOverrideAuditInput);
+export { MergeOverrideAuditInput };
 let ResolveGateInput = class ResolveGateInput {
     inboxId;
     outcome;
     note;
     resolvedBy;
+    adoptionAudit;
+    mergeOverrideAudit;
 };
 __decorate([
     Field(() => ID),
@@ -30,6 +134,14 @@ __decorate([
     Field(() => String, { nullable: true }),
     __metadata("design:type", String)
 ], ResolveGateInput.prototype, "resolvedBy", void 0);
+__decorate([
+    Field(() => ManualAdoptionAuditInput, { nullable: true }),
+    __metadata("design:type", ManualAdoptionAuditInput)
+], ResolveGateInput.prototype, "adoptionAudit", void 0);
+__decorate([
+    Field(() => MergeOverrideAuditInput, { nullable: true }),
+    __metadata("design:type", MergeOverrideAuditInput)
+], ResolveGateInput.prototype, "mergeOverrideAudit", void 0);
 ResolveGateInput = __decorate([
     InputType()
 ], ResolveGateInput);

package/dist/api/graphql-api/inbox/inputs/resolve-gate.input.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolve-gate.input.js","sourceRoot":"","sources":["../../../../../src/api/graphql-api/inbox/inputs/resolve-gate.input.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAGhD,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAE3B,OAAO,CAAU;IAGjB,OAAO,CAAU;IAGjB,IAAI,CAAU;IAGd,UAAU,CAAU;CACrB,CAAA;AAVC;IADC,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC;;iDACC;AAGjB;IADC,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;iDACH;AAGjB;IADC,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8CAC1B;AAGd;IADC,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;oDACpB;AAXT,gBAAgB;IAD5B,SAAS,EAAE;GACC,gBAAgB,CAY5B"}
+{"version":3,"file":"resolve-gate.input.js","sourceRoot":"","sources":["../../../../../src/api/graphql-api/inbox/inputs/resolve-gate.input.ts"],"names":[],"mappings":"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"}

package/dist/control-plane/audit-validation-helpers.js

@@ -0,0 +1,31 @@
+import { ControlPlaneError } from './errors.js';
+export function asRecord(value) {
+    if (value === null || typeof value !== 'object' || Array.isArray(value))
+        return null;
+    return value;
+}
+export function nonBlankString(record, key) {
+    const value = record[key];
+    if (typeof value !== 'string')
+        return undefined;
+    const trimmed = value.trim();
+    return trimmed.length > 0 ? trimmed : undefined;
+}
+export function requireAuditRecord(input, errorMessage) {
+    const record = asRecord(input);
+    if (!record)
+        throw new ControlPlaneError('VALIDATION_FAILURE', errorMessage);
+    return record;
+}
+export function normalizeAuditStringFields(record, fields, fieldPath) {
+    const normalized = {};
+    for (const field of fields) {
+        const value = nonBlankString(record, field);
+        if (!value) {
+            throw new ControlPlaneError('VALIDATION_FAILURE', `${fieldPath}.${field} is required`);
+        }
+        normalized[field] = value;
+    }
+    return normalized;
+}
+//# sourceMappingURL=audit-validation-helpers.js.map

package/dist/control-plane/audit-validation-helpers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"audit-validation-helpers.js","sourceRoot":"","sources":["../../src/control-plane/audit-validation-helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAEhD,MAAM,UAAU,QAAQ,CAAC,KAAc;IACrC,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IACrF,OAAO,KAAgC,CAAC;AAC1C,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,MAA+B,EAAE,GAAW;IACzE,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;IAC1B,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,SAAS,CAAC;IAChD,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IAC7B,OAAO,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;AAClD,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,KAAc,EAAE,YAAoB;IACrE,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC/B,IAAI,CAAC,MAAM;QAAE,MAAM,IAAI,iBAAiB,CAAC,oBAAoB,EAAE,YAAY,CAAC,CAAC;IAC7E,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,0BAA0B,CACxC,MAA+B,EAC/B,MAAyB,EACzB,SAAiB;IAEjB,MAAM,UAAU,GAA2B,EAAE,CAAC;IAC9C,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,MAAM,KAAK,GAAG,cAAc,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAC5C,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,MAAM,IAAI,iBAAiB,CAAC,oBAAoB,EAAE,GAAG,SAAS,IAAI,KAAK,cAAc,CAAC,CAAC;QACzF,CAAC;QACD,UAAU,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC;IAC5B,CAAC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC"}