nextclaw 0.18.12-beta.6 → 0.18.12-beta.8

package/dist/cli/app/index.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { _ as resolveUiConfig, a as compareNpmRuntimeVersions, c as getPackageVersion$1, d as openBrowser, f as printAgentResponse, g as resolveUiApiBase, h as resolveServiceLogPath, i as NpmRuntimeBundleService, l as isLoopbackHost, m as resolvePublicIp, n as NpmRuntimeUpdateSourceService, o as NpmRuntimeBundleLayoutStore, p as prompt, s as findExecutableOnPath, t as NpmRuntimeUpdateStateStore, u as isProcessRunning, v as resolveUiStaticDir, y as waitForExit } from "../../npm-runtime-update-state.store-BwM_B6eP.js";
+import { S as waitForExit, _ as resolvePublicIp, a as compareNpmRuntimeVersions, b as resolveUiConfig, c as NpmRuntimeBundleLayoutStore, d as getPackageVersion$1, f as isLoopbackHost, g as prompt, h as printAgentResponse, i as NpmRuntimeBundleService, l as findExecutableOnPath, m as openBrowser, n as NpmRuntimeUpdateSourceService, o as resolveEffectiveNpmRuntimeVersion, p as isProcessRunning, t as NpmRuntimeUpdateStateStore, u as findListeningProcessByPort, v as resolveServiceLogPath, x as resolveUiStaticDir, y as resolveUiApiBase } from "../../npm-runtime-update-state.store-75vzvn0B.js";
 import { createRequire } from "node:module";
 import * as NextclawCore from "@nextclaw/core";
 import { APP_NAME, APP_TAGLINE, AgentRouteResolver, BUILTIN_MAIN_AGENT_ID, ChannelManager, CommandRegistry, ConfigSchema, ContextBuilder, CronService, CronTool, DEFAULT_WORKSPACE_DIR, DEFAULT_WORKSPACE_PATH, DisposableStore, EditFileTool, ExecTool, ExtensionToolAdapter, FileLogSink, GatewayTool, InputBudgetPruner, LLMProvider, ListDirTool, MemoryGetTool, MemorySearchTool, MessageBus, MessageTool, ProviderManager, ReadFileTool, RequestedSkillsMetadataReader, SessionManager, SessionsHistoryTool, SessionsListTool, SkillsLoader, Tool, ToolRegistry, WebFetchTool, WebSearchTool, WriteFileTool, buildConfigSchema, buildMinimalSystemExecutionPrompt, buildReloadPlan, buildToolCatalogEntries, createAgentProfile, createAssistantStreamDeltaControlMessage, createAssistantStreamResetControlMessage, createGlobalTypedEventBus, createTypedEventKey, createTypingStopControlMessage, diffConfigPaths, expandHome, findEffectiveAgentProfile, getAppLogger, getConfigPath, getDataDir, getDataPath, getLoggingRuntime, getWorkspacePath, hasSecretRef, loadConfig, normalizeInlineSecretRefs, parseAgentScopedSessionKey, parseThinkingLevel, readSessionProjectRoot, redactConfigObject, removeAgentProfile, resolveAppLogPath, resolveConfigSecrets, resolveDefaultAgentProfileId, resolveEffectiveAgentProfiles, resolveLocalUiBaseUrl, resolveProviderRuntime, resolveSessionWorkspacePath, resolveThinkingLevel, saveConfig, toDisposable, updateAgentProfile } from "@nextclaw/core";
@@ -5236,10 +5236,14 @@ var NpmRuntimeUpdateManager = class {
 	};
 	syncStateFromCurrentPointer = () => {
 		const currentPointer = this.options.layout.readCurrentPointer();
-		if (!currentPointer) return;
+		const effectiveCurrentVersion = resolveEffectiveNpmRuntimeVersion({
+			launcherVersion: this.launcherVersion,
+			currentBundleVersion: currentPointer?.version ?? null
+		});
+		if (!effectiveCurrentVersion) return;
 		this.options.stateStore.update((state) => ({
 			...state,
-			currentVersion: state.currentVersion ?? currentPointer.version
+			currentVersion: effectiveCurrentVersion
 		}));
 	};
 	toSnapshotFromState = (state, patch) => {
@@ -16286,7 +16290,7 @@ async function startUiShell(params) {
 	if (!uiConfig.enabled) return null;
 	let publishUiEvent = null;
 	const deferredNcpAgent = createDeferredUiNcpAgent();
-	const uiServer = startUiServer({
+	const uiServer = await startUiServer({
 		host: uiConfig.host,
 		port: uiConfig.port,
 		configPath,
@@ -18477,7 +18481,7 @@ var MacosLaunchAgentAutostartService = class {
 			`    <string>${this.escapeXml(homeDir)}</string>`,
 			"  </dict>",
 			"  <key>RunAtLoad</key><true/>",
-			"  <key>KeepAlive</key><true/>",
+			"  <key>KeepAlive</key><false/>",
 			`  <key>StandardOutPath</key><string>${this.escapeXml(stdoutPath)}</string>`,
 			`  <key>StandardErrorPath</key><string>${this.escapeXml(stderrPath)}</string>`,
 			"</dict>",
@@ -20413,17 +20417,31 @@ var RestartCommands = class {
 			uiPort: opts.uiPort,
 			forcedPublicHost: this.deps.forcedPublicHost
 		});
+		const targetUi = resolveUiConfig(loadConfig(), uiOverrides);
 		const state = managedServiceStateStore.read();
 		if (state && isProcessRunning(state.pid)) {
 			console.log(`Restarting ${APP_NAME}...`);
 			await this.deps.runtimeCommandService.stopService();
 		} else {
+			const foregroundRuntime = localUiRuntimeStore.read();
+			const foregroundMatchesTarget = Boolean(foregroundRuntime && isProcessRunning(foregroundRuntime.pid) && foregroundRuntime.uiPort === targetUi.port);
+			if (foregroundRuntime && foregroundMatchesTarget) {
+				if (!await this.restartForegroundRuntime(foregroundRuntime.pid)) return;
+				await this.deps.startCommands.run(opts);
+				return;
+			}
 			if (state) {
 				managedServiceStateStore.clear();
 				console.log("Service state was stale and has been cleaned up.");
 			}
 			const unmanagedHealthyServiceMessage = await describeUnmanagedHealthyTargetMessage({ uiOverrides });
 			if (unmanagedHealthyServiceMessage) {
+				const adoptedRuntimePid = this.resolveAdoptableForegroundRuntimePid(targetUi.port);
+				if (adoptedRuntimePid) {
+					if (!await this.restartForegroundRuntime(adoptedRuntimePid)) return;
+					await this.deps.startCommands.run(opts);
+					return;
+				}
 				console.error(`Error: Cannot restart ${APP_NAME} because the target UI/API port is already served by a healthy unmanaged instance.`);
 				console.error(unmanagedHealthyServiceMessage);
 				return;
@@ -20432,6 +20450,40 @@ var RestartCommands = class {
 		}
 		await this.deps.startCommands.run(opts);
 	};
+	restartForegroundRuntime = async (pid) => {
+		console.log(`Restarting ${APP_NAME} foreground runtime (PID ${pid})...`);
+		try {
+			process.kill(pid, "SIGTERM");
+		} catch (error) {
+			console.error(`Failed to stop foreground runtime: ${String(error)}`);
+			return false;
+		}
+		if (!await waitForExit(pid, 3e3)) {
+			try {
+				process.kill(pid, "SIGKILL");
+			} catch (error) {
+				console.error(`Failed to force stop foreground runtime: ${String(error)}`);
+				return false;
+			}
+			if (!await waitForExit(pid, 2e3)) {
+				console.error(`Failed to stop foreground runtime PID ${pid}.`);
+				return false;
+			}
+		}
+		localUiRuntimeStore.clearIfOwnedByProcess(pid);
+		console.log(`✓ ${APP_NAME} foreground runtime stopped`);
+		return true;
+	};
+	resolveAdoptableForegroundRuntimePid = (port) => {
+		const listeningProcess = findListeningProcessByPort(port);
+		if (!listeningProcess || !isProcessRunning(listeningProcess.pid)) return null;
+		return this.isAdoptableNextclawRuntimeCommand(listeningProcess.command) ? listeningProcess.pid : null;
+	};
+	isAdoptableNextclawRuntimeCommand = (command) => {
+		const normalized = command?.trim() ?? "";
+		if (!normalized) return false;
+		return /\bserve\b/.test(normalized) && (normalized.includes("/dist/cli/app/index.js") || normalized.includes("/src/cli/app/index.js") || normalized.includes("/runtime/dist/cli/app/index.js"));
+	};
 };
 //#endregion
 //#region src/cli/commands/serve/index.ts

package/dist/cli/launcher/index.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { c as getPackageVersion$1, i as NpmRuntimeBundleService, o as NpmRuntimeBundleLayoutStore, r as inferDefaultNpmRuntimeReleaseChannel, t as NpmRuntimeUpdateStateStore } from "../../npm-runtime-update-state.store-BwM_B6eP.js";
+import { c as NpmRuntimeBundleLayoutStore, d as getPackageVersion$1, i as NpmRuntimeBundleService, r as inferDefaultNpmRuntimeReleaseChannel, s as shouldPreferPackagedNpmRuntime, t as NpmRuntimeUpdateStateStore } from "../../npm-runtime-update-state.store-75vzvn0B.js";
 import { createExternalCommandEnv } from "@nextclaw/core";
 import { dirname, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
@@ -33,7 +33,12 @@ var NpmRuntimeLauncher = class {
 			launcherVersion: getPackageVersion$1()
 		});
 		try {
-			return bundleService.resolveCurrentBundle()?.runtimeScriptPath ?? this.resolvePackagedAppEntrypoint();
+			const currentBundle = bundleService.resolveCurrentBundle();
+			if (currentBundle && shouldPreferPackagedNpmRuntime({
+				launcherVersion: getPackageVersion$1(),
+				currentBundleVersion: currentBundle.manifest.runtimeVersion ?? currentBundle.manifest.bundleVersion
+			})) return this.resolvePackagedAppEntrypoint();
+			return currentBundle?.runtimeScriptPath ?? this.resolvePackagedAppEntrypoint();
 		} catch (error) {
 			console.error(`Cannot start current runtime bundle: ${error instanceof Error ? error.message : String(error)}`);
 			console.error("Falling back to the packaged npm launcher runtime.");

package/dist/{npm-runtime-update-state.store-BwM_B6eP.js → npm-runtime-update-state.store-75vzvn0B.js}

@@ -2,7 +2,7 @@ import { createExternalCommandEnv, getDataDir, getLogsPath, getPackageVersion, r
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { dirname, join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
-import { spawn } from "node:child_process";
+import { spawn, spawnSync } from "node:child_process";
 import { isIP } from "node:net";
 import { cp, readdir, rename, rm } from "node:fs/promises";
 //#region src/cli/shared/utils/cli.utils.ts
@@ -71,6 +71,98 @@ async function waitForExit(pid, timeoutMs) {
 	}
 	return !isProcessRunning(pid);
 }
+function runLookupCommand(command, args) {
+	try {
+		const result = spawnSync(command, args, {
+			encoding: "utf8",
+			env: createExternalCommandEnv(process.env)
+		});
+		if (result.error || result.status !== 0) return {
+			ok: false,
+			stdout: ""
+		};
+		return {
+			ok: true,
+			stdout: result.stdout ?? ""
+		};
+	} catch {
+		return {
+			ok: false,
+			stdout: ""
+		};
+	}
+}
+function parseListeningPidFromLsof(raw) {
+	for (const line of raw.split("\n")) {
+		if (!line.startsWith("p")) continue;
+		const pid = Number(line.slice(1));
+		if (Number.isFinite(pid) && pid > 0) return pid;
+	}
+	return null;
+}
+function parseListeningPidFromNetstat(raw, port) {
+	const portSuffix = `:${port}`;
+	for (const line of raw.split("\n")) {
+		const trimmed = line.trim();
+		if (!trimmed || !trimmed.includes("LISTEN")) continue;
+		const columns = trimmed.split(/\s+/);
+		if (columns.length < 5) continue;
+		if (!(columns[1] ?? "").endsWith(portSuffix)) continue;
+		const pid = Number(columns[4]);
+		if (Number.isFinite(pid) && pid > 0) return pid;
+	}
+	return null;
+}
+function lookupProcessCommandByPid(pid) {
+	if (!Number.isFinite(pid) || pid <= 0) return null;
+	if (process.platform === "win32") {
+		const result = runLookupCommand("powershell", [
+			"-NoProfile",
+			"-Command",
+			`(Get-CimInstance Win32_Process -Filter "ProcessId = ${pid}").CommandLine`
+		]);
+		if (!result.ok) return null;
+		const command = result.stdout.trim();
+		return command.length > 0 ? command : null;
+	}
+	const result = runLookupCommand("ps", [
+		"-p",
+		String(pid),
+		"-o",
+		"command="
+	]);
+	if (!result.ok) return null;
+	const command = result.stdout.trim();
+	return command.length > 0 ? command : null;
+}
+function findListeningProcessByPort(port) {
+	if (!Number.isFinite(port) || port <= 0) return null;
+	let pid = null;
+	if (process.platform === "win32") {
+		const result = runLookupCommand("netstat", [
+			"-ano",
+			"-p",
+			"tcp"
+		]);
+		if (!result.ok) return null;
+		pid = parseListeningPidFromNetstat(result.stdout, port);
+	} else {
+		const result = runLookupCommand("lsof", [
+			"-nP",
+			`-iTCP:${port}`,
+			"-sTCP:LISTEN",
+			"-F",
+			"p"
+		]);
+		if (!result.ok) return null;
+		pid = parseListeningPidFromLsof(result.stdout);
+	}
+	if (!pid) return null;
+	return {
+		pid,
+		command: lookupProcessCommandByPid(pid)
+	};
+}
 function findNearestPackageManifest(startDir, expectedName) {
 	let current = resolve(startDir);
 	while (current.length > 0) {
@@ -379,6 +471,19 @@ function compareNpmRuntimeVersions(left, right) {
 	}
 	return left.localeCompare(right);
 }
+function resolveEffectiveNpmRuntimeVersion(params) {
+	const launcherVersion = params.launcherVersion?.trim() || null;
+	const currentBundleVersion = params.currentBundleVersion?.trim() || null;
+	if (!launcherVersion) return currentBundleVersion;
+	if (!currentBundleVersion) return launcherVersion;
+	return compareNpmRuntimeVersions(launcherVersion, currentBundleVersion) > 0 ? launcherVersion : currentBundleVersion;
+}
+function shouldPreferPackagedNpmRuntime(params) {
+	const launcherVersion = params.launcherVersion?.trim() || null;
+	const currentBundleVersion = params.currentBundleVersion?.trim() || null;
+	if (!launcherVersion || !currentBundleVersion) return false;
+	return resolveEffectiveNpmRuntimeVersion(params) === launcherVersion;
+}
 function parseVersionParts(version) {
 	return version.split(/[.-]/).map((part) => Number(part)).map((part) => Number.isFinite(part) ? part : 0);
 }
@@ -525,4 +630,4 @@ var NpmRuntimeUpdateStateStore = class {
 	};
 };
 //#endregion
-export { resolveUiConfig as _, compareNpmRuntimeVersions as a, getPackageVersion$1 as c, openBrowser as d, printAgentResponse as f, resolveUiApiBase as g, resolveServiceLogPath as h, NpmRuntimeBundleService as i, isLoopbackHost as l, resolvePublicIp as m, NpmRuntimeUpdateSourceService as n, NpmRuntimeBundleLayoutStore as o, prompt as p, inferDefaultNpmRuntimeReleaseChannel as r, findExecutableOnPath as s, NpmRuntimeUpdateStateStore as t, isProcessRunning as u, resolveUiStaticDir as v, waitForExit as y };
+export { waitForExit as S, resolvePublicIp as _, compareNpmRuntimeVersions as a, resolveUiConfig as b, NpmRuntimeBundleLayoutStore as c, getPackageVersion$1 as d, isLoopbackHost as f, prompt as g, printAgentResponse as h, NpmRuntimeBundleService as i, findExecutableOnPath as l, openBrowser as m, NpmRuntimeUpdateSourceService as n, resolveEffectiveNpmRuntimeVersion as o, isProcessRunning as p, inferDefaultNpmRuntimeReleaseChannel as r, shouldPreferPackagedNpmRuntime as s, NpmRuntimeUpdateStateStore as t, findListeningProcessByPort as u, resolveServiceLogPath as v, resolveUiStaticDir as x, resolveUiApiBase as y };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nextclaw",
-  "version": "0.18.12-beta.6",
+  "version": "0.18.12-beta.8",
   "description": "Lightweight personal AI assistant with CLI, multi-provider routing, and channel integrations.",
   "private": false,
   "type": "module",
@@ -41,21 +41,21 @@
     "commander": "^12.1.0",
     "jszip": "^3.10.1",
     "yaml": "^2.8.1",
-    "@nextclaw/mcp": "0.1.78-beta.0",
-    "@nextclaw/companion": "0.1.1-beta.0",
+    "@nextclaw/companion": "0.1.1-beta.1",
+    "@nextclaw/mcp": "0.1.78-beta.1",
     "@nextclaw/core": "0.12.13-beta.1",
-    "@nextclaw/kernel": "0.1.2-beta.1",
-    "@nextclaw/ncp-agent-runtime": "0.3.16-beta.0",
-    "@nextclaw/ncp-mcp": "0.1.80-beta.0",
-    "@nextclaw/nextclaw-hermes-acp-bridge": "0.1.5-beta.0",
-    "@nextclaw/ncp-toolkit": "0.5.11-beta.0",
-    "@nextclaw/openclaw-compat": "1.0.13-beta.0",
-    "@nextclaw/nextclaw-ncp-runtime-http-client": "0.1.5-beta.0",
     "@nextclaw/ncp": "0.5.6-beta.0",
+    "@nextclaw/kernel": "0.1.2-beta.2",
+    "@nextclaw/ncp-mcp": "0.1.80-beta.1",
+    "@nextclaw/ncp-agent-runtime": "0.3.16-beta.1",
+    "@nextclaw/nextclaw-hermes-acp-bridge": "0.1.5-beta.1",
+    "@nextclaw/nextclaw-ncp-runtime-http-client": "0.1.5-beta.1",
+    "@nextclaw/nextclaw-ncp-runtime-stdio-client": "0.1.6-beta.1",
+    "@nextclaw/ncp-toolkit": "0.5.11-beta.0",
+    "@nextclaw/remote": "0.1.90-beta.1",
+    "@nextclaw/openclaw-compat": "1.0.13-beta.1",
     "@nextclaw/runtime": "0.2.45-beta.0",
-    "@nextclaw/nextclaw-ncp-runtime-stdio-client": "0.1.6-beta.0",
-    "@nextclaw/server": "0.12.13-beta.0",
-    "@nextclaw/remote": "0.1.90-beta.0"
+    "@nextclaw/server": "0.12.13-beta.1"
   },
   "devDependencies": {
     "@types/node": "^20.17.6",
@@ -63,7 +63,7 @@
     "tsx": "^4.19.2",
     "typescript": "^5.6.3",
     "vitest": "^4.1.2",
-    "@nextclaw/ui": "0.12.20-beta.0"
+    "@nextclaw/ui": "0.12.20-beta.1"
   },
   "scripts": {
     "dev": "tsx watch --tsconfig tsconfig.json src/cli/app/index.ts",

package/resources/USAGE.md

@@ -189,6 +189,7 @@ When the gateway is already running, config changes from the UI or `nextclaw con
 - `agents.defaults.model`
 - `agents.context.*`
 - `tools.*`
+- `companion.enabled`
 - `plugins.*` (v1 hot plugin runtime: plugin registry/channel gateways/channels are hot-reloaded)
 
 Restart is still required for:
@@ -211,6 +212,40 @@ Useful commands:
 
 UI note: **Model** page save persists `agents.defaults.model` only.
 
+### Companion feature
+
+NextClaw companion is a persistent system feature backed by `companion.enabled`, not just a one-off background process.
+
+Recommended control path:
+
+- Open the runtime settings page in the UI.
+- Toggle **Companion enabled**.
+- Save the runtime settings.
+
+Behavior:
+
+- enabling starts the companion immediately when a local runtime is available
+- disabling stops any running companion process
+- if it remains enabled, it auto-starts again after the NextClaw runtime restarts
+
+CLI equivalents:
+
+```bash
+nextclaw companion enable
+nextclaw companion disable
+nextclaw companion status --json
+```
+
+Lower-level process controls are also available:
+
+```bash
+nextclaw companion start
+nextclaw companion stop
+```
+
+Use `enable/disable` when you want the feature state to persist in config.
+Use `start/stop` only for direct process control or debugging.
+
 ### Multi-agent routing & session isolation (OpenClaw-aligned)
 
 For agent identities themselves, do **not** create them through `Routing & Runtime` or direct `agents.list` edits.
@@ -464,6 +499,11 @@ Skill loading contract:
 | `nextclaw start` | Start gateway + UI in the background |
 | `nextclaw restart` | Restart the background service with optional start flags |
 | `nextclaw stop` | Stop the background service |
+| `nextclaw companion enable` | Persistently enable the companion feature and start it when a local runtime is available |
+| `nextclaw companion disable` | Persistently disable the companion feature and stop any running companion process |
+| `nextclaw companion status` | Show current companion process/config status (`--json`) |
+| `nextclaw companion start` | Start the companion process without changing the persisted feature toggle |
+| `nextclaw companion stop` | Stop the companion process without changing the persisted feature toggle (`--force` supported) |
 | `nextclaw service install-systemd --user` | Install a user-level Linux `systemd` service for NextClaw |
 | `sudo nextclaw service install-systemd --system` | Install a system-wide Linux `systemd` service for NextClaw |
 | `nextclaw service uninstall-systemd --user` | Remove a user-level Linux `systemd` service |
@@ -531,7 +571,7 @@ Autostart notes:
 
 - `npm i -g nextclaw` installs the CLI only. It does not register host autostart by itself.
 - On Linux, use `nextclaw service install-systemd --user` for a user-level login autostart path.
-- On macOS, use `nextclaw service install-launch-agent` for a LaunchAgent-based login autostart path.
+- On macOS, use `nextclaw service install-launch-agent` for a LaunchAgent-based login autostart path. The agent runs once at login and does not supervise retries after the runtime exits.
 - On Windows, use `nextclaw service install-task` for a Scheduled Task based login autostart path.
 - For machine-wide Linux startup after boot, use `sudo nextclaw service install-systemd --system`.
 - `nextclaw service autostart status` and `nextclaw service autostart doctor` are read-only inspection commands; add `--user` or `--system` only when you need an explicit Linux `systemd` scope.