chore: address reviewer feedback, cleanup unrelated files, and refactor to neutral env keys

Author: 3kin0x

src/services/api/utils.ts

@@ -81,22 +81,10 @@ export function getContextWindowForModel(
   betas?: string[],
 ): number {
   // Allow override via environment variable
-  // OPENAI_CONTEXT_WINDOW_SIZE from the active provider profile takes precedence
-  if (process.env.OPENAI_CONTEXT_WINDOW_SIZE) {
-    const override = parseInt(process.env.OPENAI_CONTEXT_WINDOW_SIZE, 10)
-    if (!isNaN(override) && override > 0) {
-      return override
-    }
-  }
-
-  // Allow override via environment variable (internal-only)
   // This takes precedence over all other context window resolution, including 1M detection,
   // so users can cap the effective context window for local decisions (auto-compact, etc.)
   // while still using a 1M-capable endpoint.
-  if (
-    process.env.USER_TYPE === 'ant' &&
-    process.env.CLAUDE_CODE_MAX_CONTEXT_TOKENS
-  ) {
+  if (process.env.CLAUDE_CODE_MAX_CONTEXT_TOKENS) {
     const override = parseInt(process.env.CLAUDE_CODE_MAX_CONTEXT_TOKENS, 10)
     if (!isNaN(override) && override > 0) {
       return override
@@ -206,15 +194,6 @@ export function getModelMaxOutputTokens(model: string): {
   let defaultTokens: number
   let upperLimit: number
 
-  // Allow override via environment variable
-  // OPENAI_MAX_OUTPUT_TOKENS from the active provider profile takes precedence
-  if (process.env.OPENAI_MAX_OUTPUT_TOKENS) {
-    const override = parseInt(process.env.OPENAI_MAX_OUTPUT_TOKENS, 10)
-    if (!isNaN(override) && override > 0) {
-      return { default: override, upperLimit: override }
-    }
-  }
-
   if (process.env.USER_TYPE === 'ant') {
     const antModel = resolveAntModel(model.toLowerCase())
     if (antModel) {

src/utils/context.ts

@@ -93,8 +93,8 @@ const PROFILE_ENV_KEYS = [
   'XAI_API_KEY',
   'VENICE_API_KEY',
   'MIMO_API_KEY',
-  'OPENAI_CONTEXT_WINDOW_SIZE',
-  'OPENAI_MAX_OUTPUT_TOKENS',
+  'CLAUDE_CODE_MAX_CONTEXT_TOKENS',
+  'CLAUDE_CODE_MAX_OUTPUT_TOKENS',
 ] as const
 
 export type CompatibilityProfileMode =
@@ -175,8 +175,8 @@ export type ProfileEnv = {
   XAI_API_KEY?: string
   VENICE_API_KEY?: string
   MIMO_API_KEY?: string
-  OPENAI_CONTEXT_WINDOW_SIZE?: string
-  OPENAI_MAX_OUTPUT_TOKENS?: string
+  CLAUDE_CODE_MAX_CONTEXT_TOKENS?: string
+  CLAUDE_CODE_MAX_OUTPUT_TOKENS?: string
 }
 
 export type ProfileFile = {

src/utils/providerProfile.ts

@@ -13,8 +13,8 @@ const RESTORED_KEYS = [
   'CLAUDE_CODE_USE_OPENAI',
   'OPENAI_BASE_URL',
   'OPENAI_MODEL',
-  'OPENAI_CONTEXT_WINDOW_SIZE',
-  'OPENAI_MAX_OUTPUT_TOKENS',
+  'CLAUDE_CODE_MAX_CONTEXT_TOKENS',
+  'CLAUDE_CODE_MAX_OUTPUT_TOKENS',
 ] as const
 
 type MockConfigState = {
@@ -104,8 +104,8 @@ describe('Provider Profile Persistence (Context Window & Max Tokens)', () => {
 
     setActiveProviderProfile('test_params', { configDir: testConfigDir! })
 
-    expect(process.env.OPENAI_CONTEXT_WINDOW_SIZE).toBe('200000')
-    expect(process.env.OPENAI_MAX_OUTPUT_TOKENS).toBe('8192')
+    expect(process.env.CLAUDE_CODE_MAX_CONTEXT_TOKENS).toBe('200000')
+    expect(process.env.CLAUDE_CODE_MAX_OUTPUT_TOKENS).toBe('8192')
   })
 
   test('persists new parameters to .openclaude-profile.json for startup fallback', async () => {
@@ -131,8 +131,8 @@ describe('Provider Profile Persistence (Context Window & Max Tokens)', () => {
     const persistedPath = join(testConfigDir!, '.openclaude-profile.json')
     const persisted = JSON.parse(readFileSync(persistedPath, 'utf8'))
 
-    expect(persisted.env.OPENAI_CONTEXT_WINDOW_SIZE).toBe('64000')
-    expect(persisted.env.OPENAI_MAX_OUTPUT_TOKENS).toBe('2048')
+    expect(persisted.env.CLAUDE_CODE_MAX_CONTEXT_TOKENS).toBe('64000')
+    expect(persisted.env.CLAUDE_CODE_MAX_OUTPUT_TOKENS).toBe('2048')
   })
 
   test('uses empty string for unspecified parameters (no default values stored)', async () => {

src/utils/providerProfiles.persistence.test.ts

@@ -62,8 +62,8 @@ const RESTORED_KEYS = [
   'VENICE_API_KEY',
   'MIMO_API_KEY',
   'HICAP_API_KEY',
-  'OPENAI_CONTEXT_WINDOW_SIZE',
-  'OPENAI_MAX_OUTPUT_TOKENS',
+  'CLAUDE_CODE_MAX_CONTEXT_TOKENS',
+  'CLAUDE_CODE_MAX_OUTPUT_TOKENS',
 ] as const
 
 type MockConfigState = {

src/utils/providerProfiles.test.ts

@@ -681,10 +681,10 @@ export function applyProviderProfileToProcessEnv(profile: ProviderProfile): void
   }
 
   if (profile.contextWindowSize) {
-    profileEnv.OPENAI_CONTEXT_WINDOW_SIZE = String(profile.contextWindowSize)
+    profileEnv.CLAUDE_CODE_MAX_CONTEXT_TOKENS = String(profile.contextWindowSize)
   }
   if (profile.maxOutputTokens) {
-    profileEnv.OPENAI_MAX_OUTPUT_TOKENS = String(profile.maxOutputTokens)
+    profileEnv.CLAUDE_CODE_MAX_OUTPUT_TOKENS = String(profile.maxOutputTokens)
   }
 
   profileEnv = applySupportedProfileCustomHeaders(profile, profileEnv)
@@ -990,10 +990,10 @@ function buildOpenAICompatibleStartupEnv(
     delete env.OPENAI_API_KEY
   }
   if (activeProfile.contextWindowSize) {
-    env.OPENAI_CONTEXT_WINDOW_SIZE = String(activeProfile.contextWindowSize)
+    env.CLAUDE_CODE_MAX_CONTEXT_TOKENS = String(activeProfile.contextWindowSize)
   }
   if (activeProfile.maxOutputTokens) {
-    env.OPENAI_MAX_OUTPUT_TOKENS = String(activeProfile.maxOutputTokens)
+    env.CLAUDE_CODE_MAX_OUTPUT_TOKENS = String(activeProfile.maxOutputTokens)
   }
   return applySupportedProfileCustomHeaders(activeProfile, env)
 }
@@ -1159,12 +1159,12 @@ function buildStartupProfileFromActiveProfile(
   }
 
   if (activeProfile.contextWindowSize) {
-    startup.env.OPENAI_CONTEXT_WINDOW_SIZE = String(
+    startup.env.CLAUDE_CODE_MAX_CONTEXT_TOKENS = String(
       activeProfile.contextWindowSize,
     )
   }
   if (activeProfile.maxOutputTokens) {
-    startup.env.OPENAI_MAX_OUTPUT_TOKENS = String(activeProfile.maxOutputTokens)
+    startup.env.CLAUDE_CODE_MAX_OUTPUT_TOKENS = String(activeProfile.maxOutputTokens)
   }
 
   return startup