npm - @ainyc/canonry - Versions diffs - 1.36.0 → 1.37.1 - Mend

@ainyc/canonry 1.36.0 → 1.37.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

package/assets/assets/{index-CborW-lk.css → index-CM92zXYn.css} +1 -1
package/assets/assets/index-Du9ZvTq9.js +281 -0
package/assets/index.html +2 -2
package/dist/{chunk-PZKK53EX.js → chunk-U2ZNKIWK.js} +176 -102
package/dist/cli.js +20 -8
package/dist/index.js +1 -1
package/package.json +7 -7
package/assets/assets/index-Du_w835k.js +0 -281

package/assets/index.html CHANGED Viewed

@@ -12,8 +12,8 @@
     <link rel="icon" type="image/png" sizes="32x32" href="./favicon-32.png" />
     <link rel="apple-touch-icon" href="./apple-touch-icon.png" />
     <title>Canonry</title>
-    <script type="module" crossorigin src="./assets/index-Du_w835k.js"></script>
-    <link rel="stylesheet" crossorigin href="./assets/index-CborW-lk.css">
+    <script type="module" crossorigin src="./assets/index-Du9ZvTq9.js"></script>
+    <link rel="stylesheet" crossorigin href="./assets/index-CM92zXYn.css">
   </head>
   <body>
     <div id="root"></div>

package/dist/{chunk-PZKK53EX.js → chunk-U2ZNKIWK.js} RENAMED Viewed

@@ -1055,11 +1055,13 @@ var ga4TrafficSnapshotDtoSchema = z11.object({
   organicSessions: z11.number(),
   users: z11.number()
 });
+var ga4SourceDimensionSchema = z11.enum(["session", "first_user", "manual_utm"]);
 var ga4AiReferralDtoSchema = z11.object({
   source: z11.string(),
   medium: z11.string(),
   sessions: z11.number(),
-  users: z11.number()
+  users: z11.number(),
+  sourceDimension: ga4SourceDimensionSchema
 });
 var ga4TrafficSummaryDtoSchema = z11.object({
   totalSessions: z11.number(),
@@ -1072,6 +1074,10 @@ var ga4TrafficSummaryDtoSchema = z11.object({
     users: z11.number()
   })),
   aiReferrals: z11.array(ga4AiReferralDtoSchema),
+  /** Deduped AI session total: MAX(sessions) per date+source+medium across attribution dimensions, then summed. */
+  aiSessionsDeduped: z11.number(),
+  /** Deduped AI user total: MAX(users) per date+source+medium across attribution dimensions, then summed. */
+  aiUsersDeduped: z11.number(),
   lastSyncedAt: z11.string().nullable()
 });
 var ga4AiReferralHistoryEntrySchema = z11.object({
@@ -1079,7 +1085,9 @@ var ga4AiReferralHistoryEntrySchema = z11.object({
   source: z11.string(),
   medium: z11.string(),
   sessions: z11.number(),
-  users: z11.number()
+  users: z11.number(),
+  /** Which GA4 dimension this row came from: session (sessionSource), first_user (firstUserSource), or manual_utm (utm_source parameter) */
+  sourceDimension: ga4SourceDimensionSchema
 });
 var ga4SessionHistoryEntrySchema = z11.object({
   date: z11.string(),
@@ -1487,13 +1495,15 @@ var gaAiReferrals = sqliteTable("ga_ai_referrals", {
   date: text("date").notNull(),
   source: text("source").notNull(),
   medium: text("medium").notNull(),
+  /** Which GA4 dimension produced this row: 'session' | 'first_user' | 'manual_utm' */
+  sourceDimension: text("source_dimension").notNull().default("session"),
   sessions: integer("sessions").notNull().default(0),
   users: integer("users").notNull().default(0),
   syncedAt: text("synced_at").notNull()
 }, (table) => [
   index("idx_ga_ai_ref_project_date").on(table.projectId, table.date),
   index("idx_ga_ai_ref_source").on(table.source),
-  uniqueIndex("idx_ga_ai_ref_unique").on(table.projectId, table.date, table.source, table.medium)
+  uniqueIndex("idx_ga_ai_ref_unique_v2").on(table.projectId, table.date, table.source, table.medium, table.sourceDimension)
 ]);
 var gaTrafficSummaries = sqliteTable("ga_traffic_summaries", {
   id: text("id").primaryKey(),
@@ -1860,7 +1870,13 @@ var MIGRATIONS = [
   `CREATE UNIQUE INDEX IF NOT EXISTS idx_schedules_project ON schedules(project_id)`,
   `CREATE UNIQUE INDEX IF NOT EXISTS idx_usage_scope_period_metric ON usage_counters(scope, period, metric)`,
   `ALTER TABLE projects ADD COLUMN config_source TEXT NOT NULL DEFAULT 'cli'`,
-  `ALTER TABLE projects ADD COLUMN config_revision INTEGER NOT NULL DEFAULT 1`
+  `ALTER TABLE projects ADD COLUMN config_revision INTEGER NOT NULL DEFAULT 1`,
+  // v20: Track which GA4 dimension produced each AI referral row
+  // Values: 'session' (sessionSource), 'first_user' (firstUserSource), 'manual_utm' (manualSource/utm_source)
+  `ALTER TABLE ga_ai_referrals ADD COLUMN source_dimension TEXT NOT NULL DEFAULT 'session'`,
+  // Replace old unique index with one that includes source_dimension
+  `DROP INDEX IF EXISTS idx_ga_ai_ref_unique`,
+  `CREATE UNIQUE INDEX IF NOT EXISTS idx_ga_ai_ref_unique_v2 ON ga_ai_referrals(project_id, date, source, medium, source_dimension)`
 ];
 function migrate(db) {
   const statements = MIGRATION_SQL.split(";").map((s) => s.trim()).filter((s) => s.length > 0);
@@ -6634,7 +6650,10 @@ var AI_REFERRAL_SOURCE_FILTERS = [
   { matchType: "CONTAINS", value: "openai" },
   { matchType: "CONTAINS", value: "claude" },
   { matchType: "CONTAINS", value: "anthropic" },
-  { matchType: "CONTAINS", value: "copilot" }
+  { matchType: "CONTAINS", value: "copilot" },
+  { matchType: "CONTAINS", value: "phind" },
+  { matchType: "EXACT", value: "you.com" },
+  { matchType: "CONTAINS", value: "meta.ai" }
 ];
 async function fetchTrafficByLandingPage(accessToken, propertyId, days) {
   const syncDays = Math.min(Math.max(1, days ?? GA4_DEFAULT_SYNC_DAYS), GA4_MAX_SYNC_DAYS);
@@ -6773,52 +6792,75 @@ async function fetchAiReferrals(accessToken, propertyId, days) {
   ga4Log("info", "fetch-ai-referrals.start", { propertyId, days: syncDays });
   const PAGE_SIZE = 1e3;
   const rows = [];
-  let offset = 0;
-  while (true) {
-    const request = {
-      dateRanges: [{ startDate: formatDate(startDate), endDate: formatDate(endDate) }],
-      dimensions: [
-        { name: "date" },
-        { name: "sessionSource" },
-        { name: "sessionMedium" }
-      ],
-      metrics: [
-        { name: "sessions" },
-        { name: "totalUsers" }
-      ],
-      dimensionFilter: {
-        orGroup: {
-          expressions: AI_REFERRAL_SOURCE_FILTERS.map(({ matchType, value }) => ({
-            filter: {
-              fieldName: "sessionSource",
-              stringFilter: { matchType, value }
-            }
-          }))
-        }
-      },
-      limit: PAGE_SIZE,
-      offset
-    };
-    const response = await runReport(accessToken, propertyId, request);
-    const pageRows = (response.rows ?? []).map((row) => ({
-      date: row.dimensionValues[0].value,
-      source: row.dimensionValues[1].value,
-      medium: row.dimensionValues[2].value,
-      sessions: parseInt(row.metricValues[0].value, 10) || 0,
-      users: parseInt(row.metricValues[1].value, 10) || 0
-    }));
-    rows.push(...pageRows);
-    const totalRows = response.rowCount ?? 0;
-    offset += pageRows.length;
-    if (pageRows.length < PAGE_SIZE || offset >= totalRows) break;
+  const dimensionPairs = [
+    ["sessionSource", "sessionMedium", "session"],
+    ["firstUserSource", "firstUserMedium", "first_user"],
+    ["manualSource", "manualMedium", "manual_utm"]
+  ];
+  for (const [sourceDim, mediumDim, dimLabel] of dimensionPairs) {
+    let offset = 0;
+    while (true) {
+      const request = {
+        dateRanges: [{ startDate: formatDate(startDate), endDate: formatDate(endDate) }],
+        dimensions: [
+          { name: "date" },
+          { name: sourceDim },
+          { name: mediumDim }
+        ],
+        metrics: [
+          { name: "sessions" },
+          { name: "totalUsers" }
+        ],
+        dimensionFilter: {
+          orGroup: {
+            expressions: AI_REFERRAL_SOURCE_FILTERS.map(({ matchType, value }) => ({
+              filter: {
+                fieldName: sourceDim,
+                stringFilter: { matchType, value }
+              }
+            }))
+          }
+        },
+        limit: PAGE_SIZE,
+        offset
+      };
+      const response = await runReport(accessToken, propertyId, request);
+      const pageRows = (response.rows ?? []).map((row) => ({
+        date: row.dimensionValues[0].value,
+        source: row.dimensionValues[1].value,
+        medium: row.dimensionValues[2].value,
+        sessions: parseInt(row.metricValues[0].value, 10) || 0,
+        users: parseInt(row.metricValues[1].value, 10) || 0,
+        sourceDimension: dimLabel
+      }));
+      rows.push(...pageRows);
+      const totalRows = response.rowCount ?? 0;
+      offset += pageRows.length;
+      if (pageRows.length < PAGE_SIZE || offset >= totalRows) break;
+    }
   }
+  const deduped = /* @__PURE__ */ new Map();
   for (const row of rows) {
+    const key = `${row.date}::${row.source}::${row.medium}::${row.sourceDimension}`;
+    const existing = deduped.get(key);
+    if (!existing) {
+      deduped.set(key, row);
+    } else {
+      deduped.set(key, {
+        ...existing,
+        sessions: Math.max(existing.sessions, row.sessions),
+        users: Math.max(existing.users, row.users)
+      });
+    }
+  }
+  const dedupedRows = [...deduped.values()];
+  for (const row of dedupedRows) {
     if (row.date.length === 8 && !row.date.includes("-")) {
       row.date = `${row.date.slice(0, 4)}-${row.date.slice(4, 6)}-${row.date.slice(6, 8)}`;
     }
   }
-  ga4Log("info", "fetch-ai-referrals.done", { propertyId, rowCount: rows.length });
-  return rows;
+  ga4Log("info", "fetch-ai-referrals.done", { propertyId, rowCount: dedupedRows.length });
+  return dedupedRows;
 }
 // ../api-routes/src/google.ts
@@ -8444,6 +8486,7 @@ async function ga4Routes(app, opts) {
             date: row.date,
             source: row.source,
             medium: row.medium,
+            sourceDimension: row.sourceDimension,
             sessions: row.sessions,
             users: row.users,
             syncedAt: now
@@ -8495,9 +8538,23 @@ async function ga4Routes(app, opts) {
     const aiReferrals = app.db.select({
       source: gaAiReferrals.source,
       medium: gaAiReferrals.medium,
+      sourceDimension: gaAiReferrals.sourceDimension,
       sessions: sql4`SUM(${gaAiReferrals.sessions})`,
       users: sql4`SUM(${gaAiReferrals.users})`
-    }).from(gaAiReferrals).where(eq16(gaAiReferrals.projectId, project.id)).groupBy(gaAiReferrals.source, gaAiReferrals.medium).orderBy(sql4`SUM(${gaAiReferrals.sessions}) DESC`).all();
+    }).from(gaAiReferrals).where(eq16(gaAiReferrals.projectId, project.id)).groupBy(gaAiReferrals.source, gaAiReferrals.medium, gaAiReferrals.sourceDimension).orderBy(sql4`SUM(${gaAiReferrals.sessions}) DESC`).all();
+    const aiDeduped = app.db.select({
+      sessions: sql4`SUM(max_sessions)`,
+      users: sql4`SUM(max_users)`
+    }).from(
+      sql4`(
+          SELECT date, source, medium,
+                 MAX(sessions) AS max_sessions,
+                 MAX(users) AS max_users
+          FROM ga_ai_referrals
+          WHERE project_id = ${project.id}
+          GROUP BY date, source, medium
+        )`
+    ).get();
     const latestSync = app.db.select({ syncedAt: gaTrafficSummaries.syncedAt }).from(gaTrafficSummaries).where(eq16(gaTrafficSummaries.projectId, project.id)).orderBy(desc6(gaTrafficSummaries.syncedAt)).limit(1).get();
     return {
       totalSessions: summary?.totalSessions ?? 0,
@@ -8512,9 +8569,12 @@ async function ga4Routes(app, opts) {
       aiReferrals: aiReferrals.map((r) => ({
         source: r.source,
         medium: r.medium,
+        sourceDimension: r.sourceDimension,
         sessions: r.sessions ?? 0,
         users: r.users ?? 0
       })),
+      aiSessionsDeduped: aiDeduped?.sessions ?? 0,
+      aiUsersDeduped: aiDeduped?.users ?? 0,
       lastSyncedAt: latestSync?.syncedAt ?? null
     };
   });
@@ -8525,6 +8585,7 @@ async function ga4Routes(app, opts) {
       date: gaAiReferrals.date,
       source: gaAiReferrals.source,
       medium: gaAiReferrals.medium,
+      sourceDimension: gaAiReferrals.sourceDimension,
       sessions: gaAiReferrals.sessions,
       users: gaAiReferrals.users
     }).from(gaAiReferrals).where(eq16(gaAiReferrals.projectId, project.id)).orderBy(gaAiReferrals.date).all();
@@ -10326,19 +10387,11 @@ async function apiRoutes(app, opts) {
 // ../provider-gemini/src/normalize.ts
 import { GoogleGenAI } from "@google/genai";
 var DEFAULT_MODEL = "gemini-3-flash";
-var VALIDATION_PATTERN = /^gemini-/;
 function isVertexConfig(config) {
   return !!config.vertexProject;
 }
 function resolveModel(config) {
-  const m = config.model;
-  if (!m) return DEFAULT_MODEL;
-  if (VALIDATION_PATTERN.test(m)) return m;
-  const backend = isVertexConfig(config) ? "Vertex AI" : "AI Studio";
-  console.warn(
-    `[provider-gemini] Invalid model name "${m}" \u2014 this provider uses the Gemini ${backend} API which only accepts "gemini-*" model names. Falling back to ${DEFAULT_MODEL}.`
-  );
-  return DEFAULT_MODEL;
+  return config.model || DEFAULT_MODEL;
 }
 function createClient2(config) {
   if (isVertexConfig(config)) {
@@ -10352,6 +10405,9 @@ function createClient2(config) {
   return new GoogleGenAI({ apiKey: config.apiKey });
 }
 function validateConfig(config) {
+  if ("vertexProject" in config && config.vertexProject !== void 0 && config.vertexProject.trim().length === 0) {
+    return { ok: false, provider: "gemini", message: "missing Vertex AI project ID" };
+  }
   if (isVertexConfig(config)) {
     const model2 = resolveModel(config);
     return {
@@ -10365,11 +10421,10 @@ function validateConfig(config) {
     return { ok: false, provider: "gemini", message: "missing api key" };
   }
   const model = resolveModel(config);
-  const warning = config.model && !VALIDATION_PATTERN.test(config.model) ? ` (invalid model "${config.model}" replaced with default)` : "";
   return {
     ok: true,
     provider: "gemini",
-    message: `config valid${warning}`,
+    message: "config valid",
     model
   };
 }
@@ -10562,12 +10617,14 @@ var geminiAdapter = {
   displayName: "Gemini",
   mode: "api",
   keyUrl: "https://aistudio.google.com/apikey",
+  // Upstream model list: https://ai.google.dev/gemini-api/docs/models
   modelRegistry: {
     defaultModel: "gemini-3-flash",
-    validationPattern: /^gemini-/,
-    validationHint: 'model name must start with "gemini-" (e.g. gemini-3-flash)',
+    validationPattern: /./,
+    validationHint: "any valid Google model name (e.g. gemini-3-flash, learnlm-1.5-pro-experimental)",
     knownModels: [
       { id: "gemini-3.1-pro-preview", displayName: "Gemini 3.1 Pro (Preview)", tier: "flagship" },
+      { id: "gemini-3-flash", displayName: "Gemini 3 Flash", tier: "standard" },
       { id: "gemini-3-flash-preview", displayName: "Gemini 3 Flash (Preview)", tier: "standard" },
       { id: "gemini-3.1-flash-lite-preview", displayName: "Gemini 3.1 Flash-Lite (Preview)", tier: "economy" },
       { id: "gemini-2.5-flash", displayName: "Gemini 2.5 Flash", tier: "standard" }
@@ -10730,13 +10787,15 @@ function extractResponseText(response) {
 }
 function extractGroundingSources(response) {
   const sources = [];
+  const seen = /* @__PURE__ */ new Set();
   try {
     for (const item of response.output) {
       if (item.type === "message") {
         for (const content of item.content) {
           if (content.type === "output_text" && content.annotations) {
             for (const annotation of content.annotations) {
-              if (annotation.type === "url_citation") {
+              if (annotation.type === "url_citation" && !seen.has(annotation.url)) {
+                seen.add(annotation.url);
                 sources.push({
                   uri: annotation.url,
                   title: annotation.title ?? ""
@@ -10756,7 +10815,10 @@ function extractSearchQueries2(response) {
   try {
     for (const item of response.output) {
       if (item.type === "web_search_call" && "query" in item) {
-        queries.push(item.query);
+        const query = item.query;
+        if (typeof query === "string" && query.length > 0) {
+          queries.push(query);
+        }
       }
     }
   } catch {
@@ -10828,10 +10890,11 @@ var openaiAdapter = {
   displayName: "OpenAI",
   mode: "api",
   keyUrl: "https://platform.openai.com/api-keys",
+  // Upstream model list: https://platform.openai.com/docs/models
   modelRegistry: {
     defaultModel: "gpt-5.4",
-    validationPattern: /^(gpt-|o\d)/,
-    validationHint: "expected a GPT or o-series model name (e.g. gpt-5.4, o3)",
+    validationPattern: /./,
+    validationHint: "any valid OpenAI model name (e.g. gpt-5.4, o3, chatgpt-4o-latest)",
     knownModels: [
       { id: "gpt-5.4", displayName: "GPT-5.4", tier: "flagship" },
       { id: "gpt-5.4-pro", displayName: "GPT-5.4 Pro", tier: "flagship" },
@@ -10900,24 +10963,37 @@ var openaiAdapter = {
 // ../provider-claude/src/normalize.ts
 import Anthropic from "@anthropic-ai/sdk";
 var DEFAULT_MODEL3 = "claude-sonnet-4-6";
+var VALIDATION_PATTERN = /^claude-/;
+function resolveModel2(config) {
+  const m = config.model;
+  if (!m) return DEFAULT_MODEL3;
+  if (VALIDATION_PATTERN.test(m)) return m;
+  console.warn(
+    `[provider-claude] Invalid model name "${m}" \u2014 this provider uses the Anthropic API which only accepts "claude-*" model names. Falling back to ${DEFAULT_MODEL3}.`
+  );
+  return DEFAULT_MODEL3;
+}
 function validateConfig3(config) {
   if (!config.apiKey || config.apiKey.length === 0) {
     return { ok: false, provider: "claude", message: "missing api key" };
   }
+  const model = resolveModel2(config);
+  const warning = config.model && !VALIDATION_PATTERN.test(config.model) ? ` (invalid model "${config.model}" replaced with default)` : "";
   return {
     ok: true,
     provider: "claude",
-    message: "config valid",
-    model: config.model ?? DEFAULT_MODEL3
+    message: `config valid${warning}`,
+    model
   };
 }
 async function healthcheck3(config) {
   const validation = validateConfig3(config);
   if (!validation.ok) return validation;
   try {
+    const model = resolveModel2(config);
     const client = new Anthropic({ apiKey: config.apiKey });
     const response = await client.messages.create({
-      model: config.model ?? DEFAULT_MODEL3,
+      model,
       max_tokens: 32,
       messages: [{ role: "user", content: 'Say "ok"' }]
     });
@@ -10926,19 +11002,19 @@ async function healthcheck3(config) {
       ok: text2.length > 0,
       provider: "claude",
       message: text2.length > 0 ? "claude api key verified" : "empty response from claude",
-      model: config.model ?? DEFAULT_MODEL3
+      model
     };
   } catch (err) {
     return {
       ok: false,
       provider: "claude",
       message: err instanceof Error ? err.message : String(err),
-      model: config.model ?? DEFAULT_MODEL3
+      model: resolveModel2(config)
     };
   }
 }
 async function executeTrackedQuery3(input) {
-  const model = input.config.model ?? DEFAULT_MODEL3;
+  const model = resolveModel2(input.config);
   const client = new Anthropic({ apiKey: input.config.apiKey });
   const webSearchTool = {
     type: "web_search_20250305",
@@ -11060,7 +11136,7 @@ function extractDomainFromUri3(uri) {
   }
 }
 async function generateText3(prompt, config) {
-  const model = config.model ?? DEFAULT_MODEL3;
+  const model = resolveModel2(config);
   const client = new Anthropic({ apiKey: config.apiKey });
   const response = await client.messages.create({
     model,
@@ -11090,6 +11166,7 @@ var claudeAdapter = {
   displayName: "Claude",
   mode: "api",
   keyUrl: "https://platform.claude.com/settings/keys",
+  // Upstream model list: https://platform.claude.com/docs/en/about-claude/models/overview
   modelRegistry: {
     defaultModel: "claude-sonnet-4-6",
     validationPattern: /^claude-/,
@@ -11799,7 +11876,7 @@ function normalizeResult5(raw) {
 }
 // ../provider-cdp/src/adapter.ts
-var sharedConnection = null;
+var connectionPool = /* @__PURE__ */ new Map();
 function getConnection(config) {
   if (!config.cdpEndpoint) {
     throw new CDPProviderError("CDP_CONNECTION_REFUSED", "CDP endpoint not configured");
@@ -11810,14 +11887,13 @@ function getConnection(config) {
   const parts = endpoint.split(":");
   if (parts.length >= 1 && parts[0]) host = parts[0];
   if (parts.length >= 2 && parts[1]) port = parseInt(parts[1], 10) || 9222;
-  if (!sharedConnection || sharedConnection.endpoint !== `${host}:${port}`) {
-    if (sharedConnection) {
-      sharedConnection.disconnect().catch(() => {
-      });
-    }
-    sharedConnection = new CDPConnectionManager(host, port);
+  const key = `${host}:${port}`;
+  let conn = connectionPool.get(key);
+  if (!conn) {
+    conn = new CDPConnectionManager(host, port);
+    connectionPool.set(key, conn);
   }
-  return sharedConnection;
+  return conn;
 }
 function getScreenshotDir2() {
   return path4.join(os3.homedir(), ".canonry", "screenshots");
@@ -12063,6 +12139,7 @@ var perplexityAdapter = {
   displayName: "Perplexity",
   mode: "api",
   keyUrl: "https://www.perplexity.ai/settings/api",
+  // Upstream model list: https://docs.perplexity.ai/guides/model-cards
   modelRegistry: {
     defaultModel: "sonar",
     validationPattern: /^sonar/,
@@ -12291,7 +12368,7 @@ import crypto18 from "crypto";
 import fs4 from "fs";
 import path5 from "path";
 import os4 from "os";
-import { and as and6, eq as eq17, inArray as inArray3 } from "drizzle-orm";
+import { and as and6, eq as eq17, inArray as inArray3, sql as sql5 } from "drizzle-orm";
 // src/logger.ts
 var IS_TTY = process.stdout.isTTY === true;
@@ -12453,12 +12530,12 @@ var JobRunner = class {
       } else if (locationOverride) {
         runLocation = locationOverride;
       } else {
-        const projectLocations = JSON.parse(project.locations || "[]");
+        const projectLocations = parseJsonColumn(project.locations, []);
         if (project.defaultLocation && projectLocations.length > 0) {
           runLocation = projectLocations.find((l) => l.label === project.defaultLocation);
         }
       }
-      const projectProviders = providerOverride ?? JSON.parse(project.providers || "[]");
+      const projectProviders = providerOverride ?? parseJsonColumn(project.providers, []);
       activeProviders = this.registry.getForProject(projectProviders);
       if (activeProviders.length === 0) {
         throw new Error("No providers configured. Add at least one provider API key.");
@@ -12469,7 +12546,7 @@ var JobRunner = class {
       const competitorDomains = projectCompetitors.map((c) => c.domain);
       const allDomains = effectiveDomains({
         canonicalDomain: project.canonicalDomain,
-        ownedDomains: JSON.parse(project.ownedDomains || "[]")
+        ownedDomains: parseJsonColumn(project.ownedDomains, [])
       });
       const executionContext = {
         providerCount: activeProviders.length,
@@ -12680,22 +12757,19 @@ var JobRunner = class {
     }
   }
   incrementUsage(scope, metric, count) {
-    const now = /* @__PURE__ */ new Date();
-    const period = now.toISOString().slice(0, 10);
-    const id = crypto18.randomUUID();
-    const existing = this.db.select().from(usageCounters).where(eq17(usageCounters.scope, scope)).all().find((r) => r.period === period && r.metric === metric);
-    if (existing) {
-      this.db.update(usageCounters).set({ count: existing.count + count, updatedAt: now.toISOString() }).where(eq17(usageCounters.id, existing.id)).run();
-    } else {
-      this.db.insert(usageCounters).values({
-        id,
-        scope,
-        period,
-        metric,
-        count,
-        updatedAt: now.toISOString()
-      }).run();
-    }
+    const now = (/* @__PURE__ */ new Date()).toISOString();
+    const period = now.slice(0, 10);
+    this.db.insert(usageCounters).values({
+      id: crypto18.randomUUID(),
+      scope,
+      period,
+      metric,
+      count,
+      updatedAt: now
+    }).onConflictDoUpdate({
+      target: [usageCounters.scope, usageCounters.period, usageCounters.metric],
+      set: { count: sql5`${usageCounters.count} + ${count}`, updatedAt: now }
+    }).run();
   }
   flushProviderUsage(projectId, providerDispatchCounts) {
     for (const [providerName, count] of providerDispatchCounts.entries()) {
@@ -12896,7 +12970,7 @@ function matchesBrandKey(candidateKey, brandKeys) {
 // src/gsc-sync.ts
 import crypto19 from "crypto";
-import { eq as eq18, and as and7, sql as sql5 } from "drizzle-orm";
+import { eq as eq18, and as and7, sql as sql6 } from "drizzle-orm";
 var log2 = createLogger("GscSync");
 function formatDate2(d) {
   return d.toISOString().split("T")[0];
@@ -12950,8 +13024,8 @@ async function executeGscSync(db, runId, projectId, opts) {
     db.delete(gscSearchData).where(
       and7(
         eq18(gscSearchData.projectId, projectId),
-        sql5`${gscSearchData.date} >= ${startDate}`,
-        sql5`${gscSearchData.date} <= ${endDate}`
+        sql6`${gscSearchData.date} >= ${startDate}`,
+        sql6`${gscSearchData.date} <= ${endDate}`
       )
     ).run();
     const batchSize = 500;
@@ -13410,7 +13484,7 @@ var Scheduler = class {
         nextRunAt,
         updatedAt: now
       }).where(eq20(schedules.id, currentSchedule.id)).run();
-      const scheduleProviders = JSON.parse(currentSchedule.providers);
+      const scheduleProviders = parseJsonColumn(currentSchedule.providers, []);
       const providers = scheduleProviders.length > 0 ? scheduleProviders : void 0;
       log4.info("run.triggered", { runId, projectName: project.name, providers: providers ?? "all" });
       this.callbacks.onRunCreated(runId, projectId, providers);

package/dist/cli.js CHANGED Viewed

@@ -26,7 +26,7 @@ import {
   setGoogleAuthConfig,
   showFirstRunNotice,
   trackEvent
-} from "./chunk-PZKK53EX.js";
+} from "./chunk-U2ZNKIWK.js";
 // src/cli.ts
 import { pathToFileURL } from "url";
@@ -1493,14 +1493,20 @@ async function gaTraffic(project, opts) {
   console.log(`  Total Sessions:          ${result.totalSessions}`);
   console.log(`  Organic Sessions:        ${result.totalOrganicSessions}`);
   console.log(`  Total Users:             ${result.totalUsers}`);
+  if (result.aiSessionsDeduped > 0) {
+    const share = result.totalSessions > 0 ? Math.round(result.aiSessionsDeduped / result.totalSessions * 100) : 0;
+    console.log(`  AI Sessions (deduped):   ${result.aiSessionsDeduped} (${share}% of total)`);
+  }
   console.log();
   if (result.aiReferrals.length > 0) {
+    const attrWidth = 12;
     console.log("  AI REFERRAL SOURCES");
-    console.log(`  ${"SOURCE".padEnd(25)}  ${"MEDIUM".padEnd(15)}  ${"SESSIONS".padEnd(10)}${"USERS".padEnd(8)}`);
-    console.log(`  ${"\u2500".repeat(25)}  ${"\u2500".repeat(15)}  ${"\u2500".repeat(10)}${"\u2500".repeat(8)}`);
+    console.log(`  ${"SOURCE".padEnd(25)}  ${"MEDIUM".padEnd(15)}  ${"ATTRIBUTION".padEnd(attrWidth)}  ${"SESSIONS".padEnd(10)}${"USERS".padEnd(8)}`);
+    console.log(`  ${"\u2500".repeat(25)}  ${"\u2500".repeat(15)}  ${"\u2500".repeat(attrWidth)}  ${"\u2500".repeat(10)}${"\u2500".repeat(8)}`);
     for (const ref of result.aiReferrals) {
+      const dimLabel = ref.sourceDimension === "first_user" ? "first-visit" : ref.sourceDimension === "manual_utm" ? "utm" : "session";
       console.log(
-        `  ${ref.source.padEnd(25)}  ${ref.medium.padEnd(15)}  ${String(ref.sessions).padEnd(10)}${String(ref.users).padEnd(8)}`
+        `  ${ref.source.padEnd(25)}  ${ref.medium.padEnd(15)}  ${dimLabel.padEnd(attrWidth)}  ${String(ref.sessions).padEnd(10)}${String(ref.users).padEnd(8)}`
       );
     }
     console.log();
@@ -1535,13 +1541,15 @@ async function gaAiReferralHistory(project, format) {
   }
   const dateWidth = 12;
   const sourceWidth = Math.min(30, Math.max(10, ...result.map((r) => r.source.length)));
+  const attrWidth = 12;
   console.log(`GA4 AI Referral History for "${project}":
 `);
-  console.log(`  ${"DATE".padEnd(dateWidth)}  ${"SOURCE".padEnd(sourceWidth)}  ${"SESSIONS".padEnd(10)}${"USERS".padEnd(8)}`);
-  console.log(`  ${"\u2500".repeat(dateWidth)}  ${"\u2500".repeat(sourceWidth)}  ${"\u2500".repeat(10)}${"\u2500".repeat(8)}`);
+  console.log(`  ${"DATE".padEnd(dateWidth)}  ${"SOURCE".padEnd(sourceWidth)}  ${"ATTRIBUTION".padEnd(attrWidth)}  ${"SESSIONS".padEnd(10)}${"USERS".padEnd(8)}`);
+  console.log(`  ${"\u2500".repeat(dateWidth)}  ${"\u2500".repeat(sourceWidth)}  ${"\u2500".repeat(attrWidth)}  ${"\u2500".repeat(10)}${"\u2500".repeat(8)}`);
   for (const row of result) {
+    const dimLabel = row.sourceDimension === "first_user" ? "first-visit" : row.sourceDimension === "manual_utm" ? "utm" : "session";
     console.log(
-      `  ${row.date.padEnd(dateWidth)}  ${row.source.padEnd(sourceWidth)}  ${String(row.sessions).padEnd(10)}${String(row.users).padEnd(8)}`
+      `  ${row.date.padEnd(dateWidth)}  ${row.source.padEnd(sourceWidth)}  ${dimLabel.padEnd(attrWidth)}  ${String(row.sessions).padEnd(10)}${String(row.users).padEnd(8)}`
     );
   }
 }
@@ -1690,7 +1698,11 @@ async function addCompetitors(project, domains, format) {
     }, null, 2));
     return;
   }
-  console.log(`Added ${domains.length} competitor(s) to "${project}".`);
+  if (addedDomains.length === 0) {
+    console.log(`No new competitors added to "${project}" (all already tracked).`);
+  } else {
+    console.log(`Added ${addedDomains.length} competitor(s) to "${project}".`);
+  }
 }
 async function listCompetitors(project, format) {
   const client = getClient4();

package/dist/index.js CHANGED Viewed

@@ -1,7 +1,7 @@
 import {
   createServer,
   loadConfig
-} from "./chunk-PZKK53EX.js";
+} from "./chunk-U2ZNKIWK.js";
 export {
   createServer,
   loadConfig