deepdebug-local-agent 1.0.17 → 1.0.18

package/src/server.js

@@ -48,7 +48,7 @@ class AIVibeCodingEngine extends EventEmitter {
         this.currentSession = null;
         this.lastSuccessfulConfig = null;
 
-        console.log(' [AI-Engine] Vibe Coding Engine initialized');
+        console.log('[AI-Engine] Vibe Coding Engine initialized');
         this.setupErrorMonitoring();
     }
 
@@ -61,9 +61,9 @@ class AIVibeCodingEngine extends EventEmitter {
 
         this.processManager.on('stopped', async ({ serviceId, code, signal }) => {
             if (this.isActive && code !== 0 && code !== null) {
-                console.log(` [AI-Engine] Process ${serviceId} crashed (code: ${code})`);
+                console.log(`[AI-Engine] Process ${serviceId} crashed (code: ${code})`);
                 if (this.pendingFixes.length > 0) {
-                    console.log(` [AI-Engine] ${this.pendingFixes.length} fixes pending`);
+                    console.log(`[AI-Engine] ${this.pendingFixes.length} fixes pending`);
                 }
             }
         });
@@ -164,12 +164,12 @@ class AIVibeCodingEngine extends EventEmitter {
         this.errorHistory.push(entry);
         if (this.errorHistory.length > 200) this.errorHistory = this.errorHistory.slice(-200);
 
-        console.log(` [AI-Engine] Error: ${classification.type} (${classification.severity})`);
+        console.log(`[AI-Engine] Error: ${classification.type} (${classification.severity})`);
 
         if (classification.autoFixable) {
             const fix = this.getQuickFix(classification.type, errorMessage);
             if (fix) {
-                console.log(` [AI-Engine] Quick fix: ${fix.description}`);
+                console.log(`[AI-Engine] Quick fix: ${fix.description}`);
                 this.pendingFixes.push({ errorId: entry.id, fix, timestamp: Date.now() });
             }
         }
@@ -204,7 +204,7 @@ class AIVibeCodingEngine extends EventEmitter {
     }
 
     async startWithAutoHealing(config) {
-        console.log(' [AI-Engine] Starting with auto-healing...');
+        console.log('[AI-Engine] Starting with auto-healing...');
 
         this.currentSession = {
             startTime: Date.now(),
@@ -222,12 +222,12 @@ class AIVibeCodingEngine extends EventEmitter {
 
             if (attempts > 1 && this.pendingFixes.length > 0) {
                 const fix = this.pendingFixes.shift();
-                console.log(` Applying: ${fix.fix.description}`);
+                console.log(`Applying: ${fix.fix.description}`);
                 currentConfig = this.applyFix(currentConfig, fix.fix);
             }
 
             if (currentConfig.recompile) {
-                console.log(' Recompiling...');
+                console.log('Recompiling...');
                 await this.recompile();
                 delete currentConfig.recompile;
             }
@@ -257,16 +257,16 @@ class AIVibeCodingEngine extends EventEmitter {
             }
 
             lastError = result.error;
-            console.log(` Attempt ${attempts} failed: ${lastError?.substring(0, 100)}...`);
+            console.log(`Attempt ${attempts} failed: ${lastError?.substring(0, 100)}...`);
 
             const fix = this.getFix(result.error, currentConfig);
             if (fix) {
-                console.log(` Fix: ${fix.description}`);
+                console.log(`Fix: ${fix.description}`);
                 currentConfig = this.applyFix(currentConfig, fix);
             } else {
                 const ai = await this.analyzeWithAI('startup', lastError, currentConfig);
                 if (ai?.newConfig) {
-                    console.log(` AI: ${ai.suggestion}`);
+                    console.log(`AI: ${ai.suggestion}`);
                     currentConfig = ai.newConfig;
                 } else {
                     break;
@@ -305,7 +305,7 @@ class AIVibeCodingEngine extends EventEmitter {
 
                     // Detectar sucesso nos logs do Spring Boot
                     if (isStartupSuccess(message) && !resolved) {
-                        console.log(` [AI-Engine] Detected startup success: ${message.substring(0, 80)}...`);
+                        console.log(`[AI-Engine] Detected startup success: ${message.substring(0, 80)}...`);
                         resolved = true;
                         cleanup();
                         resolve({ success: true, logs });
@@ -372,7 +372,7 @@ class AIVibeCodingEngine extends EventEmitter {
                 newConfig.profile = next;
                 newConfig.args = this.updateArgs(config.args, 'profile', next);
                 newConfig.env = { ...config.env, SPRING_PROFILES_ACTIVE: next };
-                console.log(`    Profile: ${config.profile}  ${next}`);
+                console.log(`Profile: ${config.profile}  ${next}`);
                 break;
 
             case 'change_port':
@@ -380,7 +380,7 @@ class AIVibeCodingEngine extends EventEmitter {
                 newConfig.port = newPort;
                 newConfig.args = this.updateArgs(config.args, 'port', newPort);
                 newConfig.env = { ...config.env, SERVER_PORT: String(newPort), PORT: String(newPort) };
-                console.log(`    Port: ${config.port}  ${newPort}`);
+                console.log(`Port: ${config.port}  ${newPort}`);
                 break;
 
             case 'recompile':
@@ -418,7 +418,7 @@ class AIVibeCodingEngine extends EventEmitter {
 
             if (response.ok) return await response.json();
         } catch (err) {
-            console.log(` [AI-Engine] AI unavailable: ${err.message}`);
+            console.log(`[AI-Engine] AI unavailable: ${err.message}`);
         }
 
         return this.localFallback(errorType, error, config);
@@ -527,7 +527,7 @@ class AIVibeCodingEngine extends EventEmitter {
 
     setActive(active) {
         this.isActive = active;
-        console.log(` [AI-Engine] ${active ? 'ENABLED' : 'DISABLED'}`);
+        console.log(`[AI-Engine] ${active ? 'ENABLED' : 'DISABLED'}`);
     }
 
     clearHistory() {
@@ -577,7 +577,7 @@ const DEFAULT_WORKSPACE = process.env.DEFAULT_WORKSPACE || '/Users/macintosh/Ide
 
 let WORKSPACE_ROOT = fs.existsSync(DEFAULT_WORKSPACE) ? DEFAULT_WORKSPACE : null;
 if (WORKSPACE_ROOT) {
-    console.log(` Default workspace: ${WORKSPACE_ROOT}`);
+    console.log(`Default workspace: ${WORKSPACE_ROOT}`);
 }
 
 let DETECTED_SERVICES = [];
@@ -585,11 +585,31 @@ const processManager = new ProcessManager();
 const wsManager = new WorkspaceManager();
 
 function resolveWorkspaceRoot(req) {
+    // TENANT ISOLATION: stateless, never mutates global state.
+    // Returns the workspace path for THIS specific request only.
+    //
+    // Priority:
+    //   1. X-Workspace-Root header  -- sent by Gateway with tenant NFS path (post-onboarding)
+    //   2. X-Workspace-Id header    -- fallback via WorkspaceManager (dev/local mode)
+    //   3. null                     -- no workspace for this request (onboarding flow)
+    //
+    // IMPORTANT: Does NOT fall back to WORKSPACE_ROOT global.
+    // A request without a workspace header gets null, not another tenant's path.
+
+    // 1. Tenant-isolated NFS path from Gateway
+    const secureRoot = req.headers['x-workspace-root'];
+    if (secureRoot && secureRoot.trim()) {
+        return secureRoot.trim();
+    }
+
+    // 2. WorkspaceId (dev/local mode only)
     const wsId = req.headers['x-workspace-id']
         || (req.body && req.body.workspaceId)
         || req.query.workspaceId;
     if (wsId && wsManager.isOpen(wsId)) return wsManager.getRoot(wsId);
-    return WORKSPACE_ROOT;
+
+    // 3. No workspace -- caller must handle null (e.g. onboarding endpoints)
+    return null;
 }
 const MCP_PORT = process.env.MCP_PORT || 5056;
 
@@ -652,7 +672,7 @@ function loadBackupIndex() {
                     });
                 }
             }
-            console.log(` Restored ${BACKUPS.size} backups from disk`);
+            console.log(`Restored ${BACKUPS.size} backups from disk`);
         }
     } catch (e) {
         console.warn('Could not load backup index:', e.message);
@@ -664,19 +684,19 @@ loadBackupIndex();
 
 // Event listeners do ProcessManager
 processManager.on("started", ({ serviceId }) => {
-    console.log(` Service ${serviceId} started successfully`);
+    console.log(`Service ${serviceId} started successfully`);
     updateServiceStatus(serviceId, "running");
     addServerLog("info", `Service ${serviceId} started successfully`);
 });
 
 processManager.on("stopped", ({ serviceId }) => {
-    console.log(` Service ${serviceId} stopped`);
+    console.log(`Service ${serviceId} stopped`);
     updateServiceStatus(serviceId, "stopped");
     addServerLog("info", `Service ${serviceId} stopped`);
 });
 
 processManager.on("error", ({ serviceId, error }) => {
-    console.error(` Service ${serviceId} error: ${error}`);
+    console.error(`Service ${serviceId} error: ${error}`);
     updateServiceStatus(serviceId, "failed");
     addServerLog("error", `Service ${serviceId} error: ${error}`);
 });
@@ -731,7 +751,7 @@ app.post("/workspace/open", async (req, res) => {
     // CLOUD MODE: Git clone (when Gateway sends repoUrl)
     // ==========================================
     if (repoUrl) {
-        console.log(` [/workspace/open] CLOUD MODE  cloning ${repoUrl} (branch: ${branch})`);
+        console.log(`[/workspace/open] CLOUD MODE  cloning ${repoUrl} (branch: ${branch})`);
 
         try {
             // Extract repo name: https://github.com/org/repo  org_repo
@@ -772,16 +792,16 @@ app.post("/workspace/open", async (req, res) => {
             const alreadyCloned = await exists(gitDir);
 
             if (alreadyCloned) {
-                console.log(` [cloud] Repo exists: ${clonePath}, updating...`);
+                console.log(`[cloud] Repo exists: ${clonePath}, updating...`);
                 // Update remote URL with fresh token
                 await execAsync(`git remote set-url origin "${authUrl}"`, { cwd: clonePath }).catch(() => {});
                 await execAsync(`git fetch origin`, { cwd: clonePath, timeout: 120000 });
                 // Checkout correct branch and reset to remote (discard previous patches)
                 await execAsync(`git checkout ${branch} 2>/dev/null || git checkout -b ${branch} origin/${branch}`, { cwd: clonePath }).catch(() => {});
                 await execAsync(`git reset --hard origin/${branch}`, { cwd: clonePath });
-                console.log(` [cloud] Updated to latest ${branch}`);
+                console.log(`[cloud] Updated to latest ${branch}`);
             } else {
-                console.log(` [cloud] Cloning ${repoUrl} (branch: ${branch})...`);
+                console.log(`[cloud] Cloning ${repoUrl} (branch: ${branch})...`);
                 await execAsync(
                     `git clone --branch ${branch} --single-branch --depth 50 "${authUrl}" "${clonePath}"`,
                     { timeout: 300000 }
@@ -789,7 +809,7 @@ app.post("/workspace/open", async (req, res) => {
                 // Configure git user for future commits
                 await execAsync(`git config user.email "deepdebug-ai@deepdebug.ai"`, { cwd: clonePath });
                 await execAsync(`git config user.name "DeepDebug AI"`, { cwd: clonePath });
-                console.log(` [cloud] Cloned successfully: ${clonePath}`);
+                console.log(`[cloud] Cloned successfully: ${clonePath}`);
             }
 
             // Set as active workspace
@@ -799,7 +819,7 @@ app.post("/workspace/open", async (req, res) => {
             }
             const wsId = workspaceId || "default";
             try { await wsManager.open(wsId, clonePath); } catch (err) {
-                console.warn(` WorkspaceManager.open failed (non-fatal): ${err.message}`);
+                console.warn(`WorkspaceManager.open failed (non-fatal): ${err.message}`);
             }
 
             const meta = await detectProject(clonePath);
@@ -815,7 +835,7 @@ app.post("/workspace/open", async (req, res) => {
             });
 
         } catch (gitErr) {
-            console.error(` [cloud] Git clone failed:`, gitErr.message);
+            console.error(`[cloud] Git clone failed:`, gitErr.message);
             const hint = gitErr.message.includes('Authentication') || gitErr.message.includes('could not read')
                 ? "Authentication failed. Check token and repo URL."
                 : gitErr.message.includes('not found') || gitErr.message.includes('does not exist')
@@ -842,7 +862,7 @@ app.post("/workspace/open", async (req, res) => {
     try {
         await wsManager.open(wsId, abs);
     } catch (err) {
-        console.warn(` WorkspaceManager open failed (non-fatal): ${err.message}`);
+        console.warn(`WorkspaceManager open failed (non-fatal): ${err.message}`);
     }
 
     const meta = await detectProject(abs);
@@ -859,24 +879,30 @@ app.post("/workspace/open", async (req, res) => {
  */
 app.post("/workspace/clone", async (req, res) => {
     const body = req.body || {};
-    // Accept both naming conventions:
-    // - gitUrl + targetPath (local agent format)
-    // - repoUrl + targetDir (cloud format)
-    const gitUrl     = body.gitUrl     || body.repoUrl;
-    const targetPath = body.targetPath || body.targetDir;
+    const gitUrl      = body.gitUrl     || body.repoUrl;
+    const targetPath  = body.targetPath || body.targetDir;
+    const tenantId    = body.tenantId;
     const workspaceId = body.workspaceId;
-    const gitToken   = body.gitToken;
-    const branch     = body.branch;
+    const gitToken    = body.gitToken;
+    const branch      = body.branch;
 
     if (!gitUrl) return res.status(400).json({ ok: false, error: "gitUrl is required" });
 
-    // If targetPath not provided, derive from repo name
-    const repoName   = gitUrl.split('/').pop().replace('.git', '');
-    const resolvedTarget = targetPath
-        ? path.resolve(targetPath)
-        : path.join(process.env.HOME || '/home/deepdebug', 'DeepDebug', repoName);
+    const repoName = gitUrl.split('/').pop().replace('.git', '');
+
+    const NFS_MOUNT = '/mnt/workspaces';
+    let absTarget;
+    if (tenantId && fs.existsSync(NFS_MOUNT)) {
+        absTarget = path.join(NFS_MOUNT, tenantId, repoName);
+        console.log(`[clone] Using NFS persistent storage: ${absTarget}`);
+    } else if (targetPath) {
+        absTarget = path.resolve(targetPath);
+        console.log(`[clone] Using explicit targetPath: ${absTarget}`);
+    } else {
+        absTarget = path.join(process.env.HOME || '/home/deepdebug', 'DeepDebug', repoName);
+        console.log(`[clone] Using fallback path: ${absTarget}`);
+    }
 
-    // If gitToken provided and not already embedded in URL, embed it
     let authenticatedUrl = gitUrl;
     if (gitToken && gitUrl.startsWith('https://') && !gitUrl.includes('@')) {
         if (gitUrl.includes('bitbucket.org')) {
@@ -887,9 +913,7 @@ app.post("/workspace/clone", async (req, res) => {
             authenticatedUrl = gitUrl.replace('https://', `https://x-access-token:${gitToken}@`);
         }
     }
-
-    const absTarget = resolvedTarget;
-    console.log(` Clone request: ${gitUrl} -> ${absTarget}`);
+    console.log(`Clone request: ${gitUrl} -> ${absTarget}`);
 
     try {
         // Ensure parent directory exists
@@ -901,14 +925,22 @@ app.post("/workspace/clone", async (req, res) => {
         const alreadyCloned = await exists(gitDir);
 
         if (alreadyCloned) {
-            console.log(` Repo already exists at ${absTarget}, running git pull...`);
-            const { stdout } = await execAsync('git pull', { cwd: absTarget, timeout: 120000 });
-            console.log(` git pull: ${stdout.trim()}`);
+            const targetBranch = branch || 'develop';
+            console.log(`Repo already exists at ${absTarget}, updating branch: ${targetBranch}...`);
+            await execAsync('git fetch --all', { cwd: absTarget, timeout: 60000 });
+            try {
+                await execAsync(`git checkout ${targetBranch}`, { cwd: absTarget, timeout: 30000 });
+                const { stdout } = await execAsync(`git pull origin ${targetBranch}`, { cwd: absTarget, timeout: 120000 });
+                console.log(`git pull: ${stdout.trim()}`);
+            } catch (checkoutErr) {
+                console.warn(`Checkout ${targetBranch} failed, staying on current branch: ${checkoutErr.message}`);
+            }
         } else {
             const safeLog = authenticatedUrl.replace(/x-token-auth:[^@]+@/g, 'x-token-auth:***@').replace(/oauth2:[^@]+@/g, 'oauth2:***@').replace(/x-access-token:[^@]+@/g, 'x-access-token:***@');
-            console.log(` Running: git clone "${safeLog}" "${absTarget}"`);
-            await execAsync(`git clone "${authenticatedUrl}" "${absTarget}"`, { timeout: 300000 });
-            console.log(` Clone complete: ${absTarget}`);
+            const cloneCmd = branch ? `git clone -b ${branch} "${authenticatedUrl}" "${absTarget}"` : `git clone "${authenticatedUrl}" "${absTarget}"`;
+            console.log(`Running: git clone${branch ? ' -b ' + branch : ''} "${safeLog}" "${absTarget}"`);
+            await execAsync(cloneCmd, { timeout: 300000 });
+            console.log(`Clone complete: ${absTarget}`);
         }
 
         // Open the cloned workspace
@@ -917,7 +949,7 @@ app.post("/workspace/clone", async (req, res) => {
         try {
             await wsManager.open(wsId, absTarget);
         } catch (err) {
-            console.warn(` WorkspaceManager.open failed (non-fatal): ${err.message}`);
+            console.warn(`WorkspaceManager.open failed (non-fatal): ${err.message}`);
         }
 
         const meta = await detectProject(absTarget);
@@ -933,7 +965,7 @@ app.post("/workspace/clone", async (req, res) => {
         });
 
     } catch (err) {
-        console.error(` Clone failed: ${err.message}`);
+        console.error(`Clone failed: ${err.message}`);
         const hint = err.message.includes('Authentication') || err.message.includes('could not read')
             ? "Authentication failed. Ensure the repo is public or GitHub integration is configured."
             : err.message.includes('not found') || err.message.includes('does not exist')
@@ -1015,6 +1047,35 @@ app.get("/workspace/file-content", async (req, res) => {
     }
 });
 
+/** Escreve/salva conteudo de arquivo no workspace */
+app.post("/workspace/write-file", async (req, res) => {
+    const workspaceRoot = getEffectiveRoot(req);
+    if (!workspaceRoot) return res.status(400).json({ error: "workspace not set" });
+
+    const { path: relativePath, content: fileContent } = req.body || {};
+    if (!relativePath) return res.status(400).json({ error: "path is required" });
+    if (fileContent === undefined || fileContent === null) return res.status(400).json({ error: "content is required" });
+
+    const pathMod = await import('path');
+    const fullPath = pathMod.default.resolve(workspaceRoot, relativePath);
+
+    // Security: prevent path traversal outside workspace root
+    if (!fullPath.startsWith(workspaceRoot)) {
+        return res.status(403).json({ error: "Path traversal not allowed" });
+    }
+
+    try {
+        const { mkdir } = await import('fs/promises');
+        await mkdir(pathMod.default.dirname(fullPath), { recursive: true });
+        await fsPromises.writeFile(fullPath, fileContent, 'utf8');
+        res.json({ ok: true, path: relativePath, size: fileContent.length });
+    } catch (err) {
+        res.status(500).json({ error: "Could not write file", details: err.message });
+    }
+});
+
+
+
 /** L mltiplos arquivos */
 app.post("/workspace/batch-read", async (req, res) => {
     const wsRoot = resolveWorkspaceRoot(req);
@@ -1057,7 +1118,7 @@ app.get("/workspace/file-exists", async (req, res) => {
         const fullPath = path.join(wsRoot, relativePath);
         const fileExists = await exists(fullPath);
 
-        console.log(` [file-exists] ${relativePath} -> ${fileExists ? 'EXISTS' : 'NOT FOUND'}`);
+        console.log(`[file-exists] ${relativePath} -> ${fileExists ? 'EXISTS' : 'NOT FOUND'}`);
 
         res.json({
             ok: true,
@@ -1066,7 +1127,7 @@ app.get("/workspace/file-exists", async (req, res) => {
             fullPath: fullPath
         });
     } catch (err) {
-        console.error(` [file-exists] Error:`, err.message);
+        console.error(`[file-exists] Error:`, err.message);
         res.status(500).json({ ok: false, error: err.message });
     }
 });
@@ -1098,7 +1159,7 @@ app.post("/workspace/validate-paths", async (req, res) => {
         const allExist = results.every(r => r.exists);
         const missingPaths = results.filter(r => !r.exists).map(r => r.path);
 
-        console.log(` [validate-paths] Checked ${pathList.length} paths, ${missingPaths.length} missing`);
+        console.log(`[validate-paths] Checked ${pathList.length} paths, ${missingPaths.length} missing`);
 
         res.json({
             ok: true,
@@ -1108,7 +1169,7 @@ app.post("/workspace/validate-paths", async (req, res) => {
             totalChecked: pathList.length
         });
     } catch (err) {
-        console.error(` [validate-paths] Error:`, err.message);
+        console.error(`[validate-paths] Error:`, err.message);
         res.status(500).json({ ok: false, error: err.message });
     }
 });
@@ -1131,7 +1192,7 @@ app.post("/workspace/search-file", async (req, res) => {
     }
 
     try {
-        console.log(` [search-file] Searching for: ${fileName}`);
+        console.log(`[search-file] Searching for: ${fileName}`);
 
         const rawFiles = await listRecursive(wsRoot, {
             maxDepth: 15,
@@ -1148,7 +1209,7 @@ app.post("/workspace/search-file", async (req, res) => {
             return String(f);
         }).filter(f => f && typeof f === 'string');
 
-        console.log(` [search-file] Scanning ${allFiles.length} files`);
+        console.log(`[search-file] Scanning ${allFiles.length} files`);
 
         // Strategy 1: Exact path match
         let foundPath = allFiles.find(f => f.endsWith('/' + fileName) || f === fileName);
@@ -1178,14 +1239,14 @@ app.post("/workspace/search-file", async (req, res) => {
         }
 
         if (foundPath) {
-            console.log(` [search-file] Found: ${foundPath}`);
+            console.log(`[search-file] Found: ${foundPath}`);
             res.json({ ok: true, found: true, path: foundPath, fileName });
         } else {
-            console.log(` [search-file] Not found: ${fileName}`);
+            console.log(`[search-file] Not found: ${fileName}`);
             res.json({ ok: true, found: false, fileName, searchedFiles: allFiles.length });
         }
     } catch (err) {
-        console.error(` [search-file] Error:`, err.message);
+        console.error(`[search-file] Error:`, err.message);
         res.status(500).json({ ok: false, error: err.message });
     }
 });
@@ -1209,7 +1270,7 @@ app.post("/workspace/search-by-content", async (req, res) => {
     }
 
     try {
-        console.log(` [search-by-content] Searching for terms: ${terms.join(', ')}`);
+        console.log(`[search-by-content] Searching for terms: ${terms.join(', ')}`);
 
         const rawFiles = await listRecursive(wsRoot, {
             maxDepth: 15,
@@ -1229,7 +1290,7 @@ app.post("/workspace/search-by-content", async (req, res) => {
             return extensions.some(ext => filePath.endsWith(ext));
         });
 
-        console.log(` [search-by-content] Scanning ${filteredFiles.length} files`);
+        console.log(`[search-by-content] Scanning ${filteredFiles.length} files`);
 
         const results = [];
 
@@ -1274,7 +1335,7 @@ app.post("/workspace/search-by-content", async (req, res) => {
             return true;
         }).slice(0, maxResults);
 
-        console.log(` [search-by-content] Found ${dedupedResults.length} matching files`);
+        console.log(`[search-by-content] Found ${dedupedResults.length} matching files`);
 
         res.json({
             ok: true,
@@ -1283,7 +1344,7 @@ app.post("/workspace/search-by-content", async (req, res) => {
             termsSearched: terms
         });
     } catch (err) {
-        console.error(` [search-by-content] Error:`, err.message);
+        console.error(`[search-by-content] Error:`, err.message);
         res.status(500).json({ ok: false, error: err.message });
     }
 });
@@ -1307,7 +1368,7 @@ app.post("/workspace/find-field-definition", async (req, res) => {
     }
 
     try {
-        console.log(` [find-field] Searching for field: ${fieldName}`);
+        console.log(`[find-field] Searching for field: ${fieldName}`);
 
         const rawFiles = await listRecursive(wsRoot, {
             maxDepth: 15,
@@ -1386,7 +1447,7 @@ app.post("/workspace/find-field-definition", async (req, res) => {
             return 0;
         });
 
-        console.log(` [find-field] Found ${definitions.length} definitions for '${fieldName}'`);
+        console.log(`[find-field] Found ${definitions.length} definitions for '${fieldName}'`);
 
         res.json({
             ok: true,
@@ -1395,7 +1456,7 @@ app.post("/workspace/find-field-definition", async (req, res) => {
             totalSearched: targetFiles.length
         });
     } catch (err) {
-        console.error(` [find-field] Error:`, err.message);
+        console.error(`[find-field] Error:`, err.message);
         res.status(500).json({ ok: false, error: err.message });
     }
 });
@@ -1609,7 +1670,7 @@ app.post("/workspace/patch", async (req, res) => {
     if (!diff) return res.status(400).json({ error: "diff is required" });
 
     try {
-        console.log(` Applying patch for incident: ${incidentId || 'unknown'}`);
+        console.log(`Applying patch for incident: ${incidentId || 'unknown'}`);
         const out = await applyUnifiedDiff(wsRoot, diff);
 
         //  CRITICAL FIX: Format response as expected by Gateway
@@ -1624,7 +1685,7 @@ app.post("/workspace/patch", async (req, res) => {
             incidentId: incidentId
         };
 
-        console.log(` Patch applied successfully:`, {
+        console.log(`Patch applied successfully:`, {
             target: out.target,
             bytes: out.bytes,
             incident: incidentId
@@ -1632,7 +1693,7 @@ app.post("/workspace/patch", async (req, res) => {
 
         res.json(response);
     } catch (e) {
-        console.error(` Patch failed:`, e.message);
+        console.error(`Patch failed:`, e.message);
         res.status(400).json({
             ok: false,
             error: "patch failed",
@@ -1684,7 +1745,7 @@ let TEST_LOCAL_STATE = {
  * Returns current test local state with auto-detected port
  */
 app.get("/workspace/test-local/state", async (req, res) => {
-    console.log(" [TEST-LOCAL] Getting state:", TEST_LOCAL_STATE.status);
+    console.log("[TEST-LOCAL] Getting state:", TEST_LOCAL_STATE.status);
 
     // Auto-detect port if not set in config
     let port = TEST_LOCAL_STATE.config?.server?.port;
@@ -1723,7 +1784,7 @@ app.post("/workspace/test-local/compile", async (req, res) => {
     if (!wsRoot) return res.status(400).json({ error: "workspace not set" });
 
     try {
-        console.log(" [TEST-LOCAL] Starting compilation...");
+        console.log("[TEST-LOCAL] Starting compilation...");
         TEST_LOCAL_STATE.status = "compiling";
 
         const meta = await detectProject(wsRoot);
@@ -1758,7 +1819,7 @@ app.post("/workspace/test-local/compile", async (req, res) => {
             duration: compileResult.duration
         };
 
-        console.log(" [TEST-LOCAL] Compilation successful");
+        console.log("[TEST-LOCAL] Compilation successful");
 
         res.json({
             ok: true,
@@ -1768,7 +1829,7 @@ app.post("/workspace/test-local/compile", async (req, res) => {
             stdout: compileResult.stdout
         });
     } catch (err) {
-        console.error(" [TEST-LOCAL] Compilation failed:", err.message);
+        console.error("[TEST-LOCAL] Compilation failed:", err.message);
         TEST_LOCAL_STATE.status = "error";
         res.status(500).json({ ok: false, error: err.message });
     }
@@ -1821,7 +1882,7 @@ app.post("/workspace/test-local/start", async (req, res) => {
             const command = 'java';
             const args = ['-jar', jarPath, `--server.port=${serverPort}`];
 
-            console.log(` Command: ${command} ${args.join(' ')}`);
+            console.log(`Command: ${command} ${args.join(' ')}`);
 
             // Env LIMPO - remover TODAS as variveis Spring que podem interferir
             const cleanEnv = { ...process.env };
@@ -1851,7 +1912,7 @@ app.post("/workspace/test-local/start", async (req, res) => {
             TEST_LOCAL_STATE.status = "running";
             TEST_LOCAL_STATE.config = { port: serverPort };
 
-            console.log(` [TEST-LOCAL] Server started on port ${serverPort}`);
+            console.log(`[TEST-LOCAL] Server started on port ${serverPort}`);
 
             res.json({
                 ok: true,
@@ -1901,7 +1962,7 @@ app.post("/workspace/test-local/start", async (req, res) => {
             });
         }
     } catch (err) {
-        console.error(" [TEST-LOCAL] Server start failed:", err.message);
+        console.error("[TEST-LOCAL] Server start failed:", err.message);
         TEST_LOCAL_STATE.status = "error";
         res.status(500).json({ ok: false, error: err.message });
     }
@@ -1913,19 +1974,19 @@ app.post("/workspace/test-local/start", async (req, res) => {
  */
 app.post("/workspace/test-local/stop", async (req, res) => {
     try {
-        console.log(" [TEST-LOCAL] Stopping server...");
+        console.log("[TEST-LOCAL] Stopping server...");
 
         await processManager.stop('test-local');
         TEST_LOCAL_STATE.status = "stopped";
 
-        console.log(" [TEST-LOCAL] Server stopped");
+        console.log("[TEST-LOCAL] Server stopped");
 
         res.json({
             ok: true,
             status: "stopped"
         });
     } catch (err) {
-        console.error(" [TEST-LOCAL] Server stop failed:", err.message);
+        console.error("[TEST-LOCAL] Server stop failed:", err.message);
         res.status(500).json({ ok: false, error: err.message });
     }
 });
@@ -1939,7 +2000,7 @@ app.get("/workspace/test-local/endpoints", async (req, res) => {
     if (!wsRoot) return res.status(400).json({ error: "workspace not set" });
 
     try {
-        console.log(" [TEST-LOCAL] Getting endpoints...");
+        console.log("[TEST-LOCAL] Getting endpoints...");
 
         // If endpoints are cached, return them
         if (TEST_LOCAL_STATE.endpoints && TEST_LOCAL_STATE.endpoints.length > 0) {
@@ -1962,7 +2023,7 @@ app.get("/workspace/test-local/endpoints", async (req, res) => {
 
         TEST_LOCAL_STATE.endpoints = payloadDocs.endpoints;
 
-        console.log(` [TEST-LOCAL] Discovered ${payloadDocs.endpoints.length} endpoints`);
+        console.log(`[TEST-LOCAL] Discovered ${payloadDocs.endpoints.length} endpoints`);
 
         res.json({
             ok: true,
@@ -1970,7 +2031,7 @@ app.get("/workspace/test-local/endpoints", async (req, res) => {
             cached: false
         });
     } catch (err) {
-        console.error(" [TEST-LOCAL] Failed to get endpoints:", err.message);
+        console.error("[TEST-LOCAL] Failed to get endpoints:", err.message);
         res.status(500).json({ ok: false, error: err.message });
     }
 });
@@ -1990,7 +2051,7 @@ app.post("/workspace/test-local/execute", async (req, res) => {
         const serverPort = port || TEST_LOCAL_STATE.config?.server?.port || 8080;
         const url = `http://localhost:${serverPort}${reqPath}`;
 
-        console.log(` [TEST-LOCAL] Executing: ${method} ${url}`);
+        console.log(`[TEST-LOCAL] Executing: ${method} ${url}`);
 
         const startTime = Date.now();
 
@@ -2039,14 +2100,14 @@ app.post("/workspace/test-local/execute", async (req, res) => {
             TEST_LOCAL_STATE.testResults.shift();
         }
 
-        console.log(` [TEST-LOCAL] Test result: ${response.status} (${duration}ms)`);
+        console.log(`[TEST-LOCAL] Test result: ${response.status} (${duration}ms)`);
 
         res.json({
             ok: true,
             result
         });
     } catch (err) {
-        console.error(" [TEST-LOCAL] Test execution failed:", err.message);
+        console.error("[TEST-LOCAL] Test execution failed:", err.message);
         res.json({
             ok: false,
             error: err.message,
@@ -2065,7 +2126,7 @@ app.post("/workspace/test-local/execute", async (req, res) => {
  * Returns stored test results
  */
 app.get("/workspace/test-local/results", (req, res) => {
-    console.log(" [TEST-LOCAL] Getting test results...");
+    console.log("[TEST-LOCAL] Getting test results...");
 
     res.json({
         ok: true,
@@ -2079,7 +2140,7 @@ app.get("/workspace/test-local/results", (req, res) => {
  * Clears stored test results
  */
 app.post("/workspace/test-local/clear-results", (req, res) => {
-    console.log(" [TEST-LOCAL] Clearing test results...");
+    console.log("[TEST-LOCAL] Clearing test results...");
 
     TEST_LOCAL_STATE.testResults = [];
 
@@ -2096,7 +2157,7 @@ app.post("/workspace/test-local/clear-results", (req, res) => {
 app.get("/workspace/test-local/logs", (req, res) => {
     const limit = parseInt(req.query.limit) || 500;
 
-    console.log(` [TEST-LOCAL] Getting logs (limit: ${limit})`);
+    console.log(`[TEST-LOCAL] Getting logs (limit: ${limit})`);
 
     const logs = TEST_LOCAL_STATE.serverLogs.slice(-limit);
 
@@ -2115,7 +2176,7 @@ app.get("/workspace/controllers", async (req, res) => {
     if (!wsRoot) return res.status(400).json({ error: "workspace not set" });
 
     try {
-        console.log(" [CONTROLLERS] Discovering controllers...");
+        console.log("[CONTROLLERS] Discovering controllers...");
 
         const scanner = new WorkspaceScanner(wsRoot);
         const structure = await scanner.scan();
@@ -2123,14 +2184,14 @@ app.get("/workspace/controllers", async (req, res) => {
         const controllerAnalyzer = new ControllerAnalyzer(wsRoot);
         const apiDocs = await controllerAnalyzer.generateApiDocs(structure.files);
 
-        console.log(` [CONTROLLERS] Found ${apiDocs.totalEndpoints} endpoints in ${apiDocs.totalControllers} controllers`);
+        console.log(`[CONTROLLERS] Found ${apiDocs.totalEndpoints} endpoints in ${apiDocs.totalControllers} controllers`);
 
         res.json({
             ok: true,
             ...apiDocs
         });
     } catch (err) {
-        console.error(" [CONTROLLERS] Failed:", err.message);
+        console.error("[CONTROLLERS] Failed:", err.message);
         res.status(500).json({ ok: false, error: err.message });
     }
 });
@@ -2141,7 +2202,7 @@ app.get("/workspace/dtos", async (req, res) => {
     if (!wsRoot) return res.status(400).json({ error: "workspace not set" });
 
     try {
-        console.log(" [DTOS] Analyzing DTOs...");
+        console.log("[DTOS] Analyzing DTOs...");
 
         const scanner = new WorkspaceScanner(wsRoot);
         const structure = await scanner.scan();
@@ -2152,14 +2213,14 @@ app.get("/workspace/dtos", async (req, res) => {
         const dtoAnalyzer = new DTOAnalyzer(wsRoot);
         const payloadDocs = await dtoAnalyzer.generatePayloadDocs(structure.files, apiDocs.endpoints);
 
-        console.log(` [DTOS] Found ${payloadDocs.totalDtos} DTOs`);
+        console.log(`[DTOS] Found ${payloadDocs.totalDtos} DTOs`);
 
         res.json({
             ok: true,
             ...payloadDocs
         });
     } catch (err) {
-        console.error(" [DTOS] Failed:", err.message);
+        console.error("[DTOS] Failed:", err.message);
         res.status(500).json({ ok: false, error: err.message });
     }
 });
@@ -2170,19 +2231,19 @@ app.get("/workspace/config", async (req, res) => {
     if (!wsRoot) return res.status(400).json({ error: "workspace not set" });
 
     try {
-        console.log(" [CONFIG] Analyzing configuration...");
+        console.log("[CONFIG] Analyzing configuration...");
 
         const configAnalyzer = new ConfigAnalyzer(wsRoot);
         const config = await configAnalyzer.analyze();
 
-        console.log(` [CONFIG] Server port: ${config.server.port}`);
+        console.log(`[CONFIG] Server port: ${config.server.port}`);
 
         res.json({
             ok: true,
             ...config
         });
     } catch (err) {
-        console.error(" [CONFIG] Failed:", err.message);
+        console.error("[CONFIG] Failed:", err.message);
         res.status(500).json({ ok: false, error: err.message });
     }
 });
@@ -2251,7 +2312,7 @@ app.post("/workspace/safe-patch", async (req, res) => {
     const { diff, incidentId } = req.body || {};
     if (!diff) return res.status(400).json({ error: "diff is required" });
 
-    console.log(` Safe patch requested for incident: ${incidentId || 'unknown'}`);
+    console.log(`Safe patch requested for incident: ${incidentId || 'unknown'}`);
 
     try {
         // 1. Validate diff
@@ -2266,7 +2327,7 @@ app.post("/workspace/safe-patch", async (req, res) => {
 
         // 2. Extract target files
         const targetFiles = extractTargetFiles(diff);
-        console.log(` Target files: ${targetFiles.join(', ')}`);
+        console.log(`Target files: ${targetFiles.join(', ')}`);
 
         // 3. Create backup
         const backupId = `backup-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`;
@@ -2297,23 +2358,23 @@ app.post("/workspace/safe-patch", async (req, res) => {
             }
             saveBackupIndex();
         } catch (e) {
-            console.warn(` Could not persist backup to disk: ${e.message}`);
+            console.warn(`Could not persist backup to disk: ${e.message}`);
         }
 
         // Cleanup old backups if exceeded max
         if (BACKUPS.size > MAX_BACKUPS) {
             const oldest = Array.from(BACKUPS.keys())[0];
             BACKUPS.delete(oldest);
-            console.log(` Removed old backup: ${oldest}`);
+            console.log(`Removed old backup: ${oldest}`);
             saveBackupIndex();
         }
 
-        console.log(` Backup created: ${backupId} (${backupFiles.length} files)`);
+        console.log(`Backup created: ${backupId} (${backupFiles.length} files)`);
 
         // 4. Apply patch
         try {
             const result = await applyUnifiedDiff(wsRoot, diff);
-            console.log(` Patch applied successfully: ${result.target}`);
+            console.log(`Patch applied successfully: ${result.target}`);
 
             res.json({
                 ok: true,
@@ -2324,7 +2385,7 @@ app.post("/workspace/safe-patch", async (req, res) => {
             });
         } catch (patchError) {
             // 5. Rollback on failure
-            console.error(` Patch failed, rolling back: ${patchError.message}`);
+            console.error(`Patch failed, rolling back: ${patchError.message}`);
 
             for (const file of backupFiles) {
                 const fullPath = path.join(wsRoot, file.path);
@@ -2341,7 +2402,7 @@ app.post("/workspace/safe-patch", async (req, res) => {
             });
         }
     } catch (err) {
-        console.error(` Safe patch error: ${err.message}`);
+        console.error(`Safe patch error: ${err.message}`);
         res.status(500).json({ ok: false, error: err.message });
     }
 });
@@ -2362,7 +2423,7 @@ app.post("/workspace/patch/dry-run", async (req, res) => {
     const { diff } = req.body || {};
     if (!diff) return res.status(400).json({ error: "diff is required" });
 
-    console.log(` Dry-run patch validation requested`);
+    console.log(`Dry-run patch validation requested`);
 
     try {
         // 1. Validate diff format
@@ -2413,7 +2474,7 @@ app.post("/workspace/patch/dry-run", async (req, res) => {
         const allFilesExist = fileChecks.every(f => f.exists || diff.includes('--- /dev/null'));
         const missingFiles = fileChecks.filter(f => !f.exists && !diff.includes('--- /dev/null'));
 
-        console.log(` Dry-run complete: ${targetFiles.length} files, ${hunkCount} hunks`);
+        console.log(`Dry-run complete: ${targetFiles.length} files, ${hunkCount} hunks`);
 
         res.json({
             ok: true,
@@ -2426,7 +2487,7 @@ app.post("/workspace/patch/dry-run", async (req, res) => {
             warnings: missingFiles.length > 0 ? [`${missingFiles.length} file(s) not found`] : []
         });
     } catch (err) {
-        console.error(` Dry-run error: ${err.message}`);
+        console.error(`Dry-run error: ${err.message}`);
         res.status(500).json({ ok: false, error: err.message });
     }
 });
@@ -2494,7 +2555,7 @@ app.post("/workspace/backup", async (req, res) => {
             incidentId: incidentId || null
         });
 
-        console.log(` Manual backup created: ${backupId}`);
+        console.log(`Manual backup created: ${backupId}`);
 
         res.json({
             ok: true,
@@ -2503,7 +2564,7 @@ app.post("/workspace/backup", async (req, res) => {
             timestamp: new Date().toISOString()
         });
     } catch (err) {
-        console.error(` Backup error: ${err.message}`);
+        console.error(`Backup error: ${err.message}`);
         res.status(500).json({ ok: false, error: err.message });
     }
 });
@@ -2535,14 +2596,14 @@ app.post("/workspace/rollback", async (req, res) => {
     }
 
     try {
-        console.log(` Rolling back to backup: ${backupId}`);
+        console.log(`Rolling back to backup: ${backupId}`);
 
         for (const file of backup.files) {
             const fullPath = path.join(wsRoot, file.path);
             await writeFile(fullPath, file.content, 'utf8');
         }
 
-        console.log(` Rollback completed: ${backup.files.length} files restored`);
+        console.log(`Rollback completed: ${backup.files.length} files restored`);
 
         res.json({
             ok: true,
@@ -2551,7 +2612,7 @@ app.post("/workspace/rollback", async (req, res) => {
             timestamp: backup.timestamp
         });
     } catch (err) {
-        console.error(` Rollback error: ${err.message}`);
+        console.error(`Rollback error: ${err.message}`);
         res.status(500).json({ ok: false, error: err.message });
     }
 });
@@ -2591,7 +2652,7 @@ app.delete("/workspace/backups/:backupId", (req, res) => {
     }
 
     BACKUPS.delete(backupId);
-    console.log(` Backup deleted: ${backupId}`);
+    console.log(`Backup deleted: ${backupId}`);
 
     res.json({
         ok: true,
@@ -2650,7 +2711,7 @@ app.get("/workspace/diff/by-incident/:incidentId", async (req, res) => {
     }
 
     if (!matchedBackup) {
-        console.log(` No backup found for incident ${incidentId}. Available backups:`, Array.from(BACKUPS.keys()));
+        console.log(`No backup found for incident ${incidentId}. Available backups:`, Array.from(BACKUPS.keys()));
         return res.status(404).json({
             ok: false,
             error: "No backup found for this incident",
@@ -2659,7 +2720,7 @@ app.get("/workspace/diff/by-incident/:incidentId", async (req, res) => {
         });
     }
 
-    console.log(` Found backup ${matchedBackupId} for incident ${incidentId}`);
+    console.log(`Found backup ${matchedBackupId} for incident ${incidentId}`);
 
     // Reuse the diff logic
     try {
@@ -2696,7 +2757,7 @@ app.get("/workspace/diff/by-incident/:incidentId", async (req, res) => {
             files: diffs
         });
     } catch (err) {
-        console.error(` Diff error: ${err.message}`);
+        console.error(`Diff error: ${err.message}`);
         res.status(500).json({ ok: false, error: err.message });
     }
 });
@@ -2768,7 +2829,7 @@ app.get("/workspace/diff/:backupId", async (req, res) => {
             }
         }
 
-        console.log(` Diff for ${backupId}: ${diffs.length} file(s) changed`);
+        console.log(`Diff for ${backupId}: ${diffs.length} file(s) changed`);
 
         res.json({
             ok: true,
@@ -2780,7 +2841,7 @@ app.get("/workspace/diff/:backupId", async (req, res) => {
             files: diffs
         });
     } catch (err) {
-        console.error(` Diff error: ${err.message}`);
+        console.error(`Diff error: ${err.message}`);
         res.status(500).json({ ok: false, error: err.message });
     }
 });
@@ -2813,7 +2874,7 @@ app.get("/workspace/detect-port", async (req, res) => {
 
     try {
         const fullPath = path.join(wsRoot, servicePath);
-        console.log(` Detecting port for service at: ${fullPath}`);
+        console.log(`Detecting port for service at: ${fullPath}`);
 
         let port = null;
         let detectionMethod = null;
@@ -2848,7 +2909,7 @@ app.get("/workspace/detect-port", async (req, res) => {
             detectionMethod = 'global-detection';
         }
 
-        console.log(` Detected port: ${port || 'default'} via ${detectionMethod}`);
+        console.log(`Detected port: ${port || 'default'} via ${detectionMethod}`);
 
         res.json({
             ok: true,
@@ -2859,7 +2920,7 @@ app.get("/workspace/detect-port", async (req, res) => {
             servicePath: servicePath || '/'
         });
     } catch (err) {
-        console.error(' Error detecting port:', err.message);
+        console.error('Error detecting port:', err.message);
         res.status(500).json({ ok: false, error: err.message });
     }
 });
@@ -3070,7 +3131,7 @@ app.post("/workspace/test-local/prepare", async (req, res) => {
     if (!wsRoot) return res.status(400).json({ error: "workspace not set" });
 
     try {
-        console.log(" [TEST-LOCAL] Preparing test environment...");
+        console.log("[TEST-LOCAL] Preparing test environment...");
         TEST_LOCAL_STATE.status = "compiling";
 
         // Step 1: Compile
@@ -3110,7 +3171,7 @@ app.post("/workspace/test-local/prepare", async (req, res) => {
         const config = await configAnalyzer.analyze();
         TEST_LOCAL_STATE.config = config;
 
-        console.log(` [TEST-LOCAL] Prepared: ${payloadDocs.endpoints.length} endpoints discovered`);
+        console.log(`[TEST-LOCAL] Prepared: ${payloadDocs.endpoints.length} endpoints discovered`);
 
         res.json({
             ok: true,
@@ -3133,7 +3194,7 @@ app.post("/workspace/test-local/prepare", async (req, res) => {
             endpoints: payloadDocs.endpoints
         });
     } catch (err) {
-        console.error(" [TEST-LOCAL] Prepare failed:", err.message);
+        console.error("[TEST-LOCAL] Prepare failed:", err.message);
         TEST_LOCAL_STATE.status = "error";
         res.status(500).json({ ok: false, error: err.message });
     }
@@ -3335,9 +3396,9 @@ app.post("/workspace/scan-files", async (req, res) => {
         });
     }
 
-    console.log(` [SCAN-FILES] Scanning: ${workspaceRoot}`);
-    console.log(`   Extensions: ${includeExtensions.join(", ")}`);
-    console.log(`   Exclude: ${excludePatterns.join(", ")}`);
+    console.log(`[SCAN-FILES] Scanning: ${workspaceRoot}`);
+    console.log(`Extensions: ${includeExtensions.join(", ")}`);
+    console.log(`Exclude: ${excludePatterns.join(", ")}`);
 
     try {
         const files = [];
@@ -3387,13 +3448,13 @@ app.post("/workspace/scan-files", async (req, res) => {
                     }
                 }
             } catch (error) {
-                console.warn(` Cannot read directory ${dir}: ${error.message}`);
+                console.warn(`Cannot read directory ${dir}: ${error.message}`);
             }
         }
 
         await scanDir(workspaceRoot);
 
-        console.log(` [SCAN-FILES] Found ${files.length} files`);
+        console.log(`[SCAN-FILES] Found ${files.length} files`);
 
         res.json({
             success: true,
@@ -3403,7 +3464,7 @@ app.post("/workspace/scan-files", async (req, res) => {
         });
 
     } catch (error) {
-        console.error(` [SCAN-FILES] Error: ${error.message}`);
+        console.error(`[SCAN-FILES] Error: ${error.message}`);
         res.status(500).json({
             success: false,
             error: error.message,
@@ -3432,7 +3493,7 @@ app.post("/workspace/read-file", async (req, res) => {
         });
     }
 
-    console.log(` [READ-FILE] Reading: ${filePath}`);
+    console.log(`[READ-FILE] Reading: ${filePath}`);
 
     try {
         const fs = await import("fs/promises");
@@ -3463,7 +3524,7 @@ app.post("/workspace/read-file", async (req, res) => {
         });
 
     } catch (error) {
-        console.error(` [READ-FILE] Error: ${error.message}`);
+        console.error(`[READ-FILE] Error: ${error.message}`);
         res.status(404).json({
             success: false,
             error: error.message,
@@ -3492,7 +3553,7 @@ app.post("/workspace/read-files", async (req, res) => {
         });
     }
 
-    console.log(` [READ-FILES] Reading ${filePaths.length} files`);
+    console.log(`[READ-FILES] Reading ${filePaths.length} files`);
 
     try {
         const fs = await import("fs/promises");
@@ -3519,7 +3580,7 @@ app.post("/workspace/read-files", async (req, res) => {
             }
         }
 
-        console.log(` [READ-FILES] Read ${Object.keys(files).length} files, ${errors.length} errors`);
+        console.log(`[READ-FILES] Read ${Object.keys(files).length} files, ${errors.length} errors`);
 
         res.json({
             success: true,
@@ -3529,7 +3590,7 @@ app.post("/workspace/read-files", async (req, res) => {
         });
 
     } catch (error) {
-        console.error(` [READ-FILES] Error: ${error.message}`);
+        console.error(`[READ-FILES] Error: ${error.message}`);
         res.status(500).json({
             success: false,
             error: error.message
@@ -3547,7 +3608,7 @@ app.post("/workspace/read-files", async (req, res) => {
  * Abre o file picker nativo do sistema operacional
  */
 app.get("/system/folder-picker", async (req, res) => {
-    console.log(` [FOLDER-PICKER] Opening native folder picker...`);
+    console.log(`[FOLDER-PICKER] Opening native folder picker...`);
 
     try {
         const platform = process.platform;
@@ -3630,7 +3691,7 @@ app.get("/system/folder-picker", async (req, res) => {
             selectedPath = selectedPath.slice(0, -1);
         }
 
-        console.log(` [FOLDER-PICKER] Selected: ${selectedPath}`);
+        console.log(`[FOLDER-PICKER] Selected: ${selectedPath}`);
 
         res.json({
             success: true,
@@ -3639,7 +3700,7 @@ app.get("/system/folder-picker", async (req, res) => {
         });
 
     } catch (error) {
-        console.error(` [FOLDER-PICKER] Error:`, error.message);
+        console.error(`[FOLDER-PICKER] Error:`, error.message);
         res.status(500).json({
             success: false,
             error: error.message,
@@ -3681,7 +3742,7 @@ app.get("/workspace/api-docs", async (req, res) => {
         });
     }
 
-    console.log(` [API-DOCS] Analyzing controllers in ${wsRoot}`);
+    console.log(`[API-DOCS] Analyzing controllers in ${wsRoot}`);
 
     try {
         // Primeiro, escanear arquivos do workspace
@@ -3720,13 +3781,13 @@ app.get("/workspace/api-docs", async (req, res) => {
 
         await scanDir(wsRoot);
 
-        console.log(` [API-DOCS] Found ${files.length} Java files`);
+        console.log(`[API-DOCS] Found ${files.length} Java files`);
 
         // Agora analisar os controllers
         const controllerAnalyzer = new ControllerAnalyzer(wsRoot);
         const apiDocs = await controllerAnalyzer.generateApiDocs(files);
 
-        console.log(` [API-DOCS] Found ${apiDocs.totalEndpoints} endpoints in ${apiDocs.totalControllers} controllers`);
+        console.log(`[API-DOCS] Found ${apiDocs.totalEndpoints} endpoints in ${apiDocs.totalControllers} controllers`);
 
         res.json({
             success: true,
@@ -3738,7 +3799,7 @@ app.get("/workspace/api-docs", async (req, res) => {
         });
 
     } catch (error) {
-        console.error(` [API-DOCS] Error:`, error.message);
+        console.error(`[API-DOCS] Error:`, error.message);
 
         res.json({
             success: false,
@@ -3765,7 +3826,7 @@ app.get("/workspace/api-docs/:controller", async (req, res) => {
     }
 
     const { controller } = req.params;
-    console.log(` [API-DOCS] Getting endpoints for controller: ${controller}`);
+    console.log(`[API-DOCS] Getting endpoints for controller: ${controller}`);
 
     try {
         // Primeiro, escanear arquivos do workspace
@@ -3840,7 +3901,7 @@ app.get("/workspace/api-docs/:controller", async (req, res) => {
         });
 
     } catch (error) {
-        console.error(` [API-DOCS] Error:`, error.message);
+        console.error(`[API-DOCS] Error:`, error.message);
         res.status(500).json({
             success: false,
             error: error.message
@@ -3930,7 +3991,7 @@ app.get("/workspace/smart-config", async (req, res) => {
         return res.status(400).json({ error: "workspace not set" });
     }
 
-    console.log(" [SMART-CONFIG] Collecting configuration files...");
+    console.log("[SMART-CONFIG] Collecting configuration files...");
 
     try {
         const configPatterns = [
@@ -3964,9 +4025,9 @@ app.get("/workspace/smart-config", async (req, res) => {
                             : content,
                         size: content.length
                     });
-                    console.log(` Found: ${pattern}`);
+                    console.log(`Found: ${pattern}`);
                 } catch (err) {
-                    console.error(` Error reading ${pattern}: ${err.message}`);
+                    console.error(`Error reading ${pattern}: ${err.message}`);
                 }
             }
         }
@@ -3982,7 +4043,7 @@ app.get("/workspace/smart-config", async (req, res) => {
             });
         }
 
-        console.log(` Collected ${collectedFiles.length} files, profiles: ${availableProfiles.join(', ')}`);
+        console.log(`Collected ${collectedFiles.length} files, profiles: ${availableProfiles.join(', ')}`);
 
         res.json({
             ok: true,
@@ -3996,7 +4057,7 @@ app.get("/workspace/smart-config", async (req, res) => {
         });
 
     } catch (err) {
-        console.error(" [SMART-CONFIG] Error:", err.message);
+        console.error("[SMART-CONFIG] Error:", err.message);
         res.status(500).json({ ok: false, error: err.message });
     }
 });
@@ -4007,7 +4068,7 @@ app.get("/workspace/smart-config", async (req, res) => {
  */
 app.post("/workspace/test-local/restart", async (req, res) => {
     try {
-        console.log(" [TEST-LOCAL] Restarting server...");
+        console.log("[TEST-LOCAL] Restarting server...");
 
         // Stop
         await processManager.stop('test-local');
@@ -4052,7 +4113,7 @@ app.post("/workspace/test-local/restart", async (req, res) => {
         }
 
     } catch (err) {
-        console.error(" [TEST-LOCAL] Restart failed:", err.message);
+        console.error("[TEST-LOCAL] Restart failed:", err.message);
         res.status(500).json({ ok: false, error: err.message });
     }
 });
@@ -4086,7 +4147,7 @@ app.post("/workspace/search", async (req, res) => {
         return res.status(400).json({ ok: false, error: "pattern is required" });
     }
 
-    console.log(` [workspace/search] pattern="${pattern}" filter="${fileFilter || '*'}"`);
+    console.log(`[workspace/search] pattern="${pattern}" filter="${fileFilter || '*'}"`);
 
     try {
         const { execSync } = await import('child_process');
@@ -4144,7 +4205,7 @@ app.post("/workspace/search", async (req, res) => {
             .join('\n');
 
         const count = results.split('\n').filter(l => l.trim()).length;
-        console.log(`   Found ${count} matches`);
+        console.log(`Found ${count} matches`);
 
         res.json({
             ok: true,
@@ -4152,7 +4213,7 @@ app.post("/workspace/search", async (req, res) => {
             count: count
         });
     } catch (err) {
-        console.error(` [workspace/search] Error:`, err.message);
+        console.error(`[workspace/search] Error:`, err.message);
         res.status(500).json({ ok: false, error: err.message });
     }
 });
@@ -4192,14 +4253,14 @@ app.post("/workspace/exec", async (req, res) => {
     ];
     const lowerCmd = command.toLowerCase().trim();
     if (dangerous.some(d => lowerCmd.includes(d))) {
-        console.warn(` [workspace/exec] BLOCKED dangerous command: ${command}`);
+        console.warn(`[workspace/exec] BLOCKED dangerous command: ${command}`);
         return res.status(403).json({
             ok: false,
             error: "Command blocked for security reasons"
         });
     }
 
-    console.log(` [workspace/exec] Running: ${command.substring(0, 120)}...`);
+    console.log(`[workspace/exec] Running: ${command.substring(0, 120)}...`);
 
     try {
         const { exec: execCb } = await import('child_process');
@@ -4213,7 +4274,7 @@ app.post("/workspace/exec", async (req, res) => {
             env: { ...process.env, FORCE_COLOR: '0' }
         });
 
-        console.log(`   Command completed (stdout: ${result.stdout.length} chars)`);
+        console.log(`Command completed (stdout: ${result.stdout.length} chars)`);
 
         res.json({
             ok: true,
@@ -4222,7 +4283,7 @@ app.post("/workspace/exec", async (req, res) => {
             exitCode: 0
         });
     } catch (err) {
-        console.error(`   Command failed (exit: ${err.code}):`, err.message?.substring(0, 200));
+        console.error(`Command failed (exit: ${err.code}):`, err.message?.substring(0, 200));
         res.json({
             ok: false,
             stdout: err.stdout || '',
@@ -4255,7 +4316,7 @@ app.post("/workspace/test-endpoint", async (req, res) => {
         return res.status(403).json({ error: "Only localhost URLs allowed for security" });
     }
 
-    console.log(` Testing: ${method} ${url} (${testName || 'unnamed'})`);
+    console.log(`Testing: ${method} ${url} (${testName || 'unnamed'})`);
 
     const startTime = Date.now();
 
@@ -4305,7 +4366,7 @@ app.post("/workspace/test-endpoint", async (req, res) => {
                 : response.status >= 200 && response.status < 400
         };
 
-        console.log(`    ${response.status} ${response.statusText} (${durationMs}ms) ${result.passed ? '' : ''}`);
+        console.log(`${response.status} ${response.statusText} (${durationMs}ms) ${result.passed ? '' : ''}`);
         res.json(result);
 
     } catch (err) {
@@ -4381,7 +4442,7 @@ app.post("/workspace/git/create-fix-branch", async (req, res) => {
         try {
             const stashResult = execSync('git stash --include-untracked 2>&1', opts).trim();
             hadStash = !stashResult.includes('No local changes');
-            if (hadStash) console.log(' Stashed uncommitted changes');
+            if (hadStash) console.log('Stashed uncommitted changes');
         } catch {}
 
         // 4. Create and checkout new branch (with unique name if exists)
@@ -4405,7 +4466,7 @@ app.post("/workspace/git/create-fix-branch", async (req, res) => {
             try {
                 execSync('git stash pop', opts);
             } catch (e) {
-                console.warn(' Stash pop had conflicts, trying apply:', e.message);
+                console.warn('Stash pop had conflicts, trying apply:', e.message);
                 try { execSync('git stash apply', opts); } catch {}
             }
         }
@@ -4427,6 +4488,13 @@ app.post("/workspace/git/create-fix-branch", async (req, res) => {
         }
 
         // 8. Commit
+        // Ensure git identity is configured (required in Cloud Run environment)
+        try {
+            execSync('git config user.email "ai@deepdebug.ai"', opts);
+            execSync('git config user.name "DeepDebug AI"', opts);
+        } catch (e) {
+            console.warn('Could not set git config:', e.message);
+        }
         const safeMsg = commitMessage.replace(/"/g, '\\"').replace(/\n/g, '\\n');
         execSync(`git commit -m "${safeMsg}"`, opts);
 
@@ -4434,7 +4502,7 @@ app.post("/workspace/git/create-fix-branch", async (req, res) => {
         let pushResult = '';
         let pushed = false;
 
-        console.log(` Git push  gitToken provided: ${!!gitToken}, repoUrl provided: ${!!repoUrl}`);
+        console.log(`Git push  gitToken provided: ${!!gitToken}, repoUrl provided: ${!!repoUrl}`);
 
         // If gitToken provided, set up authenticated remote URL for push
         if (gitToken) {
@@ -4446,11 +4514,11 @@ app.post("/workspace/git/create-fix-branch", async (req, res) => {
                     // No remote configured  use repoUrl from integration if available
                     if (repoUrl) {
                         remoteUrlRaw = repoUrl;
-                        console.log(` No git remote, using repoUrl from integration: ${repoUrl}`);
+                        console.log(`No git remote, using repoUrl from integration: ${repoUrl}`);
                     }
                 }
 
-                console.log(` Remote URL: ${remoteUrlRaw.replace(gitToken, '***')}`);
+                console.log(`Remote URL: ${remoteUrlRaw.replace(gitToken, '***')}`);
                 let authenticatedUrl = '';
 
                 if (remoteUrlRaw.includes('github.com')) {
@@ -4459,7 +4527,7 @@ app.post("/workspace/git/create-fix-branch", async (req, res) => {
                         .replace(/^git@github\.com:/, '')
                         .replace(/\.git$/, '');
                     authenticatedUrl = `https://x-access-token:${gitToken}@github.com/${repoPath}.git`;
-                    console.log(` GitHub auth URL: https://x-access-token:***@github.com/${repoPath}.git`);
+                    console.log(`GitHub auth URL: https://x-access-token:***@github.com/${repoPath}.git`);
                 } else if (remoteUrlRaw.includes('gitlab.com') || remoteUrlRaw.includes('gitlab')) {
                     const repoPath = remoteUrlRaw
                         .replace(/^https?:\/\/(.*@)?[^\/]+\//, '')
@@ -4467,7 +4535,7 @@ app.post("/workspace/git/create-fix-branch", async (req, res) => {
                         .replace(/\.git$/, '');
                     const host = remoteUrlRaw.match(/https?:\/\/([^\/]+)/)?.[1] || 'gitlab.com';
                     authenticatedUrl = `https://oauth2:${gitToken}@${host}/${repoPath}.git`;
-                    console.log(` GitLab auth URL: https://oauth2:***@${host}/${repoPath}.git`);
+                    console.log(`GitLab auth URL: https://oauth2:***@${host}/${repoPath}.git`);
                 } else if (remoteUrlRaw.includes('bitbucket.org') || remoteUrlRaw.includes('bitbucket')) {
                     const repoPath = remoteUrlRaw
                         .replace(/^https?:\/\/(.*@)?bitbucket\.org\//, '')
@@ -4481,11 +4549,11 @@ app.post("/workspace/git/create-fix-branch", async (req, res) => {
                     const urlObj = new URL(remoteUrlRaw.replace(/^git@([^:]+):/, 'https://$1/'));
                     authenticatedUrl = `https://oauth2:${gitToken}@${urlObj.host}${urlObj.pathname}`;
                     if (!authenticatedUrl.endsWith('.git')) authenticatedUrl += '.git';
-                    console.log(` Generic auth URL for ${urlObj.host}`);
+                    console.log(`Generic auth URL for ${urlObj.host}`);
                 }
 
                 if (authenticatedUrl) {
-                    console.log(` Pushing ${finalBranchName} with token auth...`);
+                    console.log(`Pushing ${finalBranchName} with token auth...`);
                     try {
                         // Don't use 2>&1  let execSync capture stderr separately
                         pushResult = execSync(`git push ${authenticatedUrl} ${finalBranchName}`, {
@@ -4494,20 +4562,20 @@ app.post("/workspace/git/create-fix-branch", async (req, res) => {
                             stdio: ['pipe', 'pipe', 'pipe']  // capture stdin, stdout, stderr separately
                         }).toString();
                         pushed = true;
-                        console.log(` Pushed with token authentication`);
+                        console.log(`Pushed with token authentication`);
                     } catch (innerErr) {
                         // Mask token in error messages before logging
                         const maskToken = (str) => str ? str.replace(gitToken, '***TOKEN***') : '';
                         const errMsg = maskToken(innerErr.stderr?.toString() || innerErr.stdout?.toString() || innerErr.message || '');
-                        console.warn(` Authenticated push failed: ${errMsg}`);
+                        console.warn(`Authenticated push failed: ${errMsg}`);
                         pushResult = errMsg;
                     }
                 } else {
-                    console.warn(` Could not construct authenticated URL from: ${remoteUrlRaw}`);
+                    console.warn(`Could not construct authenticated URL from: ${remoteUrlRaw}`);
                 }
             } catch (pushErr) {
                 const maskToken = (str) => str ? str.replace(gitToken, '***TOKEN***') : '';
-                console.warn(` Git auth setup failed: ${maskToken(pushErr.message)}`);
+                console.warn(`Git auth setup failed: ${maskToken(pushErr.message)}`);
                 pushResult = maskToken(pushErr.message) || 'Push setup failed';
             }
         }
@@ -4522,7 +4590,7 @@ app.post("/workspace/git/create-fix-branch", async (req, res) => {
                     pushResult = execSync(`git push origin ${finalBranchName} 2>&1`, opts).toString();
                     pushed = true;
                 } catch (pushErr2) {
-                    console.warn(` Git push failed: ${pushErr2.message}`);
+                    console.warn(`Git push failed: ${pushErr2.message}`);
                     pushResult = pushErr2.message || 'Push failed  no remote configured or auth required';
                 }
             }
@@ -4581,8 +4649,8 @@ app.post("/workspace/git/create-fix-branch", async (req, res) => {
             console.warn('Could not detect remote URL:', e.message);
         }
 
-        console.log(` Fix branch created: ${finalBranchName} (${commitSha.substring(0, 8)}) pushed=${pushed}`);
-        if (mrUrl) console.log(` MR URL: ${mrUrl}`);
+        console.log(`Fix branch created: ${finalBranchName} (${commitSha.substring(0, 8)}) pushed=${pushed}`);
+        if (mrUrl) console.log(`MR URL: ${mrUrl}`);
 
         // 10. Switch back to original branch and merge fix to keep changes on disk
         try {
@@ -4591,7 +4659,7 @@ app.post("/workspace/git/create-fix-branch", async (req, res) => {
             // This keeps the diff viewer working (disk has patched version)
             try {
                 execSync(`git merge ${finalBranchName} --no-edit`, opts);
-                console.log(` Merged ${finalBranchName} into ${currentBranch}`);
+                console.log(`Merged ${finalBranchName} into ${currentBranch}`);
             } catch (mergeErr) {
                 // If merge fails (conflicts), just cherry-pick the changes without committing
                 try {
@@ -4605,7 +4673,7 @@ app.post("/workspace/git/create-fix-branch", async (req, res) => {
                             execSync(`git checkout ${finalBranchName} -- ${f}`, opts);
                         } catch {}
                     }
-                    console.log(` Cherry-picked ${changedFiles.length} file(s) from ${finalBranchName}`);
+                    console.log(`Cherry-picked ${changedFiles.length} file(s) from ${finalBranchName}`);
                 } catch {}
             }
         } catch {}
@@ -4652,14 +4720,14 @@ app.post("/workspace/git/create-fix-branch", async (req, res) => {
                     if (response.ok) {
                         const prData = await response.json();
                         prUrl = prData.html_url;
-                        console.log(` GitHub PR created: ${prUrl}`);
+                        console.log(`GitHub PR created: ${prUrl}`);
                     } else {
                         const errText = await response.text();
-                        console.warn(` GitHub PR creation failed (${response.status}): ${errText.substring(0, 200)}`);
+                        console.warn(`GitHub PR creation failed (${response.status}): ${errText.substring(0, 200)}`);
                         prUrl = mrUrl;
                     }
                 } catch (prErr) {
-                    console.warn(` GitHub PR error: ${prErr.message}`);
+                    console.warn(`GitHub PR error: ${prErr.message}`);
                     prUrl = mrUrl;
                 }
 
@@ -4693,14 +4761,14 @@ app.post("/workspace/git/create-fix-branch", async (req, res) => {
                     if (response.ok) {
                         const mrData = await response.json();
                         prUrl = mrData.web_url;
-                        console.log(` GitLab MR created: ${prUrl}`);
+                        console.log(`GitLab MR created: ${prUrl}`);
                     } else {
                         const errText = await response.text();
-                        console.warn(` GitLab MR creation failed (${response.status}): ${errText.substring(0, 200)}`);
+                        console.warn(`GitLab MR creation failed (${response.status}): ${errText.substring(0, 200)}`);
                         prUrl = mrUrl;
                     }
                 } catch (glErr) {
-                    console.warn(` GitLab MR error: ${glErr.message}`);
+                    console.warn(`GitLab MR error: ${glErr.message}`);
                     prUrl = mrUrl;
                 }
 
@@ -4753,14 +4821,14 @@ app.post("/workspace/git/create-fix-branch", async (req, res) => {
                     if (response.ok) {
                         const prData = await response.json();
                         prUrl = prData.links && prData.links.html ? prData.links.html.href : mrUrl;
-                        console.log(` Bitbucket PR created: ${prUrl}`);
+                        console.log(`Bitbucket PR created: ${prUrl}`);
                     } else {
                         const errText = await response.text();
-                        console.warn(` Bitbucket PR creation failed (${response.status}): ${errText.substring(0, 200)}`);
+                        console.warn(`Bitbucket PR creation failed (${response.status}): ${errText.substring(0, 200)}`);
                         prUrl = mrUrl;
                     }
                 } catch (bbErr) {
-                    console.warn(` Bitbucket PR error: ${bbErr.message}`);
+                    console.warn(`Bitbucket PR error: ${bbErr.message}`);
                     prUrl = mrUrl;
                 }
             }
@@ -4783,7 +4851,7 @@ app.post("/workspace/git/create-fix-branch", async (req, res) => {
         });
 
     } catch (err) {
-        console.error(` Git branch creation failed: ${err.message}`);
+        console.error(`Git branch creation failed: ${err.message}`);
         res.status(500).json({ ok: false, error: err.message });
     }
 });
@@ -4895,7 +4963,7 @@ app.get("/workspace/git/pr/comments", async (req, res) => {
             unresolvedCount: comments.filter(c => c.resolved === false || c.resolved === undefined).length
         });
     } catch (err) {
-        console.error(' Failed to fetch PR comments:', err.message);
+        console.error('Failed to fetch PR comments:', err.message);
         res.status(500).json({ ok: false, error: err.message });
     }
 });
@@ -4932,7 +5000,7 @@ app.get("/workspace/git/pr/comments/:commentId", async (req, res) => {
 
         res.json({ ok: true, comment });
     } catch (err) {
-        console.error(' Failed to fetch PR comment:', err.message);
+        console.error('Failed to fetch PR comment:', err.message);
         res.status(500).json({ ok: false, error: err.message });
     }
 });
@@ -4994,10 +5062,10 @@ app.post("/workspace/git/pr/comments", async (req, res) => {
             comment = await provider.instance.addPRComment(owner, repo, Number(prNumber), body);
         }
 
-        console.log(` PR comment added to PR #${prNumber}: ${body.substring(0, 50)}...`);
+        console.log(`PR comment added to PR #${prNumber}: ${body.substring(0, 50)}...`);
         res.json({ ok: true, comment });
     } catch (err) {
-        console.error(' Failed to add PR comment:', err.message);
+        console.error('Failed to add PR comment:', err.message);
         res.status(500).json({ ok: false, error: err.message });
     }
 });
@@ -5032,10 +5100,10 @@ app.post("/workspace/git/pr/comments/:commentId/resolve", async (req, res) => {
         const { owner, repo } = provider.info;
         const result = await provider.instance.resolvePRComment(owner, repo, Number(prNumber), commentId);
 
-        console.log(` PR comment ${commentId} resolved on PR #${prNumber}`);
+        console.log(`PR comment ${commentId} resolved on PR #${prNumber}`);
         res.json({ ok: true, commentId, ...result });
     } catch (err) {
-        console.error(' Failed to resolve PR comment:', err.message);
+        console.error('Failed to resolve PR comment:', err.message);
         res.status(500).json({ ok: false, error: err.message });
     }
 });
@@ -5070,10 +5138,10 @@ app.post("/workspace/git/pr/comments/:commentId/unresolve", async (req, res) =>
         const { owner, repo } = provider.info;
         const result = await provider.instance.unresolvePRComment(owner, repo, Number(prNumber), commentId);
 
-        console.log(` PR comment ${commentId} unresolve on PR #${prNumber}`);
+        console.log(`PR comment ${commentId} unresolve on PR #${prNumber}`);
         res.json({ ok: true, commentId, ...result });
     } catch (err) {
-        console.error(' Failed to unresolve PR comment:', err.message);
+        console.error('Failed to unresolve PR comment:', err.message);
         res.status(500).json({ ok: false, error: err.message });
     }
 });
@@ -5118,9 +5186,9 @@ app.post("/workspace/git/pr/comments/:commentId/fix-and-resolve", async (req, re
             return res.status(404).json({ error: "Comment not found" });
         }
 
-        console.log(` AI Fix & Resolve: PR #${prNumber}, comment ${commentId}`);
-        console.log(`   File: ${comment.path || '(general)'}, Line: ${comment.line || 'N/A'}`);
-        console.log(`   Request: ${comment.body.substring(0, 100)}...`);
+        console.log(`AI Fix & Resolve: PR #${prNumber}, comment ${commentId}`);
+        console.log(`File: ${comment.path || '(general)'}, Line: ${comment.line || 'N/A'}`);
+        console.log(`Request: ${comment.body.substring(0, 100)}...`);
 
         // 2. Return the comment info for the Gateway to orchestrate the AI fix
         // The actual AI analysis + patch is handled by the Gateway's AI service,
@@ -5150,7 +5218,7 @@ app.post("/workspace/git/pr/comments/:commentId/fix-and-resolve", async (req, re
             message: 'Comment fetched. Gateway should now: 1) Read file, 2) AI analyze, 3) Apply patch, 4) Commit, 5) Reply, 6) Resolve'
         });
     } catch (err) {
-        console.error(' Failed to prepare fix-and-resolve:', err.message);
+        console.error('Failed to prepare fix-and-resolve:', err.message);
         res.status(500).json({ ok: false, error: err.message });
     }
 });
@@ -5173,7 +5241,7 @@ async function _getGitProvider() {
         try {
             remoteUrl = execSync('git remote get-url origin', opts).trim();
         } catch {
-            console.warn(' No git remote found');
+            console.warn('No git remote found');
             return null;
         }
 
@@ -5183,7 +5251,7 @@ async function _getGitProvider() {
         const providerId = registry.detectProviderFromUrl(remoteUrl);
 
         if (!providerId) {
-            console.warn(` Unknown git provider for URL: ${remoteUrl}`);
+            console.warn(`Unknown git provider for URL: ${remoteUrl}`);
             return null;
         }
 
@@ -5198,7 +5266,7 @@ async function _getGitProvider() {
         }
 
         if (!token) {
-            console.warn(` No token found for ${providerId}. Set ${providerId.toUpperCase()}_TOKEN or GIT_TOKEN env var.`);
+            console.warn(`No token found for ${providerId}. Set ${providerId.toUpperCase()}_TOKEN or GIT_TOKEN env var.`);
             return null;
         }
 
@@ -5218,7 +5286,7 @@ async function _getGitProvider() {
 
         return { instance, info, providerId, remoteUrl };
     } catch (err) {
-        console.error(' Failed to initialize git provider:', err.message);
+        console.error('Failed to initialize git provider:', err.message);
         return null;
     }
 }
@@ -5308,7 +5376,7 @@ app.post("/workspace/:workspaceId/run", async (req, res) => {
 // ============================================
 async function startWebSocketTunnel(port, gatewayUrl, apiKey, tenantId) {
     if (!gatewayUrl || !apiKey || !tenantId) {
-        console.log('  WebSocket tunnel skipped: missing gatewayUrl, apiKey or tenantId in ~/.deepdebug/config.json');
+        console.log('WebSocket tunnel skipped: missing gatewayUrl, apiKey or tenantId in ~/.deepdebug/config.json');
         return;
     }
 
@@ -5326,7 +5394,7 @@ async function startWebSocketTunnel(port, gatewayUrl, apiKey, tenantId) {
             ws = new WebSocket(fullUrl);
 
             ws.on('open', () => {
-                console.log(` WebSocket tunnel connected to Gateway`);
+                console.log(`WebSocket tunnel connected to Gateway`);
                 reconnectDelay = 2000;
                 ws.send(JSON.stringify({ type: 'register', tenantId, port, workspacePath: WORKSPACE_ROOT || null }));
                 const hb = setInterval(() => {
@@ -5342,7 +5410,7 @@ async function startWebSocketTunnel(port, gatewayUrl, apiKey, tenantId) {
                 try { request = JSON.parse(text); } catch { return; }
                 const { requestId, command, params } = request;
                 if (!requestId || !command) return;
-                console.log(` WS command: ${command}`);
+                console.log(`WS command: ${command}`);
                 let result;
                 try { result = await handleWsCommand(command, params || {}); }
                 catch (err) { result = { error: err.message }; }
@@ -5351,19 +5419,19 @@ async function startWebSocketTunnel(port, gatewayUrl, apiKey, tenantId) {
 
             ws.on('close', () => {
                 if (!isShuttingDown) {
-                    console.log(` WS disconnected. Reconnecting in ${reconnectDelay/1000}s...`);
+                    console.log(`WS disconnected. Reconnecting in ${reconnectDelay/1000}s...`);
                     setTimeout(connect, reconnectDelay);
                     reconnectDelay = Math.min(reconnectDelay * 2, 30000);
                 }
             });
 
-            ws.on('error', (err) => console.warn(` WS error: ${err.message}`));
+            ws.on('error', (err) => console.warn(`WS error: ${err.message}`));
 
         } catch (err) {
             if (err.code === 'ERR_MODULE_NOT_FOUND') {
-                console.warn(' WebSocket tunnel requires "ws" package. Run: npm install ws');
+                console.warn('WebSocket tunnel requires "ws" package. Run: npm install ws');
             } else {
-                console.warn(` WS tunnel error: ${err.message}`);
+                console.warn(`WS tunnel error: ${err.message}`);
                 setTimeout(connect, reconnectDelay);
                 reconnectDelay = Math.min(reconnectDelay * 2, 30000);
             }
@@ -5434,7 +5502,7 @@ async function startWebSocketTunnel(port, gatewayUrl, apiKey, tenantId) {
                     return { error: 'backupId or incidentId is required' };
                 }
 
-                console.log(` WS workspace.diff  ${endpoint}`);
+                console.log(`WS workspace.diff  ${endpoint}`);
                 const res = await fetch(`${localBase}${endpoint}`, {
                     method: 'GET',
                     headers: { 'Content-Type': 'application/json' }
@@ -5568,7 +5636,7 @@ async function startWebSocketTunnel(port, gatewayUrl, apiKey, tenantId) {
 }
 
 // ============================================
-// 🤖 SETUP AGENT ROUTES
+//  SETUP AGENT ROUTES
 // Supports the AI Assistant chat commands
 // ============================================
 
@@ -5585,7 +5653,7 @@ app.post("/setup/run-command", async (req, res) => {
         return res.status(403).json({ ok: false, error: "Command blocked for safety" });
     }
 
-    console.log(`🤖 [SetupAgent] Running: ${command.substring(0, 100)}`);
+    console.log(`[SetupAgent] Running: ${command.substring(0, 100)}`);
     const { exec: execCb } = await import('child_process');
     const { promisify } = await import('util');
     const execAsync = promisify(execCb);
@@ -5683,10 +5751,10 @@ app.post("/setup/run-auth-command", async (req, res) => {
 
     const { exec: execCb } = await import('child_process');
     const bgCmd = process.platform === 'win32' ? `start cmd /c "${command}"` : `${command} &`;
-    console.log(`🔐 [SetupAgent] Starting auth: ${command.substring(0, 80)}`);
+    console.log(`[SetupAgent] Starting auth: ${command.substring(0, 80)}`);
 
     execCb(bgCmd, { shell: true }, (err) => {
-        if (err) console.warn(`⚠️ Auth command warning: ${err.message}`);
+        if (err) console.warn(`Auth command warning: ${err.message}`);
     });
 
     res.json({ ok: true, status: "started", session_id, message: "Auth command started, browser should open" });
@@ -5730,13 +5798,13 @@ app.get("/setup/auth-status", async (req, res) => {
 // ============================================
 app.listen(PORT, '0.0.0.0', async () => {
     console.log(`\n DeepDebug Local Agent listening on port ${PORT}`);
-    console.log(` Environment: ${process.env.NODE_ENV || 'development'}`);
-    console.log(` Process Manager initialized`);
-    console.log(` Backup system ready (max: ${MAX_BACKUPS} backups)`);
-    console.log(` AI Vibe Coding Engine: ${aiEngine?.isActive ? 'ACTIVE' : 'DISABLED'}`);
+    console.log(`Environment: ${process.env.NODE_ENV || 'development'}`);
+    console.log(`Process Manager initialized`);
+    console.log(`Backup system ready (max: ${MAX_BACKUPS} backups)`);
+    console.log(`AI Vibe Coding Engine: ${aiEngine?.isActive ? 'ACTIVE' : 'DISABLED'}`);
     if (aiEngine) {
-        console.log(`   Gateway URL: ${aiEngine.gatewayUrl}`);
-        console.log(`   Max Retries: ${aiEngine.maxRetries}`);
+        console.log(`Gateway URL: ${aiEngine.gatewayUrl}`);
+        console.log(`Max Retries: ${aiEngine.maxRetries}`);
     }
     console.log(`\n Ready to receive requests!\n`);
 
@@ -5748,7 +5816,7 @@ app.listen(PORT, '0.0.0.0', async () => {
 
     const gwUrl = cfg.gatewayUrl || process.env.GATEWAY_URL;
     const apiKey = cfg.apiKey || process.env.DEEPDEBUG_API_KEY;
-    let tenantId = cfg.tenantId;
+    let tenantId = cfg.tenantId || process.env.TENANT_ID;
     if (!tenantId && apiKey) {
         try {
             const payload = JSON.parse(Buffer.from(apiKey.split('.')[1], 'base64').toString());
@@ -5765,8 +5833,8 @@ app.listen(PORT, '0.0.0.0', async () => {
 try {
     startMCPHttpServer(wsManager, parseInt(MCP_PORT));
 } catch (err) {
-    console.warn(` MCP HTTP Server failed to start: ${err.message}`);
-    console.warn(`   (MCP features disabled, REST API continues normally)`);
+    console.warn(`MCP HTTP Server failed to start: ${err.message}`);
+    console.warn(`(MCP features disabled, REST API continues normally)`);
 }
 
 // Auto-register default workspace in WorkspaceManager