@cubis/foundry 0.3.68 → 0.3.69

package/mcp/dist/index.js

@@ -2434,6 +2434,31 @@ async function withUpstreamClient({
     await client.close();
   }
 }
+function isCallToolResult(result) {
+  return Array.isArray(
+    result.content
+  );
+}
+function normalizeUpstreamToolResult(result) {
+  if (isCallToolResult(result)) {
+    return result;
+  }
+  return {
+    content: [
+      {
+        type: "text",
+        text: JSON.stringify(
+          {
+            toolResult: result.toolResult
+          },
+          null,
+          2
+        )
+      }
+    ],
+    _meta: result._meta
+  };
+}
 async function persistCatalog(catalog) {
   if (!catalog.configPath) return;
   const catalogDir = resolveCatalogDir(catalog.configPath);
@@ -2563,10 +2588,12 @@ async function callUpstreamTool({
   return withUpstreamClient({
     url: auth.mcpUrl,
     headers: auth.headers,
-    fn: async (client) => client.callTool({
-      name,
-      arguments: argumentsValue
-    })
+    fn: async (client) => normalizeUpstreamToolResult(
+      await client.callTool({
+        name,
+        arguments: argumentsValue
+      })
+    )
   });
 }
 
@@ -2631,7 +2658,10 @@ async function createServer({
   const registeredDynamicToolNames = /* @__PURE__ */ new Set();
   for (const catalog of [upstreamCatalogs.postman, upstreamCatalogs.stitch]) {
     for (const tool of catalog.tools) {
-      const registrationNames = [tool.namespacedName, ...tool.aliasNames || []];
+      const registrationNames = [
+        tool.namespacedName,
+        ...tool.aliasNames || []
+      ];
       const uniqueRegistrationNames = [...new Set(registrationNames)];
       for (const registrationName of uniqueRegistrationNames) {
         if (registeredDynamicToolNames.has(registrationName)) {
@@ -2648,7 +2678,7 @@ async function createServer({
             inputSchema: dynamicSchema,
             annotations: {}
           },
-          async (args) => {
+          async (args, _extra) => {
             try {
               const result = await callUpstreamTool({
                 service: catalog.service,
@@ -2657,9 +2687,8 @@ async function createServer({
                 scope: defaultConfigScope
               });
               return {
-                // SDK content is typed broadly; cast to the expected array shape.
+                ...result,
                 content: result.content ?? [],
-                structuredContent: result.structuredContent,
                 isError: Boolean(result.isError)
               };
             } catch (error) {

package/mcp/src/server.ts

@@ -6,6 +6,7 @@
  */
 
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
 import { z } from "zod";
 import type { ServerConfig } from "./config/schema.js";
 import type { ConfigScope } from "./cbxConfig/types.js";
@@ -102,7 +103,10 @@ export async function createServer({
 
   for (const catalog of [upstreamCatalogs.postman, upstreamCatalogs.stitch]) {
     for (const tool of catalog.tools) {
-      const registrationNames = [tool.namespacedName, ...(tool.aliasNames || [])];
+      const registrationNames = [
+        tool.namespacedName,
+        ...(tool.aliasNames || []),
+      ];
       const uniqueRegistrationNames = [...new Set(registrationNames)];
       for (const registrationName of uniqueRegistrationNames) {
         if (registeredDynamicToolNames.has(registrationName)) {
@@ -119,7 +123,10 @@ export async function createServer({
             inputSchema: dynamicSchema,
             annotations: {},
           },
-          async (args: Record<string, unknown>) => {
+          async (
+            args: Record<string, unknown>,
+            _extra,
+          ): Promise<CallToolResult> => {
             try {
               const result = await callUpstreamTool({
                 service: catalog.service,
@@ -131,14 +138,8 @@ export async function createServer({
                 scope: defaultConfigScope,
               });
               return {
-                // SDK content is typed broadly; cast to the expected array shape.
-                content: (result.content ?? []) as Array<{
-                  type: string;
-                  [k: string]: unknown;
-                }>,
-                structuredContent: result.structuredContent as
-                  | Record<string, unknown>
-                  | undefined,
+                ...result,
+                content: result.content ?? [],
                 isError: Boolean(result.isError),
               };
             } catch (error) {

package/mcp/src/tools/registry.ts

@@ -12,6 +12,7 @@
  */
 
 import { z } from "zod";
+import type { ToolCallback } from "@modelcontextprotocol/sdk/server/mcp.js";
 import type { VaultManifest } from "../vault/types.js";
 import type { RouteManifest } from "../routes/types.js";
 import type { ConfigScope } from "../cbxConfig/types.js";
@@ -35,7 +36,7 @@ export interface ToolRegistryEntry {
    */
   createHandler: (
     ctx: ToolRuntimeContext,
-  ) => (args: unknown) => Promise<unknown>;
+  ) => ToolCallback<z.ZodObject<z.ZodRawShape>>;
 }
 
 export interface ToolRuntimeContext {

package/mcp/src/tools/routeResolve.ts

@@ -359,7 +359,7 @@ async function fileExists(target: string) {
 
 async function detectLanguageSkillHint() {
   const cwd = process.cwd();
-  const candidates = await fs.readdir(cwd).catch(() => []);
+  const candidates: string[] = await fs.readdir(cwd).catch(() => []);
   const has = (fileName: string) => candidates.includes(fileName);
 
   for (const entry of LANGUAGE_SIGNAL_FILES) {

package/mcp/src/upstream/passthrough.ts

@@ -6,6 +6,7 @@ import { mkdir, readFile, writeFile } from "node:fs/promises";
 import path from "node:path";
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
+import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
 import {
   parsePostmanState,
   parseStitchState,
@@ -209,6 +210,40 @@ async function withUpstreamClient<T>({
   }
 }
 
+function isCallToolResult(
+  result: Awaited<ReturnType<Client["callTool"]>>,
+): result is CallToolResult {
+  return Array.isArray(
+    (result as {
+      content?: unknown;
+    }).content,
+  );
+}
+
+function normalizeUpstreamToolResult(
+  result: Awaited<ReturnType<Client["callTool"]>>,
+): CallToolResult {
+  if (isCallToolResult(result)) {
+    return result;
+  }
+
+  return {
+    content: [
+      {
+        type: "text",
+        text: JSON.stringify(
+          {
+            toolResult: result.toolResult,
+          },
+          null,
+          2,
+        ),
+      },
+    ],
+    _meta: result._meta,
+  };
+}
+
 async function persistCatalog(catalog: UpstreamCatalog): Promise<void> {
   if (!catalog.configPath) return;
   const catalogDir = resolveCatalogDir(catalog.configPath);
@@ -344,7 +379,7 @@ export async function callUpstreamTool({
   name: string;
   argumentsValue: Record<string, unknown>;
   scope?: ConfigScope | "auto";
-}) {
+}): Promise<CallToolResult> {
   const effective = readEffectiveConfig(scope);
   if (!effective) {
     throw new Error("cbx_config.json not found");
@@ -360,10 +395,12 @@ export async function callUpstreamTool({
   return withUpstreamClient({
     url: auth.mcpUrl,
     headers: auth.headers,
-    fn: async (client) =>
-      client.callTool({
-        name,
-        arguments: argumentsValue,
-      }),
+    fn: async (client): Promise<CallToolResult> =>
+      normalizeUpstreamToolResult(
+        await client.callTool({
+          name,
+          arguments: argumentsValue,
+        }),
+      ),
   });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cubis/foundry",
-  "version": "0.3.68",
+  "version": "0.3.69",
   "description": "Cubis Foundry CLI for workflow-first AI agent environments",
   "type": "module",
   "bin": {