feat: support custom model providers

src/agents/agent-paths.ts

@@ -0,0 +1,21 @@
+import path from "node:path";
+
+import { CONFIG_DIR, resolveUserPath } from "../utils.js";
+
+const DEFAULT_AGENT_DIR = path.join(CONFIG_DIR, "agent");
+
+export function resolveClawdisAgentDir(): string {
+  const override =
+    process.env.CLAWDIS_AGENT_DIR?.trim() ||
+    process.env.PI_CODING_AGENT_DIR?.trim() ||
+    DEFAULT_AGENT_DIR;
+  return resolveUserPath(override);
+}
+
+export function ensureClawdisAgentEnv(): string {
+  const dir = resolveClawdisAgentDir();
+  if (!process.env.CLAWDIS_AGENT_DIR) process.env.CLAWDIS_AGENT_DIR = dir;
+  if (!process.env.PI_CODING_AGENT_DIR) process.env.PI_CODING_AGENT_DIR = dir;
+  return dir;
+}
+

src/agents/context.ts

@@ -1,13 +1,19 @@
 // Lazy-load pi-coding-agent model metadata so we can infer context windows when
 // the agent reports a model id. This includes custom models.json entries.
 
+import { loadConfig } from "../config/config.js";
+import { resolveClawdisAgentDir } from "./agent-paths.js";
+import { ensureClawdisModelsJson } from "./models-config.js";
+
 type ModelEntry = { id: string; contextWindow?: number };
 
 const MODEL_CACHE = new Map<string, number>();
 const loadPromise = (async () => {
   try {
     const { discoverModels } = await import("@mariozechner/pi-coding-agent");
-    const models = discoverModels() as ModelEntry[];
+    const cfg = loadConfig();
+    await ensureClawdisModelsJson(cfg);
+    const models = discoverModels(resolveClawdisAgentDir()) as ModelEntry[];
     for (const m of models) {
       if (!m?.id) continue;
       if (typeof m.contextWindow === "number" && m.contextWindow > 0) {

src/agents/models-config.ts

@@ -0,0 +1,64 @@
+import fs from "node:fs/promises";
+import path from "node:path";
+
+import { loadConfig, type ClawdisConfig } from "../config/config.js";
+import { ensureClawdisAgentEnv, resolveClawdisAgentDir } from "./agent-paths.js";
+
+type ModelsConfig = NonNullable<ClawdisConfig["models"]>;
+
+const DEFAULT_MODE: NonNullable<ModelsConfig["mode"]> = "merge";
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return Boolean(value && typeof value === "object" && !Array.isArray(value));
+}
+
+async function readJson(pathname: string): Promise<unknown | null> {
+  try {
+    const raw = await fs.readFile(pathname, "utf8");
+    return JSON.parse(raw) as unknown;
+  } catch {
+    return null;
+  }
+}
+
+export async function ensureClawdisModelsJson(
+  config?: ClawdisConfig,
+): Promise<{ agentDir: string; wrote: boolean }> {
+  const cfg = config ?? loadConfig();
+  const providers = cfg.models?.providers;
+  if (!providers || Object.keys(providers).length === 0) {
+    return { agentDir: resolveClawdisAgentDir(), wrote: false };
+  }
+
+  const mode = cfg.models?.mode ?? DEFAULT_MODE;
+  const agentDir = ensureClawdisAgentEnv();
+  const targetPath = path.join(agentDir, "models.json");
+
+  let mergedProviders = providers;
+  let existingRaw = "";
+  if (mode === "merge") {
+    const existing = await readJson(targetPath);
+    if (isRecord(existing) && isRecord(existing.providers)) {
+      const existingProviders = existing.providers as Record<
+        string,
+        NonNullable<ModelsConfig["providers"]>[string]
+      >;
+      mergedProviders = { ...existingProviders, ...providers };
+    }
+  }
+
+  const next = `${JSON.stringify({ providers: mergedProviders }, null, 2)}\n`;
+  try {
+    existingRaw = await fs.readFile(targetPath, "utf8");
+  } catch {
+    existingRaw = "";
+  }
+
+  if (existingRaw === next) {
+    return { agentDir, wrote: false };
+  }
+
+  await fs.mkdir(agentDir, { recursive: true, mode: 0o700 });
+  await fs.writeFile(targetPath, next, { mode: 0o600 });
+  return { agentDir, wrote: true };
+}

src/agents/pi-embedded-runner.ts

@@ -26,6 +26,8 @@ import type { ClawdisConfig } from "../config/config.js";
 import { splitMediaFromOutput } from "../media/parse.js";
 import { enqueueCommand } from "../process/command-queue.js";
 import { CONFIG_DIR, resolveUserPath } from "../utils.js";
+import { resolveClawdisAgentDir } from "./agent-paths.js";
+import { ensureClawdisModelsJson } from "./models-config.js";
 import { DEFAULT_MODEL, DEFAULT_PROVIDER } from "./defaults.js";
 import {
   buildBootstrapContextFiles,
@@ -84,7 +86,6 @@ const ACTIVE_EMBEDDED_RUNS = new Map<string, EmbeddedPiQueueHandle>();
 
 const OAUTH_FILENAME = "oauth.json";
 const DEFAULT_OAUTH_DIR = path.join(CONFIG_DIR, "credentials");
-const DEFAULT_AGENT_DIR = path.join(CONFIG_DIR, "agent");
 let oauthStorageConfigured = false;
 let cachedDefaultApiKey: ReturnType<typeof defaultGetApiKey> | null = null;
 
@@ -94,14 +95,6 @@ function resolveClawdisOAuthPath(): string {
   return path.join(resolveUserPath(overrideDir), OAUTH_FILENAME);
 }
 
-function resolveAgentDir(): string {
-  const override =
-    process.env.CLAWDIS_AGENT_DIR?.trim() ||
-    process.env.PI_CODING_AGENT_DIR?.trim() ||
-    DEFAULT_AGENT_DIR;
-  return resolveUserPath(override);
-}
-
 function loadOAuthStorageAt(pathname: string): OAuthStorage | null {
   if (!fsSync.existsSync(pathname)) return null;
   try {
@@ -284,10 +277,8 @@ export async function runEmbeddedPiAgent(params: {
     const provider =
       (params.provider ?? DEFAULT_PROVIDER).trim() || DEFAULT_PROVIDER;
     const modelId = (params.model ?? DEFAULT_MODEL).trim() || DEFAULT_MODEL;
-    const agentDir = resolveAgentDir();
-    if (!process.env.PI_CODING_AGENT_DIR) {
-      process.env.PI_CODING_AGENT_DIR = agentDir;
-    }
+    await ensureClawdisModelsJson(params.config);
+    const agentDir = resolveClawdisAgentDir();
     const { model, error } = resolveModel(provider, modelId, agentDir);
     if (!model) {
       throw new Error(error ?? `Unknown model: ${provider}/${modelId}`);