mumucc 0.4.4 → 0.4.10

package/src/utils/auth.ts

@@ -80,6 +80,22 @@ import { clearToolSchemaCache } from './toolSchemaCache.js'
 /** Default TTL for API key helper cache in milliseconds (5 minutes) */
 const DEFAULT_API_KEY_HELPER_TTL = 5 * 60 * 1000
 
+function sanitizeAnthropicApiKeyEnv(
+  apiKey: string | undefined,
+): string | undefined {
+  if (!apiKey) return undefined
+  const trimmed = apiKey.trim()
+  if (!trimmed) return undefined
+  if (
+    trimmed === 'your-api-key-here' ||
+    trimmed === 'YOUR_API_KEY' ||
+    trimmed === 'ANTHROPIC_API_KEY'
+  ) {
+    return undefined
+  }
+  return trimmed
+}
+
 /**
  * CCR and Claude Desktop spawn the CLI with OAuth and should never fall back
  * to the user's ~/.mumucc/settings.json API-key config (apiKeyHelper,
@@ -233,8 +249,9 @@ export function getAnthropicApiKeyWithSource(
   // the --settings flag. Never touches keychain, config file, or approval
   // lists. 3P (Bedrock/Vertex/Foundry) uses provider creds, not this path.
   if (isBareMode()) {
-    if (process.env.ANTHROPIC_API_KEY) {
-      return { key: process.env.ANTHROPIC_API_KEY, source: 'ANTHROPIC_API_KEY' }
+    const apiKeyEnv = sanitizeAnthropicApiKeyEnv(process.env.ANTHROPIC_API_KEY)
+    if (apiKeyEnv) {
+      return { key: apiKeyEnv, source: 'ANTHROPIC_API_KEY' }
     }
     if (getConfiguredApiKeyHelper()) {
       return {
@@ -251,7 +268,7 @@ export function getAnthropicApiKeyWithSource(
   // https://anthropic.slack.com/archives/C08428WSLKV/p1747331773214779
   const apiKeyEnv = isRunningOnHomespace()
     ? undefined
-    : process.env.ANTHROPIC_API_KEY
+    : sanitizeAnthropicApiKeyEnv(process.env.ANTHROPIC_API_KEY)
 
   // Always check for direct environment variable when the user ran claude --print.
   // This is useful for CI, etc.

package/src/utils/effort.ts

@@ -21,11 +21,19 @@ export const EFFORT_LEVELS = [
 
 export type EffortValue = EffortLevel | number
 
+function isOpenAIGptEffortModel(model: string): boolean {
+  const normalized = model.toLowerCase()
+  return (
+    normalized.includes('gpt-5') ||
+    normalized.includes('gpt5') ||
+    normalized.includes('gpt-5.3-codex') ||
+    normalized.includes('codexplan') ||
+    normalized.includes('codexspark')
+  )
+}
+
 // @[MODEL LAUNCH]: Add the new model to the allowlist if it supports the effort parameter.
 export function modelSupportsEffort(model: string): boolean {
-  if (isThirdPartyModel(model)) {
-    return false
-  }
   const m = model.toLowerCase()
   if (isEnvTruthy(process.env.CLAUDE_CODE_ALWAYS_ENABLE_EFFORT)) {
     return true
@@ -34,6 +42,9 @@ export function modelSupportsEffort(model: string): boolean {
   if (supported3P !== undefined) {
     return supported3P
   }
+  if (isThirdPartyModel(model)) {
+    return isOpenAIGptEffortModel(model)
+  }
   // Supported by a subset of Claude 4 models
   if (m.includes('opus-4-6') || m.includes('sonnet-4-6')) {
     return true
@@ -60,6 +71,9 @@ export function modelSupportsMaxEffort(model: string): boolean {
   if (supported3P !== undefined) {
     return supported3P
   }
+  if (isThirdPartyModel(model)) {
+    return isOpenAIGptEffortModel(model)
+  }
   if (model.toLowerCase().includes('opus-4-6')) {
     return true
   }

package/src/utils/logoV2Utils.ts

@@ -15,6 +15,10 @@ import { getStoredChangelogFromMemory, parseChangelog } from './releaseNotes.js'
 import { gt } from './semver.js'
 import { loadMessageLogs } from './sessionStorage.js'
 import { getInitialSettings } from './settings/settings.js'
+import {
+  getDefaultProfileId,
+  resolvePlatformModelTarget,
+} from './model/platformProfiles.js'
 
 // Layout constants
 const MAX_LEFT_WIDTH = 50
@@ -246,6 +250,18 @@ export function getLogoDisplayData(): {
   cwd: string
   billingType: string
   agentName: string | undefined
+}
+export function getLogoDisplayData(currentModel: string): {
+  version: string
+  cwd: string
+  billingType: string
+  agentName: string | undefined
+}
+export function getLogoDisplayData(currentModel?: string): {
+  version: string
+  cwd: string
+  billingType: string
+  agentName: string | undefined
 } {
   const version = process.env.DEMO_VERSION ?? MACRO.VERSION
   const serverUrl = getDirectConnectServerUrl()
@@ -264,18 +280,17 @@ export function getLogoDisplayData(): {
   const oauthAccountBillingType = getGlobalConfig().oauthAccount?.billingType
   // Use whichever subscription indicator is available
   const effectiveSubscription = subscriptionType ?? (oauthAccountBillingType ? oauthAccountBillingType : null)
-  const providers = getThirdPartyProviders()
+  const activeTarget = resolvePlatformModelTarget({
+    model: currentModel,
+    useDefaultProfile: true,
+    defaultProfileId: getDefaultProfileId(),
+  })
 
   let billingType: string
-  if (effectiveSubscription && providers.length > 0) {
-    // Both account subscription and third-party API
-    const subName = getSubscriptionName() || oauthAccountBillingType || 'Subscriber'
-    billingType = `${subName} + ${providers.map(p => p.name).join(', ')}`
+  if (activeTarget && activeTarget.provider.id !== 'anthropic') {
+    billingType = activeTarget.profile.name || activeTarget.provider.name
   } else if (effectiveSubscription) {
     billingType = getSubscriptionName() || oauthAccountBillingType || 'Subscriber'
-  } else if (providers.length > 0) {
-    // Show specific provider names instead of generic "Third-party API"
-    billingType = providers.map(p => p.name).join(', ')
   } else {
     billingType = 'API Usage Billing'
   }

package/src/utils/model/modelOptions.ts

@@ -3,6 +3,7 @@
 import { getInitialMainLoopModel } from '../../bootstrap/state.js'
 import {
   getAnthropicApiKey,
+  getAuthTokenSource,
   isClaudeAISubscriber,
   isMaxSubscriber,
   isTeamPremiumSubscriber,
@@ -35,7 +36,7 @@ import {
 import { has1mContext } from '../context.js'
 import { getGlobalConfig } from '../config.js'
 import { getAllThirdPartyModels } from './thirdPartyProviders.js'
-import { parseProfileQualifiedModel } from './platformProfiles.js'
+import { getDefaultProfileId, parseProfileQualifiedModel } from './platformProfiles.js'
 
 // @[MODEL LAUNCH]: Update all the available and default model option strings below.
 
@@ -303,122 +304,7 @@ function getOpusPlanOption(): ModelOption {
 // @[MODEL LAUNCH]: Update the model picker lists below to include/reorder options for the new model.
 // Each user tier (ant, Max/Team Premium, Pro/Team Standard/Enterprise, PAYG 1P, PAYG 3P) has its own list.
 function getModelOptionsBase(fastMode = false): ModelOption[] {
-  // If no Anthropic auth is configured (no API key, no OAuth token),
-  // skip Anthropic models entirely — user only sees third-party models
-  // from providers they've configured via /login.
-  const hasAnthropicAuth =
-    !!getAnthropicApiKey() ||
-    !!process.env.CLAUDE_CODE_USE_BEDROCK ||
-    !!process.env.CLAUDE_CODE_USE_VERTEX ||
-    !!process.env.CLAUDE_CODE_USE_FOUNDRY
-  if (!hasAnthropicAuth) {
-    return []
-  }
-
-  if (process.env.USER_TYPE === 'ant') {
-    // Build options from antModels config
-    const antModelOptions: ModelOption[] = getAntModels().map(m => ({
-      value: m.alias,
-      label: m.label,
-      description: m.description ?? `[ANT-ONLY] ${m.label} (${m.model})`,
-    }))
-
-    return [
-      getDefaultOptionForUser(),
-      ...antModelOptions,
-      getMergedOpus1MOption(fastMode),
-      getSonnet46Option(),
-      getSonnet46_1MOption(),
-      getHaiku45Option(),
-    ]
-  }
-
-  if (isClaudeAISubscriber()) {
-    if (isMaxSubscriber() || isTeamPremiumSubscriber()) {
-      // Max and Team Premium users: Opus is default, show Sonnet as alternative
-      const premiumOptions = [getDefaultOptionForUser(fastMode)]
-      if (!isOpus1mMergeEnabled() && checkOpus1mAccess()) {
-        premiumOptions.push(getMaxOpus46_1MOption(fastMode))
-      }
-
-      premiumOptions.push(MaxSonnet46Option)
-      if (checkSonnet1mAccess()) {
-        premiumOptions.push(getMaxSonnet46_1MOption())
-      }
-
-      premiumOptions.push(MaxHaiku45Option)
-      return premiumOptions
-    }
-
-    // Pro/Team Standard/Enterprise users: Sonnet is default, show Opus as alternative
-    const standardOptions = [getDefaultOptionForUser(fastMode)]
-    if (checkSonnet1mAccess()) {
-      standardOptions.push(getMaxSonnet46_1MOption())
-    }
-
-    if (isOpus1mMergeEnabled()) {
-      standardOptions.push(getMergedOpus1MOption(fastMode))
-    } else {
-      standardOptions.push(getMaxOpusOption(fastMode))
-      if (checkOpus1mAccess()) {
-        standardOptions.push(getMaxOpus46_1MOption(fastMode))
-      }
-    }
-
-    standardOptions.push(MaxHaiku45Option)
-    return standardOptions
-  }
-
-  // PAYG 1P API: Default (Sonnet) + Sonnet 1M + Opus 4.6 + Opus 1M + Haiku
-  if (getAPIProvider() === 'firstParty') {
-    const payg1POptions = [getDefaultOptionForUser(fastMode)]
-    if (checkSonnet1mAccess()) {
-      payg1POptions.push(getSonnet46_1MOption())
-    }
-    if (isOpus1mMergeEnabled()) {
-      payg1POptions.push(getMergedOpus1MOption(fastMode))
-    } else {
-      payg1POptions.push(getOpus46Option(fastMode))
-      if (checkOpus1mAccess()) {
-        payg1POptions.push(getOpus46_1MOption(fastMode))
-      }
-    }
-    payg1POptions.push(getHaiku45Option())
-    return payg1POptions
-  }
-
-  // PAYG 3P: Default (Sonnet 4.5) + Sonnet (3P custom) or Sonnet 4.6/1M + Opus (3P custom) or Opus 4.1/Opus 4.6/Opus1M + Haiku + Opus 4.1
-  const payg3pOptions = [getDefaultOptionForUser(fastMode)]
-
-  const customSonnet = getCustomSonnetOption()
-  if (customSonnet !== undefined) {
-    payg3pOptions.push(customSonnet)
-  } else {
-    // Add Sonnet 4.6 since Sonnet 4.5 is the default
-    payg3pOptions.push(getSonnet46Option())
-    if (checkSonnet1mAccess()) {
-      payg3pOptions.push(getSonnet46_1MOption())
-    }
-  }
-
-  const customOpus = getCustomOpusOption()
-  if (customOpus !== undefined) {
-    payg3pOptions.push(customOpus)
-  } else {
-    // Add Opus 4.1, Opus 4.6 and Opus 4.6 1M
-    payg3pOptions.push(getOpus41Option()) // This is the default opus
-    payg3pOptions.push(getOpus46Option(fastMode))
-    if (checkOpus1mAccess()) {
-      payg3pOptions.push(getOpus46_1MOption(fastMode))
-    }
-  }
-  const customHaiku = getCustomHaikuOption()
-  if (customHaiku !== undefined) {
-    payg3pOptions.push(customHaiku)
-  } else {
-    payg3pOptions.push(getHaikuOption())
-  }
-  return payg3pOptions
+  return []
 }
 
 // @[MODEL LAUNCH]: Add the new model ID to the appropriate family pattern below
@@ -524,14 +410,23 @@ export function getModelOptions(fastMode = false): ModelOption[] {
     const prioritizedOptions: ModelOption[] = []
     const defaultOption = options.find(option => option.value === null)
     const baseOptionsWithoutDefault = options.filter(option => option.value !== null)
+    const defaultProfileId = getDefaultProfileId()
+    const preferAnthropicOptionsFirst = defaultProfileId === 'anthropic'
 
     if (defaultOption) {
       pushUniqueOption(prioritizedOptions, defaultOption)
     }
-    for (const option of profileModelOptions) {
+    const firstGroup = preferAnthropicOptionsFirst
+      ? baseOptionsWithoutDefault
+      : profileModelOptions
+    const secondGroup = preferAnthropicOptionsFirst
+      ? profileModelOptions
+      : baseOptionsWithoutDefault
+
+    for (const option of firstGroup) {
       pushUniqueOption(prioritizedOptions, option)
     }
-    for (const option of baseOptionsWithoutDefault) {
+    for (const option of secondGroup) {
       pushUniqueOption(prioritizedOptions, option)
     }
     for (const option of otherProviderOptions) {

package/src/utils/model/platformProfiles.ts

@@ -91,6 +91,8 @@ const BUILTIN_PLATFORM_PROVIDERS: PlatformProviderConfig[] = [
     transport: 'openai_chat_completions',
     baseUrl: DEFAULT_OPENAI_BASE_URL,
     models: [
+      { id: 'gpt-5.4', displayName: 'GPT-5.4' },
+      { id: 'gpt-5.3-codex', displayName: 'GPT-5.3 Codex' },
       { id: 'gpt-4o', displayName: 'GPT-4o' },
       { id: 'gpt-4o-mini', displayName: 'GPT-4o Mini' },
       { id: 'o3', displayName: 'o3' },
@@ -146,7 +148,7 @@ const BUILTIN_PLATFORM_PROFILES: PlatformProfileConfig[] = [
     name: 'OpenAI',
     providerId: 'openai',
     authAccountId: 'openai-env',
-    defaultModel: 'gpt-4o',
+    defaultModel: 'gpt-5.4',
   },
   {
     id: 'codex',

package/src/utils/model/thirdPartyProviders.ts

@@ -369,6 +369,7 @@ export async function getThirdPartyClient(
         baseUrl: profile.baseUrl ?? provider.baseUrl,
         codexAccountId: authAccount?.accountId,
         codexAuthPath: authAccount?.authJsonPath,
+        transportOverride: 'codex_responses',
       }) as unknown as Anthropic
     }
 

package/src/utils/plugins/pluginDirectories.ts

@@ -11,7 +11,8 @@
 
 import { mkdirSync } from 'fs'
 import { readdir, rm, stat } from 'fs/promises'
-import { delimiter, join } from 'path'
+import { fileURLToPath } from 'url'
+import { delimiter, dirname, join } from 'path'
 import { getUseCoworkPlugins } from '../../bootstrap/state.js'
 import { logForDebugging } from '../debug.js'
 import { getClaudeConfigHomeDir, isEnvTruthy } from '../envUtils.js'
@@ -21,6 +22,15 @@ import { expandTilde } from '../permissions/pathValidation.js'
 
 const PLUGINS_DIR = 'plugins'
 const COWORK_PLUGINS_DIR = 'cowork_plugins'
+const __filename = fileURLToPath(import.meta.url)
+const BUILTIN_PLUGIN_SEED_DIR = join(
+  dirname(__filename),
+  '..',
+  '..',
+  '..',
+  'defaults',
+  'plugin-seed',
+)
 
 /**
  * Get the plugins directory name based on current mode.
@@ -85,8 +95,10 @@ export function getPluginsDirectory(): string {
 export function getPluginSeedDirs(): string[] {
   // Same tilde-expansion rationale as getPluginsDirectory (gh-30794).
   const raw = process.env.CLAUDE_CODE_PLUGIN_SEED_DIR
-  if (!raw) return []
-  return raw.split(delimiter).filter(Boolean).map(expandTilde)
+  const configured = raw
+    ? raw.split(delimiter).filter(Boolean).map(expandTilde)
+    : []
+  return [...configured, BUILTIN_PLUGIN_SEED_DIR]
 }
 
 function sanitizePluginId(pluginId: string): string {