sitevision-cli 1.0.0-beta.13 → 1.0.0-beta.15

package/dist/commands/dev.js

@@ -1,379 +1,66 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import fs from 'fs';
-import path from 'path';
 import React from 'react';
-import { render, Box, Text, useApp, useInput } from 'ink';
+import { render, Box, Text, useApp, useInput, useStdout } from 'ink';
 import { StatusIndicator } from '../components/StatusIndicator.js';
-import { WebpackRunner, hasLocalWebpackConfig } from '../utils/webpack-runner.js';
-import { hasSitevisionScripts, runSitevisionScriptsBuild, getDelegatedZipPath, checkSitevisionScriptsCompatibility, } from '../utils/sitevision-scripts-runner.js';
 import { promptPassword, promptYesNo } from '../utils/password-prompt.js';
-import { signApp, deployApp } from '../utils/sitevision-api.js';
 import { setDeployPassword } from '../utils/keychain.js';
 import { resolveSigningPassword } from '../utils/signing-password.js';
-import { copyStaticToBuild, createBuildZip, cleanBuild } from '../utils/zip.js';
-import { isBundledApp, getAppType, getFullAppId, getZipPath, getSignedZipPath, localizedText, readManifest, } from '../utils/project-detection.js';
-export function DevScreen({ projectRoot, manifest, devProperties, signed, deploy = true, signingCredentials, onBack, onRetryCredentials, }) {
+import { startDev, useTasks } from '../utils/tasks.js';
+import { Log } from '../shell/Tabs.js';
+/** Standalone `svc dev` / `svc watch`: one task, its log, Ctrl+C or q to stop. */
+export function DevScreen({ project, options }) {
     const { exit } = useApp();
-    const [version, setVersion] = React.useState(manifest.version);
-    const [state, setState] = React.useState({
-        status: 'initializing',
-        message: 'Starting webpack watch...',
-        buildCount: 0,
-        webpackReady: false,
-    });
+    const { stdout } = useStdout();
+    const tasks = useTasks();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    const task = React.useMemo(() => startDev(project, options), []);
+    const live = tasks.find(t => t.id === task.id) ?? task;
     useInput((input, key) => {
-        if (onBack && (key.escape || input === 'q')) {
-            onBack();
-        }
-        if (onRetryCredentials && state.status === 'error' && input === 'r') {
-            onRetryCredentials();
+        if (key.escape || input === 'q') {
+            live.stop();
+            exit();
         }
     });
-    const webpackRunnerRef = React.useRef(null);
-    const watchersRef = React.useRef([]);
-    const debounceTimerRef = React.useRef(null);
-    const isBuildingRef = React.useRef(false);
-    const pendingRebuildRef = React.useRef(false);
-    // Sign (if needed) and deploy an already-built zip, updating UI state.
-    const refreshVersion = React.useCallback(() => {
-        try {
-            const fresh = readManifest(projectRoot)?.manifest.version;
-            if (fresh)
-                setVersion(fresh);
-        }
-        catch {
-            // keep last known version
-        }
-    }, [projectRoot]);
-    const signAndDeploy = React.useCallback(async (zipPath, buildTime) => {
-        try {
-            let deployZipPath = zipPath;
-            // Sign if needed
-            if (signed && signingCredentials) {
-                setState(prev => ({
-                    ...prev,
-                    status: 'signing',
-                    message: 'Signing app...',
-                }));
-                const signedZipPath = getSignedZipPath(projectRoot, manifest);
-                const signResult = await signApp(zipPath, signingCredentials, signedZipPath);
-                if (!signResult.success) {
-                    setState(prev => ({
-                        ...prev,
-                        status: 'error',
-                        message: `Signing failed: ${signResult.error}`,
-                        error: signResult.error,
-                    }));
-                    return;
-                }
-                deployZipPath = signedZipPath;
-            }
-            refreshVersion();
-            // Watch/build-only mode: stop after building (and signing).
-            if (!deploy || !devProperties) {
-                setState(prev => ({
-                    ...prev,
-                    status: 'ready',
-                    message: signed
-                        ? 'Signed. Watching for changes...'
-                        : 'Built. Watching for changes...',
-                    buildCount: prev.buildCount + 1,
-                    lastBuildTime: buildTime,
-                    error: undefined,
-                }));
-                return;
-            }
-            // Deploy
-            setState(prev => ({
-                ...prev,
-                status: 'deploying',
-                message: 'Deploying to dev...',
-            }));
-            const appType = getAppType(manifest);
-            const deployResult = await deployApp(deployZipPath, {
-                domain: devProperties.domain,
-                siteName: devProperties.siteName,
-                addonName: devProperties.addonName,
-                username: devProperties.username,
-                password: devProperties.password,
-                useHTTP: devProperties.useHTTPForDevDeploy,
-            }, appType, true);
-            if (!deployResult.success) {
-                setState(prev => ({
-                    ...prev,
-                    status: 'error',
-                    message: `Deploy failed: ${deployResult.error}`,
-                    error: deployResult.error,
-                }));
-                return;
-            }
-            // Success - back to watching
-            setState(prev => ({
-                ...prev,
-                status: 'ready',
-                message: 'Deployed. Watching for changes...',
-                buildCount: prev.buildCount + 1,
-                lastBuildTime: buildTime,
-                error: undefined,
-            }));
-        }
-        catch (error) {
-            setState(prev => ({
-                ...prev,
-                status: 'error',
-                message: error instanceof Error ? error.message : String(error),
-                error: error instanceof Error ? error.message : String(error),
-            }));
-        }
-    }, [
-        projectRoot,
-        manifest,
-        devProperties,
-        signed,
-        deploy,
-        signingCredentials,
-        refreshVersion,
-    ]);
-    // In-house webpack path: copy static, zip, then sign + deploy.
-    const handleBuildComplete = React.useCallback(async (result) => {
-        if (!result.success) {
-            setState(prev => ({
-                ...prev,
-                status: 'error',
-                message: result.errors?.join('\n') || 'Build failed',
-                error: result.errors?.join('\n'),
-            }));
-            return;
-        }
-        try {
-            copyStaticToBuild(projectRoot);
-            const appId = getFullAppId(manifest.id);
-            await createBuildZip(projectRoot, appId);
-            await signAndDeploy(getZipPath(projectRoot, manifest), result.stats?.time);
-        }
-        catch (error) {
-            setState(prev => ({
-                ...prev,
-                status: 'error',
-                message: error instanceof Error ? error.message : String(error),
-                error: error instanceof Error ? error.message : String(error),
-            }));
-        }
-    }, [projectRoot, manifest, signAndDeploy]);
-    // Delegated path: full `sitevision-scripts build` then sign + deploy.
-    // Coalesces overlapping triggers so a save mid-build queues one rebuild.
-    const runDelegatedBuild = React.useCallback(async () => {
-        if (isBuildingRef.current) {
-            pendingRebuildRef.current = true;
-            return;
-        }
-        isBuildingRef.current = true;
-        const buildOnce = async () => {
-            pendingRebuildRef.current = false;
-            setState(prev => ({
-                ...prev,
-                status: 'building',
-                message: 'Building via sitevision-scripts...',
-            }));
-            const result = await runSitevisionScriptsBuild(projectRoot);
-            if (result.success) {
-                await signAndDeploy(getDelegatedZipPath(projectRoot, manifest.id));
-            }
-            else {
-                setState(prev => ({
-                    ...prev,
-                    status: 'error',
-                    message: result.error ?? 'Build failed',
-                    error: `${result.error}\n${result.output.slice(-1000)}`,
-                }));
-            }
-            if (pendingRebuildRef.current) {
-                await buildOnce();
-            }
-        };
-        try {
-            await buildOnce();
-        }
-        finally {
-            isBuildingRef.current = false;
-        }
-    }, [projectRoot, manifest, signAndDeploy]);
-    // Watch source files and trigger a delegated rebuild (debounced).
-    const startFileWatcher = React.useCallback(() => {
-        const targets = [
-            'src',
-            'static',
-            'i18n',
-            'resource',
-            'config',
-            'manifest.json',
-        ]
-            .map(name => path.join(projectRoot, name))
-            .filter(target => fs.existsSync(target));
-        for (const target of targets) {
-            const isDir = fs.statSync(target).isDirectory();
-            const watcher = fs.watch(target, { recursive: isDir }, () => {
-                if (debounceTimerRef.current) {
-                    clearTimeout(debounceTimerRef.current);
-                }
-                debounceTimerRef.current = setTimeout(() => {
-                    void runDelegatedBuild();
-                }, 300);
-            });
-            watchersRef.current.push(watcher);
-        }
-    }, [projectRoot, runDelegatedBuild]);
     React.useEffect(() => {
-        const isBundled = isBundledApp(manifest);
-        async function startWatch() {
-            try {
-                // Clean build directory
-                cleanBuild(projectRoot);
-                if (isBundled && !hasLocalWebpackConfig(projectRoot)) {
-                    // No local webpack config: delegate each build to
-                    // sitevision-scripts (full rebuild) and watch source files
-                    // ourselves, keeping the CLI's own sign + deploy flow.
-                    if (!hasSitevisionScripts(projectRoot)) {
-                        setState({
-                            status: 'error',
-                            message: 'No webpack.config.js found and @sitevision/sitevision-scripts is not installed. Run npm install.',
-                            buildCount: 0,
-                            webpackReady: false,
-                            error: 'No build pipeline available',
-                        });
-                        return;
-                    }
-                    const warning = checkSitevisionScriptsCompatibility(projectRoot).warning;
-                    setState(prev => ({ ...prev, webpackReady: true, warning }));
-                    startFileWatcher();
-                    await runDelegatedBuild();
-                }
-                else if (isBundled) {
-                    // Project ships its own webpack config: incremental in-process watch.
-                    if (!WebpackRunner.isWebpackAvailable(projectRoot)) {
-                        setState({
-                            status: 'error',
-                            message: 'webpack not found. Run npm install.',
-                            buildCount: 0,
-                            webpackReady: false,
-                            error: 'webpack not found',
-                        });
-                        return;
-                    }
-                    setState(prev => ({
-                        ...prev,
-                        status: 'building',
-                        message: 'Starting initial build...',
-                    }));
-                    const appType = getAppType(manifest);
-                    const runner = new WebpackRunner(projectRoot, {
-                        mode: 'development',
-                        watch: true,
-                        cssPrefix: manifest.id,
-                        restApp: appType === 'rest',
-                    });
-                    webpackRunnerRef.current = runner;
-                    await runner.watch(handleBuildComplete);
-                    setState(prev => ({
-                        ...prev,
-                        status: 'watching',
-                        message: 'Building...',
-                        webpackReady: true,
-                    }));
-                }
-                else {
-                    // Non-bundled app: just copy and deploy
-                    setState(prev => ({
-                        ...prev,
-                        status: 'building',
-                        message: 'Copying files...',
-                    }));
-                    await handleBuildComplete({
-                        success: true,
-                        stats: { time: 0, hash: '', assets: [] },
-                    });
-                }
-            }
-            catch (error) {
-                setState({
-                    status: 'error',
-                    message: error instanceof Error ? error.message : String(error),
-                    buildCount: 0,
-                    webpackReady: false,
-                    error: error instanceof Error ? error.message : String(error),
-                });
-            }
-        }
-        startWatch();
-        // Cleanup
-        return () => {
-            if (webpackRunnerRef.current) {
-                webpackRunnerRef.current.close().catch(() => { });
-            }
-            if (debounceTimerRef.current) {
-                clearTimeout(debounceTimerRef.current);
-            }
-            for (const watcher of watchersRef.current) {
-                watcher.close();
-            }
-            watchersRef.current = [];
-        };
-    }, [
-        projectRoot,
-        manifest,
-        handleBuildComplete,
-        runDelegatedBuild,
-        startFileWatcher,
-    ]);
-    // Handle Ctrl+C
-    React.useEffect(() => {
-        const handleExit = () => {
-            if (webpackRunnerRef.current) {
-                webpackRunnerRef.current.close().catch(() => { });
-            }
-            for (const watcher of watchersRef.current) {
-                watcher.close();
-            }
+        const stop = () => {
+            live.stop();
             exit();
         };
-        process.on('SIGINT', handleExit);
-        process.on('SIGTERM', handleExit);
+        process.on('SIGINT', stop);
+        process.on('SIGTERM', stop);
         return () => {
-            process.off('SIGINT', handleExit);
-            process.off('SIGTERM', handleExit);
+            process.off('SIGINT', stop);
+            process.off('SIGTERM', stop);
         };
-    }, [exit]);
-    const getStatusType = () => {
-        switch (state.status) {
-            case 'error':
-                return 'error';
-            case 'ready':
-                return 'success';
-            default:
-                return 'running';
-        }
-    };
-    const getStatusLabel = () => {
-        switch (state.status) {
-            case 'initializing':
-                return 'Initializing';
-            case 'watching':
-                return 'Watching';
-            case 'building':
-                return 'Building';
-            case 'signing':
-                return 'Signing';
-            case 'deploying':
-                return 'Deploying';
-            case 'ready':
-                return 'Ready';
-            case 'error':
-                return 'Error';
-        }
+    }, [live, exit]);
+    const status = live.status === 'running'
+        ? live.phase === 'error'
+            ? 'error'
+            : 'running'
+        : live.status === 'success'
+            ? 'success'
+            : 'error';
+    return (_jsxs(Box, { flexDirection: "column", padding: 1, children: [_jsx(StatusIndicator, { status: status, label: live.phase, message: `${live.label} ${live.appName}` }), _jsx(Box, { marginTop: 1, children: _jsx(Log, { task: live, height: (stdout.rows || 24) - 6, scroll: 0, wrap: true }) }), _jsx(Text, { dimColor: true, children: "Press q, Esc or Ctrl+C to stop" })] }));
+}
+/** Resolve signing credentials for signed dev/watch, prompting if needed. */
+export async function resolveSigningForCli(project) {
+    if (!project.hasSigningProperties ||
+        !project.devProperties?.signingUsername) {
+        console.log('\n\x1b[33mSigning credentials not configured.\x1b[0m');
+        console.log('Run \x1b[36msetup-signing\x1b[0m to configure credentials.\n');
+        return undefined;
+    }
+    const signingUsername = project.devProperties.signingUsername;
+    const password = await resolveSigningPassword(signingUsername);
+    if (!password) {
+        console.log('\x1b[31mError: Password is required for signed mode\x1b[0m');
+        return undefined;
+    }
+    return {
+        username: signingUsername,
+        password,
+        certificateName: project.devProperties.certificateName,
     };
-    return (_jsxs(Box, { flexDirection: "column", padding: 1, children: [_jsx(Box, { marginBottom: 1, children: _jsx(StatusIndicator, { status: getStatusType(), label: getStatusLabel(), message: state.message }) }), state.warning && (_jsx(Box, { marginBottom: 1, children: _jsxs(Text, { color: "yellow", children: ["\u26A0 ", state.warning] }) })), state.buildCount > 0 && (_jsx(Box, { marginLeft: 2, marginBottom: 1, children: _jsxs(Text, { dimColor: true, children: ["Builds: ", state.buildCount, state.lastBuildTime
-                            ? ` | Last build: ${state.lastBuildTime}ms`
-                            : '', signed ? ' | Signed mode' : ''] }) })), _jsx(Box, { marginLeft: 2, marginBottom: 1, children: _jsxs(Text, { dimColor: true, children: [localizedText(manifest.name), " v", version] }) }), deploy && devProperties && (_jsx(Box, { marginLeft: 2, marginBottom: 1, children: _jsxs(Text, { dimColor: true, children: ["Target: ", devProperties.domain, "/", devProperties.siteName, "/", devProperties.addonName] }) })), state.status === 'error' && state.error && (_jsx(Box, { flexDirection: "column", marginTop: 1, children: _jsx(Text, { color: "red", children: state.error }) })), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [state.status === 'error' && onRetryCredentials && (_jsx(Text, { dimColor: true, children: "Press r to retry with new credentials" })), onBack ? (_jsx(Text, { dimColor: true, children: "Press q or Esc to return to menu (Ctrl+C to stop process)" })) : (_jsx(Text, { dimColor: true, children: "Press Ctrl+C to stop" }))] })] }));
 }
 export const devCommand = {
     name: 'dev',
@@ -388,21 +75,22 @@ export const devCommand = {
         },
     },
     async execute({ project, flags }) {
-        // Check if dev properties are configured
-        if (!project.hasDevProperties || !project.devProperties) {
+        const dev = project.devProperties;
+        if (!project.hasDevProperties || !dev) {
             console.log('\n\x1b[33mDeployment credentials not configured.\x1b[0m');
             console.log('Create a .dev_properties.json file with domain, siteName, addonName, and username, then run setup.\n');
             return;
         }
-        // dev/watch continuously redeploy and only support basic auth. Fail clearly
-        // on an OAuth2/cookie config instead of prompting for an unusable password.
-        if ((project.devProperties.authMethod ?? 'basic') !== 'basic') {
-            console.log('\n\x1b[33mdev/watch support only basic auth. Use `svc deploy` for OAuth2/cookie.\x1b[0m\n');
+        // The standalone command only prompts for a basic password; OAuth2/cookie
+        // logins are interactive and live in the shell (`svc`) or `svc deploy`.
+        if ((dev.authMethod ?? 'basic') !== 'basic' &&
+            !dev.accessToken &&
+            !dev.sessionCookie) {
+            console.log('\n\x1b[33mNo token/cookie available. Run `svc` and use Dev from the shell, or set SITEVISION_ACCESS_TOKEN / SITEVISION_SESSION_COOKIE.\x1b[0m\n');
             return;
         }
-        // Resolve deploy password (already loaded from keychain/env in detectProject — prompt if missing)
-        if (!project.devProperties.password) {
-            const { domain, username } = project.devProperties;
+        if ((dev.authMethod ?? 'basic') === 'basic' && !dev.password) {
+            const { domain, username } = dev;
             console.log('');
             const pw = await promptPassword(`Deploy password for ${username}@${domain}: `);
             if (!pw) {
@@ -413,31 +101,28 @@ export const devCommand = {
             if (remember && domain && username) {
                 setDeployPassword(domain, username, pw);
             }
-            project.devProperties.password = pw;
+            dev.password = pw;
         }
-        const signed = Boolean(flags['signed']);
         let signingCredentials;
-        // If signed mode, resolve signing password (keychain → env → prompt)
-        if (signed) {
-            if (!project.hasSigningProperties ||
-                !project.devProperties.signingUsername) {
-                console.log('\n\x1b[33mSigning credentials not configured.\x1b[0m');
-                console.log('Run \x1b[36msetup-signing\x1b[0m to configure credentials.\n');
+        if (flags['signed']) {
+            signingCredentials = await resolveSigningForCli(project);
+            if (!signingCredentials)
                 return;
-            }
-            const signingUsername = project.devProperties.signingUsername;
-            const password = await resolveSigningPassword(signingUsername);
-            if (!password) {
-                console.log('\x1b[31mError: Password is required for signed mode\x1b[0m');
-                return;
-            }
-            signingCredentials = {
-                username: signingUsername,
-                password,
-                certificateName: project.devProperties.certificateName,
-            };
         }
-        const { waitUntilExit } = render(_jsx(DevScreen, { projectRoot: project.root, manifest: project.manifest, devProperties: project.devProperties, signed: signed, signingCredentials: signingCredentials }));
+        const { waitUntilExit } = render(_jsx(DevScreen, { project: project, options: {
+                deploy: true,
+                signingCredentials,
+                deployConfig: {
+                    domain: dev.domain,
+                    siteName: dev.siteName,
+                    addonName: dev.addonName,
+                    username: dev.username,
+                    password: dev.password,
+                    accessToken: dev.accessToken,
+                    sessionCookie: dev.sessionCookie,
+                    useHTTP: dev.useHTTPForDevDeploy,
+                },
+            } }));
         await waitUntilExit();
     },
 };

package/dist/commands/watch.js

@@ -1,7 +1,6 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { render } from 'ink';
-import { DevScreen } from './dev.js';
-import { resolveSigningPassword } from '../utils/signing-password.js';
+import { DevScreen, resolveSigningForCli } from './dev.js';
 export const watchCommand = {
     name: 'watch',
     description: 'Watch and rebuild (optionally signing) without deploying',
@@ -15,30 +14,13 @@ export const watchCommand = {
         },
     },
     async execute({ project, flags }) {
-        const signed = Boolean(flags['signed']);
         let signingCredentials;
-        // Signed mode: resolve signing credentials (keychain → env → prompt).
-        // No deploy credentials are needed — watch never deploys.
-        if (signed) {
-            if (!project.hasSigningProperties ||
-                !project.devProperties?.signingUsername) {
-                console.log('\n\x1b[33mSigning credentials not configured.\x1b[0m');
-                console.log('Run \x1b[36msetup-signing\x1b[0m to configure credentials.\n');
+        if (flags['signed']) {
+            signingCredentials = await resolveSigningForCli(project);
+            if (!signingCredentials)
                 return;
-            }
-            const signingUsername = project.devProperties.signingUsername;
-            const password = await resolveSigningPassword(signingUsername);
-            if (!password) {
-                console.log('\x1b[31mError: Password is required for signed mode\x1b[0m');
-                return;
-            }
-            signingCredentials = {
-                username: signingUsername,
-                password,
-                certificateName: project.devProperties.certificateName,
-            };
         }
-        const { waitUntilExit } = render(_jsx(DevScreen, { projectRoot: project.root, manifest: project.manifest, devProperties: project.devProperties, signed: signed, deploy: false, signingCredentials: signingCredentials }));
+        const { waitUntilExit } = render(_jsx(DevScreen, { project: project, options: { deploy: false, signingCredentials } }));
         await waitUntilExit();
     },
 };

package/dist/components/AuthLoginScreen.js

@@ -2,6 +2,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React from 'react';
 import { Box, Text, useInput } from 'ink';
 import Spinner from 'ink-spinner';
+import { t } from '../utils/i18n.js';
 import { beginOAuth2Login, openBrowser } from '../utils/oauth2-auth.js';
 import { beginCookieLogin, } from '../utils/session-cookie-auth.js';
 /**
@@ -83,5 +84,5 @@ export function AuthLoginScreen({ method, devProperties, onComplete, onError, on
             })();
         }
     });
-    return (_jsxs(Box, { flexDirection: "column", padding: 1, children: [_jsx(Box, { marginBottom: 1, children: _jsx(Text, { bold: true, color: "cyan", children: method === 'oauth2' ? 'OAuth2 login' : 'Session cookie login' }) }), method === 'oauth2' ? (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { children: [_jsx(Text, { color: "green", children: _jsx(Spinner, { type: "dots" }) }), _jsx(Text, { children: " Waiting for you to finish login in the browser\u2026" })] }), authUrl && (_jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsx(Text, { dimColor: true, children: "If the browser didn't open, visit:" }), _jsx(Text, { children: authUrl })] }))] })) : (_jsxs(Box, { flexDirection: "column", children: [phase === 'starting' && (_jsxs(Box, { children: [_jsx(Text, { color: "green", children: _jsx(Spinner, { type: "dots" }) }), _jsx(Text, { children: " Opening browser\u2026" })] })), phase === 'awaiting' && (_jsx(Text, { children: "Log in in the opened browser, then press Enter to capture the session." })), phase === 'capturing' && (_jsxs(Box, { children: [_jsx(Text, { color: "green", children: _jsx(Spinner, { type: "dots" }) }), _jsx(Text, { children: " Capturing session\u2026" })] })), note && (_jsx(Box, { marginTop: 1, children: _jsx(Text, { color: "yellow", children: note }) }))] })), _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: "Press Esc to cancel." }) })] }));
+    return (_jsxs(Box, { flexDirection: "column", padding: 1, children: [_jsx(Box, { marginBottom: 1, children: _jsx(Text, { bold: true, color: "cyan", children: method === 'oauth2' ? t('OAuth2 login') : t('Session cookie login') }) }), method === 'oauth2' ? (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { children: [_jsx(Text, { color: "green", children: _jsx(Spinner, { type: "dots" }) }), _jsxs(Text, { children: [" ", t('Waiting for you to finish login in the browser…')] })] }), authUrl && (_jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsx(Text, { dimColor: true, children: t("If the browser didn't open, visit:") }), _jsx(Text, { children: authUrl })] }))] })) : (_jsxs(Box, { flexDirection: "column", children: [phase === 'starting' && (_jsxs(Box, { children: [_jsx(Text, { color: "green", children: _jsx(Spinner, { type: "dots" }) }), _jsxs(Text, { children: [" ", t('Opening browser…')] })] })), phase === 'awaiting' && (_jsx(Text, { children: t('Log in in the opened browser, then press Enter to capture the session.') })), phase === 'capturing' && (_jsxs(Box, { children: [_jsx(Text, { color: "green", children: _jsx(Spinner, { type: "dots" }) }), _jsxs(Text, { children: [" ", t('Capturing session…')] })] })), note && (_jsx(Box, { marginTop: 1, children: _jsx(Text, { color: "yellow", children: note }) }))] })), _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: t('Press Esc to cancel.') }) })] }));
 }

package/dist/components/DevPropertiesForm.js

@@ -66,11 +66,14 @@ export function DevPropertiesForm({ projectRoot, initialProperties, packageJson,
             if (cancelled)
                 return;
             if (discovered) {
+                // Endpoints only — do NOT pre-fill scopes. `scopes_supported` is the
+                // provider's list, not what this client is granted (and casing may
+                // differ, e.g. advertised `all` vs client `ALL`), so requesting them
+                // causes `invalid_scope`. Empty scopes → the client's default scopes.
                 setOauth(previous => ({
                     ...previous,
                     authorizationEndpoint: previous.authorizationEndpoint || discovered.authorizationEndpoint,
                     tokenEndpoint: previous.tokenEndpoint || discovered.tokenEndpoint,
-                    scopes: previous.scopes || (discovered.scopesSupported?.join(' ') ?? ''),
                 }));
                 setDiscoveryNote('Endpoints auto-filled from the site OpenID config.');
             }
@@ -196,9 +199,9 @@ export function DevPropertiesForm({ projectRoot, initialProperties, packageJson,
             case 'oauthTokenEndpoint':
                 return (_jsx(TextInput, { label: "Token Endpoint URL", defaultValue: oauth.tokenEndpoint, onSubmit: value => submitOAuth('tokenEndpoint', value), onCancel: onCancel }, "oauthTokenEndpoint"));
             case 'oauthScopes':
-                return (_jsx(TextInput, { label: "Scopes (space-separated, optional)", defaultValue: oauth.scopes, onSubmit: value => submitOAuth('scopes', value), onCancel: onCancel }, "oauthScopes"));
+                return (_jsx(TextInput, { label: "Scopes (space-separated \u2014 leave empty to use the client's default scopes; add offline_access, matching your client's casing, for a refresh token)", defaultValue: oauth.scopes, onSubmit: value => submitOAuth('scopes', value), onCancel: onCancel }, "oauthScopes"));
             case 'oauthClientSecret':
-                return (_jsx(TextInput, { label: "Client Secret (OS keychain \u2014 leave empty for a public/PKCE client)", type: "password", defaultValue: oauth.clientSecret, onSubmit: value => submitOAuth('clientSecret', value), onCancel: onCancel }, "oauthClientSecret"));
+                return (_jsx(TextInput, { label: "Client Secret (OS keychain \u2014 required if your Sitevision client has a secret; leave empty only for a public client)", type: "password", defaultValue: oauth.clientSecret, onSubmit: value => submitOAuth('clientSecret', value), onCancel: onCancel }, "oauthClientSecret"));
             case 'sessionLoginUrl':
                 return (_jsx(TextInput, { label: "Login URL (opened in a browser; blank = site root)", defaultValue: properties.sessionLoginUrl ??
                         (properties.domain ? `https://${properties.domain}/` : ''), onSubmit: value => submitProperty('sessionLoginUrl', value), onCancel: onCancel }, "sessionLoginUrl"));

package/dist/components/PasswordInput.js

@@ -1,6 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useState } from 'react';
 import { Box, Text, useInput } from 'ink';
+import { t } from '../utils/i18n.js';
 export function PasswordInput({ label = 'Enter Signing Password', showRememberOption = false, defaultRemember = false, rememberLabel = 'Save to OS keychain: ', onSubmit, onCancel, }) {
     const [password, setPassword] = useState('');
     const [remember, setRemember] = useState(defaultRemember);
@@ -26,5 +27,5 @@ export function PasswordInput({ label = 'Enter Signing Password', showRememberOp
             setPassword(prev => prev + input);
         }
     });
-    return (_jsxs(Box, { flexDirection: "column", padding: 1, children: [_jsx(Box, { marginBottom: 1, children: _jsx(Text, { bold: true, color: "cyan", children: label }) }), _jsx(Box, { borderStyle: "round", borderColor: "cyan", paddingX: 1, children: _jsx(Text, { children: '*'.repeat(password.length) }) }), showRememberOption && (_jsxs(Box, { marginTop: 1, children: [_jsx(Text, { dimColor: true, children: rememberLabel }), _jsxs(Text, { color: remember ? 'green' : 'gray', children: ["[", remember ? 'x' : ' ', "]"] }), _jsx(Text, { dimColor: true, children: " (Tab to toggle)" })] })), _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: "Press Enter to submit, Esc to cancel" }) })] }));
+    return (_jsxs(Box, { flexDirection: "column", padding: 1, children: [_jsx(Box, { marginBottom: 1, children: _jsx(Text, { bold: true, color: "cyan", children: label }) }), _jsx(Box, { borderStyle: "round", borderColor: "cyan", paddingX: 1, children: _jsx(Text, { children: '*'.repeat(password.length) }) }), showRememberOption && (_jsxs(Box, { marginTop: 1, children: [_jsx(Text, { dimColor: true, children: rememberLabel }), _jsxs(Text, { color: remember ? 'green' : 'gray', children: ["[", remember ? 'x' : ' ', "]"] }), _jsxs(Text, { dimColor: true, children: [" ", t('(Tab to toggle)')] })] })), _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: t('Press Enter to submit, Esc to cancel') }) })] }));
 }

package/dist/shell/AddonPicker.d.ts

@@ -0,0 +1,14 @@
+import type { SimpleAppType } from '../types/index.js';
+import { type AddonNode } from '../utils/sitevision-api.js';
+export declare function AddonPicker({ domain, appType, initialQuery, load, onSelect, onClose, height, }: {
+    domain: string;
+    appType?: SimpleAppType;
+    initialQuery: string;
+    load: () => Promise<{
+        addons?: AddonNode[];
+        error?: string;
+    }>;
+    onSelect: (name: string) => void;
+    onClose: () => void;
+    height: number;
+}): import("react").JSX.Element;