From 90619cdeaf2c021566cbef8f508ae5d87b033e38 Mon Sep 17 00:00:00 2001
From: Dotta <bippadotta@protonmail.com>
Date: Thu, 8 Oct 2026 15:06:53 -0500
Subject: [PATCH] fix(db): retain uncertain queue writes across consumer
 startup

Keep ambiguous commit hints in the database scope so a later subscriber inherits the recovery hold.

Co-Authored-By: Paperclip <noreply@paperclip.ing>
---
 packages/db/src/work-signals.test.ts | 11 +++++++++++
 packages/db/src/work-signals.ts      |  8 ++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/packages/db/src/work-signals.test.ts b/packages/db/src/work-signals.test.ts
index c5f929ebc9..5b5c1bb6ce 100644
--- a/packages/db/src/work-signals.test.ts
+++ b/packages/db/src/work-signals.test.ts
@@ -53,6 +53,17 @@ describe("database work signals", () => {
     expect(first).toHaveBeenCalledTimes(1);
   });
 
+  it("retains uncertain writes made before a consumer subscribes", () => {
+    const db = installDatabaseWorkSignals(connection());
+    signalDatabaseWork(db, "queue", true);
+    const first = vi.fn();
+    subscribeDatabaseWork(db, "queue", first)();
+    expect(first).toHaveBeenCalledWith(true);
+    const replacement = vi.fn();
+    subscribeDatabaseWork(db, "queue", replacement);
+    expect(replacement).toHaveBeenCalledWith(true);
+  });
+
   it("isolates databases and topics and releases subscriptions", () => {
     const db = installDatabaseWorkSignals(connection());
     const other = installDatabaseWorkSignals(connection());
diff --git a/packages/db/src/work-signals.ts b/packages/db/src/work-signals.ts
index 01bd090017..1d8725e2f9 100644
--- a/packages/db/src/work-signals.ts
+++ b/packages/db/src/work-signals.ts
@@ -1,6 +1,6 @@
 /** Process-local hints for durable work. The database remains the source of truth. */
 type Listener = (uncertainCommit: boolean) => void;
-type Scope = { listeners: Map<string, Set<Listener>> };
+type Scope = { listeners: Map<string, Set<Listener>>; uncertainTopics: Set<string> };
 type Context = { scope: Scope; pending: Set<string> | null };
 const contexts = new WeakMap<object, Context>();
 
@@ -9,11 +9,12 @@ const contexts = new WeakMap<object, Context>();
 // transaction before commit. No SQL, connection, or timer is added here.
 type Transactional = { transaction: (...args: any[]) => Promise<any> };
 export function installDatabaseWorkSignals<T extends Transactional>(db: T): T {
-  install(db, { scope: { listeners: new Map() }, pending: null });
+  install(db, { scope: { listeners: new Map(), uncertainTopics: new Set() }, pending: null });
   return db;
 }
 
 function publish(scope: Scope, topic: string, uncertainCommit = false) {
+  if (uncertainCommit) scope.uncertainTopics.add(topic);
   for (const listener of scope.listeners.get(topic) ?? []) {
     try { listener(uncertainCommit); }
     catch (error) { process.emitWarning(`Database work listener failed: ${String(error)}`); }
@@ -63,5 +64,8 @@ export function subscribeDatabaseWork(connection: object, topic: string, listene
   let listeners = context.scope.listeners.get(topic);
   if (!listeners) context.scope.listeners.set(topic, listeners = new Set());
   listeners.add(listener);
+  // A consumer may start after an ambiguous startup write or be replaced
+  // without restarting the database owner. Retain that uncertainty in scope.
+  if (context.scope.uncertainTopics.has(topic)) listener(true);
   return () => { listeners.delete(listener); };
 }