blun-king-cli 9.1.527 → 9.1.536

package/blun.mjs

@@ -16,6 +16,7 @@ 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 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";
@@ -56,6 +57,18 @@ const { SessionScrollbackArchive, sessionScrollbackArchiveDirectory } = sessionS
 const { replayWindowStartIndex, resolveReplayActiveTurnCount } = sessionReplayWindowPolicy;
 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;
 import { EventEmitter as EventEmitter$1 } from "node:events";
 import { StringDecoder } from "node:string_decoder";
 import co from "node:assert";
@@ -2720,6 +2733,7 @@ var init_blun = __esmMin((() => {
 		_defaultHeaders;
 		_generationKwargs;
 		_supportEfforts;
+		_openAICompatible;
 		_client;
 		_clientFactory;
 		_files;
@@ -2733,6 +2747,7 @@ 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,
@@ -2844,8 +2859,17 @@ var init_blun = __esmMin((() => {
 			delete requestExtraBody["model"];
 			delete requestExtraBody["messages"];
 			if (!thinkingDisabled && thinking?.keep !== void 0) requestExtraBody["thinking"] = { keep: thinking.keep };
-			const effectiveTemplateKwargs = requestKwargs["chat_template_kwargs"];
-			const reasoningRequested = typeof effectiveTemplateKwargs === "object" && effectiveTemplateKwargs !== null && effectiveTemplateKwargs.thinking === true;
+			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 createParams = {
 				model: this._model,
 				messages,
@@ -9989,7 +10013,7 @@ var init_schema = __esmMin((() => {
 	init_matches_rule();
 	init_errors$8();
 	init_zod$1();
-	ProviderTypeSchema = literal("blun");
+	ProviderTypeSchema = union([literal("blun"), literal("openai_compatible")]);
 	OAuthRefSchema = object({
 		storage: _enum(["file", "keyring"]),
 		key: string().min(1),
@@ -9999,6 +10023,7 @@ var init_schema = __esmMin((() => {
 	ProviderConfigSchema = object({
 		type: ProviderTypeSchema,
 		apiKey: string().optional(),
+		apiKeyFile: string().optional(),
 		baseUrl: string().optional(),
 		defaultModel: string().optional(),
 		oauth: OAuthRefSchema.optional(),
@@ -28546,6 +28571,7 @@ 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 = 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");
 }));
 //#endregion
 //#region ../../packages/agent-core/src/profile/default/coder.yaml?raw
@@ -28553,6 +28579,7 @@ var coder_default;
 var init_coder = __esmMin((() => {
 	coder_default = "extends: agent\nname: coder\npromptVars:\n  roleAdditional: |\n    You are now running as a subagent. All the `user` messages are sent by the main agent. The main agent cannot see your context, it can only see your last message when you finish the task. You must treat the parent agent as your caller. Do not directly ask the end user questions. If something is unclear, explain the ambiguity in your final summary to the parent agent.\n\n    Your final message is the entire handoff — the parent sees nothing else from your run. Make it technically complete: what you changed and why, the path of every file you touched, how you verified the change (tests or commands run, with results), and anything left undone or worth follow-up. A final message of only a sentence or two is treated as too brief and sent back to you for expansion, costing an extra turn.\nwhenToUse: |\n  Use this agent for non-trivial software engineering work that may require reading files, editing code, running commands, and returning a compact but technically complete summary to the parent agent.\ntools:\n  - Bash\n  - Read\n  - ReadMediaFile\n  - Glob\n  - Grep\n  - Write\n  - Edit\n  - MistakeRecord\n  - WebSearch\n  - FetchURL\n  - mcp__*\n";
 	coder_default = coder_default.replace("  - Read\n", "  - Read\n  - ReadBatch\n");
+	coder_default = coder_default.replace("  - ReadBatch\n", "  - ReadBatch\n  - ProgrammaticTool\n");
 }));
 //#endregion
 //#region ../../packages/agent-core/src/profile/default/explore.yaml?raw
@@ -28560,6 +28587,7 @@ var explore_default;
 var init_explore = __esmMin((() => {
 	explore_default = "extends: agent\nname: explore\npromptVars:\n  roleAdditional: |\n    You are now running as a subagent. All the `user` messages are sent by the main agent. The main agent cannot see your context, it can only see your last message when you finish the task. You must treat the parent agent as your caller. Do not directly ask the end user questions. If something is unclear, explain the ambiguity in your final summary to the parent agent.\n\n    You are a codebase exploration specialist. Your role is EXCLUSIVELY to search, read, and analyze existing code and resources. You do NOT have access to project file editing tools. MistakeRecord is the sole write-capable exception: it may record a concrete refutation in shared BLUN learning memory, never modify project files.\n\n    Your strengths:\n    - Rapidly finding files using glob patterns\n    - Searching code and text with powerful regex patterns\n    - Reading and analyzing file contents\n    - Running read-only shell commands (git log, git diff, ls, find, etc.)\n\n    Guidelines:\n    - Use Glob for broad file pattern matching. Prefer patterns with a literal anchor (extension or subdirectory); pure wildcards like `*` or `**/*` are allowed but usually truncate at the match cap.\n    - Use Grep for searching file contents with regex\n    - Use Read when you know the specific file path\n    - Use Bash ONLY for read-only operations (ls, git status, git log, git diff, find)\n    - NEVER use Bash for any file creation or modification commands\n    - Use WebSearch or FetchURL when a question needs external context (library documentation, error messages, upstream APIs); the local codebase remains your primary domain\n    - Adapt your search depth based on the thoroughness level specified by the caller\n    - Wherever possible, spawn multiple parallel tool calls for grepping and reading files to maximize speed\n\n    If the prompt includes a <git-context> block, use it to orient yourself about the repository state before starting your investigation.\n\n    You are meant to be a fast agent. Complete the search request efficiently and report your findings clearly in a structured format.\nwhenToUse: |\n  Fast agent specialized for exploring codebases. Use this when you need to quickly find files by patterns (e.g. \"src/**/*.yaml\"), search code for keywords (e.g. \"database connection\"), or answer questions about the codebase (e.g. \"how does the auth module work?\"). When calling this agent, specify the desired thoroughness level: \"quick\" for basic searches, \"medium\" for moderate exploration, or \"thorough\" for comprehensive analysis across multiple locations and naming conventions. Use this agent for any read-only exploration that will clearly require more than 3 search queries. Prefer launching multiple explore agents concurrently when investigating independent questions.\ntools:\n  - Bash\n  - Read\n  - ReadMediaFile\n  - Glob\n  - Grep\n  - MistakeRecord\n  - WebSearch\n  - FetchURL\n";
 	explore_default = explore_default.replace("  - Read\n", "  - Read\n  - ReadBatch\n");
+	explore_default = explore_default.replace("  - ReadBatch\n", "  - ReadBatch\n  - ProgrammaticTool\n");
 }));
 //#endregion
 //#region ../../packages/agent-core/src/profile/default/init.md?raw
@@ -28573,6 +28601,7 @@ var plan_default;
 var init_plan$1 = __esmMin((() => {
 	plan_default = "extends: agent\nname: plan\npromptVars:\n  roleAdditional: |\n    You are now running as a subagent. All the `user` messages are sent by the main agent. The main agent cannot see your context, it can only see your last message when you finish the task. You must treat the parent agent as your caller. Do not directly ask the end user questions. If something is unclear, explain the ambiguity in your final summary to the parent agent.\n\n    Before designing your implementation plan, consider whether you fully understand the codebase areas relevant to the task. If not, recommend the parent agent to use the explore agent (subagent_type=\"explore\") to investigate key questions first. In your response, clearly state:\n    1. What you already know from the information provided\n    2. What questions remain unanswered that would benefit from explore agent investigation\n    3. Your implementation plan (either preliminary if questions remain, or final if sufficient context exists)\n\n    You are a read-only planning agent: you can read and search files (Read, Glob, Grep, ReadMediaFile) and consult the web (WebSearch, FetchURL), but you have no shell and no project file-editing tools. MistakeRecord is the sole write-capable exception: it may record a concrete refutation in shared BLUN learning memory, never modify project files. Where the general instructions tell you to make changes with tools, that does not apply to you — do not attempt to run commands or modify project files. Your deliverable is the plan itself, returned as your final message.\nwhenToUse: |\n  Use this agent when the parent agent needs a step-by-step implementation plan, key file identification, and architectural trade-off analysis before code changes are made.\ntools:\n  - Read\n  - ReadMediaFile\n  - Glob\n  - Grep\n  - MistakeRecord\n  - WebSearch\n  - FetchURL\n";
 	plan_default = plan_default.replace("  - Read\n", "  - Read\n  - ReadBatch\n");
+	plan_default = plan_default.replace("  - ReadBatch\n", "  - ReadBatch\n  - ProgrammaticTool\n");
 }));
 //#endregion
 //#region ../../packages/agent-core/src/profile/default/system.md?raw
@@ -29102,6 +29131,7 @@ var init_agent_task = __esmMin((() => {
 		continuationTimeoutMs;
 		runInBackground;
 		parentToolCallId;
+		responseFormat;
 		kind = "agent";
 		idPrefix = "agent";
 		agentId;
@@ -29114,6 +29144,7 @@ var init_agent_task = __esmMin((() => {
 			this.continuationTimeoutMs = options.timeoutMs;
 			this.runInBackground = options.runInBackground;
 			this.parentToolCallId = options.parentToolCallId;
+			this.responseFormat = options.responseFormat;
 			this.agentId = handle.agentId;
 			this.subagentType = handle.profileName;
 		}
@@ -29133,6 +29164,7 @@ var init_agent_task = __esmMin((() => {
 							prompt: continuation.kind === "transient_provider" ? "Continue from the preserved context after a transient provider interruption. Do not repeat completed work; inspect the preserved wire and continue from the last durable boundary." : "Continue from the preserved context after the wall-clock interval.",
 							description: this.description,
 							runInBackground: this.runInBackground,
+							responseFormat: this.responseFormat,
 							signal: this.abortController.signal
 						});
 						return this.handle;
@@ -30334,6 +30366,7 @@ var init_completion_budget = __esmMin((() => {
 }));
 //#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) {
@@ -30347,9 +30380,10 @@ 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));
+		return await input.llm.chat(paramsForAttempt(input, attempt, maxAttempts, completionBudgetRetry, thinkingEffortRetry));
 	} catch (error) {
 		if (error instanceof APIEmptyResponseError && (emptyRetryKind !== void 0 || error.emptyResponseKind === "length" || error.emptyResponseKind === "stop")) {
 			logEmptyResponse(input, error, attempt);
@@ -30359,6 +30393,12 @@ 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({
@@ -30415,11 +30455,12 @@ function logRequestFailure(input, error, attempt, maxAttempts) {
 		...retryErrorFields(error)
 	});
 }
-function paramsForAttempt(input, attempt, maxAttempts, completionBudgetRetry) {
+function paramsForAttempt(input, attempt, maxAttempts, completionBudgetRetry, thinkingEffortRetry) {
 	const turnStep = `${input.turnId}.${String(input.currentStep)}`;
 	return {
 		...input.params,
 		completionBudgetRetry,
+		thinkingEffortRetry,
 		requestLogFields: attempt === 1 ? { turnStep } : {
 			turnStep,
 			attempt: `${String(attempt)}/${String(maxAttempts)}`
@@ -30427,12 +30468,19 @@ function paramsForAttempt(input, attempt, maxAttempts, completionBudgetRetry) {
 	};
 }
 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
+		reasoningLength: error.reasoningLength,
+		...retryThinkingEffort === void 0 ? {} : { retryThinkingEffort }
 	});
 }
 function retryBackoffDelays(maxAttempts) {
@@ -30599,6 +30647,96 @@ var init_todo_list = __esmMin((() => {
 	};
 }));
 //#endregion
+//#region ../../packages/agent-core/src/tools/builtin/state/programmatic-tool.ts
+var PROGRAMMATIC_TOOL_NAME, ProgrammaticTool;
+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.";
+		parameters = {
+			type: "object",
+			properties: {
+				code: {
+					type: "string",
+					maxLength: 32e3,
+					description: "JavaScript function body. Use state for explicit JSON state and tools.<alias>(args) for declared sequential tool calls."
+				},
+				state: {
+					type: "object",
+					description: "Optional JSON-only state snapshot from a previous run."
+				},
+				tools: {
+					type: "array",
+					maxItems: 16,
+					description: "Explicit allowlist for this program. Each name must be a tool available in the current turn.",
+					items: {
+						type: "object",
+						properties: {
+							name: {
+								type: "string",
+								minLength: 1,
+								description: "Exact current BLUN tool name."
+							},
+							alias: {
+								type: "string",
+								pattern: "^[A-Za-z_$][A-Za-z0-9_$]*$",
+								description: "JavaScript identifier exposed under tools."
+							}
+						},
+						required: ["name", "alias"],
+						additionalProperties: false
+					}
+				}
+			},
+			required: ["code"],
+			additionalProperties: false
+		};
+		resolveExecution(args) {
+			const declaredTools = Array.isArray(args.tools) ? args.tools : [];
+			return {
+				description: `Running bounded programmatic tool plan (${declaredTools.length} allowed tool${declaredTools.length === 1 ? "" : "s"})`,
+				approvalRule: this.name,
+				execute: async (context) => {
+					if (typeof context.invokeTool !== "function") return {
+						output: "Programmatic tool invocation boundary is unavailable.",
+						isError: true
+					};
+					try {
+						const { createProgrammaticToolRuntime } = await import(new URL("./bin/programmatic-tool-runtime.mjs", import.meta.url).href);
+						const runtime = createProgrammaticToolRuntime({
+							allowedTools: declaredTools,
+							invokeTool: context.invokeTool,
+							onEvent: (event) => context.onUpdate({
+								kind: "programmatic_tool",
+								event
+							})
+						});
+						const outcome = await runtime.run({
+							code: args.code,
+							state: args.state ?? {},
+							signal: context.signal
+						});
+						const result = {
+							output: JSON.stringify(outcome),
+							isError: false
+						};
+						if (context.invokeTool.stopTurn === true) result.stopTurn = true;
+						return result;
+					} catch (error) {
+						const result = {
+							output: error instanceof Error ? error.message : String(error),
+							isError: true
+						};
+						if (context.invokeTool.stopTurn === true) result.stopTurn = true;
+						return result;
+					}
+				}
+			};
+		}
+	};
+}));
+//#endregion
 //#region ../../packages/agent-core/src/tools/support/file-type.ts
 function toBuffer$2(data) {
 	return Buffer.isBuffer(data) ? data : Buffer.from(data.buffer, data.byteOffset, data.byteLength);
@@ -74747,6 +74885,9 @@ var init_kosong_llm = __esmMin((() => {
 			this.visionReader = config.visionReader;
 			this.onVisionUsage = config.onVisionUsage;
 		}
+		get thinkingEffort() {
+			return this.provider.thinkingEffort;
+		}
 		notifyMediaDropped(dropped) {
 			if (this.onMediaDropped === void 0) return;
 			const fresh = dropped.filter((part) => {
@@ -74789,6 +74930,7 @@ 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) => {
@@ -74798,11 +74940,11 @@ var init_kosong_llm = __esmMin((() => {
 				const reportedContextTokens = this.reportedContextTokens?.() ?? 0;
 				const usedContextTokens = Math.max(outgoingRequestTokens, reportedContextTokens);
 				completionBudget = applyCompletionBudgetWithDetails({
-					provider: this.provider,
+					provider: requestProvider,
 					budget: this.completionBudgetConfig,
 					capability: this.capability,
 					usedContextTokens,
-					retry: params.completionBudgetRetry ?? (thinkingEnabled(this.provider.thinkingEffort) ? {
+					retry: params.completionBudgetRetry ?? (thinkingEnabled(requestProvider.thinkingEffort) ? {
 						minimumCompletionTokens: 1024,
 						multiplier: 1
 					} : void 0)
@@ -76041,8 +76183,9 @@ 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, DEFAULT_CONFIG, MicroCompaction;
+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;
 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"));
 	({ isPersistedToolResultReference, freshToolResultIds } = createRequire(import.meta.url)("./bin/tool-result-offload-policy.cjs"));
 	({ projectHistoricalUnaddressedTelegramMessages } = createRequire(import.meta.url)("./bin/telegram-context-projection-policy.cjs"));
@@ -79191,6 +79334,7 @@ var init_context$2 = __esmMin((() => {
 				type: "context.append_loop_event",
 				event: projectLoopEventForRecord(event)
 			});
+			if (isWireOnlyProgrammaticEvent(event)) return;
 			switch (event.type) {
 				case "step.begin": {
 					const closed = this.closePendingToolResults();
@@ -233363,6 +233507,7 @@ var init_default_tool_approve = __esmMin((() => {
 		"Agent",
 		"AskUserQuestion",
 		"Skill",
+		"ProgrammaticTool",
 		"GetGoal",
 		"SetGoalBudget",
 		"UpdateGoal"
@@ -244071,6 +244216,49 @@ async function runToolCallBatch(step, response) {
 	}
 	return { stopTurn };
 }
+function createNestedToolInvoker(step, parentToolCall) {
+	let nestedSequence = 0;
+	const invoke = async ({ name, args, callId, signal }) => {
+		if (invoke.stopTurn === true) throw new Error("No nested tool calls are allowed after a turn-stop result.");
+		if (name === PROGRAMMATIC_TOOL_NAME) throw new Error("Nested ProgrammaticTool calls are not allowed.");
+		const nestedSignal = signal ?? step.signal;
+		nestedSignal.throwIfAborted();
+		nestedSequence += 1;
+		const safeCallId = typeof callId === "string" && callId.length > 0 ? callId : `call_${nestedSequence}`;
+		const nestedToolCall = {
+			id: `${parentToolCall.id}:ptc:${safeCallId}`,
+			name,
+			arguments: JSON.stringify(args ?? {})
+		};
+		const nestedStep = {
+			...step,
+			signal: nestedSignal,
+			toolCalls: [nestedToolCall],
+			dispatchEvent: (event) => step.dispatchEvent(markProgrammaticNestedEvent(event))
+		};
+		const preflight = preflightToolCall(nestedStep, nestedToolCall);
+		const prepared = await prepareToolCall(nestedStep, preflight);
+		const started = await prepared.task.start();
+		const pendingResult = await started.result;
+		const finalized = await finalizePendingToolResult(nestedStep, pendingResult);
+		if (finalized.stopTurn === true) invoke.stopTurn = true;
+		await nestedStep.dispatchEvent({
+			type: "tool.result",
+			parentUuid: nestedToolCall.id,
+			toolCallId: nestedToolCall.id,
+			result: finalized.result
+		});
+		if (finalized.result.isError === true) throw new Error(nestedToolResultText(finalized.result));
+		return finalized.result;
+	};
+	invoke.stopTurn = false;
+	return invoke;
+}
+function nestedToolResultText(result) {
+	if (typeof result.output === "string") return result.output;
+	const text = result.output.filter((part) => part.type === "text").map((part) => part.text).join("");
+	return text.length > 0 ? text : "Nested tool call failed.";
+}
 /**
 * Provider-order validation pass. It does not run hooks, spawn tools, or write
 * events. Validator compilation may populate the local cache.
@@ -244326,11 +244514,13 @@ async function finalizePendingToolResult(step, pendingResult) {
 async function executeTool(step, execution, toolCall, toolName, metadata) {
 	const { dispatchEvent, signal, turnId } = step;
 	signal.throwIfAborted();
+	const invokeTool = toolName === PROGRAMMATIC_TOOL_NAME ? createNestedToolInvoker(step, toolCall) : void 0;
 	return raceExecuteWithGraceTimeout(execution.execute({
 		turnId,
 		toolCallId: toolCall.id,
 		metadata,
 		signal,
+		invokeTool,
 		onUpdate: (update) => {
 			if (signal.aborted) return;
 			dispatchEvent({
@@ -244462,8 +244652,9 @@ async function dispatchToolCall(step, call, args, displayFields) {
 		display: displayFields?.display
 	});
 }
-var GRACE_TIMEOUT_MS, TOOL_OUTPUT_EMPTY, TOOL_OUTPUT_NON_TEXT, validators;
+var markProgrammaticNestedEvent, 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"));
 	init_args_validator();
 	init_path_access();
 	init_abort();
@@ -251417,6 +251608,7 @@ var init_task_output = __esmMin((() => {
 	init_zod$1();
 	init_background();
 	init_input_schema();
+	init_args_validator();
 	init_rule_match();
 	init_format();
 	init_task_output$1();
@@ -252467,12 +252659,29 @@ function lastAssistantText(agent) {
 	}
 	return "";
 }
+async function completeStructuredSubagentResult(child, childId, profileName, responseFormat, signal) {
+	let validation = validateStructuredSubagentOutput(lastAssistantText(child), responseFormat);
+	if (validation.validatorException === true) throw new Error(validation.error);
+	if (!validation.ok) {
+		signal.throwIfAborted();
+		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);
+		signal.throwIfAborted();
+		validation = validateStructuredSubagentOutput(lastAssistantText(child), responseFormat);
+		if (validation.validatorException === true) throw new Error(validation.error);
+		if (!validation.ok) throw new Error(`${STRUCTURED_SUBAGENT_OUTPUT_ERROR}: ${validation.error}. Resume with Agent(resume="${childId}", prompt="return the corrected JSON object", response_format=...) using the same response format.`);
+	}
+	return validation.value;
+}
 function shouldSuppressQueuedAttemptFailureEvent(options, error) {
 	if (options.suppressRateLimitFailureEvent !== true) return false;
 	if (isProviderRateLimitError(error)) return true;
 	return isAbortError$4(error) || options.signal.aborted;
 }
-var DEFAULT_SUBAGENT_TIMEOUT_MS, resolveSubagentTimeoutMs, runAgentWithTimeoutContinuation, buildSubagentUsageDelta, inheritSubagentAllowedTools, inheritSubagentLifecycleTools, 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, 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 init_subagent_host = __esmMin((() => {
 	init_src$4();
 	init_errors$8();
@@ -252487,6 +252696,14 @@ 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"));
+	({
+		STRUCTURED_SUBAGENT_OUTPUT_ERROR,
+		prepareStructuredResponseFormat,
+		validateStructuredSubagentOutput,
+		buildStructuredResponseFormatReminder,
+		buildStructuredResponseRepairPrompt,
+		buildStructuredSubagentEnvelope
+	} = createRequire(import.meta.url)("./bin/structured-subagent-output.cjs"));
 	({
 		SUBAGENT_MAX_TOKENS_ERROR,
 		SUBAGENT_MAX_TOKENS_HANDOFF_PROMPT,
@@ -252751,6 +252968,10 @@ IMPORTANT:
 				const gitContext = await collectGitContext(child.kaos, child.config.cwd);
 				if (gitContext) childPrompt = `${gitContext}\n\n${childPrompt}`;
 			}
+			if (options.responseFormat !== void 0) child.context.appendSystemReminder(buildStructuredResponseFormatReminder(options.responseFormat), {
+				kind: "system_trigger",
+				name: "subagent_response_format"
+			});
 			this.emitSubagentStarted(parent, childId);
 			if (child.turn.prompt([{
 				type: "text",
@@ -252761,17 +252982,29 @@ IMPORTANT:
 		}
 		async waitForChildCompletion(parent, childId, child, profileName, options) {
 			await completeChildTurnWithMaxTokensHandoff(child, options.signal);
-			let result = lastAssistantText(child);
-			let remainingContinuations = SUMMARY_CONTINUATION_ATTEMPTS;
-			while (remainingContinuations > 0 && result.length < SUMMARY_MIN_LENGTH) {
-				remainingContinuations -= 1;
-				options.signal.throwIfAborted();
-				child.turn.prompt([{
-					type: "text",
-					text: summary_continuation_default
-				}], SUBAGENT_PROMPT_ORIGIN);
-				await completeChildTurnWithMaxTokensHandoff(child, options.signal);
+			let result;
+			if (options.responseFormat !== void 0) {
+				const structuredResult = await completeStructuredSubagentResult(child, childId, profileName, options.responseFormat, options.signal);
+				result = buildStructuredSubagentEnvelope({
+					agentId: childId,
+					profileName,
+					responseFormat: options.responseFormat,
+					result: structuredResult,
+					usage: child.usage.data().total
+				});
+			} else {
 				result = lastAssistantText(child);
+				let remainingContinuations = SUMMARY_CONTINUATION_ATTEMPTS;
+				while (remainingContinuations > 0 && result.length < SUMMARY_MIN_LENGTH) {
+					remainingContinuations -= 1;
+					options.signal.throwIfAborted();
+					child.turn.prompt([{
+						type: "text",
+						text: summary_continuation_default
+					}], SUBAGENT_PROMPT_ORIGIN);
+					await completeChildTurnWithMaxTokensHandoff(child, options.signal);
+					result = lastAssistantText(child);
+				}
 			}
 			const usage = child.usage.data().total;
 			parent.emitEvent({
@@ -252868,7 +253101,7 @@ var init_agent_background_disabled = __esmMin((() => {
 //#region ../../packages/agent-core/src/tools/builtin/collaboration/agent-background-enabled.md?raw
 var agent_background_enabled_default;
 var init_agent_background_enabled = __esmMin((() => {
-	agent_background_enabled_default = "Subagents run detached whenever task management is available, so the parent remains responsive while delegated work continues. Completion arrives automatically in a later turn. Do not poll, sleep, or block on TaskOutput. Continue with other work or respond to the user. Use TaskUpdate to steer the running subagent and TaskStop only when it must be cancelled. Never fabricate or predict its result.";
+	agent_background_enabled_default = "Subagents run detached whenever task management is available, so the parent remains responsive while delegated work continues. A call with `response_format` is the deliberate exception: it runs in the foreground so BLUN can validate and, at most once, repair the final JSON before returning it. Detached completion arrives automatically in a later turn. Do not poll, sleep, or block on TaskOutput. Continue with other work or respond to the user. Use TaskUpdate to steer a running detached subagent and TaskStop only when it must be cancelled. Never fabricate or predict its result.";
 }));
 //#endregion
 //#region ../../packages/agent-core/src/tools/builtin/collaboration/agent.md?raw
@@ -252910,7 +253143,7 @@ function formatForegroundAgentFailure(handle, message, timedOut) {
 		"",
 		`subagent error: ${message}`
 	];
-	if (timedOut || message.includes(SUBAGENT_MAX_TOKENS_ERROR)) lines.push(`resume_hint: Continue with Agent(resume="${handle.agentId}", prompt="continue"). Use agent_id only; do not set subagent_type. The subagent retains its prior context; redo any unfinished tool call if its result was lost.`);
+	if (timedOut || message.includes(SUBAGENT_MAX_TOKENS_ERROR) || message.includes(STRUCTURED_SUBAGENT_OUTPUT_ERROR)) lines.push(`resume_hint: Continue with Agent(resume="${handle.agentId}", prompt="continue"). Use agent_id only; do not set subagent_type. The subagent retains its prior context; redo any unfinished tool call if its result was lost.`);
 	return lines.join("\n");
 }
 function launchErrorMessage(error, signal) {
@@ -252954,8 +253187,12 @@ var init_agent$1 = __esmMin((() => {
 		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."),
 		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. When task management is available, subagents always run detached so the parent remains responsive."),
-		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.")
+		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."),
+		response_format: object({
+			name: string().min(1).max(64).describe("Stable name for the structured result"),
+			schema: record(string(), unknown()).describe("Restricted JSON Schema for one object result")
+		}).optional().describe("Require a validated JSON object from a foreground subagent. Structured background agents are not supported yet.")
 	}));
 	object({
 		result: string().describe("Aggregated text output from the subagent"),
@@ -252967,7 +253204,7 @@ var init_agent$1 = __esmMin((() => {
 		}).describe("Cumulative token usage")
 	});
 	BACKGROUND_AGENT_UNAVAILABLE = "Background agent execution is not available for this agent because TaskList, TaskOutput, and TaskStop are not enabled.";
-	agent_default = "Launch a subagent for substantial, multi-step work in its own context and wire file. It returns a final report while keeping intermediate file contents out of your context.\n\nThe subagent starts with zero conversation context. Give it a self-contained prompt with the goal, known facts, constraints, and required result. For a direct lookup, include the exact path or command. For an investigation, state the question and evidence needed instead of prescribing rigid steps.\n\nWhen continuing earlier work, resume the existing agent ID instead of spawning a new agent; its context remains available. A subagent report is only visible to you, so relay the relevant conclusions to the user. `timeout_minutes` sets the wall-clock interval before the same agent continues automatically with preserved context; `timeout_minutes=0` disables that interval.\n\nUse Agent for complex, context-heavy work, not a trivial one- or two-step task. Launch independent agents in parallel in one response when useful. After assigning a scope, do not duplicate its searches or reads and do not abandon it to redo the same work manually; both erase the intended context savings.";
+	agent_default = "Launch a subagent for substantial, multi-step work in its own context and wire file. It returns a final report while keeping intermediate file contents out of your context.\n\nThe subagent starts with zero conversation context. Give it a self-contained prompt with the goal, known facts, constraints, and required result. For a direct lookup, include the exact path or command. For an investigation, state the question and evidence needed instead of prescribing rigid steps.\n\nWhen continuing earlier work, resume the existing agent ID instead of spawning a new agent; its context remains available. A subagent report is only visible to you, so relay the relevant conclusions to the user. `timeout_minutes` sets the wall-clock interval before the same agent continues automatically with preserved context; `timeout_minutes=0` disables that interval.\n\nUse Agent for complex, context-heavy work, not a trivial one- or two-step task. Launch independent agents in parallel in one response when useful. After assigning a scope, do not duplicate its searches or reads and do not abandon it to redo the same work manually; both erase the intended context savings.\n\nFor a machine-readable foreground result, pass `response_format` with a stable name and restricted object JSON Schema. The child gets no additional tools or permissions. It must return exactly one matching JSON object; BLUN validates it and allows at most one bounded repair turn. Do not combine `response_format` with `run_in_background=true`.";
 	AgentTool = class {
 		subagentHost;
 		backgroundManager;
@@ -252990,10 +253227,11 @@ var init_agent$1 = __esmMin((() => {
 			let profileName = args.subagent_type?.length ? args.subagent_type : "coder";
 			const resumeAgentId = args.resume?.trim();
 			if (resumeAgentId !== void 0 && resumeAgentId.length > 0) profileName = await this.subagentHost.getProfileName?.(resumeAgentId) ?? "subagent";
-			const { runInBackground } = resolveSubagentRunMode({
+			const resolvedRunMode = resolveSubagentRunMode({
 				allowBackground: this.allowBackground,
 				requested: args.run_in_background
 			});
+			const runInBackground = args.response_format === void 0 ? resolvedRunMode.runInBackground : false;
 			return {
 				description: `${runInBackground ? "Launching background" : "Launching"} ${profileName} agent: ${args.description}`,
 				accesses: ToolAccesses.none(),
@@ -253011,10 +253249,24 @@ var init_agent$1 = __esmMin((() => {
 		async execution(args, { toolCallId, signal }) {
 			try {
 				signal.throwIfAborted();
-				const { runInBackground } = resolveSubagentRunMode({
+				if (args.response_format !== void 0 && args.run_in_background === true) return {
+					output: "response_format is supported for foreground Agent runs only; remove run_in_background=true.",
+					isError: true
+				};
+				let responseFormat;
+				try {
+					responseFormat = prepareStructuredResponseFormat(args.response_format, compileToolArgsValidator);
+				} catch (error) {
+					return {
+						output: `Invalid response_format: ${error instanceof Error ? error.message : String(error)}`,
+						isError: true
+					};
+				}
+				const resolvedRunMode = resolveSubagentRunMode({
 					allowBackground: this.allowBackground,
 					requested: args.run_in_background
 				});
+				const runInBackground = responseFormat === void 0 ? resolvedRunMode.runInBackground : false;
 				const requestedProfileName = args.subagent_type?.length ? args.subagent_type : void 0;
 				const resumeAgentId = args.resume?.trim();
 				if (resumeAgentId !== void 0 && resumeAgentId.length > 0 && requestedProfileName !== void 0) return {
@@ -253036,6 +253288,7 @@ var init_agent$1 = __esmMin((() => {
 					prompt: args.prompt,
 					description: args.description,
 					runInBackground,
+					responseFormat,
 					signal: controller.signal
 				};
 				let handle;
@@ -253061,7 +253314,8 @@ var init_agent$1 = __esmMin((() => {
 					taskId = this.backgroundManager.registerTask(new AgentBackgroundTask(handle, args.description, this.subagentHost, controller, {
 						timeoutMs: resolveSubagentTimeoutMs({ perRunMinutes: args.timeout_minutes }),
 						runInBackground,
-						parentToolCallId: toolCallId
+						parentToolCallId: toolCallId,
+						responseFormat
 					}), {
 						detached: runInBackground,
 						signal: runInBackground ? void 0 : signal
@@ -253084,7 +253338,7 @@ var init_agent$1 = __esmMin((() => {
 				}
 				if (runInBackground) return { output: formatBackgroundAgentResult(taskId, handle, args.description, this.allowBackground) };
 				if (await this.backgroundManager.waitForForegroundRelease(taskId) === "detached") return { output: formatBackgroundAgentResult(taskId, handle, args.description, this.allowBackground) };
-				return await this.formatForegroundResult(taskId, handle);
+				return await this.formatForegroundResult(taskId, handle, responseFormat);
 			} catch (error) {
 				return {
 					output: `subagent error: ${launchErrorMessage(error, signal)}`,
@@ -253092,9 +253346,12 @@ var init_agent$1 = __esmMin((() => {
 				};
 			}
 		}
-		async formatForegroundResult(taskId, handle) {
+		async formatForegroundResult(taskId, handle, responseFormat) {
 			const info = this.backgroundManager.getTask(taskId);
-			if (info?.status === "completed") return { output: formatForegroundAgentSuccess(handle, await this.backgroundManager.readOutput(taskId)) };
+			if (info?.status === "completed") {
+				const output = await this.backgroundManager.readOutput(taskId);
+				return { output: responseFormat === void 0 ? formatForegroundAgentSuccess(handle, output) : output };
+			}
 			const timedOut = info?.status === "timed_out";
 			return {
 				output: formatForegroundAgentFailure(handle, timedOut ? "Agent timed out before automatic continuation could start." : info?.stopReason === "Interrupted by user" ? USER_INTERRUPTED_SUBAGENT_MESSAGE : info?.stopReason !== void 0 ? info.stopReason : "The subagent was stopped before it finished.", timedOut),
@@ -261161,7 +261418,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, 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, 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");
@@ -261177,6 +261434,8 @@ var init_tool_result_budget = __esmMin((() => {
 	createToolResultPreview = toolResultOffloadPolicy.createToolResultPreview;
 	compactPersistedToolResultReference = toolResultOffloadPolicy.compactPersistedToolResultReference;
 	compactHistoricalSuccessfulToolResults = toolResultOffloadPolicy.compactHistoricalSuccessfulToolResults;
+	currentTurnReadToolResultIds = toolResultOffloadPolicy.currentTurnReadToolResultIds;
+	currentUserTurnStartIndex = toolResultOffloadPolicy.currentUserTurnStartIndex;
 	dedupeRepeatedSuccessfulToolResults = toolResultOffloadPolicy.dedupeRepeatedSuccessfulToolResults;
 	freshToolResultIds = toolResultOffloadPolicy.freshToolResultIds;
 	readContinuationLineOffset = toolResultOffloadPolicy.readContinuationLineOffset;
@@ -261194,8 +261453,9 @@ var ToolResultBatchOffload = class {
 	async detect() {
 		const history = this.agent.context.history;
 		const tailIds = freshToolResultIds(history);
+		const pinnedReadIds = currentTurnReadToolResultIds(history);
 		const recentStart = Math.max(0, history.length - TOOL_RESULT_HISTORICAL_KEEP_RECENT_MESSAGES);
-		const historical = history.slice(0, recentStart).filter((message) => message?.role === "tool" && !tailIds.has(message.toolCallId));
+		const historical = history.slice(0, recentStart).filter((message) => message?.role === "tool" && !tailIds.has(message.toolCallId) && !pinnedReadIds.has(message.toolCallId));
 		const candidateBatches = [{
 			messages: historical,
 			historical: true,
@@ -261369,7 +261629,7 @@ function renderPersistedUserMessage(text, outputPath) {
 		createUserMessagePreview(text)
 	].join("\n");
 }
-var USER_MESSAGE_MAX_CHARS, USER_MESSAGE_OFFLOAD_MARKER, shouldOffloadUserMessage, shouldOffloadHistoricalUserMessage, createUserMessagePreview, compactHistoricalPersistedUserMessageReferences, projectHistoricalMediaParts;
+var USER_MESSAGE_MAX_CHARS, USER_MESSAGE_OFFLOAD_MARKER, shouldOffloadUserMessage, shouldOffloadHistoricalUserMessage, createUserMessagePreview, compactHistoricalPersistedUserMessageReferences, historyTextChars, projectHistoricalMediaParts;
 var init_user_message_offload = __esmMin((() => {
 	const policy = createRequire(import.meta.url)("./bin/user-message-offload-policy.cjs");
 	USER_MESSAGE_MAX_CHARS = policy.USER_MESSAGE_MAX_CHARS;
@@ -261377,6 +261637,7 @@ var init_user_message_offload = __esmMin((() => {
 	shouldOffloadUserMessage = policy.shouldOffloadUserMessage;
 	shouldOffloadHistoricalUserMessage = policy.shouldOffloadHistoricalUserMessage;
 	createUserMessagePreview = policy.createUserMessagePreview;
+	historyTextChars = policy.historyTextChars;
 		compactHistoricalPersistedUserMessageReferences = policy.compactHistoricalPersistedUserMessageReferences;
 		({ projectHistoricalMediaParts } = createRequire(import.meta.url)("./bin/historical-media-projection-policy.cjs"));
 	}));
@@ -261389,8 +261650,11 @@ var UserMessageOffload = class {
 	async detect() {
 		const history = this.agent.context.history;
 		if (this.agent.homedir === void 0) return 0;
+		const currentTurnStart = currentUserTurnStartIndex(history);
+		const totalHistoryChars = historyTextChars(history);
 		let offloaded = 0;
 		for (let historyIndex = 0; historyIndex < history.length; historyIndex++) {
+			if (historyIndex === currentTurnStart) continue;
 			const message = history[historyIndex];
 			const text = persistableUserMessageText(message);
 			if (text === void 0) continue;
@@ -261398,6 +261662,7 @@ var UserMessageOffload = class {
 			const historicalOversize = shouldOffloadHistoricalUserMessage({
 				historyIndex,
 				historyLength: history.length,
+				historyChars: totalHistoryChars,
 				textChars: text.length
 			});
 			if (!immediateOversize && !historicalOversize) continue;
@@ -261520,6 +261785,7 @@ var AssistantMessageOffload = class {
 	async detect() {
 		const history = this.agent.context.history;
 		if (this.agent.homedir === void 0) return 0;
+		const totalHistoryChars = historyTextChars(history);
 		let offloaded = 0;
 		for (let historyIndex = 0; historyIndex < history.length; historyIndex++) {
 			const message = history[historyIndex];
@@ -261527,6 +261793,7 @@ var AssistantMessageOffload = class {
 			if (text === void 0 || !shouldOffloadHistoricalAssistantMessage({
 				historyIndex,
 				historyLength: history.length,
+				historyChars: totalHistoryChars,
 				textChars: text.length
 			})) continue;
 			const messageHash = assistantMessageOffloadHash(message, text);
@@ -261563,6 +261830,7 @@ var AssistantMessageOffload = class {
 	}
 	compact(messages) {
 		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;
 		const projected = messages.map((message, historyIndex) => {
 			if (message?.role === "assistant" && message.toolCalls.length > 0) {
@@ -261572,6 +261840,7 @@ var AssistantMessageOffload = class {
 				if (shouldCompactHistoricalAssistantToolNarration({
 					historyIndex,
 					historyLength: messages.length,
+					historyChars: totalHistoryChars,
 					textChars,
 					toolCallCount: message.toolCalls.length,
 					completedToolCallCount
@@ -261959,7 +262228,7 @@ function durablePromptOrigin(origin) {
 	void externalReportSources;
 	return durableOrigin;
 }
-var BLUN_CORE_TOOL_NAMES, BLUN_LEAN_TOOL_NAMES, BLUN_ATTACHMENT_MARKER_RE, BLUN_TELEGRAM_OUTBOUND_TOOL_RE, BLUN_TELEGRAM_CHANNEL_RE, BLUN_TOOL_BUDGET_RATIO, createDeferredToolLoader, mediaToolNamesForTurnText, rankedSupportToolNamesForGoal, rankedToolNamesForTurnText, rememberDeferredToolAfterNotFound, toolSchemaBudgetTokens, enforceSingleTodoWritePerStep, projectRecurringCronHistory, TelegramDeliveryLedger, createRuntimeCognitiveTurnLifecycle, cognitiveFocusScopesForTurn, buildCognitiveWorkFocus, buildAttentionQueueItem, LLM_NOT_SET_MESSAGE, GOAL_CONTINUATION_ORIGIN, GOAL_COMPLETION_REMINDER_NAME, GOAL_BLOCKED_REMINDER_NAME, GOAL_RATE_LIMIT_PAUSE_REASON, GOAL_PROVIDER_CONNECTION_PAUSE_PREFIX, GOAL_PROVIDER_AUTH_PAUSE_PREFIX, GOAL_PROVIDER_API_PAUSE_PREFIX, GOAL_MODEL_CONFIG_PAUSE_PREFIX, GOAL_RUNTIME_PAUSE_PREFIX, GOAL_PROVIDER_FILTERED_PAUSE_REASON, GOAL_CONTINUATION_PROMPT, TurnFlow;
+var BLUN_CORE_TOOL_NAMES, BLUN_LEAN_TOOL_NAMES, BLUN_ATTACHMENT_MARKER_RE, BLUN_TELEGRAM_OUTBOUND_TOOL_RE, BLUN_TELEGRAM_CHANNEL_RE, BLUN_TOOL_BUDGET_RATIO, createDeferredToolLoader, mediaToolNamesForTurnText, rankedSupportToolNamesForGoal, rankedToolNamesForTurnText, rememberDeferredToolAfterNotFound, toolSchemaBudgetTokens, assessTodoListBounds, assessTodoMaintenanceUpdate, enforceSingleTodoWritePerStep, todoRefreshWorkCallLimit, projectRecurringCronHistory, TelegramDeliveryLedger, createRuntimeCognitiveTurnLifecycle, cognitiveFocusScopesForTurn, buildCognitiveWorkFocus, buildAttentionQueueItem, LLM_NOT_SET_MESSAGE, GOAL_CONTINUATION_ORIGIN, GOAL_COMPLETION_REMINDER_NAME, GOAL_BLOCKED_REMINDER_NAME, GOAL_RATE_LIMIT_PAUSE_REASON, GOAL_PROVIDER_CONNECTION_PAUSE_PREFIX, GOAL_PROVIDER_AUTH_PAUSE_PREFIX, GOAL_PROVIDER_API_PAUSE_PREFIX, GOAL_MODEL_CONFIG_PAUSE_PREFIX, GOAL_RUNTIME_PAUSE_PREFIX, GOAL_PROVIDER_FILTERED_PAUSE_REASON, GOAL_CONTINUATION_PROMPT, TurnFlow;
 var init_turn = __esmMin((() => {
 	init_dist$4();
 	init_src$4();
@@ -261977,7 +262246,7 @@ var init_turn = __esmMin((() => {
 	init_user_message_offload();
 	init_assistant_message_offload();
 	({ CORE_TOOL_NAMES: BLUN_CORE_TOOL_NAMES, createDeferredToolLoader, mediaToolNamesForTurnText, rankedSupportToolNamesForGoal, rankedToolNamesForTurnText, rememberDeferredToolAfterNotFound, toolSchemaBudgetTokens } = createRequire(import.meta.url)("./bin/turn-tool-performance-policy.cjs"));
-	({ enforceSingleTodoWritePerStep } = createRequire(import.meta.url)("./bin/todo-list-turn-policy.cjs"));
+	({ assessTodoListBounds, assessTodoMaintenanceUpdate, enforceSingleTodoWritePerStep, todoRefreshWorkCallLimit } = createRequire(import.meta.url)("./bin/todo-list-turn-policy.cjs"));
 	({ projectRecurringCronHistory } = createRequire(import.meta.url)("./bin/recurring-cron-history-policy.cjs"));
 	({ TelegramDeliveryLedger } = createRequire(import.meta.url)("./bin/repeated-user-message-projection.cjs"));
 	({ createRuntimeCognitiveTurnLifecycle } = createRequire(import.meta.url)("./bin/cognitive-turn-lifecycle.cjs"));
@@ -262789,6 +263058,7 @@ var init_turn = __esmMin((() => {
 		async runStepLoop(turnId, signal, input, origin) {
 			let stopHookContinuationUsed = false;
 			let goalOutcomeMessageContinuationUsed = false;
+			let directSteerContinuationPending = false;
 			const directReplyTurnStop = createDirectReplyTurnStop(blunExtractText(input));
 			const deduper = new ToolCallDeduplicator({ telemetry: this.agent.telemetry });
 			if (blunTurnNeedsInitialMcp(input, origin)) await blunWaitForInitialMcpBudget(this.agent.mcp, signal);
@@ -262913,7 +263183,8 @@ var init_turn = __esmMin((() => {
 									});
 									return { llm: this.agent.llmForTurn(workStepThinkingEffort), tools: selectedTools };
 								}
-								const steerEfforts = pendingSteers.map((steer) => blunTurnHasAttachment(steer.input) ? void 0 : selectThinkingEffortForBufferedSteer(blunExtractText(blunThinkingIntentInput(steer.input)), steer.origin.kind));
+							if (pendingSteers.some((steer) => directMessageAllowsWorkContinuation(blunExtractText(steer.input)))) directSteerContinuationPending = true;
+							const steerEfforts = pendingSteers.map((steer) => blunTurnHasAttachment(steer.input) ? void 0 : selectThinkingEffortForBufferedSteer(blunExtractText(blunThinkingIntentInput(steer.input)), steer.origin.kind));
 								if (steerEfforts.some((effort) => effort === void 0)) return;
 								const steerInput = pendingSteers.flatMap((steer) => [...steer.input]);
 								const steerThinkingEffort = "low";
@@ -262959,10 +263230,22 @@ var init_turn = __esmMin((() => {
 								deduper.endStep();
 								return stopForGoalBudget || directReplyTurnStop.shouldStop() ? { stopTurn: true } : void 0;
 							},
-							shouldContinueAfterStop: async (ctx) => {
-								const { signal } = ctx;
-								if (this.matchingSteers().length > 0) return { continue: true };
-								signal.throwIfAborted();
+						shouldContinueAfterStop: async (ctx) => {
+							const { signal } = ctx;
+							if (this.matchingSteers().length > 0) return { continue: true };
+							signal.throwIfAborted();
+							if (directSteerContinuationPending) {
+								directSteerContinuationPending = false;
+								this.agent.context.appendUserMessage([{
+									type: "text",
+									text: "The private Telegram DM was handled. Continue the exact work that was active before it arrived. Do not re-read completed evidence; perform the next unfinished action now."
+								}], {
+									kind: "system_trigger",
+									name: "telegram_direct_work_resume"
+								});
+								this.setActiveSteerAcceptance(turnId, true);
+								return { continue: true };
+							}
 								if (!goalOutcomeMessageContinuationUsed && isGoalOutcomeReminderOrigin(this.agent.context.history.at(-1)?.origin)) {
 									goalOutcomeMessageContinuationUsed = true;
 									if (!hasStepBudgetRemaining(loopControl?.maxStepsPerTurn, ctx.stepNumber)) {
@@ -262997,6 +263280,8 @@ var init_turn = __esmMin((() => {
 							prepareToolExecution: async (ctx) => {
 								const todoTurnPolicy = enforceSingleTodoWritePerStep(ctx);
 								if (todoTurnPolicy !== void 0) return todoTurnPolicy;
+								const todoBoundsPolicy = enforceTodoListBounds(this.agent, ctx);
+								if (todoBoundsPolicy !== void 0) return todoBoundsPolicy;
 								const goalTodoPolicy = enforceGoalTodoPolicy(this.agent, ctx);
 								if (goalTodoPolicy !== void 0) return goalTodoPolicy;
 								const ideaPolicy = enforceIdeaToolPolicy(this.agent, ctx);
@@ -264119,20 +264404,16 @@ var init_codebase_search$1 = __esmMin((() => {
 * `CODEBASE_INDEX_SCRIPT` env override, then to a search from cwd.
 */
 function resolveScriptPath() {
-	const envPath = process.env["CODEBASE_INDEX_SCRIPT"];
-	if (envPath !== void 0 && envPath.length > 0) return envPath;
-	try {
-		return fileURLToPath(new URL("../../../../../codebase-index/codebase_index.py", import.meta.url));
-	} catch {}
-	return "";
+	return resolveCodebaseIndexScript(import.meta.url, process.env["CODEBASE_INDEX_SCRIPT"]);
 }
-var CodebaseSearchInputSchema, SCRIPT_TIMEOUT_MS, CodebaseSearchTool;
+var resolveCodebaseIndexScript, CodebaseSearchInputSchema, SCRIPT_TIMEOUT_MS, CodebaseSearchTool;
 var init_codebase_search = __esmMin((() => {
 	init_zod$1();
 	init_rule_match();
 	init_input_schema();
 	init_result_builder();
 	init_codebase_search$1();
+	({ resolveCodebaseIndexScript } = createRequire(import.meta.url)("./bin/codebase-search-runtime.cjs"));
 	CodebaseSearchInputSchema = object({
 		query: string().min(1, "Query cannot be empty.").describe("A natural-language question or concept describing what the code does. Examples: \"keyboard event handling\", \"retry with exponential backoff\", \"where chat messages are routed to the model\"."),
 		top: number$1().int().positive().default(5).describe("Maximum number of results to return. Defaults to 5.")
@@ -264828,6 +265109,7 @@ var init_builtin = __esmMin((() => {
 	init_exit_plan_mode();
 	init_bash();
 	init_todo_list();
+	init_programmatic_tool();
 	init_fetch_url();
 	init_web_search();
 	init_codebase_search();
@@ -265272,6 +265554,7 @@ var init_tool$1 = __esmMin((() => {
 				goalToolsEnabled && new UpdateGoalTool(this.agent),
 				this.agent.rpc?.requestQuestion && new AskUserQuestionTool(this.agent),
 				new TodoListTool(this.toolStore),
+				new ProgrammaticTool(),
 				new CompactConversationTool(this.agent),
 				new TaskListTool(background),
 				new TaskOutputTool(background),
@@ -265461,6 +265744,9 @@ var init_fallback_llm = __esmMin((() => {
 		get capability() {
 			return this.current.llm.capability;
 		}
+		get thinkingEffort() {
+			return this.current.llm.thinkingEffort;
+		}
 		async prepareRequestBoundary(params, rebuildMessages) {
 			params.signal.throwIfAborted();
 			this.rebuildBoundaryMessages = rebuildMessages;
@@ -314793,7 +315079,17 @@ function resolveModelCapabilities(alias, provider) {
 	};
 }
 function toKosongProviderConfig(provider, model, blunRequestHeaders, promptCacheKey, supportEfforts) {
-	assertBlunProviderType(provider);
+	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" }
+	};
 	const envCustomHeaders = parseBlunCodeCustomHeaders();
 	return {
 		type: "blun",
@@ -314814,11 +315110,12 @@ function defaultHeadersField(headers) {
 	return { defaultHeaders: { ...headers } };
 }
 function providerApiKey(provider) {
-	assertBlunProviderType(provider);
+	assertSupportedProviderType(provider);
+	if (provider.type === FREDRIK_GLM_PROVIDER_TYPE) return readFredrikGlmApiKeyFile(provider);
 	return providerValue(provider.apiKey, provider.env, "BLUN_API_KEY");
 }
-function assertBlunProviderType(provider) {
-	if (provider.type !== "blun") throw new BlunError(ErrorCodes.MODEL_CONFIG_INVALID, "Only the BLUN provider type is supported.");
+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 providerValue(configured, env, envKey) {
 	return nonEmptyString$2(configured) ?? envValue(env, envKey);
@@ -314856,7 +315153,9 @@ 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.`);
-			assertBlunProviderType(providerConfig);
+			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.");
 			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.`);
@@ -314870,7 +315169,7 @@ var init_provider_manager = __esmMin((() => {
 				}, provider),
 				alwaysThinking: (effectiveAlias.capabilities ?? []).some((c) => c.trim().toLowerCase() === "always_thinking"),
 				maxOutputSize: effectiveAlias.maxOutputSize,
-				type: "blun"
+				type: providerConfig.type
 			};
 		}
 		setRuntimeModelContext(input) {
@@ -314890,7 +315189,7 @@ var init_provider_manager = __esmMin((() => {
 		resolveAuth(model, options) {
 			const { providerName } = this.resolveProviderConfig(model);
 			const providerConfig = this.config.providers[providerName];
-			const apiKey = providerConfig === void 0 ? void 0 : providerApiKey(providerConfig);
+			const apiKey = providerConfig?.type === "blun" ? providerApiKey(providerConfig) : void 0;
 			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;
@@ -402988,7 +403287,7 @@ function createProgram(version, onMain, onPluginNodeRunner = () => {}) {
 		"high",
 		"xhigh",
 		"max"
-	])).addOption(new Option("--permission-mode <mode>", "Permission mode for this invocation (auto, manual, yolo).").choices([
+	])).option("--swarm", "Start in swarm mode.", false).addOption(new Option("--permission-mode <mode>", "Permission mode for this invocation (auto, manual, yolo).").choices([
 		"auto",
 		"manual",
 		"yolo"
@@ -403022,6 +403321,7 @@ function createProgram(version, onMain, onPluginNodeRunner = () => {}) {
 			plan: raw["plan"],
 			model: raw["model"],
 			effort: raw["effort"],
+			swarm: raw["swarm"] === true,
 			permissionMode: raw["permissionMode"],
 			forkSession: raw["forkSession"],
 			outputFormat: raw["outputFormat"],
@@ -403908,6 +404208,13 @@ 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"],
@@ -404359,7 +404666,6 @@ registerUiCatalogFragment({
 //#endregion
 //#region src/tui/commands/resolve.ts
 const LEGACY_EFFORT_COMMANDS = new Set([
-	"model",
 	"automodel",
 	"router"
 ]);
@@ -416599,7 +416905,7 @@ const EFFORT_STAGE_LABELS = {
 	medium: "Deep",
 	high: "Forge",
 	xhigh: "Apex",
-	max: "Swarm"
+	max: "Max"
 };
 const EFFORT_DISPLAY_LABEL_KEYS = {
 	off: "effort.value.off",
@@ -416728,15 +417034,13 @@ var EffortSelectorComponent = class extends Container {
 		}
 		if (matchesKey(data, Key.alt("s")) && this.opts.onSessionOnlySelect !== void 0) {
 			const effort = this.selectedEffort;
-			if (effort === "max" && this.usesLegacyServerStageScale && this.opts.onBlunSwarmSelect !== void 0) this.opts.onBlunSwarmSelect();
-			else if (effort !== void 0) this.opts.onSessionOnlySelect(effort);
+			if (effort !== void 0) this.opts.onSessionOnlySelect(effort);
 			return;
 		}
 		if (matchesKey(data, Key.enter)) if (this.isBlunSwarmSelected) this.opts.onBlunSwarmSelect?.();
 		else {
 			const effort = this.selectedEffort;
-			if (effort === "max" && this.usesLegacyServerStageScale && this.opts.onBlunSwarmSelect !== void 0) this.opts.onBlunSwarmSelect();
-			else if (effort !== void 0) this.opts.onSelect(effort);
+			if (effort !== void 0) this.opts.onSelect(effort);
 		}
 	}
 	render(width) {
@@ -416766,9 +417070,6 @@ var EffortSelectorComponent = class extends Container {
 	get isBlunSwarmSelected() {
 		return this.hasSeparatedBlunSwarm && this.activeIndex === this.efforts.length;
 	}
-	get usesLegacyServerStageScale() {
-		return isServerStageScale(this.efforts);
-	}
 	get hasSeparatedBlunSwarm() {
 		return this.opts.onBlunSwarmSelect !== void 0 && !usesInlineStageScale(this.efforts);
 	}
@@ -417401,6 +417702,168 @@ 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() {
@@ -419762,7 +420225,7 @@ registerUiCatalogFragment({
 */
 var { projectUnaddressedTelegramContext } = createRequire(import.meta.url)("./bin/telegram-context-projection-policy.cjs");
 var { enqueueTelegramUrgent, rewriteTelegramUrgentEnvelope, telegramUrgentMessage } = createRequire(import.meta.url)("./bin/telegram-urgent-policy.cjs");
-var { createDirectFocusController, createDirectReplyTurnStop, enqueueTelegramDirect, readDirectFocusCheckpoint, rewriteTelegramDirectEnvelope, telegramDirectMessage, writeDirectFocusCheckpoint } = createRequire(import.meta.url)("./bin/telegram-direct-focus-policy.cjs");
+var { createDirectFocusController, createDirectReplyTurnStop, directMessageAllowsWorkContinuation, enqueueTelegramDirect, readDirectFocusCheckpoint, rewriteTelegramDirectEnvelope, telegramDirectMessage, writeDirectFocusCheckpoint } = createRequire(import.meta.url)("./bin/telegram-direct-focus-policy.cjs");
 var { enqueueTelegramAddressed } = createRequire(import.meta.url)("./bin/telegram-addressed-priority.cjs");
 var { enqueueTelegramBotPriority, telegramBotPriorityMessage } = createRequire(import.meta.url)("./bin/telegram-bot-priority.cjs");
 var { createAddressedChannelFocusStore } = createRequire(import.meta.url)("./bin/telegram-addressed-focus.cjs");
@@ -421206,6 +421669,47 @@ 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];
@@ -421237,7 +421741,7 @@ async function handleEffortCommand(host, args) {
 		}));
 		return;
 	}
-	await performEffortSelection(host, alias, arg, true);
+	await performEffortSelection(host, alias, arg, !isConfiguredFredrikGlmAlias(alias, model));
 }
 function showEffortPicker(host, model, segments) {
 	const liveEffort = host.state.appState.thinkingEffort;
@@ -421248,7 +421752,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, true));
+			host.restoreEditorAfter(() => performEffortSelection(host, alias, effort, !isConfiguredFredrikGlmAlias(alias, host.state.appState.availableModels[alias])));
 		},
 		onSessionOnlySelect: (effort) => {
 			host.restoreEditorAfter(() => performEffortSelection(host, alias, effort, false));
@@ -421433,7 +421937,7 @@ async function performEffortSelection(host, alias, effort, persist) {
 	host.setAppState({
 		thinkingEffort: effort,
 		modelFallbackAllowed: false,
-		swarmMode: false,
+		swarmMode: input.cliOptions.swarm === true,
 		swarmModeEntry: void 0
 	});
 	renderSwarmModeMarker(host, "inactive");
@@ -423409,7 +423913,6 @@ async function handleGoalCommand(host, args) {
 }
 const IDEA_CONTRACT_MARKER = "Work as a self-directing employee:";
 const IDEA_ALLOWED_CHANNELS = Object.freeze([]);
-const GOAL_TODO_REFRESH_WORK_CALL_LIMIT = 8;
 const GOAL_TODO_EVIDENCE_LIMIT = 8;
 const TODO_MAINTENANCE_RECOVERY_TOOL_NAMES = new Set([
 	"TodoList",
@@ -423435,6 +423938,22 @@ function ideaTodos(agent) {
 	const value = agent.tools.store?.["todo"];
 	return Array.isArray(value) ? value : [];
 }
+function goalTodoProgressState(agent) {
+	return agent.goalTodoPolicyState ??= {
+		workCallsSinceRefresh: 0,
+		refreshRequired: false,
+		unchangedRefreshStreak: 0,
+		evidenceRevision: 0,
+		lastMaintenanceEvidenceRevision: 0
+	};
+}
+function enforceTodoListBounds(agent, context) {
+	if (context.toolCall.name !== "TodoList" || !Array.isArray(context.args?.todos)) return;
+	return assessTodoListBounds({
+		currentTodos: ideaTodos(agent),
+		nextTodos: context.args.todos
+	});
+}
 function validInitialIdeaPlan(value) {
 	if (!Array.isArray(value) || value.length === 0) return false;
 	let active = 0;
@@ -423471,28 +423990,21 @@ function goalTodoEvidenceLabel(toolName, args, isError) {
 function recordGoalTodoEvidence(agent, toolName, args, isError) {
 	if (isIdeaGoal(agent) || agent.goal.getActiveGoal() === null) return;
 	const name = String(toolName ?? "");
-	const progress = agent.goalTodoPolicyState ??= {
-		workCallsSinceRefresh: 0,
-		refreshRequired: false
-	};
-	if (name === "TodoList") {
-		if (isError !== true) progress.recentEvidence = [];
-		return;
-	}
+	const progress = goalTodoProgressState(agent);
+	if (name === "TodoList") return;
 	if (name === "UpdateGoal" || TELEGRAM_DELIVERY_TOOL_RE.test(name)) return;
 	const recentEvidence = Array.isArray(progress.recentEvidence) ? progress.recentEvidence : [];
 	recentEvidence.push(goalTodoEvidenceLabel(name, args, isError));
 	progress.recentEvidence = recentEvidence.slice(-GOAL_TODO_EVIDENCE_LIMIT);
+	progress.evidenceRevision = (Number(progress.evidenceRevision) || 0) + 1;
 }
 function goalTodoMaintenanceMode(agent) {
 	if (isIdeaGoal(agent)) return null;
 	const todos = ideaTodos(agent);
 	if (todos.length === 0) return agent.goal.getActiveGoal() === null ? null : "initial";
-	const progress = agent.goalTodoPolicyState ??= {
-		workCallsSinceRefresh: 0,
-		refreshRequired: false
-	};
-	if (!progress.refreshRequired && progress.workCallsSinceRefresh < GOAL_TODO_REFRESH_WORK_CALL_LIMIT) return null;
+	const progress = goalTodoProgressState(agent);
+	const refreshWorkCallLimit = todoRefreshWorkCallLimit(progress.unchangedRefreshStreak);
+	if (!progress.refreshRequired && progress.workCallsSinceRefresh < refreshWorkCallLimit) return null;
 	progress.refreshRequired = true;
 	return "refresh";
 }
@@ -423506,8 +424018,9 @@ function goalTodoMaintenanceTools(eligibleTools, selectedTools) {
 }
 function buildGoalTodoMaintenanceSystemPrompt(agent, mode) {
 	const todos = ideaTodos(agent);
+	const requireConcreteProgress = mode === "refresh" && (agent.goalTodoPolicyState?.unchangedRefreshStreak ?? 0) >= 2;
 	const visibleTodoList = todos.length === 0 ? "The visible TodoList is empty." : ["Current visible TodoList:", ...todos.map((todo) => `- [${String(todo?.status ?? "pending")}] ${String(todo?.title ?? "").trim()}`)].join("\n");
-	const action = mode === "initial" ? "Create the visible task-specific TodoList now. Keep exactly one item in_progress and every later item pending." : "Update the visible TodoList now, before any more task work. Mark only evidenced steps done, keep the actual current step in_progress, and leave later steps pending. If the current title is stale, refine it to the concrete verified substep.";
+	const action = mode === "initial" ? "Create the visible task-specific TodoList now. Keep exactly one item in_progress and every later item pending." : requireConcreteProgress ? "Recent TodoList refreshes stayed semantically unchanged despite new work-tool evidence. Make a truthful concrete transition now: mark evidenced items done, refine the active title to the next verified substep, or record blocked, waiting_approval, or aborted when that is the real state. If the available evidence proves no boundary, preserve the list unchanged; the call remains executable." : "Update the visible TodoList now, before any more task work. Mark only evidenced steps done, keep the actual current step in_progress, and leave later steps pending. If the current title is stale, refine it to the concrete verified substep.";
 	return `<todo-maintenance>
 TODO MAINTENANCE IS THE ONLY ACTION FOR THIS STEP.
 ${action}
@@ -423519,11 +424032,12 @@ ${visibleTodoList}
 function buildGoalTodoMaintenanceMessages(agent, mode) {
 	const goal = agent.goal.getActiveGoal();
 	const todos = ideaTodos(agent);
+	const requireConcreteProgress = mode === "refresh" && (agent.goalTodoPolicyState?.unchangedRefreshStreak ?? 0) >= 2;
 	const recentEvidence = Array.isArray(agent.goalTodoPolicyState?.recentEvidence) ? agent.goalTodoPolicyState.recentEvidence.slice(-GOAL_TODO_EVIDENCE_LIMIT) : [];
 	const objective = String(goal?.objective ?? "Continue the current multi-step task.").trim();
 	const visibleTodoList = todos.length === 0 ? "The visible TodoList is empty." : ["Current visible TodoList:", ...todos.map((todo) => `- [${String(todo?.status ?? "pending")}] ${String(todo?.title ?? "").trim()}`)].join("\n");
 	const verifiedEvidence = recentEvidence.length === 0 ? "No new work-tool evidence is available." : ["Recent bounded work-tool evidence since the last accepted TodoList:", ...recentEvidence.map((entry) => `- ${entry}`)].join("\n");
-	const action = mode === "initial" ? "Create the task-specific TodoList from the active objective. Keep exactly one item in_progress and every later item pending." : "Refresh the TodoList from the current verified state. Mark finished work done, keep the actual current step in_progress, and leave later work pending. Completed items disappear automatically after this call.";
+	const action = mode === "initial" ? "Create the task-specific TodoList from the active objective. Keep exactly one item in_progress and every later item pending." : requireConcreteProgress ? "The recent refreshes stayed semantically unchanged despite new evidence. Make a truthful concrete transition now: finish evidenced items, refine the active title to the next verified substep, or use blocked, waiting_approval, or aborted when accurate. If no boundary is proven, preserve the list unchanged; never invent progress." : "Refresh the TodoList from the current verified state. Mark finished work done, keep the actual current step in_progress, and leave later work pending. Completed items disappear automatically after this call.";
 	const request = [
 		"Return exactly one TodoList tool call and no prose.",
 		action,
@@ -423542,10 +424056,7 @@ function enforceGoalTodoPolicy(agent, context) {
 	if (TELEGRAM_DELIVERY_TOOL_RE.test(String(context.toolCall.name ?? ""))) return;
 	const activeGoal = agent.goal.getActiveGoal();
 	const todos = ideaTodos(agent);
-	const progress = agent.goalTodoPolicyState ??= {
-		workCallsSinceRefresh: 0,
-		refreshRequired: false
-	};
+	const progress = goalTodoProgressState(agent);
 	if (todos.length === 0) {
 		const startsTrackedList = context.toolCall.name === "TodoList" && Array.isArray(context.args?.todos) && context.args.todos.length > 0;
 		if (activeGoal === null && !startsTrackedList) return;
@@ -423561,6 +424072,9 @@ function enforceGoalTodoPolicy(agent, context) {
 		};
 		progress.workCallsSinceRefresh = 0;
 		progress.refreshRequired = false;
+		progress.unchangedRefreshStreak = 0;
+		progress.recentEvidence = [];
+		progress.lastMaintenanceEvidenceRevision = Number(progress.evidenceRevision) || 0;
 		progress.allVisibleWorkCompleted = false;
 		return;
 	}
@@ -423584,9 +424098,26 @@ function enforceGoalTodoPolicy(agent, context) {
 				reason: "A maintained TodoList must keep exactly one item in_progress while unfinished work remains."
 			};
 		}
+		const evidenceRevision = Number(progress.evidenceRevision) || 0;
+		const lastMaintenanceEvidenceRevision = Number(progress.lastMaintenanceEvidenceRevision) || 0;
+		const maintenanceUpdate = assessTodoMaintenanceUpdate({
+			currentTodos: todos,
+			nextTodos,
+			unchangedRefreshStreak: progress.unchangedRefreshStreak,
+			recentEvidenceCount: evidenceRevision > lastMaintenanceEvidenceRevision ? (progress.recentEvidence?.length ?? 0) : 0
+		});
 		progress.allVisibleWorkCompleted = nextTodos.length > 0 && nextTodos.every((todo) => todo?.status === "done");
 		progress.workCallsSinceRefresh = 0;
 		progress.refreshRequired = false;
+		progress.unchangedRefreshStreak = maintenanceUpdate.unchangedRefreshStreak;
+		progress.lastMaintenanceEvidenceRevision = evidenceRevision;
+		if (!maintenanceUpdate.preserveRecentEvidence) progress.recentEvidence = [];
+		if (maintenanceUpdate.emitStalledWarning) agent.emitEvent({
+			type: "warning",
+			code: "todo-maintenance-stalled",
+			message: "TodoList stayed semantically unchanged across three evidence-bearing maintenance cycles. Work tools remain available; the next maintenance check is backed off while the active step is refined.",
+			blocked: false
+		});
 		return;
 	}
 	if (activeGoal !== null && context.toolCall.name === "UpdateGoal" && (context.args?.status === "complete" || context.args?.status === "blocked")) {
@@ -423602,7 +424133,7 @@ function enforceGoalTodoPolicy(agent, context) {
 	}
 	if (context.toolCall.id === context.toolCalls[0]?.id) {
 		progress.workCallsSinceRefresh += 1;
-		if (progress.workCallsSinceRefresh > GOAL_TODO_REFRESH_WORK_CALL_LIMIT) progress.refreshRequired = true;
+		if (progress.workCallsSinceRefresh > todoRefreshWorkCallLimit(progress.unchangedRefreshStreak)) progress.refreshRequired = true;
 	}
 	if (!progress.refreshRequired) return;
 	return {
@@ -496923,6 +497454,9 @@ 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;
@@ -503142,7 +503676,10 @@ function applyManagedAccountContext(models, maxContextTokens) {
 			maxContextSize: maxContextTokens
 		} }
 	};
-	return { [BLUN_KING_MODEL_ALIAS]: king };
+	return {
+		[BLUN_KING_MODEL_ALIAS]: king,
+		...configuredFredrikGlmModels(models)
+	};
 }
 function normalizeKingProductEffort(value) {
 	if (value === "none" || value === "minimal" || value === "off") return "low";
@@ -503198,7 +503735,11 @@ function nextManagedQuotaWarning(windows, highestShown) {
 //#region src/tui/controllers/auth-flow.ts
 function managedProviderOnly(providers) {
 	const managed = providers[DEFAULT_OAUTH_PROVIDER_NAME];
-	return managed === void 0 ? {} : { [DEFAULT_OAUTH_PROVIDER_NAME]: managed };
+	const fredrikGlm = configuredFredrikGlmProvider(providers);
+	return {
+		...managed === void 0 ? {} : { [DEFAULT_OAUTH_PROVIDER_NAME]: managed },
+		...fredrikGlm === void 0 ? {} : { [FREDRIK_GLM_PROVIDER_ID]: fredrikGlm }
+	};
 }
 var AuthFlowController = class {
 	host;
@@ -517611,6 +518152,8 @@ var BlunTUI = class {
 				yolo: startupInput.cliOptions.yolo,
 				auto: startupInput.cliOptions.auto,
 				plan: startupInput.cliOptions.plan,
+				effort: startupInput.cliOptions.effort,
+				swarm: startupInput.cliOptions.swarm,
 				model: startupInput.cliOptions.model,
 				startupNotice: startupInput.startupNotice
 			}
@@ -518027,6 +518570,7 @@ var BlunTUI = class {
 		const createSessionOptions = {
 			workDir,
 			model: BLUN_KING_MODEL_ALIAS,
+			thinking: startup.effort,
 			permission: startup.auto ? "auto" : startup.yolo ? "yolo" : void 0,
 			planMode: startup.plan ? true : void 0
 		};
@@ -518073,7 +518617,7 @@ var BlunTUI = class {
 					}
 				}
 			} else session = await this.harness.createSession(createSessionOptions);
-			if (session !== void 0 && shouldReplayHistory) await this.applyStartupModesToResumedSession(session);
+			if (session !== void 0 && (shouldReplayHistory || startup.effort !== void 0 || startup.swarm)) await this.applyStartupModesToResumedSession(session);
 		} catch (error) {
 			if (!isOAuthLoginRequiredError(error)) throw error;
 			this.authFlow.enterLoginRequiredStartupState();
@@ -518124,10 +518668,6 @@ 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) {
@@ -519164,10 +519704,6 @@ 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" });
@@ -519225,10 +519761,6 @@ var BlunTUI = class {
 		};
 		if (installedGuard !== void 0) this.pendingChannelReplyGuard = installedGuard;
 		const imagePart = channelImagePath !== void 0 ? buildChannelImagePart(channelImagePath) : void 0;
-		this.setAppState({
-			model: BLUN_KING_MODEL_ALIAS,
-			modelFallbackAllowed: false
-		});
 		const directNotice = channelDirect === true ? ["A private Telegram DM has priority over background, group, and loop work.", channelDirectResume === true ? "The user explicitly resumed work. Answer any remaining direct content, then continue the exact saved work checkpoint." : "The runtime saved the active work checkpoint. Answer the private conversation naturally, without exposing internal task, cron, checkpoint, queue, or lane narration. Unless the user explicitly asks to pause, stop, or wait, continue the exact saved work checkpoint automatically after the direct conversation."].join("\n") : void 0;
 		const focusedModelInput = directNotice === void 0 ? modelInput : `${directNotice}\n\n${modelInput}`;
 		const promptInput = imagePart !== void 0 && this.canReadImages() ? [{
@@ -519429,10 +519961,6 @@ 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) => {
@@ -519703,10 +520231,6 @@ 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);
@@ -519821,18 +520345,19 @@ 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: BLUN_KING_MODEL_ALIAS } : {},
-			..."activeResponderModel" in patch && patch.activeResponderModel != null ? { activeResponderModel: BLUN_KING_MODEL_ALIAS } : {}
+			..."model" in patch && patch.model?.trim().length ? { model: allowedModel(patch.model) } : {},
+			..."activeResponderModel" in patch && patch.activeResponderModel != null ? { activeResponderModel: allowedModel(patch.activeResponderModel) } : {}
 		};
 		if ("availableModels" in patch || "managedAccountContextTokens" in patch) {
-			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 = {
+			if (availableModels !== patch.availableModels) effectivePatch = {
 				...effectivePatch,
-				availableModels: effectiveModels
+				availableModels
 			};
 		}
 		if (!hasPatchChanges(this.state.appState, effectivePatch)) return;
@@ -519909,7 +520434,11 @@ var BlunTUI = class {
 		return this.harness.createSession(options);
 	}
 	async setSession(session, options = {}) {
-		await session.setModel(BLUN_KING_MODEL_ALIAS, { allowFallback: false });
+		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 this.personalMemoryController.clear(this.session);
 		const previous = this.unloadCurrentSession(approvalCancellationFeedback("switching_session"));
 		await this.managedQuotaWarningPersistence;
@@ -519917,10 +520446,7 @@ var BlunTUI = class {
 		resetChannelPreambleState(this.channelPreamble);
 		this.session = session;
 		this.managedQuotaWarningController.restore(session.id, managedQuotaWarningThresholdFromMetadata(session.getResumeState()?.sessionMetadata?.custom));
-		this.setAppState({
-			model: BLUN_KING_MODEL_ALIAS,
-			modelFallbackAllowed: false
-		});
+		this.setAppState({ modelFallbackAllowed: false });
 		this.harness.setTelemetryContext({ sessionId: session.id });
 		this.registerSessionHandlers(session);
 		this.syncAdditionalDirs(session);
@@ -519932,7 +520458,7 @@ var BlunTUI = class {
 		const [status, goalResult, loopResult] = await Promise.all([session.getStatus(), session.getGoal(), session.getLoop()]);
 		this.setAppState({
 			sessionId: session.id,
-			model: BLUN_KING_MODEL_ALIAS,
+			model: status.model ?? BLUN_KING_MODEL_ALIAS,
 			modelFallbackAllowed: false,
 			activeResponderModel: null,
 			thinkingEffort: status.thinkingEffort,
@@ -519966,6 +520492,8 @@ var BlunTUI = class {
 		const { startup } = this.options;
 		if (startup.auto) await session.setPermission("auto");
 		else if (startup.yolo) await session.setPermission("yolo");
+		if (startup.effort !== void 0) await session.setThinking(startup.effort);
+		if (startup.swarm && !(await session.getStatus()).swarmMode) await session.setSwarmMode(true, "effort");
 		if (startup.plan) {
 			if (!(await session.getStatus()).planMode) await session.setPlanMode(true);
 		}
@@ -519974,6 +520502,8 @@ var BlunTUI = class {
 		const { startup } = this.options;
 		if (startup.auto) this.setAppState({ permissionMode: "auto" });
 		else if (startup.yolo) this.setAppState({ permissionMode: "yolo" });
+		if (startup.effort !== void 0) this.setAppState({ thinkingEffort: startup.effort });
+		if (startup.swarm) this.setAppState({ swarmMode: true, swarmModeEntry: "effort" });
 		if (startup.plan) this.setAppState({ planMode: true });
 	}
 	async activateRuntime() {
@@ -520148,7 +520678,6 @@ 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);