mini-coder 0.5.11 → 0.5.13

package/src/ui/commands.ts

@@ -17,22 +17,31 @@ import { getOAuthProviders } from "@mariozechner/pi-ai/oauth";
 import { getErrorMessage } from "../errors.ts";
 import type { AppState } from "../index.ts";
 import { getAvailableModels, saveOAuthCredentials } from "../index.ts";
-import { COMMANDS } from "../input.ts";
+import { COMMANDS, SKILL_COMMAND } from "../input.ts";
+import { connectMcpServer, disconnectMcpServer } from "../mcp.ts";
 import {
-  computeContextTokens,
-  computeStats,
+  clearConversationState,
   forkSession,
   listPromptHistory,
   listSessions,
   loadMessages,
+  replaceConversationState,
   type SessionListEntry,
   type UiInfoFormat,
   undoLastTurn,
 } from "../session.ts";
 import { updateSettings } from "../settings.ts";
+import { clearQueuedUserMessages } from "../submit.ts";
+import { collapseWhitespace, truncateText } from "../text.ts";
 import { getTodoItems } from "../tools.ts";
-import { buildHelpText, COMMAND_DESCRIPTIONS } from "./help.ts";
+import {
+  buildHelpText,
+  COMMAND_DESCRIPTIONS,
+  SKILL_REFERENCE_DESCRIPTION,
+  SKILL_REFERENCE_LABEL,
+} from "./help.ts";
 import { type ActiveOverlay, OVERLAY_MAX_VISIBLE } from "./overlay.ts";
+import type { UiRenderPriority } from "./runtime.ts";
 import { abbreviatePath } from "./status.ts";
 
 /** Effort levels available for selection. */
@@ -45,9 +54,9 @@ const EFFORT_LEVELS: { label: string; value: ThinkingLevel }[] = [
 
 /** Runtime hooks injected from the stateful UI module. */
 interface UiCommandRuntime {
-  /** Open an overlay and trigger a re-render. */
+  /** Open an overlay. */
   openOverlay: (overlay: ActiveOverlay) => void;
-  /** Dismiss the active overlay and trigger a re-render. */
+  /** Dismiss the active overlay. */
   dismissOverlay: () => void;
   /** Update the current input draft. */
   setInputValue: (value: string) => void;
@@ -64,14 +73,30 @@ interface UiCommandRuntime {
   ) => void;
   /** Re-enable stick-to-bottom behavior for the conversation log. */
   scrollConversationToBottom: () => void;
-  /** Trigger a UI re-render. */
-  render: () => void;
+  /** Schedule a UI re-render. */
+  requestRender: (priority?: UiRenderPriority) => void;
   /** Reload prompt/session context at a boundary like `/new`. */
   reloadPromptContext: (state: AppState) => Promise<void>;
   /** Open a URL in the user's default browser. */
   openInBrowser: (url: string) => void;
 }
 
+interface UiCommandDeps {
+  /** Connect a configured MCP server on demand. */
+  connectMcpServer: (
+    server: AppState["mcpServers"][number],
+  ) => Promise<string[]>;
+  /** Disconnect an MCP server and clear its imported tools. */
+  disconnectMcpServer: (
+    server: AppState["mcpServers"][number],
+  ) => Promise<void>;
+}
+
+const defaultUiCommandDeps: UiCommandDeps = {
+  connectMcpServer,
+  disconnectMcpServer,
+};
+
 /** Public command actions consumed by `ui.ts` and unit tests. */
 interface UiCommandController {
   /** Apply a model selection and persist it to settings. */
@@ -142,7 +167,7 @@ export function formatRelativeDate(date: Date, now = new Date()): string {
  * @returns A single-line preview string.
  */
 export function formatPromptHistoryPreview(text: string): string {
-  return text.replace(/\s+/g, " ").trim();
+  return collapseWhitespace(text);
 }
 
 const HISTORY_PREVIEW_MAX_CHARS = 32;
@@ -150,26 +175,6 @@ const HISTORY_CWD_MAX_CHARS = 18;
 const SESSION_PREVIEW_MAX_CHARS = 27;
 const SESSION_MODEL_MAX_CHARS = 17;
 
-function truncateTrailingText(text: string, maxChars: number): string {
-  if (text.length <= maxChars) {
-    return text;
-  }
-  if (maxChars <= 1) {
-    return "…";
-  }
-  return `${text.slice(0, maxChars - 1)}…`;
-}
-
-function truncateLeadingText(text: string, maxChars: number): string {
-  if (text.length <= maxChars) {
-    return text;
-  }
-  if (maxChars <= 1) {
-    return "…";
-  }
-  return `…${text.slice(text.length - (maxChars - 1))}`;
-}
-
 /**
  * Format a prompt-history row for the Select overlay.
  *
@@ -183,13 +188,14 @@ export function formatPromptHistoryLabel(
   cwd: string,
   date: string,
 ): string {
-  const preview = truncateTrailingText(
+  const preview = truncateText(
     formatPromptHistoryPreview(text),
     HISTORY_PREVIEW_MAX_CHARS,
   );
-  const displayCwd = truncateLeadingText(
+  const displayCwd = truncateText(
     abbreviatePath(cwd),
     HISTORY_CWD_MAX_CHARS,
+    "start",
   );
   return `${preview}  ·  ${displayCwd}  ·  ${date}`;
 }
@@ -207,11 +213,11 @@ export function formatSessionLabel(
   date: string,
   isCurrent: boolean,
 ): string {
-  const preview = truncateTrailingText(
+  const preview = truncateText(
     session.firstUserPreview ?? "No messages yet",
     SESSION_PREVIEW_MAX_CHARS,
   );
-  const model = truncateTrailingText(
+  const model = truncateText(
     session.model ?? "no model",
     SESSION_MODEL_MAX_CHARS,
   );
@@ -229,14 +235,117 @@ interface OverlayItem {
   filterText: string;
 }
 
+function formatSkillLabel(skill: AppState["skills"][number]): string {
+  return skill.description
+    ? `${skill.name}  ·  ${skill.description}`
+    : skill.name;
+}
+
+function formatToolCount(count: number): string {
+  return `${count} tool${count === 1 ? "" : "s"}`;
+}
+
+function formatMcpServerLabel(server: AppState["mcpServers"][number]): string {
+  return `${server.name}  ·  ${server.enabled ? "on" : "off"}  ·  ${formatToolCount(server.tools.length)}`;
+}
+
+function formatMcpToggleMessage(
+  server: AppState["mcpServers"][number],
+  toolCount: number,
+): string {
+  const action = server.enabled ? "Enabled" : "Disabled";
+  const delta = `${server.enabled ? "+" : "-"}${toolCount}`;
+  const toolSuffix = toolCount === 1 ? "tool" : "tools";
+  return `${action} MCP server "${server.name}" (${delta} ${toolSuffix}).`;
+}
+
+function isRepoLocalMcpServer(state: AppState, serverName: string): boolean {
+  return (
+    state.repoSettings.mcp?.servers?.some(
+      (entry) => entry.name === serverName,
+    ) ?? false
+  );
+}
+
+function persistMcpServerSettings(
+  state: AppState,
+  server: AppState["mcpServers"][number],
+): void {
+  if (isRepoLocalMcpServer(state, server.name)) {
+    return;
+  }
+
+  state.settings = updateSettings(state.settingsPath, {
+    mcp: {
+      servers: [
+        {
+          name: server.name,
+          url: server.url,
+          enabled: server.enabled,
+        },
+      ],
+    },
+  });
+}
+
+async function toggleMcpServer(
+  server: AppState["mcpServers"][number],
+  state: AppState,
+  runtime: UiCommandRuntime,
+  deps: UiCommandDeps,
+): Promise<void> {
+  try {
+    if (server.enabled) {
+      const toolCount = server.tools.length;
+      await deps.disconnectMcpServer(server);
+      server.enabled = false;
+      persistMcpServerSettings(state, server);
+      runtime.appendInfoMessage(
+        formatMcpToggleMessage(server, toolCount),
+        state,
+      );
+      runtime.requestRender("normal");
+      return;
+    }
+
+    const warnings = await deps.connectMcpServer(server);
+    if (!server.connected) {
+      for (const warning of warnings) {
+        runtime.appendInfoMessage(warning, state);
+      }
+      runtime.requestRender("normal");
+      return;
+    }
+
+    server.enabled = true;
+    persistMcpServerSettings(state, server);
+    runtime.appendInfoMessage(
+      formatMcpToggleMessage(server, server.tools.length),
+      state,
+    );
+    for (const warning of warnings) {
+      runtime.appendInfoMessage(warning, state);
+    }
+    runtime.requestRender("normal");
+  } catch (error) {
+    runtime.appendInfoMessage(
+      `MCP server "${server.name}": ${getErrorMessage(error)}`,
+      state,
+    );
+    runtime.requestRender("normal");
+  }
+}
+
 /**
  * Create the UI command controller bound to the current UI runtime hooks.
  *
  * @param runtime - State mutation and rendering hooks owned by `ui.ts`.
+ * @param deps - Internal MCP command dependencies, mainly for tests.
  * @returns Command actions for slash commands and overlays.
  */
 export function createCommandController(
   runtime: UiCommandRuntime,
+  deps: UiCommandDeps = defaultUiCommandDeps,
 ): UiCommandController {
   const openSelectOverlay = (
     state: AppState,
@@ -252,20 +361,52 @@ export function createCommandController(
       focused: true,
       highlightColor: state.theme.accentText,
       onSelect,
+      onKeyPress: (key) => {
+        if (key === "escape") {
+          runtime.dismissOverlay();
+          return;
+        }
+        return false;
+      },
       onBlur: runtime.dismissOverlay,
     });
 
     runtime.openOverlay({ select, title });
   };
 
-  const showCommandAutocomplete = (state: AppState): void => {
-    const items = COMMANDS.map((command) => ({
-      label: `/${command}  ${COMMAND_DESCRIPTIONS[command] ?? ""}`,
-      value: command,
-      filterText: command,
+  const handleSkillCommand = (state: AppState): void => {
+    const items = state.skills.map((skill) => ({
+      label: formatSkillLabel(skill),
+      value: skill.name,
+      filterText: `${skill.name} ${skill.description ?? ""}`,
     }));
 
-    runtime.setInputValue("");
+    openSelectOverlay(
+      state,
+      "Select a skill",
+      items,
+      "type to filter skills...",
+      (skillName) => {
+        runtime.setInputValue(`/${SKILL_COMMAND}:${skillName}`);
+        runtime.dismissOverlay();
+      },
+    );
+  };
+
+  const showCommandAutocomplete = (state: AppState): void => {
+    const items: OverlayItem[] = [
+      ...COMMANDS.map((command) => ({
+        label: `/${command}  ${COMMAND_DESCRIPTIONS[command] ?? ""}`,
+        value: command,
+        filterText: command,
+      })),
+      {
+        label: `${SKILL_REFERENCE_LABEL}  ${SKILL_REFERENCE_DESCRIPTION}`,
+        value: SKILL_COMMAND,
+        filterText: `${SKILL_COMMAND} ${SKILL_REFERENCE_LABEL}`,
+      },
+    ];
+
     openSelectOverlay(
       state,
       "Commands",
@@ -273,6 +414,12 @@ export function createCommandController(
       "type to filter commands...",
       (value) => {
         runtime.dismissOverlay();
+        if (value === SKILL_COMMAND) {
+          handleSkillCommand(state);
+          return;
+        }
+
+        runtime.setInputValue("");
         handleCommand(value, state);
       },
     );
@@ -393,17 +540,17 @@ export function createCommandController(
       items,
       "type to filter sessions...",
       (sessionId) => {
+        clearQueuedUserMessages(state);
         if (sessionId !== currentSessionId) {
           const picked = sessions.find((session) => session.id === sessionId);
           if (picked) {
             state.session = picked;
-            state.messages = loadMessages(state.db, picked.id);
-            state.stats = computeStats(state.messages);
-            state.contextTokens = computeContextTokens(state.messages);
+            replaceConversationState(state, loadMessages(state.db, picked.id));
             runtime.scrollConversationToBottom();
           }
         }
         runtime.dismissOverlay();
+        runtime.requestRender("normal");
       },
     );
   };
@@ -412,13 +559,12 @@ export function createCommandController(
     if (state.running) {
       return;
     }
+    clearQueuedUserMessages(state);
     state.session = null;
-    state.messages = [];
-    state.stats = { totalInput: 0, totalOutput: 0, totalCost: 0 };
-    state.contextTokens = 0;
+    clearConversationState(state);
     await runtime.reloadPromptContext(state);
     runtime.scrollConversationToBottom();
-    runtime.render();
+    runtime.requestRender("normal");
   };
 
   const handleForkCommand = (state: AppState): void => {
@@ -427,13 +573,13 @@ export function createCommandController(
     }
     const forked = forkSession(state.db, state.session.id);
     state.session = forked;
-    state.messages = loadMessages(state.db, forked.id);
-    state.stats = computeStats(state.messages);
-    state.contextTokens = computeContextTokens(state.messages);
+    replaceConversationState(state, loadMessages(state.db, forked.id));
     runtime.appendInfoMessage("Forked session.", state);
   };
 
   const handleUndoCommand = async (state: AppState): Promise<void> => {
+    clearQueuedUserMessages(state);
+
     if (state.running && state.abortController) {
       state.abortController.abort();
     }
@@ -447,11 +593,9 @@ export function createCommandController(
     }
     const removed = undoLastTurn(state.db, state.session.id);
     if (removed) {
-      state.messages = loadMessages(state.db, state.session.id);
-      state.stats = computeStats(state.messages);
-      state.contextTokens = computeContextTokens(state.messages);
+      replaceConversationState(state, loadMessages(state.db, state.session.id));
       runtime.scrollConversationToBottom();
-      runtime.render();
+      runtime.requestRender("normal");
     }
   };
 
@@ -460,7 +604,6 @@ export function createCommandController(
     state.settings = updateSettings(state.settingsPath, {
       showReasoning: state.showReasoning,
     });
-    runtime.render();
   };
 
   const handleVerboseCommand = (state: AppState): void => {
@@ -468,7 +611,34 @@ export function createCommandController(
     state.settings = updateSettings(state.settingsPath, {
       verbose: state.verbose,
     });
-    runtime.render();
+  };
+
+  const handleMcpCommand = (state: AppState): void => {
+    if (state.mcpServers.length === 0) {
+      return;
+    }
+
+    const items = state.mcpServers.map((server) => ({
+      label: formatMcpServerLabel(server),
+      value: server.name,
+      filterText: `${server.name} ${server.url} ${server.enabled ? "on" : "off"}`,
+    }));
+
+    openSelectOverlay(
+      state,
+      "Toggle MCP servers",
+      items,
+      "type to filter MCP servers...",
+      (serverName) => {
+        const server = state.mcpServers.find(
+          (entry) => entry.name === serverName,
+        );
+        runtime.dismissOverlay();
+        if (server) {
+          void toggleMcpServer(server, state, runtime, deps);
+        }
+      },
+    );
   };
 
   const performLogin = async (
@@ -637,12 +807,18 @@ export function createCommandController(
       case "verbose":
         handleVerboseCommand(state);
         return true;
+      case "mcp":
+        handleMcpCommand(state);
+        return true;
       case "todo":
         handleTodoCommand(state);
         return true;
       case "help":
         handleHelpCommand(state);
         return true;
+      case SKILL_COMMAND:
+        handleSkillCommand(state);
+        return true;
       default:
         return false;
     }