apps 0.0.1-beta.4 → 0.0.1-beta.40

package/js/{chunk-HDJH3RPR.js → chunk-VJQXXOQ3.js}

@@ -4,7 +4,7 @@ import {
   fromWeb,
   layerMergedContext,
   make2 as make
-} from "./chunk-QKHR7BMF.js";
+} from "./chunk-3MMG2H6M.js";
 import {
   Reference,
   Service,
@@ -13,16 +13,16 @@ import {
   getOrUndefined2 as getOrUndefined,
   map3 as map,
   merge3 as merge,
-  remove3 as remove,
+  remove2 as remove,
   succeed4 as succeed,
   toReadableStreamEffect,
   tryPromise
-} from "./chunk-FW5HBOIK.js";
+} from "./chunk-MXDKXAY4.js";
 import {
   __export
 } from "./chunk-CZ7CSFO4.js";
 
-// ../../node_modules/.bun/effect@https+++pkg.pr.new+Effect-TS+effect+effect@c7d1ffff31a3e2ae0b0b+a654a55b752bdb24/node_modules/effect/dist/unstable/http/FetchHttpClient.js
+// ../../node_modules/.bun/effect@4.0.1/node_modules/effect/dist/http/FetchHttpClient.js
 var FetchHttpClient_exports = {};
 __export(FetchHttpClient_exports, {
   Fetch: () => Fetch,

package/js/chunk-XDGUGB2A.js

@@ -0,0 +1,156 @@
+import {
+  declaredOperations,
+  fromPromise,
+  nativeOperation,
+  nativeRouter
+} from "./chunk-6KABJTDO.js";
+import {
+  ScheduleTiming
+} from "./chunk-OTCLXFLL.js";
+import {
+  decoderOf,
+  isSchema,
+  schemaArgument
+} from "./chunk-GHXRRFZA.js";
+import {
+  JsonValue
+} from "./chunk-YQ35E7KS.js";
+import {
+  Effect_exports,
+  Schema_exports
+} from "./chunk-MXDKXAY4.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) => ({
+  [NativeWorkflow]: {
+    input: decoderOf(schemaArgument(options.input, "The workflow input")),
+    ...options.output === void 0 ? {} : { output: decoderOf(schemaArgument(options.output, "The workflow output")) },
+    ...options.description === void 0 ? {} : { description: options.description },
+    run: (context, input) => Effect_exports.tryPromise({
+      // SAFETY: defineApp checks required context; the host supplies the pinned run's capabilities.
+      try: () => run(context, input),
+      catch: (error) => error
+    })
+  }
+});
+var nativeWorkflow = (value) => {
+  if (typeof value !== "object" || value === null || !(NativeWorkflow in value)) return void 0;
+  return value[NativeWorkflow];
+};
+
+// src/implementation/app.ts
+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) {
+  rejectCatalogs(definition);
+  const webhooks = definition.webhooks === void 0 ? {} : {
+    webhooks: Object.fromEntries(
+      Object.entries(definition.webhooks).map(([name, webhook]) => [
+        name,
+        {
+          ...webhook,
+          ...webhook.register === void 0 ? {} : { register: fromPromise(webhook.register) },
+          handle: fromPromise(webhook.handle),
+          ...webhook.unregister === void 0 ? {} : { unregister: fromPromise(webhook.unregister) },
+          ..."config" in webhook && isSchema(webhook.config) ? { config: decoderOf(webhook.config) } : {},
+          ..."state" in webhook && isSchema(webhook.state) ? { state: decoderOf(webhook.state) } : {}
+        }
+      ])
+    )
+  };
+  const workflows = definition.workflows === void 0 ? {} : {
+    workflows: Object.fromEntries(
+      Object.entries(definition.workflows).map(([name, value]) => {
+        const declared2 = nativeWorkflow(value);
+        if (declared2 === void 0) throw new Error("Invalid workflow declaration");
+        return [name, declared2];
+      })
+    )
+  };
+  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 target = nativeOperation(schedule.operation);
+        const match = declared.find(
+          ({ operation }) => operation === target && operation.kind === "mutation"
+        );
+        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: match.name
+          }
+        ];
+      })
+    )
+  };
+  return {
+    ...definition,
+    ...webhooks,
+    ...workflows,
+    ...data,
+    ...schedules
+  };
+}
+var defineApp = (requirements, definition) => {
+  if (typeof definition !== "function") rejectCatalogs(definition);
+  const evaluate = typeof definition === "function" ? definition : async () => definition;
+  const factory = fromPromise(evaluate);
+  const native = {
+    accounts: requirements.accounts,
+    evaluate: (context) => factory(context).pipe(Effect_exports.map((value) => adaptDefinition(value)))
+  };
+  return {
+    [InternalApp]: native,
+    accounts: native.accounts,
+    evaluate: (context) => Effect_exports.runPromise(factory(context))
+  };
+};
+
+export {
+  ResponseStatusError,
+  ResponseDecodeError,
+  workflow,
+  isApp,
+  toEffectApp,
+  defineApp
+};

package/js/{chunk-SATWJKN6.js → chunk-YQ35E7KS.js}

@@ -1,12 +1,12 @@
 import {
   Schema_exports
-} from "./chunk-FW5HBOIK.js";
+} from "./chunk-MXDKXAY4.js";
 
 // src/contracts/schema.ts
 var JsonValue = Schema_exports.Json;
 var JsonObject = Schema_exports.Record(Schema_exports.String, JsonValue);
 var AccountId = Schema_exports.String.pipe(
-  Schema_exports.check(Schema_exports.isStartsWith("acc_"), Schema_exports.isMinLength(5)),
+  Schema_exports.check(Schema_exports.isStartingWith("acc_"), Schema_exports.isMinLength(5)),
   Schema_exports.brand("acc")
 );
 var HttpUrl = Schema_exports.String.check(

package/js/chunk-ZUKBIHMK.js

@@ -0,0 +1,92 @@
+import {
+  JsonValue
+} from "./chunk-YQ35E7KS.js";
+import {
+  HttpApiEndpoint_exports,
+  HttpApiGroup_exports,
+  HttpApiSchema_exports,
+  HttpApi_exports
+} from "./chunk-VIU2XXA7.js";
+import {
+  Schema_exports
+} from "./chunk-MXDKXAY4.js";
+
+// src/contracts/ui.ts
+var UiContext = Schema_exports.Struct({
+  deployment: Schema_exports.NonEmptyString,
+  profile: Schema_exports.optional(Schema_exports.NonEmptyString),
+  expectedProfileRevision: Schema_exports.optional(Schema_exports.Int)
+});
+var UiOperation = Schema_exports.Struct({
+  ...UiContext.fields,
+  name: Schema_exports.NonEmptyString,
+  input: JsonValue
+});
+var UiUnauthorized = class extends Schema_exports.TaggedError()(
+  "UiUnauthorized",
+  {},
+  { httpApiStatus: 401 }
+) {
+};
+var UiForbidden = class extends Schema_exports.TaggedError()(
+  "UiForbidden",
+  {},
+  { httpApiStatus: 403 }
+) {
+};
+var UiDeploymentChanged = class extends Schema_exports.TaggedError()(
+  "UiDeploymentChanged",
+  {},
+  { httpApiStatus: 409 }
+) {
+};
+var UiFailed = class extends Schema_exports.TaggedError()(
+  "UiFailed",
+  {
+    reason: Schema_exports.Literals(["unavailable", "operation_failed", "account_required"])
+  },
+  { httpApiStatus: 422 }
+) {
+};
+var UiSnapshot = Schema_exports.Union([
+  Schema_exports.Struct({
+    type: Schema_exports.Literal("snapshot"),
+    value: JsonValue,
+    trace: Schema_exports.optional(Schema_exports.Unknown)
+  }),
+  Schema_exports.Struct({ type: Schema_exports.Literal("failure"), error: UiFailed }),
+  Schema_exports.Struct({ type: Schema_exports.Literal("heartbeat") })
+]);
+var errors = [UiUnauthorized, UiForbidden, UiDeploymentChanged, UiFailed];
+var AppUiApi = HttpApi_exports.make("app-ui").add(
+  HttpApiGroup_exports.make("ui").add(
+    HttpApiEndpoint_exports.post("query", "/_executor/api/query", {
+      payload: UiOperation,
+      success: JsonValue,
+      error: errors
+    })
+  ).add(
+    HttpApiEndpoint_exports.post("mutate", "/_executor/api/mutate", {
+      payload: UiOperation,
+      success: JsonValue,
+      error: errors
+    })
+  ).add(
+    HttpApiEndpoint_exports.post("subscribe", "/_executor/api/subscribe", {
+      payload: UiOperation,
+      success: HttpApiSchema_exports.StreamSse({ data: UiSnapshot, error: Schema_exports.Union(errors) }),
+      error: errors
+    })
+  )
+);
+
+export {
+  UiContext,
+  UiOperation,
+  UiUnauthorized,
+  UiForbidden,
+  UiDeploymentChanged,
+  UiFailed,
+  UiSnapshot,
+  AppUiApi
+};

package/js/client.js

@@ -1,40 +1,38 @@
 import {
   AppUiApi,
-  HttpApiClient_exports,
   UiContext,
   UiDeploymentChanged,
   UiFailed
-} from "./chunk-G7ZIRKMK.js";
+} from "./chunk-ZUKBIHMK.js";
 import {
   AsyncResult_exports,
   AtomRegistry_exports,
   Atom_exports,
   queryResult
-} from "./chunk-EVJUVWN2.js";
-import "./chunk-M6ZRRIBI.js";
+} from "./chunk-DKUEYTYD.js";
 import {
   OtlpExporter_exports,
-  TraceContext,
   externalTrace,
   pendingSpan,
   telemetryLayer,
   traceLinks
-} from "./chunk-ZCAMUXSG.js";
+} from "./chunk-PNVCCB4L.js";
 import {
   FetchHttpClient_exports
-} from "./chunk-HDJH3RPR.js";
-import {
-  HttpClientError_exports
-} from "./chunk-QKHR7BMF.js";
+} from "./chunk-VJQXXOQ3.js";
 import {
   decoderOf
-} from "./chunk-WFSQXYUT.js";
-import {
-  StorageName
-} from "./chunk-FZJOYIZO.js";
+} from "./chunk-GHXRRFZA.js";
+import "./chunk-KAQD3DTI.js";
 import {
   JsonValue
-} from "./chunk-SATWJKN6.js";
+} from "./chunk-YQ35E7KS.js";
+import {
+  HttpApiClient_exports
+} from "./chunk-VIU2XXA7.js";
+import {
+  HttpClientError_exports
+} from "./chunk-3MMG2H6M.js";
 import {
   Cause_exports,
   Clock_exports,
@@ -47,25 +45,27 @@ import {
   Logger_exports,
   ManagedRuntime_exports,
   Option_exports,
+  Queue_exports,
   Schedule_exports,
   Schema_exports,
   Semaphore_exports,
   Stream_exports,
   Tracer_exports
-} from "./chunk-FW5HBOIK.js";
+} from "./chunk-MXDKXAY4.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(
@@ -448,21 +448,6 @@ var observeBrowserPerformance = Effect_exports.gen(function* () {
   };
 });
 
-// ../telemetry/src/browser-operations.ts
-var BrowserOperationFailure = Schema_exports.Struct({
-  error_type: Schema_exports.Literals([
-    "BrowserDecodeFailed",
-    "BrowserTransportFailed",
-    "BrowserOperationFailed"
-  ]),
-  trace_id: TraceContext.fields.traceId,
-  span_id: TraceContext.fields.spanId,
-  page_id: Schema_exports.String
-});
-var ResponseTrace = Context_exports.Reference("telemetry/ResponseTrace", {
-  defaultValue: () => void 0
-});
-
 // ../telemetry/src/browser.ts
 var BrowserTelemetry = class extends Context_exports.Service()("executor/BrowserTelemetry") {
 };
@@ -809,6 +794,33 @@ 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")
@@ -863,7 +875,8 @@ var createAppClient = () => {
     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", {
@@ -911,53 +924,55 @@ 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)
           );
@@ -968,16 +983,35 @@ var createAppClient = () => {
         Stream_exports.catch(
           (error) => Schema_exports.is(UiDeploymentChanged)(error) ? Stream_exports.unwrap(deploymentChanged.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),