@skyramp/mcp 0.0.55 → 0.0.57

package/build/prompts/testbot/testbot-prompts.js

@@ -1,105 +1,131 @@
+import { ResourceTemplate, } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { z } from "zod";
 import { logger } from "../../utils/logger.js";
-function getTestbotRecommendationPrompt(prTitle, prDescription, summaryOutputFile) {
+import { AnalyticsService } from "../../services/AnalyticsService.js";
+function getTestbotPrompt(prTitle, prDescription, diffFile, testDirectory, summaryOutputFile, repositoryPath) {
     return `<TITLE>${prTitle}</TITLE>
 <DESCRIPTION>${prDescription}</DESCRIPTION>
+<CODE CHANGES>${diffFile}</CODE CHANGES>
+<TEST DIRECTORY>${testDirectory}</TEST DIRECTORY>
+<REPOSITORY PATH>${repositoryPath}</REPOSITORY PATH>
 
-Use the MCP tools offered by Skyramp MCP server to analyze the pull request title and description to come up with a business justification
-case for this code change. Based on your analysis of the business case, perform
+For all the following work, use the tools offered by Skyramp MCP server.
 
-1. Get recommendations for new contract, e2e, smoke, load tests that can be generated by Skyramp MCP tools
-2. Use Skyramp MCP to execute the tests and validate the results.
-3. Generate a CONCISE summary to '${summaryOutputFile}' following this format:
+First analyze the pull request title, description, and code changes to determine a business case
+justification for this code change.
 
-## 🤖 Skyramp Test Bot Recommendations
+Then perform ALL of the following tasks. Every task is MANDATORY — do NOT skip any task based on your own judgment unless the task itself gives you an explicit condition to skip.
 
-### 💡 Suggested Test Coverage
-- Brief list of new test types added and for which endpoint.
+## Task 1: Recommend New Tests (MANDATORY)
 
-### 🧪 Test Results
-- List each test executed with pass/fail status and brief details
+Read the diff at \`${diffFile}\`. Classify each changed file. A file is application source code if it is any of: a route/controller/handler, a model/schema/validator/serializer/DTO, business logic, middleware, service, utility, test helper, or has a source extension (.py, .ts, .js, .java, .go, .rb, .cs, .kt, .swift, etc.). When in doubt, treat the file as application source code.
 
-### ⚠️ Issues Found
-- List any test failures or bugs discovered (if none, write 'None')
+**DEFAULT: You MUST run steps 1–5 below.** The only exception is if you can confirm that EVERY changed file is exclusively a CI workflow YAML, markdown documentation, README, CHANGELOG, or a dependency lock file — and nothing else.
 
-Keep the summary brief and scannable. Avoid repeating code diff details that are already visible in the PR.
+1. Call \`skyramp_analyze_repository\` with:
+   - \`repositoryPath\`: "${repositoryPath}"
+   - \`analysisScope\`: "current_branch_diff"
+2. MANDATORY: Call \`skyramp_map_tests\` with \`stateFile\` (the state file path returned above) and \`analysisScope: "current_branch_diff"\`.
+3. MANDATORY: Call \`skyramp_recommend_tests\` with the \`stateFile\` returned by \`skyramp_map_tests\`. Use the priority summary and the specific endpoints/files that changed to determine exactly what to test.
+4. Generate tests using the Skyramp MCP generate tools, in priority order (minimum 3 test types).
+5. Use Skyramp MCP to execute the generated tests and validate the results.
 
-Use the skyramp-mcp tools available to you for test analysis, generation, and execution.`;
-}
-function getTestbotMaintenancePrompt(diffFile, testDirectory, summaryOutputFile) {
-    return `Based on the git diff in ${diffFile} file, perform the following test maintenance tasks:
+## Task 2: Existing Test Maintenance (MANDATORY)
+
+You MUST always run steps 1–4 below. Do NOT skip this task based on your own assessment of whether tests exist or are relevant — use the tools to determine that.
 
-1. Check if there are any relevant Skyramp tests in the '${testDirectory}' directory that correspond to the code changes.
-2. If there are relevant tests, use Skyramp MCP tools to analyze and modify them to ensure they pass with the new changes.
-3. If there are no tests that can validate the changes, use Skyramp MCP to generate appropriate Skyramp tests for the new or modified code.
-4. Use Skyramp MCP to execute the tests and validate the results.
-5. Generate a CONCISE summary to '${summaryOutputFile}' following this format:
+1. Call \`skyramp_discover_tests\` with \`repositoryPath\`: "${repositoryPath}" to find all existing Skyramp-generated tests.
+2. Call \`skyramp_analyze_test_drift\` with the \`stateFile\` returned by \`skyramp_discover_tests\`.
+3. Call \`skyramp_calculate_health_scores\` with the \`stateFile\` from the previous step.
+4. Call \`skyramp_actions\` with the updated \`stateFile\` to apply recommended updates.
+5. Execute any updated or affected tests using Skyramp MCP and validate the results.
+6. You may skip this task ONLY if \`skyramp_discover_tests\` explicitly returns zero Skyramp-generated tests.
 
-## 🤖 Skyramp Test Bot Summary
+## Task 3: Submit Report (MANDATORY)
 
-**Tests Modified:** [number] | **Tests Created:** [number] | **Tests Executed:** [number] | **Passed:** [number] | **Failed:** [number]
+After completing Tasks 1 and 2, you MUST call the Skyramp MCP tool "skyramp_submit_report" to submit your report.
+Pass '${summaryOutputFile}' as the summaryOutputFile parameter.
 
-### ✅ Maintenance Summary
-- Brief one-line summary of test changes (details are in the commit)
+For the commitMessage parameter, write a succinct summary (under 72 chars) of what you did, without any prefix. Examples:
+- "add contract tests for /products endpoint"
+- "update smoke tests for order API changes"
+- "add smoke and e2e tests for new /reviews endpoint"
 
-### 🧪 Test Results
-- List each test executed with pass/fail status and brief details
+Do NOT write the report to a file yourself. Do NOT skip this step. The skyramp_submit_report tool is the ONLY way to submit the report.
 
-### ⚠️ Issues Found
-- List any test failures or bugs discovered (if none, write 'None')
+## Report Guidelines
 
-Keep the summary brief and scannable. Avoid repeating code diff details that are already visible in the PR.
+When reporting test results, if you chose to skip executing a test, you MUST explain WHY you skipped it.
+NEVER use the phrase "CI timeout" or imply a timeout occurred unless a tool call actually timed out.
+Instead, set the status to "Skipped" and provide an honest reason in the details, for example:
+- "Skipped: no code changes affect this endpoint"
+- "Skipped: skyramp_discover_tests found no existing Skyramp tests"
+- "Skipped: only CI/config changes in this PR, no API changes"
 
-Use the skyramp-mcp tools available to you for test analysis, generation, and execution.`;
+Reminder: Use the Skyramp MCP tools available to you for test analysis, generation, and execution.`;
 }
 export function registerTestbotPrompt(server) {
     logger.info("Registering testbot prompt");
     server.registerPrompt("skyramp_testbot", {
         description: "Run Skyramp TestBot to generate test recommendations and perform test maintenance for a pull request.",
         argsSchema: {
-            prTitle: z
-                .string()
-                .describe("Pull request title"),
+            prTitle: z.string().describe("Pull request title"),
             prDescription: z
                 .string()
                 .describe("Pull request description/body"),
-            diffFile: z
-                .string()
-                .describe("Path to the git diff file"),
+            diffFile: z.string().describe("Path to the git diff file"),
             testDirectory: z
                 .string()
                 .default("tests")
                 .describe("Directory containing Skyramp tests"),
-            recommendationSummaryOutputFile: z
+            summaryOutputFile: z
                 .string()
-                .describe("File path where the agent should write the recommendation summary"),
-            maintenanceSummaryOutputFile: z
+                .describe("File path where the agent should write the testbot summary report"),
+            repositoryPath: z
                 .string()
-                .describe("File path where the agent should write the maintenance summary"),
+                .default(".")
+                .describe("Absolute path to the repository being analyzed"),
         },
     }, (args) => {
-        const recommendationPrompt = getTestbotRecommendationPrompt(args.prTitle, args.prDescription, args.recommendationSummaryOutputFile);
-        const maintenancePrompt = getTestbotMaintenancePrompt(args.diffFile, args.testDirectory, args.maintenanceSummaryOutputFile);
+        const prompt = getTestbotPrompt(args.prTitle, args.prDescription, args.diffFile, args.testDirectory, args.summaryOutputFile, args.repositoryPath);
+        AnalyticsService.pushMCPToolEvent("skyramp_testbot_prompt", undefined, {}).catch(() => { });
         return {
             messages: [
                 {
                     role: "user",
                     content: {
                         type: "text",
-                        text: `# Skyramp TestBot Workflow
-
-Follow these two phases in order.
-
-## Phase 1: Test Recommendations
-
-${recommendationPrompt}
-
-## Phase 2: Test Maintenance
-
-${maintenancePrompt}`,
+                        text: prompt,
                     },
                 },
             ],
         };
     });
 }
+export function registerTestbotResource(server) {
+    logger.info("Registering testbot resource");
+    // RFC 6570 {+rest} (reserved expansion) captures the entire query string
+    // including the leading "?". This avoids the SDK's per-param regex which
+    // fails on empty query-param values (e.g. prDescription=).
+    // We then parse query params from the URL object which handles URL-decoding
+    // and empty values correctly.
+    const template = new ResourceTemplate("skyramp://prompts/testbot{+rest}", { list: undefined });
+    server.registerResource("skyramp_testbot", template, {
+        title: "Skyramp TestBot Prompt",
+        description: "Returns task instructions for PR test analysis, generation, and maintenance.",
+        mimeType: "text/plain",
+    }, (uri) => {
+        const param = (name, fallback) => uri.searchParams.get(name) ?? fallback;
+        const prompt = getTestbotPrompt(param("prTitle", ""), param("prDescription", ""), param("diffFile", ".skyramp_git_diff"), param("testDirectory", "tests"), param("summaryOutputFile", ""), param("repositoryPath", "."));
+        AnalyticsService.pushMCPToolEvent("skyramp_testbot_prompt", undefined, {}).catch(() => { });
+        return {
+            contents: [
+                {
+                    uri: uri.toString(),
+                    mimeType: "text/plain",
+                    text: prompt,
+                },
+            ],
+        };
+    });
+}

package/build/services/AnalyticsService.js

@@ -2,8 +2,9 @@ import { pushToolEvent } from "@skyramp/skyramp";
 import * as fs from "fs";
 import * as path from "path";
 import { fileURLToPath } from "url";
+import { getEntryPoint, getCIPlatform } from "../utils/telemetry.js";
+import { logger } from "../utils/logger.js";
 export class AnalyticsService {
-    static entryPoint = "mcp";
     static async pushTestGenerationToolEvent(toolName, result, params) {
         const analyticsResult = {};
         analyticsResult["prompt"] = params.prompt;
@@ -11,19 +12,29 @@ export class AnalyticsService {
         this.pushMCPToolEvent(toolName, result, analyticsResult);
     }
     static async pushMCPToolEvent(toolName, result, params) {
-        let errorMessage = "";
-        if (result && result.isError) {
-            for (const content of result?.content ?? []) {
-                if ("text" in content && content.text) {
-                    errorMessage += content.text + ", ";
+        try {
+            let errorMessage = "";
+            if (result && result.isError) {
+                for (const content of result?.content ?? []) {
+                    if ("text" in content && content.text) {
+                        errorMessage += content.text + ", ";
+                    }
+                }
+                if (errorMessage.length > 0) {
+                    errorMessage = errorMessage.slice(0, -2);
                 }
             }
-            if (errorMessage.length > 0) {
-                errorMessage = errorMessage.slice(0, -2);
+            params.mcpServerVersion = getMCPPackageVersion();
+            const ciPlatform = getCIPlatform();
+            if (ciPlatform) {
+                params.ciPlatform = ciPlatform;
             }
+            await pushToolEvent(getEntryPoint(), toolName, errorMessage, params);
+        }
+        catch (error) {
+            logger.error("Error pushing MCP tool event", { error: error });
+            // silently ignore
         }
-        params.mcpServerVersion = getMCPPackageVersion();
-        await pushToolEvent(this.entryPoint, toolName, errorMessage, params);
     }
     /**
      * Track server crash events
@@ -34,7 +45,11 @@ export class AnalyticsService {
             errorStack: errorStack || "no stack trace",
             mcpServerVersion: getMCPPackageVersion(),
         };
-        await pushToolEvent(this.entryPoint, "mcp_server_crash", errorMessage, params);
+        const ciPlatform = getCIPlatform();
+        if (ciPlatform) {
+            params.ciPlatform = ciPlatform;
+        }
+        await pushToolEvent(getEntryPoint(), "mcp_server_crash", errorMessage, params);
     }
     /**
      * Track tool timeout events
@@ -46,7 +61,11 @@ export class AnalyticsService {
             timeoutMs: timeoutMs.toString(),
             mcpServerVersion: getMCPPackageVersion(),
         };
-        await pushToolEvent(this.entryPoint, `${toolName}_timeout`, errorMessage, timeoutParams);
+        const ciPlatform = getCIPlatform();
+        if (ciPlatform) {
+            timeoutParams.ciPlatform = ciPlatform;
+        }
+        await pushToolEvent(getEntryPoint(), `${toolName}_timeout`, errorMessage, timeoutParams);
     }
 }
 /**

package/build/services/TestExecutionService.js

@@ -6,7 +6,7 @@ import { stripVTControlCharacters } from "util";
 import { logger } from "../utils/logger.js";
 const DEFAULT_TIMEOUT = 300000; // 5 minutes
 const MAX_CONCURRENT_EXECUTIONS = 5;
-const EXECUTOR_DOCKER_IMAGE = "skyramp/executor:v1.3.8";
+export const EXECUTOR_DOCKER_IMAGE = "skyramp/executor:v1.3.10";
 const DOCKER_PLATFORM = "linux/amd64";
 const EXECUTION_PROGRESS_INTERVAL = 10000; // 10 seconds between progress updates during execution
 // Files and directories to exclude when mounting workspace to Docker container

package/build/services/TestGenerationService.js

@@ -1,6 +1,7 @@
 import { SkyrampClient } from "@skyramp/skyramp";
 import { analyzeOpenAPIWithGivenEndpoint } from "../utils/analyze-openapi.js";
-import { getPathParameterValidationError, OUTPUT_DIR_FIELD_NAME, PATH_PARAMS_FIELD_NAME, QUERY_PARAMS_FIELD_NAME, FORM_PARAMS_FIELD_NAME, validateParams, validatePath, validateRequestData, TELEMETRY_entrypoint_FIELD_NAME, } from "../utils/utils.js";
+import { getPathParameterValidationError, OUTPUT_DIR_FIELD_NAME, PATH_PARAMS_FIELD_NAME, QUERY_PARAMS_FIELD_NAME, FORM_PARAMS_FIELD_NAME, validateParams, validatePath, validateRequestData, } from "../utils/utils.js";
+import { getEntryPoint } from "../utils/telemetry.js";
 import { getLanguageSteps } from "../utils/language-helper.js";
 import { logger } from "../utils/logger.js";
 export class TestGenerationService {
@@ -148,6 +149,10 @@ The generated test file remains unchanged and ready to use as-is.
     }
     async executeGeneration(generateOptions) {
         try {
+            //if auth header is authorization then exclude auth header from request
+            if (generateOptions.authHeader === "Authorization") {
+                generateOptions.authHeader = "";
+            }
             const result = await this.client.generateRestTest(generateOptions);
             // Check if the result indicates failure
             if (result && result.length > 0) {
@@ -201,7 +206,7 @@ ${result}`;
             generateInclude: params.include,
             generateExclude: params.exclude,
             generateInsecure: params.insecure,
-            entrypoint: TELEMETRY_entrypoint_FIELD_NAME,
+            entrypoint: getEntryPoint(),
             chainingKey: params.chainingKey,
         };
     }

package/build/tools/submitReportTool.js

@@ -0,0 +1,106 @@
+import { z } from "zod";
+import { logger } from "../utils/logger.js";
+import * as fs from "fs/promises";
+import * as path from "path";
+import { AnalyticsService } from "../services/AnalyticsService.js";
+const TOOL_NAME = "skyramp_submit_report";
+const DEFAULT_COMMIT_MESSAGE = "Added recommendations by Skyramp Testbot.";
+const testResultSchema = z.object({
+    testType: z.string().describe("Type of test: Smoke, Contract, Integration, Fuzz, E2E, Load, etc."),
+    endpoint: z.string().describe("HTTP verb and path, e.g. 'GET /api/v1/products'"),
+    status: z.enum(["Pass", "Fail", "Skipped"]).describe("Test execution result"),
+    details: z.string().describe("Execution time and test file name, e.g. '10.8s, products_smoke_test.py'"),
+});
+const newTestSchema = z.object({
+    testType: z.string().describe("Type of test created: Smoke, Contract, Integration, etc."),
+    endpoint: z.string().describe("HTTP verb and path, e.g. 'GET /api/v1/products'"),
+    fileName: z.string().describe("Name of the generated test file"),
+});
+const descriptionSchema = z.object({
+    description: z.string().describe("One-line description"),
+});
+export function registerSubmitReportTool(server) {
+    server.registerTool(TOOL_NAME, {
+        description: "Submit the final testbot report. Call this tool once after completing all test analysis, generation, and execution. " +
+            "This is the ONLY way to submit the report — do NOT write the report to a file manually.",
+        inputSchema: {
+            summaryOutputFile: z
+                .string()
+                .describe("The file path where the report should be written (provided in the task instructions)"),
+            businessCaseAnalysis: z
+                .string()
+                .describe("2-3 sentence business justification for this PR"),
+            newTestsCreated: z
+                .array(newTestSchema)
+                .describe("List of new tests created. Use empty array [] if none."),
+            testMaintenance: z
+                .array(descriptionSchema)
+                .describe("List of existing test modifications. Use empty array [] if none."),
+            testResults: z
+                .array(testResultSchema)
+                .describe("List of ALL test execution results. One entry per test executed."),
+            issuesFound: z
+                .array(descriptionSchema)
+                .describe("List of issues, failures, or bugs found. Use empty array [] if none."),
+            commitMessage: z
+                .string()
+                .optional()
+                .default(DEFAULT_COMMIT_MESSAGE)
+                .describe("Succinct commit message (under 72 chars) summarizing what the testbot did, " +
+                "e.g. 'add contract tests for /products endpoint' or 'update smoke tests for order API changes'"),
+        },
+        _meta: {
+            keywords: ["report", "summary", "testbot", "submit"],
+        },
+    }, async (params) => {
+        const startTime = Date.now();
+        let errorResult;
+        const reportJson = JSON.stringify({
+            businessCaseAnalysis: params.businessCaseAnalysis,
+            newTestsCreated: params.newTestsCreated,
+            testMaintenance: params.testMaintenance,
+            testResults: params.testResults,
+            issuesFound: params.issuesFound,
+            commitMessage: (params.commitMessage ?? "").replace(/[\r\n]+/g, " ").trim().slice(0, 72) || DEFAULT_COMMIT_MESSAGE,
+        }, null, 2);
+        logger.info("Submitting testbot report", {
+            outputFile: params.summaryOutputFile,
+            payloadBytes: reportJson.length,
+            testResultCount: params.testResults.length,
+        });
+        try {
+            await fs.mkdir(path.dirname(params.summaryOutputFile), { recursive: true });
+            await fs.writeFile(params.summaryOutputFile, reportJson, "utf-8");
+            const elapsed = Date.now() - startTime;
+            logger.info("Testbot report written successfully", {
+                outputFile: params.summaryOutputFile,
+                elapsedMs: elapsed,
+            });
+            return {
+                content: [
+                    {
+                        type: "text",
+                        text: `Report submitted successfully to ${params.summaryOutputFile}`,
+                    },
+                ],
+            };
+        }
+        catch (error) {
+            const elapsed = Date.now() - startTime;
+            const errorMessage = `Failed to write report: ${error.message}`;
+            logger.error(errorMessage, { error, elapsedMs: elapsed });
+            errorResult = {
+                content: [{ type: "text", text: errorMessage }],
+                isError: true,
+            };
+            return errorResult;
+        }
+        finally {
+            AnalyticsService.pushMCPToolEvent(TOOL_NAME, errorResult, {
+                summary_output_file: params.summaryOutputFile,
+                testResultCount: String(params.testResults.length),
+                payloadBytes: String(reportJson.length),
+            }).catch(() => { });
+        }
+    });
+}

package/build/tools/submitReportTool.test.js

@@ -0,0 +1,176 @@
+// @ts-ignore
+import { registerSubmitReportTool } from "./submitReportTool.js";
+import * as fs from "fs/promises";
+import * as path from "path";
+import * as os from "os";
+jest.mock("../utils/logger.js", () => ({
+    logger: { info: jest.fn(), error: jest.fn() },
+}));
+jest.mock("../services/AnalyticsService.js", () => ({
+    AnalyticsService: { pushMCPToolEvent: jest.fn().mockResolvedValue(undefined) },
+}));
+function captureToolHandler() {
+    let handler;
+    const fakeServer = {
+        registerTool: (_name, _opts, fn) => {
+            handler = fn;
+        },
+    };
+    registerSubmitReportTool(fakeServer);
+    return handler;
+}
+function sampleReportParams(outputFile) {
+    return {
+        summaryOutputFile: outputFile,
+        businessCaseAnalysis: "This PR adds product search. Tests needed for filtering.",
+        newTestsCreated: [
+            { testType: "Smoke", endpoint: "GET /api/v1/products/search", fileName: "search_smoke_test.py" },
+        ],
+        testMaintenance: [{ description: "Updated auth flow in existing tests" }],
+        testResults: [
+            { testType: "Smoke", endpoint: "GET /api/v1/products", status: "Pass", details: "2.1s, products_smoke_test.py" },
+            { testType: "Smoke", endpoint: "GET /api/v1/products/search", status: "Fail", details: "3.4s, search_smoke_test.py" },
+        ],
+        issuesFound: [{ description: "Search endpoint returns 500 with category filter" }],
+    };
+}
+describe("registerSubmitReportTool", () => {
+    let handler;
+    let tmpDirs = [];
+    beforeAll(() => {
+        handler = captureToolHandler();
+    });
+    afterEach(async () => {
+        for (const dir of tmpDirs) {
+            await fs.rm(dir, { recursive: true, force: true });
+        }
+        tmpDirs = [];
+    });
+    it("should register the tool on the server", () => {
+        const registerToolMock = jest.fn();
+        const fakeServer = { registerTool: registerToolMock };
+        registerSubmitReportTool(fakeServer);
+        expect(registerToolMock).toHaveBeenCalledWith("skyramp_submit_report", expect.objectContaining({
+            description: expect.any(String),
+            inputSchema: expect.any(Object),
+        }), expect.any(Function));
+    });
+    it("should write JSON report to the specified file", async () => {
+        const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), "submit-report-test-"));
+        tmpDirs.push(tmpDir);
+        const outputFile = path.join(tmpDir, "report.json");
+        const result = await handler(sampleReportParams(outputFile));
+        expect(result.isError).toBeUndefined();
+        expect(result.content[0].text).toContain("Report submitted successfully");
+        const written = JSON.parse(await fs.readFile(outputFile, "utf-8"));
+        expect(written.businessCaseAnalysis).toBe("This PR adds product search. Tests needed for filtering.");
+        expect(written.newTestsCreated).toHaveLength(1);
+        expect(written.testResults).toHaveLength(2);
+        expect(written.issuesFound).toHaveLength(1);
+        expect(written.testMaintenance).toHaveLength(1);
+    });
+    it("should create parent directories if they don't exist", async () => {
+        const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), "submit-report-test-"));
+        tmpDirs.push(tmpDir);
+        const outputFile = path.join(tmpDir, "nested", "dirs", "report.json");
+        const result = await handler(sampleReportParams(outputFile));
+        expect(result.isError).toBeUndefined();
+        const written = JSON.parse(await fs.readFile(outputFile, "utf-8"));
+        expect(written.businessCaseAnalysis).toBeDefined();
+    });
+    it("should handle empty arrays for optional sections", async () => {
+        const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), "submit-report-test-"));
+        tmpDirs.push(tmpDir);
+        const outputFile = path.join(tmpDir, "report.json");
+        const result = await handler({
+            summaryOutputFile: outputFile,
+            businessCaseAnalysis: "Simple config change.",
+            newTestsCreated: [],
+            testMaintenance: [],
+            testResults: [
+                { testType: "Smoke", endpoint: "GET /api/v1/products", status: "Pass", details: "1.0s, test.py" },
+            ],
+            issuesFound: [],
+        });
+        expect(result.isError).toBeUndefined();
+        const written = JSON.parse(await fs.readFile(outputFile, "utf-8"));
+        expect(written.newTestsCreated).toEqual([]);
+        expect(written.testMaintenance).toEqual([]);
+        expect(written.issuesFound).toEqual([]);
+        expect(written.testResults).toHaveLength(1);
+    });
+    it("should return error for invalid file path", async () => {
+        const result = await handler(sampleReportParams("/nonexistent/readonly/path/report.json"));
+        expect(result.isError).toBe(true);
+        expect(result.content[0].text).toContain("Failed to write report");
+    });
+    it("should write commitMessage when provided", async () => {
+        const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), "submit-report-test-"));
+        tmpDirs.push(tmpDir);
+        const outputFile = path.join(tmpDir, "report.json");
+        const result = await handler({
+            ...sampleReportParams(outputFile),
+            commitMessage: "add contract tests for /products endpoint",
+        });
+        expect(result.isError).toBeUndefined();
+        const written = JSON.parse(await fs.readFile(outputFile, "utf-8"));
+        expect(written.commitMessage).toBe("add contract tests for /products endpoint");
+    });
+    it("should use default commitMessage when omitted", async () => {
+        const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), "submit-report-test-"));
+        tmpDirs.push(tmpDir);
+        const outputFile = path.join(tmpDir, "report.json");
+        const result = await handler(sampleReportParams(outputFile));
+        expect(result.isError).toBeUndefined();
+        const written = JSON.parse(await fs.readFile(outputFile, "utf-8"));
+        expect(written.commitMessage).toBe("Added recommendations by Skyramp Testbot.");
+    });
+    it("should sanitize commitMessage (newlines, length)", async () => {
+        const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), "submit-report-test-"));
+        tmpDirs.push(tmpDir);
+        const outputFile = path.join(tmpDir, "report.json");
+        const result = await handler({
+            ...sampleReportParams(outputFile),
+            commitMessage: "  line one\nline two\r\nline three  ",
+        });
+        expect(result.isError).toBeUndefined();
+        const written = JSON.parse(await fs.readFile(outputFile, "utf-8"));
+        expect(written.commitMessage).toBe("line one line two line three");
+        expect(written.commitMessage.length).toBeLessThanOrEqual(72);
+    });
+    it("should use default commitMessage when provided as empty string", async () => {
+        const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), "submit-report-test-"));
+        tmpDirs.push(tmpDir);
+        const outputFile = path.join(tmpDir, "report.json");
+        const result = await handler({
+            ...sampleReportParams(outputFile),
+            commitMessage: "",
+        });
+        expect(result.isError).toBeUndefined();
+        const written = JSON.parse(await fs.readFile(outputFile, "utf-8"));
+        expect(written.commitMessage).toBe("Added recommendations by Skyramp Testbot.");
+    });
+    it("should use default commitMessage when whitespace-only", async () => {
+        const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), "submit-report-test-"));
+        tmpDirs.push(tmpDir);
+        const outputFile = path.join(tmpDir, "report.json");
+        const result = await handler({
+            ...sampleReportParams(outputFile),
+            commitMessage: "   \n\r\n   ",
+        });
+        expect(result.isError).toBeUndefined();
+        const written = JSON.parse(await fs.readFile(outputFile, "utf-8"));
+        expect(written.commitMessage).toBe("Added recommendations by Skyramp Testbot.");
+    });
+    it("should produce valid JSON with pretty formatting", async () => {
+        const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), "submit-report-test-"));
+        tmpDirs.push(tmpDir);
+        const outputFile = path.join(tmpDir, "report.json");
+        await handler(sampleReportParams(outputFile));
+        const raw = await fs.readFile(outputFile, "utf-8");
+        // Pretty-printed JSON should have indentation
+        expect(raw).toContain("  ");
+        // Should not contain summaryOutputFile in the output
+        expect(raw).not.toContain("summaryOutputFile");
+    });
+});