sitevision-cli 1.0.0-beta.23 → 1.0.0-beta.24

package/dist/cli.js

@@ -4,6 +4,9 @@ import { render } from 'ink';
 import { Text, Box } from 'ink';
 import meow from 'meow';
 import { readFileSync } from 'node:fs';
+import os from 'node:os';
+import { runningTasks } from './utils/tasks.js';
+import { killAllChildren } from './utils/process-runner.js';
 import { Shell } from './shell/Shell.js';
 import { getCommand } from './commands/index.js';
 import { requireProject, detectProject, migrateLegacyPassword, } from './utils/project-detection.js';
@@ -105,6 +108,20 @@ function printMasthead(version) {
         `${spaces(gap)}${DIM}${right}${RESET}${spaces(padding)}${CYAN}│${RESET}`);
     console.log(`${CYAN}╰${border}╯${RESET}`);
 }
+/**
+ * Stop every running task and kill leftover child processes. In raw mode Ink
+ * reads Ctrl+C as a keypress, so no SIGINT reaches anything else. Exits when
+ * there was work to stop (or on a signal); otherwise the process ends on its
+ * own, so a command's last output is never cut off.
+ */
+function shutdown(code) {
+    const busy = runningTasks();
+    for (const task of busy)
+        task.stop();
+    const killed = killAllChildren();
+    if (busy.length > 0 || killed > 0 || code !== undefined)
+        process.exit(code);
+}
 function fail(message, hint) {
     render(_jsxs(Box, { flexDirection: "column", padding: 1, children: [_jsxs(Text, { color: "red", children: ["Error: ", message] }), _jsx(Text, { dimColor: true, children: hint })] }));
     process.exit(1);
@@ -130,6 +147,8 @@ async function playIntro(art) {
 // inside the same buffer, when the terminal is wide enough for it.
 async function runShell(apps, workspaceRoot) {
     process.stdout.write('\x1b[?1049h\x1b[H');
+    // Also leave the alternate screen when a signal exits past the finally.
+    process.once('exit', () => process.stdout.write('\x1b[?1049l'));
     try {
         const art = process.stdin.isTTY && settings.introAnimation && !cli.flags.minimal
             ? pickIntroArt(process.stdout.columns ?? 0)
@@ -146,6 +165,11 @@ async function runShell(apps, workspaceRoot) {
     }
 }
 async function main() {
+    for (const signal of ['SIGINT', 'SIGTERM', 'SIGHUP']) {
+        process.on(signal, () => {
+            shutdown(128 + os.constants.signals[signal]);
+        });
+    }
     // On the very first run we show a dedicated welcome screen instead of the
     // masthead, so the branding is the moment. Only when stdin is a TTY — the
     // welcome is interactive and would hang in CI / piped input.
@@ -188,6 +212,7 @@ async function main() {
                 fail('No Sitevision apps found here.', 'Run svc inside an app directory (manifest.json) or at the root of a repo that contains apps.');
             }
             await runShell(apps, process.cwd());
+            shutdown();
             return;
         }
         if (firstRun) {
@@ -201,6 +226,7 @@ async function main() {
             });
         }
         await runShell([project]);
+        shutdown();
         return;
     }
     // Check if we're in a Sitevision project
@@ -255,6 +281,7 @@ async function main() {
         flags: cli.flags,
         args,
     });
+    shutdown();
 }
 main().catch(error => {
     console.error('Fatal error:', error);

package/dist/commands/deploy.js

@@ -3,7 +3,7 @@ import React from 'react';
 import { render, Box, Text, useInput } from 'ink';
 import { StatusIndicator } from '../components/StatusIndicator.js';
 import { deployApp, deployProduction } from '../utils/sitevision-api.js';
-import { getZipPath, getSignedZipPath, getAppType, } from '../utils/project-detection.js';
+import { getDeployZipPath, getSignedZipPath, getAppType, } from '../utils/project-detection.js';
 import { zipExists } from '../utils/zip.js';
 import { promptPassword, promptYesNo } from '../utils/password-prompt.js';
 import { setDeployPassword, deleteSessionCookie, deleteOAuth2RefreshToken, } from '../utils/keychain.js';
@@ -161,8 +161,7 @@ export function DeployScreen({ projectRoot, manifest, devProperties, force, prod
                     });
                 }
                 else {
-                    // Dev deployment can use unsigned zip
-                    const zipPath = getZipPath(projectRoot, manifest);
+                    const zipPath = getDeployZipPath(projectRoot, manifest);
                     if (!zipExists(zipPath)) {
                         setState({
                             status: 'error',

package/dist/commands/dev.js

@@ -21,18 +21,6 @@ export function DevScreen({ project, options }) {
             exit();
         }
     });
-    React.useEffect(() => {
-        const stop = () => {
-            live.stop();
-            exit();
-        };
-        process.on('SIGINT', stop);
-        process.on('SIGTERM', stop);
-        return () => {
-            process.off('SIGINT', stop);
-            process.off('SIGTERM', stop);
-        };
-    }, [live, exit]);
     const status = live.status === 'running'
         ? live.phase === 'error'
             ? 'error'

package/dist/shell/Shell.js

@@ -251,7 +251,7 @@ export function Shell({ apps: initialApps, workspaceRoot, version, minimal = fal
     useInput((raw, key) => {
         // Terminals speaking the kitty keyboard protocol report shift+s as
         // "s" plus a shift flag; fold that back into the uppercase letter so
-        // P, K, R behave the same everywhere.
+        // P and K behave the same everywhere.
         const input = key.shift && raw.length === 1 && /[a-z]/.test(raw)
             ? raw.toUpperCase()
             : raw;
@@ -270,7 +270,8 @@ export function Shell({ apps: initialApps, workspaceRoot, version, minimal = fal
             setOverlay({ kind: 'palette' });
             return;
         }
-        if (key.tab) {
+        // The config form uses Tab/Shift+Tab to move between fields.
+        if (key.tab && !formActive) {
             setFilter('');
             setFocus(f => f === 'nav' && !single ? 'content' : single ? 'content' : 'nav');
             return;
@@ -346,7 +347,7 @@ export function Shell({ apps: initialApps, workspaceRoot, version, minimal = fal
                 setVersionRow(r => Math.max(0, r - 1));
             if (key.downArrow)
                 setVersionRow(r => Math.min(Math.max(0, count - 1), r + 1));
-            if (input === 'R')
+            if (input === 'r')
                 void fetchVersions(false);
             else if (input === 'a' && count > 0)
                 void activateSelected();
@@ -426,8 +427,9 @@ export function Shell({ apps: initialApps, workspaceRoot, version, minimal = fal
                 : tab === 'versions'
                     ? h([
                         ['a', 'activate'],
-                        ['R', 'refresh'],
+                        ['r', 'refresh'],
                         ['p', 'deploy'],
+                        ['P', 'force'],
                         ['/', 'commands'],
                         ['q', 'quit'],
                     ])
@@ -437,6 +439,7 @@ export function Shell({ apps: initialApps, workspaceRoot, version, minimal = fal
                             ['x', 'wrap'],
                             ['K', 'stop'],
                             ['p', 'deploy'],
+                            ['P', 'force'],
                             ['/', 'commands'],
                             ['q', 'quit'],
                         ])
@@ -468,9 +471,14 @@ export function Shell({ apps: initialApps, workspaceRoot, version, minimal = fal
                                 ['b', 'build'],
                                 ['s', 'sign'],
                                 ['p', 'deploy'],
-                                ['a', 'activate'],
-                                ['E', 'env'],
+                                ['P', 'force'],
+                                ['v', 'env'],
+                                ['K', 'stop'],
+                                ['a', 'versions'],
+                                ['e', 'config'],
                                 ['i', 'install'],
+                                ['l', 'login'],
+                                [',', 'settings'],
                                 ['/', 'commands'],
                                 ['q', 'quit'],
                             ]);

package/dist/shell/Tabs.js

@@ -72,8 +72,8 @@ export function Versions({ project, state, selected, }) {
     return (_jsxs(Box, { flexDirection: "column", paddingX: 1, overflow: "hidden", children: [_jsxs(Text, { dimColor: true, children: [t('APP IDENTIFIER').padEnd(30), t('VERSION').padEnd(12), t('ACTIVE'), state.loading && (_jsxs(Text, { color: ACCENT, children: [' '.repeat(3), _jsx(Spinner, { type: "dots" })] }))] }), state.error && _jsx(Text, { color: "red", children: state.error }), list.map((e, i) => (_jsxs(Text, { backgroundColor: i === selected ? ACCENT : undefined, color: i === selected ? 'black' : undefined, wrap: "truncate", children: [e.appIdentifier.padEnd(30).slice(0, 30), e.appVersion.padEnd(12), e.active ? '●' : '○', i === selected ? ` ${e.id}` : ''] }, e.id))), !state.loading && !state.error && list.length === 0 && (_jsx(Text, { dimColor: true, children: t('No versions uploaded to {addon}.', {
                     addon: project.devProperties.addonName,
                 }) })), _jsx(Box, { marginTop: 1, children: _jsxs(Text, { dimColor: true, children: [list.length === 1
-                            ? t('1 version · a activate selected · R refresh')
-                            : t('{n} versions · a activate selected · R refresh', {
+                            ? t('1 version · a activate selected · r refresh')
+                            : t('{n} versions · a activate selected · r refresh', {
                                 n: list.length,
                             }), state.fetchedAt
                             ? t(' · fetched {time}', { time: time(state.fetchedAt) })
@@ -86,5 +86,5 @@ export function Log({ task, height, scroll, wrap, }) {
     const visible = Math.max(1, height - 2);
     const end = Math.max(0, task.lines.length - scroll);
     const lines = task.lines.slice(Math.max(0, end - visible), end);
-    return (_jsxs(Box, { flexDirection: "column", paddingX: 1, overflow: "hidden", children: [_jsxs(Text, { children: [STATUS_GLYPH[task.status], " ", task.label, " ", task.appName, ' ', _jsxs(Text, { dimColor: true, children: [task.phase, " \u00B7 ", elapsed(task), scroll > 0 ? ` · ↑${scroll}` : t(' · following')] })] }), lines.map((line, i) => (_jsxs(Text, { wrap: wrap ? 'wrap' : 'truncate', color: LEVEL_COLOR[line.level], children: [_jsxs(Text, { dimColor: true, children: [time(line.time, true), " ", line.tag.padEnd(3)] }), ' ', line.text] }, i)))] }));
+    return (_jsxs(Box, { width: "100%", flexDirection: "column", paddingX: 1, overflow: "hidden", children: [_jsxs(Text, { children: [STATUS_GLYPH[task.status], " ", task.label, " ", task.appName, ' ', _jsxs(Text, { dimColor: true, children: [task.phase, " \u00B7 ", elapsed(task), scroll > 0 ? ` · ↑${scroll}` : t(' · following')] })] }), _jsx(Box, { flexDirection: "column", maxHeight: visible, justifyContent: "flex-end", overflow: "hidden", children: lines.map((line, i) => (_jsx(Box, { flexShrink: 0, children: _jsxs(Text, { wrap: wrap ? 'wrap' : 'truncate', color: LEVEL_COLOR[line.level], children: [_jsxs(Text, { dimColor: true, children: [time(line.time, true), " ", line.tag.padEnd(3)] }), ' ', line.text] }) }, i))) }, wrap ? 'wrap' : 'truncate')] }));
 }

package/dist/utils/i18n.js

@@ -68,8 +68,8 @@ const sv = {
     VERSION: 'VERSION',
     ACTIVE: 'AKTIV',
     'No versions uploaded to {addon}.': 'Inga versioner uppladdade till {addon}.',
-    '{n} versions · a activate selected · R refresh': '{n} versioner · a aktivera vald · R uppdatera',
-    '1 version · a activate selected · R refresh': '1 version · a aktivera vald · R uppdatera',
+    '{n} versions · a activate selected · r refresh': '{n} versioner · a aktivera vald · r uppdatera',
+    '1 version · a activate selected · r refresh': '1 version · a aktivera vald · r uppdatera',
     ' · fetched {time}': ' · hämtad {time}',
     'No task yet. d dev · w watch · b build · s sign · p deploy': 'Ingen uppgift ännu. d dev · w watch · b build · s sign · p deploy',
     ' · following': ' · följer',
@@ -97,7 +97,7 @@ const sv = {
     'e.g. test or prod, overriding domain and auth': 't.ex. test eller prod, med egen domän och auth',
     'Environment name (e.g. test, prod)': 'Miljönamn (t.ex. test, prod)',
     'Deploy the signed {id} to {env} and activate it?': 'Driftsätt signerade {id} till {env} och aktivera?',
-    'Dev never deploys to a production environment ({env}). Switch with E.': 'Dev driftsätter aldrig till en produktionsmiljö ({env}). Byt med E.',
+    'Dev never deploys to a production environment ({env}). Switch with v.': 'Dev driftsätter aldrig till en produktionsmiljö ({env}). Byt med v.',
     'switched to {env}': 'bytte till {env}',
     'environment {env} added': 'miljön {env} tillagd',
     environment: 'miljö',
@@ -217,6 +217,8 @@ const sv = {
     activate: 'aktivera',
     refresh: 'uppdatera',
     deploy: 'driftsätt',
+    force: 'tvinga',
+    versions: 'versioner',
     commands: 'kommandon',
     follow: 'följ',
     wrap: 'radbryt',

package/dist/utils/process-runner.d.ts

@@ -1,3 +1,4 @@
+import { type ChildProcess, type SpawnOptions } from 'child_process';
 import { EventEmitter } from 'events';
 export interface ProcessOutput {
     type: 'stdout' | 'stderr';
@@ -7,15 +8,23 @@ export interface ProcessResult {
     exitCode: number;
     output: ProcessOutput[];
 }
+/**
+ * Spawn a child in its own process group, so stopping it also stops whatever it
+ * starts (npm, webpack workers), and track it so the CLI can kill leftovers on
+ * exit.
+ */
+export declare function spawnChild(command: string, args: string[], options?: SpawnOptions): ChildProcess;
+/** Stop a child and everything it started. */
+export declare function killChild(child: ChildProcess): void;
+/** Kill every child still running; returns how many were signalled. */
+export declare function killAllChildren(): number;
 export declare class ProcessRunner extends EventEmitter {
     private process;
-    private output;
+    private readonly output;
     private readonly command;
     private readonly args;
     private readonly cwd?;
-    private readonly interactive;
-    private readonly customEnv?;
-    constructor(command: string, args?: string[], cwd?: string, interactive?: boolean, customEnv?: Record<string, string>);
+    constructor(command: string, args?: string[], cwd?: string);
     run(): Promise<ProcessResult>;
     kill(): void;
     getOutput(): ProcessOutput[];

package/dist/utils/process-runner.js

@@ -1,54 +1,81 @@
-import { spawn } from 'child_process';
+import { spawn, spawnSync, } from 'child_process';
 import { EventEmitter } from 'events';
+const children = new Set();
+/**
+ * Spawn a child in its own process group, so stopping it also stops whatever it
+ * starts (npm, webpack workers), and track it so the CLI can kill leftovers on
+ * exit.
+ */
+export function spawnChild(command, args, options = {}) {
+    const child = spawn(command, args, {
+        ...options,
+        detached: process.platform !== 'win32',
+    });
+    children.add(child);
+    const forget = () => children.delete(child);
+    child.on('close', forget);
+    child.on('error', forget);
+    return child;
+}
+/** Stop a child and everything it started. */
+export function killChild(child) {
+    if (child.pid === undefined ||
+        child.exitCode !== null ||
+        child.signalCode !== null) {
+        return;
+    }
+    try {
+        if (process.platform === 'win32') {
+            // No process groups on Windows: taskkill /T takes the whole tree.
+            spawnSync('taskkill', ['/pid', String(child.pid), '/T', '/F'], {
+                stdio: 'ignore',
+                windowsHide: true,
+            });
+        }
+        else {
+            process.kill(-child.pid, 'SIGTERM');
+        }
+    }
+    catch {
+        // Already gone.
+    }
+}
+/** Kill every child still running; returns how many were signalled. */
+export function killAllChildren() {
+    const running = [...children];
+    for (const child of running)
+        killChild(child);
+    return running.length;
+}
 export class ProcessRunner extends EventEmitter {
     process = null;
     output = [];
     command;
     args;
     cwd;
-    interactive;
-    customEnv;
-    constructor(command, args = [], cwd, interactive = false, customEnv) {
+    constructor(command, args = [], cwd) {
         super();
         this.command = command;
         this.args = args;
         this.cwd = cwd;
-        this.interactive = interactive;
-        this.customEnv = customEnv;
     }
     run() {
         return new Promise((resolve, reject) => {
-            this.process = spawn(this.command, this.args, {
+            this.process = spawnChild(this.command, this.args, {
                 cwd: this.cwd || process.cwd(),
-                env: { ...process.env, ...this.customEnv },
                 shell: true,
-                stdio: this.interactive ? 'inherit' : 'pipe',
+                stdio: 'pipe',
             });
-            // Only capture output if not in interactive mode
-            if (!this.interactive) {
-                this.process.stdout?.on('data', data => {
-                    const output = {
-                        type: 'stdout',
-                        data: data.toString(),
-                    };
-                    this.output.push(output);
-                    if (this.output.length > 1000) {
-                        this.output.shift();
-                    }
-                    this.emit('output', output);
-                });
-                this.process.stderr?.on('data', data => {
-                    const output = {
-                        type: 'stderr',
-                        data: data.toString(),
-                    };
-                    this.output.push(output);
-                    if (this.output.length > 1000) {
-                        this.output.shift();
-                    }
-                    this.emit('output', output);
-                });
-            }
+            const capture = (type) => (data) => {
+                const output = { type, data: data.toString() };
+                this.output.push(output);
+                if (this.output.length > 1000) {
+                    this.output.shift();
+                }
+                this.emit('output', output);
+            };
+            this.process.stdout?.on('data', capture('stdout'));
+            this.process.stderr?.on('data', capture('stderr'));
             this.process.on('error', error => {
                 this.emit('error', error);
                 reject(error);
@@ -64,9 +91,8 @@ export class ProcessRunner extends EventEmitter {
         });
     }
     kill() {
-        if (this.process) {
-            this.process.kill('SIGTERM');
-        }
+        if (this.process)
+            killChild(this.process);
     }
     getOutput() {
         return this.output;

package/dist/utils/project-detection.d.ts

@@ -62,6 +62,11 @@ export declare function getZipPath(projectRoot: string, manifest: SitevisionMani
  * Get the full path to the signed zip file in dist/
  */
 export declare function getSignedZipPath(projectRoot: string, manifest: SitevisionManifest): string;
+/**
+ * The zip a non-production deploy uploads: the signed one when it is at least
+ * as new as the build, since some sites reject unsigned apps even on dev.
+ */
+export declare function getDeployZipPath(projectRoot: string, manifest: SitevisionManifest): string;
 /**
  * Get API endpoints for the given app type
  */

package/dist/utils/project-detection.js

@@ -192,6 +192,20 @@ export function getZipPath(projectRoot, manifest) {
 export function getSignedZipPath(projectRoot, manifest) {
     return path.join(projectRoot, 'dist', getSignedZipFilename(manifest));
 }
+/**
+ * The zip a non-production deploy uploads: the signed one when it is at least
+ * as new as the build, since some sites reject unsigned apps even on dev.
+ */
+export function getDeployZipPath(projectRoot, manifest) {
+    const zip = getZipPath(projectRoot, manifest);
+    const signed = getSignedZipPath(projectRoot, manifest);
+    const mtime = (file) => fs.statSync(file, { throwIfNoEntry: false })?.mtimeMs;
+    const signedAt = mtime(signed);
+    if (signedAt === undefined)
+        return zip;
+    const builtAt = mtime(zip);
+    return builtAt === undefined || signedAt >= builtAt ? signed : zip;
+}
 // =============================================================================
 // API ENDPOINT UTILITIES
 // =============================================================================

package/dist/utils/sitevision-scripts-runner.d.ts

@@ -79,5 +79,6 @@ export interface SitevisionBuildResult {
  *
  * @param projectRoot - Project root directory (used as cwd)
  * @param onOutput - Optional callback for streaming output chunks
+ * @param signal - Aborting kills the build and everything it started
  */
-export declare function runSitevisionScriptsBuild(projectRoot: string, onOutput?: (chunk: string) => void): Promise<SitevisionBuildResult>;
+export declare function runSitevisionScriptsBuild(projectRoot: string, onOutput?: (chunk: string) => void, signal?: AbortSignal): Promise<SitevisionBuildResult>;

package/dist/utils/sitevision-scripts-runner.js

@@ -17,7 +17,7 @@
  */
 import path from 'path';
 import fs from 'fs';
-import { spawn } from 'child_process';
+import { killChild, spawnChild } from './process-runner.js';
 /**
  * Resolve the path to the sitevision-scripts CLI entry inside a project.
  * Returns null if the package is not installed.
@@ -145,8 +145,9 @@ const MAX_OUTPUT_CHARS = 50_000;
  *
  * @param projectRoot - Project root directory (used as cwd)
  * @param onOutput - Optional callback for streaming output chunks
+ * @param signal - Aborting kills the build and everything it started
  */
-export async function runSitevisionScriptsBuild(projectRoot, onOutput) {
+export async function runSitevisionScriptsBuild(projectRoot, onOutput, signal) {
     const bin = getSitevisionScriptsBin(projectRoot);
     if (!bin) {
         return {
@@ -157,10 +158,16 @@ export async function runSitevisionScriptsBuild(projectRoot, onOutput) {
     }
     return new Promise(resolve => {
         let output = '';
-        const child = spawn(process.execPath, [bin, 'build'], {
+        const child = spawnChild(process.execPath, [bin, 'build'], {
             cwd: projectRoot,
             stdio: ['ignore', 'pipe', 'pipe'],
         });
+        const abort = () => {
+            killChild(child);
+        };
+        signal?.addEventListener('abort', abort, { once: true });
+        if (signal?.aborted)
+            abort();
         const handleData = (data) => {
             const text = data.toString();
             output += text;
@@ -175,12 +182,16 @@ export async function runSitevisionScriptsBuild(projectRoot, onOutput) {
             resolve({ success: false, output, error: error.message });
         });
         child.on('close', code => {
+            signal?.removeEventListener('abort', abort);
+            const stopped = signal?.aborted ?? false;
             resolve({
-                success: code === 0,
+                success: code === 0 && !stopped,
                 output,
-                error: code === 0
-                    ? undefined
-                    : `sitevision-scripts build exited with code ${code}`,
+                error: stopped
+                    ? 'Build stopped.'
+                    : code === 0
+                        ? undefined
+                        : `sitevision-scripts build exited with code ${code}`,
             });
         });
     });

package/dist/utils/tasks.js

@@ -5,7 +5,7 @@ import { useSyncExternalStore } from 'react';
 import { WebpackRunner, hasLocalWebpackConfig } from './webpack-runner.js';
 import { hasSitevisionScripts, runSitevisionScriptsBuild, getDelegatedZipPath, checkSitevisionScriptsCompatibility, } from './sitevision-scripts-runner.js';
 import { copyStaticToBuild, copySrcToBuild, cleanBuild, createBuildZip, zipExists, } from './zip.js';
-import { isBundledApp, getAppType, getFullAppId, getZipPath, getSignedZipPath, localizedText, } from './project-detection.js';
+import { isBundledApp, getAppType, getFullAppId, getZipPath, getSignedZipPath, getDeployZipPath, localizedText, } from './project-detection.js';
 import { signApp, deployApp, deployProduction, activateApp, } from './sitevision-api.js';
 import { ProcessRunner } from './process-runner.js';
 const MAX_LINES = 2000;
@@ -78,7 +78,7 @@ const errorText = (error) => error instanceof Error ? error.message : String(err
 // One-shot steps shared by the tasks below.
 // ---------------------------------------------------------------------------
 /** Build the app to dist/<appId>.zip. Returns the zip path or throws. */
-async function buildOnce(project, task, log, mode) {
+async function buildOnce(project, task, log, mode, signal) {
     const { root, manifest } = project;
     cleanBuild(root);
     if (isBundledApp(manifest) && !hasLocalWebpackConfig(root)) {
@@ -90,7 +90,7 @@ async function buildOnce(project, task, log, mode) {
             log('bld', warning, 'warn');
         setPhase(task, 'building');
         log('bld', 'building via sitevision-scripts');
-        const result = await runSitevisionScriptsBuild(root, chunk => log('bld', chunk));
+        const result = await runSitevisionScriptsBuild(root, chunk => log('bld', chunk), signal);
         if (!result.success)
             throw new Error(result.error ?? 'Build failed');
         const zipPath = getDelegatedZipPath(root, manifest.id);
@@ -148,7 +148,7 @@ async function signOnce(project, task, log, zipPath, credentials) {
 async function deployOnce(project, task, log, zipPath, config, options) {
     setPhase(task, 'deploying');
     const appType = getAppType(project.manifest);
-    log('dep', `POST multipart → ${options.production ? 'production' : 'dev'} import · ${config.addonName}`);
+    log('dep', `POST multipart → ${options.production ? 'production' : 'dev'} import · ${config.addonName} · ${path.basename(zipPath)}`);
     const result = options.production
         ? await deployProduction(zipPath, { ...config, activate: options.activate }, appType)
         : await deployApp(zipPath, config, appType, options.force);
@@ -161,10 +161,14 @@ async function deployOnce(project, task, log, zipPath, config, options) {
 // Tasks
 // ---------------------------------------------------------------------------
 export function startBuild(project) {
-    const { task, log, finish } = createTask('build', project, 'build');
+    const controller = new AbortController();
+    const { task, log, finish } = createTask('build', project, 'build', () => {
+        controller.abort();
+        finish('stopped');
+    });
     void (async () => {
         try {
-            const zip = await buildOnce(project, task, log, 'production');
+            const zip = await buildOnce(project, task, log, 'production', controller.signal);
             log('bld', `created ${zip}`, 'ok');
             finish('success');
         }
@@ -197,7 +201,7 @@ export function startDeploy(project, config, options) {
         try {
             const zipPath = options.production
                 ? getSignedZipPath(project.root, project.manifest)
-                : getZipPath(project.root, project.manifest);
+                : getDeployZipPath(project.root, project.manifest);
             if (!zipExists(zipPath)) {
                 throw new Error(`${options.production ? 'Signed zip' : 'Zip'} not found: ${zipPath}. Run ${options.production ? 'sign' : 'build'} first.`);
             }
@@ -230,7 +234,10 @@ export function startActivate(project, config, executableId, versionLabel) {
 }
 export function startInstall(project) {
     const runner = new ProcessRunner('npm', ['install'], project.root);
-    const { task, log, finish } = createTask('install', project, 'npm install', () => runner.kill());
+    const { task, log, finish } = createTask('install', project, 'npm install', () => {
+        runner.kill();
+        finish('stopped');
+    });
     setPhase(task, 'installing');
     runner.on('output', (output) => log('npm', output.data, output.type === 'stderr' ? 'warn' : 'info'));
     runner
@@ -260,7 +267,9 @@ export function startDev(project, options) {
     let debounce;
     let building = false;
     let pending = false;
+    const controller = new AbortController();
     const stop = () => {
+        controller.abort();
         clearTimeout(debounce);
         for (const watcher of watchers)
             watcher.close();
@@ -269,6 +278,9 @@ export function startDev(project, options) {
     };
     const { task, log, finish } = createTask(options.deploy ? 'dev' : 'watch', project, options.deploy ? 'dev' : 'watch', stop);
     const afterBuild = async (zipPath) => {
+        // Stopped mid-build: never sign or deploy what is left.
+        if (controller.signal.aborted)
+            return;
         let deployZip = zipPath;
         if (options.signingCredentials) {
             deployZip = await signOnce(project, task, log, zipPath, options.signingCredentials);
@@ -282,6 +294,8 @@ export function startDev(project, options) {
         log('svc', 'watching for changes');
     };
     const fail = (error) => {
+        if (controller.signal.aborted)
+            return;
         log('svc', errorText(error), 'error');
         setPhase(task, 'error');
     };
@@ -296,12 +310,14 @@ export function startDev(project, options) {
                 pending = false;
                 try {
                     // eslint-disable-next-line no-await-in-loop
-                    await afterBuild(await buildOnce(project, task, log, 'development'));
+                    const zip = await buildOnce(project, task, log, 'development', controller.signal);
+                    // eslint-disable-next-line no-await-in-loop
+                    await afterBuild(zip);
                 }
                 catch (error) {
                     fail(error);
                 }
-            } while (pending);
+            } while (pending && !controller.signal.aborted);
         }
         finally {
             building = false;

package/package.json

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

package/readme.md

@@ -42,7 +42,7 @@ svc
 3. Press `i` to install dependencies if needed, then `d` to start dev: build on
    every change and deploy. Output is in the **Log** tab (`4`).
 
-For production: switch environment with `E`, press `b` to build, `s` to sign
+For production: switch environment with `v`, press `b` to build, `s` to sign
 and `p` to deploy and activate.
 
 ## The shell
@@ -53,7 +53,7 @@ and `p` to deploy and activate.
 | `b` / `s`       | Build / Sign                                        |
 | `p` / `P`       | Deploy / force deploy to the active environment     |
 | `a`             | Versions: list and activate uploaded versions       |
-| `E`             | Switch environment                                  |
+| `v`             | Switch environment                                  |
 | `e` / `y` / `i` | Config tab / sync `package.json` / `npm install`    |
 | `l`             | Log in again                                        |
 | `K`             | Stop running tasks                                  |