@desplega.ai/agent-swarm 1.108.2 → 1.110.0

package/dist/{lead-czd1xgxr.js → lead-twm4zp8y.js}

@@ -1,6 +1,6 @@
 import {
   runAgent
-} from "./cli-bz6qha8p.js";
+} from "./cli-0pzg1f8z.js";
 import"./cli-w6zp4qcx.js";
 import"./cli-m3enfr8q.js";
 import"./cli-amncg1dq.js";
@@ -15,7 +15,7 @@ import"./cli-d6n0thxw.js";
 import"./cli-hx1dcevq.js";
 import {
   getEnabledCapabilities
-} from "./cli-xekgq1r8.js";
+} from "./cli-kna0r84e.js";
 import"./cli-1z7048dy.js";
 import"./cli-dcfyyh3t.js";
 import"./cli-gz9sbyk3.js";
@@ -25,32 +25,32 @@ import"./cli-tng3131n.js";
 import"./cli-zm7njwzd.js";
 import"./cli-tghre7g6.js";
 import"./cli-tkmm5nf9.js";
-import"./cli-cr2wze6h.js";
-import"./cli-nt60dmfm.js";
-import"./cli-b4hwyzev.js";
-import"./cli-27pxayz8.js";
+import"./cli-6ttdv68b.js";
+import"./cli-sjm0e1pa.js";
+import"./cli-3baz70yp.js";
+import"./cli-k6ssh5dk.js";
 import"./cli-fad8m16k.js";
-import"./cli-6z0y1339.js";
-import"./cli-er5kffrx.js";
+import"./cli-zw3cmjh6.js";
+import"./cli-3t97r3y1.js";
 import"./cli-f14fvzag.js";
-import"./cli-b7ytq2z8.js";
-import"./cli-hc7hxy2m.js";
-import"./cli-5m4da9px.js";
+import"./cli-2h86bsfe.js";
+import"./cli-dy01kwxk.js";
+import"./cli-5kav4x1a.js";
 import"./cli-q25ejbyn.js";
-import"./cli-9zz27c9g.js";
-import"./cli-gg6zxrx1.js";
+import"./cli-g44ffxk5.js";
+import"./cli-4trfcacj.js";
 import"./cli-rkndnn90.js";
 import"./cli-b0p7rfnd.js";
-import"./cli-fxk0as0h.js";
+import"./cli-gb7dqnna.js";
 import"./cli-6xd0bvf8.js";
 import"./cli-wspgs9bt.js";
-import"./cli-3p0e74xv.js";
+import"./cli-8ps5wsk9.js";
 import"./cli-dh55d5fg.js";
-import"./cli-6jf8xfnt.js";
+import"./cli-d8vmtyyr.js";
 import"./cli-z2zcxes1.js";
 import"./cli-q21d49ac.js";
 import"./cli-anrj584m.js";
-import"./cli-tc19ec02.js";
+import"./cli-kg9v8h1w.js";
 import"./cli-4j2mrzag.js";
 import"./cli-e15jhafb.js";
 import"./cli-9aryf9tv.js";

package/dist/{maintenance-xjqt3ne7.js → maintenance-1htsnyz6.js}

@@ -1,13 +1,13 @@
 import {
   reembedAllScripts
-} from "./cli-hc7hxy2m.js";
-import"./cli-5m4da9px.js";
+} from "./cli-dy01kwxk.js";
+import"./cli-5kav4x1a.js";
 import"./cli-q25ejbyn.js";
-import"./cli-6jf8xfnt.js";
+import"./cli-d8vmtyyr.js";
 import"./cli-z2zcxes1.js";
 import"./cli-q21d49ac.js";
 import"./cli-anrj584m.js";
-import"./cli-tc19ec02.js";
+import"./cli-kg9v8h1w.js";
 import"./cli-4j2mrzag.js";
 import"./cli-p9swy5t3.js";
 

package/dist/{onboard-whf6w0mr.js → onboard-1y1pdzt5.js}

@@ -3,7 +3,7 @@ import {
   createDefaultMcpJson,
   createDefaultSettingsLocal,
   createHooksConfig
-} from "./cli-8gtrpqcw.js";
+} from "./cli-vfyhrk9k.js";
 import {
   require_jsx_dev_runtime
 } from "./cli-wx82tw1k.js";
@@ -13,7 +13,7 @@ import {
 import {
   init_package,
   package_default
-} from "./cli-tc19ec02.js";
+} from "./cli-kg9v8h1w.js";
 import {
   Box_default,
   Select,

package/dist/{otel-impl-9n4p19tt.js → otel-impl-pw9tnc80.js}

@@ -6,7 +6,7 @@ import {
 import {
   init_package,
   package_default
-} from "./cli-tc19ec02.js";
+} from "./cli-kg9v8h1w.js";
 import {
   init_secret_scrubber,
   scrubSecrets

package/dist/{pricing-refresh-wg80me14.js → pricing-refresh-tqvvrk7a.js}

@@ -2,13 +2,13 @@ import {
   PRICING_REFRESH_INTERVAL_MS,
   refreshPricingFromModelsDev,
   startPricingRefreshLoop
-} from "./cli-nt60dmfm.js";
-import"./cli-b4hwyzev.js";
-import"./cli-6jf8xfnt.js";
+} from "./cli-sjm0e1pa.js";
+import"./cli-3baz70yp.js";
+import"./cli-d8vmtyyr.js";
 import"./cli-z2zcxes1.js";
 import"./cli-q21d49ac.js";
 import"./cli-anrj584m.js";
-import"./cli-tc19ec02.js";
+import"./cli-kg9v8h1w.js";
 import"./cli-4j2mrzag.js";
 import"./cli-p9swy5t3.js";
 export {

package/dist/{seed-pricing-garwba27.js → seed-pricing-f23sehzq.js}

@@ -1,12 +1,12 @@
 import {
   buildModelsDevSeedRows,
   seedPricingFromModelsDev
-} from "./cli-b4hwyzev.js";
-import"./cli-6jf8xfnt.js";
+} from "./cli-3baz70yp.js";
+import"./cli-d8vmtyyr.js";
 import"./cli-z2zcxes1.js";
 import"./cli-q21d49ac.js";
 import"./cli-anrj584m.js";
-import"./cli-tc19ec02.js";
+import"./cli-kg9v8h1w.js";
 import"./cli-4j2mrzag.js";
 import"./cli-p9swy5t3.js";
 export {

package/dist/{setup-dktff2q2.js → setup-jtw9rz9t.js}

@@ -4,14 +4,14 @@ import {
   createDefaultMcpJson,
   createDefaultSettingsLocal,
   createHooksConfig
-} from "./cli-8gtrpqcw.js";
+} from "./cli-vfyhrk9k.js";
 import {
   require_jsx_dev_runtime
 } from "./cli-wx82tw1k.js";
 import {
   getApiKey
 } from "./cli-f14fvzag.js";
-import"./cli-tc19ec02.js";
+import"./cli-kg9v8h1w.js";
 import {
   Box_default,
   Spinner,

package/dist/{worker-t26gwn0n.js → worker-jxrmzwb9.js}

@@ -1,6 +1,6 @@
 import {
   runAgent
-} from "./cli-bz6qha8p.js";
+} from "./cli-0pzg1f8z.js";
 import"./cli-w6zp4qcx.js";
 import"./cli-m3enfr8q.js";
 import"./cli-amncg1dq.js";
@@ -15,7 +15,7 @@ import"./cli-d6n0thxw.js";
 import"./cli-hx1dcevq.js";
 import {
   getEnabledCapabilities
-} from "./cli-xekgq1r8.js";
+} from "./cli-kna0r84e.js";
 import"./cli-1z7048dy.js";
 import"./cli-dcfyyh3t.js";
 import"./cli-gz9sbyk3.js";
@@ -25,32 +25,32 @@ import"./cli-tng3131n.js";
 import"./cli-zm7njwzd.js";
 import"./cli-tghre7g6.js";
 import"./cli-tkmm5nf9.js";
-import"./cli-cr2wze6h.js";
-import"./cli-nt60dmfm.js";
-import"./cli-b4hwyzev.js";
-import"./cli-27pxayz8.js";
+import"./cli-6ttdv68b.js";
+import"./cli-sjm0e1pa.js";
+import"./cli-3baz70yp.js";
+import"./cli-k6ssh5dk.js";
 import"./cli-fad8m16k.js";
-import"./cli-6z0y1339.js";
-import"./cli-er5kffrx.js";
+import"./cli-zw3cmjh6.js";
+import"./cli-3t97r3y1.js";
 import"./cli-f14fvzag.js";
-import"./cli-b7ytq2z8.js";
-import"./cli-hc7hxy2m.js";
-import"./cli-5m4da9px.js";
+import"./cli-2h86bsfe.js";
+import"./cli-dy01kwxk.js";
+import"./cli-5kav4x1a.js";
 import"./cli-q25ejbyn.js";
-import"./cli-9zz27c9g.js";
-import"./cli-gg6zxrx1.js";
+import"./cli-g44ffxk5.js";
+import"./cli-4trfcacj.js";
 import"./cli-rkndnn90.js";
 import"./cli-b0p7rfnd.js";
-import"./cli-fxk0as0h.js";
+import"./cli-gb7dqnna.js";
 import"./cli-6xd0bvf8.js";
 import"./cli-wspgs9bt.js";
-import"./cli-3p0e74xv.js";
+import"./cli-8ps5wsk9.js";
 import"./cli-dh55d5fg.js";
-import"./cli-6jf8xfnt.js";
+import"./cli-d8vmtyyr.js";
 import"./cli-z2zcxes1.js";
 import"./cli-q21d49ac.js";
 import"./cli-anrj584m.js";
-import"./cli-tc19ec02.js";
+import"./cli-kg9v8h1w.js";
 import"./cli-4j2mrzag.js";
 import"./cli-e15jhafb.js";
 import"./cli-9aryf9tv.js";

package/openapi.json

@@ -2,7 +2,7 @@
   "openapi": "3.1.0",
   "info": {
     "title": "Agent Swarm API",
-    "version": "1.108.2",
+    "version": "1.110.0",
     "description": "Multi-agent orchestration API for Claude Code, Codex, and Gemini CLI. Enables task distribution, agent communication, and service discovery.\n\nMCP tools are documented separately in [MCP.md](./MCP.md)."
   },
   "servers": [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@desplega.ai/agent-swarm",
-  "version": "1.108.2",
+  "version": "1.110.0",
   "description": "Multi-agent orchestration for Claude Code, Codex, Gemini CLI, and other AI coding assistants",
   "license": "MIT",
   "author": "desplega.sh <contact@desplega.sh>",
@@ -146,7 +146,7 @@
     "@linear/sdk": "^77.0.0",
     "@modelcontextprotocol/sdk": "^1.25.1",
     "@openai/codex-sdk": "^0.142.5",
-    "@opencode-ai/sdk": "^1.17.12",
+    "@opencode-ai/sdk": "^1.17.13",
     "@openfort/openfort-node": "^0.9.1",
     "@opentelemetry/api": "^1.9.1",
     "@opentelemetry/exporter-metrics-otlp-http": "^0.218.0",

package/src/be/db.ts

@@ -6923,18 +6923,18 @@ export function getStalledInProgressTasks(thresholdMinutes: number = 30): AgentT
 }
 
 /**
- * Genuine same-agent crash-recovery PINS (tagged `crash-recovery-pin`, DES-523
- * Phase 1) that are still `pending` `graceMin` minutes after creation — the
- * heartbeat reaper escalates these to a Lead reroute-decision.
+ * Genuine same-agent protected resume PINS (tagged `crash-recovery-pin` or
+ * `graceful-shutdown-pin`) that are still `pending` `graceMin` minutes after
+ * creation — the heartbeat reaper escalates these to a Lead reroute-decision.
  *
  * Three scoping clauses, each load-bearing:
- *  - `tags LIKE '%"crash-recovery-pin"%'` — restricts to resumes actually pinned
- *    to their original agent on the crash path. Without it, a *pooled* resume
- *    that `autoAssignPoolTasks` flips to `pending` earlier in the SAME sweep
- *    (keeping its old `createdAt`) would be reaped and cancelled before the
- *    assigned worker polls; it also keeps `context_limits` / `manual_supersede`
- *    pins from being escalated under a `crash_recovery` label. (Literal must
- *    match `CRASH_RECOVERY_PIN_TAG` in src/tasks/worker-follow-up.ts.)
+ *  - pin tags — restricts to resumes actually pinned to their original agent on
+ *    protected paths. Without this, a *pooled* resume that `autoAssignPoolTasks`
+ *    flips to `pending` earlier in the SAME sweep (keeping its old `createdAt`)
+ *    would be reaped and cancelled before the assigned worker polls; it also
+ *    keeps `context_limits` / `manual_supersede` pins from being escalated under
+ *    the protected-pin label. (Literals must match the pin tag constants in
+ *    src/tasks/worker-follow-up.ts.)
  *  - `status = 'pending'` — the "currently unreclaimed" discriminator: when the
  *    agent reclaims via the normal poll path, `startTask` flips the row to
  *    `in_progress` and it drops out of this set. (A reclaimed resume whose
@@ -6954,7 +6954,7 @@ export function getStalePinnedResumes(graceMin: number): AgentTask[] {
     .prepare<AgentTaskRow, [string]>(
       `SELECT * FROM agent_tasks
        WHERE taskType = 'resume' AND status = 'pending'
-         AND tags LIKE '%"crash-recovery-pin"%'
+         AND (tags LIKE '%"crash-recovery-pin"%' OR tags LIKE '%"graceful-shutdown-pin"%')
          AND createdAt < ?
        ORDER BY createdAt ASC`,
     )

package/src/tasks/worker-follow-up.ts

@@ -36,6 +36,16 @@ export const WORKER_LIVENESS_WINDOW_SECONDS = Number(
  */
 export const HEARTBEAT_PIN_CRASH_RESUME = process.env.HEARTBEAT_PIN_CRASH_RESUME !== "0";
 
+/**
+ * Rollback switch for pinning `graceful_shutdown` resumes to their original
+ * agent. ON by default: graceful shutdowns happen during deploy/SIGTERM, where
+ * the agent ID is stable and the worker normally polls again minutes later.
+ * Set `HEARTBEAT_PIN_GRACEFUL_RESUME=0` to restore the old unassigned-pool path.
+ */
+export function isGracefulResumePinEnabled(): boolean {
+  return process.env.HEARTBEAT_PIN_GRACEFUL_RESUME !== "0";
+}
+
 export const RESUME_GENERATION_TAG_PREFIX = "resume-generation:";
 
 /**
@@ -52,6 +62,13 @@ export const RESUME_GENERATION_TAG_PREFIX = "resume-generation:";
  */
 export const CRASH_RECOVERY_PIN_TAG = "crash-recovery-pin";
 
+/**
+ * Tag set ONLY on a genuine same-agent `graceful_shutdown` pin. The stale-pin
+ * reaper treats it like `CRASH_RECOVERY_PIN_TAG` while preserving which resume
+ * path produced the pin. Keep the literal in sync with `getStalePinnedResumes`.
+ */
+export const GRACEFUL_SHUTDOWN_PIN_TAG = "graceful-shutdown-pin";
+
 export function getResumeGeneration(task: Pick<AgentTask, "tags">): number {
   const tag = task.tags.find((value) => value.startsWith(RESUME_GENERATION_TAG_PREFIX));
   if (!tag) return 0;
@@ -189,20 +206,23 @@ export type CreateResumeFollowUpResult =
  * (`getActiveTaskCount < agent.maxTasks`). For `crash_recovery` the pin holds
  * regardless of `lastActivityAt` freshness — the agent ID is stable across a
  * restart and the crashed row survives intact, so a stale `lastActivityAt` at
- * the ~5-min crash-detection mark means "restarting", not "gone". Pinning keeps
- * the resume off the role-blind unassigned pool so no wrong-specialization
- * worker can grab it (DES-523). For `context_limits` / `manual_supersede` the
- * worker is alive, so `lastActivityAt` freshness is still required. The resume
- * falls back to the unassigned pool only when the agent is genuinely gone
- * (graceful close → `offline`) or its row is absent.
+ * the ~5-min crash-detection mark means "restarting", not "gone". `graceful_shutdown`
+ * follows the same pin path when `HEARTBEAT_PIN_GRACEFUL_RESUME` is enabled:
+ * deploy/SIGTERM restarts preserve the stable agent ID and the stale-pin reaper
+ * now handles the "agent never returns" case. Pinning keeps the resume off the
+ * role-blind unassigned pool so no wrong-specialization worker can grab it
+ * (DES-523). For `context_limits` / `manual_supersede` the worker is alive, so
+ * `lastActivityAt` freshness is still required. The resume falls back to the
+ * unassigned pool only when the agent is genuinely gone (graceful close →
+ * `offline`) or its row is absent.
  *
  * Gone-agent / never-reclaimed case: a pin whose agent never returns is NOT
  * re-pooled — the heartbeat's stale-resume reaper (`escalateUnreclaimedResumes`
  * in `src/heartbeat/heartbeat.ts`) escalates it to a Lead re-delegation decision
  * once `HEARTBEAT_RESUME_PIN_GRACE_MIN` lapses.
  *
- * The pin itself is gated by `HEARTBEAT_PIN_CRASH_RESUME` (default on); set it to
- * `0` to restore the pre-DES-523 pool-fallback behavior.
+ * The crash pin is gated by `HEARTBEAT_PIN_CRASH_RESUME`; the graceful shutdown
+ * pin is gated by `HEARTBEAT_PIN_GRACEFUL_RESUME`. Both default on.
  */
 export function createResumeFollowUp(args: {
   parentId: string;
@@ -218,13 +238,6 @@ export function createResumeFollowUp(args: {
 
   // Routing decision — same DB process so the read-then-create window is small.
   //
-  // For `graceful_shutdown`, force the unassigned-pool path: the parent worker
-  // is exiting and will call `closeAgent` (→ offline) moments after the
-  // supersede loop. At this check it still looks fresh + has capacity (it just
-  // terminal-transitioned), so the liveness branch would pin the resume to a
-  // dying worker — orphaning it in `pending` once the worker closes. Pool
-  // routing lets any live worker claim it.
-  //
   // For `crash_recovery`, deliberately PIN to the same (stable-ID) agent even
   // when `lastActivityAt` is stale. This REVERSES the prior "let staleness pool
   // it" behavior: crash detection only fires after STALL_THRESHOLD_NO_SESSION_MIN
@@ -237,6 +250,11 @@ export function createResumeFollowUp(args: {
   // guard. An unreclaimed pin is escalated to a Lead decision by the heartbeat
   // reaper, never silently re-pooled.
   //
+  // `graceful_shutdown` uses the same pin machinery: deploy/SIGTERM restarts
+  // preserve the stable agent ID, and the reaper now prevents an unreclaimed pin
+  // from being orphaned forever. `HEARTBEAT_PIN_GRACEFUL_RESUME=0` restores the
+  // old forced-pool path for this reason.
+  //
   // Brittleness note: this relies on a hard crash NEVER marking the agent
   // `offline` (only `POST /close` does). If future code offlines stale agents
   // before remediation, this re-opens the pool path for `crash_recovery` —
@@ -245,7 +263,7 @@ export function createResumeFollowUp(args: {
   //   - `context_limits` / `manual_supersede`: the worker is alive and
   //     responsive, so keep requiring `fresh`.
   let preferredAgentId: string | undefined;
-  if (parent.agentId && args.reason !== "graceful_shutdown") {
+  if (parent.agentId) {
     const candidate = getAgentById(parent.agentId);
     if (candidate && candidate.status !== "offline") {
       const lastActivity = candidate.lastActivityAt ? Date.parse(candidate.lastActivityAt) : 0;
@@ -255,15 +273,18 @@ export function createResumeFollowUp(args: {
       const activeCount = getActiveTaskCount(candidate.id);
       const hasCap = activeCount < (candidate.maxTasks ?? 1);
       const isCrashRecovery = args.reason === "crash_recovery" && HEARTBEAT_PIN_CRASH_RESUME;
-      // crash_recovery pins regardless of `fresh` (unless the rollback switch is
-      // off); other reasons still require it.
-      if (hasCap && (isCrashRecovery || fresh)) {
+      const isGracefulShutdown = args.reason === "graceful_shutdown";
+      const isGracefulPin = isGracefulShutdown && isGracefulResumePinEnabled();
+      const isFreshPinnedReason = !isGracefulShutdown && fresh;
+      // crash_recovery and graceful_shutdown pins ignore `fresh` when their
+      // kill-switches are on; context_limits/manual_supersede still require it.
+      if (hasCap && (isCrashRecovery || isGracefulPin || isFreshPinnedReason)) {
         preferredAgentId = candidate.id;
-      } else if (isCrashRecovery && !hasCap) {
-        // The only reason a crash_recovery pin is skipped here is capacity —
-        // surface the pool fallback instead of letting it happen silently.
+      } else if ((isCrashRecovery || isGracefulPin) && !hasCap) {
+        // Surface capacity-driven pool fallback instead of letting a protected
+        // pinned-reason skip happen silently.
         console.warn(
-          `[Heartbeat] crash_recovery resume for task ${parent.id.slice(0, 8)} NOT pinned: agent ${candidate.id.slice(0, 8)} at capacity (${activeCount}/${candidate.maxTasks ?? 1}); falling back to unassigned pool`,
+          `[Heartbeat] ${args.reason} resume for task ${parent.id.slice(0, 8)} NOT pinned: agent ${candidate.id.slice(0, 8)} at capacity (${activeCount}/${candidate.maxTasks ?? 1}); falling back to unassigned pool`,
         );
       }
     }
@@ -296,6 +317,9 @@ export function createResumeFollowUp(args: {
   if (args.reason === "crash_recovery" && preferredAgentId !== undefined) {
     tags.push(CRASH_RECOVERY_PIN_TAG);
   }
+  if (args.reason === "graceful_shutdown" && preferredAgentId !== undefined) {
+    tags.push(GRACEFUL_SHUTDOWN_PIN_TAG);
+  }
 
   // Identity-shaped fields (dir, VCS provider/repo/number/url/etc.,
   // outputSchema, slack channel/thread/user, agentmail, mention, contextKey,

package/src/tests/heartbeat-reroute-decision.test.ts

@@ -38,6 +38,7 @@ import {
   CRASH_RECOVERY_PIN_TAG,
   createRerouteDecisionTask,
   createResumeFollowUp,
+  GRACEFUL_SHUTDOWN_PIN_TAG,
   RESUME_GENERATION_TAG_PREFIX,
 } from "../tasks/worker-follow-up";
 import { registerSendTaskTool } from "../tools/send-task";
@@ -71,6 +72,32 @@ function seedPinnedCrash(agentName: string) {
   return { agent, original: getTaskById(original.id)!, r1 };
 }
 
+/**
+ * Build the graceful-shutdown equivalent: a superseded original + a pending
+ * resume R1 (generation 1) pinned to the original agent with its own provenance
+ * tag.
+ */
+function seedPinnedGracefulShutdown(agentName: string) {
+  const agent = createAgent({ name: agentName, isLead: false, status: "idle" });
+  const original = createTaskExtended("Gracefully stopped worker's original work", {
+    agentId: agent.id,
+  });
+  startTask(original.id);
+  const r1 = createTaskExtended("Resume of gracefully stopped work", {
+    agentId: agent.id,
+    parentTaskId: original.id,
+    taskType: "resume",
+    tags: [
+      "auto-resume",
+      "reason:graceful_shutdown",
+      `${RESUME_GENERATION_TAG_PREFIX}1`,
+      GRACEFUL_SHUTDOWN_PIN_TAG,
+    ],
+  });
+  supersedeTask(original.id, { reason: "shutdown", resumeTaskId: r1.id });
+  return { agent, original: getTaskById(original.id)!, r1 };
+}
+
 type RegisteredTool = {
   handler: (args: unknown, extra: unknown) => Promise<CallToolResult>;
 };
@@ -261,6 +288,28 @@ describe("Heartbeat — reroute-decision fallback (DES-523)", () => {
     );
   });
 
+  test("stale graceful_shutdown pin older than grace → escalated to a Lead decision", async () => {
+    const lead = createAgent({ name: "lead", isLead: true, status: "busy" });
+    const { original, r1 } = seedPinnedGracefulShutdown("coder-graceful");
+    expect(r1.tags).toContain(GRACEFUL_SHUTDOWN_PIN_TAG);
+    ageCreatedAtPastGrace(r1.id);
+
+    const findings = await codeLevelTriage();
+
+    expect(findings.escalatedReroutes.length).toBe(1);
+    expect(findings.escalatedReroutes[0]!.originalTaskId).toBe(original.id);
+    expect(getTaskById(r1.id)!.status).not.toBe("pending");
+    const decisions = getChildTasks(original.id).filter((c) => c.taskType === "reroute-decision");
+    expect(decisions.length).toBe(1);
+    expect(decisions[0]!.agentId).toBe(lead.id);
+
+    const second = await codeLevelTriage();
+    expect(second.escalatedReroutes.length).toBe(0);
+    expect(getChildTasks(original.id).filter((c) => c.taskType === "reroute-decision").length).toBe(
+      1,
+    );
+  });
+
   test("pinned resume reclaimed (in_progress) before the grace window is NOT escalated", async () => {
     createAgent({ name: "lead", isLead: true, status: "busy" });
     const { original, r1 } = seedPinnedCrash("coder-reclaim");

package/src/tests/task-supersede-resume.test.ts

@@ -21,7 +21,11 @@ import {
   getTrackerSyncByExternalId,
 } from "../be/db-queries/tracker";
 import { buildResumeContextPreamble } from "../commands/context-preamble";
-import { createResumeFollowUp } from "../tasks/worker-follow-up";
+import {
+  CRASH_RECOVERY_PIN_TAG,
+  createResumeFollowUp,
+  GRACEFUL_SHUTDOWN_PIN_TAG,
+} from "../tasks/worker-follow-up";
 
 const TEST_DB_PATH = "./test-task-supersede-resume.sqlite";
 
@@ -398,16 +402,88 @@ describe("Task Supersede + Resume", () => {
       expect(afterCount).toBe(beforeCount);
     });
 
-    test("routing: graceful_shutdown ALWAYS goes to pool, even on fresh+capable worker (PR #594 review)", () => {
-      // The worker is exiting moments after this check — keeping the resume on
-      // the same agent would orphan it once `closeAgent` runs. graceful_shutdown
-      // must force the unassigned-pool path regardless of liveness.
+    test("routing: graceful_shutdown pins to original online agent with capacity and tags the pin", () => {
       const worker = freshAgent("worker-fresh-shutdown", {
         maxTasks: 5,
-        lastActivityAt: new Date().toISOString(),
+        // Stale activity proves graceful_shutdown skips the fresh-agent gate,
+        // matching crash_recovery's stable-agent-ID routing.
+        lastActivityAt: new Date(Date.now() - 5 * 60 * 1000).toISOString(),
       });
       const parent = createTaskExtended("Routing graceful_shutdown", { agentId: worker.id });
       startTask(parent.id);
+      supersedeTask(parent.id, { reason: "graceful_shutdown", resumeTaskId: null });
+
+      const result = createResumeFollowUp({
+        parentId: parent.id,
+        reason: "graceful_shutdown",
+      });
+      if (result.kind !== "created") throw new Error("expected created");
+      expect(result.task.agentId).toBe(worker.id);
+      expect(result.task.status).toBe("pending");
+      expect(result.task.tags).toContain(GRACEFUL_SHUTDOWN_PIN_TAG);
+      expect(result.task.tags).not.toContain(CRASH_RECOVERY_PIN_TAG);
+    });
+
+    test("routing: HEARTBEAT_PIN_GRACEFUL_RESUME=0 restores graceful_shutdown pool behavior", () => {
+      const previous = process.env.HEARTBEAT_PIN_GRACEFUL_RESUME;
+      process.env.HEARTBEAT_PIN_GRACEFUL_RESUME = "0";
+      try {
+        const worker = freshAgent("worker-shutdown-killswitch", {
+          maxTasks: 5,
+          lastActivityAt: new Date().toISOString(),
+        });
+        const parent = createTaskExtended("Routing graceful_shutdown kill-switch", {
+          agentId: worker.id,
+        });
+        startTask(parent.id);
+        supersedeTask(parent.id, { reason: "graceful_shutdown", resumeTaskId: null });
+
+        const result = createResumeFollowUp({
+          parentId: parent.id,
+          reason: "graceful_shutdown",
+        });
+        if (result.kind !== "created") throw new Error("expected created");
+        expect(result.task.agentId).toBeNull();
+        expect(result.task.status).toBe("unassigned");
+        expect(result.task.tags).not.toContain(GRACEFUL_SHUTDOWN_PIN_TAG);
+      } finally {
+        if (previous === undefined) {
+          delete process.env.HEARTBEAT_PIN_GRACEFUL_RESUME;
+        } else {
+          process.env.HEARTBEAT_PIN_GRACEFUL_RESUME = previous;
+        }
+      }
+    });
+
+    test("routing: graceful_shutdown at capacity → unassigned pool fail-open", () => {
+      const worker = freshAgent("worker-full-shutdown", {
+        maxTasks: 1,
+        lastActivityAt: new Date().toISOString(),
+      });
+      // Parent is still in_progress and fills the worker's single slot.
+      const parent = createTaskExtended("Routing graceful_shutdown capped", { agentId: worker.id });
+      startTask(parent.id);
+
+      const result = createResumeFollowUp({
+        parentId: parent.id,
+        reason: "graceful_shutdown",
+      });
+      if (result.kind !== "created") throw new Error("expected created");
+      expect(result.task.agentId).toBeNull();
+      expect(result.task.status).toBe("unassigned");
+      expect(result.task.tags).not.toContain(GRACEFUL_SHUTDOWN_PIN_TAG);
+    });
+
+    test("routing: graceful_shutdown offline worker → unassigned pool fail-open", () => {
+      const worker = freshAgent("worker-offline-shutdown", {
+        maxTasks: 5,
+        lastActivityAt: new Date().toISOString(),
+      });
+      updateAgentStatus(worker.id, "offline");
+      const parent = createTaskExtended("Routing graceful_shutdown offline", {
+        agentId: worker.id,
+      });
+      startTask(parent.id);
 
       const result = createResumeFollowUp({
         parentId: parent.id,
@@ -416,6 +492,7 @@ describe("Task Supersede + Resume", () => {
       if (result.kind !== "created") throw new Error("expected created");
       expect(result.task.agentId).toBeNull();
       expect(result.task.status).toBe("unassigned");
+      expect(result.task.tags).not.toContain(GRACEFUL_SHUTDOWN_PIN_TAG);
     });
 
     test("routing: fresh worker + capacity (non-shutdown) → resume pre-assigned to same worker", () => {