@@ -168,10 +168,9 @@ function renderWorkClaim(payload) {
     const claim = JSON.stringify({ id: item.claim_id, work_id: item.work_id }).replace(/</g, "\\u003c");
     return `${work}\n${claim}`;
   });
-  const instructions =
-    assignments.length === 1
-      ? 'When the work is complete, call work_queue_claim_finish with outcome "completed" to record the finish intent. If you cannot complete the work, call it with outcome "cancelled".'
-      : 'Call work_queue_claim_finish with claim_id and outcome "completed" or "cancelled" for every claim. Tag each safe output with claim_id to apply it only when that claim completes. Untagged outputs require every claim to complete.';
+  const instructions = !Array.isArray(assignment)
+    ? 'When the work is complete, call work_queue_claim_finish with outcome "completed" to record the finish intent. If you cannot complete the work, call it with outcome "cancelled".'
+    : 'Call work_queue_claim_finish with claim_id and outcome "completed" or "cancelled" for every claim. Tag each safe output with claim_id to apply it only when that claim completes. Untagged outputs require every claim to complete.';
   return `<work-claim>\n${claims.join("\n")}\n${instructions} The claim is only complete after trusted reconciliation verifies it; recording intent alone does not authorize safe outputs.\n</work-claim>\n`;
 }
 
 
@@ -29,6 +29,7 @@ function validWorker(worker) {
   return worker && typeof worker === "object" && typeof worker.work_id === "string" && worker.work_id.length > 0 && typeof worker.claim_id === "string" && worker.claim_id.length > 0;
 }
 
+/** @param {Array<{claim_id: string, work_id: string}> | null} [workers] */
 function readFinishIntent(finishIntentPath = process.env.GH_AW_WORK_QUEUE_FINISH_INTENT || FINISH_INTENT_PATH, workers = null) {
   if (!fs.existsSync(finishIntentPath)) return null;
   const outcomes = new Set();
@@ -70,6 +71,7 @@ function renderSummary(status) {
   const labels = {
     unassigned: "No worker claim was assigned; safe outputs may proceed.",
     completed: "The effective worker claim was durably completed and verified; safe outputs may proceed.",
+    partial: "Some claims were completed and verified; only safe outputs tagged with those claims may proceed.",
     cancelled: "The worker claim was cancelled; ordinary safe outputs were skipped.",
     superseded: "The worker claim is no longer effective; ordinary safe outputs were skipped.",
     terminal: "The work is already terminal; ordinary safe outputs were skipped.",
 
@@ -136,7 +136,7 @@ function createWorkQueueStateTool(snapshot) {
 function createWorkQueueFinishTool(options = {}) {
   const outputPath = options.finishIntentPath || process.env.GH_AW_WORK_QUEUE_FINISH_INTENT || DEFAULT_FINISH_INTENT_PATH;
   const workers = options.worker == null ? [] : Array.isArray(options.worker) ? options.worker : [options.worker];
-  const multiple = workers.length > 1;
+  const multiple = Array.isArray(options.worker);
   return {
     name: "work_queue_claim_finish",
     description: multiple ? "Record a finish intent for a trusted inbound claim. Call once for each claim_id." : "Record the finish intent for the trusted inbound work queue claim.",
 
@@ -181,6 +181,8 @@ describe("work queue MCP snapshot", () => {
     tool.handler({ claim_id: "a", outcome: "completed" });
     tool.handler({ claim_id: "b", outcome: "cancelled" });
     expect(fs.readFileSync(finishPath, "utf8")).toBe('{"claim_id":"a","outcome":"completed"}\n{"claim_id":"b","outcome":"cancelled"}\n');
+    const arrayOfOne = createWorkQueueFinishTool({ finishIntentPath: finishPath, worker: [{ claim_id: "a", work_id: "one" }] });
+    expect(arrayOfOne.inputSchema.required).toEqual(["claim_id"]);
   });
 
   it("returns queue state and finish confirmation through the stdio MCP transport", async () => {
 
@@ -1750,3 +1750,13 @@ func TestBuildSafeOutputItemsManifestUploadStep(t *testing.T) {
 	assert.NotContains(t, content, "process-safe-outputs.stdout.log")
 	assert.NotContains(t, content, "process-safe-outputs.stderr.log")
 }
+
+func TestGateSafeOutputStepsForPartialWorkQueueClaims(t *testing.T) {
+	steps := gateSafeOutputSteps([]string{
+		"      - name: Process safe outputs\n        id: process_safe_outputs\n        run: echo process\n",
+		"      - name: Custom action\n        id: action_notify\n        if: success()\n        run: echo notify\n",
+	})
+	result := strings.Join(steps, "")
+	assert.Contains(t, result, "if: "+combineGitHubIfExpressions(workQueueClaimAuthorizedExpression, "")+"\n        id: process_safe_outputs")
+	assert.Contains(t, result, "id: action_notify\n        if: "+combineGitHubIfExpressions("steps.work_queue_claim_reconciliation.outputs.all_authorized == 'true'", "success()"))
+}