sitevision-cli 0.4.0-beta.1 → 0.5.0-beta.0

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/build.js

@@ -2,8 +2,9 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React from 'react';
 import { render, Box, Text, useInput } from 'ink';
 import { StatusIndicator } from '../components/StatusIndicator.js';
-import { WebpackRunner } from '../utils/webpack-runner.js';
-import { copyStaticToBuild, copySrcToBuild, cleanBuild, formatFileSize, createBuildZip, getZipSize, } from '../utils/zip.js';
+import { WebpackRunner, hasLocalWebpackConfig } from '../utils/webpack-runner.js';
+import { hasSitevisionScripts, runSitevisionScriptsBuild, getDelegatedZipPath, checkSitevisionScriptsCompatibility, } from '../utils/sitevision-scripts-runner.js';
+import { copyStaticToBuild, copySrcToBuild, cleanBuild, formatFileSize, createBuildZip, getZipSize, zipExists, } from '../utils/zip.js';
 import { isBundledApp, getAppType, getFullAppId, } from '../utils/project-detection.js';
 export function BuildScreen({ projectRoot, manifest, createZip = true, onBack, }) {
     const [state, setState] = React.useState({
@@ -25,8 +26,55 @@ export function BuildScreen({ projectRoot, manifest, createZip = true, onBack, }
                 setState({ status: 'cleaning', message: 'Cleaning build directory...' });
                 cleanBuild(projectRoot);
                 // Step 2: Build or copy files
+                if (isBundled && !hasLocalWebpackConfig(projectRoot)) {
+                    // No project-local webpack config: delegate the whole build to
+                    // @sitevision/sitevision-scripts, which compiles + zips to
+                    // dist/<appId>.zip (the path the CLI's sign/deploy already use).
+                    if (!hasSitevisionScripts(projectRoot)) {
+                        setState({
+                            status: 'error',
+                            error: 'No webpack.config.js found and @sitevision/sitevision-scripts is not installed. Run npm install.',
+                        });
+                        return;
+                    }
+                    // Warn if the installed sitevision-scripts is outside the range
+                    // the delegated build was validated against.
+                    const warning = checkSitevisionScriptsCompatibility(projectRoot).warning;
+                    setState({
+                        status: 'building',
+                        message: 'Building via sitevision-scripts...',
+                        warning,
+                    });
+                    const sitevisionResult = await runSitevisionScriptsBuild(projectRoot);
+                    if (!sitevisionResult.success) {
+                        setState({
+                            status: 'error',
+                            error: `${sitevisionResult.error}\n${sitevisionResult.output.slice(-1000)}`,
+                            warning,
+                        });
+                        return;
+                    }
+                    // sitevision-scripts already produced the zip; report it directly.
+                    const zipPath = getDelegatedZipPath(projectRoot, manifest.id);
+                    if (!zipExists(zipPath)) {
+                        setState({
+                            status: 'error',
+                            error: `Build reported success but no zip was found at ${zipPath}.`,
+                            warning,
+                        });
+                        return;
+                    }
+                    setState({
+                        status: 'success',
+                        message: 'Build complete',
+                        zipPath,
+                        zipSize: getZipSize(zipPath),
+                        warning,
+                    });
+                    return;
+                }
                 if (isBundled) {
-                    // Check if webpack is available
+                    // Project ships its own webpack config: build it in-process.
                     if (!WebpackRunner.isWebpackAvailable(projectRoot)) {
                         setState({
                             status: 'error',
@@ -122,7 +170,7 @@ export function BuildScreen({ projectRoot, manifest, createZip = true, onBack, }
                 return 'Build failed';
         }
     };
-    return (_jsxs(Box, { flexDirection: "column", padding: 1, children: [_jsx(Box, { marginBottom: 1, children: _jsx(StatusIndicator, { status: getStatusIndicator(), label: getStatusLabel(), message: state.message }) }), state.status === 'success' && state.result?.stats && (_jsxs(Box, { flexDirection: "column", marginLeft: 2, children: [_jsxs(Text, { dimColor: true, children: ["Compiled in ", state.result.stats.time, "ms"] }), state.result.stats.assets &&
+    return (_jsxs(Box, { flexDirection: "column", padding: 1, children: [_jsx(Box, { marginBottom: 1, children: _jsx(StatusIndicator, { status: getStatusIndicator(), label: getStatusLabel(), message: state.message }) }), state.warning && (_jsx(Box, { marginBottom: 1, children: _jsxs(Text, { color: "yellow", children: ["\u26A0 ", state.warning] }) })), state.status === 'success' && state.result?.stats && (_jsxs(Box, { flexDirection: "column", marginLeft: 2, children: [_jsxs(Text, { dimColor: true, children: ["Compiled in ", state.result.stats.time, "ms"] }), state.result.stats.assets &&
                         state.result.stats.assets.length > 0 && (_jsxs(Text, { dimColor: true, children: ["Assets: ", state.result.stats.assets.join(', ')] }))] })), state.status === 'success' && state.zipPath && (_jsxs(Box, { flexDirection: "column", marginLeft: 2, marginTop: 1, children: [_jsxs(Text, { color: "green", children: ["\u2713 Created: ", state.zipPath] }), state.zipSize !== undefined && (_jsxs(Text, { dimColor: true, children: [" Size: ", formatFileSize(state.zipSize)] }))] })), state.result?.warnings && state.result.warnings.length > 0 && (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsx(Text, { color: "yellow", children: "Warnings:" }), state.result.warnings.slice(0, 5).map((warning, i) => (_jsx(Text, { color: "yellow", dimColor: true, children: warning.substring(0, 200) }, i))), state.result.warnings.length > 5 && (_jsxs(Text, { color: "yellow", dimColor: true, children: ["...and ", state.result.warnings.length - 5, " more"] }))] })), state.status === 'error' && state.error && (_jsx(Box, { flexDirection: "column", marginTop: 1, children: _jsx(Text, { color: "red", children: state.error }) })), onBack && (state.status === 'success' || state.status === 'error') && (_jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: "Press q or Esc to return to menu" }) }))] }));
 }
 export const buildCommand = {

package/dist/commands/dev.js

@@ -1,8 +1,11 @@
 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 { StatusIndicator } from '../components/StatusIndicator.js';
-import { WebpackRunner } from '../utils/webpack-runner.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';
@@ -26,23 +29,13 @@ export function DevScreen({ projectRoot, manifest, devProperties, signed, signin
         }
     });
     const webpackRunnerRef = React.useRef(null);
-    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;
-        }
+    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 signAndDeploy = React.useCallback(async (zipPath, buildTime) => {
         try {
-            // Copy static files
-            copyStaticToBuild(projectRoot);
-            // Create zip
-            const appId = getFullAppId(manifest.id);
-            await createBuildZip(projectRoot, appId);
-            const zipPath = getZipPath(projectRoot, manifest);
             let deployZipPath = zipPath;
             // Sign if needed
             if (signed && signingCredentials) {
@@ -94,7 +87,7 @@ export function DevScreen({ projectRoot, manifest, devProperties, signed, signin
                 status: 'ready',
                 message: 'Deployed. Watching for changes...',
                 buildCount: prev.buildCount + 1,
-                lastBuildTime: result.stats?.time,
+                lastBuildTime: buildTime,
                 error: undefined,
             }));
         }
@@ -107,14 +100,122 @@ export function DevScreen({ projectRoot, manifest, devProperties, signed, signin
             }));
         }
     }, [projectRoot, manifest, devProperties, signed, signingCredentials]);
+    // 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) {
-                    // Check if webpack is available
+                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',
@@ -175,14 +276,30 @@ export function DevScreen({ projectRoot, manifest, devProperties, signed, signin
             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]);
+    }, [
+        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();
+            }
             exit();
         };
         process.on('SIGINT', handleExit);
@@ -220,7 +337,7 @@ export function DevScreen({ projectRoot, manifest, devProperties, signed, signin
                 return 'Error';
         }
     };
-    return (_jsxs(Box, { flexDirection: "column", padding: 1, children: [_jsx(Box, { marginBottom: 1, children: _jsx(StatusIndicator, { status: getStatusType(), label: getStatusLabel(), message: state.message }) }), state.buildCount > 0 && (_jsx(Box, { marginLeft: 2, marginBottom: 1, children: _jsxs(Text, { dimColor: true, children: ["Builds: ", state.buildCount, state.lastBuildTime
+    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: [manifest.name, " v", manifest.version] }) }), 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" }))] })] }));
 }

package/dist/components/InfoScreen.js

@@ -1,12 +1,14 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { Box, Text, useInput } from 'ink';
 import { getAppType } from '../utils/project-detection.js';
+import { checkSitevisionScriptsCompatibility } from '../utils/sitevision-scripts-runner.js';
 export function InfoScreen({ project, onBack }) {
     const appType = getAppType(project.manifest);
+    const scriptsCompat = checkSitevisionScriptsCompatibility(project.root);
     useInput((input, key) => {
         if (key.escape || input === 'q' || key.return) {
             onBack();
         }
     });
-    return (_jsxs(Box, { flexDirection: "column", padding: 1, children: [_jsx(Box, { marginBottom: 1, children: _jsx(Text, { bold: true, color: "cyan", children: "Sitevision Project Information" }) }), _jsxs(Box, { flexDirection: "column", marginLeft: 2, children: [_jsxs(Box, { children: [_jsx(Text, { bold: true, children: "Name: " }), _jsx(Text, { children: project.manifest.name })] }), _jsxs(Box, { children: [_jsx(Text, { bold: true, children: "ID: " }), _jsx(Text, { children: project.manifest.id })] }), _jsxs(Box, { children: [_jsx(Text, { bold: true, children: "Version: " }), _jsx(Text, { children: project.manifest.version })] }), _jsxs(Box, { children: [_jsx(Text, { bold: true, children: "Type: " }), _jsx(Text, { color: "green", children: project.manifest.type }), _jsxs(Text, { dimColor: true, children: [" (", appType, ")"] })] }), _jsxs(Box, { children: [_jsx(Text, { bold: true, children: "Bundled: " }), _jsx(Text, { children: project.manifest.bundled ? 'Yes' : 'No' })] })] }), project.hasDevProperties && project.devProperties && (_jsxs(_Fragment, { children: [_jsx(Box, { marginTop: 1, marginBottom: 1, children: _jsx(Text, { bold: true, color: "cyan", children: "Development Configuration" }) }), _jsxs(Box, { flexDirection: "column", marginLeft: 2, children: [_jsxs(Box, { children: [_jsx(Text, { bold: true, children: "Domain: " }), _jsx(Text, { children: project.devProperties.domain })] }), _jsxs(Box, { children: [_jsx(Text, { bold: true, children: "Site: " }), _jsx(Text, { children: project.devProperties.siteName })] }), _jsxs(Box, { children: [_jsx(Text, { bold: true, children: "Addon: " }), _jsx(Text, { children: project.devProperties.addonName })] }), _jsxs(Box, { children: [_jsx(Text, { bold: true, children: "Username: " }), _jsx(Text, { children: project.devProperties.username })] }), _jsxs(Box, { children: [_jsx(Text, { bold: true, children: "Use HTTP: " }), _jsx(Text, { children: project.devProperties.useHTTPForDevDeploy ? 'Yes' : 'No' })] })] })] })), !project.hasDevProperties && (_jsx(Box, { marginTop: 1, children: _jsx(Text, { color: "yellow", children: "\u26A0 No dev properties found. Run setup-dev-properties to configure." }) })), _jsxs(Box, { marginTop: 1, children: [_jsx(Text, { bold: true, children: "Project Root: " }), _jsx(Text, { dimColor: true, children: project.root })] }), _jsx(Box, { marginTop: 2, children: _jsx(Text, { dimColor: true, children: "Press Enter or ESC to return to menu" }) })] }));
+    return (_jsxs(Box, { flexDirection: "column", padding: 1, children: [_jsx(Box, { marginBottom: 1, children: _jsx(Text, { bold: true, color: "cyan", children: "Sitevision Project Information" }) }), _jsxs(Box, { flexDirection: "column", marginLeft: 2, children: [_jsxs(Box, { children: [_jsx(Text, { bold: true, children: "Name: " }), _jsx(Text, { children: project.manifest.name })] }), _jsxs(Box, { children: [_jsx(Text, { bold: true, children: "ID: " }), _jsx(Text, { children: project.manifest.id })] }), _jsxs(Box, { children: [_jsx(Text, { bold: true, children: "Version: " }), _jsx(Text, { children: project.manifest.version })] }), _jsxs(Box, { children: [_jsx(Text, { bold: true, children: "Type: " }), _jsx(Text, { color: "green", children: project.manifest.type }), _jsxs(Text, { dimColor: true, children: [" (", appType, ")"] })] }), _jsxs(Box, { children: [_jsx(Text, { bold: true, children: "Bundled: " }), _jsx(Text, { children: project.manifest.bundled ? 'Yes' : 'No' })] })] }), _jsx(Box, { marginTop: 1, marginBottom: 1, children: _jsx(Text, { bold: true, color: "cyan", children: "Build Tooling" }) }), _jsxs(Box, { flexDirection: "column", marginLeft: 2, children: [_jsxs(Box, { children: [_jsx(Text, { bold: true, children: "sitevision-scripts: " }), _jsx(Text, { children: scriptsCompat.installed ?? 'not installed' }), _jsxs(Text, { dimColor: true, children: [" (supported ", scriptsCompat.supportedRange, ")"] })] }), scriptsCompat.warning && (_jsx(Box, { marginTop: 1, children: _jsxs(Text, { color: "yellow", children: ["\u26A0 ", scriptsCompat.warning] }) }))] }), project.hasDevProperties && project.devProperties && (_jsxs(_Fragment, { children: [_jsx(Box, { marginTop: 1, marginBottom: 1, children: _jsx(Text, { bold: true, color: "cyan", children: "Development Configuration" }) }), _jsxs(Box, { flexDirection: "column", marginLeft: 2, children: [_jsxs(Box, { children: [_jsx(Text, { bold: true, children: "Domain: " }), _jsx(Text, { children: project.devProperties.domain })] }), _jsxs(Box, { children: [_jsx(Text, { bold: true, children: "Site: " }), _jsx(Text, { children: project.devProperties.siteName })] }), _jsxs(Box, { children: [_jsx(Text, { bold: true, children: "Addon: " }), _jsx(Text, { children: project.devProperties.addonName })] }), _jsxs(Box, { children: [_jsx(Text, { bold: true, children: "Username: " }), _jsx(Text, { children: project.devProperties.username })] }), _jsxs(Box, { children: [_jsx(Text, { bold: true, children: "Use HTTP: " }), _jsx(Text, { children: project.devProperties.useHTTPForDevDeploy ? 'Yes' : 'No' })] })] })] })), !project.hasDevProperties && (_jsx(Box, { marginTop: 1, children: _jsx(Text, { color: "yellow", children: "\u26A0 No dev properties found. Run setup-dev-properties to configure." }) })), _jsxs(Box, { marginTop: 1, children: [_jsx(Text, { bold: true, children: "Project Root: " }), _jsx(Text, { dimColor: true, children: project.root })] }), _jsx(Box, { marginTop: 2, children: _jsx(Text, { dimColor: true, children: "Press Enter or ESC to return to menu" }) })] }));
 }

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/process-runner.d.ts

@@ -20,11 +20,3 @@ export declare class ProcessRunner extends EventEmitter {
     kill(): void;
     getOutput(): ProcessOutput[];
 }
-/**
- * Run a sitevision-scripts command in the project directory
- */
-export declare function runSitevisionScript(scriptName: string, args?: string[], projectRoot?: string): ProcessRunner;
-/**
- * Run an NPM script
- */
-export declare function runNpmScript(scriptName: string, args?: string[], projectRoot?: string, customEnv?: Record<string, string>): ProcessRunner;

package/dist/utils/process-runner.js

@@ -72,18 +72,3 @@ export class ProcessRunner extends EventEmitter {
         return this.output;
     }
 }
-/**
- * Run a sitevision-scripts command in the project directory
- */
-export function runSitevisionScript(scriptName, args = [], projectRoot) {
-    // Check if sitevision-scripts is available locally
-    const runner = new ProcessRunner('npm', ['run', scriptName, '--', ...args], projectRoot);
-    return runner;
-}
-/**
- * Run an NPM script
- */
-export function runNpmScript(scriptName, args = [], projectRoot, customEnv) {
-    const runner = new ProcessRunner('npm', ['run', scriptName, ...args], projectRoot, false, customEnv);
-    return runner;
-}

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/dist/utils/sitevision-api.d.ts

@@ -13,6 +13,38 @@ import type { SigningCredentials, DeployConfig, ProductionDeployConfig, SigningR
  * Create Basic Auth header value
  */
 declare function createBasicAuth(username: string, password: string): string;
+/**
+ * Make an HTTP/HTTPS request
+ */
+export declare function makeRequest(url: string, options: {
+    method: string;
+    headers?: Record<string, string>;
+    body?: Buffer;
+    auth?: {
+        username: string;
+        password: string;
+    };
+    timeoutMs?: number;
+}): Promise<{
+    statusCode: number;
+    body: Buffer;
+    headers: Record<string, string>;
+}>;
+/**
+ * Whether an HTTP status is worth retrying (transient server-side failures).
+ */
+export declare function isRetryableStatus(statusCode: number): boolean;
+/**
+ * Summarize a non-success response body for error messages.
+ * Avoids dumping raw bytes (e.g. an HTML error page or a binary blob) by
+ * trimming text bodies and labelling binary ones by their content type.
+ */
+export declare function summarizeErrorBody(body: Buffer, headers: Record<string, string>): string;
+/**
+ * Check that a buffer begins with the ZIP magic bytes. Used to fail fast when
+ * the signing endpoint returns an error page with HTTP 200.
+ */
+export declare function looksLikeZip(body: Buffer): boolean;
 /**
  * Sign an app via developer.sitevision.se
  *