@nanobpm/nano-workforce 0.99.0 → 0.100.0

package/openapi.yaml

@@ -1908,69 +1908,17 @@ paths:
             application/json:
               schema:
                 $ref: "#/components/schemas/MessageResult"
-  /actions/answer-escalation:
-    post:
-      operationId: answerFeatureEscalation
-      summary: "Answer a native feature-run escalation (issue #210). Completes the parked
-        `feature-escalation` user task with the operator's typed form variables (resolution=answer/abandon
-        + guidance), driving the canonical attributed completer (completeUserTaskAttributed) — the same
-        resume path the task inbox uses, recording who answered. The poller then reconciles the run off
-        `escalated`. This is the nwf UI's answer affordance for a feature run parked on a human decision."
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              type: object
-              additionalProperties: false
-              required:
-                - userTaskKey
-                - resolution
-              properties:
-                userTaskKey:
-                  type: string
-                  minLength: 1
-                  description: The parked `feature-escalation` user-task key (feature_runs.escalation_user_task_key).
-                resolution:
-                  type: string
-                  enum: [answer, abandon]
-                  description: answer ⇒ re-dispatch the implement task with the guidance; abandon ⇒ give up on the task.
-                answer:
-                  type: string
-                  description: Guidance for the implementation agent. Required (non-blank) when resolution is answer.
-                operator:
-                  type: string
-                  description: Optional operator handle recorded in the attribution ledger; defaults to "operator".
-      responses:
-        "200":
-          description: The escalation user task was completed and the process resumed.
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/MessageResult"
-        "400":
-          description: A required field was missing/invalid, or the target is not an escalation task.
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/MessageResult"
-        "404":
-          description: No open escalation user task matches the userTaskKey.
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/MessageResult"
   /actions/complete-user-task:
     post:
       operationId: completeUserTask
       summary: "Complete an open native user-task escalation from the nwf Tasks inbox (issue #236).
         Submits the parked task's typed `.form` variables (e.g. a plan-review `{ directive, notes }`, a
-        trial-merge `{ action, notes }`, or a PR `{ answer }`) to the canonical human completer
-        (completeEscalationAsHuman → completeUserTaskAttributed) — the same resume path the task inbox
-        uses, recording who answered. The completer refuses any user task that is not one of the
-        migrated escalation elements. The feature-run kinds keep their own operations
-        (answer-escalation / acknowledge-blocked); this door is for the plan-review / trial-merge / PR
-        `wait-answer` kinds whose completion is a straight typed pass-through. On success the answered
+        trial-merge `{ action, notes }`, a PR `{ answer }`, a feature escalation `{ resolution, answer }`,
+        or a blocked-run `{ note }`) to the canonical human completer (completeEscalationAsHuman →
+        completeUserTaskAttributed) — the same resume path the task inbox uses, recording who answered.
+        The completer refuses any user task that is not one of the human-completable elements. Issue #332
+        retired the bespoke feature-run doors (answer-escalation / acknowledge-blocked) and folded
+        `feature-escalation` / `feature-blocked` onto this one canonical door. On success the answered
         task's read-model row is dropped so the Tasks grid stops offering a decision for it."
       requestBody:
         required: true
@@ -2013,61 +1961,12 @@ paths:
             application/json:
               schema:
                 $ref: "#/components/schemas/MessageResult"
-  /actions/acknowledge-blocked:
-    post:
-      operationId: acknowledgeBlocked
-      summary: "Acknowledge a blocked native feature run (issue #220). Completes the parked
-        `feature-blocked` operator user task with the operator's optional disposition note, driving the
-        canonical attributed completer (completeUserTaskAttributed) — the same resume path the task inbox
-        uses, recording who acknowledged. Completing it fires pr.record-blocked-ack, settling the run to
-        the terminal `blocked` status with the note, and the poller reconciles the completable-task
-        pointer off the row. This is the nwf UI's completion affordance for a feature run parked as
-        blocked (the blocked twin of answer-escalation)."
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              type: object
-              additionalProperties: false
-              required:
-                - userTaskKey
-              properties:
-                userTaskKey:
-                  type: string
-                  minLength: 1
-                  description: The parked `feature-blocked` user-task key (feature_runs.blocked_user_task_key).
-                note:
-                  type: string
-                  description: Optional operator disposition note, recorded on the run (delivery_label). Blank ⇒ "acknowledged".
-                operator:
-                  type: string
-                  description: Optional operator handle recorded in the attribution ledger; defaults to "operator".
-      responses:
-        "200":
-          description: The blocked user task was completed and the process resumed.
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/MessageResult"
-        "400":
-          description: A required field was missing/invalid, or the target is not a blocked task.
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/MessageResult"
-        "404":
-          description: No open blocked user task matches the userTaskKey.
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/MessageResult"
   /actions/acknowledge-done:
     post:
       operationId: acknowledgeDone
       summary: "Tick off a TERMINAL feature run (issue #254 §5). Stamps `acknowledged_at` on the run so
         the gateway recomputes its `list_bucket` to 'history', dropping the finished run out of the
-        primary Active list into History. The Done twin of acknowledge-blocked, but a terminal run is
+        primary Active list into History. The Done twin of the blocked acknowledgement, but a terminal run is
         not parked at a user task, so this completes no user task and only writes the row. Keyed on the
         run's `feature_key`; idempotent-safe (re-acknowledging keeps it in History)."
       requestBody:

package/operations/agentCompleteEscalation.ts

@@ -46,8 +46,8 @@ export default defineOperation("agentCompleteEscalation", async ({ req, body },
     app.log.info("agent completed escalation", { userTaskKey, agentId, elementId: r.elementId });
     return { status: 200, body: { ok: true, completionId: r.completionId, elementId: r.elementId } };
   }
-  // A non-escalation / missing-target is a client error; an unknown key is a 404.
-  const status = r.reason === "no open escalation task" ? 404 : 400;
+  // A non-completable / missing-target is a client error; an unknown key is a 404.
+  const status = r.reason === "no open completable task" ? 404 : 400;
   app.log.warn("agent-complete: not completed", { userTaskKey, reason: r.reason });
   return { status, body: { ok: false, error: r.reason } };
 });

package/operations/completeUserTask.test.ts

@@ -1,15 +1,17 @@
 // Tests for the POST /app/api/actions/complete-user-task operation `completeUserTask` (issue #236).
 // The nwf Tasks page's decision affordance for the plan-review / trial-merge / PR `wait-answer`
-// escalations: it routes the typed form variables through the canonical human completer
-// (completeEscalationAsHuman → completeUserTaskAttributed), resuming the process exactly as the task
-// inbox would, and drops the answered task's read-model row so the grid stops offering a decision.
+// escalations plus the feature kinds `feature-escalation` / `feature-blocked` (issue #332 folded the
+// bespoke feature doors onto this one canonical door): it routes the typed form variables through the
+// canonical human completer (completeEscalationAsHuman → completeUserTaskAttributed), resuming the
+// process exactly as the task inbox would, and drops the answered task's read-model row so the grid
+// stops offering a decision.
 import { test } from "node:test";
 import { assertEquals } from "#test-assert";
 import type { AppApi } from "@nanobpm/urban";
 import { noopLog } from "../test/log.ts";
 import handler from "./completeUserTask.ts";
 
-// biome-ignore lint/suspicious/noExplicitAny: in-memory doubles, mirrors acknowledgeBlocked.test.ts
+// biome-ignore lint/suspicious/noExplicitAny: in-memory doubles, mirrors sibling op tests
 function memApp(openTasks: { userTaskKey: string; elementId?: string }[]): {
   app: AppApi;
   // biome-ignore lint/suspicious/noExplicitAny: see above
@@ -49,6 +51,7 @@ function memApp(openTasks: { userTaskKey: string; elementId?: string }[]): {
     };
   }
   const engine = {
+    openUserTasks: async () => openTasks,
     searchUserTasks: async () => openTasks,
     completeUserTask: async (userTaskKey: string, variables: Record<string, unknown>) => {
       completed.push({ userTaskKey, variables });
@@ -106,14 +109,30 @@ test("complete-user-task: non-object variables are rejected 400", async () => {
   assertEquals(res.status, 400);
 });
 
-test("complete-user-task: an unknown key is a 404 (no open escalation task)", async () => {
+test("complete-user-task: an unknown key is a 404 (no open completable task)", async () => {
   const { app } = memApp([]);
   const res = await call(app, { userTaskKey: "ghost", variables: { answer: "x" } });
   assertEquals(res.status, 404);
 });
 
-test("complete-user-task: refuses a non-escalation user task (400)", async () => {
+test("complete-user-task: completes a feature-blocked acknowledgement with the typed note (issue #332)", async () => {
   const { app, completed } = memApp([{ userTaskKey: "ut-4", elementId: "feature-blocked" }]);
+  const res = await call(app, { userTaskKey: "ut-4", variables: { note: "reassigned" } });
+  assertEquals(res.status, 200);
+  assertEquals(res.body.elementId, "feature-blocked");
+  assertEquals(completed, [{ userTaskKey: "ut-4", variables: { note: "reassigned" } }]);
+});
+
+test("complete-user-task: completes a feature-escalation answer (issue #332)", async () => {
+  const { app, completed } = memApp([{ userTaskKey: "ut-6", elementId: "feature-escalation" }]);
+  const res = await call(app, { userTaskKey: "ut-6", variables: { resolution: "answer", answer: "use v2" } });
+  assertEquals(res.status, 200);
+  assertEquals(res.body.elementId, "feature-escalation");
+  assertEquals(completed, [{ userTaskKey: "ut-6", variables: { resolution: "answer", answer: "use v2" } }]);
+});
+
+test("complete-user-task: refuses a non-completable internal user task (400)", async () => {
+  const { app, completed } = memApp([{ userTaskKey: "ut-4", elementId: "some-internal-task" }]);
   const res = await call(app, { userTaskKey: "ut-4", variables: { note: "x" } });
   assertEquals(res.status, 400);
   assertEquals(completed, []);

package/operations/completeUserTask.ts

@@ -1,19 +1,21 @@
 // POST /app/api/actions/complete-user-task → operationId `completeUserTask` (issue #236).
 //
-// The nwf **Tasks** page's decision affordance for the epic/PR native escalations that had no
-// app-side completion path — `plan-review-decision`, `trial-merge-decision`, and the PR review-loop
-// `wait-answer`. An operator submits the parked task's typed `.form` variables (e.g. a plan-review
-// `{ directive, notes }`, a trial-merge `{ action, notes }`, or a PR `{ answer }`) directly from the
-// Tasks inbox instead of only from Urban's read-only task-inbox stub.
+// The nwf **Tasks** page's decision affordance for the native user-task escalations that had no
+// app-side completion path — `plan-review-decision`, `trial-merge-decision`, the PR review-loop
+// `wait-answer`, the feature escalation `feature-escalation`, and the human-only `feature-blocked`
+// acknowledgement. An operator submits the parked task's typed `.form` variables (e.g. a plan-review
+// `{ directive, notes }`, a trial-merge `{ action, notes }`, a PR `{ answer }`, a feature escalation
+// `{ resolution, answer }`, or a blocked-run `{ note }`) directly from the Tasks inbox instead of only
+// from Urban's read-only task-inbox stub.
 //
 // It routes through the ONE canonical human completer (`completeEscalationAsHuman` →
 // `completeUserTaskAttributed`), so the completion uses the exact same typed variables and engine
 // resume path a human drives from the task inbox — no parallel completion — while recording WHO
 // answered in the `task_completions` ledger. That completer refuses any user task that is not one of
-// the migrated escalation elements (`ESCALATION_TASK_ELEMENTS`), so this generic door can never
-// complete an arbitrary internal user task. The feature-run kinds keep their own reconcile-bearing
-// operations (`answer-escalation` / `acknowledge-blocked`); this door is for the escalation kinds
-// whose completion is a straight typed pass-through.
+// the human-completable elements (`HUMAN_COMPLETABLE_ELEMENTS`), so this generic door can never
+// complete an arbitrary internal user task. Issue #332 retired the bespoke feature-run reconcile doors
+// (`answer-escalation` / `acknowledge-blocked`) and folded `feature-escalation` / `feature-blocked`
+// onto this one canonical door.
 //
 // On success it removes the answered task's `user_tasks` read-model row so the Tasks grid stops
 // offering a decision for a task that is now completed, without waiting a poll cycle; the poller
@@ -66,7 +68,7 @@ export default defineOperation("completeUserTask", async ({ body }, app) => {
     app.log.info("operator completed user task", { userTaskKey, elementId: r.elementId });
     return { status: 200, body: { ok: true, completionId: r.completionId, elementId: r.elementId } };
   }
-  const status = r.reason === "no open escalation task" ? 404 : 400;
+  const status = r.reason === "no open completable task" ? 404 : 400;
   app.log.warn("complete-user-task: not completed", { userTaskKey, reason: r.reason });
   return { status, body: { ok: false, error: r.reason } };
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nanobpm/nano-workforce",
-  "version": "0.99.0",
+  "version": "0.100.0",
   "description": "Nano Workforce — an Agent Graph Orchestration application for Agentic SDLC: durable BPMN processes that coordinate a graph of AI agents across the software delivery lifecycle.",
   "type": "module",
   "main": "main.ts",
@@ -55,7 +55,7 @@
   },
   "dependencies": {
     "@nanobpm/agentic": "^0.1.0",
-    "@nanobpm/urban": "^0.61.0"
+    "@nanobpm/urban": "^0.68.1"
   },
   "devDependencies": {
     "@biomejs/biome": "^2.4.11",

package/pages/feature.page.json

@@ -126,24 +126,6 @@
           { "field": "updated_at", "header": "Updated", "width": "9rem", "format": "datetime" }
         ],
         "rowActions": [
-          {
-            "label": "Abandon",
-            "confirm": "Abandon this escalated task? The run gives up on it (no PR).",
-            "showWhenField": "escalation_open",
-            "action": {
-              "path": "/app/api/actions/answer-escalation",
-              "body": { "userTaskKey": "{{row.escalation_user_task_key}}", "resolution": "abandon" }
-            }
-          },
-          {
-            "label": "Acknowledge blocked",
-            "confirm": "Acknowledge this blocked run? It settles to terminal blocked (the agent could not open a PR).",
-            "showWhenField": "blocked_user_task_key",
-            "action": {
-              "path": "/app/api/actions/acknowledge-blocked",
-              "body": { "userTaskKey": "{{row.blocked_user_task_key}}" }
-            }
-          },
           {
             "label": "Dismiss",
             "confirm": "Tick off this finished run? It acknowledges the run as done and files it under History.",
@@ -156,28 +138,10 @@
         ],
         "detail": {
           "fields": [
-            { "field": "escalation_question", "label": "Escalation question" },
             { "field": "base_branch", "label": "Base branch" },
             { "field": "outcome", "label": "Outcome" },
             { "field": "delivery_label", "label": "Delivery" }
-          ],
-          "form": {
-            "showWhenField": "escalation_open",
-            "title": "Answer escalation",
-            "promptField": "escalation_question",
-            "inputKey": "answer",
-            "inputLabel": "Guidance for the implementation agent",
-            "submitLabel": "Answer & re-dispatch",
-            "action": {
-              "path": "/app/api/actions/answer-escalation",
-              "successLabel": "Answered — the agent will resume",
-              "body": {
-                "userTaskKey": "{{row.escalation_user_task_key}}",
-                "resolution": "answer",
-                "answer": "{{form.answer}}"
-              }
-            }
-          }
+          ]
         }
       }
     }

package/pages/overview.page.json

@@ -165,48 +165,10 @@
           { "field": "delivery_label", "header": "Delivery" },
           { "field": "updated_at", "header": "Updated", "width": "9rem", "format": "datetime" }
         ],
-        "rowActions": [
-          {
-            "label": "Abandon",
-            "confirm": "Abandon this escalated task? The run gives up on it (no PR).",
-            "showWhenField": "escalation_open",
-            "action": {
-              "path": "/app/api/actions/answer-escalation",
-              "body": { "userTaskKey": "{{row.escalation_user_task_key}}", "resolution": "abandon" }
-            }
-          },
-          {
-            "label": "Acknowledge blocked",
-            "confirm": "Acknowledge this blocked run? It settles to terminal blocked (the agent could not open a PR).",
-            "showWhenField": "blocked_user_task_key",
-            "action": {
-              "path": "/app/api/actions/acknowledge-blocked",
-              "body": { "userTaskKey": "{{row.blocked_user_task_key}}" }
-            }
-          }
-        ],
         "detail": {
           "fields": [
-            { "field": "escalation_question", "label": "Escalation question" },
             { "field": "outcome", "label": "Outcome" }
-          ],
-          "form": {
-            "showWhenField": "escalation_open",
-            "title": "Answer escalation",
-            "promptField": "escalation_question",
-            "inputKey": "answer",
-            "inputLabel": "Guidance for the implementation agent",
-            "submitLabel": "Answer & re-dispatch",
-            "action": {
-              "path": "/app/api/actions/answer-escalation",
-              "successLabel": "Answered — the agent will resume",
-              "body": {
-                "userTaskKey": "{{row.escalation_user_task_key}}",
-                "resolution": "answer",
-                "answer": "{{form.answer}}"
-              }
-            }
-          }
+          ]
         }
       }
     }

package/pages/tasks.page.json

@@ -119,22 +119,6 @@
           }
         ],
         "rowKey": "user_task_key",
-        "rowActions": [
-          {
-            "label": "Abandon",
-            "confirm": "Abandon this escalated task? The run gives up on it (no PR).",
-            "showWhenField": "user_task_key",
-            "action": {
-              "path": "/app/api/actions/complete-user-task",
-              "body": {
-                "userTaskKey": "{{row.user_task_key}}",
-                "variables": {
-                  "resolution": "abandon"
-                }
-              }
-            }
-          }
-        ],
         "detail": {
           "linkField": "subject_url",
           "fields": [
@@ -147,18 +131,32 @@
             "showWhenField": "user_task_key",
             "title": "Answer escalation",
             "promptField": "question",
-            "inputKey": "answer",
-            "inputLabel": "Guidance for the implementation agent",
-            "submitLabel": "Answer & re-dispatch",
+            "submitLabel": "Submit decision",
+            "fields": [
+              {
+                "inputKey": "resolution",
+                "type": "select",
+                "inputLabel": "Resolution",
+                "options": [
+                  { "value": "answer", "label": "Answer — re-dispatch the task with this guidance" },
+                  { "value": "abandon", "label": "Abandon — give up on this task" }
+                ]
+              },
+              {
+                "inputKey": "answer",
+                "type": "textarea",
+                "inputLabel": "Answer / guidance for the implementation agent",
+                "conditional": {
+                  "hide": "=resolution != \"answer\""
+                }
+              }
+            ],
             "action": {
               "path": "/app/api/actions/complete-user-task",
-              "successLabel": "Answered — the agent will resume",
+              "successLabel": "Decision submitted — the process will continue",
               "body": {
                 "userTaskKey": "{{row.user_task_key}}",
-                "variables": {
-                  "resolution": "answer",
-                  "answer": "{{form.answer}}"
-                }
+                "variables": "{{form}}"
               }
             }
           }
@@ -220,22 +218,6 @@
           }
         ],
         "rowKey": "user_task_key",
-        "rowActions": [
-          {
-            "label": "Proceed",
-            "confirm": "Proceed with the current plan as-is? It is dispatched unchanged.",
-            "showWhenField": "user_task_key",
-            "action": {
-              "path": "/app/api/actions/complete-user-task",
-              "body": {
-                "userTaskKey": "{{row.user_task_key}}",
-                "variables": {
-                  "directive": "proceed"
-                }
-              }
-            }
-          }
-        ],
         "detail": {
           "linkField": "subject_url",
           "fields": [
@@ -246,20 +228,34 @@
           ],
           "form": {
             "showWhenField": "user_task_key",
-            "title": "Revise — send the plan back to the planner",
+            "title": "Review the plan",
             "promptField": "question",
-            "inputKey": "notes",
-            "inputLabel": "Revision guidance for the planner",
-            "submitLabel": "Revise & re-plan",
+            "submitLabel": "Submit decision",
+            "fields": [
+              {
+                "inputKey": "directive",
+                "type": "select",
+                "inputLabel": "Directive",
+                "options": [
+                  { "value": "proceed", "label": "Proceed — dispatch the current plan as-is" },
+                  { "value": "revise", "label": "Revise — send the plan back to the planner" }
+                ]
+              },
+              {
+                "inputKey": "notes",
+                "type": "textarea",
+                "inputLabel": "Revision guidance for the planner",
+                "conditional": {
+                  "hide": "=directive != \"revise\""
+                }
+              }
+            ],
             "action": {
               "path": "/app/api/actions/complete-user-task",
-              "successLabel": "Sent back — the planner will revise",
+              "successLabel": "Decision recorded",
               "body": {
                 "userTaskKey": "{{row.user_task_key}}",
-                "variables": {
-                  "directive": "revise",
-                  "notes": "{{form.notes}}"
-                }
+                "variables": "{{form}}"
               }
             }
           }
@@ -321,58 +317,45 @@
           }
         ],
         "rowKey": "user_task_key",
-        "rowActions": [
-          {
-            "label": "Proceed",
-            "confirm": "Accept the red trial merge and continue?",
-            "showWhenField": "user_task_key",
-            "action": {
-              "path": "/app/api/actions/complete-user-task",
-              "body": {
-                "userTaskKey": "{{row.user_task_key}}",
-                "variables": {
-                  "action": "proceed"
-                }
-              }
+        "detail": {
+          "linkField": "subject_url",
+          "fields": [
+            {
+              "field": "question",
+              "label": "Trial merge"
             }
-          },
-          {
-            "label": "Rebase",
-            "confirm": "Re-run the trial merge?",
+          ],
+          "form": {
             "showWhenField": "user_task_key",
-            "action": {
-              "path": "/app/api/actions/complete-user-task",
-              "body": {
-                "userTaskKey": "{{row.user_task_key}}",
-                "variables": {
-                  "action": "rebase"
-                }
+            "title": "Trial-merge decision",
+            "promptField": "question",
+            "submitLabel": "Submit decision",
+            "fields": [
+              {
+                "inputKey": "action",
+                "type": "select",
+                "inputLabel": "Action",
+                "options": [
+                  { "value": "proceed", "label": "Proceed — accept the red trial merge and continue" },
+                  { "value": "rebase", "label": "Rebase — re-run the trial merge" },
+                  { "value": "abandon", "label": "Abandon — stop and finalize the plan" }
+                ]
+              },
+              {
+                "inputKey": "notes",
+                "type": "textarea",
+                "inputLabel": "Notes"
               }
-            }
-          },
-          {
-            "label": "Abandon",
-            "confirm": "Stop and finalize the plan?",
-            "showWhenField": "user_task_key",
+            ],
             "action": {
               "path": "/app/api/actions/complete-user-task",
+              "successLabel": "Decision recorded",
               "body": {
                 "userTaskKey": "{{row.user_task_key}}",
-                "variables": {
-                  "action": "abandon"
-                }
+                "variables": "{{form}}"
               }
             }
           }
-        ],
-        "detail": {
-          "linkField": "subject_url",
-          "fields": [
-            {
-              "field": "question",
-              "label": "Trial merge"
-            }
-          ]
         },
         "refreshMs": 5000
       }
@@ -532,11 +515,13 @@
             "inputLabel": "Disposition note (what you did / why)",
             "submitLabel": "Acknowledge & close",
             "action": {
-              "path": "/app/api/actions/acknowledge-blocked",
+              "path": "/app/api/actions/complete-user-task",
               "successLabel": "Acknowledged — the run will close",
               "body": {
                 "userTaskKey": "{{row.user_task_key}}",
-                "note": "{{form.note}}"
+                "variables": {
+                  "note": "{{form.note}}"
+                }
               }
             }
           }

package/resources/forms/feature-escalation.form

@@ -21,6 +21,9 @@
       "label": "Answer / guidance for the implementation agent",
       "conditional": {
         "hide": "=resolution != \"answer\""
+      },
+      "validate": {
+        "required": true
       }
     }
   ]