From 1c31d91c83e10c1872f83c0f5b27cd31a47bed81 Mon Sep 17 00:00:00 2001
From: Mario Zechner <badlogicgames@gmail.com>
Date: Thu, 25 Dec 2025 01:15:17 +0100
Subject: [PATCH] WIP: Rename model-config.ts to models-json.ts

- loadCustomModels now takes file path instead of agentDir
---
 packages/coding-agent/src/cli/list-models.ts  |  2 +-
 .../coding-agent/src/core/agent-session.ts    |  2 +-
 .../coding-agent/src/core/model-resolver.ts   |  2 +-
 .../core/{model-config.ts => models-json.ts}  | 19 +++++++++----------
 packages/coding-agent/src/core/sdk.ts         |  2 +-
 packages/coding-agent/src/index.ts            |  2 +-
 packages/coding-agent/src/main.ts             |  2 +-
 .../modes/interactive/components/footer.ts    |  2 +-
 .../interactive/components/model-selector.ts  |  2 +-
 .../src/modes/interactive/interactive-mode.ts |  2 +-
 10 files changed, 18 insertions(+), 19 deletions(-)
 rename packages/coding-agent/src/core/{model-config.ts => models-json.ts} (96%)

diff --git a/packages/coding-agent/src/cli/list-models.ts b/packages/coding-agent/src/cli/list-models.ts
index 59ef03da..3f6a0121 100644
--- a/packages/coding-agent/src/cli/list-models.ts
+++ b/packages/coding-agent/src/cli/list-models.ts
@@ -3,7 +3,7 @@
  */
 
 import type { Api, Model } from "@mariozechner/pi-ai";
-import { getAvailableModels } from "../core/model-config.js";
+import { getAvailableModels } from "../core/models-json.js";
 import type { SettingsManager } from "../core/settings-manager.js";
 import { fuzzyFilter } from "../utils/fuzzy.js";
 
diff --git a/packages/coding-agent/src/core/agent-session.ts b/packages/coding-agent/src/core/agent-session.ts
index e4b9c2e6..40a36200 100644
--- a/packages/coding-agent/src/core/agent-session.ts
+++ b/packages/coding-agent/src/core/agent-session.ts
@@ -23,7 +23,7 @@ import type { LoadedCustomTool, SessionEvent as ToolSessionEvent } from "./custo
 import { exportSessionToHtml } from "./export-html.js";
 import type { HookRunner, SessionEventResult, TurnEndEvent, TurnStartEvent } from "./hooks/index.js";
 import type { BashExecutionMessage } from "./messages.js";
-import { getApiKeyForModel, getAvailableModels } from "./model-config.js";
+import { getApiKeyForModel, getAvailableModels } from "./models-json.js";
 import type { CompactionEntry, SessionManager } from "./session-manager.js";
 import type { SettingsManager, SkillsSettings } from "./settings-manager.js";
 import { expandSlashCommand, type FileSlashCommand } from "./slash-commands.js";
diff --git a/packages/coding-agent/src/core/model-resolver.ts b/packages/coding-agent/src/core/model-resolver.ts
index 7e11d9d6..53b4eaa9 100644
--- a/packages/coding-agent/src/core/model-resolver.ts
+++ b/packages/coding-agent/src/core/model-resolver.ts
@@ -6,7 +6,7 @@ import type { ThinkingLevel } from "@mariozechner/pi-agent-core";
 import type { Api, KnownProvider, Model } from "@mariozechner/pi-ai";
 import chalk from "chalk";
 import { isValidThinkingLevel } from "../cli/args.js";
-import { findModel, getApiKeyForModel, getAvailableModels } from "./model-config.js";
+import { findModel, getApiKeyForModel, getAvailableModels } from "./models-json.js";
 import type { SettingsManager } from "./settings-manager.js";
 
 /** Default model IDs for each known provider */
diff --git a/packages/coding-agent/src/core/model-config.ts b/packages/coding-agent/src/core/models-json.ts
similarity index 96%
rename from packages/coding-agent/src/core/model-config.ts
rename to packages/coding-agent/src/core/models-json.ts
index 3b1bf43c..c56f15c0 100644
--- a/packages/coding-agent/src/core/model-config.ts
+++ b/packages/coding-agent/src/core/models-json.ts
@@ -95,17 +95,16 @@ export function resolveApiKey(keyConfig: string): string | undefined {
 }
 
 /**
- * Load custom models from models.json in agent config dir
+ * Load custom models from a models.json file
  * Returns { models, error } - either models array or error message
  */
-function loadCustomModels(agentDir: string = getAgentDir()): { models: Model<Api>[]; error: string | null } {
-	const configPath = join(agentDir, "models.json");
-	if (!existsSync(configPath)) {
+function loadCustomModels(modelsJsonPath: string): { models: Model<Api>[]; error: string | null } {
+	if (!existsSync(modelsJsonPath)) {
 		return { models: [], error: null };
 	}
 
 	try {
-		const content = readFileSync(configPath, "utf-8");
+		const content = readFileSync(modelsJsonPath, "utf-8");
 		const config: ModelsConfig = JSON.parse(content);
 
 		// Validate schema
@@ -117,7 +116,7 @@ function loadCustomModels(agentDir: string = getAgentDir()): { models: Model<Api
 				"Unknown schema error";
 			return {
 				models: [],
-				error: `Invalid models.json schema:\n${errors}\n\nFile: ${configPath}`,
+				error: `Invalid models.json schema:\n${errors}\n\nFile: ${modelsJsonPath}`,
 			};
 		}
 
@@ -127,7 +126,7 @@ function loadCustomModels(agentDir: string = getAgentDir()): { models: Model<Api
 		} catch (error) {
 			return {
 				models: [],
-				error: `Invalid models.json: ${error instanceof Error ? error.message : error}\n\nFile: ${configPath}`,
+				error: `Invalid models.json: ${error instanceof Error ? error.message : error}\n\nFile: ${modelsJsonPath}`,
 			};
 		}
 
@@ -137,12 +136,12 @@ function loadCustomModels(agentDir: string = getAgentDir()): { models: Model<Api
 		if (error instanceof SyntaxError) {
 			return {
 				models: [],
-				error: `Failed to parse models.json: ${error.message}\n\nFile: ${configPath}`,
+				error: `Failed to parse models.json: ${error.message}\n\nFile: ${modelsJsonPath}`,
 			};
 		}
 		return {
 			models: [],
-			error: `Failed to load models.json: ${error instanceof Error ? error.message : error}\n\nFile: ${configPath}`,
+			error: `Failed to load models.json: ${error instanceof Error ? error.message : error}\n\nFile: ${modelsJsonPath}`,
 		};
 	}
 }
@@ -244,7 +243,7 @@ export function loadAndMergeModels(agentDir: string = getAgentDir()): { models:
 	}
 
 	// Load custom models
-	const { models: customModels, error } = loadCustomModels(agentDir);
+	const { models: customModels, error } = loadCustomModels(join(agentDir, "models.json"));
 
 	if (error) {
 		return { models: [], error };
diff --git a/packages/coding-agent/src/core/sdk.ts b/packages/coding-agent/src/core/sdk.ts
index f1e28463..9f9a8b1f 100644
--- a/packages/coding-agent/src/core/sdk.ts
+++ b/packages/coding-agent/src/core/sdk.ts
@@ -45,7 +45,7 @@ import {
 	getApiKeyForModel,
 	getAvailableModels,
 	loadAndMergeModels,
-} from "./model-config.js";
+} from "./models-json.js";
 import { SessionManager } from "./session-manager.js";
 import { type Settings, SettingsManager, type SkillsSettings } from "./settings-manager.js";
 import { loadSkills as loadSkillsInternal, type Skill } from "./skills.js";
diff --git a/packages/coding-agent/src/index.ts b/packages/coding-agent/src/index.ts
index 579e58c1..eb36e17d 100644
--- a/packages/coding-agent/src/index.ts
+++ b/packages/coding-agent/src/index.ts
@@ -73,7 +73,7 @@ export {
 } from "./core/hooks/index.js";
 export { messageTransformer } from "./core/messages.js";
 // Model configuration and OAuth
-export { findModel, getApiKeyForModel, getAvailableModels } from "./core/model-config.js";
+export { findModel, getApiKeyForModel, getAvailableModels } from "./core/models-json.js";
 export {
 	getOAuthProviders,
 	login,
diff --git a/packages/coding-agent/src/main.ts b/packages/coding-agent/src/main.ts
index c4e1b7fc..fcc8fa0e 100644
--- a/packages/coding-agent/src/main.ts
+++ b/packages/coding-agent/src/main.ts
@@ -18,8 +18,8 @@ import type { AgentSession } from "./core/agent-session.js";
 import type { LoadedCustomTool } from "./core/custom-tools/index.js";
 import { exportFromFile } from "./core/export-html.js";
 import type { HookUIContext } from "./core/index.js";
-import { findModel } from "./core/model-config.js";
 import { resolveModelScope, type ScopedModel } from "./core/model-resolver.js";
+import { findModel } from "./core/models-json.js";
 import { type CreateAgentSessionOptions, configureOAuthStorage, createAgentSession } from "./core/sdk.js";
 import { SessionManager } from "./core/session-manager.js";
 import { SettingsManager } from "./core/settings-manager.js";
diff --git a/packages/coding-agent/src/modes/interactive/components/footer.ts b/packages/coding-agent/src/modes/interactive/components/footer.ts
index ce2ad8af..4b286077 100644
--- a/packages/coding-agent/src/modes/interactive/components/footer.ts
+++ b/packages/coding-agent/src/modes/interactive/components/footer.ts
@@ -3,7 +3,7 @@ import type { AssistantMessage } from "@mariozechner/pi-ai";
 import { type Component, visibleWidth } from "@mariozechner/pi-tui";
 import { existsSync, type FSWatcher, readFileSync, watch } from "fs";
 import { dirname, join } from "path";
-import { isModelUsingOAuth } from "../../../core/model-config.js";
+import { isModelUsingOAuth } from "../../../core/models-json.js";
 import { theme } from "../theme/theme.js";
 
 /**
diff --git a/packages/coding-agent/src/modes/interactive/components/model-selector.ts b/packages/coding-agent/src/modes/interactive/components/model-selector.ts
index 35b00f8e..fe1b31e5 100644
--- a/packages/coding-agent/src/modes/interactive/components/model-selector.ts
+++ b/packages/coding-agent/src/modes/interactive/components/model-selector.ts
@@ -10,7 +10,7 @@ import {
 	Text,
 	type TUI,
 } from "@mariozechner/pi-tui";
-import { getAvailableModels } from "../../../core/model-config.js";
+import { getAvailableModels } from "../../../core/models-json.js";
 import type { SettingsManager } from "../../../core/settings-manager.js";
 import { fuzzyFilter } from "../../../utils/fuzzy.js";
 import { theme } from "../theme/theme.js";
diff --git a/packages/coding-agent/src/modes/interactive/interactive-mode.ts b/packages/coding-agent/src/modes/interactive/interactive-mode.ts
index b719e259..76410991 100644
--- a/packages/coding-agent/src/modes/interactive/interactive-mode.ts
+++ b/packages/coding-agent/src/modes/interactive/interactive-mode.ts
@@ -30,7 +30,7 @@ import type { AgentSession, AgentSessionEvent } from "../../core/agent-session.j
 import type { LoadedCustomTool, SessionEvent as ToolSessionEvent } from "../../core/custom-tools/index.js";
 import type { HookUIContext } from "../../core/hooks/index.js";
 import { isBashExecutionMessage } from "../../core/messages.js";
-import { invalidateOAuthCache } from "../../core/model-config.js";
+import { invalidateOAuthCache } from "../../core/models-json.js";
 import { listOAuthProviders, login, logout, type OAuthProvider } from "../../core/oauth/index.js";
 import {
 	getLatestCompactionEntry,