kfc-code-cli 0.0.1-alpha.11 → 0.0.1-alpha.13

package/dist/main.mjs

@@ -1026,14 +1026,7 @@ var BaseContextState = class {
 		this.journalWriter = opts.journalWriter;
 		this.projector = opts.projector ?? new DefaultConversationProjector();
 		this.currentTurnId = opts.currentTurnId;
-		this.memory = new ContextStateMemory({
-			initialModel: opts.initialModel,
-			...opts.initialSystemPrompt !== void 0 ? { initialSystemPrompt: opts.initialSystemPrompt } : {},
-			...opts.initialActiveTools !== void 0 ? { initialActiveTools: opts.initialActiveTools } : {},
-			initialHistory: opts.initialHistory,
-			...opts.initialTokenCount !== void 0 ? { initialTokenCount: opts.initialTokenCount } : {},
-			...opts.initialThinkingLevel !== void 0 ? { initialThinkingLevel: opts.initialThinkingLevel } : {}
-		});
+		this.memory = new ContextStateMemory(opts);
 	}
 	get model() {
 		return this.memory.model;
@@ -1061,8 +1054,12 @@ var BaseContextState = class {
 			activeTools: this.memory.activeTools
 		});
 	}
-	drainSteerMessages() {
-		return this.memory.drainSteerMessages();
+	async applySteerMessages() {
+		const steers = this.memory.drainSteerMessages();
+		if (steers.length === 0) return false;
+		this.assertNotBroken();
+		for (const steer of steers) await this.appendUserMessage(steer);
+		return true;
 	}
 	pushSteer(input) {
 		this.memory.pushSteer(input);
@@ -1109,10 +1106,6 @@ var BaseContextState = class {
 		await this.journalWriter.append(buildToolCallRecord(input, data));
 		this.memory.appendOpenStepToolCall(input.stepUuid, toolCallDataToKosongToolCall(input.data));
 	}
-	async addUserMessages(steers) {
-		this.assertNotBroken();
-		for (const steer of steers) await this.appendUserMessage(steer);
-	}
 	async appendNotification(data) {
 		this.assertNotBroken();
 		await this.journalWriter.append(buildNotificationRecord(data));
@@ -1160,32 +1153,13 @@ var BaseContextState = class {
 		this.memory.resetToSummary(summary);
 	}
 };
-var WiredContextState = class extends BaseContextState {
-	constructor(opts) {
-		super({
-			journalWriter: opts.journalWriter,
-			initialModel: opts.initialModel,
-			...opts.initialSystemPrompt !== void 0 ? { initialSystemPrompt: opts.initialSystemPrompt } : {},
-			...opts.initialActiveTools !== void 0 ? { initialActiveTools: opts.initialActiveTools } : {},
-			currentTurnId: opts.currentTurnId,
-			projector: opts.projector,
-			initialHistory: opts.initialHistory,
-			...opts.initialTokenCount !== void 0 ? { initialTokenCount: opts.initialTokenCount } : {},
-			...opts.initialThinkingLevel !== void 0 ? { initialThinkingLevel: opts.initialThinkingLevel } : {}
-		});
-	}
-};
+var WiredContextState = class extends BaseContextState {};
 var InMemoryContextState = class extends BaseContextState {
 	constructor(opts) {
 		super({
-			journalWriter: new NoopJournalWriter(),
-			initialModel: opts.initialModel,
-			...opts.initialSystemPrompt !== void 0 ? { initialSystemPrompt: opts.initialSystemPrompt } : {},
-			...opts.initialActiveTools !== void 0 ? { initialActiveTools: opts.initialActiveTools } : {},
+			...opts,
 			currentTurnId: opts.currentTurnId ?? (() => "embedded"),
-			projector: opts.projector,
-			initialHistory: opts.initialHistory,
-			...opts.initialThinkingLevel !== void 0 ? { initialThinkingLevel: opts.initialThinkingLevel } : {}
+			journalWriter: new NoopJournalWriter()
 		});
 	}
 };
@@ -2226,6 +2200,7 @@ function zodToSchema(schema) {
 	}
 }
 function buildLLMVisibleTools(tools, activeTools) {
+	if (tools === void 0) return [];
 	return (activeTools === void 0 ? tools : tools.filter((t) => activeTools.includes(t.name))).map((t) => ({
 		name: t.name,
 		description: t.description,
@@ -2558,7 +2533,7 @@ async function executePendingCalls(step, pending, deferred) {
 	for (const callback of postContentCallbacks) await callback();
 }
 function findTool(tools, name) {
-	return tools.find((tool) => tool.name === name);
+	return tools?.find((tool) => tool.name === name);
 }
 function emitToolResultEvent(emit, toolCallId, output, isError) {
 	emit({
@@ -2640,10 +2615,7 @@ async function executeSoulStep(deps) {
 		type: "step.begin",
 		step: currentStep
 	});
-	const drained = context.drainSteerMessages();
-	if (drained.length > 0) await context.addUserMessages(drained);
 	signal.throwIfAborted();
-	context.beforeStep?.();
 	const model = overrides?.model ?? context.model;
 	const visibleTools = buildLLMVisibleTools(config.tools, overrides?.activeTools);
 	const messages = context.buildMessages();
@@ -2763,7 +2735,7 @@ async function runSoulTurn(config, context, runtime, sink, signal, overrides) {
 			});
 			if (stepResult.stopReason === "tool_use") continue;
 			stopReason = stepResult.stopReason;
-			break;
+			if (!(await config.beforeTurnCompletes?.())?.continue) break;
 		}
 	} catch (error) {
 		if (isAbortError$3(error) || signal.aborted) {
@@ -3253,6 +3225,25 @@ var SoulRegistry = class {
 	}
 };
 //#endregion
+//#region ../../packages/kimi-core/src/soul/types.ts
+function mergeSoulConfig(target, source) {
+	if (source.tools) target.tools = target.tools ? [...target.tools, ...source.tools] : source.tools;
+	if (source.maxSteps !== void 0) target.maxSteps = source.maxSteps;
+	if (source.beforeToolCall) target.beforeToolCall = mergeCallback(target.beforeToolCall, source.beforeToolCall);
+	if (source.afterToolCall) target.afterToolCall = mergeCallback(target.afterToolCall, source.afterToolCall);
+	if (source.beforeStep) target.beforeStep = mergeCallback(target.beforeStep, source.beforeStep);
+	if (source.afterStep) target.afterStep = mergeCallback(target.afterStep, source.afterStep);
+	if (source.compactionConfig !== void 0) target.compactionConfig = source.compactionConfig;
+	if (source.contextWindow !== void 0) target.contextWindow = source.contextWindow;
+	function mergeCallback(f1, f2) {
+		if (!f1) return f2;
+		if (!f2) return f1;
+		return (async (...args) => {
+			return await f1(...args) ?? await f2(...args);
+		});
+	}
+}
+//#endregion
 //#region ../../packages/kimi-core/src/soul-plus/subagent/git-context.ts
 /**
 * Git context collection for explore subagents.
@@ -3476,7 +3467,7 @@ async function runSubagentTurn(deps, agentId, request, signal) {
 				agent_id: agentId,
 				agent_name: request.agentName,
 				parent_tool_call_id: request.parentToolCallId,
-				...request.parentToolCallUuid !== void 0 ? { parent_tool_call_uuid: request.parentToolCallUuid } : {},
+				parent_tool_call_uuid: request.parentToolCallUuid,
 				...request.parentAgentId !== void 0 && request.parentAgentId !== "" && request.parentAgentId !== "agent_main" ? { parent_agent_id: request.parentAgentId } : {},
 				run_in_background: request.runInBackground ?? false
 			}
@@ -3782,9 +3773,9 @@ var ContextStateToolTranscriptRecorder = class {
 				tool_call_id: input.toolCall.id,
 				tool_name: input.toolCall.name,
 				args: input.args,
-				...input.display?.activityDescription !== void 0 ? { activity_description: input.display.activityDescription } : {},
-				...input.display?.userFacingName !== void 0 ? { user_facing_name: input.display.userFacingName } : {},
-				...input.display?.inputDisplay !== void 0 ? { input_display: input.display.inputDisplay } : {}
+				activity_description: input.display?.activityDescription,
+				user_facing_name: input.display?.userFacingName,
+				input_display: input.display?.inputDisplay
 			}
 		});
 		return { wireUuid };
@@ -4455,7 +4446,7 @@ var DefaultToolCallUseCase = class {
 			approvalRuntime: this.deps.policy.approvalRuntime,
 			approvalSource,
 			turnId: context.turnId,
-			...context.approvalTimeoutMs !== void 0 ? { approvalTimeoutMs: context.approvalTimeoutMs } : {}
+			approvalTimeoutMs: context.approvalTimeoutMs
 		});
 		return async (btcCtx, signal) => {
 			const hookResult = await this.deps.policy.hookEngine.executeHooks("PreToolUse", {
@@ -4543,7 +4534,7 @@ function approvalSourceForActor(context) {
 	if (context.actor.kind === "subagent") return {
 		kind: "subagent",
 		agent_id: context.actor.agentId,
-		...context.actor.subagentType !== void 0 ? { subagent_type: context.actor.subagentType } : {}
+		subagent_type: context.actor.subagentType
 	};
 	return {
 		kind: "soul",
@@ -5617,7 +5608,7 @@ async function requestEnterPlanModeApproval(approvalRuntime, turnState, toolCall
 			detail: reason
 		},
 		source: approvalSourceForPlanMode(turnState),
-		...turnState.getCurrentTurnId() !== void 0 ? { turnId: turnState.getCurrentTurnId() } : {}
+		turnId: turnState.getCurrentTurnId()
 	}, signal);
 	return {
 		approved: response.approved,
@@ -7440,6 +7431,15 @@ function mergeInPlace(target, source) {
 	}
 	return false;
 }
+/**
+* Extract the concatenated text from a message's content parts.
+*
+* @param message The message to extract text from.
+* @param sep Separator between text parts. Defaults to empty string.
+*/
+function extractText(message, sep = "") {
+	return message.content.filter((part) => part.type === "text").map((part) => part.text).join(sep);
+}
 //#endregion
 //#region ../../packages/kosong/src/capability.ts
 /**
@@ -7447,7 +7447,7 @@ function mergeInPlace(target, source) {
 * given model. Frozen so accidental mutation at one call site cannot leak
 * into another.
 */
-const UNKNOWN_CAPABILITY$1 = Object.freeze({
+const UNKNOWN_CAPABILITY = Object.freeze({
 	image_in: false,
 	video_in: false,
 	audio_in: false,
@@ -7460,16 +7460,47 @@ const UNKNOWN_CAPABILITY$1 = Object.freeze({
 /**
 * Base error for all chat provider errors.
 */
-var ChatProviderError$1 = class extends Error {
+var ChatProviderError = class extends Error {
 	constructor(message) {
 		super(message);
 		this.name = "ChatProviderError";
 	}
 };
 /**
+* Network-level connection failure.
+*/
+var APIConnectionError$3 = class extends ChatProviderError {
+	constructor(message) {
+		super(message);
+		this.name = "APIConnectionError";
+	}
+};
+/**
+* Request timed out.
+*/
+var APITimeoutError = class extends ChatProviderError {
+	constructor(message) {
+		super(message);
+		this.name = "APITimeoutError";
+	}
+};
+/**
+* HTTP status error from the API.
+*/
+var APIStatusError = class extends ChatProviderError {
+	statusCode;
+	requestId;
+	constructor(statusCode, message, requestId) {
+		super(message);
+		this.name = "APIStatusError";
+		this.statusCode = statusCode;
+		this.requestId = requestId ?? null;
+	}
+};
+/**
 * The API returned an empty response (no content, no tool calls).
 */
-var APIEmptyResponseError = class extends ChatProviderError$1 {
+var APIEmptyResponseError = class extends ChatProviderError {
 	constructor(message) {
 		super(message);
 		this.name = "APIEmptyResponseError";
@@ -13462,7 +13493,7 @@ var APIError$2 = class APIError$2 extends OpenAIError {
 		return "(no status code or body)";
 	}
 	static generate(status, errorResponse, message, headers) {
-		if (!status || !headers) return new APIConnectionError$3({
+		if (!status || !headers) return new APIConnectionError$2({
 			message,
 			cause: castToError$2(errorResponse)
 		});
@@ -13483,13 +13514,13 @@ var APIUserAbortError$2 = class extends APIError$2 {
 		super(void 0, void 0, message || "Request was aborted.", void 0);
 	}
 };
-var APIConnectionError$3 = class extends APIError$2 {
+var APIConnectionError$2 = class extends APIError$2 {
 	constructor({ message, cause }) {
 		super(void 0, void 0, message || "Connection error.", void 0);
 		if (cause) this.cause = cause;
 	}
 };
-var APIConnectionTimeoutError$2 = class extends APIConnectionError$3 {
+var APIConnectionTimeoutError$2 = class extends APIConnectionError$2 {
 	constructor({ message } = {}) {
 		super({ message: message ?? "Request timed out." });
 	}
@@ -19915,7 +19946,7 @@ var OpenAI = class {
 			}));
 			if (response instanceof OAuthError$1 || response instanceof SubjectTokenProviderError) throw response;
 			if (isTimeout) throw new APIConnectionTimeoutError$2();
-			throw new APIConnectionError$3({ cause: response });
+			throw new APIConnectionError$2({ cause: response });
 		}
 		const responseInfo = `[${requestLogID}${retryLogStr}${[...response.headers.entries()].filter(([name]) => name === "x-request-id").map(([name, value]) => ", " + name + ": " + JSON.stringify(value)).join("")}] ${req.method} ${url} ${response.ok ? "succeeded" : "failed"} with status ${response.status} in ${headersTime - startTime}ms`;
 		if (!response.ok) {
@@ -20155,7 +20186,7 @@ OpenAI.OpenAI = _a$3;
 OpenAI.DEFAULT_TIMEOUT = 6e5;
 OpenAI.OpenAIError = OpenAIError;
 OpenAI.APIError = APIError$2;
-OpenAI.APIConnectionError = APIConnectionError$3;
+OpenAI.APIConnectionError = APIConnectionError$2;
 OpenAI.APIConnectionTimeoutError = APIConnectionTimeoutError$2;
 OpenAI.APIUserAbortError = APIUserAbortError$2;
 OpenAI.NotFoundError = NotFoundError$2;
@@ -20191,6 +20222,187 @@ OpenAI.Containers = Containers;
 OpenAI.Skills = Skills$1;
 OpenAI.Videos = Videos;
 //#endregion
+//#region ../../packages/kosong/src/providers/openai-common.ts
+/**
+* Convert a kosong `ContentPart` to OpenAI-compatible content part.
+* Returns `null` for think parts (handled separately as reasoning_content).
+*/
+function convertContentPart(part) {
+	switch (part.type) {
+		case "text": return {
+			type: "text",
+			text: part.text
+		};
+		case "think": return null;
+		case "image_url": return {
+			type: "image_url",
+			image_url: part.imageUrl.id === void 0 ? { url: part.imageUrl.url } : {
+				url: part.imageUrl.url,
+				id: part.imageUrl.id
+			}
+		};
+		case "audio_url": return {
+			type: "audio_url",
+			audio_url: part.audioUrl.id === void 0 ? { url: part.audioUrl.url } : {
+				url: part.audioUrl.url,
+				id: part.audioUrl.id
+			}
+		};
+		case "video_url": return {
+			type: "video_url",
+			video_url: part.videoUrl.id === void 0 ? { url: part.videoUrl.url } : {
+				url: part.videoUrl.url,
+				id: part.videoUrl.id
+			}
+		};
+		default: throw new Error(`Unknown content part type: ${part.type}`);
+	}
+}
+/**
+* Convert a kosong `Tool` to OpenAI tool format.
+*/
+function toolToOpenAI(tool) {
+	return {
+		type: "function",
+		function: {
+			name: tool.name,
+			description: tool.description,
+			parameters: tool.parameters
+		}
+	};
+}
+const NETWORK_RE$1 = /network|connection|connect|disconnect/i;
+const TIMEOUT_RE$1 = /timed?\s*out|timeout|deadline/i;
+function classifyBaseApiError(message) {
+	if (TIMEOUT_RE$1.test(message)) return new APITimeoutError(message);
+	if (NETWORK_RE$1.test(message)) return new APIConnectionError$3(message);
+	return new ChatProviderError(`Error: ${message}`);
+}
+/**
+* Convert an OpenAI SDK error (or raw Error) to a kosong `ChatProviderError`.
+*/
+function convertOpenAIError(error) {
+	if (error instanceof APIConnectionTimeoutError$2) return new APITimeoutError(error.message);
+	if (error instanceof APIConnectionError$2) return new APIConnectionError$3(error.message);
+	if (error instanceof APIError$2 && typeof error.status === "number") {
+		const reqId = error.requestID ?? null;
+		return new APIStatusError(error.status, error.message, reqId);
+	}
+	if (error instanceof APIError$2 && error.constructor === APIError$2 && error.error === void 0) return classifyBaseApiError(error.message);
+	if (error instanceof OpenAIError) return new ChatProviderError(`Error: ${error.message}`);
+	if (error instanceof Error) return new ChatProviderError(`Error: ${error.message}`);
+	return new ChatProviderError(`Error: ${String(error)}`);
+}
+/**
+* Type guard: narrow a tool call union to the function-type variant.
+* Works with OpenAI SDK's `ChatCompletionMessageToolCall` as well as
+* any object carrying `{ type: string }`.
+*/
+function isFunctionToolCall(tc) {
+	return tc.type === "function";
+}
+/**
+* Map kosong `ThinkingEffort` to OpenAI `reasoning_effort` string.
+*/
+function thinkingEffortToReasoningEffort(effort) {
+	switch (effort) {
+		case "off": return;
+		case "low": return "low";
+		case "medium": return "medium";
+		case "high": return "high";
+		default: throw new Error(`Unknown thinking effort: ${String(effort)}`);
+	}
+}
+/**
+* Map OpenAI `reasoning_effort` string back to kosong `ThinkingEffort`.
+*/
+function reasoningEffortToThinkingEffort(reasoning) {
+	if (reasoning === void 0 || reasoning === null) return null;
+	switch (reasoning) {
+		case "low":
+		case "minimal": return "low";
+		case "medium": return "medium";
+		case "high":
+		case "xhigh": return "high";
+		case "none": return "off";
+		default: return "off";
+	}
+}
+/**
+* Extract `TokenUsage` from an OpenAI-compatible usage object.
+*/
+function extractUsage(usage) {
+	if (usage === null || usage === void 0 || typeof usage !== "object") return null;
+	const u = usage;
+	const promptTokens = typeof u["prompt_tokens"] === "number" ? u["prompt_tokens"] : 0;
+	const completionTokens = typeof u["completion_tokens"] === "number" ? u["completion_tokens"] : 0;
+	let cached = 0;
+	if (typeof u["cached_tokens"] === "number") cached = u["cached_tokens"];
+	else if (typeof u["prompt_tokens_details"] === "object" && u["prompt_tokens_details"] !== null) {
+		const details = u["prompt_tokens_details"];
+		if (typeof details["cached_tokens"] === "number") cached = details["cached_tokens"];
+	}
+	return {
+		inputOther: promptTokens - cached,
+		output: completionTokens,
+		inputCacheRead: cached,
+		inputCacheCreation: 0
+	};
+}
+/**
+* Normalize an OpenAI Chat Completions–style `finish_reason` string to the
+* unified {@link FinishReason} enum.
+*
+* Used by both the Kimi and OpenAI Legacy adapters because they share the
+* Chat Completions wire format. Returns `{ finishReason: null,
+* rawFinishReason: null }` when the upstream value is missing or `null` so
+* callers can treat "no signal" uniformly.
+*
+* Mapping:
+* - `'stop'` → `'completed'`
+* - `'tool_calls'` → `'tool_calls'`
+* - `'function_call'` → `'tool_calls'` (legacy alias)
+* - `'length'` → `'truncated'`
+* - `'content_filter'` → `'filtered'`
+* - any other non-null string → `'other'`
+*/
+function normalizeOpenAIFinishReason(raw) {
+	if (raw === null || raw === void 0) return {
+		finishReason: null,
+		rawFinishReason: null
+	};
+	switch (raw) {
+		case "stop": return {
+			finishReason: "completed",
+			rawFinishReason: raw
+		};
+		case "tool_calls":
+		case "function_call": return {
+			finishReason: "tool_calls",
+			rawFinishReason: raw
+		};
+		case "length": return {
+			finishReason: "truncated",
+			rawFinishReason: raw
+		};
+		case "content_filter": return {
+			finishReason: "filtered",
+			rawFinishReason: raw
+		};
+		default: return {
+			finishReason: "other",
+			rawFinishReason: raw
+		};
+	}
+}
+/**
+* Convert tool-role message content according to the chosen strategy.
+*/
+function convertToolMessageContent(message, conversion) {
+	if (conversion === "extract_text") return extractText(message);
+	return message.content.map((p) => convertContentPart(p)).filter((p) => p !== null);
+}
+//#endregion
 //#region ../../packages/kimi-core/src/hooks/execution-pipeline.ts
 const ALLOW = Object.freeze({
 	blockAction: false,
@@ -20560,7 +20772,7 @@ var TurnManager = class {
 		if (!this.deps.lifecycleStateMachine.isIdle() || this.getCurrentTurnId() !== void 0) return { error: "agent_busy" };
 		const input = req.data.input;
 		const capability = ((this.runtimeSlot?.current())?.runtime ?? this.runtime).kosong.getCapability?.(this.deps.contextState.model);
-		if (capability !== void 0 && capability !== UNKNOWN_CAPABILITY$1) {
+		if (capability !== void 0 && capability !== UNKNOWN_CAPABILITY) {
 			let inputContainsImage = false;
 			let inputContainsVideo = false;
 			for (const part of input.parts ?? []) if (part.type === "image_url") inputContainsImage = true;
@@ -20699,7 +20911,15 @@ var TurnManager = class {
 			kind: "soul",
 			agent_id: this.agentId
 		};
-		let soulConfig;
+		const soulConfig = {
+			beforeStep: async () => {
+				await this.deps.contextState.applySteerMessages();
+				this.deps.contextState.beforeStep?.();
+			},
+			beforeTurnCompletes: async () => {
+				return { continue: await this.deps.contextState.applySteerMessages() };
+			}
+		};
 		const scope = this.deps.toolExecutionScopeFactory?.create({
 			sessionId: this.sessionId,
 			agentId: this.agentId,
@@ -20711,27 +20931,20 @@ var TurnManager = class {
 		const runtimeForTurn = scope?.wrapRuntime(baseRuntime) ?? baseRuntime;
 		if (scope !== void 0) {
 			this.activeToolExecutionScope = scope;
-			const scoped = scope.buildSoulConfig({
+			mergeSoulConfig(soulConfig, scope.buildSoulConfig({
 				tools: this.deps.tools,
 				turnId,
 				permissionRules: () => mergeTurnRules(this.sessionRules, turnOverrides),
 				permissionMode: () => this.permissionMode,
 				approvalSource
-			});
-			soulConfig = {
-				tools: [...scoped.tools],
-				beforeToolCall: scoped.beforeToolCall,
-				afterToolCall: scoped.afterToolCall
-			};
-		} else soulConfig = { tools: [...this.deps.tools] };
+			}));
+		} else mergeSoulConfig(soulConfig, { tools: this.deps.tools });
 		const compactionConfig = this.runtimeSlot !== void 0 ? runtimeBundle?.compactionConfig : this.compactionConfig;
-		if (compactionConfig !== void 0) soulConfig = {
-			...soulConfig,
+		if (compactionConfig !== void 0) mergeSoulConfig(soulConfig, {
 			compactionConfig,
 			contextWindow: compactionConfig.maxContextSize
-		};
-		if (this.deps.hookEngine !== void 0) soulConfig = {
-			...soulConfig,
+		});
+		if (this.deps.hookEngine !== void 0) mergeSoulConfig(soulConfig, {
 			beforeStep: async (ctx, signal) => {
 				const result = await this.executionHooks.run({
 					event: "PreStep",
@@ -20755,7 +20968,7 @@ var TurnManager = class {
 					stopReason: ctx.stopReason
 				}, signal);
 			}
-		};
+		});
 		const runPromise = this.runTurn(turnId, soulConfig, runtimeForTurn, controller.signal);
 		runPromise.catch(() => {});
 		this.deps.lifecycle.registerTurn(turnId, controller, runPromise);
@@ -24250,7 +24463,7 @@ var EditTool = class {
 };
 //#endregion
 //#region ../../packages/kimi-core/src/tools/builtin/shell/bash.ts
-const DEFAULT_TIMEOUT_MS$1 = 6e4;
+const DEFAULT_TIMEOUT_MS$2 = 6e4;
 const MAX_TIMEOUT_MS = 300 * 1e3;
 const MAX_BACKGROUND_TIMEOUT_MS = 1440 * 60 * 1e3;
 const SIGTERM_GRACE_MS$1 = 5e3;
@@ -24264,7 +24477,7 @@ If \`run_in_background=true\`, the command will be started as a background task
 
 **Guidelines for safety and security:**
 - Each shell tool call will be executed in a fresh shell environment. The shell variables, current working directory changes, and the shell history is not preserved between calls.
-- The tool call will return after the command is finished. You shall not use this tool to execute an interactive command or a command that may run forever. For possibly long-running commands, set the \`timeout\` argument in milliseconds. The default is ${String(DEFAULT_TIMEOUT_MS$1)}ms; foreground commands allow up to ${String(MAX_TIMEOUT_MS)}ms, and background commands allow up to ${String(MAX_BACKGROUND_TIMEOUT_MS)}ms.
+- The tool call will return after the command is finished. You shall not use this tool to execute an interactive command or a command that may run forever. For possibly long-running commands, set the \`timeout\` argument in milliseconds. The default is ${String(DEFAULT_TIMEOUT_MS$2)}ms; foreground commands allow up to ${String(MAX_TIMEOUT_MS)}ms, and background commands allow up to ${String(MAX_BACKGROUND_TIMEOUT_MS)}ms.
 - Avoid using \`..\` to access files or directories outside of the working directory.
 - Avoid modifying files outside of the working directory unless explicitly instructed to do so.
 - Never run commands that require superuser privileges unless explicitly instructed to do so.
@@ -24287,7 +24500,7 @@ If \`run_in_background=true\`, the command will be started as a background task
 
 **Guidelines for safety and security:**
 - Every tool call starts a fresh PowerShell session. Environment variables, \`cd\` changes, and command history do not persist between calls.
-- Do not launch interactive programs or anything that is expected to block indefinitely; ensure each command finishes promptly. Provide a \`timeout\` argument in milliseconds for potentially long runs. The default is ${String(DEFAULT_TIMEOUT_MS$1)}ms; foreground commands allow up to ${String(MAX_TIMEOUT_MS)}ms, and background commands allow up to ${String(MAX_BACKGROUND_TIMEOUT_MS)}ms.
+- Do not launch interactive programs or anything that is expected to block indefinitely; ensure each command finishes promptly. Provide a \`timeout\` argument in milliseconds for potentially long runs. The default is ${String(DEFAULT_TIMEOUT_MS$2)}ms; foreground commands allow up to ${String(MAX_TIMEOUT_MS)}ms, and background commands allow up to ${String(MAX_BACKGROUND_TIMEOUT_MS)}ms.
 - Avoid using \`..\` to leave the working directory, and never touch files outside that directory unless explicitly instructed.
 - Never attempt commands that require elevated (Administrator) privileges unless explicitly authorized.
 
@@ -24394,7 +24607,7 @@ var ShellTool = class {
 			};
 			return this.executeInBackground(args);
 		}
-		const timeoutMs = Math.min(args.timeout !== void 0 ? args.timeout : DEFAULT_TIMEOUT_MS$1, MAX_TIMEOUT_MS);
+		const timeoutMs = Math.min(args.timeout !== void 0 ? args.timeout : DEFAULT_TIMEOUT_MS$2, MAX_TIMEOUT_MS);
 		let proc;
 		try {
 			const effectiveCwd = args.cwd ?? this.cwd;
@@ -24497,7 +24710,7 @@ var ShellTool = class {
 			isError: true,
 			content: "description is required when run_in_background is true."
 		};
-		const timeoutMs = Math.min(args.timeout !== void 0 ? args.timeout : DEFAULT_TIMEOUT_MS$1, MAX_BACKGROUND_TIMEOUT_MS);
+		const timeoutMs = Math.min(args.timeout !== void 0 ? args.timeout : DEFAULT_TIMEOUT_MS$2, MAX_BACKGROUND_TIMEOUT_MS);
 		let proc;
 		try {
 			const effectiveCwd = args.cwd ?? this.cwd;
@@ -28911,7 +29124,7 @@ Error: ${cause instanceof Error ? cause.message : typeof cause === "string" ? ca
 }
 //#endregion
 //#region ../../packages/kimi-core/src/tools/builtin/file/grep.ts
-const DEFAULT_TIMEOUT_MS = 2e4;
+const DEFAULT_TIMEOUT_MS$1 = 2e4;
 const SIGTERM_GRACE_MS = 5e3;
 const MAX_OUTPUT_BYTES = 10 * 1024 * 1024;
 const CONTENT_LINE_RE = /^(.*?)([:-])(\d+)\2/;
@@ -28997,7 +29210,7 @@ var GrepTool = class {
 		const timeoutHandle = setTimeout(() => {
 			timedOut = true;
 			killProc();
-		}, DEFAULT_TIMEOUT_MS);
+		}, DEFAULT_TIMEOUT_MS$1);
 		let exitCode = 0;
 		let stdoutText = "";
 		let stderrText = "";
@@ -29050,7 +29263,7 @@ var GrepTool = class {
 			messages.push(`Results truncated to ${String(headLimit ?? 0)} lines (total: ${String(total)}). Use offset=${String(nextOffset)} to see more.`);
 		}
 		if (bufferTruncated) messages.push(`[stdout truncated at ${String(MAX_OUTPUT_BYTES)} bytes]`);
-		if (timedOut) messages.push(`Grep timed out after ${String(DEFAULT_TIMEOUT_MS / 1e3)}s; partial results`);
+		if (timedOut) messages.push(`Grep timed out after ${String(DEFAULT_TIMEOUT_MS$1 / 1e3)}s; partial results`);
 		const contentBody = limited.join("\n");
 		const combined = messages.length > 0 ? contentBody === "" ? messages.join("\n") : `${contentBody}\n${messages.join("\n")}` : contentBody;
 		if (mode === "files_with_matches") return {
@@ -30662,12 +30875,12 @@ var DefaultSessionApplicationService = class {
 			workspaceDir: this.deps.workspaceDir,
 			compactionProvider,
 			compactionConfig,
-			...this.deps.approvalRuntime !== void 0 ? { approvalRuntime: this.deps.approvalRuntime } : {},
-			...this.deps.approvalRuntimeFactory !== void 0 ? { approvalRuntimeFactory: this.deps.approvalRuntimeFactory } : {},
+			approvalRuntime: this.deps.approvalRuntime,
+			approvalRuntimeFactory: this.deps.approvalRuntimeFactory,
 			hookEngine,
 			skillManager: this.deps.skillManager,
-			...this.deps.agentTypeRegistry !== void 0 ? { agentTypeRegistry: this.deps.agentTypeRegistry } : {},
-			...this.deps.questionRuntimeProvider !== void 0 ? { questionRuntime: this.deps.questionRuntimeProvider({ sessionId }) } : {},
+			agentTypeRegistry: this.deps.agentTypeRegistry,
+			questionRuntime: this.deps.questionRuntimeProvider?.({ sessionId }),
 			logger: this.deps.logger
 		});
 		this.deps.sessionLifecycle?.onSessionCreated?.(managed);
@@ -30707,12 +30920,12 @@ var DefaultSessionApplicationService = class {
 			eventBus,
 			compactionProvider,
 			compactionConfig,
-			...this.deps.approvalRuntime !== void 0 ? { approvalRuntime: this.deps.approvalRuntime } : {},
-			...this.deps.approvalRuntimeFactory !== void 0 ? { approvalRuntimeFactory: this.deps.approvalRuntimeFactory } : {},
+			approvalRuntime: this.deps.approvalRuntime,
+			approvalRuntimeFactory: this.deps.approvalRuntimeFactory,
 			hookEngine,
 			skillManager: this.deps.skillManager,
-			...this.deps.agentTypeRegistry !== void 0 ? { agentTypeRegistry: this.deps.agentTypeRegistry } : {},
-			...this.deps.questionRuntimeProvider !== void 0 ? { questionRuntime: this.deps.questionRuntimeProvider({ sessionId }) } : {},
+			agentTypeRegistry: this.deps.agentTypeRegistry,
+			questionRuntime: this.deps.questionRuntimeProvider?.({ sessionId }),
 			logger: this.deps.logger
 		});
 		const runtimeBundleProvider = this.deps.runtimeBundleProvider;
@@ -30777,7 +30990,7 @@ var DefaultSessionApplicationService = class {
 			turn_count: turnCount,
 			last_turn_id: lastTurnId,
 			status,
-			...planPath !== null ? { plan_path: planPath } : {}
+			plan_path: planPath
 		};
 	}
 	getStatus(sessionId) {
@@ -32772,6 +32985,12 @@ function projectReplayState(records, sessionInitialized, runtimeBaseline) {
 			content,
 			toolCalls: openStep.toolCalls
 		});
+		for (const tr of openStep.toolResults) messages.push({
+			role: "tool",
+			content: tr.content,
+			toolCalls: [],
+			toolCallId: tr.toolCallId
+		});
 		openStep = null;
 	}
 	for (const r of records) {
@@ -32795,18 +33014,25 @@ function projectReplayState(records, sessionInitialized, runtimeBaseline) {
 				break;
 			}
 			case "tool_result": {
-				flushOpenStep();
 				const pendingTodo = pendingTodoWrites.get(r.tool_call_id);
 				if (pendingTodo !== void 0) {
 					if (r.is_error !== true) todos = pendingTodo.map((todo) => ({ ...todo }));
 					pendingTodoWrites.delete(r.tool_call_id);
 				}
+				const toolContent = isContentPartArray(r.output) ? r.output.map(cloneContentPart) : [{
+					type: "text",
+					text: typeof r.output === "string" ? r.output : JSON.stringify(r.output)
+				}];
+				if (openStep !== null && !openStep.hasStepEnd) {
+					openStep.toolResults.push({
+						toolCallId: r.tool_call_id,
+						content: toolContent
+					});
+					break;
+				}
 				messages.push({
 					role: "tool",
-					content: isContentPartArray(r.output) ? r.output.map(cloneContentPart) : [{
-						type: "text",
-						text: typeof r.output === "string" ? r.output : JSON.stringify(r.output)
-					}],
+					content: toolContent,
 					toolCalls: [],
 					toolCallId: r.tool_call_id
 				});
@@ -32846,6 +33072,7 @@ function projectReplayState(records, sessionInitialized, runtimeBaseline) {
 					textChunks: [],
 					thinkChunks: [],
 					toolCalls: [],
+					toolResults: [],
 					hasStepEnd: false
 				};
 				break;
@@ -32857,6 +33084,7 @@ function projectReplayState(records, sessionInitialized, runtimeBaseline) {
 						textChunks: [],
 						thinkChunks: [],
 						toolCalls: [],
+						toolResults: [],
 						hasStepEnd: false
 					};
 				}
@@ -32874,6 +33102,7 @@ function projectReplayState(records, sessionInitialized, runtimeBaseline) {
 						textChunks: [],
 						thinkChunks: [],
 						toolCalls: [],
+						toolResults: [],
 						hasStepEnd: false
 					};
 				}
@@ -32961,7 +33190,7 @@ function normalizeSessionTimestampSeconds(value) {
 async function readSessionInfo(paths, sessionId) {
 	const statePath = paths.statePath(sessionId);
 	const cache = new StateCache(statePath);
-	const [state, lastActivity] = await Promise.all([cache.read(), stat(statePath).then((st) => Math.floor(st.mtimeMs / 1e3), () => {})]);
+	const [state, lastActivity] = await Promise.all([cache.read(), stat(statePath).then((st) => Math.floor(st.mtimeMs / 1e3), () => void 0)]);
 	if (state !== null) return {
 		session_id: state.session_id,
 		created_at: state.created_at,
@@ -33287,13 +33516,13 @@ var SessionManager = class {
 			runtime: runtimeBundle.runtime,
 			eventBus,
 			tools: sessionTools,
-			...options.enabledToolNames !== void 0 ? { enabledToolNames: options.enabledToolNames } : {},
+			enabledToolNames: options.enabledToolNames,
 			lifecycleStateMachine,
 			producer: this.producer,
 			onShellDeliver: options.onShellDeliver,
 			skillManager: options.skillManager,
-			...options.questionRuntime !== void 0 ? { questionRuntime: options.questionRuntime } : {},
-			...runtimeBundle.compactionConfig !== void 0 ? { compactionConfig: runtimeBundle.compactionConfig } : {},
+			questionRuntime: options.questionRuntime,
+			compactionConfig: runtimeBundle.compactionConfig,
 			compactionProvider: runtimeBundle.compactionProvider,
 			journalCapability: options.journalCapability ?? createWiredJournalCapability({
 				sessionDir,
@@ -33302,13 +33531,13 @@ var SessionManager = class {
 			}),
 			approvalRuntime,
 			hookEngine: options.hookEngine,
-			...options.toolExecutionScopeFactory !== void 0 ? { toolExecutionScopeFactory: options.toolExecutionScopeFactory } : {},
+			toolExecutionScopeFactory: options.toolExecutionScopeFactory,
 			sessionRules: options.sessionRules,
 			permissionMode: options.permissionMode,
 			stateCache,
 			initialMeta,
 			pathConfig: this.paths,
-			...options.approvalStateStore !== void 0 ? { approvalStateStore: options.approvalStateStore } : {},
+			approvalStateStore: options.approvalStateStore,
 			...options.agentTypeRegistry !== void 0 ? {
 				subagentStore: new SubagentStore(sessionDir),
 				agentTypeRegistry: options.agentTypeRegistry,
@@ -33425,7 +33654,7 @@ var SessionManager = class {
 			model: projected.model,
 			runtime: options.runtime,
 			compactionProvider: options.compactionProvider,
-			...options.compactionConfig !== void 0 ? { compactionConfig: options.compactionConfig } : {}
+			compactionConfig: options.compactionConfig
 		});
 		const runtimeBundle = runtimeSlot.current();
 		await stateCache.write({
@@ -33457,10 +33686,7 @@ var SessionManager = class {
 			subagentStore = new SubagentStore(sessionDir);
 			lostSubagentIds = await cleanupStaleSubagents(subagentStore);
 		}
-		const approvalRuntime = this.buildApprovalRuntime(sessionId, sessionJournal, stateCache, {
-			...options.approvalRuntime !== void 0 ? { approvalRuntime: options.approvalRuntime } : {},
-			...options.approvalRuntimeFactory !== void 0 ? { approvalRuntimeFactory: options.approvalRuntimeFactory } : {}
-		});
+		const approvalRuntime = this.buildApprovalRuntime(sessionId, sessionJournal, stateCache, options);
 		const soulPlus = new SoulPlus({
 			sessionId,
 			contextState,
@@ -33775,7 +34001,7 @@ var SessionManager = class {
 				turn_count: meta?.turn_count ?? existing.turn_count ?? 0,
 				plan_slug: meta?.plan_slug,
 				thinking_level: currentThinkingLevel,
-				...currentPlanMode ? { plan_mode: true } : { plan_mode: false },
+				plan_mode: currentPlanMode,
 				todos: cloneTodoItems(currentTodos),
 				last_exit_code: "clean"
 			} : {
@@ -41668,12 +41894,9 @@ const KimiConfigSchema = z.object({
 	defaultThinking: z.boolean().optional(),
 	defaultYolo: z.boolean().optional(),
 	defaultPlanMode: z.boolean().optional(),
-	defaultEditor: z.string().optional(),
-	theme: z.string().optional(),
 	hooks: z.array(z.unknown()).optional(),
 	services: ServicesConfigSchema.optional(),
 	mergeAllAvailableSkills: z.boolean().optional(),
-	showThinkingStream: z.boolean().optional(),
 	loopControl: LoopControlSchema.optional(),
 	raw: z.record(z.string(), z.unknown()).optional()
 });
@@ -41871,11 +42094,8 @@ function configToTomlData(config) {
 	setDefined(out, "default_thinking", config.defaultThinking);
 	setDefined(out, "default_yolo", config.defaultYolo);
 	setDefined(out, "default_plan_mode", config.defaultPlanMode);
-	setDefined(out, "default_editor", config.defaultEditor);
-	setDefined(out, "theme", config.theme);
 	setDefined(out, "hooks", config.hooks);
 	setDefined(out, "merge_all_available_skills", config.mergeAllAvailableSkills);
-	setDefined(out, "show_thinking_stream", config.showThinkingStream);
 	const rawProviders = cloneRecord(out["providers"]);
 	out["providers"] = Object.fromEntries(Object.entries(config.providers).map(([name, provider]) => [name, providerToToml(provider, rawProviders[name])]));
 	if (config.models !== void 0) {
@@ -41890,63 +42110,6 @@ function configToTomlData(config) {
 	return out;
 }
 //#endregion
-//#region ../../packages/kosong/dist/capability-6GoTY4Ii.mjs
-/**
-* Shared read-only default returned when a provider has not catalogued a
-* given model. Frozen so accidental mutation at one call site cannot leak
-* into another.
-*/
-const UNKNOWN_CAPABILITY = Object.freeze({
-	image_in: false,
-	video_in: false,
-	audio_in: false,
-	thinking: false,
-	tool_use: false,
-	max_context_tokens: 0
-});
-//#endregion
-//#region ../../packages/kosong/dist/errors-DYOwJhxZ.mjs
-/**
-* Base error for all chat provider errors.
-*/
-var ChatProviderError = class extends Error {
-	constructor(message) {
-		super(message);
-		this.name = "ChatProviderError";
-	}
-};
-/**
-* Network-level connection failure.
-*/
-var APIConnectionError$2 = class extends ChatProviderError {
-	constructor(message) {
-		super(message);
-		this.name = "APIConnectionError";
-	}
-};
-/**
-* Request timed out.
-*/
-var APITimeoutError = class extends ChatProviderError {
-	constructor(message) {
-		super(message);
-		this.name = "APITimeoutError";
-	}
-};
-/**
-* HTTP status error from the API.
-*/
-var APIStatusError = class extends ChatProviderError {
-	statusCode;
-	requestId;
-	constructor(statusCode, message, requestId) {
-		super(message);
-		this.name = "APIStatusError";
-		this.statusCode = statusCode;
-		this.requestId = requestId ?? null;
-	}
-};
-//#endregion
 //#region ../../node_modules/.pnpm/@anthropic-ai+sdk@0.88.0_zod@4.3.6/node_modules/@anthropic-ai/sdk/internal/tslib.mjs
 function __classPrivateFieldSet(receiver, state, value, kind, f) {
 	if (kind === "m") throw new TypeError("Private method is not writable");
@@ -47091,7 +47254,7 @@ Anthropic.Messages = Messages;
 Anthropic.Models = Models$1;
 Anthropic.Beta = Beta;
 //#endregion
-//#region ../../packages/kosong/dist/providers/anthropic.mjs
+//#region ../../packages/kosong/src/providers/anthropic.ts
 /**
 * Normalize an Anthropic `stop_reason` string to the unified
 * {@link FinishReason} enum.
@@ -47277,7 +47440,7 @@ function convertMessage$3(message) {
 }
 function convertAnthropicError(error) {
 	if (error instanceof APIConnectionTimeoutError$1) return new APITimeoutError(error.message);
-	if (error instanceof APIConnectionError$1) return new APIConnectionError$2(error.message);
+	if (error instanceof APIConnectionError$1) return new APIConnectionError$3(error.message);
 	if (error instanceof APIError$1 && typeof error.status === "number") {
 		const reqId = error.requestID ?? null;
 		return new APIStatusError(error.status, error.message, reqId);
@@ -75826,7 +75989,7 @@ function getApiKeyFromEnv() {
 	return envGoogleApiKey || envGeminiApiKey || void 0;
 }
 //#endregion
-//#region ../../packages/kosong/dist/providers/google-genai.mjs
+//#region ../../packages/kosong/src/providers/google-genai.ts
 /**
 * Normalize a Google GenAI (Gemini) `finishReason` value to the unified
 * {@link FinishReason} enum.
@@ -76214,8 +76377,8 @@ var GoogleGenAIStreamedMessage = class {
 		}
 	}
 };
-const NETWORK_RE$1 = /network|connection|connect|disconnect|fetch failed/i;
-const TIMEOUT_RE$1 = /timed?\s*out|timeout|deadline/i;
+const NETWORK_RE = /network|connection|connect|disconnect|fetch failed/i;
+const TIMEOUT_RE = /timed?\s*out|timeout|deadline/i;
 /**
 * Convert a Google GenAI SDK error (or raw Error) to a kosong `ChatProviderError`.
 */
@@ -76223,8 +76386,8 @@ function convertGoogleGenAIError(error) {
 	if (error instanceof ApiError) return new APIStatusError(error.status, error.message);
 	if (error instanceof Error) {
 		const msg = error.message;
-		if (TIMEOUT_RE$1.test(msg)) return new APITimeoutError(msg);
-		if (NETWORK_RE$1.test(msg) || error instanceof TypeError && msg.includes("fetch")) return new APIConnectionError$2(msg);
+		if (TIMEOUT_RE.test(msg)) return new APITimeoutError(msg);
+		if (NETWORK_RE.test(msg) || error instanceof TypeError && msg.includes("fetch")) return new APIConnectionError$3(msg);
 		const statusCode = error.code;
 		if (typeof statusCode === "number") return new APIStatusError(statusCode, msg);
 		return new ChatProviderError(`GoogleGenAI error: ${msg}`);
@@ -76388,197 +76551,7 @@ var GoogleGenAIChatProvider = class {
 	}
 };
 //#endregion
-//#region ../../packages/kosong/dist/openai-common-CmMTBbL2.mjs
-/**
-* Extract the concatenated text from a message's content parts.
-*
-* @param message The message to extract text from.
-* @param sep Separator between text parts. Defaults to empty string.
-*/
-function extractText(message, sep = "") {
-	return message.content.filter((part) => part.type === "text").map((part) => part.text).join(sep);
-}
-/**
-* Convert a kosong `ContentPart` to OpenAI-compatible content part.
-* Returns `null` for think parts (handled separately as reasoning_content).
-*/
-function convertContentPart(part) {
-	switch (part.type) {
-		case "text": return {
-			type: "text",
-			text: part.text
-		};
-		case "think": return null;
-		case "image_url": return {
-			type: "image_url",
-			image_url: part.imageUrl.id === void 0 ? { url: part.imageUrl.url } : {
-				url: part.imageUrl.url,
-				id: part.imageUrl.id
-			}
-		};
-		case "audio_url": return {
-			type: "audio_url",
-			audio_url: part.audioUrl.id === void 0 ? { url: part.audioUrl.url } : {
-				url: part.audioUrl.url,
-				id: part.audioUrl.id
-			}
-		};
-		case "video_url": return {
-			type: "video_url",
-			video_url: part.videoUrl.id === void 0 ? { url: part.videoUrl.url } : {
-				url: part.videoUrl.url,
-				id: part.videoUrl.id
-			}
-		};
-		default: throw new Error(`Unknown content part type: ${part.type}`);
-	}
-}
-/**
-* Convert a kosong `Tool` to OpenAI tool format.
-*/
-function toolToOpenAI(tool) {
-	return {
-		type: "function",
-		function: {
-			name: tool.name,
-			description: tool.description,
-			parameters: tool.parameters
-		}
-	};
-}
-const NETWORK_RE = /network|connection|connect|disconnect/i;
-const TIMEOUT_RE = /timed?\s*out|timeout|deadline/i;
-function classifyBaseApiError(message) {
-	if (TIMEOUT_RE.test(message)) return new APITimeoutError(message);
-	if (NETWORK_RE.test(message)) return new APIConnectionError$2(message);
-	return new ChatProviderError(`Error: ${message}`);
-}
-/**
-* Convert an OpenAI SDK error (or raw Error) to a kosong `ChatProviderError`.
-*/
-function convertOpenAIError(error) {
-	if (error instanceof APIConnectionTimeoutError$2) return new APITimeoutError(error.message);
-	if (error instanceof APIConnectionError$3) return new APIConnectionError$2(error.message);
-	if (error instanceof APIError$2 && typeof error.status === "number") {
-		const reqId = error.requestID ?? null;
-		return new APIStatusError(error.status, error.message, reqId);
-	}
-	if (error instanceof APIError$2 && error.constructor === APIError$2 && error.error === void 0) return classifyBaseApiError(error.message);
-	if (error instanceof OpenAIError) return new ChatProviderError(`Error: ${error.message}`);
-	if (error instanceof Error) return new ChatProviderError(`Error: ${error.message}`);
-	return new ChatProviderError(`Error: ${String(error)}`);
-}
-/**
-* Type guard: narrow a tool call union to the function-type variant.
-* Works with OpenAI SDK's `ChatCompletionMessageToolCall` as well as
-* any object carrying `{ type: string }`.
-*/
-function isFunctionToolCall(tc) {
-	return tc.type === "function";
-}
-/**
-* Map kosong `ThinkingEffort` to OpenAI `reasoning_effort` string.
-*/
-function thinkingEffortToReasoningEffort(effort) {
-	switch (effort) {
-		case "off": return;
-		case "low": return "low";
-		case "medium": return "medium";
-		case "high": return "high";
-		default: throw new Error(`Unknown thinking effort: ${String(effort)}`);
-	}
-}
-/**
-* Map OpenAI `reasoning_effort` string back to kosong `ThinkingEffort`.
-*/
-function reasoningEffortToThinkingEffort(reasoning) {
-	if (reasoning === void 0 || reasoning === null) return null;
-	switch (reasoning) {
-		case "low":
-		case "minimal": return "low";
-		case "medium": return "medium";
-		case "high":
-		case "xhigh": return "high";
-		case "none": return "off";
-		default: return "off";
-	}
-}
-/**
-* Extract `TokenUsage` from an OpenAI-compatible usage object.
-*/
-function extractUsage(usage) {
-	if (usage === null || usage === void 0 || typeof usage !== "object") return null;
-	const u = usage;
-	const promptTokens = typeof u["prompt_tokens"] === "number" ? u["prompt_tokens"] : 0;
-	const completionTokens = typeof u["completion_tokens"] === "number" ? u["completion_tokens"] : 0;
-	let cached = 0;
-	if (typeof u["cached_tokens"] === "number") cached = u["cached_tokens"];
-	else if (typeof u["prompt_tokens_details"] === "object" && u["prompt_tokens_details"] !== null) {
-		const details = u["prompt_tokens_details"];
-		if (typeof details["cached_tokens"] === "number") cached = details["cached_tokens"];
-	}
-	return {
-		inputOther: promptTokens - cached,
-		output: completionTokens,
-		inputCacheRead: cached,
-		inputCacheCreation: 0
-	};
-}
-/**
-* Normalize an OpenAI Chat Completions–style `finish_reason` string to the
-* unified {@link FinishReason} enum.
-*
-* Used by both the Kimi and OpenAI Legacy adapters because they share the
-* Chat Completions wire format. Returns `{ finishReason: null,
-* rawFinishReason: null }` when the upstream value is missing or `null` so
-* callers can treat "no signal" uniformly.
-*
-* Mapping:
-* - `'stop'` → `'completed'`
-* - `'tool_calls'` → `'tool_calls'`
-* - `'function_call'` → `'tool_calls'` (legacy alias)
-* - `'length'` → `'truncated'`
-* - `'content_filter'` → `'filtered'`
-* - any other non-null string → `'other'`
-*/
-function normalizeOpenAIFinishReason(raw) {
-	if (raw === null || raw === void 0) return {
-		finishReason: null,
-		rawFinishReason: null
-	};
-	switch (raw) {
-		case "stop": return {
-			finishReason: "completed",
-			rawFinishReason: raw
-		};
-		case "tool_calls":
-		case "function_call": return {
-			finishReason: "tool_calls",
-			rawFinishReason: raw
-		};
-		case "length": return {
-			finishReason: "truncated",
-			rawFinishReason: raw
-		};
-		case "content_filter": return {
-			finishReason: "filtered",
-			rawFinishReason: raw
-		};
-		default: return {
-			finishReason: "other",
-			rawFinishReason: raw
-		};
-	}
-}
-/**
-* Convert tool-role message content according to the chosen strategy.
-*/
-function convertToolMessageContent(message, conversion) {
-	if (conversion === "extract_text") return extractText(message);
-	return message.content.map((p) => convertContentPart(p)).filter((p) => p !== null);
-}
-//#endregion
-//#region ../../packages/kosong/dist/providers/kimi.mjs
+//#region ../../packages/kosong/src/providers/kimi-files.ts
 /**
 * Kimi-specific file upload client.
 *
@@ -76668,6 +76641,8 @@ function guessMimeTypeFromExt(filename) {
 	if (dot < 0) return void 0;
 	return EXT_TO_MIME[filename.slice(dot + 1).toLowerCase()];
 }
+//#endregion
+//#region ../../packages/kosong/src/providers/kimi.ts
 function convertStreamToolCall$1(toolCall, bufferedByIndex) {
 	if (!toolCall.function) return [];
 	const streamIndex = toolCall.index;
@@ -77007,7 +76982,7 @@ var KimiChatProvider = class {
 	}
 };
 //#endregion
-//#region ../../packages/kosong/dist/providers/openai-legacy.mjs
+//#region ../../packages/kosong/src/providers/openai-legacy.ts
 function convertStreamToolCall(toolCall, bufferedByIndex) {
 	if (!toolCall.function) return [];
 	const streamIndex = toolCall.index;
@@ -77311,7 +77286,7 @@ var OpenAILegacyChatProvider = class {
 	}
 };
 //#endregion
-//#region ../../packages/kosong/dist/providers/openai-responses.mjs
+//#region ../../packages/kosong/src/providers/openai-responses.ts
 /**
 * Normalize the Responses API status / incomplete_details into the unified
 * {@link FinishReason} enum.
@@ -78125,7 +78100,7 @@ var DeferredOAuthChatProvider = class DeferredOAuthChatProvider {
 		return createProvider(this.options.providerName, {
 			...this.options.providerConfig,
 			apiKey: "__oauth_token_placeholder__"
-		}, this.options.modelOverride, this.options.defaultHeaders).getCapability?.(model) ?? UNKNOWN_CAPABILITY$1;
+		}, this.options.modelOverride, this.options.defaultHeaders).getCapability?.(model) ?? UNKNOWN_CAPABILITY;
 	}
 	async materializeProvider() {
 		const accessToken = await this.options.oauthResolver(this.options.providerName);
@@ -94703,8 +94678,7 @@ async function startCoreWireServer(options) {
 		},
 		modelsProvider: options.modelsProvider,
 		configProvider: options.configProvider,
-		logger: options.logger,
-		skillManager: options.skillManager
+		logger: options.logger
 	}).getEventFilter;
 	options.transport.onMessage = (frame) => {
 		(async () => {
@@ -94900,12 +94874,6 @@ async function createDefaultSoulPlusWireClient(options) {
 		get defaultPlanMode() {
 			return effectiveConfig.planMode ?? effectiveConfig.defaultPlanMode ?? false;
 		},
-		get theme() {
-			return effectiveConfig.theme === "light" ? "light" : "dark";
-		},
-		get defaultEditor() {
-			return effectiveConfig.defaultEditor ?? "";
-		},
 		get availableModels() {
 			return effectiveConfig.models ?? {};
 		},
@@ -95106,6 +95074,90 @@ async function createKimiAgent() {
 	};
 }
 //#endregion
+//#region src/tui/config.ts
+/**
+* TUI-owned configuration.
+*
+* Agent/runtime settings live in core's `config.toml`; this file owns only
+* terminal UI preferences for the kimi-code client.
+*/
+const INVALID_TUI_CONFIG_MESSAGE = "Invalid TUI config in ~/.kimi-code/tui.toml; using defaults.";
+const TuiThemeSchema = z.enum([
+	"dark",
+	"light",
+	"auto"
+]);
+const TuiConfigFileSchema = z.object({
+	theme: TuiThemeSchema.optional(),
+	editor: z.object({ command: z.string().optional() }).optional()
+});
+const TuiConfigSchema = z.object({
+	theme: TuiThemeSchema,
+	editorCommand: z.string().nullable()
+});
+const DEFAULT_TUI_CONFIG = TuiConfigSchema.parse({
+	theme: "auto",
+	editorCommand: null
+});
+/**
+* Thrown by `loadTuiConfig` when the on-disk TOML cannot be parsed.
+* Carries `fallback` so the caller can recover without re-running the
+* I/O, and use `message` (== `INVALID_TUI_CONFIG_MESSAGE`) as a
+* user-facing notice.
+*/
+var TuiConfigParseError = class extends Error {
+	name = "TuiConfigParseError";
+	fallback;
+	constructor(fallback) {
+		super(INVALID_TUI_CONFIG_MESSAGE);
+		this.fallback = fallback;
+	}
+};
+function getTuiConfigPath() {
+	return join(getDataDir(), "tui.toml");
+}
+async function loadTuiConfig(filePath = getTuiConfigPath()) {
+	if (!existsSync(filePath)) {
+		await saveTuiConfig(DEFAULT_TUI_CONFIG, filePath);
+		return DEFAULT_TUI_CONFIG;
+	}
+	try {
+		return parseTuiConfig(await readFile(filePath, "utf-8"));
+	} catch {
+		throw new TuiConfigParseError(DEFAULT_TUI_CONFIG);
+	}
+}
+function parseTuiConfig(tomlText) {
+	if (tomlText.trim().length === 0) return DEFAULT_TUI_CONFIG;
+	const raw = parse$1(tomlText);
+	return normalizeTuiConfig(TuiConfigFileSchema.parse(raw));
+}
+async function saveTuiConfig(config, filePath = getTuiConfigPath()) {
+	await mkdir(dirname(filePath), { recursive: true });
+	await writeFile(filePath, renderTuiConfig(config), "utf-8");
+}
+function normalizeTuiConfig(config) {
+	const command = config.editor?.command?.trim();
+	return TuiConfigSchema.parse({
+		theme: config.theme ?? DEFAULT_TUI_CONFIG.theme,
+		editorCommand: command === void 0 || command.length === 0 ? null : command
+	});
+}
+function renderTuiConfig(config) {
+	return `# ~/.kimi-code/tui.toml
+# Terminal UI preferences for kimi-code.
+# Agent/runtime settings stay in ~/.kimi-code/config.toml.
+
+theme = "${config.theme}" # "auto" | "dark" | "light"
+
+[editor]
+command = "${escapeTomlBasicString(config.editorCommand ?? "")}" # Empty uses $VISUAL / $EDITOR
+`;
+}
+function escapeTomlBasicString(value) {
+	return value.replaceAll("\\", "\\\\").replaceAll("\"", "\\\"").replaceAll("\b", "\\b").replaceAll("	", "\\t").replaceAll("\n", "\\n").replaceAll("\f", "\\f").replaceAll("\r", "\\r");
+}
+//#endregion
 //#region src/utils/persistence.ts
 /**
 * Small persistence helpers for CLI-owned data files.
@@ -95269,7 +95321,7 @@ var ImageThumbnail = class extends Container {
 		super();
 		const caps = getCapabilities();
 		if (!(caps.images === "kitty" || caps.images === "iterm2")) {
-			this.addChild(new Text(chalk.dim.cyan(`  ${attachment.placeholder}`), 0, 0));
+			this.addChild(new Text(chalk.hex(colors.accent)(`  ${attachment.placeholder}`), 0, 0));
 			return;
 		}
 		const image = new Image(Buffer.from(attachment.bytes).toString("base64"), attachment.mime, { fallbackColor: (s) => chalk.hex(colors.textDim)(s) }, {
@@ -95289,10 +95341,12 @@ const INDENT$1 = "  ";
 var AssistantMessageComponent = class {
 	contentContainer;
 	markdownTheme;
+	bulletColor;
 	lastText = "";
 	showBullet;
-	constructor(markdownTheme, showBullet = true) {
+	constructor(markdownTheme, colors, showBullet = true) {
 		this.markdownTheme = markdownTheme;
+		this.bulletColor = colors.roleAssistant;
 		this.showBullet = showBullet;
 		this.contentContainer = new Container();
 	}
@@ -95315,7 +95369,7 @@ var AssistantMessageComponent = class {
 		const contentLines = this.contentContainer.render(contentWidth);
 		const lines = [""];
 		for (let i = 0; i < contentLines.length; i++) {
-			const p = i === 0 && this.showBullet ? chalk.white(BULLET$1) : INDENT$1;
+			const p = i === 0 && this.showBullet ? chalk.hex(this.bulletColor)(BULLET$1) : INDENT$1;
 			lines.push(p + contentLines[i]);
 		}
 		return lines;
@@ -95343,7 +95397,7 @@ var SkillActivationComponent = class extends Container {
 	constructor(name, args, colors) {
 		super();
 		this.addChild(new Spacer(1));
-		const head = chalk.hex(colors.primary).bold("▶ Activated skill: ") + chalk.hex(colors.user).bold(name);
+		const head = chalk.hex(colors.primary).bold("▶ Activated skill: ") + chalk.hex(colors.roleUser).bold(name);
 		this.addChild(new Text(head, 0, 0));
 		const trimmed = args?.trim() ?? "";
 		if (trimmed.length > 0) {
@@ -95381,7 +95435,7 @@ var ThinkingComponent = class {
 	spinnerInterval;
 	constructor(text, colors, showMarker = true, mode = "finalized", ui) {
 		this.text = text;
-		this.color = colors.thinking;
+		this.color = colors.roleThinking;
 		this.showMarker = showMarker;
 		this.mode = mode;
 		this.ui = ui;
@@ -95494,6 +95548,16 @@ function highlightLines(code, lang) {
 * Reuses the diff algorithm from approval/DiffPreview.tsx, but outputs
 * formatted text lines instead of React elements.
 */
+function makeDiffStyles(colors) {
+	return {
+		add: (s) => chalk.hex(colors.diffAdded)(s),
+		del: (s) => chalk.hex(colors.diffRemoved)(s),
+		addBold: (s) => chalk.bold.hex(colors.diffAddedStrong)(s),
+		delBold: (s) => chalk.bold.hex(colors.diffRemovedStrong)(s),
+		gutter: (s) => chalk.hex(colors.diffGutter)(s),
+		meta: (s) => chalk.hex(colors.diffMeta)(s)
+	};
+}
 function computeDiffLines(oldText, newText, oldStart = 1, newStart = 1, isIncomplete = false) {
 	const oldLines = oldText ? oldText.split("\n") : [];
 	const newLines = newText ? newText.split("\n") : [];
@@ -95582,10 +95646,10 @@ function buildClusters(diffLines, contextLines) {
 		removedCount: removed
 	};
 }
-function formatDiffRow(line) {
-	const gutter = chalk.gray(String(line.lineNum).padStart(4) + " ");
-	if (line.kind === "add") return gutter + chalk.green("+ " + line.code);
-	if (line.kind === "delete") return gutter + chalk.red("- " + line.code);
+function formatDiffRow(line, s) {
+	const gutter = s.gutter(String(line.lineNum).padStart(4) + " ");
+	if (line.kind === "add") return gutter + s.add("+ " + line.code);
+	if (line.kind === "delete") return gutter + s.del("- " + line.code);
 	return gutter + "  " + line.code;
 }
 /**
@@ -95597,15 +95661,16 @@ function formatDiffRow(line) {
 * Used by Edit's call preview where we want to show *what changed*
 * with enough context to read the change, but not the whole file.
 */
-function renderDiffLinesClustered(oldText, newText, path, opts = {}) {
+function renderDiffLinesClustered(oldText, newText, path, colors, opts = {}) {
+	const s = makeDiffStyles(colors);
 	const contextLines = opts.contextLines ?? 3;
 	const maxLines = opts.maxLines;
 	const diffLines = computeDiffLines(oldText, newText, 1, 1, opts.isIncomplete ?? false);
 	const { clusters, changedCount, addedCount, removedCount } = buildClusters(diffLines, contextLines);
 	const output = [];
 	let header = "";
-	if (addedCount > 0) header += chalk.green.bold(`+${String(addedCount)} `);
-	if (removedCount > 0) header += chalk.red.bold(`-${String(removedCount)} `);
+	if (addedCount > 0) header += s.addBold(`+${String(addedCount)} `);
+	if (removedCount > 0) header += s.delBold(`-${String(removedCount)} `);
 	header += path;
 	output.push(header);
 	if (clusters.length === 0) return output;
@@ -95626,7 +95691,7 @@ function renderDiffLinesClustered(oldText, newText, path, opts = {}) {
 					truncated = true;
 					break;
 				}
-				output.push(chalk.dim(`     … ${String(gap)} unchanged line${gap > 1 ? "s" : ""} …`));
+				output.push(s.meta(`     … ${String(gap)} unchanged line${gap > 1 ? "s" : ""} …`));
 				body++;
 			}
 		}
@@ -95636,7 +95701,7 @@ function renderDiffLinesClustered(oldText, newText, path, opts = {}) {
 				break outer;
 			}
 			const line = diffLines[i];
-			output.push(formatDiffRow(line));
+			output.push(formatDiffRow(line, s));
 			body++;
 			if (line.kind !== "context") shownChanges++;
 			prevEnd = i;
@@ -95644,7 +95709,7 @@ function renderDiffLinesClustered(oldText, newText, path, opts = {}) {
 	}
 	if (truncated) {
 		const hidden = changedCount - shownChanges;
-		if (hidden > 0) output.push(chalk.dim(`     … ${String(hidden)} more change${hidden > 1 ? "s" : ""} hidden (ctrl+o to expand)`));
+		if (hidden > 0) output.push(s.meta(`     … ${String(hidden)} more change${hidden > 1 ? "s" : ""} hidden (ctrl+o to expand)`));
 	}
 	return output;
 }
@@ -95652,12 +95717,16 @@ function renderDiffLinesClustered(oldText, newText, path, opts = {}) {
 //#region src/tui/components/panels/plan-box.ts
 const LEFT_MARGIN$1 = 2;
 const SIDE_PADDING$1 = 1;
+const TITLE_PREFIX = " plan: ";
+const TITLE_SUFFIX = " ";
+const ELLIPSIS_PREFIX = "…/";
 var PlanBoxComponent = class {
 	markdown;
 	cachedWidth;
 	cachedLines;
-	constructor(plan, markdownTheme, borderHex) {
+	constructor(plan, markdownTheme, borderHex, planPath) {
 		this.borderHex = borderHex;
+		this.planPath = planPath;
 		this.markdown = new Markdown(plan.trim(), 0, 0, markdownTheme);
 	}
 	invalidate() {
@@ -95671,8 +95740,8 @@ var PlanBoxComponent = class {
 		const contentWidth = Math.max(1, horzLen - 2 * SIDE_PADDING$1);
 		const paint = (s) => chalk.hex(this.borderHex)(s);
 		const indent = " ".repeat(LEFT_MARGIN$1);
-		const title = " plan ";
-		const trailingDashLen = Math.max(0, horzLen - 6);
+		const title = this.buildTitle(horzLen);
+		const trailingDashLen = Math.max(0, horzLen - title.length);
 		const top = indent + paint("┌") + paint(title) + paint("─".repeat(trailingDashLen)) + paint("┐");
 		const bottom = indent + paint("└" + "─".repeat(horzLen) + "┘");
 		const rawLines = this.markdown.render(contentWidth);
@@ -95686,7 +95755,28 @@ var PlanBoxComponent = class {
 		this.cachedLines = lines;
 		return lines;
 	}
+	buildTitle(horzLen) {
+		const fallback = " plan ";
+		const path = this.planPath;
+		if (path === void 0 || path.length === 0) return fallback;
+		const pathBudget = horzLen - 1 - 8;
+		if (pathBudget < (path.split("/").pop() ?? path).length) return fallback;
+		return TITLE_PREFIX + (path.length <= pathBudget ? path : truncatePathHead(path, pathBudget)) + TITLE_SUFFIX;
+	}
 };
+function truncatePathHead(path, budget) {
+	if (budget <= 2) return path.slice(-budget);
+	const segments = path.split("/");
+	let acc = segments.at(-1) ?? "";
+	for (let i = segments.length - 2; i >= 0; i -= 1) {
+		const candidate = (segments[i] ?? "") + "/" + acc;
+		if (2 + candidate.length > budget) break;
+		acc = candidate;
+	}
+	if (acc.length + 2 <= budget) return ELLIPSIS_PREFIX + acc;
+	const tailBudget = budget - 2;
+	return ELLIPSIS_PREFIX + acc.slice(-tailBudget);
+}
 //#endregion
 //#region src/tui/components/messages/tool-renderers/types.ts
 function strArg(args, ...keys) {
@@ -95991,6 +96081,42 @@ function extractApprovedPlan(output) {
 	if (markerIndex < 0) return "";
 	return output.slice(markerIndex + 17).trim();
 }
+const REJECT_PREFIX = "User rejected the plan.";
+const REJECT_FEEDBACK_PREFIX = "User rejected the plan. Feedback:";
+const APPROVED_OPTION_RE = /^User approved option "([^"]+)"\./;
+const PLAN_SAVED_TO_RE = /\nPlan saved to: ([^\n]+)\n/;
+/**
+* 解析 ExitPlanMode 工具结果的 content 字符串，识别审批结局 + plan 路径。
+* core 侧字符串模板见 `packages/kimi-core/src/tools/builtin/planning/exit-plan-mode.ts`：
+*   - 通过：以 'Exited plan mode.' 或 'User approved option "<label>".' 开头，
+*     plan-file 模式还会附带一行 'Plan saved to: <path>'。
+*   - 拒绝：以 'User rejected the plan.' 开头；带 feedback 的形式是
+*     'User rejected the plan. Feedback:\n\n<text>'。
+* 这是字符串协议而非结构化字段，未来若 core 把结局结构化进 wire 层应优先切过去。
+*/
+function interpretExitPlanModeOutcome(output) {
+	if (output.startsWith(REJECT_PREFIX)) {
+		if (output.startsWith(REJECT_FEEDBACK_PREFIX)) return {
+			kind: "rejected",
+			feedback: output.slice(33).trimStart()
+		};
+		return { kind: "rejected" };
+	}
+	const path = PLAN_SAVED_TO_RE.exec(output)?.[1]?.trim();
+	const optionMatch = APPROVED_OPTION_RE.exec(output);
+	if (optionMatch !== null) return path !== void 0 && path.length > 0 ? {
+		kind: "approved",
+		chosen: optionMatch[1],
+		path
+	} : {
+		kind: "approved",
+		chosen: optionMatch[1]
+	};
+	return path !== void 0 && path.length > 0 ? {
+		kind: "approved",
+		path
+	} : { kind: "approved" };
+}
 const STREAMING_FIELD_RE$1 = /"(path|file_path|command|pattern|query|url|description|title|name)"\s*:\s*"((?:\\.|[^"\\])*)"/g;
 function unescapeJsonString$1(s) {
 	return s.replaceAll(/\\(["\\/bfnrt])/g, (_, ch) => {
@@ -96116,6 +96242,14 @@ var ToolCallComponent = class extends Container {
 	colors;
 	ui;
 	markdownTheme;
+	planPath;
+	/**
+	* 退化用的 plan body：当 LLM 走 plan-file 模式、`args.plan` 为空时，
+	* stream-ops 会通过 `setPlanInfo` 把从 `client.getPlan()` 拉到的内容
+	* 喂进来，让 plan 框在审批等待阶段就能渲染（也避免拒绝/修订时
+	* `## Approved Plan:` 标记缺失导致 plan body 永远不出现）。
+	*/
+	currentPlan;
 	headerText;
 	callPreviewEndIndex = 0;
 	subagentAgentId;
@@ -96160,6 +96294,26 @@ var ToolCallComponent = class extends Container {
 		this.rebuildBody();
 		this.ui?.requestRender();
 	}
+	/**
+	* 异步注入 plan body / path。仅 ExitPlanMode 工具卡使用：当 LLM 走
+	* plan-file 模式时 `args.plan` 为空，stream-ops 会从 `client.getPlan()`
+	* 拉到 plan 文本后调用本方法，触发 plan 框渲染。
+	*/
+	setPlanInfo(info) {
+		if (this.toolCall.name !== "ExitPlanMode") return;
+		let changed = false;
+		if (info.plan !== void 0 && info.plan.length > 0 && this.currentPlan !== info.plan) {
+			this.currentPlan = info.plan;
+			changed = true;
+		}
+		if (info.path !== void 0 && info.path.length > 0 && this.planPath !== info.path) {
+			this.planPath = info.path;
+			changed = true;
+		}
+		if (!changed) return;
+		this.rebuildBody();
+		this.ui?.requestRender();
+	}
 	applySubagentReplay(subagent) {
 		if (subagent === void 0) return;
 		this.subagentAgentId = subagent.id;
@@ -96242,8 +96396,17 @@ var ToolCallComponent = class extends Container {
 		const isError = result?.is_error ?? false;
 		let bullet;
 		if (isFinished) bullet = isError ? chalk.hex(colors.error)("✗ ") : chalk.hex(colors.success)("⏺ ");
-		else bullet = chalk.white("⏺ ");
-		if (toolCall.name === "ExitPlanMode") return chalk.hex(colors.primary).bold("Current plan");
+		else bullet = chalk.hex(colors.roleAssistant)("⏺ ");
+		if (toolCall.name === "ExitPlanMode") {
+			const label = chalk.hex(colors.primary).bold("Current plan");
+			if (!isFinished || result === void 0 || result.is_error === true) return label;
+			const outcome = interpretExitPlanModeOutcome(result.output);
+			if (outcome.kind === "approved") {
+				const chipText = outcome.chosen !== void 0 && outcome.chosen.length > 0 ? `Approved: ${outcome.chosen}` : "Approved";
+				return `${label}${chalk.hex(colors.success)(` · ${chipText}`)}`;
+			}
+			return `${label}${chalk.hex(colors.error)(" · Rejected")}`;
+		}
 		if (toolCall.name === "AskUserQuestion") {
 			const label = isFinished ? isError ? "Could not collect your input" : "Collected your answers" : "Waiting for your input";
 			const tone = isError ? chalk.hex(colors.error) : chalk.hex(colors.primary);
@@ -96333,7 +96496,7 @@ var ToolCallComponent = class extends Container {
 			const oldStr = str(this.toolCall.args["old_string"]);
 			const newStr = str(this.toolCall.args["new_string"]);
 			if (oldStr.length === 0 && newStr.length === 0) return;
-			const lines = renderDiffLinesClustered(oldStr, newStr, str(this.toolCall.args["file_path"] ?? this.toolCall.args["path"]), {
+			const lines = renderDiffLinesClustered(oldStr, newStr, str(this.toolCall.args["file_path"] ?? this.toolCall.args["path"]), this.colors, {
 				contextLines: 3,
 				...shouldCap ? { maxLines: CALL_PREVIEW_LINES } : {}
 			});
@@ -96366,7 +96529,7 @@ var ToolCallComponent = class extends Container {
 			const oldStr = extractPartialStringField(streamText, "old_string") ?? "";
 			const newStr = extractPartialStringField(streamText, "new_string") ?? "";
 			if (oldStr.length === 0 && newStr.length === 0) return;
-			const lines = renderDiffLinesClustered(oldStr, newStr, extractPartialStringField(streamText, "file_path") ?? extractPartialStringField(streamText, "path") ?? "", {
+			const lines = renderDiffLinesClustered(oldStr, newStr, extractPartialStringField(streamText, "file_path") ?? extractPartialStringField(streamText, "path") ?? "", this.colors, {
 				contextLines: 3,
 				isIncomplete: true
 			});
@@ -96384,22 +96547,41 @@ var ToolCallComponent = class extends Container {
 		}
 	}
 	buildPlanPreview() {
-		const plan = str(this.toolCall.args["plan"]);
-		if (plan.length === 0 || this.markdownTheme === void 0) return;
-		this.addChild(new PlanBoxComponent(plan, this.markdownTheme, this.colors.success));
-	}
-	renderPlanFromResult(result) {
-		const plan = extractApprovedPlan(result.output);
-		if (plan.length === 0) return false;
-		if (this.markdownTheme !== void 0) this.addChild(new PlanBoxComponent(plan, this.markdownTheme, this.colors.success));
+		const plan = this.resolvePlanForPreview();
+		if (plan.length === 0) return;
+		const path = this.resolvePlanPath();
+		if (this.markdownTheme !== void 0) this.addChild(new PlanBoxComponent(plan, this.markdownTheme, this.colors.success, path));
 		else this.addChild(new Text(chalk.dim(plan), 2, 0));
-		return true;
+	}
+	resolvePlanForPreview() {
+		const inlinePlan = str(this.toolCall.args["plan"]);
+		if (inlinePlan.length > 0) return inlinePlan;
+		if (this.result !== void 0 && !this.result.is_error) {
+			const approved = extractApprovedPlan(this.result.output);
+			if (approved.length > 0) return approved;
+		}
+		return this.currentPlan ?? "";
+	}
+	resolvePlanPath() {
+		if (this.result !== void 0 && !this.result.is_error) {
+			const fromResult = interpretExitPlanModeOutcome(this.result.output).path;
+			if (fromResult !== void 0 && fromResult.length > 0) return fromResult;
+		}
+		return this.planPath;
 	}
 	buildContent() {
 		const { result } = this;
 		if (result === void 0 || !result.output) return;
 		if (this.toolCall.name === "ExitPlanMode" && !result.is_error) {
-			if (str(this.toolCall.args["plan"]).length === 0 && this.renderPlanFromResult(result)) return;
+			const outcome = interpretExitPlanModeOutcome(result.output);
+			if (outcome.kind === "rejected" && outcome.feedback !== void 0) {
+				const trimmed = outcome.feedback.trim();
+				if (trimmed.length > 0) {
+					const labelTone = chalk.hex(this.colors.warning).bold;
+					this.addChild(new Text(labelTone("↪ Suggestion"), 2, 0));
+					for (const line of trimmed.split("\n")) this.addChild(new Text(line, 4, 0));
+				}
+			}
 			return;
 		}
 		if (this.toolCall.name === "SetTodoList" && !result.is_error) return;
@@ -96450,7 +96632,7 @@ var UserMessageComponent = class extends Container {
 	constructor(text, colors) {
 		super();
 		this.addChild(new Spacer(1));
-		this.addChild(new Text(chalk.hex(colors.user).bold("✨ " + text), 0, 0));
+		this.addChild(new Text(chalk.hex(colors.roleUser).bold("✨ " + text), 0, 0));
 	}
 };
 //#endregion
@@ -96473,14 +96655,16 @@ var WelcomeComponent = class {
 		const textWidth = Math.max(4, innerWidth - logoWidth - 2);
 		const rightRow0 = truncateToWidth(chalk.bold.hex(this.colors.primary)("Welcome to Kimi Code!"), textWidth, "…");
 		const isLoggedOut = !this.state.model;
-		const rightRow1 = truncateToWidth(chalk.dim(isLoggedOut ? "Run /login to sign in." : "Send /help for help information."), textWidth, "…");
+		const dim = chalk.hex(this.colors.textDim);
+		const labelStyle = chalk.bold.hex(this.colors.textDim);
+		const rightRow1 = truncateToWidth(dim(isLoggedOut ? "Run /login to sign in." : "Send /help for help information."), textWidth, "…");
 		const headerLines = [primary(logo[0].padEnd(logoWidth)) + gap + rightRow0, primary(logo[1].padEnd(logoWidth)) + gap + rightRow1];
-		const modelValue = isLoggedOut ? chalk.yellow("(not signed in — run /login)") : this.state.model;
+		const modelValue = isLoggedOut ? chalk.hex(this.colors.warning)("(not signed in — run /login)") : this.state.model;
 		const infoLines = [
-			chalk.dim.bold("Directory: ") + this.state.workDir,
-			chalk.dim.bold("Session:   ") + this.state.sessionId,
-			chalk.dim.bold("Model:     ") + modelValue,
-			chalk.dim.bold("Version:   ") + this.state.version
+			labelStyle("Directory: ") + this.state.workDir,
+			labelStyle("Session:   ") + this.state.sessionId,
+			labelStyle("Model:     ") + modelValue,
+			labelStyle("Version:   ") + this.state.version
 		];
 		const contentLines = [
 			...headerLines,
@@ -96646,32 +96830,32 @@ function createTranscriptComponent(state, entry) {
 				if (state.toolOutputExpanded) tc.setExpanded(true);
 				return tc;
 			}
-			return entry.renderMode === "notice" ? createNoticeEntry(entry.content, entry.detail, state.colors) : createStatusEntry(entry.content, entry.color);
-		case "status": return entry.renderMode === "notice" ? createNoticeEntry(entry.content, entry.detail, state.colors) : createStatusEntry(entry.content, entry.color);
+			return entry.renderMode === "notice" ? createNoticeEntry(entry.content, entry.detail, state.colors) : createStatusEntry(entry.content, state.colors, entry.color);
+		case "status": return entry.renderMode === "notice" ? createNoticeEntry(entry.content, entry.detail, state.colors) : createStatusEntry(entry.content, state.colors, entry.color);
 		default: return null;
 	}
 }
 function createAssistantEntry(state, content) {
-	const component = new AssistantMessageComponent(state.markdownTheme);
+	const component = new AssistantMessageComponent(state.markdownTheme, state.colors);
 	component.updateContent(content);
 	return component;
 }
-function paintStatus(content, color) {
-	if (color === void 0) return chalk.dim(content);
+function paintStatus(content, colors, color) {
+	if (color === void 0) return chalk.hex(colors.textDim)(content);
 	if (color.startsWith("#")) return chalk.hex(color)(content);
 	const fn = chalk[color];
 	return typeof fn === "function" ? fn(content) : content;
 }
-function createStatusEntry(content, color) {
+function createStatusEntry(content, colors, color) {
 	const container = new Container();
-	const styled = paintStatus(content, color);
+	const styled = paintStatus(content, colors, color);
 	container.addChild(new Text(`  ${styled}`, 0, 0));
 	return container;
 }
 function createNoticeEntry(title, detail, colors) {
 	const container = new Container();
 	container.addChild(new Spacer(1));
-	container.addChild(new Text(`  ${chalk.white(title)}`, 0, 0));
+	container.addChild(new Text(`  ${chalk.hex(colors.textStrong)(title)}`, 0, 0));
 	if (detail !== void 0 && detail.length > 0) container.addChild(new Text(`  ${chalk.hex(colors.textDim)(detail)}`, 0, 0));
 	return container;
 }
@@ -96779,21 +96963,243 @@ function buildImagePart(att) {
 	};
 }
 //#endregion
+//#region src/tui/theme/colors.ts
+/**
+* Color palette definitions for dark and light themes.
+*
+* Two layers:
+*  - private `dark` / `light` raw palettes — unsemantic constants reused
+*    across multiple semantic tokens to avoid hex literal duplication.
+*  - exported `darkColors` / `lightColors` — the semantic `ColorPalette`
+*    consumed by every UI component via chalk.hex(...).
+*
+* Light palette values are tuned for ≥ 4.5:1 contrast against #FFFFFF
+* for text tokens and ≥ 3:1 for chrome (border / large text), matching
+* WCAG AA. See plan in `~/.claude/plans/kimi-code-tui-zippy-spindle.md`.
+*/
+const dark = {
+	blue400: "#4FA8FF",
+	cyan400: "#5BC0BE",
+	gray50: "#F5F5F5",
+	gray100: "#E0E0E0",
+	gray500: "#888888",
+	gray600: "#6B6B6B",
+	gray800: "#3A3A3A",
+	green400: "#4EC87E",
+	green300: "#7AD99B",
+	red400: "#E85454",
+	red300: "#F08585",
+	amber400: "#E8A838",
+	orange300: "#FFCB6B"
+};
+const light = {
+	blue600: "#1565C0",
+	cyan700: "#00838F",
+	gray900: "#1A1A1A",
+	gray700: "#454545",
+	gray600: "#5F5F5F",
+	gray500: "#737373",
+	gray400: "#9CA3AF",
+	green700: "#0E7A38",
+	red700: "#B91C1C",
+	amber800: "#92660A",
+	orange700: "#9A4A00"
+};
+const darkColors = {
+	primary: dark.blue400,
+	accent: dark.cyan400,
+	text: dark.gray100,
+	textStrong: dark.gray50,
+	textDim: dark.gray500,
+	textMuted: dark.gray600,
+	border: dark.gray800,
+	borderFocus: dark.amber400,
+	success: dark.green400,
+	warning: dark.amber400,
+	error: dark.red400,
+	diffAdded: dark.green400,
+	diffRemoved: dark.red400,
+	diffAddedStrong: dark.green300,
+	diffRemovedStrong: dark.red300,
+	diffGutter: dark.gray600,
+	diffMeta: dark.gray500,
+	roleUser: dark.orange300,
+	roleAssistant: dark.gray100,
+	roleThinking: dark.gray500,
+	roleTool: dark.amber400,
+	status: dark.gray500
+};
+const lightColors = {
+	primary: light.blue600,
+	accent: light.cyan700,
+	text: light.gray900,
+	textStrong: light.gray900,
+	textDim: light.gray700,
+	textMuted: light.gray600,
+	border: light.gray400,
+	borderFocus: light.amber800,
+	success: light.green700,
+	warning: light.amber800,
+	error: light.red700,
+	diffAdded: light.green700,
+	diffRemoved: light.red700,
+	diffAddedStrong: light.green700,
+	diffRemovedStrong: light.red700,
+	diffGutter: light.gray500,
+	diffMeta: light.gray600,
+	roleUser: light.orange700,
+	roleAssistant: light.gray900,
+	roleThinking: light.gray700,
+	roleTool: light.amber800,
+	status: light.gray700
+};
+function getColorPalette(theme) {
+	return theme === "dark" ? darkColors : lightColors;
+}
+//#endregion
+//#region src/tui/theme/detect.ts
+const DEFAULT_TIMEOUT_MS = 250;
+const OSC11_QUERY = "\x1B]11;?\x07";
+const OSC11_RESPONSE = /\]11;rgb:([0-9a-f]{1,4})\/([0-9a-f]{1,4})\/([0-9a-f]{1,4})/i;
+async function detectTerminalTheme(opts = {}) {
+	if (!isInteractiveTerminal()) return "dark";
+	if (isColorOptOut()) return "dark";
+	const fromOsc = await queryOsc11({ timeoutMs: opts.timeoutMs ?? DEFAULT_TIMEOUT_MS });
+	if (fromOsc !== null) return fromOsc;
+	const fromColorFgBg = parseColorFgBg(process.env["COLORFGBG"]);
+	if (fromColorFgBg !== null) return fromColorFgBg;
+	return "dark";
+}
+function isInteractiveTerminal() {
+	return (process.stdin.isTTY ?? false) && (process.stdout.isTTY ?? false);
+}
+function isColorOptOut() {
+	const env = process.env;
+	if (env["NO_COLOR"] !== void 0 && env["NO_COLOR"] !== "") return true;
+	if (env["FORCE_COLOR"] === "0") return true;
+	if (env["CI"] !== void 0 && env["CI"] !== "" && env["CI"] !== "0") return true;
+	return false;
+}
+async function queryOsc11(opts) {
+	const stdin = process.stdin;
+	if (typeof stdin.setRawMode !== "function") return null;
+	if (process.stdin.listenerCount("data") > 0) return null;
+	const wasRaw = stdin.isRaw === true;
+	let buffer = "";
+	let listener = null;
+	let timer = null;
+	try {
+		if (!wasRaw) stdin.setRawMode(true);
+		return await new Promise((resolve) => {
+			listener = (chunk) => {
+				buffer += chunk.toString("utf8");
+				const match = OSC11_RESPONSE.exec(buffer);
+				if (match === null) return;
+				const [, r, g, b] = match;
+				if (r === void 0 || g === void 0 || b === void 0) return;
+				resolve(themeFromHexChannels(r, g, b));
+			};
+			stdin.on("data", listener);
+			timer = setTimeout(() => {
+				resolve(null);
+			}, opts.timeoutMs);
+			try {
+				process.stdout.write(OSC11_QUERY);
+			} catch {
+				resolve(null);
+			}
+		});
+	} catch {
+		return null;
+	} finally {
+		if (timer !== null) clearTimeout(timer);
+		if (listener !== null) stdin.off("data", listener);
+		if (!wasRaw) try {
+			stdin.setRawMode(false);
+		} catch {}
+	}
+}
+function themeFromHexChannels(rHex, gHex, bHex) {
+	const r = normalizeChannel(rHex);
+	const g = normalizeChannel(gHex);
+	const b = normalizeChannel(bHex);
+	return .2126 * r + .7152 * g + .0722 * b > .5 ? "light" : "dark";
+}
+function normalizeChannel(hex) {
+	const max = (1 << hex.length * 4) - 1;
+	const value = parseInt(hex, 16);
+	return Number.isFinite(value) ? value / max : 0;
+}
+/**
+* COLORFGBG is `"fg;bg"` (sometimes `"fg;default;bg"`). The last token is
+* the background ANSI 16-color index; 0–6 and 8 are dark, the rest light.
+*/
+function parseColorFgBg(value) {
+	if (value === void 0 || value === "") return null;
+	const bgRaw = value.split(";").at(-1);
+	if (bgRaw === void 0) return null;
+	const bg = parseInt(bgRaw, 10);
+	if (!Number.isInteger(bg)) return null;
+	return new Set([
+		0,
+		1,
+		2,
+		3,
+		4,
+		5,
+		6,
+		8
+	]).has(bg) ? "dark" : "light";
+}
+//#endregion
+//#region src/tui/theme/styles.ts
+/**
+* Theme-aware style helpers built on chalk. Components hold a reference
+* to a `ThemeStyles` instance via `state.styles` and never reach into
+* raw chalk color names — that keeps theme switches consistent and lets
+* every visual token route through `ColorPalette`.
+*/
+function createThemeStyles(colors) {
+	return {
+		colors,
+		primary: (s) => chalk.hex(colors.primary)(s),
+		accent: (s) => chalk.hex(colors.accent)(s),
+		dim: (s) => chalk.hex(colors.textDim)(s),
+		muted: (s) => chalk.hex(colors.textMuted)(s),
+		text: (s) => chalk.hex(colors.text)(s),
+		strong: (s) => chalk.hex(colors.textStrong)(s),
+		error: (s) => chalk.hex(colors.error)(s),
+		warning: (s) => chalk.hex(colors.warning)(s),
+		success: (s) => chalk.hex(colors.success)(s),
+		label: (s) => chalk.bold.hex(colors.textDim)(s),
+		value: (s) => chalk.hex(colors.text)(s),
+		diffAdd: (s) => chalk.hex(colors.diffAdded)(s),
+		diffDel: (s) => chalk.hex(colors.diffRemoved)(s),
+		diffAddBold: (s) => chalk.bold.hex(colors.diffAddedStrong)(s),
+		diffDelBold: (s) => chalk.bold.hex(colors.diffRemovedStrong)(s),
+		diffGutter: (s) => chalk.hex(colors.diffGutter)(s),
+		diffMeta: (s) => chalk.hex(colors.diffMeta)(s)
+	};
+}
+//#endregion
 //#region src/tui/theme/pi-tui-theme.ts
-const HEADING_HASH_PREFIX = /^((?:\x1B\[[0-9;]*m)*)#{1,6}[ \t]+/;
+const HEADING_HASH_PREFIX = /^((?:\u001B\[[0-9;]*m)*)#{1,6}[ \t]+/;
 function createMarkdownTheme(colors) {
 	const stripHash = (text) => text.replace(HEADING_HASH_PREFIX, "$1");
+	const muted = chalk.hex(colors.textMuted);
+	const dim = chalk.hex(colors.textDim);
+	const border = chalk.hex(colors.border);
 	return {
 		heading: (text) => chalk.bold.hex(colors.text)(stripHash(text)),
 		link: (text) => chalk.hex(colors.primary)(text),
-		linkUrl: (text) => chalk.dim(text),
+		linkUrl: (text) => muted(text),
 		code: (text) => chalk.hex(colors.primary)(text),
 		codeBlock: (text) => text,
-		codeBlockBorder: (text) => chalk.dim(text),
-		quote: (text) => chalk.gray(text),
-		quoteBorder: (text) => chalk.gray(text),
-		hr: (text) => chalk.dim(text),
-		listBullet: (text) => chalk.white(text.replace(/^-/, "•")),
+		codeBlockBorder: (text) => border(text),
+		quote: (text) => dim(text),
+		quoteBorder: (text) => dim(text),
+		hr: (text) => border(text),
+		listBullet: (text) => chalk.hex(colors.roleAssistant)(text.replace(/^-/, "•")),
 		bold: (text) => chalk.bold(text),
 		italic: (text) => chalk.italic(text),
 		strikethrough: (text) => chalk.strikethrough(text),
@@ -96811,18 +97217,39 @@ function createMarkdownTheme(colors) {
 	};
 }
 function createEditorTheme(colors) {
+	const muted = chalk.hex(colors.textMuted);
 	return {
 		borderColor: (s) => chalk.hex(colors.border)(s),
 		selectList: {
 			selectedPrefix: (s) => chalk.hex(colors.primary)(s),
 			selectedText: (s) => chalk.hex(colors.primary)(s),
-			description: (s) => chalk.dim(s),
-			scrollInfo: (s) => chalk.dim(s),
-			noMatch: (s) => chalk.dim(s)
+			description: (s) => muted(s),
+			scrollInfo: (s) => muted(s),
+			noMatch: (s) => muted(s)
 		}
 	};
 }
 //#endregion
+//#region src/tui/theme/index.ts
+/**
+* Resolve a user preference to a concrete palette key. `'auto'` triggers
+* terminal background detection (OSC 11 with COLORFGBG / dark fallback);
+* explicit choices pass through.
+*/
+async function resolveTheme(theme) {
+	if (theme === "auto") return detectTerminalTheme();
+	return theme;
+}
+/**
+* Synchronous fallback used by paths that cannot wait on terminal probes
+* (initial state construction, in-TUI theme switches). `'auto'` collapses
+* to `'dark'`; explicit choices pass through.
+*/
+function resolveThemeSync(theme) {
+	if (theme === "auto") return "dark";
+	return theme;
+}
+//#endregion
 //#region src/tui/core/ui-ops.ts
 function isExpandable(obj) {
 	return typeof obj === "object" && obj !== null && "setExpanded" in obj && typeof obj.setExpanded === "function";
@@ -96898,15 +97325,34 @@ function clearTranscriptAndRedraw(state) {
 }
 /** Use primary color for slash commands or while plan mode is active. */
 function updateEditorBorderHighlight(state, text) {
-	const editorTheme = createEditorTheme(state.colors);
 	const trimmed = (text ?? state.editor.getText()).trimStart();
 	if (state.appState.planMode || trimmed.startsWith("/")) {
 		const primary = state.colors.primary;
 		state.editor.borderColor = (s) => chalk.hex(primary)(s);
-	} else state.editor.borderColor = editorTheme.borderColor;
+	} else state.editor.borderColor = state.editorTheme.borderColor;
 	state.editor.slashHighlightHex = state.colors.primary;
 	state.ui.requestRender();
 }
+/**
+* Apply a theme preference. `resolved` lets callers pre-compute the
+* concrete palette (e.g. async OSC 11 detection done before re-entering
+* the TUI); when omitted we fall back to the synchronous rule
+* (`'auto'` → `'dark'`).
+*/
+function applyTheme(state, theme, hooks, resolved) {
+	const resolvedTheme = resolved ?? resolveThemeSync(theme);
+	Object.assign(state.colors, getColorPalette(resolvedTheme));
+	state.appState.theme = theme;
+	state.resolvedTheme = resolvedTheme;
+	state.styles = createThemeStyles(state.colors);
+	state.markdownTheme = createMarkdownTheme(state.colors);
+	state.editorTheme = createEditorTheme(state.colors);
+	updateEditorBorderHighlight(state);
+	hooks.syncFooter();
+	hooks.refreshActivityPane();
+	hooks.refreshQueuePane();
+	state.ui.requestRender(true);
+}
 //#endregion
 //#region src/tui/handlers/subagent.ts
 function handleSubagentSourceEvent(ectx, payload) {
@@ -97379,6 +97825,31 @@ const shellCommands = [
 		async execute() {
 			return ok$1("__show_usage__");
 		}
+	},
+	{
+		name: "editor",
+		aliases: [],
+		description: "Set the external editor for Ctrl-G",
+		mode: "both",
+		priority: 60,
+		async execute(args, _ctx) {
+			const trimmed = args.trim();
+			if (trimmed.length === 0) return ok$1("__show_editor_picker__");
+			return ok$1(`__set_editor__:${trimmed}`);
+		}
+	},
+	{
+		name: "theme",
+		aliases: [],
+		description: "Set the terminal UI theme",
+		mode: "both",
+		priority: 60,
+		async execute(args) {
+			const trimmed = args.trim();
+			if (trimmed.length === 0) return ok$1("__show_theme_picker__");
+			if (trimmed === "dark" || trimmed === "light" || trimmed === "auto") return ok$1(`__set_theme__:${trimmed}`);
+			return ok$1(`Unknown theme: ${trimmed}`);
+		}
 	}
 ];
 //#endregion
@@ -98169,49 +98640,6 @@ var QuestionController = class extends ReverseRpcController {
 	}
 };
 //#endregion
-//#region src/tui/theme/colors.ts
-const darkColors = {
-	primary: "#4FA8FF",
-	primaryDim: "#2563EB",
-	text: "#E0E0E0",
-	textDim: "#888888",
-	textMuted: "#555555",
-	success: "#4EC87E",
-	warning: "#E8A838",
-	error: "#E85454",
-	info: "#4FA8FF",
-	border: "#444444",
-	prompt: "#4FA8FF",
-	spinner: "#4FA8FF",
-	user: "#FFCB6B",
-	assistant: "#E0E0E0",
-	thinking: "#888888",
-	toolCall: "#E8A838",
-	status: "#888888"
-};
-const lightColors = {
-	primary: "#1783ff",
-	primaryDim: "#6ba7e8",
-	text: "#1A1A1A",
-	textDim: "#666666",
-	textMuted: "#999999",
-	success: "#16A34A",
-	warning: "#CA8A04",
-	error: "#DC2626",
-	info: "#1783ff",
-	border: "#CCCCCC",
-	prompt: "#1783ff",
-	spinner: "#1783ff",
-	user: "#B45309",
-	assistant: "#1A1A1A",
-	thinking: "#666666",
-	toolCall: "#CA8A04",
-	status: "#666666"
-};
-function getColorPalette(theme) {
-	return theme === "dark" ? darkColors : lightColors;
-}
-//#endregion
 //#region src/tui/state.ts
 const INITIAL_LIVE_PANE = {
 	mode: "idle",
@@ -98228,7 +98656,9 @@ const INITIAL_LIVE_PANE = {
 */
 function createTUIState(options) {
 	const initialAppState = options.initialAppState;
-	const colors = getColorPalette(initialAppState.theme);
+	const resolvedTheme = options.resolvedTheme ?? resolveThemeSync(initialAppState.theme);
+	const colors = { ...getColorPalette(resolvedTheme) };
+	const styles = createThemeStyles(colors);
 	const markdownTheme = createMarkdownTheme(colors);
 	const editorTheme = createEditorTheme(colors);
 	const terminal = new ProcessTerminal();
@@ -98261,10 +98691,13 @@ function createTUIState(options) {
 		footer,
 		editor,
 		colors,
+		styles,
 		markdownTheme,
+		editorTheme,
+		resolvedTheme,
 		appState: { ...initialAppState },
 		startupState: "pending",
-		startupNotice: void 0,
+		startupNotice: options.startup.startupNotice,
 		livePane: { ...INITIAL_LIVE_PANE },
 		transcriptEntries: [],
 		toasts: [],
@@ -98439,6 +98872,9 @@ function dequeueFirst(state) {
 	state.queuedMessages = state.queuedMessages.slice(1);
 	return first.text;
 }
+function clearQueue(state) {
+	state.queuedMessages.length = 0;
+}
 //#endregion
 //#region src/tui/actions/wire-ops.ts
 /** Immediately send a message through the wire client (no queue). */
@@ -98569,21 +99005,21 @@ function sendMessage(state, addEntry, input, options) {
 */
 function steerMessage(state, addEntry, input) {
 	if (state.appState.isCompacting) {
-		enqueueMessage(state, input);
+		for (const part of input) enqueueMessage(state, part);
 		return;
 	}
 	if (!state.appState.isStreaming) {
-		sendMessageInternal(state, addEntry, input);
+		for (const part of input) sendMessageInternal(state, addEntry, part);
 		return;
 	}
-	addEntry({
+	for (const part of input) addEntry({
 		id: nextTranscriptId(),
 		kind: "user",
 		turnId: state.currentTurnId,
 		renderMode: "plain",
-		content: input
+		content: part
 	});
-	state.client.steer(state.appState.sessionId, input).catch((error) => {
+	state.client.steer(state.appState.sessionId, input.join("\n\n")).catch((error) => {
 		const message = error instanceof Error ? error.message : String(error);
 		addEntry({
 			id: nextTranscriptId(),
@@ -99150,7 +99586,7 @@ var CompactionComponent = class extends Container {
 	}
 	buildHeader() {
 		if (this.done) return `${chalk.hex(this.colors.success)("⏺ ")}${chalk.hex(this.colors.success).bold("Compaction complete")}${this.tokensBefore !== void 0 && this.tokensAfter !== void 0 ? chalk.dim(` (${String(this.tokensBefore)} → ${String(this.tokensAfter)} tokens)`) : ""}`;
-		return `${this.blinkOn ? chalk.white("⏺ ") : "  "}${chalk.hex(this.colors.primary).bold("Compacting context...")}`;
+		return `${this.blinkOn ? chalk.hex(this.colors.roleAssistant)("⏺ ") : "  "}${chalk.hex(this.colors.primary).bold("Compacting context...")}`;
 	}
 	startBlink() {
 		this.blinkTimer = setInterval(() => {
@@ -99167,6 +99603,15 @@ var CompactionComponent = class extends Container {
 	}
 };
 //#endregion
+//#region src/tui/actions/plan-ops.ts
+async function refreshPlanFromCore(state) {
+	try {
+		return await state.client.getPlan(state.appState.sessionId);
+	} catch {
+		return {};
+	}
+}
+//#endregion
 //#region src/tui/actions/stream-ops.ts
 /**
 * Streaming / tool-call / compaction render hooks.
@@ -99176,7 +99621,7 @@ var CompactionComponent = class extends Container {
 * on `state` is touched — state-ops.ts owns AppState / LivePane.
 */
 function onStreamingTextStart(state) {
-	state.streamingComponent = new AssistantMessageComponent(state.markdownTheme);
+	state.streamingComponent = new AssistantMessageComponent(state.markdownTheme, state.colors);
 	state.transcriptContainer.addChild(state.streamingComponent);
 	state.ui.requestRender();
 }
@@ -99209,6 +99654,10 @@ function onToolCallStart(state, toolCall) {
 	state.pendingToolComponents.set(toolCall.id, tc);
 	state.transcriptContainer.addChild(tc);
 	state.ui.requestRender();
+	if (toolCall.name === "ExitPlanMode" && typeof toolCall.args["plan"] !== "string") (async () => {
+		const snapshot = await refreshPlanFromCore(state);
+		tc.setPlanInfo(snapshot);
+	})();
 }
 function onToolCallEnd(state, toolCallId, result) {
 	const matchedCall = state.activeToolCalls.get(toolCallId);
@@ -99251,6 +99700,126 @@ function endCompaction(state, tokensBefore, tokensAfter) {
 	state.ui.requestRender();
 }
 //#endregion
+//#region src/tui/components/dialogs/choice-picker.ts
+/**
+* ChoicePicker — modal single-select list for slash commands that ask
+* the user to pick from a small set of preset values.
+*
+* Mirrors SessionPickerComponent's container-replacement pattern: host
+* calls `showChoicePicker(...)` which clears the editor container,
+* addChild(picker), setFocus(picker); the picker invokes `onSelect` or
+* `onCancel`, and the host tears it down.
+*/
+const CURRENT_MARK = "← current";
+var ChoicePickerComponent = class extends Container {
+	focused = false;
+	opts;
+	selectedIndex;
+	constructor(opts) {
+		super();
+		this.opts = opts;
+		const currentIdx = opts.options.findIndex((o) => o.value === opts.currentValue);
+		this.selectedIndex = Math.max(currentIdx, 0);
+	}
+	handleInput(data) {
+		if (matchesKey(data, Key.escape)) {
+			this.opts.onCancel();
+			return;
+		}
+		if (matchesKey(data, Key.up)) {
+			this.selectedIndex = Math.max(0, this.selectedIndex - 1);
+			return;
+		}
+		if (matchesKey(data, Key.down)) {
+			this.selectedIndex = Math.min(this.opts.options.length - 1, this.selectedIndex + 1);
+			return;
+		}
+		if (matchesKey(data, Key.enter)) {
+			const chosen = this.opts.options[this.selectedIndex];
+			if (chosen !== void 0) this.opts.onSelect(chosen.value);
+			return;
+		}
+	}
+	render(width) {
+		const { colors } = this.opts;
+		const hint = this.opts.hint ?? "↑↓ navigate · Enter select · Esc cancel";
+		const lines = [
+			chalk.hex(colors.primary)("─".repeat(width)),
+			chalk.hex(colors.primary).bold(` ${this.opts.title}`),
+			chalk.hex(colors.textMuted)(` ${hint}`),
+			""
+		];
+		for (let i = 0; i < this.opts.options.length; i++) {
+			const opt = this.opts.options[i];
+			const isSelected = i === this.selectedIndex;
+			const isCurrent = opt.value === this.opts.currentValue;
+			const pointer = isSelected ? "❯" : " ";
+			const labelStyle = isSelected ? chalk.hex(colors.primary).bold : chalk.hex(colors.text);
+			let line = chalk.hex(isSelected ? colors.primary : colors.textDim)(`  ${pointer} `);
+			line += labelStyle(opt.label);
+			if (isCurrent) line += " " + chalk.hex(colors.success)(CURRENT_MARK);
+			lines.push(line);
+		}
+		lines.push("");
+		lines.push(chalk.hex(colors.primary)("─".repeat(width)));
+		return lines;
+	}
+};
+//#endregion
+//#region src/tui/panels/theme-picker.ts
+const THEME_OPTIONS = [
+	{
+		value: "auto",
+		label: "Auto (match terminal)"
+	},
+	{
+		value: "dark",
+		label: "Dark"
+	},
+	{
+		value: "light",
+		label: "Light"
+	}
+];
+function isTheme(value) {
+	return value === "dark" || value === "light" || value === "auto";
+}
+function showThemePicker(state, hooks) {
+	mountPanel(state, new ChoicePickerComponent({
+		title: "Select theme",
+		hint: "↑↓ navigate · Enter select · Esc cancel",
+		options: [...THEME_OPTIONS],
+		currentValue: state.appState.theme,
+		colors: state.colors,
+		onSelect: (value) => {
+			closeThemePicker(state);
+			if (isTheme(value)) applyThemeChoice(state, value, hooks);
+		},
+		onCancel: () => closeThemePicker(state)
+	}));
+}
+function closeThemePicker(state) {
+	unmountPanel(state);
+}
+async function applyThemeChoice(state, theme, hooks) {
+	if (theme === state.appState.theme) {
+		emitStatus(state, `Theme unchanged: "${theme}".`);
+		return;
+	}
+	try {
+		await saveTuiConfig({
+			theme,
+			editorCommand: state.appState.editorCommand
+		});
+	} catch (error) {
+		emitStatus(state, `Failed to save theme: ${error instanceof Error ? error.message : String(error)}`, state.colors.error);
+		return;
+	}
+	const resolved = await resolveTheme(theme);
+	applyTheme(state, theme, hooks, resolved);
+	emitStatus(state, `Theme set to "${theme}"${theme === "auto" ? ` (detected: ${resolved})` : ""}.`);
+}
+//#endregion
 //#region src/tui/commands/skill-commands.ts
 const SKILL_ACTIVATION_SENTINEL_PREFIX = "__activate_skill__:";
 async function fetchSkills(client, sessionId) {
@@ -99319,6 +99888,27 @@ async function tryDispatchSkill(client, sessionId, name, args) {
 }
 //#endregion
 //#region src/tui/commands/dispatch.ts
+/**
+* Slash-command dispatcher.
+*
+* 入口 `dispatchSlashCommand(input, state, buildCtx)` 替代旧
+* `KimiTUI.executeSlashCommand`。职责：
+*
+*  1. 通过 `parseSlashInput` 拆 `/name args`。
+*  2. 走 `state.registry.find(name)` 定位命令定义。
+*     - 未命中：交给 `tryDispatchSkill` 做 skill 兜底。
+*     - 命中：调用命令 `execute(args, ctx)` 拿到 `SlashCommandResult`。
+*  3. 解释 result：
+*     - `type: 'exit'` → 调 ctx.stop。
+*     - `type: 'reload'` → 调 ctx.performReload(action)。
+*     - `type: 'ok'` + 哨兵字符串 `__show_help__ / __show_sessions__ /
+*       __show_editor_picker__ / __show_theme_picker__ /
+*       __show_model_picker__ / __show_usage__ /
+*       __show_model_picker__:<alias> / __set_editor__:<cmd> /
+*       __set_theme__:<theme> / __send_as_message__:<text>` →
+*       分发到 `ctx.showXxx / ctx.sendAsMessage`。
+*     - 其它：把 `message` append 进 transcript。
+*/
 async function dispatchSlashCommand(input, state, buildCtx, addEntry) {
 	const parsed = parseSlashInput(input);
 	if (!parsed) return false;
@@ -99379,6 +99969,10 @@ async function dispatchSlashCommand(input, state, buildCtx, addEntry) {
 				ctx.showEditorPicker();
 				return true;
 			}
+			if (result.message === "__show_theme_picker__") {
+				ctx.showThemePicker();
+				return true;
+			}
 			if (result.message === "__show_model_picker__") {
 				ctx.showModelPicker();
 				return true;
@@ -99392,6 +99986,18 @@ async function dispatchSlashCommand(input, state, buildCtx, addEntry) {
 				ctx.showThinkingPicker(alias);
 				return true;
 			}
+			if (result.message.startsWith("__set_editor__:")) {
+				const command = result.message.slice(15);
+				await ctx.setEditorCommand(command);
+				return true;
+			}
+			if (result.message.startsWith("__set_theme__:")) {
+				const theme = result.message.slice(14);
+				if (isTheme(theme)) {
+					await ctx.setTheme(theme);
+					return true;
+				}
+			}
 			if (result.message.startsWith("__send_as_message__:")) {
 				const msg = result.message.slice(20);
 				ctx.sendAsMessage(msg);
@@ -99770,72 +100376,6 @@ function dispatchEvent(event, ectx, sendQueued) {
 	}
 }
 //#endregion
-//#region src/tui/components/dialogs/choice-picker.ts
-/**
-* ChoicePicker — modal single-select list for slash commands that ask
-* the user to pick from a small set of preset values.
-*
-* Mirrors SessionPickerComponent's container-replacement pattern: host
-* calls `showChoicePicker(...)` which clears the editor container,
-* addChild(picker), setFocus(picker); the picker invokes `onSelect` or
-* `onCancel`, and the host tears it down.
-*/
-const CURRENT_MARK = "← current";
-var ChoicePickerComponent = class extends Container {
-	focused = false;
-	opts;
-	selectedIndex;
-	constructor(opts) {
-		super();
-		this.opts = opts;
-		const currentIdx = opts.options.findIndex((o) => o.value === opts.currentValue);
-		this.selectedIndex = Math.max(currentIdx, 0);
-	}
-	handleInput(data) {
-		if (matchesKey(data, Key.escape)) {
-			this.opts.onCancel();
-			return;
-		}
-		if (matchesKey(data, Key.up)) {
-			this.selectedIndex = Math.max(0, this.selectedIndex - 1);
-			return;
-		}
-		if (matchesKey(data, Key.down)) {
-			this.selectedIndex = Math.min(this.opts.options.length - 1, this.selectedIndex + 1);
-			return;
-		}
-		if (matchesKey(data, Key.enter)) {
-			const chosen = this.opts.options[this.selectedIndex];
-			if (chosen !== void 0) this.opts.onSelect(chosen.value);
-			return;
-		}
-	}
-	render(width) {
-		const { colors } = this.opts;
-		const hint = this.opts.hint ?? "↑↓ navigate · Enter select · Esc cancel";
-		const lines = [
-			chalk.hex(colors.primary)("─".repeat(width)),
-			chalk.hex(colors.primary).bold(` ${this.opts.title}`),
-			chalk.hex(colors.textMuted)(` ${hint}`),
-			""
-		];
-		for (let i = 0; i < this.opts.options.length; i++) {
-			const opt = this.opts.options[i];
-			const isSelected = i === this.selectedIndex;
-			const isCurrent = opt.value === this.opts.currentValue;
-			const pointer = isSelected ? "❯" : " ";
-			const labelStyle = isSelected ? chalk.hex(colors.primary).bold : chalk.hex(colors.text);
-			let line = chalk.hex(isSelected ? colors.primary : colors.textDim)(`  ${pointer} `);
-			line += labelStyle(opt.label);
-			if (isCurrent) line += " " + chalk.hex(colors.success)(CURRENT_MARK);
-			lines.push(line);
-		}
-		lines.push("");
-		lines.push(chalk.hex(colors.primary)("─".repeat(width)));
-		return lines;
-	}
-};
-//#endregion
 //#region src/tui/panels/editor-picker.ts
 /**
 * `/editor` modal — picks an external editor command.
@@ -99880,12 +100420,22 @@ function showEditorPicker(state, hooks) {
 function closeEditorPicker(state) {
 	unmountPanel(state);
 }
-function applyEditorChoice(state, value, hooks) {
-	if (value === (state.appState.editorCommand ?? "")) {
+async function applyEditorChoice(state, value, hooks) {
+	if (value === (state.appState.editorCommand ?? "") && value.length > 0) {
 		emitStatus(state, `Editor unchanged: ${value.length > 0 ? value : "auto-detect"}`);
 		return;
 	}
-	setState(state, { editorCommand: value.length > 0 ? value : null }, hooks);
+	const editorCommand = value.length > 0 ? value : null;
+	try {
+		await saveTuiConfig({
+			theme: state.appState.theme,
+			editorCommand
+		});
+	} catch (error) {
+		emitStatus(state, `Failed to save editor: ${error instanceof Error ? error.message : String(error)}`, state.colors.error);
+		return;
+	}
+	setState(state, { editorCommand }, hooks);
 	emitStatus(state, value.length > 0 ? `Editor set to "${value}".` : "Editor set to auto-detect ($VISUAL / $EDITOR).");
 }
 //#endregion
@@ -100460,7 +101010,7 @@ var MoonLoader = class extends Text {
 		this.ui = ui;
 		this.frames = style === "moon" ? MOON_PHASES : BRAILLE_FRAMES;
 		this.interval = style === "moon" ? MOON_INTERVAL : BRAILLE_INTERVAL;
-		if (colorFn !== void 0) this.colorFn = colorFn;
+		this.colorFn = colorFn;
 		this.label = label;
 		this.start();
 	}
@@ -100579,9 +101129,11 @@ function updateQueueDisplay(state) {
 	state.queueContainer.clear();
 	const queued = state.queuedMessages;
 	if (queued.length === 0) return;
-	for (const item of queued) state.queueContainer.addChild(new Text(chalk.cyan.dim(`  ❯ ${item.text}`), 0, 0));
+	const accent = chalk.hex(state.colors.accent);
+	const dim = chalk.hex(state.colors.textDim);
+	for (const item of queued) state.queueContainer.addChild(new Text(accent(`  ❯ ${item.text}`), 0, 0));
 	const hint = state.appState.isCompacting && !state.appState.isStreaming ? "  ↑ to edit · will send after compaction" : "  ↑ to edit · ctrl-s to steer immediately";
-	state.queueContainer.addChild(new Text(chalk.dim(hint), 0, 0));
+	state.queueContainer.addChild(new Text(dim(hint), 0, 0));
 }
 //#endregion
 //#region src/tui/reverse-rpc/approval/adapter.ts
@@ -100919,9 +101471,18 @@ function truncateOneLine(text, max) {
 }
 const DIFF_SUMMARY_MAX_LINES = 10;
 const CONTENT_SUMMARY_MAX_LINES = 10;
-function renderDisplayBlock(block, expanded) {
+function makeBlockStyles(colors) {
+	return {
+		strong: (s) => chalk.hex(colors.textStrong)(s),
+		dim: (s) => chalk.hex(colors.textDim)(s),
+		accent: (s) => chalk.hex(colors.accent)(s),
+		gutter: (s) => chalk.hex(colors.diffGutter)(s),
+		errorBold: (s) => chalk.bold.hex(colors.error)(s)
+	};
+}
+function renderDisplayBlock(block, expanded, s, colors) {
 	switch (block.type) {
-		case "diff": return renderDiffLinesClustered(block.old_text, block.new_text, block.path, {
+		case "diff": return renderDiffLinesClustered(block.old_text, block.new_text, block.path, colors, {
 			contextLines: 3,
 			...expanded ? {} : { maxLines: DIFF_SUMMARY_MAX_LINES }
 		});
@@ -100930,42 +101491,42 @@ function renderDisplayBlock(block, expanded) {
 			const allLines = highlightLines(block.content, lang);
 			const cap = expanded ? allLines.length : CONTENT_SUMMARY_MAX_LINES;
 			const shown = allLines.slice(0, cap);
-			const lines = [chalk.whiteBright(block.path)];
-			for (const [i, line] of shown.entries()) lines.push(chalk.gray(String(i + 1).padStart(4) + "  ") + line);
+			const lines = [s.strong(block.path)];
+			for (const [i, line] of shown.entries()) lines.push(s.gutter(String(i + 1).padStart(4) + "  ") + line);
 			const remaining = allLines.length - shown.length;
-			if (remaining > 0) lines.push(chalk.dim(`     … ${String(remaining)} more line${remaining > 1 ? "s" : ""} hidden (ctrl+o to expand)`));
+			if (remaining > 0) lines.push(s.dim(`     … ${String(remaining)} more line${remaining > 1 ? "s" : ""} hidden (ctrl+o to expand)`));
 			return lines;
 		}
 		case "shell": {
 			const lines = [];
-			if (block.cwd !== void 0 && block.cwd.length > 0) lines.push(chalk.dim(`cwd: ${block.cwd}`));
-			if (block.danger !== void 0) lines.push(chalk.red.bold(`⚠  potentially destructive: ${block.danger}`));
+			if (block.cwd !== void 0 && block.cwd.length > 0) lines.push(s.dim(`cwd: ${block.cwd}`));
+			if (block.danger !== void 0) lines.push(s.errorBold(`⚠  potentially destructive: ${block.danger}`));
 			(block.command.length > 0 ? block.command.split("\n") : [""]).forEach((cmdLine, idx) => {
-				const prefix = idx === 0 ? chalk.cyan("$") : chalk.dim("·");
-				lines.push(`${prefix} ${chalk.whiteBright(cmdLine)}`);
+				const prefix = idx === 0 ? s.accent("$") : s.dim("·");
+				lines.push(`${prefix} ${s.strong(cmdLine)}`);
 			});
-			if (block.description !== void 0 && block.description.length > 0) lines.push(`  ${chalk.dim(block.description)}`);
+			if (block.description !== void 0 && block.description.length > 0) lines.push(`  ${s.dim(block.description)}`);
 			return lines;
 		}
 		case "file_op": {
-			const lines = [`${chalk.cyan(block.operation.padEnd(5))} ${chalk.whiteBright(block.path)}`];
-			if (block.detail !== void 0 && block.detail.length > 0) lines.push(chalk.dim(block.detail));
+			const lines = [`${s.accent(block.operation.padEnd(5))} ${s.strong(block.path)}`];
+			if (block.detail !== void 0 && block.detail.length > 0) lines.push(s.dim(block.detail));
 			return lines;
 		}
-		case "url_fetch": return [`${chalk.cyan((block.method ?? "GET").toUpperCase().padEnd(5))} ${chalk.whiteBright(block.url)}`];
+		case "url_fetch": return [`${s.accent((block.method ?? "GET").toUpperCase().padEnd(5))} ${s.strong(block.url)}`];
 		case "search": {
-			const lines = [`${chalk.cyan("search")} ${chalk.whiteBright(block.query)}`];
-			if (block.scope !== void 0 && block.scope.length > 0) lines.push(chalk.dim(`scope: ${block.scope}`));
+			const lines = [`${s.accent("search")} ${s.strong(block.query)}`];
+			if (block.scope !== void 0 && block.scope.length > 0) lines.push(s.dim(`scope: ${block.scope}`));
 			return lines;
 		}
 		case "invocation": {
-			const lines = [`${chalk.cyan(block.kind.padEnd(5))} ${chalk.whiteBright(block.name)}`];
-			if (block.description !== void 0 && block.description.length > 0) lines.push(chalk.dim(truncateOneLine(block.description, 200)));
+			const lines = [`${s.accent(block.kind.padEnd(5))} ${s.strong(block.name)}`];
+			if (block.description !== void 0 && block.description.length > 0) lines.push(s.dim(truncateOneLine(block.description, 200)));
 			return lines;
 		}
-		case "brief": return block.text ? block.text.split("\n").map((line) => line.length > 0 ? chalk.whiteBright(line) : "") : [];
-		case "background_task": return [chalk.whiteBright(`${block.status} ${block.kind} task ${block.task_id}: ${block.description}`)];
-		case "todo": return block.items.map((item) => chalk.whiteBright(`- [${item.status}] ${item.title}`));
+		case "brief": return block.text ? block.text.split("\n").map((line) => line.length > 0 ? s.strong(line) : "") : [];
+		case "background_task": return [s.strong(`${block.status} ${block.kind} task ${block.task_id}: ${block.description}`)];
+		case "todo": return block.items.map((item) => s.strong(`- [${item.status}] ${item.title}`));
 		default: return [];
 	}
 }
@@ -100982,8 +101543,6 @@ function isDuplicateBriefBlock(block, description) {
 	if (blockLines.length <= 1) return false;
 	return normalizeApprovalText(blockLines.slice(1).join("\n")) === normalizedDescription;
 }
-const borderColor = chalk.yellow;
-const selectColor = chalk.cyan;
 function headerFor(toolName) {
 	switch (toolName) {
 		case "Bash": return "Run this command?";
@@ -101002,10 +101561,12 @@ var ApprovalPanelComponent = class extends Container {
 	expanded = false;
 	onResponse;
 	request;
-	constructor(request, onResponse) {
+	colors;
+	constructor(request, onResponse, colors) {
 		super();
 		this.request = request;
 		this.onResponse = onResponse;
+		this.colors = colors;
 		this.feedbackInput.onSubmit = (value) => {
 			this.submit(this.selectedIndex, value);
 		};
@@ -101076,21 +101637,27 @@ var ApprovalPanelComponent = class extends Container {
 		this.ensureValidSelection();
 		this.feedbackInput.focused = this.focused && this.feedbackMode;
 		const { data } = this.request;
+		const blockStyles = makeBlockStyles(this.colors);
+		const borderColor = chalk.hex(this.colors.borderFocus);
+		const borderColorBold = chalk.bold.hex(this.colors.borderFocus);
+		const selectColorBold = chalk.bold.hex(this.colors.accent);
+		const dim = chalk.hex(this.colors.textDim);
+		const strong = chalk.hex(this.colors.textStrong);
 		const horizontalBar = borderColor("─".repeat(width));
 		const indent = (s) => `  ${s}`;
 		const title = headerFor(data.tool_name);
-		const lines = [horizontalBar, indent(`${borderColor.bold("▶")} ${borderColor.bold(title)}`)];
+		const lines = [horizontalBar, indent(`${borderColorBold("▶")} ${borderColorBold(title)}`)];
 		const visibleBlocks = data.display.filter((block) => !isDuplicateBriefBlock(block, data.description)).slice(0, 5);
 		const hasExpandable = visibleBlocks.some((block) => block.type === "diff" || block.type === "file_content");
 		if (visibleBlocks.length > 0) {
 			lines.push("");
 			for (const block of visibleBlocks) {
-				const blockLines = renderDisplayBlock(block, this.expanded);
+				const blockLines = renderDisplayBlock(block, this.expanded, blockStyles, this.colors);
 				for (const line of blockLines) lines.push(indent(line));
 			}
 		} else if (data.description) {
 			lines.push("");
-			for (const descLine of data.description.split("\n")) lines.push(indent(chalk.dim(descLine)));
+			for (const descLine of data.description.split("\n")) lines.push(indent(dim(descLine)));
 		}
 		lines.push("");
 		for (let idx = 0; idx < data.choices.length; idx++) {
@@ -101100,14 +101667,14 @@ var ApprovalPanelComponent = class extends Container {
 			const num = idx + 1;
 			const labelWithNum = `${String(num)}. ${option.label}`;
 			if (this.feedbackMode && option.requires_feedback === true && isSelected) lines.push(indent(this.renderInlineFeedbackLine(width - 2, labelWithNum)));
-			else if (isSelected) lines.push(indent(`${selectColor.bold("▶")} ${selectColor.bold(labelWithNum)}`));
-			else lines.push(indent(chalk.whiteBright(`  ${labelWithNum}`)));
+			else if (isSelected) lines.push(indent(`${selectColorBold("▶")} ${selectColorBold(labelWithNum)}`));
+			else lines.push(indent(strong(`  ${labelWithNum}`)));
 		}
 		lines.push("");
-		if (this.feedbackMode) lines.push(indent(chalk.dim("Type feedback · ↵ submit.")));
+		if (this.feedbackMode) lines.push(indent(dim("Type feedback · ↵ submit.")));
 		else {
 			const expandHint = hasExpandable ? ` · ctrl+o ${this.expanded ? "collapse" : "expand"}` : "";
-			lines.push(indent(chalk.dim(`↑/↓ select · ${buildNumericHint(data.choices.length)} choose · ↵ confirm${expandHint}`)));
+			lines.push(indent(dim(`↑/↓ select · ${buildNumericHint(data.choices.length)} choose · ↵ confirm${expandHint}`)));
 		}
 		lines.push(horizontalBar);
 		return lines.map((line) => truncateToWidth(line, width));
@@ -101127,7 +101694,8 @@ var ApprovalPanelComponent = class extends Container {
 		if (this.selectedIndex < 0 || this.selectedIndex >= count) this.selectedIndex = Math.max(0, Math.min(this.selectedIndex, count - 1));
 	}
 	renderInlineFeedbackLine(width, labelWithNum) {
-		const prefix = `${selectColor.bold("▶")} ${selectColor.bold(labelWithNum)}  `;
+		const selectColorBold = chalk.bold.hex(this.colors.accent);
+		const prefix = `${selectColorBold("▶")} ${selectColorBold(labelWithNum)}  `;
 		const inputWidth = Math.max(4, width - visibleWidth(prefix) + 2);
 		const inputLine = this.feedbackInput.render(inputWidth)[0] ?? "> ";
 		return prefix + (inputLine.startsWith("> ") ? inputLine.slice(2) : inputLine);
@@ -101148,7 +101716,7 @@ function showApprovalPanel(state, payload) {
 	updateActivityPane(state);
 	mountPanel(state, new ApprovalPanelComponent({ data: payload }, (response) => {
 		state.approvalController.respond(adaptPanelResponse(response));
-	}));
+	}, state.colors));
 }
 function hideApprovalPanel(state) {
 	state.livePane.pendingApproval = null;
@@ -101601,7 +102169,7 @@ var QuestionDialogComponent = class extends Container {
 			if (question === void 0) continue;
 			const label = question.header !== void 0 && question.header.length > 0 ? question.header : `Q${String(i + 1)}`;
 			if (i === this.currentTab) tabs.push(active(` ${label} `));
-			else if (this.isAnswered(i)) tabs.push(chalk.green(`(✓) ${label}`));
+			else if (this.isAnswered(i)) tabs.push(chalk.hex(this.colors.success)(`(✓) ${label}`));
 			else tabs.push(dim(`(○) ${label}`));
 		}
 		const submitLabel = "Submit";
@@ -102362,12 +102930,17 @@ function setupEditor(state, cb) {
 	editor.onCtrlS = () => {
 		if (!state.appState.isStreaming || state.appState.isCompacting) return;
 		const text = editor.getText().trim();
-		if (text.length > 0) {
+		const queuedTexts = state.queuedMessages.map((m) => m.text);
+		clearQueue(state);
+		const parts = [];
+		for (const q of queuedTexts) {
+			const trimmed = q.trim();
+			if (trimmed.length > 0) parts.push(trimmed);
+		}
+		if (text.length > 0) parts.push(text);
+		if (parts.length > 0) {
 			editor.setText("");
-			cb.onSteerFromInput(text);
-		} else {
-			const first = cb.onSteerDequeueFirst();
-			if (first !== void 0) cb.onSteerFromInput(first);
+			cb.onSteerFromInput(parts);
 		}
 		cb.onAfterQueueMutation();
 		state.ui.requestRender();
@@ -102507,7 +103080,8 @@ var KimiTUI = class {
 		this.state = createTUIState({
 			client,
 			initialAppState: initialState,
-			startup: options.startup
+			startup: options.startup,
+			...options.resolvedTheme !== void 0 ? { resolvedTheme: options.resolvedTheme } : {}
 		});
 		this.stateHooks = {
 			syncFooter: () => this.state.footer.setState(this.state.appState),
@@ -102557,14 +103131,14 @@ var KimiTUI = class {
 		this.state.ui.setFocus(this.state.editor);
 		this.state.ui.start();
 		attachFooterFeed(this.state, buildFooterFeedHandlers(this.state));
-		if (this.state.startupState === "picker") {
-			bootstrapFromPicker(this.state, this.buildSessionBootstrapHooks());
-			return;
-		}
 		if (this.state.startupNotice !== void 0) {
 			emitMuted(this.state, this.state.startupNotice);
 			this.state.startupNotice = void 0;
 		}
+		if (this.state.startupState === "picker") {
+			bootstrapFromPicker(this.state, this.buildSessionBootstrapHooks());
+			return;
+		}
 		if (shouldReplayHistory) await hydrateTranscriptFromReplay(this.state, this.stateHooks, this.state.appState.sessionId);
 		this.startWireSubscription();
 		fetchSessions(this.state);
@@ -102729,11 +103303,14 @@ var KimiTUI = class {
 			showHelpPanel: () => showHelpPanel(this.state),
 			showSessionPicker: () => showSessionPicker(this.state, this.buildSessionHooks()),
 			showEditorPicker: () => showEditorPicker(this.state, this.stateHooks),
+			showThemePicker: () => showThemePicker(this.state, this.stateHooks),
 			showModelPicker: () => showModelPicker(this.state, this.stateHooks),
 			showThinkingPicker: (alias) => showThinkingPicker(this.state, alias, this.stateHooks),
 			showUsage: () => {
 				showUsage(this.state);
 			},
+			setEditorCommand: (command) => applyEditorChoice(this.state, command, this.stateHooks),
+			setTheme: (theme) => applyThemeChoice(this.state, theme, this.stateHooks),
 			sendAsMessage: (text) => sendMessage(this.state, (e) => this.addEntry(e), text),
 			activateSkill: (name, args, fullPrompt) => sendSkillActivation(this.state, (e) => this.addEntry(e), name, args, fullPrompt),
 			performReload: (action) => performReload(this.state, action, this.buildInputHooks())
@@ -102767,6 +103344,16 @@ function toInitialSessionIntent(opts) {
 }
 async function runShell(opts, version) {
 	const ctx = await createKimiAgent();
+	let tuiConfig;
+	let configWarning;
+	try {
+		tuiConfig = await loadTuiConfig();
+	} catch (error) {
+		if (!(error instanceof TuiConfigParseError)) throw error;
+		tuiConfig = error.fallback;
+		configWarning = error.message;
+	}
+	const resolvedTheme = tuiConfig.theme === "auto" ? await detectTerminalTheme() : tuiConfig.theme;
 	const workDir = process.cwd();
 	const initialState = {
 		model: ctx.model,
@@ -102783,18 +103370,22 @@ async function runShell(opts, version) {
 		isReplaying: false,
 		streamingPhase: "idle",
 		streamingStartTime: 0,
-		theme: "dark",
+		theme: tuiConfig.theme,
 		version,
-		editorCommand: null,
+		editorCommand: tuiConfig.editorCommand,
 		availableModels: ctx.availableModels,
 		sessionTitle: null
 	};
-	const tui = new KimiTUI(ctx.client, initialState, { startup: {
-		initialSession: toInitialSessionIntent(opts),
-		requestedPlanMode: opts.plan,
-		requestedYolo: opts.yolo,
-		syncSessionRuntime: ctx.syncSessionRuntime
-	} });
+	const tui = new KimiTUI(ctx.client, initialState, {
+		startup: {
+			initialSession: toInitialSessionIntent(opts),
+			requestedPlanMode: opts.plan,
+			requestedYolo: opts.yolo,
+			startupNotice: configWarning,
+			syncSessionRuntime: ctx.syncSessionRuntime
+		},
+		resolvedTheme
+	});
 	tui.onExit = async () => {
 		const sessionId = tui.getCurrentSessionId();
 		const hasContent = tui.hasSessionContent();