apps 0.0.1-beta.5 → 0.0.1-beta.54

package/js/{chunk-XHO2ZX6W.js → chunk-UM62MBJQ.js}

@@ -1,26 +1,42 @@
+import {
+  fromPromise,
+  method,
+  toPromise
+} from "./chunk-LTDHQJ2Z.js";
 import {
   CacheError
-} from "./chunk-YEPYT6SD.js";
+} from "./chunk-MWKHKOTL.js";
 import {
   wrap
-} from "./chunk-FWQC6I3C.js";
+} from "./chunk-KGCTYL2S.js";
 import {
   JsonObject
-} from "./chunk-27F7W2LG.js";
+} from "./chunk-H2CJWXA3.js";
 import {
+  Deferred_exports,
   Duration_exports,
   Effect_exports,
   Schema_exports
-} from "./chunk-CDL5PM2Q.js";
+} from "./chunk-IFJU5SYQ.js";
 
 // src/implementation/catalog-cache.ts
+var catalogScope = (options, credential, invalid) => {
+  const { account, cache } = options;
+  if (account === void 0)
+    return credential === void 0 ? Effect_exports.succeed(cache) : Effect_exports.fail(invalid("missing-account"));
+  if (cache === void 0) return Effect_exports.succeed(void 0);
+  return Effect_exports.try({
+    try: () => cache.forAccount(account),
+    catch: () => invalid("unselected-account")
+  });
+};
 var schema = (decoder) => wrap(decoder, false);
 var Manifest = Schema_exports.Struct({
   revision: Schema_exports.String,
   pages: Schema_exports.Int,
-  summaries: Schema_exports.Int
+  summaries: Schema_exports.Int,
+  header: Schema_exports.optionalKey(JsonObject)
 });
-var invoke = (work) => Effect_exports.tryPromise({ try: work, catch: (error) => error });
 var catalogCache = (options) => Effect_exports.gen(function* () {
   const cache = options.cache;
   const key = [...options.prefix, "current"];
@@ -34,11 +50,42 @@ var catalogCache = (options) => Effect_exports.gen(function* () {
   const staleFor = options.staleFor ?? "1 day";
   const retention = Duration_exports.toMillis(Duration_exports.fromInputUnsafe(freshFor)) + Duration_exports.toMillis(Duration_exports.fromInputUnsafe(staleFor)) + 3e5;
   const local = yield* Effect_exports.cached(options.load());
-  const refresh = (context) => Effect_exports.gen(function* () {
-    const tools = yield* options.load(context);
-    const digest = yield* invoke(
-      () => crypto.subtle.digest("SHA-256", new TextEncoder().encode(JSON.stringify(tools)))
+  const pages = (cache2, revision, kind, count, decoder) => Effect_exports.gen(function* () {
+    const batches = yield* Effect_exports.forEach(
+      Array.from({ length: Math.ceil(count / 4) }, (_, batch) => batch * 4),
+      (offset) => fromPromise(method(cache2, "readMany"), "cache")(
+        Array.from(
+          { length: Math.min(4, count - offset) },
+          (_, index) => part(revision, kind, offset + index)
+        ),
+        schema(Schema_exports.Array(decoder))
+      ),
+      { concurrency: "unbounded" }
     );
+    const values = [];
+    for (const page of batches.flat()) {
+      if (page === void 0) return yield* new CacheError({ reason: "unavailable" });
+      values.push(...page);
+    }
+    return values;
+  });
+  const kept = (cache2) => fromPromise(method(cache2, "read"), "cache")(key, schema(Manifest)).pipe(
+    Effect_exports.map(
+      (manifest) => manifest === void 0 ? void 0 : {
+        header: manifest.header,
+        tools: pages(cache2, manifest.revision, "page", manifest.pages, options.schema)
+      }
+    )
+  );
+  const refresh = (context) => Effect_exports.gen(function* () {
+    const { tools, header } = yield* options.load(context, kept(context.cache));
+    const digest = yield* Effect_exports.tryPromise({
+      try: () => crypto.subtle.digest(
+        "SHA-256",
+        new TextEncoder().encode(JSON.stringify({ tools, header: header ?? null }))
+      ),
+      catch: (error) => error
+    });
     const revision = Array.from(
       new Uint8Array(digest),
       (byte) => byte.toString(16).padStart(2, "0")
@@ -58,7 +105,7 @@ var catalogCache = (options) => Effect_exports.gen(function* () {
       batch = [];
       batchBytes = 0;
       if (!entries.length) return Effect_exports.void;
-      return invoke(() => context.cache.write(entries, retention)).pipe(
+      return fromPromise(method(context.cache, "write"), "cache")(entries, retention).pipe(
         Effect_exports.withSpan("app.cache.flush", {
           attributes: {
             "cache.flush.index": flushes++,
@@ -104,50 +151,56 @@ var catalogCache = (options) => Effect_exports.gen(function* () {
     yield* pageOut();
     yield* summaryOut();
     yield* flush();
-    return { revision, pages: pages2, summaries };
+    return {
+      revision,
+      pages: pages2,
+      summaries,
+      ...header === void 0 ? {} : { header: yield* json(header) }
+    };
   });
   const getOptions = {
     key,
     schema: schema(Manifest),
     freshFor,
     staleFor,
-    load: (context) => Effect_exports.runPromise(refresh(context), { signal: context.signal })
+    ...options.stale === void 0 ? {} : { stale: options.stale },
+    // A cache may call the loader as a Promise; its own signal cancels that load.
+    load: toPromise(refresh, (context) => context.signal)
   };
-  const current = () => cache === void 0 ? Effect_exports.fail(new CacheError({ reason: "unavailable" })) : invoke(() => cache.get(getOptions));
+  let reading;
+  const current = () => Effect_exports.suspend(() => {
+    if (cache === void 0) return Effect_exports.fail(new CacheError({ reason: "unavailable" }));
+    const shared = reading;
+    if (shared !== void 0) return Deferred_exports.await(shared);
+    const deferred = Deferred_exports.makeUnsafe();
+    reading = deferred;
+    return fromPromise(
+      method(cache, "get"),
+      "cache"
+    )(getOptions).pipe(
+      Effect_exports.onExit(
+        (exit) => Effect_exports.sync(() => {
+          if (reading === deferred) reading = void 0;
+        }).pipe(Effect_exports.andThen(Deferred_exports.done(deferred, exit)))
+      )
+    );
+  });
   if (options.revalidate) {
     if (cache === void 0) yield* local;
-    else yield* invoke(() => cache.revalidate(getOptions));
+    else yield* fromPromise(method(cache, "revalidate"), "cache")(getOptions);
   }
-  const pages = (cache2, revision, kind, count, decoder) => Effect_exports.gen(function* () {
-    const batches = yield* Effect_exports.forEach(
-      Array.from({ length: Math.ceil(count / 4) }, (_, batch) => batch * 4),
-      (offset) => invoke(
-        () => cache2.readMany(
-          Array.from(
-            { length: Math.min(4, count - offset) },
-            (_, index) => part(revision, kind, offset + index)
-          ),
-          schema(Schema_exports.Array(decoder))
-        )
-      ),
-      { concurrency: "unbounded" }
-    );
-    const values = [];
-    for (const page of batches.flat()) {
-      if (page === void 0) return yield* new CacheError({ reason: "unavailable" });
-      values.push(...page);
-    }
-    return values;
-  });
   const metadata = () => Effect_exports.gen(function* () {
-    if (cache === void 0) return yield* local;
+    if (cache === void 0) return (yield* local).tools;
     const manifest = yield* current();
     return yield* pages(cache, manifest.revision, "page", manifest.pages, options.schema);
   });
   return {
     list: metadata,
+    /** The record stored with the current revision, if the source supplied one. */
+    header: () => cache === void 0 ? local.pipe(Effect_exports.map(({ header }) => header)) : current().pipe(Effect_exports.map((manifest) => manifest.header)),
     summaries: () => Effect_exports.gen(function* () {
-      if (cache === void 0) return (yield* local).map((tool) => options.summary.of(tool));
+      if (cache === void 0)
+        return (yield* local).tools.map((tool) => options.summary.of(tool));
       const manifest = yield* current();
       return yield* pages(
         cache,
@@ -157,10 +210,11 @@ var catalogCache = (options) => Effect_exports.gen(function* () {
         options.summary.schema
       );
     }),
-    resolve: (name) => cache === void 0 ? local.pipe(Effect_exports.map((tools) => tools.find((tool) => tool.name === name))) : current().pipe(
+    resolve: (name) => cache === void 0 ? local.pipe(Effect_exports.map(({ tools }) => tools.find((tool) => tool.name === name))) : current().pipe(
       Effect_exports.flatMap(
-        (manifest) => invoke(
-          () => cache.read(part(manifest.revision, "tool", name), schema(options.schema))
+        (manifest) => fromPromise(method(cache, "read"), "cache")(
+          part(manifest.revision, "tool", name),
+          schema(options.schema)
         )
       )
     )
@@ -168,5 +222,6 @@ var catalogCache = (options) => Effect_exports.gen(function* () {
 });
 
 export {
+  catalogScope,
   catalogCache
 };

package/js/chunk-X5U5KIWQ.js

@@ -0,0 +1,221 @@
+import {
+  fromPromise
+} from "./chunk-LTDHQJ2Z.js";
+import {
+  HostedTool,
+  RouterKey,
+  RouterMeta,
+  reservedRouterKeys
+} from "./chunk-JY56GVSV.js";
+import {
+  decoderOf,
+  schemaArgument
+} from "./chunk-KGCTYL2S.js";
+import {
+  Effect_exports,
+  Schema_exports
+} from "./chunk-IFJU5SYQ.js";
+
+// 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) => fromPromise(async () => approval(context), "approval")()
+    }
+  };
+};
+var approvedOperation = (operation, approval) => {
+  const copy = Object.defineProperties({}, Object.getOwnPropertyDescriptors(operation));
+  return Object.defineProperty(copy, "approval", {
+    enumerable: true,
+    value: (context) => fromPromise(async () => approval(context), "approval")()
+  });
+};
+var withApproval = (operation, approval) => ({
+  ...operation,
+  [NativeOperation]: approvedOperation(operation[NativeOperation], approval)
+});
+var toolAnnotations = (operation) => nativeOperation(operation)?.annotations;
+var make = (kind, options, run) => operationDeclaration({
+  ...operationOptions({ ...options, input: schemaArgument(options.input, `The ${kind} input`) }),
+  kind,
+  // The host always validates JSON serialization, even without a stronger output declaration.
+  ...options.output === void 0 ? {} : { output: decoderOf(schemaArgument(options.output, `The ${kind} output`)) },
+  // SAFETY: defineApp checks the handler context against its requirements.
+  // The host validates account bindings and creates the matching storage facade.
+  run: (context, input) => fromPromise(run, "handler")(context, input)
+});
+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(), "router")().pipe(
+        Effect_exports.flatMap((options) => Schema_exports.decodeUnknownEffect(RouterMeta)(options))
+      )
+    },
+    list: () => fromPromise(async () => source.list(), "router")().pipe(
+      Effect_exports.flatMap(Schema_exports.decodeUnknownEffect(Schema_exports.Array(HostedTool)))
+    ),
+    resolve: (name) => fromPromise(async () => source.resolve(name), "router")().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 [];
+  }
+});
+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 {
+  operationDeclaration,
+  nativeOperation,
+  withApproval,
+  toolAnnotations,
+  query,
+  mutation,
+  routerDeclaration,
+  nativeRouter,
+  mergeMeta,
+  router,
+  dynamicRouter,
+  joinPath,
+  locate,
+  declaredOperations,
+  withApprovals
+};

package/js/{chunk-IPI4MFSN.js → chunk-XBG7HHXC.js}

@@ -5,11 +5,11 @@ import {
   SkillDefinitionInvalid,
   SkillFile,
   SkillFilePath
-} from "./chunk-JU7VHODU.js";
+} from "./chunk-H72MEDMN.js";
 import {
   Effect_exports,
   Schema_exports
-} from "./chunk-CDL5PM2Q.js";
+} from "./chunk-IFJU5SYQ.js";
 
 // src/implementation/skill-files.ts
 var skillFromFiles = (input, source = {}) => Effect_exports.gen(function* () {