mini-coder 0.5.0 → 0.5.2

package/src/settings.ts

@@ -10,6 +10,17 @@
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { dirname } from "node:path";
 import type { ThinkingLevel } from "@mariozechner/pi-ai";
+import { getErrorMessage } from "./errors.ts";
+
+/** A user-configured OpenAI-compatible provider endpoint. */
+export interface CustomProvider {
+  /** Provider identifier, e.g. "ollama". Shown as the provider prefix in model names. */
+  name: string;
+  /** OpenAI-compatible API base URL, e.g. "http://localhost:11434/v1". */
+  baseUrl: string;
+  /** Optional API key. Defaults to "no-key" at discovery time. */
+  apiKey?: string;
+}
 
 /** Default reasoning effort when no saved setting exists. */
 const DEFAULT_EFFORT: ThinkingLevel = "medium";
@@ -30,6 +41,8 @@ export interface UserSettings {
   showReasoning?: boolean;
   /** Whether full tool output is shown in the UI. */
   verbose?: boolean;
+  /** Custom OpenAI-compatible provider endpoints. */
+  customProviders?: CustomProvider[];
 }
 
 /** Resolved startup settings after applying defaults and availability checks. */
@@ -54,7 +67,8 @@ const THINKING_LEVELS = new Set<ThinkingLevel>([
 /**
  * Load and validate user settings from disk.
  *
- * Invalid or missing files are treated as empty settings.
+ * Missing files are treated as empty settings. Invalid JSON or unreadable files
+ * fail with a descriptive error instead of silently discarding saved state.
  *
  * @param path - Absolute path to `settings.json`.
  * @returns The validated settings object.
@@ -67,8 +81,10 @@ export function loadSettings(path: string): UserSettings {
   try {
     const raw = JSON.parse(readFileSync(path, "utf-8")) as unknown;
     return sanitizeSettings(raw);
-  } catch {
-    return {};
+  } catch (error) {
+    throw new Error(
+      `Failed to read settings ${path}: ${getErrorMessage(error)}`,
+    );
   }
 }
 
@@ -168,9 +184,62 @@ function sanitizeSettings(value: unknown): UserSettings {
     settings.verbose = candidate.verbose;
   }
 
+  const customProviders = sanitizeCustomProviders(candidate.customProviders);
+  if (customProviders) {
+    settings.customProviders = customProviders;
+  }
+
   return settings;
 }
 
+/** Try to parse a single custom provider entry, returning null on failure. */
+function parseCustomProvider(item: unknown): CustomProvider | null {
+  if (item == null || typeof item !== "object" || Array.isArray(item)) {
+    return null;
+  }
+
+  const candidate = item as Record<string, unknown>;
+  const name = typeof candidate.name === "string" ? candidate.name.trim() : "";
+  const baseUrl =
+    typeof candidate.baseUrl === "string" ? candidate.baseUrl.trim() : "";
+
+  if (!name || !baseUrl) {
+    return null;
+  }
+
+  const entry: CustomProvider = { name, baseUrl };
+  if (typeof candidate.apiKey === "string") {
+    entry.apiKey = candidate.apiKey;
+  }
+  return entry;
+}
+
+/**
+ * Validate and normalize custom provider entries.
+ *
+ * Drops entries with missing/empty name or baseUrl, and deduplicates by name
+ * (first entry wins).
+ */
+function sanitizeCustomProviders(value: unknown): CustomProvider[] | undefined {
+  if (!Array.isArray(value)) {
+    return undefined;
+  }
+
+  const result: CustomProvider[] = [];
+  const seen = new Set<string>();
+
+  for (const item of value) {
+    const entry = parseCustomProvider(item);
+    if (!entry || seen.has(entry.name)) {
+      continue;
+    }
+    seen.add(entry.name);
+    result.push(entry);
+  }
+
+  return result.length > 0 ? result : undefined;
+}
+
 /**
  * Check whether a value is a valid thinking level.
  *

package/src/skills.ts

@@ -183,13 +183,17 @@ function readSkill(basePath: string, entry: string): Skill | null {
     return null;
   }
 
-  const content = readFileSync(skillPath, "utf-8");
-  const frontmatter = parseFrontmatter(content);
-  return {
-    name: frontmatter.name ?? entry,
-    description: frontmatter.description ?? "",
-    path: skillPath,
-  };
+  try {
+    const content = readFileSync(skillPath, "utf-8");
+    const frontmatter = parseFrontmatter(content);
+    return {
+      name: frontmatter.name ?? entry,
+      description: frontmatter.description ?? "",
+      path: skillPath,
+    };
+  } catch {
+    return null;
+  }
 }
 
 /**

package/src/submit.ts

@@ -8,6 +8,7 @@ import { readFileSync } from "node:fs";
 import type { UserMessage } from "@mariozechner/pi-ai";
 import type { AgentEvent } from "./agent.ts";
 import { runAgentLoop } from "./agent.ts";
+import { getErrorMessage } from "./errors.ts";
 import { getGitState } from "./git.ts";
 import {
   type AppState,
@@ -103,10 +104,6 @@ export function isEmptyUserContent(content: UserMessage["content"]): boolean {
   );
 }
 
-function getErrorMessage(error: unknown): string {
-  return error instanceof Error ? error.message : String(error);
-}
-
 function buildSkillMessageContent(
   skillName: string,
   userText: string,
@@ -276,12 +273,13 @@ export async function submitResolvedInput(
     content,
     timestamp: Date.now(),
   } satisfies UserMessage;
+  const loadGitState = state.loadGitState ?? getGitState;
 
   const turn = appendMessage(state.db, session.id, userMessage);
   state.messages.push(userMessage);
   hooks?.onUserMessage?.(state);
 
-  state.git = await getGitState(state.cwd);
+  state.git = await loadGitState(state.cwd);
 
   const systemPrompt = buildPrompt(state);
   const { tools, toolHandlers } = buildToolList(state);
@@ -313,7 +311,7 @@ export async function submitResolvedInput(
       },
     });
     stopReason = result.stopReason;
-    state.git = await getGitState(state.cwd);
+    state.git = await loadGitState(state.cwd);
     return result.stopReason;
   } finally {
     state.running = false;

package/src/tools.ts

@@ -532,7 +532,8 @@ export const editTool: Tool = {
     "Make an exact-text replacement in a single file. " +
     "Provide the file path, the exact text to find, and the replacement text. " +
     "The old text must match exactly one location in the file. " +
-    "To create a new file, use an empty old text and the full file content as new text.",
+    "To create a new file, use an empty old text and the full file content as new text. " +
+    "Use this to write the exact final file content the task requires.",
   parameters: Type.Object({
     path: Type.String({
       description: "File path (absolute or relative to cwd)",
@@ -552,7 +553,7 @@ export const shellTool: Tool = {
   name: "shell",
   description:
     "Run a command in the user's shell. Returns stdout, stderr, and exit code. " +
-    "Use for exploring the codebase (rg, find, ls, cat), running tests, builds, git, etc.",
+    "Use this to explore the codebase, read tests/verifiers/examples, inspect required outputs, and run targeted checks, builds, or git commands.",
   parameters: Type.Object({
     command: Type.String({ description: "The shell command to execute" }),
   }),

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));
 }
 
@@ -524,6 +530,164 @@ describe("ui/conversation", () => {
     expect(text).not.toContain('"command": "echo hi"');
   });
 
+  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", () => {
     // Arrange
     const command = Array.from(
@@ -564,7 +728,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 () => {