@massa-ai/mcp-client 1.2.1 → 1.4.0

package/dist/config-cli.js

@@ -557,7 +557,8 @@ __export(exports_config_loader, {
   getConfigPath: () => getConfigPath,
   getConfigForEnv: () => getConfigForEnv,
   getConfigDir: () => getConfigDir,
-  configExists: () => configExists
+  configExists: () => configExists,
+  __resetMigrationForTests: () => __resetMigrationForTests
 });
 import fs from "fs";
 import path3 from "path";
@@ -627,6 +628,9 @@ function migrateDataDirOnce() {
     console.error(`[massa-ai] Data directory migration skipped:`, err);
   }
 }
+function __resetMigrationForTests() {
+  migrationAttempted = false;
+}
 function saveConfig(config) {
   if (!fs.existsSync(CONFIG_DIR)) {
     fs.mkdirSync(CONFIG_DIR, { recursive: true });
@@ -636,7 +640,7 @@ function saveConfig(config) {
 function initConfig() {
   if (!fs.existsSync(CONFIG_FILE)) {
     saveConfig(defaultMassaAiConfig);
-    console.log(`Created default config at ${CONFIG_FILE}`);
+    console.error(`Created default config at ${CONFIG_FILE}`);
   }
 }
 function getConfigForEnv() {
@@ -688,7 +692,7 @@ var import_dotenv, envPath;
 var init_env = __esm(() => {
   import_dotenv = __toESM(require_main(), 1);
   envPath = findEnvFile();
-  import_dotenv.config({ path: envPath });
+  import_dotenv.config({ path: envPath, quiet: true });
   try {
     const { loadConfigSafe: loadConfigSafe2, migrateDataDirOnce: migrateDataDirOnce2 } = (init_config_loader(), __toCommonJS(exports_config_loader));
     migrateDataDirOnce2();
@@ -6957,11 +6961,7 @@ class Logger {
     return `[${timestamp}] [${level}] ${message}${metaStr}`;
   }
   write(message, level) {
-    if (level >= LogLevel.WARN) {
-      console.error(message);
-    } else {
-      console.log(message);
-    }
+    console.error(message);
   }
   debug(message, meta) {
     if (this.shouldLog(LogLevel.DEBUG)) {
@@ -7405,8 +7405,9 @@ class FileFilterCache {
   }
   invalidateProject(projectId) {
     let removed = 0;
+    const prefix = `project:${projectId}`;
     for (const [key, _entry] of this.cache.entries()) {
-      if (key.startsWith(`project:${projectId}|`)) {
+      if (key === prefix || key.startsWith(`${prefix}|`)) {
         this.cache.delete(key);
         removed++;
       }
@@ -109741,9 +109742,9 @@ class SearchCachePg {
     if (this.l1Cache.size <= this.L1_MAX_SIZE)
       return;
     let oldestKey = null;
-    let oldestTime = Date.now();
+    let oldestTime = Infinity;
     for (const [key, entry2] of this.l1Cache.entries()) {
-      if (entry2.lastAccessed < oldestTime) {
+      if (entry2.lastAccessed <= oldestTime) {
         oldestTime = entry2.lastAccessed;
         oldestKey = key;
       }
@@ -110352,7 +110353,8 @@ function generationDefinitionIdentityColumns(def) {
   }
   if (parsed.kind !== def.kind)
     throw new TypeError(`definition_fqn_kind_mismatch:${def.id}`);
-  if (parsed.qualifiedName.split(".").at(-1) !== def.name) {
+  const terminalMatchesName = parsed.qualifiedName === def.name || parsed.qualifiedName.endsWith(`.${def.name}`);
+  if (!terminalMatchesName) {
     throw new TypeError(`definition_fqn_name_mismatch:${def.id}`);
   }
   if (def.qualified_name !== undefined && def.qualified_name !== parsed.qualifiedName) {
@@ -110639,11 +110641,24 @@ async function writeFileGeneration(input) {
         last_known_good_generation_id = EXCLUDED.last_known_good_generation_id,
         last_successful_at = EXCLUDED.last_successful_at
     `;
-    for (const definition of definitions) {
+    const seenDefinitionIds = new Set;
+    const uniqueDefinitions = definitions.filter((definition) => {
+      if (seenDefinitionIds.has(definition.id))
+        return false;
+      seenDefinitionIds.add(definition.id);
+      return true;
+    });
+    for (const definition of uniqueDefinitions) {
       const identity = generationDefinitionIdentityColumns(definition);
       await tx.$executeRaw`
         INSERT INTO symbol_definitions (id, project_id, generation_id, file_path, name, kind, line_start, line_end, exported, doc_comment, indexed_at, qualified_name, canonical_signature, signature_hash, legacy_fqn, source_span)
         VALUES (${definition.id}, ${lease.projectId}, ${lease.generationId}, ${file2.relative_path}, ${definition.name}, ${definition.kind}, ${definition.line_start}, ${definition.line_end}, ${definition.exported}, ${definition.doc_comment ?? null}, ${new Date(definition.indexed_at)}, ${identity.qualifiedName}, ${identity.canonicalSignature}, ${identity.signatureHash}, ${identity.legacyFqn}, ${identity.sourceSpan}::jsonb)
+        ON CONFLICT (project_id, generation_id, id) DO UPDATE SET
+          name = EXCLUDED.name, kind = EXCLUDED.kind, line_start = EXCLUDED.line_start,
+          line_end = EXCLUDED.line_end, exported = EXCLUDED.exported, doc_comment = EXCLUDED.doc_comment,
+          indexed_at = EXCLUDED.indexed_at, qualified_name = EXCLUDED.qualified_name,
+          canonical_signature = EXCLUDED.canonical_signature, signature_hash = EXCLUDED.signature_hash,
+          legacy_fqn = EXCLUDED.legacy_fqn, source_span = EXCLUDED.source_span
       `;
     }
     for (const reference of references) {
@@ -110894,7 +110909,7 @@ async function upsertWorkspace(ws) {
       AND generation.id = 'legacy-' || md5(current_workspace.project_id)
       AND generation.project_id = current_workspace.project_id
     `;
-  });
+  }, { timeout: 60000, maxWait: 1e4 });
 }
 async function updateWorkspaceStatus(projectId, status, opts) {
   const lastError = typeof opts === "string" ? opts : opts?.lastError ?? null;
@@ -110965,7 +110980,7 @@ async function updateWorkspaceStatus(projectId, status, opts) {
       FROM active_counts c
       WHERE w.project_id = c.project_id AND EXISTS (SELECT 1 FROM updated_generation)
     `;
-  });
+  }, { timeout: 60000, maxWait: 1e4 });
 }
 var init_symbol_repo_workspace = __esm(() => {
   init_prisma_client();
@@ -112574,7 +112589,7 @@ class MemoryRepositoryPg {
       importance: m.importance,
       tags: JSON.stringify(tagsArr),
       embedding: m.embedding,
-      metadata: m.metadata ? JSON.stringify(m.metadata) : null,
+      metadata: m.metadata == null ? null : typeof m.metadata === "string" ? m.metadata : JSON.stringify(m.metadata),
       created_at: m.created_at instanceof Date ? m.created_at.getTime() : Number(m.created_at),
       updated_at: m.updated_at instanceof Date ? m.updated_at.getTime() : Number(m.updated_at),
       access_count: m.access_count,
@@ -112768,7 +112783,7 @@ class MemoryRepositoryPg {
              pinned, deleted_at
       FROM memories
       WHERE deleted_at IS NULL
-      ORDER BY created_at DESC
+      ORDER BY created_at DESC, id DESC
       LIMIT ${limit} OFFSET ${offset}
     `;
     return rows.map((r) => this.toMemoryRow(r));
@@ -112776,7 +112791,7 @@ class MemoryRepositoryPg {
   async findRecentByTag(tag, opts) {
     const since = new Date(opts.sinceMs);
     const conditions = [
-      import_prisma2.Prisma.sql`${tag} = ANY(tags)`,
+      import_prisma2.Prisma.sql`${tag} = ANY(tags::text[])`,
       import_prisma2.Prisma.sql`created_at >= ${since}`
     ];
     if (opts.sessionId)
@@ -113319,7 +113334,8 @@ function restoreWorkingMemoryBuffer(snapshot) {
   for (const e of snapshot.entries) {
     if (!e || !e.result || typeof e.id !== "string")
       continue;
-    if (now2 - (e.lastAccessedAt ?? 0) >= snapshot.config.ttlMs)
+    const lastAccessedAt = e.lastAccessedAt ?? now2;
+    if (now2 - lastAccessedAt >= snapshot.config.ttlMs)
       continue;
     const result = e.result;
     buf.entries.set(e.id, {
@@ -113327,7 +113343,7 @@ function restoreWorkingMemoryBuffer(snapshot) {
       queryTokens: new Set,
       contentTokens: tokenize(result.content || ""),
       addedAt: e.addedAt ?? now2,
-      lastAccessedAt: e.lastAccessedAt ?? now2,
+      lastAccessedAt,
       baselineScore: e.baselineScore ?? result.score
     });
   }
@@ -123720,10 +123736,10 @@ class GraphQueries {
       return new Map;
     }
     const rows = await getPrismaClient2().$queryRaw`
-      SELECT id, content, type, level, importance, array_to_json(tags)::text AS tags,
+      SELECT id, content, type, level, importance, tags,
              created_at, updated_at, access_count, user_id, session_id, project_id, agent_id,
              NULL::bytea AS embedding, NULL::text AS metadata, NULL::timestamp AS last_accessed,
-             pinned::integer AS pinned, deleted_at
+             CASE WHEN pinned THEN 1 ELSE 0 END AS pinned, deleted_at
       FROM memories WHERE id = ANY(${memoryIds}::text[])`;
     const result = new Map;
     for (const row of rows) {
@@ -128266,6 +128282,7 @@ function buildStructuralResolverDefinitions(documents) {
   return Object.freeze(documents.flatMap((document2) => document2.structure.symbols.map((symbol27) => {
     const key = `${document2.file}\x00${symbol27.qualifiedName}\x00${symbol27.kind}`;
     const visibleNested = document2.dialect === "java" ? symbol27.signatureMaterial.modifiers.includes("public") && (["class", "interface", "enum"].includes(symbol27.kind) || symbol27.signatureMaterial.modifiers.includes("static")) : !symbol27.signatureMaterial.modifiers.includes("private");
+    const isExportMarker = symbol27.kind === "export";
     return Object.freeze({
       identity: Object.freeze({
         file: document2.file,
@@ -128278,7 +128295,7 @@ function buildStructuralResolverDefinitions(documents) {
         typeTokens: symbol27.signatureMaterial.typeTokens,
         modifiers: symbol27.signatureMaterial.modifiers,
         scope: symbol27.qualifiedName === symbol27.name ? "top_level" : "nested",
-        overload: (groups.get(key) ?? 0) > 1 ? "overloaded" : "unique"
+        overload: (groups.get(key) ?? 0) > 1 || isExportMarker ? "overloaded" : "unique"
       }),
       exported: symbol27.exported || !symbol27.name.startsWith("#") && !symbol27.name.startsWith("%23") && visibleNested && exportedRoots.has(`${document2.file}\x00${symbol27.qualifiedName.split(".")[0]}`),
       defaultExport: symbol27.defaultExport
@@ -128947,6 +128964,7 @@ class ResolveStage {
           timestamp: Date.now()
         });
       }
+      await new Promise((resolve6) => setTimeout(resolve6, 0));
     }
     const durationMs = Math.round(performance.now() - t0);
     ctx.emit({
@@ -129270,6 +129288,47 @@ var init_resolve = __esm(() => {
   STRUCTURAL_SEED_EXTENSIONS = new Set([".ts", ".tsx", ".js", ".jsx", ".py", ".rb", ".php", ".lua", ".c", ".h", ".cpp", ".hpp", ".go", ".rs", ".zig", ".java", ".kt", ".kts", ".scala", ".cs", ".swift", ".dart", ".ex", ".exs", ".erl", ".clj", ".ml", ".hs", ".vue", ".md", ".json", ".yaml", ".yml"]);
 });
 
+// ../../packages/core/dist/data/with-deadlock-retry.js
+function isRetriableTransactionError(error51) {
+  if (!error51 || typeof error51 !== "object")
+    return false;
+  const code = error51.code;
+  if (typeof code === "string" && RETRIABLE_SQLSTATES.has(code))
+    return true;
+  const message = error51.message;
+  if (typeof message === "string" && /Code:\s*`(?:40P01|40001|40P02)`/.test(message)) {
+    return true;
+  }
+  return false;
+}
+async function withDeadlockRetry(operation, options = {}) {
+  const maxAttempts = options.maxAttempts ?? 5;
+  const baseDelayMs = options.baseDelayMs ?? 75;
+  for (let attempt = 1;attempt <= maxAttempts; attempt++) {
+    try {
+      return await operation();
+    } catch (error51) {
+      if (!isRetriableTransactionError(error51) || attempt === maxAttempts)
+        throw error51;
+      const delayMs = baseDelayMs * 2 ** (attempt - 1);
+      logger.warn("Retriable DB lock cycle; retrying operation", {
+        operation: options.operation ?? "unknown",
+        attempt,
+        maxAttempts,
+        delayMs,
+        error: error51?.message?.slice(0, 120)
+      });
+      await new Promise((resolve6) => setTimeout(resolve6, delayMs));
+    }
+  }
+  throw new Error("withDeadlockRetry exhausted retries");
+}
+var RETRIABLE_SQLSTATES;
+var init_with_deadlock_retry = __esm(() => {
+  init_dist();
+  RETRIABLE_SQLSTATES = new Set(["40P01", "40001", "40P02"]);
+});
+
 // ../../packages/core/dist/services/etl/stages/load.js
 import path18 from "path";
 function formatDuration(ms) {
@@ -129386,8 +129445,12 @@ class LoadStage {
           return;
         try {
           const [chunkCount, symCount] = await Promise.all([
-            mode === "structural" ? Promise.resolve(0) : this.loadToSearchStores(ctx, file2),
-            mode === "semantic" ? Promise.resolve(file2.symbols.length) : this.loadToSymbolDb(ctx, file2)
+            mode === "structural" ? Promise.resolve(0) : withDeadlockRetry(() => this.loadToSearchStores(ctx, file2), {
+              operation: "etl.loadToSearchStores"
+            }),
+            mode === "semantic" ? Promise.resolve(file2.symbols.length) : withDeadlockRetry(() => this.loadToSymbolDb(ctx, file2), {
+              operation: "etl.loadToSymbolDb"
+            })
           ]);
           if (!ctx.graphGenerationLease && mode !== "structural") {
             await getSymbolRepository().upsertFile({
@@ -129579,6 +129642,7 @@ class LoadStage {
 }
 var init_load = __esm(() => {
   init_dist();
+  init_with_deadlock_retry();
   init_vector_store_factory();
   init_keyword_search_factory();
   init_symbol_repository_factory();
@@ -129776,7 +129840,7 @@ class GraphGenerationRepositoryPg {
           AND graph_lease_token = ${lease.leaseToken}
       `;
       return { status: "renewed", leaseExpiresAt: renewed[0].lease_expires_at.getTime() };
-    });
+    }, { timeout: 60000, maxWait: 1e4 });
   }
   async complete(lease) {
     return getPrismaClient2().$transaction(async (tx) => {
@@ -129950,7 +130014,7 @@ class GraphGenerationCoordinator {
     } while (true);
   }
   async heartbeat(lease) {
-    const outcome2 = await this.repository.heartbeat(lease, GRAPH_GENERATION_LEASE_TTL_MS);
+    const outcome2 = await withDeadlockRetry(() => this.repository.heartbeat(lease, GRAPH_GENERATION_LEASE_TTL_MS), { operation: "graph_generation.heartbeat", maxAttempts: 3 });
     if (outcome2.status !== "renewed")
       throw new Error("graph_generation_lease_lost");
   }
@@ -129986,6 +130050,7 @@ class GraphGenerationCoordinator {
 var GRAPH_GENERATION_LEASE_TTL_MS = 300000;
 var init_graph_generation_coordinator = __esm(() => {
   init_graph_generation_repository_factory();
+  init_with_deadlock_retry();
 });
 
 // ../../packages/core/dist/services/etl/pipeline.js
@@ -130063,6 +130128,7 @@ var init_pipeline = __esm(() => {
   init_symbol_repository_factory();
   init_index_job_tracker();
   init_cache_factory();
+  init_index_manager();
   init_vector_store_factory();
   init_keyword_search_factory();
   init_alias_resolver();
@@ -130354,6 +130420,16 @@ var init_pipeline = __esm(() => {
           }
         };
         await getSearchCache().invalidateProject(projectId);
+        try {
+          const admissionMarker = new IndexManager(await getVectorStore());
+          await admissionMarker.updateIndexMetadata(projectId, projectPath, discovered.map((file2) => file2.relativePath));
+        } catch (markerError) {
+          logger.warn("EtlPipeline: search-admission marker write failed", {
+            projectId,
+            jobId,
+            error: markerError.message.slice(0, 160)
+          });
+        }
         indexJobTracker.updateProgress(jobId, result.filesIndexed, result.filesIndexed);
         await indexJobTracker.setResultAndFlush(jobId, {
           filesIndexed: result.filesIndexed,
@@ -131694,16 +131770,14 @@ var TOOL_NAME_NORMALIZE, classifyToolCall = (_source, payload) => {
       const cmdRaw = field2(payload, "command") ?? (toolInput && typeof toolInput === "object" ? toolInput.command : undefined);
       const cmd = lower(cmdRaw);
       if (cmd.startsWith("git ") || cmd.includes(" git ")) {
-        if (cmd.includes("commit") || cmd.includes("merge") || cmd.includes("rebase")) {
-          return "git-changes";
-        }
         return "git-changes";
       }
       return "tool-calls";
     }
     case "TodoWrite":
-    case "Task":
       return "tasks";
+    case "Task":
+      return "subagents-spawned";
     case "WebFetch":
       return "web-fetch";
     case "WebSearch":
@@ -131720,8 +131794,6 @@ var TOOL_NAME_NORMALIZE, classifyToolCall = (_source, payload) => {
       return "memories-stored";
     case "compact_snapshot":
       return "compaction-snapshots";
-    case "Task":
-      return "subagents-spawned";
     default:
       if (toolName.startsWith("mcp__"))
         return "mcp-calls";
@@ -150348,8 +150420,6 @@ var init_recover_project = __esm(() => {
 
 // src/config-cli.ts
 init_config();
-var args = process.argv.slice(2);
-var command = args[0];
 function help() {
   console.log(`
 massa-ai-config - Configuration manager for massa-ai
@@ -150384,13 +150454,13 @@ Examples:
   massa-ai-config recover my-project --path /home/user/renamed-dir
 `);
 }
-function parseOptions(args2) {
+function parseOptions(args) {
   const options = {};
-  for (let i = 0;i < args2.length; i++) {
-    if (args2[i].startsWith("--")) {
-      const key = args2[i].slice(2);
-      if (i + 1 < args2.length && !args2[i + 1].startsWith("--")) {
-        options[key] = args2[i + 1];
+  for (let i = 0;i < args.length; i++) {
+    if (args[i].startsWith("--")) {
+      const key = args[i].slice(2);
+      if (i + 1 < args.length && !args[i + 1].startsWith("--")) {
+        options[key] = args[i + 1];
         i++;
       } else {
         options[key] = true;
@@ -150399,147 +150469,159 @@ function parseOptions(args2) {
   }
   return options;
 }
-if (!command || command === "--help" || command === "-h") {
-  help();
-  process.exit(0);
-}
-var options = parseOptions(args.slice(1));
-switch (command) {
-  case "init": {
-    initConfig();
-    if (options.mistral && typeof options.mistral === "string") {
-      const config3 = loadConfig();
-      config3.embedding = {
-        provider: "mistral",
-        model: "mistral-embed",
-        apiKey: options.mistral,
-        dimensions: 1024
-      };
-      saveConfig(config3);
-      console.log("\u2713 Configured for Mistral embeddings");
-    } else if (options.openai && typeof options.openai === "string") {
-      const config3 = loadConfig();
-      config3.embedding = {
-        provider: "openai",
-        model: "text-embedding-3-small",
-        apiKey: options.openai,
-        dimensions: 1536
-      };
-      saveConfig(config3);
-      console.log("\u2713 Configured for OpenAI embeddings");
-    } else {
-      console.log("\u2713 Configured for Ollama (local) embeddings");
-    }
-    console.log(`
-Config file: ${getConfigPath()}`);
-    break;
-  }
-  case "path": {
-    console.log(getConfigPath());
-    break;
+async function runCli(argv) {
+  const args = argv;
+  const command = args[0];
+  if (!command || command === "--help" || command === "-h") {
+    help();
+    return 0;
   }
-  case "show": {
-    if (!configExists()) {
-      console.log("No config file found. Run `massa-ai-config init` to create one.");
+  const options = parseOptions(args.slice(1));
+  switch (command) {
+    case "init": {
+      initConfig();
+      if (options.mistral && typeof options.mistral === "string") {
+        const config3 = loadConfig();
+        config3.embedding = {
+          provider: "mistral",
+          model: "mistral-embed",
+          apiKey: options.mistral,
+          dimensions: 1024
+        };
+        saveConfig(config3);
+        console.log("\u2713 Configured for Mistral embeddings");
+      } else if (options.openai && typeof options.openai === "string") {
+        const config3 = loadConfig();
+        config3.embedding = {
+          provider: "openai",
+          model: "text-embedding-3-small",
+          apiKey: options.openai,
+          dimensions: 1536
+        };
+        saveConfig(config3);
+        console.log("\u2713 Configured for OpenAI embeddings");
+      } else {
+        console.log("\u2713 Configured for Ollama (local) embeddings");
+      }
       console.log(`
+Config file: ${getConfigPath()}`);
+      break;
+    }
+    case "path": {
+      console.log(getConfigPath());
+      break;
+    }
+    case "show": {
+      if (!configExists()) {
+        console.log("No config file found. Run `massa-ai-config init` to create one.");
+        console.log(`
 Using defaults:`);
-      console.log(JSON.stringify(defaultMassaAiConfig, null, 2));
-      process.exit(0);
-    }
-    const config3 = loadConfig();
-    console.log(JSON.stringify(config3, null, 2));
-    break;
-  }
-  case "set": {
-    const key = args[1];
-    const value = args[2];
-    if (!key || !value) {
-      console.error("Usage: massa-ai-config set <key> <value>");
-      process.exit(1);
-    }
-    const config3 = loadConfig();
-    const keys = key.split(".");
-    let obj = config3;
-    for (let i = 0;i < keys.length - 1; i++) {
-      obj = obj[keys[i]];
-    }
-    const parsedValue = isNaN(Number(value)) ? value : Number(value);
-    obj[keys[keys.length - 1]] = parsedValue;
-    saveConfig(config3);
-    console.log(`\u2713 Set ${key} = ${value}`);
-    break;
-  }
-  case "use": {
-    const provider = args[1];
-    if (!provider || !["ollama", "mistral", "openai"].includes(provider)) {
-      console.error("Provider must be: ollama, mistral, or openai");
-      process.exit(1);
-    }
-    const config3 = loadConfig();
-    if (provider === "ollama") {
-      config3.embedding = {
-        provider: "ollama",
-        model: options.model || "qwen3-embedding:8b",
-        baseURL: options["base-url"] || "http://localhost:11434",
-        dimensions: 768
-      };
-    } else if (provider === "mistral") {
-      if (!options["api-key"]) {
-        console.error("Error: --api-key required for Mistral");
-        process.exit(1);
-      }
-      config3.embedding = {
-        provider: "mistral",
-        model: options.model || "mistral-embed",
-        apiKey: options["api-key"],
-        dimensions: 1024
-      };
-    } else if (provider === "openai") {
-      if (!options["api-key"]) {
-        console.error("Error: --api-key required for OpenAI");
-        process.exit(1);
+        console.log(JSON.stringify(defaultMassaAiConfig, null, 2));
+        return 0;
       }
-      config3.embedding = {
-        provider: "openai",
-        model: options.model || "text-embedding-3-small",
-        apiKey: options["api-key"],
-        dimensions: 1536
-      };
+      const config3 = loadConfig();
+      console.log(JSON.stringify(config3, null, 2));
+      break;
     }
-    saveConfig(config3);
-    console.log(`\u2713 Switched to ${provider} embeddings`);
-    console.log(`  Model: ${config3.embedding.model}`);
-    break;
-  }
-  case "recover": {
-    const projectId = args[1];
-    const newPath = options.path;
-    if (!projectId) {
-      console.error("Error: projectId required. Usage: massa-ai-config recover <projectId> --path <newPath>");
-      process.exit(1);
+    case "set": {
+      const key = args[1];
+      const value = args[2];
+      if (!key || !value) {
+        console.error("Usage: massa-ai-config set <key> <value>");
+        return 1;
+      }
+      const config3 = loadConfig();
+      const keys = key.split(".");
+      let obj = config3;
+      for (let i = 0;i < keys.length - 1; i++) {
+        obj = obj[keys[i]];
+      }
+      const parsedValue = isNaN(Number(value)) ? value : Number(value);
+      obj[keys[keys.length - 1]] = parsedValue;
+      saveConfig(config3);
+      console.log(`\u2713 Set ${key} = ${value}`);
+      break;
     }
-    if (!newPath || typeof newPath !== "string") {
-      console.error("Error: --path required. Usage: massa-ai-config recover <projectId> --path <newPath>");
-      process.exit(1);
+    case "use": {
+      const provider = args[1];
+      if (!provider || !["ollama", "mistral", "openai"].includes(provider)) {
+        console.error("Provider must be: ollama, mistral, or openai");
+        return 1;
+      }
+      const config3 = loadConfig();
+      if (provider === "ollama") {
+        config3.embedding = {
+          provider: "ollama",
+          model: options.model || "qwen3-embedding:8b",
+          baseURL: options["base-url"] || "http://localhost:11434",
+          dimensions: 768
+        };
+      } else if (provider === "mistral") {
+        if (!options["api-key"]) {
+          console.error("Error: --api-key required for Mistral");
+          return 1;
+        }
+        config3.embedding = {
+          provider: "mistral",
+          model: options.model || "mistral-embed",
+          apiKey: options["api-key"],
+          dimensions: 1024
+        };
+      } else if (provider === "openai") {
+        if (!options["api-key"]) {
+          console.error("Error: --api-key required for OpenAI");
+          return 1;
+        }
+        config3.embedding = {
+          provider: "openai",
+          model: options.model || "text-embedding-3-small",
+          apiKey: options["api-key"],
+          dimensions: 1536
+        };
+      }
+      saveConfig(config3);
+      console.log(`\u2713 Switched to ${provider} embeddings`);
+      console.log(`  Model: ${config3.embedding.model}`);
+      break;
     }
-    try {
-      const { recoverProjectPath: recoverProjectPath2 } = await Promise.resolve().then(() => (init_recover_project(), exports_recover_project));
-      const result = await recoverProjectPath2(projectId, newPath);
-      if (!result.found) {
-        console.error(`Error: project "${projectId}" not found. Cannot recover \u2014 the project must be indexed first.`);
-        process.exit(1);
-      }
-      console.log(`\u2713 Recovered project "${projectId}" \u2014 path updated to ${newPath}`);
-      console.log(`  Previous path: ${result.oldPath ?? "(none)"}`);
-    } catch (e) {
-      const err = e;
-      console.error(`Error: recovery failed \u2014 ${err.message}`);
-      process.exit(1);
+    case "recover": {
+      const projectId = args[1];
+      const newPath = options.path;
+      if (!projectId) {
+        console.error("Error: projectId required. Usage: massa-ai-config recover <projectId> --path <newPath>");
+        return 1;
+      }
+      if (!newPath || typeof newPath !== "string") {
+        console.error("Error: --path required. Usage: massa-ai-config recover <projectId> --path <newPath>");
+        return 1;
+      }
+      try {
+        const { recoverProjectPath: recoverProjectPath2 } = await Promise.resolve().then(() => (init_recover_project(), exports_recover_project));
+        const result = await recoverProjectPath2(projectId, newPath);
+        if (!result.found) {
+          console.error(`Error: project "${projectId}" not found. Cannot recover \u2014 the project must be indexed first.`);
+          return 1;
+        }
+        console.log(`\u2713 Recovered project "${projectId}" \u2014 path updated to ${newPath}`);
+        console.log(`  Previous path: ${result.oldPath ?? "(none)"}`);
+      } catch (e) {
+        const err = e;
+        console.error(`Error: recovery failed \u2014 ${err.message}`);
+        return 1;
+      }
+      break;
     }
-    break;
+    default:
+      console.error(`Unknown command: ${command}`);
+      help();
+      return 1;
   }
-  default:
-    console.error(`Unknown command: ${command}`);
-    help();
-    process.exit(1);
+  return 0;
+}
+if (import.meta.main) {
+  runCli(process.argv.slice(2)).then((code) => process.exit(code));
 }
+export {
+  runCli,
+  parseOptions
+};

package/dist/index.js

@@ -25554,7 +25554,8 @@ __export(exports_config_loader, {
   getConfigPath: () => getConfigPath,
   getConfigForEnv: () => getConfigForEnv,
   getConfigDir: () => getConfigDir,
-  configExists: () => configExists
+  configExists: () => configExists,
+  __resetMigrationForTests: () => __resetMigrationForTests
 });
 import fs from "fs";
 import path3 from "path";
@@ -25624,6 +25625,9 @@ function migrateDataDirOnce() {
     console.error(`[massa-ai] Data directory migration skipped:`, err);
   }
 }
+function __resetMigrationForTests() {
+  migrationAttempted = false;
+}
 function saveConfig(config2) {
   if (!fs.existsSync(CONFIG_DIR)) {
     fs.mkdirSync(CONFIG_DIR, { recursive: true });
@@ -25633,7 +25637,7 @@ function saveConfig(config2) {
 function initConfig() {
   if (!fs.existsSync(CONFIG_FILE)) {
     saveConfig(defaultMassaAiConfig);
-    console.log(`Created default config at ${CONFIG_FILE}`);
+    console.error(`Created default config at ${CONFIG_FILE}`);
   }
 }
 function getConfigForEnv() {
@@ -25685,7 +25689,7 @@ var import_dotenv, envPath;
 var init_env = __esm(() => {
   import_dotenv = __toESM(require_main(), 1);
   envPath = findEnvFile();
-  import_dotenv.config({ path: envPath });
+  import_dotenv.config({ path: envPath, quiet: true });
   try {
     const { loadConfigSafe: loadConfigSafe2, migrateDataDirOnce: migrateDataDirOnce2 } = (init_config_loader(), __toCommonJS(exports_config_loader));
     migrateDataDirOnce2();
@@ -31954,11 +31958,7 @@ class Logger {
     return `[${timestamp}] [${level}] ${message}${metaStr}`;
   }
   write(message, level) {
-    if (level >= LogLevel.WARN) {
-      console.error(message);
-    } else {
-      console.log(message);
-    }
+    console.error(message);
   }
   debug(message, meta3) {
     if (this.shouldLog(LogLevel.DEBUG)) {
@@ -32402,8 +32402,9 @@ class FileFilterCache {
   }
   invalidateProject(projectId) {
     let removed = 0;
+    const prefix = `project:${projectId}`;
     for (const [key, _entry] of this.cache.entries()) {
-      if (key.startsWith(`project:${projectId}|`)) {
+      if (key === prefix || key.startsWith(`${prefix}|`)) {
         this.cache.delete(key);
         removed++;
       }
@@ -116300,9 +116301,9 @@ class SearchCachePg {
     if (this.l1Cache.size <= this.L1_MAX_SIZE)
       return;
     let oldestKey = null;
-    let oldestTime = Date.now();
+    let oldestTime = Infinity;
     for (const [key, entry2] of this.l1Cache.entries()) {
-      if (entry2.lastAccessed < oldestTime) {
+      if (entry2.lastAccessed <= oldestTime) {
         oldestTime = entry2.lastAccessed;
         oldestKey = key;
       }
@@ -116911,7 +116912,8 @@ function generationDefinitionIdentityColumns(def) {
   }
   if (parsed.kind !== def.kind)
     throw new TypeError(`definition_fqn_kind_mismatch:${def.id}`);
-  if (parsed.qualifiedName.split(".").at(-1) !== def.name) {
+  const terminalMatchesName = parsed.qualifiedName === def.name || parsed.qualifiedName.endsWith(`.${def.name}`);
+  if (!terminalMatchesName) {
     throw new TypeError(`definition_fqn_name_mismatch:${def.id}`);
   }
   if (def.qualified_name !== undefined && def.qualified_name !== parsed.qualifiedName) {
@@ -117198,11 +117200,24 @@ async function writeFileGeneration(input) {
         last_known_good_generation_id = EXCLUDED.last_known_good_generation_id,
         last_successful_at = EXCLUDED.last_successful_at
     `;
-    for (const definition of definitions) {
+    const seenDefinitionIds = new Set;
+    const uniqueDefinitions = definitions.filter((definition) => {
+      if (seenDefinitionIds.has(definition.id))
+        return false;
+      seenDefinitionIds.add(definition.id);
+      return true;
+    });
+    for (const definition of uniqueDefinitions) {
       const identity = generationDefinitionIdentityColumns(definition);
       await tx.$executeRaw`
         INSERT INTO symbol_definitions (id, project_id, generation_id, file_path, name, kind, line_start, line_end, exported, doc_comment, indexed_at, qualified_name, canonical_signature, signature_hash, legacy_fqn, source_span)
         VALUES (${definition.id}, ${lease.projectId}, ${lease.generationId}, ${file2.relative_path}, ${definition.name}, ${definition.kind}, ${definition.line_start}, ${definition.line_end}, ${definition.exported}, ${definition.doc_comment ?? null}, ${new Date(definition.indexed_at)}, ${identity.qualifiedName}, ${identity.canonicalSignature}, ${identity.signatureHash}, ${identity.legacyFqn}, ${identity.sourceSpan}::jsonb)
+        ON CONFLICT (project_id, generation_id, id) DO UPDATE SET
+          name = EXCLUDED.name, kind = EXCLUDED.kind, line_start = EXCLUDED.line_start,
+          line_end = EXCLUDED.line_end, exported = EXCLUDED.exported, doc_comment = EXCLUDED.doc_comment,
+          indexed_at = EXCLUDED.indexed_at, qualified_name = EXCLUDED.qualified_name,
+          canonical_signature = EXCLUDED.canonical_signature, signature_hash = EXCLUDED.signature_hash,
+          legacy_fqn = EXCLUDED.legacy_fqn, source_span = EXCLUDED.source_span
       `;
     }
     for (const reference of references) {
@@ -117453,7 +117468,7 @@ async function upsertWorkspace(ws) {
       AND generation.id = 'legacy-' || md5(current_workspace.project_id)
       AND generation.project_id = current_workspace.project_id
     `;
-  });
+  }, { timeout: 60000, maxWait: 1e4 });
 }
 async function updateWorkspaceStatus(projectId, status, opts) {
   const lastError = typeof opts === "string" ? opts : opts?.lastError ?? null;
@@ -117524,7 +117539,7 @@ async function updateWorkspaceStatus(projectId, status, opts) {
       FROM active_counts c
       WHERE w.project_id = c.project_id AND EXISTS (SELECT 1 FROM updated_generation)
     `;
-  });
+  }, { timeout: 60000, maxWait: 1e4 });
 }
 var init_symbol_repo_workspace = __esm(() => {
   init_prisma_client();
@@ -119133,7 +119148,7 @@ class MemoryRepositoryPg {
       importance: m.importance,
       tags: JSON.stringify(tagsArr),
       embedding: m.embedding,
-      metadata: m.metadata ? JSON.stringify(m.metadata) : null,
+      metadata: m.metadata == null ? null : typeof m.metadata === "string" ? m.metadata : JSON.stringify(m.metadata),
       created_at: m.created_at instanceof Date ? m.created_at.getTime() : Number(m.created_at),
       updated_at: m.updated_at instanceof Date ? m.updated_at.getTime() : Number(m.updated_at),
       access_count: m.access_count,
@@ -119327,7 +119342,7 @@ class MemoryRepositoryPg {
              pinned, deleted_at
       FROM memories
       WHERE deleted_at IS NULL
-      ORDER BY created_at DESC
+      ORDER BY created_at DESC, id DESC
       LIMIT ${limit} OFFSET ${offset}
     `;
     return rows.map((r) => this.toMemoryRow(r));
@@ -119335,7 +119350,7 @@ class MemoryRepositoryPg {
   async findRecentByTag(tag, opts) {
     const since = new Date(opts.sinceMs);
     const conditions = [
-      import_prisma2.Prisma.sql`${tag} = ANY(tags)`,
+      import_prisma2.Prisma.sql`${tag} = ANY(tags::text[])`,
       import_prisma2.Prisma.sql`created_at >= ${since}`
     ];
     if (opts.sessionId)
@@ -119878,7 +119893,8 @@ function restoreWorkingMemoryBuffer(snapshot) {
   for (const e of snapshot.entries) {
     if (!e || !e.result || typeof e.id !== "string")
       continue;
-    if (now2 - (e.lastAccessedAt ?? 0) >= snapshot.config.ttlMs)
+    const lastAccessedAt = e.lastAccessedAt ?? now2;
+    if (now2 - lastAccessedAt >= snapshot.config.ttlMs)
       continue;
     const result = e.result;
     buf.entries.set(e.id, {
@@ -119886,7 +119902,7 @@ function restoreWorkingMemoryBuffer(snapshot) {
       queryTokens: new Set,
       contentTokens: tokenize(result.content || ""),
       addedAt: e.addedAt ?? now2,
-      lastAccessedAt: e.lastAccessedAt ?? now2,
+      lastAccessedAt,
       baselineScore: e.baselineScore ?? result.score
     });
   }
@@ -126449,6 +126465,7 @@ function buildStructuralResolverDefinitions(documents) {
   return Object.freeze(documents.flatMap((document2) => document2.structure.symbols.map((symbol27) => {
     const key = `${document2.file}\x00${symbol27.qualifiedName}\x00${symbol27.kind}`;
     const visibleNested = document2.dialect === "java" ? symbol27.signatureMaterial.modifiers.includes("public") && (["class", "interface", "enum"].includes(symbol27.kind) || symbol27.signatureMaterial.modifiers.includes("static")) : !symbol27.signatureMaterial.modifiers.includes("private");
+    const isExportMarker = symbol27.kind === "export";
     return Object.freeze({
       identity: Object.freeze({
         file: document2.file,
@@ -126461,7 +126478,7 @@ function buildStructuralResolverDefinitions(documents) {
         typeTokens: symbol27.signatureMaterial.typeTokens,
         modifiers: symbol27.signatureMaterial.modifiers,
         scope: symbol27.qualifiedName === symbol27.name ? "top_level" : "nested",
-        overload: (groups.get(key) ?? 0) > 1 ? "overloaded" : "unique"
+        overload: (groups.get(key) ?? 0) > 1 || isExportMarker ? "overloaded" : "unique"
       }),
       exported: symbol27.exported || !symbol27.name.startsWith("#") && !symbol27.name.startsWith("%23") && visibleNested && exportedRoots.has(`${document2.file}\x00${symbol27.qualifiedName.split(".")[0]}`),
       defaultExport: symbol27.defaultExport
@@ -127130,6 +127147,7 @@ class ResolveStage {
           timestamp: Date.now()
         });
       }
+      await new Promise((resolve5) => setTimeout(resolve5, 0));
     }
     const durationMs = Math.round(performance.now() - t0);
     ctx.emit({
@@ -127453,6 +127471,47 @@ var init_resolve = __esm(() => {
   STRUCTURAL_SEED_EXTENSIONS = new Set([".ts", ".tsx", ".js", ".jsx", ".py", ".rb", ".php", ".lua", ".c", ".h", ".cpp", ".hpp", ".go", ".rs", ".zig", ".java", ".kt", ".kts", ".scala", ".cs", ".swift", ".dart", ".ex", ".exs", ".erl", ".clj", ".ml", ".hs", ".vue", ".md", ".json", ".yaml", ".yml"]);
 });
 
+// ../../packages/core/dist/data/with-deadlock-retry.js
+function isRetriableTransactionError(error51) {
+  if (!error51 || typeof error51 !== "object")
+    return false;
+  const code = error51.code;
+  if (typeof code === "string" && RETRIABLE_SQLSTATES.has(code))
+    return true;
+  const message = error51.message;
+  if (typeof message === "string" && /Code:\s*`(?:40P01|40001|40P02)`/.test(message)) {
+    return true;
+  }
+  return false;
+}
+async function withDeadlockRetry(operation, options = {}) {
+  const maxAttempts = options.maxAttempts ?? 5;
+  const baseDelayMs = options.baseDelayMs ?? 75;
+  for (let attempt = 1;attempt <= maxAttempts; attempt++) {
+    try {
+      return await operation();
+    } catch (error51) {
+      if (!isRetriableTransactionError(error51) || attempt === maxAttempts)
+        throw error51;
+      const delayMs = baseDelayMs * 2 ** (attempt - 1);
+      logger.warn("Retriable DB lock cycle; retrying operation", {
+        operation: options.operation ?? "unknown",
+        attempt,
+        maxAttempts,
+        delayMs,
+        error: error51?.message?.slice(0, 120)
+      });
+      await new Promise((resolve5) => setTimeout(resolve5, delayMs));
+    }
+  }
+  throw new Error("withDeadlockRetry exhausted retries");
+}
+var RETRIABLE_SQLSTATES;
+var init_with_deadlock_retry = __esm(() => {
+  init_dist();
+  RETRIABLE_SQLSTATES = new Set(["40P01", "40001", "40P02"]);
+});
+
 // ../../packages/core/dist/services/etl/stages/load.js
 import path15 from "path";
 function formatDuration(ms) {
@@ -127569,8 +127628,12 @@ class LoadStage {
           return;
         try {
           const [chunkCount, symCount] = await Promise.all([
-            mode === "structural" ? Promise.resolve(0) : this.loadToSearchStores(ctx, file2),
-            mode === "semantic" ? Promise.resolve(file2.symbols.length) : this.loadToSymbolDb(ctx, file2)
+            mode === "structural" ? Promise.resolve(0) : withDeadlockRetry(() => this.loadToSearchStores(ctx, file2), {
+              operation: "etl.loadToSearchStores"
+            }),
+            mode === "semantic" ? Promise.resolve(file2.symbols.length) : withDeadlockRetry(() => this.loadToSymbolDb(ctx, file2), {
+              operation: "etl.loadToSymbolDb"
+            })
           ]);
           if (!ctx.graphGenerationLease && mode !== "structural") {
             await getSymbolRepository().upsertFile({
@@ -127762,6 +127825,7 @@ class LoadStage {
 }
 var init_load = __esm(() => {
   init_dist();
+  init_with_deadlock_retry();
   init_vector_store_factory();
   init_keyword_search_factory();
   init_symbol_repository_factory();
@@ -127959,7 +128023,7 @@ class GraphGenerationRepositoryPg {
           AND graph_lease_token = ${lease.leaseToken}
       `;
       return { status: "renewed", leaseExpiresAt: renewed[0].lease_expires_at.getTime() };
-    });
+    }, { timeout: 60000, maxWait: 1e4 });
   }
   async complete(lease) {
     return getPrismaClient2().$transaction(async (tx) => {
@@ -128133,7 +128197,7 @@ class GraphGenerationCoordinator {
     } while (true);
   }
   async heartbeat(lease) {
-    const outcome2 = await this.repository.heartbeat(lease, GRAPH_GENERATION_LEASE_TTL_MS);
+    const outcome2 = await withDeadlockRetry(() => this.repository.heartbeat(lease, GRAPH_GENERATION_LEASE_TTL_MS), { operation: "graph_generation.heartbeat", maxAttempts: 3 });
     if (outcome2.status !== "renewed")
       throw new Error("graph_generation_lease_lost");
   }
@@ -128169,6 +128233,7 @@ class GraphGenerationCoordinator {
 var GRAPH_GENERATION_LEASE_TTL_MS = 300000;
 var init_graph_generation_coordinator = __esm(() => {
   init_graph_generation_repository_factory();
+  init_with_deadlock_retry();
 });
 
 // ../../packages/core/dist/services/etl/pipeline.js
@@ -128246,6 +128311,7 @@ var init_pipeline = __esm(() => {
   init_symbol_repository_factory();
   init_index_job_tracker();
   init_cache_factory();
+  init_index_manager();
   init_vector_store_factory();
   init_keyword_search_factory();
   init_alias_resolver();
@@ -128537,6 +128603,16 @@ var init_pipeline = __esm(() => {
           }
         };
         await getSearchCache().invalidateProject(projectId);
+        try {
+          const admissionMarker = new IndexManager(await getVectorStore());
+          await admissionMarker.updateIndexMetadata(projectId, projectPath, discovered.map((file2) => file2.relativePath));
+        } catch (markerError) {
+          logger.warn("EtlPipeline: search-admission marker write failed", {
+            projectId,
+            jobId,
+            error: markerError.message.slice(0, 160)
+          });
+        }
         indexJobTracker.updateProgress(jobId, result.filesIndexed, result.filesIndexed);
         await indexJobTracker.setResultAndFlush(jobId, {
           filesIndexed: result.filesIndexed,
@@ -131951,10 +132027,10 @@ class GraphQueries {
       return new Map;
     }
     const rows = await getPrismaClient2().$queryRaw`
-      SELECT id, content, type, level, importance, array_to_json(tags)::text AS tags,
+      SELECT id, content, type, level, importance, tags,
              created_at, updated_at, access_count, user_id, session_id, project_id, agent_id,
              NULL::bytea AS embedding, NULL::text AS metadata, NULL::timestamp AS last_accessed,
-             pinned::integer AS pinned, deleted_at
+             CASE WHEN pinned THEN 1 ELSE 0 END AS pinned, deleted_at
       FROM memories WHERE id = ANY(${memoryIds}::text[])`;
     const result = new Map;
     for (const row of rows) {
@@ -133259,7 +133335,7 @@ class CompressContextTool {
     } catch (error51) {
       logger.error("Failed to compress context", error51, {
         strategy,
-        contentLength: content.length
+        contentLength: typeof content === "string" ? content.length : 0
       });
       return {
         success: false,
@@ -135381,16 +135457,14 @@ var TOOL_NAME_NORMALIZE, classifyToolCall = (_source, payload) => {
       const cmdRaw = field2(payload, "command") ?? (toolInput && typeof toolInput === "object" ? toolInput.command : undefined);
       const cmd = lower(cmdRaw);
       if (cmd.startsWith("git ") || cmd.includes(" git ")) {
-        if (cmd.includes("commit") || cmd.includes("merge") || cmd.includes("rebase")) {
-          return "git-changes";
-        }
         return "git-changes";
       }
       return "tool-calls";
     }
     case "TodoWrite":
-    case "Task":
       return "tasks";
+    case "Task":
+      return "subagents-spawned";
     case "WebFetch":
       return "web-fetch";
     case "WebSearch":
@@ -135407,8 +135481,6 @@ var TOOL_NAME_NORMALIZE, classifyToolCall = (_source, payload) => {
       return "memories-stored";
     case "compact_snapshot":
       return "compaction-snapshots";
-    case "Task":
-      return "subagents-spawned";
     default:
       if (toolName.startsWith("mcp__"))
         return "mcp-calls";
@@ -168147,36 +168219,37 @@ function resolveFlavor(request) {
 // src/index.ts
 init_config();
 var args = process.argv.slice(2);
-if (args.includes("--config-show")) {
-  try {
-    const config3 = loadConfig();
-    console.log(JSON.stringify(config3, null, 2));
-    process.exit(0);
-  } catch (error51) {
-    console.error("Error loading config:", error51 instanceof Error ? error51.message : String(error51));
-    process.exit(1);
+function processCliArgs(cliArgs) {
+  if (cliArgs.includes("--config-show")) {
+    try {
+      const config3 = loadConfig();
+      console.log(JSON.stringify(config3, null, 2));
+      return 0;
+    } catch (error51) {
+      console.error("Error loading config:", error51 instanceof Error ? error51.message : String(error51));
+      return 1;
+    }
   }
-}
-if (args.includes("--config-path")) {
-  console.log(getConfigPath());
-  process.exit(0);
-}
-if (args.includes("--config-dir")) {
-  console.log(getConfigDir());
-  process.exit(0);
-}
-if (args.includes("--config-init")) {
-  try {
-    initConfig();
-    console.log(`Configuration initialized at: ${getConfigPath()}`);
-    process.exit(0);
-  } catch (error51) {
-    console.error("Error initializing config:", error51 instanceof Error ? error51.message : String(error51));
-    process.exit(1);
+  if (cliArgs.includes("--config-path")) {
+    console.log(getConfigPath());
+    return 0;
   }
-}
-if (args.includes("--help") || args.includes("-h")) {
-  console.log(`
+  if (cliArgs.includes("--config-dir")) {
+    console.log(getConfigDir());
+    return 0;
+  }
+  if (cliArgs.includes("--config-init")) {
+    try {
+      initConfig();
+      console.log(`Configuration initialized at: ${getConfigPath()}`);
+      return 0;
+    } catch (error51) {
+      console.error("Error initializing config:", error51 instanceof Error ? error51.message : String(error51));
+      return 1;
+    }
+  }
+  if (cliArgs.includes("--help") || cliArgs.includes("-h")) {
+    console.log(`
 massa-ai MCP Client
 
 Usage:
@@ -168196,7 +168269,24 @@ Examples:
   npx @massa-ai/mcp-client --config-show
   npx @massa-ai/mcp-client --config-path
 `);
-  process.exit(0);
+    return 0;
+  }
+  const KNOWN_FLAGS = ["--config-show", "--config-path", "--config-dir", "--config-init", "--help", "-h"];
+  const unknown3 = cliArgs.filter((a) => a.startsWith("-") && !KNOWN_FLAGS.includes(a));
+  if (unknown3.length) {
+    console.error(`Unknown flag: ${unknown3[0]}
+Run 'massa-ai --help' for usage.`);
+    return 2;
+  }
+  return;
+}
+if (import.meta.main) {
+  const code = processCliArgs(args);
+  if (code !== undefined)
+    process.exit(code);
+  if (!configExists()) {
+    initConfig();
+  }
 }
 function textContent(text3) {
   return { content: [{ type: "text", text: text3 }] };
@@ -168204,22 +168294,6 @@ function textContent(text3) {
 function isEmbeddedMode() {
   return process.env.MASSA_AI_EMBEDDED === "true";
 }
-var KNOWN_FLAGS = ["--config-show", "--config-path", "--config-dir", "--config-init", "--help", "-h"];
-var unknown3 = args.filter((a) => a.startsWith("-") && !KNOWN_FLAGS.includes(a));
-if (unknown3.length) {
-  console.error(`Unknown flag: ${unknown3[0]}
-Run 'massa-ai --help' for usage.`);
-  process.exit(2);
-}
-if (!configExists()) {
-  initConfig();
-  console.log(`
-[massa-ai] Initialized with default configuration
-[massa-ai] Config: ${getConfigPath()}
-[massa-ai] Provider: Ollama (local, free)
-[massa-ai] To change: npx @massa-ai/mcp-client massa-ai-config use mistral --api-key YOUR_KEY
-`);
-}
 
 class McpProxyServer {
   server;
@@ -168246,32 +168320,34 @@ class McpProxyServer {
     this.setupHandlers();
   }
   setupHandlers() {
-    this.server.setRequestHandler(ListToolsRequestSchema, async (request) => {
-      const result = pageToolDefinitions(TOOL_DEFINITIONS, request.params?.cursor);
-      const flavor = resolveFlavor(request);
-      return applyMoonshotFlavor(result, flavor);
-    });
-    this.server.setRequestHandler(CallToolRequestSchema, async (request) => {
-      const { name: name26, arguments: args2 } = request.params;
-      try {
-        if (name26 === "index") {
-          return await this.handleIndexTool(args2 ?? {});
-        }
-        return await proxyCallTool(this.apiClient, name26, args2 ?? {});
-      } catch (error51) {
-        return {
-          content: [
-            {
-              type: "text",
-              text: JSON.stringify({
-                success: false,
-                error: error51 instanceof Error ? error51.message : String(error51)
-              })
-            }
-          ]
-        };
+    this.server.setRequestHandler(ListToolsRequestSchema, async (request) => this.handleListTools(request));
+    this.server.setRequestHandler(CallToolRequestSchema, async (request) => this.handleCallTool(request));
+  }
+  async handleListTools(request) {
+    const result = pageToolDefinitions(TOOL_DEFINITIONS, request.params?.cursor);
+    const flavor = resolveFlavor(request);
+    return applyMoonshotFlavor(result, flavor);
+  }
+  async handleCallTool(request) {
+    const { name: name26, arguments: args2 } = request.params;
+    try {
+      if (name26 === "index") {
+        return await this.handleIndexTool(args2 ?? {});
       }
-    });
+      return await proxyCallTool(this.apiClient, name26, args2 ?? {});
+    } catch (error51) {
+      return {
+        content: [
+          {
+            type: "text",
+            text: JSON.stringify({
+              success: false,
+              error: error51 instanceof Error ? error51.message : String(error51)
+            })
+          }
+        ]
+      };
+    }
   }
   async handleIndexTool(args2) {
     const projectPath2 = args2.projectPath;
@@ -168304,27 +168380,30 @@ class McpProxyServer {
   }
   async start() {
     const healthy = await this.apiClient.healthCheck();
-    if (!healthy) {
-      console.log(`[massa-ai-mcp] Warning: Tools API is not reachable (mode: ${this.mode}). Requests will fail until API is available.`);
-    } else {
-      console.log(`[massa-ai-mcp] Connected (mode: ${this.mode})`);
-    }
     await this.server.connect(this.transport);
   }
   async close() {
     await this.server.close();
   }
 }
-var client = new McpProxyServer;
-client.start().catch((error51) => {
-  console.error("Failed to start MCP client:", error51);
-  process.exit(1);
-});
-process.on("SIGINT", async () => {
-  await client.close();
-  process.exit(0);
-});
-process.on("SIGTERM", async () => {
-  await client.close();
-  process.exit(0);
-});
+if (import.meta.main) {
+  const client = new McpProxyServer;
+  client.start().catch((error51) => {
+    console.error("Failed to start MCP client:", error51);
+    process.exit(1);
+  });
+  process.on("SIGINT", async () => {
+    await client.close();
+    process.exit(0);
+  });
+  process.on("SIGTERM", async () => {
+    await client.close();
+    process.exit(0);
+  });
+}
+export {
+  textContent,
+  processCliArgs,
+  isEmbeddedMode,
+  McpProxyServer
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@massa-ai/mcp-client",
-  "version": "1.2.1",
+  "version": "1.4.0",
   "description": "massa-ai MCP server - Semantic code search, memory, and context compression via Model Context Protocol",
   "author": "luizgmassa",
   "type": "module",
@@ -16,12 +16,12 @@
     "dev": "bun run --watch src/index.ts",
     "start": "bun run src/index.ts",
     "build": "bun build src/index.ts src/config-cli.ts --outdir=dist --target=bun",
-    "test": "bun test",
+    "test": "bun scripts/run-tests-isolated.ts",
     "type-check": "tsc --noEmit"
   },
   "dependencies": {
-    "@massa-ai/core": "^1.2.1",
-    "@massa-ai/shared": "^1.2.1",
+    "@massa-ai/core": "^1.4.0",
+    "@massa-ai/shared": "^1.4.0",
     "@modelcontextprotocol/sdk": "^1.0.0"
   },
   "devDependencies": {