kfc-code-cli 0.0.1-alpha.6 → 0.0.1-alpha.8

package/dist/main.mjs

@@ -675,8 +675,8 @@ function sanitizeToolCallData(data) {
 		tool_name: data.tool_name,
 		args: data.args,
 		...data.activity_description !== void 0 ? { activity_description: data.activity_description } : {},
-		...data.user_facing_name !== void 0 ? { user_facing_name: data.user_facing_name } : {},
-		...data.input_display !== void 0 ? { input_display: data.input_display } : {}
+		user_facing_name: data.user_facing_name,
+		input_display: data.input_display
 	};
 }
 function toolCallDataToKosongToolCall(data) {
@@ -870,11 +870,11 @@ function extractTextOnly(message) {
 function cloneMessage(message) {
 	return {
 		role: message.role,
-		...message.name !== void 0 ? { name: message.name } : {},
+		name: message.name,
 		content: message.content.map((p) => ({ ...p })),
 		toolCalls: message.toolCalls.map((tc) => ({ ...tc })),
-		...message.toolCallId !== void 0 ? { toolCallId: message.toolCallId } : {},
-		...message.partial !== void 0 ? { partial: message.partial } : {}
+		toolCallId: message.toolCallId,
+		partial: message.partial
 	};
 }
 //#endregion
@@ -892,9 +892,9 @@ function buildToolResultRecord(turnId, parentUuid, toolCallId, normalisedOutput,
 		turn_id: turnId,
 		tool_call_id: toolCallId,
 		output: normalisedOutput,
-		...parentUuid !== void 0 ? { parent_uuid: parentUuid } : {},
-		...result.isError !== void 0 ? { is_error: result.isError } : {},
-		...result.synthetic !== void 0 ? { synthetic: result.synthetic } : {}
+		parent_uuid: parentUuid,
+		is_error: result.isError,
+		synthetic: result.synthetic
 	};
 }
 function buildStepBeginRecord(input) {
@@ -911,8 +911,8 @@ function buildStepEndRecord(input) {
 		uuid: input.uuid,
 		turn_id: input.turnId,
 		step: input.step,
-		...input.usage !== void 0 ? { usage: input.usage } : {},
-		...input.finishReason !== void 0 ? { finish_reason: input.finishReason } : {}
+		usage: input.usage,
+		finish_reason: input.finishReason
 	};
 }
 function buildContentPartRecord(input) {
@@ -986,7 +986,7 @@ function buildCompactionRecord(summary) {
 		pre_compact_tokens: summary.preCompactTokens,
 		post_compact_tokens: summary.postCompactTokens,
 		trigger: summary.trigger,
-		...summary.archiveFile !== void 0 ? { archive_file: summary.archiveFile } : {}
+		archive_file: summary.archiveFile
 	};
 }
 //#endregion
@@ -1006,7 +1006,7 @@ function buildCompactionRecord(summary) {
 var BaseContextState = class {
 	journalWriter;
 	projector;
-	_currentTurnId;
+	currentTurnId;
 	memory;
 	_broken = false;
 	_brokenError;
@@ -1025,12 +1025,12 @@ var BaseContextState = class {
 	constructor(opts) {
 		this.journalWriter = opts.journalWriter;
 		this.projector = opts.projector ?? new DefaultConversationProjector();
-		this._currentTurnId = opts.currentTurnId;
+		this.currentTurnId = opts.currentTurnId;
 		this.memory = new ContextStateMemory({
 			initialModel: opts.initialModel,
 			...opts.initialSystemPrompt !== void 0 ? { initialSystemPrompt: opts.initialSystemPrompt } : {},
 			...opts.initialActiveTools !== void 0 ? { initialActiveTools: opts.initialActiveTools } : {},
-			...opts.initialHistory !== void 0 ? { initialHistory: opts.initialHistory } : {},
+			initialHistory: opts.initialHistory,
 			...opts.initialTokenCount !== void 0 ? { initialTokenCount: opts.initialTokenCount } : {},
 			...opts.initialThinkingLevel !== void 0 ? { initialThinkingLevel: opts.initialThinkingLevel } : {}
 		});
@@ -1053,9 +1053,6 @@ var BaseContextState = class {
 	get beforeStep() {
 		return this.memory.beforeStep;
 	}
-	currentTurnId() {
-		return this._currentTurnId();
-	}
 	buildMessages() {
 		return this.projector.project({
 			history: this.memory.getHistory(),
@@ -1082,10 +1079,10 @@ var BaseContextState = class {
 		await this.journalWriter.append(buildUserMessageRecord(turnId, input));
 		this.memory.appendUserContent(userInputToContentParts(input));
 	}
-	async appendToolResult(parentUuid, toolCallId, result, turnIdOverride) {
+	async appendToolResult(parentUuid, toolCallId, result) {
 		this.assertNotBroken();
 		const normalisedOutput = result.output === void 0 ? null : result.output;
-		const turnId = turnIdOverride ?? this.currentTurnId();
+		const turnId = this.currentTurnId();
 		await this.journalWriter.append(buildToolResultRecord(turnId, parentUuid, toolCallId, normalisedOutput, result));
 		this.memory.appendToolResult(toolCallId, toolResultOutputToContentParts(normalisedOutput));
 	}
@@ -1171,8 +1168,8 @@ var WiredContextState = class extends BaseContextState {
 			...opts.initialSystemPrompt !== void 0 ? { initialSystemPrompt: opts.initialSystemPrompt } : {},
 			...opts.initialActiveTools !== void 0 ? { initialActiveTools: opts.initialActiveTools } : {},
 			currentTurnId: opts.currentTurnId,
-			...opts.projector !== void 0 ? { projector: opts.projector } : {},
-			...opts.initialHistory !== void 0 ? { initialHistory: opts.initialHistory } : {},
+			projector: opts.projector,
+			initialHistory: opts.initialHistory,
 			...opts.initialTokenCount !== void 0 ? { initialTokenCount: opts.initialTokenCount } : {},
 			...opts.initialThinkingLevel !== void 0 ? { initialThinkingLevel: opts.initialThinkingLevel } : {}
 		});
@@ -1186,8 +1183,8 @@ var InMemoryContextState = class extends BaseContextState {
 			...opts.initialSystemPrompt !== void 0 ? { initialSystemPrompt: opts.initialSystemPrompt } : {},
 			...opts.initialActiveTools !== void 0 ? { initialActiveTools: opts.initialActiveTools } : {},
 			currentTurnId: opts.currentTurnId ?? (() => "embedded"),
-			...opts.projector !== void 0 ? { projector: opts.projector } : {},
-			...opts.initialHistory !== void 0 ? { initialHistory: opts.initialHistory } : {},
+			projector: opts.projector,
+			initialHistory: opts.initialHistory,
 			...opts.initialThinkingLevel !== void 0 ? { initialThinkingLevel: opts.initialThinkingLevel } : {}
 		});
 	}
@@ -2269,7 +2266,7 @@ function toKosongContentPart(part) {
 				type: "video_url",
 				videoUrl: {
 					url: part.source.url,
-					...part.source.id !== void 0 ? { id: part.source.id } : {}
+					id: part.source.id
 				}
 			};
 			return {
@@ -2312,8 +2309,8 @@ function createChatStreamingCallbacks(deps) {
 			emit({
 				type: "tool_call_part",
 				tool_call_id: part.tool_call_id,
-				...part.name !== void 0 ? { name: part.name } : {},
-				...part.arguments_chunk !== void 0 ? { arguments_chunk: part.arguments_chunk } : {}
+				name: part.name,
+				arguments_chunk: part.arguments_chunk
 			});
 		},
 		onPrefetchedResult: (toolCallId, result) => {
@@ -2395,6 +2392,15 @@ async function classifyToolCalls(step, response, deferred) {
 			});
 			continue;
 		}
+		if (toolCall.error !== void 0) {
+			const output = `Invalid input for tool "${toolCall.name}": ${toolCall.error}`;
+			await writeFallbackToolCallAndResult(context, stepUuid, turnId, currentStep, toolCall, output);
+			deferred.set(toolCall.id, {
+				output,
+				isError: true
+			});
+			continue;
+		}
 		const parsed = tool.inputSchema.safeParse(toolCall.args);
 		if (!parsed.success) {
 			const output = `Invalid input for tool "${toolCall.name}": ${parsed.error.message}`;
@@ -2446,6 +2452,7 @@ async function classifyToolCalls(step, response, deferred) {
 }
 async function executePendingCalls(step, pending, deferred) {
 	const { config, context, emit, signal, turnId, currentStep, stepUuid, toolCallByProviderId } = step;
+	const postContentCallbacks = [];
 	for (const [index, item] of pending.entries()) {
 		if (index > 0) signal.throwIfAborted();
 		const { toolCall, tool, parsedArgs, hookResult } = item;
@@ -2464,13 +2471,20 @@ async function executePendingCalls(step, pending, deferred) {
 		try {
 			const prefetched = step.prefetchedResults.get(toolCall.id);
 			if (prefetched !== void 0) toolResult = prefetched;
-			else toolResult = await raceExecuteWithGraceTimeout(tool.execute(toolCall.id, effectiveInput, signal, (update) => {
-				emit({
-					type: "tool.progress",
-					toolCallId: toolCall.id,
-					update
-				});
-			}, { wireUuid: toolCallByProviderId.get(toolCall.id) }), signal, toolCall.name);
+			else toolResult = await raceExecuteWithGraceTimeout(tool.execute({
+				turnId,
+				toolCallId: toolCall.id,
+				args: effectiveInput,
+				signal,
+				onUpdate: (update) => {
+					emit({
+						type: "tool.progress",
+						toolCallId: toolCall.id,
+						update
+					});
+				},
+				wireUuid: toolCallByProviderId.get(toolCall.id)
+			}), signal, toolCall.name);
 		} catch (error) {
 			const output = isAbortError$3(error) || signal.aborted ? `Tool "${toolCall.name}" was aborted` : `Tool "${toolCall.name}" failed: ${errorMessage$1(error)}`;
 			const syntheticResult = {
@@ -2539,7 +2553,9 @@ async function executePendingCalls(step, pending, deferred) {
 			isError: finalResult.isError === true
 		});
 		await context.appendToolResult(toolCallByProviderId.get(toolCall.id), toolCall.id, adapted);
+		if (!finalResult.isError && finalResult.postContent) postContentCallbacks.push(finalResult.postContent);
 	}
+	for (const callback of postContentCallbacks) await callback();
 }
 function findTool(tools, name) {
 	return tools.find((tool) => tool.name === name);
@@ -2644,7 +2660,7 @@ async function executeSoulStep(deps) {
 		tools: visibleTools,
 		model,
 		systemPrompt: context.systemPrompt,
-		...overrides?.effort !== void 0 ? { effort: overrides.effort } : {},
+		effort: overrides?.effort,
 		signal,
 		...createChatStreamingCallbacks({
 			emit,
@@ -2654,7 +2670,7 @@ async function executeSoulStep(deps) {
 			stepUuid,
 			prefetchedResults
 		}),
-		...config.contextWindow !== void 0 ? { contextWindow: config.contextWindow } : {}
+		contextWindow: config.contextWindow
 	});
 	recordUsage(response.usage);
 	const deferredResults = /* @__PURE__ */ new Map();
@@ -2679,7 +2695,7 @@ async function executeSoulStep(deps) {
 			turnId,
 			step: currentStep,
 			usage: toStepEndUsage(response.usage),
-			...response.stopReason !== void 0 ? { finishReason: response.stopReason } : {}
+			finishReason: response.stopReason
 		});
 		await executePendingCalls(step, pending, deferredResults);
 		signal.throwIfAborted();
@@ -2705,8 +2721,8 @@ function toStepEndUsage(usage) {
 	return {
 		input_tokens: usage.input,
 		output_tokens: usage.output,
-		...usage.cache_read !== void 0 ? { cache_read_tokens: usage.cache_read } : {},
-		...usage.cache_write !== void 0 ? { cache_write_tokens: usage.cache_write } : {}
+		cache_read_tokens: usage.cache_read,
+		cache_write_tokens: usage.cache_write
 	};
 }
 //#endregion
@@ -3145,7 +3161,7 @@ var SoulRegistry = class {
 			uuid: spawnedUuid,
 			data: {
 				agent_id: agentId,
-				...request.agentName !== void 0 ? { agent_name: request.agentName } : {},
+				agent_name: request.agentName,
 				parent_tool_call_id: request.parentToolCallId,
 				...request.parentToolCallUuid !== void 0 ? { parent_tool_call_uuid: request.parentToolCallUuid } : {},
 				...request.parentAgentId !== void 0 && request.parentAgentId !== "" && request.parentAgentId !== "agent_main" ? { parent_agent_id: request.parentAgentId } : {},
@@ -3156,7 +3172,7 @@ var SoulRegistry = class {
 			type: "subagent.spawned",
 			data: {
 				agent_id: agentId,
-				...request.agentName !== void 0 ? { agent_name: request.agentName } : {},
+				agent_name: request.agentName,
 				parent_tool_call_id: request.parentToolCallId,
 				...request.parentToolCallUuid !== void 0 ? { parent_tool_call_uuid: request.parentToolCallUuid } : {},
 				...request.parentAgentId !== void 0 && request.parentAgentId !== "" && request.parentAgentId !== "agent_main" ? { parent_agent_id: request.parentAgentId } : {},
@@ -3458,7 +3474,7 @@ async function runSubagentTurn(deps, agentId, request, signal) {
 			uuid: spawnedUuid,
 			data: {
 				agent_id: agentId,
-				...request.agentName !== void 0 ? { agent_name: request.agentName } : {},
+				agent_name: request.agentName,
 				parent_tool_call_id: request.parentToolCallId,
 				...request.parentToolCallUuid !== void 0 ? { parent_tool_call_uuid: request.parentToolCallUuid } : {},
 				...request.parentAgentId !== void 0 && request.parentAgentId !== "" && request.parentAgentId !== "agent_main" ? { parent_agent_id: request.parentAgentId } : {},
@@ -3469,7 +3485,7 @@ async function runSubagentTurn(deps, agentId, request, signal) {
 			type: "subagent.spawned",
 			data: {
 				agent_id: agentId,
-				...request.agentName !== void 0 ? { agent_name: request.agentName } : {},
+				agent_name: request.agentName,
 				parent_tool_call_id: request.parentToolCallId,
 				...request.parentToolCallUuid !== void 0 ? { parent_tool_call_uuid: request.parentToolCallUuid } : {},
 				...request.parentAgentId !== void 0 && request.parentAgentId !== "" && request.parentAgentId !== "agent_main" ? { parent_agent_id: request.parentAgentId } : {},
@@ -3502,7 +3518,7 @@ async function runSubagentTurn(deps, agentId, request, signal) {
 			type: "session_initialized",
 			agent_type: "sub",
 			agent_id: agentId,
-			...request.agentName !== void 0 ? { agent_name: request.agentName } : {},
+			agent_name: request.agentName,
 			parent_session_id: parentSessionId,
 			...request.parentAgentId !== void 0 && request.parentAgentId !== "" && request.parentAgentId !== "agent_main" ? { parent_agent_id: request.parentAgentId } : {},
 			parent_tool_call_id: request.parentToolCallId,
@@ -3514,13 +3530,13 @@ async function runSubagentTurn(deps, agentId, request, signal) {
 		childContext = new WiredContextState({
 			journalWriter: childJournalWriter,
 			initialModel: childModel,
-			...childSystemPrompt !== void 0 ? { initialSystemPrompt: childSystemPrompt } : {},
+			initialSystemPrompt: childSystemPrompt,
 			currentTurnId: () => `${agentId}_turn`
 		});
 		childContextRef = childContext;
 	} else childContext = new InMemoryContextState({
 		initialModel: childModel,
-		...childSystemPrompt !== void 0 ? { initialSystemPrompt: childSystemPrompt } : {}
+		initialSystemPrompt: childSystemPrompt
 	});
 	const childTurnId = `${agentId}_turn`;
 	const baseChildRuntime = { kosong: runtimeSlot?.current().runtime.kosong ?? parentRuntime.kosong };
@@ -3531,7 +3547,7 @@ async function runSubagentTurn(deps, agentId, request, signal) {
 			id: agentId,
 			kind: "subagent",
 			parent_tool_call_id: request.parentToolCallId,
-			...request.agentName !== void 0 ? { name: request.agentName } : {}
+			name: request.agentName
 		};
 		baseSink = createSubagentSinkWrapper({
 			childJournalWriter,
@@ -3679,8 +3695,8 @@ async function runSubagentTurn(deps, agentId, request, signal) {
 				if (endReason === "done") turnEndRecord.usage = {
 					input_tokens: usage.input,
 					output_tokens: usage.output,
-					...usage.cache_read !== void 0 ? { cache_read_tokens: usage.cache_read } : {},
-					...usage.cache_write !== void 0 ? { cache_write_tokens: usage.cache_write } : {}
+					cache_read_tokens: usage.cache_read,
+					cache_write_tokens: usage.cache_write
 				};
 				await childJournalWriter.append(turnEndRecord);
 			} catch {}
@@ -3838,7 +3854,11 @@ var ToolStreamingPrefetchScope = class {
 			return;
 		}
 		if (!safe) return void 0;
-		return tool.execute(toolCall.id, toolCall.args, signal);
+		return tool.execute({
+			toolCallId: toolCall.id,
+			args: toolCall.args,
+			signal
+		});
 	}
 	discard(reason) {
 		this.binding?.discardStreaming(reason);
@@ -4236,7 +4256,7 @@ function actionToRulePattern(action, fallbackToolName) {
 //#endregion
 //#region ../../packages/kimi-core/src/soul-plus/permission/before-tool-call.ts
 function buildBeforeToolCall(options) {
-	const rules = [...options.rules];
+	const getRules = options.rules;
 	const mode = options.mode;
 	const approvalRuntime = options.approvalRuntime;
 	const approvalSource = options.approvalSource;
@@ -4248,7 +4268,7 @@ function buildBeforeToolCall(options) {
 	return async (ctx, signal) => {
 		const toolName = ctx.toolCall.name;
 		const args = ctx.args;
-		const { decision, matchedRule } = checkRulesDetailed(rules, toolName, args, mode);
+		const { decision, matchedRule } = checkRulesDetailed(getRules(), toolName, args, mode());
 		if (decision === "allow") return;
 		if (decision === "deny") return {
 			block: true,
@@ -4270,7 +4290,7 @@ function buildBeforeToolCall(options) {
 				action,
 				display,
 				source: approvalSource,
-				...turnId !== void 0 ? { turnId } : {},
+				turnId,
 				step
 			}, signal), timeoutMs, signal);
 			if (result.approved) return void 0;
@@ -4426,8 +4446,8 @@ var DefaultToolCallUseCase = class {
 		this.deps = deps;
 	}
 	buildBeforeToolCall(context) {
-		const rules = context.permissionRules ?? this.deps.policy.getSessionRules();
-		const mode = context.permissionMode ?? this.deps.policy.getPermissionMode();
+		const rules = context.permissionRules ?? this.deps.policy.getSessionRules;
+		const mode = context.permissionMode ?? this.deps.policy.getPermissionMode;
 		const approvalSource = context.approvalSource ?? approvalSourceForActor(context);
 		const permissionClosure = buildBeforeToolCall({
 			rules,
@@ -4472,9 +4492,9 @@ var DefaultToolCallUseCase = class {
 				stepNumber: btcCtx.stepNumber,
 				stepUuid: btcCtx.stepUuid,
 				display: {
-					...activityDescription !== void 0 ? { activityDescription } : {},
-					...userFacingName !== void 0 ? { userFacingName } : {},
-					...inputDisplay !== void 0 ? { inputDisplay } : {}
+					activityDescription,
+					userFacingName,
+					inputDisplay
 				}
 			});
 			if (wireUuid !== void 0) btcCtx.toolCallByProviderId?.set(btcCtx.toolCall.id, wireUuid);
@@ -4606,7 +4626,7 @@ var DefaultToolExecutionScopeFactory = class {
 			policy: this.deps.policy,
 			transcript,
 			resultPolicy,
-			...planMode !== void 0 ? { planMode } : {},
+			planMode,
 			consumeToolOutcome: (toolCallId) => {
 				const outcome = outcomes.get(toolCallId);
 				outcomes.delete(toolCallId);
@@ -4618,11 +4638,19 @@ var DefaultToolExecutionScopeFactory = class {
 				name: inner.name,
 				description: inner.description,
 				inputSchema: inner.inputSchema,
-				async execute(toolCallId, args, signal, onUpdate, ctx) {
+				async execute(ctx) {
+					const { toolCallId, turnId, args, signal, onUpdate, wireUuid } = ctx;
 					try {
 						const planModeResult = await maybeExecutePlanFileTool(inner.name, args, planMode);
 						if (planModeResult !== void 0) return planModeResult;
-						return await inner.execute(toolCallId, args, signal, onUpdate, ctx);
+						return await inner.execute({
+							toolCallId,
+							turnId,
+							args,
+							signal,
+							onUpdate,
+							wireUuid
+						});
 					} catch (error) {
 						if (isAbortLike(error, signal)) outcomes.set(toolCallId, { kind: "abort" });
 						else outcomes.set(toolCallId, {
@@ -4648,9 +4676,9 @@ var DefaultToolExecutionScopeFactory = class {
 					actor,
 					turnId,
 					toolsByName,
-					...permissionRules !== void 0 ? { permissionRules } : {},
-					...permissionMode !== void 0 ? { permissionMode } : {},
-					...approvalSource !== void 0 ? { approvalSource } : {}
+					permissionRules,
+					permissionMode,
+					approvalSource
 				};
 				return {
 					tools: wrappedTools,
@@ -4730,10 +4758,17 @@ function wrapPlanModeTool(inner, planMode) {
 		name: inner.name,
 		description: inner.description,
 		inputSchema: inner.inputSchema,
-		async execute(toolCallId, args, signal, onUpdate, ctx) {
+		async execute(ctx) {
+			const { toolCallId, args, signal, onUpdate, wireUuid } = ctx;
 			const planModeResult = await maybeExecutePlanFileTool(inner.name, args, planMode);
 			if (planModeResult !== void 0) return planModeResult;
-			return inner.execute(toolCallId, args, signal, onUpdate, ctx);
+			return inner.execute({
+				toolCallId,
+				args,
+				signal,
+				onUpdate,
+				wireUuid
+			});
 		}
 	};
 	copyToolMetadata(inner, wrapped);
@@ -4857,7 +4892,7 @@ function createSoulRegistryForSession(deps) {
 				sessionDir: deps.sessionDir ?? "",
 				parentModel: deps.parentModel,
 				workDir: deps.workDir ?? process.cwd(),
-				...deps.pathConfig !== void 0 ? { pathConfig: deps.pathConfig } : {},
+				pathConfig: deps.pathConfig,
 				sessionId: deps.sessionId,
 				parentSessionId: deps.sessionId,
 				toolExecutionScopeFactory: deps.toolExecutionScopeFactory ?? createWalOnlyToolExecutionScopeFactory(),
@@ -4901,7 +4936,7 @@ var AgentTool = class {
 		this.backgroundManager = backgroundManager;
 		this.typeRegistry = typeRegistry;
 	}
-	async execute(toolCallId, args, signal, _onUpdate, ctx) {
+	async execute({ toolCallId, args, signal, wireUuid }) {
 		try {
 			const agentName = args.subagent_type?.length ? args.subagent_type : "coder";
 			if (args.runInBackground && this.typeRegistry?.has(agentName)) {
@@ -4913,7 +4948,7 @@ var AgentTool = class {
 			const request = {
 				parentAgentId: this.parentAgentId,
 				parentToolCallId: toolCallId,
-				...ctx?.wireUuid !== void 0 ? { parentToolCallUuid: ctx.wireUuid } : {},
+				parentToolCallUuid: wireUuid,
 				agentName,
 				prompt: args.prompt,
 				description: args.description,
@@ -5013,7 +5048,7 @@ var AskUserQuestionTool = class {
 	getActivityDescription(_args) {
 		return "Asking user a question";
 	}
-	async execute(toolCallId, args, signal, _onUpdate) {
+	async execute({ toolCallId, args, signal }) {
 		if (this.getPermissionMode() === "bypassPermissions") return {
 			isError: false,
 			content: "{\"answers\": {}, \"note\": \"Running in non-interactive (yolo) mode. Make your own decision.\"}"
@@ -5103,7 +5138,7 @@ var SkillTool = class SkillTool {
 			initialQueryDepth
 		});
 	}
-	async execute(_toolCallId, args, signal, _onUpdate) {
+	async execute({ args, turnId }) {
 		const currentDepth = this.deps.initialQueryDepth ?? this.deps.queryDepth ?? 0;
 		if (currentDepth >= 3) throw new NestedSkillTooDeepError(3, args.skill);
 		const skill = this.deps.skillManager.getSkill(args.skill);
@@ -5113,9 +5148,13 @@ var SkillTool = class SkillTool {
 		const skillArgs = args.args ?? "";
 		const skillType = skill.metadata.type;
 		if (skillType !== void 0 && skillType !== "prompt" && skillType !== "inline") return errorResult(`Skill "${skill.name}" is not an inline skill and cannot be invoked by the model in v1.`);
-		const trigger = currentDepth === 0 ? "claude-proactive" : "nested-skill";
-		await this.deps.inlineWriter.inject(skill, skillArgs, nextDepth, trigger);
-		return { content: `Skill "${skill.name}" loaded inline. Follow its instructions.` };
+		return {
+			content: `Skill "${skill.name}" loaded inline. Follow its instructions.`,
+			postContent: async () => {
+				const trigger = currentDepth === 0 ? "claude-proactive" : "nested-skill";
+				await this.deps.inlineWriter.inject(skill, skillArgs, nextDepth, trigger, turnId);
+			}
+		};
 	}
 };
 function errorResult(message) {
@@ -5160,7 +5199,7 @@ var EnterPlanModeTool = class {
 	getActivityDescription(_args) {
 		return "Requesting to enter plan mode";
 	}
-	async execute(toolCallId, args, signal, _onUpdate) {
+	async execute({ toolCallId, args, signal }) {
 		if (this.deps.isPlanModeActive()) return {
 			isError: true,
 			content: "Plan mode is already active. Use ExitPlanMode when the plan is ready."
@@ -5282,7 +5321,7 @@ var ExitPlanModeTool = class {
 	getActivityDescription(_args) {
 		return "Presenting plan and exiting plan mode";
 	}
-	async execute(toolCallId, args, signal, _onUpdate) {
+	async execute({ toolCallId, args, signal }) {
 		if (!this.deps.isPlanModeActive()) return {
 			isError: true,
 			content: "ExitPlanMode can only be called while plan mode is active. Use EnterPlanMode (or /plan) first."
@@ -5385,7 +5424,7 @@ var ExitPlanModeTool = class {
 			return {
 				ok: true,
 				plan: source.plan,
-				...source.path !== void 0 ? { path: source.path } : {}
+				path: source.path
 			};
 		}
 		if (args.plan === void 0 || args.plan.trim().length === 0) return {
@@ -5547,7 +5586,7 @@ async function requestPlanApproval(approvalRuntime, turnState, toolCallId, args,
 		display: {
 			kind: "plan_review",
 			plan: args.plan,
-			...args.path !== void 0 ? { path: args.path } : {},
+			path: args.path,
 			...args.options !== void 0 ? { options: [...args.options] } : {}
 		},
 		source: approvalSourceForPlanMode(turnState),
@@ -5559,11 +5598,11 @@ async function requestPlanApproval(approvalRuntime, turnState, toolCallId, args,
 	};
 	if (response.response === "approved") return {
 		approved: true,
-		...response.selected_label !== void 0 ? { chosenLabel: response.selected_label } : {}
+		chosenLabel: response.selected_label
 	};
 	return {
 		approved: false,
-		...response.feedback !== void 0 ? { feedback: response.feedback } : {}
+		feedback: response.feedback
 	};
 }
 async function requestEnterPlanModeApproval(approvalRuntime, turnState, toolCallId, args, signal) {
@@ -5575,14 +5614,14 @@ async function requestEnterPlanModeApproval(approvalRuntime, turnState, toolCall
 		display: {
 			kind: "generic",
 			summary: "Enter plan mode",
-			...reason !== void 0 ? { detail: reason } : {}
+			detail: reason
 		},
 		source: approvalSourceForPlanMode(turnState),
 		...turnState.getCurrentTurnId() !== void 0 ? { turnId: turnState.getCurrentTurnId() } : {}
 	}, signal);
 	return {
 		approved: response.approved,
-		...response.feedback !== void 0 ? { feedback: response.feedback } : {}
+		feedback: response.feedback
 	};
 }
 function approvalSourceForPlanMode(turnState) {
@@ -5603,8 +5642,7 @@ var SkillInlineWriter = class {
 	constructor(deps) {
 		this.deps = deps;
 	}
-	async inject(skill, args, depth, trigger = "claude-proactive") {
-		const turnId = this.deps.currentTurnId?.() ?? "pending";
+	async inject(skill, args, depth, trigger = "claude-proactive", turnId) {
 		const eventData = {
 			skill_name: skill.name,
 			execution_mode: "inline",
@@ -5614,7 +5652,7 @@ var SkillInlineWriter = class {
 		};
 		await this.deps.sessionJournal.appendSkillInvoked({
 			type: "skill_invoked",
-			turn_id: turnId,
+			turn_id: turnId ?? "pending",
 			data: eventData
 		});
 		this.deps.eventBus?.emit({
@@ -5869,7 +5907,7 @@ function bridgeSummaryMessage(providerSummary, messagesCount, preCompactTokens,
 		preCompactTokens,
 		postCompactTokens: estimateTokens(providerSummary.content),
 		trigger,
-		...archiveFile !== void 0 ? { archiveFile } : {}
+		archiveFile
 	};
 }
 //#endregion
@@ -6584,10 +6622,10 @@ var NotificationManager = class {
 			title: input.title,
 			body: input.body,
 			severity: input.severity,
-			...input.payload !== void 0 ? { payload: input.payload } : {},
+			payload: input.payload,
 			targets,
-			...input.dedupe_key !== void 0 ? { dedupe_key: input.dedupe_key } : {},
-			...input.envelope_id !== void 0 ? { envelope_id: input.envelope_id } : {}
+			dedupe_key: input.dedupe_key,
+			envelope_id: input.envelope_id
 		};
 		const deliveredAt = {};
 		const wantsLlm = targets.includes("llm");
@@ -6856,14 +6894,14 @@ var SessionMetaService = class {
 			session_id: meta.session_id,
 			created_at: meta.created_at,
 			updated_at: meta.last_updated,
-			...meta.title !== void 0 ? { custom_title: meta.title } : {},
+			custom_title: meta.title,
 			...meta.tags !== void 0 ? { tags: [...meta.tags] } : {},
-			...meta.description !== void 0 ? { description: meta.description } : {},
-			...meta.archived !== void 0 ? { archived: meta.archived } : {},
-			...meta.color !== void 0 ? { color: meta.color } : {},
-			...meta.last_model !== void 0 ? { model: meta.last_model } : {},
+			description: meta.description,
+			archived: meta.archived,
+			color: meta.color,
+			model: meta.last_model,
 			turn_count: meta.turn_count,
-			...meta.plan_slug !== void 0 ? { plan_slug: meta.plan_slug } : {},
+			plan_slug: meta.plan_slug,
 			...meta.producer !== void 0 ? { producer: { ...meta.producer } } : {},
 			last_exit_code: "dirty"
 		}));
@@ -6897,9 +6935,9 @@ function toWirePatch(p) {
 var DynamicInjectionManager = class {
 	providers = [];
 	onProviderError;
-	constructor(deps = {}) {
-		if (deps.initialProviders !== void 0) for (const provider of deps.initialProviders) this.register(provider);
-		this.onProviderError = deps.onProviderError;
+	constructor(options = {}) {
+		if (options.initialProviders !== void 0) for (const provider of options.initialProviders) this.register(provider);
+		this.onProviderError = options.onProviderError;
 	}
 	/**
 	* Register a provider. Registration is idempotent on `id`: a second
@@ -7255,10 +7293,10 @@ function hasReminderWithoutNewUser(history, fingerprint) {
 * built-in providers (plan-mode + yolo-mode). Hosts that want additional
 * providers can `register` them after construction.
 */
-function createDefaultDynamicInjectionManager(deps = {}) {
+function createDefaultDynamicInjectionManager(options = {}) {
 	return new DynamicInjectionManager({
-		...deps,
-		initialProviders: [new PlanModeInjectionProvider(), new YoloModeInjectionProvider()]
+		initialProviders: [new PlanModeInjectionProvider(), new YoloModeInjectionProvider()],
+		...options
 	});
 }
 //#endregion
@@ -7556,7 +7594,7 @@ function flushPart(message, part, toolCallIndexMap) {
 			type: "function",
 			id: part.id,
 			function: part.function,
-			...part.extras !== void 0 ? { extras: part.extras } : {}
+			extras: part.extras
 		};
 		const arrayIdx = message.toolCalls.length;
 		message.toolCalls.push(storedCall);
@@ -20560,7 +20598,7 @@ var TurnManager = class {
 				kind: "begin",
 				turnId,
 				userInput: input.text,
-				...input.parts !== void 0 ? { userInputParts: input.parts } : {},
+				userInputParts: input.parts,
 				inputKind: "user",
 				agentType: this.agentType
 			});
@@ -20607,7 +20645,7 @@ var TurnManager = class {
 			permissionMode: this.permissionMode,
 			turnNumber: this.extractTurnNumber(turnId),
 			history: this.deps.contextState.getHistory(),
-			...planFilePath !== void 0 ? { planFilePath } : {}
+			planFilePath
 		};
 		const contextBackedWrites = [];
 		const injections = manager.computeInjections(ctx, { appendSystemReminder: (data) => {
@@ -20651,12 +20689,12 @@ var TurnManager = class {
 	}
 	launchTurn(turnId) {
 		const controller = this.deps.soulRegistry.getOrCreate("main").abortController;
-		const effectiveRules = mergeTurnRules(this.sessionRules, this.pendingTurnOverrides);
+		const turnOverrides = this.pendingTurnOverrides;
 		this.pendingTurnOverrides = void 0;
 		const approvalSource = this.agentType === "sub" ? {
 			kind: "subagent",
 			agent_id: this.agentId,
-			...this.subagentType !== void 0 ? { subagent_type: this.subagentType } : {}
+			subagent_type: this.subagentType
 		} : {
 			kind: "soul",
 			agent_id: this.agentId
@@ -20666,7 +20704,7 @@ var TurnManager = class {
 			sessionId: this.sessionId,
 			agentId: this.agentId,
 			kind: this.agentType === "sub" ? "subagent" : this.agentType === "independent" ? "independent" : "main",
-			...this.subagentType !== void 0 ? { subagentType: this.subagentType } : {}
+			subagentType: this.subagentType
 		});
 		const runtimeBundle = this.runtimeSlot?.current();
 		const baseRuntime = runtimeBundle?.runtime ?? this.runtime;
@@ -20676,14 +20714,14 @@ var TurnManager = class {
 			const scoped = scope.buildSoulConfig({
 				tools: this.deps.tools,
 				turnId,
-				permissionRules: effectiveRules,
-				permissionMode: this.permissionMode,
+				permissionRules: () => mergeTurnRules(this.sessionRules, turnOverrides),
+				permissionMode: () => this.permissionMode,
 				approvalSource
 			});
 			soulConfig = {
 				tools: [...scoped.tools],
-				...scoped.beforeToolCall !== void 0 ? { beforeToolCall: scoped.beforeToolCall } : {},
-				...scoped.afterToolCall !== void 0 ? { afterToolCall: scoped.afterToolCall } : {}
+				beforeToolCall: scoped.beforeToolCall,
+				afterToolCall: scoped.afterToolCall
 			};
 		} else soulConfig = { tools: [...this.deps.tools] };
 		const compactionConfig = this.runtimeSlot !== void 0 ? runtimeBundle?.compactionConfig : this.compactionConfig;
@@ -20704,7 +20742,7 @@ var TurnManager = class {
 				}, signal);
 				if (result.blockAction) return {
 					block: true,
-					...result.reason !== void 0 ? { reason: result.reason } : {}
+					reason: result.reason
 				};
 			},
 			afterStep: async (ctx, signal) => {
@@ -20787,7 +20825,7 @@ var TurnManager = class {
 				error_type: "internal",
 				details: {
 					name,
-					...stack !== void 0 ? { stack } : {}
+					stack
 				}
 			});
 			result = void 0;
@@ -20886,7 +20924,7 @@ var TurnManager = class {
 				total,
 				percent: total > 0 ? Math.max(0, Math.min(100, Math.round(used / total * 100))) : 0
 			},
-			...tokenUsage !== void 0 ? { token_usage: tokenUsage } : {},
+			token_usage: tokenUsage,
 			plan_mode: this.planMode,
 			yolo: this.permissionMode === "bypassPermissions",
 			model: this.deps.contextState.model
@@ -20951,10 +20989,10 @@ var SoulPlus = class {
 		const eventBus = deps.eventBus;
 		const { toolRegistry, hostToolNames, isToolEnabled } = createSoulPlusToolRegistry({
 			tools: deps.tools,
-			...deps.enabledToolNames !== void 0 ? { enabledToolNames: deps.enabledToolNames } : {}
+			enabledToolNames: deps.enabledToolNames
 		});
 		this.hostToolNames = hostToolNames;
-		const permissionRules = [];
+		const permissionRules = () => [];
 		const stateMachine = deps.lifecycleStateMachine ?? new SessionLifecycleStateMachine();
 		const gate = new SoulLifecycleGate(stateMachine);
 		const contextState = deps.contextState;
@@ -20965,7 +21003,7 @@ var SoulPlus = class {
 			model: contextState.model,
 			runtime: deps.runtime,
 			compactionProvider: deps.compactionProvider,
-			...deps.compactionConfig !== void 0 ? { compactionConfig: deps.compactionConfig } : {}
+			compactionConfig: deps.compactionConfig
 		});
 		const runtime = runtimeSlot.current().runtime;
 		const approvalRuntime = deps.approvalRuntime;
@@ -20977,8 +21015,8 @@ var SoulPlus = class {
 		}) : void 0;
 		const planController = new PlanSessionController({
 			sessionId: deps.sessionId,
-			...deps.pathConfig !== void 0 ? { paths: deps.pathConfig } : {},
-			...sessionMeta !== void 0 ? { sessionMeta } : {}
+			paths: deps.pathConfig,
+			sessionMeta
 		});
 		this.planController = planController;
 		const compactionProvider = deps.compactionProvider;
@@ -21051,12 +21089,12 @@ var SoulPlus = class {
 			dynamicInjectionManager,
 			sessionId: deps.sessionId,
 			planFilePathProvider: () => planController.getPlanFilePath() ?? void 0,
-			...deps.sessionRules !== void 0 ? { sessionRules: deps.sessionRules } : {},
-			...deps.permissionMode !== void 0 ? { permissionMode: deps.permissionMode } : {},
-			...toolExecutionScopeFactory !== void 0 ? { toolExecutionScopeFactory } : {},
-			...approvalRuntime !== void 0 ? { approvalRuntime } : {},
-			...deps.hookEngine !== void 0 ? { hookEngine: deps.hookEngine } : {},
-			...deps.compactionConfig !== void 0 ? { compactionConfig: deps.compactionConfig } : {}
+			sessionRules: deps.sessionRules,
+			permissionMode: deps.permissionMode,
+			toolExecutionScopeFactory,
+			approvalRuntime,
+			hookEngine: deps.hookEngine,
+			compactionConfig: deps.compactionConfig
 		});
 		turnManagerRef.bind(turnManager);
 		const setPlanMode = createPlanModeSetter({
@@ -21079,8 +21117,8 @@ var SoulPlus = class {
 			sessionJournal,
 			sessionEventBus: eventBus,
 			contextState,
-			...deps.onShellDeliver !== void 0 ? { onShellDeliver: deps.onShellDeliver } : {},
-			...deps.logger !== void 0 ? { logger: deps.logger } : {}
+			onShellDeliver: deps.onShellDeliver,
+			logger: deps.logger
 		});
 		this.lifecycle = {
 			stateMachine,
@@ -21549,7 +21587,8 @@ var KosongAdapter = class {
 		const toolCalls = result.message.toolCalls.map((tc) => ({
 			id: tc.id,
 			name: tc.function.name,
-			args: parseToolArgs(tc.function.arguments)
+			rawArgs: tc.function.arguments,
+			...parseToolArgs(tc.function.arguments)
 		}));
 		const usage = mapUsage(result.usage);
 		const stopReason = mapFinishReason(result.finishReason);
@@ -21558,12 +21597,12 @@ var KosongAdapter = class {
 				role: "assistant",
 				content: contentBlocks,
 				...toolCalls.length > 0 ? { tool_calls: toolCalls } : {},
-				...stopReason !== void 0 ? { stop_reason: stopReason } : {}
+				stop_reason: stopReason
 			},
 			toolCalls,
 			usage,
 			actualModel: activeProvider.modelName,
-			...stopReason !== void 0 ? { stopReason } : {}
+			stopReason
 		};
 		if (params.contextWindow !== void 0 && usage.input > params.contextWindow) throw new ContextOverflowError(`Implicit context overflow: input=${String(usage.input)} exceeds contextWindow=${String(params.contextWindow)}`, usage);
 		return response;
@@ -21609,11 +21648,14 @@ function isRecord$8(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function parseToolArgs(raw) {
-	if (raw === null || raw.length === 0) return {};
+	if (raw === null || raw.length === 0) return { args: {} };
 	try {
-		return JSON.parse(raw);
-	} catch {
-		return {};
+		return { args: JSON.parse(raw) };
+	} catch (error) {
+		return {
+			args: {},
+			error: error.message
+		};
 	}
 }
 function mapUsage(raw) {
@@ -21986,8 +22028,8 @@ var WiredApprovalRuntime = class {
 		return {
 			approved: data.response === "approved",
 			response: data.response,
-			...data.feedback !== void 0 ? { feedback: data.feedback } : {},
-			...data.selected_label !== void 0 ? { selected_label: data.selected_label } : {}
+			feedback: data.feedback,
+			selected_label: data.selected_label
 		};
 	}
 	resolve(requestId, response) {
@@ -22009,7 +22051,7 @@ var WiredApprovalRuntime = class {
 				data: {
 					request_id: requestId,
 					response: response.response,
-					...response.feedback !== void 0 ? { feedback: response.feedback } : {},
+					feedback: response.feedback,
 					...response.selected_label !== void 0 ? { selected_label: response.selected_label } : {}
 				}
 			};
@@ -22017,8 +22059,8 @@ var WiredApprovalRuntime = class {
 			const result = {
 				approved: response.response === "approved",
 				response: response.response,
-				...response.feedback !== void 0 ? { feedback: response.feedback } : {},
-				...response.selected_label !== void 0 ? { selected_label: response.selected_label } : {}
+				feedback: response.feedback,
+				selected_label: response.selected_label
 			};
 			entry.deferred.resolve(result);
 			for (const target of cascadeTargets) queueMicrotask(() => {
@@ -22302,7 +22344,7 @@ var ThinkTool = class {
 	metadata = { source: "builtin" };
 	description = DESCRIPTION$3;
 	inputSchema = ThinkInputSchema;
-	async execute(_toolCallId, _args, _signal, _onUpdate) {
+	async execute(_ctx) {
 		return {
 			content: "",
 			isError: false
@@ -22540,7 +22582,7 @@ var BackgroundProcessManager = class {
 			endedAt: null,
 			waiters: [],
 			terminalFired: false,
-			...this.sessionDir !== void 0 ? { outputSessionDir: this.sessionDir } : {},
+			outputSessionDir: this.sessionDir,
 			persistWriteQueue: Promise.resolve(),
 			outputWriteQueue: Promise.resolve()
 		};
@@ -22958,7 +23000,7 @@ var TaskListTool = class {
 	constructor(manager) {
 		this.manager = manager;
 	}
-	async execute(_toolCallId, args, _signal, _onUpdate) {
+	async execute({ args }) {
 		return {
 			content: formatTaskList(this.manager.list(args.active_only ?? true, args.limit ?? 20)),
 			isError: false
@@ -22984,7 +23026,7 @@ var TaskOutputTool = class {
 	constructor(manager) {
 		this.manager = manager;
 	}
-	async execute(_toolCallId, args, _signal, _onUpdate) {
+	async execute({ args }) {
 		const info = this.manager.getTask(args.task_id);
 		if (!info) return {
 			isError: true,
@@ -23028,7 +23070,7 @@ var TaskStopTool = class {
 	constructor(manager) {
 		this.manager = manager;
 	}
-	async execute(_toolCallId, args, _signal, _onUpdate) {
+	async execute({ args }) {
 		const info = this.manager.getTask(args.task_id);
 		if (!info) return {
 			isError: true,
@@ -23068,7 +23110,7 @@ var WebSearchTool = class {
 	constructor(provider) {
 		this.provider = provider;
 	}
-	async execute(toolCallId, args, _signal, _onUpdate) {
+	async execute({ toolCallId, args }) {
 		try {
 			const opts = { toolCallId };
 			if (args.limit !== void 0) opts.limit = args.limit;
@@ -23116,7 +23158,7 @@ var FetchURLTool = class {
 	constructor(fetcher) {
 		this.fetcher = fetcher;
 	}
-	async execute(toolCallId, args, _signal, _onUpdate) {
+	async execute({ toolCallId, args }) {
 		try {
 			const opts = { toolCallId };
 			if (args.format !== void 0) opts.format = args.format;
@@ -23647,7 +23689,7 @@ var ReadMediaFileTool = class {
 		this.capabilities = capabilities;
 		this.description = buildDescription(capabilities);
 	}
-	async execute(_toolCallId, args, _signal, _onUpdate) {
+	async execute({ args }) {
 		if (!args.path) return {
 			isError: true,
 			content: "File path cannot be empty."
@@ -23716,7 +23758,7 @@ var ReadMediaFileTool = class {
 						type: "url",
 						url: uploaded.url,
 						media_type: fileType.mimeType,
-						...uploaded.id !== void 0 ? { id: uploaded.id } : {}
+						id: uploaded.id
 					}
 				};
 			} else mediaPart = {
@@ -23974,7 +24016,7 @@ var ReadTool = class {
 		this.kaos = kaos;
 		this.workspace = workspace;
 	}
-	async execute(_toolCallId, args, _signal, _onUpdate) {
+	async execute({ args }) {
 		let safePath;
 		try {
 			safePath = resolvePathAccess(args.path, this.workspace.workspaceDir, this.workspace, {
@@ -24063,7 +24105,7 @@ var WriteTool = class {
 		this.workspace = workspace;
 		this.planModeChecker = options?.planModeChecker;
 	}
-	async execute(_toolCallId, args, _signal, _onUpdate) {
+	async execute({ args }) {
 		if (this.planModeChecker?.isPlanModeActive() === true) {
 			const planPath = this.planModeChecker.getPlanFilePath();
 			if (planPath === null || resolve(args.path) !== resolve(planPath)) return {
@@ -24136,7 +24178,7 @@ var EditTool = class {
 		this.workspace = workspace;
 		this.planModeChecker = options?.planModeChecker;
 	}
-	async execute(_toolCallId, args, _signal, _onUpdate) {
+	async execute({ args }) {
 		if (this.planModeChecker?.isPlanModeActive() === true) {
 			const planPath = this.planModeChecker.getPlanFilePath();
 			if (planPath === null || resolve(args.path) !== resolve(planPath)) return {
@@ -24294,8 +24336,8 @@ var ShellTool = class {
 				kind: "command",
 				command: input.command,
 				language,
-				...input.cwd !== void 0 ? { cwd: input.cwd } : {},
-				...input.description !== void 0 ? { description: input.description } : {}
+				cwd: input.cwd,
+				description: input.description
 			}),
 			getResultDisplay: (_input, result) => ({
 				kind: "command_output",
@@ -24332,7 +24374,7 @@ var ShellTool = class {
 		};
 		return this.kaos.execWithEnv([...args], mergedEnv);
 	}
-	async execute(_toolCallId, args, signal, _onUpdate) {
+	async execute({ args, signal }) {
 		if (signal.aborted) return {
 			isError: true,
 			content: "Aborted before command started"
@@ -28883,7 +28925,7 @@ var GrepTool = class {
 		this.kaos = kaos;
 		this.workspace = workspace;
 	}
-	async execute(_toolCallId, args, signal, _onUpdate) {
+	async execute({ args, signal }) {
 		if (signal.aborted) return {
 			isError: true,
 			content: "Aborted before search started"
@@ -29283,7 +29325,7 @@ var GlobTool = class {
 		this.kaos = kaos;
 		this.workspace = workspace;
 	}
-	async execute(_toolCallId, args, _signal, _onUpdate) {
+	async execute({ args }) {
 		if (isPureWildcard(args.pattern)) {
 			const dirList = [this.workspace.workspaceDir, ...this.workspace.additionalDirs].map((d) => `  - ${d}`).join("\n");
 			let tree;
@@ -29523,7 +29565,7 @@ var SetTodoListTool = class {
 		if (args.todos.length === 0) return "Clearing todo list";
 		return "Updating todo list";
 	}
-	async execute(_toolCallId, args, _signal, _onUpdate) {
+	async execute({ args }) {
 		if (args.todos === void 0) {
 			const current = this.store.getTodos();
 			return {
@@ -29752,7 +29794,7 @@ function createWireRequest(options) {
 		from: options.from ?? "client",
 		to: options.to ?? "core",
 		method: options.method,
-		...options.data !== void 0 ? { data: options.data } : {}
+		data: options.data
 	};
 }
 function createWireResponse(options) {
@@ -29764,8 +29806,8 @@ function createWireResponse(options) {
 		from: options.from ?? "core",
 		to: options.to ?? "client",
 		...options.requestId !== void 0 && options.requestId !== "" ? { request_id: options.requestId } : {},
-		...options.data !== void 0 ? { data: options.data } : {},
-		...options.error !== void 0 ? { error: options.error } : {}
+		data: options.data,
+		error: options.error
 	};
 }
 function createWireEvent(options) {
@@ -29779,10 +29821,10 @@ function createWireEvent(options) {
 		method: options.method,
 		seq: options.seq,
 		...options.requestId !== void 0 && options.requestId !== "" ? { request_id: options.requestId } : {},
-		...options.turnId !== void 0 ? { turn_id: options.turnId } : {},
-		...options.agentType !== void 0 ? { agent_type: options.agentType } : {},
-		...options.source !== void 0 ? { source: options.source } : {},
-		...options.data !== void 0 ? { data: options.data } : {}
+		turn_id: options.turnId,
+		agent_type: options.agentType,
+		source: options.source,
+		data: options.data
 	};
 }
 //#endregion
@@ -29868,10 +29910,10 @@ var WireEventPipeline = class {
 				method: ctx.draft.method,
 				sessionId: ctx.sessionId,
 				seq: this.seq++,
-				...ctx.draft.requestId !== void 0 ? { requestId: ctx.draft.requestId } : {},
-				...ctx.draft.turnId !== void 0 ? { turnId: ctx.draft.turnId } : {},
+				requestId: ctx.draft.requestId,
+				turnId: ctx.draft.turnId,
 				agentType: ctx.draft.agentType ?? "main",
-				...ctx.draft.source !== void 0 ? { source: ctx.draft.source } : {},
+				source: ctx.draft.source,
 				data: ctx.draft.data
 			});
 			await next();
@@ -29929,8 +29971,8 @@ function draft(event, ctx, method, data) {
 	return {
 		method,
 		data,
-		...ctx.currentTurnId !== void 0 ? { turnId: ctx.currentTurnId } : {},
-		...event.source !== void 0 ? { source: event.source } : {}
+		turnId: ctx.currentTurnId,
+		source: event.source
 	};
 }
 const BUS_EVENT_TRANSLATORS = {
@@ -29961,7 +30003,7 @@ const BUS_EVENT_TRANSLATORS = {
 	tool_call_part: (event, ctx) => {
 		return draft(event, ctx, "tool.call.delta", {
 			tool_call_id: event.tool_call_id,
-			...event.name !== void 0 ? { name: event.name } : {},
+			name: event.name,
 			arguments_part: event.arguments_chunk ?? null
 		});
 	},
@@ -29980,7 +30022,7 @@ const BUS_EVENT_TRANSLATORS = {
 		return draft(event, ctx, "tool.result", {
 			tool_call_id: event.toolCallId,
 			output: event.output,
-			...event.isError !== void 0 ? { is_error: event.isError } : {}
+			is_error: event.isError
 		});
 	},
 	"compaction.begin": (event, ctx) => {
@@ -29988,16 +30030,16 @@ const BUS_EVENT_TRANSLATORS = {
 	},
 	"compaction.end": (event, ctx) => {
 		return draft(event, ctx, "compaction.end", {
-			...event.tokensBefore !== void 0 ? { tokens_before: event.tokensBefore } : {},
-			...event.tokensAfter !== void 0 ? { tokens_after: event.tokensAfter } : {}
+			tokens_before: event.tokensBefore,
+			tokens_after: event.tokensAfter
 		});
 	},
 	"session.error": (event, ctx) => {
 		return draft(event, ctx, "session.error", {
 			error: event.error,
-			...event.error_type !== void 0 ? { error_type: event.error_type } : {},
-			...event.retry_after_ms !== void 0 ? { retry_after_ms: event.retry_after_ms } : {},
-			...event.details !== void 0 ? { details: event.details } : {}
+			error_type: event.error_type,
+			retry_after_ms: event.retry_after_ms,
+			details: event.details
 		});
 	},
 	"hook.triggered": (event, ctx) => draft(event, ctx, "hook.triggered", {
@@ -30086,7 +30128,7 @@ function installWireEventBridge(opts) {
 	const pipeline = new WireEventPipeline({
 		sessionId,
 		transport: server,
-		...getEventFilter !== void 0 ? { getEventFilter } : {}
+		getEventFilter
 	});
 	const soulListener = (event) => {
 		const draft = translateBusEvent(event, currentTurnId);
@@ -30442,13 +30484,13 @@ async function readSubagentReplay(options) {
 		id: agentId,
 		parent_session_id: options.parentSessionId,
 		parent_tool_call_id: spawned.data.parent_tool_call_id,
-		...name !== void 0 ? { name } : {}
+		name
 	};
 	const source = {
 		id: agentId,
 		kind: "subagent",
 		parent_tool_call_id: spawned.data.parent_tool_call_id,
-		...name !== void 0 ? { name } : {}
+		name
 	};
 	const childRecords = [init, ...childReplay.records];
 	for (const record of childRecords) records.push({
@@ -30591,7 +30633,7 @@ var DefaultSessionApplicationService = class {
 		input.prepare?.({
 			sessionId,
 			eventBus,
-			...hookEngine !== void 0 ? { hookEngine } : {}
+			hookEngine
 		});
 		const systemPrompt = input.systemPrompt ?? this.deps.defaultSystemPromptProvider?.();
 		const enabledToolNames = this.deps.enabledToolNamesProvider?.();
@@ -30611,22 +30653,22 @@ var DefaultSessionApplicationService = class {
 		const managed = await this.deps.sessionManager.createSession({
 			sessionId,
 			runtime,
-			...runtimeSlot !== void 0 ? { runtimeSlot } : {},
+			runtimeSlot,
 			tools: this.deps.toolsProvider(),
-			...enabledToolNames !== void 0 ? { enabledToolNames } : {},
+			enabledToolNames,
 			model,
-			...systemPrompt !== void 0 ? { systemPrompt } : {},
+			systemPrompt,
 			eventBus,
 			workspaceDir: this.deps.workspaceDir,
 			compactionProvider,
-			...compactionConfig !== void 0 ? { compactionConfig } : {},
+			compactionConfig,
 			...this.deps.approvalRuntime !== void 0 ? { approvalRuntime: this.deps.approvalRuntime } : {},
 			...this.deps.approvalRuntimeFactory !== void 0 ? { approvalRuntimeFactory: this.deps.approvalRuntimeFactory } : {},
-			...hookEngine !== void 0 ? { hookEngine } : {},
-			...this.deps.skillManager !== void 0 ? { skillManager: this.deps.skillManager } : {},
+			hookEngine,
+			skillManager: this.deps.skillManager,
 			...this.deps.agentTypeRegistry !== void 0 ? { agentTypeRegistry: this.deps.agentTypeRegistry } : {},
 			...this.deps.questionRuntimeProvider !== void 0 ? { questionRuntime: this.deps.questionRuntimeProvider({ sessionId }) } : {},
-			...this.deps.logger !== void 0 ? { logger: this.deps.logger } : {}
+			logger: this.deps.logger
 		});
 		this.deps.sessionLifecycle?.onSessionCreated?.(managed);
 		return {
@@ -30643,7 +30685,7 @@ var DefaultSessionApplicationService = class {
 		input?.prepare?.({
 			sessionId,
 			eventBus,
-			...hookEngine !== void 0 ? { hookEngine } : {}
+			hookEngine
 		});
 		const initialModel = (await new StateCache(this.deps.pathConfig.statePath(sessionId)).read())?.model ?? this.deps.defaultModelProvider();
 		const runtimeBundle = await this.deps.runtimeBundleProvider?.({
@@ -30660,18 +30702,18 @@ var DefaultSessionApplicationService = class {
 		const runtimeSlot = runtimeSlotBundle !== void 0 ? createSessionRuntimeSlot(runtimeSlotBundle) : void 0;
 		const managed = await this.deps.sessionManager.resumeSession(sessionId, {
 			runtime,
-			...runtimeSlot !== void 0 ? { runtimeSlot } : {},
+			runtimeSlot,
 			tools: this.deps.toolsProvider(),
 			eventBus,
 			compactionProvider,
-			...compactionConfig !== void 0 ? { compactionConfig } : {},
+			compactionConfig,
 			...this.deps.approvalRuntime !== void 0 ? { approvalRuntime: this.deps.approvalRuntime } : {},
 			...this.deps.approvalRuntimeFactory !== void 0 ? { approvalRuntimeFactory: this.deps.approvalRuntimeFactory } : {},
-			...hookEngine !== void 0 ? { hookEngine } : {},
-			...this.deps.skillManager !== void 0 ? { skillManager: this.deps.skillManager } : {},
+			hookEngine,
+			skillManager: this.deps.skillManager,
 			...this.deps.agentTypeRegistry !== void 0 ? { agentTypeRegistry: this.deps.agentTypeRegistry } : {},
 			...this.deps.questionRuntimeProvider !== void 0 ? { questionRuntime: this.deps.questionRuntimeProvider({ sessionId }) } : {},
-			...this.deps.logger !== void 0 ? { logger: this.deps.logger } : {}
+			logger: this.deps.logger
 		});
 		const runtimeBundleProvider = this.deps.runtimeBundleProvider;
 		if (runtimeSlot !== void 0 && runtimeBundleProvider !== void 0 && managed.contextState.model !== runtimeSlot.current().model) {
@@ -30733,7 +30775,7 @@ var DefaultSessionApplicationService = class {
 		return {
 			session_id: sessionId,
 			turn_count: turnCount,
-			...lastTurnId !== void 0 ? { last_turn_id: lastTurnId } : {},
+			last_turn_id: lastTurnId,
 			status,
 			...planPath !== null ? { plan_path: planPath } : {}
 		};
@@ -30767,7 +30809,7 @@ var DefaultSessionApplicationService = class {
 		return readSessionReplay({
 			sessionId,
 			pathConfig: this.deps.pathConfig,
-			...fromSeq !== void 0 ? { fromSeq } : {}
+			fromSeq
 		});
 	}
 	rollback(sessionId, nTurnsBack) {
@@ -30964,7 +31006,7 @@ var SessionStateApprovalStateStore = class {
 				created_at: now,
 				updated_at: now
 			},
-			...nextActions !== void 0 ? { auto_approve_actions: nextActions } : {},
+			auto_approve_actions: nextActions,
 			permission_mode: nextMode
 		};
 		await this.stateCache.write(next);
@@ -30992,9 +31034,9 @@ function createWireHookSender(opts) {
 			requestId: message.requestId,
 			result: {
 				ok: data.ok ?? true,
-				...blockAction !== void 0 ? { blockAction } : {},
-				...data.reason !== void 0 ? { reason: data.reason } : {},
-				...additionalContext !== void 0 ? { additionalContext } : {}
+				blockAction,
+				reason: data.reason,
+				additionalContext
 			}
 		};
 	} };
@@ -31027,14 +31069,14 @@ function createWireQuestionRuntime(reverse, sessionId) {
 			tool_call_id: req.toolCallId,
 			questions: req.questions.map((question) => ({
 				question: question.question,
-				...question.header !== void 0 ? { header: question.header } : {},
-				...question.body !== void 0 ? { body: question.body } : {},
+				header: question.header,
+				body: question.body,
 				multi_select: question.multiSelect ?? false,
-				...question.otherLabel !== void 0 ? { other_label: question.otherLabel } : {},
+				other_label: question.otherLabel,
 				...question.otherDescription !== void 0 ? { other_description: question.otherDescription } : {},
 				options: question.options.map((option) => ({
 					label: option.label,
-					...option.description !== void 0 ? { description: option.description } : {}
+					description: option.description
 				}))
 			}))
 		}, { signal: req.signal })).data ?? {};
@@ -31350,7 +31392,7 @@ const CONVERSATION_HANDLER_DESCRIPTORS = [
 			}
 			const dispatch = await ctx.sessionApplication.prompt(msg.session_id, {
 				text: inputText,
-				...inputParts !== void 0 ? { parts: inputParts } : {}
+				parts: inputParts
 			});
 			return createWireResponse({
 				requestId: msg.id,
@@ -31401,8 +31443,8 @@ const CONVERSATION_HANDLER_DESCRIPTORS = [
 				(ctx.approvalRuntimesBySession.get(msg.session_id) ?? ctx.approval)?.resolveRemote({
 					request_id: payload.request_id,
 					response: payload.response,
-					...payload.feedback !== void 0 ? { feedback: payload.feedback } : {},
-					...payload.scope !== void 0 ? { scope: payload.scope } : {}
+					feedback: payload.feedback,
+					scope: payload.scope
 				});
 			} catch {}
 			return createWireResponse({
@@ -31763,9 +31805,9 @@ const PROCESS_HANDLER_DESCRIPTORS = [
 		ctx.router.registerProcessMethod("session.create", async (msg) => {
 			const payload = msg.data ?? {};
 			const data = { session_id: (await ctx.sessionApplication.createSession({
-				...payload.session_id !== void 0 ? { sessionId: payload.session_id } : {},
-				...payload.model !== void 0 ? { model: payload.model } : {},
-				...payload.system_prompt !== void 0 ? { systemPrompt: payload.system_prompt } : {},
+				sessionId: payload.session_id,
+				model: payload.model,
+				systemPrompt: payload.system_prompt,
 				prepare: ({ sessionId, hookEngine: sessionHookEngine }) => {
 					prepareSessionHooks(ctx, sessionId, sessionHookEngine);
 				}
@@ -31847,7 +31889,7 @@ function buildExternalToolProxy(options) {
 			source: "external",
 			originalName: options.name
 		},
-		async execute(toolCallId, args, signal) {
+		async execute({ toolCallId, args, signal }) {
 			try {
 				const response = await options.sendToolCall({
 					id: toolCallId,
@@ -31898,7 +31940,7 @@ const TOOLS_HANDLER_DESCRIPTORS = [
 					})).data ?? {};
 					return {
 						output: data.output ?? "",
-						...data.is_error !== void 0 ? { is_error: data.is_error } : {}
+						is_error: data.is_error
 					};
 				}
 			}));
@@ -32067,9 +32109,9 @@ function createWireApprovalRuntimeFactory(reverse, runtimesBySession) {
 						const parsed = ApprovalDecisionSchema.parse(reply.data ?? {});
 						const decision = {
 							response: parsed.response,
-							...parsed.feedback !== void 0 ? { feedback: parsed.feedback } : {},
+							feedback: parsed.feedback,
 							...parsed.selected_label !== void 0 ? { selected_label: parsed.selected_label } : {},
-							...parsed.scope !== void 0 ? { scope: parsed.scope } : {}
+							scope: parsed.scope
 						};
 						runtime.resolveRemote({
 							request_id: frame.data.request_id,
@@ -32111,15 +32153,15 @@ function registerDefaultWireHandlers(deps) {
 		...deps.compactionConfigProvider !== void 0 ? { compactionConfigProvider: deps.compactionConfigProvider } : {},
 		...deps.runtimeBundleProvider !== void 0 ? { runtimeBundleProvider: deps.runtimeBundleProvider } : {},
 		eventBusProvider: () => eventBusProvider?.() ?? eventBus,
-		...approvalRuntime !== void 0 ? { approvalRuntime } : {},
-		...approvalRuntimeFactory !== void 0 ? { approvalRuntimeFactory } : {},
+		approvalRuntime,
+		approvalRuntimeFactory,
 		workspaceDir,
-		...approvalStateStore !== void 0 ? { approvalStateStore } : {},
-		...deps.skillManager !== void 0 ? { skillManager: deps.skillManager } : {},
-		...deps.agentTypeRegistry !== void 0 ? { agentTypeRegistry: deps.agentTypeRegistry } : {},
+		approvalStateStore,
+		skillManager: deps.skillManager,
+		agentTypeRegistry: deps.agentTypeRegistry,
 		questionRuntimeProvider: ({ sessionId }) => reverse !== void 0 ? createWireQuestionRuntime(reverse, sessionId) : void 0,
-		...rebuildRuntimeForModel !== void 0 ? { rebuildRuntimeForModel } : {},
-		...backgroundProcessManager !== void 0 ? { backgroundProcessManager } : {},
+		rebuildRuntimeForModel,
+		backgroundProcessManager,
 		sessionLifecycle: {
 			onSessionCreated: (managed) => deps.sessionLifecycle?.onSessionCreated?.(managed),
 			onSessionDestroyed: (sessionId) => {
@@ -32132,7 +32174,7 @@ function registerDefaultWireHandlers(deps) {
 			sessionId,
 			eventBus: sessionEventBus
 		}) ?? hookEngine,
-		...deps.logger !== void 0 ? { logger: deps.logger } : {}
+		logger: deps.logger
 	});
 	const initialHooksRef = { current: [] };
 	const handlerContext = {
@@ -32141,16 +32183,16 @@ function registerDefaultWireHandlers(deps) {
 		sessionState,
 		supportedWireEvents: SUPPORTED_WIRE_EVENTS,
 		supportedWireMethods: SUPPORTED_WIRE_METHODS,
-		...reverse !== void 0 ? { reverse } : {},
-		...authService !== void 0 ? { authService } : {},
-		...mcpRegistry !== void 0 ? { mcpRegistry } : {},
-		...modelsProvider !== void 0 ? { modelsProvider } : {},
-		...configProvider !== void 0 ? { configProvider } : {},
+		reverse,
+		authService,
+		mcpRegistry,
+		modelsProvider,
+		configProvider,
 		defaultModel,
 		...deps.defaultModelProvider !== void 0 ? { defaultModelProvider: deps.defaultModelProvider } : {},
-		...hookEngine !== void 0 ? { hookEngine } : {},
+		hookEngine,
 		usesPerSessionHookEngine: hookEngineProvider !== void 0,
-		...approvalRuntime !== void 0 ? { approval: approvalRuntime } : {},
+		approval: approvalRuntime,
 		approvalRuntimesBySession,
 		initialHooksRef,
 		registerWireHooksForSession
@@ -32923,16 +32965,16 @@ async function readSessionInfo(paths, sessionId) {
 	if (state !== null) return {
 		session_id: state.session_id,
 		created_at: state.created_at,
-		...state.model !== void 0 ? { model: state.model } : {},
-		...state.workspace_dir !== void 0 ? { workspace_dir: state.workspace_dir } : {},
-		...state.custom_title !== void 0 ? { title: state.custom_title } : {},
-		...lastActivity !== void 0 ? { last_activity: lastActivity } : {},
-		...state.producer !== void 0 ? { producer: state.producer } : {}
+		model: state.model,
+		workspace_dir: state.workspace_dir,
+		title: state.custom_title,
+		last_activity: lastActivity,
+		producer: state.producer
 	};
 	return {
 		session_id: sessionId,
 		created_at: 0,
-		...lastActivity !== void 0 ? { last_activity: lastActivity } : {}
+		last_activity: lastActivity
 	};
 }
 //#endregion
@@ -33206,7 +33248,7 @@ var SessionManager = class {
 		const contextState = new WiredContextState({
 			journalWriter,
 			initialModel: options.model,
-			...options.systemPrompt !== void 0 ? { initialSystemPrompt: options.systemPrompt } : {},
+			initialSystemPrompt: options.systemPrompt,
 			currentTurnId: () => turnManagerRef?.getCurrentTurnId() ?? "no_turn"
 		});
 		contextStateRef = contextState;
@@ -33248,8 +33290,8 @@ var SessionManager = class {
 			...options.enabledToolNames !== void 0 ? { enabledToolNames: options.enabledToolNames } : {},
 			lifecycleStateMachine,
 			producer: this.producer,
-			...options.onShellDeliver !== void 0 ? { onShellDeliver: options.onShellDeliver } : {},
-			...options.skillManager !== void 0 ? { skillManager: options.skillManager } : {},
+			onShellDeliver: options.onShellDeliver,
+			skillManager: options.skillManager,
 			...options.questionRuntime !== void 0 ? { questionRuntime: options.questionRuntime } : {},
 			...runtimeBundle.compactionConfig !== void 0 ? { compactionConfig: runtimeBundle.compactionConfig } : {},
 			compactionProvider: runtimeBundle.compactionProvider,
@@ -33258,11 +33300,11 @@ var SessionManager = class {
 				journalWriter,
 				producer: this.producer
 			}),
-			...approvalRuntime !== void 0 ? { approvalRuntime } : {},
-			...options.hookEngine !== void 0 ? { hookEngine: options.hookEngine } : {},
+			approvalRuntime,
+			hookEngine: options.hookEngine,
 			...options.toolExecutionScopeFactory !== void 0 ? { toolExecutionScopeFactory: options.toolExecutionScopeFactory } : {},
-			...options.sessionRules !== void 0 ? { sessionRules: options.sessionRules } : {},
-			...options.permissionMode !== void 0 ? { permissionMode: options.permissionMode } : {},
+			sessionRules: options.sessionRules,
+			permissionMode: options.permissionMode,
 			stateCache,
 			initialMeta,
 			pathConfig: this.paths,
@@ -33273,7 +33315,7 @@ var SessionManager = class {
 				sessionDir,
 				workDir: options.workspaceDir
 			} : {},
-			...options.logger !== void 0 ? { logger: options.logger } : {}
+			logger: options.logger
 		});
 		turnManagerRef = soulPlus.getTurnManager();
 		const disposeStateTracking = this.attachStateTracker(sessionId, stateCache, turnManagerRef);
@@ -33398,13 +33440,13 @@ var SessionManager = class {
 			created_at: stateData.created_at ?? now,
 			turn_count: stateData.turn_count ?? 0,
 			last_updated: stateData.updated_at ?? now,
-			...stateData.custom_title !== void 0 ? { title: stateData.custom_title } : {},
+			title: stateData.custom_title,
 			...stateData.tags !== void 0 ? { tags: [...stateData.tags] } : {},
-			...stateData.description !== void 0 ? { description: stateData.description } : {},
-			...stateData.archived !== void 0 ? { archived: stateData.archived } : {},
-			...stateData.color !== void 0 ? { color: stateData.color } : {},
+			description: stateData.description,
+			archived: stateData.archived,
+			color: stateData.color,
 			last_model: stateData.model,
-			...stateData.plan_slug !== void 0 ? { plan_slug: stateData.plan_slug } : {},
+			plan_slug: stateData.plan_slug,
 			producer: replayResult.producer,
 			last_exit_code: "dirty"
 		};
@@ -33430,8 +33472,8 @@ var SessionManager = class {
 			...options.enabledToolNames !== void 0 ? { enabledToolNames: options.enabledToolNames } : {},
 			lifecycleStateMachine,
 			producer: this.producer,
-			...options.onShellDeliver !== void 0 ? { onShellDeliver: options.onShellDeliver } : {},
-			...options.skillManager !== void 0 ? { skillManager: options.skillManager } : {},
+			onShellDeliver: options.onShellDeliver,
+			skillManager: options.skillManager,
 			...options.questionRuntime !== void 0 ? { questionRuntime: options.questionRuntime } : {},
 			...runtimeBundle.compactionConfig !== void 0 ? { compactionConfig: runtimeBundle.compactionConfig } : {},
 			compactionProvider: runtimeBundle.compactionProvider,
@@ -33440,10 +33482,10 @@ var SessionManager = class {
 				journalWriter,
 				producer: this.producer
 			}),
-			...approvalRuntime !== void 0 ? { approvalRuntime } : {},
-			...options.hookEngine !== void 0 ? { hookEngine: options.hookEngine } : {},
+			approvalRuntime,
+			hookEngine: options.hookEngine,
 			...options.toolExecutionScopeFactory !== void 0 ? { toolExecutionScopeFactory: options.toolExecutionScopeFactory } : {},
-			...options.sessionRules !== void 0 ? { sessionRules: options.sessionRules } : {},
+			sessionRules: options.sessionRules,
 			permissionMode: effectivePermissionMode,
 			stateCache,
 			initialMeta,
@@ -33455,7 +33497,7 @@ var SessionManager = class {
 				sessionDir,
 				workDir: stateData.workspace_dir ?? process.cwd()
 			} : {},
-			...options.logger !== void 0 ? { logger: options.logger } : {}
+			logger: options.logger
 		});
 		turnManagerRef = soulPlus.getTurnManager();
 		const disposeStateTracking = this.attachStateTracker(sessionId, stateCache, turnManagerRef);
@@ -33725,14 +33767,14 @@ var SessionManager = class {
 				updated_at: now,
 				model: managed.contextState.model,
 				permission_mode: currentPermissionMode,
-				...meta?.title !== void 0 ? { custom_title: meta.title } : {},
+				custom_title: meta?.title,
 				...meta?.tags !== void 0 ? { tags: [...meta.tags] } : {},
-				...meta?.description !== void 0 ? { description: meta.description } : {},
-				...meta?.archived !== void 0 ? { archived: meta.archived } : {},
-				...meta?.color !== void 0 ? { color: meta.color } : {},
+				description: meta?.description,
+				archived: meta?.archived,
+				color: meta?.color,
 				turn_count: meta?.turn_count ?? existing.turn_count ?? 0,
-				...meta?.plan_slug !== void 0 ? { plan_slug: meta.plan_slug } : {},
-				...currentThinkingLevel !== void 0 ? { thinking_level: currentThinkingLevel } : {},
+				plan_slug: meta?.plan_slug,
+				thinking_level: currentThinkingLevel,
 				...currentPlanMode ? { plan_mode: true } : { plan_mode: false },
 				todos: cloneTodoItems(currentTodos),
 				last_exit_code: "clean"
@@ -33744,7 +33786,7 @@ var SessionManager = class {
 				permission_mode: currentPermissionMode,
 				plan_mode: currentPlanMode,
 				turn_count: meta?.turn_count ?? 0,
-				...currentThinkingLevel !== void 0 ? { thinking_level: currentThinkingLevel } : {},
+				thinking_level: currentThinkingLevel,
 				todos: cloneTodoItems(currentTodos),
 				last_exit_code: "clean"
 			};
@@ -41191,7 +41233,7 @@ async function parseSkillFromFile(opts) {
 		content,
 		metadata,
 		source: opts.source,
-		...mermaid !== void 0 ? { mermaid } : {}
+		mermaid
 	};
 }
 /**
@@ -76214,8 +76256,8 @@ var GoogleGenAIChatProvider = class {
 			apiKey: this._apiKey,
 			...this._vertexai ? {
 				vertexai: true,
-				...this._project !== void 0 ? { project: this._project } : {},
-				...this._location !== void 0 ? { location: this._location } : {}
+				project: this._project,
+				location: this._location
 			} : {}
 		});
 	}
@@ -77845,8 +77887,8 @@ function kimiOverrides(provider, model, env) {
 		}
 	}
 	return {
-		...nextProvider !== void 0 ? { provider: nextProvider } : {},
-		...nextModel !== void 0 ? { model: nextModel } : {}
+		provider: nextProvider,
+		model: nextModel
 	};
 }
 function openaiOverrides(provider, env) {
@@ -78009,8 +78051,8 @@ function resolveModelAlias(config, nameOrAlias) {
 async function createProviderFromConfig(config, modelNameOrAlias, deps) {
 	const requestedModel = modelNameOrAlias ?? config.defaultModel;
 	const effectiveConfig = resolveEffectiveConfig(config, {
-		...deps?.env !== void 0 ? { env: deps.env } : {},
-		...requestedModel !== void 0 ? { requestedModel } : {}
+		env: deps?.env,
+		requestedModel
 	});
 	let providerName;
 	let modelName;
@@ -78070,7 +78112,7 @@ var DeferredOAuthChatProvider = class DeferredOAuthChatProvider {
 		return provider.files.uploadVideo({
 			data: input.data,
 			mimeType: input.mimeType,
-			...input.filename !== void 0 ? { filename: input.filename } : {}
+			filename: input.filename
 		});
 	}
 	withThinking(effort) {
@@ -78232,11 +78274,11 @@ function createVideoUploader(provider) {
 		const uploaded = await uploadVideo({
 			data: input.data,
 			mimeType: input.mimeType,
-			...input.filename !== void 0 ? { filename: input.filename } : {}
+			filename: input.filename
 		});
 		return {
 			url: uploaded.videoUrl.url,
-			...uploaded.videoUrl.id !== void 0 ? { id: uploaded.videoUrl.id } : {}
+			id: uploaded.videoUrl.id
 		};
 	};
 }
@@ -78266,20 +78308,20 @@ async function createDefaultSoulPlusRuntimeBundle(options) {
 	};
 	if (options.kimiConfig === void 0) throw new Error("createDefaultSoulPlusWireClient: provide either runtime+compactionProvider or kimiConfig");
 	const provider = await createProviderFromConfig(options.kimiConfig, defaultModel, {
-		...options.oauthResolver !== void 0 ? { oauthResolver: options.oauthResolver } : {},
-		...options.deferOAuth !== void 0 ? { deferOAuth: options.deferOAuth } : {},
-		...options.defaultHeaders !== void 0 ? { defaultHeaders: options.defaultHeaders } : {}
+		oauthResolver: options.oauthResolver,
+		deferOAuth: options.deferOAuth,
+		defaultHeaders: options.defaultHeaders
 	});
 	const videoUploader = createVideoUploader(provider);
 	return {
 		runtime: createRuntime({ kosong: createKosongAdapter({
 			provider,
-			...options.tokenRefresher !== void 0 ? { tokenRefresher: options.tokenRefresher } : {}
+			tokenRefresher: options.tokenRefresher
 		}) }),
 		compactionProvider: createKosongCompactionProvider(provider),
 		defaultModel,
 		maxContextSize,
-		...videoUploader !== void 0 ? { videoUploader } : {}
+		videoUploader
 	};
 }
 const LLM_NOT_CONFIGURED_MESSAGE = "No LLM configured. Run /login to authenticate.";
@@ -78740,7 +78782,7 @@ var LocalKaos = class {
 				"pipe"
 			],
 			detached: !isWindows,
-			...env !== void 0 ? { env } : {}
+			env
 		});
 		await waitForSpawn(child);
 		return new LocalProcess(child);
@@ -93213,7 +93255,7 @@ function toUsageRow(raw, defaultLabel) {
 		label: name,
 		used: used ?? 0,
 		limit: limit ?? 0,
-		...resetHint !== void 0 ? { resetHint } : {}
+		resetHint
 	};
 }
 function limitLabel(item, detail, window, idx) {
@@ -93411,7 +93453,7 @@ function applyManagedKimiCodeConfig(config, options) {
 			provider: KIMI_CODE_PROVIDER_NAME,
 			model: model.id,
 			maxContextSize: model.contextLength,
-			...capabilities !== void 0 ? { capabilities } : {}
+			capabilities
 		};
 	}
 	config.models = existingModels;
@@ -93446,7 +93488,7 @@ async function provisionManagedKimiCodeConfigAfterLogin(options) {
 	const config = loadConfig({ pathConfig: options.pathConfig });
 	const applied = applyManagedKimiCodeConfig(config, {
 		models,
-		...options.baseUrl !== void 0 ? { baseUrl: options.baseUrl } : {}
+		baseUrl: options.baseUrl
 	});
 	await saveConfig(config, { pathConfig: options.pathConfig });
 	return {
@@ -93665,15 +93707,15 @@ function createDefaultSoulPlusWebProviders(options) {
 	const fetchBaseUrl = fetchService?.baseUrl ?? (kimiCodeOAuth !== void 0 ? `${moonshotBase}/fetch` : void 0);
 	return {
 		webSearchProvider: searchBaseUrl !== void 0 ? new MoonshotWebSearchProvider({
-			...searchOAuth !== void 0 ? { oauthManager: searchOAuth } : {},
-			...searchService?.apiKey !== void 0 ? { apiKey: searchService.apiKey } : {},
+			oauthManager: searchOAuth,
+			apiKey: searchService?.apiKey,
 			baseUrl: searchBaseUrl,
 			userAgent: options.userAgent,
 			...searchService?.customHeaders !== void 0 ? { customHeaders: searchService.customHeaders } : {}
 		}) : new StubWebSearchProvider(),
 		urlFetcher: fetchBaseUrl !== void 0 ? new MoonshotFetchURLProvider({
-			...fetchOAuth !== void 0 ? { oauthManager: fetchOAuth } : {},
-			...fetchService?.apiKey !== void 0 ? { apiKey: fetchService.apiKey } : {},
+			oauthManager: fetchOAuth,
+			apiKey: fetchService?.apiKey,
 			baseUrl: fetchBaseUrl,
 			userAgent: options.userAgent,
 			...fetchService?.customHeaders !== void 0 ? { customHeaders: fetchService.customHeaders } : {},
@@ -93728,8 +93770,8 @@ var DefaultSoulPlusOAuthServiceImpl = class {
 		const name = providerName ?? "managed:kimi-code";
 		const manager = this.managerFor(name);
 		const accessToken = await manager.hasToken() ? await manager.ensureFresh() : (await manager.login({
-			...options?.signal !== void 0 ? { signal: options.signal } : {},
-			...options?.onDeviceCode !== void 0 ? { onDeviceCode: options.onDeviceCode } : {}
+			signal: options?.signal,
+			onDeviceCode: options?.onDeviceCode
 		})).accessToken;
 		await provisionManagedKimiCodeConfigAfterLogin({
 			pathConfig: this.options.pathConfig,
@@ -93963,10 +94005,10 @@ async function scanSessionWire(sessionDir) {
 		}
 	}
 	return {
-		...firstActivityMs !== void 0 ? { firstActivityMs } : {},
-		...lastActivityMs !== void 0 ? { lastActivityMs } : {},
-		...lastUserMessageMs !== void 0 ? { lastUserMessageMs } : {},
-		...firstUserInput !== void 0 ? { firstUserInput } : {}
+		firstActivityMs,
+		lastActivityMs,
+		lastUserMessageMs,
+		firstUserInput
 	};
 }
 function normalizeTimestampMs(value) {
@@ -94236,7 +94278,7 @@ var KimiWireClient = class {
 		const message = createWireRequest({
 			method,
 			sessionId: options?.sessionId ?? "__process__",
-			...data !== void 0 ? { data } : {}
+			data
 		});
 		const response = await this.sendRequestMessage(message, options);
 		if (response.error !== void 0) throw new WireResponseError(response);
@@ -94245,8 +94287,8 @@ var KimiWireClient = class {
 	initialize(data) {
 		return this.request("initialize", {
 			protocol_version: data?.protocol_version ?? "2.1",
-			...data?.capabilities !== void 0 ? { capabilities: data.capabilities } : {},
-			...data?.hooks !== void 0 ? { hooks: data.hooks } : {}
+			capabilities: data?.capabilities,
+			hooks: data?.hooks
 		});
 	}
 	getModels() {
@@ -94365,7 +94407,7 @@ var KimiWireClient = class {
 	getBackgroundTaskOutput(sessionId, taskId, tail) {
 		return this.request("session.getBackgroundTaskOutput", {
 			task_id: taskId,
-			...tail !== void 0 ? { tail } : {}
+			tail
 		}, { sessionId });
 	}
 	rollback(sessionId, nTurnsBack) {
@@ -94377,7 +94419,7 @@ var KimiWireClient = class {
 	activateSkill(sessionId, name, args) {
 		return this.request("session.activateSkill", {
 			name,
-			...args !== void 0 ? { args } : {}
+			args
 		}, { sessionId });
 	}
 	mcpList() {
@@ -94408,7 +94450,7 @@ var KimiWireClient = class {
 		return this.request("mcp.getPrompt", {
 			server_id: serverId,
 			name,
-			...args !== void 0 ? { arguments: args } : {}
+			arguments: args
 		});
 	}
 	mcpStartAuth(serverId) {
@@ -94441,7 +94483,7 @@ var KimiWireClient = class {
 	addSystemReminder(sessionId, content, category) {
 		return this.request("session.addSystemReminder", {
 			content,
-			...category !== void 0 ? { category } : {}
+			category
 		}, { sessionId });
 	}
 	registerTool(sessionId, data) {
@@ -94630,7 +94672,7 @@ async function startCoreWireServer(options) {
 		kosong: options.runtime.kosong,
 		tools: options.tools ?? [],
 		...options.enabledToolNames !== void 0 ? { enabledToolNames: options.enabledToolNames } : {},
-		...options.approval !== void 0 ? { approval: options.approval } : {},
+		approval: options.approval,
 		...options.enableWiredApprovals !== void 0 ? { enableWiredApprovals: options.enableWiredApprovals } : {},
 		eventBus,
 		eventBusProvider: () => new SessionEventBus(),
@@ -94640,7 +94682,7 @@ async function startCoreWireServer(options) {
 		}),
 		workspaceDir: options.workspaceDir,
 		defaultModel: options.defaultModel,
-		...options.runtimeProvider !== void 0 ? { runtimeProvider: options.runtimeProvider } : {},
+		runtimeProvider: options.runtimeProvider,
 		...options.defaultModelProvider !== void 0 ? { defaultModelProvider: options.defaultModelProvider } : {},
 		...options.compactionProviderProvider !== void 0 ? { compactionProviderProvider: options.compactionProviderProvider } : {},
 		...options.compactionConfigProvider !== void 0 ? { compactionConfigProvider: options.compactionConfigProvider } : {},
@@ -94650,19 +94692,19 @@ async function startCoreWireServer(options) {
 		pathConfig: options.pathConfig,
 		server: options.transport,
 		hookEngine,
-		...options.skillManager !== void 0 ? { skillManager: options.skillManager } : {},
+		skillManager: options.skillManager,
 		...options.agentTypeRegistry !== void 0 ? { agentTypeRegistry: options.agentTypeRegistry } : {},
-		...options.mcpRegistry !== void 0 ? { mcpRegistry: options.mcpRegistry } : {},
-		...options.authService !== void 0 ? { authService: options.authService } : {},
+		mcpRegistry: options.mcpRegistry,
+		authService: options.authService,
 		...options.backgroundProcessManager !== void 0 ? { backgroundProcessManager: options.backgroundProcessManager } : {},
 		sessionLifecycle: {
 			onSessionCreated: installBridge,
 			onSessionDestroyed: disposeBridge
 		},
-		...options.modelsProvider !== void 0 ? { modelsProvider: options.modelsProvider } : {},
-		...options.configProvider !== void 0 ? { configProvider: options.configProvider } : {},
-		...options.logger !== void 0 ? { logger: options.logger } : {},
-		...options.skillManager !== void 0 ? { skillManager: options.skillManager } : {}
+		modelsProvider: options.modelsProvider,
+		configProvider: options.configProvider,
+		logger: options.logger,
+		skillManager: options.skillManager
 	}).getEventFilter;
 	options.transport.onMessage = (frame) => {
 		(async () => {
@@ -94810,7 +94852,7 @@ async function createDefaultSoulPlusWireClient(options) {
 		enabledToolNames: defaults.enabledToolNames,
 		webSearchProvider: webProviders.webSearchProvider,
 		urlFetcher: webProviders.urlFetcher,
-		...activeVideoUploader !== void 0 ? { videoUploader: activeVideoUploader } : {}
+		videoUploader: activeVideoUploader
 	});
 	const backgroundManager = builtin.backgroundManager;
 	const handle = await createInProcessWireClient({
@@ -94833,7 +94875,7 @@ async function createDefaultSoulPlusWireClient(options) {
 			...activeDefaultModel.length > 0 ? { default_model: activeDefaultModel } : {}
 		}),
 		configProvider: () => effectiveConfig,
-		...options.logger !== void 0 ? { logger: options.logger } : {},
+		logger: options.logger,
 		backgroundProcessManager: backgroundManager,
 		...options.defaultTimeoutMs !== void 0 ? { defaultTimeoutMs: options.defaultTimeoutMs } : {}
 	});
@@ -95042,26 +95084,21 @@ function pinoToLogger(p) {
 async function createKimiAgent() {
 	const workDir = process.cwd();
 	const version = getVersion();
-	const { client, dispose: disposeClient, maxContextSize, defaultModel: modelAlias, defaultThinking, defaultYolo, defaultPlanMode, theme, defaultEditor, availableModels, syncSessionRuntime } = await createDefaultSoulPlusWireClient({
+	const { client, dispose, maxContextSize, defaultModel, defaultThinking, defaultYolo, defaultPlanMode, availableModels, syncSessionRuntime } = await createDefaultSoulPlusWireClient({
 		workspaceDir: workDir,
 		userAgent: `KimiCLI/${version}`,
 		defaultHeaders: buildKimiDefaultHeaders(version),
 		logger: pinoToLogger(getLogger()).child({ component: "session" })
 	});
 	client.onRequest("hook.request", async () => ({ ok: true }));
-	const dispose = async () => {
-		await disposeClient();
-	};
 	return {
 		client,
-		model: modelAlias,
+		model: defaultModel,
 		defaultThinking,
 		defaultModes: {
 			yolo: defaultYolo,
 			planMode: defaultPlanMode
 		},
-		theme,
-		defaultEditor,
 		availableModels,
 		maxContextSize,
 		syncSessionRuntime,
@@ -95212,6 +95249,40 @@ function shellQuote(path) {
 	return `'${path.replace(/'/g, "'\\''")}'`;
 }
 //#endregion
+//#region src/tui/components/media/image-thumbnail.ts
+/**
+* Transcript-side rendering of a pasted image.
+*
+* On terminals that speak the Kitty graphics protocol or iTerm2 inline
+* image protocol (detected by pi-tui's `getCapabilities()`), we show
+* the actual image. Everywhere else we fall back to a one-line text
+* marker matching the placeholder the user sees in the input box —
+* this keeps the transcript readable on Terminal.app / Linux default
+* terminals / `script` recordings without extra chrome.
+*
+* Height is capped at ~12 rows so a single screenshot can't monopolize
+* the viewport; pi-tui handles proportional scaling internally.
+*/
+const MAX_IMAGE_ROWS = 12;
+var ImageThumbnail = class extends Container {
+	constructor(attachment, colors) {
+		super();
+		const caps = getCapabilities();
+		if (!(caps.images === "kitty" || caps.images === "iterm2")) {
+			this.addChild(new Text(chalk.dim.cyan(`  ${attachment.placeholder}`), 0, 0));
+			return;
+		}
+		const image = new Image(Buffer.from(attachment.bytes).toString("base64"), attachment.mime, { fallbackColor: (s) => chalk.hex(colors.textDim)(s) }, {
+			maxHeightCells: MAX_IMAGE_ROWS,
+			filename: attachment.placeholder
+		}, {
+			widthPx: attachment.width,
+			heightPx: attachment.height
+		});
+		this.addChild(image);
+	}
+};
+//#endregion
 //#region src/tui/components/messages/assistant-message.ts
 const BULLET$1 = "⏺ ";
 const INDENT$1 = "  ";
@@ -95251,44 +95322,41 @@ var AssistantMessageComponent = class {
 	}
 };
 //#endregion
-//#region src/tui/components/media/image-thumbnail.ts
+//#region src/tui/components/messages/skill-activation.ts
 /**
-* Transcript-side rendering of a pasted image.
+* Skill activation card.
 *
-* On terminals that speak the Kitty graphics protocol or iTerm2 inline
-* image protocol (detected by pi-tui's `getCapabilities()`), we show
-* the actual image. Everywhere else we fall back to a one-line text
-* marker matching the placeholder the user sees in the input box —
-* this keeps the transcript readable on Terminal.app / Linux default
-* terminals / `script` recordings without extra chrome.
+* 用户跑 `/skill:foo bar` 时不再把 SKILL.md 正文铺在 user 气泡里 ——
+* 只显示一张紧凑卡片：
 *
-* Height is capped at ~12 rows so a single screenshot can't monopolize
-* the viewport; pi-tui handles proportional scaling internally.
+*   ▶ Activated skill: foo
+*     bar
+*
+* 第二行（args）可省。skill 正文已经经由 `client.prompt` 进了 LLM
+* 的上下文，用户视角无需再看到。
+*
+* Resume 重放仍会通过磁盘上的 user_message WAL 把 skill 正文当 user
+* 消息渲染（核心层未引入 skill_activated WAL 类型）—— 视为已知限制。
 */
-const MAX_IMAGE_ROWS = 12;
-var ImageThumbnail = class extends Container {
-	constructor(attachment, colors) {
+const ARGS_PREVIEW_MAX = 200;
+var SkillActivationComponent = class extends Container {
+	constructor(name, args, colors) {
 		super();
-		const caps = getCapabilities();
-		if (!(caps.images === "kitty" || caps.images === "iterm2")) {
-			this.addChild(new Text(chalk.dim.cyan(`  ${attachment.placeholder}`), 0, 0));
-			return;
+		this.addChild(new Spacer(1));
+		const head = chalk.hex(colors.primary).bold("▶ Activated skill: ") + chalk.hex(colors.user).bold(name);
+		this.addChild(new Text(head, 0, 0));
+		const trimmed = args?.trim() ?? "";
+		if (trimmed.length > 0) {
+			const preview = trimmed.length > ARGS_PREVIEW_MAX ? trimmed.slice(0, ARGS_PREVIEW_MAX) + "…" : trimmed;
+			this.addChild(new Text("  " + chalk.hex(colors.textDim)(preview), 0, 0));
 		}
-		const image = new Image(Buffer.from(attachment.bytes).toString("base64"), attachment.mime, { fallbackColor: (s) => chalk.hex(colors.textDim)(s) }, {
-			maxHeightCells: MAX_IMAGE_ROWS,
-			filename: attachment.placeholder
-		}, {
-			widthPx: attachment.width,
-			heightPx: attachment.height
-		});
-		this.addChild(image);
 	}
 };
 //#endregion
 //#region src/tui/components/messages/thinking.ts
 const BULLET = "⏺ ";
 const INDENT = "  ";
-const PREVIEW_LINES$1 = 5;
+const PREVIEW_LINES$1 = 3;
 const SPINNER_FRAMES = [
 	"⠋",
 	"⠙",
@@ -95342,7 +95410,7 @@ var ThinkingComponent = class {
 			const visibleLines = contentLines.length > PREVIEW_LINES$1 ? contentLines.slice(contentLines.length - PREVIEW_LINES$1) : contentLines;
 			return [
 				"",
-				INDENT + chalk.hex(this.color)(SPINNER_FRAMES[this.spinnerFrame] ?? SPINNER_FRAMES[0]) + chalk.hex(this.color)(" thinking..."),
+				chalk.hex(this.color)(`${SPINNER_FRAMES[this.spinnerFrame] ?? SPINNER_FRAMES[0]} `) + chalk.hex(this.color)("thinking..."),
 				...visibleLines.map((line) => INDENT + line)
 			];
 		}
@@ -95378,7 +95446,7 @@ var ThinkingComponent = class {
 * Reuses the diff algorithm from approval/DiffPreview.tsx, but outputs
 * formatted text lines instead of React elements.
 */
-function computeDiffLines(oldText, newText, oldStart = 1, newStart = 1) {
+function computeDiffLines(oldText, newText, oldStart = 1, newStart = 1, isIncomplete = false) {
 	const oldLines = oldText ? oldText.split("\n") : [];
 	const newLines = newText ? newText.split("\n") : [];
 	const m = oldLines.length;
@@ -95414,10 +95482,16 @@ function computeDiffLines(oldText, newText, oldStart = 1, newStart = 1) {
 	}
 	const result = [];
 	for (let k = reversed.length - 1; k >= 0; k--) result.push(reversed[k]);
+	if (isIncomplete && result.length > 0) {
+		let lastNonDelete = result.length - 1;
+		while (lastNonDelete >= 0 && result[lastNonDelete].kind === "delete") lastNonDelete--;
+		if (lastNonDelete >= 0) result.length = lastNonDelete + 1;
+		else result.length = 0;
+	}
 	return result;
 }
-function renderDiffLines(oldText, newText, path, oldStart, newStart, maxLines) {
-	const changedLines = computeDiffLines(oldText, newText, oldStart ?? 1, newStart ?? 1).filter((l) => l.kind !== "context");
+function renderDiffLines(oldText, newText, path, isIncomplete = false, oldStart, newStart, maxLines) {
+	const changedLines = computeDiffLines(oldText, newText, oldStart ?? 1, newStart ?? 1, isIncomplete).filter((l) => l.kind !== "context");
 	const added = changedLines.filter((l) => l.kind === "add").length;
 	const removed = changedLines.filter((l) => l.kind === "delete").length;
 	const output = [];
@@ -95538,7 +95612,7 @@ function extractApprovedPlan(output) {
 }
 const STREAMING_FIELD_RE$1 = /"(path|file_path|command|pattern|query|url|description|title|name)"\s*:\s*"((?:\\.|[^"\\])*)"/g;
 function unescapeJsonString$1(s) {
-	return s.replace(/\\(["\\/bfnrt])/g, (_, ch) => {
+	return s.replaceAll(/\\(["\\/bfnrt])/g, (_, ch) => {
 		switch (ch) {
 			case "n": return "\n";
 			case "t": return "	";
@@ -95600,7 +95674,7 @@ function extractPartialStringField(text, key) {
 					const hex = text.slice(i + 2, i + 6);
 					const code = Number.parseInt(hex, 16);
 					if (Number.isNaN(code)) return out;
-					out += String.fromCharCode(code);
+					out += String.fromCodePoint(code);
 					i += 6;
 					continue;
 				}
@@ -95867,7 +95941,7 @@ var ToolCallComponent = class extends Container {
 			this.buildPlanPreview();
 			return;
 		}
-		if (this.toolCall.streamingArguments !== void 0) {
+		if (this.result === void 0 && this.toolCall.streamingArguments !== void 0) {
 			this.buildStreamingPreview(this.toolCall.streamingArguments);
 			return;
 		}
@@ -95886,7 +95960,7 @@ var ToolCallComponent = class extends Container {
 			const oldStr = str(this.toolCall.args["old_string"]);
 			const newStr = str(this.toolCall.args["new_string"]);
 			if (oldStr.length === 0 && newStr.length === 0) return;
-			const allLines = renderDiffLines(oldStr, newStr, str(this.toolCall.args["file_path"] ?? this.toolCall.args["path"]));
+			const allLines = renderDiffLines(oldStr, newStr, str(this.toolCall.args["file_path"] ?? this.toolCall.args["path"]), false);
 			const shown = allLines.slice(0, CALL_PREVIEW_LINES);
 			const remaining = allLines.length - shown.length;
 			for (const line of shown) this.addChild(new Text(line, 2, 0));
@@ -95917,7 +95991,7 @@ var ToolCallComponent = class extends Container {
 			const oldStr = extractPartialStringField(streamText, "old_string") ?? "";
 			const newStr = extractPartialStringField(streamText, "new_string") ?? "";
 			if (oldStr.length === 0 && newStr.length === 0) return;
-			const allLines = renderDiffLines(oldStr, newStr, extractPartialStringField(streamText, "file_path") ?? extractPartialStringField(streamText, "path") ?? "");
+			const allLines = renderDiffLines(oldStr, newStr, extractPartialStringField(streamText, "file_path") ?? extractPartialStringField(streamText, "path") ?? "", true);
 			const shown = allLines.slice(0, CALL_PREVIEW_LINES);
 			const remaining = allLines.length - shown.length;
 			for (const line of shown) this.addChild(new Text(line, 2, 0));
@@ -96053,10 +96127,11 @@ var WelcomeComponent = class {
 			"",
 			...infoLines
 		];
-		const lines = [];
-		lines.push("");
-		lines.push(primary("╭" + "─".repeat(width - 2) + "╮"));
-		lines.push(primary("│") + " ".repeat(width - 2) + primary("│"));
+		const lines = [
+			"",
+			primary("╭" + "─".repeat(width - 2) + "╮"),
+			primary("│") + " ".repeat(width - 2) + primary("│")
+		];
 		for (const content of contentLines) {
 			const truncated = truncateToWidth(content, innerWidth, "…");
 			const vis = visibleWidth(truncated);
@@ -96202,6 +96277,7 @@ function createTranscriptComponent(state, entry) {
 			}
 			return msg;
 		}
+		case "skill_activation": return new SkillActivationComponent(entry.skillName ?? entry.content, entry.skillArgs, state.colors);
 		case "assistant": return createAssistantEntry(state, entry.content);
 		case "thinking": return new ThinkingComponent(entry.content, state.colors, true);
 		case "tool_call":
@@ -96267,7 +96343,7 @@ function emitStatus(state, message, color) {
 		turnId: state.currentTurnId,
 		renderMode: "plain",
 		content: message,
-		...color !== void 0 ? { color } : {}
+		color
 	});
 }
 function emitNotice(state, title, detail) {
@@ -96277,7 +96353,7 @@ function emitNotice(state, title, detail) {
 		turnId: state.currentTurnId,
 		renderMode: "notice",
 		content: title,
-		...detail !== void 0 ? { detail } : {}
+		detail
 	});
 }
 /** Red. */
@@ -96344,7 +96420,7 @@ function buildImagePart(att) {
 }
 //#endregion
 //#region src/tui/theme/pi-tui-theme.ts
-const HEADING_HASH_PREFIX = /^((?:\x1b\[[0-9;]*m)*)#{1,6}[ \t]+/;
+const HEADING_HASH_PREFIX = /^((?:\x1B\[[0-9;]*m)*)#{1,6}[ \t]+/;
 function createMarkdownTheme(colors) {
 	const stripHash = (text) => text.replace(HEADING_HASH_PREFIX, "$1");
 	return {
@@ -96590,7 +96666,7 @@ function fetchSnapshot(gitRoot) {
 	const seen = /* @__PURE__ */ new Set();
 	for (const path of tracked) seen.add(path);
 	for (const path of untracked) seen.add(path);
-	const merged = [...seen].sort();
+	const merged = [...seen].toSorted();
 	const files = merged.length > MAX_ENTRIES ? merged.slice(0, MAX_ENTRIES) : merged;
 	return {
 		files,
@@ -96732,7 +96808,7 @@ async function refreshConfigAfterLogin(client, ctx) {
 	const selected = defaultModel !== void 0 ? availableModels[defaultModel] : void 0;
 	const patch = {
 		availableModels,
-		...defaultModel !== void 0 ? { model: defaultModel } : {},
+		model: defaultModel,
 		...selected?.maxContextSize !== void 0 ? { maxContextTokens: selected.maxContextSize } : {},
 		...typeof config["defaultThinking"] === "boolean" ? { thinking: config["defaultThinking"] } : {}
 	};
@@ -96746,6 +96822,7 @@ function createAuthCommands(deps = {}) {
 		aliases: [],
 		description: "Clear OAuth credentials",
 		mode: "both",
+		priority: 40,
 		async execute(_args, _ctx) {
 			if (deps.client === void 0) return ok$2("OAuth is unavailable: no wire client is attached.");
 			if (!(await deps.client.authStatus(providerName)).providers.some((provider) => provider.provider_name === providerName && provider.has_token)) return ok$2("Not logged in.");
@@ -96757,6 +96834,7 @@ function createAuthCommands(deps = {}) {
 		aliases: [],
 		description: "Start OAuth device code login flow",
 		mode: "both",
+		priority: 40,
 		async execute(_args, ctx) {
 			if (deps.client === void 0) return ok$2("OAuth is unavailable: no wire client is attached.");
 			const disposeDeviceCodeHandler = deps.client.onRequest("auth.device_code", (req) => {
@@ -96805,6 +96883,7 @@ const shellCommands = [
 		aliases: ["quit", "q"],
 		description: "Exit the application",
 		mode: "both",
+		priority: 20,
 		async execute() {
 			return { type: "exit" };
 		}
@@ -96814,6 +96893,7 @@ const shellCommands = [
 		aliases: ["h", "?"],
 		description: "Show available commands and shortcuts",
 		mode: "both",
+		priority: 80,
 		async execute(_args, _ctx) {
 			return ok$1("__show_help__");
 		}
@@ -96823,6 +96903,7 @@ const shellCommands = [
 		aliases: [],
 		description: "Show version information",
 		mode: "both",
+		priority: 20,
 		async execute(_args, ctx) {
 			return ok$1(`Kimi Code v${ctx.appState.version}`);
 		}
@@ -96832,6 +96913,7 @@ const shellCommands = [
 		aliases: [],
 		description: "Start a fresh session in the current workspace",
 		mode: "both",
+		priority: 80,
 		async execute() {
 			return {
 				type: "reload",
@@ -96844,6 +96926,7 @@ const shellCommands = [
 		aliases: ["resume"],
 		description: "Browse and resume sessions",
 		mode: "both",
+		priority: 80,
 		async execute(_args, _ctx) {
 			return ok$1("__show_sessions__");
 		}
@@ -96853,6 +96936,7 @@ const shellCommands = [
 		aliases: ["rename"],
 		description: "Set or show session title",
 		mode: "both",
+		priority: 60,
 		async execute(args, ctx) {
 			const trimmed = args.trim();
 			if (trimmed.length === 0) {
@@ -96873,6 +96957,7 @@ const shellCommands = [
 		aliases: ["yes"],
 		description: "Toggle auto-approve mode",
 		mode: "both",
+		priority: 100,
 		async execute(args, ctx) {
 			let enabled;
 			if (args === "on") enabled = true;
@@ -96889,6 +96974,7 @@ const shellCommands = [
 		aliases: [],
 		description: "Toggle plan mode",
 		mode: "both",
+		priority: 100,
 		async execute(args, ctx) {
 			const subcmd = args.trim().toLowerCase();
 			if (subcmd === "view") {
@@ -96916,6 +97002,7 @@ const shellCommands = [
 		aliases: [],
 		description: "Switch LLM model",
 		mode: "both",
+		priority: 100,
 		async execute(args, ctx) {
 			const trimmed = args.trim();
 			if (trimmed.length === 0) return ok$1("__show_model_picker__");
@@ -96928,6 +97015,7 @@ const shellCommands = [
 		aliases: ["status"],
 		description: "Show session tokens + context window + plan quotas",
 		mode: "both",
+		priority: 60,
 		async execute() {
 			return ok$1("__show_usage__");
 		}
@@ -96947,6 +97035,7 @@ const soulCommands = [{
 	aliases: [],
 	description: "Compact the conversation context",
 	mode: "both",
+	priority: 80,
 	async execute(args, ctx) {
 		const customInstruction = args.trim() || void 0;
 		await ctx.client.compact(ctx.appState.sessionId, customInstruction);
@@ -96967,13 +97056,12 @@ function parseSlashInput(input) {
 	const trimmed = input.slice(1).trim();
 	if (trimmed.length === 0) return null;
 	const spaceIdx = trimmed.indexOf(" ");
-	if (spaceIdx === -1) return {
-		name: trimmed,
-		args: ""
-	};
+	const name = spaceIdx === -1 ? trimmed : trimmed.slice(0, spaceIdx);
+	const args = spaceIdx === -1 ? "" : trimmed.slice(spaceIdx + 1).trim();
+	if (name.includes("/")) return null;
 	return {
-		name: trimmed.slice(0, spaceIdx),
-		args: trimmed.slice(spaceIdx + 1).trim()
+		name,
+		args
 	};
 }
 //#endregion
@@ -97030,11 +97118,17 @@ var SlashCommandRegistry = class {
 		}
 		return [...bestScores.values()].toSorted((a, b) => b.score - a.score || a.def.name.localeCompare(b.def.name)).map(({ def }) => def);
 	}
-	/** List all registered commands, optionally filtered by mode. */
+	/**
+	* List all registered commands, optionally filtered by mode.
+	* Built-in commands come first, sorted alphabetically; skill commands
+	* follow in their original registration order.
+	*/
 	listAll(mode) {
 		const all = [...this.commands.values()];
-		if (mode === void 0) return all.toSorted((a, b) => a.name.localeCompare(b.name));
-		return all.filter((def) => def.mode === mode || def.mode === "both").toSorted((a, b) => a.name.localeCompare(b.name));
+		const filtered = mode === void 0 ? all : all.filter((def) => def.mode === mode || def.mode === "both");
+		const builtins = filtered.filter((def) => !def.name.startsWith(SKILL_COMMAND_PREFIX)).toSorted((a, b) => (b.priority ?? 0) - (a.priority ?? 0) || a.name.localeCompare(b.name));
+		const skills = filtered.filter((def) => def.name.startsWith(SKILL_COMMAND_PREFIX));
+		return [...builtins, ...skills];
 	}
 	/** Get the number of registered commands. */
 	get size() {
@@ -97605,9 +97699,7 @@ var TodoPanelComponent = class {
 	render(width) {
 		if (this.todos.length === 0) return [];
 		const c = this.colors;
-		const lines = [];
-		lines.push(chalk.hex(c.border)("─".repeat(width)));
-		lines.push(chalk.hex(c.primary).bold(" Todo"));
+		const lines = [chalk.hex(c.border)("─".repeat(width)), chalk.hex(c.primary).bold(" Todo")];
 		for (const todo of this.todos) lines.push(renderRow(todo, c));
 		return lines.map((line) => truncateToWidth(line, width));
 	}
@@ -97977,7 +98069,7 @@ function enqueueMessage(state, text) {
 }
 function recallLastQueued(state) {
 	if (state.queuedMessages.length === 0) return void 0;
-	const last = state.queuedMessages[state.queuedMessages.length - 1];
+	const last = state.queuedMessages.at(-1);
 	state.queuedMessages = state.queuedMessages.slice(0, -1);
 	return last.text;
 }
@@ -98043,6 +98135,66 @@ function sendMessageInternal(state, addEntry, input, options) {
 		});
 	});
 }
+/**
+* Activate a skill: render a compact activation card (no skill body in
+* the transcript) and forward the prepared prompt — `skill.content +
+* "\n\nUser request:\n" + args` — to core via `client.prompt`. Keeps
+* the skill body out of the user-visible transcript while still feeding
+* it into the LLM exactly as the legacy path did.
+*/
+function sendSkillActivation(state, addEntry, skillName, skillArgs, fullPrompt) {
+	addEntry({
+		id: nextTranscriptId(),
+		kind: "skill_activation",
+		turnId: void 0,
+		renderMode: "plain",
+		content: `Activated skill: ${skillName}`,
+		skillName,
+		skillArgs
+	});
+	state.currentTurnId = void 0;
+	state.assistantDraft = "";
+	state.assistantStreamActive = false;
+	state.thinkingDraft = "";
+	disposeActiveThinkingComponent(state);
+	state.activeToolCalls.clear();
+	state.streamingToolCallArguments.clear();
+	state.livePane = {
+		...state.livePane,
+		mode: "waiting",
+		thinkingText: "",
+		assistantText: "",
+		pendingToolCall: null,
+		pendingApproval: null,
+		pendingQuestion: null
+	};
+	state.appState.isStreaming = true;
+	state.appState.streamingPhase = "waiting";
+	state.appState.streamingStartTime = Date.now();
+	state.footer.setState(state.appState);
+	state.ui.requestRender();
+	state.client.prompt(state.appState.sessionId, { input: fullPrompt }).catch((error) => {
+		const message = error instanceof Error ? error.message : String(error);
+		state.appState.isStreaming = false;
+		state.appState.streamingPhase = "idle";
+		state.livePane = {
+			mode: "idle",
+			thinkingText: "",
+			assistantText: "",
+			pendingToolCall: null,
+			pendingApproval: null,
+			pendingQuestion: null
+		};
+		state.footer.setState(state.appState);
+		addEntry({
+			id: nextTranscriptId(),
+			kind: "status",
+			renderMode: "plain",
+			content: `Skill "${skillName}" failed: ${message}`,
+			color: state.colors.error
+		});
+	});
+}
 /** Send from user input: enqueue if busy, otherwise send immediately. */
 function sendMessage(state, addEntry, input, options) {
 	if (state.appState.isStreaming || state.appState.isCompacting) {
@@ -98307,7 +98459,7 @@ function projectToolCall(state, record) {
 		id: tool.id,
 		name: tool.name,
 		args: tool.args,
-		...tool.description !== void 0 ? { description: tool.description } : {}
+		description: tool.description
 	};
 	state.toolCalls.set(tool.id, toolCall);
 	state.entries.push(entry("tool_call", "", "plain", {
@@ -98357,13 +98509,11 @@ function toolCallFromRecord(record) {
 	const id = stringValue(data["tool_call_id"]);
 	const name = stringValue(data["tool_name"]);
 	if (id === void 0 || name === void 0) return void 0;
-	const args = isObject(data["args"]) ? data["args"] : {};
-	const description = stringValue(data["activity_description"]);
 	return {
 		id,
 		name,
-		args,
-		...description !== void 0 ? { description } : {}
+		args: isObject(data["args"]) ? data["args"] : {},
+		description: stringValue(data["activity_description"])
 	};
 }
 function toolResultFromRecord(record) {
@@ -98378,7 +98528,7 @@ function toolResultFromRecord(record) {
 function ensureSubagent(parent, id, name) {
 	if (parent.subagent === void 0) parent.subagent = {
 		id,
-		...name !== void 0 ? { name } : {},
+		name,
 		toolCalls: []
 	};
 	return parent.subagent;
@@ -98389,8 +98539,8 @@ function entry(kind, content, renderMode, extras) {
 		kind,
 		renderMode,
 		content,
-		...extras?.turnId !== void 0 ? { turnId: extras.turnId } : {},
-		...extras?.toolCallData !== void 0 ? { toolCallData: extras.toolCallData } : {}
+		turnId: extras?.turnId,
+		toolCallData: extras?.toolCallData
 	};
 }
 function userContentToText(content) {
@@ -98744,36 +98894,71 @@ function endCompaction(state, tokensBefore, tokensAfter) {
 	state.ui.requestRender();
 }
 //#endregion
+//#region src/tui/commands/skill-commands.ts
+const SKILL_ACTIVATION_SENTINEL_PREFIX = "__activate_skill__:";
+async function fetchSkills(client, sessionId) {
+	const skills = (await client.listSkills(sessionId))?.skills ?? [];
+	const out = [];
+	for (const s of skills) {
+		if (typeof s?.name !== "string" || s.name.length === 0) continue;
+		if (typeof s.content !== "string") continue;
+		out.push({
+			name: s.name,
+			content: s.content,
+			...typeof s.description === "string" ? { description: s.description } : {}
+		});
+	}
+	return out;
+}
+function buildSkillCommand(skill) {
+	return {
+		name: `${SKILL_COMMAND_PREFIX}${skill.name}`,
+		aliases: [],
+		description: skill.description ?? "",
+		mode: "both",
+		async execute(args) {
+			const trimmed = args.trim();
+			const prompt = trimmed.length > 0 ? `${skill.content}\n\nUser request:\n${trimmed}` : skill.content;
+			const payload = {
+				name: skill.name,
+				args: trimmed,
+				prompt
+			};
+			return {
+				type: "ok",
+				message: `${SKILL_ACTIVATION_SENTINEL_PREFIX}${JSON.stringify(payload)}`
+			};
+		}
+	};
+}
+//#endregion
 //#region src/tui/commands/skill-dispatch.ts
 /**
-* Attempt to dispatch `/name args` as a skill activation.
+* 探测 `/name args` 是否对应某个 skill。命中返回 activate（含拼好的
+* prompt）；未命中或查询失败返回 unknown，message 由调用方推到 transcript。
 */
 async function tryDispatchSkill(client, sessionId, name, args) {
 	let skills;
 	try {
 		skills = (await client.listSkills(sessionId))?.skills ?? [];
-	} catch (err) {
+	} catch (error) {
 		return {
-			matched: false,
-			message: `Unknown command: /${name} (skill lookup failed: ${err instanceof Error ? err.message : String(err)})`
+			kind: "unknown",
+			message: `Unknown command: /${name} (skill lookup failed: ${error instanceof Error ? error.message : String(error)})`
 		};
 	}
-	if (!skills.some((s) => s.name === name)) return {
-		matched: false,
+	const skill = skills.find((s) => s.name === name);
+	if (skill === void 0 || typeof skill.content !== "string") return {
+		kind: "unknown",
 		message: `Unknown command: /${name}`
 	};
-	try {
-		await client.activateSkill(sessionId, name, args);
-		return {
-			matched: true,
-			message: `Skill "${name}" activated.`
-		};
-	} catch (err) {
-		return {
-			matched: true,
-			message: `Skill "${name}" failed: ${err instanceof Error ? err.message : String(err)}`
-		};
-	}
+	const trimmed = args.trim();
+	return {
+		kind: "activate",
+		name,
+		args: trimmed,
+		prompt: trimmed.length > 0 ? `${skill.content}\n\nUser request:\n${trimmed}` : skill.content
+	};
 }
 //#endregion
 //#region src/tui/commands/dispatch.ts
@@ -98782,7 +98967,12 @@ async function dispatchSlashCommand(input, state, buildCtx, addEntry) {
 	if (!parsed) return false;
 	const def = state.registry.find(parsed.name);
 	if (!def) {
+		const ctx = buildCtx();
 		const result = await tryDispatchSkill(state.client, state.appState.sessionId, parsed.name, parsed.args);
+		if (result.kind === "activate") {
+			ctx.activateSkill(result.name, result.args, result.prompt);
+			return true;
+		}
 		addEntry({
 			id: `slash-${Date.now()}`,
 			kind: "status",
@@ -98850,12 +99040,30 @@ async function dispatchSlashCommand(input, state, buildCtx, addEntry) {
 				ctx.sendAsMessage(msg);
 				return true;
 			}
+			if (result.message.startsWith("__activate_skill__:")) {
+				const raw = result.message.slice(19);
+				let payload;
+				try {
+					payload = JSON.parse(raw);
+				} catch (error) {
+					addEntry({
+						id: `slash-err-${Date.now()}`,
+						kind: "status",
+						renderMode: "plain",
+						content: `Skill activation failed: malformed payload (${error instanceof Error ? error.message : String(error)})`,
+						color: state.colors.error
+					});
+					return true;
+				}
+				ctx.activateSkill(payload.name, payload.args, payload.prompt);
+				return true;
+			}
 			addEntry({
 				id: `slash-${Date.now()}`,
 				kind: "status",
 				renderMode: "plain",
 				content: result.message,
-				...result.color !== void 0 ? { color: result.color } : {}
+				color: result.color
 			});
 			return true;
 	}
@@ -98941,7 +99149,7 @@ function handleContentDelta(ectx, data) {
 //#region src/tui/handlers/tool.ts
 const STREAMING_FIELD_RE = /"(path|file_path|command|pattern|query|url|description|title|name)"\s*:\s*"((?:\\.|[^"\\])*)"/g;
 function unescapeJsonString(s) {
-	return s.replace(/\\(["\\/bfnrt])/g, (_, ch) => {
+	return s.replaceAll(/\\(["\\/bfnrt])/g, (_, ch) => {
 		switch (ch) {
 			case "n": return "\n";
 			case "t": return "	";
@@ -99224,7 +99432,7 @@ var ChoicePickerComponent = class extends Container {
 		super();
 		this.opts = opts;
 		const currentIdx = opts.options.findIndex((o) => o.value === opts.currentValue);
-		this.selectedIndex = currentIdx >= 0 ? currentIdx : 0;
+		this.selectedIndex = Math.max(currentIdx, 0);
 	}
 	handleInput(data) {
 		if (matchesKey(data, Key.escape)) {
@@ -99247,12 +99455,13 @@ var ChoicePickerComponent = class extends Container {
 	}
 	render(width) {
 		const { colors } = this.opts;
-		const lines = [];
-		lines.push(chalk.hex(colors.primary)("─".repeat(width)));
-		lines.push(chalk.hex(colors.primary).bold(` ${this.opts.title}`));
 		const hint = this.opts.hint ?? "↑↓ navigate · Enter select · Esc cancel";
-		lines.push(chalk.hex(colors.textMuted)(` ${hint}`));
-		lines.push("");
+		const lines = [
+			chalk.hex(colors.primary)("─".repeat(width)),
+			chalk.hex(colors.primary).bold(` ${this.opts.title}`),
+			chalk.hex(colors.textMuted)(` ${hint}`),
+			""
+		];
 		for (let i = 0; i < this.opts.options.length; i++) {
 			const opt = this.opts.options[i];
 			const isSelected = i === this.selectedIndex;
@@ -99410,31 +99619,28 @@ var HelpPanelComponent = class extends Container {
 		const muted = chalk.hex(c.textMuted);
 		const kbdColor = chalk.hex(c.warning);
 		const slashColor = chalk.hex(c.primary);
-		const lines = [];
-		lines.push(accent("─".repeat(width)));
-		lines.push(accent.bold(" help ") + muted("· Esc / Enter / q to close · ↑↓ scroll"));
-		lines.push("");
-		lines.push(`  ${dim("Sure, Kimi is ready to help! Just send a message to get started.")}`);
-		lines.push("");
-		lines.push(`  ${chalk.bold("Keyboard shortcuts")}`);
 		const shortcuts = this.opts.shortcuts ?? DEFAULT_KEYBOARD_SHORTCUTS;
 		const kbdWidth = Math.max(8, ...shortcuts.map((s) => s.keys.length));
-		for (const s of shortcuts) lines.push(`    ${kbdColor(s.keys.padEnd(kbdWidth))}  ${dim(s.description)}`);
-		lines.push("");
-		lines.push(`  ${chalk.bold("Slash commands")}`);
-		const sortedCmds = [...this.opts.commands].sort((a, b) => a.name.localeCompare(b.name));
+		const sortedCmds = [...this.opts.commands].toSorted((a, b) => a.name.localeCompare(b.name));
 		const cmdLabels = sortedCmds.map((c) => {
 			const aliases = c.aliases.length > 0 ? ` (${c.aliases.map((a) => "/" + a).join(", ")})` : "";
 			return `/${c.name}${aliases}`;
 		});
 		const cmdWidth = Math.max(12, ...cmdLabels.map((l) => l.length));
-		for (let i = 0; i < sortedCmds.length; i++) {
-			const cmd = sortedCmds[i];
-			const label = cmdLabels[i];
-			lines.push(`    ${slashColor(label.padEnd(cmdWidth))}  ${dim(cmd.description)}`);
-		}
-		lines.push("");
-		lines.push(accent("─".repeat(width)));
+		const lines = [
+			accent("─".repeat(width)),
+			accent.bold(" help ") + muted("· Esc / Enter / q to close · ↑↓ scroll"),
+			"",
+			`  ${dim("Sure, Kimi is ready to help! Just send a message to get started.")}`,
+			"",
+			`  ${chalk.bold("Keyboard shortcuts")}`,
+			...shortcuts.map((s) => `    ${kbdColor(s.keys.padEnd(kbdWidth))}  ${dim(s.description)}`),
+			"",
+			`  ${chalk.bold("Slash commands")}`,
+			...sortedCmds.map((cmd, i) => `    ${slashColor(cmdLabels[i].padEnd(cmdWidth))}  ${dim(cmd.description)}`),
+			"",
+			accent("─".repeat(width))
+		];
 		const content = lines.slice(1, lines.length - 1);
 		const maxVisible = Math.max(5, this.opts.maxVisible ?? 24);
 		if (content.length > maxVisible) {
@@ -99445,7 +99651,7 @@ var HelpPanelComponent = class extends Container {
 				lines[0],
 				...slice,
 				scrollInfo,
-				lines[lines.length - 1]
+				lines.at(-1)
 			].map((line) => truncateToWidth(line, width));
 		}
 		this.scrollTop = 0;
@@ -99619,8 +99825,7 @@ var SessionPickerComponent = class extends Container {
 	}
 	render(width) {
 		const colors = this.colors;
-		const lines = [];
-		lines.push(chalk.hex(colors.primary)("─".repeat(width)));
+		const lines = [chalk.hex(colors.primary)("─".repeat(width))];
 		if (this.loading) {
 			lines.push(chalk.hex(colors.primary).bold("Sessions"));
 			lines.push(chalk.hex(colors.textMuted)("Loading sessions..."));
@@ -100113,9 +100318,9 @@ function extractFromArgs(toolName, detail) {
 				type: "shell",
 				language: stringField(detail, "language") ?? "bash",
 				command,
-				...cwd !== void 0 ? { cwd } : {},
-				...toolDescription !== void 0 ? { description: toolDescription } : {},
-				...danger !== void 0 ? { danger } : {}
+				cwd,
+				description: toolDescription,
+				danger
 			}],
 			description: toolDescription ?? ""
 		};
@@ -100141,17 +100346,14 @@ function extractFromArgs(toolName, detail) {
 		description: ""
 	};
 	const url = stringField(detail, "url");
-	if (url !== void 0) {
-		const method = stringField(detail, "method");
-		return {
-			blocks: [{
-				type: "url_fetch",
-				url,
-				...method !== void 0 ? { method } : {}
-			}],
-			description: ""
-		};
-	}
+	if (url !== void 0) return {
+		blocks: [{
+			type: "url_fetch",
+			url,
+			method: stringField(detail, "method")
+		}],
+		description: ""
+	};
 	const query = stringField(detail, "query");
 	if (query !== void 0) return {
 		blocks: [{
@@ -100161,17 +100363,14 @@ function extractFromArgs(toolName, detail) {
 		description: ""
 	};
 	const pattern = stringField(detail, "pattern");
-	if (pattern !== void 0) {
-		const scope = stringField(detail, "path");
-		return {
-			blocks: [{
-				type: "search",
-				query: pattern,
-				...scope !== void 0 ? { scope } : {}
-			}],
-			description: ""
-		};
-	}
+	if (pattern !== void 0) return {
+		blocks: [{
+			type: "search",
+			query: pattern,
+			scope: stringField(detail, "path")
+		}],
+		description: ""
+	};
 	if (filePath !== void 0) return {
 		blocks: [{
 			type: "file_op",
@@ -100194,13 +100393,13 @@ function adaptPanelResponse(response) {
 	if (response.response === "approved_for_session") return {
 		response: "approved",
 		scope: "session",
-		...response.feedback !== void 0 ? { feedback: response.feedback } : {},
-		...response.selected_label !== void 0 ? { selected_label: response.selected_label } : {}
+		feedback: response.feedback,
+		selected_label: response.selected_label
 	};
 	return {
 		response: response.response === "approved" ? "approved" : response.response === "rejected" ? "rejected" : "cancelled",
-		...response.feedback !== void 0 ? { feedback: response.feedback } : {},
-		...response.selected_label !== void 0 ? { selected_label: response.selected_label } : {}
+		feedback: response.feedback,
+		selected_label: response.selected_label
 	};
 }
 function describeApproval(display, action) {
@@ -100268,9 +100467,9 @@ function adaptDisplay(display) {
 				type: "shell",
 				language: display.language ?? "bash",
 				command,
-				...display.cwd !== void 0 ? { cwd: display.cwd } : {},
-				...display.description !== void 0 ? { description: display.description } : {},
-				...danger !== void 0 ? { danger } : {}
+				cwd: display.cwd,
+				description: display.description,
+				danger
 			}];
 		}
 		case "diff": return [{
@@ -100283,29 +100482,29 @@ function adaptDisplay(display) {
 			type: "file_op",
 			operation: display.operation,
 			path: display.path ?? "",
-			...display.detail !== void 0 ? { detail: display.detail } : {}
+			detail: display.detail
 		}];
 		case "url_fetch": return [{
 			type: "url_fetch",
 			url: display.url ?? "",
-			...display.method !== void 0 ? { method: display.method } : {}
+			method: display.method
 		}];
 		case "search": return [{
 			type: "search",
 			query: display.query ?? "",
-			...display.scope !== void 0 ? { scope: display.scope } : {}
+			scope: display.scope
 		}];
 		case "agent_call": return [{
 			type: "invocation",
 			kind: "agent",
 			name: display.agent_name ?? "",
-			...display.prompt !== void 0 ? { description: display.prompt } : {}
+			description: display.prompt
 		}];
 		case "skill_call": return [{
 			type: "invocation",
 			kind: "skill",
 			name: display.skill_name ?? "",
-			...display.args !== void 0 ? { description: display.args } : {}
+			description: display.args
 		}];
 		case "task_stop": return [{
 			type: "brief",
@@ -100363,7 +100562,7 @@ function truncateOneLine(text, max) {
 const DIFF_SUMMARY_MAX_LINES = 10;
 function renderDisplayBlock(block, expanded) {
 	switch (block.type) {
-		case "diff": return renderDiffLines(block.old_text, block.new_text, block.path, block.old_start, block.new_start, expanded ? void 0 : DIFF_SUMMARY_MAX_LINES);
+		case "diff": return renderDiffLines(block.old_text, block.new_text, block.path, false, block.old_start, block.new_start, expanded ? void 0 : DIFF_SUMMARY_MAX_LINES);
 		case "shell": {
 			const lines = [];
 			if (block.cwd !== void 0 && block.cwd.length > 0) lines.push(chalk.dim(`cwd: ${block.cwd}`));
@@ -100443,7 +100642,7 @@ var ApprovalPanelComponent = class extends Container {
 		this.onResponse({
 			response: option.response,
 			feedback: feedback || void 0,
-			...option.selected_label !== void 0 ? { selected_label: option.selected_label } : {}
+			selected_label: option.selected_label
 		});
 	}
 	selectAndSubmit(index) {
@@ -101170,10 +101369,7 @@ function registerReverseRPCHandlers(state, client, callbacks) {
 		showPanel: (payload) => showQuestionDialog(state, payload),
 		hidePanel: () => hideQuestionDialog(state)
 	});
-	const disposers = [];
-	disposers.push(client.onRequest("approval.request", createApprovalRequestHandler(state)));
-	disposers.push(client.onRequest("question.ask", createQuestionAskHandler(state)));
-	return disposers;
+	return [client.onRequest("approval.request", createApprovalRequestHandler(state)), client.onRequest("question.ask", createQuestionAskHandler(state))];
 }
 //#endregion
 //#region src/utils/clipboard/clipboard-native.ts
@@ -101515,44 +101711,6 @@ function readUInt32BE(b, off) {
 	return b[off] * 16777216 + (b[off + 1] << 16) + (b[off + 2] << 8) + b[off + 3] >>> 0;
 }
 //#endregion
-//#region src/tui/commands/skill-commands.ts
-async function fetchSkills(client, sessionId) {
-	const skills = (await client.listSkills(sessionId))?.skills ?? [];
-	const out = [];
-	for (const s of skills) {
-		if (typeof s?.name !== "string" || s.name.length === 0) continue;
-		if (typeof s.content !== "string") continue;
-		out.push({
-			name: s.name,
-			content: s.content,
-			...typeof s.description === "string" ? { description: s.description } : {}
-		});
-	}
-	return out;
-}
-function buildSkillCommand(skill) {
-	return {
-		name: `${SKILL_COMMAND_PREFIX}${skill.name}`,
-		aliases: [],
-		description: skill.description ?? "",
-		mode: "both",
-		async execute(args, ctx) {
-			const trimmed = args.trim();
-			const prompt = trimmed.length > 0 ? `${skill.content}\n\nUser request:\n${trimmed}` : skill.content;
-			try {
-				await ctx.client.prompt(ctx.appState.sessionId, { input: prompt });
-			} catch (err) {
-				const msg = err instanceof Error ? err.message : String(err);
-				return {
-					type: "ok",
-					message: `Skill "${skill.name}" failed: ${msg}`
-				};
-			}
-			return { type: "ok" };
-		}
-	};
-}
-//#endregion
 //#region src/tui/components/editor/file-mention-provider.ts
 /**
 * `@file` autocomplete provider for the input box.
@@ -101662,7 +101820,7 @@ function rankForEmptyQuery(files, snapshot) {
 	const result = [];
 	const cap = MAX_SUGGESTIONS_WHEN_EMPTY;
 	const inFiles = new Set(files);
-	const byRecency = [...snapshot.recencyOrder.entries()].filter(([path]) => inFiles.has(path)).sort((a, b) => a[1] - b[1]);
+	const byRecency = [...snapshot.recencyOrder.entries()].filter(([path]) => inFiles.has(path)).toSorted((a, b) => a[1] - b[1]);
 	for (const [path] of byRecency) {
 		if (result.length >= cap) break;
 		if (picked.has(path)) continue;
@@ -101670,7 +101828,7 @@ function rankForEmptyQuery(files, snapshot) {
 		result.push(path);
 	}
 	if (result.length < cap) {
-		const byMtime = files.filter((p) => !picked.has(p) && snapshot.mtimeByPath.has(p)).sort((a, b) => (snapshot.mtimeByPath.get(b) ?? 0) - (snapshot.mtimeByPath.get(a) ?? 0));
+		const byMtime = files.filter((p) => !picked.has(p) && snapshot.mtimeByPath.has(p)).toSorted((a, b) => (snapshot.mtimeByPath.get(b) ?? 0) - (snapshot.mtimeByPath.get(a) ?? 0));
 		for (const path of byMtime) {
 			if (result.length >= cap) break;
 			picked.add(path);
@@ -101678,7 +101836,7 @@ function rankForEmptyQuery(files, snapshot) {
 		}
 	}
 	if (result.length < cap) {
-		const rest = files.filter((p) => !picked.has(p)).sort((a, b) => basename(a).localeCompare(basename(b)) || a.localeCompare(b));
+		const rest = files.filter((p) => !picked.has(p)).toSorted((a, b) => basename(a).localeCompare(basename(b)) || a.localeCompare(b));
 		for (const path of rest) {
 			if (result.length >= cap) break;
 			result.push(path);
@@ -102183,7 +102341,7 @@ var KimiTUI = class {
 					kind: "status",
 					renderMode: "plain",
 					content: message,
-					...color !== void 0 ? { color } : {}
+					color
 				});
 			},
 			showNotice: (title, detail) => {
@@ -102199,6 +102357,7 @@ var KimiTUI = class {
 				showUsage(this.state);
 			},
 			sendAsMessage: (text) => sendMessage(this.state, (e) => this.addEntry(e), text),
+			activateSkill: (name, args, fullPrompt) => sendSkillActivation(this.state, (e) => this.addEntry(e), name, args, fullPrompt),
 			performReload: (action) => performReload(this.state, action, this.buildInputHooks())
 		};
 	}
@@ -102246,9 +102405,9 @@ async function runShell(opts, version) {
 		isReplaying: false,
 		streamingPhase: "idle",
 		streamingStartTime: 0,
-		theme: ctx.theme,
+		theme: "dark",
 		version,
-		editorCommand: ctx.defaultEditor.length > 0 ? ctx.defaultEditor : null,
+		editorCommand: null,
 		availableModels: ctx.availableModels,
 		sessionTitle: null
 	};
@@ -102382,7 +102541,7 @@ async function promptForInstallConfirmation(options) {
 	const output = options.output ?? process.stdout;
 	const choices = createInstallPromptChoices(options.target);
 	let selectedIndex = getDefaultInstallPromptSelection(choices);
-	return await new Promise((resolve) => {
+	return new Promise((resolve) => {
 		let lineCount = 0;
 		const hadRawMode = "isRaw" in input ? input.isRaw === true : false;
 		const canSetRawMode = typeof input.setRawMode === "function";