Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions src-tauri/src/services/stream_check.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1393,10 +1393,11 @@ impl StreamCheckService {
config: &StreamCheckConfig,
) -> String {
match app_type {
AppType::Claude | AppType::ClaudeDesktop => {
Self::extract_env_model(provider, "ANTHROPIC_MODEL")
.unwrap_or_else(|| config.claude_model.clone())
}
AppType::Claude => Self::extract_env_model(provider, "ANTHROPIC_MODEL")
.unwrap_or_else(|| config.claude_model.clone()),
AppType::ClaudeDesktop => Self::extract_env_model(provider, "ANTHROPIC_MODEL")
.or_else(|| Self::extract_desktop_model_from_routes(provider))
.unwrap_or_else(|| config.claude_model.clone()),
AppType::Codex => {
Self::extract_codex_model(provider).unwrap_or_else(|| config.codex_model.clone())
}
Expand Down Expand Up @@ -1450,6 +1451,21 @@ impl StreamCheckService {
.filter(|value| !value.is_empty())
}

/// Extract the first upstream model name from Claude Desktop's model route mapping.
///
/// Claude Desktop presets store model info in `meta.claudeDesktopModelRoutes`
/// rather than `settings_config.env.ANTHROPIC_MODEL`, so this extra fallback is needed.
fn extract_desktop_model_from_routes(provider: &Provider) -> Option<String> {
provider
.meta
.as_ref()?
.claude_desktop_model_routes
.values()
.next()
Comment thread
Eunknight marked this conversation as resolved.
.map(|route| route.model.trim().to_string())
.filter(|m| !m.is_empty())
}

fn extract_codex_model(provider: &Provider) -> Option<String> {
let config_text = provider
.settings_config
Expand Down
8 changes: 6 additions & 2 deletions src/components/providers/ProviderActions.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ interface ProviderActionsProps {
isOmo?: boolean;
onSwitch: () => void;
onEdit: () => void;
onDuplicate: () => void;
onDuplicate?: () => void;
onTest?: () => void;
onConfigureUsage?: () => void;
onDelete: () => void;
Expand Down Expand Up @@ -278,7 +278,11 @@ export function ProviderActions({
variant="ghost"
onClick={onDuplicate}
title={t("provider.duplicate")}
className={iconButtonClass}
className={cn(
iconButtonClass,
!onDuplicate &&
"opacity-40 cursor-not-allowed text-muted-foreground",
Comment thread
Eunknight marked this conversation as resolved.
)}
>
<Copy className="h-4 w-4" />
</Button>
Expand Down
10 changes: 8 additions & 2 deletions src/components/providers/ProviderCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ interface ProviderCardProps {
onDisableOmoSlim?: () => void;
onConfigureUsage: (provider: Provider) => void;
onOpenWebsite: (url: string) => void;
onDuplicate: (provider: Provider) => void;
onDuplicate?: (provider: Provider) => void;
onTest?: (provider: Provider) => void;
onOpenTerminal?: (provider: Provider) => void;
isTesting?: boolean;
Expand Down Expand Up @@ -529,7 +529,13 @@ export function ProviderCard({
isOmo={isAnyOmo}
onSwitch={() => onSwitch(provider)}
onEdit={() => onEdit(provider)}
onDuplicate={() => onDuplicate(provider)}
onDuplicate={
appId === "claude-desktop" && isOfficial
? undefined
: onDuplicate
? () => onDuplicate(provider)
: undefined
}
onTest={
onTest &&
!isOfficial &&
Expand Down