@noxsoft/anima 5.1.2 → 6.5.0

package/dist/bundled/boot-md/handler.js

@@ -1,40 +1,50 @@
-import "../../paths-D2eokayo.js";
-import { E as resolveAgentIdFromSessionKey, T as normalizeMainKey, l as ensureAgentWorkspace, w as normalizeAgentId } from "../../workspace-BQkffCaR.js";
-import { c as DEFAULT_CHAT_CHANNEL, n as defaultRuntime, t as createSubsystemLogger } from "../../subsystem-DA3Cno1i.js";
-import "../../exec-Bfd4ztFZ.js";
-import { a as resolveAgentModelPrimary, i as resolveAgentModelFallbacksOverride, o as resolveAgentSkillsFilter, r as resolveAgentDir, s as resolveAgentWorkspaceDir, t as listAgentIds } from "../../agent-scope-BZ8hjIt_.js";
-import { $ as normalizeAccountId, A as supportsXHighThinking, Dt as buildWorkspaceSkillSnapshot, E as normalizeThinkLevel, H as loadSessionStore, K as updateSessionStore, O as normalizeVerboseLevel, S as formatXHighModelHint, Yt as SILENT_REPLY_TOKEN, a as normalizeOutboundPayloadsForJson, et as resolveSessionKey, i as normalizeOutboundPayloads, it as resolveSessionResetType, lt as resolveExplicitAgentSessionKey, nt as resolveChannelResetConfig, r as formatOutboundPayloadLog, rt as resolveSessionResetPolicy, t as deliverOutboundPayloads, tt as evaluateSessionFreshness, ut as resolveMainSessionKey, x as formatThinkingLevels } from "../../deliver-D2hQZ9X0.js";
-import { A as applyVerboseOverride, D as lookupContextTokens, E as getSkillsSnapshotVersion, G as resolveAgentTimeoutMs, K as AGENT_LANE_NESTED, M as loadModelCatalog, O as clearSessionAuthProfileOverride, T as getRemoteSkillEligibility, X as emitAgentEvent, Y as clearAgentRunContext, Z as registerAgentRunContext, b as hasNonzeroUsage, d as setCliSessionId, g as runWithModelFallback, h as resolveSessionDeliveryTarget, k as applyModelOverrideToSessionEntry, m as resolveOutboundTarget, q as AGENT_LANE_SUBAGENT, rt as runCliAgent, t as runEmbeddedPiAgent, u as getCliSessionId, w as resolveSendPolicy, y as deriveSessionTotalTokens } from "../../pi-embedded-DifnZvKk.js";
-import { n as loadConfig } from "../../config-6FVC8hW0.js";
+import "../../paths-B-AkG5FD.js";
+import { E as resolveAgentIdFromSessionKey, T as normalizeMainKey, l as ensureAgentWorkspace, w as normalizeAgentId } from "../../workspace-BFIZCnGo.js";
+import { c as DEFAULT_CHAT_CHANNEL, n as defaultRuntime, t as createSubsystemLogger } from "../../subsystem-D1AJZPgG.js";
+import "../../exec-DUzVF5_D.js";
+import { a as resolveAgentModelPrimary, i as resolveAgentModelFallbacksOverride, o as resolveAgentSkillsFilter, r as resolveAgentDir, s as resolveAgentWorkspaceDir, t as listAgentIds } from "../../agent-scope-CxBzAozu.js";
+import { $ as normalizeAccountId, A as supportsXHighThinking, Dt as buildWorkspaceSkillSnapshot, E as normalizeThinkLevel, H as loadSessionStore, K as updateSessionStore, O as normalizeVerboseLevel, S as formatXHighModelHint, Yt as SILENT_REPLY_TOKEN, a as normalizeOutboundPayloadsForJson, et as resolveSessionKey, i as normalizeOutboundPayloads, it as resolveSessionResetType, lt as resolveExplicitAgentSessionKey, nt as resolveChannelResetConfig, r as formatOutboundPayloadLog, rt as resolveSessionResetPolicy, t as deliverOutboundPayloads, tt as evaluateSessionFreshness, ut as resolveMainSessionKey, x as formatThinkingLevels } from "../../deliver-d-CaN0uL.js";
+import { A as applyVerboseOverride, D as lookupContextTokens, E as getSkillsSnapshotVersion, G as resolveAgentTimeoutMs, K as AGENT_LANE_NESTED, M as loadModelCatalog, O as clearSessionAuthProfileOverride, T as getRemoteSkillEligibility, X as emitAgentEvent, Y as clearAgentRunContext, Z as registerAgentRunContext, b as hasNonzeroUsage, d as setCliSessionId, g as runWithModelFallback, h as resolveSessionDeliveryTarget, k as applyModelOverrideToSessionEntry, m as resolveOutboundTarget, q as AGENT_LANE_SUBAGENT, t as runNoxSoftEmbeddedAgent, u as getCliSessionId, w as resolveSendPolicy, y as deriveSessionTotalTokens } from "../../pi-embedded-DfbM3fAT.js";
+import { n as loadConfig } from "../../config-CweTwOtr.js";
 import "../../boolean-Ce2-qkSB.js";
-import "../../shell-env-B4ae4lFh.js";
-import { a as modelKey, f as resolveThinkingDefault, h as DEFAULT_PROVIDER, i as isCliProvider, l as resolveConfiguredModelRef, m as DEFAULT_MODEL, o as normalizeModelRef, p as DEFAULT_CONTEXT_TOKENS, t as buildAllowedModelSet } from "../../model-selection-BI8CKPwQ.js";
-import "../../chrome-Cfak4A3i.js";
+import "../../shell-env-HkVWMh--.js";
+import { a as modelKey, f as resolveModelRefFromString, g as DEFAULT_PROVIDER, h as DEFAULT_MODEL, i as isCliProvider, l as resolveAllowedModelRef, m as DEFAULT_CONTEXT_TOKENS, o as normalizeModelRef, p as resolveThinkingDefault, r as buildModelAliasIndex, u as resolveConfiguredModelRef } from "../../model-selection-DjsJGv1R.js";
+import "../../chrome-DLUBPBPz.js";
 import { t as formatCliCommand } from "../../command-format-GLYKXXl-.js";
-import "../../frontmatter-BP4GSt5L.js";
-import { f as normalizeChannelId, g as isInternalMessageChannel, h as isGatewayMessageChannel, m as isDeliverableMessageChannel, p as INTERNAL_MESSAGE_CHANNEL, u as getChannelPlugin, x as resolveMessageChannel, y as normalizeMessageChannel } from "../../chunk-CyT-_QsQ.js";
-import { n as resolveSessionFilePath, s as resolveStorePath } from "../../paths-Cwszsz1I.js";
-import "../../tool-images-DK97edts.js";
-import { o as ensureAuthProfileStore } from "../../auth-profiles-eZzmaeR3.js";
-import "../../manager-A3pC-CW-.js";
-import "../../sqlite-ClLAW1iQ.js";
-import "../../session-3MLbl1-K.js";
-import "../../semantic-CG6X3rBo.js";
-import "../../soul-Bt57OdSx.js";
-import "../../common-BzPvZcxT.js";
-import "../../active-listener-GJR3nLhX.js";
+import "../../frontmatter-Dsa7N963.js";
+import { f as normalizeChannelId, g as isInternalMessageChannel, h as isGatewayMessageChannel, m as isDeliverableMessageChannel, p as INTERNAL_MESSAGE_CHANNEL, u as getChannelPlugin, x as resolveMessageChannel, y as normalizeMessageChannel } from "../../chunk-B4Kx-ocg.js";
+import { n as resolveSessionFilePath, s as resolveStorePath } from "../../paths-Q6h5HODL.js";
+import "../../tool-images-2qproko3.js";
+import { l as ensureAuthProfileStore } from "../../auth-profiles-DtWUl1-k.js";
+import "../../manager-b_aZwo00.js";
+import "../../sqlite-CZ1vD4VS.js";
+import "../../session-BiA6jrcs.js";
+import "../../semantic-C1UN3bb9.js";
+import "../../soul-Bt8UNmTq.js";
+import "../../common-Bf_TG87Y.js";
+import "../../active-listener-D2r8IO7g.js";
 import "../../pi-model-discovery-62lQTR6C.js";
-import "../../auth-store-CnRrUELz.js";
+import "../../auth-store-Bd0GoqEL.js";
 import fs from "node:fs/promises";
 import path from "node:path";
 import crypto from "node:crypto";
 
 //#region src/cli/deps.ts
+async function unsupportedChannelSender(channel) {
+	throw new Error(`${channel} sending is not available via createDefaultDeps(); pass explicit deps instead.`);
+}
 function createDefaultDeps() {
-	return { sendMessageWhatsApp: async (...args) => {
-		const { sendMessageWhatsApp } = await import("../../web-DBQRQY6n.js");
-		return await sendMessageWhatsApp(...args);
-	} };
+	return {
+		sendMessageWhatsApp: async (...args) => {
+			const { sendMessageWhatsApp } = await import("../../web-so3pGceM.js");
+			return await sendMessageWhatsApp(...args);
+		},
+		sendMessageTelegram: async () => await unsupportedChannelSender("Telegram"),
+		sendMessageDiscord: async () => await unsupportedChannelSender("Discord"),
+		sendMessageSlack: async () => await unsupportedChannelSender("Slack"),
+		sendMessageSignal: async () => await unsupportedChannelSender("Signal"),
+		sendMessageIMessage: async () => await unsupportedChannelSender("iMessage")
+	};
 }
 
 //#endregion
@@ -244,6 +254,111 @@ async function deliverAgentCommandResult(params) {
 	};
 }
 
+//#endregion
+//#region src/commands/agent/model-resolution.ts
+function buildConfigForAgentPrimary(cfg, agentId) {
+	const agentModelPrimary = agentId ? resolveAgentModelPrimary(cfg, agentId) : void 0;
+	if (!agentModelPrimary) return {
+		cfgForModelSelection: cfg,
+		agentModelPrimary
+	};
+	return {
+		agentModelPrimary,
+		cfgForModelSelection: {
+			...cfg,
+			agents: {
+				...cfg.agents,
+				defaults: {
+					...cfg.agents?.defaults,
+					model: {
+						...typeof cfg.agents?.defaults?.model === "object" ? cfg.agents.defaults.model : void 0,
+						primary: agentModelPrimary
+					}
+				}
+			}
+		}
+	};
+}
+async function resolveAgentModelSelection(params) {
+	const { cfgForModelSelection } = buildConfigForAgentPrimary(params.cfg, params.agentId);
+	const configuredDefaultRef = resolveConfiguredModelRef({
+		cfg: cfgForModelSelection,
+		defaultProvider: DEFAULT_PROVIDER,
+		defaultModel: DEFAULT_MODEL
+	});
+	const { provider: defaultProvider, model: defaultModel } = normalizeModelRef(configuredDefaultRef.provider, configuredDefaultRef.model);
+	const explicitModel = params.explicitModel?.trim();
+	const hasStoredOverride = Boolean(params.sessionEntry?.modelOverride || params.sessionEntry?.providerOverride);
+	const hasAllowlist = Boolean(params.cfg.agents?.defaults?.models) && Object.keys(params.cfg.agents?.defaults?.models ?? {}).length > 0;
+	const catalog = Boolean(explicitModel) || hasStoredOverride || hasAllowlist ? await loadModelCatalog({ config: params.cfg }) : [];
+	if (explicitModel) {
+		const resolved = resolveAllowedModelRef({
+			cfg: params.cfg,
+			catalog,
+			raw: explicitModel,
+			defaultProvider,
+			defaultModel
+		});
+		if ("error" in resolved) {
+			const cliResolved = resolveModelRefFromString({
+				raw: explicitModel,
+				defaultProvider,
+				aliasIndex: buildModelAliasIndex({
+					cfg: params.cfg,
+					defaultProvider
+				})
+			});
+			if (!cliResolved || !isCliProvider(cliResolved.ref.provider, params.cfg)) throw new Error(resolved.error);
+			return {
+				provider: cliResolved.ref.provider,
+				model: cliResolved.ref.model,
+				defaultProvider,
+				defaultModel,
+				source: "explicit",
+				storedOverrideValid: true
+			};
+		}
+		return {
+			provider: resolved.ref.provider,
+			model: resolved.ref.model,
+			defaultProvider,
+			defaultModel,
+			source: "explicit",
+			storedOverrideValid: true
+		};
+	}
+	const storedProviderOverride = params.sessionEntry?.providerOverride?.trim();
+	const storedModelOverride = params.sessionEntry?.modelOverride?.trim();
+	if (storedModelOverride) {
+		const normalizedStored = normalizeModelRef(storedProviderOverride || defaultProvider, storedModelOverride);
+		const key = modelKey(normalizedStored.provider, normalizedStored.model);
+		if (isCliProvider(normalizedStored.provider, params.cfg) || !hasAllowlist || catalog.some((entry) => modelKey(entry.provider, entry.id) === key) || Object.prototype.hasOwnProperty.call(params.cfg.models?.providers ?? {}, normalizedStored.provider)) return {
+			provider: normalizedStored.provider,
+			model: normalizedStored.model,
+			defaultProvider,
+			defaultModel,
+			source: "session",
+			storedOverrideValid: true
+		};
+		return {
+			provider: defaultProvider,
+			model: defaultModel,
+			defaultProvider,
+			defaultModel,
+			source: "default",
+			storedOverrideValid: false
+		};
+	}
+	return {
+		provider: defaultProvider,
+		model: defaultModel,
+		defaultProvider,
+		defaultModel,
+		source: "default",
+		storedOverrideValid: true
+	};
+}
+
 //#endregion
 //#region src/commands/agent/run-context.ts
 function resolveAgentRunContext(opts) {
@@ -268,11 +383,15 @@ function resolveAgentRunContext(opts) {
 
 //#endregion
 //#region src/commands/agent/session-store.ts
+function readAgentMetaNumber(agentMeta, key) {
+	const value = agentMeta?.[key];
+	return typeof value === "number" && Number.isFinite(value) ? value : void 0;
+}
 async function updateSessionStoreAfterAgentRun(params) {
 	const { cfg, sessionId, sessionKey, storePath, sessionStore, defaultProvider, defaultModel, fallbackProvider, fallbackModel, result } = params;
 	const usage = result.meta.agentMeta?.usage;
 	const promptTokens = result.meta.agentMeta?.promptTokens;
-	const compactionsThisRun = Math.max(0, result.meta.agentMeta?.compactionCount ?? 0);
+	const compactionsThisRun = Math.max(0, readAgentMetaNumber(result.meta.agentMeta, "compactionCount") ?? 0);
 	const modelUsed = result.meta.agentMeta?.model ?? fallbackModel ?? defaultModel;
 	const providerUsed = result.meta.agentMeta?.provider ?? fallbackProvider ?? defaultProvider;
 	const contextTokens = params.contextTokensOverride ?? lookupContextTokens(modelUsed) ?? DEFAULT_CONTEXT_TOKENS;
@@ -292,7 +411,7 @@ async function updateSessionStoreAfterAgentRun(params) {
 		const cliSessionId = result.meta.agentMeta?.sessionId?.trim();
 		if (cliSessionId) setCliSessionId(next, providerUsed, cliSessionId);
 	}
-	next.abortedLastRun = result.meta.aborted ?? false;
+	next.abortedLastRun = false;
 	if (hasNonzeroUsage(usage)) {
 		const input = usage.input ?? 0;
 		const output = usage.output ?? 0;
@@ -395,6 +514,8 @@ async function agentCommand(opts, runtime = defaultRuntime, deps = createDefault
 	if (!body) throw new Error("Message (--message) is required");
 	if (!opts.to && !opts.sessionId && !opts.sessionKey && !opts.agentId) throw new Error("Pass --to <E.164>, --session-id, or --agent to choose a session");
 	const cfg = loadConfig();
+	const explicitModelRaw = opts.model?.trim();
+	if (opts.model !== void 0 && !explicitModelRaw) throw new Error("--model cannot be empty.");
 	const agentIdOverrideRaw = opts.agentId?.trim();
 	const agentIdOverride = agentIdOverrideRaw ? normalizeAgentId(agentIdOverrideRaw) : void 0;
 	if (agentIdOverride) {
@@ -412,18 +533,6 @@ async function agentCommand(opts, runtime = defaultRuntime, deps = createDefault
 		dir: workspaceDirRaw,
 		ensureBootstrapFiles: !agentCfg?.skipBootstrap
 	})).dir;
-	const configuredModel = resolveConfiguredModelRef({
-		cfg,
-		defaultProvider: DEFAULT_PROVIDER,
-		defaultModel: DEFAULT_MODEL
-	});
-	const thinkingLevelsHint = formatThinkingLevels(configuredModel.provider, configuredModel.model);
-	const thinkOverride = normalizeThinkLevel(opts.thinking);
-	const thinkOnce = normalizeThinkLevel(opts.thinkingOnce);
-	if (opts.thinking && !thinkOverride) throw new Error(`Invalid thinking level. Use one of: ${thinkingLevelsHint}.`);
-	if (opts.thinkingOnce && !thinkOnce) throw new Error(`Invalid one-shot thinking level. Use one of: ${thinkingLevelsHint}.`);
-	const verboseOverride = normalizeVerboseLevel(opts.verbose);
-	if (opts.verbose && !verboseOverride) throw new Error("Invalid verbose level. Use \"on\", \"full\", or \"off\".");
 	const isSubagentLane = (typeof opts.lane === "string" ? opts.lane.trim() : "") === String(AGENT_LANE_SUBAGENT);
 	const timeoutSecondsRaw = opts.timeout !== void 0 ? Number.parseInt(String(opts.timeout), 10) : isSubagentLane ? 0 : void 0;
 	if (timeoutSecondsRaw !== void 0 && (Number.isNaN(timeoutSecondsRaw) || timeoutSecondsRaw < 0)) throw new Error("--timeout must be a non-negative integer (seconds; 0 means no timeout)");
@@ -440,6 +549,18 @@ async function agentCommand(opts, runtime = defaultRuntime, deps = createDefault
 	});
 	let sessionEntry = resolvedSessionEntry;
 	const runId = opts.runId?.trim() || sessionId;
+	const configuredModel = await resolveAgentModelSelection({
+		cfg,
+		agentId: sessionAgentId,
+		sessionEntry
+	});
+	const thinkingLevelsHint = formatThinkingLevels(configuredModel.provider, configuredModel.model);
+	const thinkOverride = normalizeThinkLevel(opts.thinking);
+	const thinkOnce = normalizeThinkLevel(opts.thinkingOnce);
+	if (opts.thinking && !thinkOverride) throw new Error(`Invalid thinking level. Use one of: ${thinkingLevelsHint}.`);
+	if (opts.thinkingOnce && !thinkOnce) throw new Error(`Invalid one-shot thinking level. Use one of: ${thinkingLevelsHint}.`);
+	const verboseOverride = normalizeVerboseLevel(opts.verbose);
+	if (opts.verbose && !verboseOverride) throw new Error("Invalid verbose level. Use \"on\", \"full\", or \"off\".");
 	try {
 		if (opts.deliver === true) {
 			if (resolveSendPolicy({
@@ -481,93 +602,35 @@ async function agentCommand(opts, runtime = defaultRuntime, deps = createDefault
 			});
 			sessionEntry = next;
 		}
-		if (sessionStore && sessionKey) {
-			const next = {
-				...sessionStore[sessionKey] ?? sessionEntry ?? {
-					sessionId,
-					updatedAt: Date.now()
-				},
-				sessionId,
-				updatedAt: Date.now()
-			};
-			if (thinkOverride) next.thinkingLevel = thinkOverride;
-			applyVerboseOverride(next, verboseOverride);
-			sessionStore[sessionKey] = next;
-			await updateSessionStore(storePath, (store) => {
-				store[sessionKey] = next;
-			});
-		}
-		const agentModelPrimary = resolveAgentModelPrimary(cfg, sessionAgentId);
-		const configuredDefaultRef = resolveConfiguredModelRef({
-			cfg: agentModelPrimary ? {
-				...cfg,
-				agents: {
-					...cfg.agents,
-					defaults: {
-						...cfg.agents?.defaults,
-						model: {
-							...typeof cfg.agents?.defaults?.model === "object" ? cfg.agents.defaults.model : void 0,
-							primary: agentModelPrimary
-						}
-					}
-				}
-			} : cfg,
-			defaultProvider: DEFAULT_PROVIDER,
-			defaultModel: DEFAULT_MODEL
+		const modelSelection = await resolveAgentModelSelection({
+			cfg,
+			agentId: sessionAgentId,
+			sessionEntry,
+			explicitModel: explicitModelRaw
 		});
-		const { provider: defaultProvider, model: defaultModel } = normalizeModelRef(configuredDefaultRef.provider, configuredDefaultRef.model);
-		let provider = defaultProvider;
-		let model = defaultModel;
-		const hasAllowlist = agentCfg?.models && Object.keys(agentCfg.models).length > 0;
+		const defaultProvider = modelSelection.defaultProvider;
+		const defaultModel = modelSelection.defaultModel;
+		let provider = modelSelection.provider;
+		let model = modelSelection.model;
+		let modelCatalog;
 		const hasStoredOverride = Boolean(sessionEntry?.modelOverride || sessionEntry?.providerOverride);
-		const needsModelCatalog = hasAllowlist || hasStoredOverride;
-		let allowedModelKeys = /* @__PURE__ */ new Set();
-		let allowedModelCatalog = [];
-		let modelCatalog = null;
-		if (needsModelCatalog) {
-			modelCatalog = await loadModelCatalog({ config: cfg });
-			const allowed = buildAllowedModelSet({
-				cfg,
-				catalog: modelCatalog,
-				defaultProvider,
-				defaultModel
-			});
-			allowedModelKeys = allowed.allowedKeys;
-			allowedModelCatalog = allowed.allowedCatalog;
-		}
-		if (sessionEntry && sessionStore && sessionKey && hasStoredOverride) {
+		const storedModelOverride = sessionEntry?.modelOverride?.trim();
+		if (sessionEntry && sessionStore && sessionKey && hasStoredOverride && !modelSelection.storedOverrideValid && !explicitModelRaw) {
 			const entry = sessionEntry;
-			const overrideProvider = sessionEntry.providerOverride?.trim() || defaultProvider;
-			const overrideModel = sessionEntry.modelOverride?.trim();
-			if (overrideModel) {
-				const normalizedOverride = normalizeModelRef(overrideProvider, overrideModel);
-				const key = modelKey(normalizedOverride.provider, normalizedOverride.model);
-				if (!isCliProvider(normalizedOverride.provider, cfg) && allowedModelKeys.size > 0 && !allowedModelKeys.has(key)) {
-					const { updated } = applyModelOverrideToSessionEntry({
-						entry,
-						selection: {
-							provider: defaultProvider,
-							model: defaultModel,
-							isDefault: true
-						}
-					});
-					if (updated) {
-						sessionStore[sessionKey] = entry;
-						await updateSessionStore(storePath, (store) => {
-							store[sessionKey] = entry;
-						});
-					}
+			const { updated } = applyModelOverrideToSessionEntry({
+				entry,
+				selection: {
+					provider: defaultProvider,
+					model: defaultModel,
+					isDefault: true
 				}
-			}
-		}
-		const storedProviderOverride = sessionEntry?.providerOverride?.trim();
-		const storedModelOverride = sessionEntry?.modelOverride?.trim();
-		if (storedModelOverride) {
-			const normalizedStored = normalizeModelRef(storedProviderOverride || defaultProvider, storedModelOverride);
-			const key = modelKey(normalizedStored.provider, normalizedStored.model);
-			if (isCliProvider(normalizedStored.provider, cfg) || allowedModelKeys.size === 0 || allowedModelKeys.has(key)) {
-				provider = normalizedStored.provider;
-				model = normalizedStored.model;
+			});
+			if (updated) {
+				sessionStore[sessionKey] = entry;
+				await updateSessionStore(storePath, (store) => {
+					store[sessionKey] = entry;
+				});
+				sessionEntry = entry;
 			}
 		}
 		if (sessionEntry) {
@@ -586,8 +649,8 @@ async function agentCommand(opts, runtime = defaultRuntime, deps = createDefault
 			}
 		}
 		if (!resolvedThinkLevel) {
-			let catalogForThinking = modelCatalog ?? allowedModelCatalog;
-			if (!catalogForThinking || catalogForThinking.length === 0) {
+			let catalogForThinking = modelCatalog;
+			if (!catalogForThinking?.length) {
 				modelCatalog = await loadModelCatalog({ config: cfg });
 				catalogForThinking = modelCatalog;
 			}
@@ -611,6 +674,31 @@ async function agentCommand(opts, runtime = defaultRuntime, deps = createDefault
 				});
 			}
 		}
+		if (sessionStore && sessionKey) {
+			const next = {
+				...sessionStore[sessionKey] ?? sessionEntry ?? {
+					sessionId,
+					updatedAt: Date.now()
+				},
+				sessionId,
+				updatedAt: Date.now()
+			};
+			if (thinkOverride) next.thinkingLevel = thinkOverride;
+			applyVerboseOverride(next, verboseOverride);
+			if (explicitModelRaw) applyModelOverrideToSessionEntry({
+				entry: next,
+				selection: {
+					provider,
+					model,
+					isDefault: provider === defaultProvider && model === defaultModel
+				}
+			});
+			sessionStore[sessionKey] = next;
+			await updateSessionStore(storePath, (store) => {
+				store[sessionKey] = next;
+			});
+			sessionEntry = next;
+		}
 		const sessionFile = resolveSessionFilePath(sessionId, sessionEntry, { agentId: sessionAgentId });
 		const startedAt = Date.now();
 		let lifecycleEnded = false;
@@ -622,41 +710,22 @@ async function agentCommand(opts, runtime = defaultRuntime, deps = createDefault
 			const messageChannel = resolveMessageChannel(runContext.messageChannel, opts.replyChannel ?? opts.channel);
 			const spawnedBy = opts.spawnedBy ?? sessionEntry?.spawnedBy;
 			const agentFallbacksOverride = resolveAgentModelFallbacksOverride(cfg, sessionAgentId);
-			const effectiveFallbacksOverride = storedModelOverride ? agentFallbacksOverride ?? [] : agentFallbacksOverride;
+			const effectiveFallbacksOverride = explicitModelRaw || storedModelOverride ? agentFallbacksOverride ?? [] : agentFallbacksOverride;
 			let fallbackAttemptIndex = 0;
 			const fallbackResult = await runWithModelFallback({
 				cfg,
 				provider,
 				model,
 				agentDir,
+				sessionEntry,
+				thinkLevel: resolvedThinkLevel,
 				fallbacksOverride: effectiveFallbacksOverride,
 				run: (providerOverride, modelOverride) => {
 					const isFallbackRetry = fallbackAttemptIndex > 0;
 					fallbackAttemptIndex += 1;
 					const effectivePrompt = isFallbackRetry ? "Continue where you left off. The previous model attempt failed or timed out." : body;
-					if (isCliProvider(providerOverride, cfg)) {
-						const cliSessionId = getCliSessionId(sessionEntry, providerOverride);
-						return runCliAgent({
-							sessionId,
-							sessionKey,
-							agentId: sessionAgentId,
-							sessionFile,
-							workspaceDir,
-							config: cfg,
-							prompt: effectivePrompt,
-							provider: providerOverride,
-							model: modelOverride,
-							thinkLevel: resolvedThinkLevel,
-							timeoutMs,
-							runId,
-							extraSystemPrompt: opts.extraSystemPrompt,
-							cliSessionId,
-							images: isFallbackRetry ? void 0 : opts.images,
-							streamParams: opts.streamParams
-						});
-					}
 					const authProfileId = providerOverride === provider ? sessionEntry?.authProfileOverride : void 0;
-					return runEmbeddedPiAgent({
+					return runNoxSoftEmbeddedAgent({
 						sessionId,
 						sessionKey,
 						agentId: sessionAgentId,
@@ -688,6 +757,8 @@ async function agentCommand(opts, runtime = defaultRuntime, deps = createDefault
 						verboseLevel: resolvedVerboseLevel,
 						timeoutMs,
 						runId,
+						execSecurity: sessionEntry?.execSecurity,
+						cliSessionId: getCliSessionId(sessionEntry, providerOverride),
 						lane: opts.lane,
 						abortSignal: opts.abortSignal,
 						extraSystemPrompt: opts.extraSystemPrompt,
@@ -710,7 +781,7 @@ async function agentCommand(opts, runtime = defaultRuntime, deps = createDefault
 					phase: "end",
 					startedAt,
 					endedAt: Date.now(),
-					aborted: result.meta.aborted ?? false
+					aborted: false
 				}
 			});
 		} catch (err) {

package/dist/bundled/bootstrap-extra-files/handler.js

@@ -1,10 +1,10 @@
-import "../../paths-D2eokayo.js";
-import { d as loadExtraBootstrapFiles, u as filterBootstrapFilesForSession } from "../../workspace-BQkffCaR.js";
-import "../../subsystem-DA3Cno1i.js";
-import "../../exec-Bfd4ztFZ.js";
+import "../../paths-B-AkG5FD.js";
+import { d as loadExtraBootstrapFiles, u as filterBootstrapFilesForSession } from "../../workspace-BFIZCnGo.js";
+import "../../subsystem-D1AJZPgG.js";
+import "../../exec-DUzVF5_D.js";
 import { n as isAgentBootstrapEvent } from "../../internal-hooks-CWw3Hgeu.js";
 import "../../boolean-Ce2-qkSB.js";
-import "../../frontmatter-BP4GSt5L.js";
+import "../../frontmatter-Dsa7N963.js";
 import { t as resolveHookConfig } from "../../config-ZwgPFgdN.js";
 
 //#region src/hooks/bundled/bootstrap-extra-files/handler.ts

package/dist/bundled/command-logger/handler.js

@@ -1,4 +1,4 @@
-import { s as resolveStateDir } from "../../paths-D2eokayo.js";
+import { s as resolveStateDir } from "../../paths-B-AkG5FD.js";
 import fs from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";

package/dist/bundled/session-memory/handler.js

@@ -1,29 +1,29 @@
-import { s as resolveStateDir } from "../../paths-D2eokayo.js";
-import { E as resolveAgentIdFromSessionKey } from "../../workspace-BQkffCaR.js";
-import { t as createSubsystemLogger } from "../../subsystem-DA3Cno1i.js";
-import "../../exec-Bfd4ztFZ.js";
-import { s as resolveAgentWorkspaceDir } from "../../agent-scope-BZ8hjIt_.js";
-import "../../deliver-D2hQZ9X0.js";
-import { Q as hasInterSessionUserProvenance } from "../../pi-embedded-DifnZvKk.js";
-import "../../config-6FVC8hW0.js";
+import { s as resolveStateDir } from "../../paths-B-AkG5FD.js";
+import { E as resolveAgentIdFromSessionKey } from "../../workspace-BFIZCnGo.js";
+import { t as createSubsystemLogger } from "../../subsystem-D1AJZPgG.js";
+import "../../exec-DUzVF5_D.js";
+import { s as resolveAgentWorkspaceDir } from "../../agent-scope-CxBzAozu.js";
+import "../../deliver-d-CaN0uL.js";
+import { Q as hasInterSessionUserProvenance } from "../../pi-embedded-DfbM3fAT.js";
+import "../../config-CweTwOtr.js";
 import "../../boolean-Ce2-qkSB.js";
-import "../../shell-env-B4ae4lFh.js";
-import "../../model-selection-BI8CKPwQ.js";
-import "../../chrome-Cfak4A3i.js";
-import "../../frontmatter-BP4GSt5L.js";
-import "../../chunk-CyT-_QsQ.js";
-import "../../paths-Cwszsz1I.js";
-import "../../tool-images-DK97edts.js";
-import "../../auth-profiles-eZzmaeR3.js";
-import "../../manager-A3pC-CW-.js";
-import "../../sqlite-ClLAW1iQ.js";
-import "../../session-3MLbl1-K.js";
-import "../../semantic-CG6X3rBo.js";
-import "../../soul-Bt57OdSx.js";
-import "../../common-BzPvZcxT.js";
-import "../../active-listener-GJR3nLhX.js";
+import "../../shell-env-HkVWMh--.js";
+import "../../model-selection-DjsJGv1R.js";
+import "../../chrome-DLUBPBPz.js";
+import "../../frontmatter-Dsa7N963.js";
+import "../../chunk-B4Kx-ocg.js";
+import "../../paths-Q6h5HODL.js";
+import "../../tool-images-2qproko3.js";
+import "../../auth-profiles-DtWUl1-k.js";
+import "../../manager-b_aZwo00.js";
+import "../../sqlite-CZ1vD4VS.js";
+import "../../session-BiA6jrcs.js";
+import "../../semantic-C1UN3bb9.js";
+import "../../soul-Bt8UNmTq.js";
+import "../../common-Bf_TG87Y.js";
+import "../../active-listener-D2r8IO7g.js";
 import "../../pi-model-discovery-62lQTR6C.js";
-import "../../auth-store-CnRrUELz.js";
+import "../../auth-store-Bd0GoqEL.js";
 import { generateSlugViaLLM } from "../../llm-slug-generator.js";
 import { t as resolveHookConfig } from "../../config-ZwgPFgdN.js";
 import fs from "node:fs/promises";

package/dist/{call-DHZ76BNg.js → call-B4lhqS6H.js}

@@ -1,10 +1,10 @@
 import { n as __exportAll } from "./chunk-BXK9XSlF.js";
 import { $ as resolveStateDir, G as resolveConfigPath, Y as resolveGatewayPort } from "./entry.js";
 import { s as ensureDir, t as CONFIG_DIR, x as shortenHomeInString, y as resolveUserPath } from "./utils-D1VGbO3C.js";
-import { i as loadConfig } from "./config-Ofh9gKvs.js";
-import { Dt as PROTOCOL_VERSION, Ft as normalizeFingerprint, Lt as loadOrCreateDeviceIdentity, t as GatewayClient } from "./client-DzIcZx4J.js";
+import { i as loadConfig } from "./config-BrVuTQ8R.js";
+import { Dt as PROTOCOL_VERSION, Ft as normalizeFingerprint, Lt as loadOrCreateDeviceIdentity, t as GatewayClient } from "./client-CfLiulzK.js";
 import { t as pickPrimaryTailnetIPv4 } from "./tailnet-DpzsRR75.js";
-import { h as GATEWAY_CLIENT_NAMES, m as GATEWAY_CLIENT_MODES } from "./message-channel-DdOBO6Qm.js";
+import { h as GATEWAY_CLIENT_NAMES, m as GATEWAY_CLIENT_MODES } from "./message-channel-DIHHKJhk.js";
 import { s as pickPrimaryLanIPv4 } from "./net-CRsiP49R.js";
 import { execFile } from "node:child_process";
 import path from "node:path";

package/dist/{call-DQjoz63V.js → call-CDPbPDAr.js}

@@ -1,11 +1,11 @@
 import { n as __exportAll } from "./chunk-BXK9XSlF.js";
 import { m as resolveStateDir, o as resolveConfigPath, u as resolveGatewayPort } from "./paths-zhVksOvm.js";
-import { S as shortenHomeInString, b as resolveUserPath, c as ensureDir, t as CONFIG_DIR } from "./utils-B60lF9Wq.js";
-import { i as loadConfig } from "./config-DqwH4y-D.js";
+import { S as shortenHomeInString, b as resolveUserPath, c as ensureDir, t as CONFIG_DIR } from "./utils-CLYlhJuc.js";
+import { i as loadConfig } from "./config-DaD4FsAn.js";
 import { t as pickPrimaryTailnetIPv4 } from "./tailnet-Bg_vE5qi.js";
 import { c as pickPrimaryLanIPv4 } from "./ws-BapRHqfx.js";
-import { h as GATEWAY_CLIENT_NAMES, m as GATEWAY_CLIENT_MODES } from "./message-channel-DZYYDt1_.js";
-import { Dt as PROTOCOL_VERSION, Ft as normalizeFingerprint, Lt as loadOrCreateDeviceIdentity, t as GatewayClient } from "./client-D9E5Wwb_.js";
+import { h as GATEWAY_CLIENT_NAMES, m as GATEWAY_CLIENT_MODES } from "./message-channel-CMsexA3K.js";
+import { Dt as PROTOCOL_VERSION, Ft as normalizeFingerprint, Lt as loadOrCreateDeviceIdentity, t as GatewayClient } from "./client-BWkoTfOH.js";
 import path from "node:path";
 import fs from "node:fs/promises";
 import { execFile } from "node:child_process";

package/dist/canvas-host/a2ui/.bundle.hash

@@ -1 +1 @@
-25166e70f0c0e4dc7c77d538436b45f380b22c694e04abe34c4702bf5c2edf89
+3bd26fe09baca58fab8e6e62bd9e0be09fc12a2108626bc59ef9105a75e60271