@moonshot-ai/kimi-code 0.22.3 → 0.23.0

package/dist/main.mjs

@@ -6,7 +6,7 @@ const __dirname = __cjsShimDirname(__filename);
 import { createRequire } from "node:module";
 import crypto$1, { createHash, randomBytes, randomInt, randomUUID, timingSafeEqual } from "node:crypto";
 import * as fs$16 from "node:fs";
-import Vt, { appendFileSync, chmodSync, closeSync, constants, copyFileSync, createReadStream, createWriteStream, existsSync, fsyncSync, mkdirSync, openSync, promises, readFileSync, readSync, readdirSync, realpathSync, renameSync, rmSync, statSync, unlinkSync, writeFileSync, writeSync } from "node:fs";
+import Vt, { accessSync, appendFileSync, chmodSync, closeSync, constants, copyFileSync, createReadStream, createWriteStream, existsSync, fsyncSync, mkdirSync, openSync, promises, readFileSync, readSync, readdirSync, realpathSync, renameSync, rmSync, statSync, unlinkSync, writeFileSync, writeSync } from "node:fs";
 import * as path$15 from "node:path";
 import path, { basename, dirname, extname, isAbsolute, join, normalize, posix, relative, resolve, sep, win32 } from "node:path";
 import { spawn } from "child_process";
@@ -36,7 +36,7 @@ import { finished, pipeline as pipeline$1 } from "node:stream/promises";
 import * as ks from "zlib";
 import qr from "zlib";
 import * as nodeOs from "node:os";
-import os, { arch, homedir as homedir$1, hostname, networkInterfaces, platform, release, tmpdir, type as type$1, userInfo } from "node:os";
+import os, { arch, cpus, freemem, homedir as homedir$1, hostname, loadavg, networkInterfaces, platform, release, tmpdir, totalmem, type as type$1, userInfo } from "node:os";
 import fs, { access, appendFile, chmod, copyFile, cp, lstat as lstat$1, mkdir, mkdtemp, open as open$1, readFile, readdir as readdir$1, realpath as realpath$1, rename, rm, stat as stat$2, unlink, utimes, writeFile as writeFile$1 } from "node:fs/promises";
 import { execFile, execFileSync, execSync, spawn as spawn$1, spawnSync } from "node:child_process";
 import * as posixPath from "node:path/posix";
@@ -967,6 +967,18 @@ function isContentPart(part) {
 	const t = part.type;
 	return t === "text" || t === "think" || t === "image_url" || t === "audio_url" || t === "video_url";
 }
+/**
+* True for a message whose only payload is `tools` — the dynamic tool-loading
+* primitive (see {@link Message.tools}). Message-level tool declarations are a
+* Kimi wire feature; every other provider must skip such a message entirely:
+* their explicit field construction already keeps the `tools` field off the
+* wire, but the leftover empty message would be rejected (OpenAI: system
+* message without content) or serialized as a garbage `<system></system>`
+* turn (Anthropic/Google system-to-user wrapping).
+*/
+function isToolDeclarationOnlyMessage(message) {
+	return message.tools !== void 0 && message.tools.length > 0 && message.content.length === 0 && message.toolCalls.length === 0;
+}
 /** Check if a streamed part is a ToolCall. */
 function isToolCall(part) {
 	return part.type === "function";
@@ -1051,7 +1063,7 @@ var init_provider$1 = __esmMin((() => {}));
 function isUnknownCapability(capability) {
 	if (capability === UNKNOWN_CAPABILITY) return true;
 	if (capability[UNKNOWN_CAPABILITY_MARKER] === true) return true;
-	return !capability.image_in && !capability.video_in && !capability.audio_in && !capability.thinking && !capability.tool_use && capability.max_context_tokens === 0;
+	return !capability.image_in && !capability.video_in && !capability.audio_in && !capability.thinking && !capability.tool_use && capability.select_tools !== true && capability.max_context_tokens === 0;
 }
 var UNKNOWN_CAPABILITY_MARKER, UNKNOWN_CAPABILITY;
 var init_capability = __esmMin((() => {
@@ -1062,7 +1074,8 @@ var init_capability = __esmMin((() => {
 		audio_in: false,
 		thinking: false,
 		tool_use: false,
-		max_context_tokens: 0
+		max_context_tokens: 0,
+		select_tools: false
 	}, UNKNOWN_CAPABILITY_MARKER, { value: true }));
 }));
 //#endregion
@@ -9573,6 +9586,7 @@ function convertAnthropicError(error) {
 var INTERLEAVED_THINKING_BETA, OPUS_VERSION_RE, ADAPTIVE_MIN_VERSION, ANTHROPIC_TOOL_CALL_ID_POLICY, CEILING_BY_FAMILY_VERSION, FALLBACK_MAX_TOKENS, FAMILY_FIRST_RE, VERSION_FIRST_RE, BARE_FAMILY_RE, CACHE_CONTROL, CACHEABLE_TYPES, OMITTED_MEDIA_PLACEHOLDER, SUPPORTED_B64_MEDIA_TYPES, SUPPORTED_B64_VIDEO_TYPES, AnthropicStreamedMessage, AnthropicChatProvider;
 var init_anthropic = __esmMin((() => {
 	init_errors$12();
+	init_message$3();
 	init_sdk();
 	init_merge_user_messages();
 	init_request_auth();
@@ -9885,7 +9899,7 @@ var init_anthropic = __esmMin((() => {
 				text: systemPrompt,
 				cache_control: CACHE_CONTROL
 			}] : void 0;
-			const messages = mergeConsecutiveUserMessages(normalizeToolCallIdsForProvider(history, ANTHROPIC_TOOL_CALL_ID_POLICY).map((msg) => convertMessage$3(msg, this._model)), {
+			const messages = mergeConsecutiveUserMessages(normalizeToolCallIdsForProvider(history.filter((msg) => !isToolDeclarationOnlyMessage(msg)), ANTHROPIC_TOOL_CALL_ID_POLICY).map((msg) => convertMessage$3(msg, this._model)), {
 				isUser: (message) => message.role === "user",
 				isToolResultOnly,
 				merge: (last, next) => ({
@@ -44811,10 +44825,10 @@ function normalizeGoogleGenAIFinishReason(raw) {
 	}
 }
 function toolToGoogleGenAI(tool) {
-	return { function_declarations: [{
+	return { functionDeclarations: [{
 		name: tool.name,
 		description: tool.description,
-		parameters_json_schema: tool.parameters
+		parametersJsonSchema: tool.parameters
 	}] };
 }
 function toolCallIdToName(toolCallId, toolNameById) {
@@ -44900,11 +44914,11 @@ function messageToGoogleGenAI(message) {
 			if (error instanceof ChatProviderError) throw error;
 			throw new ChatProviderError("Tool call arguments must be valid JSON.");
 		}
-		const functionCallPart = { function_call: {
+		const functionCallPart = { functionCall: {
 			name: toolCall.name,
 			args
 		} };
-		if (toolCall.extras && "thought_signature_b64" in toolCall.extras) functionCallPart["thought_signature"] = toolCall.extras["thought_signature_b64"];
+		if (toolCall.extras && "thought_signature_b64" in toolCall.extras) functionCallPart["thoughtSignature"] = toolCall.extras["thought_signature_b64"];
 		parts.push(functionCallPart);
 	}
 	return {
@@ -44941,7 +44955,7 @@ function toolMessageToFunctionResponseParts(message, toolNameById) {
 			break;
 		case "think": break;
 	}
-	return [{ function_response: {
+	return [{ functionResponse: {
 		name: toolCallIdToName(message.toolCallId, toolNameById),
 		response: { output: textOutput },
 		parts: []
@@ -44954,6 +44968,10 @@ function messagesToGoogleGenAIContents(messages) {
 	while (i < messages.length) {
 		const message = messages[i];
 		if (message === void 0) break;
+		if (isToolDeclarationOnlyMessage(message)) {
+			i += 1;
+			continue;
+		}
 		if (message.role === "system") {
 			const text = message.content.filter((p) => p.type === "text").map((p) => p.text).join("\n");
 			if (text.length > 0) contents.push({
@@ -45021,7 +45039,7 @@ function messagesToGoogleGenAIContents(messages) {
 	}
 	return mergeConsecutiveUserMessages(contents, {
 		isUser: (content) => content.role === "user",
-		isToolResultOnly: (content) => content.parts.length > 0 && content.parts.every((part) => part.function_response !== void 0),
+		isToolResultOnly: (content) => content.parts.length > 0 && content.parts.every((part) => part.functionResponse !== void 0),
 		merge: (last, next) => ({
 			...last,
 			parts: [...last.parts, ...next.parts]
@@ -45046,6 +45064,7 @@ function convertGoogleGenAIError(error) {
 var GoogleGenAIStreamedMessage, NETWORK_RE, TIMEOUT_RE, GoogleGenAIChatProvider;
 var init_google_genai = __esmMin((() => {
 	init_errors$12();
+	init_message$3();
 	init_node$6();
 	init_merge_user_messages();
 	init_request_auth();
@@ -45218,19 +45237,19 @@ var init_google_genai = __esmMin((() => {
 			return this._model;
 		}
 		get thinkingEffort() {
-			const thinkingConfig = this._generationKwargs.thinking_config;
+			const thinkingConfig = this._generationKwargs.thinkingConfig;
 			if (thinkingConfig === void 0) return null;
-			if (thinkingConfig.thinking_level !== void 0) switch (thinkingConfig.thinking_level) {
-				case "MINIMAL": return thinkingConfig.include_thoughts === false ? "off" : "low";
+			if (thinkingConfig.thinkingLevel !== void 0) switch (thinkingConfig.thinkingLevel) {
+				case "MINIMAL": return thinkingConfig.includeThoughts === false ? "off" : "low";
 				case "LOW": return "low";
 				case "MEDIUM": return "medium";
 				case "HIGH": return "high";
 				default: return null;
 			}
-			if (thinkingConfig.thinking_budget !== void 0) {
-				if (thinkingConfig.thinking_budget === 0) return "off";
-				if (thinkingConfig.thinking_budget <= 1024) return "low";
-				if (thinkingConfig.thinking_budget <= 4096) return "medium";
+			if (thinkingConfig.thinkingBudget !== void 0) {
+				if (thinkingConfig.thinkingBudget === 0) return "off";
+				if (thinkingConfig.thinkingBudget <= 1024) return "low";
+				if (thinkingConfig.thinkingBudget <= 4096) return "medium";
 				return "high";
 			}
 			return null;
@@ -45246,7 +45265,7 @@ var init_google_genai = __esmMin((() => {
 			const contents = messagesToGoogleGenAIContents(history);
 			const config = {
 				...this._generationKwargs,
-				system_instruction: systemPrompt,
+				systemInstruction: systemPrompt,
 				...tools.length > 0 ? { tools: tools.map((t) => toolToGoogleGenAI(t)) } : {}
 			};
 			try {
@@ -45274,45 +45293,45 @@ var init_google_genai = __esmMin((() => {
 			});
 		}
 		withThinking(effort) {
-			const thinkingConfig = { include_thoughts: true };
+			const thinkingConfig = { includeThoughts: true };
 			if (this._model.includes("gemini-3")) switch (effort) {
 				case "off":
-					thinkingConfig.thinking_level = "MINIMAL";
-					thinkingConfig.include_thoughts = false;
+					thinkingConfig.thinkingLevel = "MINIMAL";
+					thinkingConfig.includeThoughts = false;
 					break;
 				case "low":
-					thinkingConfig.thinking_level = "LOW";
+					thinkingConfig.thinkingLevel = "LOW";
 					break;
 				case "medium":
-					thinkingConfig.thinking_level = "MEDIUM";
+					thinkingConfig.thinkingLevel = "MEDIUM";
 					break;
 				case "high":
 				case "xhigh":
 				case "max":
-					thinkingConfig.thinking_level = "HIGH";
+					thinkingConfig.thinkingLevel = "HIGH";
 					break;
 			}
 			else switch (effort) {
 				case "off":
-					thinkingConfig.thinking_budget = 0;
-					thinkingConfig.include_thoughts = false;
+					thinkingConfig.thinkingBudget = 0;
+					thinkingConfig.includeThoughts = false;
 					break;
 				case "low":
-					thinkingConfig.thinking_budget = 1024;
-					thinkingConfig.include_thoughts = true;
+					thinkingConfig.thinkingBudget = 1024;
+					thinkingConfig.includeThoughts = true;
 					break;
 				case "medium":
-					thinkingConfig.thinking_budget = 4096;
-					thinkingConfig.include_thoughts = true;
+					thinkingConfig.thinkingBudget = 4096;
+					thinkingConfig.includeThoughts = true;
 					break;
 				case "high":
 				case "xhigh":
 				case "max":
-					thinkingConfig.thinking_budget = 32e3;
-					thinkingConfig.include_thoughts = true;
+					thinkingConfig.thinkingBudget = 32e3;
+					thinkingConfig.includeThoughts = true;
 					break;
 			}
-			return this.withGenerationKwargs({ thinking_config: thinkingConfig });
+			return this.withGenerationKwargs({ thinkingConfig });
 		}
 		withGenerationKwargs(kwargs) {
 			const clone = this._clone();
@@ -45323,7 +45342,7 @@ var init_google_genai = __esmMin((() => {
 			return clone;
 		}
 		withMaxCompletionTokens(maxCompletionTokens) {
-			return this.withGenerationKwargs({ max_output_tokens: maxCompletionTokens });
+			return this.withGenerationKwargs({ maxOutputTokens: maxCompletionTokens });
 		}
 		_clone() {
 			const clone = Object.assign(Object.create(Object.getPrototypeOf(this)), this);
@@ -53449,6 +53468,7 @@ function convertMessage$2(message) {
 	});
 	if (message.toolCallId !== void 0) result.tool_call_id = message.toolCallId;
 	if (reasoningContent) result.reasoning_content = reasoningContent;
+	if (message.tools !== void 0 && message.tools.length > 0) result.tools = message.tools.map((tool) => convertTool$1(tool));
 	return result;
 }
 function convertTool$1(tool) {
@@ -53828,6 +53848,7 @@ function convertHistoryMessages$1(history, reasoningKey, toolMessageConversion)
 	const messages = [];
 	const pendingToolResultMedia = [];
 	for (const msg of history) {
+		if (isToolDeclarationOnlyMessage(msg)) continue;
 		if (msg.role !== "tool") appendToolResultMediaMessage(messages, pendingToolResultMedia);
 		messages.push(convertMessage$1(msg, reasoningKey, toolMessageConversion));
 		if (msg.role === "tool") pendingToolResultMedia.push(...toolResultImageParts(msg));
@@ -53837,6 +53858,7 @@ function convertHistoryMessages$1(history, reasoningKey, toolMessageConversion)
 }
 var KNOWN_REASONING_KEYS, DEFAULT_OUTBOUND_REASONING_KEY, CHAT_COMPLETIONS_MAX_OUTPUT_TOKENS_CEILING, OPENAI_CHAT_TOOL_CALL_ID_POLICY, OMITTED_AUDIO_PLACEHOLDER$1, OMITTED_VIDEO_PLACEHOLDER$1, OpenAILegacyStreamedMessage, OpenAILegacyChatProvider;
 var init_openai_legacy = __esmMin((() => {
+	init_message$3();
 	init_openai();
 	init_openai_common();
 	init_chat_completions_stream();
@@ -54435,6 +54457,7 @@ function convertHistoryMessages(history, modelName, toolMessageConversion) {
 		pendingToolResultMedia.length = 0;
 	};
 	for (const msg of history) {
+		if (isToolDeclarationOnlyMessage(msg)) continue;
 		if (msg.role !== "tool") flushPendingMedia();
 		input.push(...convertMessage(msg, modelName, toolMessageConversion));
 		if (msg.role === "tool" && toolMessageConversion === "extract_text") pendingToolResultMedia.push(...messageContentToFunctionOutputItems(msg.content.filter(isMediaPart)));
@@ -54895,7 +54918,8 @@ function catalogModelToCapability(model) {
 			audio_in: inputs.includes("audio"),
 			thinking: Boolean(model.reasoning),
 			tool_use: model.tool_call ?? true,
-			max_context_tokens: context
+			max_context_tokens: context,
+			select_tools: model.select_tools === true
 		}
 	};
 }
@@ -54956,8 +54980,9 @@ async function generate(provider, systemPrompt, tools, history, callbacks, optio
 	let pendingPart = null;
 	const toolCallIndexMap = /* @__PURE__ */ new Map();
 	if (options?.signal?.aborted) throwAbortError();
+	const wireTools = tools.some((tool) => tool.deferred === true) ? tools.filter((tool) => tool.deferred !== true) : tools;
 	options?.onRequestStart?.();
-	const stream = await provider.generate(systemPrompt, tools, history, options);
+	const stream = await provider.generate(systemPrompt, wireTools, history, options);
 	await throwIfAborted$1(options?.signal, stream);
 	let serverDecodeMs = 0;
 	let clientConsumeMs = 0;
@@ -61843,7 +61868,8 @@ var init_schema = __esmMin((() => {
 	ModelAliasSchema = ModelAliasBaseSchema.extend({ overrides: ModelAliasOverrideSchema.optional() });
 	ThinkingConfigSchema = object({
 		enabled: boolean$1().optional(),
-		effort: string().optional()
+		effort: string().optional(),
+		keep: string().optional()
 	});
 	PermissionModeSchema = _enum([
 		"yolo",
@@ -68383,7 +68409,14 @@ var init_types$15 = __esmMin((() => {}));
 //#region ../../packages/agent-core/src/flags/registry.ts
 var FLAG_DEFINITIONS;
 var init_registry$1 = __esmMin((() => {
-	FLAG_DEFINITIONS = [];
+	FLAG_DEFINITIONS = [{
+		id: "tool-select",
+		title: "Tool select (progressive tool disclosure)",
+		description: "Keep MCP tool schemas out of the immutable top-level tools[]; the model loads them on demand via the select_tools tool. Only takes effect on models whose capability catalog declares select_tools.",
+		env: "KIMI_CODE_EXPERIMENTAL_TOOL_SELECT",
+		default: false,
+		surface: "core"
+	}];
 })), FlagResolver;
 var init_resolver = __esmMin((() => {
 	init_resolve$1();
@@ -76785,6 +76818,102 @@ var init_background = __esmMin((() => {
 	};
 }));
 //#endregion
+//#region ../../packages/agent-core/src/agent/context/dynamic-tools.ts
+/** True for a message that loads tool definitions (`message.tools` present). */
+function isDynamicToolSchemaMessage(message) {
+	return message.tools !== void 0 && message.tools.length > 0;
+}
+/** True for a `<tools_added>/<tools_removed>` announcement reminder. */
+function isLoadableToolsAnnouncement(message) {
+	return message.origin?.kind === "system_trigger" && message.origin.name === "loadable-tools";
+}
+/**
+* Shape a history for a consumer that must not see dynamic-tool protocol
+* context: drop the loadable-tools announcements and strip `message.tools`
+* (dropping the message entirely when nothing else remains). Two callers:
+*   - projection for a model without the `select_tools` capability (mid-session
+*     model switch — the canonical history keeps its shape, only the outgoing
+*     view changes; announcements would be noise and even reference a
+*     select_tools tool the model does not have);
+*   - the compaction summarizer input (schemas and announcements are protocol
+*     context, not conversation — summarizing them wastes tokens and risks
+*     leaking schema text into the summary).
+* Returns the input array unchanged when there is nothing to strip, so the
+* common no-dynamic-tools path costs one scan and no allocation.
+*/
+function stripDynamicToolContext(history) {
+	if (!history.some((m) => isDynamicToolSchemaMessage(m) || isLoadableToolsAnnouncement(m))) return history;
+	const out = [];
+	for (const message of history) {
+		if (isLoadableToolsAnnouncement(message)) continue;
+		if (isDynamicToolSchemaMessage(message)) {
+			const { tools: _tools, ...rest } = message;
+			if (rest.content.length === 0 && rest.toolCalls.length === 0) continue;
+			out.push(rest);
+			continue;
+		}
+		out.push(message);
+	}
+	return out;
+}
+/** Union of tool names loaded by dynamic tool schema messages in `history`. */
+function collectLoadedDynamicToolNames(history) {
+	const names = /* @__PURE__ */ new Set();
+	for (const message of history) {
+		if (message.tools === void 0) continue;
+		for (const tool of message.tools) names.add(tool.name);
+	}
+	return names;
+}
+/**
+* Fold every loadable-tools announcement in `history`, in order, into the
+* currently-announced name set (`tools_removed` deletes, then `tools_added`
+* adds — last wins). The announcements are the context's own record of what
+* the model has been told is loadable; there is deliberately no separate
+* persisted ledger, so undo/compaction/resume all self-heal by re-folding.
+*/
+function foldAnnouncedToolNames(history) {
+	const announced = /* @__PURE__ */ new Set();
+	for (const message of history) {
+		if (!isLoadableToolsAnnouncement(message)) continue;
+		const text = message.content.map((part) => part.type === "text" ? part.text : "").join("");
+		for (const name of matchToolNameBlocks(text, TOOLS_REMOVED_BLOCK)) announced.delete(name);
+		for (const name of matchToolNameBlocks(text, TOOLS_ADDED_BLOCK)) announced.add(name);
+	}
+	return announced;
+}
+function matchToolNameBlocks(text, pattern) {
+	const names = [];
+	pattern.lastIndex = 0;
+	for (const match of text.matchAll(pattern)) {
+		const body = match[1] ?? "";
+		for (const line of body.split("\n")) {
+			const name = line.trim();
+			if (name.length > 0) names.push(name);
+		}
+	}
+	return names;
+}
+/**
+* Render one diff announcement. Only the blocks with content are emitted; the
+* guidance sentence never contains a literal block tag, so `foldAnnouncedToolNames`
+* can anchor on the tags without tripping over prose.
+*/
+function renderLoadableToolsAnnouncement(added, removed) {
+	const sections = [];
+	if (added.length > 0) sections.push(`<tools_added>\n${added.join("\n")}\n</tools_added>`);
+	if (removed.length > 0) sections.push(`<tools_removed>\n${removed.join("\n")}\n</tools_removed>`);
+	sections.push("Use the select_tools tool with exact names to load full tool definitions before calling them. Names listed as removed are no longer loadable — do not select them. Fold all announcements in this conversation in order to get the current list.");
+	return sections.join("\n\n");
+}
+var DYNAMIC_TOOL_SCHEMA_VARIANT, LOADABLE_TOOLS_TRIGGER, TOOLS_ADDED_BLOCK, TOOLS_REMOVED_BLOCK;
+var init_dynamic_tools = __esmMin((() => {
+	DYNAMIC_TOOL_SCHEMA_VARIANT = "dynamic_tool_schema";
+	LOADABLE_TOOLS_TRIGGER = "loadable-tools";
+	TOOLS_ADDED_BLOCK = /<tools_added>\n?([\s\S]*?)\n?<\/tools_added>/g;
+	TOOLS_REMOVED_BLOCK = /<tools_removed>\n?([\s\S]*?)\n?<\/tools_removed>/g;
+}));
+//#endregion
 //#region ../../packages/agent-core/src/utils/abort.ts
 function abortError$1(message = "Aborted") {
 	const error = new Error(message);
@@ -77089,6 +77218,7 @@ function estimateTokensForMessage(message) {
 		total += estimateTokens$1(call.name);
 		total += estimateTokens$1(JSON.stringify(call.arguments));
 	}
+	if (message.tools !== void 0) total += estimateTokensForTools(message.tools);
 	messageTokenEstimateCache.set(message, total);
 	return total;
 }
@@ -77492,6 +77622,7 @@ var DEFAULT_COMPACTION_MAX_COMPLETION_TOKENS, OVERFLOW_CONTEXT_SAFETY_RATIO, OVE
 var init_full = __esmMin((() => {
 	init_errors$8();
 	init_src$4();
+	init_dynamic_tools();
 	init_errors$5();
 	init_retry();
 	init_todo_list$1();
@@ -77600,7 +77731,7 @@ var init_full = __esmMin((() => {
 			return this.agent.context.tokenCountWithPending;
 		}
 		estimateRequestTokens(messages) {
-			return estimateTokens$1(this.agent.config.systemPrompt) + estimateTokensForTools(this.agent.tools.loopTools) + estimateTokensForMessages(messages);
+			return estimateTokens$1(this.agent.config.systemPrompt) + estimateTokensForTools(this.agent.tools.loopTools.filter((t) => t.deferred !== true)) + estimateTokensForMessages(messages);
 		}
 		resetForTurn() {
 			this.compactionCountInTurn = 0;
@@ -77665,6 +77796,7 @@ var init_full = __esmMin((() => {
 					this.agent.log.error("failed to refresh system prompt after compaction", { error });
 				}
 				await this.agent.injection.injectAfterCompaction();
+				this.lastCompactedTokenCount = this.tokenCountWithPending;
 				this.markCompleted();
 				const { contextSummary: _contextSummary, ...eventResult } = result;
 				this.agent.emitEvent({
@@ -77689,6 +77821,57 @@ var init_full = __esmMin((() => {
 		buildInstruction(customInstruction) {
 			return renderPrompt(compaction_instruction_default, { customInstruction: customInstruction?.trim() ?? "" }).trimEnd();
 		}
+		/**
+		* Keep-all rebuild (Phase 1): after compaction folded the history — and the
+		* dynamic tool schema messages with it — append ONE merged schema message so
+		* the model keeps calling its loaded tools without re-selecting. Schemas are
+		* read from the live registry, never copied from the old history, so a
+		* schema that changed since load self-heals here. Names whose server is
+		* currently disconnected have no registry schema and are not rebuilt (the
+		* model re-selects after reconnect); names that survived into the
+		* post-compaction history (none under today's users+summary rebuild, but
+		* guarded) are not duplicated. The message goes through the normal
+		* injection-origin append, so estimation and records pick it up as usual.
+		*
+		* Budget guard: the rebuilt floor (users + summary + schemas) is the one
+		* part of the post-compaction context that compaction itself can never
+		* shrink — if it lands inside the auto-compaction trigger band, every
+		* following step re-compacts and rebuilds in a loop. Admit schemas (in name
+		* order) only while the projected context stays within HALF the compaction
+		* trigger, so normal turn content still fits before the next compaction;
+		* anything dropped is simply re-selectable on demand, the same degradation
+		* as a disconnected server.
+		*/
+		rebuildDynamicToolSchemas(activeBefore) {
+			if (!this.agent.toolSelectEnabled) return;
+			if (activeBefore.size === 0) return;
+			const surviving = collectLoadedDynamicToolNames(this.agent.context.history);
+			const candidates = [...activeBefore].filter((name) => !surviving.has(name)).toSorted((a, b) => a.localeCompare(b)).map((name) => this.agent.tools.getMcpToolSchema(name)).filter((tool) => tool !== void 0);
+			if (candidates.length === 0) return;
+			const tools = [];
+			let projected = this.tokenCountWithPending;
+			for (const tool of candidates) {
+				const toolTokens = estimateTokensForTools([tool]);
+				if (this.strategy.shouldCompact((projected + toolTokens) * 2)) break;
+				tools.push(tool);
+				projected += toolTokens;
+			}
+			if (tools.length < candidates.length) this.agent.log.info("trimmed dynamic tool schema rebuild to stay clear of the compaction trigger", {
+				kept: tools.length,
+				dropped: candidates.slice(tools.length).map((tool) => tool.name)
+			});
+			if (tools.length === 0) return;
+			this.agent.context.appendMessage({
+				role: "system",
+				content: [],
+				toolCalls: [],
+				tools,
+				origin: {
+					kind: "injection",
+					variant: DYNAMIC_TOOL_SCHEMA_VARIANT
+				}
+			});
+		}
 		postProcessSummary(summary) {
 			const todos = this.agent.tools.storeData()["todo"] ?? [];
 			if (todos.length === 0) return summary;
@@ -77699,6 +77882,7 @@ var init_full = __esmMin((() => {
 			const startedAt = Date.now();
 			const originalHistory = [...this.agent.context.history];
 			const tokensBefore = estimateTokensForMessages(originalHistory);
+			const activeDynamicToolsBefore = new Set(this.agent.tools.loadedDynamicToolNames());
 			let retryCount = 0;
 			try {
 				await this.triggerPreCompactHook(data, tokensBefore, signal);
@@ -77718,7 +77902,7 @@ var init_full = __esmMin((() => {
 				const delays = retryBackoffDelays(5);
 				let usage = null;
 				let summary;
-				let historyForModel = originalHistory;
+				let historyForModel = stripDynamicToolContext(originalHistory);
 				let droppedCount = 0;
 				let overflowShrinkCount = 0;
 				let emptyOrTruncatedShrinkCount = 0;
@@ -77780,6 +77964,7 @@ var init_full = __esmMin((() => {
 					tokensBefore,
 					droppedCount: droppedCount === 0 ? void 0 : droppedCount
 				});
+				this.rebuildDynamicToolSchemas(activeDynamicToolsBefore);
 				this.agent.telemetry.track("compaction_finished", {
 					source: data.source,
 					tokens_before: result.tokensBefore,
@@ -77795,7 +77980,7 @@ var init_full = __esmMin((() => {
 						output_tokens: usage.output
 					}
 				});
-				this.lastCompactedTokenCount = result.tokensAfter;
+				this.lastCompactedTokenCount = this.tokenCountWithPending;
 				return result;
 			} catch (error) {
 				if (isAbortError$3(error)) return void 0;
@@ -79222,23 +79407,64 @@ function applyKimiEnvThinkingEffort(provider, thinkingEffort, env = process.env)
 	return provider.withExtraBody({ thinking: { effort } });
 }
 /**
-* Apply the Moonshot preserved-thinking passthrough (`KIMI_MODEL_THINKING_KEEP`
-* -> `thinking.keep`) to a chat provider. Applied in `ConfigState.provider` after
-* `withThinking`, and only while thinking is on — otherwise the API would
-* receive a `thinking.keep` with no accompanying `thinking.type` it honors.
-* (Compaction uses a raw provider with thinking off, so it correctly skips this.)
+* Parse a single keep source (env var or config field). A blank value is
+* "unspecified" and falls through to the next source; an off-value explicitly
+* disables Preserved Thinking (short-circuits, no fallback); anything else is
+* forwarded verbatim (e.g. "all").
+*/
+function parseKeepValue(raw) {
+	const trimmed = raw?.trim();
+	if (trimmed === void 0 || trimmed.length === 0) return { specified: false };
+	if (KEEP_OFF_VALUES.has(trimmed.toLowerCase())) return {
+		specified: true,
+		value: void 0
+	};
+	return {
+		specified: true,
+		value: trimmed
+	};
+}
+/**
+* Resolve the Moonshot Preserved Thinking passthrough (`thinking.keep`) with
+* precedence env (`KIMI_MODEL_THINKING_KEEP`) > config (`thinking.keep`) >
+* default `"all"`. Only meaningful while thinking is on — otherwise the API
+* would receive a `thinking.keep` with no accompanying `thinking.type` it
+* honors. (Compaction uses a raw provider with thinking off, so it correctly
+* resolves to `undefined`.)
 *
-* Non-Kimi providers — and an unset/blank value — are returned unchanged.
+* Returns `undefined` when Preserved Thinking should be disabled.
+*/
+function resolveThinkingKeep(env, configKeep, thinkingEffort) {
+	if (thinkingEffort === "off") return void 0;
+	const fromEnv = parseKeepValue(env["KIMI_MODEL_THINKING_KEEP"]);
+	if (fromEnv.specified) return fromEnv.value;
+	const fromConfig = parseKeepValue(configKeep);
+	if (fromConfig.specified) return fromConfig.value;
+	return "all";
+}
+/**
+* Apply the Moonshot Preserved Thinking passthrough to a chat provider. See
+* `resolveThinkingKeep` for precedence. Non-Kimi providers are returned
+* unchanged.
 */
-function applyKimiEnvThinkingKeep(provider, thinkingEffort, env = process.env) {
+function applyKimiEnvThinkingKeep(provider, thinkingEffort, env = process.env, configKeep) {
 	if (!(provider instanceof KimiChatProvider)) return provider;
-	const keep = env["KIMI_MODEL_THINKING_KEEP"]?.trim();
-	if (keep === void 0 || keep.length === 0 || thinkingEffort === "off") return provider;
+	const keep = resolveThinkingKeep(env, configKeep, thinkingEffort);
+	if (keep === void 0) return provider;
 	return provider.withExtraBody({ thinking: { keep } });
 }
+var KEEP_OFF_VALUES;
 var init_kimi_env_params = __esmMin((() => {
 	init_src$4();
 	init_resolve$1();
+	KEEP_OFF_VALUES = new Set([
+		"0",
+		"false",
+		"no",
+		"off",
+		"none",
+		"null"
+	]);
 }));
 //#endregion
 //#region ../../packages/agent-core/src/agent/config/thinking.ts
@@ -79364,7 +79590,7 @@ var init_config$3 = __esmMin((() => {
 			return provider;
 		}
 		get provider() {
-			return applyKimiEnvThinkingKeep(applyKimiEnvThinkingEffort(applyKimiEnvSamplingParams(createProvider(this.providerConfig).withThinking(this.thinkingEffort)), this.thinkingEffort), this.thinkingEffort);
+			return applyKimiEnvThinkingKeep(applyKimiEnvThinkingEffort(applyKimiEnvSamplingParams(createProvider(this.providerConfig).withThinking(this.thinkingEffort)), this.thinkingEffort), this.thinkingEffort, void 0, this.agent.kimiConfig?.thinking?.keep);
 		}
 		get model() {
 			if (this._modelAlias === void 0) throw new KimiError(ErrorCodes.MODEL_NOT_CONFIGURED, "Model not set");
@@ -122000,6 +122226,7 @@ function prepareMessageForProjection(message, onAnomaly) {
 		content
 	};
 	if (next.role === "tool" && next.content.length === 0) throw new KimiError(ErrorCodes.REQUEST_INVALID, "Tool result message content cannot be empty after removing empty text blocks.", { details: { toolCallId: next.toolCallId } });
+	if (next.tools !== void 0 && next.tools.length > 0) return next;
 	return next.content.length === 0 && next.toolCalls.length === 0 ? null : next;
 }
 function canMergeUserMessage(message) {
@@ -122029,7 +122256,8 @@ function stripContextMetadata(message) {
 		content: message.content.map((p) => ({ ...p })),
 		toolCalls: message.toolCalls.map((tc) => ({ ...tc })),
 		toolCallId: message.toolCallId,
-		partial: message.partial
+		partial: message.partial,
+		tools: message.tools?.map((tool) => ({ ...tool }))
 	};
 }
 function trimTrailingOpenToolExchange(history) {
@@ -122120,8 +122348,10 @@ var init_context$2 = __esmMin((() => {
 	init_xml_escape();
 	init_compaction();
 	init_projector();
+	init_dynamic_tools();
 	init_types$8();
 	init_types$8();
+	init_dynamic_tools();
 	TOOL_ERROR_STATUS$2 = "<system>ERROR: Tool execution failed.</system>";
 	TOOL_EMPTY_STATUS$2 = "<system>Tool output is empty.</system>";
 	TOOL_EMPTY_ERROR_STATUS$2 = "<system>ERROR: Tool execution failed. Tool output is empty.</system>";
@@ -122259,6 +122489,7 @@ var init_context$2 = __esmMin((() => {
 			this._lastAssistantAt = null;
 			this.agent.microCompaction.reset();
 			this.agent.injection.onContextClear();
+			this.agent.tools.onContextCleared();
 			this.agent.emitStatusUpdated();
 		}
 		undo(count) {
@@ -122375,6 +122606,7 @@ var init_context$2 = __esmMin((() => {
 			this.tokenCountCoveredMessageCount = this._history.length;
 			this.agent.microCompaction.reset();
 			this.agent.injection.onContextCompacted();
+			this.agent.tools.onContextCompacted();
 			this.agent.emitStatusUpdated();
 			return result;
 		}
@@ -122395,8 +122627,9 @@ var init_context$2 = __esmMin((() => {
 			return this._history;
 		}
 		project(messages, options) {
+			const shaped = this.agent.toolSelectEnabled ? messages : stripDynamicToolContext(messages);
 			const anomalies = [];
-			const result = project(this.agent.microCompaction.compact(messages), {
+			const result = project(this.agent.microCompaction.compact(shaped), {
 				...options,
 				onAnomaly: (anomaly) => {
 					anomalies.push(anomaly);
@@ -122555,7 +122788,8 @@ var init_context$2 = __esmMin((() => {
 						type: "function",
 						id: event.toolCallId,
 						name: event.name,
-						arguments: event.args === void 0 ? null : JSON.stringify(event.args)
+						arguments: event.args === void 0 ? null : JSON.stringify(event.args),
+						extras: event.extras
 					});
 					this.pendingToolResultIds.add(event.toolCallId);
 					return;
@@ -124231,6 +124465,37 @@ var init_todo_list = __esmMin((() => {
 	};
 }));
 //#endregion
+//#region ../../packages/agent-core/src/agent/injection/tools-diff.ts
+var ToolsDiffInjector;
+var init_tools_diff = __esmMin((() => {
+	init_dynamic_tools();
+	ToolsDiffInjector = class {
+		agent;
+		constructor(agent) {
+			this.agent = agent;
+		}
+		/**
+		* Recompute the loadable set, fold the announced set from history, and
+		* append one diff announcement iff they differ. Most turns append nothing,
+		* keeping the prompt cache warm; the first announcement after session start
+		* (or after compaction folded the history) is naturally the full list.
+		*/
+		inject() {
+			if (!this.agent.toolSelectEnabled) return;
+			const loadable = this.agent.tools.loadableDynamicToolNames();
+			const loadableSet = new Set(loadable);
+			const announced = foldAnnouncedToolNames(this.agent.context.history);
+			const added = loadable.filter((name) => !announced.has(name));
+			const removed = [...announced].filter((name) => !loadableSet.has(name)).toSorted((a, b) => a.localeCompare(b));
+			if (added.length === 0 && removed.length === 0) return;
+			this.agent.context.appendSystemReminder(renderLoadableToolsAnnouncement(added, removed), {
+				kind: "system_trigger",
+				name: LOADABLE_TOOLS_TRIGGER
+			});
+		}
+	};
+}));
+//#endregion
 //#region ../../packages/agent-core/src/agent/injection/manager.ts
 var ACTIVE_BACKGROUND_TASK_GUIDANCE, InjectionManager;
 var init_manager$1 = __esmMin((() => {
@@ -124240,11 +124505,13 @@ var init_manager$1 = __esmMin((() => {
 	init_plugin_session_start();
 	init_plan_mode();
 	init_todo_list();
+	init_tools_diff();
 	ACTIVE_BACKGROUND_TASK_GUIDANCE = "The conversation was compacted, so the earlier messages that started these background tasks are gone — but the tasks are still running from before. Do not start duplicates. Use TaskOutput to fetch a task’s result, TaskList to list them, and TaskStop to cancel one.";
 	InjectionManager = class {
 		agent;
 		injectors;
 		goalInjector;
+		toolsDiffInjector;
 		constructor(agent) {
 			this.agent = agent;
 			this.injectors = [
@@ -124254,6 +124521,7 @@ var init_manager$1 = __esmMin((() => {
 				new PermissionModeInjector(agent)
 			];
 			this.goalInjector = agent.type === "main" ? new GoalInjector(agent) : null;
+			this.toolsDiffInjector = new ToolsDiffInjector(agent);
 		}
 		async inject() {
 			for (const injector of this.injectors) await injector.inject();
@@ -124266,8 +124534,17 @@ var init_manager$1 = __esmMin((() => {
 		async injectGoal() {
 			await this.activeGoalInjector()?.inject();
 		}
+		/**
+		* Appends a loadable-tools diff announcement when the loadable set changed.
+		* Boundary cadence (turn start + post-compaction); no-op when the disclosure
+		* gate is closed or nothing changed.
+		*/
+		injectToolsDiff() {
+			this.toolsDiffInjector.inject();
+		}
 		async injectAfterCompaction() {
 			await this.injectGoal();
+			this.injectToolsDiff();
 			this.injectActiveBackgroundTasks();
 			await this.inject();
 		}
@@ -124396,7 +124673,8 @@ var init_default_tool_approve = __esmMin((() => {
 		"Skill",
 		"GetGoal",
 		"SetGoalBudget",
-		"UpdateGoal"
+		"UpdateGoal",
+		"select_tools"
 	]);
 	DefaultToolApprovePermissionPolicy = class {
 		name = "default-tool-approve";
@@ -134788,7 +135066,7 @@ function preflightToolCall(step, toolCall) {
 		toolCall,
 		toolName,
 		args: parsedArgs.data,
-		output: `Tool "${toolName}" not found`
+		output: step.describeMissingTool?.(toolName) ?? `Tool "${toolName}" not found`
 	};
 	if (parsedArgs.parseFailed) step.log?.debug("tool args JSON parse failed", {
 		toolName,
@@ -135157,7 +135435,8 @@ async function dispatchToolCall(step, call, args, displayFields) {
 		name: toolName,
 		args,
 		description: displayFields?.description,
-		display: displayFields?.display
+		display: displayFields?.display,
+		extras: toolCall.extras
 	});
 }
 var GRACE_TIMEOUT_MS, TOOL_OUTPUT_EMPTY, TOOL_OUTPUT_NON_TEXT, validators;
@@ -135185,7 +135464,7 @@ var init_tool_call = __esmMin((() => {
 * does not lose model usage that was already spent.
 */
 async function executeLoopStep(deps) {
-	const { turnId, signal, buildMessages, buildMessagesStrict, dispatchEvent, llm, tools, hooks, log, currentStep, maxRetryAttempts, recordUsage } = deps;
+	const { turnId, signal, buildMessages, buildMessagesStrict, dispatchEvent, llm, tools, buildTools, describeMissingTool, hooks, log, currentStep, maxRetryAttempts, recordUsage } = deps;
 	if (hooks?.beforeStep !== void 0) {
 		const beforeStep = await hooks.beforeStep({
 			turnId,
@@ -135196,11 +135475,13 @@ async function executeLoopStep(deps) {
 		if (beforeStep?.block === true) throw new Error(beforeStep.reason ?? `Step ${String(currentStep)} was blocked`);
 	}
 	signal.throwIfAborted();
+	const stepTools = buildTools !== void 0 ? buildTools() : tools;
 	const messages = await buildMessages();
 	signal.throwIfAborted();
 	const stepUuid = randomUUID();
 	const step = {
-		tools,
+		tools: stepTools,
+		describeMissingTool,
 		hooks,
 		log,
 		dispatchEvent,
@@ -135218,7 +135499,7 @@ async function executeLoopStep(deps) {
 	});
 	const chatParams = {
 		messages,
-		tools: tools ?? [],
+		tools: stepTools ?? [],
 		signal,
 		...createChatStreamingCallbacks({
 			dispatchEvent,
@@ -135408,7 +135689,7 @@ var init_turn_step = __esmMin((() => {
 //#endregion
 //#region ../../packages/agent-core/src/loop/run-turn.ts
 async function runTurn(input) {
-	const { turnId, signal, llm, buildMessages, buildMessagesStrict, dispatchEvent, tools, hooks, log, maxSteps, maxRetryAttempts, recordStepUsage: hostRecordStepUsage } = input;
+	const { turnId, signal, llm, buildMessages, buildMessagesStrict, dispatchEvent, tools, buildTools, describeMissingTool, hooks, log, maxSteps, maxRetryAttempts, recordStepUsage: hostRecordStepUsage } = input;
 	let usage = emptyUsage();
 	let steps = 0;
 	let stopReason = "end_turn";
@@ -135431,6 +135712,8 @@ async function runTurn(input) {
 				dispatchEvent,
 				llm,
 				tools,
+				buildTools,
+				describeMissingTool,
 				hooks,
 				log,
 				currentStep: steps,
@@ -135452,7 +135735,8 @@ async function runTurn(input) {
 		}
 	} catch (error) {
 		if (isAbortError$3(error) || signal.aborted) {
-			dispatchEvent(makeInterruptedEvent("aborted", steps, activeStep));
+			const interruptReason = isUserCancellation(signal.reason) || isUserCancellation(error) ? "user_cancelled" : "aborted";
+			dispatchEvent(makeInterruptedEvent("aborted", steps, activeStep, void 0, interruptReason));
 			return {
 				stopReason: "aborted",
 				steps,
@@ -135468,17 +135752,19 @@ async function runTurn(input) {
 		usage
 	};
 }
-function makeInterruptedEvent(reason, attemptedSteps, activeStep, message) {
+function makeInterruptedEvent(reason, attemptedSteps, activeStep, message, interruptReason = reason) {
 	return {
 		type: "turn.interrupted",
 		reason,
 		attemptedSteps,
 		...activeStep !== void 0 ? { activeStep } : {},
-		...message !== void 0 ? { message } : {}
+		...message !== void 0 ? { message } : {},
+		interruptReason
 	};
 }
 var init_run_turn = __esmMin((() => {
 	init_src$4();
+	init_abort();
 	init_errors$5();
 	init_turn_step();
 }));
@@ -143669,10 +143955,30 @@ var init_agent_swarm = __esmMin((() => {
 //#region ../../packages/agent-core/src/tools/builtin/collaboration/ask-user.md?raw
 var ask_user_default;
 var init_ask_user$1 = __esmMin((() => {
-	ask_user_default = "Use this tool when you need to ask the user questions with structured options during execution. This allows you to:\n1. Collect user preferences or requirements before proceeding\n2. Resolve ambiguous or underspecified instructions\n3. Let the user decide between implementation approaches as you work\n4. Present concrete options when multiple valid directions exist\n\n**When NOT to use:**\n- When you can infer the answer from context — be decisive and proceed\n- Trivial decisions that don't materially affect the outcome\n\nOverusing this tool interrupts the user's flow. Only use it when the user's input genuinely changes your next action.\n\n**Usage notes:**\n- Users always have an \"Other\" option for custom input — don't create one yourself\n- Use multi_select to allow multiple answers to be selected for a question\n- Keep option labels concise (1-5 words), use descriptions for trade-offs and details\n- Each question should have 2-4 meaningful, distinct options\n- You can ask 1-4 questions at a time; group related questions to minimize interruptions\n- If you recommend a specific option, list it first and append \"(Recommended)\" to its label\n- The result is JSON with an `answers` object whose keys identify each answered question; if `answers` is empty and a `note` says the user dismissed it, they declined to answer — proceed with your best judgment and do not re-ask the same question\n";
+	ask_user_default = "Use this tool when you need to ask the user questions with structured options during execution. This allows you to:\n1. Collect user preferences or requirements before proceeding\n2. Resolve ambiguous or underspecified instructions\n3. Let the user decide between implementation approaches as you work\n4. Present concrete options when multiple valid directions exist\n\n**When NOT to use:**\n- When you can infer the answer from context — be decisive and proceed\n- Trivial decisions that don't materially affect the outcome\n\nOverusing this tool interrupts the user's flow. Only use it when the user's input genuinely changes your next action.\n\n**Usage notes:**\n- Users always have an \"Other\" option for custom input — don't create one yourself\n- Use multi_select to allow multiple answers to be selected for a question\n- Keep option labels concise (1-5 words), use descriptions for trade-offs and details\n- Each question should have 2-4 meaningful, distinct options\n- Question texts must be unique across the call, and option labels must be unique within each question\n- You can ask 1-4 questions at a time; group related questions to minimize interruptions\n- If you recommend a specific option, list it first and append \"(Recommended)\" to its label\n- The result is JSON with an `answers` object keyed by question text; each value is the chosen option's label (comma-separated labels for multi_select, or the user's own words if they picked \"Other\"); if `answers` is empty and a `note` says the user dismissed it, they declined to answer — proceed with your best judgment and do not re-ask the same question\n";
 }));
 //#endregion
 //#region ../../packages/agent-core/src/tools/builtin/collaboration/ask-user.ts
+/**
+* Answers are keyed by question text with option labels as values, so both
+* must be unambiguous: question texts unique across the call, option labels
+* unique within their question. Runtime tool-arg validation is AJV against
+* the JSON Schema (where zod refinements are unrepresentable), so the
+* execution path re-runs this check itself.
+*/
+function questionUniquenessError(questions) {
+	const texts = /* @__PURE__ */ new Set();
+	for (const q of questions) {
+		if (texts.has(q.question)) return `Invalid questions: duplicate question text ${JSON.stringify(q.question)}. ${QUESTION_UNIQUENESS_MESSAGE} Rephrase the duplicates and call the tool again.`;
+		texts.add(q.question);
+		const labels = /* @__PURE__ */ new Set();
+		for (const option of q.options) {
+			if (labels.has(option.label)) return `Invalid questions: duplicate option label ${JSON.stringify(option.label)} in question ${JSON.stringify(q.question)}. ${QUESTION_UNIQUENESS_MESSAGE} Rephrase the duplicates and call the tool again.`;
+			labels.add(option.label);
+		}
+	}
+	return null;
+}
 function dismissedQuestionResult() {
 	return {
 		isError: false,
@@ -143707,7 +144013,7 @@ function isQuestionResponse(result) {
 	const answers = result.answers;
 	return typeof answers === "object" && answers !== null && !Array.isArray(answers);
 }
-var QuestionOptionSchema, QuestionItemSchema, AskUserQuestionInputBaseSchema, AskUserQuestionInputSchemaWithBackground, QUESTION_DISMISSED_MESSAGE, QUESTION_UNSUPPORTED_FAILURE_MESSAGE, AskUserQuestionTool;
+var QuestionOptionSchema, QuestionItemSchema, QUESTION_UNIQUENESS_MESSAGE, AskUserQuestionInputBaseSchema, AskUserQuestionInputSchemaWithBackground, QUESTION_DISMISSED_MESSAGE, QUESTION_UNSUPPORTED_FAILURE_MESSAGE, AskUserQuestionTool;
 var init_ask_user = __esmMin((() => {
 	init_zod$1();
 	init_background();
@@ -143716,17 +144022,19 @@ var init_ask_user = __esmMin((() => {
 	init_input_schema();
 	init_ask_user$1();
 	QuestionOptionSchema = object({
-		label: string().describe("Concise display text (1-5 words). If recommended, append '(Recommended)'."),
+		label: string().min(1).describe("Concise display text (1-5 words). If recommended, append '(Recommended)'."),
 		description: string().default("").describe("Brief explanation of trade-offs or implications.")
 	});
 	QuestionItemSchema = object({
-		question: string().describe("A specific, actionable question. End with '?'."),
+		question: string().min(1).describe("A specific, actionable question. End with '?'."),
 		header: string().default("").describe("Short category tag (max 12 chars, e.g. 'Auth', 'Style')."),
 		options: array(QuestionOptionSchema).min(2).max(4).describe("2-4 meaningful, distinct options. Do NOT include an 'Other' option — the system adds one automatically."),
 		multi_select: boolean$1().default(false).describe("Whether the user can select multiple options.")
 	});
+	QUESTION_UNIQUENESS_MESSAGE = "Question texts must be unique across questions, and option labels must be unique within each question.";
 	AskUserQuestionInputBaseSchema = object({ questions: array(QuestionItemSchema).min(1).max(4).describe("The questions to ask the user (1-4 questions).") });
-	AskUserQuestionInputSchemaWithBackground = AskUserQuestionInputBaseSchema.extend({ background: boolean$1().default(false).describe("Set true to ask in the background and return immediately with a background task_id; you are notified automatically when the user answers — do not poll with TaskOutput while the question is pending.") });
+	AskUserQuestionInputSchemaWithBackground = AskUserQuestionInputBaseSchema.extend({ background: boolean$1().default(false).describe("Set true to ask in the background and return immediately with a background task_id; you are notified automatically when the user answers — do not poll with TaskOutput while the question is pending.") }).refine((data) => questionUniquenessError(data.questions) === null, { message: QUESTION_UNIQUENESS_MESSAGE });
+	AskUserQuestionInputBaseSchema.refine((data) => questionUniquenessError(data.questions) === null, { message: QUESTION_UNIQUENESS_MESSAGE });
 	QUESTION_DISMISSED_MESSAGE = "User dismissed the question without answering.";
 	QUESTION_UNSUPPORTED_FAILURE_MESSAGE = "The connected client does not support interactive questions. Do NOT call this tool again. Ask the user directly in your text response instead.";
 	AskUserQuestionTool = class {
@@ -143747,6 +144055,11 @@ var init_ask_user = __esmMin((() => {
 			};
 		}
 		async execution(args, { toolCallId, signal, turnId }) {
+			const uniquenessError = questionUniquenessError(args.questions);
+			if (uniquenessError !== null) return {
+				isError: true,
+				output: uniquenessError
+			};
 			if (args.background === true) return this.executeInBackground(args, {
 				toolCallId,
 				turnId,
@@ -150799,6 +151112,12 @@ function toolOutputText(output) {
 function interruptedStep(event) {
 	return event.activeStep ?? event.attemptedSteps;
 }
+function telemetryInterruptReason(reason, userCancelled) {
+	if ((reason === "aborted" || reason === "cancelled") && userCancelled) return "user_cancelled";
+	if (reason === "aborted" || reason === "cancelled") return "aborted";
+	if (reason === "failed") return "error";
+	return reason;
+}
 function classifyApiError(error, summary) {
 	const statusCode = apiStatusCode(error) ?? summaryStatusCode(summary);
 	if (statusCode !== void 0) {
@@ -151301,7 +151620,10 @@ var init_turn = __esmMin((() => {
 			if (standalone && this.currentId === turnId && this.agent.goal.getGoal().goal?.status !== "active") this.activeTurn = null;
 			if (this.agent.swarmMode.shouldAutoExit) this.agent.swarmMode.exit();
 			if (errorEvent !== void 0) this.agent.emitEvent(errorEvent);
-			if (ended.reason !== "completed") this.trackTurnInterrupted(turnId, this.currentStepByTurn.get(turnId) ?? this.currentStep);
+			if (ended.reason !== "completed") {
+				const interruptReason = telemetryInterruptReason(ended.reason, isUserCancellation(signal.reason));
+				this.trackTurnInterrupted(turnId, this.currentStepByTurn.get(turnId) ?? this.currentStep, interruptReason);
+			}
 			this.telemetryModeByTurn.delete(turnId);
 			this.currentStepByTurn.delete(turnId);
 			this.interruptedTelemetryTurnIds.delete(turnId);
@@ -151375,6 +151697,7 @@ var init_turn = __esmMin((() => {
 			const deduper = new ToolCallDeduplicator({ telemetry: this.agent.telemetry });
 			await this.agent.mcp?.waitForInitialLoad(signal);
 			await this.agent.injection.injectGoal();
+			this.agent.injection.injectToolsDiff();
 			while (true) {
 				signal.throwIfAborted();
 				const model = this.agent.config.model;
@@ -151388,7 +151711,8 @@ var init_turn = __esmMin((() => {
 						buildMessages: () => this.agent.context.messages,
 						buildMessagesStrict: () => this.agent.context.strictMessages,
 						dispatchEvent: this.buildDispatchEvent(turnId),
-						tools: this.agent.tools.loopTools,
+						buildTools: () => this.agent.tools.loopTools,
+						describeMissingTool: (name) => this.agent.tools.missingToolMessage(name),
 						log: this.agent.log,
 						maxSteps: loopControl?.maxStepsPerTurn,
 						maxRetryAttempts: loopControl?.maxRetriesPerStep,
@@ -151560,7 +151884,7 @@ var init_turn = __esmMin((() => {
 			}
 			if (event.type === "turn.interrupted") {
 				if (event.reason === "error" && event.activeStep !== void 0) this.stepFailureByTurn.set(turnId, event);
-				this.trackTurnInterrupted(turnId, interruptedStep(event));
+				this.trackTurnInterrupted(turnId, interruptedStep(event), event.interruptReason ?? telemetryInterruptReason(event.reason, false));
 				return;
 			}
 			this.trackToolLifecycle(event, turnId);
@@ -151621,12 +151945,13 @@ var init_turn = __esmMin((() => {
 			for (const [seenStep, keys] of this.stepToolCallKeys) if (seenStep !== step && keys.has(key)) return true;
 			return false;
 		}
-		trackTurnInterrupted(turnId, atStep) {
+		trackTurnInterrupted(turnId, atStep, interruptReason) {
 			if (this.interruptedTelemetryTurnIds.has(turnId)) return;
 			this.interruptedTelemetryTurnIds.add(turnId);
 			this.agent.telemetry.track("turn_interrupted", {
 				mode: this.telemetryModeByTurn.get(turnId) ?? this.telemetryMode(),
 				at_step: atStep,
+				interrupt_reason: interruptReason,
 				...this.requestProtocolProps()
 			});
 		}
@@ -151974,6 +152299,71 @@ var init_exit_plan_mode = __esmMin((() => {
 	};
 }));
 //#endregion
+//#region ../../packages/agent-core/src/tools/builtin/select-tools.ts
+var SELECT_TOOLS_TOOL_NAME, SelectToolsInputSchema, DESCRIPTION, SelectToolsTool;
+var init_select_tools = __esmMin((() => {
+	init_zod$1();
+	init_dynamic_tools();
+	init_input_schema();
+	SELECT_TOOLS_TOOL_NAME = "select_tools";
+	SelectToolsInputSchema = object({ names: array(string()).min(1).describe("Exact tool names to load, taken from the latest announced tool list.") }).strict();
+	DESCRIPTION = "Load one or more tools by name so you can call them. All available tool names are listed in the <tools_added>/<tools_removed> announcements in the system context — fold them in order to get the current list. Pass the exact name(s) you need; their full definitions become available immediately, so you can call them directly in your next tool call.";
+	SelectToolsTool = class {
+		agent;
+		name = SELECT_TOOLS_TOOL_NAME;
+		description = DESCRIPTION;
+		parameters = toInputJsonSchema(SelectToolsInputSchema);
+		constructor(agent) {
+			this.agent = agent;
+		}
+		resolveExecution(args) {
+			return {
+				description: `Loading ${args.names.join(", ")}`,
+				approvalRule: this.name,
+				execute: async () => {
+					if (!this.agent.toolSelectEnabled) return {
+						output: "select_tools is not available for the current model.",
+						isError: true
+					};
+					const manager = this.agent.tools;
+					const loadable = new Set(manager.loadableDynamicToolNames());
+					const loaded = manager.loadedDynamicToolNames();
+					const toLoad = [];
+					const alreadyAvailable = [];
+					const unknown = [];
+					for (const name of new Set(args.names)) if (loaded.has(name)) alreadyAvailable.push(name);
+					else if (loadable.has(name)) toLoad.push(name);
+					else unknown.push(name);
+					if (toLoad.length > 0) {
+						toLoad.sort((a, b) => a.localeCompare(b));
+						const tools = toLoad.map((name) => manager.getMcpToolSchema(name)).filter((tool) => tool !== void 0);
+						this.agent.context.appendMessage({
+							role: "system",
+							content: [],
+							toolCalls: [],
+							tools,
+							origin: {
+								kind: "injection",
+								variant: DYNAMIC_TOOL_SCHEMA_VARIANT
+							}
+						});
+						manager.markDynamicToolsLoaded(toLoad);
+					}
+					const lines = [];
+					if (toLoad.length > 0) lines.push(`Loaded: ${toLoad.join(", ")}`);
+					if (alreadyAvailable.length > 0) lines.push(`Already available: ${alreadyAvailable.join(", ")}`);
+					for (const name of unknown) lines.push(`Unknown tool: ${name}. Pick from the latest announced tools list.`);
+					const isError = toLoad.length === 0 && alreadyAvailable.length === 0;
+					return isError ? {
+						output: lines.join("\n"),
+						isError
+					} : { output: lines.join("\n") };
+				}
+			};
+		}
+	};
+}));
+//#endregion
 //#region ../../packages/agent-core/src/tools/builtin/shell/bash.md?raw
 var bash_default;
 var init_bash$1 = __esmMin((() => {
@@ -152464,6 +152854,7 @@ var init_builtin = __esmMin((() => {
 	init_update_goal();
 	init_enter_plan_mode();
 	init_exit_plan_mode();
+	init_select_tools();
 	init_bash();
 	init_todo_list$1();
 	init_fetch_url();
@@ -152478,6 +152869,7 @@ var import_picomatch, SHELL_FOREGROUND_TIMEOUT_S, ToolManager;
 var init_tool$1 = __esmMin((() => {
 	init_dist$4();
 	import_picomatch = /* @__PURE__ */ __toESM(require_picomatch(), 1);
+	init_dynamic_tools();
 	init_errors$8();
 	init_auth_tool();
 	init_output();
@@ -152498,6 +152890,14 @@ var init_tool$1 = __esmMin((() => {
 		enabledTools = /* @__PURE__ */ new Set();
 		/** Glob patterns (e.g. `mcp__*`, `mcp__github__*`) gating which MCP tools the profile exposes. */
 		mcpAccessPatterns = [];
+		/**
+		* Defer-window lead for the loaded-tools ledger: names marked loaded whose
+		* schema message may still sit in the context's deferred queue (an open tool
+		* exchange). The history itself is the source of truth —
+		* `loadedDynamicToolNames()` unions this set with a history scan — so
+		* undo/compaction/resume never need to roll this back.
+		*/
+		pendingLoadedDynamicTools = /* @__PURE__ */ new Set();
 		store = {};
 		mcpToolStatusUnsubscribe;
 		/** Abort controllers for in-flight `!` shell commands, keyed by commandId so
@@ -152818,11 +153218,93 @@ var init_tool$1 = __esmMin((() => {
 		isMcpToolEnabled(name) {
 			return this.mcpAccessPatterns.some((pattern) => import_picomatch.default.isMatch(name, pattern));
 		}
+		/**
+		* Whether MCP tools are disclosed progressively: kept out of the top-level
+		* `tools[]` and loaded on demand via select_tools. Reads the agent's single
+		* three-gate decision point.
+		*/
+		get progressiveDisclosure() {
+			return this.agent.toolSelectEnabled;
+		}
+		/**
+		* Names the model may select right now: registered MCP tools that pass the
+		* profile's `mcp__*` access patterns, sorted for byte-stable announcements.
+		* In disclosure mode the patterns keep their permission-filter role but stop
+		* feeding the top-level `tools[]`.
+		*/
+		loadableDynamicToolNames() {
+			return [...this.mcpTools.keys()].filter((name) => this.isMcpToolEnabled(name)).toSorted((a, b) => a.localeCompare(b));
+		}
+		/**
+		* The loaded-tools ledger: every name whose full definition has been
+		* delivered to the conversation via a `tools`-carrying message, plus the
+		* defer-window pending set. History is the single source of truth, so the
+		* ledger survives resume (records replay rebuilds the history), keeps its
+		* state across undo (schema messages have `injection` origin and are not
+		* undone), and self-heals after compaction (the rebuild message re-carries
+		* the schemas).
+		*/
+		loadedDynamicToolNames() {
+			const names = collectLoadedDynamicToolNames(this.agent.context.history);
+			for (const name of this.pendingLoadedDynamicTools) names.add(name);
+			return names;
+		}
+		/** Mark names loaded ahead of their schema message landing in history. */
+		markDynamicToolsLoaded(names) {
+			for (const name of names) this.pendingLoadedDynamicTools.add(name);
+		}
+		/**
+		* Context was cleared (`/clear`): every schema message is gone, so the
+		* defer-window lead must not keep reporting its names as loaded — a stale
+		* entry would make select_tools answer "Already available" for a tool whose
+		* definition the model can no longer see.
+		*/
+		onContextCleared() {
+			this.pendingLoadedDynamicTools.clear();
+		}
+		/**
+		* Compaction rebuilt the history: from here on the keep-all rebuild message
+		* (which may have trimmed or skipped schemas — budget guard, disconnected
+		* servers) is the sole truth about what is still loaded. A pending entry
+		* surviving past this boundary would report a schema the context no longer
+		* carries as loaded, and re-selecting it would wrongly answer
+		* "Already available" instead of injecting.
+		*/
+		onContextCompacted() {
+			this.pendingLoadedDynamicTools.clear();
+		}
+		/**
+		* Plain schema snapshot of a registered MCP tool, read from the live
+		* registry (never from history) at injection time.
+		*/
+		getMcpToolSchema(name) {
+			const entry = this.mcpTools.get(name);
+			if (entry === void 0) return void 0;
+			return {
+				name: entry.tool.name,
+				description: entry.tool.description,
+				parameters: entry.tool.parameters
+			};
+		}
+		/**
+		* Disclosure-mode wording for a tool-call preflight miss. A loaded tool
+		* whose server dropped is a different situation from a never-announced name;
+		* telling them apart stops the model from re-selecting a disconnected tool
+		* in a loop or treating a transient disconnect as a permanent removal.
+		*/
+		missingToolMessage(name) {
+			if (!this.progressiveDisclosure) return void 0;
+			if (!isMcpToolName(name)) return void 0;
+			const registered = this.mcpTools.has(name) && this.isMcpToolEnabled(name);
+			const loaded = this.loadedDynamicToolNames().has(name);
+			if (registered && !loaded) return `Tool "${name}" is available but not loaded. Call select_tools with ["${name}"] first, then call the tool.`;
+			if (!registered && loaded) return `Tool "${name}" was loaded but its MCP server is currently disconnected. It may become available again when the server reconnects; do not retry immediately.`;
+		}
 		*toolInfos() {
 			for (const tool of this.builtinTools.values()) yield {
 				name: tool.name,
 				description: tool.description,
-				active: this.enabledTools.has(tool.name),
+				active: this.enabledTools.has(tool.name) || tool.name === "select_tools" && this.agent.toolSelectEnabled,
 				source: "builtin"
 			};
 			for (const tool of this.userTools.values()) yield {
@@ -152863,6 +153345,7 @@ var init_tool$1 = __esmMin((() => {
 				(modelCapabilities.image_in || modelCapabilities.video_in) && new ReadMediaFileTool(kaos, workspace, modelCapabilities, videoUploader),
 				new EnterPlanModeTool(this.agent),
 				new ExitPlanModeTool(this.agent),
+				new SelectToolsTool(this.agent),
 				goalToolsEnabled && new CreateGoalTool(this.agent),
 				goalToolsEnabled && new GetGoalTool(this.agent),
 				goalToolsEnabled && new SetGoalBudgetTool(this.agent),
@@ -152941,9 +153424,24 @@ var init_tool$1 = __esmMin((() => {
 		}
 		get loopTools() {
 			if (this.loopToolsOverride !== void 0) return this.loopToolsOverride;
-			const mcpNames = [...this.mcpTools.keys()].filter((name) => this.isMcpToolEnabled(name));
+			const disclosure = this.progressiveDisclosure;
+			const enabledMcpNames = [...this.mcpTools.keys()].filter((name) => this.isMcpToolEnabled(name));
+			const loadedSet = disclosure ? this.loadedDynamicToolNames() : void 0;
+			const mcpNames = loadedSet === void 0 ? enabledMcpNames : enabledMcpNames.filter((name) => loadedSet.has(name));
+			const selectToolsName = disclosure ? [SELECT_TOOLS_TOOL_NAME] : [];
 			const hideGoalMutationTools = this.agent.goal.getGoal().goal === null;
-			return uniq([...this.enabledTools, ...mcpNames]).toSorted((a, b) => a.localeCompare(b)).filter((name) => !(hideGoalMutationTools && (name === "SetGoalBudget" || name === "UpdateGoal"))).map((name) => this.userTools.get(name) ?? this.mcpTools.get(name)?.tool ?? this.builtinTools.get(name)).filter((tool) => !!tool);
+			return uniq([
+				...this.enabledTools,
+				...selectToolsName,
+				...mcpNames
+			]).toSorted((a, b) => a.localeCompare(b)).filter((name) => !(hideGoalMutationTools && (name === "SetGoalBudget" || name === "UpdateGoal"))).filter((name) => disclosure || name !== "select_tools").map((name) => {
+				const tool = this.userTools.get(name) ?? this.mcpTools.get(name)?.tool ?? this.builtinTools.get(name);
+				if (tool === void 0) return void 0;
+				return disclosure && this.mcpTools.has(name) ? {
+					...tool,
+					deferred: true
+				} : tool;
+			}).filter((tool) => !!tool);
 		}
 	};
 }));
@@ -153245,18 +153743,19 @@ var init_llm_request_logger = __esmMin((() => {
 		logRequest(input) {
 			const { provider, modelAlias, systemPrompt, tools, messages, fields } = input;
 			const requestLogFields = fields ?? {};
+			const wireTools = tools.filter((tool) => tool.deferred !== true);
 			const config = {
 				provider: provider.name,
 				model: provider.modelName,
 				modelAlias,
 				thinkingEffort: provider.thinkingEffort ?? void 0,
 				systemPromptChars: systemPrompt.length,
-				toolCount: tools.length
+				toolCount: wireTools.length
 			};
 			const signature = JSON.stringify({
 				...config,
 				systemPromptHash: fingerprint(systemPrompt),
-				toolsHash: fingerprint(JSON.stringify(toolSignature(tools)))
+				toolsHash: fingerprint(JSON.stringify(toolSignature(wireTools)))
 			});
 			if (signature !== this.lastConfigLogSignature) {
 				this.lastConfigLogSignature = signature;
@@ -153420,6 +153919,20 @@ var init_agent = __esmMin((() => {
 			this.additionalDirs = normalizeAdditionalDirs(additionalDirs);
 			if (this.config.hasProvider) this.tools.initializeBuiltinTools();
 		}
+		/**
+		* Single decision point for select_tools progressive disclosure. All three
+		* gates must be open: the model declares the `select_tools` capability, the
+		* model declares `tool_use` (a model without tool use registering
+		* select_tools is a contradiction), and the `tool-select` experimental flag
+		* is on. Every consumer — top-level tools[] convergence, select_tools
+		* registration, manifest announcements, projection shaping — reads this
+		* instead of re-deriving the conditions, so degradation is lossless: any
+		* closed gate reproduces the inline behavior byte-for-byte.
+		*/
+		get toolSelectEnabled() {
+			const capability = this.config.modelCapabilities;
+			return capability.select_tools === true && capability.tool_use && this.experimentalFlags.enabled("tool-select");
+		}
 		get generate() {
 			return async (provider, systemPrompt, tools, history, callbacks, options) => {
 				const { requestLogFields, generateOptions } = splitGenerateOptions(options);
@@ -183817,6 +184330,597 @@ var init_mcp$1 = __esmMin((() => {
 	init_types$2();
 }));
 //#endregion
+//#region ../../packages/agent-core/src/session/store/session-index.ts
+function sessionIndexPath(homeDir) {
+	return join$4(homeDir, "session_index.jsonl");
+}
+async function appendSessionIndexEntry(homeDir, entry) {
+	const indexPath = sessionIndexPath(homeDir);
+	const line = `${JSON.stringify(entry)}\n`;
+	const next = (appendQueues.get(homeDir) ?? Promise.resolve()).then(async () => {
+		await mkdir(dirname$3(indexPath), {
+			recursive: true,
+			mode: 448
+		});
+		await appendFile(indexPath, line, "utf-8");
+	});
+	appendQueues.set(homeDir, next.then(() => void 0, () => void 0));
+	return next;
+}
+async function readSessionIndex$1(homeDir, sessionsDir) {
+	let raw;
+	try {
+		raw = await readFile(sessionIndexPath(homeDir), "utf-8");
+	} catch {
+		return /* @__PURE__ */ new Map();
+	}
+	const result = /* @__PURE__ */ new Map();
+	for (const line of raw.split(/\r?\n/)) {
+		const trimmed = line.trim();
+		if (trimmed === "") continue;
+		const entry = parseIndexLine$1(trimmed);
+		if (entry === void 0) continue;
+		const sessionDir = resolve$2(entry.sessionDir);
+		if (!isAbsolute$2(entry.sessionDir)) continue;
+		if (!isPathInside$1(sessionsDir, sessionDir)) continue;
+		if (basename$2(sessionDir) !== entry.sessionId) continue;
+		result.set(entry.sessionId, {
+			sessionId: entry.sessionId,
+			sessionDir,
+			workDir: entry.workDir
+		});
+	}
+	return result;
+}
+function parseIndexLine$1(line) {
+	try {
+		const parsed = JSON.parse(line);
+		if (typeof parsed !== "object" || parsed === null) return void 0;
+		const entry = parsed;
+		if (typeof entry.sessionId !== "string" || typeof entry.sessionDir !== "string" || typeof entry.workDir !== "string") return;
+		return {
+			sessionId: entry.sessionId,
+			sessionDir: entry.sessionDir,
+			workDir: entry.workDir
+		};
+	} catch {
+		return;
+	}
+}
+function isPathInside$1(parent, child) {
+	const rel = relative$1(resolve$2(parent), resolve$2(child));
+	return rel !== "" && !rel.startsWith("..") && !isAbsolute$2(rel);
+}
+var appendQueues;
+var init_session_index = __esmMin((() => {
+	init_dist$7();
+	appendQueues = /* @__PURE__ */ new Map();
+}));
+//#endregion
+//#region ../../packages/agent-core/src/utils/workdir-slug.ts
+function slugifyWorkDirName(name) {
+	const slug = name.toLowerCase().replaceAll(/[^a-z0-9._-]+/g, "-").replaceAll(/^-+|-+$/g, "").slice(0, MAX_WORKDIR_SLUG_LENGTH).replaceAll(/^-+|-+$/g, "");
+	return slug === "" || slug === "." || slug === ".." ? "workspace" : slug;
+}
+var MAX_WORKDIR_SLUG_LENGTH;
+var init_workdir_slug = __esmMin((() => {
+	MAX_WORKDIR_SLUG_LENGTH = 40;
+}));
+//#endregion
+//#region ../../packages/agent-core/src/session/store/workdir-key.ts
+function normalizeWorkDir(workDir) {
+	return resolve$2(workDir);
+}
+function encodeWorkDirKey(workDir) {
+	const normalized = normalizeWorkDir(workDir);
+	return `${WORKDIR_KEY_PREFIX}${slugifyWorkDirName(basename$2(normalized))}_${createHash("sha256").update(normalized).digest("hex").slice(0, HASH_LENGTH)}`;
+}
+var WORKDIR_KEY_PREFIX, HASH_LENGTH;
+var init_workdir_key = __esmMin((() => {
+	init_dist$7();
+	init_workdir_slug();
+	WORKDIR_KEY_PREFIX = "wd_";
+	HASH_LENGTH = 12;
+}));
+//#endregion
+//#region ../../packages/agent-core/src/session/store/session-store.ts
+function metadataFromState(state) {
+	if (state === void 0 || state.custom === void 0) return void 0;
+	return state.custom;
+}
+function forkCustomMetadata(source, metadata) {
+	return {
+		...customMetadataWithoutGoal(source),
+		...customMetadataWithoutGoal(metadata)
+	};
+}
+async function dropForkedSessionFiles(sessionDir) {
+	await Promise.all(FORKED_SESSION_DROPPED_FILES.map((fileName) => rm(join$4(sessionDir, fileName), { force: true })));
+}
+async function appendForkedMarkers(state) {
+	const record = {
+		type: "forked",
+		time: Date.now()
+	};
+	const agents = state["agents"];
+	if (!isRecord$11(agents)) return;
+	const paths = /* @__PURE__ */ new Set();
+	for (const agentMeta of Object.values(agents)) {
+		if (!isRecord$11(agentMeta)) continue;
+		const homedir = agentMeta["homedir"];
+		if (typeof homedir !== "string") continue;
+		paths.add(join$4(homedir, "wire.jsonl"));
+	}
+	await Promise.all([...paths].map(async (path) => {
+		const persistence = new FileSystemAgentRecordPersistence(path);
+		persistence.append(record);
+		await persistence.flush();
+	}));
+}
+function customMetadataWithoutGoal(value) {
+	if (!isRecord$11(value)) return {};
+	const custom = {};
+	for (const [key, entry] of Object.entries(value)) {
+		if (key === "goal") continue;
+		custom[key] = entry;
+	}
+	return custom;
+}
+async function latestAgentWireMtime(sessionDir) {
+	const agentsDir = join$4(sessionDir, "agents");
+	let entries;
+	try {
+		entries = await readdir$1(agentsDir, { withFileTypes: true });
+	} catch {
+		return;
+	}
+	let latest = 0;
+	for (const entry of entries) {
+		if (!entry.isDirectory()) continue;
+		const wireInfo = await statIfExists(join$4(agentsDir, entry.name, "wire.jsonl"));
+		latest = Math.max(latest, wireInfo?.mtimeMs ?? 0);
+	}
+	return latest > 0 ? latest : void 0;
+}
+function titleFromState(state) {
+	if (state === void 0) return void 0;
+	if (typeof state.isCustomTitle === "boolean" && typeof state.title === "string") return state.title;
+	if (typeof state.customTitle === "string") return state.customTitle;
+	return typeof state.title === "string" ? state.title : void 0;
+}
+async function readOptionalState(sessionDir) {
+	try {
+		const parsed = JSON.parse(await readFile(join$4(sessionDir, "state.json"), "utf-8"));
+		const result = SessionSummaryStateSchema.safeParse(parsed);
+		return result.success ? result.data : void 0;
+	} catch {
+		return;
+	}
+}
+function normalizeRequiredWorkDir(workDir) {
+	if (workDir.trim() === "") throw new KimiError(ErrorCodes.REQUEST_WORK_DIR_REQUIRED, "listSessions requires workDir");
+	return normalizeWorkDir(workDir);
+}
+function normalizeOptionalSessionId$1(sessionId) {
+	return sessionId === void 0 ? void 0 : sessionId.trim();
+}
+function normalizeForkTitle(title, fallback) {
+	if (title !== void 0) {
+		const normalized = title.trim();
+		if (normalized.length === 0) throw new KimiError(ErrorCodes.SESSION_TITLE_EMPTY, "Session title cannot be empty");
+		return normalized;
+	}
+	return typeof fallback === "string" && fallback.trim().length > 0 ? fallback : "New Session";
+}
+function rewriteAgentHomedirs(value, sourceDir, targetDir) {
+	if (!isRecord$11(value)) return {};
+	const agents = {};
+	for (const [agentId, agentMeta] of Object.entries(value)) {
+		if (!isRecord$11(agentMeta)) {
+			agents[agentId] = agentMeta;
+			continue;
+		}
+		const homedir = agentMeta["homedir"];
+		agents[agentId] = {
+			...agentMeta,
+			homedir: typeof homedir === "string" ? remapSessionPath(homedir, sourceDir, targetDir) : homedir
+		};
+	}
+	return agents;
+}
+function remapSessionPath(value, sourceDir, targetDir) {
+	const rel = relative$1(sourceDir, value);
+	if (rel === "") return targetDir;
+	if (rel.startsWith("..") || isAbsolute$2(rel)) return value;
+	return join$4(targetDir, rel);
+}
+function isRecord$11(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+async function statIfExists(path) {
+	try {
+		return await stat$2(path);
+	} catch {
+		return;
+	}
+}
+async function isDirectory(path) {
+	try {
+		return (await stat$2(path)).isDirectory();
+	} catch {
+		return false;
+	}
+}
+function timestampOrFallback(value, fallback) {
+	return Number.isFinite(value) && value > 0 ? value : fallback;
+}
+function assertSafeSessionId(id) {
+	if (isSafeSessionId(id)) return;
+	throw new KimiError(ErrorCodes.SESSION_ID_INVALID, "Session id contains unsupported path characters");
+}
+function isSafeSessionId(id) {
+	return /^[A-Za-z0-9._-]+$/.test(id) && id !== "." && id !== "..";
+}
+function compareSessionSummary(a, b) {
+	if (a.updatedAt !== b.updatedAt) return b.updatedAt - a.updatedAt;
+	if (a.createdAt !== b.createdAt) return b.createdAt - a.createdAt;
+	if (a.id < b.id) return -1;
+	if (a.id > b.id) return 1;
+	return 0;
+}
+var SessionSummaryStateSchema, FORKED_SESSION_DROPPED_FILES, SessionStore;
+var init_session_store$1 = __esmMin((() => {
+	init_dist$7();
+	init_zod$1();
+	init_errors$8();
+	init_session_index();
+	init_workdir_key();
+	init_records();
+	SessionSummaryStateSchema = object({
+		archived: boolean$1().optional(),
+		customTitle: string().optional(),
+		isCustomTitle: boolean$1().optional(),
+		lastPrompt: string().optional(),
+		title: string().optional(),
+		workDir: string().optional(),
+		custom: record(string(), unknown()).optional()
+	});
+	FORKED_SESSION_DROPPED_FILES = ["upcoming-goals.json"];
+	SessionStore = class {
+		homeDir;
+		sessionsDir;
+		constructor(homeDir, _options = {}) {
+			this.homeDir = homeDir;
+			this.sessionsDir = join$4(homeDir, "sessions");
+		}
+		sessionDirFor(input) {
+			assertSafeSessionId(input.id);
+			return join$4(this.sessionsDir, encodeWorkDirKey(normalizeWorkDir(input.workDir)), input.id);
+		}
+		async create(input) {
+			assertSafeSessionId(input.id);
+			const workDir = normalizeWorkDir(input.workDir);
+			if (await this.findSessionEntry(input.id) !== void 0) throw new KimiError(ErrorCodes.SESSION_ALREADY_EXISTS, `Session "${input.id}" already exists`);
+			const dir = this.sessionDirFor({
+				id: input.id,
+				workDir
+			});
+			if (await isDirectory(dir)) throw new KimiError(ErrorCodes.SESSION_ALREADY_EXISTS, `Session "${input.id}" already exists`);
+			await mkdir(dir, {
+				recursive: true,
+				mode: 448
+			});
+			await appendSessionIndexEntry(this.homeDir, {
+				sessionId: input.id,
+				sessionDir: dir,
+				workDir
+			});
+			return this.summaryFromDir(input.id, dir, workDir);
+		}
+		async fork(input) {
+			const source = await this.findExistingSessionEntry(input.sourceId);
+			assertSafeSessionId(input.targetId);
+			if (await this.findSessionEntry(input.targetId) !== void 0) throw new KimiError(ErrorCodes.SESSION_ALREADY_EXISTS, `Session "${input.targetId}" already exists`);
+			const targetDir = this.sessionDirFor({
+				id: input.targetId,
+				workDir: source.workDir
+			});
+			if (await isDirectory(targetDir)) throw new KimiError(ErrorCodes.SESSION_ALREADY_EXISTS, `Session "${input.targetId}" already exists`);
+			await mkdir(dirname$3(targetDir), {
+				recursive: true,
+				mode: 448
+			});
+			try {
+				await cp(source.sessionDir, targetDir, {
+					recursive: true,
+					force: false,
+					errorOnExist: true
+				});
+				await dropForkedSessionFiles(targetDir);
+				await appendForkedMarkers(await this.writeForkedState(input, source.sessionDir, source.workDir, targetDir));
+				const summary = await this.summaryFromDir(input.targetId, targetDir, source.workDir);
+				await appendSessionIndexEntry(this.homeDir, {
+					sessionId: input.targetId,
+					sessionDir: targetDir,
+					workDir: source.workDir
+				});
+				return summary;
+			} catch (error) {
+				await rm(targetDir, {
+					recursive: true,
+					force: true
+				}).catch(() => {});
+				throw error;
+			}
+		}
+		async get(id) {
+			const entry = await this.findExistingSessionEntry(id);
+			return this.summaryFromDir(id, entry.sessionDir, entry.workDir);
+		}
+		async rename(id, title) {
+			const normalized = title.trim();
+			if (normalized.length === 0) throw new KimiError(ErrorCodes.SESSION_TITLE_EMPTY, "Session title cannot be empty");
+			const statePath = join$4((await this.findExistingSessionEntry(id)).sessionDir, "state.json");
+			let parsed;
+			try {
+				parsed = JSON.parse(await readFile(statePath, "utf-8"));
+			} catch (error) {
+				throw new KimiError(ErrorCodes.SESSION_STATE_NOT_FOUND, `Session "${id}" state.json was not found`, { cause: error });
+			}
+			if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) throw new KimiError(ErrorCodes.SESSION_STATE_INVALID, `Session "${id}" state.json is invalid`);
+			const next = {
+				...parsed,
+				title: normalized,
+				isCustomTitle: true
+			};
+			await writeFile$1(statePath, `${JSON.stringify(next, null, 2)}\n`, "utf-8");
+		}
+		async archive(id) {
+			const entry = await this.findExistingSessionEntry(id);
+			const statePath = join$4(entry.sessionDir, "state.json");
+			let parsed;
+			try {
+				parsed = JSON.parse(await readFile(statePath, "utf-8"));
+			} catch (error) {
+				throw new KimiError(ErrorCodes.SESSION_STATE_NOT_FOUND, `Session "${id}" state.json was not found`, { cause: error });
+			}
+			if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) throw new KimiError(ErrorCodes.SESSION_STATE_INVALID, `Session "${id}" state.json is invalid`);
+			const now = (/* @__PURE__ */ new Date()).toISOString();
+			const next = {
+				...parsed,
+				archived: true,
+				updatedAt: now
+			};
+			await writeFile$1(statePath, `${JSON.stringify(next, null, 2)}\n`, "utf-8");
+			return this.summaryFromDir(id, entry.sessionDir, entry.workDir);
+		}
+		async list(options = {}) {
+			const workDir = options.workDir === void 0 ? void 0 : normalizeRequiredWorkDir(options.workDir);
+			const sessionId = normalizeOptionalSessionId$1(options.sessionId);
+			const includeArchive = options.includeArchive === true;
+			if (workDir !== void 0) {
+				if (sessionId !== void 0) {
+					const local = await this.summaryFromWorkDirSession(sessionId, workDir, includeArchive);
+					if (local !== void 0) return [local];
+					return this.listSessionId(sessionId, includeArchive);
+				}
+				return this.listWorkDir(workDir, includeArchive);
+			}
+			if (sessionId !== void 0) return this.listSessionId(sessionId, includeArchive);
+			return this.listAll(includeArchive);
+		}
+		/**
+		* Rebuild the global session index from the session directories on disk.
+		*
+		* The bucket directory name is a one-way hash of the workDir, so the workDir
+		* can only be recovered from each session's self-describing `state.json`
+		* (`workDir`, falling back to `custom.cwd` for older sessions). Sessions that
+		* record no workDir, or whose recorded workDir does not match the bucket they
+		* live in, are left untouched rather than writing a misleading entry.
+		*
+		* The index is append-only and `readSessionIndex` lets later lines override
+		* earlier ones for the same id, so appending a corrected line both adds
+		* missing entries and repairs stale ones. Best-effort: never throws.
+		*/
+		async reindex() {
+			const index = await readSessionIndex$1(this.homeDir, this.sessionsDir);
+			let bucketEntries;
+			try {
+				bucketEntries = await readdir$1(this.sessionsDir, { withFileTypes: true });
+			} catch {
+				return {
+					scanned: 0,
+					added: 0,
+					repaired: 0
+				};
+			}
+			let scanned = 0;
+			let added = 0;
+			let repaired = 0;
+			for (const bucket of bucketEntries) {
+				if (!bucket.isDirectory()) continue;
+				const bucketDir = join$4(this.sessionsDir, bucket.name);
+				let sessionEntries;
+				try {
+					sessionEntries = await readdir$1(bucketDir, { withFileTypes: true });
+				} catch {
+					continue;
+				}
+				for (const entry of sessionEntries) {
+					if (!entry.isDirectory()) continue;
+					const id = entry.name;
+					if (!isSafeSessionId(id)) continue;
+					const sessionDir = join$4(bucketDir, id);
+					const workDir = await this.recoverWorkDir(sessionDir);
+					if (workDir === void 0) continue;
+					scanned++;
+					let expectedDir;
+					try {
+						expectedDir = this.sessionDirFor({
+							id,
+							workDir
+						});
+					} catch {
+						continue;
+					}
+					if (resolve$2(sessionDir) !== resolve$2(expectedDir)) continue;
+					const existing = index.get(id);
+					if (existing !== void 0 && resolve$2(existing.sessionDir) === resolve$2(sessionDir) && existing.workDir === workDir) continue;
+					await appendSessionIndexEntry(this.homeDir, {
+						sessionId: id,
+						sessionDir,
+						workDir
+					});
+					index.set(id, {
+						sessionId: id,
+						sessionDir,
+						workDir
+					});
+					if (existing === void 0) added++;
+					else repaired++;
+				}
+			}
+			return {
+				scanned,
+				added,
+				repaired
+			};
+		}
+		async recoverWorkDir(sessionDir) {
+			const state = await readOptionalState(sessionDir);
+			if (state?.workDir !== void 0) try {
+				return normalizeWorkDir(state.workDir);
+			} catch {
+				return;
+			}
+			const legacyCwd = state?.custom?.["cwd"];
+			if (typeof legacyCwd === "string" && legacyCwd.length > 0) try {
+				return normalizeWorkDir(legacyCwd);
+			} catch {
+				return;
+			}
+		}
+		async listWorkDir(workDir, includeArchive) {
+			const bucketDir = join$4(this.sessionsDir, encodeWorkDirKey(workDir));
+			let entries;
+			try {
+				entries = await readdir$1(bucketDir, { withFileTypes: true });
+			} catch {
+				return [];
+			}
+			const sessions = [];
+			for (const entry of entries) {
+				if (!entry.isDirectory()) continue;
+				const id = entry.name;
+				if (!isSafeSessionId(id)) continue;
+				const dir = join$4(bucketDir, id);
+				const summary = await this.summaryFromDir(id, dir, workDir);
+				if (!includeArchive && summary.archived === true) continue;
+				sessions.push(summary);
+			}
+			sessions.sort(compareSessionSummary);
+			return sessions;
+		}
+		async listSessionId(sessionId, includeArchive) {
+			try {
+				const summary = await this.get(sessionId);
+				if (!includeArchive && summary.archived === true) return [];
+				return [summary];
+			} catch (error) {
+				if (error instanceof KimiError && error.code === ErrorCodes.SESSION_NOT_FOUND) return [];
+				throw error;
+			}
+		}
+		async listAll(includeArchive) {
+			const index = await readSessionIndex$1(this.homeDir, this.sessionsDir);
+			const sessions = [];
+			for (const entry of index.values()) {
+				if (!await isDirectory(entry.sessionDir)) continue;
+				const summary = await this.summaryFromDir(entry.sessionId, entry.sessionDir, entry.workDir);
+				if (!includeArchive && summary.archived === true) continue;
+				sessions.push(summary);
+			}
+			sessions.sort(compareSessionSummary);
+			return sessions;
+		}
+		async summaryFromWorkDirSession(sessionId, workDir, includeArchive) {
+			if (!isSafeSessionId(sessionId)) return void 0;
+			const sessionDir = this.sessionDirFor({
+				id: sessionId,
+				workDir
+			});
+			if (!await isDirectory(sessionDir)) return void 0;
+			const summary = await this.summaryFromDir(sessionId, sessionDir, workDir);
+			if (!includeArchive && summary.archived === true) return void 0;
+			return summary;
+		}
+		async assertDirectory(id) {
+			return (await this.findExistingSessionEntry(id)).sessionDir;
+		}
+		async findSessionEntry(id) {
+			if (!isSafeSessionId(id)) return void 0;
+			return (await readSessionIndex$1(this.homeDir, this.sessionsDir)).get(id);
+		}
+		async findExistingSessionEntry(id) {
+			const entry = await this.findSessionEntry(id);
+			if (entry !== void 0 && await isDirectory(entry.sessionDir)) return entry;
+			throw new KimiError(ErrorCodes.SESSION_NOT_FOUND, `Session "${id}" was not found`, { details: { sessionId: id } });
+		}
+		async writeForkedState(input, sourceDir, sourceWorkDir, targetDir) {
+			const statePath = join$4(targetDir, "state.json");
+			let parsed;
+			try {
+				parsed = JSON.parse(await readFile(statePath, "utf-8"));
+			} catch (error) {
+				throw new KimiError(ErrorCodes.SESSION_STATE_NOT_FOUND, `Session "${input.sourceId}" state.json was not found`, { cause: error });
+			}
+			if (!isRecord$11(parsed)) throw new KimiError(ErrorCodes.SESSION_STATE_INVALID, `Session "${input.sourceId}" state.json is invalid`);
+			const title = normalizeForkTitle(input.title, parsed["title"]);
+			const now = (/* @__PURE__ */ new Date()).toISOString();
+			const next = {
+				...parsed,
+				createdAt: now,
+				updatedAt: now,
+				workDir: sourceWorkDir,
+				title,
+				isCustomTitle: input.title === void 0 ? parsed["isCustomTitle"] === true : true,
+				forkedFrom: input.sourceId,
+				agents: rewriteAgentHomedirs(parsed["agents"], sourceDir, targetDir),
+				custom: forkCustomMetadata(parsed["custom"], input.metadata)
+			};
+			await writeFile$1(statePath, `${JSON.stringify(next, null, 2)}\n`, "utf-8");
+			return next;
+		}
+		async summaryFromDir(id, sessionDir, workDir) {
+			const dirStat = await stat$2(sessionDir);
+			const state = await readOptionalState(sessionDir);
+			const [stateInfo, wireInfo, agentsWireMtime] = await Promise.all([
+				statIfExists(join$4(sessionDir, "state.json")),
+				statIfExists(join$4(sessionDir, "wire.jsonl")),
+				latestAgentWireMtime(sessionDir)
+			]);
+			return {
+				id,
+				workDir: state?.workDir ?? workDir,
+				sessionDir,
+				createdAt: timestampOrFallback(dirStat.birthtimeMs, dirStat.ctimeMs),
+				updatedAt: Math.max(dirStat.mtimeMs, stateInfo?.mtimeMs ?? 0, wireInfo?.mtimeMs ?? 0, agentsWireMtime ?? 0),
+				archived: state?.archived === true,
+				title: titleFromState(state),
+				lastPrompt: state?.lastPrompt,
+				metadata: metadataFromState(state)
+			};
+		}
+	};
+}));
+//#endregion
+//#region ../../packages/agent-core/src/session/store/index.ts
+var init_store$1 = __esmMin((() => {
+	init_session_store$1();
+	init_session_index();
+	init_workdir_key();
+}));
+//#endregion
 //#region ../../packages/agent-core/src/session/index.ts
 async function waitForSettlementOrTimeout(promise, timeoutMs) {
 	let timeout;
@@ -183859,6 +184963,7 @@ var init_session$1 = __esmMin((() => {
 	init_flags();
 	init_abort();
 	init_subagent_host();
+	init_store$1();
 	BACKGROUND_KEEP_ALIVE_ON_EXIT_ENV = "KIMI_CODE_BACKGROUND_KEEP_ALIVE_ON_EXIT";
 	ACTIVE_TURN_CLOSE_TIMEOUT_MS = 8e3;
 	Session$1 = class {
@@ -184993,7 +186098,7 @@ async function writeInstalled(kimiHomeDir, data) {
 	await rename(tmp, final);
 }
 var INSTALLED_REL, EMPTY;
-var init_store$1 = __esmMin((() => {
+var init_store = __esmMin((() => {
 	INSTALLED_REL = path.join("plugins", "installed.json");
 	EMPTY = {
 		version: 1,
@@ -185488,7 +186593,7 @@ var init_manager = __esmMin((() => {
 	init_archive();
 	init_github_resolver();
 	init_manifest$1();
-	init_store$1();
+	init_store();
 	init_source();
 	init_types$1();
 	KIMI_NODE_FALLBACK_SUBCOMMAND = "__plugin_run_node";
@@ -185766,7 +186871,7 @@ var init_manager = __esmMin((() => {
 var init_plugin$1 = __esmMin((() => {
 	init_types$1();
 	init_manifest$1();
-	init_store$1();
+	init_store();
 	init_manager();
 	init_source();
 	init_archive();
@@ -200316,7 +201421,7 @@ function tokenFromWire(wire) {
 var init_types = __esmMin((() => {}));
 //#endregion
 //#region ../../packages/oauth/src/utils.ts
-function isRecord$11(value) {
+function isRecord$10(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 var init_utils = __esmMin((() => {}));
@@ -200372,7 +201477,7 @@ var init_storage = __esmMin((() => {
 			} catch {
 				return;
 			}
-			if (!isRecord$11(parsed)) return void 0;
+			if (!isRecord$10(parsed)) return void 0;
 			return tokenFromWire(parsed);
 		}
 		async save(name, token) {
@@ -200426,7 +201531,7 @@ function extractApiErrorMessage(value) {
 		}
 		return;
 	}
-	if (!isRecord$11(value)) return void 0;
+	if (!isRecord$10(value)) return void 0;
 	for (const key of DIRECT_ERROR_KEYS) {
 		const message = stringField$3(value, key);
 		if (message !== void 0) return message;
@@ -200434,7 +201539,7 @@ function extractApiErrorMessage(value) {
 	const error = value["error"];
 	const errorString = nonEmptyString$2(error);
 	if (errorString !== void 0) return errorString;
-	if (isRecord$11(error)) for (const key of NESTED_ERROR_KEYS) {
+	if (isRecord$10(error)) for (const key of NESTED_ERROR_KEYS) {
 		const message = stringField$3(error, key);
 		if (message !== void 0) return message;
 	}
@@ -200524,7 +201629,7 @@ async function postForm(url, params, deviceHeaders, options) {
 	let data = {};
 	try {
 		const parsed = await response.json();
-		if (isRecord$11(parsed)) data = parsed;
+		if (isRecord$10(parsed)) data = parsed;
 	} catch {}
 	return {
 		status,
@@ -202397,9 +203502,9 @@ function parseManagedUsagePayload(payload) {
 		const item = rawLimits[idx];
 		if (!item || typeof item !== "object") continue;
 		const detailRaw = item["detail"];
-		const detail = isRecord$11(detailRaw) ? detailRaw : item;
+		const detail = isRecord$10(detailRaw) ? detailRaw : item;
 		const windowRaw = item["window"];
-		const row = toUsageRow(detail, limitLabel(item, detail, isRecord$11(windowRaw) ? windowRaw : {}, idx));
+		const row = toUsageRow(detail, limitLabel(item, detail, isRecord$10(windowRaw) ? windowRaw : {}, idx));
 		if (row !== null) limits.push(row);
 	}
 	return {
@@ -202408,7 +203513,7 @@ function parseManagedUsagePayload(payload) {
 	};
 }
 function toUsageRow(raw, defaultLabel) {
-	if (!isRecord$11(raw)) return null;
+	if (!isRecord$10(raw)) return null;
 	const limit = toInt(raw["limit"]);
 	let used = toInt(raw["used"]);
 	if (used === null) {
@@ -202561,8 +203666,8 @@ function userExtras(existing, remoteOwnedFields) {
 	return out;
 }
 function mergeRefreshedModelAlias(existing, remote, remoteOwnedFields) {
-	const current = isRecord$11(existing) ? existing : {};
-	const overrides = cloneOverrides(isRecord$11(current["overrides"]) ? current["overrides"] : void 0);
+	const current = isRecord$10(existing) ? existing : {};
+	const overrides = cloneOverrides(isRecord$10(current["overrides"]) ? current["overrides"] : void 0);
 	return {
 		...userExtras(current, remoteOwnedFields),
 		...remote,
@@ -202742,7 +203847,7 @@ function resolveKimiCodeLoginAuth(options) {
 	};
 }
 function toModelInfo$1(item) {
-	if (!isRecord$11(item) || typeof item["id"] !== "string" || item["id"].length === 0) return;
+	if (!isRecord$10(item) || typeof item["id"] !== "string" || item["id"].length === 0) return;
 	const contextLength = Number(item["context_length"]);
 	if (!Number.isInteger(contextLength) || contextLength <= 0) throw new Error(`Kimi Code model "${item["id"]}" must include a positive context_length.`);
 	const displayName = item["display_name"];
@@ -202813,7 +203918,7 @@ async function fetchManagedKimiCodeModels(options) {
 		throw new Error(message);
 	}
 	const payload = await response.json();
-	if (!isRecord$11(payload) || !Array.isArray(payload["data"])) throw new Error(`Unexpected models response for ${baseUrl}.`);
+	if (!isRecord$10(payload) || !Array.isArray(payload["data"])) throw new Error(`Unexpected models response for ${baseUrl}.`);
 	return payload["data"].map((item) => toModelInfo$1(item)).filter((item) => item !== void 0);
 }
 function applyManagedKimiCodeConfig(config, options) {
@@ -202836,11 +203941,11 @@ function applyManagedKimiCodeConfig(config, options) {
 		oauth
 	};
 	const upstreamKeys = new Set(options.models.map((m) => managedModelKey(m.id)));
-	for (const [key, model] of Object.entries(existingModels)) if (isRecord$11(model) && model["provider"] === "managed:kimi-code" && !upstreamKeys.has(key)) delete existingModels[key];
+	for (const [key, model] of Object.entries(existingModels)) if (isRecord$10(model) && model["provider"] === "managed:kimi-code" && !upstreamKeys.has(key)) delete existingModels[key];
 	for (const model of options.models) {
 		const capabilities = capabilitiesForModel$1(model);
 		const key = managedModelKey(model.id);
-		const existing = isRecord$11(existingModels[key]) ? existingModels[key] : {};
+		const existing = isRecord$10(existingModels[key]) ? existingModels[key] : {};
 		const supportsAdaptiveThinking = model.protocol === "anthropic" && (capabilities?.includes("thinking") === true || capabilities?.includes("always_thinking") === true);
 		existingModels[key] = mergeRefreshedModelAlias(existing, {
 			provider: KIMI_CODE_PROVIDER_NAME$1,
@@ -202883,7 +203988,7 @@ function applyManagedKimiCodeLogoutConfig(config) {
 	let removedDefaultModel = false;
 	const existingModels = config.models ?? {};
 	for (const [key, model] of Object.entries(existingModels)) {
-		if (!isRecord$11(model) || model["provider"] !== "managed:kimi-code") continue;
+		if (!isRecord$10(model) || model["provider"] !== "managed:kimi-code") continue;
 		delete existingModels[key];
 		if (config.defaultModel === key) removedDefaultModel = true;
 	}
@@ -202922,7 +204027,7 @@ function selectDefaultModel(config, models, options) {
 function canPreserveDefaultModel(existingModels, defaultModel, managedModels) {
 	if (managedModels.has(defaultModel)) return true;
 	const existing = existingModels[defaultModel];
-	return isRecord$11(existing) && existing["provider"] !== "managed:kimi-code";
+	return isRecord$10(existing) && existing["provider"] !== "managed:kimi-code";
 }
 function assertPositiveContextLength(model) {
 	if (!Number.isInteger(model.contextLength) || model.contextLength <= 0) throw new Error(`Kimi Code model "${model.id}" must include a positive context_length.`);
@@ -203162,7 +204267,7 @@ function isOpenPlatformId(id) {
 	return OPEN_PLATFORMS.some((p) => p.id === id);
 }
 function toModelInfo(item) {
-	if (!isRecord$11(item) || typeof item["id"] !== "string" || item["id"].length === 0) return;
+	if (!isRecord$10(item) || typeof item["id"] !== "string" || item["id"].length === 0) return;
 	const contextLength = Number(item["context_length"]);
 	if (!Number.isInteger(contextLength) || contextLength <= 0) throw new Error(`Model "${item["id"]}" must include a positive context_length.`);
 	const displayName = item["display_name"];
@@ -203213,7 +204318,7 @@ async function fetchOpenPlatformModels(platform, apiKey, fetchImpl = fetch, sign
 	});
 	if (!res.ok) throw new OpenPlatformApiError(await readApiErrorMessage(res, `Failed to list models (HTTP ${res.status}).`), res.status);
 	const payload = await res.json();
-	if (!isRecord$11(payload) || !Array.isArray(payload["data"])) throw new Error(`Unexpected models response for ${platform.baseUrl}.`);
+	if (!isRecord$10(payload) || !Array.isArray(payload["data"])) throw new Error(`Unexpected models response for ${platform.baseUrl}.`);
 	return payload["data"].map((item) => toModelInfo(item)).filter((item) => item !== void 0);
 }
 function filterModelsByPrefix(models, platform) {
@@ -203231,10 +204336,10 @@ function applyOpenPlatformConfig(config, options) {
 	};
 	const existingModels = config.models ?? {};
 	const upstreamKeys = new Set(options.models.map((m) => `${providerKey}/${m.id}`));
-	for (const [key, model] of Object.entries(existingModels)) if (isRecord$11(model) && model["provider"] === providerKey && !upstreamKeys.has(key)) delete existingModels[key];
+	for (const [key, model] of Object.entries(existingModels)) if (isRecord$10(model) && model["provider"] === providerKey && !upstreamKeys.has(key)) delete existingModels[key];
 	for (const model of options.models) {
 		const aliasKey = `${providerKey}/${model.id}`;
-		existingModels[aliasKey] = mergeRefreshedModelAlias(isRecord$11(existingModels[aliasKey]) ? existingModels[aliasKey] : {}, {
+		existingModels[aliasKey] = mergeRefreshedModelAlias(isRecord$10(existingModels[aliasKey]) ? existingModels[aliasKey] : {}, {
 			provider: providerKey,
 			model: model.id,
 			maxContextSize: model.contextLength,
@@ -203300,14 +204405,14 @@ function toStringArrayOrUndefined(value) {
 	return out;
 }
 function toModelEntry(value) {
-	if (!isRecord$11(value)) return void 0;
+	if (!isRecord$10(value)) return void 0;
 	const id = value["id"];
 	if (typeof id !== "string" || id.length === 0) return void 0;
 	const entry = { id };
 	const name = value["name"];
 	if (typeof name === "string" && name.length > 0) entry.name = name;
 	const limit = value["limit"];
-	if (isRecord$11(limit)) {
+	if (isRecord$10(limit)) {
 		const context = limit["context"];
 		const output = limit["output"];
 		const parsedLimit = {};
@@ -203318,7 +204423,7 @@ function toModelEntry(value) {
 	if (typeof value["tool_call"] === "boolean") entry.tool_call = value["tool_call"];
 	if (typeof value["reasoning"] === "boolean") entry.reasoning = value["reasoning"];
 	const modalities = value["modalities"];
-	if (isRecord$11(modalities)) {
+	if (isRecord$10(modalities)) {
 		const input = toStringArrayOrUndefined(modalities["input"]);
 		const output = toStringArrayOrUndefined(modalities["output"]);
 		if (input !== void 0 || output !== void 0) entry.modalities = {
@@ -203329,7 +204434,7 @@ function toModelEntry(value) {
 	return entry;
 }
 function toProviderEntry(value) {
-	if (!isRecord$11(value)) return void 0;
+	if (!isRecord$10(value)) return void 0;
 	const id = value["id"];
 	const name = value["name"];
 	const api = value["api"];
@@ -203339,7 +204444,7 @@ function toProviderEntry(value) {
 	if (typeof name !== "string" || name.length === 0) return void 0;
 	if (typeof api !== "string" || api.length === 0) return void 0;
 	if (!isAllowedProviderType(type)) return void 0;
-	if (!isRecord$11(models)) return void 0;
+	if (!isRecord$10(models)) return void 0;
 	const parsedModels = {};
 	for (const [key, raw] of Object.entries(models)) {
 		const modelEntry = toModelEntry(raw);
@@ -203369,7 +204474,7 @@ async function fetchCustomRegistry(source, fetchImpl = fetch, signal) {
 	const response = await fetchImpl(source.url, init);
 	if (!response.ok) throw new CustomRegistryApiError(await readApiErrorMessage(response, `Failed to fetch custom registry at ${source.url} (HTTP ${response.status}).`), response.status);
 	const payload = await response.json();
-	if (!isRecord$11(payload)) throw new Error(`Unexpected custom registry response at ${source.url}: expected a JSON object keyed by provider id.`);
+	if (!isRecord$10(payload)) throw new Error(`Unexpected custom registry response at ${source.url}: expected a JSON object keyed by provider id.`);
 	const out = {};
 	for (const [key, raw] of Object.entries(payload)) {
 		const entry = toProviderEntry(raw);
@@ -203429,13 +204534,13 @@ function applyCustomRegistryProvider(config, entry, source) {
 	};
 	const existingModels = config.models ?? {};
 	const upstreamKeys = new Set(Object.keys(entry.models).map((modelKey) => `${providerKey}/${modelKey}`));
-	for (const [key, alias] of Object.entries(existingModels)) if (isRecord$11(alias) && alias["provider"] === providerKey && !upstreamKeys.has(key)) delete existingModels[key];
+	for (const [key, alias] of Object.entries(existingModels)) if (isRecord$10(alias) && alias["provider"] === providerKey && !upstreamKeys.has(key)) delete existingModels[key];
 	for (const [modelKey, model] of Object.entries(entry.models)) {
 		const aliasKey = `${providerKey}/${modelKey}`;
 		const maxContextSize = resolveMaxContextSize(model);
 		const capabilities = resolveCapabilities(model);
 		const displayName = typeof model.name === "string" && model.name.length > 0 ? model.name : model.id;
-		existingModels[aliasKey] = mergeRefreshedModelAlias(isRecord$11(existingModels[aliasKey]) ? existingModels[aliasKey] : {}, {
+		existingModels[aliasKey] = mergeRefreshedModelAlias(isRecord$10(existingModels[aliasKey]) ? existingModels[aliasKey] : {}, {
 			provider: providerKey,
 			model: model.id,
 			maxContextSize,
@@ -203455,7 +204560,7 @@ function removeCustomRegistryProvider(config, providerId) {
 	let removedDefault = false;
 	const existingModels = config.models ?? {};
 	for (const [key, alias] of Object.entries(existingModels)) {
-		if (!isRecord$11(alias) || alias["provider"] !== providerId) continue;
+		if (!isRecord$10(alias) || alias["provider"] !== providerId) continue;
 		delete existingModels[key];
 		if (config.defaultModel === key) removedDefault = true;
 	}
@@ -203487,9 +204592,9 @@ function applyCustomRegistryEntries(config, entries, source) {
 	const surviving = new Set(Object.values(entries).map((entry) => entry.id));
 	for (const [providerId, provider] of Object.entries(config.providers)) {
 		if (surviving.has(providerId)) continue;
-		if (!isRecord$11(provider)) continue;
+		if (!isRecord$10(provider)) continue;
 		const existingSource = provider["source"];
-		if (isRecord$11(existingSource) && existingSource["kind"] === "apiJson" && existingSource["url"] === source.url) removeCustomRegistryProvider(config, providerId);
+		if (isRecord$10(existingSource) && existingSource["kind"] === "apiJson" && existingSource["url"] === source.url) removeCustomRegistryProvider(config, providerId);
 	}
 	for (const entry of Object.values(entries)) {
 		if (entry.id in config.providers) removeCustomRegistryProvider(config, entry.id);
@@ -204187,7 +205292,8 @@ function resolveModelCapabilities(alias, provider) {
 		audio_in: declared.has("audio_in") || detected.audio_in,
 		thinking: declared.has("thinking") || declared.has("always_thinking") || detected.thinking,
 		tool_use: declared.has("tool_use") || detected.tool_use,
-		max_context_tokens: alias.maxContextSize
+		max_context_tokens: alias.maxContextSize,
+		select_tools: declared.has("select_tools") || detected.select_tools === true
 	};
 }
 function toKosongProviderConfig(provider, model, modelProtocol, kimiRequestHeaders, maxOutputSize, reasoningKey, promptCacheKey, adaptiveThinking, betaApi, supportEfforts) {
@@ -204691,498 +205797,6 @@ var init_rpc$1 = __esmMin((() => {
 	};
 }));
 //#endregion
-//#region ../../packages/agent-core/src/session/store/session-index.ts
-function sessionIndexPath(homeDir) {
-	return join$4(homeDir, "session_index.jsonl");
-}
-async function appendSessionIndexEntry(homeDir, entry) {
-	const indexPath = sessionIndexPath(homeDir);
-	await mkdir(dirname$3(indexPath), {
-		recursive: true,
-		mode: 448
-	});
-	await appendFile(indexPath, `${JSON.stringify(entry)}\n`, "utf-8");
-}
-async function readSessionIndex$1(homeDir, sessionsDir) {
-	let raw;
-	try {
-		raw = await readFile(sessionIndexPath(homeDir), "utf-8");
-	} catch {
-		return /* @__PURE__ */ new Map();
-	}
-	const result = /* @__PURE__ */ new Map();
-	for (const line of raw.split(/\r?\n/)) {
-		const trimmed = line.trim();
-		if (trimmed === "") continue;
-		const entry = parseIndexLine(trimmed);
-		if (entry === void 0) continue;
-		const sessionDir = resolve$2(entry.sessionDir);
-		if (!isAbsolute$2(entry.sessionDir)) continue;
-		if (!isAbsolute$2(entry.workDir)) continue;
-		if (!isPathInside(sessionsDir, sessionDir)) continue;
-		if (basename$2(sessionDir) !== entry.sessionId) continue;
-		result.set(entry.sessionId, {
-			sessionId: entry.sessionId,
-			sessionDir,
-			workDir: resolve$2(entry.workDir)
-		});
-	}
-	return result;
-}
-function parseIndexLine(line) {
-	try {
-		const parsed = JSON.parse(line);
-		if (typeof parsed !== "object" || parsed === null) return void 0;
-		const entry = parsed;
-		if (typeof entry.sessionId !== "string" || typeof entry.sessionDir !== "string" || typeof entry.workDir !== "string") return;
-		return {
-			sessionId: entry.sessionId,
-			sessionDir: entry.sessionDir,
-			workDir: entry.workDir
-		};
-	} catch {
-		return;
-	}
-}
-function isPathInside(parent, child) {
-	const rel = relative$1(resolve$2(parent), resolve$2(child));
-	return rel !== "" && !rel.startsWith("..") && !isAbsolute$2(rel);
-}
-var init_session_index = __esmMin((() => {
-	init_dist$7();
-}));
-//#endregion
-//#region ../../packages/agent-core/src/utils/workdir-slug.ts
-function slugifyWorkDirName(name) {
-	const slug = name.toLowerCase().replaceAll(/[^a-z0-9._-]+/g, "-").replaceAll(/^-+|-+$/g, "").slice(0, MAX_WORKDIR_SLUG_LENGTH).replaceAll(/^-+|-+$/g, "");
-	return slug === "" || slug === "." || slug === ".." ? "workspace" : slug;
-}
-var MAX_WORKDIR_SLUG_LENGTH;
-var init_workdir_slug = __esmMin((() => {
-	MAX_WORKDIR_SLUG_LENGTH = 40;
-}));
-//#endregion
-//#region ../../packages/agent-core/src/session/store/workdir-key.ts
-function normalizeWorkDir(workDir) {
-	return resolve$2(workDir);
-}
-function encodeWorkDirKey(workDir) {
-	const normalized = normalizeWorkDir(workDir);
-	return `${WORKDIR_KEY_PREFIX}${slugifyWorkDirName(basename$2(normalized))}_${createHash("sha256").update(normalized).digest("hex").slice(0, HASH_LENGTH)}`;
-}
-var WORKDIR_KEY_PREFIX, HASH_LENGTH;
-var init_workdir_key = __esmMin((() => {
-	init_dist$7();
-	init_workdir_slug();
-	WORKDIR_KEY_PREFIX = "wd_";
-	HASH_LENGTH = 12;
-}));
-//#endregion
-//#region ../../packages/agent-core/src/session/store/session-store.ts
-function metadataFromState(state) {
-	if (state === void 0 || state.custom === void 0) return void 0;
-	return state.custom;
-}
-function forkCustomMetadata(source, metadata) {
-	return {
-		...customMetadataWithoutGoal(source),
-		...customMetadataWithoutGoal(metadata)
-	};
-}
-async function dropForkedSessionFiles(sessionDir) {
-	await Promise.all(FORKED_SESSION_DROPPED_FILES.map((fileName) => rm(join$4(sessionDir, fileName), { force: true })));
-}
-async function appendForkedMarkers(state) {
-	const record = {
-		type: "forked",
-		time: Date.now()
-	};
-	const agents = state["agents"];
-	if (!isRecord$10(agents)) return;
-	const paths = /* @__PURE__ */ new Set();
-	for (const agentMeta of Object.values(agents)) {
-		if (!isRecord$10(agentMeta)) continue;
-		const homedir = agentMeta["homedir"];
-		if (typeof homedir !== "string") continue;
-		paths.add(join$4(homedir, "wire.jsonl"));
-	}
-	await Promise.all([...paths].map(async (path) => {
-		const persistence = new FileSystemAgentRecordPersistence(path);
-		persistence.append(record);
-		await persistence.flush();
-	}));
-}
-function customMetadataWithoutGoal(value) {
-	if (!isRecord$10(value)) return {};
-	const custom = {};
-	for (const [key, entry] of Object.entries(value)) {
-		if (key === "goal") continue;
-		custom[key] = entry;
-	}
-	return custom;
-}
-async function latestAgentWireMtime(sessionDir) {
-	const agentsDir = join$4(sessionDir, "agents");
-	let entries;
-	try {
-		entries = await readdir$1(agentsDir, { withFileTypes: true });
-	} catch {
-		return;
-	}
-	let latest = 0;
-	for (const entry of entries) {
-		if (!entry.isDirectory()) continue;
-		const wireInfo = await statIfExists(join$4(agentsDir, entry.name, "wire.jsonl"));
-		latest = Math.max(latest, wireInfo?.mtimeMs ?? 0);
-	}
-	return latest > 0 ? latest : void 0;
-}
-function titleFromState(state) {
-	if (state === void 0) return void 0;
-	if (typeof state.isCustomTitle === "boolean" && typeof state.title === "string") return state.title;
-	if (typeof state.customTitle === "string") return state.customTitle;
-	return typeof state.title === "string" ? state.title : void 0;
-}
-async function readOptionalState(sessionDir) {
-	try {
-		const parsed = JSON.parse(await readFile(join$4(sessionDir, "state.json"), "utf-8"));
-		const result = SessionSummaryStateSchema.safeParse(parsed);
-		return result.success ? result.data : void 0;
-	} catch {
-		return;
-	}
-}
-function normalizeRequiredWorkDir(workDir) {
-	if (workDir.trim() === "") throw new KimiError(ErrorCodes.REQUEST_WORK_DIR_REQUIRED, "listSessions requires workDir");
-	return normalizeWorkDir(workDir);
-}
-function normalizeOptionalSessionId$1(sessionId) {
-	return sessionId === void 0 ? void 0 : sessionId.trim();
-}
-function normalizeForkTitle(title, fallback) {
-	if (title !== void 0) {
-		const normalized = title.trim();
-		if (normalized.length === 0) throw new KimiError(ErrorCodes.SESSION_TITLE_EMPTY, "Session title cannot be empty");
-		return normalized;
-	}
-	return typeof fallback === "string" && fallback.trim().length > 0 ? fallback : "New Session";
-}
-function rewriteAgentHomedirs(value, sourceDir, targetDir) {
-	if (!isRecord$10(value)) return {};
-	const agents = {};
-	for (const [agentId, agentMeta] of Object.entries(value)) {
-		if (!isRecord$10(agentMeta)) {
-			agents[agentId] = agentMeta;
-			continue;
-		}
-		const homedir = agentMeta["homedir"];
-		agents[agentId] = {
-			...agentMeta,
-			homedir: typeof homedir === "string" ? remapSessionPath(homedir, sourceDir, targetDir) : homedir
-		};
-	}
-	return agents;
-}
-function remapSessionPath(value, sourceDir, targetDir) {
-	const rel = relative$1(sourceDir, value);
-	if (rel === "") return targetDir;
-	if (rel.startsWith("..") || isAbsolute$2(rel)) return value;
-	return join$4(targetDir, rel);
-}
-function isRecord$10(value) {
-	return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-async function statIfExists(path) {
-	try {
-		return await stat$2(path);
-	} catch {
-		return;
-	}
-}
-async function isDirectory(path) {
-	try {
-		return (await stat$2(path)).isDirectory();
-	} catch {
-		return false;
-	}
-}
-function timestampOrFallback(value, fallback) {
-	return Number.isFinite(value) && value > 0 ? value : fallback;
-}
-function assertSafeSessionId(id) {
-	if (isSafeSessionId(id)) return;
-	throw new KimiError(ErrorCodes.SESSION_ID_INVALID, "Session id contains unsupported path characters");
-}
-function isSafeSessionId(id) {
-	return /^[A-Za-z0-9._-]+$/.test(id) && id !== "." && id !== "..";
-}
-function compareSessionSummary(a, b) {
-	if (a.updatedAt !== b.updatedAt) return b.updatedAt - a.updatedAt;
-	if (a.createdAt !== b.createdAt) return b.createdAt - a.createdAt;
-	if (a.id < b.id) return -1;
-	if (a.id > b.id) return 1;
-	return 0;
-}
-var SessionSummaryStateSchema, FORKED_SESSION_DROPPED_FILES, SessionStore;
-var init_session_store$1 = __esmMin((() => {
-	init_dist$7();
-	init_zod$1();
-	init_errors$8();
-	init_session_index();
-	init_workdir_key();
-	init_records();
-	SessionSummaryStateSchema = object({
-		archived: boolean$1().optional(),
-		customTitle: string().optional(),
-		isCustomTitle: boolean$1().optional(),
-		lastPrompt: string().optional(),
-		title: string().optional(),
-		custom: record(string(), unknown()).optional()
-	});
-	FORKED_SESSION_DROPPED_FILES = ["upcoming-goals.json"];
-	SessionStore = class {
-		homeDir;
-		sessionsDir;
-		constructor(homeDir, _options = {}) {
-			this.homeDir = homeDir;
-			this.sessionsDir = join$4(homeDir, "sessions");
-		}
-		sessionDirFor(input) {
-			assertSafeSessionId(input.id);
-			return join$4(this.sessionsDir, encodeWorkDirKey(normalizeWorkDir(input.workDir)), input.id);
-		}
-		async create(input) {
-			assertSafeSessionId(input.id);
-			const workDir = normalizeWorkDir(input.workDir);
-			if (await this.findSessionEntry(input.id) !== void 0) throw new KimiError(ErrorCodes.SESSION_ALREADY_EXISTS, `Session "${input.id}" already exists`);
-			const dir = this.sessionDirFor({
-				id: input.id,
-				workDir
-			});
-			if (await isDirectory(dir)) throw new KimiError(ErrorCodes.SESSION_ALREADY_EXISTS, `Session "${input.id}" already exists`);
-			await mkdir(dir, {
-				recursive: true,
-				mode: 448
-			});
-			await appendSessionIndexEntry(this.homeDir, {
-				sessionId: input.id,
-				sessionDir: dir,
-				workDir
-			});
-			return this.summaryFromDir(input.id, dir, workDir);
-		}
-		async fork(input) {
-			const source = await this.findExistingSessionEntry(input.sourceId);
-			assertSafeSessionId(input.targetId);
-			if (await this.findSessionEntry(input.targetId) !== void 0) throw new KimiError(ErrorCodes.SESSION_ALREADY_EXISTS, `Session "${input.targetId}" already exists`);
-			const targetDir = this.sessionDirFor({
-				id: input.targetId,
-				workDir: source.workDir
-			});
-			if (await isDirectory(targetDir)) throw new KimiError(ErrorCodes.SESSION_ALREADY_EXISTS, `Session "${input.targetId}" already exists`);
-			await mkdir(dirname$3(targetDir), {
-				recursive: true,
-				mode: 448
-			});
-			try {
-				await cp(source.sessionDir, targetDir, {
-					recursive: true,
-					force: false,
-					errorOnExist: true
-				});
-				await dropForkedSessionFiles(targetDir);
-				await appendForkedMarkers(await this.writeForkedState(input, source.sessionDir, targetDir));
-				const summary = await this.summaryFromDir(input.targetId, targetDir, source.workDir);
-				await appendSessionIndexEntry(this.homeDir, {
-					sessionId: input.targetId,
-					sessionDir: targetDir,
-					workDir: source.workDir
-				});
-				return summary;
-			} catch (error) {
-				await rm(targetDir, {
-					recursive: true,
-					force: true
-				}).catch(() => {});
-				throw error;
-			}
-		}
-		async get(id) {
-			const entry = await this.findExistingSessionEntry(id);
-			return this.summaryFromDir(id, entry.sessionDir, entry.workDir);
-		}
-		async rename(id, title) {
-			const normalized = title.trim();
-			if (normalized.length === 0) throw new KimiError(ErrorCodes.SESSION_TITLE_EMPTY, "Session title cannot be empty");
-			const statePath = join$4((await this.findExistingSessionEntry(id)).sessionDir, "state.json");
-			let parsed;
-			try {
-				parsed = JSON.parse(await readFile(statePath, "utf-8"));
-			} catch (error) {
-				throw new KimiError(ErrorCodes.SESSION_STATE_NOT_FOUND, `Session "${id}" state.json was not found`, { cause: error });
-			}
-			if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) throw new KimiError(ErrorCodes.SESSION_STATE_INVALID, `Session "${id}" state.json is invalid`);
-			const next = {
-				...parsed,
-				title: normalized,
-				isCustomTitle: true
-			};
-			await writeFile$1(statePath, `${JSON.stringify(next, null, 2)}\n`, "utf-8");
-		}
-		async archive(id) {
-			const entry = await this.findExistingSessionEntry(id);
-			const statePath = join$4(entry.sessionDir, "state.json");
-			let parsed;
-			try {
-				parsed = JSON.parse(await readFile(statePath, "utf-8"));
-			} catch (error) {
-				throw new KimiError(ErrorCodes.SESSION_STATE_NOT_FOUND, `Session "${id}" state.json was not found`, { cause: error });
-			}
-			if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) throw new KimiError(ErrorCodes.SESSION_STATE_INVALID, `Session "${id}" state.json is invalid`);
-			const now = (/* @__PURE__ */ new Date()).toISOString();
-			const next = {
-				...parsed,
-				archived: true,
-				updatedAt: now
-			};
-			await writeFile$1(statePath, `${JSON.stringify(next, null, 2)}\n`, "utf-8");
-			return this.summaryFromDir(id, entry.sessionDir, entry.workDir);
-		}
-		async list(options = {}) {
-			const workDir = options.workDir === void 0 ? void 0 : normalizeRequiredWorkDir(options.workDir);
-			const sessionId = normalizeOptionalSessionId$1(options.sessionId);
-			const includeArchive = options.includeArchive === true;
-			if (workDir !== void 0) {
-				if (sessionId !== void 0) {
-					const local = await this.summaryFromWorkDirSession(sessionId, workDir, includeArchive);
-					if (local !== void 0) return [local];
-					return this.listSessionId(sessionId, includeArchive);
-				}
-				return this.listWorkDir(workDir, includeArchive);
-			}
-			if (sessionId !== void 0) return this.listSessionId(sessionId, includeArchive);
-			return this.listAll(includeArchive);
-		}
-		async listWorkDir(workDir, includeArchive) {
-			const bucketDir = join$4(this.sessionsDir, encodeWorkDirKey(workDir));
-			let entries;
-			try {
-				entries = await readdir$1(bucketDir, { withFileTypes: true });
-			} catch {
-				return [];
-			}
-			const sessions = [];
-			for (const entry of entries) {
-				if (!entry.isDirectory()) continue;
-				const id = entry.name;
-				if (!isSafeSessionId(id)) continue;
-				const dir = join$4(bucketDir, id);
-				const summary = await this.summaryFromDir(id, dir, workDir);
-				if (!includeArchive && summary.archived === true) continue;
-				sessions.push(summary);
-			}
-			sessions.sort(compareSessionSummary);
-			return sessions;
-		}
-		async listSessionId(sessionId, includeArchive) {
-			try {
-				const summary = await this.get(sessionId);
-				if (!includeArchive && summary.archived === true) return [];
-				return [summary];
-			} catch (error) {
-				if (error instanceof KimiError && error.code === ErrorCodes.SESSION_NOT_FOUND) return [];
-				throw error;
-			}
-		}
-		async listAll(includeArchive) {
-			const index = await readSessionIndex$1(this.homeDir, this.sessionsDir);
-			const sessions = [];
-			for (const entry of index.values()) {
-				if (!await isDirectory(entry.sessionDir)) continue;
-				const summary = await this.summaryFromDir(entry.sessionId, entry.sessionDir, entry.workDir);
-				if (!includeArchive && summary.archived === true) continue;
-				sessions.push(summary);
-			}
-			sessions.sort(compareSessionSummary);
-			return sessions;
-		}
-		async summaryFromWorkDirSession(sessionId, workDir, includeArchive) {
-			if (!isSafeSessionId(sessionId)) return void 0;
-			const sessionDir = this.sessionDirFor({
-				id: sessionId,
-				workDir
-			});
-			if (!await isDirectory(sessionDir)) return void 0;
-			const summary = await this.summaryFromDir(sessionId, sessionDir, workDir);
-			if (!includeArchive && summary.archived === true) return void 0;
-			return summary;
-		}
-		async assertDirectory(id) {
-			return (await this.findExistingSessionEntry(id)).sessionDir;
-		}
-		async findSessionEntry(id) {
-			if (!isSafeSessionId(id)) return void 0;
-			return (await readSessionIndex$1(this.homeDir, this.sessionsDir)).get(id);
-		}
-		async findExistingSessionEntry(id) {
-			const entry = await this.findSessionEntry(id);
-			if (entry !== void 0 && await isDirectory(entry.sessionDir)) return entry;
-			throw new KimiError(ErrorCodes.SESSION_NOT_FOUND, `Session "${id}" was not found`, { details: { sessionId: id } });
-		}
-		async writeForkedState(input, sourceDir, targetDir) {
-			const statePath = join$4(targetDir, "state.json");
-			let parsed;
-			try {
-				parsed = JSON.parse(await readFile(statePath, "utf-8"));
-			} catch (error) {
-				throw new KimiError(ErrorCodes.SESSION_STATE_NOT_FOUND, `Session "${input.sourceId}" state.json was not found`, { cause: error });
-			}
-			if (!isRecord$10(parsed)) throw new KimiError(ErrorCodes.SESSION_STATE_INVALID, `Session "${input.sourceId}" state.json is invalid`);
-			const title = normalizeForkTitle(input.title, parsed["title"]);
-			const now = (/* @__PURE__ */ new Date()).toISOString();
-			const next = {
-				...parsed,
-				createdAt: now,
-				updatedAt: now,
-				title,
-				isCustomTitle: input.title === void 0 ? parsed["isCustomTitle"] === true : true,
-				forkedFrom: input.sourceId,
-				agents: rewriteAgentHomedirs(parsed["agents"], sourceDir, targetDir),
-				custom: forkCustomMetadata(parsed["custom"], input.metadata)
-			};
-			await writeFile$1(statePath, `${JSON.stringify(next, null, 2)}\n`, "utf-8");
-			return next;
-		}
-		async summaryFromDir(id, sessionDir, workDir) {
-			const dirStat = await stat$2(sessionDir);
-			const state = await readOptionalState(sessionDir);
-			const [stateInfo, wireInfo, agentsWireMtime] = await Promise.all([
-				statIfExists(join$4(sessionDir, "state.json")),
-				statIfExists(join$4(sessionDir, "wire.jsonl")),
-				latestAgentWireMtime(sessionDir)
-			]);
-			return {
-				id,
-				workDir,
-				sessionDir,
-				createdAt: timestampOrFallback(dirStat.birthtimeMs, dirStat.ctimeMs),
-				updatedAt: Math.max(dirStat.mtimeMs, stateInfo?.mtimeMs ?? 0, wireInfo?.mtimeMs ?? 0, agentsWireMtime ?? 0),
-				archived: state?.archived === true,
-				title: titleFromState(state),
-				lastPrompt: state?.lastPrompt,
-				metadata: metadataFromState(state)
-			};
-		}
-	};
-}));
-//#endregion
-//#region ../../packages/agent-core/src/session/store/index.ts
-var init_store = __esmMin((() => {
-	init_session_store$1();
-	init_session_index();
-	init_workdir_key();
-}));
-//#endregion
 //#region ../../packages/kaos/src/errors.ts
 var KaosError, KaosFileExistsError, KaosShellNotFoundError;
 var init_errors$1 = __esmMin((() => {
@@ -206432,9 +207046,10 @@ var init_core_impl = __esmMin((() => {
 	init_mcp$1();
 	init_session$1();
 	init_export();
+	init_skill$4();
 	init_provider_manager();
 	init_rpc$1();
-	init_store();
+	init_store$1();
 	init_telemetry();
 	init_types$3();
 	init_src$1();
@@ -206559,6 +207174,7 @@ var init_core_impl = __esmMin((() => {
 					...session.metadata,
 					createdAt: new Date(summary.createdAt).toISOString(),
 					updatedAt: new Date(summary.updatedAt).toISOString(),
+					workDir,
 					...summary.title !== void 0 ? {
 						title: summary.title,
 						isCustomTitle: true
@@ -206857,6 +207473,34 @@ var init_core_impl = __esmMin((() => {
 		listSkills({ sessionId, ...payload }) {
 			return this.sessionApi(sessionId).listSkills(payload);
 		}
+		/**
+		* List the skills available for a workspace working directory without
+		* requiring a session. Mirrors `Session.loadSkills` exactly (same roots,
+		* same discovery order, same built-ins) so the result matches what a new
+		* session created in `workDir` would see. Used to populate the composer
+		* skill menu before a session exists.
+		*/
+		async listWorkspaceSkills({ workDir }) {
+			const cwd = requiredWorkDir("listWorkspaceSkills", workDir);
+			await this.pluginsReady;
+			const skills = this.resolveSessionSkillConfig(this.reloadProviderManager());
+			const roots = await resolveSkillRoots({
+				paths: {
+					userHomeDir: skills.userHomeDir ?? this.userHomeDir,
+					brandHomeDir: skills.brandHomeDir ?? this.homeDir,
+					workDir: cwd
+				},
+				explicitDirs: skills.explicitDirs,
+				extraDirs: skills.extraDirs,
+				pluginSkillRoots: skills.pluginSkillRoots,
+				mergeAllAvailableSkills: skills.mergeAllAvailableSkills,
+				builtinDir: skills.builtinDir
+			});
+			const registry = new SessionSkillRegistry({});
+			await registry.loadRoots(roots);
+			registerBuiltinSkills(registry);
+			return registry.listSkills().map(summarizeSkill);
+		}
 		listPluginCommands({ sessionId, ...payload }) {
 			return this.sessionApi(sessionId).listPluginCommands(payload);
 		}
@@ -208407,30 +209051,53 @@ function toBrokerRequest(req, params) {
 * Protocol REST response body → in-process SDK `QuestionResponse` (with
 * `answers` flattened to `Record<string, string | true>`).
 *
-* Normalization rules from SCHEMAS §6.4:
-*   - single            → option_id
-*   - multi             → option_ids.join(',')
+* The wire keeps synthesized ids (`q_<idx>` / `opt_<q>_<o>`) so clients can
+* answer unambiguously, but the flattened record is what the ask-user tool
+* feeds back to the model — so ids are translated back to text here using
+* the original broker `request`:
+*   - key               → the question's text (falls back to the raw qid
+*                         when the request is unavailable or the qid is
+*                         unknown — stale client, defensive)
+*   - single            → option label
+*   - multi             → labels.join(', ')
 *   - other             → text
-*   - multi_with_other  → [...option_ids, other_text].join(',')
+*   - multi_with_other  → [...labels, other_text].join(', ')
 *   - skipped           → OMIT entry
+*
+* Multi-select joins use `', '` to match what the TUI reverse-RPC path
+* already emits, so the model sees one format regardless of which client
+* answered.
+*
+* Unknown qids and option ids — including ids that belong to a DIFFERENT
+* question than the one being answered — are kept verbatim rather than
+* resolved or dropped: translating a cross-question id would hand the model
+* a plausible-looking label that was never offered for that question, while
+* the raw id stays diagnosable.
 */
-function toAgentCoreResponse(resp) {
+function toAgentCoreResponse(resp, request) {
+	const itemsById = /* @__PURE__ */ new Map();
+	for (const item of request?.questions ?? []) itemsById.set(item.id, item);
 	const flattened = {};
-	for (const [qid, ans] of Object.entries(resp.answers)) switch (ans.kind) {
-		case "single":
-			flattened[qid] = ans.option_id;
-			break;
-		case "multi":
-			flattened[qid] = ans.option_ids.join(",");
-			break;
-		case "other":
-			flattened[qid] = ans.text;
-			break;
-		case "multi_with_other":
-			flattened[qid] = [...ans.option_ids, ans.other_text].join(",");
-			break;
-		case "skipped": break;
-		default:
+	for (const [qid, ans] of Object.entries(resp.answers)) {
+		const item = itemsById.get(qid);
+		const key = item?.question ?? qid;
+		const optionText = (id) => item?.options.find((o) => o.id === id)?.label ?? id;
+		switch (ans.kind) {
+			case "single":
+				flattened[key] = optionText(ans.option_id);
+				break;
+			case "multi":
+				flattened[key] = ans.option_ids.map(optionText).join(", ");
+				break;
+			case "other":
+				flattened[key] = ans.text;
+				break;
+			case "multi_with_other":
+				flattened[key] = [...ans.option_ids.map(optionText), ans.other_text].join(", ");
+				break;
+			case "skipped": break;
+			default:
+		}
 	}
 	const out = { answers: flattened };
 	if (resp.method !== void 0) {
@@ -209087,7 +209754,7 @@ function toProtocolSession(summary, meta) {
 var ISessionService, SessionUndoUnavailableError, SessionNotFoundError;
 var init_session = __esmMin((() => {
 	init_di();
-	init_store();
+	init_store$1();
 	init_src$3();
 	ISessionService = createDecorator("sessionService");
 	SessionUndoUnavailableError = class extends Error {
@@ -212483,7 +213150,7 @@ var WORKSPACE_REGISTRY_FILE, WORKSPACE_REGISTRY_VERSION, WorkspaceRegistryServic
 var init_workspaceRegistryService = __esmMin((() => {
 	init_dist$7();
 	init_di();
-	init_store();
+	init_store$1();
 	init_session_index();
 	init_environment();
 	init_event();
@@ -215595,6 +216262,9 @@ var init_skillService = __esmMin((() => {
 			await this._requireLoadedSession(sessionId);
 			return (await this.core.rpc.listSkills({ sessionId })).map(toProtocolSkill);
 		}
+		async listForWorkDir(workDir) {
+			return (await this.core.rpc.listWorkspaceSkills({ workDir })).map(toProtocolSkill);
+		}
 		async activate(sessionId, skillName, args) {
 			await this._requireLoadedSession(sessionId);
 			try {
@@ -217590,6 +218260,7 @@ function capabilityToStrings(capability) {
 	if (capability.audio_in) caps.push("audio_in");
 	if (capability.thinking) caps.push("thinking");
 	if (capability.tool_use) caps.push("tool_use");
+	if (capability.select_tools === true) caps.push("select_tools");
 	return caps.length > 0 ? caps : void 0;
 }
 /** Builds a kimi-code model alias from a normalized catalog model. */
@@ -217648,6 +218319,7 @@ const MAX_QUEUE_SIZE = 1e3;
 var TelemetryClient = class {
 	queue = [];
 	sink = null;
+	systemMetricsCollector = null;
 	deviceId = null;
 	sessionId = null;
 	disabled = false;
@@ -217658,6 +218330,10 @@ var TelemetryClient = class {
 	withContext(input) {
 		return new ScopedTelemetryClient(this, input);
 	}
+	setSystemMetricsCollector(collector) {
+		if (this.systemMetricsCollector !== null && this.systemMetricsCollector !== collector) this.systemMetricsCollector.stop();
+		this.systemMetricsCollector = collector;
+	}
 	attachSink(sink) {
 		if (this.sink !== null && this.sink !== sink) {
 			this.sink.stopPeriodicFlush();
@@ -217675,6 +218351,8 @@ var TelemetryClient = class {
 	disable() {
 		this.disabled = true;
 		this.queue = [];
+		this.systemMetricsCollector?.stop();
+		this.systemMetricsCollector = null;
 		if (this.sink !== null) {
 			this.sink.stopPeriodicFlush();
 			this.sink.clearBuffer();
@@ -217718,6 +218396,8 @@ var TelemetryClient = class {
 		this.sink?.flushSync();
 	}
 	async shutdown(options = {}) {
+		this.systemMetricsCollector?.stop();
+		this.systemMetricsCollector = null;
 		const sink = this.sink;
 		if (sink === null) return;
 		sink.stopPeriodicFlush();
@@ -217740,6 +218420,8 @@ var TelemetryClient = class {
 	}
 	resetForTests() {
 		this.sink?.stopPeriodicFlush();
+		this.systemMetricsCollector?.stop();
+		this.systemMetricsCollector = null;
 		this.queue = [];
 		this.sink = null;
 		this.deviceId = null;
@@ -217761,6 +218443,9 @@ var ScopedTelemetryClient = class ScopedTelemetryClient extends TelemetryClient
 	withContext(input) {
 		return new ScopedTelemetryClient(this.parent, mergeContext(this.context, input));
 	}
+	setSystemMetricsCollector(collector) {
+		this.parent.setSystemMetricsCollector(collector);
+	}
 	attachSink(sink) {
 		this.parent.attachSink(sink);
 	}
@@ -217908,6 +218593,88 @@ function setPrimitive(target, key, value) {
 	if (typeof value === "string" && value.length === 0) return;
 	target[key] = value;
 }
+//#endregion
+//#region ../../packages/telemetry/src/systemMetrics.ts
+const DEFAULT_INTERVAL_MS = 3e4;
+const DEFAULT_WARMUP_SAMPLE_MS = 1500;
+const SYSTEM_METRICS_EVENT = "system_metrics";
+var SystemMetricsCollector = class {
+	client;
+	intervalMs;
+	warmupSampleMs;
+	intervalTimer = null;
+	warmupTimer = null;
+	previousCpuUsage = process.cpuUsage();
+	previousHrtime = process.hrtime.bigint();
+	processStartedAtSeconds = Math.floor(Date.now() / 1e3 - process.uptime());
+	constructor(options) {
+		this.client = options.client;
+		this.intervalMs = options.intervalMs ?? DEFAULT_INTERVAL_MS;
+		this.warmupSampleMs = options.warmupSampleMs === void 0 ? DEFAULT_WARMUP_SAMPLE_MS : options.warmupSampleMs;
+	}
+	start() {
+		if (this.intervalTimer !== null) return;
+		if (this.warmupSampleMs !== null && this.warmupSampleMs > 0) {
+			this.warmupTimer = setTimeout(() => {
+				this.warmupTimer = null;
+				this.sampleSafely();
+			}, this.warmupSampleMs);
+			this.warmupTimer.unref?.();
+		}
+		this.intervalTimer = setInterval(() => {
+			this.sampleSafely();
+		}, this.intervalMs);
+		this.intervalTimer.unref?.();
+	}
+	stop() {
+		if (this.warmupTimer !== null) {
+			clearTimeout(this.warmupTimer);
+			this.warmupTimer = null;
+		}
+		if (this.intervalTimer !== null) {
+			clearInterval(this.intervalTimer);
+			this.intervalTimer = null;
+		}
+	}
+	sampleSafely() {
+		try {
+			this.sample();
+		} catch {
+			this.stop();
+		}
+	}
+	sample() {
+		const now = process.hrtime.bigint();
+		const elapsedUs = Number(now - this.previousHrtime) / 1e3;
+		const cpu = process.cpuUsage(this.previousCpuUsage);
+		this.previousCpuUsage = process.cpuUsage();
+		this.previousHrtime = now;
+		const mem = process.memoryUsage();
+		const constrainedMemory = getConstrainedMemoryBytes();
+		this.client.track(SYSTEM_METRICS_EVENT, {
+			process_started_at: this.processStartedAtSeconds,
+			process_uptime_ms: Math.round(process.uptime() * 1e3),
+			rss_bytes: mem.rss,
+			heap_used_bytes: mem.heapUsed,
+			heap_total_bytes: mem.heapTotal,
+			external_bytes: mem.external,
+			array_buffers_bytes: mem.arrayBuffers,
+			constrained_memory_bytes: constrainedMemory,
+			cpu_user_us: cpu.user,
+			cpu_system_us: cpu.system,
+			cpu_elapsed_us: Math.round(elapsedUs),
+			load_avg_1m: loadavg()[0],
+			free_mem_bytes: freemem(),
+			total_mem_bytes: totalmem(),
+			cpu_count: cpus().length
+		});
+	}
+};
+function getConstrainedMemoryBytes() {
+	if (typeof process.constrainedMemory !== "function") return void 0;
+	const value = process.constrainedMemory();
+	return Number.isFinite(value) ? value : void 0;
+}
 const SERVER_EVENT_PREFIX = "kfc_";
 const USER_ID_PREFIX = "kfc_device_id_";
 const RETRY_BACKOFFS_MS = [
@@ -218206,6 +218973,9 @@ function initializeTelemetry(options) {
 	});
 	client.attachSink(sink);
 	sink.startPeriodicFlush();
+	const systemMetricsCollector = new SystemMetricsCollector({ client });
+	client.setSystemMetricsCollector(systemMetricsCollector);
+	systemMetricsCollector.start();
 	sink.retryDiskEvents().catch(() => {});
 }
 //#endregion
@@ -218602,7 +219372,7 @@ async function classifySessionDir(sessionDir) {
 }
 //#endregion
 //#region ../../packages/migration-legacy/src/sessions/workdir-bucket.ts
-init_store();
+init_store$1();
 /**
 * Bucket directory name `wd_<slug>_<hash12>` for a workdir path.
 *
@@ -220229,10 +220999,12 @@ async function walkDirectoryWithFd(baseDir, fdPath, query, maxResults, signal) {
 var CombinedAutocompleteProvider = class {
 	commands;
 	basePath;
+	additionalBasePaths;
 	fdPath;
-	constructor(commands = [], basePath, fdPath = null) {
+	constructor(commands = [], basePath, fdPath = null, additionalBasePaths = []) {
 		this.commands = commands;
 		this.basePath = basePath;
+		this.additionalBasePaths = additionalBasePaths.map((p) => toDisplayPath(p));
 		this.fdPath = fdPath;
 	}
 	async getSuggestions(lines, cursorLine, cursorCol, options) {
@@ -220379,25 +221151,41 @@ var CombinedAutocompleteProvider = class {
 		} else if (path === "~") return homedir();
 		return path;
 	}
+	searchRoots() {
+		const seen = /* @__PURE__ */ new Set();
+		const roots = [];
+		for (const root of [this.basePath, ...this.additionalBasePaths]) {
+			const key = toDisplayPath(root);
+			if (seen.has(key)) continue;
+			seen.add(key);
+			roots.push(root);
+		}
+		return roots;
+	}
 	resolveScopedFuzzyQuery(rawQuery) {
 		const normalizedQuery = toDisplayPath(rawQuery);
 		const slashIndex = normalizedQuery.lastIndexOf("/");
 		if (slashIndex === -1) return null;
 		const displayBase = normalizedQuery.slice(0, slashIndex + 1);
 		const query = normalizedQuery.slice(slashIndex + 1);
-		let baseDir;
-		if (displayBase.startsWith("~/")) baseDir = this.expandHomePath(displayBase);
-		else if (displayBase.startsWith("/")) baseDir = displayBase;
-		else baseDir = join$1(this.basePath, displayBase);
-		try {
-			if (!statSync$1(baseDir).isDirectory()) return null;
-		} catch {
-			return null;
+		if (displayBase.startsWith("~/") || displayBase.startsWith("/")) {
+			const baseDir = displayBase.startsWith("~/") ? this.expandHomePath(displayBase) : displayBase;
+			try {
+				if (!statSync$1(baseDir).isDirectory()) return null;
+			} catch {
+				return null;
+			}
+			return {
+				kind: "absolute",
+				baseDir,
+				displayBase,
+				query
+			};
 		}
 		return {
-			baseDir,
-			query,
-			displayBase
+			kind: "relative",
+			displayBase,
+			query
 		};
 	}
 	scopedPathForDisplay(displayBase, relativePath) {
@@ -220487,32 +221275,90 @@ var CombinedAutocompleteProvider = class {
 		return score;
 	}
 	async getFuzzyFileSuggestions(query, options) {
-		if (!this.fdPath || options.signal.aborted) return [];
+		const fdPath = this.fdPath;
+		if (!fdPath || options.signal.aborted) return [];
 		try {
-			const scopedQuery = this.resolveScopedFuzzyQuery(query);
-			const fdBaseDir = scopedQuery?.baseDir ?? this.basePath;
-			const fdQuery = scopedQuery?.query ?? query;
-			const entries = await walkDirectoryWithFd(fdBaseDir, this.fdPath, fdQuery, 100, options.signal);
+			const scoped = this.resolveScopedFuzzyQuery(query);
+			const targets = [];
+			const pushFullPathTarget = (root) => {
+				targets.push({
+					baseDir: root,
+					pathRoot: root,
+					displayBase: "",
+					fdQuery: query,
+					isAdditional: root !== this.basePath,
+					absolute: false
+				});
+			};
+			if (scoped?.kind === "absolute") targets.push({
+				baseDir: scoped.baseDir,
+				pathRoot: scoped.baseDir,
+				displayBase: scoped.displayBase,
+				fdQuery: scoped.query,
+				isAdditional: false,
+				absolute: true
+			});
+			else if (scoped?.kind === "relative") for (const root of this.searchRoots()) {
+				const baseDir = join$1(root, scoped.displayBase);
+				let isDir = false;
+				try {
+					isDir = statSync$1(baseDir).isDirectory();
+				} catch {
+					isDir = false;
+				}
+				if (isDir) targets.push({
+					baseDir,
+					pathRoot: root,
+					displayBase: scoped.displayBase,
+					fdQuery: scoped.query,
+					isAdditional: root !== this.basePath,
+					absolute: false
+				});
+				else pushFullPathTarget(root);
+			}
+			else for (const root of this.searchRoots()) pushFullPathTarget(root);
+			if (targets.length === 0) return [];
+			const perRoot = await Promise.all(targets.map(async (target) => {
+				return (await walkDirectoryWithFd(target.baseDir, fdPath, target.fdQuery, 100, options.signal)).map((entry) => ({
+					entry,
+					target
+				}));
+			}));
 			if (options.signal.aborted) return [];
-			const scoredEntries = entries.map((entry) => ({
-				...entry,
-				score: fdQuery ? this.scoreEntry(entry.path, fdQuery, entry.isDirectory) : 1
-			})).filter((entry) => entry.score > 0);
-			scoredEntries.sort((a, b) => b.score - a.score);
-			const topEntries = scoredEntries.slice(0, 20);
+			const bestByAbs = /* @__PURE__ */ new Map();
+			for (const group of perRoot) for (const { entry, target } of group) {
+				const score = target.fdQuery ? this.scoreEntry(entry.path, target.fdQuery, entry.isDirectory) : 1;
+				if (score <= 0) continue;
+				const pathWithoutSlash = entry.isDirectory ? entry.path.slice(0, -1) : entry.path;
+				const absPath = target.absolute ? toDisplayPath(join$1(target.displayBase, pathWithoutSlash)) : toDisplayPath(join$1(target.pathRoot, target.displayBase, pathWithoutSlash));
+				const existing = bestByAbs.get(absPath);
+				if (!existing || score > existing.score) bestByAbs.set(absPath, {
+					path: entry.path,
+					isDirectory: entry.isDirectory,
+					score,
+					target,
+					absPath
+				});
+			}
+			const scored = [...bestByAbs.values()];
+			scored.sort((a, b) => b.score - a.score);
+			const topEntries = scored.slice(0, 20);
 			const suggestions = [];
-			for (const { path: entryPath, isDirectory } of topEntries) {
-				const pathWithoutSlash = isDirectory ? entryPath.slice(0, -1) : entryPath;
-				const displayPath = scopedQuery ? this.scopedPathForDisplay(scopedQuery.displayBase, pathWithoutSlash) : pathWithoutSlash;
+			for (const item of topEntries) {
+				const pathWithoutSlash = item.isDirectory ? item.path.slice(0, -1) : item.path;
 				const entryName = basename$1(pathWithoutSlash);
-				const value = buildCompletionValue(isDirectory ? `${displayPath}/` : displayPath, {
-					isDirectory,
+				let displayPath;
+				if (item.target.absolute) displayPath = this.scopedPathForDisplay(item.target.displayBase, pathWithoutSlash);
+				else if (item.target.isAdditional) displayPath = item.absPath;
+				else displayPath = item.target.displayBase ? this.scopedPathForDisplay(item.target.displayBase, pathWithoutSlash) : pathWithoutSlash;
+				const value = buildCompletionValue(item.isDirectory ? `${displayPath}/` : displayPath, {
+					isDirectory: item.isDirectory,
 					isAtPrefix: true,
 					isQuotedPrefix: options.isQuotedPrefix
 				});
 				suggestions.push({
 					value,
-					label: entryName + (isDirectory ? "/" : ""),
+					label: entryName + (item.isDirectory ? "/" : ""),
 					description: displayPath
 				});
 			}
@@ -241057,6 +241903,7 @@ function initializeCliTelemetry(options) {
 		version: options.version,
 		uiMode: options.uiMode,
 		model: options.model ?? options.config.defaultModel,
+		sessionId: options.sessionId,
 		getAccessToken: async () => await options.harness.auth.getCachedAccessToken("managed:kimi-code") ?? null
 	});
 	if (options.bootstrap.firstLaunch) options.harness.track("first_launch");
@@ -275394,6 +276241,15 @@ let QuestionService = class QuestionService extends Disposable {
 	isPending(questionId) {
 		return this._pending.has(questionId);
 	}
+	/**
+	* Protocol request for a still-pending question. The resolve route needs it
+	* to translate wire ids back to question text / option labels before the
+	* response reaches the SDK; must be read BEFORE `resolve()` settles (and
+	* thereby drops) the pending entry.
+	*/
+	getPendingRequest(questionId) {
+		return this._pending.get(questionId)?.protocolRequest;
+	}
 	listPending(sessionId) {
 		return Array.from(this._pending.values()).filter((p) => p.sessionId === sessionId).map((p) => p.protocolRequest);
 	}
@@ -275536,7 +276392,7 @@ function registerQuestionsRoutes(app, ix) {
 			return;
 		}
 		const body = bodyParse.data;
-		const inProc = toAgentCoreResponse(body);
+		const inProc = toAgentCoreResponse(body, broker.getPendingRequest(questionId));
 		broker.resolve(questionId, inProc);
 		broker.markResolved(questionId);
 		const result = {
@@ -275548,6 +276404,69 @@ function registerQuestionsRoutes(app, ix) {
 	app.post(route.path, route.options, route.handler);
 }
 //#endregion
+//#region ../../packages/server/src/lib/sessionArchive.ts
+init_src();
+async function restoreArchivedSession(homeDir, sessionId) {
+	const sessionDir = await findSessionDir$1(homeDir, sessionId);
+	if (sessionDir === void 0) throw new SessionNotFoundError(sessionId);
+	const statePath = join(sessionDir, "state.json");
+	let parsed;
+	try {
+		parsed = JSON.parse(await readFile(statePath, "utf-8"));
+	} catch {
+		throw new SessionNotFoundError(sessionId);
+	}
+	if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) throw new SessionNotFoundError(sessionId);
+	const next = {
+		...parsed,
+		archived: false,
+		updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+	};
+	await writeFile$1(statePath, `${JSON.stringify(next, null, 2)}\n`, "utf-8");
+}
+async function findSessionDir$1(homeDir, sessionId) {
+	const indexPath = join(homeDir, "session_index.jsonl");
+	let raw;
+	try {
+		raw = await readFile(indexPath, "utf-8");
+	} catch {
+		return;
+	}
+	const sessionsDir = join(homeDir, "sessions");
+	let found;
+	for (const line of raw.split(/\r?\n/)) {
+		const trimmed = line.trim();
+		if (trimmed === "") continue;
+		const entry = parseIndexLine(trimmed);
+		if (entry === void 0 || entry.sessionId !== sessionId) continue;
+		const sessionDir = resolve(entry.sessionDir);
+		if (!isAbsolute(entry.sessionDir)) continue;
+		if (!isPathInside(sessionsDir, sessionDir)) continue;
+		if (basename(sessionDir) !== entry.sessionId) continue;
+		found = sessionDir;
+	}
+	return found;
+}
+function parseIndexLine(line) {
+	try {
+		const parsed = JSON.parse(line);
+		if (typeof parsed !== "object" || parsed === null) return void 0;
+		const entry = parsed;
+		if (typeof entry.sessionId !== "string" || typeof entry.sessionDir !== "string" || typeof entry.workDir !== "string") return;
+		return {
+			sessionId: entry.sessionId,
+			sessionDir: entry.sessionDir,
+			workDir: entry.workDir
+		};
+	} catch {
+		return;
+	}
+}
+function isPathInside(parent, child) {
+	const rel = relative(resolve(parent), resolve(child));
+	return rel !== "" && !rel.startsWith("..") && !isAbsolute(rel);
+}
+//#endregion
 //#region ../../packages/server/src/routes/sessions.ts
 init_src$3();
 init_src();
@@ -275564,6 +276483,7 @@ const sessionsListQueryCoercion = object({
 	status: sessionStatusSchema.optional(),
 	include_archive: booleanQueryParam,
 	exclude_empty: booleanQueryParam,
+	archived_only: booleanQueryParam,
 	workspace_id: workspaceIdSchema.optional()
 }).superRefine((value, ctx) => {
 	if (value.before_id !== void 0 && value.after_id !== void 0) ctx.addIssue({
@@ -275572,6 +276492,12 @@ const sessionsListQueryCoercion = object({
 		path: ["before_id"],
 		params: { code: ErrorCode$1.VALIDATION_FAILED }
 	});
+	if (value.archived_only === true && value.include_archive === true) ctx.addIssue({
+		code: "custom",
+		message: "archived_only and include_archive are mutually exclusive",
+		path: ["archived_only"],
+		params: { code: ErrorCode$1.VALIDATION_FAILED }
+	});
 });
 const sessionChildrenListQueryCoercion = object({
 	before_id: string().min(1).optional(),
@@ -275615,6 +276541,47 @@ function headerString(headers, key) {
 	const trimmed = raw.trim();
 	return trimmed.length === 0 ? void 0 : trimmed;
 }
+const DEFAULT_SESSION_LIST_PAGE_SIZE = 20;
+const MAX_SESSION_LIST_PAGE_SIZE = 100;
+function normalizeSessionListPageSize(cursor) {
+	const requested = cursor.page_size ?? DEFAULT_SESSION_LIST_PAGE_SIZE;
+	return Math.min(Math.max(requested, 1), MAX_SESSION_LIST_PAGE_SIZE);
+}
+async function listSessionsWithRouteFilter(fetchPage, baseQuery, cursor, predicate) {
+	const targetSize = normalizeSessionListPageSize(cursor);
+	const forward = cursor.after_id !== void 0 && cursor.before_id === void 0;
+	const matches = [];
+	let beforeId = forward ? void 0 : cursor.before_id;
+	let afterId = forward ? cursor.after_id : void 0;
+	let coreHasMore = true;
+	while (matches.length <= targetSize && coreHasMore) {
+		const page = await fetchPage({
+			...baseQuery,
+			before_id: beforeId,
+			after_id: afterId,
+			page_size: MAX_SESSION_LIST_PAGE_SIZE
+		});
+		if (page.items.length === 0) break;
+		let hitPivot = false;
+		for (const session of page.items) {
+			if (forward && session.id === afterId) {
+				hitPivot = true;
+				break;
+			}
+			if (predicate(session)) matches.push(session);
+		}
+		coreHasMore = page.has_more && !hitPivot;
+		if (!coreHasMore) break;
+		const nextBeforeId = page.items[page.items.length - 1]?.id;
+		if (nextBeforeId === void 0 || nextBeforeId === beforeId) break;
+		beforeId = nextBeforeId;
+		afterId = void 0;
+	}
+	return {
+		items: matches.slice(0, targetSize),
+		has_more: matches.length > targetSize
+	};
+}
 function registerSessionsRoutes(app, ix) {
 	const createRoute = defineRoute({
 		method: "POST",
@@ -275694,15 +276661,12 @@ function registerSessionsRoutes(app, ix) {
 	}, async (req, reply) => {
 		try {
 			const raw = req.query;
-			const baseQuery = {
-				before_id: raw.before_id,
-				after_id: raw.after_id,
-				page_size: raw.page_size,
-				status: raw.status,
-				includeArchive: raw.include_archive,
+			const archivedOnly = raw.archived_only === true;
+			const status = raw.status;
+			let baseQuery = {
+				includeArchive: archivedOnly ? true : raw.include_archive,
 				excludeEmpty: raw.exclude_empty
 			};
-			let query;
 			if (raw.workspace_id !== void 0) {
 				const registry = ix.invokeFunction((a) => a.get(IWorkspaceRegistry));
 				let root;
@@ -275715,12 +276679,23 @@ function registerSessionsRoutes(app, ix) {
 					}
 					throw err;
 				}
-				query = {
+				baseQuery = {
 					...baseQuery,
 					workDir: root
 				};
-			} else query = baseQuery;
-			const page = await ix.invokeFunction((a) => a.get(ISessionService).list(query));
+			}
+			if (archivedOnly) {
+				const page = await listSessionsWithRouteFilter((query) => ix.invokeFunction((a) => a.get(ISessionService).list(query)), baseQuery, raw, (session) => session.archived === true && (status === void 0 || session.status === status));
+				reply.send(okEnvelope(page, req.id));
+				return;
+			}
+			const page = await ix.invokeFunction((a) => a.get(ISessionService).list({
+				...baseQuery,
+				before_id: raw.before_id,
+				after_id: raw.after_id,
+				page_size: raw.page_size,
+				status
+			}));
 			reply.send(okEnvelope(page, req.id));
 		} catch (err) {
 			sendMappedError$6(reply, req.id, err);
@@ -275836,7 +276811,8 @@ function registerSessionsRoutes(app, ix) {
 					"undo",
 					"abort",
 					"btw",
-					"archive"
+					"archive",
+					"restore"
 				],
 				resourceLabel: "session"
 			});
@@ -275875,6 +276851,13 @@ function registerSessionsRoutes(app, ix) {
 				reply.send(okEnvelope(result, req.id));
 				return;
 			}
+			if (parsed.action === "restore") {
+				const homeDir = ix.invokeFunction((a) => a.get(IEnvironmentService)).homeDir;
+				await restoreArchivedSession(homeDir, parsed.id);
+				const session = await ix.invokeFunction((a) => a.get(ISessionService).get(parsed.id));
+				reply.send(okEnvelope(session, req.id));
+				return;
+			}
 			const body = undoSessionRequestSchema.parse(req.body);
 			const result = await ix.invokeFunction((a) => a.get(ISessionService).undo(parsed.id, body));
 			reply.send(okEnvelope(result, req.id));
@@ -276073,6 +277056,29 @@ function registerSkillsRoutes(app, ix) {
 		}
 	});
 	app.get(listSkillsRoute.path, listSkillsRoute.options, listSkillsRoute.handler);
+	const listWorkspaceSkillsRoute = defineRoute({
+		method: "GET",
+		path: "/workspaces/{workspace_id}/skills",
+		params: workspaceIdParamSchema,
+		success: { data: listSkillsResponseSchema },
+		errors: { [ErrorCode$1.WORKSPACE_NOT_FOUND]: {} },
+		description: "List the skills available to a workspace (no session required)",
+		tags: ["skills"],
+		operationId: "listWorkspaceSkills"
+	}, async (req, reply) => {
+		try {
+			const { workspace_id } = req.params;
+			const skills = await ix.invokeFunction((a) => {
+				const registry = a.get(IWorkspaceRegistry);
+				const skillService = a.get(ISkillService);
+				return registry.resolveRoot(workspace_id).then((workDir) => skillService.listForWorkDir(workDir));
+			});
+			reply.send(okEnvelope({ skills }, req.id));
+		} catch (err) {
+			sendMappedError$5(reply, req.id, err);
+		}
+	});
+	app.get(listWorkspaceSkillsRoute.path, listWorkspaceSkillsRoute.options, listWorkspaceSkillsRoute.handler);
 	const activateSkillRoute = defineRoute({
 		method: "POST",
 		path: "/sessions/{session_id}/skills/{tail}",
@@ -276119,6 +277125,10 @@ function registerSkillsRoutes(app, ix) {
 * Map a thrown error to the right envelope. See module header for the table.
 */
 function sendMappedError$5(reply, requestId, err) {
+	if (err instanceof WorkspaceNotFoundError) {
+		reply.send(errEnvelope(ErrorCode$1.WORKSPACE_NOT_FOUND, err.message, requestId));
+		return;
+	}
 	if (err instanceof SessionNotFoundError) {
 		reply.send(errEnvelope(ErrorCode$1.SESSION_NOT_FOUND, err.message, requestId));
 		return;
@@ -276217,7 +277227,7 @@ function loadSnapshotConfig(env = process.env) {
 * `turn.started` events fired before the first snapshot request.
 */
 init_src();
-init_store();
+init_store$1();
 init_decorateParam();
 init_decorate();
 const MAIN_AGENT_ID$1 = "main";
@@ -287643,6 +288653,12 @@ async function startServer(opts) {
 			configPath: opts.coreProcessOptions?.configPath
 		})
 	};
+	try {
+		const stats = await new SessionStore(envService.homeDir).reindex();
+		pinoLogger.info(stats, "session index rebuilt");
+	} catch (error) {
+		pinoLogger.warn({ err: String(error) }, "session index rebuild failed (best-effort)");
+	}
 	const tokenStore = await createTokenStore(envService.homeDir);
 	const passwordHash = await resolvePasswordHash(process.env);
 	const defaultAuth = createAuthTokenService({
@@ -302394,6 +303410,7 @@ const BLINK_INTERVAL = 500;
 var CompactionComponent = class extends Container {
 	ui;
 	headerText;
+	instructionText;
 	instruction;
 	tip;
 	blinkOn = true;
@@ -302402,6 +303419,9 @@ var CompactionComponent = class extends Container {
 	canceled = false;
 	tokensBefore;
 	tokensAfter;
+	summary;
+	summaryText;
+	expanded = false;
 	constructor(ui, instruction, tip) {
 		super();
 		this.ui = ui;
@@ -302414,23 +303434,35 @@ var CompactionComponent = class extends Container {
 		this.startBlink();
 	}
 	addInstructionChild() {
-		if (this.instruction !== void 0) this.addChild(new Text(currentTheme.dim(`  ${this.instruction}`), 0, 0));
+		if (this.instruction !== void 0) {
+			this.instructionText = new Text(currentTheme.dim(`  ${this.instruction}`), 0, 0);
+			this.addChild(this.instructionText);
+		}
+	}
+	removeInstructionChild() {
+		if (this.instructionText === void 0) return;
+		const index = this.children.indexOf(this.instructionText);
+		if (index !== -1) this.children.splice(index, 1);
+		this.instructionText = void 0;
 	}
 	invalidate() {
 		this.headerText.setText(this.buildHeader());
-		if (this.instruction !== void 0) {
-			if (this.children.length > 2) this.children.pop();
-			this.addInstructionChild();
-		}
+		const expanded = this.expanded;
+		this.removeInstructionChild();
+		if (expanded) this.removeSummaryChild();
+		this.addInstructionChild();
+		if (expanded) this.addSummaryChild();
 		super.invalidate();
 	}
-	markDone(tokensBefore, tokensAfter) {
+	markDone(tokensBefore, tokensAfter, summary) {
 		if (this.done || this.canceled) return;
 		this.done = true;
 		this.tokensBefore = tokensBefore;
 		this.tokensAfter = tokensAfter;
+		this.summary = summary;
 		this.stopBlink();
 		this.headerText.setText(this.buildHeader());
+		if (this.expanded) this.addSummaryChild();
 		this.ui?.requestRender();
 	}
 	markCanceled() {
@@ -302440,11 +303472,31 @@ var CompactionComponent = class extends Container {
 		this.headerText.setText(this.buildHeader());
 		this.ui?.requestRender();
 	}
+	setExpanded(expanded) {
+		if (this.expanded === expanded) return;
+		this.expanded = expanded;
+		if (expanded) this.addSummaryChild();
+		else this.removeSummaryChild();
+		this.headerText.setText(this.buildHeader());
+		this.ui?.requestRender();
+	}
+	addSummaryChild() {
+		if (this.summaryText !== void 0 || this.summary === void 0 || this.summary.length === 0) return;
+		const indentedSummary = this.summary.split("\n").map((line) => `  ${line}`).join("\n");
+		this.summaryText = new Text(currentTheme.dim(indentedSummary), 0, 0);
+		this.addChild(this.summaryText);
+	}
+	removeSummaryChild() {
+		if (this.summaryText === void 0) return;
+		const index = this.children.indexOf(this.summaryText);
+		if (index !== -1) this.children.splice(index, 1);
+		this.summaryText = void 0;
+	}
 	dispose() {
 		this.stopBlink();
 	}
 	buildHeader() {
-		if (this.done) return `${currentTheme.fg("success", STATUS_BULLET)}${currentTheme.boldFg("success", "Compaction complete")}${this.tokensBefore !== void 0 && this.tokensAfter !== void 0 ? currentTheme.dim(` (${String(this.tokensBefore)} → ${String(this.tokensAfter)} tokens)`) : ""}`;
+		if (this.done) return `${currentTheme.fg("success", STATUS_BULLET)}${currentTheme.boldFg("success", "Compaction complete")}${this.tokensBefore !== void 0 && this.tokensAfter !== void 0 ? currentTheme.dim(` (${String(this.tokensBefore)} → ${String(this.tokensAfter)} tokens)`) : ""}${this.summary !== void 0 && this.summary.length > 0 ? currentTheme.dim(` (Ctrl-O to ${this.expanded ? "hide" : "show"} compaction summary)`) : ""}`;
 		if (this.canceled) return `${currentTheme.fg("warning", STATUS_BULLET)}${currentTheme.boldFg("warning", "Compaction cancelled")}`;
 		return `${this.blinkOn ? currentTheme.fg("text", STATUS_BULLET) : "  "}${currentTheme.boldFg("primary", "Compacting context...")}${this.tip ? currentTheme.fg("textDim", ` · Tip: ${this.tip}`) : ""}`;
 	}
@@ -364019,27 +365071,6 @@ function computeDiffLines(oldText, newText, oldStart = 1, newStart = 1, isIncomp
 	}
 	return result;
 }
-function renderDiffLines(oldText, newText, path, isIncomplete = false, oldStart, newStart, maxLines) {
-	const s = makeDiffStyles();
-	const changedLines = computeDiffLines(oldText, newText, oldStart ?? 1, newStart ?? 1, isIncomplete).filter((l) => l.kind !== "context");
-	const added = changedLines.filter((l) => l.kind === "add").length;
-	const removed = changedLines.filter((l) => l.kind === "delete").length;
-	const output = [];
-	let header = "";
-	if (added > 0) header += s.addBold(`+${String(added)} `);
-	if (removed > 0) header += s.delBold(`-${String(removed)} `);
-	header += path;
-	output.push(header);
-	const shown = maxLines !== void 0 && maxLines >= 0 && changedLines.length > maxLines ? changedLines.slice(0, maxLines) : changedLines;
-	for (const line of shown) {
-		const marker = line.kind === "add" ? "+" : "-";
-		const color = line.kind === "add" ? s.add : s.del;
-		output.push(s.gutter(String(line.lineNum).padStart(4) + " ") + color(marker + " " + line.code));
-	}
-	const hidden = changedLines.length - shown.length;
-	if (hidden > 0) output.push(s.meta(`     … ${String(hidden)} more change${hidden > 1 ? "s" : ""} hidden (ctrl+o to expand)`));
-	return output;
-}
 function buildClusters(diffLines, contextLines) {
 	const changeIndices = [];
 	let added = 0;
@@ -364103,7 +365134,7 @@ function renderDiffLinesClustered(oldText, newText, path, opts = {}) {
 	const s = makeDiffStyles();
 	const contextLines = opts.contextLines ?? 3;
 	const maxLines = opts.maxLines;
-	const diffLines = computeDiffLines(oldText, newText, 1, 1, opts.isIncomplete ?? false);
+	const diffLines = computeDiffLines(oldText, newText, opts.oldStart ?? 1, opts.newStart ?? 1, opts.isIncomplete ?? false);
 	const { clusters, changedCount, addedCount, removedCount } = buildClusters(diffLines, contextLines);
 	const output = [];
 	let header = "";
@@ -364282,7 +365313,8 @@ var TruncatedOutputComponent = class {
 		this.expandHint = options.expandHint ?? true;
 		this.tail = options.tail ?? false;
 		const cleaned = trimTrailingEmptyLines(output.split("\n")).join("\n");
-		this.textComponent = new Text(options.isError ? currentTheme.fg("error", cleaned) : currentTheme.dim(cleaned), this.indent, 0);
+		const successColor = options.color ?? "textDim";
+		this.textComponent = new Text(options.isError ? currentTheme.fg("error", cleaned) : currentTheme.fg(successColor, cleaned), this.indent, 0);
 	}
 	invalidate() {
 		this.textComponent.invalidate();
@@ -364325,8 +365357,8 @@ var ShellExecutionComponent = class extends Container {
 		const allLines = command.split("\n");
 		const lines = previewLines === void 0 ? allLines : allLines.slice(0, previewLines);
 		for (const [i, line] of lines.entries()) {
-			const prefix = i === 0 ? "$ " : "  ";
-			this.addChild(new Text(currentTheme.dim(prefix + line), 2, 0));
+			const text = i === 0 ? currentTheme.fg("shellMode", "$ ") + currentTheme.dim(line) : `  ${currentTheme.dim(line)}`;
+			this.addChild(new Text(text, 2, 0));
 		}
 	}
 	addResultPreview(result, expanded, previewLines, tailOutput, expandHint) {
@@ -364336,16 +365368,14 @@ var ShellExecutionComponent = class extends Container {
 			isError: result.is_error ?? false,
 			maxLines: previewLines,
 			tail: tailOutput,
-			expandHint
+			expandHint,
+			color: "textMuted"
 		}));
 	}
 };
-const shellExecutionResultRenderer = (toolCall, result, ctx) => [new ShellExecutionComponent({
-	command: typeof toolCall.args["command"] === "string" ? toolCall.args["command"] : "",
+const shellExecutionResultRenderer = (_toolCall, result, ctx) => [new ShellExecutionComponent({
 	result,
-	expanded: ctx.expanded,
-	showCommand: ctx.expanded,
-	commandPreviewLines: void 0
+	expanded: ctx.expanded
 })];
 //#endregion
 //#region src/tui/components/messages/tool-renderers/goal.ts
@@ -365727,6 +366757,13 @@ var ToolCallComponent = class ToolCallComponent extends Container {
 			const tone = isError ? "error" : "primary";
 			return `${bullet}${currentTheme.boldFg(tone, label)}`;
 		}
+		if (toolCall.name === "Bash") {
+			if (isTruncated) return `${bullet}${currentTheme.fg("error", "Truncated")} ${currentTheme.boldFg("primary", "Bash")}`;
+			const label = isFinished ? "Ran a command" : "Running a command";
+			const tone = isError ? "error" : "primary";
+			const chipStr = isFinished && result !== void 0 ? this.buildHeaderChip(result) : "";
+			return `${bullet}${currentTheme.boldFg(tone, label)}${chipStr}`;
+		}
 		const goalHeader = buildGoalToolHeader({
 			toolCall,
 			result,
@@ -366038,7 +367075,7 @@ var ToolCallComponent = class ToolCallComponent extends Container {
 			this.buildStreamingPreview(this.toolCall.streamingArguments);
 			return;
 		}
-		const shouldCap = this.result !== void 0 && !this.expanded;
+		const shouldCap = !this.expanded;
 		if (name === "Write") {
 			const content = str(this.toolCall.args["content"]);
 			if (content.length === 0) return;
@@ -366060,7 +367097,7 @@ var ToolCallComponent = class ToolCallComponent extends Container {
 				...shouldCap ? { maxLines: 10 } : {}
 			});
 			for (const line of lines) this.addChild(new Text(line, 2, 0));
-		} else if (name === "Bash" && this.result === void 0) {
+		} else if (name === "Bash") {
 			const command = str(this.toolCall.args["command"]);
 			if (command.length === 0) return;
 			this.addChild(new ShellExecutionComponent({
@@ -366111,7 +367148,7 @@ var ToolCallComponent = class ToolCallComponent extends Container {
 			this.addChild(new ShellExecutionComponent({
 				command: cmd,
 				showCommand: true,
-				commandPreviewLines: 10
+				commandPreviewLines: this.expanded ? void 0 : 10
 			}));
 		}
 	}
@@ -367121,7 +368158,8 @@ async function runPrompt(opts, version, io = {}) {
 			config,
 			version,
 			uiMode: PROMPT_UI_MODE,
-			model: telemetryModel
+			model: telemetryModel,
+			sessionId: session.id
 		});
 		setCrashPhase("runtime");
 		const outputFormat = opts.outputFormat ?? "text";
@@ -369524,7 +370562,11 @@ function buildBody(block) {
 	return buildFileContentBody(block);
 }
 function buildDiffBody(block) {
-	const [header = "", ...rest] = renderDiffLines(block.old_text, block.new_text, block.path, false, block.old_start ?? 1, block.new_start ?? 1);
+	const [header = "", ...rest] = renderDiffLinesClustered(block.old_text, block.new_text, block.path, {
+		contextLines: 3,
+		oldStart: block.old_start ?? 1,
+		newStart: block.new_start ?? 1
+	});
 	return {
 		lines: rest,
 		title: stripLeadingSpace(header)
@@ -369563,7 +370605,7 @@ const DEFAULT_KEYBOARD_SHORTCUTS = [
 	},
 	{
 		keys: "Ctrl-O",
-		description: "Toggle tool output expansion"
+		description: "Toggle tool output / compaction summary expansion"
 	},
 	{
 		keys: "Ctrl-T",
@@ -370511,13 +371553,13 @@ const MAX_FALLBACK_SUGGESTIONS = 50;
 /**
 * Kimi wrapper around pi-tui's combined autocomplete provider.
 *
-* File / folder mention behavior uses pi-tui's fd-backed provider when fd is
-* available and only the current working directory is involved. While managed fd
-* is downloading, when it is unavailable, or when the session has additional
-* roots, a small filesystem fallback keeps `@` file and folder completion usable
-* across every root. Ordinary path completion is still handled by pi-tui's
-* readdir-backed path completer. This wrapper also keeps Kimi-specific
-* slash-command guards.
+* File / folder mention behavior uses pi-tui's fd-backed provider whenever fd
+* is available, fanning out across the working directory and any additional
+* roots so `@` completion pushes the query down to fd instead of enumerating
+* every file. A small filesystem fallback is used only while managed fd is
+* downloading, when it is unavailable, or if fd fails to spawn. Ordinary path
+* completion is still handled by pi-tui's readdir-backed path completer. This
+* wrapper also keeps Kimi-specific slash-command guards.
 */
 var FileMentionProvider = class {
 	slashCommands;
@@ -370540,14 +371582,14 @@ var FileMentionProvider = class {
 				name: alias
 			});
 		}
-		this.inner = new CombinedAutocompleteProvider(expanded, workDir, fdPath);
+		this.inner = new CombinedAutocompleteProvider(expanded, workDir, fdPath, this.additionalDirs);
 	}
 	async getSuggestions(lines, cursorLine, cursorCol, options) {
 		const currentLine = lines[cursorLine] ?? "";
 		const textBeforeCursor = currentLine.slice(0, cursorCol);
 		const atPrefix = extractAtPrefix(textBeforeCursor);
 		if (atPrefix !== null) {
-			if (this.fdPath === null || this.additionalDirs.length > 0) return getFsMentionSuggestions(this.workDir, this.additionalDirs, atPrefix, options.signal);
+			if (this.fdPath === null || !isExecutableFd(this.fdPath)) return getFsMentionSuggestions(this.workDir, this.additionalDirs, atPrefix, options.signal);
 			try {
 				return await this.inner.getSuggestions(lines, cursorLine, cursorCol, options);
 			} catch {
@@ -370625,6 +371667,15 @@ function extractAtPrefix(text) {
 	if (text[tokenStart] !== "@") return null;
 	return text.slice(tokenStart);
 }
+function isExecutableFd(fdPath) {
+	if (!fdPath.includes("/") && !fdPath.includes("\\")) return true;
+	try {
+		accessSync(fdPath, constants.X_OK);
+		return true;
+	} catch {
+		return false;
+	}
+}
 /**
 * Match the `/add-dir` directory completer, which skips every entry whose name
 * starts with `.` (see registry.ts). pi-tui's path completer sets `label` to
@@ -374222,7 +375273,7 @@ var SessionEventHandler = class {
 		this.host.streamingUI.beginCompaction(event.instruction);
 	}
 	handleCompactionEnd(event, sendQueued) {
-		this.host.streamingUI.endCompaction(event.result.tokensBefore, event.result.tokensAfter);
+		this.host.streamingUI.endCompaction(event.result.tokensBefore, event.result.tokensAfter, event.result.summary);
 		this.finishCompaction(sendQueued);
 	}
 	handleCompactionCancel(_event, sendQueued) {
@@ -374859,6 +375910,7 @@ var SessionReplayRenderer = class {
 		this.host.appendTranscriptEntry({
 			...replayEntry(context, "status", "Compaction complete", "plain"),
 			compactionData: {
+				summary: record.result.summary,
 				tokensBefore: record.result.tokensBefore,
 				tokensAfter: record.result.tokensAfter,
 				instruction: record.instruction
@@ -375670,12 +376722,13 @@ var StreamingUIController = class {
 		const block = new CompactionComponent(state.ui, instruction, currentWorkingTip()?.text);
 		this._activeCompactionBlock = block;
 		state.transcriptContainer.addChild(block);
+		if (state.toolOutputExpanded) block.setExpanded(true);
 		state.ui.requestRender();
 	}
-	endCompaction(tokensBefore, tokensAfter) {
+	endCompaction(tokensBefore, tokensAfter, summary) {
 		const block = this._activeCompactionBlock;
 		if (block === void 0) return;
-		block.markDone(tokensBefore, tokensAfter);
+		block.markDone(tokensBefore, tokensAfter, summary);
 		this._activeCompactionBlock = void 0;
 		this.host.state.ui.requestRender();
 	}
@@ -377658,6 +378711,7 @@ var CustomEditor = class extends Editor {
 	consumingPaste = false;
 	consumeBuffer = "";
 	argumentHints = /* @__PURE__ */ new Map();
+	autocompleteWasShowing = false;
 	setArgumentHints(hints) {
 		this.argumentHints = hints;
 	}
@@ -377713,7 +378767,20 @@ var CustomEditor = class extends Editor {
 	cancelAutocompleteActivity() {
 		this.cancelAutocomplete();
 	}
+	requestFullRenderOnAutocompleteClose() {
+		if (isInsideTmux()) return;
+		const { columns, rows } = this.tui.terminal;
+		if (this.tui.render(columns).length < rows) return;
+		this.tui.requestRender(true);
+	}
+	trackAutocompleteCloseForFullRender() {
+		const showing = this.isShowingAutocomplete();
+		const closed = this.autocompleteWasShowing && !showing;
+		this.autocompleteWasShowing = showing;
+		if (closed) queueMicrotask(() => this.requestFullRenderOnAutocompleteClose());
+	}
 	render(width) {
+		this.trackAutocompleteCloseForFullRender();
 		const lines = super.render(width);
 		if (lines.length < 3) return lines;
 		const firstContentIdx = 1;
@@ -379675,7 +380742,10 @@ var KimiTUI = class {
 			const data = entry.compactionData;
 			const block = new CompactionComponent(this.state.ui, data.instruction);
 			if (data.result === "cancelled") block.markCanceled();
-			else block.markDone(data.tokensBefore, data.tokensAfter);
+			else {
+				block.markDone(data.tokensBefore, data.tokensAfter, data.summary);
+				if (this.state.toolOutputExpanded) block.setExpanded(true);
+			}
 			return block;
 		}
 		switch (entry.kind) {
@@ -380251,7 +381321,9 @@ var KimiTUI = class {
 		this.state.editorContainer.clear();
 		this.state.editorContainer.addChild(this.state.editor);
 		this.state.ui.setFocus(this.state.editor);
-		this.state.ui.requestRender();
+		const { columns, rows } = this.state.terminal;
+		const overflowsViewport = this.state.ui.render(columns).length >= rows;
+		this.state.ui.requestRender(!this.state.terminalState.insideTmux && overflowsViewport);
 	}
 	restoreInputText(text) {
 		this.restoreEditor();