botmux 3.2.1 → 3.4.0

package/dist/desktop/main/pm2-apps.d.ts

@@ -1,6 +1,6 @@
 import { spawn as spawnProcess } from 'node:child_process';
 import type { DesktopPaths } from '../shared/types.js';
-import type { ExternalRuntimeCandidate } from './runtime-service.js';
+import type { RuntimeLaunchTarget } from './runtime-service.js';
 import { type Pm2AppSummary } from './runtime-source.js';
 interface Pm2ListDeps {
     existsSync?: (path: string) => boolean;
@@ -8,8 +8,10 @@ interface Pm2ListDeps {
     execPath?: string;
     env?: NodeJS.ProcessEnv;
     timeoutMs?: number;
+    /** Probed user shell PATH for bundled runtimes (see probeShellPathEnv). */
+    pathEnv?: string;
 }
 export declare const defaultPm2ListTimeoutMs = 25000;
-export declare function listPm2Apps(paths: DesktopPaths, runtime: ExternalRuntimeCandidate, deps?: Pm2ListDeps): Promise<Pm2AppSummary[]>;
+export declare function listPm2Apps(paths: DesktopPaths, runtime: RuntimeLaunchTarget, deps?: Pm2ListDeps): Promise<Pm2AppSummary[]>;
 export {};
 //# sourceMappingURL=pm2-apps.d.ts.map

package/dist/desktop/main/pm2-apps.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pm2-apps.d.ts","sourceRoot":"","sources":["../../../src/desktop/main/pm2-apps.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,YAAY,EAAuC,MAAM,oBAAoB,CAAC;AAGhG,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AACrE,OAAO,EAAgB,KAAK,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEvE,UAAU,WAAW;IACnB,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC;IACvC,KAAK,CAAC,EAAE,OAAO,YAAY,CAAC;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,eAAO,MAAM,uBAAuB,QAAS,CAAC;AAE9C,wBAAgB,WAAW,CACzB,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,wBAAwB,EACjC,IAAI,GAAE,WAAgB,GACrB,OAAO,CAAC,aAAa,EAAE,CAAC,CAkE1B"}
+{"version":3,"file":"pm2-apps.d.ts","sourceRoot":"","sources":["../../../src/desktop/main/pm2-apps.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,YAAY,EAAuC,MAAM,oBAAoB,CAAC;AAGhG,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEvD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,EAAgB,KAAK,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEvE,UAAU,WAAW;IACnB,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC;IACvC,KAAK,CAAC,EAAE,OAAO,YAAY,CAAC;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,2EAA2E;IAC3E,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,eAAO,MAAM,uBAAuB,QAAS,CAAC;AAE9C,wBAAgB,WAAW,CACzB,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,mBAAmB,EAC5B,IAAI,GAAE,WAAgB,GACrB,OAAO,CAAC,aAAa,EAAE,CAAC,CAyE1B"}

package/dist/desktop/main/pm2-apps.js

@@ -1,6 +1,7 @@
 import { spawn as spawnProcess } from 'node:child_process';
 import { existsSync as pathExistsSync } from 'node:fs';
 import { delimiter, dirname, join } from 'node:path';
+import { buildBundledPath } from './node-command.js';
 import { parsePm2Apps } from './runtime-source.js';
 export const defaultPm2ListTimeoutMs = 25_000;
 export function listPm2Apps(paths, runtime, deps = {}) {
@@ -10,14 +11,21 @@ export function listPm2Apps(paths, runtime, deps = {}) {
     if (!existsSync(pm2Bin)) {
         return Promise.reject(new Error(`PM2 binary not found: ${pm2Bin}`));
     }
-    const command = pm2Bin;
-    const args = ['jlist'];
+    const command = runtime.kind === 'bundled' ? runtime.nodePath : pm2Bin;
+    const args = runtime.kind === 'bundled' ? [pm2Bin, 'jlist'] : ['jlist'];
     const baseEnv = deps.env ?? process.env;
     const env = {
         ...baseEnv,
         // External PM2 bins use /usr/bin/env node; Finder-launched apps need a
         // repaired PATH so discovery does not depend on the user's shell startup.
-        PATH: withRuntimePath(baseEnv.PATH, runtime.binPath, runtime.pathEnv),
+        // jlist may be the first pm2 contact and thus start the pm2 daemon, whose
+        // env sticks and propagates into resurrected apps — so the bundled branch
+        // carries the probed shell PATH with the SAME ordering as the daemon-start
+        // spawn (buildBundledPath); pm2 itself is launched via the absolute
+        // nodePath and never resolves node through this PATH.
+        PATH: runtime.kind === 'bundled'
+            ? buildBundledPath(baseEnv.PATH, runtime.nodePath, deps.pathEnv)
+            : withRuntimePath(baseEnv.PATH, runtime.binPath, runtime.pathEnv),
         PM2_HOME: paths.pm2Home,
         SESSION_DATA_DIR: paths.dataDir,
     };

package/dist/desktop/main/pm2-apps.js.map

@@ -1 +1 @@
-{"version":3,"file":"pm2-apps.js","sourceRoot":"","sources":["../../../src/desktop/main/pm2-apps.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pm2-apps.js","sourceRoot":"","sources":["../../../src/desktop/main/pm2-apps.ts"],"names":[],"mappings":"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"}

package/dist/desktop/main/runtime-service.d.ts

@@ -1,5 +1,5 @@
 import { type DashboardResult } from '../../cli/dashboard-endpoint.js';
-import type { DesktopPaths, DesktopRuntimeState, RuntimeSource } from '../shared/types.js';
+import type { DesktopPaths, DesktopRuntimeState } from '../shared/types.js';
 import { type BotmuxCommand } from './node-command.js';
 import { type Pm2AppSummary } from './runtime-source.js';
 export interface RunResult {
@@ -8,7 +8,11 @@ export interface RunResult {
     stderr: string;
     signal?: NodeJS.Signals | null;
 }
-type RunCommand = (cmd: BotmuxCommand) => Promise<RunResult>;
+interface RunCommandOptions {
+    timeoutMs?: number;
+    maxOutputBytes?: number;
+}
+type RunCommand = (cmd: BotmuxCommand, options?: RunCommandOptions) => Promise<RunResult>;
 type DashboardEndpointCaller = (path: '/__cli/current') => Promise<DashboardResult>;
 export interface ExternalRuntimeCandidate {
     kind: 'external';
@@ -17,9 +21,17 @@ export interface ExternalRuntimeCandidate {
     binPath: string;
     pathEnv?: string;
     version: string;
-    runtimeSource?: Exclude<RuntimeSource, 'none'>;
+    runtimeSource?: 'global-cli';
+}
+export interface BundledRuntimeCandidate {
+    kind: 'bundled';
+    root: string;
+    cliPath: string;
+    nodePath: string;
+    version: string;
+    runtimeSource: 'bundled';
 }
-export type RuntimeLaunchTarget = ExternalRuntimeCandidate;
+export type RuntimeLaunchTarget = ExternalRuntimeCandidate | BundledRuntimeCandidate;
 export interface RuntimeServiceDeps {
     paths: DesktopPaths;
     appVersion: string;
@@ -34,7 +46,10 @@ export interface RuntimeServiceDeps {
     commandTimeoutMs?: number;
     externalRuntime?: ExternalRuntimeCandidate | null;
     discoverExternalRuntime?: () => ExternalRuntimeCandidate | null;
-    pm2Apps?: (runtime: ExternalRuntimeCandidate) => Promise<Pm2AppSummary[]>;
+    bundledRuntime?: BundledRuntimeCandidate;
+    /** Probed user shell PATH for bundled-runtime spawns (see probeShellPathEnv). */
+    shellPathEnv?: () => string | undefined;
+    pm2Apps?: (runtime: RuntimeLaunchTarget) => Promise<Pm2AppSummary[]>;
 }
 export declare function createRuntimeService(deps: RuntimeServiceDeps): {
     getState(): Promise<DesktopRuntimeState>;
@@ -44,6 +59,7 @@ export declare function createRuntimeService(deps: RuntimeServiceDeps): {
     takeover(): Promise<RunResult>;
     dashboard(): Promise<RunResult>;
     currentDashboard(): Promise<RunResult>;
+    getDeviceStatus(): Promise<import("../shared/types.js").DesktopDeviceStatusResult>;
 };
 export {};
 //# sourceMappingURL=runtime-service.d.ts.map

package/dist/desktop/main/runtime-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtime-service.d.ts","sourceRoot":"","sources":["../../../src/desktop/main/runtime-service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAiB,KAAK,eAAe,EAAE,MAAM,iCAAiC,CAAC;AACtF,OAAO,KAAK,EAAE,YAAY,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAC3F,OAAO,EAA8B,KAAK,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACnF,OAAO,EAAsD,KAAK,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAE7G,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC;CAChC;AAED,KAAK,UAAU,GAAG,CAAC,GAAG,EAAE,aAAa,KAAK,OAAO,CAAC,SAAS,CAAC,CAAC;AAC7D,KAAK,uBAAuB,GAAG,CAAC,IAAI,EAAE,gBAAgB,KAAK,OAAO,CAAC,eAAe,CAAC,CAAC;AAGpF,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,UAAU,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,OAAO,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;CAChD;AAED,MAAM,MAAM,mBAAmB,GAAG,wBAAwB,CAAC;AA6D3D,MAAM,WAAW,kBAAkB;IACjC,KAAK,EAAE,YAAY,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC;IACvB,EAAE,EAAE;QACF,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;QAClC,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,cAAc,GAAG,MAAM,CAAC;KAC9D,CAAC;IACF,GAAG,CAAC,EAAE,UAAU,CAAC;IACjB,iBAAiB,CAAC,EAAE,uBAAuB,CAAC;IAC5C,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,eAAe,CAAC,EAAE,wBAAwB,GAAG,IAAI,CAAC;IAClD,uBAAuB,CAAC,EAAE,MAAM,wBAAwB,GAAG,IAAI,CAAC;IAChE,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,wBAAwB,KAAK,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC;CAC3E;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,kBAAkB;gBAuL7C,OAAO,CAAC,mBAAmB,CAAC;aAUzB,OAAO,CAAC,SAAS,CAAC;YAGnB,OAAO,CAAC,SAAS,CAAC;eAGf,OAAO,CAAC,SAAS,CAAC;gBAGjB,OAAO,CAAC,SAAS,CAAC;iBAajB,OAAO,CAAC,SAAS,CAAC;wBAKX,OAAO,CAAC,SAAS,CAAC;EAkB/C"}
+{"version":3,"file":"runtime-service.d.ts","sourceRoot":"","sources":["../../../src/desktop/main/runtime-service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAiB,KAAK,eAAe,EAAE,MAAM,iCAAiC,CAAC;AACtF,OAAO,KAAK,EAAE,YAAY,EAAE,mBAAmB,EAAiB,MAAM,oBAAoB,CAAC;AAC3F,OAAO,EAAyD,KAAK,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAC9G,OAAO,EAAsD,KAAK,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAG7G,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC;CAChC;AAED,UAAU,iBAAiB;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,KAAK,UAAU,GAAG,CAAC,GAAG,EAAE,aAAa,EAAE,OAAO,CAAC,EAAE,iBAAiB,KAAK,OAAO,CAAC,SAAS,CAAC,CAAC;AAC1F,KAAK,uBAAuB,GAAG,CAAC,IAAI,EAAE,gBAAgB,KAAK,OAAO,CAAC,eAAe,CAAC,CAAC;AAKpF,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,UAAU,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,YAAY,CAAC;CAC9B;AAED,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,SAAS,CAAC;CAC1B;AAED,MAAM,MAAM,mBAAmB,GAAG,wBAAwB,GAAG,uBAAuB,CAAC;AA2FrF,MAAM,WAAW,kBAAkB;IACjC,KAAK,EAAE,YAAY,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC;IACvB,EAAE,EAAE;QACF,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;QAClC,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,cAAc,GAAG,MAAM,CAAC;KAC9D,CAAC;IACF,GAAG,CAAC,EAAE,UAAU,CAAC;IACjB,iBAAiB,CAAC,EAAE,uBAAuB,CAAC;IAC5C,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,eAAe,CAAC,EAAE,wBAAwB,GAAG,IAAI,CAAC;IAClD,uBAAuB,CAAC,EAAE,MAAM,wBAAwB,GAAG,IAAI,CAAC;IAChE,cAAc,CAAC,EAAE,uBAAuB,CAAC;IACzC,iFAAiF;IACjF,YAAY,CAAC,EAAE,MAAM,MAAM,GAAG,SAAS,CAAC;IACxC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,mBAAmB,KAAK,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC;CACtE;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,kBAAkB;gBA4N7C,OAAO,CAAC,mBAAmB,CAAC;aAUzB,OAAO,CAAC,SAAS,CAAC;YAGnB,OAAO,CAAC,SAAS,CAAC;eAGf,OAAO,CAAC,SAAS,CAAC;gBAGjB,OAAO,CAAC,SAAS,CAAC;iBAkBjB,OAAO,CAAC,SAAS,CAAC;wBAKX,OAAO,CAAC,SAAS,CAAC;;EA6B/C"}

package/dist/desktop/main/runtime-service.js

@@ -1,15 +1,20 @@
 import { spawn } from 'node:child_process';
 import { join } from 'node:path';
 import { callDashboard } from '../../cli/dashboard-endpoint.js';
-import { buildExternalBotmuxCommand } from './node-command.js';
+import { buildBundledBotmuxCommand, buildExternalBotmuxCommand } from './node-command.js';
 import { classifyRuntimeSource, countActiveBotmuxDaemonApps } from './runtime-source.js';
+import { sanitizeDeviceStatusCommandResult } from './device-status.js';
 const defaultCommandTimeoutMs = 30_000;
-function defaultRun(cmd, timeoutMs = defaultCommandTimeoutMs) {
+const defaultCommandOutputLimitBytes = 1024 * 1024;
+const deviceStatusOutputLimitBytes = 4 * 1024;
+function defaultRun(cmd, timeoutMs = defaultCommandTimeoutMs, maxOutputBytes = defaultCommandOutputLimitBytes) {
     return new Promise(resolve => {
         const child = spawn(cmd.command, cmd.args, { env: cmd.env, stdio: ['ignore', 'pipe', 'pipe'] });
         let stdout = '';
         let stderr = '';
+        let outputBytes = 0;
         let settled = false;
+        let forceKillTimer;
         const timer = setTimeout(() => {
             if (settled)
                 return;
@@ -17,6 +22,11 @@ function defaultRun(cmd, timeoutMs = defaultCommandTimeoutMs) {
             // Timeout is surfaced as an ordinary failed action so renderer controls
             // can recover and show the last error without waiting for child close.
             child.kill();
+            forceKillTimer = setTimeout(() => {
+                if (child.exitCode === null && child.signalCode === null)
+                    child.kill('SIGKILL');
+            }, 1_000);
+            forceKillTimer.unref?.();
             resolve({
                 code: 1,
                 stdout,
@@ -31,16 +41,39 @@ function defaultRun(cmd, timeoutMs = defaultCommandTimeoutMs) {
             clearTimeout(timer);
             resolve(result);
         };
+        const appendOutput = (target, chunk) => {
+            if (settled)
+                return;
+            const text = String(chunk);
+            const bytes = Buffer.byteLength(text);
+            if (outputBytes + bytes > maxOutputBytes) {
+                child.kill('SIGKILL');
+                finish({
+                    code: 1,
+                    stdout,
+                    stderr: `Command output exceeded ${maxOutputBytes} bytes`,
+                    signal: null,
+                });
+                return;
+            }
+            outputBytes += bytes;
+            if (target === 'stdout')
+                stdout += text;
+            else
+                stderr += text;
+        };
         child.stdout.on('data', chunk => {
-            stdout += String(chunk);
+            appendOutput('stdout', chunk);
         });
         child.stderr.on('data', chunk => {
-            stderr += String(chunk);
+            appendOutput('stderr', chunk);
         });
         child.on('error', error => {
             finish({ code: 1, stdout, stderr: stderr || error.message, signal: null });
         });
         child.on('close', (code, signal) => {
+            if (forceKillTimer)
+                clearTimeout(forceKillTimer);
             // Signal-only exits still represent a failed desktop action to the UI.
             finish({
                 code: code ?? 1,
@@ -62,10 +95,22 @@ function dashboardEndpointResultToRunResult(result) {
     return { code: 1, stdout: '', stderr: `${result.reason}${detail}`, signal: null };
 }
 export function createRuntimeService(deps) {
-    const run = deps.run ?? ((cmd) => defaultRun(cmd, deps.commandTimeoutMs));
+    const run = deps.run ?? ((cmd, options) => defaultRun(cmd, options?.timeoutMs ?? deps.commandTimeoutMs, options?.maxOutputBytes ?? defaultCommandOutputLimitBytes));
     const botsPath = join(deps.paths.botmuxHome, 'bots.json');
-    const installCliMessage = 'Install the global botmux CLI with `npm install -g botmux`, then reopen Botmux Desktop.';
+    const installCliMessage = deps.bundledRuntime
+        ? 'The bundled botmux runtime is unavailable. Reinstall Botmux Desktop.'
+        : 'Install the global botmux CLI with `npm install -g botmux`, then reopen Botmux Desktop.';
     function command(runtime, args) {
+        if (runtime.kind === 'bundled') {
+            return buildBundledBotmuxCommand({
+                nodePath: runtime.nodePath,
+                cliPath: runtime.cliPath,
+                botmuxHome: deps.paths.botmuxHome,
+                args,
+                baseEnv: deps.env,
+                pathEnv: deps.shellPathEnv?.(),
+            });
+        }
         return buildExternalBotmuxCommand({
             binPath: runtime.binPath,
             botmuxHome: deps.paths.botmuxHome,
@@ -78,7 +123,7 @@ export function createRuntimeService(deps) {
         return deps.discoverExternalRuntime ? deps.discoverExternalRuntime() : deps.externalRuntime ?? null;
     }
     function activeRuntime() {
-        return currentExternalRuntime();
+        return deps.bundledRuntime ?? currentExternalRuntime();
     }
     function rejectedCliRequired() {
         return {
@@ -106,6 +151,12 @@ export function createRuntimeService(deps) {
     function externalSource(runtime) {
         return runtime.runtimeSource ?? 'global-cli';
     }
+    function isRuntimeOwned(runtime, sourcePath, sourceVersion) {
+        if (runtime.kind !== 'bundled')
+            return true;
+        const ownedPath = Boolean(sourcePath && (sourcePath === runtime.cliPath || sourcePath.startsWith(`${runtime.root}/`)));
+        return ownedPath && (!sourceVersion || sourceVersion === runtime.version);
+    }
     function readBotConfig() {
         if (!deps.fs.existsSync(botsPath))
             return { status: 'not_configured', count: 0 };
@@ -135,7 +186,7 @@ export function createRuntimeService(deps) {
     let stateInFlight = null;
     async function computeState() {
         const config = readBotConfig();
-        const active = currentExternalRuntime();
+        const active = activeRuntime();
         const selectedSource = active ? externalSource(active) : 'none';
         if (config.status === 'invalid') {
             // A malformed bots.json is actionable user state, not an empty setup.
@@ -189,6 +240,21 @@ export function createRuntimeService(deps) {
                 const source = classifyRuntimeSource({ pm2Apps });
                 const onlineDaemonCount = countActiveBotmuxDaemonApps(pm2Apps);
                 if (source.running) {
+                    if (!isRuntimeOwned(active, source.sourcePath, source.sourceVersion)) {
+                        return {
+                            status: 'degraded',
+                            appVersion: deps.appVersion,
+                            runtimeVersion: active.version,
+                            runtimeSource: 'global-cli',
+                            runtimeManaged: false,
+                            runtimePath: source.sourcePath,
+                            botCount: config.count,
+                            onlineDaemonCount,
+                            attentionCount: 1,
+                            dashboardUrl: null,
+                            message: '检测到由外置 botmux 启动的运行时，Desktop 正在切换到内置运行时。',
+                        };
+                    }
                     return {
                         status: 'running',
                         appVersion: deps.appVersion,
@@ -257,8 +323,14 @@ export function createRuntimeService(deps) {
         },
         async takeover() {
             const state = await this.getState();
-            // Compatibility shim for the old IPC name: "takeover" now means adopt
-            // the selected global CLI runtime. It never stops or replaces a runtime.
+            const runtime = activeRuntime();
+            if (!runtime)
+                return rejectedCliRequired();
+            if (runtime.kind === 'bundled') {
+                // Replace core processes only. The generated ecosystem pins their
+                // interpreter to bundled Node, while unrelated plugin services survive.
+                return run(command(runtime, ['restart']));
+            }
             return {
                 code: state.runtimeManaged ? 0 : 1,
                 stdout: '',
@@ -291,6 +363,18 @@ export function createRuntimeService(deps) {
                 });
             return dashboardEndpointResultToRunResult(result);
         },
+        async getDeviceStatus() {
+            const runtime = activeRuntime();
+            if (!runtime)
+                return { ok: false, reason: 'cli_unavailable' };
+            // Device credentials stay inside the host CLI. Electron receives only the
+            // command's public status JSON, then reconstructs an allow-listed DTO
+            // before anything can cross the renderer IPC boundary.
+            const result = await run(command(runtime, ['device', 'status', '--json']), {
+                maxOutputBytes: deviceStatusOutputLimitBytes,
+            });
+            return sanitizeDeviceStatusCommandResult(result);
+        },
     };
     return service;
 }

package/dist/desktop/main/runtime-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"runtime-service.js","sourceRoot":"","sources":["../../../src/desktop/main/runtime-service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"runtime-service.js","sourceRoot":"","sources":["../../../src/desktop/main/runtime-service.ts"],"names":[],"mappings":"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"}

package/dist/desktop/main/runtime-source.d.ts

@@ -2,6 +2,7 @@ export interface Pm2AppSummary {
     name: string;
     script?: string;
     status?: string;
+    version?: string;
 }
 export interface RuntimeSourceInput {
     pm2Apps: Pm2AppSummary[];
@@ -10,6 +11,7 @@ export interface RuntimeSourceInput {
 export interface RuntimeSource {
     running: boolean;
     sourcePath: string | null;
+    sourceVersion: string | null;
 }
 export declare function classifyRuntimeSource(input: RuntimeSourceInput): RuntimeSource;
 export declare function countActiveBotmuxDaemonApps(pm2Apps: Pm2AppSummary[]): number;

package/dist/desktop/main/runtime-source.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtime-source.d.ts","sourceRoot":"","sources":["../../../src/desktop/main/runtime-source.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,aAAa,EAAE,CAAC;IACzB,aAAa,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;CAC1C;AAED,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,kBAAkB,GAAG,aAAa,CAa9E;AAED,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,aAAa,EAAE,GAAG,MAAM,CAE5E;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa,EAAE,CAmB5D"}
+{"version":3,"file":"runtime-source.d.ts","sourceRoot":"","sources":["../../../src/desktop/main/runtime-source.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,aAAa,EAAE,CAAC;IACzB,aAAa,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;CAC1C;AAED,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,kBAAkB,GAAG,aAAa,CAc9E;AAED,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,aAAa,EAAE,GAAG,MAAM,CAE5E;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa,EAAE,CAoB5D"}

package/dist/desktop/main/runtime-source.js

@@ -1,16 +1,17 @@
 import { resolve } from 'node:path';
 export function classifyRuntimeSource(input) {
-    // CLI-first Desktop only needs to know whether a botmux PM2 process exists;
-    // ownership comes from the selected global CLI, not from a bundled path.
+    // The source path decides whether Desktop already owns the fleet or must
+    // replace an older/global installation with its bundled runtime.
     const botmuxApps = activeBotmuxApps(input.pm2Apps);
     if (botmuxApps.length === 0)
-        return { running: false, sourcePath: null };
+        return { running: false, sourcePath: null, sourceVersion: null };
     const sourcePaths = botmuxApps
         .map(app => app.script ? normalizeRuntimePath(app.script, input.normalizePath) : null)
         .filter((path) => path !== null);
     return {
         running: true,
         sourcePath: sourcePaths[0] ?? null,
+        sourceVersion: botmuxApps.find(app => app.version)?.version ?? null,
     };
 }
 export function countActiveBotmuxDaemonApps(pm2Apps) {
@@ -33,7 +34,8 @@ export function parsePm2Apps(stdout) {
                     ? record.pm2_env.pm_exec_path
                     : undefined;
             const status = typeof record.pm2_env?.status === 'string' ? record.pm2_env.status : undefined;
-            return [{ name: record.name, script, status }];
+            const version = typeof record.pm2_env?.version === 'string' ? record.pm2_env.version : undefined;
+            return [{ name: record.name, script, status, version }];
         });
     }
     catch {
@@ -44,10 +46,14 @@ function activeBotmuxApps(pm2Apps) {
     return pm2Apps.filter(isBotmuxApp).filter(isActivePm2App);
 }
 function isBotmuxApp(app) {
-    return app.name === 'botmux-dashboard' || app.name === 'botmux' || app.name.startsWith('botmux-');
+    return app.name === 'botmux-dashboard'
+        || app.name === 'botmux'
+        || (app.name.startsWith('botmux-') && !app.name.startsWith('botmux-plugin-'));
 }
 function isBotmuxDaemonApp(app) {
-    return app.name !== 'botmux-dashboard' && (app.name === 'botmux' || app.name.startsWith('botmux-'));
+    return app.name !== 'botmux-dashboard'
+        && !app.name.startsWith('botmux-plugin-')
+        && (app.name === 'botmux' || app.name.startsWith('botmux-'));
 }
 function isActivePm2App(app) {
     // PM2 keeps stopped processes in jlist, so only live-ish statuses should hold

package/dist/desktop/main/runtime-source.js.map

@@ -1 +1 @@
-{"version":3,"file":"runtime-source.js","sourceRoot":"","sources":["../../../src/desktop/main/runtime-source.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"runtime-source.js","sourceRoot":"","sources":["../../../src/desktop/main/runtime-source.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAoBpC,MAAM,UAAU,qBAAqB,CAAC,KAAyB;IAC7D,yEAAyE;IACzE,iEAAiE;IACjE,MAAM,UAAU,GAAG,gBAAgB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACnD,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC;IAE9F,MAAM,WAAW,GAAG,UAAU;SAC3B,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,oBAAoB,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;SACrF,MAAM,CAAC,CAAC,IAAI,EAAkB,EAAE,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;IACnD,OAAO;QACL,OAAO,EAAE,IAAI;QACb,UAAU,EAAE,WAAW,CAAC,CAAC,CAAC,IAAI,IAAI;QAClC,aAAa,EAAE,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,OAAO,IAAI,IAAI;KACpE,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,2BAA2B,CAAC,OAAwB;IAClE,OAAO,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC;AACzE,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,MAAc;IACzC,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAY,CAAC;QAC7C,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;YAAE,OAAO,EAAE,CAAC;QACtC,OAAO,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC1B,IAAI,CAAC,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ;gBAAE,OAAO,EAAE,CAAC;YAC/C,MAAM,MAAM,GAAG,GAAsH,CAAC;YACtI,IAAI,OAAO,MAAM,CAAC,IAAI,KAAK,QAAQ;gBAAE,OAAO,EAAE,CAAC;YAC/C,MAAM,MAAM,GAAG,OAAO,MAAM,CAAC,MAAM,KAAK,QAAQ;gBAC9C,CAAC,CAAC,MAAM,CAAC,MAAM;gBACf,CAAC,CAAC,OAAO,MAAM,CAAC,OAAO,EAAE,YAAY,KAAK,QAAQ;oBAChD,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY;oBAC7B,CAAC,CAAC,SAAS,CAAC;YAChB,MAAM,MAAM,GAAG,OAAO,MAAM,CAAC,OAAO,EAAE,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;YAC9F,MAAM,OAAO,GAAG,OAAO,MAAM,CAAC,OAAO,EAAE,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;YACjG,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;QAC1D,CAAC,CAAC,CAAC;IACL,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAED,SAAS,gBAAgB,CAAC,OAAwB;IAChD,OAAO,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;AAC5D,CAAC;AAED,SAAS,WAAW,CAAC,GAAkB;IACrC,OAAO,GAAG,CAAC,IAAI,KAAK,kBAAkB;WACjC,GAAG,CAAC,IAAI,KAAK,QAAQ;WACrB,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC;AAClF,CAAC;AAED,SAAS,iBAAiB,CAAC,GAAkB;IAC3C,OAAO,GAAG,CAAC,IAAI,KAAK,kBAAkB;WACjC,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC;WACtC,CAAC,GAAG,CAAC,IAAI,KAAK,QAAQ,IAAI,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC;AACjE,CAAC;AAED,SAAS,cAAc,CAAC,GAAkB;IACxC,8EAA8E;IAC9E,6EAA6E;IAC7E,OAAO,CAAC,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,MAAM,KAAK,QAAQ,IAAI,GAAG,CAAC,MAAM,KAAK,WAAW,CAAC;AAC9E,CAAC;AAED,SAAS,oBAAoB,CAAC,IAAY,EAAE,aAAwC;IAClF,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/B,OAAO,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;AAC5D,CAAC"}

package/dist/desktop/main/tray.d.ts

@@ -1,5 +1,6 @@
 import { Tray, type BrowserWindow } from 'electron';
 export declare function createDesktopTray(args: {
+    iconPath: string;
     window: BrowserWindow;
     onStart: () => void;
     onStop: () => void;

package/dist/desktop/main/tray.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tray.d.ts","sourceRoot":"","sources":["../../../src/desktop/main/tray.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,IAAI,EAAe,KAAK,aAAa,EAAE,MAAM,UAAU,CAAC;AAEvE,wBAAgB,iBAAiB,CAAC,IAAI,EAAE;IACtC,MAAM,EAAE,aAAa,CAAC;IACtB,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,MAAM,EAAE,MAAM,IAAI,CAAC;IACnB,SAAS,EAAE,MAAM,IAAI,CAAC;IACtB,UAAU,EAAE,MAAM,IAAI,CAAC;IACvB,UAAU,EAAE,MAAM,IAAI,CAAC;CACxB,GAAG,IAAI,CA0BP"}
+{"version":3,"file":"tray.d.ts","sourceRoot":"","sources":["../../../src/desktop/main/tray.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,IAAI,EAAe,KAAK,aAAa,EAAE,MAAM,UAAU,CAAC;AAEvE,wBAAgB,iBAAiB,CAAC,IAAI,EAAE;IACtC,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,aAAa,CAAC;IACtB,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,MAAM,EAAE,MAAM,IAAI,CAAC;IACnB,SAAS,EAAE,MAAM,IAAI,CAAC;IACtB,UAAU,EAAE,MAAM,IAAI,CAAC;IACvB,UAAU,EAAE,MAAM,IAAI,CAAC;CACxB,GAAG,IAAI,CA0BP"}

package/dist/desktop/main/tray.js

@@ -1,8 +1,8 @@
 import { Menu, Tray, nativeImage } from 'electron';
 export function createDesktopTray(args) {
-    // Keep the menu-bar lifecycle functional even before a branded tray icon
-    // asset exists.
-    const tray = new Tray(nativeImage.createEmpty());
+    const icon = nativeImage.createFromPath(args.iconPath);
+    icon.setTemplateImage(true);
+    const tray = new Tray(icon);
     const showWindow = () => {
         args.window.show();
         args.window.focus();

package/dist/desktop/main/tray.js.map

@@ -1 +1 @@
-{"version":3,"file":"tray.js","sourceRoot":"","sources":["../../../src/desktop/main/tray.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAsB,MAAM,UAAU,CAAC;AAEvE,MAAM,UAAU,iBAAiB,CAAC,IAOjC;IACC,yEAAyE;IACzE,gBAAgB;IAChB,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC,CAAC;IACjD,MAAM,UAAU,GAAG,GAAG,EAAE;QACtB,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACnB,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;IACtB,CAAC,CAAC;IACF,MAAM,IAAI,GAAG,IAAI,CAAC,iBAAiB,CAAC;QAClC,EAAE,KAAK,EAAE,cAAc,EAAE,KAAK,EAAE,UAAU,EAAE;QAC5C,EAAE,IAAI,EAAE,WAAW,EAAE;QACrB,EAAE,KAAK,EAAE,cAAc,EAAE,KAAK,EAAE,IAAI,CAAC,OAAO,EAAE;QAC9C,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE;QAC5C,EAAE,KAAK,EAAE,gBAAgB,EAAE,KAAK,EAAE,IAAI,CAAC,SAAS,EAAE;QAClD,EAAE,IAAI,EAAE,WAAW,EAAE;QACrB,EAAE,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,IAAI,CAAC,UAAU,EAAE;QAC9C,EAAE,KAAK,EAAE,kBAAkB,EAAE,KAAK,EAAE,IAAI,CAAC,UAAU,EAAE;QACrD,EAAE,IAAI,EAAE,WAAW,EAAE;QACrB,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE;KACpC,CAAC,CAAC;IAEH,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IAC1B,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;IAC1B,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IAE7B,OAAO,IAAI,CAAC;AACd,CAAC"}
+{"version":3,"file":"tray.js","sourceRoot":"","sources":["../../../src/desktop/main/tray.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAsB,MAAM,UAAU,CAAC;AAEvE,MAAM,UAAU,iBAAiB,CAAC,IAQjC;IACC,MAAM,IAAI,GAAG,WAAW,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACvD,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAC5B,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC;IAC5B,MAAM,UAAU,GAAG,GAAG,EAAE;QACtB,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACnB,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;IACtB,CAAC,CAAC;IACF,MAAM,IAAI,GAAG,IAAI,CAAC,iBAAiB,CAAC;QAClC,EAAE,KAAK,EAAE,cAAc,EAAE,KAAK,EAAE,UAAU,EAAE;QAC5C,EAAE,IAAI,EAAE,WAAW,EAAE;QACrB,EAAE,KAAK,EAAE,cAAc,EAAE,KAAK,EAAE,IAAI,CAAC,OAAO,EAAE;QAC9C,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE;QAC5C,EAAE,KAAK,EAAE,gBAAgB,EAAE,KAAK,EAAE,IAAI,CAAC,SAAS,EAAE;QAClD,EAAE,IAAI,EAAE,WAAW,EAAE;QACrB,EAAE,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,IAAI,CAAC,UAAU,EAAE;QAC9C,EAAE,KAAK,EAAE,kBAAkB,EAAE,KAAK,EAAE,IAAI,CAAC,UAAU,EAAE;QACrD,EAAE,IAAI,EAAE,WAAW,EAAE;QACrB,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE;KACpC,CAAC,CAAC;IAEH,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IAC1B,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;IAC1B,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IAE7B,OAAO,IAAI,CAAC;AACd,CAAC"}

package/dist/desktop/main.js

@@ -2,10 +2,11 @@ import { app, session, shell } from 'electron';
 import { existsSync, readFileSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { join } from 'node:path';
-import { autoStartCliRuntimeOnLaunch } from './main/auto-start.js';
-import { discoverExternalRuntimeCandidate } from './main/external-runtime.js';
+import { autoStartCliRuntimeOnLaunch, shouldTakeOverExternalRuntime } from './main/auto-start.js';
 import { createRuntimeStateMonitor, registerDesktopIpc } from './main/ipc.js';
 import { resolveDesktopPaths } from './main/paths.js';
+import { resolveBundledRuntimeCandidate } from './main/bundled-runtime.js';
+import { probeShellPathEnv } from './main/external-runtime.js';
 import { listPm2Apps } from './main/pm2-apps.js';
 import { createRuntimeService } from './main/runtime-service.js';
 import { createDesktopTray } from './main/tray.js';
@@ -56,33 +57,51 @@ async function bootstrap() {
         devRepoRoot: process.cwd(),
     });
     const appVersion = resolveDesktopAppVersion(app.getVersion());
+    const bundledRuntime = resolveBundledRuntimeCandidate({
+        resourcesPath: process.resourcesPath,
+        repoRoot: process.cwd(),
+        isPackaged: app.isPackaged,
+        arch: process.arch,
+        appVersion,
+        env: process.env,
+    });
     const runtime = createRuntimeService({
         paths,
         appVersion,
         execPath: process.execPath,
         env: process.env,
         fs: { existsSync, readFileSync },
-        // Re-scan the user's global CLI on every status/action path so an in-place
-        // `botmux upgrade` is detected without requiring the desktop app to restart.
-        discoverExternalRuntime: () => discoverExternalRuntimeCandidate(paths),
-        pm2Apps: async (selectedRuntime) => listPm2Apps(paths, selectedRuntime),
+        bundledRuntime,
+        // Finder-launched apps inherit launchd's minimal PATH; the daemon needs the
+        // user's real shell PATH (zsh/bash, profile+rc) to find per-bot CLIs.
+        shellPathEnv: () => probeShellPathEnv(),
+        pm2Apps: async (selectedRuntime) => listPm2Apps(paths, selectedRuntime, { pathEnv: probeShellPathEnv() }),
     });
     const win = createMainWindow(join(desktopDir, 'preload.cjs'), join(desktopDir, 'renderer'));
     mainWindow = win;
+    let ownershipRepair = null;
     const monitor = createRuntimeStateMonitor({
         runtime,
         sendState: state => {
             if (!win.isDestroyed())
                 win.webContents.send('desktop:state-changed', state);
+            // A user may invoke an older/global `botmux restart` after Desktop has
+            // launched. Reclaim the fleet instead of allowing the external runtime
+            // to remain connected to the same bots.
+            if (shouldTakeOverExternalRuntime(state) && !ownershipRepair) {
+                ownershipRepair = runtime.takeover()
+                    .then(() => monitor.refresh())
+                    .catch(error => console.warn('[desktop] bundled runtime ownership repair failed', error))
+                    .finally(() => { ownershipRepair = null; });
+            }
         },
     });
     registerDesktopIpc({ paths, runtime, monitor });
-    monitor.start();
     void autoStartCliRuntimeOnLaunch({
         runtime,
         monitor,
         warn: message => console.warn(`[desktop] ${message}`),
-    });
+    }).finally(() => monitor.start());
     win.on('close', event => {
         // Closing the window should not stop the supervised daemon; explicit Quit
         // exits the shell, explicit Stop controls the runtime.
@@ -92,6 +111,7 @@ async function bootstrap() {
         }
     });
     tray = createDesktopTray({
+        iconPath: join(desktopDir, 'assets', 'trayTemplate.png'),
         window: win,
         onStart: () => {
             void runtime.start();