apps 0.0.1-beta.15 → 0.0.1-beta.16

package/js/{chunk-H34RQANV.js → chunk-CIUZ3HSV.js}

@@ -4,7 +4,7 @@ import {
 import {
   joinPath,
   mergeMeta
-} from "./chunk-SWXGYMUW.js";
+} from "./chunk-TEFD5OBS.js";
 import {
   parseProviderError
 } from "./chunk-MKWZPDR6.js";

package/js/{chunk-4J3IQXFD.js → chunk-L2QHGLWF.js}

@@ -1,11 +1,11 @@
 import {
   fixedRouter
-} from "./chunk-H34RQANV.js";
+} from "./chunk-CIUZ3HSV.js";
 import {
   nativeOperation,
   operationDeclaration,
   routerDeclaration
-} from "./chunk-SWXGYMUW.js";
+} from "./chunk-TEFD5OBS.js";
 
 // src/implementation/protocol-operations.ts
 var protocolOperations = (operations, kinds = {}) => {

package/js/{chunk-YHLXXXKH.js → chunk-QAXLPXKL.js}

@@ -1,9 +1,9 @@
 import {
   prepareElicitation
-} from "./chunk-JAKBOQ5T.js";
+} from "./chunk-ZBGV4RN4.js";
 import {
   fromPromise
-} from "./chunk-SWXGYMUW.js";
+} from "./chunk-TEFD5OBS.js";
 import {
   ElicitationFailed,
   McpError,

package/js/{chunk-GKHJITGG.js → chunk-S2HMUOAV.js}

@@ -2,7 +2,7 @@ import {
   adaptMcpTools,
   mcpClient,
   mcpJsonSchemaValidator
-} from "./chunk-YHLXXXKH.js";
+} from "./chunk-QAXLPXKL.js";
 import {
   accountProviderError,
   httpProviderError

package/js/{chunk-SWXGYMUW.js → chunk-TEFD5OBS.js}

@@ -68,13 +68,18 @@ var operationOptions = (options) => {
     }
   };
 };
+var approvedOperation = (operation, approval) => {
+  const copy = Object.defineProperties({}, Object.getOwnPropertyDescriptors(operation));
+  return Object.defineProperty(copy, "approval", {
+    enumerable: true,
+    value: (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 })
-  }
+  [NativeOperation]: approvedOperation(operation[NativeOperation], approval)
 });
+var toolAnnotations = (operation) => nativeOperation(operation)?.annotations;
 var make = (kind, options, run) => operationDeclaration({
   ...operationOptions(options),
   kind,
@@ -189,6 +194,44 @@ var declaredOperations = (root, path = "") => Object.entries(root?.children ?? {
       return [];
   }
 });
+var withApprovals = (source, policy) => {
+  const native = nativeRouter(source);
+  if (native === void 0) throw new Error("withApprovals expects a router");
+  const operation = (node, name) => {
+    const approval = policy(operationDeclaration(node), name);
+    return approval === void 0 ? node : approvedOperation(node, approval);
+  };
+  const child = (node, name) => {
+    switch (node.kind) {
+      case "query":
+      case "mutation":
+        return operation(node, name);
+      case "router":
+      case "dynamic":
+        return walk(node, name);
+    }
+  };
+  const walk = (node, path) => node.kind === "dynamic" ? {
+    ...node,
+    resolve: (name) => node.resolve(name).pipe(
+      Effect_exports.flatMap(
+        (resolved) => resolved === void 0 ? Effect_exports.succeed(void 0) : Effect_exports.try({
+          try: () => operation(resolved, joinPath(path, name)),
+          catch: (error) => error
+        })
+      )
+    )
+  } : {
+    ...node,
+    children: Object.fromEntries(
+      Object.entries(node.children).map(([key, value]) => [
+        key,
+        child(value, joinPath(path, key))
+      ])
+    )
+  };
+  return routerDeclaration(walk(native, ""));
+};
 
 export {
   fromPromise,
@@ -196,6 +239,7 @@ export {
   operationDeclaration,
   nativeOperation,
   withApproval,
+  toolAnnotations,
   query,
   mutation,
   routerDeclaration,
@@ -205,5 +249,6 @@ export {
   dynamicRouter,
   joinPath,
   locate,
-  declaredOperations
+  declaredOperations,
+  withApprovals
 };

package/js/{chunk-O5G3NDEO.js → chunk-TXFDBLWA.js}

@@ -6,7 +6,7 @@ import {
   fromPromise,
   nativeOperation,
   nativeRouter
-} from "./chunk-SWXGYMUW.js";
+} from "./chunk-TEFD5OBS.js";
 import {
   ScheduleTiming
 } from "./chunk-CL3O2NIN.js";

package/js/{chunk-JAKBOQ5T.js → chunk-ZBGV4RN4.js}

@@ -8,7 +8,7 @@ import {
   failureDetail,
   readCatalog,
   routerSkills
-} from "./chunk-H34RQANV.js";
+} from "./chunk-CIUZ3HSV.js";
 import {
   folderSkillsEffect
 } from "./chunk-IPI4MFSN.js";
@@ -18,7 +18,7 @@ import {
   isApp,
   toEffectApp,
   unavailableStorage
-} from "./chunk-O5G3NDEO.js";
+} from "./chunk-TXFDBLWA.js";
 import {
   parseDatabaseSchema
 } from "./chunk-ZQINWV4W.js";
@@ -28,7 +28,7 @@ import {
   locate,
   nativeOperation,
   toPromise
-} from "./chunk-SWXGYMUW.js";
+} from "./chunk-TEFD5OBS.js";
 import {
   accountProviderError,
   httpProviderError,

package/js/effect.js

@@ -3,13 +3,13 @@ import {
   ApprovalDecision,
   createAppHandler,
   prepareElicitation
-} from "./chunk-JAKBOQ5T.js";
+} from "./chunk-ZBGV4RN4.js";
 import "./chunk-NKLWZJLE.js";
-import "./chunk-H34RQANV.js";
+import "./chunk-CIUZ3HSV.js";
 import "./chunk-IPI4MFSN.js";
-import "./chunk-O5G3NDEO.js";
+import "./chunk-TXFDBLWA.js";
 import "./chunk-ZQINWV4W.js";
-import "./chunk-SWXGYMUW.js";
+import "./chunk-TEFD5OBS.js";
 import "./chunk-MKWZPDR6.js";
 import {
   ToolAnnotations

package/js/graphql.js

@@ -3,20 +3,20 @@ import {
 } from "./chunk-RFVIONFX.js";
 import {
   protocolOperations
-} from "./chunk-4J3IQXFD.js";
+} from "./chunk-L2QHGLWF.js";
 import "./chunk-BCSNKUAC.js";
-import "./chunk-JAKBOQ5T.js";
+import "./chunk-ZBGV4RN4.js";
 import {
   cacheKey
 } from "./chunk-NKLWZJLE.js";
-import "./chunk-H34RQANV.js";
+import "./chunk-CIUZ3HSV.js";
 import "./chunk-IPI4MFSN.js";
-import "./chunk-O5G3NDEO.js";
+import "./chunk-TXFDBLWA.js";
 import "./chunk-ZQINWV4W.js";
 import {
   nativeOperation,
   routerDeclaration
-} from "./chunk-SWXGYMUW.js";
+} from "./chunk-TEFD5OBS.js";
 import {
   accountProviderError,
   graphqlProviderError,

package/js/host.js

@@ -1,12 +1,12 @@
 import {
   createAppHandler
-} from "./chunk-JAKBOQ5T.js";
+} from "./chunk-ZBGV4RN4.js";
 import "./chunk-NKLWZJLE.js";
-import "./chunk-H34RQANV.js";
+import "./chunk-CIUZ3HSV.js";
 import "./chunk-IPI4MFSN.js";
-import "./chunk-O5G3NDEO.js";
+import "./chunk-TXFDBLWA.js";
 import "./chunk-ZQINWV4W.js";
-import "./chunk-SWXGYMUW.js";
+import "./chunk-TEFD5OBS.js";
 import "./chunk-MKWZPDR6.js";
 import {
   ElicitationFailed,

package/js/index.js

@@ -5,7 +5,7 @@ import {
   defineDatabase,
   table,
   workflow
-} from "./chunk-O5G3NDEO.js";
+} from "./chunk-TXFDBLWA.js";
 import "./chunk-ZQINWV4W.js";
 import {
   dynamicRouter,
@@ -17,8 +17,10 @@ import {
   query,
   router,
   routerDeclaration,
-  withApproval
-} from "./chunk-SWXGYMUW.js";
+  toolAnnotations,
+  withApproval,
+  withApprovals
+} from "./chunk-TEFD5OBS.js";
 import {
   accountProviderError
 } from "./chunk-MKWZPDR6.js";
@@ -422,7 +424,9 @@ export {
   secrets2 as secrets,
   string,
   table,
+  toolAnnotations,
   userId,
   withApproval,
+  withApprovals,
   workflow
 };

package/js/mcp/effect.js

@@ -1,16 +1,16 @@
 import {
   mcpClientEffect,
   mcpToolsEffect
-} from "../chunk-GKHJITGG.js";
-import "../chunk-YHLXXXKH.js";
+} from "../chunk-S2HMUOAV.js";
+import "../chunk-QAXLPXKL.js";
 import "../chunk-BCSNKUAC.js";
-import "../chunk-JAKBOQ5T.js";
+import "../chunk-ZBGV4RN4.js";
 import "../chunk-NKLWZJLE.js";
-import "../chunk-H34RQANV.js";
+import "../chunk-CIUZ3HSV.js";
 import "../chunk-IPI4MFSN.js";
-import "../chunk-O5G3NDEO.js";
+import "../chunk-TXFDBLWA.js";
 import "../chunk-ZQINWV4W.js";
-import "../chunk-SWXGYMUW.js";
+import "../chunk-TEFD5OBS.js";
 import "../chunk-MKWZPDR6.js";
 import "../chunk-CL3O2NIN.js";
 import "../chunk-N7YDVXYJ.js";

package/js/mcp/stdio.js

@@ -2,18 +2,18 @@ import {
   adaptMcpTools,
   mcpClient,
   mcpJsonSchemaValidator
-} from "../chunk-YHLXXXKH.js";
+} from "../chunk-QAXLPXKL.js";
 import {
   protocolRouter
-} from "../chunk-4J3IQXFD.js";
+} from "../chunk-L2QHGLWF.js";
 import "../chunk-BCSNKUAC.js";
-import "../chunk-JAKBOQ5T.js";
+import "../chunk-ZBGV4RN4.js";
 import "../chunk-NKLWZJLE.js";
-import "../chunk-H34RQANV.js";
+import "../chunk-CIUZ3HSV.js";
 import "../chunk-IPI4MFSN.js";
-import "../chunk-O5G3NDEO.js";
+import "../chunk-TXFDBLWA.js";
 import "../chunk-ZQINWV4W.js";
-import "../chunk-SWXGYMUW.js";
+import "../chunk-TEFD5OBS.js";
 import "../chunk-MKWZPDR6.js";
 import {
   McpError,

package/js/mcp.js

@@ -1,28 +1,28 @@
 import {
   mcpClientEffect
-} from "./chunk-GKHJITGG.js";
+} from "./chunk-S2HMUOAV.js";
 import {
   catalogCache
 } from "./chunk-RFVIONFX.js";
 import {
   adaptMcpTool
-} from "./chunk-YHLXXXKH.js";
+} from "./chunk-QAXLPXKL.js";
 import {
   protocolOperations
-} from "./chunk-4J3IQXFD.js";
+} from "./chunk-L2QHGLWF.js";
 import "./chunk-BCSNKUAC.js";
-import "./chunk-JAKBOQ5T.js";
+import "./chunk-ZBGV4RN4.js";
 import {
   cacheKey
 } from "./chunk-NKLWZJLE.js";
-import "./chunk-H34RQANV.js";
+import "./chunk-CIUZ3HSV.js";
 import "./chunk-IPI4MFSN.js";
-import "./chunk-O5G3NDEO.js";
+import "./chunk-TXFDBLWA.js";
 import "./chunk-ZQINWV4W.js";
 import {
   nativeOperation,
   routerDeclaration
-} from "./chunk-SWXGYMUW.js";
+} from "./chunk-TEFD5OBS.js";
 import "./chunk-MKWZPDR6.js";
 import {
   McpError,

package/js/openapi.js

@@ -8,7 +8,7 @@ import {
 import {
   protocolOperations,
   protocolRouter
-} from "./chunk-4J3IQXFD.js";
+} from "./chunk-L2QHGLWF.js";
 import {
   OpenapiError,
   OpenapiErrorResponse,
@@ -21,14 +21,14 @@ import {
   isOpenapiTextMedia,
   openapiBinaryResultSchema,
   openapiMediaKind
-} from "./chunk-H34RQANV.js";
+} from "./chunk-CIUZ3HSV.js";
 import "./chunk-IPI4MFSN.js";
 import {
   fromPromise,
   nativeOperation,
   routerDeclaration,
   toPromise
-} from "./chunk-SWXGYMUW.js";
+} from "./chunk-TEFD5OBS.js";
 import {
   accountProviderError,
   httpProviderError

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apps",
-  "version": "0.0.1-beta.15",
+  "version": "0.0.1-beta.16",
   "description": "TypeScript apps with typed tools, accounts, storage, and UI.",
   "type": "module",
   "sideEffects": false,