stitchkit 0.55.0 → 0.56.1

package/dist/tools.js

@@ -1,7 +1,7 @@
 import {
   signJwt,
   verifyPkce
-} from "./index-js7yexng.js";
+} from "./index-xy8fmh6w.js";
 import {
   DEFAULT_CORS_ALLOW_HEADERS,
   DEFAULT_PROCESS_SIGNALS,
@@ -9,10 +9,9 @@ import {
   defaultSignalSource,
   guardSignalCallback,
   reportSignalError
-} from "./index-pzc32v75.js";
+} from "./index-sm2tjx06.js";
 import {
   WaitTimeoutError,
-  buildToolPresentationSchema,
   coerceJsonArgs,
   collectToolSurface,
   collectTools,
@@ -24,37 +23,42 @@ import {
   executeToolMethod,
   fetchGuarded,
   fetchPinnedDocument,
-  flattenToolJsonSchema,
   formatToolError,
-  isObjectPresentationSchema,
-  presentationMetadata,
   readCapped,
   runWaitOperation,
   toolErrorFromResult,
   toolResultFromError
-} from "./index-0gv7k0ra.js";
+} from "./index-escqg10p.js";
 import {
   ManagedFileError
-} from "./index-1k16zv57.js";
+} from "./index-bfcpjw20.js";
 import"./index-sbdmyz75.js";
 import {
+  PORTABLE_JSON_SCHEMA_FORMATS,
   assertToolName,
-  assertUniqueToolName
-} from "./index-k4dftwf7.js";
-import {
-  toJsonSchema
-} from "./index-cby4ar3v.js";
+  assertUniqueToolName,
+  findNonPortableFormats,
+  findUntypedProperties,
+  flattenToolJsonSchema,
+  prepareProjectedMcpTools,
+  presentationMetadata,
+  validateMcpRoundPolicy
+} from "./index-6y759j86.js";
+import"./index-cby4ar3v.js";
 import {
   redact
-} from "./index-qx84bqzk.js";
+} from "./index-jcc611vh.js";
 import {
   getRequestContext,
   getTraceId,
+  normalizeError,
   runWithRequestContext
-} from "./index-v4bbq3p4.js";
+} from "./index-j3dem06f.js";
 import {
-  AppError
-} from "./index-h60df7rj.js";
+  AppError,
+  STITCH_ERROR_STATUS,
+  defineContract
+} from "./index-5r13htq1.js";
 import {
   ManagedFilePathSchema,
   ManagedFileRefSchema
@@ -328,6 +332,120 @@ function defineAsyncOperation(config) {
     }
   };
 }
+function adapterResult(capability, target, schema, value) {
+  const parsed = schema.safeParse(value);
+  if (!parsed.success) {
+    throw new Error(`Async operation adapter for capability "${capability}" returned invalid ${target}`, { cause: parsed.error });
+  }
+  return parsed.data;
+}
+var NON_WIRE_STABLE_ZOD_TYPES = new Set([
+  "catch",
+  "default",
+  "lazy",
+  "pipe",
+  "prefault",
+  "readonly",
+  "success",
+  "transform"
+]);
+function hasOverwriteCheck(value) {
+  return isRecord(value) && isRecord(value._zod) && isRecord(value._zod.def) && value._zod.def.check === "overwrite";
+}
+function assertWireStableIdSchema(schema, boundary) {
+  const visited = new Set;
+  const pending = [schema];
+  while (pending.length > 0) {
+    const value = pending.pop();
+    if (typeof value !== "object" || value === null || visited.has(value))
+      continue;
+    visited.add(value);
+    if (value instanceof z.ZodType) {
+      const definition = value._zod.def;
+      if (NON_WIRE_STABLE_ZOD_TYPES.has(definition.type) || "coerce" in definition && definition.coerce === true || "checks" in definition && Array.isArray(definition.checks) && definition.checks.some(hasOverwriteCheck)) {
+        throw new Error(`${boundary} must use a wire-stable ID schema without transforms, coercion, defaults or overwrites; use binding: "adapted" with explicit ID adapters`);
+      }
+      pending.push(...Object.values(definition));
+      continue;
+    }
+    if (Array.isArray(value)) {
+      pending.push(...value);
+      continue;
+    }
+    if (isRecord(value))
+      pending.push(...Object.values(value));
+  }
+}
+function defineAsyncOperationContract(config) {
+  assertWireStableIdSchema(config.id, "Async operation contract");
+  const hasStartOutput = config.startOutput !== undefined;
+  const hasIdFromStart = config.idFromStart !== undefined;
+  if (hasStartOutput !== hasIdFromStart) {
+    throw new Error("Async operation contract startOutput and idFromStart must be configured together");
+  }
+  const description = (capability) => config.descriptions?.[capability] ?? `${config.description}: ${capability}`;
+  const endpoint = (capability, method, path, input, output) => {
+    const scope = config.scopes?.[capability];
+    return {
+      method,
+      path,
+      desc: description(capability),
+      input,
+      output,
+      ...scope !== undefined && { scope }
+    };
+  };
+  const startOutput = config.startOutput ?? config.id;
+  const endpoints = {
+    start: endpoint("start", "POST", "/", config.startInput, startOutput),
+    status: endpoint("status", "POST", "/status", config.id, config.snapshot),
+    wait: endpoint("wait", "POST", "/wait", config.id, config.snapshot)
+  };
+  const capabilities = {
+    start: "start",
+    status: "status",
+    wait: "wait"
+  };
+  const schemas = {
+    startInput: config.startInput,
+    startOutput,
+    id: config.id,
+    snapshot: config.snapshot,
+    cancelResult: AsyncOperationCancelResultSchema
+  };
+  const inputFor = {
+    status: (id) => adapterResult("status", "input", config.id, id),
+    wait: (id) => adapterResult("wait", "input", config.id, id)
+  };
+  if (config.cancel) {
+    endpoints.cancel = endpoint("cancel", "POST", "/cancel", config.id, AsyncOperationCancelResultSchema);
+    capabilities.cancel = "cancel";
+    schemas.cancel = AsyncOperationCancelResultSchema;
+    inputFor.cancel = (id) => adapterResult("cancel", "input", config.id, id);
+  }
+  if (config.result) {
+    endpoints.result = endpoint("result", "POST", "/result", config.id, config.result);
+    capabilities.result = "result";
+    schemas.result = config.result;
+    inputFor.result = (id) => adapterResult("result", "input", config.id, id);
+  }
+  if (config.artifacts) {
+    endpoints.artifacts = endpoint("artifacts", "POST", "/artifacts", config.id, config.artifacts);
+    capabilities.artifacts = "artifacts";
+    schemas.artifacts = config.artifacts;
+    inputFor.artifacts = (id) => adapterResult("artifacts", "input", config.id, id);
+  }
+  const contract = config.scope ? defineContract({ prefix: config.prefix, scope: config.scope }, endpoints) : defineContract({ prefix: config.prefix }, endpoints);
+  const applicationStartOutput = config.startOutput;
+  const applicationIdFromStart = config.idFromStart;
+  const idFromStart = applicationStartOutput && applicationIdFromStart ? (output) => adapterResult("start", "id", config.id, applicationIdFromStart(output)) : (output) => adapterResult("start", "id", config.id, output);
+  return {
+    contract,
+    capabilities,
+    schemas,
+    adapters: { idFromStart, inputFor }
+  };
+}
 function bindContractAsyncOperation(config) {
   const endpoint = (key) => {
     const found = config.contract.endpoints[key];
@@ -341,27 +459,82 @@ function bindContractAsyncOperation(config) {
   if (!start.output || !status.output || !wait.output) {
     throw new Error("Contract async operation requires outputs for start, status and wait");
   }
-  if (status.input !== start.output || wait.input !== start.output) {
-    const capability = status.input !== start.output ? "status" : "wait";
-    throw new Error(`Contract async operation capability "${capability}" input must reuse the same schema instance as the start output`);
-  }
-  if (wait.output !== status.output) {
+  const startOutput = start.output;
+  const statusOutput = status.output;
+  if (wait.output !== statusOutput) {
     throw new Error('Contract async operation capability "wait" output must reuse the same schema instance as the status output');
   }
-  const validateOptional = (capability) => {
-    const key = config.capabilities[capability];
-    if (key && endpoint(key).input !== start.output) {
+  const optionalCapabilities = [
+    "cancel",
+    "result",
+    "artifacts"
+  ];
+  if (config.binding !== "adapted") {
+    assertWireStableIdSchema(startOutput, "Direct contract async operation");
+    if (status.input !== startOutput || wait.input !== startOutput) {
+      const capability = status.input !== startOutput ? "status" : "wait";
       throw new Error(`Contract async operation capability "${capability}" input must reuse the same schema instance as the start output`);
     }
+    const inputFor2 = {
+      status: (id) => adapterResult("status", "input", startOutput, id),
+      wait: (id) => adapterResult("wait", "input", startOutput, id)
+    };
+    for (const capability of optionalCapabilities) {
+      const key = config.capabilities[capability];
+      if (!key)
+        continue;
+      if (endpoint(key).input !== startOutput) {
+        throw new Error(`Contract async operation capability "${capability}" input must reuse the same schema instance as the start output`);
+      }
+      inputFor2[capability] = (id) => adapterResult(capability, "input", startOutput, id);
+    }
+    return {
+      contract: config.contract,
+      handlers: config.handlers,
+      capabilities: config.capabilities,
+      schemas: { id: startOutput, snapshot: statusOutput },
+      adapters: {
+        idFromStart: (output) => adapterResult("start", "id", startOutput, output),
+        inputFor: inputFor2
+      }
+    };
+  }
+  const adapters = config.adapters;
+  const idSchema = config.id;
+  const adaptedInput = (capability, key, builder) => {
+    const input = endpoint(key).input;
+    if (!input) {
+      throw new Error(`Contract async operation capability "${capability}" requires an input schema`);
+    }
+    return (id) => adapterResult(capability, "input", input, builder(id));
+  };
+  const inputFor = {
+    status: adaptedInput("status", config.capabilities.status, adapters.inputFor.status),
+    wait: adaptedInput("wait", config.capabilities.wait, adapters.inputFor.wait)
+  };
+  const optionalInput = (capability, key, builder) => {
+    if (!key)
+      return;
+    if (!builder) {
+      throw new Error(`Contract async operation capability "${capability}" requires an input adapter`);
+    }
+    inputFor[capability] = adaptedInput(capability, key, builder);
   };
-  validateOptional("cancel");
-  validateOptional("result");
-  validateOptional("artifacts");
+  optionalInput("cancel", config.capabilities.cancel, "cancel" in adapters.inputFor ? adapters.inputFor.cancel : undefined);
+  optionalInput("result", config.capabilities.result, "result" in adapters.inputFor ? adapters.inputFor.result : undefined);
+  optionalInput("artifacts", config.capabilities.artifacts, "artifacts" in adapters.inputFor ? adapters.inputFor.artifacts : undefined);
+  if (!idSchema) {
+    throw new Error("Contract adapted async operation requires an id schema");
+  }
   return {
     contract: config.contract,
     handlers: config.handlers,
     capabilities: config.capabilities,
-    schemas: { id: start.output, snapshot: status.output }
+    schemas: { id: idSchema, snapshot: statusOutput },
+    adapters: {
+      idFromStart: (output) => adapterResult("start", "id", idSchema, adapters.idFromStart(output)),
+      inputFor
+    }
   };
 }
 // src/tools/download-core.ts
@@ -430,6 +603,36 @@ async function runDownloadOperation(config) {
   });
 }
 
+// src/tools/managed-file-error.ts
+var SAFE_MANAGED_FILE_MESSAGES = {
+  FILE_INVALID_PATH: "Invalid managed-file path",
+  FILE_OUTSIDE_ROOT: "Managed-file path escapes its boundary",
+  FILE_NOT_FOUND: "Managed file not found",
+  FILE_NOT_REGULAR: "Managed path is not a regular file",
+  FILE_INSPECTION_REJECTED: "Managed file rejected by inspection",
+  FILE_TOO_LARGE: "Managed file exceeds the configured size limit",
+  FILE_EXISTS: "Managed file already exists"
+};
+function managedFileAppError(error) {
+  if (!(error instanceof ManagedFileError))
+    return null;
+  switch (error.code) {
+    case "FILE_INVALID_PATH":
+    case "FILE_OUTSIDE_ROOT":
+    case "FILE_NOT_FOUND":
+    case "FILE_NOT_REGULAR":
+    case "FILE_INSPECTION_REJECTED":
+    case "FILE_TOO_LARGE":
+    case "FILE_EXISTS":
+      return new AppError(error.code, SAFE_MANAGED_FILE_MESSAGES[error.code], STITCH_ERROR_STATUS[error.code]);
+    case "FILE_IO_ERROR":
+      return null;
+  }
+}
+function normalizeFileToolError(error) {
+  return managedFileAppError(error) ?? normalizeError(error);
+}
+
 // src/tools/define-download-tool.ts
 function defineDownloadTool(config) {
   return defineRuntimeTool({
@@ -460,6 +663,9 @@ function defineDownloadTool(config) {
         if (error instanceof DownloadOperationError) {
           throw new AppError(error.code, `Download failed: ${error.message}`, error.status);
         }
+        const managedError = managedFileAppError(error);
+        if (managedError)
+          throw managedError;
         throw error;
       }
     }
@@ -488,7 +694,16 @@ function defineUploadTool(config) {
     transports: config.transports,
     annotations: config.annotations,
     present: config.present,
-    handler: async (context) => runUploadOperation(config.files, context.input.path, (source) => config.upload(source, context), context.signal)
+    handler: async (context) => {
+      try {
+        return await runUploadOperation(config.files, context.input.path, (source) => config.upload(source, context), context.signal);
+      } catch (error) {
+        const managedError = managedFileAppError(error);
+        if (managedError)
+          throw managedError;
+        throw error;
+      }
+    }
   });
 }
 // src/tools/view-file.ts
@@ -546,7 +761,7 @@ async function fetchSource(pathOrUrl, options, maxBytes) {
       signal: options.signal
     });
     if (!res.ok)
-      throw new Error(`HTTP ${res.status}`);
+      throw new AppError("VIEW_HTTP_ERROR", `HTTP ${res.status}`, 502);
     const headerMime = (res.headers.get("content-type") ?? "").split(";")[0]?.trim() ?? "";
     const mimeType = headerMime || extMime || "application/octet-stream";
     if (mimeType.startsWith("video/")) {
@@ -562,11 +777,11 @@ async function fetchSource(pathOrUrl, options, maxBytes) {
     return buffer ? { buffer, mimeType, bytesRead: buffer.length } : { tooLarge: true, mimeType, bytesRead: maxBytes };
   }
   if (!options.files) {
-    throw new Error("local file paths are disabled — set files to allow them");
+    throw new AppError("FILE_INVALID_PATH", "local file paths are disabled — set files to allow them", 400);
   }
   options.signal?.throwIfAborted();
   if (!extMime) {
-    throw new Error("refusing to read a non-media file");
+    throw new AppError("FILE_INSPECTION_REJECTED", "refusing to read a non-media file", 422);
   }
   try {
     const source = await options.files.read(pathOrUrl, {
@@ -672,7 +887,7 @@ async function runViewFileOperation(paths, options = {}, signal) {
     } catch (error) {
       if (signal?.aborted)
         throw signal.reason ?? error;
-      const message = error instanceof Error ? error.message : String(error);
+      const message = normalizeFileToolError(error).message;
       errors.push({ path: pathOrUrl, message });
       content.push({ type: "text", text: `[${pathOrUrl}] Error: ${message}` });
     }
@@ -864,6 +1079,95 @@ function inlineMcpAppBundle(html) {
   return html.replace(EXT_APPS_BUNDLE_PLACEHOLDER, () => bundle);
 }
 
+// src/tools/mcp-prepare.ts
+function textBlock(text) {
+  return [{ type: "text", text }];
+}
+function formatMcpResult(result, mode, toolName, errorHint) {
+  if (result.ok) {
+    if (mode === "none")
+      return { content: [] };
+    let serialized;
+    try {
+      serialized = JSON.stringify(result.data, null, 2);
+    } catch {
+      serialized = undefined;
+    }
+    if (serialized === undefined) {
+      const safe = redact(result.data, { sensitiveKeys: /(?!)/ });
+      return { content: textBlock(JSON.stringify(safe, null, 2)), structuredContent: safe };
+    }
+    return { content: textBlock(serialized), structuredContent: result.data };
+  }
+  return {
+    content: textBlock(JSON.stringify(formatToolError(result, toolName, errorHint), null, 2)),
+    isError: true
+  };
+}
+function prepareMcpSurface(services, config = {}) {
+  const serviceList = Array.isArray(services) ? services : [services];
+  const tools = serviceList.flatMap((service) => collectTools(service, "MCP", config));
+  return prepareMcpTools(tools, config);
+}
+function prepareMcpTools(tools, config = {}) {
+  const prepared = prepareProjectedMcpTools(tools.map((mountable) => ({
+    tool: mountable,
+    name: mountable.name,
+    ...mountable.method.paramsSchema !== undefined && {
+      paramsSchema: mountable.method.paramsSchema
+    },
+    ...mountable.method.inputSchema !== undefined && {
+      inputSchema: mountable.method.inputSchema
+    },
+    ...mountable.method.outputSchema !== undefined && {
+      outputSchema: mountable.method.outputSchema
+    },
+    shouldExtend: mountable.shouldExtend,
+    ...mountable.method.mcp !== undefined && { mcp: mountable.method.mcp }
+  })), config).map((entry) => {
+    Object.freeze(entry.tool);
+    return Object.freeze({
+      mountable: entry.tool,
+      inputSchema: entry.inputSchema,
+      ...entry.outputSchema !== undefined && { outputSchema: entry.outputSchema },
+      outputMode: entry.outputSchema === undefined ? "none" : "direct"
+    });
+  });
+  return Object.freeze(prepared);
+}
+function prepareMcpServerSurface(surface, config = {}) {
+  const contractMountables = [];
+  const definitions = [];
+  const runtimeMountables = [];
+  for (const entry of collectToolSurface({
+    surface,
+    transport: "MCP",
+    extend: config.extend,
+    flattenUnionInput: config.flattenUnionInput
+  })) {
+    if (entry.kind === "contract") {
+      contractMountables.push(entry.mountable);
+    } else {
+      definitions.push(entry.definition);
+      runtimeMountables.push(entry.mountable);
+    }
+  }
+  const contractTools = prepareMcpTools(contractMountables, config);
+  const runtimeDescriptors = prepareMcpTools(runtimeMountables, {
+    schemaValidation: config.schemaValidation,
+    logger: config.logger,
+    multiRound: config.multiRound
+  });
+  const descriptorsByName = new Map(runtimeDescriptors.map((descriptor) => [descriptor.mountable.name, descriptor]));
+  const runtimeTools = [];
+  for (const definition of definitions) {
+    const descriptor = descriptorsByName.get(definition.name);
+    if (descriptor)
+      runtimeTools.push(Object.freeze({ definition, descriptor }));
+  }
+  return Object.freeze({ contractTools, runtimeTools: Object.freeze(runtimeTools) });
+}
+
 // src/tools/mcp-round.ts
 import {
   acceptedContent,
@@ -945,28 +1249,6 @@ async function runRoundFailure(tool2, rawArgs, runTool, context, code, message)
     }
   }, rawArgs, context);
 }
-function validateMcpRoundPolicy(tool2, policy, runtime) {
-  if (!runtime?.stateConfigured) {
-    throw new Error(`[stitchkit] MCP tool "${tool2.name}" declares inputRequired but no multiRound.state key is configured`);
-  }
-  const { maxRounds } = runtime;
-  if (!Number.isInteger(maxRounds) || maxRounds < 1) {
-    throw new Error("[stitchkit] multiRound.serving.maxRounds must be a positive integer");
-  }
-  if (policy.inputRequired.length === 0) {
-    throw new Error(`[stitchkit] MCP tool "${tool2.name}" must declare at least one input round`);
-  }
-  if (policy.inputRequired.length > maxRounds) {
-    throw new Error(`[stitchkit] MCP tool "${tool2.name}" declares ${policy.inputRequired.length} input rounds, exceeding maxRounds ${maxRounds}`);
-  }
-  const keys = new Set;
-  for (const request of policy.inputRequired) {
-    if (keys.has(request.key)) {
-      throw new Error(`[stitchkit] MCP tool "${tool2.name}" declares duplicate input key "${request.key}"`);
-    }
-    keys.add(request.key);
-  }
-}
 async function failedResolution(options) {
   const result = await runRoundFailure(options.tool, options.rawArgs, options.runTool, options.context, options.code, options.message);
   return { kind: "response", response: options.formatFailure(result) };
@@ -1099,329 +1381,6 @@ async function resolveMcpRound(options) {
   };
 }
 
-// src/tools/portable-formats.ts
-var PORTABLE_JSON_SCHEMA_FORMATS = new Set([
-  "date",
-  "time",
-  "date-time",
-  "duration",
-  "uri",
-  "uri-reference",
-  "uri-template",
-  "email",
-  "hostname",
-  "ipv4",
-  "ipv6",
-  "regex",
-  "uuid",
-  "json-pointer",
-  "relative-json-pointer"
-]);
-function propertyPath(prefix, property) {
-  return prefix ? `${prefix}.${property}` : property;
-}
-function keywordPath(prefix, keyword) {
-  if (prefix && keyword.startsWith("["))
-    return `${prefix}${keyword}`;
-  return prefix ? `${prefix}.${keyword}` : keyword;
-}
-function findNonPortableFormats(schema, allowFormats = []) {
-  const allowed = new Set([...PORTABLE_JSON_SCHEMA_FORMATS, ...allowFormats]);
-  const found = [];
-  const pending = [{ value: schema, path: "" }];
-  while (pending.length > 0) {
-    const current = pending.pop();
-    if (!current || !isRecord(current.value))
-      continue;
-    const format = current.value.format;
-    if (typeof format === "string" && !allowed.has(format)) {
-      found.push({ path: current.path || "(root)", format });
-    }
-    const properties = current.value.properties;
-    if (isRecord(properties)) {
-      for (const [key, value] of Object.entries(properties)) {
-        pending.push({ value, path: propertyPath(current.path, key) });
-      }
-    }
-    for (const mapKey of ["$defs", "definitions", "patternProperties", "dependentSchemas"]) {
-      const entries = current.value[mapKey];
-      if (!isRecord(entries))
-        continue;
-      for (const [key, value] of Object.entries(entries)) {
-        pending.push({ value, path: keywordPath(current.path, `${mapKey}.${key}`) });
-      }
-    }
-    const directChildren = [
-      ["items", "[]"],
-      ["contains", "contains"],
-      ["additionalProperties", "*"],
-      ["unevaluatedProperties", "*"],
-      ["propertyNames", "propertyNames"],
-      ["not", "not"],
-      ["if", "if"],
-      ["then", "then"],
-      ["else", "else"]
-    ];
-    for (const [keyword, segment] of directChildren) {
-      const child = current.value[keyword];
-      if (isRecord(child)) {
-        pending.push({ value: child, path: keywordPath(current.path, segment) });
-      }
-      if (Array.isArray(child)) {
-        child.forEach((value, index) => {
-          pending.push({ value, path: keywordPath(current.path, `${segment}[${index}]`) });
-        });
-      }
-    }
-    for (const keyword of ["prefixItems", "allOf", "anyOf", "oneOf"]) {
-      const branches = current.value[keyword];
-      if (!Array.isArray(branches))
-        continue;
-      branches.forEach((value, index) => {
-        pending.push({ value, path: keywordPath(current.path, `${keyword}[${index}]`) });
-      });
-    }
-  }
-  return found.sort((left, right) => left.path.localeCompare(right.path) || left.format.localeCompare(right.format));
-}
-
-// src/tools/untyped-properties.ts
-var TYPE_KEYWORDS = ["type", "enum", "const", "anyOf", "oneOf", "allOf", "$ref", "not"];
-function saysWhatItIs(schema) {
-  return TYPE_KEYWORDS.some((keyword) => schema[keyword] !== undefined);
-}
-function findUntypedProperties(schema, prefix = "") {
-  if (!isRecord(schema))
-    return [];
-  const found = [];
-  const properties = schema.properties;
-  if (isRecord(properties)) {
-    for (const [key, value] of Object.entries(properties)) {
-      const path = prefix ? `${prefix}.${key}` : key;
-      if (isRecord(value)) {
-        if (!saysWhatItIs(value)) {
-          const description = value.description;
-          found.push({
-            path,
-            ...typeof description === "string" && { description }
-          });
-        }
-        found.push(...findUntypedProperties(value, path));
-      }
-    }
-  }
-  for (const key of ["items", "additionalProperties"]) {
-    const child = schema[key];
-    if (isRecord(child))
-      found.push(...findUntypedProperties(child, prefix));
-    if (Array.isArray(child)) {
-      for (const entry of child) {
-        if (isRecord(entry))
-          found.push(...findUntypedProperties(entry, prefix));
-      }
-    }
-  }
-  for (const key of ["prefixItems"]) {
-    const child = schema[key];
-    if (Array.isArray(child)) {
-      for (const entry of child) {
-        if (isRecord(entry))
-          found.push(...findUntypedProperties(entry, prefix));
-      }
-    }
-  }
-  const patterned = schema.patternProperties;
-  if (isRecord(patterned)) {
-    for (const value of Object.values(patterned)) {
-      if (isRecord(value))
-        found.push(...findUntypedProperties(value, prefix));
-    }
-  }
-  for (const key of ["$defs", "definitions"]) {
-    const container = schema[key];
-    if (!isRecord(container))
-      continue;
-    for (const definition of Object.values(container)) {
-      if (isRecord(definition))
-        found.push(...findUntypedProperties(definition, prefix));
-    }
-  }
-  for (const key of ["allOf", "anyOf", "oneOf"]) {
-    const branches = schema[key];
-    if (Array.isArray(branches)) {
-      for (const branch of branches)
-        found.push(...findUntypedProperties(branch, prefix));
-    }
-  }
-  return found;
-}
-
-// src/tools/mcp-prepare.ts
-function textBlock(text) {
-  return [{ type: "text", text }];
-}
-function formatMcpResult(result, mode, toolName, errorHint) {
-  if (result.ok) {
-    if (mode === "none")
-      return { content: [] };
-    let serialized;
-    try {
-      serialized = JSON.stringify(result.data, null, 2);
-    } catch {
-      serialized = undefined;
-    }
-    if (serialized === undefined) {
-      const safe = redact(result.data, { sensitiveKeys: /(?!)/ });
-      return { content: textBlock(JSON.stringify(safe, null, 2)), structuredContent: safe };
-    }
-    return { content: textBlock(serialized), structuredContent: result.data };
-  }
-  return {
-    content: textBlock(JSON.stringify(formatToolError(result, toolName, errorHint), null, 2)),
-    isError: true
-  };
-}
-function probeSchema(schema, io) {
-  try {
-    toJsonSchema(schema, io);
-    return null;
-  } catch (err) {
-    return err instanceof Error ? err.message : String(err);
-  }
-}
-function resolveOutputSchema(outputSchema) {
-  if (!outputSchema)
-    return null;
-  return { schema: outputSchema, mode: "direct" };
-}
-function reportIncompatible(message, policy, logger, failures) {
-  if (policy === "throw") {
-    failures.push(message);
-  } else if (policy === "warn") {
-    if (logger)
-      logger.warn(`[stitchkit] ${message}`);
-    else
-      console.warn(`[stitchkit] ${message}`);
-  }
-}
-function throwIfFailures(failures) {
-  if (failures.length > 0) {
-    throw new Error(`[stitchkit] ${failures.length} problem(s) with MCP tool schemas:
- - ${failures.join(`
- - `)}`);
-  }
-}
-function prepareMcpTool(mountable, config, validation, logger, failures, seen) {
-  const policy = validation.policy ?? "throw";
-  assertUniqueToolName(mountable.name, seen.has(mountable.name), "MCP tool name");
-  seen.add(mountable.name);
-  if (mountable.method.mcp) {
-    validateMcpRoundPolicy(mountable, mountable.method.mcp, config.multiRound);
-  }
-  let inputJsonSchema;
-  try {
-    inputJsonSchema = buildToolPresentationSchema({
-      paramsSchema: mountable.method.paramsSchema,
-      inputSchema: mountable.method.inputSchema,
-      extendSchema: mountable.shouldExtend && config.extend ? config.extend.schema : undefined,
-      flattenUnionInput: config.flattenUnionInput,
-      unrepresentable: "throw"
-    });
-  } catch (err) {
-    reportIncompatible(`MCP tool "${mountable.name}" — input schema is not JSON Schema-compatible: ${err instanceof Error ? err.message : String(err)}`, policy, logger, failures);
-    return null;
-  }
-  if (!isObjectPresentationSchema(inputJsonSchema)) {
-    reportIncompatible(`MCP tool "${mountable.name}" — input must be an object schema; a union, discriminated union or scalar cannot be an MCP tool input (flatten it in the contract, or drop MCP from \`expose\`)`, policy, logger, failures);
-    return null;
-  }
-  if (validation.requireTypedProperties) {
-    const allowed = new Set(validation.allowUntyped ?? []);
-    for (const untyped of findUntypedProperties(inputJsonSchema)) {
-      const path = `${mountable.name}.${untyped.path}`;
-      if (allowed.has(path))
-        continue;
-      const clue = untyped.description ? ` (only a description: "${untyped.description}")` : "";
-      reportIncompatible(`MCP tool "${mountable.name}" — input property "${untyped.path}" carries no type, enum or $ref${clue}. ` + "A model is given no way to know what to send. Use `z.json()` for an arbitrary JSON value; use `allowUntyped` only when the presentation value is genuinely not representable as JSON Schema.", policy === "skip" ? "warn" : policy, logger, failures);
-    }
-  }
-  if (validation.requirePortableFormats) {
-    for (const finding of findNonPortableFormats(inputJsonSchema, validation.allowFormats)) {
-      reportIncompatible(`MCP tool "${mountable.name}" — input property "${finding.path}" uses non-portable JSON Schema format "${finding.format}". ` + "Use a portable pattern/schema, or list the format in `allowFormats` only when every MCP client supports it.", policy === "skip" ? "warn" : policy, logger, failures);
-    }
-  }
-  const resolved = resolveOutputSchema(mountable.method.outputSchema);
-  if (!resolved)
-    return { mountable, inputSchema: inputJsonSchema, outputMode: "none" };
-  const outputError = probeSchema(resolved.schema, "output");
-  if (outputError) {
-    reportIncompatible(`MCP tool "${mountable.name}" — output schema is not JSON Schema-compatible: ${outputError}`, policy, logger, failures);
-    return { mountable, inputSchema: inputJsonSchema, outputMode: "none" };
-  }
-  if (validation.requirePortableFormats) {
-    for (const finding of findNonPortableFormats(toJsonSchema(resolved.schema, "output"), validation.allowFormats)) {
-      reportIncompatible(`MCP tool "${mountable.name}" — output property "${finding.path}" uses non-portable JSON Schema format "${finding.format}". ` + "Use a portable pattern/schema, or list the format in `allowFormats` only when every MCP client supports it.", policy === "skip" ? "warn" : policy, logger, failures);
-    }
-  }
-  return {
-    mountable,
-    inputSchema: inputJsonSchema,
-    outputSchema: resolved.schema,
-    outputMode: resolved.mode
-  };
-}
-function prepareMcpSurface(services, config = {}) {
-  const serviceList = Array.isArray(services) ? services : [services];
-  const tools = serviceList.flatMap((service) => collectTools(service, "MCP", config));
-  return prepareMcpTools(tools, config);
-}
-function prepareMcpTools(tools, config = {}) {
-  const seen = new Set;
-  const failures = [];
-  const prepared = [];
-  for (const mountable of tools) {
-    const tool2 = prepareMcpTool(mountable, config, config.schemaValidation ?? {}, config.logger, failures, seen);
-    if (tool2) {
-      Object.freeze(tool2.mountable);
-      prepared.push(Object.freeze(tool2));
-    }
-  }
-  throwIfFailures(failures);
-  return Object.freeze(prepared);
-}
-function prepareMcpServerSurface(surface, config = {}) {
-  const contractMountables = [];
-  const definitions = [];
-  const runtimeMountables = [];
-  for (const entry of collectToolSurface({
-    surface,
-    transport: "MCP",
-    extend: config.extend,
-    flattenUnionInput: config.flattenUnionInput
-  })) {
-    if (entry.kind === "contract") {
-      contractMountables.push(entry.mountable);
-    } else {
-      definitions.push(entry.definition);
-      runtimeMountables.push(entry.mountable);
-    }
-  }
-  const contractTools = prepareMcpTools(contractMountables, config);
-  const runtimeDescriptors = prepareMcpTools(runtimeMountables, {
-    schemaValidation: config.schemaValidation,
-    logger: config.logger,
-    multiRound: config.multiRound
-  });
-  const descriptorsByName = new Map(runtimeDescriptors.map((descriptor) => [descriptor.mountable.name, descriptor]));
-  const runtimeTools = [];
-  for (const definition of definitions) {
-    const descriptor = descriptorsByName.get(definition.name);
-    if (descriptor)
-      runtimeTools.push(Object.freeze({ definition, descriptor }));
-  }
-  return Object.freeze({ contractTools, runtimeTools: Object.freeze(runtimeTools) });
-}
-
 // src/tools/mcp-trace.ts
 import {
   BAGGAGE_META_KEY,
@@ -2015,8 +1974,12 @@ function mountDownload(server, config) {
         timeoutMs: config.timeoutMs
       });
       return textResult(JSON.stringify(result, null, 2));
-    } catch (err) {
-      return textResult(`Download failed: ${err instanceof Error ? err.message : String(err)}`, true);
+    } catch (error) {
+      if (error instanceof DownloadOperationError) {
+        return textResult(`Download failed [${error.code}]: ${error.message}`, true);
+      }
+      const normalized = normalizeFileToolError(error);
+      return textResult(`Download failed [${normalized.code}]: ${normalized.message}`, true);
     }
   });
 }
@@ -2037,8 +2000,9 @@ function mountUpload(server, config) {
     try {
       const uploaded = await runUploadOperation(config.files, path, config.upload);
       return textResult(JSON.stringify(uploaded ?? null, null, 2));
-    } catch (err) {
-      return textResult(`Upload failed: ${err instanceof Error ? err.message : String(err)}`, true);
+    } catch (error) {
+      const normalized = normalizeFileToolError(error);
+      return textResult(`Upload failed [${normalized.code}]: ${normalized.message}`, true);
     }
   });
 }
@@ -2840,6 +2804,7 @@ export {
   createToolLogger,
   createToolkit,
   defineAsyncOperation,
+  defineAsyncOperationContract,
   defineCliCommand,
   defineDownloadTool,
   defineRuntimeTool,