nextclaw 0.18.12-beta.9 → 0.18.12

package/dist/cli/app/index.js

@@ -2,7 +2,7 @@
 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";
+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, createExternalCommandEnv, 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";
 import { Command } from "commander";
 import fs, { appendFileSync, closeSync, constants, cpSync, existsSync, mkdirSync, openSync, readFileSync, readdirSync, rmSync, unlinkSync, writeFileSync } from "node:fs";
 import path, { basename, delimiter, dirname, extname, isAbsolute, join, relative, resolve, sep, win32 } from "node:path";
@@ -30,6 +30,7 @@ import { setImmediate as setImmediate$1, setTimeout as setTimeout$1 } from "node
 import { request } from "node:http";
 import { request as request$1 } from "node:https";
 import chokidar from "chokidar";
+import { eventKeys, nextclaw } from "@nextclaw/kernel";
 import { parse } from "yaml";
 //#region \0rolldown/runtime.js
 var __create = Object.create;
@@ -5062,6 +5063,14 @@ function parseSessionKey(sessionKey) {
 	};
 }
 //#endregion
+//#region src/cli/shared/utils/top-level-nextclaw-command-env.utils.ts
+const NEXTCLAW_RUNTIME_BUNDLE_ENV_KEYS = ["NEXTCLAW_RUNTIME_BUNDLE_CHILD", "NEXTCLAW_DISABLE_RUNTIME_BUNDLE_LAUNCHER"];
+function createTopLevelNextclawCommandEnv(baseEnv = process.env, extraEnv = {}) {
+	const env = createExternalCommandEnv(baseEnv, extraEnv);
+	for (const key of NEXTCLAW_RUNTIME_BUNDLE_ENV_KEYS) delete env[key];
+	return env;
+}
+//#endregion
 //#region src/cli/shared/utils/startup-trace.ts
 const STARTUP_TRACE_ENABLED = process.env.NEXTCLAW_STARTUP_TRACE === "1";
 const STARTUP_TRACE_ORIGIN_MS = Date.now();
@@ -5685,11 +5694,9 @@ const readInstalledFirstPartyPluginMatches = (workspaceExtensionsDir) => {
 		const workspacePackage = workspacePackageByName.get(packageName);
 		if (!workspacePackage) continue;
 		matches.push({
-			pluginId: workspacePackage.pluginId,
 			packageName,
 			workspaceDir: workspacePackage.dir,
-			installPath: packageDir,
-			supportsDevelopmentSource: workspacePackage.supportsDevelopmentSource
+			installPath: packageDir
 		});
 	}
 	return matches;
@@ -5709,35 +5716,6 @@ const findWorkspacePackageForInstallRecord = (installRecord, workspacePackages,
 	if (installPathCandidates.size === 0) return;
 	return workspacePackages.find((workspacePackage) => installPathCandidates.has(path.resolve(workspacePackage.dir)));
 };
-const buildDevelopmentSourceEntryDefaults = (config, workspacePackages, installedPluginMatches) => {
-	const packageByName = new Map(workspacePackages.map((entry) => [entry.packageName, entry]));
-	const nextEntries = { ...config.plugins.entries ?? {} };
-	let didDefaultDevelopmentSource = false;
-	for (const installedPlugin of installedPluginMatches) {
-		if (!installedPlugin.supportsDevelopmentSource) continue;
-		const existingEntry = nextEntries[installedPlugin.pluginId];
-		if (existingEntry?.source) continue;
-		nextEntries[installedPlugin.pluginId] = {
-			...existingEntry,
-			source: "development"
-		};
-		didDefaultDevelopmentSource = true;
-	}
-	for (const [pluginId, installRecord] of Object.entries(config.plugins.installs ?? {})) {
-		if (!findWorkspacePackageForInstallRecord(installRecord, workspacePackages, packageByName)?.supportsDevelopmentSource) continue;
-		const existingEntry = nextEntries[pluginId];
-		if (existingEntry?.source) continue;
-		nextEntries[pluginId] = {
-			...existingEntry,
-			source: "development"
-		};
-		didDefaultDevelopmentSource = true;
-	}
-	return {
-		didDefaultDevelopmentSource,
-		nextEntries
-	};
-};
 const resolveDevFirstPartyPluginLoadPaths = (config, workspaceExtensionsDir) => {
 	const rootDir = resolveDevFirstPartyPluginDir(workspaceExtensionsDir);
 	if (!rootDir) return [];
@@ -5787,18 +5765,15 @@ const resolveDevFirstPartyPluginInstallRoots = (config, workspaceExtensionsDir)
 const applyDevFirstPartyPluginLoadPaths = (config, workspaceExtensionsDir) => {
 	const rootDir = resolveDevFirstPartyPluginDir(workspaceExtensionsDir);
 	if (!rootDir) return config;
-	const workspacePackages = readWorkspacePluginPackages(rootDir);
-	if (workspacePackages.length === 0) return config;
-	const installedPluginMatches = readInstalledFirstPartyPluginMatches(rootDir);
+	if (readWorkspacePluginPackages(rootDir).length === 0) return config;
+	readInstalledFirstPartyPluginMatches(rootDir);
 	const devLoadPaths = resolveDevFirstPartyPluginLoadPaths(config, rootDir);
 	if (devLoadPaths.length === 0) return config;
 	const mergedLoadPaths = mergeLoadPaths$1(Array.isArray(config.plugins.load?.paths) ? config.plugins.load.paths.filter((entry) => typeof entry === "string" && entry.trim().length > 0) : [], devLoadPaths);
-	const { didDefaultDevelopmentSource, nextEntries } = buildDevelopmentSourceEntryDefaults(config, workspacePackages, installedPluginMatches);
 	return {
 		...config,
 		plugins: {
 			...config.plugins,
-			entries: didDefaultDevelopmentSource ? nextEntries : config.plugins.entries,
 			load: {
 				...config.plugins.load,
 				paths: mergedLoadPaths
@@ -5809,10 +5784,10 @@ const applyDevFirstPartyPluginLoadPaths = (config, workspaceExtensionsDir) => {
 //#endregion
 //#region src/cli/commands/plugin/development-source/dev-plugin-overrides.utils.ts
 const DEV_PLUGIN_OVERRIDES_ENV = "NEXTCLAW_DEV_PLUGIN_OVERRIDES";
-function isRecord$6(value) {
+function isRecord$7(value) {
 	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
-function readOptionalString$6(value) {
+function readOptionalString$7(value) {
 	if (typeof value !== "string") return;
 	return value.trim() || void 0;
 }
@@ -5838,9 +5813,9 @@ function assertOverridePluginReadable(override) {
 	}
 }
 function readOverrideRecord(value, index) {
-	if (!isRecord$6(value)) throw new Error(`[dev-plugin-override] override[${index}] must be an object`);
-	const pluginId = readOptionalString$6(value.pluginId);
-	const pluginPath = readOptionalString$6(value.pluginPath);
+	if (!isRecord$7(value)) throw new Error(`[dev-plugin-override] override[${index}] must be an object`);
+	const pluginId = readOptionalString$7(value.pluginId);
+	const pluginPath = readOptionalString$7(value.pluginPath);
 	const source = value.source === "development" ? "development" : "production";
 	if (!pluginId || !pluginPath) throw new Error(`[dev-plugin-override] override[${index}] requires pluginId and pluginPath`);
 	const normalized = {
@@ -5897,7 +5872,7 @@ function resolveDevPluginOverrideInstallRoots(config, overrides) {
 	const installRoots = [];
 	for (const override of overrides) {
 		const installRecord = config.plugins.installs?.[override.pluginId];
-		const installPath = readOptionalString$6(installRecord?.installPath);
+		const installPath = readOptionalString$7(installRecord?.installPath);
 		if (!installPath || installRoots.includes(installPath)) continue;
 		installRoots.push(installPath);
 	}
@@ -8360,13 +8335,13 @@ var AgentCommands = class {
 };
 //#endregion
 //#region src/cli/commands/ncp/features/runtime/ncp-asset-tools.ts
-function readOptionalString$5(value) {
+function readOptionalString$6(value) {
 	if (typeof value !== "string") return null;
 	const trimmed = value.trim();
 	return trimmed.length > 0 ? trimmed : null;
 }
 function readOptionalBase64Bytes(value) {
-	const base64 = readOptionalString$5(value);
+	const base64 = readOptionalString$6(value);
 	if (!base64) return null;
 	try {
 		return Buffer.from(base64, "base64");
@@ -8417,18 +8392,18 @@ var AssetPutTool = class {
 		this.contentBasePath = contentBasePath;
 	}
 	validateArgs = (args) => {
-		const path = readOptionalString$5(args.path);
-		const bytesBase64 = readOptionalString$5(args.bytesBase64);
-		const fileName = readOptionalString$5(args.fileName);
+		const path = readOptionalString$6(args.path);
+		const bytesBase64 = readOptionalString$6(args.bytesBase64);
+		const fileName = readOptionalString$6(args.fileName);
 		if (path && bytesBase64) return ["Provide either path, or bytesBase64 + fileName, not both."];
 		if (path) return [];
 		if (bytesBase64) return fileName ? [] : ["fileName is required when using bytesBase64."];
 		return ["Provide either path, or bytesBase64 + fileName."];
 	};
 	execute = async (args) => {
-		const path = readOptionalString$5(args?.path);
-		const fileName = readOptionalString$5(args?.fileName);
-		const mimeType = readOptionalString$5(args?.mimeType);
+		const path = readOptionalString$6(args?.path);
+		const fileName = readOptionalString$6(args?.fileName);
+		const mimeType = readOptionalString$6(args?.mimeType);
 		const bytes = readOptionalBase64Bytes(args?.bytesBase64);
 		if (path) return {
 			ok: true,
@@ -8471,8 +8446,8 @@ var AssetExportTool = class {
 		this.assetStore = assetStore;
 	}
 	execute = async (args) => {
-		const assetUri = readOptionalString$5(args?.assetUri);
-		const targetPath = readOptionalString$5(args?.targetPath);
+		const assetUri = readOptionalString$6(args?.assetUri);
+		const targetPath = readOptionalString$6(args?.targetPath);
 		if (!assetUri || !targetPath) throw new Error("asset_export requires assetUri and targetPath.");
 		return {
 			ok: true,
@@ -8498,7 +8473,7 @@ var AssetStatTool = class {
 		this.contentBasePath = contentBasePath;
 	}
 	execute = async (args) => {
-		const assetUri = readOptionalString$5(args?.assetUri);
+		const assetUri = readOptionalString$6(args?.assetUri);
 		if (!assetUri) throw new Error("asset_stat requires assetUri.");
 		const record = await this.assetStore.statRecord(assetUri);
 		if (!record) return {
@@ -8530,11 +8505,11 @@ function normalizeString(value) {
 	const trimmed = value.trim();
 	return trimmed.length > 0 ? trimmed : null;
 }
-function isRecord$5(value) {
+function isRecord$6(value) {
 	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
 function cloneMetadata(value) {
-	return isRecord$5(value) ? structuredClone(value) : void 0;
+	return isRecord$6(value) ? structuredClone(value) : void 0;
 }
 function readStringArray(value) {
 	if (!Array.isArray(value)) return null;
@@ -9025,7 +9000,7 @@ function readRequiredString$1(params, key) {
 	if (typeof value !== "string" || value.trim().length === 0) throw new Error(`${key} must be a non-empty string.`);
 	return value.trim();
 }
-function readOptionalString$4(params, key) {
+function readOptionalString$5(params, key) {
 	const value = params[key];
 	if (typeof value !== "string") return;
 	const trimmed = value.trim();
@@ -9086,14 +9061,14 @@ var SessionRequestTool = class extends Tool {
 		const target = params.target;
 		if (!target || typeof target !== "object" || Array.isArray(target)) throw new Error("target must be an object.");
 		const task = readRequiredString$1(params, "task");
-		const notifyMode = readOptionalString$4(params, "notify")?.toLowerCase();
+		const notifyMode = readOptionalString$5(params, "notify")?.toLowerCase();
 		if (notifyMode !== "none" && notifyMode !== "final_reply") throw new Error("notify must be \"none\" or \"final_reply\".");
 		return this.broker.requestSession({
 			sourceSessionId: this.sourceSessionId,
 			sourceToolCallId: toolCallId,
 			targetSessionId: readRequiredString$1(target, "session_id"),
 			task,
-			title: readOptionalString$4(params, "title"),
+			title: readOptionalString$5(params, "title"),
 			notify: notifyMode,
 			handoffDepth: this.handoffDepth
 		});
@@ -9105,13 +9080,13 @@ function readRequiredString(value, key) {
 	if (typeof value !== "string" || value.trim().length === 0) throw new Error(`${key} must be a non-empty string.`);
 	return value.trim();
 }
-function readOptionalString$3(value) {
+function readOptionalString$4(value) {
 	if (typeof value !== "string") return;
 	const trimmed = value.trim();
 	return trimmed.length > 0 ? trimmed : void 0;
 }
 function readSpawnScope(value) {
-	const normalized = readOptionalString$3(value)?.toLowerCase();
+	const normalized = readOptionalString$4(value)?.toLowerCase();
 	if (!normalized || normalized === "standalone") return "standalone";
 	if (normalized === "child") return "child";
 	throw new Error("scope must be \"standalone\" or \"child\".");
@@ -9119,7 +9094,7 @@ function readSpawnScope(value) {
 function readSpawnRequestOptions(value) {
 	if (typeof value === "undefined") return;
 	if (!value || typeof value !== "object" || Array.isArray(value)) throw new Error("request must be an object.");
-	const notifyMode = readOptionalString$3(value.notify)?.toLowerCase();
+	const notifyMode = readOptionalString$4(value.notify)?.toLowerCase();
 	if (notifyMode === "none" || notifyMode === "final_reply") return { notify: notifyMode };
 	throw new Error("request.notify must be \"none\" or \"final_reply\".");
 }
@@ -9197,21 +9172,21 @@ var SessionSpawnTool = class extends Tool {
 			sourceToolCallId: toolCallId,
 			sourceSessionMetadata: this.sourceSessionMetadata,
 			task,
-			title: readOptionalString$3(rawTitle),
-			agentId: readOptionalString$3(rawAgentId),
-			model: readOptionalString$3(rawModel),
-			runtime: readOptionalString$3(rawRuntime),
+			title: readOptionalString$4(rawTitle),
+			agentId: readOptionalString$4(rawAgentId),
+			model: readOptionalString$4(rawModel),
+			runtime: readOptionalString$4(rawRuntime),
 			handoffDepth: this.handoffDepth,
 			...parentSessionId ? { parentSessionId } : {},
 			notify: request.notify
 		});
 		const session = this.sessionCreationService.createSession({
 			task,
-			title: readOptionalString$3(rawTitle),
+			title: readOptionalString$4(rawTitle),
 			sourceSessionMetadata: this.sourceSessionMetadata,
-			agentId: readOptionalString$3(rawAgentId),
-			model: readOptionalString$3(rawModel),
-			runtime: readOptionalString$3(rawRuntime),
+			agentId: readOptionalString$4(rawAgentId),
+			model: readOptionalString$4(rawModel),
+			runtime: readOptionalString$4(rawRuntime),
 			...parentSessionId ? { parentSessionId } : {}
 		});
 		return {
@@ -9235,10 +9210,10 @@ var SessionSpawnTool = class extends Tool {
 //#endregion
 //#region src/cli/commands/ncp/nextclaw-ncp-tool-registry.ts
 function toToolParams(args) {
-	if (isRecord$5(args)) return args;
+	if (isRecord$6(args)) return args;
 	if (typeof args === "string") try {
 		const parsed = JSON.parse(args);
-		return isRecord$5(parsed) ? parsed : {};
+		return isRecord$6(parsed) ? parsed : {};
 	} catch {
 		return {};
 	}
@@ -9416,14 +9391,14 @@ function readAccountIdForHints(metadata, sessionMetadata) {
 //#endregion
 //#region src/cli/commands/ncp/nextclaw-ncp-context-builder.ts
 const TIME_HINT_TRIGGER_PATTERNS = [/\b(now|right now|current time|what time|today|tonight|tomorrow|yesterday|this morning|this afternoon|this evening|date)\b/i, /(现在|此刻|当前时间|现在几点|几点了|今天|今晚|今早|今晨|明天|昨天|日期)/];
-function isRecord$4(value) {
+function isRecord$5(value) {
 	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
 function mergeInputMetadata(input) {
-	const messageMetadata = input.messages.slice().reverse().find((message) => isRecord$4(message.metadata))?.metadata;
+	const messageMetadata = input.messages.slice().reverse().find((message) => isRecord$5(message.metadata))?.metadata;
 	return {
-		...isRecord$4(messageMetadata) ? structuredClone(messageMetadata) : {},
-		...isRecord$4(input.metadata) ? structuredClone(input.metadata) : {}
+		...isRecord$5(messageMetadata) ? structuredClone(messageMetadata) : {},
+		...isRecord$5(input.metadata) ? structuredClone(input.metadata) : {}
 	};
 }
 const REQUESTED_SKILLS_METADATA_READER = new RequestedSkillsMetadataReader();
@@ -10047,7 +10022,7 @@ const CHILD_SESSION_PARENT_METADATA_KEY = "parent_session_id";
 const CHILD_SESSION_REQUEST_METADATA_KEY = "spawned_by_request_id";
 const CHILD_SESSION_LIFECYCLE_METADATA_KEY = "session_lifecycle";
 const CHILD_SESSION_PROMOTED_METADATA_KEY = "child_session_promoted";
-function readOptionalString$2(value) {
+function readOptionalString$3(value) {
 	if (typeof value !== "string") return null;
 	const trimmed = value.trim();
 	return trimmed.length > 0 ? trimmed : null;
@@ -10087,14 +10062,14 @@ function buildSessionId() {
 	return `ncp-${Date.now().toString(36)}-${randomUUID().replace(/-/g, "").slice(0, 8)}`;
 }
 function resolveSessionAgentId(params) {
-	return readOptionalString$2(params.agentId) ?? resolveDefaultAgentProfileId(params.getConfig());
+	return readOptionalString$3(params.agentId) ?? resolveDefaultAgentProfileId(params.getConfig());
 }
 function resolveSessionTitle(params) {
-	return readOptionalString$2(params.title) ?? summarizeTask(params.task);
+	return readOptionalString$3(params.title) ?? summarizeTask(params.task);
 }
 function resolveSessionType(params) {
 	const { metadata, runtime, sessionType } = params;
-	return readOptionalString$2(runtime) ?? readOptionalString$2(metadata.runtime) ?? readOptionalString$2(sessionType) ?? readOptionalString$2(metadata.session_type) ?? DEFAULT_SESSION_TYPE;
+	return readOptionalString$3(runtime) ?? readOptionalString$3(metadata.runtime) ?? readOptionalString$3(sessionType) ?? readOptionalString$3(metadata.session_type) ?? DEFAULT_SESSION_TYPE;
 }
 function applySessionOverrides(params) {
 	const { lifecycle, metadata, model, parentSessionId, projectRoot, requestId, sessionType, thinkingLevel, title } = params;
@@ -10107,15 +10082,15 @@ function applySessionOverrides(params) {
 		metadata[CHILD_SESSION_PROMOTED_METADATA_KEY] = false;
 	}
 	if (requestId) metadata[CHILD_SESSION_REQUEST_METADATA_KEY] = requestId;
-	if (readOptionalString$2(model)) {
+	if (readOptionalString$3(model)) {
 		metadata.model = model?.trim();
 		metadata.preferred_model = model?.trim();
 	}
-	if (readOptionalString$2(thinkingLevel)) {
+	if (readOptionalString$3(thinkingLevel)) {
 		metadata.thinking = thinkingLevel?.trim();
 		metadata.preferred_thinking = thinkingLevel?.trim();
 	}
-	if (readOptionalString$2(projectRoot)) metadata.project_root = projectRoot?.trim();
+	if (readOptionalString$3(projectRoot)) metadata.project_root = projectRoot?.trim();
 }
 var SessionCreationService = class {
 	constructor(sessionManager, getConfig, onSessionUpdated) {
@@ -10137,8 +10112,8 @@ var SessionCreationService = class {
 			task
 		});
 		const metadata = cloneInheritedMetadata(sourceSessionMetadata);
-		const parentSessionId = readOptionalString$2(rawParentSessionId);
-		const requestId = readOptionalString$2(rawRequestId);
+		const parentSessionId = readOptionalString$3(rawParentSessionId);
+		const requestId = readOptionalString$3(rawRequestId);
 		const sessionType = resolveSessionType({
 			runtime,
 			sessionType: requestedSessionType,
@@ -10191,12 +10166,12 @@ var SessionCreationService = class {
 		return true;
 	};
 	isChildSessionRecord = (metadata) => {
-		return Boolean(readOptionalString$2(metadata?.[CHILD_SESSION_PARENT_METADATA_KEY]));
+		return Boolean(readOptionalString$3(metadata?.[CHILD_SESSION_PARENT_METADATA_KEY]));
 	};
 };
 //#endregion
 //#region src/cli/commands/ncp/session-request/session-request-result.ts
-function readOptionalString$1(value) {
+function readOptionalString$2(value) {
 	if (typeof value !== "string") return null;
 	const trimmed = value.trim();
 	return trimmed.length > 0 ? trimmed : null;
@@ -10217,7 +10192,7 @@ function extractSessionMessageText(message) {
 	return parts.join("\n\n");
 }
 function readParentSessionId(metadata) {
-	return readOptionalString$1(metadata?.["parent_session_id"]) ?? void 0;
+	return readOptionalString$2(metadata?.["parent_session_id"]) ?? void 0;
 }
 function buildSessionRequestToolResult(params) {
 	const { request, task, title, agentId, isChildSession, parentSessionId, spawnedByRequestId, message } = params;
@@ -10356,7 +10331,7 @@ var SessionRequestBroker = class {
 			sourceToolCallId,
 			targetSessionId: normalizedTargetSessionId,
 			task,
-			title: readOptionalString$1(title) ?? readOptionalString$1(targetSummary.metadata?.label) ?? summarizeSessionRequestTask(task),
+			title: readOptionalString$2(title) ?? readOptionalString$2(targetSummary.metadata?.label) ?? summarizeSessionRequestTask(task),
 			handoffDepth: handoffDepth ?? 0,
 			notify,
 			agentId: targetSummary.agentId,
@@ -10892,7 +10867,7 @@ var SessionSearchStoreService = class {
 };
 //#endregion
 //#region src/cli/commands/ncp/session-search/session-search-tool.service.ts
-function isRecord$3(value) {
+function isRecord$4(value) {
 	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
 function readOptionalInteger(value) {
@@ -10942,7 +10917,7 @@ var SessionSearchTool = class {
 		return issues;
 	};
 	execute = async (args) => {
-		if (!isRecord$3(args)) throw new Error("session_search requires an object argument.");
+		if (!isRecord$4(args)) throw new Error("session_search requires an object argument.");
 		const issues = this.validateArgs(args);
 		if (issues.length > 0) throw new Error(issues.join(" "));
 		return this.queryService.search({
@@ -11874,12 +11849,12 @@ function createContextWindowUpdatedEvent(params) {
 		}
 	};
 }
-function isRecord$2(value) {
+function isRecord$3(value) {
 	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
 function resolveNativeReasoningNormalizationMode(params) {
 	const runtimeEntry = params.config.agents.runtimes.entries.native?.config ?? params.config.ui.ncp.runtimes.native;
-	const runtimeMetadata = isRecord$2(runtimeEntry) ? runtimeEntry : {};
+	const runtimeMetadata = isRecord$3(runtimeEntry) ? runtimeEntry : {};
 	return readAssistantReasoningNormalizationModeFromMetadata(params.sessionMetadata) ?? readAssistantReasoningNormalizationMode(runtimeMetadata.reasoningNormalization) ?? readAssistantReasoningNormalizationMode(runtimeMetadata.reasoning_normalization) ?? readAssistantReasoningNormalizationMode(runtimeMetadata.reasoningNormalizationMode) ?? readAssistantReasoningNormalizationMode(runtimeMetadata.reasoning_normalization_mode) ?? "think-tags";
 }
 function createMcpRuntimeSupport(getConfig) {
@@ -14306,6 +14281,27 @@ async function describeUnmanagedHealthyTargetMessage(params) {
 //#endregion
 //#region src/cli/shared/services/runtime/service-managed-startup.service.ts
 const { APP_NAME: APP_NAME$1, loadConfig: loadConfig$4 } = NextclawCore;
+function resolveManagedServiceReadySnapshot(params) {
+	const { snapshot, readLocalUiRuntimeState, isProcessRunningFn: providedIsProcessRunningFn } = params;
+	const localUiRuntimeState = (readLocalUiRuntimeState ?? localUiRuntimeStore.read)();
+	const isProcessRunningFn = providedIsProcessRunningFn ?? isProcessRunning;
+	if (!localUiRuntimeState || typeof localUiRuntimeState.pid !== "number" || !Number.isFinite(localUiRuntimeState.pid) || localUiRuntimeState.uiPort !== snapshot.uiPort || !isProcessRunningFn(localUiRuntimeState.pid)) return snapshot;
+	return {
+		...snapshot,
+		pid: localUiRuntimeState.pid,
+		uiUrl: localUiRuntimeState.uiUrl,
+		apiUrl: localUiRuntimeState.apiUrl,
+		uiHost: localUiRuntimeState.uiHost ?? snapshot.uiHost,
+		uiPort: localUiRuntimeState.uiPort ?? snapshot.uiPort
+	};
+}
+function resolveLauncherCliEntry(importMetaUrl) {
+	const modulePath = fileURLToPath(importMetaUrl);
+	const cliRootIndex = modulePath.replace(/\\/g, "/").lastIndexOf("/cli/");
+	if (cliRootIndex === -1) return fileURLToPath(new URL("../../../launcher/index.js", importMetaUrl));
+	const extension = extname(modulePath) || ".js";
+	return resolve(modulePath.slice(0, cliRootIndex + 5), "launcher", `index${extension}`);
+}
 function toObjectRecord(value) {
 	if (!value || typeof value !== "object" || Array.isArray(value)) return null;
 	return value;
@@ -14357,7 +14353,7 @@ function spawnManagedService(params) {
 	appendStartupStage(logPath, `start requested: ui=${uiConfig.host}:${uiConfig.port}, readinessTimeoutMs=${readinessTimeoutMs}`);
 	console.log(`Starting ${appName} background service (readiness timeout ${Math.ceil(readinessTimeoutMs / 1e3)}s)...`);
 	const cliLaunch = resolveCliSubcommandLaunch({
-		argvEntry: process.argv[1],
+		argvEntry: resolveLauncherCliEntry(import.meta.url),
 		importMetaUrl: import.meta.url,
 		cliArgs: [
 			"serve",
@@ -14369,7 +14365,7 @@ function spawnManagedService(params) {
 	const childArgs = [...process.execArgv, ...cliLaunch.args];
 	appendStartupStage(logPath, `spawning background process: ${cliLaunch.command} ${childArgs.join(" ")}`);
 	const child = spawn(cliLaunch.command, childArgs, {
-		env: process.env,
+		env: createTopLevelNextclawCommandEnv(process.env),
 		stdio: "ignore",
 		detached: true
 	});
@@ -14628,12 +14624,13 @@ var ManagedServiceCommandService = class {
 			return;
 		}
 		startup.child.unref();
+		const readySnapshot = resolveManagedServiceReadySnapshot({ snapshot: startup.snapshot });
 		await reportManagedServiceStart({
 			appName: APP_NAME$1,
 			state: writeReadyManagedServiceState({
 				readinessTimeoutMs: startup.readinessTimeoutMs,
 				readiness,
-				snapshot: startup.snapshot
+				snapshot: readySnapshot
 			}),
 			uiConfig,
 			uiUrl,
@@ -15178,25 +15175,25 @@ var NpmRuntimeUpdateHost = class {
 	};
 	applyDownloadedUpdate = async () => {
 		if (this.activeTask) return this.snapshot;
-		this.snapshot = {
+		this.setSnapshot({
 			...this.snapshot,
 			status: "applying",
 			progress: null,
 			errorMessage: null
-		};
+		});
 		try {
 			const snapshot = this.createManager().applyDownloadedUpdate();
-			this.snapshot = this.deps.applyRestartMode === "managed-service-restart" ? snapshot : {
+			this.setSnapshot(this.deps.applyRestartMode === "managed-service-restart" ? snapshot : {
 				...snapshot,
 				recoveryCommand: "Restart this NextClaw process to launch the downloaded runtime."
-			};
+			});
 			if (this.deps.applyRestartMode === "managed-service-restart") await requestManagedServiceRestart(this.deps.requestRestart, {
 				reason: "runtime update apply",
 				uiPort: this.deps.uiConfig.port
 			});
 			return this.snapshot;
 		} catch (error) {
-			this.snapshot = this.toFailedSnapshot(error);
+			this.setSnapshot(this.toFailedSnapshot(error));
 			throw error;
 		}
 	};
@@ -15208,7 +15205,7 @@ var NpmRuntimeUpdateHost = class {
 				...preferences
 			}
 		}));
-		this.snapshot = this.createManager(nextState.channel).getSnapshot();
+		this.setSnapshot(this.createManager(nextState.channel).getSnapshot());
 		if (nextState.updatePreferences.automaticChecks) this.startAutomaticSync({ force: true });
 		return this.snapshot;
 	};
@@ -15217,7 +15214,7 @@ var NpmRuntimeUpdateHost = class {
 			...current,
 			channel
 		}));
-		this.snapshot = this.createManager(nextState.channel).getSnapshot();
+		this.setSnapshot(this.createManager(nextState.channel).getSnapshot());
 		if (nextState.updatePreferences.automaticChecks) return this.startCheck({ autoDownload: nextState.updatePreferences.autoDownload });
 		return this.snapshot;
 	};
@@ -15231,19 +15228,19 @@ var NpmRuntimeUpdateHost = class {
 	};
 	startCheck = async (options) => {
 		if (this.activeTask) return this.snapshot;
-		this.snapshot = {
+		this.setSnapshot({
 			...this.createManager().getSnapshot(),
 			status: "checking",
 			progress: null,
 			errorMessage: null
-		};
+		});
 		this.activeTask = (async () => {
 			try {
 				const checkedSnapshot = await this.createManager().checkForUpdate();
-				this.snapshot = checkedSnapshot;
+				this.setSnapshot(checkedSnapshot);
 				if (options.autoDownload && checkedSnapshot.status === "update-available") await this.runDownloadTask();
 			} catch (error) {
-				this.snapshot = this.toFailedSnapshot(error);
+				this.setSnapshot(this.toFailedSnapshot(error));
 			} finally {
 				this.activeTask = null;
 			}
@@ -15252,17 +15249,17 @@ var NpmRuntimeUpdateHost = class {
 	};
 	startDownload = async () => {
 		if (this.activeTask) return this.snapshot;
-		this.snapshot = {
+		this.setSnapshot({
 			...this.createManager().getSnapshot(),
 			status: "downloading",
 			progress: INITIAL_DOWNLOAD_PROGRESS,
 			errorMessage: null
-		};
+		});
 		this.activeTask = (async () => {
 			try {
 				await this.runDownloadTask();
 			} catch (error) {
-				this.snapshot = this.toFailedSnapshot(error);
+				this.setSnapshot(this.toFailedSnapshot(error));
 			} finally {
 				this.activeTask = null;
 			}
@@ -15270,14 +15267,15 @@ var NpmRuntimeUpdateHost = class {
 		return this.snapshot;
 	};
 	runDownloadTask = async () => {
-		this.snapshot = await this.createManager().downloadUpdate((progress) => {
-			this.snapshot = {
+		const downloadedSnapshot = await this.createManager().downloadUpdate((progress) => {
+			this.setSnapshot({
 				...this.snapshot,
 				status: "downloading",
 				progress,
 				errorMessage: null
-			};
+			});
 		});
+		this.setSnapshot(downloadedSnapshot);
 	};
 	createManager = (channel = this.stateStore.read().channel) => {
 		return new NpmRuntimeUpdateManager({
@@ -15298,6 +15296,11 @@ var NpmRuntimeUpdateHost = class {
 			errorMessage: error instanceof Error ? error.message : String(error ?? "Unknown error")
 		};
 	};
+	setSnapshot = (snapshot) => {
+		this.snapshot = snapshot;
+		nextclaw.eventBus.emit(eventKeys.runtimeUpdateSnapshot, snapshot, { source: "backend" });
+		return snapshot;
+	};
 };
 function createNpmRuntimeUpdateHost(params) {
 	return new NpmRuntimeUpdateHost(params);
@@ -15423,9 +15426,15 @@ function createRuntimeControlHost(params) {
 }
 //#endregion
 //#region src/cli/shared/services/ui/service-ui-hosts.service.ts
+function resolveApplyRestartMode(uiPort) {
+	const serviceState = managedServiceStateStore.read();
+	if (serviceState?.pid === process.pid) return "managed-service-restart";
+	if (process.env.NEXTCLAW_RUNTIME_BUNDLE_CHILD === "1" && typeof serviceState?.uiPort === "number" && serviceState.uiPort === uiPort) return "managed-service-restart";
+	return "manual-process-restart";
+}
 function createServiceUiHosts(params) {
 	const { requestRestart, serviceCommands, uiConfig } = params;
-	const applyRestartMode = managedServiceStateStore.read()?.pid === process.pid ? "managed-service-restart" : "manual-process-restart";
+	const applyRestartMode = resolveApplyRestartMode(uiConfig.port);
 	return {
 		remoteAccess: createRemoteAccessHost(params),
 		runtimeControl: createRuntimeControlHost({
@@ -16905,17 +16914,17 @@ function readStringList(value) {
 	if (!Array.isArray(value)) return [];
 	return value.map((entry) => typeof entry === "string" ? entry.trim() : "").filter(Boolean);
 }
-function readOptionalString(value) {
+function readOptionalString$1(value) {
 	if (typeof value !== "string") return;
 	return value.trim() || void 0;
 }
 function resolvePluginRuntimeAttachments(ctx) {
 	const mediaPaths = readStringList(ctx.MediaPaths);
 	const mediaUrls = readStringList(ctx.MediaUrls);
-	const fallbackPath = readOptionalString(ctx.MediaPath);
-	const fallbackUrl = readOptionalString(ctx.MediaUrl);
+	const fallbackPath = readOptionalString$1(ctx.MediaPath);
+	const fallbackUrl = readOptionalString$1(ctx.MediaUrl);
 	const mediaTypes = readStringList(ctx.MediaTypes);
-	const fallbackType = readOptionalString(ctx.MediaType);
+	const fallbackType = readOptionalString$1(ctx.MediaType);
 	const entryCount = Math.max(mediaPaths.length, mediaUrls.length, fallbackPath ? 1 : 0, fallbackUrl ? 1 : 0);
 	const attachments = [];
 	for (let index = 0; index < entryCount; index += 1) {
@@ -16938,7 +16947,7 @@ function resolvePluginRuntimeAttachments(ctx) {
 //#region src/cli/shared/services/plugin/service-plugin-reload.service.ts
 async function reloadServicePlugins(params) {
 	const nextWorkspace = getWorkspacePath(params.nextConfig.agents.defaults.workspace);
-	const nextPluginRegistry = loadPluginRegistry(params.nextConfig, nextWorkspace);
+	const nextPluginRegistry = await loadPluginRegistryProgressively(params.nextConfig, nextWorkspace);
 	const nextExtensionRegistry = toExtensionRegistry(nextPluginRegistry);
 	const nextPluginChannelBindings = getPluginChannelBindings(nextPluginRegistry);
 	const shouldRestartChannels = shouldRestartChannelsForPluginReload({
@@ -16994,30 +17003,52 @@ function applyGatewayRuntimeCapabilityState(params) {
 	params.state.extensionRegistry = params.next.extensionRegistry;
 	params.state.pluginChannelBindings = params.next.pluginChannelBindings;
 }
+async function applyGatewayPluginReload(params) {
+	const result = await reloadServicePlugins({
+		nextConfig: params.nextConfig,
+		changedPaths: params.changedPaths,
+		pluginRegistry: params.state.pluginRegistry,
+		extensionRegistry: params.state.extensionRegistry,
+		pluginChannelBindings: params.state.pluginChannelBindings,
+		pluginGatewayHandles: params.state.pluginGatewayHandles,
+		pluginGatewayLogger,
+		logPluginGatewayDiagnostics
+	});
+	applyGatewayRuntimeCapabilityState({
+		gateway: params.gateway,
+		state: params.state,
+		next: {
+			pluginRegistry: result.pluginRegistry,
+			extensionRegistry: result.extensionRegistry,
+			pluginChannelBindings: result.pluginChannelBindings
+		}
+	});
+	params.state.pluginUiMetadata = getPluginUiMetadataFromRegistry(result.pluginRegistry);
+	params.state.pluginGatewayHandles = result.pluginGatewayHandles;
+	params.getLiveUiNcpAgent()?.applyExtensionRegistry?.(result.extensionRegistry);
+	return { restartChannels: result.restartChannels };
+}
+async function reloadGatewayPluginRuntimeForChanges(params) {
+	const nextConfig = resolveConfigSecrets$2(loadConfig$2(), { configPath: params.gateway.runtimeConfigPath });
+	const result = await applyGatewayPluginReload({
+		gateway: params.gateway,
+		state: params.state,
+		getLiveUiNcpAgent: params.getLiveUiNcpAgent,
+		nextConfig,
+		changedPaths: params.changedPaths
+	});
+	if (result.restartChannels) await params.gateway.reloader.rebuildChannels(nextConfig, { start: true });
+	return result;
+}
 function configureGatewayPluginRuntime(params) {
 	params.gateway.reloader.setReloadPlugins(async ({ config: nextConfig, changedPaths }) => {
-		const result = await reloadServicePlugins({
-			nextConfig,
-			changedPaths,
-			pluginRegistry: params.state.pluginRegistry,
-			extensionRegistry: params.state.extensionRegistry,
-			pluginChannelBindings: params.state.pluginChannelBindings,
-			pluginGatewayHandles: params.state.pluginGatewayHandles,
-			pluginGatewayLogger,
-			logPluginGatewayDiagnostics
-		});
-		applyGatewayRuntimeCapabilityState({
+		const result = await applyGatewayPluginReload({
 			gateway: params.gateway,
 			state: params.state,
-			next: {
-				pluginRegistry: result.pluginRegistry,
-				extensionRegistry: result.extensionRegistry,
-				pluginChannelBindings: result.pluginChannelBindings
-			}
+			getLiveUiNcpAgent: params.getLiveUiNcpAgent,
+			nextConfig,
+			changedPaths
 		});
-		params.state.pluginUiMetadata = getPluginUiMetadataFromRegistry(result.pluginRegistry);
-		params.state.pluginGatewayHandles = result.pluginGatewayHandles;
-		params.getLiveUiNcpAgent()?.applyExtensionRegistry?.(result.extensionRegistry);
 		if (result.restartChannels) console.log("Config reload: plugin channel gateways restarted.");
 		return { restartChannels: result.restartChannels };
 	});
@@ -17088,6 +17119,120 @@ async function cleanupGatewayRuntime(params) {
 	setPluginRuntimeBridge(null);
 }
 //#endregion
+//#region src/cli/shared/services/plugin/service-plugin-dev-hot-reload.service.ts
+const DEV_PLUGIN_HOT_RELOAD_TARGETS_ENV = "NEXTCLAW_DEV_PLUGIN_HOT_RELOAD_TARGETS";
+function isRecord$2(value) {
+	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
+}
+function readOptionalString(value) {
+	if (typeof value !== "string") return null;
+	const trimmed = value.trim();
+	return trimmed.length > 0 ? trimmed : null;
+}
+function normalizeWatchPaths(value) {
+	if (!Array.isArray(value)) return [];
+	const watchPaths = [];
+	for (const entry of value) {
+		const normalized = readOptionalString(entry);
+		if (!normalized) continue;
+		const resolvedPath = resolve(normalized);
+		if (!watchPaths.includes(resolvedPath)) watchPaths.push(resolvedPath);
+	}
+	return watchPaths;
+}
+function resolveDevPluginHotReloadTargets(rawValue = process.env[DEV_PLUGIN_HOT_RELOAD_TARGETS_ENV]) {
+	if (typeof rawValue !== "string" || rawValue.trim().length === 0) return [];
+	let parsed;
+	try {
+		parsed = JSON.parse(rawValue);
+	} catch (error) {
+		throw new Error(`[dev-plugin-hot-reload] failed to parse ${DEV_PLUGIN_HOT_RELOAD_TARGETS_ENV}: ${error instanceof Error ? error.message : String(error)}`);
+	}
+	if (!Array.isArray(parsed)) throw new Error(`[dev-plugin-hot-reload] ${DEV_PLUGIN_HOT_RELOAD_TARGETS_ENV} must be a JSON array`);
+	const seenPluginIds = /* @__PURE__ */ new Set();
+	const targets = [];
+	for (const entry of parsed) {
+		if (!isRecord$2(entry)) continue;
+		const pluginId = readOptionalString(entry.pluginId);
+		const pluginPath = readOptionalString(entry.pluginPath);
+		const watchPaths = normalizeWatchPaths(entry.watchPaths);
+		if (!pluginId || !pluginPath || watchPaths.length === 0) continue;
+		if (seenPluginIds.has(pluginId)) throw new Error(`[dev-plugin-hot-reload] duplicate plugin target for "${pluginId}"`);
+		seenPluginIds.add(pluginId);
+		targets.push({
+			pluginId,
+			pluginPath: resolve(pluginPath),
+			watchPaths
+		});
+	}
+	return targets;
+}
+function startDevPluginHotReloadWatcher(params) {
+	const targets = params.targets ?? resolveDevPluginHotReloadTargets();
+	if (targets.length === 0) return;
+	const pendingPluginIds = /* @__PURE__ */ new Set();
+	let flushTimer = null;
+	let reloadRunning = false;
+	let reloadPending = false;
+	const flushReload = async () => {
+		if (reloadRunning) {
+			reloadPending = true;
+			return;
+		}
+		const pluginIds = [...pendingPluginIds];
+		pendingPluginIds.clear();
+		if (pluginIds.length === 0) return;
+		reloadRunning = true;
+		try {
+			console.log(`[dev] Plugin dist updated: ${pluginIds.join(", ")}`);
+			await params.reloadPlugins(pluginIds);
+			console.log(`[dev] Plugin hot reload applied: ${pluginIds.join(", ")}`);
+		} catch (error) {
+			console.error(`[dev] Plugin hot reload failed: ${error instanceof Error ? error.message : String(error)}`);
+		} finally {
+			reloadRunning = false;
+			if (reloadPending || pendingPluginIds.size > 0) {
+				reloadPending = false;
+				await flushReload();
+			}
+		}
+	};
+	const scheduleReload = (pluginId) => {
+		pendingPluginIds.add(pluginId);
+		if (flushTimer) clearTimeout(flushTimer);
+		flushTimer = setTimeout(() => {
+			flushTimer = null;
+			flushReload();
+		}, 150);
+	};
+	const watcher = chokidar.watch(targets.flatMap((entry) => entry.watchPaths), {
+		ignoreInitial: true,
+		awaitWriteFinish: {
+			stabilityThreshold: 200,
+			pollInterval: 50
+		}
+	});
+	params.watcherRegistry.remember(watcher);
+	watcher.on("all", (_event, changedPath) => {
+		const normalizedChangedPath = resolve(changedPath);
+		for (const target of targets) if (target.watchPaths.some((watchPath) => normalizedChangedPath === watchPath || normalizedChangedPath.startsWith(`${watchPath}${sep}`))) scheduleReload(target.pluginId);
+	});
+	console.log(`[dev] Plugin hot reload watcher: ${targets.map((entry) => entry.pluginId).join(", ")}`);
+}
+function wrapStartChannelsWithDevPluginHotReload(params) {
+	return async () => {
+		await params.startChannels();
+		console.log(`[dev] Plugin hot reload watcher will arm after ${params.startupSettleMs}ms startup settle window.`);
+		setTimeout(() => {
+			if (!params.isRuntimeActive()) return;
+			startDevPluginHotReloadWatcher({
+				watcherRegistry: params.watcherRegistry,
+				reloadPlugins: params.reloadPlugins
+			});
+		}, params.startupSettleMs).unref?.();
+	};
+}
+//#endregion
 //#region src/cli/shared/stores/companion-runtime.store.ts
 var CompanionRuntimeStore = class {
 	get path() {
@@ -17249,6 +17394,7 @@ const companionRuntimeService = new CompanionRuntimeService();
 //#endregion
 //#region src/cli/shared/services/runtime/runtime-command.service.ts
 const { getApiBase, getConfigPath: getConfigPath$1, getProvider, getProviderName, getWorkspacePath: getWorkspacePath$1, loadConfig: loadConfig$1, LiteLLMProvider, MessageBus: MessageBus$1, resolveConfigSecrets: resolveConfigSecrets$1, SessionManager: SessionManager$1, parseAgentScopedSessionKey: parseAgentScopedSessionKey$1 } = NextclawCore;
+const DEV_PLUGIN_HOT_RELOAD_STARTUP_SETTLE_MS = 5e3;
 function createSkillsLoader(workspace) {
 	const ctor = NextclawCore.SkillsLoader;
 	if (!ctor) return null;
@@ -17342,6 +17488,20 @@ var RuntimeCommandService = class {
 				sessionManager: gateway.sessionManager
 			})
 		});
+		deferredGatewayStartupHooks.startChannels = wrapStartChannelsWithDevPluginHotReload({
+			startChannels: deferredGatewayStartupHooks.startChannels,
+			watcherRegistry: this.fileWatchers,
+			isRuntimeActive: () => Boolean(this.applyLiveConfigReload),
+			reloadPlugins: async (pluginIds) => {
+				await reloadGatewayPluginRuntimeForChanges({
+					gateway,
+					state: gatewayRuntimeState,
+					getLiveUiNcpAgent: () => this.liveUiNcpAgent,
+					changedPaths: pluginIds.map((pluginId) => `plugins.entries.${pluginId}.source`)
+				});
+			},
+			startupSettleMs: DEV_PLUGIN_HOT_RELOAD_STARTUP_SETTLE_MS
+		});
 		await runConfiguredGatewayRuntime({
 			uiStartup,
 			bootstrapStatus,
@@ -20797,7 +20957,7 @@ var CliRuntime = class {
 			spawn(process.execPath, ["-e", helperScript], {
 				detached: true,
 				stdio: "ignore",
-				env: process.env
+				env: createTopLevelNextclawCommandEnv(process.env)
 			}).unref();
 			this.selfRelaunchArmed = true;
 			console.warn(`Gateway self-restart armed (${reason}).`);