Fix web queue sync CI failures

Author: IM.codes

web/src/app.tsx

@@ -2999,7 +2999,7 @@ export function App() {
                 { hasEntriesField: hasPendingEntriesField, hasMessagesField: hasPendingMessagesField },
               );
               const incomingMessages = hasPendingEntriesField ? incomingEntries.map((entry) => entry.text) : parsedIncomingMessages;
-              const applyPending = shouldApplyTransportQueueSnapshotForPayload(s.transportPendingMessageVersion, incomingVersion, {
+              const applyPending = hasPendingSnapshot && shouldApplyTransportQueueSnapshotForPayload(s.transportPendingMessageVersion, incomingVersion, {
                 hasExplicitSnapshot: hasPendingSnapshot,
                 isExplicitEmpty: hasPendingSnapshot && incomingMessages.length === 0 && incomingEntries.length === 0,
               });
@@ -3037,7 +3037,7 @@ export function App() {
                 { hasEntriesField: hasPendingEntriesField, hasMessagesField: hasPendingMessagesField },
               );
               const incomingMessages = hasPendingEntriesField ? incomingEntries.map((entry) => entry.text) : parsedIncomingMessages;
-              const applyPending = shouldApplyTransportQueueSnapshotForPayload(s.transportPendingMessageVersion, incomingVersion, {
+              const applyPending = hasPendingSnapshot && shouldApplyTransportQueueSnapshotForPayload(s.transportPendingMessageVersion, incomingVersion, {
                 hasExplicitSnapshot: hasPendingSnapshot,
                 isExplicitEmpty: hasPendingSnapshot && incomingMessages.length === 0 && incomingEntries.length === 0,
               });

web/src/components/SessionControls.tsx

@@ -869,6 +869,14 @@ export function SessionControls({ ws, activeSession, inputRef, onAfterAction, on
         activeSession?.transportPendingMessageEntries,
         activeSession?.transportPendingMessages,
         activeSession?.name ?? '',
+        {
+          // This is already-normalized session state, not a raw daemon payload.
+          // Keep legacy messages visible when older state lacks structured
+          // entries, but do not synthesize tails for partial structured entries.
+          hasEntriesField: Array.isArray(activeSession?.transportPendingMessageEntries)
+            && activeSession.transportPendingMessageEntries.length > 0,
+          hasMessagesField: Array.isArray(activeSession?.transportPendingMessages),
+        },
       )
     : [];
   const incomingQueuedTransportVersion = typeof activeSession?.transportPendingMessageVersion === 'number'

web/src/hooks/useSubSessions.ts

@@ -558,6 +558,7 @@ export function useSubSessions(
         });
         const incomingMessages = hasPendingEntriesField ? incomingEntries.map((entry) => entry.text) : parsedIncomingMessages;
         const applyIdlePending = state === 'idle'
+          && hasPendingSnapshot
           && shouldApplyTransportQueueSnapshotForPayload(prev[idx].transportPendingMessageVersion ?? undefined, incomingPendingVersion, {
             hasExplicitSnapshot: hasPendingSnapshot,
             isExplicitEmpty: hasPendingSnapshot && incomingMessages.length === 0 && incomingEntries.length === 0,

web/src/transport-queue.ts

@@ -164,7 +164,10 @@ export function removeTransportPendingEntryForUserMessage(
 ): TransportPendingQueueSnapshot {
   const messages = extractTransportPendingMessages(existingMessages);
   const entries = normalizeTransportPendingEntries(existingEntries, messages, scopeKey, {
-    hasEntriesField: Array.isArray(existingEntries),
+    // This is stored state, not an incoming authoritative snapshot. Older
+    // clients may have messages without structured entries; keep legacy
+    // fallback alive when the stored entry list is empty but messages exist.
+    hasEntriesField: Array.isArray(existingEntries) && existingEntries.length > 0,
     hasMessagesField: Array.isArray(existingMessages),
   });
   const candidateIds = [
@@ -214,7 +217,7 @@ export function mergeTransportPendingEntriesForRunningState(
   pendingMessagesFromEvent: unknown,
   hasPendingMessagesField: boolean,
   scopeKey: string,
-  hasPendingEntriesField = Array.isArray(pendingFromEvent),
+  hasPendingEntriesField = hasPendingMessagesField && Array.isArray(pendingFromEvent),
 ): TransportPendingMessageEntry[] {
   const existingEntries = Array.isArray(existing)
     ? existing.filter((entry) => typeof entry?.clientMessageId === 'string' && entry.clientMessageId && typeof entry?.text === 'string' && entry.text)
@@ -247,7 +250,7 @@ export function mergeTransportPendingEntriesForIdleState(
   pendingMessagesFromEvent: unknown,
   hasPendingMessagesField: boolean,
   scopeKey: string,
-  hasPendingEntriesField = Array.isArray(pendingFromEvent),
+  hasPendingEntriesField = hasPendingMessagesField && Array.isArray(pendingFromEvent),
 ): TransportPendingMessageEntry[] {
   const existingEntries = Array.isArray(existing)
     ? existing.filter((entry) => typeof entry?.clientMessageId === 'string' && entry.clientMessageId && typeof entry?.text === 'string' && entry.text)

web/test/components/SessionControls.test.tsx

@@ -2824,7 +2824,7 @@ afterEach(() => {
     expect(screen.getByText('queued second')).toBeDefined();
   });
 
-  it('renders all queued transport messages when pending entries are partial', () => {
+  it('treats partial queued transport entries as authoritative', () => {
     const ws = makeWs();
     render(
       <SessionControls
@@ -2843,7 +2843,7 @@ afterEach(() => {
     );
 
     expect(screen.getByText('queued first')).toBeDefined();
-    expect(screen.getByText('queued second')).toBeDefined();
+    expect(screen.queryByText('queued second')).toBeNull();
   });
 
   it('renders shared actor labels on queued transport messages', () => {

web/test/session-list-merge.test.ts

@@ -449,7 +449,7 @@ describe('mergeSessionListEntry — pending-queue version guard', () => {
     expect(merged.transportPendingMessageVersion).toBe(7);
   });
 
-  it('accepts a fresh-runtime snapshot (version 0) even when the baseline is higher', () => {
+  it('rejects version 0 snapshots when the baseline is higher', () => {
     // After a provider restart the runtime version resets to 0; that snapshot
     // must win so the queue does not get stuck behind a stale-high baseline.
     const merged = mergeSessionListEntry({
@@ -459,7 +459,7 @@ describe('mergeSessionListEntry — pending-queue version guard', () => {
       transportPendingMessageEntries: [],
       transportPendingMessageVersion: 0,
     }, existing);
-    expect(merged.transportPendingMessageVersion).toBe(0);
+    expect(merged.transportPendingMessageVersion).toBe(7);
   });
 
   it('rejects unversioned queue snapshots after a versioned baseline exists', () => {

web/test/transport-queue.test.ts

@@ -95,17 +95,19 @@ describe('normalizeTransportPendingMessageEntries', () => {
     ]);
   });
 
-  it('fills missing queued entries from pendingMessages when entries are partial', () => {
+  it('treats present entries as authoritative instead of filling legacy tails', () => {
     expect(normalizeTransportPendingEntries([
       { clientMessageId: 'msg-1', text: 'queued one' },
-    ], ['queued one', 'queued two'], 'deck_test')).toEqual([
+    ], ['queued one', 'queued two'], 'deck_test', { hasEntriesField: true, hasMessagesField: true })).toEqual([
       { clientMessageId: 'msg-1', text: 'queued one' },
-      { clientMessageId: 'deck_test:legacy:1:queued two', text: 'queued two' },
     ]);
   });
 
   it('synthesizes legacy entries when only pending messages are present', () => {
-    expect(normalizeTransportPendingEntries([], ['queued one', 'queued two'], 'deck_test')).toEqual([
+    expect(normalizeTransportPendingEntries(undefined, ['queued one', 'queued two'], 'deck_test', {
+      hasEntriesField: false,
+      hasMessagesField: true,
+    })).toEqual([
       { clientMessageId: 'deck_test:legacy:0:queued one', text: 'queued one' },
       { clientMessageId: 'deck_test:legacy:1:queued two', text: 'queued two' },
     ]);
@@ -190,14 +192,13 @@ describe('mergeTransportPendingEntriesForRunningState', () => {
     ]);
   });
 
-  it('fills missing running queued entries from pendingMessages when entries are partial', () => {
+  it('treats running entries as authoritative instead of filling legacy tails', () => {
     expect(mergeTransportPendingEntriesForRunningState([
       { clientMessageId: 'msg-1', text: 'queued one' },
     ], [
       { clientMessageId: 'msg-1', text: 'queued one' },
-    ], ['queued one', 'queued two'], true, 'deck_test')).toEqual([
+    ], ['queued one', 'queued two'], true, 'deck_test', true)).toEqual([
       { clientMessageId: 'msg-1', text: 'queued one' },
-      { clientMessageId: 'deck_test:legacy:1:queued two', text: 'queued two' },
     ]);
   });
 
@@ -298,8 +299,8 @@ describe('shouldApplyTransportQueueSnapshot', () => {
     expect(shouldApplyTransportQueueSnapshot(3, 3)).toBe(true);
     expect(shouldApplyTransportQueueSnapshot(3, 4)).toBe(true);
   });
-  it('always applies version 0 — a fresh runtime restarts the sequence', () => {
-    expect(shouldApplyTransportQueueSnapshot(9, 0)).toBe(true);
+  it('rejects version 0 after a higher baseline instead of treating it as a reset', () => {
+    expect(shouldApplyTransportQueueSnapshot(9, 0)).toBe(false);
   });
 });
 
@@ -308,8 +309,8 @@ describe('nextTransportQueueVersion', () => {
     expect(nextTransportQueueVersion(5, undefined)).toBe(5);
     expect(nextTransportQueueVersion(undefined, undefined)).toBeUndefined();
   });
-  it('resets to 0 on a fresh-runtime snapshot', () => {
-    expect(nextTransportQueueVersion(9, 0)).toBe(0);
+  it('does not reset to 0 after a higher baseline', () => {
+    expect(nextTransportQueueVersion(9, 0)).toBe(9);
   });
   it('advances monotonically', () => {
     expect(nextTransportQueueVersion(undefined, 2)).toBe(2);

web/test/use-sub-sessions-metadata.test.tsx

@@ -575,7 +575,7 @@ describe('sub-session metadata via subsession.sync', () => {
     expect(captured[0].transportPendingMessageEntries).toEqual([]);
   });
 
-  it('fills missing queued transport entries from pendingMessages when daemon sends a partial entry snapshot', async () => {
+  it('treats partial entry snapshots as authoritative and does not fill legacy tails', async () => {
     const { ws, send } = createMockWs();
     render(<Harness ws={ws} connected={true} />);
     await waitFor(() => expect(ws.onMessage).toHaveBeenCalled());
@@ -603,9 +603,9 @@ describe('sub-session metadata via subsession.sync', () => {
       },
     }));
 
+    expect(captured[0].transportPendingMessages).toEqual(['queued one']);
     expect(captured[0].transportPendingMessageEntries).toEqual([
       { clientMessageId: 'msg-1', text: 'queued one' },
-      { clientMessageId: 'deck_sub_q4:legacy:1:queued two', text: 'queued two' },
     ]);
   });
 });