sitevision-cli 1.0.0-beta.3 → 1.0.0-beta.30

package/dist/components/DevPropertiesForm.d.ts

@@ -3,8 +3,9 @@ interface Props {
     projectRoot: string;
     initialProperties?: DevProperties;
     packageJson: PackageJson;
+    authOnly?: boolean;
     onComplete: () => void;
     onCancel: () => void;
 }
-export declare function DevPropertiesForm({ projectRoot, initialProperties, packageJson, onComplete, onCancel, }: Props): import("react").JSX.Element;
+export declare function DevPropertiesForm({ projectRoot, initialProperties, packageJson, authOnly, onComplete, onCancel, }: Props): import("react").JSX.Element;
 export {};

package/dist/components/DevPropertiesForm.js

@@ -1,67 +1,232 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useState } from 'react';
+import { useState, useEffect } from 'react';
 import { Box, Text, useInput } from 'ink';
 import { TextInput } from './TextInput.js';
 import { writeDevProperties } from '../utils/project-detection.js';
-import { setDeployPassword, deleteDeployPassword } from '../utils/keychain.js';
-const STEPS = [
-    { id: 'domain', label: 'Domain' },
-    { id: 'siteName', label: 'Site Name' },
-    { id: 'addonName', label: 'Addon Name' },
-    { id: 'username', label: 'Username' },
-    { id: 'password', label: 'Password' },
-    { id: 'useHTTP', label: 'Use HTTP' },
+import { setDeployPassword, deleteDeployPassword, setOAuth2ClientSecret, } from '../utils/keychain.js';
+import { DEFAULT_REDIRECT_PORT, discoverOAuth2Config, } from '../utils/oauth2-auth.js';
+const LABELS = {
+    domain: 'Domain',
+    siteName: 'Site Name',
+    addonName: 'Addon Name',
+    username: 'Username',
+    authMethod: 'Auth Method',
+    password: 'Password',
+    oauthClientId: 'Client ID',
+    oauthAuthEndpoint: 'Authorization Endpoint',
+    oauthTokenEndpoint: 'Token Endpoint',
+    oauthScopes: 'Scopes',
+    oauthClientSecret: 'Client Secret',
+    sessionLoginUrl: 'Login URL',
+    useHTTP: 'Use HTTP',
+};
+const AUTH_METHODS = [
+    { value: 'basic', label: 'Basic auth (username + password)' },
+    { value: 'oauth2', label: 'OAuth2 bearer token (PKCE)' },
+    { value: 'cookie', label: 'Session cookie (SAML / SSO login)' },
 ];
-export function DevPropertiesForm({ projectRoot, initialProperties, packageJson, onComplete, onCancel, }) {
+function parseScopes(raw) {
+    const scopes = raw
+        .split(/[\s,]+/)
+        .map(s => s.trim())
+        .filter(Boolean);
+    return scopes.length > 0 ? scopes : undefined;
+}
+export function DevPropertiesForm({ projectRoot, initialProperties, packageJson, authOnly, onComplete, onCancel, }) {
     const [stepIndex, setStepIndex] = useState(0);
     const [properties, setProperties] = useState(() => {
         const defaults = {
             domain: packageJson.developmentDomain || '',
             addonName: packageJson.addonName || '',
             siteName: packageJson.siteName || '',
+            authMethod: 'basic',
         };
         return { ...defaults, ...initialProperties };
     });
-    const currentStep = STEPS[stepIndex];
-    const handleNext = (key, value) => {
-        const newProperties = { ...properties, [key]: value };
-        setProperties(newProperties);
-        if (stepIndex < STEPS.length - 1) {
+    const [oauth, setOauth] = useState(() => ({
+        authorizationEndpoint: initialProperties?.oauth2?.authorizationEndpoint ?? '',
+        tokenEndpoint: initialProperties?.oauth2?.tokenEndpoint ?? '',
+        clientId: initialProperties?.oauth2?.clientId ?? '',
+        scopes: initialProperties?.oauth2?.scopes?.join(' ') ?? '',
+        clientSecret: '',
+    }));
+    const [discoveryNote, setDiscoveryNote] = useState('');
+    const method = properties.authMethod ?? 'basic';
+    const isOAuth = method === 'oauth2';
+    // When OAuth2 is chosen, auto-fill the endpoints from the site's OpenID
+    // configuration (unauthenticated) so the user doesn't type them in.
+    useEffect(() => {
+        if (method !== 'oauth2' || !properties.domain)
+            return;
+        if (oauth.authorizationEndpoint && oauth.tokenEndpoint)
+            return;
+        let cancelled = false;
+        setDiscoveryNote('Looking up OAuth2 endpoints…');
+        void discoverOAuth2Config(properties.domain, properties.useHTTPForDevDeploy).then(discovered => {
+            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,
+                }));
+                setDiscoveryNote('Endpoints auto-filled from the site OpenID config.');
+            }
+            else {
+                setDiscoveryNote('Could not auto-discover endpoints — enter them below.');
+            }
+        });
+        return () => {
+            cancelled = true;
+        };
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [method, properties.domain]);
+    const methodSteps = method === 'oauth2'
+        ? [
+            'oauthClientId',
+            'oauthAuthEndpoint',
+            'oauthTokenEndpoint',
+            'oauthScopes',
+            'oauthClientSecret',
+        ]
+        : method === 'cookie'
+            ? ['sessionLoginUrl']
+            : ['password'];
+    const steps = authOnly
+        ? ['authMethod', ...methodSteps]
+        : [
+            'domain',
+            'siteName',
+            'addonName',
+            'username',
+            'authMethod',
+            ...methodSteps,
+            'useHTTP',
+        ];
+    const currentStep = steps[stepIndex];
+    const redirectPort = initialProperties?.oauth2?.redirectPort ?? DEFAULT_REDIRECT_PORT;
+    const advance = () => {
+        if (stepIndex < steps.length - 1) {
             setStepIndex(stepIndex + 1);
         }
-        else {
-            const finalProperties = newProperties;
-            const { password, domain, username } = finalProperties;
-            if (password && domain && username) {
-                setDeployPassword(domain, username, password);
+    };
+    const finalize = (props, fields) => {
+        const authMethod = props.authMethod ?? 'basic';
+        const domain = props.domain ?? '';
+        const username = props.username ?? '';
+        const finalProps = {
+            domain,
+            siteName: props.siteName ?? '',
+            addonName: props.addonName ?? '',
+            username,
+            authMethod,
+            useHTTPForDevDeploy: props.useHTTPForDevDeploy ?? false,
+        };
+        if (authMethod === 'oauth2') {
+            finalProps.oauth2 = {
+                authorizationEndpoint: fields.authorizationEndpoint,
+                tokenEndpoint: fields.tokenEndpoint,
+                clientId: fields.clientId,
+                scopes: parseScopes(fields.scopes),
+                ...(initialProperties?.oauth2?.redirectPort && {
+                    redirectPort: initialProperties.oauth2.redirectPort,
+                }),
+            };
+            if (fields.clientSecret && domain && fields.clientId) {
+                setOAuth2ClientSecret(domain, fields.clientId, fields.clientSecret);
             }
-            else if (domain && username) {
-                // Empty password — clear any stale keychain entry so deploy falls through to prompt
-                deleteDeployPassword(domain, username);
+        }
+        else if (authMethod === 'cookie') {
+            if (props.sessionLoginUrl) {
+                finalProps.sessionLoginUrl = props.sessionLoginUrl;
             }
-            writeDevProperties(projectRoot, finalProperties);
-            onComplete();
+        }
+        else if (props.password && domain && username) {
+            setDeployPassword(domain, username, props.password);
+        }
+        else if (domain && username) {
+            // Empty password — clear any stale keychain entry so deploy prompts.
+            deleteDeployPassword(domain, username);
+        }
+        writeDevProperties(projectRoot, finalProps);
+        onComplete();
+    };
+    // Update a top-level DevProperties field, then advance or finalize.
+    const submitProperty = (key, value) => {
+        const next = { ...properties, [key]: value };
+        setProperties(next);
+        if (steps[stepIndex] === steps[steps.length - 1]) {
+            finalize(next, oauth);
+        }
+        else {
+            advance();
+        }
+    };
+    // Update an OAuth field, then advance or finalize.
+    const submitOAuth = (key, value) => {
+        const next = { ...oauth, [key]: value };
+        setOauth(next);
+        if (steps[stepIndex] === steps[steps.length - 1]) {
+            finalize(properties, next);
+        }
+        else {
+            advance();
         }
     };
     const renderInput = () => {
-        switch (currentStep?.id) {
+        switch (currentStep) {
             case 'domain':
-                return (_jsx(TextInput, { label: "Development Domain (e.g. www.sitevision.se)", defaultValue: properties.domain, placeholder: "sitevision.se", onSubmit: (value) => handleNext('domain', value), onCancel: onCancel }, "domain"));
+                return (_jsx(TextInput, { label: "Development Domain (e.g. www.sitevision.se)", defaultValue: properties.domain, placeholder: "sitevision.se", onSubmit: value => submitProperty('domain', value), onCancel: onCancel }, "domain"));
             case 'siteName':
-                return (_jsx(TextInput, { label: "Site Name (Root node name)", defaultValue: properties.siteName, onSubmit: (value) => handleNext('siteName', value), onCancel: onCancel }, "siteName"));
+                return (_jsx(TextInput, { label: "Site Name (Root node name)", defaultValue: properties.siteName, onSubmit: value => submitProperty('siteName', value), onCancel: onCancel }, "siteName"));
             case 'addonName':
-                return (_jsx(TextInput, { label: "Addon Name", defaultValue: properties.addonName, onSubmit: (value) => handleNext('addonName', value), onCancel: onCancel }, "addonName"));
+                return (_jsx(TextInput, { label: "Addon Name", defaultValue: properties.addonName, onSubmit: value => submitProperty('addonName', value), onCancel: onCancel }, "addonName"));
             case 'username':
-                return (_jsx(TextInput, { label: "Username (usually your Sitevision Cloud email)", defaultValue: properties.username, onSubmit: (value) => handleNext('username', value), onCancel: onCancel }, "username"));
+                return (_jsx(TextInput, { label: "Username (usually your Sitevision Cloud email)", defaultValue: properties.username, onSubmit: value => submitProperty('username', value), onCancel: onCancel }, "username"));
+            case 'authMethod':
+                return (_jsx(MethodSelect, { defaultValue: method, onSubmit: value => submitProperty('authMethod', value) }, "authMethod"));
             case 'password':
-                return (_jsx(TextInput, { label: "Password (saved in OS keychain \u2014 leave empty to prompt on each run)", type: "password", defaultValue: properties.password, onSubmit: (value) => handleNext('password', value), onCancel: onCancel }, "password"));
+                return (_jsx(TextInput, { label: "Password (saved in OS keychain \u2014 leave empty to prompt on each run)", type: "password", defaultValue: properties.password, onSubmit: value => submitProperty('password', value), onCancel: onCancel }, "password"));
+            case 'oauthClientId':
+                return (_jsx(TextInput, { label: "OAuth2 Client ID", defaultValue: oauth.clientId, onSubmit: value => submitOAuth('clientId', value), onCancel: onCancel }, "oauthClientId"));
+            case 'oauthAuthEndpoint':
+                return (_jsx(TextInput, { label: "Authorization Endpoint URL", defaultValue: oauth.authorizationEndpoint, onSubmit: value => submitOAuth('authorizationEndpoint', value), onCancel: onCancel }, "oauthAuthEndpoint"));
+            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 \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 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"));
             case 'useHTTP':
-                return (_jsx(BooleanInput, { label: "Use HTTP for deployment? (y/n)", defaultValue: properties.useHTTPForDevDeploy ?? false, onSubmit: (value) => handleNext('useHTTPForDevDeploy', value) }, "useHTTP"));
+                return (_jsx(BooleanInput, { label: "Use HTTP for deployment? (y/n)", defaultValue: properties.useHTTPForDevDeploy ?? false, onSubmit: value => submitProperty('useHTTPForDevDeploy', value) }, "useHTTP"));
             default:
                 return null;
         }
     };
-    return (_jsxs(Box, { flexDirection: "column", padding: 1, children: [_jsxs(Box, { marginBottom: 1, children: [_jsx(Text, { bold: true, color: "cyan", children: "Setup Development Properties" }), _jsxs(Text, { children: [' ', "Step ", stepIndex + 1, " of ", STEPS.length, ": ", currentStep?.label] })] }), _jsx(Box, { marginBottom: 1, children: STEPS.map((s, i) => (_jsx(Box, { marginRight: 1, children: _jsx(Text, { color: i === stepIndex ? 'green' : i < stepIndex ? 'green' : 'gray', children: i < stepIndex ? '✓' : i === stepIndex ? '●' : '○' }) }, s.id))) }), _jsx(Box, { borderStyle: "single", borderColor: "gray", padding: 1, children: renderInput() })] }));
+    return (_jsxs(Box, { flexDirection: "column", padding: 1, children: [_jsxs(Box, { marginBottom: 1, children: [_jsx(Text, { bold: true, color: "cyan", children: "Setup Development Properties" }), _jsxs(Text, { children: [' ', "Step ", stepIndex + 1, " of ", steps.length, ":", ' ', currentStep ? LABELS[currentStep] : ''] })] }), isOAuth && (_jsxs(Box, { marginBottom: 1, flexDirection: "column", children: [_jsxs(Text, { dimColor: true, children: ["Whitelist this redirect URI on the OAuth2 client: http://127.0.0.1:", redirectPort, "/callback"] }), discoveryNote && _jsx(Text, { color: "yellow", children: discoveryNote })] })), _jsx(Box, { marginBottom: 1, children: steps.map((s, i) => (_jsx(Box, { marginRight: 1, children: _jsx(Text, { color: i <= stepIndex ? 'green' : 'gray', children: i < stepIndex ? '✓' : i === stepIndex ? '●' : '○' }) }, s))) }), _jsx(Box, { borderStyle: "single", borderColor: "gray", padding: 1, children: renderInput() })] }));
+}
+function MethodSelect({ defaultValue, onSubmit, }) {
+    const [index, setIndex] = useState(() => Math.max(0, AUTH_METHODS.findIndex(m => m.value === defaultValue)));
+    useInput((_input, key) => {
+        if (key.upArrow) {
+            setIndex(p => (p === 0 ? AUTH_METHODS.length - 1 : p - 1));
+        }
+        else if (key.downArrow) {
+            setIndex(p => (p === AUTH_METHODS.length - 1 ? 0 : p + 1));
+        }
+        else if (key.return) {
+            onSubmit(AUTH_METHODS[index].value);
+        }
+    });
+    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Box, { marginBottom: 1, children: _jsx(Text, { bold: true, color: "cyan", children: "Authentication method" }) }), AUTH_METHODS.map((m, i) => (_jsxs(Text, { color: i === index ? 'green' : undefined, children: [i === index ? '❯ ' : '  ', m.label] }, m.value))), _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: "\u2191/\u2193 to move, Enter to select" }) })] }));
 }
 function BooleanInput({ label, defaultValue, onSubmit, }) {
     useInput(input => {

package/dist/components/MainMenu.js

@@ -51,6 +51,11 @@ export function MainMenu({ project, onSelect }) {
             value: 'deploy-production',
             description: 'Deploy to production server',
         },
+        {
+            label: '🔑 Auth Method',
+            value: 'change-auth',
+            description: 'Change the deploy authentication method',
+        },
         {
             label: 'ℹ️  Info',
             value: 'info',

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/components/SetupFlow.d.ts

@@ -1,7 +1,8 @@
 import { type ProjectInfo } from '../utils/project-detection.js';
 interface Props {
     project: ProjectInfo;
+    onReload: () => void;
     onComplete: () => void;
 }
-export declare function SetupFlow({ project, onComplete }: Props): import("react").JSX.Element | null;
+export declare function SetupFlow({ project, onReload, onComplete }: Props): import("react").JSX.Element | null;
 export {};

package/dist/components/SetupFlow.js

@@ -1,16 +1,21 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { useState, useEffect } from 'react';
 import { Box, Text, useInput } from 'ink';
-import { getAppType, localizedText, migrateLegacyPassword, } from '../utils/project-detection.js';
+import { getAppType, localizedText, migrateLegacyPassword, getPackageJsonSyncChanges, syncDevPropertiesToPackageJson, readSvcConfig, writeSvcConfig, writeDevProperties, } from '../utils/project-detection.js';
 import { ProcessRunner } from '../utils/process-runner.js';
 import { ProcessOutputComponent } from './ProcessOutput.js';
 import { StatusIndicator } from './StatusIndicator.js';
 import { DevPropertiesForm } from './DevPropertiesForm.js';
 import { SigningPropertiesForm } from './SigningPropertiesForm.js';
-export function SetupFlow({ project, onComplete }) {
+export function SetupFlow({ project, onReload, onComplete }) {
     const [step, setStep] = useState('check-node-modules');
     const [runner, setRunner] = useState(null);
     const [commandStatus, setCommandStatus] = useState('running');
+    const [syncChanges, setSyncChanges] = useState([]);
+    const [syncDecision, setSyncDecision] = useState(false);
+    // Set when the user picks OAuth2 for an existing config, so the form opens in
+    // the OAuth2 branch without mutating the shared project object.
+    const [pendingAuthMethod, setPendingAuthMethod] = useState(undefined);
     const appType = getAppType(project.manifest);
     // Auto-advance through checks
     useEffect(() => {
@@ -27,14 +32,36 @@ export function SetupFlow({ project, onComplete }) {
                 if (project.hasLegacyPassword) {
                     setStep('confirm-password-migration');
                 }
+                else if (project.devProperties?.authMethod === undefined) {
+                    setStep('confirm-auth-method');
+                }
                 else {
-                    setStep('check-signing-properties');
+                    setStep('check-package-sync');
                 }
             }
             else {
                 setStep('confirm-dev-setup');
             }
         }
+        else if (step === 'check-package-sync') {
+            const preference = readSvcConfig(project.root).syncPackageJson;
+            const properties = project.devProperties;
+            const changes = preference !== false && properties
+                ? getPackageJsonSyncChanges(project.root, properties)
+                : [];
+            if (changes.length === 0 || !properties) {
+                setStep('check-signing-properties');
+            }
+            else if (preference === true) {
+                syncDevPropertiesToPackageJson(project.root, properties);
+                onReload();
+                setStep('check-signing-properties');
+            }
+            else {
+                setSyncChanges(changes);
+                setStep('confirm-package-sync');
+            }
+        }
         else if (step === 'check-signing-properties') {
             if (project.hasSigningProperties) {
                 setStep('show-info');
@@ -84,6 +111,29 @@ export function SetupFlow({ project, onComplete }) {
         else if (step === 'confirm-password-migration') {
             if (input === 'y' || input === 'Y') {
                 migrateLegacyPassword(project);
+                // The file was rewritten (plaintext stripped, password moved to
+                // keychain) — re-detect so hasLegacyPassword/password reflect that.
+                onReload();
+                setStep('check-package-sync');
+            }
+            else if (input === 'n' || input === 'N') {
+                setStep('check-package-sync');
+            }
+        }
+        else if (step === 'confirm-package-sync') {
+            if (['y', 'Y', 'n', 'N'].includes(input)) {
+                const accepted = input.toLowerCase() === 'y';
+                if (accepted && project.devProperties) {
+                    syncDevPropertiesToPackageJson(project.root, project.devProperties);
+                    onReload();
+                }
+                setSyncDecision(accepted);
+                setStep('confirm-save-sync-choice');
+            }
+        }
+        else if (step === 'confirm-save-sync-choice') {
+            if (input === 'y' || input === 'Y') {
+                writeSvcConfig(project.root, { syncPackageJson: syncDecision });
                 setStep('check-signing-properties');
             }
             else if (input === 'n' || input === 'N') {
@@ -98,21 +148,46 @@ export function SetupFlow({ project, onComplete }) {
                 setStep('show-info');
             }
         }
+        else if (step === 'confirm-auth-method') {
+            if (input === 'o' || input === 'O') {
+                // Choosing OAuth2 needs endpoints — collect them in the full form.
+                setPendingAuthMethod('oauth2');
+                setStep('setup-dev-properties');
+            }
+            else if (input === 'c' || input === 'C') {
+                setPendingAuthMethod('cookie');
+                setStep('setup-dev-properties');
+            }
+            else if (['b', 'B', '\r'].includes(input)) {
+                if (project.devProperties) {
+                    writeDevProperties(project.root, {
+                        ...project.devProperties,
+                        authMethod: 'basic',
+                    });
+                    onReload();
+                }
+                setStep('check-package-sync');
+            }
+        }
     });
     // Setup Dev Properties Form
     if (step === 'setup-dev-properties') {
-        return (_jsx(DevPropertiesForm, { projectRoot: project.root, initialProperties: project.devProperties, packageJson: project.packageJson, onComplete: () => {
-                // Manually update project state locally if possible, or just proceed
-                // Since we can't easily update 'project' prop from here without reloading,
-                // we just move to next step. The file is written.
-                project.hasDevProperties = true; // Optimization/Hack to pass check
-                setStep('check-signing-properties');
+        return (_jsx(DevPropertiesForm, { projectRoot: project.root, initialProperties: pendingAuthMethod && project.devProperties
+                ? { ...project.devProperties, authMethod: pendingAuthMethod }
+                : project.devProperties, packageJson: project.packageJson, onComplete: () => {
+                // Re-detect from disk/keychain so devProperties (incl. the keychain
+                // password) populate in memory — otherwise the rest of this flow and
+                // the menu would see stale state until the CLI is restarted.
+                onReload();
+                setStep('check-package-sync');
             }, onCancel: () => setStep('check-signing-properties') }));
     }
     // Setup Signing Properties Form
     if (step === 'setup-signing-properties') {
         return (_jsx(SigningPropertiesForm, { projectRoot: project.root, onComplete: () => {
-                project.hasSigningProperties = true; // Optimization/Hack
+                // Re-detect so signing credentials are reflected in memory before
+                // the info screen / menu render.
+                onReload();
                 setStep('show-info');
             }, onCancel: () => setStep('show-info') }));
     }
@@ -132,6 +207,20 @@ export function SetupFlow({ project, onComplete }) {
     if (step === 'confirm-password-migration') {
         return (_jsxs(Box, { flexDirection: "column", padding: 1, children: [_jsx(Box, { marginBottom: 1, children: _jsx(Text, { bold: true, color: "cyan", children: "Sitevision CLI" }) }), _jsx(Box, { marginBottom: 1, children: _jsx(Text, { color: "yellow", children: "\u26A0 Plaintext password found in .dev_properties.json" }) }), _jsxs(Box, { marginBottom: 1, flexDirection: "column", children: [_jsx(Text, { children: "Move it to the OS keychain and remove it from the file? (y/n)" }), _jsx(Text, { dimColor: true, children: "Recommended \u2014 storing passwords in project files is insecure." })] })] }));
     }
+    // Ask which auth method an existing config should use (setting is missing)
+    if (step === 'confirm-auth-method') {
+        return (_jsxs(Box, { flexDirection: "column", padding: 1, children: [_jsx(Box, { marginBottom: 1, children: _jsx(Text, { bold: true, color: "cyan", children: "Sitevision CLI" }) }), _jsx(Box, { marginBottom: 1, children: _jsx(Text, { color: "yellow", children: "\u26A0 Deploy authentication method not set" }) }), _jsxs(Box, { marginBottom: 1, flexDirection: "column", children: [_jsx(Text, { children: "Which method should deploys use? [B]asic / [O]Auth2 / [C]ookie" }), _jsx(Text, { dimColor: true, children: "B = Basic (default), O = OAuth2 bearer, C = session cookie (SSO)." })] })] }));
+    }
+    // Confirm package.json sync
+    if (step === 'confirm-package-sync') {
+        return (_jsxs(Box, { flexDirection: "column", padding: 1, children: [_jsx(Box, { marginBottom: 1, children: _jsx(Text, { bold: true, color: "cyan", children: "Sitevision CLI" }) }), _jsx(Box, { marginBottom: 1, children: _jsx(Text, { color: "yellow", children: "\u26A0 package.json is out of sync with .dev_properties.json" }) }), _jsx(Box, { marginBottom: 1, flexDirection: "column", marginLeft: 2, children: syncChanges.map(change => (_jsxs(Box, { children: [_jsx(Text, { color: change.from === undefined ? 'green' : 'yellow', children: change.from === undefined ? '+ ' : '~ ' }), _jsxs(Text, { bold: true, children: [change.key, ": "] }), change.from !== undefined && (_jsxs(Text, { dimColor: true, children: [change.from, " \u2192 "] })), _jsx(Text, { children: change.to })] }, change.key))) }), _jsxs(Box, { marginBottom: 1, flexDirection: "column", children: [_jsx(Text, { children: "Update package.json from .dev_properties.json? (y/n)" }), _jsx(Text, { dimColor: true, children: "sitevision-scripts reads these fields from package.json." })] })] }));
+    }
+    // Offer to persist the sync decision in .svcconfig
+    if (step === 'confirm-save-sync-choice') {
+        return (_jsxs(Box, { flexDirection: "column", padding: 1, children: [_jsx(Box, { marginBottom: 1, children: _jsx(Text, { bold: true, color: "cyan", children: "Sitevision CLI" }) }), _jsxs(Box, { marginBottom: 1, flexDirection: "column", children: [_jsx(Text, { children: "Remember this choice in .svcconfig? (y/n)" }), _jsx(Text, { dimColor: true, children: syncDecision
+                                ? 'svc will update package.json automatically from now on.'
+                                : 'svc will stop asking about package.json sync.' })] })] }));
+    }
     // Confirm signing setup
     if (step === 'confirm-signing-setup') {
         return (_jsxs(Box, { flexDirection: "column", padding: 1, children: [_jsx(Box, { marginBottom: 1, children: _jsx(Text, { bold: true, color: "cyan", children: "Sitevision CLI" }) }), _jsx(Box, { marginBottom: 1, children: _jsx(Text, { color: "yellow", children: "\u26A0 signing credentials not configured" }) }), _jsx(Box, { marginBottom: 1, children: _jsx(Text, { children: "Signing credentials are required for signing apps on developer.sitevision.se" }) }), _jsx(Box, { marginBottom: 1, children: _jsx(Text, { children: "Would you like to set up signing credentials? (y/n)" }) })] }));

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;

package/dist/shell/AddonPicker.js

@@ -0,0 +1,54 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useEffect, useState } from 'react';
+import { Box, Text, useInput } from 'ink';
+import Spinner from 'ink-spinner';
+import { ACCENT } from './Frame.js';
+import { fuzzyMatch } from './actions.js';
+import { t } from '../utils/i18n.js';
+export function AddonPicker({ domain, appType, initialQuery, load, onSelect, onClose, height, }) {
+    const [query, setQuery] = useState(initialQuery);
+    const [index, setIndex] = useState(0);
+    const [addons, setAddons] = useState(null);
+    const [error, setError] = useState('');
+    useEffect(() => {
+        void load().then(result => {
+            setAddons(result.addons ?? []);
+            setError(result.error ?? '');
+        });
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
+    const matches = (addons ?? [])
+        .filter(a => fuzzyMatch(query, a.name))
+        .toSorted((a, b) => Number(b.appType === appType) - Number(a.appType === appType) ||
+        a.name.localeCompare(b.name));
+    useInput((input, key) => {
+        if (key.escape) {
+            onClose();
+        }
+        else if (key.return) {
+            const pick = matches[index];
+            if (pick)
+                onSelect(pick.name);
+        }
+        else if (key.upArrow) {
+            setIndex(i => (i > 0 ? i - 1 : Math.max(0, matches.length - 1)));
+        }
+        else if (key.downArrow) {
+            setIndex(i => (i < matches.length - 1 ? i + 1 : 0));
+        }
+        else if (key.backspace || key.delete) {
+            setQuery(q => q.slice(0, -1));
+            setIndex(0);
+        }
+        else if (input && !key.ctrl && !key.meta) {
+            setQuery(q => q + input);
+            setIndex(0);
+        }
+    });
+    const visible = Math.max(3, height - 6);
+    const start = Math.max(0, Math.min(index - visible + 1, matches.length - visible));
+    return (_jsxs(Box, { flexDirection: "column", paddingX: 1, children: [_jsxs(Text, { children: [_jsx(Text, { bold: true, children: t('Addon Repository') }), _jsxs(Text, { dimColor: true, children: [" ", domain] })] }), _jsxs(Text, { children: [_jsx(Text, { color: ACCENT, children: "\u276F " }), query, _jsx(Text, { inverse: true, children: " " }), _jsxs(Text, { dimColor: true, children: ['  ', addons ? t('{n} of {m}', { n: matches.length, m: addons.length }) : ''] })] }), !addons && !error && (_jsxs(Text, { color: ACCENT, children: [_jsx(Spinner, { type: "dots" }), " ", _jsx(Text, { dimColor: true, children: t('fetching addons') })] })), error && _jsx(Text, { color: "red", children: error }), matches.slice(start, start + visible).map((a, i) => {
+                const selected = start + i === index;
+                return (_jsxs(Box, { justifyContent: "space-between", children: [_jsx(Box, { flexShrink: 1, marginRight: 1, children: _jsxs(Text, { backgroundColor: selected ? ACCENT : undefined, color: selected ? 'black' : undefined, wrap: "truncate", children: ['  ', a.name] }) }), _jsx(Box, { flexShrink: 0, children: _jsx(Text, { dimColor: true, children: a.appType ?? a.type }) })] }, a.id));
+            }), _jsx(Text, { dimColor: true, children: t('↑↓ move · Enter select · Esc cancel') })] }));
+}

package/dist/shell/Changelog.d.ts

@@ -0,0 +1,10 @@
+/**
+ * CHANGELOG.md without its title, or undefined when it isn't shipped. With
+ * `since`, only the releases above that version's heading.
+ */
+export declare function readChangelog(since?: string): string[] | undefined;
+export declare function ChangelogPanel({ since, height, onClose, }: {
+    since?: string;
+    height: number;
+    onClose: () => void;
+}): import("react").JSX.Element;

package/dist/shell/Changelog.js

@@ -0,0 +1,44 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { readFileSync } from 'node:fs';
+import { useMemo, useState } from 'react';
+import { Box, Text, useInput } from 'ink';
+import { t } from '../utils/i18n.js';
+import { ACCENT } from './Frame.js';
+/**
+ * CHANGELOG.md without its title, or undefined when it isn't shipped. With
+ * `since`, only the releases above that version's heading.
+ */
+export function readChangelog(since) {
+    try {
+        const lines = readFileSync(new URL('../../CHANGELOG.md', import.meta.url), 'utf8')
+            .replace(/^# .*\n/, '')
+            .trim()
+            .split('\n');
+        const end = since ? lines.indexOf(`## ${since}`) : -1;
+        return end > 0 ? lines.slice(0, end) : lines;
+    }
+    catch {
+        return undefined;
+    }
+}
+export function ChangelogPanel({ since, height, onClose, }) {
+    const lines = useMemo(() => readChangelog(since), [since]);
+    const [top, setTop] = useState(0);
+    const visible = Math.max(1, height - 1);
+    const max = Math.max(0, (lines?.length ?? 0) - visible);
+    useInput((input, key) => {
+        if (key.escape || key.return || input === 'q')
+            onClose();
+        else if (key.upArrow)
+            setTop(n => Math.max(0, n - 1));
+        else if (key.downArrow)
+            setTop(n => Math.min(max, n + 1));
+        else if (key.pageUp)
+            setTop(n => Math.max(0, n - visible));
+        else if (key.pageDown)
+            setTop(n => Math.min(max, n + visible));
+    });
+    return (_jsxs(Box, { flexDirection: "column", paddingX: 1, children: [_jsxs(Text, { children: [_jsx(Text, { bold: true, children: since
+                            ? t("What's new since {version}", { version: since })
+                            : t('Changelog') }), _jsxs(Text, { dimColor: true, children: [" \u00B7 ", t('↑↓ scroll · Esc close')] })] }), lines ? (lines.slice(top, top + visible).map((line, i) => line.startsWith('## ') ? (_jsx(Text, { bold: true, color: ACCENT, children: line.slice(3) }, top + i)) : (_jsx(Text, { wrap: "truncate", children: line || ' ' }, top + i)))) : (_jsx(Text, { dimColor: true, children: t('No changelog found.') }))] }));
+}

package/dist/shell/CommandPalette.d.ts

@@ -0,0 +1,12 @@
+import type { ProjectInfo } from '../types/index.js';
+import { type Action } from './actions.js';
+export declare const GROUPS: {
+    id: Action['group'];
+    label: string;
+}[];
+export declare function CommandPalette({ project, onRun, onClose, height, }: {
+    project: ProjectInfo;
+    onRun: (action: Action) => void;
+    onClose: () => void;
+    height: number;
+}): import("react").JSX.Element;