@moonshot-ai/kimi-code 0.10.0 → 0.11.0

package/dist/main.mjs

@@ -40,9 +40,9 @@ import * as z4mini from "zod/v4-mini";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import process$1 from "node:process";
 import { AsyncLocalStorage } from "node:async_hooks";
-import { Command, Option } from "commander";
-import { CombinedAutocompleteProvider, Container, Editor, Image, Input, Key, Markdown, ProcessTerminal, Spacer, TUI, Text, decodeKittyPrintable, deleteAllKittyImages, fuzzyFilter, fuzzyMatch, getCapabilities, isKeyRelease, matchesKey, truncateToWidth, visibleWidth, wrapTextWithAnsi } from "@earendil-works/pi-tui";
+import { CURSOR_MARKER, CombinedAutocompleteProvider, Container, Editor, Image, Input, Key, Markdown, ProcessTerminal, Spacer, TUI, Text, decodeKittyPrintable, deleteAllKittyImages, fuzzyFilter, fuzzyMatch, getCapabilities, isKeyRelease, matchesKey, truncateToWidth, visibleWidth, wrapTextWithAnsi } from "@earendil-works/pi-tui";
 import chalk, { chalkStderr } from "chalk";
+import { Command, Option } from "commander";
 import { Buffer as Buffer$2 } from "node:buffer";
 import { createInterface } from "node:readline/promises";
 import { highlight, supportsLanguage } from "cli-highlight";
@@ -1089,9 +1089,13 @@ var APIContextOverflowError = class extends APIStatusError {
 * The API returned an empty response (no content, no tool calls).
 */
 var APIEmptyResponseError = class extends ChatProviderError {
-	constructor(message) {
+	finishReason;
+	rawFinishReason;
+	constructor(message, options = {}) {
 		super(message);
 		this.name = "APIEmptyResponseError";
+		this.finishReason = options.finishReason ?? null;
+		this.rawFinishReason = options.rawFinishReason ?? null;
 	}
 };
 function isRetryableGenerateError(error) {
@@ -8609,6 +8613,11 @@ const OPENAI_RESPONSES_DEVELOPER_ROLE_MODELS = new Set([
 	"o3-pro",
 	"o4-mini"
 ]);
+const OPENAI_CHAT_COMPLETIONS_XHIGH_REASONING_MODELS = new Set([
+	"gpt-5.2",
+	"gpt-5.4",
+	"gpt-5.5"
+]);
 const OPENAI_VISION_TOOL_PREFIXES = [
 	"gpt-4o",
 	"gpt-4-turbo",
@@ -8720,6 +8729,9 @@ const ANTHROPIC_CAPABILITY_CATALOG = [{
 function normalizeModelName(modelName) {
 	return modelName.toLowerCase();
 }
+function modelIdLeaf(modelName) {
+	return normalizeModelName(modelName).trim().split("/").at(-1) ?? "";
+}
 function hasPrefix(modelName, prefixes) {
 	return prefixes.some((prefix) => modelName.startsWith(prefix));
 }
@@ -8747,6 +8759,9 @@ function getGoogleGenAIModelCapability(modelName) {
 	if (normalized.startsWith("gemini-2.5-") || normalized.includes("thinking")) return GEMINI_THINKING_MULTIMODAL_TOOL_CAPABILITY;
 	return GEMINI_MULTIMODAL_TOOL_CAPABILITY;
 }
+function supportsOpenAIChatCompletionsXHighReasoning(modelName) {
+	return OPENAI_CHAT_COMPLETIONS_XHIGH_REASONING_MODELS.has(modelIdLeaf(modelName));
+}
 function usesOpenAIResponsesDeveloperRole(modelName) {
 	const normalized = normalizeModelName(modelName);
 	if (OPENAI_RESPONSES_DEVELOPER_ROLE_MODELS.has(normalized)) return true;
@@ -46253,6 +46268,10 @@ function normalizeGenerationKwargs(model, source) {
 	}
 	return kwargs;
 }
+function clampChatCompletionsReasoningEffort(reasoningEffort, model) {
+	if (reasoningEffort !== "xhigh") return reasoningEffort;
+	return supportsOpenAIChatCompletionsXHighReasoning(model) ? "xhigh" : "high";
+}
 function convertMessage$1(message, reasoningKey, toolMessageConversion) {
 	let reasoningContent = "";
 	const nonThinkParts = [];
@@ -46443,7 +46462,7 @@ var OpenAILegacyChatProvider = class {
 		}
 	}
 	withThinking(effort) {
-		const reasoningEffort = thinkingEffortToReasoningEffort(effort);
+		const reasoningEffort = clampChatCompletionsReasoningEffort(thinkingEffortToReasoningEffort(effort), this._model);
 		const clone = this._clone();
 		clone._reasoningEffort = reasoningEffort;
 		return clone;
@@ -47322,11 +47341,17 @@ async function generate(provider, systemPrompt, tools, history, callbacks, optio
 	await throwIfAborted(options?.signal, stream);
 	options?.onStreamEnd?.();
 	if (pendingPart !== null) flushPart(message, pendingPart, toolCallIndexMap);
-	if (message.content.length === 0 && message.toolCalls.length === 0) throw new APIEmptyResponseError(`The API returned an empty response (no content, no tool calls). Provider: ${provider.name}, model: ${provider.modelName}`);
+	if (message.content.length === 0 && message.toolCalls.length === 0) throw new APIEmptyResponseError("The API returned an empty response (no content, no tool calls)." + formatFinishReasonHint(stream) + ` Provider: ${provider.name}, model: ${provider.modelName}`, {
+		finishReason: stream.finishReason,
+		rawFinishReason: stream.rawFinishReason
+	});
 	const hasThink = message.content.some((p) => p.type === "think");
 	const hasText = message.content.some((p) => p.type === "text" && p.text.trim().length > 0);
 	const hasToolCalls = message.toolCalls.length > 0;
-	if (hasThink && !hasText && !hasToolCalls) throw new APIEmptyResponseError(`The API returned a response containing only thinking content without any text or tool calls. This usually indicates the stream was interrupted or the output token budget was exhausted during reasoning. Provider: ${provider.name}, model: ${provider.modelName}`);
+	if (hasThink && !hasText && !hasToolCalls) throw new APIEmptyResponseError("The API returned a response containing only thinking content without any text or tool calls. This usually indicates the stream was interrupted or the output token budget was exhausted during reasoning." + formatFinishReasonHint(stream) + ` Provider: ${provider.name}, model: ${provider.modelName}`, {
+		finishReason: stream.finishReason,
+		rawFinishReason: stream.rawFinishReason
+	});
 	if (callbacks?.onToolCall !== void 0) for (const toolCall of message.toolCalls) {
 		await throwIfAborted(options?.signal, stream);
 		await callbacks.onToolCall(toolCall);
@@ -47387,6 +47412,12 @@ function flushPart(message, part, toolCallIndexMap) {
 		if (streamIndex !== void 0) toolCallIndexMap.set(streamIndex, ordinal);
 	}
 }
+function formatFinishReasonHint(stream) {
+	if (stream.finishReason === null && stream.rawFinishReason === null) return "";
+	const raw = stream.rawFinishReason === null ? "" : `, rawFinishReason=${stream.rawFinishReason}`;
+	const filteredHint = stream.finishReason === "filtered" ? " The provider filtered the response before visible output was emitted." : "";
+	return ` Provider stop details: finishReason=${stream.finishReason ?? "unknown"}${raw}.${filteredHint}`;
+}
 /**
 * Produce a shallow-ish copy of a StreamedMessagePart.
 *
@@ -47500,6 +47531,16 @@ function toKimiErrorPayload(error) {
 		name: error.name,
 		retryable: KIMI_ERROR_INFO[ErrorCodes.PROVIDER_CONNECTION_ERROR].retryable
 	};
+	if (error instanceof APIEmptyResponseError) return {
+		code: ErrorCodes.PROVIDER_API_ERROR,
+		message: error.message,
+		name: error.name,
+		details: {
+			finishReason: error.finishReason,
+			rawFinishReason: error.rawFinishReason
+		},
+		retryable: KIMI_ERROR_INFO[ErrorCodes.PROVIDER_API_ERROR].retryable
+	};
 	if (error instanceof ChatProviderError) return {
 		code: ErrorCodes.PROVIDER_API_ERROR,
 		message: error.message,
@@ -48298,6 +48339,14 @@ const FLAG_DEFINITIONS = [
 		env: "KIMI_CODE_EXPERIMENTAL_BACKGROUND_ASK",
 		default: false,
 		surface: "core"
+	},
+	{
+		id: "sub_skill",
+		title: "Sub-skill",
+		description: "Enable discovery of nested skills inside skill bundles that declare has-sub-skill.",
+		env: "KIMI_CODE_EXPERIMENTAL_SUB_SKILL",
+		default: false,
+		surface: "core"
 	}
 ];
 //#endregion
@@ -48324,6 +48373,19 @@ function parseBooleanEnv(value) {
 	if (FALSE_BOOLEAN_ENV_VALUES.has(normalized)) return false;
 }
 /**
+* Parse a floating-point environment value (e.g. `KIMI_MODEL_TEMPERATURE`).
+* Returns `undefined` when unset/blank; throws `KimiError(CONFIG_INVALID)` on a
+* non-numeric value so a typo fails fast like the other `KIMI_MODEL_*` vars.
+* No range validation — callers pass values the upstream API accepts.
+*/
+function parseFloatEnv(value, varName) {
+	const trimmed = value?.trim();
+	if (trimmed === void 0 || trimmed.length === 0) return void 0;
+	const parsed = Number(trimmed);
+	if (!Number.isFinite(parsed)) throw new KimiError(ErrorCodes.CONFIG_INVALID, `${varName} must be a number, got "${value}".`);
+	return parsed;
+}
+/**
 * Pure, synchronous flag resolver. State comes entirely from (env, registry) and nothing is
 * cached: env is read live on every call, so a single shared instance always reflects the current
 * process env. Defaults to process.env + FLAG_DEFINITIONS; tests can inject a custom env / defs.
@@ -48384,7 +48446,12 @@ var FlagResolver = class {
 		};
 	}
 };
-new FlagResolver();
+/**
+* Compatibility accessor for callers that only need process-global env behavior.
+* Runtime code that belongs to a KimiCore/Session/Agent should use the scoped
+* resolver on that owner instead.
+*/
+const flags = new FlagResolver();
 //#endregion
 //#region ../../packages/agent-core/src/telemetry.ts
 const noopTelemetryClient = {
@@ -48396,56 +48463,6 @@ function withTelemetryContext$1(telemetry, patch) {
 	return telemetry.withContext?.(patch) ?? telemetry;
 }
 //#endregion
-//#region ../../packages/agent-core/src/utils/tokens.ts
-/**
-* Estimate token count from text using a character-based heuristic.
-*   - ASCII (~4 chars per token)
-*   - CJK and other non-ASCII (~1 char per token)
-* The estimate is transient — the next LLM call returns the real count
-* and supersedes this value. Used to keep `tokenCountWithPending`
-* monotonic between LLM round-trips without paying for a tokenizer.
-*/
-function estimateTokens(text) {
-	let asciiCount = 0;
-	let nonAsciiCount = 0;
-	for (const char of text) if (char.codePointAt(0) <= 127) asciiCount++;
-	else nonAsciiCount++;
-	return Math.ceil(asciiCount / 4) + nonAsciiCount;
-}
-function estimateTokensForMessages(messages) {
-	let total = 0;
-	for (const message of messages) total += estimateTokensForMessage(message);
-	return total;
-}
-function estimateTokensForTools(tools) {
-	let total = 0;
-	for (const tool of tools) {
-		total += estimateTokens(tool.name);
-		total += estimateTokens(tool.description);
-		total += estimateTokens(JSON.stringify(tool.parameters));
-	}
-	return total;
-}
-function estimateTokensForMessage(message) {
-	let total = estimateTokens(message.role);
-	total += estimateTokensForContentParts(message.content);
-	if (message.toolCalls !== void 0) for (const call of message.toolCalls) {
-		total += estimateTokens(call.name);
-		total += estimateTokens(JSON.stringify(call.arguments));
-	}
-	return total;
-}
-function estimateTokensForContentParts(parts) {
-	let total = 0;
-	for (const part of parts) total += estimateTokensForContentPart(part);
-	return total;
-}
-function estimateTokensForContentPart(part) {
-	if (part.type === "text") return estimateTokens(part.text);
-	else if (part.type === "think") return estimateTokens(part.think);
-	return 0;
-}
-//#endregion
 //#region ../../packages/agent-core/src/loop/errors.ts
 /**
 * Loop-local error helpers.
@@ -54575,6 +54592,47 @@ function renderPrompt(template, vars) {
 	return env.renderString(template, vars);
 }
 //#endregion
+//#region ../../packages/agent-core/src/utils/tokens.ts
+/**
+* Estimate token count from text using a character-based heuristic.
+*   - ASCII (~4 chars per token)
+*   - CJK and other non-ASCII (~1 char per token)
+* The estimate is transient — the next LLM call returns the real count
+* and supersedes this value. Used to keep `tokenCountWithPending`
+* monotonic between LLM round-trips without paying for a tokenizer.
+*/
+function estimateTokens(text) {
+	let asciiCount = 0;
+	let nonAsciiCount = 0;
+	for (const char of text) if (char.codePointAt(0) <= 127) asciiCount++;
+	else nonAsciiCount++;
+	return Math.ceil(asciiCount / 4) + nonAsciiCount;
+}
+function estimateTokensForMessages(messages) {
+	let total = 0;
+	for (const message of messages) total += estimateTokensForMessage(message);
+	return total;
+}
+function estimateTokensForMessage(message) {
+	let total = estimateTokens(message.role);
+	total += estimateTokensForContentParts(message.content);
+	if (message.toolCalls !== void 0) for (const call of message.toolCalls) {
+		total += estimateTokens(call.name);
+		total += estimateTokens(JSON.stringify(call.arguments));
+	}
+	return total;
+}
+function estimateTokensForContentParts(parts) {
+	let total = 0;
+	for (const part of parts) total += estimateTokensForContentPart(part);
+	return total;
+}
+function estimateTokensForContentPart(part) {
+	if (part.type === "text") return estimateTokens(part.text);
+	else if (part.type === "think") return estimateTokens(part.think);
+	return 0;
+}
+//#endregion
 //#region ../../packages/agent-core/src/utils/completion-budget.ts
 const MIN_FLOOR = 1;
 const DEFAULT_UNKNOWN_CONTEXT_FALLBACK = 32e3;
@@ -56570,6 +56628,44 @@ var CronManager = class {
 	}
 };
 //#endregion
+//#region ../../packages/agent-core/src/agent/kimi-env-params.ts
+/**
+* Apply Kimi sampling params (`KIMI_MODEL_TEMPERATURE`, `KIMI_MODEL_TOP_P`) from
+* the environment to a chat provider. Applied at provider construction
+* (`ConfigState.provider`) so every request built from `config.provider` — the
+* main loop AND full-history compaction — carries them, matching kimi-cli where
+* these live on the shared `create_llm` provider. Applies globally to any Kimi
+* provider (not tied to `KIMI_MODEL_NAME`).
+*
+* Non-Kimi providers — and Kimi providers with neither var set — are returned
+* unchanged. `max_tokens` is intentionally NOT handled here: `KIMI_MODEL_MAX_TOKENS`
+* already flows through the completion-budget path (`resolveCompletionBudget`).
+*/
+function applyKimiEnvSamplingParams(provider, env = process.env) {
+	if (!(provider instanceof KimiChatProvider)) return provider;
+	const kwargs = {};
+	const temperature = parseFloatEnv(env["KIMI_MODEL_TEMPERATURE"], "KIMI_MODEL_TEMPERATURE");
+	if (temperature !== void 0) kwargs.temperature = temperature;
+	const topP = parseFloatEnv(env["KIMI_MODEL_TOP_P"], "KIMI_MODEL_TOP_P");
+	if (topP !== void 0) kwargs.top_p = topP;
+	return Object.keys(kwargs).length > 0 ? provider.withGenerationKwargs(kwargs) : provider;
+}
+/**
+* Apply the Moonshot preserved-thinking passthrough (`KIMI_MODEL_THINKING_KEEP`
+* -> `thinking.keep`) to a chat provider. Applied in `Agent.llm` 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.)
+*
+* Non-Kimi providers — and an unset/blank value — are returned unchanged.
+*/
+function applyKimiEnvThinkingKeep(provider, thinkingLevel, env = process.env) {
+	if (!(provider instanceof KimiChatProvider)) return provider;
+	const keep = env["KIMI_MODEL_THINKING_KEEP"]?.trim();
+	if (keep === void 0 || keep.length === 0 || thinkingLevel === "off") return provider;
+	return provider.withExtraBody({ thinking: { keep } });
+}
+//#endregion
 //#region ../../packages/agent-core/src/agent/config/thinking.ts
 const DEFAULT_THINKING_EFFORT = "high";
 const THINKING_EFFORTS = new Set([
@@ -56659,7 +56755,7 @@ var ConfigState = class {
 		return provider;
 	}
 	get provider() {
-		return createProvider(this.providerConfig);
+		return applyKimiEnvThinkingKeep(applyKimiEnvSamplingParams(createProvider(this.providerConfig).withThinking(this.thinkingLevel)), this.thinkingLevel);
 	}
 	get model() {
 		if (this._modelAlias === void 0) throw new KimiError(ErrorCodes.MODEL_NOT_CONFIGURED, "Model not set");
@@ -65445,6 +65541,41 @@ const MCP_CONFIG_SKILL = {
 	}
 };
 //#endregion
+//#region ../../packages/agent-core/src/skill/builtin/sub-skill/consolidate/SKILL.md
+var SKILL_default$2 = "---\nname: sub-skill.consolidate\ndescription: Apply an approved sub-skill grouping by moving user-specified skills into a parent bundle, with timestamped backups of every modified directory.\ndisable-model-invocation: true\n---\n\n# Consolidate sub-skills (`sub-skill.consolidate`)\n\nExecute the reorganization by moving user-specified skills into a parent bundle, forming a sub-skill hierarchy.\n\n## When to use\n\n- The user has approved a grouping proposal (typically from `sub-skill.review`) and wants to apply it.\n- Migrating standalone skills into a new or existing parent bundle.\n\n## Process\n\n1. **Confirm the plan.** Restate which skills will move and where, and ask the user to confirm **before** making any file changes.\n2. **Back up every original skill directory.** Before moving anything, create a timestamped backup of each skill directory that will be modified.\n   - For a skill at `<root>/<skill-name>/SKILL.md`, back up the entire `<skill-name>` directory:\n     ```bash\n     cp -r <skill-name> \"<skill-name>.$(date +%Y%m%d-%H%M%S).bak\"\n     ```\n   - Keep all backups; never overwrite an existing backup file.\n3. **Create or update the parent bundle.**\n   - If the parent does not exist, create `<parent-name>/SKILL.md` with `has-sub-skill: true` in the frontmatter.\n   - If the parent already exists, ensure its frontmatter includes `has-sub-skill: true`.\n4. **Move child skills into the parent.** Move each child skill's entire directory under the parent bundle.\n   - Example: `web-search/` → `web-research/web-search/`\n5. **Verify the result.** List the new directory structure and confirm each moved skill still has a valid `SKILL.md` with required frontmatter (`name` and `description`).\n6. **Report the change.** Summarize what was moved, the new structure, and where backups are located.\n\n## Don'ts\n\n- **Never move skills without backing up first.**\n- **Never overwrite an existing backup** — always use a fresh timestamped suffix.\n- **Don't drop frontmatter or payload files** during the move; the entire directory must be preserved.\n- **Don't create deeply nested hierarchies** (3+ levels) unless the user explicitly requests it.\n";
+//#endregion
+//#region ../../packages/agent-core/src/skill/builtin/sub-skill/review/SKILL.md
+var SKILL_default$1 = "---\nname: sub-skill.review\ndescription: Analyze the available skill set and recommend candidate groups that could be consolidated into sub-skill bundles. Read-only — proposes a plan, does not move files.\ndisable-model-invocation: true\n---\n\n# Review sub-skills (`sub-skill.review`)\n\nAnalyze the current skill inventory and identify candidate groups that could be consolidated into sub-skill bundles. This sub-skill is **read-only**: it produces a proposal for the user to review before any file changes are made by `sub-skill.consolidate`.\n\n## When to use\n\n- The user asks to review, reorganize, or audit the skill inventory.\n- There are many loosely-related skills that might benefit from hierarchical grouping.\n- The user wants to evaluate whether a new skill should be a sub-skill of an existing parent.\n\n## Process\n\n1. **List the current inventory.** Use the skill registry (or scan the configured skill roots) to get a full list of skill names, descriptions, and source scopes.\n2. **Categorize by domain.** Group skills by functional domain — e.g. file operations, web tools, collaboration, observability.\n3. **Detect coupling.** Identify skills that are frequently used together or share similar `whenToUse` conditions.\n4. **Flag granularity issues.** Call out skills that are too fine-grained (e.g. one skill per CLI flag) or too broad to land in any single domain.\n5. **Propose sub-skill structures.** For each candidate group, list:\n   - The parent skill name and a one-line description.\n   - The children that should move under it.\n   - Whether the parent needs `has-sub-skill: true` (it does, if children should be discovered).\n6. **Output a summary report.** Present findings as a concise grouped list with rationale, and stop. Do **not** edit any file — that's `sub-skill.consolidate`'s job.\n\n## Criteria for a good sub-skill grouping\n\n- **Shared context.** Children operate within the same domain or workflow.\n- **Composable entry point.** The parent gives a natural top-level handle; children handle specifics.\n- **Shallow nesting.** Prefer 2 levels (parent → child). Avoid 3+ unless strictly necessary.\n- **Backward compatibility.** Existing skill names should ideally remain discoverable.\n\n## Example output format\n\n```\nProposed sub-skill: web-research\n  - Parent: web-research (has-sub-skill: true)\n  - Children:\n    - web-search    → move under web-research/search\n    - fetch-url     → move under web-research/fetch\n  - Rationale: Both deal with online information retrieval and are often chained together.\n```\n";
+//#endregion
+//#region ../../packages/agent-core/src/skill/builtin/sub-skill/SKILL.md
+var SKILL_default = "---\nname: sub-skill\ndescription: Discover and reorganize the skill inventory into hierarchical sub-skill bundles. Use when the user asks to review, group, or consolidate skills into a parent bundle.\ndisable-model-invocation: true\nhas-sub-skill: true\n---\n\n# Sub-skill\n\nContainer skill for analyzing the local skill inventory and reorganizing it into hierarchical sub-skill bundles (`has-sub-skill: true` parents with children inside).\n\n## When to use\n\n- The user asks to review, reorganize, or consolidate skills.\n- There are many loosely-related skills that might benefit from hierarchical grouping.\n- The user wants to evaluate whether a new skill should be a sub-skill of an existing one.\n\n## Sub-skills\n\n- **`sub-skill.review`** — Analyze the current inventory and propose candidate sub-skill groupings.\n- **`sub-skill.consolidate`** — Apply an approved grouping by moving skills into a parent bundle, with timestamped backups.\n\nThe usual flow is `sub-skill.review` first (read-only proposal), then `sub-skill.consolidate` after the user approves a plan. Never run consolidate without an explicit go-ahead from the user.\n";
+//#endregion
+//#region ../../packages/agent-core/src/skill/builtin/sub-skill.ts
+function makeBuiltin(body, dirName, pseudoPath, extraMetadata = {}) {
+	const parsed = parseSkillText({
+		skillMdPath: `/builtin/skills/${dirName}/SKILL.md`,
+		skillDirName: dirName,
+		source: "builtin",
+		text: body
+	});
+	return {
+		...parsed,
+		path: pseudoPath,
+		dir: pseudoPath,
+		metadata: {
+			...parsed.metadata,
+			type: parsed.metadata.type ?? "inline",
+			...extraMetadata
+		}
+	};
+}
+const SUB_SKILL_PARENT = makeBuiltin(SKILL_default, "sub-skill", "builtin://sub-skill", {
+	disableModelInvocation: true,
+	"has-sub-skill": true
+});
+const SUB_SKILL_REVIEW = makeBuiltin(SKILL_default$1, "sub-skill.review", "builtin://sub-skill/review", { disableModelInvocation: true });
+const SUB_SKILL_CONSOLIDATE = makeBuiltin(SKILL_default$2, "sub-skill.consolidate", "builtin://sub-skill/consolidate", { disableModelInvocation: true });
+//#endregion
 //#region ../../packages/agent-core/src/skill/builtin/update-config.md
 var update_config_default = "---\nname: update-config\ndescription: Inspect or edit kimi-code's own config — `config.toml` (model, provider, permission, hooks) and `tui.toml` (theme, editor, notifications, auto-update). Use when the user asks what a setting does or wants to change one.\n---\n\n# Configure kimi-code (update-config)\n\nHelp the user inspect, change, and validate kimi-code's configuration files. The files are **TOML** with **snake_case** keys.\n\n## The two config files\n\nkimi-code has two TOML config files, both under `~/.kimi-code/` (or under `KIMI_CODE_HOME` when set), both snake_case, but with different ownership — decide which one the user means before doing anything:\n\n- **`config.toml`** — agent / runtime settings: `default_model`, `providers`, `models`, `thinking`, `permission`, `hooks`, `loop_control`, etc.\n- **`tui.toml`** — terminal-UI / client preferences: `theme`, `[editor].command`, `[notifications]`, `[upgrade].auto_install` (auto-update). These can usually also be changed with the interactive commands `/config`, `/theme`, `/editor`, which is easier — prefer pointing the user at those.\n\nThe \"read → copy → Edit → validate → back up → overwrite\" flow below applies to both files; only **which reload command applies** differs (see Capability 4).\n\n## Prerequisite 1: the official docs are the single source of truth\n\nBefore touching any config, use **FetchURL** to fetch the official config docs as the one authoritative reference for fields (key names, types, allowed values, owning section):\n\n```\nhttps://moonshotai.github.io/kimi-code/en/configuration/config-files.html\n```\n\n- Use the **snake_case key names and sections exactly as documented** — don't invent them, don't guess camelCase.\n- If FetchURL is unavailable or the fetch fails, tell the user plainly that you can't reach the online docs, and ask them to paste the relevant section or confirm whether to proceed from what you already know. **Never edit blindly without an authoritative reference.**\n\n## Prerequisite 2: read the target file before any change\n\nBefore any modification, use **Read** on the target config file (decide whether it's `config.toml` or `tui.toml` per the above):\n\n- Location: `~/.kimi-code/config.toml` or `~/.kimi-code/tui.toml` (under `$KIMI_CODE_HOME/` when set). For other scopes/files, defer to the official docs.\n- A missing or empty file is fine — you'll create a minimal skeleton later.\n- If the file exists but **fails to parse as TOML**, report the error verbatim and **stop** — never overwrite a broken file in place (it could destroy the user's existing config).\n\n---\n\n## Capability 1: explain configuration (read-only, no file changes)\n\nWhen the user asks \"what config is there\", \"what does this setting do\", or \"how do I use it\":\n\n1. Fetch the official docs (Prerequisite 1).\n2. Read the current `config.toml` (Prerequisite 2).\n3. Answer against both: list the relevant sections / keys, what each is for, **current value vs default**, and the allowed-value range; say which file and section each lives in.\n4. Present it as a compact grouped list or table. **Stay read-only — write no files.**\n\n## Capability 2: make changes for the user (copy → Edit → validate → back up → overwrite)\n\nDon't edit the target file in place, and **don't rewrite it from scratch** — instead copy it, Edit the copy, and keep the original out of any broken state the whole time:\n\n1. **Clarify intent**: which key, what value, and which file (`config.toml` or `tui.toml`). Ask in one line if ambiguous; for discrete choices (e.g. scope) AskUserQuestion is fine, but use plain questions for free-form input.\n2. **Read the target file** (Prerequisite 2): Read it to understand the current state and confirm it parses.\n3. **Copy out a candidate (do not create from scratch)**: use **Bash** to copy the target verbatim — `cp config.toml config-new.toml` (same directory, `-new` suffix; for tui.toml, `cp tui.toml tui-new.toml`). **Leave the original untouched for now.**\n   - Only when the target doesn't exist (nothing to copy) should you use **Write** to create a minimal skeleton candidate (e.g. just the comment line `# ~/.kimi-code/config.toml`).\n4. **Edit the candidate**: use the **Edit** tool on the candidate to **change/add only the target key** — never rewrite the whole file. That way every existing section, entry, comment, and bit of formatting stays exactly as-is; only what should change changes. The candidate is identical to the original, so use the content you read in step 2 to locate the Edit anchor. Check the change against the official docs (key / section / value type / allowed values, snake_case).\n5. **Validate the candidate** (see Capability 3, via `kimi doctor`). **If anything fails, keep Editing the candidate and re-validate, looping until it all passes.**\n6. **Back up and overwrite** (only after validation fully passes):\n   - **Back up the old file — always create a new timestamped backup, keep all of them, never overwrite an existing backup.** Copy this exactly with **Bash** (for config.toml): `cp config.toml \"config.toml.$(date +%Y%m%d-%H%M%S).bak\"`; for tui.toml: `cp tui.toml \"tui.toml.$(date +%Y%m%d-%H%M%S).bak\"`. Skip the backup only if the target didn't exist.\n   - Overwrite with the candidate: `mv config-new.toml config.toml`.\n   - If reload errors after the overwrite, the user can recover from **the most recent timestamped backup**.\n7. Tell the user how to apply it (see Capability 4).\n\n## Capability 3: validate the candidate file (must pass before overwrite)\n\nUse **`kimi doctor`** to validate the candidate you wrote — it doesn't start the TUI and doesn't modify any file; it runs kimi's own parser + schema (syntax and schema together), so it's the authoritative check. Pick the subcommand by which file you changed, and pass the **candidate** path explicitly:\n\n- changed `config.toml` → `kimi doctor config <config-new.toml path>`\n- changed `tui.toml` → `kimi doctor tui <tui-new.toml path>`\n\nWhen a path is passed explicitly the file must exist (your candidate does, so that's fine). **Exit code 0 = pass (valid or skipped); non-zero = a specified file is missing or the config is invalid** — show the output verbatim, fix the candidate, and re-run, looping until it's 0.\n\nThen do two checks `kimi doctor` can't:\n\n1. **Cross-check values against the official docs** (single source of truth): are the key / section / enum values as documented, and snake_case? doctor guarantees \"schema-valid\", but \"valid yet not what the user wanted\" (e.g. a misspelled model alias) needs the docs.\n2. **Completeness**: every existing entry is still present (the candidate fully replaces the target — a dropped line is a deletion).\n\n> To also check whether the currently **active** config is OK overall, run `kimi doctor` with no path (it checks the default `config.toml` + `tui.toml`, showing a missing one as skipped).\n\n## Capability 4: tell the user how to apply changes\n\nOnce local validation passes, tell the user how to make the change take effect — **the reload command depends on which file you changed**:\n\n- changed **`config.toml`** → run **`/reload`** in the TUI (reloads the session and applies `config.toml`; it also reloads `tui.toml`).\n- changed **`tui.toml`** → run **`/reload-tui`** (reloads only `tui.toml`, lighter); `/reload` works too (reloads both).\n- changed both → a single **`/reload`** covers it.\n\nNote: `/reload` is available **only when idle** — if a reply is streaming, press Esc / Ctrl-C to stop first. `kimi doctor` already validated the schema before the overwrite, so reload should apply cleanly; if it still errors, follow the message to fix it or recover from the most recent timestamped backup. If you don't want to reload now, the **next new session** picks it up automatically.\n\n## Don'ts\n\n- **Always back up before overwriting**, with a **timestamped name and all history kept** — don't skip the backup, don't keep only a single `.bak`, don't overwrite an old backup.\n- Don't drop unrelated entries (the candidate fully replaces the target — a dropped line is a deletion).\n- When you can't reach the docs / have no authoritative reference, don't edit by guessing.\n";
 //#endregion
@@ -65467,9 +65598,15 @@ const UPDATE_CONFIG_SKILL = {
 };
 //#endregion
 //#region ../../packages/agent-core/src/skill/builtin/index.ts
-function registerBuiltinSkills(registry) {
+function registerBuiltinSkills(registry, options = {}) {
+	const experimentalFlags = options.experimentalFlags ?? flags;
 	registry.registerBuiltinSkill(MCP_CONFIG_SKILL);
 	registry.registerBuiltinSkill(UPDATE_CONFIG_SKILL);
+	if (experimentalFlags.enabled("sub_skill")) {
+		registry.registerBuiltinSkill(SUB_SKILL_PARENT);
+		registry.registerBuiltinSkill(SUB_SKILL_REVIEW);
+		registry.registerBuiltinSkill(SUB_SKILL_CONSOLIDATE);
+	}
 }
 //#endregion
 //#region ../../packages/agent-core/src/skill/scanner.ts
@@ -65502,6 +65639,7 @@ async function discoverSkills(options) {
 	const isFile = options.isFile ?? defaultIsFile;
 	const isDir = options.isDir ?? defaultIsDir;
 	const parse = options.parse ?? parseSkillFromFile;
+	const subSkillFlags = options.experimentalFlags ?? flags;
 	const warn = options.onWarning ?? (() => {});
 	const skip = options.onSkippedByPolicy ?? (() => {});
 	const byName = /* @__PURE__ */ new Map();
@@ -65517,23 +65655,25 @@ async function discoverSkills(options) {
 		const directorySkills = /* @__PURE__ */ new Set();
 		const subdirs = [];
 		for (const entry of entries) {
-			if (await isFile(posix$1.join(dirPath, entry, "SKILL.md"))) {
-				directorySkills.add(entry);
-				continue;
-			}
+			const entryPath = posix$1.join(dirPath, entry);
+			if (await isFile(posix$1.join(entryPath, "SKILL.md"))) directorySkills.add(entry);
 			if (entry === "node_modules" || entry.startsWith(".")) continue;
-			if (await isDir(posix$1.join(dirPath, entry))) subdirs.push(entry);
+			if (await isDir(entryPath)) subdirs.push(entry);
+		}
+		const allowedSubSkillBundles = /* @__PURE__ */ new Set();
+		for (const entry of directorySkills) {
+			const skill = await parseAndRegister({
+				parse,
+				byName,
+				skillMdPath: posix$1.join(dirPath, entry, "SKILL.md"),
+				skillDirName: entry,
+				root,
+				onDiscoveredSkill: options.onDiscoveredSkill,
+				warn,
+				skip
+			});
+			if (skill !== void 0 && hasSubSkillEnabled(skill, subSkillFlags)) allowedSubSkillBundles.add(entry);
 		}
-		for (const entry of directorySkills) await parseAndRegister({
-			parse,
-			byName,
-			skillMdPath: posix$1.join(dirPath, entry, "SKILL.md"),
-			skillDirName: entry,
-			root,
-			onDiscoveredSkill: options.onDiscoveredSkill,
-			warn,
-			skip
-		});
 		if (isTopLevel) {
 			if (root.plugin !== void 0) {
 				const rootSkillMd = posix$1.join(dirPath, "SKILL.md");
@@ -65570,7 +65710,10 @@ async function discoverSkills(options) {
 				});
 			}
 		}
-		for (const entry of subdirs) await walkSkillDir(posix$1.join(dirPath, entry), root, false, depth + 1);
+		for (const entry of subdirs) {
+			if (directorySkills.has(entry) && !allowedSubSkillBundles.has(entry)) continue;
+			await walkSkillDir(posix$1.join(dirPath, entry), root, false, depth + 1);
+		}
 	}
 	for (const root of options.roots) await walkSkillDir(root.path, root, true, 0);
 	return sortSkills([...byName.values()]);
@@ -65645,6 +65788,7 @@ async function parseAndRegister(input) {
 		input.onDiscoveredSkill?.(discovered);
 		const key = normalizeSkillName(discovered.name);
 		if (!input.byName.has(key)) input.byName.set(key, discovered);
+		return skill;
 	} catch (error) {
 		if (error instanceof UnsupportedSkillTypeError) input.skip({
 			path: input.skillMdPath,
@@ -65653,8 +65797,15 @@ async function parseAndRegister(input) {
 		});
 		else if (error instanceof SkillParseError) input.warn(`Skipping invalid skill at ${input.skillMdPath}: ${error.message}`, error);
 		else input.warn(`Skipping skill at ${input.skillMdPath} due to unexpected error`, error);
+		return;
 	}
 }
+function hasSubSkillEnabled(skill, experimentalFlags) {
+	if (!experimentalFlags.enabled("sub_skill")) return false;
+	const nested = skill.metadata["metadata"];
+	const nestedFlag = typeof nested === "object" && nested !== null ? nested["has-sub-skill"] === true || nested["hasSubSkill"] === true : false;
+	return skill.metadata["has-sub-skill"] === true || skill.metadata["hasSubSkill"] === true || nestedFlag;
+}
 async function defaultIsDir(p) {
 	try {
 		return (await promises.stat(p)).isDirectory();
@@ -65706,10 +65857,12 @@ var SkillRegistry = class {
 	roots = [];
 	skipped = [];
 	discoverImpl;
+	experimentalFlags;
 	onWarning;
 	sessionId;
 	constructor(options = {}) {
 		this.discoverImpl = options.discover ?? discoverSkills;
+		this.experimentalFlags = options.experimentalFlags ?? flags;
 		this.onWarning = options.onWarning ?? (() => {});
 		this.sessionId = options.sessionId;
 	}
@@ -65717,6 +65870,7 @@ var SkillRegistry = class {
 		for (const root of roots) if (!this.roots.includes(root.path)) this.roots.push(root.path);
 		const skills = await this.discoverImpl({
 			roots,
+			experimentalFlags: this.experimentalFlags,
 			onWarning: this.onWarning,
 			onSkippedByPolicy: (skill) => this.skipped.push(skill),
 			onDiscoveredSkill: (skill) => {
@@ -78894,10 +79048,10 @@ var CronListTool = class {
 var agent_background_disabled_default = "Background agent execution is disabled for this agent. Do not set `run_in_background=true`.";
 //#endregion
 //#region ../../packages/agent-core/src/tools/builtin/collaboration/agent-background-enabled.md
-var agent_background_enabled_default = "When `run_in_background=true`, the subagent runs detached from this turn. The completion arrives in a later turn as a synthetic user-role message containing its result — you do not need to poll, sleep, or check on its progress. Continue with other work or respond to the user. Never fabricate or predict what the result will say.\n\nFor a background task, when `timeout` is omitted it falls back to the operator-configured background timeout, if one is set. If the operator has not configured a background timeout, an omitted `timeout` means the task runs with no time limit.\n";
+var agent_background_enabled_default = "When `run_in_background=true`, the subagent runs detached from this turn. The completion arrives in a later turn as a synthetic user-role message containing its result — you do not need to poll, sleep, or check on its progress. Continue with other work or respond to the user. Never fabricate or predict what the result will say.\n";
 //#endregion
 //#region ../../packages/agent-core/src/tools/builtin/collaboration/agent.md
-var agent_default = "Launch a subagent to handle a task. The subagent runs as a same-process loop instance with its own context and wire file.\n\nWriting the prompt:\n- The subagent starts with zero context — it has not seen this conversation. Brief it like a colleague who just walked into the room: state the goal, list what you already know, hand over the specifics.\n- Lookups (read this file, run that test): put the exact path or command in the prompt. The subagent should not have to search for things you already know.\n- Investigations (figure out X, find why Y): give the question, not prescribed steps — fixed steps become dead weight when the premise is wrong.\n- Do not delegate understanding. If the task hinges on a file path or line number, find it yourself first and write it into the prompt.\n\nUsage notes:\n- When the task continues earlier work a subagent already did, prefer resuming that agent (pass its `resume` id) over spawning a fresh instance — the resumed agent keeps its prior context.\n- A subagent's result is only visible to you, not to the user. When the user needs to see what a subagent produced, summarize the relevant parts yourself in your own reply.\n\nWhen NOT to use Agent: skip delegation for trivial work you can do directly — reading a file whose path you already know, searching a small known set of files, or any task that takes only a step or two. Delegation has a context-handoff cost; it pays off only when the task is substantial enough to outweigh it.\n\nOnce a subagent is running, leave that scope to it: do not redo its searches or reads in parallel, and do not abandon it midway and finish the job manually. Both undo the context savings the delegation was meant to buy.";
+var agent_default = "Launch a subagent to handle a task. The subagent runs as a same-process loop instance with its own context and wire file.\n\nWriting the prompt:\n- The subagent starts with zero context — it has not seen this conversation. Brief it like a colleague who just walked into the room: state the goal, list what you already know, hand over the specifics.\n- Lookups (read this file, run that test): put the exact path or command in the prompt. The subagent should not have to search for things you already know.\n- Investigations (figure out X, find why Y): give the question, not prescribed steps — fixed steps become dead weight when the premise is wrong.\n- Do not delegate understanding. If the task hinges on a file path or line number, find it yourself first and write it into the prompt.\n\nUsage notes:\n- When the task continues earlier work a subagent already did, prefer resuming that agent (pass its `resume` id) over spawning a fresh instance — the resumed agent keeps its prior context.\n- A subagent's result is only visible to you, not to the user. When the user needs to see what a subagent produced, summarize the relevant parts yourself in your own reply.\n- Subagents use a fixed 30-minute timeout. If one times out, resume the same agent instead of starting over.\n\nWhen NOT to use Agent: skip delegation for trivial work you can do directly — reading a file whose path you already know, searching a small known set of files, or any task that takes only a step or two. Delegation has a context-handoff cost; it pays off only when the task is substantial enough to outweigh it.\n\nOnce a subagent is running, leave that scope to it: do not redo its searches or reads in parallel, and do not abandon it midway and finish the job manually. Both undo the context savings the delegation was meant to buy.\n";
 //#endregion
 //#region ../../packages/agent-core/src/tools/builtin/collaboration/agent.ts
 /**
@@ -78930,8 +79084,7 @@ const AgentToolInputSchema = z.preprocess((input) => {
 	description: z.string().describe("Short task description (3-5 words) for UI display"),
 	subagent_type: z.string().optional().describe("One of the available agent types (see \"Available agent types\" in this tool description). Defaults to \"coder\" when omitted."),
 	resume: z.string().optional().describe("Optional agent ID to resume instead of creating a new instance"),
-	run_in_background: z.boolean().optional().describe("If true, return immediately without waiting for completion. Prefer false unless the task can run independently and there is a clear benefit to not waiting."),
-	timeout: z.number().int().min(30).max(3600).optional().describe("Timeout in seconds for the agent task (min 30s, max 3600s / 1hr). When omitted, a foreground task runs until completion with no timeout. The agent is stopped if it exceeds this limit.")
+	run_in_background: z.boolean().optional().describe("If true, return immediately without waiting for completion. Prefer false unless the task can run independently and there is a clear benefit to not waiting.")
 }));
 z.object({
 	result: z.string().describe("Aggregated text output from the subagent"),
@@ -78943,6 +79096,8 @@ z.object({
 	}).describe("Cumulative token usage")
 });
 const BACKGROUND_AGENT_UNAVAILABLE = "Background agent execution is not available for this agent because TaskList, TaskOutput, and TaskStop are not enabled.";
+const AGENT_TIMEOUT_MS = 1800 * 1e3;
+const AGENT_TIMEOUT_DESCRIPTION = "30 minutes";
 var AgentTool = class {
 	subagentHost;
 	backgroundManager;
@@ -78995,8 +79150,7 @@ var AgentTool = class {
 				};
 			}
 			const backgroundController = runInBackground ? new AbortController() : void 0;
-			const timeoutMs = args.timeout === void 0 ? void 0 : args.timeout * 1e3;
-			foregroundDeadline = !runInBackground && timeoutMs !== void 0 ? createDeadlineAbortSignal(signal, timeoutMs) : void 0;
+			foregroundDeadline = !runInBackground ? createDeadlineAbortSignal(signal, AGENT_TIMEOUT_MS) : void 0;
 			const options = {
 				parentToolCallId: toolCallId,
 				prompt: args.prompt,
@@ -79027,7 +79181,7 @@ var AgentTool = class {
 				let taskId;
 				try {
 					taskId = this.backgroundManager.registerTask(new AgentBackgroundTask(handle.completion, args.description, {
-						timeoutMs: timeoutMs ?? this.subagentHost.backgroundTaskTimeoutMs,
+						timeoutMs: AGENT_TIMEOUT_MS,
 						agentId: handle.agentId,
 						subagentType: handle.profileName,
 						abort: () => {
@@ -79073,24 +79227,27 @@ var AgentTool = class {
 				].join("\n") };
 			} catch (error) {
 				let message;
-				if (foregroundDeadline?.timedOut() === true && args.timeout !== void 0) message = `Agent timed out after ${args.timeout}s.`;
+				const timedOut = foregroundDeadline?.timedOut() === true;
+				if (timedOut) message = `Agent timed out after ${AGENT_TIMEOUT_DESCRIPTION}.`;
 				else if (isUserCancellation(signal.reason)) message = "The user manually interrupted this subagent (and any sibling agents launched alongside it). This was a deliberate user action, not a system error, a timeout, or a capacity/concurrency limit. Do not retry automatically or speculate about why it failed — wait for the user's next instruction.";
 				else if (isAbortError$3(error)) message = "The subagent was stopped before it finished.";
 				else message = error instanceof Error ? error.message : String(error);
+				const lines = [
+					`agent_id: ${handle.agentId}`,
+					`actual_subagent_type: ${handle.profileName}`,
+					"status: failed",
+					"",
+					`subagent error: ${message}`
+				];
+				if (timedOut) lines.push(`resume_hint: Continue with Agent(resume="${handle.agentId}", prompt="continue"). Use agent_id only; do not set subagent_type. The subagent retains its prior context; redo any unfinished tool call if its result was lost.`);
 				return {
-					output: [
-						`agent_id: ${handle.agentId}`,
-						`actual_subagent_type: ${handle.profileName}`,
-						"status: failed",
-						"",
-						`subagent error: ${message}`
-					].join("\n"),
+					output: lines.join("\n"),
 					isError: true
 				};
 			}
 		} catch (error) {
 			let message;
-			if (foregroundDeadline?.timedOut() === true && args.timeout !== void 0) message = `Agent timed out after ${args.timeout}s.`;
+			if (foregroundDeadline?.timedOut() === true) message = `Agent timed out after ${AGENT_TIMEOUT_DESCRIPTION}.`;
 			else if (isUserCancellation(signal.reason)) message = "The user manually interrupted this subagent (and any sibling agents launched alongside it). This was a deliberate user action, not a system error, a timeout, or a capacity/concurrency limit. Do not retry automatically or speculate about why it failed — wait for the user's next instruction.";
 			else if (isAbortError$3(error)) message = "The subagent was stopped before it finished.";
 			else message = error instanceof Error ? error.message : String(error);
@@ -88328,7 +88485,7 @@ var Agent = class {
 	}
 	get llm() {
 		const model = this.config.model;
-		const provider = this.config.provider.withThinking(this.config.thinkingLevel);
+		const provider = this.config.provider;
 		const loopControl = this.kimiConfig?.loopControl;
 		const completionBudgetConfig = resolveCompletionBudget({
 			maxOutputSize: this.config.maxOutputSize,
@@ -88349,7 +88506,7 @@ var Agent = class {
 		this.logLlmConfigIfChanged(context, configMetadata, buildLlmConfigSignature(configMetadata, systemPrompt, tools));
 		let partialMessageCount = 0;
 		for (const message of history) if (message.partial === true) partialMessageCount += 1;
-		const requestMetadata = { estimatedInputTokens: estimateTokens(systemPrompt) + estimateTokensForMessages(history) + estimateTokensForTools(tools) };
+		const requestMetadata = {};
 		if (partialMessageCount > 0) requestMetadata.partialMessageCount = partialMessageCount;
 		this.log.info("llm request", {
 			...context,
@@ -89101,7 +89258,6 @@ const BackgroundConfigSchema = z.object({
 	maxRunningTasks: z.number().int().min(1).optional(),
 	keepAliveOnExit: z.boolean().optional(),
 	killGracePeriodMs: z.number().int().min(0).optional(),
-	agentTaskTimeoutS: z.number().int().min(1).optional(),
 	printWaitCeilingS: z.number().int().min(1).optional()
 });
 const ExperimentalFlagIdSet = new Set(FLAG_DEFINITIONS.map((def) => def.id));
@@ -93248,19 +93404,19 @@ async function readMcpJson(filePath, options = {}) {
 		text = await readFile(filePath, "utf-8");
 	} catch (error) {
 		if (isFileNotFound(error)) return {};
-		throw new KimiError(ErrorCodes.CONFIG_INVALID, `Failed to read ${filePath}: ${describeError(error)}`, { cause: error });
+		throw new KimiError(ErrorCodes.CONFIG_INVALID, `Failed to read ${filePath}: ${describeError$1(error)}`, { cause: error });
 	}
 	if (text.trim().length === 0) return {};
 	let data;
 	try {
 		data = JSON.parse(text);
 	} catch (error) {
-		throw new KimiError(ErrorCodes.CONFIG_INVALID, `Invalid JSON in ${filePath}: ${describeError(error)}`, { cause: error });
+		throw new KimiError(ErrorCodes.CONFIG_INVALID, `Invalid JSON in ${filePath}: ${describeError$1(error)}`, { cause: error });
 	}
 	try {
 		return normalizeMcpServers(McpJsonFileSchema.parse(data).mcpServers, options);
 	} catch (error) {
-		throw new KimiError(ErrorCodes.CONFIG_INVALID, `Invalid MCP server config in ${filePath}: ${describeError(error)}`, { cause: error });
+		throw new KimiError(ErrorCodes.CONFIG_INVALID, `Invalid MCP server config in ${filePath}: ${describeError$1(error)}`, { cause: error });
 	}
 }
 function normalizeMcpServers(servers, options) {
@@ -93290,7 +93446,7 @@ function getErrorCode(error) {
 	if (typeof error !== "object" || error === null || !("code" in error)) return void 0;
 	return error.code;
 }
-function describeError(error) {
+function describeError$1(error) {
 	return error instanceof Error ? error.message : String(error);
 }
 //#endregion
@@ -93500,12 +93656,10 @@ IMPORTANT:
 var SessionSubagentHost = class {
 	session;
 	ownerAgentId;
-	backgroundTaskTimeoutMs;
 	activeChildren = /* @__PURE__ */ new Map();
-	constructor(session, ownerAgentId, backgroundTaskTimeoutMs) {
+	constructor(session, ownerAgentId) {
 		this.session = session;
 		this.ownerAgentId = ownerAgentId;
-		this.backgroundTaskTimeoutMs = backgroundTaskTimeoutMs;
 	}
 	async spawn(profileName, options) {
 		options.signal.throwIfAborted();
@@ -93785,7 +93939,10 @@ var Session$1 = class {
 			},
 			telemetry: this.telemetry
 		});
-		this.skills = new SkillRegistry({ sessionId: options.id });
+		this.skills = new SkillRegistry({
+			sessionId: options.id,
+			experimentalFlags: this.experimentalFlags
+		});
 		this.mcp = new McpConnectionManager({
 			oauthService: new McpOAuthService({ kimiHomeDir: options.kimiHomeDir }),
 			log: this.log
@@ -93965,7 +94122,7 @@ var Session$1 = class {
 			builtinDir: this.options.skills?.builtinDir
 		});
 		await this.skills.loadRoots(roots);
-		registerBuiltinSkills(this.skills);
+		registerBuiltinSkills(this.skills, { experimentalFlags: this.experimentalFlags });
 	}
 	async loadMcpServers() {
 		const servers = this.options.mcpConfig?.servers;
@@ -94007,10 +94164,6 @@ var Session$1 = class {
 			}
 		});
 	}
-	backgroundTaskTimeoutMs() {
-		const timeoutS = this.options.background?.agentTaskTimeoutS;
-		return timeoutS === void 0 ? void 0 : timeoutS * 1e3;
-	}
 	refreshAgentBuiltinTools() {
 		for (const agent of this.readyAgents()) {
 			if (!agent.config.hasProvider) continue;
@@ -94030,7 +94183,7 @@ var Session$1 = class {
 			rpc: proxyWithExtraPayload(this.rpc, { agentId: id }),
 			modelProvider: this.options.providerManager,
 			hookEngine: config.hookEngine ?? this.hookEngine,
-			subagentHost: config.subagentHost ?? new SessionSubagentHost(this, id, this.backgroundTaskTimeoutMs()),
+			subagentHost: config.subagentHost ?? new SessionSubagentHost(this, id),
 			mcp: this.mcp,
 			goals: this.goals,
 			permission: this.permissionOptions(parentAgentId, config.permission),
@@ -114550,39 +114703,6 @@ function canPreserveDefaultModel(existingModels, defaultModel, managedModels) {
 	const existing = existingModels[defaultModel];
 	return isRecord$8(existing) && existing["provider"] !== "managed:kimi-code";
 }
-function clearManagedKimiCodeConfig(config) {
-	const removedProvider = Object.hasOwn(config.providers, KIMI_CODE_PROVIDER_NAME);
-	delete config.providers[KIMI_CODE_PROVIDER_NAME];
-	const removedModels = [];
-	const models = config.models;
-	if (models !== void 0) for (const [key, model] of Object.entries(models)) {
-		if (!isRecord$8(model) || model["provider"] !== "managed:kimi-code") continue;
-		delete models[key];
-		removedModels.push(key);
-	}
-	let defaultModelCleared = false;
-	if (typeof config.defaultModel === "string" && removedModels.includes(config.defaultModel)) {
-		config.defaultModel = void 0;
-		defaultModelCleared = true;
-	}
-	const removedServices = [];
-	if (config.services?.moonshotSearch !== void 0) {
-		delete config.services.moonshotSearch;
-		removedServices.push("moonshotSearch");
-	}
-	if (config.services?.moonshotFetch !== void 0) {
-		delete config.services.moonshotFetch;
-		removedServices.push("moonshotFetch");
-	}
-	if (config.services !== void 0 && Object.keys(config.services).length === 0) config.services = void 0;
-	return {
-		providerName: KIMI_CODE_PROVIDER_NAME,
-		removedProvider,
-		removedModels,
-		defaultModelCleared,
-		removedServices
-	};
-}
 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.`);
 }
@@ -114751,19 +114871,6 @@ function applyOpenPlatformConfig(config, options) {
 		defaultThinking: options.thinking
 	};
 }
-function removeOpenPlatformConfig(config, platformId) {
-	delete config.providers[platformId];
-	let removedDefault = false;
-	const existingModels = config.models ?? {};
-	for (const [key, model] of Object.entries(existingModels)) {
-		if (!isRecord$8(model) || model["provider"] !== platformId) continue;
-		delete existingModels[key];
-		if (config.defaultModel === key) removedDefault = true;
-	}
-	config.models = existingModels;
-	if (removedDefault) config.defaultModel = void 0;
-	if (config["defaultProvider"] === platformId) config["defaultProvider"] = void 0;
-}
 //#endregion
 //#region ../../packages/oauth/src/custom-registry.ts
 /**
@@ -126347,7 +126454,7 @@ function errorMessage(error) {
 //#endregion
 //#region src/cli/commands.ts
 function createProgram(version, onMain, onMigrate, onPluginNodeRunner = () => {}, onUpgrade = () => {}) {
-	const program = new Command(CLI_COMMAND_NAME).description("The Starting Point for Next-Gen Agents").version(version, "-V, --version").allowUnknownOption(false).configureHelp({ helpWidth: 100 }).helpOption("-h, --help", "Show help.").addHelpText("after", "\nDocumentation:        https://moonshotai.github.io/kimi-code/\n");
+	const program = new Command(CLI_COMMAND_NAME).description("The Starting Point for Next-Gen Agents").version(version, "-V, --version").allowUnknownOption(false).configureHelp({ helpWidth: 100 }).helpOption("-h, --help", "Show help.").usage("[options] [command]").addHelpText("after", "\nDocumentation:        https://moonshotai.github.io/kimi-code/\n");
 	program.addOption(new Option("-S, --session [id]", "Resume a session. With ID: resume that session. Without ID: interactively pick.").argParser((val) => val === true ? "" : val)).addOption(new Option("-r, --resume [id]").hideHelp().argParser((val) => val === true ? "" : val)).option("-C, --continue", "Continue the previous session for the working directory.", false).option("-y, --yolo", "Automatically approve all actions.", false).option("--auto", "Start in auto permission mode.", false).addOption(new Option("-m, --model <model>", "LLM model alias to use for this invocation. Defaults to default_model in config.toml.")).addOption(new Option("-p, --prompt <prompt>", "Run one prompt non-interactively and print the response.")).addOption(new Option("--output-format <format>", "Output format for prompt mode. Defaults to text.").choices(["text", "stream-json"])).addOption(new Option("--skills-dir <dir>", "Load skills from this directory instead of auto-discovered user and project directories. Can be repeated.").argParser((value, previous) => [...previous ?? [], value]).default([])).addOption(new Option("--yes").hideHelp().default(false)).addOption(new Option("--auto-approve").hideHelp().default(false)).option("--plan", "Start in plan mode.", false);
 	registerExportCommand(program);
 	registerProviderCommand(program);
@@ -126361,7 +126468,8 @@ function createProgram(version, onMain, onMigrate, onPluginNodeRunner = () => {}
 	program.command("__plugin_run_node", { hidden: true }).argument("<entry>").argument("[args...]").allowUnknownOption(true).action((entry, args) => {
 		onPluginNodeRunner(entry, args);
 	});
-	program.action(() => {
+	program.argument("[args...]").action((args) => {
+		if (args.length > 0) program.error(`unknown command '${args[0]}'. See '${CLI_COMMAND_NAME} --help'.`);
 		const raw = program.opts();
 		const rawSession = raw["session"] ?? raw["resume"];
 		const sessionValue = rawSession === true ? "" : rawSession;
@@ -126805,11 +126913,17 @@ function slashBusyMessage(commandName, reason) {
 function isUserActivatableSkill(skill) {
 	return skill.type === void 0 || skill.type === "prompt" || skill.type === "inline" || skill.type === "flow";
 }
+function compareSkillSlashCommands(a, b) {
+	return getSkillSlashCommandGroup(a.source) - getSkillSlashCommandGroup(b.source) || a.name.localeCompare(b.name);
+}
+function getSkillSlashCommandGroup(source) {
+	return source === "builtin" ? 0 : 1;
+}
 function buildSkillSlashCommands(skills) {
 	const commandMap = /* @__PURE__ */ new Map();
 	return {
-		commands: skills.filter(isUserActivatableSkill).map((skill) => {
-			const commandName = `skill:${skill.name}`;
+		commands: [...skills].toSorted(compareSkillSlashCommands).filter(isUserActivatableSkill).map((skill) => {
+			const commandName = skill.source === "builtin" ? skill.name : `skill:${skill.name}`;
 			commandMap.set(commandName, skill.name);
 			return {
 				name: commandName,
@@ -126890,9 +127004,28 @@ function isTodoItemShape(value) {
 	return rec.status === "pending" || rec.status === "in_progress" || rec.status === "done";
 }
 function formatErrorMessage$2(error) {
-	if (isKimiError(error)) return `[${error.code}] ${error.message}`;
+	if (isKimiError(error)) return formatErrorPayload({
+		code: error.code,
+		message: error.message,
+		details: error.details
+	});
 	return error instanceof Error ? error.message : String(error);
 }
+function formatErrorPayload(error) {
+	const filteredMessage = formatProviderFilteredMessage(error.details);
+	if (filteredMessage !== void 0) return `[${error.code}] ${filteredMessage}`;
+	return `[${error.code}] ${error.message}`;
+}
+function formatProviderFilteredMessage(details) {
+	const finishReason = stringDetail(details, "finishReason");
+	const rawFinishReason = stringDetail(details, "rawFinishReason");
+	if (finishReason !== "filtered" && rawFinishReason !== "content_filter") return void 0;
+	return `Provider filtered the response before visible output (finishReason=${finishReason ?? "filtered"}${rawFinishReason === void 0 ? "" : `, rawFinishReason=${rawFinishReason}`}).`;
+}
+function stringDetail(details, key) {
+	const value = details?.[key];
+	return typeof value === "string" ? value : void 0;
+}
 function stringValue(value) {
 	return typeof value === "string" ? value : void 0;
 }
@@ -129740,7 +129873,7 @@ function handleSettingsSelection(host, value) {
 }
 //#endregion
 //#region src/tui/components/dialogs/goal-start-permission-prompt.ts
-const OPTIONS = [
+const MANUAL_OPTIONS = [
 	{
 		value: "auto",
 		label: "Switch to Auto and start",
@@ -129762,11 +129895,33 @@ const OPTIONS = [
 		description: "Return to the input box with your goal command."
 	}
 ];
-const NOTICE_LINES = [
+const YOLO_OPTIONS = [
+	{
+		value: "auto",
+		label: "Switch to Auto and start",
+		description: "Best if you want Kimi Code to keep working while you are away. Tools are approved automatically, and questions are skipped."
+	},
+	{
+		value: "yolo",
+		label: "Keep YOLO and start",
+		description: "Tools and plan changes stay approved automatically. Kimi Code may still ask you questions."
+	},
+	{
+		value: "cancel",
+		label: "Do not start",
+		description: "Return to the input box with your goal command."
+	}
+];
+const MANUAL_NOTICE_LINES = [
 	"Manual mode asks you before Kimi Code runs commands, edits files, or takes other risky actions.",
 	"Manual mode is not suitable for unattended goal work.",
 	"You can go back without losing your command."
 ];
+const YOLO_NOTICE_LINES = [
+	"YOLO mode approves tools and plan changes automatically.",
+	"YOLO mode can still stop for questions.",
+	"Switch to Auto if you want questions skipped during goal work."
+];
 var GoalStartPermissionPromptComponent = class {
 	opts;
 	focused = false;
@@ -129785,27 +129940,27 @@ var GoalStartPermissionPromptComponent = class {
 			return;
 		}
 		if (matchesKey(data, Key.down)) {
-			this.selectedIndex = Math.min(OPTIONS.length - 1, this.selectedIndex + 1);
+			this.selectedIndex = Math.min(this.options.length - 1, this.selectedIndex + 1);
 			return;
 		}
-		if (matchesKey(data, Key.enter) || matchesKey(data, Key.space)) this.opts.onSelect(OPTIONS[this.selectedIndex].value);
+		if (matchesKey(data, Key.enter) || matchesKey(data, Key.space)) this.opts.onSelect(this.options[this.selectedIndex].value);
 	}
 	render(width) {
 		const { colors } = this.opts;
 		const rule = chalk.hex(colors.primary)("─".repeat(width));
 		const lines = [
 			rule,
-			chalk.hex(colors.primary).bold(" Start a goal with approvals on?"),
-			chalk.hex(colors.textMuted)(" ↑↓ navigate · Enter select · Esc return to input box"),
+			chalk.hex(colors.primary).bold(` ${this.title}`),
+			chalk.hex(colors.textMuted)(" ↑↓ navigate · Enter select · Esc cancel"),
 			""
 		];
 		const textWidth = Math.max(20, width - 2);
-		for (const paragraph of NOTICE_LINES) {
+		for (const paragraph of this.noticeLines) {
 			for (const line of wrapPlain(paragraph, textWidth)) lines.push(` ${styleModeNames(line, colors, colors.textMuted)}`);
 			lines.push("");
 		}
-		for (let i = 0; i < OPTIONS.length; i += 1) {
-			const option = OPTIONS[i];
+		for (let i = 0; i < this.options.length; i += 1) {
+			const option = this.options[i];
 			const selected = i === this.selectedIndex;
 			const pointer = selected ? "❯" : " ";
 			lines.push(chalk.hex(selected ? colors.primary : colors.textDim)(`  ${pointer} `) + styleLabel(option.label, selected, colors));
@@ -129815,6 +129970,15 @@ var GoalStartPermissionPromptComponent = class {
 		lines.push(rule);
 		return lines.map((line) => truncateToWidth(line, width));
 	}
+	get options() {
+		return this.opts.mode === "yolo" ? YOLO_OPTIONS : MANUAL_OPTIONS;
+	}
+	get noticeLines() {
+		return this.opts.mode === "yolo" ? YOLO_NOTICE_LINES : MANUAL_NOTICE_LINES;
+	}
+	get title() {
+		return this.opts.mode === "yolo" ? "Start a goal in YOLO mode?" : "Start a goal with approvals on?";
+	}
 };
 function styleLabel(label, selected, colors) {
 	if (selected) return chalk.hex(colors.primary).bold(label);
@@ -129847,8 +130011,14 @@ function wrapPlain(text, width) {
 //#endregion
 //#region src/tui/components/dialogs/goal-queue-manager.ts
 const MAX_GOAL_OBJECTIVE_LENGTH$2 = 4e3;
+const MAX_EDIT_INPUT_LINES = 8;
 const ELLIPSIS$5 = "…";
-const END_KEY = "\x1B[F";
+const BRACKET_PASTE_START$1 = "\x1B[200~";
+const BRACKET_PASTE_END$1 = "\x1B[201~";
+const SHIFT_ENTER_LEGACY = "\x1B\r";
+const SHIFT_ENTER_CSI = "\x1B[13;2~";
+const SEGMENTER = new Intl.Segmenter(void 0, { granularity: "grapheme" });
+const ANSI_CSI = /\u001B\[[0-?]*[ -/]*[@-~]/g;
 var GoalQueueManagerComponent = class extends Container {
 	focused = false;
 	opts;
@@ -129945,7 +130115,7 @@ var GoalQueueManagerComponent = class extends Container {
 		const labelWidth = visibleWidth(labelPrefix);
 		const stateWidth = visibleWidth(stateLabel);
 		const objectiveWidth = Math.max(1, width - 5 - labelWidth - stateWidth);
-		const objective = truncateToWidth(goal.objective, objectiveWidth, ELLIPSIS$5);
+		const objective = truncateToWidth(formatListObjective(goal.objective), objectiveWidth, ELLIPSIS$5);
 		let line = prefix + (selected ? chalk.hex(colors.primary).bold : chalk.hex(colors.text))(labelPrefix + objective);
 		if (moving) line += chalk.hex(colors.success)(stateLabel);
 		return line;
@@ -129981,7 +130151,7 @@ var GoalQueueManagerComponent = class extends Container {
 };
 var GoalQueueEditDialogComponent = class extends Container {
 	focused = false;
-	input = new Input();
+	input = new MultilineGoalInput();
 	opts;
 	done = false;
 	error;
@@ -129989,7 +130159,6 @@ var GoalQueueEditDialogComponent = class extends Container {
 		super();
 		this.opts = opts;
 		this.input.setValue(opts.goal.objective);
-		this.input.handleInput(END_KEY);
 		this.input.onSubmit = (value) => {
 			this.submit(value);
 		};
@@ -130018,14 +130187,18 @@ var GoalQueueEditDialogComponent = class extends Container {
 		const pad = "  ";
 		const { colors } = this.opts;
 		const border = (s) => chalk.hex(colors.primary)(s);
+		const title = truncateToWidth(chalk.hex(colors.textStrong).bold("Edit upcoming goal"), innerWidth, ELLIPSIS$5);
+		const subtitle = truncateToWidth(chalk.hex(this.error === void 0 ? colors.textDim : colors.warning)(this.error ?? "Update the queued objective."), innerWidth, ELLIPSIS$5);
+		const inputLines = this.input.render(innerWidth);
+		const footer = truncateToWidth(chalk.hex(colors.textDim)("Enter submit · Shift-Enter/Ctrl-J newline · Esc cancel"), innerWidth, ELLIPSIS$5);
 		const contentLines = [
-			truncateToWidth(chalk.hex(colors.textStrong).bold("Edit upcoming goal"), innerWidth, ELLIPSIS$5),
+			title,
 			"",
-			truncateToWidth(chalk.hex(this.error === void 0 ? colors.textDim : colors.warning)(this.error ?? "Update the queued objective."), innerWidth, ELLIPSIS$5),
+			subtitle,
 			"",
-			this.input.render(innerWidth)[0] ?? "> ",
+			...inputLines,
 			"",
-			truncateToWidth(chalk.hex(colors.textDim)("Enter submit · Esc cancel"), innerWidth, ELLIPSIS$5)
+			footer
 		];
 		const lines = [
 			"",
@@ -130058,6 +130231,261 @@ var GoalQueueEditDialogComponent = class extends Container {
 		});
 	}
 };
+var MultilineGoalInput = class {
+	focused = false;
+	onSubmit;
+	value = "";
+	cursor = 0;
+	pasteBuffer;
+	getValue() {
+		return this.value;
+	}
+	setValue(value) {
+		this.value = normalizeNewlines(value);
+		this.cursor = this.value.length;
+	}
+	handleInput(data) {
+		if (this.handleBracketedPaste(data)) return;
+		if (isNewlineInput(data)) {
+			this.insert("\n");
+			return;
+		}
+		if (matchesKey(data, Key.enter) || matchesKey(data, Key.return)) {
+			this.onSubmit?.(this.value);
+			return;
+		}
+		if (matchesKey(data, Key.backspace)) {
+			this.deleteBeforeCursor();
+			return;
+		}
+		if (matchesKey(data, Key.delete)) {
+			this.deleteAfterCursor();
+			return;
+		}
+		if (matchesKey(data, Key.left)) {
+			this.cursor = previousGraphemeStart(this.value, this.cursor);
+			return;
+		}
+		if (matchesKey(data, Key.right)) {
+			this.cursor = nextGraphemeEnd(this.value, this.cursor);
+			return;
+		}
+		if (matchesKey(data, Key.up)) {
+			this.moveVertical(-1);
+			return;
+		}
+		if (matchesKey(data, Key.down)) {
+			this.moveVertical(1);
+			return;
+		}
+		if (matchesKey(data, Key.home) || matchesKey(data, Key.ctrl("a"))) {
+			this.cursor = this.currentLineStart();
+			return;
+		}
+		if (matchesKey(data, Key.end) || matchesKey(data, Key.ctrl("e"))) {
+			this.cursor = this.currentLineEnd();
+			return;
+		}
+		const decoded = printableChar(data);
+		if (isPrintableText(decoded)) this.insert(decoded);
+	}
+	invalidate() {}
+	render(width) {
+		const safeWidth = Math.max(4, width);
+		const logicalLines = this.value.split("\n");
+		const cursor = this.cursorLocation();
+		const range = visibleLineRange(logicalLines.length, cursor.line);
+		const rendered = [];
+		if (range.start > 0) rendered.push(padInputLine(`  ${ELLIPSIS$5} ${String(range.start)} previous`, safeWidth));
+		for (let lineIndex = range.start; lineIndex < range.end; lineIndex++) {
+			const line = logicalLines[lineIndex] ?? "";
+			const prefix = lineIndex === 0 ? "> " : "  ";
+			rendered.push(lineIndex === cursor.line ? renderCursorLine(line, cursor.column, prefix, safeWidth, this.focused) : renderTextLine(line, prefix, safeWidth));
+		}
+		const remaining = logicalLines.length - range.end;
+		if (remaining > 0) rendered.push(padInputLine(`  ${ELLIPSIS$5} ${String(remaining)} more`, safeWidth));
+		return rendered;
+	}
+	insert(text) {
+		const normalized = normalizeNewlines(text);
+		this.value = this.value.slice(0, this.cursor) + normalized + this.value.slice(this.cursor);
+		this.cursor += normalized.length;
+	}
+	deleteBeforeCursor() {
+		if (this.cursor === 0) return;
+		const start = previousGraphemeStart(this.value, this.cursor);
+		this.value = this.value.slice(0, start) + this.value.slice(this.cursor);
+		this.cursor = start;
+	}
+	deleteAfterCursor() {
+		if (this.cursor >= this.value.length) return;
+		const end = nextGraphemeEnd(this.value, this.cursor);
+		this.value = this.value.slice(0, this.cursor) + this.value.slice(end);
+	}
+	moveVertical(delta) {
+		const starts = lineStarts(this.value);
+		const location = this.cursorLocation(starts);
+		const targetLine = location.line + delta;
+		if (targetLine < 0 || targetLine >= starts.length) return;
+		const targetStart = starts[targetLine] ?? 0;
+		const targetEnd = lineEndForStart(this.value, starts, targetLine);
+		this.cursor = Math.min(targetStart + location.column, targetEnd);
+	}
+	currentLineStart() {
+		return this.value.lastIndexOf("\n", Math.max(0, this.cursor - 1)) + 1;
+	}
+	currentLineEnd() {
+		return lineEndAt(this.value, this.cursor);
+	}
+	cursorLocation(starts = lineStarts(this.value)) {
+		let line = 0;
+		for (let i = 0; i < starts.length; i++) {
+			if ((starts[i] ?? 0) > this.cursor) break;
+			line = i;
+		}
+		const lineStart = starts[line] ?? 0;
+		return {
+			line,
+			column: this.cursor - lineStart
+		};
+	}
+	handleBracketedPaste(data) {
+		if (this.pasteBuffer !== void 0) {
+			this.appendPasteChunk(data);
+			return true;
+		}
+		const start = data.indexOf(BRACKET_PASTE_START$1);
+		if (start === -1) return false;
+		this.pasteBuffer = "";
+		const before = data.slice(0, start);
+		if (isPrintableText(before)) this.insert(before);
+		this.appendPasteChunk(data.slice(start + 6));
+		return true;
+	}
+	appendPasteChunk(data) {
+		if (this.pasteBuffer === void 0) return;
+		this.pasteBuffer += data;
+		const end = this.pasteBuffer.indexOf(BRACKET_PASTE_END$1);
+		if (end === -1) return;
+		const pasted = this.pasteBuffer.slice(0, end);
+		const remaining = this.pasteBuffer.slice(end + 6);
+		this.pasteBuffer = void 0;
+		this.insert(sanitizePastedText(pasted));
+		if (remaining.length > 0) this.handleInput(remaining);
+	}
+};
+function isNewlineInput(data) {
+	return data === "\n" || data === SHIFT_ENTER_LEGACY || data === SHIFT_ENTER_CSI || matchesKey(data, Key.ctrl("j"));
+}
+function normalizeNewlines(text) {
+	return text.replaceAll("\r\n", "\n").replaceAll("\r", "\n");
+}
+function formatListObjective(objective) {
+	return objective.replaceAll(/\s+/g, " ").trim();
+}
+function sanitizePastedText(text) {
+	const normalized = normalizeNewlines(text).replaceAll(ANSI_CSI, "");
+	let out = "";
+	for (let i = 0; i < normalized.length;) {
+		const code = normalized.codePointAt(i);
+		if (code === void 0) break;
+		const char = String.fromCodePoint(code);
+		if (char === "\n" || isPrintableText(char)) out += char;
+		i += code > 65535 ? 2 : 1;
+	}
+	return out;
+}
+function isPrintableText(text) {
+	if (text.length === 0) return false;
+	for (let i = 0; i < text.length;) {
+		const code = text.codePointAt(i);
+		if (code === void 0) return false;
+		if (code < 32 || code === 127 || code >= 128 && code <= 159) return false;
+		i += code > 65535 ? 2 : 1;
+	}
+	return true;
+}
+function lineStarts(text) {
+	const starts = [0];
+	for (let i = 0; i < text.length; i++) if (text[i] === "\n") starts.push(i + 1);
+	return starts;
+}
+function lineEndAt(text, offset) {
+	const end = text.indexOf("\n", offset);
+	return end === -1 ? text.length : end;
+}
+function lineEndForStart(text, starts, line) {
+	const nextStart = starts[line + 1];
+	return nextStart === void 0 ? text.length : nextStart - 1;
+}
+function previousGraphemeStart(text, offset) {
+	if (offset <= 0) return 0;
+	let previous = 0;
+	for (const segment of SEGMENTER.segment(text.slice(0, offset))) previous = segment.index;
+	return previous;
+}
+function nextGraphemeEnd(text, offset) {
+	if (offset >= text.length) return text.length;
+	const segment = SEGMENTER.segment(text.slice(offset))[Symbol.iterator]().next().value;
+	return segment === void 0 ? text.length : offset + segment.segment.length;
+}
+function visibleLineRange(totalLines, cursorLine) {
+	if (totalLines <= MAX_EDIT_INPUT_LINES) return {
+		start: 0,
+		end: totalLines
+	};
+	const half = Math.floor(MAX_EDIT_INPUT_LINES / 2);
+	const start = Math.min(Math.max(0, cursorLine - half), Math.max(0, totalLines - MAX_EDIT_INPUT_LINES));
+	return {
+		start,
+		end: start + MAX_EDIT_INPUT_LINES
+	};
+}
+function renderTextLine(line, prefix, width) {
+	const prefixWidth = visibleWidth(prefix);
+	return padInputLine(prefix + truncateToWidth(line, Math.max(1, width - prefixWidth), ELLIPSIS$5), width);
+}
+function renderCursorLine(line, column, prefix, width, focused) {
+	const prefixWidth = visibleWidth(prefix);
+	const textWidth = Math.max(1, width - prefixWidth);
+	const cursorEnd = nextGraphemeEnd(line, column);
+	const before = line.slice(0, column);
+	const cursorText = line.slice(column, cursorEnd) || " ";
+	const after = line.slice(cursorEnd);
+	const cursorWidth = Math.max(1, visibleWidth(cursorText));
+	const beforeView = takeEndByWidth(before, Math.max(0, textWidth - cursorWidth));
+	const afterView = takeStartByWidth(after, Math.max(0, textWidth - visibleWidth(beforeView) - cursorWidth));
+	const marker = focused ? CURSOR_MARKER : "";
+	return padInputLine(prefix + beforeView + marker + chalk.inverse(cursorText) + afterView, width);
+}
+function takeStartByWidth(text, width) {
+	let out = "";
+	let used = 0;
+	for (const segment of SEGMENTER.segment(text)) {
+		const segmentWidth = visibleWidth(segment.segment);
+		if (used + segmentWidth > width) break;
+		out += segment.segment;
+		used += segmentWidth;
+	}
+	return out;
+}
+function takeEndByWidth(text, width) {
+	let out = "";
+	let used = 0;
+	const segments = [...SEGMENTER.segment(text)];
+	for (let i = segments.length - 1; i >= 0; i--) {
+		const segment = segments[i];
+		if (segment === void 0) continue;
+		const segmentWidth = visibleWidth(segment.segment);
+		if (used + segmentWidth > width) break;
+		out = segment.segment + out;
+		used += segmentWidth;
+	}
+	return out;
+}
+function padInputLine(line, width) {
+	return line + " ".repeat(Math.max(0, width - visibleWidth(line)));
+}
 //#endregion
 //#region src/tui/constant/rendering.ts
 const BRAILLE_SPINNER_FRAMES = [
@@ -130088,6 +130516,9 @@ const WRAP_WIDTH = 72;
 const MAX_OBJECTIVE_LINES = 6;
 const MAX_CRITERION_LINES = 3;
 const LABEL_WIDTH = 11;
+function renderLifecycleLine(label, colors) {
+	return ["", chalk.hex(colors.primary).bold(STATUS_BULLET) + chalk.hex(colors.primary).bold(label)];
+}
 /**
 * The "Goal set" confirmation shown after `/goal <objective>`. The objective is
 * rendered as the following user prompt, so this message only marks the state
@@ -130100,7 +130531,17 @@ var GoalSetMessageComponent = class {
 	}
 	invalidate() {}
 	render(_width) {
-		return ["", chalk.hex(this.colors.primary).bold(STATUS_BULLET) + chalk.hex(this.colors.primary).bold("Goal set")];
+		return renderLifecycleLine("Goal set", this.colors);
+	}
+};
+var UpcomingGoalAddedMessageComponent = class {
+	colors;
+	constructor(colors) {
+		this.colors = colors;
+	}
+	invalidate() {}
+	render(_width) {
+		return renderLifecycleLine("Upcoming goal added. It will start after the current goal is complete.", this.colors);
 	}
 };
 var GoalCompletionMessageComponent = class {
@@ -130184,7 +130625,7 @@ function statusHex(status, colors) {
 		case "active": return colors.primary;
 		case "complete": return colors.success;
 		case "blocked": return colors.warning;
-		default: return colors.textDim;
+		case "paused": return colors.textDim;
 	}
 }
 function formatElapsed$1(ms) {
@@ -130197,7 +130638,7 @@ function formatElapsed$1(ms) {
 }
 /** Word-wrap to `width`, capped at `maxLines` (last line gets an ellipsis when clipped). */
 function wrap$1(text, width, maxLines) {
-	const words = text.replace(/\s+/g, " ").trim().split(" ");
+	const words = text.replaceAll(/\s+/g, " ").trim().split(" ");
 	const lines = [];
 	let current = "";
 	for (const word of words) {
@@ -130319,10 +130760,8 @@ async function readQueueFile(session) {
 	let parsed;
 	try {
 		parsed = JSON.parse(raw);
-	} catch {
-		const empty = emptyQueueFile();
-		await writeQueueFile(session, empty);
-		return empty;
+	} catch (error) {
+		throw new KimiError(ErrorCodes.CONFIG_INVALID, `Invalid JSON in goal queue: ${describeError(error)}`);
 	}
 	if (!isGoalQueueFile(parsed)) {
 		const empty = emptyQueueFile();
@@ -130390,10 +130829,14 @@ function timestampAfter(previous) {
 function isErrno(error, code) {
 	return isRecord$4(error) && error["code"] === code;
 }
+function describeError(error) {
+	return error instanceof Error ? error.message : String(error);
+}
 //#endregion
 //#region src/tui/commands/goal.ts
 const MAX_GOAL_OBJECTIVE_LENGTH = 4e3;
 const RESUME_GOAL_INPUT = "Resume the active goal.";
+const START_NEXT_GOAL_NOW_MESSAGE = "No active goal. Starting this goal now.";
 const CONTROL_SUBCOMMANDS = new Set([
 	"pause",
 	"resume",
@@ -130488,14 +130931,34 @@ function parseNextGoalCommand(tokens) {
 	};
 }
 async function queueNextGoal(host, parsed) {
+	const session = host.requireSession();
+	let hasCurrentGoal;
 	try {
-		await appendGoalQueueItem(host.requireSession(), { objective: parsed.objective });
+		const { goal } = await session.getGoal();
+		hasCurrentGoal = goal !== null;
+	} catch (error) {
+		host.showError(`Failed to inspect current goal: ${formatErrorMessage$2(error)}`);
+		return;
+	}
+	if (!hasCurrentGoal && !isBusy(host)) {
+		host.showStatus(START_NEXT_GOAL_NOW_MESSAGE);
+		await createGoal(host, {
+			kind: "create",
+			objective: parsed.objective,
+			replace: false
+		}, `next ${parsed.objective}`);
+		return;
+	}
+	try {
+		await appendGoalQueueItem(session, { objective: parsed.objective });
 	} catch (error) {
 		host.showError(formatErrorMessage$2(error));
 		return;
 	}
 	host.track("goal_queue_append");
-	host.showStatus("Upcoming goal added. It will start after the current goal is complete.");
+	if (!hasCurrentGoal) host.requestQueuedGoalPromotion?.();
+	host.state.transcriptContainer.addChild(new UpcomingGoalAddedMessageComponent(host.state.theme.colors));
+	host.state.ui.requestRender();
 }
 async function showGoalQueueManager(host, selectedGoalId) {
 	let snapshot;
@@ -130585,7 +131048,7 @@ async function createGoal(host, parsed, rawArgs, options = {}) {
 		host.showError(LLM_NOT_SET_MESSAGE);
 		return false;
 	}
-	if (host.state.appState.permissionMode === "manual") {
+	if (host.state.appState.permissionMode === "manual" || host.state.appState.permissionMode === "yolo") {
 		showGoalStartPermissionPrompt(host, parsed, rawArgs ?? parsed.objective, options);
 		return false;
 	}
@@ -130599,6 +131062,7 @@ function showGoalStartPermissionPrompt(host, parsed, rawArgs, options) {
 	};
 	host.mountEditorReplacement(new GoalStartPermissionPromptComponent({
 		colors: host.state.theme.colors,
+		mode: host.state.appState.permissionMode === "yolo" ? "yolo" : "manual",
 		onSelect: (choice) => {
 			if (choice === "cancel") {
 				cancelStart();
@@ -130611,7 +131075,7 @@ function showGoalStartPermissionPrompt(host, parsed, rawArgs, options) {
 	}));
 }
 async function startGoalWithPermission(host, parsed, choice, options) {
-	if (choice === "auto" || choice === "yolo") {
+	if (choice !== host.state.appState.permissionMode && (choice === "auto" || choice === "yolo")) {
 		if (!await setPermissionForGoal(host, choice)) return;
 	}
 	await startGoal(host, parsed, options);
@@ -130644,7 +131108,8 @@ async function startGoal(host, parsed, options) {
 	host.track("goal_create", { replace: parsed.replace });
 	host.state.transcriptContainer.addChild(new GoalSetMessageComponent(host.state.theme.colors));
 	host.state.ui.requestRender();
-	(options.sendInput ?? host.sendNormalUserInput)(parsed.objective);
+	if (options.sendInput !== void 0) options.sendInput(parsed.objective);
+	else host.sendNormalUserInput(parsed.objective);
 	return true;
 }
 async function pauseGoal(host) {
@@ -130711,6 +131176,9 @@ async function showGoalStatus(host) {
 function isStreaming(host) {
 	return host.state.appState.streamingPhase !== "idle";
 }
+function isBusy(host) {
+	return isStreaming(host) || host.state.appState.isCompacting;
+}
 //#endregion
 //#region src/tui/components/dialogs/custom-registry-import.ts
 /**
@@ -137226,7 +137694,7 @@ var HelpPanelComponent = class extends Container {
 		const slashColor = chalk.hex(colors.primary);
 		const shortcuts = this.opts.shortcuts ?? DEFAULT_KEYBOARD_SHORTCUTS;
 		const kbdWidth = Math.max(8, ...shortcuts.map((s) => s.keys.length));
-		const sortedCmds = [...this.opts.commands].toSorted((a, b) => a.name.localeCompare(b.name));
+		const sortedCmds = [...this.opts.commands].toSorted(compareSlashCommandsForDisplay);
 		const cmdLabels = sortedCmds.map((c) => {
 			const aliases = c.aliases.length > 0 ? ` (${c.aliases.map((a) => "/" + a).join(", ")})` : "";
 			return `/${c.name}${aliases}`;
@@ -137265,6 +137733,12 @@ var HelpPanelComponent = class extends Container {
 		return lines.map((line) => truncateToWidth(line, width));
 	}
 };
+function compareSlashCommandsForDisplay(a, b) {
+	return getSlashCommandDisplayGroup(a.name) - getSlashCommandDisplayGroup(b.name) || a.name.localeCompare(b.name);
+}
+function getSlashCommandDisplayGroup(name) {
+	return name.startsWith("skill:") ? 1 : 0;
+}
 //#endregion
 //#region src/tui/components/dialogs/question-dialog.ts
 /**
@@ -138039,15 +138513,23 @@ function readCustomRegistrySource(provider) {
 function asManaged(config) {
 	return config;
 }
-function collectModelIdsForProvider(config, providerId) {
+function collectModelIdsForAliases(config, aliasKeys) {
 	const ids = /* @__PURE__ */ new Set();
-	for (const alias of Object.values(config.models ?? {})) if (alias.provider === providerId && alias.model.length > 0) ids.add(alias.model);
+	for (const aliasKey of aliasKeys) {
+		const alias = config.models?.[aliasKey];
+		if (alias !== void 0 && alias.model.length > 0) ids.add(alias.model);
+	}
 	return ids;
 }
-function setsEqual(a, b) {
-	if (a.size !== b.size) return false;
-	for (const item of a) if (!b.has(item)) return false;
-	return true;
+function providerAliasKeys(config, providerId) {
+	const keys = /* @__PURE__ */ new Set();
+	for (const [alias, model] of Object.entries(config.models ?? {})) if (model.provider === providerId) keys.add(alias);
+	return keys;
+}
+function generatedProviderAliasKeys(config, providerId, aliasPrefix) {
+	const keys = /* @__PURE__ */ new Set();
+	for (const [alias, model] of Object.entries(config.models ?? {})) if (model.provider === providerId && alias.startsWith(aliasPrefix)) keys.add(alias);
+	return keys;
 }
 function computeChanges(oldIds, newIds) {
 	let added = 0;
@@ -138059,6 +138541,56 @@ function computeChanges(oldIds, newIds) {
 		removed
 	};
 }
+function providerModelSnapshot(config, providerId, aliasKeys) {
+	const snapshots = [];
+	for (const alias of aliasKeys) {
+		const model = config.models?.[alias];
+		if (model === void 0 || model.provider !== providerId) continue;
+		snapshots.push({
+			alias,
+			model: {
+				...model,
+				capabilities: model.capabilities === void 0 ? void 0 : model.capabilities.toSorted()
+			}
+		});
+	}
+	snapshots.sort((a, b) => a.alias.localeCompare(b.alias));
+	return JSON.stringify(snapshots);
+}
+function providerModelsEqual(config, nextConfig, providerId, aliasKeys) {
+	return providerModelSnapshot(config, providerId, aliasKeys) === providerModelSnapshot(nextConfig, providerId, aliasKeys);
+}
+function providerRefreshAliasKeys(config, nextConfig, providerId, aliasPrefix) {
+	const keys = generatedProviderAliasKeys(config, providerId, aliasPrefix);
+	for (const key of providerAliasKeys(nextConfig, providerId)) keys.add(key);
+	return keys;
+}
+function preserveUserProviderAliases(config, providerId, refreshedAliasKeys) {
+	const preserved = {};
+	for (const [alias, model] of Object.entries(config.models ?? {})) {
+		if (model.provider !== providerId || refreshedAliasKeys.has(alias)) continue;
+		preserved[alias] = structuredClone(model);
+	}
+	return preserved;
+}
+function restoreProviderAliases(config, aliases) {
+	if (Object.keys(aliases).length === 0) return;
+	config.models = {
+		...config.models,
+		...aliases
+	};
+}
+function restoreDefaultSelection(config, defaultModel, defaultThinking) {
+	if (defaultModel === void 0 || config.models?.[defaultModel] === void 0) return;
+	config.defaultModel = defaultModel;
+	config.defaultThinking = defaultThinking;
+}
+function clampDanglingDefault(config) {
+	if (config.defaultModel !== void 0 && config.models?.[config.defaultModel] === void 0) {
+		config.defaultModel = void 0;
+		config.defaultThinking = void 0;
+	}
+}
 function pickDefaultModel(config, providerId, models) {
 	const firstModel = models[0];
 	if (firstModel === void 0) return "";
@@ -138088,25 +138620,27 @@ async function refreshAllProviderModels(host) {
 			baseUrl: auth.baseUrl
 		});
 		if (models.length > 0) {
-			const beforeIds = collectModelIdsForProvider(config, KIMI_CODE_PROVIDER_NAME);
-			const newIds = new Set(models.map((m) => m.id));
-			if (setsEqual(beforeIds, newIds)) unchanged.push(KIMI_CODE_PROVIDER_NAME);
+			const next = structuredClone(config);
+			applyManagedKimiCodeConfig(asManaged(next), {
+				models,
+				baseUrl: auth.baseUrl,
+				oauthKey: auth.oauthRef.key,
+				oauthHost: auth.oauthRef.oauthHost,
+				preserveDefaultModel: true
+			});
+			const refreshedAliasKeys = providerRefreshAliasKeys(config, next, KIMI_CODE_PROVIDER_NAME, `${KIMI_CODE_PLATFORM_ID}/`);
+			restoreProviderAliases(next, preserveUserProviderAliases(config, KIMI_CODE_PROVIDER_NAME, refreshedAliasKeys));
+			restoreDefaultSelection(next, config.defaultModel, config.defaultThinking);
+			clampDanglingDefault(next);
+			if (providerModelsEqual(config, next, "managed:kimi-code", refreshedAliasKeys)) unchanged.push(KIMI_CODE_PROVIDER_NAME);
 			else {
-				const { added, removed } = computeChanges(beforeIds, newIds);
-				config = await host.removeProvider(KIMI_CODE_PROVIDER_NAME);
-				clearManagedKimiCodeConfig(asManaged(config));
-				applyManagedKimiCodeConfig(asManaged(config), {
-					models,
-					baseUrl: auth.baseUrl,
-					oauthKey: auth.oauthRef.key,
-					oauthHost: auth.oauthRef.oauthHost,
-					preserveDefaultModel: true
-				});
-				await host.setConfig({
-					providers: config.providers,
-					models: config.models,
-					defaultModel: config.defaultModel,
-					defaultThinking: config.defaultThinking
+				const { added, removed } = computeChanges(collectModelIdsForAliases(config, refreshedAliasKeys), collectModelIdsForAliases(next, refreshedAliasKeys));
+				await host.removeProvider(KIMI_CODE_PROVIDER_NAME);
+				config = await host.setConfig({
+					providers: next.providers,
+					models: next.models,
+					defaultModel: next.defaultModel,
+					defaultThinking: next.defaultThinking
 				});
 				changed.push({
 					providerId: KIMI_CODE_PROVIDER_NAME,
@@ -138134,28 +138668,30 @@ async function refreshAllProviderModels(host) {
 			let models = await fetchOpenPlatformModels(platform, apiKey);
 			models = filterModelsByPrefix(models, platform);
 			if (models.length === 0) continue;
-			const beforeIds = collectModelIdsForProvider(config, providerId);
-			const newIds = new Set(models.map((m) => m.id));
-			if (setsEqual(beforeIds, newIds)) unchanged.push(providerId);
+			const selectedModelId = pickDefaultModel(config, providerId, models);
+			const selectedModel = models.find((m) => m.id === selectedModelId);
+			if (selectedModel === void 0) continue;
+			const next = structuredClone(config);
+			applyOpenPlatformConfig(asManaged(next), {
+				platform,
+				models,
+				selectedModel,
+				thinking: false,
+				apiKey
+			});
+			const refreshedAliasKeys = providerRefreshAliasKeys(config, next, providerId, `${providerId}/`);
+			restoreProviderAliases(next, preserveUserProviderAliases(config, providerId, refreshedAliasKeys));
+			restoreDefaultSelection(next, config.defaultModel, config.defaultThinking);
+			clampDanglingDefault(next);
+			if (providerModelsEqual(config, next, providerId, refreshedAliasKeys)) unchanged.push(providerId);
 			else {
-				const { added, removed } = computeChanges(beforeIds, newIds);
-				const selectedModelId = pickDefaultModel(config, providerId, models);
-				const selectedModel = models.find((m) => m.id === selectedModelId);
-				if (selectedModel === void 0) continue;
-				config = await host.removeProvider(providerId);
-				removeOpenPlatformConfig(asManaged(config), providerId);
-				applyOpenPlatformConfig(asManaged(config), {
-					platform,
-					models,
-					selectedModel,
-					thinking: false,
-					apiKey
-				});
-				await host.setConfig({
-					providers: config.providers,
-					models: config.models,
-					defaultModel: config.defaultModel,
-					defaultThinking: config.defaultThinking
+				const { added, removed } = computeChanges(collectModelIdsForAliases(config, refreshedAliasKeys), collectModelIdsForAliases(next, refreshedAliasKeys));
+				await host.removeProvider(providerId);
+				config = await host.setConfig({
+					providers: next.providers,
+					models: next.models,
+					defaultModel: next.defaultModel,
+					defaultThinking: next.defaultThinking
 				});
 				changed.push({
 					providerId,
@@ -138187,20 +138723,18 @@ async function refreshAllProviderModels(host) {
 	}
 	for (const { source, providerIds } of customSources.values()) try {
 		const entries = await fetchCustomRegistry(source);
-		let changedAny = false;
+		const next = structuredClone(config);
+		const changedProviders = [];
 		for (const providerId of providerIds) {
 			const entry = entries[providerId];
 			if (entry === void 0) continue;
-			const beforeIds = collectModelIdsForProvider(config, providerId);
-			const newIds = new Set(Object.values(entry.models).map((m) => m.id));
-			if (setsEqual(beforeIds, newIds)) unchanged.push(providerId);
+			applyCustomRegistryProvider(asManaged(next), entry, source);
+			const refreshedAliasKeys = providerRefreshAliasKeys(config, next, providerId, `${providerId}/`);
+			restoreProviderAliases(next, preserveUserProviderAliases(config, providerId, refreshedAliasKeys));
+			if (providerModelsEqual(config, next, providerId, refreshedAliasKeys)) unchanged.push(providerId);
 			else {
-				const { added, removed } = computeChanges(beforeIds, newIds);
-				config = await host.removeProvider(providerId);
-				removeCustomRegistryProvider(asManaged(config), providerId);
-				applyCustomRegistryProvider(asManaged(config), entry, source);
-				changedAny = true;
-				changed.push({
+				const { added, removed } = computeChanges(collectModelIdsForAliases(config, refreshedAliasKeys), collectModelIdsForAliases(next, refreshedAliasKeys));
+				changedProviders.push({
 					providerId,
 					providerName: entry.name || providerId,
 					added,
@@ -138208,10 +138742,18 @@ async function refreshAllProviderModels(host) {
 				});
 			}
 		}
-		if (changedAny) await host.setConfig({
-			providers: config.providers,
-			models: config.models
-		});
+		if (changedProviders.length > 0) {
+			restoreDefaultSelection(next, config.defaultModel, config.defaultThinking);
+			clampDanglingDefault(next);
+			for (const { providerId } of changedProviders) await host.removeProvider(providerId);
+			config = await host.setConfig({
+				providers: next.providers,
+				models: next.models,
+				defaultModel: next.defaultModel,
+				defaultThinking: next.defaultThinking
+			});
+			for (const change of changedProviders) changed.push(change);
+		}
 	} catch (error) {
 		for (const providerId of providerIds) failed.push({
 			provider: providerId,
@@ -140159,6 +140701,7 @@ var SessionEventHandler = class {
 	goalCompletionAwaitingClear = false;
 	goalCompletionTurnEnded = false;
 	queuedGoalPromotionPending = false;
+	queuedGoalPromotionInFlight = false;
 	queuedGoalPromotionTimer;
 	resetRuntimeState() {
 		this.backgroundAgentMetadata.clear();
@@ -140171,6 +140714,7 @@ var SessionEventHandler = class {
 		this.goalCompletionAwaitingClear = false;
 		this.goalCompletionTurnEnded = false;
 		this.queuedGoalPromotionPending = false;
+		this.queuedGoalPromotionInFlight = false;
 		this.clearQueuedGoalPromotionTimer();
 		this.stopAllMcpServerStatusSpinners();
 	}
@@ -140630,14 +141174,25 @@ var SessionEventHandler = class {
 	}
 	scheduleQueuedGoalPromotion() {
 		if (!this.queuedGoalPromotionPending || !this.goalCompletionTurnEnded) return;
+		if (this.queuedGoalPromotionInFlight) return;
 		if (this.queuedGoalPromotionTimer !== void 0) return;
 		this.queuedGoalPromotionTimer = setTimeout(() => {
 			this.queuedGoalPromotionTimer = void 0;
 			if (!this.queuedGoalPromotionPending || !this.goalCompletionTurnEnded) return;
-			if (this.host.state.appState.streamingPhase !== "idle" || this.host.state.queuedMessages.length > 0) return;
-			this.queuedGoalPromotionPending = false;
-			this.goalCompletionTurnEnded = false;
-			this.promoteNextQueuedGoal();
+			if (this.queuedGoalPromotionInFlight) return;
+			if (!this.isReadyForQueuedGoalPromotion()) return;
+			this.queuedGoalPromotionInFlight = true;
+			this.promoteNextQueuedGoal().then((complete) => {
+				if (complete) {
+					this.queuedGoalPromotionPending = false;
+					this.goalCompletionTurnEnded = false;
+					return;
+				}
+				this.goalCompletionTurnEnded = false;
+			}).finally(() => {
+				this.queuedGoalPromotionInFlight = false;
+				this.scheduleQueuedGoalPromotion();
+			});
 		}, 0);
 	}
 	clearQueuedGoalPromotionTimer() {
@@ -140645,50 +141200,72 @@ var SessionEventHandler = class {
 		clearTimeout(this.queuedGoalPromotionTimer);
 		this.queuedGoalPromotionTimer = void 0;
 	}
+	requestQueuedGoalPromotion() {
+		this.queuedGoalPromotionPending = true;
+		this.goalCompletionTurnEnded = true;
+		this.scheduleQueuedGoalPromotion();
+	}
+	retryQueuedGoalPromotion() {
+		this.scheduleQueuedGoalPromotion();
+	}
+	isReadyForQueuedGoalPromotion(session) {
+		return (session === void 0 || this.host.session === session) && !this.host.aborted && this.host.state.appState.streamingPhase === "idle" && this.host.state.queuedMessages.length === 0;
+	}
 	async promoteNextQueuedGoal() {
 		const { host } = this;
 		const session = host.session;
-		if (session === void 0 || host.aborted) return;
+		if (session === void 0 || host.aborted) return true;
 		let queue;
 		try {
 			queue = await readGoalQueue(session);
 		} catch (error) {
 			host.showError(`Failed to read upcoming goals: ${formatErrorMessage$2(error)}`);
-			return;
+			return false;
 		}
-		if (host.session !== session || host.aborted) return;
+		if (host.session !== session || host.aborted) return true;
 		const next = queue.goals[0];
-		if (next === void 0) return;
-		await createGoal(host, {
+		if (next === void 0) return true;
+		if (!this.isReadyForQueuedGoalPromotion(session)) return false;
+		return await createGoal(host, {
 			kind: "create",
 			objective: next.objective,
 			replace: false
 		}, next.objective, {
 			beforeSend: async () => {
-				if (host.session !== session || host.aborted) return false;
+				if (!this.isReadyForQueuedGoalPromotion(session)) {
+					await this.cancelStartedQueuedGoal(session);
+					return false;
+				}
 				try {
 					await removeGoalQueueItem(session, { goalId: next.id });
 				} catch (error) {
 					host.showError(`Queued goal started, but could not be removed from the queue: ${formatErrorMessage$2(error)}`);
+					await this.cancelStartedQueuedGoal(session);
 					return false;
 				}
-				if (host.session === session && !host.aborted) return true;
-				try {
-					await restoreGoalQueueItem(session, next);
-				} catch (error) {
-					host.showError(`Queued goal could not be restored: ${formatErrorMessage$2(error)}`);
-				}
-				try {
-					await session.cancelGoal();
-				} catch (error) {
-					host.showError(`Queued goal could not be cancelled: ${formatErrorMessage$2(error)}`);
-				}
+				if (this.isReadyForQueuedGoalPromotion(session)) return true;
+				await this.restoreAndCancelStartedQueuedGoal(session, next);
 				return false;
 			},
 			sendInput: (objective) => {
 				host.sendQueuedMessage(session, { text: objective });
 			}
-		});
+		}) || host.session !== session || host.aborted;
+	}
+	async restoreAndCancelStartedQueuedGoal(session, goal) {
+		try {
+			await restoreGoalQueueItem(session, goal);
+		} catch (error) {
+			this.host.showError(`Queued goal could not be restored: ${formatErrorMessage$2(error)}`);
+		}
+		await this.cancelStartedQueuedGoal(session);
+	}
+	async cancelStartedQueuedGoal(session) {
+		try {
+			await session.cancelGoal();
+		} catch (error) {
+			this.host.showError(`Queued goal could not be cancelled: ${formatErrorMessage$2(error)}`);
+		}
 	}
 	async notifyQueuedGoalWaitingOnBlocked() {
 		const { host } = this;
@@ -140718,7 +141295,7 @@ var SessionEventHandler = class {
 			this.host.showError(OAUTH_LOGIN_REQUIRED_STARTUP_NOTICE);
 			return;
 		}
-		this.host.showError(`[${event.code}] ${event.message}`);
+		this.host.showError(formatErrorPayload(event));
 		if (this.host.state.appState.sessionId.length > 0) this.host.showStatus(errorReportHintLine());
 	}
 	handleSessionWarning(event) {
@@ -143303,8 +143880,13 @@ var FileMentionProvider = class {
 		this.inner = new CombinedAutocompleteProvider(slashCommands, workDir, fdPath);
 	}
 	async getSuggestions(lines, cursorLine, cursorCol, options) {
-		const atPrefix = extractAtPrefix((lines[cursorLine] ?? "").slice(0, cursorCol));
-		if (atPrefix === null) return this.inner.getSuggestions(lines, cursorLine, cursorCol, options);
+		const currentLine = lines[cursorLine] ?? "";
+		const textBeforeCursor = currentLine.slice(0, cursorCol);
+		const atPrefix = extractAtPrefix(textBeforeCursor);
+		if (atPrefix === null) {
+			if (shouldSuppressSlashArgumentCompletion(textBeforeCursor, currentLine.slice(cursorCol), options.force)) return null;
+			return this.inner.getSuggestions(lines, cursorLine, cursorCol, options);
+		}
 		if (this.fdPath !== null) return this.inner.getSuggestions(lines, cursorLine, cursorCol, options);
 		const snapshot = this.gitCache.getSnapshot();
 		if (snapshot === null || snapshot.files.length === 0) return this.inner.getSuggestions(lines, cursorLine, cursorCol, options);
@@ -143336,6 +143918,12 @@ function extractAtPrefix(text) {
 	if (text[tokenStart] !== "@") return null;
 	return text.slice(tokenStart);
 }
+function shouldSuppressSlashArgumentCompletion(textBeforeCursor, textAfterCursor, force) {
+	if (force === true) return false;
+	if (!textBeforeCursor.startsWith("/")) return false;
+	if (!textBeforeCursor.includes(" ")) return false;
+	return textAfterCursor.trimStart().length > 0;
+}
 /** True when any path segment starts with a dot (e.g. `.github/x.yml`). */
 function containsDotSegment(path) {
 	for (const segment of path.split("/")) if (segment.startsWith(".")) return true;
@@ -145027,6 +145615,7 @@ var CustomEditor = class extends Editor {
 };
 /**
 * Return a copy of `line` with the first `/token` coloured using `hex`.
+* For `/goal next manage`, also colour the command-path tokens.
 * `line` may already contain SGR escapes (cursor inverse, etc.); we
 * locate `/` via visible-index math so ANSI pass-through survives.
 * Returns `undefined` if no token is found.
@@ -145042,13 +145631,48 @@ function highlightFirstSlashToken(line, hex) {
 		if (ch === " " || ch === "	") break;
 		endVisible++;
 	}
-	if (visible.slice(slashIdx, endVisible).slice(1).includes("/")) return void 0;
-	const rawStart = mapVisibleIdxToRaw(line, slashIdx);
-	const rawEnd = mapVisibleIdxToRaw(line, endVisible);
-	const before = line.slice(0, rawStart);
-	const token = line.slice(rawStart, rawEnd);
-	const after = line.slice(rawEnd);
-	return before + chalk.hex(hex).bold(token) + after;
+	const visibleToken = visible.slice(slashIdx, endVisible);
+	if (visibleToken.slice(1).includes("/")) return void 0;
+	const ranges = [{
+		start: slashIdx,
+		end: endVisible
+	}];
+	if (visibleToken === "/goal") ranges.push(...goalCommandPathRanges(visible, endVisible));
+	return highlightVisibleRanges(line, ranges, hex);
+}
+function goalCommandPathRanges(visible, commandEnd) {
+	const nextRange = readTokenRange(visible, commandEnd);
+	if (nextRange === null || visible.slice(nextRange.start, nextRange.end) !== "next") return [];
+	const ranges = [nextRange];
+	const manageRange = readTokenRange(visible, nextRange.end);
+	if (manageRange !== null && visible.slice(manageRange.start, manageRange.end) === "manage") ranges.push(manageRange);
+	return ranges;
+}
+function readTokenRange(visible, start) {
+	let tokenStart = start;
+	while (tokenStart < visible.length && isTokenSpace(visible[tokenStart])) tokenStart++;
+	if (tokenStart >= visible.length) return null;
+	let tokenEnd = tokenStart;
+	while (tokenEnd < visible.length && !isTokenSpace(visible[tokenEnd])) tokenEnd++;
+	return {
+		start: tokenStart,
+		end: tokenEnd
+	};
+}
+function isTokenSpace(ch) {
+	return ch === " " || ch === "	";
+}
+function highlightVisibleRanges(line, ranges, hex) {
+	let out = "";
+	let rawCursor = 0;
+	for (const range of ranges) {
+		const rawStart = mapVisibleIdxToRaw(line, range.start);
+		const rawEnd = mapVisibleIdxToRaw(line, range.end);
+		out += line.slice(rawCursor, rawStart);
+		out += chalk.hex(hex).bold(line.slice(rawStart, rawEnd));
+		rawCursor = rawEnd;
+	}
+	return out + line.slice(rawCursor);
 }
 /**
 * Overlay a terminal-style `> ` prompt symbol on the first content line.
@@ -145964,6 +146588,9 @@ var KimiTUI = class {
 			imageAttachmentIds: item.imageAttachmentIds
 		});
 	}
+	requestQueuedGoalPromotion() {
+		this.sessionEventHandler.requestQueuedGoalPromotion();
+	}
 	sendMessageInternal(session, input, options) {
 		const imageAttachmentIds = options?.imageAttachmentIds !== void 0 && options.imageAttachmentIds.length > 0 ? options.imageAttachmentIds : void 0;
 		this.appendTranscriptEntry({
@@ -146065,7 +146692,10 @@ var KimiTUI = class {
 		if ("planMode" in patch) this.updateEditorBorderHighlight();
 		this.state.footer.setState(this.state.appState);
 		this.updateActivityPane();
-		if (busyChanged) this.updateQueueDisplay();
+		if (busyChanged) {
+			this.updateQueueDisplay();
+			this.sessionEventHandler.retryQueuedGoalPromotion();
+		}
 		this.state.ui.requestRender();
 	}
 	patchLivePane(patch) {
@@ -147355,6 +147985,21 @@ async function showPendingBackgroundInstallNotice(state, currentVersion, stdout,
 	await writeUpdateInstallState(nextState).catch(() => {});
 	return nextState;
 }
+/**
+* `KIMI_CODE_NO_AUTO_UPDATE` (or the legacy `KIMI_CLI_NO_AUTO_UPDATE` alias)
+* fully disables the update preflight — no check, no background install, no
+* prompt. Migrated from kimi-cli, where the variable gated all auto-update
+* behavior. Accepts the usual truthy values (`1`/`true`/`yes`/`on`).
+*/
+function isAutoUpdateDisabledByEnv(env = process.env) {
+	const truthy = (value) => [
+		"1",
+		"true",
+		"yes",
+		"on"
+	].includes((value ?? "").trim().toLowerCase());
+	return truthy(env["KIMI_CODE_NO_AUTO_UPDATE"]) || truthy(env["KIMI_CLI_NO_AUTO_UPDATE"]);
+}
 async function shouldAutoInstallUpdates() {
 	try {
 		return (await loadTuiConfig()).upgrade.autoInstall;
@@ -147512,6 +148157,7 @@ async function runUpdatePreflight(currentVersion, options = {}) {
 	const stderr = options.stderr ?? process.stderr;
 	const logger = options.logger ?? log;
 	const platform = process.platform;
+	if (isAutoUpdateDisabledByEnv()) return "continue";
 	try {
 		const isInteractive = options.isTTY ?? (process.stdin.isTTY && process.stdout.isTTY);
 		let installState = await readUpdateInstallState().catch(() => emptyUpdateInstallState());