agent-ide 0.8.1 → 0.9.0

package/dist/core/change-signature/change-signature-service.js

@@ -3,9 +3,13 @@
  * 參數重構核心服務
  */
 import * as path from 'path';
+import { createChangesetBuilder, ChangesetCommand, TextEditOperationType } from '../../infrastructure/changeset/index.js';
 import { SignatureParser } from './signature-parser.js';
-import { ChangeSignatureErrorCode, isAddParameterChange, isRemoveParameterChange, isReorderParametersChange, isChangeParameterTypeChange, isRenameParameterChange, isChangeDefaultValueChange, isToggleOptionalChange } from './types.js';
-import { SymbolFinder } from '../shared/symbol-finder.js';
+import { SignatureValidator } from './signature-validator.js';
+import { SignatureTransformer } from './signature-transformer.js';
+import { CallSiteUpdater } from './call-site-updater.js';
+import { ChangeSignatureErrorCode } from './types.js';
+import { SymbolFinder } from '../shared/symbol-finder/index.js';
 /**
  * Change Signature Service
  */
@@ -14,11 +18,17 @@ export class ChangeSignatureService {
     fileSystem;
     signatureParser;
     symbolFinder;
+    validator;
+    transformer;
+    callSiteUpdater;
     constructor(parserRegistry, fileSystem) {
         this.parserRegistry = parserRegistry;
         this.fileSystem = fileSystem;
         this.signatureParser = new SignatureParser(parserRegistry, fileSystem);
         this.symbolFinder = new SymbolFinder(parserRegistry, fileSystem);
+        this.validator = new SignatureValidator();
+        this.transformer = new SignatureTransformer();
+        this.callSiteUpdater = new CallSiteUpdater(fileSystem);
     }
     /**
      * 執行 Change Signature
@@ -30,19 +40,19 @@ export class ChangeSignatureService {
             return this.createErrorResult(ChangeSignatureErrorCode.FunctionNotFound, `找不到函式: ${options.functionName}`);
         }
         // 2. 驗證變更
-        const validationErrors = this.validateChanges(originalSignature, options.changes);
+        const validationErrors = this.validator.validateChanges(originalSignature, options.changes);
         if (validationErrors.length > 0) {
             return this.createErrorResult(validationErrors[0].code, validationErrors[0].message);
         }
         // 3. 計算新簽名
-        const newSignature = this.applyChangesToSignature(originalSignature, options.changes);
+        const newSignature = this.transformer.applyChangesToSignature(originalSignature, options.changes);
         // 4. 取得所有呼叫點
         const projectFiles = options.targetFiles ?? await this.getProjectFiles(options.projectRoot);
         const callSites = await this.symbolFinder.findCallSites(options.functionName, projectFiles);
         // 5. 生成定義更新
         const definitionUpdate = await this.generateDefinitionUpdate(options.filePath, originalSignature, newSignature);
         // 6. 生成呼叫點更新
-        const callSiteUpdates = await this.generateCallSiteUpdates(callSites, originalSignature, newSignature, options.changes);
+        const callSiteUpdates = await this.callSiteUpdater.generateCallSiteUpdates(callSites, originalSignature, newSignature, options.changes);
         // 7. 執行或預覽
         if (!options.preview) {
             await this.applyChanges(definitionUpdate, callSiteUpdates);
@@ -67,163 +77,75 @@ export class ChangeSignatureService {
         };
     }
     /**
-     * 驗證變更
+     * 生成參數簽名變更的 Changeset
+     * 使用 preview 模式收集變更，轉換為統一的 Changeset 格式
+     *
+     * @param options - 變更選項（強制使用 preview 模式）
+     * @returns Changeset 物件
      */
-    validateChanges(signature, changes) {
-        const errors = [];
-        const parameterNames = new Set(signature.parameters.map(p => p.name));
-        const newParameterNames = new Set(parameterNames);
-        for (const change of changes) {
-            if (isAddParameterChange(change)) {
-                if (newParameterNames.has(change.name)) {
-                    errors.push({
-                        code: ChangeSignatureErrorCode.DuplicateParameterName,
-                        message: `參數名稱重複: ${change.name}`,
-                        parameterName: change.name
-                    });
-                }
-                else {
-                    newParameterNames.add(change.name);
-                }
-                // 驗證新增參數必須有預設值
-                if (!change.callSiteValue && !change.defaultValue) {
-                    errors.push({
-                        code: ChangeSignatureErrorCode.MissingDefaultValue,
-                        message: `參數 ${change.name} 缺少預設值，請使用 --default-value 或 --call-site-value 指定`,
-                        parameterName: change.name
-                    });
-                }
-            }
-            if (isRemoveParameterChange(change)) {
-                const targetName = this.resolveParameterName(signature, change.parameterNameOrIndex);
-                if (!targetName || !parameterNames.has(targetName)) {
-                    errors.push({
-                        code: ChangeSignatureErrorCode.ParameterNotFound,
-                        message: `找不到參數: ${change.parameterNameOrIndex}`,
-                        parameterName: String(change.parameterNameOrIndex)
-                    });
-                }
-                else {
-                    newParameterNames.delete(targetName);
-                }
-            }
-            if (isReorderParametersChange(change)) {
-                for (const nameOrIndex of change.newOrder) {
-                    const targetName = this.resolveParameterName(signature, nameOrIndex);
-                    if (!targetName || !parameterNames.has(targetName)) {
-                        errors.push({
-                            code: ChangeSignatureErrorCode.ParameterNotFound,
-                            message: `找不到參數: ${nameOrIndex}`,
-                            parameterName: String(nameOrIndex)
-                        });
-                    }
-                }
-                if (change.newOrder.length !== signature.parameters.length) {
-                    errors.push({
-                        code: ChangeSignatureErrorCode.InvalidParameterOrder,
-                        message: '重新排序必須包含所有參數'
-                    });
-                }
-                // 驗證可選參數順序：可選參數必須在必選參數之後
-                const optionalOrderError = this.validateOptionalParameterOrder(signature, change.newOrder);
-                if (optionalOrderError) {
-                    errors.push(optionalOrderError);
-                }
-            }
-            if (isChangeParameterTypeChange(change) || isRenameParameterChange(change) ||
-                isChangeDefaultValueChange(change) || isToggleOptionalChange(change)) {
-                const targetName = this.resolveParameterName(signature, change.parameterNameOrIndex);
-                if (!targetName || !parameterNames.has(targetName)) {
-                    errors.push({
-                        code: ChangeSignatureErrorCode.ParameterNotFound,
-                        message: `找不到參數: ${change.parameterNameOrIndex}`,
-                        parameterName: String(change.parameterNameOrIndex)
-                    });
-                }
+    async generateChangeset(options) {
+        const builder = createChangesetBuilder().forCommand(ChangesetCommand.ChangeSignature);
+        // 使用現有邏輯（preview 模式）收集變更
+        const result = await this.changeSignature({
+            ...options,
+            preview: true
+        });
+        if (!result.success) {
+            return builder
+                .addError(result.error ?? 'Change signature failed')
+                .withDescription(result.error ?? 'Change signature failed')
+                .build();
+        }
+        // 轉換 definitionUpdate
+        const { filePath, originalCode, newCode, location } = result.definitionUpdate;
+        // originalCode 和 newCode 都是完整的一行內容
+        // 因此 range 應該從行首（column 1）開始，到行尾結束
+        const lineNumber = location.range.start.line;
+        const originalLineLength = originalCode.length;
+        builder.addTextChange(filePath, [{
+                range: {
+                    start: { line: lineNumber, column: 1 },
+                    end: { line: lineNumber, column: originalLineLength + 1 }
+                },
+                newText: newCode,
+                description: `Update definition: ${originalCode.trim()} -> ${newCode.trim()}`
+            }], TextEditOperationType.Modify);
+        // 轉換 callSiteUpdates
+        // 按檔案分組，合併同一檔案的多個變更
+        const updatesByFile = new Map();
+        for (const update of result.callSiteUpdates) {
+            const existing = updatesByFile.get(update.filePath);
+            if (existing) {
+                existing.push(update);
             }
-            if (isRenameParameterChange(change)) {
-                if (newParameterNames.has(change.newName) && change.newName !== this.resolveParameterName(signature, change.parameterNameOrIndex)) {
-                    errors.push({
-                        code: ChangeSignatureErrorCode.DuplicateParameterName,
-                        message: `參數名稱重複: ${change.newName}`,
-                        parameterName: change.newName
-                    });
-                }
+            else {
+                updatesByFile.set(update.filePath, [update]);
             }
         }
-        return errors;
-    }
-    /**
-     * 套用變更到簽名
-     */
-    applyChangesToSignature(signature, changes) {
-        let parameters = [...signature.parameters];
-        for (const change of changes) {
-            if (isAddParameterChange(change)) {
-                const newParam = {
-                    name: change.name,
-                    type: change.parameterType,
-                    defaultValue: change.defaultValue,
-                    optional: change.optional,
-                    rest: false,
-                    range: { start: { line: 0, column: 0, offset: 0 }, end: { line: 0, column: 0, offset: 0 } }
+        for (const [updateFilePath, updates] of updatesByFile) {
+            // 跳過與 definitionUpdate 同一檔案（避免重複）
+            // 已經在上面處理過了，呼叫點和定義可能在同一行
+            const edits = updates.map(update => {
+                // originalCode 和 newCode 都是完整的一行內容
+                // 因此 range 應該從行首（column 1）開始，到行尾結束
+                const lineStart = update.location.range.start.line;
+                const callOriginalLength = update.originalCode.length;
+                return {
+                    range: {
+                        start: { line: lineStart, column: 1 },
+                        end: { line: lineStart, column: callOriginalLength + 1 }
+                    },
+                    newText: update.newCode,
+                    description: `Update call: ${update.originalCode.trim()} -> ${update.newCode.trim()}`
                 };
-                if (change.position < 0 || change.position >= parameters.length) {
-                    parameters.push(newParam);
-                }
-                else {
-                    parameters.splice(change.position, 0, newParam);
-                }
-            }
-            if (isRemoveParameterChange(change)) {
-                const index = this.resolveParameterIndex(parameters, change.parameterNameOrIndex);
-                if (index >= 0) {
-                    parameters.splice(index, 1);
-                }
-            }
-            if (isReorderParametersChange(change)) {
-                const newParams = [];
-                for (const nameOrIndex of change.newOrder) {
-                    const index = this.resolveParameterIndex(parameters, nameOrIndex);
-                    if (index >= 0) {
-                        newParams.push(parameters[index]);
-                    }
-                }
-                parameters = newParams;
-            }
-            if (isChangeParameterTypeChange(change)) {
-                const index = this.resolveParameterIndex(parameters, change.parameterNameOrIndex);
-                if (index >= 0) {
-                    parameters[index] = { ...parameters[index], type: change.newType };
-                }
-            }
-            if (isRenameParameterChange(change)) {
-                const index = this.resolveParameterIndex(parameters, change.parameterNameOrIndex);
-                if (index >= 0) {
-                    parameters[index] = { ...parameters[index], name: change.newName };
-                }
-            }
-            if (isChangeDefaultValueChange(change)) {
-                const index = this.resolveParameterIndex(parameters, change.parameterNameOrIndex);
-                if (index >= 0) {
-                    parameters[index] = {
-                        ...parameters[index],
-                        defaultValue: change.newDefaultValue,
-                        optional: change.newDefaultValue !== undefined || parameters[index].optional
-                    };
-                }
-            }
-            if (isToggleOptionalChange(change)) {
-                const index = this.resolveParameterIndex(parameters, change.parameterNameOrIndex);
-                if (index >= 0) {
-                    parameters[index] = { ...parameters[index], optional: change.optional };
-                }
-            }
+            });
+            builder.addTextChange(updateFilePath, edits, TextEditOperationType.Modify);
         }
-        return {
-            ...signature,
-            parameters
-        };
+        // 設定描述
+        const originalParams = result.originalSignature.parameters.map(p => p.name).join(', ');
+        const newParams = result.newSignature.parameters.map(p => p.name).join(', ');
+        builder.withDescription(`Changed signature of ${result.originalSignature.name}: (${originalParams}) -> (${newParams})`);
+        return builder.build();
     }
     /**
      * 生成定義更新
@@ -252,267 +174,6 @@ export class ChangeSignatureService {
             location: originalSignature.location
         };
     }
-    /**
-     * 生成呼叫點更新
-     * 效能優化：按檔案分組後批次讀取，避免重複讀取同一檔案
-     * 檔案讀取次數從 O(N) 降到 O(M)，N = callSites 數量，M = 不重複檔案數
-     * 支援多行呼叫點：正確處理跨多行的函式呼叫
-     */
-    async generateCallSiteUpdates(callSites, originalSignature, newSignature, changes) {
-        const updates = [];
-        // 建立參數映射
-        const parameterMapping = this.createParameterMapping(originalSignature, newSignature, changes);
-        // 按檔案分組 callSites，避免重複讀取同一檔案
-        const callSitesByFile = new Map();
-        for (const callSite of callSites) {
-            const filePath = callSite.location.filePath;
-            const existing = callSitesByFile.get(filePath);
-            if (existing) {
-                existing.push(callSite);
-            }
-            else {
-                callSitesByFile.set(filePath, [callSite]);
-            }
-        }
-        // 批次讀取所有不重複的檔案並處理
-        for (const [filePath, fileCallSites] of callSitesByFile) {
-            const content = await this.readFile(filePath);
-            if (!content) {
-                continue;
-            }
-            const lines = content.split('\n');
-            // 處理該檔案的所有 callSites
-            for (const callSite of fileCallSites) {
-                const startLineIndex = callSite.location.range.start.line - 1;
-                const endLineIndex = callSite.location.range.end.line - 1;
-                const isMultiline = startLineIndex !== endLineIndex;
-                // 建立新的參數列表
-                const newArgs = this.mapCallSiteArguments(callSite, parameterMapping, changes, originalSignature);
-                // 找到呼叫的括號位置
-                const startLine = lines[startLineIndex];
-                const funcNameIndex = startLine.indexOf(callSite.functionName);
-                if (funcNameIndex < 0) {
-                    continue;
-                }
-                const openParenIndex = startLine.indexOf('(', funcNameIndex);
-                if (isMultiline) {
-                    // 多行呼叫點：提取完整的原始程式碼並替換
-                    const originalCode = this.extractMultilineCode(lines, startLineIndex, endLineIndex);
-                    // 檢測原始呼叫的格式風格
-                    const originalStyle = this.detectCallStyle(lines, startLineIndex, endLineIndex);
-                    // 生成新的參數字串（保留原始風格）
-                    const newArgsString = this.formatArgsWithStyle(newArgs, originalStyle);
-                    // 生成新的程式碼
-                    const newCode = startLine.substring(0, openParenIndex + 1)
-                        + newArgsString
-                        + ')' + this.getTrailingContent(lines, endLineIndex, callSite.location.range.end.column - 1);
-                    if (newCode !== originalCode) {
-                        updates.push({
-                            filePath: callSite.location.filePath,
-                            originalCode,
-                            newCode,
-                            location: callSite.location
-                        });
-                    }
-                }
-                else {
-                    // 單行呼叫點：保持原有邏輯
-                    const closeParenIndex = this.findMatchingParen(startLine, openParenIndex);
-                    const newArgsString = newArgs.join(', ');
-                    const newLine = startLine.substring(0, openParenIndex + 1)
-                        + newArgsString
-                        + startLine.substring(closeParenIndex);
-                    if (newLine !== startLine) {
-                        updates.push({
-                            filePath: callSite.location.filePath,
-                            originalCode: startLine,
-                            newCode: newLine,
-                            location: callSite.location
-                        });
-                    }
-                }
-            }
-        }
-        return updates;
-    }
-    /**
-     * 提取多行程式碼
-     */
-    extractMultilineCode(lines, startLine, endLine) {
-        if (startLine === endLine) {
-            return lines[startLine];
-        }
-        const result = [];
-        for (let i = startLine; i <= endLine; i++) {
-            result.push(lines[i]);
-        }
-        return result.join('\n');
-    }
-    /**
-     * 檢測呼叫風格
-     */
-    detectCallStyle(lines, startLine, endLine) {
-        const isMultiline = startLine !== endLine;
-        if (!isMultiline) {
-            return { multiline: false, indent: '', trailingComma: false };
-        }
-        // 檢測縮排（從第二行取得）
-        const secondLine = lines[startLine + 1] || '';
-        const indentMatch = secondLine.match(/^(\s*)/);
-        const indent = indentMatch ? indentMatch[1] : '  ';
-        // 檢測是否有尾隨逗號
-        const lastArgLine = lines[endLine - 1] || lines[endLine];
-        const trailingComma = lastArgLine.trimEnd().endsWith(',');
-        return { multiline: true, indent, trailingComma };
-    }
-    /**
-     * 根據風格格式化參數
-     */
-    formatArgsWithStyle(args, style) {
-        if (!style.multiline || args.length === 0) {
-            return args.join(', ');
-        }
-        // 多行格式
-        const formattedArgs = args.map(arg => `${style.indent}${arg}`);
-        const separator = style.trailingComma ? ',\n' : ',\n';
-        return '\n' + formattedArgs.join(separator) + (style.trailingComma ? ',' : '') + '\n';
-    }
-    /**
-     * 取得結束行的尾隨內容（右括號之後的部分）
-     */
-    getTrailingContent(lines, endLine, closeParenColumn) {
-        const line = lines[endLine];
-        // 找到右括號後的內容
-        return line.substring(closeParenColumn + 1);
-    }
-    /**
-     * 建立參數映射
-     */
-    createParameterMapping(originalSignature, newSignature, changes) {
-        const mapping = new Map();
-        // 初始化：原始索引 -> 新索引
-        let currentParams = originalSignature.parameters.map((p, i) => ({ name: p.name, originalIndex: i }));
-        // 處理每個變更
-        for (const change of changes) {
-            if (isRemoveParameterChange(change)) {
-                const index = this.resolveParameterIndex(currentParams.map(p => ({ name: p.name })), change.parameterNameOrIndex);
-                if (index >= 0) {
-                    currentParams.splice(index, 1);
-                }
-            }
-            if (isReorderParametersChange(change)) {
-                const newOrder = [];
-                for (const nameOrIndex of change.newOrder) {
-                    const index = this.resolveParameterIndex(currentParams.map(p => ({ name: p.name })), nameOrIndex);
-                    if (index >= 0) {
-                        newOrder.push(currentParams[index]);
-                    }
-                }
-                currentParams = newOrder;
-            }
-            if (isAddParameterChange(change)) {
-                const newParam = { name: change.name, originalIndex: -1, value: change.callSiteValue || change.defaultValue };
-                if (change.position < 0 || change.position >= currentParams.length) {
-                    currentParams.push(newParam);
-                }
-                else {
-                    currentParams.splice(change.position, 0, newParam);
-                }
-            }
-        }
-        // 建立最終映射
-        for (let newIndex = 0; newIndex < currentParams.length; newIndex++) {
-            const param = currentParams[newIndex];
-            if (param.originalIndex >= 0) {
-                mapping.set(param.originalIndex, { newIndex });
-            }
-            else if ('value' in param) {
-                // 新增的參數，設定預設值
-                mapping.set(-1 - newIndex, { newIndex, value: param.value });
-            }
-        }
-        return mapping;
-    }
-    /**
-     * 映射呼叫點參數
-     * 處理省略的可選參數：當可選參數被省略時，重排後需要插入 undefined
-     */
-    mapCallSiteArguments(callSite, parameterMapping, changes, originalSignature) {
-        const result = [];
-        // 找出新參數的數量
-        let maxNewIndex = -1;
-        for (const { newIndex } of parameterMapping.values()) {
-            maxNewIndex = Math.max(maxNewIndex, newIndex);
-        }
-        // 初始化結果陣列
-        for (let i = 0; i <= maxNewIndex; i++) {
-            result.push('');
-        }
-        // 映射原始參數
-        for (const [originalIndex, { newIndex }] of parameterMapping.entries()) {
-            if (originalIndex >= 0) {
-                if (originalIndex < callSite.arguments.length) {
-                    // 呼叫點有提供此參數
-                    result[newIndex] = callSite.arguments[originalIndex].value;
-                }
-                else {
-                    // 呼叫點省略了此可選參數
-                    // 檢查這個位置是否需要填入 undefined（當後面有其他參數時）
-                    const param = originalSignature.parameters[originalIndex];
-                    if (param && (param.optional || param.defaultValue)) {
-                        // 標記為需要填入 undefined（如果後面有非空參數）
-                        result[newIndex] = '\0OMITTED\0';
-                    }
-                }
-            }
-        }
-        // 填入新增參數的值
-        const addedPositions = new Set();
-        for (const change of changes) {
-            if (isAddParameterChange(change)) {
-                // 使用 callSiteValue 或 defaultValue（驗證階段已確保至少有一個值）
-                const value = change.callSiteValue || change.defaultValue;
-                const position = change.position < 0 ? result.length - 1 : Math.min(change.position, result.length - 1);
-                if (position >= 0 && position < result.length && !result[position]) {
-                    result[position] = value;
-                    addedPositions.add(position);
-                }
-            }
-        }
-        // 處理省略的可選參數：
-        // 如果省略的參數後面有非空參數，則需要填入 undefined
-        // 否則可以完全省略
-        const processedResult = [];
-        let lastNonEmptyIndex = -1;
-        // 找到最後一個非空參數的索引
-        for (let i = result.length - 1; i >= 0; i--) {
-            if (result[i] !== '' && result[i] !== '\0OMITTED\0') {
-                lastNonEmptyIndex = i;
-                break;
-            }
-        }
-        // 建立最終結果
-        for (let i = 0; i <= lastNonEmptyIndex; i++) {
-            if (result[i] === '\0OMITTED\0') {
-                // 省略的可選參數，但後面有其他參數，需要填入 undefined
-                processedResult.push('undefined');
-            }
-            else if (result[i] === '') {
-                // 空值，檢查是否是新增的位置
-                if (addedPositions.has(i)) {
-                    processedResult.push('undefined');
-                }
-                else {
-                    // 不應該出現的情況，填入 undefined 以避免語法錯誤
-                    processedResult.push('undefined');
-                }
-            }
-            else {
-                processedResult.push(result[i]);
-            }
-        }
-        return processedResult;
-    }
     /**
      * 執行變更
      */
@@ -595,61 +256,6 @@ export class ChangeSignatureService {
         }
         return line.length;
     }
-    /**
-     * 解析參數名稱
-     */
-    resolveParameterName(signature, nameOrIndex) {
-        if (typeof nameOrIndex === 'number') {
-            return signature.parameters[nameOrIndex]?.name;
-        }
-        return signature.parameters.find(p => p.name === nameOrIndex)?.name;
-    }
-    /**
-     * 解析參數索引
-     */
-    resolveParameterIndex(parameters, nameOrIndex) {
-        if (typeof nameOrIndex === 'number') {
-            return nameOrIndex >= 0 && nameOrIndex < parameters.length ? nameOrIndex : -1;
-        }
-        return parameters.findIndex(p => p.name === nameOrIndex);
-    }
-    /**
-     * 驗證可選參數順序
-     * TypeScript 規則：可選參數必須在所有必選參數之後
-     * 例外：有預設值的參數視為可選，rest 參數必須在最後
-     */
-    validateOptionalParameterOrder(signature, newOrder) {
-        // 根據新順序建立參數列表
-        const reorderedParams = [];
-        for (const nameOrIndex of newOrder) {
-            const index = this.resolveParameterIndex(signature.parameters, nameOrIndex);
-            if (index >= 0) {
-                reorderedParams.push(signature.parameters[index]);
-            }
-        }
-        // 檢查可選參數是否在必選參數之前
-        let foundOptional = false;
-        let firstOptionalParam = null;
-        for (const param of reorderedParams) {
-            const isOptional = param.optional || param.defaultValue !== undefined;
-            const isRest = param.rest;
-            if (isOptional && !isRest) {
-                foundOptional = true;
-                if (!firstOptionalParam) {
-                    firstOptionalParam = param;
-                }
-            }
-            else if (!isOptional && !isRest && foundOptional) {
-                // 找到必選參數在可選參數之後
-                return {
-                    code: ChangeSignatureErrorCode.OptionalBeforeRequired,
-                    message: `可選參數 '${firstOptionalParam.name}' 不能位於必選參數 '${param.name}' 之前`,
-                    parameterName: param.name
-                };
-            }
-        }
-        return null;
-    }
     /**
      * 取得專案檔案
      */
@@ -707,12 +313,22 @@ export class ChangeSignatureService {
      * 建立錯誤結果
      */
     createErrorResult(code, message) {
+        // 錯誤情況下必須提供佔位簽名資訊
+        const emptyRange = { start: { line: 0, column: 0, offset: 0 }, end: { line: 0, column: 0, offset: 0 } };
+        const emptyLocation = { filePath: '', range: emptyRange };
+        const emptySignature = {
+            name: '',
+            parameters: [],
+            location: emptyLocation,
+            isMethod: false,
+            modifiers: []
+        };
         return {
             success: false,
             error: message,
-            originalSignature: null,
-            newSignature: null,
-            definitionUpdate: null,
+            originalSignature: emptySignature,
+            newSignature: emptySignature,
+            definitionUpdate: { filePath: '', originalCode: '', newCode: '', location: emptyLocation },
             callSiteUpdates: [],
             executed: false,
             stats: {