diff --git a/src/agent/oauth/index.ts b/src/agent/oauth/index.ts
deleted file mode 100644
index 9d740a39..00000000
--- a/src/agent/oauth/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from "./cli-credentials.js";
-export * from "./providers.js";
diff --git a/src/agent/oauth/providers.ts b/src/agent/oauth/providers.ts
deleted file mode 100644
index ddd5f8dc..00000000
--- a/src/agent/oauth/providers.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * @deprecated This file is deprecated. Import from '../providers/index.js' instead.
- *
- * This file re-exports from the new providers/ module for backwards compatibility.
- * Will be removed in a future version.
- */
-
-export {
-  type AuthMethod,
-  type ProviderInfo,
-  type ProviderConfig,
-  isOAuthProvider,
-  isProviderAvailable,
-  getCurrentProvider,
-  getProviderList,
-  getAvailableProviders,
-  formatProviderStatus,
-  getLoginInstructions,
-  resolveProviderConfig,
-} from "../providers/index.js";
diff --git a/src/agent/oauth/cli-credentials.ts b/src/agent/providers/oauth/cli-credentials.ts
similarity index 100%
rename from src/agent/oauth/cli-credentials.ts
rename to src/agent/providers/oauth/cli-credentials.ts
diff --git a/src/agent/providers/oauth/index.ts b/src/agent/providers/oauth/index.ts
new file mode 100644
index 00000000..e666b667
--- /dev/null
+++ b/src/agent/providers/oauth/index.ts
@@ -0,0 +1,7 @@
+/**
+ * OAuth Credential Reading
+ *
+ * Read OAuth credentials from external CLI tools (Claude Code, Codex).
+ */
+
+export * from "./cli-credentials.js";
diff --git a/src/agent/providers/registry.ts b/src/agent/providers/registry.ts
index acff7ee9..50809def 100644
--- a/src/agent/providers/registry.ts
+++ b/src/agent/providers/registry.ts
@@ -9,7 +9,7 @@ import { credentialManager } from "../credentials.js";
 import {
   hasValidClaudeCliCredentials,
   hasValidCodexCliCredentials,
-} from "../oauth/cli-credentials.js";
+} from "./oauth/cli-credentials.js";
 
 // ============================================================
 // Types
@@ -50,24 +50,24 @@ const PROVIDER_REGISTRY: Record<string, ProviderMeta> = {
     id: "claude-code",
     name: "Claude Code (OAuth)",
     authMethod: "oauth",
-    defaultModel: "claude-sonnet-4-20250514",
-    models: ["claude-sonnet-4-20250514", "claude-opus-4-20250514"],
+    defaultModel: "claude-opus-4-5",
+    models: ["claude-opus-4-5", "claude-sonnet-4-5", "claude-haiku-4-5"],
     loginCommand: "claude login",
   },
   "openai-codex": {
     id: "openai-codex",
     name: "Codex (OAuth)",
     authMethod: "oauth",
-    defaultModel: "gpt-5.1",
-    models: ["gpt-5.1", "gpt-5.1-codex-max"],
+    defaultModel: "gpt-5.2",
+    models: ["gpt-5.2", "gpt-5.2-codex", "gpt-5.1-codex", "gpt-5.1-codex-mini", "gpt-5.1-codex-max"],
     loginCommand: "codex login",
   },
   "anthropic": {
     id: "anthropic",
     name: "Anthropic (API Key)",
     authMethod: "api-key",
-    defaultModel: "claude-sonnet-4-20250514",
-    models: ["claude-sonnet-4-20250514", "claude-opus-4-20250514", "claude-haiku-3-5-20241022"],
+    defaultModel: "claude-sonnet-4-5",
+    models: ["claude-opus-4-5", "claude-sonnet-4-5", "claude-haiku-4-5"],
     loginUrl: "https://console.anthropic.com/",
   },
   "openai": {
diff --git a/src/agent/providers/resolver.ts b/src/agent/providers/resolver.ts
index a29748e8..7ec8dd14 100644
--- a/src/agent/providers/resolver.ts
+++ b/src/agent/providers/resolver.ts
@@ -10,7 +10,7 @@ import { credentialManager } from "../credentials.js";
 import {
   readClaudeCliCredentials,
   readCodexCliCredentials,
-} from "../oauth/cli-credentials.js";
+} from "./oauth/cli-credentials.js";
 import {
   PROVIDER_ALIAS,
   getProviderMeta,