@opengeni/api-router 0.12.1 → 0.12.2

package/dist/index.js

@@ -1,6 +1,6 @@
 import {
   createApp
-} from "./chunk-S2N4252E.js";
+} from "./chunk-3JR6L6NJ.js";
 
 // src/index.ts
 import {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeni/api-router",
-  "version": "0.12.1",
+  "version": "0.12.2",
   "description": "OpenGeni HTTP surface: the Hono adapter/router (createApp), routes, MCP HTTP transport, and HTTP access adapters over @opengeni/core. An engine-distribution surface — its runtime closure includes engine-internal packages.",
   "license": "Apache-2.0",
   "repository": {
@@ -46,14 +46,14 @@
     "@opengeni/codex": "^0.2.7",
     "@opengeni/config": "^0.7.8",
     "@opengeni/contracts": "^0.20.1",
-    "@opengeni/core": "^0.12.1",
+    "@opengeni/core": "^0.12.2",
     "@opengeni/db": "^0.13.1",
     "@opengeni/documents": "^0.2.38",
     "@opengeni/events": "^0.3.29",
     "@opengeni/github": "^0.3.20",
     "@opengeni/network": "^0.1.1",
     "@opengeni/observability": "^0.3.0",
-    "@opengeni/runtime": "^0.13.12",
+    "@opengeni/runtime": "^0.13.13",
     "@opengeni/storage": "^0.2.32",
     "@temporalio/client": "^1.17.0",
     "better-auth": "^1.6.14",

package/src/app.ts

@@ -3,6 +3,7 @@ import {
   configuredAllowedModels,
   configuredAllowedReasoningEfforts,
   configuredModels,
+  withCodexCatalogProvider,
 } from "@opengeni/config";
 import {
   ClientConfig,
@@ -322,18 +323,21 @@ export function createApp(deps: AppDependencies): Hono {
 
   app.get("/v1/config/client", (c) => {
     c.header("cache-control", "no-store");
+    const catalogSettings = deps.settings.codexSubscriptionEnabled
+      ? withCodexCatalogProvider(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: canonicalizeConfiguredModelId(deps.settings, deps.settings.openaiModel),
-        allowedModels: configuredAllowedModels(deps.settings),
+        defaultModel: canonicalizeConfiguredModelId(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: configuredModels(deps.settings).map(projectClientModel),
+        models: configuredModels(catalogSettings).map(projectClientModel),
         defaultReasoningEffort: deps.settings.openaiReasoningEffort,
         allowedReasoningEfforts: configuredAllowedReasoningEfforts(deps.settings),
         mcpServers: deps.settings.mcpServers.map((server) => ({

package/src/mcp/server.ts

@@ -776,6 +776,26 @@ function registerToolspaceProxyTools(server: McpServer, surface: ToolspaceMcpSur
   if (!surface) {
     return;
   }
+  // McpServer installs its tools/list handler lazily on the first registered
+  // tool. A legitimate empty Toolspace surface (no selected proxyable servers,
+  // no active turn, or all optional upstreams unavailable) must therefore seed
+  // and disable one invisible tool; otherwise `ogtool list` receives JSON-RPC
+  // "Method not found" instead of the valid `{ tools: [] }` response.
+  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" as const, text: '{"unavailable":true}' }],
+        }),
+      )
+      .disable();
+    return;
+  }
   for (const tool of surface.tools) {
     server.registerTool(
       tool.name,

package/src/mcp/toolspace.ts

@@ -367,7 +367,13 @@ 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;
@@ -375,7 +381,13 @@ async function resolveToolListing(input: {
     try {
       const listed = await connection.client
         .listTools(undefined, toolspaceRequestOptions(config))
-        .catch(() => ({ tools: [] }));
+        .catch((error) => {
+          deps.observability?.warn("toolspace upstream tool list failed", {
+            serverId,
+            ...toolspaceErrorAttributes(error),
+          });
+          return { tools: [] };
+        });
       let boundedTools: readonly McpTool[];
       try {
         boundedTools = assertMcpToolListWithinBounds(listed.tools as McpTool[]) as McpTool[];
@@ -494,7 +506,18 @@ async function connectToolspaceServer(input: {
   rootSessionId: string;
   turn: SessionTurn;
 }): Promise<ConnectedToolspaceServer> {
-  const guardedFetch = guardedMcpFetch(input.deps.settings, undiciFetch);
+  // npm Undici's dispatcher transport is not reliable under Bun. The worker's
+  // model-visible MCP path already uses Bun's native fetch while retaining the
+  // same pre-request destination-policy check; Toolspace must do the same or an
+  // embedded Bun API can expose a server to the model while silently dropping
+  // that exact server from `ogtool list`.
+  const useBunNativeFetch = !!process.versions.bun;
+  const mcpFetchImpl: FetchLike = useBunNativeFetch
+    ? globalThis.fetch.bind(globalThis)
+    : undiciFetch;
+  const guardedFetch = guardedMcpFetch(input.deps.settings, mcpFetchImpl, {
+    ...(useBunNativeFetch ? { pinResolvedDestination: false } : {}),
+  });
   const baseFetch: FetchLike = input.config.connectionRef
     ? connectionBrokerFetch(guardedFetch, input)
     : guardedFetch;
@@ -730,6 +753,24 @@ function toolspaceAuditSummary(value: unknown): {
   };
 }
 
+function toolspaceErrorAttributes(error: unknown): {
+  errorClass: string;
+  errorCode?: string;
+  errorMessage?: string;
+} {
+  if (!(error instanceof Error)) {
+    return { errorClass: typeof error };
+  }
+  const code = (error as Error & { code?: unknown }).code;
+  return {
+    errorClass: error.name,
+    ...(typeof code === "string" ? { errorCode: code } : {}),
+    ...(error.message
+      ? { errorMessage: error.message.replaceAll(/[\r\n]+/gu, " ").slice(0, 512) }
+      : {}),
+  };
+}
+
 type ToolspaceReservation =
   | { status: "ok"; turn: SessionTurn }
   | { status: "no_active_turn" }