diff --git a/src/agent/cli/commands/chat.ts b/src/agent/cli/commands/chat.ts
index e50c159d..feae83f5 100644
--- a/src/agent/cli/commands/chat.ts
+++ b/src/agent/cli/commands/chat.ts
@@ -17,7 +17,7 @@ import {
   getCurrentProvider,
   getLoginInstructions,
   type ProviderInfo,
-} from "../../credentials/providers.js";
+} from "../../oauth/providers.js";
 
 type ChatOptions = {
   profile?: string;
diff --git a/src/agent/credentials/cli-credentials.ts b/src/agent/oauth/cli-credentials.ts
similarity index 100%
rename from src/agent/credentials/cli-credentials.ts
rename to src/agent/oauth/cli-credentials.ts
diff --git a/src/agent/credentials/index.ts b/src/agent/oauth/index.ts
similarity index 100%
rename from src/agent/credentials/index.ts
rename to src/agent/oauth/index.ts
diff --git a/src/agent/credentials/providers.ts b/src/agent/oauth/providers.ts
similarity index 97%
rename from src/agent/credentials/providers.ts
rename to src/agent/oauth/providers.ts
index 7a1d80a5..737c5439 100644
--- a/src/agent/credentials/providers.ts
+++ b/src/agent/oauth/providers.ts
@@ -36,13 +36,13 @@ export interface ProviderInfo {
 
 export interface ProviderConfig {
   provider: string;
-  model?: string;
-  apiKey?: string;
-  baseUrl?: string;
+  model?: string | undefined;
+  apiKey?: string | undefined;
+  baseUrl?: string | undefined;
   // OAuth specific
-  accessToken?: string;
-  refreshToken?: string;
-  expires?: number;
+  accessToken?: string | undefined;
+  refreshToken?: string | undefined;
+  expires?: number | undefined;
 }
 
 // ============================================================
diff --git a/src/agent/runner.ts b/src/agent/runner.ts
index 368d0437..0fcc7543 100644
--- a/src/agent/runner.ts
+++ b/src/agent/runner.ts
@@ -7,7 +7,7 @@ import { SessionManager } from "./session/session-manager.js";
 import { ProfileManager } from "./profile/index.js";
 import { SkillManager } from "./skills/index.js";
 import { credentialManager, getCredentialsPath } from "./credentials.js";
-import { resolveProviderConfig } from "./credentials/providers.js";
+import { resolveProviderConfig } from "./oauth/providers.js";
 import {
   checkContextWindow,
   DEFAULT_CONTEXT_TOKENS,