mini-coder 0.5.1 → 0.5.3

package/src/ui/agent.ts

@@ -11,6 +11,7 @@
 
 import type { AssistantMessage } from "@mariozechner/pi-ai";
 import type { AgentEvent } from "../agent.ts";
+import { getErrorMessage } from "../errors.ts";
 import type { AppState } from "../index.ts";
 import { resolveRawInput, submitResolvedInput } from "../submit.ts";
 import type {
@@ -75,10 +76,6 @@ export function getStreamingConversationState(): StreamingConversationState {
   };
 }
 
-function getErrorMessage(error: unknown): string {
-  return error instanceof Error ? error.message : String(error);
-}
-
 /**
  * Create the UI agent controller bound to runtime hooks supplied by `ui.ts`.
  *

package/src/ui/commands.test.ts

@@ -91,6 +91,9 @@ function createTestState(): AppState {
     activeTurnPromise: null,
     showReasoning: true,
     verbose: false,
+    versionLabel: "dev",
+    customModels: [],
+    startupWarnings: [],
   };
 }
 

package/src/ui/commands.ts

@@ -14,6 +14,7 @@ import { Select } from "@cel-tui/components";
 import type { Model, ThinkingLevel } from "@mariozechner/pi-ai";
 import type { OAuthProviderInterface } from "@mariozechner/pi-ai/oauth";
 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";
@@ -39,10 +40,6 @@ const EFFORT_LEVELS: { label: string; value: ThinkingLevel }[] = [
   { label: "xhigh", value: "xhigh" },
 ];
 
-function getErrorMessage(error: unknown): string {
-  return error instanceof Error ? error.message : String(error);
-}
-
 /** Runtime hooks injected from the stateful UI module. */
 interface UiCommandRuntime {
   /** Open an overlay and trigger a re-render. */

package/src/ui/conversation.test.ts

@@ -40,6 +40,12 @@ function collectText(node: Node | null): string[] {
   if (node.type === "textinput") {
     return [];
   }
+  if (
+    node.type === "hstack" &&
+    node.children.every((child) => child.type === "text")
+  ) {
+    return [node.children.map((child) => child.content).join("")];
+  }
   return node.children.flatMap((child) => collectText(child));
 }
 
@@ -244,9 +250,9 @@ describe("ui/conversation", () => {
 
     // Assert
     expect(text).toContain("Working...");
-    expect(text.filter((line) => line === "[shell ->]")).toHaveLength(1);
+    expect(text.filter((line) => line === "shell ->")).toHaveLength(1);
     expect(text).toContain("echo hi");
-    expect(text).toContain("[shell <-]");
+    expect(text).toContain("shell <-");
     expect(text).toContain("partial output");
     expect(text).not.toContain("Exit code: 0");
   });
@@ -295,7 +301,7 @@ describe("ui/conversation", () => {
     });
 
     // Assert
-    expect(text).toContain("[edit <-]");
+    expect(text).toContain("edit <-");
     expect(text).toContain("~ src/app.ts");
     expect(text).not.toContain("before");
     expect(text).not.toContain("after");
@@ -507,7 +513,7 @@ describe("ui/conversation", () => {
     expect(text).toContain("Thinking... 1 line.");
   });
 
-  test("renderAssistantMessage for a shell tool call shows the command under the new header pill", () => {
+  test("renderAssistantMessage for a shell tool call renders an unbracketed header inside the pill", () => {
     // Arrange
     const assistant = {
       content: [
@@ -516,12 +522,205 @@ describe("ui/conversation", () => {
     };
 
     // Act
-    const text = collectText(renderAssistantMessage(assistant, RENDER_OPTS));
+    const node = renderAssistantMessage(assistant, RENDER_OPTS);
+    const text = collectText(node);
 
     // Assert
-    expect(text).toContain("[shell ->]");
+    expect(text).toContain("shell ->");
+    expect(text).not.toContain("[shell ->]");
     expect(text).toContain("echo hi");
     expect(text).not.toContain('"command": "echo hi"');
+
+    expect(node?.type).toBe("vstack");
+    if (!node || node.type !== "vstack") {
+      throw new Error("Expected the assistant node to be a vstack");
+    }
+
+    const toolBlock = node.children[0];
+    expect(toolBlock?.type).toBe("hstack");
+    if (!toolBlock || toolBlock.type !== "hstack") {
+      throw new Error("Expected the tool block to be an hstack");
+    }
+
+    const contentColumn = toolBlock.children[1];
+    expect(contentColumn?.type).toBe("vstack");
+    if (!contentColumn || contentColumn.type !== "vstack") {
+      throw new Error("Expected the tool content column to be a vstack");
+    }
+
+    const headerRow = contentColumn.children[0];
+    expect(headerRow?.type).toBe("hstack");
+    if (!headerRow || headerRow.type !== "hstack") {
+      throw new Error("Expected the tool header row to be an hstack");
+    }
+
+    const headerPill = headerRow.children[0];
+    expect(headerPill?.type).toBe("hstack");
+    if (!headerPill || headerPill.type !== "hstack") {
+      throw new Error("Expected the tool header pill to be an hstack");
+    }
+
+    expect(headerPill.props.bgColor).toBe(DEFAULT_THEME.toolBorder);
+    expect(headerPill.props.padding).toEqual({ x: 1 });
+    expect(collectText(headerPill)).toEqual(["shell ->"]);
+  });
+
+  test("renderAssistantMessage for a shell tool call syntax-highlights bash tokens", async () => {
+    // Arrange
+    const assistant = {
+      content: [
+        fauxToolCall(
+          "shell",
+          { command: 'if true; then echo "$HOME"; fi' },
+          { id: "tool-1" },
+        ),
+      ],
+    };
+
+    // Act
+    const rows = await renderBufferRows(
+      renderAssistantMessage(assistant, RENDER_OPTS),
+      48,
+      12,
+    );
+    const commandRow = rows.find((row) =>
+      row.text.includes('if true; then echo "$HOME"; fi'),
+    );
+
+    // Assert
+    expect(commandRow).toBeDefined();
+    expect(commandRow?.fgColors[commandRow.text.indexOf("if")]).toBe(
+      DEFAULT_THEME.secondaryAccentText ?? null,
+    );
+    expect(commandRow?.fgColors[commandRow.text.indexOf("echo")]).toBe(
+      DEFAULT_THEME.accentText ?? null,
+    );
+    expect(commandRow?.fgColors[commandRow.text.indexOf('"$HOME"')]).toBe(
+      DEFAULT_THEME.diffAdded ?? null,
+    );
+  });
+
+  test("renderAssistantMessage for a multiline shell tool call preserves syntax state across lines", async () => {
+    // Arrange
+    const assistant = {
+      content: [
+        fauxToolCall(
+          "shell",
+          { command: "printf 'foo\nbar'" },
+          { id: "tool-1" },
+        ),
+      ],
+    };
+
+    // Act
+    const rows = await renderBufferRows(
+      renderAssistantMessage(assistant, {
+        ...RENDER_OPTS,
+        verbose: true,
+      }),
+      32,
+      12,
+    );
+    const firstRow = rows.find((row) => row.text.includes("printf 'foo"));
+    const secondRow = rows.find((row) => row.text.includes("bar'"));
+
+    // Assert
+    expect(firstRow).toBeDefined();
+    expect(secondRow).toBeDefined();
+    expect(firstRow?.fgColors[firstRow.text.indexOf("foo")]).toBe(
+      DEFAULT_THEME.diffAdded ?? null,
+    );
+    expect(secondRow?.fgColors[secondRow.text.indexOf("bar")]).toBe(
+      DEFAULT_THEME.diffAdded ?? null,
+    );
+  });
+
+  test("renderAssistantMessage for a shell tool call uses theme-derived syntax colors", async () => {
+    // Arrange
+    const theme = {
+      ...DEFAULT_THEME,
+      accentText: "color14",
+      secondaryAccentText: "color09",
+      diffAdded: "color10",
+      mutedText: "color13",
+      toolText: "color15",
+    } satisfies typeof DEFAULT_THEME;
+    const assistant = {
+      content: [
+        fauxToolCall(
+          "shell",
+          { command: 'if true; then echo "$HOME"; fi' },
+          { id: "tool-1" },
+        ),
+      ],
+    };
+
+    // Act
+    const rows = await renderBufferRows(
+      renderAssistantMessage(assistant, {
+        ...RENDER_OPTS,
+        theme,
+      }),
+      48,
+      12,
+    );
+    const commandRow = rows.find((row) =>
+      row.text.includes('if true; then echo "$HOME"; fi'),
+    );
+
+    // Assert
+    expect(commandRow).toBeDefined();
+    expect(commandRow?.fgColors[commandRow.text.indexOf("if")]).toBe(
+      theme.secondaryAccentText ?? null,
+    );
+    expect(commandRow?.fgColors[commandRow.text.indexOf("echo")]).toBe(
+      theme.accentText ?? null,
+    );
+    expect(commandRow?.fgColors[commandRow.text.indexOf('"$HOME"')]).toBe(
+      theme.diffAdded ?? null,
+    );
+  });
+
+  test("renderAssistantMessage for a long single-token shell argument wraps through the tail in verbose mode", async () => {
+    // Arrange
+    const command = `printf ${"x".repeat(60)}TAIL`;
+    const assistant = {
+      content: [fauxToolCall("shell", { command }, { id: "tool-1" })],
+    };
+
+    // Act
+    const text = await renderVisibleText(
+      renderAssistantMessage(assistant, {
+        ...RENDER_OPTS,
+        verbose: true,
+        previewWidth: 24,
+      }),
+      24,
+      20,
+    );
+
+    // Assert
+    expect(text.some((line) => line.includes("TAIL"))).toBe(true);
+  });
+
+  test("renderAssistantMessage for a long single-token shell command uses wrapped preview height when verbose is off", () => {
+    // Arrange
+    const command = `printf ${"x".repeat(220)}TAIL`;
+    const assistant = {
+      content: [fauxToolCall("shell", { command }, { id: "tool-1" })],
+    };
+
+    // Act
+    const height = measureRenderedHeight(
+      renderAssistantMessage(assistant, {
+        ...RENDER_OPTS,
+        previewWidth: 24,
+      }),
+      24,
+    );
+
+    // Assert
+    expect(height).toBe(9);
   });
 
   test("renderAssistantMessage for a wrapped shell command keeps a fixed preview height when verbose is off", () => {
@@ -564,7 +763,7 @@ describe("ui/conversation", () => {
     );
 
     // Assert
-    expect(text).toContain("IMPORTANT_PREFIX");
+    expect(text.some((line) => line.includes("IMPORTANT_PREFIX"))).toBe(true);
   });
 
   test("renderToolResult for a shell preview allows the outer conversation scroll to handle mouse wheel events", async () => {
@@ -631,7 +830,7 @@ describe("ui/conversation", () => {
     const text = collectText(renderAssistantMessage(assistant, RENDER_OPTS));
 
     // Assert
-    expect(text).toContain("[read image ->]");
+    expect(text).toContain("read image ->");
     expect(text).toContain("assets/preview.png");
     expect(text).not.toContain("{");
   });
@@ -656,7 +855,7 @@ describe("ui/conversation", () => {
     const text = collectText(renderAssistantMessage(assistant, RENDER_OPTS));
 
     // Assert
-    expect(text).toContain("[edit ->]");
+    expect(text).toContain("edit ->");
     expect(text).toContain("src/file.ts");
     expect(text).toContain("old line");
     expect(text).toContain("new line");
@@ -719,7 +918,7 @@ describe("ui/conversation", () => {
     );
 
     // Assert
-    expect(text).toContain("[shell <-]");
+    expect(text).toContain("shell <-");
     expect(text).toContain("line 18");
     expect(text).toContain("line 25");
     expect(text).toContain("And 17 lines more");
@@ -763,7 +962,7 @@ describe("ui/conversation", () => {
     );
 
     // Assert
-    expect(text).toContain("[shell <-]");
+    expect(text).toContain("shell <-");
     expect(text).toContain("exit 42");
     expect(text).toContain("boom");
     expect(text).not.toContain("Exit code: 42");
@@ -780,7 +979,7 @@ describe("ui/conversation", () => {
     );
 
     // Assert
-    expect(text).toContain("[read image <-]");
+    expect(text).toContain("read image <-");
     expect(text).toContain("diagram.png");
     expect(text).not.toContain("Read image.");
   });
@@ -829,7 +1028,7 @@ describe("ui/conversation", () => {
     );
 
     // Assert
-    expect(previewText).toContain("[edit <-]");
+    expect(previewText).toContain("edit <-");
     expect(previewText).toContain("~ src/file.ts");
     expect(previewText).not.toContain("before");
     expect(previewText).not.toContain("after");
@@ -862,7 +1061,7 @@ describe("ui/conversation", () => {
     );
 
     // Assert
-    expect(text).toContain("[edit <-]");
+    expect(text).toContain("edit <-");
     expect(text).toContain("error 18");
     expect(text).toContain("error 25");
     expect(text).toContain("And 17 lines more");
@@ -885,7 +1084,7 @@ describe("ui/conversation", () => {
     );
 
     // Assert
-    expect(text).toContain("[mcp/search <-]");
+    expect(text).toContain("mcp/search <-");
     expect(text).toContain("session persistence sqlite turn numbering");
     expect(text).not.toContain('"query"');
   });