apps 0.0.1-beta.11 → 0.0.1-beta.110

package/js/{chunk-GPFVWWDZ.js → chunk-ZXG7RMCB.js}

@@ -1,48 +1,20 @@
+import {
+  fromPromise
+} from "./chunk-OIH73VFM.js";
 import {
   HostedTool,
   RouterKey,
   RouterMeta,
   reservedRouterKeys
-} from "./chunk-KRSCJDTW.js";
+} from "./chunk-2RGJMA7N.js";
 import {
-  decoderOf
-} from "./chunk-5T57N25Q.js";
+  decoderOf,
+  schemaArgument
+} from "./chunk-VAI3EVCS.js";
 import {
   Effect_exports,
   Schema_exports
-} from "./chunk-CDL5PM2Q.js";
-
-// src/implementation/authoring.ts
-var NativeCallback = /* @__PURE__ */ Symbol("apps.NativeCallback");
-var fromPromise = (callback) => (...args) => {
-  if (NativeCallback in callback) {
-    const native = callback[NativeCallback];
-    return native(...args);
-  }
-  return Effect_exports.tryPromise({ try: () => callback(...args), catch: (error) => error });
-};
-var toPromise = (operation, signal) => {
-  const native = (...args) => Effect_exports.suspend(() => {
-    if (signal === void 0) return operation(...args);
-    if (signal.aborted) return Effect_exports.interrupt;
-    const cancelled = Effect_exports.callback((resume) => {
-      if (signal.aborted) {
-        resume(Effect_exports.interrupt);
-        return;
-      }
-      const abort = () => resume(Effect_exports.interrupt);
-      signal.addEventListener("abort", abort, { once: true });
-      return Effect_exports.sync(() => signal.removeEventListener("abort", abort));
-    });
-    return Effect_exports.raceFirst(
-      cancelled,
-      Effect_exports.suspend(() => operation(...args))
-    );
-  });
-  return Object.assign((...args) => Effect_exports.runPromise(native(...args)), {
-    [NativeCallback]: native
-  });
-};
+} from "./chunk-ZKDXML77.js";
 
 // src/implementation/operations.ts
 var NativeOperation = /* @__PURE__ */ Symbol("apps.Operation");
@@ -64,31 +36,38 @@ var operationOptions = (options) => {
     ...options._meta === void 0 ? {} : { _meta: options._meta },
     input: decoderOf(options.input),
     ...approval === void 0 ? {} : {
-      approval: (context) => Effect_exports.tryPromise({ try: async () => approval(context), catch: (error) => error })
+      approval: (context) => fromPromise(async () => approval(context), "approval")()
     }
   };
 };
-var withApproval = (operation, approval) => ({
-  ...operation,
-  [NativeOperation]: {
-    ...operation[NativeOperation],
-    approval: (context) => Effect_exports.tryPromise({ try: async () => approval(context), catch: (error) => error })
+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) => (
+  // SAFETY: `Approved` is a type-only mark; the native operation now carries the approval.
+  {
+    ...operation,
+    [NativeOperation]: approvedOperation(operation[NativeOperation], approval)
   }
-});
+);
+var toolAnnotations = (operation) => nativeOperation(operation)?.annotations;
 var make = (kind, options, run) => operationDeclaration({
-  ...operationOptions(options),
+  ...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(options.output) },
-  run: (context, input) => Effect_exports.tryPromise({
-    // SAFETY: defineApp checks the handler context against its requirements.
-    // The host validates account bindings and creates the matching storage facade.
-    try: () => run(context, input),
-    catch: (error) => error
-  })
+  ...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);
+function mutation(options, run) {
+  return make("mutation", options, run);
+}
 
 // src/implementation/router.ts
 var routerDeclaration = (node) => ({
@@ -133,14 +112,14 @@ var dynamicRouter = (source) => {
   return routerDeclaration({
     kind: "dynamic",
     ...meta === void 0 ? {} : {
-      meta: () => fromPromise(async () => meta())().pipe(
+      meta: () => fromPromise(async () => meta(), "router")().pipe(
         Effect_exports.flatMap((options) => Schema_exports.decodeUnknownEffect(RouterMeta)(options))
       )
     },
-    list: () => fromPromise(async () => source.list())().pipe(
+    list: () => fromPromise(async () => source.list(), "router")().pipe(
       Effect_exports.flatMap(Schema_exports.decodeUnknownEffect(Schema_exports.Array(HostedTool)))
     ),
-    resolve: (name) => fromPromise(async () => source.resolve(name))().pipe(
+    resolve: (name) => fromPromise(async () => source.resolve(name), "router")().pipe(
       Effect_exports.map((value) => {
         if (value === void 0) return void 0;
         const operation = nativeOperation(value);
@@ -189,13 +168,87 @@ 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, ""));
+};
+var renameTools = (source, rename) => {
+  const native = nativeRouter(source);
+  if (native?.kind !== "dynamic") throw new Error("renameTools expects a protocol router");
+  const exposed = (tools) => {
+    const seen = /* @__PURE__ */ new Set();
+    return tools.flatMap((tool) => {
+      const name = rename(tool.name);
+      if (name === void 0 || seen.has(name)) return [];
+      seen.add(name);
+      return [{ ...tool, name, source: tool.name }];
+    });
+  };
+  const listed = native.summaries ?? native.list;
+  const original = (name) => listed().pipe(Effect_exports.map((tools) => exposed(tools).find((tool) => tool.name === name)?.source));
+  const strip = ({
+    source: _source,
+    ...tool
+  }) => tool;
+  return routerDeclaration({
+    ...native,
+    list: () => native.list().pipe(Effect_exports.map((tools) => exposed(tools).map(strip))),
+    ...native.summaries === void 0 ? {} : {
+      summaries: () => listed().pipe(Effect_exports.map((tools) => exposed(tools).map(strip)))
+    },
+    describe: (name) => original(name).pipe(
+      Effect_exports.flatMap(
+        (found) => found === void 0 ? Effect_exports.succeed(void 0) : native.describe?.(found) ?? native.list().pipe(Effect_exports.map((tools) => tools.find((tool) => tool.name === found)))
+      ),
+      Effect_exports.map((tool) => tool === void 0 ? void 0 : { ...tool, name })
+    ),
+    resolve: (name) => original(name).pipe(
+      Effect_exports.flatMap(
+        (found) => found === void 0 ? Effect_exports.succeed(void 0) : native.resolve(found)
+      )
+    )
+  });
+};
 
 export {
-  fromPromise,
-  toPromise,
   operationDeclaration,
   nativeOperation,
   withApproval,
+  toolAnnotations,
   query,
   mutation,
   routerDeclaration,
@@ -205,5 +258,7 @@ export {
   dynamicRouter,
   joinPath,
   locate,
-  declaredOperations
+  declaredOperations,
+  withApprovals,
+  renameTools
 };

package/js/client.js

@@ -1,39 +1,38 @@
 import {
   AppUiApi,
-  HttpApiClient_exports,
   UiContext,
-  UiDeploymentChanged,
-  UiFailed
-} from "./chunk-IJX4CYZO.js";
+  UiFailed,
+  UiVersionChanged
+} from "./chunk-74H25C4X.js";
 import {
   AsyncResult_exports,
   AtomRegistry_exports,
   Atom_exports,
   queryResult
-} from "./chunk-M3B3DE4K.js";
-import "./chunk-PJJ24GU7.js";
+} from "./chunk-KLSEU35Y.js";
+import {
+  decoderOf
+} from "./chunk-VAI3EVCS.js";
 import {
   OtlpExporter_exports,
   externalTrace,
   pendingSpan,
   telemetryLayer,
   traceLinks
-} from "./chunk-ODEIDRGW.js";
+} from "./chunk-URKOTNDA.js";
 import {
   FetchHttpClient_exports
-} from "./chunk-57RKNWL2.js";
-import {
-  HttpClientError_exports
-} from "./chunk-UK573G7W.js";
+} from "./chunk-YDW7DX3A.js";
+import "./chunk-OWN3DP2W.js";
 import {
-  decoderOf
-} from "./chunk-5T57N25Q.js";
+  JsonValue
+} from "./chunk-7HG422GB.js";
 import {
-  StorageName
-} from "./chunk-PZB6T6KU.js";
+  HttpApiClient_exports
+} from "./chunk-DILSCQPJ.js";
 import {
-  JsonValue
-} from "./chunk-27F7W2LG.js";
+  HttpClientError_exports
+} from "./chunk-ACQXVKVQ.js";
 import {
   Cause_exports,
   Clock_exports,
@@ -46,25 +45,27 @@ import {
   Logger_exports,
   ManagedRuntime_exports,
   Option_exports,
+  Queue_exports,
   Schedule_exports,
   Schema_exports,
   Semaphore_exports,
   Stream_exports,
   Tracer_exports
-} from "./chunk-CDL5PM2Q.js";
+} from "./chunk-ZKDXML77.js";
 import "./chunk-CZ7CSFO4.js";
 
 // src/contracts/live.ts
+var OperationName = Schema_exports.NonEmptyString.check(Schema_exports.isMaxLength(200));
 var AppQueryFailed = class extends Schema_exports.TaggedError()("AppQueryFailed", {}) {
 };
 
 // src/implementation/live.ts
 var queryReference = (name) => ({
-  name: Schema_exports.decodeUnknownSync(StorageName)(name),
+  name: Schema_exports.decodeUnknownSync(OperationName)(name),
   kind: "query"
 });
 var mutationReference = (name) => ({
-  name: Schema_exports.decodeUnknownSync(StorageName)(name),
+  name: Schema_exports.decodeUnknownSync(OperationName)(name),
   kind: "mutation"
 });
 var liveQueryAtom = (reference, input, options) => Atom_exports.make(
@@ -475,6 +476,8 @@ var browserTelemetryLayer = (settings) => Layer_exports.unwrap(
           const onError = (event) => error("ui.error", event.error ?? new Error(event.message));
           const onRejection = (event) => error("ui.unhandled-rejection", event.reason);
           const onHidden = () => {
+            if (navigation !== void 0 && document.visibilityState === "hidden")
+              navigation.hidden = true;
             run(
               document.visibilityState === "hidden" ? performance.pause.pipe(Effect_exports.andThen(flush)) : performance.resume
             );
@@ -502,15 +505,27 @@ var browserTelemetryLayer = (settings) => Layer_exports.unwrap(
           return {
             flush,
             navigation: (event) => Effect_exports.sync(() => {
+              if (event.type === "load") return;
               if (event.type === "end") {
-                if (navigation !== void 0) Deferred_exports.doneUnsafe(navigation, Effect_exports.void);
+                if (navigation !== void 0) Deferred_exports.doneUnsafe(navigation.done, Effect_exports.void);
                 navigation = void 0;
                 return;
               }
-              if (navigation !== void 0) Deferred_exports.doneUnsafe(navigation, Effect_exports.interrupt);
-              navigation = Deferred_exports.makeUnsafe();
+              if (navigation !== void 0)
+                Deferred_exports.doneUnsafe(navigation.done, Effect_exports.interrupt);
+              const current = {
+                done: Deferred_exports.makeUnsafe(),
+                hidden: document.visibilityState === "hidden"
+              };
+              navigation = current;
               run(
-                Deferred_exports.await(navigation).pipe(
+                Deferred_exports.await(current.done).pipe(
+                  // Record visibility however the navigation ends, including when a later one interrupts it.
+                  Effect_exports.ensuring(
+                    Effect_exports.suspend(
+                      () => Effect_exports.annotateCurrentSpan("executor.navigation.hidden", current.hidden)
+                    )
+                  ),
                   Effect_exports.withSpan("ui.navigation", {
                     root: true,
                     attributes: { "url.path": event.path }
@@ -520,7 +535,7 @@ var browserTelemetryLayer = (settings) => Layer_exports.unwrap(
               );
             }).pipe(
               Effect_exports.andThen(
-                event.type === "start" ? performance.navigation(event.path) : Effect_exports.void
+                event.type === "end" ? Effect_exports.void : performance.navigation(event.path)
               )
             )
           };
@@ -793,12 +808,39 @@ var makeOptimisticClient = (transport) => {
 };
 
 // src/implementation/ui-client.ts
+var resubscribeDelay = Schedule_exports.min([
+  Schedule_exports.exponential("1 second"),
+  Schedule_exports.spaced("1 minute")
+]).pipe(Schedule_exports.jittered);
+var appFailure = (error) => Schema_exports.is(UiFailed)(error) && error.reason === "operation_failed";
+var resubscribes = (error) => HttpClientError_exports.isHttpClientError(error) || Cause_exports.isTimeoutError(error) || Schema_exports.is(UiFailed)(error) && error.reason !== "account_required";
+var Retrying = class {
+  constructor(error, previous) {
+    this.error = error;
+    this.previous = previous;
+  }
+  error;
+  previous;
+};
+var visibleResult = (result) => {
+  const current = AsyncResult_exports.value(result);
+  if (Option_exports.isNone(current) || !(current.value instanceof Retrying)) {
+    return result;
+  }
+  const previous = Option_exports.map(
+    Option_exports.fromUndefinedOr(current.value.previous),
+    AsyncResult_exports.success
+  );
+  return AsyncResult_exports.isSuccess(result) ? AsyncResult_exports.failureWithPrevious(Cause_exports.fail(current.value.error), { previous, waiting: true }) : AsyncResult_exports.failureWithPrevious(AsyncResult_exports.isFailure(result) ? result.cause : Cause_exports.empty, {
+    previous
+  });
+};
 var createAppClient = () => {
   const { runtime, atoms } = makeBrowserTelemetry(
     browserSettings("/_executor/api/telemetry", "executor-app-web")
   );
   const browser = atoms(Layer_exports.empty);
-  const deploymentChanged = Effect_exports.sync(() => {
+  const versionChanged = Effect_exports.sync(() => {
     window.dispatchEvent(new Event("executor:deployment-changed"));
   });
   let pendingWrites = 0;
@@ -840,14 +882,15 @@ var createAppClient = () => {
     const value = yield* api.ui[kind]({ payload: yield* payload(name, input) });
     return yield* Schema_exports.decodeUnknownEffect(decoderOf(output))(value);
   }).pipe(
-    Effect_exports.tapErrorTag("UiDeploymentChanged", () => deploymentChanged),
+    Effect_exports.tapErrorTag("UiDeploymentChanged", () => versionChanged),
     Effect_exports.withSpan(`ui.app.${kind}`, { attributes: { "executor.operation.name": name } })
   );
   const source = (name, input, output) => browser.atom(
     Stream_exports.suspend(() => {
       let previous;
       let attempts = 0;
-      return Stream_exports.unwrap(
+      let latest;
+      const subscription = Stream_exports.unwrap(
         Effect_exports.gen(function* () {
           const attempt = attempts++;
           const first = yield* pendingSpan("ui.app.first_result", {
@@ -895,73 +938,94 @@ var createAppClient = () => {
             Stream_exports.timeout("45 seconds"),
             Stream_exports.concat(Stream_exports.fail(new UiFailed({ reason: "unavailable" }))),
             Stream_exports.filter((frame) => frame.type !== "heartbeat"),
-            Stream_exports.mapEffect((frame) => {
-              if (frame.type === "failure") return Effect_exports.fail(frame.error);
-              const server = externalTrace(frame.trace);
-              return Effect_exports.gen(function* () {
-                const value = yield* Schema_exports.decodeUnknownEffect(decoderOf(output))(
-                  frame.value
-                ).pipe(Effect_exports.mapError(() => new UiFailed({ reason: "operation_failed" })));
-                const received = yield* Effect_exports.currentSpan;
-                const receivedAt = clock.currentTimeMillisUnsafe();
-                const currentRevision = revision++;
-                yield* Effect_exports.annotateCurrentSpan({
-                  "executor.operation.name": name,
-                  "executor.snapshot.revision": currentRevision,
-                  "browser.query.elapsed_ms": receivedAt - started,
-                  "executor.trace.context_valid": Option_exports.isSome(server)
-                });
-                yield* first.finish(Exit_exports.void);
-                let committed = false;
-                return {
-                  value,
-                  commit: () => {
-                    if (committed) return;
-                    committed = true;
-                    const committedAt = clock.currentTimeMillisUnsafe();
-                    runtime.runFork(
-                      Effect_exports.void.pipe(
-                        Effect_exports.withSpan("ui.app.result.commit", {
-                          parent: received,
-                          attributes: {
-                            "executor.operation.name": name,
-                            "executor.snapshot.revision": currentRevision,
-                            "browser.query.elapsed_ms": committedAt - started,
-                            "browser.query.receive_to_commit_ms": committedAt - receivedAt,
-                            "browser.page.hidden": document.visibilityState === "hidden"
-                          }
-                        })
-                      )
-                    );
-                  }
-                };
-              }).pipe(
-                Effect_exports.withSpan("ui.app.result.receive", {
-                  parent: Option_exports.isSome(server) ? server.value : first.span,
-                  kind: "consumer"
-                })
-              );
-            }),
+            Stream_exports.mapEffect(
+              (frame) => {
+                if (frame.type === "failure") return Effect_exports.fail(frame.error);
+                const server = externalTrace(frame.trace);
+                return Effect_exports.gen(function* () {
+                  const value = yield* Schema_exports.decodeUnknownEffect(decoderOf(output))(
+                    frame.value
+                  ).pipe(Effect_exports.mapError(() => new AppQueryFailed()));
+                  const received = yield* Effect_exports.currentSpan;
+                  const receivedAt = clock.currentTimeMillisUnsafe();
+                  const currentRevision = revision++;
+                  yield* Effect_exports.annotateCurrentSpan({
+                    "executor.operation.name": name,
+                    "executor.snapshot.revision": currentRevision,
+                    "browser.query.elapsed_ms": receivedAt - started,
+                    "executor.trace.context_valid": Option_exports.isSome(server)
+                  });
+                  yield* first.finish(Exit_exports.void);
+                  let committed = false;
+                  return {
+                    value,
+                    commit: () => {
+                      if (committed) return;
+                      committed = true;
+                      const committedAt = clock.currentTimeMillisUnsafe();
+                      runtime.runFork(
+                        Effect_exports.void.pipe(
+                          Effect_exports.withSpan("ui.app.result.commit", {
+                            parent: received,
+                            attributes: {
+                              "executor.operation.name": name,
+                              "executor.snapshot.revision": currentRevision,
+                              "browser.query.elapsed_ms": committedAt - started,
+                              "browser.query.receive_to_commit_ms": committedAt - receivedAt,
+                              "browser.page.hidden": document.visibilityState === "hidden"
+                            }
+                          })
+                        )
+                      );
+                    }
+                  };
+                }).pipe(
+                  Effect_exports.withSpan("ui.app.result.receive", {
+                    parent: Option_exports.isSome(server) ? server.value : first.span,
+                    kind: "consumer"
+                  })
+                );
+              }
+            ),
             Stream_exports.onExit(finish),
             Stream_exports.provideService(Tracer_exports.ParentSpan, first.span)
           );
         })
       ).pipe(
         // Keep the last snapshot while the watcher replaces the document.
-        // Unmount or client disposal interrupts the deployment-change wait.
+        // Unmount or client disposal interrupts the version-change wait.
         Stream_exports.catch(
-          (error) => Schema_exports.is(UiDeploymentChanged)(error) ? Stream_exports.unwrap(deploymentChanged.pipe(Effect_exports.as(Stream_exports.never))) : Stream_exports.fail(error)
+          (error) => Schema_exports.is(UiVersionChanged)(error) ? Stream_exports.unwrap(versionChanged.pipe(Effect_exports.as(Stream_exports.never))) : Stream_exports.fail(error)
         ),
-        Stream_exports.retry(
-          Schedule_exports.spaced("1 second").pipe(
-            Schedule_exports.while(
-              ({ input: input2 }) => HttpClientError_exports.isHttpClientError(input2) || Cause_exports.isTimeoutError(input2) || Schema_exports.is(UiFailed)(input2)
-            )
-          )
+        Stream_exports.tap(
+          (value) => Effect_exports.sync(() => {
+            latest = value;
+          })
         )
       );
+      return Stream_exports.unwrap(
+        Effect_exports.gen(function* () {
+          const retrying = yield* Queue_exports.unbounded();
+          return Stream_exports.merge(
+            subscription.pipe(
+              Stream_exports.retry(
+                resubscribeDelay.pipe(
+                  Schedule_exports.while(
+                    ({ input: input2 }) => !resubscribes(input2) ? false : appFailure(input2) ? Queue_exports.offer(retrying, new Retrying(input2, latest)).pipe(
+                      Effect_exports.as(true)
+                    ) : true
+                  )
+                )
+              )
+            ),
+            // Shown outside the retried stream, so they do not reset its delay.
+            Stream_exports.fromQueue(retrying),
+            { haltStrategy: "left" }
+          );
+        })
+      );
     })
-  ).pipe(Atom_exports.map(queryResult));
+  ).pipe(Atom_exports.map((result) => queryResult(visibleResult(result))));
   const optimistic = makeOptimisticClient({
     source,
     read: (name, input, output) => request("query", name, input, output),