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

package/js/chunk-T7GKZBLP.js

@@ -0,0 +1,209 @@
+import {
+  HostedTool,
+  RouterKey,
+  RouterMeta,
+  reservedRouterKeys
+} from "./chunk-B3EOZTK3.js";
+import {
+  decoderOf
+} from "./chunk-5T57N25Q.js";
+import {
+  Effect_exports,
+  Schema_exports
+} from "./chunk-CDL5PM2Q.js";
+
+// src/implementation/authoring.ts
+var NativeCallback = /* @__PURE__ */ Symbol("apps.NativeCallback");
+var fromPromise = (callback) => (...args) => {
+  if (NativeCallback in callback) {
+    const native = callback[NativeCallback];
+    return native(...args);
+  }
+  return Effect_exports.tryPromise({ try: () => callback(...args), catch: (error) => error });
+};
+var toPromise = (operation, signal) => {
+  const native = (...args) => Effect_exports.suspend(() => {
+    if (signal === void 0) return operation(...args);
+    if (signal.aborted) return Effect_exports.interrupt;
+    const cancelled = Effect_exports.callback((resume) => {
+      if (signal.aborted) {
+        resume(Effect_exports.interrupt);
+        return;
+      }
+      const abort = () => resume(Effect_exports.interrupt);
+      signal.addEventListener("abort", abort, { once: true });
+      return Effect_exports.sync(() => signal.removeEventListener("abort", abort));
+    });
+    return Effect_exports.raceFirst(
+      cancelled,
+      Effect_exports.suspend(() => operation(...args))
+    );
+  });
+  return Object.assign((...args) => Effect_exports.runPromise(native(...args)), {
+    [NativeCallback]: native
+  });
+};
+
+// src/implementation/operations.ts
+var NativeOperation = /* @__PURE__ */ Symbol("apps.Operation");
+var NativeRouterKey = /* @__PURE__ */ Symbol("apps.Router");
+var operationDeclaration = (operation) => ({
+  kind: operation.kind,
+  [NativeOperation]: operation
+});
+var nativeOperation = (value) => {
+  if (typeof value !== "object" || value === null || !(NativeOperation in value)) return void 0;
+  return value[NativeOperation];
+};
+var operationOptions = (options) => {
+  const approval = options.approval;
+  return {
+    ...options.description === void 0 ? {} : { description: options.description },
+    ...options.title === void 0 ? {} : { title: options.title },
+    ...options.annotations === void 0 ? {} : { annotations: options.annotations },
+    ...options._meta === void 0 ? {} : { _meta: options._meta },
+    input: decoderOf(options.input),
+    ...approval === void 0 ? {} : {
+      approval: (context) => Effect_exports.tryPromise({ try: async () => approval(context), catch: (error) => error })
+    }
+  };
+};
+var withApproval = (operation, approval) => ({
+  ...operation,
+  [NativeOperation]: {
+    ...operation[NativeOperation],
+    approval: (context) => Effect_exports.tryPromise({ try: async () => approval(context), catch: (error) => error })
+  }
+});
+var make = (kind, options, run) => operationDeclaration({
+  ...operationOptions(options),
+  kind,
+  // The host always validates JSON serialization, even without a stronger output declaration.
+  ...options.output === void 0 ? {} : { output: decoderOf(options.output) },
+  run: (context, input) => Effect_exports.tryPromise({
+    // SAFETY: defineApp checks the handler context against its requirements.
+    // The host validates account bindings and creates the matching storage facade.
+    try: () => run(context, input),
+    catch: (error) => error
+  })
+});
+var query = (options, run) => make("query", options, run);
+var mutation = (options, run) => make("mutation", options, run);
+
+// src/implementation/router.ts
+var routerDeclaration = (node) => ({
+  [NativeRouterKey]: node
+});
+var nativeRouter = (value) => {
+  if (typeof value !== "object" || value === null || !(NativeRouterKey in value)) return void 0;
+  return value[NativeRouterKey];
+};
+var nativeNode = (value) => nativeOperation(value) ?? nativeRouter(value);
+var metaOf = (options) => {
+  if (options === void 0) return void 0;
+  const defined = Object.fromEntries(
+    Object.entries(options).filter(([, value]) => value !== void 0)
+  );
+  return Object.keys(defined).length === 0 ? void 0 : Schema_exports.decodeUnknownSync(RouterMeta)(defined);
+};
+var mergeMeta = (base, override) => base === void 0 ? override : override === void 0 ? base : { ...base, ...override };
+function router(children, options) {
+  const meta = metaOf(options);
+  const existing = nativeRouter(children);
+  if (existing !== void 0)
+    return routerDeclaration(
+      existing.kind === "router" ? { ...existing, ...withMeta(mergeMeta(existing.meta, meta)) } : { ...existing, ...withOverrides(mergeMeta(existing.overrides, meta)) }
+    );
+  const nodes = {};
+  for (const [key, value] of Object.entries(children)) {
+    if (reservedRouterKeys.has(key)) throw new Error(`Router key "${key}" is reserved`);
+    if (!Schema_exports.is(RouterKey)(key))
+      throw new Error(`Router key "${key}" must start with a letter or _ and contain no dots`);
+    const node = nativeNode(value);
+    if (node === void 0)
+      throw new Error(`Router key "${key}" must be a query, mutation or router`);
+    nodes[key] = node;
+  }
+  return routerDeclaration({ kind: "router", ...withMeta(meta), children: nodes });
+}
+var withMeta = (meta) => meta === void 0 ? {} : { meta };
+var withOverrides = (overrides) => overrides === void 0 ? {} : { overrides };
+var dynamicRouter = (source) => {
+  const meta = source.meta;
+  return routerDeclaration({
+    kind: "dynamic",
+    ...meta === void 0 ? {} : {
+      meta: () => fromPromise(async () => meta())().pipe(
+        Effect_exports.flatMap((options) => Schema_exports.decodeUnknownEffect(RouterMeta)(options))
+      )
+    },
+    list: () => fromPromise(async () => source.list())().pipe(
+      Effect_exports.flatMap(Schema_exports.decodeUnknownEffect(Schema_exports.Array(HostedTool)))
+    ),
+    resolve: (name) => fromPromise(async () => 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;
+      })
+    )
+  });
+};
+var joinPath = (path, name) => path === "" ? name : `${path}.${name}`;
+var locate = (root, name) => {
+  if (root?.kind === "dynamic") return { kind: "dynamic", source: root, router: "", name };
+  let current = root;
+  let path = "";
+  let rest = name;
+  while (current !== void 0) {
+    const dot = rest.indexOf(".");
+    const key = dot < 0 ? rest : rest.slice(0, dot);
+    const child = Object.hasOwn(current.children, key) ? current.children[key] : void 0;
+    if (child === void 0) return void 0;
+    const remaining = dot < 0 ? void 0 : rest.slice(dot + 1);
+    switch (child.kind) {
+      case "query":
+      case "mutation":
+        return remaining === void 0 ? { kind: "operation", operation: child, router: path } : void 0;
+      case "dynamic":
+        return remaining === void 0 || remaining === "" ? void 0 : { kind: "dynamic", source: child, router: joinPath(path, key), name: remaining };
+      case "router":
+        if (remaining === void 0) return void 0;
+        current = child;
+        path = joinPath(path, key);
+        rest = remaining;
+    }
+  }
+  return void 0;
+};
+var declaredOperations = (root, path = "") => Object.entries(root?.children ?? {}).flatMap(([key, child]) => {
+  const name = joinPath(path, key);
+  switch (child.kind) {
+    case "query":
+    case "mutation":
+      return [{ name, router: path, operation: child }];
+    case "router":
+      return declaredOperations(child, name);
+    case "dynamic":
+      return [];
+  }
+});
+
+export {
+  fromPromise,
+  toPromise,
+  operationDeclaration,
+  nativeOperation,
+  withApproval,
+  query,
+  mutation,
+  routerDeclaration,
+  nativeRouter,
+  mergeMeta,
+  router,
+  dynamicRouter,
+  joinPath,
+  locate,
+  declaredOperations
+};

package/js/client.js

@@ -28,7 +28,7 @@ import {
 } from "./chunk-UK573G7W.js";
 import {
   decoderOf
-} from "./chunk-FWQC6I3C.js";
+} from "./chunk-5T57N25Q.js";
 import {
   StorageName
 } from "./chunk-PZB6T6KU.js";

package/js/contracts.js

@@ -1,4 +1,5 @@
 import {
+  ApiErrorResponse,
   ApprovalElicitation,
   ApprovalResponse,
   CalendarSchedule,
@@ -24,6 +25,7 @@ import {
   HostInputInvalid,
   HostInspectError,
   HostInvocation,
+  HostKindMismatch,
   HostOperationFailed,
   HostOperationNotFound,
   HostOutputInvalid,
@@ -31,10 +33,14 @@ import {
   HostRequestInvalid,
   HostRequirementsError,
   HostResponse,
+  HostRouterError,
   HostToolApprovalRequired,
   HostToolBlocked,
   HostToolNotFound,
   HostToolPolicyFailed,
+  HostedCatalog,
+  HostedCatalogSummary,
+  HostedRouter,
   HostedTool,
   HostedToolSummary,
   HostedWebhook,
@@ -49,10 +55,13 @@ import {
   NonRetryableError,
   OAuthClientAuth,
   OAuthSecretClientAuth,
+  OpenapiResponseError,
   OperationSchedule,
-  OperationToolPrefixes,
   ResolvedAccount,
   ResolvedAccounts,
+  RouterIcon,
+  RouterKey,
+  RouterMeta,
   ScheduleTiming,
   SkillCatalogResponse,
   SkillSources,
@@ -90,16 +99,19 @@ import {
   protocol1,
   protocol2,
   protocol3,
+  protocol4,
   selectTools,
   skillCatalog,
   skillsCommand,
   workflowDurationMillis
-} from "./chunk-DQAZTA4I.js";
+} from "./chunk-B3EOZTK3.js";
 import {
   DatabaseFieldReserved,
   DatabaseLimitExceeded
 } from "./chunk-N7YDVXYJ.js";
-import "./chunk-YEPYT6SD.js";
+import {
+  ProviderError
+} from "./chunk-R3EV5FTO.js";
 import {
   AppSkillMetadata,
   AppSkillName,
@@ -113,13 +125,6 @@ import {
   skillFormatLimits,
   skillLoadLimits
 } from "./chunk-JU7VHODU.js";
-import {
-  ApiErrorResponse,
-  OpenapiResponseError
-} from "./chunk-W4DMKWAB.js";
-import {
-  ProviderError
-} from "./chunk-SB3V4YVR.js";
 import {
   AppStorageError,
   AppStorageUnavailable,
@@ -167,6 +172,7 @@ export {
   HostInputInvalid,
   HostInspectError,
   HostInvocation,
+  HostKindMismatch,
   HostOperationFailed,
   HostOperationNotFound,
   HostOutputInvalid,
@@ -174,10 +180,14 @@ export {
   HostRequestInvalid,
   HostRequirementsError,
   HostResponse,
+  HostRouterError,
   HostToolApprovalRequired,
   HostToolBlocked,
   HostToolNotFound,
   HostToolPolicyFailed,
+  HostedCatalog,
+  HostedCatalogSummary,
+  HostedRouter,
   HostedTool,
   HostedToolSummary,
   HostedWebhook,
@@ -195,10 +205,12 @@ export {
   OAuthSecretClientAuth,
   OpenapiResponseError,
   OperationSchedule,
-  OperationToolPrefixes,
   ProviderError,
   ResolvedAccount,
   ResolvedAccounts,
+  RouterIcon,
+  RouterKey,
+  RouterMeta,
   ScheduleTiming,
   SkillCatalogResponse,
   SkillDefinitionInvalid,
@@ -242,6 +254,7 @@ export {
   protocol1,
   protocol2,
   protocol3,
+  protocol4,
   selectTools,
   skillCatalog,
   skillFormatLimits,

package/js/effect.js

@@ -3,22 +3,20 @@ import {
   ApprovalDecision,
   createAppHandler,
   prepareElicitation
-} from "./chunk-LUVSFETN.js";
-import "./chunk-CYYBFC2K.js";
+} from "./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 {
   ToolAnnotations
-} 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";
@@ -27,7 +25,7 @@ import {
   decoderOf,
   jsonSchemaDecoder,
   wrap
-} from "./chunk-FWQC6I3C.js";
+} from "./chunk-5T57N25Q.js";
 import "./chunk-PZB6T6KU.js";
 import {
   HttpUrl,

package/js/graphql.js

@@ -1,34 +1,33 @@
 import {
   catalogCache
-} from "./chunk-XHO2ZX6W.js";
+} from "./chunk-RFVIONFX.js";
 import {
   protocolOperations
-} from "./chunk-TDNYXSIX.js";
+} from "./chunk-ECQFRCH4.js";
 import "./chunk-BCSNKUAC.js";
-import "./chunk-LUVSFETN.js";
+import "./chunk-SB4HEPNJ.js";
 import {
   cacheKey
-} from "./chunk-CYYBFC2K.js";
+} from "./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 {
-  nativeOperation
-} from "./chunk-3XKZDQLM.js";
+  nativeOperation,
+  routerDeclaration
+} from "./chunk-T7GKZBLP.js";
 import {
   accountProviderError,
   graphqlProviderError,
   httpProviderError
-} from "./chunk-G7T27IWB.js";
-import "./chunk-DQAZTA4I.js";
+} from "./chunk-MKWZPDR6.js";
+import "./chunk-B3EOZTK3.js";
 import "./chunk-N7YDVXYJ.js";
-import "./chunk-YEPYT6SD.js";
-import "./chunk-JU7VHODU.js";
-import "./chunk-W4DMKWAB.js";
 import {
   ProviderError
-} from "./chunk-SB3V4YVR.js";
+} from "./chunk-R3EV5FTO.js";
+import "./chunk-JU7VHODU.js";
 import "./chunk-RJDDBDSN.js";
 import {
   FetchHttpClient_exports
@@ -39,7 +38,7 @@ import {
 } from "./chunk-UK573G7W.js";
 import {
   jsonSchemaDecoder
-} from "./chunk-FWQC6I3C.js";
+} from "./chunk-5T57N25Q.js";
 import "./chunk-PZB6T6KU.js";
 import {
   AccountId,
@@ -449,13 +448,13 @@ var graphqlCatalog = (options, kinds) => Effect_exports.gen(function* () {
     },
     load: (context) => (context === void 0 ? Effect_exports.succeed(client) : graphqlClientEffect({ ...parsed, signal: context.signal })).pipe(
       Effect_exports.flatMap((source) => source.discover),
-      Effect_exports.flatMap(graphqlDefinitions)
+      Effect_exports.flatMap(graphqlDefinitions),
+      Effect_exports.map((tools) => ({ tools }))
     )
   });
   const kindOf = (tool) => Object.hasOwn(kinds, tool.name) ? kinds[tool.name] ?? "mutation" : tool.kind;
-  const qualified = (tool) => `${kindOf(tool) === "query" ? "queries" : "mutations"}.${tool.name}`;
   const summarize = (tool) => ({
-    name: qualified(tool),
+    name: tool.name,
     description: tool.description,
     readOnly: kindOf(tool) === "query"
   });
@@ -463,34 +462,28 @@ var graphqlCatalog = (options, kinds) => Effect_exports.gen(function* () {
     ...summarize(tool),
     inputSchema: tool.inputSchema
   });
-  const selected = (name) => Effect_exports.gen(function* () {
-    if (!name.startsWith("queries.") && !name.startsWith("mutations.")) return void 0;
-    const tool = yield* catalog.resolve(name.slice(name.indexOf(".") + 1));
-    return tool === void 0 || qualified(tool) !== name ? void 0 : tool;
-  });
-  const dynamicTools = {
+  const router = {
+    kind: "dynamic",
     list: () => catalog.list().pipe(Effect_exports.map((tools) => tools.map(describe))),
     summaries: () => catalog.summaries().pipe(Effect_exports.map((tools) => tools.map(summarize))),
-    describe: (name) => selected(name).pipe(
-      Effect_exports.map((tool) => tool === void 0 ? void 0 : describe(tool))
-    ),
+    describe: (name) => catalog.resolve(name).pipe(Effect_exports.map((tool) => tool === void 0 ? void 0 : describe(tool))),
     resolve: (name) => Effect_exports.gen(function* () {
-      const tool = yield* selected(name);
+      const tool = yield* catalog.resolve(name);
       if (tool === void 0) return void 0;
       const adapted = yield* adaptGraphqlTool(client, tool);
       const operations = protocolOperations({ selected: adapted }, { selected: kindOf(tool) });
-      return nativeOperation(operations.queries.selected ?? operations.mutations.selected);
+      return nativeOperation(operations.selected);
     })
   };
-  return { dynamicTools };
+  return routerDeclaration(router);
 });
 
 // src/graphql.ts
-var graphqlOperations = (options, kinds = {}) => Effect_exports.runPromise(
+var graphqlRouter = (options, kinds = {}) => Effect_exports.runPromise(
   graphqlCatalog(options, kinds),
   options.signal === void 0 ? {} : { signal: options.signal }
 );
 export {
   GraphqlError,
-  graphqlOperations
+  graphqlRouter
 };

package/js/host.js

@@ -1,13 +1,13 @@
 import {
   createAppHandler
-} from "./chunk-LUVSFETN.js";
-import "./chunk-CYYBFC2K.js";
+} from "./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 {
   ElicitationFailed,
   ElicitationReply,
@@ -21,23 +21,21 @@ import {
   WorkflowRun,
   WorkflowRunId,
   WorkflowRunPage
-} from "./chunk-DQAZTA4I.js";
+} from "./chunk-B3EOZTK3.js";
 import "./chunk-N7YDVXYJ.js";
 import {
   CacheCommand,
   CacheError,
   CacheReply
-} from "./chunk-YEPYT6SD.js";
+} from "./chunk-R3EV5FTO.js";
 import "./chunk-JU7VHODU.js";
-import "./chunk-W4DMKWAB.js";
-import "./chunk-SB3V4YVR.js";
 import {
   collectTelemetry,
   withRemoteSpan
 } from "./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 {