codesearch-mcp 0.1.0-alpha → 0.2.1-alpha

package/dist/src/config-store.d.ts

@@ -13,7 +13,6 @@ declare const jsonSchema: z.ZodObject<{
     }, z.core.$strip>>;
     embedding: z.ZodOptional<z.ZodObject<{
         provider: z.ZodOptional<z.ZodEnum<{
-            ollama: "ollama";
             "openai-compatible": "openai-compatible";
             voyage: "voyage";
             infinity: "infinity";
@@ -49,6 +48,7 @@ declare const jsonSchema: z.ZodObject<{
         model: z.ZodOptional<z.ZodString>;
         url: z.ZodOptional<z.ZodString>;
         overfetch: z.ZodOptional<z.ZodNumber>;
+        candidateFloor: z.ZodOptional<z.ZodNumber>;
     }, z.core.$strip>>;
     logging: z.ZodOptional<z.ZodObject<{
         level: z.ZodOptional<z.ZodEnum<{
@@ -58,6 +58,7 @@ declare const jsonSchema: z.ZodObject<{
             warn: "warn";
         }>>;
         dir: z.ZodOptional<z.ZodString>;
+        searchMetrics: z.ZodOptional<z.ZodBoolean>;
     }, z.core.$strip>>;
     workspaceRoot: z.ZodOptional<z.ZodString>;
 }, z.core.$strip>;
@@ -77,9 +78,9 @@ export declare const ALL_KEYS: string[];
  */
 export declare const CONFIG_DEFAULTS: {
     readonly 'db.port': 5433;
-    readonly 'embedding.provider': "ollama";
+    readonly 'embedding.provider': "infinity";
     readonly 'embedding.apiKey': "";
-    readonly 'embedding.model': "bge-m3";
+    readonly 'embedding.model': "jinaai/jina-embeddings-v2-base-code";
     readonly 'embedding.batchSize': 32;
     readonly 'indexing.chunkSize': 1500;
     readonly 'indexing.chunkOverlap': 200;
@@ -89,20 +90,30 @@ export declare const CONFIG_DEFAULTS: {
     readonly 'search.similarityThreshold': 0.6;
     readonly 'search.defaultLimit': 5;
     readonly 'search.maxLimit': 20;
-    readonly 'reranker.enabled': false;
+    readonly 'reranker.enabled': true;
     readonly 'reranker.provider': "openai-compatible";
     readonly 'reranker.apiKey': "";
-    readonly 'reranker.model': "";
-    readonly 'reranker.overfetch': 3;
+    readonly 'reranker.model': "mixedbread-ai/mxbai-rerank-xsmall-v1";
+    readonly 'reranker.overfetch': 5;
+    readonly 'reranker.candidateFloor': 80;
     readonly 'logging.level': "error";
+    readonly 'logging.searchMetrics': false;
 };
 export declare function readConfigJson(): JsonConfig | null;
+/**
+ * Detect a raw (pre-migration) config object that still selects the removed
+ * `ollama` embedding provider — explicitly, via a legacy top-level `ollama`
+ * block, or implicitly (no `provider` set, but `baseURL`/`model` point at
+ * Ollama's defaults) — and throw a `ConfigError` with migration guidance
+ * instead of letting it validate under a silently reinterpreted provider.
+ * Runs before `migrateRawConfig` so a legacy `ollama.*` block is never
+ * converted into an `embedding` block first. Pure — never mutates `raw`.
+ */
+export declare function detectFormerOllamaConfig(raw: unknown): void;
 /**
  * Migrate a legacy raw config object to the current shape, in place of a
  * versioned migration system. Pure — returns a new object, never mutates input.
  *
- * - Legacy `ollama.host`/`ollama.model` → `embedding.{baseURL,model}` with
- *   `provider: 'ollama'` (only when `embedding` is not already present).
  * - Removed translation keys (`search.autoTranslate`, `search.translateModel`)
  *   are dropped so they neither validate-fail nor take effect.
  * - Legacy `reranker.provider: 'ollama'` (a dead value — Ollama has no rerank
@@ -110,13 +121,20 @@ export declare function readConfigJson(): JsonConfig | null;
  *   dropped so it re-derives to `/rerank`. Otherwise the tightened enum would
  *   fail validation on existing configs and lock the user out.
  *
- * `ollama` itself is left for the schema to strip. Exported for unit testing.
+ * A legacy top-level `ollama` block reaches here only when `detectFormerOllamaConfig`
+ * did not already reject it (i.e. an `embedding` block is also present); it is
+ * dropped rather than merged. Exported for unit testing.
  */
 export declare function migrateRawConfig(raw: unknown): unknown;
 /**
- * Validate a parsed config object against the Zod schema. Unknown keys (e.g.
- * the "$schema" editor reference) are stripped. Throws with a caller-friendly
- * message on validation failure. Pure — no file I/O.
+ * Validate a raw (pre-migration) config object against the Zod schema: first
+ * `detectFormerOllamaConfig` (a `ConfigError` on a former-Ollama config takes
+ * priority over both migration and the regular Zod enum rejection), then
+ * `migrateRawConfig`, then the schema itself. Unknown keys (e.g. the "$schema"
+ * editor reference) are stripped. Throws with a caller-friendly message on
+ * validation failure. The single entry point for both `readConfigJson` and
+ * `PUT /api/config`, so both apply identical rules with an identical message.
+ * Pure — no file I/O.
  */
 export declare function parseConfig(raw: unknown, source?: string): JsonConfig;
 /** Build the JSON Schema object generated from the Zod config schema. Pure. */

package/dist/src/config-store.js

@@ -35,6 +35,7 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CONFIG_DEFAULTS = exports.ALL_KEYS = exports.ENV_FILE = exports.SCHEMA_FILE = exports.CONFIG_FILE = exports.CONFIG_DIR = void 0;
 exports.readConfigJson = readConfigJson;
+exports.detectFormerOllamaConfig = detectFormerOllamaConfig;
 exports.migrateRawConfig = migrateRawConfig;
 exports.parseConfig = parseConfig;
 exports.buildJsonSchema = buildJsonSchema;
@@ -48,6 +49,7 @@ const path = __importStar(require("path"));
 const os = __importStar(require("os"));
 const zod_1 = require("zod");
 const constants_1 = require("./constants");
+const config_error_1 = require("./config-error");
 exports.CONFIG_DIR = path.join(os.homedir(), '.config', 'codesearch-mcp');
 exports.CONFIG_FILE = path.join(exports.CONFIG_DIR, 'config.json');
 exports.SCHEMA_FILE = path.join(exports.CONFIG_DIR, 'config.schema.json');
@@ -66,10 +68,10 @@ const jsonSchema = zod_1.z.object({
         name: zod_1.z.string().describe('Database name; defaults to rag_<os-username>, auto-created on first run').optional(),
     }).optional(),
     embedding: zod_1.z.object({
-        provider: zod_1.z.enum(['ollama', 'openai-compatible', 'voyage', 'infinity']).describe('Embedding backend (default ollama)').optional(),
-        baseURL: zod_1.z.string().describe('Backend base URL. ollama: http://localhost:11434 · OpenAI: https://api.openai.com/v1 · Infinity/TEI/vLLM: http://localhost:7997 · Voyage: https://api.voyageai.com/v1').optional(),
+        provider: zod_1.z.enum(['openai-compatible', 'voyage', 'infinity']).describe('Embedding backend (default infinity)').optional(),
+        baseURL: zod_1.z.string().describe('Backend base URL. Infinity/TEI/vLLM/Ollama-via-openai-compatible: http://localhost:7997 (Infinity default) · OpenAI: https://api.openai.com/v1 · Voyage: https://api.voyageai.com/v1').optional(),
         apiKey: zod_1.z.string().describe('API key. Use env:VAR_NAME to read from ~/.config/codesearch-mcp/.env or the environment (recommended). Empty for local servers.').optional(),
-        model: zod_1.z.string().describe('Embedding model (default bge-m3)').optional(),
+        model: zod_1.z.string().describe('Embedding model (default jinaai/jina-embeddings-v2-base-code)').optional(),
         dimensions: zod_1.z.number().int().describe('Vector width override; required for models whose native width exceeds 2000 (Matryoshka reduction). Omit to derive from the model/registry/probe.').optional(),
         batchSize: zod_1.z.number().int().describe('Texts per batch embedding request (default 32)').optional(),
     }).optional(),
@@ -87,16 +89,18 @@ const jsonSchema = zod_1.z.object({
     }).optional(),
     reranker: zod_1.z.object({
         enabled: zod_1.z.boolean().describe('Enable cross-encoder reranking; requires reranker.model').optional(),
-        provider: zod_1.z.enum(['openai-compatible']).describe('Rerank backend. Only openai-compatible /rerank servers (Infinity, TEI, vLLM) — Ollama has no rerank API.').optional(),
+        provider: zod_1.z.enum(['openai-compatible']).describe('Rerank backend. Only openai-compatible /rerank servers (Infinity, TEI, vLLM).').optional(),
         baseURL: zod_1.z.string().describe('Rerank server base URL (defaults to embedding.baseURL — Infinity serves both).').optional(),
         apiKey: zod_1.z.string().describe('API key, or env:VAR_NAME. Empty for local servers.').optional(),
         model: zod_1.z.string().describe('Reranker model name (e.g. qllama/bge-reranker-v2-m3)').optional(),
         url: zod_1.z.string().describe('Full URL of the rerank endpoint (default derived from provider + baseURL)').optional(),
-        overfetch: zod_1.z.number().int().min(1).max(20).describe('Candidate multiplier before reranking (limit × N, default 3)').optional(),
+        overfetch: zod_1.z.number().int().min(1).max(20).describe('Candidate multiplier before reranking (limit × N, default 5)').optional(),
+        candidateFloor: zod_1.z.number().int().min(1).describe('Minimum candidate pool fed to the reranker regardless of limit; fetchLimit = min(max(limit × overfetch, candidateFloor), 200) (default 80)').optional(),
     }).optional(),
     logging: zod_1.z.object({
         level: zod_1.z.enum(['debug', 'info', 'warn', 'error']).describe('File log level (default error)').optional(),
         dir: zod_1.z.string().describe('Base log directory; "false" to disable file logging').optional(),
+        searchMetrics: zod_1.z.boolean().describe('Emit one structured search-tuning line (info level) per search, independent of level (default false)').optional(),
     }).optional(),
     workspaceRoot: zod_1.z.string().describe('Full path to the directory containing all your projects').optional(),
 });
@@ -127,8 +131,10 @@ const FIELD_TYPES = {
     'reranker.model': 'string',
     'reranker.url': 'string',
     'reranker.overfetch': 'number',
+    'reranker.candidateFloor': 'number',
     'logging.level': 'string',
     'logging.dir': 'string',
+    'logging.searchMetrics': 'boolean',
     'workspaceRoot': 'string',
 };
 exports.ALL_KEYS = Object.keys(FIELD_TYPES);
@@ -146,7 +152,7 @@ exports.ALL_KEYS = Object.keys(FIELD_TYPES);
  */
 exports.CONFIG_DEFAULTS = {
     'db.port': 5433,
-    'embedding.provider': 'ollama',
+    'embedding.provider': 'infinity',
     'embedding.apiKey': '',
     'embedding.model': constants_1.DEFAULT_EMBED_MODEL,
     'embedding.batchSize': 32,
@@ -158,12 +164,14 @@ exports.CONFIG_DEFAULTS = {
     'search.similarityThreshold': 0.6,
     'search.defaultLimit': 5,
     'search.maxLimit': 20,
-    'reranker.enabled': false,
+    'reranker.enabled': true,
     'reranker.provider': 'openai-compatible',
     'reranker.apiKey': '',
-    'reranker.model': '',
-    'reranker.overfetch': 3,
+    'reranker.model': 'mixedbread-ai/mxbai-rerank-xsmall-v1',
+    'reranker.overfetch': 5,
+    'reranker.candidateFloor': 80,
     'logging.level': 'error',
+    'logging.searchMetrics': false,
 };
 function readConfigJson() {
     if (!fs.existsSync(exports.CONFIG_FILE))
@@ -183,14 +191,61 @@ function readConfigJson() {
         throw new Error(`Invalid JSON in ${exports.CONFIG_FILE}: ${e.message}\n` +
             `Fix the file manually or delete it and run: rag-setup`);
     }
-    return parseConfig(migrateRawConfig(parsed), exports.CONFIG_FILE);
+    return parseConfig(parsed, exports.CONFIG_FILE);
+}
+const OLLAMA_MIGRATION_REMEDY = 'The "ollama" embedding provider has been removed. Point Ollama through the ' +
+    '"openai-compatible" provider instead — set embedding.provider to "openai-compatible" ' +
+    'and embedding.baseURL to "http://localhost:11434/v1" — via `rag-config edit` (or by ' +
+    'editing the config file directly) or by re-running `rag-setup`. After switching, rebuild ' +
+    'the index with `rag-index --reindex`.';
+/** Strip a trailing `:tag` (Docker-style) from a model name, if present. */
+function stripModelTag(model) {
+    return model.replace(/:[^:]*$/, '');
+}
+/**
+ * Detect a raw (pre-migration) config object that still selects the removed
+ * `ollama` embedding provider — explicitly, via a legacy top-level `ollama`
+ * block, or implicitly (no `provider` set, but `baseURL`/`model` point at
+ * Ollama's defaults) — and throw a `ConfigError` with migration guidance
+ * instead of letting it validate under a silently reinterpreted provider.
+ * Runs before `migrateRawConfig` so a legacy `ollama.*` block is never
+ * converted into an `embedding` block first. Pure — never mutates `raw`.
+ */
+function detectFormerOllamaConfig(raw) {
+    if (raw == null || typeof raw !== 'object')
+        return;
+    const obj = raw;
+    const embedding = obj.embedding;
+    if (embedding != null && typeof embedding === 'object') {
+        const e = embedding;
+        if (e.provider === 'ollama') {
+            throw new config_error_1.ConfigError(`Config selects the "ollama" embedding provider, which is no longer supported. ${OLLAMA_MIGRATION_REMEDY}`);
+        }
+        if (e.provider === undefined) {
+            if (typeof e.baseURL === 'string') {
+                let port;
+                try {
+                    port = new URL(e.baseURL).port;
+                }
+                catch { /* unparsable — not a signal */ }
+                if (port === '11434') {
+                    throw new config_error_1.ConfigError(`Config's embedding.baseURL targets Ollama's default port (11434) with no embedding.provider set. ${OLLAMA_MIGRATION_REMEDY}`);
+                }
+            }
+            if (typeof e.model === 'string' && constants_1.FORMER_OLLAMA_MODELS.includes(stripModelTag(e.model))) {
+                throw new config_error_1.ConfigError(`Config's embedding.model ("${e.model}") was formerly registered for Ollama, with no embedding.provider set. ${OLLAMA_MIGRATION_REMEDY}`);
+            }
+        }
+        return;
+    }
+    if (obj.ollama != null && typeof obj.ollama === 'object') {
+        throw new config_error_1.ConfigError(`Config has a legacy "ollama" configuration block. ${OLLAMA_MIGRATION_REMEDY}`);
+    }
 }
 /**
  * Migrate a legacy raw config object to the current shape, in place of a
  * versioned migration system. Pure — returns a new object, never mutates input.
  *
- * - Legacy `ollama.host`/`ollama.model` → `embedding.{baseURL,model}` with
- *   `provider: 'ollama'` (only when `embedding` is not already present).
  * - Removed translation keys (`search.autoTranslate`, `search.translateModel`)
  *   are dropped so they neither validate-fail nor take effect.
  * - Legacy `reranker.provider: 'ollama'` (a dead value — Ollama has no rerank
@@ -198,21 +253,14 @@ function readConfigJson() {
  *   dropped so it re-derives to `/rerank`. Otherwise the tightened enum would
  *   fail validation on existing configs and lock the user out.
  *
- * `ollama` itself is left for the schema to strip. Exported for unit testing.
+ * A legacy top-level `ollama` block reaches here only when `detectFormerOllamaConfig`
+ * did not already reject it (i.e. an `embedding` block is also present); it is
+ * dropped rather than merged. Exported for unit testing.
  */
 function migrateRawConfig(raw) {
     if (raw == null || typeof raw !== 'object')
         return raw;
     const obj = JSON.parse(JSON.stringify(raw));
-    const legacyOllama = obj.ollama;
-    if (!obj.embedding && legacyOllama && typeof legacyOllama === 'object') {
-        const embedding = { provider: 'ollama' };
-        if (typeof legacyOllama.host === 'string')
-            embedding.baseURL = legacyOllama.host;
-        if (typeof legacyOllama.model === 'string')
-            embedding.model = legacyOllama.model;
-        obj.embedding = embedding;
-    }
     delete obj.ollama;
     if (obj.search && typeof obj.search === 'object') {
         delete obj.search.autoTranslate;
@@ -227,12 +275,19 @@ function migrateRawConfig(raw) {
     return obj;
 }
 /**
- * Validate a parsed config object against the Zod schema. Unknown keys (e.g.
- * the "$schema" editor reference) are stripped. Throws with a caller-friendly
- * message on validation failure. Pure — no file I/O.
+ * Validate a raw (pre-migration) config object against the Zod schema: first
+ * `detectFormerOllamaConfig` (a `ConfigError` on a former-Ollama config takes
+ * priority over both migration and the regular Zod enum rejection), then
+ * `migrateRawConfig`, then the schema itself. Unknown keys (e.g. the "$schema"
+ * editor reference) are stripped. Throws with a caller-friendly message on
+ * validation failure. The single entry point for both `readConfigJson` and
+ * `PUT /api/config`, so both apply identical rules with an identical message.
+ * Pure — no file I/O.
  */
 function parseConfig(raw, source = exports.CONFIG_FILE) {
-    const result = jsonSchema.safeParse(raw);
+    detectFormerOllamaConfig(raw);
+    const migrated = migrateRawConfig(raw);
+    const result = jsonSchema.safeParse(migrated);
     if (!result.success) {
         const issues = result.error.issues.map(i => `  ${i.path.join('.')}: ${i.message}`).join('\n');
         throw new Error(`Invalid config in ${source}:\n${issues}\n` +

package/dist/src/config.d.ts

@@ -1,6 +1,5 @@
-export declare class ConfigError extends Error {
-    constructor(message: string);
-}
+import { ConfigError } from './config-error';
+export { ConfigError };
 /**
  * Resolve a config value that may reference an environment variable. A value of
  * the form `env:VAR_NAME` resolves to `process.env.VAR_NAME`; any other string
@@ -26,7 +25,7 @@ export declare class Config {
      * locking the user out of `rag-web`/`rag-mcp`.
      */
     get embedding(): {
-        provider: "ollama" | "openai-compatible" | "voyage" | "infinity";
+        provider: "openai-compatible" | "voyage" | "infinity";
         baseURL: string;
         apiKey: string;
         model: string;
@@ -42,6 +41,7 @@ export declare class Config {
         model: string;
         url: string;
         overfetch: number;
+        candidateFloor: number;
     };
     get indexer(): {
         chunkSize: number;
@@ -57,6 +57,7 @@ export declare class Config {
     };
     get logging(): {
         level: "error" | "debug" | "info" | "warn";
+        searchMetrics: boolean;
         dir?: string | undefined;
     };
     get workspaceRoot(): string;

package/dist/src/config.js

@@ -38,13 +38,8 @@ exports.resolveEnvRef = resolveEnvRef;
 const os = __importStar(require("os"));
 const zod_1 = require("zod");
 const config_store_1 = require("./config-store");
-class ConfigError extends Error {
-    constructor(message) {
-        super(message);
-        this.name = 'ConfigError';
-    }
-}
-exports.ConfigError = ConfigError;
+const config_error_1 = require("./config-error");
+Object.defineProperty(exports, "ConfigError", { enumerable: true, get: function () { return config_error_1.ConfigError; } });
 /**
  * Resolve a config value that may reference an environment variable. A value of
  * the form `env:VAR_NAME` resolves to `process.env.VAR_NAME`; any other string
@@ -58,24 +53,23 @@ function resolveEnvRef(value, env = process.env) {
     const name = value.slice(4).trim();
     const resolved = name ? env[name] : undefined;
     if (resolved == null || resolved === '') {
-        throw new ConfigError(`Config references environment variable "${name}" (as "env:${name}") but it is not set. ` +
+        throw new config_error_1.ConfigError(`Config references environment variable "${name}" (as "env:${name}") but it is not set. ` +
             `Define ${name} in ${config_store_1.ENV_FILE} or export it in the environment.`);
     }
     return resolved;
 }
 const DEFAULT_BASE_URLS = {
-    'ollama': 'http://localhost:11434',
     'openai-compatible': 'https://api.openai.com/v1',
     'voyage': 'https://api.voyageai.com/v1',
     'infinity': 'http://localhost:7997',
 };
 function defaultBaseURL(provider) {
-    return DEFAULT_BASE_URLS[provider] ?? DEFAULT_BASE_URLS.ollama;
+    return DEFAULT_BASE_URLS[provider] ?? DEFAULT_BASE_URLS.infinity;
 }
 // Reranking is served only by OpenAI-compatible `/rerank` endpoints (Infinity,
-// TEI, vLLM, Jina/Cohere-shape). Ollama has no rerank API, so there is a single
-// endpoint shape. Normalize a trailing `/embeddings` or `/v1` to the server root
-// so a baseURL written with an OpenAI-style suffix still yields `<root>/rerank`.
+// TEI, vLLM, Jina/Cohere-shape) — a single endpoint shape. Normalize a trailing
+// `/embeddings` or `/v1` to the server root so a baseURL written with an
+// OpenAI-style suffix still yields `<root>/rerank`.
 function deriveRerankUrl(baseURL) {
     const root = baseURL.replace(/\/+$/, '').replace(/\/(embeddings|v1)$/, '');
     return `${root}/rerank`;
@@ -89,7 +83,7 @@ const resolvedSchema = zod_1.z.object({
         database: zod_1.z.string().min(1),
     }),
     embedding: zod_1.z.object({
-        provider: zod_1.z.enum(['ollama', 'openai-compatible', 'voyage', 'infinity']).default(config_store_1.CONFIG_DEFAULTS['embedding.provider']),
+        provider: zod_1.z.enum(['openai-compatible', 'voyage', 'infinity']).default(config_store_1.CONFIG_DEFAULTS['embedding.provider']),
         baseURL: zod_1.z.string().min(1),
         apiKey: zod_1.z.string().default(config_store_1.CONFIG_DEFAULTS['embedding.apiKey']),
         model: zod_1.z.string().min(1).default(config_store_1.CONFIG_DEFAULTS['embedding.model']),
@@ -104,6 +98,7 @@ const resolvedSchema = zod_1.z.object({
         model: zod_1.z.string().default(config_store_1.CONFIG_DEFAULTS['reranker.model']),
         url: zod_1.z.string().min(1),
         overfetch: zod_1.z.number().int().min(1).max(20).default(config_store_1.CONFIG_DEFAULTS['reranker.overfetch']),
+        candidateFloor: zod_1.z.number().int().min(1).default(config_store_1.CONFIG_DEFAULTS['reranker.candidateFloor']),
     }),
     indexer: zod_1.z.object({
         chunkSize: zod_1.z.number().int().positive().default(config_store_1.CONFIG_DEFAULTS['indexing.chunkSize']),
@@ -120,6 +115,7 @@ const resolvedSchema = zod_1.z.object({
     logging: zod_1.z.object({
         level: zod_1.z.enum(['debug', 'info', 'warn', 'error']).default(config_store_1.CONFIG_DEFAULTS['logging.level']),
         dir: zod_1.z.string().optional(),
+        searchMetrics: zod_1.z.boolean().default(config_store_1.CONFIG_DEFAULTS['logging.searchMetrics']),
     }),
     workspaceRoot: zod_1.z.string().default(''),
 });
@@ -143,7 +139,7 @@ class Config {
     constructor() {
         const raw = (0, config_store_1.readConfigJson)();
         if (!raw)
-            throw new ConfigError('Config not found. Run rag-setup.');
+            throw new config_error_1.ConfigError('Config not found. Run rag-setup.');
         const embProvider = (raw.embedding?.provider ?? config_store_1.CONFIG_DEFAULTS['embedding.provider']);
         const embBaseURL = raw.embedding?.baseURL ?? defaultBaseURL(embProvider);
         const rerankBaseURL = raw.reranker?.baseURL ?? embBaseURL;
@@ -172,6 +168,7 @@ class Config {
                 model: raw.reranker?.model,
                 url: rerankUrl,
                 overfetch: raw.reranker?.overfetch,
+                candidateFloor: raw.reranker?.candidateFloor,
             },
             indexer: {
                 chunkSize: raw.indexing?.chunkSize,
@@ -188,6 +185,7 @@ class Config {
             logging: {
                 level: raw.logging?.level,
                 dir: raw.logging?.dir,
+                searchMetrics: raw.logging?.searchMetrics,
             },
             workspaceRoot: raw.workspaceRoot,
         });
@@ -195,7 +193,7 @@ class Config {
             const issues = result.error.issues
                 .map(i => `  ${i.path.join('.')}: ${i.message}`)
                 .join('\n');
-            throw new ConfigError(`Invalid config:\n${issues}\nRun rag-setup or: rag-config set <key> <value>`);
+            throw new config_error_1.ConfigError(`Invalid config:\n${issues}\nRun rag-setup or: rag-config set <key> <value>`);
         }
         this.data = result.data;
     }

package/dist/src/constants.d.ts

@@ -1,4 +1,4 @@
-export type EmbeddingProvider = 'ollama' | 'openai-compatible' | 'voyage' | 'infinity';
+export type EmbeddingProvider = 'openai-compatible' | 'voyage' | 'infinity';
 /**
  * pgvector's HNSW / IVFFlat index hard limit. The effective embedding dimension
  * must not exceed this; larger cloud models must reduce via the Matryoshka
@@ -23,7 +23,13 @@ export interface ModelInfo {
  * time (see `resolveDimension`).
  */
 export declare const MODEL_REGISTRY: Record<string, ModelInfo>;
-export declare const DEFAULT_EMBED_MODEL = "bge-m3";
+export declare const DEFAULT_EMBED_MODEL = "jinaai/jina-embeddings-v2-base-code";
+/**
+ * Former Ollama registry model names, kept only so config validation can
+ * recognise an implicit (provider-less) config that still targets Ollama —
+ * see `detectFormerOllamaConfig` in `config-store.ts`.
+ */
+export declare const FORMER_OLLAMA_MODELS: readonly ["bge-m3", "nomic-embed-text", "mxbai-embed-large"];
 /** Advisory dimension for a model, or `undefined` when the model is unknown. */
 export declare function registryDimension(model: string): number | undefined;
 /**

package/dist/src/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_EMBED_MODEL = exports.MODEL_REGISTRY = exports.MAX_EMBED_DIM = void 0;
+exports.FORMER_OLLAMA_MODELS = exports.DEFAULT_EMBED_MODEL = exports.MODEL_REGISTRY = exports.MAX_EMBED_DIM = void 0;
 exports.registryDimension = registryDimension;
 exports.resolveDimension = resolveDimension;
 /**
@@ -16,9 +16,6 @@ exports.MAX_EMBED_DIM = 2000;
  * time (see `resolveDimension`).
  */
 exports.MODEL_REGISTRY = {
-    'bge-m3': { provider: 'ollama', dimensions: 1024 },
-    'nomic-embed-text': { provider: 'ollama', dimensions: 768 },
-    'mxbai-embed-large': { provider: 'ollama', dimensions: 1024 },
     'text-embedding-3-small': { provider: 'openai-compatible', dimensions: 1536, dimConfigurable: true },
     'text-embedding-3-large': { provider: 'openai-compatible', dimensions: 3072, dimConfigurable: true, maxIndexable: 2000 },
     'text-embedding-ada-002': { provider: 'openai-compatible', dimensions: 1536 },
@@ -28,7 +25,13 @@ exports.MODEL_REGISTRY = {
     'BAAI/bge-m3': { provider: 'infinity', dimensions: 1024 },
     'jinaai/jina-embeddings-v2-base-code': { provider: 'infinity', dimensions: 768 },
 };
-exports.DEFAULT_EMBED_MODEL = 'bge-m3';
+exports.DEFAULT_EMBED_MODEL = 'jinaai/jina-embeddings-v2-base-code';
+/**
+ * Former Ollama registry model names, kept only so config validation can
+ * recognise an implicit (provider-less) config that still targets Ollama —
+ * see `detectFormerOllamaConfig` in `config-store.ts`.
+ */
+exports.FORMER_OLLAMA_MODELS = ['bge-m3', 'nomic-embed-text', 'mxbai-embed-large'];
 /** Advisory dimension for a model, or `undefined` when the model is unknown. */
 function registryDimension(model) {
     return exports.MODEL_REGISTRY[model]?.dimensions;

package/dist/src/db/index.d.ts

@@ -1,2 +1,2 @@
-export { codeChunk, codeDependency, codeSymbol, codeCall, indexMeta } from './schema';
+export { codeChunk, codeDependency, codeSymbol, codeCall, indexMeta, symbolIndexVersion } from './schema';
 export type { CodeChunkInsert } from './schema';

package/dist/src/db/index.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.indexMeta = exports.codeCall = exports.codeSymbol = exports.codeDependency = exports.codeChunk = void 0;
+exports.symbolIndexVersion = exports.indexMeta = exports.codeCall = exports.codeSymbol = exports.codeDependency = exports.codeChunk = void 0;
 var schema_1 = require("./schema");
 Object.defineProperty(exports, "codeChunk", { enumerable: true, get: function () { return schema_1.codeChunk; } });
 Object.defineProperty(exports, "codeDependency", { enumerable: true, get: function () { return schema_1.codeDependency; } });
 Object.defineProperty(exports, "codeSymbol", { enumerable: true, get: function () { return schema_1.codeSymbol; } });
 Object.defineProperty(exports, "codeCall", { enumerable: true, get: function () { return schema_1.codeCall; } });
 Object.defineProperty(exports, "indexMeta", { enumerable: true, get: function () { return schema_1.indexMeta; } });
+Object.defineProperty(exports, "symbolIndexVersion", { enumerable: true, get: function () { return schema_1.symbolIndexVersion; } });

package/dist/src/db/schema.d.ts

@@ -430,6 +430,81 @@ export declare const codeSymbol: import("drizzle-orm/pg-core").PgTableWithColumn
             identity: undefined;
             generated: undefined;
         }, {}, {}>;
+        container: import("drizzle-orm/pg-core").PgColumn<{
+            name: "container";
+            tableName: "code_symbol";
+            dataType: "string";
+            columnType: "PgText";
+            data: string;
+            driverParam: string;
+            notNull: false;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: [string, ...string[]];
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {}>;
+        isStatic: import("drizzle-orm/pg-core").PgColumn<{
+            name: "isStatic";
+            tableName: "code_symbol";
+            dataType: "boolean";
+            columnType: "PgBoolean";
+            data: boolean;
+            driverParam: boolean;
+            notNull: true;
+            hasDefault: true;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {}>;
+    };
+    dialect: "pg";
+}>;
+export declare const symbolIndexVersion: import("drizzle-orm/pg-core").PgTableWithColumns<{
+    name: "symbol_index_version";
+    schema: undefined;
+    columns: {
+        project: import("drizzle-orm/pg-core").PgColumn<{
+            name: "project";
+            tableName: "symbol_index_version";
+            dataType: "string";
+            columnType: "PgText";
+            data: string;
+            driverParam: string;
+            notNull: true;
+            hasDefault: false;
+            isPrimaryKey: true;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: [string, ...string[]];
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {}>;
+        version: import("drizzle-orm/pg-core").PgColumn<{
+            name: "version";
+            tableName: "symbol_index_version";
+            dataType: "number";
+            columnType: "PgInteger";
+            data: number;
+            driverParam: string | number;
+            notNull: true;
+            hasDefault: false;
+            isPrimaryKey: false;
+            isAutoincrement: false;
+            hasRuntimeDefault: false;
+            enumValues: undefined;
+            baseColumn: never;
+            identity: undefined;
+            generated: undefined;
+        }, {}, {}>;
     };
     dialect: "pg";
 }>;

package/dist/src/db/schema.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.indexMeta = exports.codeCall = exports.codeSymbol = exports.codeDependency = exports.codeChunk = void 0;
+exports.indexMeta = exports.codeCall = exports.symbolIndexVersion = exports.codeSymbol = exports.codeDependency = exports.codeChunk = void 0;
 const pg_core_1 = require("drizzle-orm/pg-core");
 // NOTE: the `dimensions` literal below is nominal only. `dataType()` is invoked
 // solely by drizzle-kit DDL generation, which this project does not use — the
@@ -38,6 +38,15 @@ exports.codeSymbol = (0, pg_core_1.pgTable)('code_symbol', {
     signature: (0, pg_core_1.text)('signature'),
     line: (0, pg_core_1.integer)('line'),
     col: (0, pg_core_1.integer)('col'),
+    container: (0, pg_core_1.text)('container'),
+    isStatic: (0, pg_core_1.boolean)('isStatic').notNull().default(false),
+});
+// Per-project marker of the symbol/call-graph row format. Not one of the four
+// index tables (see the `index-consistency` pruning requirement) — a project
+// with only a marker row is not "indexed" and is never pruned for it.
+exports.symbolIndexVersion = (0, pg_core_1.pgTable)('symbol_index_version', {
+    project: (0, pg_core_1.text)('project').primaryKey(),
+    version: (0, pg_core_1.integer)('version').notNull(),
 });
 exports.codeCall = (0, pg_core_1.pgTable)('code_call', {
     id: (0, pg_core_1.uuid)('id').primaryKey().defaultRandom(),

package/dist/src/enriched-prompt.d.ts

@@ -0,0 +1,8 @@
+import type { ChunkPiece } from './interfaces/IChunker';
+import type { DepEdge, SymbolEntry } from './interfaces/IAstParser';
+/**
+ * Build the embedding-input prompt for one chunk. `symbols` is the file's
+ * top-level declarations only (never members) — the prompt is unaffected by
+ * this change (see the `symbol-index-members` non-goal).
+ */
+export declare function getEnrichedPrompt(piece: ChunkPiece, relPath: string, serviceName: string, edges: DepEdge[], symbols: SymbolEntry[]): string;