stitchkit 0.54.0 → 0.55.0

package/dist/tools.js

@@ -1,7 +1,7 @@
 import {
   signJwt,
   verifyPkce
-} from "./index-yez419px.js";
+} from "./index-js7yexng.js";
 import {
   DEFAULT_CORS_ALLOW_HEADERS,
   DEFAULT_PROCESS_SIGNALS,
@@ -9,10 +9,9 @@ import {
   defaultSignalSource,
   guardSignalCallback,
   reportSignalError
-} from "./index-b15rtha1.js";
+} from "./index-pzc32v75.js";
 import {
-  assertToolName,
-  assertUniqueToolName,
+  WaitTimeoutError,
   buildToolPresentationSchema,
   coerceJsonArgs,
   collectToolSurface,
@@ -32,33 +31,39 @@ import {
   readCapped,
   runWaitOperation,
   toolErrorFromResult,
-  toolResultFromError,
-  writeDownload
-} from "./index-7vb44hy8.js";
+  toolResultFromError
+} from "./index-0gv7k0ra.js";
 import {
-  isWithinDir,
-  realPathWithinDir,
-  toJsonSchema
-} from "./index-yxpe3phd.js";
+  ManagedFileError
+} from "./index-1k16zv57.js";
+import"./index-sbdmyz75.js";
 import {
-  ApiError,
-  createClient
-} from "./index-e1es808r.js";
-import"./index-48ffdxgk.js";
+  assertToolName,
+  assertUniqueToolName
+} from "./index-k4dftwf7.js";
+import {
+  toJsonSchema
+} from "./index-cby4ar3v.js";
 import {
   redact
-} from "./index-gvha32jh.js";
+} from "./index-qx84bqzk.js";
 import {
-  AppError,
   getRequestContext,
   getTraceId,
-  mergeMeta,
   runWithRequestContext
-} from "./index-173tvqcp.js";
+} from "./index-v4bbq3p4.js";
+import {
+  AppError
+} from "./index-h60df7rj.js";
+import {
+  ManagedFilePathSchema,
+  ManagedFileRefSchema
+} from "./index-6k1937bx.js";
 import {
   isRecord,
   resolvePropagationContext
-} from "./index-bmnhqtya.js";
+} from "./index-7eq9va6e.js";
+import"./index-1bx83sw4.js";
 
 // src/tools/agent.ts
 import { jsonSchema, tool } from "ai";
@@ -85,10 +90,10 @@ function mountAgent(services, config = {}) {
     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 execute = async (rawArgs, options) => {
       const args = isRecord(rawArgs) ? rawArgs : {};
       try {
-        const result = await runTool(mountable, args);
+        const result = await runTool(mountable, args, { signal: options.abortSignal });
         if (result.ok)
           return result.data;
         return formatToolError(result, mountable.name, config.errorHint);
@@ -128,9 +133,239 @@ function mountAgent(services, config = {}) {
   }
   return tools;
 }
-// src/tools/download-core.ts
-import { basename, extname, resolve } from "node:path";
+// src/tools/async-operation.ts
 import { z } from "zod";
+
+// src/tools/native-definition.ts
+function managedNativeIdentity(identity, method) {
+  return { ...identity, method };
+}
+
+// src/tools/define-wait-tool.ts
+function defineWaitTool(config) {
+  const renderedMcp = config.render ? {
+    mcp: (state) => {
+      const rendered = config.render?.(state, false);
+      return {
+        content: [
+          {
+            type: "text",
+            text: rendered?.text ?? JSON.stringify(state, null, 2)
+          }
+        ]
+      };
+    }
+  } : undefined;
+  const present = renderedMcp || config.present ? { ...renderedMcp, ...config.present } : undefined;
+  return defineRuntimeTool({
+    name: config.name ?? "wait",
+    description: config.description,
+    identity: managedNativeIdentity(config.identity, "GET"),
+    input: config.input,
+    output: config.state,
+    transports: config.transports,
+    annotations: config.annotations,
+    present,
+    handler: async (context) => {
+      let result;
+      try {
+        result = await runWaitOperation({
+          input: context.input,
+          poll: async (input, signal) => config.state.parse(await config.poll(input, { ...context, signal })),
+          done: config.done,
+          backoff: config.backoff,
+          timeoutSec: config.timeoutFromInput?.(context.input) ?? config.defaultTimeout,
+          signal: context.signal
+        });
+      } catch (error) {
+        if (error instanceof WaitTimeoutError) {
+          throw new AppError("WAIT_TIMEOUT", "Wait timed out before the first snapshot", 408);
+        }
+        throw error;
+      }
+      const rendered = config.render?.(result.state, result.timedOut);
+      if (result.timedOut) {
+        throw new AppError("WAIT_TIMEOUT", rendered?.text ?? "Wait timed out before the operation completed", 408);
+      }
+      if (rendered?.isError) {
+        throw new AppError("WAIT_FAILED", rendered.text, 409);
+      }
+      return result.state;
+    }
+  });
+}
+
+// src/tools/async-operation.ts
+var AsyncOperationCancelResultSchema = z.discriminatedUnion("outcome", [
+  z.object({ outcome: z.literal("accepted") }),
+  z.object({ outcome: z.literal("already_terminal") }),
+  z.object({ outcome: z.literal("rejected"), reason: z.string().min(1) })
+]);
+function createAsyncOperationSnapshotSchema(config) {
+  const progress = config.progress ? { progress: config.progress.optional() } : {};
+  return z.discriminatedUnion("phase", [
+    z.object({ phase: z.literal("pending"), ...progress }),
+    z.object({ phase: z.literal("running"), ...progress }),
+    z.object({ phase: z.literal("succeeded"), ...progress }),
+    z.object({ phase: z.literal("failed"), failure: config.failure, ...progress }),
+    z.object({ phase: z.literal("cancelled"), ...progress })
+  ]);
+}
+function terminal(snapshot) {
+  if (typeof snapshot !== "object" || snapshot === null || !("phase" in snapshot)) {
+    return false;
+  }
+  return snapshot.phase === "succeeded" || snapshot.phase === "failed" || snapshot.phase === "cancelled";
+}
+function succeeded(snapshot) {
+  return typeof snapshot === "object" && snapshot !== null && "phase" in snapshot && snapshot.phase === "succeeded";
+}
+function defineAsyncOperation(config) {
+  const capabilityName = (capability) => config.names?.[capability] ?? `${config.name}_${capability}`;
+  const description = (capability) => config.descriptions?.[capability] ?? `${config.description}: ${capability}`;
+  const identity = (capability, method) => ({
+    serviceName: config.identity.serviceName,
+    action: `${config.identity.action}.${capability}`,
+    scope: config.scopes?.[capability] ?? config.identity.scope,
+    meta: config.identity.meta,
+    method
+  });
+  const common = (capability) => ({
+    name: capabilityName(capability),
+    description: description(capability),
+    transports: config.transports?.[capability],
+    annotations: config.annotations?.[capability] ?? (capability === "start" || capability === "cancel" ? { destructiveHint: true } : undefined)
+  });
+  const inspect = async (capability, context) => {
+    await config.authorize(context.input, capability, context);
+    const state = config.state.parse(await config.inspect(context.input, context));
+    const snapshot = config.snapshot.parse(await config.classify(state, context));
+    return { state, snapshot };
+  };
+  const start = defineRuntimeTool({
+    ...common("start"),
+    identity: identity("start", "POST"),
+    input: config.startInput,
+    output: config.id,
+    handler: (context) => config.start(context.input, context)
+  });
+  const status = defineRuntimeTool({
+    ...common("status"),
+    identity: identity("status", "GET"),
+    input: config.id,
+    output: config.snapshot,
+    handler: async (context) => (await inspect("status", context)).snapshot
+  });
+  const wait = defineWaitTool({
+    ...common("wait"),
+    identity: identity("wait", "GET"),
+    input: config.id,
+    state: config.snapshot,
+    poll: async (_id, context) => (await inspect("wait", context)).snapshot,
+    done: terminal,
+    backoff: config.backoff,
+    defaultTimeout: config.defaultTimeout,
+    timeoutFromInput: config.timeoutFromId
+  });
+  const definitions = { start, status, wait };
+  const names = new Set;
+  if (config.cancel) {
+    const capability = config.cancel;
+    definitions.cancel = defineRuntimeTool({
+      ...common("cancel"),
+      identity: identity("cancel", "DELETE"),
+      input: config.id,
+      output: AsyncOperationCancelResultSchema,
+      handler: async (context) => {
+        const inspected = await inspect("cancel", context);
+        return capability.handler(inspected.state, context);
+      }
+    });
+  }
+  if (config.result) {
+    const capability = config.result;
+    definitions.result = defineRuntimeTool({
+      ...common("result"),
+      identity: identity("result", "GET"),
+      input: config.id,
+      output: capability.output,
+      handler: async (context) => {
+        const inspected = await inspect("result", context);
+        if (!succeeded(inspected.snapshot)) {
+          throw new AppError("OPERATION_NOT_SUCCEEDED", "Operation result is not available", 409);
+        }
+        return capability.handler(inspected.state, context);
+      }
+    });
+  }
+  if (config.artifacts) {
+    const capability = config.artifacts;
+    definitions.artifacts = defineRuntimeTool({
+      ...common("artifacts"),
+      identity: identity("artifacts", "GET"),
+      input: config.id,
+      output: capability.output,
+      handler: async (context) => {
+        const inspected = await inspect("artifacts", context);
+        if (!succeeded(inspected.snapshot)) {
+          throw new AppError("OPERATION_NOT_SUCCEEDED", "Operation artifacts are not available", 409);
+        }
+        return capability.handler(inspected.state, context);
+      }
+    });
+  }
+  for (const definition of Object.values(definitions)) {
+    assertUniqueToolName(definition.name, names.has(definition.name), "in-process tool name");
+    names.add(definition.name);
+  }
+  return {
+    ...definitions,
+    runtimeTools: Object.values(definitions),
+    schemas: {
+      id: config.id,
+      snapshot: config.snapshot,
+      cancelResult: AsyncOperationCancelResultSchema
+    }
+  };
+}
+function bindContractAsyncOperation(config) {
+  const endpoint = (key) => {
+    const found = config.contract.endpoints[key];
+    if (!found)
+      throw new Error(`Contract async operation method "${key}" not found`);
+    return found;
+  };
+  const start = endpoint(config.capabilities.start);
+  const status = endpoint(config.capabilities.status);
+  const wait = endpoint(config.capabilities.wait);
+  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) {
+    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) {
+      throw new Error(`Contract async operation capability "${capability}" input must reuse the same schema instance as the start output`);
+    }
+  };
+  validateOptional("cancel");
+  validateOptional("result");
+  validateOptional("artifacts");
+  return {
+    contract: config.contract,
+    handlers: config.handlers,
+    capabilities: config.capabilities,
+    schemas: { id: start.output, snapshot: status.output }
+  };
+}
+// src/tools/download-core.ts
+import { basename, extname } from "node:path";
 var DEFAULT_MAX_BYTES = 100 * 1024 * 1024;
 var MIME_EXT = {
   "image/png": ".png",
@@ -143,11 +378,6 @@ var MIME_EXT = {
   "audio/wav": ".wav",
   "audio/ogg": ".ogg"
 };
-var DownloadResultSchema = z.object({
-  path: z.string(),
-  size: z.number().int().nonnegative(),
-  mimeType: z.string()
-});
 
 class DownloadOperationError extends Error {
   code;
@@ -192,19 +422,12 @@ async function runDownloadOperation(config) {
     await res.body?.cancel();
     throw new DownloadOperationError("DOWNLOAD_TOO_LARGE", `file exceeds the ${max}-byte cap`, 413);
   }
-  const buffer = await readCapped(res, max);
-  if (!buffer) {
-    throw new DownloadOperationError("DOWNLOAD_TOO_LARGE", `file exceeds the ${max}-byte cap`, 413);
-  }
-  const dir = resolve(config.dir);
-  const filePath = resolve(dir, `${baseNameFor(config.url)}${extensionFor(config.url, mimeType)}`);
-  await writeDownload(dir, filePath, buffer);
-  return { path: filePath, size: buffer.length, mimeType };
-}
-
-// src/tools/native-definition.ts
-function managedNativeIdentity(identity, method) {
-  return { ...identity, method };
+  const path = config.path ?? `${baseNameFor(config.url)}${extensionFor(config.url, mimeType)}`;
+  return config.files.write(path, res.body ?? new Uint8Array, {
+    maxBytes: max,
+    mediaType: mimeType,
+    signal: config.signal
+  });
 }
 
 // src/tools/define-download-tool.ts
@@ -214,7 +437,7 @@ function defineDownloadTool(config) {
     description: config.description,
     identity: managedNativeIdentity(config.identity, "POST"),
     input: config.input,
-    output: DownloadResultSchema,
+    output: ManagedFileRefSchema,
     transports: config.transports,
     annotations: config.annotations,
     present: config.present,
@@ -226,7 +449,8 @@ function defineDownloadTool(config) {
       try {
         return await runDownloadOperation({
           url,
-          dir: config.dirFromInput?.(context.input) ?? config.defaultDir,
+          files: config.files,
+          path: config.pathFromInput?.(context.input),
           allowPrivateHosts: config.allowPrivateHosts,
           maxBytes: config.maxBytes,
           timeoutMs: config.timeoutMs,
@@ -245,14 +469,14 @@ function defineDownloadTool(config) {
 import { z as z2 } from "zod";
 
 // src/tools/upload-core.ts
-function runUploadOperation(path, upload, signal) {
+function runUploadOperation(files, path, upload, signal) {
   signal?.throwIfAborted();
-  return upload(path, signal);
+  return files.read(path, { signal }).then((source) => upload(source, signal));
 }
 
 // src/tools/define-upload-tool.ts
 var UploadToolInputSchema = z2.object({
-  path: z2.string().min(1).describe("Path to a local file on this machine")
+  path: ManagedFilePathSchema.describe("Path relative to the configured file boundary")
 });
 function defineUploadTool(config) {
   return defineRuntimeTool({
@@ -264,12 +488,11 @@ function defineUploadTool(config) {
     transports: config.transports,
     annotations: config.annotations,
     present: config.present,
-    handler: async (context) => runUploadOperation(context.input.path, (path) => config.upload(path, context), context.signal)
+    handler: async (context) => runUploadOperation(config.files, context.input.path, (source) => config.upload(source, context), context.signal)
   });
 }
 // src/tools/view-file.ts
-import { readFile, stat } from "node:fs/promises";
-import { extname as extname2, resolve as resolve2 } from "node:path";
+import { extname as extname2 } from "node:path";
 import { z as z3 } from "zod";
 var MAX_INLINE_BYTES = 20 * 1024 * 1024;
 var MAX_VIEW_FILES = 20;
@@ -335,32 +558,33 @@ async function fetchSource(pathOrUrl, options, maxBytes) {
       await res.body?.cancel();
       return { tooLarge: true, mimeType, bytesRead: 0 };
     }
-    const buffer2 = await readCapped(res, maxBytes);
-    return buffer2 ? { buffer: buffer2, mimeType, bytesRead: buffer2.length } : { tooLarge: true, mimeType, bytesRead: maxBytes };
+    const buffer = await readCapped(res, maxBytes);
+    return buffer ? { buffer, mimeType, bytesRead: buffer.length } : { tooLarge: true, mimeType, bytesRead: maxBytes };
   }
-  if (!options.baseDir) {
-    throw new Error("local file paths are disabled — set baseDir to allow them");
+  if (!options.files) {
+    throw new Error("local file paths are disabled — set files to allow them");
   }
   options.signal?.throwIfAborted();
   if (!extMime) {
     throw new Error("refusing to read a non-media file");
   }
-  const root = resolve2(options.baseDir);
-  const target = resolve2(root, pathOrUrl);
-  if (!isWithinDir(root, target)) {
-    throw new Error("path escapes the allowed directory");
-  }
-  const realTarget = await realPathWithinDir(root, target);
-  if (realTarget === null) {
-    throw new Error("path escapes the allowed directory");
+  try {
+    const source = await options.files.read(pathOrUrl, {
+      maxBytes,
+      signal: options.signal
+    });
+    const buffer = Buffer.from(source.bytes);
+    return {
+      buffer,
+      mimeType: source.ref.mediaType ?? extMime,
+      bytesRead: buffer.length
+    };
+  } catch (error) {
+    if (error instanceof ManagedFileError && error.code === "FILE_TOO_LARGE") {
+      return { tooLarge: true, mimeType: extMime, bytesRead: maxBytes };
+    }
+    throw error;
   }
-  const info = await stat(realTarget).catch(() => null);
-  if (!info?.isFile())
-    throw new Error("file not found");
-  if (info.size > maxBytes)
-    return { tooLarge: true, mimeType: extMime, bytesRead: 0 };
-  const buffer = await readFile(realTarget, { signal: options.signal });
-  return { buffer, mimeType: extMime, bytesRead: buffer.length };
 }
 async function resolveMediaWithinBudget(pathOrUrl, options, maxBytes) {
   if (maxBytes <= 0) {
@@ -497,57 +721,12 @@ function defineViewFileTool(config) {
     },
     present: { ...defaults, ...config.present },
     handler: (context) => runViewFileOperation(context.input.paths, {
-      baseDir: config.baseDir,
+      files: config.files,
       allowPrivateHosts: config.allowPrivateHosts,
       timeoutMs: config.timeoutMs
     }, context.signal)
   });
 }
-// src/tools/define-wait-tool.ts
-function defineWaitTool(config) {
-  const renderedMcp = config.render ? {
-    mcp: (state) => {
-      const rendered = config.render?.(state, false);
-      return {
-        content: [
-          {
-            type: "text",
-            text: rendered?.text ?? JSON.stringify(state, null, 2)
-          }
-        ]
-      };
-    }
-  } : undefined;
-  const present = renderedMcp || config.present ? { ...renderedMcp, ...config.present } : undefined;
-  return defineRuntimeTool({
-    name: config.name ?? "wait",
-    description: config.description,
-    identity: managedNativeIdentity(config.identity, "GET"),
-    input: config.input,
-    output: config.state,
-    transports: config.transports,
-    annotations: config.annotations,
-    present,
-    handler: async (context) => {
-      const result = await runWaitOperation({
-        input: context.input,
-        poll: async (input) => config.state.parse(await config.poll(input, context)),
-        done: config.done,
-        backoff: config.backoff,
-        timeoutSec: config.timeoutFromInput?.(context.input) ?? config.defaultTimeout,
-        signal: context.signal
-      });
-      const rendered = config.render?.(result.state, result.timedOut);
-      if (result.timedOut) {
-        throw new AppError("WAIT_TIMEOUT", rendered?.text ?? "Wait timed out before the operation completed", 408);
-      }
-      if (rendered?.isError) {
-        throw new AppError("WAIT_FAILED", rendered.text, 409);
-      }
-      return result.state;
-    }
-  });
-}
 // src/tools/invoker.ts
 function createToolInvoker(services, config) {
   const serviceList = Array.isArray(services) ? services : [services];
@@ -595,6 +774,24 @@ function createToolInvoker(services, config) {
     }
   });
 }
+// src/tools/lifecycle.ts
+function composeToolLifecycle(...hooks) {
+  return {
+    beforeHandle: async (ctx, endpoint) => {
+      for (const hook of hooks)
+        await hook?.beforeHandle?.(ctx, endpoint);
+    },
+    afterHandle: async (ctx, result, endpoint) => {
+      let current = result;
+      for (const hook of hooks) {
+        const transformed = await hook?.afterHandle?.(ctx, current, endpoint);
+        if (transformed !== undefined)
+          current = transformed;
+      }
+      return current;
+    }
+  };
+}
 // src/tools/list-names.ts
 var TOOL_TRANSPORTS = ["MCP", "AGENT", "CLI"];
 function listToolNames(surface) {
@@ -1610,8 +1807,8 @@ function createMcpHandler(config) {
   const authByCarrier = new WeakMap;
   let closed = false;
   let resolveClosed;
-  const closedSignal = new Promise((resolve3) => {
-    resolveClosed = resolve3;
+  const closedSignal = new Promise((resolve) => {
+    resolveClosed = resolve;
   });
   const sdkHandler = createSdkMcpHandler(({ authInfo }) => {
     const resolved = authInfo ? authByCarrier.get(authInfo) : undefined;
@@ -1714,8 +1911,8 @@ function bindStdioProcessSignals(handle, options = {}) {
   let rejectChain = () => {
     return;
   };
-  const promise = new Promise((resolve3, reject) => {
-    resolveChain = resolve3;
+  const promise = new Promise((resolve, reject) => {
+    resolveChain = resolve;
     rejectChain = reject;
   });
   promise.catch(() => {
@@ -1811,7 +2008,8 @@ function mountDownload(server, config) {
         return textResult("Nothing to download.", true);
       const result = await runDownloadOperation({
         url,
-        dir: config.dirFromArgs?.(args) ?? config.defaultDir,
+        files: config.files,
+        path: config.pathFromArgs?.(args),
         allowPrivateHosts: config.allowPrivateHosts,
         maxBytes: config.maxBytes,
         timeoutMs: config.timeoutMs
@@ -1823,20 +2021,21 @@ function mountDownload(server, config) {
   });
 }
 // src/tools/mount-upload.ts
-import { z as z7 } from "zod";
 function mountUpload(server, config) {
   const name = config.name ?? "upload";
   assertToolName(name, "<native>", "upload");
   server.registerTool(name, {
     description: config.description,
-    inputSchema: { path: z7.string().describe("Path to a local file on this machine") }
+    inputSchema: {
+      path: ManagedFilePathSchema.describe("Path relative to the configured file boundary")
+    }
   }, async (rawArgs) => {
     const args = isRecord(rawArgs) ? rawArgs : {};
     const path = typeof args.path === "string" ? args.path : "";
     if (!path)
       return textResult("Provide `path`.", true);
     try {
-      const uploaded = await runUploadOperation(path, config.upload);
+      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);
@@ -1844,11 +2043,11 @@ function mountUpload(server, config) {
   });
 }
 // src/tools/mount-wait.ts
-import { z as z8 } from "zod";
+import { z as z7 } from "zod";
 function mountWait(server, config) {
   const name = config.name ?? "wait";
   assertToolName(name, "<native>", "wait");
-  server.registerTool(name, { description: config.description, inputSchema: z8.object(config.inputSchema) }, async (rawArgs) => {
+  server.registerTool(name, { description: config.description, inputSchema: z7.object(config.inputSchema) }, async (rawArgs) => {
     const args = isRecord(rawArgs) ? rawArgs : {};
     try {
       const { state, timedOut } = await runWaitOperation({
@@ -1867,19 +2066,19 @@ function mountWait(server, config) {
 }
 // src/tools/oauth-provider.ts
 import { randomUUID } from "node:crypto";
-import { z as z9 } from "zod";
+import { z as z8 } from "zod";
 function isPlainDisplayCharacter(character) {
   const codePoint = character.codePointAt(0);
   return codePoint !== undefined && codePoint >= 32 && codePoint !== 127 && character !== "<" && character !== ">";
 }
-var CimdClientMetadataSchema = z9.object({
-  client_id: z9.url(),
-  redirect_uris: z9.array(z9.url()).min(1),
-  client_name: z9.string().trim().min(1).max(200).refine((value) => Array.from(value).every(isPlainDisplayCharacter), {
+var CimdClientMetadataSchema = z8.object({
+  client_id: z8.url(),
+  redirect_uris: z8.array(z8.url()).min(1),
+  client_name: z8.string().trim().min(1).max(200).refine((value) => Array.from(value).every(isPlainDisplayCharacter), {
     message: "client_name must be plain display text"
   }),
-  token_endpoint_auth_method: z9.literal("none"),
-  application_type: z9.enum(["native", "web"]).optional()
+  token_endpoint_auth_method: z8.literal("none"),
+  application_type: z8.enum(["native", "web"]).optional()
 });
 function createSecureClientMetadataFetcher(policy = {}) {
   assertPositiveInteger("cimd.maxBytes", policy.maxBytes ?? DEFAULT_CIMD_MAX_BYTES);
@@ -2512,67 +2711,6 @@ function mountOAuthProvider(config) {
   };
   return dcrEnabled ? [metadataRoute, registerRoute, authorizeRoute, tokenRoute] : [metadataRoute, authorizeRoute, tokenRoute];
 }
-// src/tools/remote.ts
-var HTTP_ONLY = Object.freeze(["HTTP"]);
-function toArgs(ctx) {
-  const { params, input } = ctx;
-  return {
-    ...isRecord(params) ? params : {},
-    ...isRecord(input) ? input : {}
-  };
-}
-function implementRemote(contract, http, options) {
-  const client = createClient(contract, http);
-  const groupScope = contract.meta.scope ?? "public";
-  const methods = {};
-  for (const [key, endpoint] of Object.entries(contract.endpoints)) {
-    methods[key] = {
-      method: endpoint.method,
-      path: endpoint.path,
-      desc: endpoint.desc,
-      serviceName: contract.meta.prefix,
-      key,
-      toolName: "toolName" in endpoint ? endpoint.toolName : undefined,
-      expose: endpoint.rawResponse || endpoint.rawBody || endpoint.responseMeta ? HTTP_ONLY : endpoint.expose,
-      ui: "ui" in endpoint ? endpoint.ui : undefined,
-      annotations: "annotations" in endpoint ? endpoint.annotations : undefined,
-      meta: mergeMeta(contract.meta.meta, endpoint.meta),
-      scope: endpoint.scope ?? groupScope,
-      paramsSchema: endpoint.params,
-      inputSchema: endpoint.input,
-      outputSchema: endpoint.output,
-      multipart: endpoint.multipart,
-      maxJsonBodyBytes: endpoint.maxJsonBodyBytes,
-      idempotent: endpoint.idempotent,
-      rawResponse: endpoint.rawResponse,
-      rawBody: endpoint.rawBody,
-      responseMeta: endpoint.responseMeta,
-      contentType: "contentType" in endpoint ? endpoint.contentType : undefined,
-      handler: async (ctx) => {
-        const call = client[key];
-        if (!call) {
-          throw new Error(`implementRemote: endpoint "${key}" is not exposed over HTTP`);
-        }
-        const args = toArgs(ctx);
-        try {
-          const finalArgs = options?.transformArgs ? await options.transformArgs(key, args) : args;
-          return await call(finalArgs);
-        } catch (err) {
-          if (ApiError.is(err)) {
-            throw new AppError(err.code, err.message, err.status, isRecord(err.details) ? err.details : undefined, err.hint, err.traceId);
-          }
-          throw err;
-        }
-      }
-    };
-  }
-  return {
-    name: contract.meta.prefix,
-    prefix: contract.meta.prefix,
-    scope: groupScope,
-    methods
-  };
-}
 // src/tools/tool-logger.ts
 function createToolLogger(config = {}) {
   const log = config.log ?? ((line) => console.error(line));
@@ -2673,56 +2811,59 @@ function summarizeTransports(surface) {
   };
 }
 export {
-  wwwAuthenticateHeader,
-  validateMcpSchemas,
-  summarizeTransports,
-  resolveMedia,
-  protectedResourceMetadataUrl,
-  oauthProtectedResourceRoute,
-  mountWait,
-  mountViewFile,
-  mountUpload,
-  mountOAuthProvider,
-  mountMcpResource,
-  mountMcp,
-  mountDownload,
-  mountAgent,
-  listToolNames,
-  listContractToolNames,
-  inlineMcpAppBundle,
-  implementRemote,
-  flattenToolJsonSchema,
-  findUntypedProperties,
-  findNonPortableFormats,
-  defineWaitTool,
-  defineViewFileTool,
-  defineUploadTool,
-  defineRuntimeTool,
-  defineDownloadTool,
-  defineCliCommand,
-  createToolkit,
-  createToolLogger,
-  createToolInvoker,
-  createStdioMcpServer,
-  createSecureClientMetadataFetcher,
-  createRuntimeToolFactory,
-  createMcpHttpRoute,
-  createMcpHandler,
-  createCli,
-  collectTools,
-  coerceJsonArgs,
-  buildToolManifest,
-  buildMcpServer,
-  bindStdioProcessSignals,
-  ViewFileOutputSchema,
-  ViewFileInputSchema,
-  ViewFileErrorSchema,
-  UploadToolInputSchema,
-  RESOURCE_MIME_TYPE,
-  PROTECTED_RESOURCE_PATH,
-  PORTABLE_JSON_SCHEMA_FORMATS,
-  McpMediaContentSchema,
-  McpAnnotationsSchema,
+  AsyncOperationCancelResultSchema,
   EXT_APPS_BUNDLE_PLACEHOLDER,
-  DownloadResultSchema
+  McpAnnotationsSchema,
+  McpMediaContentSchema,
+  PORTABLE_JSON_SCHEMA_FORMATS,
+  PROTECTED_RESOURCE_PATH,
+  RESOURCE_MIME_TYPE,
+  UploadToolInputSchema,
+  ViewFileErrorSchema,
+  ViewFileInputSchema,
+  ViewFileOutputSchema,
+  bindContractAsyncOperation,
+  bindStdioProcessSignals,
+  buildMcpServer,
+  buildToolManifest,
+  coerceJsonArgs,
+  collectTools,
+  composeToolLifecycle,
+  createAsyncOperationSnapshotSchema,
+  createCli,
+  createMcpHandler,
+  createMcpHttpRoute,
+  createRuntimeToolFactory,
+  createSecureClientMetadataFetcher,
+  createStdioMcpServer,
+  createToolInvoker,
+  createToolLogger,
+  createToolkit,
+  defineAsyncOperation,
+  defineCliCommand,
+  defineDownloadTool,
+  defineRuntimeTool,
+  defineUploadTool,
+  defineViewFileTool,
+  defineWaitTool,
+  findNonPortableFormats,
+  findUntypedProperties,
+  flattenToolJsonSchema,
+  inlineMcpAppBundle,
+  listContractToolNames,
+  listToolNames,
+  mountAgent,
+  mountDownload,
+  mountMcp,
+  mountMcpResource,
+  mountOAuthProvider,
+  mountUpload,
+  mountViewFile,
+  mountWait,
+  oauthProtectedResourceRoute,
+  protectedResourceMetadataUrl,
+  resolveMedia,
+  summarizeTransports,
+  validateMcpSchemas,
+  wwwAuthenticateHeader
 };