@blotout/qinto-cli 0.1.19 → 0.1.21

package/dist/worker-artifact/main/index.js

@@ -20992,10 +20992,13 @@ var variableSchema = external_exports.object({
   label: external_exports.string().min(1).max(100),
   required: external_exports.boolean().optional(),
   browser: external_exports.boolean().optional(),
+  owner: external_exports.enum(["site", "developer"]).optional(),
   helpText: external_exports.string().min(1).max(MAX_VARIABLE_HELP_TEXT).optional(),
   helpUrl: httpsUrl("helpUrl").optional()
 }).strict().refine((variable) => !(variable.kind === "secret" && variable.browser === true), {
   message: "A secret variable can never be browser-exposed"
+}).refine((variable) => !(variable.required === true && variable.owner === "developer"), {
+  message: "A developer-owned variable cannot be required"
 });
 var appVariableSchema = external_exports.object({
   name: external_exports.string().min(1).max(64).regex(VARIABLE_NAME),
@@ -21467,6 +21470,8 @@ var MAX_CAPTURE_WRITES_PER_INSTALL = 10;
 var MAX_CONTEXT_WRITES_PER_INSTALL = 2;
 var CONTEXT_LEVELS = ["private", "shared"];
 var PUSH_BROADCASTS = ["install", "app", "site"];
+var ACTION_SOURCES = ["website", "api", "app", "scheduled", "webhook", "tool", "workflow"];
+var APP_HANDLER_SOURCES = ["scheduled", "webhook", "tool", "workflow"];
 var MAX_PRIVATE_CONTEXT_ENTRY_BYTES = 32 * 1024;
 var MAX_SHARED_CONTEXT_ENTRY_BYTES = 4 * 1024;
 var MAX_PUSH_BYTES = 16 * 1024;
@@ -21495,9 +21500,10 @@ var effectGroupSchema = external_exports.object({
   context: external_exports.array(contextWriteSchema).optional()
 }).strict();
 var captureValueSchema = external_exports.object({ value: external_exports.string().max(512), createdAt: external_exports.number().int(), updatedAt: external_exports.number().int(), type: external_exports.enum(CAPTURE_TYPES) }).strict();
+var pageSchema = external_exports.object({ url: external_exports.string().min(1).max(4096), referrer: external_exports.string().min(1).max(4096).optional() }).strict();
 var actionContextFields = {
   occurredAt: external_exports.number().int().nonnegative().safe(),
-  page: external_exports.object({ url: external_exports.string().min(1).max(4096), referrer: external_exports.string().min(1).max(4096).optional() }).strict().optional(),
+  page: pageSchema.optional(),
   network: external_exports.object({
     ip: external_exports.string().min(1).max(64).optional(),
     userAgent: external_exports.string().min(1).max(512).optional(),
@@ -21525,6 +21531,8 @@ var envelopeRequestSchema = external_exports.object({
   }).strict().optional(),
   consent: external_exports.object({ enabled: external_exports.boolean(), categories: external_exports.record(external_exports.string(), external_exports.boolean()), apps: external_exports.record(external_exports.string(), external_exports.boolean()) }).strict().optional(),
   geo: external_exports.record(external_exports.string(), external_exports.unknown()).optional(),
+  // Connect envelopes only: the page the visitor's socket opened from.
+  page: pageSchema.optional(),
   // Only what this app captured or wrote for this visitor; `updatedAt` is when the current value
   // was first seen, which is the click time a CAPI `fbc` is built from.
   captures: external_exports.record(external_exports.string().max(64), captureValueSchema).optional(),
@@ -21542,6 +21550,9 @@ var envelopeRequestSchema = external_exports.object({
     userId: external_exports.string().min(1).max(64),
     payload: external_exports.record(external_exports.string(), external_exports.unknown()),
     receivedAt: external_exports.number().int(),
+    // Optional on the wire: an app worker redeploys before its site worker, so this reader must
+    // accept an envelope a site worker predating the field produces.
+    source: external_exports.enum(ACTION_SOURCES).optional(),
     context: actionContextSchema.optional(),
     browser: external_exports.record(external_exports.string().min(1).max(64), external_exports.unknown()).optional(),
     origin: external_exports.object({ app: external_exports.string().min(1).max(30), install: external_exports.number().int().min(1), depth: external_exports.number().int().min(0) }).strict().optional()
@@ -26297,14 +26308,15 @@ var captureAppsField = external_exports.record(external_exports.string().max(30)
   description: "Values to record, keyed by app slug and then by capture name. A name the app does not declare is dropped.",
   example: { facebook: { fbclid: "IwAR0abc" }, "google-ads": { gclid: "Cj0KCQ" } }
 });
+var pageContextField = external_exports.object({
+  url: external_exports.string().min(1).max(4096),
+  referrer: external_exports.string().min(1).max(4096).optional()
+}).strict();
 var serverActionContextField = external_exports.object({
   occurredAt: external_exports.number().int().nonnegative().safe().optional().openapi({
     description: "When the visitor action occurred, as Unix milliseconds; defaults to Qinto receipt time."
   }),
-  page: external_exports.object({
-    url: external_exports.string().min(1).max(4096),
-    referrer: external_exports.string().min(1).max(4096).optional()
-  }).strict().optional(),
+  page: pageContextField.optional(),
   network: external_exports.object({
     ip: external_exports.string().min(1).max(64).optional(),
     userAgent: external_exports.string().min(1).max(512).optional(),
@@ -26868,7 +26880,6 @@ var submitAction = /* @__PURE__ */ __name(async (env, userId, args, request) =>
       ...args,
       userId: resolved.id,
       identifier: resolved.identifier,
-      source: "http",
       receivedAt,
       context: serverActionContext(args.context, receivedAt),
       geo: request?.cf,
@@ -27159,6 +27170,90 @@ var lookupPersonForApp = /* @__PURE__ */ __name(async (env, slug, id, afterRowId
   return page === null ? null : personOf(globalId, page);
 }, "lookupPersonForApp");
 
+// src/apps/broker-fields.ts
+var identityFields = {
+  // Derived, never a literal: the client stamps ENVELOPE_VERSION on every body, so a hardcoded
+  // number here silently 400s the whole channel the next time the envelope version moves.
+  v: external_exports.literal(ENVELOPE_VERSION),
+  slug: external_exports.string().min(1).max(30),
+  key: external_exports.string().min(1)
+};
+
+// src/apps/emit-payload.ts
+var emitPayloadSchema = external_exports.object({
+  event: external_exports.string().min(1),
+  eventId: external_exports.string().min(1).optional(),
+  properties: external_exports.record(external_exports.string(), external_exports.unknown()).optional()
+}).strict();
+var emittedEventId = /* @__PURE__ */ __name((eventId, properties2) => {
+  if (eventId !== void 0) {
+    return eventId;
+  }
+  const orderId = properties2?.["orderId"];
+  if (typeof orderId === "string" && orderId !== "") {
+    return orderId;
+  }
+  return `evt_${ulid3()}`;
+}, "emittedEventId");
+
+// src/apps/rate-limit.ts
+var limiterAbsenceLogged = false;
+var rateLimited = /* @__PURE__ */ __name(async (env, key, binding = "BROKER_RATE_LIMITER") => {
+  const limiter = env[binding];
+  if (limiter === void 0) {
+    if (!limiterAbsenceLogged) {
+      limiterAbsenceLogged = true;
+      addSpanEvent("rate limiter binding is absent; limits are off", { level: "warn", attrs: { binding } });
+    }
+    return false;
+  }
+  const outcome = await limiter.limit({ key });
+  return !outcome.success;
+}, "rateLimited");
+
+// src/apps/broker-track.ts
+var trackBody = external_exports.object({
+  ...identityFields,
+  kind: external_exports.literal("track"),
+  source: external_exports.enum(APP_HANDLER_SOURCES),
+  userId: external_exports.string().min(1).max(64),
+  installId: external_exports.string().min(1).max(64),
+  event: emitSchema
+}).strict();
+var handleTrack = /* @__PURE__ */ __name(async (env, body) => {
+  const app2 = siteRegistry().registry.apps[body.slug];
+  if (app2 === void 0) {
+    return Response.json({ error: "forbidden" }, { status: 403 });
+  }
+  if (!app2.installs.some((install) => install.active && install.id === body.installId)) {
+    return Response.json({ error: "invalid_install" }, { status: 400 });
+  }
+  const parsed = emitPayloadSchema.safeParse(body.event.payload);
+  if (!parsed.success) {
+    return Response.json({ error: "invalid_event" }, { status: 400 });
+  }
+  if (!isCanonicalId(body.userId)) {
+    return Response.json({ error: "invalid_user" }, { status: 400 });
+  }
+  if (await rateLimited(env, `${body.slug}:${body.installId}:track`)) {
+    return Response.json({ error: "rate_limited" }, { status: 429 });
+  }
+  const site = ownSite(env);
+  if (!await anonStub(env, body.userId).appAllowed(body.slug, site, currentTraceContext())) {
+    return Response.json({ error: "forbidden" }, { status: 403 });
+  }
+  const { event, eventId, properties: properties2 } = parsed.data;
+  const action = buildAction({
+    type: "track",
+    userId: body.userId,
+    source: body.source,
+    payload: { event, eventId: emittedEventId(eventId, properties2), properties: properties2 ?? {} },
+    context: { source: "app", occurredAt: body.event.occurredAt, offline: false, replay: false }
+  });
+  await ingest(env, action, site);
+  return Response.json({ accepted: true }, { status: 202 });
+}, "handleTrack");
+
 // src/id-graph/anon/context.ts
 var LEVEL_KINDS = {
   private: { kv: "context_private_kv", text: "context_private_text" },
@@ -27596,6 +27691,7 @@ var eventAction = /* @__PURE__ */ __name((target, trigger, snapshot) => {
     userId: snapshot.anonId,
     payload: trigger.action.payload,
     receivedAt: trigger.action.receivedAt,
+    source: trigger.action.source,
     ...buckets.includes("eventContext") && trigger.action.context !== void 0 ? { context: trigger.action.context } : {},
     ...trigger.action.browserResults?.[target.slug] === void 0 ? {} : { browser: trigger.action.browserResults[target.slug] },
     ...trigger.action.origin !== void 0 ? { origin: trigger.action.origin } : {}
@@ -27626,6 +27722,7 @@ var buildEnvelope = /* @__PURE__ */ __name((target, trigger, snapshot, context)
     },
     ...buckets.includes("consentState") ? { consent: { enabled: context.consentEnforced, categories: snapshot.consent.categories, apps: snapshot.consent.apps } } : {},
     ...geoAllowed && currentGeo !== void 0 ? { geo: currentGeo } : {},
+    ...trigger.kind === "connect" && trigger.page !== void 0 && buckets.includes("eventContext") ? { page: trigger.page } : {},
     // Not gated on a capabilities.data bucket: an app only ever sees what it captured or wrote.
     ...captures === void 0 ? {} : { captures },
     ...visitorContext === void 0 ? {} : { context: visitorContext },
@@ -27633,21 +27730,6 @@ var buildEnvelope = /* @__PURE__ */ __name((target, trigger, snapshot, context)
     ...trigger.kind === "event" ? { action: eventAction(target, trigger, snapshot) } : {}
   };
 }, "buildEnvelope");
-var emitPayloadSchema = external_exports.object({
-  event: external_exports.string().min(1),
-  eventId: external_exports.string().min(1).optional(),
-  properties: external_exports.record(external_exports.string(), external_exports.unknown()).optional()
-}).strict();
-var emittedEventId = /* @__PURE__ */ __name((eventId, properties2) => {
-  if (eventId !== void 0) {
-    return eventId;
-  }
-  const orderId = properties2?.["orderId"];
-  if (typeof orderId === "string" && orderId !== "") {
-    return orderId;
-  }
-  return `evt_${ulid3()}`;
-}, "emittedEventId");
 var ingestEmit = /* @__PURE__ */ __name(async (ingest2, { slug, ord, depth, emit, anonId, geo, host, context }) => {
   const parsed = emitPayloadSchema.safeParse(emit.payload);
   if (!parsed.success) {
@@ -27826,31 +27908,9 @@ var invokeApp = /* @__PURE__ */ __name(async (env, input2) => {
   );
 }, "invokeApp");
 
-// src/apps/rate-limit.ts
-var limiterAbsenceLogged = false;
-var rateLimited = /* @__PURE__ */ __name(async (env, key, binding = "BROKER_RATE_LIMITER") => {
-  const limiter = env[binding];
-  if (limiter === void 0) {
-    if (!limiterAbsenceLogged) {
-      limiterAbsenceLogged = true;
-      addSpanEvent("rate limiter binding is absent; limits are off", { level: "warn", attrs: { binding } });
-    }
-    return false;
-  }
-  const outcome = await limiter.limit({ key });
-  return !outcome.success;
-}, "rateLimited");
-
 // src/apps/broker.ts
 var MAX_RPC_DEPTH = 3;
 var BROKER_PATHS = ["/__qinto/push", "/__qinto/rpc"];
-var identityFields = {
-  // Derived, never a literal: the client stamps ENVELOPE_VERSION on every body, so a hardcoded
-  // number here silently 400s the whole channel the next time the envelope version moves.
-  v: external_exports.literal(ENVELOPE_VERSION),
-  slug: external_exports.string().min(1).max(30),
-  key: external_exports.string().min(1)
-};
 var pushBody = external_exports.object({
   ...identityFields,
   kind: external_exports.literal("push"),
@@ -27920,7 +27980,8 @@ var brokerBody = external_exports.discriminatedUnion("kind", [
   contextReadBody,
   contextWriteBody,
   factsReadBody,
-  identityReadBody
+  identityReadBody,
+  trackBody
 ]);
 var BODY_ENVELOPE_ALLOWANCE_BYTES = 2 * 1024;
 var MAX_BODY_BYTES = MAX_RPC_BYTES + BODY_ENVELOPE_ALLOWANCE_BYTES;
@@ -28307,6 +28368,9 @@ var handleBroker = /* @__PURE__ */ __name(async (request, env) => {
     case "identityRead": {
       return handleIdentityRead(env, body);
     }
+    case "track": {
+      return handleTrack(env, body);
+    }
   }
 }, "handleBroker");
 var brokerRoutes = new Hono2();
@@ -28749,6 +28813,7 @@ var requireScope = /* @__PURE__ */ __name((bit) => {
     if ((entry.mask & bit) === 0) {
       return c.json({ error: "forbidden" }, 403);
     }
+    c.set("actionSource", entry.app === null ? "api" : "app");
     return next();
   };
 }, "requireScope");
@@ -30027,9 +30092,141 @@ var defaultHook = /* @__PURE__ */ __name((result, c) => {
 }, "defaultHook");
 var createApiRouter = /* @__PURE__ */ __name(() => new OpenAPIHono({ defaultHook }), "createApiRouter");
 
+// src/id-graph/anon/connection.ts
+var CONNECTION_CF_HEADER = "x-connection-cf";
+var SESSION_HEADER = "x-session";
+var OPEN_PAGE_PARAMS = ["url", "referrer"];
+var MAX_HOST_USER_AGENT_LENGTH = 512;
+var MAX_HOST_LOCALE_LENGTH = 64;
+var INTERNAL_HEADERS = /* @__PURE__ */ new Set([
+  "x-user-id",
+  "x-new-user",
+  "x-geo",
+  SITE_ID_HEADER,
+  CONNECTION_CF_HEADER,
+  SESSION_HEADER,
+  TRACE_HEADER,
+  CF_DATA_HEADER
+]);
+var REDACTED_HEADERS = /* @__PURE__ */ new Set(["authorization"]);
+var encodeConnectionCf = /* @__PURE__ */ __name((cf) => {
+  if (cf === void 0) {
+    return void 0;
+  }
+  const encoded = headerJson(cf);
+  return encoded.length > MAX_ATTACHMENT_BYTES ? void 0 : encoded;
+}, "encodeConnectionCf");
+var forwardedCf = /* @__PURE__ */ __name((request) => {
+  const raw2 = request.headers.get(CONNECTION_CF_HEADER);
+  if (raw2 === null) {
+    return void 0;
+  }
+  return JSON.parse(raw2);
+}, "forwardedCf");
+var forwardedSession = /* @__PURE__ */ __name((request) => {
+  const raw2 = request.headers.get(SESSION_HEADER);
+  if (raw2 === null) {
+    return void 0;
+  }
+  return JSON.parse(raw2);
+}, "forwardedSession");
+var withoutPageParams = /* @__PURE__ */ __name((url2) => {
+  const parsed = new URL(url2);
+  for (const param of OPEN_PAGE_PARAMS) {
+    parsed.searchParams.delete(param);
+  }
+  return parsed.toString();
+}, "withoutPageParams");
+var connectPage = /* @__PURE__ */ __name((request) => {
+  const params = new URL(request.url).searchParams;
+  const url2 = params.get("url");
+  if (url2 === null) {
+    return void 0;
+  }
+  const referrer = params.get("referrer");
+  const parsed = pageContextField.safeParse({ url: url2, ...referrer === null ? {} : { referrer } });
+  return parsed.success ? parsed.data : void 0;
+}, "connectPage");
+var connectAttrs = /* @__PURE__ */ __name((request, geo) => {
+  const headers = {};
+  for (const [name, value] of request.headers) {
+    const lower = name.toLowerCase();
+    if (!INTERNAL_HEADERS.has(lower) && !REDACTED_HEADERS.has(lower)) {
+      headers[name] = value;
+    }
+  }
+  const cf = forwardedCf(request);
+  return {
+    "url.full": withoutPageParams(request.url),
+    "http.request.headers": JSON.stringify(headers),
+    ...cf === void 0 ? {} : { "qinto.cf": JSON.stringify(cf) },
+    ...geo === void 0 ? {} : { "qinto.geo": JSON.stringify(loggableGeo(geo)) }
+  };
+}, "connectAttrs");
+var withoutQuery = /* @__PURE__ */ __name((url2) => {
+  const parsed = new URL(url2);
+  parsed.search = "";
+  return parsed.toString();
+}, "withoutQuery");
+var browserGeoFrom = /* @__PURE__ */ __name((geo) => {
+  if (geo === void 0) {
+    return void 0;
+  }
+  return {
+    country: geo.country ?? null,
+    // EdgeTag's geoRegion is Cloudflare's subdivision code.
+    region: geo.regionCode ?? null,
+    state: geo.region ?? null,
+    isEU: geo.isEUCountry === "yes"
+  };
+}, "browserGeoFrom");
+var attachmentFieldBytes = /* @__PURE__ */ __name((name, value) => {
+  return value === void 0 ? 0 : new TextEncoder().encode(`,"${name}":${JSON.stringify(value)}`).length;
+}, "attachmentFieldBytes");
+var boundedHost = /* @__PURE__ */ __name((request) => {
+  const raw2 = hostFromRequest(request);
+  const bounded = {
+    ip: raw2.ip,
+    userAgent: raw2.userAgent !== void 0 && raw2.userAgent.length <= MAX_HOST_USER_AGENT_LENGTH ? raw2.userAgent : void 0,
+    locale: raw2.locale !== void 0 && raw2.locale.length <= MAX_HOST_LOCALE_LENGTH ? raw2.locale : void 0
+  };
+  return bounded.ip === void 0 && bounded.userAgent === void 0 && bounded.locale === void 0 ? void 0 : bounded;
+}, "boundedHost");
+var connectionAttachment = /* @__PURE__ */ __name((request, geo, siteId) => {
+  const userAgent = request.headers.get("user-agent");
+  const attrs = {
+    "url.full": withoutQuery(request.url),
+    ...geo?.country === void 0 ? {} : { "qinto.country": geo.country },
+    ...geo?.city === void 0 ? {} : { "qinto.city": geo.city },
+    ...userAgent === null ? {} : { user_agent: userAgent }
+  };
+  const host = boundedHost(request);
+  const hostBytes = attachmentFieldBytes("host", host);
+  const browserGeo = browserGeoFrom(geo);
+  const browserGeoBytes = attachmentFieldBytes("browserGeo", browserGeo);
+  const session2 = forwardedSession(request);
+  const sessionBytes = attachmentFieldBytes("session", session2);
+  const siteBytes = attachmentFieldBytes("siteId", siteId);
+  const cf = forwardedCf(request);
+  const cfSuffix = cf === void 0 ? "" : `,"cf":${JSON.stringify(cf)}`;
+  const cfBytes = new TextEncoder().encode(cfSuffix).length;
+  const emptyAttrsBytes = new TextEncoder().encode(JSON.stringify({ attrs: {} })).length;
+  const fixedBytes = siteBytes + sessionBytes + hostBytes + browserGeoBytes;
+  const includedCf = cfBytes <= MAX_ATTACHMENT_BYTES - emptyAttrsBytes - fixedBytes ? cf : void 0;
+  const budgeted = budgetAttrs(attrs, MAX_ATTACHMENT_BYTES - fixedBytes - (includedCf === void 0 ? 0 : cfBytes));
+  return {
+    ...budgeted,
+    siteId,
+    ...session2 === void 0 ? {} : { session: session2 },
+    ...browserGeo === void 0 ? {} : { browserGeo },
+    ...includedCf === void 0 ? {} : { cf: includedCf },
+    ...host === void 0 ? {} : { host }
+  };
+}, "connectionAttachment");
+
 // src/helpers/request-span.ts
 var OMITTED_HEADERS = /* @__PURE__ */ new Set(["authorization", DISPATCH_HEADER, CF_DATA_HEADER]);
-var requestAttrs = /* @__PURE__ */ __name((request) => {
+var requestAttrs = /* @__PURE__ */ __name((request, pathname) => {
   const headers = {};
   for (const [name, value] of request.headers) {
     if (!OMITTED_HEADERS.has(name.toLowerCase())) {
@@ -30039,7 +30236,7 @@ var requestAttrs = /* @__PURE__ */ __name((request) => {
   const cf = request.cf;
   return {
     "http.request.method": request.method,
-    "url.full": request.url,
+    "url.full": pathname === "/open" ? withoutPageParams(request.url) : request.url,
     "http.request.headers": JSON.stringify(headers),
     ...cf === void 0 ? {} : { "qinto.cf": JSON.stringify(cf) }
   };
@@ -30054,7 +30251,7 @@ var requestSpan = /* @__PURE__ */ __name(async (c, next) => {
   const pathname = new URL(c.req.url).pathname;
   const dispatch = parseDispatchTrace(c.req.raw.headers.get(DISPATCH_HEADER));
   const trace = dispatch === void 0 ? inboundTrace(c.req.raw, pathname) : { traceId: dispatch.traceId, parent: dispatch.spanId };
-  await runInvocation({ name: `${c.req.method} ${pathname}`, trace, attrs: requestAttrs(c.req.raw) }, async () => {
+  await runInvocation({ name: `${c.req.method} ${pathname}`, trace, attrs: requestAttrs(c.req.raw, pathname) }, async () => {
     try {
       await next();
       setSpanAttributes({ "http.response.status_code": c.res.status });
@@ -30261,120 +30458,6 @@ idGraphInspect.post("/internal/id-graph/rows", async (c) => {
   return c.json({ page: await inspectObjectTable(c.env, body) });
 });
 
-// src/id-graph/anon/connection.ts
-var CONNECTION_CF_HEADER = "x-connection-cf";
-var SESSION_HEADER = "x-session";
-var MAX_HOST_USER_AGENT_LENGTH = 512;
-var MAX_HOST_LOCALE_LENGTH = 64;
-var INTERNAL_HEADERS = /* @__PURE__ */ new Set([
-  "x-user-id",
-  "x-new-user",
-  "x-geo",
-  SITE_ID_HEADER,
-  CONNECTION_CF_HEADER,
-  SESSION_HEADER,
-  TRACE_HEADER,
-  CF_DATA_HEADER
-]);
-var REDACTED_HEADERS = /* @__PURE__ */ new Set(["authorization"]);
-var encodeConnectionCf = /* @__PURE__ */ __name((cf) => {
-  if (cf === void 0) {
-    return void 0;
-  }
-  const encoded = headerJson(cf);
-  return encoded.length > MAX_ATTACHMENT_BYTES ? void 0 : encoded;
-}, "encodeConnectionCf");
-var forwardedCf = /* @__PURE__ */ __name((request) => {
-  const raw2 = request.headers.get(CONNECTION_CF_HEADER);
-  if (raw2 === null) {
-    return void 0;
-  }
-  return JSON.parse(raw2);
-}, "forwardedCf");
-var forwardedSession = /* @__PURE__ */ __name((request) => {
-  const raw2 = request.headers.get(SESSION_HEADER);
-  if (raw2 === null) {
-    return void 0;
-  }
-  return JSON.parse(raw2);
-}, "forwardedSession");
-var connectAttrs = /* @__PURE__ */ __name((request, geo) => {
-  const headers = {};
-  for (const [name, value] of request.headers) {
-    const lower = name.toLowerCase();
-    if (!INTERNAL_HEADERS.has(lower) && !REDACTED_HEADERS.has(lower)) {
-      headers[name] = value;
-    }
-  }
-  const cf = forwardedCf(request);
-  return {
-    "url.full": request.url,
-    "http.request.headers": JSON.stringify(headers),
-    ...cf === void 0 ? {} : { "qinto.cf": JSON.stringify(cf) },
-    ...geo === void 0 ? {} : { "qinto.geo": JSON.stringify(loggableGeo(geo)) }
-  };
-}, "connectAttrs");
-var withoutQuery = /* @__PURE__ */ __name((url2) => {
-  const parsed = new URL(url2);
-  parsed.search = "";
-  return parsed.toString();
-}, "withoutQuery");
-var browserGeoFrom = /* @__PURE__ */ __name((geo) => {
-  if (geo === void 0) {
-    return void 0;
-  }
-  return {
-    country: geo.country ?? null,
-    // EdgeTag's geoRegion is Cloudflare's subdivision code.
-    region: geo.regionCode ?? null,
-    state: geo.region ?? null,
-    isEU: geo.isEUCountry === "yes"
-  };
-}, "browserGeoFrom");
-var attachmentFieldBytes = /* @__PURE__ */ __name((name, value) => {
-  return value === void 0 ? 0 : new TextEncoder().encode(`,"${name}":${JSON.stringify(value)}`).length;
-}, "attachmentFieldBytes");
-var boundedHost = /* @__PURE__ */ __name((request) => {
-  const raw2 = hostFromRequest(request);
-  const bounded = {
-    ip: raw2.ip,
-    userAgent: raw2.userAgent !== void 0 && raw2.userAgent.length <= MAX_HOST_USER_AGENT_LENGTH ? raw2.userAgent : void 0,
-    locale: raw2.locale !== void 0 && raw2.locale.length <= MAX_HOST_LOCALE_LENGTH ? raw2.locale : void 0
-  };
-  return bounded.ip === void 0 && bounded.userAgent === void 0 && bounded.locale === void 0 ? void 0 : bounded;
-}, "boundedHost");
-var connectionAttachment = /* @__PURE__ */ __name((request, geo, siteId) => {
-  const userAgent = request.headers.get("user-agent");
-  const attrs = {
-    "url.full": withoutQuery(request.url),
-    ...geo?.country === void 0 ? {} : { "qinto.country": geo.country },
-    ...geo?.city === void 0 ? {} : { "qinto.city": geo.city },
-    ...userAgent === null ? {} : { user_agent: userAgent }
-  };
-  const host = boundedHost(request);
-  const hostBytes = attachmentFieldBytes("host", host);
-  const browserGeo = browserGeoFrom(geo);
-  const browserGeoBytes = attachmentFieldBytes("browserGeo", browserGeo);
-  const session2 = forwardedSession(request);
-  const sessionBytes = attachmentFieldBytes("session", session2);
-  const siteBytes = attachmentFieldBytes("siteId", siteId);
-  const cf = forwardedCf(request);
-  const cfSuffix = cf === void 0 ? "" : `,"cf":${JSON.stringify(cf)}`;
-  const cfBytes = new TextEncoder().encode(cfSuffix).length;
-  const emptyAttrsBytes = new TextEncoder().encode(JSON.stringify({ attrs: {} })).length;
-  const fixedBytes = siteBytes + sessionBytes + hostBytes + browserGeoBytes;
-  const includedCf = cfBytes <= MAX_ATTACHMENT_BYTES - emptyAttrsBytes - fixedBytes ? cf : void 0;
-  const budgeted = budgetAttrs(attrs, MAX_ATTACHMENT_BYTES - fixedBytes - (includedCf === void 0 ? 0 : cfBytes));
-  return {
-    ...budgeted,
-    siteId,
-    ...session2 === void 0 ? {} : { session: session2 },
-    ...browserGeo === void 0 ? {} : { browserGeo },
-    ...includedCf === void 0 ? {} : { cf: includedCf },
-    ...host === void 0 ? {} : { host }
-  };
-}, "connectionAttachment");
-
 // src/paths/open.ts
 var withSetCookie = /* @__PURE__ */ __name((res, cookies) => {
   if (res.webSocket) {
@@ -30599,7 +30682,12 @@ var definition2 = createRoute({
 });
 var alias = createApiRouter().openapi(definition2, async (c) => {
   const body = c.req.valid("json");
-  const id = await submitAction(c.env, body.identifier, { type: "alias", payload: { alias: body.alias } }, c.req.raw);
+  const id = await submitAction(
+    c.env,
+    body.identifier,
+    { type: "alias", source: c.get("actionSource"), payload: { alias: body.alias } },
+    c.req.raw
+  );
   return respond(c, acceptedResponse, { ok: true, id });
 });
 
@@ -30701,7 +30789,7 @@ var consent = createApiRouter().openapi(definition4, async (c) => {
   const id = await submitAction(
     c.env,
     identifier,
-    { type: "consent", payload: { categories: categories ?? {}, apps: apps ?? {} }, context },
+    { type: "consent", source: c.get("actionSource"), payload: { categories: categories ?? {}, apps: apps ?? {} }, context },
     c.req.raw
   );
   return respond(c, acceptedResponse, { ok: true, id });
@@ -30800,7 +30888,12 @@ var definition6 = createRoute({
 });
 var identify = createApiRouter().openapi(definition6, async (c) => {
   const { identifier, traits, context } = c.req.valid("json");
-  const id = await submitAction(c.env, identifier, { type: "identify", payload: { traits: traits ?? {} }, context }, c.req.raw);
+  const id = await submitAction(
+    c.env,
+    identifier,
+    { type: "identify", source: c.get("actionSource"), payload: { traits: traits ?? {} }, context },
+    c.req.raw
+  );
   return respond(c, acceptedResponse, { ok: true, id });
 });
 
@@ -30950,7 +31043,7 @@ var session = createApiRouter().openapi(definition9, async (c) => {
 });
 
 // src/paths/v1/track.ts
-var trackBody = external_exports.object({
+var trackBody2 = external_exports.object({
   identifier: identifierField2,
   event: external_exports.string().min(1).openapi({
     description: "Name of the event the user performed.",
@@ -30982,7 +31075,7 @@ var definition10 = createRoute({
     body: {
       required: true,
       description: "The event to record.",
-      content: { "application/json": { schema: trackBody } }
+      content: { "application/json": { schema: trackBody2 } }
     }
   },
   responses: {
@@ -30999,7 +31092,7 @@ var track = createApiRouter().openapi(definition10, async (c) => {
     const id = await submitAction(
       c.env,
       identifier,
-      { type: "track", payload: { event, eventId, properties: properties2 ?? {} }, context },
+      { type: "track", source: c.get("actionSource"), payload: { event, eventId, properties: properties2 ?? {} }, context },
       c.req.raw
     );
     return respond(c, acceptedResponse, { ok: true, id });
@@ -31111,6 +31204,13 @@ var FanOut = class extends WorkerEntrypoint2 {
 // src/apps/storage-link-site.ts
 import { WorkerEntrypoint as WorkerEntrypoint3 } from "cloudflare:workers";
 
+// src/apps/action-source.ts
+var LEGACY_SOURCES = { ws: "website", http: "api" };
+var withCurrentSource = /* @__PURE__ */ __name((action) => {
+  const current = LEGACY_SOURCES[action.source];
+  return current === void 0 ? action : { ...action, source: current };
+}, "withCurrentSource");
+
 // src/apps/transform.ts
 var TRANSFORM_TIMEOUT_MS = 500;
 var TRANSFORM_CHAIN_BUDGET_MS = 1e3;
@@ -31312,10 +31412,11 @@ var StorageLinkSite = class extends WorkerEntrypoint3 {
     __name(this, "StorageLinkSite");
   }
   fanOut(job) {
-    runFanOut(this.env, this.ctx, job);
+    const trigger = job.trigger.kind === "event" ? { ...job.trigger, action: withCurrentSource(job.trigger.action) } : job.trigger;
+    runFanOut(this.env, this.ctx, { ...job, trigger });
   }
   transform(input2) {
-    return runTransformChain(this.env, { ...input2, dataPoints: createDataPointBudget() });
+    return runTransformChain(this.env, { ...input2, action: withCurrentSource(input2.action), dataPoints: createDataPointBudget() });
   }
   describe() {
     return describeSite(this.env);
@@ -31560,6 +31661,10 @@ var acceptedCaptures = /* @__PURE__ */ __name((registry3, consent2, apps, enforc
   }
   return accepted;
 }, "acceptedCaptures");
+var declaredTtlMs = /* @__PURE__ */ __name((registry3, appId, key) => {
+  const app2 = registry3.apps[appId];
+  return app2 === void 0 ? null : declaration(app2, key)?.ttlMs ?? null;
+}, "declaredTtlMs");
 
 // src/id-graph/kv-cache.ts
 var cachedKv = /* @__PURE__ */ __name((kv) => {
@@ -32199,7 +32304,7 @@ var updateGeo = /* @__PURE__ */ __name((storage, geo, observedAt) => {
     record2[key] = { value, observedAt };
     mutated = true;
     if (GEO_SERIES_KEY_SET.has(key)) {
-      insertFact(storage.sql, { ...projectionFact(entry.key), value: entry.value, source: "ws", observedAt: entry.observedAt });
+      insertFact(storage.sql, { ...projectionFact(entry.key), value: entry.value, source: "website", observedAt: entry.observedAt });
       appended.push(entry);
     }
   }
@@ -32484,7 +32589,7 @@ var MAX_BROWSER_RESULTS_BYTES = 32 * 1024;
 var MAX_FRAME_BYTES = 64 * 1024;
 var browserContextFrame = external_exports.object({
   occurredAt: external_exports.number().int().nonnegative().safe(),
-  page: external_exports.object({ url: external_exports.string().min(1).max(4096), referrer: external_exports.string().min(1).max(4096).optional() }).strict()
+  page: pageContextField
 }).strict();
 var browserResult = external_exports.unknown().refine((value) => {
   return new TextEncoder().encode(JSON.stringify(value)).length <= MAX_BROWSER_RESULT_BYTES;
@@ -32610,7 +32715,7 @@ var actionFromFrame = /* @__PURE__ */ __name((frame, userId, connection = {}) =>
         type: "identify",
         userId,
         identifier,
-        source: "ws",
+        source: "website",
         payload: { traits: frame.traits ?? {} },
         context: browserActionContext(frame.context, host, session2),
         browserResults: frame.appResults,
@@ -32622,7 +32727,7 @@ var actionFromFrame = /* @__PURE__ */ __name((frame, userId, connection = {}) =>
       return buildAction({
         type: "track",
         userId,
-        source: "ws",
+        source: "website",
         payload: { event: frame.event, eventId: frame.eventId, properties: frame.properties ?? {} },
         context: browserActionContext(frame.context, host, session2),
         browserResults: frame.appResults,
@@ -32631,13 +32736,13 @@ var actionFromFrame = /* @__PURE__ */ __name((frame, userId, connection = {}) =>
       });
     }
     case "alias": {
-      return buildAction({ type: "alias", userId, source: "ws", payload: { alias: frame.alias }, geo, host });
+      return buildAction({ type: "alias", userId, source: "website", payload: { alias: frame.alias }, geo, host });
     }
     case "consent": {
       return buildAction({
         type: "consent",
         userId,
-        source: "ws",
+        source: "website",
         payload: { categories: frame.categories ?? {}, apps: frame.apps ?? {} },
         context: browserActionContext(frame.context, host, session2),
         geo,
@@ -32716,8 +32821,14 @@ var AnonDO = class extends DurableObject2 {
       const attachment = connectionAttachment(request, geo, siteId);
       server.serializeAttachment(attachment);
       this.sendSharedContext([server], context);
+      const page = connectPage(request);
       this.appFanOut(
-        { kind: "connect", ...attachment.cf === void 0 ? {} : { geo: attachment.cf }, host: attachment.host },
+        {
+          kind: "connect",
+          ...attachment.cf === void 0 ? {} : { geo: attachment.cf },
+          host: attachment.host,
+          ...page === void 0 ? {} : { page }
+        },
         userId,
         context
       );
@@ -32918,7 +33029,11 @@ var AnonDO = class extends DurableObject2 {
         if (!appWriteAllowed(context.registry, consentState2(this.kv), input2.slug, context.consentEnforced)) {
           return;
         }
-        this.storeCaptures(input2.writes.map((write) => ({ ...write, appId: input2.slug, source: "app", ttlMs: null })));
+        this.storeCaptures(
+          input2.writes.map((write) => {
+            return { ...write, appId: input2.slug, source: "app", ttlMs: declaredTtlMs(context.registry, input2.slug, write.key) };
+          })
+        );
       });
     });
   }