apps 0.0.1-beta.93 → 0.0.1-beta.95

package/js/{chunk-6C2I6JLA.js → chunk-4CCDS4U7.js}

@@ -1,6 +1,6 @@
 import {
   getWithReads
-} from "./chunk-JJZZLNJY.js";
+} from "./chunk-7YH74PGP.js";
 import {
   fromPromise,
   method,
@@ -11,7 +11,7 @@ import {
 } from "./chunk-6WC2OWHV.js";
 import {
   wrap
-} from "./chunk-RKFLB36H.js";
+} from "./chunk-VAI3EVCS.js";
 import {
   JsonObject
 } from "./chunk-7HG422GB.js";

package/js/{chunk-6F3WAXVN.js → chunk-7N2UOAMJ.js}

@@ -10,7 +10,7 @@ import {
 import {
   decoderOf,
   schemaArgument
-} from "./chunk-RKFLB36H.js";
+} from "./chunk-VAI3EVCS.js";
 import {
   Effect_exports,
   Schema_exports

package/js/{chunk-JJZZLNJY.js → chunk-7YH74PGP.js}

@@ -15,7 +15,7 @@ import {
 } from "./chunk-6WC2OWHV.js";
 import {
   decoderOf
-} from "./chunk-RKFLB36H.js";
+} from "./chunk-VAI3EVCS.js";
 import {
   captureTelemetry,
   owned,

package/js/{chunk-MBCUKNUA.js → chunk-DXZEKRIW.js}

@@ -1,6 +1,6 @@
 import {
   prepareElicitation
-} from "./chunk-FA5MLNYL.js";
+} from "./chunk-VIFIFPDC.js";
 import {
   failOnNetworkRefusal
 } from "./chunk-2GPX2E57.js";
@@ -33,7 +33,7 @@ import {
   jsonSchemaDecoder,
   nestJsonSchema,
   preparedJsonSchemaDecoder
-} from "./chunk-RKFLB36H.js";
+} from "./chunk-VAI3EVCS.js";
 import {
   captureTelemetry,
   owned

package/js/{chunk-TNVB3KLB.js → chunk-EQVLEJTX.js}

@@ -2,7 +2,7 @@ import {
   declaredOperations,
   nativeOperation,
   nativeRouter
-} from "./chunk-6F3WAXVN.js";
+} from "./chunk-7N2UOAMJ.js";
 import {
   fromPromise,
   method
@@ -23,7 +23,7 @@ import {
   isSchema,
   jsonSchemaDocument,
   schemaArgument
-} from "./chunk-RKFLB36H.js";
+} from "./chunk-VAI3EVCS.js";
 import {
   JsonValue
 } from "./chunk-7HG422GB.js";

package/js/{chunk-ATBBIJ5O.js → chunk-OGUGI2I6.js}

@@ -1,11 +1,11 @@
 import {
   fixedRouter
-} from "./chunk-DYE2CKHG.js";
+} from "./chunk-RLV4NKW3.js";
 import {
   nativeOperation,
   operationDeclaration,
   routerDeclaration
-} from "./chunk-6F3WAXVN.js";
+} from "./chunk-7N2UOAMJ.js";
 
 // src/implementation/protocol-operations.ts
 var protocolOperations = (operations, kinds = {}) => {

package/js/{chunk-DYE2CKHG.js → chunk-RLV4NKW3.js}

@@ -4,7 +4,7 @@ import {
 import {
   joinPath,
   mergeMeta
-} from "./chunk-6F3WAXVN.js";
+} from "./chunk-7N2UOAMJ.js";
 import {
   isShortenedUpstream,
   parseProviderError,
@@ -38,7 +38,7 @@ import {
 } from "./chunk-4PIQKACY.js";
 import {
   jsonSchemaDocument
-} from "./chunk-RKFLB36H.js";
+} from "./chunk-VAI3EVCS.js";
 import {
   AccountId,
   HttpUrl,

package/js/{chunk-RKFLB36H.js → chunk-VAI3EVCS.js}

@@ -1264,6 +1264,65 @@ var nestJsonSchema = (input, pointer) => {
     Schema_exports.Record(Schema_exports.String, Schema_exports.Json)
   )(rewrite(document));
 };
+var identifiers = /* @__PURE__ */ new Set([
+  "$id",
+  "id",
+  "$anchor",
+  "$recursiveAnchor",
+  "$recursiveRef",
+  "$dynamicAnchor",
+  "$dynamicRef"
+]);
+var ownDefinition = (reference) => {
+  if (typeof reference !== "string" || !reference.startsWith("#/$defs/")) return void 0;
+  const segments = pointerSegments(reference);
+  return segments.length === 2 ? segments[1] : void 0;
+};
+var rootDefinitions = (schema) => {
+  const definitions = schema.$defs ?? {};
+  if (!isJsonRecord(definitions)) return void 0;
+  const pending = [schema];
+  for (let value = pending.pop(); value !== void 0; value = pending.pop()) {
+    if (!isSchemaObject(value)) continue;
+    for (const [key, item] of Object.entries(value)) {
+      if (identifiers.has(key)) return void 0;
+      if (key === "$ref") {
+        const name = ownDefinition(item);
+        if (name === void 0 || !Object.hasOwn(definitions, name)) return void 0;
+      } else if (Array.isArray(item)) {
+        if (schemaArrays.has(key) || key === "items") pending.push(...item);
+      } else if (schemaMaps.has(key) || key === "dependencies") {
+        if (isJsonRecord(item)) pending.push(...Object.values(item));
+      } else if (schemaNodes.has(key)) pending.push(item);
+    }
+  }
+  return definitions;
+};
+var combineJsonSchemas = (schemas, pointer) => {
+  const shared = {};
+  const texts = /* @__PURE__ */ new Map();
+  const combined = schemas.map((schema, index) => {
+    const definitions = rootDefinitions(schema);
+    const entries = Object.entries(definitions ?? {}).map(
+      ([name, definition]) => [name, definition, JSON.stringify(definition)]
+    );
+    if (definitions === void 0 || entries.some(([name, , text]) => texts.has(name) && texts.get(name) !== text))
+      return nestJsonSchema(schema, pointer(index));
+    for (const [name, definition, text] of entries) {
+      if (texts.has(name)) continue;
+      texts.set(name, text);
+      Object.defineProperty(shared, name, {
+        value: definition,
+        enumerable: true,
+        writable: true,
+        configurable: true
+      });
+    }
+    const { $defs: _, ...rest } = schema;
+    return rest;
+  });
+  return texts.size === 0 ? { schemas: combined } : { $defs: shared, schemas: combined };
+};
 var schemaMaps = /* @__PURE__ */ new Set([
   "$defs",
   "definitions",
@@ -1924,6 +1983,7 @@ export {
   once,
   withLazyJsonSchemaDocument,
   nestJsonSchema,
+  combineJsonSchemas,
   echoableKey,
   objectShape,
   allowedValues,

package/js/{chunk-FA5MLNYL.js → chunk-VIFIFPDC.js}

@@ -1,7 +1,7 @@
 import {
   authorCache,
   unavailableCache
-} from "./chunk-JJZZLNJY.js";
+} from "./chunk-7YH74PGP.js";
 import {
   accountSecrets,
   boundFailureMessage,
@@ -12,7 +12,7 @@ import {
   parseSkillLoadFailed,
   readCatalog,
   routerSkills
-} from "./chunk-DYE2CKHG.js";
+} from "./chunk-RLV4NKW3.js";
 import {
   appInvocationFetch
 } from "./chunk-2GPX2E57.js";
@@ -26,12 +26,12 @@ import {
   makeEmitter,
   toEffectApp,
   withPlacements
-} from "./chunk-TNVB3KLB.js";
+} from "./chunk-EQVLEJTX.js";
 import {
   declaredOperations,
   locate,
   nativeOperation
-} from "./chunk-6F3WAXVN.js";
+} from "./chunk-7N2UOAMJ.js";
 import {
   accountProviderError,
   appCode,
@@ -108,7 +108,7 @@ import {
   missingKeyText,
   objectShape,
   unionShape
-} from "./chunk-RKFLB36H.js";
+} from "./chunk-VAI3EVCS.js";
 import {
   captureTelemetry,
   makeOwnershipAccounting,

package/js/client.js

@@ -12,7 +12,7 @@ import {
 } from "./chunk-KLSEU35Y.js";
 import {
   decoderOf
-} from "./chunk-RKFLB36H.js";
+} from "./chunk-VAI3EVCS.js";
 import {
   OtlpExporter_exports,
   externalTrace,

package/js/effect.js

@@ -3,13 +3,13 @@ import {
   ApprovalDecision,
   createAppHandler,
   prepareElicitation
-} from "./chunk-FA5MLNYL.js";
-import "./chunk-JJZZLNJY.js";
-import "./chunk-DYE2CKHG.js";
+} from "./chunk-VIFIFPDC.js";
+import "./chunk-7YH74PGP.js";
+import "./chunk-RLV4NKW3.js";
 import "./chunk-2GPX2E57.js";
 import "./chunk-PBGPES67.js";
-import "./chunk-TNVB3KLB.js";
-import "./chunk-6F3WAXVN.js";
+import "./chunk-EQVLEJTX.js";
+import "./chunk-7N2UOAMJ.js";
 import "./chunk-MN5XVRKW.js";
 import {
   ToolAnnotations
@@ -20,7 +20,7 @@ import {
   decoderOf,
   jsonSchemaDecoder,
   wrap
-} from "./chunk-RKFLB36H.js";
+} from "./chunk-VAI3EVCS.js";
 import "./chunk-URKOTNDA.js";
 import "./chunk-YDW7DX3A.js";
 import "./chunk-OWN3DP2W.js";

package/js/graphql.js

@@ -1,25 +1,25 @@
 import {
   catalogCache,
   catalogScope
-} from "./chunk-6C2I6JLA.js";
+} from "./chunk-4CCDS4U7.js";
 import {
   protocolOperations
-} from "./chunk-ATBBIJ5O.js";
+} from "./chunk-OGUGI2I6.js";
 import "./chunk-BCSNKUAC.js";
-import "./chunk-FA5MLNYL.js";
+import "./chunk-VIFIFPDC.js";
 import {
   cacheKey
-} from "./chunk-JJZZLNJY.js";
-import "./chunk-DYE2CKHG.js";
+} from "./chunk-7YH74PGP.js";
+import "./chunk-RLV4NKW3.js";
 import {
   failOnNetworkRefusal
 } from "./chunk-2GPX2E57.js";
 import "./chunk-PBGPES67.js";
-import "./chunk-TNVB3KLB.js";
+import "./chunk-EQVLEJTX.js";
 import {
   nativeOperation,
   routerDeclaration
-} from "./chunk-6F3WAXVN.js";
+} from "./chunk-7N2UOAMJ.js";
 import {
   accountProviderError,
   graphqlProviderError,
@@ -32,7 +32,7 @@ import {
 import "./chunk-4PIQKACY.js";
 import {
   jsonSchemaDecoder
-} from "./chunk-RKFLB36H.js";
+} from "./chunk-VAI3EVCS.js";
 import {
   owned
 } from "./chunk-URKOTNDA.js";

package/js/host.js

@@ -1,12 +1,12 @@
 import {
   createAppHandler
-} from "./chunk-FA5MLNYL.js";
-import "./chunk-JJZZLNJY.js";
-import "./chunk-DYE2CKHG.js";
+} from "./chunk-VIFIFPDC.js";
+import "./chunk-7YH74PGP.js";
+import "./chunk-RLV4NKW3.js";
 import "./chunk-2GPX2E57.js";
 import "./chunk-PBGPES67.js";
-import "./chunk-TNVB3KLB.js";
-import "./chunk-6F3WAXVN.js";
+import "./chunk-EQVLEJTX.js";
+import "./chunk-7N2UOAMJ.js";
 import "./chunk-MN5XVRKW.js";
 import {
   CacheCommand,
@@ -27,7 +27,7 @@ import {
   WorkflowRunPage
 } from "./chunk-6WC2OWHV.js";
 import "./chunk-4PIQKACY.js";
-import "./chunk-RKFLB36H.js";
+import "./chunk-VAI3EVCS.js";
 import {
   collectTelemetry,
   withRemoteSpan

package/js/index.js

@@ -11,7 +11,7 @@ import {
   query,
   t,
   workflow
-} from "./chunk-TNVB3KLB.js";
+} from "./chunk-EQVLEJTX.js";
 import {
   dynamicRouter,
   mutation,
@@ -25,7 +25,7 @@ import {
   toolAnnotations,
   withApproval,
   withApprovals
-} from "./chunk-6F3WAXVN.js";
+} from "./chunk-7N2UOAMJ.js";
 import {
   accountProviderError,
   fromPromise
@@ -53,6 +53,7 @@ import "./chunk-4PIQKACY.js";
 import {
   array,
   boolean,
+  combineJsonSchemas,
   decoderOf,
   fieldExposure,
   importedJsonSchema,
@@ -60,7 +61,6 @@ import {
   json,
   jsonSchema,
   literal,
-  nestJsonSchema,
   number,
   object,
   once,
@@ -72,7 +72,7 @@ import {
   string,
   withLazyJsonSchemaDocument,
   wrap
-} from "./chunk-RKFLB36H.js";
+} from "./chunk-VAI3EVCS.js";
 import "./chunk-URKOTNDA.js";
 import "./chunk-YDW7DX3A.js";
 import "./chunk-OWN3DP2W.js";
@@ -139,6 +139,42 @@ var decoderDocument = (decoder) => {
   const document = Schema_exports.toJsonSchemaDocument(decoder);
   return Schema_exports.decodeUnknownSync(JsonObject)({ ...document.schema, $defs: document.definitions });
 };
+var accountBranches = (variants) => {
+  const groups = /* @__PURE__ */ new Map();
+  for (const [accountId, schema] of variants) {
+    const key = JSON.stringify(schema);
+    const group = groups.get(key);
+    if (group === void 0) groups.set(key, { schema, first: accountId, rest: [] });
+    else group.rest.push(accountId);
+  }
+  const branches = [...groups.values()];
+  const { $defs, schemas } = combineJsonSchemas(
+    branches.map(({ schema }) => schema),
+    (index) => `#/anyOf/${index}/properties/input`
+  );
+  return {
+    type: "object",
+    ...$defs === void 0 ? {} : { $defs },
+    anyOf: schemas.map((input, index) => {
+      const { first, rest } = branches[index];
+      return {
+        type: "object",
+        properties: {
+          accountId: rest.length === 0 ? { type: "string", const: first } : { type: "string", enum: [first, ...rest] },
+          input
+        },
+        required: ["accountId", "input"]
+      };
+    })
+  };
+};
+var outputBranches = (outputs) => {
+  const { $defs, schemas } = combineJsonSchemas(
+    [...new Map(outputs.map((output) => [JSON.stringify(output), output])).values()],
+    (index) => `#/anyOf/${index}`
+  );
+  return { ...$defs === void 0 ? {} : { $defs }, anyOf: schemas };
+};
 var declaresOutput = (operation) => {
   if (operation.output !== void 0) return true;
   const property = Object.getOwnPropertyDescriptor(operation, "outputSchema");
@@ -161,20 +197,9 @@ var combineOperation = (accounts) => {
       ([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",
-      properties: {
-        accountId: { type: "string", const: accountId },
-        input: nestJsonSchema(
-          decoderDocument(operation.input),
-          `#/anyOf/${index}/properties/input`
-        )
-      },
-      required: ["accountId", "input"]
-    }))
-  });
+  const inputSchema = () => accountBranches(
+    [...accounts].map(([accountId, operation]) => [accountId, decoderDocument(operation.input)])
+  );
   const declaration2 = operationDeclaration({
     kind,
     ...first.description === void 0 ? {} : { description: first.description },
@@ -199,12 +224,14 @@ var combineOperation = (accounts) => {
     }
   });
   if (variants.every(declaresOutput)) {
-    const outputSchema = once(() => ({
-      anyOf: variants.flatMap((operation) => {
-        const output = outputDocument(operation);
-        return output === void 0 ? [] : [output];
-      }).map((output, index) => nestJsonSchema(output, `#/anyOf/${index}`))
-    }));
+    const outputSchema = once(
+      () => outputBranches(
+        variants.flatMap((operation) => {
+          const output = outputDocument(operation);
+          return output === void 0 ? [] : [output];
+        })
+      )
+    );
     const native2 = nativeOperation(declaration2);
     if (native2 !== void 0)
       Object.defineProperty(native2, "outputSchema", { enumerable: true, get: outputSchema });
@@ -230,23 +257,15 @@ var mergeSummary = (name, variants) => {
 };
 var merge = (name, variants) => Schema_exports.decodeUnknownSync(HostedTool)({
   ...mergeSummary(name, variants),
-  inputSchema: {
-    type: "object",
-    anyOf: variants.map(([accountId, tool], index) => ({
-      type: "object",
-      properties: {
-        accountId: { type: "string", const: accountId },
-        input: nestJsonSchema(tool.inputSchema, `#/anyOf/${index}/properties/input`)
-      },
-      required: ["accountId", "input"]
-    }))
-  },
+  inputSchema: accountBranches(
+    variants.map(([accountId, tool]) => [accountId, tool.inputSchema])
+  ),
   ...variants.every(([, tool]) => tool.outputSchema !== void 0) ? {
-    outputSchema: {
-      anyOf: variants.flatMap(
-        ([, tool], index) => tool.outputSchema === void 0 ? [] : [nestJsonSchema(tool.outputSchema, `#/anyOf/${index}`)]
+    outputSchema: outputBranches(
+      variants.flatMap(
+        ([, tool]) => tool.outputSchema === void 0 ? [] : [tool.outputSchema]
       )
-    }
+    )
   } : {},
   ...sameAcross("_meta", variants)
 });

package/js/mcp/effect.js

@@ -2,19 +2,19 @@ import {
   mcpClientEffect,
   mcpHealthEffect,
   mcpToolsEffect
-} from "../chunk-MBCUKNUA.js";
+} from "../chunk-DXZEKRIW.js";
 import "../chunk-BCSNKUAC.js";
-import "../chunk-FA5MLNYL.js";
-import "../chunk-JJZZLNJY.js";
-import "../chunk-DYE2CKHG.js";
+import "../chunk-VIFIFPDC.js";
+import "../chunk-7YH74PGP.js";
+import "../chunk-RLV4NKW3.js";
 import "../chunk-2GPX2E57.js";
 import "../chunk-PBGPES67.js";
-import "../chunk-TNVB3KLB.js";
-import "../chunk-6F3WAXVN.js";
+import "../chunk-EQVLEJTX.js";
+import "../chunk-7N2UOAMJ.js";
 import "../chunk-MN5XVRKW.js";
 import "../chunk-6WC2OWHV.js";
 import "../chunk-4PIQKACY.js";
-import "../chunk-RKFLB36H.js";
+import "../chunk-VAI3EVCS.js";
 import "../chunk-URKOTNDA.js";
 import "../chunk-YDW7DX3A.js";
 import "../chunk-OWN3DP2W.js";

package/js/mcp.js

@@ -1,30 +1,30 @@
 import {
   catalogCache,
   catalogScope
-} from "./chunk-6C2I6JLA.js";
+} from "./chunk-4CCDS4U7.js";
 import {
   protocolOperations
-} from "./chunk-ATBBIJ5O.js";
+} from "./chunk-OGUGI2I6.js";
 import {
   adaptMcpTool,
   mcpClientEffect,
   mcpHealthEffect
-} from "./chunk-MBCUKNUA.js";
+} from "./chunk-DXZEKRIW.js";
 import "./chunk-BCSNKUAC.js";
-import "./chunk-FA5MLNYL.js";
+import "./chunk-VIFIFPDC.js";
 import {
   cacheKey
-} from "./chunk-JJZZLNJY.js";
+} from "./chunk-7YH74PGP.js";
 import {
   operationDescription
-} from "./chunk-DYE2CKHG.js";
+} from "./chunk-RLV4NKW3.js";
 import "./chunk-2GPX2E57.js";
 import "./chunk-PBGPES67.js";
-import "./chunk-TNVB3KLB.js";
+import "./chunk-EQVLEJTX.js";
 import {
   nativeOperation,
   routerDeclaration
-} from "./chunk-6F3WAXVN.js";
+} from "./chunk-7N2UOAMJ.js";
 import {
   fromPromise,
   method
@@ -37,7 +37,7 @@ import {
   McpToolsOptions
 } from "./chunk-6WC2OWHV.js";
 import "./chunk-4PIQKACY.js";
-import "./chunk-RKFLB36H.js";
+import "./chunk-VAI3EVCS.js";
 import "./chunk-URKOTNDA.js";
 import "./chunk-YDW7DX3A.js";
 import "./chunk-OWN3DP2W.js";

package/js/openapi.js

@@ -8,7 +8,7 @@ import {
 import {
   protocolOperations,
   protocolRouter
-} from "./chunk-ATBBIJ5O.js";
+} from "./chunk-OGUGI2I6.js";
 import {
   OpenapiCompileError,
   OpenapiCompileErrorCode,
@@ -29,7 +29,7 @@ import {
   isOpenapiTextMedia,
   openapiBinaryResultSchema,
   openapiMediaKind
-} from "./chunk-DYE2CKHG.js";
+} from "./chunk-RLV4NKW3.js";
 import {
   failOnNetworkRefusal
 } from "./chunk-2GPX2E57.js";
@@ -37,7 +37,7 @@ import "./chunk-PBGPES67.js";
 import {
   nativeOperation,
   routerDeclaration
-} from "./chunk-6F3WAXVN.js";
+} from "./chunk-7N2UOAMJ.js";
 import {
   accountProviderError,
   bodyUpstreamError,
@@ -64,7 +64,7 @@ import {
   lazyJsonSchemaDecoder,
   once,
   wrap
-} from "./chunk-RKFLB36H.js";
+} from "./chunk-VAI3EVCS.js";
 import {
   owned
 } from "./chunk-URKOTNDA.js";

package/js/skills.js

@@ -1,8 +1,8 @@
 import {
   catalogCache,
   catalogScope
-} from "./chunk-6C2I6JLA.js";
-import "./chunk-JJZZLNJY.js";
+} from "./chunk-4CCDS4U7.js";
+import "./chunk-7YH74PGP.js";
 import {
   failOnNetworkRefusal
 } from "./chunk-2GPX2E57.js";
@@ -34,7 +34,7 @@ import {
 } from "./chunk-4PIQKACY.js";
 import {
   wrap
-} from "./chunk-RKFLB36H.js";
+} from "./chunk-VAI3EVCS.js";
 import "./chunk-URKOTNDA.js";
 import {
   FetchHttpClient_exports

package/package.json

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