sitevision-cli 1.0.0-beta.31 → 1.0.0-beta.33

package/dist/shell/Shell.js

@@ -1,12 +1,14 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import fs from 'node:fs';
 import path from 'node:path';
 import { useCallback, useEffect, useMemo, useReducer, useState } from 'react';
 import { Box, Text, useApp, useInput, useStdout } from 'ink';
 import Spinner from 'ink-spinner';
 import { detectProject, appTypeOf, localizedText, readWorkspaceDevProperties, readSvcConfig, writeSvcConfig, writeDevProperties, syncDevPropertiesToPackageJson, } from '../utils/project-detection.js';
-import { appGroup, configIncomplete, needsOnboarding, } from '../utils/workspace.js';
+import { appGroup, configIncomplete, discoverApps, needsOnboarding, } from '../utils/workspace.js';
+import { createAppInTerminal, isEmptyOrMissing, seedNewApp, startCreateApp, appNameAdvice, appNameProblem, } from '../utils/create-app.js';
 import { listAddons, listExecutables, } from '../utils/sitevision-api.js';
-import { useTasks, runningTasks, startActivate, getTasks, } from '../utils/tasks.js';
+import { useTasks, runningTasks, startActivate, getTasks, scaffoldRunning, } from '../utils/tasks.js';
 import { PasswordInput } from '../components/PasswordInput.js';
 import { AuthLoginScreen } from '../components/AuthLoginScreen.js';
 import { TopBar, Navigator, NavigatorStrip, BottomBar, navMatches, navMove, appLabel, navWidth, NARROW_BELOW, ACCENT, } from './Frame.js';
@@ -20,7 +22,8 @@ import { Popover } from './Popover.js';
 import { ChangelogPanel } from './Changelog.js';
 import { baseEnvironment, environmentColor, environmentNames, environmentProject, isProductionEnvironment, resolveEnvironment, } from '../utils/environments.js';
 import { t } from '../utils/i18n.js';
-import { actionForKey, authState, resolveDeployConfig, } from './actions.js';
+import { onKeychainSaveFailed } from '../utils/keychain.js';
+import { actionForKey, actions, authState, resolveDeployConfig, } from './actions.js';
 function useSize() {
     const { stdout } = useStdout();
     const read = () => ({ columns: stdout.columns || 80, rows: stdout.rows || 24 });
@@ -35,7 +38,7 @@ function useSize() {
     }, [stdout]);
     return size;
 }
-export function Shell({ apps: initialApps, workspaceRoot, version, minimal = false, updatedFrom, }) {
+export function Shell({ apps: initialApps, workspaceRoot, version, minimal = false, updatedFrom, handover, skipped, }) {
     const { exit } = useApp();
     const { columns, rows } = useSize();
     const tasks = useTasks();
@@ -45,13 +48,31 @@ export function Shell({ apps: initialApps, workspaceRoot, version, minimal = fal
     const [selected, setSelected] = useState(onboard ? initialApps.length : 0);
     const [tab, setTab] = useState('overview');
     const [focus, setFocus] = useState(workspaceRoot && !onboard ? 'nav' : 'content');
-    const [overlay, setOverlay] = useState(updatedFrom ? { kind: 'changelog', since: updatedFrom } : null);
+    const [overlays, setOverlays] = useState(updatedFrom ? [{ kind: 'changelog', since: updatedFrom }] : []);
+    const setOverlay = useCallback((next) => {
+        setOverlays(stack => overlayStack(stack, next));
+    }, []);
+    const [editing, setEditing] = useState(false);
+    // A confirm that turns up mid-edit stays hidden until the field is done.
+    const top = overlays.at(-1) ?? null;
+    const overlay = top?.kind === 'confirm' && editing ? null : top;
     const [filter, setFilter] = useState('');
     const [versions, setVersions] = useState({});
     const [versionRow, setVersionRow] = useState(0);
     const [logScroll, setLogScroll] = useState(0);
     const [logWrap, setLogWrap] = useState(false);
-    const [notice, setNotice] = useState(null);
+    const [offerAddon, setOfferAddon] = useState();
+    const [notice, setNotice] = useState(skipped?.length
+        ? {
+            text: skipped.length === 1
+                ? t('Skipped: {reason}', { reason: skipped[0] })
+                : t('Skipped {n} apps. First: {reason}', {
+                    n: skipped.length,
+                    reason: skipped[0],
+                }),
+            level: 'warn',
+        }
+        : null);
     const [, tick] = useReducer((n) => n + 1, 0);
     // In workspace mode the row after the last app is "Workspace settings".
     const settings = Boolean(workspaceRoot) && selected === apps.length;
@@ -114,12 +135,35 @@ export function Shell({ apps: initialApps, workspaceRoot, version, minimal = fal
     const notify = useCallback((text, level = 'info') => {
         setNotice({ text, level });
     }, []);
+    // "Save to keychain" that did not save would otherwise just ask again.
+    useEffect(() => {
+        onKeychainSaveFailed(() => {
+            notify(t('Could not save to the OS keychain; you will be asked again next time.'), 'warn');
+        });
+    }, [notify]);
     const quit = useCallback(() => {
-        for (const task of getTasks())
-            if (task.status === 'running')
-                task.stop();
-        exit();
-    }, [exit]);
+        const leave = () => {
+            for (const task of getTasks())
+                if (task.status === 'running')
+                    task.stop();
+            exit();
+        };
+        // Between the scaffolder's questions nothing is open, so q is live:
+        // quitting then would leave a half-made app behind without a word.
+        if (scaffoldRunning()) {
+            setOverlay({
+                kind: 'confirm',
+                message: t('A new app is still being created. Stop it and quit?'),
+                resolve(yes) {
+                    if (yes)
+                        leave();
+                },
+            });
+        }
+        else {
+            leave();
+        }
+    }, [exit, setOverlay]);
     const context = useMemo(() => ({
         project,
         reload,
@@ -169,6 +213,178 @@ export function Shell({ apps: initialApps, workspaceRoot, version, minimal = fal
             writeSvcConfig(configRoot, { environment: clean });
             notify(t('environment {env} added', { env: clean }), 'ok');
         },
+        async createApp() {
+            // Only what this flow opened is closed when the scaffolder ends.
+            const asked = new Set();
+            const openOwn = (next) => {
+                asked.add(next);
+                setOverlay(next);
+            };
+            if (scaffoldRunning()) {
+                notify(t('An app is already being created.'), 'warn');
+                return;
+            }
+            const promptText = async (label, initial, validate, error, advise) => new Promise(resolve => {
+                openOwn({
+                    kind: 'prompt',
+                    label,
+                    initial,
+                    validate,
+                    advise,
+                    error,
+                    resolve,
+                });
+            });
+            const base = workspaceRoot ?? path.dirname(rawProject.root);
+            const suggested = workspaceRoot
+                ? path.relative(workspaceRoot, path.dirname(rawProject.root)) || '.'
+                : base;
+            // Asked again, with the reason, until the name is free in that folder.
+            let name = '';
+            let parentDir = '';
+            let appDir = '';
+            let taken;
+            for (;;) {
+                // eslint-disable-next-line no-await-in-loop
+                const typed = await promptText(t('Name of the new app'), name, appNameProblem, taken, appNameAdvice);
+                if (typed === null)
+                    return;
+                name = typed.trim();
+                // Folders that already hold apps, then a way to type another one.
+                const folders = [
+                    ...new Set([
+                        suggested,
+                        ...apps.map(app => workspaceRoot
+                            ? path.relative(base, path.dirname(app.root)) || '.'
+                            : path.dirname(app.root)),
+                    ]),
+                ].toSorted((a, b) => a.localeCompare(b));
+                // eslint-disable-next-line no-await-in-loop
+                const folderPick = await new Promise(resolve => {
+                    openOwn({
+                        kind: 'choice',
+                        label: t('Create it in folder'),
+                        choices: [...folders, t('Other folder…')],
+                        multi: false,
+                        initial: [folders.indexOf(suggested)],
+                        resolve,
+                    });
+                });
+                if (!folderPick)
+                    return;
+                const folder = folders[folderPick[0]] ??
+                    // eslint-disable-next-line no-await-in-loop
+                    (await promptText(t('Create it in folder'), suggested));
+                if (folder === null)
+                    return;
+                parentDir = path.resolve(base, folder.trim() || '.');
+                appDir = path.join(parentDir, name);
+                if (isEmptyOrMissing(appDir))
+                    break;
+                taken = t('{dir} already exists. Pick another name, or keep it and choose a different folder next.', { dir: path.relative(base, appDir) });
+            }
+            // Both were checked above, so a run that leaves no app may remove them.
+            const madeParent = !fs.existsSync(parentDir);
+            const discard = () => {
+                fs.rmSync(appDir, { recursive: true, force: true });
+                if (madeParent && isEmptyOrMissing(parentDir))
+                    fs.rmSync(parentDir, { recursive: true, force: true });
+            };
+            fs.mkdirSync(parentDir, { recursive: true });
+            const known = (workspaceRoot
+                ? readWorkspaceDevProperties(workspaceRoot)
+                : rawProject.devProperties);
+            const ask = async (question) => {
+                // svc keeps passwords in the keychain, never in the app's file.
+                if (question.name === 'password')
+                    return { skip: true };
+                const shared = known?.[question.name];
+                if (!question.error &&
+                    ['domain', 'siteName', 'username', 'useHTTPForDevDeploy'].includes(question.name) &&
+                    shared !== undefined &&
+                    shared !== '')
+                    return { value: shared };
+                const label = question.error
+                    ? `${question.message} (${question.error})`
+                    : question.message;
+                if (question.type === 'confirm') {
+                    const value = await new Promise(resolve => {
+                        openOwn({ kind: 'confirm', message: label, resolve });
+                    });
+                    return { value };
+                }
+                if (question.type === 'password') {
+                    const secret = await new Promise(resolve => {
+                        openOwn({ kind: 'password', label, resolve });
+                    });
+                    return secret && { value: secret.password };
+                }
+                if (question.choices.length > 0) {
+                    const multi = question.type === 'checkbox';
+                    const picked = await new Promise(resolve => {
+                        openOwn({
+                            kind: 'choice',
+                            label,
+                            choices: question.choices,
+                            multi,
+                            initial: [question.default ?? []].flat(),
+                            resolve,
+                        });
+                    });
+                    return picked && { value: multi ? picked : picked[0] };
+                }
+                const initial = question.default ?? (question.name === 'addonName' ? name : '');
+                const value = await promptText(label, typeof initial === 'string' ? initial : JSON.stringify(initial));
+                return value === null ? null : { value };
+            };
+            notify(t('creating {app}: installing, questions follow', { app: name }));
+            setTab('log');
+            const { done } = startCreateApp({ name, parentDir, ask });
+            let outcome = await done;
+            setOverlays(stack => withoutOverlays(stack, asked));
+            if (outcome === 'unmanaged') {
+                if (!handover) {
+                    notify(t('The scaffolder could not be run from here'), 'error');
+                    return;
+                }
+                fs.rmSync(appDir, { recursive: true, force: true });
+                handover(async () => {
+                    if (await createAppInTerminal(name, parentDir))
+                        seedNewApp(appDir, workspaceRoot);
+                    else
+                        discard();
+                });
+                return;
+            }
+            if (outcome !== 'created') {
+                discard();
+                if (outcome === 'failed')
+                    notify(t('creating {app} failed, see the log', { app: name }), 'error');
+                return;
+            }
+            try {
+                seedNewApp(appDir, workspaceRoot);
+            }
+            catch (error) {
+                notify(error instanceof Error ? error.message : String(error), 'warn');
+                outcome = 'failed';
+            }
+            if (!workspaceRoot ||
+                path.relative(workspaceRoot, appDir).startsWith('..')) {
+                notify(t('{app} created in {dir}', { app: name, dir: appDir }), 'ok');
+                return;
+            }
+            const left = [];
+            const found = discoverApps(workspaceRoot, left);
+            if (left[0])
+                notify(t('Skipped: {reason}', { reason: left[0] }), 'warn');
+            setApps(found);
+            setFilter('');
+            setSelected(Math.max(0, found.findIndex(app => app.root === appDir)));
+            if (outcome === 'created')
+                notify(t('{app} created', { app: name }), 'ok');
+            setOfferAddon(appDir);
+        },
         openWorkspaceSettings: workspaceRoot
             ? () => {
                 setSelected(apps.length);
@@ -204,7 +420,7 @@ export function Shell({ apps: initialApps, workspaceRoot, version, minimal = fal
         action.run(context).catch((error) => {
             notify(error instanceof Error ? error.message : String(error), 'error');
         });
-    }, [context, project, notify]);
+    }, [context, project, notify, setOverlay]);
     const fetchVersions = useCallback(async (fresh = false) => {
         const key = versionsKey;
         const config = await resolveDeployConfig(context, fresh);
@@ -245,19 +461,52 @@ export function Shell({ apps: initialApps, workspaceRoot, version, minimal = fal
         await wait();
         notify(task.error ?? t('{v} activated', { v: executable.appVersion }), task.error ? 'error' : 'ok');
         await fetchVersions();
-    }, [versions, project, versionRow, context, notify, fetchVersions]);
+    }, [
+        versions,
+        versionsKey,
+        project,
+        versionRow,
+        context,
+        notify,
+        fetchVersions,
+    ]);
     // A popover owns the keyboard; the form stays mounted underneath it.
     const formActive = (tab === 'config' || settings) && focus === 'content' && !overlay;
-    const [editing, setEditing] = useState(false);
     const pickAddon = useCallback(async () => new Promise(resolve => {
         setOverlay({ kind: 'picker', resolve });
-    }), []);
+    }), [setOverlay]);
+    // A freshly created app: once it is the selected project, offer its addon.
+    useEffect(() => {
+        if (!offerAddon || project.root !== offerAddon || overlay)
+            return;
+        setOfferAddon(undefined);
+        const addon = project.devProperties?.addonName;
+        const action = actions.find(entry => entry.id === 'create-addon');
+        if (!addon || !action || !project.devProperties?.domain)
+            return;
+        void context
+            .confirm(t('Create the addon "{addon}" on {domain} now?', {
+            addon,
+            domain: project.devProperties.domain,
+        }))
+            .then(yes => {
+            if (yes)
+                run(action);
+        });
+    }, [offerAddon, project, overlay, context, run]);
     const loadAddons = useCallback(async () => {
-        const config = await resolveDeployConfig(context);
+        const config = await resolveDeployConfig(context, false, { addon: false });
         return config ? listAddons(config) : { error: t('No credentials.') };
     }, [context]);
     const appTasks = tasks.filter(task => task.appRoot === project.root);
-    const logTask = appTasks.find(task => task.status === 'running') ?? appTasks.at(-1);
+    // A new app is not in the list while it is being created, so its log shows
+    // wherever you are; a failed one stays up until another task runs.
+    const creating = tasks.findLast(task => task.kind === 'create');
+    const logTask = appTasks.find(task => task.status === 'running') ??
+        (creating?.status === 'running' ||
+            (creating?.status === 'error' && creating === tasks.at(-1))
+            ? creating
+            : appTasks.at(-1));
     useInput((raw, key) => {
         // Terminals speaking the kitty keyboard protocol report shift+s as
         // "s" plus a shift flag; fold that back into the uppercase letter so
@@ -276,6 +525,9 @@ export function Shell({ apps: initialApps, workspaceRoot, version, minimal = fal
             setFocus(single ? 'content' : 'nav');
             return;
         }
+        // Ctrl+D is not d: only plain keys are shortcuts.
+        if (key.ctrl || key.meta)
+            return;
         if (input === '/') {
             setOverlay({ kind: 'palette' });
             return;
@@ -284,6 +536,11 @@ export function Shell({ apps: initialApps, workspaceRoot, version, minimal = fal
             setOverlay({ kind: 'help' });
             return;
         }
+        // Reachable from the navigator's search and the workspace form too.
+        if (input === ',') {
+            setOverlay({ kind: 'settings' });
+            return;
+        }
         // The config form uses Tab/Shift+Tab to move between fields.
         if (key.tab && !formActive) {
             setFilter('');
@@ -320,6 +577,23 @@ export function Shell({ apps: initialApps, workspaceRoot, version, minimal = fal
                 search(filter + input);
             return;
         }
+        if (settings && focus === 'content') {
+            // Settings pane: the form owns everything but q, y and Tab/Esc above.
+            if (input === 'q')
+                quit();
+            else if (input === 'y') {
+                try {
+                    if (syncDevPropertiesToPackageJson(workspaceRoot)) {
+                        reload();
+                        notify(t('package.json updated'), 'ok');
+                    }
+                }
+                catch (error) {
+                    notify(error instanceof Error ? error.message : String(error), 'error');
+                }
+            }
+            return;
+        }
         if (input === 'a' && tab !== 'versions') {
             setTab('versions');
             setFocus('content');
@@ -338,23 +612,6 @@ export function Shell({ apps: initialApps, workspaceRoot, version, minimal = fal
             setTab(TABS[(i + (key.rightArrow ? 1 : TABS.length - 1)) % TABS.length].id);
             return;
         }
-        if (settings && focus === 'content') {
-            // Settings pane: the form owns everything but q, y and Tab/Esc above.
-            if (input === 'q')
-                quit();
-            else if (input === 'y') {
-                try {
-                    if (syncDevPropertiesToPackageJson(workspaceRoot)) {
-                        reload();
-                        notify(t('package.json updated'), 'ok');
-                    }
-                }
-                catch (error) {
-                    notify(error instanceof Error ? error.message : String(error), 'error');
-                }
-            }
-            return;
-        }
         if (tab === 'versions') {
             const count = versions[versionsKey]?.executables?.length ?? 0;
             if (key.upArrow)
@@ -532,6 +789,8 @@ export function Shell({ apps: initialApps, workspaceRoot, version, minimal = fal
                     base: rawProject.devProperties,
                     environment: env,
                     workspaceRoot,
+                    manifest: project.manifest,
+                    manifestPath: project.paths.manifest,
                 }, active: formActive, width: narrow ? columns : columns - sidebar, height: contentHeight, pickAddon: pickAddon, onSaved: () => {
                     reload();
                     notify(t('config saved'), 'ok');
@@ -574,13 +833,21 @@ function renderOverlay(overlay, env) {
                     overlay.resolve(answer);
                 } }));
         case 'prompt':
-            return (_jsx(TextPrompt, { label: overlay.label, onSubmit: value => {
+            return (_jsx(TextPrompt, { label: overlay.label, initial: overlay.initial, validate: overlay.validate, advise: overlay.advise, error: overlay.error, onSubmit: value => {
                     closeOverlay();
                     overlay.resolve(value);
                 }, onCancel: () => {
                     closeOverlay();
                     overlay.resolve(null);
-                } }));
+                } }, overlay.label));
+        case 'choice':
+            return (_jsx(ChoicePrompt, { label: overlay.label, choices: overlay.choices, multi: overlay.multi, initial: overlay.initial, onSubmit: picked => {
+                    closeOverlay();
+                    overlay.resolve(picked);
+                }, onCancel: () => {
+                    closeOverlay();
+                    overlay.resolve(null);
+                } }, overlay.label));
         case 'help':
             return (_jsx(HelpPanel, { here: here, where: where, height: height, onClose: closeOverlay }));
         case 'changelog':
@@ -597,26 +864,77 @@ function renderOverlay(overlay, env) {
                 } }));
     }
 }
-function Confirm({ message, onAnswer, }) {
-    useInput(input => {
+/**
+ * The open overlays, last one shown. `null` closes the shown one. A new overlay
+ * covers the current one instead of replacing it, so whoever awaits the covered
+ * one still gets an answer. A confirm goes underneath: background tasks raise
+ * them, and on top it would take the keys being typed into a prompt.
+ */
+export function overlayStack(stack, next) {
+    if (next === null)
+        return stack.slice(0, -1);
+    return next.kind === 'confirm' ? [next, ...stack] : [...stack, next];
+}
+export function withoutOverlays(stack, gone) {
+    return stack.filter(overlay => !gone.has(overlay));
+}
+export function Confirm({ message, onAnswer, }) {
+    useInput((input, key) => {
         if (input === 'y' || input === 'Y')
             onAnswer(true);
-        else if (input === 'n' || input === 'N')
+        else if (input === 'n' || input === 'N' || key.escape)
             onAnswer(false);
     });
     return (_jsxs(Box, { flexDirection: "column", paddingX: 1, children: [_jsx(Text, { children: message }), _jsx(Text, { dimColor: true, children: t('y confirm · n cancel') })] }));
 }
-function TextPrompt({ label, onSubmit, onCancel, }) {
-    const [value, setValue] = useState('');
+function ChoicePrompt({ label, choices, multi, initial, onSubmit, onCancel, }) {
+    const [cursor, setCursor] = useState(multi ? 0 : (initial[0] ?? 0));
+    const [checked, setChecked] = useState(() => new Set(multi ? initial : []));
     useInput((input, key) => {
         if (key.escape)
             onCancel();
         else if (key.return)
-            onSubmit(value);
+            onSubmit(multi ? [...checked].toSorted((a, b) => a - b) : [cursor]);
+        else if (key.upArrow)
+            setCursor(c => (c - 1 + choices.length) % choices.length);
+        else if (key.downArrow)
+            setCursor(c => (c + 1) % choices.length);
+        else if (multi && input === ' ') {
+            setChecked(current => {
+                const next = new Set(current);
+                if (!next.delete(cursor))
+                    next.add(cursor);
+                return next;
+            });
+        }
+    });
+    return (_jsxs(Box, { flexDirection: "column", paddingX: 1, children: [_jsx(Text, { bold: true, children: label }), choices.map((choice, i) => (_jsxs(Text, { color: i === cursor ? ACCENT : undefined, bold: i === cursor, children: [i === cursor ? '▸ ' : '  ', multi ? (checked.has(i) ? '◉ ' : '◯ ') : '', choice] }, choice))), _jsx(Text, { dimColor: true, children: multi
+                    ? t('↑↓ move · Space toggle · Enter submit · Esc cancel')
+                    : t('↑↓ move · Enter select · Esc cancel') })] }));
+}
+function TextPrompt({ label, initial = '', validate, advise, error, onSubmit, onCancel, }) {
+    const [value, setValue] = useState(initial);
+    const [problem, setProblem] = useState(error);
+    // The value an advice was shown for; submitting it again keeps it.
+    const [advised, setAdvised] = useState();
+    const advice = advised === value ? advise?.(value) : undefined;
+    useInput((input, key) => {
+        if (key.escape)
+            onCancel();
+        else if (key.return) {
+            const invalid = validate?.(value);
+            setProblem(invalid);
+            if (invalid)
+                return;
+            if (advise?.(value) && advised !== value)
+                setAdvised(value);
+            else
+                onSubmit(value);
+        }
         else if (key.backspace || key.delete)
             setValue(v => v.slice(0, -1));
         else if (input && !key.ctrl && !key.meta)
             setValue(v => v + input);
     });
-    return (_jsxs(Box, { flexDirection: "column", paddingX: 1, children: [_jsx(Text, { bold: true, children: label }), _jsxs(Text, { children: [_jsx(Text, { color: ACCENT, children: "\u276F " }), value, _jsx(Text, { inverse: true, children: " " })] }), _jsx(Text, { dimColor: true, children: t('Press Enter to submit, Esc to cancel') })] }));
+    return (_jsxs(Box, { flexDirection: "column", paddingX: 1, children: [_jsx(Text, { bold: true, children: label }), _jsxs(Text, { children: [_jsx(Text, { color: ACCENT, children: "\u276F " }), value, _jsx(Text, { inverse: true, children: " " })] }), problem && _jsxs(Text, { color: "red", children: ["\u2717 ", problem] }), !problem && advice && _jsx(Text, { color: "yellow", children: advice }), _jsx(Text, { dimColor: true, children: t('Press Enter to submit, Esc to cancel') })] }));
 }

package/dist/shell/Tabs.js

@@ -5,6 +5,7 @@ import { appTypeOf, getPackageJsonSyncChanges, readAncestorDevProperties, locali
 import { checkSitevisionScriptsCompatibility } from '../utils/sitevision-scripts-runner.js';
 import { ACCENT, elapsed } from './Frame.js';
 import { t } from '../utils/i18n.js';
+import { getGlobalSigning } from '../utils/config.js';
 export const TABS = [
     { id: 'overview', label: 'Overview', short: 'Ovw' },
     { id: 'config', label: 'Config', short: 'Cfg' },
@@ -40,11 +41,16 @@ export function Overview({ project, tasks, height, }) {
     const dev = project.devProperties;
     const inherited = new Set(project.inheritedKeys);
     const ancestors = readAncestorDevProperties(project.root);
+    const globalSigning = getGlobalSigning();
     const src = (key) => inherited.has(key)
         ? Object.hasOwn(ancestors, key)
             ? t('↑ root')
             : 'package.json'
-        : undefined;
+        : globalSigning[key] !== undefined &&
+            globalSigning[key] ===
+                dev?.[key]
+            ? t('global')
+            : undefined;
     const notSet = t('not set');
     const sync = getPackageJsonSyncChanges(project.root).length;
     const scripts = checkSitevisionScriptsCompatibility(project.root);
@@ -64,7 +70,7 @@ export function Versions({ project, state, selected, }) {
         return (_jsx(Box, { paddingX: 1, children: _jsx(Text, { color: "yellow", children: t('⚠ Configure dev properties first (e).') }) }));
     }
     if (!state) {
-        return (_jsx(Box, { paddingX: 1, children: _jsx(Text, { dimColor: true, children: t('Press R to fetch versions from {domain}.', {
+        return (_jsx(Box, { paddingX: 1, children: _jsx(Text, { dimColor: true, children: t('Press r to fetch versions from {domain}.', {
                     domain: project.devProperties.domain,
                 }) }) }));
     }

package/dist/utils/config.js

@@ -1,6 +1,7 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import os from 'node:os';
+import { parseJsonc } from './jsonc.js';
 function configDir() {
     const base = process.env['XDG_CONFIG_HOME'] || path.join(os.homedir(), '.config');
     return path.join(base, 'sitevision-cli');
@@ -10,13 +11,33 @@ function configFile() {
 }
 function readConfig() {
     try {
-        return JSON.parse(fs.readFileSync(configFile(), 'utf8'));
+        return parseJsonc(fs.readFileSync(configFile(), 'utf8'));
     }
     catch {
         return {};
     }
 }
+/** Set when the file exists but does not parse; it is then left untouched. */
+export function configProblem() {
+    let text;
+    try {
+        text = fs.readFileSync(configFile(), 'utf8');
+    }
+    catch {
+        return undefined;
+    }
+    try {
+        parseJsonc(text);
+        return undefined;
+    }
+    catch (error) {
+        return error instanceof Error ? error.message : String(error);
+    }
+}
 function writeConfig(config) {
+    // A hand-edited file with a typo must not be replaced by defaults.
+    if (configProblem())
+        return;
     try {
         fs.mkdirSync(configDir(), { recursive: true });
         fs.writeFileSync(configFile(), JSON.stringify(config, null, 2));
@@ -31,10 +52,30 @@ export function getSettings() {
     return {
         language: config.language ?? 'en',
         introAnimation: config.introAnimation ?? true,
+        updateCheck: config.updateCheck ?? true,
+        addonNameDriftWarning: config.warnings?.addonNameDrift ?? true,
     };
 }
 export function setSettings(patch) {
-    writeConfig({ ...readConfig(), ...patch });
+    const { addonNameDriftWarning, ...rest } = patch;
+    const config = { ...readConfig(), ...rest };
+    if (addonNameDriftWarning !== undefined) {
+        config.warnings = {
+            ...config.warnings,
+            addonNameDrift: addonNameDriftWarning,
+        };
+    }
+    writeConfig(config);
+}
+export function getGlobalSigning() {
+    const { signingUsername, certificateName } = readConfig();
+    return {
+        ...(signingUsername && { signingUsername }),
+        ...(certificateName && { certificateName }),
+    };
+}
+export function setGlobalSigning(signing) {
+    writeConfig({ ...readConfig(), ...signing });
 }
 /** Path of the config file, for display. */
 export function settingsFile() {
@@ -44,7 +85,7 @@ export function settingsFile() {
  * True until the user has completed the first-run welcome at least once.
  */
 export function isFirstRun() {
-    return !readConfig().firstRunCompleted;
+    return !configProblem() && !readConfig().firstRunCompleted;
 }
 /**
  * Persist that the first-run welcome has been seen.
@@ -66,6 +107,8 @@ export function getLastSeenVersion() {
  */
 export function setLastSeenVersion(version) {
     const config = readConfig();
+    if (config.lastSeenVersion === version)
+        return;
     config.lastSeenVersion = version;
     writeConfig(config);
 }