stitchkit 0.38.0 → 0.39.0

package/dist/tools.d.ts

@@ -7,6 +7,7 @@ export type { CliWaitConfig } from './tools/cli-wait';
 export { coerceJsonArgs } from './tools/coerce';
 export type { AfterToolCallOptions, BeforeToolCallOptions, ErrorHintFn, ToolCallContext, ToolCallHooks, ToolErrorOptions, ToolLifecycle, ToolOperation, ToolResult, } from './tools/execute';
 export { flattenToolJsonSchema, type ToolPresentationSchema, } from './tools/flatten';
+export { createToolInvoker, type ToolInvoker, type ToolInvokerConfig, type ToolInvokerTransport, } from './tools/invoker';
 export { listToolNames, type ToolNameEntry } from './tools/list-names';
 export { buildToolManifest, type ToolManifestEntry } from './tools/manifest';
 export { buildMcpServer, type IncompatibleSchemaPolicy, type McpMountConfig, type McpSchemaValidationConfig, type McpServerBuildConfig, mountMcp, mountMcpResource, type ValidateMcpSchemasConfig, validateMcpSchemas, } from './tools/mcp';
@@ -17,11 +18,12 @@ export { type CollectToolsConfig, collectTools, type MountableTool, type ToolExt
 export { type DownloadToolConfig, mountDownload } from './tools/mount-download';
 export { mountUpload, type UploadToolConfig } from './tools/mount-upload';
 export { mountWait, type WaitToolConfig } from './tools/mount-wait';
-export type { NativeMcpHandlerContext, NativeMcpOperationIdentity, NativeMcpRegistrar, NativeMcpResult, NativeMcpToolDefinition, } from './tools/native-mcp';
+export type { NativeMcpRegistrar } from './tools/native-mcp';
 export { oauthProtectedResourceRoute, PROTECTED_RESOURCE_PATH, type ProtectedResourceConfig, protectedResourceMetadataUrl, wwwAuthenticateHeader, } from './tools/oauth-metadata';
 export { type ApplicationType, type AuthCodeData, type AuthRequest, type ClientMetadata, mountOAuthProvider, type OAuthProviderConfig, type RefreshData, type RegisteredClient, } from './tools/oauth-provider';
 export { findNonPortableFormats, type NonPortableFormat, PORTABLE_JSON_SCHEMA_FORMATS, } from './tools/portable-formats';
 export { type ImplementRemoteOptions, implementRemote } from './tools/remote';
+export { defineRuntimeTool, type RuntimeAgentModelOutput, type RuntimeMcpPresentation, type RuntimeToolDefinition, type RuntimeToolDefinitionBase, type RuntimeToolDefinitionWithOutput, type RuntimeToolDefinitionWithoutOutput, type RuntimeToolHandlerContext, type RuntimeToolIdentity, type RuntimeToolOutput, type RuntimeToolPresenters, type RuntimeToolTransport, } from './tools/runtime-tool';
 export { createToolLogger, type ToolCallRecord, type ToolLoggerConfig, } from './tools/tool-logger';
 export { createToolkit, type Toolkit } from './tools/toolkit';
 export { summarizeTransports, type TransportCounts, type TransportSummary, } from './tools/transports';

package/dist/tools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../src/tools.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../src/tools.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACzE,YAAY,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,gBAAgB,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AACrF,OAAO,EAAE,KAAK,SAAS,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxD,YAAY,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACtD,YAAY,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,YAAY,EACV,oBAAoB,EACpB,qBAAqB,EACrB,WAAW,EACX,eAAe,EACf,aAAa,EACb,gBAAgB,EAChB,aAAa,EACb,aAAa,EACb,UAAU,GACX,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,qBAAqB,EACrB,KAAK,sBAAsB,GAC5B,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,iBAAiB,EACjB,KAAK,WAAW,EAChB,KAAK,iBAAiB,EACtB,KAAK,oBAAoB,GAC1B,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,aAAa,EAAE,KAAK,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACvE,OAAO,EAAE,iBAAiB,EAAE,KAAK,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAC7E,OAAO,EACL,cAAc,EACd,KAAK,wBAAwB,EAC7B,KAAK,cAAc,EACnB,KAAK,yBAAyB,EAC9B,KAAK,oBAAoB,EACzB,QAAQ,EACR,gBAAgB,EAChB,KAAK,wBAAwB,EAC7B,kBAAkB,GACnB,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,2BAA2B,EAC3B,kBAAkB,EAClB,KAAK,SAAS,EACd,KAAK,kBAAkB,EACvB,KAAK,cAAc,EACnB,kBAAkB,GACnB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,gBAAgB,EAChB,KAAK,gBAAgB,EACrB,KAAK,cAAc,GACpB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,oBAAoB,EAAE,KAAK,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACpF,OAAO,EACL,KAAK,kBAAkB,EACvB,YAAY,EACZ,KAAK,aAAa,EAClB,KAAK,UAAU,GAChB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,KAAK,kBAAkB,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAChF,OAAO,EAAE,WAAW,EAAE,KAAK,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC1E,OAAO,EAAE,SAAS,EAAE,KAAK,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpE,YAAY,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EACL,2BAA2B,EAC3B,uBAAuB,EACvB,KAAK,uBAAuB,EAC5B,4BAA4B,EAC5B,qBAAqB,GACtB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,YAAY,EACjB,KAAK,WAAW,EAChB,KAAK,cAAc,EACnB,kBAAkB,EAClB,KAAK,mBAAmB,EACxB,KAAK,WAAW,EAChB,KAAK,gBAAgB,GACtB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,sBAAsB,EACtB,KAAK,iBAAiB,EACtB,4BAA4B,GAC7B,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,KAAK,sBAAsB,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAC9E,OAAO,EACL,iBAAiB,EACjB,KAAK,uBAAuB,EAC5B,KAAK,sBAAsB,EAC3B,KAAK,qBAAqB,EAC1B,KAAK,yBAAyB,EAC9B,KAAK,+BAA+B,EACpC,KAAK,kCAAkC,EACvC,KAAK,yBAAyB,EAC9B,KAAK,mBAAmB,EACxB,KAAK,iBAAiB,EACtB,KAAK,qBAAqB,EAC1B,KAAK,oBAAoB,GAC1B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,gBAAgB,EAChB,KAAK,cAAc,EACnB,KAAK,gBAAgB,GACtB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,KAAK,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC9D,OAAO,EACL,mBAAmB,EACnB,KAAK,eAAe,EACpB,KAAK,gBAAgB,GACtB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,qBAAqB,EAAE,KAAK,eAAe,EAAE,MAAM,4BAA4B,CAAC;AACzF,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,eAAe,EACpB,aAAa,EACb,YAAY,EACZ,KAAK,eAAe,GACrB,MAAM,mBAAmB,CAAC"}

package/dist/tools.js

@@ -2,10 +2,10 @@ import {
   inputIsQuery,
   signJwt,
   verifyPkce
-} from "./index-bgdd42pt.js";
+} from "./index-92gs1m5b.js";
 import {
   DEFAULT_CORS_ALLOW_HEADERS
-} from "./index-czmqks7r.js";
+} from "./index-6jypn22c.js";
 import {
   assertToolName,
   assertUniqueToolName,
@@ -24,7 +24,7 @@ import {
   readCapped,
   toolResultFromError,
   writeDownload
-} from "./index-n5t4gnfz.js";
+} from "./index-y5scd1cr.js";
 import {
   toJsonSchema
 } from "./index-frfyw9fa.js";
@@ -33,15 +33,63 @@ import {
 } from "./index-x3fcszf8.js";
 import {
   AppError,
-  formatZodError,
   getTraceId,
   isRecord,
   mergeMeta,
+  parseTrailingWildcard,
   typedEntries
-} from "./index-mzx0an0s.js";
+} from "./index-fyfk537k.js";
 
 // src/tools/agent.ts
 import { jsonSchema, tool } from "ai";
+
+// src/tools/runtime-tool.ts
+function defineRuntimeTool(definition) {
+  if (definition.transports?.length === 0) {
+    throw new Error(`Runtime tool "${definition.name}" must expose at least one transport`);
+  }
+  return definition;
+}
+function runtimeToolSupports(definition, transport) {
+  if (definition.transports?.length === 0) {
+    throw new Error(`Runtime tool "${definition.name}" must expose at least one transport`);
+  }
+  return !definition.transports || definition.transports.includes(transport);
+}
+function runtimeToolIdentity(definition) {
+  return {
+    method: definition.identity.method,
+    desc: definition.description,
+    serviceName: definition.identity.serviceName,
+    key: definition.identity.action,
+    toolName: definition.name,
+    scope: definition.identity.scope,
+    meta: definition.identity.meta,
+    annotations: definition.annotations,
+    ui: definition.ui
+  };
+}
+function runtimeToolMountable(definition) {
+  assertToolName(definition.name, definition.identity.serviceName, definition.identity.action);
+  const method = {
+    ...runtimeToolIdentity(definition),
+    inputSchema: definition.input,
+    outputSchema: definition.output,
+    handler: definition.handler
+  };
+  return {
+    method,
+    name: definition.name,
+    argumentSchema: definition.input,
+    presentationSchema: buildToolPresentationSchema({
+      inputSchema: definition.input,
+      unrepresentable: "any"
+    }),
+    shouldExtend: false
+  };
+}
+
+// src/tools/agent.ts
 function mountAgent(services, config = {}) {
   const serviceList = Array.isArray(services) ? services : [services];
   const tools = {};
@@ -80,8 +128,88 @@ function mountAgent(services, config = {}) {
       });
     }
   }
+  for (const definition of config.runtimeTools ?? []) {
+    if (!runtimeToolSupports(definition, "AGENT"))
+      continue;
+    const mountable = runtimeToolMountable(definition);
+    assertUniqueToolName(definition.name, Object.hasOwn(tools, definition.name), "agent tool name");
+    const inputSchema = jsonSchema(mountable.presentationSchema, {
+      validate: async (value) => isRecord(value) ? { success: true, value } : { success: false, error: new Error("Tool arguments must be an object") }
+    });
+    const execute = async (rawArgs) => {
+      const args = isRecord(rawArgs) ? rawArgs : {};
+      try {
+        const result = await runTool(mountable, args);
+        if (result.ok)
+          return result.data;
+        return formatToolError(result, mountable.name, config.errorHint);
+      } catch (err) {
+        return formatToolError(toolResultFromError(err), mountable.name, config.errorHint);
+      }
+    };
+    if (definition.present?.agent) {
+      const presenter = definition.present.agent;
+      const output = definition.output;
+      tools[definition.name] = tool({
+        description: definition.description,
+        inputSchema,
+        outputSchema: output,
+        execute,
+        toModelOutput: async ({ output: rawOutput }) => {
+          const parsed = output.safeParse(rawOutput);
+          if (!parsed.success) {
+            return { type: "text", value: JSON.stringify(rawOutput) };
+          }
+          return presenter(parsed.data);
+        }
+      });
+    } else {
+      tools[definition.name] = tool({
+        description: definition.description,
+        inputSchema,
+        ...definition.output && { outputSchema: definition.output },
+        execute
+      });
+    }
+  }
   return tools;
 }
+// src/tools/invoker.ts
+function createToolInvoker(services, config) {
+  const serviceList = Array.isArray(services) ? services : [services];
+  const tools = new Map;
+  for (const service of serviceList) {
+    for (const tool2 of collectTools(service, config.transport, {
+      extend: config.extend,
+      flattenUnionInput: config.flattenUnionInput
+    })) {
+      assertUniqueToolName(tool2.name, tools.has(tool2.name), "in-process tool name");
+      tools.set(tool2.name, tool2);
+    }
+  }
+  const names = Object.freeze([...tools.keys()].sort());
+  const runTool = createToolRunner({
+    source: config.source ?? "internal",
+    context: config.context,
+    hooks: config.hooks,
+    lifecycle: config.lifecycle,
+    extend: config.extend,
+    coerceJsonArgs: config.coerceJsonArgs,
+    onOutputStrip: config.onOutputStrip
+  });
+  return Object.freeze({
+    names,
+    invoke(name, args) {
+      const tool2 = tools.get(name);
+      if (!tool2) {
+        throw new AppError("NOT_FOUND", `Unknown tool: ${name}`, 404, {
+          available: names
+        });
+      }
+      return runTool(tool2, args);
+    }
+  });
+}
 // src/tools/list-names.ts
 var TOOL_TRANSPORTS = ["MCP", "AGENT", "CLI"];
 function listToolNames(services) {
@@ -142,72 +270,21 @@ function inlineMcpAppBundle(html) {
 // src/tools/native-mcp.ts
 import { CallToolResultSchema } from "@modelcontextprotocol/sdk/types.js";
 import { z } from "zod";
-function operationIdentity(definition) {
-  return {
-    method: definition.identity.method,
-    desc: definition.description,
-    serviceName: definition.identity.serviceName,
-    key: definition.identity.action,
-    toolName: definition.name,
-    scope: definition.identity.scope,
-    meta: definition.identity.meta,
-    annotations: definition.annotations,
-    ui: definition.ui
-  };
-}
 function isCallToolResult(value) {
   return CallToolResultSchema.safeParse(value).success;
 }
-function nativeResultSchema(output) {
-  const envelope = z.custom(isCallToolResult, {
-    error: "Native MCP handler must return a valid CallToolResult"
-  });
-  if (!output)
-    return envelope;
-  return envelope.transform((result, context) => {
-    const parsed = output.safeParse(result.structuredContent);
-    if (!parsed.success) {
-      context.addIssue({
-        code: "custom",
-        message: `Invalid structuredContent: ${formatZodError(parsed.error)}`
-      });
-      return z.NEVER;
-    }
-    return { ...result, structuredContent: parsed.data };
-  });
-}
 function createNativeMcpRegistrar(server, config) {
   return {
     rawServer: server,
     registerTool: (definition) => {
-      const identity = operationIdentity(definition);
-      const advertisedOperation = {
-        ...identity,
-        inputSchema: definition.input,
-        outputSchema: definition.output,
-        handler: () => {
-          return;
-        }
-      };
-      const mountable = {
-        method: advertisedOperation,
-        name: definition.name,
-        argumentSchema: definition.input,
-        presentationSchema: buildToolPresentationSchema({
-          inputSchema: definition.input,
-          unrepresentable: "any"
-        }),
-        shouldExtend: false
-      };
+      if (!runtimeToolSupports(definition, "MCP"))
+        return;
+      assertUniqueToolName(definition.name, config.takenNames.has(definition.name), "MCP tool name");
+      config.takenNames.add(definition.name);
+      const mountable = runtimeToolMountable(definition);
       const [prepared] = config.prepare(mountable);
       if (!prepared)
         return;
-      const executionOperation = {
-        ...identity,
-        inputSchema: definition.input,
-        outputSchema: nativeResultSchema(definition.output),
-        handler: definition.handler
-      };
       const toolConfig = {
         description: definition.description,
         inputSchema: z.looseObject({}).meta(presentationMetadata(prepared.inputSchema))
@@ -224,16 +301,32 @@ function createNativeMcpRegistrar(server, config) {
       }
       server.registerTool(definition.name, toolConfig, async (rawArgs) => {
         const args = isRecord(rawArgs) ? rawArgs : {};
-        const result = await executeToolMethod(executionOperation, definition.name, args, { ...config.context, source: "mcp" }, config.hooks, config.lifecycle, config.coerceJsonArgs ?? true, config.onOutputStrip ? (paths) => config.onOutputStrip?.(definition.name, paths) : undefined);
-        if (!result.ok)
-          return config.formatError(result, definition.name);
-        if (isCallToolResult(result.data))
-          return result.data;
-        return config.formatError({
+        const result = await executeToolMethod(mountable.method, definition.name, args, { ...config.context, source: "mcp" }, config.hooks, config.lifecycle, config.coerceJsonArgs ?? true, config.onOutputStrip ? (paths) => config.onOutputStrip?.(definition.name, paths) : undefined);
+        if (!result.ok || !definition.present?.mcp) {
+          return config.formatResult(result, prepared.outputMode, definition.name);
+        }
+        const presented = await definition.present.mcp(result.data);
+        if ("structuredContent" in presented || "isError" in presented) {
+          return config.formatResult({
+            ok: false,
+            code: "INTERNAL_SERVER_ERROR",
+            details: {
+              message: "Runtime MCP presenter cannot set framework-owned structuredContent or isError"
+            }
+          }, "none", definition.name);
+        }
+        const structured = config.formatResult(result, prepared.outputMode, definition.name).structuredContent;
+        const response = {
+          ...presented,
+          ...structured && { structuredContent: structured }
+        };
+        if (isCallToolResult(response))
+          return response;
+        return config.formatResult({
           ok: false,
           code: "INTERNAL_SERVER_ERROR",
-          details: { message: "Native MCP handler returned an invalid result" }
-        }, definition.name);
+          details: { message: "Runtime MCP presenter returned an invalid CallToolResult" }
+        }, "none", definition.name);
       });
     }
   };
@@ -606,17 +699,19 @@ function buildMcpServerFromPrepared(config, auth, prepared) {
     onOutputStrip: config.onOutputStrip
   });
   if (config.nativeTools) {
+    const takenNames = new Set(prepared.map((tool2) => tool2.mountable.name));
     const registrar = createNativeMcpRegistrar(server, {
       context,
       hooks: config.hooks,
       lifecycle: config.lifecycle,
       coerceJsonArgs: config.coerceJsonArgs,
       onOutputStrip: config.onOutputStrip,
+      takenNames,
       prepare: (tool2) => prepareMcpTools([tool2], {
         schemaValidation: config.schemaValidation,
         logger: config.logger
       }),
-      formatError: (result, toolName) => formatMcpResult(result, "none", toolName, config.errorHint)
+      formatResult: (result, mode, toolName) => formatMcpResult(result, mode, toolName, config.errorHint)
     });
     config.nativeTools(registrar, auth);
   }
@@ -1277,11 +1372,13 @@ function resolvePathPrefix(config, args) {
 function extractParamNames(path) {
   const matches = path.match(/:(\w+)/g);
   const names = matches ? matches.map((match) => match.slice(1)) : [];
-  if (path.endsWith("/*"))
-    names.push("*");
+  const wildcard = parseTrailingWildcard(path);
+  if (wildcard)
+    names.push(wildcard.name);
   return names;
 }
 function fillPathParams(path, args) {
+  const wildcard = parseTrailingWildcard(path);
   let filled = path.replace(/:(\w+)/g, (_, key) => {
     const value = args[key];
     if (value === undefined || value === null) {
@@ -1289,14 +1386,14 @@ function fillPathParams(path, args) {
     }
     return encodeURIComponent(String(value));
   });
-  if (!filled.endsWith("/*"))
+  if (!wildcard)
     return filled;
-  const wildcard = args["*"];
-  if (wildcard === undefined || wildcard === null) {
-    throw new Error("Missing path param: *");
+  const wildcardValue = args[wildcard.name];
+  if (wildcardValue === undefined || wildcardValue === null) {
+    throw new Error(`Missing path param: ${wildcard.name}`);
   }
-  const remainder = String(wildcard).split("/").map((segment) => encodeURIComponent(segment)).join("/");
-  filled = `${filled.slice(0, -1)}${remainder}`;
+  const remainder = String(wildcardValue).split("/").map((segment) => encodeURIComponent(segment)).join("/");
+  filled = `${filled.slice(0, -(wildcard.name.length + 1))}${remainder}`;
   return filled;
 }
 function stripConsumedArgs(args, path, scopeKeys) {
@@ -1422,7 +1519,7 @@ function createHttpMethod(endpoint, prefix, client, config) {
       if (!isMultipartFile(file)) {
         throw new Error(`Missing multipart file field: ${endpoint.multipart}`);
       }
-      if (httpMethod === "get" || httpMethod === "delete") {
+      if (httpMethod === "get" || httpMethod === "head" || httpMethod === "delete") {
         throw new Error(`Multipart endpoint ${endpoint.method} ${endpoint.path} must be POST / PUT / PATCH`);
       }
       const formData = new FormData;
@@ -1430,8 +1527,8 @@ function createHttpMethod(endpoint, prefix, client, config) {
       appendFormFields(formData, plan.remainingArgs, new Set([endpoint.multipart]));
       return withOutput(endpoint, client[httpMethod](plan.relativeUrl, formData, withTimeout(undefined, endpoint)));
     }
-    if (httpMethod === "get") {
-      return withOutput(endpoint, client.get(plan.relativeUrl, withTimeout(undefined, endpoint)));
+    if (httpMethod === "get" || httpMethod === "head") {
+      return withOutput(endpoint, client[httpMethod](plan.relativeUrl, withTimeout(undefined, endpoint)));
     }
     if (httpMethod === "delete") {
       return withOutput(endpoint, client.delete(plan.relativeUrl, withTimeout(undefined, endpoint)));
@@ -1448,7 +1545,7 @@ function createFetchMethod(endpoint, prefix, config, contractConfig) {
       ...typeof config.headers === "function" ? config.headers() : config.headers
     };
     const signal = endpoint.timeout !== undefined ? AbortSignal.timeout(endpoint.timeout) : undefined;
-    const hasBody = endpoint.method !== "GET" && endpoint.method !== "DELETE" && !endpoint.multipart && endpoint.input && args;
+    const hasBody = endpoint.method !== "GET" && endpoint.method !== "HEAD" && endpoint.method !== "DELETE" && !endpoint.multipart && endpoint.input && args;
     if (hasBody)
       headers["Content-Type"] = "application/json";
     if (endpoint.multipart && args) {
@@ -1765,8 +1862,10 @@ export {
   flattenToolJsonSchema,
   findUntypedProperties,
   findNonPortableFormats,
+  defineRuntimeTool,
   createToolkit,
   createToolLogger,
+  createToolInvoker,
   createStdioMcpServer,
   createMcpHandler,
   createCli,