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

package/js/{chunk-FWQC6I3C.js → chunk-5T57N25Q.js}

@@ -1,4 +1,5 @@
 import {
+  JsonObject,
   ValidationError
 } from "./chunk-27F7W2LG.js";
 import {
@@ -1387,6 +1388,16 @@ var jsonSchema = (input) => {
 var storageFieldOf = (schema) => schema[StorageField];
 var id = (table) => wrap(Schema_exports.NonEmptyString, false, { kind: "id", references: table });
 var userId = () => wrap(Schema_exports.NonEmptyString, false, { kind: "userId" });
+var jsonSchemaDocument = (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"
+  });
+};
 
 export {
   decoderOf,
@@ -1411,5 +1422,6 @@ export {
   jsonSchema,
   storageFieldOf,
   id,
-  userId
+  userId,
+  jsonSchemaDocument
 };

package/js/{chunk-67EVWIGJ.js → chunk-6BSSI67S.js}

@@ -2,19 +2,19 @@ import {
   adaptMcpTools,
   mcpClient,
   mcpJsonSchemaValidator
-} from "./chunk-UDDE5KOR.js";
+} from "./chunk-ITM77QPO.js";
 import {
   accountProviderError,
   httpProviderError
-} from "./chunk-G7T27IWB.js";
+} from "./chunk-MKWZPDR6.js";
 import {
   McpError,
   McpToolsOptions,
   defaultMcpClientLimits
-} from "./chunk-DQAZTA4I.js";
+} from "./chunk-B3EOZTK3.js";
 import {
   ProviderError
-} from "./chunk-SB3V4YVR.js";
+} from "./chunk-R3EV5FTO.js";
 import {
   captureTelemetry
 } from "./chunk-RJDDBDSN.js";

package/js/{chunk-DQAZTA4I.js → chunk-B3EOZTK3.js}

@@ -5,18 +5,14 @@ import {
 } from "./chunk-N7YDVXYJ.js";
 import {
   CacheCommand,
-  CacheReply
-} from "./chunk-YEPYT6SD.js";
+  CacheReply,
+  ProviderError
+} from "./chunk-R3EV5FTO.js";
 import {
+  AppSkillName,
   AppSkills,
   SkillLoadFailed
 } from "./chunk-JU7VHODU.js";
-import {
-  OpenapiResponseError
-} from "./chunk-W4DMKWAB.js";
-import {
-  ProviderError
-} from "./chunk-SB3V4YVR.js";
 import {
   AccountId,
   HttpUrl,
@@ -78,6 +74,30 @@ import {
   withDefault
 } from "./chunk-CDL5PM2Q.js";
 
+// src/contracts/router.ts
+var reservedRouterKeys = /* @__PURE__ */ new Set([
+  "__proto__",
+  "constructor",
+  "prototype"
+]);
+var RouterKey = Schema_exports.String.check(
+  Schema_exports.isPattern(/^[A-Za-z_][A-Za-z0-9_-]{0,99}$/),
+  Schema_exports.makeFilter((key) => !reservedRouterKeys.has(key))
+);
+var RouterIcon = Schema_exports.Struct({
+  src: Schema_exports.NonEmptyString,
+  mimeType: Schema_exports.optionalKey(Schema_exports.String),
+  sizes: Schema_exports.optionalKey(Schema_exports.Array(Schema_exports.String)),
+  theme: Schema_exports.optionalKey(Schema_exports.Literals(["light", "dark"]))
+});
+var RouterMeta = Schema_exports.Struct({
+  title: Schema_exports.optionalKey(Schema_exports.String),
+  description: Schema_exports.optionalKey(Schema_exports.String),
+  instructions: Schema_exports.optionalKey(Schema_exports.String),
+  icons: Schema_exports.optionalKey(Schema_exports.Array(RouterIcon)),
+  tags: Schema_exports.optionalKey(Schema_exports.Record(Schema_exports.NonEmptyString, Schema_exports.String))
+});
+
 // src/contracts/tools.ts
 var ToolAnnotations = Schema_exports.Struct({
   title: Schema_exports.optionalKey(Schema_exports.String),
@@ -130,6 +150,15 @@ var McpToolMetadata = Schema_exports.Struct({
   annotations: Schema_exports.optional(ToolAnnotations),
   _meta: Schema_exports.optional(JsonObject2)
 });
+var McpServerHeader = Schema_exports.Struct({
+  name: Schema_exports.optionalKey(Schema_exports.String),
+  title: Schema_exports.optionalKey(Schema_exports.String),
+  version: Schema_exports.optionalKey(Schema_exports.String),
+  description: Schema_exports.optionalKey(Schema_exports.String),
+  websiteUrl: Schema_exports.optionalKey(Schema_exports.String),
+  icons: Schema_exports.optionalKey(Schema_exports.Array(RouterIcon)),
+  instructions: Schema_exports.optionalKey(Schema_exports.String)
+});
 var McpError = class extends Schema_exports.TaggedError()("McpError", {
   phase: Schema_exports.Literals(["connect", "discover", "call", "schema", "transport"]),
   reason: Schema_exports.Literals([
@@ -152,6 +181,31 @@ var ProcessConfig = Schema_exports.Struct({
   )
 });
 
+// src/contracts/api-response-error.ts
+var ApiErrorRecovery = Schema_exports.Struct({
+  action: Schema_exports.NonEmptyString.check(Schema_exports.isMaxLength(1024)),
+  instructions: Schema_exports.NonEmptyString.check(Schema_exports.isMaxLength(4096))
+});
+var ApiErrorResponse = Schema_exports.Struct({
+  code: Schema_exports.NonEmptyString.check(Schema_exports.isMaxLength(128)),
+  status: Schema_exports.Int.check(Schema_exports.isBetween({ minimum: 400, maximum: 599 })),
+  message: Schema_exports.NonEmptyString.check(Schema_exports.isMaxLength(4096)),
+  recovery: Schema_exports.optionalKey(ApiErrorRecovery)
+});
+var OpenapiResponseError = class extends Schema_exports.TaggedError()(
+  "OpenapiResponseError",
+  ApiErrorResponse.fields
+) {
+};
+var OpenapiErrorLimits = Schema_exports.Struct({
+  maxBodyBytes: Schema_exports.Int.check(Schema_exports.isGreaterThan(0)),
+  readTimeoutMs: Schema_exports.Int.check(Schema_exports.isGreaterThan(0))
+});
+var defaultOpenapiErrorLimits = OpenapiErrorLimits.make({
+  maxBodyBytes: 65536,
+  readTimeoutMs: 2e3
+});
+
 // src/contracts/failure.ts
 var maxFailureMessageLength = 2048;
 var FailureSource = Schema_exports.Literals(["app", "storage", "service"]);
@@ -1843,7 +1897,7 @@ var ManyAccounts = class extends Data_exports.TaggedClass("many") {
 };
 
 // src/contracts/protocol-version.ts
-var frameworkProtocol = 3;
+var frameworkProtocol = 4;
 
 // src/contracts/schedules.ts
 var minimumIntervalMilliseconds = 6e4;
@@ -2215,8 +2269,132 @@ var protocol3 = {
   }
 };
 
-// src/contracts/operations.ts
-var OperationToolPrefixes = { query: "queries.", mutate: "mutations." };
+// src/contracts/protocols/4.ts
+var HostedTool2 = Schema_exports.Struct({
+  schedules: Schema_exports.optionalKey(Schema_exports.Array(OperationSchedule)),
+  name: Schema_exports.NonEmptyString,
+  router: Schema_exports.optionalKey(Schema_exports.NonEmptyString),
+  tags: Schema_exports.optionalKey(Schema_exports.Array(Schema_exports.NonEmptyString)),
+  description: Schema_exports.String,
+  inputSchema: JsonObject2,
+  readOnly: Schema_exports.optionalKey(Schema_exports.Boolean),
+  title: Schema_exports.optionalKey(Schema_exports.String),
+  outputSchema: Schema_exports.optionalKey(JsonObject2),
+  annotations: Schema_exports.optionalKey(ToolAnnotations),
+  _meta: Schema_exports.optionalKey(JsonObject2)
+});
+var HostedToolSummary2 = HostedTool2.mapFields(
+  ({ inputSchema: _input, outputSchema: _output, _meta, ...fields }) => fields
+);
+var HostRouterError = Schema_exports.Union([
+  ProviderError,
+  McpError,
+  SkillLoadFailed,
+  HostDeclarationInvalid2,
+  HostEvaluationFailed2
+]);
+var HostedRouter = Schema_exports.Struct({
+  path: Schema_exports.String,
+  title: Schema_exports.optionalKey(Schema_exports.String),
+  description: Schema_exports.optionalKey(Schema_exports.String),
+  icons: Schema_exports.optionalKey(Schema_exports.Array(RouterIcon)),
+  tags: Schema_exports.optionalKey(Schema_exports.Record(Schema_exports.NonEmptyString, Schema_exports.String)),
+  skill: Schema_exports.optionalKey(AppSkillName),
+  error: Schema_exports.optionalKey(HostRouterError)
+});
+var HostedCatalog = Schema_exports.Struct({
+  tools: Schema_exports.Array(HostedTool2),
+  routers: Schema_exports.Array(HostedRouter)
+});
+var HostedCatalogSummary = Schema_exports.Struct({
+  tools: Schema_exports.Array(HostedToolSummary2),
+  routers: Schema_exports.Array(HostedRouter)
+});
+var ToolKind = Schema_exports.Literals(["query", "mutation"]);
+var HostRequest2 = Schema_exports.Union([
+  WorkflowCommand,
+  WebhookCommand,
+  Schema_exports.Struct({ operation: Schema_exports.Literal("requirements") }),
+  Schema_exports.Struct({
+    operation: Schema_exports.Literal("inspect"),
+    /** Omit schemas. Only builds that declare the toolIndex capability accept this. */
+    detail: Schema_exports.optionalKey(Schema_exports.Literal("summary")),
+    /** Describe only these tools. Only builds that declare the toolIndex capability accept this. */
+    tools: Schema_exports.optionalKey(Schema_exports.Array(Schema_exports.NonEmptyString)),
+    /**
+     * Describe only declared operations that have schedules, without dynamic tool discovery.
+     * Only builds that declare the scheduledTools capability accept this.
+     */
+    scheduled: Schema_exports.optionalKey(Schema_exports.Literal(true))
+  }),
+  Schema_exports.Struct({
+    operation: Schema_exports.Literal("skills"),
+    /** Answer with SkillSources. Only builds that declare the skillSources capability accept this. */
+    sources: Schema_exports.optionalKey(Schema_exports.Literal(true))
+  }),
+  Schema_exports.Struct({
+    operation: Schema_exports.Literal("query"),
+    name: Schema_exports.NonEmptyString,
+    input: JsonValue
+  }),
+  Schema_exports.Struct({
+    operation: Schema_exports.Literal("mutate"),
+    name: Schema_exports.NonEmptyString,
+    input: JsonValue
+  }),
+  Schema_exports.Struct({
+    operation: Schema_exports.Literal("call"),
+    tool: Schema_exports.NonEmptyString,
+    /**
+     * The caller's claim; the bundle rejects a call whose tool has the other kind. The host omits
+     * it for a tool its catalog does not list, and then opens storage for writing.
+     */
+    kind: Schema_exports.optionalKey(ToolKind),
+    input: JsonValue
+  })
+]);
+var HostKindMismatch = class extends Schema_exports.TaggedError()("HostKindMismatch", {
+  tool: Schema_exports.NonEmptyString,
+  requested: ToolKind,
+  actual: ToolKind
+}) {
+};
+var HostError3 = Schema_exports.Union([...HostError2.members, HostKindMismatch]);
+var HostResponse3 = Schema_exports.Union([
+  Schema_exports.Struct({
+    ok: Schema_exports.Literal(true),
+    value: JsonValue,
+    toolError: Schema_exports.optionalKey(Schema_exports.Literal(true))
+  }),
+  Schema_exports.Struct({ ok: Schema_exports.Literal(false), error: HostError3 })
+]);
+var HostInvocation2 = Schema_exports.Struct({
+  command: HostRequest2,
+  accounts: ResolvedAccounts,
+  approval: Schema_exports.optionalKey(TrustedToolApproval),
+  replay: Schema_exports.optionalKey(WorkflowReplay),
+  deadline: Schema_exports.optionalKey(InvocationDeadline),
+  workflowRun: Schema_exports.optionalKey(WorkflowRunId)
+});
+var protocol4 = {
+  version: 4,
+  schemas: {
+    invocation: HostInvocation2,
+    request: HostRequest2,
+    response: HostResponse3,
+    requirements: DeclaredRequirements,
+    catalog: HostedCatalog,
+    catalogSummary: HostedCatalogSummary,
+    skills: SkillCatalogResponse2,
+    elicitationRequest: FormElicitation,
+    elicitationReply: ElicitationReply,
+    workflowStep: WorkflowRpcCommand,
+    workflowStepReply: WorkflowRpcResult,
+    workflowControl: WorkflowControlCommand,
+    cacheCommand: CacheCommand,
+    cacheReply: CacheReply
+  }
+};
 
 // src/contracts/host.ts
 var skillsCommand = (sources) => sources ? { operation: "skills", sources: true } : { operation: "skills" };
@@ -2227,7 +2405,7 @@ var inspectCommand = (tools, scheduled) => ({
   ...scheduled === void 0 ? {} : { scheduled }
 });
 var indexCommand = { operation: "inspect", detail: "summary" };
-var selectTools = (tools) => (all) => tools === void 0 ? all : all.filter((tool) => tools.includes(tool.name));
+var selectTools = (tools) => (catalog) => tools === void 0 ? catalog : { ...catalog, tools: catalog.tools.filter((tool) => tools.includes(tool.name)) };
 var HostRequirementsError = Schema_exports.Union([
   HostRequestInvalid,
   HostDeclarationInvalid2,
@@ -2248,6 +2426,7 @@ var HostCallError = Schema_exports.Union([
   HostInspectError,
   HostToolNotFound,
   HostOperationNotFound,
+  HostKindMismatch,
   HostOperationFailed2,
   DatabaseLimitExceeded,
   HostInputInvalid,
@@ -2273,6 +2452,10 @@ export {
   OAuth2Method,
   Provider,
   ManyAccounts,
+  reservedRouterKeys,
+  RouterKey,
+  RouterIcon,
+  RouterMeta,
   ToolAnnotations,
   McpClientLimits,
   defaultMcpClientLimits,
@@ -2280,8 +2463,13 @@ export {
   McpToolsOptions,
   McpToolResult,
   McpToolMetadata,
+  McpServerHeader,
   McpError,
   ProcessConfig,
+  ApiErrorRecovery,
+  ApiErrorResponse,
+  OpenapiResponseError,
+  defaultOpenapiErrorLimits,
   maxFailureMessageLength,
   FailureSource,
   FailureName,
@@ -2336,9 +2524,6 @@ export {
   ResolvedAccounts,
   TrustedToolApproval,
   InvocationDeadline,
-  HostedTool,
-  HostedToolSummary,
-  HostRequest,
   HostRequestInvalid,
   HostAccountsInvalid,
   HostOperationNotFound,
@@ -2350,7 +2535,6 @@ export {
   HostToolApprovalRequired,
   HostToolPolicyFailed,
   HostOutputInvalid,
-  HostInvocation,
   protocol1,
   SkillSources2 as SkillSources,
   SkillCatalogResponse2 as SkillCatalogResponse,
@@ -2358,10 +2542,19 @@ export {
   HostDeclarationInvalid2 as HostDeclarationInvalid,
   HostEvaluationFailed2 as HostEvaluationFailed,
   HostOperationFailed2 as HostOperationFailed,
-  HostError2 as HostError,
-  HostResponse2 as HostResponse,
   protocol3,
-  OperationToolPrefixes,
+  HostedTool2 as HostedTool,
+  HostedToolSummary2 as HostedToolSummary,
+  HostRouterError,
+  HostedRouter,
+  HostedCatalog,
+  HostedCatalogSummary,
+  HostRequest2 as HostRequest,
+  HostKindMismatch,
+  HostError3 as HostError,
+  HostResponse3 as HostResponse,
+  HostInvocation2 as HostInvocation,
+  protocol4,
   skillsCommand,
   skillCatalog,
   inspectCommand,

package/js/{chunk-TDNYXSIX.js → chunk-ECQFRCH4.js}

@@ -1,13 +1,17 @@
 import {
-  operationDeclaration
-} from "./chunk-3XKZDQLM.js";
+  fixedRouter
+} from "./chunk-MNMNLXBL.js";
+import {
+  nativeOperation,
+  operationDeclaration,
+  routerDeclaration
+} from "./chunk-T7GKZBLP.js";
 
 // src/implementation/protocol-operations.ts
 var protocolOperations = (operations, kinds = {}) => {
-  const queries = {};
-  const mutations = {};
+  const declared = {};
   for (const [name, operation] of Object.entries(operations)) {
-    const kind = Object.hasOwn(kinds, name) ? kinds[name] : operation.readOnly === true ? "query" : "mutation";
+    const kind = Object.hasOwn(kinds, name) ? kinds[name] ?? "mutation" : operation.readOnly === true ? "query" : "mutation";
     const native = {
       description: operation.description,
       ...operation.title === void 0 ? {} : { title: operation.title },
@@ -18,12 +22,20 @@ var protocolOperations = (operations, kinds = {}) => {
     };
     const output = Object.getOwnPropertyDescriptor(operation, "outputSchema");
     const withOutput = (target) => output === void 0 || output.get === void 0 && output.value === void 0 ? target : Object.defineProperty(target, "outputSchema", { ...output, enumerable: true });
-    if (kind === "query") queries[name] = operationDeclaration(withOutput({ ...native, kind }));
-    else mutations[name] = operationDeclaration(withOutput({ ...native, kind: "mutation" }));
+    declared[name] = operationDeclaration(withOutput({ ...native, kind }));
+  }
+  return declared;
+};
+var protocolRouter = (operations, kinds = {}) => {
+  const native = {};
+  for (const [name, declaration] of Object.entries(protocolOperations(operations, kinds))) {
+    const operation = nativeOperation(declaration);
+    if (operation !== void 0) native[name] = operation;
   }
-  return { queries, mutations };
+  return routerDeclaration(fixedRouter(native));
 };
 
 export {
-  protocolOperations
+  protocolOperations,
+  protocolRouter
 };

package/js/{chunk-UDDE5KOR.js → chunk-ITM77QPO.js}

@@ -1,23 +1,25 @@
 import {
   prepareElicitation
-} from "./chunk-LUVSFETN.js";
+} from "./chunk-SB4HEPNJ.js";
 import {
   fromPromise
-} from "./chunk-3XKZDQLM.js";
+} from "./chunk-T7GKZBLP.js";
 import {
   ElicitationFailed,
   McpError,
+  McpServerHeader,
   McpToolMetadata,
   McpToolResult,
+  RouterIcon,
   ToolResultObservation,
   defaultElicitationLimits,
   defaultMcpClientLimits,
   mcpSdkTimerCeilingMs
-} from "./chunk-DQAZTA4I.js";
+} from "./chunk-B3EOZTK3.js";
 import {
   compileJsonSchemaDecoder,
   jsonSchemaDecoder
-} from "./chunk-FWQC6I3C.js";
+} from "./chunk-5T57N25Q.js";
 import {
   JsonObject
 } from "./chunk-27F7W2LG.js";
@@ -70,7 +72,7 @@ var adaptMcpTool = (client, tool) => Effect_exports.gen(function* () {
   return adapted;
 });
 var adaptMcpTools = (client) => Effect_exports.gen(function* () {
-  const metadata = yield* client.list;
+  const { tools: metadata } = yield* client.list;
   const entries = yield* Effect_exports.forEach(
     metadata,
     (tool) => adaptMcpTool(client, tool).pipe(Effect_exports.map((adapted) => [tool.name, adapted]))
@@ -233,7 +235,7 @@ function mcpClient(withClient, timeoutMs, failure) {
       do {
         const page = yield* Effect_exports.tryPromise({
           // This session only reads metadata. listTools() also eagerly compiles
-          // every output validator; mcpOperations validates the selected tool on call.
+          // every output validator; mcpRouter validates the selected tool on call.
           try: (signal) => client.request(
             { method: "tools/list", params: cursor === void 0 ? {} : { cursor } },
             ListToolsResultSchema,
@@ -263,7 +265,24 @@ function mcpClient(withClient, timeoutMs, failure) {
           cursors.add(cursor);
         }
       } while (cursor !== void 0);
-      return [...tools.values()];
+      const info = client.getServerVersion();
+      const instructions = client.getInstructions();
+      const icons = info?.icons?.flatMap(
+        (icon) => Option_exports.toArray(Schema_exports.decodeUnknownOption(RouterIcon)(icon))
+      );
+      const server = Schema_exports.decodeUnknownOption(McpServerHeader)({
+        ...info?.name === void 0 ? {} : { name: info.name },
+        ...info?.title === void 0 ? {} : { title: info.title },
+        ...info?.version === void 0 ? {} : { version: info.version },
+        ...info?.description === void 0 ? {} : { description: info.description },
+        ...info?.websiteUrl === void 0 ? {} : { websiteUrl: info.websiteUrl },
+        ...icons === void 0 ? {} : { icons },
+        ...instructions === void 0 ? {} : { instructions }
+      });
+      return {
+        tools: [...tools.values()],
+        server: Option_exports.getOrElse(server, () => ({}))
+      };
     })
   ).pipe(Effect_exports.withSpan("provider.mcp.discover"));
   const call = (name, input, context) => withClient("call", (client) => mcpCall(client, name, input, context, timeoutMs, failure)).pipe(

package/js/{chunk-G7T27IWB.js → chunk-MKWZPDR6.js}

@@ -1,6 +1,6 @@
 import {
   ProviderError
-} from "./chunk-SB3V4YVR.js";
+} from "./chunk-R3EV5FTO.js";
 import {
   AccountId
 } from "./chunk-27F7W2LG.js";