blun-king-cli 9.1.536 → 9.1.561

package/blun.mjs

@@ -1,10 +1,11 @@
 #!/usr/bin/env node
-// BLUN_BUILD_INPUT_SHA256:804ef7d1988621941a7f328013311dcf55daa850695958e9d322a7eb3f92e699
+// BLUN_BUILD_INPUT_SHA256:058cccc03f986fac95f89d198bb56bfa928b0c5117340651158d2f731509129c
 import { fileURLToPath as __cjsShimFileURLToPath } from 'node:url';
 import { dirname as __cjsShimDirname } from 'node:path';
 const __filename = __cjsShimFileURLToPath(import.meta.url);
 const __dirname = __cjsShimDirname(__filename);
 import { createRequire } from "node:module";
+const { htmlToResearchMarkdown } = createRequire(import.meta.url)("./bin/html-to-research-markdown.cjs");
 import telegramConsoleStatusPolicy from "./bin/telegram-console-status-policy.cjs";
 import cognitiveGoalAutostartPolicy from "./bin/cognitive-goal-autostart-policy.cjs";
 import cognitiveGoalTimeTriggerController from "./bin/cognitive-goal-time-trigger-controller.cjs";
@@ -16,7 +17,8 @@ import sessionScrollbackArchive from "./bin/session-scrollback-archive.cjs";
 import sessionReplayWindowPolicy from "./bin/session-replay-window-policy.cjs";
 import globPatternPolicy from "./bin/glob-pattern-policy.cjs";
 import userHomePathPolicy from "./bin/user-home-path-policy.cjs";
-import fredrikGlmProviderPolicy from "./bin/fredrik-glm-provider.cjs";
+import editableToolApprovalPolicy from "./bin/editable-tool-approval-policy.cjs";
+import editableToolApprovalRuntime from "./bin/editable-tool-approval-runtime.cjs";
 import crypto$1, { createHash, randomBytes, randomInt, randomUUID, timingSafeEqual } from "node:crypto";
 import * as fs$16 from "node:fs";
 import Kt, { accessSync, appendFileSync, chmodSync, closeSync, constants, copyFileSync, createReadStream, createWriteStream, existsSync, fsyncSync, linkSync, lstatSync, mkdirSync, openSync, promises, readFileSync, readSync, readdirSync, realpathSync, renameSync, rmSync, statSync, unlinkSync, writeFileSync, writeSync } from "node:fs";
@@ -58,17 +60,13 @@ const { replayWindowStartIndex, resolveReplayActiveTurnCount } = sessionReplayWi
 const { globPatternError } = globPatternPolicy;
 const { unsupportedUserHomePathError } = userHomePathPolicy;
 const {
-	PROVIDER_ID: FREDRIK_GLM_PROVIDER_ID,
-	PROVIDER_TYPE: FREDRIK_GLM_PROVIDER_TYPE,
-	MODEL_EFFORTS: FREDRIK_GLM_EFFORTS,
-	configuredModels: configuredFredrikGlmModels,
-	configuredProvider: configuredFredrikGlmProvider,
-	isAllowedRuntimeAlias: isAllowedFredrikRuntimeAlias,
-	isConfiguredAlias: isConfiguredFredrikGlmAlias,
-	normalizeEffort: normalizeFredrikGlmEffort,
-	requestControls: fredrikGlmRequestControls,
-	readApiKeyFile: readFredrikGlmApiKeyFile
-} = fredrikGlmProviderPolicy;
+	buildApprovalEditedEvent,
+	canonicalEditedToolInputJson,
+	isEditableToolApprovalEligible,
+	parseEditedToolInputJson,
+	validateEditedApprovalDecision
+} = editableToolApprovalPolicy;
+const { buildEditedToolCallPlan } = editableToolApprovalRuntime;
 import { EventEmitter as EventEmitter$1 } from "node:events";
 import { StringDecoder } from "node:string_decoder";
 import co from "node:assert";
@@ -2733,7 +2731,6 @@ var init_blun = __esmMin((() => {
 		_defaultHeaders;
 		_generationKwargs;
 		_supportEfforts;
-		_openAICompatible;
 		_client;
 		_clientFactory;
 		_files;
@@ -2747,7 +2744,6 @@ var init_blun = __esmMin((() => {
 			this._stream = options.stream ?? true;
 			this._generationKwargs = { ...options.generationKwargs };
 			this._supportEfforts = options.supportEfforts ?? [];
-			this._openAICompatible = options.openAICompatible === true;
 			this._client = this._apiKey === void 0 ? void 0 : createFetchHttpClient({
 				apiKey: this._apiKey,
 				baseUrl: this._baseUrl,
@@ -2802,8 +2798,6 @@ var init_blun = __esmMin((() => {
 			}
 			const kwargs = { ...this._generationKwargs };
 			for (const key of Object.keys(kwargs)) if (kwargs[key] === void 0) delete kwargs[key];
-			if (kwargs["max_completion_tokens"] === void 0 && kwargs["max_tokens"] !== void 0) kwargs["max_completion_tokens"] = kwargs["max_tokens"];
-			delete kwargs["max_tokens"];
 			const { extra_body: extraBody, ...requestKwargs } = kwargs;
 			const extraBodyRecord = typeof extraBody === "object" && extraBody !== null ? { ...extraBody } : {};
 			const thinking = sanitizeThinkingConfig(extraBodyRecord.thinking);
@@ -2859,17 +2853,8 @@ var init_blun = __esmMin((() => {
 			delete requestExtraBody["model"];
 			delete requestExtraBody["messages"];
 			if (!thinkingDisabled && thinking?.keep !== void 0) requestExtraBody["thinking"] = { keep: thinking.keep };
-			let reasoningRequested;
-			if (this._openAICompatible) {
-				delete requestKwargs["chat_template_kwargs"];
-				const controls = fredrikGlmRequestControls(effectiveThinkingEffort ?? "max");
-				requestExtraBody["thinking"] = controls.thinking;
-				requestExtraBody["reasoning_effort"] = controls.reasoning_effort;
-				reasoningRequested = true;
-			} else {
-				const effectiveTemplateKwargs = requestKwargs["chat_template_kwargs"];
-				reasoningRequested = typeof effectiveTemplateKwargs === "object" && effectiveTemplateKwargs !== null && effectiveTemplateKwargs.thinking === true;
-			}
+			const effectiveTemplateKwargs = requestKwargs["chat_template_kwargs"];
+			const reasoningRequested = typeof effectiveTemplateKwargs === "object" && effectiveTemplateKwargs !== null && effectiveTemplateKwargs.thinking === true;
 			const createParams = {
 				model: this._model,
 				messages,
@@ -2923,7 +2908,7 @@ var init_blun = __esmMin((() => {
 		withMaxCompletionTokens(maxCompletionTokens, options) {
 			let cap = maxCompletionTokens;
 			if (options?.usedContextTokens !== void 0 && options?.maxContextTokens !== void 0 && options.maxContextTokens > 0) cap = Math.min(cap, options.maxContextTokens - options.usedContextTokens);
-			return this._withGenerationKwargs({ max_completion_tokens: Math.max(1, cap) });
+			return this._withGenerationKwargs({ max_tokens: Math.max(1, cap) });
 		}
 		withExtraBody(extraBody) {
 			const oldExtra = this._generationKwargs.extra_body ?? {};
@@ -10013,7 +9998,7 @@ var init_schema = __esmMin((() => {
 	init_matches_rule();
 	init_errors$8();
 	init_zod$1();
-	ProviderTypeSchema = union([literal("blun"), literal("openai_compatible")]);
+	ProviderTypeSchema = literal("blun");
 	OAuthRefSchema = object({
 		storage: _enum(["file", "keyring"]),
 		key: string().min(1),
@@ -10023,7 +10008,6 @@ var init_schema = __esmMin((() => {
 	ProviderConfigSchema = object({
 		type: ProviderTypeSchema,
 		apiKey: string().optional(),
-		apiKeyFile: string().optional(),
 		baseUrl: string().optional(),
 		defaultModel: string().optional(),
 		oauth: OAuthRefSchema.optional(),
@@ -14687,7 +14671,7 @@ async function refreshProviderModels(host, options = {}) {
 var BLUN_LOCAL_PROVIDER_NAME;
 var init_refreshProviderModels = __esmMin((() => {
 	init_managed_blun();
-	BLUN_LOCAL_PROVIDER_NAME = "king-blun";
+	BLUN_LOCAL_PROVIDER_NAME = "blun";
 }));
 //#endregion
 //#region ../../packages/oauth/src/index.ts
@@ -15945,6 +15929,8 @@ function loadRuntimeConfigSafe(filePath, env = process.env) {
 	} catch (error) {
 		envWarnings.push(`Ignoring BLUN_MODEL_* environment overrides: ${describeUnknownError(error)}`);
 	}
+	const { applyDefaultModelOutputBudget } = createRequire(import.meta.url)("./bin/default-model-output-budget-policy.cjs");
+	config = applyDefaultModelOutputBudget(config);
 	return {
 		config,
 		fileWarnings,
@@ -21405,7 +21391,10 @@ var init_flags = __esmMin((() => {
 var RawSubagentProfileSchema, RawAgentProfileSchema;
 var init_types$13 = __esmMin((() => {
 	init_zod$1();
-	RawSubagentProfileSchema = object({ description: string().optional() });
+	RawSubagentProfileSchema = object({
+		description: string().optional(),
+		skills: array(string()).optional()
+	});
 	RawAgentProfileSchema = object({
 		extends: string().optional(),
 		name: string().min(1),
@@ -28499,10 +28488,13 @@ function linkResolvedSubagents(mergedProfiles, resolvedProfiles) {
 	for (const [ownerName, owner] of mergedProfiles) {
 		if (owner.subagents === void 0) continue;
 		const subagents = {};
-		for (const subagentName of Object.keys(owner.subagents)) {
+		for (const [subagentName, subagentBinding] of Object.entries(owner.subagents)) {
 			const target = resolvedProfiles.get(subagentName);
 			if (target === void 0) throwMissingSubagent(ownerName, subagentName);
-			subagents[subagentName] = target;
+			subagents[subagentName] = subagentBinding.skills === void 0 ? target : {
+				...target,
+				subagentSkills: [...subagentBinding.skills]
+			};
 		}
 		const resolved = resolvedProfiles.get(ownerName);
 		if (resolved !== void 0) resolved.subagents = subagents;
@@ -28568,10 +28560,12 @@ var init_load = __esmMin((() => {
 //#region ../../packages/agent-core/src/profile/default/agent.yaml?raw
 var agent_default$1;
 var init_agent$3 = __esmMin((() => {
-	agent_default$1 = "name: agent\ndescription: Default BLUN King agent\n\nsystemPromptPath: ./system.md\npromptVars:\n  roleAdditional: ''\n\ntools:\n  - Read\n  - Write\n  - Edit\n  - Grep\n  - Glob\n  - Bash\n  - TaskList\n  - TaskOutput\n  - TaskUpdate\n  - TaskStop\n  - CronCreate\n  - CronList\n  - CronDelete\n  - ReadMediaFile\n  - TodoList\n  - Skill\n  - WebSearch\n  - Agent\n  - AgentSwarm\n  - FetchURL\n  - GenerateImage\n  - GenerateVideo\n  - GenerateSpeech\n  - UnderstandImage\n  - UnderstandVideo\n  - DubVideo\n  - LipSyncMedia\n  - GetMedia\n  - AskUserQuestion\n  - MistakeRecord\n  - CodebaseSearch\n  - EnterPlanMode\n  - ExitPlanMode\n  - CreateGoal\n  - GetGoal\n  - SetGoalBudget\n  - UpdateGoal\n  - mcp__*\n\nsubagents:\n  coder:\n    description: General software engineering agent — the only subagent type with file-editing tools; use it for any delegated task that must modify code.\n  explore:\n    description: Fast codebase exploration with prompt-enforced read-only behavior.\n  plan:\n    description: Read-only implementation planning and architecture design.\n";
+	agent_default$1 = "name: agent\ndescription: Default BLUN King agent\n\nsystemPromptPath: ./system.md\npromptVars:\n  roleAdditional: ''\n\ntools:\n  - Read\n  - Write\n  - Edit\n  - Grep\n  - Glob\n  - Bash\n  - TaskList\n  - TaskOutput\n  - TaskUpdate\n  - TaskResume\n  - TaskStop\n  - CronCreate\n  - CronList\n  - CronDelete\n  - ReadMediaFile\n  - TodoList\n  - Skill\n  - WebSearch\n  - Agent\n  - AgentSwarm\n  - FetchURL\n  - GenerateImage\n  - GenerateVideo\n  - GenerateSpeech\n  - UnderstandImage\n  - UnderstandVideo\n  - DubVideo\n  - LipSyncMedia\n  - GetMedia\n  - AskUserQuestion\n  - MistakeRecord\n  - CodebaseSearch\n  - EnterPlanMode\n  - ExitPlanMode\n  - CreateGoal\n  - GetGoal\n  - SetGoalBudget\n  - UpdateGoal\n  - mcp__*\n\nsubagents:\n  coder:\n    description: General software engineering agent — the only subagent type with file-editing tools; use it for any delegated task that must modify code.\n  explore:\n    description: Fast codebase exploration with prompt-enforced read-only behavior.\n  plan:\n    description: Read-only implementation planning and architecture design.\n";
+	agent_default$1 = agent_default$1.replace("  plan:\n", "  research:\n    description: Read-only web and source research with an explicit two-skill allowlist.\n    skills:\n      - web-lesen\n      - premortem\n  plan:\n");
 	agent_default$1 = agent_default$1.replace("  - Read\n", "  - Read\n  - ReadBatch\n");
 	agent_default$1 = agent_default$1.replace("  - TodoList\n", "  - TodoList\n  - CompactConversation\n");
 	agent_default$1 = agent_default$1.replace("  - CodebaseSearch\n", "  - CodebaseSearch\n  - ProgrammaticTool\n");
+	agent_default$1 = agent_default$1.replace("  - CronList\n", "  - CronList\n  - CronRunList\n  - CronRunOutput\n");
 }));
 //#endregion
 //#region ../../packages/agent-core/src/profile/default/coder.yaml?raw
@@ -28590,6 +28584,13 @@ var init_explore = __esmMin((() => {
 	explore_default = explore_default.replace("  - ReadBatch\n", "  - ReadBatch\n  - ProgrammaticTool\n");
 }));
 //#endregion
+//#region ../../packages/agent-core/src/profile/default/research.yaml?raw
+var research_default;
+var init_research = __esmMin((() => {
+	init_explore();
+	research_default = explore_default.replace("name: explore\n", "name: research\n").replace("Fast agent specialized for exploring codebases.", "Read-only agent specialized for source and web research with profile-scoped skills.");
+}));
+//#endregion
 //#region ../../packages/agent-core/src/profile/default/init.md?raw
 var init_default$2;
 var init_init = __esmMin((() => {
@@ -28620,6 +28621,7 @@ var init_default$1 = __esmMin((() => {
 	coder_default = coder_default.replace("\nwhenToUse:", "\nexcludedTools:\n  - mcp__plugin-telegram_telegram__reply\n  - mcp__plugin-telegram_telegram__react\n  - mcp__plugin-telegram_telegram__edit_message\n  - mcp__plugin-telegram_telegram__download_attachment\n\nwhenToUse:");
 	init_explore();
 	explore_default = explore_default.replace("\nwhenToUse:", "\nexcludedTools:\n  - mcp__plugin-telegram_telegram__reply\n  - mcp__plugin-telegram_telegram__react\n  - mcp__plugin-telegram_telegram__edit_message\n  - mcp__plugin-telegram_telegram__download_attachment\n\nwhenToUse:");
+	init_research();
 	init_init();
 	init_plan$1();
 	plan_default = plan_default.replace("\nwhenToUse:", "\nexcludedTools:\n  - mcp__plugin-telegram_telegram__reply\n  - mcp__plugin-telegram_telegram__react\n  - mcp__plugin-telegram_telegram__edit_message\n  - mcp__plugin-telegram_telegram__download_attachment\n\nwhenToUse:");
@@ -28630,6 +28632,7 @@ var init_default$1 = __esmMin((() => {
 		"profile/default/agent.yaml": agent_default$1,
 		"profile/default/coder.yaml": coder_default,
 		"profile/default/explore.yaml": explore_default,
+		"profile/default/research.yaml": research_default,
 		"profile/default/plan.yaml": plan_default,
 		"profile/default/system.md": system_default
 	};
@@ -28638,6 +28641,7 @@ var init_default$1 = __esmMin((() => {
 		"agent.yaml",
 		"coder.yaml",
 		"explore.yaml",
+		"research.yaml",
 		"plan.yaml"
 	].map((file) => `profile/default/${file}`), PROFILE_SOURCES);
 }));
@@ -29132,6 +29136,9 @@ var init_agent_task = __esmMin((() => {
 		runInBackground;
 		parentToolCallId;
 		responseFormat;
+		resumed;
+		replacesTaskId;
+		resumeRootTaskId;
 		kind = "agent";
 		idPrefix = "agent";
 		agentId;
@@ -29145,6 +29152,9 @@ var init_agent_task = __esmMin((() => {
 			this.runInBackground = options.runInBackground;
 			this.parentToolCallId = options.parentToolCallId;
 			this.responseFormat = options.responseFormat;
+			this.resumed = options.resumed;
+			this.replacesTaskId = options.replacesTaskId;
+			this.resumeRootTaskId = options.resumeRootTaskId;
 			this.agentId = handle.agentId;
 			this.subagentType = handle.profileName;
 		}
@@ -29197,7 +29207,10 @@ var init_agent_task = __esmMin((() => {
 				timeoutMs: this.continuationTimeoutMs,
 				kind: "agent",
 				agentId: this.agentId,
-				subagentType: this.subagentType
+				subagentType: this.subagentType,
+				resumed: this.resumed,
+				replacesTaskId: this.replacesTaskId,
+				resumeRootTaskId: this.resumeRootTaskId
 			};
 		}
 	};
@@ -29470,6 +29483,11 @@ function buildBackgroundTaskNotificationBody(info) {
 	if (info.status === "completed") return baseLine;
 	const agentId = info.agentId;
 	if (agentId === void 0 || agentId === info.taskId) return baseLine;
+	if (info.status === "lost") return `${baseLine}${[
+		"",
+		`To recover this interrupted background run explicitly, call TaskResume(task_id="${info.taskId}", prompt="Inspect the preserved state and continue without repeating completed side effects.", description="Resume ${info.description}").`,
+		`TaskResume keeps agent_id "${agentId}" and its context, creates a new linked task_id, and never runs automatically at startup.`
+	].join("\n")}`;
 	return `${baseLine}${[
 		"",
 		`To recover or continue this subagent, call Agent(resume="${agentId}", prompt="Pick up where you left off; redo the last tool call if its result was never observed.").`,
@@ -29478,7 +29496,7 @@ function buildBackgroundTaskNotificationBody(info) {
 		"The subagent retains its full prior context across the restart, but any in-flight tool call lost its result and may need to be redone."
 	].join("\n")}`;
 }
-var MAX_OUTPUT_BYTES$2, NOTIFICATION_FALLBACK_PREVIEW_BYTES, MAX_FOREGROUND_CAPTURE_BYTES, captureForegroundOutputChunk, createAbortOutcome, SIGTERM_GRACE_MS$1, USER_INTERRUPT_REASON$1, _ALPHABET, BackgroundManager;
+var MAX_OUTPUT_BYTES$2, NOTIFICATION_FALLBACK_PREVIEW_BYTES, MAX_FOREGROUND_CAPTURE_BYTES, captureForegroundOutputChunk, createAbortOutcome, DurableTaskResumeStore$1, decorateTaskInfo$1, SIGTERM_GRACE_MS$1, USER_INTERRUPT_REASON$1, _ALPHABET, BackgroundManager;
 var init_background = __esmMin((() => {
 	init_dist$4();
 	init_errors$4();
@@ -29494,13 +29512,17 @@ var init_background = __esmMin((() => {
 	NOTIFICATION_FALLBACK_PREVIEW_BYTES = 3e3;
 	({ MAX_FOREGROUND_CAPTURE_BYTES, captureForegroundOutputChunk } = createRequire(import.meta.url)("./bin/foreground-output-capture-policy.cjs"));
 	({ createAbortOutcome } = createRequire(import.meta.url)("./bin/abort-listener-policy.cjs"));
+	({ DurableTaskResumeStore: DurableTaskResumeStore$1 } = createRequire(import.meta.url)("./bin/durable-task-resume-store.cjs"));
+	({ decorateTaskInfo: decorateTaskInfo$1 } = createRequire(import.meta.url)("./bin/durable-task-resume-policy.cjs"));
 	SIGTERM_GRACE_MS$1 = 5e3;
 	USER_INTERRUPT_REASON$1 = "Interrupted by user";
 	_ALPHABET = "0123456789abcdefghijklmnopqrstuvwxyz";
 	BackgroundManager = class {
 		agent;
 		persistence;
+		resumeStore;
 		tasks = /* @__PURE__ */ new Map();
+		reservedTaskIds = /* @__PURE__ */ new Set();
 		/**
 		* Ghosts: tasks loaded from disk during reconcile that have no live
 		* KaosProcess. They appear in `list()` / `getTask()` with status
@@ -29512,6 +29534,7 @@ var init_background = __esmMin((() => {
 		constructor(agent, persistence) {
 			this.agent = agent;
 			this.persistence = persistence;
+			this.resumeStore = persistence?.sessionDir ? new DurableTaskResumeStore$1(persistence.sessionDir) : void 0;
 		}
 		fireTerminalEffects(entry) {
 			if (!this.isDetached(entry)) return;
@@ -29555,6 +29578,13 @@ var init_background = __esmMin((() => {
 		isDetached(entry) {
 			return entry.foregroundRelease === void 0;
 		}
+		reserveTaskId(prefix) {
+			let taskId;
+			do taskId = generateTaskId(prefix);
+			while (this.tasks.has(taskId) || this.ghosts.has(taskId) || this.reservedTaskIds.has(taskId) || this.resumeStore?.list().some((intent) => intent.replacementTaskId === taskId));
+			this.reservedTaskIds.add(taskId);
+			return taskId;
+		}
 		registerTask(task, options = {}) {
 			const detached = options.detached ?? true;
 			const entryOptions = {
@@ -29564,7 +29594,10 @@ var init_background = __esmMin((() => {
 				signal: detached ? void 0 : options.signal
 			};
 			this.assertCanRegister(detached);
-			const taskId = generateTaskId(task.idPrefix);
+			const taskId = options.taskId ?? this.reserveTaskId(task.idPrefix);
+			if (!VALID_TASK_ID$1.test(taskId)) throw new Error(`Invalid task id: "${taskId}"`);
+			if (this.tasks.has(taskId) || this.ghosts.has(taskId)) throw new Error(`Task id already exists: ${taskId}`);
+			this.reservedTaskIds.delete(taskId);
 			const entry = {
 				taskId,
 				task,
@@ -29598,8 +29631,8 @@ var init_background = __esmMin((() => {
 		/** Get info about a specific task. Falls back to reconcile ghosts. */
 		getTask(taskId) {
 			const entry = this.tasks.get(taskId);
-			if (entry !== void 0) return this.toInfo(entry);
-			return this.ghosts.get(taskId);
+			const info = entry !== void 0 ? this.toInfo(entry) : this.ghosts.get(taskId);
+			return decorateTaskInfo$1(info, this.resumeStore?.getBySourceTaskId(taskId));
 		}
 		updateAgentTask(taskId, message) {
 			const entry = this.tasks.get(taskId);
@@ -29622,12 +29655,13 @@ var init_background = __esmMin((() => {
 		list(activeOnly = true, limit) {
 			const result = [];
 			for (const entry of this.tasks.values()) {
-				const info = this.toInfo(entry);
+				const info = decorateTaskInfo$1(this.toInfo(entry), this.resumeStore?.getBySourceTaskId(entry.taskId));
 				if (!this.shouldListTask(info, activeOnly)) continue;
 				result.push(info);
 				if (limit !== void 0 && result.length >= limit) return result;
 			}
-			if (!activeOnly) for (const ghost of this.ghosts.values()) {
+			if (!activeOnly) for (const storedGhost of this.ghosts.values()) {
+				const ghost = decorateTaskInfo$1(storedGhost, this.resumeStore?.getBySourceTaskId(storedGhost.taskId));
 				if (!this.shouldListTask(ghost, activeOnly)) continue;
 				result.push(ghost);
 				if (limit !== void 0 && result.length >= limit) return result;
@@ -29775,6 +29809,7 @@ var init_background = __esmMin((() => {
 		async loadFromDisk() {
 			const persistence = this.persistence;
 			if (persistence === void 0) return;
+			await this.resumeStore?.load();
 			this.ghosts.clear();
 			const persisted = await persistence.listTasks();
 			for (const t of persisted) {
@@ -29820,6 +29855,11 @@ var init_background = __esmMin((() => {
 			entry.persistWriteQueue = entry.persistWriteQueue.then(() => persistence.writeTask(info)).catch(() => {});
 			return entry.persistWriteQueue;
 		}
+		async awaitTaskPersisted(taskId) {
+			const entry = this.tasks.get(taskId);
+			if (entry === void 0) throw new Error(`Task not found: ${taskId}`);
+			await entry.persistWriteQueue;
+		}
 		appendOutput(entry, chunk) {
 			const capture = this.isDetached(entry) ? {
 				capturedText: chunk,
@@ -30307,7 +30347,6 @@ function resolveCompletionBudget(args) {
 	const fromLegacy = parseEnvBudget(env["BLUN_MODEL_MAX_TOKENS"]);
 	if (fromLegacy !== "absent") return fromLegacy === "disabled" ? void 0 : { hardCap: fromLegacy };
 	if (args.maxOutputSize !== void 0 && args.maxOutputSize > 0) return { hardCap: args.maxOutputSize };
-	if (args.reservedContextSize !== void 0 && args.reservedContextSize > 0) return { fallback: args.reservedContextSize };
 	return { fallback: DEFAULT_UNKNOWN_CONTEXT_FALLBACK };
 }
 function parseEnvBudget(raw) {
@@ -30360,13 +30399,12 @@ function applyCompletionBudgetWithDetails(args) {
 var MIN_FLOOR, DEFAULT_UNKNOWN_CONTEXT_FALLBACK, MIN_THINKING_COMPLETION_TOKENS, COMPLETION_CONTEXT_SAFETY_MARGIN;
 var init_completion_budget = __esmMin((() => {
 	MIN_FLOOR = 1;
-	DEFAULT_UNKNOWN_CONTEXT_FALLBACK = 32e3;
+	DEFAULT_UNKNOWN_CONTEXT_FALLBACK = 65536;
 	MIN_THINKING_COMPLETION_TOKENS = 1024;
 	COMPLETION_CONTEXT_SAFETY_MARGIN = 1e4;
 }));
 //#endregion
 //#region ../../packages/agent-core/src/loop/retry.ts
-var { nextThinkingEffortForExhaustedEmpty } = createRequire(import.meta.url)("./bin/empty-response-retry-policy.cjs");
 async function chatWithRetry(input) {
 	const maxAttempts = input.maxAttempts ?? 3;
 	if (input.llm.isRetryableError === void 0 || maxAttempts <= 1) {
@@ -30380,10 +30418,9 @@ async function chatWithRetry(input) {
 	}
 	const delays = retryBackoffDelays(maxAttempts);
 	let completionBudgetRetry;
-	let thinkingEffortRetry;
 	let emptyRetryKind;
 	for (let attempt = 1;; attempt += 1) try {
-		return await input.llm.chat(paramsForAttempt(input, attempt, maxAttempts, completionBudgetRetry, thinkingEffortRetry));
+		return await input.llm.chat(paramsForAttempt(input, attempt, maxAttempts, completionBudgetRetry));
 	} catch (error) {
 		if (error instanceof APIEmptyResponseError && (emptyRetryKind !== void 0 || error.emptyResponseKind === "length" || error.emptyResponseKind === "stop")) {
 			logEmptyResponse(input, error, attempt);
@@ -30393,24 +30430,24 @@ async function chatWithRetry(input) {
 				throw terminal;
 			}
 			completionBudgetRetry = completionBudgetRetryForEmpty(error);
-			thinkingEffortRetry = nextThinkingEffortForExhaustedEmpty({
-				emptyResponseKind: error.emptyResponseKind,
-				maxCompletionTokens: error.maxCompletionTokens,
-				completionTokens: error.completionTokens,
-				thinkingEffort: input.llm.thinkingEffort
-			});
 			emptyRetryKind = error.emptyResponseKind;
 			input.params.signal.throwIfAborted();
-			input.dispatchEvent({
-				type: "step.retrying",
-				turnId: input.turnId,
-				step: input.currentStep,
-				stepUuid: input.stepUuid,
-				failedAttempt: attempt,
-				nextAttempt: attempt + 1,
-				maxAttempts,
-				delayMs: 0,
-				...retryErrorFields(error)
+			await persistRetrySchedule({
+				dispatchRetrying: input.dispatchEvent,
+				flush: input.checkpointBeforeRetryWait,
+				signal: input.params.signal,
+				event: {
+					type: "step.retrying",
+					turnId: input.turnId,
+					step: input.currentStep,
+					stepUuid: input.stepUuid,
+					failedAttempt: attempt,
+					nextAttempt: attempt + 1,
+					maxAttempts,
+					delayMs: 0,
+					...completionBudgetIntervention(error, completionBudgetRetry),
+					...retryErrorFields(error)
+				}
 			});
 			continue;
 		}
@@ -30420,17 +30457,22 @@ async function chatWithRetry(input) {
 		}
 		const delayMs = retryDelayForError(error, delays[attempt - 1] ?? 0);
 		input.params.signal.throwIfAborted();
-		input.dispatchEvent({
-			type: "step.retrying",
-			turnId: input.turnId,
-			step: input.currentStep,
-			stepUuid: input.stepUuid,
-			failedAttempt: attempt,
-			nextAttempt: attempt + 1,
-			maxAttempts,
-			delayMs,
-			outputMayHaveStarted: input.llm.didErrorEmitPartialOutput?.(error) === true,
-			...retryErrorFields(error)
+		await persistRetrySchedule({
+			dispatchRetrying: input.dispatchEvent,
+			flush: input.checkpointBeforeRetryWait,
+			signal: input.params.signal,
+			event: {
+				type: "step.retrying",
+				turnId: input.turnId,
+				step: input.currentStep,
+				stepUuid: input.stepUuid,
+				failedAttempt: attempt,
+				nextAttempt: attempt + 1,
+				maxAttempts,
+				delayMs,
+				outputMayHaveStarted: input.llm.didErrorEmitPartialOutput?.(error) === true,
+				...retryErrorFields(error)
+			}
 		});
 		await sleepForRetry(delayMs, input.params.signal);
 	}
@@ -30442,6 +30484,14 @@ function completionBudgetRetryForEmpty(error) {
 		multiplier: 2
 	};
 }
+function completionBudgetIntervention(error, retryBudget) {
+	const before = Number(error.maxCompletionTokens);
+	if (retryBudget === void 0 || !Number.isFinite(before) || before <= 0) return {};
+	return {
+		completionBudgetBefore: before,
+		completionBudgetAfter: Math.max(retryBudget.minimumCompletionTokens, Math.ceil(before * retryBudget.multiplier))
+	};
+}
 function retryDelayForError(error, fallbackDelayMs) {
 	if (!(error instanceof APIProviderRateLimitError) || error.retryAfterMs === null) return fallbackDelayMs;
 	return Math.max(fallbackDelayMs, error.retryAfterMs);
@@ -30455,12 +30505,11 @@ function logRequestFailure(input, error, attempt, maxAttempts) {
 		...retryErrorFields(error)
 	});
 }
-function paramsForAttempt(input, attempt, maxAttempts, completionBudgetRetry, thinkingEffortRetry) {
+function paramsForAttempt(input, attempt, maxAttempts, completionBudgetRetry) {
 	const turnStep = `${input.turnId}.${String(input.currentStep)}`;
 	return {
 		...input.params,
 		completionBudgetRetry,
-		thinkingEffortRetry,
 		requestLogFields: attempt === 1 ? { turnStep } : {
 			turnStep,
 			attempt: `${String(attempt)}/${String(maxAttempts)}`
@@ -30468,19 +30517,12 @@ function paramsForAttempt(input, attempt, maxAttempts, completionBudgetRetry, th
 	};
 }
 function logEmptyResponse(input, error, attempt) {
-	const retryThinkingEffort = nextThinkingEffortForExhaustedEmpty({
-		emptyResponseKind: error.emptyResponseKind,
-		maxCompletionTokens: error.maxCompletionTokens,
-		completionTokens: error.completionTokens,
-		thinkingEffort: input.llm.thinkingEffort
-	});
 	input.log?.warn(`[leer] fall=${error.emptyResponseKind}`, {
 		turnStep: `${input.turnId}.${String(input.currentStep)}`,
 		attempt,
 		budget: error.maxCompletionTokens,
 		completion: error.completionTokens,
-		reasoningLength: error.reasoningLength,
-		...retryThinkingEffort === void 0 ? {} : { retryThinkingEffort }
+		reasoningLength: error.reasoningLength
 	});
 }
 function retryBackoffDelays(maxAttempts) {
@@ -30508,7 +30550,7 @@ function maybeStatusCode(error) {
 	const statusCode = error.statusCode;
 	return typeof statusCode === "number" ? statusCode : void 0;
 }
-var import_retry$1, RETRY_MIN_TIMEOUT_MS, RETRY_MAX_TIMEOUT_MS, RETRY_FACTOR;
+var import_retry$1, RETRY_MIN_TIMEOUT_MS, RETRY_MAX_TIMEOUT_MS, RETRY_FACTOR, persistRetrySchedule;
 var init_retry = __esmMin((() => {
 	init_dist$4();
 	init_src$4();
@@ -30516,6 +30558,7 @@ var init_retry = __esmMin((() => {
 	init_abort();
 	init_completion_budget();
 	init_errors$4();
+	({ persistRetrySchedule } = createRequire(import.meta.url)("./bin/retry-checkpoint-policy.cjs"));
 	RETRY_MIN_TIMEOUT_MS = 300;
 	RETRY_MAX_TIMEOUT_MS = 5e3;
 	RETRY_FACTOR = 2;
@@ -30653,7 +30696,7 @@ var init_programmatic_tool = __esmMin((() => {
 	PROGRAMMATIC_TOOL_NAME = "ProgrammaticTool";
 	ProgrammaticTool = class {
 		name = PROGRAMMATIC_TOOL_NAME;
-		description = "Run bounded JavaScript in an isolated QuickJS interpreter to coordinate several sequential BLUN tool calls without returning every intermediate value to the model context. Declare every callable tool explicitly with its current BLUN name and a JavaScript alias. Calls still pass through the normal schema, hook, permission, scheduler, event, and result pipeline; denied or unavailable tools fail inside the program. The interpreter has no host filesystem, network, process, package loader, clock, or dynamic eval. Return a JSON-serializable result and use the JSON state object only for explicit continuation.";
+		description = "Run bounded JavaScript in an isolated QuickJS interpreter to coordinate several sequential BLUN tool calls without returning every intermediate value to the model context. Declare every callable tool explicitly with its current BLUN name and a JavaScript alias. Calls still pass through the normal schema, hook, permission, scheduler, event, and result pipeline; denied or unavailable tools fail inside the program. The interpreter has no host filesystem, network, process, package loader, clock, or dynamic eval. Use bounded console.log, console.warn, or console.error diagnostics when needed. Return a JSON-serializable result and use the JSON state object only for explicit continuation.";
 		parameters = {
 			type: "object",
 			properties: {
@@ -30724,8 +30767,13 @@ var init_programmatic_tool = __esmMin((() => {
 						if (context.invokeTool.stopTurn === true) result.stopTurn = true;
 						return result;
 					} catch (error) {
+						const message = error instanceof Error ? error.message : String(error);
+						const programmaticConsole = error && typeof error === "object" ? error.programmaticConsole : void 0;
 						const result = {
-							output: error instanceof Error ? error.message : String(error),
+							output: programmaticConsole ? JSON.stringify({
+								error: message,
+								console: programmaticConsole
+							}) : message,
 							isError: true
 						};
 						if (context.invokeTool.stopTurn === true) result.stopTurn = true;
@@ -74888,6 +74936,25 @@ var init_kosong_llm = __esmMin((() => {
 		get thinkingEffort() {
 			return this.provider.thinkingEffort;
 		}
+		describeRequest(messages, tools, retry) {
+			const outgoingRequestTokens = estimateSystemPromptTokens(this.systemPrompt) + estimateTokensForTools(tools) + estimateTokensForMessages(messages);
+			const reportedContextTokens = this.reportedContextTokens?.() ?? 0;
+			const details = applyCompletionBudgetWithDetails({
+				provider: this.provider,
+				budget: this.completionBudgetConfig,
+				capability: this.capability,
+				usedContextTokens: Math.max(outgoingRequestTokens, reportedContextTokens),
+				retry: retry ?? (thinkingEnabled(this.provider.thinkingEffort) ? {
+					minimumCompletionTokens: 1024,
+					multiplier: 1
+				} : void 0)
+			});
+			return {
+				thinkingEffort: this.provider.thinkingEffort,
+				completionBudget: details.maxCompletionTokens,
+				details
+			};
+		}
 		notifyMediaDropped(dropped) {
 			if (this.onMediaDropped === void 0) return;
 			const fresh = dropped.filter((part) => {
@@ -74930,25 +74997,12 @@ var init_kosong_llm = __esmMin((() => {
 			let result;
 			let completionBudget;
 			try {
-				const requestProvider = params.thinkingEffortRetry === void 0 ? this.provider : this.provider.withThinking(params.thinkingEffortRetry);
 				const enrichedMessages = this.visionReader === void 0 ? params.messages : await enrichMessagesWithVision(params.messages, this.visionReader, params.signal, this.onVisionUsage);
 				const tools = [...params.tools];
 				const outgoingMessages = downgradeUnsupportedMedia(enrichedMessages, this.capability, (dropped) => {
 					this.notifyMediaDropped(dropped);
 				});
-				const outgoingRequestTokens = estimateSystemPromptTokens(this.systemPrompt) + estimateTokensForTools(tools) + estimateTokensForMessages(outgoingMessages);
-				const reportedContextTokens = this.reportedContextTokens?.() ?? 0;
-				const usedContextTokens = Math.max(outgoingRequestTokens, reportedContextTokens);
-				completionBudget = applyCompletionBudgetWithDetails({
-					provider: requestProvider,
-					budget: this.completionBudgetConfig,
-					capability: this.capability,
-					usedContextTokens,
-					retry: params.completionBudgetRetry ?? (thinkingEnabled(requestProvider.thinkingEffort) ? {
-						minimumCompletionTokens: 1024,
-						multiplier: 1
-					} : void 0)
-				});
+				completionBudget = this.describeRequest(outgoingMessages, tools, params.completionBudgetRetry).details;
 				result = await this.generate(completionBudget.provider, this.systemPrompt, tools, outgoingMessages, callbacks, options);
 			} catch (error) {
 				if (error instanceof APIEmptyResponseError) throw error.withMetadata({ maxCompletionTokens: completionBudget === void 0 ? null : completionBudget.maxCompletionTokens ?? null });
@@ -75471,12 +75525,13 @@ function extractCompactionSummary(response) {
 	if (summary.trim().length === 0) throw new APIEmptyResponseError("The compaction response did not contain a non-empty summary.");
 	return summary;
 }
-var archiveCompactionHistory, buildCompactionArchiveNotice, capCompactionCompletionTokens, capCompactionStageTarget, proactiveCompactionEligibility, waitForAbortableCompletion, COMPACTION_THINKING_EFFORT, COMPACTION_SYSTEM_PROMPT, COMPACTION_SUMMARY_RESERVE_RATIO, MAX_HIERARCHICAL_COMPACTION_PASSES, HIERARCHICAL_COMPACTION_PREFIX, CompactionTruncatedError, CompactionStallError, COMPACTION_STALL_MEASUREMENT_MULTIPLIER, REBUILT_AFTER_COMPACTION_INJECTION_VARIANTS, FullCompaction, MAX_COMPACTION_OVERFLOW_SHRINK_ATTEMPTS, COMPACTION_OVERFLOW_SHRINK_RATIOS;
+var archiveCompactionHistory, buildCompactionArchiveNotice, capCompactionCompletionTokens, capCompactionStageTarget, proactiveCompactionEligibility, assertBalancedToolPairs, createCompactionTransaction, endCompactionTransaction, summarizeCompactionTransaction, waitForAbortableCompletion, COMPACTION_THINKING_EFFORT, COMPACTION_SYSTEM_PROMPT, COMPACTION_SUMMARY_RESERVE_RATIO, MAX_HIERARCHICAL_COMPACTION_PASSES, HIERARCHICAL_COMPACTION_PREFIX, CompactionTruncatedError, CompactionStallError, COMPACTION_STALL_MEASUREMENT_MULTIPLIER, REBUILT_AFTER_COMPACTION_INJECTION_VARIANTS, FullCompaction, MAX_COMPACTION_OVERFLOW_SHRINK_ATTEMPTS, COMPACTION_OVERFLOW_SHRINK_RATIOS;
 var init_full = __esmMin((() => {
 	({ archiveCompactionHistory, buildCompactionArchiveNotice } = createRequire(import.meta.url)("./bin/compaction-history-archive.cjs"));
 	({ waitForAbortableCompletion } = createRequire(import.meta.url)("./bin/abort-listener-policy.cjs"));
 	({ capCompactionCompletionTokens, capCompactionStageTarget } = createRequire(import.meta.url)("./bin/compaction-stage-policy.cjs"));
 	({ proactiveCompactionEligibility } = createRequire(import.meta.url)("./bin/proactive-compaction-policy.cjs"));
+	({ assertBalancedToolPairs, createCompactionTransaction, endCompactionTransaction, summarizeCompactionTransaction } = createRequire(import.meta.url)("./bin/compaction-transaction-policy.cjs"));
 	init_errors$8();
 	init_src$4();
 	init_errors$4();
@@ -75563,23 +75618,27 @@ var init_full = __esmMin((() => {
 			const budget = this.strategy.compactionBudgetTokens;
 			return budget !== void 0 && Number.isFinite(budget) && budget > 0 ? Math.floor(budget) : void 0;
 		}
-		proactiveCompactionStatus() {
-			return proactiveCompactionEligibility({
-				usedTokens: this.estimateCurrentRequestTokens(),
-				budgetTokens: this.getCompactionBudgetTokens(),
-				hasShrinkableHistory: this.hasShrinkableHistory(this.agent.context.history),
-				isCompacting: this.isCompacting
-			});
+		proactiveCompactionStatus(context = {}) {
+			const usedTokens = this.estimateCurrentRequestTokens(context);
+			return {
+				...proactiveCompactionEligibility({
+					usedTokens,
+					budgetTokens: this.getCompactionBudgetTokens(),
+					hasShrinkableHistory: this.hasShrinkableHistory(this.agent.context.history),
+					isCompacting: this.isCompacting
+				}),
+				usedTokens
+			};
 		}
 		isProactiveCompactionEligible() {
 			return this.proactiveCompactionStatus().eligible;
 		}
-		requestProactiveCompaction() {
-			const status = this.proactiveCompactionStatus();
+		requestProactiveCompaction(context = {}) {
+			const status = this.proactiveCompactionStatus(context);
 			if (!status.eligible) return status;
 			this.proactiveCompactionRequested = true;
 			this.agent.telemetry.track("proactive_compaction_requested", {
-				used_tokens: this.estimateCurrentRequestTokens(),
+				used_tokens: status.usedTokens,
 				threshold_tokens: status.thresholdTokens
 			});
 			return status;
@@ -75623,6 +75682,15 @@ var init_full = __esmMin((() => {
 			}
 			if (this.agent.context.history.length === 0) throw new BlunError(ErrorCodes.COMPACTION_UNABLE, "No messages to compact in current history.");
 			if (data.source === "manual" && this.agent.turn.hasActiveTurn) throw new BlunError(ErrorCodes.COMPACTION_UNABLE, "Cannot compact while a turn is active. Wait for it to finish, then retry.");
+			const history = this.agent.context.history;
+			assertBalancedToolPairs(history, "history selected for full compaction");
+			const { transaction, record: transactionStart } = createCompactionTransaction({
+				source: data.source,
+				turnId: this.agent.turn.hasActiveTurn ? this.agent.turn.currentId : null,
+				tokensBefore: estimateTokensForMessages(history),
+				messageCountBefore: history.length
+			});
+			this.agent.records.logRecord(transactionStart);
 			this.agent.records.logRecord({
 				type: "full_compaction.begin",
 				...data
@@ -75635,20 +75703,32 @@ var init_full = __esmMin((() => {
 			const abortController = new AbortController();
 			this.compacting = {
 				abortController,
-				promise: this.compactionWorker(abortController.signal, data),
+				promise: this.compactionWorker(abortController.signal, data, transaction),
+				transaction,
 				blockedByTurn: false
 			};
 		}
-		cancel() {
+		closeTransaction(status, error) {
+			const transaction = this.compacting?.transaction;
+			if (transaction === void 0) return;
+			const record = endCompactionTransaction(transaction, {
+				status,
+				...error === void 0 ? {} : { error: error instanceof Error ? `${error.name}: ${error.message}` : String(error) }
+			});
+			if (record !== void 0) this.agent.records.logRecord(record);
+		}
+		cancel(error) {
 			this.agent.replayBuilder.patchLast("compaction", { result: "cancelled" });
 			if (!this.compacting) return;
 			this.agent.records.logRecord({ type: "full_compaction.cancel" });
+			this.closeTransaction(error === void 0 ? "cancelled" : "failed", error);
 			this.compacting.abortController.abort();
 			this.compacting = null;
 			this.agent.emitEvent({ type: "compaction.cancelled" });
 		}
 		markCompleted() {
 			this.agent.records.logRecord({ type: "full_compaction.complete" });
+			this.closeTransaction("success");
 			this.compacting = null;
 		}
 		get tokenCountWithPending() {
@@ -75675,9 +75755,19 @@ var init_full = __esmMin((() => {
 			const requestMessages = requestContext.messages ?? this.agent.context.messages;
 			const projectedMessages = requestContext.additionalMessages === void 0 ? requestMessages : [...requestMessages, ...requestContext.additionalMessages];
 			const requestTokens = this.estimateCurrentRequestTokens(requestContext);
-			const proactiveStatus = this.requestProactiveCompaction();
+			const proactiveStatus = this.requestProactiveCompaction(requestContext);
 			if (proactiveStatus.eligible) {
 				this.proactiveCompactionRequested = false;
+				this.agent.records.logRecord({
+					type: "policy.intervention",
+					policy: "proactive_compaction_trigger",
+					location: "FullCompaction.beforeStep",
+					size_before: this.estimateCurrentRequestTokens(),
+					size_after: proactiveStatus.usedTokens,
+					unit: "tokens",
+					threshold_tokens: proactiveStatus.thresholdTokens,
+					selected_tool_count: requestContext.tools?.length ?? 0
+				});
 				if (!this.compacting) this.beginAutoCompaction();
 				await this.block(signal);
 			}
@@ -75747,9 +75837,9 @@ var init_full = __esmMin((() => {
 				await waitForAbortableCompletion(signal, active.promise, onAbort);
 			}
 		}
-		async compactionWorker(signal, data) {
+		async compactionWorker(signal, data, transaction) {
 			try {
-				const output = await this.compactionRound(signal, data);
+				const output = await this.compactionRound(signal, data, transaction);
 				if (!output) return;
 				const { result, stageCount } = output;
 				try {
@@ -75774,9 +75864,12 @@ var init_full = __esmMin((() => {
 				});
 				this.triggerPostCompactHook(data, result);
 			} catch (error) {
-				if (isAbortError$4(error)) return;
+				if (isAbortError$4(error)) {
+					if (this.compacting?.transaction === transaction) this.cancel();
+					return;
+				}
 				const blockedByTurn = this.compacting?.blockedByTurn === true;
-				this.cancel();
+				this.cancel(error);
 				this.agent.log.error("compaction failed", { error });
 				if (blockedByTurn) throw error;
 				this.agent.emitEvent({
@@ -75796,7 +75889,7 @@ var init_full = __esmMin((() => {
 			const todoMarkdown = renderTodoList(todos, "## TODO List");
 			return `${summary.trim()}\n\n${todoMarkdown}`;
 		}
-		async compactionRound(signal, data) {
+		async compactionRound(signal, data, transaction) {
 			const startedAt = Date.now();
 			const originalHistory = [...this.agent.context.history];
 			const tokensBefore = estimateTokensForMessages(originalHistory);
@@ -76072,7 +76165,9 @@ var init_full = __esmMin((() => {
 					contextSummary,
 					compactedCount: originalHistory.length,
 					tokensBefore,
-					droppedCount: droppedCount === 0 ? void 0 : droppedCount
+					droppedCount: droppedCount === 0 ? void 0 : droppedCount,
+					transaction,
+					historyBefore: originalHistory
 				});
 				this.agent.telemetry.track("compaction_finished", {
 					source: data.source,
@@ -76183,10 +76278,18 @@ var init_full = __esmMin((() => {
 }));
 //#endregion
 //#region ../../packages/agent-core/src/agent/compaction/micro.ts
-var selectMicroCompactionCutoff, MICRO_COMPACTION_RECENT_MESSAGES, MICRO_COMPACTION_TOOL_ARGUMENTS_ENABLED, MICRO_COMPACTION_TOOL_ARGUMENT_MIN_TOKENS, isPersistedToolResultReference, freshToolResultIds, projectHistoricalUnaddressedTelegramMessages, dedupeRepeatedUserMessages, projectRepeatedAssistantResponses, compactHistoricalSkillActivations, dedupeRecurringCronWakeups, dedupeRepeatedInjections, projectLoopEventForRecord, projectUsageModelForRecord, projectUsageForRecord, resolveCompletedStepUuid, resolveStepEventUuid, restoreUsageFromRecord, restoreUsageModelFromRecord, isWireOnlyProgrammaticEvent, DEFAULT_CONFIG, MicroCompaction;
+function repeatedToolResultReference(marker, newestToolCallId) {
+	if (newestToolCallId === void 0) return marker;
+	return [
+		marker,
+		`same_as_tool_call_id: ${newestToolCallId}`,
+		"reason: identical successful result for the same tool call arguments"
+	].join("\n");
+}
+var selectMicroCompactionCutoff, redundantHistoricalToolResultReferences, MICRO_COMPACTION_RECENT_MESSAGES, MICRO_COMPACTION_TOOL_ARGUMENTS_ENABLED, MICRO_COMPACTION_TOOL_ARGUMENT_MIN_TOKENS, isPersistedToolResultReference, freshToolResultIds, projectHistoricalUnaddressedTelegramMessages, dedupeRepeatedUserMessages, projectRepeatedAssistantResponses, compactHistoricalSkillActivations, dedupeRecurringCronWakeups, dedupeRepeatedInjections, projectLoopEventForRecord, projectUsageModelForRecord, projectUsageForRecord, resolveCompletedStepUuid, resolveStepEventUuid, restoreUsageFromRecord, restoreUsageModelFromRecord, isWireOnlyProgrammaticEvent, DEFAULT_CONFIG, MicroCompaction;
 var init_micro = __esmMin((() => {
 	({ isWireOnlyProgrammaticEvent } = createRequire(import.meta.url)("./bin/programmatic-context-isolation.cjs"));
-	({ selectMicroCompactionCutoff, MICRO_COMPACTION_RECENT_MESSAGES, MICRO_COMPACTION_TOOL_ARGUMENTS_ENABLED, MICRO_COMPACTION_TOOL_ARGUMENT_MIN_TOKENS } = createRequire(import.meta.url)("./bin/micro-compaction-policy.cjs"));
+	({ selectMicroCompactionCutoff, redundantHistoricalToolResultReferences, MICRO_COMPACTION_RECENT_MESSAGES, MICRO_COMPACTION_TOOL_ARGUMENTS_ENABLED, MICRO_COMPACTION_TOOL_ARGUMENT_MIN_TOKENS } = createRequire(import.meta.url)("./bin/micro-compaction-policy.cjs"));
 	({ isPersistedToolResultReference, freshToolResultIds } = createRequire(import.meta.url)("./bin/tool-result-offload-policy.cjs"));
 	({ projectHistoricalUnaddressedTelegramMessages } = createRequire(import.meta.url)("./bin/telegram-context-projection-policy.cjs"));
 	({ dedupeRepeatedUserMessages } = createRequire(import.meta.url)("./bin/repeated-user-message-projection.cjs"));
@@ -76201,7 +76304,7 @@ var init_micro = __esmMin((() => {
 		compactToolArguments: MICRO_COMPACTION_TOOL_ARGUMENTS_ENABLED,
 		minToolArgumentTokens: MICRO_COMPACTION_TOOL_ARGUMENT_MIN_TOKENS,
 		cacheMissedThresholdMs: 3600 * 1e3,
-		truncatedMarker: "[Old tool result content cleared]",
+		truncatedMarker: "[Repeated tool result omitted]",
 		truncatedArgumentsMarker: "[Old tool call arguments cleared]",
 		minContextUsageRatio: .5
 	};
@@ -76249,10 +76352,18 @@ var init_micro = __esmMin((() => {
 			const effect = this.measureEffect(history, selection.cutoff);
 			const previousEffect = this.measureEffect(history, previousCutoff);
 			if (effect.truncatedToolResultCount <= previousEffect.truncatedToolResultCount && effect.truncatedToolArgumentCount <= previousEffect.truncatedToolArgumentCount) return;
-			this.apply(selection.cutoff);
 			const rawContextTokens = estimateTokensForMessages(history);
 			const tokensBefore = rawContextTokens - previousEffect.truncatedToolResultTokensBefore + previousEffect.truncatedToolResultTokensAfter - previousEffect.truncatedToolArgumentTokensBefore + previousEffect.truncatedToolArgumentTokensAfter;
 			const tokensAfter = rawContextTokens - effect.truncatedToolResultTokensBefore + effect.truncatedToolResultTokensAfter - effect.truncatedToolArgumentTokensBefore + effect.truncatedToolArgumentTokensAfter;
+			this.apply(selection.cutoff);
+			this.agent.records.logRecord({
+				type: "policy.intervention",
+				policy: "repeated_tool_result_projection",
+				location: "MicroCompaction.detect",
+				size_before: tokensBefore,
+				size_after: tokensAfter,
+				unit: "tokens"
+			});
 			this.agent.telemetry.track("micro_compaction_finished", {
 				trigger: selection.trigger,
 				keep_recent_messages: config.keepRecentMessages,
@@ -76284,15 +76395,16 @@ var init_micro = __esmMin((() => {
 			const historicalArgumentCutoff = Math.max(this.cutoff, messages.length - config.keepRecentMessages);
 			const completedToolCallIds = new Set(messages.filter((message) => message?.role === "tool" && message.toolCallId !== void 0).map((message) => message.toolCallId));
 			const protectedToolResultIds = freshToolResultIds(messages);
+			const reducibleToolResultIds = redundantHistoricalToolResultReferences(messages, this.cutoff);
 			const serializedArgumentsMarker = JSON.stringify({ _blun_compacted: config.truncatedArgumentsMarker });
 			const result = [];
 			let i = 0;
 			for (const msg of messages) {
-				if (i < this.cutoff && msg.role === "tool" && msg.toolCallId !== void 0 && !protectedToolResultIds.has(msg.toolCallId) && !isPersistedToolResultReference(msg.content) && estimateTokensForContentParts(msg.content) >= config.minContentTokens) result.push({
+				if (i < this.cutoff && msg.role === "tool" && msg.toolCallId !== void 0 && reducibleToolResultIds.has(msg.toolCallId) && !protectedToolResultIds.has(msg.toolCallId) && !isPersistedToolResultReference(msg.content) && estimateTokensForContentParts(msg.content) >= config.minContentTokens) result.push({
 					...msg,
 					content: [{
 						type: "text",
-						text: config.truncatedMarker
+						text: repeatedToolResultReference(config.truncatedMarker, reducibleToolResultIds.get(msg.toolCallId))
 					}]
 				});
 				else if (config.compactToolArguments && i < historicalArgumentCutoff && msg.role === "assistant" && Array.isArray(msg.toolCalls)) {
@@ -76321,7 +76433,6 @@ var init_micro = __esmMin((() => {
 			return result;
 		}
 		measureEffect(messages, cutoff) {
-			let markerTokenCount;
 			let argumentsMarkerTokenCount;
 			let truncatedToolResultCount = 0;
 			let truncatedToolResultTokensBefore = 0;
@@ -76331,19 +76442,20 @@ var init_micro = __esmMin((() => {
 			let truncatedToolArgumentTokensAfter = 0;
 			const completedToolCallIds = new Set(messages.filter((message) => message?.role === "tool" && message.toolCallId !== void 0).map((message) => message.toolCallId));
 			const protectedToolResultIds = freshToolResultIds(messages);
+			const reducibleToolResultIds = redundantHistoricalToolResultReferences(messages, cutoff);
 			const serializedArgumentsMarker = JSON.stringify({ _blun_compacted: this.config.truncatedArgumentsMarker });
 			for (let i = 0; i < messages.length && i < cutoff; i++) {
 				const message = messages[i];
-				if (message?.role === "tool" && message.toolCallId !== void 0 && !protectedToolResultIds.has(message.toolCallId) && !isPersistedToolResultReference(message.content)) {
+				if (message?.role === "tool" && message.toolCallId !== void 0 && reducibleToolResultIds.has(message.toolCallId) && !protectedToolResultIds.has(message.toolCallId) && !isPersistedToolResultReference(message.content)) {
 					const contentTokens = estimateTokensForContentParts(message.content);
 					if (contentTokens >= this.config.minContentTokens) {
-						markerTokenCount ??= estimateTokensForContentParts([{
-							type: "text",
-							text: this.config.truncatedMarker
-						}]);
 						truncatedToolResultCount += 1;
 						truncatedToolResultTokensBefore += contentTokens;
-						truncatedToolResultTokensAfter += markerTokenCount;
+						const replacement = repeatedToolResultReference(this.config.truncatedMarker, reducibleToolResultIds.get(message.toolCallId));
+						truncatedToolResultTokensAfter += estimateTokensForContentParts([{
+							type: "text",
+							text: replacement
+						}]);
 					}
 				}
 				if (!this.config.compactToolArguments || message?.role !== "assistant" || !Array.isArray(message.toolCalls)) continue;
@@ -76556,6 +76668,9 @@ function isValidCronTask(obj) {
 	if (o["paused"] !== void 0 && typeof o["paused"] !== "boolean") return false;
 	if (o["autoExpire"] !== void 0 && typeof o["autoExpire"] !== "boolean") return false;
 	if (o["scheduleFromAt"] !== void 0 && (typeof o["scheduleFromAt"] !== "number" || !Number.isFinite(o["scheduleFromAt"]))) return false;
+	if (o["allowedTools"] !== void 0 && (!Array.isArray(o["allowedTools"]) || !o["allowedTools"].every((name) => typeof name === "string"))) return false;
+	if (o["allowedTools"] !== void 0 && typeof o["toolScopeDigest"] !== "string") return false;
+	if (o["allowedTools"] === void 0 && o["toolScopeDigest"] !== void 0) return false;
 	if (o["owner"] === "session-loop" && (typeof o["loopInterval"] !== "string" || o["loopInterval"].length === 0 || o["recurring"] === false || o["autoExpire"] !== false)) return false;
 	return true;
 }
@@ -77333,7 +77448,7 @@ function hasUnfinishedTodoWork(agent) {
 	const todos = agent.tools.storeData()["todo"];
 	return Array.isArray(todos) && todos.some((todo) => todo?.status === "in_progress" || todo?.status === "pending");
 }
-var STALE_THRESHOLD_MS, CronManager;
+var STALE_THRESHOLD_MS, normalizeCronAllowedTools, cronToolScopeForTask, filterToolsForCronScope, inheritedCronToolScope, createCronRunReceipt, buildCronFileCandidate, publicCronRunList, createCronRunStore, createMemoryCronRunStore, readCronFinalMessage, CronManager;
 var init_manager$3 = __esmMin((() => {
 	init_clock();
 	init_cron_fire_xml();
@@ -77341,6 +77456,17 @@ var init_manager$3 = __esmMin((() => {
 	init_session_store$2();
 	init_scheduler();
 	init_telemetry_events();
+	({
+		normalizeCronAllowedTools,
+		cronToolScopeForTask,
+		filterToolsForCronScope,
+		inheritedCronToolScope,
+		createCronRunReceipt,
+		buildCronFileCandidate,
+		publicCronRunList
+	} = createRequire(import.meta.url)("./bin/scoped-cron-run-policy.cjs"));
+	({ createCronRunStore, createMemoryCronRunStore } = createRequire(import.meta.url)("./bin/cron-run-store.cjs"));
+	({ readCronFinalMessage } = createRequire(import.meta.url)("./bin/cron-run-output.cjs"));
 	STALE_THRESHOLD_MS = 10080 * 60 * 1e3;
 	CronManager = class {
 		/** In-memory task store. Empty at construction; populated by
@@ -77376,6 +77502,11 @@ var init_manager$3 = __esmMin((() => {
 		* later `blun resume` can reload via {@link loadFromDisk}.
 		*/
 		persistStore;
+		runStore;
+		bufferedRuns = [];
+		runByTurnId = /* @__PURE__ */ new Map();
+		runAccumulators = /* @__PURE__ */ new Map();
+		drainTimer = null;
 		/**
 		* Per-id serializer for persistence writes. Prevents a fast
 		* `add` → `remove` sequence on the same id from racing each other on
@@ -77389,6 +77520,7 @@ var init_manager$3 = __esmMin((() => {
 			this.store = new SessionCronStore();
 			this.clocks = opts.clocks ?? resolveClockSources(process.env["BLUN_CRON_CLOCK"]) ?? SYSTEM_CLOCKS;
 			this.persistStore = agent.homedir === void 0 ? void 0 : createCronPersistStore(agent.homedir);
+			this.runStore = agent.homedir === void 0 ? createMemoryCronRunStore() : createCronRunStore(agent.homedir, { now: () => this.clocks.wallNow() });
 			this.scheduler = createCronScheduler({
 				clocks: this.clocks,
 				source: () => this.store.list(),
@@ -77440,7 +77572,10 @@ var init_manager$3 = __esmMin((() => {
 		*/
 		removeTasks(ids) {
 			const removed = this.store.remove(ids);
-			for (const id of removed) this.persistEnqueue(id, () => this.persistStore.remove(id));
+			for (const id of removed) {
+				this.persistEnqueue(id, () => this.persistStore.remove(id));
+				this.runStore.markJobDeletedById(id);
+			}
 			return removed;
 		}
 		updateTask(id, patch) {
@@ -77480,6 +77615,11 @@ var init_manager$3 = __esmMin((() => {
 		* input, so a regenerated value would corrupt both.
 		*/
 		async loadFromDisk() {
+			const loadedRuns = this.runStore.load();
+			for (const runId of loadedRuns.lostRunIds ?? []) {
+				const receipt = this.runStore.get(runId);
+				if (receipt !== void 0) this.emitRunTerminal(receipt);
+			}
 			if (this.persistStore === void 0) return;
 			const tasks = await this.persistStore.list();
 			this.store.clear();
@@ -77547,6 +77687,8 @@ var init_manager$3 = __esmMin((() => {
 		* would be missing from the resume's `loadFromDisk()`.
 		*/
 		async stop() {
+			if (this.drainTimer !== null) clearTimeout(this.drainTimer);
+			this.drainTimer = null;
 			this.unbindSigusr1();
 			await this.scheduler.stop();
 			await this.flushPersist();
@@ -77612,24 +77754,49 @@ var init_manager$3 = __esmMin((() => {
 		*/
 		handleFire(task, ctx) {
 			const stale = this.isStale(task);
+			const toolScope = cronToolScopeForTask(task);
+			const runId = randomBytes(8).toString("hex");
 			const origin = {
 				kind: "cron_job",
 				jobId: task.id,
+				runId,
 				cron: task.cron,
 				recurring: task.recurring !== false,
 				coalescedCount: ctx.coalescedCount,
-				stale
+				stale,
+				...(toolScope.mode === "scoped" ? { toolScope } : {})
 			};
 			const content = [{
 				type: "text",
 				text: task.owner === "session-loop" ? renderSessionLoopWakeupXml(origin, task.prompt, task.loopInterval ?? "auto") : renderCronFireXml(origin, task.prompt)
 			}];
+			const receipt = createCronRunReceipt({
+				runId,
+				jobId: task.id,
+				cron: task.cron,
+				recurring: task.recurring !== false,
+				stale,
+				coalescedCount: ctx.coalescedCount,
+				toolScopeDigest: toolScope.digest,
+				firedAt: new Date(this.clocks.wallNow()).toISOString()
+			});
+			this.runStore.create(receipt);
+			this.bufferedRuns.push({ runId, content, origin });
+			this.runAccumulators.set(runId, {
+				toolCalls: /* @__PURE__ */ new Map(),
+				fileCandidates: /* @__PURE__ */ new Map(),
+				outputs: [],
+				finalStepId: null
+			});
+			this.agent.emitEvent({ type: "cron.fired", origin });
 			this.agent.emitEvent({
-				type: "cron.fired",
-				origin,
-				prompt: task.prompt
+				type: "cron.run.created",
+				runId,
+				jobId: task.id,
+				coalescedCount: ctx.coalescedCount,
+				toolScopeDigest: toolScope.digest
 			});
-			const turnId = this.agent.turn.steer(content, origin);
+			const turnId = this.launchBufferedRuns();
 			this.agent.telemetry.track(CRON_FIRED, {
 				recurring: task.recurring !== false,
 				coalesced_count: ctx.coalescedCount,
@@ -77641,6 +77808,137 @@ var init_manager$3 = __esmMin((() => {
 				this.emitDeleted(task.id);
 			}
 		}
+		launchBufferedRuns() {
+			if (this.bufferedRuns.length === 0) return null;
+			if (this.agent.turn.hasActiveTurn || this.agent.fullCompaction.isCompacting) {
+				this.scheduleBufferedRunDrain();
+				return null;
+			}
+			const next = this.bufferedRuns.shift();
+			const acceptance = this.agent.turn.promptWithAcceptance(next.content, next.origin);
+			if (acceptance.accepted !== true || acceptance.turnId === null) {
+				this.bufferedRuns.unshift(next);
+				this.scheduleBufferedRunDrain();
+				return null;
+			}
+			return acceptance.turnId;
+		}
+		scheduleBufferedRunDrain() {
+			if (this.drainTimer !== null || this.bufferedRuns.length === 0) return;
+			this.drainTimer = setTimeout(() => {
+				this.drainTimer = null;
+				this.launchBufferedRuns();
+			}, 250);
+			this.drainTimer.unref?.();
+		}
+		observeLoopEvent(turnId, event) {
+			const runId = this.runByTurnId.get(turnId);
+			if (runId === void 0) return;
+			const accumulator = this.runAccumulators.get(runId);
+			if (accumulator === void 0) return;
+			if (event.type === "step.begin" && typeof event.uuid === "string") accumulator.finalStepId = event.uuid;
+			if (event.type === "tool.call") {
+				accumulator.toolCalls.set(event.toolCallId, { name: event.name, isError: false });
+				const candidate = buildCronFileCandidate({
+					toolName: event.name,
+					toolCallId: event.toolCallId,
+					display: event.display,
+					workspaceRoot: this.agent.config.cwd,
+					additionalRoots: this.agent.getAdditionalDirs(),
+					pathExists: typeof event.display?.path === "string" && existsSync(event.display.path)
+				});
+				if (candidate !== null) accumulator.fileCandidates.set(event.toolCallId, candidate);
+			}
+			if (event.type === "tool.result") {
+				const call = accumulator.toolCalls.get(event.toolCallId);
+				if (call !== void 0) call.isError = event.result.isError === true;
+				const candidate = accumulator.fileCandidates.get(event.toolCallId);
+				if (candidate !== void 0 && event.result.isError !== true) accumulator.outputs.push(candidate);
+				accumulator.fileCandidates.delete(event.toolCallId);
+			}
+		}
+		observeAgentEvent(event) {
+			if (event.type === "turn.started") {
+				const runId = event.origin?.kind === "cron_job" && typeof event.origin.runId === "string" ? event.origin.runId : event.origin?.kind === "system_trigger" && typeof event.origin.cronRunId === "string" ? event.origin.cronRunId : void 0;
+				if (runId === void 0) return;
+				const receipt = this.runStore.get(runId);
+				if (receipt?.status !== "buffered" && receipt?.status !== "running") return;
+				this.runByTurnId.set(event.turnId, runId);
+				if (receipt.status === "buffered") {
+					const running = this.runStore.transition(runId, "running", {
+						turnId: event.turnId,
+						startedAt: new Date(this.clocks.wallNow()).toISOString()
+					});
+					this.agent.emitEvent({
+						type: "cron.run.started",
+						runId: running.runId,
+						jobId: running.jobId,
+						turnId: event.turnId
+					});
+				}
+				return;
+			}
+			if (event.type !== "turn.ended") return;
+			const runId = this.runByTurnId.get(event.turnId);
+			if (runId === void 0) return;
+			const accumulator = this.runAccumulators.get(runId);
+			if (accumulator !== void 0) accumulator.lastTurnEnd = event;
+			this.runByTurnId.delete(event.turnId);
+		}
+		observeRunWorkerEnded(runId, event) {
+			const current = this.runStore.get(runId);
+			if (current?.status !== "running" && current?.status !== "buffered") return;
+			const accumulator = this.runAccumulators.get(runId) ?? {
+				toolCalls: /* @__PURE__ */ new Map(),
+				outputs: [],
+				finalStepId: null
+			};
+			const status = event.reason === "cancelled" ? "cancelled" : event.reason === "failed" || event.reason === "filtered" ? "failed" : "completed";
+			const terminal = this.runStore.transition(runId, status, {
+				endedAt: new Date(this.clocks.wallNow()).toISOString(),
+				toolCalls: [...accumulator.toolCalls.values()],
+				outputs: accumulator.outputs,
+				finalStepId: accumulator.finalStepId,
+				error: status === "failed" ? {
+					category: event.reason === "filtered" ? "policy" : "executor",
+					code: event.error?.code ?? (event.reason === "filtered" ? "PROVIDER_FILTERED" : "TURN_FAILED")
+				} : void 0
+			});
+			this.emitRunTerminal(terminal);
+			this.runAccumulators.delete(runId);
+			this.scheduleBufferedRunDrain();
+		}
+		observeRunWorkerFailed(runId) {
+			this.observeRunWorkerEnded(runId, {
+				reason: "failed",
+				error: { code: "TURN_WORKER_FAILED" }
+			});
+		}
+		emitRunTerminal(receipt) {
+			const durationMs = receipt.startedAt === null || receipt.endedAt === null ? void 0 : Math.max(0, Date.parse(receipt.endedAt) - Date.parse(receipt.startedAt));
+			this.agent.emitEvent({
+				type: `cron.run.${receipt.status}`,
+				runId: receipt.runId,
+				jobId: receipt.jobId,
+				durationMs,
+				toolCalls: receipt.toolSummary.calls,
+				toolErrors: receipt.toolSummary.errors,
+				outputCount: receipt.outputs.length,
+				errorCategory: receipt.error?.category
+			});
+		}
+		listRuns(filters) {
+			return publicCronRunList(this.runStore.list(), filters);
+		}
+		readRunOutput(runId) {
+			const receipt = this.runStore.get(runId);
+			if (receipt === void 0) return null;
+			let finalMessage = null;
+			if (receipt.finalMessageRef !== null && this.agent.homedir !== void 0) try {
+				finalMessage = readCronFinalMessage(join$4(this.agent.homedir, "wire.jsonl"), receipt.finalMessageRef.stepId);
+			} catch {}
+			return { receipt, finalMessage };
+		}
 		/**
 		* Reserved hook for an explicit "you missed N fires while offline"
 		* banner. Today the scheduler's `coalescedCount` semantics already
@@ -78105,7 +78403,8 @@ var init_cron_create = __esmMin((() => {
 	CronCreateInputSchema = object({
 		cron: string().describe("5-field cron expression in local time: \"M H DoM Mon DoW\" (e.g. \"*/5 * * * *\" = every 5 minutes; \"30 14 28 2 *\" = Feb 28 at 2:30pm local — a pinned date like this repeats yearly unless you also pass recurring: false)."),
 		prompt: string().min(1).max(MAX_PROMPT_BYTES).describe("The prompt to enqueue at each fire time. Limited to 8 KiB (UTF-8)."),
-		recurring: boolean$1().optional().default(true).describe("true (default) = fire on every cron match until deleted or auto-expired after 7 days. false = fire once at the next match, then auto-delete. Use false for \"remind me at X\" one-shot requests with pinned minute/hour/dom/month.")
+		recurring: boolean$1().optional().default(true).describe("true (default) = fire on every cron match until deleted or auto-expired after 7 days. false = fire once at the next match, then auto-delete. Use false for \"remind me at X\" one-shot requests with pinned minute/hour/dom/month."),
+		allowed_tools: array(string()).max(64).optional().describe("Optional exact tool names allowed in each isolated run. Omit for legacy behavior; an empty array allows no tools. Wildcards and unknown tools are rejected.")
 	});
 	CronCreateTool = class {
 		manager;
@@ -78145,6 +78444,15 @@ var init_cron_create = __esmMin((() => {
 				output: `Prompt exceeds ${String(MAX_PROMPT_BYTES)} bytes (got ${String(byteLen)}).`
 			};
 			const recurring = args.recurring !== false;
+			let toolScope;
+			try {
+				toolScope = normalizeCronAllowedTools(args.allowed_tools, this.manager.agent.tools.loopTools);
+			} catch (error) {
+				return {
+					isError: true,
+					output: error instanceof Error ? error.message : String(error)
+				};
+			}
 			if (!recurring) {
 				const firstFire = computeNextCronRun(parsed, nowAtPrepare);
 				if (firstFire !== null && firstFire - nowAtPrepare > ONE_SHOT_MAX_FUTURE_MS) return {
@@ -78157,7 +78465,8 @@ var init_cron_create = __esmMin((() => {
 				approvalRule: literalRulePattern(this.name, JSON.stringify({
 					cron: normalizedCron,
 					prompt: args.prompt,
-					recurring
+					recurring,
+					...(args.allowed_tools === void 0 ? {} : { allowed_tools: toolScope.names })
 				})),
 				execute: async () => {
 					const nowMs = this.manager.clocks.wallNow();
@@ -78168,7 +78477,11 @@ var init_cron_create = __esmMin((() => {
 					const task = this.manager.addTask({
 						cron: normalizedCron,
 						prompt: args.prompt,
-						recurring
+						recurring,
+						...(toolScope.mode === "scoped" ? {
+							allowedTools: toolScope.names,
+							toolScopeDigest: toolScope.digest
+						} : {})
 					});
 					const ideal = computeNextCronRun(parsed, nowMs);
 					const nextFireAt = ideal === null ? null : recurring ? jitteredNextCronRunMs(task, parsed, ideal) : oneShotJitteredNextCronRunMs(task, ideal);
@@ -79135,6 +79448,32 @@ var init_context$2 = __esmMin((() => {
 				keptHeadUserMessageCount,
 				droppedCount: input.droppedCount
 			};
+			const summaryMessage = {
+				role: "user",
+				content: [{
+					type: "text",
+					text: contextSummary
+				}],
+				toolCalls: [],
+				origin: { kind: "compaction_summary" }
+			};
+			const isLegacyRestore = this.agent.records.restoring !== null && input.keptUserMessageCount === void 0 && input.compactedCount < this._history.length;
+			const nextHistory = isLegacyRestore ? [summaryMessage, ...this._history.slice(input.compactedCount)] : [...keptMessages, summaryMessage];
+			if (input.transaction !== void 0) this.agent.records.logRecord(summarizeCompactionTransaction(input.transaction, {
+				summary: contextSummary,
+				historyBefore: input.historyBefore ?? this._history,
+				historyAfter: nextHistory,
+				tokensAfter: result.tokensAfter,
+				messageCountAfter: nextHistory.length
+			}));
+			this.agent.records.logRecord({
+				type: "policy.intervention",
+				policy: "full_context_compaction",
+				location: "AgentContext.applyCompaction",
+				size_before: result.tokensBefore,
+				size_after: result.tokensAfter,
+				unit: "tokens"
+			});
 			this.agent.records.logRecord({
 				type: "context.apply_compaction",
 				...result
@@ -79149,17 +79488,7 @@ var init_context$2 = __esmMin((() => {
 				keptHeadUserMessageCount: result.keptHeadUserMessageCount,
 				droppedCount: result.droppedCount
 			} });
-			const summaryMessage = {
-				role: "user",
-				content: [{
-					type: "text",
-					text: contextSummary
-				}],
-				toolCalls: [],
-				origin: { kind: "compaction_summary" }
-			};
-			const isLegacyRestore = this.agent.records.restoring !== null && input.keptUserMessageCount === void 0 && input.compactedCount < this._history.length;
-				this._history = isLegacyRestore ? [summaryMessage, ...this._history.slice(input.compactedCount)] : [...keptMessages, summaryMessage];
+				this._history = nextHistory;
 				this.markPendingTokenEstimateDirty();
 			this.openSteps.clear();
 			this.pendingToolResultIds.clear();
@@ -79195,6 +79524,7 @@ var init_context$2 = __esmMin((() => {
 		}
 		project(messages, options) {
 			const anomalies = [];
+			const underPressure = toolResultOffloadPressureForAgent(this.agent);
 			const userOffloaded = this.agent.userMessageOffload.compact(messages);
 			const historicalMediaProjected = projectHistoricalMediaParts(userOffloaded);
 			const historicalUserReferencesProjected = compactHistoricalPersistedUserMessageReferences(historicalMediaProjected);
@@ -79202,7 +79532,9 @@ var init_context$2 = __esmMin((() => {
 			const historicalTelegramProjected = projectHistoricalUnaddressedTelegramMessages(duplicateUserMessagesProjected);
 			const assistantOffloaded = this.agent.assistantMessageOffload.compact(historicalTelegramProjected);
 			const repeatedAssistantProjected = projectRepeatedAssistantResponses(assistantOffloaded);
-			const result = project(this.agent.microCompaction.compact(compactHistoricalSuccessfulToolResults(dedupeRepeatedSuccessfulToolResults(repeatedAssistantProjected, this.agent.toolResultBatchOffload.compact(dedupeRecurringCronWakeups(dedupeRepeatedInjections(compactHistoricalSkillActivations(compactBaselineSkillInjections(repeatedAssistantProjected)))))))), {
+			const batchProjected = this.agent.toolResultBatchOffload.compact(dedupeRecurringCronWakeups(dedupeRepeatedInjections(compactHistoricalSkillActivations(compactBaselineSkillInjections(repeatedAssistantProjected)))));
+			const toolResultsProjected = compactHistoricalSuccessfulToolResults(dedupeRepeatedSuccessfulToolResults(repeatedAssistantProjected, batchProjected), { underPressure });
+			const result = project(this.agent.microCompaction.compact(toolResultsProjected), {
 				...options,
 				onAnomaly: (anomaly) => {
 					anomalies.push(anomaly);
@@ -233897,9 +234229,9 @@ var init_plan_mode_guard_deny = __esmMin((() => {
 					message: planModeWriteDeniedMessage(planFilePath)
 				};
 			}
-			if (toolName === "TaskStop") return {
+			if (toolName === "TaskStop" || toolName === "TaskResume") return {
 				kind: "deny",
-				message: "TaskStop is not available in plan mode. Call ExitPlanMode to exit plan mode before stopping a background task."
+				message: `${toolName} is not available in plan mode. Call ExitPlanMode before changing background task execution.`
 			};
 			if (toolName === "CronCreate" || toolName === "CronDelete") return {
 				kind: "deny",
@@ -234265,6 +234597,16 @@ var init_permission = __esmMin((() => {
 			if (pattern === void 0) return;
 			this.localSessionApprovalRulePatterns.add(pattern);
 		}
+		recordApprovalEdited(context, editedArgs) {
+			const event = buildApprovalEditedEvent({
+				turnId: Number(context.turnId),
+				toolCallId: context.toolCall.id,
+				toolName: context.toolCall.name,
+				originalArgs: context.args,
+				editedArgs
+			});
+			this.agent.records.logRecord(event);
+		}
 		get sessionApprovalRulePatterns() {
 			return [...this.localSessionApprovalRulePatterns, ...this.parent?.sessionApprovalRulePatterns ?? []];
 		}
@@ -234284,6 +234626,8 @@ var init_permission = __esmMin((() => {
 			const { signal } = context;
 			const id = context.toolCall.id;
 			const name = context.toolCall.name;
+			const approvalEditCount = Number.isSafeInteger(context.approvalEditCount) ? context.approvalEditCount : 0;
+			const allowEdit = approvalEditCount === 0 && isEditableToolApprovalEligible(name);
 			const display = context.execution.display ?? {
 				kind: "generic",
 				summary: context.execution.description ?? `Approve ${name}`,
@@ -234321,7 +234665,10 @@ var init_permission = __esmMin((() => {
 						toolCallId: id,
 						toolName: name,
 						action,
-						display
+						display,
+						allowEdit,
+						approvalEditCount,
+						editableToolInput: allowEdit ? context.args : void 0
 					}, { signal });
 				} catch (error) {
 					this.agent.telemetry.track("permission_approval_result", {
@@ -234349,6 +234696,19 @@ var init_permission = __esmMin((() => {
 					return resolved === void 0 ? Promise.reject(error) : this.permissionPolicyResolutionToPrepare(resolved, context, policyName);
 				}
 			} else response = { decision: "approved" };
+			let editedDecision;
+			if (response.decision === "edited") try {
+				editedDecision = validateEditedApprovalDecision({
+					response,
+					toolName: name,
+					editCount: approvalEditCount
+				});
+			} catch (error) {
+				response = {
+					decision: "rejected",
+					feedback: `Edited approval was rejected before tool preparation: ${error instanceof Error ? error.message : String(error)}`
+				};
+			}
 			const sessionApprovalRule = response.decision === "approved" && response.scope === "session" ? context.execution.approvalRule : void 0;
 			if (requestedApproval) this.agent.hooks?.fireAndForgetTrigger?.("PermissionResult", {
 				matcherValue: name,
@@ -234363,13 +234723,14 @@ var init_permission = __esmMin((() => {
 					selectedLabel: response.selectedLabel
 				}
 			});
+			const approvalRecordResponse = response.decision === "edited" ? { decision: "edited" } : response;
 			this.recordApprovalResult({
 				turnId: Number(context.turnId),
 				toolCallId: id,
 				toolName: name,
 				action,
 				sessionApprovalRule,
-				result: response
+				result: approvalRecordResponse
 			});
 			this.agent.telemetry.track("permission_approval_result", {
 				policy_name: policyName ?? null,
@@ -234381,6 +234742,17 @@ var init_permission = __esmMin((() => {
 				session_cache_written: sessionApprovalRule !== void 0,
 				has_feedback: response.feedback !== void 0 && response.feedback.length > 0
 			});
+			if (response.decision === "edited" && editedDecision !== void 0) {
+				let recorded = false;
+				return { approvalEdit: {
+					args: editedDecision.editedToolInput,
+					record: (validatedArgs) => {
+						if (recorded) throw new Error("Edited approval Wire event was already recorded");
+						recorded = true;
+						this.recordApprovalEdited(context, validatedArgs);
+					}
+				} };
+			}
 			const resolved = result.resolveApproval?.(response);
 			if (resolved !== void 0) return this.permissionPolicyResolutionToPrepare(resolved, context, policyName);
 			if (response.decision === "approved") return;
@@ -244234,6 +244606,7 @@ function createNestedToolInvoker(step, parentToolCall) {
 			...step,
 			signal: nestedSignal,
 			toolCalls: [nestedToolCall],
+			checkpointBeforeToolExecution: void 0,
 			dispatchEvent: (event) => step.dispatchEvent(markProgrammaticNestedEvent(event))
 		};
 		const preflight = preflightToolCall(nestedStep, nestedToolCall);
@@ -244306,7 +244679,7 @@ function validateExecutableToolArgs(tool, args) {
 	}
 	return validateToolArgs(validator, args);
 }
-async function prepareToolCall(step, call) {
+async function prepareToolCall(step, call, approvalEditCount = 0) {
 	const settleError = async (args, output, displayFields) => {
 		await dispatchToolCall(step, call, args, displayFields);
 		return { task: makeResolvedToolCallTask(makeErrorToolResult(call, args, output)) };
@@ -244341,12 +244714,43 @@ async function prepareToolCall(step, call) {
 	const settleAborted = () => settleError(effectiveArgs, abortedToolOutput(call.toolName, step.signal), displayFields);
 	if (step.signal.aborted) return settleAborted();
 	if (execution.isError === true) return settleSynthetic(effectiveArgs, execution, displayFields);
-	const authorization = await runAuthorizeToolExecutionHook(step, call, effectiveArgs, execution);
+	const authorization = await runAuthorizeToolExecutionHook(step, call, effectiveArgs, execution, approvalEditCount);
 	if (step.signal.aborted) return settleAborted();
 	if (authorization?.block === true) return settleError(effectiveArgs, authorization.reason ?? `Tool call "${call.toolName}" was blocked`, displayFields);
 	if (authorization?.syntheticResult !== void 0) return settleSynthetic(effectiveArgs, authorization.syntheticResult, displayFields);
+	if (authorization?.approvalEdit !== void 0) {
+		let plan;
+		try {
+			plan = buildEditedToolCallPlan({
+				step,
+				call,
+				editedArgs: authorization.approvalEdit.args,
+				editCount: approvalEditCount,
+				preflightToolCall
+			});
+		} catch (error) {
+			return settleError(authorization.approvalEdit.args, `Edited approval could not be re-prepared: ${errorMessage$12(error)}`, displayFields);
+		}
+		if (plan.kind === "rejected") return settleError(plan.call.args, plan.output ?? `Edited args for tool "${call.toolName}" were rejected`, displayFields);
+		try {
+			authorization.approvalEdit.record(plan.call.args);
+		} catch (error) {
+			return settleError(plan.call.args, `Edited approval evidence could not be recorded: ${errorMessage$12(error)}`, displayFields);
+		}
+		return prepareToolCall(plan.step, plan.call, plan.editCount);
+	}
 	const executionMetadata = authorization?.executionMetadata ?? decision.metadata;
 	await dispatchToolCall(step, call, effectiveArgs, displayFields);
+	if (step.checkpointBeforeToolExecution !== void 0) {
+		const checkpoint = await checkpointBeforeExternalSideEffect({
+			flush: step.checkpointBeforeToolExecution,
+			signal: step.signal
+		});
+		if (!checkpoint.allowed) return {
+			task: makeResolvedToolCallTask(makeErrorToolResult(call, effectiveArgs, `${checkpoint.code}: ${checkpoint.error}`)),
+			stopBatchAfterThis: true
+		};
+	}
 	return {
 		task: {
 			accesses: execution.accesses ?? ToolAccesses.all(),
@@ -244418,7 +244822,7 @@ async function runPrepareToolExecutionHook(step, call) {
 		metadata: hookResult?.executionMetadata
 	};
 }
-async function runAuthorizeToolExecutionHook(step, call, args, execution) {
+async function runAuthorizeToolExecutionHook(step, call, args, execution, approvalEditCount = 0) {
 	const { hooks, signal, turnId, currentStep, llm } = step;
 	if (hooks?.authorizeToolExecution === void 0) return void 0;
 	try {
@@ -244428,6 +244832,7 @@ async function runAuthorizeToolExecutionHook(step, call, args, execution) {
 			tool: call.tool,
 			args,
 			execution,
+			approvalEditCount,
 			turnId,
 			stepNumber: currentStep,
 			signal,
@@ -244652,9 +245057,10 @@ async function dispatchToolCall(step, call, args, displayFields) {
 		display: displayFields?.display
 	});
 }
-var markProgrammaticNestedEvent, GRACE_TIMEOUT_MS, TOOL_OUTPUT_EMPTY, TOOL_OUTPUT_NON_TEXT, validators;
+var markProgrammaticNestedEvent, checkpointBeforeExternalSideEffect, GRACE_TIMEOUT_MS, TOOL_OUTPUT_EMPTY, TOOL_OUTPUT_NON_TEXT, validators;
 var init_tool_call = __esmMin((() => {
 	({ markProgrammaticNestedEvent } = createRequire(import.meta.url)("./bin/programmatic-context-isolation.cjs"));
+	({ checkpointBeforeExternalSideEffect } = createRequire(import.meta.url)("./bin/session-checkpoint-policy.cjs"));
 	init_args_validator();
 	init_path_access();
 	init_abort();
@@ -244678,7 +245084,7 @@ var init_tool_call = __esmMin((() => {
 * does not lose model usage that was already spent.
 */
 async function executeLoopStep(deps) {
-	const { turnId, signal, buildMessages, buildMessagesStrict, dispatchEvent, llm, tools, hooks, log, currentStep, maxRetryAttempts, recordUsage, onStepStarted } = deps;
+	const { turnId, signal, buildMessages, buildMessagesStrict, dispatchEvent, llm, tools, hooks, log, currentStep, maxRetryAttempts, recordUsage, onStepStarted, checkpointBeforeToolExecution, checkpointBeforeRetryWait } = deps;
 	const beforeStep = hooks?.beforeStep === void 0 ? void 0 : await hooks.beforeStep({
 		turnId,
 		stepNumber: currentStep,
@@ -244694,12 +245100,15 @@ async function executeLoopStep(deps) {
 	const messages = await stepBuildMessages();
 	signal.throwIfAborted();
 	const stepUuid = randomUUID();
+	const requestMetadata = stepLLM.describeRequest?.(messages, stepTools ?? []);
 	const stepEvents = createStepEventGate({
 		dispatchEvent,
 		turnId,
 		currentStep,
 		stepUuid,
-		onStepStarted
+		onStepStarted,
+		requestMetadata,
+		maxAttempts: maxRetryAttempts
 	});
 	const prepareRequestBoundary = stepLLM.prepareRequestBoundary?.bind(stepLLM);
 	const step = {
@@ -244711,7 +245120,8 @@ async function executeLoopStep(deps) {
 		signal,
 		turnId,
 		currentStep,
-		stepUuid
+		stepUuid,
+		checkpointBeforeToolExecution
 	};
 	let chatParams = {
 		messages,
@@ -244724,9 +245134,8 @@ async function executeLoopStep(deps) {
 	signal.throwIfAborted();
 	const retryInput = {
 		llm: stepLLM,
-		dispatchEvent: (event) => {
-			stepEvents.dispatchRetrying(event);
-		},
+		dispatchEvent: (event) => stepEvents.dispatchRetrying(event),
+		checkpointBeforeRetryWait,
 		turnId,
 		currentStep,
 		stepUuid,
@@ -244886,29 +245295,33 @@ async function chatWithLiveResponseRepetitionRecovery(deps) {
 				occurrences: repetition.count,
 				wordCount: repetition.wordCount
 			});
-			await stepEvents.dispatchRetrying({
-				type: "step.retrying",
-				turnId: retryInput.turnId,
-				step: retryInput.currentStep,
-				stepUuid: retryInput.stepUuid,
-				failedAttempt: 1,
-				nextAttempt: 2,
-				maxAttempts: 2,
-				delayMs: 0,
-				outputMayHaveStarted: true,
-				errorName: "LiveResponseRepetitionError",
-				errorMessage: "Repeated assistant text detected during streaming"
+			await persistRetrySchedule({
+				dispatchRetrying: (event) => stepEvents.dispatchRetrying(event),
+				flush: checkpointBeforeRetryWait,
+				signal,
+				event: {
+					type: "step.retrying",
+					turnId: retryInput.turnId,
+					step: retryInput.currentStep,
+					stepUuid: retryInput.stepUuid,
+					failedAttempt: 1,
+					nextAttempt: 2,
+					maxAttempts: 2,
+					delayMs: 0,
+					outputMayHaveStarted: true,
+					errorName: "LiveResponseRepetitionError",
+					errorMessage: "Repeated assistant text detected during streaming"
+				}
 			});
 		}
 	}
 	throw new Error("Live response repetition recovery exhausted");
 }
 function createStepEventGate(deps) {
-	const { dispatchEvent, turnId, currentStep, stepUuid, onStepStarted } = deps;
+	const { dispatchEvent, turnId, currentStep, stepUuid, onStepStarted, requestMetadata, maxAttempts } = deps;
 	let startPromise;
 	let eventQueue = Promise.resolve();
 	let hasOutput = false;
-	const pendingBeforeStart = [];
 	let liveRepetitionGuard;
 	let liveRepetitionController;
 	let liveRepetitionResult = null;
@@ -244918,10 +245331,13 @@ function createStepEventGate(deps) {
 				type: "step.begin",
 				uuid: stepUuid,
 				turnId,
-				step: currentStep
+				step: currentStep,
+				thinkingEffort: requestMetadata?.thinkingEffort,
+				completionBudget: requestMetadata?.completionBudget,
+				attempt: 1,
+				maxAttempts
 			});
 			onStepStarted?.();
-			for (const dispatch of pendingBeforeStart.splice(0)) await dispatch();
 		})();
 		return startPromise;
 	};
@@ -244956,14 +245372,9 @@ function createStepEventGate(deps) {
 			return AbortSignal.any([signal, liveRepetitionController.signal]);
 		},
 		dispatchRetrying: async (event) => {
-			if (startPromise === void 0) {
-				pendingBeforeStart.push(() => {
-					dispatchEvent(event);
-				});
-				return;
-			}
-			const queued = eventQueue.then(() => {
-				dispatchEvent(event);
+			const queued = eventQueue.then(async () => {
+				await start();
+				await dispatchEvent(event);
 			});
 			eventQueue = queued;
 			await queued;
@@ -245027,7 +245438,7 @@ var init_turn_step = __esmMin((() => {
 //#endregion
 //#region ../../packages/agent-core/src/loop/run-turn.ts
 async function runTurn(input) {
-	const { turnId, signal, llm, buildMessages, buildMessagesStrict, dispatchEvent, tools, hooks, log, maxSteps, maxRetryAttempts, recordStepUsage: hostRecordStepUsage } = input;
+	const { turnId, signal, llm, buildMessages, buildMessagesStrict, dispatchEvent, tools, hooks, log, maxSteps, maxRetryAttempts, checkpointBeforeToolExecution, checkpointBeforeRetryWait, recordStepUsage: hostRecordStepUsage } = input;
 	let usage = emptyUsage();
 	let steps = 0;
 	let stopReason = "end_turn";
@@ -245057,6 +245468,8 @@ async function runTurn(input) {
 				log,
 				currentStep: stepNumber,
 				maxRetryAttempts,
+				checkpointBeforeToolExecution,
+				checkpointBeforeRetryWait,
 				recordUsage: recordStepUsage,
 				onStepStarted: setActiveStep.bind(void 0, stepNumber)
 			});
@@ -245955,7 +246368,7 @@ var init_modelCatalog$2 = __esmMin((() => {
 function isVolatileEventType(type) {
 	return volatileEventTypeSet.has(type);
 }
-var MCP_OAUTH_AUTHORIZATION_URL_TOOL_UPDATE, tokenUsageSchema, finishReasonSchema, usageStatusSchema, permissionModeSchema, skillSourceSchema, userPromptOriginSchema, skillActivationOriginSchema, pluginCommandOriginSchema, injectionOriginSchema, shellCommandOriginSchema, compactionSummaryOriginSchema, systemTriggerOriginSchema, agentCoreBackgroundTaskStatusSchema, backgroundTaskOriginSchema, cronJobOriginSchema, cronMissedOriginSchema, hookResultOriginSchema, retryOriginSchema, promptOriginSchema, goalStatusSchema, goalActorSchema, goalBudgetReportSchema, goalSnapshotSchema, goalChangeStatsSchema, goalChangeKindSchema, goalChangeSchema, blunErrorCodeSchema, blunErrorPayloadSchema, backgroundTaskInfoBaseSchema, processBackgroundTaskInfoSchema, agentBackgroundTaskInfoSchema, questionBackgroundTaskInfoSchema, backgroundTaskInfoSchema, compactionResultSchema, toolUpdateSchema, turnEndReasonSchema, agentStatusUpdatedEventSchema, sessionMetaUpdatedEventSchema, sessionCreatedEventSchema, workspaceCreatedEventSchema, workspaceUpdatedEventSchema, workspaceDeletedEventSchema, sessionStatusChangedEventSchema, modelCatalogChangedEventSchema, goalUpdatedEventSchema, skillActivatedEventSchema, pluginCommandActivatedEventSchema, errorEventSchema, warningEventSchema, turnStartedEventSchema, turnEndedEventSchema, turnStepStartedEventSchema, turnStepCompletedEventSchema, turnStepRetryingEventSchema, turnStepInterruptedEventSchema, assistantDeltaEventSchema, hookResultEventSchema, thinkingDeltaEventSchema, toolCallDeltaEventSchema, toolCallStartedEventSchema, toolProgressEventSchema, shellOutputEventSchema, shellStartedEventSchema, toolResultEventSchema, subagentSpawnedEventSchema, subagentStartedEventSchema, subagentSuspendedEventSchema, subagentCompletedEventSchema, subagentFailedEventSchema, compactionStartedEventSchema, compactionBlockedEventSchema, compactionCancelledEventSchema, compactionProgressEventSchema, compactionCompletedEventSchema, backgroundTaskStartedEventSchema, backgroundTaskTerminatedEventSchema, cronFiredEventSchema, attentionIntentSchema, attentionAuthorizedEventSchema, promptSubmittedEventSchema, toolListUpdatedReasonSchema, toolListUpdatedEventSchema, mcpServerStatusPayloadSchema, mcpServerStatusEventSchema, mediaDroppedEventSchema, agentEventSchema, eventSchema, VOLATILE_EVENT_TYPES, volatileEventTypeSet;
+var MCP_OAUTH_AUTHORIZATION_URL_TOOL_UPDATE, tokenUsageSchema, finishReasonSchema, usageStatusSchema, permissionModeSchema, skillSourceSchema, userPromptOriginSchema, skillActivationOriginSchema, pluginCommandOriginSchema, injectionOriginSchema, shellCommandOriginSchema, compactionSummaryOriginSchema, cronToolScopeSchema, systemTriggerOriginSchema, agentCoreBackgroundTaskStatusSchema, backgroundTaskOriginSchema, cronJobOriginSchema, cronMissedOriginSchema, hookResultOriginSchema, retryOriginSchema, promptOriginSchema, goalStatusSchema, goalActorSchema, goalBudgetReportSchema, goalSnapshotSchema, goalChangeStatsSchema, goalChangeKindSchema, goalChangeSchema, blunErrorCodeSchema, blunErrorPayloadSchema, backgroundTaskInfoBaseSchema, processBackgroundTaskInfoSchema, agentBackgroundTaskInfoSchema, questionBackgroundTaskInfoSchema, backgroundTaskInfoSchema, compactionResultSchema, toolUpdateSchema, turnEndReasonSchema, agentStatusUpdatedEventSchema, sessionMetaUpdatedEventSchema, sessionCreatedEventSchema, workspaceCreatedEventSchema, workspaceUpdatedEventSchema, workspaceDeletedEventSchema, sessionStatusChangedEventSchema, modelCatalogChangedEventSchema, goalUpdatedEventSchema, skillActivatedEventSchema, pluginCommandActivatedEventSchema, errorEventSchema, warningEventSchema, turnStartedEventSchema, turnEndedEventSchema, turnStepStartedEventSchema, turnStepCompletedEventSchema, turnStepRetryingEventSchema, turnStepInterruptedEventSchema, assistantDeltaEventSchema, hookResultEventSchema, thinkingDeltaEventSchema, toolCallDeltaEventSchema, toolCallStartedEventSchema, toolProgressEventSchema, shellOutputEventSchema, shellStartedEventSchema, toolResultEventSchema, subagentSpawnedEventSchema, subagentStartedEventSchema, subagentSuspendedEventSchema, subagentCompletedEventSchema, subagentFailedEventSchema, compactionStartedEventSchema, compactionBlockedEventSchema, compactionCancelledEventSchema, compactionProgressEventSchema, compactionCompletedEventSchema, backgroundTaskStartedEventSchema, backgroundTaskTerminatedEventSchema, cronFiredEventSchema, cronRunCreatedEventSchema, cronRunStartedEventSchema, cronRunTerminalEventSchema, attentionIntentSchema, attentionAuthorizedEventSchema, promptSubmittedEventSchema, toolListUpdatedReasonSchema, toolListUpdatedEventSchema, mcpServerStatusPayloadSchema, mcpServerStatusEventSchema, mediaDroppedEventSchema, agentEventSchema, eventSchema, VOLATILE_EVENT_TYPES, volatileEventTypeSet;
 var init_events$1 = __esmMin((() => {
 	init_zod$1();
 	init_display();
@@ -246029,9 +246442,16 @@ var init_events$1 = __esmMin((() => {
 		isError: boolean$1().optional()
 	});
 	compactionSummaryOriginSchema = object({ kind: literal("compaction_summary") });
+	cronToolScopeSchema = object({
+		mode: literal("scoped"),
+		names: array(string()).max(64),
+		digest: string()
+	});
 	systemTriggerOriginSchema = object({
 		kind: literal("system_trigger"),
-		name: string()
+		name: string(),
+		cronRunId: string().optional(),
+		toolScope: cronToolScopeSchema.optional()
 	});
 	agentCoreBackgroundTaskStatusSchema = _enum([
 		"running",
@@ -246050,10 +246470,12 @@ var init_events$1 = __esmMin((() => {
 	cronJobOriginSchema = object({
 		kind: literal("cron_job"),
 		jobId: string(),
+		runId: string().optional(),
 		cron: string(),
 		recurring: boolean$1(),
 		coalescedCount: number$1(),
-		stale: boolean$1()
+		stale: boolean$1(),
+		toolScope: cronToolScopeSchema.optional()
 	});
 	cronMissedOriginSchema = object({
 		kind: literal("cron_missed"),
@@ -246066,7 +246488,8 @@ var init_events$1 = __esmMin((() => {
 	});
 	retryOriginSchema = object({
 		kind: literal("retry"),
-		trigger: string().optional()
+		trigger: string().optional(),
+		toolScope: cronToolScopeSchema.optional()
 	});
 	promptOriginSchema = discriminatedUnion("kind", [
 		userPromptOriginSchema,
@@ -246419,7 +246842,11 @@ var init_events$1 = __esmMin((() => {
 		type: literal("turn.step.started"),
 		turnId: number$1(),
 		step: number$1(),
-		stepId: string().optional()
+		stepId: string().optional(),
+		thinkingEffort: string().optional(),
+		completionBudget: number$1().int().positive().optional(),
+		attempt: number$1().int().positive().optional(),
+		maxAttempts: number$1().int().positive().optional()
 	});
 	turnStepCompletedEventSchema = object({
 		type: literal("turn.step.completed"),
@@ -246449,7 +246876,9 @@ var init_events$1 = __esmMin((() => {
 		outputMayHaveStarted: boolean$1().optional(),
 		errorName: string(),
 		errorMessage: string(),
-		statusCode: number$1().optional()
+		statusCode: number$1().optional(),
+		completionBudgetBefore: number$1().int().positive().optional(),
+		completionBudgetAfter: number$1().int().positive().optional()
 	});
 	turnStepInterruptedEventSchema = object({
 		type: literal("turn.step.interrupted"),
@@ -246586,8 +247015,30 @@ var init_events$1 = __esmMin((() => {
 	});
 	cronFiredEventSchema = object({
 		type: literal("cron.fired"),
-		origin: cronJobOriginSchema,
-		prompt: string()
+		origin: cronJobOriginSchema
+	});
+	cronRunCreatedEventSchema = object({
+		type: literal("cron.run.created"),
+		runId: string(),
+		jobId: string(),
+		coalescedCount: number$1(),
+		toolScopeDigest: string().nullable()
+	});
+	cronRunStartedEventSchema = object({
+		type: literal("cron.run.started"),
+		runId: string(),
+		jobId: string(),
+		turnId: number$1()
+	});
+	cronRunTerminalEventSchema = object({
+		type: _enum(["cron.run.completed", "cron.run.failed", "cron.run.cancelled", "cron.run.lost"]),
+		runId: string(),
+		jobId: string(),
+		durationMs: number$1().optional(),
+		toolCalls: number$1(),
+		toolErrors: number$1(),
+		outputCount: number$1(),
+		errorCategory: string().optional()
 	});
 	attentionIntentSchema = object({
 		accepted: literal(true),
@@ -246701,6 +247152,9 @@ var init_events$1 = __esmMin((() => {
 		backgroundTaskStartedEventSchema,
 		backgroundTaskTerminatedEventSchema,
 		cronFiredEventSchema,
+		cronRunCreatedEventSchema,
+		cronRunStartedEventSchema,
+		cronRunTerminalEventSchema,
 		attentionAuthorizedEventSchema,
 		promptSubmittedEventSchema
 	]);
@@ -247246,7 +247700,8 @@ var init_approval$2 = __esmMin((() => {
 	approvalDecisionSchema = _enum([
 		"approved",
 		"rejected",
-		"cancelled"
+		"cancelled",
+		"edited"
 	]);
 	approvalScopeSchema = _enum(["session"]);
 	approvalRequestSchema = object({
@@ -247257,6 +247712,7 @@ var init_approval$2 = __esmMin((() => {
 		tool_name: string().min(1),
 		action: string(),
 		tool_input_display: unknown(),
+		allow_edit: boolean$1().optional(),
 		created_at: isoDateTimeSchema,
 		expires_at: isoDateTimeSchema
 	});
@@ -247264,7 +247720,8 @@ var init_approval$2 = __esmMin((() => {
 		decision: approvalDecisionSchema,
 		scope: approvalScopeSchema.optional(),
 		feedback: string().optional(),
-		selected_label: string().optional()
+		selected_label: string().optional(),
+		edited_tool_input: unknown().optional()
 	});
 }));
 //#endregion
@@ -251720,6 +252177,89 @@ var init_task_update = __esmMin((() => {
 	};
 }));
 //#endregion
+//#region ../../packages/agent-core/src/tools/background/task-resume.ts
+var DurableTaskResumeRuntime$1, TaskResumeInputSchema, TaskResumeTool;
+var init_task_resume = __esmMin((() => {
+	init_zod$1();
+	init_input_schema();
+	init_rule_match();
+	init_agent_task();
+	({ DurableTaskResumeRuntime: DurableTaskResumeRuntime$1 } = createRequire(import.meta.url)("./bin/durable-task-resume-runtime.cjs"));
+	TaskResumeInputSchema = object({
+		task_id: string().trim().min(1).describe("The lost agent task ID, or completed TaskResume successor, to continue."),
+		prompt: string().trim().min(1).max(32768).describe("New instructions for the preserved agent context."),
+		description: string().trim().min(1).max(1024).describe("Short description for the replacement background task."),
+		timeout_minutes: number$1().int().min(0).max(10080).optional().describe("Wall-clock continuation interval for the replacement run. Defaults to 240 minutes; 0 disables it for this run.")
+	});
+	TaskResumeTool = class {
+		manager;
+		subagentHost;
+		runtime;
+		name = "TaskResume";
+		description = "Explicitly continue a recoverable background agent task after a process loss. This resumes the same agent and preserved context, but creates a new background task ID linked to the terminal source task. Only lost agent tasks and completed TaskResume successors are accepted. It never resumes automatically at startup.";
+		parameters = toInputJsonSchema(TaskResumeInputSchema);
+		constructor(manager, subagentHost) {
+			this.manager = manager;
+			this.subagentHost = subagentHost;
+			this.runtime = new DurableTaskResumeRuntime$1({
+				getTask: (taskId) => manager.getTask(taskId),
+				getIntent: (taskId) => manager.resumeStore?.getBySourceTaskId(taskId),
+				writeIntent: (intent) => manager.resumeStore.write(intent),
+				markIntentStarted: (taskId, startedAt) => manager.resumeStore.markStarted(taskId, startedAt),
+				reserveTaskId: (prefix) => manager.reserveTaskId(prefix),
+				resumeAgent: (agentId, options) => subagentHost.resume(agentId, options),
+				createTask: (handle, description, metadata) => new AgentBackgroundTask(handle, description, subagentHost, metadata.controller ?? new AbortController(), {
+					timeoutMs: resolveSubagentTimeoutMs({ perRunMinutes: metadata.timeoutMinutes }),
+					runInBackground: true,
+					parentToolCallId: metadata.parentToolCallId,
+					responseFormat: void 0,
+					resumed: true,
+					replacesTaskId: metadata.replacesTaskId,
+					resumeRootTaskId: metadata.resumeRootTaskId
+				}),
+				registerTask: (task, options) => manager.registerTask(task, options),
+				awaitTaskPersisted: (taskId) => manager.awaitTaskPersisted(taskId),
+				emitEvent: (event) => manager.agent.emitEvent(event),
+				now: () => Date.now()
+			});
+		}
+		resolveExecution(args) {
+			return {
+				description: `Resuming agent task ${args.task_id}`,
+				approvalRule: this.name,
+				matchesRule: (ruleArgs) => matchesGlobRuleSubject(ruleArgs, args.task_id),
+				execute: (ctx) => this.execute(args, ctx)
+			};
+		}
+		async execute(args, { toolCallId, signal, turnId }) {
+			const controller = new AbortController();
+			try {
+				signal.throwIfAborted();
+				const result = await this.runtime.resume({
+					taskId: args.task_id,
+					prompt: args.prompt,
+					description: args.description,
+					timeoutMinutes: args.timeout_minutes,
+					parentToolCallId: toolCallId,
+					toolScope: this.subagentHost.toolScopeForTurn(Number(turnId)),
+					controller,
+					signal
+				});
+				return {
+					output: `task_id: ${result.taskId}\nstatus: ${result.status}\nagent_id: ${result.agentId}\nreplaces_task_id: ${result.replacesTaskId}\nresume_root_task_id: ${result.resumeRootTaskId}\nresumed: true`,
+					isError: false
+				};
+			} catch (error) {
+				controller.abort();
+				return {
+					output: error instanceof Error ? error.message : String(error),
+					isError: true
+				};
+			}
+		}
+	};
+}));
+//#endregion
 //#region ../../packages/agent-core/src/tools/background/task-stop.md?raw
 var task_stop_default;
 var init_task_stop$1 = __esmMin((() => {
@@ -251907,6 +252447,67 @@ var init_cron_list = __esmMin((() => {
 	};
 }));
 //#endregion
+//#region ../../packages/agent-core/src/tools/cron/cron-runs.ts
+var CronRunListInputSchema, CronRunOutputInputSchema, CronRunListTool, CronRunOutputTool;
+var init_cron_runs = __esmMin((() => {
+	init_zod$1();
+	init_input_schema();
+	CronRunListInputSchema = object({
+		job_id: string().regex(/^[A-Za-z0-9][A-Za-z0-9._:-]{0,127}$/u).optional().describe("Optional cron job id filter."),
+		status: string().regex(/^(buffered|running|completed|failed|cancelled|lost)$/u).optional().describe("Optional run status filter."),
+		limit: number$1().int().min(1).max(100).optional().default(20).describe("Maximum number of newest run receipts.")
+	}).strict();
+	CronRunOutputInputSchema = object({
+		run_id: string().regex(/^[0-9a-f]{16}$/u).describe("The 16-hex run id returned by CronRunList.")
+	}).strict();
+	CronRunListTool = class {
+		manager;
+		name = "CronRunList";
+		description = "List bounded private receipts for cron runs in this session. Receipts contain lifecycle, tool counts, and output references, never prompts, thoughts, raw tool arguments, results, headers, or approval feedback.";
+		parameters = toInputJsonSchema(CronRunListInputSchema);
+		constructor(manager) {
+			this.manager = manager;
+		}
+		resolveExecution(args) {
+			return {
+				description: "Listing private cron run receipts",
+				approvalRule: this.name,
+				execute: async () => {
+					const runs = this.manager.listRuns({
+						jobId: args.job_id,
+						status: args.status,
+						limit: args.limit
+					});
+					return { output: JSON.stringify({ runs }, null, 2), isError: false };
+				}
+			};
+		}
+	};
+	CronRunOutputTool = class {
+		manager;
+		name = "CronRunOutput";
+		description = "Read one private cron run receipt and its bounded final assistant message. Raw prompts, thoughts, tool arguments, tool results, headers, approvals, and Bash-inferred files are never returned.";
+		parameters = toInputJsonSchema(CronRunOutputInputSchema);
+		constructor(manager) {
+			this.manager = manager;
+		}
+		resolveExecution(args) {
+			return {
+				description: `Reading private cron run ${args.run_id}`,
+				approvalRule: this.name,
+				execute: async () => {
+					const run = this.manager.readRunOutput(args.run_id);
+					if (run === null) return {
+						output: `No cron run with id ${args.run_id} exists in this session.`,
+						isError: true
+					};
+					return { output: JSON.stringify(run, null, 2), isError: false };
+				}
+			};
+		}
+	};
+}));
+//#endregion
 //#region ../../packages/agent-core/src/agent/permission/policies/deny-all.ts
 var DenyAllPermissionPolicy;
 var init_deny_all = __esmMin((() => {
@@ -252318,6 +252919,7 @@ var init_subagent_batch = __esmMin((() => {
 				description: task.description,
 				swarmIndex: task.swarmIndex,
 				runInBackground: task.runInBackground,
+				responseFormat: task.responseFormat,
 				compactBeforeRetry: attempt.state.retryCount > 0,
 				signal: attempt.controller.signal,
 				onReady: () => {
@@ -252342,11 +252944,13 @@ var init_subagent_batch = __esmMin((() => {
 				return this.failedAttemptOutcome(attempt, error);
 			}
 			attempt.state.agentId = handle.agentId;
+			attempt.state.profileName = handle.profileName;
 			try {
 				const completion = await handle.completion;
 				return {
 					task,
 					agentId: handle.agentId,
+					profileName: handle.profileName,
 					status: "completed",
 					result: completion.result,
 					usage: completion.usage
@@ -252370,6 +252974,7 @@ var init_subagent_batch = __esmMin((() => {
 			return {
 				task: attempt.state.task,
 				agentId: attempt.state.agentId,
+				profileName: attempt.state.profileName,
 				status,
 				state: attempt.state.agentId === void 0 ? "not_started" : "started",
 				error: this.attemptErrorMessage(attempt, error, status)
@@ -252633,7 +253238,7 @@ async function runChildTurnToCompletion(child, signal) {
 	}
 	return completion.stopReason;
 }
-async function completeChildTurnWithMaxTokensHandoff(child, signal) {
+async function completeChildTurnWithMaxTokensHandoff(child, signal, promptOrigin = SUBAGENT_PROMPT_ORIGIN) {
 	let stopReason = await runChildTurnToCompletion(child, signal);
 	let handoffAttempts = 0;
 	while (shouldRequestSubagentHandoff(stopReason, handoffAttempts)) {
@@ -252642,7 +253247,7 @@ async function completeChildTurnWithMaxTokensHandoff(child, signal) {
 		if (child.turn.prompt([{
 			type: "text",
 			text: SUBAGENT_MAX_TOKENS_HANDOFF_PROMPT
-		}], SUBAGENT_PROMPT_ORIGIN) === null) throw new Error("Subagent could not start its max_tokens recovery handoff.");
+		}], promptOrigin) === null) throw new Error("Subagent could not start its max_tokens recovery handoff.");
 		stopReason = await runChildTurnToCompletion(child, signal);
 	}
 	if (stopReason === "max_tokens") throw new Error(buildSubagentMaxTokensFailure(lastAssistantText(child)));
@@ -252659,7 +253264,7 @@ function lastAssistantText(agent) {
 	}
 	return "";
 }
-async function completeStructuredSubagentResult(child, childId, profileName, responseFormat, signal) {
+async function completeStructuredSubagentResult(child, childId, profileName, responseFormat, signal, promptOrigin = SUBAGENT_PROMPT_ORIGIN) {
 	let validation = validateStructuredSubagentOutput(lastAssistantText(child), responseFormat);
 	if (validation.validatorException === true) throw new Error(validation.error);
 	if (!validation.ok) {
@@ -252667,8 +253272,8 @@ async function completeStructuredSubagentResult(child, childId, profileName, res
 		if (child.turn.prompt([{
 			type: "text",
 			text: buildStructuredResponseRepairPrompt(responseFormat, validation.error)
-		}], SUBAGENT_PROMPT_ORIGIN) === null) throw new Error("Subagent could not start its structured-output repair turn.");
-		await completeChildTurnWithMaxTokensHandoff(child, signal);
+		}], promptOrigin) === null) throw new Error("Subagent could not start its structured-output repair turn.");
+		await completeChildTurnWithMaxTokensHandoff(child, signal, promptOrigin);
 		signal.throwIfAborted();
 		validation = validateStructuredSubagentOutput(lastAssistantText(child), responseFormat);
 		if (validation.validatorException === true) throw new Error(validation.error);
@@ -252681,7 +253286,7 @@ function shouldSuppressQueuedAttemptFailureEvent(options, error) {
 	if (isProviderRateLimitError(error)) return true;
 	return isAbortError$4(error) || options.signal.aborted;
 }
-var DEFAULT_SUBAGENT_TIMEOUT_MS, resolveSubagentTimeoutMs, runAgentWithTimeoutContinuation, buildSubagentUsageDelta, inheritSubagentAllowedTools, inheritSubagentLifecycleTools, STRUCTURED_SUBAGENT_OUTPUT_ERROR, prepareStructuredResponseFormat, validateStructuredSubagentOutput, buildStructuredResponseFormatReminder, buildStructuredResponseRepairPrompt, buildStructuredSubagentEnvelope, SUBAGENT_MAX_TOKENS_ERROR, SUBAGENT_MAX_TOKENS_HANDOFF_PROMPT, buildSubagentMaxTokensFailure, isSubagentMaxTokensTurnError, shouldRequestSubagentHandoff, SUMMARY_MIN_LENGTH, SUMMARY_CONTINUATION_ATTEMPTS, HOOK_TEXT_PREVIEW_LENGTH, TOOL_CALL_DISABLED_MESSAGE, SUBAGENT_PROMPT_ORIGIN, SIDE_QUESTION_SYSTEM_REMINDER, SessionSubagentHost;
+var DEFAULT_SUBAGENT_TIMEOUT_MS, resolveSubagentTimeoutMs, runAgentWithTimeoutContinuation, buildSubagentUsageDelta, inheritSubagentAllowedTools, inheritSubagentLifecycleTools, prepareSubagentSkillPolicy, profileWithSubagentSkillTools, restoreSubagentSkillPolicy, STRUCTURED_SUBAGENT_OUTPUT_ERROR, prepareStructuredResponseFormat, validateStructuredSubagentOutput, buildStructuredResponseFormatReminder, buildStructuredResponseRepairPrompt, buildStructuredSubagentEnvelope, SUBAGENT_MAX_TOKENS_ERROR, SUBAGENT_MAX_TOKENS_HANDOFF_PROMPT, buildSubagentMaxTokensFailure, isSubagentMaxTokensTurnError, shouldRequestSubagentHandoff, SUBAGENT_FORK_REMINDER, projectSubagentForkContext, resolveSubagentContextMode, SUMMARY_MIN_LENGTH, SUMMARY_CONTINUATION_ATTEMPTS, HOOK_TEXT_PREVIEW_LENGTH, TOOL_CALL_DISABLED_MESSAGE, SUBAGENT_PROMPT_ORIGIN, SIDE_QUESTION_SYSTEM_REMINDER, SessionSubagentHost;
 var init_subagent_host = __esmMin((() => {
 	init_src$4();
 	init_errors$8();
@@ -252696,6 +253301,8 @@ var init_subagent_host = __esmMin((() => {
 	({ DEFAULT_SUBAGENT_TIMEOUT_MS, resolveSubagentTimeoutMs, runAgentWithTimeoutContinuation } = createRequire(import.meta.url)("./bin/subagent-timeout-policy.cjs"));
 	({ buildSubagentUsageDelta } = createRequire(import.meta.url)("./bin/subagent-usage-rollup-policy.cjs"));
 	({ inheritSubagentAllowedTools, inheritSubagentLifecycleTools } = createRequire(import.meta.url)("./bin/subagent-tool-policy.cjs"));
+	({ prepareSubagentSkillPolicy, profileWithSubagentSkillTools, restoreSubagentSkillPolicy } = createRequire(import.meta.url)("./bin/subagent-skill-policy.cjs"));
+	({ SUBAGENT_FORK_REMINDER, projectSubagentForkContext, resolveSubagentContextMode } = createRequire(import.meta.url)("./bin/subagent-context-fork-policy.cjs"));
 	({
 		STRUCTURED_SUBAGENT_OUTPUT_ERROR,
 		prepareStructuredResponseFormat,
@@ -252719,6 +253326,12 @@ var init_subagent_host = __esmMin((() => {
 		kind: "system_trigger",
 		name: "subagent"
 	};
+	function subagentPromptOrigin(toolScope) {
+		return toolScope === void 0 ? SUBAGENT_PROMPT_ORIGIN : {
+			...SUBAGENT_PROMPT_ORIGIN,
+			toolScope
+		};
+	}
 	SIDE_QUESTION_SYSTEM_REMINDER = `
 This is a side-channel conversation with the user. You should answer user questions directly based on what you already know.
 
@@ -252757,21 +253370,37 @@ IMPORTANT:
 			}
 			return this.session.getReadyAgent(currentId);
 		}
+		toolScopeForTurn(turnId) {
+			return inheritedCronToolScope(this.session.getReadyAgent(this.ownerAgentId)?.turn.toolScopeForTurn(turnId));
+		}
+		isRootAgent() {
+			return this.session.metadata.agents[this.ownerAgentId]?.parentAgentId == null;
+		}
 		async spawn(options) {
 			options.signal.throwIfAborted();
 			const parent = await this.session.ensureAgentResumed(this.ownerAgentId);
+			const contextMode = resolveSubagentContextMode({
+				requested: options.contextMode,
+				isRoot: this.isRootAgent()
+			});
 			const profile = this.resolveProfile(parent, options.profileName);
+			const skillPolicy = prepareSubagentSkillPolicy(profile.subagentSkills, this.session.skills);
+			const effectiveProfile = profileWithSubagentSkillTools(profile, skillPolicy);
 			const { id, agent } = await this.session.createAgent({
 				type: "sub",
-				generate: parent.rawGenerate
+				generate: parent.rawGenerate,
+				skillRegistry: skillPolicy.registry
 			}, {
 				parentAgentId: this.ownerAgentId,
-				swarmItem: options.swarmItem
+				swarmItem: options.swarmItem,
+				profileName: profile.name,
+				skillPolicy: skillPolicy.metadata
 			});
 			const completion = this.runWithTrackedChildUsage(parent, agent, id, options, async (runOptions) => {
 				this.emitSubagentSpawned(parent, id, profile.name, runOptions);
 				try {
-					await this.configureChild(parent, agent, profile);
+					await this.configureChild(parent, agent, effectiveProfile);
+					if (contextMode === "fork") this.seedForkedContext(parent, agent);
 					return await this.runPromptTurn(parent, id, agent, profile.name, runOptions);
 				} catch (error) {
 					this.emitSubagentFailed(parent, id, runOptions, error);
@@ -252845,7 +253474,7 @@ IMPORTANT:
 							await child.fullCompaction.block(runOptions.signal);
 						}
 						this.emitSubagentStarted(parent, agentId);
-						if (child.turn.retry("agent-host") === null) throw new Error(`Agent instance "${agentId}" could not start a retry turn`);
+						if (child.turn.retry("agent-host", runOptions.toolScope) === null) throw new Error(`Agent instance "${agentId}" could not start a retry turn`);
 						this.observeFirstRequest(child, runOptions);
 						return await this.waitForChildCompletion(parent, agentId, child, profileName, runOptions);
 					} catch (error) {
@@ -252968,23 +253597,29 @@ IMPORTANT:
 				const gitContext = await collectGitContext(child.kaos, child.config.cwd);
 				if (gitContext) childPrompt = `${gitContext}\n\n${childPrompt}`;
 			}
+			if (options.systemReminder !== void 0) child.context.appendSystemReminder(options.systemReminder, {
+				kind: "system_trigger",
+				name: "durable_task_resume"
+			});
 			if (options.responseFormat !== void 0) child.context.appendSystemReminder(buildStructuredResponseFormatReminder(options.responseFormat), {
 				kind: "system_trigger",
 				name: "subagent_response_format"
 			});
 			this.emitSubagentStarted(parent, childId);
+			const childOrigin = subagentPromptOrigin(options.toolScope);
 			if (child.turn.prompt([{
 				type: "text",
 				text: childPrompt
-			}], SUBAGENT_PROMPT_ORIGIN) === null) throw new Error(`Agent instance "${childId}" could not start a turn`);
+			}], childOrigin) === null) throw new Error(`Agent instance "${childId}" could not start a turn`);
 			this.observeFirstRequest(child, options);
 			return this.waitForChildCompletion(parent, childId, child, profileName, options);
 		}
 		async waitForChildCompletion(parent, childId, child, profileName, options) {
-			await completeChildTurnWithMaxTokensHandoff(child, options.signal);
+			const childOrigin = subagentPromptOrigin(options.toolScope);
+			await completeChildTurnWithMaxTokensHandoff(child, options.signal, childOrigin);
 			let result;
 			if (options.responseFormat !== void 0) {
-				const structuredResult = await completeStructuredSubagentResult(child, childId, profileName, options.responseFormat, options.signal);
+				const structuredResult = await completeStructuredSubagentResult(child, childId, profileName, options.responseFormat, options.signal, childOrigin);
 				result = buildStructuredSubagentEnvelope({
 					agentId: childId,
 					profileName,
@@ -253001,8 +253636,8 @@ IMPORTANT:
 					child.turn.prompt([{
 						type: "text",
 						text: summary_continuation_default
-					}], SUBAGENT_PROMPT_ORIGIN);
-					await completeChildTurnWithMaxTokensHandoff(child, options.signal);
+					}], childOrigin);
+					await completeChildTurnWithMaxTokensHandoff(child, options.signal, childOrigin);
 					result = lastAssistantText(child);
 				}
 			}
@@ -253029,10 +253664,22 @@ IMPORTANT:
 			});
 			const context = await prepareSystemPromptContext(this.session.systemContextKaos(child.kaos.getcwd()), this.session.options.blunHomeDir, { additionalDirs: child.getAdditionalDirs() });
 			child.useProfile(profile, context, this.session.options.blunHomeDir);
-			child.tools.inheritUserTools(parent.tools);
+			child.tools.inheritUserTools(parent.tools, /* @__PURE__ */ new Set(["Skill"]));
 			inheritSubagentLifecycleTools(parent.tools, child.tools);
 			inheritSubagentAllowedTools(parent.tools, child.tools);
 		}
+		seedForkedContext(parent, child) {
+			const projection = projectSubagentForkContext(parent.context.history);
+			child.context.useProjectedHistoryFrom({
+				history: projection.messages,
+				project: (history) => history
+			});
+			child.context.appendSystemReminder(SUBAGENT_FORK_REMINDER, {
+				kind: "system_trigger",
+				name: "subagent_context_fork"
+			});
+			return projection;
+		}
 		async triggerSubagentStart(parent, profileName, prompt, signal) {
 			await parent.hooks?.trigger("SubagentStart", {
 				matcherValue: profileName,
@@ -253064,10 +253711,11 @@ IMPORTANT:
 				subagentId: childId,
 				subagentName: profileName,
 				parentToolCallId: options.parentToolCallId,
-				parentToolCallUuid: options.parentToolCallUuid,
-				parentAgentId: this.ownerAgentId,
-				description: options.description,
-				swarmIndex: options.swarmIndex,
+					parentToolCallUuid: options.parentToolCallUuid,
+					parentAgentId: this.ownerAgentId,
+					description: options.description,
+					contextMode: options.contextMode === "fork" ? "fork" : "isolated",
+					swarmIndex: options.swarmIndex,
 				runInBackground: options.runInBackground
 			});
 			parent.telemetry.track("subagent_created", {
@@ -253160,7 +253808,7 @@ function buildSubagentDescriptions(subagents) {
 		return `${header}\n  Tools: ${subagent.tools.join(", ")}`;
 	}).join("\n");
 }
-var AgentToolInputSchema, BACKGROUND_AGENT_UNAVAILABLE, AgentTool, USER_INTERRUPTED_SUBAGENT_MESSAGE, resolveSubagentRunMode;
+var AgentToolInputSchema, BACKGROUND_AGENT_UNAVAILABLE, SUBAGENT_CONTEXT_FORK_TOOL_DESCRIPTION, AgentTool, USER_INTERRUPTED_SUBAGENT_MESSAGE, resolveSubagentRunMode;
 var init_agent$1 = __esmMin((() => {
 	init_zod$1();
 	init_tool_access();
@@ -253174,6 +253822,7 @@ var init_agent$1 = __esmMin((() => {
 	init_agent_background_enabled();
 	init_agent$2();
 	({ resolveSubagentRunMode } = createRequire(import.meta.url)("./bin/subagent-parent-responsiveness.cjs"));
+	SUBAGENT_CONTEXT_FORK_TOOL_DESCRIPTION = "The default context_mode=isolated starts with zero conversation context. For a new root-level subagent whose work genuinely depends on this exact conversation, context_mode=fork passes only a bounded, redacted projection of direct local user text and completed text-only assistant replies. It never passes private channel messages, system injections, attachments, tool calls, arguments, or results. The delegated prompt remains required and authoritative. Fork is unavailable when resuming and unavailable to nested subagents.";
 	AgentToolInputSchema = preprocess((input) => {
 		if (typeof input !== "object" || input === null || Array.isArray(input)) return input;
 		const normalized = { ...input };
@@ -253186,6 +253835,7 @@ var init_agent$1 = __esmMin((() => {
 		prompt: string().describe("Full task prompt for the subagent"),
 		description: string().describe("Short task description (3-5 words) for UI display"),
 		subagent_type: string().optional().describe("One of the available agent types (see \"Available agent types\" in this tool description). Defaults to \"coder\" when omitted."),
+		context_mode: _enum(["isolated", "fork"]).optional().describe("Context boundary for a new subagent. Defaults to isolated. fork is root-only and passes a bounded redacted user/assistant projection without tools, private channels, system injections, attachments, or tool results."),
 		resume: string().optional().describe("Optional agent ID to resume instead of creating a new instance. When set, do not also pass subagent_type — the resumed agent keeps its own type, and supplying both is rejected."),
 		run_in_background: boolean$1().optional().describe("Compatibility option. Normal subagents run detached when task management is available. A response_format call requires this to be false or omitted and runs in the foreground for validation."),
 		timeout_minutes: number$1().int().min(0).max(10080).optional().describe("Wall-clock interval before the same agent is continued automatically. Defaults to 240 minutes. Set 0 to disable the interval for this run."),
@@ -253217,7 +253867,7 @@ var init_agent$1 = __esmMin((() => {
 			const log = options?.log;
 			this.allowBackground = options?.allowBackground ?? true;
 			const typeLines = buildSubagentDescriptions(subagents);
-			const baseDescription = `${agent_default}\n\n${this.allowBackground ? agent_background_enabled_default : agent_background_disabled_default}`;
+			const baseDescription = `${agent_default}\n\n${SUBAGENT_CONTEXT_FORK_TOOL_DESCRIPTION}\n\n${this.allowBackground ? agent_background_enabled_default : agent_background_disabled_default}`;
 			this.description = typeLines ? `${baseDescription}\n\nAvailable agent types (pass via subagent_type):\n${typeLines}` : baseDescription;
 			this.log = log;
 		}
@@ -253246,7 +253896,7 @@ var init_agent$1 = __esmMin((() => {
 				execute: (ctx) => this.execution(args, ctx)
 			};
 		}
-		async execution(args, { toolCallId, signal }) {
+		async execution(args, { toolCallId, signal, turnId }) {
 			try {
 				signal.throwIfAborted();
 				if (args.response_format !== void 0 && args.run_in_background === true) return {
@@ -253269,6 +253919,19 @@ var init_agent$1 = __esmMin((() => {
 				const runInBackground = responseFormat === void 0 ? resolvedRunMode.runInBackground : false;
 				const requestedProfileName = args.subagent_type?.length ? args.subagent_type : void 0;
 				const resumeAgentId = args.resume?.trim();
+				let contextMode;
+				try {
+					contextMode = resolveSubagentContextMode({
+						requested: args.context_mode,
+						resume: resumeAgentId !== void 0 && resumeAgentId.length > 0,
+						isRoot: this.subagentHost.isRootAgent()
+					});
+				} catch (error) {
+					return {
+						output: error instanceof Error ? error.message : String(error),
+						isError: true
+					};
+				}
 				if (resumeAgentId !== void 0 && resumeAgentId.length > 0 && requestedProfileName !== void 0) return {
 					output: "Cannot set subagent_type when resuming an existing agent. Resume by agent id only.",
 					isError: true
@@ -253289,6 +253952,8 @@ var init_agent$1 = __esmMin((() => {
 					description: args.description,
 					runInBackground,
 					responseFormat,
+					contextMode,
+					toolScope: this.subagentHost.toolScopeForTurn(Number(turnId)),
 					signal: controller.signal
 				};
 				let handle;
@@ -253365,7 +254030,7 @@ var init_agent$1 = __esmMin((() => {
 //#region ../../packages/agent-core/src/tools/builtin/collaboration/agent-swarm.md?raw
 var agent_swarm_default;
 var init_agent_swarm$1 = __esmMin((() => {
-	agent_swarm_default = "Launch multiple subagents from one prompt template, existing agent resumes, or both.\n\nUse AgentSwarm when many subagents should run the same kind of task over different inputs. The placeholder is exactly `{{item}}`. For example, with `prompt_template` set to `Review {{item}} for likely regressions.` and `items` set to `[\"src/a.ts\", \"src/b.ts\"]`, AgentSwarm launches two new subagents with those two concrete prompts. For a few differently-shaped tasks, make separate `Agent` calls in one message instead.\n\nUse `resume_agent_ids` to continue subagents that already exist from earlier work, such as ones that failed or timed out: map each agent id to the prompt for that resumed subagent (usually `continue` if no extra information is needed). You may combine `resume_agent_ids` with `items` in the same call to resume existing subagents and launch new ones. Do not duplicate resumed work in `items`.\n\nEach of these is enforced — a violation is rejected before any subagent starts: provide at least 2 `items` unless you pass `resume_agent_ids`; whenever `items` are present, `prompt_template` is required and must contain `{{item}}`; and the filled-in prompts must be distinct (two items that expand to the same prompt are rejected).\n\nUse enough subagents to keep the work focused and parallel. AgentSwarm supports up to 128 subagents, and launches are queued automatically, so it is safe to split large tasks into many clear, independent items.\n\nIf `AgentSwarm` is called, that call must be the only tool call in the response.\n";
+	agent_swarm_default = "Launch multiple subagents from one prompt template, existing agent resumes, or both.\n\nUse AgentSwarm when many subagents should run the same kind of task over different inputs. The placeholder is exactly `{{item}}`. For example, with `prompt_template` set to `Review {{item}} for likely regressions.` and `items` set to `[\"src/a.ts\", \"src/b.ts\"]`, AgentSwarm launches two new subagents with those two concrete prompts. For a few differently-shaped tasks, make separate `Agent` calls in one message instead.\n\nUse `resume_agent_ids` to continue subagents that already exist from earlier work, such as ones that failed or timed out: map each agent id to the prompt for that resumed subagent (usually `continue` if no extra information is needed). You may combine `resume_agent_ids` with `items` in the same call to resume existing subagents and launch new ones. Do not duplicate resumed work in `items`.\n\nEach of these is enforced — a violation is rejected before any subagent starts: provide at least 2 `items` unless you pass `resume_agent_ids`; whenever `items` are present, `prompt_template` is required and must contain `{{item}}`; and the filled-in prompts must be distinct (two items that expand to the same prompt are rejected).\n\nUse enough subagents to keep the work focused and parallel. AgentSwarm supports up to 128 subagents, and launches are queued automatically, so it is safe to split large tasks into many clear, independent items.\n\nUse `response_format` when all children must return one shared bounded JSON shape. Each child is validated and repaired independently, and the final result is canonical task-order JSON. Omit it to retain the existing XML result format unchanged.\n\nIf `AgentSwarm` is called, that call must be the only tool call in the response.\n";
 }));
 //#endregion
 //#region ../../packages/agent-core/src/tools/builtin/collaboration/agent-swarm.ts
@@ -253448,13 +254113,14 @@ function renderSwarmSummary(completed, failed, aborted = 0) {
 function escapeXmlAttribute(value) {
 	return value.replaceAll("&", "&amp;").replaceAll("\"", "&quot;").replaceAll("<", "&lt;").replaceAll(">", "&gt;");
 }
-var DEFAULT_SUBAGENT_TYPE, PROMPT_TEMPLATE_PLACEHOLDER, MAX_AGENT_SWARM_SUBAGENTS, AgentSwarmToolInputSchema, AgentSwarmTool;
+var DEFAULT_SUBAGENT_TYPE, PROMPT_TEMPLATE_PLACEHOLDER, MAX_AGENT_SWARM_SUBAGENTS, renderStructuredSwarmResults, parseStructuredSwarmDisplay, structuredSwarmToolResult, AgentSwarmToolInputSchema, AgentSwarmTool;
 var init_agent_swarm = __esmMin((() => {
 	init_zod$1();
 	init_subagent_host();
 	init_tool_access();
 	init_input_schema();
 	init_agent_swarm$1();
+	({ renderStructuredSwarmResults, parseStructuredSwarmDisplay, structuredSwarmToolResult } = createRequire(import.meta.url)("./bin/structured-agent-swarm-output.cjs"));
 	DEFAULT_SUBAGENT_TYPE = "coder";
 	PROMPT_TEMPLATE_PLACEHOLDER = "{{item}}";
 	MAX_AGENT_SWARM_SUBAGENTS = 128;
@@ -253464,7 +254130,11 @@ var init_agent_swarm = __esmMin((() => {
 		prompt_template: string().trim().min(1).optional().describe(`Prompt template for each subagent. The ${PROMPT_TEMPLATE_PLACEHOLDER} placeholder is replaced with each item value.`),
 		items: array(string().trim().min(1)).max(MAX_AGENT_SWARM_SUBAGENTS).optional().describe(`Values used to fill ${PROMPT_TEMPLATE_PLACEHOLDER}. Each item launches one new subagent.`),
 		resume_agent_ids: record(string().trim().min(1), string().trim().min(1)).optional().describe("Map of existing subagent agent_id to the prompt used to resume that subagent. These resumed subagents are launched before new item-based subagents."),
-		timeout_minutes: number$1().int().min(0).max(10080).optional().describe("Wall-clock interval before each same swarm agent is continued automatically. Defaults to 240 minutes. Set 0 to disable the interval for this run.")
+		timeout_minutes: number$1().int().min(0).max(10080).optional().describe("Wall-clock interval before each same swarm agent is continued automatically. Defaults to 240 minutes. Set 0 to disable the interval for this run."),
+		response_format: object({
+			name: string().min(1).max(64).describe("Stable name for the shared structured result"),
+			schema: record(string(), unknown()).describe("Restricted JSON Schema applied to every child result")
+		}).optional().describe("Require one shared validated JSON object shape from every spawned or resumed swarm child.")
 	}).strict();
 	AgentSwarmTool = class {
 		subagentHost;
@@ -253492,8 +254162,17 @@ var init_agent_swarm = __esmMin((() => {
 		}
 		async execution(args, context) {
 			try {
+				let responseFormat;
+				if (args.response_format !== void 0) try {
+					responseFormat = prepareStructuredResponseFormat(args.response_format, compileToolArgsValidator);
+				} catch (error) {
+					return {
+						output: `Invalid response_format: ${error instanceof Error ? error.message : String(error)}`,
+						isError: true
+					};
+				}
 				this.swarmMode.enter("tool");
-				return { output: await this.runSwarm(args, context.signal, context.toolCallId) };
+				return structuredSwarmToolResult(await this.runSwarm(args, context.signal, context.toolCallId, responseFormat, context.turnId));
 			} catch (error) {
 				return {
 					output: error instanceof Error ? error.message : String(error),
@@ -253501,7 +254180,7 @@ var init_agent_swarm = __esmMin((() => {
 				};
 			}
 		}
-		async runSwarm(args, signal, toolCallId) {
+		async runSwarm(args, signal, toolCallId, responseFormat, turnId) {
 			const profileName = normalizeOptionalString$2(args.subagent_type) ?? DEFAULT_SUBAGENT_TYPE;
 			const tasks = createAgentSwarmSpecs(args, (agentId) => this.subagentHost.getSwarmItem(agentId)).map((spec) => {
 				const descriptionName = spec.kind === "resume" ? "resume" : profileName;
@@ -253513,6 +254192,8 @@ var init_agent_swarm = __esmMin((() => {
 					description: childDescription(args.description, spec.index, descriptionName),
 					swarmIndex: spec.index,
 					runInBackground: false,
+					responseFormat,
+					toolScope: this.subagentHost.toolScopeForTurn(Number(turnId)),
 					swarmItem: spec.item,
 					signal,
 					timeout: resolveSubagentTimeoutMs({ perRunMinutes: args.timeout_minutes })
@@ -253527,10 +254208,11 @@ var init_agent_swarm = __esmMin((() => {
 					kind: "spawn"
 				};
 			});
-			return renderSwarmResults((await this.subagentHost.runQueued(tasks)).map(({ task, ...result }) => ({
+			const results = (await this.subagentHost.runQueued(tasks)).map(({ task, ...result }) => ({
 				spec: task.data,
 				...result
-			})));
+			}));
+			return responseFormat === void 0 ? renderSwarmResults(results) : renderStructuredSwarmResults(results, responseFormat);
 		}
 	};
 }));
@@ -254011,7 +254693,15 @@ function replaceOnceLiteral(content, oldString, newString) {
 	if (index === -1) return content;
 	return content.slice(0, index) + newString + content.slice(index + oldString.length);
 }
-var EditInputSchema, EditTool, findDegenerateGeneratedStatementRun;
+async function observedFileStat(kaos, path) {
+	try {
+		return await kaos.stat(path);
+	} catch (error) {
+		if (error?.code === "ENOENT" || error?.code === "ENOTDIR") return null;
+		throw error;
+	}
+}
+var EditInputSchema, EditTool, findDegenerateGeneratedStatementRun, writeToolTextAtomic;
 var init_edit = __esmMin((() => {
 	init_zod$1();
 	init_tool_access();
@@ -254023,6 +254713,7 @@ var init_edit = __esmMin((() => {
 	init_edit$1();
 	init_lsp_diagnostics();
 	({ findDegenerateGeneratedStatementRun } = createRequire(import.meta.url)("./bin/generated-source-health.cjs"));
+	({ writeToolTextAtomic } = createRequire(import.meta.url)("./bin/tool-file-persistence.cjs"));
 	EditInputSchema = object({
 		path: string().describe("Path to the text file to edit. Relative paths resolve against the working directory; a path outside the working directory must be absolute."),
 		old_string: string().min(1).describe("Exact content to replace from the Read output view, without the line-number prefix. Use LF for pure CRLF files; use actual \\r escapes where Read shows \\r."),
@@ -254036,14 +254727,16 @@ var init_edit = __esmMin((() => {
 		workspace;
 		history;
 		lsp;
+		fileObservation;
 		name = "Edit";
 		description = edit_default;
 		parameters = toInputJsonSchema(EditInputSchema);
-		constructor(kaos, workspace, history, lsp) {
+		constructor(kaos, workspace, history, lsp, fileObservation) {
 			this.kaos = kaos;
 			this.workspace = workspace;
 			this.history = history;
 			this.lsp = lsp;
+			this.fileObservation = fileObservation;
 		}
 		resolveExecution(args) {
 			const path = resolvePathAccessPath(args.path, {
@@ -254081,6 +254774,12 @@ var init_edit = __esmMin((() => {
 				output: `Refused to edit ${args.path}: generated source contains a runaway repeated statement ${String(degenerateStatementRun.count)} times from line ${String(degenerateStatementRun.line)} (starts with ${JSON.stringify(degenerateStatementRun.preview)}). Regenerate that section in a smaller focused chunk. No file was written.`
 			};
 			try {
+				const currentStat = await observedFileStat(this.kaos, safePath);
+				const authorization = this.fileObservation.authorizeEdit(safePath, currentStat);
+				if (!authorization.allowed) return {
+					isError: true,
+					output: `[${authorization.code}] ${authorization.error}`
+				};
 				const raw = await this.kaos.readText(safePath);
 				const modelView = toModelTextView(raw);
 				const content = modelView.text;
@@ -254103,7 +254802,7 @@ var init_edit = __esmMin((() => {
 						output: `old_string is not unique in ${args.path} (found ${String(count)} occurrences). To replace every occurrence, set replace_all=true. To replace only one occurrence, include more surrounding context in old_string.`
 					};
 					const newContent = replaceOnceLiteral(content, args.old_string, args.new_string);
-					return this.writeReplacement(args, safePath, raw, newContent, modelView.lineEndingStyle, 1);
+					return this.writeReplacement(args, safePath, raw, newContent, modelView.lineEndingStyle, 1, authorization.version);
 				}
 				const parts = content.split(args.old_string);
 				const replacementCount = parts.length - 1;
@@ -254113,7 +254812,7 @@ var init_edit = __esmMin((() => {
 `
 				};
 				const newContent = parts.join(args.new_string);
-				return this.writeReplacement(args, safePath, raw, newContent, modelView.lineEndingStyle, replacementCount);
+				return this.writeReplacement(args, safePath, raw, newContent, modelView.lineEndingStyle, replacementCount, authorization.version);
 			} catch (error) {
 				if (error?.code === "EISDIR") return {
 					isError: true,
@@ -254125,7 +254824,7 @@ var init_edit = __esmMin((() => {
 				};
 			}
 		}
-		async writeReplacement(args, safePath, currentContent, nextContent, lineEndingStyle, replacementCount) {
+		async writeReplacement(args, safePath, currentContent, nextContent, lineEndingStyle, replacementCount, observedVersion) {
 			const materialized = materializeModelText(nextContent, lineEndingStyle);
 			const lineLimit = evaluateSourceFileLineLimit(safePath, materialized, {
 				currentContent,
@@ -254136,7 +254835,14 @@ var init_edit = __esmMin((() => {
 				isError: true,
 				output: lineLimit.error
 			};
-			await this.kaos.writeText(safePath, materialized);
+			const latestStat = await observedFileStat(this.kaos, safePath);
+			const freshness = this.fileObservation.verifyUnchanged(safePath, observedVersion, latestStat);
+			if (!freshness.allowed) return {
+				isError: true,
+				output: `[${freshness.code}] ${freshness.error}`
+			};
+			await writeToolTextAtomic(safePath, materialized);
+			this.fileObservation.recordPresent(safePath, await this.kaos.stat(safePath));
 			const occurrence = replacementCount === 1 ? "occurrence" : "occurrences";
 			const notice = lineLimit.notice === void 0 ? "" : ` ${lineLimit.notice}`;
 			return appendLspDiagnostics({ output: `Replaced ${String(replacementCount)} ${occurrence} in ${args.path}.` + notice }, safePath, this.lsp);
@@ -259646,7 +260352,7 @@ function renderLine(entry, lineEndingStyle) {
 function renderedLineBytes(renderedLine, isFirst) {
 	return (isFirst ? 0 : 1) + Buffer.byteLength(renderedLine, "utf8");
 }
-function renderEntries(entries, lineEndingStyle) {
+function renderEntries(entries, lineEndingStyle, maxBytes) {
 	const renderedLines = [];
 	const truncatedLineNumbers = [];
 	let bytes = 0;
@@ -259654,14 +260360,14 @@ function renderEntries(entries, lineEndingStyle) {
 	for (const entry of entries) {
 		const rendered = renderLine(entry, lineEndingStyle);
 		const lineBytes = renderedLineBytes(rendered.line, renderedLines.length === 0);
-		if (renderedLines.length > 0 && bytes + lineBytes > MAX_BYTES) {
+		if (renderedLines.length > 0 && bytes + lineBytes > maxBytes) {
 			maxBytesReached = true;
 			break;
 		}
 		if (rendered.wasTruncated) truncatedLineNumbers.push(entry.lineNo);
 		renderedLines.push(rendered.line);
 		bytes += lineBytes;
-		if (bytes >= MAX_BYTES) {
+		if (bytes >= maxBytes) {
 			maxBytesReached = true;
 			break;
 		}
@@ -259692,7 +260398,7 @@ function containsNulByte(text) {
 function notReadableFileOutput(path) {
 	return `"${path}" is not readable as UTF-8 text. If it is an image or video, use ReadMediaFile. For other binary formats, use Bash or an MCP tool if available.`;
 }
-var MAX_LINES$1, MAX_LINE_LENGTH, MAX_BYTES, S_IFMT$1, S_IFREG, PositiveLineOffsetSchema, TailLineOffsetSchema, ReadInputSchema, ReadBatchInputSchema, READ_DESCRIPTION, READ_BATCH_DESCRIPTION, ReadTool, ReadBatchTool, readContinuationNotice, READ_MODEL_VISIBLE_BYTES, MAX_READ_BATCH_REQUESTS, readBatchAllFailed, renderReadBatchOutput;
+var MAX_LINES$1, MAX_LINE_LENGTH, S_IFMT$1, S_IFREG, PositiveLineOffsetSchema, TailLineOffsetSchema, ReadInputSchema, ReadBatchInputSchema, READ_DESCRIPTION, READ_BATCH_DESCRIPTION, ReadTool, ReadBatchTool, readContinuationNotice, readModelVisibleBytes, readModelVisibleLines, MAX_READ_BATCH_REQUESTS, readBatchAllFailed, renderReadBatchOutput;
 var init_read = __esmMin((() => {
 	init_zod$1();
 	init_tool_access();
@@ -259703,46 +260409,49 @@ var init_read = __esmMin((() => {
 	init_rule_match();
 	init_line_endings();
 	init_read$1();
-	({ readContinuationNotice, READ_MODEL_VISIBLE_BYTES } = createRequire(import.meta.url)("./bin/read-continuation-policy.cjs"));
+	({ readContinuationNotice, readModelVisibleBytes, readModelVisibleLines } = createRequire(import.meta.url)("./bin/read-continuation-policy.cjs"));
 	({ MAX_READ_BATCH_REQUESTS, readBatchAllFailed, renderReadBatchOutput } = createRequire(import.meta.url)("./bin/read-batch-policy.cjs"));
 	MAX_LINES$1 = 1e3;
 	MAX_LINE_LENGTH = 2e3;
-	MAX_BYTES = READ_MODEL_VISIBLE_BYTES;
 	S_IFMT$1 = 61440;
 	S_IFREG = 32768;
 	PositiveLineOffsetSchema = number$1().int().min(1);
-	TailLineOffsetSchema = number$1().int().min(-MAX_LINES$1).max(-1);
+	TailLineOffsetSchema = number$1().int().max(-1);
 	ReadInputSchema = object({
 		path: string().describe("Path to a text file. Relative paths resolve against the working directory; a path outside the working directory must be absolute. Directories are not supported; use `ls` via Bash for a known directory, or Glob for pattern search."),
-		line_offset: union([PositiveLineOffsetSchema, TailLineOffsetSchema]).optional().describe(`The line number to start reading from. Omit to start at line 1. Negative values read from the end of the file; the absolute value cannot exceed ${String(MAX_LINES$1)}.`),
-		n_lines: number$1().int().positive().optional().describe(`The number of lines to read; the tool also applies its internal cap. Omit to read up to the internal cap of ${String(MAX_LINES$1)} lines.`)
+		line_offset: union([PositiveLineOffsetSchema, TailLineOffsetSchema]).optional().describe("The line number to start reading from. Omit to start at line 1. Negative values read backward from the end within the active context budget."),
+		n_lines: number$1().int().positive().optional().describe("The number of lines for an explicit targeted range. Omit to read the complete file whenever the active context has room.")
 	});
 	ReadBatchInputSchema = object({ requests: array(ReadInputSchema).min(2).max(MAX_READ_BATCH_REQUESTS).describe(`Two to ${String(MAX_READ_BATCH_REQUESTS)} independent known text-file reads. Do not batch a read whose path or range depends on an earlier result.`) });
 	object({
 		content: string(),
 		lineCount: number$1().int().nonnegative()
 	});
+	read_default = "Read a known UTF-8 text file. Invalid paths error; directories are unsupported. Relative paths use the working directory; outside paths must be absolute. Use Glob for unknown names, Grep for content, and ReadMediaFile for media.\n\nOmit `line_offset` and `n_lines` to read the complete file whenever the active context has room. Explicit ranges remain available for targeted inspection. Under real context pressure, a result is capped and names the exact next `line_offset`; continue from that line without gaps. Individual lines beyond {{ MAX_LINE_LENGTH }} characters are truncated. Negative `line_offset` reads from the end, up to {{ MAX_LINES }} lines. Issue independent Read calls together in one response when several files or ranges may be useful. Prefer ReadBatch when two or more independent paths or ranges are already known.\n\nSensitive files such as `.env` and credential stores are refused; templates and public keys remain readable. Only UTF-8 text without NUL bytes is accepted; use Bash or an MCP tool for other binaries.\n\nOutput is `<line-number>\\t<content>` per line. The trailing `<system>...</system>` block is status, not file content. Pure CRLF appears as LF and is preserved by Edit. Mixed or lone carriage returns appear as `\\r` and require exact `Edit.old_string` escapes.";
 	READ_DESCRIPTION = renderPrompt(read_default, {
 		MAX_LINES: MAX_LINES$1,
-		MAX_BYTES_KB: MAX_BYTES / 1024,
-		MAX_LINE_LENGTH
-	});
-	read_default = "Read a known UTF-8 text file. Invalid paths error; directories are unsupported. Relative paths use the working directory; outside paths must be absolute. Use Glob for unknown names, Grep for content, and ReadMediaFile for media.\n\nEach call returns at most {{ MAX_LINES }} lines or {{ MAX_BYTES_KB }} KB and truncates lines beyond {{ MAX_LINE_LENGTH }} characters. Page large files with 1-based `line_offset` and `n_lines`; omit `n_lines` for the cap. Negative `line_offset` reads from the end, up to {{ MAX_LINES }} lines. A capped result names the exact next `line_offset`. Issue independent Read calls together in one response when several files or ranges may be useful. Prefer ReadBatch when two or more independent paths or ranges are already known.\n\nSensitive files such as `.env` and credential stores are refused; templates and public keys remain readable. Only UTF-8 text without NUL bytes is accepted; use Bash or an MCP tool for other binaries.\n\nOutput is `<line-number>\\t<content>` per line. The trailing `<system>...</system>` block is status, not file content. Pure CRLF appears as LF and is preserved by Edit. Mixed or lone carriage returns appear as `\\r` and require exact `Edit.old_string` escapes.";
-	READ_DESCRIPTION = renderPrompt(read_default, {
-		MAX_LINES: MAX_LINES$1,
-		MAX_BYTES_KB: MAX_BYTES / 1024,
 		MAX_LINE_LENGTH
 	});
 	READ_BATCH_DESCRIPTION = `Read ${String(MAX_READ_BATCH_REQUESTS)} or fewer independent known UTF-8 text files or ranges concurrently in one tool call. Use this instead of serial Read calls only when every path and range is already known and no later request depends on an earlier result. Each request uses the same path, sensitive-file, UTF-8, line, and byte rules as Read. Results remain in request order and identify partial failures individually.`;
 	ReadTool = class {
 		kaos;
 		workspace;
+		contextWindowState;
+		fileObservation;
 		name = "Read";
 		description = READ_DESCRIPTION;
 		parameters = toInputJsonSchema(ReadInputSchema);
-		constructor(kaos, workspace) {
+		constructor(kaos, workspace, contextWindowState = () => ({}), fileObservation) {
 			this.kaos = kaos;
 			this.workspace = workspace;
+			this.contextWindowState = contextWindowState;
+			this.fileObservation = fileObservation;
+		}
+		modelVisibleBytes() {
+			return readModelVisibleBytes(this.contextWindowState());
+		}
+		modelVisibleLines() {
+			return readModelVisibleLines(this.contextWindowState());
 		}
 		resolveExecution(args) {
 			const path = resolvePathAccessPath(args.path, {
@@ -259773,10 +260482,13 @@ var init_read = __esmMin((() => {
 				try {
 					stat = await this.kaos.stat(safePath);
 				} catch (error) {
-					if (isFileNotFoundError(error)) return {
-						isError: true,
-						output: `"${args.path}" does not exist.`
-					};
+					if (isFileNotFoundError(error)) {
+						this.fileObservation.recordAbsent(safePath);
+						return {
+							isError: true,
+							output: `"${args.path}" does not exist.`
+						};
+					}
 					throw error;
 				}
 				if (!isRegularFileMode(stat.stMode)) return {
@@ -259793,10 +260505,21 @@ var init_read = __esmMin((() => {
 					output: notReadableFileOutput(args.path)
 				};
 				const lineOffset = args.line_offset ?? 1;
-				const requestedLines = args.n_lines ?? 1e3;
-				const effectiveLimit = Math.min(requestedLines, MAX_LINES$1);
-				if (lineOffset < 0) return await this.readTail(safePath, args.path, lineOffset, effectiveLimit, requestedLines);
-				return await this.readForward(safePath, args.path, lineOffset, effectiveLimit, requestedLines);
+				const maxLines = this.modelVisibleLines();
+				const requestedLines = args.n_lines ?? maxLines;
+				const effectiveLimit = Math.min(requestedLines, maxLines);
+				const maxBytes = this.modelVisibleBytes();
+				const result = lineOffset < 0
+					? await this.readTail(safePath, args.path, lineOffset, effectiveLimit, requestedLines, maxBytes, maxLines)
+					: await this.readForward(safePath, args.path, lineOffset, effectiveLimit, requestedLines, maxBytes, maxLines);
+				if (result.isError === true) return result;
+				const afterStat = await observedFileStat(this.kaos, safePath);
+				const stability = this.fileObservation.verifyStableRead(safePath, stat, afterStat);
+				if (!stability.allowed) return {
+					isError: true,
+					output: `[${stability.code}] ${stability.error}`
+				};
+				return result;
 			} catch (error) {
 				if (isTextDecodeError(error)) return {
 					isError: true,
@@ -259808,7 +260531,7 @@ var init_read = __esmMin((() => {
 				};
 			}
 		}
-		async readForward(safePath, displayPath, lineOffset, effectiveLimit, requestedLines) {
+		async readForward(safePath, displayPath, lineOffset, effectiveLimit, requestedLines, maxBytes, maxLines) {
 			const rangeKaos = this.kaos;
 			if (rangeKaos.scanTextFile !== void 0 && rangeKaos.readLineRange !== void 0) {
 				const scan = await rangeKaos.scanTextFile(safePath);
@@ -259817,31 +260540,47 @@ var init_read = __esmMin((() => {
 					output: notReadableFileOutput(displayPath)
 				};
 				const selectedEntries = [];
+				const lineEndingStyle = lineEndingStyleFromFlags(scan.lineEndingFlags);
+				let selectedBytes = 0;
+				let maxBytesReached = false;
 				let lineNo = lineOffset;
 				for await (const rawLine of rangeKaos.readLineRange(safePath, {
 					startLine: lineOffset,
 					maxLines: effectiveLimit,
 					errors: "strict"
 				})) {
-					selectedEntries.push({
+					const entry = {
 						lineNo,
 						rawContent: stripTrailingLf(rawLine)
-					});
+					};
+					const rendered = renderLine(entry, lineEndingStyle);
+					const lineBytes = renderedLineBytes(rendered.line, selectedEntries.length === 0);
+					if (selectedEntries.length > 0 && selectedBytes + lineBytes > maxBytes) {
+						maxBytesReached = true;
+						break;
+					}
+					selectedEntries.push(entry);
+					selectedBytes += lineBytes;
 					lineNo += 1;
+					if (selectedBytes >= maxBytes) {
+						maxBytesReached = true;
+						break;
+					}
 				}
-				const lineEndingStyle = lineEndingStyleFromFlags(scan.lineEndingFlags);
-				const rendered = renderEntries(selectedEntries, lineEndingStyle);
+				const rendered = renderEntries(selectedEntries, lineEndingStyle, maxBytes);
 				return this.finishReadResult({
 					renderedLines: rendered.renderedLines,
 					truncatedLineNumbers: rendered.truncatedLineNumbers,
-					maxLinesReached: effectiveLimit >= 1e3 && lineOffset + 1e3 <= scan.totalLines,
-					maxBytesReached: rendered.maxBytesReached,
+					maxLinesReached: effectiveLimit >= maxLines && lineOffset + maxLines <= scan.totalLines,
+					maxBytesReached: maxBytesReached || rendered.maxBytesReached,
 					lineEndingStyle,
 					startLine: selectedEntries.length > 0 ? lineOffset : 0,
 					totalLines: scan.totalLines,
 					requestedLines,
 					lineOffset,
-					effectiveLimit
+					effectiveLimit,
+					maxBytes,
+					maxLines
 				});
 			}
 			const selectedEntries = [];
@@ -259852,7 +260591,10 @@ var init_read = __esmMin((() => {
 			};
 			let currentLineNo = 0;
 			let maxLinesReached = false;
+			let maxBytesReached = false;
+			let selectedBytes = 0;
 			let collectionClosed = false;
+			let closedByLines = false;
 			for await (const rawLine of this.kaos.readLines(safePath, { errors: "strict" })) {
 				if (containsNulByte(rawLine)) return {
 					isError: true,
@@ -259861,38 +260603,56 @@ var init_read = __esmMin((() => {
 				currentLineNo += 1;
 				updateLineEndingFlags(flags, rawLine);
 				if (collectionClosed) {
-					if (effectiveLimit >= 1e3 && currentLineNo >= lineOffset) maxLinesReached = true;
+					if (closedByLines && effectiveLimit >= maxLines && currentLineNo >= lineOffset) maxLinesReached = true;
 					continue;
 				}
 				if (currentLineNo < lineOffset) continue;
 				if (selectedEntries.length >= effectiveLimit) {
-					if (effectiveLimit >= 1e3) maxLinesReached = true;
+					if (effectiveLimit >= maxLines) maxLinesReached = true;
 					collectionClosed = true;
+					closedByLines = true;
 					continue;
 				}
-				selectedEntries.push({
+				const entry = {
 					lineNo: currentLineNo,
 					rawContent: stripTrailingLf(rawLine)
-				});
-				if (selectedEntries.length >= effectiveLimit) collectionClosed = true;
+				};
+				const conservative = renderLine(entry, "mixed");
+				const lineBytes = renderedLineBytes(conservative.line, selectedEntries.length === 0);
+				if (selectedEntries.length > 0 && selectedBytes + lineBytes > maxBytes) {
+					maxBytesReached = true;
+					collectionClosed = true;
+					continue;
+				}
+				selectedEntries.push(entry);
+				selectedBytes += lineBytes;
+				if (selectedEntries.length >= effectiveLimit) {
+					collectionClosed = true;
+					closedByLines = true;
+				} else if (selectedBytes >= maxBytes) {
+					maxBytesReached = true;
+					collectionClosed = true;
+				}
 			}
 			const lineEndingStyle = lineEndingStyleFromFlags(flags);
-			const rendered = renderEntries(selectedEntries, lineEndingStyle);
+			const rendered = renderEntries(selectedEntries, lineEndingStyle, maxBytes);
 			return this.finishReadResult({
 				renderedLines: rendered.renderedLines,
 				truncatedLineNumbers: rendered.truncatedLineNumbers,
 				maxLinesReached,
-				maxBytesReached: rendered.maxBytesReached,
+				maxBytesReached: maxBytesReached || rendered.maxBytesReached,
 				lineEndingStyle,
 				startLine: selectedEntries.length > 0 ? lineOffset : 0,
 				totalLines: currentLineNo,
 				requestedLines,
 				lineOffset,
-				effectiveLimit
+				effectiveLimit,
+				maxBytes,
+				maxLines
 			});
 		}
-		async readTail(safePath, displayPath, lineOffset, effectiveLimit, requestedLines) {
-			const tailCount = Math.abs(lineOffset);
+		async readTail(safePath, displayPath, lineOffset, effectiveLimit, requestedLines, maxBytes, maxLines) {
+			const tailCount = Math.min(Math.abs(lineOffset), maxLines);
 			const rangeKaos = this.kaos;
 			if (rangeKaos.scanTextFile !== void 0 && rangeKaos.readTailLines !== void 0) {
 				const scan = await rangeKaos.scanTextFile(safePath);
@@ -259915,7 +260675,9 @@ var init_read = __esmMin((() => {
 					lineEndingFlags: scan.lineEndingFlags,
 					effectiveLimit,
 					totalLines: scan.totalLines,
-					requestedLines
+					requestedLines,
+					maxBytes,
+					maxLines
 				});
 			}
 			const entries = [];
@@ -259943,7 +260705,9 @@ var init_read = __esmMin((() => {
 				lineEndingFlags: flags,
 				effectiveLimit,
 				totalLines: currentLineNo,
-				requestedLines
+				requestedLines,
+				maxBytes,
+				maxLines
 			});
 		}
 		finishTailEntries(input) {
@@ -259957,7 +260721,7 @@ var init_read = __esmMin((() => {
 			let totalBytes = 0;
 			for (const [index, candidate] of renderedCandidates.entries()) totalBytes += renderedLineBytes(candidate.rendered.line, index === 0);
 			let maxBytesReached = false;
-			if (totalBytes > MAX_BYTES) {
+			if (totalBytes > input.maxBytes) {
 				maxBytesReached = true;
 				const kept = [];
 				let bytes = 0;
@@ -259965,7 +260729,7 @@ var init_read = __esmMin((() => {
 					const candidate = renderedCandidates[i];
 					if (candidate === void 0) continue;
 					const lineBytes = renderedLineBytes(candidate.rendered.line, kept.length === 0);
-					if (bytes + lineBytes > MAX_BYTES) break;
+					if (bytes + lineBytes > input.maxBytes) break;
 					kept.unshift(candidate);
 					bytes += lineBytes;
 				}
@@ -259985,7 +260749,9 @@ var init_read = __esmMin((() => {
 				lineEndingStyle,
 				startLine: renderedCandidates[0]?.entry.lineNo ?? 0,
 				totalLines: input.totalLines,
-				requestedLines: input.requestedLines
+				requestedLines: input.requestedLines,
+				maxBytes: input.maxBytes,
+				maxLines: input.maxLines
 			});
 		}
 		finishReadResult(input) {
@@ -260000,8 +260766,8 @@ var init_read = __esmMin((() => {
 			const lineCount = input.renderedLines.length;
 			const parts = lineCount > 0 ? [`${String(lineCount)} ${lineCount === 1 ? "line" : "lines"} read from file starting from line ${String(input.startLine)}.`] : ["No lines read from file."];
 			parts.push(`Total lines in file: ${String(input.totalLines)}.`);
-			if (input.maxLinesReached) parts.push(`Max ${String(MAX_LINES$1)} lines reached.`);
-			else if (input.maxBytesReached) parts.push(`Max ${String(MAX_BYTES)} bytes reached.`);
+			if (input.maxLinesReached) parts.push(`Max ${String(input.maxLines)} lines reached.`);
+			else if (input.maxBytesReached) parts.push(`Max ${String(input.maxBytes)} bytes reached.`);
 			else if (lineCount < input.requestedLines) parts.push("End of file reached.");
 			const continuationNotice = readContinuationNotice({
 				...input,
@@ -260020,10 +260786,10 @@ var init_read = __esmMin((() => {
 		name = "ReadBatch";
 		description = READ_BATCH_DESCRIPTION;
 		parameters = toInputJsonSchema(ReadBatchInputSchema);
-		constructor(kaos, workspace) {
+		constructor(kaos, workspace, contextWindowState, fileObservation) {
 			this.kaos = kaos;
 			this.workspace = workspace;
-			this.reader = new ReadTool(kaos, workspace);
+			this.reader = new ReadTool(kaos, workspace, contextWindowState, fileObservation);
 		}
 		resolveExecution(args) {
 			const items = args.requests.map((request) => ({
@@ -260448,7 +261214,7 @@ function countCompletedLines(content) {
 	for (const character of content) if (character === "\n") count += 1;
 	return count;
 }
-var S_IFMT, S_IFDIR, DEFAULT_CONTINUATION_CHUNK_BYTES, MIN_CONTINUATION_CHUNK_BYTES, MAX_CONTINUATION_CHUNK_BYTES, CONTINUATION_CHUNK_BYTES_ENV, WriteContinuationSchema, WriteInputSchema, WriteTool, resolveWriteContinuationContract, resolvePlainWriteContract, splitNativeWriteBytes, writeNativeLargeContentOnDisk;
+var S_IFMT, S_IFDIR, DEFAULT_CONTINUATION_CHUNK_BYTES, MIN_CONTINUATION_CHUNK_BYTES, MAX_CONTINUATION_CHUNK_BYTES, CONTINUATION_CHUNK_BYTES_ENV, WriteContinuationSchema, WriteInputSchema, WriteTool, resolveWriteContinuationContract, resolvePlainWriteContract, splitNativeWriteBytes, writeNativeLargeContentOnDisk, writeToolTextAtomic;
 var init_write = __esmMin((() => {
 	init_dist$6();
 	init_zod$1();
@@ -260462,6 +261228,7 @@ var init_write = __esmMin((() => {
 	init_lsp_diagnostics();
 	({ resolveWriteContinuationContract, resolvePlainWriteContract, splitNativeWriteBytes } = createRequire(import.meta.url)("./bin/write-continuation-policy.cjs"));
 	({ writeNativeLargeContentOnDisk } = createRequire(import.meta.url)("./bin/native-large-file-io.cjs"));
+	({ writeToolTextAtomic } = createRequire(import.meta.url)("./bin/tool-file-persistence.cjs"));
 	S_IFMT = 61440;
 	S_IFDIR = 16384;
 	DEFAULT_CONTINUATION_CHUNK_BYTES = 2048;
@@ -260491,17 +261258,19 @@ bytesWritten: number$1().int().nonnegative() });
 		workspace;
 		history;
 		lsp;
+		fileObservation;
 		maxContinuationChunkBytes;
 		name = "Write";
 		description = write_default;
 		parameters = toInputJsonSchema(WriteInputSchema);
 		pendingContinuations = /* @__PURE__ */ new Map();
 		continuationRequiredPaths = /* @__PURE__ */ new Set();
-		constructor(kaos, workspace, history, lsp, maxContinuationChunkBytes = resolveWriteContinuationChunkBytes()) {
+		constructor(kaos, workspace, history, lsp, fileObservation, maxContinuationChunkBytes = resolveWriteContinuationChunkBytes()) {
 			this.kaos = kaos;
 			this.workspace = workspace;
 			this.history = history;
 			this.lsp = lsp;
+			this.fileObservation = fileObservation;
 			this.maxContinuationChunkBytes = maxContinuationChunkBytes;
 		}
 		resolveExecution(args) {
@@ -260670,6 +261439,12 @@ bytesWritten: number$1().int().nonnegative() });
 				isError: true,
 				output: `Refused to write ${args.path}: generated source contains a runaway repeated statement ${String(degenerateStatementRun.count)} times from line ${String(degenerateStatementRun.line)} (starts with ${JSON.stringify(degenerateStatementRun.preview)}). Regenerate that section in a smaller focused chunk. No file was written.`
 			};
+			const currentStat = await observedFileStat(this.kaos, safePath);
+			const authorization = this.fileObservation.authorizeWrite(safePath, currentStat);
+			if (!authorization.allowed) return {
+				isError: true,
+				output: `[${authorization.code}] ${authorization.error}`
+			};
 			let currentContent;
 			if (isSourceFilePath(safePath)) try {
 				currentContent = await this.kaos.readText(safePath);
@@ -260697,9 +261472,16 @@ bytesWritten: number$1().int().nonnegative() });
 				continuationRequired: this.continuationRequiredPaths.has(safePath)
 			});
 			if (!allowLargeContent && !plainWrite.allowed) {
+				const latestStat = await observedFileStat(this.kaos, safePath);
+				const freshness = this.fileObservation.verifyUnchanged(safePath, authorization.version, latestStat);
+				if (!freshness.allowed) return {
+					isError: true,
+					output: `[${freshness.code}] ${freshness.error}`
+				};
 				const chunks = splitNativeWriteBytes(args.content, this.maxContinuationChunkBytes);
 				const nativeResult = await this.writeNativeLargeContent(safePath, chunks, mode);
 				if (nativeResult.isError === true) return nativeResult;
+				this.fileObservation.recordPresent(safePath, await this.kaos.stat(safePath));
 				this.continuationRequiredPaths.delete(safePath);
 				const notice = lineLimit.notice === void 0 ? "" : ` ${lineLimit.notice}`;
 				return appendLspDiagnostics({
@@ -260712,8 +261494,15 @@ bytesWritten: number$1().int().nonnegative() });
 				output: parentError
 			};
 			try {
+				const latestStat = await observedFileStat(this.kaos, safePath);
+				const freshness = this.fileObservation.verifyUnchanged(safePath, authorization.version, latestStat);
+				if (!freshness.allowed) return {
+					isError: true,
+					output: `[${freshness.code}] ${freshness.error}`
+				};
 				if (mode === "append") await this.kaos.writeText(safePath, args.content, { mode: "a" });
-				else await this.kaos.writeText(safePath, args.content);
+				else await writeToolTextAtomic(safePath, args.content);
+				this.fileObservation.recordPresent(safePath, await this.kaos.stat(safePath));
 				const bytesWritten = Buffer.byteLength(args.content, "utf8");
 				const notice = lineLimit.notice === void 0 ? "" : ` ${lineLimit.notice}`;
 				return appendLspDiagnostics({ output: `${mode === "append" ? "Appended" : "Wrote"} ${String(bytesWritten)} bytes to ${args.path}.${notice}` }, safePath, this.lsp);
@@ -261262,7 +262051,8 @@ var init_tool_dedup = __esmMin((() => {
 //#region ../../packages/agent-core/src/agent/turn/tool-result-budget.ts
 async function budgetToolResultForModel(options) {
 	const text = persistableToolResultText(options.result.output);
-	if (text === void 0 || shouldKeepFreshToolResult(options.toolName) || !shouldOffloadToolResult(text.length)) return options.result;
+	const contextUsageRatio = Number.isFinite(options.maxContextTokens) && options.maxContextTokens > 0 ? Number(options.contextTokens) / options.maxContextTokens : 1;
+	if (text === void 0 || shouldKeepFreshToolResult(options.toolName) || !shouldOffloadToolResult(text.length, { contextUsageRatio })) return options.result;
 	const readSourcePath = reusableReadSourcePath(options);
 	if (readSourcePath !== void 0) return referenceReadSourceForModel(options, text, readSourcePath);
 	return persistToolResultForModel(options, text);
@@ -261418,7 +262208,7 @@ function renderHistoricalToolResultReference(toolName, toolCallId, text, outputP
 function safeToolResultFileStem(toolName, toolCallId) {
 	return `${toolName}-${toolCallId}`.replace(/[^a-zA-Z0-9._-]+/g, "_").replace(/^_+|_+$/g, "").slice(0, 80) || "tool-result";
 }
-var TOOL_RESULT_MAX_CHARS, TOOL_RESULT_PREVIEW_CHARS, TOOL_RESULT_HISTORICAL_PREVIEW_CHARS, TOOL_RESULT_RECOVERY_PAGE_LINES, TOOL_RESULT_OFFLOAD_MARKER, TOOL_RESULT_HISTORICAL_KEEP_RECENT_MESSAGES, shouldKeepFreshToolResult, shouldOffloadToolResult, createToolResultPreview, compactPersistedToolResultReference, compactHistoricalSuccessfulToolResults, currentTurnReadToolResultIds, currentUserTurnStartIndex, dedupeRepeatedSuccessfulToolResults, readContinuationLineOffset, selectToolResultBatchOffloads, selectHistoricalToolResultOffloads, buildToolResultOffloadTelemetry;
+var TOOL_RESULT_MAX_CHARS, TOOL_RESULT_PREVIEW_CHARS, TOOL_RESULT_HISTORICAL_PREVIEW_CHARS, TOOL_RESULT_RECOVERY_PAGE_LINES, TOOL_RESULT_OFFLOAD_MARKER, TOOL_RESULT_HISTORICAL_KEEP_RECENT_MESSAGES, shouldKeepFreshToolResult, shouldOffloadToolResult, createToolResultPreview, compactPersistedToolResultReference, compactHistoricalSuccessfulToolResults, currentTurnReadToolResultIds, currentUserTurnStartIndex, dedupeRepeatedSuccessfulToolResults, hasToolResultOffloadPressure, readContinuationLineOffset, selectToolResultBatchOffloads, selectHistoricalToolResultOffloads, buildToolResultOffloadTelemetry;
 var init_tool_result_budget = __esmMin((() => {
 	init_dist$6();
 	const toolResultOffloadPolicy = createRequire(import.meta.url)("./bin/tool-result-offload-policy.cjs");
@@ -261438,6 +262228,7 @@ var init_tool_result_budget = __esmMin((() => {
 	currentUserTurnStartIndex = toolResultOffloadPolicy.currentUserTurnStartIndex;
 	dedupeRepeatedSuccessfulToolResults = toolResultOffloadPolicy.dedupeRepeatedSuccessfulToolResults;
 	freshToolResultIds = toolResultOffloadPolicy.freshToolResultIds;
+	hasToolResultOffloadPressure = toolResultOffloadPolicy.hasToolResultOffloadPressure;
 	readContinuationLineOffset = toolResultOffloadPolicy.readContinuationLineOffset;
 	selectToolResultBatchOffloads = toolResultOffloadPolicy.selectToolResultBatchOffloads;
 	selectHistoricalToolResultOffloads = toolResultOffloadPolicy.selectHistoricalToolResultOffloads;
@@ -261452,6 +262243,7 @@ var ToolResultBatchOffload = class {
 	}
 	async detect() {
 		const history = this.agent.context.history;
+		if (!toolResultOffloadPressureForAgent(this.agent)) return 0;
 		const tailIds = freshToolResultIds(history);
 		const pinnedReadIds = currentTurnReadToolResultIds(history);
 		const recentStart = Math.max(0, history.length - TOOL_RESULT_HISTORICAL_KEEP_RECENT_MESSAGES);
@@ -261534,6 +262326,7 @@ var ToolResultBatchOffload = class {
 		});
 	}
 	compact(messages) {
+		if (!toolResultOffloadPressureForAgent(this.agent)) return messages;
 		const recentStart = Math.max(0, messages.length - TOOL_RESULT_HISTORICAL_KEEP_RECENT_MESSAGES);
 		let changed = false;
 		const projected = messages.map((message, index) => {
@@ -261584,6 +262377,13 @@ var ToolResultBatchOffload = class {
 		}
 	}
 };
+function toolResultOffloadPressureForAgent(agent) {
+	return hasToolResultOffloadPressure({ contextUsageRatio: contextUsageRatioForAgent(agent) });
+}
+function contextUsageRatioForAgent(agent) {
+	const maxContextTokens = agent.fullCompaction.getEffectiveMaxContextTokens();
+	return maxContextTokens > 0 ? agent.context.tokenCountWithPending / maxContextTokens : 1;
+}
 //#endregion
 //#region ../../packages/agent-core/src/agent/turn/user-message-offload.ts
 function persistableUserMessageText(message) {
@@ -261652,6 +262452,7 @@ var UserMessageOffload = class {
 		if (this.agent.homedir === void 0) return 0;
 		const currentTurnStart = currentUserTurnStartIndex(history);
 		const totalHistoryChars = historyTextChars(history);
+		const contextUsageRatio = contextUsageRatioForAgent(this.agent);
 		let offloaded = 0;
 		for (let historyIndex = 0; historyIndex < history.length; historyIndex++) {
 			if (historyIndex === currentTurnStart) continue;
@@ -261663,7 +262464,8 @@ var UserMessageOffload = class {
 				historyIndex,
 				historyLength: history.length,
 				historyChars: totalHistoryChars,
-				textChars: text.length
+				textChars: text.length,
+				contextUsageRatio
 			});
 			if (!immediateOversize && !historicalOversize) continue;
 			const messageHash = userMessageOffloadHash(message, text);
@@ -261675,6 +262477,14 @@ var UserMessageOffload = class {
 				type: "text",
 				text: replacementText
 			}, ...message.content.filter((part) => part.type !== "text")];
+			this.agent.records.logRecord({
+				type: "policy.intervention",
+				policy: "user_message_offload",
+				location: "UserMessageOffload.detect",
+				size_before: text.length,
+				size_after: replacementText.length,
+				unit: "chars"
+			});
 			this.apply({
 				messageHash,
 				content,
@@ -261699,7 +262509,7 @@ var UserMessageOffload = class {
 		});
 	}
 	compact(messages) {
-		if (this.replacements.size === 0) return messages;
+		if (this.replacements.size === 0 || !toolResultOffloadPressureForAgent(this.agent)) return messages;
 		return messages.map((message) => {
 			const text = persistableUserMessageText(message);
 			if (text === void 0) return message;
@@ -261786,6 +262596,7 @@ var AssistantMessageOffload = class {
 		const history = this.agent.context.history;
 		if (this.agent.homedir === void 0) return 0;
 		const totalHistoryChars = historyTextChars(history);
+		const contextUsageRatio = contextUsageRatioForAgent(this.agent);
 		let offloaded = 0;
 		for (let historyIndex = 0; historyIndex < history.length; historyIndex++) {
 			const message = history[historyIndex];
@@ -261794,7 +262605,8 @@ var AssistantMessageOffload = class {
 				historyIndex,
 				historyLength: history.length,
 				historyChars: totalHistoryChars,
-				textChars: text.length
+				textChars: text.length,
+				contextUsageRatio
 			})) continue;
 			const messageHash = assistantMessageOffloadHash(message, text);
 			if (this.replacements.has(messageHash)) continue;
@@ -261805,6 +262617,14 @@ var AssistantMessageOffload = class {
 				type: "text",
 				text: replacementText
 			}, ...message.content.filter((part) => part.type !== "text")];
+			this.agent.records.logRecord({
+				type: "policy.intervention",
+				policy: "assistant_message_offload",
+				location: "AssistantMessageOffload.detect",
+				size_before: text.length,
+				size_after: replacementText.length,
+				unit: "chars"
+			});
 			this.apply({
 				messageHash,
 				content,
@@ -261829,6 +262649,7 @@ var AssistantMessageOffload = class {
 		});
 	}
 	compact(messages) {
+		const underPressure = toolResultOffloadPressureForAgent(this.agent);
 		const completedToolCallIds = new Set(messages.filter((message) => message?.role === "tool" && message.toolCallId !== void 0).map((message) => message.toolCallId));
 		const totalHistoryChars = historyTextChars(messages);
 		let changed = false;
@@ -261858,7 +262679,7 @@ var AssistantMessageOffload = class {
 			}
 			const text = persistableAssistantMessageText(message);
 			if (text === void 0) return message;
-			const replacement = this.replacements.get(assistantMessageOffloadHash(message, text));
+			const replacement = underPressure ? this.replacements.get(assistantMessageOffloadHash(message, text)) : void 0;
 			if (replacement === void 0) return message;
 			changed = true;
 			return { ...message, content: replacement.content };
@@ -261885,6 +262706,17 @@ function blunExtractText(content) {
 	if (Array.isArray(content)) return content.map((c) => typeof c === "string" ? c : c && typeof c === "object" && "text" in c && typeof c.text === "string" ? c.text : "").join(" ");
 	return "";
 }
+function blunRepeatActiveTurnPrompt(history, input, stepNumber) {
+	if (stepNumber <= 1) return history;
+	const prompt = blunExtractText(input);
+	if (prompt.length === 0) return history;
+	return [...history, {
+		role: "user",
+		content: [{ type: "text", text: `<active-task-reminder>\nThe active user task is repeated verbatim below. Continue from the current work state; do not restart completed work.\n\n${prompt}\n</active-task-reminder>` }],
+		toolCalls: [],
+		origin: { kind: "injection", variant: "active_turn_prompt" }
+	}];
+}
 /**
 * BLUN: decide whether a turn should carry the full tool set. Small-context models
 * (e.g. King on an 8k window) lose their identity/language when all tool schemas
@@ -262004,7 +262836,11 @@ function mapLoopEvent(event, turnId) {
 			type: "turn.step.started",
 			turnId,
 			step: event.step,
-			stepId: event.uuid
+			stepId: event.uuid,
+			thinkingEffort: event.thinkingEffort,
+			completionBudget: event.completionBudget,
+			attempt: event.attempt,
+			maxAttempts: event.maxAttempts
 		};
 		case "step.end": return {
 			type: "turn.step.completed",
@@ -262034,7 +262870,9 @@ function mapLoopEvent(event, turnId) {
 			outputMayHaveStarted: event.outputMayHaveStarted,
 			errorName: event.errorName,
 			errorMessage: event.errorMessage,
-			statusCode: event.statusCode
+			statusCode: event.statusCode,
+			completionBudgetBefore: event.completionBudgetBefore,
+			completionBudgetAfter: event.completionBudgetAfter
 		};
 		case "content.part": return;
 		case "tool.call": return {
@@ -262263,6 +263101,15 @@ var init_turn = __esmMin((() => {
 		kind: "system_trigger",
 		name: "goal_continuation"
 	};
+	function goalContinuationOrigin(origin) {
+		const cronRunId = origin?.kind === "cron_job" ? origin.runId : origin?.cronRunId;
+		if (cronRunId === void 0 && origin?.toolScope === void 0) return GOAL_CONTINUATION_ORIGIN;
+		return {
+			...GOAL_CONTINUATION_ORIGIN,
+			...(cronRunId === void 0 ? {} : { cronRunId }),
+			...(origin?.toolScope === void 0 ? {} : { toolScope: origin.toolScope })
+		};
+	}
 	GOAL_COMPLETION_REMINDER_NAME = "goal_completion";
 	GOAL_BLOCKED_REMINDER_NAME = "goal_blocked";
 	GOAL_RATE_LIMIT_PAUSE_REASON = "Paused after provider rate limit";
@@ -262310,8 +263157,10 @@ var init_turn = __esmMin((() => {
 		stepToolCallKeys = /* @__PURE__ */ new Map();
 		telemetryModeByTurn = /* @__PURE__ */ new Map();
 		currentStepByTurn = /* @__PURE__ */ new Map();
+		toolScopeByTurn = /* @__PURE__ */ new Map();
 		interruptedTelemetryTurnIds = /* @__PURE__ */ new Set();
 		stepFailureByTurn = /* @__PURE__ */ new Map();
+		stepRequestStateByTurn = /* @__PURE__ */ new Map();
 		currentStep = 0;
 		cognitiveLifecycle;
 		cognitiveLifecycleUnavailable = false;
@@ -262576,10 +263425,11 @@ var init_turn = __esmMin((() => {
 				duplicate: false
 			};
 		}
-		retry(trigger) {
+		retry(trigger, toolScope) {
 			return this.prompt([], {
 				kind: "retry",
-				trigger
+				trigger,
+				...(toolScope === void 0 ? {} : { toolScope })
 			});
 		}
 		launch(input, origin) {
@@ -262657,6 +263507,9 @@ var init_turn = __esmMin((() => {
 		get hasActiveTurn() {
 			return this.activeTurn !== null && this.activeTurn !== "resuming";
 		}
+		toolScopeForTurn(turnId) {
+			return this.toolScopeByTurn.get(turnId);
+		}
 		ensureActiveTurn() {
 			if (this.activeTurn === null || this.activeTurn === "resuming") throw new Error("No active turn");
 			return this.activeTurn;
@@ -262768,15 +263621,23 @@ var init_turn = __esmMin((() => {
 		*/
 		async turnWorker(firstTurnId, input, origin, signal) {
 			const ownsActiveTurn = () => this.activeTurn !== null && this.activeTurn !== "resuming" && this.activeTurn.controller.signal === signal;
+			let result;
 			try {
-				if (this.agent.goal.getGoal().goal?.status === "active") return await this.driveGoal(firstTurnId, input, origin, signal);
-				const end = await this.runOneTurn(firstTurnId, input, origin, signal, true);
-				if (this.agent.goal.getGoal().goal?.status === "active" && end.event.reason !== "cancelled" && end.event.reason !== "failed" && end.event.reason !== "filtered") return await this.driveGoal(this.allocateTurnId(), [{
-					type: "text",
-					text: GOAL_CONTINUATION_PROMPT
-				}], GOAL_CONTINUATION_ORIGIN, signal);
-				return end;
+				if (this.agent.goal.getGoal().goal?.status === "active") result = await this.driveGoal(firstTurnId, input, origin, signal);
+				else {
+					const end = await this.runOneTurn(firstTurnId, input, origin, signal, true);
+					if (this.agent.goal.getGoal().goal?.status === "active" && end.event.reason !== "cancelled" && end.event.reason !== "failed" && end.event.reason !== "filtered") result = await this.driveGoal(this.allocateTurnId(), [{
+						type: "text",
+						text: GOAL_CONTINUATION_PROMPT
+					}], goalContinuationOrigin(origin), signal);
+					else result = end;
+				}
+				return result;
+			} catch (error) {
+				if (origin.kind === "cron_job" && typeof origin.runId === "string") this.agent.cron?.observeRunWorkerFailed(origin.runId);
+				throw error;
 			} finally {
+				if (result !== void 0 && origin.kind === "cron_job" && typeof origin.runId === "string") this.agent.cron?.observeRunWorkerEnded(origin.runId, result.event);
 				if (ownsActiveTurn()) this.activeTurn = null;
 			}
 		}
@@ -262830,7 +263691,7 @@ var init_turn = __esmMin((() => {
 					type: "text",
 					text: GOAL_CONTINUATION_PROMPT
 				}];
-				turnOrigin = GOAL_CONTINUATION_ORIGIN;
+				turnOrigin = goalContinuationOrigin(origin);
 			}
 		}
 		async endGoalTurnWithoutModel(turnId, input, origin) {
@@ -262878,6 +263739,7 @@ var init_turn = __esmMin((() => {
 			this.currentStepByTurn.set(turnId, 0);
 			this.recordExternalReportSources(turnId, origin);
 			const persistedOrigin = durablePromptOrigin(origin);
+			if (persistedOrigin.toolScope !== void 0) this.toolScopeByTurn.set(turnId, persistedOrigin.toolScope);
 			this.agent.telemetry.track("turn_started", {
 				mode: telemetryMode,
 				...this.requestProviderProps()
@@ -262985,11 +263847,13 @@ var init_turn = __esmMin((() => {
 			if (ended.reason !== "completed") this.trackTurnInterrupted(turnId, this.currentStepByTurn.get(turnId) ?? this.currentStep);
 			this.telemetryModeByTurn.delete(turnId);
 			this.currentStepByTurn.delete(turnId);
+			this.toolScopeByTurn.delete(turnId);
 			this.interruptedTelemetryTurnIds.delete(turnId);
 			this.cognitiveActionEvidenceByTurn.delete(turnId);
 			this.cognitiveExternalReportsByTurn.delete(turnId);
 			this.cognitiveLocalClaimsByTurn.delete(turnId);
 			this.stepFailureByTurn.delete(turnId);
+			this.stepRequestStateByTurn.delete(turnId);
 			await this.agent.records.flush();
 			await this.agent.records.writeResumeCheckpoint();
 			return {
@@ -263082,13 +263946,14 @@ var init_turn = __esmMin((() => {
 			let previousStepToolOutcome = "initial";
 			let currentStepHadTool = false;
 			let currentStepHadFailure = false;
+			let currentLoopStep = 0;
 			while (true) {
 				signal.throwIfAborted();
 				const model = this.agent.config.model;
 				const loopControl = this.agent.blunConfig?.loopControl;
 				let stopForGoalBudget = false;
 				try {
-					const originTools = blunToolsForOrigin(this.agent.injection.filterPersonalMemoryToolsForTurn(turnId, input, origin, this.agent.tools.loopTools), origin);
+					const originTools = filterToolsForCronScope(blunToolsForOrigin(this.agent.injection.filterPersonalMemoryToolsForTurn(turnId, input, origin, this.agent.tools.loopTools), origin), origin.toolScope);
 					const compactConversationTool = originTools.find((tool) => tool.name === "CompactConversation");
 					const eligibleTools = originTools.filter((tool) => tool.name !== "CompactConversation" || this.agent.fullCompaction.isProactiveCompactionEligible());
 					const turnRequiredToolNames = new Set(requiredToolNames);
@@ -263114,12 +263979,13 @@ var init_turn = __esmMin((() => {
 						eligibleToolSchemaTokens: estimateTokensForTools(eligibleTools),
 						selectedToolSchemaTokens: estimateTokensForTools(selectedTools)
 					});
+					const turnHistory = () => fastConversation ? turnThinkingEffort === "off" ? blunStandaloneConversationHistory(this.agent.context.history) : blunFastConversationHistory(this.agent.context.history) : origin.kind === "cron_job" && origin.recurring === true ? projectRecurringCronHistory(this.agent.context.history, origin.jobId) : personalMemoryRecall === void 0 ? this.agent.context.history : [...this.agent.context.history, personalMemoryRecall];
 					return (await runTurn({
 						turnId: String(turnId),
 						signal,
 						llm: turnLLM,
-						buildMessages: () => this.agent.context.project(fastConversation ? turnThinkingEffort === "off" ? blunStandaloneConversationHistory(this.agent.context.history) : blunFastConversationHistory(this.agent.context.history) : origin.kind === "cron_job" && origin.recurring === true ? projectRecurringCronHistory(this.agent.context.history, origin.jobId) : personalMemoryRecall === void 0 ? this.agent.context.history : [...this.agent.context.history, personalMemoryRecall], { dropOrphanResults: true }),
-						buildMessagesStrict: () => this.agent.context.project(fastConversation ? turnThinkingEffort === "off" ? blunStandaloneConversationHistory(this.agent.context.history) : blunFastConversationHistory(this.agent.context.history) : origin.kind === "cron_job" && origin.recurring === true ? projectRecurringCronHistory(this.agent.context.history, origin.jobId) : personalMemoryRecall === void 0 ? this.agent.context.history : [...this.agent.context.history, personalMemoryRecall], {
+						buildMessages: () => this.agent.context.project(blunRepeatActiveTurnPrompt(turnHistory(), input, currentLoopStep), { dropOrphanResults: true }),
+						buildMessagesStrict: () => this.agent.context.project(blunRepeatActiveTurnPrompt(turnHistory(), input, currentLoopStep), {
 							synthesizeMissing: true,
 							dropOrphanResults: true,
 							dedupeDuplicateToolCalls: true,
@@ -263131,6 +263997,8 @@ var init_turn = __esmMin((() => {
 						log: this.agent.log,
 						maxSteps: loopControl?.maxStepsPerTurn,
 						maxRetryAttempts: loopControl?.maxRetriesPerStep,
+						checkpointBeforeToolExecution: () => this.agent.records.flush(),
+						checkpointBeforeRetryWait: () => this.agent.records.flush(),
 						recordStepUsage: async (usage) => {
 							try {
 								stopForGoalBudget = (await this.agent.goal.recordTokenUsage(grandTotal(usage)))?.budget.overBudget === true;
@@ -263140,6 +264008,7 @@ var init_turn = __esmMin((() => {
 						},
 						hooks: {
 							beforeStep: async ({ signal: stepSignal, stepNumber }) => {
+								currentLoopStep = stepNumber;
 								await this.agent.records.flush();
 								await this.agent.toolResultBatchOffload.detect();
 								this.agent.microCompaction.detect();
@@ -263327,14 +264196,25 @@ var init_turn = __esmMin((() => {
 										toolOutput: isError === true ? void 0 : toolOutputText(output).slice(0, 2e3)
 									}
 								});
-								return budgetToolResultForModel({
+								const budgetedResult = await budgetToolResultForModel({
 									homedir: this.agent.homedir,
 									toolName: ctx.toolCall.name,
 									toolCallId: ctx.toolCall.id,
 									toolArgs: ctx.args,
 									result: finalResult,
+									contextTokens: this.agent.context.tokenCountWithPending,
+									maxContextTokens: this.agent.config.modelCapabilities.max_context_tokens,
 									telemetry: this.agent.telemetry
 								});
+								if (budgetedResult !== finalResult) this.agent.records.logRecord({
+									type: "policy.intervention",
+									policy: "tool_result_spill",
+									location: "budgetToolResultForModel",
+									size_before: toolOutputText(finalResult.output).length,
+									size_after: toolOutputText(budgetedResult.output).length,
+									unit: "chars"
+								});
+								return budgetedResult;
 							}
 						}
 					})).stopReason;
@@ -263377,11 +264257,32 @@ var init_turn = __esmMin((() => {
 		buildDispatchEvent(turnId) {
 			return createLoopEventDispatcher({
 				appendTranscriptRecord: async (event) => {
+					this.agent.cron?.observeLoopEvent(turnId, event);
 					this.agent.context.appendLoopEvent(event);
 				},
 				emitLiveEvent: (event) => {
 					this.noteFirstRequestEvent(event);
 					this.trackLoopTelemetry(event, turnId);
+					if (event.type === "thinking.delta" && event.delta.trim().length === 0) {
+						const requestState = this.stepRequestStateByTurn.get(turnId);
+						this.agent.records.logRecord({
+							type: "thinking.heartbeat",
+							turn_id: turnId,
+							step: this.currentStepByTurn.get(turnId) ?? this.currentStep,
+							attempt: requestState?.attempt ?? 1,
+							max_attempts: requestState?.maxAttempts,
+							completion_budget: requestState?.completionBudget,
+							thinking_effort: requestState?.thinkingEffort
+						});
+					}
+					if (event.type === "step.retrying" && event.completionBudgetBefore !== void 0 && event.completionBudgetAfter !== void 0) this.agent.records.logRecord({
+						type: "policy.intervention",
+						policy: "empty_response_completion_budget_retry",
+						location: "chatWithRetry",
+						size_before: event.completionBudgetBefore,
+						size_after: event.completionBudgetAfter,
+						unit: "tokens"
+					});
 					const mapped = mapLoopEvent(event, turnId);
 					if (mapped !== void 0) return this.agent.emitEvent(mapped);
 				}
@@ -263405,9 +264306,18 @@ var init_turn = __esmMin((() => {
 		}
 		trackLoopTelemetry(event, turnId) {
 			if (event.type === "step.begin") {
-				this.beginTrackedStep(turnId, event.step);
+				this.beginTrackedStep(turnId, event.step, event);
 				return;
 			}
+			if (event.type === "step.retrying") {
+				const previous = this.stepRequestStateByTurn.get(turnId) ?? {};
+				this.stepRequestStateByTurn.set(turnId, {
+					...previous,
+					attempt: event.nextAttempt,
+					maxAttempts: event.maxAttempts,
+					completionBudget: event.completionBudgetAfter ?? previous.completionBudget
+				});
+			}
 			if (event.type === "turn.interrupted") {
 				if (event.reason === "error" && event.activeStep !== void 0) this.stepFailureByTurn.set(turnId, event);
 				this.trackTurnInterrupted(turnId, interruptedStep(event));
@@ -263415,9 +264325,15 @@ var init_turn = __esmMin((() => {
 			}
 			this.trackToolLifecycle(event, turnId);
 		}
-		beginTrackedStep(turnId, step) {
+		beginTrackedStep(turnId, step, event) {
 			this.currentStepByTurn.set(turnId, step);
 			this.currentStep = step;
+			this.stepRequestStateByTurn.set(turnId, {
+				thinkingEffort: event?.thinkingEffort,
+				completionBudget: event?.completionBudget,
+				attempt: event?.attempt ?? 1,
+				maxAttempts: event?.maxAttempts
+			});
 			if (!this.stepToolCallKeys.has(step)) this.stepToolCallKeys.set(step, /* @__PURE__ */ new Set());
 		}
 		trackToolLifecycle(event, turnId) {
@@ -264434,7 +265350,7 @@ var init_codebase_search = __esmMin((() => {
 				description: `Semantic search: ${args.query.length > 50 ? `${args.query.slice(0, 50)}…` : args.query}`,
 				display: {
 					kind: "command",
-					command: `python codebase_index.py query . "${args.query}" --top ${String(args.top)}`,
+					command: `python codebase_index.py query . "${args.query}" --top ${String(args.top)} --model auto`,
 					cwd: this.cwd,
 					description: `Codebase semantic search`,
 					language: "bash"
@@ -264454,7 +265370,9 @@ var init_codebase_search = __esmMin((() => {
 					this.cwd,
 					args.query,
 					"--top",
-					String(args.top)
+					String(args.top),
+					"--model",
+					"auto"
 				], {
 					cwd: this.cwd,
 					timeout: SCRIPT_TIMEOUT_MS,
@@ -265087,10 +266005,12 @@ var init_builtin = __esmMin((() => {
 	init_task_list();
 	init_task_output();
 	init_task_update();
+	init_task_resume();
 	init_task_stop();
 	init_cron_create();
 	init_cron_delete();
 	init_cron_list();
+	init_cron_runs();
 	init_agent$1();
 	init_agent_swarm();
 	init_ask_user();
@@ -265122,7 +266042,7 @@ var init_builtin = __esmMin((() => {
 var init_types$3 = __esmMin((() => {}));
 //#endregion
 //#region ../../packages/agent-core/src/agent/tool/index.ts
-var import_picomatch, profileToolExclusionPolicy, applyProfileToolExclusions, shouldRecordUserToolUnregister, SHELL_FOREGROUND_TIMEOUT_S, ToolManager;
+var import_picomatch, profileToolExclusionPolicy, applyProfileToolExclusions, shouldRecordUserToolUnregister, createFileObservationPolicy, SHELL_FOREGROUND_TIMEOUT_S, ToolManager;
 var init_tool$1 = __esmMin((() => {
 	init_dist$4();
 	import_picomatch = /* @__PURE__ */ __toESM(require_picomatch(), 1);
@@ -265138,6 +266058,7 @@ var init_tool$1 = __esmMin((() => {
 	profileToolExclusionPolicy = createRequire(import.meta.url)("./bin/profile-tool-exclusion-policy.cjs");
 	applyProfileToolExclusions = profileToolExclusionPolicy.applyProfileToolExclusions;
 	({ shouldRecordUserToolUnregister } = createRequire(import.meta.url)("./bin/user-tool-record-policy.cjs"));
+	({ createFileObservationPolicy } = createRequire(import.meta.url)("./bin/file-observation-policy.cjs"));
 	SHELL_FOREGROUND_TIMEOUT_S = 120;
 	ToolManager = class {
 		agent;
@@ -265320,9 +266241,10 @@ var init_tool$1 = __esmMin((() => {
 		hasUserTool(name) {
 			return this.userTools.has(name);
 		}
-		inheritUserTools(parent) {
+		inheritUserTools(parent, excludedNames = /* @__PURE__ */ new Set()) {
 			for (const tool of parent.userTools.values()) {
 				if (!parent.enabledTools.has(tool.name)) continue;
+				if (excludedNames.has(tool.name)) continue;
 				this.registerUserTool({
 					name: tool.name,
 					description: tool.description,
@@ -265537,11 +266459,16 @@ var init_tool$1 = __esmMin((() => {
 			}, this.agent.skills?.registry.getSkillRoots() ?? []);
 			const allowBackground = this.enabledTools.has("TaskList") && this.enabledTools.has("TaskOutput") && this.enabledTools.has("TaskStop");
 			const goalToolsEnabled = this.agent.type === "main";
+			const readBudget = () => ({
+				contextTokens: this.agent.context.tokenCountWithPending,
+				maxContextTokens: this.agent.fullCompaction.getEffectiveMaxContextTokens()
+			});
+			const fileObservation = createFileObservationPolicy({ pathClass: kaos.pathClass() });
 			this.builtinTools = new Map([
-				new ReadTool(kaos, workspace),
-				new ReadBatchTool(kaos, workspace),
-				new WriteTool(kaos, workspace, () => this.agent.context.history, toolServices?.lsp),
-				new EditTool(kaos, workspace, () => this.agent.context.history, toolServices?.lsp),
+				new ReadTool(kaos, workspace, readBudget, fileObservation),
+				new ReadBatchTool(kaos, workspace, readBudget, fileObservation),
+				new WriteTool(kaos, workspace, () => this.agent.context.history, toolServices?.lsp, fileObservation),
+				new EditTool(kaos, workspace, () => this.agent.context.history, toolServices?.lsp, fileObservation),
 				new GrepTool(kaos, workspace, this.agent.telemetry),
 				new GlobTool(kaos, workspace, this.agent.telemetry),
 				new BashTool(kaos, cwd, background, { allowBackground }),
@@ -265559,9 +266486,12 @@ var init_tool$1 = __esmMin((() => {
 				new TaskListTool(background),
 				new TaskOutputTool(background),
 				new TaskUpdateTool(background),
+				this.agent.subagentHost && allowBackground && background.resumeStore && new TaskResumeTool(background, this.agent.subagentHost),
 				new TaskStopTool(background),
 				this.agent.cron && new CronCreateTool(this.agent.cron),
 				this.agent.cron && new CronListTool(this.agent.cron),
+				this.agent.cron && new CronRunListTool(this.agent.cron),
+				this.agent.cron && new CronRunOutputTool(this.agent.cron),
 				this.agent.cron && new CronDeleteTool(this.agent.cron),
 				this.agent.skills?.registry.listInvocableSkills().length && new SkillTool(this.agent),
 				this.agent.subagentHost && new AgentTool(this.agent.subagentHost, background, DEFAULT_AGENT_PROFILES["agent"]?.subagents, {
@@ -265968,7 +266898,7 @@ var init_llm_request_logger = __esmMin((() => {
 function normalizeRuntimeSystemPromptAppend(value) {
 	return value?.trim().slice(0, 16e3) ?? "";
 }
-var PINNED_MODEL_ALIASES, createEffectiveSystemPromptResolver, resolveProviderIdleTimeoutMs, capCompletionBudgetForAdaptiveEffort, capTurnCompletionTokens, selectThinkingEffortForBufferedSteer, selectThinkingEffortForWorkStep, selectThinkingEffortForTurn, Agent$1;
+var PINNED_MODEL_ALIASES, createEffectiveSystemPromptResolver, resolveProviderIdleTimeoutMs, capCompletionBudgetForAdaptiveEffort, selectThinkingEffortForBufferedSteer, selectThinkingEffortForWorkStep, selectThinkingEffortForTurn, Agent$1;
 var init_agent = __esmMin((() => {
 	init_dist$6();
 	init_config$4();
@@ -266007,8 +266937,8 @@ var init_agent = __esmMin((() => {
 	init_error_memory();
 	({ createEffectiveSystemPromptResolver } = createRequire(import.meta.url)("./bin/effective-system-prompt-cache-policy.cjs"));
 	({ resolveProviderIdleTimeoutMs } = createRequire(import.meta.url)("./bin/provider-idle-timeout-policy.cjs"));
-	({ capCompletionBudgetForAdaptiveEffort, capTurnCompletionTokens, selectThinkingEffortForBufferedSteer, selectThinkingEffortForWorkStep, selectThinkingEffortForTurn } = createRequire(import.meta.url)("./bin/turn-thinking-policy.cjs"));
-	PINNED_MODEL_ALIASES = new Set(["king-blun", "pruefstand"]);
+	({ capCompletionBudgetForAdaptiveEffort, selectThinkingEffortForBufferedSteer, selectThinkingEffortForWorkStep, selectThinkingEffortForTurn } = createRequire(import.meta.url)("./bin/turn-thinking-policy.cjs"));
+	PINNED_MODEL_ALIASES = new Set(["blun/king"]);
 	Agent$1 = class {
 		type;
 		_kaos;
@@ -266202,7 +267132,7 @@ var init_agent = __esmMin((() => {
 			const provider = thinkingEffort === void 0 ? runtimeModel.provider : runtimeModel.provider.withThinking(thinkingEffort);
 			const loopControl = this.blunConfig?.loopControl;
 			const completionBudgetConfig = resolveCompletionBudget({
-				maxOutputSize: capTurnCompletionTokens(runtimeModel.maxOutputSize),
+				maxOutputSize: runtimeModel.maxOutputSize,
 				reservedContextSize: loopControl?.reservedContextSize
 			});
 			return new KosongLLM({
@@ -266550,6 +267480,7 @@ var init_agent = __esmMin((() => {
 		}
 		emitEvent(event) {
 			if (this.records.restoring) return;
+			this.cron?.observeAgentEvent(event);
 			return this.rpc?.emitEvent?.(event);
 		}
 		emitStatusUpdated() {
@@ -298410,7 +299341,9 @@ var init_session$1 = __esmMin((() => {
 					homedir,
 					type,
 					parentAgentId,
-					swarmItem: options.swarmItem
+					swarmItem: options.swarmItem,
+					profileName: options.profileName,
+					skillPolicy: options.skillPolicy
 				};
 				this.writeMetadata();
 			}
@@ -298686,7 +299619,7 @@ var init_session$1 = __esmMin((() => {
 						missingCapability: part.missingCapability
 					});
 				},
-				skills: this.skills,
+				skills: config.skillRegistry === void 0 ? this.skills : config.skillRegistry,
 				rpc: proxyWithExtraPayload(this.rpc, { agentId: id }),
 				modelProvider: this.options.providerManager,
 				hookEngine: config.hookEngine ?? this.hookEngine,
@@ -298751,9 +299684,16 @@ var init_session$1 = __esmMin((() => {
 			const parentAgentId = meta.parentAgentId ?? null;
 			const parent = parentAgentId === null ? void 0 : await this.resumeAgent(parentAgentId, [...stack, id]);
 			try {
-				const agent = this.instantiateAgent(id, meta.homedir, meta.type, {}, parentAgentId);
+				let restoredSkillPolicy;
+				if (meta.type === "sub" && meta.skillPolicy !== void 0) {
+					if (meta.profileName === void 0) throw new Error("SUBAGENT_SKILL_POLICY_CHANGED: persisted subagent profile is unavailable; spawn a new subagent");
+					const persistedProfile = DEFAULT_AGENT_PROFILES[parent?.agent.config.profileName ?? "agent"]?.subagents?.[meta.profileName] ?? DEFAULT_AGENT_PROFILES["agent"]?.subagents?.[meta.profileName];
+					if (persistedProfile === void 0) throw new Error("SUBAGENT_SKILL_POLICY_CHANGED: persisted subagent profile was not found; spawn a new subagent");
+					restoredSkillPolicy = restoreSubagentSkillPolicy(persistedProfile.subagentSkills, meta.skillPolicy, this.skills);
+				}
+				const agent = this.instantiateAgent(id, meta.homedir, meta.type, restoredSkillPolicy === void 0 ? {} : { skillRegistry: restoredSkillPolicy.registry }, parentAgentId);
 				const result = await agent.resume();
-				await this.restoreAgentProfileHandle(agent, meta, parent?.agent);
+				await this.restoreAgentProfileHandle(agent, meta, parent?.agent, restoredSkillPolicy);
 				this.ensureBaselineSkill(agent);
 				agent.setRuntimeSystemPromptAppend(this.accountMemoryContext);
 				this.agents.set(id, agent);
@@ -298766,18 +299706,33 @@ var init_session$1 = __esmMin((() => {
 				throw error;
 			}
 		}
-		async restoreAgentProfileHandle(agent, meta, parentAgent) {
+		async restoreAgentProfileHandle(agent, meta, parentAgent, restoredSkillPolicy) {
 			if (agent.config.systemPrompt === "") return;
-			const profile = this.resolvePersistedProfile(agent, meta, parentAgent);
+			let profile = this.resolvePersistedProfile(agent, meta, parentAgent);
 			if (profile === void 0) return;
+			if (restoredSkillPolicy !== void 0) profile = profileWithSubagentSkillTools(profile, restoredSkillPolicy);
 			agent.setActiveProfile(profile, this.options.blunHomeDir);
 			await agent.refreshSystemPrompt();
 		}
 		ensureBaselineSkill(agent) {
-			if (agent.skills?.ensureBaseline(BASELINE_SKILL_NAME) !== true) this.log.warn("baseline skill is unavailable", { skill: BASELINE_SKILL_NAME });
+			const skill = this.skills.getSkill(BASELINE_SKILL_NAME);
+			if (skill === void 0) {
+				this.log.warn("baseline skill is unavailable", { skill: BASELINE_SKILL_NAME });
+				return;
+			}
+			const variant = `${BASELINE_SKILL_ORIGIN_PREFIX}${skill.name}`;
+			if (agent.context.history.some((message) => message.origin?.kind === "injection" && message.origin.variant === variant)) return;
+			agent.context.appendSystemReminder(renderBaselineSkillPrompt({
+				skillName: skill.name,
+				skillSource: skill.source,
+				skillDir: skill.dir
+			}), {
+				kind: "injection",
+				variant
+			});
 		}
 		resolvePersistedProfile(agent, meta, parentAgent) {
-			const profileName = agent.config.profileName;
+			const profileName = meta.profileName ?? agent.config.profileName;
 			if (profileName === void 0) return void 0;
 			if (meta.type === "sub") return DEFAULT_AGENT_PROFILES[parentAgent?.config.profileName ?? "agent"]?.subagents?.[profileName] ?? DEFAULT_AGENT_PROFILES["agent"]?.subagents?.[profileName];
 			return DEFAULT_AGENT_PROFILES[profileName];
@@ -313566,27 +314521,14 @@ var init_local_fetch_url = __esmMin((() => {
 				kind: "passthrough"
 			};
 			return {
-				content: this.extractMainContent(body),
+				content: this.extractMainContent(body, url),
 				kind: "extracted"
 			};
 		}
-		extractMainContent(html) {
-			const primary = parseHTML(html);
-			try {
-				const article = new import_readability.Readability(primary.document, { charThreshold: 0 }).parse();
-				if (article !== null) {
-					const text = (article.textContent ?? "").trim();
-					if (text.length > 0) {
-						const title = (article.title ?? "").trim();
-						return title.length > 0 ? `# ${title}\n\n${text}` : text;
-					}
-				}
-			} catch {}
-			const { document } = parseHTML(html);
-			const titleText = (document.querySelector("title")?.textContent ?? "").trim();
-			const fallbackText = ((document.querySelector("article") ?? document.querySelector("main") ?? document.querySelector("body"))?.textContent ?? "").trim();
-			if (fallbackText.length === 0) throw new Error("Failed to extract meaningful content from the page. The page may require JavaScript to render.");
-			return titleText.length > 0 ? `# ${titleText}\n\n${fallbackText}` : fallbackText;
+		extractMainContent(html, baseUrl) {
+			const content = htmlToResearchMarkdown(html, baseUrl);
+			if (content.length === 0) throw new Error("Failed to extract meaningful content from the page. The page may require JavaScript to render.");
+			return content;
 		}
 	};
 }));
@@ -315079,17 +316021,7 @@ function resolveModelCapabilities(alias, provider) {
 	};
 }
 function toKosongProviderConfig(provider, model, blunRequestHeaders, promptCacheKey, supportEfforts) {
-	assertSupportedProviderType(provider);
-	if (provider.type === FREDRIK_GLM_PROVIDER_TYPE) return {
-		type: "blun",
-		model,
-		baseUrl: provider.baseUrl,
-		apiKey: readFredrikGlmApiKeyFile(provider),
-		generationKwargs: { prompt_cache_key: promptCacheKey },
-		supportEfforts: [...FREDRIK_GLM_EFFORTS],
-		openAICompatible: true,
-		defaultHeaders: { "User-Agent": "BLUN-King/Fredrik-GLM" }
-	};
+	assertBlunProviderType(provider);
 	const envCustomHeaders = parseBlunCodeCustomHeaders();
 	return {
 		type: "blun",
@@ -315110,12 +316042,11 @@ function defaultHeadersField(headers) {
 	return { defaultHeaders: { ...headers } };
 }
 function providerApiKey(provider) {
-	assertSupportedProviderType(provider);
-	if (provider.type === FREDRIK_GLM_PROVIDER_TYPE) return readFredrikGlmApiKeyFile(provider);
+	assertBlunProviderType(provider);
 	return providerValue(provider.apiKey, provider.env, "BLUN_API_KEY");
 }
-function assertSupportedProviderType(provider) {
-	if (provider.type !== "blun" && provider.type !== FREDRIK_GLM_PROVIDER_TYPE) throw new BlunError(ErrorCodes.MODEL_CONFIG_INVALID, "Only approved BLUN Code provider types are supported.");
+function assertBlunProviderType(provider) {
+	if (provider.type !== "blun") throw new BlunError(ErrorCodes.MODEL_CONFIG_INVALID, "Only the BLUN provider type is supported.");
 }
 function providerValue(configured, env, envKey) {
 	return nonEmptyString$2(configured) ?? envValue(env, envKey);
@@ -315134,7 +316065,7 @@ var init_provider_manager = __esmMin((() => {
 	init_config$4();
 	init_errors$8();
 	MANAGED_PROVIDER_NAME$2 = "managed:blun";
-	MANAGED_BLUN_MODEL_ALIASES$1 = new Set(["blun/king", "king-blun"]);
+	MANAGED_BLUN_MODEL_ALIASES$1 = new Set(["blun/king"]);
 	ProviderManager = class {
 		options;
 		runtimeModelContexts = /* @__PURE__ */ new Map();
@@ -315153,9 +316084,7 @@ var init_provider_manager = __esmMin((() => {
 			if (providerName === void 0) throw new BlunError(ErrorCodes.CONFIG_INVALID, `Model "${model}" must define a provider in config.toml.`);
 			const providerConfig = this.config.providers[providerName];
 			if (providerConfig === void 0) throw new BlunError(ErrorCodes.CONFIG_INVALID, `Provider "${providerName}" for model "${model}" is not configured.`);
-			assertSupportedProviderType(providerConfig);
-			if (providerConfig.type === FREDRIK_GLM_PROVIDER_TYPE && (providerName !== FREDRIK_GLM_PROVIDER_ID || !isConfiguredFredrikGlmAlias(model, alias))) throw new BlunError(ErrorCodes.CONFIG_INVALID, "Fredrik GLM provider aliases must match the approved profile-local model catalog.");
-			if (providerConfig.type !== FREDRIK_GLM_PROVIDER_TYPE && isConfiguredFredrikGlmAlias(model, alias)) throw new BlunError(ErrorCodes.CONFIG_INVALID, "Fredrik GLM aliases require the approved profile-local provider.");
+			assertBlunProviderType(providerConfig);
 			const runtimeContext = this.runtimeModelContexts.get(model);
 			const maxContextSize = runtimeContext?.providerName === providerName && runtimeContext.model === alias.model ? runtimeContext.maxContextTokens : effectiveAlias.maxContextSize;
 			if (!Number.isInteger(maxContextSize) || maxContextSize <= 0) throw new BlunError(ErrorCodes.CONFIG_INVALID, `Model "${model}" must define a positive max_context_size in config.toml.`);
@@ -315169,7 +316098,7 @@ var init_provider_manager = __esmMin((() => {
 				}, provider),
 				alwaysThinking: (effectiveAlias.capabilities ?? []).some((c) => c.trim().toLowerCase() === "always_thinking"),
 				maxOutputSize: effectiveAlias.maxOutputSize,
-				type: providerConfig.type
+				type: "blun"
 			};
 		}
 		setRuntimeModelContext(input) {
@@ -315177,7 +316106,7 @@ var init_provider_manager = __esmMin((() => {
 			if (!Number.isSafeInteger(input.maxContextTokens) || input.maxContextTokens <= 0) throw new BlunError(ErrorCodes.CONFIG_INVALID, "Runtime model context must be a positive integer.");
 			const alias = this.config.models?.[input.modelAlias];
 			const providerName = alias?.provider ?? this.config.defaultProvider;
-			if (alias === void 0 || providerName !== input.providerName || alias.model !== input.model || providerName !== "managed:blun" && providerName !== "king-blun") throw new BlunError(ErrorCodes.CONFIG_INVALID, "Runtime model context does not match the configured internal BLUN model.");
+			if (alias === void 0 || providerName !== input.providerName || alias.model !== input.model || providerName !== "managed:blun") throw new BlunError(ErrorCodes.CONFIG_INVALID, "Runtime model context does not match the configured BLUN model.");
 			const previous = this.runtimeModelContexts.get(input.modelAlias);
 			this.runtimeModelContexts.set(input.modelAlias, {
 				providerName: input.providerName,
@@ -315189,7 +316118,7 @@ var init_provider_manager = __esmMin((() => {
 		resolveAuth(model, options) {
 			const { providerName } = this.resolveProviderConfig(model);
 			const providerConfig = this.config.providers[providerName];
-			const apiKey = providerConfig?.type === "blun" ? providerApiKey(providerConfig) : void 0;
+			const apiKey = providerConfig === void 0 ? void 0 : providerApiKey(providerConfig);
 			const revocationStore = this.options.managedApiKeyRevocationStore;
 			if (providerName === MANAGED_PROVIDER_NAME$2 && providerConfig?.oauth === void 0 && apiKey !== void 0 && revocationStore !== void 0) return this.resolveManagedApiKeyAuth(providerName, apiKey, revocationStore, options?.log);
 			if (providerConfig?.oauth === void 0) return void 0;
@@ -319412,6 +320341,7 @@ function toBrokerRequest$1(req, params) {
 		tool_name: req.toolName,
 		action: req.action,
 		tool_input_display: req.display,
+		allow_edit: req.allowEdit === true ? true : void 0,
 		created_at: params.createdAt,
 		expires_at: params.expiresAt
 	};
@@ -319426,7 +320356,8 @@ function toAgentCoreResponse$1(resp) {
 		decision: resp.decision,
 		scope: resp.scope,
 		feedback: resp.feedback,
-		selectedLabel: resp.selected_label
+		selectedLabel: resp.selected_label,
+		edited_tool_input: resp.edited_tool_input
 	};
 }
 var IApprovalService;
@@ -343030,7 +343961,7 @@ const DEFAULT_NOTIFICATIONS_CONFIG = {
 	enabled: true,
 	condition: "unfocused"
 };
-const DEFAULT_UPGRADE_PREFERENCES = { autoInstall: true };
+const DEFAULT_UPGRADE_PREFERENCES = { autoInstall: false };
 /**
 * F2 Tippen-mit-Vorschlag: Code-Sprachen standardmäßig an, md/plain aus.
 * Unbekannte Sprachen fallen auf "an" zurück (Opt-out über tui.toml).
@@ -373133,16 +374064,18 @@ var PendingApproval = class {
 	createdAt;
 	expiresAt;
 	protocolRequest;
+	editContext;
 	_resolveFn;
 	_rejectFn;
 	_settled = false;
-	constructor(approvalId, sessionId, toolCallId, createdAt, expiresAt, protocolRequest, _resolveFn, _rejectFn) {
+	constructor(approvalId, sessionId, toolCallId, createdAt, expiresAt, protocolRequest, editContext, _resolveFn, _rejectFn) {
 		this.approvalId = approvalId;
 		this.sessionId = sessionId;
 		this.toolCallId = toolCallId;
 		this.createdAt = createdAt;
 		this.expiresAt = expiresAt;
 		this.protocolRequest = protocolRequest;
+		this.editContext = editContext;
 		this._resolveFn = _resolveFn;
 		this._rejectFn = _rejectFn;
 	}
@@ -373216,7 +374149,10 @@ let ApprovalService = class ApprovalService extends Disposable {
 			toolCallId: req.toolCallId
 		}, "approval requested");
 		return new Promise((resolve, reject) => {
-			this._pending.set(approvalId, new PendingApproval(approvalId, req.sessionId, req.toolCallId, createdAt, expiresAt, protocolRequest, resolve, reject));
+			this._pending.set(approvalId, new PendingApproval(approvalId, req.sessionId, req.toolCallId, createdAt, expiresAt, protocolRequest, {
+				toolName: req.toolName,
+				editCount: Number.isSafeInteger(req.approvalEditCount) ? req.approvalEditCount : 0
+			}, resolve, reject));
 			this._byToolCallId.set(req.toolCallId, approvalId);
 		});
 	}
@@ -373245,6 +374181,14 @@ let ApprovalService = class ApprovalService extends Disposable {
 	isPending(approvalId) {
 		return this._pending.has(approvalId);
 	}
+	getEditContext(approvalId) {
+		const pending = this._pending.get(approvalId);
+		if (!pending) return void 0;
+		return {
+			toolName: pending.editContext.toolName,
+			editCount: pending.editContext.editCount
+		};
+	}
 	listPending(sessionId) {
 		return Array.from(this._pending.values()).filter((p) => p.sessionId === sessionId).map((p) => p.protocolRequest);
 	}
@@ -373287,6 +374231,24 @@ const approvalParamsSchema = object({
 	session_id: string().min(1),
 	approval_id: string().min(1)
 });
+const EDITABLE_APPROVAL_RAW_BODY_LIMIT = 65536;
+async function captureEditableApprovalRawBody(req, reply, payload) {
+	const chunks = [];
+	let totalBytes = 0;
+	for await (const chunk of payload) {
+		const bytes = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
+		totalBytes += bytes.length;
+		if (totalBytes > EDITABLE_APPROVAL_RAW_BODY_LIMIT) {
+			const error = new Error("Approval response body exceeds the editable-input limit");
+			error.statusCode = 413;
+			throw error;
+		}
+		chunks.push(bytes);
+	}
+	const rawBody = Buffer.concat(chunks, totalBytes);
+	req.editableApprovalRawBody = rawBody.toString("utf8");
+	return Readable.from([rawBody]);
+}
 function registerApprovalsRoutes(app, ix) {
 	const listRoute = defineRoute({
 		method: "GET",
@@ -373331,7 +374293,27 @@ function registerApprovalsRoutes(app, ix) {
 			reply.send(errEnvelope(ErrorCode$1.APPROVAL_NOT_FOUND, `approval ${approval_id} not found`, req.id));
 			return;
 		}
-		const inProc = toAgentCoreResponse$1(body);
+		const editContext = broker.getEditContext(approval_id);
+		if (editContext === void 0 || typeof req.editableApprovalRawBody !== "string") {
+			reply.send(errEnvelope(ErrorCode$1.VALIDATION_FAILED, "approval response could not be validated from its raw JSON body", req.id));
+			return;
+		}
+		let inProc;
+		try {
+			const rawResponse = parseEditedToolInputJson(req.editableApprovalRawBody);
+			const normalized = validateEditedApprovalDecision({
+				response: rawResponse,
+				toolName: editContext.toolName,
+				editCount: editContext.editCount
+			});
+			inProc = normalized.decision === "edited" ? {
+				decision: "edited",
+				edited_tool_input: normalized.editedToolInput
+			} : normalized;
+		} catch (error) {
+			reply.send(errEnvelope(ErrorCode$1.VALIDATION_FAILED, error instanceof Error ? error.message : String(error), req.id));
+			return;
+		}
 		broker.resolve(approval_id, inProc);
 		broker.markResolved(approval_id);
 		const result = {
@@ -373340,6 +374322,7 @@ function registerApprovalsRoutes(app, ix) {
 		};
 		reply.send(okEnvelope(result, req.id));
 	});
+	route.options.preParsing = captureEditableApprovalRawBody;
 	app.post(route.path, route.options, route.handler);
 }
 //#endregion
@@ -404208,13 +405191,6 @@ const BUILTIN_SLASH_COMMAND_DEFINITIONS = [
 		completeArgs: swarmArgumentCompletions,
 		availability: "idle-only"
 	},
-	{
-		name: "model",
-		aliases: [],
-		descriptionKey: "command.model.description",
-		priority: 96,
-		availability: "always"
-	},
 	{
 		name: "effort",
 		aliases: ["thinking"],
@@ -404666,6 +405642,7 @@ registerUiCatalogFragment({
 //#endregion
 //#region src/tui/commands/resolve.ts
 const LEGACY_EFFORT_COMMANDS = new Set([
+	"model",
 	"automodel",
 	"router"
 ]);
@@ -408495,6 +409472,9 @@ var TUI = class TUI extends Container {
 	setClearOnShrink(enabled) {
 		this.clearOnShrink = enabled;
 	}
+	getRenderHeight() {
+		return this.terminal.rows;
+	}
 	setFocus(component) {
 		this.setFocusInternal({
 			component,
@@ -409103,7 +410083,7 @@ var TUI = class TUI extends Container {
 	doRender() {
 		if (this.stopped) return;
 		const width = this.terminal.columns;
-		const height = this.terminal.rows;
+		const height = this.getRenderHeight();
 		const widthChanged = this.previousWidth !== 0 && this.previousWidth !== width;
 		const heightChanged = this.previousHeight !== 0 && this.previousHeight !== height;
 		const previousBufferLength = this.previousHeight > 0 ? this.previousViewportTop + this.previousHeight : height;
@@ -417702,168 +418682,6 @@ function segmentsFor(model) {
 	if (availability === "unsupported") return ["off"];
 	return ["off", "on"];
 }
-function fredrikSelectableModels(models) {
-	return Object.fromEntries(Object.entries(models).filter(([alias]) => isAllowedFredrikRuntimeAlias(alias, models)));
-}
-function fredrikProviderDisplayName(provider) {
-	if (provider === "managed:blun") return PRODUCT_NAME;
-	if (provider.startsWith("managed:")) return provider.slice(8);
-	return provider;
-}
-function fredrikCreateModelChoices(models) {
-	return Object.entries(fredrikSelectableModels(models)).map(([alias, configured]) => {
-		const model = effectiveModelAlias(configured);
-		const name = modelDisplayName$1(alias, model);
-		const provider = fredrikProviderDisplayName(model.provider);
-		return {
-			alias,
-			model,
-			name,
-			provider,
-			label: `${name} (${provider})`
-		};
-	});
-}
-function fredrikEffortLabel(effort) {
-	const label = effortDisplayLabel(effort);
-	if (label !== effort || effort.length === 0) return label;
-	return effort.charAt(0).toUpperCase() + effort.slice(1);
-}
-function fredrikDefaultThinkingEffort(model) {
-	if (thinkingAvailability(model) === "unsupported") return "off";
-	const efforts = effortsOf(model);
-	if (efforts.length > 0) return model.defaultEffort ?? efforts[Math.floor(efforts.length / 2)];
-	return "on";
-}
-function fredrikCommitEffort(choice, draft) {
-	if (draft === "on") return fredrikDefaultThinkingEffort(choice.model);
-	return draft;
-}
-var FredrikModelSelectorComponent = class extends Container {
-	focused = false;
-	opts;
-	list;
-	thinkingOverrides = /* @__PURE__ */ new Map();
-	ignoreSubmitTailUntil = Date.now() + 250;
-	constructor(opts) {
-		super();
-		this.opts = opts;
-		const choices = fredrikCreateModelChoices(opts.models);
-		const selectedIndex = choices.findIndex((choice) => choice.alias === (opts.selectedValue ?? opts.currentValue));
-		this.list = new SearchableList({
-			items: choices,
-			toSearchText: (choice) => choice.label,
-			initialIndex: Math.max(selectedIndex, 0),
-			searchable: opts.searchable === true
-		});
-	}
-	draftFor(choice) {
-		const override = this.thinkingOverrides.get(choice.alias);
-		if (override !== void 0) return override;
-		if (choice.alias === this.opts.currentValue) return this.opts.currentThinkingEffort;
-		const efforts = effortsOf(choice.model);
-		if (efforts.length > 0) {
-			const fallback = choice.model.defaultEffort ?? efforts[Math.floor(efforts.length / 2)];
-			if (fallback !== void 0 && efforts.includes(fallback)) return fallback;
-			return efforts[0];
-		}
-		return thinkingAvailability(choice.model) !== "unsupported" ? "on" : "off";
-	}
-	effectiveEffort(choice) {
-		const draft = this.draftFor(choice);
-		const segments = segmentsFor(choice.model);
-		return segments.includes(draft) ? draft : segments[0];
-	}
-	handleInput(data) {
-		if (isKeyRelease(data)) return;
-		if (Date.now() <= this.ignoreSubmitTailUntil && /^[\r\n]+$/.test(data)) return;
-		this.ignoreSubmitTailUntil = 0;
-		if (matchesKey(data, Key.escape)) {
-			if (this.list.clearQuery()) return;
-			this.opts.onCancel();
-			return;
-		}
-		if (this.list.handleKey(data)) return;
-		if (matchesKey(data, Key.left) || matchesKey(data, Key.right)) {
-			const selected = this.selectedChoice();
-			if (selected !== void 0) {
-				const segments = segmentsFor(selected.model);
-				if (segments.length > 1) {
-					const current = this.effectiveEffort(selected);
-					const index = segments.indexOf(current);
-					const delta = matchesKey(data, Key.left) ? -1 : 1;
-					const next = Math.max(0, Math.min(segments.length - 1, index + delta));
-					if (next !== index) this.thinkingOverrides.set(selected.alias, segments[next]);
-				}
-			}
-			return;
-		}
-		if (matchesKey(data, Key.enter)) {
-			const selected = this.selectedChoice();
-			if (selected === void 0) return;
-			this.opts.onSelect({
-				alias: selected.alias,
-				thinking: fredrikCommitEffort(selected, this.effectiveEffort(selected))
-			});
-			return;
-		}
-		if (matchesKey(data, Key.alt("s")) && this.opts.onSessionOnlySelect !== void 0) {
-			const selected = this.selectedChoice();
-			if (selected === void 0) return;
-			this.opts.onSessionOnlySelect({
-				alias: selected.alias,
-				thinking: fredrikCommitEffort(selected, this.effectiveEffort(selected))
-			});
-		}
-	}
-	render(width) {
-		const view = this.list.view();
-		const totalCount = Object.keys(fredrikSelectableModels(this.opts.models)).length;
-		const titleSuffix = this.opts.searchable === true && view.query.length === 0 ? currentTheme.fg("textMuted", `  (${uiText("model.typeToSearch")})`) : "";
-		const lines = [
-			currentTheme.fg("primary", "-".repeat(width)),
-			currentTheme.boldFg("primary", ` ${uiText("model.title")}`) + titleSuffix,
-			currentTheme.fg("textMuted", ` ${uiText("model.navigate")} | ${uiText("model.thinking")} (Left/Right) | Enter ${uiText("model.select")} | Esc ${uiText("model.cancel")}`),
-			""
-		];
-		if (view.query.length > 0) lines.push(currentTheme.fg("primary", ` ${uiText("model.search")}: `) + currentTheme.fg("text", view.query));
-		if (view.items.length === 0) lines.push(currentTheme.fg("textMuted", `   ${uiText("model.noMatches")}`));
-		for (let index = view.page.start; index < view.page.end; index++) {
-			const choice = view.items[index];
-			if (choice === void 0) continue;
-			const selected = index === view.selectedIndex;
-			const current = choice.alias === this.opts.currentValue;
-			const pointer = selected ? ">" : " ";
-			let line = currentTheme.fg(selected ? "primary" : "textDim", `  ${pointer} `);
-			line += selected ? currentTheme.boldFg("primary", choice.name) : currentTheme.fg("text", choice.name);
-			line += "  " + currentTheme.fg("textMuted", choice.provider);
-			if (current) line += " " + currentTheme.fg("success", currentMark());
-			lines.push(line);
-		}
-		if (view.query.length > 0) lines.push("", currentTheme.fg("textMuted", ` ${String(view.items.length)} / ${String(totalCount)}`));
-		lines.push("");
-		const selected = this.selectedChoice();
-		if (selected !== void 0) {
-			lines.push(currentTheme.fg("textMuted", ` ${uiText("model.thinking")}  (Left/Right ${uiText("model.toSwitch")})`));
-			lines.push(this.renderThinkingControl(selected));
-		}
-		lines.push("", currentTheme.fg("primary", "-".repeat(width)));
-		return lines.map((line) => truncateToWidth(line, width));
-	}
-	selectedChoice() {
-		return this.list.selected();
-	}
-	renderThinkingControl(choice) {
-		const segment = (label, active) => active ? currentTheme.boldFg("primary", `[ ${label} ]`) : currentTheme.fg("text", `  ${label}  `);
-		const unavailable = (label) => currentTheme.fg("textMuted", `  ${label} (${uiText("model.unsupported")})  `);
-		const efforts = effortsOf(choice.model);
-		const availability = thinkingAvailability(choice.model);
-		if (efforts.length === 0 && availability === "always-on") return `  ${segment(uiText("model.on"), true)} ${unavailable(uiText("model.off"))}`;
-		if (efforts.length === 0 && availability === "unsupported") return `  ${unavailable(uiText("model.on"))} ${segment(uiText("model.off"), true)}`;
-		const active = this.effectiveEffort(choice);
-		return `  ${segmentsFor(choice.model).map((effort) => segment(fredrikEffortLabel(effort), effort === active)).join("  ")}`;
-	}
-};
 //#endregion
 //#region src/tui/components/dialogs/permission-selector.ts
 function permissionOptions() {
@@ -421669,47 +422487,6 @@ async function handleThemeCommand(host, args) {
 	}
 	await applyThemeChoice(host, theme);
 }
-function resolveFredrikModelArgument(models, raw) {
-	const query = raw.trim().toLowerCase();
-	if (query.length === 0) return void 0;
-	return Object.entries(models).filter(([alias]) => isAllowedFredrikRuntimeAlias(alias, models)).find(([alias, model]) => [alias, model.model, model.displayName].filter((value) => typeof value === "string").some((value) => value.toLowerCase() === query))?.[0];
-}
-function showFredrikModelPicker(host, selectedValue = host.state.appState.model) {
-	const models = fredrikSelectableModels(host.state.appState.availableModels);
-	host.mountEditorReplacement(new FredrikModelSelectorComponent({
-		models,
-		currentValue: host.state.appState.model,
-		selectedValue,
-		currentThinkingEffort: host.state.appState.thinkingEffort,
-		searchable: true,
-		onSelect: (selection) => {
-			host.restoreEditorAfter(() => performModelSwitch(host, selection.alias, selection.thinking, false));
-		},
-		onSessionOnlySelect: (selection) => {
-			host.restoreEditorAfter(() => performModelSwitch(host, selection.alias, selection.thinking, false));
-		},
-		onCancel: () => {
-			host.restoreEditor();
-		}
-	}));
-}
-async function handleModelCommand(host, args) {
-	if (host.session === void 0) {
-		host.showError(noActiveSessionMessage());
-		return;
-	}
-	const raw = args.trim();
-	if (raw.length === 0) {
-		showFredrikModelPicker(host);
-		return;
-	}
-	const alias = resolveFredrikModelArgument(host.state.appState.availableModels, raw);
-	if (alias === void 0) {
-		host.showError(uiText("config.model.unknownAlias", { alias: raw }));
-		return;
-	}
-	showFredrikModelPicker(host, alias);
-}
 async function handleEffortCommand(host, args) {
 	const alias = host.state.appState.model;
 	const model = host.state.appState.availableModels[alias];
@@ -421741,7 +422518,7 @@ async function handleEffortCommand(host, args) {
 		}));
 		return;
 	}
-	await performEffortSelection(host, alias, arg, !isConfiguredFredrikGlmAlias(alias, model));
+	await performEffortSelection(host, alias, arg, true);
 }
 function showEffortPicker(host, model, segments) {
 	const liveEffort = host.state.appState.thinkingEffort;
@@ -421752,7 +422529,7 @@ function showEffortPicker(host, model, segments) {
 		currentValue,
 		currentBlunSwarm: host.state.appState.swarmMode && host.state.appState.swarmModeEntry === "effort",
 		onSelect: (effort) => {
-			host.restoreEditorAfter(() => performEffortSelection(host, alias, effort, !isConfiguredFredrikGlmAlias(alias, host.state.appState.availableModels[alias])));
+			host.restoreEditorAfter(() => performEffortSelection(host, alias, effort, true));
 		},
 		onSessionOnlySelect: (effort) => {
 			host.restoreEditorAfter(() => performEffortSelection(host, alias, effort, false));
@@ -432550,6 +433327,11 @@ function agentSwarmResultSummaryFromOutput(output) {
 	};
 }
 function parseAgentSwarmResultStatuses(output) {
+	const structured = parseStructuredSwarmDisplay(output);
+	if (structured.recognized) return structured.statuses.map((entry) => ({
+		...entry,
+		status: entry.status === "aborted" ? "cancelled" : entry.status
+	}));
 	const xmlStatuses = parseAgentSwarmXmlResultStatuses(output);
 	if (xmlStatuses.length > 0) return xmlStatuses;
 	return parseAgentSwarmLegacyResultStatuses(output);
@@ -493011,12 +493793,28 @@ registerUiCatalogFragment({
 	en: {
 		"thinking.label": "{name} thinking",
 		"thinking.aborted": "aborted",
+		"thinking.step": "step {step}",
+		"thinking.effort": "effort {effort}",
+		"thinking.attempt": "attempt {attempt}/{maxAttempts}",
+		"thinking.budget": "budget {budget}",
+		"thinking.heartbeat": "hidden-thought heartbeat {seconds}s ago",
+		"thinking.worked": "Worked {elapsed}",
+		"thinking.finished": "done {time}",
+		"thinking.emptyRetry": "Empty model response; {hint} · budget {before} → {after}",
 		"thinking.tokens.one": "{count} Token",
 		"thinking.tokens.other": "{count} Tokens"
 	},
 	de: {
 		"thinking.label": "{name} denkt",
 		"thinking.aborted": "abgebrochen",
+		"thinking.step": "Schritt {step}",
+		"thinking.effort": "Effort {effort}",
+		"thinking.attempt": "Versuch {attempt}/{maxAttempts}",
+		"thinking.budget": "Budget {budget}",
+		"thinking.heartbeat": "Verdecktes Denken läuft · letzter Takt vor {seconds}s",
+		"thinking.worked": "Gearbeitet {elapsed}",
+		"thinking.finished": "fertig {time}",
+		"thinking.emptyRetry": "Leere Modellantwort; {hint} · Budget {before} → {after}",
 		"thinking.tokens.one": "{count} Token",
 		"thinking.tokens.other": "{count} Tokens"
 	},
@@ -493070,6 +493868,14 @@ var ThinkingComponent = class {
 	thinkElapsedMs = 0;
 	thinkAborted = false;
 	estimatedOutputTokens = 0;
+	step;
+	thinkingEffort;
+	attempt = 1;
+	maxAttempts = 1;
+	completionBudget;
+	lastHeartbeatAtMs;
+	activeToolName;
+	finishedAtMs;
 	textComponent;
 	renderCache;
 	constructor(text, showMarker = true, mode = "finalized", ui, metrics) {
@@ -493084,6 +493890,7 @@ var ThinkingComponent = class {
 			this.thinkStartMs = metrics?.startedAtMs ?? Date.now();
 			this.thinkAborted = false;
 			this.estimatedOutputTokens = metrics?.estimatedOutputTokens ?? 0;
+			this.applyLiveMetrics(metrics ?? {});
 		}
 	}
 	markRenderDirty() {
@@ -493102,10 +493909,22 @@ var ThinkingComponent = class {
 	}
 	setLiveMetrics(metrics) {
 		if (this.mode === "live" && !this.thinkAborted && metrics.startedAtMs !== void 0) this.thinkStartMs = metrics.startedAtMs;
-		if (metrics.estimatedOutputTokens === this.estimatedOutputTokens) return;
+		const before = JSON.stringify([this.estimatedOutputTokens, this.step, this.thinkingEffort, this.attempt, this.maxAttempts, this.completionBudget, this.lastHeartbeatAtMs, this.activeToolName]);
 		this.estimatedOutputTokens = metrics.estimatedOutputTokens;
+		this.applyLiveMetrics(metrics);
+		const after = JSON.stringify([this.estimatedOutputTokens, this.step, this.thinkingEffort, this.attempt, this.maxAttempts, this.completionBudget, this.lastHeartbeatAtMs, this.activeToolName]);
+		if (before === after) return;
 		this.markRenderDirty();
 	}
+	applyLiveMetrics(metrics) {
+		this.step = metrics.step;
+		this.thinkingEffort = metrics.thinkingEffort;
+		this.attempt = metrics.attempt ?? 1;
+		this.maxAttempts = metrics.maxAttempts ?? 1;
+		this.completionBudget = metrics.completionBudget;
+		this.lastHeartbeatAtMs = metrics.lastHeartbeatAtMs;
+		this.activeToolName = metrics.activeToolName;
+	}
 	styled(text) {
 		return currentTheme.italicFg("textDim", text);
 	}
@@ -493117,6 +493936,7 @@ var ThinkingComponent = class {
 			this.thinkElapsedMs = Date.now() - this.thinkStartMs;
 			this.thinkStartMs = null;
 		}
+		this.finishedAtMs = Date.now();
 	}
 	dispose() {
 		this.stopSpinner();
@@ -493140,12 +493960,24 @@ var ThinkingComponent = class {
 			const abortMark = this.thinkAborted ? ` (${uiText("thinking.aborted")})` : "";
 			const tokenKey = roundedTokenCount === 1 ? "thinking.tokens.one" : "thinking.tokens.other";
 			const thinkingLabel = uiText("thinking.label", { name: this.persona });
-			const fullLabel = `${thinkingLabel}… (${elapsed} · ↓ ~${uiText(tokenKey, { count: tokenCount })} · ${startedAt})${abortMark}`;
-			const compactLabel = `${thinkingLabel}… (${elapsed} · ↓${tokenCount} · ${startedAt})${abortMark}`;
+			const details = [];
+			if (this.step !== void 0) details.push(uiText("thinking.step", { step: this.step }));
+			if (this.thinkingEffort !== void 0) details.push(uiText("thinking.effort", { effort: this.thinkingEffort }));
+			if (this.attempt > 1 || this.maxAttempts > 1) details.push(uiText("thinking.attempt", { attempt: this.attempt, maxAttempts: this.maxAttempts }));
+			if (this.completionBudget !== void 0) details.push(uiText("thinking.budget", { budget: this.completionBudget.toLocaleString(locale) }));
+			if (this.lastHeartbeatAtMs !== void 0) details.push(uiText("thinking.heartbeat", { seconds: Math.max(0, Math.floor((Date.now() - this.lastHeartbeatAtMs) / 1e3)) }));
+			if (this.activeToolName !== void 0) details.push(this.activeToolName);
+			const detailText = details.length === 0 ? "" : ` · ${details.join(" · ")}`;
+			const fullLabel = `${thinkingLabel}… (${elapsed} · ↓ ~${uiText(tokenKey, { count: tokenCount })}${detailText} · ${startedAt})${abortMark}`;
+			const compactLabel = `${thinkingLabel}… (${elapsed} · ↓${tokenCount}${this.step === void 0 ? "" : ` · #${this.step}`} · ${startedAt})${abortMark}`;
 			const metricsOnly = `(${elapsed} · ${startedAt})${abortMark}`;
 			const availableWidth = Math.max(1, width - visibleWidth(spinner));
 			const label = visibleWidth(fullLabel) <= availableWidth ? fullLabel : visibleWidth(compactLabel) <= availableWidth ? compactLabel : metricsOnly;
 			rendered = ["", spinner + currentTheme.fg("textDim", truncateToWidth(label, availableWidth))];
+		} else if (this.thinkElapsedMs > 0) {
+			const finishedAt = new Date(this.finishedAtMs ?? Date.now()).toLocaleTimeString(locale, { hour: "2-digit", minute: "2-digit" });
+			const finalLabel = `${uiText("thinking.worked", { elapsed: formatLiveElapsed(this.formatElapsedSeconds()) })} · ${uiText("thinking.finished", { time: finishedAt })}`;
+			rendered = ["", currentTheme.fg("textDim", truncateToWidth(finalLabel, Math.max(1, width)))];
 		} else rendered = [""];
 		if (isRenderCacheEnabled()) this.renderCache = {
 			width,
@@ -497454,9 +498286,6 @@ async function handleBuiltInSlashCommand(host, name, args) {
 		case "theme":
 			await handleThemeCommand(host, args);
 			return;
-		case "model":
-			await handleModelCommand(host, args);
-			return;
 		case "effort":
 			await handleEffortCommand(host, args);
 			return;
@@ -499539,9 +500368,11 @@ registerUiCatalogFragment({
 		"approval.search.scope": "scope: {scope}",
 		"approval.backgroundTask": "{status} {kind} task {taskId}: {description}",
 		"approval.hint.feedback": "Type feedback · ↵ submit.",
+		"approval.hint.editArguments": "Enter the complete replacement JSON object · ↵ submit.",
 		"approval.hint.main": "↑/↓ select · {numbers} choose · ↵ confirm{preview}",
 		"approval.hint.preview": " · ctrl+e preview",
 		"approval.choice.approveOnce": "Approve once",
+		"approval.choice.editArguments": "Edit arguments (JSON)",
 		"approval.choice.approveSession": "Approve for this session",
 		"approval.choice.reject": "Reject",
 		"approval.choice.rejectFeedback": "Reject with feedback",
@@ -499551,6 +500382,7 @@ registerUiCatalogFragment({
 		"approval.transcript.approvedSession": "Approved for session",
 		"approval.transcript.rejected": "Rejected",
 		"approval.transcript.cancelled": "Cancelled",
+		"approval.transcript.edited": "Arguments edited",
 		"approval.transcript.action": "{decision}: {action}",
 		"approval.transcript.actionWithFeedback": "{decision}: {action} — \"{feedback}\""
 	},
@@ -499570,9 +500402,11 @@ registerUiCatalogFragment({
 		"approval.search.scope": "Bereich: {scope}",
 		"approval.backgroundTask": "Aufgabe {taskId} ({status}, {kind}): {description}",
 		"approval.hint.feedback": "Feedback eingeben · ↵ absenden.",
+		"approval.hint.editArguments": "Vollständiges Ersatz-JSON-Objekt eingeben · ↵ absenden.",
 		"approval.hint.main": "↑/↓ auswählen · {numbers} wählen · ↵ bestätigen{preview}",
 		"approval.hint.preview": " · ctrl+e Vorschau",
 		"approval.choice.approveOnce": "Einmal genehmigen",
+		"approval.choice.editArguments": "Argumente bearbeiten (JSON)",
 		"approval.choice.approveSession": "Für diese Sitzung genehmigen",
 		"approval.choice.reject": "Ablehnen",
 		"approval.choice.rejectFeedback": "Ablehnen und Feedback geben",
@@ -499582,6 +500416,7 @@ registerUiCatalogFragment({
 		"approval.transcript.approvedSession": "Für diese Sitzung genehmigt",
 		"approval.transcript.rejected": "Abgelehnt",
 		"approval.transcript.cancelled": "Abgebrochen",
+		"approval.transcript.edited": "Argumente bearbeitet",
 		"approval.transcript.action": "{decision}: {action}",
 		"approval.transcript.actionWithFeedback": "{decision}: {action} – „{feedback}“"
 	},
@@ -499601,9 +500436,11 @@ registerUiCatalogFragment({
 		"approval.search.scope": "Ámbito: {scope}",
 		"approval.backgroundTask": "Tarea {taskId} ({status}, {kind}): {description}",
 		"approval.hint.feedback": "Escribe tus comentarios · ↵ enviar.",
+		"approval.hint.editArguments": "Introduce el objeto JSON completo de sustitución · ↵ enviar.",
 		"approval.hint.main": "↑/↓ seleccionar · {numbers} elegir · ↵ confirmar{preview}",
 		"approval.hint.preview": " · ctrl+e vista previa",
 		"approval.choice.approveOnce": "Aprobar una vez",
+		"approval.choice.editArguments": "Editar argumentos (JSON)",
 		"approval.choice.approveSession": "Aprobar durante esta sesión",
 		"approval.choice.reject": "Rechazar",
 		"approval.choice.rejectFeedback": "Rechazar y enviar comentarios",
@@ -499613,6 +500450,7 @@ registerUiCatalogFragment({
 		"approval.transcript.approvedSession": "Aprobado durante esta sesión",
 		"approval.transcript.rejected": "Rechazado",
 		"approval.transcript.cancelled": "Cancelado",
+		"approval.transcript.edited": "Argumentos modificados",
 		"approval.transcript.action": "{decision}: {action}",
 		"approval.transcript.actionWithFeedback": "{decision}: {action} — «{feedback}»"
 	},
@@ -499632,9 +500470,11 @@ registerUiCatalogFragment({
 		"approval.search.scope": "Portée : {scope}",
 		"approval.backgroundTask": "Tâche {taskId} ({status}, {kind}) : {description}",
 		"approval.hint.feedback": "Saisissez un commentaire · ↵ envoyer.",
+		"approval.hint.editArguments": "Saisissez l’objet JSON de remplacement complet · ↵ envoyer.",
 		"approval.hint.main": "↑/↓ sélectionner · {numbers} choisir · ↵ confirmer{preview}",
 		"approval.hint.preview": " · ctrl+e aperçu",
 		"approval.choice.approveOnce": "Approuver une fois",
+		"approval.choice.editArguments": "Modifier les arguments (JSON)",
 		"approval.choice.approveSession": "Approuver pour cette session",
 		"approval.choice.reject": "Refuser",
 		"approval.choice.rejectFeedback": "Refuser et ajouter un commentaire",
@@ -499644,6 +500484,7 @@ registerUiCatalogFragment({
 		"approval.transcript.approvedSession": "Approuvé pour cette session",
 		"approval.transcript.rejected": "Refusé",
 		"approval.transcript.cancelled": "Annulé",
+		"approval.transcript.edited": "Arguments modifiés",
 		"approval.transcript.action": "{decision} : {action}",
 		"approval.transcript.actionWithFeedback": "{decision} : {action} — « {feedback} »"
 	},
@@ -499663,9 +500504,11 @@ registerUiCatalogFragment({
 		"approval.search.scope": "Omfattning: {scope}",
 		"approval.backgroundTask": "Uppgift {taskId} ({status}, {kind}): {description}",
 		"approval.hint.feedback": "Skriv återkoppling · ↵ skicka.",
+		"approval.hint.editArguments": "Ange hela JSON-objektet som ska ersätta det befintliga · ↵ skicka.",
 		"approval.hint.main": "↑/↓ markera · {numbers} välj · ↵ bekräfta{preview}",
 		"approval.hint.preview": " · ctrl+e förhandsgranska",
 		"approval.choice.approveOnce": "Godkänn en gång",
+		"approval.choice.editArguments": "Redigera argument (JSON)",
 		"approval.choice.approveSession": "Godkänn för den här sessionen",
 		"approval.choice.reject": "Avvisa",
 		"approval.choice.rejectFeedback": "Avvisa och lämna återkoppling",
@@ -499675,6 +500518,7 @@ registerUiCatalogFragment({
 		"approval.transcript.approvedSession": "Godkänt för den här sessionen",
 		"approval.transcript.rejected": "Avvisat",
 		"approval.transcript.cancelled": "Avbrutet",
+		"approval.transcript.edited": "Argument redigerade",
 		"approval.transcript.action": "{decision}: {action}",
 		"approval.transcript.actionWithFeedback": "{decision}: {action} – ”{feedback}”"
 	},
@@ -499858,7 +500702,7 @@ var ApprovalPanelComponent = class extends Container {
 		if (!option) return;
 		this.onResponse({
 			response: option.response,
-			feedback: feedback || void 0,
+			...(option.input_kind === "edited_tool_input_json" ? { edited_tool_input_json: feedback } : { feedback: feedback || void 0 }),
 			selected_label: option.selected_label
 		});
 	}
@@ -499868,6 +500712,7 @@ var ApprovalPanelComponent = class extends Container {
 		if (option.requires_feedback === true) {
 			this.selectedIndex = index;
 			this.feedbackMode = true;
+			if (option.input_kind === "edited_tool_input_json") this.feedbackInput.setValue(this.request.data.editable_tool_input_json ?? "{}");
 		} else this.submit(index);
 	}
 	handleInput(data) {
@@ -499964,7 +500809,7 @@ var ApprovalPanelComponent = class extends Container {
 			if (option.description !== void 0 && option.description.length > 0 && !(this.feedbackMode && option.requires_feedback === true && isSelected)) for (const descLine of wrapTextWithAnsi(option.description, Math.max(20, width - 7))) lines.push(indent(`     ${dim(descLine)}`));
 		}
 		lines.push("");
-		if (this.feedbackMode) lines.push(indent(dim(uiText("approval.hint.feedback"))));
+		if (this.feedbackMode) lines.push(indent(dim(uiText(this.choiceAt(this.selectedIndex)?.input_kind === "edited_tool_input_json" ? "approval.hint.editArguments" : "approval.hint.feedback"))));
 		else {
 			const expandHint = hasPreviewable ? uiText("approval.hint.preview") : "";
 			lines.push(indent(dim(uiText("approval.hint.main", {
@@ -503221,12 +504066,18 @@ async function refreshAllProviderModels(host, options = {}) {
 }
 //#endregion
 //#region src/tui/reverse-rpc/approval/adapter.ts
-function defaultApprovalChoices() {
+function defaultApprovalChoices(allowEdit = false) {
 	return [
 		{
 			label: uiText("approval.choice.approveOnce"),
 			response: "approved"
 		},
+		...allowEdit ? [{
+			label: uiText("approval.choice.editArguments"),
+			response: "edited",
+			requires_feedback: true,
+			input_kind: "edited_tool_input_json"
+		}] : [],
 		{
 			label: uiText("approval.choice.approveSession"),
 			response: "approved_for_session"
@@ -503263,7 +504114,8 @@ function adaptApprovalRequest(event) {
 		action: resolved.action ?? event.action,
 		description: resolved.description,
 		display: resolved.blocks,
-		choices: adaptChoices(event.toolName, event.display)
+		choices: adaptChoices(event.toolName, event.display, event.allowEdit === true),
+		editable_tool_input_json: event.allowEdit === true ? canonicalEditedToolInputJson(event.editableToolInput) : void 0
 	};
 }
 function resolveDisplay(toolName, display, action) {
@@ -503367,6 +504219,10 @@ function inferFileOp(toolName) {
 	return "read";
 }
 function adaptPanelResponse(response) {
+	if (response.response === "edited") return {
+		decision: "edited",
+		edited_tool_input_json: response.edited_tool_input_json
+	};
 	if (response.response === "approved_for_session") return {
 		decision: "approved",
 		scope: "session",
@@ -503530,10 +504386,10 @@ function adaptDisplay(display) {
 		default: return [];
 	}
 }
-function adaptChoices(toolName, display) {
+function adaptChoices(toolName, display, allowEdit = false) {
 	if (toolName === "ExitPlanMode" || display.kind === "plan_review") return adaptPlanReviewChoices(display);
 	if (display.kind === "goal_start") return adaptGoalStartChoices(display);
-	return defaultApprovalChoices();
+	return defaultApprovalChoices(allowEdit);
 }
 function adaptGoalStartChoices(display) {
 	return goalStartOptions(display.mode).map((option) => option.value === "cancel" ? {
@@ -503629,7 +504485,7 @@ function createApprovalRequestHandler(controller, onResponse, options = {}) {
 				}).catch(() => {});
 			}
 			const response = await pending;
-			relay?.complete(response);
+			relay?.complete(response.decision === "edited" ? { decision: "edited" } : response);
 			onResponse?.(event, response);
 			return response;
 		} catch {
@@ -503676,10 +504532,7 @@ function applyManagedAccountContext(models, maxContextTokens) {
 			maxContextSize: maxContextTokens
 		} }
 	};
-	return {
-		[BLUN_KING_MODEL_ALIAS]: king,
-		...configuredFredrikGlmModels(models)
-	};
+	return { [BLUN_KING_MODEL_ALIAS]: king };
 }
 function normalizeKingProductEffort(value) {
 	if (value === "none" || value === "minimal" || value === "off") return "low";
@@ -503735,11 +504588,7 @@ function nextManagedQuotaWarning(windows, highestShown) {
 //#region src/tui/controllers/auth-flow.ts
 function managedProviderOnly(providers) {
 	const managed = providers[DEFAULT_OAUTH_PROVIDER_NAME];
-	const fredrikGlm = configuredFredrikGlmProvider(providers);
-	return {
-		...managed === void 0 ? {} : { [DEFAULT_OAUTH_PROVIDER_NAME]: managed },
-		...fredrikGlm === void 0 ? {} : { [FREDRIK_GLM_PROVIDER_ID]: fredrikGlm }
-	};
+	return managed === void 0 ? {} : { [DEFAULT_OAUTH_PROVIDER_NAME]: managed };
 }
 var AuthFlowController = class {
 	host;
@@ -507718,6 +508567,9 @@ var BottomPinnedTUI = class extends TUI {
 	* page-up/down jumps without re-reading the live (possibly stale) value.
 	*/
 	getTerminalRows() {
+		return this.getRenderHeight();
+	}
+	getRenderHeight() {
 		this.ensureResizeLatch();
 		return this.latchedTerminalRows > 0 ? this.latchedTerminalRows : currentTerminalRows(this.terminal.rows);
 	}
@@ -509848,7 +510700,7 @@ var SessionEventHandler = class {
 		this.host.commitQueuedSteerAtStepStart(event.turnId);
 		this.host.commitChannelPromptAtStepStart(event.turnId);
 		this.host.streamingUI.flushNow();
-		this.host.streamingUI.setStep(event.step);
+		this.host.streamingUI.beginStep(event);
 		this.host.streamingUI.resetToolUi();
 		this.host.streamingUI.finalizeLiveTextBuffers("waiting");
 		this.host.patchLivePane({
@@ -509922,7 +510774,8 @@ var SessionEventHandler = class {
 	handleStepRetrying(event) {
 		this.turnWatchdog.recordProgress();
 		const hint = formatModelRetryProgress(event);
-		if (event.outputMayHaveStarted === true) {
+		const completionBudgetRetry = event.completionBudgetBefore !== void 0 && event.completionBudgetAfter !== void 0;
+		if (event.outputMayHaveStarted === true || completionBudgetRetry) {
 			const { streamingUI } = this.host;
 			streamingUI.flushNow();
 			streamingUI.discardUnfinishedToolUi();
@@ -509932,9 +510785,14 @@ var SessionEventHandler = class {
 				kind: "status",
 				turnId: String(event.turnId),
 				renderMode: "plain",
-				content: uiText("sessionEvent.interrupted.reason", { reason: hint })
+				content: completionBudgetRetry ? uiText("thinking.emptyRetry", {
+					hint,
+					before: event.completionBudgetBefore.toLocaleString(getCurrentUiLocale()),
+					after: event.completionBudgetAfter.toLocaleString(getCurrentUiLocale())
+				}) : uiText("sessionEvent.interrupted.reason", { reason: hint })
 			});
 		}
+		this.host.streamingUI.noteStepRetry(event);
 		this.modelRetryHint = hint;
 		this.host.state.footer.setTransientHint(hint);
 		this.host.state.ui.requestRender();
@@ -509950,6 +510808,7 @@ var SessionEventHandler = class {
 	handleThinkingDelta(event) {
 		const { state, streamingUI } = this.host;
 		if (event.delta.length === 0 && !streamingUI.hasThinkingDraft()) return;
+		if (event.delta.trim().length === 0) streamingUI.noteThinkingHeartbeat();
 		if (event.delta.length > 0) this.turnWatchdog.recordProgress();
 		if (event.delta.length > 0) this.clearModelRetryHint();
 		streamingUI.appendThinkingDelta(event.delta);
@@ -512992,6 +513851,9 @@ var StreamingUIController = class {
 	_remoteTurnActivity = { active: false };
 	_remoteProcessStartedAt = new Date(Date.now() - process.uptime() * 1e3).toISOString();
 	_liveTurnStartedAtMs = void 0;
+	_liveStepStartedAtMs = void 0;
+	_liveThinkingHeartbeatAtMs = void 0;
+	_liveStepRequest = {};
 	_liveOutputTokens = new LiveOutputTokenCounter();
 	_countedToolCallIds = /* @__PURE__ */ new Set();
 	_assistantDraft = "";
@@ -513022,6 +513884,32 @@ var StreamingUIController = class {
 		this._currentStep = step;
 		this.publishTelegramConsoleStatus();
 	}
+	beginStep(event) {
+		this.setStep(event.step);
+		this._liveStepStartedAtMs = Date.now();
+		this._liveThinkingHeartbeatAtMs = void 0;
+		this._liveOutputTokens.reset();
+		this._countedToolCallIds.clear();
+		this._liveStepRequest = {
+			thinkingEffort: event.thinkingEffort,
+			completionBudget: event.completionBudget,
+			attempt: event.attempt ?? 1,
+			maxAttempts: event.maxAttempts ?? 1
+		};
+	}
+	noteStepRetry(event) {
+		this._liveStepStartedAtMs = Date.now();
+		this._liveThinkingHeartbeatAtMs = void 0;
+		this._liveStepRequest = {
+			...this._liveStepRequest,
+			attempt: event.nextAttempt,
+			maxAttempts: event.maxAttempts,
+			completionBudget: event.completionBudgetAfter ?? this._liveStepRequest.completionBudget
+		};
+	}
+	noteThinkingHeartbeat() {
+		this._liveThinkingHeartbeatAtMs = Date.now();
+	}
 	setRemoteTurnActivity(activity) {
 		const previous = this._remoteTurnActivity;
 		this._remoteTurnActivity = activity?.active === true ? activity : { active: false };
@@ -513050,14 +513938,25 @@ var StreamingUIController = class {
 	}
 	beginLiveTurn() {
 		this._liveTurnStartedAtMs = Date.now();
+		this._liveStepStartedAtMs = void 0;
+		this._liveThinkingHeartbeatAtMs = void 0;
+		this._liveStepRequest = {};
 		this._liveOutputTokens.reset();
 		this._countedToolCallIds.clear();
 		this.lastFlushAt = void 0;
 	}
 	getLiveActivityMetrics() {
+		const activeToolName = [...this._activeToolCalls.values()].at(-1)?.name ?? [...this._streamingToolCallArguments.values()].at(-1)?.name;
 		return {
-			startedAtMs: this._liveTurnStartedAtMs,
-			estimatedOutputTokens: this._liveOutputTokens.estimatedOutputTokens()
+			startedAtMs: this._liveStepStartedAtMs ?? this._liveTurnStartedAtMs,
+			estimatedOutputTokens: this._liveOutputTokens.estimatedOutputTokens(),
+			step: this._currentStep,
+			thinkingEffort: this._liveStepRequest.thinkingEffort,
+			completionBudget: this._liveStepRequest.completionBudget,
+			attempt: this._liveStepRequest.attempt ?? 1,
+			maxAttempts: this._liveStepRequest.maxAttempts ?? 1,
+			lastHeartbeatAtMs: this._liveThinkingHeartbeatAtMs,
+			activeToolName
 		};
 	}
 	recordLiveOutput(fragment) {
@@ -513098,6 +513997,9 @@ var StreamingUIController = class {
 	}
 	resetLiveActivity() {
 		this._liveTurnStartedAtMs = void 0;
+		this._liveStepStartedAtMs = void 0;
+		this._liveThinkingHeartbeatAtMs = void 0;
+		this._liveStepRequest = {};
 		this._liveOutputTokens.reset();
 		this._countedToolCallIds.clear();
 	}
@@ -518668,6 +519570,10 @@ var BlunTUI = class {
 		const sessionId = session.id;
 		const autostartPrompt = autostart.observation === void 0 ? GOAL_CONTINUATION_PROMPT : `${GOAL_CONTINUATION_PROMPT}\n\n${autostart.observation}`;
 		this.beginSessionRequest();
+		this.setAppState({
+			model: BLUN_KING_MODEL_ALIAS,
+			modelFallbackAllowed: false
+		});
 		try {
 			const result = await session.promptAccepted(autostartPrompt);
 			if (!result.accepted && this.session?.id === sessionId) {
@@ -519704,6 +520610,10 @@ var BlunTUI = class {
 			contextOnly: false
 		};
 		this.pendingChannelReplyGuard = installedGuard;
+		this.setAppState({
+			model: BLUN_KING_MODEL_ALIAS,
+			modelFallbackAllowed: false
+		});
 		session.promptAccepted(options?.parts ?? input).then((result) => {
 			if (result.duplicate === true) {
 				this.traceTelegramDelivery?.({ stage: "committed", ...context.item.channelDeliveryTrace, route: "channel_command_prompt", reason: "duplicate" });
@@ -519767,6 +520677,10 @@ var BlunTUI = class {
 			type: "text",
 			text: focusedModelInput
 		}, imagePart] : focusedModelInput;
+		this.setAppState({
+			model: BLUN_KING_MODEL_ALIAS,
+			modelFallbackAllowed: false
+		});
 		session.promptAccepted(promptInput, channelPromptOrigin(channelReportSources)).then((result) => {
 			if (result.duplicate === true) {
 				this.traceTelegramDelivery?.({ stage: "committed", ...channelDeliveryTrace, route: "prompt", reason: "duplicate" });
@@ -519961,6 +520875,10 @@ var BlunTUI = class {
 			return;
 		}
 		this.beginSessionRequest();
+		this.setAppState({
+			model: BLUN_KING_MODEL_ALIAS,
+			modelFallbackAllowed: false
+		});
 		session.promptAccepted(TRUNCATED_REPLY_CONTINUATION_PROMPT).then((result) => {
 			if (!result.accepted) this.failTruncatedChannelReplyRecovery(new Error("continuation prompt rejected"));
 		}).catch((error) => {
@@ -520231,6 +521149,10 @@ var BlunTUI = class {
 		});
 		this.beginSessionRequest();
 		const sdkInput = options?.parts ?? input;
+		this.setAppState({
+			model: BLUN_KING_MODEL_ALIAS,
+			modelFallbackAllowed: false
+		});
 		session.promptAccepted(sdkInput).catch((error) => {
 			finishPersonalMemoryRememberIntentTurn(session.id);
 			const message = formatErrorMessage$2(error);
@@ -520345,19 +521267,18 @@ var BlunTUI = class {
 		}
 	}
 	setAppState(patch) {
-		const managedAccountContextTokens = "managedAccountContextTokens" in patch ? patch.managedAccountContextTokens : this.state.appState.managedAccountContextTokens;
-		const availableModels = applyManagedAccountContext(patch.availableModels ?? this.state.appState.availableModels, isValidManagedContextTokens(managedAccountContextTokens) ? managedAccountContextTokens : void 0);
-		const allowedModel = (candidate) => typeof candidate === "string" && isAllowedFredrikRuntimeAlias(candidate, availableModels) ? candidate : BLUN_KING_MODEL_ALIAS;
 		let effectivePatch = {
 			...patch,
 			modelFallbackAllowed: false,
-			..."model" in patch && patch.model?.trim().length ? { model: allowedModel(patch.model) } : {},
-			..."activeResponderModel" in patch && patch.activeResponderModel != null ? { activeResponderModel: allowedModel(patch.activeResponderModel) } : {}
+			..."model" in patch && patch.model?.trim().length ? { model: BLUN_KING_MODEL_ALIAS } : {},
+			..."activeResponderModel" in patch && patch.activeResponderModel != null ? { activeResponderModel: BLUN_KING_MODEL_ALIAS } : {}
 		};
 		if ("availableModels" in patch || "managedAccountContextTokens" in patch) {
-			if (availableModels !== patch.availableModels) effectivePatch = {
+			const managedAccountContextTokens = "managedAccountContextTokens" in patch ? patch.managedAccountContextTokens : this.state.appState.managedAccountContextTokens;
+			const effectiveModels = applyManagedAccountContext(patch.availableModels ?? this.state.appState.availableModels, isValidManagedContextTokens(managedAccountContextTokens) ? managedAccountContextTokens : void 0);
+			if (effectiveModels !== patch.availableModels) effectivePatch = {
 				...effectivePatch,
-				availableModels
+				availableModels: effectiveModels
 			};
 		}
 		if (!hasPatchChanges(this.state.appState, effectivePatch)) return;
@@ -520434,11 +521355,7 @@ var BlunTUI = class {
 		return this.harness.createSession(options);
 	}
 	async setSession(session, options = {}) {
-		const resumedStatus = await session.getStatus();
-		if (!isAllowedFredrikRuntimeAlias(resumedStatus.model ?? BLUN_KING_MODEL_ALIAS, this.state.appState.availableModels)) {
-			await session.setModel(BLUN_KING_MODEL_ALIAS, { allowFallback: false });
-			this.showStatus(uiText("config.model.unknownAlias", { alias: resumedStatus.model ?? "" }), "warning");
-		}
+		await session.setModel(BLUN_KING_MODEL_ALIAS, { allowFallback: false });
 		await this.personalMemoryController.clear(this.session);
 		const previous = this.unloadCurrentSession(approvalCancellationFeedback("switching_session"));
 		await this.managedQuotaWarningPersistence;
@@ -520446,7 +521363,10 @@ var BlunTUI = class {
 		resetChannelPreambleState(this.channelPreamble);
 		this.session = session;
 		this.managedQuotaWarningController.restore(session.id, managedQuotaWarningThresholdFromMetadata(session.getResumeState()?.sessionMetadata?.custom));
-		this.setAppState({ modelFallbackAllowed: false });
+		this.setAppState({
+			model: BLUN_KING_MODEL_ALIAS,
+			modelFallbackAllowed: false
+		});
 		this.harness.setTelemetryContext({ sessionId: session.id });
 		this.registerSessionHandlers(session);
 		this.syncAdditionalDirs(session);
@@ -520458,7 +521378,7 @@ var BlunTUI = class {
 		const [status, goalResult, loopResult] = await Promise.all([session.getStatus(), session.getGoal(), session.getLoop()]);
 		this.setAppState({
 			sessionId: session.id,
-			model: status.model ?? BLUN_KING_MODEL_ALIAS,
+			model: BLUN_KING_MODEL_ALIAS,
 			modelFallbackAllowed: false,
 			activeResponderModel: null,
 			thinkingEffort: status.thinkingEffort,
@@ -520678,6 +521598,7 @@ var BlunTUI = class {
 		this.approvalController.cancelAll(approvalCancellationFeedback("reloading_session"));
 		this.questionController.cancelAll("");
 		this.resetSessionRuntime();
+		await session.setModel(BLUN_KING_MODEL_ALIAS, { allowFallback: false });
 		this.session = session;
 		this.harness.setTelemetryContext({ sessionId: session.id });
 		this.registerSessionHandlers(session);
@@ -520815,6 +521736,9 @@ var BlunTUI = class {
 			case "cancelled":
 				decision = uiText("approval.transcript.cancelled");
 				break;
+			case "edited":
+				decision = uiText("approval.transcript.edited");
+				break;
 		}
 		const content = response.feedback !== void 0 && response.feedback.length > 0 ? uiText("approval.transcript.actionWithFeedback", {
 			decision,