@gguf/claw 2026.2.4 → 2026.2.5

package/dist/{tui-cV-R-JXi.js → tui-DPorsF4z.js}

@@ -1,14 +1,16 @@
-import { I as listThinkingLevelLabels, P as formatThinkingLevels, U as resolveResponseUsageMode, V as normalizeUsageDisplay } from "./pi-embedded-helpers-CC00lEFI.js";
-import { u as resolveGatewayPort } from "./paths-BDd7_JUB.js";
-import { H as parseAgentSessionKey, N as normalizeAgentId, P as normalizeMainKey, c as resolveDefaultAgentId, k as buildAgentMainSessionKey } from "./agent-scope-CrgUOY3f.js";
-import { s as visibleWidth } from "./subsystem-46MXi6Ip.js";
-import { M as VERSION, r as loadConfig } from "./config-qgIz1lbh.js";
-import { m as GATEWAY_CLIENT_NAMES, p as GATEWAY_CLIENT_MODES } from "./message-channel-CQGWXVL4.js";
-import { n as resolveToolDisplay, t as formatToolDetail } from "./tool-display-rIUh61kT.js";
-import { a as extractContentFromMessage, c as formatContextUsageLine, d as resolveFinalAssistantText, i as composeThinkingAndContent, l as formatTokens, n as formatAge, o as extractTextFromMessage, p as formatTokenCount, r as asString, s as extractThinkingFromMessage, u as isCommandMessage, v as listChatCommands, y as listChatCommandsForConfig } from "./channel-summary-C8GoEKgH.js";
-import { St as PROTOCOL_VERSION, t as GatewayClient } from "./client-zqMhLTAX.js";
-import chalk from "chalk";
+import { W as resolveGatewayPort, f as visibleWidth } from "./entry.js";
+import { _ as parseAgentSessionKey, c as normalizeAgentId, i as buildAgentMainSessionKey, l as normalizeMainKey } from "./session-key-CZkcvAtx.js";
+import { c as resolveDefaultAgentId } from "./agent-scope-C9VjJXEK.js";
+import { i as loadConfig, j as VERSION } from "./config-CKLedg5Y.js";
+import { Ct as PROTOCOL_VERSION, t as GatewayClient } from "./client-CxbkcEZ7.js";
+import { a as resolveExplicitGatewayAuth, r as ensureExplicitGatewayAuth } from "./call-90HgQQ8o.js";
+import { f as GATEWAY_CLIENT_CAPS, h as GATEWAY_CLIENT_NAMES, m as GATEWAY_CLIENT_MODES } from "./message-channel-BlgPSDAh.js";
+import { I as listThinkingLevelLabels, P as formatThinkingLevels, U as resolveResponseUsageMode, V as normalizeUsageDisplay } from "./pi-embedded-helpers-DF8SAHU-.js";
+import { a as extractContentFromMessage, c as formatContextUsageLine, d as resolveFinalAssistantText, h as listChatCommandsForConfig, i as composeThinkingAndContent, l as formatTokens, m as listChatCommands, n as formatAge, o as extractTextFromMessage, r as asString, s as extractThinkingFromMessage, u as isCommandMessage } from "./channel-summary-D9nzC5WB.js";
+import { n as resolveToolDisplay, t as formatToolDetail } from "./tool-display-DmgKs6-V.js";
+import { n as formatTokenCount } from "./usage-format-E3bMcUMV.js";
 import { spawn } from "node:child_process";
+import chalk from "chalk";
 import { randomUUID } from "node:crypto";
 import { Box, CombinedAutocompleteProvider, Container, Editor, Input, Key, Loader, Markdown, ProcessTerminal, SelectList, SettingsList, Spacer, TUI, Text, getEditorKeybindings, isKeyRelease, matchesKey, truncateToWidth } from "@mariozechner/pi-tui";
 import { highlight, supportsLanguage } from "cli-highlight";
@@ -625,6 +627,7 @@ var GatewayChatClient = class {
 			clientVersion: VERSION,
 			platform: process.platform,
 			mode: GATEWAY_CLIENT_MODES.UI,
+			caps: [GATEWAY_CLIENT_CAPS.TOOL_EVENTS],
 			instanceId: randomUUID(),
 			minProtocol: PROTOCOL_VERSION,
 			maxProtocol: PROTOCOL_VERSION,
@@ -658,7 +661,7 @@ var GatewayChatClient = class {
 		await this.readyPromise;
 	}
 	async sendChat(opts) {
-		const runId = randomUUID();
+		const runId = opts.runId ?? randomUUID();
 		await this.client.request("chat.send", {
 			sessionKey: opts.sessionKey,
 			message: opts.message,
@@ -715,10 +718,20 @@ function resolveGatewayConnection(opts) {
 	const remote = isRemoteMode ? config.gateway?.remote : void 0;
 	const authToken = config.gateway?.auth?.token;
 	const localPort = resolveGatewayPort(config);
+	const urlOverride = typeof opts.url === "string" && opts.url.trim().length > 0 ? opts.url.trim() : void 0;
+	const explicitAuth = resolveExplicitGatewayAuth({
+		token: opts.token,
+		password: opts.password
+	});
+	ensureExplicitGatewayAuth({
+		urlOverride,
+		auth: explicitAuth,
+		errorHint: "Fix: pass --token or --password when using --url."
+	});
 	return {
-		url: (typeof opts.url === "string" && opts.url.trim().length > 0 ? opts.url.trim() : void 0) || (typeof remote?.url === "string" && remote.url.trim().length > 0 ? remote.url.trim() : void 0) || `ws://127.0.0.1:${localPort}`,
-		token: (typeof opts.token === "string" && opts.token.trim().length > 0 ? opts.token.trim() : void 0) || (isRemoteMode ? typeof remote?.token === "string" && remote.token.trim().length > 0 ? remote.token.trim() : void 0 : process.env.OPENCLAW_GATEWAY_TOKEN?.trim() || (typeof authToken === "string" && authToken.trim().length > 0 ? authToken.trim() : void 0)),
-		password: (typeof opts.password === "string" && opts.password.trim().length > 0 ? opts.password.trim() : void 0) || process.env.OPENCLAW_GATEWAY_PASSWORD?.trim() || (typeof remote?.password === "string" && remote.password.trim().length > 0 ? remote.password.trim() : void 0)
+		url: urlOverride || (typeof remote?.url === "string" && remote.url.trim().length > 0 ? remote.url.trim() : void 0) || `ws://127.0.0.1:${localPort}`,
+		token: explicitAuth.token || (!urlOverride ? isRemoteMode ? typeof remote?.token === "string" && remote.token.trim().length > 0 ? remote.token.trim() : void 0 : process.env.OPENCLAW_GATEWAY_TOKEN?.trim() || (typeof authToken === "string" && authToken.trim().length > 0 ? authToken.trim() : void 0) : void 0),
+		password: explicitAuth.password || (!urlOverride ? process.env.OPENCLAW_GATEWAY_PASSWORD?.trim() || (typeof remote?.password === "string" && remote.password.trim().length > 0 ? remote.password.trim() : void 0) : void 0)
 	};
 }
 
@@ -1181,7 +1194,7 @@ function formatStatusSummary(summary) {
 //#endregion
 //#region src/tui/tui-command-handlers.ts
 function createCommandHandlers(context) {
-	const { client, chatLog, tui, opts, state, deliverDefault, openOverlay, closeOverlay, refreshSessionInfo, loadHistory, setSession, refreshAgents, abortActive, setActivityStatus, formatSessionKey } = context;
+	const { client, chatLog, tui, opts, state, deliverDefault, openOverlay, closeOverlay, refreshSessionInfo, loadHistory, setSession, refreshAgents, abortActive, setActivityStatus, formatSessionKey, applySessionInfoFromPatch, noteLocalRunId, forgetLocalRunId } = context;
 	const setAgent = async (id) => {
 		state.currentAgentId = normalizeAgentId(id);
 		await setSession("");
@@ -1202,11 +1215,12 @@ function createCommandHandlers(context) {
 			selector.onSelect = (item) => {
 				(async () => {
 					try {
-						await client.patchSession({
+						const result = await client.patchSession({
 							key: state.currentSessionKey,
 							model: item.value
 						});
 						chatLog.addSystem(`model set to ${item.value}`);
+						applySessionInfoFromPatch(result);
 						await refreshSessionInfo();
 					} catch (err) {
 						chatLog.addSystem(`model set failed: ${String(err)}`);
@@ -1370,11 +1384,12 @@ function createCommandHandlers(context) {
 			case "model":
 				if (!args) await openModelSelector();
 				else try {
-					await client.patchSession({
+					const result = await client.patchSession({
 						key: state.currentSessionKey,
 						model: args
 					});
 					chatLog.addSystem(`model set to ${args}`);
+					applySessionInfoFromPatch(result);
 					await refreshSessionInfo();
 				} catch (err) {
 					chatLog.addSystem(`model set failed: ${String(err)}`);
@@ -1390,11 +1405,12 @@ function createCommandHandlers(context) {
 					break;
 				}
 				try {
-					await client.patchSession({
+					const result = await client.patchSession({
 						key: state.currentSessionKey,
 						thinkingLevel: args
 					});
 					chatLog.addSystem(`thinking set to ${args}`);
+					applySessionInfoFromPatch(result);
 					await refreshSessionInfo();
 				} catch (err) {
 					chatLog.addSystem(`think failed: ${String(err)}`);
@@ -1406,12 +1422,13 @@ function createCommandHandlers(context) {
 					break;
 				}
 				try {
-					await client.patchSession({
+					const result = await client.patchSession({
 						key: state.currentSessionKey,
 						verboseLevel: args
 					});
 					chatLog.addSystem(`verbose set to ${args}`);
-					await refreshSessionInfo();
+					applySessionInfoFromPatch(result);
+					await loadHistory();
 				} catch (err) {
 					chatLog.addSystem(`verbose failed: ${String(err)}`);
 				}
@@ -1422,11 +1439,12 @@ function createCommandHandlers(context) {
 					break;
 				}
 				try {
-					await client.patchSession({
+					const result = await client.patchSession({
 						key: state.currentSessionKey,
 						reasoningLevel: args
 					});
 					chatLog.addSystem(`reasoning set to ${args}`);
+					applySessionInfoFromPatch(result);
 					await refreshSessionInfo();
 				} catch (err) {
 					chatLog.addSystem(`reasoning failed: ${String(err)}`);
@@ -1442,11 +1460,12 @@ function createCommandHandlers(context) {
 				const current = resolveResponseUsageMode(currentRaw);
 				const next = normalized ?? (current === "off" ? "tokens" : current === "tokens" ? "full" : "off");
 				try {
-					await client.patchSession({
+					const result = await client.patchSession({
 						key: state.currentSessionKey,
 						responseUsage: next === "off" ? null : next
 					});
 					chatLog.addSystem(`usage footer: ${next}`);
+					applySessionInfoFromPatch(result);
 					await refreshSessionInfo();
 				} catch (err) {
 					chatLog.addSystem(`usage failed: ${String(err)}`);
@@ -1468,11 +1487,12 @@ function createCommandHandlers(context) {
 					break;
 				}
 				try {
-					await client.patchSession({
+					const result = await client.patchSession({
 						key: state.currentSessionKey,
 						elevatedLevel: args
 					});
 					chatLog.addSystem(`elevated set to ${args}`);
+					applySessionInfoFromPatch(result);
 					await refreshSessionInfo();
 				} catch (err) {
 					chatLog.addSystem(`elevated failed: ${String(err)}`);
@@ -1484,11 +1504,12 @@ function createCommandHandlers(context) {
 					break;
 				}
 				try {
-					await client.patchSession({
+					const result = await client.patchSession({
 						key: state.currentSessionKey,
 						groupActivation: args === "always" ? "always" : "mention"
 					});
 					chatLog.addSystem(`activation set to ${args}`);
+					applySessionInfoFromPatch(result);
 					await refreshSessionInfo();
 				} catch (err) {
 					chatLog.addSystem(`activation failed: ${String(err)}`);
@@ -1530,17 +1551,22 @@ function createCommandHandlers(context) {
 		try {
 			chatLog.addUser(text);
 			tui.requestRender();
+			const runId = randomUUID();
+			noteLocalRunId(runId);
+			state.activeChatRunId = runId;
 			setActivityStatus("sending");
-			const { runId } = await client.sendChat({
+			await client.sendChat({
 				sessionKey: state.currentSessionKey,
 				message: text,
 				thinking: opts.thinking,
 				deliver: deliverDefault,
-				timeoutMs: opts.timeoutMs
+				timeoutMs: opts.timeoutMs,
+				runId
 			});
-			state.activeChatRunId = runId;
 			setActivityStatus("waiting");
 		} catch (err) {
+			if (state.activeChatRunId) forgetLocalRunId?.(state.activeChatRunId);
+			state.activeChatRunId = null;
 			chatLog.addSystem(`send failed: ${String(err)}`);
 			setActivityStatus("error");
 		}
@@ -1612,7 +1638,7 @@ var TuiStreamAssembler = class {
 //#endregion
 //#region src/tui/tui-event-handlers.ts
 function createEventHandlers(context) {
-	const { chatLog, tui, state, setActivityStatus, refreshSessionInfo } = context;
+	const { chatLog, tui, state, setActivityStatus, refreshSessionInfo, loadHistory, isLocalRunId, forgetLocalRunId, clearLocalRunIds } = context;
 	const finalizedRuns = /* @__PURE__ */ new Map();
 	const sessionRuns = /* @__PURE__ */ new Map();
 	let streamAssembler = new TuiStreamAssembler();
@@ -1635,6 +1661,7 @@ function createEventHandlers(context) {
 		finalizedRuns.clear();
 		sessionRuns.clear();
 		streamAssembler = new TuiStreamAssembler();
+		clearLocalRunIds?.();
 	};
 	const noteSessionRun = (runId) => {
 		sessionRuns.set(runId, Date.now());
@@ -1665,6 +1692,8 @@ function createEventHandlers(context) {
 		}
 		if (evt.state === "final") {
 			if (isCommandMessage(evt.message)) {
+				if (isLocalRunId?.(evt.runId)) forgetLocalRunId?.(evt.runId);
+				else loadHistory?.();
 				const text = extractTextFromMessage(evt.message);
 				if (text) chatLog.addSystem(text);
 				streamAssembler.drop(evt.runId);
@@ -1675,6 +1704,8 @@ function createEventHandlers(context) {
 				tui.requestRender();
 				return;
 			}
+			if (isLocalRunId?.(evt.runId)) forgetLocalRunId?.(evt.runId);
+			else loadHistory?.();
 			const stopReason = evt.message && typeof evt.message === "object" && !Array.isArray(evt.message) ? typeof evt.message.stopReason === "string" ? evt.message.stopReason : "" : "";
 			const finalText = streamAssembler.finalize(evt.runId, evt.message, state.showThinking);
 			chatLog.finalizeAssistant(finalText, evt.runId);
@@ -1690,6 +1721,8 @@ function createEventHandlers(context) {
 			state.activeChatRunId = null;
 			setActivityStatus("aborted");
 			refreshSessionInfo?.();
+			if (isLocalRunId?.(evt.runId)) forgetLocalRunId?.(evt.runId);
+			else loadHistory?.();
 		}
 		if (evt.state === "error") {
 			chatLog.addSystem(`run error: ${evt.errorMessage ?? "unknown"}`);
@@ -1698,6 +1731,8 @@ function createEventHandlers(context) {
 			state.activeChatRunId = null;
 			setActivityStatus("error");
 			refreshSessionInfo?.();
+			if (isLocalRunId?.(evt.runId)) forgetLocalRunId?.(evt.runId);
+			else loadHistory?.();
 		}
 		tui.requestRender();
 	};
@@ -1706,16 +1741,23 @@ function createEventHandlers(context) {
 		const evt = payload;
 		syncSessionKey();
 		const isActiveRun = evt.runId === state.activeChatRunId;
-		if (!isActiveRun && !sessionRuns.has(evt.runId)) return;
+		if (!(isActiveRun || sessionRuns.has(evt.runId) || finalizedRuns.has(evt.runId))) return;
 		if (evt.stream === "tool") {
+			const verbose = state.sessionInfo.verboseLevel ?? "off";
+			const allowToolEvents = verbose !== "off";
+			const allowToolOutput = verbose === "full";
+			if (!allowToolEvents) return;
 			const data = evt.data ?? {};
 			const phase = asString(data.phase, "");
 			const toolCallId = asString(data.toolCallId, "");
 			const toolName = asString(data.name, "tool");
 			if (!toolCallId) return;
 			if (phase === "start") chatLog.startTool(toolCallId, toolName, data.args);
-			else if (phase === "update") chatLog.updateToolResult(toolCallId, data.partialResult, { partial: true });
-			else if (phase === "result") chatLog.updateToolResult(toolCallId, data.result, { isError: Boolean(data.isError) });
+			else if (phase === "update") {
+				if (!allowToolOutput) return;
+				chatLog.updateToolResult(toolCallId, data.partialResult, { partial: true });
+			} else if (phase === "result") if (allowToolOutput) chatLog.updateToolResult(toolCallId, data.result, { isError: Boolean(data.isError) });
+			else chatLog.updateToolResult(toolCallId, { content: [] }, { isError: Boolean(data.isError) });
 			tui.requestRender();
 			return;
 		}
@@ -1845,8 +1887,9 @@ function createOverlayHandlers(host, fallbackFocus) {
 //#endregion
 //#region src/tui/tui-session-actions.ts
 function createSessionActions(context) {
-	const { client, chatLog, tui, opts, state, agentNames, initialSessionInput, initialSessionAgentId, resolveSessionKey, updateHeader, updateFooter, updateAutocompleteProvider, setActivityStatus } = context;
-	let refreshSessionInfoPromise = null;
+	const { client, chatLog, tui, opts, state, agentNames, initialSessionInput, initialSessionAgentId, resolveSessionKey, updateHeader, updateFooter, updateAutocompleteProvider, setActivityStatus, clearLocalRunIds } = context;
+	let refreshSessionInfoPromise = Promise.resolve();
+	let lastSessionDefaults = null;
 	const applyAgentsResult = (result) => {
 		state.agentDefaultId = normalizeAgentId(result.defaultId);
 		state.sessionMainKey = normalizeMainKey(result.mainKey);
@@ -1881,46 +1924,102 @@ function createSessionActions(context) {
 		const next = normalizeAgentId(parsed.agentId);
 		if (next !== state.currentAgentId) state.currentAgentId = next;
 	};
-	const refreshSessionInfo = async () => {
-		if (refreshSessionInfoPromise) return refreshSessionInfoPromise;
-		refreshSessionInfoPromise = (async () => {
-			try {
-				const listAgentId = state.currentSessionKey === "global" || state.currentSessionKey === "unknown" ? void 0 : state.currentAgentId;
-				const result = await client.listSessions({
-					includeGlobal: false,
-					includeUnknown: false,
-					agentId: listAgentId
-				});
-				const entry = result.sessions.find((row) => {
-					if (row.key === state.currentSessionKey) return true;
-					return parseAgentSessionKey(row.key)?.rest === state.currentSessionKey;
-				});
-				state.sessionInfo = {
-					thinkingLevel: entry?.thinkingLevel,
-					verboseLevel: entry?.verboseLevel,
-					reasoningLevel: entry?.reasoningLevel,
-					model: entry?.model ?? result.defaults?.model ?? void 0,
-					modelProvider: entry?.modelProvider ?? result.defaults?.modelProvider ?? void 0,
-					contextTokens: entry?.contextTokens ?? result.defaults?.contextTokens,
-					inputTokens: entry?.inputTokens ?? null,
-					outputTokens: entry?.outputTokens ?? null,
-					totalTokens: entry?.totalTokens ?? null,
-					responseUsage: entry?.responseUsage,
-					updatedAt: entry?.updatedAt ?? null,
-					displayName: entry?.displayName
-				};
-			} catch (err) {
-				chatLog.addSystem(`sessions list failed: ${String(err)}`);
-			}
-			updateAutocompleteProvider();
-			updateFooter();
-			tui.requestRender();
-		})();
+	const resolveModelSelection = (entry) => {
+		if (entry?.modelProvider || entry?.model) return {
+			modelProvider: entry.modelProvider ?? state.sessionInfo.modelProvider,
+			model: entry.model ?? state.sessionInfo.model
+		};
+		const overrideModel = entry?.modelOverride?.trim();
+		if (overrideModel) return {
+			modelProvider: entry?.providerOverride?.trim() || state.sessionInfo.modelProvider,
+			model: overrideModel
+		};
+		return {
+			modelProvider: state.sessionInfo.modelProvider,
+			model: state.sessionInfo.model
+		};
+	};
+	const applySessionInfo = (params) => {
+		const entry = params.entry ?? void 0;
+		const defaults = params.defaults ?? lastSessionDefaults ?? void 0;
+		const previousDefaults = lastSessionDefaults;
+		const defaultsChanged = params.defaults ? previousDefaults?.model !== params.defaults.model || previousDefaults?.modelProvider !== params.defaults.modelProvider || previousDefaults?.contextTokens !== params.defaults.contextTokens : false;
+		if (params.defaults) lastSessionDefaults = params.defaults;
+		const entryUpdatedAt = entry?.updatedAt ?? null;
+		const currentUpdatedAt = state.sessionInfo.updatedAt ?? null;
+		const modelChanged = entry?.modelProvider !== void 0 && entry.modelProvider !== state.sessionInfo.modelProvider || entry?.model !== void 0 && entry.model !== state.sessionInfo.model;
+		if (!params.force && entryUpdatedAt !== null && currentUpdatedAt !== null && entryUpdatedAt < currentUpdatedAt && !defaultsChanged && !modelChanged) return;
+		const next = { ...state.sessionInfo };
+		if (entry?.thinkingLevel !== void 0) next.thinkingLevel = entry.thinkingLevel;
+		if (entry?.verboseLevel !== void 0) next.verboseLevel = entry.verboseLevel;
+		if (entry?.reasoningLevel !== void 0) next.reasoningLevel = entry.reasoningLevel;
+		if (entry?.responseUsage !== void 0) next.responseUsage = entry.responseUsage;
+		if (entry?.inputTokens !== void 0) next.inputTokens = entry.inputTokens;
+		if (entry?.outputTokens !== void 0) next.outputTokens = entry.outputTokens;
+		if (entry?.totalTokens !== void 0) next.totalTokens = entry.totalTokens;
+		if (entry?.contextTokens !== void 0 || defaults?.contextTokens !== void 0) next.contextTokens = entry?.contextTokens ?? defaults?.contextTokens ?? state.sessionInfo.contextTokens;
+		if (entry?.displayName !== void 0) next.displayName = entry.displayName;
+		if (entry?.updatedAt !== void 0) next.updatedAt = entry.updatedAt;
+		const selection = resolveModelSelection(entry);
+		if (selection.modelProvider !== void 0) next.modelProvider = selection.modelProvider;
+		if (selection.model !== void 0) next.model = selection.model;
+		state.sessionInfo = next;
+		updateAutocompleteProvider();
+		updateFooter();
+		tui.requestRender();
+	};
+	const runRefreshSessionInfo = async () => {
 		try {
-			await refreshSessionInfoPromise;
-		} finally {
-			refreshSessionInfoPromise = null;
+			const resolveListAgentId = () => {
+				if (state.currentSessionKey === "global" || state.currentSessionKey === "unknown") return;
+				const parsed = parseAgentSessionKey(state.currentSessionKey);
+				return parsed?.agentId ? normalizeAgentId(parsed.agentId) : state.currentAgentId;
+			};
+			const listAgentId = resolveListAgentId();
+			const result = await client.listSessions({
+				includeGlobal: false,
+				includeUnknown: false,
+				agentId: listAgentId
+			});
+			const normalizeMatchKey = (key) => parseAgentSessionKey(key)?.rest ?? key;
+			const currentMatchKey = normalizeMatchKey(state.currentSessionKey);
+			const entry = result.sessions.find((row) => {
+				if (row.key === state.currentSessionKey) return true;
+				return normalizeMatchKey(row.key) === currentMatchKey;
+			});
+			if (entry?.key && entry.key !== state.currentSessionKey) {
+				updateAgentFromSessionKey(entry.key);
+				state.currentSessionKey = entry.key;
+				updateHeader();
+			}
+			applySessionInfo({
+				entry,
+				defaults: result.defaults
+			});
+		} catch (err) {
+			chatLog.addSystem(`sessions list failed: ${String(err)}`);
+		}
+	};
+	const refreshSessionInfo = async () => {
+		refreshSessionInfoPromise = refreshSessionInfoPromise.then(runRefreshSessionInfo, runRefreshSessionInfo);
+		await refreshSessionInfoPromise;
+	};
+	const applySessionInfoFromPatch = (result) => {
+		if (!result?.entry) return;
+		if (result.key && result.key !== state.currentSessionKey) {
+			updateAgentFromSessionKey(result.key);
+			state.currentSessionKey = result.key;
+			updateHeader();
 		}
+		const resolved = result.resolved;
+		applySessionInfo({
+			entry: resolved && (resolved.modelProvider || resolved.model) ? {
+				...result.entry,
+				modelProvider: resolved.modelProvider ?? result.entry.modelProvider,
+				model: resolved.model ?? result.entry.model
+			} : result.entry,
+			force: true
+		});
 	};
 	const loadHistory = async () => {
 		try {
@@ -1930,6 +2029,8 @@ function createSessionActions(context) {
 			});
 			state.currentSessionId = typeof record.sessionId === "string" ? record.sessionId : null;
 			state.sessionInfo.thinkingLevel = record.thinkingLevel ?? state.sessionInfo.thinkingLevel;
+			state.sessionInfo.verboseLevel = record.verboseLevel ?? state.sessionInfo.verboseLevel;
+			const showTools = (state.sessionInfo.verboseLevel ?? "off") !== "off";
 			chatLog.clearAll();
 			chatLog.addSystem(`session ${state.currentSessionKey}`);
 			for (const entry of record.messages ?? []) {
@@ -1951,6 +2052,7 @@ function createSessionActions(context) {
 					continue;
 				}
 				if (message.role === "toolResult") {
+					if (!showTools) continue;
 					const toolCallId = asString(message.toolCallId, "");
 					const toolName = asString(message.toolName, "tool");
 					chatLog.startTool(toolCallId, toolName, {}).setResult({
@@ -1973,6 +2075,7 @@ function createSessionActions(context) {
 		state.activeChatRunId = null;
 		state.currentSessionId = null;
 		state.historyLoaded = false;
+		clearLocalRunIds?.();
 		updateHeader();
 		updateFooter();
 		await loadHistory();
@@ -1999,6 +2102,7 @@ function createSessionActions(context) {
 		applyAgentsResult,
 		refreshAgents,
 		refreshSessionInfo,
+		applySessionInfoFromPatch,
 		loadHistory,
 		setSession,
 		abortActive
@@ -2079,6 +2183,7 @@ async function runTui(opts) {
 	let wasDisconnected = false;
 	let toolsExpanded = false;
 	let showThinking = false;
+	const localRunIds = /* @__PURE__ */ new Set();
 	const deliverDefault = opts.deliver ?? false;
 	const autoMessage = opts.message?.trim();
 	let autoMessageSent = false;
@@ -2206,6 +2311,21 @@ async function runTui(opts) {
 			lastCtrlCAt = value;
 		}
 	};
+	const noteLocalRunId = (runId) => {
+		if (!runId) return;
+		localRunIds.add(runId);
+		if (localRunIds.size > 200) {
+			const [first] = localRunIds;
+			if (first) localRunIds.delete(first);
+		}
+	};
+	const forgetLocalRunId = (runId) => {
+		localRunIds.delete(runId);
+	};
+	const isLocalRunId = (runId) => localRunIds.has(runId);
+	const clearLocalRunIds = () => {
+		localRunIds.clear();
+	};
 	const client = new GatewayChatClient({
 		url: opts.url,
 		token: opts.token,
@@ -2390,7 +2510,7 @@ async function runTui(opts) {
 		footer.setText(theme.dim(footerParts.join(" | ")));
 	};
 	const { openOverlay, closeOverlay } = createOverlayHandlers(tui, editor);
-	const { refreshAgents, refreshSessionInfo, loadHistory, setSession, abortActive } = createSessionActions({
+	const { refreshAgents, refreshSessionInfo, applySessionInfoFromPatch, loadHistory, setSession, abortActive } = createSessionActions({
 		client,
 		chatLog,
 		tui,
@@ -2407,14 +2527,19 @@ async function runTui(opts) {
 		updateHeader,
 		updateFooter,
 		updateAutocompleteProvider,
-		setActivityStatus
+		setActivityStatus,
+		clearLocalRunIds
 	});
 	const { handleChatEvent, handleAgentEvent } = createEventHandlers({
 		chatLog,
 		tui,
 		state,
 		setActivityStatus,
-		refreshSessionInfo
+		refreshSessionInfo,
+		loadHistory,
+		isLocalRunId,
+		forgetLocalRunId,
+		clearLocalRunIds
 	});
 	const { handleCommand, sendMessage, openModelSelector, openAgentSelector, openSessionSelector } = createCommandHandlers({
 		client,
@@ -2426,12 +2551,15 @@ async function runTui(opts) {
 		openOverlay,
 		closeOverlay,
 		refreshSessionInfo,
+		applySessionInfoFromPatch,
 		loadHistory,
 		setSession,
 		refreshAgents,
 		abortActive,
 		setActivityStatus,
-		formatSessionKey
+		formatSessionKey,
+		noteLocalRunId,
+		forgetLocalRunId
 	});
 	const { runLocalShellLine } = createLocalShellRunner({
 		chatLog,