mini-coder 0.5.11 → 0.5.12

package/src/ui/agent.ts

@@ -1,10 +1,11 @@
 /**
  * Input parsing, message submission, and streaming agent-event handling for the terminal UI.
  *
- * This module owns the transient streaming render state for the in-progress
- * assistant response. Persistent session and message state remain on
- * {@link AppState}; transient UI concerns are exposed through runtime hooks so
- * `ui.ts` can stay a small orchestrator.
+ * This module builds the controller used by `ui.ts`. Each controller owns its
+ * own transient streaming render state for the in-progress assistant response.
+ * Persistent session and message state remain on {@link AppState}; transient UI
+ * concerns are exposed through runtime hooks so `ui.ts` can stay a small
+ * orchestrator.
  *
  * @module
  */
@@ -22,17 +23,18 @@ import type {
   PendingToolResult,
   StreamingConversationState,
 } from "./conversation.ts";
+import type { UiRenderPriority } from "./runtime.ts";
 
 export { isEmptyUserContent, stripSkillFrontmatter } from "../submit.ts";
 
-/** Streaming assistant content for the current response. */
-let streamingContent: AssistantMessage["content"] = [];
-
-/** Whether a response is currently streaming. */
-let isStreaming = false;
-
-/** Tool results collected during the current streaming turn. */
-let pendingToolResults: PendingToolResult[] = [];
+interface UiAgentRuntimeState {
+  /** Whether a response is currently streaming. */
+  isStreaming: boolean;
+  /** Streaming assistant content for the current response. */
+  content: AssistantMessage["content"];
+  /** Tool results collected during the current streaming turn. */
+  pendingToolResults: PendingToolResult[];
+}
 
 /** Hooks implemented by `ui.ts` to bridge controller logic with runtime UI state. */
 interface UiAgentRuntime {
@@ -40,8 +42,8 @@ interface UiAgentRuntime {
   appendInfoMessage: (text: string, state: AppState) => void;
   /** Dispatch a parsed slash command. */
   handleCommand: (command: string, state: AppState) => boolean;
-  /** Trigger a UI render. */
-  render: () => void;
+  /** Schedule a UI render. */
+  requestRender: (priority?: UiRenderPriority) => void;
   /** Re-enable stick-to-bottom behavior for the conversation log. */
   scrollConversationToBottom: () => void;
   /** Start the active-turn divider animation. */
@@ -54,30 +56,10 @@ interface UiAgentRuntime {
 interface UiAgentController {
   /** Route raw user input through parseInput and dispatch accordingly. */
   handleInput: (raw: string, state: AppState) => void;
-}
-
-/**
- * Reset the transient streaming UI state owned by this module.
- *
- * Used by `resetUiState()` and tests to keep state isolated.
- */
-export function resetUiAgentState(): void {
-  streamingContent = [];
-  isStreaming = false;
-  pendingToolResults = [];
-}
-
-/**
- * Read the current streaming tail state for conversation rendering.
- *
- * @returns The in-progress assistant content and pending tool results.
- */
-export function getStreamingConversationState(): StreamingConversationState {
-  return {
-    isStreaming,
-    content: streamingContent,
-    pendingToolResults,
-  };
+  /** Read the current streaming tail state for conversation rendering. */
+  getStreamingConversationState: () => StreamingConversationState;
+  /** Reset the transient streaming state owned by this controller. */
+  reset: () => void;
 }
 
 /**
@@ -89,6 +71,173 @@ export function getStreamingConversationState(): StreamingConversationState {
 export function createUiAgentController(
   runtime: UiAgentRuntime,
 ): UiAgentController {
+  const streamingState: UiAgentRuntimeState = {
+    isStreaming: false,
+    content: [],
+    pendingToolResults: [],
+  };
+
+  const resetStreamingState = (): boolean => {
+    const changed =
+      streamingState.isStreaming ||
+      streamingState.content.length > 0 ||
+      streamingState.pendingToolResults.length > 0;
+    streamingState.isStreaming = false;
+    streamingState.content = [];
+    streamingState.pendingToolResults = [];
+    return changed;
+  };
+
+  const clearStreamingContent = (): boolean => {
+    if (streamingState.content.length === 0) {
+      return false;
+    }
+    streamingState.content = [];
+    return true;
+  };
+
+  const setStreamingContent = (
+    content: AssistantMessage["content"],
+  ): boolean => {
+    if (streamingState.content === content) {
+      return false;
+    }
+    streamingState.content = content;
+    return true;
+  };
+
+  const upsertPendingToolResult = (
+    event: Extract<AgentEvent, { type: "tool_delta" | "tool_end" }>,
+  ): boolean => {
+    const pending = streamingState.pendingToolResults.find(
+      (toolResult) => toolResult.toolCallId === event.toolCallId,
+    );
+    if (pending) {
+      if (
+        pending.toolName === event.name &&
+        pending.content === event.result.content &&
+        pending.isError === event.result.isError
+      ) {
+        return false;
+      }
+      pending.toolName = event.name;
+      pending.content = event.result.content;
+      pending.isError = event.result.isError;
+      return true;
+    }
+
+    streamingState.pendingToolResults.push({
+      toolCallId: event.toolCallId,
+      toolName: event.name,
+      content: event.result.content,
+      isError: event.result.isError,
+    });
+    return true;
+  };
+
+  const removePendingToolResult = (toolCallId: string): boolean => {
+    const nextPendingToolResults = streamingState.pendingToolResults.filter(
+      (toolResult) => toolResult.toolCallId !== toolCallId,
+    );
+    if (
+      nextPendingToolResults.length === streamingState.pendingToolResults.length
+    ) {
+      return false;
+    }
+    streamingState.pendingToolResults = nextPendingToolResults;
+    return true;
+  };
+
+  const isStreamingContentEvent = (
+    event: AgentEvent,
+  ): event is Extract<
+    AgentEvent,
+    {
+      type:
+        | "text_delta"
+        | "thinking_delta"
+        | "toolcall_start"
+        | "toolcall_delta"
+        | "toolcall_end";
+    }
+  > => {
+    return (
+      event.type === "text_delta" ||
+      event.type === "thinking_delta" ||
+      event.type === "toolcall_start" ||
+      event.type === "toolcall_delta" ||
+      event.type === "toolcall_end"
+    );
+  };
+
+  const isPendingToolProgressEvent = (
+    event: AgentEvent,
+  ): event is Extract<AgentEvent, { type: "tool_delta" | "tool_end" }> => {
+    return event.type === "tool_delta" || event.type === "tool_end";
+  };
+
+  const handleCommittedAgentEvent = (
+    event: Exclude<
+      AgentEvent,
+      | Extract<
+          AgentEvent,
+          {
+            type:
+              | "text_delta"
+              | "thinking_delta"
+              | "toolcall_start"
+              | "toolcall_delta"
+              | "toolcall_end";
+          }
+        >
+      | Extract<AgentEvent, { type: "tool_delta" | "tool_end" }>
+    >,
+  ): void => {
+    switch (event.type) {
+      case "user_message":
+        runtime.scrollConversationToBottom();
+        runtime.requestRender("normal");
+        return;
+      case "assistant_message":
+        if (clearStreamingContent()) {
+          runtime.requestRender("normal");
+        }
+        return;
+      case "tool_result":
+        if (removePendingToolResult(event.message.toolCallId)) {
+          runtime.requestRender("normal");
+        }
+        return;
+      case "done":
+      case "error":
+      case "aborted":
+        if (resetStreamingState()) {
+          runtime.requestRender("normal");
+        }
+        return;
+      case "tool_start":
+        return;
+    }
+  };
+
+  const handleAgentEvent = (event: AgentEvent, _state: AppState): void => {
+    if (isStreamingContentEvent(event)) {
+      if (setStreamingContent(event.content)) {
+        runtime.requestRender("stream");
+      }
+      return;
+    }
+
+    if (isPendingToolProgressEvent(event)) {
+      if (upsertPendingToolResult(event)) {
+        runtime.requestRender("stream");
+      }
+      return;
+    }
+
+    handleCommittedAgentEvent(event);
+  };
+
   const submitMessageAsync = (rawInput: string, state: AppState): void => {
     const resolved = resolveRawInput(rawInput, state);
 
@@ -120,20 +269,19 @@ export function createUiAgentController(
     submitPromise = submitResolvedInput(rawInput, resolved.content, state, {
       onUserMessage: () => {
         runtime.scrollConversationToBottom();
-        runtime.render();
+        runtime.requestRender("normal");
       },
       onTurnStart: () => {
-        isStreaming = true;
-        streamingContent = [];
-        pendingToolResults = [];
+        resetStreamingState();
+        streamingState.isStreaming = true;
         runtime.startDividerAnimation();
-        runtime.render();
+        runtime.requestRender("normal");
       },
       onEvent: (event, currentState) => handleAgentEvent(event, currentState),
       onTurnEnd: () => {
-        resetUiAgentState();
+        resetStreamingState();
         runtime.stopDividerAnimation();
-        runtime.render();
+        runtime.requestRender("normal");
       },
     })
       .then(() => undefined)
@@ -152,70 +300,11 @@ export function createUiAgentController(
     state.activeTurnPromise = submitPromise;
   };
 
-  const handleAgentEvent = (event: AgentEvent, _state: AppState): void => {
-    switch (event.type) {
-      case "text_delta":
-      case "thinking_delta":
-      case "toolcall_start":
-      case "toolcall_delta":
-      case "toolcall_end":
-        streamingContent = event.content;
-        runtime.render();
-        break;
-
-      case "user_message":
-        runtime.scrollConversationToBottom();
-        runtime.render();
-        break;
-
-      case "assistant_message":
-        streamingContent = [];
-        runtime.render();
-        break;
-
-      case "tool_start":
-        break;
-
-      case "tool_delta":
-      case "tool_end": {
-        const pending = pendingToolResults.find(
-          (toolResult) => toolResult.toolCallId === event.toolCallId,
-        );
-        if (pending) {
-          pending.toolName = event.name;
-          pending.content = event.result.content;
-          pending.isError = event.result.isError;
-        } else {
-          pendingToolResults.push({
-            toolCallId: event.toolCallId,
-            toolName: event.name,
-            content: event.result.content,
-            isError: event.result.isError,
-          });
-        }
-        runtime.render();
-        break;
-      }
-
-      case "tool_result":
-        pendingToolResults = pendingToolResults.filter(
-          (toolResult) => toolResult.toolCallId !== event.message.toolCallId,
-        );
-        runtime.render();
-        break;
-
-      case "done":
-      case "error":
-      case "aborted":
-        resetUiAgentState();
-        runtime.render();
-        break;
-    }
-  };
-
-  const handleInput = (raw: string, state: AppState): void => {
-    submitMessageAsync(raw, state);
+  return {
+    handleInput: (raw, state) => {
+      submitMessageAsync(raw, state);
+    },
+    getStreamingConversationState: () => streamingState,
+    reset: resetStreamingState,
   };
-
-  return { handleInput };
 }

package/src/ui/commands.test.ts

@@ -90,6 +90,7 @@ describe("ui/commands", () => {
     const state = createTestState();
     const runtimeState = { overlay: null as ActiveOverlay | null };
     let scrollCalls = 0;
+    let renderCalls = 0;
     const controller = createCommandController({
       openOverlay: (nextOverlay) => {
         runtimeState.overlay = nextOverlay;
@@ -103,7 +104,9 @@ describe("ui/commands", () => {
       scrollConversationToBottom: () => {
         scrollCalls += 1;
       },
-      render: () => {},
+      requestRender: () => {
+        renderCalls += 1;
+      },
       reloadPromptContext: async () => {},
       openInBrowser: () => {},
     });
@@ -153,13 +156,12 @@ describe("ui/commands", () => {
       expect(controller.handleCommand("session", state)).toBe(true);
 
       const overlay = expectOverlay(runtimeState.overlay);
-      expect(overlay.title).toBe("Resume a session");
-
       const selectNode = renderSelect(overlay);
       selectNode.props.onKeyPress?.("enter");
 
       expect(runtimeState.overlay).toBeNull();
       expect(scrollCalls).toBe(1);
+      expect(renderCalls).toBe(1);
       expect(state.session?.id).toBe(session.id);
       expect(state.messages.map((message) => message.role)).toEqual([
         "user",
@@ -187,7 +189,7 @@ describe("ui/commands", () => {
       appendInfoMessage: () => {},
       appendTodoMessage: () => {},
       scrollConversationToBottom: () => {},
-      render: () => {},
+      requestRender: () => {},
       reloadPromptContext: async (nextState) => {
         reloadCount++;
         nextState.agentsMd = [
@@ -243,7 +245,7 @@ describe("ui/commands", () => {
       appendInfoMessage: () => {},
       appendTodoMessage: () => {},
       scrollConversationToBottom: () => {},
-      render: () => {},
+      requestRender: () => {},
       reloadPromptContext: async () => {},
       openInBrowser: () => {},
     });
@@ -269,7 +271,7 @@ describe("ui/commands", () => {
       appendInfoMessage: () => {},
       appendTodoMessage: () => {},
       scrollConversationToBottom: () => {},
-      render: () => {},
+      requestRender: () => {},
       reloadPromptContext: async () => {},
       openInBrowser: () => {},
     });
@@ -284,7 +286,7 @@ describe("ui/commands", () => {
     }
   });
 
-  test("/help appends markdown help without creating a session", () => {
+  test("/help appends a markdown info message without creating a session", () => {
     const state = createTestState();
     const appended: Array<{
       text: string;
@@ -304,7 +306,7 @@ describe("ui/commands", () => {
       },
       appendTodoMessage: () => {},
       scrollConversationToBottom: () => {},
-      render: () => {},
+      requestRender: () => {},
       reloadPromptContext: async () => {},
       openInBrowser: () => {},
     });
@@ -312,8 +314,7 @@ describe("ui/commands", () => {
     try {
       expect(controller.handleCommand("help", state)).toBe(true);
       expect(appended).toHaveLength(1);
-      expect(appended[0]?.text).toContain("# Help");
-      expect(appended[0]?.text).toContain("## Commands");
+      expect(appended[0]?.text.length).toBeGreaterThan(0);
       expect(appended[0]?.format).toBe("markdown");
       expect(appended[0]?.sessionId).toBeNull();
       expect(state.session).toBeNull();
@@ -360,7 +361,7 @@ describe("ui/commands", () => {
         });
       },
       scrollConversationToBottom: () => {},
-      render: () => {},
+      requestRender: () => {},
       reloadPromptContext: async () => {},
       openInBrowser: () => {},
     });
@@ -393,7 +394,7 @@ describe("ui/commands", () => {
       appendInfoMessage: () => {},
       appendTodoMessage: () => {},
       scrollConversationToBottom: () => {},
-      render: () => {},
+      requestRender: () => {},
       reloadPromptContext: async () => {},
       openInBrowser: () => {},
     });
@@ -421,7 +422,7 @@ describe("ui/commands", () => {
       appendInfoMessage: () => {},
       appendTodoMessage: () => {},
       scrollConversationToBottom: () => {},
-      render: () => {},
+      requestRender: () => {},
       reloadPromptContext: async () => {},
       openInBrowser: () => {},
     });

package/src/ui/commands.ts

@@ -19,20 +19,22 @@ import type { AppState } from "../index.ts";
 import { getAvailableModels, saveOAuthCredentials } from "../index.ts";
 import { COMMANDS } from "../input.ts";
 import {
-  computeContextTokens,
-  computeStats,
+  clearConversationState,
   forkSession,
   listPromptHistory,
   listSessions,
   loadMessages,
+  replaceConversationState,
   type SessionListEntry,
   type UiInfoFormat,
   undoLastTurn,
 } from "../session.ts";
 import { updateSettings } from "../settings.ts";
+import { collapseWhitespace, truncateText } from "../text.ts";
 import { getTodoItems } from "../tools.ts";
 import { buildHelpText, COMMAND_DESCRIPTIONS } 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 +47,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,8 +66,8 @@ 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. */
@@ -142,7 +144,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 +152,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 +165,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 +190,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,
   );
@@ -397,13 +380,12 @@ export function createCommandController(
           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");
       },
     );
   };
@@ -413,12 +395,10 @@ export function createCommandController(
       return;
     }
     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,9 +407,7 @@ 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);
   };
 
@@ -447,11 +425,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 +436,6 @@ export function createCommandController(
     state.settings = updateSettings(state.settingsPath, {
       showReasoning: state.showReasoning,
     });
-    runtime.render();
   };
 
   const handleVerboseCommand = (state: AppState): void => {
@@ -468,7 +443,6 @@ export function createCommandController(
     state.settings = updateSettings(state.settingsPath, {
       verbose: state.verbose,
     });
-    runtime.render();
   };
 
   const performLogin = async (