@massa-ai/tools-api 1.2.1 → 1.3.1

package/dist/index.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();
@@ -12168,11 +12172,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)) {
@@ -12616,8 +12616,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++;
       }
@@ -108648,9 +108649,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;
       }
@@ -109259,7 +109260,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) {
@@ -109546,11 +109548,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}, ${file3.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) {
@@ -109801,7 +109816,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, status2, opts) {
   const lastError = typeof opts === "string" ? opts : opts?.lastError ?? null;
@@ -109872,7 +109887,7 @@ async function updateWorkspaceStatus(projectId, status2, 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();
@@ -111481,7 +111496,7 @@ class MemoryRepositoryPg {
       importance: m2.importance,
       tags: JSON.stringify(tagsArr),
       embedding: m2.embedding,
-      metadata: m2.metadata ? JSON.stringify(m2.metadata) : null,
+      metadata: m2.metadata == null ? null : typeof m2.metadata === "string" ? m2.metadata : JSON.stringify(m2.metadata),
       created_at: m2.created_at instanceof Date ? m2.created_at.getTime() : Number(m2.created_at),
       updated_at: m2.updated_at instanceof Date ? m2.updated_at.getTime() : Number(m2.updated_at),
       access_count: m2.access_count,
@@ -111675,7 +111690,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((r2) => this.toMemoryRow(r2));
@@ -111683,7 +111698,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)
@@ -112226,7 +112241,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, {
@@ -112234,7 +112250,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
     });
   }
@@ -118797,6 +118813,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,
@@ -118809,7 +118826,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
@@ -119478,6 +119495,7 @@ class ResolveStage {
           timestamp: Date.now()
         });
       }
+      await new Promise((resolve5) => setTimeout(resolve5, 0));
     }
     const durationMs = Math.round(performance.now() - t0);
     ctx.emit({
@@ -119801,6 +119819,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) {
@@ -119917,8 +119976,12 @@ class LoadStage {
           return;
         try {
           const [chunkCount, symCount] = await Promise.all([
-            mode === "structural" ? Promise.resolve(0) : this.loadToSearchStores(ctx, file3),
-            mode === "semantic" ? Promise.resolve(file3.symbols.length) : this.loadToSymbolDb(ctx, file3)
+            mode === "structural" ? Promise.resolve(0) : withDeadlockRetry(() => this.loadToSearchStores(ctx, file3), {
+              operation: "etl.loadToSearchStores"
+            }),
+            mode === "semantic" ? Promise.resolve(file3.symbols.length) : withDeadlockRetry(() => this.loadToSymbolDb(ctx, file3), {
+              operation: "etl.loadToSymbolDb"
+            })
           ]);
           if (!ctx.graphGenerationLease && mode !== "structural") {
             await getSymbolRepository().upsertFile({
@@ -120110,6 +120173,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();
@@ -120307,7 +120371,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) => {
@@ -120481,7 +120545,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");
   }
@@ -120517,6 +120581,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
@@ -120594,6 +120659,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();
@@ -120885,6 +120951,16 @@ var init_pipeline = __esm(() => {
           }
         };
         await getSearchCache().invalidateProject(projectId);
+        try {
+          const admissionMarker = new IndexManager(await getVectorStore());
+          await admissionMarker.updateIndexMetadata(projectId, projectPath, discovered.map((file3) => file3.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,
@@ -123045,10 +123121,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) {
@@ -125229,16 +125305,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":
@@ -125255,8 +125329,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";
@@ -172930,7 +173002,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,
@@ -177893,9 +177965,11 @@ var systemRoutes = new Elysia({ prefix: "/api/v1/system" }).get("/info", async (
 });
 
 // src/routes/events.ts
-var HEARTBEAT_MS = 15000;
-var MAX_DURATION_MS = 10 * 60 * 1000;
+var HEARTBEAT_MS_DEFAULT = 15000;
+var MAX_DURATION_MS_DEFAULT = 10 * 60 * 1000;
 var eventsRoutes = new Elysia({ prefix: "/api/v1" }).get("/events", async ({ query, set: set3 }) => {
+  const HEARTBEAT_MS = Number(process.env.MASSA_AI_SSE_HEARTBEAT_MS) || HEARTBEAT_MS_DEFAULT;
+  const MAX_DURATION_MS = Number(process.env.MASSA_AI_SSE_MAX_DURATION_MS) || MAX_DURATION_MS_DEFAULT;
   const projectIdFilter = query.projectId;
   const jobIdFilter = query.jobId;
   set3.headers["Content-Type"] = "text/event-stream";
@@ -177904,6 +177978,9 @@ var eventsRoutes = new Elysia({ prefix: "/api/v1" }).get("/events", async ({ que
   set3.headers["X-Accel-Buffering"] = "no";
   const encoder3 = new TextEncoder;
   let closed = false;
+  let unsubscribers = [];
+  let heartbeatTimer;
+  let closeTimer;
   const stream2 = new ReadableStream({
     start(controller) {
       const enqueue = (data) => {
@@ -177925,14 +178002,14 @@ var eventsRoutes = new Elysia({ prefix: "/api/v1" }).get("/events", async ({ que
         "indexing:failed",
         "workspace:updated"
       ];
-      const unsubscribers = events.map((event) => eventBus.subscribe(event, (payload) => {
+      unsubscribers = events.map((event) => eventBus.subscribe(event, (payload) => {
         if (projectIdFilter && payload.projectId !== projectIdFilter)
           return;
         if (jobIdFilter && payload.jobId !== jobIdFilter)
           return;
         enqueue({ event, payload, timestamp: new Date().toISOString() });
       }));
-      const heartbeatTimer = setInterval(() => {
+      heartbeatTimer = setInterval(() => {
         if (closed) {
           clearInterval(heartbeatTimer);
           return;
@@ -177946,7 +178023,7 @@ var eventsRoutes = new Elysia({ prefix: "/api/v1" }).get("/events", async ({ que
           clearInterval(heartbeatTimer);
         }
       }, HEARTBEAT_MS);
-      const closeTimer = setTimeout(() => {
+      closeTimer = setTimeout(() => {
         closed = true;
         unsubscribers.forEach((u) => u());
         clearInterval(heartbeatTimer);
@@ -177962,12 +178039,14 @@ var eventsRoutes = new Elysia({ prefix: "/api/v1" }).get("/events", async ({ que
         },
         timestamp: new Date().toISOString()
       });
-      return () => {
-        closed = true;
-        unsubscribers.forEach((u) => u());
+    },
+    cancel() {
+      closed = true;
+      unsubscribers.forEach((u) => u());
+      if (heartbeatTimer)
         clearInterval(heartbeatTimer);
+      if (closeTimer)
         clearTimeout(closeTimer);
-      };
     }
   });
   return new Response(stream2, {
@@ -179442,21 +179521,22 @@ var webRoutes = new Elysia({ prefix: "/api/v1/web" }).post("/fetch_and_index", a
 import fs17 from "fs/promises";
 import path27 from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
-var STATIC_DIR_CANDIDATES = (() => {
-  const here = path27.dirname(fileURLToPath3(import.meta.url));
+function buildStaticDirCandidates(moduleDir, cwd) {
   const candidates2 = [];
-  candidates2.push(path27.resolve(here, "../../web-ui/src/static"));
-  candidates2.push(path27.resolve(here, "../web-ui/src/static"));
-  let dir = process.cwd();
-  for (let i = 0;i < 8; i++) {
-    candidates2.push(path27.resolve(dir, "apps/web-ui/src/static"));
-    const parent = path27.dirname(dir);
-    if (parent === dir)
-      break;
-    dir = parent;
+  for (const root2 of [moduleDir, cwd]) {
+    let dir = root2;
+    for (let i = 0;i < 10; i++) {
+      candidates2.push(path27.resolve(dir, "apps/web-ui/src/static"));
+      candidates2.push(path27.resolve(dir, "web-ui/src/static"));
+      const parent = path27.dirname(dir);
+      if (parent === dir)
+        break;
+      dir = parent;
+    }
   }
-  return candidates2;
-})();
+  return [...new Set(candidates2)];
+}
+var STATIC_DIR_CANDIDATES = buildStaticDirCandidates(path27.dirname(fileURLToPath3(import.meta.url)), process.cwd());
 async function resolveStaticDir() {
   for (const dir of STATIC_DIR_CANDIDATES) {
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@massa-ai/tools-api",
-  "version": "1.2.1",
+  "version": "1.3.1",
   "author": "luizgmassa",
   "description": "massa-ai REST API server - Semantic code search, memory, and context compression",
   "type": "module",
@@ -21,8 +21,8 @@
     "test": "bun scripts/run-tests-isolated.ts"
   },
   "dependencies": {
-    "@massa-ai/core": "^1.2.1",
-    "@massa-ai/shared": "^1.2.1",
+    "@massa-ai/core": "^1.3.1",
+    "@massa-ai/shared": "^1.3.1",
     "elysia": "^1.2.25",
     "@elysiajs/swagger": "^1.2.0",
     "@elysiajs/cors": "^1.2.0",