@opengeni/api-router 0.2.1 → 0.3.0

package/dist/app.js

@@ -14,7 +14,7 @@ import {
   validateToolRefs,
   withDefaultEnabledCapabilityMcpTools,
   workflowIdForSession
-} from "./chunk-XSYUDIX3.js";
+} from "./chunk-SVBM6RM6.js";
 export {
   allowedCorsOrigin,
   createApp,

package/dist/{chunk-XSYUDIX3.js → chunk-SVBM6RM6.js}

@@ -267,6 +267,7 @@ import { requireLimit as requireLimit8 } from "@opengeni/core";
 // src/mcp/server.ts
 import {
   CreateScheduledTaskRequest,
+  SessionMcpCredentialUpdateInput,
   WorkspaceEnvironmentVariableName,
   UpdateScheduledTaskRequest
 } from "@opengeni/contracts";
@@ -931,6 +932,9 @@ function registerWorkspaceOrchestrationTools(server, deps, grant, can, json) {
         goal: z4.unknown().optional(),
         resources: z4.array(z4.unknown()).optional(),
         tools: z4.array(z4.unknown()).optional(),
+        // Per-session third-party MCP servers. Credential header values are
+        // accepted only at create and never appear in responses/events.
+        mcpServers: z4.array(z4.unknown()).optional(),
         environmentId: z4.string().uuid().optional(),
         model: z4.string().min(1).optional(),
         reasoningEffort: z4.string().optional(),
@@ -989,12 +993,16 @@ function registerWorkspaceOrchestrationTools(server, deps, grant, can, json) {
       description: "Post a user message into an existing session; the session queues a turn and resumes if idle.",
       inputSchema: {
         sessionId: z4.string().uuid(),
-        text: z4.string().min(1)
+        text: z4.string().min(1),
+        // Header-value rotation only. URL/name/tool settings are immutable
+        // after create; core enforces mcp_servers:attach on this field.
+        mcpCredentialUpdates: z4.array(z4.unknown()).optional()
       }
-    }, async ({ sessionId, text }) => {
+    }, async ({ sessionId, text, mcpCredentialUpdates }) => {
       const { accepted, turn } = await acceptSessionUserMessage(deps, grant, grant.workspaceId, sessionId, {
         text,
-        toolsProvided: false
+        toolsProvided: false,
+        mcpCredentialUpdates: (mcpCredentialUpdates ?? []).map((update) => SessionMcpCredentialUpdateInput.parse(update))
       });
       return json({ event: accepted, turnId: turn.id });
     });
@@ -4257,7 +4265,7 @@ import {
   updatePtySessionActivity,
   updateQueuedSessionTurn
 } from "@opengeni/db";
-import { appendAndPublishEvents as appendAndPublishEvents4 } from "@opengeni/events";
+import { appendAndPublishEvents as appendAndPublishEvents4, coalesceSessionEventDeltas } from "@opengeni/events";
 
 // src/sandbox/channel-a.ts
 import { applyGitAuthPointerEnvironment, hasGitHubRepositorySelection, stableSandboxEnvironmentForRun } from "@opengeni/config";
@@ -4579,6 +4587,12 @@ function viewerHeartbeatIntervalMs(settings) {
 async function dropEstablishedHandle2(established) {
   void established;
 }
+function resolveActiveDesktopTransport(selfhostedActive, interactive) {
+  if (selfhostedActive) {
+    return { transport: "relay-frames", client: "frames", mode: "read-only" };
+  }
+  return { transport: "vnc-ws", client: "novnc", mode: interactive ? "interactive" : "read-only" };
+}
 async function mintDesktopStream(services, input) {
   const { db, settings, bus } = services;
   const { accountId, workspaceId, session } = input;
@@ -4883,7 +4897,7 @@ function viewerIdAsUuid(rawViewerId) {
 }
 
 // src/routes/sessions.ts
-import { settingsWithEnabledCapabilityMcpServers } from "@opengeni/core";
+import { settingsWithEnabledCapabilityMcpServers, settingsWithSessionMcpServerMetadata } from "@opengeni/core";
 import {
   normalizeResources,
   validateFileResources,
@@ -5138,9 +5152,16 @@ function registerSessionRoutes(app, deps) {
     await requireAccessGrant12(c, deps, workspaceId, "sessions:read");
     const sessionId = c.req.param("sessionId");
     await assertSessionExists(db, workspaceId, sessionId);
-    const after = Number(c.req.query("after") ?? 0);
-    const limit = Number(c.req.query("limit") ?? 500);
-    return c.json(await listSessionEvents3(db, workspaceId, sessionId, Number.isFinite(after) ? after : 0, Number.isFinite(limit) ? limit : 500));
+    const after = eventSequence(c.req.query("after"), 0);
+    const before = optionalEventSequence(c.req.query("before"));
+    const compact = compactEvents(c.req.query("compact"));
+    const limit = eventListLimit(c.req.query("limit"), compact ? 5e3 : 2e3);
+    const events = await listSessionEvents3(db, workspaceId, sessionId, {
+      after,
+      ...before !== void 0 ? { before } : {},
+      limit
+    });
+    return c.json(compact ? coalesceSessionEventDeltas(events) : events);
   });
   app.get("/v1/workspaces/:workspaceId/sessions/:sessionId/events/stream", async (c) => {
     const workspaceId = c.req.param("workspaceId");
@@ -5166,14 +5187,17 @@ function registerSessionRoutes(app, deps) {
     const existing = await requireQueuedTurnForApi(db, workspaceId, sessionId, turnId);
     const payload = UpdateSessionTurnRequest.parse(await c.req.json());
     assertConfiguredModel(settings, payload.model);
-    const runtimeSettings = await settingsWithEnabledCapabilityMcpServers(db, workspaceId, settings);
+    const session = await requireSession2(db, workspaceId, sessionId);
+    const runtimeSettings = settingsWithSessionMcpServerMetadata(
+      await settingsWithEnabledCapabilityMcpServers(db, workspaceId, settings),
+      session.mcpServers
+    );
     const resources = payload.resources !== void 0 ? normalizeResources(payload.resources) : existing.resources;
     const tools = payload.tools !== void 0 ? validateToolRefs(payload.tools, runtimeSettings) : existing.tools;
     if (resources.some((resource) => resource.kind === "file") && !objectStorage) {
       throw new HTTPException15(503, { message: "object storage is not configured" });
     }
     await validateFileResources(db, workspaceId, resources);
-    const session = await requireSession2(db, workspaceId, sessionId);
     await validateGitHubRepositorySelection(db, workspaceId, [...session.resources, ...resources]);
     const turn = await updateQueuedSessionTurn(db, workspaceId, turnId, {
       ...payload.prompt !== void 0 ? { prompt: payload.prompt.trim() } : {},
@@ -5234,6 +5258,7 @@ function registerSessionRoutes(app, deps) {
         toolsProvided: userMessagePayloadHasOwnProperty(rawEvent, "tools"),
         model: event.payload.model ?? null,
         reasoningEffort: event.payload.reasoningEffort ?? null,
+        mcpCredentialUpdates: event.payload.mcpCredentialUpdates ?? [],
         ...event.clientEventId ? { clientEventId: event.clientEventId } : {}
       });
       return c.json(accepted2, 202);
@@ -5361,19 +5386,13 @@ function registerSessionRoutes(app, deps) {
       } : {}
     });
     let responseCapabilities = capabilities;
-    if (session.activeSandboxId && capabilities.DesktopStream.transport === "vnc-ws") {
-      const activeSandbox = await getSandbox2(db, workspaceId, session.activeSandboxId);
-      if (activeSandbox?.kind === "selfhosted") {
-        responseCapabilities = {
-          ...capabilities,
-          DesktopStream: {
-            ...capabilities.DesktopStream,
-            transport: "relay-frames",
-            client: "frames",
-            mode: "read-only"
-          }
-        };
-      }
+    if (capabilities.DesktopStream.transport !== null) {
+      const activeSandbox = session.activeSandboxId ? await getSandbox2(db, workspaceId, session.activeSandboxId) : null;
+      const wire = resolveActiveDesktopTransport(activeSandbox?.kind === "selfhosted", settings.sandboxDesktopInteractive !== false);
+      responseCapabilities = {
+        ...capabilities,
+        DesktopStream: { ...capabilities.DesktopStream, ...wire }
+      };
     }
     return c.json(responseCapabilities);
   });
@@ -5497,8 +5516,13 @@ function registerSessionRoutes(app, deps) {
         streamToken: stream?.token ?? null,
         streamExpiresAt: stream?.expiresAt ?? null,
         resolution: stream?.resolution ?? null,
-        transport: stream ? "vnc-ws" : null,
-        client: stream ? "novnc" : null,
+        // Transport MUST match where the pixels were minted: a selfhosted-active box
+        // serves the RELAY framebuffer (relay-frames/frames), a Modal box serves noVNC
+        // (vnc-ws/novnc). Hardcoding vnc-ws here handed a machine's relay URL to the
+        // noVNC renderer (and vice-versa on the swap-away case) → "closed before it
+        // opened". Key off the SAME selfhostedActive the mint routed on.
+        transport: stream ? selfhostedActive ? "relay-frames" : "vnc-ws" : null,
+        client: stream ? selfhostedActive ? "frames" : "novnc" : null,
         // The REAL PTY terminal address (pty-ws), null when degraded.
         terminalUrl: terminal?.url ?? null,
         terminalToken: terminal?.token ?? null,
@@ -5727,6 +5751,33 @@ function registerSessionRoutes(app, deps) {
     return c.body(null, 204);
   });
 }
+function eventListLimit(raw, max = 2e3) {
+  const limit = Number(raw ?? 500);
+  if (!Number.isFinite(limit)) {
+    return 500;
+  }
+  return Math.min(max, Math.max(1, Math.floor(limit)));
+}
+function compactEvents(raw) {
+  return raw === "1" || raw === "true";
+}
+function eventSequence(raw, fallback) {
+  const sequence = Number(raw ?? fallback);
+  if (!Number.isFinite(sequence)) {
+    return fallback;
+  }
+  return Math.floor(sequence);
+}
+function optionalEventSequence(raw) {
+  if (raw === void 0) {
+    return void 0;
+  }
+  const sequence = Number(raw);
+  if (!Number.isFinite(sequence)) {
+    return void 0;
+  }
+  return Math.floor(sequence);
+}
 function hasOwnProperty(value, key) {
   return Boolean(value && typeof value === "object" && Object.prototype.hasOwnProperty.call(value, key));
 }
@@ -6328,4 +6379,4 @@ export {
   withDefaultEnabledCapabilityMcpTools,
   workflowIdForSession3 as workflowIdForSession
 };
-//# sourceMappingURL=chunk-XSYUDIX3.js.map
+//# sourceMappingURL=chunk-SVBM6RM6.js.map