nextclaw 0.17.2 → 0.17.4

package/dist/cli/index.js

@@ -2486,41 +2486,79 @@ var ChannelCommands = class {
 function createCronService() {
 	return new CronService(join(getDataDir(), "cron", "jobs.json"));
 }
+function readTrimmed(value) {
+	if (typeof value !== "string") return;
+	return value.trim() || void 0;
+}
 function toSchedule(opts) {
-	if (opts.every) return {
-		kind: "every",
-		everyMs: Number(opts.every) * 1e3
-	};
-	if (opts.cron) return {
+	const every = readTrimmed(opts.every);
+	const cron = readTrimmed(opts.cron);
+	const at = readTrimmed(opts.at);
+	if ([
+		every,
+		cron,
+		at
+	].filter((value) => value !== void 0).length !== 1) return { error: "Error: Must specify exactly one of --every, --cron, or --at" };
+	if (every) {
+		const everySeconds = Number(every);
+		if (!Number.isFinite(everySeconds) || everySeconds <= 0) return { error: "Error: --every must be a positive number of seconds" };
+		return { schedule: {
+			kind: "every",
+			everyMs: everySeconds * 1e3
+		} };
+	}
+	if (cron) return { schedule: {
 		kind: "cron",
-		expr: String(opts.cron)
-	};
-	if (opts.at) return {
+		expr: cron
+	} };
+	const atMs = Date.parse(String(at));
+	if (!Number.isFinite(atMs)) return { error: "Error: --at must be a valid ISO datetime" };
+	return { schedule: {
 		kind: "at",
-		atMs: Date.parse(String(opts.at))
-	};
-	return null;
+		atMs
+	} };
+}
+function createCronCreateRequest(opts) {
+	const name = readTrimmed(opts.name);
+	const message = readTrimmed(opts.message);
+	if (!name || !message) return { error: "Error: name and message are required" };
+	const schedule = toSchedule(opts);
+	if (!schedule.schedule) return { error: schedule.error ?? "Error: Must specify --every, --cron, or --at" };
+	return { request: {
+		name,
+		message,
+		schedule: schedule.schedule,
+		agentId: readTrimmed(opts.agent),
+		deliver: Boolean(opts.deliver),
+		channel: readTrimmed(opts.channel),
+		to: readTrimmed(opts.to),
+		accountId: readTrimmed(opts.account)
+	} };
 }
 var CronLocalService = class {
 	list = (all) => {
 		return createCronService().listJobs(all);
 	};
+	addRequest = (request) => {
+		return createCronService().addJob({
+			name: request.name,
+			schedule: request.schedule,
+			message: request.message,
+			agentId: request.agentId ?? void 0,
+			deliver: request.deliver === true,
+			channel: request.channel ?? void 0,
+			to: request.to ?? void 0,
+			accountId: request.accountId ?? void 0,
+			deleteAfterRun: request.deleteAfterRun === true
+		});
+	};
 	add = (opts) => {
-		const schedule = toSchedule(opts);
-		if (!schedule) return {
+		const request = createCronCreateRequest(opts);
+		if (!request.request) return {
 			job: null,
-			error: "Error: Must specify --every, --cron, or --at"
+			error: request.error
 		};
-		return { job: createCronService().addJob({
-			name: opts.name,
-			schedule,
-			message: opts.message,
-			agentId: opts.agent,
-			deliver: Boolean(opts.deliver),
-			channel: opts.channel,
-			to: opts.to,
-			accountId: opts.account
-		}) };
+		return { job: this.addRequest(request.request) };
 	};
 	remove = (jobId) => {
 		return createCronService().removeJob(jobId);
@@ -2550,9 +2588,11 @@ function printCronJobs(jobs) {
 //#region src/cli/commands/shared/ui-bridge-api.service.ts
 function resolveManagedApiBase() {
 	const state = readServiceState();
-	if (!state?.apiUrl || !state.pid) return null;
+	if (!state?.pid) return null;
 	if (!isProcessRunning(state.pid)) return null;
-	return state.apiUrl.replace(/\/+$/, "");
+	if (typeof state.uiUrl === "string" && state.uiUrl.trim().length > 0) return state.uiUrl.replace(/\/+$/, "");
+	if (typeof state.apiUrl === "string" && state.apiUrl.trim().length > 0) return state.apiUrl.replace(/\/api\/?$/, "").replace(/\/+$/, "");
+	return null;
 }
 var UiBridgeApiClient = class {
 	cookie;
@@ -2590,6 +2630,10 @@ var UiBridgeApiClient = class {
 };
 //#endregion
 //#region src/cli/commands/cron.ts
+function readErrorMessage(error) {
+	if (error instanceof Error && error.message.trim().length > 0) return error.message.trim();
+	return String(error ?? "unknown error");
+}
 var CronCommands = class {
 	constructor(local = new CronLocalService()) {
 		this.local = local;
@@ -2610,12 +2654,26 @@ var CronCommands = class {
 		printCronJobs(this.local.list(includeDisabled));
 	};
 	cronAdd = async (opts) => {
-		const result = this.local.add(opts);
-		if (!result.job) {
-			console.error(result.error ?? "Error: Failed to add job");
+		const request = createCronCreateRequest(opts);
+		if (!request.request) {
+			console.error(request.error ?? "Error: Failed to add job");
+			return;
+		}
+		const apiClient = this.createApiClient();
+		if (apiClient) try {
+			const data = await apiClient.request({
+				path: "/api/cron",
+				method: "POST",
+				body: request.request
+			});
+			console.log(`✓ Added job '${data.job.name}' (${data.job.id})`);
+			return;
+		} catch (error) {
+			console.error(`Error: ${readErrorMessage(error)}`);
 			return;
 		}
-		console.log(`✓ Added job '${result.job.name}' (${result.job.id})`);
+		const job = this.local.addRequest(request.request);
+		console.log(`✓ Added job '${job.name}' (${job.id})`);
 	};
 	cronRemove = async (jobId) => {
 		const apiClient = this.createApiClient();
@@ -2627,7 +2685,10 @@ var CronCommands = class {
 				console.log(`✓ Removed job ${jobId}`);
 				return;
 			}
-		} catch {}
+		} catch (error) {
+			console.error(`Error: ${readErrorMessage(error)}`);
+			return;
+		}
 		if (this.local.remove(jobId)) console.log(`✓ Removed job ${jobId}`);
 		else console.log(`Job ${jobId} not found`);
 	};
@@ -2644,7 +2705,10 @@ var CronCommands = class {
 				console.log(`✓ Job '${data.job.name}' ${opts.disable ? "disabled" : "enabled"}`);
 				return;
 			}
-		} catch {}
+		} catch (error) {
+			console.error(`Error: ${readErrorMessage(error)}`);
+			return;
+		}
 		const job = this.local.enable(jobId, enabled);
 		if (job) console.log(`✓ Job '${job.name}' ${opts.disable ? "disabled" : "enabled"}`);
 		else console.log(`Job ${jobId} not found`);
@@ -2659,12 +2723,128 @@ var CronCommands = class {
 			});
 			console.log(data.executed ? "✓ Job executed" : `Failed to run job ${jobId}`);
 			return;
-		} catch {}
+		} catch (error) {
+			console.error(`Error: ${readErrorMessage(error)}`);
+			return;
+		}
 		const ok = await this.local.run(jobId, Boolean(opts.force));
 		console.log(ok ? "✓ Job executed" : `Failed to run job ${jobId}`);
 	};
 };
 //#endregion
+//#region src/cli/commands/ncp/ui-ncp-runtime-registry.ts
+const DEFAULT_UI_NCP_RUNTIME_KIND = "native";
+function normalizeRuntimeKind(value) {
+	if (typeof value !== "string") return null;
+	const normalized = value.trim().toLowerCase();
+	return normalized.length > 0 ? normalized : null;
+}
+function readRequestedRuntimeKind(sessionMetadata) {
+	return normalizeRuntimeKind(sessionMetadata.runtime) ?? normalizeRuntimeKind(sessionMetadata.session_type) ?? normalizeRuntimeKind(sessionMetadata.sessionType) ?? null;
+}
+var UiNcpRuntimeRegistry = class {
+	registrations = /* @__PURE__ */ new Map();
+	constructor(defaultKind = DEFAULT_UI_NCP_RUNTIME_KIND) {
+		this.defaultKind = defaultKind;
+	}
+	register(registration) {
+		const normalizedKind = normalizeRuntimeKind(registration.kind);
+		if (!normalizedKind) throw new Error("ui ncp runtime kind must be a non-empty string");
+		const token = Symbol(normalizedKind);
+		this.registrations.set(normalizedKind, {
+			...registration,
+			kind: normalizedKind,
+			token
+		});
+		return toDisposable(() => {
+			const current = this.registrations.get(normalizedKind);
+			if (!current || current.token !== token) return;
+			this.registrations.delete(normalizedKind);
+		});
+	}
+	createRuntime(params) {
+		const requestedKind = readRequestedRuntimeKind(params.sessionMetadata) ?? this.defaultKind;
+		const registration = this.registrations.get(requestedKind);
+		if (!registration) throw new Error(`ncp runtime unavailable: ${requestedKind}`);
+		const nextSessionMetadata = {
+			...params.sessionMetadata,
+			session_type: registration.kind
+		};
+		params.setSessionMetadata(nextSessionMetadata);
+		return registration.createRuntime({
+			...params,
+			sessionMetadata: nextSessionMetadata
+		});
+	}
+	async listSessionTypes(params) {
+		const options = await Promise.all([...this.registrations.values()].map(async (registration) => {
+			const descriptor = await registration.describeSessionType?.(params);
+			return {
+				value: registration.kind,
+				label: registration.label,
+				ready: descriptor?.ready ?? true,
+				reason: descriptor?.reason ?? null,
+				reasonMessage: descriptor?.reasonMessage ?? null,
+				recommendedModel: descriptor?.recommendedModel ?? null,
+				cta: descriptor?.cta ?? null,
+				...descriptor?.supportedModels ? { supportedModels: descriptor.supportedModels } : {}
+			};
+		}));
+		return {
+			defaultType: this.defaultKind,
+			options: options.sort((left, right) => {
+				if (left.value === this.defaultKind) return -1;
+				if (right.value === this.defaultKind) return 1;
+				return left.value.localeCompare(right.value);
+			})
+		};
+	}
+};
+//#endregion
+//#region src/cli/commands/agent/agent-runtime.ts
+function createUnusedRuntime(_params) {
+	throw new Error("runtime creation is not available during runtime listing");
+}
+async function listAvailableAgentRuntimes(params) {
+	const config = loadConfig();
+	const pluginRegistry = loadPluginRegistry(config, getWorkspacePath(config.agents.defaults.workspace));
+	logPluginDiagnostics(pluginRegistry);
+	const extensionRegistry = toExtensionRegistry(pluginRegistry);
+	const runtimeRegistry = new UiNcpRuntimeRegistry(DEFAULT_UI_NCP_RUNTIME_KIND);
+	const runtimeSourceByKind = /* @__PURE__ */ new Map();
+	runtimeRegistry.register({
+		kind: DEFAULT_UI_NCP_RUNTIME_KIND,
+		label: "Native",
+		createRuntime: createUnusedRuntime
+	});
+	runtimeSourceByKind.set(DEFAULT_UI_NCP_RUNTIME_KIND, { source: "builtin" });
+	for (const registration of extensionRegistry.ncpAgentRuntimes) {
+		runtimeRegistry.register({
+			kind: registration.kind,
+			label: registration.label,
+			createRuntime: registration.createRuntime,
+			describeSessionType: registration.describeSessionType
+		});
+		runtimeSourceByKind.set(registration.kind, {
+			source: "plugin",
+			pluginId: registration.pluginId
+		});
+	}
+	const listed = await runtimeRegistry.listSessionTypes(params);
+	return {
+		defaultRuntime: listed.defaultType,
+		runtimes: listed.options.map((runtime) => {
+			const source = runtimeSourceByKind.get(runtime.value);
+			return {
+				...runtime,
+				default: runtime.value === listed.defaultType,
+				source: source?.source ?? "plugin",
+				...source?.pluginId ? { pluginId: source.pluginId } : {}
+			};
+		})
+	};
+}
+//#endregion
 //#region src/cli/commands/agents.ts
 var AgentCommands = class {
 	constructor(deps) {
@@ -2683,6 +2863,31 @@ var AgentCommands = class {
 			console.log(`  description: ${agent.description ?? "-"}`);
 			console.log(`  home: ${agent.workspace}`);
 			console.log(`  avatar: ${agent.avatar ?? "-"}`);
+			console.log(`  runtime: ${agent.runtime ?? "-"}`);
+		}
+	};
+	agentsRuntimes = async (opts = {}) => {
+		const describeMode = opts.probe ? "probe" : "observation";
+		const listed = await listAvailableAgentRuntimes({ describeMode });
+		if (opts.json) {
+			console.log(JSON.stringify({
+				defaultRuntime: listed.defaultRuntime,
+				describeMode,
+				runtimes: listed.runtimes
+			}, null, 2));
+			return;
+		}
+		for (const runtime of listed.runtimes) {
+			const head = runtime.default ? `${runtime.value} (default)` : runtime.value;
+			console.log(head);
+			console.log(`  label: ${runtime.label}`);
+			console.log(`  source: ${runtime.source}`);
+			if (runtime.pluginId) console.log(`  pluginId: ${runtime.pluginId}`);
+			console.log(`  ready: ${runtime.ready === false ? "no" : "yes"}`);
+			console.log(`  reason: ${runtime.reason ?? "-"}`);
+			console.log(`  reasonMessage: ${runtime.reasonMessage ?? "-"}`);
+			console.log(`  recommendedModel: ${runtime.recommendedModel ?? "-"}`);
+			console.log(`  supportedModels: ${runtime.supportedModels?.join(", ") ?? "-"}`);
 		}
 	};
 	agentsNew = async (agentId, opts = {}) => {
@@ -2691,48 +2896,38 @@ var AgentCommands = class {
 			displayName: opts.name,
 			description: opts.description,
 			avatar: opts.avatar,
-			home: opts.home
+			home: opts.home,
+			runtime: opts.runtime
 		}, { initializeHomeDirectory: this.deps.initializeAgentHomeDirectory });
 		if (opts.json) {
-			console.log(JSON.stringify({
-				agent: created,
-				restartRequired: true
-			}, null, 2));
+			console.log(JSON.stringify({ agent: created }, null, 2));
 			return;
 		}
-		await this.deps.requestRestart({
-			reason: "agents-updated",
-			manualMessage: `Created agent '${created.id}'. Restart ${this.deps.appName} to apply agent runtime changes.`
-		});
 		console.log(`✓ Created agent ${created.id}`);
 		console.log(`  name: ${created.displayName ?? "-"}`);
 		console.log(`  description: ${created.description ?? "-"}`);
 		console.log(`  home: ${created.workspace}`);
 		console.log(`  avatar: ${created.avatar ?? "-"}`);
+		console.log(`  runtime: ${created.runtime ?? created.engine ?? "-"}`);
 	};
 	agentsUpdate = async (agentId, opts = {}) => {
 		const updated = updateAgentProfile({
 			id: agentId,
 			displayName: opts.name,
 			description: opts.description,
-			avatar: opts.avatar
+			avatar: opts.avatar,
+			runtime: opts.runtime
 		});
 		if (opts.json) {
-			console.log(JSON.stringify({
-				agent: updated,
-				restartRequired: true
-			}, null, 2));
+			console.log(JSON.stringify({ agent: updated }, null, 2));
 			return;
 		}
-		await this.deps.requestRestart({
-			reason: "agents-updated",
-			manualMessage: `Updated agent '${updated.id}'. Restart ${this.deps.appName} to apply agent runtime changes.`
-		});
 		console.log(`✓ Updated agent ${updated.id}`);
 		console.log(`  name: ${updated.displayName ?? "-"}`);
 		console.log(`  description: ${updated.description ?? "-"}`);
 		console.log(`  home: ${updated.workspace}`);
 		console.log(`  avatar: ${updated.avatar ?? "-"}`);
+		console.log(`  runtime: ${updated.runtime ?? updated.engine ?? "-"}`);
 	};
 	agentsRemove = async (agentId, opts = {}) => {
 		if (agentId.trim().toLowerCase() === BUILTIN_MAIN_AGENT_ID) throw new Error(`agent id '${BUILTIN_MAIN_AGENT_ID}' is reserved`);
@@ -2740,15 +2935,10 @@ var AgentCommands = class {
 		if (opts.json) {
 			console.log(JSON.stringify({
 				removed: true,
-				agentId,
-				restartRequired: true
+				agentId
 			}, null, 2));
 			return;
 		}
-		await this.deps.requestRestart({
-			reason: "agents-updated",
-			manualMessage: `Removed agent '${agentId}'. Restart ${this.deps.appName} to apply agent runtime changes.`
-		});
 		console.log(`✓ Removed agent ${agentId}`);
 	};
 	toAgentListEntry = (agent) => {
@@ -2758,6 +2948,7 @@ var AgentCommands = class {
 			description: agent.description ?? null,
 			avatar: agent.avatar ?? null,
 			workspace: agent.workspace,
+			runtime: agent.runtime ?? agent.engine ?? null,
 			builtIn: agent.builtIn === true
 		};
 	};
@@ -4184,13 +4375,14 @@ async function startGatewaySupportServices(params) {
 }
 function watchCronStoreFile(params) {
 	const cronStorePath = resolve(params.cronStorePath);
-	chokidar.watch(cronStorePath, {
+	const watcher = chokidar.watch(cronStorePath, {
 		ignoreInitial: true,
 		awaitWriteFinish: {
 			stabilityThreshold: 200,
 			pollInterval: 50
 		}
-	}).on("all", (event, changedPath) => {
+	});
+	watcher.on("all", (event, changedPath) => {
 		if (resolve(changedPath) !== cronStorePath) return;
 		if (event === "add" || event === "change" || event === "unlink") try {
 			params.reloadCronStore();
@@ -4198,6 +4390,85 @@ function watchCronStoreFile(params) {
 			console.error(`Cron store reload failed (${event}): ${String(error)}`);
 		}
 	});
+	return watcher;
+}
+function watchServiceConfigFile(params) {
+	const configPath = resolve(params.configPath);
+	const watcher = chokidar.watch(configPath, {
+		ignoreInitial: true,
+		awaitWriteFinish: {
+			stabilityThreshold: 200,
+			pollInterval: 50
+		}
+	});
+	params.watcherRegistry.remember(watcher);
+	watcher.on("all", (event, changedPath) => {
+		if (resolve(changedPath) !== configPath) return;
+		if (event === "add") {
+			params.scheduleReload("config add");
+			return;
+		}
+		if (event === "change") {
+			params.scheduleReload("config change");
+			return;
+		}
+		if (event === "unlink") params.scheduleReload("config unlink");
+	});
+}
+var ServiceFileWatcherRegistry = class {
+	watchers = [];
+	remember = (watcher) => {
+		this.watchers.push(watcher);
+	};
+	clear = async () => {
+		const watchers = this.watchers.splice(0);
+		await Promise.allSettled(watchers.map(async (watcher) => {
+			try {
+				await watcher.close();
+			} catch {}
+		}));
+	};
+};
+function writeLocalServiceDiscoveryState(uiConfig, pid = process.pid) {
+	const uiUrl = resolveUiApiBase(uiConfig.host, uiConfig.port);
+	const apiUrl = `${uiUrl}/api`;
+	const existing = readServiceState();
+	writeServiceState({
+		pid,
+		startedAt: existing?.pid === pid && typeof existing.startedAt === "string" ? existing.startedAt : (/* @__PURE__ */ new Date()).toISOString(),
+		uiUrl,
+		apiUrl,
+		uiHost: uiConfig.host,
+		uiPort: uiConfig.port,
+		logPath: existing?.logPath ?? resolveServiceLogPath(),
+		startupState: existing?.startupState ?? "ready",
+		startupLastProbeError: existing?.startupLastProbeError ?? null,
+		startupTimeoutMs: existing?.startupTimeoutMs,
+		startupCheckedAt: (/* @__PURE__ */ new Date()).toISOString(),
+		...existing?.remote ? { remote: existing.remote } : {}
+	});
+}
+function clearOwnedServiceState(pid = process.pid) {
+	if (readServiceState()?.pid === pid) clearServiceState();
+}
+function finalizeLocalUiStartup(params) {
+	const { setUiEventPublisher, uiConfig, uiStartup } = params;
+	setUiEventPublisher(uiStartup?.publish);
+	if (uiStartup) writeLocalServiceDiscoveryState(uiConfig);
+}
+async function startGatewayRuntimeSupport(params) {
+	const { cronJobs, cronStorePath, reloadCronStore, remoteModule, startCron, startHeartbeat, watchConfigFile, watcherRegistry } = params;
+	await startGatewaySupportServices({
+		cronJobs,
+		remoteModule,
+		watchConfigFile,
+		startCron,
+		startHeartbeat
+	});
+	watcherRegistry.remember(watchCronStoreFile({
+		cronStorePath,
+		reloadCronStore
+	}));
 }
 //#endregion
 //#region src/cli/commands/remote-support/remote-access-service-control.ts
@@ -4998,6 +5269,10 @@ var SpawnChildSessionTool = class extends Tool {
 					type: "string",
 					description: "Optional model override used only for the child session."
 				},
+				runtime: {
+					type: "string",
+					description: "Optional runtime override used only for the child session, for example native or codex."
+				},
 				agentId: {
 					type: "string",
 					description: "Optional target agent id for the child session. Omit to use the default agent for that child."
@@ -5020,6 +5295,7 @@ var SpawnChildSessionTool = class extends Tool {
 			task,
 			title: readOptionalString$4(params, "label"),
 			model: readOptionalString$4(params, "model"),
+			runtime: readOptionalString$4(params, "runtime"),
 			handoffDepth: this.handoffDepth,
 			agentId: readOptionalString$4(params, "agentId")
 		});
@@ -5141,6 +5417,10 @@ var SessionSpawnTool = class extends Tool {
 					type: "string",
 					description: "Optional model override for the new session."
 				},
+				runtime: {
+					type: "string",
+					description: "Optional runtime override for the new session, for example native or codex."
+				},
 				agentId: {
 					type: "string",
 					description: "Optional target agent id for the new session. Omit to use the default agent."
@@ -5160,7 +5440,8 @@ var SessionSpawnTool = class extends Tool {
 			title: readOptionalString$3(params.title),
 			sourceSessionMetadata: this.sourceSessionMetadata,
 			agentId: readOptionalString$3(params.agentId),
-			model: readOptionalString$3(params.model)
+			model: readOptionalString$3(params.model),
+			runtime: readOptionalString$3(params.runtime)
 		});
 		return {
 			kind: "nextclaw.session",
@@ -5429,6 +5710,7 @@ function prependRequestedSkills(content, requestedSkillNames) {
 function buildSessionOrchestrationSection() {
 	return [
 		"## Session Orchestration",
+		"- Before passing a non-default `runtime` to `spawn`, `sessions_spawn`, or agent creation/update flows, inspect the installed runtime kinds with `nextclaw agents runtimes --json`.",
 		"- `spawn` creates a child session, starts the delegated task there immediately, and returns a running child-session handle right away instead of waiting for the child to finish.",
 		"- When that child reaches its final reply, `spawn` writes the completed result back into the original tool call and resumes the current session with the child's result.",
 		"- Use `spawn` when the work is a subtask of the current flow and the user expects this session to pause now and then continue after that child finishes.",
@@ -5946,6 +6228,7 @@ function summarizeTask(task) {
 function cloneInheritedMetadata(sourceMetadata) {
 	const nextMetadata = {};
 	for (const key of [
+		"runtime",
 		"session_type",
 		"preferred_model",
 		"preferred_thinking",
@@ -5970,10 +6253,11 @@ function resolveSessionTitle(params) {
 	return readOptionalString$2(params.title) ?? summarizeTask(params.task);
 }
 function resolveSessionType(params) {
-	return readOptionalString$2(params.sessionType) ?? readOptionalString$2(params.metadata.session_type) ?? DEFAULT_SESSION_TYPE;
+	return readOptionalString$2(params.runtime) ?? readOptionalString$2(params.metadata.runtime) ?? readOptionalString$2(params.sessionType) ?? readOptionalString$2(params.metadata.session_type) ?? DEFAULT_SESSION_TYPE;
 }
 function applySessionOverrides(params) {
 	params.metadata.session_type = params.sessionType;
+	params.metadata.runtime = params.sessionType;
 	params.metadata[SESSION_METADATA_LABEL_KEY] = params.title;
 	params.metadata[CHILD_SESSION_LIFECYCLE_METADATA_KEY] = params.lifecycle;
 	if (params.parentSessionId) {
@@ -6013,6 +6297,7 @@ var SessionCreationService = class {
 		const parentSessionId = readOptionalString$2(params.parentSessionId);
 		const requestId = readOptionalString$2(params.requestId);
 		const sessionType = resolveSessionType({
+			runtime: params.runtime,
 			sessionType: params.sessionType,
 			metadata
 		});
@@ -6036,7 +6321,7 @@ var SessionCreationService = class {
 			sessionId,
 			agentId: resolvedAgentId,
 			sessionType,
-			runtimeFamily: "native",
+			runtimeFamily: sessionType === DEFAULT_SESSION_TYPE ? "native" : "external",
 			...parentSessionId ? { parentSessionId } : {},
 			...requestId ? { spawnedByRequestId: requestId } : {},
 			lifecycle: DEFAULT_LIFECYCLE,
@@ -6189,7 +6474,7 @@ var SessionRequestBroker = class {
 		this.onSessionUpdated = onSessionUpdated;
 	}
 	spawnChildSessionAndRequest = async (params) => {
-		const { sourceSessionId, sourceToolCallId, sourceSessionMetadata, task, title, model, handoffDepth, sessionType, thinkingLevel, projectRoot, agentId } = params;
+		const { sourceSessionId, sourceToolCallId, sourceSessionMetadata, task, title, model, runtime, handoffDepth, sessionType, thinkingLevel, projectRoot, agentId } = params;
 		const requestId = randomUUID();
 		const childSession = this.sessionCreationService.createChildSession({
 			parentSessionId: sourceSessionId,
@@ -6198,6 +6483,7 @@ var SessionRequestBroker = class {
 			sourceSessionMetadata,
 			agentId,
 			model,
+			runtime,
 			thinkingLevel,
 			sessionType,
 			projectRoot,
@@ -6499,75 +6785,6 @@ var SessionRequestDeliveryService = class {
 	};
 };
 //#endregion
-//#region src/cli/commands/ncp/ui-ncp-runtime-registry.ts
-const DEFAULT_UI_NCP_RUNTIME_KIND = "native";
-function normalizeRuntimeKind(value) {
-	if (typeof value !== "string") return null;
-	const normalized = value.trim().toLowerCase();
-	return normalized.length > 0 ? normalized : null;
-}
-function readRequestedRuntimeKind(sessionMetadata) {
-	return normalizeRuntimeKind(sessionMetadata.session_type) ?? normalizeRuntimeKind(sessionMetadata.sessionType) ?? null;
-}
-var UiNcpRuntimeRegistry = class {
-	registrations = /* @__PURE__ */ new Map();
-	constructor(defaultKind = DEFAULT_UI_NCP_RUNTIME_KIND) {
-		this.defaultKind = defaultKind;
-	}
-	register(registration) {
-		const normalizedKind = normalizeRuntimeKind(registration.kind);
-		if (!normalizedKind) throw new Error("ui ncp runtime kind must be a non-empty string");
-		const token = Symbol(normalizedKind);
-		this.registrations.set(normalizedKind, {
-			...registration,
-			kind: normalizedKind,
-			token
-		});
-		return toDisposable(() => {
-			const current = this.registrations.get(normalizedKind);
-			if (!current || current.token !== token) return;
-			this.registrations.delete(normalizedKind);
-		});
-	}
-	createRuntime(params) {
-		const requestedKind = readRequestedRuntimeKind(params.sessionMetadata) ?? this.defaultKind;
-		const registration = this.registrations.get(requestedKind);
-		if (!registration) throw new Error(`ncp runtime unavailable: ${requestedKind}`);
-		const nextSessionMetadata = {
-			...params.sessionMetadata,
-			session_type: registration.kind
-		};
-		params.setSessionMetadata(nextSessionMetadata);
-		return registration.createRuntime({
-			...params,
-			sessionMetadata: nextSessionMetadata
-		});
-	}
-	async listSessionTypes(params) {
-		const options = await Promise.all([...this.registrations.values()].map(async (registration) => {
-			const descriptor = await registration.describeSessionType?.(params);
-			return {
-				value: registration.kind,
-				label: registration.label,
-				ready: descriptor?.ready ?? true,
-				reason: descriptor?.reason ?? null,
-				reasonMessage: descriptor?.reasonMessage ?? null,
-				recommendedModel: descriptor?.recommendedModel ?? null,
-				cta: descriptor?.cta ?? null,
-				...descriptor?.supportedModels ? { supportedModels: descriptor.supportedModels } : {}
-			};
-		}));
-		return {
-			defaultType: this.defaultKind,
-			options: options.sort((left, right) => {
-				if (left.value === this.defaultKind) return -1;
-				if (right.value === this.defaultKind) return 1;
-				return left.value.localeCompare(right.value);
-			})
-		};
-	}
-};
-//#endregion
 //#region src/cli/commands/ncp/runtime/ui-ncp-agent-handle.ts
 function createUiNcpAgentHandle(params) {
 	return {
@@ -8664,11 +8881,13 @@ function createSkillsLoader(workspace) {
 var ServiceCommands = class {
 	applyLiveConfigReload = null;
 	liveUiNcpAgent = null;
+	fileWatchers = new ServiceFileWatcherRegistry();
 	constructor(deps) {
 		this.deps = deps;
 	}
 	startGateway = async (options = {}) => {
 		logStartupTrace("service.start_gateway.begin");
+		await this.fileWatchers.clear();
 		this.applyLiveConfigReload = null;
 		this.liveUiNcpAgent = null;
 		const shellContext = measureStartupSync("service.create_gateway_shell_context", () => createGatewayShellContext({
@@ -8712,7 +8931,11 @@ var ServiceCommands = class {
 			ncpSessionService: ncpSessionRealtimeBridge.sessionService,
 			initializeAgentHomeDirectory: this.deps.initializeAgentHomeDirectory
 		}));
-		ncpSessionRealtimeBridge.setUiEventPublisher(uiStartup?.publish);
+		finalizeLocalUiStartup({
+			uiStartup,
+			setUiEventPublisher: (publish) => ncpSessionRealtimeBridge.setUiEventPublisher(publish),
+			uiConfig: shellContext.uiConfig
+		});
 		bootstrapStatus.markShellReady();
 		await setImmediate();
 		const gateway = measureStartupSync("service.create_gateway_startup_context", () => createGatewayStartupContext({
@@ -8746,17 +8969,20 @@ var ServiceCommands = class {
 			publishUiEvent: uiStartup?.publish
 		});
 		console.log("✓ Capability hydration: scheduled in background");
-		await measureStartupAsync("service.start_gateway_support_services", async () => await startGatewaySupportServices({
+		await measureStartupAsync("service.start_gateway_support_services", async () => await startGatewayRuntimeSupport({
 			cronJobs: gateway.cron.status().jobs,
 			remoteModule: gateway.remoteModule,
-			watchConfigFile: () => this.watchConfigFile(gateway.reloader),
+			watchConfigFile: () => watchServiceConfigFile({
+				configPath: resolve(getConfigPath$1()),
+				watcherRegistry: this.fileWatchers,
+				scheduleReload: (reason) => gateway.reloader.scheduleReload(reason)
+			}),
 			startCron: () => gateway.cron.start(),
-			startHeartbeat: () => gateway.heartbeat.start()
-		}));
-		watchCronStoreFile({
+			startHeartbeat: () => gateway.heartbeat.start(),
 			cronStorePath: resolve(join(NextclawCore.getDataDir(), "cron", "jobs.json")),
-			reloadCronStore: () => gateway.cron.reloadFromStore()
-		});
+			reloadCronStore: () => gateway.cron.reloadFromStore(),
+			watcherRegistry: this.fileWatchers
+		}));
 		const deferredGatewayStartupHooks = createDeferredGatewayStartupHooks({
 			uiStartup,
 			gateway,
@@ -8804,6 +9030,8 @@ var ServiceCommands = class {
 				console.error(`Deferred startup failed: ${error instanceof Error ? error.message : String(error)}`);
 			},
 			cleanup: async () => {
+				clearOwnedServiceState();
+				await this.fileWatchers.clear();
 				this.applyLiveConfigReload = null;
 				this.liveUiNcpAgent = null;
 				ncpSessionRealtimeBridge.clear();
@@ -8819,27 +9047,6 @@ var ServiceCommands = class {
 		if (typeof value !== "string") return;
 		return value.trim() || void 0;
 	};
-	watchConfigFile = (reloader) => {
-		const configPath = resolve(getConfigPath$1());
-		chokidar.watch(configPath, {
-			ignoreInitial: true,
-			awaitWriteFinish: {
-				stabilityThreshold: 200,
-				pollInterval: 50
-			}
-		}).on("all", (event, changedPath) => {
-			if (resolve(changedPath) !== configPath) return;
-			if (event === "add") {
-				reloader.scheduleReload("config add");
-				return;
-			}
-			if (event === "change") {
-				reloader.scheduleReload("config change");
-				return;
-			}
-			if (event === "unlink") reloader.scheduleReload("config unlink");
-		});
-	};
 	resolveMostRecentRoutableSessionKey = (sessionManager) => {
 		let best = null;
 		for (const session of sessionManager.listSessions()) {
@@ -9552,11 +9759,7 @@ var CliRuntime = class {
 		this.mcpCommands = measureStartupSync("cli.runtime.mcp_commands", () => new McpCommands());
 		this.secretsCommands = measureStartupSync("cli.runtime.secrets_commands", () => new SecretsCommands({ requestRestart: (params) => this.requestRestart(params) }));
 		this.pluginCommands = measureStartupSync("cli.runtime.plugin_commands", () => new PluginCommands());
-		this.agentCommands = measureStartupSync("cli.runtime.agent_commands", () => new AgentCommands({
-			requestRestart: (params) => this.requestRestart(params),
-			initializeAgentHomeDirectory: (homeDirectory) => this.workspaceManager.createWorkspaceTemplates(homeDirectory),
-			appName: APP_NAME
-		}));
+		this.agentCommands = measureStartupSync("cli.runtime.agent_commands", () => new AgentCommands({ initializeAgentHomeDirectory: (homeDirectory) => this.workspaceManager.createWorkspaceTemplates(homeDirectory) }));
 		this.channelCommands = measureStartupSync("cli.runtime.channel_commands", () => new ChannelCommands({
 			logo: this.logo,
 			getBridgeDir: () => this.workspaceManager.getBridgeDir(),
@@ -9959,6 +10162,9 @@ var CliRuntime = class {
 	agentsList = (opts = {}) => {
 		this.agentCommands.agentsList(opts);
 	};
+	agentsRuntimes = async (opts = {}) => {
+		await this.agentCommands.agentsRuntimes(opts);
+	};
 	agentsNew = async (agentId, opts = {}) => {
 		await this.agentCommands.agentsNew(agentId, opts);
 	};
@@ -10120,8 +10326,9 @@ var CliRuntime = class {
 function registerAgentsCommands(program, runtime) {
 	const agents = program.command("agents").description("Manage agents");
 	agents.command("list").description("List available agents").option("--json", "Output JSON", false).action((opts) => runtime.agentsList(opts));
-	agents.command("new <agentId>").description("Create a new agent").option("--name <name>", "Agent display name").option("--description <description>", "Agent description").option("--avatar <avatar>", "Remote avatar URL or local image path").option("--home <path>", "Agent home directory").option("--json", "Output JSON", false).action(async (agentId, opts) => runtime.agentsNew(agentId, opts));
-	agents.command("update <agentId>").description("Update an existing agent").option("--name <name>", "Agent display name").option("--description <description>", "Agent description").option("--avatar <avatar>", "Remote avatar URL or local image path").option("--json", "Output JSON", false).action(async (agentId, opts) => runtime.agentsUpdate(agentId, opts));
+	agents.command("runtimes").description("List available agent runtimes").option("--probe", "Actively probe runtime readiness", false).option("--json", "Output JSON", false).action(async (opts) => runtime.agentsRuntimes(opts));
+	agents.command("new <agentId>").description("Create a new agent").option("--name <name>", "Agent display name").option("--description <description>", "Agent description").option("--avatar <avatar>", "Remote avatar URL or local image path").option("--home <path>", "Agent home directory").option("--runtime <runtime>", "Agent runtime kind, for example native or codex").option("--json", "Output JSON", false).action(async (agentId, opts) => runtime.agentsNew(agentId, opts));
+	agents.command("update <agentId>").description("Update an existing agent").option("--name <name>", "Agent display name").option("--description <description>", "Agent description").option("--avatar <avatar>", "Remote avatar URL or local image path").option("--runtime <runtime>", "Agent runtime kind, for example native or codex").option("--json", "Output JSON", false).action(async (agentId, opts) => runtime.agentsUpdate(agentId, opts));
 	agents.command("remove <agentId>").description("Remove an agent").option("--json", "Output JSON", false).action(async (agentId, opts) => runtime.agentsRemove(agentId, opts));
 }
 //#endregion