@skyramp/mcp 0.2.3 → 0.2.5-rc.1

package/build/tools/test-management/actionsTool.js

@@ -2,11 +2,11 @@ import { z } from "zod";
 import { logger } from "../../utils/logger.js";
 import { StateManager, } from "../../utils/AnalysisStateManager.js";
 import { TestSource, DriftAction, RecommendationPriority, EstimatedWork } from "../../types/TestAnalysis.js";
-import { TestType } from "../../types/TestTypes.js";
 import * as fs from "fs";
 import * as path from "path";
 import { AnalyticsService } from "../../services/AnalyticsService.js";
 import { toolError } from "../../utils/utils.js";
+import { buildRenameStrategy, buildFileRenameStrategy, buildUpdateStrategy, buildRegenerateStrategy, buildUpdateFileInstruction, buildRegenerateFileInstruction, } from "../../prompts/test-maintenance/actionsInstructions.js";
 /**
  * Compute a suggested new filename when an endpoint is renamed.
  */
@@ -44,22 +44,6 @@ export function computeRenamedTestFile(testFile, renames) {
     }
     return newFilePath;
 }
-/**
- * Select test types to generate based on HTTP method.
- */
-function selectTestTypesForEndpoint(method) {
-    switch (method.toUpperCase()) {
-        case "POST":
-        case "PUT":
-        case "PATCH":
-            return [TestType.INTEGRATION, TestType.CONTRACT];
-        case "DELETE":
-            return [TestType.INTEGRATION, TestType.SMOKE];
-        case "GET":
-        default:
-            return [TestType.CONTRACT, TestType.SMOKE];
-    }
-}
 const recommendationSchema = z.object({
     testFile: z
         .string()
@@ -106,7 +90,7 @@ const actionsSchema = {
     recommendations: z
         .array(recommendationSchema)
         .optional()
-        .describe("LLM drift assessment — one entry per test assessed. Required for UPDATE instructions to be emitted; omitting results in no maintenance actions."),
+        .describe("LLM Drift assessment produced by skyramp_analyze_test_health — one entry per test assessed, including IGNORE and VERIFY entries. Required for UPDATE instructions to be emitted; omitting results in no maintenance actions. For [external] tests: UPDATE edits are applied automatically; REGENERATE and DELETE are surfaced as report-only findings and never rewrite or delete a user-authored file."),
 };
 const TOOL_NAME = "skyramp_actions";
 export function registerActionsTool(server) {
@@ -117,21 +101,7 @@ export function registerActionsTool(server) {
             idempotentHint: false,
             openWorldHint: true,
         },
-        description: `Execute test maintenance and generation actions — final step of the unified Test Health Analysis Flow.
-
-**PREREQUISITE:** Call \`skyramp_analyze_changes\` (produces the stateFile), then \`skyramp_analyze_test_health\` (runs the drift assessment). This tool reads the stateFile from \`skyramp_analyze_changes\`.
-
-Call this tool after completing the drift assessment. It executes maintenance actions automatically from the stateFile — no user confirmation required.
-
-**EXECUTING ACTIONS:**
-- UPDATE: Tests with drift — emits targeted per-file edit instructions driven by updateInstructions and renamedEndpoints
-- REGENERATE: Emits file-level summary; follow up by calling the appropriate generation tool (e.g. skyramp_integration_test_generation) with the same filename to overwrite
-- VERIFY: Emits file-level summary for human review — no automated edits
-- ADD: Auto-generates tests for new endpoints via LLM instructions
-
-**OUTPUT:**
-Comprehensive report with executed actions, summary, and instructions for ADD recommendations
-`,
+        description: `Execute test maintenance actions — final step of the unified Test Health Analysis Flow.`,
         inputSchema: actionsSchema,
     }, async (args) => {
         let errorResult;
@@ -146,17 +116,22 @@ Comprehensive report with executed actions, summary, and instructions for ADD re
                 errorResult = toolError(`State file is empty or invalid: ${args.stateFile}. Call skyramp_analyze_changes first to generate a valid state file.`);
                 return errorResult;
             }
-            // External tests must not be candidates for UPDATE/REGENERATE/DELETE actions.
-            // Default source to Skyramp for backwards compat with state files created before the source field existed.
-            const testAnalysisResults = (stateData.existingTests || []).filter((t) => (t.source ?? TestSource.Skyramp) !== TestSource.External);
-            const newEndpoints = stateData.newEndpoints || [];
             // Resolve repo root for path normalization and security checks.
             const repoRoot = repositoryPath ? path.resolve(repositoryPath) : "";
-            // Set of non-external (Skyramp-generated) test file paths — the only files
-            // that may receive UPDATE/REGENERATE/DELETE actions. Using the allowlist rather
-            // than a blocklist catches both external tests AND hallucinated paths the LLM
-            // may supply that are not present in the scanned catalog at all.
-            const skyrampTestFiles = new Set(testAnalysisResults.map((t) => t.testFile));
+            // Relevant external (user-written) tests: UPDATE is permitted; REGENERATE/DELETE
+            // are report-only (the LLM may recommend them but this tool will not apply them).
+            // Paths are stored relative to repositoryPath in the state file — re-absolutize.
+            const relevantExternalPaths = new Set((stateData.repositoryAnalysis?.relevantExternalTestPaths ?? []).map((p) => path.isAbsolute(p) ? p : path.resolve(repoRoot, p)));
+            // Allowlist: Skyramp-generated tests + relevant external tests.
+            // Using an allowlist (not a blocklist) catches hallucinated paths the LLM
+            // may supply that are not in the scanned catalog at all.
+            const testAnalysisResults = (stateData.existingTests || []);
+            const skyrampTestFiles = new Set(testAnalysisResults
+                .filter((t) => (t.source ?? TestSource.Skyramp) !== TestSource.External)
+                .map((t) => t.testFile));
+            const externalTestFiles = new Set(testAnalysisResults
+                .filter((t) => (t.source ?? TestSource.Skyramp) === TestSource.External)
+                .map((t) => t.testFile));
             // ── Build recommendations from LLM-supplied drift assessment ──
             // The LLM performs the drift assessment in context after skyramp_analyze_test_health
             // and passes results here directly — analyzeTestHealthTool never writes assessment
@@ -165,23 +140,55 @@ Comprehensive report with executed actions, summary, and instructions for ADD re
             (args.recommendations ?? []).forEach((rec) => {
                 // Schema requires absolute paths; resolve any relative paths defensively
                 // against repoRoot in case the LLM sends a relative path despite the schema.
-                const resolvedFile = path.isAbsolute(rec.testFile)
+                // Normalize via path.resolve to collapse any `..` segments before the
+                // traversal guard — otherwise "/repo/../etc/passwd" would pass startsWith.
+                const rawFile = path.isAbsolute(rec.testFile)
                     ? rec.testFile
                     : repoRoot
                         ? path.resolve(repoRoot, rec.testFile)
                         : rec.testFile;
+                const resolvedFile = path.resolve(rawFile);
                 // Reject files outside the repo root (path-traversal guard).
-                if (repoRoot && !resolvedFile.startsWith(repoRoot + path.sep) && resolvedFile !== repoRoot) {
+                // Exception: files already in the scanned test catalog (externalTestFiles / skyrampTestFiles)
+                // may legitimately live in a separate testsRepoDir outside repositoryPath — catalog
+                // membership is a sufficient provenance check for those paths.
+                const isInCatalog = skyrampTestFiles.has(resolvedFile) || skyrampTestFiles.has(rec.testFile)
+                    || externalTestFiles.has(resolvedFile) || externalTestFiles.has(rec.testFile);
+                if (repoRoot && !isInCatalog && !resolvedFile.startsWith(repoRoot + path.sep) && resolvedFile !== repoRoot) {
                     logger.warning(`Skipping recommendation for path outside repo root: ${rec.testFile}`);
                     return;
                 }
-                // Guard: only Skyramp-generated tests may receive UPDATE/REGENERATE/DELETE.
-                // Using an allowlist (skyrampTestFiles) rather than a blocklist catches both
-                // external tests and hallucinated paths the LLM may supply that are not in
-                // the scanned catalog. IGNORE/VERIFY are informational and pass through.
+                // Guard: only files present in the scanned test catalog may receive any
+                // recommendation. Hallucinated paths (not in either set) are rejected for
+                // all actions, including VERIFY and IGNORE, to keep the report consistent
+                // with what was actually discovered.
+                const isSkyramp = skyrampTestFiles.has(resolvedFile) || skyrampTestFiles.has(rec.testFile);
+                const isRelevantExternal = (externalTestFiles.has(resolvedFile) || externalTestFiles.has(rec.testFile)) &&
+                    (relevantExternalPaths.has(resolvedFile) || relevantExternalPaths.has(rec.testFile));
+                const isInAnyKnownCatalog = isSkyramp || isRelevantExternal
+                    || externalTestFiles.has(resolvedFile) || externalTestFiles.has(rec.testFile);
+                if (!isInAnyKnownCatalog) {
+                    logger.warning(`Skipping ${rec.action} for unknown test (not in scanned catalog): ${rec.testFile}`);
+                    return;
+                }
                 const isActionable = [DriftAction.Update, DriftAction.Regenerate, DriftAction.Delete].includes(rec.action);
-                if (isActionable && !skyrampTestFiles.has(resolvedFile) && !skyrampTestFiles.has(rec.testFile)) {
-                    logger.warning(`Skipping ${rec.action} for non-Skyramp or unknown test: ${rec.testFile}`);
+                if (isActionable && !isSkyramp && !isRelevantExternal) {
+                    logger.warning(`Skipping ${rec.action} for irrelevant external test: ${rec.testFile}`);
+                    return;
+                }
+                // REGENERATE and DELETE on external tests are report-only — convert to VERIFY so
+                // the finding surfaces to the developer without touching the file.
+                if (isRelevantExternal && !isSkyramp &&
+                    (rec.action === DriftAction.Regenerate || rec.action === DriftAction.Delete)) {
+                    recommendations.push({
+                        testFile: resolvedFile,
+                        action: DriftAction.Verify,
+                        priority: rec.priority ?? RecommendationPriority.Medium,
+                        rationale: `[external test — needs manual review] ${rec.rationale ?? ""}`.trimEnd(),
+                        estimatedWork: rec.estimatedWork ?? EstimatedWork.Small,
+                        updateInstructions: "",
+                        renamedEndpoints: [],
+                    });
                     return;
                 }
                 recommendations.push({
@@ -194,7 +201,7 @@ Comprehensive report with executed actions, summary, and instructions for ADD re
                     renamedEndpoints: rec.renamedEndpoints ?? [],
                 });
             });
-            // ── Process UPDATE recommendations ──
+            // ── Process UPDATE and REGENERATE recommendations ──
             // Deduplicate by testFile — keep the highest-priority entry when the LLM
             // repeats a file. Priority order: high > medium > low.
             const priorityRank = {
@@ -202,32 +209,46 @@ Comprehensive report with executed actions, summary, and instructions for ADD re
                 [RecommendationPriority.Medium]: 1,
                 [RecommendationPriority.Low]: 0,
             };
+            // Build per-file winner maps. REGENERATE beats UPDATE for the same file —
+            // if the LLM emits both, keep REGENERATE (higher severity) and drop UPDATE.
             const updateByFile = new Map();
+            const regenerateByFile = new Map();
             for (const rec of recommendations) {
-                if (rec.action !== DriftAction.Update)
-                    continue;
-                const existing = updateByFile.get(rec.testFile);
-                if (!existing || priorityRank[rec.priority] > priorityRank[existing.priority]) {
-                    updateByFile.set(rec.testFile, rec);
+                if (rec.action === DriftAction.Regenerate) {
+                    const existing = regenerateByFile.get(rec.testFile);
+                    if (!existing || priorityRank[rec.priority] > priorityRank[existing.priority]) {
+                        regenerateByFile.set(rec.testFile, rec);
+                    }
+                }
+                else if (rec.action === DriftAction.Update) {
+                    // Only add to updateByFile if no REGENERATE exists for this file.
+                    if (!regenerateByFile.has(rec.testFile)) {
+                        const existing = updateByFile.get(rec.testFile);
+                        if (!existing || priorityRank[rec.priority] > priorityRank[existing.priority]) {
+                            updateByFile.set(rec.testFile, rec);
+                        }
+                    }
                 }
             }
+            // Second pass: drop any UPDATE entries for files that ended up with REGENERATE
+            // (handles ordering where UPDATE was inserted before REGENERATE was seen).
+            for (const file of regenerateByFile.keys()) {
+                updateByFile.delete(file);
+            }
             const updateRecommendations = Array.from(updateByFile.values());
+            const regenerateRecommendations = Array.from(regenerateByFile.values());
             const fileInstructions = [];
             const testFilesToUpdate = [];
             const testFileContentMap = new Map();
+            // ── UPDATE: read file, emit targeted edit instructions ──
             for (const rec of updateRecommendations) {
                 if (!rec.testFile) {
                     logger.warning("Recommendation missing testFile", rec);
                     continue;
                 }
                 testFilesToUpdate.push(rec.testFile);
-                const testData = testAnalysisResults.find((t) => t.testFile === rec.testFile);
-                const driftData = testData?.drift;
-                const driftChanges = driftData?.changes || [];
-                let testFileContent = "";
                 try {
-                    testFileContent = fs.readFileSync(rec.testFile, "utf-8");
-                    testFileContentMap.set(rec.testFile, testFileContent);
+                    testFileContentMap.set(rec.testFile, fs.readFileSync(rec.testFile, "utf-8"));
                 }
                 catch (error) {
                     logger.error(`Failed to read test file ${rec.testFile}: ${error.message}`);
@@ -235,173 +256,83 @@ Comprehensive report with executed actions, summary, and instructions for ADD re
                 }
                 const renames = rec.renamedEndpoints || [];
                 const isRenameUpdate = renames.length > 0;
-                let instruction = `\n### ${rec.testFile}\n\n`;
-                instruction += `**Priority:** ${rec.priority} | `;
-                instruction += `**Estimated Effort:** ${rec.estimatedWork || EstimatedWork.Small}\n\n`;
-                instruction += `**Why Update Needed:** ${rec.rationale}\n\n`;
-                if (isRenameUpdate) {
-                    instruction += `**Endpoint Rename Detected — Path Substitution Required:**\n\n`;
-                    instruction += `| Old Path | New Path | Method |\n`;
-                    instruction += `|----------|----------|--------|\n`;
-                    for (const rename of renames) {
-                        instruction += `| \`${rename.oldPath}\` | \`${rename.newPath}\` | ${rename.method} |\n`;
-                    }
-                    instruction += `\n`;
-                    instruction += `**Action:** Find-and-replace all occurrences of the old path with the new path in this test file. `;
-                    instruction += `Do NOT change any test logic, assertions, or structure — only update the URL paths.\n\n`;
-                    const suggestedNewFile = computeRenamedTestFile(rec.testFile, renames);
-                    if (suggestedNewFile) {
-                        instruction += `**File Rename:** After updating the paths, rename this file:\n`;
-                        instruction += `- From: \`${path.basename(rec.testFile)}\`\n`;
-                        instruction += `- To: \`${path.basename(suggestedNewFile)}\`\n\n`;
-                        rec._suggestedNewFile = suggestedNewFile;
-                    }
-                }
-                const recUpdateInstructions = rec.updateInstructions ?? "";
-                if (recUpdateInstructions) {
-                    instruction += `**What to change:**\n\n${recUpdateInstructions}\n\n`;
-                    instruction += `Match the assertion style already used in the file. `;
-                    instruction += `Preserve all existing test logic — only add or adjust what is described above.\n\n`;
-                }
-                else if (!isRenameUpdate) {
-                    instruction += `**Action:** Update this test file per the rationale above. `;
-                    instruction += `Match the assertion style already used in the file. `;
-                    instruction += `Preserve all existing test logic — only add or adjust the minimum required assertions.\n\n`;
-                }
-                if (driftData) {
-                    instruction += `**Analysis:**\n`;
-                    instruction += `- Changes Detected: ${driftData.changes?.length || 0}\n`;
-                    instruction += `- Affected Files: ${driftData.affectedFiles.files?.length || 0}\n\n`;
+                const suggestedNewFile = isRenameUpdate
+                    ? computeRenamedTestFile(rec.testFile, renames) ?? undefined
+                    : undefined;
+                if (suggestedNewFile)
+                    rec._suggestedNewFile = suggestedNewFile;
+                fileInstructions.push(buildUpdateFileInstruction({
+                    testFile: rec.testFile,
+                    renames,
+                    suggestedNewFile,
+                    updateInstructions: rec.updateInstructions,
+                    rationale: rec.rationale,
+                }));
+            }
+            // ── REGENERATE: read file for context, emit overwrite instructions ──
+            const regenerateInstructions = [];
+            const testFilesToRegenerate = [];
+            const regenerateContentMap = new Map();
+            for (const rec of regenerateRecommendations) {
+                if (!rec.testFile) {
+                    logger.warning("Recommendation missing testFile", rec);
+                    continue;
                 }
-                if (driftChanges.length > 0) {
-                    instruction += `**Changes Detected:**\n`;
-                    driftChanges.forEach((change) => {
-                        instruction += `**${change.type}** (Severity: ${change.severity}): ${change.description}\n`;
-                        if (change.details) {
-                            instruction += `   └─ ${change.details}\n`;
-                        }
-                        if (change.file) {
-                            instruction += `   └─ In: \`${change.file}\`\n`;
-                        }
-                    });
-                    instruction += `\n`;
+                testFilesToRegenerate.push(rec.testFile);
+                try {
+                    regenerateContentMap.set(rec.testFile, fs.readFileSync(rec.testFile, "utf-8"));
                 }
-                // File content is provided in LLM_INSTRUCTIONS.update_context.current_content — omit here to avoid duplication.
-                fileInstructions.push(instruction);
-            }
-            // ── Build ADD section for new endpoints ──
-            const wsBaseUrl = stateData.repositoryAnalysis?.wsBaseUrl || "";
-            const wsSchemaPath = stateData.repositoryAnalysis?.wsSchemaPath || "";
-            const primaryLanguage = stateData.repositoryAnalysis?.projectMeta?.primaryLanguage ||
-                "python";
-            const primaryFramework = stateData.repositoryAnalysis?.projectMeta?.primaryFramework ||
-                "pytest";
-            // Determine output directory from workspace config or repo path
-            const outputDir = repositoryPath
-                ? path.join(repositoryPath, "tests", "skyramp")
-                : "./tests/skyramp";
-            const addSummaryLines = [];
-            const llmToolCalls = [];
-            for (const ep of newEndpoints) {
-                const testTypes = selectTestTypesForEndpoint(ep.method);
-                const endpointURL = wsBaseUrl
-                    ? wsBaseUrl.replace(/\/$/, "") + ep.path
-                    : ep.path;
-                addSummaryLines.push(`- ${ep.method} ${ep.path} → ${testTypes.join(", ")} tests`);
-                for (const testType of testTypes) {
-                    let toolName = "";
-                    switch (testType) {
-                        case TestType.CONTRACT:
-                            toolName = "skyramp_contract_test_generation";
-                            break;
-                        case TestType.INTEGRATION:
-                            toolName = "skyramp_integration_test_generation";
-                            break;
-                        case TestType.SMOKE:
-                            toolName = "skyramp_smoke_test_generation";
-                            break;
-                        default:
-                            toolName = "skyramp_contract_test_generation";
-                    }
-                    llmToolCalls.push({
-                        tool: toolName,
-                        params: {
-                            endpointURL,
-                            method: ep.method,
-                            language: primaryLanguage,
-                            framework: primaryFramework,
-                            outputDir,
-                            ...(wsSchemaPath ? { apiSchema: wsSchemaPath } : {}),
-                        },
-                        endpoint: `${ep.method} ${ep.path}`,
-                        testType: testType,
-                    });
+                catch (error) {
+                    logger.warning(`Could not read file for REGENERATE context ${rec.testFile}: ${error.message}`);
                 }
+                regenerateInstructions.push(buildRegenerateFileInstruction({
+                    testFile: rec.testFile,
+                    updateInstructions: rec.updateInstructions,
+                    outputDir: path.dirname(rec.testFile),
+                    outputFile: path.basename(rec.testFile),
+                }));
             }
             // ── Build response text ──
-            let responseText = `# Test Actions Report\n\n`;
+            const otherRecs = recommendations.filter((rec) => rec.action !== DriftAction.Update && rec.action !== DriftAction.Regenerate);
+            const sections = [`# Test Actions Report`];
             if (updateRecommendations.length > 0) {
-                responseText += `## Tests Requiring Updates (${updateRecommendations.length})\n\n`;
-                testFilesToUpdate.forEach((file, idx) => {
-                    responseText += `${idx + 1}. \`${file}\`\n`;
-                });
-                responseText += `\n---\n`;
-                responseText += fileInstructions.join("\n---\n");
-            }
-            if (newEndpoints.length > 0) {
-                responseText += `\n## New Endpoint Tests to Generate (${newEndpoints.length} endpoints)\n\n`;
-                addSummaryLines.forEach((line) => {
-                    responseText += `${line}\n`;
-                });
-                responseText += `\nThe following tests will be generated automatically.\n`;
-            }
-            if (updateRecommendations.length === 0 && newEndpoints.length === 0) {
-                const otherRecs = recommendations.filter((rec) => rec.action !== DriftAction.Update);
-                if (otherRecs.length > 0) {
-                    responseText += `## Recommendations (${otherRecs.length})\n\n`;
-                    otherRecs.forEach((rec) => {
-                        responseText += `- **${rec.testFile}** — Action: ${rec.action}, Priority: ${rec.priority}\n`;
-                        responseText += `  ${rec.rationale}\n`;
-                    });
-                }
-                else {
-                    responseText += `No action required. All existing tests appear healthy.\n`;
-                }
+                sections.push(`## Tests Requiring Updates (${updateRecommendations.length})\n\n` +
+                    testFilesToUpdate.map((f, i) => `${i + 1}. \`${f}\``).join("\n") +
+                    `\n\n---\n` +
+                    fileInstructions.join("\n---\n"));
             }
-            responseText += `\n\n## Next Steps\n\n`;
-            responseText += `The AI assistant will:\n`;
-            let stepNumber = 1;
-            if (updateRecommendations.length > 0) {
-                responseText += `${stepNumber++}. Review the changes and issues for each test\n`;
-                responseText += `${stepNumber++}. Update test files to fix compatibility issues\n`;
-                responseText += `${stepNumber++}. Preserve original test logic and structure\n`;
-                responseText += `${stepNumber++}. Show you the changes made\n`;
+            if (regenerateRecommendations.length > 0) {
+                sections.push(`## Tests Requiring Regeneration (${regenerateRecommendations.length})\n\n` +
+                    testFilesToRegenerate.map((f, i) => `${i + 1}. \`${f}\``).join("\n") +
+                    `\n\n---\n` +
+                    regenerateInstructions.join("\n---\n"));
             }
-            if (newEndpoints.length > 0) {
-                responseText += `${stepNumber++}. Generate new tests for new endpoints\n`;
+            if (otherRecs.length > 0) {
+                sections.push(`## Other Findings (${otherRecs.length})\n\n` +
+                    otherRecs.map((rec) => `- **${rec.testFile}** — Action: ${rec.action}, Priority: ${rec.priority}` +
+                        (rec.rationale ? ` — ${rec.rationale}` : "")).join("\n"));
             }
-            responseText += `\n**This tool is currently in Early Preview stage. Please verify the results.**\n`;
-            // ── Build LLM instructions for UPDATE ──
-            const allRenames = [];
-            for (const rec of updateRecommendations) {
-                if (rec.renamedEndpoints && rec.renamedEndpoints.length > 0) {
-                    allRenames.push(...rec.renamedEndpoints);
-                }
+            else if (updateRecommendations.length === 0 && regenerateRecommendations.length === 0) {
+                sections.push(`No action required. All existing tests appear healthy.`);
             }
-            const uniqueRenames = allRenames.filter((r, i, arr) => arr.findIndex((x) => x.oldPath === r.oldPath &&
-                x.newPath === r.newPath &&
-                x.method === r.method) === i);
+            sections.push(`**This tool is currently in Early Preview stage. Please verify the results.**`);
+            const responseText = sections.join("\n\n");
+            // ── Build LLM instructions ──
+            const uniqueRenames = updateRecommendations
+                .flatMap((rec) => rec.renamedEndpoints ?? [])
+                .filter((r, i, arr) => arr.findIndex((x) => x.oldPath === r.oldPath && x.newPath === r.newPath && x.method === r.method) === i);
             const llmInstructionsObj = {
                 workflow: "test_maintenance",
                 action: "execute_updates",
                 auto_proceed: true,
                 files_to_update: testFilesToUpdate,
                 update_count: updateRecommendations.length,
+                files_to_regenerate: testFilesToRegenerate,
+                regenerate_count: regenerateRecommendations.length,
             };
             if (uniqueRenames.length > 0) {
                 llmInstructionsObj.endpoint_renames = uniqueRenames;
-                llmInstructionsObj.rename_strategy =
-                    "For each file, find-and-replace all occurrences of oldPath with newPath. Do NOT regenerate or restructure the test — only update the URL paths.";
+                llmInstructionsObj.rename_strategy = buildRenameStrategy();
                 const fileRenames = [];
                 for (const rec of updateRecommendations) {
                     if (rec._suggestedNewFile) {
@@ -410,25 +341,31 @@ Comprehensive report with executed actions, summary, and instructions for ADD re
                 }
                 if (fileRenames.length > 0) {
                     llmInstructionsObj.file_renames = fileRenames;
-                    llmInstructionsObj.file_rename_strategy =
-                        "After updating path content in each file, rename the file using 'mv' or equivalent. Use git mv if the repo tracks the file.";
+                    llmInstructionsObj.file_rename_strategy = buildFileRenameStrategy();
                 }
             }
             // Update context: per-file guidance + current content for the downstream LLM.
             // Including file content avoids re-reads on each Edit turn, reducing token usage.
-            const updateInstructionsFiles = [];
-            for (const rec of updateRecommendations) {
-                if (rec.updateInstructions) {
-                    const current_content = testFileContentMap.get(rec.testFile);
-                    updateInstructionsFiles.push({ file: rec.testFile, context: rec.updateInstructions, ...(current_content !== undefined && { current_content }) });
-                }
+            const updateContext = updateRecommendations
+                .filter((rec) => !!rec.updateInstructions)
+                .map((rec) => {
+                const current_content = testFileContentMap.get(rec.testFile);
+                return { file: rec.testFile, context: rec.updateInstructions, ...(current_content !== undefined && { current_content }) };
+            });
+            if (updateContext.length > 0) {
+                llmInstructionsObj.update_context = updateContext;
+                llmInstructionsObj.update_strategy = buildUpdateStrategy();
             }
-            if (updateInstructionsFiles.length > 0) {
-                llmInstructionsObj.update_context = updateInstructionsFiles;
-                llmInstructionsObj.update_strategy =
-                    "For each file in update_context, apply the changes described in context to the provided current_content. Write the result using the Edit tool. Do NOT re-read the file first. Match the assertion style already used in the file. Preserve all existing test logic. After applying all edits, call skyramp_enhance_assertions with each updated file path to strengthen the assertions.";
+            // REGENERATE context: existing file content gives the generation tool the
+            // endpoint URL, auth pattern, test type, and language to replicate.
+            if (regenerateRecommendations.length > 0) {
+                llmInstructionsObj.regenerate_context = regenerateRecommendations.map((rec) => {
+                    const existing_content = regenerateContentMap.get(rec.testFile);
+                    return { file: rec.testFile, rationale: rec.updateInstructions || rec.rationale, ...(existing_content !== undefined && { existing_content }) };
+                });
+                llmInstructionsObj.regenerate_strategy = buildRegenerateStrategy();
             }
-            const llmInstructions = `<!-- LLM_INSTRUCTIONS:\n${JSON.stringify(llmInstructionsObj, null, 2)}\n-->\n`;
+            const llmInstructions = JSON.stringify(llmInstructionsObj, null, 2);
             const contentBlocks = [
                 {
                     type: "text",
@@ -445,23 +382,6 @@ Comprehensive report with executed actions, summary, and instructions for ADD re
                     },
                 },
             ];
-            // ── Build ADD instructions for new endpoints ──
-            if (newEndpoints.length > 0 && llmToolCalls.length > 0) {
-                const addInstructionsObj = {
-                    workflow: "add_tests_for_new_endpoints",
-                    auto_proceed: true,
-                    instruction: "Call each tool in tool_calls immediately and in order. Do NOT ask for confirmation. If endpointURL is a bare path, read .skyramp/workspace.yml for baseUrl and prepend it.",
-                    tool_calls: llmToolCalls,
-                };
-                const addInstructions = `<!-- LLM_INSTRUCTIONS:\n${JSON.stringify(addInstructionsObj, null, 2)}\n-->\n`;
-                contentBlocks.push({
-                    type: "text",
-                    text: addInstructions,
-                    annotations: {
-                        audience: ["assistant"],
-                    },
-                });
-            }
             return {
                 content: contentBlocks,
             };