apps 0.0.1-beta.5 → 0.0.1-beta.6

package/js/{chunk-XHO2ZX6W.js → chunk-RFVIONFX.js}

@@ -1,9 +1,9 @@
 import {
   CacheError
-} from "./chunk-YEPYT6SD.js";
+} from "./chunk-R3EV5FTO.js";
 import {
   wrap
-} from "./chunk-FWQC6I3C.js";
+} from "./chunk-5T57N25Q.js";
 import {
   JsonObject
 } from "./chunk-27F7W2LG.js";
@@ -18,7 +18,8 @@ var schema = (decoder) => wrap(decoder, false);
 var Manifest = Schema_exports.Struct({
   revision: Schema_exports.String,
   pages: Schema_exports.Int,
-  summaries: Schema_exports.Int
+  summaries: Schema_exports.Int,
+  header: Schema_exports.optionalKey(JsonObject)
 });
 var invoke = (work) => Effect_exports.tryPromise({ try: work, catch: (error) => error });
 var catalogCache = (options) => Effect_exports.gen(function* () {
@@ -35,9 +36,12 @@ var catalogCache = (options) => Effect_exports.gen(function* () {
   const retention = Duration_exports.toMillis(Duration_exports.fromInputUnsafe(freshFor)) + Duration_exports.toMillis(Duration_exports.fromInputUnsafe(staleFor)) + 3e5;
   const local = yield* Effect_exports.cached(options.load());
   const refresh = (context) => Effect_exports.gen(function* () {
-    const tools = yield* options.load(context);
+    const { tools, header } = yield* options.load(context);
     const digest = yield* invoke(
-      () => crypto.subtle.digest("SHA-256", new TextEncoder().encode(JSON.stringify(tools)))
+      () => crypto.subtle.digest(
+        "SHA-256",
+        new TextEncoder().encode(JSON.stringify({ tools, header: header ?? null }))
+      )
     );
     const revision = Array.from(
       new Uint8Array(digest),
@@ -104,7 +108,12 @@ var catalogCache = (options) => Effect_exports.gen(function* () {
     yield* pageOut();
     yield* summaryOut();
     yield* flush();
-    return { revision, pages: pages2, summaries };
+    return {
+      revision,
+      pages: pages2,
+      summaries,
+      ...header === void 0 ? {} : { header: yield* json(header) }
+    };
   });
   const getOptions = {
     key,
@@ -113,7 +122,12 @@ var catalogCache = (options) => Effect_exports.gen(function* () {
     staleFor,
     load: (context) => Effect_exports.runPromise(refresh(context), { signal: context.signal })
   };
-  const current = () => cache === void 0 ? Effect_exports.fail(new CacheError({ reason: "unavailable" })) : invoke(() => cache.get(getOptions));
+  let reading;
+  const current = () => cache === void 0 ? Effect_exports.fail(new CacheError({ reason: "unavailable" })) : invoke(
+    () => reading ??= cache.get(getOptions).finally(() => {
+      reading = void 0;
+    })
+  );
   if (options.revalidate) {
     if (cache === void 0) yield* local;
     else yield* invoke(() => cache.revalidate(getOptions));
@@ -140,14 +154,17 @@ var catalogCache = (options) => Effect_exports.gen(function* () {
     return values;
   });
   const metadata = () => Effect_exports.gen(function* () {
-    if (cache === void 0) return yield* local;
+    if (cache === void 0) return (yield* local).tools;
     const manifest = yield* current();
     return yield* pages(cache, manifest.revision, "page", manifest.pages, options.schema);
   });
   return {
     list: metadata,
+    /** The record stored with the current revision, if the source supplied one. */
+    header: () => cache === void 0 ? local.pipe(Effect_exports.map(({ header }) => header)) : current().pipe(Effect_exports.map((manifest) => manifest.header)),
     summaries: () => Effect_exports.gen(function* () {
-      if (cache === void 0) return (yield* local).map((tool) => options.summary.of(tool));
+      if (cache === void 0)
+        return (yield* local).tools.map((tool) => options.summary.of(tool));
       const manifest = yield* current();
       return yield* pages(
         cache,
@@ -157,7 +174,7 @@ var catalogCache = (options) => Effect_exports.gen(function* () {
         options.summary.schema
       );
     }),
-    resolve: (name) => cache === void 0 ? local.pipe(Effect_exports.map((tools) => tools.find((tool) => tool.name === name))) : current().pipe(
+    resolve: (name) => cache === void 0 ? local.pipe(Effect_exports.map(({ tools }) => tools.find((tool) => tool.name === name))) : current().pipe(
       Effect_exports.flatMap(
         (manifest) => invoke(
           () => cache.read(part(manifest.revision, "tool", name), schema(options.schema))

package/js/{chunk-LUVSFETN.js → chunk-SB4HEPNJ.js}

@@ -1,29 +1,36 @@
 import {
   makeCache
-} from "./chunk-CYYBFC2K.js";
+} from "./chunk-NKLWZJLE.js";
+import {
+  accountSecrets,
+  boundFailureMessage,
+  describeFailure,
+  failureDetail,
+  readCatalog,
+  routerSkills
+} from "./chunk-MNMNLXBL.js";
 import {
   folderSkillsEffect
 } from "./chunk-IPI4MFSN.js";
-import {
-  OpenapiError
-} from "./chunk-4M277YTM.js";
 import {
   authorDatabase,
   isApp,
   toEffectApp,
   unavailableStorage
-} from "./chunk-C3VAOK5B.js";
+} from "./chunk-OE3QQTSB.js";
 import {
   parseDatabaseSchema
 } from "./chunk-ZQINWV4W.js";
 import {
+  declaredOperations,
   fromPromise,
+  locate,
   nativeOperation,
   toPromise
-} from "./chunk-3XKZDQLM.js";
+} from "./chunk-T7GKZBLP.js";
 import {
   parseProviderError
-} from "./chunk-G7T27IWB.js";
+} from "./chunk-MKWZPDR6.js";
 import {
   DeclaredProvider,
   DeclaredRequirements,
@@ -35,6 +42,7 @@ import {
   HostError,
   HostEvaluationFailed,
   HostInputInvalid,
+  HostKindMismatch,
   HostOperationFailed,
   HostOperationNotFound,
   HostOutputInvalid,
@@ -44,6 +52,7 @@ import {
   HostToolBlocked,
   HostToolNotFound,
   HostToolPolicyFailed,
+  HostedRouter,
   HostedTool,
   HostedToolSummary,
   HostedWebhook,
@@ -53,7 +62,7 @@ import {
   ManyAccounts,
   McpError,
   NonRetryableError,
-  OperationToolPrefixes,
+  OpenapiResponseError,
   ResolvedAccounts,
   ToolResultObservation,
   TrustedToolApproval,
@@ -66,24 +75,17 @@ import {
   WorkflowValue,
   approvalElicitation,
   defaultWebhookTransportLimits,
-  maxFailureMessageLength,
   maxInputProblems,
   workflowDurationMillis
-} from "./chunk-DQAZTA4I.js";
-import {
-  AppDatabaseError
-} from "./chunk-N7YDVXYJ.js";
+} from "./chunk-B3EOZTK3.js";
 import {
   CacheError
-} from "./chunk-YEPYT6SD.js";
+} from "./chunk-R3EV5FTO.js";
 import {
   AppSkills,
   SkillFile,
   SkillLoadFailed
 } from "./chunk-JU7VHODU.js";
-import {
-  OpenapiResponseError
-} from "./chunk-W4DMKWAB.js";
 import {
   captureTelemetry,
   invocationFetch
@@ -91,12 +93,9 @@ import {
 import {
   decoderOf,
   importedJsonSchema,
-  jsonSchemaDecoder
-} from "./chunk-FWQC6I3C.js";
-import {
-  AppStorageError,
-  AppStorageUnavailable
-} from "./chunk-PZB6T6KU.js";
+  jsonSchemaDecoder,
+  jsonSchemaDocument
+} from "./chunk-5T57N25Q.js";
 import {
   JsonObject,
   JsonValue
@@ -108,7 +107,6 @@ import {
   Encoding_exports,
   Match_exports,
   Option_exports,
-  Predicate_exports,
   Redacted_exports,
   SchemaIssue_exports,
   Schema_exports,
@@ -153,109 +151,18 @@ var makeElicit = (handler, signal) => toPromise(
 // src/contracts/approval.ts
 var ApprovalDecision = Schema_exports.Literals(["approved", "denied", "user-approval"]);
 
-// src/implementation/failure-detail.ts
-var storageMessages = {
-  schema: "The app's database schema is invalid.",
-  schema_changed: "The app's database schema changed during this operation. Retry it.",
-  table: "The operation used a table the app's database schema does not declare.",
-  index: "The operation used an index the table does not declare, or used it incorrectly.",
-  range: "The index range is invalid for the declared index.",
-  value: "A value does not match the table's declared field schema.",
-  readonly: "Queries cannot write. Move writes into a mutation.",
-  cursor: "The pagination cursor is invalid or belongs to a different query.",
-  limit: "The operation exceeded a per-invocation app data limit.",
-  closed: "The database session closed before this operation finished.",
-  storage: "App storage failed to complete the operation.",
-  replay: "A workflow step replayed with different input than its first run."
-};
-var minimumSecretLength = 6;
-var secretValues = (value, found) => {
-  if (typeof value === "string") {
-    if (value.length >= minimumSecretLength) found.add(value);
-  } else if (Array.isArray(value)) for (const item of value) secretValues(item, found);
-  else if (Predicate_exports.isObject(value))
-    for (const item of Object.values(value)) secretValues(item, found);
-  return found;
-};
-var accountFieldSecrets = (accounts) => {
-  const found = /* @__PURE__ */ new Set();
-  if (Predicate_exports.isObject(accounts)) {
-    for (const slot of Object.values(accounts))
-      for (const account of Array.isArray(slot) ? slot : [slot])
-        if (Predicate_exports.hasProperty(account, "fields")) secretValues(account.fields, found);
-  }
-  return [...found].sort((a, b) => b.length - a.length);
-};
-var accountSecrets = (accounts) => accountFieldSecrets(Redacted_exports.value(accounts));
-var boundFailureMessage = (message, secrets) => {
-  let redacted = message;
-  for (const secret of secrets) redacted = redacted.split(secret).join("[redacted]");
-  return redacted.length <= maxFailureMessageLength ? redacted : `${redacted.slice(0, maxFailureMessageLength - 1)}\u2026`;
-};
-var errorName = (error) => (error.name.length > 0 ? error.name : "Error").slice(0, 128);
-var ownMessage = (error) => {
-  const cause = error.cause;
-  const suffix = cause instanceof Error && cause.message.length > 0 ? ` (caused by ${errorName(cause)}: ${cause.message})` : "";
-  return error.message.length > 0 ? `${error.message}${suffix}` : void 0;
-};
-var describeFailure = (error) => error instanceof Error ? `${errorName(error)}: ${ownMessage(error) ?? "(no message)"}` : typeof error === "string" ? error : `A non-Error ${error === null ? "null" : typeof error} value was thrown`;
-var failureDetail = (error, secrets) => {
-  if (Schema_exports.is(AppDatabaseError)(error))
-    return {
-      source: "storage",
-      errorName: "AppDatabaseError",
-      code: error.reason,
-      message: boundFailureMessage(ownMessage(error) ?? storageMessages[error.reason], secrets)
-    };
-  if (Schema_exports.is(AppStorageUnavailable)(error))
-    return {
-      source: "storage",
-      errorName: "AppStorageUnavailable",
-      message: "App storage is not available on this host."
-    };
-  if (Schema_exports.is(AppStorageError)(error))
-    return {
-      source: "storage",
-      errorName: "AppStorageError",
-      message: "App storage failed to complete the operation."
-    };
-  if (Schema_exports.is(OpenapiError)(error))
-    return {
-      source: "service",
-      errorName: "OpenapiError",
-      code: error.reason,
-      message: error.reason === "request" ? error.status === void 0 ? "The API request failed before a response arrived." : `The API responded with HTTP ${error.status}, which its OpenAPI document does not declare as an error with a message.` : error.reason === "invalid_input" ? "The input could not be encoded as a request for this API operation." : "The API's OpenAPI definition for this operation is invalid."
-    };
-  if (error instanceof Error)
-    return {
-      source: "app",
-      errorName: errorName(error),
-      message: boundFailureMessage(
-        ownMessage(error) ?? `${errorName(error)} was thrown without a message.`,
-        secrets
-      )
-    };
-  if (typeof error === "string")
-    return { source: "app", errorName: "string", message: boundFailureMessage(error, secrets) };
-  return {
-    source: "app",
-    errorName: typeof error,
-    message: `A non-Error ${error === null ? "null" : typeof error} value was thrown.`
-  };
-};
-
 // src/implementation/workflow-context.ts
 var workflowSafe = (work, secrets) => work.pipe(
   Effect_exports.catchCause((cause) => {
     if (Cause_exports.hasInterrupts(cause)) return Effect_exports.interrupt;
     const error = Cause_exports.squash(cause);
     if (Schema_exports.is(WorkflowFailure)(error)) return Effect_exports.fail(error);
-    const { errorName: errorName2, message } = failureDetail(error, secrets);
+    const { errorName, message } = failureDetail(error, secrets);
     return Effect_exports.fail(
       new WorkflowFailure({
         reason: "execution",
         retryable: !(error instanceof NonRetryableError),
-        ...errorName2 === void 0 ? {} : { errorName: errorName2 },
+        ...errorName === void 0 ? {} : { errorName },
         ...message === void 0 ? {} : { message }
       })
     );
@@ -346,9 +253,9 @@ var makeWorkflowContext = (execution, definition, fresh, signal) => Effect_expor
   });
   const operationStep = (kind, name, operation, input, options) => Effect_exports.gen(function* () {
     const target = nativeOperation(operation);
-    const catalog = kind === "query" ? definition.queries : definition.mutations;
-    const match = Object.entries(catalog ?? {}).find(
-      ([, value]) => value === target && value.kind === kind
+    const root = definition.tools?.kind === "router" ? definition.tools : void 0;
+    const match = declaredOperations(root).find(
+      (entry) => entry.operation === target && entry.operation.kind === kind
     );
     if (target === void 0 || match === void 0)
       return yield* new WorkflowFailure({ reason: "operation", retryable: false });
@@ -367,7 +274,7 @@ var makeWorkflowContext = (execution, definition, fresh, signal) => Effect_expor
       parsed,
       () => attempt(
         parsed,
-        execution.invoke({ kind, name: match[0], input: args, stepId, timeout }).pipe(Effect_exports.provideContext(services))
+        execution.invoke({ kind, name: match.name, input: args, stepId, timeout }).pipe(Effect_exports.provideContext(services))
       )
     ).pipe(Effect_exports.mapError(inStep(name)));
   });
@@ -647,6 +554,10 @@ var authorCache = (host, accounts, signal, deadline) => {
 };
 
 // src/implementation/host.ts
+var WireCatalog = Schema_exports.Struct({
+  tools: Schema_exports.Array(Schema_exports.Union([HostedTool, HostedToolSummary])),
+  routers: Schema_exports.Array(HostedRouter)
+});
 function safe2(work, failure) {
   return Effect_exports.suspend(work).pipe(
     Effect_exports.catchCause(
@@ -666,16 +577,6 @@ var evaluationSafe = (work, secrets) => work.pipe(
     );
   })
 );
-function jsonSchema(decoder) {
-  const imported = importedJsonSchema(decoder);
-  if (imported !== void 0) return Schema_exports.decodeUnknownEffect(JsonObject)(imported);
-  const document = Schema_exports.toJsonSchemaDocument(decoder);
-  return Schema_exports.decodeUnknownEffect(JsonObject)({
-    ...document.schema,
-    $defs: document.definitions,
-    $schema: "https://json-schema.org/draft/2020-12/schema"
-  });
-}
 var declarationInvalid = (summary, cause, secrets = []) => new HostDeclarationInvalid({
   source: "app",
   errorName: "HostDeclarationInvalid",
@@ -699,14 +600,14 @@ function providerDeclaration(provider) {
             auth.set(name, {
               type: "secrets",
               label: method.label,
-              fields: yield* jsonSchema(method.fields)
+              fields: yield* jsonSchemaDocument(method.fields)
             });
             break;
           case "oauth2":
             auth.set(name, {
               type: "oauth2",
               ...method.config,
-              response: yield* jsonSchema(method.response)
+              response: yield* jsonSchemaDocument(method.response)
             });
             break;
         }
@@ -910,27 +811,33 @@ function dispatch(app, request, context, signal) {
         const declared2 = definition.skills ?? (yield* folderSkillsEffect({ files }).pipe(
           Effect_exports.mapError(() => new HostDeclarationInvalid())
         ));
-        const source2 = definition.dynamicSkills;
+        const source = definition.dynamicSkills;
         const before = cacheCommands;
-        const dynamic = source2 === void 0 ? [] : yield* evaluationSafe(Effect_exports.suspend(source2.list), secrets).pipe(
+        const dynamic = source === void 0 ? [] : yield* evaluationSafe(Effect_exports.suspend(source.list), secrets).pipe(
           Effect_exports.withSpan("app.skills.load")
         );
-        const cached = source2 !== void 0 && cacheCommands > before;
-        const skills = yield* Schema_exports.decodeUnknownEffect(AppSkills)([...declared2, ...dynamic]).pipe(
-          Effect_exports.mapError(() => new HostDeclarationInvalid())
-        );
-        return request.sources === true ? { skills, dynamic: source2 !== void 0, cached } : skills;
+        const cached = source !== void 0 && cacheCommands > before;
+        const authored = new Set([...declared2, ...dynamic].map((skill) => skill.name));
+        const routed = (yield* routerSkills(definition.tools).pipe(
+          Effect_exports.withSpan("app.skills.routers")
+        )).filter((skill) => !authored.has(skill.name));
+        const skills = yield* Schema_exports.decodeUnknownEffect(AppSkills)([
+          ...declared2,
+          ...dynamic,
+          ...routed
+        ]).pipe(Effect_exports.mapError(() => new HostDeclarationInvalid()));
+        return request.sources === true ? { skills, dynamic: source !== void 0, cached } : skills;
       }
       if (request.operation === "workflows") {
         return yield* Effect_exports.forEach(
           Object.entries(definition.workflows ?? {}),
-          ([name2, entry]) => safe2(
+          ([name, entry]) => safe2(
             () => Effect_exports.gen(function* () {
               return yield* Schema_exports.decodeUnknownEffect(HostedWorkflow)({
-                name: name2,
+                name,
                 ...entry.description === void 0 ? {} : { description: entry.description },
-                inputSchema: yield* jsonSchema(entry.input),
-                ...entry.output === void 0 ? {} : { outputSchema: yield* jsonSchema(entry.output) }
+                inputSchema: yield* jsonSchemaDocument(entry.input),
+                ...entry.output === void 0 ? {} : { outputSchema: yield* jsonSchemaDocument(entry.output) }
               });
             }),
             new HostDeclarationInvalid()
@@ -1004,79 +911,19 @@ function dispatch(app, request, context, signal) {
       }
       if (request.operation === "inspect") {
         const summary = request.detail === "summary";
-        const wanted = request.tools === void 0 ? void 0 : new Set(request.tools);
-        const metadata = [];
-        for (const [prefix, readOnly, catalog2] of [
-          [OperationToolPrefixes.query, true, definition.queries],
-          [OperationToolPrefixes.mutate, false, definition.mutations]
-        ]) {
-          for (const [name2, operation] of Object.entries(catalog2 ?? {})) {
-            if (wanted !== void 0 && !wanted.has(`${prefix}${name2}`)) continue;
-            const schedules = Object.entries(definition.schedules ?? {}).filter(([, schedule]) => schedule.tool === `${prefix}${name2}`).map(([name3, { tool: _tool, ...schedule }]) => ({ name: name3, ...schedule }));
-            if (request.scheduled === true && schedules.length === 0) continue;
-            metadata.push(
-              yield* safe2(
-                () => Effect_exports.gen(function* () {
-                  const fields = {
-                    name: `${prefix}${name2}`,
-                    schedules,
-                    description: operation.description ?? `${readOnly ? "Query" : "Mutate"} ${name2}`,
-                    ...operation.title === void 0 ? {} : { title: operation.title },
-                    readOnly,
-                    annotations: { ...operation.annotations, readOnlyHint: readOnly }
-                  };
-                  if (summary)
-                    return yield* Schema_exports.decodeUnknownEffect(HostedToolSummary)(fields);
-                  return yield* Schema_exports.decodeUnknownEffect(HostedTool)({
-                    ...fields,
-                    inputSchema: yield* jsonSchema(operation.input),
-                    ...operation.output === void 0 ? operation.outputSchema === void 0 ? {} : { outputSchema: operation.outputSchema } : { outputSchema: yield* jsonSchema(operation.output) },
-                    ...operation._meta === void 0 ? {} : { _meta: operation._meta }
-                  });
-                }),
-                new HostDeclarationInvalid()
-              )
-            );
-          }
-        }
-        const dynamic = request.scheduled === true ? void 0 : definition.dynamicTools;
-        if (dynamic !== void 0 && (wanted === void 0 || metadata.length < wanted.size)) {
-          const declared2 = new Set(metadata.map((tool2) => tool2.name));
-          const discover = () => {
-            if (summary && dynamic.summaries !== void 0) return dynamic.summaries();
-            if (wanted !== void 0 && dynamic.describe !== void 0) {
-              const describe = dynamic.describe;
-              return Effect_exports.forEach(
-                [...wanted].filter((name2) => !declared2.has(name2)),
-                (name2) => describe(name2),
-                { concurrency: "unbounded" }
-              ).pipe(Effect_exports.map((tools) => tools.filter((tool2) => tool2 !== void 0)));
-            }
-            return dynamic.list();
-          };
-          const discovered = yield* evaluationSafe(discover(), secrets).pipe(
-            Effect_exports.flatMap(
-              (value) => safe2(
-                () => summary ? Schema_exports.decodeUnknownEffect(Schema_exports.Array(HostedToolSummary))(value) : Schema_exports.decodeUnknownEffect(Schema_exports.Array(HostedTool))(value),
-                new HostDeclarationInvalid()
-              )
-            )
-          );
-          const names = new Set(declared2);
-          for (const tool2 of discovered) {
-            const readOnly = tool2.name.startsWith(OperationToolPrefixes.query);
-            if (!readOnly && !tool2.name.startsWith(OperationToolPrefixes.mutate) || tool2.name === OperationToolPrefixes.query || tool2.name === OperationToolPrefixes.mutate || names.has(tool2.name))
-              return yield* new HostDeclarationInvalid();
-            names.add(tool2.name);
-            if (wanted !== void 0 && !wanted.has(tool2.name)) continue;
-            metadata.push({
-              ...tool2,
-              readOnly,
-              annotations: { ...tool2.annotations, readOnlyHint: readOnly }
-            });
-          }
-        }
-        return metadata;
+        const catalog = yield* readCatalog(definition.tools, {
+          summary,
+          secrets,
+          ...request.tools === void 0 ? {} : { wanted: new Set(request.tools) },
+          ...request.scheduled === true ? { scheduled: true } : {},
+          schedules: (name) => Object.entries(definition.schedules ?? {}).filter(([, schedule]) => schedule.tool === name).map(([name2, { tool: _tool, ...schedule }]) => ({ name: name2, ...schedule }))
+        }).pipe(Effect_exports.withSpan("app.catalog.read"));
+        return yield* safe2(
+          () => Schema_exports.encodeEffect(WireCatalog)(catalog).pipe(
+            Effect_exports.flatMap(Schema_exports.decodeUnknownEffect(JsonValue))
+          ),
+          new HostDeclarationInvalid()
+        );
       }
       if (request.operation === "webhook-complete" || request.operation === "webhook-validate" || request.operation === "webhooks" || request.operation === "webhook-register" || request.operation === "webhook-handle" || request.operation === "webhook-unregister") {
         const executeWebhook = (db) => dispatchWebhook(
@@ -1107,19 +954,15 @@ function dispatch(app, request, context, signal) {
           })
         );
       }
-      const kind = request.operation === "call" ? request.tool.startsWith(OperationToolPrefixes.query) ? "query" : request.tool.startsWith(OperationToolPrefixes.mutate) ? "mutate" : void 0 : request.operation;
-      if (kind === void 0) return yield* new HostToolNotFound();
-      const name = request.operation === "call" ? request.tool.slice(OperationToolPrefixes[kind].length) : request.name;
-      const toolName = `${OperationToolPrefixes[kind]}${name}`;
-      const catalog = kind === "query" ? definition.queries : definition.mutations;
-      const declaredTool = catalog !== void 0 && Object.hasOwn(catalog, name) ? catalog[name] : void 0;
-      const source = definition.dynamicTools;
-      const resolvedTool = source === void 0 || declaredTool !== void 0 ? void 0 : yield* evaluationSafe(source.resolve(toolName), secrets);
-      const tool = declaredTool ?? resolvedTool;
-      if (tool !== void 0 && tool.kind !== (kind === "query" ? "query" : "mutation"))
-        return yield* new HostDeclarationInvalid();
+      const toolName = request.operation === "call" ? request.tool : request.name;
+      const location = locate(definition.tools, toolName);
+      const tool = location === void 0 ? void 0 : location.kind === "operation" ? location.operation : yield* evaluationSafe(location.source.resolve(location.name), secrets);
       if (tool === void 0)
         return yield* request.operation === "call" ? new HostToolNotFound() : new HostOperationNotFound();
+      const requested = request.operation === "call" ? request.kind : request.operation === "query" ? "query" : "mutation";
+      if (requested !== void 0 && tool.kind !== requested)
+        return yield* new HostKindMismatch({ tool: toolName, requested, actual: tool.kind });
+      const kind = tool.kind === "query" ? "query" : "mutate";
       const input = yield* Effect_exports.suspend(
         () => Schema_exports.decodeUnknownEffect(tool.input)(request.input)
       ).pipe(
@@ -1273,6 +1116,7 @@ var errorStatus = Match_exports.type().pipe(
     HostAccountsInvalid: () => 422,
     HostInputInvalid: () => 422,
     HostOperationNotFound: () => 404,
+    HostKindMismatch: () => 409,
     HostToolNotFound: () => 404,
     HostToolBlocked: () => 403,
     HostToolApprovalRequired: () => 409,