@nanobpm/nano-workforce 0.60.0 → 0.61.1

package/nano.app.json

@@ -6,13 +6,11 @@
   "codename": "nano-workforce",
   "models": {
     "processes": [
-      "resources/processes/*.bpmn"
+      "resources/processes/*.bpmn",
+      "prompts/*.md"
     ],
     "forms": [
       "resources/forms/*.form"
-    ],
-    "templates": [
-      "prompts/*.md"
     ]
   },
   "data": {
@@ -134,6 +132,10 @@
       "taskType": "pr.record-feature",
       "handler": "workers/record-feature/worker.ts"
     },
+    {
+      "taskType": "pr.record-blocked-ack",
+      "handler": "workers/record-blocked-ack/worker.ts"
+    },
     {
       "taskType": "pr.converge-feature",
       "handler": "workers/converge-feature/worker.ts"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nanobpm/nano-workforce",
-  "version": "0.60.0",
+  "version": "0.61.1",
   "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",

package/pages/feature.page.json

@@ -59,11 +59,11 @@
           "source": "app",
           "table": "feature_runs",
           "orderBy": { "field": "updated_at", "dir": "desc" },
-          "filter": [{ "field": "status", "in": ["running"] }]
+          "filter": [{ "field": "status", "in": ["running", "awaiting_operator"] }]
         },
         "tabs": [
-          { "label": "Active", "filter": [{ "field": "status", "in": ["running"] }] },
-          { "label": "History", "filter": [{ "field": "status", "in": ["opened", "converging", "blocked", "skipped", "failed", "abandoned"] }] },
+          { "label": "Active", "filter": [{ "field": "status", "in": ["running", "awaiting_operator"] }] },
+          { "label": "History", "filter": [{ "field": "status", "in": ["opened", "converging", "merged", "converged", "blocked", "skipped", "failed", "abandoned"] }] },
           { "label": "All", "filter": [] }
         ],
         "columns": [
@@ -71,6 +71,7 @@
           { "field": "status", "header": "Status", "link": { "kind": "processExplorer", "keyField": "process_key" } },
           { "field": "base_branch", "header": "Base branch" },
           { "field": "pr_key", "header": "PR", "link": { "kind": "page", "page": "home", "keyField": "pr_key" } },
+          { "field": "delivery_label", "header": "Delivery" },
           { "field": "converge", "header": "Converge" },
           { "field": "auto_merge", "header": "Auto-merge" },
           { "field": "outcome", "header": "Outcome" },

package/resources/agent-guide.md

@@ -309,9 +309,17 @@ both live in the source repo, not in the job payload.
   sequence flows) for the element it is parked on (§5).
 - **Prompts (agent base instructions):** `prompts/*.md` — `review-round.md`,
   `plan.md`, `feature.md`, `fix-ci.md`, `rebase.md`, `trial-merge.md`, etc. An
-  agent's base prompt is **not** a job variable: it is delivered as a model
-  **template header** (`{{review-round}}`, `{{plan}}`, …) substituted from these files
-  at deploy time. If an agent misbehaves systematically, the prompt is the first thing
+  agent's base prompt is **not** a job variable: it is delivered as a
+  **linked resource** (likewise `plan.md`, …):
+
+  ```xml
+  <zeebe:linkedResource resourceId="review-round.md" bindingType="latest" linkName="prompt"/>
+  ```
+
+  that the engine
+  resolves to the latest deployed prompt at job activation. Because the binding is
+  `latest`, redeploying one of these files updates the prompt mid-epic without a process
+  redeploy. If an agent misbehaves systematically, the prompt is the first thing
   to inspect/fix.
 - **Job contract:** `senior:pr-review` receives `{ prUrl, repo, prNumber, round,
   answer? }` and must return a flat result `{ status, summary, question? }` with

package/resources/forms/feature-blocked.form

@@ -0,0 +1,17 @@
+{
+  "id": "feature-blocked",
+  "schemaVersion": 18,
+  "type": "default",
+  "components": [
+    {
+      "type": "text",
+      "text": "This single-issue feature run is **blocked** — the implementation agent could not open a PR (it gave up, or the escalation was abandoned / timed out). It landed in your inbox so a blocked run is never a silent dead-end. Review the outcome, then acknowledge to close the run.",
+      "label": "Blocked feature run"
+    },
+    {
+      "type": "textarea",
+      "key": "note",
+      "label": "Disposition note (what you did / why — recorded on the run)"
+    }
+  ]
+}

package/resources/processes/convergence-loop.bpmn

@@ -67,9 +67,9 @@
     <bpmn:serviceTask id="review-round" name="Review round (agent)">
       <bpmn:extensionElements>
         <zeebe:taskDefinition type="senior:pr-review" />
-        <zeebe:taskHeaders>
-          <zeebe:header key="io.nanobpm.agentTask.task.prompt" value="{{review-round}}" />
-        </zeebe:taskHeaders>
+        <zeebe:linkedResources>
+          <zeebe:linkedResource resourceId="review-round.md" bindingType="latest" linkName="prompt" />
+        </zeebe:linkedResources>
         <zeebe:properties>
           <zeebe:property name="io.nanobpm.dataEnvelope.in" value="PrReviewRoundIn" />
           <zeebe:property name="io.nanobpm.dataEnvelope.out" value="PrReviewRoundOut" />

package/resources/processes/feature.bpmn

@@ -18,9 +18,9 @@
     <bpmn:serviceTask id="implement-task" name="Implement (agent)">
       <bpmn:extensionElements>
         <zeebe:taskDefinition type="senior:feature" />
-        <zeebe:taskHeaders>
-          <zeebe:header key="io.nanobpm.agentTask.task.prompt" value="{{feature}}" />
-        </zeebe:taskHeaders>
+        <zeebe:linkedResources>
+          <zeebe:linkedResource resourceId="feature.md" bindingType="latest" linkName="prompt" />
+        </zeebe:linkedResources>
         <zeebe:ioMapping>
           <zeebe:input source="=&#34;&#10;&#10;---&#10;&#10;&#34; + task.prompt + (if (baseBranchBrief = null) then &#34;&#34; else baseBranchBrief)" target="appendPrompt" />
           <zeebe:output source="=status" target="status" />
@@ -63,10 +63,35 @@
       <bpmn:incoming>w_done</bpmn:incoming>
       <bpmn:incoming>w_abandon</bpmn:incoming>
       <bpmn:incoming>w_sla</bpmn:incoming>
-      <bpmn:outgoing>f_toConvergeGw</bpmn:outgoing>
+      <bpmn:outgoing>f_toBlockedGw</bpmn:outgoing>
+    </bpmn:serviceTask>
+    <bpmn:exclusiveGateway id="gw-blocked" name="blocked?" default="f_notBlocked">
+      <bpmn:incoming>f_toBlockedGw</bpmn:incoming>
+      <bpmn:outgoing>f_blocked</bpmn:outgoing>
+      <bpmn:outgoing>f_notBlocked</bpmn:outgoing>
+    </bpmn:exclusiveGateway>
+    <bpmn:userTask id="feature-blocked" name="Blocked run (human)">
+      <bpmn:extensionElements>
+        <zeebe:formDefinition formId="feature-blocked" />
+        <zeebe:userTask />
+        <zeebe:assignmentDefinition candidateGroups="operators" />
+      </bpmn:extensionElements>
+      <bpmn:incoming>f_blocked</bpmn:incoming>
+      <bpmn:outgoing>f_toBlockedAck</bpmn:outgoing>
+    </bpmn:userTask>
+    <bpmn:serviceTask id="record-blocked-ack" name="Record acknowledgement">
+      <bpmn:extensionElements>
+        <zeebe:taskDefinition type="pr.record-blocked-ack" />
+        <zeebe:ioMapping>
+          <zeebe:input source="=featureKey" target="featureKey" />
+          <zeebe:input source="=if (is defined(note)) then note else null" target="note" />
+        </zeebe:ioMapping>
+      </bpmn:extensionElements>
+      <bpmn:incoming>f_toBlockedAck</bpmn:incoming>
+      <bpmn:outgoing>f_blockedEnd</bpmn:outgoing>
     </bpmn:serviceTask>
     <bpmn:exclusiveGateway id="gw-converge" name="converge?" default="f_noConverge">
-      <bpmn:incoming>f_toConvergeGw</bpmn:incoming>
+      <bpmn:incoming>f_notBlocked</bpmn:incoming>
       <bpmn:outgoing>f_converge</bpmn:outgoing>
       <bpmn:outgoing>f_noConverge</bpmn:outgoing>
     </bpmn:exclusiveGateway>
@@ -80,6 +105,7 @@
     <bpmn:endEvent id="End" name="Done">
       <bpmn:incoming>f_noConverge</bpmn:incoming>
       <bpmn:incoming>f_toEndConverged</bpmn:incoming>
+      <bpmn:incoming>f_blockedEnd</bpmn:incoming>
     </bpmn:endEvent>
     <bpmn:sequenceFlow id="f_toEnsureBase" sourceRef="Start" targetRef="ensure-base-branch" />
     <bpmn:sequenceFlow id="f_toImplement" sourceRef="ensure-base-branch" targetRef="implement-task" />
@@ -94,7 +120,13 @@
     </bpmn:sequenceFlow>
     <bpmn:sequenceFlow id="w_abandon" name="abandon" sourceRef="w_gw_answer" targetRef="record-feature" />
     <bpmn:sequenceFlow id="w_sla" name="SLA auto-abandon" sourceRef="be_feature_sla" targetRef="record-feature" />
-    <bpmn:sequenceFlow id="f_toConvergeGw" sourceRef="record-feature" targetRef="gw-converge" />
+    <bpmn:sequenceFlow id="f_toBlockedGw" sourceRef="record-feature" targetRef="gw-blocked" />
+    <bpmn:sequenceFlow id="f_blocked" name="blocked" sourceRef="gw-blocked" targetRef="feature-blocked">
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=featureStatus = "blocked"</bpmn:conditionExpression>
+    </bpmn:sequenceFlow>
+    <bpmn:sequenceFlow id="f_notBlocked" name="not blocked" sourceRef="gw-blocked" targetRef="gw-converge" />
+    <bpmn:sequenceFlow id="f_toBlockedAck" sourceRef="feature-blocked" targetRef="record-blocked-ack" />
+    <bpmn:sequenceFlow id="f_blockedEnd" sourceRef="record-blocked-ack" targetRef="End" />
     <bpmn:sequenceFlow id="f_converge" name="converge" sourceRef="gw-converge" targetRef="converge">
       <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=converge = true and featureStatus = "opened" and prKey != null</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
@@ -133,19 +165,31 @@
       <bpmndi:BPMNShape id="BPMNShape_record-feature" bpmnElement="record-feature">
         <dc:Bounds x="1116" y="80" width="100" height="80" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_gw-converge" bpmnElement="gw-converge" isMarkerVisible="true">
+      <bpmndi:BPMNShape id="BPMNShape_gw-blocked" bpmnElement="gw-blocked" isMarkerVisible="true">
         <dc:Bounds x="1316" y="95" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1308" y="76" width="67" height="14" />
+          <dc:Bounds x="1311" y="76" width="60" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_feature-blocked" bpmnElement="feature-blocked">
+        <dc:Bounds x="1466" y="400" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_record-blocked-ack" bpmnElement="record-blocked-ack">
+        <dc:Bounds x="1666" y="400" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_gw-converge" bpmnElement="gw-converge" isMarkerVisible="true">
+        <dc:Bounds x="1491" y="95" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1483" y="76" width="67" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_converge" bpmnElement="converge">
-        <dc:Bounds x="1466" y="240" width="100" height="80" />
+        <dc:Bounds x="1666" y="240" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_End" bpmnElement="End">
-        <dc:Bounds x="1666" y="102" width="36" height="36" />
+        <dc:Bounds x="1866" y="102" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1667" y="83" width="34" height="14" />
+          <dc:Bounds x="1867" y="83" width="34" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_be_feature_sla" bpmnElement="be_feature_sla">
@@ -173,15 +217,22 @@
           <dc:Bounds x="875" y="98" width="32" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_f_toConvergeGw" bpmnElement="f_toConvergeGw">
+      <bpmndi:BPMNEdge id="BPMNEdge_f_toBlockedGw" bpmnElement="f_toBlockedGw">
         <di:waypoint x="1216" y="120" />
         <di:waypoint x="1316" y="120" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_f_noConverge" bpmnElement="f_noConverge">
+      <bpmndi:BPMNEdge id="BPMNEdge_f_notBlocked" bpmnElement="f_notBlocked">
         <di:waypoint x="1366" y="120" />
-        <di:waypoint x="1666" y="120" />
+        <di:waypoint x="1491" y="120" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1390" y="98" width="78" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_f_noConverge" bpmnElement="f_noConverge">
+        <di:waypoint x="1541" y="120" />
+        <di:waypoint x="1866" y="120" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1481" y="98" width="71" height="14" />
+          <dc:Bounds x="1668" y="98" width="71" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_w_abandon" bpmnElement="w_abandon">
@@ -200,22 +251,39 @@
           <dc:Bounds x="646" y="206" width="67" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_f_converge" bpmnElement="f_converge">
+      <bpmndi:BPMNEdge id="BPMNEdge_f_blocked" bpmnElement="f_blocked">
         <di:waypoint x="1341" y="145" />
-        <di:waypoint x="1341" y="280" />
-        <di:waypoint x="1466" y="280" />
+        <di:waypoint x="1341" y="440" />
+        <di:waypoint x="1466" y="440" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1346" y="206" width="60" height="14" />
+          <dc:Bounds x="1346" y="286" width="53" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_f_converge" bpmnElement="f_converge">
+        <di:waypoint x="1516" y="145" />
+        <di:waypoint x="1516" y="280" />
+        <di:waypoint x="1666" y="280" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1521" y="206" width="60" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_w_toAnswerGw" bpmnElement="w_toAnswerGw">
         <di:waypoint x="866" y="280" />
         <di:waypoint x="966" y="280" />
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_f_toBlockedAck" bpmnElement="f_toBlockedAck">
+        <di:waypoint x="1566" y="440" />
+        <di:waypoint x="1666" y="440" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_f_blockedEnd" bpmnElement="f_blockedEnd">
+        <di:waypoint x="1766" y="440" />
+        <di:waypoint x="1884" y="440" />
+        <di:waypoint x="1884" y="138" />
+      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_toEndConverged" bpmnElement="f_toEndConverged">
-        <di:waypoint x="1566" y="280" />
-        <di:waypoint x="1684" y="280" />
-        <di:waypoint x="1684" y="138" />
+        <di:waypoint x="1766" y="280" />
+        <di:waypoint x="1884" y="280" />
+        <di:waypoint x="1884" y="138" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_w_sla" bpmnElement="w_sla">
         <di:waypoint x="816" y="338" />

package/resources/processes/merge-loop.bpmn

@@ -216,9 +216,9 @@
     <bpmn:serviceTask id="fix-ci" name="Fix CI (agent)">
       <bpmn:extensionElements>
         <zeebe:taskDefinition type="senior:fix-ci" />
-        <zeebe:taskHeaders>
-          <zeebe:header key="io.nanobpm.agentTask.task.prompt" value="{{fix-ci}}" />
-        </zeebe:taskHeaders>
+        <zeebe:linkedResources>
+          <zeebe:linkedResource resourceId="fix-ci.md" bindingType="latest" linkName="prompt" />
+        </zeebe:linkedResources>
         <zeebe:properties>
           <zeebe:property name="io.nanobpm.dataEnvelope.in" value="FixCiIn" />
           <zeebe:property name="io.nanobpm.dataEnvelope.out" value="FixCiOut" />
@@ -246,9 +246,9 @@
     <bpmn:serviceTask id="rebase" name="Rebase (agent)">
       <bpmn:extensionElements>
         <zeebe:taskDefinition type="senior:rebase" />
-        <zeebe:taskHeaders>
-          <zeebe:header key="io.nanobpm.agentTask.task.prompt" value="{{rebase}}" />
-        </zeebe:taskHeaders>
+        <zeebe:linkedResources>
+          <zeebe:linkedResource resourceId="rebase.md" bindingType="latest" linkName="prompt" />
+        </zeebe:linkedResources>
         <zeebe:properties>
           <zeebe:property name="io.nanobpm.dataEnvelope.in" value="RebaseIn" />
           <zeebe:property name="io.nanobpm.dataEnvelope.out" value="RebaseOut" />

package/resources/processes/plan-fanout.bpmn

@@ -23,9 +23,9 @@
     <bpmn:serviceTask id="plan" name="Plan (agent)">
       <bpmn:extensionElements>
         <zeebe:taskDefinition type="senior:plan" />
-        <zeebe:taskHeaders>
-          <zeebe:header key="io.nanobpm.agentTask.task.prompt" value="{{plan}}" />
-        </zeebe:taskHeaders>
+        <zeebe:linkedResources>
+          <zeebe:linkedResource resourceId="plan.md" bindingType="latest" linkName="prompt" />
+        </zeebe:linkedResources>
         <zeebe:ioMapping>
           <zeebe:input source="=(if (planFindings = null or planFindings = &#34;&#34;) then &#34;&#34; else &#34;&#10;&#10;---&#10;&#10;A prior review REJECTED your last plan. Address every point, then re-emit the full plan:&#10;&#10;&#34; + planFindings)" target="appendPrompt" />
         </zeebe:ioMapping>
@@ -46,9 +46,9 @@
     <bpmn:serviceTask id="review-plan" name="Review plan (agent)">
       <bpmn:extensionElements>
         <zeebe:taskDefinition type="senior:plan-review" />
-        <zeebe:taskHeaders>
-          <zeebe:header key="io.nanobpm.agentTask.task.prompt" value="{{plan-review}}" />
-        </zeebe:taskHeaders>
+        <zeebe:linkedResources>
+          <zeebe:linkedResource resourceId="plan-review.md" bindingType="latest" linkName="prompt" />
+        </zeebe:linkedResources>
       </bpmn:extensionElements>
       <bpmn:incoming>f_toReviewPlan</bpmn:incoming>
       <bpmn:outgoing>f_toRecordPlanReview</bpmn:outgoing>
@@ -121,9 +121,9 @@
       <bpmn:serviceTask id="implement-task" name="Implement (agent)">
         <bpmn:extensionElements>
           <zeebe:taskDefinition type="senior:feature" />
-          <zeebe:taskHeaders>
-            <zeebe:header key="io.nanobpm.agentTask.task.prompt" value="{{feature}}" />
-          </zeebe:taskHeaders>
+          <zeebe:linkedResources>
+            <zeebe:linkedResource resourceId="feature.md" bindingType="latest" linkName="prompt" />
+          </zeebe:linkedResources>
           <zeebe:ioMapping>
             <zeebe:input source="=&#34;&#10;&#10;---&#10;&#10;&#34; + task.prompt + (if (blackboardBrief = null) then &#34;&#34; else blackboardBrief) + (if (baseBranchBrief = null) then &#34;&#34; else baseBranchBrief)" target="appendPrompt" />
             <zeebe:output source="=status" target="status" />
@@ -192,9 +192,9 @@
     <bpmn:serviceTask id="trial-merge" name="Trial merge (agent)">
       <bpmn:extensionElements>
         <zeebe:taskDefinition type="senior:trial-merge" />
-        <zeebe:taskHeaders>
-          <zeebe:header key="io.nanobpm.agentTask.task.prompt" value="{{trial-merge}}" />
-        </zeebe:taskHeaders>
+        <zeebe:linkedResources>
+          <zeebe:linkedResource resourceId="trial-merge.md" bindingType="latest" linkName="prompt" />
+        </zeebe:linkedResources>
         <zeebe:ioMapping>
           <zeebe:input source="=null" target="result" />
           <zeebe:input source="=null" target="conflicts" />

package/resources/processes/retro.bpmn

@@ -14,9 +14,9 @@
     <bpmn:serviceTask id="synthesize" name="Synthesize &#38; promote (agent)">
       <bpmn:extensionElements>
         <zeebe:taskDefinition type="senior:retro" />
-        <zeebe:taskHeaders>
-          <zeebe:header key="io.nanobpm.agentTask.task.prompt" value="{{retro}}" />
-        </zeebe:taskHeaders>
+        <zeebe:linkedResources>
+          <zeebe:linkedResource resourceId="retro.md" bindingType="latest" linkName="prompt" />
+        </zeebe:linkedResources>
         <zeebe:ioMapping>
           <zeebe:input source="=retroDigest" target="appendPrompt" />
         </zeebe:ioMapping>