@sayknow-cli/coding-agent 0.3.5 → 0.3.7

package/src/discovery/gemini.ts

@@ -9,11 +9,13 @@
  * - Project: .gemini/ (cwd only)
  *
  * Capabilities:
- * - mcps: From settings.json with mcpServers key
  * - context-files: GEMINI.md files
  * - system-prompt: system.md files for custom system prompt
  * - extensions: From extensions/STAR/gemini-extension.json manifests (STAR = wildcard)
  * - settings: From settings.json
+ *
+ * MCP servers are intentionally NOT inherited live from Gemini config: SKC owns
+ * MCP runtime execution. Copy definitions into SKC's own mcp.json instead.
  */
 import * as path from "node:path";
 import { tryParseJson } from "@sayknow-cli/utils";
@@ -22,7 +24,6 @@ import { type ContextFile, contextFileCapability } from "../capability/context-f
 import { type Extension, type ExtensionManifest, extensionCapability } from "../capability/extension";
 import { type ExtensionModule, extensionModuleCapability } from "../capability/extension-module";
 import { readDirEntries, readFile } from "../capability/fs";
-import { type MCPServer, mcpCapability } from "../capability/mcp";
 import { type Settings, settingsCapability } from "../capability/settings";
 import { type SystemPrompt, systemPromptCapability } from "../capability/system-prompt";
 import type { LoadContext, LoadResult } from "../capability/types";
@@ -31,7 +32,6 @@ import {
 	calculateDepth,
 	createSourceMeta,
 	discoverExtensionModulePaths,
-	expandEnvVarsDeep,
 	getProjectPath,
 	getUserPath,
 } from "./helpers";
@@ -40,84 +40,6 @@ const PROVIDER_ID = "gemini";
 const DISPLAY_NAME = "Gemini CLI";
 const PRIORITY = 60;
 
-// =============================================================================
-// MCP Servers
-// =============================================================================
-
-async function loadMCPServers(ctx: LoadContext): Promise<LoadResult<MCPServer>> {
-	const items: MCPServer[] = [];
-	const warnings: string[] = [];
-
-	// User-level: ~/.gemini/settings.json → mcpServers
-	const userPath = getUserPath(ctx, "gemini", "settings.json");
-	if (userPath) {
-		const result = await loadMCPFromSettings(ctx, userPath, "user");
-		items.push(...result.items);
-		if (result.warnings) warnings.push(...result.warnings);
-	}
-
-	// Project-level: .gemini/settings.json → mcpServers
-	const projectPath = getProjectPath(ctx, "gemini", "settings.json");
-	if (projectPath) {
-		const result = await loadMCPFromSettings(ctx, projectPath, "project");
-		items.push(...result.items);
-		if (result.warnings) warnings.push(...result.warnings);
-	}
-
-	return { items, warnings };
-}
-
-async function loadMCPFromSettings(
-	_ctx: LoadContext,
-	path: string,
-	level: "user" | "project",
-): Promise<LoadResult<MCPServer>> {
-	const items: MCPServer[] = [];
-	const warnings: string[] = [];
-
-	const content = await readFile(path);
-	if (!content) {
-		return { items, warnings };
-	}
-
-	const parsed = tryParseJson<{ mcpServers?: Record<string, unknown> }>(content);
-	if (!parsed) {
-		warnings.push(`Invalid JSON in ${path}`);
-		return { items, warnings };
-	}
-
-	if (!parsed.mcpServers || typeof parsed.mcpServers !== "object") {
-		return { items, warnings };
-	}
-
-	const servers = expandEnvVarsDeep(parsed.mcpServers);
-
-	for (const [name, config] of Object.entries(servers)) {
-		if (!config || typeof config !== "object") {
-			warnings.push(`Invalid config for server "${name}" in ${path}`);
-			continue;
-		}
-
-		const raw = config as Record<string, unknown>;
-
-		items.push({
-			name,
-			command: typeof raw.command === "string" ? raw.command : undefined,
-			args: Array.isArray(raw.args) ? (raw.args as string[]) : undefined,
-			env: raw.env && typeof raw.env === "object" ? (raw.env as Record<string, string>) : undefined,
-			url: typeof raw.url === "string" ? raw.url : undefined,
-			headers: raw.headers && typeof raw.headers === "object" ? (raw.headers as Record<string, string>) : undefined,
-			transport: ["stdio", "sse", "http"].includes(raw.type as string)
-				? (raw.type as "stdio" | "sse" | "http")
-				: undefined,
-			timeout: typeof raw.timeout === "number" ? raw.timeout : undefined,
-			_source: createSourceMeta(PROVIDER_ID, path, level),
-		} as MCPServer);
-	}
-
-	return { items, warnings };
-}
-
 // =============================================================================
 // Context Files
 // =============================================================================
@@ -296,14 +218,6 @@ async function loadSettings(ctx: LoadContext): Promise<LoadResult<Settings>> {
 // Provider Registration
 // =============================================================================
 
-registerProvider(mcpCapability.id, {
-	id: PROVIDER_ID,
-	displayName: DISPLAY_NAME,
-	description: "Load MCP servers from ~/.gemini/settings.json and .gemini/settings.json",
-	priority: PRIORITY,
-	load: loadMCPServers,
-});
-
 registerProvider(contextFileCapability.id, {
 	id: PROVIDER_ID,
 	displayName: DISPLAY_NAME,

package/src/discovery/index.ts

@@ -30,7 +30,10 @@ import "./opencode";
 import "./github";
 import "./mcp-json";
 import "./ssh";
-import "./vscode";
+// NOTE: There is deliberately no VS Code provider and no MCP registration in
+// the cursor/gemini/opencode/windsurf providers: SKC does not inherit MCP
+// servers live from other hosts. MCP comes from SKC's own config (builtin,
+// mcp-json), validated plugin bundles, or an explicit `skc mcp import <host>`.
 import "./windsurf";
 
 // Re-export the main API from capability registry

package/src/discovery/mcp-json.ts

@@ -25,6 +25,7 @@ interface MCPConfigFile {
 		string,
 		{
 			enabled?: boolean;
+			autoload?: boolean;
 			timeout?: number;
 			command?: string;
 			args?: string[];
@@ -82,9 +83,19 @@ function transformMCPConfig(config: MCPConfigFile, source: SourceMeta): MCPServe
 				}
 			}
 
+			let autoload: boolean | undefined;
+			if (serverConfig.autoload !== undefined) {
+				if (typeof serverConfig.autoload === "boolean") {
+					autoload = serverConfig.autoload;
+				} else {
+					logger.warn("MCP server has invalid 'autoload' value, ignoring", { name, value: serverConfig.autoload });
+				}
+			}
+
 			const server: MCPServer = {
 				name,
 				enabled,
+				autoload,
 				timeout,
 				command: serverConfig.command,
 				args: serverConfig.args,

package/src/discovery/opencode.ts

@@ -7,21 +7,23 @@
  *
  * Capabilities:
  * - context-files: AGENTS.md (user-level only at ~/.config/opencode/AGENTS.md)
- * - mcps: From opencode.json "mcp" key
  * - settings: From opencode.json
  * - skills: From skills/ subdirectories
  * - slash-commands: From commands/ subdirectories
  * - extension-modules: From plugins/ subdirectories
  *
+ * MCP servers are intentionally NOT inherited live from OpenCode config: SKC
+ * owns MCP runtime execution. Use `skc mcp import opencode` to copy definitions
+ * into SKC's own mcp.json instead.
+ *
  * Priority: 55 (tool-specific provider)
  */
 import * as path from "node:path";
-import { logger, parseFrontmatter, tryParseJson } from "@sayknow-cli/utils";
+import { parseFrontmatter, tryParseJson } from "@sayknow-cli/utils";
 import { registerProvider } from "../capability";
 import { type ContextFile, contextFileCapability } from "../capability/context-file";
 import { type ExtensionModule, extensionModuleCapability } from "../capability/extension-module";
 import { readFile } from "../capability/fs";
-import { type MCPServer, mcpCapability } from "../capability/mcp";
 import { type Settings, settingsCapability } from "../capability/settings";
 import { type Skill, skillCapability } from "../capability/skill";
 import { type SlashCommand, slashCommandCapability } from "../capability/slash-command";
@@ -32,7 +34,6 @@ import {
 	buildExtensionModuleItems,
 	createSourceMeta,
 	discoverExtensionModulePaths,
-	expandEnvVarsDeep,
 	getProjectPath,
 	getUserPath,
 	loadFilesFromDir,
@@ -43,22 +44,6 @@ const PROVIDER_ID = "opencode";
 const DISPLAY_NAME = "OpenCode";
 const PRIORITY = 55;
 
-// =============================================================================
-// JSON Config Loading
-// =============================================================================
-
-async function loadJsonConfig(configPath: string): Promise<Record<string, unknown> | null> {
-	const content = await readFile(configPath);
-	if (!content) return null;
-
-	const parsed = tryParseJson<Record<string, unknown>>(content);
-	if (!parsed) {
-		logger.warn("Failed to parse OpenCode JSON config", { path: configPath });
-		return null;
-	}
-	return parsed;
-}
-
 // =============================================================================
 // Context Files (AGENTS.md)
 // =============================================================================
@@ -84,100 +69,6 @@ async function loadContextFiles(ctx: LoadContext): Promise<LoadResult<ContextFil
 	return { items, warnings };
 }
 
-// =============================================================================
-// MCP Servers (opencode.json → mcp)
-// =============================================================================
-
-/** OpenCode MCP server config (from opencode.json "mcp" key) */
-interface OpenCodeMCPConfig {
-	type?: "local" | "remote";
-	command?: string;
-	args?: string[];
-	env?: Record<string, string>;
-	url?: string;
-	headers?: Record<string, string>;
-	enabled?: boolean;
-	timeout?: number;
-}
-
-async function loadMCPServers(ctx: LoadContext): Promise<LoadResult<MCPServer>> {
-	const items: MCPServer[] = [];
-	const warnings: string[] = [];
-
-	// User-level: ~/.config/opencode/opencode.json
-	const userConfigPath = getUserPath(ctx, "opencode", "opencode.json");
-	if (userConfigPath) {
-		const config = await loadJsonConfig(userConfigPath);
-		if (config) {
-			const result = extractMCPServers(config, userConfigPath, "user");
-			items.push(...result.items);
-			if (result.warnings) warnings.push(...result.warnings);
-		}
-	}
-
-	// Project-level: opencode.json in project root
-	const projectConfigPath = path.join(ctx.cwd, "opencode.json");
-	const projectConfig = await loadJsonConfig(projectConfigPath);
-	if (projectConfig) {
-		const result = extractMCPServers(projectConfig, projectConfigPath, "project");
-		items.push(...result.items);
-		if (result.warnings) warnings.push(...result.warnings);
-	}
-
-	return { items, warnings };
-}
-
-function extractMCPServers(
-	config: Record<string, unknown>,
-	configPath: string,
-	level: "user" | "project",
-): LoadResult<MCPServer> {
-	const items: MCPServer[] = [];
-	const warnings: string[] = [];
-
-	if (!config.mcp || typeof config.mcp !== "object") {
-		return { items, warnings };
-	}
-
-	const servers = expandEnvVarsDeep(config.mcp as Record<string, unknown>);
-
-	for (const [name, raw] of Object.entries(servers)) {
-		if (!raw || typeof raw !== "object") {
-			warnings.push(`Invalid MCP config for "${name}" in ${configPath}`);
-			continue;
-		}
-
-		const serverConfig = raw as OpenCodeMCPConfig;
-
-		// Determine transport from OpenCode's "type" field
-		let transport: "stdio" | "sse" | "http" | undefined;
-		if (serverConfig.type === "local") {
-			transport = "stdio";
-		} else if (serverConfig.type === "remote") {
-			transport = "http";
-		} else if (serverConfig.url) {
-			transport = "http";
-		} else if (serverConfig.command) {
-			transport = "stdio";
-		}
-
-		items.push({
-			name,
-			command: serverConfig.command,
-			args: Array.isArray(serverConfig.args) ? (serverConfig.args as string[]) : undefined,
-			env: serverConfig.env && typeof serverConfig.env === "object" ? serverConfig.env : undefined,
-			url: typeof serverConfig.url === "string" ? serverConfig.url : undefined,
-			headers: serverConfig.headers && typeof serverConfig.headers === "object" ? serverConfig.headers : undefined,
-			enabled: serverConfig.enabled,
-			timeout: typeof serverConfig.timeout === "number" ? serverConfig.timeout : undefined,
-			transport,
-			_source: createSourceMeta(PROVIDER_ID, configPath, level),
-		});
-	}
-
-	return { items, warnings };
-}
-
 // =============================================================================
 // Skills (skills/)
 // =============================================================================
@@ -357,14 +248,6 @@ registerProvider(contextFileCapability.id, {
 	load: loadContextFiles,
 });
 
-registerProvider(mcpCapability.id, {
-	id: PROVIDER_ID,
-	displayName: DISPLAY_NAME,
-	description: "Load MCP servers from opencode.json mcp key",
-	priority: PRIORITY,
-	load: loadMCPServers,
-});
-
 registerProvider(skillCapability.id, {
 	id: PROVIDER_ID,
 	displayName: DISPLAY_NAME,

package/src/discovery/windsurf.ts

@@ -6,93 +6,23 @@
  * - Project: .windsurf
  *
  * Supports:
- * - MCP servers from mcp_config.json
  * - Rules from .windsurf/rules/*.md and ~/.codeium/windsurf/memories/global_rules.md
  * - Legacy .windsurfrules file
+ *
+ * MCP servers are intentionally NOT inherited live from Windsurf config: SKC
+ * owns MCP runtime execution. Copy definitions into SKC's own mcp.json instead.
  */
 
-import { tryParseJson } from "@sayknow-cli/utils";
 import { registerProvider } from "../capability";
 import { readFile } from "../capability/fs";
-import { type MCPServer, mcpCapability } from "../capability/mcp";
 import { type Rule, ruleCapability } from "../capability/rule";
 import type { LoadContext, LoadResult } from "../capability/types";
-import {
-	buildRuleFromMarkdown,
-	createSourceMeta,
-	expandEnvVarsDeep,
-	getProjectPath,
-	getUserPath,
-	loadFilesFromDir,
-} from "./helpers";
+import { buildRuleFromMarkdown, createSourceMeta, getProjectPath, getUserPath, loadFilesFromDir } from "./helpers";
 
 const PROVIDER_ID = "windsurf";
 const DISPLAY_NAME = "Windsurf";
 const PRIORITY = 50;
 
-// =============================================================================
-// MCP Servers
-// =============================================================================
-
-function parseServerConfig(
-	name: string,
-	serverConfig: unknown,
-	path: string,
-	scope: "user" | "project",
-): { server?: MCPServer; warning?: string } {
-	if (typeof serverConfig !== "object" || serverConfig === null) {
-		return { warning: `Invalid server config for "${name}" in ${path}` };
-	}
-
-	const server = expandEnvVarsDeep(serverConfig as Record<string, unknown>);
-	return {
-		server: {
-			name,
-			command: server.command as string | undefined,
-			args: server.args as string[] | undefined,
-			env: server.env as Record<string, string> | undefined,
-			url: server.url as string | undefined,
-			headers: server.headers as Record<string, string> | undefined,
-			transport: server.type as "stdio" | "sse" | "http" | undefined,
-			timeout: typeof server.timeout === "number" ? server.timeout : undefined,
-			_source: createSourceMeta(PROVIDER_ID, path, scope),
-		},
-	};
-}
-
-async function loadMCPServers(ctx: LoadContext): Promise<LoadResult<MCPServer>> {
-	const items: MCPServer[] = [];
-	const warnings: string[] = [];
-
-	const userPath = getUserPath(ctx, "windsurf", "mcp_config.json");
-	const [userContent, projectPath] = await Promise.all([
-		userPath ? readFile(userPath) : Promise.resolve(null),
-		getProjectPath(ctx, "windsurf", "mcp_config.json"),
-	]);
-
-	const projectContent = projectPath ? await readFile(projectPath) : null;
-
-	const configs: Array<{ content: string | null; path: string | null; scope: "user" | "project" }> = [
-		{ content: userContent, path: userPath, scope: "user" },
-		{ content: projectContent, path: projectPath, scope: "project" },
-	];
-
-	for (const { content, path, scope } of configs) {
-		if (!content || !path) continue;
-
-		const config = tryParseJson<{ mcpServers?: Record<string, unknown> }>(content);
-		if (!config?.mcpServers) continue;
-
-		for (const [name, serverConfig] of Object.entries(config.mcpServers)) {
-			const result = parseServerConfig(name, serverConfig, path, scope);
-			if (result.warning) warnings.push(result.warning);
-			if (result.server) items.push(result.server);
-		}
-	}
-
-	return { items, warnings };
-}
-
 // =============================================================================
 // Rules
 // =============================================================================
@@ -130,14 +60,6 @@ async function loadRules(ctx: LoadContext): Promise<LoadResult<Rule>> {
 // Provider Registration
 // =============================================================================
 
-registerProvider<MCPServer>(mcpCapability.id, {
-	id: PROVIDER_ID,
-	displayName: DISPLAY_NAME,
-	description: "Load MCP servers from Windsurf config (mcp_config.json)",
-	priority: PRIORITY,
-	load: loadMCPServers,
-});
-
 registerProvider<Rule>(ruleCapability.id, {
 	id: PROVIDER_ID,
 	displayName: DISPLAY_NAME,

package/src/edit/read-file.ts

@@ -14,6 +14,13 @@ import { isNotebookPath, readEditableNotebookText, serializeEditedNotebookText }
  */
 export const MAX_EDIT_FILE_BYTES = 8 * 1024 * 1024;
 
+const UTF8_BOM = [0xef, 0xbb, 0xbf] as const;
+
+async function fileHasUtf8Bom(file: Bun.BunFile): Promise<boolean> {
+	const bytes = await file.slice(0, UTF8_BOM.length).bytes();
+	return UTF8_BOM.every((byte, index) => bytes[index] === byte);
+}
+
 export async function readEditFileText(absolutePath: string, path: string): Promise<string> {
 	try {
 		const file = Bun.file(absolutePath);
@@ -28,7 +35,8 @@ export async function readEditFileText(absolutePath: string, path: string): Prom
 		// Guard BEFORE the notebook fast-path: a >8 MiB .ipynb would otherwise load + JSON-parse
 		// + convert the whole file via readEditableNotebookText, bypassing the F19 freeze guard.
 		if (isNotebookPath(absolutePath)) return await readEditableNotebookText(absolutePath, path);
-		return await file.text();
+		const text = await file.text();
+		return (await fileHasUtf8Bom(file)) && !text.startsWith("\uFEFF") ? `\uFEFF${text}` : text;
 	} catch (error) {
 		if (isEnoent(error)) {
 			throw new Error(`File not found: ${path}`);

package/src/extensibility/extensions/runner.ts

@@ -347,7 +347,8 @@ export class ExtensionRunner {
 		"ctrl+t",
 		"ctrl+g",
 		"shift+tab",
-		"shift+ctrl+p",
+		"alt+n",
+		"alt+shift+n",
 		"ctrl+enter",
 		"alt+enter",
 		"escape",

package/src/extensibility/extensions/types.ts

@@ -136,6 +136,17 @@ export interface ExtensionUIDialogOptions {
 		optionLabel: string;
 		onSubmit: (text: string) => void;
 	};
+	/**
+	 * Inline free-text input for a non-answer clarification action. It is
+	 * separate from `customInput` so callers can distinguish "ask about these
+	 * choices" from "provide my own answer". Empty/whitespace-only submissions
+	 * may be rejected by the selector when `allowEmpty` is false.
+	 */
+	clarificationInput?: {
+		optionLabel: string;
+		onSubmit: (text: string) => void;
+		allowEmpty?: boolean;
+	};
 }
 
 /** Raw terminal input listener for extensions. */

package/src/extensibility/skills.ts

@@ -326,12 +326,28 @@ interface SkillTokenMatch {
 	skill: Skill;
 }
 
+function buildInlineSkillInvocationArgs(text: string, matches: readonly SkillTokenMatch[]): string {
+	const pieces: string[] = [];
+	let cursor = 0;
+	for (const match of matches) {
+		pieces.push(text.slice(cursor, match.index));
+		cursor = match.end;
+	}
+	pieces.push(text.slice(cursor));
+	return pieces
+		.join("")
+		.replace(/[ \t]{2,}/g, " ")
+		.replace(/[ \t]+\n/g, "\n")
+		.replace(/\n[ \t]+/g, "\n")
+		.trim();
+}
+
 export function parseSkillInvocations(
 	text: string,
 	skillsByCommandName: ReadonlyMap<string, Skill>,
 ): ParsedSkillInvocation[] {
 	const trimmedText = text.trim();
-	if (!trimmedText.startsWith("/")) return [];
+	if (!trimmedText) return [];
 	const canonicalSkillCommandPattern = /(^|\s)\/(skill:[^\s]+)/g;
 	const matches: SkillTokenMatch[] = [];
 	for (const match of trimmedText.matchAll(canonicalSkillCommandPattern)) {
@@ -348,7 +364,19 @@ export function parseSkillInvocations(
 			skill,
 		});
 	}
-	if (matches.length === 0 || matches[0]?.index !== 0) return [];
+	if (matches.length === 0) return [];
+	if (matches[0]?.index !== 0) {
+		// Preserve leading slash-command semantics: `/skill:unknown /skill:alpha`
+		// should remain plain text rather than silently skipping the unknown
+		// leading command and invoking the later known one.
+		if (trimmedText.startsWith("/")) return [];
+		const args = buildInlineSkillInvocationArgs(trimmedText, matches);
+		return matches.map(match => ({
+			commandName: match.commandName,
+			args,
+			skill: match.skill,
+		}));
+	}
 	return matches.map((match, index) => {
 		const next = matches[index + 1];
 		return {