codehere 0.1.0 → 0.2.0

package/dist/domain/services/react-loop.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"react-loop.d.ts","sourceRoot":"","sources":["../../../src/domain/services/react-loop.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,MAAM,WAAW,OAAO;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,MAAM;IACrB,IAAI,EAAE,MAAM,GAAG,OAAO,GAAG,QAAQ,CAAC;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAClC;AAED,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,GAAG,CAAC;IACZ,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,SAAS;IACxB,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,WAAW,CAAC;IACzB,SAAS,EAAE,IAAI,CAAC;CACjB;AAED,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,SAAS,EAAE,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,qBAAa,SAAS;IACpB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,UAAU,CAAgC;IAClD,OAAO,CAAC,mBAAmB,CAAa;IACxC,OAAO,CAAC,sBAAsB,CAAa;IAC3C,OAAO,CAAC,eAAe,CAAkC;gBAE7C,QAAQ,GAAE,MAAW;IAIjC;;OAEG;IACG,OAAO,CACX,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,GAAG,EACZ,eAAe,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,eAAe,KAAK,OAAO,CAAC,OAAO,CAAC,EAC/F,cAAc,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,KAAK,OAAO,CAAC,MAAM,CAAC,EACnE,aAAa,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,WAAW,CAAC,EACvD,aAAa,EAAE,CAAC,WAAW,EAAE,WAAW,KAAK,OAAO,GACnD,OAAO,CAAC,eAAe,CAAC;IAmG3B,aAAa,IAAI,eAAe;CAMjC"}

package/dist/domain/services/react-loop.js

@@ -0,0 +1,110 @@
+/**
+ * Domain Service: ReAct Loop
+ * Implements Thought → Action → Observation cycle
+ */
+export class ReActLoop {
+    maxTurns;
+    trajectory = null;
+    consecutiveFailures = 0;
+    maxConsecutiveFailures = 3;
+    recentToolCalls = new Map(); // Track repeated tool calls
+    constructor(maxTurns = 20) {
+        this.maxTurns = maxTurns;
+    }
+    /**
+     * Execute ReAct loop with infinite loop prevention
+     */
+    async execute(query, context, generateThought, generateAction, executeAction, isFinalAnswer) {
+        this.trajectory = {
+            query,
+            steps: [],
+            success: false,
+        };
+        this.consecutiveFailures = 0;
+        this.recentToolCalls.clear();
+        for (let turn = 0; turn < this.maxTurns; turn++) {
+            // 1. Generate Thought
+            const thought = await generateThought(query, context, this.trajectory);
+            // 2. Generate Action
+            const action = await generateAction(thought, context);
+            // 3. Check for repeated tool calls (infinite loop detection)
+            if (action.type === 'tool') {
+                const toolKey = `${action.name}:${JSON.stringify(action.parameters || {})}`;
+                const callCount = this.recentToolCalls.get(toolKey) || 0;
+                if (callCount >= 2) {
+                    // Same tool called 3+ times with same parameters - likely stuck
+                    this.trajectory.steps.push({
+                        thought,
+                        action,
+                        observation: {
+                            result: null,
+                            success: false,
+                            error: `Infinite loop detected: Tool "${action.name}" called ${callCount + 1} times with same parameters. Stopping to prevent infinite loop.`,
+                        },
+                        timestamp: new Date(),
+                    });
+                    this.trajectory.success = false;
+                    break;
+                }
+                this.recentToolCalls.set(toolKey, callCount + 1);
+            }
+            // 4. Execute Action
+            const observation = await executeAction(action);
+            // 5. Track consecutive failures
+            if (!observation.success) {
+                this.consecutiveFailures++;
+                if (this.consecutiveFailures >= this.maxConsecutiveFailures) {
+                    // Too many consecutive failures - stop to prevent infinite loop
+                    this.trajectory.steps.push({
+                        thought,
+                        action,
+                        observation: {
+                            result: null,
+                            success: false,
+                            error: `Too many consecutive failures (${this.consecutiveFailures}). Stopping to prevent infinite loop. Last error: ${observation.error || 'Unknown error'}`,
+                        },
+                        timestamp: new Date(),
+                    });
+                    this.trajectory.success = false;
+                    break;
+                }
+            }
+            else {
+                // Reset failure counter on success
+                this.consecutiveFailures = 0;
+            }
+            // 6. Record step
+            const step = {
+                thought,
+                action,
+                observation,
+                timestamp: new Date(),
+            };
+            this.trajectory.steps.push(step);
+            // 7. Check if done
+            if (isFinalAnswer(observation)) {
+                this.trajectory.finalAnswer = observation.result;
+                this.trajectory.success = true;
+                break;
+            }
+            // 8. Update context with observation
+            context = { ...context, lastObservation: observation };
+        }
+        // Check if we hit max turns without success
+        if (!this.trajectory.success && this.trajectory.steps.length >= this.maxTurns) {
+            const lastStep = this.trajectory.steps[this.trajectory.steps.length - 1];
+            if (lastStep && !lastStep.observation.error) {
+                // Add error if we hit max turns
+                lastStep.observation.error = `Reached maximum turns (${this.maxTurns}) without finding solution.`;
+            }
+        }
+        return this.trajectory;
+    }
+    getTrajectory() {
+        if (!this.trajectory) {
+            throw new Error('Trajectory not initialized. Execute loop first.');
+        }
+        return this.trajectory;
+    }
+}
+//# sourceMappingURL=react-loop.js.map

package/dist/domain/services/react-loop.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"react-loop.js","sourceRoot":"","sources":["../../../src/domain/services/react-loop.ts"],"names":[],"mappings":"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"}

package/dist/edit.d.ts

@@ -1,18 +1,6 @@
 import type { DiffStats, PolicyResult } from './types.js';
 export declare function parseDiffStats(diffText: string): DiffStats;
 export declare function applyUnifiedDiff(originalContent: string, diffText: string): string;
-/**
- * Generate and validate diff without applying (for dry-run)
- */
-export declare function generateEditDryRun(filepath: string, instruction: string): Promise<{
-    success: boolean;
-    diffText?: string;
-    diffStats?: DiffStats;
-    policyResult?: PolicyResult;
-    error?: string;
-    newContent?: string;
-    syntaxValid?: boolean;
-}>;
 /**
  * Legacy function - kept for backward compatibility
  * Use generateAndApplyEditWithVerification() for new code

package/dist/edit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"edit.d.ts","sourceRoot":"","sources":["../src/edit.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAK1D,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAkC1D;AAED,wBAAgB,gBAAgB,CAAC,eAAe,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAsClF;AAwSD;;GAEG;AACH,wBAAsB,kBAAkB,CACtC,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC;IACT,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC,CAyFD;AAED;;;GAGG;AACH,wBAAsB,oBAAoB,CACxC,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,SAAS,CAAC,EAAE,SAAS,CAAC;IAAC,YAAY,CAAC,EAAE,YAAY,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAwFnG;AAED;;GAEG;AACH,wBAAsB,oCAAoC,CACxD,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EACnB,YAAY,CAAC,EAAE,MAAM,EAAE,GACtB,OAAO,CAAC;IACT,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,OAAO,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;CAC/B,CAAC,CAyFD"}
+{"version":3,"file":"edit.d.ts","sourceRoot":"","sources":["../src/edit.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AA6D1D,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAkC1D;AAED,wBAAgB,gBAAgB,CAAC,eAAe,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAyFlF;AAED;;;GAGG;AACH,wBAAsB,oBAAoB,CACxC,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,SAAS,CAAC,EAAE,SAAS,CAAC;IAAC,YAAY,CAAC,EAAE,YAAY,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAuDnG;AAED;;GAEG;AACH,wBAAsB,oCAAoC,CACxD,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EACnB,YAAY,CAAC,EAAE,MAAM,EAAE,GACtB,OAAO,CAAC;IACT,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,OAAO,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;CAC/B,CAAC,CAyFD"}

package/dist/edit.js

@@ -1,11 +1,63 @@
-import { readFileSync, writeFileSync, existsSync, unlinkSync } from 'fs';
+import { readFileSync, writeFileSync, existsSync } from 'fs';
 import { join } from 'path';
-import { execSync } from 'child_process';
-import { applyPatch, parsePatch } from 'diff';
 import { generateDiff } from './chat.js';
 import { checkPolicy } from './policy.js';
 import { refineTask } from './iterative-refinement.js';
-import { updateFileEmbeddings } from './embed.js';
+/**
+ * Fix duplicate module.exports or export statements
+ */
+function fixDuplicateExports(content) {
+    const lines = content.split('\n');
+    const result = [];
+    let foundModuleExports = false;
+    let foundExport = false;
+    let lastExportIndex = -1;
+    for (let i = 0; i < lines.length; i++) {
+        const line = lines[i].trim();
+        // Check for module.exports
+        if (line.startsWith('module.exports')) {
+            if (foundModuleExports) {
+                // Skip duplicate - keep the last one
+                // Remove previous export from result
+                if (lastExportIndex >= 0) {
+                    result.splice(lastExportIndex, 1);
+                }
+                lastExportIndex = result.length;
+                result.push(lines[i]);
+            }
+            else {
+                foundModuleExports = true;
+                lastExportIndex = result.length;
+                result.push(lines[i]);
+            }
+        }
+        // Check for ES6 export default
+        else if (line.startsWith('export default')) {
+            if (foundExport) {
+                // Skip duplicate
+                if (lastExportIndex >= 0) {
+                    result.splice(lastExportIndex, 1);
+                }
+                lastExportIndex = result.length;
+                result.push(lines[i]);
+            }
+            else {
+                foundExport = true;
+                lastExportIndex = result.length;
+                result.push(lines[i]);
+            }
+        }
+        // Check for ES6 export const/function/class
+        else if (line.match(/^export\s+(const|function|class|let|var)\s+/)) {
+            // These are usually fine (one per line), but check for duplicates
+            result.push(lines[i]);
+        }
+        else {
+            result.push(lines[i]);
+        }
+    }
+    return result.join('\n');
+}
 export function parseDiffStats(diffText) {
     const lines = diffText.split('\n');
     let linesAdded = 0;
@@ -43,75 +95,23 @@ export function parseDiffStats(diffText) {
     return { linesAdded, linesRemoved, filesChanged };
 }
 export function applyUnifiedDiff(originalContent, diffText) {
-    try {
-        // Use the diff package's applyPatch function for reliable patch application
-        const patches = parsePatch(diffText);
-        if (!patches || patches.length === 0) {
-            // Fallback to original content if no valid patches
-            console.warn('No patches parsed from diff');
-            return originalContent;
-        }
-        // Apply all patches
-        let result = originalContent;
-        for (let i = 0; i < patches.length; i++) {
-            const patch = patches[i];
-            const applied = applyPatch(result, patch);
-            if (applied === false) {
-                // Patch application failed - try manual as fallback
-                console.warn(`Patch ${i} failed to apply, using manual fallback`);
-                const manualResult = applyUnifiedDiffManual(result, diffText);
-                // If manual also fails, return original
-                if (manualResult === result) {
-                    console.warn('Manual diff application also failed, returning original content');
-                    return originalContent;
-                }
-                result = manualResult;
-            }
-            else {
-                result = Array.isArray(applied) ? applied.join('\n') : String(applied);
-            }
-        }
-        // Post-process to fix duplicate module.exports
-        return fixDuplicateExports(result);
-    }
-    catch (error) {
-        // If patch application fails, try manual application
-        console.warn(`Patch application error: ${error instanceof Error ? error.message : String(error)}`);
-        return applyUnifiedDiffManual(originalContent, diffText);
-    }
-}
-/**
- * Manual diff application as fallback when applyPatch fails
- * More lenient parsing to handle AI-generated diffs
- */
-function applyUnifiedDiffManual(originalContent, diffText) {
-    // If diff is empty or invalid, return original
-    if (!diffText || !diffText.trim()) {
-        return originalContent;
-    }
     const diffLines = diffText.split('\n');
     const originalLines = originalContent.split('\n');
     const result = [];
     let originalIndex = 0;
     let i = 0;
-    // Skip header lines (---, +++)
-    while (i < diffLines.length && (diffLines[i].startsWith('---') || diffLines[i].startsWith('+++'))) {
-        i++;
-    }
     // Find first hunk
     while (i < diffLines.length && !diffLines[i].startsWith('@@')) {
         i++;
     }
-    if (i >= diffLines.length) {
-        // No hunks found, return original
-        return originalContent;
-    }
     while (i < diffLines.length) {
         const line = diffLines[i];
         if (line.startsWith('@@')) {
+            // Hunk header: @@ -start,count +start,count @@
             const match = line.match(/^@@\s+-(\d+)(?:,(\d+))?\s+\+(\d+)(?:,(\d+))?\s+@@/);
             if (match) {
-                const oldStart = parseInt(match[1], 10) - 1; // Convert to 0-based
+                const oldStart = parseInt(match[1], 10) - 1; // Convert to 0-based (line numbers are 1-based)
+                const oldCount = match[2] ? parseInt(match[2], 10) : 0;
                 // Add lines before this hunk
                 while (originalIndex < oldStart && originalIndex < originalLines.length) {
                     result.push(originalLines[originalIndex]);
@@ -119,25 +119,22 @@ function applyUnifiedDiffManual(originalContent, diffText) {
                 }
                 i++; // Move past hunk header
                 // Process hunk lines
+                let removedCount = 0;
                 while (i < diffLines.length) {
                     const hunkLine = diffLines[i];
                     // Check for next hunk
                     if (hunkLine.startsWith('@@')) {
                         break;
                     }
-                    // Skip empty lines
-                    if (hunkLine.trim() === '') {
-                        i++;
-                        continue;
-                    }
                     if (hunkLine.startsWith('+') && !hunkLine.startsWith('+++')) {
                         // Added line
                         result.push(hunkLine.substring(1));
                         i++;
                     }
                     else if (hunkLine.startsWith('-') && !hunkLine.startsWith('---')) {
-                        // Removed line - skip in original
+                        // Removed line - skip it in original
                         originalIndex++;
+                        removedCount++;
                         i++;
                     }
                     else if (hunkLine.startsWith(' ')) {
@@ -146,12 +143,24 @@ function applyUnifiedDiffManual(originalContent, diffText) {
                             result.push(originalLines[originalIndex]);
                         }
                         originalIndex++;
+                        removedCount++;
+                        i++;
+                    }
+                    else if (hunkLine.trim() === '') {
+                        // Empty line, skip
                         i++;
                     }
                     else {
-                        // Unknown line type - skip
+                        // Unknown line type, skip
                         i++;
                     }
+                    // Safety check: if we've processed all expected removed lines, we might be done
+                    if (oldCount > 0 && removedCount >= oldCount && !diffLines[i]?.startsWith('@@')) {
+                        // Check if next line is part of this hunk or next
+                        if (i < diffLines.length && !diffLines[i].startsWith('@@') && !diffLines[i].startsWith('+') && !diffLines[i].startsWith('-') && !diffLines[i].startsWith(' ')) {
+                            break;
+                        }
+                    }
                 }
             }
             else {
@@ -167,262 +176,7 @@ function applyUnifiedDiffManual(originalContent, diffText) {
         result.push(originalLines[originalIndex]);
         originalIndex++;
     }
-    const appliedContent = result.join('\n');
-    // Only apply post-processing if content actually changed
-    if (appliedContent === originalContent) {
-        return originalContent;
-    }
-    return fixDuplicateExports(appliedContent);
-}
-/**
- * Validate JavaScript/TypeScript syntax
- */
-async function validateSyntax(content, ext, filepath) {
-    if (ext === 'js' || ext === 'jsx') {
-        // Use node --check for reliable syntax validation
-        try {
-            // Write to temp file and check
-            const tempFile = filepath + '.tmp';
-            writeFileSync(tempFile, content, 'utf-8');
-            try {
-                execSync(`node --check "${tempFile}"`, { stdio: 'pipe' });
-                // Clean up temp file
-                if (existsSync(tempFile)) {
-                    unlinkSync(tempFile);
-                }
-                return { valid: true };
-            }
-            catch (error) {
-                // Clean up temp file
-                if (existsSync(tempFile)) {
-                    unlinkSync(tempFile);
-                }
-                const errorMsg = error.stderr?.toString() || error.message || 'Unknown syntax error';
-                return { valid: false, error: errorMsg };
-            }
-        }
-        catch (error) {
-            // Fallback to Function constructor if node check fails
-            try {
-                new Function(content);
-                return { valid: true };
-            }
-            catch (syntaxError) {
-                return {
-                    valid: false,
-                    error: syntaxError instanceof Error ? syntaxError.message : String(syntaxError),
-                };
-            }
-        }
-    }
-    // For TypeScript, use tsc --noEmit
-    if (ext === 'ts' || ext === 'tsx') {
-        try {
-            // Write to temp file and check
-            const tempFile = filepath + '.tmp';
-            writeFileSync(tempFile, content, 'utf-8');
-            try {
-                // Try to find tsc in node_modules or use npx
-                execSync(`npx tsc --noEmit --skipLibCheck "${tempFile}" 2>&1`, { stdio: 'pipe' });
-                // Clean up temp file
-                if (existsSync(tempFile)) {
-                    unlinkSync(tempFile);
-                }
-                return { valid: true };
-            }
-            catch (error) {
-                // Clean up temp file
-                if (existsSync(tempFile)) {
-                    unlinkSync(tempFile);
-                }
-                const errorMsg = error.stderr?.toString() || error.stdout?.toString() || error.message || 'Unknown TypeScript error';
-                // If tsc is not found, that's okay - just skip validation
-                if (errorMsg.includes('command not found') || errorMsg.includes('Cannot find module')) {
-                    return { valid: true }; // Skip if tsc not available
-                }
-                return { valid: false, error: errorMsg };
-            }
-        }
-        catch (error) {
-            // If tsc check fails entirely, skip validation
-            return { valid: true };
-        }
-    }
-    return { valid: true };
-}
-/**
- * Fix duplicate module.exports lines and update exports when functions are renamed
- */
-function fixDuplicateExports(content) {
-    const lines = content.split('\n');
-    const moduleExportsLines = [];
-    // Find all module.exports lines
-    for (let i = 0; i < lines.length; i++) {
-        const line = lines[i].trim();
-        if (line.startsWith('module.exports') && (line.includes('=') || line.includes('{'))) {
-            moduleExportsLines.push(i);
-        }
-    }
-    // If we have duplicates, use the LAST one (most recent/newest)
-    if (moduleExportsLines.length > 1) {
-        // Get the last export line (this is the new/correct one)
-        const lastExportIdx = moduleExportsLines[moduleExportsLines.length - 1];
-        const lastExportLine = lines[lastExportIdx];
-        // Remove all duplicate lines (including the last one, we'll re-add it)
-        for (let i = moduleExportsLines.length - 1; i >= 0; i--) {
-            lines.splice(moduleExportsLines[i], 1);
-        }
-        // Insert the last export line at the position where the last duplicate was
-        // (usually at end of file)
-        const insertPos = lastExportIdx - (moduleExportsLines.length - 1); // Adjust for removed lines
-        lines.splice(insertPos, 0, lastExportLine);
-    }
-    // Now fix exports: find function definitions and update exports to match
-    const contentFixed = lines.join('\n');
-    return updateExportsForRenamedFunctions(contentFixed);
-}
-/**
- * Update module.exports when functions are renamed
- * Detects function renames and updates exports accordingly
- */
-function updateExportsForRenamedFunctions(content) {
-    const lines = content.split('\n');
-    // Find all function definitions
-    const functionDefs = new Map(); // name -> line number
-    for (let i = 0; i < lines.length; i++) {
-        const line = lines[i];
-        // Match: function functionName(...) {
-        const funcMatch = line.match(/function\s+(\w+)\s*\(/);
-        if (funcMatch) {
-            functionDefs.set(funcMatch[1], i);
-        }
-    }
-    // Find module.exports line
-    for (let i = 0; i < lines.length; i++) {
-        const line = lines[i];
-        if (line.trim().startsWith('module.exports') && line.includes('{')) {
-            // Extract exported names
-            const exportMatch = line.match(/module\.exports\s*=\s*\{([^}]+)\}/);
-            if (exportMatch) {
-                const exportedNames = exportMatch[1].split(',').map(n => n.trim()).filter(n => n);
-                // Check if any exported name doesn't exist as a function
-                const missingFunctions = [];
-                const validExports = [];
-                for (const exportName of exportedNames) {
-                    if (functionDefs.has(exportName)) {
-                        validExports.push(exportName);
-                    }
-                    else {
-                        missingFunctions.push(exportName);
-                    }
-                }
-                // If we have missing functions, try to find renamed versions
-                // This is a heuristic: if a function was renamed, the old name might still be in exports
-                if (missingFunctions.length > 0 && validExports.length > 0) {
-                    // Check if there are functions that aren't exported but should be
-                    const allFunctionNames = Array.from(functionDefs.keys());
-                    const missingFromExports = allFunctionNames.filter(name => !exportedNames.includes(name));
-                    // If we have exactly one missing function and one missing export, likely a rename
-                    if (missingFunctions.length === 1 && missingFromExports.length === 1) {
-                        // Replace old name with new name in exports
-                        const oldName = missingFunctions[0];
-                        const newName = missingFromExports[0];
-                        const newExports = exportedNames.map(name => name === oldName ? newName : name);
-                        lines[i] = line.replace(/\{([^}]+)\}/, `{ ${newExports.join(', ')} }`);
-                    }
-                    else {
-                        // Just remove missing functions from exports
-                        lines[i] = line.replace(/\{([^}]+)\}/, `{ ${validExports.join(', ')} }`);
-                    }
-                }
-            }
-            break; // Only process first module.exports
-        }
-    }
-    return lines.join('\n');
-}
-/**
- * Generate and validate diff without applying (for dry-run)
- */
-export async function generateEditDryRun(filepath, instruction) {
-    const fullPath = join(process.cwd(), filepath);
-    if (!existsSync(fullPath)) {
-        return {
-            success: false,
-            error: `File not found: ${filepath}`,
-        };
-    }
-    const originalContent = readFileSync(fullPath, 'utf-8');
-    // Generate diff
-    const diffText = await generateDiff(originalContent, instruction, filepath);
-    if (!diffText || diffText.trim().length === 0) {
-        return {
-            success: false,
-            error: 'No diff generated',
-        };
-    }
-    // Parse diff stats
-    const diffStats = parseDiffStats(diffText);
-    // Check policy
-    const policyResult = checkPolicy(filepath, diffStats);
-    if (!policyResult.allowed) {
-        return {
-            success: false,
-            diffText,
-            policyResult,
-            diffStats,
-            error: policyResult.reason,
-        };
-    }
-    // Apply diff to get new content (but don't write)
-    try {
-        const newContent = applyUnifiedDiff(originalContent, diffText);
-        // Check if content actually changed
-        if (newContent === originalContent) {
-            return {
-                success: false,
-                diffText,
-                diffStats,
-                policyResult,
-                error: 'Diff application resulted in no changes. The generated diff may be invalid or incompatible.',
-            };
-        }
-        // Validate syntax (for JS/TS files)
-        const ext = filepath.split('.').pop()?.toLowerCase();
-        let syntaxValid = true;
-        if (ext === 'js' || ext === 'jsx' || ext === 'ts' || ext === 'tsx') {
-            const syntaxCheck = await validateSyntax(newContent, ext, fullPath);
-            syntaxValid = syntaxCheck.valid;
-            if (!syntaxValid) {
-                return {
-                    success: false,
-                    diffText,
-                    diffStats,
-                    policyResult,
-                    newContent,
-                    syntaxValid: false,
-                    error: `Syntax error in generated code: ${syntaxCheck.error}`,
-                };
-            }
-        }
-        return {
-            success: true,
-            diffText,
-            diffStats,
-            policyResult,
-            newContent,
-            syntaxValid: true,
-        };
-    }
-    catch (error) {
-        return {
-            success: false,
-            diffText,
-            diffStats,
-            policyResult,
-            error: `Failed to apply diff: ${error instanceof Error ? error.message : String(error)}`,
-        };
-    }
+    return result.join('\n');
 }
 /**
  * Legacy function - kept for backward compatibility
@@ -460,36 +214,7 @@ export async function generateAndApplyEdit(filepath, instruction) {
     // Apply diff
     try {
         const newContent = applyUnifiedDiff(originalContent, diffText);
-        // Check if content actually changed
-        if (newContent === originalContent) {
-            return {
-                success: false,
-                diffStats,
-                policyResult,
-                error: 'Diff application resulted in no changes. The generated diff may be invalid or incompatible.',
-            };
-        }
-        // CRITICAL: Validate syntax BEFORE writing (for JS/TS files)
-        // Never write broken files to disk under any condition
-        const ext = filepath.split('.').pop()?.toLowerCase();
-        if (ext === 'js' || ext === 'jsx' || ext === 'ts' || ext === 'tsx') {
-            const syntaxCheck = await validateSyntax(newContent, ext, fullPath);
-            if (!syntaxCheck.valid) {
-                // Syntax invalid - DO NOT WRITE, return error immediately
-                return {
-                    success: false,
-                    diffStats,
-                    policyResult,
-                    error: `Syntax validation failed. File NOT modified. Error: ${syntaxCheck.error}`,
-                };
-            }
-        }
-        // Only write if syntax is valid (or not JS/TS)
         writeFileSync(fullPath, newContent, 'utf-8');
-        // Update embeddings for this file (async, don't wait)
-        updateFileEmbeddings(filepath).catch(() => {
-            // Silently fail - embedding update is optional
-        });
         return {
             success: true,
             diffStats,