mumucc 0.4.2 → 0.4.4

package/src/utils/model/model.ts

@@ -1,3 +1,4 @@
+// @ts-nocheck
 // biome-ignore-all assist/source/organizeImports: ANT-ONLY import markers must not be reordered
 /**
  * Ensure that any model codenames introduced here are also added to
@@ -34,6 +35,13 @@ import {
   getThirdPartyModelDisplayName,
   parseThirdPartyModel,
 } from './thirdPartyProviders.js'
+import {
+  getDefaultProfileId,
+  getPlatformDefaultModelForProfile,
+  getPlatformModelDisplayName,
+  isProfileQualifiedModel,
+  parseProfileQualifiedModel,
+} from './platformProfiles.js'
 
 export type ModelShortName = string
 export type ModelName = string
@@ -182,6 +190,15 @@ export function getRuntimeMainLoopModel(params: {
  * @returns The default model setting to use
  */
 export function getDefaultMainLoopModelSetting(): ModelName | ModelAlias {
+  const settings = getSettings_DEPRECATED() || {}
+  const defaultProfile = getDefaultProfileId() ?? settings.defaultProfile
+  const defaultProfileModel = defaultProfile
+    ? getPlatformDefaultModelForProfile(defaultProfile)
+    : undefined
+  if (defaultProfile && defaultProfileModel) {
+    return `${defaultProfile}:${defaultProfileModel}`
+  }
+
   // Ants default to defaultModel from flag config, or Opus 1M if not configured
   if (process.env.USER_TYPE === 'ant') {
     return (
@@ -434,6 +451,11 @@ export function renderModelName(model: ModelName): string {
  * @returns "Claude {ModelName}" for public models, or "Claude ({model})" for non-public models
  */
 export function getPublicModelName(model: ModelName): string {
+  const platformName = getPlatformModelDisplayName(model)
+  if (platformName) {
+    return platformName
+  }
+
   // Third-party models get their provider name
   const thirdPartyName = getThirdPartyModelDisplayName(model)
   if (thirdPartyName) {
@@ -463,6 +485,10 @@ export function parseUserSpecifiedModel(
 ): ModelName {
   const modelInputTrimmed = modelInput.trim()
 
+  if (isProfileQualifiedModel(modelInputTrimmed)) {
+    return modelInputTrimmed
+  }
+
   // Third-party models (providerId:modelId) pass through without alias resolution
   if (isThirdPartyModel(modelInputTrimmed)) {
     return modelInputTrimmed
@@ -636,6 +662,11 @@ export function getMarketingNameForModel(modelId: string): string | undefined {
 }
 
 export function normalizeModelStringForAPI(model: string): string {
+  const profileQualified = parseProfileQualifiedModel(model)
+  if (profileQualified) {
+    return profileQualified.modelId.replace(/\[(1|2)m\]/gi, '')
+  }
+
   // For third-party models, strip the provider prefix before sending to API
   const parsed = parseThirdPartyModel(model)
   if (parsed) {

package/src/utils/model/modelCapabilities.ts

@@ -1,3 +1,4 @@
+// @ts-nocheck
 import { readFileSync } from 'fs'
 import { mkdir, writeFile } from 'fs/promises'
 import isEqual from 'lodash-es/isEqual.js'

package/src/utils/model/modelOptions.ts

@@ -1,8 +1,8 @@
+// @ts-nocheck
 // biome-ignore-all assist/source/organizeImports: ANT-ONLY import markers must not be reordered
 import { getInitialMainLoopModel } from '../../bootstrap/state.js'
 import {
   getAnthropicApiKey,
-  getClaudeAIOAuthTokens,
   isClaudeAISubscriber,
   isMaxSubscriber,
   isTeamPremiumSubscriber,
@@ -35,6 +35,7 @@ import {
 import { has1mContext } from '../context.js'
 import { getGlobalConfig } from '../config.js'
 import { getAllThirdPartyModels } from './thirdPartyProviders.js'
+import { parseProfileQualifiedModel } from './platformProfiles.js'
 
 // @[MODEL LAUNCH]: Update all the available and default model option strings below.
 
@@ -45,6 +46,36 @@ export type ModelOption = {
   descriptionForModel?: string
 }
 
+function toThirdPartyOption(tpModel: {
+  qualifiedId: string
+  displayName: string
+  providerName: string
+  modelId: string
+}): ModelOption {
+  const parsed = parseProfileQualifiedModel(tpModel.qualifiedId)
+  if (parsed) {
+    return {
+      value: tpModel.qualifiedId,
+      label: `${parsed.profileId}:${parsed.modelId}`,
+      description: `${tpModel.displayName} · profile ${parsed.profileId}`,
+      descriptionForModel: `${tpModel.displayName} via profile ${parsed.profileId}`,
+    }
+  }
+
+  return {
+    value: tpModel.qualifiedId,
+    label: tpModel.displayName,
+    description: `${tpModel.providerName} · ${tpModel.modelId}`,
+    descriptionForModel: `${tpModel.displayName} via ${tpModel.providerName}`,
+  }
+}
+
+function pushUniqueOption(options: ModelOption[], option: ModelOption): void {
+  if (!options.some(existing => existing.value === option.value)) {
+    options.push(option)
+  }
+}
+
 export function getDefaultOptionForUser(fastMode = false): ModelOption {
   if (process.env.USER_TYPE === 'ant') {
     const currentModel = renderDefaultModelSetting(
@@ -275,10 +306,8 @@ 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.
-  // mumucc: 也检查 OAuth 登录态（claude.ai /login），不只看 API key
   const hasAnthropicAuth =
     !!getAnthropicApiKey() ||
-    !!getClaudeAIOAuthTokens()?.accessToken ||
     !!process.env.CLAUDE_CODE_USE_BEDROCK ||
     !!process.env.CLAUDE_CODE_USE_VERTEX ||
     !!process.env.CLAUDE_CODE_USE_FOUNDRY
@@ -476,18 +505,43 @@ function getKnownModelOption(model: string): ModelOption | null {
 }
 
 export function getModelOptions(fastMode = false): ModelOption[] {
-  const options = getModelOptionsBase(fastMode)
-
-  // Append third-party provider models
+  let options = getModelOptionsBase(fastMode)
   const thirdPartyModels = getAllThirdPartyModels()
-  for (const tpModel of thirdPartyModels) {
-    if (!options.some(existing => existing.value === tpModel.qualifiedId)) {
-      options.push({
-        value: tpModel.qualifiedId,
-        label: tpModel.displayName,
-        description: `${tpModel.providerName} · ${tpModel.modelId}`,
-        descriptionForModel: `${tpModel.displayName} via ${tpModel.providerName}`,
-      })
+  const profileModelOptions: ModelOption[] = []
+  const otherProviderOptions: ModelOption[] = []
+
+  for (const model of thirdPartyModels) {
+    const option = toThirdPartyOption(model)
+    if (parseProfileQualifiedModel(model.qualifiedId)) {
+      profileModelOptions.push(option)
+    } else {
+      otherProviderOptions.push(option)
+    }
+  }
+
+  // When profile models are configured, prioritize them in the picker.
+  if (profileModelOptions.length > 0) {
+    const prioritizedOptions: ModelOption[] = []
+    const defaultOption = options.find(option => option.value === null)
+    const baseOptionsWithoutDefault = options.filter(option => option.value !== null)
+
+    if (defaultOption) {
+      pushUniqueOption(prioritizedOptions, defaultOption)
+    }
+    for (const option of profileModelOptions) {
+      pushUniqueOption(prioritizedOptions, option)
+    }
+    for (const option of baseOptionsWithoutDefault) {
+      pushUniqueOption(prioritizedOptions, option)
+    }
+    for (const option of otherProviderOptions) {
+      pushUniqueOption(prioritizedOptions, option)
+    }
+
+    options = prioritizedOptions
+  } else {
+    for (const option of otherProviderOptions) {
+      pushUniqueOption(options, option)
     }
   }
 

package/src/utils/model/modelStrings.ts

@@ -1,3 +1,4 @@
+// @ts-nocheck
 import {
   getModelStrings as getModelStringsState,
   setModelStrings as setModelStringsState,