stitchkit 0.118.1 → 0.119.0

package/dist/entrypoints/react.js

@@ -1,6 +1,6 @@
 import {
   isAbortLikeError
-} from "../index-p6apg0jg.js";
+} from "../index-9frf01t9.js";
 import {
   ApiError2
 } from "../index-kfjkb396.js";

package/dist/entrypoints/remote.js

@@ -1,16 +1,17 @@
 import"../index-m38ej7e5.js";
 import"../index-h2fhjqy7.js";
-import"../index-p6apg0jg.js";
+import"../index-9frf01t9.js";
+import"../index-69t14s4a.js";
 import {
   endpointHasArguments,
   createClient2
-} from "../index-tsngj2b5.js";
+} from "../index-2dfvv1jg.js";
 import {
   ApiError2
 } from "../index-kfjkb396.js";
 import {
   contractMethodFields
-} from "../index-1bx1xv1k.js";
+} from "../index-pfvde2fz.js";
 import {
   AppError2,
   STITCH_ERROR_STATUS2

package/dist/entrypoints/server.js

@@ -1,6 +1,6 @@
 import"../index-2kbysk9s.js";
-import"../index-n8z3rvzw.js";
-import"../index-tdpmfks8.js";
+import"../index-f4njz9j0.js";
+import"../index-ynrf908v.js";
 import {
   errorCode2,
   normalizeError2
@@ -18,15 +18,16 @@ import {
   ShutdownStatusSchema2,
   ShutdownResultSchema2,
   createServerLifecycle
-} from "../index-q0th8q0z.js";
+} from "../index-9mjrnqxs.js";
+import"../index-69t14s4a.js";
 import {
   toJsonSchema,
   jsonSchemaFields
 } from "../index-ct75c3at.js";
 import"../index-3za04re9.js";
 import"../index-4s0fep5q.js";
-import"../index-d9hq291n.js";
-import"../index-9bwcthxw.js";
+import"../index-4jpykzvw.js";
+import"../index-yj6saztf.js";
 import"../index-xqhede6x.js";
 import {
   contextContributionDelta,
@@ -49,14 +50,14 @@ import {
   socketIoLane2,
   UnixClientTransportError2,
   createUnixClientTransport2
-} from "../index-p0rf7sq9.js";
+} from "../index-s20s2mad.js";
 import {
   createFileStateStore2
-} from "../index-75ns2ybj.js";
+} from "../index-fqd4yqwd.js";
 import {
   bindRealtimeServer2
 } from "../index-2bqf0a74.js";
-import"../index-nqxrm176.js";
+import"../index-g444vfz2.js";
 import {
   withDeadline
 } from "../index-9tqbxv5p.js";
@@ -74,7 +75,7 @@ import {
   implement2,
   createImplement2,
   createScopedImplement2
-} from "../index-cqmqyjax.js";
+} from "../index-sa99p98w.js";
 import {
   deriveCodeChallenge2
 } from "../index-ap3gqe56.js";
@@ -99,7 +100,7 @@ import {
   isWithinDir2,
   realPathWithinDir
 } from "../index-5cc6r990.js";
-import"../index-1bx1xv1k.js";
+import"../index-pfvde2fz.js";
 import {
   readBoundedChunks,
   concatChunks

package/dist/entrypoints/telegram.js

@@ -2,10 +2,10 @@ import {
   backoffDelay
 } from "../index-g6a3na27.js";
 import"../index-2kbysk9s.js";
-import"../index-n8z3rvzw.js";
+import"../index-f4njz9j0.js";
 import {
   attemptExclusiveLock
-} from "../index-tdpmfks8.js";
+} from "../index-ynrf908v.js";
 import {
   TELEGRAM_SEND_FAILURE_REASONS2,
   classifyTelegramSendFailure2

package/dist/entrypoints/testing.js

@@ -2,11 +2,11 @@ import {
   joinRoutePath
 } from "../index-m38ej7e5.js";
 import"../index-h2fhjqy7.js";
-import"../index-p6apg0jg.js";
-import"../index-q0th8q0z.js";
+import"../index-9frf01t9.js";
+import"../index-9mjrnqxs.js";
 import {
   createApplication2
-} from "../index-txg1npmg.js";
+} from "../index-cyxp8rbf.js";
 import"../index-w5s3xftz.js";
 import {
   RealtimeRequestTimeoutError2,
@@ -15,7 +15,8 @@ import {
 } from "../index-4s0fep5q.js";
 import {
   TOOL_TRANSPORTS2
-} from "../index-d9hq291n.js";
+} from "../index-69t14s4a.js";
+import"../index-4jpykzvw.js";
 import {
   RealtimeRejectDirectionSchema,
   RealtimeRejectPhaseSchema,
@@ -30,12 +31,12 @@ import {
   projectToolSurface,
   mcpProjectionCandidate,
   prepareProjectedMcpTools
-} from "../index-rhzkndr5.js";
+} from "../index-x4p3kw1p.js";
 import"../index-k42ckyzx.js";
 import {
   createClient2,
   createClients2
-} from "../index-tsngj2b5.js";
+} from "../index-2dfvv1jg.js";
 import {
   assertPositiveSafeInteger
 } from "../index-0s4xebbg.js";

package/dist/entrypoints/tools/connections.js

@@ -1,8 +1,9 @@
+import"../../index-69t14s4a.js";
 import"../../index-ct75c3at.js";
 import {
   declaresDraft07,
   withDraft2020Keywords
-} from "../../index-rhzkndr5.js";
+} from "../../index-x4p3kw1p.js";
 import"../../index-k42ckyzx.js";
 import {
   markJsonSchemaObjectGuards,
@@ -13,7 +14,7 @@ import {
 } from "../../index-9tqbxv5p.js";
 import {
   defineRuntimeTool2
-} from "../../index-ega3yz4c.js";
+} from "../../index-aqwg2dm5.js";
 import {
   TOOL_ERROR_PROJECTION
 } from "../../index-98hv3sba.js";

package/dist/entrypoints/tools/contract.js

@@ -6,7 +6,7 @@ import {
   ViewFileErrorSchema2,
   ViewFileOutputSchema2,
   ViewFileInputSchema2
-} from "../../index-0gxvns6s.js";
+} from "../../index-sba3e6m4.js";
 import {
   coerceJsonArgs2
 } from "../../index-rbzq0q16.js";

package/dist/entrypoints/tools/invoker.js

@@ -2,12 +2,13 @@ import"../../index-k42ckyzx.js";
 import"../../index-dsa676h8.js";
 import"../../index-rbzq0q16.js";
 import"../../index-ct75c3at.js";
-import"../../index-rhzkndr5.js";
-import"../../index-v6vb5qx8.js";
-import"../../index-htxh46ej.js";
+import"../../index-x4p3kw1p.js";
+import"../../index-s3yxw6kt.js";
+import"../../index-69t14s4a.js";
+import"../../index-ycqhyars.js";
 import {
   createToolInvoker2
-} from "../../index-vwhrnp67.js";
+} from "../../index-kz9734jc.js";
 export {
   createToolInvoker2 as createToolInvoker
 };

package/dist/entrypoints/tools/mcp.js

@@ -2,9 +2,10 @@ import"../../index-ct75c3at.js";
 import"../../index-k42ckyzx.js";
 import"../../index-dsa676h8.js";
 import"../../index-rbzq0q16.js";
-import"../../index-rhzkndr5.js";
-import"../../index-v6vb5qx8.js";
-import"../../index-htxh46ej.js";
+import"../../index-x4p3kw1p.js";
+import"../../index-s3yxw6kt.js";
+import"../../index-69t14s4a.js";
+import"../../index-ycqhyars.js";
 import {
   RESOURCE_MIME_TYPE2,
   EXT_APPS_BUNDLE_PLACEHOLDER2,
@@ -20,9 +21,9 @@ import {
   createMcpHttpRoute2,
   createStdioMcpServer2,
   bindStdioProcessSignals2
-} from "../../index-095ya5hm.js";
-import"../../index-86nbfysb.js";
-import"../../index-ega3yz4c.js";
+} from "../../index-bbvc59gw.js";
+import"../../index-ff39f9dr.js";
+import"../../index-aqwg2dm5.js";
 export {
   EXT_APPS_BUNDLE_PLACEHOLDER2 as EXT_APPS_BUNDLE_PLACEHOLDER,
   MCP_CATALOG_META_KEY2 as MCP_CATALOG_META_KEY,

package/dist/entrypoints/tools.js

@@ -21,25 +21,27 @@ import {
   findNonPortableFormats2,
   flattenToolJsonSchema2,
   findUntypedProperties2
-} from "../index-rhzkndr5.js";
+} from "../index-x4p3kw1p.js";
 import {
   ToolExecutionControlError2,
   isToolExecutionControlError2
-} from "../index-v6vb5qx8.js";
+} from "../index-s3yxw6kt.js";
+import {
+  ALL_TRANSPORTS2,
+  TOOL_TRANSPORTS2
+} from "../index-69t14s4a.js";
 import {
   collectTools2
-} from "../index-htxh46ej.js";
+} from "../index-ycqhyars.js";
 import {
   mountAgent2,
   describeToolCatalog2,
   buildToolManifest2
-} from "../index-6p3frkv5.js";
+} from "../index-6a69xzrx.js";
 import"../index-m38ej7e5.js";
 import {
-  ALL_TRANSPORTS2,
-  TOOL_TRANSPORTS2,
   defineContract2
-} from "../index-d9hq291n.js";
+} from "../index-4jpykzvw.js";
 import {
   PROTECTED_RESOURCE_PATH2,
   protectedResourceMetadataUrl2,
@@ -60,7 +62,7 @@ import {
   createMcpHttpRoute2,
   createStdioMcpServer2,
   bindStdioProcessSignals2
-} from "../index-095ya5hm.js";
+} from "../index-bbvc59gw.js";
 import {
   AsyncOperationCancelResultSchema2,
   createAsyncOperationSnapshotSchema2,
@@ -69,12 +71,12 @@ import {
   ViewFileErrorSchema2,
   ViewFileOutputSchema2,
   ViewFileInputSchema2
-} from "../index-0gxvns6s.js";
+} from "../index-sba3e6m4.js";
 import {
   WaitTimeoutError,
   runWaitOperation,
   createCli2
-} from "../index-w7jq3fz9.js";
+} from "../index-s0qjs6ee.js";
 import"../index-2kbysk9s.js";
 import {
   ManagedFilePathSchema2,
@@ -87,25 +89,25 @@ import {
 import {
   contractOnlyService,
   mediaTypeEssence
-} from "../index-cqmqyjax.js";
+} from "../index-sa99p98w.js";
 import {
   DEFAULT_CORS_ALLOW_HEADERS2
 } from "../index-yk4g8805.js";
 import {
   createToolInvoker2
-} from "../index-vwhrnp67.js";
+} from "../index-kz9734jc.js";
 import"../index-q968hy6y.js";
 import"../index-arjmb6de.js";
 import {
   collectToolSurface
-} from "../index-86nbfysb.js";
+} from "../index-ff39f9dr.js";
 import {
   getTraceId2
 } from "../index-r6v4mc67.js";
 import {
   defineRuntimeTool2,
   createRuntimeToolFactory2
-} from "../index-ega3yz4c.js";
+} from "../index-aqwg2dm5.js";
 import {
   ManagedFileError2
 } from "../index-364k2zwa.js";
@@ -114,7 +116,7 @@ import {
   fetchPinnedDocument,
   readCapped
 } from "../index-mgb7r8b8.js";
-import"../index-1bx1xv1k.js";
+import"../index-pfvde2fz.js";
 import {
   readBoundedChunks,
   concatChunks

package/dist/entrypoints/tracking/contract.js

@@ -1,7 +1,8 @@
 import"../../index-m38ej7e5.js";
+import"../../index-69t14s4a.js";
 import {
   defineContract2
-} from "../../index-d9hq291n.js";
+} from "../../index-4jpykzvw.js";
 
 // src/tracking/schemas.ts
 import { z } from "zod";
@@ -14,6 +15,7 @@ var UtmDataSchema = z.object({
 });
 var AttributionDataSchema = z.object({
   utm: UtmDataSchema.optional(),
+  clickId: z.string().min(1).max(200).optional(),
   referrer: z.string().optional(),
   landingPage: z.string().optional()
 });
@@ -57,6 +59,7 @@ function visitEntryContextShape(buildIdPattern) {
     landingPath: z.string().startsWith("/").max(300).regex(/^[^?#]*$/),
     referrer: z.url().max(2000).optional(),
     utm: UtmDataSchema.optional(),
+    clickId: AttributionDataSchema.shape.clickId,
     displayMode: z.enum(["browser", "standalone"]),
     screenWidth: z.number().int().positive().max(20000),
     screenHeight: z.number().int().positive().max(20000),
@@ -75,8 +78,7 @@ function createTrackingSchemas(config) {
     event,
     request: z.object({
       buildId: z.string().regex(buildIdPattern),
-      events: z.array(event).min(1).max(maxEvents),
-      utm: UtmDataSchema.optional()
+      events: z.array(event).min(1).max(maxEvents)
     }),
     response: TrackEventsResponseSchema,
     disposition: TrackingDispositionSchema,

package/dist/entrypoints/tracking/performance.js

@@ -2,9 +2,9 @@ import {
   DEFAULT_BOT_USER_AGENT_PATTERN2
 } from "../../index-1f40z584.js";
 import {
-  sendUnloadBeacon2,
-  redactTrackingText2
-} from "../../index-vv1sch8a.js";
+  redactTrackingText2,
+  sendUnloadBeacon2
+} from "../../index-8vzh5wpv.js";
 
 // src/tracking/performance/collector.ts
 var DEFAULT_EARLY_DELAY_MS = 5000;

package/dist/entrypoints/tracking.d.ts

@@ -8,7 +8,7 @@
  * `stitchkit/tracking/contract`, the server half `stitchkit/tracking/server`.
  * → ADR 0166, ADR 0280.
  */
-export { type AttributionStorage, parseReferrer, parseUtmFromSearch, type ReferrerRule, type ResolveAttributionInput, type ResolvedAttribution, resolveAttribution, } from '../tracking/attribution.js';
+export { type AttributionStorage, parseUtmFromSearch, type ResolveAttributionInput, type ResolvedAttribution, resolveAttribution, } from '../tracking/attribution.js';
 export { sendUnloadBeacon } from '../tracking/beacon.js';
 export { type ClickTarget, type ResolveTrackedClickOptions, resolveTrackedClick, type TrackedClick, type TrackedClickAttributes, } from '../tracking/clicks.js';
 export { type BuiltinTrackingEventTypes, CONVENTIONAL_TRACKING_EVENT_TYPES, createTrackingClient, type EventsWithMetadata, type EventsWithoutMetadata, type TrackFn, type TrackingClient, type TrackingClientConfig, } from '../tracking/client.js';

package/dist/entrypoints/tracking.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tracking.d.ts","sourceRoot":"","sources":["../../src/entrypoints/tracking.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,OAAO,EACL,KAAK,kBAAkB,EACvB,aAAa,EACb,kBAAkB,EAClB,KAAK,YAAY,EACjB,KAAK,uBAAuB,EAC5B,KAAK,mBAAmB,EACxB,kBAAkB,GACnB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EACL,KAAK,WAAW,EAChB,KAAK,0BAA0B,EAC/B,mBAAmB,EACnB,KAAK,YAAY,EACjB,KAAK,sBAAsB,GAC5B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,KAAK,yBAAyB,EAC9B,iCAAiC,EACjC,oBAAoB,EACpB,KAAK,kBAAkB,EACvB,KAAK,qBAAqB,EAC1B,KAAK,OAAO,EACZ,KAAK,cAAc,EACnB,KAAK,oBAAoB,GAC1B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,oBAAoB,EACpB,KAAK,uBAAuB,EAC5B,KAAK,uBAAuB,GAC7B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,mBAAmB,EACnB,KAAK,YAAY,EACjB,KAAK,mBAAmB,GACzB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,iBAAiB,EAAE,KAAK,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAChF,OAAO,EACL,oBAAoB,EACpB,KAAK,cAAc,EACnB,KAAK,oBAAoB,EACzB,KAAK,oBAAoB,EACzB,KAAK,kBAAkB,EACvB,KAAK,qBAAqB,EAC1B,KAAK,oBAAoB,EACzB,KAAK,qBAAqB,EAC1B,KAAK,mBAAmB,GACzB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAC9E,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AACxE,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC9E,OAAO,EACL,sBAAsB,EACtB,KAAK,gBAAgB,EACrB,kBAAkB,GACnB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,qBAAqB,EACrB,KAAK,eAAe,EACpB,KAAK,sBAAsB,GAC5B,MAAM,8BAA8B,CAAC;AACtC,OAAO,EACL,sBAAsB,EACtB,KAAK,gBAAgB,EACrB,KAAK,eAAe,EACpB,KAAK,gBAAgB,EACrB,KAAK,uBAAuB,GAC7B,MAAM,0BAA0B,CAAC"}
+{"version":3,"file":"tracking.d.ts","sourceRoot":"","sources":["../../src/entrypoints/tracking.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,OAAO,EACL,KAAK,kBAAkB,EACvB,kBAAkB,EAClB,KAAK,uBAAuB,EAC5B,KAAK,mBAAmB,EACxB,kBAAkB,GACnB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EACL,KAAK,WAAW,EAChB,KAAK,0BAA0B,EAC/B,mBAAmB,EACnB,KAAK,YAAY,EACjB,KAAK,sBAAsB,GAC5B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,KAAK,yBAAyB,EAC9B,iCAAiC,EACjC,oBAAoB,EACpB,KAAK,kBAAkB,EACvB,KAAK,qBAAqB,EAC1B,KAAK,OAAO,EACZ,KAAK,cAAc,EACnB,KAAK,oBAAoB,GAC1B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,oBAAoB,EACpB,KAAK,uBAAuB,EAC5B,KAAK,uBAAuB,GAC7B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,mBAAmB,EACnB,KAAK,YAAY,EACjB,KAAK,mBAAmB,GACzB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,iBAAiB,EAAE,KAAK,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAChF,OAAO,EACL,oBAAoB,EACpB,KAAK,cAAc,EACnB,KAAK,oBAAoB,EACzB,KAAK,oBAAoB,EACzB,KAAK,kBAAkB,EACvB,KAAK,qBAAqB,EAC1B,KAAK,oBAAoB,EACzB,KAAK,qBAAqB,EAC1B,KAAK,mBAAmB,GACzB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAC9E,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AACxE,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC9E,OAAO,EACL,sBAAsB,EACtB,KAAK,gBAAgB,EACrB,kBAAkB,GACnB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,qBAAqB,EACrB,KAAK,eAAe,EACpB,KAAK,sBAAsB,GAC5B,MAAM,8BAA8B,CAAC;AACtC,OAAO,EACL,sBAAsB,EACtB,KAAK,gBAAgB,EACrB,KAAK,eAAe,EACpB,KAAK,gBAAgB,EACrB,KAAK,uBAAuB,GAC7B,MAAM,0BAA0B,CAAC"}

package/dist/entrypoints/tracking.js

@@ -1,8 +1,9 @@
 import {
-  sendUnloadBeacon2,
   redactTrackingText2,
-  redactTrackingValue2
-} from "../index-vv1sch8a.js";
+  maskTrackingParameters,
+  redactTrackingValue2,
+  sendUnloadBeacon2
+} from "../index-8vzh5wpv.js";
 import {
   ApiError2
 } from "../index-kfjkb396.js";
@@ -27,49 +28,55 @@ function isStoredTouch(value) {
   if (!isRecord(value) || !Number.isFinite(value.capturedAt))
     return false;
   const { data } = value;
-  return isRecord(data) && isUtm(data.utm) && isOptionalText(data.referrer) && isOptionalText(data.landingPage);
+  return isRecord(data) && isUtm(data.utm) && (data.clickId === undefined || typeof data.clickId === "string" && data.clickId.length > 0 && data.clickId.length <= MAX_UTM_LENGTH) && isOptionalText(data.referrer) && isOptionalText(data.landingPage);
 }
 function isStoredAttribution(value) {
-  return isRecord(value) && isStoredTouch(value.firstTouch) && isStoredTouch(value.currentTouch);
+  return isRecord(value) && value.version === 1 && isStoredTouch(value.firstTouch);
 }
-function normalize(value) {
+function campaignValue(value) {
   if (!value)
     return;
-  return value.toLowerCase().trim().slice(0, 200) || undefined;
+  return redactTrackingText2(value).slice(0, MAX_UTM_LENGTH);
 }
 function parseUtmFromSearch(search) {
   const params = new URLSearchParams(search);
-  const source = normalize(params.get("utm_source"));
-  if (!source)
-    return null;
-  return {
+  const source = campaignValue(params.get("utm_source"));
+  const utm = {
     source,
-    medium: normalize(params.get("utm_medium")),
-    campaign: normalize(params.get("utm_campaign")),
-    content: normalize(params.get("utm_content")),
-    term: normalize(params.get("utm_term"))
+    medium: campaignValue(params.get("utm_medium")),
+    campaign: campaignValue(params.get("utm_campaign")),
+    content: campaignValue(params.get("utm_content")),
+    term: campaignValue(params.get("utm_term"))
   };
+  return Object.values(utm).some((value) => value !== undefined) ? utm : null;
 }
-function parseReferrer(referrer, currentHostname, referrerMap = []) {
-  if (!referrer)
-    return null;
-  try {
-    const hostname = new URL(referrer).hostname.toLowerCase();
-    if (hostname === currentHostname.toLowerCase())
-      return null;
-    const match = referrerMap.find((rule) => rule.pattern.test(hostname));
-    return match ? { source: match.source, medium: match.medium } : { source: hostname, medium: "referral" };
-  } catch {
-    return null;
+function assertClickIdParams(names) {
+  for (const name of names) {
+    if (typeof name !== "string" || name.length === 0 || name.length > MAX_UTM_LENGTH) {
+      throw new TypeError("clickIdParams names must contain 1–200 characters");
+    }
   }
 }
+function trackedReferrer(referrer, clickIdParams) {
+  return maskTrackingParameters(redactTrackingText2(referrer), new Set(clickIdParams));
+}
+function clickIdFromSearch(search, names) {
+  const params = new URLSearchParams(search);
+  return names.find((name) => params.getAll(name).some((value) => value.length > 0));
+}
+function isFresh(capturedAt, now, ttlMs) {
+  const age = now - capturedAt;
+  return age >= 0 && age <= ttlMs;
+}
 function readStored(storage, key, now, ttlMs) {
+  if (!storage)
+    return null;
   try {
     const raw = storage.getItem(key);
     if (!raw)
       return null;
     const parsed = JSON.parse(raw);
-    if (!isStoredAttribution(parsed) || now - parsed.firstTouch.capturedAt > ttlMs) {
+    if (!isStoredAttribution(parsed) || !isFresh(parsed.firstTouch.capturedAt, now, ttlMs)) {
       storage.removeItem(key);
       return null;
     }
@@ -79,6 +86,8 @@ function readStored(storage, key, now, ttlMs) {
   }
 }
 function writeStored(storage, key, value) {
+  if (!storage)
+    return;
   try {
     storage.setItem(key, JSON.stringify(value));
   } catch {}
@@ -87,47 +96,27 @@ function resolveAttribution({
   search,
   referrer,
   pathname,
-  hostname,
   storage,
-  referrerMap = [],
+  clickIdParams = [],
   storageKey = "tracking.attribution",
   ttlMs = 90 * 24 * 60 * 60 * 1000,
   now = Date.now()
 }) {
+  assertClickIdParams(clickIdParams);
   const stored = readStored(storage, storageKey, now, ttlMs);
-  const urlUtm = parseUtmFromSearch(search);
-  if (urlUtm) {
-    const currentTouch = {
-      utm: urlUtm,
-      referrer: referrer || undefined,
-      landingPage: pathname
-    };
-    const persisted = {
-      firstTouch: {
-        data: stored?.firstTouch.data ?? currentTouch,
-        capturedAt: stored?.firstTouch.capturedAt ?? now
-      },
-      currentTouch: { data: currentTouch, capturedAt: now }
-    };
-    writeStored(storage, storageKey, persisted);
-    return {
-      firstTouch: persisted.firstTouch.data,
-      currentTouch: persisted.currentTouch.data
-    };
-  }
-  if (stored)
-    return { firstTouch: stored.firstTouch.data, currentTouch: stored.currentTouch.data };
-  const fromReferrer = parseReferrer(referrer, hostname, referrerMap);
-  const firstTouch = {
-    utm: fromReferrer ? { source: fromReferrer.source, medium: fromReferrer.medium } : undefined,
-    referrer: referrer || undefined,
-    landingPage: pathname
+  const currentTouch = {
+    utm: parseUtmFromSearch(search) ?? undefined,
+    clickId: clickIdFromSearch(search, clickIdParams),
+    referrer: referrer ? trackedReferrer(referrer, clickIdParams) : undefined,
+    landingPage: redactTrackingText2(pathname)
   };
+  if (stored)
+    return { firstTouch: stored.firstTouch.data, currentTouch };
   writeStored(storage, storageKey, {
-    firstTouch: { data: firstTouch, capturedAt: now },
-    currentTouch: { data: firstTouch, capturedAt: now }
+    version: 1,
+    firstTouch: { data: currentTouch, capturedAt: now }
   });
-  return { firstTouch, currentTouch: firstTouch };
+  return { firstTouch: currentTouch, currentTouch };
 }
 // src/tracking/clicks.ts
 function label(target) {
@@ -359,9 +348,10 @@ function bootstrapTrackingVisit(deps, renew) {
         browserStreamId: visit.browserStreamId,
         previousVisitId: visit.visitId ?? undefined,
         origin: page.origin,
-        landingPath: redactTrackingText2(page.pathname),
-        referrer: page.referrer ? redactTrackingText2(page.referrer) : undefined,
-        utm: touch?.currentTouch.utm?.source ? redactedUtm(touch.currentTouch.utm) : undefined,
+        landingPath: touch.currentTouch.landingPage,
+        referrer: touch.currentTouch.referrer,
+        utm: touch.currentTouch.utm,
+        clickId: touch.currentTouch.clickId,
         displayMode: page.displayMode,
         screenWidth: page.screenWidth,
         screenHeight: page.screenHeight,
@@ -431,22 +421,18 @@ function createVisitSequences(outbox, visit, options, fail) {
     } : undefined
   });
 }
-function redactedUtm(utm) {
-  return Object.fromEntries(Object.entries(utm).map(([field, value]) => [field, redactTrackingText2(value)]));
-}
-function pageAttribution(host, storage, referrerMap, search, pathname) {
+function pageAttribution(host, clickIdParams, search, pathname) {
   const page = host.page();
   return resolveAttribution({
     search,
     pathname,
-    referrer: redactTrackingText2(page.referrer),
-    hostname: page.hostname,
-    storage,
-    referrerMap,
+    referrer: page.referrer,
+    storage: host.storage,
+    clickIdParams,
     now: host.wallClock()
   });
 }
-function pageViewDraft(host, type, pathname, previous) {
+function pageViewDraft(host, type, pathname, previous, clickIdParams) {
   const page = host.page();
   return {
     type,
@@ -455,7 +441,7 @@ function pageViewDraft(host, type, pathname, previous) {
       title: page.title,
       screenWidth: page.viewportWidth,
       screenHeight: page.viewportHeight,
-      referrer: previous || !page.referrer ? undefined : redactTrackingText2(page.referrer)
+      referrer: previous || !page.referrer ? undefined : trackedReferrer(page.referrer, clickIdParams ?? [])
     },
     clientTimestamp: host.wallClock()
   };
@@ -567,9 +553,6 @@ function chunk(items, size) {
 function unloadBeacon(unloadUrl) {
   return (request) => unloadUrl === undefined ? false : sendUnloadBeacon2(unloadUrl, JSON.stringify(request));
 }
-function currentUtmOf(attribution) {
-  return attribution?.currentTouch.utm?.source ? redactedUtm(attribution.currentTouch.utm) : undefined;
-}
 function trackingTimings(config) {
   if (typeof config.buildId !== "string" || config.buildId.length === 0) {
     throw new Error('[stitchkit] tracking client requires a buildId — a git SHA or "dev"');
@@ -584,6 +567,7 @@ function trackingTimings(config) {
 function createTrackingClient(config) {
   const { host, builtin, outbox } = config;
   const { heartbeatMs, renewAfterHiddenMs, pendingLimit, batchSize } = trackingTimings(config);
+  assertClickIdParams(config.clickIdParams ?? []);
   const fail = config.onFailure ?? (() => {
     return;
   });
@@ -604,13 +588,11 @@ function createTrackingClient(config) {
   const scroll = createScrollMilestones(config.scrollMilestones);
   const sequences = createVisitSequences(outbox, visit, config.sequence, fail);
   const captureAttribution = (search, pathname) => {
-    if (!host.storage)
-      return null;
-    attribution = pageAttribution(host, host.storage, config.referrerMap, search, pathname);
+    attribution = pageAttribution(host, config.clickIdParams, search, pathname);
     return attribution;
   };
   const bootstrapVisit = (renew = false) => bootstrapTrackingVisit({ visit, config, host, outbox, sequences, captureAttribution, fail }, renew);
-  const deliver = (events) => deliverTrackedEvents(config, { buildId: config.buildId, events, utm: currentUtmOf(attribution) }, fail);
+  const deliver = (events) => deliverTrackedEvents(config, { buildId: config.buildId, events }, fail);
   const flushOutbox = createOutboxFlusher({
     outbox,
     isAvailable: () => visit.outboxAvailable,
@@ -672,7 +654,7 @@ function createTrackingClient(config) {
       send([draft]);
       return;
     }
-    unload({ buildId: config.buildId, events: [event], utm: currentUtmOf(attribution) });
+    unload({ buildId: config.buildId, events: [event] });
     if (outbox && visit.outboxAvailable)
       outbox.enqueue(event).catch((error) => fail("unload event persistence", error));
   };
@@ -695,7 +677,7 @@ function createTrackingClient(config) {
     currentPage = pathname;
     meter.checkpoint();
     scroll.reset();
-    send([pageViewDraft(host, builtin.pageView, pathname, previous)]);
+    send([pageViewDraft(host, builtin.pageView, pathname, previous, config.clickIdParams)]);
   };
   const start = () => {
     const generation = ++running;
@@ -754,7 +736,6 @@ function browserTrackingHost() {
       pathname: window.location.pathname,
       search: window.location.search,
       origin: window.location.origin,
-      hostname: window.location.hostname,
       title: document.title,
       referrer: document.referrer,
       viewportWidth: window.innerWidth,
@@ -1032,7 +1013,6 @@ export {
   deliverTrackingBatch,
   indexedDbOutboxStorage,
   memoryOutboxStorage,
-  parseReferrer,
   parseUtmFromSearch,
   redactTrackingText2 as redactTrackingText,
   redactTrackingValue2 as redactTrackingValue,