sitevision-cli 0.4.0-beta.0 → 0.4.0-beta.2

package/dist/app.js

@@ -1,20 +1,48 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { useState } from 'react';
+import { useMemo, useState } from 'react';
 import { MainMenu } from './components/MainMenu.js';
 import { InfoScreen } from './components/InfoScreen.js';
 import { SetupFlow } from './components/SetupFlow.js';
 import { PasswordInput } from './components/PasswordInput.js';
+import { KeychainPasswordChoice } from './components/KeychainPasswordChoice.js';
+import { decideSigningStep } from './utils/signing-step.js';
 import { DevScreen } from './commands/dev.js';
 import { BuildScreen } from './commands/build.js';
 import { DeployScreen } from './commands/deploy.js';
 import { SignScreen } from './commands/sign.js';
 import { SigningPropertiesForm } from './components/SigningPropertiesForm.js';
-import { setDeployPassword as saveDeployPassword, setSigningPassword as saveSigningPassword, } from './utils/keychain.js';
+import { getSigningPassword, setDeployPassword as saveDeployPassword, setSigningPassword as saveSigningPassword, } from './utils/keychain.js';
 export default function App({ project }) {
     const [state, setState] = useState('setup');
     const [currentCommand, setCurrentCommand] = useState('');
     const [signingPassword, setSigningPassword] = useState('');
     const [devPassword, setDevPassword] = useState('');
+    // When true, skip the keychain "use saved / enter new" choice and go straight
+    // to manual entry (e.g. the saved password just failed and we're retrying).
+    const [signingRetry, setSigningRetry] = useState(false);
+    // Read the saved signing password from the keychain once (keychain access is
+    // slow and this component re-renders frequently).
+    const signingUsername = project.devProperties?.signingUsername;
+    const storedSigningPassword = useMemo(() => (signingUsername ? getSigningPassword(signingUsername) : null), [signingUsername]);
+    // Decide the next step once a signing password is needed: proceed if we already
+    // have one this session, offer the keychain choice if one is saved, otherwise
+    // prompt for manual entry.
+    const routeToSigningStep = (command = currentCommand) => {
+        const step = decideSigningStep({
+            hasSessionPassword: Boolean(signingPassword),
+            hasStoredPassword: Boolean(storedSigningPassword),
+            isRetry: signingRetry,
+        });
+        if (step === 'proceed') {
+            setState(command === 'dev-signed' ? 'dev' : 'sign');
+        }
+        else if (step === 'choice') {
+            setState('signing-password-choice');
+        }
+        else {
+            setState('signing-password-input');
+        }
+    };
     // Check if dev password is available (either from file or session)
     const hasDevPassword = Boolean(project.devProperties?.password || devPassword);
     // Get effective dev properties with session password if needed
@@ -35,8 +63,8 @@ export default function App({ project }) {
         }
         // Continue to the intended command
         if (currentCommand === 'dev' || currentCommand === 'dev-signed') {
-            if (currentCommand === 'dev-signed' && !signingPassword) {
-                setState('signing-password-input');
+            if (currentCommand === 'dev-signed') {
+                routeToSigningStep();
             }
             else {
                 setState('dev');
@@ -46,6 +74,15 @@ export default function App({ project }) {
             setState('deploy');
         }
     };
+    const handleUseSavedSigning = () => {
+        if (storedSigningPassword) {
+            setSigningPassword(storedSigningPassword);
+        }
+        setState(currentCommand === 'dev-signed' ? 'dev' : 'sign');
+    };
+    const handleEnterNewSigning = () => {
+        setState('signing-password-input');
+    };
     const handleSigningPasswordSubmit = (password, remember) => {
         setSigningPassword(password);
         if (remember && project.devProperties?.signingUsername && password) {
@@ -60,6 +97,8 @@ export default function App({ project }) {
     };
     const handleCommandSelect = (command) => {
         setCurrentCommand(command);
+        // Fresh selection from the menu — re-offer the saved keychain password.
+        setSigningRetry(false);
         switch (command) {
             case 'info':
                 setState('info');
@@ -92,11 +131,8 @@ export default function App({ project }) {
                 if (!hasDevPassword) {
                     setState('dev-password-input');
                 }
-                else if (!signingPassword) {
-                    setState('signing-password-input');
-                }
                 else {
-                    setState('dev');
+                    routeToSigningStep(command);
                 }
                 break;
             case 'sign':
@@ -108,12 +144,7 @@ export default function App({ project }) {
                     console.log('\x1b[31mSigning credentials not configured. Run svc setup-signing first.\x1b[0m');
                     return;
                 }
-                if (signingPassword) {
-                    setState('sign');
-                }
-                else {
-                    setState('signing-password-input');
-                }
+                routeToSigningStep(command);
                 break;
             case 'build':
                 setState('build');
@@ -146,8 +177,13 @@ export default function App({ project }) {
     if (state === 'dev-password-input') {
         return (_jsx(PasswordInput, { label: "Enter Development Password (usually Sitevision Cloud Password)", showRememberOption: Boolean(project.devProperties?.domain && project.devProperties?.username), onSubmit: handleDevPasswordSubmit, onCancel: () => setState('menu') }, "dev-password"));
     }
+    if (state === 'signing-password-choice') {
+        return (_jsx(KeychainPasswordChoice, { onUseSaved: handleUseSavedSigning, onEnterNew: handleEnterNewSigning, onCancel: () => setState('menu') }, "signing-password-choice"));
+    }
     if (state === 'signing-password-input') {
-        return (_jsx(PasswordInput, { label: "Enter Signing Password (developer.sitevision.se)", showRememberOption: Boolean(project.devProperties?.signingUsername), onSubmit: handleSigningPasswordSubmit, onCancel: () => setState('menu') }, "signing-password"));
+        return (_jsx(PasswordInput, { label: "Enter Signing Password (developer.sitevision.se)", showRememberOption: Boolean(project.devProperties?.signingUsername), defaultRemember: Boolean(storedSigningPassword), rememberLabel: storedSigningPassword
+                ? 'Update saved password in OS keychain: '
+                : 'Save to OS keychain: ', onSubmit: handleSigningPasswordSubmit, onCancel: () => setState('menu') }, "signing-password"));
     }
     if (state === 'dev') {
         return (_jsx(DevScreen, { projectRoot: project.root, manifest: project.manifest, devProperties: getEffectiveDevProperties(), signed: currentCommand === 'dev-signed', onBack: () => setState('menu'), onRetryCredentials: () => {
@@ -156,6 +192,8 @@ export default function App({ project }) {
                     project.devProperties.password = undefined;
                 if (currentCommand === 'dev-signed') {
                     setSigningPassword('');
+                    // The saved password may be what failed — don't re-offer it.
+                    setSigningRetry(true);
                 }
                 setState('dev-password-input');
             }, signingCredentials: currentCommand === 'dev-signed' &&

package/dist/commands/dev.js

@@ -5,7 +5,8 @@ import { StatusIndicator } from '../components/StatusIndicator.js';
 import { WebpackRunner } from '../utils/webpack-runner.js';
 import { promptPassword, promptYesNo } from '../utils/password-prompt.js';
 import { signApp, deployApp } from '../utils/sitevision-api.js';
-import { getSigningPassword, setSigningPassword, setDeployPassword, } from '../utils/keychain.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, } from '../utils/project-detection.js';
 export function DevScreen({ projectRoot, manifest, devProperties, signed, signingCredentials, onBack, onRetryCredentials, }) {
@@ -268,25 +269,11 @@ export const devCommand = {
                 return;
             }
             const signingUsername = project.devProperties.signingUsername;
-            let password = getSigningPassword(signingUsername) ||
-                process.env['SITEVISION_SIGNING_PASSWORD'] ||
-                '';
-            let promptedManually = false;
-            if (!password) {
-                console.log('');
-                password = await promptPassword('Signing password (developer.sitevision.se): ');
-                promptedManually = true;
-            }
+            const password = await resolveSigningPassword(signingUsername);
             if (!password) {
                 console.log('\x1b[31mError: Password is required for signed mode\x1b[0m');
                 return;
             }
-            if (promptedManually) {
-                const remember = await promptYesNo('Save password to OS keychain? (y/N): ');
-                if (remember) {
-                    setSigningPassword(signingUsername, password);
-                }
-            }
             signingCredentials = {
                 username: signingUsername,
                 password,

package/dist/commands/sign.js

@@ -3,8 +3,7 @@ import React from 'react';
 import { render, Box, Text, useInput } from 'ink';
 import { StatusIndicator } from '../components/StatusIndicator.js';
 import { signApp } from '../utils/sitevision-api.js';
-import { promptPassword, promptYesNo } from '../utils/password-prompt.js';
-import { getSigningPassword, setSigningPassword } from '../utils/keychain.js';
+import { resolveSigningPassword } from '../utils/signing-password.js';
 import { getZipPath, getSignedZipPath } from '../utils/project-detection.js';
 import { formatFileSize, getZipSize, zipExists } from '../utils/zip.js';
 export function SignScreen({ projectRoot, manifest, devProperties, password, onBack, onRetryCredentials, }) {
@@ -84,26 +83,11 @@ export const signCommand = {
             return;
         }
         const signingUsername = project.devProperties.signingUsername;
-        // Try keychain first, then env var, then prompt
-        let password = getSigningPassword(signingUsername) ||
-            process.env['SITEVISION_SIGNING_PASSWORD'] ||
-            '';
-        let promptedManually = false;
-        if (!password) {
-            console.log('');
-            password = await promptPassword('Signing password (developer.sitevision.se): ');
-            promptedManually = true;
-        }
+        const password = await resolveSigningPassword(signingUsername);
         if (!password) {
             console.log('\x1b[31mError: Password is required\x1b[0m');
             return;
         }
-        if (promptedManually) {
-            const remember = await promptYesNo('Save password to OS keychain? (y/N): ');
-            if (remember) {
-                setSigningPassword(signingUsername, password);
-            }
-        }
         const { waitUntilExit } = render(_jsx(SignScreen, { projectRoot: project.root, manifest: project.manifest, devProperties: project.devProperties, password: password }));
         await waitUntilExit();
     },

package/dist/components/KeychainPasswordChoice.d.ts

@@ -0,0 +1,8 @@
+interface Props {
+    label?: string;
+    onUseSaved: () => void;
+    onEnterNew: () => void;
+    onCancel: () => void;
+}
+export declare function KeychainPasswordChoice({ label, onUseSaved, onEnterNew, onCancel, }: Props): import("react").JSX.Element;
+export {};

package/dist/components/KeychainPasswordChoice.js

@@ -0,0 +1,30 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useState } from 'react';
+import { Box, Text, useInput } from 'ink';
+const OPTIONS = [
+    { label: 'Use saved password from keychain', value: 'saved' },
+    { label: 'Enter a new password', value: 'new' },
+];
+export function KeychainPasswordChoice({ label = 'A signing password is saved in your OS keychain.', onUseSaved, onEnterNew, onCancel, }) {
+    const [selectedIndex, setSelectedIndex] = useState(0);
+    useInput((_input, key) => {
+        if (key.upArrow) {
+            setSelectedIndex(prev => (prev === 0 ? OPTIONS.length - 1 : prev - 1));
+        }
+        else if (key.downArrow) {
+            setSelectedIndex(prev => (prev === OPTIONS.length - 1 ? 0 : prev + 1));
+        }
+        else if (key.return) {
+            if (selectedIndex === 0) {
+                onUseSaved();
+            }
+            else {
+                onEnterNew();
+            }
+        }
+        else if (key.escape) {
+            onCancel();
+        }
+    });
+    return (_jsxs(Box, { flexDirection: "column", padding: 1, children: [_jsx(Box, { marginBottom: 1, children: _jsx(Text, { bold: true, color: "cyan", children: label }) }), OPTIONS.map((option, index) => (_jsxs(Text, { color: index === selectedIndex ? 'green' : undefined, children: [index === selectedIndex ? '❯ ' : '  ', option.label] }, option.value))), _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: "\u2191/\u2193 to move, Enter to select, Esc to cancel" }) })] }));
+}

package/dist/components/PasswordInput.d.ts

@@ -1,8 +1,10 @@
 interface Props {
     label?: string;
     showRememberOption?: boolean;
+    defaultRemember?: boolean;
+    rememberLabel?: string;
     onSubmit: (password: string, remember: boolean) => void;
     onCancel: () => void;
 }
-export declare function PasswordInput({ label, showRememberOption, onSubmit, onCancel, }: Props): import("react").JSX.Element;
+export declare function PasswordInput({ label, showRememberOption, defaultRemember, rememberLabel, onSubmit, onCancel, }: Props): import("react").JSX.Element;
 export {};

package/dist/components/PasswordInput.js

@@ -1,9 +1,9 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useState } from 'react';
 import { Box, Text, useInput } from 'ink';
-export function PasswordInput({ label = 'Enter Signing Password', showRememberOption = false, onSubmit, onCancel, }) {
+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(false);
+    const [remember, setRemember] = useState(defaultRemember);
     useInput((input, key) => {
         if (key.return) {
             onSubmit(password, remember);
@@ -26,5 +26,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: "Save to OS keychain: " }), _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' : ' ', "]"] }), _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" }) })] }));
 }

package/dist/utils/password-prompt.d.ts

@@ -1,7 +1,8 @@
 /**
- * Prompt for a yes/no answer. Returns true for y/Y, false otherwise (incl. empty / Enter).
+ * Prompt for a yes/no answer. Returns true for y/Y.
+ * Pressing Enter (empty answer) returns `defaultYes` (default: false).
  */
-export declare function promptYesNo(prompt: string): Promise<boolean>;
+export declare function promptYesNo(prompt: string, defaultYes?: boolean): Promise<boolean>;
 /**
  * Prompt for password input with masked display
  */

package/dist/utils/password-prompt.js

@@ -1,7 +1,8 @@
 /**
- * Prompt for a yes/no answer. Returns true for y/Y, false otherwise (incl. empty / Enter).
+ * Prompt for a yes/no answer. Returns true for y/Y.
+ * Pressing Enter (empty answer) returns `defaultYes` (default: false).
  */
-export function promptYesNo(prompt) {
+export function promptYesNo(prompt, defaultYes = false) {
     return new Promise(resolve => {
         process.stdout.write(prompt);
         const stdin = process.stdin;
@@ -14,9 +15,15 @@ export function promptYesNo(prompt) {
             stdin.removeListener('data', onData);
             stdin.pause();
             process.stdout.write(`${char}\n`);
-            if (char.charCodeAt(0) === 3) {
+            const charCode = char.charCodeAt(0);
+            if (charCode === 3) {
                 process.exit();
             }
+            // Enter (CR/LF) or empty input → use the default
+            if (char === '' || charCode === 13 || charCode === 10) {
+                resolve(defaultYes);
+                return;
+            }
             resolve(char === 'y' || char === 'Y');
         };
         stdin.on('data', onData);

package/dist/utils/signing-password.d.ts

@@ -0,0 +1,12 @@
+/**
+ * Resolve the signing password for the given user.
+ *
+ * Priority:
+ * 1. `SITEVISION_SIGNING_PASSWORD` env var (non-interactive override, no prompts).
+ * 2. A password saved in the OS keychain — the user is asked whether to use it
+ * or set a new one. Choosing "new" optionally updates the saved password.
+ * 3. An interactive prompt — optionally saved to the keychain.
+ *
+ * Returns an empty string if no password could be obtained.
+ */
+export declare function resolveSigningPassword(signingUsername: string): Promise<string>;

package/dist/utils/signing-password.js

@@ -0,0 +1,36 @@
+import { getSigningPassword, setSigningPassword } from './keychain.js';
+import { promptPassword, promptYesNo } from './password-prompt.js';
+const SIGNING_PROMPT = 'Signing password (developer.sitevision.se): ';
+/**
+ * Resolve the signing password for the given user.
+ *
+ * Priority:
+ * 1. `SITEVISION_SIGNING_PASSWORD` env var (non-interactive override, no prompts).
+ * 2. A password saved in the OS keychain — the user is asked whether to use it
+ * or set a new one. Choosing "new" optionally updates the saved password.
+ * 3. An interactive prompt — optionally saved to the keychain.
+ *
+ * Returns an empty string if no password could be obtained.
+ */
+export async function resolveSigningPassword(signingUsername) {
+    const envPassword = process.env['SITEVISION_SIGNING_PASSWORD'];
+    if (envPassword)
+        return envPassword;
+    const stored = getSigningPassword(signingUsername);
+    if (stored) {
+        const useStored = await promptYesNo('Use saved signing password from keychain? (Y/n): ', true);
+        if (useStored)
+            return stored;
+    }
+    console.log('');
+    const password = await promptPassword(SIGNING_PROMPT);
+    if (!password)
+        return '';
+    const remember = await promptYesNo(stored
+        ? 'Update saved password in OS keychain? (y/N): '
+        : 'Save password to OS keychain? (y/N): ');
+    if (remember) {
+        setSigningPassword(signingUsername, password);
+    }
+    return password;
+}

package/dist/utils/signing-step.d.ts

@@ -0,0 +1,15 @@
+export type SigningStep = 'proceed' | 'choice' | 'input';
+/**
+ * Decide what to do when a signing password is needed.
+ *
+ * - `proceed`: a password is already available this session — use it.
+ * - `choice`: a password is saved in the keychain — ask whether to use it or
+ * enter a new one.
+ * - `input`: prompt for a password (nothing saved, or a saved one just failed
+ * and we're retrying).
+ */
+export declare function decideSigningStep(options: {
+    hasSessionPassword: boolean;
+    hasStoredPassword: boolean;
+    isRetry: boolean;
+}): SigningStep;

package/dist/utils/signing-step.js

@@ -0,0 +1,16 @@
+/**
+ * Decide what to do when a signing password is needed.
+ *
+ * - `proceed`: a password is already available this session — use it.
+ * - `choice`: a password is saved in the keychain — ask whether to use it or
+ * enter a new one.
+ * - `input`: prompt for a password (nothing saved, or a saved one just failed
+ * and we're retrying).
+ */
+export function decideSigningStep(options) {
+    if (options.hasSessionPassword)
+        return 'proceed';
+    if (options.hasStoredPassword && !options.isRetry)
+        return 'choice';
+    return 'input';
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "sitevision-cli",
-	"version": "0.4.0-beta.0",
+	"version": "0.4.0-beta.2",
 	"license": "MIT",
 	"bin": {
 		"svc": "dist/cli.js"