@cortexkit/pi-magic-context 0.22.0 → 0.22.2

package/dist/subagent-entry.js

@@ -86,9 +86,6 @@ function getMagicContextStorageDir() {
 function getLegacyOpenCodeMagicContextStorageDir() {
   return path.join(getOpenCodeStorageDir(), "plugin", "magic-context");
 }
-function getCacheDir() {
-  return process.env.XDG_CACHE_HOME ?? path.join(os.homedir(), ".cache");
-}
 var init_data_path = () => {};
 
 // ../plugin/src/shared/logger.ts
@@ -8919,6 +8916,38 @@ var MIGRATIONS = [
                     ON tags(session_id, entry_fingerprint)
                     WHERE type='message' AND entry_fingerprint IS NOT NULL`);
     }
+  },
+  {
+    version: 28,
+    description: "Add git commit sweep coordinator lease/cooldown table",
+    up: (db) => {
+      db.exec(`
+                CREATE TABLE IF NOT EXISTS git_sweep_coordinator (
+                    project_path TEXT PRIMARY KEY,
+                    lease_holder TEXT,
+                    lease_expires_at INTEGER,
+                    last_swept_at INTEGER
+                );
+                CREATE INDEX IF NOT EXISTS idx_git_sweep_coordinator_lease_expires
+                    ON git_sweep_coordinator(lease_expires_at);
+                CREATE INDEX IF NOT EXISTS idx_git_sweep_coordinator_last_swept
+                    ON git_sweep_coordinator(last_swept_at);
+            `);
+    }
+  },
+  {
+    version: 29,
+    description: "Add anchor_ordinal to notes (traceback to the conversation tail)",
+    up: (db) => {
+      const notesExists = db.prepare("SELECT name FROM sqlite_master WHERE type='table' AND name='notes'").get();
+      if (!notesExists) {
+        return;
+      }
+      const columns = db.prepare("PRAGMA table_info(notes)").all();
+      if (!columns.some((column) => column.name === "anchor_ordinal")) {
+        db.exec("ALTER TABLE notes ADD COLUMN anchor_ordinal INTEGER");
+      }
+    }
   }
 ];
 var LATEST_MIGRATION_VERSION = MIGRATIONS.reduce((max, m) => Math.max(max, m.version), 0);
@@ -141883,7 +141912,7 @@ var databases = new Map;
 var persistenceByDatabase = new WeakMap;
 var persistenceErrorByDatabase = new WeakMap;
 var lastSchemaFenceRejection = null;
-var LATEST_SUPPORTED_VERSION = 27;
+var LATEST_SUPPORTED_VERSION = 29;
 function resolveDatabasePath(dbPathOverride) {
   if (dbPathOverride) {
     return { dbDir: dirname2(dbPathOverride), dbPath: dbPathOverride };
@@ -142203,6 +142232,17 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
       updated_at INTEGER NOT NULL DEFAULT 0
     );
 
+    CREATE TABLE IF NOT EXISTS git_sweep_coordinator (
+      project_path TEXT PRIMARY KEY,
+      lease_holder TEXT,
+      lease_expires_at INTEGER,
+      last_swept_at INTEGER
+    );
+    CREATE INDEX IF NOT EXISTS idx_git_sweep_coordinator_lease_expires
+      ON git_sweep_coordinator(lease_expires_at);
+    CREATE INDEX IF NOT EXISTS idx_git_sweep_coordinator_last_swept
+      ON git_sweep_coordinator(last_swept_at);
+
     CREATE TABLE IF NOT EXISTS m0_mutation_log (
       id INTEGER PRIMARY KEY AUTOINCREMENT,
       session_id TEXT NOT NULL,
@@ -157156,25 +157196,26 @@ var PermissionSchema = exports_external.object({
   external_directory: PermissionValueSchema.optional()
 }).optional();
 var AgentOverrideConfigSchema = exports_external.object({
-  model: exports_external.string().optional(),
-  temperature: exports_external.number().min(0).max(2).optional(),
-  top_p: exports_external.number().min(0).max(1).optional(),
-  prompt: exports_external.string().optional(),
-  tools: exports_external.record(exports_external.string(), exports_external.boolean()).optional(),
-  disable: exports_external.boolean().optional(),
-  description: exports_external.string().optional(),
-  mode: exports_external.enum(["subagent", "primary", "all"]).optional(),
-  color: exports_external.string().regex(/^#[0-9A-Fa-f]{6}$/).optional(),
-  maxSteps: exports_external.number().optional(),
-  permission: PermissionSchema,
-  maxTokens: exports_external.number().optional(),
-  variant: exports_external.string().optional(),
-  fallback_models: exports_external.union([exports_external.string(), exports_external.array(exports_external.string())]).optional()
+  model: exports_external.string().optional().describe("Primary model ID (e.g. 'claude-sonnet-4-6')"),
+  temperature: exports_external.number().min(0).max(2).optional().describe("Sampling temperature (0-2)"),
+  top_p: exports_external.number().min(0).max(1).optional().describe("Nucleus sampling top_p (0-1)"),
+  prompt: exports_external.string().optional().describe("Additional system prompt text"),
+  tools: exports_external.record(exports_external.string(), exports_external.boolean()).optional().describe("Tool enable/disable overrides"),
+  disable: exports_external.boolean().optional().describe("Disable this agent"),
+  description: exports_external.string().optional().describe("Agent description"),
+  mode: exports_external.enum(["subagent", "primary", "all"]).optional().describe("Agent mode (subagent, primary, or all)"),
+  color: exports_external.string().regex(/^#[0-9A-Fa-f]{6}$/).optional().describe("Hex color for the agent (e.g. '#a1b2c3')"),
+  maxSteps: exports_external.number().optional().describe("Maximum tool-call steps per invocation"),
+  permission: PermissionSchema.describe("Per-tool permission overrides"),
+  maxTokens: exports_external.number().optional().describe("Maximum output tokens"),
+  variant: exports_external.string().optional().describe("OpenCode reasoning variant (e.g. for extended thinking)"),
+  fallback_models: exports_external.union([exports_external.string(), exports_external.array(exports_external.string())]).optional().describe("Fallback model IDs if primary is unavailable")
 });
 
 // ../plugin/src/config/schema/magic-context.ts
 var DEFAULT_NUDGE_INTERVAL_TOKENS = 1e4;
 var DEFAULT_EXECUTE_THRESHOLD_PERCENTAGE = 65;
+var EXECUTE_THRESHOLD_CAP_MESSAGE = "execute_threshold is capped at 80% for cache safety: a single large agent step can overflow the context window before Magic Context can compact between turns, forcing OpenCode's native compaction (hard to recover from). 80% also leaves headroom below the 85%/95% emergency bands. Use a value between 20 and 80.";
 var DEFAULT_HISTORIAN_TIMEOUT_MS = 300000;
 var DEFAULT_HISTORY_BUDGET_PERCENTAGE = 0.15;
 var DEFAULT_LOCAL_EMBEDDING_MODEL = "Xenova/all-MiniLM-L6-v2";
@@ -157194,36 +157235,38 @@ var DEFAULT_DREAMER_TASKS = [
 ];
 var PiThinkingLevelSchema = exports_external.enum(["off", "minimal", "low", "medium", "high", "xhigh"]).optional();
 var DreamerConfigSchema = AgentOverrideConfigSchema.merge(exports_external.object({
-  schedule: exports_external.string().default("02:00-06:00"),
-  max_runtime_minutes: exports_external.number().min(10).default(120),
-  tasks: exports_external.array(DreamingTaskSchema).default(DEFAULT_DREAMER_TASKS),
-  task_timeout_minutes: exports_external.number().min(5).default(20),
-  inject_docs: exports_external.boolean().default(true),
+  schedule: exports_external.string().default("02:00-06:00").describe("Scheduled window for overnight dreaming (e.g. '02:00-06:00')"),
+  max_runtime_minutes: exports_external.number().min(10).default(120).describe("Maximum runtime per dream session in minutes"),
+  tasks: exports_external.array(DreamingTaskSchema).default(DEFAULT_DREAMER_TASKS).describe("Tasks to run during dreaming, in order"),
+  task_timeout_minutes: exports_external.number().min(5).default(20).describe("Minutes allocated per task before moving to next"),
+  inject_docs: exports_external.boolean().default(true).describe("Inject ARCHITECTURE.md and STRUCTURE.md into system prompt"),
   user_memories: exports_external.object({
-    enabled: exports_external.boolean().default(true),
-    promotion_threshold: exports_external.number().min(2).max(20).default(3)
-  }).default({ enabled: true, promotion_threshold: 3 }),
+    enabled: exports_external.boolean().default(true).describe("Enable user memory extraction and promotion (default: true)"),
+    promotion_threshold: exports_external.number().min(2).max(20).default(3).describe("Minimum candidate observations before dreamer considers promotion (default: 3)")
+  }).default({ enabled: true, promotion_threshold: 3 }).describe("User memory pipeline: historian extracts behavior observations from each compartment run; dreamer reviews recurring patterns and promotes them to stable user memories injected into all sessions as <user-profile>. Requires dreamer to not be disabled for promotion to actually happen. Graduated from experimental in v0.14. Default: enabled."),
   pin_key_files: exports_external.object({
-    enabled: exports_external.boolean().default(false),
-    token_budget: exports_external.number().min(2000).max(30000).default(1e4),
-    min_reads: exports_external.number().min(2).max(20).default(4)
-  }).default({ enabled: false, token_budget: 1e4, min_reads: 4 }),
-  thinking_level: PiThinkingLevelSchema
+    enabled: exports_external.boolean().default(false).describe("Enable key file pinning (default: false)"),
+    token_budget: exports_external.number().min(2000).max(30000).default(1e4).describe("Total token budget for all pinned key files (min: 2000, max: 30000, default: 10000)"),
+    min_reads: exports_external.number().min(2).max(20).default(4).describe("Minimum full-read count before a file is considered for pinning (min: 2, default: 4)")
+  }).default({ enabled: false, token_budget: 1e4, min_reads: 4 }).describe("Pin frequently-read key files into the system prompt so the agent doesn't need to re-read them after context drops. Dreamer identifies key files per session based on read patterns. Requires dreamer to not be disabled for selection to happen. Graduated from experimental in v0.14. Default: disabled."),
+  thinking_level: PiThinkingLevelSchema.describe("Pi only: explicit thinking level for dreamer subagent invocations. See historian.thinking_level.")
 }));
 var SidekickConfigSchema = AgentOverrideConfigSchema.extend({
-  timeout_ms: exports_external.number().default(30000),
-  system_prompt: exports_external.string().optional(),
-  thinking_level: PiThinkingLevelSchema
+  timeout_ms: exports_external.number().default(30000).describe("Timeout for sidekick calls in milliseconds"),
+  system_prompt: exports_external.string().optional().describe("Custom system prompt for sidekick"),
+  thinking_level: PiThinkingLevelSchema.describe("Pi only: explicit thinking level for sidekick subagent invocations. See historian.thinking_level.")
 }).optional();
 var HistorianConfigSchema = AgentOverrideConfigSchema.extend({
-  two_pass: exports_external.boolean().default(false),
-  thinking_level: PiThinkingLevelSchema
+  two_pass: exports_external.boolean().default(false).describe("Run a second editor pass over historian output to clean low-signal U: lines and cross-compartment duplicates. Adds ~1 extra API call and ~1.3x cost per historian run. Useful for models without extended thinking support. (default: false)"),
+  thinking_level: PiThinkingLevelSchema.describe("Pi only: explicit thinking level passed as --thinking <level> to Pi historian subagent invocations. Required when using reasoning models (e.g. github-copilot/gpt-5.4) because Pi's default thinking-level resolution can pick a value the provider rejects. OpenCode users set variant instead. Valid: off | minimal | low | medium | high | xhigh")
 }).optional();
 var BaseEmbeddingConfigSchema = exports_external.object({
-  provider: exports_external.enum(["local", "openai-compatible", "off"]).default("local"),
-  model: exports_external.string().optional(),
-  endpoint: exports_external.string().optional(),
-  api_key: exports_external.string().optional()
+  provider: exports_external.enum(["local", "openai-compatible", "off"]).default("local").describe("Embedding provider. 'local' uses Xenova/all-MiniLM-L6-v2, 'openai-compatible' requires endpoint and model, 'off' disables embeddings."),
+  model: exports_external.string().optional().describe("Embedding model name. Required for openai-compatible, ignored for local."),
+  endpoint: exports_external.string().optional().describe("API endpoint URL. Required when provider is openai-compatible."),
+  api_key: exports_external.string().optional().describe("API key for remote embedding provider (optional)"),
+  input_type: exports_external.string().optional().describe("Optional input_type sent in the embedding request body. Required by some openai-compatible providers (e.g. NVIDIA NIM expects 'query' or 'passage'). Omitted from the request when unset."),
+  truncate: exports_external.string().optional().describe("Optional truncate mode sent in the embedding request body (e.g. NVIDIA NIM accepts 'NONE' | 'START' | 'END'). Omitted from the request when unset.")
 }).superRefine((data, ctx) => {
   if (data.provider === "openai-compatible" && !data.endpoint?.trim()) {
     ctx.addIssue({
@@ -157249,76 +157292,80 @@ var EmbeddingConfigSchema = BaseEmbeddingConfigSchema.transform((data) => {
   }
   if (data.provider === "openai-compatible") {
     const apiKey = data.api_key?.trim();
+    const inputType = data.input_type?.trim();
+    const truncate = data.truncate?.trim();
     return {
       provider: "openai-compatible",
       model: data.model?.trim() ?? "",
       endpoint: data.endpoint?.trim() ?? "",
-      ...apiKey ? { api_key: apiKey } : {}
+      ...apiKey ? { api_key: apiKey } : {},
+      ...inputType ? { input_type: inputType } : {},
+      ...truncate ? { truncate } : {}
     };
   }
   return { provider: "off" };
 });
 var MagicContextConfigSchema = exports_external.object({
-  enabled: exports_external.boolean().default(true),
-  auto_update: exports_external.boolean().optional(),
-  ctx_reduce_enabled: exports_external.boolean().default(true),
-  historian: HistorianConfigSchema,
-  dreamer: DreamerConfigSchema.optional(),
-  cache_ttl: exports_external.union([exports_external.string(), exports_external.object({ default: exports_external.string() }).catchall(exports_external.string())]).default("5m"),
-  nudge_interval_tokens: exports_external.number().min(1000).default(DEFAULT_NUDGE_INTERVAL_TOKENS),
+  enabled: exports_external.boolean().default(true).describe("Enable magic context (default: true)"),
+  auto_update: exports_external.boolean().optional().describe("Enable automatic npm self-update checks for the OpenCode plugin. Security: USER-only in config loader, so hostile project configs cannot suppress updates."),
+  ctx_reduce_enabled: exports_external.boolean().default(true).describe("When false, ctx_reduce tool is hidden, all nudges disabled, and prompt guidance about ctx_reduce stripped. Heuristic cleanup, compartments, memory, and other features still work. (default: true)"),
+  historian: HistorianConfigSchema.describe("Historian agent configuration (model, fallback_models, variant, temperature, maxTokens, permission, two_pass, etc.)"),
+  dreamer: DreamerConfigSchema.optional().describe("Dreamer agent + scheduling configuration (model, fallback_models, disable, schedule, tasks, etc.)"),
+  cache_ttl: exports_external.union([exports_external.string(), exports_external.object({ default: exports_external.string() }).catchall(exports_external.string())]).default("5m").describe('Cache TTL: string (e.g. "5m") or per-model object ({ default: "5m", "model-id": "10m" })'),
+  nudge_interval_tokens: exports_external.number().min(1000).default(DEFAULT_NUDGE_INTERVAL_TOKENS).describe("Minimum token growth between low-priority rolling nudges (default: DEFAULT_NUDGE_INTERVAL_TOKENS)"),
   execute_threshold_percentage: exports_external.union([
-    exports_external.number().min(20).max(80),
-    exports_external.object({ default: exports_external.number().min(20).max(80) }).catchall(exports_external.number().min(20).max(80))
-  ]).default(DEFAULT_EXECUTE_THRESHOLD_PERCENTAGE),
+    exports_external.number().min(20).max(80, EXECUTE_THRESHOLD_CAP_MESSAGE),
+    exports_external.object({ default: exports_external.number().min(20).max(80, EXECUTE_THRESHOLD_CAP_MESSAGE) }).catchall(exports_external.number().min(20).max(80, EXECUTE_THRESHOLD_CAP_MESSAGE))
+  ]).default(DEFAULT_EXECUTE_THRESHOLD_PERCENTAGE).describe('Context percentage that forces queued operations to execute. Number or per-model object ({ default: 65, "provider/model": 45 }). Values above 80 are rejected because the runtime caps at 80% for cache safety (MAX_EXECUTE_THRESHOLD). Default: DEFAULT_EXECUTE_THRESHOLD_PERCENTAGE'),
   execute_threshold_tokens: exports_external.object({
     default: exports_external.number().min(5000).max(2000000).optional()
-  }).catchall(exports_external.number().min(5000).max(2000000)).optional(),
-  protected_tags: exports_external.number().min(1).max(100).optional(),
-  auto_drop_tool_age: exports_external.number().min(10).default(100),
-  drop_tool_structure: exports_external.boolean().default(true),
-  clear_reasoning_age: exports_external.number().min(10).default(50),
-  iteration_nudge_threshold: exports_external.number().min(5).default(15),
-  history_budget_percentage: exports_external.number().min(0.05).max(0.5).default(DEFAULT_HISTORY_BUDGET_PERCENTAGE),
-  historian_timeout_ms: exports_external.number().min(60000).default(DEFAULT_HISTORIAN_TIMEOUT_MS),
+  }).catchall(exports_external.number().min(5000).max(2000000)).optional().describe("Absolute token thresholds per model. When matched, overrides execute_threshold_percentage for that model. Accepts `default` for all models or per-model keys. Values above 80% × context_limit are clamped with a warning log. Min 5_000, max 2_000_000."),
+  protected_tags: exports_external.number().min(1).max(100).optional().describe("Number of recent tags to protect from dropping (min: 1, max: 100, default: 20)"),
+  auto_drop_tool_age: exports_external.number().min(10).default(100).describe("Auto-drop tool outputs older than N tags during queue execution (default: 100)"),
+  drop_tool_structure: exports_external.boolean().default(true).describe("When true, dropped tool parts are fully removed instead of truncated in place (default: true)"),
+  clear_reasoning_age: exports_external.number().min(10).default(50).describe("Clear reasoning/thinking blocks older than N tags (default: 50)"),
+  iteration_nudge_threshold: exports_external.number().min(5).default(15).describe("Number of consecutive assistant messages without user input to trigger iteration nudge (default: 15)"),
+  history_budget_percentage: exports_external.number().min(0.05).max(0.5).default(DEFAULT_HISTORY_BUDGET_PERCENTAGE).describe("Fraction of usable context (context_limit × execute_threshold) reserved for the session history block (default: 0.15)"),
+  historian_timeout_ms: exports_external.number().min(60000).default(DEFAULT_HISTORIAN_TIMEOUT_MS).describe("Timeout for each historian prompt call in milliseconds (default: 300000)"),
   commit_cluster_trigger: exports_external.object({
-    enabled: exports_external.boolean().default(true),
-    min_clusters: exports_external.number().min(1).default(3)
-  }).default({ enabled: true, min_clusters: 3 }),
+    enabled: exports_external.boolean().default(true).describe("Enable commit-cluster based historian triggering (default: true)"),
+    min_clusters: exports_external.number().min(1).default(3).describe("Minimum commit clusters required to trigger historian (min: 1, default: 3)")
+  }).default({ enabled: true, min_clusters: 3 }).describe("Commit-cluster trigger: fire historian when enough commit clusters accumulate in the unsummarized tail"),
   system_prompt_injection: exports_external.object({
-    enabled: exports_external.boolean().default(true),
-    skip_signatures: exports_external.array(exports_external.string()).default(["<!-- magic-context: skip -->"])
+    enabled: exports_external.boolean().default(true).describe("When false, NO injection happens for ANY agent — global escape hatch. (default: true)"),
+    skip_signatures: exports_external.array(exports_external.string()).default(["<!-- magic-context: skip -->"]).describe(`Substring opt-out list. If the agent's system prompt contains any of these strings, skip ALL Magic Context injection for that call. Default "<!-- magic-context: skip -->" is meant to be added inside a user's custom agent prompt to opt that agent out.`)
   }).default({
     enabled: true,
     skip_signatures: ["<!-- magic-context: skip -->"]
-  }),
+  }).describe("Controls whether and where Magic Context augments the system prompt. Lets users opt specific agents out of the Magic Context guidance and the surrounding project-docs / user-profile / key-files blocks. OpenCode's internal hidden agents — title, summary, and compaction — are always skipped automatically."),
   sqlite: exports_external.object({
-    cache_size_mb: exports_external.number().min(2).max(2048).default(64),
-    mmap_size_mb: exports_external.number().min(0).max(8192).default(0)
-  }).default({ cache_size_mb: 64, mmap_size_mb: 0 }),
+    cache_size_mb: exports_external.number().min(2).max(2048).default(64).describe("Page-cache size in MiB per connection (PRAGMA cache_size). Larger keeps more hot pages resident, cutting re-reads on repeated full-table scans. (min 2, max 2048, default 64)"),
+    mmap_size_mb: exports_external.number().min(0).max(8192).default(0).describe("Memory-mapped I/O size in MiB (PRAGMA mmap_size). 0 disables mmap (SQLite default). Raising it can cut read overhead on large DBs at the cost of address space. (min 0, max 8192, default 0)")
+  }).default({ cache_size_mb: 64, mmap_size_mb: 0 }).describe("SQLite connection tuning for Magic Context's own context.db. These are per-connection PRAGMAs applied at open; they do not change the schema or what is stored."),
   embedding: EmbeddingConfigSchema.default({
     provider: "local",
     model: DEFAULT_LOCAL_EMBEDDING_MODEL
-  }),
-  temporal_awareness: exports_external.boolean().default(true),
+  }).describe("Embedding provider configuration"),
+  temporal_awareness: exports_external.boolean().default(true).describe('Inject wall-clock gap markers (<!-- +Xm -->) between user messages where > 5 min elapsed since the previous message, and add start/end date attributes on compartments. Gives the agent a sense of session pacing and "how long ago" across multi-day sessions. Graduated from experimental.temporal_awareness; default: true (set false to opt out).'),
   caveman_text_compression: exports_external.object({
-    enabled: exports_external.boolean().default(false),
-    min_chars: exports_external.number().min(100).max(1e4).default(500)
-  }).default({ enabled: false, min_chars: 500 }),
+    enabled: exports_external.boolean().default(false).describe("Apply deterministic caveman-style text compression to old conversation text. Only active when ctx_reduce_enabled=false. Compresses user/assistant text in oldest-first tiers: ultra (oldest 20%), full, lite, untouched (newest 40%)."),
+    min_chars: exports_external.number().min(100).max(1e4).default(500).describe("Text parts shorter than this (characters) stay untouched. Min 100, max 10000. Default: 500.")
+  }).default({ enabled: false, min_chars: 500 }).describe("Age-tier caveman compression for long user/assistant text parts. Only active when ctx_reduce_enabled is false. Oldest 20% of eligible tags (outside protected tail) go to ultra, next 20% to full, next 20% to lite, newest 40% untouched. Graduated from experimental.caveman_text_compression; opt-in, default off (lossy)."),
   memory: exports_external.object({
-    enabled: exports_external.boolean().default(true),
-    injection_budget_tokens: exports_external.number().min(500).max(20000).default(4000),
-    auto_promote: exports_external.boolean().default(true),
-    retrieval_count_promotion_threshold: exports_external.number().min(1).default(3),
+    enabled: exports_external.boolean().default(true).describe("Enable cross-session memory (default: true)"),
+    injection_budget_tokens: exports_external.number().min(500).max(20000).default(4000).describe("Token budget for memory injection on session start (min: 500, max: 20000, default: 4000)"),
+    auto_promote: exports_external.boolean().default(true).describe("Automatically promote eligible session facts into memory (default: true)"),
+    retrieval_count_promotion_threshold: exports_external.number().min(1).default(3).describe("retrieval_count threshold for promoting memory to permanent status (min: 1, default: 3)"),
     auto_search: exports_external.object({
-      enabled: exports_external.boolean().default(true),
-      score_threshold: exports_external.number().min(0.3).max(0.95).default(0.6),
-      min_prompt_chars: exports_external.number().min(5).max(500).default(20)
-    }).default({ enabled: true, score_threshold: 0.6, min_prompt_chars: 20 }),
+      enabled: exports_external.boolean().default(true).describe("Automatically append a compact <ctx-search-hint> to eligible user messages when relevant memories, conversation, or commits are found. Graduated from experimental.auto_search; on by default (set false to opt out). Independent of memory.enabled."),
+      score_threshold: exports_external.number().min(0.3).max(0.95).default(0.6).describe("Top hit score must exceed this threshold for the hint to fire (min: 0.3, max: 0.95, default: 0.60)"),
+      min_prompt_chars: exports_external.number().min(5).max(500).default(20).describe("Skip hint when user message is shorter than this (min: 5, max: 500, default: 20)")
+    }).default({ enabled: true, score_threshold: 0.6, min_prompt_chars: 20 }).describe("Auto-search hint: transform-time ctx_search on each new user message; when the top hit clears the threshold, append a compact <ctx-search-hint> block of vague fragments to that user message. Does NOT inject full content. Graduated from experimental.auto_search; enabled by default (set enabled: false to opt out). Independent of memory.enabled."),
     git_commit_indexing: exports_external.object({
-      enabled: exports_external.boolean().default(false),
-      since_days: exports_external.number().min(7).max(3650).default(365),
-      max_commits: exports_external.number().min(100).max(20000).default(2000)
-    }).default({ enabled: false, since_days: 365, max_commits: 2000 })
+      enabled: exports_external.boolean().default(false).describe("Index HEAD git commits for ctx_search (git_commit source). Graduated from experimental.git_commit_indexing; opt-in, default off. Independent of memory.enabled."),
+      since_days: exports_external.number().min(7).max(3650).default(365).describe("Days of HEAD history to index (min: 7, max: 3650, default: 365)"),
+      max_commits: exports_external.number().min(100).max(20000).default(2000).describe("Max commits kept per project; oldest evicted (min: 100, max: 20000, default: 2000)")
+    }).default({ enabled: false, since_days: 365, max_commits: 2000 }).describe("Index git commit messages from HEAD into ctx_search. Commits become a 4th searchable source alongside memories and session history. Graduated from experimental.git_commit_indexing; opt-in, default off (per-project embedding cost). Independent of memory.enabled.")
   }).default({
     enabled: true,
     injection_budget_tokens: 4000,
@@ -157326,8 +157373,8 @@ var MagicContextConfigSchema = exports_external.object({
     retrieval_count_promotion_threshold: 3,
     auto_search: { enabled: true, score_threshold: 0.6, min_prompt_chars: 20 },
     git_commit_indexing: { enabled: false, since_days: 365, max_commits: 2000 }
-  }),
-  sidekick: SidekickConfigSchema
+  }).describe("Cross-session memory configuration"),
+  sidekick: SidekickConfigSchema.describe("Optional sidekick agent configuration for session-start memory retrieval")
 }).transform((data) => {
   return {
     ...data,
@@ -157395,46 +157442,6 @@ function stripJsonComments(content) {
   }
   return result;
 }
-function stripTrailingCommas(content) {
-  let result = "";
-  let inString = false;
-  let escaped = false;
-  for (let index = 0;index < content.length; index += 1) {
-    const char = content[index];
-    if (inString) {
-      result += char;
-      if (escaped) {
-        escaped = false;
-      } else if (char === "\\") {
-        escaped = true;
-      } else if (char === '"') {
-        inString = false;
-      }
-      continue;
-    }
-    if (char === '"') {
-      inString = true;
-      result += char;
-      continue;
-    }
-    if (char === ",") {
-      let lookahead = index + 1;
-      while (lookahead < content.length && /\s/.test(content[lookahead] ?? "")) {
-        lookahead += 1;
-      }
-      const next = content[lookahead];
-      if (next === "}" || next === "]") {
-        continue;
-      }
-    }
-    result += char;
-  }
-  return result;
-}
-function parseJsonc(content) {
-  const normalized = stripTrailingCommas(stripJsonComments(content));
-  return JSON.parse(normalized);
-}
 
 // ../plugin/src/config/variable.ts
 var ENV_PATTERN = /\{env:([^}]+)\}/g;
@@ -157791,7 +157798,8 @@ function getEmbeddingProviderIdentity(config2) {
     provider: "openai-compatible",
     model: config2.model.trim(),
     endpoint: normalizeEndpoint(config2.endpoint),
-    apiKeyPresent: Boolean(config2.api_key?.trim())
+    apiKeyPresent: Boolean(config2.api_key?.trim()),
+    inputType: config2.input_type?.trim() || ""
   } : {
     provider: "local",
     model: config2.model?.trim() || DEFAULT_LOCAL_EMBEDDING_MODEL,
@@ -158157,6 +158165,8 @@ class OpenAICompatibleEmbeddingProvider {
   endpoint;
   model;
   apiKey;
+  inputType;
+  truncate;
   initialized = false;
   failureTimes = [];
   circuitOpenUntil = 0;
@@ -158166,6 +158176,8 @@ class OpenAICompatibleEmbeddingProvider {
     this.endpoint = normalizeEndpoint2(options.endpoint);
     this.model = options.model?.trim() ?? "";
     this.apiKey = options.apiKey?.trim() ?? "";
+    this.inputType = options.inputType?.trim() ?? "";
+    this.truncate = options.truncate?.trim() ?? "";
     this.modelId = getEmbeddingProviderIdentity({
       provider: "openai-compatible",
       endpoint: this.endpoint,
@@ -158222,7 +158234,9 @@ class OpenAICompatibleEmbeddingProvider {
         },
         body: JSON.stringify({
           model: this.model,
-          input: texts
+          input: texts,
+          ...this.inputType ? { input_type: this.inputType } : {},
+          ...this.truncate ? { truncate: this.truncate } : {}
         }),
         signal: internalController.signal
       });
@@ -158427,7 +158441,7 @@ function getDistinctStoredModelIds(db, projectPath) {
 }
 
 // ../plugin/src/features/magic-context/project-embedding-registry.ts
-import { createHash as createHash3 } from "node:crypto";
+import { createHash as createHash3, randomUUID } from "node:crypto";
 init_logger();
 
 // ../plugin/src/features/magic-context/git-commits/storage-git-commit-embeddings.ts
@@ -158531,6 +158545,125 @@ function getDistinctCommitEmbeddingModelIds(db, projectPath) {
   return new Set(rows.map((row) => typeof row.modelId === "string" ? row.modelId : null));
 }
 
+// ../plugin/src/features/magic-context/git-commits/sweep-coordinator.ts
+var GIT_SWEEP_COOLDOWN_MS = 10 * 60 * 1000;
+var GIT_SWEEP_LEASE_TTL_MS = 5 * 60 * 1000;
+var GIT_SWEEP_LEASE_RENEWAL_MS = 60 * 1000;
+function runImmediate(db, body) {
+  db.exec("BEGIN IMMEDIATE");
+  let committed = false;
+  try {
+    const result = body();
+    db.exec("COMMIT");
+    committed = true;
+    return result;
+  } finally {
+    if (!committed) {
+      try {
+        db.exec("ROLLBACK");
+      } catch {}
+    }
+  }
+}
+function rowToState(row) {
+  return {
+    projectPath: row.project_path,
+    leaseHolder: row.lease_holder,
+    leaseExpiresAt: row.lease_expires_at,
+    lastSweptAt: row.last_swept_at
+  };
+}
+function getGitSweepCoordinatorState(db, projectPath) {
+  const row = db.prepare(`SELECT project_path, lease_holder, lease_expires_at, last_swept_at
+             FROM git_sweep_coordinator
+             WHERE project_path = ?`).get(projectPath);
+  return row ? rowToState(row) : null;
+}
+function acquireGitSweepLease(db, projectPath, holderId, options = {}) {
+  const cooldownMs = options.cooldownMs ?? GIT_SWEEP_COOLDOWN_MS;
+  const leaseTtlMs = options.leaseTtlMs ?? GIT_SWEEP_LEASE_TTL_MS;
+  return runImmediate(db, () => {
+    const now = Date.now();
+    const row = getGitSweepCoordinatorState(db, projectPath);
+    if (row?.leaseHolder && row.leaseExpiresAt !== null && row.leaseExpiresAt > now) {
+      return {
+        acquired: false,
+        projectPath,
+        reason: "lease_active",
+        leaseHolder: row.leaseHolder,
+        leaseExpiresAt: row.leaseExpiresAt,
+        lastSweptAt: row.lastSweptAt,
+        nextAllowedAt: null
+      };
+    }
+    if (!options.ignoreCooldown && row?.lastSweptAt !== null && row?.lastSweptAt !== undefined) {
+      const nextAllowedAt = row.lastSweptAt + cooldownMs;
+      if (nextAllowedAt > now) {
+        return {
+          acquired: false,
+          projectPath,
+          reason: "cooldown_active",
+          leaseHolder: row.leaseHolder,
+          leaseExpiresAt: row.leaseExpiresAt,
+          lastSweptAt: row.lastSweptAt,
+          nextAllowedAt
+        };
+      }
+    }
+    const leaseExpiresAt = now + leaseTtlMs;
+    db.prepare(`INSERT INTO git_sweep_coordinator (
+                 project_path,
+                 lease_holder,
+                 lease_expires_at,
+                 last_swept_at
+             ) VALUES (?, ?, ?, NULL)
+             ON CONFLICT(project_path) DO UPDATE SET
+                 lease_holder = excluded.lease_holder,
+                 lease_expires_at = excluded.lease_expires_at`).run(projectPath, holderId, leaseExpiresAt);
+    return {
+      acquired: true,
+      projectPath,
+      holderId,
+      acquiredAt: now,
+      leaseExpiresAt
+    };
+  });
+}
+function renewGitSweepLease(db, projectPath, holderId, leaseTtlMs = GIT_SWEEP_LEASE_TTL_MS) {
+  return runImmediate(db, () => {
+    const now = Date.now();
+    const leaseExpiresAt = now + leaseTtlMs;
+    const result = db.prepare(`UPDATE git_sweep_coordinator
+                 SET lease_expires_at = ?
+                 WHERE project_path = ?
+                   AND lease_holder = ?
+                   AND lease_expires_at > ?`).run(leaseExpiresAt, projectPath, holderId, now);
+    return result.changes === 1;
+  });
+}
+function markGitSweepSuccessAndRelease(db, projectPath, holderId) {
+  return runImmediate(db, () => {
+    const now = Date.now();
+    const result = db.prepare(`UPDATE git_sweep_coordinator
+                 SET lease_holder = NULL,
+                     lease_expires_at = NULL,
+                     last_swept_at = ?
+                 WHERE project_path = ?
+                   AND lease_holder = ?
+                   AND lease_expires_at > ?`).run(now, projectPath, holderId, now);
+    return result.changes === 1;
+  });
+}
+function releaseGitSweepLease(db, projectPath, holderId) {
+  runImmediate(db, () => {
+    db.prepare(`UPDATE git_sweep_coordinator
+             SET lease_holder = NULL,
+                 lease_expires_at = NULL
+             WHERE project_path = ?
+               AND lease_holder = ?`).run(projectPath, holderId);
+  });
+}
+
 // ../plugin/src/features/magic-context/memory/embedding-cache.ts
 var DEFAULT_EMBEDDING_CACHE_TTL_MS = 60000;
 var projectEmbeddingCache = new Map;
@@ -158851,7 +158984,9 @@ function createProvider2(config2) {
     return new OpenAICompatibleEmbeddingProvider({
       endpoint: config2.endpoint,
       model: config2.model,
-      apiKey: config2.api_key
+      apiKey: config2.api_key,
+      inputType: config2.input_type,
+      truncate: config2.truncate
     });
   }
   return new LocalEmbeddingProvider(config2.model);
@@ -166024,7 +166159,8 @@ function toNote(row) {
     updatedAt: row.updated_at,
     lastCheckedAt: toNullableNumber(row.last_checked_at),
     readyAt: toNullableNumber(row.ready_at),
-    readyReason: toNullableString(row.ready_reason)
+    readyReason: toNullableString(row.ready_reason),
+    anchorOrdinal: toNullableNumber(row.anchor_ordinal)
   };
 }
 function getNoteById(db, noteId) {
@@ -166076,7 +166212,7 @@ function getNotes(db, options3 = {}) {
 }
 function addNote(db, type, options3) {
   const now = Date.now();
-  const result = type === "session" ? db.prepare("INSERT INTO notes (type, status, content, session_id, created_at, updated_at, harness) VALUES ('session', 'active', ?, ?, ?, ?, ?) RETURNING *").get(options3.content, options3.sessionId, now, now, getHarness()) : db.prepare("INSERT INTO notes (type, status, content, session_id, project_path, surface_condition, created_at, updated_at, harness) VALUES ('smart', 'pending', ?, ?, ?, ?, ?, ?, ?) RETURNING *").get(options3.content, options3.sessionId ?? null, options3.projectPath, options3.surfaceCondition, now, now, getHarness());
+  const result = type === "session" ? db.prepare("INSERT INTO notes (type, status, content, session_id, created_at, updated_at, harness, anchor_ordinal) VALUES ('session', 'active', ?, ?, ?, ?, ?, ?) RETURNING *").get(options3.content, options3.sessionId, now, now, getHarness(), options3.anchorOrdinal ?? null) : db.prepare("INSERT INTO notes (type, status, content, session_id, project_path, surface_condition, created_at, updated_at, harness, anchor_ordinal) VALUES ('smart', 'pending', ?, ?, ?, ?, ?, ?, ?, ?) RETURNING *").get(options3.content, options3.sessionId ?? null, options3.projectPath, options3.surfaceCondition, now, now, getHarness(), options3.anchorOrdinal ?? null);
   if (!isNoteRow(result)) {
     throw new Error("[notes] failed to insert note");
   }
@@ -166930,15 +167066,26 @@ function err3(text) {
     isError: true
   };
 }
+function captureAnchorOrdinal(db, sessionId) {
+  try {
+    const ordinal = getLastIndexedOrdinal(db, sessionId);
+    return ordinal > 0 ? ordinal : null;
+  } catch {
+    return null;
+  }
+}
+function anchorSuffix(note) {
+  return note.anchorOrdinal !== null ? ` ↳ @msg ${note.anchorOrdinal}` : "";
+}
 function formatNoteLine(note) {
   if (note.type === "smart") {
     const conditionLine = note.status === "ready" ? note.readyReason ?? note.surfaceCondition ?? "Condition satisfied" : note.surfaceCondition ?? "No condition recorded";
     const statusSuffix2 = note.status === "active" ? "" : ` (${note.status})`;
-    return `- **#${note.id}**${statusSuffix2}: ${note.content}
+    return `- **#${note.id}**${statusSuffix2}: ${note.content}${anchorSuffix(note)}
   *Condition*: ${conditionLine}`;
   }
   const statusSuffix = note.status === "active" ? "" : ` (${note.status})`;
-  return `- **#${note.id}**${statusSuffix}: ${note.content}`;
+  return `- **#${note.id}**${statusSuffix}: ${note.content}${anchorSuffix(note)}`;
 }
 var DISMISS_FOOTER = `
 
@@ -166960,6 +167107,7 @@ function createCtxNoteTool(deps) {
         const content = params.content?.trim();
         if (!content)
           return err3("Error: 'content' is required when action is 'write'.");
+        const anchorOrdinal = captureAnchorOrdinal(deps.db, sessionId);
         const surfaceCondition = params.surface_condition?.trim();
         if (surfaceCondition) {
           if (deps.dreamerEnabled !== true) {
@@ -166972,13 +167120,18 @@ function createCtxNoteTool(deps) {
           const note2 = addNote(deps.db, "smart", {
             content,
             projectPath: projectIdentity,
-            surfaceCondition
+            surfaceCondition,
+            anchorOrdinal
           });
           return ok3(`Created smart note #${note2.id}. Dreamer will evaluate the condition during nightly runs:
 - Content: ${content}
 - Condition: ${surfaceCondition}`);
         }
-        const note = addNote(deps.db, "session", { sessionId, content });
+        const note = addNote(deps.db, "session", {
+          sessionId,
+          content,
+          anchorOrdinal
+        });
         return ok3(`Saved session note #${note.id}.`);
       }
       if (action2 === "dismiss") {
@@ -167041,9 +167194,13 @@ function createCtxNoteTool(deps) {
 
 No notes for the current filter.`);
       }
-      return ok3(`${sections.join(`
+      const body = sections.join(`
 
-`)}${DISMISS_FOOTER}`);
+`);
+      const anchorHint = body.includes("↳ @msg ") ? `
+
+↳ @msg N marks the conversation tail when a note was written. To see what led to it: ctx_expand(start=N-x, end=N) (pick x for how far back to look).` : "";
+      return ok3(`${body}${anchorHint}${DISMISS_FOOTER}`);
     }
   };
 }
@@ -167358,6 +167515,7 @@ var insertStatements = new WeakMap;
 var existingShasStatements = new WeakMap;
 var projectCountStatements = new WeakMap;
 var evictStatements = new WeakMap;
+var evictOverflowStatements = new WeakMap;
 var latestCommitTimeStatements = new WeakMap;
 function getInsertStatement(db) {
   let stmt = insertStatements.get(db);
@@ -167400,17 +167558,17 @@ function getLatestCommitTimeStatement(db) {
   }
   return stmt;
 }
-function getEvictStatement(db) {
-  let stmt = evictStatements.get(db);
+function getEvictOverflowStatement(db) {
+  let stmt = evictOverflowStatements.get(db);
   if (!stmt) {
     stmt = db.prepare(`DELETE FROM git_commits
-             WHERE sha IN (
-                 SELECT sha FROM git_commits
+             WHERE rowid IN (
+                 SELECT rowid FROM git_commits
                  WHERE project_path = ?
-                 ORDER BY committed_at ASC
-                 LIMIT ?
+                 ORDER BY committed_at DESC, sha DESC
+                 LIMIT -1 OFFSET ?
              )`);
-    evictStatements.set(db, stmt);
+    evictOverflowStatements.set(db, stmt);
   }
   return stmt;
 }
@@ -167448,22 +167606,15 @@ function getLatestIndexedCommitTimeMs(db, projectPath) {
   const row = getLatestCommitTimeStatement(db).get(projectPath);
   return row?.latest ?? null;
 }
-function evictOldestCommits(db, projectPath, excess) {
-  if (excess <= 0)
-    return 0;
-  const before = getCommitCount(db, projectPath);
-  getEvictStatement(db).run(projectPath, excess);
-  const after = getCommitCount(db, projectPath);
-  return Math.max(0, before - after);
-}
 function enforceProjectCap(db, projectPath, maxCommits) {
   if (maxCommits <= 0)
     return 0;
   const count = getCommitCount(db, projectPath);
   if (count <= maxCommits)
     return 0;
-  const excess = count - maxCommits;
-  const evicted = evictOldestCommits(db, projectPath, excess);
+  getEvictOverflowStatement(db).run(projectPath, maxCommits);
+  const after = getCommitCount(db, projectPath);
+  const evicted = Math.max(0, count - after);
   if (evicted > 0) {
     log(`[git-commits] evicted ${evicted} oldest commits for project ${projectPath} (cap=${maxCommits}, was=${count})`);
   }
@@ -167702,6 +167853,62 @@ function searchGitCommitsSync(db, projectPath, query, options3) {
   });
   return results.slice(0, options3.limit);
 }
+// ../plugin/src/features/magic-context/literal-probes.ts
+var MAX_PROBES = 5;
+var MIN_PROBE_LENGTH = 3;
+var SLASH_COMMAND_RE = /\/[a-z][a-z0-9]*(?:-[a-z0-9]+)+/gi;
+var KEBAB_SNAKE_RE = /[a-z][a-z0-9]*(?:[-_][a-z0-9]+)+/gi;
+var DOTTED_RE = /[a-z0-9][a-z0-9_-]*(?:\.[a-z0-9_-]+)+/gi;
+var CAMEL_RE = /\b[a-zA-Z][a-z0-9]*(?:[A-Z][a-z0-9]*)+\b/g;
+var SHA_RE = /\b[0-9a-f]{7,40}\b/gi;
+var ERROR_CODE_RE = /\b(?:TS\d{4,}|ERR_[A-Z][A-Z0-9_]*)\b/g;
+var QUOTED_RE = /["`]([^"`]{3,80})["`]/g;
+function looksLikeSha(token) {
+  return /[0-9]/.test(token) && /^[0-9a-f]{7,40}$/i.test(token);
+}
+function extractLiteralProbes(query) {
+  const trimmed = query.trim();
+  if (trimmed.length === 0)
+    return [];
+  const ordered = [];
+  const seen = new Set;
+  const add = (raw) => {
+    if (!raw)
+      return;
+    const probe = raw.trim();
+    if (probe.length < MIN_PROBE_LENGTH)
+      return;
+    const key = probe.toLowerCase();
+    if (seen.has(key))
+      return;
+    seen.add(key);
+    ordered.push(probe);
+  };
+  for (const m of trimmed.matchAll(QUOTED_RE))
+    add(m[1]);
+  for (const m of trimmed.matchAll(SLASH_COMMAND_RE))
+    add(m[0]);
+  for (const m of trimmed.matchAll(ERROR_CODE_RE))
+    add(m[0]);
+  for (const m of trimmed.matchAll(DOTTED_RE))
+    add(m[0]);
+  for (const m of trimmed.matchAll(KEBAB_SNAKE_RE))
+    add(m[0]);
+  for (const m of trimmed.matchAll(CAMEL_RE))
+    add(m[0]);
+  for (const m of trimmed.matchAll(SHA_RE)) {
+    if (looksLikeSha(m[0]))
+      add(m[0]);
+  }
+  return ordered.slice(0, MAX_PROBES);
+}
+function containsProbeVerbatim(text, probes) {
+  if (probes.length === 0)
+    return false;
+  const haystack = text.toLowerCase();
+  return probes.some((probe) => haystack.includes(probe.toLowerCase()));
+}
+
 // ../plugin/src/features/magic-context/search.ts
 var DEFAULT_UNIFIED_SEARCH_LIMIT = 10;
 var FTS_SEMANTIC_CANDIDATE_LIMIT = 50;
@@ -167879,36 +168086,82 @@ function linearDecayScore(rank, total) {
     return 0;
   return Math.max(0, 1 - rank / total);
 }
-function searchMessages(args) {
-  const sanitizedQuery = sanitizeFtsQuery(args.query.trim());
-  if (sanitizedQuery.length === 0) {
+function runMessageFtsQuery(db, sessionId, ftsQuery, fetchLimit, cutoff) {
+  if (ftsQuery.length === 0)
     return [];
-  }
-  const fetchLimit = args.maxOrdinal != null && args.maxOrdinal >= 0 ? args.limit * 3 : args.limit;
-  const rows = getMessageSearchStatement(args.db).all(args.sessionId, sanitizedQuery, fetchLimit).map((row) => row);
-  const cutoff = args.maxOrdinal != null && args.maxOrdinal >= 0 ? args.maxOrdinal : null;
-  const filtered = rows.map((row) => {
+  const rows = getMessageSearchStatement(db).all(sessionId, ftsQuery, fetchLimit).map((row) => row);
+  const result = [];
+  for (const row of rows) {
     const messageOrdinal = getMessageOrdinal(row.messageOrdinal);
     if (messageOrdinal === null || typeof row.messageId !== "string" || typeof row.role !== "string" || typeof row.content !== "string") {
-      return null;
+      continue;
     }
     if (cutoff !== null && messageOrdinal > cutoff) {
-      return null;
+      continue;
     }
-    return {
+    result.push({
       messageOrdinal,
       messageId: row.messageId,
       role: row.role,
       content: row.content
-    };
-  }).filter((result) => result !== null).slice(0, args.limit);
-  return filtered.map((row, rank) => ({
+    });
+  }
+  return result;
+}
+var RRF_K = 60;
+var VERBATIM_PROBE_BONUS = 0.5;
+function searchMessages(args) {
+  const cutoff = args.maxOrdinal != null && args.maxOrdinal >= 0 ? args.maxOrdinal : null;
+  const fetchLimit = args.maxOrdinal != null && args.maxOrdinal >= 0 ? args.limit * 3 : args.limit;
+  const baseQuery = sanitizeFtsQuery(args.query.trim());
+  const probes = args.probes ?? [];
+  if (probes.length === 0) {
+    const filtered = runMessageFtsQuery(args.db, args.sessionId, baseQuery, fetchLimit, cutoff).slice(0, args.limit);
+    return filtered.map((row, rank) => ({
+      source: "message",
+      content: previewText(row.content),
+      score: linearDecayScore(rank, filtered.length),
+      messageOrdinal: row.messageOrdinal,
+      messageId: row.messageId,
+      role: row.role
+    }));
+  }
+  const queryLists = [];
+  if (baseQuery.length > 0) {
+    queryLists.push(runMessageFtsQuery(args.db, args.sessionId, baseQuery, fetchLimit, cutoff));
+  }
+  for (const probe of probes) {
+    const probeQuery = sanitizeFtsQuery(probe);
+    if (probeQuery.length === 0)
+      continue;
+    queryLists.push(runMessageFtsQuery(args.db, args.sessionId, probeQuery, fetchLimit, cutoff));
+  }
+  const fused = new Map;
+  for (const list of queryLists) {
+    list.forEach((row, rank) => {
+      const rrf = 1 / (RRF_K + rank);
+      const existing = fused.get(row.messageId);
+      if (existing) {
+        existing.score += rrf;
+      } else {
+        fused.set(row.messageId, { row, score: rrf });
+      }
+    });
+  }
+  for (const entry of fused.values()) {
+    if (containsProbeVerbatim(entry.row.content, probes)) {
+      entry.score += VERBATIM_PROBE_BONUS;
+    }
+  }
+  const ranked = [...fused.values()].sort((a, b) => b.score !== a.score ? b.score - a.score : a.row.messageOrdinal - b.row.messageOrdinal).slice(0, args.limit);
+  const maxScore = ranked.length > 0 ? ranked[0].score : 1;
+  return ranked.map((entry) => ({
     source: "message",
-    content: previewText(row.content),
-    score: linearDecayScore(rank, filtered.length),
-    messageOrdinal: row.messageOrdinal,
-    messageId: row.messageId,
-    role: row.role
+    content: previewText(entry.row.content),
+    score: maxScore > 0 ? entry.score / maxScore : 0,
+    messageOrdinal: entry.row.messageOrdinal,
+    messageId: entry.row.messageId,
+    role: entry.row.role
   }));
 }
 function getSourceBoost(result) {
@@ -167992,12 +168245,14 @@ async function unifiedSearch(db, sessionId, projectPath, query, options3 = {}) {
     return null;
   }) : Promise.resolve(null);
   await Promise.resolve();
+  const messageProbes = options3.explicitSearch ? extractLiteralProbes(trimmedQuery) : [];
   const messageResults = runMessages ? searchMessages({
     db,
     sessionId,
     query: trimmedQuery,
     limit: tierLimit,
-    maxOrdinal: options3.maxMessageOrdinal
+    maxOrdinal: options3.maxMessageOrdinal,
+    probes: messageProbes
   }) : [];
   const queryEmbedding = await queryEmbeddingPromise;
   const [memoryResults, gitCommitResults] = await Promise.all([
@@ -168768,7 +169023,8 @@ function createCtxSearchTool(deps) {
         maxMessageOrdinal: lastCompartmentEnd >= 0 ? lastCompartmentEnd : undefined,
         gitCommitsEnabled,
         sources: params.sources,
-        visibleMemoryIds
+        visibleMemoryIds,
+        explicitSearch: true
       });
       return {
         content: [{ type: "text", text: formatSearchResults(query, results) }],