nextclaw 0.18.12-beta.7 → 0.18.12-beta.8

package/dist/cli/app/index.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { _ as resolveUiApiBase, a as compareNpmRuntimeVersions, b as waitForExit, c as findListeningProcessByPort, d as isProcessRunning, f as openBrowser, g as resolveServiceLogPath, h as resolvePublicIp, i as NpmRuntimeBundleService, l as getPackageVersion$1, m as prompt, n as NpmRuntimeUpdateSourceService, o as NpmRuntimeBundleLayoutStore, p as printAgentResponse, s as findExecutableOnPath, t as NpmRuntimeUpdateStateStore, u as isLoopbackHost, v as resolveUiConfig, y as resolveUiStaticDir } from "../../npm-runtime-update-state.store-uaYppWyO.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) => {

package/dist/cli/launcher/index.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { i as NpmRuntimeBundleService, l as getPackageVersion$1, o as NpmRuntimeBundleLayoutStore, r as inferDefaultNpmRuntimeReleaseChannel, t as NpmRuntimeUpdateStateStore } from "../../npm-runtime-update-state.store-uaYppWyO.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-uaYppWyO.js → npm-runtime-update-state.store-75vzvn0B.js}

@@ -471,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);
 }
@@ -617,4 +630,4 @@ var NpmRuntimeUpdateStateStore = class {
 	};
 };
 //#endregion
-export { resolveUiApiBase as _, compareNpmRuntimeVersions as a, waitForExit as b, findListeningProcessByPort as c, isProcessRunning as d, openBrowser as f, resolveServiceLogPath as g, resolvePublicIp as h, NpmRuntimeBundleService as i, getPackageVersion$1 as l, prompt as m, NpmRuntimeUpdateSourceService as n, NpmRuntimeBundleLayoutStore as o, printAgentResponse as p, inferDefaultNpmRuntimeReleaseChannel as r, findExecutableOnPath as s, NpmRuntimeUpdateStateStore as t, isLoopbackHost as u, resolveUiConfig as v, resolveUiStaticDir 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.7",
+  "version": "0.18.12-beta.8",
   "description": "Lightweight personal AI assistant with CLI, multi-provider routing, and channel integrations.",
   "private": false,
   "type": "module",
@@ -42,20 +42,20 @@
     "jszip": "^3.10.1",
     "yaml": "^2.8.1",
     "@nextclaw/companion": "0.1.1-beta.1",
-    "@nextclaw/core": "0.12.13-beta.1",
     "@nextclaw/mcp": "0.1.78-beta.1",
+    "@nextclaw/core": "0.12.13-beta.1",
     "@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/ncp-toolkit": "0.5.11-beta.0",
     "@nextclaw/nextclaw-hermes-acp-bridge": "0.1.5-beta.1",
-    "@nextclaw/kernel": "0.1.2-beta.2",
     "@nextclaw/nextclaw-ncp-runtime-http-client": "0.1.5-beta.1",
-    "@nextclaw/ncp-mcp": "0.1.80-beta.1",
-    "@nextclaw/server": "0.12.13-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/nextclaw-ncp-runtime-stdio-client": "0.1.6-beta.1",
-    "@nextclaw/runtime": "0.2.45-beta.0"
+    "@nextclaw/runtime": "0.2.45-beta.0",
+    "@nextclaw/server": "0.12.13-beta.1"
   },
   "devDependencies": {
     "@types/node": "^20.17.6",