apps 0.0.1-beta.10 → 0.0.1-beta.101

package/js/index.js

@@ -1,78 +1,93 @@
 import {
   ResponseDecodeError,
   ResponseStatusError,
+  base64,
+  basic,
+  bearer,
+  declarePlacements,
   defineApp,
-  defineDatabase,
-  table,
+  event,
+  header,
+  query,
+  t,
   workflow
-} from "./chunk-YXQHV65J.js";
-import "./chunk-ZQINWV4W.js";
+} from "./chunk-ILYCJ3HV.js";
 import {
   dynamicRouter,
-  fromPromise,
   mutation,
   nativeOperation,
   nativeRouter,
   operationDeclaration,
-  query,
+  query as query2,
+  renameTools,
   router,
   routerDeclaration,
-  withApproval
-} from "./chunk-Z5M2LQOZ.js";
+  toolAnnotations,
+  withApproval,
+  withApprovals
+} from "./chunk-2CURR5Y7.js";
 import {
-  accountProviderError
-} from "./chunk-MKWZPDR6.js";
+  accountProviderError,
+  fromPromise
+} from "./chunk-7STIP5CS.js";
 import {
+  CacheError,
   CalendarSchedule,
   ElicitationFailed,
+  FetchOptionUnsupported,
   HostedTool,
   HostedToolSummary,
   Interval,
+  NetworkRefused,
   NonRetryableError,
   OAuth2AccessToken,
   OAuth2Config,
   OAuth2Method,
   Provider,
+  ProviderError,
   ScheduleTiming,
   SecretsMethod,
   WorkflowFailure
-} from "./chunk-WLE7WX2U.js";
-import "./chunk-N7YDVXYJ.js";
-import {
-  CacheError,
-  ProviderError
-} from "./chunk-R3EV5FTO.js";
-import "./chunk-JU7VHODU.js";
+} from "./chunk-4UPC36ZL.js";
+import "./chunk-4PIQKACY.js";
 import {
   array,
   boolean,
+  combineJsonSchemas,
   decoderOf,
-  id,
+  fieldExposure,
   importedJsonSchema,
+  isSchema,
   json,
   jsonSchema,
   literal,
-  nestJsonSchema,
   number,
   object,
   once,
   parse,
+  parseDeclaration,
+  plain,
+  raw,
   record,
   string,
-  userId,
   withLazyJsonSchemaDocument,
   wrap
-} from "./chunk-5T57N25Q.js";
-import "./chunk-PZB6T6KU.js";
+} from "./chunk-VAI3EVCS.js";
+import "./chunk-URKOTNDA.js";
+import "./chunk-YDW7DX3A.js";
+import "./chunk-OWN3DP2W.js";
 import {
+  DeclarationInvalid,
   JsonObject,
   JsonValue,
   ValidationError
-} from "./chunk-27F7W2LG.js";
+} from "./chunk-7HG422GB.js";
+import "./chunk-DILSCQPJ.js";
+import "./chunk-ACQXVKVQ.js";
 import {
   Effect_exports,
   Schema_exports
-} from "./chunk-CDL5PM2Q.js";
+} from "./chunk-ZKDXML77.js";
 import "./chunk-CZ7CSFO4.js";
 
 // src/implementation/http.ts
@@ -86,27 +101,86 @@ var decodeJson = (response, schema) => Effect_exports.gen(function* () {
 
 // src/implementation/provider.ts
 var secrets = (options) => new SecretsMethod(options);
-var oauth2 = (config, response) => parse(OAuth2Config, config).pipe(Effect_exports.map((config2) => new OAuth2Method({ config: config2, response })));
+var clientCredentials = Schema_exports.is(Schema_exports.Struct({ grant: Schema_exports.Literal("client_credentials") }));
+var oauth2Form = (config) => {
+  const [discovered, declared, discoveredMachine, declaredMachine] = OAuth2Config.members;
+  const discovers = typeof config === "object" && config !== null && Object.hasOwn(config, "discover");
+  if (clientCredentials(config)) return discovers ? discoveredMachine : declaredMachine;
+  return discovers ? discovered : declared;
+};
+var oauth2 = (config, response, exposure, request) => parseDeclaration(OAuth2Config, config, "oauth2()", oauth2Form).pipe(
+  Effect_exports.map(
+    (config2) => new OAuth2Method({
+      config: config2,
+      response,
+      ...exposure === void 0 ? {} : { exposure },
+      ...request === void 0 ? {} : { request }
+    })
+  )
+);
 var defineProvider = ({
   health,
   ...options
 }) => {
+  const placed = Object.entries(options.auth).filter(([, method]) => method.request !== void 0);
+  if (options.hosts === void 0 && placed.length > 0)
+    throw new TypeError(
+      `Provider "${options.name}" declares a request for ${placed.map(([name]) => name).join(", ")} but no hosts. Declare the hosts its credentials may be sent to.`
+    );
   if (health === void 0) return new Provider(options);
-  const run = fromPromise(health);
+  const run = fromPromise(health, "check");
   return new Provider({ ...options, health: { run } });
 };
 
 // src/implementation/account-router.ts
-var inputDocument = (operation) => {
-  const imported = importedJsonSchema(operation.input);
+var decoderDocument = (decoder) => {
+  const imported = importedJsonSchema(decoder);
   if (imported !== void 0) return Schema_exports.decodeUnknownSync(JsonObject)(imported);
-  const document = Schema_exports.toJsonSchemaDocument(operation.input);
+  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");
   return property !== void 0 && (property.get !== void 0 || property.value !== void 0);
 };
+var outputDocument = (operation) => operation.output === void 0 ? operation.outputSchema : decoderDocument(operation.output);
 var combineOperation = (accounts) => {
   const variants = [...accounts.values()];
   const first = variants[0];
@@ -123,17 +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(inputDocument(operation), `#/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 },
@@ -158,11 +224,14 @@ var combineOperation = (accounts) => {
     }
   });
   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 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 });
@@ -188,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)
 });
@@ -218,7 +279,7 @@ var combineDynamic = (sources) => {
       );
       for (const tool of tools) {
         const variants = groups.get(tool.name) ?? [];
-        if (variants.some(([id2]) => id2 === accountId))
+        if (variants.some(([id]) => id === accountId))
           return yield* Effect_exports.die(new Error("Duplicate source operation"));
         variants.push([accountId, tool]);
         groups.set(tool.name, variants);
@@ -307,7 +368,7 @@ var accountRouter = (accounts, discover, options) => Effect_exports.runPromise(
     const routers = /* @__PURE__ */ new Map();
     for (const account of accounts) {
       const declaration2 = yield* Effect_exports.tryPromise({
-        try: () => discover(account),
+        try: async () => discover(account),
         catch: (error) => accountProviderError(error, account.id)
       });
       if (routers.has(account.id))
@@ -327,7 +388,7 @@ var accountRouter = (accounts, discover, options) => Effect_exports.runPromise(
 
 // src/implementation/dynamic-skills.ts
 var dynamicSkills = (source) => ({
-  list: fromPromise(async () => source.list())
+  list: fromPromise(async () => source.list(), "skills")
 });
 
 // src/contracts/app.ts
@@ -337,58 +398,102 @@ var NotImplemented = class extends Schema_exports.TaggedError()("NotImplemented"
 };
 
 // src/implementation/schedules.ts
-var declaration = (timing, operation, input) => {
+var declaration = (scope, timing, operation, input) => {
   const native = nativeOperation(operation);
   if (native === void 0 || native.kind !== "mutation")
     throw new Error("A schedule must reference a mutation");
+  if (scope === "app" && native.approval !== void 0)
+    throw new Error("An app schedule must reference a mutation without an approval");
   Schema_exports.decodeUnknownSync(native.input)(input);
-  return { operation, timing, input: Schema_exports.decodeUnknownSync(JsonValue)(input) };
+  return { scope, operation, timing, input: Schema_exports.decodeUnknownSync(JsonValue)(input) };
 };
-var interval = (duration, operation, input) => {
+var intervalTiming = (duration) => {
   const value = Schema_exports.decodeUnknownSync(Interval)(duration);
   const milliseconds = value.seconds !== void 0 ? value.seconds * 1e3 : value.minutes !== void 0 ? value.minutes * 6e4 : value.hours * 36e5;
-  return declaration(
-    Schema_exports.decodeUnknownSync(ScheduleTiming)({ kind: "interval", milliseconds }),
-    operation,
-    input
-  );
+  return Schema_exports.decodeUnknownSync(ScheduleTiming)({ kind: "interval", milliseconds });
 };
-var cron = (calendar, operation, input) => declaration(
-  {
-    kind: "cron",
-    calendar: Schema_exports.decodeUnknownSync(CalendarSchedule)({
-      ...calendar,
-      timezone: calendar.timezone ?? "UTC"
-    })
-  },
-  operation,
-  input
-);
+var cronTiming = (calendar) => ({
+  kind: "cron",
+  calendar: Schema_exports.decodeUnknownSync(CalendarSchedule)({
+    ...calendar,
+    timezone: calendar.timezone ?? "UTC"
+  })
+});
+var userInterval = (duration, operation, input) => declaration("user", intervalTiming(duration), operation, input);
+var userCron = (calendar, operation, input) => declaration("user", cronTiming(calendar), operation, input);
+var appInterval = (duration, operation, input) => declaration("app", intervalTiming(duration), operation, input);
+var appCron = (calendar, operation, input) => declaration("app", cronTiming(calendar), operation, input);
 
 // src/index.ts
+var isFields = (value) => typeof value === "object" && value !== null && Object.values(value).every(isSchema);
+var accountDecoder = (schema) => (
+  // SAFETY: the brand exists only in types; secret values are strings at runtime.
+  decoderOf(schema)
+);
+var exposureOf = (schema) => {
+  const marked = "fields" in schema && isFields(schema.fields) ? fieldExposure(schema.fields) : {};
+  return Object.keys(marked).length === 0 ? {} : { exposure: marked };
+};
+var fieldNames = (schema) => "fields" in schema && isFields(schema.fields) ? Object.keys(schema.fields) : schema === OAuth2AccessToken2 ? ["access_token"] : [];
+var placementsOf = (method, schema, request) => request === void 0 ? {} : {
+  request: declarePlacements(
+    method,
+    fieldNames(schema),
+    exposureOf(schema).exposure,
+    request
+  )
+};
 var OAuth2AccessToken2 = wrap(OAuth2AccessToken, false);
-var secrets2 = (options) => secrets({ label: options.label, fields: decoderOf(options.fields) });
+var secrets2 = (options) => secrets({
+  label: options.label,
+  fields: accountDecoder(options.fields),
+  ...exposureOf(options.fields),
+  // SAFETY: the callback receives references named by the schema's own keys.
+  ...placementsOf(
+    `"${options.label}"`,
+    options.fields,
+    options.request
+  )
+});
 function oauth22(options) {
-  const { response = OAuth2AccessToken2, ...config } = options;
-  return Effect_exports.runSync(oauth2(config, decoderOf(response)));
+  const { response = OAuth2AccessToken2, request, ...config } = options;
+  return Effect_exports.runSync(
+    oauth2(
+      config,
+      accountDecoder(response),
+      exposureOf(response).exposure,
+      // SAFETY: the callback receives references named by the response projection's own keys.
+      placementsOf("OAuth", response, request).request
+    )
+  );
 }
 var decodeJson2 = (response, schema) => {
   const native = {
     status: response.status,
-    json: () => Effect_exports.tryPromise({
-      try: () => response.json(),
-      catch: (error) => error
-    }).pipe(
-      Effect_exports.catch(
-        (error) => error instanceof SyntaxError ? Effect_exports.fail(new ResponseDecodeError()) : Effect_exports.die(error)
+    json: () => (
+      // oxlint-disable-next-line executor/authored-code-through-adapter -- a Response the app passes from its own code
+      Effect_exports.tryPromise({
+        try: () => response.json(),
+        catch: (error) => error
+      }).pipe(
+        Effect_exports.catch(
+          (error) => error instanceof SyntaxError ? Effect_exports.fail(new ResponseDecodeError()) : Effect_exports.die(error)
+        )
       )
     )
   };
   return Effect_exports.runPromise(decodeJson(native, decoderOf(schema)));
 };
+function query3(first, second) {
+  if (typeof first === "string") return query(first, second);
+  return query2(...[first, second]);
+}
 export {
   CacheError,
+  DeclarationInvalid,
   ElicitationFailed,
+  FetchOptionUnsupported,
+  NetworkRefused,
   NonRetryableError,
   NotImplemented,
   OAuth2AccessToken2 as OAuth2AccessToken,
@@ -398,17 +503,20 @@ export {
   ValidationError,
   WorkflowFailure,
   accountRouter,
+  appCron,
+  appInterval,
   array,
+  base64,
+  basic,
+  bearer,
   boolean,
-  cron,
   decodeJson2 as decodeJson,
   defineApp,
-  defineDatabase,
   defineProvider,
   dynamicRouter,
   dynamicSkills,
-  id,
-  interval,
+  event,
+  header,
   json,
   jsonSchema,
   literal,
@@ -416,13 +524,19 @@ export {
   number,
   oauth22 as oauth2,
   object,
-  query,
+  plain,
+  query3 as query,
+  raw,
   record,
+  renameTools,
   router,
   secrets2 as secrets,
   string,
-  table,
-  userId,
+  t,
+  toolAnnotations,
+  userCron,
+  userInterval,
   withApproval,
+  withApprovals,
   workflow
 };

package/js/mcp/effect.js

@@ -1,30 +1,30 @@
 import {
   mcpClientEffect,
+  mcpHealthEffect,
   mcpToolsEffect
-} from "../chunk-EPT3ZP52.js";
-import "../chunk-CRDWFA74.js";
+} from "../chunk-K6TSCYAO.js";
 import "../chunk-BCSNKUAC.js";
-import "../chunk-V5KNQVCT.js";
-import "../chunk-NKLWZJLE.js";
-import "../chunk-FL2QR3XW.js";
-import "../chunk-IPI4MFSN.js";
-import "../chunk-YXQHV65J.js";
-import "../chunk-ZQINWV4W.js";
-import "../chunk-Z5M2LQOZ.js";
-import "../chunk-MKWZPDR6.js";
-import "../chunk-WLE7WX2U.js";
-import "../chunk-N7YDVXYJ.js";
-import "../chunk-R3EV5FTO.js";
-import "../chunk-JU7VHODU.js";
-import "../chunk-ODEIDRGW.js";
-import "../chunk-57RKNWL2.js";
-import "../chunk-UK573G7W.js";
-import "../chunk-5T57N25Q.js";
-import "../chunk-PZB6T6KU.js";
-import "../chunk-27F7W2LG.js";
-import "../chunk-CDL5PM2Q.js";
+import "../chunk-RN4YB4JT.js";
+import "../chunk-5C6RAGAS.js";
+import "../chunk-QI66R4FP.js";
+import "../chunk-VCYWAA4N.js";
+import "../chunk-PBGPES67.js";
+import "../chunk-ILYCJ3HV.js";
+import "../chunk-2CURR5Y7.js";
+import "../chunk-7STIP5CS.js";
+import "../chunk-4UPC36ZL.js";
+import "../chunk-4PIQKACY.js";
+import "../chunk-VAI3EVCS.js";
+import "../chunk-URKOTNDA.js";
+import "../chunk-YDW7DX3A.js";
+import "../chunk-OWN3DP2W.js";
+import "../chunk-7HG422GB.js";
+import "../chunk-DILSCQPJ.js";
+import "../chunk-ACQXVKVQ.js";
+import "../chunk-ZKDXML77.js";
 import "../chunk-CZ7CSFO4.js";
 export {
   mcpClientEffect,
+  mcpHealthEffect,
   mcpToolsEffect
 };