screenci 0.0.65 → 0.0.67

package/dist/cli.d.ts

@@ -55,6 +55,8 @@ export type StudioUploadNotice = {
  */
 export declare function formatStudioChangeSummary(changes: StudioAppliedChange[]): string;
 export declare function formatStudioUrl(appUrl: string, projectId: string, videoId: string): string;
+type OrgPlan = 'free' | 'starter' | 'business';
+export declare function withUploadRetry<T>(fn: () => Promise<T>, signal: AbortSignal | undefined, maxAttempts?: number): Promise<T>;
 export declare function attachUploadAbortStdinListener(input: Pick<NodeJS.ReadStream, 'on' | 'off' | 'pause'>, onAbort: (signal: NodeJS.Signals) => void): () => void;
 export declare function collectUploadAssets(data: RecordingData, configDir: string): Promise<PreparedUploadAsset[]>;
 export declare function stripVoicePath(voice: VoiceKey | RecordingCustomVoiceRef): VoiceKey | RecordingCustomVoiceRef;
@@ -72,6 +74,7 @@ export declare function uploadRecordings(screenciDir: string, projectName: strin
         message: string;
     }>;
     studioNotices: StudioUploadNotice[];
+    plan: OrgPlan | null;
 }>;
 export declare function getDevBackendUrl(): string;
 export declare function getDevFrontendUrl(): string;
@@ -82,6 +85,7 @@ export declare function extractMockRecordLiteral(configSource: string): boolean
 export declare function getConfigModuleSpecifier(resolvedConfigPath: string): string;
 export declare function ensureScreenciSecret(resolvedConfigPath?: string, opts?: {
     interactive?: boolean;
+    pollAuth?: boolean;
 }): Promise<string | undefined>;
 export declare function main(): Promise<void>;
 export declare function logCliError(error: unknown): void;

package/dist/cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../cli.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../cli.ts"],"names":[],"mappings":"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"}

package/dist/cli.js

@@ -23,6 +23,10 @@ const SCREENCI_DEVELOPMENT_BACKEND_URL = 'https://dev.api.screenci.com';
 const SCREENCI_DEVELOPMENT_FRONTEND_URL = 'https://dev.app.screenci.com';
 const SCREENCI_LINK_SESSION_FILE = 'link-session.json';
 const SCREENCI_LINK_SESSION_POLL_INTERVAL_MS = 2_000;
+// `record --poll` keeps a non-interactive session (an agent or CI) waiting for
+// sign-in. We poll on a slower cadence than the interactive loop so a long wait
+// for a human to click the link does not hammer the backend.
+const SCREENCI_LINK_SESSION_POLL_FLAG_INTERVAL_MS = 5_000;
 const require = createRequire(import.meta.url);
 function parseScreenCIEnvironment(value) {
     if (value === undefined)
@@ -88,13 +92,14 @@ function extractPlaywrightDiscoveryError(output) {
 function logScreenCISecretGuide() {
     logger.info(`Guide: ${pc.cyan(SCREENCI_RECORD_DOCS_URL)}`);
 }
-function getSuggestedScreenciCommand(command) {
+function getSuggestedScreenciCommand(command, flags = '') {
+    const suffix = flags ? ` ${flags}` : '';
     const pm = determinePackageManager();
     if (pm === 'pnpm')
-        return `pnpm exec screenci ${command}`;
+        return `pnpm exec screenci ${command}${suffix}`;
     if (pm === 'yarn')
-        return `yarn screenci ${command}`;
-    return `npx screenci ${command}`;
+        return `yarn screenci ${command}${suffix}`;
+    return `npx screenci ${command}${suffix}`;
 }
 async function collectDiscoveredTestTitles(configPath, additionalArgs, env) {
     const listArgs = [
@@ -278,6 +283,20 @@ function isRecordFailureHintError(err) {
 function isUploadAssetError(err) {
     return err instanceof UploadAssetError;
 }
+export async function withUploadRetry(fn, signal, maxAttempts = 3) {
+    let lastErr;
+    for (let attempt = 0; attempt < maxAttempts; attempt++) {
+        try {
+            return await fn();
+        }
+        catch (err) {
+            if (isUploadCancelledError(err))
+                throw err;
+            lastErr = err;
+        }
+    }
+    throw lastErr;
+}
 function formatUploadProgressLine(videoName, status) {
     switch (status) {
         case undefined:
@@ -346,6 +365,7 @@ async function uploadRecordingCandidate(candidate, screenciDir, projectName, api
     const { entry, videoName, data, preparedUploadAssets } = candidate;
     let projectId = null;
     let videoId = null;
+    let plan = null;
     try {
         uploadAbort.throwIfAborted();
         const recordingPath = resolve(screenciDir, entry, 'recording.mp4');
@@ -361,7 +381,7 @@ async function uploadRecordingCandidate(candidate, screenciDir, projectName, api
             };
         }
         const recordingHash = await hashFile(recordingPath);
-        const startResponse = await fetch(`${apiUrl}/cli/upload/start`, {
+        const startResponse = await withUploadRetry(() => fetch(`${apiUrl}/cli/upload/start`, {
             method: 'POST',
             headers: {
                 'Content-Type': 'application/json',
@@ -387,7 +407,7 @@ async function uploadRecordingCandidate(candidate, screenciDir, projectName, api
                 })),
             }),
             signal: uploadAbort.signal,
-        });
+        }), uploadAbort.signal);
         if (!startResponse.ok) {
             const text = await startResponse.text();
             progressReporter.complete(progressIndex, 'failure');
@@ -404,6 +424,7 @@ async function uploadRecordingCandidate(candidate, screenciDir, projectName, api
         const { recordingId } = startBody;
         projectId = startBody.projectId;
         videoId = startBody.videoId ?? null;
+        plan = startBody.plan ?? null;
         const studio = startBody.studio;
         if (verbose) {
             logger.info(`recordingId=${recordingId} projectId=${projectId}`);
@@ -415,44 +436,45 @@ async function uploadRecordingCandidate(candidate, screenciDir, projectName, api
         if (verbose) {
             logger.info(`Uploading recording.mp4 size=${(fileStat.size / 1024 / 1024).toFixed(1)}MB`);
         }
-        const stream = createReadStream(recordingPath);
-        const abortStream = () => {
-            stream.destroy(new UploadCancelledError(`Upload cancelled for "${videoName}"`));
-        };
-        uploadAbort.signal.addEventListener('abort', abortStream, {
-            once: true,
-        });
-        try {
-            const recordingResponse = await fetch(`${apiUrl}/cli/upload/${recordingId}/recording`, {
-                method: 'PUT',
-                headers: {
-                    'Content-Type': 'video/mp4',
-                    'Content-Length': String(fileStat.size),
-                    'X-ScreenCI-Secret': secret,
-                    ...(elevenLabsApiKey
-                        ? { 'X-ElevenLabs-Api-Key': elevenLabsApiKey }
-                        : {}),
-                },
-                body: stream,
-                signal: uploadAbort.signal,
-                // @ts-expect-error Node.js fetch supports duplex for streaming
-                duplex: 'half',
-            });
-            if (!recordingResponse.ok) {
-                const text = await recordingResponse.text();
-                progressReporter.complete(progressIndex, 'failure');
-                return {
-                    projectId,
-                    videoId,
-                    hadFailure: true,
-                    videoName,
-                    failureMessage: `Failed to upload recording for "${videoName}": ${recordingResponse.status} ${text}${hint401(recordingResponse.status, secret)}`,
-                    recordId,
-                };
+        const recordingResponse = await withUploadRetry(async () => {
+            const stream = createReadStream(recordingPath);
+            const abortStream = () => {
+                stream.destroy(new UploadCancelledError(`Upload cancelled for "${videoName}"`));
+            };
+            uploadAbort.signal.addEventListener('abort', abortStream, { once: true });
+            try {
+                return await fetch(`${apiUrl}/cli/upload/${recordingId}/recording`, {
+                    method: 'PUT',
+                    headers: {
+                        'Content-Type': 'video/mp4',
+                        'Content-Length': String(fileStat.size),
+                        'X-ScreenCI-Secret': secret,
+                        ...(elevenLabsApiKey
+                            ? { 'X-ElevenLabs-Api-Key': elevenLabsApiKey }
+                            : {}),
+                    },
+                    body: stream,
+                    signal: uploadAbort.signal,
+                    // @ts-expect-error Node.js fetch supports duplex for streaming
+                    duplex: 'half',
+                });
             }
-        }
-        finally {
-            uploadAbort.signal.removeEventListener('abort', abortStream);
+            finally {
+                uploadAbort.signal.removeEventListener('abort', abortStream);
+            }
+        }, uploadAbort.signal);
+        if (!recordingResponse.ok) {
+            const text = await recordingResponse.text();
+            progressReporter.complete(progressIndex, 'failure');
+            return {
+                projectId,
+                videoId,
+                hadFailure: true,
+                videoName,
+                failureMessage: `Failed to upload recording for "${videoName}": ${recordingResponse.status} ${text}${hint401(recordingResponse.status, secret)}`,
+                recordId,
+                ...(plan !== null && { plan }),
+            };
         }
         progressReporter.complete(progressIndex, 'success');
         cleanupUploadedRecordingDir(screenciDir, entry);
@@ -463,6 +485,7 @@ async function uploadRecordingCandidate(candidate, screenciDir, projectName, api
             videoName,
             recordId,
             ...(studio !== undefined && { studio }),
+            ...(plan !== null && { plan }),
         };
     }
     catch (err) {
@@ -479,6 +502,7 @@ async function uploadRecordingCandidate(candidate, screenciDir, projectName, api
                 videoName,
                 failureMessage: err instanceof Error ? err.message : String(err),
                 recordId,
+                ...(plan !== null && { plan }),
             };
         }
         progressReporter.complete(progressIndex, 'failure');
@@ -489,6 +513,7 @@ async function uploadRecordingCandidate(candidate, screenciDir, projectName, api
             videoName,
             failureMessage: `Network error uploading "${videoName}": ${err instanceof Error ? err.message : String(err)}`,
             recordId,
+            ...(plan !== null && { plan }),
         };
     }
 }
@@ -1022,7 +1047,7 @@ async function uploadAssets(assets, apiUrl, secret, recordingId, signal, throwIf
     for (const asset of assets) {
         throwIfAborted();
         try {
-            const checkRes = await fetch(`${apiUrl}/cli/upload/${recordingId}/asset/check`, {
+            const checkRes = await withUploadRetry(() => fetch(`${apiUrl}/cli/upload/${recordingId}/asset/check`, {
                 method: 'POST',
                 headers: {
                     'Content-Type': 'application/json',
@@ -1036,7 +1061,7 @@ async function uploadAssets(assets, apiUrl, secret, recordingId, signal, throwIf
                     ...(typeof asset.name === 'string' ? { name: asset.name } : {}),
                 }),
                 signal,
-            });
+            }), signal);
             if (!checkRes.ok) {
                 const text = await checkRes.text();
                 throw new UploadAssetError(`Failed to check asset ${asset.path}: ${checkRes.status} ${text}${hint401(checkRes.status, secret)}`);
@@ -1049,8 +1074,9 @@ async function uploadAssets(assets, apiUrl, secret, recordingId, signal, throwIf
             if (!asset.fileBuffer || !asset.contentType) {
                 throw new UploadAssetError(`Asset bytes not available for upload and backend does not have it yet: ${asset.path}`);
             }
+            const fileBuffer = asset.fileBuffer;
             throwIfAborted();
-            const res = await fetch(`${apiUrl}/cli/upload/${recordingId}/asset`, {
+            const res = await withUploadRetry(() => fetch(`${apiUrl}/cli/upload/${recordingId}/asset`, {
                 method: 'PUT',
                 headers: {
                     'Content-Type': 'application/json',
@@ -1058,14 +1084,14 @@ async function uploadAssets(assets, apiUrl, secret, recordingId, signal, throwIf
                 },
                 body: JSON.stringify({
                     fileHash: asset.fileHash,
-                    fileBase64: asset.fileBuffer.toString('base64'),
+                    fileBase64: fileBuffer.toString('base64'),
                     contentType: asset.contentType,
                     size: asset.size,
                     path: asset.path,
                     ...(typeof asset.name === 'string' ? { name: asset.name } : {}),
                 }),
                 signal,
-            });
+            }), signal);
             if (!res.ok) {
                 const text = await res.text();
                 if (res.status === 409 && text.includes('already exists')) {
@@ -1106,6 +1132,7 @@ export async function uploadRecordings(screenciDir, projectName, apiUrl, secret,
             failedVideoNames: [],
             failedVideoMessages: [],
             studioNotices: [],
+            plan: null,
         };
     }
     if (specificEntry !== undefined) {
@@ -1126,12 +1153,14 @@ export async function uploadRecordings(screenciDir, projectName, apiUrl, secret,
                 failedVideoNames: [],
                 failedVideoMessages: [],
                 studioNotices: [],
+                plan: null,
             };
         }
         const progressReporter = createUploadProgressReporter(candidates.map((candidate) => candidate.videoName), verbose);
         const results = await Promise.all(candidates.map(async (candidate, index) => await uploadRecordingCandidate(candidate, screenciDir, projectName, apiUrl, secret, elevenLabsApiKey, verbose, uploadAbort, progressReporter, index, recordId)));
         firstProjectId =
             results.find((result) => result.projectId !== null)?.projectId ?? null;
+        const resolvedPlan = results.find((result) => result.plan !== undefined)?.plan ?? null;
         const hadFailures = results.some((result) => result.hadFailure);
         const failedVideoNames = results
             .filter((result) => result.hadFailure)
@@ -1155,6 +1184,7 @@ export async function uploadRecordings(screenciDir, projectName, apiUrl, secret,
             failedVideoNames,
             failedVideoMessages,
             studioNotices,
+            plan: resolvedPlan,
         };
     }
     finally {
@@ -1417,8 +1447,10 @@ async function requireScreenCISecret(configPath, opts = {}) {
     if (!secret) {
         // In a non-interactive session ensureScreenciSecret already printed the
         // sign-in link and the next step, so we exit without repeating guidance.
+        // A pending sign-in is an expected handoff (surface the link, then rerun),
+        // not a failure, so exit cleanly (0) to avoid flagging the run as red.
         if (opts.interactive === false) {
-            process.exit(1);
+            process.exit(0);
         }
         const envFilePath = await resolveProjectEnvFilePath(resolvedConfigPath);
         logger.error(`No SCREENCI_SECRET configured. Rerun ${pc.cyan(getSuggestedScreenciCommand('record'))} or add SCREENCI_SECRET manually to ${envFilePath} by following the guide at ${pc.cyan(SCREENCI_RECORD_DOCS_URL)}.`);
@@ -1556,7 +1588,7 @@ async function pollLinkSessionOnce(spec) {
     }
     return { status };
 }
-async function pollLinkSession(spec) {
+async function pollLinkSession(spec, pollIntervalMs = SCREENCI_LINK_SESSION_POLL_INTERVAL_MS) {
     for (;;) {
         const result = await pollLinkSessionOnce(spec);
         if (result.status === 'completed' && result.secret) {
@@ -1567,11 +1599,12 @@ async function pollLinkSession(spec) {
             result.status === 'invalid') {
             return result;
         }
-        await new Promise((resolveDelay) => setTimeout(resolveDelay, SCREENCI_LINK_SESSION_POLL_INTERVAL_MS));
+        await new Promise((resolveDelay) => setTimeout(resolveDelay, pollIntervalMs));
     }
 }
 export async function ensureScreenciSecret(resolvedConfigPath, opts = {}) {
     const interactive = opts.interactive ?? true;
+    const pollAuth = opts.pollAuth ?? false;
     const existingSecret = process.env.SCREENCI_SECRET;
     if (existingSecret)
         return existingSecret;
@@ -1614,12 +1647,14 @@ export async function ensureScreenciSecret(resolvedConfigPath, opts = {}) {
             return secret;
         };
         if (!interactive) {
-            // Non-interactive sessions cannot complete a browser sign-in here, so we
-            // never block. Reuse or create the persisted session and check its status
-            // once; if a stored session is stale, recreate it and check once more.
-            // When the session is already completed (the sign-in happened between
-            // runs) we pick up the secret; otherwise we print the link and return so
-            // the caller can surface it and rerun later.
+            // Non-interactive sessions cannot complete a browser sign-in here, so by
+            // default we never block. Reuse or create the persisted session and check
+            // its status once; if a stored session is stale, recreate it and check
+            // once more. When the session is already completed (the sign-in happened
+            // between runs) we pick up the secret; otherwise we print the link and
+            // return so the caller can surface it and rerun later. The exception is
+            // `pollAuth` (the `--poll-auth` flag), which opts in to waiting: it keeps
+            // polling on a slow cadence until sign-in completes.
             let spec = await ensureSpec();
             let result = await pollLinkSessionOnce(spec);
             if (result.status === 'expired' ||
@@ -1632,8 +1667,25 @@ export async function ensureScreenciSecret(resolvedConfigPath, opts = {}) {
             if (result.status === 'completed' && result.secret) {
                 return await saveCompletedSecret(result.secret);
             }
-            logger.info(`Sign-in required to record. Open this link to sign in and choose a plan:\n${pc.cyan(spec.appUrl)}\n` +
-                `This session is non-interactive, so sign-in can't complete here. After signing in, rerun ${pc.cyan(getSuggestedScreenciCommand('record'))} to continue.`);
+            if (pollAuth) {
+                // The caller asked us to wait for sign-in. Print the link, then poll on
+                // a slow cadence until the human finishes signing in, and continue
+                // recording automatically once the secret lands. We re-print the link
+                // on every (re)created session so the latest valid link is always
+                // visible, including after a stale session is recreated.
+                for (;;) {
+                    logger.info(`Sign-in required to record. Open this link to sign in:\n${pc.cyan(spec.appUrl)}\n` +
+                        `Waiting for sign-in (checking every 5 seconds). Recording continues automatically once you finish.`);
+                    const polled = await pollLinkSession(spec, SCREENCI_LINK_SESSION_POLL_FLAG_INTERVAL_MS);
+                    if (polled.status === 'completed' && polled.secret) {
+                        return await saveCompletedSecret(polled.secret);
+                    }
+                    deletePersistedLinkSessionSpec(specPath);
+                    spec = await ensureSpec();
+                }
+            }
+            logger.info(`Sign-in required to record. Open this link to sign in:\n${pc.cyan(spec.appUrl)}\n` +
+                `This session is non-interactive, so sign-in can't complete here. After signing in, rerun ${pc.cyan(getSuggestedScreenciCommand('record'))} to continue, or run ${pc.cyan(getSuggestedScreenciCommand('record', '--poll-auth'))} to print the link again and wait for sign-in, continuing automatically.`);
             return undefined;
         }
         for (;;) {
@@ -1669,12 +1721,13 @@ export async function main() {
         .command('record [playwrightArgs...]')
         .description('Record videos using Playwright')
         .option('-v, --verbose', 'verbose output')
+        .option('--poll-auth', 'wait for sign-in to complete (polling every 5s) instead of exiting, then continue recording')
         .allowUnknownOption(true)
         .action(async () => {
         const parsed = parseRecordCliArgs(getSubcommandArgv('record'));
         let playwrightFailure = null;
         try {
-            await run('record', parsed.otherArgs, parsed.configPath, parsed.verbose);
+            await run('record', parsed.otherArgs, parsed.configPath, parsed.verbose, false, parsed.pollAuth);
         }
         catch (error) {
             if (!(error instanceof Error))
@@ -1727,6 +1780,7 @@ export async function main() {
                         failedVideoNames: [],
                         failedVideoMessages: [],
                         studioNotices: [],
+                        plan: null,
                     };
                     try {
                         uploadResult = await uploadRecordings(screenciDir, screenciConfig.projectName, apiUrl, secret);
@@ -1737,7 +1791,7 @@ export async function main() {
                         }
                         throw err;
                     }
-                    const { projectId, recordId, hadFailures, failedVideoNames, failedVideoMessages, studioNotices, } = uploadResult;
+                    const { projectId, recordId, hadFailures, failedVideoNames, failedVideoMessages, studioNotices, plan, } = uploadResult;
                     if (recordId !== null && projectId !== null) {
                         const recordUrl = `${appUrl}/record/${recordId}`;
                         await writeGitHubProjectOutput(recordUrl);
@@ -1756,6 +1810,11 @@ export async function main() {
                             : 'Recording finished, rendering in progress. Results available at:');
                         logger.info(pc.cyan(projectUrl));
                     }
+                    if (projectId !== null && plan !== 'business') {
+                        logger.info('');
+                        logger.info('Upgrade for more renders, more active videos, and expressive narration:');
+                        logger.info(pc.cyan(`${appUrl}/select-plan`));
+                    }
                     for (const notice of studioNotices) {
                         if ('held' in notice.studio) {
                             logger.info('');
@@ -1900,6 +1959,7 @@ function getSubcommandArgv(command) {
 function parseRecordCliArgs(args) {
     let configPath;
     let verbose = false;
+    let pollAuth = false;
     const otherArgs = [];
     for (let i = 0; i < args.length; i++) {
         const arg = args[i];
@@ -1917,6 +1977,9 @@ function parseRecordCliArgs(args) {
         else if (arg === '--verbose' || arg === '-v') {
             verbose = true;
         }
+        else if (arg === '--poll-auth') {
+            pollAuth = true;
+        }
         else {
             otherArgs.push(arg);
         }
@@ -1924,6 +1987,7 @@ function parseRecordCliArgs(args) {
     return {
         configPath,
         verbose,
+        pollAuth,
         otherArgs,
     };
 }
@@ -1974,7 +2038,7 @@ function validateArgs(args) {
         }
     }
 }
-async function run(command, additionalArgs, customConfigPath, verbose = false, mockRecord = false) {
+async function run(command, additionalArgs, customConfigPath, verbose = false, mockRecord = false, pollAuth = false) {
     const configPath = resolveScreenCIConfigPathOrExit(customConfigPath);
     if (command === 'test' || process.env.SCREENCI_RECORDING !== 'true') {
         await loadEnvFileFromConfigSource(configPath, false);
@@ -1984,6 +2048,7 @@ async function run(command, additionalArgs, customConfigPath, verbose = false, m
         if (!process.env.SCREENCI_SECRET) {
             await requireScreenCISecret(configPath, {
                 interactive: detectInteractiveSession(),
+                pollAuth,
             });
         }
         validateArgs(additionalArgs);