devsmind-mcp 1.2.1 → 2.0.0

package/dist/cli/runner.js

@@ -42,6 +42,7 @@ const crypto = __importStar(require("crypto"));
 const database_1 = require("../db/database");
 const indexer_1 = require("../db/indexer");
 const scanner_1 = require("../utils/scanner");
+const json_1 = require("../utils/json");
 function makeHttpRequest(urlStr, method, headers, body) {
     return new Promise((resolve, reject) => {
         const isHttps = urlStr.startsWith('https');
@@ -104,12 +105,11 @@ function makeBar(done, total) {
 function truncate(s, max) {
     return s.length > max ? '…' + s.slice(-(max - 1)) : s;
 }
+const MAX_LOG_LINES = 18;
 class ProgressDisplay {
     isTTY = IS_TTY;
-    lineCount = 0;
     spinIdx = 0;
     // phase state
-    phaseLabel = '';
     phaseNum = 0;
     totalPhases = 2;
     total = 0;
@@ -118,36 +118,40 @@ class ProgressDisplay {
     itemStart = 0;
     times = [];
     currentItem = '';
-    extraLine = '';
+    statusLine = '';
+    // scrolling log ring buffer
+    logLines = [];
+    // total lines currently drawn on screen (log + bar)
+    drawnLines = 0;
     startPhase(phaseNum, label, total, alreadyDone = 0) {
         this.phaseNum = phaseNum;
-        this.phaseLabel = label;
         this.total = total;
-        this.done = alreadyDone; // resume offset — show true overall progress
+        this.done = alreadyDone;
         this.times = [];
         this.phaseStart = Date.now();
         this.currentItem = alreadyDone > 0 ? `Resuming from item ${alreadyDone + 1}…` : 'Starting…';
-        this.extraLine = '';
-        this.lineCount = 0;
+        this.statusLine = '';
+        this.logLines = [];
+        this.drawnLines = 0;
         if (!this.isTTY) {
-            console.log(`\n${'═'.repeat(52)}`);
+            console.log(`\n${'═'.repeat(60)}`);
             console.log(` Phase ${phaseNum}/${this.totalPhases}: ${label}`);
-            console.log(`${'═'.repeat(52)}`);
-            if (alreadyDone > 0) {
+            console.log(`${'═'.repeat(60)}`);
+            if (alreadyDone > 0)
                 console.log(` Resuming: ${alreadyDone}/${total} already done`);
-            }
             console.log(` Remaining: ${total - alreadyDone} item(s) to process`);
-            console.log(`${'─'.repeat(52)}\n`);
+            console.log(`${'─'.repeat(60)}\n`);
         }
         else {
             const resumeTag = alreadyDone > 0 ? ` \x1B[90m(resuming from ${alreadyDone}/${total})\x1B[0m` : '';
-            process.stdout.write(`\n  \x1B[1m\x1B[36mPhase ${phaseNum}/${this.totalPhases}: ${label}\x1B[0m${resumeTag}\n\n`);
+            process.stdout.write(`\n  \x1B[1m\x1B[36mPhase ${phaseNum}/${this.totalPhases}: ${label}\x1B[0m${resumeTag}\n`);
             this._render();
         }
     }
     beginItem(name) {
         this.currentItem = name;
         this.itemStart = Date.now();
+        this.statusLine = '';
         this.spinIdx = (this.spinIdx + 1) % SPINNER_FRAMES.length;
         if (this.isTTY)
             this._render();
@@ -158,7 +162,7 @@ class ProgressDisplay {
         const t = Date.now() - this.itemStart;
         this.times.push(t);
         this.done++;
-        this.extraLine = extra;
+        this.statusLine = extra;
         if (this.isTTY)
             this._render();
         else
@@ -166,16 +170,37 @@ class ProgressDisplay {
     }
     skipItem(reason) {
         this.done++;
-        this.extraLine = reason;
+        this.statusLine = `skip — ${reason}`;
+        if (this.isTTY)
+            this._render();
+        else
+            console.log(`  skip — ${reason}`);
+    }
+    updateStatus(msg) {
+        this.statusLine = msg;
         if (this.isTTY)
             this._render();
         else
-            console.log(`skip — ${reason}`);
+            console.log(`  ... ${msg}`);
+    }
+    /** Push a log line into the scrolling log panel and re-render */
+    log(msg) {
+        const ts = new Date().toLocaleTimeString('en-GB', { hour: '2-digit', minute: '2-digit', second: '2-digit' });
+        this.logLines.push(`  \x1B[90m${ts}\x1B[0m  ${msg}`);
+        if (this.logLines.length > MAX_LOG_LINES) {
+            this.logLines.shift();
+        }
+        if (this.isTTY) {
+            this._render();
+        }
+        else {
+            console.log(`  ${msg}`);
+        }
     }
     _render() {
-        // Clear previously rendered block
-        if (this.lineCount > 0) {
-            process.stdout.write(`\x1B[${this.lineCount}A\x1B[0J`);
+        // Clear all previously drawn lines
+        if (this.drawnLines > 0) {
+            process.stdout.write(`\x1B[${this.drawnLines}A\x1B[0J`);
         }
         const pct = this.total > 0 ? (this.done / this.total) * 100 : 0;
         const bar = makeBar(this.done, this.total);
@@ -186,24 +211,33 @@ class ProgressDisplay {
         const remaining = this.total - this.done;
         const eta = avg > 0 && remaining > 0 ? avg * remaining : 0;
         const spin = SPINNER_FRAMES[this.spinIdx];
-        const itemShort = truncate(this.currentItem, 56);
+        const itemShort = truncate(this.currentItem, 64);
         const pctStr = `${Math.round(pct)}%`.padStart(4);
         const doneStr = `${this.done}/${this.total}`;
-        const lines = [
-            `  ${spin} ${bar}  ${doneStr.padEnd(9)} ${pctStr}`,
+        // ── Log panel (scrolling lines) ──────────────────────────────────
+        const logSection = this.logLines.length > 0
+            ? [
+                `  \x1B[90m${'─'.repeat(60)}\x1B[0m`,
+                ...this.logLines,
+                `  \x1B[90m${'─'.repeat(60)}\x1B[0m`,
+            ]
+            : [];
+        // ── Progress bar (fixed) ─────────────────────────────────────────
+        const barSection = [
+            `  ${spin} ${bar}  ${doneStr.padEnd(11)} ${pctStr}`,
             `  ⏱  Elapsed : \x1B[33m${fmtMs(elapsed)}\x1B[0m   ETA : \x1B[32m${eta > 0 ? '~' + fmtMs(eta) : remaining > 0 ? 'calculating…' : 'done!'}\x1B[0m`,
-            `  ⚡  Avg/item: \x1B[35m${avg > 0 ? fmtMs(avg) : '—'}\x1B[0m   ${this.extraLine ? '\x1B[90m' + truncate(this.extraLine, 30) + '\x1B[0m' : ''}`,
-            `  ▶  \x1B[90m${itemShort}\x1B[0m`,
-            ``
+            `  ⚡  Avg/item: \x1B[35m${avg > 0 ? fmtMs(avg) : '—'}\x1B[0m${this.statusLine ? `   \x1B[33m${truncate(this.statusLine, 40)}\x1B[0m` : ''}`,
+            `  ▶  \x1B[96m${itemShort}\x1B[0m`,
+            ``,
         ];
-        process.stdout.write(lines.join('\n'));
-        this.lineCount = lines.length;
+        const all = [...logSection, ...barSection];
+        process.stdout.write(all.join('\n'));
+        this.drawnLines = all.length;
     }
     finishPhase(summary) {
-        if (this.isTTY && this.lineCount > 0) {
-            // Clear live block
-            process.stdout.write(`\x1B[${this.lineCount}A\x1B[0J`);
-            this.lineCount = 0;
+        if (this.isTTY && this.drawnLines > 0) {
+            process.stdout.write(`\x1B[${this.drawnLines}A\x1B[0J`);
+            this.drawnLines = 0;
         }
         const elapsed = Date.now() - this.phaseStart;
         const avg = this.times.length > 0
@@ -214,20 +248,20 @@ class ProgressDisplay {
     }
 }
 // Build standard taxonomy prompt text
-const TAXONOMY_PROMPT = `
-Choose node types from this taxonomy:
-- UNIVERSAL: function | method | class | abstract_class | interface | type_alias | enum | constant | variable | module | namespace | decorator
-- NESTJS: nest_module | nest_controller | nest_service | nest_provider | nest_guard | nest_interceptor | nest_pipe | nest_filter | nest_decorator | nest_middleware | nest_gateway | nest_resolver | nest_schema | nest_dto
-- EXPRESS/FASTIFY: route_handler | middleware | router
-- SPRING (Java): spring_controller | spring_service | spring_repository | spring_component | spring_bean | spring_config | spring_entity
-- DJANGO/FASTAPI: django_view | django_model | django_serializer | django_form | django_signal | fastapi_router | fastapi_dependency
-- GO: go_handler | go_middleware | go_struct | go_interface | go_func
-- RUST: rust_struct | rust_impl | rust_trait | rust_enum | rust_fn | rust_macro
-- REACT/NEXTJS: react_component | react_hook | react_context | react_hoc | react_page | next_page | next_layout | next_api_route | next_server_action
-- ORM: prisma_model | typeorm_entity | mongoose_model | sqlalchemy_model
-- REST/API/GRAPHQL: api_endpoint | rest_controller | graphql_resolver | graphql_query | graphql_mutation | graphql_schema
-- CLI: cli_command | cli_option
-- UTILITY: util_function | helper | validator | formatter
+const TAXONOMY_PROMPT = `
+Choose node types from this taxonomy:
+- UNIVERSAL: function | method | class | abstract_class | interface | type_alias | enum | constant | variable | module | namespace | decorator
+- NESTJS: nest_module | nest_controller | nest_service | nest_provider | nest_guard | nest_interceptor | nest_pipe | nest_filter | nest_decorator | nest_middleware | nest_gateway | nest_resolver | nest_schema | nest_dto
+- EXPRESS/FASTIFY: route_handler | middleware | router
+- SPRING (Java): spring_controller | spring_service | spring_repository | spring_component | spring_bean | spring_config | spring_entity
+- DJANGO/FASTAPI: django_view | django_model | django_serializer | django_form | django_signal | fastapi_router | fastapi_dependency
+- GO: go_handler | go_middleware | go_struct | go_interface | go_func
+- RUST: rust_struct | rust_impl | rust_trait | rust_enum | rust_fn | rust_macro
+- REACT/NEXTJS: react_component | react_hook | react_context | react_hoc | react_page | next_page | next_layout | next_api_route | next_server_action
+- ORM: prisma_model | typeorm_entity | mongoose_model | sqlalchemy_model
+- REST/API/GRAPHQL: api_endpoint | rest_controller | graphql_resolver | graphql_query | graphql_mutation | graphql_schema
+- CLI: cli_command | cli_option
+- UTILITY: util_function | helper | validator | formatter
 `;
 // ── Vertex AI Authentication & Helper Functions ───────────────────────────
 function base64UrlEncode(obj) {
@@ -319,24 +353,24 @@ async function getVertexTokenCached(saData) {
 }
 async function extractWithVertex(model, token, projectId, location, filePath, code) {
     const url = `https://${location}-aiplatform.googleapis.com/v1/projects/${projectId}/locations/${location}/publishers/google/models/${model}:generateContent`;
-    const systemPrompt = `You are a codebase indexing assistant. Your job is to analyze the source code file provided and extract all code structures (functions, methods, classes, controllers, services, interfaces, schema models, types) defined in the file.
-Return ONLY a valid JSON object matching the schema:
-{
-  "nodes": [
-    { 
-      "node_id": "fully_qualified_identifier (e.g. Class.method or function)", 
-      "name": "display_name", 
-      "type": "type_from_taxonomy", 
-      "signature": "param/return signature (optional)",
-      "code_snapshot": "the exact full source code block of this entity"
-    }
-  ]
-}
-${TAXONOMY_PROMPT}
-CRITICAL RULES:
-1. ONLY extract code structures defined in the file. Do NOT extract imports or third-party libraries as nodes.
-2. For each node, extract its exact code snippet as "code_snapshot".
-3. DO NOT wrap JSON in markdown blocks (e.g. no \`\`\`json). Return raw JSON.
+    const systemPrompt = `You are a codebase indexing assistant. Your job is to analyze the source code file provided and extract all code structures (functions, methods, classes, controllers, services, interfaces, schema models, types) defined in the file.
+Return ONLY a valid JSON object matching the schema:
+{
+  "nodes": [
+    { 
+      "node_id": "fully_qualified_identifier (e.g. Class.method or function)", 
+      "name": "display_name", 
+      "type": "type_from_taxonomy", 
+      "signature": "param/return signature (optional)",
+      "code_snapshot": "the exact full source code block of this entity"
+    }
+  ]
+}
+${TAXONOMY_PROMPT}
+CRITICAL RULES:
+1. ONLY extract code structures defined in the file. Do NOT extract imports or third-party libraries as nodes.
+2. For each node, extract its exact code snippet as "code_snapshot".
+3. DO NOT wrap JSON in markdown blocks (e.g. no \`\`\`json). Return raw JSON.
 4. Be highly precise and return an empty JSON object if no code constructs are found.`;
     const payload = {
         contents: [
@@ -364,27 +398,27 @@ CRITICAL RULES:
         'Content-Type': 'application/json',
         'Authorization': `Bearer ${token}`
     }, JSON.stringify(payload));
-    const parsed = JSON.parse(responseText);
+    const parsed = (0, json_1.safeJsonParse)(responseText, {});
     const text = parsed.candidates?.[0]?.content?.parts?.[0]?.text;
     if (!text) {
         return {};
     }
-    return JSON.parse(text);
+    return (0, json_1.safeJsonParse)(text, {});
 }
 async function resolveConnectionsWithVertex(model, token, projectId, location, sourceNodeId, code, candidateNodeIds) {
     const url = `https://${location}-aiplatform.googleapis.com/v1/projects/${projectId}/locations/${location}/publishers/google/models/${model}:generateContent`;
-    const systemPrompt = `You are a codebase indexing assistant. Your job is to analyze the source code of a specific code entity and identify which other known code entities from the provided candidate list it calls or references.
-Return ONLY a valid JSON object matching the schema:
-{
-  "connections": [
-    "target_node_id_1",
-    "target_node_id_2"
-  ]
-}
-CRITICAL RULES:
-1. ONLY return target node IDs that are present in the provided list of known candidates. Do NOT invent new node IDs.
-2. DO NOT include connections to third-party libraries, language built-ins, or the source node itself.
-3. DO NOT wrap JSON in markdown blocks (e.g. no \`\`\`json). Return raw JSON.
+    const systemPrompt = `You are a codebase indexing assistant. Your job is to analyze the source code of a specific code entity and identify which other known code entities from the provided candidate list it calls or references.
+Return ONLY a valid JSON object matching the schema:
+{
+  "connections": [
+    "target_node_id_1",
+    "target_node_id_2"
+  ]
+}
+CRITICAL RULES:
+1. ONLY return target node IDs that are present in the provided list of known candidates. Do NOT invent new node IDs.
+2. DO NOT include connections to third-party libraries, language built-ins, or the source node itself.
+3. DO NOT wrap JSON in markdown blocks (e.g. no \`\`\`json). Return raw JSON.
 4. If no connections are found, return an empty array.`;
     const payload = {
         contents: [
@@ -412,34 +446,34 @@ CRITICAL RULES:
         'Content-Type': 'application/json',
         'Authorization': `Bearer ${token}`
     }, JSON.stringify(payload));
-    const parsed = JSON.parse(responseText);
+    const parsed = (0, json_1.safeJsonParse)(responseText, {});
     const text = parsed.candidates?.[0]?.content?.parts?.[0]?.text;
     if (!text) {
         return [];
     }
-    const result = JSON.parse(text);
+    const result = (0, json_1.safeJsonParse)(text, {});
     return result.connections || [];
 }
 async function extractWithGemini(model, key, filePath, code) {
     const url = `https://generativelanguage.googleapis.com/v1beta/models/${model}:generateContent?key=${key}`;
-    const systemPrompt = `You are a codebase indexing assistant. Your job is to analyze the source code file provided and extract all code structures (functions, methods, classes, controllers, services, interfaces, schema models, types) defined in the file.
-Return ONLY a valid JSON object matching the schema:
-{
-  "nodes": [
-    { 
-      "node_id": "fully_qualified_identifier (e.g. Class.method or function)", 
-      "name": "display_name", 
-      "type": "type_from_taxonomy", 
-      "signature": "param/return signature (optional)",
-      "code_snapshot": "the exact full source code block of this entity"
-    }
-  ]
-}
-${TAXONOMY_PROMPT}
-CRITICAL RULES:
-1. ONLY extract code structures defined in the file. Do NOT extract imports or third-party libraries as nodes.
-2. For each node, extract its exact code snippet as "code_snapshot".
-3. DO NOT wrap JSON in markdown blocks (e.g. no \`\`\`json). Return raw JSON.
+    const systemPrompt = `You are a codebase indexing assistant. Your job is to analyze the source code file provided and extract all code structures (functions, methods, classes, controllers, services, interfaces, schema models, types) defined in the file.
+Return ONLY a valid JSON object matching the schema:
+{
+  "nodes": [
+    { 
+      "node_id": "fully_qualified_identifier (e.g. Class.method or function)", 
+      "name": "display_name", 
+      "type": "type_from_taxonomy", 
+      "signature": "param/return signature (optional)",
+      "code_snapshot": "the exact full source code block of this entity"
+    }
+  ]
+}
+${TAXONOMY_PROMPT}
+CRITICAL RULES:
+1. ONLY extract code structures defined in the file. Do NOT extract imports or third-party libraries as nodes.
+2. For each node, extract its exact code snippet as "code_snapshot".
+3. DO NOT wrap JSON in markdown blocks (e.g. no \`\`\`json). Return raw JSON.
 4. Be highly precise and return an empty JSON object if no code constructs are found.`;
     const payload = {
         contents: [
@@ -463,32 +497,32 @@ CRITICAL RULES:
         }
     };
     const responseText = await makeHttpRequest(url, 'POST', { 'Content-Type': 'application/json' }, JSON.stringify(payload));
-    const parsed = JSON.parse(responseText);
+    const parsed = (0, json_1.safeJsonParse)(responseText, {});
     const text = parsed.candidates?.[0]?.content?.parts?.[0]?.text;
     if (!text) {
         return {};
     }
-    return JSON.parse(text);
+    return (0, json_1.safeJsonParse)(text, {});
 }
 async function extractWithOllama(url, model, filePath, code) {
     const endpoint = `${url.replace(/\/$/, '')}/api/chat`;
-    const systemPrompt = `You are a codebase indexing assistant. Analyze this source code file and extract code structures (functions, classes, methods, endpoints).
-Return ONLY a valid JSON object matching the schema:
-{
-  "nodes": [
-    { 
-      "node_id": "unique_string (e.g. Class.method or function)", 
-      "name": "display_name", 
-      "type": "type_from_taxonomy", 
-      "signature": "param/return signature (optional)",
-      "code_snapshot": "the exact full source code block of this entity"
-    }
-  ]
-}
-${TAXONOMY_PROMPT}
-CRITICAL RULES:
-1. ONLY extract constructs defined in this file. Do NOT extract third-party libraries or imports.
-2. For each node, extract its exact code snippet as "code_snapshot".
+    const systemPrompt = `You are a codebase indexing assistant. Analyze this source code file and extract code structures (functions, classes, methods, endpoints).
+Return ONLY a valid JSON object matching the schema:
+{
+  "nodes": [
+    { 
+      "node_id": "unique_string (e.g. Class.method or function)", 
+      "name": "display_name", 
+      "type": "type_from_taxonomy", 
+      "signature": "param/return signature (optional)",
+      "code_snapshot": "the exact full source code block of this entity"
+    }
+  ]
+}
+${TAXONOMY_PROMPT}
+CRITICAL RULES:
+1. ONLY extract constructs defined in this file. Do NOT extract third-party libraries or imports.
+2. For each node, extract its exact code snippet as "code_snapshot".
 3. Return a clean, valid JSON object.`;
     const userPrompt = `File path: ${filePath}\n\nCode:\n${code}`;
     const payload = {
@@ -501,24 +535,27 @@ CRITICAL RULES:
         format: 'json'
     };
     const responseText = await makeHttpRequest(endpoint, 'POST', { 'Content-Type': 'application/json' }, JSON.stringify(payload));
-    const parsed = JSON.parse(responseText);
+    const parsed = (0, json_1.safeJsonParse)(responseText, {});
     const text = parsed.message?.content;
-    return JSON.parse(text);
+    if (!text) {
+        return {};
+    }
+    return (0, json_1.safeJsonParse)(text, {});
 }
 async function resolveConnectionsWithGemini(model, key, sourceNodeId, code, candidateNodeIds) {
     const url = `https://generativelanguage.googleapis.com/v1beta/models/${model}:generateContent?key=${key}`;
-    const systemPrompt = `You are a codebase indexing assistant. Your job is to analyze the source code of a specific code entity and identify which other known code entities from the provided candidate list it calls or references.
-Return ONLY a valid JSON object matching the schema:
-{
-  "connections": [
-    "target_node_id_1",
-    "target_node_id_2"
-  ]
-}
-CRITICAL RULES:
-1. ONLY return target node IDs that are present in the provided list of known candidates. Do NOT invent new node IDs.
-2. DO NOT include connections to third-party libraries, language built-ins, or the source node itself.
-3. DO NOT wrap JSON in markdown blocks (e.g. no \`\`\`json). Return raw JSON.
+    const systemPrompt = `You are a codebase indexing assistant. Your job is to analyze the source code of a specific code entity and identify which other known code entities from the provided candidate list it calls or references.
+Return ONLY a valid JSON object matching the schema:
+{
+  "connections": [
+    "target_node_id_1",
+    "target_node_id_2"
+  ]
+}
+CRITICAL RULES:
+1. ONLY return target node IDs that are present in the provided list of known candidates. Do NOT invent new node IDs.
+2. DO NOT include connections to third-party libraries, language built-ins, or the source node itself.
+3. DO NOT wrap JSON in markdown blocks (e.g. no \`\`\`json). Return raw JSON.
 4. If no connections are found, return an empty array.`;
     const payload = {
         contents: [
@@ -542,26 +579,26 @@ CRITICAL RULES:
         }
     };
     const responseText = await makeHttpRequest(url, 'POST', { 'Content-Type': 'application/json' }, JSON.stringify(payload));
-    const parsed = JSON.parse(responseText);
+    const parsed = (0, json_1.safeJsonParse)(responseText, {});
     const text = parsed.candidates?.[0]?.content?.parts?.[0]?.text;
     if (!text) {
         return [];
     }
-    const result = JSON.parse(text);
+    const result = (0, json_1.safeJsonParse)(text, {});
     return result.connections || [];
 }
 async function resolveConnectionsWithOllama(url, model, sourceNodeId, code, candidateNodeIds) {
     const endpoint = `${url.replace(/\/$/, '')}/api/chat`;
-    const systemPrompt = `You are a codebase indexing assistant. Analyze this source code of a code entity and identify which other known entities from the provided candidate list it calls or references.
-Return ONLY a valid JSON object matching the schema:
-{
-  "connections": [
-    "target_node_id_1",
-    "target_node_id_2"
-  ]
-}
-CRITICAL RULES:
-1. ONLY return target node IDs that are present in the provided list of known candidates. Do NOT invent new node IDs.
+    const systemPrompt = `You are a codebase indexing assistant. Analyze this source code of a code entity and identify which other known entities from the provided candidate list it calls or references.
+Return ONLY a valid JSON object matching the schema:
+{
+  "connections": [
+    "target_node_id_1",
+    "target_node_id_2"
+  ]
+}
+CRITICAL RULES:
+1. ONLY return target node IDs that are present in the provided list of known candidates. Do NOT invent new node IDs.
 2. Return a clean, valid JSON object.`;
     const userPrompt = `Source Node ID: ${sourceNodeId}\n\nSource Code:\n${code}\n\nCandidate Target Node IDs:\n${JSON.stringify(candidateNodeIds, null, 2)}`;
     const payload = {
@@ -574,18 +611,19 @@ CRITICAL RULES:
         format: 'json'
     };
     const responseText = await makeHttpRequest(endpoint, 'POST', { 'Content-Type': 'application/json' }, JSON.stringify(payload));
-    const parsed = JSON.parse(responseText);
+    const parsed = (0, json_1.safeJsonParse)(responseText, {});
     const text = parsed.message?.content;
     if (!text) {
         return [];
     }
-    const result = JSON.parse(text);
+    const result = (0, json_1.safeJsonParse)(text, {});
     return result.connections || [];
 }
 function filterCandidates(codeSnapshot, allNodeIds) {
     const lowerCode = codeSnapshot.toLowerCase();
     return allNodeIds.filter(id => {
-        const shortName = id.includes('.') ? id.split('.').pop() : id;
+        const symbolName = id.includes('#') ? id.split('#').pop() : id;
+        const shortName = symbolName.includes('.') ? symbolName.split('.').pop() : symbolName;
         if (!shortName || shortName.trim().length === 0)
             return false;
         if (shortName.length < 3)
@@ -719,8 +757,11 @@ async function runBackgroundIndexing(opts) {
                 progress.skipItem('empty file');
                 continue;
             }
+            const fileLines = code.split('\n').length;
+            progress.updateStatus(`Reading ${fileLines} lines — sending to AI…`);
             let result = {};
-            let retries = 3;
+            let retries = 5;
+            let backoffMs = 10000;
             while (retries > 0) {
                 try {
                     if (opts.provider === 'gemini') {
@@ -743,15 +784,43 @@ async function runBackgroundIndexing(opts) {
                         db.close();
                         process.exit(1);
                     }
-                    await sleep(2000);
+                    const errMsg = err.message;
+                    if (errMsg.includes('429')) {
+                        progress.updateStatus(`Rate limited (429). Retrying in ${backoffMs / 1000}s...`);
+                        await sleep(backoffMs);
+                        backoffMs *= 2;
+                    }
+                    else {
+                        progress.updateStatus(`API error. Retrying in 2s...`);
+                        await sleep(2000);
+                    }
                 }
             }
             let newNodesCount = 0;
+            const totalNodesFound = result.nodes?.length ?? 0;
+            if (totalNodesFound === 0) {
+                progress.log(`\x1B[90mNo nodes found in file\x1B[0m`);
+            }
             if (result.nodes && Array.isArray(result.nodes)) {
                 for (const n of result.nodes) {
                     if (n.node_id && n.name && n.type) {
+                        // Estimate which line the node starts on by finding its code in the file
+                        let lineNum = '?';
+                        if (n.code_snapshot) {
+                            const snippet = n.code_snapshot.trimStart().substring(0, 60);
+                            const pos = code.indexOf(snippet.substring(0, 40));
+                            if (pos !== -1) {
+                                lineNum = String(code.substring(0, pos).split('\n').length);
+                            }
+                        }
+                        const pctDone = fileLines > 0 ? Math.round((parseInt(lineNum) / fileLines) * 100) : 0;
+                        const lineTag = lineNum !== '?' ? `\x1B[90mL${lineNum}/${fileLines} (${pctDone}% through file)\x1B[0m` : `\x1B[90m(line unknown)\x1B[0m`;
+                        progress.log(`\x1B[32m+\x1B[0m \x1B[1m${n.name}\x1B[0m \x1B[90m[${n.type}]\x1B[0m  ${lineTag}`);
+                        const workspaceRoot = path.dirname(resolvedDevmind);
+                        const relPath = path.relative(workspaceRoot, fileObj.absolutePath).replace(/\\/g, '/');
+                        const qualifiedId = `${relPath}#${n.node_id}`;
                         db.upsertNode({
-                            id: n.node_id,
+                            id: qualifiedId,
                             name: n.name,
                             type: n.type,
                             file_path: fileObj.absolutePath,
@@ -760,7 +829,7 @@ async function runBackgroundIndexing(opts) {
                         newNodesCount++;
                         if (n.code_snapshot) {
                             db.updateHistory({
-                                node_id: n.node_id,
+                                node_id: qualifiedId,
                                 code_snapshot: n.code_snapshot,
                                 reasoning: {
                                     what_changed: 'Initial code extraction during background indexing',
@@ -770,6 +839,7 @@ async function runBackgroundIndexing(opts) {
                                     model: modelName
                                 }
                             });
+                            progress.log(`  \x1B[90m└ code snapshot saved (${n.code_snapshot.split('\n').length} lines)\x1B[0m`);
                         }
                     }
                 }
@@ -831,7 +901,8 @@ async function runBackgroundIndexing(opts) {
                 continue;
             }
             let connections = [];
-            let retries = 3;
+            let retries = 5;
+            let backoffMs = 10000;
             while (retries > 0) {
                 try {
                     if (opts.provider === 'gemini') {
@@ -854,12 +925,22 @@ async function runBackgroundIndexing(opts) {
                         db.close();
                         process.exit(1);
                     }
-                    await sleep(2000);
+                    const errMsg = err.message;
+                    if (errMsg.includes('429')) {
+                        progress.updateStatus(`Rate limited (429). Retrying in ${backoffMs / 1000}s...`);
+                        await sleep(backoffMs);
+                        backoffMs *= 2;
+                    }
+                    else {
+                        progress.updateStatus(`API error. Retrying in 2s...`);
+                        await sleep(2000);
+                    }
                 }
             }
             let addedCount = 0;
             for (const targetId of connections) {
                 if (allNodeIds.includes(targetId)) {
+                    progress.log(`Linked: \x1B[36m${node.id}\x1B[0m → \x1B[36m${targetId}\x1B[0m`);
                     db.addConnection(node.id, targetId);
                     addedCount++;
                 }