@opengeni/api-router 2.6.4 → 2.8.1-canary.0

package/src/routes/sessions.ts

@@ -12,6 +12,7 @@ import {
   GatewayRealtimeConnectRequest,
   ClientSessionEvent,
   CompactSessionContextRequest,
+  CreateSessionRequest,
   DeleteSessionQueueItemRequest,
   EditSessionQueueItemRequest,
   EndSessionRealtimeRequest,
@@ -47,6 +48,7 @@ import {
   SessionEventSemanticClass,
   SessionEventType,
   SessionMcpServerId,
+  SaveNewSessionDraftRequest,
   compactSessionEventResult,
   sessionEventLatestClassToSemanticClass,
   SaveComposerDraftRequest,
@@ -195,7 +197,7 @@ import {
 import {
   appendAndPublishEvents,
   boundSessionEventHttpPage,
-  coalesceSessionEventDeltas,
+  coalesceSessionEventDeltasWithCoverage,
   publishDurableSessionEvents,
 } from "@opengeni/events";
 import {
@@ -231,6 +233,7 @@ import {
   requirePermission,
   requireSessionAuthorization,
   requireSessionAuthorizationListScope,
+  resolveWorkspaceCatalogSettings,
   withResolvedSessionAuthorization,
   SESSION_AUTHORIZATION_DEFAULT_REAUTHORIZE_MS,
   SessionAuthorizationDeniedError,
@@ -549,6 +552,7 @@ export function registerSessionRoutes(app: Hono, deps: SessionRouteDeps): void {
     }
     let session: Session;
     try {
+      CreateSessionRequest.parse(payload);
       session = await createSessionForRequest(deps, grant, workspaceId, payload, authorization);
     } catch (error) {
       return sessionCreateErrorResponse(c, error);
@@ -562,7 +566,13 @@ export function registerSessionRoutes(app: Hono, deps: SessionRouteDeps): void {
   app.get("/v1/workspaces/:workspaceId/new-session-draft", async (c) => {
     const workspaceId = c.req.param("workspaceId");
     const grant = await requireAccessGrant(c, deps, workspaceId, "sessions:read");
-    return c.json(await getActorNewSessionDraft({ settings, db }, grant, workspaceId));
+    const catalog = await resolveWorkspaceCatalogSettings(db, settings, {
+      accountId: grant.accountId,
+      workspaceId,
+    });
+    return c.json(
+      await getActorNewSessionDraft({ settings: catalog.settings, db }, grant, workspaceId),
+    );
   });
 
   app.put("/v1/workspaces/:workspaceId/new-session-draft", async (c) => {
@@ -587,9 +597,14 @@ export function registerSessionRoutes(app: Hono, deps: SessionRouteDeps): void {
       );
     }
     try {
+      SaveNewSessionDraftRequest.parse(payload);
+      const catalog = await resolveWorkspaceCatalogSettings(db, settings, {
+        accountId: grant.accountId,
+        workspaceId,
+      });
       return c.json(
         await saveActorNewSessionDraft(
-          { settings, db, objectStorage },
+          { settings: catalog.settings, db, objectStorage },
           grant,
           workspaceId,
           payload,
@@ -2606,10 +2621,16 @@ export function registerSessionRoutes(app: Hono, deps: SessionRouteDeps): void {
       c.header("X-OpenGeni-Covered-Last", String(result.coveredSequence.last));
       return c.json(result);
     }
-    const projected = compact ? coalesceSessionEventDeltas(events) : events;
+    const compactProjection = compact ? coalesceSessionEventDeltasWithCoverage(events) : null;
+    const projected = compactProjection?.events ?? events;
+    const forensicExact =
+      !compact && mode === "forensic" && payloadMode === "full" && dbPage.fullPayloadsExact;
     const page = boundSessionEventHttpPage(projected, {
       direction,
-      eventProjection: mode === "forensic" && payloadMode === "full" ? "exact" : "bounded",
+      eventProjection: forensicExact ? "exact" : "bounded",
+      ...(compactProjection
+        ? { coveredThroughBySequence: compactProjection.coveredThroughBySequence }
+        : {}),
     });
     const hasMore = dbPage.hasMore || page.truncated;
     c.header("X-OpenGeni-Page-Bytes", String(page.bytes));
@@ -2619,9 +2640,14 @@ export function registerSessionRoutes(app: Hono, deps: SessionRouteDeps): void {
     c.header("X-OpenGeni-Event-Mode", mode);
     c.header("X-OpenGeni-Event-Direction", direction);
     c.header("X-OpenGeni-Payload-Mode", payloadMode);
-    c.header("X-OpenGeni-Forensic-Exact", String(mode === "forensic" && payloadMode === "full"));
+    c.header("X-OpenGeni-Forensic-Exact", String(forensicExact));
     const coveredFirst = page.events[0]?.sequence;
-    const coveredLast = page.events.at(-1)?.sequence;
+    const coveredLastEvent = page.events.at(-1);
+    const coveredLast =
+      coveredLastEvent === undefined
+        ? undefined
+        : (compactProjection?.coveredThroughBySequence.get(coveredLastEvent.sequence) ??
+          coveredLastEvent.sequence);
     if (coveredFirst !== undefined) c.header("X-OpenGeni-Covered-First", String(coveredFirst));
     if (coveredLast !== undefined) c.header("X-OpenGeni-Covered-Last", String(coveredLast));
     const truncatedBy = page.truncated ? "http_bytes" : dbPage.truncatedBy;
@@ -2898,28 +2924,33 @@ export function registerSessionRoutes(app: Hono, deps: SessionRouteDeps): void {
     const sessionId = c.req.param("sessionId");
     await assertSessionExists(db, workspaceId, sessionId);
     const payload = parseSteerSessionAdmission(await c.req.json().catch(() => null));
-    const result = await acceptSessionUserMessage(deps, grant, workspaceId, sessionId, {
-      text: payload.text,
-      annotations: payload.annotations,
-      modelContext: payload.modelContext ?? null,
-      resources: payload.resources,
-      model: payload.model ?? null,
-      reasoningEffort: payload.reasoningEffort ?? null,
-      latencyMode: payload.latencyMode ?? null,
-      mcpCredentialUpdates: payload.mcpCredentialUpdates ?? [],
-      connectionAuthorities: payload.connectionAuthorities,
-      ...(payload.personalResourceAttachment
-        ? { personalResourceAttachment: payload.personalResourceAttachment }
-        : {}),
-      authorization,
-      delivery: "steer",
-      origin: "human",
-      ...(payload.controlEtag !== undefined ? { controlEtag: payload.controlEtag } : {}),
-      ...(payload.expectedDraftRevision !== undefined
-        ? { expectedDraftRevision: payload.expectedDraftRevision }
-        : {}),
-      ...(payload.clientEventId ? { clientEventId: payload.clientEventId } : {}),
-    });
+    let result: Awaited<ReturnType<typeof acceptSessionUserMessage>>;
+    try {
+      result = await acceptSessionUserMessage(deps, grant, workspaceId, sessionId, {
+        text: payload.text,
+        annotations: payload.annotations,
+        modelContext: payload.modelContext ?? null,
+        resources: payload.resources,
+        model: payload.model ?? null,
+        reasoningEffort: payload.reasoningEffort ?? null,
+        latencyMode: payload.latencyMode ?? null,
+        mcpCredentialUpdates: payload.mcpCredentialUpdates ?? [],
+        connectionAuthorities: payload.connectionAuthorities,
+        ...(payload.personalResourceAttachment
+          ? { personalResourceAttachment: payload.personalResourceAttachment }
+          : {}),
+        authorization,
+        delivery: "steer",
+        origin: "human",
+        ...(payload.controlEtag !== undefined ? { controlEtag: payload.controlEtag } : {}),
+        ...(payload.expectedDraftRevision !== undefined
+          ? { expectedDraftRevision: payload.expectedDraftRevision }
+          : {}),
+        ...(payload.clientEventId ? { clientEventId: payload.clientEventId } : {}),
+      });
+    } catch (error) {
+      return commandConflictResponse(c, error);
+    }
     return c.json(result, 202);
   });
 
@@ -2975,29 +3006,34 @@ export function registerSessionRoutes(app: Hono, deps: SessionRouteDeps): void {
       }
     }
     if (event.type === "user.message") {
-      const { accepted } = await acceptSessionUserMessage(deps, grant, workspaceId, sessionId, {
-        text: event.payload.text,
-        annotations: event.payload.annotations,
-        modelContext: event.payload.modelContext ?? null,
-        resources: event.payload.resources ?? [],
-        model: event.payload.model ?? null,
-        reasoningEffort: event.payload.reasoningEffort ?? null,
-        latencyMode: event.payload.latencyMode ?? null,
-        mcpCredentialUpdates: event.payload.mcpCredentialUpdates ?? [],
-        connectionAuthorities: event.payload.connectionAuthorities,
-        ...(event.payload.personalResourceAttachment
-          ? { personalResourceAttachment: event.payload.personalResourceAttachment }
-          : {}),
-        authorization,
-        ...(event.payload.controlEtag !== undefined
-          ? { controlEtag: event.payload.controlEtag }
-          : {}),
-        ...(event.payload.expectedDraftRevision !== undefined
-          ? { expectedDraftRevision: event.payload.expectedDraftRevision }
-          : {}),
-        ...(event.clientEventId ? { clientEventId: event.clientEventId } : {}),
-      });
-      return c.json(accepted, 202);
+      let result: Awaited<ReturnType<typeof acceptSessionUserMessage>>;
+      try {
+        result = await acceptSessionUserMessage(deps, grant, workspaceId, sessionId, {
+          text: event.payload.text,
+          annotations: event.payload.annotations,
+          modelContext: event.payload.modelContext ?? null,
+          resources: event.payload.resources ?? [],
+          model: event.payload.model ?? null,
+          reasoningEffort: event.payload.reasoningEffort ?? null,
+          latencyMode: event.payload.latencyMode ?? null,
+          mcpCredentialUpdates: event.payload.mcpCredentialUpdates ?? [],
+          connectionAuthorities: event.payload.connectionAuthorities,
+          ...(event.payload.personalResourceAttachment
+            ? { personalResourceAttachment: event.payload.personalResourceAttachment }
+            : {}),
+          authorization,
+          ...(event.payload.controlEtag !== undefined
+            ? { controlEtag: event.payload.controlEtag }
+            : {}),
+          ...(event.payload.expectedDraftRevision !== undefined
+            ? { expectedDraftRevision: event.payload.expectedDraftRevision }
+            : {}),
+          ...(event.clientEventId ? { clientEventId: event.clientEventId } : {}),
+        });
+      } catch (error) {
+        return commandConflictResponse(c, error);
+      }
+      return c.json(result.accepted, 202);
     }
 
     if (event.type === "user.approvalDecision") {

package/src/routes/supergrok.ts

@@ -552,8 +552,9 @@ export function registerSuperGrokRoutes(app: Hono, deps: ApiRouteDeps): void {
     } catch {
       valid = false;
     }
-    const catalog = valid
-      ? configuredModels(withXaiSubscriptionCatalogProvider(deps.settings))
+    const catalogSettings = valid ? (await deps.resolveCatalogSettings()).settings : null;
+    const catalog = catalogSettings
+      ? configuredModels(withXaiSubscriptionCatalogProvider(catalogSettings))
           .filter(
             (model) =>
               model.credentialSource.kind === "connected_subscription" &&