@noxsoft/anima 5.1.2 → 6.0.0

package/dist/{acp-cli-ynoZZhYQ.js → acp-cli-CWgqDQQH.js}

@@ -2,15 +2,15 @@ import { N as theme, g as defaultRuntime } from "./entry.js";
 import "./utils-D1VGbO3C.js";
 import "./exec-BtBJICHE.js";
 import "./agent-scope-Dm8IL1Ks.js";
-import "./model-selection-DFbDH9o2.js";
+import "./model-selection-DcO3qJOu.js";
 import "./manifest-registry-W_OfCIRP.js";
-import { M as VERSION, i as loadConfig } from "./config-Ofh9gKvs.js";
+import { M as VERSION, i as loadConfig } from "./config-BrVuTQ8R.js";
 import "./shell-env-2QqHvBMl.js";
-import { t as GatewayClient } from "./client-DzIcZx4J.js";
-import { t as buildGatewayConnectionDetails } from "./call-DHZ76BNg.js";
-import { h as GATEWAY_CLIENT_NAMES, m as GATEWAY_CLIENT_MODES } from "./message-channel-DdOBO6Qm.js";
+import { t as GatewayClient } from "./client-CfLiulzK.js";
+import { t as buildGatewayConnectionDetails } from "./call-B4lhqS6H.js";
+import { h as GATEWAY_CLIENT_NAMES, m as GATEWAY_CLIENT_MODES } from "./message-channel-DIHHKJhk.js";
 import { i as resolveGatewayAuth } from "./auth-Cp__MMeO.js";
-import { t as formatDocsLink } from "./links-3c7gzW-G.js";
+import { t as formatDocsLink } from "./links-BjjDMNIq.js";
 import { t as ensureAnimaCliOnPath } from "./path-env-CafGfJPa.js";
 import { t as DANGEROUS_ACP_TOOLS } from "./dangerous-tools-Asx2qyrG.js";
 import { t as isMainModule } from "./is-main-Db59BkG-.js";

package/dist/{acp-cli-BFAoKBvs.js → acp-cli-D0wfP8-l.js}

@@ -1,21 +1,21 @@
 import "./paths-zhVksOvm.js";
-import { V as theme, d as defaultRuntime } from "./subsystem-BMsbqSb4.js";
-import "./utils-B60lF9Wq.js";
-import "./exec-cazBMA02.js";
-import "./agent-scope-D3HZp64M.js";
-import "./model-selection-wCaVeFbb.js";
-import { M as VERSION, i as loadConfig } from "./config-DqwH4y-D.js";
+import { V as theme, d as defaultRuntime } from "./subsystem-BAADN1B8.js";
+import "./utils-CLYlhJuc.js";
+import "./exec-BylR5qWS.js";
+import "./agent-scope-CXxC8FFX.js";
+import "./model-selection-CY6r_3wt.js";
+import { M as VERSION, i as loadConfig } from "./config-DaD4FsAn.js";
 import "./boolean-B8-BqKGQ.js";
-import "./env-DVJCc7dM.js";
-import "./shell-env-PnmcBTp4.js";
-import "./manifest-registry-D-DOtLzo.js";
-import { i as resolveGatewayAuth } from "./auth-DXrALxdm.js";
-import { h as GATEWAY_CLIENT_NAMES, m as GATEWAY_CLIENT_MODES } from "./message-channel-DZYYDt1_.js";
-import { t as GatewayClient } from "./client-D9E5Wwb_.js";
-import { t as buildGatewayConnectionDetails } from "./call-DQjoz63V.js";
-import { t as formatDocsLink } from "./links-OhvsEkVw.js";
-import { t as isMainModule } from "./is-main-BnikY3ud.js";
-import { t as ensureAnimaCliOnPath } from "./path-env-CjpH-KWH.js";
+import "./env-DlTia1B4.js";
+import "./shell-env-iPnSIi-t.js";
+import "./manifest-registry-qF960vMH.js";
+import { i as resolveGatewayAuth } from "./auth-DsC5pZ_0.js";
+import { h as GATEWAY_CLIENT_NAMES, m as GATEWAY_CLIENT_MODES } from "./message-channel-CMsexA3K.js";
+import { t as GatewayClient } from "./client-BWkoTfOH.js";
+import { t as buildGatewayConnectionDetails } from "./call-CDPbPDAr.js";
+import { t as formatDocsLink } from "./links-DcilUrqq.js";
+import { t as isMainModule } from "./is-main-H-hpHkdq.js";
+import { t as ensureAnimaCliOnPath } from "./path-env-DLQPf9qj.js";
 import { t as DANGEROUS_ACP_TOOLS } from "./dangerous-tools-BCnOEYau.js";
 import { fileURLToPath } from "node:url";
 import fs from "node:fs";

package/dist/{active-listener-BWPgtTZp.js → active-listener-BKtsWhsb.js}

@@ -1,8 +1,8 @@
-import { _ as logVerbose, b as shouldLogVerbose, j as STATE_DIR } from "./subsystem-CucjNlOk.js";
-import { j as normalizeAccountId, w as DEFAULT_ACCOUNT_ID } from "./agent-scope-C9CiVcmh.js";
-import { c as logWarn, w as resolveUserPath } from "./exec-gKbUce2p.js";
+import { _ as logVerbose, b as shouldLogVerbose, j as STATE_DIR } from "./subsystem-D-Xta-sj.js";
+import { j as normalizeAccountId, w as DEFAULT_ACCOUNT_ID } from "./agent-scope-ByIGrCTT.js";
+import { c as logWarn, w as resolveUserPath } from "./exec-C6tXfeqA.js";
 import { t as formatCliCommand } from "./command-format-CsqJApTg.js";
-import { A as extensionForMime, B as createPinnedDispatcher, D as optimizeImageToPng, E as hasAlphaChannel, I as maxBytesForKind, L as mediaKindFromMime, O as resizeToJpeg, R as SsrFBlockedError, U as resolvePinnedHostnameWithPolicy, f as normalizeChannelId, k as detectMime, w as convertHeicToJpeg, z as closeDispatcher } from "./chunk-DFqo_u5A.js";
+import { A as extensionForMime, B as createPinnedDispatcher, D as optimizeImageToPng, E as hasAlphaChannel, I as maxBytesForKind, L as mediaKindFromMime, O as resizeToJpeg, R as SsrFBlockedError, U as resolvePinnedHostnameWithPolicy, f as normalizeChannelId, k as detectMime, w as convertHeicToJpeg, z as closeDispatcher } from "./chunk-DJXDX69U.js";
 import path from "node:path";
 import os from "node:os";
 import fs from "node:fs/promises";

package/dist/{active-listener-GJR3nLhX.js → active-listener-D2r8IO7g.js}

@@ -1,9 +1,9 @@
-import { t as STATE_DIR } from "./paths-D2eokayo.js";
-import { C as normalizeAccountId, g as DEFAULT_ACCOUNT_ID } from "./workspace-BQkffCaR.js";
-import { v as logVerbose, x as shouldLogVerbose } from "./subsystem-DA3Cno1i.js";
-import { c as logWarn, w as resolveUserPath } from "./exec-Bfd4ztFZ.js";
+import { t as STATE_DIR } from "./paths-B-AkG5FD.js";
+import { C as normalizeAccountId, g as DEFAULT_ACCOUNT_ID } from "./workspace-BFIZCnGo.js";
+import { v as logVerbose, x as shouldLogVerbose } from "./subsystem-D1AJZPgG.js";
+import { c as logWarn, w as resolveUserPath } from "./exec-DUzVF5_D.js";
 import { t as formatCliCommand } from "./command-format-GLYKXXl-.js";
-import { A as detectMime, B as closeDispatcher, D as hasAlphaChannel, L as maxBytesForKind, O as optimizeImageToPng, R as mediaKindFromMime, T as convertHeicToJpeg, V as createPinnedDispatcher, W as resolvePinnedHostnameWithPolicy, f as normalizeChannelId, j as extensionForMime, k as resizeToJpeg, z as SsrFBlockedError } from "./chunk-CyT-_QsQ.js";
+import { A as detectMime, B as closeDispatcher, D as hasAlphaChannel, L as maxBytesForKind, O as optimizeImageToPng, R as mediaKindFromMime, T as convertHeicToJpeg, V as createPinnedDispatcher, W as resolvePinnedHostnameWithPolicy, f as normalizeChannelId, j as extensionForMime, k as resizeToJpeg, z as SsrFBlockedError } from "./chunk-B4Kx-ocg.js";
 import fs from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";

package/dist/{agent-DUAarfNl.js → agent-CnS0SRpT.js}

@@ -1,47 +1,23 @@
 import { g as defaultRuntime, rt as DEFAULT_CHAT_CHANNEL } from "./entry.js";
-import { l as ensureAuthProfileStore } from "./auth-profiles-BF5x9Ej0.js";
+import { p as ensureAuthProfileStore } from "./auth-profiles-Brxz2ojJ.js";
 import { t as formatCliCommand } from "./command-format-kLw3YIIu.js";
-import { d as resolveAgentIdFromSessionKey, l as normalizeAgentId, u as normalizeMainKey } from "./session-key-DP2WHl90.js";
-import { a as resolveAgentModelPrimary, i as resolveAgentModelFallbacksOverride, o as resolveAgentSkillsFilter, r as resolveAgentDir, s as resolveAgentWorkspaceDir, t as listAgentIds, x as ensureAgentWorkspace } from "./agent-scope-Dm8IL1Ks.js";
-import { _ as DEFAULT_MODEL, a as isCliProvider, d as resolveConfiguredModelRef, g as DEFAULT_CONTEXT_TOKENS, h as resolveThinkingDefault, o as modelKey, s as normalizeModelRef, t as buildAllowedModelSet, v as DEFAULT_PROVIDER } from "./model-selection-DFbDH9o2.js";
+import { d as resolveAgentIdFromSessionKey, l as normalizeAgentId } from "./session-key-DP2WHl90.js";
+import { i as resolveAgentModelFallbacksOverride, o as resolveAgentSkillsFilter, r as resolveAgentDir, s as resolveAgentWorkspaceDir, t as listAgentIds, x as ensureAgentWorkspace } from "./agent-scope-Dm8IL1Ks.js";
+import { a as isCliProvider, g as DEFAULT_CONTEXT_TOKENS, h as resolveThinkingDefault } from "./model-selection-DcO3qJOu.js";
 import { r as buildWorkspaceSkillSnapshot } from "./skills-DtoVe1dS.js";
-import { i as loadConfig } from "./config-Ofh9gKvs.js";
-import { a as isInternalMessageChannel, d as resolveMessageChannel, i as isGatewayMessageChannel, l as normalizeMessageChannel, n as isDeliverableMessageChannel, t as INTERNAL_MESSAGE_CHANNEL } from "./message-channel-DdOBO6Qm.js";
-import { An as clearSessionAuthProfileOverride, Cr as runCliAgent, D as setCliSessionId, E as getCliSessionId, Er as emitAgentEvent, Mn as applyVerboseOverride, Nt as AGENT_LANE_NESTED, On as getSkillsSnapshotVersion, Pt as AGENT_LANE_SUBAGENT, Rn as loadModelCatalog, Tr as clearAgentRunContext, c as runEmbeddedPiAgent, jn as applyModelOverrideToSessionEntry, kr as registerAgentRunContext, nr as resolveAgentTimeoutMs, on as resolveSendPolicy, ot as resolveOutboundTarget, sn as getRemoteSkillEligibility, st as resolveSessionDeliveryTarget, ut as runWithModelFallback } from "./subagent-registry-MZIxVf8W.js";
-import { L as normalizeAccountId, d as resolveSessionKey, f as evaluateSessionFreshness, h as resolveSessionResetType, i as loadSessionStore, l as updateSessionStore, m as resolveSessionResetPolicy, p as resolveChannelResetConfig, x as resolveExplicitAgentSessionKey } from "./sessions-1XK2mH6L.js";
+import { i as loadConfig } from "./config-BrVuTQ8R.js";
+import { a as isInternalMessageChannel, d as resolveMessageChannel, i as isGatewayMessageChannel, l as normalizeMessageChannel, n as isDeliverableMessageChannel, t as INTERNAL_MESSAGE_CHANNEL } from "./message-channel-DIHHKJhk.js";
+import { Bt as AGENT_LANE_SUBAGENT, D as setCliSessionId, E as getCliSessionId, Er as emitAgentEvent, Mn as applyModelOverrideToSessionEntry, Nn as applyVerboseOverride, Tr as clearAgentRunContext, ct as resolveSessionDeliveryTarget, fn as resolveSendPolicy, jn as clearSessionAuthProfileOverride, kn as getSkillsSnapshotVersion, kr as registerAgentRunContext, l as runNoxSoftEmbeddedAgent, pn as getRemoteSkillEligibility, pt as runWithModelFallback, rr as resolveAgentTimeoutMs, st as resolveOutboundTarget, zn as loadModelCatalog, zt as AGENT_LANE_NESTED } from "./subagent-registry-CPtElVX0.js";
+import { L as normalizeAccountId, l as updateSessionStore } from "./sessions-C_3wTmSA.js";
 import { d as supportsXHighThinking, l as normalizeVerboseLevel, n as formatXHighModelHint, s as normalizeThinkLevel, t as formatThinkingLevels } from "./pi-embedded-helpers-D2SLlgS4.js";
 import { r as normalizeChannelId, t as getChannelPlugin } from "./plugins-BOMS6J5A.js";
-import { c as resolveStorePath, n as resolveSessionFilePath } from "./paths-DMk3Q7yD.js";
-import { a as normalizeOutboundPayloadsForJson, i as normalizeOutboundPayloads, r as formatOutboundPayloadLog, t as deliverOutboundPayloads } from "./deliver-DVt8TbK9.js";
-import { t as lookupContextTokens } from "./context-CpsnZLOp.js";
+import { n as resolveSessionFilePath } from "./paths-DMk3Q7yD.js";
+import { a as normalizeOutboundPayloadsForJson, i as normalizeOutboundPayloads, r as formatOutboundPayloadLog, t as deliverOutboundPayloads } from "./deliver-C1L5nO0K.js";
+import { t as lookupContextTokens } from "./context-B5X720Bs.js";
 import { l as deriveSessionTotalTokens, u as hasNonzeroUsage } from "./session-cost-usage-DnxtnK1E.js";
-import crypto from "node:crypto";
+import { n as createDefaultDeps, t as createOutboundSendDeps } from "./outbound-send-deps-T_FgdfgW.js";
+import { r as resolveAgentModelSelection, t as resolveSession } from "./session-C7IGnhd1.js";
 
-//#region src/cli/deps.ts
-function createDefaultDeps() {
-	return { sendMessageWhatsApp: async (...args) => {
-		const { sendMessageWhatsApp } = await import("./web-DDAkSrtZ.js");
-		return await sendMessageWhatsApp(...args);
-	} };
-}
-function createOutboundSendDeps$1(deps) {
-	return { sendWhatsApp: deps.sendMessageWhatsApp };
-}
-
-//#endregion
-//#region src/cli/outbound-send-deps.ts
-function createOutboundSendDeps(deps) {
-	return {
-		sendWhatsApp: deps.sendMessageWhatsApp,
-		sendTelegram: deps.sendMessageTelegram,
-		sendDiscord: deps.sendMessageDiscord,
-		sendSlack: deps.sendMessageSlack,
-		sendSignal: deps.sendMessageSignal,
-		sendIMessage: deps.sendMessageIMessage
-	};
-}
-
-//#endregion
 //#region src/infra/outbound/agent-delivery.ts
 function resolveAgentDeliveryPlan(params) {
 	const requestedRaw = typeof params.requestedChannel === "string" ? params.requestedChannel.trim() : "";
@@ -259,11 +235,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;
@@ -283,7 +263,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;
@@ -304,81 +284,6 @@ async function updateSessionStoreAfterAgentRun(params) {
 	});
 }
 
-//#endregion
-//#region src/commands/agent/session.ts
-function resolveSessionKeyForRequest(opts) {
-	const sessionCfg = opts.cfg.session;
-	const scope = sessionCfg?.scope ?? "per-sender";
-	const mainKey = normalizeMainKey(sessionCfg?.mainKey);
-	const explicitSessionKey = opts.sessionKey?.trim() || resolveExplicitAgentSessionKey({
-		cfg: opts.cfg,
-		agentId: opts.agentId
-	});
-	const storeAgentId = resolveAgentIdFromSessionKey(explicitSessionKey);
-	const storePath = resolveStorePath(sessionCfg?.store, { agentId: storeAgentId });
-	const sessionStore = loadSessionStore(storePath);
-	const ctx = opts.to?.trim() ? { From: opts.to } : void 0;
-	let sessionKey = explicitSessionKey ?? (ctx ? resolveSessionKey(scope, ctx, mainKey) : void 0);
-	if (!explicitSessionKey && opts.sessionId && (!sessionKey || sessionStore[sessionKey]?.sessionId !== opts.sessionId)) {
-		const foundKey = Object.keys(sessionStore).find((key) => sessionStore[key]?.sessionId === opts.sessionId);
-		if (foundKey) sessionKey = foundKey;
-	}
-	if (opts.sessionId && !explicitSessionKey && (!sessionKey || sessionStore[sessionKey]?.sessionId !== opts.sessionId)) {
-		const allAgentIds = listAgentIds(opts.cfg);
-		for (const agentId of allAgentIds) {
-			if (agentId === storeAgentId) continue;
-			const altStorePath = resolveStorePath(sessionCfg?.store, { agentId });
-			const altStore = loadSessionStore(altStorePath);
-			const foundKey = Object.keys(altStore).find((key) => altStore[key]?.sessionId === opts.sessionId);
-			if (foundKey) return {
-				sessionKey: foundKey,
-				sessionStore: altStore,
-				storePath: altStorePath
-			};
-		}
-	}
-	return {
-		sessionKey,
-		sessionStore,
-		storePath
-	};
-}
-function resolveSession(opts) {
-	const sessionCfg = opts.cfg.session;
-	const { sessionKey, sessionStore, storePath } = resolveSessionKeyForRequest({
-		cfg: opts.cfg,
-		to: opts.to,
-		sessionId: opts.sessionId,
-		sessionKey: opts.sessionKey,
-		agentId: opts.agentId
-	});
-	const now = Date.now();
-	const sessionEntry = sessionKey ? sessionStore[sessionKey] : void 0;
-	const resetPolicy = resolveSessionResetPolicy({
-		sessionCfg,
-		resetType: resolveSessionResetType({ sessionKey }),
-		resetOverride: resolveChannelResetConfig({
-			sessionCfg,
-			channel: sessionEntry?.lastChannel ?? sessionEntry?.channel
-		})
-	});
-	const fresh = sessionEntry ? evaluateSessionFreshness({
-		updatedAt: sessionEntry.updatedAt,
-		now,
-		policy: resetPolicy
-	}).fresh : false;
-	return {
-		sessionId: opts.sessionId?.trim() || (fresh ? sessionEntry?.sessionId : void 0) || crypto.randomUUID(),
-		sessionKey,
-		sessionEntry,
-		sessionStore,
-		storePath,
-		isNewSession: !fresh && !opts.sessionId,
-		persistedThinking: fresh && sessionEntry?.thinkingLevel ? normalizeThinkLevel(sessionEntry.thinkingLevel) : void 0,
-		persistedVerbose: fresh && sessionEntry?.verboseLevel ? normalizeVerboseLevel(sessionEntry.verboseLevel) : void 0
-	};
-}
-
 //#endregion
 //#region src/commands/agent.ts
 async function agentCommand(opts, runtime = defaultRuntime, deps = createDefaultDeps()) {
@@ -386,6 +291,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) {
@@ -403,18 +310,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)");
@@ -431,6 +326,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({
@@ -472,93 +379,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) {
@@ -577,8 +426,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;
 			}
@@ -602,6 +451,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;
@@ -613,41 +487,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,
@@ -679,6 +534,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,
@@ -701,7 +558,7 @@ async function agentCommand(opts, runtime = defaultRuntime, deps = createDefault
 					phase: "end",
 					startedAt,
 					endedAt: Date.now(),
-					aborted: result.meta.aborted ?? false
+					aborted: false
 				}
 			});
 		} catch (err) {
@@ -746,4 +603,4 @@ async function agentCommand(opts, runtime = defaultRuntime, deps = createDefault
 }
 
 //#endregion
-export { createOutboundSendDeps as a, resolveAgentOutboundTarget as i, resolveSessionKeyForRequest as n, createDefaultDeps as o, resolveAgentDeliveryPlan as r, createOutboundSendDeps$1 as s, agentCommand as t };
+export { resolveAgentDeliveryPlan as n, resolveAgentOutboundTarget as r, agentCommand as t };