dshmarket 1.2.3 → 1.3.0

package/lib/dsh-cli.js

@@ -11,7 +11,9 @@ import { dirname, resolve } from 'node:path';
 import { logEvent } from './log.js';
 import { pluginArgsFor } from './pnpm-compat.js';
 import { profileDir } from './profile.js';
-const INSTALL_TIMEOUT_MS = 5 * 60 * 1000;
+// 15 min default (slow networks + git installs), overridable for CI/tests.
+// (#6 by @qichuang321.)
+const INSTALL_TIMEOUT_MS = Number(process.env.DSH_MARKET_INSTALL_TIMEOUT_MS) || 15 * 60 * 1000;
 /**
  * Windows npm/corepack/pnpm are `.cmd` shims. Node's `spawn` without a shell
  * cannot start them (ENOENT / EINVAL). Same pattern as dsh's `plugin` forwarder.
@@ -50,6 +52,55 @@ export function killChild(child) {
     }
     child.kill('SIGKILL');
 }
+/** The child of the operation currently running, for /dsh-market/cancel. */
+let activeChild = null;
+let cancelRequested = false;
+/**
+ * Kill a child and its whole tree, gracefully where the platform allows:
+ * taskkill /T /F on Windows (plain kill() leaves pnpm children running),
+ * SIGTERM with a 5s SIGKILL escalation elsewhere so pnpm can clean up.
+ * (Cancel flow contributed in #6 by @qichuang321.)
+ */
+function killTree(child) {
+    if (process.platform === 'win32' && child.pid !== undefined) {
+        try {
+            spawn('taskkill', ['/pid', String(child.pid), '/t', '/f'], { stdio: 'ignore' });
+            return;
+        }
+        catch { /* fall through */ }
+    }
+    // POSIX: the dsh wrapper runs pnpm as a grandchild (spawnSync), which a
+    // plain child.kill() leaves running — it keeps our stdio pipes open, so
+    // the close event never fires and the market looks stuck "installing".
+    // The child is spawned detached as its own process GROUP; kill the group.
+    const signalTree = (signal) => {
+        if (child.pid === undefined)
+            return;
+        try {
+            process.kill(-child.pid, signal);
+        }
+        catch {
+            try {
+                child.kill(signal);
+            }
+            catch { /* already gone */ }
+        }
+    };
+    signalTree('SIGTERM');
+    const escalate = setTimeout(() => signalTree('SIGKILL'), 5000);
+    escalate.unref?.();
+}
+/**
+ * Cancel the plugin command currently running.
+ * @returns true when there was one to cancel.
+ */
+export function cancelActive() {
+    if (activeChild === null)
+        return false;
+    cancelRequested = true;
+    killTree(activeChild);
+    return true;
+}
 /** Whether `pnpm` resolves on PATH; success is cached, absence is re-probed. */
 let pnpmReady = false;
 /** Probe `pnpm --version` on PATH. */
@@ -117,7 +168,7 @@ export function runDshPlugin(profile, pluginArgs) {
     const target = pluginArgs[pluginArgs.length - 1] ?? '';
     if (!TARGET_RE.test(target)) {
         logEvent('error', 'install', `unsafe plugin target rejected: ${JSON.stringify(target)}`);
-        return Promise.resolve({ exitCode: 1, timedOut: false, stdout: '', stderr: `unsafe plugin target rejected: ${JSON.stringify(target)}` });
+        return Promise.resolve({ exitCode: 1, timedOut: false, stdout: '', stderr: `unsafe plugin target rejected: ${JSON.stringify(target)}`, cancelled: false });
     }
     progress.active = true;
     progress.target = target;
@@ -132,13 +183,18 @@ export function runDshPlugin(profile, pluginArgs) {
             env: { ...process.env, CI: 'true' },
             stdio: ['ignore', 'pipe', 'pipe'],
             shell: viaShell,
+            // Own process group on POSIX so cancel/timeout can kill the whole
+            // tree (dsh wrapper + pnpm grandchild) with one group signal.
+            detached: process.platform !== 'win32',
         });
+        activeChild = child;
+        cancelRequested = false;
         let stdout = '';
         let stderr = '';
         let timedOut = false;
         const timer = setTimeout(() => {
             timedOut = true;
-            killChild(child);
+            killTree(child);
         }, INSTALL_TIMEOUT_MS);
         child.stdout.on('data', (chunk) => {
             const text = chunk.toString();
@@ -153,12 +209,16 @@ export function runDshPlugin(profile, pluginArgs) {
         child.on('error', (error) => {
             clearTimeout(timer);
             progress.active = false;
-            resolvePromise({ exitCode: 127, timedOut: false, stdout, stderr: `${stderr}\n${error.message}` });
+            if (activeChild === child)
+                activeChild = null;
+            resolvePromise({ exitCode: 127, timedOut: false, stdout, stderr: `${stderr}\n${error.message}`, cancelled: false });
         });
         child.on('close', (code) => {
             clearTimeout(timer);
             progress.active = false;
-            resolvePromise({ exitCode: code, timedOut, stdout, stderr });
+            if (activeChild === child)
+                activeChild = null;
+            resolvePromise({ exitCode: code, timedOut, stdout, stderr, cancelled: cancelRequested });
         });
     });
 }

package/lib/index.js

@@ -22,7 +22,10 @@ function argvProfile() {
     return undefined;
 }
 export function apply(ctx, config) {
-    const resolved = { profile: config?.profile ?? argvProfile() ?? 'web' };
+    const resolved = {
+        profile: config?.profile ?? argvProfile() ?? 'web',
+        allowRestart: config?.allowRestart ?? true,
+    };
     ctx.inject(['webServer', 'loader'], (hostCtx) => {
         const host = hostCtx;
         host.effect(() => mountMarketRoutes(host, resolved), 'dsh-market: http routes');

package/lib/install.js

@@ -19,7 +19,7 @@ import { logEvent } from './log.js';
  */
 export async function withHoistRecovery(run, profile, pluginArgs) {
     let result = await run(profile, pluginArgs);
-    const ok = (r) => r.exitCode === 0 && !r.timedOut;
+    const ok = (r) => r.exitCode === 0 && !r.timedOut && !r.cancelled;
     if (!ok(result) && classifyPnpmFailure(`${result.stderr}\n${result.stdout}`)?.code === 'hoist-pattern-diff') {
         logEvent('warn', 'install', `modules dir was built by a different pnpm major — rebuilding (pnpm install) and retrying once`);
         // --no-frozen-lockfile: the market runs pnpm with CI=true (TTY hangs),
@@ -28,7 +28,7 @@ export async function withHoistRecovery(run, profile, pluginArgs) {
         if (ok(rebuild))
             result = await run(profile, pluginArgs);
     }
-    if (!ok(result)) {
+    if (!ok(result) && !result.cancelled) {
         const failure = classifyPnpmFailure(`${result.stderr}\n${result.stdout}`);
         if (failure !== null)
             result = { ...result, stderr: `${result.stderr}\n\n${failure.message}` };
@@ -108,3 +108,25 @@ export function isStaleUpdate(check) {
         ? check.beforeCommit !== null && check.afterCommit === check.beforeCommit
         : check.beforeVersion !== null && check.afterVersion === check.beforeVersion;
 }
+/**
+ * Package names pnpm reported as having their build scripts ignored
+ * ("Ignored build scripts: esbuild, koffi."). Empty when none.
+ * (#6 by @qichuang321.)
+ */
+export function parseIgnoredBuilds(stdout, stderr) {
+    const m = /Ignored build scripts:?\s*([^\n]+)/i.exec(`${stdout}\n${stderr}`);
+    if (m === null)
+        return [];
+    const found = [];
+    for (const chunk of m[1].split(',')) {
+        // Entries may carry a version suffix and the sentence's final period.
+        const trimmed = chunk.trim().replace(/\.$/, '');
+        if (trimmed === '')
+            continue;
+        const at = trimmed.lastIndexOf('@');
+        const name = at > 0 ? trimmed.slice(0, at) : trimmed;
+        if (name !== '' && !found.includes(name))
+            found.push(name);
+    }
+    return found;
+}

package/lib/profile.js

@@ -3,7 +3,7 @@
  * profile directory (manifest, lockfile, installed package trees). Pure
  * functions of the directory contents; no processes, no network.
  */
-import { existsSync, readdirSync, readFileSync } from 'node:fs';
+import { existsSync, readdirSync, readFileSync, writeFileSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { join } from 'node:path';
 /** Resolve a profile name to its directory under DSH_HOME (default ~/.dsh). */
@@ -11,13 +11,25 @@ export function profileDir(profile) {
     const home = process.env.DSH_HOME ?? join(homedir(), '.dsh');
     return join(home, 'profiles', profile);
 }
-/** Community dependencies of the profile (official in-box scope filtered out). */
+/**
+ * The in-box bundles dsh's profile templates install themselves — the ONLY
+ * names the market hides from the installed list. Community plugins may
+ * legitimately publish under the official scope (#28), so a whole-scope
+ * filter would make them invisible and fail install validation.
+ * (Diagnosis and fix proposed in #28 by @Lograthmic.)
+ */
+const INBOX_BUNDLES = new Set([
+    '@deepseek-ai/dsh-base',
+    '@deepseek-ai/dsh-web-app',
+    '@deepseek-ai/dsh-headless',
+]);
+/** Community dependencies of the profile (in-box bundles filtered out). */
 export function readInstalled(profile) {
     try {
         const manifest = JSON.parse(readFileSync(join(profileDir(profile), 'package.json'), 'utf8'));
         const installed = {};
         for (const [name, spec] of Object.entries(manifest.dependencies ?? {})) {
-            if (!name.startsWith('@deepseek-ai/'))
+            if (!INBOX_BUNDLES.has(name))
                 installed[name] = spec;
         }
         return installed;
@@ -119,3 +131,36 @@ export function pluginSubdirs(root) {
     }
     return found.slice(0, 8);
 }
+/**
+ * Allow the given packages' build scripts in the profile's
+ * pnpm-workspace.yaml `allowBuilds` block (the key dsh profiles use),
+ * merging with existing entries and leaving the rest of the yaml intact.
+ * (#6 by @qichuang321.)
+ * @returns every package now allowed.
+ */
+export function setAllowBuilds(profile, packages) {
+    const file = join(profileDir(profile), 'pnpm-workspace.yaml');
+    let yaml = '';
+    try {
+        yaml = readFileSync(file, 'utf8');
+    }
+    catch { /* created below */ }
+    const blockRe = /allowBuilds:\n((?:[ \t]+[^\n]*\n?)*)/;
+    const map = {};
+    const blockMatch = blockRe.exec(yaml);
+    if (blockMatch !== null) {
+        for (const line of blockMatch[1].split('\n')) {
+            const m = /^[ \t]+([^:\s]+(?:\/[^:\s]+)?)\s*:\s*(\S.*)?$/.exec(line);
+            if (m !== null)
+                map[m[1]] = m[2] ?? 'true';
+        }
+    }
+    for (const pkg of packages) {
+        if (/^[A-Za-z0-9@/_.-]+$/.test(pkg))
+            map[pkg] = 'true';
+    }
+    const block = Object.entries(map).map(([k, v]) => `  ${k}: ${v}`).join('\n');
+    const blockText = `allowBuilds:\n${block}\n`;
+    writeFileSync(file, blockMatch !== null ? yaml.replace(blockRe, blockText) : `${yaml.replace(/\n?$/, '\n')}${blockText}`);
+    return Object.keys(map);
+}

package/lib/restart.js

@@ -0,0 +1,86 @@
+/**
+ * Self-restart: relaunch the exact DSH invocation that booted this host so
+ * pending (non-hot) plugin changes take effect without the user leaving the
+ * UI. Contributed in #14 by @ysyyhhh; ported onto the layered architecture.
+ *
+ * Safety model: the endpoint accepts only direct same-origin loopback
+ * requests (no forwarding headers), refuses while a plugin operation runs,
+ * and deployments under a supervisor (systemd/launchd/pm2) can disable the
+ * whole feature with `allowRestart: false` — the supervisor owns restarts.
+ */
+import { spawn } from 'node:child_process';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { dshArgv } from './dsh-cli.js';
+/** Self-restart is enabled by default and disabled only by an explicit false. */
+export function restartAllowed(config) {
+    return config.allowRestart !== false;
+}
+/** Whether a process-control request came from this Web host on loopback. */
+export function trustedRestartRequest(request) {
+    const address = request.socket.remoteAddress;
+    if (address !== '127.0.0.1' && address !== '::1' && address !== '::ffff:127.0.0.1')
+        return false;
+    // Any forwarding trace means the loopback peer is a proxy, not the user.
+    if (request.headers.forwarded !== undefined
+        || request.headers['x-forwarded-for'] !== undefined
+        || request.headers['x-real-ip'] !== undefined)
+        return false;
+    const origin = request.headers.origin;
+    const host = request.headers.host;
+    if (origin === undefined || host === undefined)
+        return false;
+    try {
+        const parsed = new URL(origin);
+        return (parsed.protocol === 'http:' || parsed.protocol === 'https:') && parsed.host === host;
+    }
+    catch {
+        return false;
+    }
+}
+/** The exact boot invocation the detached restart helper replays. */
+export function restartLaunch() {
+    const launch = dshArgv();
+    return {
+        ...launch,
+        args: [...launch.args, ...process.argv.slice(2)],
+        cwd: launch.cwd ?? process.cwd(),
+    };
+}
+/**
+ * Relaunch this exact DSH entry after a short detached handoff, then stop
+ * this process. The helper outlives us (detached + unref), waits for our
+ * port to free up, and logs the replacement's output under tmpdir.
+ */
+export function scheduleRestart() {
+    const launch = restartLaunch();
+    const stamp = new Date().toISOString().replace(/[:.]/g, '-').slice(0, 19);
+    const logOut = join(tmpdir(), `dsh-market-restart-${stamp}.out.log`);
+    const logErr = join(tmpdir(), `dsh-market-restart-${stamp}.err.log`);
+    const helperCode = [
+        "const { spawn } = require('node:child_process')",
+        "const fs = require('node:fs')",
+        `const file = ${JSON.stringify(launch.file)}`,
+        `const args = ${JSON.stringify(launch.args)}`,
+        `const cwd = ${JSON.stringify(launch.cwd)}`,
+        `const viaShell = ${JSON.stringify(launch.viaShell)}`,
+        `const logOut = ${JSON.stringify(logOut)}`,
+        `const logErr = ${JSON.stringify(logErr)}`,
+        'setTimeout(() => {',
+        '  try {',
+        '    const out = fs.openSync(logOut, "a")',
+        '    const err = fs.openSync(logErr, "a")',
+        '    const child = spawn(file, args, { cwd, detached: true, stdio: ["ignore", out, err], env: process.env, shell: viaShell })',
+        '    child.unref()',
+        '  } catch {}',
+        '}, 1500)',
+    ].join('\n');
+    const helper = spawn(process.execPath, ['-e', helperCode], {
+        detached: true,
+        stdio: 'ignore',
+        env: process.env,
+    });
+    helper.unref();
+    setTimeout(() => process.kill(process.pid, 'SIGTERM'), 500);
+    return { pid: process.pid, helperPid: helper.pid, logOut, logErr };
+}

package/lib/routes.js

@@ -7,17 +7,19 @@
  * Security: the install route executes a shell command, so it accepts only
  * same-origin POSTs and only sources present in the curated registry.
  */
-import { readFileSync } from 'node:fs';
+import { existsSync, readFileSync } from 'node:fs';
+import { join } from 'node:path';
 import { loadRegistry } from './registry.js';
 import { cleanHotDir, hotMount, hotUnmount, listHotMounts, mountClientOnlyDeps, readDisabledThemes, } from './hot.js';
 import { exportLogs, logEvent } from './log.js';
-import { BOOT_ID, probePnpm, progress, provisionPnpm, runDshPlugin } from './dsh-cli.js';
-import { profileDir, readInstalled, readInstalledVersion, readLockCommits } from './profile.js';
+import { BOOT_ID, cancelActive, probePnpm, progress, provisionPnpm, runDshPlugin } from './dsh-cli.js';
+import { profileDir, readInstalled, readInstalledVersion, readLockCommits, setAllowBuilds } from './profile.js';
 import { findInstalledAlias, installTargetFor } from './sources.js';
-import { isStaleUpdate, retargetCollections, validateAddedPlugins, withHoistRecovery } from './install.js';
+import { isStaleUpdate, parseIgnoredBuilds, retargetCollections, validateAddedPlugins, withHoistRecovery } from './install.js';
 import { checkUpdates, invalidateUpdates } from './updates.js';
 import { createThemeManager } from './themes.js';
 import { readJsonBody, sameOrigin, sendJson } from './http.js';
+import { restartAllowed, scheduleRestart, trustedRestartRequest } from './restart.js';
 const PROFILE_RE = /^[A-Za-z0-9_-]+$/;
 /**
  * Register the market's HTTP routes.
@@ -58,6 +60,21 @@ export function mountMarketRoutes(host, config) {
             void themes.setEntryDisabled(name, true);
     });
     let installing = false;
+    let restarting = false;
+    /**
+     * Drop live hot mounts whose package was removed outside the market
+     * (e.g. `dsh plugin remove` in a terminal): the stale mount would keep
+     * serving a client bundle that 404s after refresh, wedging the page
+     * until a restart (#29 by @SunYanbox).
+     */
+    async function dropStaleHotMounts() {
+        for (const name of listHotMounts()) {
+            if (existsSync(join(profileDir(config.profile), 'node_modules', name, 'package.json')))
+                continue;
+            await hotUnmount(name);
+            logEvent('warn', 'hot-sweep', `${name}: package removed outside the market — live mount dropped`);
+        }
+    }
     /** Every plugin command goes through the pnpm-drift recovery wrapper (#20). */
     const runPlugin = (profile, args) => withHoistRecovery(runDshPlugin, profile, args);
     const disposers = [
@@ -82,12 +99,13 @@ export function mountMarketRoutes(host, config) {
         host.webServer.register({
             kind: 'exact',
             path: '/dsh-market/installed',
-            handler: (request, response) => {
+            handler: async (request, response) => {
                 if (request.method !== 'GET') {
                     response.writeHead(405, { allow: 'GET' });
                     response.end();
                     return;
                 }
+                await dropStaleHotMounts();
                 sendJson(response, 200, {
                     profile: config.profile,
                     installed: readInstalled(config.profile),
@@ -137,6 +155,7 @@ export function mountMarketRoutes(host, config) {
                     response.end();
                     return;
                 }
+                await dropStaleHotMounts();
                 sendJson(response, 200, {
                     active: progress.active,
                     target: progress.target,
@@ -144,6 +163,7 @@ export function mountMarketRoutes(host, config) {
                     lastLine: progress.lastLine,
                     pnpm: await probePnpm(),
                     boot: BOOT_ID,
+                    restart: restartAllowed(config),
                     installed: readInstalled(config.profile),
                 });
             },
@@ -236,7 +256,8 @@ export function mountMarketRoutes(host, config) {
                         // default one-day safety wait; scoped to this single command.
                         const addArgs = force ? ['add', '--config.minimumReleaseAge=0', target] : ['add', target];
                         const result = await runPlugin(config.profile, addArgs);
-                        let ok = result.exitCode === 0 && !result.timedOut;
+                        const cancelled = result.cancelled;
+                        let ok = result.exitCode === 0 && !result.timedOut && !cancelled;
                         let stale = false;
                         if (ok) {
                             stale = isStaleUpdate({
@@ -254,9 +275,11 @@ export function mountMarketRoutes(host, config) {
                         const staleError = stale
                             ? '这个新版本刚发布不久。为了安全，系统默认会等它发布满一天后再安装——刚发布的版本偶尔会被发现问题然后撤回。可以明天再试，或点「立即更新」不再等待。 / This version was just released; for safety, installs normally wait about a day after a release. Try again tomorrow, or click "Update now" to install it right away.'
                             : null;
-                        logEvent(ok ? 'info' : 'error', 'update', `${name} -> ${target} exit=${String(result.exitCode)}${result.timedOut ? ' TIMEOUT' : ''}${stale ? ' STALE(minimumReleaseAge?)' : ''}${ok ? '' : ` stderr=${result.stderr.slice(-300)}`}`);
-                        sendJson(response, ok ? 200 : 502, {
+                        logEvent(ok || cancelled ? 'info' : 'error', 'update', `${name} -> ${target} exit=${String(result.exitCode)}${result.timedOut ? ' TIMEOUT' : ''}${cancelled ? ' CANCELLED' : ''}${stale ? ' STALE(minimumReleaseAge?)' : ''}${ok || cancelled ? '' : ` stderr=${result.stderr.slice(-300)}`}`);
+                        // A user-cancelled run is a quiet outcome, not an error.
+                        sendJson(response, ok || cancelled ? 200 : 502, {
                             ok,
+                            cancelled: cancelled || undefined,
                             stale: stale || undefined,
                             error: staleError ?? undefined,
                             exitCode: result.exitCode,
@@ -299,6 +322,104 @@ export function mountMarketRoutes(host, config) {
                 }
             },
         }),
+        host.webServer.register({
+            kind: 'exact',
+            path: '/dsh-market/restart',
+            handler: (request, response) => {
+                if (request.method !== 'POST') {
+                    response.writeHead(405, { allow: 'POST' });
+                    response.end();
+                    return;
+                }
+                // One-click restart contributed in #14 by @ysyyhhh.
+                if (!restartAllowed(config)) {
+                    sendJson(response, 403, { error: 'self-restart is disabled for this host' });
+                    return;
+                }
+                if (!trustedRestartRequest(request)) {
+                    sendJson(response, 403, { error: 'restart is limited to same-origin loopback requests' });
+                    return;
+                }
+                if (installing) {
+                    sendJson(response, 409, { error: 'cannot restart while a plugin operation is running' });
+                    return;
+                }
+                if (restarting) {
+                    sendJson(response, 409, { error: 'restart already scheduled' });
+                    return;
+                }
+                restarting = true;
+                try {
+                    const result = scheduleRestart();
+                    logEvent('info', 'restart', `scheduled pid=${String(result.pid)} helper=${String(result.helperPid)}`);
+                    sendJson(response, 202, { ok: true, boot: BOOT_ID, ...result });
+                }
+                catch (error) {
+                    restarting = false;
+                    const message = error instanceof Error ? error.message : String(error);
+                    logEvent('error', 'restart', message);
+                    sendJson(response, 500, { error: message });
+                }
+            },
+        }),
+        host.webServer.register({
+            kind: 'exact',
+            path: '/dsh-market/approve-builds',
+            handler: async (request, response) => {
+                if (request.method !== 'POST') {
+                    response.writeHead(405, { allow: 'POST' });
+                    response.end();
+                    return;
+                }
+                if (!sameOrigin(request)) {
+                    sendJson(response, 403, { error: 'untrusted origin' });
+                    return;
+                }
+                try {
+                    // One-click build-script approval (#6 by @qichuang321): only
+                    // packages ALREADY installed in the profile can be allowed — the
+                    // list is not free input.
+                    const body = (await readJsonBody(request));
+                    const installed = readInstalled(config.profile);
+                    const packages = (Array.isArray(body.packages) ? body.packages.map(String) : [])
+                        .filter(name => installed[name] !== undefined);
+                    if (packages.length === 0) {
+                        sendJson(response, 400, { error: 'no installed packages given' });
+                        return;
+                    }
+                    const approved = setAllowBuilds(config.profile, packages);
+                    logEvent('info', 'approve-builds', `allowed build scripts: ${approved.join(', ')}`);
+                    sendJson(response, 200, { ok: true, approved });
+                }
+                catch (error) {
+                    const message = error instanceof Error ? error.message : String(error);
+                    logEvent('error', 'approve-builds', `route error: ${message}`);
+                    sendJson(response, 500, { error: message });
+                }
+            },
+        }),
+        host.webServer.register({
+            kind: 'exact',
+            path: '/dsh-market/cancel',
+            handler: async (request, response) => {
+                if (request.method !== 'POST') {
+                    response.writeHead(405, { allow: 'POST' });
+                    response.end();
+                    return;
+                }
+                if (!sameOrigin(request)) {
+                    sendJson(response, 403, { error: 'untrusted origin' });
+                    return;
+                }
+                // Cancel flow contributed in #6 by @qichuang321.
+                if (!cancelActive()) {
+                    sendJson(response, 400, { error: 'no operation is running' });
+                    return;
+                }
+                logEvent('info', 'cancel', `cancelled ${progress.target || 'operation'}`);
+                sendJson(response, 200, { ok: true, cancelled: true, target: progress.target });
+            },
+        }),
         host.webServer.register({
             kind: 'exact',
             path: '/dsh-market/uninstall',
@@ -330,15 +451,17 @@ export function mountMarketRoutes(host, config) {
                     installing = true;
                     try {
                         const result = await runPlugin(config.profile, ['remove', name]);
-                        const ok = result.exitCode === 0 && !result.timedOut;
+                        const cancelled = result.cancelled;
+                        const ok = result.exitCode === 0 && !result.timedOut && !cancelled;
                         let hot = false;
                         if (ok) {
                             invalidateUpdates();
                             hot = await hotUnmount(name);
                         }
-                        logEvent(ok ? 'info' : 'error', 'uninstall', `${name} exit=${String(result.exitCode)}${ok ? ` live-removed=${String(hot)}` : ` stderr=${result.stderr.slice(-300)}`}`);
-                        sendJson(response, ok ? 200 : 502, {
+                        logEvent(ok || cancelled ? 'info' : 'error', 'uninstall', `${name} exit=${String(result.exitCode)}${cancelled ? ' CANCELLED' : ''}${ok ? ` live-removed=${String(hot)}` : cancelled ? '' : ` stderr=${result.stderr.slice(-300)}`}`);
+                        sendJson(response, ok || cancelled ? 200 : 502, {
                             ok,
+                            cancelled: cancelled || undefined,
                             hot,
                             exitCode: result.exitCode,
                             stdout: result.stdout,
@@ -405,7 +528,8 @@ export function mountMarketRoutes(host, config) {
                     try {
                         const before = new Set(Object.keys(readInstalled(config.profile)));
                         const result = await runPlugin(config.profile, ['add', target]);
-                        let ok = result.exitCode === 0 && !result.timedOut;
+                        const cancelled = result.cancelled;
+                        let ok = result.exitCode === 0 && !result.timedOut && !cancelled;
                         if (ok)
                             invalidateUpdates();
                         if (ok) {
@@ -420,7 +544,7 @@ export function mountMarketRoutes(host, config) {
                         // must never survive to brick the next boot.
                         let notAPlugin = false;
                         let removedBroken = [];
-                        if (result.exitCode === 0 && !result.timedOut) {
+                        if (result.exitCode === 0 && !result.timedOut && !cancelled) {
                             const validated = await validateAddedPlugins(runPlugin, config.profile, before);
                             removedBroken = validated.removedBroken;
                             if (removedBroken.length > 0) {
@@ -453,10 +577,12 @@ export function mountMarketRoutes(host, config) {
                                 }
                             }
                         }
-                        logEvent(ok ? 'info' : 'error', 'install', `${target} exit=${String(result.exitCode)}${result.timedOut ? ' TIMEOUT' : ''}${ok ? ` hot=${String(hot)}` : ` stderr=${result.stderr.slice(-300)}`}`);
-                        sendJson(response, ok ? 200 : 502, {
+                        logEvent(ok || cancelled ? 'info' : 'error', 'install', `${target} exit=${String(result.exitCode)}${result.timedOut ? ' TIMEOUT' : ''}${cancelled ? ' CANCELLED' : ''}${ok ? ` hot=${String(hot)}` : cancelled ? '' : ` stderr=${result.stderr.slice(-300)}`}`);
+                        sendJson(response, ok || cancelled ? 200 : 502, {
                             ok,
+                            cancelled: cancelled || undefined,
                             hot,
+                            ignoredBuilds: (() => { const list = parseIgnoredBuilds(result.stdout, result.stderr); return list.length > 0 ? list : undefined; })(),
                             error: notAPlugin ? 'nothing installable: the plugin(s) need a build step (blocked by default, see allowBuilds) or ship no prebuilt artifacts / 没有可安装的内容：插件需要构建授权（allowBuilds，默认拦截）或未附带构建产物，详见导出日志' : undefined,
                             exitCode: result.exitCode,
                             timedOut: result.timedOut,

package/lib/types/dsh-cli.d.ts

@@ -29,6 +29,8 @@ export interface InstallResult {
     timedOut: boolean;
     stdout: string;
     stderr: string;
+    /** True when the run ended because the user cancelled it. */
+    cancelled: boolean;
 }
 /** The shape every orchestration function takes to run plugin commands (injectable in tests). */
 export type PluginRunner = (profile: string, pluginArgs: string[]) => Promise<InstallResult>;
@@ -38,6 +40,11 @@ export type PluginRunner = (profile: string, pluginArgs: string[]) => Promise<In
  * (Contributed in #7 by @mraing.)
  */
 export declare function killChild(child: ChildProcess): void;
+/**
+ * Cancel the plugin command currently running.
+ * @returns true when there was one to cancel.
+ */
+export declare function cancelActive(): boolean;
 /** Probe `pnpm --version` on PATH. */
 export declare function probePnpm(): Promise<boolean>;
 /**

package/lib/types/install.d.ts

@@ -47,3 +47,9 @@ export declare function isStaleUpdate(check: {
     beforeCommit: string | null;
     afterCommit: string | null;
 }): boolean;
+/**
+ * Package names pnpm reported as having their build scripts ignored
+ * ("Ignored build scripts: esbuild, koffi."). Empty when none.
+ * (#6 by @qichuang321.)
+ */
+export declare function parseIgnoredBuilds(stdout: string, stderr: string): string[];

package/lib/types/profile.d.ts

@@ -5,7 +5,7 @@
  */
 /** Resolve a profile name to its directory under DSH_HOME (default ~/.dsh). */
 export declare function profileDir(profile: string): string;
-/** Community dependencies of the profile (official in-box scope filtered out). */
+/** Community dependencies of the profile (in-box bundles filtered out). */
 export declare function readInstalled(profile: string): Record<string, string>;
 /** The version actually present in the profile's node_modules, or null. */
 export declare function readInstalledVersion(profile: string, name: string): string | null;
@@ -22,3 +22,11 @@ export declare function hasDshManifest(dir: string): boolean;
 export declare function entryArtifactExists(dir: string): boolean;
 /** Plugin subdirectories (depth 2) of a collection checkout, as relative paths. */
 export declare function pluginSubdirs(root: string): string[];
+/**
+ * Allow the given packages' build scripts in the profile's
+ * pnpm-workspace.yaml `allowBuilds` block (the key dsh profiles use),
+ * merging with existing entries and leaving the rest of the yaml intact.
+ * (#6 by @qichuang321.)
+ * @returns every package now allowed.
+ */
+export declare function setAllowBuilds(profile: string, packages: string[]): string[];