sitevision-cli 1.0.0-beta.15 → 1.0.0-beta.17

package/dist/components/AnimatedLogo.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment, useEffect, useRef, useState } from 'react';
-import { Box, Text } from 'ink';
+import { Box, Text, useStdout } from 'ink';
 import { AUTHOR, BIG_LOGO } from '../utils/branding.js';
 const FRAME_MS = 45;
 const SWEEP_COLS_PER_FRAME = 7; // how fast the wipe edge moves left → right
@@ -83,5 +83,11 @@ export function AnimatedLogo({ art = BIG_LOGO, onDone }) {
         }
     }, [frame, total, onDone]);
     const edge = (frame + 1) * SWEEP_COLS_PER_FRAME;
-    return (_jsxs(Box, { flexDirection: "column", padding: 1, children: [art.map((line, y) => (_jsx(Text, { children: buildSpans(line, y, frame, edge).map((span, index) => (_jsx(Fragment, { children: span.color ? (_jsx(Text, { color: span.color, children: span.text })) : (_jsx(Text, { children: span.text })) }, index))) }, y))), _jsxs(Box, { marginTop: 1, children: [_jsx(Text, { dimColor: true, children: '  a tool by ' }), _jsx(Text, { bold: true, children: AUTHOR })] })] }));
+    // Centre the wordmark on the alternate screen. `rows - 1` leaves room for
+    // Ink's trailing newline; a terminal too short for the art just renders it
+    // top-aligned rather than scrolling.
+    const { stdout } = useStdout();
+    const height = (stdout.rows || 24) - 1;
+    const fits = height >= art.length + 2;
+    return (_jsx(Box, { width: stdout.columns || 80, height: fits ? height : undefined, alignItems: "center", justifyContent: "center", children: _jsxs(Box, { flexDirection: "column", padding: 1, children: [art.map((line, y) => (_jsx(Text, { children: buildSpans(line, y, frame, edge).map((span, index) => (_jsx(Fragment, { children: span.color ? (_jsx(Text, { color: span.color, children: span.text })) : (_jsx(Text, { children: span.text })) }, index))) }, y))), _jsxs(Box, { marginTop: 1, children: [_jsx(Text, { dimColor: true, children: '  a tool by ' }), _jsx(Text, { bold: true, children: AUTHOR })] })] }) }));
 }

package/dist/shell/ConfigForm.d.ts

@@ -4,7 +4,7 @@ interface Field {
     key: string;
     label: string;
     kind?: 'text' | 'method' | 'bool' | 'secret';
-    required?: boolean;
+    required?: boolean | Method;
     when?: Method;
     section?: string;
     hint?: string;

package/dist/shell/ConfigForm.js

@@ -11,8 +11,8 @@ const METHODS = ['basic', 'oauth2', 'cookie'];
 const FIELDS = [
     {
         key: 'domain',
-        help: 'Domain of the development environment (USE or TSE) without https://, e.g. myorg-use.sitevision-cloud.se. Deploys and version lookups go here.',
-        label: 'Development domain',
+        help: "Domain of this environment's site (USE or TSE) without https://, e.g. myorg-use.sitevision-cloud.se. Deploys and version lookups go here.",
+        label: 'Domain',
         required: true,
     },
     {
@@ -31,9 +31,9 @@ const FIELDS = [
     },
     {
         key: 'username',
-        help: 'Sitevision account used for deploys, usually your Sitevision Cloud e-mail. It needs DEVELOPER or MANAGE_ADDONS permission on the site.',
+        help: 'Sitevision account used for deploys, usually your Sitevision Cloud e-mail. It needs DEVELOPER or MANAGE_ADDONS permission on the site. Required for basic auth; with oauth2 or cookie it only labels the stored credential.',
         label: 'Username',
-        required: true,
+        required: 'basic',
     },
     {
         key: 'authMethod',
@@ -274,6 +274,7 @@ export function ConfigForm({ project, active, width, height, pickAddon, onSaved,
     const [cursor, setCursor] = useState(0);
     const [editing, setEditing] = useState(false);
     const [draft, setDraft] = useState('');
+    const [caret, setCaret] = useState(0);
     const [note, setNote] = useState('');
     // Values always mirror the project; edits are committed field by field.
     useEffect(() => {
@@ -369,11 +370,21 @@ export function ConfigForm({ project, active, width, height, pickAddon, onSaved,
             else if (key.ctrl && input === 'o' && current.key === 'addonName') {
                 openPicker();
             }
+            else if (key.leftArrow) {
+                setCaret(Math.max(0, caret - 1));
+            }
+            else if (key.rightArrow) {
+                setCaret(Math.min(draft.length, caret + 1));
+            }
             else if (key.backspace || key.delete) {
-                setDraft(d => d.slice(0, -1));
+                if (caret > 0) {
+                    setDraft(draft.slice(0, caret - 1) + draft.slice(caret));
+                    setCaret(caret - 1);
+                }
             }
             else if (input && !key.ctrl && !key.meta) {
-                setDraft(d => d + input);
+                setDraft(draft.slice(0, caret) + input + draft.slice(caret));
+                setCaret(caret + input.length);
             }
             return;
         }
@@ -387,12 +398,15 @@ export function ConfigForm({ project, active, width, height, pickAddon, onSaved,
             openPicker();
         }
         else if (key.return) {
-            setDraft(current.kind === 'secret' ? '' : (values[current.key] ?? ''));
+            const start = current.kind === 'secret' ? '' : (values[current.key] ?? '');
+            setDraft(start);
+            setCaret(start.length);
             setEditing(true);
         }
     }, { isActive: active });
     const source = (f) => {
-        if (f.required && !(values[f.key] ?? ''))
+        const required = f.required === true || f.required === method;
+        if (required && !(values[f.key] ?? ''))
             return { text: t('✗ required'), color: 'red' };
         if (f.kind === 'secret') {
             return { text: storedSecret(project, f.key) ? t('keychain') : '—' };
@@ -438,10 +452,17 @@ export function ConfigForm({ project, active, width, height, pickAddon, onSaved,
         }
         const focused = active && f === current;
         const typing = focused && editing;
-        // Keep the end of a long value (where the cursor is) visible while typing.
-        const tail = (text) => typing && text.length > valueWidth - 1
-            ? `…${text.slice(-(valueWidth - 2))}`
-            : text;
+        // A value being typed into, scrolled so the caret stays in view and drawn
+        // with the caret as an inverted cell.
+        const withCaret = (text) => {
+            const max = Math.max(1, valueWidth - 1);
+            const start = text.length > max
+                ? Math.min(Math.max(0, caret - max + 1), text.length - max)
+                : 0;
+            const shown = text.slice(start, start + max);
+            const at = caret - start;
+            return (_jsxs(Text, { children: [shown.slice(0, at), _jsx(Text, { inverse: true, children: shown[at] ?? ' ' }), shown.slice(at + 1)] }));
+        };
         let display;
         if (f.kind === 'method' || f.kind === 'bool') {
             const choices = options(f);
@@ -449,18 +470,18 @@ export function ConfigForm({ project, active, width, height, pickAddon, onSaved,
             display = choices.map((m, i) => (_jsxs(Text, { children: [_jsx(Text, { bold: m === chosen, color: m === chosen ? ACCENT : undefined, inverse: typing && m === chosen, dimColor: m !== chosen, children: f.kind === 'bool' ? t(m) : m }), i < choices.length - 1 && _jsx(Text, { dimColor: true, children: " \u00B7 " })] }, m)));
         }
         else if (f.kind === 'secret') {
-            display = typing ? (_jsx(Text, { children: tail('•'.repeat(draft.length)) })) : (_jsx(Text, { dimColor: true, children: storedSecret(project, f.key)
+            display = typing ? (withCaret('•'.repeat(draft.length))) : (_jsx(Text, { dimColor: true, children: storedSecret(project, f.key)
                     ? t('•••••••• keychain')
                     : f.hint
                         ? t(f.hint)
                         : '' }));
         }
         else {
-            const value = typing ? draft : values[f.key];
-            display = value ? (_jsx(Text, { children: tail(value) })) : (_jsx(Text, { dimColor: true, children: typing ? '' : f.hint ? t(f.hint) : '—' }));
+            const value = values[f.key];
+            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, 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: _jsxs(Text, { wrap: "truncate", children: [display, typing && options(f).length === 0 && _jsx(Text, { inverse: true, children: " " })] }) }), _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, 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));
     }
     return (_jsxs(Box, { flexDirection: "column", paddingX: 1, overflow: "hidden", height: height, children: [_jsxs(Text, { dimColor: true, children: [('  ' + t('FIELD')).padEnd(24), t('VALUE').padEnd(valueWidth), t('SOURCE')] }), rows, project.workspace && (_jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: t("Shared by every app below {root}. An app's own value wins.", {
                         root: project.root,

package/dist/shell/Frame.d.ts

@@ -28,6 +28,12 @@ export declare function appStatus(project: ProjectInfo): {
     signing: boolean;
     scriptsWarning: string | undefined;
 };
+/** The name shown for an app in the navigator, and what the filter matches. */
+export declare function appLabel(app: ProjectInfo): string;
+/** Indices into `apps` whose label fuzzy-matches the filter. */
+export declare function navMatches(apps: ProjectInfo[], filter: string): number[];
+/** Next selectable index when moving by `delta`, wrapping at both ends. */
+export declare function navMove(ring: number[], selected: number, delta: number): number;
 export interface NavigatorProps {
     apps: ProjectInfo[];
     groupOf: (app: ProjectInfo) => string;
@@ -38,8 +44,9 @@ export interface NavigatorProps {
     single: boolean;
     settingsSelected?: boolean;
     width: number;
+    filter?: string;
 }
-export declare function Navigator({ apps, groupOf, selected, focused, tasks, height, single, settingsSelected, width, }: NavigatorProps): import("react").JSX.Element;
+export declare function Navigator({ apps, groupOf, selected, focused, tasks, height, single, settingsSelected, width, filter, }: NavigatorProps): import("react").JSX.Element;
 export declare function NavigatorStrip({ apps, selected, focused, }: Pick<NavigatorProps, 'apps' | 'selected' | 'focused'>): import("react").JSX.Element;
 export declare function elapsed(task: Task): string;
 export interface Hint {

package/dist/shell/Frame.js

@@ -2,6 +2,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Box, Text } from 'ink';
 import Spinner from 'ink-spinner';
 import { appTypeOf, getPackageJsonSyncChanges, localizedText, } from '../utils/project-detection.js';
+import { fuzzyMatch } from './actions.js';
 import { t } from '../utils/i18n.js';
 export const ACCENT = 'cyan';
 export const NARROW_BELOW = 100;
@@ -40,7 +41,24 @@ function Dots({ project }) {
     const dot = (ok, warn = false) => (_jsx(Text, { color: ok ? 'green' : warn ? 'yellow' : 'red', children: "\u25CF" }));
     return (_jsxs(Text, { children: [dot(s.deps), dot(s.config), dot(s.sync === 0, s.sync > 0), dot(s.signing, !s.signing)] }));
 }
-export function Navigator({ apps, groupOf, selected, focused, tasks, height, single, settingsSelected = false, width, }) {
+/** The name shown for an app in the navigator, and what the filter matches. */
+export function appLabel(app) {
+    return localizedText(app.manifest.name) || app.manifest.id;
+}
+/** Indices into `apps` whose label fuzzy-matches the filter. */
+export function navMatches(apps, filter) {
+    return apps
+        .map((_, index) => index)
+        .filter(index => fuzzyMatch(filter, appLabel(apps[index])));
+}
+/** Next selectable index when moving by `delta`, wrapping at both ends. */
+export function navMove(ring, selected, delta) {
+    if (ring.length === 0)
+        return selected;
+    const at = ring.indexOf(selected);
+    return ring[at === -1 ? 0 : (at + delta + ring.length) % ring.length];
+}
+export function Navigator({ apps, groupOf, selected, focused, tasks, height, single, settingsSelected = false, width, filter = '', }) {
     // Row: marker(1) glyph(3) sp name sp version(6) sp dots(4) inside the padding.
     const nameWidth = width - 2 - 17;
     const running = tasks.filter(task => task.status === 'running');
@@ -51,16 +69,20 @@ export function Navigator({ apps, groupOf, selected, focused, tasks, height, sin
     for (const [index, app] of apps.entries()) {
         const group = groupOf(app);
         if (!single && group !== lastGroup) {
-            rows.push(_jsx(Box, { height: 1, flexShrink: 0, children: _jsxs(Text, { dimColor: true, wrap: "truncate", children: ['  ', group] }) }, `g-${group}`));
+            rows.push(_jsx(Box, { height: 1, flexShrink: 0, children: _jsxs(Text, { dimColor: true, wrap: "truncate", children: ['  ', group] }) }, `g-${index}-${group}`));
             rowApp.push(-1);
             lastGroup = group;
         }
         rowApp.push(index);
         const active = index === selected;
         const busy = running.some(task => task.appRoot === app.root);
-        const name = localizedText(app.manifest.name) || app.manifest.id;
+        const name = appLabel(app);
         rows.push(_jsxs(Box, { width: width - 2, height: 1, flexShrink: 0, children: [_jsxs(Text, { backgroundColor: active && focused ? ACCENT : undefined, color: active && focused ? 'black' : undefined, bold: active, wrap: "truncate", children: [active ? '▎' : ' ', _jsx(Text, { dimColor: !active, children: typeGlyph(app.manifest) }), ' ', name.padEnd(nameWidth).slice(0, nameWidth), ' ', _jsx(Text, { dimColor: true, children: app.manifest.version.padStart(6).slice(0, 6) }), ' '] }), busy ? (_jsx(Text, { color: ACCENT, children: _jsx(Spinner, { type: "dots" }) })) : (_jsx(Dots, { project: app }))] }, app.root));
     }
+    if (rows.length === 0) {
+        rows.push(_jsx(Box, { height: 1, flexShrink: 0, children: _jsx(Text, { dimColor: true, children: '  ' + t('no matches') }) }, "none"));
+        rowApp.push(-1);
+    }
     // Window the list so the selected app stays visible; the lines outside
     // are summarised as "… n more".
     const fixed = 1 + 1 + (single ? 0 : 2) + (running.length > 0 ? running.length + 2 : 0);
@@ -79,14 +101,16 @@ export function Navigator({ apps, groupOf, selected, focused, tasks, height, sin
         if (end < rows.length)
             shown[shown.length - 1] = more(rows.length - end, '↓');
     }
-    return (_jsxs(Box, { flexDirection: "column", width: width, height: height, borderStyle: "single", borderDimColor: true, borderTop: false, borderBottom: false, borderLeft: false, paddingX: 1, overflow: "hidden", children: [_jsx(Text, { bold: true, dimColor: true, children: single
+    return (_jsxs(Box, { flexDirection: "column", width: width, height: height, borderStyle: "single", borderDimColor: true, borderTop: false, borderBottom: false, borderLeft: false, paddingX: 1, overflow: "hidden", children: [filter ? (_jsxs(Text, { wrap: "truncate", children: [_jsx(Text, { color: ACCENT, children: "\u276F " }), filter, _jsx(Text, { inverse: true, children: " " }), _jsxs(Text, { dimColor: true, children: [' ', apps.length === 1
+                                ? t('1 match')
+                                : t('{n} matches', { n: apps.length })] })] })) : (_jsx(Text, { bold: true, dimColor: true, children: single
                     ? t('APP')
                     : apps.length === 1
                         ? t('WORKSPACE 1 app')
-                        : t('WORKSPACE {n} apps', { n: apps.length }) }), shown, _jsx(Text, { dimColor: true, children: '  ' + t('deps·config·sync·signing') }), !single && (_jsx(Box, { marginTop: 1, children: _jsxs(Text, { backgroundColor: settingsSelected && focused ? ACCENT : undefined, color: settingsSelected && focused ? 'black' : undefined, bold: settingsSelected, children: [settingsSelected ? '▎' : ' ', "\u2699 ", t('Workspace settings')] }) })), running.length > 0 && (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsx(Text, { bold: true, dimColor: true, children: t('TASKS') }), running.map(task => (_jsxs(Text, { wrap: "truncate", children: [_jsx(Text, { color: ACCENT, children: _jsx(Spinner, { type: "dots" }) }), ' ', task.label, " ", task.appName, " ", _jsx(Text, { dimColor: true, children: elapsed(task) })] }, task.id)))] }))] }));
+                        : t('WORKSPACE {n} apps', { n: apps.length }) })), shown, _jsx(Text, { dimColor: true, children: '  ' + t('deps·config·sync·signing') }), !single && (_jsx(Box, { marginTop: 1, children: _jsxs(Text, { backgroundColor: settingsSelected && focused ? ACCENT : undefined, color: settingsSelected && focused ? 'black' : undefined, bold: settingsSelected, children: [settingsSelected ? '▎' : ' ', "\u2699 ", t('Workspace settings')] }) })), running.length > 0 && (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsx(Text, { bold: true, dimColor: true, children: t('TASKS') }), running.map(task => (_jsxs(Text, { wrap: "truncate", children: [_jsx(Text, { color: ACCENT, children: _jsx(Spinner, { type: "dots" }) }), ' ', task.label, " ", task.appName, " ", _jsx(Text, { dimColor: true, children: elapsed(task) })] }, task.id)))] }))] }));
 }
 export function NavigatorStrip({ apps, selected, focused, }) {
-    return (_jsx(Box, { paddingX: 1, children: _jsx(Text, { wrap: "truncate", children: apps.map((app, index) => (_jsxs(Text, { backgroundColor: index === selected && focused ? ACCENT : undefined, color: index === selected && focused ? 'black' : undefined, bold: index === selected, children: [' ', typeGlyph(app.manifest), ' ', localizedText(app.manifest.name) || app.manifest.id, ' '] }, app.root))) }) }));
+    return (_jsx(Box, { paddingX: 1, children: _jsx(Text, { wrap: "truncate", children: apps.map((app, index) => (_jsxs(Text, { backgroundColor: index === selected && focused ? ACCENT : undefined, color: index === selected && focused ? 'black' : undefined, bold: index === selected, children: [' ', typeGlyph(app.manifest), " ", appLabel(app), ' '] }, app.root))) }) }));
 }
 export function elapsed(task) {
     const ms = (task.endedAt ?? Date.now()) - task.startedAt;

package/dist/shell/Shell.js

@@ -4,12 +4,12 @@ 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, } from '../utils/project-detection.js';
-import { appGroup } from '../utils/workspace.js';
+import { appGroup, configIncomplete, needsOnboarding, } from '../utils/workspace.js';
 import { listAddons, listExecutables, } from '../utils/sitevision-api.js';
 import { useTasks, runningTasks, startActivate, getTasks, } from '../utils/tasks.js';
 import { PasswordInput } from '../components/PasswordInput.js';
 import { AuthLoginScreen } from '../components/AuthLoginScreen.js';
-import { TopBar, Navigator, NavigatorStrip, BottomBar, navWidth, NARROW_BELOW, ACCENT, } from './Frame.js';
+import { TopBar, Navigator, NavigatorStrip, BottomBar, navMatches, navMove, appLabel, navWidth, NARROW_BELOW, ACCENT, } from './Frame.js';
 import { TabBar, TABS, Overview, Versions, Log, } from './Tabs.js';
 import { CommandPalette } from './CommandPalette.js';
 import { ConfigForm } from './ConfigForm.js';
@@ -37,10 +37,13 @@ export function Shell({ apps: initialApps, workspaceRoot, version }) {
     const { columns, rows } = useSize();
     const tasks = useTasks();
     const [apps, setApps] = useState(initialApps);
-    const [selected, setSelected] = useState(0);
+    // A workspace with nothing to deploy against opens on its settings form.
+    const onboard = useMemo(() => Boolean(workspaceRoot) && needsOnboarding(workspaceRoot, initialApps), [workspaceRoot, initialApps]);
+    const [selected, setSelected] = useState(onboard ? initialApps.length : 0);
     const [tab, setTab] = useState('overview');
-    const [focus, setFocus] = useState(workspaceRoot ? 'nav' : 'content');
+    const [focus, setFocus] = useState(workspaceRoot && !onboard ? 'nav' : 'content');
     const [overlay, setOverlay] = useState(null);
+    const [filter, setFilter] = useState('');
     const [versions, setVersions] = useState({});
     const [versionRow, setVersionRow] = useState(0);
     const [logScroll, setLogScroll] = useState(0);
@@ -76,6 +79,10 @@ export function Shell({ apps: initialApps, workspaceRoot, version }) {
     [workspaceRoot, apps, env]);
     const narrow = columns < NARROW_BELOW;
     const sidebar = navWidth(columns);
+    // The navigator shows the fuzzy matches; `selected` stays an index into
+    // `apps` (with `apps.length` meaning the workspace settings row).
+    const matches = useMemo(() => navMatches(apps, filter), [apps, filter]);
+    const ring = single ? matches : [...matches, apps.length];
     const running = runningTasks();
     // Re-render once a second while something runs so elapsed times move.
     useEffect(() => {
@@ -252,6 +259,13 @@ export function Shell({ apps: initialApps, workspaceRoot, version }) {
             ? raw.toUpperCase()
             : raw;
         if (key.escape) {
+            if (focus === 'nav' && filter) {
+                setFilter('');
+                return;
+            }
+            // Esc backs out of the workspace settings pane, not just its focus.
+            if (settings)
+                setSelected(0);
             setFocus(single ? 'content' : 'nav');
             return;
         }
@@ -260,9 +274,40 @@ export function Shell({ apps: initialApps, workspaceRoot, version }) {
             return;
         }
         if (key.tab) {
+            setFilter('');
             setFocus(f => f === 'nav' && !single ? 'content' : single ? 'content' : 'nav');
             return;
         }
+        // Navigator: typing searches, so no action key fires until Enter has
+        // moved the focus into the content pane.
+        if (focus === 'nav') {
+            const move = (delta) => {
+                setSelected(navMove(ring, selected, delta));
+            };
+            const search = (next) => {
+                setFilter(next);
+                const found = navMatches(apps, next);
+                if (found.length > 0 && !found.includes(selected))
+                    setSelected(found[0]);
+            };
+            if (key.upArrow)
+                move(-1);
+            else if (key.downArrow)
+                move(1);
+            else if (key.return) {
+                if (matches.length > 0 || settings) {
+                    setFilter('');
+                    setFocus('content');
+                }
+            }
+            else if (key.backspace || key.delete)
+                search(filter.slice(0, -1));
+            else if (input === 'q' && !filter)
+                quit();
+            else if (input?.length === 1 && input >= ' ' && !key.ctrl && !key.meta)
+                search(filter + input);
+            return;
+        }
         if (input === 'a' && tab !== 'versions') {
             setTab('versions');
             setFocus('content');
@@ -287,16 +332,7 @@ export function Shell({ apps: initialApps, workspaceRoot, version }) {
                 quit();
             return;
         }
-        if (focus === 'nav') {
-            const last = single ? apps.length - 1 : apps.length;
-            if (key.upArrow)
-                setSelected(s => (s > 0 ? s - 1 : last));
-            if (key.downArrow)
-                setSelected(s => (s < last ? s + 1 : 0));
-            if (key.return)
-                setFocus('content');
-        }
-        else if (tab === 'versions') {
+        if (tab === 'versions') {
             const count = versions[versionsKey]?.executables?.length ?? 0;
             if (key.upArrow)
                 setVersionRow(r => Math.max(0, r - 1));
@@ -331,7 +367,7 @@ export function Shell({ apps: initialApps, workspaceRoot, version }) {
     const mainHeight = frameRows - 2;
     const contentHeight = mainHeight - 1 - (narrow ? 1 : 0);
     const groupOf = (app) => workspaceRoot ? appGroup(workspaceRoot, app.root) : '.';
-    const appName = localizedText(project.manifest.name) || project.manifest.id;
+    const appName = appLabel(project);
     const tabName = t(TABS.find(entry => entry.id === tab).label).toLowerCase();
     const contextLabel = settings
         ? `${t('workspace')} ▸ ${t('settings')}`
@@ -356,61 +392,77 @@ export function Shell({ apps: initialApps, workspaceRoot, version }) {
                 ['↑↓', 'apps'],
                 ['q', 'quit'],
             ]);
+    const navHints = filter
+        ? h([
+            ['↑↓', 'move'],
+            ['Enter', 'select'],
+            ['Esc', 'clear'],
+            ['/', 'commands'],
+        ])
+        : h([
+            ['a–z', 'search'],
+            ['↑↓', 'move'],
+            ['Enter', 'select'],
+            ['/', 'commands'],
+            ['q', 'quit'],
+        ]);
     const hints = overlay
         ? h([['Esc', 'cancel']])
-        : settings
-            ? settingsHints
-            : tab === 'versions'
-                ? h([
-                    ['a', 'activate'],
-                    ['R', 'refresh'],
-                    ['p', 'deploy'],
-                    ['/', 'commands'],
-                    ['q', 'quit'],
-                ])
-                : tab === 'log'
+        : focus === 'nav' && !settings
+            ? navHints
+            : settings
+                ? settingsHints
+                : tab === 'versions'
                     ? h([
-                        ['f', 'follow'],
-                        ['x', 'wrap'],
-                        ['K', 'stop'],
+                        ['a', 'activate'],
+                        ['R', 'refresh'],
                         ['p', 'deploy'],
                         ['/', 'commands'],
                         ['q', 'quit'],
                     ])
-                    : tab === 'config'
-                        ? editing
-                            ? h([
-                                ['Enter', 'save'],
-                                ['Esc', 'cancel'],
-                            ])
-                            : formActive
-                                ? h([
-                                    ['↑↓', 'field'],
-                                    ['Enter', 'edit'],
-                                    ['^O', 'pick addon'],
-                                    ['y', 'sync'],
-                                    ['/', 'commands'],
-                                    ['q', 'quit'],
-                                ])
-                                : h([
-                                    ['Tab', 'edit'],
-                                    ['y', 'sync'],
-                                    ['l', 'login'],
-                                    ['/', 'commands'],
-                                    ['q', 'quit'],
-                                ])
-                        : h([
-                            ['d', 'dev'],
-                            ['w', 'watch'],
-                            ['b', 'build'],
-                            ['s', 'sign'],
+                    : tab === 'log'
+                        ? h([
+                            ['f', 'follow'],
+                            ['x', 'wrap'],
+                            ['K', 'stop'],
                             ['p', 'deploy'],
-                            ['a', 'activate'],
-                            ['E', 'env'],
-                            ['i', 'install'],
                             ['/', 'commands'],
                             ['q', 'quit'],
-                        ]);
+                        ])
+                        : tab === 'config'
+                            ? editing
+                                ? h([
+                                    ['Enter', 'save'],
+                                    ['Esc', 'cancel'],
+                                ])
+                                : formActive
+                                    ? h([
+                                        ['↑↓', 'field'],
+                                        ['Enter', 'edit'],
+                                        ['^O', 'pick addon'],
+                                        ['y', 'sync'],
+                                        ['/', 'commands'],
+                                        ['q', 'quit'],
+                                    ])
+                                    : h([
+                                        ['Tab', 'edit'],
+                                        ['y', 'sync'],
+                                        ['l', 'login'],
+                                        ['/', 'commands'],
+                                        ['q', 'quit'],
+                                    ])
+                            : h([
+                                ['d', 'dev'],
+                                ['w', 'watch'],
+                                ['b', 'build'],
+                                ['s', 'sign'],
+                                ['p', 'deploy'],
+                                ['a', 'activate'],
+                                ['E', 'env'],
+                                ['i', 'install'],
+                                ['/', 'commands'],
+                                ['q', 'quit'],
+                            ]);
     const right = running.length > 0 ? (_jsxs(Text, { children: [_jsx(Text, { color: ACCENT, children: _jsx(Spinner, { type: "dots" }) }), ' ', running[0].label, " ", running[0].appName, running.length > 1 && (_jsxs(Text, { dimColor: true, children: [" \u00B7 ", t('{n} tasks', { n: running.length })] }))] })) : notice ? (_jsx(Text, { color: { info: undefined, ok: 'green', warn: 'yellow', error: 'red' }[notice.level], wrap: "truncate", children: notice.text })) : (_jsx(Text, { dimColor: true, children: t('idle') }));
     const closeOverlay = () => setOverlay(null);
     const content = overlay ? (renderOverlay(overlay, {
@@ -443,7 +495,9 @@ export function Shell({ apps: initialApps, workspaceRoot, version }) {
     return (_jsxs(Box, { flexDirection: "column", width: columns, height: frameRows, children: [_jsx(TopBar, { context: contextLabel, domain: project.devProperties?.domain, auth: authState(project), environment: {
                     name: env,
                     color: environmentColor(env, rawProject.devProperties),
-                }, version: version }), _jsxs(Box, { flexGrow: 1, height: mainHeight, borderStyle: "single", borderDimColor: true, borderLeft: false, borderRight: false, borderBottom: false, children: [!narrow && (_jsx(Navigator, { apps: apps, groupOf: groupOf, selected: selected, focused: focus === 'nav', tasks: tasks, height: mainHeight - 1, single: single, settingsSelected: settings, width: sidebar })), _jsxs(Box, { flexDirection: "column", width: narrow ? columns : columns - sidebar, overflow: "hidden", children: [narrow && !single && (_jsx(NavigatorStrip, { apps: apps, selected: selected, focused: focus === 'nav' })), settings ? (_jsxs(Box, { paddingX: 1, children: [_jsx(Text, { bold: true, color: ACCENT, children: t('Workspace settings') }), _jsx(Text, { dimColor: true, children: t(' · shared .dev_properties.json at the root') })] })) : (_jsx(TabBar, { tab: tab, narrow: narrow, focused: focus === 'content' })), _jsx(Box, { height: contentHeight, overflow: "hidden", alignItems: "flex-start", children: content })] })] }), _jsx(BottomBar, { hints: hints, right: right })] }));
+                }, version: version }), _jsxs(Box, { flexGrow: 1, height: mainHeight, borderStyle: "single", borderDimColor: true, borderLeft: false, borderRight: false, borderBottom: false, children: [!narrow && (_jsx(Navigator, { apps: matches.map(i => apps[i]), groupOf: groupOf, selected: matches.indexOf(selected), focused: focus === 'nav', tasks: tasks, height: mainHeight - 1, single: single, settingsSelected: settings, width: sidebar, filter: filter })), _jsxs(Box, { flexDirection: "column", width: narrow ? columns : columns - sidebar, overflow: "hidden", children: [narrow && !single && (_jsx(NavigatorStrip, { apps: matches.map(i => apps[i]), selected: matches.indexOf(selected), focused: focus === 'nav' })), settings ? (_jsxs(Box, { paddingX: 1, children: [_jsx(Text, { bold: true, color: ACCENT, children: t('Workspace settings') }), _jsx(Text, { dimColor: true, children: onboard && configIncomplete(workspaceTarget?.base)
+                                            ? t(' · new workspace: fill in once, every app inherits · Esc skips')
+                                            : t(' · shared .dev_properties.json at the root') })] })) : (_jsx(TabBar, { tab: tab, narrow: narrow, focused: focus === 'content' })), _jsx(Box, { height: contentHeight, overflow: "hidden", alignItems: "flex-start", children: content })] })] }), _jsx(BottomBar, { hints: hints, right: right })] }));
 }
 function renderOverlay(overlay, env) {
     const { project, closeOverlay, run, notify, loadAddons, height, rerender, openWorkspace, } = env;

package/dist/utils/i18n.js

@@ -147,7 +147,7 @@ const sv = {
     'logged in': 'inloggad',
     'credentials removed': 'uppgifter borttagna',
     // Config form
-    'Development domain': 'Utvecklingsdomän',
+    Domain: 'Domän',
     'Site name': 'Webbplatsnamn',
     'Addon name': 'Tilläggsnamn',
     Username: 'Användarnamn',
@@ -203,6 +203,13 @@ const sv = {
     edit: 'redigera',
     back: 'tillbaka',
     quit: 'avsluta',
+    search: 'sök',
+    move: 'flytta',
+    select: 'välj',
+    clear: 'rensa',
+    'no matches': 'inga träffar',
+    '{n} matches': '{n} träffar',
+    '1 match': '1 träff',
     'edit settings': 'redigera inställningar',
     apps: 'appar',
     activate: 'aktivera',
@@ -224,12 +231,13 @@ const sv = {
     'workspace config saved': 'arbetsytans konfig sparad',
     'config saved': 'konfig sparad',
     ' · shared .dev_properties.json at the root': ' · delad .dev_properties.json i roten',
+    ' · new workspace: fill in once, every app inherits · Esc skips': ' · ny arbetsyta: fyll i en gång, alla appar ärver · Esc hoppar över',
     'y confirm · n cancel': 'y bekräfta · n avbryt',
     // Config help
-    'Domain of the development environment (USE or TSE) without https://, e.g. myorg-use.sitevision-cloud.se. Deploys and version lookups go here.': 'Domän för utvecklingsmiljön (USE eller TSE) utan https://, t.ex. myorg-use.sitevision-cloud.se. Driftsättningar och versionslistor går hit.',
+    "Domain of this environment's site (USE or TSE) without https://, e.g. myorg-use.sitevision-cloud.se. Deploys and version lookups go here.": 'Domän för den här miljöns webbplats (USE eller TSE) utan https://, t.ex. myorg-use.sitevision-cloud.se. Driftsättningar och versionslistor går hit.',
     "Name of the site's root node in Sitevision, exactly as shown in the site tree. It becomes part of the REST API path.": 'Namnet på webbplatsens rotnod i Sitevision, exakt som i webbplatsträdet. Det blir en del av REST API-sökvägen.',
     "Name of the addon (custom module) in the site's Addon Repository that this app is uploaded into. Ctrl+O lists the existing ones.": 'Namnet på tillägget (custom module) i webbplatsens tilläggsförråd som appen laddas upp till. Ctrl+O listar befintliga.',
-    'Sitevision account used for deploys, usually your Sitevision Cloud e-mail. It needs DEVELOPER or MANAGE_ADDONS permission on the site.': 'Sitevision-konto som används för driftsättning, oftast din Sitevision Cloud-e-post. Behöver DEVELOPER eller MANAGE_ADDONS på webbplatsen.',
+    'Sitevision account used for deploys, usually your Sitevision Cloud e-mail. It needs DEVELOPER or MANAGE_ADDONS permission on the site. Required for basic auth; with oauth2 or cookie it only labels the stored credential.': 'Sitevision-konto som används för driftsättning, oftast din Sitevision Cloud-e-post. Behöver DEVELOPER eller MANAGE_ADDONS på webbplatsen. Krävs för basic; med oauth2 eller cookie används det bara för att märka den sparade inloggningen.',
     "How deploys authenticate: basic = username and password; oauth2 = bearer token from the site's OAuth2 provider (PKCE, opens a browser); cookie = reuse a browser SSO/SAML session.": 'Hur driftsättningar autentiseras: basic = användarnamn och lösenord; oauth2 = bearer-token från webbplatsens OAuth2-provider (PKCE, öppnar webbläsare); cookie = återanvänd en SSO/SAML-session från webbläsaren.',
     'Deploy password for the account above. Stored in the OS keychain, never in a file. Leave empty to be asked on each run.': 'Driftsättningslösenord för kontot ovan. Sparas i nyckelringen, aldrig i en fil. Lämna tomt för att bli tillfrågad varje gång.',
     'Client id of the OAuth2 client registered on the site. Its redirect URI must be http://127.0.0.1:8137/callback.': 'Klient-id för OAuth2-klienten som är registrerad på webbplatsen. Dess redirect-URI måste vara http://127.0.0.1:8137/callback.',

package/dist/utils/project-detection.js

@@ -343,7 +343,7 @@ export function resolveRuntimeSecrets(dev) {
     if (dev.authMethod === 'oauth2') {
         dev.accessToken = process.env['SITEVISION_ACCESS_TOKEN'] ?? undefined;
     }
-    if (dev.authMethod === 'cookie' && dev.domain && dev.username) {
+    if (dev.authMethod === 'cookie' && dev.domain) {
         dev.sessionCookie =
             process.env['SITEVISION_SESSION_COOKIE'] ??
                 getSessionCookie(dev.domain, dev.username) ??
@@ -419,10 +419,13 @@ export function writeDevProperties(projectRoot, properties) {
         getDefaultDevPropertiesPath(projectRoot);
     const { password: _password, accessToken: _accessToken, sessionCookie: _sessionCookie, environmentName: _environmentName, productionEnvironment: _productionEnvironment, ...persisted } = properties;
     // Keep the app file minimal: values identical to the inherited ones stay
-    // at the workspace root instead of being copied into every app.
+    // at the workspace root instead of being copied into every app. An empty
+    // string means "unset", so it is dropped rather than written as an override
+    // that would shadow the inherited value.
     const inherited = readInheritedDevProperties(projectRoot);
-    const own = Object.fromEntries(Object.entries(persisted).filter(([key, value]) => !Object.hasOwn(inherited, key) ||
-        JSON.stringify(inherited[key]) !== JSON.stringify(value)));
+    const own = Object.fromEntries(Object.entries(persisted).filter(([key, value]) => value !== '' &&
+        (!Object.hasOwn(inherited, key) ||
+            JSON.stringify(inherited[key]) !== JSON.stringify(value))));
     fs.writeFileSync(devPropertiesPath, JSON.stringify(own, null, 2));
 }
 export function readSvcConfig(projectRoot) {

package/dist/utils/session-cookie-auth.js

@@ -56,7 +56,7 @@ async function readAllCookies(browser, page) {
  */
 export async function beginCookieLogin(dev) {
     const { domain, username } = dev;
-    if (!domain || !username)
+    if (!domain)
         return null;
     let puppeteer;
     try {

package/dist/utils/workspace.d.ts

@@ -1,4 +1,5 @@
 import { type ProjectInfo } from './project-detection.js';
+import type { DevProperties } from '../types/index.js';
 /**
  * Find every Sitevision app below `root` (e.g. root/webapps/x, root/restapps/y).
  * Depth-limited walk that skips dependency and output folders.
@@ -6,3 +7,11 @@ import { type ProjectInfo } from './project-detection.js';
 export declare function discoverApps(root: string): ProjectInfo[];
 /** Group label for an app: its parent folder relative to the workspace root. */
 export declare function appGroup(root: string, appRoot: string): string;
+/** Missing something nothing can deploy without. */
+export declare function configIncomplete(dev?: Partial<DevProperties>): boolean;
+/**
+ * True when a workspace has apps but nothing usable to deploy with: neither the
+ * shared root config nor the apps themselves carry domain/site/username. The
+ * shell then opens on Workspace settings instead of the first app.
+ */
+export declare function needsOnboarding(root: string, apps: ProjectInfo[]): boolean;

package/dist/utils/workspace.js

@@ -1,6 +1,6 @@
 import fs from 'node:fs';
 import path from 'node:path';
-import { detectProject } from './project-detection.js';
+import { detectProject, readWorkspaceDevProperties, } from './project-detection.js';
 const SKIP_DIRS = new Set(['node_modules', '.git', 'dist', 'build']);
 const MAX_DEPTH = 3;
 /**
@@ -39,10 +39,29 @@ export function discoverApps(root) {
         }
     };
     walk(root, 1);
-    return found.toSorted((a, b) => a.root.localeCompare(b.root));
+    // Group first, then path: a deeper folder (webapps/nested) must not split
+    // its parent's run of apps, or the same group heading renders twice.
+    return found.toSorted((a, b) => path.dirname(a.root).localeCompare(path.dirname(b.root)) ||
+        a.root.localeCompare(b.root));
 }
 /** Group label for an app: its parent folder relative to the workspace root. */
 export function appGroup(root, appRoot) {
     const relative = path.relative(root, path.dirname(appRoot));
     return relative === '' ? '.' : relative;
 }
+/** Missing something nothing can deploy without. */
+export function configIncomplete(dev) {
+    if (!dev?.domain || !dev.siteName)
+        return true;
+    return (dev.authMethod ?? 'basic') === 'basic' && !dev.username;
+}
+/**
+ * True when a workspace has apps but nothing usable to deploy with: neither the
+ * shared root config nor the apps themselves carry domain/site/username. The
+ * shell then opens on Workspace settings instead of the first app.
+ */
+export function needsOnboarding(root, apps) {
+    return (apps.length > 0 &&
+        configIncomplete(readWorkspaceDevProperties(root)) &&
+        apps.some(app => configIncomplete(app.devProperties)));
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "sitevision-cli",
-	"version": "1.0.0-beta.15",
+	"version": "1.0.0-beta.17",
 	"license": "MIT",
 	"bin": {
 		"svc": "dist/cli.js"