@playdrop/playdrop-cli 0.12.18 → 0.12.21

package/config/client-meta.json

@@ -1,6 +1,6 @@
 {
   "version": "0.12.8",
-  "build": 11,
+  "build": 14,
   "runtimeSdkVersion": "0.12.5",
   "runtimeSdkBuild": 2,
   "clients": {

package/dist/commands/worker/instrument-evidence.d.ts

@@ -9,7 +9,7 @@ export declare function saveInstrumentEvidenceCapture(input: {
     evidenceDir: string;
     groupId: string;
     name: string;
-    screenshotId: string;
+    screenshotId?: string;
 }): Promise<InstrumentEvidenceCapture>;
 export declare function readAndValidateInstrumentEvidenceManifest(input: {
     workspaceDir: string;

package/dist/commands/worker/instrument-evidence.js

@@ -99,6 +99,35 @@ function createWorkerInstrumentScreenshotCollector(workspaceDir) {
         finish: () => chromeParser.finish() + playwrightParser.finish(),
     };
 }
+function resolveLatestUnusedScreenshotId(workspaceDir, index) {
+    const used = new Set();
+    const evidenceRoot = node_path_1.default.resolve(workspaceDir);
+    const walk = (dir) => {
+        for (const entry of (0, node_fs_1.existsSync)(dir) ? (0, node_fs_1.readdirSync)(dir, { withFileTypes: true }) : []) {
+            const entryPath = node_path_1.default.join(dir, entry.name);
+            if (entry.isDirectory()) {
+                walk(entryPath);
+            }
+            else if (entry.name === exports.INSTRUMENT_EVIDENCE_MANIFEST_FILE) {
+                const manifest = readJsonRecord(entryPath, 'invalid_instrument_evidence_manifest');
+                for (const capture of Object.values(manifest.captures ?? {})) {
+                    if (capture?.screenshotId) {
+                        used.add(capture.screenshotId);
+                    }
+                }
+            }
+        }
+    };
+    walk(evidenceRoot);
+    const candidates = Object.values(index.screenshots)
+        .filter((screenshot) => !used.has(screenshot.screenshotId))
+        .sort((a, b) => a.capturedAt.localeCompare(b.capturedAt));
+    const latest = candidates.at(-1);
+    if (!latest) {
+        throw new Error('instrument_screenshot_none_available');
+    }
+    return latest.screenshotId;
+}
 function normalizeEvidenceName(value) {
     const normalized = value.trim();
     if (!types_1.INSTRUMENT_EVIDENCE_NAMES.includes(normalized)) {
@@ -131,8 +160,11 @@ function readManifestIfPresent(evidenceDir) {
 async function saveInstrumentEvidenceCapture(input) {
     const evidenceName = normalizeEvidenceName(input.name);
     const groupId = normalizeGroupId(input.groupId);
-    const screenshotId = input.screenshotId.trim();
     const index = readScreenshotIndex(input.workspaceDir);
+    const requestedId = input.screenshotId?.trim() ?? '';
+    // With no id, persist the capture the judge just took: the most recent one not already used as
+    // evidence. The judge never has to track ids, and a failed capture simply is not there to pick.
+    const screenshotId = requestedId || resolveLatestUnusedScreenshotId(input.workspaceDir, index);
     const screenshot = index.screenshots[screenshotId];
     if (!screenshot) {
         throw new Error(`instrument_screenshot_not_found:${screenshotId}`);

package/dist/commands/worker/runtime.d.ts

@@ -96,6 +96,7 @@ export declare function buildWorkerChildEnv(input: {
     homeDir?: string;
     codexHomeDir?: string;
     claudeConfigDir?: string;
+    playdropConfigPath?: string;
     playwrightBrowsersPath?: string;
     baseEnv?: NodeJS.ProcessEnv;
 }): NodeJS.ProcessEnv;

package/dist/commands/worker/runtime.js

@@ -712,6 +712,17 @@ function buildWorkerChildEnv(input) {
         }
         child.CLAUDE_CONFIG_DIR = claudeConfigDir;
     }
+    // Claude sessions inherit the host's real HOME and Claude config on purpose: the machine is
+    // logged in with the Claude CLI and we call it exactly as a human does. The worker never
+    // stages, copies, or refreshes Claude credentials. The agent's `playdrop` CLI is still scoped
+    // to a task session through PLAYDROP_CONFIG_PATH rather than by hijacking HOME.
+    if (input.playdropConfigPath !== undefined) {
+        const playdropConfigPath = input.playdropConfigPath.trim();
+        if (!playdropConfigPath || !node_path_1.default.isAbsolute(playdropConfigPath)) {
+            throw new Error('invalid_worker_child_playdrop_config_path');
+        }
+        child.PLAYDROP_CONFIG_PATH = playdropConfigPath;
+    }
     if (input.playwrightBrowsersPath !== undefined) {
         const playwrightBrowsersPath = input.playwrightBrowsersPath.trim();
         if (!playwrightBrowsersPath || !node_path_1.default.isAbsolute(playwrightBrowsersPath)) {

package/dist/commands/worker.d.ts

@@ -249,11 +249,9 @@ export declare function prepareClaudeRunConfig(input: {
     workspaceDir: string;
     workerUsername: string;
     envName: string;
-    sourceCredentialsPath?: string;
     playdropConfig?: ReturnType<typeof loadConfig>;
 }): Promise<{
-    homeDir: string;
-    claudeConfigDir: string;
+    playdropConfigPath: string;
 }>;
 export declare function removeAgentRunCredentials(workspaceDir: string): Promise<void>;
 export declare function removeStaleAgentRunCredentials(workerHomeDir?: string): Promise<void>;

package/dist/commands/worker.js

@@ -1958,78 +1958,32 @@ async function stageWorkerPlaydropSession(input) {
         },
     }, null, 2), { mode: 0o600 });
     await (0, promises_1.chmod)(playdropConfigPath, 0o600);
+    return playdropConfigPath;
 }
 async function prepareClaudeRunConfig(input) {
     const runRoot = node_path_1.default.join(input.workspaceDir, '.playdrop', 'claude-run');
     const homeDir = node_path_1.default.join(runRoot, 'home');
-    const claudeConfigDir = node_path_1.default.join(runRoot, 'config');
     await (0, promises_1.rm)(runRoot, { recursive: true, force: true });
     await (0, promises_1.mkdir)(runRoot, { recursive: true, mode: 0o700 });
     await (0, promises_1.chmod)(runRoot, 0o700);
     await (0, promises_1.mkdir)(homeDir, { mode: 0o700 });
-    await (0, promises_1.mkdir)(claudeConfigDir, { mode: 0o700 });
-    const configuredCredentialsPath = input.sourceCredentialsPath?.trim()
-        || node_process_1.default.env.PLAYDROP_WORKER_CLAUDE_CREDENTIALS_FILE?.trim();
-    const defaultCredentialsPath = node_path_1.default.join(node_os_1.default.homedir(), '.claude', '.credentials.json');
-    let rawCredentials;
-    if (configuredCredentialsPath) {
-        const sourceCredentialsPath = node_path_1.default.resolve(configuredCredentialsPath);
-        if (!isFile(sourceCredentialsPath)) {
-            throw new Error(`worker_claude_credentials_missing:${sourceCredentialsPath}`);
-        }
-        rawCredentials = (0, node_fs_1.readFileSync)(sourceCredentialsPath, 'utf8');
-    }
-    else if (isFile(defaultCredentialsPath)) {
-        rawCredentials = (0, node_fs_1.readFileSync)(defaultCredentialsPath, 'utf8');
-    }
-    else if (node_process_1.default.platform === 'darwin') {
-        try {
-            const result = await execFileAsync('security', [
-                'find-generic-password',
-                '-s',
-                'Claude Code-credentials',
-                '-w',
-            ], { maxBuffer: 1024 * 1024 });
-            rawCredentials = result.stdout;
-        }
-        catch {
-            throw new Error('worker_claude_credentials_missing:macos_keychain');
-        }
-    }
-    else {
-        throw new Error(`worker_claude_credentials_missing:${defaultCredentialsPath}`);
-    }
-    let credentials;
-    try {
-        credentials = JSON.parse(rawCredentials);
-    }
-    catch {
-        throw new Error('worker_claude_credentials_invalid_json');
-    }
-    const credentialObject = typeof credentials === 'object' && credentials !== null && !Array.isArray(credentials)
-        ? credentials
-        : null;
-    const oauthValue = credentialObject?.claudeAiOauth;
-    const claudeAiOauth = typeof oauthValue === 'object' && oauthValue !== null && !Array.isArray(oauthValue)
-        ? oauthValue
-        : null;
-    if (!claudeAiOauth
-        || typeof claudeAiOauth.accessToken !== 'string'
-        || !claudeAiOauth.accessToken.trim()
-        || typeof claudeAiOauth.refreshToken !== 'string'
-        || !claudeAiOauth.refreshToken.trim()) {
-        throw new Error('worker_claude_oauth_credentials_missing');
-    }
-    const stagedCredentialsPath = node_path_1.default.join(claudeConfigDir, '.credentials.json');
-    await (0, promises_1.writeFile)(stagedCredentialsPath, `${JSON.stringify({ claudeAiOauth })}\n`, { mode: 0o600 });
-    await (0, promises_1.chmod)(stagedCredentialsPath, 0o600);
-    await stageWorkerPlaydropSession({
-        homeDir,
-        workerUsername: input.workerUsername,
-        envName: input.envName,
-        playdropConfig: input.playdropConfig,
-    });
-    return { homeDir, claudeConfigDir };
+    // The worker does NOT manage Claude authentication. The host is logged in with the Claude CLI;
+    // we call `claude` and let it use the machine's own login exactly as a human would.
+    //
+    // We used to copy the OAuth credential into this per-task config dir. That is what logged the
+    // machine out: the copy refreshed on first use after the 8h access-token expiry, Anthropic
+    // rotated the refresh token (invalidating the one still in the keychain), and the refreshed
+    // credential was thrown away with the task workspace. The host was then permanently logged out.
+    // Observed twice in production (2026-07-13 19:50, 2026-07-14 13:00:23, the latter three seconds
+    // after task 449's Claude exited). Never stage, copy, or write Claude credentials here.
+    return {
+        playdropConfigPath: await stageWorkerPlaydropSession({
+            homeDir,
+            workerUsername: input.workerUsername,
+            envName: input.envName,
+            playdropConfig: input.playdropConfig,
+        }),
+    };
 }
 async function removeAgentRunCredentials(workspaceDir) {
     await Promise.all([
@@ -2124,7 +2078,7 @@ async function runCodex(input) {
     };
 }
 async function runClaude(input) {
-    const { homeDir, claudeConfigDir } = await prepareClaudeRunConfig({
+    const { playdropConfigPath } = await prepareClaudeRunConfig({
         workspaceDir: input.workspaceDir,
         workerUsername: input.workerUsername,
         envName: input.envName,
@@ -2135,7 +2089,8 @@ async function runClaude(input) {
         : null;
     let playwrightMcpConfigPath = null;
     if (input.enablePlaywrightMcp) {
-        playwrightMcpConfigPath = node_path_1.default.join(claudeConfigDir, 'playwright-mcp.json');
+        playwrightMcpConfigPath = node_path_1.default.join(input.workspaceDir, '.playdrop', 'claude-run', 'playwright-mcp.json');
+        (0, node_fs_1.mkdirSync)(node_path_1.default.dirname(playwrightMcpConfigPath), { recursive: true });
         (0, node_fs_1.writeFileSync)(playwrightMcpConfigPath, `${JSON.stringify((0, runtime_1.buildPlaywrightMcpServerConfig)(), null, 2)}\n`, 'utf8');
     }
     const result = await (0, runtime_1.runLoggedProcess)({
@@ -2157,8 +2112,7 @@ async function runClaude(input) {
             envName: input.envName,
             eventDir: input.eventDir,
             devPort: input.devPort,
-            homeDir,
-            claudeConfigDir,
+            playdropConfigPath,
             playwrightBrowsersPath: resolveWorkerPlaywrightBrowsersPath(),
         }),
         stdin: input.prompt,

package/dist/index.js

@@ -287,9 +287,9 @@ task
 });
 task
     .command('evidence')
-    .description('Persist a Claude Chrome screenshot as task evidence')
+    .description('Persist the screenshot you just took as task evidence')
     .requiredOption('--name <name>', 'Evidence state: first-frame, core, win, or loss')
-    .requiredOption('--screenshot-id <id>', 'Claude Chrome screenshot id')
+    .option('--screenshot-id <id>', 'Screenshot id; omit to persist the capture you just took')
     .requiredOption('--evidence-dir <path>', 'Evidence output directory')
     .option('--group <id>', 'Evidence group id; required for GAME_EVAL')
     .action(async (opts) => {

package/node_modules/@playdrop/config/client-meta.json

@@ -1,6 +1,6 @@
 {
   "version": "0.12.8",
-  "build": 11,
+  "build": 14,
   "runtimeSdkVersion": "0.12.5",
   "runtimeSdkBuild": 2,
   "clients": {

package/node_modules/@playdrop/types/dist/instrument-evidence.d.ts

@@ -30,7 +30,6 @@ export declare const PLAYWRIGHT_MCP_SCREENSHOT_TOOL = "mcp__playwright__browser_
 export declare const PLAYWRIGHT_MCP_CONTROLLED_TAB_ID = 1;
 export declare const PLAYWRIGHT_MCP_SCREENSHOT_BUDGET = 100;
 export declare function isInstrumentScreenshotId(value: string): boolean;
-export declare function normalizePlaywrightScreenshotId(value: unknown): string | null;
 export declare class ClaudeChromeScreenshotStreamParser {
     private readonly onScreenshot;
     private buffer;
@@ -46,9 +45,10 @@ export declare class ClaudeChromeScreenshotStreamParser {
 export declare class PlaywrightMcpScreenshotStreamParser {
     private readonly onScreenshot;
     private buffer;
-    private readonly pendingScreenshotFilenames;
+    private readonly pendingScreenshotToolUseIds;
     private readonly handledToolUseIds;
     private screenshotCallCount;
+    private sequence;
     constructor(onScreenshot: (screenshot: ClaudeChromeScreenshot) => void);
     push(chunk: string): number;
     finish(): number;

package/node_modules/@playdrop/types/dist/instrument-evidence.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"instrument-evidence.d.ts","sourceRoot":"","sources":["../src/instrument-evidence.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,yBAAyB,iDAK5B,CAAC;AAEX,MAAM,MAAM,sBAAsB,GAAG,CAAC,OAAO,yBAAyB,CAAC,CAAC,MAAM,CAAC,CAAC;AAEhF,MAAM,MAAM,sBAAsB,GAAG;IACnC,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,YAAY,GAAG,WAAW,CAAC;IACtC,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IACtC,IAAI,EAAE,sBAAsB,CAAC;IAC7B,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,YAAY,GAAG,WAAW,CAAC;IACtC,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACvC,OAAO,EAAE,CAAC,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,sBAAsB,EAAE,yBAAyB,CAAC,CAAC,CAAC;CAC9E,CAAC;AAMF,eAAO,MAAM,8BAA8B,6CAA6C,CAAC;AACzF,eAAO,MAAM,gCAAgC,IAAI,CAAC;AAGlD,eAAO,MAAM,gCAAgC,MAAM,CAAC;AAKpD,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAE/D;AAED,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAG7E;AA+CD,qBAAa,kCAAkC;IAKjC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAJzC,OAAO,CAAC,MAAM,CAAM;IACpB,OAAO,CAAC,QAAQ,CAAC,yBAAyB,CAA+B;IACzE,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAqB;gBAE7B,YAAY,EAAE,CAAC,UAAU,EAAE,sBAAsB,KAAK,IAAI;IAEvF,IAAI,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAqB3B,MAAM,IAAI,MAAM;IAMhB,OAAO,CAAC,WAAW;IA0BnB,OAAO,CAAC,aAAa;IAkBrB,OAAO,CAAC,iBAAiB;CAiE1B;AAMD,qBAAa,mCAAmC;IAMlC,OAAO,CAAC,QAAQ,CAAC,YAAY;IALzC,OAAO,CAAC,MAAM,CAAM;IACpB,OAAO,CAAC,QAAQ,CAAC,0BAA0B,CAA6B;IACxE,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAqB;IACvD,OAAO,CAAC,mBAAmB,CAAK;gBAEH,YAAY,EAAE,CAAC,UAAU,EAAE,sBAAsB,KAAK,IAAI;IAEvF,IAAI,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAqB3B,MAAM,IAAI,MAAM;IAMhB,OAAO,CAAC,WAAW;IA0BnB,OAAO,CAAC,aAAa;IAwBrB,OAAO,CAAC,iBAAiB;CA+C1B"}
+{"version":3,"file":"instrument-evidence.d.ts","sourceRoot":"","sources":["../src/instrument-evidence.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,yBAAyB,iDAK5B,CAAC;AAEX,MAAM,MAAM,sBAAsB,GAAG,CAAC,OAAO,yBAAyB,CAAC,CAAC,MAAM,CAAC,CAAC;AAEhF,MAAM,MAAM,sBAAsB,GAAG;IACnC,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,YAAY,GAAG,WAAW,CAAC;IACtC,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IACtC,IAAI,EAAE,sBAAsB,CAAC;IAC7B,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,YAAY,GAAG,WAAW,CAAC;IACtC,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACvC,OAAO,EAAE,CAAC,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,sBAAsB,EAAE,yBAAyB,CAAC,CAAC,CAAC;CAC9E,CAAC;AAMF,eAAO,MAAM,8BAA8B,6CAA6C,CAAC;AACzF,eAAO,MAAM,gCAAgC,IAAI,CAAC;AAGlD,eAAO,MAAM,gCAAgC,MAAM,CAAC;AAKpD,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAE/D;AAiDD,qBAAa,kCAAkC;IAKjC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAJzC,OAAO,CAAC,MAAM,CAAM;IACpB,OAAO,CAAC,QAAQ,CAAC,yBAAyB,CAA+B;IACzE,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAqB;gBAE7B,YAAY,EAAE,CAAC,UAAU,EAAE,sBAAsB,KAAK,IAAI;IAEvF,IAAI,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAqB3B,MAAM,IAAI,MAAM;IAMhB,OAAO,CAAC,WAAW;IA0BnB,OAAO,CAAC,aAAa;IAkBrB,OAAO,CAAC,iBAAiB;CAiE1B;AAMD,qBAAa,mCAAmC;IAOlC,OAAO,CAAC,QAAQ,CAAC,YAAY;IANzC,OAAO,CAAC,MAAM,CAAM;IACpB,OAAO,CAAC,QAAQ,CAAC,2BAA2B,CAAqB;IACjE,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAqB;IACvD,OAAO,CAAC,mBAAmB,CAAK;IAChC,OAAO,CAAC,QAAQ,CAAK;gBAEQ,YAAY,EAAE,CAAC,UAAU,EAAE,sBAAsB,KAAK,IAAI;IAEvF,IAAI,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAqB3B,MAAM,IAAI,MAAM;IAMhB,OAAO,CAAC,WAAW;IA0BnB,OAAO,CAAC,aAAa;IAsBrB,OAAO,CAAC,iBAAiB;CA+C1B"}

package/node_modules/@playdrop/types/dist/instrument-evidence.js

@@ -23,8 +23,7 @@ __export(instrument_evidence_exports, {
   PLAYWRIGHT_MCP_SCREENSHOT_BUDGET: () => PLAYWRIGHT_MCP_SCREENSHOT_BUDGET,
   PLAYWRIGHT_MCP_SCREENSHOT_TOOL: () => PLAYWRIGHT_MCP_SCREENSHOT_TOOL,
   PlaywrightMcpScreenshotStreamParser: () => PlaywrightMcpScreenshotStreamParser,
-  isInstrumentScreenshotId: () => isInstrumentScreenshotId,
-  normalizePlaywrightScreenshotId: () => normalizePlaywrightScreenshotId
+  isInstrumentScreenshotId: () => isInstrumentScreenshotId
 });
 module.exports = __toCommonJS(instrument_evidence_exports);
 const INSTRUMENT_EVIDENCE_NAMES = [
@@ -39,14 +38,10 @@ const MAX_STREAM_LINE_LENGTH = 20 * 1024 * 1024;
 const PLAYWRIGHT_MCP_SCREENSHOT_TOOL = "mcp__playwright__browser_take_screenshot";
 const PLAYWRIGHT_MCP_CONTROLLED_TAB_ID = 1;
 const PLAYWRIGHT_MCP_SCREENSHOT_BUDGET = 100;
-const PLAYWRIGHT_SCREENSHOT_ID_PATTERN = /^[a-z0-9][a-z0-9._-]{0,63}\.(png|jpe?g)$/;
+const PLAYWRIGHT_SCREENSHOT_ID_PATTERN = /^pw-[1-9][0-9]*$/;
 function isInstrumentScreenshotId(value) {
   return SCREENSHOT_ID_PATTERN.test(value) || PLAYWRIGHT_SCREENSHOT_ID_PATTERN.test(value);
 }
-function normalizePlaywrightScreenshotId(value) {
-  const id = typeof value === "string" ? value.trim().toLowerCase() : "";
-  return PLAYWRIGHT_SCREENSHOT_ID_PATTERN.test(id) ? id : null;
-}
 function asRecord(value) {
   return value && typeof value === "object" && !Array.isArray(value) ? value : null;
 }
@@ -228,9 +223,10 @@ class ClaudeChromeScreenshotStreamParser {
 class PlaywrightMcpScreenshotStreamParser {
   onScreenshot;
   buffer = "";
-  pendingScreenshotFilenames = /* @__PURE__ */ new Map();
+  pendingScreenshotToolUseIds = /* @__PURE__ */ new Set();
   handledToolUseIds = /* @__PURE__ */ new Set();
   screenshotCallCount = 0;
+  sequence = 0;
   constructor(onScreenshot) {
     this.onScreenshot = onScreenshot;
   }
@@ -298,12 +294,7 @@ class PlaywrightMcpScreenshotStreamParser {
       if (this.screenshotCallCount > PLAYWRIGHT_MCP_SCREENSHOT_BUDGET) {
         throw new Error(`playwright_screenshot_budget_exceeded:${PLAYWRIGHT_MCP_SCREENSHOT_BUDGET}`);
       }
-      const input = asRecord(item?.["input"]);
-      const filename = normalizePlaywrightScreenshotId(input?.["filename"]);
-      if (!filename) {
-        continue;
-      }
-      this.pendingScreenshotFilenames.set(id, filename);
+      this.pendingScreenshotToolUseIds.add(id);
     }
   }
   recordToolResults(payload) {
@@ -316,12 +307,11 @@ class PlaywrightMcpScreenshotStreamParser {
         continue;
       }
       const toolUseId = typeof toolResult["tool_use_id"] === "string" ? toolResult["tool_use_id"].trim() : "";
-      const screenshotId = this.pendingScreenshotFilenames.get(toolUseId);
-      if (!screenshotId || this.handledToolUseIds.has(toolUseId)) {
+      if (!this.pendingScreenshotToolUseIds.has(toolUseId) || this.handledToolUseIds.has(toolUseId)) {
         continue;
       }
       this.handledToolUseIds.add(toolUseId);
-      this.pendingScreenshotFilenames.delete(toolUseId);
+      this.pendingScreenshotToolUseIds.delete(toolUseId);
       const resultContent = Array.isArray(toolResult["content"]) ? toolResult["content"] : [];
       const images = resultContent.map(asRecord).filter((item) => item?.["type"] === "image");
       if (images.length === 0) {
@@ -336,8 +326,9 @@ class PlaywrightMcpScreenshotStreamParser {
       if (mediaType !== "image/jpeg" && mediaType !== "image/png" || !dataBase64) {
         throw new Error(`invalid_playwright_screenshot_payload:${toolUseId}`);
       }
+      this.sequence += 1;
       this.onScreenshot({
-        screenshotId,
+        screenshotId: `pw-${this.sequence}`,
         tabId: PLAYWRIGHT_MCP_CONTROLLED_TAB_ID,
         toolUseId,
         mediaType,
@@ -358,6 +349,5 @@ class PlaywrightMcpScreenshotStreamParser {
   PLAYWRIGHT_MCP_SCREENSHOT_BUDGET,
   PLAYWRIGHT_MCP_SCREENSHOT_TOOL,
   PlaywrightMcpScreenshotStreamParser,
-  isInstrumentScreenshotId,
-  normalizePlaywrightScreenshotId
+  isInstrumentScreenshotId
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@playdrop/playdrop-cli",
-  "version": "0.12.18",
+  "version": "0.12.21",
   "description": "Official Playdrop CLI for publishing browser games, creator apps, and AI-generated game assets on playdrop.ai",
   "homepage": "https://www.playdrop.ai",
   "repository": {