mcp-scraper 0.73.4 → 0.73.6

package/CHANGELOG.md

@@ -4,6 +4,18 @@ All notable changes to MCP Scraper are documented here. The format is based on [
 
 ## [Unreleased]
 
+## [0.73.6] - 2026-08-28
+
+### Fixed
+
+- Linked retained pixel events and conversions to their sessions through keyed identifiers, restoring enhanced Journey page, event, acquisition, chronology, conversion, and revenue detail after a visitor becomes a known person.
+
+## [0.73.5] - 2026-08-28
+
+### Fixed
+
+- Promoted resolved visitor-reference journey details to person presentation, so deterministic identity resolution immediately unlocks the known-person label and authorized masked identity panel across the complete historical journey.
+
 ## [0.73.4] - 2026-08-28
 
 ### Fixed
@@ -1334,7 +1346,8 @@ All notable changes to MCP Scraper are documented here. The format is based on [
 - Write actions remain unavailable until the account owner explicitly enables them.
 - Provider-specific connection data is normalized into one agent-facing contract.
 
-[Unreleased]: https://github.com/VilovietaSEO/mcp-scraper/compare/v0.73.4...HEAD
+[Unreleased]: https://github.com/VilovietaSEO/mcp-scraper/compare/v0.73.5...HEAD
+[0.73.5]: https://github.com/VilovietaSEO/mcp-scraper/compare/v0.73.4...v0.73.5
 [0.73.4]: https://github.com/VilovietaSEO/mcp-scraper/compare/v0.73.3...v0.73.4
 [0.73.3]: https://github.com/VilovietaSEO/mcp-scraper/compare/v0.73.2...v0.73.3
 [0.73.2]: https://github.com/VilovietaSEO/mcp-scraper/compare/v0.73.1...v0.73.2

package/README.md

@@ -173,7 +173,7 @@ Build the branded one-click bundle:
 npm run build:mcpb
 ```
 
-The generated bundle is written to `build/mcpb/mcp-scraper-<version>.mcpb` and copied to `public/downloads/` for the hosted download. The current public bundle is `https://mcpscraper.dev/downloads/mcp-scraper.mcpb` (`0.73.4`, SHA-256 `f5edf036670debed712e2bbf421f45da59dc4aabee1ad505b8a5824de232f7ed`). Install it by opening or dragging it into Claude Desktop. Claude displays the `MCP Scraper` install card, icon, API-key configuration field, and manually curated current-release message from the bundle manifest.
+The generated bundle is written to `build/mcpb/mcp-scraper-<version>.mcpb` and copied to `public/downloads/` for the hosted download. The current public bundle is `https://mcpscraper.dev/downloads/mcp-scraper.mcpb` (`0.73.6`, SHA-256 `8998408725170b1d2a1998f15dd31d1fa6d32d27ae5fda53181557ebf80f3284`). Install it by opening or dragging it into Claude Desktop. Claude displays the `MCP Scraper` install card, icon, API-key configuration field, and manually curated current-release message from the bundle manifest.
 
 The MCPB install exposes every tool — web-intelligence plus all `browser_*` tools — through the one `mcp-scraper` server.
 

package/dist/{analytics-repository-7XYPQ2YJ.js → analytics-repository-22MAFYHS.js}

@@ -84,7 +84,7 @@ import {
   updateAnalyticsPixel,
   upsertAnalyticsAdSpend,
   upsertAnalyticsHostGroup
-} from "./chunk-M6XDENOO.js";
+} from "./chunk-52PVP5P2.js";
 import "./chunk-PJEEKOUM.js";
 import "./chunk-WEFPBAAG.js";
 export {

package/dist/bin/api-server.js

@@ -17,7 +17,7 @@ loadDotEnv();
 async function main() {
   const [{ serve }, { app }, { startWorker }, { migrate }] = await Promise.all([
     import("@hono/node-server"),
-    import("../server-YZJPP6CB.js"),
+    import("../server-6JEC3JHU.js"),
     import("../worker-CBK5DWEE.js"),
     import("../db-566MOHHD.js")
   ]);
@@ -25,7 +25,7 @@ async function main() {
   try {
     await migrate();
     if (process.env.ANALYTICS_DATABASE_URL) {
-      const { migrateAnalytics } = await import("../analytics-repository-7XYPQ2YJ.js");
+      const { migrateAnalytics } = await import("../analytics-repository-22MAFYHS.js");
       await migrateAnalytics();
     }
     startWorker();

package/dist/bin/mcp-scraper-cli.js

@@ -13,7 +13,7 @@ import "../chunk-VXLU74YZ.js";
 import "../chunk-GGZEC22A.js";
 import {
   PACKAGE_VERSION
-} from "../chunk-LHHUHX5N.js";
+} from "../chunk-4W4TIA3A.js";
 
 // src/cli/human-cli.ts
 import { Command } from "commander";

package/dist/bin/mcp-scraper-install.js

@@ -4,7 +4,7 @@ import {
 } from "../chunk-Q2J23DHY.js";
 import {
   PACKAGE_VERSION
-} from "../chunk-LHHUHX5N.js";
+} from "../chunk-4W4TIA3A.js";
 
 // bin/mcp-scraper-install.ts
 var noColor = process.argv.includes("--no-color") || process.env.NO_COLOR !== void 0 || process.env.FORCE_COLOR === "0" || !process.stdout.isTTY;

package/dist/bin/mcp-stdio-server.js

@@ -13,7 +13,7 @@ import {
   registerScheduledResultsMcpTools,
   registerSerpIntelligenceCaptureTools,
   resolveDeploymentProfile
-} from "../chunk-EC5X2SNZ.js";
+} from "../chunk-HCBQHUON.js";
 import "../chunk-PGJQDMC2.js";
 import "../chunk-T3MZISOF.js";
 import "../chunk-7RQULQF3.js";
@@ -26,7 +26,7 @@ import "../chunk-VXLU74YZ.js";
 import "../chunk-GGZEC22A.js";
 import {
   PACKAGE_VERSION
-} from "../chunk-LHHUHX5N.js";
+} from "../chunk-4W4TIA3A.js";
 import "../chunk-DNM65UCK.js";
 import "../chunk-EQJRPDUS.js";
 import "../chunk-WEFPBAAG.js";

package/dist/{chunk-LHHUHX5N.js → chunk-4W4TIA3A.js}

@@ -1,5 +1,5 @@
 // src/version.ts
-var PACKAGE_VERSION = "0.73.4";
+var PACKAGE_VERSION = "0.73.6";
 
 export {
   PACKAGE_VERSION

package/dist/{chunk-M6XDENOO.js → chunk-52PVP5P2.js}

@@ -946,6 +946,8 @@ async function migrateAnalytics() {
         hostname text NOT NULL,
         visitor_id text,
         session_id text,
+        visitor_hmac text,
+        session_hmac text,
         event_name text NOT NULL,
         occurred_at timestamptz NOT NULL,
         received_at timestamptz NOT NULL DEFAULT now(),
@@ -969,6 +971,7 @@ async function migrateAnalytics() {
         site_id uuid NOT NULL REFERENCES analytics_sites(id) ON DELETE CASCADE,
         pixel_id uuid REFERENCES analytics_pixels(id) ON DELETE SET NULL,
         session_id text,
+        session_hmac text,
         conversion_kind text NOT NULL,
         value_minor bigint NOT NULL DEFAULT 0,
         currency text NOT NULL DEFAULT 'USD',
@@ -1169,6 +1172,16 @@ async function migrateAnalytics() {
     await client.query(
       `ALTER TABLE analytics_events ADD COLUMN IF NOT EXISTS click_ids jsonb NOT NULL DEFAULT '{}'::jsonb`
     );
+    await client.query(
+      `ALTER TABLE analytics_events ADD COLUMN IF NOT EXISTS visitor_hmac text`
+    );
+    await client.query(
+      `ALTER TABLE analytics_events ADD COLUMN IF NOT EXISTS session_hmac text`
+    );
+    await client.query(
+      `ALTER TABLE analytics_conversions ADD COLUMN IF NOT EXISTS session_hmac text`
+    );
+    await backfillAnalyticsJourneyLinkageHmacs(client);
     await client.query(
       `ALTER TABLE analytics_form_submissions ADD COLUMN IF NOT EXISTS click_ids jsonb NOT NULL DEFAULT '{}'::jsonb`
     );
@@ -2472,6 +2485,15 @@ async function migrateAnalytics() {
     await client.query(
       "CREATE INDEX IF NOT EXISTS analytics_events_site_time ON analytics_events(site_id, occurred_at DESC)"
     );
+    await client.query(
+      "CREATE INDEX IF NOT EXISTS analytics_events_site_session_hmac_time ON analytics_events(site_id, session_hmac, occurred_at DESC)"
+    );
+    await client.query(
+      "CREATE INDEX IF NOT EXISTS analytics_events_site_visitor_hmac_time ON analytics_events(site_id, visitor_hmac, occurred_at DESC)"
+    );
+    await client.query(
+      "CREATE INDEX IF NOT EXISTS analytics_conversions_site_session_hmac_time ON analytics_conversions(site_id, session_hmac, occurred_at DESC)"
+    );
     await client.query(
       "CREATE INDEX IF NOT EXISTS analytics_events_pixel_time ON analytics_events(pixel_id, occurred_at DESC)"
     );
@@ -2603,7 +2625,7 @@ async function migrateAnalytics() {
     );
     await client.query(`
       INSERT INTO analytics_schema_migrations(version)
-      VALUES ('2026-08-05.1'), ('2026-08-05.2'), ('2026-08-05.3'), ('2026-08-05.4'), ('2026-08-05.5'), ('2026-08-05.6'), ('2026-08-05.7'), ('2026-08-05.8'), ('2026-08-05.9'), ('2026-08-05.10'), ('2026-08-05.11'), ('2026-08-05.12'), ('2026-08-05.13'), ('2026-08-05.14'), ('2026-08-26.1'), ('2026-08-26.2'), ('2026-08-26.3'), ('2026-08-26.4'), ('2026-08-27.1')
+      VALUES ('2026-08-05.1'), ('2026-08-05.2'), ('2026-08-05.3'), ('2026-08-05.4'), ('2026-08-05.5'), ('2026-08-05.6'), ('2026-08-05.7'), ('2026-08-05.8'), ('2026-08-05.9'), ('2026-08-05.10'), ('2026-08-05.11'), ('2026-08-05.12'), ('2026-08-05.13'), ('2026-08-05.14'), ('2026-08-26.1'), ('2026-08-26.2'), ('2026-08-26.3'), ('2026-08-26.4'), ('2026-08-27.1'), ('2026-08-28.1')
       ON CONFLICT (version) DO NOTHING
     `);
   } catch (error) {
@@ -3623,10 +3645,10 @@ async function ingestAnalyticsEvents(input) {
              occurred_at, path, canonical_url, title, referrer, source, medium, campaign,
              device_class, properties, country_code, region_code, click_ids, person_id,
              channel_family, platform, campaign_id, ad_set_id, ad_id, creative_id, placement, utm_term, utm_content,
-             engaged_ms, scroll_depth
+             engaged_ms, scroll_depth, visitor_hmac, session_hmac
            ) VALUES (
              $1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18::jsonb, $19, $20, $21::jsonb, $22,
-             $23, $24, $25, $26, $27, $28, $29, $30, $31, $32, $33
+             $23, $24, $25, $26, $27, $28, $29, $30, $31, $32, $33, $34, $35
            ) ON CONFLICT(site_id, event_id) DO NOTHING`,
           [
             randomUUID2(),
@@ -3661,7 +3683,9 @@ async function ingestAnalyticsEvents(input) {
             attribution.term,
             attribution.content,
             boundedEngagedMs(event.engagedMs),
-            boundedScrollDepth(event.scrollDepth)
+            boundedScrollDepth(event.scrollDepth),
+            event.visitorId ? identityHmac("visitor_id", event.visitorId) : null,
+            event.sessionId ? identityHmac("session_id", event.sessionId) : null
           ]
         );
         if (inserted.rowCount) {
@@ -3811,8 +3835,8 @@ async function createAnalyticsConversion(input) {
     const inserted = await client.query(
       `INSERT INTO analytics_conversions(
          id, source_event_id, site_id, pixel_id, session_id, conversion_kind,
-         value_minor, currency, occurred_at, person_id, order_id
-       ) VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11)
+         value_minor, currency, occurred_at, person_id, order_id, session_hmac
+       ) VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12)
        ON CONFLICT(site_id, source_event_id) DO NOTHING RETURNING id`,
       [
         proposedId,
@@ -3825,7 +3849,8 @@ async function createAnalyticsConversion(input) {
         (input.currency || "USD").toUpperCase(),
         input.occurredAt,
         resolvedPerson.rows[0]?.person_id ?? null,
-        input.orderId ?? null
+        input.orderId ?? null,
+        input.sessionId ? identityHmac("session_id", input.sessionId) : null
       ]
     );
     const created = Boolean(inserted.rowCount);
@@ -4807,6 +4832,54 @@ function sanitizeClickIds(value) {
 function identityHmac(kind, value) {
   return createHmac2("sha256", getSessionSecret()).update(`${kind}:${value.trim().toLowerCase()}`).digest("hex");
 }
+async function backfillAnalyticsJourneyLinkageHmacs(client) {
+  const batchSize = 500;
+  while (true) {
+    const events = await client.query(
+      `SELECT id, visitor_id, session_id
+         FROM analytics_events
+        WHERE (visitor_id IS NOT NULL AND visitor_hmac IS NULL)
+           OR (session_id IS NOT NULL AND session_hmac IS NULL)
+        ORDER BY id
+        LIMIT $1`,
+      [batchSize]
+    );
+    if (!events.rowCount) break;
+    await client.query(
+      `UPDATE analytics_events e
+          SET visitor_hmac = COALESCE(e.visitor_hmac, patch.visitor_hmac),
+              session_hmac = COALESCE(e.session_hmac, patch.session_hmac)
+         FROM unnest($1::uuid[], $2::text[], $3::text[]) AS patch(id, visitor_hmac, session_hmac)
+        WHERE e.id = patch.id`,
+      [
+        events.rows.map((row) => row.id),
+        events.rows.map((row) => row.visitor_id ? identityHmac("visitor_id", row.visitor_id) : null),
+        events.rows.map((row) => row.session_id ? identityHmac("session_id", row.session_id) : null)
+      ]
+    );
+  }
+  while (true) {
+    const conversions = await client.query(
+      `SELECT id, session_id
+         FROM analytics_conversions
+        WHERE session_id IS NOT NULL AND session_hmac IS NULL
+        ORDER BY id
+        LIMIT $1`,
+      [batchSize]
+    );
+    if (!conversions.rowCount) break;
+    await client.query(
+      `UPDATE analytics_conversions c
+          SET session_hmac = patch.session_hmac
+         FROM unnest($1::uuid[], $2::text[]) AS patch(id, session_hmac)
+        WHERE c.id = patch.id AND c.session_hmac IS NULL`,
+      [
+        conversions.rows.map((row) => row.id),
+        conversions.rows.map((row) => identityHmac("session_id", row.session_id))
+      ]
+    );
+  }
+}
 function newAnalyticsPersonPublicRef() {
   return `xrp_${randomBytes2(18).toString("base64url")}`;
 }

package/dist/{chunk-EC5X2SNZ.js → chunk-HCBQHUON.js}

@@ -32,7 +32,7 @@ import {
 } from "./chunk-VXLU74YZ.js";
 import {
   PACKAGE_VERSION
-} from "./chunk-LHHUHX5N.js";
+} from "./chunk-4W4TIA3A.js";
 import {
   createPrivateArtifact,
   privateArtifactOwnerId,

package/dist/{server-YZJPP6CB.js → server-6JEC3JHU.js}

@@ -153,7 +153,7 @@ import {
   upsertAnalyticsAdSpend,
   upsertAnalyticsHostGroup,
   verifyAnalyticsWebhookSignature
-} from "./chunk-M6XDENOO.js";
+} from "./chunk-52PVP5P2.js";
 import {
   claimServiceConnectionAction,
   ensureServiceConnectionsSchema,
@@ -280,7 +280,7 @@ import {
   resolveDeploymentProfile,
   resolveLocalSourcebookSchemaType,
   transcribeMediaUrl
-} from "./chunk-EC5X2SNZ.js";
+} from "./chunk-HCBQHUON.js";
 import {
   auditImageUrls,
   auditImages,
@@ -345,7 +345,7 @@ import {
 } from "./chunk-GGZEC22A.js";
 import {
   PACKAGE_VERSION
-} from "./chunk-LHHUHX5N.js";
+} from "./chunk-4W4TIA3A.js";
 import {
   SITE_EXTRACT_ARTIFACT_PREFIX,
   abandonExtractSettlement,
@@ -34575,17 +34575,17 @@ async function analyticsSessions(input, db = getAnalyticsPool()) {
         FROM analytics_sessions s
        WHERE s.site_id = $1
     ), facts AS (
-      SELECT DISTINCT ON (e.session_id)
-             e.session_id, e.country_code, e.region_code, e.device_class,
+      SELECT DISTINCT ON (e.session_hmac)
+             e.session_hmac, e.country_code, e.region_code, e.device_class,
              e.source, e.medium, e.campaign
         FROM analytics_events e
        WHERE e.site_id = $1
-       ORDER BY e.session_id, e.occurred_at
+       ORDER BY e.session_hmac, e.occurred_at
     ), conversions AS (
-      SELECT c.session_id, count(*)::int AS conversion_count,
+      SELECT c.session_hmac, count(*)::int AS conversion_count,
              sum(c.value_minor)::bigint AS revenue_minor,
              CASE WHEN count(DISTINCT c.currency) = 1 THEN min(c.currency) END AS currency
-        FROM analytics_conversions c WHERE c.site_id = $1 GROUP BY c.session_id
+        FROM analytics_conversions c WHERE c.site_id = $1 GROUP BY c.session_hmac
     )
     SELECT r.id AS internal_id, r.visitor_hmac, r.person_id, r.started_at, r.last_active_at,
            r.ended_at, r.duration_ms, r.landing_path, r.exit_path, r.pageview_count,
@@ -34593,8 +34593,8 @@ async function analyticsSessions(input, db = getAnalyticsPool()) {
            f.source, f.medium, f.campaign, COALESCE(c.conversion_count, 0)::int AS conversion_count,
            c.revenue_minor, c.currency
       FROM ranked r
-      LEFT JOIN facts f ON f.session_id = r.session_hmac
-      LEFT JOIN conversions c ON c.session_id = r.session_hmac
+      LEFT JOIN facts f ON f.session_hmac = r.session_hmac
+      LEFT JOIN conversions c ON c.session_hmac = r.session_hmac
      WHERE ($2::timestamptz IS NULL OR (r.started_at, r.id) < ($2::timestamptz, $3::uuid))
        AND ($4::boolean IS NULL OR (r.session_number > 1) = $4)
        AND ($5::boolean IS NULL OR (COALESCE(c.conversion_count, 0) > 0) = $5)
@@ -34602,7 +34602,7 @@ async function analyticsSessions(input, db = getAnalyticsPool()) {
        AND ($7::bigint IS NULL OR r.duration_ms <= $7)
        AND ($8::text IS NULL OR EXISTS (
          SELECT 1 FROM analytics_events ee
-          WHERE ee.site_id = $1 AND ee.session_id = r.session_hmac AND ee.event_name = $8
+          WHERE ee.site_id = $1 AND ee.session_hmac = r.session_hmac AND ee.event_name = $8
        ))
      ORDER BY r.started_at DESC, r.id DESC LIMIT $9`, [
     input.siteId,
@@ -34655,7 +34655,7 @@ async function analyticsVisitors(input, db = getAnalyticsPool()) {
              count(*)::int AS conversion_count, sum(c.value_minor)::bigint AS revenue_minor,
              CASE WHEN count(DISTINCT c.currency) = 1 THEN min(c.currency) END AS currency
         FROM analytics_conversions c
-        LEFT JOIN analytics_sessions s ON s.site_id=c.site_id AND s.session_hmac=c.session_id
+        LEFT JOIN analytics_sessions s ON s.site_id=c.site_id AND s.session_hmac=c.session_hmac
        WHERE c.site_id=$1 GROUP BY COALESCE(c.person_id::text, s.visitor_hmac)
     )
     SELECT v.*, COALESCE(c.conversion_count,0)::int AS conversion_count, c.revenue_minor, c.currency
@@ -34774,7 +34774,7 @@ async function analyticsSessionTimeline(input, db = getAnalyticsPool()) {
              e.event_name AS name, e.path, e.referrer, e.source, e.medium, e.campaign,
              NULL::bigint AS value_minor, NULL::text AS currency,
              'deterministic'::text AS evidence_class, 'pixel_event'::text AS provenance
-        FROM analytics_events e JOIN subject_sessions s ON s.session_hmac=e.session_id AND e.site_id=$1
+        FROM analytics_events e JOIN subject_sessions s ON s.session_hmac=e.session_hmac AND e.site_id=$1
       UNION ALL
       SELECT t.occurred_at, t.id::text, 'touch', COALESCE(t.touch_kind,'touch'), t.landing_path,
              t.referrer, t.source, t.medium, t.campaign, NULL, NULL, 'deterministic', 'attribution_touch'
@@ -34788,13 +34788,13 @@ async function analyticsSessionTimeline(input, db = getAnalyticsPool()) {
       SELECT c.occurred_at, c.id::text, 'conversion', c.conversion_kind, NULL, NULL, NULL, NULL, NULL,
              c.value_minor, c.currency, 'deterministic', COALESCE(c.value_source,'conversion')
         FROM analytics_conversions c
-       WHERE c.site_id=$1 AND (c.person_id=$2 OR c.session_id IN (SELECT session_hmac FROM subject_sessions))
+       WHERE c.site_id=$1 AND (c.person_id=$2 OR c.session_hmac IN (SELECT session_hmac FROM subject_sessions))
       UNION ALL
       SELECT e.occurred_at, ve.id::text, 'value', e.event_name, e.path, NULL, e.source, e.medium,
              e.campaign, ve.value_minor, ve.currency, 'deterministic', ve.value_source
         FROM analytics_event_value_evaluations ve
         JOIN analytics_events e ON e.id=ve.source_event_id AND e.site_id=ve.site_id
-        JOIN subject_sessions s ON s.session_hmac=e.session_id
+        JOIN subject_sessions s ON s.session_hmac=e.session_hmac
        WHERE ve.site_id=$1
       UNION ALL
       SELECT se.evaluated_at, se.id::text, 'score', sd.name, NULL, NULL, NULL, NULL, NULL,
@@ -34826,12 +34826,12 @@ async function analyticsSessionTimeline(input, db = getAnalyticsPool()) {
       WITH subject_sessions AS (${subjectSessionsSql}), ranged_sessions AS (
         SELECT * FROM subject_sessions WHERE started_at >= $5::timestamptz AND started_at < $6::timestamptz
       ), ranged_events AS (
-        SELECT e.* FROM analytics_events e JOIN subject_sessions s ON s.session_hmac=e.session_id
+        SELECT e.* FROM analytics_events e JOIN subject_sessions s ON s.session_hmac=e.session_hmac
          WHERE e.site_id=$1 AND e.occurred_at >= $5::timestamptz AND e.occurred_at < $6::timestamptz
       ), ranged_conversions AS (
         SELECT c.* FROM analytics_conversions c
          WHERE c.site_id=$1 AND c.occurred_at >= $5::timestamptz AND c.occurred_at < $6::timestamptz
-           AND (c.person_id=$2 OR c.session_id IN (SELECT session_hmac FROM subject_sessions))
+           AND (c.person_id=$2 OR c.session_hmac IN (SELECT session_hmac FROM subject_sessions))
       )
       SELECT (SELECT (array_agg(person_id ORDER BY started_at) FILTER (WHERE person_id IS NOT NULL))[1]::text FROM subject_sessions) AS resolved_person_id,
              (SELECT count(*)::int FROM ranged_sessions) AS sessions,
@@ -34845,13 +34845,13 @@ async function analyticsSessionTimeline(input, db = getAnalyticsPool()) {
     db.query(`/* analyticsEnhancedJourney:pages */
       WITH subject_sessions AS (${subjectSessionsSql}), pageviews AS (
         SELECT e.path, e.session_id, count(*)::int AS visits
-          FROM analytics_events e JOIN subject_sessions s ON s.session_hmac=e.session_id
+          FROM analytics_events e JOIN subject_sessions s ON s.session_hmac=e.session_hmac
          WHERE e.site_id=$1 AND e.event_name='page_view' AND e.path IS NOT NULL
            AND e.occurred_at >= $5::timestamptz AND e.occurred_at < $6::timestamptz
          GROUP BY e.path,e.session_id
       ), engagement AS (
         SELECT e.path, sum(e.engaged_ms)::bigint AS engaged_ms
-          FROM analytics_events e JOIN subject_sessions s ON s.session_hmac=e.session_id
+          FROM analytics_events e JOIN subject_sessions s ON s.session_hmac=e.session_hmac
          WHERE e.site_id=$1 AND e.event_name='page_engagement' AND e.path IS NOT NULL AND e.engaged_ms IS NOT NULL
            AND e.occurred_at >= $5::timestamptz AND e.occurred_at < $6::timestamptz GROUP BY e.path
       ), conversion_pages AS (
@@ -34862,7 +34862,7 @@ async function analyticsSessionTimeline(input, db = getAnalyticsPool()) {
              AND e.occurred_at <= c.occurred_at ORDER BY e.occurred_at DESC,e.id DESC LIMIT 1
         ) latest ON true
         WHERE c.site_id=$1 AND c.occurred_at >= $5::timestamptz AND c.occurred_at < $6::timestamptz
-          AND (c.person_id=$2 OR c.session_id IN (SELECT session_hmac FROM subject_sessions))
+          AND (c.person_id=$2 OR c.session_hmac IN (SELECT session_hmac FROM subject_sessions))
         GROUP BY latest.path
       )
       SELECT p.path,sum(p.visits)::int AS visits,count(*)::int AS unique_sessions,e.engaged_ms,
@@ -34871,27 +34871,27 @@ async function analyticsSessionTimeline(input, db = getAnalyticsPool()) {
        GROUP BY p.path,e.engaged_ms,c.conversions ORDER BY visits DESC,p.path LIMIT 20`, [...subjectValues]),
     db.query(`/* analyticsEnhancedJourney:acquisition */
       WITH subject_sessions AS (${subjectSessionsSql}), first_touch AS (
-        SELECT DISTINCT ON (e.session_id) e.session_id,e.source,e.medium,e.campaign,e.referrer
-          FROM analytics_events e JOIN subject_sessions s ON s.session_hmac=e.session_id
+        SELECT DISTINCT ON (e.session_hmac) e.session_hmac,e.source,e.medium,e.campaign,e.referrer
+          FROM analytics_events e JOIN subject_sessions s ON s.session_hmac=e.session_hmac
          WHERE e.site_id=$1 AND e.occurred_at >= $5::timestamptz AND e.occurred_at < $6::timestamptz
-         ORDER BY e.session_id,e.occurred_at,e.id
+         ORDER BY e.session_hmac,e.occurred_at,e.id
       ), event_counts AS (
-        SELECT e.session_id,count(*)::int AS events FROM analytics_events e JOIN subject_sessions s ON s.session_hmac=e.session_id
-         WHERE e.site_id=$1 AND e.occurred_at >= $5::timestamptz AND e.occurred_at < $6::timestamptz GROUP BY e.session_id
+        SELECT e.session_hmac,count(*)::int AS events FROM analytics_events e JOIN subject_sessions s ON s.session_hmac=e.session_hmac
+         WHERE e.site_id=$1 AND e.occurred_at >= $5::timestamptz AND e.occurred_at < $6::timestamptz GROUP BY e.session_hmac
       ), conversion_counts AS (
-        SELECT c.session_id,count(*)::int AS conversions FROM analytics_conversions c
+        SELECT c.session_hmac,count(*)::int AS conversions FROM analytics_conversions c
          WHERE c.site_id=$1 AND c.occurred_at >= $5::timestamptz AND c.occurred_at < $6::timestamptz
-           AND (c.person_id=$2 OR c.session_id IN (SELECT session_hmac FROM subject_sessions)) GROUP BY c.session_id
+           AND (c.person_id=$2 OR c.session_hmac IN (SELECT session_hmac FROM subject_sessions)) GROUP BY c.session_hmac
       )
       SELECT f.source,f.medium,f.campaign,f.referrer,count(*)::int AS sessions,
              sum(COALESCE(e.events,0))::int AS events,sum(COALESCE(c.conversions,0))::int AS conversions
-        FROM first_touch f LEFT JOIN event_counts e USING(session_id) LEFT JOIN conversion_counts c USING(session_id)
+        FROM first_touch f LEFT JOIN event_counts e USING(session_hmac) LEFT JOIN conversion_counts c USING(session_hmac)
        GROUP BY f.source,f.medium,f.campaign,f.referrer ORDER BY sessions DESC,f.source NULLS LAST LIMIT 20`, [...subjectValues]),
     db.query(`/* analyticsEnhancedJourney:events */
       WITH subject_sessions AS (${subjectSessionsSql}), event_groups AS (
         SELECT e.event_name AS name,count(*)::int AS count,count(DISTINCT e.session_id)::int AS unique_sessions,
                array_agg(DISTINCT e.session_id) AS session_ids
-          FROM analytics_events e JOIN subject_sessions s ON s.session_hmac=e.session_id
+          FROM analytics_events e JOIN subject_sessions s ON s.session_hmac=e.session_hmac
          WHERE e.site_id=$1 AND e.occurred_at >= $5::timestamptz AND e.occurred_at < $6::timestamptz
          GROUP BY e.event_name
       )
@@ -34904,25 +34904,25 @@ async function analyticsSessionTimeline(input, db = getAnalyticsPool()) {
       WITH subject_sessions AS (${subjectSessionsSql}), ranged_sessions AS (
         SELECT * FROM subject_sessions WHERE started_at >= $5::timestamptz AND started_at < $6::timestamptz
       ), event_stats AS (
-        SELECT e.session_id,count(*) FILTER (WHERE e.event_name='page_view')::int AS pageviews,count(*)::int AS events
-          FROM analytics_events e JOIN ranged_sessions s ON s.session_hmac=e.session_id
-         WHERE e.site_id=$1 AND e.occurred_at >= $5::timestamptz AND e.occurred_at < $6::timestamptz GROUP BY e.session_id
+        SELECT e.session_hmac,count(*) FILTER (WHERE e.event_name='page_view')::int AS pageviews,count(*)::int AS events
+          FROM analytics_events e JOIN ranged_sessions s ON s.session_hmac=e.session_hmac
+         WHERE e.site_id=$1 AND e.occurred_at >= $5::timestamptz AND e.occurred_at < $6::timestamptz GROUP BY e.session_hmac
       ), first_touch AS (
-        SELECT DISTINCT ON (e.session_id) e.session_id,e.source,e.medium,e.campaign,e.referrer
-          FROM analytics_events e JOIN ranged_sessions s ON s.session_hmac=e.session_id
-         WHERE e.site_id=$1 ORDER BY e.session_id,e.occurred_at,e.id
+        SELECT DISTINCT ON (e.session_hmac) e.session_hmac,e.source,e.medium,e.campaign,e.referrer
+          FROM analytics_events e JOIN ranged_sessions s ON s.session_hmac=e.session_hmac
+         WHERE e.site_id=$1 ORDER BY e.session_hmac,e.occurred_at,e.id
       ), conversion_stats AS (
-        SELECT c.session_id,count(*)::int AS conversions,sum(c.value_minor)::bigint AS revenue_minor,
+        SELECT c.session_hmac,count(*)::int AS conversions,sum(c.value_minor)::bigint AS revenue_minor,
                CASE WHEN count(DISTINCT c.currency)=1 THEN min(c.currency) END AS currency
-          FROM analytics_conversions c JOIN ranged_sessions s ON s.session_hmac=c.session_id
-         WHERE c.site_id=$1 AND c.occurred_at >= $5::timestamptz AND c.occurred_at < $6::timestamptz GROUP BY c.session_id
+          FROM analytics_conversions c JOIN ranged_sessions s ON s.session_hmac=c.session_hmac
+         WHERE c.site_id=$1 AND c.occurred_at >= $5::timestamptz AND c.occurred_at < $6::timestamptz GROUP BY c.session_hmac
       )
       SELECT s.id AS internal_id,s.started_at,s.ended_at,s.duration_ms,s.landing_path,s.exit_path,
              COALESCE(e.pageviews,0)::int AS pageviews,COALESCE(e.events,0)::int AS events,
              COALESCE(c.conversions,0)::int AS conversions,c.revenue_minor,c.currency,
              f.source,f.medium,f.campaign,f.referrer
-        FROM ranged_sessions s LEFT JOIN event_stats e ON e.session_id=s.session_hmac
-        LEFT JOIN first_touch f ON f.session_id=s.session_hmac LEFT JOIN conversion_stats c ON c.session_id=s.session_hmac
+        FROM ranged_sessions s LEFT JOIN event_stats e ON e.session_hmac=s.session_hmac
+        LEFT JOIN first_touch f ON f.session_hmac=s.session_hmac LEFT JOIN conversion_stats c ON c.session_hmac=s.session_hmac
        ORDER BY s.started_at DESC,s.id DESC LIMIT 50`, [...subjectValues])
   ]);
   const rows = result2.rows.map((row) => ({ ...row, _cursorAt: isoTimestamp(row.occurred_at), _cursorId: row.stable_id }));
@@ -34948,11 +34948,12 @@ async function analyticsSessionTimeline(input, db = getAnalyticsPool()) {
     total_engagement_ms: null,
     average_engagement_ms: null
   };
+  const resolvedPersonId = summary.resolved_person_id ?? subject.personId;
   return {
     subject: {
-      kind: subject.kind,
+      kind: resolvedPersonId ? "person" : subject.kind,
       reference: input.reference,
-      personRef: summary.resolved_person_id ? createAnalyticsReportReference("person", input.siteId, summary.resolved_person_id) : subject.personId ? createAnalyticsReportReference("person", input.siteId, subject.personId) : null
+      personRef: resolvedPersonId ? createAnalyticsReportReference("person", input.siteId, resolvedPersonId) : null
     },
     range: { ...range, fromInclusive: true, toExclusive: true },
     journeyTier: "confirmed",
@@ -35095,17 +35096,17 @@ async function analyticsBestGuessJourneys(input, db = getAnalyticsPool()) {
                  (SELECT count(*) FROM analytics_sessions s
                    WHERE s.site_id=ca.site_id AND s.visitor_hmac=inode.value_hmac)::int AS session_count,
                  (SELECT count(*) FROM analytics_events e JOIN analytics_sessions s
-                     ON s.site_id=e.site_id AND s.session_hmac=e.session_id
+                     ON s.site_id=e.site_id AND s.session_hmac=e.session_hmac
                    WHERE e.site_id=ca.site_id AND s.visitor_hmac=inode.value_hmac)::int AS event_count,
                  (SELECT count(*) FROM analytics_conversions c JOIN analytics_sessions s
-                     ON s.site_id=c.site_id AND s.session_hmac=c.session_id
+                     ON s.site_id=c.site_id AND s.session_hmac=c.session_hmac
                    WHERE c.site_id=ca.site_id AND s.visitor_hmac=inode.value_hmac)::int AS conversion_count,
                  (SELECT sum(c.value_minor) FROM analytics_conversions c JOIN analytics_sessions s
-                     ON s.site_id=c.site_id AND s.session_hmac=c.session_id
+                     ON s.site_id=c.site_id AND s.session_hmac=c.session_hmac
                    WHERE c.site_id=ca.site_id AND s.visitor_hmac=inode.value_hmac)::bigint AS revenue_minor,
                  (SELECT CASE WHEN count(DISTINCT c.currency)=1 THEN min(c.currency) END
                     FROM analytics_conversions c JOIN analytics_sessions s
-                      ON s.site_id=c.site_id AND s.session_hmac=c.session_id
+                      ON s.site_id=c.site_id AND s.session_hmac=c.session_hmac
                    WHERE c.site_id=ca.site_id AND s.visitor_hmac=inode.value_hmac) AS currency
             FROM analytics_identity_nodes inode
            WHERE inode.site_id=ca.site_id AND inode.namespace_id=ca.namespace_id
@@ -36368,8 +36369,8 @@ async function recordAnalyticsExternalEvent(input) {
         `INSERT INTO analytics_conversions(
            id, source_event_id, site_id, session_id, conversion_kind,
            value_minor, currency, occurred_at, person_id, rule_id, rule_version, order_id,
-           value_source, value_provenance
-         ) VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14::jsonb)
+           value_source, value_provenance, session_hmac
+         ) VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14::jsonb,$15)
          ON CONFLICT(site_id, source_event_id) DO NOTHING RETURNING id`,
         [
           conversionId,
@@ -36385,7 +36386,8 @@ async function recordAnalyticsExternalEvent(input) {
           rule.version,
           event2.orderId ?? null,
           valueSource,
-          JSON.stringify(resolvedValue.provenance)
+          JSON.stringify(resolvedValue.provenance),
+          event2.sessionId ? identityHmac("session_id", event2.sessionId) : null
         ]
       );
       if (!result2.rowCount) continue;
@@ -49411,8 +49413,8 @@ async function deleteAnalyticsPrivacySubject(input) {
       ["activationJobs", `DELETE FROM analytics_activation_jobs WHERE person_id=ANY($1::uuid[]) OR conversion_id IN (SELECT id FROM analytics_conversions WHERE site_id=$2 AND (person_id=ANY($1::uuid[]) OR session_id=ANY($3::text[])))`, [target.personIds, siteId, target.sessionHmacs]],
       ["externalEvents", `DELETE FROM analytics_external_events WHERE site_id=$1 AND (person_id=ANY($2::uuid[]) OR session_hmac=ANY($3::text[]) OR visitor_hmac=ANY($4::text[]))`, [siteId, target.personIds, target.sessionHmacs, target.visitorHmacs]],
       ["formSubmissions", `DELETE FROM analytics_form_submissions WHERE site_id=$1 AND (person_id=ANY($2::uuid[]) OR session_id=ANY($3::text[]) OR visitor_id=$4)`, [siteId, target.personIds, target.sessionHmacs, subject.ref]],
-      ["conversions", `DELETE FROM analytics_conversions WHERE site_id=$1 AND (person_id=ANY($2::uuid[]) OR session_id=ANY($3::text[]))`, [siteId, target.personIds, target.sessionHmacs]],
-      ["events", `DELETE FROM analytics_events WHERE site_id=$1 AND (person_id=ANY($2::uuid[]) OR session_id=ANY($3::text[]) OR visitor_id=ANY($4::text[]) OR visitor_id=$5)`, [siteId, target.personIds, target.sessionHmacs, target.visitorHmacs, subject.ref]],
+      ["conversions", `DELETE FROM analytics_conversions WHERE site_id=$1 AND (person_id=ANY($2::uuid[]) OR session_hmac=ANY($3::text[]))`, [siteId, target.personIds, target.sessionHmacs]],
+      ["events", `DELETE FROM analytics_events WHERE site_id=$1 AND (person_id=ANY($2::uuid[]) OR session_hmac=ANY($3::text[]) OR visitor_hmac=ANY($4::text[]) OR visitor_hmac=$5)`, [siteId, target.personIds, target.sessionHmacs, target.visitorHmacs, subject.ref]],
       ["touches", `DELETE FROM analytics_attribution_touches WHERE site_id=$1 AND (person_id=ANY($2::uuid[]) OR session_id=ANY($3::uuid[]) OR visitor_hmac=ANY($4::text[]))`, [siteId, target.personIds, target.sessionIds, target.visitorHmacs]],
       ["sessions", `DELETE FROM analytics_sessions WHERE site_id=$1 AND id=ANY($2::uuid[])`, [siteId, target.sessionIds]],
       ["linkers", `DELETE FROM analytics_linker_tokens WHERE site_id=$1 AND identity_node_id=ANY($2::uuid[])`, [siteId, target.identityNodeIds]],
@@ -49495,7 +49497,7 @@ async function applyAnalyticsPrivacyWithdrawal(input) {
       [siteId, target.personIds, now]
     ));
     affectedCounts.eventAdvertisingIds = count(await client2.query(
-      `UPDATE analytics_events SET click_ids='{}'::jsonb WHERE site_id=$1 AND (person_id=ANY($2::uuid[]) OR visitor_id=$3) AND click_ids <> '{}'::jsonb`,
+      `UPDATE analytics_events SET click_ids='{}'::jsonb WHERE site_id=$1 AND (person_id=ANY($2::uuid[]) OR visitor_hmac=$3) AND click_ids <> '{}'::jsonb`,
       [siteId, target.personIds, subject.ref]
     ));
     affectedCounts.touchAdvertisingIds = count(await client2.query(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mcp-scraper",
-  "version": "0.73.4",
+  "version": "0.73.6",
   "description": "MCP server for MCP Scraper web intelligence tools",
   "type": "module",
   "main": "./dist/index.cjs",