@playdrop/playdrop-cli 0.12.10 → 0.12.12

package/config/client-meta.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.12.7",
+  "version": "0.12.8",
   "build": 2,
   "runtimeSdkVersion": "0.12.5",
   "runtimeSdkBuild": 2,

package/dist/commands/create.d.ts

@@ -1,3 +1,8 @@
+export declare function resolveNpmInstallInvocation(platform?: NodeJS.Platform, nodeExecutable?: string): {
+    command: string;
+    args: string[];
+};
+export declare function runNpmInstall(projectDir: string): boolean;
 type CreateOptions = {
     template?: string;
     remix?: string;

package/dist/commands/create.js

@@ -3,6 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveNpmInstallInvocation = resolveNpmInstallInvocation;
+exports.runNpmInstall = runNpmInstall;
 exports.createAssetSpecProject = createAssetSpecProject;
 exports.create = create;
 const types_1 = require("@playdrop/types");
@@ -22,6 +24,7 @@ const messages_1 = require("../messages");
 const loadCheck_1 = require("../apps/loadCheck");
 const devShared_1 = require("./devShared");
 const init_1 = require("./init");
+const npmProcess_1 = require("./npmProcess");
 const taskCaptureSession_1 = require("./taskCaptureSession");
 const CATALOGUE_FILENAME = 'catalogue.json';
 const LEGACY_CATALOGUE_VERSION_KEY = ['schema', 'Version'].join('');
@@ -186,9 +189,12 @@ async function promptInstallDependencies(projectDir) {
     rl.close();
     return /^y(es)?$/i.test(answer.trim());
 }
+function resolveNpmInstallInvocation(platform = process.platform, nodeExecutable = process.execPath) {
+    return (0, npmProcess_1.resolveNpmInvocation)(['install'], platform, nodeExecutable);
+}
 function runNpmInstall(projectDir) {
-    const npmCommand = process.platform === 'win32' ? 'npm.cmd' : 'npm';
-    const result = (0, node_child_process_1.spawnSync)(npmCommand, ['install'], {
+    const invocation = resolveNpmInstallInvocation();
+    const result = (0, node_child_process_1.spawnSync)(invocation.command, invocation.args, {
         cwd: projectDir,
         stdio: 'inherit',
     });

package/dist/commands/devServer.d.ts

@@ -34,6 +34,7 @@ export declare function buildLocalDevAppUrl(input: {
 }): string;
 export declare function terminateChildProcessTree(child: ChildProcess | null, timeoutMs?: number): Promise<void>;
 export declare function ensureDevRouterRunning(port?: number): Promise<void>;
+export declare function resolveDevRouterWorkingDirectory(cliEntrypoint: string): string;
 export declare function updateMountedDevRuntimeAssetManifest(input: {
     creatorUsername: string;
     appName: string;

package/dist/commands/devServer.js

@@ -8,6 +8,7 @@ exports.parseMountConflictError = parseMountConflictError;
 exports.buildLocalDevAppUrl = buildLocalDevAppUrl;
 exports.terminateChildProcessTree = terminateChildProcessTree;
 exports.ensureDevRouterRunning = ensureDevRouterRunning;
+exports.resolveDevRouterWorkingDirectory = resolveDevRouterWorkingDirectory;
 exports.updateMountedDevRuntimeAssetManifest = updateMountedDevRuntimeAssetManifest;
 exports.startDevServer = startDevServer;
 exports.isDevServerAvailable = isDevServerAvailable;
@@ -19,6 +20,7 @@ const node_crypto_1 = require("node:crypto");
 const node_fs_1 = require("node:fs");
 const node_http_1 = __importDefault(require("node:http"));
 const node_path_1 = require("node:path");
+const npmProcess_1 = require("./npmProcess");
 exports.DEV_ROUTER_PORT = 8888;
 const DEV_ROUTER_HOST = '127.0.0.1';
 const CONTROL_PREFIX = '/_playdrop';
@@ -248,8 +250,8 @@ function spawnDevScript(projectInfo) {
     if (!projectInfo.projectDir || !projectInfo.packageJson || typeof projectInfo.packageJson.scripts?.dev !== 'string') {
         return null;
     }
-    const npmCommand = process.platform === 'win32' ? 'npm.cmd' : 'npm';
-    const child = (0, node_child_process_1.spawn)(npmCommand, ['run', 'dev'], {
+    const npm = (0, npmProcess_1.resolveNpmInvocation)(['run', 'dev']);
+    const child = (0, node_child_process_1.spawn)(npm.command, npm.args, {
         cwd: projectInfo.projectDir,
         stdio: 'inherit',
         env: { ...process.env },
@@ -341,25 +343,52 @@ async function waitForProcessGroupExit(pid, timeoutMs) {
     }
     return !isProcessGroupAlive(pid);
 }
+async function terminateWindowsProcessTree(pid, timeoutMs) {
+    const windowsRoot = process.env.SystemRoot?.trim() || process.env.WINDIR?.trim() || 'C:\\Windows';
+    const taskkillPath = (0, node_path_1.join)(windowsRoot, 'System32', 'taskkill.exe');
+    await new Promise((resolvePromise) => {
+        let settled = false;
+        const taskkill = (0, node_child_process_1.spawn)(taskkillPath, ['/PID', String(pid), '/T', '/F'], {
+            stdio: 'ignore',
+            windowsHide: true,
+        });
+        const settle = () => {
+            if (settled) {
+                return;
+            }
+            settled = true;
+            clearTimeout(timeout);
+            resolvePromise();
+        };
+        const timeout = setTimeout(() => {
+            taskkill.kill();
+            settle();
+        }, timeoutMs);
+        timeout.unref?.();
+        taskkill.once('error', settle);
+        taskkill.once('close', settle);
+    });
+}
 async function terminateChildProcessTree(child, timeoutMs = 2000) {
     const pid = child?.pid;
     if (!child || !pid || !isPidAlive(pid)) {
         return;
     }
-    const useGroup = process.platform !== 'win32';
-    signalProcess(pid, 'SIGTERM', useGroup);
-    const exited = useGroup
-        ? await waitForProcessGroupExit(pid, timeoutMs)
-        : await waitForChildExit(child, timeoutMs);
-    if (exited) {
+    if (process.platform === 'win32') {
+        await terminateWindowsProcessTree(pid, timeoutMs);
+        if (isPidAlive(pid)) {
+            signalProcess(pid, 'SIGKILL', false);
+            await waitForChildExit(child, timeoutMs);
+        }
         return;
     }
-    signalProcess(pid, 'SIGKILL', useGroup);
-    if (useGroup) {
-        await waitForProcessGroupExit(pid, timeoutMs);
+    signalProcess(pid, 'SIGTERM', true);
+    const exited = await waitForProcessGroupExit(pid, timeoutMs);
+    if (exited) {
         return;
     }
-    await waitForChildExit(child, timeoutMs);
+    signalProcess(pid, 'SIGKILL', true);
+    await waitForProcessGroupExit(pid, timeoutMs);
 }
 async function fetchRouterJson(path, init = {}, port = exports.DEV_ROUTER_PORT) {
     const response = await fetch(`http://${DEV_ROUTER_HOST}:${port}${path}`, init);
@@ -416,6 +445,7 @@ async function ensureDevRouterRunning(port = exports.DEV_ROUTER_PORT) {
     const childEnv = { ...process.env };
     delete childEnv.PLAYDROP_WORKER_CONTEXT;
     const child = (0, node_child_process_1.spawn)(process.execPath, [cliEntrypoint, 'project', '_dev-router', 'serve'], {
+        cwd: resolveDevRouterWorkingDirectory(cliEntrypoint),
         detached: true,
         stdio: 'ignore',
         env: {
@@ -434,6 +464,9 @@ async function ensureDevRouterRunning(port = exports.DEV_ROUTER_PORT) {
     }
     throw new Error('dev_router_start_failed');
 }
+function resolveDevRouterWorkingDirectory(cliEntrypoint) {
+    return (0, node_path_1.dirname)((0, node_path_1.resolve)(cliEntrypoint));
+}
 async function registerDevMount(input, port = exports.DEV_ROUTER_PORT) {
     const response = await fetch(`http://${DEV_ROUTER_HOST}:${port}${CONTROL_PREFIX}/mounts`, {
         method: 'POST',

package/dist/commands/npmProcess.d.ts

@@ -0,0 +1,4 @@
+export declare function resolveNpmInvocation(args: string[], platform?: NodeJS.Platform, nodeExecutable?: string): {
+    command: string;
+    args: string[];
+};

package/dist/commands/npmProcess.js

@@ -0,0 +1,20 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveNpmInvocation = resolveNpmInvocation;
+const node_path_1 = require("node:path");
+const node_process_1 = __importDefault(require("node:process"));
+function resolveNpmInvocation(args, platform = node_process_1.default.platform, nodeExecutable = node_process_1.default.execPath) {
+    if (platform === 'win32') {
+        return {
+            command: nodeExecutable,
+            args: [
+                node_path_1.win32.join(node_path_1.win32.dirname(nodeExecutable), 'node_modules', 'npm', 'bin', 'npm-cli.js'),
+                ...args,
+            ],
+        };
+    }
+    return { command: 'npm', args };
+}

package/dist/commands/worker.d.ts

@@ -266,6 +266,7 @@ export declare function createLocalPlaydropShim(input: {
 export declare function parseCodexModelCatalog(output: string): string[];
 export declare function parseClaudeModelCatalog(output: string): string[];
 export declare function claudeModelProbeReportsSelection(output: string, expectedDisplayName: string): boolean;
+export declare function probeWorkerProviderIndependently<T>(probe: () => T, unavailable: T): T;
 export declare function buildWorkerSetupActions(input: {
     degradedReasons: string[];
     playwright?: {
@@ -301,6 +302,7 @@ export declare function resolveWorkerSupervisorLockFile(input?: {
     workerHomeDirectory?: string;
 }): string;
 export declare function parseLinuxProcessStartIdentity(stat: string): string | null;
+export declare function parseWindowsProcessStartIdentity(output: string): string | null;
 export declare function removeStaleWorkerSupervisorLockIfUnchanged(file: string, observedHolder: WorkerSupervisorLockOwner): boolean;
 export declare function acquireWorkerSupervisorLock(input: {
     supervisorType: WorkerSupervisorType;

package/dist/commands/worker.js

@@ -50,10 +50,12 @@ exports.createLocalPlaydropShim = createLocalPlaydropShim;
 exports.parseCodexModelCatalog = parseCodexModelCatalog;
 exports.parseClaudeModelCatalog = parseClaudeModelCatalog;
 exports.claudeModelProbeReportsSelection = claudeModelProbeReportsSelection;
+exports.probeWorkerProviderIndependently = probeWorkerProviderIndependently;
 exports.buildWorkerSetupActions = buildWorkerSetupActions;
 exports.resolveWorkerStateDir = resolveWorkerStateDir;
 exports.resolveWorkerSupervisorLockFile = resolveWorkerSupervisorLockFile;
 exports.parseLinuxProcessStartIdentity = parseLinuxProcessStartIdentity;
+exports.parseWindowsProcessStartIdentity = parseWindowsProcessStartIdentity;
 exports.removeStaleWorkerSupervisorLockIfUnchanged = removeStaleWorkerSupervisorLockIfUnchanged;
 exports.acquireWorkerSupervisorLock = acquireWorkerSupervisorLock;
 exports.releaseWorkerSupervisorLock = releaseWorkerSupervisorLock;
@@ -2327,18 +2329,35 @@ async function createLocalPlaydropShim(input) {
     const binDir = node_path_1.default.join(input.workspaceDir, 'bin');
     await (0, promises_1.mkdir)(binDir, { recursive: true });
     const cliEntrypoint = node_path_1.default.resolve(node_process_1.default.argv[1] ?? node_path_1.default.join(__dirname, '..', 'index.js'));
-    const shimPath = node_path_1.default.join(binDir, 'playdrop');
-    await (0, promises_1.writeFile)(shimPath, [
-        '#!/bin/sh',
-        'export PLAYDROP_WORKER_CONTEXT=1',
-        `export PLAYDROP_WORKER_TASK_ID=${JSON.stringify(String(input.taskId))}`,
-        `export PLAYDROP_WORKER_TASK_ATTEMPT=${JSON.stringify(String(input.attempt))}`,
-        `export PLAYDROP_WORKER_TASK_DEV_PORT=${JSON.stringify(String(input.devPort))}`,
-        `export PLAYDROP_DEV_ROUTER_PORT=${JSON.stringify(String(input.devPort))}`,
-        `exec ${JSON.stringify(node_process_1.default.execPath)} ${JSON.stringify(cliEntrypoint)} "$@"`,
-        '',
-    ].join('\n'), 'utf8');
-    await (0, promises_1.chmod)(shimPath, 0o755);
+    const isWindows = node_process_1.default.platform === 'win32';
+    const shimPath = node_path_1.default.join(binDir, isWindows ? 'playdrop.cmd' : 'playdrop');
+    const shim = isWindows
+        ? [
+            '@echo off',
+            'setlocal',
+            'set "PLAYDROP_WORKER_CONTEXT=1"',
+            `set "PLAYDROP_WORKER_TASK_ID=${input.taskId}"`,
+            `set "PLAYDROP_WORKER_TASK_ATTEMPT=${input.attempt}"`,
+            `set "PLAYDROP_WORKER_TASK_DEV_PORT=${input.devPort}"`,
+            `set "PLAYDROP_DEV_ROUTER_PORT=${input.devPort}"`,
+            `"${node_process_1.default.execPath}" "${cliEntrypoint}" %*`,
+            'exit /b %ERRORLEVEL%',
+            '',
+        ]
+        : [
+            '#!/bin/sh',
+            'export PLAYDROP_WORKER_CONTEXT=1',
+            `export PLAYDROP_WORKER_TASK_ID=${JSON.stringify(String(input.taskId))}`,
+            `export PLAYDROP_WORKER_TASK_ATTEMPT=${JSON.stringify(String(input.attempt))}`,
+            `export PLAYDROP_WORKER_TASK_DEV_PORT=${JSON.stringify(String(input.devPort))}`,
+            `export PLAYDROP_DEV_ROUTER_PORT=${JSON.stringify(String(input.devPort))}`,
+            `exec ${JSON.stringify(node_process_1.default.execPath)} ${JSON.stringify(cliEntrypoint)} "$@"`,
+            '',
+        ];
+    await (0, promises_1.writeFile)(shimPath, shim.join(isWindows ? '\r\n' : '\n'), 'utf8');
+    if (!isWindows) {
+        await (0, promises_1.chmod)(shimPath, 0o755);
+    }
     return binDir;
 }
 function probeCodexInstallation() {
@@ -2485,17 +2504,31 @@ function probeClaudeModels() {
     }
     return normalizeDiscoveredModels('CLAUDE_CODE', discovered);
 }
+function probeWorkerProviderIndependently(probe, unavailable) {
+    try {
+        return probe();
+    }
+    catch {
+        return unavailable;
+    }
+}
 function probeReadyWorkerCapabilities(input) {
-    const codexVersion = probeCodexInstallation()?.codexVersion ?? null;
-    const claudeVersion = probeClaudeInstallation()?.claudeVersion ?? null;
-    const cursorVersion = probeCursorInstallation()?.cursorVersion ?? null;
+    const codexVersion = probeWorkerProviderIndependently(() => probeCodexInstallation()?.codexVersion ?? null, null);
+    const claudeVersion = probeWorkerProviderIndependently(() => probeClaudeInstallation()?.claudeVersion ?? null, null);
+    const cursorVersion = probeWorkerProviderIndependently(() => probeCursorInstallation()?.cursorVersion ?? null, null);
+    const codexModels = codexVersion
+        ? probeWorkerProviderIndependently(probeCodexModels, [])
+        : [];
+    const claudeModels = claudeVersion
+        ? probeWorkerProviderIndependently(probeClaudeModels, [])
+        : [];
     const capabilities = buildWorkerCapabilities({
         codexVersion,
         codexAuthenticated: codexVersion ? readCodexAuthenticated() : false,
-        codexModels: codexVersion ? probeCodexModels() : [],
+        codexModels,
         claudeVersion,
         claudeAuthenticated: claudeVersion ? readClaudeAuthenticated() : false,
-        claudeModels: claudeVersion ? probeClaudeModels() : [],
+        claudeModels,
         cursorVersion,
         cursorAuthenticated: cursorVersion ? readCursorAuthenticated() : false,
         npmVersion: input.npmVersion,
@@ -2719,6 +2752,10 @@ function parseLinuxProcessStartIdentity(stat) {
     const startTimeTicks = fieldsAfterCommand[19];
     return /^\d+$/.test(startTimeTicks ?? '') ? `linux:${startTimeTicks}` : null;
 }
+function parseWindowsProcessStartIdentity(output) {
+    const ticks = output.split(/\r?\n/).map((line) => line.trim()).find((line) => /^\d{10,}$/.test(line));
+    return /^\d{10,}$/.test(ticks ?? '') ? `win32:${ticks}` : null;
+}
 function readProcessStartIdentity(pid) {
     if (!Number.isInteger(pid) || pid <= 0) {
         return null;
@@ -2736,6 +2773,12 @@ function readProcessStartIdentity(pid) {
         const identity = result.output.trim().replace(/\s+/g, ' ');
         return result.exitCode === 0 && identity ? identity : null;
     }
+    if (node_process_1.default.platform === 'win32') {
+        const script = `(Get-Process -Id ${pid} -ErrorAction Stop).StartTime.ToUniversalTime().Ticks`;
+        const encodedScript = Buffer.from(script, 'utf16le').toString('base64');
+        const result = (0, shellProbe_1.runShell)(`powershell.exe -NoLogo -NoProfile -NonInteractive -EncodedCommand ${encodedScript}`, 'win32');
+        return result.exitCode === 0 ? parseWindowsProcessStartIdentity(result.output) : null;
+    }
     throw new Error(`worker_supervisor_process_identity_unsupported: ${node_process_1.default.platform}`);
 }
 function readWorkerSupervisorLockOwner(file) {

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

@@ -1,5 +1,5 @@
 {
-  "version": "0.12.7",
+  "version": "0.12.8",
   "build": 2,
   "runtimeSdkVersion": "0.12.5",
   "runtimeSdkBuild": 2,

package/package.json

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