chore: merge fix/watch-mode-keepalive-tri-13065 (review fixes round 3)

Author: kathiekiwi

.changeset/chat-stream-supersede-race.md

@@ -2,4 +2,4 @@
 "@trigger.dev/sdk": patch
 ---
 
-Fixed a race where quickly restarting a chat stream could break stop and reconnect for the new stream.
+Fixed a race where quickly restarting a chat stream could break stop and reconnect for the new stream. Stopping a chat now also hands it back to your other tabs instead of leaving them read-only.

apps/webapp/app/components/dashboard-agent/demo/fixtures/watches.ts

@@ -68,7 +68,8 @@ export const demoErrorRecurrenceWatch = watch(
   "email-sends",
   {
     kind: "error_recurrence",
-    fingerprint: DEMO_WORLD.errorFingerprint,
+    // The page cites `error_<fingerprint>`, the spec keeps the bare form.
+    fingerprint: DEMO_WORLD.errorFingerprint.replace(/^error_/, ""),
     note: "Tell me if the rate-limit error comes back.",
     maxHours: 12,
     checkEveryMinutes: 15,

packages/trigger-sdk/src/v3/chat.test.ts

@@ -1657,6 +1657,49 @@ describe("TriggerChatTransport", () => {
         vi.useRealTimers();
       }
     });
+
+    it("releases the tab claim when the user stops generation (multi-tab)", async () => {
+      vi.useFakeTimers();
+      try {
+        global.fetch = vi.fn().mockImplementation(async (url: string | URL, init?: RequestInit) => {
+          const urlStr = typeof url === "string" ? url : url.toString();
+          if (isSessionStreamAppendUrl(urlStr)) return defaultAppendResponse();
+          if (isSessionOutSubscribeUrl(urlStr)) return openSseResponse(init?.signal);
+          throw new Error(`Unexpected URL: ${urlStr}`);
+        });
+
+        const transport = new TriggerChatTransport({
+          task: "my-chat-task",
+          accessToken: () => "pat",
+          multiTab: true,
+          sessions: { "chat-stop-tab": { publicAccessToken: "p", isStreaming: true } },
+        });
+
+        const drain = drainChunks(
+          await transport.sendMessages({
+            trigger: "submit-message" as const,
+            chatId: "chat-stop-tab",
+            messageId: undefined,
+            messages: [createUserMessage("hi")],
+            abortSignal: undefined,
+          })
+        );
+        await vi.advanceTimersByTimeAsync(1_000);
+        expect(transport.hasClaim("chat-stop-tab")).toBe(true);
+
+        expect(await transport.stopGeneration("chat-stop-tab")).toBe(true);
+        await vi.advanceTimersByTimeAsync(1_000);
+
+        // The turn ends here with no successor stream, so the claim must be
+        // freed or other tabs stay read-only until this one closes.
+        expect(transport.hasClaim("chat-stop-tab")).toBe(false);
+
+        transport.dispose();
+        await drain;
+      } finally {
+        vi.useRealTimers();
+      }
+    });
   });
 
   describe("multi-tab coordination", () => {

packages/trigger-sdk/src/v3/chat.ts

@@ -1218,6 +1218,11 @@ export class TriggerChatTransport implements ChatTransport<UIMessage> {
       activeStream.abort();
       this.activeStreams.delete(chatId);
     }
+    // Release here, not in the stream teardown: that only releases while it
+    // still owns the map entry, and we just deleted it. Unlike a supersede,
+    // no successor stream follows a stop, so the claim would never be freed
+    // and other tabs would stay read-only until this one closes.
+    this.coordinator?.release(chatId);
 
     // The turn won't reach its turn-complete on this client (we just
     // aborted the reader), so clear the streaming flag here and persist —