apps 0.0.1-beta.5 → 0.0.1-beta.7

package/js/{chunk-DQAZTA4I.js → chunk-WLE7WX2U.js}

@@ -5,18 +5,14 @@ import {
 } from "./chunk-N7YDVXYJ.js";
 import {
   CacheCommand,
-  CacheReply
-} from "./chunk-YEPYT6SD.js";
+  CacheReply,
+  ProviderError
+} from "./chunk-R3EV5FTO.js";
 import {
+  AppSkillName,
   AppSkills,
   SkillLoadFailed
 } from "./chunk-JU7VHODU.js";
-import {
-  OpenapiResponseError
-} from "./chunk-W4DMKWAB.js";
-import {
-  ProviderError
-} from "./chunk-SB3V4YVR.js";
 import {
   AccountId,
   HttpUrl,
@@ -78,6 +74,30 @@ import {
   withDefault
 } from "./chunk-CDL5PM2Q.js";
 
+// src/contracts/router.ts
+var reservedRouterKeys = /* @__PURE__ */ new Set([
+  "__proto__",
+  "constructor",
+  "prototype"
+]);
+var RouterKey = Schema_exports.String.check(
+  Schema_exports.isPattern(/^[A-Za-z_][A-Za-z0-9_-]{0,99}$/),
+  Schema_exports.makeFilter((key) => !reservedRouterKeys.has(key))
+);
+var RouterIcon = Schema_exports.Struct({
+  src: Schema_exports.NonEmptyString,
+  mimeType: Schema_exports.optionalKey(Schema_exports.String),
+  sizes: Schema_exports.optionalKey(Schema_exports.Array(Schema_exports.String)),
+  theme: Schema_exports.optionalKey(Schema_exports.Literals(["light", "dark"]))
+});
+var RouterMeta = Schema_exports.Struct({
+  title: Schema_exports.optionalKey(Schema_exports.String),
+  description: Schema_exports.optionalKey(Schema_exports.String),
+  instructions: Schema_exports.optionalKey(Schema_exports.String),
+  icons: Schema_exports.optionalKey(Schema_exports.Array(RouterIcon)),
+  tags: Schema_exports.optionalKey(Schema_exports.Record(Schema_exports.NonEmptyString, Schema_exports.String))
+});
+
 // src/contracts/tools.ts
 var ToolAnnotations = Schema_exports.Struct({
   title: Schema_exports.optionalKey(Schema_exports.String),
@@ -130,6 +150,15 @@ var McpToolMetadata = Schema_exports.Struct({
   annotations: Schema_exports.optional(ToolAnnotations),
   _meta: Schema_exports.optional(JsonObject2)
 });
+var McpServerHeader = Schema_exports.Struct({
+  name: Schema_exports.optionalKey(Schema_exports.String),
+  title: Schema_exports.optionalKey(Schema_exports.String),
+  version: Schema_exports.optionalKey(Schema_exports.String),
+  description: Schema_exports.optionalKey(Schema_exports.String),
+  websiteUrl: Schema_exports.optionalKey(Schema_exports.String),
+  icons: Schema_exports.optionalKey(Schema_exports.Array(RouterIcon)),
+  instructions: Schema_exports.optionalKey(Schema_exports.String)
+});
 var McpError = class extends Schema_exports.TaggedError()("McpError", {
   phase: Schema_exports.Literals(["connect", "discover", "call", "schema", "transport"]),
   reason: Schema_exports.Literals([
@@ -152,6 +181,31 @@ var ProcessConfig = Schema_exports.Struct({
   )
 });
 
+// src/contracts/api-response-error.ts
+var ApiErrorRecovery = Schema_exports.Struct({
+  action: Schema_exports.NonEmptyString.check(Schema_exports.isMaxLength(1024)),
+  instructions: Schema_exports.NonEmptyString.check(Schema_exports.isMaxLength(4096))
+});
+var ApiErrorResponse = Schema_exports.Struct({
+  code: Schema_exports.NonEmptyString.check(Schema_exports.isMaxLength(128)),
+  status: Schema_exports.Int.check(Schema_exports.isBetween({ minimum: 400, maximum: 599 })),
+  message: Schema_exports.NonEmptyString.check(Schema_exports.isMaxLength(4096)),
+  recovery: Schema_exports.optionalKey(ApiErrorRecovery)
+});
+var OpenapiResponseError = class extends Schema_exports.TaggedError()(
+  "OpenapiResponseError",
+  ApiErrorResponse.fields
+) {
+};
+var OpenapiErrorLimits = Schema_exports.Struct({
+  maxBodyBytes: Schema_exports.Int.check(Schema_exports.isGreaterThan(0)),
+  readTimeoutMs: Schema_exports.Int.check(Schema_exports.isGreaterThan(0))
+});
+var defaultOpenapiErrorLimits = OpenapiErrorLimits.make({
+  maxBodyBytes: 65536,
+  readTimeoutMs: 2e3
+});
+
 // src/contracts/failure.ts
 var maxFailureMessageLength = 2048;
 var FailureSource = Schema_exports.Literals(["app", "storage", "service"]);
@@ -1833,6 +1887,16 @@ var OAuth2Method = class extends Data_exports.TaggedClass(
   "oauth2"
 ) {
 };
+var displayText = Schema_exports.String.check(Schema_exports.isMinLength(1), Schema_exports.isMaxLength(255));
+var AccountInfo = Schema_exports.Struct({
+  externalId: Schema_exports.optionalKey(displayText),
+  displayName: Schema_exports.optionalKey(displayText),
+  username: Schema_exports.optionalKey(displayText),
+  email: Schema_exports.optionalKey(displayText),
+  avatarUrl: Schema_exports.optionalKey(HttpUrl),
+  profileUrl: Schema_exports.optionalKey(HttpUrl)
+});
+var AccountCheckResult = Schema_exports.Struct({ accountInfo: Schema_exports.optionalKey(AccountInfo) });
 var Provider = class extends Data_exports.Class {
   /** Declare zero or more accounts from this provider without performing I/O. */
   many() {
@@ -1843,7 +1907,7 @@ var ManyAccounts = class extends Data_exports.TaggedClass("many") {
 };
 
 // src/contracts/protocol-version.ts
-var frameworkProtocol = 3;
+var frameworkProtocol = 5;
 
 // src/contracts/schedules.ts
 var minimumIntervalMilliseconds = 6e4;
@@ -2215,8 +2279,184 @@ var protocol3 = {
   }
 };
 
-// src/contracts/operations.ts
-var OperationToolPrefixes = { query: "queries.", mutate: "mutations." };
+// src/contracts/protocols/4.ts
+var HostedTool2 = Schema_exports.Struct({
+  schedules: Schema_exports.optionalKey(Schema_exports.Array(OperationSchedule)),
+  name: Schema_exports.NonEmptyString,
+  router: Schema_exports.optionalKey(Schema_exports.NonEmptyString),
+  tags: Schema_exports.optionalKey(Schema_exports.Array(Schema_exports.NonEmptyString)),
+  description: Schema_exports.String,
+  inputSchema: JsonObject2,
+  readOnly: Schema_exports.optionalKey(Schema_exports.Boolean),
+  title: Schema_exports.optionalKey(Schema_exports.String),
+  outputSchema: Schema_exports.optionalKey(JsonObject2),
+  annotations: Schema_exports.optionalKey(ToolAnnotations),
+  _meta: Schema_exports.optionalKey(JsonObject2)
+});
+var HostedToolSummary2 = HostedTool2.mapFields(
+  ({ inputSchema: _input, outputSchema: _output, _meta, ...fields }) => fields
+);
+var HostRouterError = Schema_exports.Union([
+  ProviderError,
+  McpError,
+  SkillLoadFailed,
+  HostDeclarationInvalid2,
+  HostEvaluationFailed2
+]);
+var HostedRouter = Schema_exports.Struct({
+  path: Schema_exports.String,
+  title: Schema_exports.optionalKey(Schema_exports.String),
+  description: Schema_exports.optionalKey(Schema_exports.String),
+  icons: Schema_exports.optionalKey(Schema_exports.Array(RouterIcon)),
+  tags: Schema_exports.optionalKey(Schema_exports.Record(Schema_exports.NonEmptyString, Schema_exports.String)),
+  skill: Schema_exports.optionalKey(AppSkillName),
+  error: Schema_exports.optionalKey(HostRouterError)
+});
+var HostedCatalog = Schema_exports.Struct({
+  tools: Schema_exports.Array(HostedTool2),
+  routers: Schema_exports.Array(HostedRouter)
+});
+var HostedCatalogSummary = Schema_exports.Struct({
+  tools: Schema_exports.Array(HostedToolSummary2),
+  routers: Schema_exports.Array(HostedRouter)
+});
+var ToolKind = Schema_exports.Literals(["query", "mutation"]);
+var HostRequest2 = Schema_exports.Union([
+  WorkflowCommand,
+  WebhookCommand,
+  Schema_exports.Struct({ operation: Schema_exports.Literal("requirements") }),
+  Schema_exports.Struct({
+    operation: Schema_exports.Literal("inspect"),
+    /** Omit schemas. Only builds that declare the toolIndex capability accept this. */
+    detail: Schema_exports.optionalKey(Schema_exports.Literal("summary")),
+    /** Describe only these tools. Only builds that declare the toolIndex capability accept this. */
+    tools: Schema_exports.optionalKey(Schema_exports.Array(Schema_exports.NonEmptyString)),
+    /**
+     * Describe only declared operations that have schedules, without dynamic tool discovery.
+     * Only builds that declare the scheduledTools capability accept this.
+     */
+    scheduled: Schema_exports.optionalKey(Schema_exports.Literal(true))
+  }),
+  Schema_exports.Struct({
+    operation: Schema_exports.Literal("skills"),
+    /** Answer with SkillSources. Only builds that declare the skillSources capability accept this. */
+    sources: Schema_exports.optionalKey(Schema_exports.Literal(true))
+  }),
+  Schema_exports.Struct({
+    operation: Schema_exports.Literal("query"),
+    name: Schema_exports.NonEmptyString,
+    input: JsonValue
+  }),
+  Schema_exports.Struct({
+    operation: Schema_exports.Literal("mutate"),
+    name: Schema_exports.NonEmptyString,
+    input: JsonValue
+  }),
+  Schema_exports.Struct({
+    operation: Schema_exports.Literal("call"),
+    tool: Schema_exports.NonEmptyString,
+    /**
+     * The caller's claim; the bundle rejects a call whose tool has the other kind. The host omits
+     * it for a tool its catalog does not list, and then opens storage for writing.
+     */
+    kind: Schema_exports.optionalKey(ToolKind),
+    input: JsonValue
+  })
+]);
+var HostKindMismatch = class extends Schema_exports.TaggedError()("HostKindMismatch", {
+  tool: Schema_exports.NonEmptyString,
+  requested: ToolKind,
+  actual: ToolKind
+}) {
+};
+var HostError3 = Schema_exports.Union([...HostError2.members, HostKindMismatch]);
+var HostResponse3 = Schema_exports.Union([
+  Schema_exports.Struct({
+    ok: Schema_exports.Literal(true),
+    value: JsonValue,
+    toolError: Schema_exports.optionalKey(Schema_exports.Literal(true))
+  }),
+  Schema_exports.Struct({ ok: Schema_exports.Literal(false), error: HostError3 })
+]);
+var HostInvocation2 = Schema_exports.Struct({
+  command: HostRequest2,
+  accounts: ResolvedAccounts,
+  approval: Schema_exports.optionalKey(TrustedToolApproval),
+  replay: Schema_exports.optionalKey(WorkflowReplay),
+  deadline: Schema_exports.optionalKey(InvocationDeadline),
+  workflowRun: Schema_exports.optionalKey(WorkflowRunId)
+});
+var protocol4 = {
+  version: 4,
+  schemas: {
+    invocation: HostInvocation2,
+    request: HostRequest2,
+    response: HostResponse3,
+    requirements: DeclaredRequirements,
+    catalog: HostedCatalog,
+    catalogSummary: HostedCatalogSummary,
+    skills: SkillCatalogResponse2,
+    elicitationRequest: FormElicitation,
+    elicitationReply: ElicitationReply,
+    workflowStep: WorkflowRpcCommand,
+    workflowStepReply: WorkflowRpcResult,
+    workflowControl: WorkflowControlCommand,
+    cacheCommand: CacheCommand,
+    cacheReply: CacheReply
+  }
+};
+
+// src/contracts/protocols/5.ts
+var DeclaredRequirements2 = Schema_exports.Struct({
+  /** Protocol support of this retained framework build, not an author-declared requirement. */
+  capabilities: Schema_exports.optionalKey(
+    Schema_exports.Struct({
+      skills: Schema_exports.Literal(true),
+      toolIndex: Schema_exports.optionalKey(Schema_exports.Literal(true)),
+      skillSources: Schema_exports.optionalKey(Schema_exports.Literal(true)),
+      scheduledTools: Schema_exports.optionalKey(Schema_exports.Literal(true))
+    })
+  ),
+  database: Schema_exports.optionalKey(DatabaseSchema),
+  accounts: Schema_exports.Record(
+    Schema_exports.NonEmptyString,
+    Schema_exports.Struct({
+      definition: DeclaredProvider,
+      cardinality: Schema_exports.Literals(["one", "many"]),
+      /**
+       * The slot's provider defines an account check. Kept beside the definition, not in it, so
+       * adding or editing a check never changes the provider's identity.
+       */
+      health: Schema_exports.optionalKey(Schema_exports.Literal(true))
+    })
+  )
+});
+var AccountCheckCommand = Schema_exports.Struct({
+  operation: Schema_exports.Literal("account-check"),
+  requirement: Schema_exports.NonEmptyString
+});
+var HostRequest3 = Schema_exports.Union([
+  ...protocol4.schemas.request.members,
+  AccountCheckCommand
+]);
+var HostInvocation3 = Schema_exports.Struct({
+  command: HostRequest3,
+  accounts: ResolvedAccounts,
+  approval: Schema_exports.optionalKey(TrustedToolApproval),
+  replay: Schema_exports.optionalKey(WorkflowReplay),
+  deadline: Schema_exports.optionalKey(InvocationDeadline),
+  workflowRun: Schema_exports.optionalKey(WorkflowRunId)
+});
+var protocol5 = {
+  version: 5,
+  schemas: {
+    ...protocol4.schemas,
+    invocation: HostInvocation3,
+    request: HostRequest3,
+    requirements: DeclaredRequirements2,
+    accountCheck: AccountCheckResult
+  }
+};
 
 // src/contracts/host.ts
 var skillsCommand = (sources) => sources ? { operation: "skills", sources: true } : { operation: "skills" };
@@ -2227,7 +2467,7 @@ var inspectCommand = (tools, scheduled) => ({
   ...scheduled === void 0 ? {} : { scheduled }
 });
 var indexCommand = { operation: "inspect", detail: "summary" };
-var selectTools = (tools) => (all) => tools === void 0 ? all : all.filter((tool) => tools.includes(tool.name));
+var selectTools = (tools) => (catalog) => tools === void 0 ? catalog : { ...catalog, tools: catalog.tools.filter((tool) => tools.includes(tool.name)) };
 var HostRequirementsError = Schema_exports.Union([
   HostRequestInvalid,
   HostDeclarationInvalid2,
@@ -2248,6 +2488,7 @@ var HostCallError = Schema_exports.Union([
   HostInspectError,
   HostToolNotFound,
   HostOperationNotFound,
+  HostKindMismatch,
   HostOperationFailed2,
   DatabaseLimitExceeded,
   HostInputInvalid,
@@ -2257,6 +2498,16 @@ var HostCallError = Schema_exports.Union([
   HostToolPolicyFailed,
   ElicitationFailed
 ]);
+var HostAccountCheckError = Schema_exports.Union([
+  ProviderError,
+  WorkflowFailure,
+  HostRequestInvalid,
+  HostDeclarationInvalid2,
+  HostAccountsInvalid,
+  HostOperationNotFound,
+  HostOperationFailed2,
+  HostOutputInvalid
+]);
 var HostDataError = HostCallError;
 var ToolResultObservation = Context_exports.Reference(
   "apps/ToolResultObservation",
@@ -2271,8 +2522,14 @@ export {
   OAuth2Config,
   OAuth2AccessToken,
   OAuth2Method,
+  AccountInfo,
+  AccountCheckResult,
   Provider,
   ManyAccounts,
+  reservedRouterKeys,
+  RouterKey,
+  RouterIcon,
+  RouterMeta,
   ToolAnnotations,
   McpClientLimits,
   defaultMcpClientLimits,
@@ -2280,8 +2537,13 @@ export {
   McpToolsOptions,
   McpToolResult,
   McpToolMetadata,
+  McpServerHeader,
   McpError,
   ProcessConfig,
+  ApiErrorRecovery,
+  ApiErrorResponse,
+  OpenapiResponseError,
+  defaultOpenapiErrorLimits,
   maxFailureMessageLength,
   FailureSource,
   FailureName,
@@ -2331,14 +2593,10 @@ export {
   OperationSchedule,
   DeclaredAuthMethod,
   DeclaredProvider,
-  DeclaredRequirements,
   ResolvedAccount,
   ResolvedAccounts,
   TrustedToolApproval,
   InvocationDeadline,
-  HostedTool,
-  HostedToolSummary,
-  HostRequest,
   HostRequestInvalid,
   HostAccountsInvalid,
   HostOperationNotFound,
@@ -2350,7 +2608,6 @@ export {
   HostToolApprovalRequired,
   HostToolPolicyFailed,
   HostOutputInvalid,
-  HostInvocation,
   protocol1,
   SkillSources2 as SkillSources,
   SkillCatalogResponse2 as SkillCatalogResponse,
@@ -2358,10 +2615,22 @@ export {
   HostDeclarationInvalid2 as HostDeclarationInvalid,
   HostEvaluationFailed2 as HostEvaluationFailed,
   HostOperationFailed2 as HostOperationFailed,
-  HostError2 as HostError,
-  HostResponse2 as HostResponse,
   protocol3,
-  OperationToolPrefixes,
+  HostedTool2 as HostedTool,
+  HostedToolSummary2 as HostedToolSummary,
+  HostRouterError,
+  HostedRouter,
+  HostedCatalog,
+  HostedCatalogSummary,
+  HostKindMismatch,
+  HostError3 as HostError,
+  HostResponse3 as HostResponse,
+  protocol4,
+  DeclaredRequirements2 as DeclaredRequirements,
+  AccountCheckCommand,
+  HostRequest3 as HostRequest,
+  HostInvocation3 as HostInvocation,
+  protocol5,
   skillsCommand,
   skillCatalog,
   inspectCommand,
@@ -2370,6 +2639,7 @@ export {
   HostRequirementsError,
   HostInspectError,
   HostCallError,
+  HostAccountCheckError,
   HostDataError,
   ToolResultObservation
 };

package/js/{chunk-C3VAOK5B.js → chunk-YXQHV65J.js}

@@ -2,12 +2,14 @@ import {
   promiseTable
 } from "./chunk-ZQINWV4W.js";
 import {
+  declaredOperations,
   fromPromise,
-  nativeOperation
-} from "./chunk-3XKZDQLM.js";
+  nativeOperation,
+  nativeRouter
+} from "./chunk-Z5M2LQOZ.js";
 import {
   ScheduleTiming
-} from "./chunk-DQAZTA4I.js";
+} from "./chunk-WLE7WX2U.js";
 import {
   DatabaseSchema
 } from "./chunk-N7YDVXYJ.js";
@@ -15,7 +17,7 @@ import {
   decoderOf,
   isSchema,
   storageFieldOf
-} from "./chunk-FWQC6I3C.js";
+} from "./chunk-5T57N25Q.js";
 import {
   AppStorageUnavailable
 } from "./chunk-PZB6T6KU.js";
@@ -27,6 +29,24 @@ import {
   Schema_exports
 } from "./chunk-CDL5PM2Q.js";
 
+// src/contracts/http.ts
+var ResponseStatusError = class extends Schema_exports.TaggedError()(
+  "ResponseStatusError",
+  { status: Schema_exports.Number }
+) {
+  get message() {
+    return `Request failed with status ${this.status}`;
+  }
+};
+var ResponseDecodeError = class extends Schema_exports.TaggedError()(
+  "ResponseDecodeError",
+  {}
+) {
+  get message() {
+    return "Response body did not match the expected schema";
+  }
+};
+
 // src/implementation/workflows.ts
 var NativeWorkflow = /* @__PURE__ */ Symbol("apps.Workflow");
 var workflow = (options, run) => ({
@@ -50,8 +70,12 @@ var nativeWorkflow = (value) => {
 var InternalApp = /* @__PURE__ */ Symbol("apps.App");
 var isApp = (value) => typeof value === "object" && value !== null && InternalApp in value;
 var toEffectApp = (app) => app[InternalApp];
+function rejectCatalogs(definition) {
+  if ("queries" in definition || "mutations" in definition)
+    throw new Error("Put queries and mutations in a router under tools");
+}
 function adaptDefinition(definition) {
-  if ("tools" in definition) throw new Error("Use queries and mutations instead of tools");
+  rejectCatalogs(definition);
   const webhooks = definition.webhooks === void 0 ? {} : {
     webhooks: Object.fromEntries(
       Object.entries(definition.webhooks).map(([name, webhook]) => [
@@ -67,42 +91,42 @@ function adaptDefinition(definition) {
       ])
     )
   };
-  const operations = (kind, catalog) => Object.fromEntries(
-    Object.entries(catalog).map(([name, value]) => {
-      const operation = nativeOperation(value);
-      if (operation === void 0 || operation.kind !== kind)
-        throw new Error("Invalid app data operation");
-      return [name, operation];
-    })
-  );
   const workflows = definition.workflows === void 0 ? {} : {
     workflows: Object.fromEntries(
       Object.entries(definition.workflows).map(([name, value]) => {
-        const declared = nativeWorkflow(value);
-        if (declared === void 0) throw new Error("Invalid workflow declaration");
-        return [name, declared];
+        const declared2 = nativeWorkflow(value);
+        if (declared2 === void 0) throw new Error("Invalid workflow declaration");
+        return [name, declared2];
       })
     )
   };
-  const data = {
-    ...definition.queries === void 0 ? {} : { queries: operations("query", definition.queries) },
-    ...definition.mutations === void 0 ? {} : { mutations: operations("mutation", definition.mutations) }
-  };
+  const root = definition.tools === void 0 ? void 0 : nativeRouter(definition.tools);
+  if (definition.tools !== void 0 && root === void 0)
+    throw new Error("tools must be a router");
+  const data = root === void 0 ? {} : { tools: root };
+  const declared = root?.kind === "router" ? declaredOperations(root) : [];
+  const mutations = /* @__PURE__ */ new Set();
+  for (const { operation } of declared) {
+    if (operation.kind !== "mutation") continue;
+    if (mutations.has(operation))
+      throw new Error("A mutation can be mounted at only one path in tools");
+    mutations.add(operation);
+  }
   const schedules = definition.schedules === void 0 ? {} : {
     schedules: Object.fromEntries(
       Object.entries(definition.schedules).map(([name, schedule]) => {
-        const matches = Object.entries(definition.mutations ?? {}).filter(
-          ([, operation]) => operation === schedule.operation
+        const target = nativeOperation(schedule.operation);
+        const match = declared.find(
+          ({ operation }) => operation === target && operation.kind === "mutation"
         );
-        const match = matches[0];
-        if (match === void 0 || matches.length !== 1)
-          throw new Error("A schedule must reference exactly one named mutation in this app");
+        if (match === void 0)
+          throw new Error("A schedule must reference a mutation in this app's tools");
         return [
           name,
           {
             timing: Schema_exports.decodeUnknownSync(ScheduleTiming)(schedule.timing),
             input: Schema_exports.decodeUnknownSync(JsonValue)(schedule.input),
-            tool: `mutations.${match[0]}`
+            tool: match.name
           }
         ];
       })
@@ -117,6 +141,7 @@ function adaptDefinition(definition) {
   };
 }
 var defineApp = (requirements, definition) => {
+  if (typeof definition !== "function") rejectCatalogs(definition);
   const evaluate = typeof definition === "function" ? definition : async () => definition;
   const factory = fromPromise(evaluate);
   const native = {
@@ -204,6 +229,8 @@ var unavailableStorage = {
 };
 
 export {
+  ResponseStatusError,
+  ResponseDecodeError,
   workflow,
   isApp,
   toEffectApp,