@openchambery/web 1.19.22-beta.1 → 2.0.0-beta.3

package/server/lib/session-turn-pages/routes.js

@@ -1,4 +1,4 @@
-import { createOpencodeClient } from '@opencode-ai/sdk/v2';
+import { makeOpenCodeV2Client } from '../opencode/v2-client.js';
 import { projectMessageSummaryDiffCounts } from '../event-stream/diff-summary.js';
 import {
   projectMessagesPayloadForReasoning,
@@ -18,6 +18,10 @@ import {
   projectSlimParts,
   SLIM_PARTS_PROJECTION,
 } from './service.js';
+import {
+  projectSessionMessage,
+  projectSessionMessageRecords as projectRecords,
+} from './session-message-projection.js';
 
 const TURNS_MIN = 1;
 const TURNS_MAX = 10;
@@ -210,10 +214,57 @@ const requestSignal = (req, res) => {
   return controller.signal;
 };
 
+/**
+ * Host outbound order: normalize → slim/L1 bounds → reasoning strip.
+ * Slim/reasoning must run on `{info, parts}` so native `content` cannot
+ * rebuild filtered parts or leak through info expansion.
+ */
+const projectTurnPageRecords = (records, includeReasoning) =>
+  projectMessagesPayloadForReasoning(projectSlimParts(projectRecords(records)), includeReasoning);
+
+const projectReconcileRecords = (records, includeReasoning) =>
+  projectMessagesPayloadForReasoning(
+    projectMessageDiffSummaries(projectRecords(records)),
+    includeReasoning,
+  );
+
+const createV2FetchPage = ({ buildOpenCodeUrl, getOpenCodeAuthHeaders, logger }) => {
+  return async ({ sessionID, before, limit, signal }) => {
+    const baseUrl = buildOpenCodeUrl('/', '').replace(/\/$/, '');
+    const headers = typeof getOpenCodeAuthHeaders === 'function' ? getOpenCodeAuthHeaders() : {};
+    const client = makeOpenCodeV2Client({ baseUrl, authHeaders: headers });
+
+    // Upstream rejects `order` together with `cursor` (400); the cursor
+    // already encodes the desc direction of the first page.
+    const result = await client.message.list({
+      sessionID,
+      ...(Number.isFinite(limit) ? { limit } : {}),
+      ...(typeof before === 'string' && before.length > 0 ? { cursor: before } : { order: 'desc' }),
+    }, { signal });
+
+    const items = Array.isArray(result?.data) ? result.data : null;
+    if (!items) {
+      logger?.warn?.('[session-turn-pages] message.list malformed payload');
+      const error = new Error('upstream');
+      error.code = 'upstream';
+      throw error;
+    }
+
+    const next = result?.cursor?.next;
+    const nextCursor = typeof next === 'string' && next.length > 0 ? next : null;
+
+    return {
+      records: items.slice().reverse(),
+      nextCursor,
+      complete: nextCursor == null,
+    };
+  };
+};
+
 const createSdkClient = ({ buildOpenCodeUrl, getOpenCodeAuthHeaders }) => {
   const baseUrl = buildOpenCodeUrl('/', '').replace(/\/$/, '');
   const headers = typeof getOpenCodeAuthHeaders === 'function' ? getOpenCodeAuthHeaders() : {};
-  return createOpencodeClient({ baseUrl, headers });
+  return makeOpenCodeV2Client({ baseUrl, authHeaders: headers });
 };
 
 const throwUpstream = (logger, label) => {
@@ -223,89 +274,86 @@ const throwUpstream = (logger, label) => {
   throw error;
 };
 
-const createSdkFetchPage = ({ buildOpenCodeUrl, getOpenCodeAuthHeaders, logger }) => {
-  return async ({ sessionID, directory, before, limit, signal }) => {
-    const client = createSdkClient({ buildOpenCodeUrl, getOpenCodeAuthHeaders });
-
-    const result = await client.session.messages({
-      sessionID,
-      ...(typeof directory === 'string' && directory.length > 0 ? { directory } : {}),
-      ...(Number.isFinite(limit) ? { limit } : {}),
-      ...(typeof before === 'string' && before.length > 0 ? { before } : {}),
-    }, { signal });
-
-    if (result?.error) {
-      throwUpstream(logger, '[session-turn-pages] session.messages SDK error');
-    }
-
-    const data = result?.data;
-    const records = Array.isArray(data)
-      ? data
-      : Array.isArray(data?.items)
-        ? data.items
-        : null;
-    if (!records) {
-      throwUpstream(logger, '[session-turn-pages] session.messages malformed payload');
-    }
-
-    const headerCursor = result?.response?.headers?.get?.('x-next-cursor');
-    const nextCursor = typeof headerCursor === 'string' && headerCursor.length > 0
-      ? headerCursor
-      : null;
+const getHttpStatus = (error) => {
+  const candidates = [error?.cause?.status, error?.status, error?.response?.status, error?.statusCode];
+  for (const value of candidates) {
+    if (Number.isFinite(value)) return value;
+  }
+  return undefined;
+};
 
-    return {
-      records,
-      nextCursor,
-      complete: nextCursor == null,
-    };
-  };
+/**
+ * Real `@opencode/client` throws declared JSON bodies with `_tag`
+ * (e.g. MessageNotFoundError) — no HTTP status on the object. Also accept
+ * legacy status/code shapes from tests and older surfaces.
+ */
+const isNotFoundError = (error) => {
+  if (!error || typeof error !== 'object') return false;
+  const tag = error._tag ?? error.name;
+  if (tag === 'MessageNotFoundError' || tag === 'SessionNotFoundError') return true;
+  if (getHttpStatus(error) === 404) return true;
+  const code = error.code ?? error.type ?? error.error?.code ?? error.error?.type ?? error.error?._tag;
+  return code === 'not_found'
+    || code === 'NotFound'
+    || code === 'MessageNotFoundError'
+    || code === 'SessionNotFoundError';
 };
 
+const isAbortError = (error) => (
+  error?.name === 'AbortError'
+  || error?.code === 'aborted'
+  || error?.cause?.name === 'AbortError'
+);
+
 const createSdkFetchMessage = ({ buildOpenCodeUrl, getOpenCodeAuthHeaders, logger }) => {
-  return async ({ sessionID, messageID, directory, signal }) => {
+  return async ({ sessionID, messageID, signal }) => {
     const client = createSdkClient({ buildOpenCodeUrl, getOpenCodeAuthHeaders });
-    const result = await client.session.message({
-      sessionID,
-      messageID,
-      ...(typeof directory === 'string' && directory.length > 0 ? { directory } : {}),
-    }, { signal });
-
-    if (result?.error) {
-      const status = result?.response?.status;
-      if (status === 404) {
-        const error = new Error('not_found');
-        error.code = 'not_found';
-        throw error;
+    let result;
+    try {
+      result = await client.session.message({ sessionID, messageID }, { signal });
+    } catch (error) {
+      // Preserve abort so routes map 499; never fold into upstream 502.
+      if (isAbortError(error) || signal?.aborted) throw error;
+      if (isNotFoundError(error)) {
+        const notFound = new Error('not_found');
+        notFound.code = 'not_found';
+        throw notFound;
       }
       throwUpstream(logger, '[session-turn-pages] session.message SDK error');
     }
 
-    const data = result?.data;
+    const data = result?.data ?? result;
     if (!data || typeof data !== 'object' || Array.isArray(data)) {
       throwUpstream(logger, '[session-turn-pages] session.message malformed payload');
     }
-    return data;
+    const projected = projectSessionMessage(data);
+    // Control rows (idle / model-switched) are not chat messages.
+    if (!projected || !projected.info) {
+      const notFound = new Error('not_found');
+      notFound.code = 'not_found';
+      throw notFound;
+    }
+    return projected;
   };
 };
 
+/**
+ * L3 diff source. v2 SessionMessageInfo has no summary.diffs; keep failure
+ * explicit until the parent lands an authoritative per-message diff API.
+ * Do not substitute working-tree / vcs.diff here.
+ */
 const createSdkFetchDiff = ({ buildOpenCodeUrl, getOpenCodeAuthHeaders, logger }) => {
   return async ({ sessionID, messageID, directory, signal }) => {
-    const client = createSdkClient({ buildOpenCodeUrl, getOpenCodeAuthHeaders });
-    const result = await client.session.diff({
-      sessionID,
-      messageID,
-      ...(typeof directory === 'string' && directory.length > 0 ? { directory } : {}),
-    }, { signal });
-
-    if (result?.error) {
-      throwUpstream(logger, '[session-changes] session.diff SDK error');
-    }
-
-    const data = result?.data;
-    if (!Array.isArray(data)) {
-      throwUpstream(logger, '[session-changes] session.diff malformed payload');
+    const payload = await createSdkFetchMessage({
+      buildOpenCodeUrl,
+      getOpenCodeAuthHeaders,
+      logger,
+    })({ sessionID, messageID, directory, signal });
+    const diffs = payload?.info?.summary?.diffs;
+    if (!Array.isArray(diffs)) {
+      throwUpstream(logger, '[session-changes] session.message summary.diffs unavailable (L3 source pending)');
     }
-    return data;
+    return diffs;
   };
 };
 
@@ -441,7 +489,7 @@ export const registerSessionTurnPageRoutes = (app, dependencies = {}) => {
 
   const needsDefaultFetch = !injectedService || !injectedReconcileService;
   const defaultFetchPage = needsDefaultFetch
-    ? createSdkFetchPage({ buildOpenCodeUrl, getOpenCodeAuthHeaders, logger })
+    ? createV2FetchPage({ buildOpenCodeUrl, getOpenCodeAuthHeaders, logger })
     : null;
 
   const service = injectedService ?? createSessionTurnPageService({
@@ -514,8 +562,8 @@ export const registerSessionTurnPageRoutes = (app, dependencies = {}) => {
       }
 
       const includeReasoning = readIncludeReasoningQuery(req.query);
-      const records = projectMessagesPayloadForReasoning(
-        projectMessageDiffSummaries(Array.isArray(result.records) ? result.records : []),
+      const records = projectReconcileRecords(
+        Array.isArray(result.records) ? result.records : [],
         includeReasoning,
       );
 
@@ -609,10 +657,10 @@ export const registerSessionTurnPageRoutes = (app, dependencies = {}) => {
 
       // Turn-page responses (first packet and prepend) share slim-v1.
       // Reconcile stays on the other route and keeps full parts.
-      // includeReasoning=false drops type=reasoning parts after slim projection.
+      // Normalize native SessionMessageInfo first, then slim, then reasoning strip.
       const includeReasoning = readIncludeReasoningQuery(req.query);
-      const records = projectMessagesPayloadForReasoning(
-        projectSlimParts(result.records),
+      const records = projectTurnPageRecords(
+        Array.isArray(result.records) ? result.records : [],
         includeReasoning,
       );
       return res.status(200).json({
@@ -673,13 +721,13 @@ export const registerSessionTurnPageRoutes = (app, dependencies = {}) => {
         projectMessagesPayloadForReasoning(projectExactMessagePayload(payload), includeReasoning),
       );
     } catch (error) {
-      if (error?.name === 'AbortError' || error?.code === 'aborted') {
+      if (isAbortError(error) || error?.code === 'aborted') {
         if (!res.headersSent) {
           return res.status(499).json({ error: SAFE_ERRORS.aborted });
         }
         return undefined;
       }
-      if (error?.code === 'not_found') {
+      if (error?.code === 'not_found' || isNotFoundError(error)) {
         if (!res.headersSent) {
           return res.status(404).json({ error: 'not found', code: 'not_found' });
         }