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

package/dist/commands/setup-signing.js

@@ -1,42 +1,44 @@
 import fs from 'fs';
 import path from 'path';
 import readline from 'readline';
-function question(rl, prompt) {
-    return new Promise(resolve => {
-        rl.question(prompt, answer => {
-            resolve(answer);
-        });
-    });
+import { findDevPropertiesPath } from '../utils/project-detection.js';
+import { configProblem, getGlobalSigning, setGlobalSigning, settingsFile, } from '../utils/config.js';
+// rl.question drops lines that arrive before it is called, which is every line
+// but the first when stdin is piped. The iterator buffers them.
+function lineReader(rl) {
+    const lines = rl[Symbol.asyncIterator]();
+    return async (prompt) => {
+        process.stdout.write(prompt);
+        const { value, done } = await lines.next();
+        return done ? '' : String(value);
+    };
 }
 export const setupSigningCommand = {
     name: 'setup-signing',
     description: 'Configure signing credentials for developer.sitevision.se',
     requiresProject: true,
-    async execute({ project }) {
+    async execute({ project, flags }) {
+        const global = Boolean(flags['global']);
         const rl = readline.createInterface({
             input: process.stdin,
             output: process.stdout,
         });
+        const question = lineReader(rl);
         console.log('\n\x1b[36m\x1b[1mSetup Signing Credentials\x1b[0m\n');
         console.log('Configure credentials for signing apps on developer.sitevision.se');
         console.log('(Password will be prompted when running signing commands)\n');
-        // Find existing dev properties file
-        const devPropertiesPaths = [
-            path.join(project.root, '.dev_properties.json'),
-            path.join(project.root, '.dev-properties.json'),
-        ];
-        let devPropertiesPath = devPropertiesPaths[0];
+        const devPropertiesPath = findDevPropertiesPath(project.root) ??
+            path.join(project.root, '.dev_properties.json');
         let existingProperties = {};
-        for (const p of devPropertiesPaths) {
-            if (fs.existsSync(p)) {
-                devPropertiesPath = p;
-                try {
-                    existingProperties = JSON.parse(fs.readFileSync(p, 'utf-8'));
-                }
-                catch {
-                    // Invalid file, start fresh
-                }
-                break;
+        if (global) {
+            existingProperties = { ...getGlobalSigning() };
+        }
+        else {
+            try {
+                existingProperties = JSON.parse(fs.readFileSync(devPropertiesPath, 'utf8'));
+            }
+            catch {
+                // Missing or invalid file, start fresh
             }
         }
         try {
@@ -45,13 +47,14 @@ export const setupSigningCommand = {
             const usernamePrompt = defaultUsername
                 ? `Signing username [${defaultUsername}]: `
                 : 'Signing username: ';
-            let signingUsername = await question(rl, usernamePrompt);
+            let signingUsername = await question(usernamePrompt);
             if (!signingUsername && defaultUsername) {
                 signingUsername = defaultUsername;
             }
             if (!signingUsername) {
                 console.log('\x1b[31mError: Signing username is required\x1b[0m');
                 rl.close();
+                process.exitCode = 1;
                 return;
             }
             // Get certificate name (optional)
@@ -59,15 +62,26 @@ export const setupSigningCommand = {
             const certPrompt = defaultCertName
                 ? `Certificate name (blank for default) [${defaultCertName}]: `
                 : 'Certificate name (blank for default): ';
-            let certificateName = await question(rl, certPrompt);
+            let certificateName = await question(certPrompt);
             if (!certificateName && defaultCertName) {
                 certificateName = defaultCertName;
             }
             rl.close();
-            // Update dev properties (strip any plaintext passwords — they live in the keychain)
-            const { signingPassword: _signingRemoved, password: _passwordRemoved, ...cleanedProperties } = existingProperties;
+            if (global) {
+                if (configProblem()) {
+                    console.log(`\x1b[31mError: ${settingsFile()} does not parse; fix it first\x1b[0m`);
+                    process.exitCode = 1;
+                    return;
+                }
+                setGlobalSigning({
+                    signingUsername,
+                    ...(certificateName && { certificateName }),
+                });
+                console.log(`\n\x1b[32mSigning credentials saved to ${settingsFile()}\x1b[0m\n`);
+                return;
+            }
             const updatedProperties = {
-                ...cleanedProperties,
+                ...existingProperties,
                 signingUsername,
                 ...(certificateName && { certificateName }),
             };
@@ -77,6 +91,7 @@ export const setupSigningCommand = {
         catch (error) {
             rl.close();
             console.error('\x1b[31mError setting up signing credentials:\x1b[0m', error);
+            process.exitCode = 1;
         }
     },
 };

package/dist/commands/sign.js

@@ -1,94 +1,17 @@
-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 { signApp } from '../utils/sitevision-api.js';
-import { resolveSigningPassword } from '../utils/signing-password.js';
-import { getZipPath, getSignedZipPath } from '../utils/project-detection.js';
-import { formatFileSize, getZipSize, zipExists } from '../utils/zip.js';
-export function SignScreen({ projectRoot, manifest, devProperties, password, onBack, onRetryCredentials, }) {
-    const [state, setState] = React.useState({
-        status: 'signing',
-        message: 'Signing app via developer.sitevision.se...',
-    });
-    useInput((input, key) => {
-        if (state.status !== 'signing') {
-            if (onBack && (key.escape || input === 'q')) {
-                onBack();
-            }
-            if (onRetryCredentials && state.status === 'error' && input === 'r') {
-                onRetryCredentials();
-            }
-        }
-    });
-    React.useEffect(() => {
-        async function runSign() {
-            try {
-                const zipPath = getZipPath(projectRoot, manifest);
-                const signedZipPath = getSignedZipPath(projectRoot, manifest);
-                // Validate zip exists
-                if (!zipExists(zipPath)) {
-                    setState({
-                        status: 'error',
-                        error: `Zip file not found: ${zipPath}\nRun 'build' first to create the zip file.`,
-                    });
-                    return;
-                }
-                // Sign the app
-                const result = await signApp(zipPath, {
-                    username: devProperties.signingUsername,
-                    password,
-                    certificateName: devProperties.certificateName,
-                }, signedZipPath);
-                if (!result.success) {
-                    setState({
-                        status: 'error',
-                        error: result.error || 'Signing failed',
-                    });
-                    return;
-                }
-                const signedSize = getZipSize(signedZipPath);
-                setState({
-                    status: 'success',
-                    message: 'App signed successfully',
-                    signedPath: signedZipPath,
-                    signedSize,
-                });
-            }
-            catch (error) {
-                setState({
-                    status: 'error',
-                    error: error instanceof Error ? error.message : String(error),
-                });
-            }
-        }
-        runSign();
-    }, [projectRoot, manifest, devProperties, password]);
-    return (_jsxs(Box, { flexDirection: "column", padding: 1, children: [_jsx(Box, { marginBottom: 1, children: _jsx(StatusIndicator, { status: state.status === 'signing' ? 'running' : state.status, label: state.status === 'signing'
-                        ? 'Signing'
-                        : state.status === 'success'
-                            ? 'Signed'
-                            : 'Failed', message: state.message }) }), state.status === 'success' && state.signedPath && (_jsxs(Box, { flexDirection: "column", marginLeft: 2, children: [_jsxs(Text, { color: "green", children: ["Created: ", state.signedPath] }), state.signedSize !== undefined && (_jsxs(Text, { dimColor: true, children: ["Size: ", formatFileSize(state.signedSize)] }))] })), state.status === 'error' && state.error && (_jsx(Box, { flexDirection: "column", marginTop: 1, children: _jsx(Text, { color: "red", children: state.error }) })), state.status !== 'signing' && (_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" })] }))] }));
-}
+import { jsx as _jsx } from "react/jsx-runtime";
+import { render } from 'ink';
+import { TaskScreen } from './TaskScreen.js';
+import { resolveSigningForCli } from './dev.js';
+import { startSign } from '../utils/tasks.js';
 export const signCommand = {
     name: 'sign',
     description: 'Sign the app for production deployment',
     requiresProject: true,
     async execute({ project }) {
-        // Check if signing credentials are configured
-        if (!project.hasSigningProperties ||
-            !project.devProperties?.signingUsername) {
-            console.log('\n\x1b[33mSigning credentials not configured.\x1b[0m');
-            console.log('Run \x1b[36msetup-signing\x1b[0m to configure credentials.\n');
+        const credentials = await resolveSigningForCli(project);
+        if (!credentials)
             return;
-        }
-        const signingUsername = project.devProperties.signingUsername;
-        const password = await resolveSigningPassword(signingUsername);
-        if (!password) {
-            console.log('\x1b[31mError: Password is required\x1b[0m');
-            return;
-        }
-        const { waitUntilExit } = render(_jsx(SignScreen, { projectRoot: project.root, manifest: project.manifest, devProperties: project.devProperties, password: password }));
-        await waitUntilExit();
+        const task = startSign(project, credentials);
+        await render(_jsx(TaskScreen, { task: task })).waitUntilExit();
     },
 };

package/dist/commands/use-finish.js

@@ -0,0 +1,17 @@
+import React from 'react';
+import { useApp } from 'ink';
+/**
+ * Standalone commands end themselves: once `result` is set the Ink app exits,
+ * and a failure becomes a non-zero exit code. `stay` keeps the screen up (for a
+ * retry key) while still recording the failure.
+ */
+export function useFinish(result, stay = false) {
+    const { exit } = useApp();
+    React.useEffect(() => {
+        if (!result)
+            return;
+        process.exitCode = result === 'error' ? 1 : 0;
+        if (!stay)
+            exit();
+    }, [result, stay, exit]);
+}

package/dist/commands/watch.js

@@ -5,14 +5,6 @@ export const watchCommand = {
     name: 'watch',
     description: 'Watch and rebuild (optionally signing) without deploying',
     requiresProject: true,
-    flags: {
-        signed: {
-            type: 'boolean',
-            description: 'Sign after each build',
-            alias: 's',
-            default: false,
-        },
-    },
     async execute({ project, flags }) {
         let signingCredentials;
         if (flags['signed']) {

package/dist/components/AuthLoginScreen.js

@@ -3,7 +3,7 @@ import React from 'react';
 import { Box, Text, useInput } from 'ink';
 import Spinner from 'ink-spinner';
 import { t } from '../utils/i18n.js';
-import { beginOAuth2Login, openBrowser } from '../utils/oauth2-auth.js';
+import { beginOAuth2Login, oauth2ConfigProblem, openBrowser, } from '../utils/oauth2-auth.js';
 import { beginCookieLogin, } from '../utils/session-cookie-auth.js';
 /**
  * Ink-native interactive login for OAuth2 and session-cookie auth. Drives the
@@ -19,11 +19,13 @@ export function AuthLoginScreen({ method, devProperties, onComplete, onError, on
     const cookieRef = React.useRef(null);
     const cancelOAuthRef = React.useRef(null);
     React.useEffect(() => {
+        // Set by the cleanup: the screen went away while a login was starting.
+        let gone = false;
         void (async () => {
             if (method === 'oauth2') {
                 const session = beginOAuth2Login(devProperties);
                 if (!session) {
-                    onError('OAuth2 is not fully configured (authorization/token endpoint or client ID missing).');
+                    onError(oauth2ConfigProblem(devProperties) ?? 'Could not start the login.');
                     return;
                 }
                 cancelOAuthRef.current = session.cancel;
@@ -32,6 +34,8 @@ export function AuthLoginScreen({ method, devProperties, onComplete, onError, on
                 setPhase('awaiting');
                 const { token, error } = await session.complete();
                 cancelOAuthRef.current = null;
+                if (gone)
+                    return;
                 if (token) {
                     onComplete({ accessToken: token });
                 }
@@ -41,8 +45,12 @@ export function AuthLoginScreen({ method, devProperties, onComplete, onError, on
             }
             else {
                 const session = await beginCookieLogin(devProperties);
+                if (gone) {
+                    void session?.close();
+                    return;
+                }
                 if (!session) {
-                    onError('Could not open a login browser (is Chrome installed?). Set SITEVISION_SESSION_COOKIE or pass --cookie with a cookie copied from your browser.');
+                    onError('Could not open a login browser (is Chrome installed?). Set SITEVISION_SESSION_COOKIE to a cookie copied from your browser.');
                     return;
                 }
                 cookieRef.current = session;
@@ -53,6 +61,7 @@ export function AuthLoginScreen({ method, devProperties, onComplete, onError, on
         // Release resources if the screen unmounts before completing: close the
         // browser (cookie) and the loopback server (oauth2, frees the port).
         return () => {
+            gone = true;
             void cookieRef.current?.close();
             cookieRef.current = null;
             cancelOAuthRef.current?.();
@@ -72,16 +81,22 @@ export function AuthLoginScreen({ method, devProperties, onComplete, onError, on
                 return;
             setPhase('capturing');
             void (async () => {
-                const result = await session.capture();
-                if (result.cookie) {
-                    cookieRef.current = null;
-                    await session.close();
-                    onComplete({ sessionCookie: result.cookie });
+                try {
+                    const result = await session.capture();
+                    if (result.cookie) {
+                        cookieRef.current = null;
+                        await session.close();
+                        onComplete({ sessionCookie: result.cookie });
+                    }
+                    else {
+                        // Keep the browser open so the user can navigate and retry.
+                        setNote(result.error ?? 'No session cookie found.');
+                        setPhase('awaiting');
+                    }
                 }
-                else {
-                    // Keep the browser open so the user can navigate and retry.
-                    setNote(result.error ?? 'No session cookie found.');
-                    setPhase('awaiting');
+                catch (error) {
+                    // The browser window was closed: nothing left to capture from.
+                    onError(`Could not read the session from the browser: ${error instanceof Error ? error.message : String(error)}`);
                 }
             })();
         }

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, writeManifestField, } 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',
@@ -168,6 +169,7 @@ const MANIFEST_FIELDS = [
     },
 ];
 /** 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 [];
@@ -175,15 +177,20 @@ export function manifestFields(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') {
-            return Object.keys(value).map(lang => ({
-                ...base,
-                key: `manifest.${f.key}.${lang}`,
-                lang,
-                required: f.required && lang === 'en',
-            }));
+            const langs = Object.keys(value);
+            if (!langs.includes('sv'))
+                langs.push('sv');
+            return langs.map(lang => localized(lang));
         }
-        return [{ ...base, key: `manifest.${f.key}` }];
+        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})` : '');
@@ -227,9 +234,11 @@ function fromProject(project) {
         signingPassword: '',
         ...Object.fromEntries(manifestFields(project.manifest).map(f => {
             const value = project.manifest[f.manifestKey];
-            const text = f.lang
+            const text = f.lang && value && typeof value === 'object'
                 ? value[f.lang]
-                : value;
+                : f.lang
+                    ? undefined
+                    : value;
             return [f.key, typeof text === 'string' ? text : ''];
         })),
     };
@@ -252,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;
@@ -276,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];
         }
@@ -285,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 = {
@@ -313,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) {
@@ -368,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('');
@@ -394,6 +442,7 @@ export function ConfigForm({ project, active, width, height, pickAddon, onSaved,
     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.
@@ -438,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) }));
@@ -536,10 +586,16 @@ 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') : '—' };
         }
@@ -579,6 +635,8 @@ 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.
@@ -638,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: labelOf(current) }), _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) => {