@skyramp/mcp 0.1.6 → 0.1.7

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

@@ -291,7 +291,7 @@ function buildServiceContext(services) {
         if (svc.api?.baseUrl)
             parts.push(`  <base_url>${escapeXml(svc.api.baseUrl)}</base_url>`);
         if (svc.testDirectory)
-            parts.push(`  <output_dir>${escapeXml(svc.testDirectory)}</output_dir>`);
+            parts.push(`  <test_directory>${escapeXml(svc.testDirectory)}</test_directory>`);
         parts.push('</service>');
         return parts.join('\n');
     });
@@ -305,6 +305,9 @@ export async function readWorkspaceServices(repositoryPath) {
     const rawConfig = await readWorkspaceConfigRaw(repositoryPath);
     return (rawConfig?.services ?? []);
 }
+export function buildWorkspaceRecoveryPrefix(repositoryPath) {
+    return `IMPORTANT: The existing .skyramp/workspace.yml failed to parse or validate. Before proceeding with any tasks below, you MUST call skyramp_init_scan with workspacePath "${repositoryPath}" and force: true, then call skyramp_init_workspace with workspacePath "${repositoryPath}", the discovered services, scanToken, and force: true to regenerate the workspace file.\n\n`;
+}
 export function registerTestbotPrompt(server) {
     logger.info("Registering testbot prompt");
     server.registerPrompt("skyramp_testbot", {
@@ -351,10 +354,17 @@ export function registerTestbotPrompt(server) {
                 .string()
                 .optional()
                 .describe("Browser login credentials for UI test recording (format: 'username:password', one per line). Injected into the prompt as a <ui-credentials> block so the agent logs in before recording traces."),
+            workspaceValidationFailed: z
+                .boolean()
+                .default(false)
+                .describe("Set to true when the testbot detected that .skyramp/workspace.yml exists but failed schema validation. Instructs the agent to regenerate the workspace file before proceeding."),
         },
     }, async (args) => {
         const services = await readWorkspaceServices(args.repositoryPath);
-        const prompt = getTestbotPrompt(args.prTitle, args.prDescription, args.summaryOutputFile, args.repositoryPath, args.baseBranch, args.maxRecommendations, args.maxGenerate, args.maxCritical, args.prNumber, args.userPrompt, services.length ? services : undefined, args.stateOutputFile, args.uiCredentials);
+        let prompt = getTestbotPrompt(args.prTitle, args.prDescription, args.summaryOutputFile, args.repositoryPath, args.baseBranch, args.maxRecommendations, args.maxGenerate, args.maxCritical, args.prNumber, args.userPrompt, services.length ? services : undefined, args.stateOutputFile, args.uiCredentials);
+        if (args.workspaceValidationFailed) {
+            prompt = buildWorkspaceRecoveryPrefix(args.repositoryPath) + prompt;
+        }
         AnalyticsService.pushMCPToolEvent("skyramp_testbot_prompt", undefined, {}).catch(() => { });
         return {
             messages: [

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

@@ -59,7 +59,7 @@ describe("buildServiceContext (via getTestbotPrompt)", () => {
         expect(prompt).toContain("<language>python</language>");
         expect(prompt).toContain("<framework>pytest</framework>");
         expect(prompt).toContain("<base_url>http://localhost:8000</base_url>");
-        expect(prompt).toContain("<output_dir>tests/python</output_dir>");
+        expect(prompt).toContain("<test_directory>tests/python</test_directory>");
         expect(prompt).toContain("</service>");
         expect(prompt).toContain("<services>");
         expect(prompt).toContain("</services>");
@@ -70,7 +70,7 @@ describe("buildServiceContext (via getTestbotPrompt)", () => {
         expect(prompt).not.toContain("<language>");
         expect(prompt).not.toContain("<framework>");
         expect(prompt).not.toContain("<base_url>");
-        expect(prompt).not.toContain("<output_dir>");
+        expect(prompt).not.toContain("<test_directory>");
     });
     it("renders multiple services", () => {
         const prompt = callWithServices([
@@ -104,7 +104,7 @@ describe("buildServiceContext (via getTestbotPrompt)", () => {
                 api: { baseUrl: "http://host?a=1&b=2" },
             },
         ]);
-        expect(prompt).toContain("<output_dir>tests/a&amp;b</output_dir>");
+        expect(prompt).toContain("<test_directory>tests/a&amp;b</test_directory>");
         expect(prompt).toContain("<base_url>http://host?a=1&amp;b=2</base_url>");
     });
     it("places services block between REPOSITORY PATH and instruction line", () => {
@@ -231,3 +231,20 @@ describe("drift analysis inline embedding", () => {
         expect(prompt).toContain("rules in `<drift_analysis_rules>`");
     });
 });
+describe("buildWorkspaceRecoveryPrefix", () => {
+    const { buildWorkspaceRecoveryPrefix } = require("./testbot-prompts.js");
+    it("includes repositoryPath in both init_scan and init_workspace instructions", () => {
+        const prefix = buildWorkspaceRecoveryPrefix("/home/user/repo");
+        expect(prefix).toContain('skyramp_init_scan with workspacePath "/home/user/repo"');
+        expect(prefix).toContain('skyramp_init_workspace with workspacePath "/home/user/repo"');
+    });
+    it("includes force: true for both tool calls", () => {
+        const prefix = buildWorkspaceRecoveryPrefix("/repo");
+        expect(prefix).toContain("force: true, then call skyramp_init_workspace");
+        expect(prefix).toContain("force: true to regenerate");
+    });
+    it("starts with IMPORTANT", () => {
+        const prefix = buildWorkspaceRecoveryPrefix("/repo");
+        expect(prefix).toMatch(/^IMPORTANT:/);
+    });
+});

package/build/services/ScenarioGenerationService.js

@@ -2,6 +2,7 @@ import { AUTH_PLACEHOLDER_TOKEN } from "../types/TestTypes.js";
 import { isAuthorizationHeaderName } from "../utils/workspaceAuth.js";
 import { inferExpectedStatus } from "../utils/httpDefaults.js";
 import { logger } from "../utils/logger.js";
+import { stageGeneratedPaths } from "../utils/gitStaging.js";
 import fs from "fs";
 import path from "path";
 export class ScenarioGenerationService {
@@ -41,6 +42,8 @@ export class ScenarioGenerationService {
                 }
                 existingRequests.push(traceRequest);
                 fs.writeFileSync(filePath, JSON.stringify(existingRequests, null, 2), "utf8");
+                // Stage so testbot includes the generated files in its output commit.
+                await stageGeneratedPaths(filePath);
                 logger.info("Trace request added to file", {
                     filePath,
                     totalRequests: existingRequests.length,

package/build/services/TestGenerationService.js

@@ -8,6 +8,7 @@ import { getEntryPoint } from "../utils/telemetry.js";
 import { getLanguageSteps } from "../utils/language-helper.js";
 import { logger } from "../utils/logger.js";
 import { normalizeLanguageParams } from "../utils/normalizeParams.js";
+import { stageGeneratedPaths } from "../utils/gitStaging.js";
 export class TestGenerationService {
     client;
     constructor() {
@@ -324,6 +325,8 @@ The generated test file remains unchanged and ready to use as-is.
                     throw new Error(`Test generation failed: ${result}`);
                 }
             }
+            // Stage so testbot includes the generated files in its output commit.
+            await stageGeneratedPaths(generateOptions.outputDir);
             return `
 **Generated Test Details:**
 - Test Type: ${this.getTestType()}

package/build/tools/code-refactor/codeReuseTool.js

@@ -4,6 +4,7 @@ import { getCodeReusePrompt } from "../../prompts/code-reuse.js";
 import { codeRefactoringSchema, languageSchema, } from "../../types/TestTypes.js";
 import { SKYRAMP_UTILS_HEADER } from "../../utils/utils.js";
 import { AnalyticsService } from "../../services/AnalyticsService.js";
+import { stageGeneratedPaths } from "../../utils/gitStaging.js";
 const codeReuseSchema = z.object({
     testFile: z
         .string()
@@ -70,6 +71,8 @@ export function registerCodeReuseTool(server) {
                 language: params.language,
                 framework: params.framework,
             });
+            // Stage so testbot includes the generated files in its output commit.
+            await stageGeneratedPaths(params.testFile);
             const codeReusePrompt = getCodeReusePrompt(params.testFile, params.language, params.framework);
             return {
                 content: [

package/build/tools/code-refactor/enhanceAssertionsTool.js

@@ -5,6 +5,7 @@ import { getContractProviderAssertionsPrompt } from "../../prompts/enhance-asser
 import { getIntegrationAssertionsPrompt } from "../../prompts/enhance-assertions/integrationAssertionsPrompt.js";
 import { getUIAssertionsPrompt } from "../../prompts/enhance-assertions/uiAssertionsPrompt.js";
 import { isTestbotEnabled } from "../../utils/featureFlags.js";
+import { stageGeneratedPaths } from "../../utils/gitStaging.js";
 const TOOL_NAME = "skyramp_enhance_assertions";
 const TESTBOT_UI_CHECKS = `
 ### Additional Testbot-Specific Checks
@@ -34,6 +35,8 @@ export function registerEnhanceAssertionsTool(server) {
         inputSchema: enhanceAssertionsSchema,
     }, async (params) => {
         const { testFile, testType, enhanceType } = params;
+        // Stage so testbot includes the generated files in its output commit.
+        await stageGeneratedPaths(testFile);
         const enhanceCtx = enhanceType;
         let instructions;
         if (testType === TestType.UI) {

package/build/tools/code-refactor/modularizationTool.js

@@ -6,6 +6,7 @@ import { ModularizationService, } from "../../services/ModularizationService.js"
 import { AnalyticsService } from "../../services/AnalyticsService.js";
 import { normalizeLanguageParams, resolveParamAliases, } from "../../utils/normalizeParams.js";
 import { normalizeSkyrampImportsInFile } from "../../utils/normalizeSkyrampImports.js";
+import { stageGeneratedPaths } from "../../utils/gitStaging.js";
 const modularizationSchema = {
     testFile: z
         .string()
@@ -79,6 +80,8 @@ After modularization, if errors remain, call skyramp_fix_errors.
             if (!params.isTraceBased && [TestType.UI, TestType.E2E, TestType.INTEGRATION].includes(params.testType))
                 params.isTraceBased = true;
             normalizeSkyrampImportsInFile(params.testFile);
+            // Stage so testbot includes the generated files in its output commit.
+            await stageGeneratedPaths(params.testFile);
             // Default prompt to test file content
             if (!params.prompt && params.testFile) {
                 try {

package/build/tools/workspace/initializeWorkspaceTool.js

@@ -46,7 +46,7 @@ const initializeWorkspaceSchema = z.object({
     force: z
         .boolean()
         .default(false)
-        .describe("Set to true ONLY if user explicitly requests to overwrite existing workspace configuration. NEVER auto-fill this as true. Default is false."),
+        .describe("Set to true to overwrite an existing workspace file. Use when the user explicitly requests it, or when recovering from a workspace validation failure (schema mismatch, unknown fields). Default is false."),
 });
 /**
  * Write a YAML workspace config to disk, bypassing the library's restricted

package/build/utils/docker.test.js

@@ -54,7 +54,7 @@ describe("dockerImageExistsLocally", () => {
     });
 });
 describe("pullDockerImage", () => {
-    const IMAGE = "skyramp/executor:v1.3.23";
+    const IMAGE = "skyramp/executor:v1.3.24";
     beforeEach(() => jest.clearAllMocks());
     describe("on amd64 host", () => {
         const originalArch = process.arch;

package/build/utils/featureFlags.test.js

@@ -41,11 +41,11 @@ describe("resolveServiceDetailsRef", () => {
             process.env.SKYRAMP_FEATURE_TESTBOT = "1";
         });
         it("returns <services> block reference for testDirRef", () => {
-            expect(resolveServiceDetailsRef().testDirRef).toContain("<output_dir>");
+            expect(resolveServiceDetailsRef().testDirRef).toContain("<test_directory>");
             expect(resolveServiceDetailsRef().testDirRef).toContain("<services>");
         });
         it("returns <services> block reference for frontendTestDirRef", () => {
-            expect(resolveServiceDetailsRef().frontendTestDirRef).toContain("<output_dir>");
+            expect(resolveServiceDetailsRef().frontendTestDirRef).toContain("<test_directory>");
             expect(resolveServiceDetailsRef().frontendTestDirRef).toContain("<services>");
         });
         it("returns <services> block reference for authSourceRef", () => {

package/build/utils/gitStaging.js

@@ -0,0 +1,18 @@
+import { execFile } from "child_process";
+import { promisify } from "util";
+import { logger } from "./logger.js";
+import { isTestbotEnabled } from "./featureFlags.js";
+const execFileAsync = promisify(execFile);
+/**
+ * Stages a file path an MCP tool just wrote into the git index by
+ * running `git add -- <path>`.
+ *
+ * Gated by the SKYRAMP_FEATURE_TESTBOT=1 env var, which is set only
+ * inside a testbot CI run.
+ */
+export async function stageGeneratedPaths(path, cwd) {
+    if (!isTestbotEnabled())
+        return;
+    await execFileAsync("git", ["add", "--", path], { cwd });
+    logger.info("Staged generated file", { path });
+}

package/build/utils/gitStaging.test.js

@@ -0,0 +1,87 @@
+jest.mock("./logger.js", () => ({
+    logger: {
+        debug: jest.fn(),
+        info: jest.fn(),
+        warning: jest.fn(),
+        error: jest.fn(),
+    },
+}));
+const execFileMock = jest.fn();
+jest.mock("child_process", () => ({
+    execFile: (cmd, args, opts, cb) => {
+        const result = execFileMock(cmd, args, opts);
+        const cbErr = result && typeof result === "object" && "err" in result
+            ? result.err
+            : null;
+        cb(cbErr, "", "");
+    },
+}));
+import { stageGeneratedPaths } from "./gitStaging.js";
+import { logger } from "./logger.js";
+const loggerInfoMock = logger.info;
+let originalTestbotEnv;
+beforeAll(() => {
+    originalTestbotEnv = process.env.SKYRAMP_FEATURE_TESTBOT;
+});
+afterAll(() => {
+    if (originalTestbotEnv === undefined) {
+        delete process.env.SKYRAMP_FEATURE_TESTBOT;
+    }
+    else {
+        process.env.SKYRAMP_FEATURE_TESTBOT = originalTestbotEnv;
+    }
+});
+beforeEach(() => {
+    execFileMock.mockReset();
+    loggerInfoMock.mockReset();
+});
+afterEach(() => {
+    delete process.env.SKYRAMP_FEATURE_TESTBOT;
+});
+describe("stageGeneratedPaths", () => {
+    describe("gated on (SKYRAMP_FEATURE_TESTBOT=1)", () => {
+        beforeEach(() => {
+            process.env.SKYRAMP_FEATURE_TESTBOT = "1";
+        });
+        it("runs `git add -- <path>` with the supplied path", async () => {
+            await stageGeneratedPaths("tests/a.py");
+            expect(execFileMock).toHaveBeenCalledTimes(1);
+            expect(execFileMock).toHaveBeenCalledWith("git", ["add", "--", "tests/a.py"], expect.objectContaining({}));
+            expect(loggerInfoMock).toHaveBeenCalledWith("Staged generated file", expect.objectContaining({ path: "tests/a.py" }));
+        });
+        it("passes through the cwd option when provided", async () => {
+            await stageGeneratedPaths("tests/a.py", "/repo/root");
+            expect(execFileMock).toHaveBeenCalledWith("git", ["add", "--", "tests/a.py"], expect.objectContaining({ cwd: "/repo/root" }));
+        });
+        it("propagates errors from git add", async () => {
+            const err = new Error("fatal: not a git repository");
+            execFileMock.mockImplementation(() => {
+                throw err;
+            });
+            await expect(stageGeneratedPaths("tests/a.py")).rejects.toThrow("fatal: not a git repository");
+        });
+        it("propagates async callback errors from git add", async () => {
+            const err = Object.assign(new Error("git: command not found"), {
+                code: "ENOENT",
+            });
+            execFileMock.mockReturnValueOnce({ err });
+            await expect(stageGeneratedPaths("tests/a.py", "/repo/root")).rejects.toThrow("git: command not found");
+        });
+    });
+    describe("gated off (SKYRAMP_FEATURE_TESTBOT unset)", () => {
+        it("does not invoke git add", async () => {
+            await stageGeneratedPaths("tests/a.py");
+            expect(execFileMock).not.toHaveBeenCalled();
+            expect(loggerInfoMock).not.toHaveBeenCalled();
+        });
+    });
+    describe("gated off (SKYRAMP_FEATURE_TESTBOT='0')", () => {
+        beforeEach(() => {
+            process.env.SKYRAMP_FEATURE_TESTBOT = "0";
+        });
+        it("does not invoke git add", async () => {
+            await stageGeneratedPaths("tests/a.py");
+            expect(execFileMock).not.toHaveBeenCalled();
+        });
+    });
+});

package/build/utils/utils.js

@@ -144,8 +144,8 @@ export function generateSkyrampHeader(language) {
 export function resolveServiceDetailsRef() {
     if (isTestbotEnabled()) {
         return {
-            testDirRef: "the `<output_dir>` from the `<services>` block",
-            frontendTestDirRef: "the **frontend** service's `<output_dir>` from the `<services>` block",
+            testDirRef: "the `<test_directory>` from the `<services>` block",
+            frontendTestDirRef: "the **frontend** service's `<test_directory>` from the `<services>` block",
             baseUrlRef: "the `<base_url>` from the `<services>` block",
             authSourceRef: "the `<services>` block",
         };

package/build/utils/versions.js

@@ -1,3 +1,3 @@
-export const SKYRAMP_IMAGE_VERSION = "v1.3.23";
+export const SKYRAMP_IMAGE_VERSION = "v1.3.24";
 export const EXECUTOR_DOCKER_IMAGE = `skyramp/executor:${SKYRAMP_IMAGE_VERSION}`;
 export const WORKER_DOCKER_IMAGE = `skyramp/worker:${SKYRAMP_IMAGE_VERSION}`;

package/node_modules/playwright/lib/mcp/browser/context.js

@@ -200,6 +200,8 @@ class Context {
         _live: true
       });
     }
+    if (this.onBrowserContextCreated)
+      await this.onBrowserContextCreated(browserContext);
     return result;
   }
   lookupSecret(secretName) {

package/node_modules/playwright/lib/mcp/browser/tools/keyboard.js

@@ -29,9 +29,9 @@ const pressKey = (0, import_tool.defineTabTool)({
   schema: {
     name: "browser_press_key",
     title: "Press a key",
-    description: "Press a single key on the globally-focused element. This is a FALLBACK tool \u2014 prefer higher-level tools whenever possible: browser_click for buttons and links, browser_type for text entry, browser_type with submit: true for form submission (bundles the fill and the Enter into one recorded action). Only use browser_press_key when no semantic alternative exists: arrow-key navigation in an already-open listbox or combobox, Escape to close a modal that has no visible close button, Tab to shift focus between fields, or an app-specific keyboard shortcut the user actually relies on (e.g. Ctrl+K to open a command palette).",
+    description: "Press a key on the keyboard",
     inputSchema: import_mcpBundle.z.object({
-      key: import_mcpBundle.z.string().describe('Key name or character, e.g. "ArrowDown", "Enter", "Escape", "a". Supports modifier combinations like "Control+a" or "Meta+v".')
+      key: import_mcpBundle.z.string().describe("Name of the key to press or a character to generate, such as `ArrowLeft` or `a`")
     }),
     type: "input"
   },

package/node_modules/playwright/lib/mcp/skyramp/traceRecordingBackend.js

@@ -93,7 +93,7 @@ class TraceRecordingBackend {
     await this._browserBackend.initialize(clientInfo);
     this._initialized = true;
     traceDebug("TraceRecordingBackend initialized");
-    this._setupPopupTracking();
+    this._browserBackend.context.onBrowserContextCreated = (browserContext) => this._installPopupListener(browserContext);
   }
   async listTools() {
     const browserTools = await this._browserBackend.listTools();
@@ -729,32 +729,23 @@ ${details}` }]
    * When a popup opens, find the most recent click that triggered it and mark it
    * with a popupAlias signal. Switch the current page alias to the new page.
    */
-  _setupPopupTracking() {
-    void (async () => {
-      try {
-        const context = this._browserBackend.context;
-        if (!context)
-          return;
-        const browserContext = await context.ensureBrowserContext();
-        let initialPageSeen = false;
-        browserContext.on("page", () => {
-          if (!initialPageSeen) {
-            initialPageSeen = true;
-            return;
-          }
-          if (this._reloading) {
-            traceDebug("Ignoring spurious popup opened during reload");
-            return;
-          }
-          this._pageCount++;
-          const popupAlias = `page${this._pageCount}`;
-          this._currentPageAlias = popupAlias;
-          this._pendingPopupAlias = popupAlias;
-          traceDebug(`Popup page opened: ${popupAlias} (pending stamp)`);
-        });
-      } catch {
+  _installPopupListener(browserContext) {
+    let initialPageSeen = false;
+    browserContext.on("page", () => {
+      if (!initialPageSeen) {
+        initialPageSeen = true;
+        return;
+      }
+      if (this._reloading) {
+        traceDebug("Ignoring spurious popup opened during reload");
+        return;
       }
-    })();
+      this._pageCount++;
+      const popupAlias = `page${this._pageCount}`;
+      this._currentPageAlias = popupAlias;
+      this._pendingPopupAlias = popupAlias;
+      traceDebug(`Popup page opened: ${popupAlias} (pending stamp)`);
+    });
   }
   _maybeTrackAction(toolName, args, result, timestamp, pageAliasBeforeAction) {
     if (result.isError)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skyramp/mcp",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "main": "build/index.js",
   "exports": {
     ".": "./build/index.js",
@@ -55,7 +55,7 @@
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.24.3",
     "@playwright/test": "^1.55.0",
-    "@skyramp/skyramp": "1.3.23",
+    "@skyramp/skyramp": "1.3.24",
     "dockerode": "^5.0.0",
     "fast-glob": "^3.3.3",
     "js-yaml": "^4.1.1",