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

package/dist/shell/ConfigForm.js

@@ -1,12 +1,13 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useEffect, useState } from 'react';
+import { useEffect, useRef, useState } from 'react';
 import { Box, Text, useInput } from 'ink';
-import { findDevPropertiesPath, getPackageJsonSyncChanges, hasPackageJson, IMPLICIT_VALUES, normalizeDomain, readAncestorDevProperties, readInheritedDevProperties, readWorkspaceDevProperties, updatePackageJson, writeDevProperties, } from '../utils/project-detection.js';
+import { addonNameDrift, findDevPropertiesPath, getPackageJsonSyncChanges, hasPackageJson, IMPLICIT_VALUES, normalizeDomain, readAncestorDevProperties, readInheritedDevProperties, readWorkspaceDevProperties, updatePackageJson, writeDevProperties, writeManifestField, } from '../utils/project-detection.js';
 import { setDeployPassword, deleteDeployPassword, getOAuth2ClientSecret, setOAuth2ClientSecret, deleteOAuth2ClientSecret, getSigningPassword, setSigningPassword, deleteSigningPassword, } from '../utils/keychain.js';
 import { DEFAULT_SCOPES, discoverOAuth2Config } from '../utils/oauth2-auth.js';
 import { ACCENT } from './Frame.js';
 import { baseEnvironment, withEnvironmentOverride, } from '../utils/environments.js';
 import { t } from '../utils/i18n.js';
+import { getGlobalSigning, getSettings } from '../utils/config.js';
 const METHODS = ['basic', 'oauth2', 'cookie'];
 const FIELDS = [
     {
@@ -23,7 +24,7 @@ const FIELDS = [
     },
     {
         key: 'addonName',
-        help: "Name of the addon (custom module) in the site's Addon Repository that this app is uploaded into. Ctrl+O lists the existing ones.",
+        help: "Name of the addon (custom module) in the site's Addon Repository that this app is uploaded into. Ctrl+O lists the existing ones. It is separate from the manifest name: to make them match, rename the addon in Sitevision (Addons, General, Settings) and pick it again with Ctrl+O. For a RESTApp the addon name is part of its endpoint URL.",
         label: 'Addon name',
         required: true,
         hint: '^O pick from repo',
@@ -132,6 +133,67 @@ const FIELDS = [
         hint: 'blank = prompt each run',
     },
 ];
+const MANIFEST_FIELDS = [
+    {
+        key: 'id',
+        label: 'App id',
+        required: true,
+        help: 'Identifier of the app in Sitevision; it also names the zip. Changing it makes the next deploy a new app instead of an update.',
+    },
+    {
+        key: 'version',
+        label: 'Version',
+        required: true,
+        help: 'Version of the app. Id and version together identify an upload, so bump it to deploy a new version instead of overwriting the current one.',
+    },
+    {
+        key: 'name',
+        label: 'Name',
+        required: true,
+        help: 'Name shown when importing and administering the app in the Sitevision editor. A multilingual manifest needs at least English.',
+    },
+    {
+        key: 'description',
+        label: 'Description',
+        help: 'Short description shown next to the name in the Sitevision editor.',
+    },
+    {
+        key: 'author',
+        label: 'Author',
+        help: 'Who made the app, shown in the Sitevision editor.',
+    },
+    {
+        key: 'helpUrl',
+        label: 'Help URL',
+        help: "Link to the app's documentation, shown in the Sitevision editor.",
+    },
+];
+/** Rows for manifest.json: one per text field, one per language of a localized one. */
+const LOCALIZABLE = new Set(['name', 'description']);
+export function manifestFields(manifest) {
+    if (!manifest)
+        return [];
+    const raw = manifest;
+    return MANIFEST_FIELDS.flatMap(f => {
+        const value = raw[f.key];
+        const base = { ...f, section: 'MANIFEST', manifestKey: f.key };
+        const localized = (lang) => ({
+            ...base,
+            key: `manifest.${f.key}.${lang}`,
+            lang,
+            required: f.required && lang === 'en',
+        });
+        if (value && typeof value === 'object') {
+            const langs = Object.keys(value);
+            if (!langs.includes('sv'))
+                langs.push('sv');
+            return langs.map(lang => localized(lang));
+        }
+        const plain = { ...base, key: `manifest.${f.key}` };
+        return LOCALIZABLE.has(f.key) ? [plain, localized('sv')] : [plain];
+    });
+}
+const labelOf = (f) => t(f.label) + (f.lang ? ` (${f.lang})` : '');
 const ENV_KEYS = new Set([
     'domain',
     'siteName',
@@ -170,6 +232,15 @@ function fromProject(project) {
         signingUsername: dev.signingUsername ?? '',
         certificateName: dev.certificateName ?? '',
         signingPassword: '',
+        ...Object.fromEntries(manifestFields(project.manifest).map(f => {
+            const value = project.manifest[f.manifestKey];
+            const text = f.lang && value && typeof value === 'object'
+                ? value[f.lang]
+                : f.lang
+                    ? undefined
+                    : value;
+            return [f.key, typeof text === 'string' ? text : ''];
+        })),
     };
 }
 function storedSecret(project, key) {
@@ -190,8 +261,9 @@ const sameValue = (key, a, b) => JSON.stringify(a === '' || a === undefined ? IM
     JSON.stringify(b === '' || b === undefined ? IMPLICIT_VALUES[key] : b);
 /**
  * App mode writes the app's complete file. Workspace mode never creates an
- * app's .dev_properties.json: changes go to the root file, and the addon name
- * to the app's package.json. An app that already has its own file keeps it.
+ * app's .dev_properties.json: changes go to the root file, and addon names (the
+ * base one and each environment's) to the app's package.json, since the root
+ * file is shared by every app. An app that already has its own file keeps it.
  */
 function writeConfigFile(project, file) {
     const { workspaceRoot } = project;
@@ -214,6 +286,40 @@ function writeConfigFile(project, file) {
                 packageJson['addonName'] = after[key] || undefined;
             });
         }
+        else if (key === 'environments') {
+            // `after` is this app's merged view. Only the environment being edited
+            // goes to the shared file, or the app's own overrides would reach
+            // every other app.
+            const environments = Object.entries((after[key] ?? {})).filter(([name]) => !project.environment || name === project.environment);
+            root[key] = {
+                ...root[key],
+                ...Object.fromEntries(environments.map(([name, { addonName: _addonName, ...shared }]) => [
+                    name,
+                    shared,
+                ])),
+            };
+            updatePackageJson(project.root, packageJson => {
+                const svc = { ...packageJson['svc'] };
+                const own = new Map(Object.entries((svc['environments'] ?? {})));
+                for (const [name, { addonName }] of environments) {
+                    const override = {
+                        ...own.get(name),
+                        addonName: addonName || undefined,
+                    };
+                    if (Object.values(override).every(value => value === undefined)) {
+                        own.delete(name);
+                    }
+                    else {
+                        own.set(name, override);
+                    }
+                }
+                svc['environments'] =
+                    own.size > 0 ? Object.fromEntries(own) : undefined;
+                packageJson['svc'] = Object.values(svc).some(value => value !== undefined)
+                    ? svc
+                    : undefined;
+            });
+        }
         else {
             root[key] = after[key];
         }
@@ -223,22 +329,21 @@ function writeConfigFile(project, file) {
 /** Apply the form to disk and the keychain. Exported for the test. */
 export function saveConfig(project, values, edited) {
     const method = values['authMethod'];
+    // Start from what is there: keys the form does not show, and the settings of
+    // the auth methods not in use, survive a save.
     const next = {
+        ...project.devProperties,
         domain: values['domain'],
         siteName: values['siteName'],
         addonName: values['addonName'],
         username: values['username'],
         authMethod: method,
         useHTTPForDevDeploy: values['useHTTPForDevDeploy'] === 'yes',
+        baseEnvironment: values['baseEnvironment']?.trim().toLowerCase() || undefined,
+        production: values['production'] === 'yes' ? true : undefined,
+        signingUsername: values['signingUsername'] || undefined,
+        certificateName: values['certificateName'] || undefined,
     };
-    if (values['baseEnvironment'])
-        next.baseEnvironment = values['baseEnvironment'].trim().toLowerCase();
-    if (values['production'] === 'yes')
-        next.production = true;
-    if (values['signingUsername'])
-        next.signingUsername = values['signingUsername'];
-    if (values['certificateName'])
-        next.certificateName = values['certificateName'];
     if (method === 'oauth2') {
         const scopes = values['scopes'].split(/[\s,]+/).filter(Boolean);
         next.oauth2 = {
@@ -251,8 +356,8 @@ export function saveConfig(project, values, edited) {
             }),
         };
     }
-    else if (method === 'cookie' && values['sessionLoginUrl']) {
-        next.sessionLoginUrl = values['sessionLoginUrl'];
+    else if (method === 'cookie') {
+        next.sessionLoginUrl = values['sessionLoginUrl'] || undefined;
     }
     const env = project.environment;
     if (env && env !== baseEnvironment(project.base) && project.base) {
@@ -306,6 +411,11 @@ export function visibleFields(method, workspace = false, envMode = false) {
 }
 export function ConfigForm({ project, active, width, height, pickAddon, onSaved, onEditingChange, }) {
     const [values, setValues] = useState(() => fromProject(project));
+    // What the form holds when an async lookup lands, not when it started.
+    const latest = useRef({ values, project });
+    useEffect(() => {
+        latest.current = { values, project };
+    });
     const [cursor, setCursor] = useState(0);
     const [editing, setEditing] = useState(false);
     const [draft, setDraft] = useState('');
@@ -325,28 +435,42 @@ export function ConfigForm({ project, active, width, height, pickAddon, onSaved,
     const envMode = Boolean(project.environment &&
         project.environment !==
             baseEnvironment(project.base ?? project.devProperties));
-    const fields = visibleFields(method, project.workspace, envMode);
+    const fields = [
+        ...visibleFields(method, project.workspace, envMode),
+        ...manifestFields(project.manifest),
+    ];
     const current = fields[Math.min(cursor, fields.length - 1)];
     const inherited = readInheritedDevProperties(project.root);
     const ancestors = readAncestorDevProperties(project.root);
+    const globalSigning = getGlobalSigning();
     const changes = getPackageJsonSyncChanges(project.root);
     const packageJsonExists = hasPackageJson(project.root);
     // Write one field to disk (and the keychain for secrets) right away.
-    const commit = (key, value, label = current.label) => {
+    const commit = (key, value, label = labelOf(current)) => {
         const clean = key === 'domain' ? normalizeDomain(value) : value;
+        const field = fields.find(f => f.key === key);
+        if (field?.manifestKey && field.required && !clean) {
+            setNote(t('Not saved: {label} is required.', { label }));
+            return;
+        }
         const next = { ...values, [key]: clean };
         setValues(next);
         try {
-            saveConfig(project, next, new Set([key]));
+            if (field?.manifestKey) {
+                writeManifestField(project.manifestPath, field.manifestKey, clean, field.lang);
+            }
+            else {
+                saveConfig(project, next, new Set([key]));
+            }
         }
         catch (error) {
             setNote(t('Not saved: {error}', { error: errorText(error) }));
             return;
         }
         setNote(clean === value
-            ? t('Saved {label}.', { label: t(label) })
+            ? t('Saved {label}.', { label })
             : t('Saved {label} as {value} — a domain is a host only.', {
-                label: t(label),
+                label,
                 value: clean,
             }));
         onSaved();
@@ -363,14 +487,15 @@ export function ConfigForm({ project, active, width, height, pickAddon, onSaved,
             if (cancelled)
                 return;
             if (found) {
+                const now = latest.current.values;
                 const next = {
-                    ...values,
-                    authorizationEndpoint: values['authorizationEndpoint'] || found.authorizationEndpoint,
-                    tokenEndpoint: values['tokenEndpoint'] || found.tokenEndpoint,
+                    ...now,
+                    authorizationEndpoint: now['authorizationEndpoint'] || found.authorizationEndpoint,
+                    tokenEndpoint: now['tokenEndpoint'] || found.tokenEndpoint,
                 };
                 setValues(next);
                 try {
-                    saveConfig(project, next, new Set());
+                    saveConfig(latest.current.project, next, new Set());
                 }
                 catch (error) {
                     setNote(t('Not saved: {error}', { error: errorText(error) }));
@@ -394,7 +519,7 @@ export function ConfigForm({ project, active, width, height, pickAddon, onSaved,
         void pickAddon().then(name => {
             if (name) {
                 setEditing(false);
-                commit('addonName', name, 'Addon name');
+                commit('addonName', name, t('Addon name'));
             }
         });
     };
@@ -461,13 +586,21 @@ export function ConfigForm({ project, active, width, height, pickAddon, onSaved,
             setEditing(true);
         }
     }, { isActive: active });
+    // An environment's addon name differs from the app's name on purpose.
+    const drift = envMode || !getSettings().addonNameDriftWarning
+        ? undefined
+        : addonNameDrift(values['addonName'], project.manifest);
     const source = (f) => {
         const required = f.required === true || f.required === method;
         if (required && !(values[f.key] ?? ''))
             return { text: t('✗ required'), color: 'red' };
+        if (f.key === 'addonName' && drift)
+            return { text: t('≠ manifest'), color: 'yellow' };
         if (f.kind === 'secret') {
             return { text: storedSecret(project, f.key) ? t('keychain') : '—' };
         }
+        if (f.manifestKey)
+            return { text: (values[f.key] ?? '') ? 'manifest.json' : '' };
         const value = f.kind === 'bool' ? values[f.key] === 'yes' : values[f.key];
         if (envMode && ENV_KEYS.has(f.key)) {
             const override = project.base?.environments?.[project.environment];
@@ -502,17 +635,22 @@ export function ConfigForm({ project, active, width, height, pickAddon, onSaved,
                     : 'package.json',
             };
         }
+        if (value && globalSigning[f.key] === value)
+            return { text: t('global') };
         return { text: (values[f.key] ?? '') ? t('local') : '' };
     };
     // label column (24) + source column + paddings; never below 20.
     const valueWidth = Math.max(20, width - 24 - SOURCE_WIDTH - 2);
     const rows = [];
+    let focusRow = 0;
     let lastSection;
     for (const f of fields) {
         if (f.section && f.section !== lastSection) {
-            rows.push(_jsx(Box, { marginTop: 1, flexShrink: 0, children: _jsx(Text, { bold: true, dimColor: true, children: t(f.section) }) }, `s-${f.section}`));
+            rows.push(_jsx(Box, { height: 1, flexShrink: 0 }, `g-${f.section}`), _jsx(Box, { height: 1, flexShrink: 0, children: _jsx(Text, { bold: true, dimColor: true, children: t(f.section) }) }, `s-${f.section}`));
             lastSection = f.section;
         }
+        if (f === current)
+            focusRow = rows.length;
         const focused = active && f === current;
         const typing = focused && editing;
         // A value being typed into, scrolled so the caret stays in view and drawn
@@ -544,9 +682,13 @@ export function ConfigForm({ project, active, width, height, pickAddon, onSaved,
             display = typing ? (withCaret(draft)) : value ? (_jsx(Text, { children: value })) : (_jsx(Text, { dimColor: true, children: f.hint ? t(f.hint) : '—' }));
         }
         const src = source(f);
-        rows.push(_jsxs(Box, { height: 1, flexShrink: 0, children: [_jsx(Text, { color: focused ? ACCENT : undefined, bold: focused, dimColor: !focused, children: (focused ? '▸ ' : '  ') + t(f.label).padEnd(22) }), _jsx(Box, { width: valueWidth, flexShrink: 0, children: _jsx(Text, { wrap: "truncate", children: display }) }), _jsx(Box, { width: SOURCE_WIDTH, flexShrink: 0, children: _jsx(Text, { dimColor: !src.color, color: src.color, wrap: "truncate", children: focused && f.hint && f.key === 'addonName' ? t(f.hint) : src.text }) })] }, f.key));
+        rows.push(_jsxs(Box, { height: 1, flexShrink: 0, children: [_jsx(Text, { color: focused ? ACCENT : undefined, bold: focused, dimColor: !focused, children: (focused ? '▸ ' : '  ') + labelOf(f).padEnd(22) }), _jsx(Box, { width: valueWidth, flexShrink: 0, children: _jsx(Text, { wrap: "truncate", children: display }) }), _jsx(Box, { width: SOURCE_WIDTH, flexShrink: 0, children: _jsx(Text, { dimColor: !src.color, color: src.color, wrap: "truncate", children: focused && f.hint && f.key === 'addonName' ? t(f.hint) : src.text }) })] }, f.key));
     }
-    return (_jsxs(Box, { flexDirection: "column", paddingX: 1, overflow: "hidden", height: height, children: [_jsx(Box, { height: 1, flexShrink: 0, children: _jsxs(Text, { dimColor: true, wrap: "truncate", children: [('  ' + t('FIELD')).padEnd(24), t('VALUE').padEnd(valueWidth), t('SOURCE')] }) }), rows, project.workspace && (_jsx(Box, { marginTop: 1, flexShrink: 0, children: _jsx(Text, { dimColor: true, children: t("Shared by every app below {root}. An app's own value wins.", {
+    // ponytail: the help panel is assumed to wrap to three lines; measure it if
+    // a narrow pane ever clips the note.
+    const room = Math.max(3, height - 9 - changes.length - (project.workspace ? 2 : 0));
+    const firstRow = Math.max(0, Math.min(focusRow - Math.floor(room / 2), rows.length - room));
+    return (_jsxs(Box, { flexDirection: "column", paddingX: 1, overflow: "hidden", height: height, children: [_jsx(Box, { height: 1, flexShrink: 0, children: _jsxs(Text, { dimColor: true, wrap: "truncate", children: [('  ' + t('FIELD')).padEnd(24), t('VALUE').padEnd(valueWidth), t('SOURCE')] }) }), rows.slice(firstRow, firstRow + room), project.workspace && (_jsx(Box, { marginTop: 1, flexShrink: 0, children: _jsx(Text, { dimColor: true, children: t("Shared by every app below {root}. An app's own value wins.", {
                         root: project.root,
                     }) }) })), _jsxs(Box, { marginTop: 1, flexDirection: "column", flexShrink: 0, children: [_jsxs(Text, { bold: true, dimColor: true, children: [t('PACKAGE.JSON SYNC'), ' ', _jsx(Text, { color: changes.length > 0 || !packageJsonExists ? 'yellow' : 'green', children: !packageJsonExists
                                     ? t('no workspace package.json · y to set up')
@@ -554,5 +696,8 @@ export function ConfigForm({ project, active, width, height, pickAddon, onSaved,
                                         ? t('in sync')
                                         : changes.length === 1
                                             ? t('1 diff · y to apply')
-                                            : t('{n} diffs · y to apply', { n: changes.length }) })] }), changes.map(c => (_jsxs(Text, { wrap: "truncate", children: [_jsx(Text, { color: c.from === undefined ? 'green' : 'yellow', children: c.from === undefined ? '+ ' : '~ ' }), c.key, ": ", c.from !== undefined && _jsxs(Text, { dimColor: true, children: [c.from, " \u2192 "] }), c.to] }, c.key)))] }), _jsx(Box, { flexGrow: 1 }), _jsx(Box, { flexDirection: "column", borderStyle: "single", borderDimColor: true, borderLeft: false, borderRight: false, borderBottom: false, children: _jsxs(Text, { wrap: "wrap", children: [_jsx(Text, { bold: true, color: ACCENT, children: t(current.label) }), _jsxs(Text, { dimColor: true, children: [" \u00B7 ", t(current.help)] })] }) }), _jsx(Text, { color: "yellow", children: note })] }));
+                                            : t('{n} diffs · y to apply', { n: changes.length }) })] }), drift && (_jsxs(Text, { wrap: "truncate", children: [_jsx(Text, { color: "yellow", children: "\u2260 " }), t('addon name {addon} · manifest name {names}', {
+                                addon: values['addonName'] ?? '',
+                                names: drift.join(' / '),
+                            })] })), changes.map(c => (_jsxs(Text, { wrap: "truncate", children: [_jsx(Text, { color: c.from === undefined ? 'green' : 'yellow', children: c.from === undefined ? '+ ' : '~ ' }), c.key, ": ", c.from !== undefined && _jsxs(Text, { dimColor: true, children: [c.from, " \u2192 "] }), c.to] }, c.key)))] }), _jsx(Box, { flexGrow: 1 }), _jsx(Box, { flexDirection: "column", borderStyle: "single", borderDimColor: true, borderLeft: false, borderRight: false, borderBottom: false, children: _jsxs(Text, { wrap: "wrap", children: [_jsx(Text, { bold: true, color: ACCENT, children: labelOf(current) }), _jsxs(Text, { dimColor: true, children: [" \u00B7 ", t(current.help)] })] }) }), _jsx(Text, { color: "yellow", children: note })] }));
 }

package/dist/shell/Frame.js

@@ -11,7 +11,10 @@ export function navWidth(columns) {
     return Math.min(48, Math.max(32, Math.floor(columns / 4)));
 }
 export function TopBar({ context, domain, auth, version, environment, }) {
-    return (_jsxs(Box, { paddingX: 1, justifyContent: "space-between", height: 1, children: [_jsx(Box, { flexShrink: 1, marginRight: 2, children: _jsxs(Text, { wrap: "truncate", children: [_jsx(Text, { bold: true, color: ACCENT, children: "svc" }), environment && (_jsxs(Text, { children: [' ', _jsx(Text, { backgroundColor: environment.color, color: "black", bold: true, children: ` ${environment.name.toUpperCase()} ` })] })), _jsxs(Text, { dimColor: true, children: [" ", context] })] }) }), _jsx(Box, { flexShrink: 0, children: _jsxs(Text, { wrap: "truncate", children: [domain && _jsxs(Text, { dimColor: true, children: [domain, " "] }), _jsx(Text, { color: auth.ready ? 'green' : 'yellow', children: auth.ready ? '●' : '○' }), _jsxs(Text, { children: [" ", auth.label, " "] }), _jsxs(Text, { dimColor: true, children: ["v", version] })] }) })] }));
+    // Narrow terminals squeeze the domain first, then the context, then the
+    // login. `svc` and the environment badge never give way: the badge is the
+    // one thing that says a deploy goes to production.
+    return (_jsxs(Box, { paddingX: 1, height: 1, overflow: "hidden", children: [_jsxs(Box, { flexShrink: 0, children: [_jsx(Text, { bold: true, color: ACCENT, children: "svc" }), environment && (_jsxs(Text, { children: [' ', _jsx(Text, { backgroundColor: environment.color, color: "black", bold: true, children: ` ${environment.name.toUpperCase()} ` })] }))] }), _jsx(Box, { flexShrink: 2, flexGrow: 1, marginRight: 2, minWidth: 0, children: _jsxs(Text, { dimColor: true, wrap: "truncate", children: [' ', context] }) }), domain && (_jsx(Box, { flexShrink: 100, minWidth: 0, marginRight: 1, children: _jsx(Text, { dimColor: true, wrap: "truncate", children: domain }) })), _jsx(Box, { flexShrink: 1, minWidth: 0, children: _jsxs(Text, { wrap: "truncate", children: [_jsx(Text, { color: auth.ready ? 'green' : 'yellow', children: auth.ready ? '●' : '○' }), _jsxs(Text, { children: [" ", auth.label] })] }) }), _jsx(Box, { flexShrink: 0, children: _jsxs(Text, { dimColor: true, children: [" v", version] }) })] }));
 }
 const TYPE_GLYPH = {
     web: 'web',

package/dist/shell/Help.js

@@ -66,10 +66,11 @@ export function HelpPanel({ here, where, height, onClose, }) {
     const inner = useRef(null);
     const [top, setTop] = useState(0);
     const [total, setTotal] = useState(0);
+    // The text depends on the pane and the language, both fixed while this is open.
     useEffect(() => {
         if (inner.current)
             setTotal(measureElement(inner.current).height);
-    });
+    }, [here, where, height]);
     const visible = Math.max(1, height - 1);
     const max = Math.max(0, total - visible);
     useInput((input, key) => {

package/dist/shell/Settings.js

@@ -1,36 +1,73 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useState } from 'react';
 import { Box, Text, useInput } from 'ink';
-import { getSettings, setSettings, settingsFile } from '../utils/config.js';
+import { configProblem, getGlobalSigning, getSettings, setGlobalSigning, setSettings, settingsFile, } from '../utils/config.js';
 import { LANGUAGES, LANGUAGE_NAMES, setLanguage, t, } from '../utils/i18n.js';
 import { ACCENT } from './Frame.js';
 const ROWS = [
     {
         key: 'language',
         label: 'Language',
+        help: 'The language svc itself speaks.',
         options: LANGUAGES,
         display: value => LANGUAGE_NAMES[value],
     },
     {
         key: 'introAnimation',
         label: 'Intro animation',
+        help: 'Play the logo animation when the shell starts.',
         options: ['on', 'off'],
         display: value => t(value),
     },
+    {
+        key: 'updateCheck',
+        label: 'Update check',
+        help: 'Look for a newer svc on npm at start.',
+        options: ['on', 'off'],
+        display: value => t(value),
+    },
+    {
+        key: 'addonNameDriftWarning',
+        label: 'Addon name warning',
+        help: 'Mark the addon name with ≠ manifest when it is none of the names in manifest.json.',
+        options: ['on', 'off'],
+        display: value => t(value),
+    },
+    {
+        key: 'signingUsername',
+        label: 'Default signing user',
+        help: 'The developer.sitevision.se account that signs in every project without a signing user of its own.',
+        options: [],
+        display: value => value,
+    },
+    {
+        key: 'certificateName',
+        label: 'Default certificate',
+        help: 'Which certificate signs when the account has several. Empty = the account default.',
+        options: [],
+        display: value => value,
+    },
 ];
 /** Global preferences, saved per field like the Config tab. */
 export function SettingsScreen({ onChanged, onClose, onOpenWorkspace, }) {
     const [values, setValues] = useState(() => {
         const s = getSettings();
+        const signing = getGlobalSigning();
         return {
             language: s.language,
             introAnimation: s.introAnimation ? 'on' : 'off',
+            updateCheck: s.updateCheck ? 'on' : 'off',
+            addonNameDriftWarning: s.addonNameDriftWarning ? 'on' : 'off',
+            signingUsername: signing.signingUsername ?? '',
+            certificateName: signing.certificateName ?? '',
         };
     });
     const [cursor, setCursor] = useState(0);
     const [editing, setEditing] = useState(false);
     const [draft, setDraft] = useState('');
-    const [note, setNote] = useState('');
+    const [note, setNote] = useState(() => configProblem()
+        ? t('The settings file does not parse and is ignored until it is fixed.')
+        : '');
     const rowCount = ROWS.length + (onOpenWorkspace ? 1 : 0);
     const onWorkspaceRow = cursor === ROWS.length;
     const current = ROWS[Math.min(cursor, ROWS.length - 1)];
@@ -42,8 +79,16 @@ export function SettingsScreen({ onChanged, onClose, onOpenWorkspace, }) {
         setSettings({
             language: next.language,
             introAnimation: next.introAnimation === 'on',
+            updateCheck: next.updateCheck === 'on',
+            addonNameDriftWarning: next.addonNameDriftWarning === 'on',
+        });
+        setGlobalSigning({
+            signingUsername: next.signingUsername.trim() || undefined,
+            certificateName: next.certificateName.trim() || undefined,
         });
-        setNote(t('Saved.'));
+        setNote(configProblem()
+            ? t('Not saved: the settings file does not parse.')
+            : t('Saved.'));
         onChanged();
     };
     useInput((input, key) => {
@@ -56,6 +101,12 @@ export function SettingsScreen({ onChanged, onClose, onOpenWorkspace, }) {
                 if (draft !== values[current.key])
                     commit(draft);
             }
+            else if (current.options.length === 0) {
+                if (key.backspace || key.delete)
+                    setDraft(d => d.slice(0, -1));
+                else if (input && !key.ctrl && !key.meta)
+                    setDraft(d => d + input);
+            }
             else {
                 const step = key.leftArrow || key.upArrow
                     ? -1
@@ -89,8 +140,10 @@ export function SettingsScreen({ onChanged, onClose, onOpenWorkspace, }) {
                 const focused = i === cursor && !onWorkspaceRow;
                 const typing = focused && editing;
                 const chosen = typing ? draft : values[row.key];
-                return (_jsxs(Box, { height: 1, children: [_jsx(Text, { color: focused ? ACCENT : undefined, bold: focused, dimColor: !focused, children: (focused ? '▸ ' : '  ') + t(row.label).padEnd(18) }), _jsx(Text, { children: row.options.map((option, j) => (_jsxs(Text, { children: [_jsx(Text, { bold: option === chosen, color: option === chosen ? ACCENT : undefined, inverse: typing && option === chosen, dimColor: option !== chosen, children: row.display(option) }), j < row.options.length - 1 && _jsx(Text, { dimColor: true, children: " \u00B7 " })] }, option))) })] }, row.key));
-            }), onOpenWorkspace && (_jsxs(Box, { height: 1, children: [_jsx(Text, { color: onWorkspaceRow ? ACCENT : undefined, bold: onWorkspaceRow, dimColor: !onWorkspaceRow, children: (onWorkspaceRow ? '▸ ' : '  ') + t('Workspace config').padEnd(18) }), _jsx(Text, { dimColor: true, children: t('shared auth and site config for every app') })] })), _jsx(Text, { color: "yellow", children: note }), _jsx(Text, { dimColor: true, children: editing
-                    ? t('←→ choose · Enter confirm · Esc cancel')
+                return (_jsxs(Box, { height: 1, children: [_jsx(Text, { color: focused ? ACCENT : undefined, bold: focused, dimColor: !focused, children: (focused ? '▸ ' : '  ') + t(row.label).padEnd(24) }), row.options.length === 0 && (_jsxs(Text, { dimColor: !typing && !chosen, children: [chosen || (typing ? '' : t('not set')), typing && _jsx(Text, { inverse: true, children: " " })] })), _jsx(Text, { children: row.options.map((option, j) => (_jsxs(Text, { children: [_jsx(Text, { bold: option === chosen, color: option === chosen ? ACCENT : undefined, inverse: typing && option === chosen, dimColor: option !== chosen, children: row.display(option) }), j < row.options.length - 1 && _jsx(Text, { dimColor: true, children: " \u00B7 " })] }, option))) })] }, row.key));
+            }), onOpenWorkspace && (_jsxs(Box, { height: 1, children: [_jsx(Text, { color: onWorkspaceRow ? ACCENT : undefined, bold: onWorkspaceRow, dimColor: !onWorkspaceRow, children: (onWorkspaceRow ? '▸ ' : '  ') + t('Workspace config').padEnd(24) }), _jsx(Text, { dimColor: true, children: t('shared auth and site config for every app') })] })), _jsx(Box, { marginTop: 1, paddingLeft: 2, children: _jsx(Text, { dimColor: true, italic: true, children: onWorkspaceRow ? ' ' : t(current.help) }) }), _jsx(Text, { color: "yellow", children: note }), _jsx(Text, { dimColor: true, children: editing
+                    ? current.options.length === 0
+                        ? t('Enter confirm · Esc cancel')
+                        : t('←→ choose · Enter confirm · Esc cancel')
                     : t('↑↓ setting · Enter edit · Esc close') })] }));
 }