mini-coder 0.5.0 → 0.5.2

package/src/index.ts

@@ -10,7 +10,7 @@
 
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
-import { join } from "node:path";
+import { dirname, join } from "node:path";
 import { isDeepStrictEqual } from "node:util";
 import type {
   KnownProvider,
@@ -28,6 +28,7 @@ import {
   resolveHeadlessPrompt,
   shouldUseHeadlessMode,
 } from "./cli.ts";
+import { getErrorMessage } from "./errors.ts";
 import { type GitState, getGitState } from "./git.ts";
 import { canonicalizePath } from "./paths.ts";
 import {
@@ -56,6 +57,7 @@ import {
   truncateSessions,
 } from "./session.ts";
 import {
+  type CustomProvider,
   loadSettings,
   resolveStartupSettings,
   type UserSettings,
@@ -70,6 +72,7 @@ import {
   readImageTool,
   shellTool,
 } from "./tools.ts";
+import { resolveAppVersionLabel } from "./version.ts";
 
 // ---------------------------------------------------------------------------
 // Constants
@@ -103,19 +106,36 @@ export const MAX_PROMPT_HISTORY = 1_000;
 // ---------------------------------------------------------------------------
 
 /** Load saved OAuth credentials from disk. */
-function loadOAuthCredentials(): Record<string, OAuthCredentials> {
-  if (!existsSync(AUTH_PATH)) return {};
+function loadOAuthCredentials(
+  path = AUTH_PATH,
+): Record<string, OAuthCredentials> {
+  if (!existsSync(path)) return {};
+
+  let parsed: unknown;
   try {
-    return JSON.parse(readFileSync(AUTH_PATH, "utf-8"));
-  } catch {
-    return {};
+    parsed = JSON.parse(readFileSync(path, "utf-8")) as unknown;
+  } catch (error) {
+    throw new Error(
+      `Failed to read OAuth credentials ${path}: ${getErrorMessage(error)}`,
+    );
+  }
+
+  if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
+    throw new Error(
+      `Failed to read OAuth credentials ${path}: expected a JSON object`,
+    );
   }
+
+  return parsed as Record<string, OAuthCredentials>;
 }
 
 /** Save OAuth credentials to disk. */
-function saveOAuthCredentials(creds: Record<string, OAuthCredentials>): void {
-  mkdirSync(DATA_DIR, { recursive: true });
-  writeFileSync(AUTH_PATH, JSON.stringify(creds, null, 2), "utf-8");
+function saveOAuthCredentials(
+  creds: Record<string, OAuthCredentials>,
+  path = AUTH_PATH,
+): void {
+  mkdirSync(dirname(path), { recursive: true });
+  writeFileSync(path, JSON.stringify(creds, null, 2), "utf-8");
 }
 
 /** Return whether refreshed OAuth credentials differ from the persisted value. */
@@ -190,6 +210,101 @@ async function discoverProviders(): Promise<DiscoveryResult> {
   return { providers, oauthCredentials };
 }
 
+// ---------------------------------------------------------------------------
+// Custom provider discovery
+// ---------------------------------------------------------------------------
+
+/** Timeout for custom provider model discovery requests. */
+const CUSTOM_PROVIDER_TIMEOUT_MS = 3_000;
+
+/** Default API key for custom providers that don't require authentication. */
+const CUSTOM_PROVIDER_DEFAULT_KEY = "no-key";
+
+/** Result of custom provider discovery. */
+interface CustomDiscoveryResult {
+  /** Discovered models from all reachable custom providers. */
+  models: Model<"openai-completions">[];
+  /** Provider name → API key for discovered providers. */
+  providers: Map<string, string>;
+  /** Warning messages for unreachable or invalid providers. */
+  warnings: string[];
+}
+
+/**
+ * Discover models from user-configured OpenAI-compatible endpoints.
+ *
+ * Queries each provider's `/models` endpoint and constructs pi-ai Model
+ * objects from the response. Unreachable endpoints produce a warning
+ * instead of failing startup.
+ *
+ * @param customProviders - Configured custom provider entries.
+ * @param builtInProviderNames - Names of built-in providers (to detect collisions).
+ * @returns Discovered models, provider credentials, and warnings.
+ */
+export async function discoverCustomProviders(
+  customProviders: readonly CustomProvider[],
+  builtInProviderNames: ReadonlySet<string>,
+): Promise<CustomDiscoveryResult> {
+  const models: Model<"openai-completions">[] = [];
+  const providers = new Map<string, string>();
+  const warnings: string[] = [];
+
+  for (const entry of customProviders) {
+    if (builtInProviderNames.has(entry.name)) {
+      warnings.push(
+        `Custom provider "${entry.name}" skipped: name conflicts with a built-in provider.`,
+      );
+      continue;
+    }
+
+    const apiKey = entry.apiKey ?? CUSTOM_PROVIDER_DEFAULT_KEY;
+    const modelsUrl = `${entry.baseUrl}/models`;
+
+    try {
+      const response = await fetch(modelsUrl, {
+        signal: AbortSignal.timeout(CUSTOM_PROVIDER_TIMEOUT_MS),
+      });
+
+      if (!response.ok) {
+        warnings.push(
+          `Custom provider "${entry.name}": ${response.status} ${response.statusText} (${modelsUrl})`,
+        );
+        continue;
+      }
+
+      const body = (await response.json()) as {
+        data?: { id: string }[];
+      };
+      const modelList = body.data ?? [];
+
+      for (const item of modelList) {
+        if (typeof item.id !== "string" || !item.id) continue;
+
+        models.push({
+          id: item.id,
+          name: item.id,
+          api: "openai-completions",
+          provider: entry.name,
+          baseUrl: entry.baseUrl,
+          reasoning: false,
+          input: ["text"],
+          cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
+          contextWindow: 131072,
+          maxTokens: 8192,
+        });
+      }
+
+      providers.set(entry.name, apiKey);
+    } catch (error) {
+      warnings.push(
+        `Custom provider "${entry.name}": ${getErrorMessage(error)} (${modelsUrl})`,
+      );
+    }
+  }
+
+  return { models, providers, warnings };
+}
+
 // ---------------------------------------------------------------------------
 // Model selection
 // ---------------------------------------------------------------------------
@@ -419,8 +534,12 @@ export interface AppState {
   plugins: LoadedPlugin[];
   /** Active theme (default + plugin overrides). */
   theme: Theme;
+  /** Version label shown in the empty conversation banner. */
+  versionLabel: string;
   /** Current git state (null if not in a repo). */
   git: GitState | null;
+  /** Optional git state loader override used by tests. */
+  loadGitState?: (cwd: string) => Promise<GitState | null>;
   /** Available provider credentials (provider → API key). */
   providers: Map<string, string>;
   /** OAuth credentials on disk. */
@@ -443,6 +562,10 @@ export interface AppState {
   showReasoning: boolean;
   /** Whether to show full (un-truncated) tool output. */
   verbose: boolean;
+  /** Models discovered from custom OpenAI-compatible providers. */
+  customModels: Model<string>[];
+  /** Warnings from startup (e.g. unreachable custom providers). */
+  startupWarnings: string[];
 }
 
 // ---------------------------------------------------------------------------
@@ -461,7 +584,21 @@ export async function init(): Promise<AppState> {
 
   // Load user settings and resolve startup defaults
   const settings = loadSettings(SETTINGS_PATH);
-  const availableModels = listAvailableModels(providers);
+
+  // Discover custom providers from settings
+  const builtInProviderNames = new Set(providers.keys());
+  const customResult = await discoverCustomProviders(
+    settings.customProviders ?? [],
+    builtInProviderNames,
+  );
+
+  // Merge custom provider credentials
+  for (const [name, key] of customResult.providers) {
+    providers.set(name, key);
+  }
+
+  const builtInModels = listAvailableModels(providers);
+  const availableModels = [...builtInModels, ...customResult.models];
   const startup = resolveStartupSettings(
     settings,
     availableModels.map((model) => `${model.provider}/${model.id}`),
@@ -488,6 +625,7 @@ export async function init(): Promise<AppState> {
     skills: promptContext.skills,
     plugins: promptContext.plugins,
     theme: promptContext.theme,
+    versionLabel: resolveAppVersionLabel(),
     git: promptContext.git,
     providers,
     oauthCredentials,
@@ -500,6 +638,8 @@ export async function init(): Promise<AppState> {
     activeTurnPromise: null,
     showReasoning: startup.showReasoning,
     verbose: startup.verbose,
+    customModels: customResult.models,
+    startupWarnings: customResult.warnings,
   };
 }
 
@@ -572,7 +712,7 @@ export function ensureSession(
  * for, suitable for the `/model` selector.
  */
 export function getAvailableModels(state: AppState): Model<string>[] {
-  return listAvailableModels(state.providers);
+  return [...listAvailableModels(state.providers), ...state.customModels];
 }
 
 /** Clean up resources on shutdown. */

package/src/prompt.ts

@@ -99,10 +99,15 @@ function readAgentsMdFile(dir: string): AgentsMdFile | null {
   if (!existsSync(filePath)) {
     return null;
   }
-  return {
-    path: filePath,
-    content: readFileSync(filePath, "utf-8"),
-  };
+
+  try {
+    return {
+      path: filePath,
+      content: readFileSync(filePath, "utf-8"),
+    };
+  } catch {
+    return null;
+  }
 }
 
 /**
@@ -152,6 +157,7 @@ export function discoverAgentsMd(
  *
  * Fields are omitted when their values are zero. The git line format:
  * `Git: branch main | 3 staged, 1 modified, 2 untracked | +5 −2 vs origin/main`
+ * where the trailing upstream label reflects the repository's actual tracking ref.
  *
  * @param state - The git state to format.
  * @returns Formatted git status line.
@@ -171,7 +177,8 @@ export function formatGitLine(state: GitState): string {
     const ab: string[] = [];
     if (state.ahead > 0) ab.push(`+${state.ahead}`);
     if (state.behind > 0) ab.push(`\u2212${state.behind}`);
-    parts.push(`${ab.join(" ")} vs origin/${state.branch}`);
+    const upstream = state.upstream ? ` vs ${state.upstream}` : "";
+    parts.push(`${ab.join(" ")}${upstream}`);
   }
 
   return parts.join(" | ");
@@ -185,14 +192,14 @@ const BASE_INSTRUCTIONS = `You are mini-coder, a coding agent running in the use
 
 # Role
 
-You are an autonomous, senior-level coding assistant. When the user gives a direction, proactively gather context, plan with the user, implement, and verify. Bias toward action: use planning first to clear any assumptions with the user, then implement the plan. Deliver working code, unless you are genuinely blocked.
+You are an autonomous, senior-level coding assistant. When the user gives a direction, proactively gather context, plan with the user, implement, and verify. Bias toward action: plan briefly when needed to clear important assumptions, then continue into implementation. First identify the task contract: required files, names, interfaces, output format, and checks for success. Treat those details as part of correctness, not as polish. Deliver working code, unless you are genuinely blocked.
 
 # Tools
 
 You have these core tools:
 
-- \`shell\` — run commands in the user's shell. Use this to explore the codebase (rg, find, ls, cat), run tests, build, git, and any other command. Prefer \`rg\` over \`grep\` for speed.
-- \`edit\` — make exact-text replacements in files. 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.
+- \`shell\` — run commands in the user's shell. Use this to explore the codebase, read tests/verifiers/examples, inspect required outputs, and run targeted checks, builds, or git commands. Prefer \`rg\` over \`grep\` for speed.
+- \`edit\` — make exact-text replacements in files. 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. Use this to write the exact final file content the task requires.
 
 You may also have additional tools provided by plugins. Use them when they match the task.
 
@@ -201,7 +208,7 @@ Workflow: **inspect with shell → mutate with edit → verify with shell**.
 # Code quality
 
 - Conform to the codebase's existing conventions: patterns, naming, formatting, language idioms.
-- Write correct, clear, minimal code. Don't over-engineer, don't add abstractions for hypothetical futures.
+- Write correct, clear, minimal code. Prefer the simplest solution that satisfies the task's checks exactly. Don't over-engineer, don't add abstractions for hypothetical futures.
 - Reuse before creating. Search for existing helpers before writing new ones.
 - Tight error handling: no broad try/catch, no silent failures, no swallowed errors.
 - Keep type safety. Avoid \`any\` casts. Use proper types and guards.
@@ -217,6 +224,7 @@ Workflow: **inspect with shell → mutate with edit → verify with shell**.
 # Exploring the codebase
 
 - Think first: before any tool call, decide all files and information you need.
+- Early in the task, look for acceptance criteria in tests, verifier scripts, eval scripts, examples, and expected-output files. Do not rely on the task text alone when machine-checkable criteria are available.
 - Batch reads: if you need multiple files, read them together in parallel rather than one at a time.
 - Only make sequential calls when a later call genuinely depends on an earlier result.
 
@@ -231,7 +239,9 @@ Workflow: **inspect with shell → mutate with edit → verify with shell**.
 # Persistence
 
 - Carry work through to completion within the current turn. Don't stop at analysis or partial fixes.
+- Once the contract is clear, create the required artifact early, then iterate and improve it. Do not spend most of the turn exploring.
 - If you encounter an error, diagnose and fix it rather than reporting it and stopping.
+- Before concluding, run the smallest targeted verification that checks the exact contract: required files exist, names and signatures match, outputs are in the required format, and no forbidden extra artifacts were left behind.
 - Avoid excessive looping: if you're re-reading or re-editing the same files without progress, stop and ask the user.`;
 
 // ---------------------------------------------------------------------------

package/src/session.ts

@@ -10,7 +10,12 @@
  */
 
 import { Database } from "bun:sqlite";
-import type { AssistantMessage, Message } from "@mariozechner/pi-ai";
+import type {
+  AssistantMessage,
+  Message,
+  ToolResultMessage,
+  UserMessage,
+} from "@mariozechner/pi-ai";
 
 // ---------------------------------------------------------------------------
 // Types
@@ -140,6 +145,21 @@ type MaxTurnRow = { max_turn: number | null };
 /** Row shape for `SELECT data` queries. */
 type DataRow = { data: string };
 
+const EMPTY_ASSISTANT_USAGE: AssistantMessage["usage"] = {
+  input: 0,
+  output: 0,
+  cacheRead: 0,
+  cacheWrite: 0,
+  totalTokens: 0,
+  cost: {
+    input: 0,
+    output: 0,
+    cacheRead: 0,
+    cacheWrite: 0,
+    total: 0,
+  },
+};
+
 /** Row shape returned by `SELECT * FROM prompt_history`. */
 type PromptHistoryRow = {
   id: number;
@@ -319,14 +339,189 @@ function getMultipartUserPreview(
   return collapsePreviewText(text);
 }
 
+function isTextContentBlock(
+  value: unknown,
+): value is { type: "text"; text: string } {
+  const record = toRecord(value);
+  return record?.type === "text" && typeof record.text === "string";
+}
+
+function isImageContentBlock(
+  value: unknown,
+): value is { type: "image"; data: string; mimeType: string } {
+  const record = toRecord(value);
+  return (
+    record?.type === "image" &&
+    typeof record.data === "string" &&
+    typeof record.mimeType === "string"
+  );
+}
+
+function isThinkingContentBlock(
+  value: unknown,
+): value is Extract<AssistantMessage["content"][number], { type: "thinking" }> {
+  const record = toRecord(value);
+  return record?.type === "thinking" && typeof record.thinking === "string";
+}
+
+function isToolCallContentBlock(
+  value: unknown,
+): value is Extract<AssistantMessage["content"][number], { type: "toolCall" }> {
+  const record = toRecord(value);
+  return (
+    record?.type === "toolCall" &&
+    typeof record.id === "string" &&
+    typeof record.name === "string" &&
+    toRecord(record.arguments) !== null
+  );
+}
+
+function isAssistantUsage(value: unknown): value is AssistantMessage["usage"] {
+  const usageRecord = toRecord(value);
+  const costRecord = toRecord(usageRecord?.cost);
+  return (
+    usageRecord !== null &&
+    costRecord !== null &&
+    readFiniteNumber(usageRecord, "input") !== null &&
+    readFiniteNumber(usageRecord, "output") !== null &&
+    readFiniteNumber(usageRecord, "cacheRead") !== null &&
+    readFiniteNumber(usageRecord, "cacheWrite") !== null &&
+    readFiniteNumber(usageRecord, "totalTokens") !== null &&
+    readFiniteNumber(costRecord, "input") !== null &&
+    readFiniteNumber(costRecord, "output") !== null &&
+    readFiniteNumber(costRecord, "cacheRead") !== null &&
+    readFiniteNumber(costRecord, "cacheWrite") !== null &&
+    readFiniteNumber(costRecord, "total") !== null
+  );
+}
+
+function isStopReason(value: unknown): value is AssistantMessage["stopReason"] {
+  return (
+    value === "stop" ||
+    value === "length" ||
+    value === "toolUse" ||
+    value === "error" ||
+    value === "aborted"
+  );
+}
+
+function isUserMessageRecord(value: unknown): value is UserMessage {
+  const record = toRecord(value);
+  if (!record || record.role !== "user") {
+    return false;
+  }
+
+  return (
+    readFiniteNumber(record, "timestamp") !== null &&
+    (typeof record.content === "string" ||
+      (Array.isArray(record.content) &&
+        record.content.every(
+          (block) => isTextContentBlock(block) || isImageContentBlock(block),
+        )))
+  );
+}
+
+function parseAssistantMessageRecord(value: unknown): AssistantMessage | null {
+  const record = toRecord(value);
+  if (!record || record.role !== "assistant") {
+    return null;
+  }
+
+  const timestamp = readFiniteNumber(record, "timestamp");
+  if (
+    !Array.isArray(record.content) ||
+    !record.content.every(
+      (block) =>
+        isTextContentBlock(block) ||
+        isThinkingContentBlock(block) ||
+        isToolCallContentBlock(block),
+    ) ||
+    typeof record.api !== "string" ||
+    typeof record.provider !== "string" ||
+    typeof record.model !== "string" ||
+    !isStopReason(record.stopReason) ||
+    (record.errorMessage !== undefined &&
+      typeof record.errorMessage !== "string") ||
+    timestamp === null
+  ) {
+    return null;
+  }
+
+  return {
+    role: "assistant",
+    content: record.content,
+    api: record.api,
+    provider: record.provider,
+    model: record.model,
+    usage: isAssistantUsage(record.usage)
+      ? record.usage
+      : structuredClone(EMPTY_ASSISTANT_USAGE),
+    stopReason: record.stopReason,
+    ...(typeof record.errorMessage === "string"
+      ? { errorMessage: record.errorMessage }
+      : {}),
+    timestamp,
+  };
+}
+
+function isToolResultMessageRecord(value: unknown): value is ToolResultMessage {
+  const record = toRecord(value);
+  if (!record || record.role !== "toolResult") {
+    return false;
+  }
+
+  return (
+    typeof record.toolCallId === "string" &&
+    typeof record.toolName === "string" &&
+    typeof record.isError === "boolean" &&
+    Array.isArray(record.content) &&
+    record.content.every(
+      (block) => isTextContentBlock(block) || isImageContentBlock(block),
+    ) &&
+    readFiniteNumber(record, "timestamp") !== null
+  );
+}
+
+function isUiMessageRecord(value: unknown): value is UiMessage {
+  const record = toRecord(value);
+  if (!record || record.role !== "ui") {
+    return false;
+  }
+
+  return (
+    record.kind === "info" &&
+    typeof record.content === "string" &&
+    readFiniteNumber(record, "timestamp") !== null
+  );
+}
+
+function parsePersistedMessage(data: string): PersistedMessage | null {
+  let parsed: unknown;
+  try {
+    parsed = JSON.parse(data) as unknown;
+  } catch {
+    return null;
+  }
+
+  if (
+    isUserMessageRecord(parsed) ||
+    isToolResultMessageRecord(parsed) ||
+    isUiMessageRecord(parsed)
+  ) {
+    return parsed;
+  }
+
+  return parseAssistantMessageRecord(parsed);
+}
+
 /** Read the first-user preview cached by the session-list query. */
 function readFirstUserPreview(messageData: string | null): string | null {
   if (!messageData) {
     return null;
   }
 
-  const message = JSON.parse(messageData) as PersistedMessage;
-  if (message.role !== "user") {
+  const message = parsePersistedMessage(messageData);
+  if (!message || message.role !== "user") {
     return null;
   }
 
@@ -434,7 +629,7 @@ export function filterModelMessages(
 }
 
 function toRecord(value: unknown): Record<string, unknown> | null {
-  return typeof value === "object" && value !== null
+  return typeof value === "object" && value !== null && !Array.isArray(value)
     ? (value as Record<string, unknown>)
     : null;
 }
@@ -620,7 +815,8 @@ export function appendMessage(
  * Load all messages for a session in insertion order.
  *
  * Messages are deserialized from their JSON representation back into
- * persisted app messages. The ordering matches the original append order
+ * persisted app messages. Invalid rows are skipped so corrupted session data
+ * does not crash the app. The ordering matches the original append order
  * (by autoincrement `id`), preserving the conversation flow.
  *
  * @param db - Open database handle.
@@ -633,7 +829,16 @@ export function loadMessages(
   sessionId: string,
 ): PersistedMessage[] {
   const rows = db.query<DataRow, [string]>(SQL.loadMessages).all(sessionId);
-  return rows.map((row) => JSON.parse(row.data) as PersistedMessage);
+  const messages: PersistedMessage[] = [];
+
+  for (const row of rows) {
+    const message = parsePersistedMessage(row.data);
+    if (message) {
+      messages.push(message);
+    }
+  }
+
+  return messages;
 }
 
 // ---------------------------------------------------------------------------