agent-nuvira 1.30.0 → 1.31.0

package/README.md

@@ -1337,7 +1337,7 @@ npx tsc --noEmit
 
 ## Roadmap
 
-**Phases 1–3 (25 phases) are complete.** Phase 4 (Industry Standards & Autonomous Polish) is in progress. See [UPGRADE_ROADMAP.md](./UPGRADE_ROADMAP.md) for the full implementation journey.
+**Phases 1–11 are complete** — from Foundation (Phase 0) through TS Compiler API-Aware Structural Editing (Phase 11). See [UPGRADE_ROADMAP.md](./UPGRADE_ROADMAP.md) for the full implementation journey.
 
 > 📊 **Architecture, strategy & contribution materials:** [ARCHITECTURE.md](./ARCHITECTURE.md) — Modular execution engine design with 7 module specifications, extensibility/observability systems, and phased migration plan. [ARCHITECTURE_DIAGRAMS.md](./ARCHITECTURE_DIAGRAMS.md) — Mermaid-rendered versions of all architecture diagrams (Module Architecture, Extensibility, Safe Execution, Data Flow, Observability Bus). [PRODUCT_STRATEGY.md](./PRODUCT_STRATEGY.md) — Competitive landscape, positioning map, OKR framework, and risk register. [PITCH_DECK.md](./PITCH_DECK.md) — 10-slide investor presentation outline with talking points and data. [CONTRIBUTING.md](./CONTRIBUTING.md) — Quick-reference contributor guide with docs map, dev setup, and contribution workflow.
 
@@ -1401,6 +1401,11 @@ npx tsc --noEmit
 | 10.2 | PhaseExecutionEngine — multi-goal project scopes with save/resume across restarts | ✅ Complete (v1.29.0) |
 | 10.3 | `buff publish` — 5-phase pipeline: tests → version → git → npm → GitHub release | ✅ Complete (v1.29.0) |
 | 10.4 | `buff phase` — create/execute/resume/status/list scopes with credential management | ✅ Complete (v1.29.0) |
+| **Phase 11: TS Compiler API-Aware Structural Editing** | | |
+| 11.1 | TS Compiler API Wrapper (`ts-adapter.ts`) — parse, find nodes, validate syntax via real TS parser | ✅ Complete (v1.31.0) |
+| 11.2 | Structural Transformations (`transform.ts`) — rename, extract, inline, add param, change signature | ✅ Complete (v1.31.0) |
+| 11.3 | Two-Tier Editing Engine (`edit.ts` rewrite) — TS API-first, regex fallback for all 7 operations | ✅ Complete (v1.31.0) |
+| 11.4 | Phase 11 Tests — 66 tests (40 ts-adapter + 26 transform), all passing | ✅ Complete (v1.31.0) |
 
 ---
 
@@ -1436,6 +1441,8 @@ npx tsc --noEmit
 | **v1.26.0** | Aug 2026 | Phase 9 — SafeExecutionLayer module (file validation, Docker sandbox, safe LLM calls) + 32 new tests (23 SafeExec + 9 Verify Bus) |
 | **v1.27.0** | Aug 2026 | Website + SVG — Phase 9 SafeExecutionLayer, phase progress 9/9, 2,207 tests |
 | **v1.29.0** | Sep 2026 | Phase 10 — Autonomous publish + phase-wise execution (CredentialStore, PhaseEngine, `buff publish`, `buff phase`, git push, npm auth) + 86 new tests |
+| **v1.30.0** | Sep 2026 | Phase 10 tests + docs — 80 unit tests (CredentialStore + PhaseExecutionEngine), README/Product_Guide/website updated with Phase 10 progress |
+| **v1.31.0** | Sep 2026 | Phase 11 — TS Compiler API-Aware Structural Editing (ts-adapter.ts, transform.ts, edit.ts rewrite, 66 new tests), proper parser-level accuracy for TS/JS edits |
 
 ---
 
@@ -1530,6 +1537,9 @@ npx tsc --noEmit
 | **PhaseExecutionEngine (Phase 10)** | Multi-goal project scope execution — sequential phase execution with save/resume across restarts, credential management, progress tracking |
 | **`buff publish` (Phase 10)** | Autonomous 5-phase publish pipeline — test verification → version bump → git commit/tag/push → npm build/publish → GitHub release |
 | **`buff phase` (Phase 10)** | Phase-wise project execution CLI — create/execute/resume/status/list/delete scopes with interactive pauses and credential collection |
+| **TS Compiler API Wrapper (Phase 11)** | Proper TypeScript Compiler API integration — parser-level accuracy with parseSourceFile, findStructuralNodes, validateTSSyntax, replaceNodeText, and insertAt |
+| **Structural Transformations (Phase 11)** | Real code transformations — renameSymbol, extractFunction, inlineFunction, addParameter, changeSignature with NLP-based detection |
+| **Two-Tier Editing Engine (Phase 11)** | All 7 edit operations try TS Compiler API first (for TS/JS), fall back to regex (for Python/Go/Rust) — AST-aware `tryFindNodeTS()` helper |
 
 ### Agent Catalog — 15 Agent Roles & Management
 | Agent/Component | Type | Description |

package/dist/editing/edit.d.ts

@@ -7,20 +7,25 @@
  * - Add import statement
  * - Intelligent code formatting with structural awareness
  *
- * Falls back to original text-based editing for unsupported languages.
+ * Uses TS Compiler API for TypeScript/JavaScript files (primary tier)
+ * with regex-based fallback for other languages.
+ *
+ * @see ARCHITECTURE.md §4.2 — Phase 11: TS Compiler API integration
  */
 import { type ASTEdit, type EditResult, type SupportedLanguage } from './types.js';
-import { analyzeStructure, findNodeByName, validateSyntax } from './ast.js';
+import { analyzeStructure, findNodeByName as findNodeByNameRegex, validateSyntax } from './ast.js';
 import { formatEditSummary } from './diff.js';
+import { renameSymbol, extractFunction, inlineFunction, addParameter, changeSignature } from './transform.js';
 /**
  * Replace the body of a function/method while preserving its signature.
- * Detects the function using structural analysis.
+ * Uses TS Compiler API for TypeScript/JavaScript files, falls back to regex.
  */
-export declare function replaceFunctionBody(code: string, functionName: string, newBody: string, language?: SupportedLanguage): EditResult;
+export declare function replaceFunctionBody(code: string, functionName: string, newBody: string, language?: SupportedLanguage, filePath?: string): EditResult;
 /**
  * Add a method to a class.
+ * Uses TS Compiler API for TypeScript/JavaScript files, falls back to regex.
  */
-export declare function addMethodToClass(code: string, className: string, methodCode: string, language?: SupportedLanguage): EditResult;
+export declare function addMethodToClass(code: string, className: string, methodCode: string, language?: SupportedLanguage, filePath?: string): EditResult;
 /**
  * Add an import statement.
  * Automatically deduplicates existing imports.
@@ -28,28 +33,36 @@ export declare function addMethodToClass(code: string, className: string, method
 export declare function addImport(code: string, importStatement: string, language?: SupportedLanguage): EditResult;
 /**
  * Insert code before a specific structural element.
+ * Uses TS Compiler API for TS/JS files, falls back to regex.
  */
-export declare function insertBefore(code: string, targetName: string, newCode: string, language?: SupportedLanguage): EditResult;
+export declare function insertBefore(code: string, targetName: string, newCode: string, language?: SupportedLanguage, filePath?: string): EditResult;
 /**
  * Insert code after a specific structural element.
+ * Uses TS Compiler API for TS/JS files, falls back to regex.
  */
-export declare function insertAfter(code: string, targetName: string, newCode: string, language?: SupportedLanguage): EditResult;
+export declare function insertAfter(code: string, targetName: string, newCode: string, language?: SupportedLanguage, filePath?: string): EditResult;
 /**
  * Delete a structural node from the code.
+ * Uses TS Compiler API for TS/JS files, falls back to regex.
  */
-export declare function deleteNode(code: string, targetName: string, language?: SupportedLanguage): EditResult;
+export declare function deleteNode(code: string, targetName: string, language?: SupportedLanguage, filePath?: string): EditResult;
 /**
  * Perform an intelligent edit based on the edit type.
  * Automatically detects language and finds structural targets.
+ * Uses TS Compiler API for TS/JS files, falls back to regex.
  *
  * This is the primary entry point for the WriterAgent integration.
  */
 export declare function performEdit(code: string, edit: ASTEdit): EditResult;
 /**
  * Build a structural context description for the LLM.
- * This tells the LLM about the structure of the file so it can make more
- * precise edits.
+ * Uses TS Compiler API for TypeScript/JavaScript files for richer, more precise
+ * structural context. Falls back to regex-based analysis for other languages.
  */
 export declare function buildStructuralContext(code: string, filePath: string): string;
-export { analyzeStructure, findNodeByName, validateSyntax, formatEditSummary };
+/**
+ * Validate syntax with TS Compiler API for TS/JS, regex fallback for others.
+ */
+export declare function validateCodeSyntax(code: string, filePath: string): boolean;
+export { analyzeStructure, findNodeByNameRegex as findNodeByName, validateSyntax, formatEditSummary, renameSymbol, extractFunction, inlineFunction, addParameter, changeSignature, };
 //# sourceMappingURL=edit.d.ts.map

package/dist/editing/edit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"edit.d.ts","sourceRoot":"","sources":["../../src/editing/edit.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EACL,KAAK,OAAO,EACZ,KAAK,UAAU,EACf,KAAK,iBAAiB,EAGvB,MAAM,YAAY,CAAC;AACpB,OAAO,EACL,gBAAgB,EAChB,cAAc,EACd,cAAc,EACf,MAAM,UAAU,CAAC;AAClB,OAAO,EAAc,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAI1D;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,MAAM,EACf,QAAQ,CAAC,EAAE,iBAAiB,GAC3B,UAAU,CAqCZ;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,QAAQ,CAAC,EAAE,iBAAiB,GAC3B,UAAU,CAwBZ;AAED;;;GAGG;AACH,wBAAgB,SAAS,CACvB,IAAI,EAAE,MAAM,EACZ,eAAe,EAAE,MAAM,EACvB,QAAQ,CAAC,EAAE,iBAAiB,GAC3B,UAAU,CAuBZ;AAED;;GAEG;AACH,wBAAgB,YAAY,CAC1B,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,MAAM,EACf,QAAQ,CAAC,EAAE,iBAAiB,GAC3B,UAAU,CAwBZ;AAED;;GAEG;AACH,wBAAgB,WAAW,CACzB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,MAAM,EACf,QAAQ,CAAC,EAAE,iBAAiB,GAC3B,UAAU,CAwBZ;AAED;;GAEG;AACH,wBAAgB,UAAU,CACxB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,EAClB,QAAQ,CAAC,EAAE,iBAAiB,GAC3B,UAAU,CAuBZ;AAID;;;;;GAKG;AACH,wBAAgB,WAAW,CACzB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,OAAO,GACZ,UAAU,CAyBZ;AAID;;;;GAIG;AACH,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,GACf,MAAM,CAuBR;AAID,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,cAAc,EAAE,iBAAiB,EAAE,CAAC"}
+{"version":3,"file":"edit.d.ts","sourceRoot":"","sources":["../../src/editing/edit.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,EACL,KAAK,OAAO,EACZ,KAAK,UAAU,EACf,KAAK,iBAAiB,EAGvB,MAAM,YAAY,CAAC;AACpB,OAAO,EACL,gBAAgB,EAChB,cAAc,IAAI,mBAAmB,EACrC,cAAc,EACf,MAAM,UAAU,CAAC;AAClB,OAAO,EAAc,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAQ1D,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,cAAc,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAoC9G;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,MAAM,EACf,QAAQ,CAAC,EAAE,iBAAiB,EAC5B,QAAQ,CAAC,EAAE,MAAM,GAChB,UAAU,CA0CZ;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,QAAQ,CAAC,EAAE,iBAAiB,EAC5B,QAAQ,CAAC,EAAE,MAAM,GAChB,UAAU,CAgCZ;AAED;;;GAGG;AACH,wBAAgB,SAAS,CACvB,IAAI,EAAE,MAAM,EACZ,eAAe,EAAE,MAAM,EACvB,QAAQ,CAAC,EAAE,iBAAiB,GAC3B,UAAU,CAeZ;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAC1B,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,MAAM,EACf,QAAQ,CAAC,EAAE,iBAAiB,EAC5B,QAAQ,CAAC,EAAE,MAAM,GAChB,UAAU,CAwBZ;AAED;;;GAGG;AACH,wBAAgB,WAAW,CACzB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,MAAM,EACf,QAAQ,CAAC,EAAE,iBAAiB,EAC5B,QAAQ,CAAC,EAAE,MAAM,GAChB,UAAU,CAwBZ;AAED;;;GAGG;AACH,wBAAgB,UAAU,CACxB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,EAClB,QAAQ,CAAC,EAAE,iBAAiB,EAC5B,QAAQ,CAAC,EAAE,MAAM,GAChB,UAAU,CAwBZ;AAID;;;;;;GAMG;AACH,wBAAgB,WAAW,CACzB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,OAAO,GACZ,UAAU,CAoCZ;AAID;;;;GAIG;AACH,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,GACf,MAAM,CAoCR;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAM1E;AAID,OAAO,EACL,gBAAgB,EAChB,mBAAmB,IAAI,cAAc,EACrC,cAAc,EACd,iBAAiB,EACjB,YAAY,EACZ,eAAe,EACf,cAAc,EACd,YAAY,EACZ,eAAe,GAChB,CAAC"}

package/dist/editing/edit.js

@@ -7,75 +7,115 @@
  * - Add import statement
  * - Intelligent code formatting with structural awareness
  *
- * Falls back to original text-based editing for unsupported languages.
+ * Uses TS Compiler API for TypeScript/JavaScript files (primary tier)
+ * with regex-based fallback for other languages.
+ *
+ * @see ARCHITECTURE.md §4.2 — Phase 11: TS Compiler API integration
  */
 import { detectLanguage, } from './types.js';
-import { analyzeStructure, findNodeByName, validateSyntax, } from './ast.js';
+import { analyzeStructure, findNodeByName as findNodeByNameRegex, validateSyntax, } from './ast.js';
 import { applyEdits, formatEditSummary } from './diff.js';
+import { findStructuralNodes as findNodesTS, findNodeByName as findNodeByNameTS, validateTSSyntax, nodeToRange, getBodyRange, } from './ts-adapter.js';
+import { renameSymbol, extractFunction, inlineFunction, addParameter, changeSignature } from './transform.js';
 // ─── High-Level Operations ──────────────────────────────────────────────────
+/**
+ * Try to find a structural node using the TS Compiler API.
+ * Returns a StructuralNode if found, null otherwise.
+ */
+function tryFindNodeTS(code, filePath, name, type = 'function', language) {
+    if (language !== 'typescript' && language !== 'javascript')
+        return null;
+    if (!filePath)
+        return null;
+    const tsResult = findNodeByNameTS(code, filePath, name);
+    if (!tsResult)
+        return null;
+    const { node, sourceFile } = tsResult;
+    const range = nodeToRange(node, sourceFile);
+    const bodyRange = getBodyRange(node, sourceFile);
+    return {
+        type,
+        name,
+        range,
+        bodyRange,
+        depth: 0,
+        children: [],
+        language,
+    };
+}
 /**
  * Replace the body of a function/method while preserving its signature.
- * Detects the function using structural analysis.
+ * Uses TS Compiler API for TypeScript/JavaScript files, falls back to regex.
  */
-export function replaceFunctionBody(code, functionName, newBody, language) {
-    const lang = language || detectLanguage('');
+export function replaceFunctionBody(code, functionName, newBody, language, filePath) {
+    const lang = language || detectLanguage(filePath || '');
+    const resolvedPath = filePath || `file.${lang === 'typescript' ? 'ts' : lang === 'javascript' ? 'js' : 'ts'}`;
+    // Try TS Compiler API first for TS/JS files
+    const tsTarget = tryFindNodeTS(code, resolvedPath, functionName, 'function', lang);
+    if (tsTarget) {
+        if (!tsTarget.bodyRange) {
+            // Abstract declaration — replace entire node
+            return applyEdits(code, [{
+                    type: 'replace-node', filePath: '', targetNode: tsTarget, language: lang,
+                    newCode: newBody, description: `Replace function ${functionName}`, priority: 1,
+                }]);
+        }
+        return applyEdits(code, [{
+                type: 'replace-body', filePath: '', targetNode: tsTarget, language: lang,
+                newCode: newBody, description: `Replace body of ${functionName}`, priority: 1,
+            }]);
+    }
+    // Fallback to regex-based analysis
     const nodes = analyzeStructure(code, lang);
-    const target = findNodeByName(nodes, functionName);
+    const target = findNodeByNameRegex(nodes, functionName);
     if (!target) {
         return {
-            success: false,
-            conflicts: [],
-            appliedCount: 0,
-            totalEdits: 1,
+            success: false, conflicts: [], appliedCount: 0, totalEdits: 1,
             error: `Function "${functionName}" not found in the code`,
         };
     }
-    if (!target?.bodyRange) {
-        // Function has no body (abstract declaration, interface) — replace entire node
+    if (!target.bodyRange) {
         return applyEdits(code, [{
-                type: 'replace-node',
-                filePath: '',
-                targetNode: target,
-                language: lang,
-                newCode: newBody,
-                description: `Replace function ${functionName}`,
-                priority: 1,
+                type: 'replace-node', filePath: '', targetNode: target, language: lang,
+                newCode: newBody, description: `Replace function ${functionName}`, priority: 1,
             }]);
     }
     return applyEdits(code, [{
-            type: 'replace-body',
-            filePath: '',
-            targetNode: target,
-            language: lang,
-            newCode: newBody,
-            description: `Replace body of ${functionName}`,
-            priority: 1,
+            type: 'replace-body', filePath: '', targetNode: target, language: lang,
+            newCode: newBody, description: `Replace body of ${functionName}`, priority: 1,
         }]);
 }
 /**
  * Add a method to a class.
+ * Uses TS Compiler API for TypeScript/JavaScript files, falls back to regex.
  */
-export function addMethodToClass(code, className, methodCode, language) {
-    const lang = language || detectLanguage('');
-    const nodes = analyzeStructure(code, lang);
-    const target = findNodeByName(nodes, className, 'class');
+export function addMethodToClass(code, className, methodCode, language, filePath) {
+    const lang = language || detectLanguage(filePath || '');
+    const resolvedPath = filePath || `file.${lang === 'typescript' ? 'ts' : lang === 'javascript' ? 'js' : 'ts'}`;
+    // Try TS Compiler API first
+    const tsTarget = tryFindNodeTS(code, resolvedPath, className, 'class', lang);
+    if (tsTarget) {
+        if (!tsTarget.bodyRange) {
+            return { success: false, conflicts: [], appliedCount: 0, totalEdits: 1, error: `Class "${className}" has no body` };
+        }
+        return applyEdits(code, [{
+                type: 'insert-child', filePath: '', targetNode: tsTarget, language: lang,
+                newCode: methodCode, description: `Add method to ${className}`, priority: 1,
+            }]);
+    }
+    // Fallback to regex-based analysis
+    const lang2 = language || detectLanguage('');
+    const nodes = analyzeStructure(code, lang2);
+    const target = findNodeByNameRegex(nodes, className, 'class');
     if (!target) {
         return {
-            success: false,
-            conflicts: [],
-            appliedCount: 0,
-            totalEdits: 1,
+            success: false, conflicts: [], appliedCount: 0, totalEdits: 1,
             error: `Class "${className}" not found`,
         };
     }
     return applyEdits(code, [{
-            type: 'insert-child',
-            filePath: '',
-            targetNode: target,
-            language: lang,
-            newCode: methodCode,
-            description: `Add method to ${className}`,
-            priority: 1,
+            type: 'insert-child', filePath: '', targetNode: target, language: lang2,
+            newCode: methodCode, description: `Add method to ${className}`, priority: 1,
         }]);
 }
 /**
@@ -88,103 +128,100 @@ export function addImport(code, importStatement, language) {
     const normalized = importStatement.trim();
     if (code.includes(normalized)) {
         return {
-            success: true,
-            code,
-            conflicts: [],
-            appliedCount: 0,
-            totalEdits: 1,
+            success: true, code, conflicts: [], appliedCount: 0, totalEdits: 1,
         };
     }
     return applyEdits(code, [{
-            type: 'add-import',
-            filePath: '',
-            language: lang,
-            newCode: normalized,
-            description: `Add import: ${normalized.slice(0, 60)}`,
-            priority: 2,
+            type: 'add-import', filePath: '', language: lang, newCode: normalized,
+            description: `Add import: ${normalized.slice(0, 60)}`, priority: 2,
         }]);
 }
 /**
  * Insert code before a specific structural element.
+ * Uses TS Compiler API for TS/JS files, falls back to regex.
  */
-export function insertBefore(code, targetName, newCode, language) {
-    const lang = language || detectLanguage('');
-    const nodes = analyzeStructure(code, lang);
-    const target = findNodeByName(nodes, targetName);
+export function insertBefore(code, targetName, newCode, language, filePath) {
+    const lang = language || detectLanguage(filePath || '');
+    const resolvedPath = filePath || `file.${lang === 'typescript' ? 'ts' : lang === 'javascript' ? 'js' : 'ts'}`;
+    // Try TS Compiler API first
+    const tsTarget = tryFindNodeTS(code, resolvedPath, targetName, 'function', lang);
+    if (tsTarget) {
+        return applyEdits(code, [{
+                type: 'insert-before', filePath: '', targetNode: tsTarget, language: lang,
+                newCode, description: `Insert before ${targetName}`, priority: 1,
+            }]);
+    }
+    // Fallback to regex
+    const lang2 = language || detectLanguage('');
+    const nodes = analyzeStructure(code, lang2);
+    const target = findNodeByNameRegex(nodes, targetName);
     if (!target) {
-        return {
-            success: false,
-            conflicts: [],
-            appliedCount: 0,
-            totalEdits: 1,
-            error: `Target "${targetName}" not found`,
-        };
+        return { success: false, conflicts: [], appliedCount: 0, totalEdits: 1, error: `Target "${targetName}" not found` };
     }
     return applyEdits(code, [{
-            type: 'insert-before',
-            filePath: '',
-            targetNode: target,
-            language: lang,
-            newCode,
-            description: `Insert before ${targetName}`,
-            priority: 1,
+            type: 'insert-before', filePath: '', targetNode: target, language: lang2,
+            newCode, description: `Insert before ${targetName}`, priority: 1,
         }]);
 }
 /**
  * Insert code after a specific structural element.
+ * Uses TS Compiler API for TS/JS files, falls back to regex.
  */
-export function insertAfter(code, targetName, newCode, language) {
-    const lang = language || detectLanguage('');
-    const nodes = analyzeStructure(code, lang);
-    const target = findNodeByName(nodes, targetName);
+export function insertAfter(code, targetName, newCode, language, filePath) {
+    const lang = language || detectLanguage(filePath || '');
+    const resolvedPath = filePath || `file.${lang === 'typescript' ? 'ts' : lang === 'javascript' ? 'js' : 'ts'}`;
+    // Try TS Compiler API first
+    const tsTarget = tryFindNodeTS(code, resolvedPath, targetName, 'function', lang);
+    if (tsTarget) {
+        return applyEdits(code, [{
+                type: 'insert-after', filePath: '', targetNode: tsTarget, language: lang,
+                newCode, description: `Insert after ${targetName}`, priority: 1,
+            }]);
+    }
+    // Fallback to regex
+    const lang2 = language || detectLanguage('');
+    const nodes = analyzeStructure(code, lang2);
+    const target = findNodeByNameRegex(nodes, targetName);
     if (!target) {
-        return {
-            success: false,
-            conflicts: [],
-            appliedCount: 0,
-            totalEdits: 1,
-            error: `Target "${targetName}" not found`,
-        };
+        return { success: false, conflicts: [], appliedCount: 0, totalEdits: 1, error: `Target "${targetName}" not found` };
     }
     return applyEdits(code, [{
-            type: 'insert-after',
-            filePath: '',
-            targetNode: target,
-            language: lang,
-            newCode,
-            description: `Insert after ${targetName}`,
-            priority: 1,
+            type: 'insert-after', filePath: '', targetNode: target, language: lang2,
+            newCode, description: `Insert after ${targetName}`, priority: 1,
         }]);
 }
 /**
  * Delete a structural node from the code.
+ * Uses TS Compiler API for TS/JS files, falls back to regex.
  */
-export function deleteNode(code, targetName, language) {
-    const lang = language || detectLanguage('');
-    const nodes = analyzeStructure(code, lang);
-    const target = findNodeByName(nodes, targetName);
+export function deleteNode(code, targetName, language, filePath) {
+    const lang = language || detectLanguage(filePath || '');
+    const resolvedPath = filePath || `file.${lang === 'typescript' ? 'ts' : lang === 'javascript' ? 'js' : 'ts'}`;
+    // Try TS Compiler API first
+    const tsTarget = tryFindNodeTS(code, resolvedPath, targetName, 'function', lang);
+    if (tsTarget) {
+        return applyEdits(code, [{
+                type: 'delete-node', filePath: '', targetNode: tsTarget, language: lang,
+                description: `Delete ${targetName}`, priority: 1,
+            }]);
+    }
+    // Fallback to regex
+    const lang2 = language || detectLanguage('');
+    const nodes = analyzeStructure(code, lang2);
+    const target = findNodeByNameRegex(nodes, targetName);
     if (!target) {
-        return {
-            success: false,
-            conflicts: [],
-            appliedCount: 0,
-            totalEdits: 1,
-            error: `Target "${targetName}" not found`,
-        };
+        return { success: false, conflicts: [], appliedCount: 0, totalEdits: 1, error: `Target "${targetName}" not found` };
     }
     return applyEdits(code, [{
-            type: 'delete-node',
-            filePath: '',
-            targetNode: target,
-            language: lang,
-            description: `Delete ${targetName}`,
-            priority: 1,
+            type: 'delete-node', filePath: '', targetNode: target, language: lang2,
+            description: `Delete ${targetName}`, priority: 1,
         }]);
 }
 // ─── Intelligent Edit ───────────────────────────────────────────────────────
 /**
  * Perform an intelligent edit based on the edit type.
  * Automatically detects language and finds structural targets.
+ * Uses TS Compiler API for TS/JS files, falls back to regex.
  *
  * This is the primary entry point for the WriterAgent integration.
  */
@@ -203,10 +240,20 @@ export function performEdit(code, edit) {
     }
     // Find the target node if specified by name but not resolved
     if (edit.targetNode?.name && !edit.targetNode.range) {
-        const nodes = analyzeStructure(code, lang);
-        const found = findNodeByName(nodes, edit.targetNode.name);
-        if (found) {
-            edit.targetNode = found;
+        // Try TS Compiler API first for TS/JS files
+        if ((lang === 'typescript' || lang === 'javascript') && edit.filePath) {
+            const tsTarget = tryFindNodeTS(code, edit.filePath, edit.targetNode.name, 'function', lang);
+            if (tsTarget) {
+                edit.targetNode = tsTarget;
+            }
+        }
+        // Fallback to regex
+        if (!edit.targetNode.range) {
+            const nodes = analyzeStructure(code, lang);
+            const found = findNodeByNameRegex(nodes, edit.targetNode.name);
+            if (found) {
+                edit.targetNode = found;
+            }
         }
     }
     return applyEdits(code, [edit]);
@@ -214,14 +261,27 @@ export function performEdit(code, edit) {
 // ─── Structural Context Builder ─────────────────────────────────────────────
 /**
  * Build a structural context description for the LLM.
- * This tells the LLM about the structure of the file so it can make more
- * precise edits.
+ * Uses TS Compiler API for TypeScript/JavaScript files for richer, more precise
+ * structural context. Falls back to regex-based analysis for other languages.
  */
 export function buildStructuralContext(code, filePath) {
     const lang = detectLanguage(filePath);
     if (lang === 'unknown')
         return '';
-    const nodes = analyzeStructure(code, lang);
+    let nodes;
+    // Try TS Compiler API first for better precision
+    if (lang === 'typescript' || lang === 'javascript') {
+        try {
+            const tsNodes = findNodesTS(code, filePath);
+            nodes = tsNodes.length > 0 ? tsNodes : analyzeStructure(code, lang);
+        }
+        catch {
+            nodes = analyzeStructure(code, lang);
+        }
+    }
+    else {
+        nodes = analyzeStructure(code, lang);
+    }
     if (nodes.length === 0)
         return '';
     const lines = [];
@@ -232,12 +292,22 @@ export function buildStructuralContext(code, filePath) {
         if (node.children.length > 0) {
             for (const child of node.children) {
                 const childRange = `L${child.range.start.line}-L${child.range.end.line}`;
-                lines.push(`    method: "${child.name}" [${childRange}]`);
+                lines.push(`    ${child.type}: "${child.name}" [${childRange}]`);
             }
         }
     }
     return lines.join('\n');
 }
+/**
+ * Validate syntax with TS Compiler API for TS/JS, regex fallback for others.
+ */
+export function validateCodeSyntax(code, filePath) {
+    const lang = detectLanguage(filePath);
+    if (lang === 'typescript' || lang === 'javascript') {
+        return validateTSSyntax(code, filePath);
+    }
+    return validateSyntax(code, lang);
+}
 // ─── Export for convenience ─────────────────────────────────────────────────
-export { analyzeStructure, findNodeByName, validateSyntax, formatEditSummary };
+export { analyzeStructure, findNodeByNameRegex as findNodeByName, validateSyntax, formatEditSummary, renameSymbol, extractFunction, inlineFunction, addParameter, changeSignature, };
 //# sourceMappingURL=edit.js.map

package/dist/editing/edit.js.map

@@ -1 +1 @@
-{"version":3,"file":"edit.js","sourceRoot":"","sources":["../../src/editing/edit.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAKL,cAAc,GACf,MAAM,YAAY,CAAC;AACpB,OAAO,EACL,gBAAgB,EAChB,cAAc,EACd,cAAc,GACf,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAE1D,+EAA+E;AAE/E;;;GAGG;AACH,MAAM,UAAU,mBAAmB,CACjC,IAAY,EACZ,YAAoB,EACpB,OAAe,EACf,QAA4B;IAE5B,MAAM,IAAI,GAAG,QAAQ,IAAI,cAAc,CAAC,EAAE,CAAC,CAAC;IAC5C,MAAM,KAAK,GAAG,gBAAgB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC3C,MAAM,MAAM,GAAG,cAAc,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;IAEnD,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO;YACL,OAAO,EAAE,KAAK;YACd,SAAS,EAAE,EAAE;YACb,YAAY,EAAE,CAAC;YACf,UAAU,EAAE,CAAC;YACb,KAAK,EAAE,aAAa,YAAY,yBAAyB;SAC1D,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC;QACvB,+EAA+E;QAC/E,OAAO,UAAU,CAAC,IAAI,EAAE,CAAC;gBACvB,IAAI,EAAE,cAAc;gBACpB,QAAQ,EAAE,EAAE;gBACZ,UAAU,EAAE,MAAM;gBAClB,QAAQ,EAAE,IAAI;gBACd,OAAO,EAAE,OAAO;gBAChB,WAAW,EAAE,oBAAoB,YAAY,EAAE;gBAC/C,QAAQ,EAAE,CAAC;aACZ,CAAC,CAAC,CAAC;IACN,CAAC;IAED,OAAO,UAAU,CAAC,IAAI,EAAE,CAAC;YACvB,IAAI,EAAE,cAAc;YACpB,QAAQ,EAAE,EAAE;YACZ,UAAU,EAAE,MAAM;YAClB,QAAQ,EAAE,IAAI;YACd,OAAO,EAAE,OAAO;YAChB,WAAW,EAAE,mBAAmB,YAAY,EAAE;YAC9C,QAAQ,EAAE,CAAC;SACZ,CAAC,CAAC,CAAC;AACN,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,gBAAgB,CAC9B,IAAY,EACZ,SAAiB,EACjB,UAAkB,EAClB,QAA4B;IAE5B,MAAM,IAAI,GAAG,QAAQ,IAAI,cAAc,CAAC,EAAE,CAAC,CAAC;IAC5C,MAAM,KAAK,GAAG,gBAAgB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC3C,MAAM,MAAM,GAAG,cAAc,CAAC,KAAK,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;IAEzD,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO;YACL,OAAO,EAAE,KAAK;YACd,SAAS,EAAE,EAAE;YACb,YAAY,EAAE,CAAC;YACf,UAAU,EAAE,CAAC;YACb,KAAK,EAAE,UAAU,SAAS,aAAa;SACxC,CAAC;IACJ,CAAC;IAED,OAAO,UAAU,CAAC,IAAI,EAAE,CAAC;YACvB,IAAI,EAAE,cAAc;YACpB,QAAQ,EAAE,EAAE;YACZ,UAAU,EAAE,MAAM;YAClB,QAAQ,EAAE,IAAI;YACd,OAAO,EAAE,UAAU;YACnB,WAAW,EAAE,iBAAiB,SAAS,EAAE;YACzC,QAAQ,EAAE,CAAC;SACZ,CAAC,CAAC,CAAC;AACN,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,SAAS,CACvB,IAAY,EACZ,eAAuB,EACvB,QAA4B;IAE5B,MAAM,IAAI,GAAG,QAAQ,IAAI,cAAc,CAAC,EAAE,CAAC,CAAC;IAE5C,iCAAiC;IACjC,MAAM,UAAU,GAAG,eAAe,CAAC,IAAI,EAAE,CAAC;IAC1C,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;QAC9B,OAAO;YACL,OAAO,EAAE,IAAI;YACb,IAAI;YACJ,SAAS,EAAE,EAAE;YACb,YAAY,EAAE,CAAC;YACf,UAAU,EAAE,CAAC;SACd,CAAC;IACJ,CAAC;IAED,OAAO,UAAU,CAAC,IAAI,EAAE,CAAC;YACvB,IAAI,EAAE,YAAY;YAClB,QAAQ,EAAE,EAAE;YACZ,QAAQ,EAAE,IAAI;YACd,OAAO,EAAE,UAAU;YACnB,WAAW,EAAE,eAAe,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE;YACrD,QAAQ,EAAE,CAAC;SACZ,CAAC,CAAC,CAAC;AACN,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,YAAY,CAC1B,IAAY,EACZ,UAAkB,EAClB,OAAe,EACf,QAA4B;IAE5B,MAAM,IAAI,GAAG,QAAQ,IAAI,cAAc,CAAC,EAAE,CAAC,CAAC;IAC5C,MAAM,KAAK,GAAG,gBAAgB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC3C,MAAM,MAAM,GAAG,cAAc,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;IAEjD,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO;YACL,OAAO,EAAE,KAAK;YACd,SAAS,EAAE,EAAE;YACb,YAAY,EAAE,CAAC;YACf,UAAU,EAAE,CAAC;YACb,KAAK,EAAE,WAAW,UAAU,aAAa;SAC1C,CAAC;IACJ,CAAC;IAED,OAAO,UAAU,CAAC,IAAI,EAAE,CAAC;YACvB,IAAI,EAAE,eAAe;YACrB,QAAQ,EAAE,EAAE;YACZ,UAAU,EAAE,MAAM;YAClB,QAAQ,EAAE,IAAI;YACd,OAAO;YACP,WAAW,EAAE,iBAAiB,UAAU,EAAE;YAC1C,QAAQ,EAAE,CAAC;SACZ,CAAC,CAAC,CAAC;AACN,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,WAAW,CACzB,IAAY,EACZ,UAAkB,EAClB,OAAe,EACf,QAA4B;IAE5B,MAAM,IAAI,GAAG,QAAQ,IAAI,cAAc,CAAC,EAAE,CAAC,CAAC;IAC5C,MAAM,KAAK,GAAG,gBAAgB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC3C,MAAM,MAAM,GAAG,cAAc,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;IAEjD,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO;YACL,OAAO,EAAE,KAAK;YACd,SAAS,EAAE,EAAE;YACb,YAAY,EAAE,CAAC;YACf,UAAU,EAAE,CAAC;YACb,KAAK,EAAE,WAAW,UAAU,aAAa;SAC1C,CAAC;IACJ,CAAC;IAED,OAAO,UAAU,CAAC,IAAI,EAAE,CAAC;YACvB,IAAI,EAAE,cAAc;YACpB,QAAQ,EAAE,EAAE;YACZ,UAAU,EAAE,MAAM;YAClB,QAAQ,EAAE,IAAI;YACd,OAAO;YACP,WAAW,EAAE,gBAAgB,UAAU,EAAE;YACzC,QAAQ,EAAE,CAAC;SACZ,CAAC,CAAC,CAAC;AACN,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,UAAU,CACxB,IAAY,EACZ,UAAkB,EAClB,QAA4B;IAE5B,MAAM,IAAI,GAAG,QAAQ,IAAI,cAAc,CAAC,EAAE,CAAC,CAAC;IAC5C,MAAM,KAAK,GAAG,gBAAgB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC3C,MAAM,MAAM,GAAG,cAAc,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;IAEjD,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO;YACL,OAAO,EAAE,KAAK;YACd,SAAS,EAAE,EAAE;YACb,YAAY,EAAE,CAAC;YACf,UAAU,EAAE,CAAC;YACb,KAAK,EAAE,WAAW,UAAU,aAAa;SAC1C,CAAC;IACJ,CAAC;IAED,OAAO,UAAU,CAAC,IAAI,EAAE,CAAC;YACvB,IAAI,EAAE,aAAa;YACnB,QAAQ,EAAE,EAAE;YACZ,UAAU,EAAE,MAAM;YAClB,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,UAAU,UAAU,EAAE;YACnC,QAAQ,EAAE,CAAC;SACZ,CAAC,CAAC,CAAC;AACN,CAAC;AAED,+EAA+E;AAE/E;;;;;GAKG;AACH,MAAM,UAAU,WAAW,CACzB,IAAY,EACZ,IAAa;IAEb,kCAAkC;IAClC,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,KAAK,SAAS;QACtC,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC;QAC/B,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC;IAClB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;IAErB,gDAAgD;IAChD,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;QAC9C,OAAO,UAAU,CAAC,IAAI,EAAE,CAAC;gBACvB,GAAG,IAAI;gBACP,IAAI,EAAE,KAAK;aACZ,CAAC,CAAC,CAAC;IACN,CAAC;IAED,6DAA6D;IAC7D,IAAI,IAAI,CAAC,UAAU,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;QACpD,MAAM,KAAK,GAAG,gBAAgB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAC3C,MAAM,KAAK,GAAG,cAAc,CAAC,KAAK,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAC1D,IAAI,KAAK,EAAE,CAAC;YACV,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;QAC1B,CAAC;IACH,CAAC;IAED,OAAO,UAAU,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;AAClC,CAAC;AAED,+EAA+E;AAE/E;;;;GAIG;AACH,MAAM,UAAU,sBAAsB,CACpC,IAAY,EACZ,QAAgB;IAEhB,MAAM,IAAI,GAAG,cAAc,CAAC,QAAQ,CAAC,CAAC;IACtC,IAAI,IAAI,KAAK,SAAS;QAAE,OAAO,EAAE,CAAC;IAElC,MAAM,KAAK,GAAG,gBAAgB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC3C,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAElC,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,KAAK,CAAC,IAAI,CAAC,6BAA6B,QAAQ,GAAG,CAAC,CAAC;IAErD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,KAAK,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;QAClE,KAAK,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,MAAM,IAAI,CAAC,IAAI,MAAM,KAAK,GAAG,CAAC,CAAC;QAExD,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC7B,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAClC,MAAM,UAAU,GAAG,IAAI,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;gBACzE,KAAK,CAAC,IAAI,CAAC,gBAAgB,KAAK,CAAC,IAAI,MAAM,UAAU,GAAG,CAAC,CAAC;YAC5D,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC1B,CAAC;AAED,+EAA+E;AAE/E,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,cAAc,EAAE,iBAAiB,EAAE,CAAC"}
+{"version":3,"file":"edit.js","sourceRoot":"","sources":["../../src/editing/edit.ts"],"names":[],"mappings":"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"}