@blotout/qinto-cli 0.1.7 → 0.1.9

package/dist/worker-artifact/app-runtime/index.js

@@ -3036,10 +3036,10 @@ var $ZodObject = /* @__PURE__ */ $constructor("$ZodObject", (inst, def) => {
     const shape = def.shape;
     const propValues = {};
     for (const key in shape) {
-      const field = shape[key]._zod;
-      if (field.values) {
+      const field2 = shape[key]._zod;
+      if (field2.values) {
         propValues[key] ?? (propValues[key] = /* @__PURE__ */ new Set());
-        for (const v of field.values)
+        for (const v of field2.values)
           propValues[key].add(v);
       }
     }
@@ -14692,7 +14692,14 @@ var scheduleSchema = external_exports.object({
   id: external_exports.string().min(1).max(32),
   cron: external_exports.string().min(1).max(MAX_CRON_LENGTH),
   scheduledTime: external_exports.number().int().nonnegative().safe(),
-  installs: external_exports.array(external_exports.object({ id: external_exports.string().min(1).max(64), ord: external_exports.number().int().min(1), label: external_exports.string().max(100) }).strict()).min(1).max(MAX_INSTALLS_PER_APP)
+  installs: external_exports.array(
+    external_exports.object({
+      id: external_exports.string().min(1).max(64),
+      ord: external_exports.number().int().min(1),
+      label: external_exports.string().max(100),
+      catalogQueryTicket: external_exports.string().min(1).max(2048)
+    }).strict()
+  ).min(1).max(MAX_INSTALLS_PER_APP)
 }).strict();
 var controlEnvelopeSchema = external_exports.object({
   v: external_exports.literal(CONTROL_ENVELOPE_VERSION),
@@ -14734,12 +14741,21 @@ var ENDPOINT_CONTEXT_HEADER = "x-qinto-endpoint-context";
 var ENDPOINT_OUTCOMES_HEADER = "x-qinto-endpoint-outcomes";
 var MAX_ENDPOINT_BODY_BYTES = 1024 * 1024;
 var MAX_ENDPOINT_OUTCOMES_BYTES = 64 * 1024;
+var MAX_ENDPOINT_PATH_LENGTH = 16 * 1024;
 var installSchema3 = external_exports.object({ id: external_exports.string().min(1).max(64), ord: external_exports.number().int().min(1), label: external_exports.string().max(100) }).strict();
 var endpointContextSchema = external_exports.object({
-  path: external_exports.string().min(1).max(255),
+  // The declared template, which keys the bundle's handler map; `path` is what the caller asked
+  // for. Only `route` may key the rate limiter — a concrete path gives every parameter value its
+  // own bucket, which is no limit at all.
+  route: external_exports.string().min(1).max(255),
+  path: external_exports.string().min(1).max(MAX_ENDPOINT_PATH_LENGTH),
+  // A name is cut from `route`, so the route's own cap bounds it; anything tighter would reject a
+  // parameter the manifest grammar accepts and the worker already matched.
+  params: external_exports.record(external_exports.string().min(1).max(255), external_exports.string().max(MAX_ENDPOINT_PATH_LENGTH)).default({}),
   method: external_exports.enum(["GET", "POST", "PUT", "PATCH", "DELETE"]),
   mode: external_exports.enum(["webhook", "api"]),
   version: external_exports.string().min(1).max(32),
+  site: external_exports.object({ origin: external_exports.string().min(1).max(255) }).strict(),
   installs: external_exports.array(installSchema3).min(1).max(15)
 }).strict().refine((context) => {
   return context.mode === "webhook" || context.installs.length === 1;
@@ -14754,12 +14770,105 @@ var endpointOutcomesSchema = external_exports.object({
   ).max(15)
 }).strict();
 
+// ../../../libs/app-envelope/src/oauth.ts
+var APP_OAUTH_BINDING_PREFIX = "OAUTH_";
+var appOauthBindingName = (providerId, ordinal) => {
+  return `${APP_OAUTH_BINDING_PREFIX}${providerId.toUpperCase().replaceAll("-", "_")}_${ordinal}`;
+};
+var parseAppOauthBinding = (raw) => {
+  if (raw === void 0 || raw === "") {
+    return null;
+  }
+  let parsed;
+  try {
+    parsed = JSON.parse(raw);
+  } catch {
+    return null;
+  }
+  if (typeof parsed !== "object" || parsed === null) {
+    return null;
+  }
+  const value = parsed;
+  if (value["st"] !== "connected" && value["st"] !== "reconnect_required") {
+    return null;
+  }
+  const expiresAt = value["e"];
+  const token = value["t"];
+  return {
+    ...typeof token === "string" && token !== "" ? { t: token } : {},
+    e: typeof expiresAt === "number" ? expiresAt : null,
+    st: value["st"]
+  };
+};
+
+// ../../../libs/app-envelope/src/observability.ts
+var APP_OBSERVABILITY_HEADER = "x-qinto-app-observability";
+var APP_OBSERVABILITY_VERSION = 1;
+var MAX_APP_OBSERVABILITY_EVENTS = 20;
+var MAX_APP_SAVED_ERRORS = 5;
+var MAX_APP_EVENT_NAME_BYTES = 128;
+var MAX_APP_ACTION_NAME_BYTES = 256;
+var MAX_APP_ERROR_DESCRIPTION_BYTES = 2048;
+var MAX_APP_ERROR_PAYLOAD_BYTES = 4096;
+var MAX_APP_DATA_POINT_BLOB_BYTES = 16 * 1024;
+var MAX_APP_OBSERVABILITY_BYTES = 32 * 1024;
+var APP_OBSERVABILITY_JSON_BUDGET = MAX_APP_OBSERVABILITY_BYTES / 4 * 3;
+var APP_EVENT_STATUSES = ["success", "error"];
+var APP_ERROR_CATEGORIES = ["authorization", "configuration", "validation", "rate_limit", "upstream", "internal"];
+var encoder = new TextEncoder();
+var decoder = new TextDecoder();
+var observabilityEventSchema = external_exports.object({ ord: external_exports.number().int().min(1), name: external_exports.string().min(1).max(MAX_APP_EVENT_NAME_BYTES), status: external_exports.enum(APP_EVENT_STATUSES) }).strict();
+var savedErrorSchema = external_exports.object({
+  ord: external_exports.number().int().min(1),
+  category: external_exports.enum(APP_ERROR_CATEGORIES),
+  action: external_exports.string().min(1).max(MAX_APP_ACTION_NAME_BYTES),
+  description: external_exports.string().min(1).max(MAX_APP_ERROR_DESCRIPTION_BYTES),
+  payload: external_exports.string().max(MAX_APP_ERROR_PAYLOAD_BYTES).optional(),
+  error: external_exports.string().max(MAX_APP_ERROR_PAYLOAD_BYTES).optional()
+}).strict();
+var appObservabilityRecordSchema = external_exports.object({
+  v: external_exports.literal(APP_OBSERVABILITY_VERSION),
+  truncated: external_exports.boolean().optional(),
+  events: external_exports.array(observabilityEventSchema).max(MAX_APP_OBSERVABILITY_EVENTS),
+  errors: external_exports.array(savedErrorSchema).max(MAX_APP_SAVED_ERRORS)
+}).strict();
+var utf8Length = (value) => {
+  return encoder.encode(value).length;
+};
+var truncateUtf8 = (value, maxBytes) => {
+  if (utf8Length(value) <= maxBytes) {
+    return value;
+  }
+  let kept = "";
+  let used = 0;
+  for (const character of value) {
+    const size = utf8Length(character);
+    if (used + size > maxBytes) {
+      break;
+    }
+    kept += character;
+    used += size;
+  }
+  return kept;
+};
+var serializeAppObservability = (record2) => {
+  const bytes = encoder.encode(JSON.stringify(record2));
+  let binary = "";
+  for (const byte of bytes) {
+    binary += String.fromCharCode(byte);
+  }
+  return btoa(binary);
+};
+
 // ../../../libs/app-envelope/src/ui.ts
 var UI_CONTEXT_HEADER = "x-qinto-ui-context";
 var MAX_UI_BODY_BYTES = 1024 * 1024;
 var appUiWritePath = (domainId, appSlug2) => {
   return `/app-ui/sites/${domainId}/apps/${appSlug2}/install-variables`;
 };
+var appUiCatalogQueryPath = (domainId, appSlug2, resourceIdentifier) => {
+  return `/app-ui/sites/${domainId}/apps/${appSlug2}/catalogs/${resourceIdentifier}/query`;
+};
 var uiInstallSchema = external_exports.object({ id: external_exports.string().min(1).max(64), ord: external_exports.number().int().min(1), label: external_exports.string().max(100), enabled: external_exports.boolean() }).strict();
 var uiContextSchema = external_exports.object({
   version: external_exports.string().min(1).max(32),
@@ -14796,10 +14905,10 @@ var formatSpansRecord = (record2) => {
 };
 
 // ../../../libs/tail-trace/src/app-spans.ts
-var encoder = new TextEncoder();
-var decoder = new TextDecoder();
+var encoder2 = new TextEncoder();
+var decoder2 = new TextDecoder();
 var serializeAppSpans = (record2) => {
-  const bytes = encoder.encode(JSON.stringify(record2));
+  const bytes = encoder2.encode(JSON.stringify(record2));
   let binary = "";
   for (const byte of bytes) {
     binary += String.fromCharCode(byte);
@@ -14808,12 +14917,12 @@ var serializeAppSpans = (record2) => {
 };
 
 // ../../../libs/tail-trace/src/budget.ts
-var encoder2 = new TextEncoder();
+var encoder3 = new TextEncoder();
 var byteLength = (value) => {
-  return encoder2.encode(JSON.stringify(value)).length;
+  return encoder3.encode(JSON.stringify(value)).length;
 };
 var fitsBudget = (text, max) => {
-  return text.length * 3 <= max || encoder2.encode(text).length <= max;
+  return text.length * 3 <= max || encoder3.encode(text).length <= max;
 };
 var MIN_KEEP = 64;
 var halveLongestString = (holders) => {
@@ -15397,6 +15506,162 @@ var buildAppsClient = (env, envelope) => {
   };
 };
 
+// src/oauth.ts
+var EXPIRY_FLOOR_MS = 1e3;
+var read = (env, id, ord, now) => {
+  const raw = env[appOauthBindingName(id, ord)];
+  const parsed = parseAppOauthBinding(typeof raw === "string" ? raw : void 0);
+  if (parsed === null) {
+    return null;
+  }
+  const expired = parsed.e !== null && parsed.e - now < EXPIRY_FLOOR_MS;
+  return {
+    id,
+    status: parsed.st === "connected" && !expired ? "connected" : "reconnect_required",
+    expiresAt: parsed.e
+  };
+};
+var buildOauth = (env, ord, now = Date.now) => {
+  return {
+    token: (id) => {
+      const raw = env[appOauthBindingName(id, ord)];
+      const parsed = parseAppOauthBinding(typeof raw === "string" ? raw : void 0);
+      if (parsed === null) {
+        throw new Error(`not_connected: this install has no ${id} connection`);
+      }
+      const state = read(env, id, ord, now());
+      if (parsed.t === void 0 || state?.status !== "connected") {
+        throw new Error(`reconnect_required: the ${id} connection has ended and a site manager must reconnect it`);
+      }
+      return parsed.t;
+    },
+    connection: (id) => {
+      return read(env, id, ord, now());
+    }
+  };
+};
+var oauthTokenValues = (env) => {
+  const values = /* @__PURE__ */ new Set();
+  for (const [name, raw] of Object.entries(env)) {
+    if (!name.startsWith("OAUTH_") || typeof raw !== "string") {
+      continue;
+    }
+    const token = parseAppOauthBinding(raw)?.t;
+    if (token !== void 0 && token !== "") {
+      values.add(token);
+    }
+  }
+  return [...values];
+};
+var buildUiOauth = (env, installs, now = Date.now) => {
+  const ordinalOf = (installId) => {
+    return installs.find((install) => install.id === installId)?.ord ?? null;
+  };
+  return {
+    token: (id, options) => {
+      const ord = ordinalOf(options.installId);
+      if (ord === null) {
+        throw new Error(`not_connected: ${options.installId} is not an install of this app`);
+      }
+      return buildOauth(env, ord, now).token(id);
+    },
+    connection: (id, options) => {
+      const ord = ordinalOf(options.installId);
+      return ord === null ? null : buildOauth(env, ord, now).connection(id);
+    }
+  };
+};
+
+// src/observability-collector.ts
+import { AsyncLocalStorage as AsyncLocalStorage2 } from "node:async_hooks";
+var ENVELOPE_OVERHEAD = 64;
+var collectors = new AsyncLocalStorage2();
+var serialized = (value) => {
+  if (value instanceof Error) {
+    const stack = value.stack;
+    return JSON.stringify({ name: value.name, message: value.message, ...stack === void 0 ? {} : { stack } });
+  }
+  let text;
+  try {
+    text = JSON.stringify(value);
+  } catch {
+    return String(value);
+  }
+  return typeof text === "string" ? text : String(value);
+};
+var field = (value, redact, maxBytes) => {
+  return truncateUtf8(redact(value), maxBytes);
+};
+var optionalField = (value, redact) => {
+  if (value === void 0) {
+    return void 0;
+  }
+  return field(serialized(value), redact, MAX_APP_ERROR_PAYLOAD_BYTES);
+};
+var createObservabilityCollector = (redact) => {
+  const events = [];
+  const errors = [];
+  let used = ENVELOPE_OVERHEAD;
+  let truncated = false;
+  const size = (entry) => {
+    return utf8Length(JSON.stringify(entry)) + 1;
+  };
+  return {
+    addEvent: (ord, name, status) => {
+      if (name === "" || !APP_EVENT_STATUSES.includes(status)) {
+        truncated = true;
+        return;
+      }
+      if (events.length >= MAX_APP_OBSERVABILITY_EVENTS) {
+        truncated = true;
+        return;
+      }
+      const entry = { ord, name: field(name, redact, MAX_APP_EVENT_NAME_BYTES), status };
+      used += size(entry);
+      events.push(entry);
+    },
+    addError: (ord, input) => {
+      if (!APP_ERROR_CATEGORIES.includes(input.category) || input.action === "" || input.description === "") {
+        truncated = true;
+        return;
+      }
+      if (errors.length >= MAX_APP_SAVED_ERRORS) {
+        truncated = true;
+        return;
+      }
+      const payload = optionalField(input.payload, redact);
+      const error51 = optionalField(input.error, redact);
+      const entry = {
+        ord,
+        category: input.category,
+        action: field(input.action, redact, MAX_APP_ACTION_NAME_BYTES),
+        description: field(input.description, redact, MAX_APP_ERROR_DESCRIPTION_BYTES),
+        ...payload === void 0 ? {} : { payload },
+        ...error51 === void 0 ? {} : { error: error51 }
+      };
+      const entrySize = size(entry);
+      if (used + entrySize > APP_OBSERVABILITY_JSON_BUDGET) {
+        truncated = true;
+        return;
+      }
+      used += entrySize;
+      errors.push(entry);
+    },
+    record: () => {
+      if (events.length === 0 && errors.length === 0) {
+        return null;
+      }
+      return { v: APP_OBSERVABILITY_VERSION, ...truncated ? { truncated } : {}, events, errors };
+    }
+  };
+};
+var runWithObservability = (collector, run) => {
+  return collectors.run(collector, run);
+};
+var currentObservability = () => {
+  return collectors.getStore();
+};
+
 // src/observability.ts
 var exceptionAttrs = (error51) => {
   const attrs = {
@@ -15419,7 +15684,7 @@ var consoleText = (error51) => {
   }
   return redactUrlParams(error51 instanceof Error ? error51.stack ?? error51.message : String(error51));
 };
-var buildObservability = () => {
+var buildObservability = (ord) => {
   return {
     log: (message, attrs) => {
       addSpanEvent(message, attrs === void 0 ? {} : { attrs });
@@ -15429,6 +15694,21 @@ var buildObservability = () => {
       addSpanEvent(message, { level: "error", attrs: { ...attrs, ...error51 === void 0 ? {} : exceptionAttrs(error51) } });
       console.error(redactUrlParams(message), consoleText(error51), redactAttrs(attrs ?? {}));
     },
+    event: (name, status) => {
+      addSpanEvent(name, { attrs: { "app.event.status": status } });
+      if (ord !== null) {
+        currentObservability()?.addEvent(ord, name, status);
+      }
+    },
+    saveError: (input) => {
+      addSpanEvent(input.description, {
+        level: "error",
+        attrs: { "app.error.category": input.category, "app.error.action": input.action }
+      });
+      if (ord !== null) {
+        currentObservability()?.addError(ord, input);
+      }
+    },
     span: ((...args) => {
       const [name] = args;
       const { attrs, run } = spanParts(args);
@@ -15505,6 +15785,9 @@ var secretValues = (env) => {
       values.add(value);
     }
   }
+  for (const value of oauthTokenValues(env)) {
+    values.add(value);
+  }
   return [...values];
 };
 var projectInstallValues = (maps, kinds, ord) => {
@@ -15581,13 +15864,13 @@ var readOnce = (env, subject) => {
   };
 };
 var fetchedContext = (env, subject, collector) => {
-  const read = readOnce(env, () => {
+  const read2 = readOnce(env, () => {
     return subject("context.load");
   });
   return {
     private: {
       load: async () => {
-        return (await read()).private;
+        return (await read2()).private;
       },
       set: (patch) => {
         subject("context.set");
@@ -15596,7 +15879,7 @@ var fetchedContext = (env, subject, collector) => {
     },
     shared: {
       load: async () => {
-        return (await read()).shared;
+        return (await read2()).shared;
       },
       set: (patch) => {
         subject("context.set");
@@ -15606,13 +15889,13 @@ var fetchedContext = (env, subject, collector) => {
   };
 };
 var asyncContext = (env, subject) => {
-  const read = readOnce(env, () => {
+  const read2 = readOnce(env, () => {
     return subject("context.load");
   });
   return {
     private: {
       load: async () => {
-        return (await read()).private;
+        return (await read2()).private;
       },
       set: async (patch) => {
         assertValidPatch(patch);
@@ -15624,7 +15907,7 @@ var asyncContext = (env, subject) => {
     },
     shared: {
       load: async () => {
-        return (await read()).shared;
+        return (await read2()).shared;
       },
       set: async (patch) => {
         assertValidPatch(patch);
@@ -15684,12 +15967,13 @@ var buildWorkflowContext = (env, stamp) => {
     env,
     install,
     startWorkflow: buildStartWorkflow(stamp),
+    oauth: buildOauth(env, stamp.ord),
     variables,
     secrets,
     appVariables,
     appSecrets,
     userId: stamp.anonId,
-    observability: buildObservability(),
+    observability: buildObservability(stamp.ord),
     context: asyncContext(env, (what) => {
       return requireSubject(stamp.anonId, what);
     }),
@@ -15766,6 +16050,7 @@ var buildContext = ({
     secrets,
     appVariables: appScope.appVariables,
     appSecrets: appScope.appSecrets,
+    oauth: buildOauth(env, install.ord),
     user: envelope.user ?? null,
     consent: envelope.consent,
     geo: envelope.geo,
@@ -15820,7 +16105,7 @@ var buildContext = ({
         }
       }
     },
-    observability: buildObservability(),
+    observability: buildObservability(install.ord),
     apps: buildAppsClient(env, envelope)
   };
 };
@@ -15847,6 +16132,48 @@ var failureMessage = (error51) => {
   return message.slice(0, MAX_ERROR_MESSAGE_LENGTH);
 };
 
+// src/catalog-query.ts
+var MAX_CATALOG_RESPONSE_BYTES = 5 * 1024 * 1024;
+var parseCatalogResponse = async (response) => {
+  const raw = await readBody(response, MAX_CATALOG_RESPONSE_BYTES);
+  if (raw === null) {
+    throw new Error("The catalog query response exceeded the app runtime limit.");
+  }
+  let body;
+  try {
+    body = JSON.parse(raw);
+  } catch {
+    throw new Error(`The catalog query returned an invalid response (${response.status}).`);
+  }
+  if (!response.ok) {
+    const error51 = body;
+    const reason = typeof error51.message === "string" ? error51.message : typeof error51.error === "string" ? error51.error : `request failed with status ${response.status}`;
+    throw new Error(`Catalog query failed: ${reason}`);
+  }
+  return body;
+};
+var buildCatalogQuery = ({ env, ticket, installId }) => {
+  return {
+    catalog: async (resourceIdentifier, sql) => {
+      const platform = env;
+      const context = JSON.parse(platform.APP_CONTEXT);
+      const path = appUiCatalogQueryPath(context.domainId, context.slug, resourceIdentifier);
+      return traced(
+        "qinto.catalog.query",
+        { attrs: { "app.install_id": installId, "app.catalog.resource": resourceIdentifier } },
+        async () => {
+          const response = await fetch(new URL(path, platform.QINTO_PLATFORM_API), {
+            method: "POST",
+            headers: { authorization: `Bearer ${ticket}`, "content-type": "application/json" },
+            body: JSON.stringify({ sql })
+          });
+          return parseCatalogResponse(response);
+        }
+      );
+    }
+  };
+};
+
 // src/schedule.ts
 var dispatchSchedule = async (envelope, bundle, env) => {
   const schedule = envelope.schedule;
@@ -15875,12 +16202,14 @@ var dispatchSchedule = async (envelope, bundle, env) => {
         installLabel: install.label,
         anonId: null
       }),
+      oauth: buildOauth(env, install.ord),
       variables,
       secrets,
       appVariables: appScope.appVariables,
       appSecrets: appScope.appSecrets,
-      observability: buildObservability(),
+      observability: buildObservability(install.ord),
       apps: buildAppsClient(env, { depth: 0 }),
+      query: buildCatalogQuery({ env, ticket: install.catalogQueryTicket, installId: install.id }),
       push: async (userId, message) => {
         await brokerPush(env, {
           userId,
@@ -15940,7 +16269,7 @@ var lifecycleContext = (env, envelope) => {
       installLabel: install.label,
       anonId: null
     }),
-    observability: buildObservability()
+    observability: buildObservability(install.ord)
   };
 };
 var migrationContext = (env, envelope) => {
@@ -15950,7 +16279,9 @@ var migrationContext = (env, envelope) => {
     site: envelope.site,
     appVariables: appScope.appVariables,
     appSecrets: appScope.appSecrets,
-    observability: buildObservability()
+    // A migration runs once for the site, not once per install, so it has no install to attribute
+    // an event or a saved error to.
+    observability: buildObservability(null)
   };
 };
 var runStatementMigration = async (env, migration) => {
@@ -16079,19 +16410,22 @@ var handlerRequest = (request, context, body) => {
     body: body.byteLength === 0 ? void 0 : body
   });
 };
-var buildContext2 = ({ env, maps, kinds, appScope, install }) => {
+var buildContext2 = ({ env, maps, kinds, appScope, install, site, params }) => {
   const { variables, secrets } = projectInstallValues(maps, kinds, install.ord);
   return {
     env,
+    site,
+    params,
     install: { id: install.id, label: install.label },
     // An endpoint has no visitor, so a workflow it starts cannot push. `push` below is the
     // exception: it names its subject rather than inheriting one.
     startWorkflow: buildStartWorkflow({ ord: install.ord, installId: install.id, installLabel: install.label, anonId: null }),
+    oauth: buildOauth(env, install.ord),
     variables,
     secrets,
     appVariables: appScope.appVariables,
     appSecrets: appScope.appSecrets,
-    observability: buildObservability(),
+    observability: buildObservability(install.ord),
     apps: buildAppsClient(env, { depth: 0 }),
     push: async (userId, message) => {
       await brokerPush(env, {
@@ -16154,7 +16488,8 @@ var dispatchEndpoint = async ({ request, env, versions }) => {
     return Response.json({ error: "unknown version" }, { status: 404 });
   }
   const bundle = versions[context.version];
-  const candidate = bundle?.endpoints?.[context.path];
+  const endpoints = bundle?.endpoints;
+  const candidate = endpoints !== void 0 && Object.hasOwn(endpoints, context.route) ? endpoints[context.route] : void 0;
   if (typeof candidate !== "function") {
     return Response.json({ error: "not_found" }, { status: 404 });
   }
@@ -16165,7 +16500,10 @@ var dispatchEndpoint = async ({ request, env, versions }) => {
   const appScope = projectAppValues(env, appVariableKinds);
   const invoke = async (install) => {
     return installSpan(install, () => {
-      return handler(handlerRequest(request, context, body), buildContext2({ env, maps, kinds: variableKinds, appScope, install }));
+      return handler(
+        handlerRequest(request, context, body),
+        buildContext2({ env, maps, kinds: variableKinds, appScope, install, site: context.site, params: context.params })
+      );
     });
   };
   const installs = [...context.installs].sort((left, right) => {
@@ -16188,29 +16526,38 @@ var appSlug = (context) => {
     return "app";
   }
 };
-var withSpans = (response, record2) => {
+var withSpans = (response, record2, collector) => {
   const headers = new Headers(response.headers);
   headers.set(APP_SPANS_HEADER, serializeAppSpans(record2));
+  headers.delete(APP_OBSERVABILITY_HEADER);
+  const observability = collector.record();
+  if (observability !== null) {
+    headers.set(APP_OBSERVABILITY_HEADER, serializeAppObservability(observability));
+  }
   return new Response(response.body, { status: response.status, statusText: response.statusText, headers });
 };
 var runAppInvocation = async (input, handle) => {
   let record2 = { spans: [] };
+  const redact = spanRedactor(input.secrets);
+  const collector = createObservabilityCollector(redact);
   try {
     const response = await runInvocation(
       {
         name: appSlug(input.context),
         trace: parseTraceContext(input.request.headers.get(TRACE_HEADER)),
         budget: APP_SPANS_JSON_BUDGET,
-        redact: spanRedactor(input.secrets),
+        redact,
         emit: (emitted) => {
           record2 = emitted;
         }
       },
-      handle
+      () => {
+        return runWithObservability(collector, handle);
+      }
     );
-    return withSpans(response, record2);
+    return withSpans(response, record2, collector);
   } catch {
-    return withSpans(input.failure(), record2);
+    return withSpans(input.failure(), record2, collector);
   }
 };
 
@@ -16236,21 +16583,21 @@ var capturedBody = async (open) => {
       return void 0;
     }
     const reader = body.getReader();
-    const decoder2 = new TextDecoder();
+    const decoder3 = new TextDecoder();
     const expired = new Promise((resolve) => {
       timer = setTimeout(() => resolve(null), READ_BUDGET_MS);
     });
     let text = "";
     for (; ; ) {
-      const read = await Promise.race([reader.read(), expired]);
-      if (read === null) {
+      const read2 = await Promise.race([reader.read(), expired]);
+      if (read2 === null) {
         abandon(reader);
         return INCOMPLETE;
       }
-      if (read.done) {
+      if (read2.done) {
         break;
       }
-      text += decoder2.decode(read.value, { stream: true });
+      text += decoder3.decode(read2.value, { stream: true });
       if (text.length > MAX_BODY_CHARS) {
         abandon(reader);
         return TOO_LARGE;
@@ -16362,6 +16709,9 @@ var dispatchUi = async ({ request, env, versions }) => {
     env,
     install: { id: context.install.id, label: context.install.label },
     installs: projectAllInstallValues(maps, variableKinds, context.installs),
+    // The install is named rather than inherited: one panel serves every install, and reading the
+    // subject install's token while showing another account's UI would be silently wrong.
+    oauth: buildUiOauth(env, context.installs),
     settings: buildSettings({ env, ticket: context.writeTicket }),
     // The panel's viewer is a portal user, not a visitor, so a workflow it starts carries no subject.
     startWorkflow: buildUiStartWorkflow(
@@ -16373,7 +16723,7 @@ var dispatchUi = async ({ request, env, versions }) => {
     appVariables,
     appSecrets,
     viewer: context.viewer,
-    observability: buildObservability(),
+    observability: buildObservability(context.install.ord),
     apps: buildAppsClient(env, { depth: 0 })
   };
   let response;