mini-coder 0.5.12 → 0.5.13

package/src/index.ts

@@ -1,9 +1,9 @@
 /**
  * Entry point for mini-coder.
  *
- * Discovers available LLM providers, loads context (AGENTS.md, skills,
- * plugins), opens the session database, selects a model, and starts
- * the TUI.
+ * Discovers available LLM providers, loads configured MCP tools,
+ * loads prompt context (AGENTS.md, skills, and theme), opens the session
+ * database, selects a model, and starts the TUI.
  *
  * @module
  */
@@ -14,7 +14,6 @@ import { basename, dirname, join } from "node:path";
 import { isDeepStrictEqual } from "node:util";
 import type {
   KnownProvider,
-  Message,
   Model,
   OAuthCredentials,
   ThinkingLevel,
@@ -33,15 +32,8 @@ import {
 } from "./cli.ts";
 import { getErrorMessage } from "./errors.ts";
 import { type GitState, getGitState } from "./git.ts";
+import { discoverMcpServers, type McpServerState } from "./mcp.ts";
 import { canonicalizePath } from "./paths.ts";
-import {
-  type AgentContext,
-  destroyPlugins,
-  initPlugins,
-  type LoadedPlugin,
-  loadPluginConfig,
-  type PluginEntry,
-} from "./plugins.ts";
 import {
   type AgentsMdFile,
   buildSystemPrompt,
@@ -52,7 +44,6 @@ import {
   appendMessage,
   createConversationSnapshot,
   createSession,
-  filterModelMessages,
   type loadMessages,
   openDatabase,
   type Session,
@@ -61,12 +52,13 @@ import {
 } from "./session.ts";
 import {
   type CustomProvider,
-  loadSettings,
+  loadStartupSettings,
+  mergeUserSettings,
   resolveStartupSettings,
   type UserSettings,
 } from "./settings.ts";
 import { discoverSkills, type Skill } from "./skills.ts";
-import { DEFAULT_THEME, mergeThemes, type Theme } from "./theme.ts";
+import { DEFAULT_THEME, type Theme } from "./theme.ts";
 import {
   createTodoReadToolHandler,
   createTodoWriteToolHandler,
@@ -95,9 +87,6 @@ const DATA_DIR = join(homedir(), ".config", "mini-coder");
 /** SQLite database path. */
 const DB_PATH = join(DATA_DIR, "mini-coder.db");
 
-/** Plugin config file path. */
-const PLUGIN_CONFIG_PATH = join(DATA_DIR, "plugins.json");
-
 /** OAuth credentials file path. */
 const AUTH_PATH = join(DATA_DIR, "auth.json");
 
@@ -370,8 +359,8 @@ function selectModel(
  */
 function buildTools(
   model: Model<string>,
-  plugins: LoadedPlugin[],
   messages: AppState["messages"],
+  mcpServers: readonly McpServerState[],
 ): { tools: Tool[]; toolHandlers: Map<string, ToolHandler> } {
   const tools: Tool[] = [
     shellTool,
@@ -390,26 +379,23 @@ function buildTools(
     [todoReadTool.name, createTodoReadToolHandler(messages)],
   ]);
 
+  for (const server of mcpServers) {
+    if (!server.enabled || !server.connected) {
+      continue;
+    }
+
+    tools.push(...server.tools);
+    for (const [name, handler] of server.toolHandlers) {
+      toolHandlers.set(name, handler);
+    }
+  }
+
   // Conditionally register readImage for vision-capable models
   if (model.input.includes("image")) {
     tools.push(readImageTool);
     toolHandlers.set(readImageTool.name, readImageToolHandler);
   }
 
-  // Add plugin tools
-  for (const plugin of plugins) {
-    if (plugin.result.tools) {
-      for (const tool of plugin.result.tools) {
-        tools.push(tool);
-      }
-    }
-    if (plugin.result.toolHandlers) {
-      for (const [name, handler] of plugin.result.toolHandlers) {
-        toolHandlers.set(name, handler);
-      }
-    }
-  }
-
   return { tools, toolHandlers };
 }
 
@@ -429,21 +415,13 @@ function getSkillScanPaths(cwd: string, gitRoot: string | null): string[] {
   ];
 }
 
-/** Load AGENTS.md files, skills, plugins, git state, and the merged theme. */
-export async function loadPromptContext(
-  messages: readonly Message[],
-  opts?: {
-    cwd?: string;
-    pluginEntries?: PluginEntry[];
-    pluginConfigPath?: string;
-  },
-): Promise<{
+/** Load AGENTS.md files, skills, git state, and the active theme. */
+export async function loadPromptContext(opts?: { cwd?: string }): Promise<{
   cwd: string;
   canonicalCwd: string;
   git: GitState | null;
   agentsMd: AgentsMdFile[];
   skills: Skill[];
-  plugins: LoadedPlugin[];
   theme: Theme;
 }> {
   const cwd = opts?.cwd ?? process.cwd();
@@ -459,20 +437,6 @@ export async function loadPromptContext(
   );
   const agentsMd = discoverAgentsMd(cwd, scanRoot, join(home, ".agents"));
   const skills = discoverSkills(getSkillScanPaths(canonicalCwd, gitRoot));
-  const pluginEntries =
-    opts?.pluginEntries ??
-    loadPluginConfig(opts?.pluginConfigPath ?? PLUGIN_CONFIG_PATH);
-  const context: AgentContext = {
-    cwd,
-    messages,
-    dataDir: DATA_DIR,
-  };
-  const plugins = await initPlugins(pluginEntries, context, (entry, err) => {
-    console.error(`Plugin "${entry.name}" failed to init: ${err.message}`);
-  });
-  const themeOverrides = plugins
-    .map((plugin) => plugin.result.theme)
-    .filter((theme): theme is Partial<Theme> => theme != null);
 
   return {
     cwd,
@@ -480,8 +444,38 @@ export async function loadPromptContext(
     git,
     agentsMd,
     skills,
-    plugins,
-    theme: mergeThemes(DEFAULT_THEME, ...themeOverrides),
+    theme: DEFAULT_THEME,
+  };
+}
+
+/**
+ * Load global and repo-local settings for the current launch.
+ *
+ * The repo-local overlay is read only and is loaded only when a git root is
+ * known. Invalid startup content in either file is treated as empty settings.
+ *
+ * @param opts - Optional settings path and git-root override for tests.
+ * @returns Global settings, repo-local overlay settings, and the merged result.
+ */
+export function loadUserSettingsForLaunch(opts?: {
+  settingsPath?: string;
+  gitRoot?: string | null;
+}): {
+  settings: UserSettings;
+  repoSettings: UserSettings;
+  effectiveSettings: UserSettings;
+} {
+  const settingsPath = opts?.settingsPath ?? SETTINGS_PATH;
+  const gitRoot = opts?.gitRoot ?? null;
+  const settings = loadStartupSettings(settingsPath);
+  const repoSettings = gitRoot
+    ? loadStartupSettings(join(gitRoot, ".mini-coder", "settings.json"))
+    : {};
+
+  return {
+    settings,
+    repoSettings,
+    effectiveSettings: mergeUserSettings(settings, repoSettings),
   };
 }
 
@@ -490,25 +484,17 @@ export async function reloadPromptContext(
   state: AppState,
   runtime?: {
     loadPromptContext?: typeof loadPromptContext;
-    destroyPlugins?: typeof destroyPlugins;
   },
 ): Promise<void> {
   const loadContext = runtime?.loadPromptContext ?? loadPromptContext;
-  const destroyLoadedPlugins = runtime?.destroyPlugins ?? destroyPlugins;
-  const previousPlugins = state.plugins;
-  const context = await loadContext(filterModelMessages(state.messages));
+  const context = await loadContext();
 
   state.cwd = context.cwd;
   state.canonicalCwd = context.canonicalCwd;
   state.git = context.git;
   state.agentsMd = context.agentsMd;
   state.skills = context.skills;
-  state.plugins = context.plugins;
   state.theme = context.theme;
-
-  await destroyLoadedPlugins(previousPlugins, (entry, err) => {
-    console.error(`Plugin "${entry.name}" failed to destroy: ${err.message}`);
-  });
 }
 
 // ---------------------------------------------------------------------------
@@ -535,9 +521,7 @@ export interface AppState {
   agentsMd: AgentsMdFile[];
   /** Discovered skills. */
   skills: Skill[];
-  /** Loaded plugins. */
-  plugins: LoadedPlugin[];
-  /** Active theme (default + plugin overrides). */
+  /** Active theme. */
   theme: Theme;
   /** Version label shown in the empty conversation banner. */
   versionLabel: string;
@@ -549,6 +533,8 @@ export interface AppState {
   oauthCredentials: Record<string, OAuthCredentials>;
   /** Loaded global user settings. */
   settings: UserSettings;
+  /** Loaded repo-local settings overlay for the current app run. */
+  repoSettings: UserSettings;
   /** Absolute path to the global settings file. */
   settingsPath: string;
   /** Working directory as entered by the user/shell (for display and tool execution). */
@@ -567,9 +553,11 @@ export interface AppState {
   showReasoning: boolean;
   /** Whether to show full (un-truncated) tool output. */
   verbose: boolean;
+  /** Configured MCP servers, including their current enabled/disabled state. */
+  mcpServers: McpServerState[];
   /** Models discovered from custom OpenAI-compatible providers. */
   customModels: Model<string>[];
-  /** Warnings from startup (e.g. unreachable custom providers). */
+  /** Warnings from startup (e.g. unreachable custom providers or MCP servers). */
   startupWarnings: string[];
 }
 
@@ -587,13 +575,17 @@ export async function init(): Promise<AppState> {
   // Discover providers (env + OAuth)
   const { providers, oauthCredentials } = await discoverProviders();
 
-  // Load user settings and resolve startup defaults
-  const settings = loadSettings(SETTINGS_PATH);
+  const promptContext = await loadPromptContext({ cwd });
+  const { settings, repoSettings, effectiveSettings } =
+    loadUserSettingsForLaunch({
+      settingsPath: SETTINGS_PATH,
+      gitRoot: promptContext.git?.root ?? null,
+    });
 
-  // Discover custom providers from settings
+  // Discover custom providers from effective settings
   const builtInProviderNames = new Set(providers.keys());
   const customResult = await discoverCustomProviders(
-    settings.customProviders ?? [],
+    effectiveSettings.customProviders ?? [],
     builtInProviderNames,
   );
 
@@ -602,10 +594,12 @@ export async function init(): Promise<AppState> {
     providers.set(name, key);
   }
 
+  const mcpResult = await discoverMcpServers(effectiveSettings.mcp);
+
   const builtInModels = listAvailableModels(providers);
   const availableModels = [...builtInModels, ...customResult.models];
   const startup = resolveStartupSettings(
-    settings,
+    effectiveSettings,
     availableModels.map((model) => `${model.provider}/${model.id}`),
   );
   const model = selectModel(availableModels, startup.modelId);
@@ -614,12 +608,6 @@ export async function init(): Promise<AppState> {
   const db = openDatabase(DB_PATH);
   const effort = startup.effort;
   const conversation = createConversationSnapshot();
-  const promptContext = await loadPromptContext(
-    filterModelMessages(conversation.messages),
-    {
-      cwd,
-    },
-  );
 
   return {
     db,
@@ -631,13 +619,13 @@ export async function init(): Promise<AppState> {
     contextTokens: conversation.contextTokens,
     agentsMd: promptContext.agentsMd,
     skills: promptContext.skills,
-    plugins: promptContext.plugins,
     theme: promptContext.theme,
     versionLabel: resolveAppVersionLabel(),
     git: promptContext.git,
     providers,
     oauthCredentials,
     settings,
+    repoSettings,
     settingsPath: SETTINGS_PATH,
     cwd: promptContext.cwd,
     canonicalCwd: promptContext.canonicalCwd,
@@ -647,8 +635,9 @@ export async function init(): Promise<AppState> {
     queuedUserMessages: [],
     showReasoning: startup.showReasoning,
     verbose: startup.verbose,
+    mcpServers: mcpResult.servers,
     customModels: customResult.models,
-    startupWarnings: customResult.warnings,
+    startupWarnings: [...customResult.warnings, ...mcpResult.warnings],
   };
 }
 
@@ -686,9 +675,6 @@ export function buildPrompt(state: AppState): string {
     git: state.git,
     agentsMd: state.agentsMd,
     skills: state.skills,
-    pluginSuffixes: state.plugins
-      .map((p) => p.result.systemPromptSuffix)
-      .filter((s): s is string => s != null),
   });
 }
 
@@ -698,7 +684,7 @@ export function buildToolList(state: AppState): {
   toolHandlers: Map<string, ToolHandler>;
 } {
   if (!state.model) return { tools: [], toolHandlers: new Map() };
-  return buildTools(state.model, state.plugins, state.messages);
+  return buildTools(state.model, state.messages, state.mcpServers);
 }
 
 /**
@@ -747,9 +733,7 @@ export function getAvailableModels(state: AppState): Model<string>[] {
 
 /** Clean up resources on shutdown. */
 export async function shutdown(state: AppState): Promise<void> {
-  await destroyPlugins(state.plugins, (entry, err) => {
-    console.error(`Plugin "${entry.name}" failed to destroy: ${err.message}`);
-  });
+  await Promise.allSettled(state.mcpServers.map((server) => server.close()));
   state.db.close();
 }
 
@@ -776,7 +760,8 @@ type HeadlessCliStopReason = "stop" | "length" | "error" | "aborted";
  *
  * Non-TTY detection only decides whether headless mode should run at all.
  * Once headless mode is selected, `--json` is the only switch that chooses
- * NDJSON streaming versus final-text output.
+ * NDJSON streaming versus the default text mode (stdout final answer plus
+ * stderr activity snippets).
  *
  * @param state - Initialized application state for the run.
  * @param cli - Parsed CLI options.

package/src/input.ts

@@ -23,6 +23,7 @@ export const COMMANDS = [
   "undo",
   "reasoning",
   "verbose",
+  "mcp",
   "todo",
   "login",
   "logout",
@@ -31,8 +32,11 @@ export const COMMANDS = [
   "effort",
 ] as const;
 
+/** Slash helper that opens the interactive skill picker when submitted alone. */
+export const SKILL_COMMAND = "skill" as const;
+
 /** A recognized slash command name. */
-type Command = (typeof COMMANDS)[number];
+type Command = (typeof COMMANDS)[number] | typeof SKILL_COMMAND;
 
 const COMMAND_SET: ReadonlySet<string> = new Set(COMMANDS);
 
@@ -73,6 +77,14 @@ function isCommand(value: string): value is Command {
 }
 
 function parseSlashInput(trimmed: string): ParsedInput | null {
+  if (trimmed === `/${SKILL_COMMAND}`) {
+    return {
+      type: "command",
+      command: SKILL_COMMAND,
+      args: "",
+    };
+  }
+
   const skillMatch = trimmed.match(/^\/skill:(\S+)(?:\s+(.*))?$/s);
   if (skillMatch?.[1]) {
     return {