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

package/js/index.js

@@ -3,19 +3,23 @@ import {
   defineDatabase,
   table,
   workflow
-} from "./chunk-C3VAOK5B.js";
+} from "./chunk-OE3QQTSB.js";
 import "./chunk-ZQINWV4W.js";
 import {
+  dynamicRouter,
   fromPromise,
   mutation,
   nativeOperation,
+  nativeRouter,
   operationDeclaration,
   query,
+  router,
+  routerDeclaration,
   withApproval
-} from "./chunk-3XKZDQLM.js";
+} from "./chunk-T7GKZBLP.js";
 import {
   accountProviderError
-} from "./chunk-G7T27IWB.js";
+} from "./chunk-MKWZPDR6.js";
 import {
   CalendarSchedule,
   ElicitationFailed,
@@ -30,16 +34,13 @@ import {
   ScheduleTiming,
   SecretsMethod,
   WorkflowFailure
-} from "./chunk-DQAZTA4I.js";
+} from "./chunk-B3EOZTK3.js";
 import "./chunk-N7YDVXYJ.js";
 import {
-  CacheError
-} from "./chunk-YEPYT6SD.js";
-import "./chunk-JU7VHODU.js";
-import "./chunk-W4DMKWAB.js";
-import {
+  CacheError,
   ProviderError
-} from "./chunk-SB3V4YVR.js";
+} from "./chunk-R3EV5FTO.js";
+import "./chunk-JU7VHODU.js";
 import {
   array,
   boolean,
@@ -59,7 +60,7 @@ import {
   userId,
   withLazyJsonSchemaDocument,
   wrap
-} from "./chunk-FWQC6I3C.js";
+} from "./chunk-5T57N25Q.js";
 import "./chunk-PZB6T6KU.js";
 import {
   JsonObject,
@@ -104,7 +105,7 @@ var secrets = (options) => new SecretsMethod(options);
 var oauth2 = (config, response) => parse(OAuth2Config, config).pipe(Effect_exports.map((config2) => new OAuth2Method({ config: config2, response })));
 var defineProvider = (options) => new Provider(options);
 
-// src/implementation/account-operations.ts
+// src/implementation/account-router.ts
 var inputDocument = (operation) => {
   const imported = importedJsonSchema(operation.input);
   if (imported !== void 0) return Schema_exports.decodeUnknownSync(JsonObject)(imported);
@@ -115,72 +116,70 @@ var declaresOutput = (operation) => {
   const property = Object.getOwnPropertyDescriptor(operation, "outputSchema");
   return property !== void 0 && (property.get !== void 0 || property.value !== void 0);
 };
-var combine = (kind, groups) => Object.fromEntries(
-  [...groups].map(([name, accounts]) => {
-    const variants = [...accounts.values()];
-    const first = variants[0];
-    if (first === void 0)
-      throw new Error("An account operation must have at least one account");
-    const select = (input2) => {
-      const operation = accounts.get(input2.accountId);
-      if (operation === void 0)
-        throw new Error("Account selection must be decoded before execution");
-      return operation;
-    };
-    const input = Schema_exports.Union(
-      [...accounts].map(
-        ([accountId, operation]) => Schema_exports.Struct({ accountId: Schema_exports.Literal(accountId), input: operation.input })
-      )
-    );
-    const inputSchema = () => ({
+var combineOperation = (accounts) => {
+  const variants = [...accounts.values()];
+  const first = variants[0];
+  if (first === void 0) throw new Error("An account operation must have at least one account");
+  const kind = variants.every((operation) => operation.kind === "query") ? "query" : "mutation";
+  const select = (input2) => {
+    const operation = accounts.get(input2.accountId);
+    if (operation === void 0)
+      throw new Error("Account selection must be decoded before execution");
+    return operation;
+  };
+  const input = Schema_exports.Union(
+    [...accounts].map(
+      ([accountId, operation]) => Schema_exports.Struct({ accountId: Schema_exports.Literal(accountId), input: operation.input })
+    )
+  );
+  const inputSchema = () => ({
+    type: "object",
+    anyOf: [...accounts].map(([accountId, operation], index) => ({
       type: "object",
-      anyOf: [...accounts].map(([accountId, operation], index) => ({
-        type: "object",
-        properties: {
-          accountId: { type: "string", const: accountId },
-          input: nestJsonSchema(inputDocument(operation), `#/anyOf/${index}/properties/input`)
-        },
-        required: ["accountId", "input"]
-      }))
-    });
-    const declaration2 = operationDeclaration({
-      kind,
-      ...first.description === void 0 ? {} : { description: first.description },
-      ...first.title === void 0 ? {} : { title: first.title },
-      ...first.annotations === void 0 || !variants.every(
-        (operation) => JSON.stringify(operation.annotations) === JSON.stringify(first.annotations)
-      ) ? {} : { annotations: first.annotations },
-      ...first._meta === void 0 || !variants.every(
-        (operation) => JSON.stringify(operation._meta) === JSON.stringify(first._meta)
-      ) ? {} : { _meta: first._meta },
-      input: withLazyJsonSchemaDocument(input, inputSchema),
-      approval: (context) => {
-        const operation = select(context.toolInput);
-        return operation.approval === void 0 ? Effect_exports.succeed("approved") : operation.approval({ ...context, toolInput: context.toolInput.input });
+      properties: {
+        accountId: { type: "string", const: accountId },
+        input: nestJsonSchema(inputDocument(operation), `#/anyOf/${index}/properties/input`)
       },
-      run: (context, input2) => {
-        const operation = select(input2);
-        return operation.run(context, input2.input).pipe(
-          Effect_exports.mapError((error) => accountProviderError(error, input2.accountId)),
-          Effect_exports.flatMap(
-            (output) => operation.output === void 0 ? Effect_exports.succeed(output) : Schema_exports.decodeUnknownEffect(operation.output)(output)
-          )
-        );
-      }
-    });
-    if (variants.every(declaresOutput)) {
-      const outputSchema = once(() => ({
-        anyOf: variants.flatMap(
-          (operation) => operation.outputSchema === void 0 ? [] : [operation.outputSchema]
-        ).map((output, index) => nestJsonSchema(output, `#/anyOf/${index}`))
-      }));
-      const native = nativeOperation(declaration2);
-      if (native !== void 0)
-        Object.defineProperty(native, "outputSchema", { enumerable: true, get: outputSchema });
+      required: ["accountId", "input"]
+    }))
+  });
+  const declaration2 = operationDeclaration({
+    kind,
+    ...first.description === void 0 ? {} : { description: first.description },
+    ...first.title === void 0 ? {} : { title: first.title },
+    ...first.annotations === void 0 || !variants.every(
+      (operation) => JSON.stringify(operation.annotations) === JSON.stringify(first.annotations)
+    ) ? {} : { annotations: first.annotations },
+    ...first._meta === void 0 || !variants.every((operation) => JSON.stringify(operation._meta) === JSON.stringify(first._meta)) ? {} : { _meta: first._meta },
+    input: withLazyJsonSchemaDocument(input, inputSchema),
+    approval: (context) => {
+      const operation = select(context.toolInput);
+      return operation.approval === void 0 ? Effect_exports.succeed("approved") : operation.approval({ ...context, toolInput: context.toolInput.input });
+    },
+    run: (context, input2) => {
+      const operation = select(input2);
+      return operation.run(context, input2.input).pipe(
+        Effect_exports.mapError((error) => accountProviderError(error, input2.accountId)),
+        Effect_exports.flatMap(
+          (output) => operation.output === void 0 ? Effect_exports.succeed(output) : Schema_exports.decodeUnknownEffect(operation.output)(output)
+        )
+      );
     }
-    return [name, declaration2];
-  })
-);
+  });
+  if (variants.every(declaresOutput)) {
+    const outputSchema = once(() => ({
+      anyOf: variants.flatMap(
+        (operation) => operation.outputSchema === void 0 ? [] : [operation.outputSchema]
+      ).map((output, index) => nestJsonSchema(output, `#/anyOf/${index}`))
+    }));
+    const native2 = nativeOperation(declaration2);
+    if (native2 !== void 0)
+      Object.defineProperty(native2, "outputSchema", { enumerable: true, get: outputSchema });
+  }
+  const native = nativeOperation(declaration2);
+  if (native === void 0) throw new Error("Expected a combined operation");
+  return native;
+};
 var sameAcross = (key, variants) => {
   const first = variants[0]?.[1][key];
   return first !== void 0 && variants.every(([, tool]) => JSON.stringify(tool[key]) === JSON.stringify(first)) ? { [key]: first } : {};
@@ -192,7 +191,7 @@ var mergeSummary = (name, variants) => {
     name,
     description: first.description,
     ...first.title === void 0 ? {} : { title: first.title },
-    readOnly: name.startsWith("queries."),
+    readOnly: variants.every(([, tool]) => tool.readOnly === true),
     ...sameAcross("annotations", variants)
   });
 };
@@ -218,112 +217,123 @@ var merge = (name, variants) => Schema_exports.decodeUnknownSync(HostedTool)({
   } : {},
   ...sameAcross("_meta", variants)
 });
-var accountOperations = (accounts, discover, options) => Effect_exports.runPromise(
+var combineDynamic = (sources) => {
+  const first = [...sources.values()][0];
+  const grouped = (read) => Effect_exports.gen(function* () {
+    const groups = /* @__PURE__ */ new Map();
+    for (const [accountId, source] of sources) {
+      const tools = yield* read(source).pipe(
+        Effect_exports.mapError((error) => accountProviderError(error, accountId))
+      );
+      for (const tool of tools) {
+        const variants = groups.get(tool.name) ?? [];
+        if (variants.some(([id2]) => id2 === accountId))
+          return yield* Effect_exports.die(new Error("Duplicate source operation"));
+        variants.push([accountId, tool]);
+        groups.set(tool.name, variants);
+      }
+    }
+    return groups;
+  });
+  return {
+    kind: "dynamic",
+    // Accounts share one source, so the first account describes the router.
+    ...first?.meta === void 0 ? {} : { meta: first.meta },
+    ...first?.overrides === void 0 ? {} : { overrides: first.overrides },
+    list: () => grouped((source) => source.list()).pipe(
+      Effect_exports.map((groups) => [...groups].map(([name, variants]) => merge(name, variants)))
+    ),
+    summaries: () => grouped(
+      (source) => source.summaries === void 0 ? source.list() : source.summaries()
+    ).pipe(
+      Effect_exports.map((groups) => [...groups].map(([name, variants]) => mergeSummary(name, variants)))
+    ),
+    describe: (name) => Effect_exports.gen(function* () {
+      const variants = [];
+      for (const [accountId, source] of sources) {
+        const tool = yield* (source.describe === void 0 ? source.list().pipe(Effect_exports.map((tools) => tools.find((tool2) => tool2.name === name))) : source.describe(name)).pipe(Effect_exports.mapError((error) => accountProviderError(error, accountId)));
+        if (tool !== void 0) variants.push([accountId, tool]);
+      }
+      return variants.length === 0 ? void 0 : merge(name, variants);
+    }),
+    resolve: (name) => Effect_exports.gen(function* () {
+      const operations = /* @__PURE__ */ new Map();
+      for (const [accountId, source] of sources) {
+        const operation = yield* source.resolve(name).pipe(Effect_exports.mapError((error) => accountProviderError(error, accountId)));
+        if (operation !== void 0) operations.set(accountId, operation);
+      }
+      return operations.size === 0 ? void 0 : combineOperation(operations);
+    })
+  };
+};
+var combineNode = (variants) => {
+  const nodes = [...variants.values()];
+  const first = nodes[0];
+  if (first === void 0) throw new Error("An account operation must have at least one account");
+  switch (first.kind) {
+    case "query":
+    case "mutation":
+      return combineOperation(
+        narrow(
+          variants,
+          (node) => node.kind === "query" || node.kind === "mutation"
+        )
+      );
+    case "dynamic":
+      return combineDynamic(
+        narrow(variants, (node) => node.kind === "dynamic")
+      );
+    case "router": {
+      const routers = narrow(variants, (node) => node.kind === "router");
+      const keys = new Set([...routers.values()].flatMap((router2) => Object.keys(router2.children)));
+      return {
+        kind: "router",
+        ...first.meta === void 0 ? {} : { meta: first.meta },
+        children: Object.fromEntries(
+          [...keys].map((key) => {
+            const children = /* @__PURE__ */ new Map();
+            for (const [accountId, router2] of routers) {
+              const child = Object.hasOwn(router2.children, key) ? router2.children[key] : void 0;
+              if (child !== void 0) children.set(accountId, child);
+            }
+            return [key, combineNode(children)];
+          })
+        )
+      };
+    }
+  }
+};
+var narrow = (variants, is) => {
+  const narrowed = /* @__PURE__ */ new Map();
+  for (const [accountId, node] of variants) {
+    if (!is(node)) throw new Error("Each account's router must have the same shape");
+    narrowed.set(accountId, node);
+  }
+  return narrowed;
+};
+var accountRouter = (accounts, discover, options) => Effect_exports.runPromise(
   Effect_exports.gen(function* () {
-    const queries = /* @__PURE__ */ new Map();
-    const mutations = /* @__PURE__ */ new Map();
-    const sources = /* @__PURE__ */ new Map();
+    const routers = /* @__PURE__ */ new Map();
     for (const account of accounts) {
-      const operations = yield* Effect_exports.tryPromise({
+      const declaration2 = yield* Effect_exports.tryPromise({
         try: () => discover(account),
         catch: (error) => accountProviderError(error, account.id)
       });
-      if (sources.has(account.id))
+      if (routers.has(account.id))
         return yield* Effect_exports.die(new Error("Account selections must be unique"));
-      if (operations.dynamicTools !== void 0) sources.set(account.id, operations.dynamicTools);
-      for (const [source, target] of [
-        [operations.queries, queries],
-        [operations.mutations, mutations]
-      ]) {
-        for (const [name, declaration2] of Object.entries(source ?? {})) {
-          const operation = nativeOperation(declaration2);
-          if (operation === void 0)
-            return yield* Effect_exports.die(new Error("Expected a protocol operation"));
-          const group = target.get(name) ?? /* @__PURE__ */ new Map();
-          if (group.has(account.id))
-            return yield* Effect_exports.die(new Error("Account selections must be unique"));
-          group.set(account.id, operation);
-          target.set(name, group);
-        }
-      }
+      const router2 = nativeRouter(declaration2);
+      if (router2 === void 0) return yield* Effect_exports.die(new Error("Expected a protocol router"));
+      routers.set(account.id, router2);
     }
-    const declared = {
-      queries: combine("query", queries),
-      mutations: combine("mutation", mutations)
-    };
-    if (sources.size === 0) return declared;
-    const grouped = (read) => Effect_exports.gen(function* () {
-      const groups = /* @__PURE__ */ new Map();
-      for (const [accountId, source] of sources) {
-        const tools = yield* read(source).pipe(
-          Effect_exports.mapError((error) => accountProviderError(error, accountId))
-        );
-        for (const tool of tools) {
-          const variants = groups.get(tool.name) ?? [];
-          if (variants.some(([id2]) => id2 === accountId))
-            return yield* Effect_exports.die(new Error("Duplicate source operation"));
-          variants.push([accountId, tool]);
-          groups.set(tool.name, variants);
-        }
-      }
-      return groups;
-    });
-    return {
-      ...declared,
-      dynamicTools: {
-        list: () => grouped((source) => source.list()).pipe(
-          Effect_exports.map((groups) => [...groups].map(([name, variants]) => merge(name, variants)))
-        ),
-        summaries: () => grouped(
-          (source) => source.summaries === void 0 ? source.list() : source.summaries()
-        ).pipe(
-          Effect_exports.map(
-            (groups) => [...groups].map(([name, variants]) => mergeSummary(name, variants))
-          )
-        ),
-        describe: (name) => Effect_exports.gen(function* () {
-          const variants = [];
-          for (const [accountId, source] of sources) {
-            const tool = yield* (source.describe === void 0 ? source.list().pipe(Effect_exports.map((tools) => tools.find((tool2) => tool2.name === name))) : source.describe(name)).pipe(Effect_exports.mapError((error) => accountProviderError(error, accountId)));
-            if (tool !== void 0) variants.push([accountId, tool]);
-          }
-          return variants.length === 0 ? void 0 : merge(name, variants);
-        }),
-        resolve: (name) => Effect_exports.gen(function* () {
-          const kind = name.startsWith("queries.") ? "query" : "mutation";
-          const operations = /* @__PURE__ */ new Map();
-          for (const [accountId, source] of sources) {
-            const operation = yield* source.resolve(name).pipe(Effect_exports.mapError((error) => accountProviderError(error, accountId)));
-            if (operation !== void 0) {
-              if (operation.kind !== kind)
-                return yield* Effect_exports.die(new Error("Operation kind changed"));
-              operations.set(accountId, operation);
-            }
-          }
-          if (operations.size === 0) return void 0;
-          return nativeOperation(combine(kind, /* @__PURE__ */ new Map([[name, operations]]))[name]);
-        })
-      }
-    };
+    if (routers.size === 0) return routerDeclaration({ kind: "router", children: {} });
+    const combined = combineNode(routers);
+    if (combined.kind !== "router" && combined.kind !== "dynamic")
+      return yield* Effect_exports.die(new Error("Expected a protocol router"));
+    return routerDeclaration(combined);
   }),
   options
 );
 
-// src/implementation/dynamic-tools.ts
-var dynamicTools = (source) => ({
-  list: () => fromPromise(source.list)().pipe(
-    Effect_exports.flatMap(Schema_exports.decodeUnknownEffect(Schema_exports.Array(HostedTool)))
-  ),
-  resolve: (name) => fromPromise(source.resolve)(name).pipe(
-    Effect_exports.map((value) => {
-      if (value === void 0) return void 0;
-      const operation = nativeOperation(value);
-      if (operation === void 0) throw new Error("Expected an operation declaration");
-      return operation;
-    })
-  )
-});
-
 // src/implementation/dynamic-skills.ts
 var dynamicSkills = (source) => ({
   list: fromPromise(async () => source.list())
@@ -396,7 +406,7 @@ export {
   ResponseStatusError,
   ValidationError,
   WorkflowFailure,
-  accountOperations,
+  accountRouter,
   array,
   boolean,
   cron,
@@ -404,8 +414,8 @@ export {
   defineApp,
   defineDatabase,
   defineProvider,
+  dynamicRouter,
   dynamicSkills,
-  dynamicTools,
   id,
   interval,
   json,
@@ -417,6 +427,7 @@ export {
   object,
   query,
   record,
+  router,
   secrets2 as secrets,
   string,
   table,

package/js/mcp/effect.js

@@ -1,27 +1,25 @@
 import {
   mcpClientEffect,
   mcpToolsEffect
-} from "../chunk-67EVWIGJ.js";
-import "../chunk-UDDE5KOR.js";
+} from "../chunk-6BSSI67S.js";
+import "../chunk-ITM77QPO.js";
 import "../chunk-BCSNKUAC.js";
-import "../chunk-LUVSFETN.js";
-import "../chunk-CYYBFC2K.js";
+import "../chunk-SB4HEPNJ.js";
+import "../chunk-NKLWZJLE.js";
+import "../chunk-MNMNLXBL.js";
 import "../chunk-IPI4MFSN.js";
-import "../chunk-4M277YTM.js";
-import "../chunk-C3VAOK5B.js";
+import "../chunk-OE3QQTSB.js";
 import "../chunk-ZQINWV4W.js";
-import "../chunk-3XKZDQLM.js";
-import "../chunk-G7T27IWB.js";
-import "../chunk-DQAZTA4I.js";
+import "../chunk-T7GKZBLP.js";
+import "../chunk-MKWZPDR6.js";
+import "../chunk-B3EOZTK3.js";
 import "../chunk-N7YDVXYJ.js";
-import "../chunk-YEPYT6SD.js";
+import "../chunk-R3EV5FTO.js";
 import "../chunk-JU7VHODU.js";
-import "../chunk-W4DMKWAB.js";
-import "../chunk-SB3V4YVR.js";
 import "../chunk-RJDDBDSN.js";
 import "../chunk-57RKNWL2.js";
 import "../chunk-UK573G7W.js";
-import "../chunk-FWQC6I3C.js";
+import "../chunk-5T57N25Q.js";
 import "../chunk-PZB6T6KU.js";
 import "../chunk-27F7W2LG.js";
 import "../chunk-CDL5PM2Q.js";

package/js/mcp/stdio.js

@@ -2,32 +2,30 @@ import {
   adaptMcpTools,
   mcpClient,
   mcpJsonSchemaValidator
-} from "../chunk-UDDE5KOR.js";
+} from "../chunk-ITM77QPO.js";
 import {
-  protocolOperations
-} from "../chunk-TDNYXSIX.js";
+  protocolRouter
+} from "../chunk-ECQFRCH4.js";
 import "../chunk-BCSNKUAC.js";
-import "../chunk-LUVSFETN.js";
-import "../chunk-CYYBFC2K.js";
+import "../chunk-SB4HEPNJ.js";
+import "../chunk-NKLWZJLE.js";
+import "../chunk-MNMNLXBL.js";
 import "../chunk-IPI4MFSN.js";
-import "../chunk-4M277YTM.js";
-import "../chunk-C3VAOK5B.js";
+import "../chunk-OE3QQTSB.js";
 import "../chunk-ZQINWV4W.js";
-import "../chunk-3XKZDQLM.js";
-import "../chunk-G7T27IWB.js";
+import "../chunk-T7GKZBLP.js";
+import "../chunk-MKWZPDR6.js";
 import {
   McpError,
   ProcessConfig
-} from "../chunk-DQAZTA4I.js";
+} from "../chunk-B3EOZTK3.js";
 import "../chunk-N7YDVXYJ.js";
-import "../chunk-YEPYT6SD.js";
+import "../chunk-R3EV5FTO.js";
 import "../chunk-JU7VHODU.js";
-import "../chunk-W4DMKWAB.js";
-import "../chunk-SB3V4YVR.js";
 import "../chunk-RJDDBDSN.js";
 import "../chunk-57RKNWL2.js";
 import "../chunk-UK573G7W.js";
-import "../chunk-FWQC6I3C.js";
+import "../chunk-5T57N25Q.js";
 import "../chunk-PZB6T6KU.js";
 import "../chunk-27F7W2LG.js";
 import {
@@ -120,11 +118,11 @@ var stdioToolsEffect = (input) => Effect_exports.gen(function* () {
 });
 
 // src/mcp-stdio.ts
-var stdioOperations = (config, signal, kinds = {}) => Effect_exports.runPromise(
-  stdioToolsEffect(config).pipe(Effect_exports.map((tools) => protocolOperations(tools, kinds))),
+var stdioRouter = (config, signal, kinds = {}) => Effect_exports.runPromise(
+  stdioToolsEffect(config).pipe(Effect_exports.map((tools) => protocolRouter(tools, kinds))),
   signal === void 0 ? {} : { signal }
 );
 export {
   McpError,
-  stdioOperations
+  stdioRouter
 };