stitchkit 0.100.0 → 0.100.2

package/dist/entrypoints/application.js

@@ -58,9 +58,6 @@ import {
   defineManagedResource,
   managedResourceDependencyId
 } from "../index-2k4yrqkc.js";
-import {
-  withDeadline
-} from "../index-b9aefrqd.js";
 import"../index-3z73fh2c.js";
 import {
   createBoundedSinkManager
@@ -69,6 +66,9 @@ import {
   backoffDelay,
   createBackoff
 } from "../index-ngfhvfpd.js";
+import {
+  withDeadline
+} from "../index-b9aefrqd.js";
 import {
   deltaWins,
   diff,
@@ -90,7 +90,9 @@ import {
 import {
   argumentsDigest
 } from "../index-0b1ess5e.js";
-import"../index-2vtcmrj9.js";
+import {
+  AppError
+} from "../index-2vtcmrj9.js";
 import {
   serializeCanonicalJson
 } from "../index-k5hsfc3j.js";
@@ -528,6 +530,9 @@ function createCoalescedTask(config) {
     get running() {
       return running;
     },
+    get pending() {
+      return dirty;
+    },
     trigger() {
       if (closed)
         return;
@@ -651,7 +656,7 @@ class ChangeSubscription {
     this.connection = undefined;
     this.attempt?.abort();
     this.report(error);
-    this.release(handle).then(() => this.schedule(), (cause) => this.report(cause));
+    this.release(handle).catch((cause) => this.report(cause)).then(() => this.schedule());
   }
   open() {
     if (this.opening)
@@ -722,7 +727,6 @@ class ChangeSubscription {
           await this.release(handle);
         } catch (cause) {
           this.report(cause);
-          return;
         }
       }
       if (!lifetime.signal.aborted) {
@@ -1110,13 +1114,97 @@ function sqliteKeyspaceBackend(declaration, config) {
   };
 }
 // src/application/notification-delivery.ts
+import { z as z7 } from "zod";
+
+// src/application/notification-outbox-state.ts
 import { z as z6 } from "zod";
-var NotificationDeliveryStateSchema = z6.object({
-  version: z6.string().min(1).max(128),
-  actions: z6.array(z6.string().min(1).max(128)).min(1).max(128),
-  receipts: z6.array(z6.object({ action: z6.string(), receipt: z6.json() }).strict()).max(128),
-  projectedAt: z6.string().datetime({ offset: true }).optional()
+var sizeOf = (value) => measureSize(value).responseBytes;
+var DEFAULT_OUTBOX_BACKOFF = {
+  minDelayMs: 1000,
+  maxDelayMs: 60000,
+  jitter: 0
+};
+function resolveOutboxLimits(config) {
+  const pollIntervalMs = z6.number().int().min(10).parse(config.pollIntervalMs ?? 1000);
+  const leaseMs = z6.number().int().min(100).parse(config.leaseMs ?? 30000);
+  const maxAttempts = z6.number().int().min(1).max(1e4).parse(config.maxAttempts ?? 100);
+  const maxQueue = z6.number().int().min(1).max(1e5).parse(config.maxQueue ?? 1000);
+  const maxStateBytes = z6.number().int().min(1024).parse(config.maxStateBytes ?? 1024 * 1024);
+  const retainReceipts = z6.number().int().min(0).max(1e5).parse(config.retainReceipts ?? 1000);
+  return { pollIntervalMs, leaseMs, maxAttempts, maxQueue, maxStateBytes, retainReceipts };
+}
+
+class OutboxStateLimitError extends Error {
+  constructor(maxStateBytes) {
+    super(`[stitchkit] notification outbox state limit (${maxStateBytes} bytes) exceeded`);
+    this.name = "OutboxStateLimitError";
+  }
+}
+function boundedOutboxState(parsed, maxQueue, retainReceipts, maxStateBytes) {
+  if (parsed.queue.length > maxQueue) {
+    throw new Error(`[stitchkit] notification outbox queue limit (${maxQueue}) exceeded`);
+  }
+  let receipts = parsed.receipts.slice(0, retainReceipts);
+  let next = { ...parsed, receipts };
+  while (sizeOf(next) > maxStateBytes && receipts.length > 0) {
+    receipts = receipts.slice(0, -1);
+    next = { ...parsed, receipts };
+  }
+  if (sizeOf(next) > maxStateBytes)
+    throw new OutboxStateLimitError(maxStateBytes);
+  return next;
+}
+function dropReason(classification, attempts, maxAttempts) {
+  if (classification.recipientUnreachable === true)
+    return "recipient-unreachable";
+  if (!classification.retryable)
+    return "terminal";
+  return attempts >= maxAttempts ? "attempt-limit" : null;
+}
+var RetryDelaySchema = z6.number().nonnegative().max(24 * 60 * 60 * 1000);
+var NO_LEASE = { leaseOwner: null, leaseId: null, leaseUntil: null };
+function claimDue(queue, now, ownerId, leaseMs) {
+  const candidate = [...queue].sort((left, right) => Date.parse(left.createdAt) - Date.parse(right.createdAt)).find((item) => Date.parse(item.nextAttemptAt) <= now.getTime() && (item.leaseUntil === null || Date.parse(item.leaseUntil) <= now.getTime()));
+  if (!candidate)
+    return null;
+  return {
+    ...candidate,
+    attempts: candidate.attempts + 1,
+    leaseOwner: ownerId,
+    leaseId: crypto.randomUUID(),
+    leaseUntil: new Date(now.getTime() + leaseMs).toISOString()
+  };
+}
+
+// src/application/notification-delivery.ts
+var NotificationDeliveryStateSchema = z7.object({
+  version: z7.string().min(1).max(128),
+  actions: z7.array(z7.string().min(1).max(128)).min(1).max(128),
+  receipts: z7.array(z7.object({
+    action: z7.string(),
+    receipt: z7.json(),
+    unrecorded: z7.enum(["not-json", "too-large"]).optional()
+  }).strict()).max(128),
+  projectedAt: z7.string().datetime({ offset: true }).optional()
 }).strict().refine((value) => new Set(value.actions).size === value.actions.length && new Set(value.receipts.map((receipt) => receipt.action)).size === value.receipts.length && value.receipts.every((receipt) => value.actions.includes(receipt.action)), "Invalid action plan or receipts");
+
+class NotificationPlanVersionError extends Error {
+  version;
+  constructor(version) {
+    super(`Notification action plan version "${version}" has no executor`);
+    this.name = "NotificationPlanVersionError";
+    this.version = version;
+  }
+}
+function projectionFor(config, version) {
+  if (version === config.version)
+    return config.project;
+  return config.retiredVersions && Object.hasOwn(config.retiredVersions, version) ? config.retiredVersions[version] : undefined;
+}
+function recordable(result) {
+  const parsed = z7.json().safeParse(result ?? null);
+  return parsed.success ? { receipt: parsed.data } : { receipt: null, unrecorded: "not-json" };
+}
 function notificationDeliveryPlan(config, payload) {
   return NotificationDeliveryStateSchema.parse({
     version: config.version,
@@ -1127,8 +1215,11 @@ function notificationDeliveryPlan(config, payload) {
 async function deliverNotification(input) {
   const { item, config } = input;
   const plan = item.delivery;
-  if (!plan || plan.version !== config.version)
-    throw new Error("Notification action plan version does not match the executor");
+  if (!plan)
+    throw new Error("Notification has no action plan");
+  const project = projectionFor(config, plan.version);
+  if (!project)
+    throw new NotificationPlanVersionError(plan.version);
   const owns = (current2) => current2.key === item.key && current2.leaseId === item.leaseId;
   const checkpoint = async (change) => input.store.update((state) => {
     if (!state)
@@ -1153,7 +1244,7 @@ async function deliverNotification(input) {
   for (const action of plan.actions) {
     if (!input.active())
       return false;
-    if (plan.receipts.some((receipt2) => receipt2.action === action))
+    if (plan.receipts.some((receipt) => receipt.action === action))
       continue;
     if (!await checkpoint((value) => value))
       return false;
@@ -1162,11 +1253,24 @@ async function deliverNotification(input) {
       action,
       idempotencyKey: JSON.stringify([item.key, plan.version, action])
     });
-    const receipt = z6.json().parse(result ?? null);
-    if (!await checkpoint((value) => ({
-      ...value,
-      receipts: [...value.receipts, { action, receipt }]
-    })))
+    const entry = recordable(result);
+    const confirm = (receipt) => checkpoint((value) => ({ ...value, receipts: [...value.receipts, receipt] }));
+    let confirmed;
+    let dropped;
+    try {
+      confirmed = await confirm({ action, ...entry });
+    } catch (error) {
+      if (entry.unrecorded || !(error instanceof OutboxStateLimitError))
+        throw error;
+      dropped = error;
+      confirmed = await confirm({ action, receipt: null, unrecorded: "too-large" });
+    }
+    if (dropped)
+      await input.report(dropped);
+    if (entry.unrecorded) {
+      await input.report(new Error(`Notification action "${action}" returned a receipt that is not JSON`));
+    }
+    if (!confirmed)
       return false;
   }
   if (!input.active())
@@ -1176,7 +1280,7 @@ async function deliverNotification(input) {
   if (!live?.delivery)
     return false;
   if (live.delivery.projectedAt === undefined) {
-    await config.project(notification, live.delivery.receipts);
+    await project(notification, live.delivery.receipts);
     if (!await checkpoint((value) => ({ ...value, projectedAt: input.clock().toISOString() })))
       return false;
   }
@@ -1184,62 +1288,6 @@ async function deliverNotification(input) {
 }
 // src/application/notification-outbox.ts
 import { z as z8 } from "zod";
-
-// src/application/notification-outbox-state.ts
-import { z as z7 } from "zod";
-var sizeOf = (value) => measureSize(value).responseBytes;
-var DEFAULT_OUTBOX_BACKOFF = {
-  minDelayMs: 1000,
-  maxDelayMs: 60000,
-  jitter: 0
-};
-function resolveOutboxLimits(config) {
-  const pollIntervalMs = z7.number().int().min(10).parse(config.pollIntervalMs ?? 1000);
-  const leaseMs = z7.number().int().min(100).parse(config.leaseMs ?? 30000);
-  const maxAttempts = z7.number().int().min(1).max(1e4).parse(config.maxAttempts ?? 100);
-  const maxQueue = z7.number().int().min(1).max(1e5).parse(config.maxQueue ?? 1000);
-  const maxStateBytes = z7.number().int().min(1024).parse(config.maxStateBytes ?? 1024 * 1024);
-  const retainReceipts = z7.number().int().min(0).max(1e5).parse(config.retainReceipts ?? 1000);
-  return { pollIntervalMs, leaseMs, maxAttempts, maxQueue, maxStateBytes, retainReceipts };
-}
-function boundedOutboxState(parsed, maxQueue, retainReceipts, maxStateBytes) {
-  if (parsed.queue.length > maxQueue) {
-    throw new Error(`[stitchkit] notification outbox queue limit (${maxQueue}) exceeded`);
-  }
-  let receipts = parsed.receipts.slice(0, retainReceipts);
-  let next = { ...parsed, receipts };
-  while (sizeOf(next) > maxStateBytes && receipts.length > 0) {
-    receipts = receipts.slice(0, -1);
-    next = { ...parsed, receipts };
-  }
-  if (sizeOf(next) > maxStateBytes) {
-    throw new Error(`[stitchkit] notification outbox state limit (${maxStateBytes} bytes) exceeded`);
-  }
-  return next;
-}
-function dropReason(classification, attempts, maxAttempts) {
-  if (classification.recipientUnreachable === true)
-    return "recipient-unreachable";
-  if (!classification.retryable)
-    return "terminal";
-  return attempts >= maxAttempts ? "attempt-limit" : null;
-}
-var RetryDelaySchema = z7.number().nonnegative().max(24 * 60 * 60 * 1000);
-var NO_LEASE = { leaseOwner: null, leaseId: null, leaseUntil: null };
-function claimDue(queue, now, ownerId, leaseMs) {
-  const candidate = [...queue].sort((left, right) => Date.parse(left.createdAt) - Date.parse(right.createdAt)).find((item) => Date.parse(item.nextAttemptAt) <= now.getTime() && (item.leaseUntil === null || Date.parse(item.leaseUntil) <= now.getTime()));
-  if (!candidate)
-    return null;
-  return {
-    ...candidate,
-    attempts: candidate.attempts + 1,
-    leaseOwner: ownerId,
-    leaseId: crypto.randomUUID(),
-    leaseUntil: new Date(now.getTime() + leaseMs).toISOString()
-  };
-}
-
-// src/application/notification-outbox.ts
 function notificationOutboxStateSchema(payload) {
   return z8.object({
     schemaVersion: z8.literal(1),
@@ -1271,16 +1319,19 @@ async function reportOutboxError(config, error) {
     await config.onError?.(error);
   } catch {}
 }
-function notificationRejection(config, parse, bounded, clock, backoffMs) {
+function notificationRejection(config, parse, bounded, clock, backoffMs, pollIntervalMs) {
   const maxAttempts = config.maxAttempts ?? 100;
   return async (claimed, error) => {
-    const classification = await config.classify(error);
+    const unknownPlan = error instanceof NotificationPlanVersionError;
+    if (unknownPlan)
+      await reportOutboxError(config, error);
+    const classification = unknownPlan ? { retryable: true } : await config.classify(error);
     return config.store.update((current) => {
       const state = parse(current);
       const live = state.queue.find((item) => item.key === claimed.key && item.leaseId === claimed.leaseId);
       if (!live)
         return { state, result: null };
-      const attempts = live.attempts;
+      const attempts = unknownPlan ? Math.max(0, live.attempts - 1) : live.attempts;
       const reason = dropReason(classification, attempts, maxAttempts);
       if (reason) {
         return {
@@ -1291,9 +1342,11 @@ function notificationRejection(config, parse, bounded, clock, backoffMs) {
           result: { item: { ...live, attempts }, error, reason }
         };
       }
-      const wait = RetryDelaySchema.parse(backoffMs(attempts));
+      const backoff = RetryDelaySchema.parse(backoffMs(Math.max(1, attempts)));
+      const wait = unknownPlan ? Math.max(backoff, pollIntervalMs) : backoff;
       const retry = {
         ...live,
+        attempts,
         nextAttemptAt: new Date(clock().getTime() + wait).toISOString(),
         ...NO_LEASE
       };
@@ -1387,7 +1440,7 @@ function createNotificationOutbox(config) {
       };
     });
   };
-  const reject = notificationRejection(config, parse, bounded, clock, backoffMs);
+  const reject = notificationRejection(config, parse, bounded, clock, backoffMs, pollIntervalMs);
   const flushPass = async () => {
     let delivered = 0;
     while (!interrupted) {
@@ -1404,7 +1457,8 @@ function createNotificationOutbox(config) {
             clock,
             bounded,
             leaseMs,
-            active: () => !interrupted
+            active: () => !interrupted,
+            report: (error) => reportOutboxError(config, error)
           });
           if (!finished)
             return delivered;
@@ -1559,7 +1613,8 @@ function previousExitOf(previous, run, overlap) {
     return ended;
   if (previous.pid === run.pid)
     return "hot-reload";
-  if (isVersionChange(previous.version, run.version) || overlap === "handoff")
+  const declared = isVersionChange(previous.version, run.version) ? overlap.versionChange : overlap.sameVersion;
+  if (declared === "handoff")
     return "handoff";
   return previous.readyAt === null ? "startup-failed" : "abnormal";
 }
@@ -1569,7 +1624,8 @@ function closeAbandoned(candidate, previous, previousExit, run, overlap) {
   const closed = { ...candidate, stoppedAt: run.startedAt };
   if (candidate.pid === run.pid)
     return { ...closed, termination: "hot-reload" };
-  if (overlap === "handoff")
+  const overlapsThisBuild = overlap.versionChange === "handoff" || !isVersionChange(candidate.version, run.version);
+  if (overlap.sameVersion === "handoff" && overlapsThisBuild)
     return candidate;
   if (candidate.runId === previous?.runId && previousExit === "handoff")
     return candidate;
@@ -1580,7 +1636,10 @@ function closeAbandoned(candidate, previous, previousExit, run, overlap) {
 }
 function transitionProcessStart(source, input) {
   const retain = RetainSchema.parse(input.retain ?? 20);
-  const overlap = input.sameVersionOverlap ?? "abnormal";
+  const overlap = {
+    sameVersion: input.sameVersionOverlap ?? "abnormal",
+    versionChange: input.versionChangeOverlap ?? "handoff"
+  };
   const state = normalizeLifecycleState(source, 1000);
   const run = LifecycleRunSchema.parse({
     runId: input.runId,
@@ -1761,7 +1820,8 @@ function createProcessLifecycleLedger(config) {
           version,
           now: clock().toISOString(),
           retain,
-          sameVersionOverlap: config.sameVersionOverlap
+          sameVersionOverlap: config.sameVersionOverlap,
+          versionChangeOverlap: config.versionChangeOverlap
         });
         return { state: transition.state, result: transition.fact };
       });
@@ -2088,6 +2148,78 @@ function managedServerResource(config) {
     }
   });
 }
+// src/application/watch-hub-source.ts
+function remember(source, deltaMemoryBytes, revision, value, fingerprint) {
+  if (deltaMemoryBytes === 0)
+    return;
+  const bytes = (JSON.stringify(value) ?? "null").length;
+  if (bytes > deltaMemoryBytes)
+    return;
+  source.history.set(revision, { value, fingerprint, bytes });
+  source.historyBytes += bytes;
+  for (const [oldest, entry] of source.history) {
+    if (source.historyBytes <= deltaMemoryBytes)
+      break;
+    source.history.delete(oldest);
+    source.historyBytes -= entry.bytes;
+  }
+}
+function fullFrame(source) {
+  const value = source.value;
+  return {
+    kind: "full",
+    key: source.key,
+    revision: source.revision,
+    fingerprint: source.fingerprint ?? valueFingerprint(value),
+    value
+  };
+}
+function frameFor(source, subscriber) {
+  const value = source.value;
+  const full = fullFrame(source);
+  const fingerprint = full.fingerprint;
+  const base = source.baselines.get(subscriber);
+  if (base === undefined)
+    return full;
+  if (base === source.revision) {
+    return { kind: "unchanged", key: source.key, revision: source.revision, fingerprint };
+  }
+  const held = source.history.get(base);
+  if (!held)
+    return full;
+  const delta = diff(held.value, value);
+  if (delta === undefined || !deltaWins(delta, value))
+    return full;
+  return {
+    kind: "delta",
+    key: source.key,
+    revision: source.revision,
+    fingerprint,
+    base,
+    delta
+  };
+}
+function adoptBaseline(source, subscriber, have) {
+  if (source.fingerprint === have.fingerprint) {
+    source.baselines.set(subscriber, source.revision);
+    return;
+  }
+  const named = source.history.get(have.revision);
+  if (named?.fingerprint === have.fingerprint) {
+    source.baselines.set(subscriber, have.revision);
+    return;
+  }
+  for (const [revision, entry] of source.history) {
+    if (entry.fingerprint !== have.fingerprint)
+      continue;
+    source.baselines.set(subscriber, revision);
+    return;
+  }
+}
+function valueFingerprint(value) {
+  return argumentsDigest({ value });
+}
+
 // src/application/watch-hub-core.ts
 var DEFAULT_BACKOFF = { minDelayMs: 250, maxDelayMs: 30000, jitter: 0.2 };
 
@@ -2137,82 +2269,24 @@ class WatchHubCore {
   announceState(source, state) {
     source.state = state;
     for (const subscriber of source.subscribers) {
-      this.tell(source.key, () => subscriber.state(state));
-    }
-  }
-  remember(source, revision, value, fingerprint) {
-    if (this.deltaMemoryBytes === 0)
-      return;
-    const bytes = (JSON.stringify(value) ?? "null").length;
-    if (bytes > this.deltaMemoryBytes)
-      return;
-    source.history.set(revision, { value, fingerprint, bytes });
-    source.historyBytes += bytes;
-    for (const [oldest, entry] of source.history) {
-      if (source.historyBytes <= this.deltaMemoryBytes)
-        break;
-      source.history.delete(oldest);
-      source.historyBytes -= entry.bytes;
-    }
-  }
-  frameFor(source, subscriber) {
-    const value = source.value;
-    const fingerprint = source.fingerprint ?? valueFingerprint(value);
-    const full = {
-      kind: "full",
-      key: source.key,
-      revision: source.revision,
-      fingerprint,
-      value
-    };
-    const base = source.baselines.get(subscriber);
-    if (base === undefined)
-      return full;
-    if (base === source.revision) {
-      return { kind: "unchanged", key: source.key, revision: source.revision, fingerprint };
-    }
-    const held = source.history.get(base);
-    if (!held)
-      return full;
-    const delta = diff(held.value, value);
-    if (delta === undefined || !deltaWins(delta, value))
-      return full;
-    return {
-      kind: "delta",
-      key: source.key,
-      revision: source.revision,
-      fingerprint,
-      base,
-      delta
-    };
-  }
-  adoptBaseline(source, subscriber, have) {
-    if (source.fingerprint === have.fingerprint) {
-      source.baselines.set(subscriber, source.revision);
-      return;
-    }
-    const named = source.history.get(have.revision);
-    if (named?.fingerprint === have.fingerprint) {
-      source.baselines.set(subscriber, have.revision);
-      return;
-    }
-    for (const [revision, entry] of source.history) {
-      if (entry.fingerprint !== have.fingerprint)
-        continue;
-      source.baselines.set(subscriber, revision);
-      return;
+      for (const key of source.routes.get(subscriber)?.values() ?? []) {
+        this.tell(key, () => subscriber.state({ ...state, key }));
+      }
     }
   }
   deliver(source, subscriber) {
-    const frame = this.frameFor(source, subscriber);
-    const delivered = this.tell(source.key, () => subscriber.value(frame));
+    const frame = frameFor(source, subscriber);
+    let delivered = true;
+    for (const key of source.routes.get(subscriber)?.values() ?? []) {
+      delivered = this.tell(key, () => subscriber.value({ ...frame, key })) && delivered;
+    }
     if (delivered)
       source.baselines.set(subscriber, source.revision);
     return delivered;
   }
   publish(source, value, fingerprint) {
     if (source.fingerprint !== undefined) {
-      this.remember(source, source.revision, source.value, source.fingerprint);
+      remember(source, this.deltaMemoryBytes, source.revision, source.value, source.fingerprint);
     }
     source.revision += 1;
     source.value = value;
@@ -2234,21 +2308,20 @@ class WatchHubCore {
       this.announceState(source, { key: source.key, phase: "live" });
   }
   readFailed(source, error) {
-    const code = readErrorCode(error);
     this.announceState(source, {
       key: source.key,
       phase: "unavailable",
       reason: "source-error",
-      ...code !== undefined && { code },
-      message: error instanceof Error ? error.message : String(error)
+      ...AppError.is(error) ? { code: error.code, message: error.message } : { message: "The watched read failed" }
     });
     this.config.logger?.warn?.("[stitchkit] watched read failed", {
       key: watchKeyString(source.key),
       error
     });
   }
-  acquire(operation, key, args, scope) {
-    const id = JSON.stringify([scope ?? null, watchKeyString(key)]);
+  acquire(operation, routed, args, scope) {
+    const id = sourceId(scope, routed);
+    const key = sharedKey(routed);
     const existing = this.sources.get(id);
     if (existing) {
       clearTimeout(existing.release);
@@ -2262,6 +2335,7 @@ class WatchHubCore {
       operation,
       args,
       subscribers: new Set,
+      routes: new Map,
       unsubscribes: [],
       revision: 0,
       history: new Map,
@@ -2305,12 +2379,32 @@ class WatchHubCore {
     source.release = setTimeout(drop, this.holdMs);
     source.release.unref?.();
   }
+  unroute(source, subscriber, route) {
+    const routes = source.routes.get(subscriber);
+    routes?.delete(route);
+    if (routes && routes.size > 0)
+      return;
+    source.routes.delete(subscriber);
+    source.subscribers.delete(subscriber);
+    source.baselines.delete(subscriber);
+    this.release(source);
+  }
   attach(subscriber, scope) {
-    if (this.held.size >= (this.config.maxSubscribers ?? 1024))
-      throw new Error("Watch subscriber capacity exceeded");
+    if (this.held.size >= (this.config.maxSubscribers ?? 1024)) {
+      const refused = {
+        open: () => ({ accepted: false, reason: "Watch subscriber capacity exceeded" }),
+        close: () => {
+          return;
+        },
+        detach: () => {
+          return;
+        }
+      };
+      return refused;
+    }
     if (scope && (!scope.key || scope.key.length > 512))
       throw new Error("Invalid watch admission scope");
-    const keys = new Set;
+    const keys = new Map;
     this.held.set(subscriber, keys);
     let detached = false;
     const attached = {
@@ -2326,8 +2420,9 @@ class WatchHubCore {
             reason: `${key.service}.${key.action} is not watchable`
           };
         }
-        const id = JSON.stringify([scope?.key ?? null, watchKeyString(key)]);
-        if (keys.has(id))
+        const route = watchKeyString(key);
+        const id = sourceId(scope?.key, key);
+        if (keys.has(route))
           return { accepted: true };
         if (keys.size >= this.maxWatches) {
           return {
@@ -2338,52 +2433,50 @@ class WatchHubCore {
         if (!this.sources.has(id) && this.sources.size >= (this.config.maxSources ?? 1024))
           return { accepted: false, reason: "Watch source capacity exceeded" };
         const source = this.acquire(operation, key, args, scope?.key);
+        const alreadyRouted = source.routes.has(subscriber);
         source.subscribers.add(subscriber);
-        keys.add(id);
+        const routes = source.routes.get(subscriber) ?? new Map;
+        routes.set(route, key);
+        source.routes.set(subscriber, routes);
+        keys.set(route, id);
         if (have)
-          this.adoptBaseline(source, subscriber, have);
+          adoptBaseline(source, subscriber, have);
         try {
           if (source.signature !== undefined) {
-            const frame = this.frameFor(source, subscriber);
-            subscriber.value(frame);
+            const frame = alreadyRouted && !have ? fullFrame(source) : frameFor(source, subscriber);
+            subscriber.value({ ...frame, key });
             source.baselines.set(subscriber, source.revision);
           }
-          subscriber.state(source.state);
+          subscriber.state({ ...source.state, key });
         } catch (error) {
-          source.subscribers.delete(subscriber);
-          source.baselines.delete(subscriber);
-          keys.delete(id);
-          this.release(source);
+          keys.delete(route);
+          this.unroute(source, subscriber, route);
           return {
             accepted: false,
             reason: error instanceof Error ? error.message : String(error)
           };
         }
-        if (!source.task.running && (source.signature === undefined || source.state.phase !== "live"))
+        if (!source.task.running && (source.signature === undefined || source.state.phase !== "live" || source.task.pending))
           source.task.trigger();
         return { accepted: true };
       },
       close: (key) => {
-        const id = JSON.stringify([scope?.key ?? null, watchKeyString(key)]);
-        if (!keys.delete(id))
+        const route = watchKeyString(key);
+        const id = keys.get(route);
+        if (id === undefined)
           return;
+        keys.delete(route);
         const source = this.sources.get(id);
-        if (!source)
-          return;
-        source.subscribers.delete(subscriber);
-        source.baselines.delete(subscriber);
-        this.release(source);
+        if (source)
+          this.unroute(source, subscriber, route);
       },
       detach: () => {
         detached = true;
         scope?.signal.removeEventListener("abort", onAbort);
-        for (const id of keys) {
+        for (const [route, id] of keys) {
           const source = this.sources.get(id);
-          if (!source)
-            continue;
-          source.subscribers.delete(subscriber);
-          source.baselines.delete(subscriber);
-          this.release(source);
+          if (source)
+            this.unroute(source, subscriber, route);
         }
         keys.clear();
         this.held.delete(subscriber);
@@ -2416,14 +2509,12 @@ class WatchHubCore {
     }
   }
 }
-function valueFingerprint(value) {
-  return argumentsDigest({ value });
+function sharedKey(key) {
+  const { instance: _routing, ...shared } = key;
+  return shared;
 }
-function readErrorCode(error) {
-  if (typeof error !== "object" || error === null)
-    return;
-  const code = Reflect.get(error, "code");
-  return typeof code === "string" ? code : undefined;
+function sourceId(scope, key) {
+  return JSON.stringify([scope ?? null, watchKeyString(sharedKey(key))]);
 }
 
 // src/application/watch-hub.ts
@@ -2487,6 +2578,7 @@ export {
   RevisionSignalAdvanceResultSchema,
   PreviousExitSchema,
   PolicyDecisionSchema,
+  NotificationPlanVersionError,
   NotificationDeliveryStateSchema,
   ManagedScheduleStatusSchema,
   ManagedScheduleOverlapSchema,