openuispec 0.2.9 → 0.2.10

package/cli/index.ts

@@ -24,6 +24,7 @@
  *   openuispec spec-schema <type>             Get JSON schema for a spec type
  *   openuispec screenshot [--route /path]     Screenshot the web app
  *   openuispec screenshot-android [opts]      Screenshot Android app on emulator
+ *   openuispec screenshot-android-batch [opts] Batch screenshot Android app on emulator
  *   openuispec screenshot-ios [opts]          Screenshot iOS app on simulator
  */
 
@@ -47,6 +48,25 @@ function getPositional(argv: string[], startIdx = 0): string[] {
   return argv.slice(startIdx).filter((a) => !a.startsWith("--"));
 }
 
+function readJsonFile(filePath: string): any {
+  return JSON.parse(readFileSync(resolve(filePath), "utf-8"));
+}
+
+function parseBatchConfig(rest: string[], usage: string): { config: any; captures: any[] } {
+  const configPath = getOption(rest, "--config");
+  if (!configPath) {
+    console.error(usage);
+    process.exit(1);
+  }
+  const config = readJsonFile(configPath);
+  const captures = Array.isArray(config) ? config : config.captures;
+  if (!Array.isArray(captures) || captures.length === 0) {
+    console.error("Batch config must be an array of captures or an object with a non-empty 'captures' array.");
+    process.exit(1);
+  }
+  return { config, captures };
+}
+
 // ── rules version check ─────────────────────────────────────────────
 
 function checkRulesVersion(): void {
@@ -338,6 +358,37 @@ async function main(): Promise<void> {
       break;
     }
 
+    case "screenshot-android-batch": {
+      const { takeAndroidScreenshotBatch } = await import("../mcp-server/screenshot-android.js");
+      const { config, captures } = parseBatchConfig(rest,
+        "Usage: openuispec screenshot-android-batch --config <captures.json> [--project-dir path] [--module name] [--theme light|dark] [--output-dir dir]");
+
+      const result = await takeAndroidScreenshotBatch(cwd, {
+        captures,
+        theme: (getOption(rest, "--theme") ?? config.theme) as "light" | "dark" | undefined,
+        output_dir: getOption(rest, "--output-dir") ?? config.output_dir ?? undefined,
+        project_dir: getOption(rest, "--project-dir") ?? config.project_dir ?? undefined,
+        module: getOption(rest, "--module") ?? config.module ?? undefined,
+      });
+      printScreenshotResult(result);
+      break;
+    }
+
+    case "screenshot-web-batch": {
+      const { takeScreenshotBatch } = await import("../mcp-server/screenshot.js");
+      const { config, captures } = parseBatchConfig(rest,
+        "Usage: openuispec screenshot-web-batch --config <captures.json> [--theme light|dark] [--output-dir dir]");
+
+      const result = await takeScreenshotBatch(cwd, {
+        captures,
+        viewport: config.viewport,
+        theme: (getOption(rest, "--theme") ?? config.theme) as "light" | "dark" | undefined,
+        output_dir: getOption(rest, "--output-dir") ?? config.output_dir ?? undefined,
+      });
+      printScreenshotResult(result);
+      break;
+    }
+
     case "screenshot-ios": {
       const { takeIOSScreenshot } = await import("../mcp-server/screenshot-ios.js");
       const result = await takeIOSScreenshot(cwd, {
@@ -355,6 +406,24 @@ async function main(): Promise<void> {
       break;
     }
 
+    case "screenshot-ios-batch": {
+      const { takeIOSScreenshotBatch } = await import("../mcp-server/screenshot-ios.js");
+      const { config, captures } = parseBatchConfig(rest,
+        "Usage: openuispec screenshot-ios-batch --config <captures.json> [--project-dir path] [--scheme name] [--bundle-id id] [--device name] [--theme light|dark] [--output-dir dir]");
+
+      const result = await takeIOSScreenshotBatch(cwd, {
+        captures,
+        device: getOption(rest, "--device") ?? config.device ?? undefined,
+        theme: (getOption(rest, "--theme") ?? config.theme) as "light" | "dark" | undefined,
+        output_dir: getOption(rest, "--output-dir") ?? config.output_dir ?? undefined,
+        project_dir: getOption(rest, "--project-dir") ?? config.project_dir ?? undefined,
+        scheme: getOption(rest, "--scheme") ?? config.scheme ?? undefined,
+        bundle_id: getOption(rest, "--bundle-id") ?? config.bundle_id ?? undefined,
+      });
+      printScreenshotResult(result);
+      break;
+    }
+
     // ── help ────────────────────────────────────────────────────────
 
     case undefined:
@@ -389,13 +458,20 @@ Spec access:
   openuispec spec-types                     List available spec types
   openuispec spec-schema <type>             Get full JSON schema for a spec type
 
-Screenshots:
+Screenshots (single):
   openuispec screenshot [--route /path] [--theme light|dark] [--output-dir dir]
   openuispec screenshot-android [--screen name] [--project-dir path] [--module name]
       [--route deeplink] [--nav Step1,Step2] [--theme light|dark] [--output-dir dir]
   openuispec screenshot-ios [--screen name] [--project-dir path] [--scheme name]
       [--bundle-id id] [--device name] [--nav Step1,Step2] [--theme light|dark]
 
+Screenshots (batch — build once, capture many):
+  openuispec screenshot-web-batch --config captures.json [--theme light|dark] [--output-dir dir]
+  openuispec screenshot-android-batch --config captures.json [--project-dir path]
+      [--module name] [--theme light|dark] [--output-dir dir]
+  openuispec screenshot-ios-batch --config captures.json [--project-dir path]
+      [--scheme name] [--bundle-id id] [--device name] [--theme light|dark] [--output-dir dir]
+
 Server:
   openuispec mcp                            Start MCP server (stdio transport)
 

package/docs/cli.md

@@ -92,9 +92,15 @@ openuispec spec-schema <type>                 # Get JSON schema for a spec type
 ### Screenshots
 
 ```bash
+# Single captures
 openuispec screenshot --route /home [--theme dark] [--output-dir dir]
 openuispec screenshot-android [--project-dir path] [--screen name] [--module name] [--route deeplink]
 openuispec screenshot-ios [--project-dir path] [--screen name] [--scheme name] [--bundle-id id]
+
+# Batch — build once, capture many
+openuispec screenshot-web-batch --config captures.json [--theme dark] [--output-dir dir]
+openuispec screenshot-android-batch --config captures.json [--project-dir path] [--module name]
+openuispec screenshot-ios-batch --config captures.json [--project-dir path] [--scheme name] [--bundle-id id]
 ```
 
 Screenshot tools work with **any** project — use `--project-dir` to skip manifest lookup.
@@ -111,6 +117,30 @@ Screenshot tools work with **any** project — use `--project-dir` to skip manif
 | `--device` | -- | yes | Simulator device name |
 | `--output-dir` | yes | yes | Save screenshot to directory |
 
+### Batch config
+
+All batch commands accept `--config captures.json`. The JSON file has the same structure for all platforms:
+
+```json
+{
+  "project_dir": "path/to/project",
+  "output_dir": "screenshots",
+  "theme": "light",
+  "captures": [
+    { "screen": "home", "route": "/home", "wait_for": 3000 },
+    { "screen": "settings", "nav": ["Settings"], "wait_for": 5000 }
+  ]
+}
+```
+
+Each capture supports:
+- `screen`: output filename stem (required)
+- `route`: deep link URI (Android) or URL path (web)
+- `nav`: array of visible-text tap steps after launch (Android, iOS)
+- `wait_for`: per-capture wait time in ms
+- `selector`: CSS selector to screenshot a specific element (web only)
+- `full_page`: capture full scrollable page (web only)
+
 ## Target Update Workflow
 
 When a shared spec change needs to be applied to a target:

package/examples/taskflow/generated/ios/TaskFlow/project.yml

@@ -24,3 +24,8 @@ targets:
         INFOPLIST_KEY_UIUserInterfaceStyle: Automatic
         SWIFT_VERSION: 5.10
         PRODUCT_BUNDLE_IDENTIFIER: uz.rsteam.taskflow
+schemes:
+  TaskFlow:
+    build:
+      targets:
+        TaskFlow: all

package/examples/todo-orbit/generated/ios/Todo Orbit/TodoOrbit.xcodeproj/project.pbxproj

@@ -19,16 +19,19 @@
 		BC38D8705D84A35CA4597319 /* SettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB44040683A902497C58A015 /* SettingsView.swift */; };
 		C48B6CB49E4975FA1F6E375B /* TaskEditorSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18F27CD847E25814CF020BD2 /* TaskEditorSheet.swift */; };
 		C6106B18861BE3E491DF43E2 /* RecurringRuleSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2ECC34C8FF28EDDC9779648 /* RecurringRuleSheet.swift */; };
+		F1510F7B66940A31758A2561 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = BEE6DEA10F74F9459C452D3F /* Localizable.strings */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
 		1549DC459C5275175F9C14DA /* SchedulePreviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SchedulePreviewView.swift; sourceTree = "<group>"; };
 		18F27CD847E25814CF020BD2 /* TaskEditorSheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TaskEditorSheet.swift; sourceTree = "<group>"; };
+		2B9B6454B5BB98B387C7B5C4 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Localizable.strings; sourceTree = "<group>"; };
 		39885C677159185FF63FD439 /* TasksHomeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TasksHomeView.swift; sourceTree = "<group>"; };
 		44D5BC7160E201639C3BB553 /* AppModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppModel.swift; sourceTree = "<group>"; };
 		4ED01AC556A631AD84466AB3 /* TrendChartView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrendChartView.swift; sourceTree = "<group>"; };
 		557759E88A2388894FA0C7BB /* TodoOrbit.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = TodoOrbit.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		6998ADDB28617F993A8C0457 /* TodoOrbitApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TodoOrbitApp.swift; sourceTree = "<group>"; };
+		6E3C87FA6CD54B76AEB1E84A /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
 		7A697422498544CC5739C094 /* Charts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Charts.framework; path = System/Library/Frameworks/Charts.framework; sourceTree = SDKROOT; };
 		8888C94EDF738EA4F84E3F63 /* AnalyticsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnalyticsView.swift; sourceTree = "<group>"; };
 		BB44040683A902497C58A015 /* SettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsView.swift; sourceTree = "<group>"; };
@@ -86,6 +89,7 @@
 		20A8D65D5A36A0A1D83FC83B = {
 			isa = PBXGroup;
 			children = (
+				4E25DE308842C29211993157 /* Resources */,
 				F8B6569F634112DBF4BA31A0 /* TodoOrbit */,
 				2076B302B77DCDE399DBA8FE /* Frameworks */,
 				004F5B8035C988C3C942C7B6 /* Products */,
@@ -102,6 +106,14 @@
 			path = Components;
 			sourceTree = "<group>";
 		};
+		4E25DE308842C29211993157 /* Resources */ = {
+			isa = PBXGroup;
+			children = (
+				BEE6DEA10F74F9459C452D3F /* Localizable.strings */,
+			);
+			path = Resources;
+			sourceTree = "<group>";
+		};
 		59DB494C80FF64B9BB3FD8AF /* Models */ = {
 			isa = PBXGroup;
 			children = (
@@ -149,6 +161,7 @@
 			buildConfigurationList = 8F4D2BE44A3854271D9C066F /* Build configuration list for PBXNativeTarget "TodoOrbit" */;
 			buildPhases = (
 				6918283D91B9066E2F9DADD5 /* Sources */,
+				EBFB738E78B6AF48E8771031 /* Resources */,
 				56326A91B4B75B21E246160E /* Frameworks */,
 			);
 			buildRules = (
@@ -179,6 +192,7 @@
 			knownRegions = (
 				Base,
 				en,
+				ru,
 			);
 			mainGroup = 20A8D65D5A36A0A1D83FC83B;
 			minimizedProjectReferenceProxies = 1;
@@ -192,6 +206,17 @@
 		};
 /* End PBXProject section */
 
+/* Begin PBXResourcesBuildPhase section */
+		EBFB738E78B6AF48E8771031 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				F1510F7B66940A31758A2561 /* Localizable.strings in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
 /* Begin PBXSourcesBuildPhase section */
 		6918283D91B9066E2F9DADD5 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
@@ -213,6 +238,18 @@
 		};
 /* End PBXSourcesBuildPhase section */
 
+/* Begin PBXVariantGroup section */
+		BEE6DEA10F74F9459C452D3F /* Localizable.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				6E3C87FA6CD54B76AEB1E84A /* en */,
+				2B9B6454B5BB98B387C7B5C4 /* ru */,
+			);
+			name = Localizable.strings;
+			sourceTree = "<group>";
+		};
+/* End PBXVariantGroup section */
+
 /* Begin XCBuildConfiguration section */
 		24892C5AA9CE821A3653389E /* Debug */ = {
 			isa = XCBuildConfiguration;
@@ -265,14 +302,15 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 17.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
-				PRODUCT_NAME = "$(TARGET_NAME)";
+				PRODUCT_NAME = TodoOrbit;
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 5.1;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -286,13 +324,13 @@
 				INFOPLIST_KEY_CFBundleDisplayName = "Todo Orbit";
 				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
 				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 17.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = uz.rsteam.generated.todoorbit;
 				SDKROOT = iphoneos;
+				SWIFT_VERSION = 5.1;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
@@ -307,13 +345,13 @@
 				INFOPLIST_KEY_CFBundleDisplayName = "Todo Orbit";
 				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
 				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 17.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = uz.rsteam.generated.todoorbit;
 				SDKROOT = iphoneos;
+				SWIFT_VERSION = 5.1;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -363,13 +401,14 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 17.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
-				PRODUCT_NAME = "$(TARGET_NAME)";
+				PRODUCT_NAME = TodoOrbit;
 				SDKROOT = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
-				SWIFT_VERSION = 5.1;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};

package/examples/todo-orbit/generated/ios/Todo Orbit/TodoOrbit.xcodeproj/xcshareddata/xcschemes/TodoOrbit.xcscheme

@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1430"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      runPostActionsOnFailure = "NO">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "8573DE2D9477FA23E2648D4F"
+               BuildableName = "TodoOrbit.app"
+               BlueprintName = "TodoOrbit"
+               ReferencedContainer = "container:TodoOrbit.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      onlyGenerateCoverageForSpecifiedTargets = "NO">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "8573DE2D9477FA23E2648D4F"
+            BuildableName = "TodoOrbit.app"
+            BlueprintName = "TodoOrbit"
+            ReferencedContainer = "container:TodoOrbit.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "8573DE2D9477FA23E2648D4F"
+            BuildableName = "TodoOrbit.app"
+            BlueprintName = "TodoOrbit"
+            ReferencedContainer = "container:TodoOrbit.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "8573DE2D9477FA23E2648D4F"
+            BuildableName = "TodoOrbit.app"
+            BlueprintName = "TodoOrbit"
+            ReferencedContainer = "container:TodoOrbit.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

package/examples/todo-orbit/generated/ios/Todo Orbit/project.yml

@@ -1,25 +1,32 @@
 name: TodoOrbit
 options:
   bundleIdPrefix: uz.rsteam.generated
+  deploymentTarget:
+    iOS: "17.0"
 settings:
   base:
-    SWIFT_VERSION: 5.10
+    PRODUCT_NAME: TodoOrbit
 targets:
   TodoOrbit:
     type: application
     platform: iOS
-    deploymentTarget: "17.0"
     sources:
       - path: Sources/TodoOrbit
-    resources:
       - path: Resources
+        buildPhase: resources
     settings:
       base:
-        PRODUCT_BUNDLE_IDENTIFIER: uz.rsteam.generated.todoorbit
         GENERATE_INFOPLIST_FILE: YES
         INFOPLIST_KEY_CFBundleDisplayName: Todo Orbit
-        INFOPLIST_KEY_UILaunchScreen_Generation: YES
-        INFOPLIST_KEY_UIApplicationSceneManifest_Generation: YES
+        INFOPLIST_KEY_UILaunchScreen_Generation: true
+        INFOPLIST_KEY_UIApplicationSceneManifest_Generation: true
+        SWIFT_VERSION: 5.10
+        PRODUCT_BUNDLE_IDENTIFIER: uz.rsteam.generated.todoorbit
         DEVELOPMENT_ASSET_PATHS: "\"Sources/TodoOrbit/Preview Content\""
     dependencies:
       - sdk: Charts.framework
+schemes:
+  TodoOrbit:
+    build:
+      targets:
+        TodoOrbit: all

package/mcp-server/index.ts

@@ -25,9 +25,9 @@ import { loadTargetDrift } from "../drift/index.js";
 import { readFileSync as fsReadFileSync, existsSync, readdirSync } from "node:fs";
 import { relative, resolve } from "node:path";
 import YAML from "yaml";
-import { takeScreenshot } from "./screenshot.js";
-import { takeAndroidScreenshot } from "./screenshot-android.js";
-import { takeIOSScreenshot } from "./screenshot-ios.js";
+import { takeScreenshot, takeScreenshotBatch } from "./screenshot.js";
+import { takeAndroidScreenshot, takeAndroidScreenshotBatch } from "./screenshot-android.js";
+import { takeIOSScreenshot, takeIOSScreenshotBatch } from "./screenshot-ios.js";
 
 // ── resolve project cwd ──────────────────────────────────────────────
 
@@ -777,6 +777,97 @@ server.registerTool(
   }
 );
 
+// ── tool: openuispec_screenshot_web_batch ──────────────────────────────
+
+const webBatchCaptureSchema = z.object({
+  screen: z.string().describe("Screen name for metadata and filename"),
+  route: z.string().describe("Route path (e.g. '/home', '/settings')"),
+  selector: z.string().optional().describe("CSS selector to screenshot a specific element"),
+  full_page: z.boolean().optional().describe("Capture full scrollable page"),
+  wait_for: z.number().optional().describe("Per-capture wait time in ms"),
+});
+
+server.registerTool(
+  "openuispec_screenshot_web_batch",
+  {
+    description: "Take multiple web screenshots in a single server session. Starts the dev server once, then captures all routes in sequence. Much faster than calling screenshot for each route individually.",
+    inputSchema: {
+      captures: z.array(webBatchCaptureSchema).describe("Array of captures — each with screen name and route"),
+      viewport: z.object({ width: z.number().default(1280), height: z.number().default(800) }).optional().describe("Viewport dimensions for all captures"),
+      theme: z.enum(["light", "dark"]).optional().describe("Force color scheme for all captures"),
+      output_dir: z.string().optional().describe("Directory to save all PNGs (relative to web app root)"),
+    },
+  },
+  async ({ captures, viewport, theme, output_dir }) => {
+    try {
+      return await takeScreenshotBatch(projectCwd, { captures, viewport, theme, output_dir });
+    } catch (err) {
+      return toolError(err);
+    }
+  }
+);
+
+// ── tool: openuispec_screenshot_android_batch ─────────────────────────
+
+const androidBatchCaptureSchema = z.object({
+  screen: z.string().describe("Screen name for metadata and filename"),
+  route: z.string().optional().describe("Deep link URI to launch"),
+  nav: z.array(z.string()).optional().describe("UI tap steps after launch"),
+  wait_for: z.number().optional().describe("Per-capture wait time in ms"),
+});
+
+server.registerTool(
+  "openuispec_screenshot_android_batch",
+  {
+    description: "Take multiple Android screenshots in a single build+install cycle. Builds the APK once, installs once, then captures each screen in sequence via deep links or UI navigation. Much faster than calling screenshot_android for each screen individually.",
+    inputSchema: {
+      captures: z.array(androidBatchCaptureSchema).describe("Array of captures — each with screen name and optional route/nav"),
+      theme: z.enum(["light", "dark"]).optional().describe("Force light or dark mode for all captures"),
+      output_dir: z.string().optional().describe("Directory to save all PNGs (relative to Android project root)"),
+      project_dir: z.string().optional().describe("Direct path to Android project root"),
+      module: z.string().optional().describe("App module name (default: auto-detect)"),
+    },
+  },
+  async ({ captures, theme, output_dir, project_dir, module }) => {
+    try {
+      return await takeAndroidScreenshotBatch(projectCwd, { captures, theme, output_dir, project_dir, module });
+    } catch (err) {
+      return toolError(err);
+    }
+  }
+);
+
+// ── tool: openuispec_screenshot_ios_batch ──────────────────────────────
+
+const iosBatchCaptureSchema = z.object({
+  screen: z.string().describe("Screen name for metadata and filename"),
+  nav: z.array(z.string()).optional().describe("UI tap steps after launch"),
+  wait_for: z.number().optional().describe("Per-capture wait time in ms"),
+});
+
+server.registerTool(
+  "openuispec_screenshot_ios_batch",
+  {
+    description: "Take multiple iOS screenshots in a single build+install cycle. Builds the app once, then captures each screen — no-nav screens via simctl, nav screens batched into a single XCUITest run. Much faster than calling screenshot_ios for each screen individually.",
+    inputSchema: {
+      captures: z.array(iosBatchCaptureSchema).describe("Array of captures — each with screen name and optional nav steps"),
+      device: z.string().optional().describe("Simulator device name"),
+      theme: z.enum(["light", "dark"]).optional().describe("Force light or dark appearance for all captures"),
+      output_dir: z.string().optional().describe("Directory to save all PNGs (relative to iOS project root)"),
+      project_dir: z.string().optional().describe("Direct path to iOS project root"),
+      scheme: z.string().optional().describe("Xcode scheme name"),
+      bundle_id: z.string().optional().describe("App bundle identifier"),
+    },
+  },
+  async ({ captures, device, theme, output_dir, project_dir, scheme, bundle_id }) => {
+    try {
+      return await takeIOSScreenshotBatch(projectCwd, { captures, device, theme, output_dir, project_dir, scheme, bundle_id });
+    } catch (err) {
+      return toolError(err);
+    }
+  }
+);
+
 // ── start server ─────────────────────────────────────────────────────
 
 export async function startMcpServer() {

package/mcp-server/screenshot-android.ts

@@ -17,6 +17,7 @@ import {
 } from "./screenshot-shared.js";
 
 const exec = promisify(execCb);
+const androidScreenshotQueues = new Map<string, Promise<void>>();
 
 // ── types ───────────────────────────────────────────────────────────
 
@@ -31,6 +32,21 @@ export interface AndroidScreenshotOptions {
   module?: string;
 }
 
+export interface AndroidBatchCapture {
+  screen: string;
+  route?: string;
+  nav?: string[];
+  wait_for?: number;
+}
+
+export interface AndroidScreenshotBatchOptions {
+  captures: AndroidBatchCapture[];
+  theme?: "light" | "dark";
+  output_dir?: string;
+  project_dir?: string;
+  module?: string;
+}
+
 // ── constants ───────────────────────────────────────────────────────
 
 const ADB_SCREENSHOT_PATH = "/sdcard/openuispec_screenshot.png";
@@ -282,6 +298,27 @@ export async function installAndLaunch(
   }
 }
 
+export async function launchInstalledApp(
+  adb: string,
+  serial: string,
+  appInfo: AppInfo,
+  route?: string,
+): Promise<void> {
+  await adbShell(adb, serial, `am force-stop ${appInfo.applicationId}`);
+  // Clear saved nav state so deep links route correctly
+  try { await adbShell(adb, serial, `pm clear ${appInfo.applicationId}`); } catch { /* ignore */ }
+  if (route) {
+    await adbShell(
+      adb,
+      serial,
+      `am start -W -a android.intent.action.VIEW -d '${route}' ` +
+        `${appInfo.applicationId}/${appInfo.launchActivity}`,
+    );
+  } else {
+    await adbShell(adb, serial, `am start -W -n ${appInfo.applicationId}/${appInfo.launchActivity}`);
+  }
+}
+
 // ── theme control ───────────────────────────────────────────────────
 
 export async function setTheme(adb: string, serial: string, theme: "light" | "dark"): Promise<void> {
@@ -358,9 +395,12 @@ export async function captureScreenshot(
   serial: string,
   localPath: string,
 ): Promise<void> {
-  await adbShell(adb, serial, `screencap -p ${ADB_SCREENSHOT_PATH}`);
-  await adbExec(adb, serial, `pull ${ADB_SCREENSHOT_PATH} "${localPath}"`);
-  await adbShell(adb, serial, `rm ${ADB_SCREENSHOT_PATH}`);
+  try {
+    await exec(`${adb} -s ${serial} exec-out screencap -p > "${localPath}"`, { timeout: 60_000, shell: "/bin/bash" });
+  } catch (err: any) {
+    const output = ((err.stderr ?? "") + "\n" + (err.stdout ?? "")).trim();
+    throw new Error(`Android screenshot capture failed${output ? `:\n${output}` : "."}`);
+  }
 }
 
 // ── wait for app ready ──────────────────────────────────────────────
@@ -395,6 +435,47 @@ async function waitForAppReady(
   await new Promise(r => setTimeout(r, waitMs));
 }
 
+async function takeSingleAndroidCapture(
+  adb: string,
+  serial: string,
+  androidDir: string,
+  appInfo: AppInfo,
+  capture: AndroidBatchCapture,
+  theme: "light" | "dark" | undefined,
+  defaultOutputDir: string | undefined,
+): Promise<{ screen: string; path: string; data: string }> {
+  await launchInstalledApp(adb, serial, appInfo, capture.route);
+  await waitForAppReady(adb, serial, appInfo.applicationId, capture.wait_for ?? 3000);
+
+  if (capture.nav && capture.nav.length > 0) {
+    await navigateByTaps(adb, serial, capture.nav);
+  }
+
+  const themeLabel = theme ?? "default";
+  const filename = `${capture.screen}_${themeLabel}.png`;
+  const tmpPath = join(androidDir, `.openuispec-screenshot-${capture.screen}.png`);
+  await captureScreenshot(adb, serial, tmpPath);
+
+  let savedPath = filename;
+  if (defaultOutputDir) {
+    const outDir = resolve(androidDir, defaultOutputDir);
+    mkdirSync(outDir, { recursive: true });
+    savedPath = join(outDir, filename);
+    copyFileSync(tmpPath, savedPath);
+  }
+
+  try {
+    const data = readFileSync(tmpPath).toString("base64");
+    return {
+      screen: capture.screen,
+      path: savedPath,
+      data,
+    };
+  } finally {
+    try { unlinkSync(tmpPath); } catch { /* ignore */ }
+  }
+}
+
 // ── main entry point ────────────────────────────────────────────────
 
 export async function takeAndroidScreenshot(
@@ -420,61 +501,121 @@ export async function takeAndroidScreenshot(
   const adb = findAdb();
   const serial = await getConnectedEmulator(adb);
 
-  // 3. Free emulator storage before build/install
-  await cleanEmulatorStorage(adb, serial);
+  const previousRun = androidScreenshotQueues.get(serial) ?? Promise.resolve();
+  let releaseQueue: (() => void) | undefined;
+  const currentRun = new Promise<void>((resolve) => {
+    releaseQueue = resolve;
+  });
+  androidScreenshotQueues.set(serial, previousRun.then(() => currentRun));
 
-  // 4. Build APK
-  const apkPath = await buildApk(androidDir, appInfo.moduleName);
+  await previousRun;
 
-  // 5. Set theme if requested
-  if (theme) {
-    await setTheme(adb, serial, theme);
-  }
+  try {
+    // 3. Free emulator storage before build/install
+    await cleanEmulatorStorage(adb, serial);
 
-  // 6. Install and launch
-  await installAndLaunch(adb, serial, apkPath, appInfo, route);
+    // 4. Build APK
+    const apkPath = await buildApk(androidDir, appInfo.moduleName);
 
-  // 7. Wait for app to be ready and content to load
-  await waitForAppReady(adb, serial, appInfo.applicationId, wait_for);
+    // 5. Set theme if requested
+    if (theme) {
+      await setTheme(adb, serial, theme);
+    }
 
-  // 8. Navigate via UI taps if specified
-  if (nav && nav.length > 0) {
-    await navigateByTaps(adb, serial, nav);
-  }
+    // 6. Install fresh once, then capture
+    await installAndLaunch(adb, serial, apkPath, appInfo, route);
+
+    const snapshot = await takeSingleAndroidCapture(
+      adb,
+      serial,
+      androidDir,
+      appInfo,
+      { screen: screen ?? "main", route, nav, wait_for },
+      theme,
+      output_dir,
+    );
 
-  // 9. Capture screenshot
-  const screenLabel = screen ?? "main";
-  const themeLabel = theme ?? "default";
-  const filename = `${screenLabel}_${themeLabel}.png`;
-  const tmpPath = join(androidDir, ".openuispec-screenshot.png");
-  await captureScreenshot(adb, serial, tmpPath);
+    return buildScreenshotResponse([snapshot], (s) => ({
+      screen: s.screen,
+      path: snapshot.path ?? null,
+      emulator: serial,
+      theme: theme ?? "default",
+      applicationId: appInfo.applicationId,
+    }));
+  } finally {
+    releaseQueue?.();
+    if (androidScreenshotQueues.get(serial) === currentRun) {
+      androidScreenshotQueues.delete(serial);
+    }
+  }
+}
 
-  // 9. Save to output_dir if specified
-  let savedPath: string | undefined;
-  if (output_dir) {
-    const outDir = resolve(androidDir, output_dir);
-    mkdirSync(outDir, { recursive: true });
-    savedPath = join(outDir, filename);
-    copyFileSync(tmpPath, savedPath);
+export async function takeAndroidScreenshotBatch(
+  projectCwd: string,
+  options: AndroidScreenshotBatchOptions,
+): Promise<ScreenshotResult> {
+  const { captures, theme, output_dir, project_dir, module } = options;
+  if (captures.length === 0) {
+    return {
+      content: [{ type: "text", text: "No Android captures specified." }],
+      isError: true,
+    };
   }
 
-  // 10. Read and return
+  const androidDir = findAndroidAppDir(projectCwd, project_dir);
+  const appInfo = extractAppInfo(androidDir, module);
+  const adb = findAdb();
+  const serial = await getConnectedEmulator(adb);
+
+  const previousRun = androidScreenshotQueues.get(serial) ?? Promise.resolve();
+  let releaseQueue: (() => void) | undefined;
+  const currentRun = new Promise<void>((resolve) => {
+    releaseQueue = resolve;
+  });
+  androidScreenshotQueues.set(serial, previousRun.then(() => currentRun));
+
+  await previousRun;
+
   try {
-    const data = readFileSync(tmpPath).toString("base64");
-    const snapshots = [{
-      screen: screenLabel,
-      path: savedPath ?? filename,
-      data,
-    }];
+    await cleanEmulatorStorage(adb, serial);
+    const apkPath = await buildApk(androidDir, appInfo.moduleName);
 
-    return buildScreenshotResponse(snapshots, (s) => ({
-      screen: s.screen,
-      path: savedPath ?? null,
+    if (theme) {
+      await setTheme(adb, serial, theme);
+    }
+
+    await installAndLaunch(adb, serial, apkPath, appInfo);
+
+    // Pre-create output dir once
+    if (output_dir) mkdirSync(resolve(androidDir, output_dir), { recursive: true });
+
+    const snapshots = [];
+    for (let index = 0; index < captures.length; index += 1) {
+      const capture = captures[index];
+      snapshots.push(
+        await takeSingleAndroidCapture(
+          adb,
+          serial,
+          androidDir,
+          appInfo,
+          capture,
+          theme,
+          output_dir,
+        ),
+      );
+    }
+
+    return buildScreenshotResponse(snapshots, (snapshot) => ({
+      screen: snapshot.screen,
+      path: snapshot.path,
       emulator: serial,
-      theme: themeLabel,
+      theme: theme ?? "default",
       applicationId: appInfo.applicationId,
     }));
   } finally {
-    try { unlinkSync(tmpPath); } catch { /* ignore */ }
+    releaseQueue?.();
+    if (androidScreenshotQueues.get(serial) === currentRun) {
+      androidScreenshotQueues.delete(serial);
+    }
   }
 }

package/mcp-server/screenshot-ios.ts

@@ -233,6 +233,45 @@ async function setAppearance(udid: string, theme: "light" | "dark"): Promise<voi
 const UITEST_TARGET = "ScreenshotUITests";
 const UITEST_DIR = ".screenshot-uitest";
 
+export function generateUITestTargetYml(
+  appInfo: IOSAppInfo,
+  sourcePath: string,
+  includeProductName = false,
+): string {
+  const productLines = includeProductName
+    ? `\n        PRODUCT_NAME: ${UITEST_TARGET}\n        PRODUCT_MODULE_NAME: ${UITEST_TARGET}`
+    : "";
+  return `  ${UITEST_TARGET}:
+    type: bundle.ui-testing
+    platform: iOS
+    deploymentTarget: "${appInfo.deploymentTarget}"
+    sources:
+      - path: ${sourcePath}
+    dependencies:
+      - target: ${appInfo.schemeName}
+        embed: false
+    settings:
+      base:${productLines}
+        TEST_TARGET_NAME: ${appInfo.schemeName}
+        PRODUCT_BUNDLE_IDENTIFIER: ${appInfo.bundleId}.uitests
+        GENERATE_INFOPLIST_FILE: YES`;
+}
+
+export function insertUITestTarget(yml: string, targetYml: string): string {
+  if (yml.includes("\nschemes:")) {
+    return yml.replace("\nschemes:", `\n${targetYml}\nschemes:`);
+  }
+  return yml + "\n" + targetYml + "\n";
+}
+
+export function ensureInfoPlistFlag(yml: string): string {
+  if (yml.includes("GENERATE_INFOPLIST_FILE")) return yml;
+  return yml.replace(
+    /(PRODUCT_BUNDLE_IDENTIFIER:[^\n]+\n)/,
+    "$1        GENERATE_INFOPLIST_FILE: YES\n",
+  );
+}
+
 function generateUITestSwift(
   bundleId: string,
   navSteps: string[],
@@ -322,40 +361,13 @@ async function runXCUITest(
 
   if (appInfo.hasXcodegen) {
     originalProjectYml = readFileSync(projectYmlPath, "utf-8");
+    let modifiedYml = ensureInfoPlistFlag(originalProjectYml);
+    modifiedYml = insertUITestTarget(modifiedYml, generateUITestTargetYml(appInfo, `${UITEST_DIR}/Sources`));
+    writeFileSync(projectYmlPath, modifiedYml);
 
-    // Ensure main target has GENERATE_INFOPLIST_FILE and append UI test target
-    let modifiedYml = originalProjectYml;
-    if (!modifiedYml.includes("GENERATE_INFOPLIST_FILE")) {
-      // Add after the first PRODUCT_BUNDLE_IDENTIFIER line
-      modifiedYml = modifiedYml.replace(
-        /(PRODUCT_BUNDLE_IDENTIFIER:[^\n]+\n)/,
-        "$1        GENERATE_INFOPLIST_FILE: YES\n",
-      );
-    }
-
-    const uitestConfig = `
-  ${UITEST_TARGET}:
-    type: bundle.ui-testing
-    platform: iOS
-    deploymentTarget: "${appInfo.deploymentTarget}"
-    sources:
-      - path: ${UITEST_DIR}/Sources
-    dependencies:
-      - target: ${appInfo.schemeName}
-        embed: false
-    settings:
-      base:
-        TEST_TARGET_NAME: ${appInfo.schemeName}
-        PRODUCT_BUNDLE_IDENTIFIER: ${appInfo.bundleId}.uitests
-        GENERATE_INFOPLIST_FILE: YES
-`;
-    writeFileSync(projectYmlPath, modifiedYml + uitestConfig);
-
-    // Regenerate Xcode project
     try {
       await exec(`xcodegen generate`, { cwd: iosDir, timeout: 30_000 });
     } catch (err: any) {
-      // Restore original project.yml
       writeFileSync(projectYmlPath, originalProjectYml);
       throw new Error(`xcodegen failed: ${((err.stderr ?? "") + (err.stdout ?? "")).slice(-300)}`);
     }
@@ -539,3 +551,203 @@ export async function takeIOSScreenshot(
     try { unlinkSync(tmpPath); } catch { /* ignore */ }
   }
 }
+
+// ── batch types ──────────────────────────────────────────────────────
+
+export interface IOSBatchCapture {
+  screen: string;
+  nav?: string[];
+  wait_for?: number;
+}
+
+export interface IOSScreenshotBatchOptions {
+  captures: IOSBatchCapture[];
+  device?: string;
+  theme?: "light" | "dark";
+  output_dir?: string;
+  project_dir?: string;
+  scheme?: string;
+  bundle_id?: string;
+}
+
+// ── batch screenshot ─────────────────────────────────────────────────
+
+export async function takeIOSScreenshotBatch(
+  projectCwd: string,
+  options: IOSScreenshotBatchOptions,
+): Promise<ScreenshotResult> {
+  const { captures, device, theme, output_dir, project_dir, scheme, bundle_id } = options;
+
+  if (captures.length === 0) {
+    return { content: [{ type: "text", text: "No iOS captures specified." }], isError: true };
+  }
+
+  const iosDir = findIOSAppDir(projectCwd, project_dir);
+  const appInfo = extractAppInfo(iosDir, { scheme, bundle_id });
+  const sim = findSimulator(device);
+  await ensureSimulatorBooted(sim.udid);
+
+  if (theme) {
+    await setAppearance(sim.udid, theme);
+  }
+
+  const themeLabel = theme ?? "default";
+  const snapshots: Array<{ screen: string; path: string; data: string }> = [];
+
+  // Separate captures: no-nav (simctl screenshot) vs nav (XCUITest batch)
+  const noNavCaptures = captures.filter((c) => !c.nav || c.nav.length === 0);
+  const navCaptures = captures.filter((c) => c.nav && c.nav.length > 0);
+
+  // Build + install once for all captures
+  const appBundlePath = await buildApp(iosDir, appInfo, sim.udid);
+  await installAndLaunch(sim.udid, appBundlePath, appInfo.bundleId);
+
+  // Pre-create output dir once
+  if (output_dir) mkdirSync(resolve(iosDir, output_dir), { recursive: true });
+
+  // No-nav captures: relaunch, wait, simctl screenshot
+  for (const capture of noNavCaptures) {
+    // Relaunch without reinstalling
+    try { await exec(`xcrun simctl terminate ${sim.udid} ${appInfo.bundleId}`); } catch { /* not running */ }
+    await exec(`xcrun simctl launch ${sim.udid} ${appInfo.bundleId}`, { timeout: 30_000 });
+    await waitForAppReady(sim.udid, appInfo.bundleId, capture.wait_for ?? 3000);
+
+    const filename = `${capture.screen}_${themeLabel}.png`;
+    const tmpPath = join(iosDir, `.openuispec-screenshot-${capture.screen}.png`);
+    await captureScreenshot(sim.udid, tmpPath);
+
+    if (!existsSync(tmpPath)) continue;
+
+    let savedPath = filename;
+    if (output_dir) {
+      savedPath = join(resolve(iosDir, output_dir), filename);
+      copyFileSync(tmpPath, savedPath);
+    }
+
+    snapshots.push({ screen: capture.screen, path: savedPath, data: readFileSync(tmpPath).toString("base64") });
+    try { unlinkSync(tmpPath); } catch { /* ignore */ }
+  }
+
+  // Nav captures: batch into a single XCUITest run
+  if (navCaptures.length > 0) {
+    const uitestDir = join(iosDir, ".screenshot-uitest");
+    const sourcesDir = join(uitestDir, "Sources");
+    mkdirSync(sourcesDir, { recursive: true });
+
+    // Build output paths map
+    const outputPaths: Record<string, string> = {};
+    for (const capture of navCaptures) {
+      const filename = `${capture.screen}_${themeLabel}.png`;
+      if (output_dir) {
+        const outDir = resolve(iosDir, output_dir);
+        mkdirSync(outDir, { recursive: true });
+        outputPaths[capture.screen] = join(outDir, filename);
+      } else {
+        outputPaths[capture.screen] = join(iosDir, `.openuispec-screenshot-${capture.screen}.png`);
+      }
+    }
+
+    // Generate multi-test Swift file
+    const testCases = navCaptures.map((capture, i) => {
+      const taps = (capture.nav ?? []).map((step, j) => {
+        const escaped = step.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
+        return `
+        let target_${i}_${j} = app.descendants(matching: .any).matching(NSPredicate(format: "label ==[c] %@ OR title ==[c] %@", "${escaped}", "${escaped}")).firstMatch
+        if target_${i}_${j}.waitForExistence(timeout: 5) {
+            target_${i}_${j}.tap()
+            Thread.sleep(forTimeInterval: 0.8)
+        }`;
+      }).join("\n");
+
+      const outPath = outputPaths[capture.screen].replace(/"/g, '\\"');
+      return `
+    func test_${String(i + 1).padStart(2, "0")}_${capture.screen}() {
+        let app = XCUIApplication()
+        app.launchArguments = ["-AppleLanguages", "(en)"]
+        app.launch()
+        Thread.sleep(forTimeInterval: ${((capture.wait_for ?? 3000) / 1000).toFixed(1)})
+${taps}
+        Thread.sleep(forTimeInterval: 0.5)
+        let screenshot = XCUIScreen.main.screenshot()
+        try! screenshot.pngRepresentation.write(to: URL(fileURLWithPath: "${outPath}"))
+    }`;
+    }).join("\n");
+
+    writeFileSync(join(sourcesDir, "ScreenshotUITest.swift"),
+      `import XCTest\n\nfinal class ScreenshotUITest: XCTestCase {\n${testCases}\n}\n`);
+
+    // Set up xcodegen
+    const UITEST_TARGET = "ScreenshotUITests";
+    const hasXcodegen = existsSync(join(iosDir, "project.yml"));
+    const projectYmlPath = join(iosDir, "project.yml");
+    let originalProjectYml: string | null = null;
+    const buildDir = join(iosDir, ".build", "screenshot");
+
+    if (hasXcodegen) {
+      originalProjectYml = readFileSync(projectYmlPath, "utf-8");
+      let modifiedYml = ensureInfoPlistFlag(originalProjectYml);
+      modifiedYml = insertUITestTarget(modifiedYml, generateUITestTargetYml(appInfo, ".screenshot-uitest/Sources", true));
+      writeFileSync(projectYmlPath, modifiedYml);
+      await exec(`xcodegen generate`, { cwd: iosDir, timeout: 30_000 });
+    } else {
+      writeFileSync(join(uitestDir, "project.yml"), `name: ${UITEST_TARGET}
+targets:
+  ${UITEST_TARGET}:
+    type: bundle.ui-testing
+    platform: iOS
+    deploymentTarget: "${appInfo.deploymentTarget}"
+    sources:
+      - path: Sources
+    settings:
+      base:
+        TEST_TARGET_NAME: ${appInfo.schemeName}
+        PRODUCT_BUNDLE_IDENTIFIER: ${appInfo.bundleId}.uitests
+        GENERATE_INFOPLIST_FILE: YES
+`);
+      await exec(`xcodegen generate`, { cwd: uitestDir, timeout: 30_000 });
+    }
+
+    const testProjectFlag = hasXcodegen
+      ? (appInfo.xcodeproj ? `-project "${join(iosDir, appInfo.xcodeproj)}"` : "")
+      : `-project "${join(uitestDir, `${UITEST_TARGET}.xcodeproj`)}"`;
+    const testCwd = hasXcodegen ? iosDir : uitestDir;
+
+    try {
+      await exec(
+        `xcodebuild test ${testProjectFlag} -scheme "${UITEST_TARGET}" -destination "id=${sim.udid}" -derivedDataPath "${buildDir}" -only-testing:${UITEST_TARGET}/ScreenshotUITest 2>&1`,
+        { cwd: testCwd, timeout: 300_000 },
+      );
+    } catch {
+      // Tests may "fail" but still produce screenshots
+    } finally {
+      if (originalProjectYml) {
+        writeFileSync(projectYmlPath, originalProjectYml);
+        try { await exec(`xcodegen generate`, { cwd: iosDir, timeout: 30_000 }); } catch { /* best effort */ }
+      }
+    }
+
+    // Collect results
+    for (const capture of navCaptures) {
+      const outPath = outputPaths[capture.screen];
+      if (existsSync(outPath)) {
+        snapshots.push({
+          screen: capture.screen,
+          path: output_dir ? outPath : `${capture.screen}_${themeLabel}.png`,
+          data: readFileSync(outPath).toString("base64"),
+        });
+        if (!output_dir) { try { unlinkSync(outPath); } catch { /* ignore */ } }
+      }
+    }
+  }
+
+  if (snapshots.length === 0) {
+    return { content: [{ type: "text", text: "No screenshots were captured. Check Xcode and Simulator output." }], isError: true };
+  }
+
+  const content: ScreenshotResult["content"] = [];
+  for (const s of snapshots) {
+    content.push({ type: "image" as const, data: s.data, mimeType: "image/png" });
+    content.push({ type: "text" as const, text: JSON.stringify({ screen: s.screen, path: s.path, simulator: sim.name, theme: themeLabel, bundleId: appInfo.bundleId }, null, 2) });
+  }
+  return { content };
+}

package/mcp-server/screenshot.ts

@@ -258,6 +258,86 @@ export async function takeScreenshot(
   }
 }
 
+// ── batch types ──────────────────────────────────────────────────────
+
+export interface WebBatchCapture {
+  screen: string;
+  route: string;
+  selector?: string;
+  full_page?: boolean;
+  wait_for?: number;
+}
+
+export interface WebScreenshotBatchOptions {
+  captures: WebBatchCapture[];
+  viewport?: { width: number; height: number };
+  theme?: "light" | "dark";
+  output_dir?: string;
+}
+
+// ── batch screenshot ─────────────────────────────────────────────────
+
+export async function takeScreenshotBatch(
+  projectCwd: string,
+  options: WebScreenshotBatchOptions,
+): Promise<ScreenshotResult> {
+  const { captures, viewport = { width: 1280, height: 800 }, theme, output_dir } = options;
+
+  if (captures.length === 0) {
+    return { content: [{ type: "text", text: "No web captures specified." }], isError: true };
+  }
+
+  const webDir = findWebAppDir(projectCwd);
+  const server = await startDevServer(webDir);
+  const browser = await getBrowser();
+  const page = await browser.newPage();
+
+  try {
+    await page.setViewport({ width: viewport.width, height: viewport.height });
+    if (theme) {
+      await page.emulateMediaFeatures([{ name: "prefers-color-scheme", value: theme }]);
+    }
+
+    const base = server.url.replace(/\/+$/, "");
+    const themeLabel = theme ?? "default";
+    const snapshots: Array<{ screen: string; path: string; data: string }> = [];
+
+    for (const capture of captures) {
+      const targetUrl = `${base}${capture.route.startsWith("/") ? "" : "/"}${capture.route}`;
+      await page.goto(targetUrl, { waitUntil: "networkidle2", timeout: 30_000 });
+      await new Promise((r) => setTimeout(r, capture.wait_for ?? 1000));
+
+      let buffer: Buffer;
+      if (capture.selector) {
+        const el = await page.$(capture.selector);
+        buffer = el ? await el.screenshot({ type: "png" }) : await page.screenshot({ type: "png" });
+      } else {
+        buffer = await page.screenshot({ type: "png", fullPage: capture.full_page ?? false });
+      }
+
+      const filename = `${capture.screen}_${themeLabel}.png`;
+      let savedPath = filename;
+      if (output_dir) {
+        const outDir = resolve(webDir, output_dir);
+        mkdirSync(outDir, { recursive: true });
+        savedPath = join(outDir, filename);
+        writeFileSync(savedPath, buffer);
+      }
+
+      snapshots.push({ screen: capture.screen, path: savedPath, data: buffer.toString("base64") });
+    }
+
+    const content: ScreenshotResult["content"] = [];
+    for (const s of snapshots) {
+      content.push({ type: "image" as const, data: s.data, mimeType: "image/png" });
+      content.push({ type: "text" as const, text: JSON.stringify({ screen: s.screen, path: s.path, theme: themeLabel }, null, 2) });
+    }
+    return { content };
+  } finally {
+    await page.close();
+  }
+}
+
 // ── cleanup ─────────────────────────────────────────────────────────
 
 export async function shutdownAll() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openuispec",
-  "version": "0.2.9",
+  "version": "0.2.10",
   "license": "MIT",
   "type": "module",
   "description": "A semantic UI specification format for AI-native, platform-native app development",