@sayknow-cli/coding-agent 0.3.10 → 0.3.12

package/src/modes/rpc/rpc-client.ts

@@ -8,7 +8,8 @@ import type { CompactionResult } from "@sayknow-cli/agent-core/compaction";
 import type { ImageContent, Model } from "@sayknow-cli/ai";
 import { isRecord, ptree, readJsonl } from "@sayknow-cli/utils";
 import type { BashResult } from "../../exec/bash-executor";
-import type { SessionStats } from "../../session/agent-session";
+import type { AgentSessionEvent, SessionStats } from "../../session/agent-session";
+import { AGENT_WIRE_EVENT_TYPES, type AgentWireEventType } from "../shared/agent-wire/event-contract";
 import type {
 	RpcCommand,
 	RpcExtensionUIRequest,
@@ -64,6 +65,7 @@ export interface RpcClientOptions {
 export type ModelInfo = Pick<Model, "provider" | "id" | "contextWindow" | "reasoning" | "thinking">;
 
 export type RpcEventListener = (event: AgentEvent) => void;
+export type RpcSessionEventListener = (event: AgentSessionEvent) => void;
 
 export interface RpcClientToolContext<TDetails = unknown> {
 	toolCallId: string;
@@ -91,7 +93,8 @@ export function defineRpcClientTool<
 	return tool;
 }
 
-const agentEventTypes = new Set<AgentEvent["type"]>([
+const agentWireEventTypes = new Set<AgentWireEventType>(AGENT_WIRE_EVENT_TYPES);
+const coreAgentEventTypes = new Set<AgentEvent["type"]>([
 	"agent_start",
 	"agent_end",
 	"turn_start",
@@ -116,13 +119,16 @@ function isRpcResponse(value: unknown): value is RpcResponse {
 	return true;
 }
 
-function isAgentEvent(value: unknown): value is AgentEvent {
+function isAgentSessionEvent(value: unknown): value is AgentSessionEvent {
 	if (!isRecord(value)) return false;
 	const type = value.type;
 	if (typeof type !== "string") return false;
-	return agentEventTypes.has(type as AgentEvent["type"]);
+	return agentWireEventTypes.has(type as AgentWireEventType);
 }
 
+function isCoreAgentEvent(value: AgentSessionEvent): value is AgentEvent {
+	return coreAgentEventTypes.has(value.type as AgentEvent["type"]);
+}
 function isRpcHostToolCallRequest(value: unknown): value is RpcHostToolCallRequest {
 	if (!isRecord(value)) return false;
 	return (
@@ -378,6 +384,7 @@ export class RpcClient {
 	#transport: RpcTransport | null = null;
 	#transportClosed = false;
 	#eventListeners: RpcEventListener[] = [];
+	#sessionEventListeners: RpcSessionEventListener[] = [];
 	#pendingRequests: Map<string, { resolve: (response: RpcResponse) => void; reject: (error: Error) => void }> =
 		new Map();
 	#customTools: RpcClientCustomTool[] = [];
@@ -442,7 +449,7 @@ export class RpcClient {
 	}
 
 	/**
-	 * Subscribe to agent events.
+	 * Subscribe to the legacy core AgentEvent subset.
 	 */
 	onEvent(listener: RpcEventListener): () => void {
 		this.#eventListeners.push(listener);
@@ -454,6 +461,19 @@ export class RpcClient {
 		};
 	}
 
+	/**
+	 * Subscribe to all renderer-facing agent session events.
+	 */
+	onSessionEvent(listener: RpcSessionEventListener): () => void {
+		this.#sessionEventListeners.push(listener);
+		return () => {
+			const index = this.#sessionEventListeners.indexOf(listener);
+			if (index !== -1) {
+				this.#sessionEventListeners.splice(index, 1);
+			}
+		};
+	}
+
 	/**
 	 * Subscribe to workflow lifecycle gates emitted by RPC mode.
 	 */
@@ -928,8 +948,12 @@ export class RpcClient {
 
 		// Canonical agent-wire event frame: { type:"event", payload:{ event_type, event } }.
 		const event = unwrapAgentWireEventFrame(data);
-		if (!isAgentEvent(event)) return;
+		if (!isAgentSessionEvent(event)) return;
 
+		for (const listener of this.#sessionEventListeners) {
+			listener(event);
+		}
+		if (!isCoreAgentEvent(event)) return;
 		for (const listener of this.#eventListeners) {
 			listener(event);
 		}

package/src/modes/utils/ui-helpers.ts

@@ -65,6 +65,127 @@ type QueuedMessages = {
 	followUp: string[];
 };
 
+const CHAT_CHILD_CAP = 400;
+const CHAT_COLLAPSE_BATCH_SIZE = 300;
+
+const chatChildAddedAt = new WeakMap<Component, number>();
+
+export class CollapsedChatHistoryComponent implements Component {
+	readonly isCollapsedChatHistory = true;
+	count: number;
+	startTime: number;
+	endTime: number;
+
+	constructor(count: number, startTime: number, endTime: number) {
+		this.count = count;
+		this.startTime = startTime;
+		this.endTime = endTime;
+	}
+
+	merge(count: number, startTime: number, endTime: number): void {
+		this.count += count;
+		this.startTime = Math.min(this.startTime, startTime);
+		this.endTime = Math.max(this.endTime, endTime);
+	}
+
+	render(_width: number): string[] {
+		const label = `[${this.count} earlier messages collapsed — ${formatChatCollapseTime(this.startTime)} to ${formatChatCollapseTime(this.endTime)}]`;
+		return [theme.fg("dim", label)];
+	}
+
+	invalidate(): void {}
+}
+
+function formatChatCollapseTime(timestamp: number): string {
+	return new Date(timestamp).toLocaleTimeString(undefined, {
+		hour: "2-digit",
+		minute: "2-digit",
+		hour12: false,
+	});
+}
+
+function isCollapsedChatHistory(component: Component): component is CollapsedChatHistoryComponent {
+	return component instanceof CollapsedChatHistoryComponent;
+}
+
+function isActiveChatChild(ctx: InteractiveModeContext, component: Component): boolean {
+	if ([...ctx.pendingTools.values()].includes(component as never)) return true;
+	if (ctx.pendingBashComponents.includes(component as never)) return true;
+	if (ctx.pendingPythonComponents.includes(component as never)) return true;
+	return component === ctx.bashComponent || component === ctx.pythonComponent || component === ctx.streamingComponent;
+}
+
+function getChatChildTime(component: Component): number {
+	return chatChildAddedAt.get(component) ?? Date.now();
+}
+
+export function addChatChild(ctx: InteractiveModeContext, component: Component): void {
+	ctx.chatContainer.addChild(component);
+	chatChildAddedAt.set(component, Date.now());
+	trimChatChildren(ctx);
+}
+
+export function trimChatChildren(ctx: InteractiveModeContext): void {
+	const children = ctx.chatContainer.children;
+
+	// Collapse the oldest completed children into history placeholders until the cap is
+	// satisfied or no further reduction is structurally possible. Active (pending/running)
+	// children and existing placeholders are never collapsed, so a conversation whose
+	// top-level children are dominated by active components may legitimately exceed the cap.
+	let scanFrom = 0;
+	while (children.length > CHAT_CHILD_CAP) {
+		// Advance to the oldest collapsible completed child, skipping active children and
+		// existing placeholders so the cap is enforced even when the oldest child is active.
+		while (
+			scanFrom < children.length &&
+			(isActiveChatChild(ctx, children[scanFrom]) || isCollapsedChatHistory(children[scanFrom]))
+		) {
+			scanFrom++;
+		}
+		if (scanFrom >= children.length) return; // only active/placeholder children remain
+
+		// Extend over the oldest contiguous run of completed children (up to the batch size).
+		let collapseEndExclusive = scanFrom;
+		const maxEnd = Math.min(children.length, scanFrom + CHAT_COLLAPSE_BATCH_SIZE);
+		while (
+			collapseEndExclusive < maxEnd &&
+			!isActiveChatChild(ctx, children[collapseEndExclusive]) &&
+			!isCollapsedChatHistory(children[collapseEndExclusive])
+		) {
+			collapseEndExclusive++;
+		}
+		const collapseCount = collapseEndExclusive - scanFrom;
+
+		const prev = scanFrom > 0 ? children[scanFrom - 1] : undefined;
+		const mergeTarget = prev && isCollapsedChatHistory(prev) ? prev : undefined;
+		// A lone completed child with no adjacent placeholder to merge into cannot reduce
+		// the child count (collapsing it yields a 1-count placeholder). Skip past it.
+		if (!mergeTarget && collapseCount <= 1) {
+			scanFrom += Math.max(collapseCount, 1);
+			continue;
+		}
+
+		const collapsed = children.slice(scanFrom, collapseEndExclusive);
+		const startTime = getChatChildTime(collapsed[0]);
+		const endTime = getChatChildTime(collapsed[collapsed.length - 1]);
+		for (const child of collapsed) {
+			child.dispose?.();
+		}
+
+		if (mergeTarget) {
+			mergeTarget.merge(collapseCount, startTime, endTime);
+			children.splice(scanFrom, collapseCount);
+			chatChildAddedAt.set(mergeTarget, mergeTarget.startTime);
+			// scanFrom stays; whatever follows the merged run is next.
+		} else {
+			const placeholder = new CollapsedChatHistoryComponent(collapseCount, startTime, endTime);
+			children.splice(scanFrom, collapseCount, placeholder);
+			chatChildAddedAt.set(placeholder, startTime);
+			scanFrom++; // step past the freshly created placeholder
+		}
+	}
+}
+
 export class UiHelpers {
 	constructor(private ctx: InteractiveModeContext) {}
 
@@ -103,8 +224,8 @@ export class UiHelpers {
 
 		const spacer = new Spacer(1);
 		const text = new Text(rendered, 1, 0);
-		this.ctx.chatContainer.addChild(spacer);
-		this.ctx.chatContainer.addChild(text);
+		addChatChild(this.ctx, spacer);
+		addChatChild(this.ctx, text);
 		this.ctx.lastStatusSpacer = spacer;
 		this.ctx.lastStatusText = text;
 		this.ctx.ui.requestRender();
@@ -120,7 +241,7 @@ export class UiHelpers {
 				component.setComplete(message.exitCode, message.cancelled, {
 					truncation: message.meta?.truncation,
 				});
-				this.ctx.chatContainer.addChild(component);
+				addChatChild(this.ctx, component);
 				break;
 			}
 			case "pythonExecution": {
@@ -131,7 +252,7 @@ export class UiHelpers {
 				component.setComplete(message.exitCode, message.cancelled, {
 					truncation: message.meta?.truncation,
 				});
-				this.ctx.chatContainer.addChild(component);
+				addChatChild(this.ctx, component);
 				break;
 			}
 			case "hookMessage":
@@ -175,14 +296,14 @@ export class UiHelpers {
 							]
 								.filter(Boolean)
 								.join(" ");
-							this.ctx.chatContainer.addChild(new Text(line, 1, 0));
+							addChatChild(this.ctx, new Text(line, 1, 0));
 						}
 						break;
 					}
 					if (message.customType === SKILL_PROMPT_MESSAGE_TYPE) {
 						const component = new SkillMessageComponent(message as CustomMessage<SkillPromptDetails>);
 						component.setExpanded(this.ctx.toolOutputExpanded);
-						this.ctx.chatContainer.addChild(component);
+						addChatChild(this.ctx, component);
 						break;
 					}
 					if (
@@ -219,12 +340,12 @@ export class UiHelpers {
 						const components: Component[] = [];
 						const header = `${theme.fg("accent", `[IRC] ${arrow}`)}`;
 						const headerComponent = new Text(header, 1, 0);
-						this.ctx.chatContainer.addChild(headerComponent);
+						addChatChild(this.ctx, headerComponent);
 						components.push(headerComponent);
 						if (body) {
 							for (const line of body.split("\n")) {
 								const lineComponent = new Text(theme.fg("muted", `  ${line}`), 0, 0);
-								this.ctx.chatContainer.addChild(lineComponent);
+								addChatChild(this.ctx, lineComponent);
 								components.push(lineComponent);
 							}
 						}
@@ -242,12 +363,12 @@ export class UiHelpers {
 						const components: Component[] = [];
 						const header = `${theme.fg("accent", `[Steer ${details?.state ?? "queued"}] ${details?.from ?? "?"} ⇨ ${details?.to ?? "?"}`)}`;
 						const headerComponent = new Text(header, 1, 0);
-						this.ctx.chatContainer.addChild(headerComponent);
+						addChatChild(this.ctx, headerComponent);
 						components.push(headerComponent);
 						if (details?.body) {
 							for (const line of details.body.split("\n")) {
 								const lineComponent = new Text(theme.fg("muted", `  ${line}`), 0, 0);
-								this.ctx.chatContainer.addChild(lineComponent);
+								addChatChild(this.ctx, lineComponent);
 								components.push(lineComponent);
 							}
 						}
@@ -257,22 +378,22 @@ export class UiHelpers {
 					// Both HookMessage and CustomMessage have the same structure, cast for compatibility
 					const component = new CustomMessageComponent(message as CustomMessage<unknown>, renderer);
 					component.setExpanded(this.ctx.toolOutputExpanded);
-					this.ctx.chatContainer.addChild(component);
+					addChatChild(this.ctx, component);
 				}
 				break;
 			}
 			case "compactionSummary": {
-				this.ctx.chatContainer.addChild(new Spacer(1));
+				addChatChild(this.ctx, new Spacer(1));
 				const component = new CompactionSummaryMessageComponent(message);
 				component.setExpanded(this.ctx.toolOutputExpanded);
-				this.ctx.chatContainer.addChild(component);
+				addChatChild(this.ctx, component);
 				break;
 			}
 			case "branchSummary": {
-				this.ctx.chatContainer.addChild(new Spacer(1));
+				addChatChild(this.ctx, new Spacer(1));
 				const component = new BranchSummaryMessageComponent(message);
 				component.setExpanded(this.ctx.toolOutputExpanded);
-				this.ctx.chatContainer.addChild(component);
+				addChatChild(this.ctx, component);
 				break;
 			}
 			case "fileMention": {
@@ -293,7 +414,7 @@ export class UiHelpers {
 						"accent",
 						file.path,
 					)} ${theme.fg("dim", suffix)}`;
-					this.ctx.chatContainer.addChild(new Text(text, 0, 0));
+					addChatChild(this.ctx, new Text(text, 0, 0));
 				}
 				break;
 			}
@@ -303,7 +424,7 @@ export class UiHelpers {
 				if (textContent) {
 					const isSynthetic = message.role === "developer" ? true : (message.synthetic ?? false);
 					const userComponent = new UserMessageComponent(textContent, isSynthetic);
-					this.ctx.chatContainer.addChild(userComponent);
+					addChatChild(this.ctx, userComponent);
 					if (options?.populateHistory && message.role === "user" && !isSynthetic) {
 						this.ctx.editor.addToHistory(textContent);
 					}
@@ -314,7 +435,7 @@ export class UiHelpers {
 				const assistantComponent = new AssistantMessageComponent(message, this.ctx.hideThinkingBlock, () =>
 					this.ctx.ui.requestRender(),
 				);
-				this.ctx.chatContainer.addChild(assistantComponent);
+				addChatChild(this.ctx, assistantComponent);
 				break;
 			}
 			case "toolResult": {
@@ -394,7 +515,7 @@ export class UiHelpers {
 									showContentPreview: this.ctx.settings.get("read.toolResultPreview"),
 								});
 								readGroup.setExpanded(this.ctx.toolOutputExpanded);
-								this.ctx.chatContainer.addChild(readGroup);
+								addChatChild(this.ctx, readGroup);
 							}
 							readGroup.updateArgs(content.arguments, content.id);
 							readGroup.updateResult(
@@ -436,7 +557,7 @@ export class UiHelpers {
 						content.id,
 					);
 					component.setExpanded(this.ctx.toolOutputExpanded);
-					this.ctx.chatContainer.addChild(component);
+					addChatChild(this.ctx, component);
 
 					if (hasErrorStop && errorMessage) {
 						component.updateResult(
@@ -474,7 +595,7 @@ export class UiHelpers {
 								showContentPreview: this.ctx.settings.get("read.toolResultPreview"),
 							});
 							readGroup.setExpanded(this.ctx.toolOutputExpanded);
-							this.ctx.chatContainer.addChild(readGroup);
+							addChatChild(this.ctx, readGroup);
 						}
 						const args = readToolCallArgs.get(message.toolCallId);
 						if (args) {
@@ -541,7 +662,7 @@ export class UiHelpers {
 		}
 		if (preservedChatChildren && preservedChatChildren.length > 0) {
 			for (const child of preservedChatChildren) {
-				this.ctx.chatContainer.addChild(child);
+				addChatChild(this.ctx, child);
 			}
 			this.ctx.ui.requestRender();
 		}
@@ -563,8 +684,8 @@ export class UiHelpers {
 			process.stderr.write(`${label}: ${errorMessage}\n`);
 			return;
 		}
-		this.ctx.chatContainer.addChild(new Spacer(1));
-		this.ctx.chatContainer.addChild(new Text(theme.fg("error", `${label}: ${errorMessage}`), 1, 0));
+		addChatChild(this.ctx, new Spacer(1));
+		addChatChild(this.ctx, new Text(theme.fg("error", `${label}: ${errorMessage}`), 1, 0));
 		this.ctx.ui.requestRender();
 	}
 
@@ -575,15 +696,16 @@ export class UiHelpers {
 			process.stderr.write(`${label}: ${warningMessage}\n`);
 			return;
 		}
-		this.ctx.chatContainer.addChild(new Spacer(1));
-		this.ctx.chatContainer.addChild(new Text(theme.fg("warning", `${label}: ${warningMessage}`), 1, 0));
+		addChatChild(this.ctx, new Spacer(1));
+		addChatChild(this.ctx, new Text(theme.fg("warning", `${label}: ${warningMessage}`), 1, 0));
 		this.ctx.ui.requestRender();
 	}
 
 	showNewVersionNotification(newVersion: string): void {
-		this.ctx.chatContainer.addChild(new Spacer(1));
-		this.ctx.chatContainer.addChild(new DynamicBorder(text => theme.fg("warning", text)));
-		this.ctx.chatContainer.addChild(
+		addChatChild(this.ctx, new Spacer(1));
+		addChatChild(this.ctx, new DynamicBorder(text => theme.fg("warning", text)));
+		addChatChild(
+			this.ctx,
 			new Text(
 				theme.bold(theme.fg("warning", "Update Available")) +
 					"\n" +
@@ -593,7 +715,7 @@ export class UiHelpers {
 				0,
 			),
 		);
-		this.ctx.chatContainer.addChild(new DynamicBorder(text => theme.fg("warning", text)));
+		addChatChild(this.ctx, new DynamicBorder(text => theme.fg("warning", text)));
 		this.ctx.ui.requestRender();
 	}
 
@@ -859,12 +981,12 @@ export class UiHelpers {
 		// removeChild() would tear them down before re-adding.
 		for (const component of this.ctx.pendingBashComponents) {
 			this.ctx.pendingMessagesContainer.detachChild(component);
-			this.ctx.chatContainer.addChild(component);
+			addChatChild(this.ctx, component);
 		}
 		this.ctx.pendingBashComponents = [];
 		for (const component of this.ctx.pendingPythonComponents) {
 			this.ctx.pendingMessagesContainer.detachChild(component);
-			this.ctx.chatContainer.addChild(component);
+			addChatChild(this.ctx, component);
 		}
 		this.ctx.pendingPythonComponents = [];
 	}

package/src/notifications/telegram-daemon.ts

@@ -146,6 +146,7 @@ const TYPING_REFRESH_INTERVAL_MS = 4_000;
 const QUEUED_REACTION = "👀";
 const PENDING_TOPIC_FRAME_LIMIT = 20;
 const SEEN_UPDATE_ID_LIMIT = 1_000;
+const ORPHAN_TOPIC_GRACE_MS = 60_000;
 const CONSUMED_REACTION = "✅";
 
 function splitTelegramPlainText(text: string, max = TELEGRAM_MESSAGE_LIMIT): string[] {
@@ -1414,24 +1415,33 @@ export class TelegramNotificationDaemon {
 	async scanRoots(): Promise<void> {
 		const paths = daemonPaths(this.opts.settings.getAgentDir());
 		const rootState = await readJson<{ roots?: string[] }>(this.fsImpl, paths.roots);
+		const endpointSessionIds = new Set<string>();
+		let allRootsReadable = true;
 		for (const root of rootState?.roots ?? []) {
 			const dir = path.join(root, "notifications");
 			let files: string[];
 			try {
 				files = await this.fsImpl.readdir(dir);
 			} catch {
+				allRootsReadable = false;
 				continue;
 			}
 			for (const file of files.filter(item => item.endsWith(".json"))) {
 				const sessionId = path.basename(file, ".json");
+				endpointSessionIds.add(sessionId);
 				if (this.sessions.has(sessionId)) continue;
 				try {
 					const endpoint = readEndpoint(path.join(dir, file));
 					// Skip endpoint files whose owning process is gone or that are
 					// explicitly stale (e.g. a hard-closed session): reconnecting
-					// would chase a dead, token-bearing record forever.
+					// would chase a dead, token-bearing record forever. Once the
+					// associated topic is past the grace window, reap it through the
+					// same best-effort delete path as graceful session shutdown.
 					const pidAlive = this.opts.pidAlive ?? defaultPidAlive;
-					if (endpoint.stale || (endpoint.pid !== undefined && !pidAlive(endpoint.pid))) continue;
+					if (endpoint.stale || (endpoint.pid !== undefined && !pidAlive(endpoint.pid))) {
+						await this.deleteOrphanedTopic(sessionId);
+						continue;
+					}
 					const endpointKey = endpointGenerationKey(endpoint.url, endpoint.token);
 					if (this.closedEndpointKeys.get(sessionId) === endpointKey) continue;
 					this.closedEndpointKeys.delete(sessionId);
@@ -1439,6 +1449,12 @@ export class TelegramNotificationDaemon {
 				} catch {}
 			}
 		}
+		if (allRootsReadable) {
+			for (const sessionId of this.topics.sessionIds()) {
+				if (!this.sessions.has(sessionId) && !endpointSessionIds.has(sessionId))
+					await this.deleteOrphanedTopic(sessionId);
+			}
+		}
 	}
 
 	connectSession(sessionId: string, url: string, token: string): void {
@@ -1683,6 +1699,16 @@ export class TelegramNotificationDaemon {
 		}
 	}
 
+	private topicPastOrphanGrace(sessionId: string): boolean {
+		const record = this.topics.get(sessionId);
+		return record !== undefined && this.runtime.now() - record.createdAt >= ORPHAN_TOPIC_GRACE_MS;
+	}
+
+	private async deleteOrphanedTopic(sessionId: string): Promise<void> {
+		if (!this.topicPastOrphanGrace(sessionId)) return;
+		await this.deleteTopic(sessionId);
+	}
+
 	/** Best-effort delete of a session topic once its local notification endpoint shuts down. */
 	private async deleteTopic(sessionId: string): Promise<void> {
 		const record = this.topics.get(sessionId);

package/src/prompts/tools/skill.md

@@ -8,8 +8,8 @@ Invoke another available skill in the current turn.
 <instruction>
 - `name` is the skill name as it appears in `/skill:<name>` (e.g. `ralplan`, `ultragoal`, `team`, `deep-interview`)
 - `args` is the free-form argument string the skill would receive after `/skill:<name>` on the command line
-- The tool loads the callee's SKILL.md into the current turn and handles the caller→callee state handoff itself.
-- The chain is refused while the caller skill is still active. If your current skill has not yet reached a terminal phase, prepare it first with `skc state <skill> write --input '{"current_phase":"handoff"}' --json`; no other handoff command is needed.
+- The tool loads the callee's SKILL.md into the current turn and handles native workflow caller→callee state handoff when the caller is one of the built-in SKC workflows.
+- The chain is refused while a native workflow caller is still active. If your current skill is one of `deep-interview`, `ralplan`, `ultragoal`, or `team` and has not yet reached a terminal phase, prepare it first with `skc state <skill> write --input '{"current_phase":"handoff"}' --json`; no other handoff command is needed. Runtime project/user skills do not use `skc state <skill>`.
 - Call once per chain step. To chain `A → B → C`, A calls `skill(B)`; B's next agent turn calls `skill(C)`.
 </instruction>
 

package/src/runtime-mcp/config-writer.ts

@@ -238,10 +238,11 @@ export async function listMCPServers(filePath: string): Promise<string[]> {
 }
 
 /**
- * Set a server's autoload flag (connect automatically at session startup).
+ * Set a server's autoload flag for explicit runtime MCP consumers.
  *
- * Autoload defaults to true, so turning it on removes the key to keep the
- * config file free of redundant fields; turning it off writes `autoload: false`.
+ * Autoload defaults to true for consumers that honor it, so turning it on
+ * removes the key to keep the config file free of redundant fields; turning it
+ * off writes `autoload: false`.
  *
  * @throws Error if the server doesn't exist
  */

package/src/runtime-mcp/config.ts

@@ -56,6 +56,7 @@ function convertToLegacyConfig(server: MCPServer): MCPServerConfig {
 		};
 		if (server.args) config.args = server.args;
 		if (server.env) config.env = server.env;
+		if (server.noInheritEnv !== undefined) config.noInheritEnv = server.noInheritEnv;
 		if (server.cwd) config.cwd = server.cwd;
 		return config;
 	}

package/src/runtime-mcp/types.ts

@@ -62,9 +62,10 @@ interface MCPServerConfigBase {
 	/** Whether this server is enabled (default: true) */
 	enabled?: boolean;
 	/**
-	 * Whether to connect this server automatically at session startup (default: true).
-	 * When false the server stays configured-but-disconnected until connected
-	 * explicitly (e.g. `/mcp connect <name>`).
+	 * Whether an explicit runtime MCP consumer should connect this server
+	 * automatically when that consumer starts (default: true). Normal standalone
+	 * `skc`, `skc --tmux`, and print-mode sessions do not consume `skc mcp`
+	 * registrations today.
 	 */
 	autoload?: boolean;
 	/** Connection timeout in milliseconds (default: 30000) */