appium-mcp 1.5.0 → 1.6.1

package/.github/dependabot.yml

@@ -0,0 +1,17 @@
+version: 2
+updates:
+- package-ecosystem: npm
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "11:00"
+  open-pull-requests-limit: 10
+- package-ecosystem: "github-actions"
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "11:00"
+  open-pull-requests-limit: 10
+  commit-message:
+    prefix: "ci"
+    include: "scope"

package/.github/workflows/ci.yml

@@ -13,16 +13,20 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Setup Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: 'lts/*'
           cache: 'npm'
 
+      - uses: SocketDev/action@v1
+        with:
+          mode: firewall-free
+
       - name: Install dependencies
-        run: npm install --no-package-lock --force
+        run: sfw npm install --no-package-lock --force
 
       - name: List installed packages
         run: npm list --depth=0

package/.github/workflows/pr-title.yml

@@ -1,15 +1,10 @@
 name: Conventional Commits
 on:
   pull_request:
-
+    types: [opened, edited, synchronize, reopened]
 
 jobs:
   lint:
-    name: https://www.conventionalcommits.org
-    runs-on: ubuntu-latest
-    steps:
-      - uses: beemojs/conventional-pr-action@v3
-        with:
-          config-preset: angular
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN  }}
+    uses: appium/appium-workflows/.github/workflows/pr-title.yml@main
+    with:
+      config-preset: angular

package/.github/workflows/publish.yml

@@ -15,7 +15,7 @@ jobs:
   build:
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           submodules: recursive
           fetch-depth: 0 # Fetch all tags for version detection
@@ -23,7 +23,7 @@ jobs:
         run: |
           chmod +x scripts/setup-submodules-sparse.sh
           ./scripts/setup-submodules-sparse.sh
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v6
         with:
           node-version: lts/*
           check-latest: true
@@ -43,9 +43,9 @@ jobs:
           echo "Updated server.json version to $VERSION"
 
       - name: Setup Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
-          go-version: '1.21'
+          go-version: '1.25'
 
       - name: Build MCP Publisher from source
         run: |

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+## [1.6.1](https://github.com/appium/appium-mcp/compare/v1.6.0...v1.6.1) (2026-01-05)
+
+### Bug Fixes
+
+* Update Go version in publish workflow ([#74](https://github.com/appium/appium-mcp/issues/74)) ([580be03](https://github.com/appium/appium-mcp/commit/580be03b59aa4ce8b47f169cfbeb8ac8dd310f35))
+
+## [1.6.0](https://github.com/appium/appium-mcp/compare/v1.5.0...v1.6.0) (2025-12-22)
+
+### Features
+
+* **screenshot:** add configurable screenshot directory via SCREENSHOTS_DIR env var ([#54](https://github.com/appium/appium-mcp/issues/54)) ([f1957ad](https://github.com/appium/appium-mcp/commit/f1957ad0372d999db67f77b7b85a035546486b86))
+
 ## [1.5.0](https://github.com/appium/appium-mcp/compare/v1.4.0...v1.5.0) (2025-12-19)
 
 ### Features

package/README.md

@@ -157,6 +157,10 @@ Create a `capabilities.json` file to define your device capabilities:
 
 Set the `CAPABILITIES_CONFIG` environment variable to point to your configuration file.
 
+### Screenshots
+
+Set the `SCREENSHOTS_DIR` environment variable to specify where screenshots are saved. If not set, screenshots are saved to the current working directory. Supports both absolute and relative paths (relative paths are resolved from the current working directory). The directory is created automatically if it doesn't exist.
+
 ## 🎯 Available Tools
 
 MCP Appium provides a comprehensive set of tools organized into the following categories:

package/dist/tests/screenshot.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/tests/screenshot.test.js

@@ -0,0 +1,212 @@
+import { describe, test, expect, beforeEach, afterEach, jest, } from '@jest/globals';
+import { join, isAbsolute } from 'path';
+/**
+ * Local implementation of resolveScreenshotDir for testing.
+ * This mirrors the implementation in screenshot.ts to avoid importing
+ * the module which has heavy dependencies.
+ */
+function resolveScreenshotDir() {
+    const screenshotDir = process.env.SCREENSHOTS_DIR;
+    if (!screenshotDir) {
+        return process.cwd();
+    }
+    if (isAbsolute(screenshotDir)) {
+        return screenshotDir;
+    }
+    return join(process.cwd(), screenshotDir);
+}
+/**
+ * Local implementation of executeScreenshot for testing.
+ * This mirrors the implementation in screenshot.ts.
+ */
+async function executeScreenshot(deps) {
+    const driver = deps.getDriver();
+    if (!driver) {
+        throw new Error('No driver found');
+    }
+    try {
+        const screenshotBase64 = await driver.getScreenshot();
+        const screenshotBuffer = Buffer.from(screenshotBase64, 'base64');
+        const timestamp = deps.dateNow();
+        const filename = `screenshot_${timestamp}.png`;
+        const screenshotDir = deps.resolveScreenshotDir();
+        await deps.mkdir(screenshotDir, { recursive: true });
+        const filepath = join(screenshotDir, filename);
+        await deps.writeFile(filepath, screenshotBuffer);
+        return {
+            content: [
+                {
+                    type: 'text',
+                    text: `Screenshot saved successfully to: ${filename}`,
+                },
+            ],
+        };
+    }
+    catch (err) {
+        return {
+            content: [
+                {
+                    type: 'text',
+                    text: `Failed to take screenshot. err: ${err.toString()}`,
+                },
+            ],
+        };
+    }
+}
+describe('resolveScreenshotDir', () => {
+    const originalEnv = process.env.SCREENSHOTS_DIR;
+    const cwd = process.cwd();
+    beforeEach(() => {
+        delete process.env.SCREENSHOTS_DIR;
+    });
+    afterEach(() => {
+        if (originalEnv !== undefined) {
+            process.env.SCREENSHOTS_DIR = originalEnv;
+        }
+        else {
+            delete process.env.SCREENSHOTS_DIR;
+        }
+    });
+    test('should return process.cwd() when SCREENSHOTS_DIR is not set', () => {
+        const result = resolveScreenshotDir();
+        expect(result).toBe(cwd);
+    });
+    test('should return process.cwd() when SCREENSHOTS_DIR is empty string', () => {
+        process.env.SCREENSHOTS_DIR = '';
+        const result = resolveScreenshotDir();
+        expect(result).toBe(cwd);
+    });
+    test('should return absolute path as-is when SCREENSHOTS_DIR is absolute', () => {
+        const absolutePath = '/tmp/screenshots';
+        process.env.SCREENSHOTS_DIR = absolutePath;
+        const result = resolveScreenshotDir();
+        expect(result).toBe(absolutePath);
+    });
+    test('should join relative path with process.cwd()', () => {
+        const relativePath = 'screenshots';
+        process.env.SCREENSHOTS_DIR = relativePath;
+        const result = resolveScreenshotDir();
+        expect(result).toBe(join(cwd, relativePath));
+    });
+    test('should handle nested relative paths', () => {
+        const relativePath = 'output/screenshots/test';
+        process.env.SCREENSHOTS_DIR = relativePath;
+        const result = resolveScreenshotDir();
+        expect(result).toBe(join(cwd, relativePath));
+    });
+    test('should handle relative path starting with ./', () => {
+        const relativePath = './screenshots';
+        process.env.SCREENSHOTS_DIR = relativePath;
+        const result = resolveScreenshotDir();
+        expect(result).toBe(join(cwd, relativePath));
+    });
+    test('should handle relative path with parent directory reference', () => {
+        const relativePath = '../screenshots';
+        process.env.SCREENSHOTS_DIR = relativePath;
+        const result = resolveScreenshotDir();
+        expect(result).toBe(join(cwd, relativePath));
+    });
+});
+describe('executeScreenshot', () => {
+    const mockBase64 = 'dGVzdA=='; // 'test' in base64
+    const mockTimestamp = 1234567890;
+    function createMockDeps(overrides = {}) {
+        return {
+            getDriver: jest.fn(() => ({
+                getScreenshot: jest.fn(() => Promise.resolve(mockBase64)),
+            })),
+            writeFile: jest.fn(() => Promise.resolve()),
+            mkdir: jest.fn(() => Promise.resolve()),
+            resolveScreenshotDir: jest.fn(() => '/mock/screenshots'),
+            dateNow: jest.fn(() => mockTimestamp),
+            ...overrides,
+        };
+    }
+    test('should throw error when no driver found', async () => {
+        const deps = createMockDeps({
+            getDriver: jest.fn(() => null),
+        });
+        await expect(executeScreenshot(deps)).rejects.toThrow('No driver found');
+    });
+    test('should return success content with filename', async () => {
+        const deps = createMockDeps();
+        const result = await executeScreenshot(deps);
+        expect(result).toEqual({
+            content: [
+                {
+                    type: 'text',
+                    text: `Screenshot saved successfully to: screenshot_${mockTimestamp}.png`,
+                },
+            ],
+        });
+    });
+    test('should use resolved screenshot directory from SCREENSHOTS_DIR', async () => {
+        const customDir = '/custom/path/screenshots';
+        const deps = createMockDeps({
+            resolveScreenshotDir: jest.fn(() => customDir),
+        });
+        await executeScreenshot(deps);
+        expect(deps.mkdir).toHaveBeenCalledWith(customDir, { recursive: true });
+        expect(deps.writeFile).toHaveBeenCalledWith(join(customDir, `screenshot_${mockTimestamp}.png`), expect.any(Buffer));
+    });
+    test('should create directory with recursive option', async () => {
+        const deps = createMockDeps();
+        await executeScreenshot(deps);
+        expect(deps.mkdir).toHaveBeenCalledWith('/mock/screenshots', {
+            recursive: true,
+        });
+    });
+    test('should write screenshot buffer to correct filepath', async () => {
+        const deps = createMockDeps();
+        await executeScreenshot(deps);
+        expect(deps.writeFile).toHaveBeenCalledWith(`/mock/screenshots/screenshot_${mockTimestamp}.png`, Buffer.from(mockBase64, 'base64'));
+    });
+    test('should return error content when screenshot fails', async () => {
+        const errorMessage = 'Screenshot capture failed';
+        const deps = createMockDeps({
+            getDriver: jest.fn(() => ({
+                getScreenshot: jest.fn(() => Promise.reject(new Error(errorMessage))),
+            })),
+        });
+        const result = await executeScreenshot(deps);
+        expect(result).toEqual({
+            content: [
+                {
+                    type: 'text',
+                    text: `Failed to take screenshot. err: Error: ${errorMessage}`,
+                },
+            ],
+        });
+    });
+    test('should return error content when mkdir fails', async () => {
+        const errorMessage = 'Permission denied';
+        const deps = createMockDeps({
+            mkdir: jest.fn(() => Promise.reject(new Error(errorMessage))),
+        });
+        const result = await executeScreenshot(deps);
+        expect(result).toEqual({
+            content: [
+                {
+                    type: 'text',
+                    text: `Failed to take screenshot. err: Error: ${errorMessage}`,
+                },
+            ],
+        });
+    });
+    test('should return error content when writeFile fails', async () => {
+        const errorMessage = 'Disk full';
+        const deps = createMockDeps({
+            writeFile: jest.fn(() => Promise.reject(new Error(errorMessage))),
+        });
+        const result = await executeScreenshot(deps);
+        expect(result).toEqual({
+            content: [
+                {
+                    type: 'text',
+                    text: `Failed to take screenshot. err: Error: ${errorMessage}`,
+                },
+            ],
+        });
+    });
+});
+//# sourceMappingURL=screenshot.test.js.map

package/dist/tests/screenshot.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"screenshot.test.js","sourceRoot":"","sources":["../../src/tests/screenshot.test.ts"],"names":[],"mappings":"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"}

package/dist/tools/interactions/screenshot.d.ts

@@ -1,2 +1,20 @@
 import { FastMCP } from 'fastmcp/dist/FastMCP.js';
+import { writeFile, mkdir } from 'fs/promises';
+/**
+ * Resolves the screenshot directory path.
+ * - If SCREENSHOTS_DIR is not set, returns process.cwd()
+ * - If SCREENSHOTS_DIR is absolute, returns it as-is
+ * - If SCREENSHOTS_DIR is relative, joins it with process.cwd()
+ */
+export declare function resolveScreenshotDir(): string;
+export interface ScreenshotDeps {
+    getDriver: () => {
+        getScreenshot: () => Promise<string>;
+    } | null;
+    writeFile: typeof writeFile;
+    mkdir: typeof mkdir;
+    resolveScreenshotDir: typeof resolveScreenshotDir;
+    dateNow: () => number;
+}
+export declare function executeScreenshot(deps?: ScreenshotDeps): Promise<any>;
 export default function screenshot(server: FastMCP): void;

package/dist/tools/interactions/screenshot.js

@@ -1,6 +1,67 @@
 import { getDriver } from '../../session-store.js';
-import { writeFile } from 'fs/promises';
-import { join } from 'path';
+import { writeFile, mkdir } from 'fs/promises';
+import { join, isAbsolute } from 'path';
+/**
+ * Resolves the screenshot directory path.
+ * - If SCREENSHOTS_DIR is not set, returns process.cwd()
+ * - If SCREENSHOTS_DIR is absolute, returns it as-is
+ * - If SCREENSHOTS_DIR is relative, joins it with process.cwd()
+ */
+export function resolveScreenshotDir() {
+    const screenshotDir = process.env.SCREENSHOTS_DIR;
+    if (!screenshotDir) {
+        return process.cwd();
+    }
+    if (isAbsolute(screenshotDir)) {
+        return screenshotDir;
+    }
+    return join(process.cwd(), screenshotDir);
+}
+const defaultDeps = {
+    getDriver,
+    writeFile,
+    mkdir,
+    resolveScreenshotDir,
+    dateNow: () => Date.now(),
+};
+export async function executeScreenshot(deps = defaultDeps) {
+    const driver = deps.getDriver();
+    if (!driver) {
+        throw new Error('No driver found');
+    }
+    try {
+        const screenshotBase64 = await driver.getScreenshot();
+        // Convert base64 to buffer
+        const screenshotBuffer = Buffer.from(screenshotBase64, 'base64');
+        // Generate filename with timestamp
+        const timestamp = deps.dateNow();
+        const filename = `screenshot_${timestamp}.png`;
+        const screenshotDir = deps.resolveScreenshotDir();
+        // Create a directory if it doesn't exist
+        await deps.mkdir(screenshotDir, { recursive: true });
+        const filepath = join(screenshotDir, filename);
+        // Save screenshot to disk
+        await deps.writeFile(filepath, screenshotBuffer);
+        return {
+            content: [
+                {
+                    type: 'text',
+                    text: `Screenshot saved successfully to: ${filepath}`,
+                },
+            ],
+        };
+    }
+    catch (err) {
+        return {
+            content: [
+                {
+                    type: 'text',
+                    text: `Failed to take screenshot. err: ${err.toString()}`,
+                },
+            ],
+        };
+    }
+}
 export default function screenshot(server) {
     server.addTool({
         name: 'appium_screenshot',
@@ -9,41 +70,7 @@ export default function screenshot(server) {
             readOnlyHint: false,
             openWorldHint: false,
         },
-        execute: async (args, context) => {
-            const driver = getDriver();
-            if (!driver) {
-                throw new Error('No driver found');
-            }
-            try {
-                const screenshotBase64 = await driver.getScreenshot();
-                // Convert base64 to buffer
-                const screenshotBuffer = Buffer.from(screenshotBase64, 'base64');
-                // Generate filename with timestamp
-                const timestamp = Date.now();
-                const filename = `screenshot_${timestamp}.png`;
-                const filepath = join(process.cwd(), filename);
-                // Save screenshot to disk
-                await writeFile(filepath, screenshotBuffer);
-                return {
-                    content: [
-                        {
-                            type: 'text',
-                            text: `Screenshot saved successfully to: ${filename}`,
-                        },
-                    ],
-                };
-            }
-            catch (err) {
-                return {
-                    content: [
-                        {
-                            type: 'text',
-                            text: `Failed to take screenshot. err: ${err.toString()}`,
-                        },
-                    ],
-                };
-            }
-        },
+        execute: async () => executeScreenshot(),
     });
 }
 //# sourceMappingURL=screenshot.js.map

package/dist/tools/interactions/screenshot.js.map

@@ -1 +1 @@
-{"version":3,"file":"screenshot.js","sourceRoot":"","sources":["../../../src/tools/interactions/screenshot.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,MAAe;IAChD,MAAM,CAAC,OAAO,CAAC;QACb,IAAI,EAAE,mBAAmB;QACzB,WAAW,EACT,iEAAiE;QACnE,WAAW,EAAE;YACX,YAAY,EAAE,KAAK;YACnB,aAAa,EAAE,KAAK;SACrB;QACD,OAAO,EAAE,KAAK,EAAE,IAAS,EAAE,OAAY,EAAgB,EAAE;YACvD,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;YAC3B,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;YACrC,CAAC;YAED,IAAI,CAAC;gBACH,MAAM,gBAAgB,GAAG,MAAM,MAAM,CAAC,aAAa,EAAE,CAAC;gBAEtD,2BAA2B;gBAC3B,MAAM,gBAAgB,GAAG,MAAM,CAAC,IAAI,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC;gBAEjE,mCAAmC;gBACnC,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;gBAC7B,MAAM,QAAQ,GAAG,cAAc,SAAS,MAAM,CAAC;gBAC/C,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,QAAQ,CAAC,CAAC;gBAE/C,0BAA0B;gBAC1B,MAAM,SAAS,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC;gBAE5C,OAAO;oBACL,OAAO,EAAE;wBACP;4BACE,IAAI,EAAE,MAAM;4BACZ,IAAI,EAAE,qCAAqC,QAAQ,EAAE;yBACtD;qBACF;iBACF,CAAC;YACJ,CAAC;YAAC,OAAO,GAAQ,EAAE,CAAC;gBAClB,OAAO;oBACL,OAAO,EAAE;wBACP;4BACE,IAAI,EAAE,MAAM;4BACZ,IAAI,EAAE,mCAAmC,GAAG,CAAC,QAAQ,EAAE,EAAE;yBAC1D;qBACF;iBACF,CAAC;YACJ,CAAC;QACH,CAAC;KACF,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"screenshot.js","sourceRoot":"","sources":["../../../src/tools/interactions/screenshot.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAExC;;;;;GAKG;AACH,MAAM,UAAU,oBAAoB;IAClC,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;IAElD,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC;IACvB,CAAC;IAED,IAAI,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;QAC9B,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,aAAa,CAAC,CAAC;AAC5C,CAAC;AAUD,MAAM,WAAW,GAAmB;IAClC,SAAS;IACT,SAAS;IACT,KAAK;IACL,oBAAoB;IACpB,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;CAC1B,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,OAAuB,WAAW;IAElC,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;IAChC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACrC,CAAC;IAED,IAAI,CAAC;QACH,MAAM,gBAAgB,GAAG,MAAM,MAAM,CAAC,aAAa,EAAE,CAAC;QAEtD,2BAA2B;QAC3B,MAAM,gBAAgB,GAAG,MAAM,CAAC,IAAI,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC;QAEjE,mCAAmC;QACnC,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QACjC,MAAM,QAAQ,GAAG,cAAc,SAAS,MAAM,CAAC;QAC/C,MAAM,aAAa,GAAG,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAElD,yCAAyC;QACzC,MAAM,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAErD,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;QAE/C,0BAA0B;QAC1B,MAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC;QAEjD,OAAO;YACL,OAAO,EAAE;gBACP;oBACE,IAAI,EAAE,MAAM;oBACZ,IAAI,EAAE,qCAAqC,QAAQ,EAAE;iBACtD;aACF;SACF,CAAC;IACJ,CAAC;IAAC,OAAO,GAAQ,EAAE,CAAC;QAClB,OAAO;YACL,OAAO,EAAE;gBACP;oBACE,IAAI,EAAE,MAAM;oBACZ,IAAI,EAAE,mCAAmC,GAAG,CAAC,QAAQ,EAAE,EAAE;iBAC1D;aACF;SACF,CAAC;IACJ,CAAC;AACH,CAAC;AAED,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,MAAe;IAChD,MAAM,CAAC,OAAO,CAAC;QACb,IAAI,EAAE,mBAAmB;QACzB,WAAW,EACT,iEAAiE;QACnE,WAAW,EAAE;YACX,YAAY,EAAE,KAAK;YACnB,aAAa,EAAE,KAAK;SACrB;QACD,OAAO,EAAE,KAAK,IAAkB,EAAE,CAAC,iBAAiB,EAAE;KACvD,CAAC,CAAC;AACL,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "appium-mcp",
   "mcpName": "io.github.appium/appium-mcp",
-  "version": "1.5.0",
+  "version": "1.6.1",
   "type": "module",
   "repository": {
     "type": "git",

package/src/tests/screenshot.test.ts

@@ -0,0 +1,278 @@
+import {
+  describe,
+  test,
+  expect,
+  beforeEach,
+  afterEach,
+  jest,
+} from '@jest/globals';
+import { join, isAbsolute } from 'path';
+
+/**
+ * Local implementation of resolveScreenshotDir for testing.
+ * This mirrors the implementation in screenshot.ts to avoid importing
+ * the module which has heavy dependencies.
+ */
+function resolveScreenshotDir(): string {
+  const screenshotDir = process.env.SCREENSHOTS_DIR;
+
+  if (!screenshotDir) {
+    return process.cwd();
+  }
+
+  if (isAbsolute(screenshotDir)) {
+    return screenshotDir;
+  }
+
+  return join(process.cwd(), screenshotDir);
+}
+
+/**
+ * Interface for screenshot dependencies (mirrors screenshot.ts).
+ */
+interface ScreenshotDeps {
+  getDriver: () => { getScreenshot: () => Promise<string> } | null;
+  writeFile: (path: string, data: Buffer) => Promise<void>;
+  mkdir: (path: string, options: { recursive: boolean }) => Promise<void>;
+  resolveScreenshotDir: () => string;
+  dateNow: () => number;
+}
+
+/**
+ * Local implementation of executeScreenshot for testing.
+ * This mirrors the implementation in screenshot.ts.
+ */
+async function executeScreenshot(deps: ScreenshotDeps): Promise<any> {
+  const driver = deps.getDriver();
+  if (!driver) {
+    throw new Error('No driver found');
+  }
+
+  try {
+    const screenshotBase64 = await driver.getScreenshot();
+    const screenshotBuffer = Buffer.from(screenshotBase64, 'base64');
+    const timestamp = deps.dateNow();
+    const filename = `screenshot_${timestamp}.png`;
+    const screenshotDir = deps.resolveScreenshotDir();
+
+    await deps.mkdir(screenshotDir, { recursive: true });
+    const filepath = join(screenshotDir, filename);
+    await deps.writeFile(filepath, screenshotBuffer);
+
+    return {
+      content: [
+        {
+          type: 'text',
+          text: `Screenshot saved successfully to: ${filename}`,
+        },
+      ],
+    };
+  } catch (err: any) {
+    return {
+      content: [
+        {
+          type: 'text',
+          text: `Failed to take screenshot. err: ${err.toString()}`,
+        },
+      ],
+    };
+  }
+}
+
+describe('resolveScreenshotDir', () => {
+  const originalEnv = process.env.SCREENSHOTS_DIR;
+  const cwd = process.cwd();
+
+  beforeEach(() => {
+    delete process.env.SCREENSHOTS_DIR;
+  });
+
+  afterEach(() => {
+    if (originalEnv !== undefined) {
+      process.env.SCREENSHOTS_DIR = originalEnv;
+    } else {
+      delete process.env.SCREENSHOTS_DIR;
+    }
+  });
+
+  test('should return process.cwd() when SCREENSHOTS_DIR is not set', () => {
+    const result = resolveScreenshotDir();
+    expect(result).toBe(cwd);
+  });
+
+  test('should return process.cwd() when SCREENSHOTS_DIR is empty string', () => {
+    process.env.SCREENSHOTS_DIR = '';
+    const result = resolveScreenshotDir();
+    expect(result).toBe(cwd);
+  });
+
+  test('should return absolute path as-is when SCREENSHOTS_DIR is absolute', () => {
+    const absolutePath = '/tmp/screenshots';
+    process.env.SCREENSHOTS_DIR = absolutePath;
+    const result = resolveScreenshotDir();
+    expect(result).toBe(absolutePath);
+  });
+
+  test('should join relative path with process.cwd()', () => {
+    const relativePath = 'screenshots';
+    process.env.SCREENSHOTS_DIR = relativePath;
+    const result = resolveScreenshotDir();
+    expect(result).toBe(join(cwd, relativePath));
+  });
+
+  test('should handle nested relative paths', () => {
+    const relativePath = 'output/screenshots/test';
+    process.env.SCREENSHOTS_DIR = relativePath;
+    const result = resolveScreenshotDir();
+    expect(result).toBe(join(cwd, relativePath));
+  });
+
+  test('should handle relative path starting with ./', () => {
+    const relativePath = './screenshots';
+    process.env.SCREENSHOTS_DIR = relativePath;
+    const result = resolveScreenshotDir();
+    expect(result).toBe(join(cwd, relativePath));
+  });
+
+  test('should handle relative path with parent directory reference', () => {
+    const relativePath = '../screenshots';
+    process.env.SCREENSHOTS_DIR = relativePath;
+    const result = resolveScreenshotDir();
+    expect(result).toBe(join(cwd, relativePath));
+  });
+});
+
+describe('executeScreenshot', () => {
+  const mockBase64 = 'dGVzdA=='; // 'test' in base64
+  const mockTimestamp = 1234567890;
+
+  function createMockDeps(
+    overrides: Partial<ScreenshotDeps> = {}
+  ): ScreenshotDeps {
+    return {
+      getDriver: jest.fn(() => ({
+        getScreenshot: jest.fn(() => Promise.resolve(mockBase64)),
+      })) as any,
+      writeFile: jest.fn(() => Promise.resolve()) as any,
+      mkdir: jest.fn(() => Promise.resolve()) as any,
+      resolveScreenshotDir: jest.fn(() => '/mock/screenshots') as any,
+      dateNow: jest.fn(() => mockTimestamp) as any,
+      ...overrides,
+    };
+  }
+
+  test('should throw error when no driver found', async () => {
+    const deps = createMockDeps({
+      getDriver: jest.fn(() => null) as any,
+    });
+
+    await expect(executeScreenshot(deps)).rejects.toThrow('No driver found');
+  });
+
+  test('should return success content with filename', async () => {
+    const deps = createMockDeps();
+
+    const result = await executeScreenshot(deps);
+
+    expect(result).toEqual({
+      content: [
+        {
+          type: 'text',
+          text: `Screenshot saved successfully to: screenshot_${mockTimestamp}.png`,
+        },
+      ],
+    });
+  });
+
+  test('should use resolved screenshot directory from SCREENSHOTS_DIR', async () => {
+    const customDir = '/custom/path/screenshots';
+    const deps = createMockDeps({
+      resolveScreenshotDir: jest.fn(() => customDir) as any,
+    });
+
+    await executeScreenshot(deps);
+
+    expect(deps.mkdir).toHaveBeenCalledWith(customDir, { recursive: true });
+    expect(deps.writeFile).toHaveBeenCalledWith(
+      join(customDir, `screenshot_${mockTimestamp}.png`),
+      expect.any(Buffer)
+    );
+  });
+
+  test('should create directory with recursive option', async () => {
+    const deps = createMockDeps();
+
+    await executeScreenshot(deps);
+
+    expect(deps.mkdir).toHaveBeenCalledWith('/mock/screenshots', {
+      recursive: true,
+    });
+  });
+
+  test('should write screenshot buffer to correct filepath', async () => {
+    const deps = createMockDeps();
+
+    await executeScreenshot(deps);
+
+    expect(deps.writeFile).toHaveBeenCalledWith(
+      `/mock/screenshots/screenshot_${mockTimestamp}.png`,
+      Buffer.from(mockBase64, 'base64')
+    );
+  });
+
+  test('should return error content when screenshot fails', async () => {
+    const errorMessage = 'Screenshot capture failed';
+    const deps = createMockDeps({
+      getDriver: jest.fn(() => ({
+        getScreenshot: jest.fn(() => Promise.reject(new Error(errorMessage))),
+      })) as any,
+    });
+
+    const result = await executeScreenshot(deps);
+
+    expect(result).toEqual({
+      content: [
+        {
+          type: 'text',
+          text: `Failed to take screenshot. err: Error: ${errorMessage}`,
+        },
+      ],
+    });
+  });
+
+  test('should return error content when mkdir fails', async () => {
+    const errorMessage = 'Permission denied';
+    const deps = createMockDeps({
+      mkdir: jest.fn(() => Promise.reject(new Error(errorMessage))) as any,
+    });
+
+    const result = await executeScreenshot(deps);
+
+    expect(result).toEqual({
+      content: [
+        {
+          type: 'text',
+          text: `Failed to take screenshot. err: Error: ${errorMessage}`,
+        },
+      ],
+    });
+  });
+
+  test('should return error content when writeFile fails', async () => {
+    const errorMessage = 'Disk full';
+    const deps = createMockDeps({
+      writeFile: jest.fn(() => Promise.reject(new Error(errorMessage))) as any,
+    });
+
+    const result = await executeScreenshot(deps);
+
+    expect(result).toEqual({
+      content: [
+        {
+          type: 'text',
+          text: `Failed to take screenshot. err: Error: ${errorMessage}`,
+        },
+      ],
+    });
+  });
+});

package/src/tools/interactions/screenshot.ts

@@ -1,8 +1,90 @@
 import { FastMCP } from 'fastmcp/dist/FastMCP.js';
-import { z } from 'zod';
 import { getDriver } from '../../session-store.js';
-import { writeFile } from 'fs/promises';
-import { join } from 'path';
+import { writeFile, mkdir } from 'fs/promises';
+import { join, isAbsolute } from 'path';
+
+/**
+ * Resolves the screenshot directory path.
+ * - If SCREENSHOTS_DIR is not set, returns process.cwd()
+ * - If SCREENSHOTS_DIR is absolute, returns it as-is
+ * - If SCREENSHOTS_DIR is relative, joins it with process.cwd()
+ */
+export function resolveScreenshotDir(): string {
+  const screenshotDir = process.env.SCREENSHOTS_DIR;
+
+  if (!screenshotDir) {
+    return process.cwd();
+  }
+
+  if (isAbsolute(screenshotDir)) {
+    return screenshotDir;
+  }
+
+  return join(process.cwd(), screenshotDir);
+}
+
+export interface ScreenshotDeps {
+  getDriver: () => { getScreenshot: () => Promise<string> } | null;
+  writeFile: typeof writeFile;
+  mkdir: typeof mkdir;
+  resolveScreenshotDir: typeof resolveScreenshotDir;
+  dateNow: () => number;
+}
+
+const defaultDeps: ScreenshotDeps = {
+  getDriver,
+  writeFile,
+  mkdir,
+  resolveScreenshotDir,
+  dateNow: () => Date.now(),
+};
+
+export async function executeScreenshot(
+  deps: ScreenshotDeps = defaultDeps
+): Promise<any> {
+  const driver = deps.getDriver();
+  if (!driver) {
+    throw new Error('No driver found');
+  }
+
+  try {
+    const screenshotBase64 = await driver.getScreenshot();
+
+    // Convert base64 to buffer
+    const screenshotBuffer = Buffer.from(screenshotBase64, 'base64');
+
+    // Generate filename with timestamp
+    const timestamp = deps.dateNow();
+    const filename = `screenshot_${timestamp}.png`;
+    const screenshotDir = deps.resolveScreenshotDir();
+
+    // Create a directory if it doesn't exist
+    await deps.mkdir(screenshotDir, { recursive: true });
+
+    const filepath = join(screenshotDir, filename);
+
+    // Save screenshot to disk
+    await deps.writeFile(filepath, screenshotBuffer);
+
+    return {
+      content: [
+        {
+          type: 'text',
+          text: `Screenshot saved successfully to: ${filepath}`,
+        },
+      ],
+    };
+  } catch (err: any) {
+    return {
+      content: [
+        {
+          type: 'text',
+          text: `Failed to take screenshot. err: ${err.toString()}`,
+        },
+      ],
+    };
+  }
+}
 
 export default function screenshot(server: FastMCP): void {
   server.addTool({
@@ -13,44 +95,6 @@ export default function screenshot(server: FastMCP): void {
       readOnlyHint: false,
       openWorldHint: false,
     },
-    execute: async (args: any, context: any): Promise<any> => {
-      const driver = getDriver();
-      if (!driver) {
-        throw new Error('No driver found');
-      }
-
-      try {
-        const screenshotBase64 = await driver.getScreenshot();
-
-        // Convert base64 to buffer
-        const screenshotBuffer = Buffer.from(screenshotBase64, 'base64');
-
-        // Generate filename with timestamp
-        const timestamp = Date.now();
-        const filename = `screenshot_${timestamp}.png`;
-        const filepath = join(process.cwd(), filename);
-
-        // Save screenshot to disk
-        await writeFile(filepath, screenshotBuffer);
-
-        return {
-          content: [
-            {
-              type: 'text',
-              text: `Screenshot saved successfully to: ${filename}`,
-            },
-          ],
-        };
-      } catch (err: any) {
-        return {
-          content: [
-            {
-              type: 'text',
-              text: `Failed to take screenshot. err: ${err.toString()}`,
-            },
-          ],
-        };
-      }
-    },
+    execute: async (): Promise<any> => executeScreenshot(),
   });
 }