blun-king-cli 9.1.596 → 9.1.599

package/blun.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-// BLUN_BUILD_INPUT_SHA256:2c4b3f451c41d328bb5eb43ffb226f0f3b0c458270217cecb6e1ffc63287e8bd
+// BLUN_BUILD_INPUT_SHA256:25c271186c418490335e30ef395705d13d90d816c66cac47bb57835f2482f093
 import { fileURLToPath as __cjsShimFileURLToPath } from 'node:url';
 import { dirname as __cjsShimDirname } from 'node:path';
 const __filename = __cjsShimFileURLToPath(import.meta.url);
@@ -1175,7 +1175,7 @@ function normalizeBlunToolSchema(schema) {
 }
 function ensureBlunPropertyTypes(schema) {
 	const normalized = cloneJsonValue(schema);
-	if (!isRecord$26(normalized)) throw new Error("JSON Schema root must normalize to an object.");
+	if (!isRecord$27(normalized)) throw new Error("JSON Schema root must normalize to an object.");
 	recurseSchema(normalized);
 	return normalized;
 }
@@ -1236,7 +1236,7 @@ function resolveLocalJsonPointer(root, ref) {
 	let current = root;
 	for (const rawPart of ref.slice(2).split("/")) {
 		const part = unescapeJsonPointerPart(rawPart);
-		if (isRecord$26(current)) {
+		if (isRecord$27(current)) {
 			if (!hasOwn(current, part)) return { found: false };
 			current = current[part];
 		} else if (Array.isArray(current)) {
@@ -1258,20 +1258,20 @@ function parseJsonPointerArrayIndex(part) {
 	return Number(part);
 }
 function recurseSchema(node) {
-	if (!isRecord$26(node)) return;
+	if (!isRecord$27(node)) return;
 	visitChildSchemas(node, normalizeProperty);
 }
 function visitChildSchemas(node, visit) {
 	for (const { key, kind } of CHILD_SCHEMA_SLOTS) {
 		const value = node[key];
 		if (kind === "single") {
-			if (isRecord$26(value)) visit(value);
+			if (isRecord$27(value)) visit(value);
 		} else if (kind === "array") {
 			if (Array.isArray(value)) for (const item of value) visit(item);
 		} else if (kind === "map") {
-			if (isRecord$26(value)) for (const item of Object.values(value)) visit(item);
+			if (isRecord$27(value)) for (const item of Object.values(value)) visit(item);
 		} else if (kind === "schema-or-array") {
-			if (isRecord$26(value)) visit(value);
+			if (isRecord$27(value)) visit(value);
 			else if (Array.isArray(value)) for (const item of value) visit(item);
 		}
 	}
@@ -1283,7 +1283,7 @@ function childSchemaKeysForParentType(parentType) {
 	});
 }
 function normalizeProperty(node) {
-	if (!isRecord$26(node)) return;
+	if (!isRecord$27(node)) return;
 	if (!hasOwn(node, "type") && !hasAnyKey(node, TYPE_COMPLETION_SKIP_KEYS)) {
 		const enumValues = node["enum"];
 		if (Array.isArray(enumValues) && enumValues.length > 0) node["type"] = inferTypeFromValues(enumValues);
@@ -1367,14 +1367,14 @@ function hasAnyKey(obj, keys) {
 }
 function cloneJsonValue(value) {
 	if (Array.isArray(value)) return value.map((item) => cloneJsonValue(item));
-	if (isRecord$26(value)) {
+	if (isRecord$27(value)) {
 		const cloned = {};
 		for (const [key, child] of Object.entries(value)) cloned[key] = cloneJsonValue(child);
 		return cloned;
 	}
 	return value;
 }
-function isRecord$26(value) {
+function isRecord$27(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function hasOwn(obj, key) {
@@ -1536,6 +1536,7 @@ function parseExplicitMaxContextTokens(message) {
 	return Number.isSafeInteger(parsed) && parsed > 0 ? parsed : void 0;
 }
 function isRetryableGenerateError(error) {
+	if (error instanceof APIContextOverflowError) return false;
 	if (error instanceof CompactionStallError$1) return true;
 	if (error instanceof APIConnectionError || error instanceof APITimeoutError) return true;
 	if (error instanceof APIEmptyResponseError) return true;
@@ -1572,7 +1573,8 @@ function isProviderQuotaExhaustedMessage(message) {
 	return PROVIDER_QUOTA_EXHAUSTED_MESSAGE_PATTERN.test(lowerMessage) && PROVIDER_QUOTA_EXHAUSTED_CONTEXT_PATTERNS.some((pattern) => pattern.test(lowerMessage));
 }
 function isContextOverflowStatusError(statusCode, message) {
-	if (statusCode !== 400 && statusCode !== 413 && statusCode !== 422) return false;
+	const wrappedRejection = statusCode === 502 && /\bHTTP(?: Error)? (?:400|413|422):/i.test(message);
+	if (statusCode !== 400 && statusCode !== 413 && statusCode !== 422 && !wrappedRejection) return false;
 	const lowerMessage = message.toLowerCase();
 	return CONTEXT_OVERFLOW_MESSAGE_PATTERNS.some((pattern) => pattern.test(lowerMessage));
 }
@@ -1998,7 +2000,8 @@ var init_fetch_http_client = __esmMin((() => {
 				const startedAt = performance.now();
 				try {
 					const response = await this.fetch(`${this.baseUrl}${pathname}`, init);
-					const willRetry = attempt < maxRetries && shouldRetryResponse(response);
+					const gatewayError = response.status === 502 ? await responseError(response) : void 0;
+					const willRetry = attempt < maxRetries && shouldRetryResponse(response) && !(gatewayError instanceof APIContextOverflowError);
 					notifyTransportAttempt(requestOptions?.onTransportAttempt, {
 						transportAttempt: attempt + 1,
 						...requestBytes === void 0 ? {} : { requestBytes },
@@ -2010,12 +2013,12 @@ var init_fetch_http_client = __esmMin((() => {
 					if (response.ok) return response;
 					if (willRetry) {
 						const delayMs = retryDelayMs(response.headers, attempt);
-						await response.body?.cancel();
+						if (gatewayError === void 0) await response.body?.cancel();
 						await waitForRetry(delayMs, init.signal);
 						attempt += 1;
 						continue;
 					}
-					throw await responseError(response);
+					throw gatewayError ?? await responseError(response);
 				} catch (error) {
 					if (error instanceof ChatProviderError) throw error;
 					const willRetry = attempt < maxRetries && init.signal?.aborted !== true && isRetryableTransportFailure(error);
@@ -2578,9 +2581,23 @@ function extractUsageFromChunk(chunk) {
 	if (choiceUsage !== null && choiceUsage !== void 0 && typeof choiceUsage === "object") return choiceUsage;
 	return null;
 }
+function contextOverflowOutputCap(error, currentCap) {
+	const maxContext = error.maxContextTokens;
+	const counts = /requested ([\d,_]+) output tokens and your prompt contains (at least )?([\d,_]+) input tokens/i.exec(error.message);
+	if (maxContext === void 0 || counts === null || !Number.isSafeInteger(maxContext) || maxContext <= 0) return;
+	const requestedOutput = Number(counts[1].replaceAll(/[,_]/g, ""));
+	const input = Number(counts[3].replaceAll(/[,_]/g, ""));
+	if (!Number.isSafeInteger(input) || input < 0 || !Number.isSafeInteger(requestedOutput) || requestedOutput <= 0 || !Number.isSafeInteger(input + requestedOutput) || input + requestedOutput <= maxContext) return;
+	const available = maxContext - input;
+	const headroom = Math.min(1024, Math.max(1, Math.ceil(available * .01)));
+	const cap = Math.min(counts[2] === void 0 ? requestedOutput - 1 : Math.floor(requestedOutput / 2), available - headroom);
+	if (cap < 1 || currentCap !== void 0 && (typeof currentCap !== "number" || !Number.isSafeInteger(currentCap) || cap >= currentCap)) return;
+	return cap;
+}
 var BLUN_TOOL_CALL_ID_POLICY, BLUN_INBOUND_REASONING_KEYS, BLUN_VISION_DATA_URL, BLUN_VISION_MAX_ATTACHMENTS, BLUN_VISION_MAX_IMAGE_BYTES, BlunStreamedMessage, BlunChatProvider;
 var init_blun = __esmMin((() => {
 	init_blun_schema();
+	init_errors$10();
 	init_blun_files();
 	init_chat_completions_wire();
 	init_chat_completions_stream();
@@ -2844,8 +2861,23 @@ var init_blun = __esmMin((() => {
 					...options.onTransportAttempt !== void 0 ? { onTransportAttempt: options.onTransportAttempt } : {}
 				} : void 0;
 				options?.onRequestSent?.();
-				return new BlunStreamedMessage(await client.chat.completions.create(createParams, requestOptions), this._stream, reasoningRequested);
+				let response;
+				try {
+					response = await client.chat.completions.create(createParams, requestOptions);
+				} catch (error) {
+					const rejection = normalizeFetchHttpError(error);
+					const cap = rejection instanceof APIContextOverflowError ? contextOverflowOutputCap(rejection, createParams["max_completion_tokens"]) : void 0;
+					if (cap === void 0) throw rejection;
+					options?.signal?.throwIfAborted();
+					options?.onRequestSent?.();
+					response = await client.chat.completions.create({
+						...createParams,
+						max_completion_tokens: cap
+					}, requestOptions);
+				}
+				return new BlunStreamedMessage(response, this._stream, reasoningRequested);
 			} catch (error) {
+				if (options?.signal?.aborted === true) throw options.signal.reason ?? error;
 				throw normalizeFetchHttpError(error);
 			}
 		}
@@ -10610,7 +10642,7 @@ function tokenFromWire(wire) {
 var init_types$17 = __esmMin((() => {}));
 //#endregion
 //#region ../../packages/oauth/src/utils.ts
-function isRecord$25(value) {
+function isRecord$26(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 var init_utils$1 = __esmMin((() => {}));
@@ -10934,7 +10966,7 @@ var init_storage = __esmMin((() => {
 			} catch {
 				return;
 			}
-			if (!isRecord$25(parsed)) return void 0;
+			if (!isRecord$26(parsed)) return void 0;
 			return tokenFromWire(parsed);
 		}
 		async save(name, token) {
@@ -11028,7 +11060,7 @@ function extractApiErrorMessage(value) {
 		}
 		return;
 	}
-	if (!isRecord$25(value)) return void 0;
+	if (!isRecord$26(value)) return void 0;
 	for (const key of DIRECT_ERROR_KEYS) {
 		const message = stringField$4(value, key);
 		if (message !== void 0) return message;
@@ -11036,7 +11068,7 @@ function extractApiErrorMessage(value) {
 	const error = value["error"];
 	const errorString = nonEmptyString$7(error);
 	if (errorString !== void 0) return errorString;
-	if (isRecord$25(error)) for (const key of NESTED_ERROR_KEYS) {
+	if (isRecord$26(error)) for (const key of NESTED_ERROR_KEYS) {
 		const message = stringField$4(error, key);
 		if (message !== void 0) return message;
 	}
@@ -11126,7 +11158,7 @@ async function postForm(url, params, deviceHeaders, options) {
 	let data = {};
 	try {
 		const parsed = await response.json();
-		if (isRecord$25(parsed)) data = parsed;
+		if (isRecord$26(parsed)) data = parsed;
 	} catch {}
 	return {
 		status,
@@ -13038,9 +13070,9 @@ function blunContextWindowsUrl(oauthHost) {
 	return `${(oauthHost ?? process.env["BLUN_OAUTH_HOST"] ?? "https://account.blun.ai").replace(/\/+$/, "")}/api/verbrauch/tarife`;
 }
 function parseManagedContextWindow(payload, plan) {
-	if (!isRecord$25(payload)) return void 0;
+	if (!isRecord$26(payload)) return void 0;
 	const contextWindows = payload["kontext"];
-	if (!isRecord$25(contextWindows)) return void 0;
+	if (!isRecord$26(contextWindows)) return void 0;
 	const value = contextWindows[plan];
 	return typeof value === "number" && Number.isSafeInteger(value) && value > 0 ? value : void 0;
 }
@@ -13075,7 +13107,7 @@ function parseManagedUsagePayload(payload) {
 	const plan = typeof rec["plan"] === "string" && rec["plan"].trim().length > 0 ? rec["plan"].trim() : void 0;
 	const contextWindowTokens = managedContextWindowFrom(rec);
 	const unlimited = rec["unlimited"] === true;
-	const stand = isRecord$25(rec["stand"]) ? rec["stand"] : void 0;
+	const stand = isRecord$26(rec["stand"]) ? rec["stand"] : void 0;
 	if (stand !== void 0) for (const [sourceKey, id, label] of ACCOUNT_USAGE_WINDOWS) {
 		const row = toAccountUsageRow(stand[sourceKey], id, label, unlimited);
 		if (row !== null) limits.push(row);
@@ -13085,9 +13117,9 @@ function parseManagedUsagePayload(payload) {
 		const item = rawLimits[idx];
 		if (!item || typeof item !== "object") continue;
 		const detailRaw = item["detail"];
-		const detail = isRecord$25(detailRaw) ? detailRaw : item;
+		const detail = isRecord$26(detailRaw) ? detailRaw : item;
 		const windowRaw = item["window"];
-		const row = toUsageRow(detail, limitLabel(item, detail, isRecord$25(windowRaw) ? windowRaw : {}, idx));
+		const row = toUsageRow(detail, limitLabel(item, detail, isRecord$26(windowRaw) ? windowRaw : {}, idx));
 		if (row !== null) limits.push(row);
 	}
 	return {
@@ -13111,7 +13143,7 @@ function managedContextWindowFrom(payload) {
 	return values.every((value) => value === first) ? first : void 0;
 }
 function toAccountUsageRow(raw, id, label, accountUnlimited) {
-	if (!isRecord$25(raw)) return null;
+	if (!isRecord$26(raw)) return null;
 	const used = toInt(raw["verbraucht"]);
 	const unlimited = accountUnlimited || raw["unlimited"] === true;
 	const fraction = raw["anteil"];
@@ -13144,7 +13176,7 @@ function toAccountUsageRow(raw, id, label, accountUnlimited) {
 	};
 }
 function toUsageRow(raw, defaultLabel) {
-	if (!isRecord$25(raw)) return null;
+	if (!isRecord$26(raw)) return null;
 	const unlimited = raw["unlimited"] === true;
 	const limit = toInt(raw["limit"]);
 	let used = toInt(raw["used"]);
@@ -13265,7 +13297,7 @@ function isManagedQuotaErrorMessage(message) {
 	return /you(?:'|’)?ve reached your usage limit/.test(normalized) && /billing cycle|quota will be (?:refreshed|reset)|purchase extra usage/.test(normalized);
 }
 function hasManagedUsageShape(payload) {
-	if (!isRecord$25(payload)) return false;
+	if (!isRecord$26(payload)) return false;
 	let recognized = false;
 	if ("context_window_tokens" in payload || "contextWindowTokens" in payload) {
 		recognized = true;
@@ -13281,15 +13313,15 @@ function hasManagedUsageShape(payload) {
 		if (!Array.isArray(limits)) return false;
 		for (let index = 0; index < limits.length; index++) {
 			const item = limits[index];
-			if (!isRecord$25(item)) return false;
-			const detail = isRecord$25(item["detail"]) ? item["detail"] : item;
-			if (toUsageRow(detail, limitLabel(item, detail, isRecord$25(item["window"]) ? item["window"] : {}, index)) === null) return false;
+			if (!isRecord$26(item)) return false;
+			const detail = isRecord$26(item["detail"]) ? item["detail"] : item;
+			if (toUsageRow(detail, limitLabel(item, detail, isRecord$26(item["window"]) ? item["window"] : {}, index)) === null) return false;
 		}
 	}
 	if ("stand" in payload) {
 		recognized = true;
 		const stand = payload["stand"];
-		if (!isRecord$25(stand)) return false;
+		if (!isRecord$26(stand)) return false;
 		const windows = ACCOUNT_USAGE_WINDOWS.filter(([sourceKey]) => sourceKey in stand);
 		if (windows.length === 0) return false;
 		const unlimited = payload["unlimited"] === true;
@@ -13385,8 +13417,8 @@ function userExtras(existing, remoteOwnedFields) {
 	return out;
 }
 function mergeRefreshedModelAlias(existing, remote, remoteOwnedFields) {
-	const current = isRecord$25(existing) ? existing : {};
-	const overrides = cloneOverrides(isRecord$25(current["overrides"]) ? current["overrides"] : void 0);
+	const current = isRecord$26(existing) ? existing : {};
+	const overrides = cloneOverrides(isRecord$26(current["overrides"]) ? current["overrides"] : void 0);
 	return {
 		...userExtras(current, remoteOwnedFields),
 		...remote,
@@ -13568,7 +13600,7 @@ function parseModelContextLength(item, modelId) {
 	return values[0];
 }
 function toModelInfo(item) {
-	if (!isRecord$25(item) || typeof item["id"] !== "string" || item["id"].length === 0) return;
+	if (!isRecord$26(item) || typeof item["id"] !== "string" || item["id"].length === 0) return;
 	const contextLength = parseModelContextLength(item, item["id"]);
 	const displayName = item["display_name"];
 	const normalizedDisplayName = typeof displayName === "string" && displayName.length > 0 ? displayName : void 0;
@@ -13655,7 +13687,7 @@ async function fetchManagedBlunCodeModels(options) {
 			throw new Error(message);
 		}
 		const payload = await response.json();
-		if (!isRecord$25(payload) || !Array.isArray(payload["data"])) throw new Error(`Unexpected models response for ${baseUrl}.`);
+		if (!isRecord$26(payload) || !Array.isArray(payload["data"])) throw new Error(`Unexpected models response for ${baseUrl}.`);
 		return payload["data"].map((item) => toModelInfo(item)).filter((item) => item !== void 0);
 	}
 	throw new Error(`Failed to list BLUN models for ${baseUrl}.`);
@@ -13698,11 +13730,11 @@ function applyManagedBlunCodeConfig(config, options) {
 		apiKey
 	};
 	const upstreamKeys = new Set(options.models.map((m) => managedModelKey(m.id)));
-	for (const [key, model] of Object.entries(existingModels)) if (RETIRED_BLUN_MODEL_KEYS.has(key) || isRecord$25(model) && model["provider"] === "managed:blun" && !upstreamKeys.has(key)) delete existingModels[key];
+	for (const [key, model] of Object.entries(existingModels)) if (RETIRED_BLUN_MODEL_KEYS.has(key) || isRecord$26(model) && model["provider"] === "managed:blun" && !upstreamKeys.has(key)) delete existingModels[key];
 	for (const model of options.models) {
 		const capabilities = capabilitiesForModel(model);
 		const key = managedModelKey(model.id);
-		const existing = isRecord$25(existingModels[key]) ? existingModels[key] : {};
+		const existing = isRecord$26(existingModels[key]) ? existingModels[key] : {};
 		const supportsAdaptiveThinking = capabilities?.includes("thinking") === true || capabilities?.includes("always_thinking") === true;
 		existingModels[key] = mergeRefreshedModelAlias(existing, {
 			provider: BLUN_PROVIDER_NAME$1,
@@ -13750,7 +13782,7 @@ function applyManagedBlunCodeLogoutConfig(config) {
 	let removedDefaultModel = false;
 	const existingModels = config.models ?? {};
 	for (const [key, model] of Object.entries(existingModels)) {
-		if (!isRecord$25(model) || model["provider"] !== "managed:blun") continue;
+		if (!isRecord$26(model) || model["provider"] !== "managed:blun") continue;
 		delete existingModels[key];
 		if (config.defaultModel === key) removedDefaultModel = true;
 	}
@@ -13790,7 +13822,7 @@ function selectDefaultModel(config, models, options) {
 function canPreserveDefaultModel(existingModels, defaultModel, managedModels) {
 	if (managedModels.has(defaultModel)) return true;
 	const existing = existingModels[defaultModel];
-	return isRecord$25(existing) && existing["provider"] !== "managed:blun";
+	return isRecord$26(existing) && existing["provider"] !== "managed:blun";
 }
 function assertPositiveContextLength(model) {
 	if (!Number.isInteger(model.contextLength) || model.contextLength <= 0) throw new Error(`BLUN model "${model.id}" must include a positive context_length.`);
@@ -13868,13 +13900,13 @@ function blunManagedQuotaUrl(oauthHost) {
 	return `${(oauthHost ?? process.env["BLUN_OAUTH_HOST"] ?? "https://account.blun.ai").replace(/\/+$/, "")}${MANAGED_QUOTA_PATH}`;
 }
 function parseManagedQuotaPayload(payload) {
-	if (!isRecord$25(payload)) return void 0;
+	if (!isRecord$26(payload)) return void 0;
 	const plan = nonEmptyString$6(payload["plan"]);
 	const paid = payload["bezahlt"];
 	const creditCents = payload["guthaben_cent"];
 	const billingKind = nonEmptyString$6(payload["art"]);
 	const globalUnlimited = payload["unlimited"];
-	if (plan === void 0 || typeof paid !== "boolean" || !Number.isSafeInteger(creditCents) || creditCents < 0 || billingKind === void 0 || globalUnlimited !== void 0 && typeof globalUnlimited !== "boolean" || !isRecord$25(payload["stand"])) return;
+	if (plan === void 0 || typeof paid !== "boolean" || !Number.isSafeInteger(creditCents) || creditCents < 0 || billingKind === void 0 || globalUnlimited !== void 0 && typeof globalUnlimited !== "boolean" || !isRecord$26(payload["stand"])) return;
 	if (!hasStrictQuotaStand(payload["stand"], globalUnlimited === true)) return void 0;
 	const limits = parseManagedUsagePayload(payload).limits;
 	if (limits.length !== REQUIRED_WINDOWS.length || REQUIRED_WINDOWS.some(([, id]) => limits.filter((row) => row.id === id).length !== 1)) return;
@@ -13944,7 +13976,7 @@ function nonEmptyString$6(value) {
 function hasStrictQuotaStand(stand, globalUnlimited) {
 	return REQUIRED_WINDOWS.every(([sourceKey]) => {
 		const row = stand[sourceKey];
-		if (!isRecord$25(row)) return false;
+		if (!isRecord$26(row)) return false;
 		const used = row["verbraucht"];
 		const rowUnlimited = row["unlimited"];
 		if (rowUnlimited !== void 0 && typeof rowUnlimited !== "boolean") return false;
@@ -21131,7 +21163,7 @@ function parseSkillText(options) {
 		throw error;
 	}
 	const frontmatter = parsed.data ?? {};
-	if (!isRecord$24(frontmatter)) throw new SkillParseError(`Frontmatter in ${options.skillMdPath} must be a mapping at the top level`);
+	if (!isRecord$25(frontmatter)) throw new SkillParseError(`Frontmatter in ${options.skillMdPath} must be a mapping at the top level`);
 	const metadata = normalizeMetadata(frontmatter);
 	if (!isSupportedSkillType(metadata.type)) throw new UnsupportedSkillTypeError(metadata.type ?? String(frontmatter["type"]));
 	const name = nonEmptyString$4(metadata.name);
@@ -21244,7 +21276,7 @@ function tokenizeArgs(raw) {
 function nonEmptyString$4(value) {
 	return typeof value === "string" && value.trim() !== "" ? value.trim() : void 0;
 }
-function isRecord$24(value) {
+function isRecord$25(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 var import_regexp_escape, FrontmatterError, SkillParseError, UnsupportedSkillTypeError, FENCE, METADATA_ALIASES;
@@ -21293,7 +21325,7 @@ var init_parser$1 = __esmMin((() => {
 function parseCommandText(input) {
 	const { text, commandPath, pluginId } = input;
 	const parsed = parseFrontmatter(text);
-	const frontmatter = isRecord$23(parsed.data) ? parsed.data : {};
+	const frontmatter = isRecord$24(parsed.data) ? parsed.data : {};
 	const baseName = input.fallbackName ?? path.basename(commandPath).replace(/\.md$/i, "");
 	const name = nonEmptyString$3(frontmatter["name"]) ?? baseName;
 	const body = parsed.body.trim();
@@ -21335,7 +21367,7 @@ function descriptionFromBody(body) {
 	if (firstLine === void 0) return "No description provided.";
 	return firstLine.length > 240 ? `${firstLine.slice(0, 239)}…` : firstLine;
 }
-function isRecord$23(value) {
+function isRecord$24(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 var init_commands = __esmMin((() => {
@@ -28886,7 +28918,7 @@ var init_per_id_json_store = __esmMin((() => {
 }));
 //#endregion
 //#region ../../packages/agent-core/src/agent/background/resume-store.ts
-var BACKGROUND_TASK_ID, id, digest$2, timestamp$2, ResumeIntentSchema, hash$3, isRecord$22, TaskResumeStore;
+var BACKGROUND_TASK_ID, id, digest$2, timestamp$2, ResumeIntentSchema, hash$3, isRecord$23, TaskResumeStore;
 var init_resume_store = __esmMin((() => {
 	init_zod$1();
 	BACKGROUND_TASK_ID = /^[a-z0-9]+(?:-[a-z0-9]+)*-[0-9a-z]{8}$/;
@@ -28911,7 +28943,7 @@ var init_resume_store = __esmMin((() => {
 		startedAt: timestamp$2.nullable()
 	}).strict();
 	hash$3 = (value) => createHash("sha256").update(value).digest("hex");
-	isRecord$22 = (value) => value !== null && typeof value === "object" && !Array.isArray(value);
+	isRecord$23 = (value) => value !== null && typeof value === "object" && !Array.isArray(value);
 	TaskResumeStore = class {
 		home;
 		constructor(home) {
@@ -28966,9 +28998,9 @@ var init_resume_store = __esmMin((() => {
 		}
 		async readOwnedTask(taskId) {
 			const task = await this.read("tasks", taskId);
-			if (!isRecord$22(task)) throw new Error("Task has no persisted local record.");
+			if (!isRecord$23(task)) throw new Error("Task has no persisted local record.");
 			const owner = task["resumeOwnership"];
-			if (!isRecord$22(owner) || owner["version"] !== 1 || owner["scope"] !== hash$3(await this.root()) || owner["taskId"] !== taskId || task["taskId"] !== taskId || task["kind"] !== "agent" || owner["agentId"] !== task["agentId"] || owner["startedAt"] !== task["startedAt"]) throw new Error("Task ownership is unverified; historical or foreign records cannot be resumed automatically.");
+			if (!isRecord$23(owner) || owner["version"] !== 1 || owner["scope"] !== hash$3(await this.root()) || owner["taskId"] !== taskId || task["taskId"] !== taskId || task["kind"] !== "agent" || owner["agentId"] !== task["agentId"] || owner["startedAt"] !== task["startedAt"]) throw new Error("Task ownership is unverified; historical or foreign records cannot be resumed automatically.");
 			const { resumeOwnership: _ownership, ...info } = task;
 			return info;
 		}
@@ -29089,12 +29121,12 @@ function legacyStatusToCurrent$1(task) {
 	return task.status;
 }
 function isReadablePersistedTask$1(obj) {
-	return isRecord$21(obj) && (typeof obj["taskId"] === "string" || typeof obj["task_id"] === "string");
+	return isRecord$22(obj) && (typeof obj["taskId"] === "string" || typeof obj["task_id"] === "string");
 }
 function isLegacyPersistedTask$1(task) {
 	return "task_id" in task;
 }
-function isRecord$21(value) {
+function isRecord$22(value) {
 	return typeof value === "object" && value !== null;
 }
 function optionalNonEmptyString$2(value) {
@@ -228671,7 +228703,7 @@ function escapeXml(value) {
 function locationKey(messageIndex, partIndex) {
 	return `${String(messageIndex)}:${String(partIndex)}`;
 }
-function isRecord$20(value) {
+function isRecord$21(value) {
 	return value !== null && typeof value === "object" && !Array.isArray(value);
 }
 function isNonNegativeInteger$1(value) {
@@ -228872,7 +228904,7 @@ var init_vision_reader = __esmMin((() => {
 					reason: "malformed"
 				};
 			}
-			if (!isRecord$20(payload) || payload["done"] !== true || typeof payload["response"] !== "string" || !isNonNegativeInteger$1(payload["prompt_eval_count"]) || !isNonNegativeInteger$1(payload["eval_count"])) return {
+			if (!isRecord$21(payload) || payload["done"] !== true || typeof payload["response"] !== "string" || !isNonNegativeInteger$1(payload["prompt_eval_count"]) || !isNonNegativeInteger$1(payload["eval_count"])) return {
 				ok: false,
 				reason: "malformed"
 			};
@@ -235010,7 +235042,7 @@ function structuredOutput(stdout, input) {
 			return {
 				...result,
 				additionalContext: input["hook_event_name"] === "UserPromptSubmit" && hookSpecificOutput?.hookEventName === "UserPromptSubmit" ? hookSpecificOutput.additionalContext : void 0,
-				updatedInput: input["hook_event_name"] === "PreToolUse" && hookSpecificOutput?.hookEventName === "PreToolUse" && isRecord$19(hookSpecificOutput.updatedInput) ? hookSpecificOutput.updatedInput : void 0
+				updatedInput: input["hook_event_name"] === "PreToolUse" && hookSpecificOutput?.hookEventName === "PreToolUse" && isRecord$20(hookSpecificOutput.updatedInput) ? hookSpecificOutput.updatedInput : void 0
 			};
 		}
 		return {
@@ -235079,7 +235111,7 @@ function killProcessTreeWindows(child, force) {
 		} catch {}
 	}
 }
-function isRecord$19(value) {
+function isRecord$20(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function errorMessage$12(error) {
@@ -235096,7 +235128,7 @@ var init_runner = __esmMin((() => {
 		if (typeof value === "string") return value;
 		if (typeof value === "number" || typeof value === "boolean" || typeof value === "bigint") return String(value);
 	}, string().optional());
-	HookSpecificOutputSchema = preprocess((value) => isRecord$19(value) ? value : void 0, looseObject({
+	HookSpecificOutputSchema = preprocess((value) => isRecord$20(value) ? value : void 0, looseObject({
 		message: OptionalStringSchema,
 		additionalContext: OptionalStringSchema,
 		permissionDecision: unknown().optional(),
@@ -235271,7 +235303,16 @@ var init_engine = __esmMin((() => {
 					};
 				}
 				if (this.admissionClosed) return void 0;
-				return runHook(hook.command, inputData, {
+				let hookInput;
+				try {
+					hookInput = this.options.runtimeInput?.(hook, inputData) ?? inputData;
+				} catch {
+					return {
+						action: "block",
+						reason: "Hook input preparation failed."
+					};
+				}
+				return runHook(hook.command, hookInput, {
 					timeout: hook.timeout ?? DEFAULT_HOOK_TIMEOUT_SECONDS,
 					cwd: hook.cwd ?? (this.options.cwd === "" ? void 0 : this.options.cwd),
 					env: hook.env,
@@ -236358,7 +236399,7 @@ function isTelegramGroupInput(input) {
 		return chatId === void 0 || chatId.startsWith("-");
 	});
 }
-function isPersonalMemoryToolName$1(name) {
+function isPersonalMemoryToolName$2(name) {
 	return name.startsWith("mcp__personal-memory__");
 }
 function isPersonalMemoryRecallToolName(name) {
@@ -236372,7 +236413,7 @@ function parsePersonalMemoryRecall(output) {
 	} catch {
 		return { kind: "invalid" };
 	}
-	if (!isRecord$18(parsed) || !isRecord$18(parsed["personal_memory"])) return { kind: "invalid" };
+	if (!isRecord$19(parsed) || !isRecord$19(parsed["personal_memory"])) return { kind: "invalid" };
 	const memory = parsed["personal_memory"];
 	const savedRaw = memory["saved"];
 	const threadsRaw = memory["threads"];
@@ -236381,7 +236422,7 @@ function parsePersonalMemoryRecall(output) {
 	if (savedRaw.length > MAX_SAVED_MEMORIES || threadsRaw.length > MAX_THREADS || historyRaw.length > 0) return { kind: "invalid" };
 	const saved = [];
 	for (const value of savedRaw) {
-		if (!isRecord$18(value)) return { kind: "invalid" };
+		if (!isRecord$19(value)) return { kind: "invalid" };
 		const text = boundedTrimmedString(value["text"], MAX_MEMORY_TEXT_CHARS);
 		const confidence = value["confidence"];
 		if (text === void 0 || typeof confidence !== "string" || !CONFIDENCE_VALUES.has(confidence)) return { kind: "invalid" };
@@ -236392,7 +236433,7 @@ function parsePersonalMemoryRecall(output) {
 	}
 	const threads = [];
 	for (const value of threadsRaw) {
-		if (!isRecord$18(value)) return { kind: "invalid" };
+		if (!isRecord$19(value)) return { kind: "invalid" };
 		const title = boundedTrimmedString(value["title"], MAX_THREAD_TITLE_CHARS);
 		const summary = boundedTrimmedString(value["summary"], MAX_THREAD_SUMMARY_CHARS);
 		if (title === void 0 || summary === void 0) return { kind: "invalid" };
@@ -236446,7 +236487,7 @@ function boundedTrimmedString(value, maxChars) {
 	const trimmed = value.trim();
 	return trimmed.length > 0 ? trimmed : void 0;
 }
-function isRecord$18(value) {
+function isRecord$19(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 var PERSONAL_MEMORY_HOST_RECALL_HANDLER$1, RECALL_LIMIT, RECALL_TIMEOUT_MS, MAX_QUERY_CHARS, MAX_WIRE_CHARS, MAX_SAVED_MEMORIES, MAX_THREADS, MAX_MEMORY_TEXT_CHARS, MAX_THREAD_TITLE_CHARS, MAX_THREAD_SUMMARY_CHARS, CONFIDENCE_VALUES, TELEGRAM_GROUP_MARKER_RE, TELEGRAM_MARKER_RE, TELEGRAM_CHANNEL_RE, TELEGRAM_SOURCE_RE, TELEGRAM_CHAT_ID_RE, TELEGRAM_SENDER_LINE_RE, TELEGRAM_ATTACHMENT_BLOCK_RE, TELEGRAM_ATTACHMENT_NOTICE_RE, TELEGRAM_IMAGE_ATTACHMENT_RE, GENERIC_IMAGE_QUERY, GENERIC_FILE_QUERY, GENERIC_EMPTY_QUERY, PERSONAL_MEMORY_RECALL_VARIANT, PersonalMemoryRecallInjector;
@@ -236536,8 +236577,8 @@ var init_personal_memory_recall = __esmMin((() => {
 		* to read, write, list, or change any personal-memory state.
 		*/
 		filterToolsForTurn(turnId, input, origin, tools) {
-			if (this.toolsAllowedForTurn(turnId, input, origin)) return tools.filter((tool) => !isPersonalMemoryRecallToolName(tool.name) && (!isPersonalMemoryToolName$1(tool.name) || this.isTrustedHostTool(tool.name)));
-			return tools.filter((tool) => !isPersonalMemoryToolName$1(tool.name));
+			if (this.toolsAllowedForTurn(turnId, input, origin)) return tools.filter((tool) => !isPersonalMemoryRecallToolName(tool.name) && (!isPersonalMemoryToolName$2(tool.name) || this.isTrustedHostTool(tool.name)));
+			return tools.filter((tool) => !isPersonalMemoryToolName$2(tool.name));
 		}
 		isTrustedHostTool(name) {
 			const isHostTool = this.agent.isPersonalMemoryHostTool;
@@ -301492,8 +301533,38 @@ var init_mcp$1 = __esmMin((() => {
 }));
 //#endregion
 //#region ../../packages/agent-core/src/plugin/agent-spine-runtime.ts
-var EMPTY_RUNTIME, AgentSpineSessionRuntime;
+/** AgentSpine reads prompt text; binary media stays in the original model input. */
+function projectAgentSpinePrompt(input) {
+	if (typeof input["hook_event_name"] !== "string" || !PROMPT_EVENTS.has(input["hook_event_name"]) || !Array.isArray(input["prompt"])) return input;
+	let changed = false;
+	const prompt = input["prompt"].map((part) => {
+		if (!isRecord$18(part)) return part;
+		const field = part["type"] === "image_url" ? "imageUrl" : part["type"] === "audio_url" ? "audioUrl" : part["type"] === "video_url" ? "videoUrl" : void 0;
+		if (field === void 0 || !isRecord$18(part[field]) || typeof part[field]["url"] !== "string") return part;
+		const serialized = JSON.stringify(part);
+		changed = true;
+		return {
+			type: "media_reference",
+			media_type: part["type"],
+			sha256: createHash("sha256").update(serialized).digest("hex"),
+			original_bytes: Buffer.byteLength(serialized)
+		};
+	});
+	return changed ? {
+		...input,
+		prompt
+	} : input;
+}
+function isRecord$18(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+var PROMPT_EVENTS, EMPTY_RUNTIME, AgentSpineSessionRuntime;
 var init_agent_spine_runtime = __esmMin((() => {
+	PROMPT_EVENTS = new Set([
+		"UserPromptSubmit",
+		"TurnStart",
+		"SubagentStart"
+	]);
 	EMPTY_RUNTIME = Object.freeze({
 		AGENTSPINE_KING_TIMELINE_SOURCE: "",
 		AGENTSPINE_KING_WIRE_PROTOCOL_VERSION: "",
@@ -302089,9 +302160,11 @@ var init_session$1 = __esmMin((() => {
 			this.experimentalFlags = options.experimentalFlags ?? new FlagResolver();
 			this.agentSpineRuntime = this.experimentalFlags.enabled("agent_spine_timeline") ? new AgentSpineSessionRuntime(options.agentSpineRuntime) : void 0;
 			this.visionReader = (this.experimentalFlags.enabled("vision_reader") ? createVisionReader(options.config?.services?.visionReader) : void 0) ?? createManagedMediaVisionReader(options.toolServices?.media);
+			const agentSpineHooks = new Set(options.agentSpineRuntime?.hooks);
 			this.hookEngine = new HookEngine(options.hooks, {
 				cwd: options.kaos.getcwd(),
 				sessionId: options.id,
+				runtimeInput: (hook, input) => agentSpineHooks.has(hook) ? projectAgentSpinePrompt(input) : input,
 				runtimeEnv: (hook) => {
 					const hostEnv = options.hookRuntimeEnv?.(hook);
 					const timelineEnv = this.agentSpineRuntime?.forHook(hook);
@@ -338166,7 +338239,6 @@ var init_core_impl = __esmMin((() => {
 			};
 		}
 		agentSpineRuntimeRecipients(pluginHooks, mcpConfig) {
-			if (!this.experimentalFlags.enabled("agent_spine_timeline")) return void 0;
 			const plugin = this.plugins.get("agent-spine");
 			if (plugin?.state !== "ok" || !plugin.enabled) return void 0;
 			const hooks = pluginHooks.filter((hook) => hook.env?.["BLUN_PLUGIN_ROOT"] === plugin.root);
@@ -502931,7 +503003,7 @@ const BLUN_SPINNER_FRAMES = [
 	"▝",
 	"▗"
 ];
-const THINKING_WORD_INTERVAL_MS = 6e3;
+const THINKING_WORD_INTERVAL_MS = 3e3;
 //#endregion
 //#region src/tui/components/messages/goal-format.ts
 function formatGoalElapsed(ms) {
@@ -514489,6 +514561,321 @@ var PluginCommandComponent = class extends Container {
 	}
 };
 //#endregion
+//#region src/tui/components/messages/thinking-activity.ts
+const THINKING_ACTIVITY_WORDS = {
+	Thinking: [
+		"Thinkering",
+		"Reasoning",
+		"Pondering",
+		"Analyzing",
+		"Exploring",
+		"Connecting",
+		"Unraveling",
+		"Imagining",
+		"Envisioning",
+		"Strategizing",
+		"Deciphering",
+		"Framing",
+		"Ideating",
+		"Synthesizing",
+		"Reflecting"
+	],
+	Planning: [
+		"Architecting",
+		"Blueprinting",
+		"Structuring",
+		"Orchestrating",
+		"Sequencing",
+		"Scoping",
+		"Prioritizing",
+		"Coordinating",
+		"Decomposing",
+		"Aligning",
+		"Roadmapping",
+		"Modeling",
+		"Designing",
+		"Drafting",
+		"Preparing"
+	],
+	Researching: [
+		"Searching",
+		"Browsing",
+		"Discovering",
+		"Investigating",
+		"Examining",
+		"Inspecting",
+		"Tracing",
+		"Comparing",
+		"Verifying",
+		"Cross-checking",
+		"Fact-finding",
+		"Source-hunting",
+		"Deep-diving",
+		"Contextualizing",
+		"Evidence-gathering"
+	],
+	Building: [
+		"Building",
+		"Crafting",
+		"Coding",
+		"Engineering",
+		"Assembling",
+		"Integrating",
+		"Implementing",
+		"Wiring",
+		"Configuring",
+		"Compiling",
+		"Rendering",
+		"Generating",
+		"Prototyping",
+		"Shaping",
+		"Forging"
+	],
+	Solving: [
+		"Debugging",
+		"Diagnosing",
+		"Troubleshooting",
+		"Untangling",
+		"Repairing",
+		"Patching",
+		"Resolving",
+		"Reworking",
+		"Refining",
+		"Optimizing",
+		"Simplifying",
+		"Stabilizing",
+		"Recovering",
+		"Calibrating",
+		"Tuning"
+	],
+	Validating: [
+		"Testing",
+		"Validating",
+		"Reviewing",
+		"Auditing",
+		"Proofreading",
+		"Measuring",
+		"Benchmarking",
+		"Stress-testing",
+		"Safeguarding",
+		"Hardening",
+		"Polishing",
+		"Fine-tuning",
+		"Checking",
+		"Confirming",
+		"Certifying"
+	],
+	Processing: [
+		"Reading",
+		"Parsing",
+		"Indexing",
+		"Remembering",
+		"Recalling",
+		"Organizing",
+		"Classifying",
+		"Filtering",
+		"Sorting",
+		"Matching",
+		"Merging",
+		"Summarizing",
+		"Compressing",
+		"Transforming",
+		"Learning"
+	],
+	Collaborating: [
+		"Delegating",
+		"Collaborating",
+		"Consulting",
+		"Briefing",
+		"Dispatching",
+		"Synchronizing",
+		"Negotiating",
+		"Handshaking",
+		"Queuing",
+		"Routing",
+		"Supervising",
+		"Monitoring",
+		"Reconciling",
+		"Reporting",
+		"Converging"
+	],
+	Creating: [
+		"Writing",
+		"Rewriting",
+		"Translating",
+		"Localizing",
+		"Narrating",
+		"Explaining",
+		"Illustrating",
+		"Visualizing",
+		"Formatting",
+		"Styling",
+		"Presenting",
+		"Documenting",
+		"Captioning",
+		"Storyboarding",
+		"Publishing"
+	],
+	"BLUN Magic": [
+		"BLUNing",
+		"Sparkering",
+		"Wondermaking",
+		"Dreamweaving",
+		"Futurecrafting",
+		"Brightening",
+		"Flowing",
+		"Accelerating",
+		"Automating",
+		"Empowering",
+		"Launching",
+		"Scaling",
+		"Evolving",
+		"Delivering",
+		"Finishing"
+	]
+};
+const EVIDENCE_KEYS = new Set([
+	"command",
+	"cmd",
+	"description",
+	"file",
+	"file_path",
+	"path",
+	"pattern",
+	"prompt",
+	"query",
+	"task",
+	"title",
+	"url"
+]);
+function activityEvidence(toolCall) {
+	if (toolCall === void 0) return "";
+	const values = [toolCall.name];
+	if (toolCall.args !== void 0) {
+		for (const [key, value] of Object.entries(toolCall.args)) if (EVIDENCE_KEYS.has(key.toLowerCase()) && typeof value === "string") values.push(value.slice(0, 2e3));
+	} else if (toolCall.argumentsText !== void 0) values.push(toolCall.argumentsText.slice(0, 2e3));
+	return values.filter(Boolean).join(" ").toLowerCase();
+}
+function matchesAny(text, patterns) {
+	return patterns.some((pattern) => text.includes(pattern));
+}
+function inferThinkingActivityGroup(toolCall, options = {}) {
+	if (options.completing === true) return "BLUN Magic";
+	if (options.retrying === true || options.failed === true) return "Solving";
+	const name = toolCall?.name?.toLowerCase() ?? "";
+	const evidence = activityEvidence(toolCall);
+	if (!name) return "Thinking";
+	if (name === "todolist" || matchesAny(evidence, [
+		" plan",
+		"roadmap",
+		"architect",
+		"scope"
+	])) return "Planning";
+	if (matchesAny(name, [
+		"agent",
+		"swarm",
+		"telegram"
+	]) || matchesAny(evidence, [
+		"delegate",
+		"handoff",
+		"telegram",
+		"report to"
+	])) return "Collaborating";
+	if (matchesAny(name, [
+		"mnemo",
+		"memory",
+		"compact"
+	]) || matchesAny(evidence, [
+		"memory",
+		"mnemo",
+		"compact",
+		"summar",
+		"index"
+	])) return "Processing";
+	if (matchesAny(name, [
+		"grep",
+		"glob",
+		"search",
+		"webfetch",
+		"web_fetch",
+		"websearch",
+		"web_search",
+		"ls"
+	]) || matchesAny(evidence, [
+		"search",
+		"find ",
+		"inspect",
+		"trace"
+	])) return "Researching";
+	if (matchesAny(evidence, [
+		"publish",
+		"release",
+		"deploy",
+		"launch",
+		"deliver",
+		"finish"
+	])) return "BLUN Magic";
+	if (matchesAny(evidence, [
+		"error",
+		"fail",
+		"debug",
+		"diagnos",
+		"repair",
+		"patch",
+		"fix ",
+		"recover",
+		"troubleshoot"
+	])) return "Solving";
+	if (matchesAny(evidence, [
+		"test",
+		"check",
+		"verify",
+		"validat",
+		"audit",
+		"benchmark",
+		"measure",
+		"compare",
+		"sha256",
+		"diff "
+	])) return "Validating";
+	if (name === "read" || name === "readbatch") return "Processing";
+	if (name === "write" || name === "edit") return matchesAny(evidence, [
+		".md",
+		".txt",
+		"readme",
+		"changelog",
+		"document",
+		"translat",
+		"localiz"
+	]) ? "Creating" : "Building";
+	if (matchesAny(name, [
+		"bash",
+		"shell",
+		"programmatictool"
+	]) || matchesAny(evidence, [
+		"build",
+		"compile",
+		"npm ",
+		"node ",
+		"code"
+	])) return "Building";
+	return "Processing";
+}
+var ThinkingActivityRotator = class {
+	currentWord;
+	changedAtMs = 0;
+	nextIndexByGroup = /* @__PURE__ */ new Map();
+	resolve(group, now = Date.now()) {
+		if (this.currentWord !== void 0 && now - this.changedAtMs < 3e3) return this.currentWord;
+		const words = THINKING_ACTIVITY_WORDS[group];
+		const index = this.nextIndexByGroup.get(group) ?? 0;
+		this.currentWord = words[index % words.length];
+		this.nextIndexByGroup.set(group, (index + 1) % words.length);
+		this.changedAtMs = now;
+		return this.currentWord;
+	}
+};
+//#endregion
 //#region src/tui/components/messages/thinking.ts
 /**
 * Renders thinking content in the transcript.
@@ -514541,14 +514928,9 @@ registerUiCatalogFragment({
 	}
 });
 function rotatingThinkingLabel(name, startedAtMs, now = Date.now()) {
-	const keys = [
-		"thinking.label",
-		"thinking.pondering",
-		"thinking.unraveling"
-	];
+	const words = THINKING_ACTIVITY_WORDS.Thinking;
 	const elapsed = startedAtMs === void 0 ? 0 : Math.max(0, now - startedAtMs);
-	const key = keys[Math.floor(elapsed / THINKING_WORD_INTERVAL_MS) % keys.length];
-	return `${uiText(key, { name })}…`;
+	return `${name} ${words[Math.floor(elapsed / THINKING_WORD_INTERVAL_MS) % words.length]}…`;
 }
 function liveActivityLabels(label, metrics, now = Date.now()) {
 	const elapsed = formatLiveElapsed(metrics.startedAtMs === void 0 ? 0 : (now - metrics.startedAtMs) / 1e3);
@@ -514597,6 +514979,7 @@ function formatLiveElapsed(seconds) {
 	return `${String(hours)}h ${String(remainingMinutes).padStart(2, "0")}m`;
 }
 var ThinkingComponent = class {
+	activityLabel;
 	text;
 	showMarker;
 	mode;
@@ -514608,12 +514991,14 @@ var ThinkingComponent = class {
 	thinkStartMs = null;
 	thinkElapsedMs = 0;
 	thinkAborted = false;
+	abortedActivityLabel;
 	estimatedOutputTokens = 0;
 	sessionTotalTokens;
 	step;
 	textComponent;
 	renderCache;
-	constructor(text, showMarker = true, mode = "finalized", ui, metrics) {
+	constructor(text, showMarker = true, mode = "finalized", ui, metrics, activityLabel) {
+		this.activityLabel = activityLabel;
 		this.text = text;
 		this.showMarker = showMarker;
 		this.mode = mode;
@@ -514680,7 +515065,7 @@ var ThinkingComponent = class {
 			const abortMark = this.thinkAborted ? ` (${uiText("thinking.aborted")})` : "";
 			const now = Date.now();
 			const startedAtMs = now - this.formatElapsedSeconds() * 1e3;
-			const labels = liveActivityLabels(rotatingThinkingLabel(this.persona, startedAtMs, now), {
+			const labels = liveActivityLabels(this.abortedActivityLabel ?? (this.activityLabel === void 0 ? rotatingThinkingLabel(this.persona, startedAtMs, now) : `${this.persona} ${this.activityLabel()}`), {
 				startedAtMs,
 				estimatedOutputTokens: this.estimatedOutputTokens,
 				sessionTotalTokens: this.sessionTotalTokens,
@@ -514707,6 +515092,7 @@ var ThinkingComponent = class {
 	}
 	/** Called when the connection dies or the request times out. */
 	abort() {
+		this.abortedActivityLabel ??= this.activityLabel === void 0 ? rotatingThinkingLabel(this.persona, this.thinkStartMs ?? void 0) : `${this.persona} ${this.activityLabel()}`;
 		if (this.thinkStartMs !== null) {
 			this.thinkElapsedMs = Date.now() - this.thinkStartMs;
 			this.thinkStartMs = null;
@@ -515162,6 +515548,184 @@ function decodeMcpToolName(name) {
 	};
 }
 //#endregion
+//#region src/personal-memory/tool-input.ts
+init_zod$1();
+const PERSONAL_MEMORY_TOOL_NAMES = [
+	"memory_status",
+	"memory_settings_update",
+	"memory_remember",
+	"memory_list",
+	"memory_recall"
+];
+const personalMemorySettingsInputSchema = object$1({
+	memoryEnabled: boolean$1().optional(),
+	useSavedMemories: boolean$1().optional(),
+	allowNewMemories: boolean$1().optional()
+}).strict().refine((value) => Object.keys(value).length > 0);
+const personalMemoryRememberInputSchema = object$1({ content: string().min(1).max(4e3) }).strict();
+function isPersonalMemoryToolName$1(qualifiedName) {
+	return PERSONAL_MEMORY_TOOL_NAMES.some((name) => qualifiedName === `mcp__personal-memory__${name}`);
+}
+function mutationNameFromQualifiedTool(name) {
+	if (name === "mcp__personal-memory__memory_settings_update") return "memory_settings_update";
+	if (name === "mcp__personal-memory__memory_remember") return "memory_remember";
+}
+function parsePersonalMemoryMutation(name, input) {
+	if (name === "memory_settings_update") {
+		const parsed = personalMemorySettingsInputSchema.safeParse(input);
+		if (!parsed.success) return { ok: false };
+		const args = parsed.data;
+		const body = {
+			memory_enabled: args.memoryEnabled,
+			use_saved_memories: args.useSavedMemories ?? (args.memoryEnabled === true ? true : void 0),
+			allow_new_memories: args.allowNewMemories ?? (args.memoryEnabled === true ? true : void 0),
+			use_chat_history: args.memoryEnabled === true ? false : void 0
+		};
+		return {
+			ok: true,
+			kind: "settings",
+			body: Object.fromEntries(Object.entries(body).filter(([, value]) => value !== void 0))
+		};
+	}
+	if (name === "memory_remember") {
+		const parsed = personalMemoryRememberInputSchema.safeParse(input);
+		if (!parsed.success) return { ok: false };
+		return {
+			ok: true,
+			kind: "remember",
+			content: parsed.data.content
+		};
+	}
+	return { ok: false };
+}
+//#endregion
+//#region src/tui/utils/personal-memory-display.copy.ts
+registerUiCatalogFragment({
+	en: {
+		"personalMemoryDisplay.settingsAction": "Change personal memory settings",
+		"personalMemoryDisplay.rememberAction": "Save a personal memory",
+		"personalMemoryDisplay.memoryEnabled": "Personal memory",
+		"personalMemoryDisplay.useSavedMemories": "Use saved memories",
+		"personalMemoryDisplay.allowNewMemories": "Allow new memories",
+		"personalMemoryDisplay.useChatHistory": "Use chat history",
+		"personalMemoryDisplay.enabled": "On",
+		"personalMemoryDisplay.disabled": "Off",
+		"personalMemoryDisplay.invalidInput": "The requested memory change could not be verified.",
+		"personalMemoryDisplay.settingLine": "{setting}: {value}"
+	},
+	de: {
+		"personalMemoryDisplay.settingsAction": "Einstellungen des persönlichen Gedächtnisses ändern",
+		"personalMemoryDisplay.rememberAction": "Persönliche Erinnerung speichern",
+		"personalMemoryDisplay.memoryEnabled": "Persönliches Gedächtnis",
+		"personalMemoryDisplay.useSavedMemories": "Gespeicherte Erinnerungen verwenden",
+		"personalMemoryDisplay.allowNewMemories": "Neue Erinnerungen zulassen",
+		"personalMemoryDisplay.useChatHistory": "Chatverlauf verwenden",
+		"personalMemoryDisplay.enabled": "An",
+		"personalMemoryDisplay.disabled": "Aus",
+		"personalMemoryDisplay.invalidInput": "Die gewünschte Änderung am Gedächtnis konnte nicht überprüft werden.",
+		"personalMemoryDisplay.settingLine": "{setting}: {value}"
+	},
+	es: {
+		"personalMemoryDisplay.settingsAction": "Cambiar la configuración de la memoria personal",
+		"personalMemoryDisplay.rememberAction": "Guardar un recuerdo personal",
+		"personalMemoryDisplay.memoryEnabled": "Memoria personal",
+		"personalMemoryDisplay.useSavedMemories": "Usar recuerdos guardados",
+		"personalMemoryDisplay.allowNewMemories": "Permitir nuevos recuerdos",
+		"personalMemoryDisplay.useChatHistory": "Usar el historial de chats",
+		"personalMemoryDisplay.enabled": "Sí",
+		"personalMemoryDisplay.disabled": "No",
+		"personalMemoryDisplay.invalidInput": "No se pudo verificar el cambio solicitado en la memoria.",
+		"personalMemoryDisplay.settingLine": "{setting}: {value}"
+	},
+	fr: {
+		"personalMemoryDisplay.settingsAction": "Modifier les réglages de la mémoire personnelle",
+		"personalMemoryDisplay.rememberAction": "Enregistrer un souvenir personnel",
+		"personalMemoryDisplay.memoryEnabled": "Mémoire personnelle",
+		"personalMemoryDisplay.useSavedMemories": "Utiliser les souvenirs enregistrés",
+		"personalMemoryDisplay.allowNewMemories": "Autoriser de nouveaux souvenirs",
+		"personalMemoryDisplay.useChatHistory": "Utiliser l’historique des discussions",
+		"personalMemoryDisplay.enabled": "Oui",
+		"personalMemoryDisplay.disabled": "Non",
+		"personalMemoryDisplay.invalidInput": "La modification demandée de la mémoire n’a pas pu être vérifiée.",
+		"personalMemoryDisplay.settingLine": "{setting}\xA0: {value}"
+	},
+	sv: {
+		"personalMemoryDisplay.settingsAction": "Ändra inställningarna för det personliga minnet",
+		"personalMemoryDisplay.rememberAction": "Spara ett personligt minne",
+		"personalMemoryDisplay.memoryEnabled": "Personligt minne",
+		"personalMemoryDisplay.useSavedMemories": "Använd sparade minnen",
+		"personalMemoryDisplay.allowNewMemories": "Tillåt nya minnen",
+		"personalMemoryDisplay.useChatHistory": "Använd chatthistorik",
+		"personalMemoryDisplay.enabled": "På",
+		"personalMemoryDisplay.disabled": "Av",
+		"personalMemoryDisplay.invalidInput": "Den begärda ändringen av minnet kunde inte verifieras.",
+		"personalMemoryDisplay.settingLine": "{setting}: {value}"
+	},
+	cs: {
+		"personalMemoryDisplay.settingsAction": "Změnit nastavení osobní paměti",
+		"personalMemoryDisplay.rememberAction": "Uložit osobní vzpomínku",
+		"personalMemoryDisplay.memoryEnabled": "Osobní paměť",
+		"personalMemoryDisplay.useSavedMemories": "Používat uložené vzpomínky",
+		"personalMemoryDisplay.allowNewMemories": "Povolit nové vzpomínky",
+		"personalMemoryDisplay.useChatHistory": "Používat historii chatů",
+		"personalMemoryDisplay.enabled": "Ano",
+		"personalMemoryDisplay.disabled": "Ne",
+		"personalMemoryDisplay.invalidInput": "Požadovanou změnu paměti se nepodařilo ověřit.",
+		"personalMemoryDisplay.settingLine": "{setting}: {value}"
+	}
+});
+//#endregion
+//#region src/tui/utils/personal-memory-display.ts
+const settingLabels = {
+	memory_enabled: "personalMemoryDisplay.memoryEnabled",
+	use_saved_memories: "personalMemoryDisplay.useSavedMemories",
+	allow_new_memories: "personalMemoryDisplay.allowNewMemories",
+	use_chat_history: "personalMemoryDisplay.useChatHistory"
+};
+function personalMemoryApprovalDisplay(toolName, display) {
+	const name = mutationNameFromQualifiedTool(toolName);
+	if (name === void 0) return void 0;
+	const action = personalMemoryActionLabel(toolName);
+	const parsed = parsePersonalMemoryMutation(name, display.kind === "generic" ? display.detail : void 0);
+	const invalid = {
+		action,
+		description: uiText("personalMemoryDisplay.invalidInput"),
+		blocks: [],
+		valid: false
+	};
+	if (!parsed.ok) return invalid;
+	const text = parsed.kind === "remember" ? memoryContentPreview(parsed.content) : Object.keys(settingLabels).filter((key) => parsed.body[key] !== void 0).map((key) => uiText("personalMemoryDisplay.settingLine", {
+		setting: uiText(settingLabels[key]),
+		value: uiText(parsed.body[key] ? "personalMemoryDisplay.enabled" : "personalMemoryDisplay.disabled")
+	})).join("\n");
+	if (text.length === 0) return invalid;
+	return {
+		action,
+		description: "",
+		blocks: [{
+			type: "brief",
+			text
+		}],
+		valid: true
+	};
+}
+function memoryContentPreview(content) {
+	const controls = /[\u0000-\u0009\u000B-\u001F\u007F-\u009F\u2028-\u202E\u2066-\u2069]/gu;
+	if (!controls.test(content)) return content;
+	return JSON.stringify(content).replaceAll(controls, (character) => `\\u${character.codePointAt(0).toString(16).padStart(4, "0")}`);
+}
+function personalMemoryArgumentPreview(toolName, value) {
+	return isPersonalMemoryToolName$1(toolName) ? memoryContentPreview(value) : value;
+}
+function personalMemoryActionLabel(toolName) {
+	const name = mutationNameFromQualifiedTool(toolName);
+	if (name === void 0) return void 0;
+	return uiText(name === "memory_settings_update" ? "personalMemoryDisplay.settingsAction" : "personalMemoryDisplay.rememberAction");
+}
+function personalMemoryActivityLabel(toolName) {
+	return isPersonalMemoryToolName$1(toolName) ? uiText("startupPersonalMemory.title") : void 0;
+}
+//#endregion
 //#region src/tui/utils/shell-output.copy.ts
 registerUiCatalogFragment({
 	en: { "shellOutput.noOutput": "(no output)" },
@@ -516785,7 +517349,8 @@ function extractKeyArgument(toolName, args, workspaceDir) {
 	for (const key of candidates) {
 		const val = args[key];
 		if (typeof val === "string" && val.length > 0) {
-			const firstLine = val.split("\n")[0] ?? val;
+			const preview = personalMemoryArgumentPreview(toolName, val);
+			const firstLine = preview.split("\n")[0] ?? preview;
 			return formatKeyArgument(toolName, key, toolName === "Bash" && val.includes("\n") ? `${firstLine}…` : firstLine, workspaceDir);
 		}
 	}
@@ -517594,6 +518159,8 @@ var ToolCallComponent = class ToolCallComponent extends Container {
 			if (phrase !== void 0) return `${bullet}${currentTheme.boldFg("primary", phrase)}${argStr}${chipStr}`;
 		}
 		const verbStyled = isTruncated ? currentTheme.fg("error", verb) : verb;
+		const memoryLabel = personalMemoryActivityLabel(toolCall.name);
+		if (memoryLabel !== void 0) return `${bullet}${isTruncated ? `${verbStyled} ` : ""}${currentTheme.boldFg("primary", memoryLabel)}${argStr}${chipStr}`;
 		const toolLabel = decoded !== null ? `${currentTheme.boldFg("primary", decoded.toolName)}${currentTheme.dim(` · MCP/${decoded.serverName}`)}` : currentTheme.boldFg("primary", toolCall.name);
 		return `${bullet}${verbStyled} ${toolLabel}${argStr}${chipStr}`;
 	}
@@ -517680,15 +518247,19 @@ var ToolCallComponent = class ToolCallComponent extends Container {
 		for (const sub of this.finishedSubCalls) {
 			const mark = sub.isError ? currentTheme.fg("error", "✗") : currentTheme.fg("success", "•");
 			const keyArg = extractKeyArgument(sub.name, sub.args, this.workspaceDir);
-			const nameCol = currentTheme.fg("primary", sub.name);
+			const memoryLabel = personalMemoryActivityLabel(sub.name);
+			const nameCol = currentTheme.fg("primary", memoryLabel ?? sub.name);
+			const verb = memoryLabel === void 0 ? `${uiText("toolCall.activity.used")} ` : "";
 			const argCol = keyArg ? currentTheme.dim(` (${keyArg})`) : "";
-			this.addChild(new Text(`    ${mark} ${uiText("toolCall.activity.used")} ${nameCol}${argCol}`, 0, 0));
+			this.addChild(new Text(`    ${mark} ${verb}${nameCol}${argCol}`, 0, 0));
 		}
 		for (const [id, call] of this.ongoingSubCalls) {
 			const keyArg = extractKeyArgument(call.name, call.args, this.workspaceDir);
-			const nameCol = currentTheme.fg("primary", call.name);
+			const memoryLabel = personalMemoryActivityLabel(call.name);
+			const nameCol = currentTheme.fg("primary", memoryLabel ?? call.name);
+			const verb = memoryLabel === void 0 ? `${uiText("toolCall.activity.using")} ` : "";
 			const argCol = keyArg ? currentTheme.dim(` (${keyArg})`) : "";
-			this.addChild(new Text(`    ${currentTheme.dim("…")} ${uiText("toolCall.activity.using")} ${nameCol}${argCol}`, 0, 0));
+			this.addChild(new Text(`    ${currentTheme.dim("…")} ${verb}${nameCol}${argCol}`, 0, 0));
 		}
 		if (this.subagentText.length > 0) {
 			const tailLines = this.subagentText.split("\n").slice(-3);
@@ -517858,10 +518429,11 @@ var ToolCallComponent = class ToolCallComponent extends Container {
 		if (current === void 0) return currentTheme.dim(`  · ${countLabel}`);
 		const verb = current.phase === "ongoing" ? uiText("toolCall.activity.using") : uiText("toolCall.activity.used");
 		const keyArg = extractKeyArgument(current.name, current.args, this.workspaceDir);
-		const nameCol = currentTheme.fg("primary", current.name);
+		const memoryLabel = personalMemoryActivityLabel(current.name);
+		const nameCol = currentTheme.fg("primary", memoryLabel ?? current.name);
 		const argCol = keyArg ? currentTheme.dim(` (${keyArg})`) : "";
 		const mark = current.phase === "failed" ? currentTheme.fg("error", " ✗") : current.phase === "done" ? currentTheme.fg("success", " ✓") : "";
-		return `${currentTheme.dim(`  · ${countLabel} · `)}${verb} ${nameCol}${argCol}${mark}`;
+		return `${currentTheme.dim(`  · ${countLabel} · `)}${memoryLabel === void 0 ? `${verb} ` : ""}${nameCol}${argCol}${mark}`;
 	}
 	buildSingleSubagentActiveWindow() {
 		const gutter = currentTheme.dim("│");
@@ -520963,7 +521535,7 @@ function renderDisplayBlock(block, s, contentWidth) {
 			if (block.description !== void 0 && block.description.length > 0) lines.push(s.dim(truncateOneLine(block.description, 200)));
 			return lines;
 		}
-		case "brief": return block.text ? block.text.split("\n").map((line) => line.length > 0 ? s.strong(line) : "") : [];
+		case "brief": return block.text ? block.text.split("\n").flatMap((line) => line.length > 0 ? wrapTextWithAnsi(s.strong(line), contentWidth) : [""]) : [];
 		case "background_task": return [s.strong(uiText("approval.backgroundTask", {
 			status: block.status,
 			kind: block.kind,
@@ -520988,6 +521560,8 @@ function isDuplicateBriefBlock(block, description) {
 	return normalizeApprovalText(blockLines.slice(1).join("\n")) === normalizedDescription;
 }
 function headerFor(toolName) {
+	const memoryAction = personalMemoryActionLabel(toolName);
+	if (memoryAction !== void 0) return memoryAction;
 	switch (toolName) {
 		case "Bash": return uiText("approval.header.runCommand");
 		case "Write": return uiText("approval.header.writeFile");
@@ -523524,7 +524098,8 @@ function planRejectChoices() {
 	}];
 }
 function adaptApprovalRequest(event) {
-	const resolved = resolveDisplay(event.toolName, event.display, event.action);
+	const memory = personalMemoryApprovalDisplay(event.toolName, event.display);
+	const resolved = memory ?? resolveDisplay(event.toolName, event.display, event.action);
 	return {
 		id: event.toolCallId,
 		tool_call_id: event.toolCallId,
@@ -523532,7 +524107,7 @@ function adaptApprovalRequest(event) {
 		action: resolved.action ?? event.action,
 		description: resolved.description,
 		display: resolved.blocks,
-		choices: adaptChoices(event.toolName, event.display)
+		choices: memory === void 0 ? adaptChoices(event.toolName, event.display) : defaultApprovalChoices().filter((choice) => choice.response === "rejected" || memory.valid && choice.response === "approved")
 	};
 }
 function resolveDisplay(toolName, display, action) {
@@ -527602,13 +528177,6 @@ async function preparePersonalMemorySession(options) {
 //#endregion
 //#region src/personal-memory/mcp-server.ts
 init_zod$1();
-const PERSONAL_MEMORY_TOOL_NAMES = [
-	"memory_status",
-	"memory_settings_update",
-	"memory_remember",
-	"memory_list",
-	"memory_recall"
-];
 const MANAGEMENT_TOOL_NAMES = [
 	"memory_status",
 	"memory_settings_update",
@@ -527625,12 +528193,8 @@ function personalMemoryToolNames(mode, capabilities = defaultPersonalMemoryCapab
 const noInputSchema = object$1({}).strict();
 const schemas = {
 	memory_status: noInputSchema,
-	memory_settings_update: object$1({
-		memoryEnabled: boolean$1().optional(),
-		useSavedMemories: boolean$1().optional(),
-		allowNewMemories: boolean$1().optional()
-	}).strict().refine((value) => Object.keys(value).length > 0),
-	memory_remember: object$1({ content: string().min(1).max(4e3) }).strict(),
+	memory_settings_update: personalMemorySettingsInputSchema,
+	memory_remember: personalMemoryRememberInputSchema,
 	memory_list: noInputSchema,
 	memory_recall: object$1({
 		query: string().min(1).max(1e3),
@@ -527652,20 +528216,18 @@ function personalMemoryToolDefinition(name) {
 }
 async function invokePersonalMemoryTool(client, name, input, context) {
 	if (!isPersonalMemoryToolName(name)) throw new Error("Unsupported personal-memory tool.");
+	if (name === "memory_settings_update" || name === "memory_remember") {
+		const parsed = parsePersonalMemoryMutation(name, input);
+		if (!parsed.ok) throw new Error("Invalid personal-memory tool arguments.");
+		if (parsed.kind === "settings") return client.request("PUT", PERSONAL_MEMORY_SETTINGS_PATH, parsed.body);
+		if (context?.explicitRememberAttested !== true) throw new PersonalMemoryBrokerError("EXPLICIT_CONSENT_REQUIRED");
+		return client.request(PERSONAL_MEMORY_MEMORY_CREATE_METHOD, PERSONAL_MEMORY_MEMORIES_PATH, explicitPersonalMemoryBody(parsed.content));
+	}
 	const parsed = schemas[name].safeParse(input);
 	if (!parsed.success) throw new Error("Invalid personal-memory tool arguments.");
 	const args = parsed.data;
 	switch (name) {
 		case "memory_status": return client.request("GET", PERSONAL_MEMORY_SETTINGS_PATH);
-		case "memory_settings_update": return await client.request("PUT", PERSONAL_MEMORY_SETTINGS_PATH, compactObject({
-			memory_enabled: args["memoryEnabled"],
-			use_saved_memories: args["useSavedMemories"] ?? (args["memoryEnabled"] === true ? true : void 0),
-			allow_new_memories: args["allowNewMemories"] ?? (args["memoryEnabled"] === true ? true : void 0),
-			use_chat_history: args["memoryEnabled"] === true ? false : void 0
-		}));
-		case "memory_remember":
-			if (context?.explicitRememberAttested !== true) throw new PersonalMemoryBrokerError("EXPLICIT_CONSENT_REQUIRED");
-			return client.request(PERSONAL_MEMORY_MEMORY_CREATE_METHOD, PERSONAL_MEMORY_MEMORIES_PATH, explicitPersonalMemoryBody(args["content"]));
 		case "memory_list": return client.request("GET", PERSONAL_MEMORY_MEMORIES_PATH);
 		case "memory_recall": return normalizePhaseOneRecall(await client.request(PERSONAL_MEMORY_RECALL_METHOD, PERSONAL_MEMORY_RECALL_PATH, { query: args["query"] }), args["limit"]);
 	}
@@ -527673,9 +528235,6 @@ async function invokePersonalMemoryTool(client, name, input, context) {
 function isPersonalMemoryToolName(name) {
 	return PERSONAL_MEMORY_TOOL_NAMES.includes(name);
 }
-function compactObject(input) {
-	return Object.fromEntries(Object.entries(input).filter(([, value]) => value !== void 0));
-}
 function normalizePhaseOneRecall(payload, limit) {
 	if (!isRecord$2(payload) || !Array.isArray(payload["ergebnis"])) throw new PersonalMemoryBrokerError("INVALID_PAYLOAD");
 	const results = payload["ergebnis"];
@@ -530675,7 +531234,9 @@ var SessionEventHandler = class {
 				this.handleStepCompleted(event);
 				this.host.releaseChannelQueueAtSafePoint();
 				break;
-			case "turn.step.retrying": break;
+			case "turn.step.retrying":
+				this.host.streamingUI.setActivityRetrying();
+				break;
 			case "tool.progress":
 				this.handleToolProgress(event);
 				break;
@@ -533458,6 +534019,9 @@ var StreamingUIController = class {
 	_currentTurnId = void 0;
 	_currentStep = 0;
 	_lastToolName = "none";
+	activityWords = new ThinkingActivityRotator();
+	activityRetrying = false;
+	activityFailed = false;
 	_liveTurnStartedAtMs = void 0;
 	_sessionTotalTokens;
 	_liveOutputTokens = new LiveOutputTokenCounter();
@@ -533487,18 +534051,37 @@ var StreamingUIController = class {
 	}
 	setStep(step) {
 		this._currentStep = step;
+		this.activityRetrying = false;
+	}
+	setActivityRetrying() {
+		this.activityRetrying = true;
+	}
+	getActivityLabel(composing = false) {
+		let activeCall;
+		for (const call of this._activeToolCalls.values()) if (call.result === void 0 && !call.truncated) activeCall = call;
+		const group = composing && activeCall === void 0 && !this.activityRetrying ? "Creating" : inferThinkingActivityGroup(activeCall, {
+			retrying: this.activityRetrying,
+			failed: this.activityFailed
+		});
+		return `${this.activityWords.resolve(group)}…`;
 	}
 	getLastToolName() {
 		return this._lastToolName;
 	}
 	resetSessionDiagnostics() {
 		this._lastToolName = "none";
+		this.activityWords = new ThinkingActivityRotator();
+		this.activityRetrying = false;
+		this.activityFailed = false;
 	}
 	hasActiveTurn() {
 		return this._currentTurnId !== void 0;
 	}
 	beginLiveTurn() {
 		this._liveTurnStartedAtMs = Date.now();
+		this.activityWords = new ThinkingActivityRotator();
+		this.activityRetrying = false;
+		this.activityFailed = false;
 		this._liveOutputTokens.reset();
 		this._countedToolCallIds.clear();
 	}
@@ -533714,6 +534297,8 @@ var StreamingUIController = class {
 	*  component, and returns whether the call was new (no previous entry). */
 	registerToolCall(toolCall) {
 		this._lastToolName = toolCall.name;
+		this.activityRetrying = false;
+		this.activityFailed = false;
 		if (!this._countedToolCallIds.has(toolCall.id)) {
 			this._countedToolCallIds.add(toolCall.id);
 			this.recordLiveOutput(`${toolCall.name}${JSON.stringify(toolCall.args)}`);
@@ -533763,7 +534348,10 @@ var StreamingUIController = class {
 	*  Returns the matched ToolCallBlockData, or undefined if no call was tracked. */
 	completeToolResult(toolCallId, result) {
 		const matchedCall = this._activeToolCalls.get(toolCallId);
-		if (matchedCall !== void 0) this.onToolCallEnd(toolCallId, result);
+		if (matchedCall !== void 0) {
+			this.activityFailed = result.is_error === true;
+			this.onToolCallEnd(toolCallId, result);
+		}
 		this._activeToolCalls.delete(toolCallId);
 		this._streamingToolCallArguments.delete(toolCallId);
 		return matchedCall;
@@ -533976,7 +534564,7 @@ var StreamingUIController = class {
 		if (this._activeThinkingComponent === void 0) {
 			this._pendingAgentGroup = null;
 			this._pendingReadGroup = null;
-			this._activeThinkingComponent = new ThinkingComponent(fullText, true, "live", state.ui, { ...this.getLiveActivityMetrics() });
+			this._activeThinkingComponent = new ThinkingComponent(fullText, true, "live", state.ui, { ...this.getLiveActivityMetrics() }, () => this.getActivityLabel());
 			if (state.toolOutputExpanded) this._activeThinkingComponent.setExpanded(true);
 			state.transcriptContainer.addChild(this._activeThinkingComponent);
 		} else {
@@ -535815,6 +536403,7 @@ var ApprovalController = class extends ReverseRpcController {
 		if (response.decision !== "approved") return void 0;
 		if (response.scope !== "session") return void 0;
 		if (!resolvedPayload.choices.some((choice) => choice.response === "approved_for_session")) return;
+		if (!queuedPayload.choices.some((choice) => choice.response === "approved_for_session")) return;
 		if (resolvedPayload.action !== queuedPayload.action) return void 0;
 		return {
 			decision: "approved",
@@ -540353,7 +540942,7 @@ var BlunTUI = class {
 		const metrics = this.streamingUI.getLiveActivityMetrics();
 		const startedAtMs = metrics.startedAtMs ?? this.activitySpinnerFallbackStartMs;
 		const mode = this.resolveActivityPaneMode();
-		return liveActivityLabels(mode === "waiting" || mode === "thinking" ? rotatingThinkingLabel(personaName() ?? "King", startedAtMs) : this.activitySpinnerBaseLabel, {
+		return liveActivityLabels(mode === "waiting" || mode === "thinking" || mode === "tool" || mode === "composing" ? `${personaName() ?? "King"} ${this.streamingUI.getActivityLabel(mode === "composing")}` : this.activitySpinnerBaseLabel, {
 			...metrics,
 			startedAtMs
 		});