@hiveai/core 0.20.1 → 0.23.0

package/dist/index.d.ts

@@ -593,6 +593,19 @@ interface PreventionEvent {
 declare function preventionLogPath(paths: HaivePaths): string;
 /** Append one catch to the log. Best-effort, creates the dir on demand. */
 declare function appendPreventionEvent(paths: HaivePaths, event: PreventionEvent): Promise<void>;
+/**
+ * THE single recorder for "a documented lesson intercepted a real mistake". Every gate path —
+ * the installed git-hook gate (`enforce check`), the standalone `haive sensors check`, and the
+ * `anti_patterns_check` MCP tool — funnels its fired memory ids through here so prevention is
+ * recorded once and identically, not bolted onto each entry point (it used to leak: the git-hook
+ * gate blocked but never recorded — see the harness-positioning gotcha).
+ *
+ * Bumps `prevented_count` in usage.json (debounced per memory via {@link recordPrevention}) AND
+ * appends one timestamped event per NEW catch to the prevention log. Best-effort: a telemetry
+ * write must never break a commit, so failures are swallowed. Returns the ids actually recorded
+ * (i.e. not debounced), so callers can report "caught for you" without re-counting.
+ */
+declare function recordPreventionHits(paths: HaivePaths, firedIds: string[], source: PreventionSource, now?: Date): Promise<string[]>;
 /** Read all catch events (skips malformed lines). */
 declare function loadPreventionEvents(paths: HaivePaths): Promise<PreventionEvent[]>;
 interface PreventionTrend {
@@ -1217,6 +1230,13 @@ interface HaiveConfig {
          * Default: "anchored" — makes "known bad approaches are blocked" true for the precise case.
          */
         antiPatternGate?: "off" | "review" | "anchored" | "strict";
+        /**
+         * Pre-commit/pre-push decision-coverage behaviour. When true (default), the gate SURFACES the
+         * relevant anchored decisions/policies itself and records them in the session marker at commit
+         * time — no separate `haive briefing` step required. Set false for the strict legacy behaviour
+         * where the commit is blocked until a prior briefing covered those decisions.
+         */
+        autoBrief?: boolean;
         /**
          * Execute `kind: "shell" | "test"` memory sensors during `haive sensors check`.
          * These run arbitrary repo-authored commands, so they are OFF by default; turn on per repo
@@ -2014,14 +2034,20 @@ declare function findUncapturedFailures(failures: FailureObservation[], captureT
  * Pure: the caller supplies hot files (from git history / briefing-radar) and the loaded corpus.
  */
 
+/** Where a file's "heat" came from: committed git churn, agent edits this/recent sessions, or both. */
+type HotFileSource = "git" | "agent" | "both";
 interface HotFile {
     path: string;
     /** Number of times the file changed in the lookback window (the "heat"). */
     changes: number;
+    /** Provenance of the heat. Optional for back-compat with git-only callers. */
+    source?: HotFileSource;
 }
 interface CoverageGap {
     path: string;
     changes: number;
+    /** Provenance of the heat that made this file a blind spot. */
+    source?: HotFileSource;
 }
 interface CoverageOptions {
     /** Only flag files with at least this many changes. Default 3. */
@@ -2043,6 +2069,17 @@ declare function isCovered(file: string, coverage: Set<string>): boolean;
  * Highest heat first. These are the highest-value places to add a memory or sensor.
  */
 declare function findCoverageGaps(hotFiles: HotFile[], memories: LoadedMemory[], options?: CoverageOptions): CoverageGap[];
+/**
+ * Tally a flat list of edited file paths into HotFiles — the agent-edit heat signal from the
+ * PostToolUse observation log (files agents actually touch), complementary to committed git churn.
+ * Pure: the caller reads/normalizes the observation paths.
+ */
+declare function tallyHotFiles(paths: string[], source?: HotFileSource): HotFile[];
+/**
+ * Merge two HotFile lists, summing heat per path. A file hot in both lists is tagged `both` so the
+ * report can show that agents AND git churn both point at the same uncovered file (the strongest gap).
+ */
+declare function mergeHotFiles(a: HotFile[], b: HotFile[]): HotFile[];
 
 interface EvalHistoryEntry {
     /** ISO timestamp of the eval run. */
@@ -2107,6 +2144,26 @@ interface ConflictResolution {
 }
 /** Compare two memories; returns the one that should WIN plus the reason. Pure. */
 declare function planConflictResolution(a: LoadedMemory, b: LoadedMemory): ConflictResolution;
+interface AppliedConflictResolution {
+    /** Updated frontmatter for the memory to keep (promoted). */
+    winner: MemoryFrontmatter;
+    /** Updated frontmatter for the memory to supersede (deprecated). */
+    loser: MemoryFrontmatter;
+    /** Topic the winner now carries — the consolidation target for future `mem_save` upserts. Null when neither carried one. */
+    topic: string | null;
+    /** True when the winner adopted the loser's topic because it had none. */
+    topic_adopted: boolean;
+}
+/**
+ * Turn a {@link ConflictResolution} plan into the two concrete frontmatter updates — the guided
+ * supersede the backlog called for, wired into topic-upsert/revision_count:
+ *   - loser  → deprecated, stamped with stale_reason + a related_ids link to the winner.
+ *   - winner → revision_count++ (it absorbed a contradiction), verified now, linked to the loser,
+ *     and it ADOPTS the loser's topic when it had none — so the next `mem_save` on this subject
+ *     upserts into the winner instead of spawning a third conflicting memory. An existing winner
+ *     topic is never overwritten. Pure: the caller persists both.
+ */
+declare function applyConflictResolution(winner: LoadedMemory, loser: LoadedMemory, plan: ConflictResolution, now?: Date): AppliedConflictResolution;
 
 /**
  * Cold-start seeding from git history — the harness has value only once the corpus is populated,
@@ -2336,4 +2393,4 @@ declare function prepareBridgeData(memories: Memory[], sensors: BridgeSensor[],
  */
 declare function generateBridges(memories: Memory[], sensors: BridgeSensor[], opts?: GenerateBridgesOptions): BridgeFileOutput[];
 
-export { AUTOPILOT_DEFAULTS, type Activation, type ActivationContext, ActivationSchema, type Anchor, AnchorSchema, type AntiPatternGate, type AutoPromoteRule, BRIDGE_MARKERS, BRIDGE_TARGETS, BRIDGE_TARGET_PATH, BRIEFING_MARKER_TTL_MS, BRIEFING_PRESET_DEFAULTS, type BreakingChange, type BridgeFileOutput, type BridgeMemoryEntry, type BridgeSensor, type BridgeTarget, type BriefingBudgetNumbers, type BriefingBudgetPreset, type BriefingMarker, type BriefingProofLineOptions, type BudgetPart, type BudgetSlice, type BuildCodeMapOptions, CHARS_PER_TOKEN, CODE_MAP_FILE, CODE_STOPWORDS, CONFIG_FILE, type CaughtForYouOptions, type CaughtForYouRow, type CaughtForYouSummary, type CodeExport, type CodeExportKind, type CodeFileEntry, type CodeMap, type CodeMapQueryOptions, type CollectTimelineOpts, type CommandSensorSpec, type ConfidenceLevel, type ConfidenceThresholds, type ConflictCandidatePair, type ConflictCandidatesOpts, type ConflictResolution, type ContractDiffResult, type ContractFile, type ContractSnapshot, type CoverageGap, type CoverageOptions, CrossRepoProvenanceSchema, type CrossRepoReport, type CrossRepoSource, DECAY_DAYS, DEFAULT_AUTO_PROMOTE_RULE, DEFAULT_CONFIDENCE_THRESHOLDS, DEFAULT_CONFIG, DEFAULT_DORMANT_DAYS, DEFAULT_PRIORITY_SIGNALS, type DashboardOptions, type DashboardReport, type DepChange, type DepTrackResult, type DependencySnapshot, type DetectStacksInput, type DetectableStack, type DocFrequency, type DormantRow, type DraftOptions, type DraftsOptions, ENV_WORKAROUND_TAGS, type EvalDelta, type EvalHistoryEntry, type EvalReport, type EvalSpec, type EvalTrend, type FailureCoverageOptions, type FailureObservation, type FeedbackAdjustment, type FeedbackAdjustmentAction, type FeedbackAdjustmentOptions, type Finding, type FindingFormat, type FindingSeverity, GUESSABLE_THRESHOLD, type GatePrecision, type GatePrecisionDelta, type GatePrecisionMetricDelta, type GateTuningSuggestion, type GenerateBridgesOptions, type GitCommit, HAIVE_DIR, type HaiveConfig, type HaivePaths, type HotFile, type ImpactOptions, type ImpactRow, type ImpactScore, type ImpactSummary, type ImpactTier, type LexicalRankResult, type LoadedMemory, MEMORIES_DIR, MIN_WORD_LEN, type Memory, type MemoryDraft, type MemoryFrontmatter, MemoryFrontmatterSchema, type MemoryPriority, type MemoryScope, MemoryScopeSchema, type MemoryStatus, MemoryStatusSchema, type MemoryType, MemoryTypeSchema, type MemoryUsage, type MergeResult, type MetricDelta, PREVENTION_DEBOUNCE_MS, PROJECT_CONTEXT_FILE, PROJECT_CONTEXT_THROTTLE_MS, type PreventionEvent, type PreventionRow, type PreventionSource, type PreventionTrend, type PrioritySignals, RUNTIME_JOURNAL_FILENAME, type RecurrenceReport, type RecurrenceRow, type ResolveProjectInfo, type RetirementSignal, type RetrievalAggregate, type RetrievalCase, type RetrievalCaseResult, type RuntimeJournalEntry, SESSION_RECAP_TTL_MS, STACK_PACK_TAG, type SeedProposal, type SelfEvalOptions, type Sensor, type SensorAggregate, type SensorCase, type SensorCaseResult, type SensorHit, type SensorRow, SensorSchema, type SensorSuggestionOptions, type SensorTarget, type SkillActivation, type TimelineEntry, type TopicStatusPair, type TruncateOptions, type TruncateResult, USAGE_FILE, USAGE_LOG_DIR, USAGE_LOG_FILE, type UncapturedFailure, type UsageAggregate, type UsageEvent, type UsageIndex, type VerifyOptions, type VerifyResult, addedLinesFromDiff, aggregateRetrieval, aggregateSensors, aggregateUsage, allocateBudget, antiPatternGateParams, appendEvalHistory, appendPreventionEvent, appendRuntimeJournalEntry, appendUsageEvent, applyFeedbackAdjustment, bridgeMemorySummary, briefingMarkerPath, briefingMarkersDir, briefingProofLine, buildCodeMap, buildCoverageIndex, buildDashboard, buildDocFrequency, buildFrontmatter, buildReport, bumpRead, classifyMemoryPriority, codeMapPath, collectTimelineEntries, compactAutoRecapBody, compareEvalReports, compareGatePrecision, compareImpact, compileRegexSensor, computeEvalTrend, computeGatePrecision, computeImpact, computePreventionTrend, computeRecurrence, configPath, contractLockPath, deriveConfidence, detectStacksFromManifests, diffContract, diffHasDistinctiveOverlap, distinctiveCap, draftsFromFindings, emptyUsage, emptyUsageIndex, enforcementDir, estimateTokens, evalHistoryPath, evaluateSkillActivation, extractActionsBriefBody, extractSnippet, filterNewDrafts, findCoverageGaps, findLexicalConflictPairs, findProjectRoot, findTopicStatusConflictPairs, findUncapturedFailures, findingBody, findingToDraft, firstMemoryOneLine, generateBridges, getUsage, globToRegExp, hasRecentBriefingMarker, hashProjectContext, inferModulesFromPaths, isAutoPromoteEligible, isAutoRecap, isCovered, isDecaying, isDistinctiveToken, isEnvWorkaroundMemory, isFreshIsoDate, isGlobPath, isLikelyGuessable, isRetiredMemory, isSkill, isSkillSuppressed, isStackPackSeed, listMarkdownFilesRecursive, literalMatchesAllTokens, literalMatchesAnyToken, loadCodeMap, loadConfig, loadConfigSync, loadEvalHistory, loadMemoriesFromDir, loadMemory, loadPreventionEvents, loadUsageIndex, looksLikeGenericAdvice, memoryFilePath, memoryMatchesAnchorPaths, mergeMemoryVersions, newMemoryId, normalizeFindingSeverity, normalizeSessionId, overallScore, parseEslintJson, parseFindings, parseMemory, parseNpmAudit, parseSarif, parseSince, parseSonar, pathsOverlap, pickSnippetNeedle, planConflictResolution, prepareBridgeData, preventionLogPath, priorityRank, prioritySignals, projectContextRecentlyEmitted, proposeSeedsFromCommits, pullCrossRepoSources, queryCodeMap, rankMemoriesLexical, readRecentBriefingMarker, readRuntimeJournalTail, readUsageEvents, recommendFeedbackAdjustment, recordApplied, recordPrevention, recordProjectContextEmission, recordRejection, relPathFrom, renderCaughtForYou, resolveBriefingBudget, resolveHaivePaths, resolveManifestFiles, resolveProjectInfo, retirementSignal, runRegexSensor, runSensors, runtimeJournalPath, saveCodeMap, saveConfig, saveUsageIndex, scoreRetrievalCase, scoreSensorCase, selectCommandSensors, sensorAppliesToPath, sensorTargetsFromDiff, serializeMemory, snapshotContract, specificityScore, stripPrivate, suggestGate, suggestSensorFromMemory, suggestTopicKey, summarizeCaughtForYou, summarizeImpact, synthesizeSelfEvalCases, titleFromBody, tokenizeQuery, tokenizeWords, trackDependencies, trackReads, truncateToTokens, usageLogPath, usageLogSize, usagePath, verifyAnchor, watchContracts, writeBriefingMarker };
+export { AUTOPILOT_DEFAULTS, type Activation, type ActivationContext, ActivationSchema, type Anchor, AnchorSchema, type AntiPatternGate, type AppliedConflictResolution, type AutoPromoteRule, BRIDGE_MARKERS, BRIDGE_TARGETS, BRIDGE_TARGET_PATH, BRIEFING_MARKER_TTL_MS, BRIEFING_PRESET_DEFAULTS, type BreakingChange, type BridgeFileOutput, type BridgeMemoryEntry, type BridgeSensor, type BridgeTarget, type BriefingBudgetNumbers, type BriefingBudgetPreset, type BriefingMarker, type BriefingProofLineOptions, type BudgetPart, type BudgetSlice, type BuildCodeMapOptions, CHARS_PER_TOKEN, CODE_MAP_FILE, CODE_STOPWORDS, CONFIG_FILE, type CaughtForYouOptions, type CaughtForYouRow, type CaughtForYouSummary, type CodeExport, type CodeExportKind, type CodeFileEntry, type CodeMap, type CodeMapQueryOptions, type CollectTimelineOpts, type CommandSensorSpec, type ConfidenceLevel, type ConfidenceThresholds, type ConflictCandidatePair, type ConflictCandidatesOpts, type ConflictResolution, type ContractDiffResult, type ContractFile, type ContractSnapshot, type CoverageGap, type CoverageOptions, CrossRepoProvenanceSchema, type CrossRepoReport, type CrossRepoSource, DECAY_DAYS, DEFAULT_AUTO_PROMOTE_RULE, DEFAULT_CONFIDENCE_THRESHOLDS, DEFAULT_CONFIG, DEFAULT_DORMANT_DAYS, DEFAULT_PRIORITY_SIGNALS, type DashboardOptions, type DashboardReport, type DepChange, type DepTrackResult, type DependencySnapshot, type DetectStacksInput, type DetectableStack, type DocFrequency, type DormantRow, type DraftOptions, type DraftsOptions, ENV_WORKAROUND_TAGS, type EvalDelta, type EvalHistoryEntry, type EvalReport, type EvalSpec, type EvalTrend, type FailureCoverageOptions, type FailureObservation, type FeedbackAdjustment, type FeedbackAdjustmentAction, type FeedbackAdjustmentOptions, type Finding, type FindingFormat, type FindingSeverity, GUESSABLE_THRESHOLD, type GatePrecision, type GatePrecisionDelta, type GatePrecisionMetricDelta, type GateTuningSuggestion, type GenerateBridgesOptions, type GitCommit, HAIVE_DIR, type HaiveConfig, type HaivePaths, type HotFile, type HotFileSource, type ImpactOptions, type ImpactRow, type ImpactScore, type ImpactSummary, type ImpactTier, type LexicalRankResult, type LoadedMemory, MEMORIES_DIR, MIN_WORD_LEN, type Memory, type MemoryDraft, type MemoryFrontmatter, MemoryFrontmatterSchema, type MemoryPriority, type MemoryScope, MemoryScopeSchema, type MemoryStatus, MemoryStatusSchema, type MemoryType, MemoryTypeSchema, type MemoryUsage, type MergeResult, type MetricDelta, PREVENTION_DEBOUNCE_MS, PROJECT_CONTEXT_FILE, PROJECT_CONTEXT_THROTTLE_MS, type PreventionEvent, type PreventionRow, type PreventionSource, type PreventionTrend, type PrioritySignals, RUNTIME_JOURNAL_FILENAME, type RecurrenceReport, type RecurrenceRow, type ResolveProjectInfo, type RetirementSignal, type RetrievalAggregate, type RetrievalCase, type RetrievalCaseResult, type RuntimeJournalEntry, SESSION_RECAP_TTL_MS, STACK_PACK_TAG, type SeedProposal, type SelfEvalOptions, type Sensor, type SensorAggregate, type SensorCase, type SensorCaseResult, type SensorHit, type SensorRow, SensorSchema, type SensorSuggestionOptions, type SensorTarget, type SkillActivation, type TimelineEntry, type TopicStatusPair, type TruncateOptions, type TruncateResult, USAGE_FILE, USAGE_LOG_DIR, USAGE_LOG_FILE, type UncapturedFailure, type UsageAggregate, type UsageEvent, type UsageIndex, type VerifyOptions, type VerifyResult, addedLinesFromDiff, aggregateRetrieval, aggregateSensors, aggregateUsage, allocateBudget, antiPatternGateParams, appendEvalHistory, appendPreventionEvent, appendRuntimeJournalEntry, appendUsageEvent, applyConflictResolution, applyFeedbackAdjustment, bridgeMemorySummary, briefingMarkerPath, briefingMarkersDir, briefingProofLine, buildCodeMap, buildCoverageIndex, buildDashboard, buildDocFrequency, buildFrontmatter, buildReport, bumpRead, classifyMemoryPriority, codeMapPath, collectTimelineEntries, compactAutoRecapBody, compareEvalReports, compareGatePrecision, compareImpact, compileRegexSensor, computeEvalTrend, computeGatePrecision, computeImpact, computePreventionTrend, computeRecurrence, configPath, contractLockPath, deriveConfidence, detectStacksFromManifests, diffContract, diffHasDistinctiveOverlap, distinctiveCap, draftsFromFindings, emptyUsage, emptyUsageIndex, enforcementDir, estimateTokens, evalHistoryPath, evaluateSkillActivation, extractActionsBriefBody, extractSnippet, filterNewDrafts, findCoverageGaps, findLexicalConflictPairs, findProjectRoot, findTopicStatusConflictPairs, findUncapturedFailures, findingBody, findingToDraft, firstMemoryOneLine, generateBridges, getUsage, globToRegExp, hasRecentBriefingMarker, hashProjectContext, inferModulesFromPaths, isAutoPromoteEligible, isAutoRecap, isCovered, isDecaying, isDistinctiveToken, isEnvWorkaroundMemory, isFreshIsoDate, isGlobPath, isLikelyGuessable, isRetiredMemory, isSkill, isSkillSuppressed, isStackPackSeed, listMarkdownFilesRecursive, literalMatchesAllTokens, literalMatchesAnyToken, loadCodeMap, loadConfig, loadConfigSync, loadEvalHistory, loadMemoriesFromDir, loadMemory, loadPreventionEvents, loadUsageIndex, looksLikeGenericAdvice, memoryFilePath, memoryMatchesAnchorPaths, mergeHotFiles, mergeMemoryVersions, newMemoryId, normalizeFindingSeverity, normalizeSessionId, overallScore, parseEslintJson, parseFindings, parseMemory, parseNpmAudit, parseSarif, parseSince, parseSonar, pathsOverlap, pickSnippetNeedle, planConflictResolution, prepareBridgeData, preventionLogPath, priorityRank, prioritySignals, projectContextRecentlyEmitted, proposeSeedsFromCommits, pullCrossRepoSources, queryCodeMap, rankMemoriesLexical, readRecentBriefingMarker, readRuntimeJournalTail, readUsageEvents, recommendFeedbackAdjustment, recordApplied, recordPrevention, recordPreventionHits, recordProjectContextEmission, recordRejection, relPathFrom, renderCaughtForYou, resolveBriefingBudget, resolveHaivePaths, resolveManifestFiles, resolveProjectInfo, retirementSignal, runRegexSensor, runSensors, runtimeJournalPath, saveCodeMap, saveConfig, saveUsageIndex, scoreRetrievalCase, scoreSensorCase, selectCommandSensors, sensorAppliesToPath, sensorTargetsFromDiff, serializeMemory, snapshotContract, specificityScore, stripPrivate, suggestGate, suggestSensorFromMemory, suggestTopicKey, summarizeCaughtForYou, summarizeImpact, synthesizeSelfEvalCases, tallyHotFiles, titleFromBody, tokenizeQuery, tokenizeWords, trackDependencies, trackReads, truncateToTokens, usageLogPath, usageLogSize, usagePath, verifyAnchor, watchContracts, writeBriefingMarker };

package/dist/index.js

@@ -852,6 +852,25 @@ async function appendPreventionEvent(paths, event) {
   await mkdir2(path6.dirname(file), { recursive: true });
   await appendFile(file, JSON.stringify(event) + "\n", "utf8");
 }
+async function recordPreventionHits(paths, firedIds, source, now = /* @__PURE__ */ new Date()) {
+  const unique = [...new Set(firedIds)].filter(Boolean);
+  if (unique.length === 0) return [];
+  const usage = await loadUsageIndex(paths).catch(() => null);
+  if (!usage) return [];
+  const recordedIds = [];
+  for (const id of unique) {
+    if (recordPrevention(usage, id, now.getTime())) recordedIds.push(id);
+  }
+  if (recordedIds.length === 0) return [];
+  await saveUsageIndex(paths, usage).catch(() => {
+  });
+  const at = now.toISOString();
+  for (const id of recordedIds) {
+    await appendPreventionEvent(paths, { at, id, source }).catch(() => {
+    });
+  }
+  return recordedIds;
+}
 async function loadPreventionEvents(paths) {
   const file = preventionLogPath(paths);
   if (!existsSync4(file)) return [];
@@ -3906,11 +3925,36 @@ function findCoverageGaps(hotFiles, memories, options = {}) {
   for (const hot of hotFiles) {
     if (hot.changes < minChanges) continue;
     if (isCovered(hot.path, coverage)) continue;
-    gaps.push({ path: normalizePath(hot.path), changes: hot.changes });
+    gaps.push({ path: normalizePath(hot.path), changes: hot.changes, ...hot.source ? { source: hot.source } : {} });
   }
   gaps.sort((a, b) => b.changes - a.changes);
   return gaps.slice(0, limit);
 }
+function tallyHotFiles(paths, source = "agent") {
+  const counts = /* @__PURE__ */ new Map();
+  for (const raw of paths) {
+    const norm = normalizePath(raw);
+    if (!norm) continue;
+    counts.set(norm, (counts.get(norm) ?? 0) + 1);
+  }
+  return [...counts.entries()].map(([path18, changes]) => ({ path: path18, changes, source })).sort((a, b) => b.changes - a.changes);
+}
+function mergeHotFiles(a, b) {
+  const merged = /* @__PURE__ */ new Map();
+  for (const hot of [...a, ...b]) {
+    const norm = normalizePath(hot.path);
+    if (!norm) continue;
+    const existing = merged.get(norm);
+    if (!existing) {
+      merged.set(norm, { path: norm, changes: hot.changes, ...hot.source ? { source: hot.source } : {} });
+      continue;
+    }
+    existing.changes += hot.changes;
+    if (hot.source && existing.source && hot.source !== existing.source) existing.source = "both";
+    else existing.source = existing.source ?? hot.source;
+  }
+  return [...merged.values()].sort((x, y) => y.changes - x.changes);
+}
 
 // src/eval-history.ts
 import { appendFile as appendFile4, mkdir as mkdir11, readFile as readFile14 } from "fs/promises";
@@ -3998,6 +4042,30 @@ function planConflictResolution(a, b) {
     stale_reason: `Superseded by ${keepId} (conflict resolved on ${reason}).`
   };
 }
+function applyConflictResolution(winner, loser, plan, now = /* @__PURE__ */ new Date()) {
+  const ts = now.toISOString();
+  const wf = winner.memory.frontmatter;
+  const lf = loser.memory.frontmatter;
+  const winnerHasTopic = Boolean(wf.topic && wf.topic.trim() !== "");
+  const loserHasTopic = Boolean(lf.topic && lf.topic.trim() !== "");
+  const topicAdopted = !winnerHasTopic && loserHasTopic;
+  const topic = winnerHasTopic ? wf.topic : topicAdopted ? lf.topic : null;
+  const winnerFm = {
+    ...wf,
+    revision_count: wf.revision_count + 1,
+    verified_at: ts,
+    related_ids: [.../* @__PURE__ */ new Set([...wf.related_ids, plan.supersede_id])],
+    ...topic ? { topic } : {}
+  };
+  const loserFm = {
+    ...lf,
+    status: "deprecated",
+    stale_reason: plan.stale_reason,
+    verified_at: ts,
+    related_ids: [.../* @__PURE__ */ new Set([...lf.related_ids, plan.keep_id])]
+  };
+  return { winner: winnerFm, loser: loserFm, topic, topic_adopted: topicAdopted };
+}
 
 // src/seed-git.ts
 var REVERT_RE = /^Revert\s+"(.+)"\s*$/i;
@@ -4383,6 +4451,7 @@ export {
   appendPreventionEvent,
   appendRuntimeJournalEntry,
   appendUsageEvent,
+  applyConflictResolution,
   applyFeedbackAdjustment,
   bridgeMemorySummary,
   briefingMarkerPath,
@@ -4466,6 +4535,7 @@ export {
   looksLikeGenericAdvice,
   memoryFilePath,
   memoryMatchesAnchorPaths,
+  mergeHotFiles,
   mergeMemoryVersions,
   newMemoryId,
   normalizeFindingSeverity,
@@ -4496,6 +4566,7 @@ export {
   recommendFeedbackAdjustment,
   recordApplied,
   recordPrevention,
+  recordPreventionHits,
   recordProjectContextEmission,
   recordRejection,
   relPathFrom,
@@ -4526,6 +4597,7 @@ export {
   summarizeCaughtForYou,
   summarizeImpact,
   synthesizeSelfEvalCases,
+  tallyHotFiles,
   titleFromBody,
   tokenizeQuery,
   tokenizeWords,