chapterhouse 0.3.11 → 0.3.13

package/dist/api/server.js

@@ -469,7 +469,7 @@ app.post("/api/message", (req, res) => {
                     event.route = {
                         model: routeResult.model,
                         routerMode: routeResult.routerMode,
-                        tier: routeResult.tier,
+                        ...(routeResult.tier !== null ? { tier: routeResult.tier } : {}),
                         ...(routeResult.overrideName ? { overrideName: routeResult.overrideName } : {}),
                     };
                 }
@@ -547,7 +547,7 @@ app.post("/api/sessions/:sessionKey/interrupt", (req, res) => {
                     event.route = {
                         model: routeResult.model,
                         routerMode: routeResult.routerMode,
-                        tier: routeResult.tier,
+                        ...(routeResult.tier !== null ? { tier: routeResult.tier } : {}),
                         ...(routeResult.overrideName ? { overrideName: routeResult.overrideName } : {}),
                     };
                 }
@@ -644,6 +644,7 @@ if (config.chatSseEnabled) {
         };
         // If Last-Event-ID is present and the session ring buffer doesn't cover it,
         // fall back to SQLite for replay of completed turns.
+        let replayHighSeq = lastSeq;
         if (lastSeq !== undefined) {
             const oldestBuf = oldestSessionSeq(sessionKey);
             const bufferMissesRange = oldestBuf === undefined || oldestBuf > lastSeq + 1;
@@ -652,13 +653,17 @@ if (config.chatSseEnabled) {
                 const dbEvents = getSessionEventsFromDb(sessionKey, lastSeq);
                 for (const e of dbEvents) {
                     sendEvent(e, e._seq);
+                    if (replayHighSeq === undefined || e._seq > replayHighSeq)
+                        replayHighSeq = e._seq;
                 }
             }
         }
-        // Subscribe to session events (replays ring buffer for afterSeq, then live)
+        // Subscribe to session events (replays ring buffer for afterSeq, then live).
+        // Use replayHighSeq (not lastSeq) so ring-buffer replay starts after any DB
+        // events we already sent — avoids double-replay overlap (Fix 5).
         const unsub = subscribeSession(sessionKey, (e) => {
             sendEvent(e, e._seq);
-        }, lastSeq);
+        }, replayHighSeq);
         // Send connected event
         res.write(`: connected session=${sessionKey}\n\n`);
         // Keep-alive every 15 s

package/dist/api/turn-sse.integration.test.js

@@ -349,4 +349,40 @@ test("turn-sse: reconnect with Last-Event-ID replays buffered events", async ()
         }
     }, { CHAPTERHOUSE_CHAT_SSE: "1" }, 15_000);
 });
+// ---------------------------------------------------------------------------
+// Regression test: turn ID contract (Fix 1 — root cause of blank SSE bubbles)
+// ---------------------------------------------------------------------------
+test("turn-sse: turnId returned by POST matches turnId in all SSE events for that turn", async () => {
+    await withStartedServer(async ({ baseUrl, authHeader }) => {
+        const sessionKey = "test-session-turnid-contract";
+        // Open SSE stream first
+        const sseRes = await fetch(`${baseUrl}/api/sessions/${sessionKey}/stream`, {
+            headers: { Authorization: authHeader, Accept: "text/event-stream" },
+        });
+        assert.ok(sseRes.body, "SSE body must be readable");
+        const reader = createSseReader(sseRes.body);
+        // POST the turn — this is the canonical turnId the frontend tags user messages with
+        const turnRes = await fetch(`${baseUrl}/api/sessions/${sessionKey}/turn`, {
+            method: "POST",
+            headers: { Authorization: authHeader, "Content-Type": "application/json" },
+            body: JSON.stringify({ prompt: "turn-id-contract test" }),
+        });
+        assert.equal(turnRes.status, 200, `POST /turn returned ${turnRes.status}`);
+        const bodyText = await turnRes.text();
+        const { turnId: postedTurnId } = JSON.parse(bodyText);
+        assert.ok(typeof postedTurnId === "string" && postedTurnId.length > 0, "POST must return a non-empty turnId");
+        // Read all events for up to 3 s (no real Copilot token — only turn:started and
+        // possibly turn:error will arrive; that is sufficient to verify ID plumbing).
+        const frames = await reader.readFrames(3, 3_000);
+        await reader.cancel();
+        assert.ok(frames.length >= 1, `Expected at least 1 SSE frame, got ${frames.length}`);
+        // THE CONTRACT: every turn:* event must carry the same turnId the POST returned.
+        for (const frame of frames) {
+            const data = frame.data;
+            if (typeof data?.type === "string" && data.type.startsWith("turn:")) {
+                assert.equal(data.turnId, postedTurnId, `Event type=${data.type} has turnId=${String(data.turnId)} but POST returned turnId=${postedTurnId}`);
+            }
+        }
+    }, { CHAPTERHOUSE_CHAT_SSE: "1" }, 15_000);
+});
 //# sourceMappingURL=turn-sse.integration.test.js.map

package/dist/copilot/orchestrator.js

@@ -152,7 +152,7 @@ function sameUserContext(a, b) {
     return a?.name === b?.name && a?.role === b?.role;
 }
 function updateUserContext(source) {
-    if (source.type !== "web")
+    if (source.type !== "web" && source.type !== "sse-web")
         return;
     const nextContext = source.user
         ? { name: source.user.name, role: source.user.role }
@@ -164,7 +164,7 @@ function updateUserContext(source) {
     registry?.get("default")?.invalidateSession();
 }
 function updateRequestContext(source) {
-    if (source.type !== "web") {
+    if (source.type !== "web" && source.type !== "sse-web") {
         currentAuthenticatedUser = undefined;
         currentAuthorizationHeader = undefined;
         return;
@@ -749,14 +749,13 @@ function isRecoverableError(err) {
         return false;
     return /disconnect|connection|EPIPE|ECONNRESET|ECONNREFUSED|socket|closed|ENOENT|spawn|not found|expired|stale/i.test(msg);
 }
-export async function sendToOrchestrator(prompt, source, callback, attachments, onActivity, onQueued, onAdvance) {
+export async function sendToOrchestrator(prompt, source, callback, attachments, onActivity, onQueued, onAdvance, externalTurnId) {
     updateUserContext(source);
     updateRequestContext(source);
-    // Generate a unique ID for this orchestrator turn.  Every SSE event emitted
-    // during this turn carries this ID so the frontend can detect turn boundaries
-    // and create a new assistant bubble when it changes (fixes #92).
-    const turnId = randomUUID();
-    const sourceLabel = source.type === "web" ? "web" : "background";
+    // Use the externally-supplied turnId if provided (POST→SSE path needs the ID
+    // returned to the client to match every emitted event — Fix 1 root cause).
+    const turnId = externalTurnId ?? randomUUID();
+    const sourceLabel = source.type === "background" ? "background" : "web";
     logMessage("in", sourceLabel, prompt);
     let sessionKey;
     if (source.type === "web" && source.projectPath && config.squadEnabled) {
@@ -764,7 +763,7 @@ export async function sendToOrchestrator(prompt, source, callback, attachments,
         setChannelProject(source.connectionId, normalizeProjectPath(source.projectPath));
         bumpProjectLastUsed(normalizeProjectPath(source.projectPath));
     }
-    else if (source.type === "background" && source.sessionKey) {
+    else if ((source.type === "background" || source.type === "sse-web") && source.sessionKey) {
         sessionKey = source.sessionKey;
     }
     else {
@@ -782,8 +781,9 @@ export async function sendToOrchestrator(prompt, source, callback, attachments,
     const sourceChannel = source.type === "web" ? "web" : undefined;
     // Capture auth context at enqueue time — prevents cross-session contamination
     // when concurrent sessions are processing simultaneously.
-    const authUser = source.type === "web" ? source.user : undefined;
-    const authHeader = source.type === "web" ? source.authorizationHeader?.trim() || undefined : undefined;
+    // sse-web carries user identity just like web (Fix 3).
+    const authUser = (source.type === "web" || source.type === "sse-web") ? source.user : undefined;
+    const authHeader = (source.type === "web" || source.type === "sse-web") ? source.authorizationHeader?.trim() || undefined : undefined;
     const manager = registry.getOrCreate(sessionKey);
     void (async () => {
         for (let attempt = 0; attempt <= MAX_RETRIES; attempt++) {
@@ -797,9 +797,10 @@ export async function sendToOrchestrator(prompt, source, callback, attachments,
                         // type dependencies. orchestrator.ts always passes valid ActivityEvent objects.
                         onActivity: onActivity,
                         turnId,
-                        // Background messages skip queue visibility — only web/user messages need it.
-                        onQueued: source.type === "web" ? onQueued : undefined,
-                        onAdvance: source.type === "web" ? onAdvance : undefined,
+                        // Background messages skip queue visibility — only user-initiated messages need it.
+                        // sse-web is user-initiated (Fix 2).
+                        onQueued: source.type !== "background" ? onQueued : undefined,
+                        onAdvance: source.type !== "background" ? onAdvance : undefined,
                         sourceChannel,
                         targetAgent,
                         channelKey,
@@ -864,19 +865,19 @@ export async function sendToOrchestrator(prompt, source, callback, attachments,
  *   replacement turn starts. Use to emit a `turn-interrupted` SSE event so the
  *   frontend can drop the partial in-flight bubble.
  */
-export async function interruptCurrentTurn(sessionKey, newPrompt, source, callback, attachments, onActivity, onInterrupted) {
+export async function interruptCurrentTurn(sessionKey, newPrompt, source, callback, attachments, onActivity, onInterrupted, externalTurnId) {
     const manager = registry?.get(sessionKey);
     // If no session exists or it isn't processing, fall back to a normal send.
     if (!manager || !manager.isProcessing) {
-        return sendToOrchestrator(newPrompt, source, callback, attachments, onActivity);
+        return sendToOrchestrator(newPrompt, source, callback, attachments, onActivity, undefined, undefined, externalTurnId);
     }
     updateUserContext(source);
     updateRequestContext(source);
-    const turnId = randomUUID();
-    const sourceLabel = source.type === "web" ? "web" : "background";
+    const turnId = externalTurnId ?? randomUUID();
+    const sourceLabel = source.type === "background" ? "background" : "web";
     const sourceChannel = source.type === "web" ? "web" : undefined;
-    const authUser = source.type === "web" ? source.user : undefined;
-    const authHeader = source.type === "web" ? source.authorizationHeader?.trim() || undefined : undefined;
+    const authUser = (source.type === "web" || source.type === "sse-web") ? source.user : undefined;
+    const authHeader = (source.type === "web" || source.type === "sse-web") ? source.authorizationHeader?.trim() || undefined : undefined;
     const taggedPrompt = source.type === "background"
         ? newPrompt
         : `[via ${sourceLabel}] ${newPrompt}`;
@@ -965,8 +966,8 @@ export async function interruptCurrentTurn(sessionKey, newPrompt, source, callba
 export function enqueueForSse(opts) {
     const { sessionKey, prompt, attachments, authUser, authHeader, interrupt } = opts;
     const turnId = randomUUID();
-    const source = { type: "background", sessionKey };
-    const taggedPrompt = `[via sse] ${prompt}`;
+    // sse-web carries auth and enables onQueued — unlike "background" (Fixes 2 & 3).
+    const source = { type: "sse-web", sessionKey, user: authUser, authorizationHeader: authHeader };
     // Emit turn:started immediately so the SSE client sees it before any delta
     emitTurnEvent(sessionKey, { type: "turn:started", turnId, sessionKey, prompt, attachments });
     const callback = (text, done, tid) => {
@@ -986,10 +987,12 @@ export function enqueueForSse(opts) {
         scheduleClearTurnLog(abortedTurnId);
     };
     if (interrupt) {
-        void interruptCurrentTurn(sessionKey, taggedPrompt, source, callback, attachments, undefined, onInterrupted);
+        // Pass the outer turnId so the replacement turn uses the same ID (Fix 1).
+        void interruptCurrentTurn(sessionKey, prompt, source, callback, attachments, undefined, onInterrupted, turnId);
     }
     else {
-        void sendToOrchestrator(taggedPrompt, source, callback, attachments, undefined, onQueued);
+        // Pass the outer turnId so sendToOrchestrator uses it instead of generating a new one (Fix 1).
+        void sendToOrchestrator(prompt, source, callback, attachments, undefined, onQueued, undefined, turnId);
     }
     return turnId;
 }
@@ -998,15 +1001,26 @@ export async function cancelCurrentMessage() {
     if (!registry)
         return false;
     let drained = 0;
+    // Capture (sessionKey, turnId) before aborting so we can emit terminal events.
     const aborts = [];
-    for (const [, manager] of registry.getAll()) {
+    for (const [sessionKey, manager] of registry.getAll()) {
         drained += manager.cancelQueued();
         if (manager.isProcessing) {
-            aborts.push(manager.abortCurrentTurn());
+            const turnId = manager.currentTurnId;
+            aborts.push({ promise: manager.abortCurrentTurn(), sessionKey, turnId });
         }
     }
-    const results = await Promise.all(aborts);
+    const results = await Promise.all(aborts.map((a) => a.promise));
     const aborted = results.some(Boolean);
+    // Emit turn:interrupted on per-session SSE streams for any turn that was aborted (Fix 4).
+    for (let i = 0; i < aborts.length; i++) {
+        if (results[i] && aborts[i].turnId) {
+            const { sessionKey, turnId } = aborts[i];
+            emitTurnEvent(sessionKey, { type: "turn:interrupted", turnId: turnId, sessionKey });
+            persistTurnEvents(turnId, sessionKey);
+            scheduleClearTurnLog(turnId);
+        }
+    }
     return aborted || drained > 0;
 }
 /** Switch the model on the live default orchestrator session without destroying it. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chapterhouse",
-  "version": "0.3.11",
+  "version": "0.3.13",
   "description": "Chapterhouse — a team-level AI assistant for engineering teams, built on the GitHub Copilot SDK. Web UI only.",
   "bin": {
     "chapterhouse": "dist/cli.js"