@canonry/canonry 5.32.0 → 5.34.0

package/dist/{chunk-7YS62CJ4.js → chunk-G2K5KCUY.js}

@@ -291,6 +291,7 @@ import {
   compareSemver,
   competitorBatchRequestSchema,
   competitorDtoSchema,
+  competitorLabelFromDomain,
   competitorLandscapeQuerySchema,
   competitorLandscapeResponseSchema,
   compileBrandAliases,
@@ -720,6 +721,7 @@ import {
   resolveMeasurementRunQueryScope,
   resolveMeasurementRunScope,
   resolveNegativeReviewMaxStars,
+  resolveProjectQualifiedAliases,
   resolveProviderModel,
   resolveRunDispatchModes,
   resolveSnapshotRequestQueries,
@@ -774,6 +776,7 @@ import {
   shareOfVoiceReason,
   shareOfVoiceSummary,
   shiftIsoCalendarDate,
+  simpleMeasurementCompetitorNames,
   simpleMeasurementDefinitionSchema,
   siteAuditLivePageHealthSchema,
   siteAuditPageFactorSchema,
@@ -866,7 +869,7 @@ import {
   wordpressSchemaDeployResultDtoSchema,
   wordpressSchemaStatusResultDtoSchema,
   wordpressStatusDtoSchema
-} from "./chunk-RCX6I3DX.js";
+} from "./chunk-NOIK3FUO.js";
 
 // src/intelligence-service.ts
 import { eq as eq82, desc as desc36, asc as asc15, and as and69, ne as ne14, or as or20, inArray as inArray32, gte as gte22, lte as lte20, isNull as isNull16, sql as sql31, exists } from "drizzle-orm";
@@ -1017,6 +1020,12 @@ var projects = sqliteTable("projects", {
   canonicalDomain: text("canonical_domain").notNull(),
   ownedDomains: text("owned_domains", { mode: "json" }).$type().notNull().default([]),
   aliases: text("aliases", { mode: "json" }).$type().notNull().default([]),
+  /**
+   * Operator-chosen subset of `aliases` that Simple sentiment tells the
+   * evaluator are this brand's own names. Frozen into each Simple run's
+   * sidecar at dispatch; never read by mention detection or query classes.
+   */
+  qualifiedAliases: text("qualified_aliases", { mode: "json" }).$type().notNull().default([]),
   country: text("country").notNull(),
   language: text("language").notNull(),
   tags: text("tags", { mode: "json" }).$type().notNull().default([]),
@@ -8172,6 +8181,16 @@ var MIGRATION_VERSIONS = [
     name: "aero-ledger-conversation-ids",
     statements: [],
     run: dropAeroLedgerConversationKeys
+  },
+  {
+    // Sentiment-only project setting: the aliases the evaluator is told are
+    // the brand's own names. Defaulted, so an older writer that omits it and
+    // every existing project read as not opted in.
+    version: 166,
+    name: "projects-qualified-aliases",
+    statements: [
+      `ALTER TABLE projects ADD COLUMN qualified_aliases TEXT NOT NULL DEFAULT '[]'`
+    ]
   }
 ];
 var AERO_LEDGER_REBUILDS = [
@@ -13504,7 +13523,10 @@ function selectSentimentSources(db, projectId, filters) {
   const selectedRuns = db.select(sourceRunColumns).from(runs).where(and3(...conditions)).orderBy(desc2(runs.createdAt)).limit(101).all();
   if (selectedRuns.length > 100) throw validationError("Selection exceeds 100 runs; narrow the date range.");
   if (requestedIds && new Set(selectedRuns.map((row) => row.id)).size !== new Set(requestedIds).size) throw validationError("One or more selected runs are unavailable in this project.");
-  const out = { assessments: [], runIds: selectedRuns.map((row) => row.id), sourceCoverage: { expected: 0, completed: 0 }, skipped: {}, skippedByRun: {} };
+  const out = { assessments: [], runIds: selectedRuns.map((row) => row.id), sourceCoverage: { expected: 0, completed: 0 }, sourceSlotIds: { expected: [], completed: [] }, skipped: {}, skippedByRun: {} };
+  const recordSlots = (runId, slots) => {
+    for (const key of ["expected", "completed"]) out.sourceSlotIds[key].push(...slots[key].map((slot) => pairKey(runId, slot)));
+  };
   let currentRunId = "";
   const skip = (reason, count4 = 1) => {
     out.skipped[reason] = (out.skipped[reason] ?? 0) + count4;
@@ -13531,6 +13553,7 @@ function selectSentimentSources(db, projectId, filters) {
     const completedSuperseded = run.status === "superseded" && Boolean(db.select({ sequence: sentimentCompletionReceipts.sequence }).from(sentimentCompletionReceipts).where(and3(eq8(sentimentCompletionReceipts.projectId, projectId), eq8(sentimentCompletionReceipts.runId, run.id))).get());
     if (run.status !== "completed" && !completedSuperseded) {
       const coverage = selectedSlotCoverage(db, projectId, run, filters, plans);
+      recordSlots(run.id, coverage.slotIds);
       out.sourceCoverage.expected += coverage.expected;
       out.sourceCoverage.completed += coverage.completed;
       skip(run.status === "failed" ? "failed-run" : "incomplete-run");
@@ -13555,6 +13578,7 @@ function selectSentimentSources(db, projectId, filters) {
       out.sourceCoverage.completed += slots.executed;
       if (!slots.planned || !slots.readable || slots.missing.length > 0 || slots.hasUnboundSnapshot) {
         const coverage = selectedSlotCoverage(db, projectId, run, filters, plans);
+        recordSlots(run.id, coverage.slotIds);
         out.sourceCoverage.expected = beforeCoverage.expected + coverage.expected;
         out.sourceCoverage.completed = beforeCoverage.completed + coverage.completed;
         skip("incomplete-run");
@@ -13626,12 +13650,14 @@ function selectSentimentSources(db, projectId, filters) {
       out.sourceCoverage.completed += expected.filter((key) => recorded.has(key)).length;
       if (!expected.length || expected.some((key) => !recorded.has(key)) || snapshots.length !== expected.length || snapshots.some(({ snapshot, query }) => !expectedSlots.has(simpleSlotKey(query?.queryId, snapshot.provider)))) {
         const coverage = selectedSlotCoverage(db, projectId, run, filters, plans);
+        recordSlots(run.id, coverage.slotIds);
         out.sourceCoverage.expected = beforeCoverage.expected + coverage.expected;
         out.sourceCoverage.completed = beforeCoverage.completed + coverage.completed;
         skip("incomplete-run");
         continue;
       }
       const identity = definition.identity;
+      const qualifiedAliases = [...identity.qualifiedAliases ?? []].sort();
       const names = effectiveBrandNames(identity);
       const urls = [identity.canonicalDomain, ...identity.ownedDomains];
       const mentionNotApplicable = !names.length && !urls.some((url) => url.trim());
@@ -13653,14 +13679,15 @@ function selectSentimentSources(db, projectId, filters) {
           language: definition.language,
           queryText: query.queryText,
           revision: null,
-          subject: { key: projectId, name: identity.displayName, aliases: [...names], identityAliases: [], urls: [...urls], mentionNotApplicable },
+          subject: { key: projectId, name: identity.displayName, aliases: [...names], identityAliases: [...qualifiedAliases], urls: [...urls], mentionNotApplicable },
           edges: [edge]
         });
       }
     }
-    const selectedSlots = new Set(out.assessments.slice(beforeAssessments).map((item2) => item2.snapshotId)).size;
-    out.sourceCoverage.expected = beforeCoverage.expected + selectedSlots;
-    out.sourceCoverage.completed = beforeCoverage.completed + selectedSlots;
+    const selectedSlots = [...new Set(out.assessments.slice(beforeAssessments).map((item2) => item2.snapshotId))];
+    recordSlots(run.id, { expected: selectedSlots, completed: selectedSlots });
+    out.sourceCoverage.expected = beforeCoverage.expected + selectedSlots.length;
+    out.sourceCoverage.completed = beforeCoverage.completed + selectedSlots.length;
   }
   return out;
 }
@@ -13707,7 +13734,8 @@ function indexedPlan(db, projectId, versionId, cache) {
 }
 function selectedSlotCoverage(db, projectId, run, filters, plans) {
   const expected = /* @__PURE__ */ new Set(), completed = /* @__PURE__ */ new Set();
-  if (run.status === "failed") return { expected: 0, completed: 0 };
+  const coverage = () => ({ expected: expected.size, completed: completed.size, slotIds: { expected: [...expected], completed: [...completed] } });
+  if (run.status === "failed") return coverage();
   const snapshots = db.select({ queryId: querySnapshots.queryId, queryText: querySnapshots.queryText, provider: querySnapshots.provider, servedModel: querySnapshots.servedModel, measurementExecutionId: querySnapshots.measurementExecutionId }).from(querySnapshots).where(eq8(querySnapshots.runId, run.id)).all();
   const count4 = (key, edge, recorded) => {
     if (!matchesSentimentEdge(edge, filters)) return;
@@ -13716,7 +13744,7 @@ function selectedSlotCoverage(db, projectId, run, filters, plans) {
   };
   if (run.measurementPlanVersionId) {
     const indexed = indexedPlan(db, projectId, run.measurementPlanVersionId, plans);
-    if (!indexed || filters.revision !== void 0 && indexed.revision !== filters.revision) return { expected: 0, completed: 0 };
+    if (!indexed || filters.revision !== void 0 && indexed.revision !== filters.revision) return coverage();
     const bySlot = /* @__PURE__ */ new Map();
     for (const snapshot of snapshots) if (snapshot.measurementExecutionId !== null) keep(bySlot, pairKey(snapshot.measurementExecutionId, snapshot.provider), snapshot);
     const scopedTargets = run.measurementScope?.resolvedTargets.length ? new Set(run.measurementScope.resolvedTargets) : null;
@@ -13733,10 +13761,10 @@ function selectedSlotCoverage(db, projectId, run, filters, plans) {
       }
     }
   } else {
-    if (filters.revision !== void 0 || filters.scope && filters.scope !== "project" || filters.marketKey) return { expected: 0, completed: 0 };
+    if (filters.revision !== void 0 || filters.scope && filters.scope !== "project" || filters.marketKey) return coverage();
     const row = db.select({ definition: simpleMeasurementDefinitions.definition }).from(simpleMeasurementDefinitions).where(eq8(simpleMeasurementDefinitions.runId, run.id)).get();
     const stored = simpleMeasurementDefinitionSchema.safeParse(row?.definition);
-    if (!stored.success) return { expected: 0, completed: 0 };
+    if (!stored.success) return coverage();
     const sourceQuery = simpleSourceQueries(stored.data);
     const bySlot = /* @__PURE__ */ new Map();
     for (const snapshot of snapshots) {
@@ -13749,7 +13777,7 @@ function selectedSlotCoverage(db, projectId, run, filters, plans) {
       count4(`${query.queryId}:${engine.provider}`, { queryKey: query.queryId, queryText: query.queryText, executionNodeKey: null, queryClass: query.queryClass, propertyKey: run.projectId, groupKeys: [], marketKeys: [], provider: engine.provider, sourceModel: engine.requestedModel, servedModel: snapshot?.servedModel ?? null, context: stored.data.location }, Boolean(snapshot));
     }
   }
-  return { expected: expected.size, completed: completed.size };
+  return coverage();
 }
 function matchesSentimentEdge(edge, filters) {
   if (edge.queryClass !== (filters.queryClass ?? "branded")) return false;
@@ -13836,7 +13864,7 @@ function sentimentClassifierInput(source, definition) {
 }
 
 // ../api-routes/src/sentiment-service.ts
-var DISCLOSURE = "Experimental English sentiment classification. Enabling sends each stored answer's text to TypeSafe with the frozen subject identity (name, aliases and URLs), the tracked query text and query class, the answer engine with its requested and served models, the location, and internal query, subject, Property, group and market identifiers.";
+var DISCLOSURE = "Experimental English sentiment classification. Enabling sends each stored answer's text to TypeSafe with the frozen subject identity (name, aliases, qualified aliases and URLs), the tracked query text and query class, the answer engine with its requested and served models, the location, and internal query, subject, Property, group and market identifiers.";
 var FULL_ROWS = { include: /* @__PURE__ */ new Set(["assessments", "locations"]), limit: null, after: null };
 var COMPACT_ROWS = { include: /* @__PURE__ */ new Set(), limit: null, after: null };
 var OPERATIONAL_OUTCOMES = /* @__PURE__ */ new Set([SentimentOutcomes.pending, SentimentOutcomes.running, SentimentOutcomes["waiting-to-retry"], SentimentOutcomes.failed, SentimentOutcomes.canceled]);
@@ -14154,26 +14182,12 @@ var SentimentService = class {
     const selections = resolved.map((entry) => entry.selection), sources = resolved.map((entry) => entry.source);
     const runIds = selections.flatMap((selection2) => selection2.runId ? [selection2.runId] : []).sort();
     const definitions = new Set(selections.flatMap((selection2) => selection2.evaluationDefinitionId ? [selection2.evaluationDefinitionId] : []));
-    const modes = new Set(selections.map((selection2) => selection2.mode));
-    const revisions = new Set(selections.map((selection2) => selection2.revision));
-    const source = { assessments: sources.flatMap((source2) => source2.assessments), runIds, sourceCoverage: { expected: sources.reduce((sum, source2) => sum + source2.sourceCoverage.expected, 0), completed: sources.reduce((sum, source2) => sum + source2.sourceCoverage.completed, 0) }, skipped: sources.reduce((counts2, source2) => {
+    const source = { assessments: sources.flatMap((source2) => source2.assessments), runIds, sourceCoverage: { expected: sources.reduce((sum, source2) => sum + source2.sourceCoverage.expected, 0), completed: sources.reduce((sum, source2) => sum + source2.sourceCoverage.completed, 0) }, sourceSlotIds: { expected: sources.flatMap((source2) => source2.sourceSlotIds.expected), completed: sources.flatMap((source2) => source2.sourceSlotIds.completed) }, skipped: sources.reduce((counts2, source2) => {
       for (const [reason2, count4] of Object.entries(source2.skipped)) counts2[reason2] = (counts2[reason2] ?? 0) + count4;
       return counts2;
     }, {}) };
     const selection = { ...selections[0], runId: runIds.length === 1 ? runIds[0] : null, runIds: runIds.length > 1 ? runIds : void 0, evaluationDefinitionId: definitions.size === 1 ? [...definitions][0] : null };
-    let reason = definitions.size > 1 ? "evaluation-definition-changed" : modes.size > 1 ? "source-mode-changed" : revisions.size > 1 ? "measurement-revision-changed" : null;
-    const subjects = /* @__PURE__ */ new Map(), queries2 = /* @__PURE__ */ new Map();
-    const filter = sourceFilter(query);
-    for (const assessment of source.assessments) {
-      const identity = sentimentHash(assessment.subject), prior = subjects.get(assessment.subject.key);
-      if (prior && prior !== identity) reason ??= "subject-identity-changed";
-      subjects.set(assessment.subject.key, identity);
-      for (const edge of assessment.edges.filter((edge2) => matchesSentimentEdge(edge2, filter))) {
-        const previous = queries2.get(edge.queryKey);
-        if (previous && previous !== edge.queryText) reason ??= "query-identity-changed";
-        queries2.set(edge.queryKey, edge.queryText);
-      }
-    }
+    const reason = incompatibleSelectionReason(selections, source.assessments, sourceFilter(query));
     return { selection, items, source, reason, fingerprint: sentimentHash(selections) };
   }
   /** Incompatible pooled identities replace every score in the response with an unavailable one. */
@@ -14205,6 +14219,7 @@ var SentimentService = class {
   overview(projectId, runIds, location) {
     const settings = this.settings(projectId);
     const configured = settings.enabled && settings.installEnabled;
+    const reads = [];
     const headline = (queryClass) => {
       if (!configured || !runIds.length) {
         const empty = { mode: "simple", scope: "project", queryClass, runId: null, revision: null, evaluationDefinitionId: null };
@@ -14212,10 +14227,12 @@ var SentimentService = class {
         return { state: result2.state, reason: result2.reason, provisional: result2.provisional, coverage: result2.coverage, score: result2.score, selection: empty, runIds: [] };
       }
       const read = this.readSelection(projectId, { mode: "auto", scope: "project", queryClass, runIds, ...location ? { location } : {} });
+      reads.push(read);
       const { summary: result } = this.present(read, settings, null);
       return { state: result.state, reason: result.reason, provisional: result.provisional, coverage: result.coverage, score: result.score, selection: result.selection, runIds: result.selection.runIds ?? (result.selection.runId ? [result.selection.runId] : []) };
     };
-    return { configured, branded: headline("branded"), nonBrand: headline("non-brand") };
+    const branded = headline("branded"), nonBrand = headline("non-brand");
+    return { configured, branded, nonBrand, overall: overallSentiment(reads, !configured) };
   }
   evidence(projectId, query, limit, cursor) {
     const { assessmentId, ...sourceSelection } = query;
@@ -14276,7 +14293,44 @@ var SentimentService = class {
 };
 var jobAttemptJoin = and4(eq9(sentimentJobItems.workItemId, sentimentAttempts.workItemId), eq9(sentimentJobItems.projectId, sentimentAttempts.projectId));
 function emptySource() {
-  return { assessments: [], runIds: [], sourceCoverage: { expected: 0, completed: 0 }, skipped: {} };
+  return { assessments: [], runIds: [], sourceCoverage: { expected: 0, completed: 0 }, sourceSlotIds: { expected: [], completed: [] }, skipped: {} };
+}
+function incompatibleSelectionReason(selections, assessments, filter) {
+  const definitions = new Set(selections.flatMap((selection) => selection.evaluationDefinitionId ? [selection.evaluationDefinitionId] : []));
+  const modes = new Set(selections.map((selection) => selection.mode));
+  const revisions = new Set(selections.map((selection) => selection.revision));
+  let reason = definitions.size > 1 ? "evaluation-definition-changed" : modes.size > 1 ? "source-mode-changed" : revisions.size > 1 ? "measurement-revision-changed" : null;
+  const subjects = /* @__PURE__ */ new Map(), queries2 = /* @__PURE__ */ new Map();
+  for (const assessment of assessments) {
+    const identity = sentimentHash(assessment.subject), prior = subjects.get(assessment.subject.key);
+    if (prior && prior !== identity) reason ??= "subject-identity-changed";
+    subjects.set(assessment.subject.key, identity);
+    for (const edge of assessment.edges) {
+      if (filter && !matchesSentimentEdge(edge, filter)) continue;
+      const previous = queries2.get(edge.queryKey);
+      if (previous && previous !== edge.queryText) reason ??= "query-identity-changed";
+      queries2.set(edge.queryKey, edge.queryText);
+    }
+  }
+  return reason;
+}
+function overallSentiment(reads, disabled) {
+  const assessmentKey = (item2) => JSON.stringify([item2.snapshotId, item2.subject.key]);
+  const assessments = reads.flatMap((read) => read.source.assessments);
+  const eligible = [...new Map(assessments.map((item2) => [assessmentKey(item2), item2])).values()];
+  const selected = [...new Map(reads.flatMap((read) => read.items).map((item2) => [assessmentKey(item2.member), item2])).values()];
+  const slots = {
+    expected: new Set(reads.flatMap((read) => read.source.sourceSlotIds.expected)).size,
+    completed: new Set(reads.flatMap((read) => read.source.sourceSlotIds.completed)).size
+  };
+  const result = scoreAssessments(selected, eligible, { disabled, slots, incomplete: reads.some((read) => Boolean(read.source.skipped["incomplete-run"])) });
+  const reason = reads.find((read) => read.reason)?.reason ?? incompatibleSelectionReason(reads.map((read) => read.selection), assessments);
+  return {
+    ...result,
+    ...!disabled && reason ? { state: "unsupported", reason, provisional: true, score: aggregateSentiment([]).score } : {},
+    queryClass: "all",
+    runIds: [...new Set(reads.flatMap((read) => read.source.runIds))].sort()
+  };
 }
 function append2(map, key, value) {
   const list = map.get(key);
@@ -16832,6 +16886,7 @@ async function projectRoutes(app, opts) {
     const id = crypto9.randomUUID();
     const now = (/* @__PURE__ */ new Date()).toISOString();
     const nextAliases = normalizeProjectAliases(body.displayName, body.aliases ?? []);
+    const qualifiedAliases = body.qualifiedAliases === void 0 ? [] : requireQualifiedAliases({ displayName: body.displayName, aliases: nextAliases }, body.qualifiedAliases, []);
     const inserted = app.db.transaction((tx) => {
       const result = tx.insert(projects).values({
         id,
@@ -16840,6 +16895,7 @@ async function projectRoutes(app, opts) {
         canonicalDomain,
         ownedDomains: body.ownedDomains ?? [],
         aliases: nextAliases,
+        qualifiedAliases,
         country: body.country,
         language: body.language,
         tags: body.tags ?? [],
@@ -16926,6 +16982,9 @@ async function projectRoutes(app, opts) {
     const nextNegativeReviewMaxStars = body.negativeReviewMaxStars !== void 0 ? body.negativeReviewMaxStars : existing ? readNegativeReviewMaxStars(app.db, existing.id) : null;
     const nextMeasurement = body.measurement ?? existing?.measurement ?? DEFAULT_MEASUREMENT_CONFIG;
     const nextAliases = normalizeProjectAliases(body.displayName, body.aliases ?? []);
+    const nextIdentity = { displayName: body.displayName, aliases: nextAliases };
+    const liveCompetitors = existing ? liveCompetitorNames(app.db, existing.id) : [];
+    const nextQualifiedAliases = body.qualifiedAliases !== void 0 ? requireQualifiedAliases(nextIdentity, body.qualifiedAliases, liveCompetitors) : resolveProjectQualifiedAliases(nextIdentity, existing?.qualifiedAliases ?? [], liveCompetitors).value;
     if (existing) {
       const prevAliases = existing.aliases;
       const aliasesChanged = !aliasArraysEqual(prevAliases, nextAliases);
@@ -16935,6 +16994,7 @@ async function projectRoutes(app, opts) {
           canonicalDomain: body.canonicalDomain,
           ownedDomains: body.ownedDomains ?? [],
           aliases: nextAliases,
+          qualifiedAliases: nextQualifiedAliases,
           country: body.country,
           language: body.language,
           tags: body.tags ?? [],
@@ -16973,6 +17033,7 @@ async function projectRoutes(app, opts) {
         canonicalDomain: body.canonicalDomain,
         ownedDomains: body.ownedDomains ?? [],
         aliases: nextAliases,
+        qualifiedAliases: nextQualifiedAliases,
         country: body.country,
         language: body.language,
         tags: body.tags ?? [],
@@ -17161,6 +17222,11 @@ async function projectRoutes(app, opts) {
       eq15(schedules.kind, SchedulableRunKinds["answer-visibility"])
     )).get();
     const notificationRows = app.db.select().from(notifications).where(eq15(notifications.projectId, project.id)).all();
+    const exportedQualifiedAliases = resolveProjectQualifiedAliases(
+      project,
+      project.qualifiedAliases,
+      comps.map((c) => competitorLabelFromDomain(c.domain))
+    ).value;
     const config = {
       apiVersion: "canonry/v1",
       kind: "Project",
@@ -17173,6 +17239,7 @@ async function projectRoutes(app, opts) {
         canonicalDomain: project.canonicalDomain,
         ownedDomains: project.ownedDomains,
         aliases: project.aliases,
+        ...exportedQualifiedAliases.length ? { qualifiedAliases: exportedQualifiedAliases } : {},
         country: project.country,
         language: project.language,
         queries: qs.map((q) => q.query),
@@ -17212,6 +17279,32 @@ function assertProviderModelScope(request, current, next, nextProviders) {
   if (providerModelsEqual(effectiveCurrent, effectiveNext)) return;
   requireScope(request, SETTINGS_WRITE_SCOPE);
 }
+function requireQualifiedAliases(identity, requested, competitorNames) {
+  const resolved = resolveProjectQualifiedAliases(identity, requested, competitorNames);
+  if (resolved.rejected.length > 0) {
+    const reasons = resolved.rejected.map((entry) => `${entry.name} (${entry.reason})`).join(", ");
+    throw validationError(`Rejected qualifiedAliases: ${reasons}`, {
+      rejectedQualifiedAliases: resolved.rejected
+    });
+  }
+  return resolved.value;
+}
+function liveCompetitorNames(db, projectId) {
+  return db.select({ domain: competitors.domain }).from(competitors).where(eq15(competitors.projectId, projectId)).all().map((row) => competitorLabelFromDomain(row.domain));
+}
+function pruneQualifiedAliasesForCompetitors(tx, projectId, now) {
+  const project = tx.select({
+    displayName: projects.displayName,
+    aliases: projects.aliases,
+    qualifiedAliases: projects.qualifiedAliases
+  }).from(projects).where(eq15(projects.id, projectId)).get();
+  if (!project?.qualifiedAliases.length) return [];
+  const kept = resolveProjectQualifiedAliases(project, project.qualifiedAliases, liveCompetitorNames(tx, projectId)).value;
+  const dropped = project.qualifiedAliases.filter((name) => !kept.includes(name));
+  if (dropped.length === 0) return [];
+  tx.update(projects).set({ qualifiedAliases: kept, updatedAt: now }).where(eq15(projects.id, projectId)).run();
+  return dropped;
+}
 function providerModelsEqual(a, b) {
   const aKeys = Object.keys(a);
   if (aKeys.length !== Object.keys(b).length) return false;
@@ -17225,6 +17318,7 @@ function formatProject(row, negativeReviewMaxStars) {
     canonicalDomain: row.canonicalDomain,
     ownedDomains: row.ownedDomains,
     aliases: row.aliases,
+    qualifiedAliases: row.qualifiedAliases,
     country: row.country,
     language: row.language,
     tags: row.tags,
@@ -17943,12 +18037,16 @@ async function competitorRoutes(app) {
           createdAt: now
         }).run();
       }
+      const droppedQualifiedAliases = pruneQualifiedAliasesForCompetitors(tx, project.id, now);
       writeAuditLog(tx, {
         projectId: project.id,
         actor: "api",
         action: "competitors.replaced",
         entityType: "competitor",
-        diff: { competitors: normalizedCompetitors }
+        diff: {
+          competitors: normalizedCompetitors,
+          ...droppedQualifiedAliases.length ? { droppedQualifiedAliases } : {}
+        }
       });
     });
     const rows = app.db.select().from(competitors).where(eq19(competitors.projectId, project.id)).all();
@@ -17975,12 +18073,13 @@ async function competitorRoutes(app) {
           target: [competitors.projectId, competitors.domain]
         }).run();
       }
+      const droppedQualifiedAliases = pruneQualifiedAliasesForCompetitors(tx, project.id, now);
       writeAuditLog(tx, {
         projectId: project.id,
         actor: "api",
         action: "competitors.appended",
         entityType: "competitor",
-        diff: { added }
+        diff: { added, ...droppedQualifiedAliases.length ? { droppedQualifiedAliases } : {} }
       });
     });
     const rows = app.db.select().from(competitors).where(eq19(competitors.projectId, project.id)).all();
@@ -29674,6 +29773,15 @@ async function applyRoutes(app, opts) {
       specProviders
     );
     const specDispatchModes = config.spec.providerDispatchModes === void 0 ? void 0 : validateProviderDispatchModes(config.spec.providerDispatchModes, opts?.providerAdapters);
+    const specCompetitorNames = normalizeCompetitorList2(config.spec.competitors).map(competitorLabelFromDomain);
+    const specQualifiedAliases = config.spec.qualifiedAliases === void 0 ? void 0 : requireQualifiedAliases(
+      {
+        displayName: config.spec.displayName,
+        aliases: normalizeProjectAliases(config.spec.displayName, config.spec.aliases)
+      },
+      config.spec.qualifiedAliases,
+      specCompetitorNames
+    );
     let resolvedSchedule = null;
     let deleteSchedule = false;
     if (config.spec.schedule) {
@@ -29732,6 +29840,11 @@ async function applyRoutes(app, opts) {
       }
       if (existing) {
         projectId = existing.id;
+        const qualifiedAliases = specQualifiedAliases ?? resolveProjectQualifiedAliases(
+          { displayName: config.spec.displayName, aliases: nextAliases },
+          existing.qualifiedAliases,
+          specCompetitorNames
+        ).value;
         const providerDispatchModes = pruneProviderDispatchModes(
           specDispatchModes ?? existing.providerDispatchModes,
           specProviders,
@@ -29742,6 +29855,7 @@ async function applyRoutes(app, opts) {
           canonicalDomain: config.spec.canonicalDomain,
           ownedDomains: config.spec.ownedDomains ?? [],
           aliases: nextAliases,
+          qualifiedAliases,
           country: config.spec.country,
           language: config.spec.language,
           labels: config.metadata.labels,
@@ -29773,6 +29887,7 @@ async function applyRoutes(app, opts) {
           canonicalDomain: config.spec.canonicalDomain,
           ownedDomains: config.spec.ownedDomains ?? [],
           aliases: nextAliases,
+          qualifiedAliases: specQualifiedAliases ?? [],
           country: config.spec.country,
           language: config.spec.language,
           tags: [],
@@ -29917,6 +30032,7 @@ async function applyRoutes(app, opts) {
       canonicalDomain: project.canonicalDomain,
       ownedDomains: project.ownedDomains,
       aliases: project.aliases,
+      qualifiedAliases: project.qualifiedAliases,
       country: project.country,
       language: project.language,
       tags: project.tags,
@@ -39392,6 +39508,7 @@ function formatProject2(row, negativeReviewMaxStars) {
     canonicalDomain: row.canonicalDomain,
     ownedDomains: row.ownedDomains,
     aliases: row.aliases,
+    qualifiedAliases: row.qualifiedAliases,
     country: row.country,
     language: row.language,
     tags: row.tags,
@@ -87632,13 +87749,18 @@ async function discoveryRoutes(app, opts) {
             createdAt: now
           }).run();
         }
+        const droppedQualifiedAliases = promotedCompetitors.length ? pruneQualifiedAliasesForCompetitors(tx, project.id, now) : [];
         writeAuditLog(tx, {
           projectId: project.id,
           actor: "api",
           action: "discovery.promoted",
           entityType: "discovery_session",
           entityId: session.id,
-          diff: { queries: promotedQueries, competitors: promotedCompetitors }
+          diff: {
+            queries: promotedQueries,
+            competitors: promotedCompetitors,
+            ...droppedQualifiedAliases.length ? { droppedQualifiedAliases } : {}
+          }
         });
       });
     }
@@ -90339,12 +90461,28 @@ function captureSimpleMeasurementDefinition(db, input) {
     if (definition.queries.some((query) => query.queryClass !== (classifier?.classify(query.queryText) ?? null))) {
       throw validationError("Query classes must match the captured identity and text.");
     }
+    if (definition.identity.qualifiedAliases !== void 0) {
+      const expected = resolveProjectQualifiedAliases(
+        definition.identity,
+        definition.identity.qualifiedAliases,
+        simpleMeasurementCompetitorNames(definition.competitors)
+      ).value;
+      const captured = definition.identity.qualifiedAliases;
+      if (captured.length !== expected.length || captured.some((name, index2) => name !== expected[index2])) {
+        throw validationError("Qualified aliases must be a sorted subset of the captured aliases.");
+      }
+    }
     const existing = tx.select().from(simpleMeasurementDefinitions).where(and68(eq81(simpleMeasurementDefinitions.projectId, input.projectId), eq81(simpleMeasurementDefinitions.runId, input.runId))).get();
     if (existing) {
       const frozen = simpleMeasurementDefinitionSchema.parse(existing.definition);
+      const { qualifiedAliases: _liveQualifiedAliases, ...liveIdentity } = definition.identity;
       const replayDefinition = {
         ...definition,
-        capturedAt: frozen.capturedAt
+        capturedAt: frozen.capturedAt,
+        identity: {
+          ...liveIdentity,
+          ...frozen.identity.qualifiedAliases?.length ? { qualifiedAliases: frozen.identity.qualifiedAliases } : {}
+        }
       };
       const replayChecksum = crypto51.createHash("sha256").update(canonicalSimpleMeasurementDefinitionJson(replayDefinition)).digest("hex");
       if (existing.checksum !== replayChecksum) {