@vantran-se/openchamber-web 1.24.3 → 2.0.1

package/server/lib/event-stream/global-hub.test.js

@@ -3,11 +3,12 @@ import { describe, expect, it, vi } from 'vitest';
 import { createGlobalMessageStreamHub } from './global-hub.js';
 
 it('bounds a contiguous replay suffix by UTF-8 bytes and event count', async () => {
-  const blocks = Array.from({ length: 8 }, (_, i) => `id: e${i}\ndata: ${JSON.stringify({ type: 'message', properties: { text: '界'.repeat(40) } })}\n\n`);
+  // v2 carries the event id inside the payload; there are no `id:` SSE lines.
+  const blocks = Array.from({ length: 8 }, (_, i) => `data: ${JSON.stringify({ id: `e${i}`, type: 'message', properties: { text: '界'.repeat(40) } })}\n\n`);
   const received = [];
   const hub = createGlobalMessageStreamHub({
     buildOpenCodeUrl: path => `http://127.0.0.1:4096${path}`,
-    getOpenCodeAuthHeaders: () => ({}), replayLimit: 3, replayByteLimit: 550,
+    getOpenCodeAuthHeaders: () => ({}), replayLimit: 3, replayByteLimit: 600,
     upstreamReconnectDelayMs: 60_000,
     fetchImpl: async () => createSseResponse({ blocks }),
   });
@@ -19,8 +20,8 @@ it('bounds a contiguous replay suffix by UTF-8 bytes and event count', async ()
     expect(hub.replayAfter('e5')).toBeNull();
     const tail = hub.replayAfter('e6');
     expect(tail.map(entry => entry.eventId)).toEqual(['e7']);
-    expect(Buffer.byteLength(tail[0].serializedFrame) * 2).toBeLessThanOrEqual(550);
-    expect(Buffer.byteLength(tail[0].serializedFrame) * 3).toBeGreaterThan(550);
+    expect(Buffer.byteLength(tail[0].serializedFrame) * 2).toBeLessThanOrEqual(600);
+    expect(Buffer.byteLength(tail[0].serializedFrame) * 3).toBeGreaterThan(600);
   } finally { hub.stop(); }
 });
 
@@ -62,9 +63,9 @@ async function waitForAssertion(assertion) {
   throw lastError;
 }
 
-const deltaBlock = (id, text, partID = 'prt_a') => `id: ${id}\ndata: ${JSON.stringify({
-  id, type: 'message.part.delta',
-  properties: { sessionID: 'ses_1', messageID: 'msg_1', partID, field: 'text', delta: text },
+const deltaBlock = (id, text, ordinal = 1) => `id: ${id}\ndata: ${JSON.stringify({
+  id, type: 'session.text.delta',
+  data: { sessionID: 'ses_1', assistantMessageID: 'msg_1', ordinal, delta: text },
 })}\n\n`;
 
 const createDeltaHub = ({ blocks, deltaCoalesceWindowMs }) => createGlobalMessageStreamHub({
@@ -75,15 +76,15 @@ const createDeltaHub = ({ blocks, deltaCoalesceWindowMs }) => createGlobalMessag
   fetchImpl: async () => createSseResponse({ blocks }),
 });
 
-// What a browser holds after applying frames in order: text per part, and the
-// text each part had when a snapshot barrier passed.
+// What a browser holds after applying frames in order: text per stream
+// ordinal, and the text each stream had when a snapshot barrier passed.
 const applyFrames = (frames) => {
   const text = {};
   const barriers = [];
   for (const frame of frames) {
     const payload = frame.payload;
-    if (payload.type === 'message.part.delta') {
-      text[payload.properties.partID] = (text[payload.properties.partID] ?? '') + payload.properties.delta;
+    if (payload.type === 'session.text.delta') {
+      text[payload.data.ordinal] = (text[payload.data.ordinal] ?? '') + payload.data.delta;
     } else {
       barriers.push({ id: payload.id, seen: { ...text } });
     }
@@ -99,7 +100,7 @@ describe('delta coalescing in the global hub', () => {
     hub.subscribeEvent((event) => received.push(event));
     try {
       hub.start();
-      await waitForAssertion(() => expect(applyFrames(received).text.prt_a).toBe(words.join('')));
+      await waitForAssertion(() => expect(applyFrames(received).text[1]).toBe(words.join('')));
       expect(received.length).toBeLessThanOrEqual(3);
       expect(received.at(-1).eventId).toBe('e0119');
     } finally { hub.stop(); }
@@ -109,9 +110,9 @@ describe('delta coalescing in the global hub', () => {
     const blocks = [];
     let id = 0;
     const nextId = () => `e${String(id++).padStart(4, '0')}`;
-    for (let index = 0; index < 40; index += 1) blocks.push(deltaBlock(nextId(), `a${index}.`, index % 3 === 0 ? 'prt_b' : 'prt_a'));
+    for (let index = 0; index < 40; index += 1) blocks.push(deltaBlock(nextId(), `a${index}.`, index % 3 === 0 ? 2 : 1));
     const snapshotId = nextId();
-    blocks.push(`id: ${snapshotId}\ndata: ${JSON.stringify({ id: snapshotId, type: 'message.part.updated', properties: { part: { id: 'prt_a', messageID: 'msg_1' } } })}\n\n`);
+    blocks.push(`id: ${snapshotId}\ndata: ${JSON.stringify({ id: snapshotId, type: 'session.text.ended', data: { sessionID: 'ses_1', assistantMessageID: 'msg_1', ordinal: 1, text: '' } })}\n\n`);
     for (let index = 0; index < 40; index += 1) blocks.push(deltaBlock(nextId(), `b${index}.`));
 
     const hub = createDeltaHub({ blocks });
@@ -121,13 +122,13 @@ describe('delta coalescing in the global hub', () => {
       hub.start();
       const expectedA = [...Array(40).keys()].filter((index) => index % 3 !== 0).map((index) => `a${index}.`).join('')
         + [...Array(40).keys()].map((index) => `b${index}.`).join('');
-      await waitForAssertion(() => expect(applyFrames(received).text.prt_a).toBe(expectedA));
+      await waitForAssertion(() => expect(applyFrames(received).text[1]).toBe(expectedA));
       expect(received.length).toBeLessThan(blocks.length / 4);
 
       const complete = applyFrames(received);
       // The snapshot barrier saw exactly the text that arrived before it.
       expect(complete.barriers).toHaveLength(1);
-      expect(complete.barriers[0].seen.prt_a).toBe([...Array(40).keys()].filter((index) => index % 3 !== 0).map((index) => `a${index}.`).join(''));
+      expect(complete.barriers[0].seen[1]).toBe([...Array(40).keys()].filter((index) => index % 3 !== 0).map((index) => `a${index}.`).join(''));
 
       // A socket that drops after any frame reconnects with that frame's id.
       for (let cut = 0; cut < received.length; cut += 1) {
@@ -139,17 +140,17 @@ describe('delta coalescing in the global hub', () => {
     } finally { hub.stop(); }
   });
 
-  // OpenCode 1.18 sends no SSE ids at all. Before the hub numbered such events
+  // OpenCode sends no SSE ids at all. Before the hub numbered such events
   // itself the replay buffer stayed empty and every reconnect lost its gap.
   it('numbers id-less upstream events so a reconnect resumes from any cursor', async () => {
-    const idless = (type, properties) => `data: ${JSON.stringify({ type, properties })}\n\n`;
+    const idless = (type, data) => `data: ${JSON.stringify({ type, data })}\n\n`;
     const blocks = [];
     for (let index = 0; index < 30; index += 1) {
-      blocks.push(idless('message.part.delta', { sessionID: 'ses_1', messageID: 'msg_1', partID: 'prt_a', field: 'text', delta: `a${index}.` }));
+      blocks.push(idless('session.text.delta', { sessionID: 'ses_1', assistantMessageID: 'msg_1', ordinal: 1, delta: `a${index}.` }));
     }
-    blocks.push(idless('message.part.updated', { part: { id: 'prt_a', messageID: 'msg_1' } }));
+    blocks.push(idless('session.text.ended', { sessionID: 'ses_1', assistantMessageID: 'msg_1', ordinal: 1, text: '' }));
     for (let index = 0; index < 30; index += 1) {
-      blocks.push(idless('message.part.delta', { sessionID: 'ses_1', messageID: 'msg_1', partID: 'prt_a', field: 'text', delta: `b${index}.` }));
+      blocks.push(idless('session.text.delta', { sessionID: 'ses_1', assistantMessageID: 'msg_1', ordinal: 1, delta: `b${index}.` }));
     }
 
     const hub = createDeltaHub({ blocks });
@@ -158,7 +159,7 @@ describe('delta coalescing in the global hub', () => {
     try {
       hub.start();
       const expected = [...Array(30).keys()].map((index) => `a${index}.`).join('') + [...Array(30).keys()].map((index) => `b${index}.`).join('');
-      await waitForAssertion(() => expect(applyFrames(received).text.prt_a).toBe(expected));
+      await waitForAssertion(() => expect(applyFrames(received).text[1]).toBe(expected));
 
       const ids = received.map((event) => event.eventId);
       expect(ids.every((eventId) => typeof eventId === 'string' && eventId.length > 0)).toBe(true);
@@ -198,7 +199,7 @@ describe('delta coalescing in the global hub', () => {
     hub.stop();
 
     const tail = hub.replayAfter('e0').map((entry) => JSON.parse(entry.serializedFrame));
-    expect(applyFrames(tail).text.prt_a).toBe('two three');
+    expect(applyFrames(tail).text[1]).toBe('two three');
     expect(tail.at(-1).eventId).toBe('e2');
   });
 
@@ -216,7 +217,7 @@ describe('delta coalescing in the global hub', () => {
 
       hub.flushPending();
 
-      expect(applyFrames(received).text.prt_a).toBe('one two three');
+      expect(applyFrames(received).text[1]).toBe('one two three');
       expect(hub.replayAfter('e2')).toEqual([]);
     } finally { hub.stop(); }
   });
@@ -232,7 +233,7 @@ describe('createGlobalMessageStreamHub', () => {
       upstreamReconnectDelayMs: 100,
       fetchImpl: async () => createSseResponse({
         blocks: [
-          'id: evt-1\ndata: {"type":"session.updated","properties":{}}\n\n',
+          'data: {"id":"evt-1","type":"session.updated","properties":{}}\n\n',
         ],
       }),
     });
@@ -294,7 +295,7 @@ describe('createGlobalMessageStreamHub', () => {
       upstreamReconnectDelayMs: 100,
       fetchImpl: async () => createSseResponse({
         blocks: [
-          'id: evt-1\ndata: {"type":"session.updated","properties":{}}\n\n',
+          'data: {"id":"evt-1","type":"session.updated","properties":{}}\n\n',
         ],
       }),
     });

package/server/lib/event-stream/index.js

@@ -15,3 +15,9 @@ export {
   DEFAULT_UPSTREAM_STALL_TIMEOUT_MS,
   UPSTREAM_STALL_TIMEOUT_CONCURRENT_MS,
 } from './upstream-reader.js';
+
+export {
+  forwardTranslatedWireEvent,
+  translateWireEvent,
+  wireEventDirectory,
+} from './translate-v2.js';

package/server/lib/event-stream/protocol.js

@@ -11,17 +11,19 @@ export const MESSAGE_STREAM_WS_MAX_BUFFERED_BYTES = 16 * 1024 * 1024;
 // proactively start shedding low-priority updates before the hard disconnect.
 export const MESSAGE_STREAM_WS_BACKPRESSURE_WARN_BYTES = 12 * 1024 * 1024;
 
+/**
+ * Parses one SSE block from OpenCode's `/api/event` stream.
+ *
+ * OpenCode v2 sends no `id:` lines: the event id lives in the JSON payload as
+ * `payload.id` and the directory as `payload.location.directory`. Both are read
+ * from the payload here so the replay buffer and the per-directory routing keep
+ * working unchanged.
+ */
 export function parseSseEventEnvelope(block) {
   if (!block || typeof block !== 'string') {
     return null;
   }
 
-  const eventId = block
-    .split('\n')
-    .find((line) => line.startsWith('id:'))
-    ?.slice(3)
-    .trim() || null;
-
   const dataLines = block
     .split('\n')
     .filter((line) => line.startsWith('data:'))
@@ -45,24 +47,17 @@ export function parseSseEventEnvelope(block) {
       parsed.payload !== null
     ) {
       return {
-        eventId,
-        directory: typeof parsed.directory === 'string' && parsed.directory.length > 0 ? parsed.directory : null,
+        eventId: readEventId(parsed.payload) ?? readEventId(parsed),
+        directory: typeof parsed.directory === 'string' && parsed.directory.length > 0
+          ? parsed.directory
+          : readDirectory(parsed.payload),
         payload: parsed.payload,
       };
     }
 
-    const directory =
-      typeof parsed?.directory === 'string' && parsed.directory.length > 0
-        ? parsed.directory
-        : typeof parsed?.properties?.directory === 'string' && parsed.properties.directory.length > 0
-          ? parsed.properties.directory
-          : typeof parsed?.properties?.info?.directory === 'string' && parsed.properties.info.directory.length > 0
-            ? parsed.properties.info.directory
-            : null;
-
     return {
-      eventId,
-      directory,
+      eventId: readEventId(parsed),
+      directory: readDirectory(parsed),
       payload: parsed,
     };
   } catch {
@@ -70,6 +65,18 @@ export function parseSseEventEnvelope(block) {
   }
 }
 
+function readEventId(payload) {
+  return payload && typeof payload === 'object' && typeof payload.id === 'string' && payload.id.length > 0
+    ? payload.id
+    : null;
+}
+
+function readDirectory(payload) {
+  if (!payload || typeof payload !== 'object') return null;
+  const directory = payload.location?.directory;
+  return typeof directory === 'string' && directory.length > 0 ? directory : null;
+}
+
 export function sendMessageStreamWsFrame(socket, payload) {
   try {
     return sendSerializedMessageStreamWsFrame(socket, JSON.stringify(payload));

package/server/lib/event-stream/protocol.test.js

@@ -16,28 +16,39 @@ describe('event stream protocol helpers', () => {
     expect(MESSAGE_STREAM_DIRECTORY_WS_PATH).toBe('/api/event/ws');
   });
 
-  it('parses wrapped SSE payloads with event id and directory', () => {
+  it('reads the event id and directory out of a v2 payload', () => {
+    // OpenCode 2.x sends no `id:` line: the id is `payload.id` and the
+    // directory is `payload.location.directory`.
+    const envelope = parseSseEventEnvelope(
+      'data: {"id":"evt_1","type":"session.renamed","location":{"directory":"/tmp/project"},"data":{"sessionID":"s1"}}\n'
+    );
+
+    expect(envelope.eventId).toBe('evt_1');
+    expect(envelope.directory).toBe('/tmp/project');
+    expect(envelope.payload.type).toBe('session.renamed');
+  });
+
+  it('parses a wrapped payload, preferring the wrapper directory', () => {
     const envelope = parseSseEventEnvelope(
-      'id: evt-1\n' +
       'event: message\n' +
-      'data: {"directory":"/tmp/project","payload":{"type":"session.updated"}}\n'
+      'data: {"directory":"/tmp/project","payload":{"id":"evt_1","type":"session.renamed"}}\n'
     );
 
     expect(envelope).toEqual({
-      eventId: 'evt-1',
+      eventId: 'evt_1',
       directory: '/tmp/project',
-      payload: { type: 'session.updated' },
+      payload: { id: 'evt_1', type: 'session.renamed' },
     });
   });
 
-  it('derives directory from payload properties when not wrapped', () => {
+  it('has no directory when the payload carries no location', () => {
     const envelope = parseSseEventEnvelope(
       'data: {"type":"openchamber:notification","properties":{"directory":"/tmp/project"}}\n'
     );
 
     expect(envelope).toEqual({
       eventId: null,
-      directory: '/tmp/project',
+      directory: null,
       payload: {
         type: 'openchamber:notification',
         properties: { directory: '/tmp/project' },

package/server/lib/event-stream/rebind.test.js

@@ -74,20 +74,20 @@ describe('rebindUpstream (#2638)', () => {
 
     // Port changes after a managed restart: buildOpenCodeUrl resolves the
     // CURRENT port on every attempt, exactly like production network-runtime.
-    const buildOpenCodeUrl = vi.fn(() => `http://127.0.0.1:${port}/global/event`);
+    const buildOpenCodeUrl = vi.fn(() => `http://127.0.0.1:${port}/api/event`);
     const fetchImpl = vi.fn(async (_url, options) => {
       fetchCalls += 1;
       if (fetchCalls === 1) {
         return createSseResponse({
           signal: options.signal,
           holdOpen: true,
-          blocks: ['id: evt-1\ndata: {"type":"server.connected","properties":{}}\n\n'],
+          blocks: ['data: {"id":"evt-1","type":"server.connected","properties":{}}\n\n'],
         });
       }
       return createSseResponse({
         signal: options.signal,
         holdOpen: true,
-        blocks: ['id: evt-2\ndata: {"type":"session.updated","properties":{"sessionID":"ses_1"}}\n\n'],
+        blocks: ['data: {"id":"evt-2","type":"session.updated","properties":{"sessionID":"ses_1"}}\n\n'],
       });
     });
 
@@ -130,7 +130,7 @@ describe('rebindUpstream (#2638)', () => {
     // The hub dialed the new port and the connected client received events
     // from the new upstream without reconnecting its own socket.
     expect(fetchCalls).toBe(2);
-    expect(fetchImpl.mock.calls[1][0]).toContain(':5000/global/event');
+    expect(fetchImpl.mock.calls[1][0]).toContain(':5000/api/event');
     expect(socket.sent.some((frame) => frame.type === 'event' && frame.eventId === 'evt-2')).toBe(true);
 
     socket.close();
@@ -149,7 +149,7 @@ describe('rebindUpstream (#2638)', () => {
       return createSseResponse({
         signal: options.signal,
         holdOpen: true,
-        blocks: ['id: evt-1\ndata: {"type":"server.connected","properties":{}}\n\n'],
+        blocks: ['data: {"id":"evt-1","type":"server.connected","properties":{}}\n\n'],
       });
     });
 

package/server/lib/event-stream/runtime.test.js

@@ -35,9 +35,9 @@ it('delivers oversized events live, but reports a replay gap instead of replayin
     fetchImpl: async (_url, options) => createSseResponse({
       signal: options.signal, holdOpen: true,
       blocks: [
-        'id: first\ndata: {"type":"first","properties":{}}\n\n',
-        `id: large\ndata: ${JSON.stringify({ type: 'large', properties: { text: '界'.repeat(1024) } })}\n\n`,
-        'id: last\ndata: {"type":"last","properties":{}}\n\n',
+        'data: {"id":"first","type":"first","properties":{}}\n\n',
+        `data: ${JSON.stringify({ id: 'large', type: 'large', properties: { text: '界'.repeat(1024) } })}\n\n`,
+        'data: {"id":"last","type":"last","properties":{}}\n\n',
       ],
     }),
   });
@@ -210,7 +210,7 @@ describe('message stream websocket runtime', () => {
           signal: options.signal,
           holdOpen: true,
           blocks: [
-            'id: evt-1\ndata: {"type":"server.connected","properties":{}}\n\n',
+            'data: {"id":"evt-1","type":"server.connected","data":{}}\n\n',
           ],
         });
       },
@@ -228,13 +228,13 @@ describe('message stream websocket runtime', () => {
     expect(secondSocket.sent).toContainEqual({ type: 'ready', scope: 'global' });
     expect(firstSocket.sent).toContainEqual({
       type: 'event',
-      payload: { type: 'server.connected', properties: {} },
+      payload: { id: 'evt-1', type: 'server.connected', data: {} },
       eventId: 'evt-1',
       directory: 'global',
     });
     expect(secondSocket.sent).toContainEqual({
       type: 'event',
-      payload: { type: 'server.connected', properties: {} },
+      payload: { id: 'evt-1', type: 'server.connected', data: {} },
       eventId: 'evt-1',
       directory: 'global',
     });
@@ -268,8 +268,8 @@ describe('message stream websocket runtime', () => {
             signal: options.signal,
             holdOpen: true,
             blocks: [
-              'id: evt-1\ndata: {"type":"server.connected","properties":{}}\n\n',
-              'id: evt-2\ndata: {"type":"session.updated","properties":{"directory":"/tmp/project"}}\n\n',
+              'data: {"id":"evt-1","type":"server.connected","data":{}}\n\n',
+              'data: {"id":"evt-2","type":"session.renamed","location":{"directory":"/tmp/project"},"data":{"sessionID":"s1","title":"t"}}\n\n',
             ],
           });
         }
@@ -296,7 +296,7 @@ describe('message stream websocket runtime', () => {
     expect(secondSocket.sent).toContainEqual({ type: 'ready', scope: 'global' });
     expect(secondSocket.sent).toContainEqual({
       type: 'event',
-      payload: { type: 'session.updated', properties: { directory: '/tmp/project' } },
+      payload: { id: 'evt-2', type: 'session.renamed', location: { directory: '/tmp/project' }, data: { sessionID: 's1', title: 't' } },
       eventId: 'evt-2',
       directory: '/tmp/project',
     });
@@ -328,7 +328,7 @@ describe('message stream websocket runtime', () => {
           signal: options.signal,
           holdOpen: true,
           blocks: [
-            'id: evt-1\ndata: {"type":"server.connected","properties":{}}\n\n',
+            'data: {"id":"evt-1","type":"server.connected","data":{}}\n\n',
           ],
         });
       },
@@ -488,7 +488,7 @@ describe('message stream websocket runtime', () => {
             signal: options.signal,
             holdOpen: true,
             blocks: [
-              'id: evt-1\ndata: {"type":"server.connected","properties":{}}\n\n',
+              'data: {"id":"evt-1","type":"server.connected","data":{}}\n\n',
             ],
           });
         }
@@ -497,7 +497,7 @@ describe('message stream websocket runtime', () => {
           signal: options.signal,
           holdOpen: true,
           blocks: [
-            'id: evt-2\ndata: {"type":"server.connected","properties":{}}\n\n',
+            'data: {"id":"evt-2","type":"server.connected","data":{}}\n\n',
           ],
         });
       },
@@ -534,7 +534,9 @@ describe('message stream websocket runtime', () => {
       buildOpenCodeUrl: (path) => `http://127.0.0.1:4096${path}`,
       getOpenCodeAuthHeaders: () => ({}),
       processForwardedEventPayload(payload, emitSynthetic) {
-        if (payload.type === 'session.updated') {
+        // The bridge forwards the RAW v2 payload; the synthetic frames the UI
+        // also expects are derived from it in `index.js`.
+        if (payload.type === 'session.renamed') {
           emitSynthetic({ type: 'openchamber:session-status', sessionID: 'ses_1' });
         }
       },
@@ -544,7 +546,7 @@ describe('message stream websocket runtime', () => {
         signal: options.signal,
         holdOpen: true,
         blocks: [
-          'id: evt-1\ndata: {"type":"session.updated","properties":{"directory":"/tmp/project"}}\n\n',
+          'data: {"id":"evt-1","type":"session.renamed","location":{"directory":"/tmp/project"},"data":{"sessionID":"s1","title":"t"}}\n\n',
         ],
       }),
     });
@@ -556,7 +558,7 @@ describe('message stream websocket runtime', () => {
 
     expect(socket.sent).toContainEqual({
       type: 'event',
-      payload: { type: 'session.updated', properties: { directory: '/tmp/project' } },
+      payload: { id: 'evt-1', type: 'session.renamed', location: { directory: '/tmp/project' }, data: { sessionID: 's1', title: 't' } },
       eventId: 'evt-1',
       directory: '/tmp/project',
     });