@opengeni/api-router 0.12.0 → 0.12.2

package/dist/app.js

@@ -19,7 +19,7 @@ import {
   validateToolRefs,
   withDefaultEnabledCapabilityMcpTools,
   workflowIdForSession
-} from "./chunk-S2N4252E.js";
+} from "./chunk-3JR6L6NJ.js";
 export {
   API_MAX_REQUEST_BODY_BYTES,
   allowedCorsOrigin,

package/dist/{chunk-S2N4252E.js → chunk-3JR6L6NJ.js}

@@ -3,7 +3,8 @@ import {
   canonicalizeConfiguredModelId as canonicalizeConfiguredModelId2,
   configuredAllowedModels,
   configuredAllowedReasoningEfforts,
-  configuredModels as configuredModels2
+  configuredModels as configuredModels2,
+  withCodexCatalogProvider as withCodexCatalogProvider2
 } from "@opengeni/config";
 import {
   ClientConfig,
@@ -3049,6 +3050,19 @@ function registerToolspaceProxyTools(server, surface) {
   if (!surface) {
     return;
   }
+  if (surface.tools.length === 0) {
+    server.registerTool(
+      "__opengeni_empty_toolspace_surface__",
+      {
+        description: "Internal disabled placeholder for an empty Toolspace surface.",
+        inputSchema: z4.object({})
+      },
+      async () => ({
+        content: [{ type: "text", text: '{"unavailable":true}' }]
+      })
+    ).disable();
+    return;
+  }
   for (const tool of surface.tools) {
     server.registerTool(
       tool.name,
@@ -4887,13 +4901,25 @@ async function resolveToolListing(input) {
       sessionId,
       rootSessionId,
       turn: activeTurn
-    }).catch(() => null);
+    }).catch((error) => {
+      deps.observability?.warn("toolspace upstream connection failed", {
+        serverId,
+        ...toolspaceErrorAttributes(error)
+      });
+      return null;
+    });
     if (!connection) {
       aggregateBudget.replace(serverId, []);
       return;
     }
     try {
-      const listed = await connection.client.listTools(void 0, toolspaceRequestOptions(config)).catch(() => ({ tools: [] }));
+      const listed = await connection.client.listTools(void 0, toolspaceRequestOptions(config)).catch((error) => {
+        deps.observability?.warn("toolspace upstream tool list failed", {
+          serverId,
+          ...toolspaceErrorAttributes(error)
+        });
+        return { tools: [] };
+      });
       let boundedTools;
       try {
         boundedTools = assertMcpToolListWithinBounds(listed.tools);
@@ -4980,7 +5006,11 @@ async function settingsWithSessionMcpServersForToolspace(deps, workspaceId, sess
   };
 }
 async function connectToolspaceServer(input) {
-  const guardedFetch = guardedMcpFetch(input.deps.settings, undiciFetch);
+  const useBunNativeFetch = !!process.versions.bun;
+  const mcpFetchImpl = useBunNativeFetch ? globalThis.fetch.bind(globalThis) : undiciFetch;
+  const guardedFetch = guardedMcpFetch(input.deps.settings, mcpFetchImpl, {
+    ...useBunNativeFetch ? { pinResolvedDestination: false } : {}
+  });
   const baseFetch = input.config.connectionRef ? connectionBrokerFetch(guardedFetch, input) : guardedFetch;
   const client = new Client(
     { name: `opengeni-toolspace-${input.config.id}`, version: "1.0.0" },
@@ -5186,6 +5216,17 @@ function toolspaceAuditSummary(value) {
     sha256: createHash2("sha256").update(serialized).digest("hex")
   };
 }
+function toolspaceErrorAttributes(error) {
+  if (!(error instanceof Error)) {
+    return { errorClass: typeof error };
+  }
+  const code = error.code;
+  return {
+    errorClass: error.name,
+    ...typeof code === "string" ? { errorCode: code } : {},
+    ...error.message ? { errorMessage: error.message.replaceAll(/[\r\n]+/gu, " ").slice(0, 512) } : {}
+  };
+}
 async function reserveExactAttemptCall(deps, grant, authority) {
   const reservation = await reserveToolspaceCallForAttempt(deps.db, {
     accountId: grant.accountId,
@@ -13270,34 +13311,34 @@ function registerSessionRoutes(app, deps) {
         message: "durable interactive terminals require a session-home provider lease"
       });
     }
-    const process = await getRetainedProcess(db, {
+    const process2 = await getRetainedProcess(db, {
       workspaceId: ctx.workspaceId,
       sessionId: ctx.session.id,
       processId: pty.retainedProcessId
     });
-    if (!process || process.state !== "active" || process.ownerActorKind !== "direct" || process.accountId !== ctx.accountId || process.leaseId !== pty.leaseId || process.sandboxGroupId !== pty.sandboxGroupId || process.parentAdmissionId !== pty.openAdmissionId || process.leaseEpoch !== pty.leaseEpoch || process.providerBackend !== pty.providerBackend || process.providerInstanceId !== pty.providerInstanceId || process.routeKind !== pty.routeKind || process.routeTargetId !== pty.routeTargetId || process.routeEpoch !== pty.routeEpoch || process.providerSessionId !== pty.execSessionId || // Only a persistable home backend can currently be reconstructed by an
+    if (!process2 || process2.state !== "active" || process2.ownerActorKind !== "direct" || process2.accountId !== ctx.accountId || process2.leaseId !== pty.leaseId || process2.sandboxGroupId !== pty.sandboxGroupId || process2.parentAdmissionId !== pty.openAdmissionId || process2.leaseEpoch !== pty.leaseEpoch || process2.providerBackend !== pty.providerBackend || process2.providerInstanceId !== pty.providerInstanceId || process2.routeKind !== pty.routeKind || process2.routeTargetId !== pty.routeTargetId || process2.routeEpoch !== pty.routeEpoch || process2.providerSessionId !== pty.execSessionId || // Only a persistable home backend can currently be reconstructed by an
     // API request without consulting the mutable active pointer.
-    process.routeTargetId !== null || handle.lease.id !== process.leaseId || handle.lease.sandboxGroupId !== process.sandboxGroupId || handle.lease.leaseEpoch !== process.leaseEpoch || handle.lease.backend !== process.providerBackend || handle.lease.instanceId !== process.providerInstanceId) {
+    process2.routeTargetId !== null || handle.lease.id !== process2.leaseId || handle.lease.sandboxGroupId !== process2.sandboxGroupId || handle.lease.leaseEpoch !== process2.leaseEpoch || handle.lease.backend !== process2.providerBackend || handle.lease.instanceId !== process2.providerInstanceId) {
       throw new HTTPException22(409, {
         message: "pty retained-process identity is stale; reopen the terminal"
       });
     }
     handle.routingSession.adoptRetainedProcess({
-      process: { id: process.id, providerSessionId: process.providerSessionId },
+      process: { id: process2.id, providerSessionId: process2.providerSessionId },
       backend: {
         sandboxId: null,
-        leaseEpoch: process.leaseEpoch,
-        providerInstanceId: process.providerInstanceId,
-        activeEpoch: process.routeEpoch
+        leaseEpoch: process2.leaseEpoch,
+        providerInstanceId: process2.providerInstanceId,
+        activeEpoch: process2.routeEpoch
       }
     });
-    return process;
+    return process2;
   };
-  const emitPtyExited = async (ctx, ptyId, process) => {
+  const emitPtyExited = async (ctx, ptyId, process2) => {
     const exited = {
       ptyId,
-      exitCode: process.exitCode,
-      reason: process.state === "exited" ? "exit" : "lost"
+      exitCode: process2.exitCode,
+      reason: process2.state === "exited" ? "exit" : "lost"
     };
     await appendAndPublishEvents5(db, bus, ctx.workspaceId, ctx.session.id, [
       { type: "terminal.pty.exited", payload: exited }
@@ -14919,12 +14960,12 @@ function registerSessionRoutes(app, deps) {
       const opened = await service.ptyOpen(req, ptyId);
       const execSessionId = opened.execSessionId;
       const retained = execSessionId === null ? null : handle.routingSession.retainedProcessIdentity(execSessionId);
-      const process = retained ? await getRetainedProcess(db, {
+      const process2 = retained ? await getRetainedProcess(db, {
         workspaceId: ctx.workspaceId,
         sessionId: ctx.session.id,
         processId: retained.id
       }) : null;
-      if (execSessionId === null || !retained || !process || process.state !== "active" || process.ownerActorKind !== "direct" || process.providerSessionId !== execSessionId || process.routeTargetId !== null || process.leaseId !== handle.lease.id || process.sandboxGroupId !== handle.lease.sandboxGroupId || process.leaseEpoch !== handle.lease.leaseEpoch || process.providerBackend !== handle.lease.backend || process.providerInstanceId !== handle.lease.instanceId) {
+      if (execSessionId === null || !retained || !process2 || process2.state !== "active" || process2.ownerActorKind !== "direct" || process2.providerSessionId !== execSessionId || process2.routeTargetId !== null || process2.leaseId !== handle.lease.id || process2.sandboxGroupId !== handle.lease.sandboxGroupId || process2.leaseEpoch !== handle.lease.leaseEpoch || process2.providerBackend !== handle.lease.backend || process2.providerInstanceId !== handle.lease.instanceId) {
         if (execSessionId !== null && handle.routingSession.hasRetainedProcess(execSessionId)) {
           await drainOpenedPty(handle, execSessionId);
         }
@@ -14933,17 +14974,17 @@ function registerSessionRoutes(app, deps) {
         });
       }
       const identity = {
-        leaseId: process.leaseId,
-        sandboxGroupId: process.sandboxGroupId,
-        retainedProcessId: process.id,
-        openAdmissionId: process.parentAdmissionId,
-        execSessionId: process.providerSessionId,
-        leaseEpoch: process.leaseEpoch,
-        providerBackend: process.providerBackend,
-        providerInstanceId: process.providerInstanceId,
-        routeKind: process.routeKind,
-        routeTargetId: process.routeTargetId,
-        routeEpoch: process.routeEpoch
+        leaseId: process2.leaseId,
+        sandboxGroupId: process2.sandboxGroupId,
+        retainedProcessId: process2.id,
+        openAdmissionId: process2.parentAdmissionId,
+        execSessionId: process2.providerSessionId,
+        leaseEpoch: process2.leaseEpoch,
+        providerBackend: process2.providerBackend,
+        providerInstanceId: process2.providerInstanceId,
+        routeKind: process2.routeKind,
+        routeTargetId: process2.routeTargetId,
+        routeEpoch: process2.routeEpoch
       };
       try {
         await insertPtySession(db, {
@@ -16489,18 +16530,19 @@ function createApp(deps) {
   );
   app.get("/v1/config/client", (c) => {
     c.header("cache-control", "no-store");
+    const catalogSettings = deps.settings.codexSubscriptionEnabled ? withCodexCatalogProvider2(deps.settings) : deps.settings;
     return c.json(
       ClientConfig.parse({
         deploymentRevision: deps.settings.deploymentRevision,
         apiContractRevision: OPENGENI_API_CONTRACT_REVISION,
         ...deps.settings.serverVersion ? { serverVersion: deps.settings.serverVersion } : {},
-        defaultModel: canonicalizeConfiguredModelId2(deps.settings, deps.settings.openaiModel),
-        allowedModels: configuredAllowedModels(deps.settings),
+        defaultModel: canonicalizeConfiguredModelId2(catalogSettings, catalogSettings.openaiModel),
+        allowedModels: configuredAllowedModels(catalogSettings),
         // Provider-grouped model list for the picker. configuredModels() carries the
         // union of the built-in allow-list and every registry provider's models, in
         // selection order (default model first); project each to the client-safe
         // ClientModel shape (ConfiguredModel.providerId → ClientModel.provider).
-        models: configuredModels2(deps.settings).map(projectClientModel),
+        models: configuredModels2(catalogSettings).map(projectClientModel),
         defaultReasoningEffort: deps.settings.openaiReasoningEffort,
         allowedReasoningEfforts: configuredAllowedReasoningEfforts(deps.settings),
         mcpServers: deps.settings.mcpServers.map((server) => ({
@@ -17179,4 +17221,4 @@ export {
   withDefaultEnabledCapabilityMcpTools,
   workflowIdForSession2 as workflowIdForSession
 };
-//# sourceMappingURL=chunk-S2N4252E.js.map
+//# sourceMappingURL=chunk-3JR6L6NJ.js.map