@playdrop/playdrop-cli 0.4.0 → 0.4.2

package/dist/commands/captureRemote.d.ts

@@ -2,10 +2,11 @@ type CaptureRemoteOptions = {
     timeout?: string | number;
     screenshot?: string;
     log?: string;
+    expectedUrl?: string;
     username?: string;
     password?: string;
     loginUrl?: string;
 };
-export declare function buildCaptureRemoteCommandArgs(url: string, options?: CaptureRemoteOptions): string[] | null;
+export declare function buildCaptureRemoteCommandArgs(url: string | undefined, options?: CaptureRemoteOptions): string[] | null;
 export declare function captureRemote(url: string | undefined, options?: CaptureRemoteOptions): Promise<void>;
 export {};

package/dist/commands/captureRemote.js

@@ -1,65 +1,102 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildCaptureRemoteCommandArgs = buildCaptureRemoteCommandArgs;
 exports.captureRemote = captureRemote;
-const node_child_process_1 = require("node:child_process");
-const node_path_1 = __importDefault(require("node:path"));
+const node_path_1 = require("node:path");
+const types_1 = require("@playdrop/types");
+const commandContext_1 = require("../commandContext");
+const http_1 = require("../http");
 const messages_1 = require("../messages");
+const devShared_1 = require("./devShared");
+const captureRuntime_1 = require("../captureRuntime");
 function parseTimeout(raw) {
     if (raw === undefined) {
-        return null;
+        return 10;
     }
     const parsed = typeof raw === 'number' ? raw : Number.parseFloat(String(raw));
     if (!Number.isFinite(parsed) || parsed <= 0 || parsed > 600) {
-        return null;
-    }
-    return String(parsed);
-}
-function buildCaptureRemoteCommandArgs(url, options = {}) {
-    const trimmedUrl = typeof url === 'string' ? url.trim() : '';
-    if (!trimmedUrl) {
-        return null;
-    }
-    const args = [
-        node_path_1.default.resolve(__dirname, '../../scripts/capture-url.mjs'),
-        '--url',
-        trimmedUrl,
-    ];
-    const timeout = parseTimeout(options.timeout);
-    if (options.timeout !== undefined && timeout === null) {
         throw new Error('invalid_timeout');
     }
-    if (timeout) {
-        args.push('--timeout', timeout);
-    }
-    if (options.screenshot) {
-        args.push('--screenshot', options.screenshot);
+    return parsed;
+}
+function assertValidUrl(value, errorCode) {
+    try {
+        new URL(value);
     }
-    if (options.log) {
-        args.push('--log', options.log);
+    catch {
+        throw new Error(errorCode);
     }
+}
+function parseCredentialPair(options) {
     const username = options.username?.trim() || '';
     const password = options.password || '';
     if ((username && !password) || (!username && password)) {
         throw new Error('invalid_credentials_pair');
     }
+    return { username, password };
+}
+function pushOptionalArg(args, flag, value) {
+    if (!value?.trim()) {
+        return;
+    }
+    args.push(flag, value.trim());
+}
+function buildCaptureRemoteCommandArgs(url, options = {}) {
+    const trimmedUrl = typeof url === 'string' ? url.trim() : '';
+    if (!trimmedUrl) {
+        return null;
+    }
+    const { username, password } = parseCredentialPair(options);
+    const args = ['--url', trimmedUrl];
+    if (options.timeout !== undefined) {
+        args.push('--timeout', String(parseTimeout(options.timeout)));
+    }
+    pushOptionalArg(args, '--screenshot', options.screenshot);
+    pushOptionalArg(args, '--log', options.log);
+    pushOptionalArg(args, '--expected-url', options.expectedUrl);
     if (username) {
         args.push('--username', username, '--password', password);
     }
-    if (options.loginUrl) {
-        args.push('--login-url', options.loginUrl);
-    }
+    pushOptionalArg(args, '--login-url', options.loginUrl);
     return args;
 }
+function parseOptions(url, options = {}) {
+    const trimmedUrl = typeof url === 'string' ? url.trim() : '';
+    if (!trimmedUrl) {
+        throw new Error('missing_url');
+    }
+    assertValidUrl(trimmedUrl, 'invalid_url');
+    const expectedUrl = options.expectedUrl?.trim() || null;
+    if (expectedUrl) {
+        assertValidUrl(expectedUrl, 'invalid_expected_url');
+    }
+    const { username, password } = parseCredentialPair(options);
+    return {
+        targetUrl: trimmedUrl,
+        expectedUrl,
+        timeoutSeconds: parseTimeout(options.timeout),
+        screenshotPath: (0, node_path_1.resolve)(process.cwd(), options.screenshot?.trim() || 'output/playwright/capture-url.png'),
+        logPath: options.log?.trim() ? (0, node_path_1.resolve)(process.cwd(), options.log.trim()) : null,
+        login: username
+            ? {
+                username,
+                password,
+                loginUrl: options.loginUrl?.trim() || null,
+            }
+            : null,
+    };
+}
 async function captureRemote(url, options = {}) {
-    let args;
+    let parsed;
     try {
-        args = buildCaptureRemoteCommandArgs(url ?? '', options);
+        parsed = parseOptions(url, options);
     }
     catch (error) {
+        if (error instanceof Error && error.message === 'invalid_expected_url') {
+            (0, messages_1.printErrorWithHelp)('The --expected-url value must be a valid URL.', [], { command: 'project capture remote' });
+            process.exitCode = 1;
+            return;
+        }
         if (error instanceof Error && error.message === 'invalid_timeout') {
             (0, messages_1.printErrorWithHelp)('The --timeout value must be a number between 0 and 600 seconds.', [], { command: 'project capture remote' });
             process.exitCode = 1;
@@ -70,21 +107,81 @@ async function captureRemote(url, options = {}) {
             process.exitCode = 1;
             return;
         }
-        throw error;
-    }
-    if (!args) {
-        (0, messages_1.printErrorWithHelp)('A URL is required.', ['Example: playdrop project capture remote https://www.playdrop.ai/creators/playdrop/apps/game/hangingout'], { command: 'project capture remote' });
+        if (error instanceof Error && error.message === 'invalid_url') {
+            (0, messages_1.printErrorWithHelp)('A valid URL is required.', ['Example: playdrop project capture remote https://www.playdrop.ai/creators/playdrop/apps/game/hangingout/play'], { command: 'project capture remote' });
+            process.exitCode = 1;
+            return;
+        }
+        (0, messages_1.printErrorWithHelp)('A URL is required.', ['Example: playdrop project capture remote https://www.playdrop.ai/creators/playdrop/apps/game/hangingout/play'], { command: 'project capture remote' });
         process.exitCode = 1;
         return;
     }
-    const result = (0, node_child_process_1.spawnSync)(process.execPath, args, {
-        stdio: 'inherit',
+    await (0, commandContext_1.withEnvironment)('project capture remote', 'Capturing remote app logs', async ({ client, token }) => {
+        let currentUser = null;
+        try {
+            currentUser = await (0, devShared_1.fetchDevUser)(client);
+        }
+        catch (error) {
+            if (error instanceof http_1.CLIUnsupportedClientError) {
+                return;
+            }
+            if (error instanceof types_1.UnsupportedClientError) {
+                (0, http_1.handleUnsupportedError)(error, 'Authentication');
+                process.exitCode = 1;
+                return;
+            }
+            if (error instanceof types_1.ApiError) {
+                (0, messages_1.printErrorWithHelp)(`Could not fetch your account (status ${error.status}).`, [
+                    'Run "playdrop auth login" to refresh your session and ensure the API is reachable.',
+                    'Use "playdrop auth whoami" afterwards to confirm your status.',
+                ], { command: 'project capture remote' });
+                process.exitCode = 1;
+                return;
+            }
+            if ((0, devShared_1.isNetworkError)(error)) {
+                (0, messages_1.printNetworkIssue)('Could not reach the Playdrop API to resolve your account.', 'project capture remote');
+                process.exitCode = 1;
+                return;
+            }
+            throw error;
+        }
+        console.log(`[capture] Launching Playwright against ${parsed.targetUrl}`);
+        try {
+            const result = await (0, captureRuntime_1.runCapture)({
+                targetUrl: parsed.targetUrl,
+                expectedUrl: parsed.expectedUrl ?? parsed.targetUrl,
+                timeoutMs: Math.round(parsed.timeoutSeconds * 1000),
+                minimumLogLevel: 'info',
+                screenshotPath: parsed.screenshotPath,
+                logPath: parsed.logPath,
+                token: parsed.login ? undefined : token,
+                user: parsed.login ? undefined : currentUser,
+                login: parsed.login,
+            });
+            if (result.errorCount > 0) {
+                console.error(`[capture] Completed with ${result.errorCount} error(s) after ${parsed.timeoutSeconds} seconds.`);
+                process.exitCode = 1;
+            }
+            else {
+                console.log(`[capture] Completed without console errors after ${parsed.timeoutSeconds} seconds.`);
+            }
+        }
+        catch (error) {
+            if (error instanceof http_1.CLIUnsupportedClientError) {
+                return;
+            }
+            if (error instanceof types_1.UnsupportedClientError) {
+                (0, http_1.handleUnsupportedError)(error, 'Capture');
+                process.exitCode = 1;
+                return;
+            }
+            if (error instanceof Error && error.stack) {
+                console.error(error.stack);
+            }
+            else {
+                console.error(error instanceof Error ? error.message : String(error));
+            }
+            process.exitCode = 1;
+        }
     });
-    if (typeof result.status === 'number' && result.status !== 0) {
-        process.exitCode = result.status;
-        return;
-    }
-    if (result.error) {
-        throw result.error;
-    }
 }

package/dist/commands/comments.js

@@ -72,7 +72,7 @@ async function browseComments(rawRef, options = {}) {
                     if (apiError.status === 401 || apiError.status === 403) {
                         return {
                             problem: `You do not have access to comments for "${ref.ref}".`,
-                            suggestions: ['Run "playdrop login" if this is private content you own.'],
+                            suggestions: ['Run "playdrop auth login" if this is private content you own.'],
                         };
                     }
                     return {
@@ -125,7 +125,7 @@ async function addComment(rawRef, options = {}) {
                     if (apiError.status === 401 || apiError.status === 403) {
                         return {
                             problem: 'Adding a comment requires you to be logged in.',
-                            suggestions: ['Run "playdrop login" and retry.'],
+                            suggestions: ['Run "playdrop auth login" and retry.'],
                         };
                     }
                     if (apiError.status === 404) {
@@ -166,7 +166,7 @@ async function deleteComment(commentId, options = {}) {
                     if (apiError.status === 401 || apiError.status === 403) {
                         return {
                             problem: 'Deleting a comment requires a valid login with permission to manage it.',
-                            suggestions: ['Run "playdrop login" and retry.'],
+                            suggestions: ['Run "playdrop auth login" and retry.'],
                         };
                     }
                     if (apiError.status === 404) {

package/dist/commands/create.js

@@ -642,7 +642,7 @@ function parseTemplateKey(value) {
             return null;
         }
         const normalizedType = typeSegment.toLowerCase();
-        if (normalizedType !== 'template') {
+        if (normalizedType !== 'template' && normalizedType !== 'app') {
             return null;
         }
         const slug = rest.join('/');
@@ -877,7 +877,7 @@ async function create(name, options = {}) {
         const choices = (0, environment_1.formatEnvironmentList)();
         (0, messages_1.printErrorWithHelp)(`Environment "${envName}" from your Playdrop config is not supported.`, [
             `Available environments: ${choices}.`,
-            'Run "playdrop login --env <env>" to save a supported environment before creating apps.'
+            'Run "playdrop auth login --env <env>" to save a supported environment before creating apps.'
         ], { command: 'project create app', includeGeneralHelp: false });
         process.exitCode = 1;
         return;
@@ -945,8 +945,8 @@ async function create(name, options = {}) {
         else {
             const parsed = parseTemplateKey(templateOption);
             if (!parsed) {
-                (0, messages_1.printErrorWithHelp)('The --template value must use the {creator}/template/{name} key format.', [
-                    'Example: playdrop/template/typescript_template.',
+                (0, messages_1.printErrorWithHelp)('The --template value must use the {creator}/template/{name} or {creator}/app/{name} key format.', [
+                    'Examples: playdrop/template/typescript_template or playdrop/app/typescript_template.',
                     'Use the exact template ref shown in Playdrop.'
                 ], { command: 'project create app' });
                 process.exitCode = 1;
@@ -1227,7 +1227,7 @@ async function create(name, options = {}) {
                 return;
             }
             if (error instanceof types_1.ApiError) {
-                (0, messages_1.printErrorWithHelp)(`Failed to resolve your creator account (status ${error.status}).`, ['Run "playdrop login" to refresh your session, then try again.'], { command: 'project create app' });
+                (0, messages_1.printErrorWithHelp)(`Failed to resolve your creator account (status ${error.status}).`, ['Run "playdrop auth login" to refresh your session, then try again.'], { command: 'project create app' });
                 process.exitCode = 1;
                 return;
             }
@@ -1237,7 +1237,7 @@ async function create(name, options = {}) {
                 return;
             }
             if (error instanceof Error && error.message === 'missing_creator_username') {
-                (0, messages_1.printErrorWithHelp)('The API did not return a creator username.', ['Run "playdrop login" again, then retry.'], { command: 'project create app' });
+                (0, messages_1.printErrorWithHelp)('The API did not return a creator username.', ['Run "playdrop auth login" again, then retry.'], { command: 'project create app' });
                 process.exitCode = 1;
                 return;
             }

package/dist/commands/createRemixContent.js

@@ -115,7 +115,7 @@ async function createAuthenticatedClient(commandLabel) {
     if (!envConfig) {
         (0, messages_1.printErrorWithHelp)(`Environment "${envName}" from your Playdrop config is not supported.`, [
             `Available environments: ${(0, environment_1.formatEnvironmentList)()}.`,
-            'Run "playdrop login --env <env>" to save a supported environment before retrying.',
+            'Run "playdrop auth login --env <env>" to save a supported environment before retrying.',
         ], { command: commandLabel, includeGeneralHelp: false });
         process.exitCode = 1;
         throw new Error('unsupported_env');

package/dist/commands/creations.js

@@ -65,7 +65,7 @@ async function resolveCreator(client, rawCreator, command) {
     const response = await client.me();
     const username = response.user?.username?.trim();
     if (!username) {
-        (0, messages_1.printErrorWithHelp)('Could not resolve your current creator account.', ['Run "playdrop whoami" to confirm your session, then retry.'], { command });
+        (0, messages_1.printErrorWithHelp)('Could not resolve your current creator account.', ['Run "playdrop auth whoami" to confirm your session, then retry.'], { command });
         process.exitCode = 1;
         return null;
     }
@@ -286,7 +286,7 @@ async function browseCreations(options = {}) {
             const handled = (0, errors_1.handleCommandFailure)(error, 'creations browse', 'Creation lookup', {
                 apiMessage: (apiError) => ({
                     problem: `Creation lookup failed with status ${apiError.status}.`,
-                    suggestions: ['Run "playdrop login" and retry.'],
+                    suggestions: ['Run "playdrop auth login" and retry.'],
                 }),
             });
             if (!handled) {

package/dist/commands/credits.js

@@ -34,7 +34,7 @@ async function showCreditBalance(options = {}) {
             const handled = (0, errors_1.handleCommandFailure)(error, 'credits balance', 'Credit balance lookup', {
                 apiMessage: (apiError) => ({
                     problem: `Credit balance lookup failed with status ${apiError.status}.`,
-                    suggestions: ['Run "playdrop login" and retry.'],
+                    suggestions: ['Run "playdrop auth login" and retry.'],
                 }),
             });
             if (!handled) {
@@ -80,7 +80,7 @@ async function browseCreditTransactions(options = {}) {
             const handled = (0, errors_1.handleCommandFailure)(error, 'credits transactions', 'Credit transaction lookup', {
                 apiMessage: (apiError) => ({
                     problem: `Credit transaction lookup failed with status ${apiError.status}.`,
-                    suggestions: ['Run "playdrop login" and retry.'],
+                    suggestions: ['Run "playdrop auth login" and retry.'],
                 }),
             });
             if (!handled) {

package/dist/commands/detail.js

@@ -6,6 +6,7 @@ const errors_1 = require("../errors");
 const messages_1 = require("../messages");
 const output_1 = require("../output");
 const refs_1 = require("../refs");
+const appUrls_1 = require("../appUrls");
 function printRefValidationError(raw) {
     (0, messages_1.printErrorWithHelp)('A canonical ref is required.', [
         'Use the format <creator>/<kind>/<name>.',
@@ -41,11 +42,15 @@ function extractAssetFileUrls(asset) {
         .filter((entry) => typeof entry?.role === 'string' && typeof entry?.url === 'string' && entry.url.trim().length > 0)
         .map((entry) => ({ role: entry.role, url: entry.url.trim() }));
 }
-function decorateApp(app) {
+function decorateApp(app, webBase) {
     return {
         ...app,
         urls: {
-            play: typeof app.assetUrl === 'string' && app.assetUrl.trim().length > 0 ? app.assetUrl : null,
+            play: (0, appUrls_1.buildPlatformPlayUrl)(webBase, {
+                creatorUsername: app.creatorUsername,
+                appName: app.name,
+                appType: app.type,
+            }),
             source: typeof app.sourceUrl === 'string' && app.sourceUrl.trim().length > 0 ? app.sourceUrl : null,
         },
     };
@@ -127,7 +132,7 @@ async function detail(rawRef, options = {}) {
         try {
             if (ref.kind === 'app') {
                 const response = await client.fetchAppBySlug(ref.creator, ref.name);
-                const item = decorateApp(response.app);
+                const item = decorateApp(response.app, envConfig.webBase);
                 if (options.json) {
                     (0, output_1.printJson)({ kind: ref.kind, ref: ref.ref, item });
                     return;
@@ -165,7 +170,7 @@ async function detail(rawRef, options = {}) {
                     if (apiError.status === 401 || apiError.status === 403) {
                         return {
                             problem: `You do not have access to "${ref.ref}".`,
-                            suggestions: ['Run "playdrop login" if this is private content you own.', 'Use "playdrop help detail" for the ref format.'],
+                            suggestions: ['Run "playdrop auth login" if this is private content you own.', 'Use "playdrop help detail" for the ref format.'],
                         };
                     }
                     return {

package/dist/commands/dev.js

@@ -120,8 +120,8 @@ async function dev(targetArg, _port, appOption) {
         }
         if (error instanceof types_1.ApiError) {
             (0, messages_1.printErrorWithHelp)(`Could not fetch your account (status ${error.status}).`, [
-                'Run "playdrop login" to refresh your session and ensure the API is reachable.',
-                'Use "playdrop whoami" afterwards to confirm your status.',
+                'Run "playdrop auth login" to refresh your session and ensure the API is reachable.',
+                'Use "playdrop auth whoami" afterwards to confirm your status.',
             ], { command: 'project dev' });
             process.exitCode = 1;
             return;

package/dist/commands/feedback.js

@@ -90,13 +90,13 @@ async function sendFeedback(options = {}) {
                 (0, output_1.printJson)({ success: true, response });
                 return;
             }
-            (0, output_1.printSuccess)('Feedback sent.', ['Next: run "playdrop feedback browse" if you need to review feedback as an admin.']);
+            (0, output_1.printSuccess)('Feedback sent.', ['Next: run "playdrop feedback browse" if you want to review your submitted feedback.']);
         }
         catch (error) {
             const handled = (0, errors_1.handleCommandFailure)(error, 'feedback send', 'Feedback send', {
                 apiMessage: (apiError) => ({
                     problem: `Feedback send failed with status ${apiError.status}.`,
-                    suggestions: ['Check the provided fields and retry.', 'Run "playdrop login" if your session may be stale.'],
+                    suggestions: ['Check the provided fields and retry.', 'Run "playdrop auth login" if your session may be stale.'],
                 }),
             });
             if (!handled) {
@@ -147,14 +147,21 @@ async function browseFeedback(options = {}) {
                 console.log(`  ${item.title}`);
                 console.log(`  ${item.comment}`);
             }
-            console.log('\nNext: run "playdrop feedback delete <id>" if you need to remove one entry.');
         }
         catch (error) {
             const handled = (0, errors_1.handleCommandFailure)(error, 'feedback browse', 'Feedback browse', {
-                apiMessage: (apiError) => ({
-                    problem: `Feedback browse failed with status ${apiError.status}.`,
-                    suggestions: ['Ensure you are logged in with an account that can review feedback.'],
-                }),
+                apiMessage: (apiError) => {
+                    if (apiError.status === 403) {
+                        return {
+                            problem: 'You can only browse your own feedback unless you are an admin.',
+                            suggestions: ['Drop --user-id or use your own user id, then retry.'],
+                        };
+                    }
+                    return {
+                        problem: `Feedback browse failed with status ${apiError.status}.`,
+                        suggestions: ['Ensure you are logged in with a valid Playdrop session.'],
+                    };
+                },
             });
             if (!handled) {
                 throw error;
@@ -178,10 +185,18 @@ async function deleteFeedbackEntry(rawId, options = {}) {
         }
         catch (error) {
             const handled = (0, errors_1.handleCommandFailure)(error, 'feedback delete', 'Feedback delete', {
-                apiMessage: (apiError) => ({
-                    problem: `Feedback delete failed with status ${apiError.status}.`,
-                    suggestions: ['Check the id and your permissions, then retry.'],
-                }),
+                apiMessage: (apiError) => {
+                    if (apiError.status === 403) {
+                        return {
+                            problem: 'Only admins can delete feedback.',
+                            suggestions: [],
+                        };
+                    }
+                    return {
+                        problem: `Feedback delete failed with status ${apiError.status}.`,
+                        suggestions: ['Check the id and your permissions, then retry.'],
+                    };
+                },
             });
             if (!handled) {
                 throw error;

package/dist/commands/generation.js

@@ -601,7 +601,7 @@ function handleAiFailure(error, command, context) {
             if (apiError.status === 401 || apiError.status === 403) {
                 return {
                     problem: `${context} requires you to be logged in.`,
-                    suggestions: ['Run "playdrop login" and retry.'],
+                    suggestions: ['Run "playdrop auth login" and retry.'],
                 };
             }
             return {
@@ -616,7 +616,7 @@ function handleAiFailure(error, command, context) {
     const status = typeof error?.status === 'number' ? Number(error.status) : null;
     if (status !== null) {
         if (status === 401 || status === 403) {
-            (0, messages_1.printErrorWithHelp)(`${context} requires you to be logged in.`, ['Run "playdrop login" and retry.'], { command });
+            (0, messages_1.printErrorWithHelp)(`${context} requires you to be logged in.`, ['Run "playdrop auth login" and retry.'], { command });
         }
         else {
             (0, messages_1.printErrorWithHelp)(`${context} failed with status ${status}.`, ['Retry in a moment.'], { command });

package/dist/commands/gettingStarted.js

@@ -4,7 +4,7 @@ exports.printGettingStarted = printGettingStarted;
 function printGettingStarted() {
     console.log('Start here:\n');
     console.log('1. Log in');
-    console.log('   playdrop login');
+    console.log('   playdrop auth login');
     console.log('');
     console.log('2. Initialize a workspace');
     console.log('   playdrop project init .');

package/dist/commands/init.js

@@ -55,7 +55,7 @@ async function resolveUsername(apiBase, token) {
         }
         if (unknownError instanceof types_1.ApiError) {
             (0, messages_1.printErrorWithHelp)(`Request failed with status ${unknownError.status}.`, [
-                'Run "playdrop login" to refresh your credentials.',
+                'Run "playdrop auth login" to refresh your credentials.',
                 'Use "playdrop project init" again after logging in.'
             ], { command: 'project init' });
             process.exitCode = 1;

package/dist/commands/login.d.ts

@@ -1,10 +1,8 @@
+import { resetOpenBrowserForTests, setOpenBrowserForTests } from '../browser';
+export { resetOpenBrowserForTests, setOpenBrowserForTests, };
 type LoginOptions = {
     username?: string;
     password?: string;
     key?: string;
 };
-type OpenBrowserFn = (url: string) => Promise<boolean>;
-export declare function setOpenBrowserForTests(fn: OpenBrowserFn): void;
-export declare function resetOpenBrowserForTests(): void;
 export declare function login(env: string, options?: LoginOptions): Promise<void>;
-export {};