mirror of
https://github.com/farion1231/cc-switch.git
synced 2026-07-28 00:35:32 +08:00
feat(copilot): add GitHub Copilot reverse proxy support (#930)
* refactor(toolsearch): replace binary patch with ENABLE_TOOL_SEARCH env var toggle
- Remove toolsearch_patch.rs binary patching mechanism (~590 lines)
- Delete `toolsearch_patch.rs` and `commands/toolsearch.rs`
- Remove auto-patch startup logic and command registration from lib.rs
- Remove `tool_search_bypass` field from settings.rs
- Remove frontend settings ToggleRow, useSettings hook sync logic, and API methods
- Clean up zh/en/ja i18n keys (notifications + settings)
- Add ENABLE_TOOL_SEARCH toggle to Claude provider form
- Add checkbox in CommonConfigEditor.tsx (alongside teammates toggle)
- When enabled, writes `"env": { "ENABLE_TOOL_SEARCH": "true" }`
- When disabled, removes the key; takes effect on provider switch
- Add zh/en/ja i18n key: `claudeConfig.enableToolSearch`
Claude Code 2.1.76+ natively supports this env var, eliminating the need for binary patching.
* feat(claude): add effortLevel high toggle to provider form
- Add "high-effort thinking" checkbox to Claude provider config form
- When checked, writes `"effortLevel": "high"`; when unchecked, removes the field
- Add zh/en/ja i18n translations
* refactor(claude): remove deprecated alwaysThinking toggle
- Claude Code now enables extended thinking by default; alwaysThinkingEnabled is a no-op
- Thinking control is now handled via effortLevel (added in prior commit)
- Remove state, switch case, and checkbox UI from CommonConfigEditor
- Clean up alwaysThinking i18n keys across zh/en/ja locales
* feat(opencode): add setCacheKey: true to all provider presets
- Add setCacheKey: true to options in all 33 regular presets
- Add setCacheKey: true to OPENCODE_DEFAULT_CONFIG for custom providers
- Exclude 2 OMO presets (Oh My OpenCode / Slim) which have their own config mechanism
Closes #1523
* fix(codex): resolve 1M context window toggle causing MCP editor flicker
- Add localValueRef to short-circuit duplicate CodeMirror updateListener callbacks,
breaking the React state → CodeMirror → stale onChange → React state feedback loop
- Use localValueRef.current in handleContextWindowToggle and handleCompactLimitChange
to avoid stale closure reads
- Change compact limit input from type="number" to type="text" with inputMode="numeric"
to remove unnecessary spinner buttons
* feat(codex): add 1M context window toggle utilities and i18n keys
- Add extractCodexTopLevelInt, setCodexTopLevelInt, removeCodexTopLevelField
TOML helpers in providerConfigUtils.ts
- Add i18n keys for contextWindow1M, autoCompactLimit in zh/en/ja locales
* feat(claude): collapse model mapping fields by default
- Wrap 5 model mapping inputs in a Collapsible, collapsed by default
- Auto-expand when any model value is present (including preset-filled)
- Show hint text when collapsed explaining most users need no config
- Add zh/en/ja i18n keys for toggle label and collapsed hint
- Use variant={null} to avoid ghost button hover style clash in dark mode
* feat(claude): merge advanced fields into single collapsible section
- Merge API format, auth field, and model mapping into a unified "Advanced Options" collapsible
- Extend smart-expand logic to detect non-default values across all advanced fields
- Preserve model mapping sub-header and hint with a separator line
- Update zh/en/ja i18n keys (advancedOptionsToggle, advancedOptionsHint, modelMappingLabel, modelMappingHint)
* feat(copilot): add GitHub Copilot reverse proxy support
Add GitHub Copilot as a Claude provider variant with OAuth device code
authentication and Anthropic ↔ OpenAI format transformation.
Backend:
- Add CopilotAuthManager for GitHub OAuth device code flow
- Implement Copilot token auto-refresh (60s before expiry)
- Persist GitHub token to ~/.cc-switch/copilot_auth.json
- Add ProviderType::GitHubCopilot and AuthStrategy::GitHubCopilot
- Modify forwarder to use /chat/completions for Copilot
- Add Copilot-specific headers (Editor-Version, Editor-Plugin-Version)
Frontend:
- Add CopilotAuthSection component for OAuth UI
- Add useCopilotAuth hook for OAuth state management
- Auto-copy user code to clipboard and open browser
- Use 8-second polling interval to avoid GitHub rate limits
- Skip API Key validation for Copilot providers
- Add GitHub Copilot preset with claude-sonnet-4 model
Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
* fix(copilot): remove is_expired() calls from tests
Remove references to deleted is_expired() method in test code.
Only is_expiring_soon() is needed for token refresh logic.
Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
* feat(copilot): add real-time model listing from Copilot API
- Add fetch_models() to CopilotAuthManager calling GET /models endpoint
- Add copilot_get_models Tauri command
- Add copilotGetModels() frontend API wrapper
- Modify ClaudeFormFields to show model dropdown for Copilot providers
- Fetches available models on component mount when isCopilotPreset
- Groups models by vendor (Anthropic, OpenAI, Google, etc.)
- Input + dropdown button combo allows both manual entry and selection
- Non-Copilot providers keep original plain Input behavior
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
* feat(copilot): add usage query integration
- Add Copilot usage API integration (fetch_usage method)
- Add copilot_get_usage Tauri command
- Add GitHub Copilot template in usage query modal
- Unify naming: copilot → github_copilot
- Add constants management (TEMPLATE_TYPES, PROVIDER_TYPES)
- Improve error handling with detailed error messages
- Add database migration (v5 → v6) for template type update
- Add i18n translations (zh, en, ja)
- Improve type safety with TemplateType
- Apply code formatting (cargo fmt, prettier)
* 修复github 登录和注销问题 ，模型选择问题
* feat(copilot): add multi-account support for GitHub Copilot
- Add multi-account storage structure with v1 to v2 migration
- Add per-account token caching and auto-refresh
- Add new Tauri commands for account management
- Integrate account selection in Proxy forwarder
- Add account selection UI in CopilotAuthSection
- Save githubAccountId to ProviderMeta
- Add i18n translations for multi-account features (zh/en/ja)
* 修复用量查询Reset字段出现多余字符
* refactor(auth-binding): introduce generic provider auth binding primitives
- add shared authBinding types in Rust and TypeScript while keeping githubAccountId as a compatibility field\n- resolve Copilot token, models, and usage through provider-bound account lookup instead of only the implicit default account\n- fix the Unix build regression in settings.rs by restoring std::io::Write for write_all()\n- remove the accidental .github ignore entry and drop leftover Copilot form debug logs\n- keep the first migration step non-breaking by writing both authBinding and the legacy githubAccountId field from the form
* refactor(auth-service): add managed auth command surface and explicit default account state
- introduce generic managed auth commands and frontend auth API wrappers for provider-scoped login, status, account listing, removal, logout, and default-account selection\n- store an explicit Copilot default_account_id instead of relying on HashMap iteration order, and use it consistently for fallback token/model/usage resolution\n- sort managed accounts deterministically and surface default-account state to the UI\n- refactor the Copilot form hook to wrap a generic useManagedAuth implementation while preserving the existing component contract\n- add default-account controls to the Copilot auth section and extend Copilot auth status serialization/tests for the new state
* feat(auth-center): add a dedicated settings entrypoint for managed OAuth accounts
- add an Auth Center tab to Settings so managed OAuth accounts are no longer hidden inside individual provider forms\n- introduce a first AuthCenterPanel that hosts GitHub Copilot account management as the initial managed auth provider\n- keep the provider form experience intact while establishing a global account-management surface for future providers such as OpenAI\n- validate that the new settings tab works cleanly with the generic managed auth hook and existing Copilot account controls
* feat(add-provider): expose managed OAuth sources alongside universal providers
- add an OAuth tab to the Add Provider flow so managed auth sources sit beside app-specific and universal providers\n- reuse the new Auth Center panel inside the dialog, keeping account management discoverable during provider creation\n- make the dialog footer adapt to the OAuth tab so account setup does not pretend to create a provider directly\n- align the add-provider UX with the new architecture where OAuth accounts are global assets and providers bind to them later
* fix(auth-reliability): harden managed auth persistence and refresh behavior
- replace direct Copilot auth store writes with private temp-file writes and atomic rename semantics, and document the local token storage limitation\n- add per-account refresh locks plus a double-check path so concurrent requests do not stampede GitHub token refresh\n- surface legacy migration failures through auth status, expose them in the UI, and add translated copy for the new account-state labels\n- stop writing the legacy githubAccountId field from the provider form while keeping compatibility reads in place\n- add logout error recovery and Copilot model-load toasts so auth failures are no longer silently swallowed
* refactor(copilot-detection): prefer provider type before URL fallbacks
- update forwarder endpoint rewriting to treat providerType as the primary GitHub Copilot signal\n- keep githubcopilot.com string matching only as a compatibility fallback for older provider records without providerType\n- reduce one more path where Copilot behavior depended purely on URL heuristics
* fix(copilot-auth): add cancel button to error state in CopilotAuthSection
- 错误状态下仅有"重试"按钮，用户无法退出（如不可恢复的 403 未订阅错误）
- 新增"取消"按钮，复用已有的 cancelAuth 逻辑重置为 idle 状态
* 修复打包后github账号头像显示异常
* 修复github copilot 来源的模型测试报错
* feat(copilot-preset): add default model presets for GitHub Copilot
- 补充 Copilot 预设的默认模型配置，用户选完预设即可直接使用
- ANTHROPIC_MODEL: claude-opus-4.6
- ANTHROPIC_DEFAULT_HAIKU_MODEL: claude-haiku-4.5
- ANTHROPIC_DEFAULT_SONNET_MODEL: claude-sonnet-4.6
- ANTHROPIC_DEFAULT_OPUS_MODEL: claude-opus-4.6
---------
Co-authored-by: Jason <farion1231@gmail.com>
Co-authored-by: 周梦泽 <mengze.zhou@dafeng-tech.com>
Co-authored-by: Claude Haiku 4.5 <noreply@anthropic.com>
This commit is contained in:
Zhou Mengze
+180
-105
@@ -5,7 +5,9 @@ import { useTranslation } from "react-i18next";
|
||||
import { useQueryClient } from "@tanstack/react-query";
|
||||
import { Provider, UsageScript, UsageData } from "@/types";
|
||||
import { usageApi, settingsApi, type AppId } from "@/lib/api";
|
||||
import { copilotGetUsage, copilotGetUsageForAccount } from "@/lib/api/copilot";
|
||||
import { useSettingsQuery } from "@/lib/query";
|
||||
import { resolveManagedAccountId } from "@/lib/authBinding";
|
||||
import { extractCodexBaseUrl } from "@/utils/providerConfigUtils";
|
||||
import JsonEditor from "./JsonEditor";
|
||||
import * as prettier from "prettier/standalone";
|
||||
@@ -18,6 +20,7 @@ import { Switch } from "@/components/ui/switch";
|
||||
import { FullScreenPanel } from "@/components/common/FullScreenPanel";
|
||||
import { ConfirmDialog } from "@/components/ConfirmDialog";
|
||||
import { cn } from "@/lib/utils";
|
||||
import { TEMPLATE_TYPES, PROVIDER_TYPES } from "@/config/constants";
|
||||
|
||||
interface UsageScriptModalProps {
|
||||
provider: Provider;
|
||||
@@ -27,18 +30,11 @@ interface UsageScriptModalProps {
|
||||
onSave: (script: UsageScript) => void;
|
||||
}
|
||||
|
||||
// 预设模板键名（用于国际化）
|
||||
const TEMPLATE_KEYS = {
|
||||
CUSTOM: "custom",
|
||||
GENERAL: "general",
|
||||
NEW_API: "newapi",
|
||||
} as const;
|
||||
|
||||
// 生成预设模板的函数（支持国际化）
|
||||
const generatePresetTemplates = (
|
||||
t: (key: string) => string,
|
||||
): Record<string, string> => ({
|
||||
[TEMPLATE_KEYS.CUSTOM]: `({
|
||||
[TEMPLATE_TYPES.CUSTOM]: `({
|
||||
request: {
|
||||
url: "",
|
||||
method: "GET",
|
||||
@@ -52,7 +48,7 @@ const generatePresetTemplates = (
|
||||
}
|
||||
})`,
|
||||
|
||||
[TEMPLATE_KEYS.GENERAL]: `({
|
||||
[TEMPLATE_TYPES.GENERAL]: `({
|
||||
request: {
|
||||
url: "{{baseUrl}}/user/balance",
|
||||
method: "GET",
|
||||
@@ -70,7 +66,7 @@ const generatePresetTemplates = (
|
||||
}
|
||||
})`,
|
||||
|
||||
[TEMPLATE_KEYS.NEW_API]: `({
|
||||
[TEMPLATE_TYPES.NEW_API]: `({
|
||||
request: {
|
||||
url: "{{baseUrl}}/api/user/self",
|
||||
method: "GET",
|
||||
@@ -96,13 +92,17 @@ const generatePresetTemplates = (
|
||||
};
|
||||
},
|
||||
})`,
|
||||
|
||||
// GitHub Copilot 模板不需要脚本，使用专用 API
|
||||
[TEMPLATE_TYPES.GITHUB_COPILOT]: "",
|
||||
});
|
||||
|
||||
// 模板名称国际化键映射
|
||||
const TEMPLATE_NAME_KEYS: Record<string, string> = {
|
||||
[TEMPLATE_KEYS.CUSTOM]: "usageScript.templateCustom",
|
||||
[TEMPLATE_KEYS.GENERAL]: "usageScript.templateGeneral",
|
||||
[TEMPLATE_KEYS.NEW_API]: "usageScript.templateNewAPI",
|
||||
[TEMPLATE_TYPES.CUSTOM]: "usageScript.templateCustom",
|
||||
[TEMPLATE_TYPES.GENERAL]: "usageScript.templateGeneral",
|
||||
[TEMPLATE_TYPES.NEW_API]: "usageScript.templateNewAPI",
|
||||
[TEMPLATE_TYPES.GITHUB_COPILOT]: "usageScript.templateCopilot",
|
||||
};
|
||||
|
||||
const UsageScriptModal: React.FC<UsageScriptModalProps> = ({
|
||||
@@ -167,7 +167,7 @@ const UsageScriptModal: React.FC<UsageScriptModalProps> = ({
|
||||
const defaultScript = {
|
||||
enabled: false,
|
||||
language: "javascript" as const,
|
||||
code: PRESET_TEMPLATES[TEMPLATE_KEYS.GENERAL],
|
||||
code: PRESET_TEMPLATES[TEMPLATE_TYPES.GENERAL],
|
||||
timeout: 10,
|
||||
};
|
||||
|
||||
@@ -230,6 +230,10 @@ const UsageScriptModal: React.FC<UsageScriptModalProps> = ({
|
||||
const [selectedTemplate, setSelectedTemplate] = useState<string | null>(
|
||||
() => {
|
||||
const existingScript = provider.meta?.usage_script;
|
||||
// Copilot 供应商默认使用 Copilot 模板
|
||||
if (provider.meta?.providerType === PROVIDER_TYPES.GITHUB_COPILOT) {
|
||||
return TEMPLATE_TYPES.GITHUB_COPILOT;
|
||||
}
|
||||
// 优先使用保存的 templateType
|
||||
if (existingScript?.templateType) {
|
||||
return existingScript.templateType;
|
||||
@@ -237,14 +241,14 @@ const UsageScriptModal: React.FC<UsageScriptModalProps> = ({
|
||||
// 向后兼容：根据字段推断模板类型
|
||||
// 检测 NEW_API 模板（有 accessToken 或 userId）
|
||||
if (existingScript?.accessToken || existingScript?.userId) {
|
||||
return TEMPLATE_KEYS.NEW_API;
|
||||
return TEMPLATE_TYPES.NEW_API;
|
||||
}
|
||||
// 检测 GENERAL 模板（有 apiKey 或 baseUrl）
|
||||
if (existingScript?.apiKey || existingScript?.baseUrl) {
|
||||
return TEMPLATE_KEYS.GENERAL;
|
||||
return TEMPLATE_TYPES.GENERAL;
|
||||
}
|
||||
// 新配置或无凭证：默认使用 GENERAL（与默认代码模板一致）
|
||||
return TEMPLATE_KEYS.GENERAL;
|
||||
return TEMPLATE_TYPES.GENERAL;
|
||||
},
|
||||
);
|
||||
|
||||
@@ -273,13 +277,16 @@ const UsageScriptModal: React.FC<UsageScriptModalProps> = ({
|
||||
};
|
||||
|
||||
const handleSave = () => {
|
||||
if (script.enabled && !script.code.trim()) {
|
||||
toast.error(t("usageScript.scriptEmpty"));
|
||||
return;
|
||||
}
|
||||
if (script.enabled && !script.code.includes("return")) {
|
||||
toast.error(t("usageScript.mustHaveReturn"), { duration: 5000 });
|
||||
return;
|
||||
// Copilot 模板不需要脚本验证
|
||||
if (selectedTemplate !== TEMPLATE_TYPES.GITHUB_COPILOT) {
|
||||
if (script.enabled && !script.code.trim()) {
|
||||
toast.error(t("usageScript.scriptEmpty"));
|
||||
return;
|
||||
}
|
||||
if (script.enabled && !script.code.includes("return")) {
|
||||
toast.error(t("usageScript.mustHaveReturn"), { duration: 5000 });
|
||||
return;
|
||||
}
|
||||
}
|
||||
// 保存时记录当前选择的模板类型
|
||||
const scriptWithTemplate = {
|
||||
@@ -288,6 +295,7 @@ const UsageScriptModal: React.FC<UsageScriptModalProps> = ({
|
||||
| "custom"
|
||||
| "general"
|
||||
| "newapi"
|
||||
| "github_copilot"
|
||||
| undefined,
|
||||
};
|
||||
onSave(scriptWithTemplate);
|
||||
@@ -297,6 +305,38 @@ const UsageScriptModal: React.FC<UsageScriptModalProps> = ({
|
||||
const handleTest = async () => {
|
||||
setTesting(true);
|
||||
try {
|
||||
// Copilot 模板使用专用 API
|
||||
if (selectedTemplate === TEMPLATE_TYPES.GITHUB_COPILOT) {
|
||||
const accountId = resolveManagedAccountId(
|
||||
provider.meta,
|
||||
PROVIDER_TYPES.GITHUB_COPILOT,
|
||||
);
|
||||
const usage = accountId
|
||||
? await copilotGetUsageForAccount(accountId)
|
||||
: await copilotGetUsage();
|
||||
const premium = usage.quota_snapshots.premium_interactions;
|
||||
const used = premium.entitlement - premium.remaining;
|
||||
const summary = `[${usage.copilot_plan}] ${t("usage.remaining")} ${premium.remaining}/${premium.entitlement} (${t("usageScript.resetDate")}: ${usage.quota_reset_date})`;
|
||||
toast.success(`${t("usageScript.testSuccess")}${summary}`, {
|
||||
duration: 3000,
|
||||
closeButton: true,
|
||||
});
|
||||
// 更新缓存
|
||||
queryClient.setQueryData(["usage", provider.id, appId], {
|
||||
success: true,
|
||||
data: [
|
||||
{
|
||||
planName: usage.copilot_plan,
|
||||
remaining: premium.remaining,
|
||||
total: premium.entitlement,
|
||||
used: used,
|
||||
unit: t("usageScript.premiumRequests"),
|
||||
},
|
||||
],
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
const result = await usageApi.testScript(
|
||||
provider.id,
|
||||
appId,
|
||||
@@ -370,7 +410,7 @@ const UsageScriptModal: React.FC<UsageScriptModalProps> = ({
|
||||
const handleUsePreset = (presetName: string) => {
|
||||
const preset = PRESET_TEMPLATES[presetName];
|
||||
if (preset) {
|
||||
if (presetName === TEMPLATE_KEYS.CUSTOM) {
|
||||
if (presetName === TEMPLATE_TYPES.CUSTOM) {
|
||||
// 🔧 自定义模式：用户应该在脚本中直接写完整 URL 和凭证，而不是依赖变量替换
|
||||
// 这样可以避免同源检查导致的问题
|
||||
// 如果用户想使用变量，需要手动在配置中设置 baseUrl/apiKey
|
||||
@@ -383,27 +423,37 @@ const UsageScriptModal: React.FC<UsageScriptModalProps> = ({
|
||||
accessToken: undefined,
|
||||
userId: undefined,
|
||||
});
|
||||
} else if (presetName === TEMPLATE_KEYS.GENERAL) {
|
||||
} else if (presetName === TEMPLATE_TYPES.GENERAL) {
|
||||
setScript({
|
||||
...script,
|
||||
code: preset,
|
||||
accessToken: undefined,
|
||||
userId: undefined,
|
||||
});
|
||||
} else if (presetName === TEMPLATE_KEYS.NEW_API) {
|
||||
} else if (presetName === TEMPLATE_TYPES.NEW_API) {
|
||||
setScript({
|
||||
...script,
|
||||
code: preset,
|
||||
apiKey: undefined,
|
||||
});
|
||||
} else if (presetName === TEMPLATE_TYPES.GITHUB_COPILOT) {
|
||||
// Copilot 模板不需要脚本和凭证，使用专用 API
|
||||
setScript({
|
||||
...script,
|
||||
code: "",
|
||||
apiKey: undefined,
|
||||
baseUrl: undefined,
|
||||
accessToken: undefined,
|
||||
userId: undefined,
|
||||
});
|
||||
}
|
||||
setSelectedTemplate(presetName);
|
||||
}
|
||||
};
|
||||
|
||||
const shouldShowCredentialsConfig =
|
||||
selectedTemplate === TEMPLATE_KEYS.GENERAL ||
|
||||
selectedTemplate === TEMPLATE_KEYS.NEW_API;
|
||||
selectedTemplate === TEMPLATE_TYPES.GENERAL ||
|
||||
selectedTemplate === TEMPLATE_TYPES.NEW_API;
|
||||
|
||||
const footer = (
|
||||
<>
|
||||
@@ -474,30 +524,40 @@ const UsageScriptModal: React.FC<UsageScriptModalProps> = ({
|
||||
{t("usageScript.presetTemplate")}
|
||||
</Label>
|
||||
<div className="flex gap-2 flex-wrap">
|
||||
{Object.keys(PRESET_TEMPLATES).map((name) => {
|
||||
const isSelected = selectedTemplate === name;
|
||||
return (
|
||||
<Button
|
||||
key={name}
|
||||
type="button"
|
||||
variant={isSelected ? "default" : "outline"}
|
||||
size="sm"
|
||||
className={cn(
|
||||
"rounded-lg border",
|
||||
isSelected
|
||||
? "shadow-sm"
|
||||
: "bg-background text-muted-foreground hover:bg-accent hover:text-accent-foreground",
|
||||
)}
|
||||
onClick={() => handleUsePreset(name)}
|
||||
>
|
||||
{t(TEMPLATE_NAME_KEYS[name])}
|
||||
</Button>
|
||||
);
|
||||
})}
|
||||
{Object.keys(PRESET_TEMPLATES)
|
||||
.filter((name) => {
|
||||
const isCopilotProvider =
|
||||
provider.meta?.providerType === "github_copilot";
|
||||
// Copilot 供应商只显示 copilot 模板，其他供应商不显示 copilot 模板
|
||||
if (isCopilotProvider) {
|
||||
return name === TEMPLATE_TYPES.GITHUB_COPILOT;
|
||||
}
|
||||
return name !== TEMPLATE_TYPES.GITHUB_COPILOT;
|
||||
})
|
||||
.map((name) => {
|
||||
const isSelected = selectedTemplate === name;
|
||||
return (
|
||||
<Button
|
||||
key={name}
|
||||
type="button"
|
||||
variant={isSelected ? "default" : "outline"}
|
||||
size="sm"
|
||||
className={cn(
|
||||
"rounded-lg border",
|
||||
isSelected
|
||||
? "shadow-sm"
|
||||
: "bg-background text-muted-foreground hover:bg-accent hover:text-accent-foreground",
|
||||
)}
|
||||
onClick={() => handleUsePreset(name)}
|
||||
>
|
||||
{t(TEMPLATE_NAME_KEYS[name])}
|
||||
</Button>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
|
||||
{/* 自定义模式：变量提示和具体值 */}
|
||||
{selectedTemplate === TEMPLATE_KEYS.CUSTOM && (
|
||||
{selectedTemplate === TEMPLATE_TYPES.CUSTOM && (
|
||||
<div className="space-y-2 border-t border-white/10 pt-3">
|
||||
<h4 className="text-sm font-medium text-foreground">
|
||||
{t("usageScript.supportedVariables")}
|
||||
@@ -564,6 +624,15 @@ const UsageScriptModal: React.FC<UsageScriptModalProps> = ({
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* Copilot 模式：自动认证提示 */}
|
||||
{selectedTemplate === TEMPLATE_TYPES.GITHUB_COPILOT && (
|
||||
<div className="space-y-2 border-t border-white/10 pt-3">
|
||||
<p className="text-sm text-muted-foreground">
|
||||
{t("usageScript.copilotAutoAuth")}
|
||||
</p>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* 凭证配置 */}
|
||||
{shouldShowCredentialsConfig && (
|
||||
<div className="space-y-4">
|
||||
@@ -577,7 +646,7 @@ const UsageScriptModal: React.FC<UsageScriptModalProps> = ({
|
||||
</div>
|
||||
|
||||
<div className="grid gap-4 md:grid-cols-2">
|
||||
{selectedTemplate === TEMPLATE_KEYS.GENERAL && (
|
||||
{selectedTemplate === TEMPLATE_TYPES.GENERAL && (
|
||||
<>
|
||||
<div className="space-y-2">
|
||||
<Label htmlFor="usage-api-key">
|
||||
@@ -641,7 +710,7 @@ const UsageScriptModal: React.FC<UsageScriptModalProps> = ({
|
||||
</>
|
||||
)}
|
||||
|
||||
{selectedTemplate === TEMPLATE_KEYS.NEW_API && (
|
||||
{selectedTemplate === TEMPLATE_TYPES.NEW_API && (
|
||||
<>
|
||||
<div className="space-y-2">
|
||||
<Label htmlFor="usage-newapi-base-url">
|
||||
@@ -789,34 +858,39 @@ const UsageScriptModal: React.FC<UsageScriptModalProps> = ({
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* 提取器代码 */}
|
||||
<div className="space-y-4 glass rounded-xl border border-white/10 p-6">
|
||||
<div className="flex items-center justify-between">
|
||||
<Label className="text-base font-medium">
|
||||
{t("usageScript.extractorCode")}
|
||||
</Label>
|
||||
<div className="text-xs text-muted-foreground">
|
||||
{t("usageScript.extractorHint")}
|
||||
{/* 提取器代码 - Copilot 模板不需要 */}
|
||||
{selectedTemplate !== TEMPLATE_TYPES.GITHUB_COPILOT && (
|
||||
<div className="space-y-4 glass rounded-xl border border-white/10 p-6">
|
||||
<div className="flex items-center justify-between">
|
||||
<Label className="text-base font-medium">
|
||||
{t("usageScript.extractorCode")}
|
||||
</Label>
|
||||
<div className="text-xs text-muted-foreground">
|
||||
{t("usageScript.extractorHint")}
|
||||
</div>
|
||||
</div>
|
||||
<JsonEditor
|
||||
id="usage-code"
|
||||
value={script.code || ""}
|
||||
onChange={(value) => setScript({ ...script, code: value })}
|
||||
height={480}
|
||||
language="javascript"
|
||||
showMinimap={false}
|
||||
/>
|
||||
</div>
|
||||
<JsonEditor
|
||||
id="usage-code"
|
||||
value={script.code || ""}
|
||||
onChange={(value) => setScript({ ...script, code: value })}
|
||||
height={480}
|
||||
language="javascript"
|
||||
showMinimap={false}
|
||||
/>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* 帮助信息 */}
|
||||
<div className="glass rounded-xl border border-white/10 p-6 text-sm text-foreground/90">
|
||||
<h4 className="font-medium mb-2">{t("usageScript.scriptHelp")}</h4>
|
||||
<div className="space-y-3 text-xs">
|
||||
<div>
|
||||
<strong>{t("usageScript.configFormat")}</strong>
|
||||
<pre className="mt-1 p-2 bg-black/20 text-foreground rounded border border-white/10 text-[10px] overflow-x-auto">
|
||||
{`({
|
||||
{/* 帮助信息 - Copilot 模板不需要 */}
|
||||
{selectedTemplate !== TEMPLATE_TYPES.GITHUB_COPILOT && (
|
||||
<div className="glass rounded-xl border border-white/10 p-6 text-sm text-foreground/90">
|
||||
<h4 className="font-medium mb-2">
|
||||
{t("usageScript.scriptHelp")}
|
||||
</h4>
|
||||
<div className="space-y-3 text-xs">
|
||||
<div>
|
||||
<strong>{t("usageScript.configFormat")}</strong>
|
||||
<pre className="mt-1 p-2 bg-black/20 text-foreground rounded border border-white/10 text-[10px] overflow-x-auto">
|
||||
{`({
|
||||
request: {
|
||||
url: "{{baseUrl}}/api/usage",
|
||||
method: "POST",
|
||||
@@ -833,38 +907,39 @@ const UsageScriptModal: React.FC<UsageScriptModalProps> = ({
|
||||
};
|
||||
}
|
||||
})`}
|
||||
</pre>
|
||||
</div>
|
||||
</pre>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<strong>{t("usageScript.extractorFormat")}</strong>
|
||||
<ul className="mt-1 space-y-0.5 ml-2">
|
||||
<li>{t("usageScript.fieldIsValid")}</li>
|
||||
<li>{t("usageScript.fieldInvalidMessage")}</li>
|
||||
<li>{t("usageScript.fieldRemaining")}</li>
|
||||
<li>{t("usageScript.fieldUnit")}</li>
|
||||
<li>{t("usageScript.fieldPlanName")}</li>
|
||||
<li>{t("usageScript.fieldTotal")}</li>
|
||||
<li>{t("usageScript.fieldUsed")}</li>
|
||||
<li>{t("usageScript.fieldExtra")}</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div>
|
||||
<strong>{t("usageScript.extractorFormat")}</strong>
|
||||
<ul className="mt-1 space-y-0.5 ml-2">
|
||||
<li>{t("usageScript.fieldIsValid")}</li>
|
||||
<li>{t("usageScript.fieldInvalidMessage")}</li>
|
||||
<li>{t("usageScript.fieldRemaining")}</li>
|
||||
<li>{t("usageScript.fieldUnit")}</li>
|
||||
<li>{t("usageScript.fieldPlanName")}</li>
|
||||
<li>{t("usageScript.fieldTotal")}</li>
|
||||
<li>{t("usageScript.fieldUsed")}</li>
|
||||
<li>{t("usageScript.fieldExtra")}</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div className="text-muted-foreground">
|
||||
<strong>{t("usageScript.tips")}</strong>
|
||||
<ul className="mt-1 space-y-0.5 ml-2">
|
||||
<li>
|
||||
{t("usageScript.tip1", {
|
||||
apiKey: "{{apiKey}}",
|
||||
baseUrl: "{{baseUrl}}",
|
||||
})}
|
||||
</li>
|
||||
<li>{t("usageScript.tip2")}</li>
|
||||
<li>{t("usageScript.tip3")}</li>
|
||||
</ul>
|
||||
<div className="text-muted-foreground">
|
||||
<strong>{t("usageScript.tips")}</strong>
|
||||
<ul className="mt-1 space-y-0.5 ml-2">
|
||||
<li>
|
||||
{t("usageScript.tip1", {
|
||||
apiKey: "{{apiKey}}",
|
||||
baseUrl: "{{baseUrl}}",
|
||||
})}
|
||||
</li>
|
||||
<li>{t("usageScript.tip2")}</li>
|
||||
<li>{t("usageScript.tip3")}</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
|
||||
|
||||
@@ -14,6 +14,7 @@ import {
|
||||
} from "@/components/providers/forms/ProviderForm";
|
||||
import { UniversalProviderFormModal } from "@/components/universal/UniversalProviderFormModal";
|
||||
import { UniversalProviderPanel } from "@/components/universal";
|
||||
import { AuthCenterPanel } from "@/components/settings/AuthCenterPanel";
|
||||
import { providerPresets } from "@/config/claudeProviderPresets";
|
||||
import { codexProviderPresets } from "@/config/codexProviderPresets";
|
||||
import { geminiProviderPresets } from "@/config/geminiProviderPresets";
|
||||
@@ -42,9 +43,9 @@ export function AddProviderDialog({
|
||||
const { t } = useTranslation();
|
||||
// OpenCode and OpenClaw don't support universal providers
|
||||
const showUniversalTab = appId !== "opencode" && appId !== "openclaw";
|
||||
const [activeTab, setActiveTab] = useState<"app-specific" | "universal">(
|
||||
"app-specific",
|
||||
);
|
||||
const [activeTab, setActiveTab] = useState<
|
||||
"app-specific" | "universal" | "oauth"
|
||||
>("app-specific");
|
||||
const [universalFormOpen, setUniversalFormOpen] = useState(false);
|
||||
const [selectedUniversalPreset, setSelectedUniversalPreset] =
|
||||
useState<UniversalProviderPreset | null>(null);
|
||||
@@ -255,6 +256,14 @@ export function AddProviderDialog({
|
||||
{t("common.add")}
|
||||
</Button>
|
||||
</>
|
||||
) : activeTab === "oauth" ? (
|
||||
<Button
|
||||
variant="outline"
|
||||
onClick={() => onOpenChange(false)}
|
||||
className="border-border/20 hover:bg-accent hover:text-accent-foreground"
|
||||
>
|
||||
{t("common.close", { defaultValue: "关闭" })}
|
||||
</Button>
|
||||
) : (
|
||||
<>
|
||||
<Button
|
||||
@@ -284,15 +293,20 @@ export function AddProviderDialog({
|
||||
{showUniversalTab ? (
|
||||
<Tabs
|
||||
value={activeTab}
|
||||
onValueChange={(v) => setActiveTab(v as "app-specific" | "universal")}
|
||||
onValueChange={(v) =>
|
||||
setActiveTab(v as "app-specific" | "universal" | "oauth")
|
||||
}
|
||||
>
|
||||
<TabsList className="grid w-full grid-cols-2 mb-6">
|
||||
<TabsList className="grid w-full grid-cols-3 mb-6">
|
||||
<TabsTrigger value="app-specific">
|
||||
{t(`apps.${appId}`)} {t("provider.tabProvider")}
|
||||
</TabsTrigger>
|
||||
<TabsTrigger value="universal">
|
||||
{t("provider.tabUniversal")}
|
||||
</TabsTrigger>
|
||||
<TabsTrigger value="oauth">
|
||||
{t("provider.tabOAuth", { defaultValue: "OAuth 认证源" })}
|
||||
</TabsTrigger>
|
||||
</TabsList>
|
||||
|
||||
<TabsContent value="app-specific" className="mt-0">
|
||||
@@ -309,6 +323,10 @@ export function AddProviderDialog({
|
||||
<TabsContent value="universal" className="mt-0">
|
||||
<UniversalProviderPanel />
|
||||
</TabsContent>
|
||||
|
||||
<TabsContent value="oauth" className="mt-0">
|
||||
<AuthCenterPanel />
|
||||
</TabsContent>
|
||||
</Tabs>
|
||||
) : (
|
||||
// OpenCode/OpenClaw: directly show form without tabs
|
||||
|
||||
@@ -199,14 +199,14 @@ export function ProviderCard({
|
||||
// - 故障转移模式：代理实际使用的供应商（activeProviderId）
|
||||
// - 普通模式：isCurrent
|
||||
const isActiveProvider = isAnyOmo
|
||||
? isCurrent
|
||||
: appId === "openclaw"
|
||||
? Boolean(isDefaultModel)
|
||||
: appId === "opencode"
|
||||
? false
|
||||
: isAutoFailoverEnabled
|
||||
? activeProviderId === provider.id
|
||||
: isCurrent;
|
||||
? isCurrent
|
||||
: appId === "openclaw"
|
||||
? Boolean(isDefaultModel)
|
||||
: appId === "opencode"
|
||||
? false
|
||||
: isAutoFailoverEnabled
|
||||
? activeProviderId === provider.id
|
||||
: isCurrent;
|
||||
|
||||
const shouldUseGreen = !isAnyOmo && isProxyTakeover && isActiveProvider;
|
||||
const shouldUseBlue =
|
||||
|
||||
@@ -1,4 +1,12 @@
|
||||
import { useEffect, useState } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import {
|
||||
Collapsible,
|
||||
CollapsibleContent,
|
||||
CollapsibleTrigger,
|
||||
} from "@/components/ui/collapsible";
|
||||
import { toast } from "sonner";
|
||||
import { FormLabel } from "@/components/ui/form";
|
||||
import { Input } from "@/components/ui/input";
|
||||
import {
|
||||
@@ -8,8 +16,23 @@ import {
|
||||
SelectTrigger,
|
||||
SelectValue,
|
||||
} from "@/components/ui/select";
|
||||
import {
|
||||
DropdownMenu,
|
||||
DropdownMenuContent,
|
||||
DropdownMenuItem,
|
||||
DropdownMenuLabel,
|
||||
DropdownMenuSeparator,
|
||||
DropdownMenuTrigger,
|
||||
} from "@/components/ui/dropdown-menu";
|
||||
import { ChevronDown, ChevronRight, Loader2 } from "lucide-react";
|
||||
import EndpointSpeedTest from "./EndpointSpeedTest";
|
||||
import { ApiKeySection, EndpointField } from "./shared";
|
||||
import { CopilotAuthSection } from "./CopilotAuthSection";
|
||||
import {
|
||||
copilotGetModels,
|
||||
copilotGetModelsForAccount,
|
||||
} from "@/lib/api/copilot";
|
||||
import type { CopilotModel } from "@/lib/api/copilot";
|
||||
import type {
|
||||
ProviderCategory,
|
||||
ClaudeApiFormat,
|
||||
@@ -33,6 +56,15 @@ interface ClaudeFormFieldsProps {
|
||||
isPartner?: boolean;
|
||||
partnerPromotionKey?: string;
|
||||
|
||||
// GitHub Copilot OAuth
|
||||
isCopilotPreset?: boolean;
|
||||
usesOAuth?: boolean;
|
||||
isCopilotAuthenticated?: boolean;
|
||||
/** 当前选中的 GitHub 账号 ID（多账号支持） */
|
||||
selectedGitHubAccountId?: string | null;
|
||||
/** GitHub 账号选择回调（多账号支持） */
|
||||
onGitHubAccountSelect?: (accountId: string | null) => void;
|
||||
|
||||
// Template Values
|
||||
templateValueEntries: Array<[string, TemplateValueConfig]>;
|
||||
templateValues: Record<string, TemplateValueConfig>;
|
||||
@@ -88,6 +120,11 @@ export function ClaudeFormFields({
|
||||
websiteUrl,
|
||||
isPartner,
|
||||
partnerPromotionKey,
|
||||
isCopilotPreset,
|
||||
usesOAuth,
|
||||
isCopilotAuthenticated,
|
||||
selectedGitHubAccountId,
|
||||
onGitHubAccountSelect,
|
||||
templateValueEntries,
|
||||
templateValues,
|
||||
templatePresetName,
|
||||
@@ -114,11 +151,172 @@ export function ClaudeFormFields({
|
||||
onApiKeyFieldChange,
|
||||
}: ClaudeFormFieldsProps) {
|
||||
const { t } = useTranslation();
|
||||
const hasAnyAdvancedValue = !!(
|
||||
claudeModel ||
|
||||
reasoningModel ||
|
||||
defaultHaikuModel ||
|
||||
defaultSonnetModel ||
|
||||
defaultOpusModel ||
|
||||
apiFormat !== "anthropic" ||
|
||||
apiKeyField !== "ANTHROPIC_AUTH_TOKEN"
|
||||
);
|
||||
const [advancedExpanded, setAdvancedExpanded] =
|
||||
useState(hasAnyAdvancedValue);
|
||||
|
||||
// 预设填充高级值后自动展开（仅从折叠→展开，不会自动折叠）
|
||||
useEffect(() => {
|
||||
if (hasAnyAdvancedValue) {
|
||||
setAdvancedExpanded(true);
|
||||
}
|
||||
}, [hasAnyAdvancedValue]);
|
||||
|
||||
// Copilot 可用模型列表
|
||||
const [copilotModels, setCopilotModels] = useState<CopilotModel[]>([]);
|
||||
const [modelsLoading, setModelsLoading] = useState(false);
|
||||
|
||||
// 当 Copilot 预设且已认证时，加载可用模型
|
||||
useEffect(() => {
|
||||
// 如果不是 Copilot 预设或未认证，清空模型列表
|
||||
if (!isCopilotPreset || !isCopilotAuthenticated) {
|
||||
setCopilotModels([]);
|
||||
setModelsLoading(false);
|
||||
return;
|
||||
}
|
||||
|
||||
let cancelled = false;
|
||||
setModelsLoading(true);
|
||||
const fetchModels = selectedGitHubAccountId
|
||||
? copilotGetModelsForAccount(selectedGitHubAccountId)
|
||||
: copilotGetModels();
|
||||
|
||||
fetchModels
|
||||
.then((models) => {
|
||||
if (!cancelled) setCopilotModels(models);
|
||||
})
|
||||
.catch((err) => {
|
||||
console.warn("[Copilot] Failed to fetch models:", err);
|
||||
if (!cancelled) {
|
||||
toast.error(
|
||||
t("copilot.loadModelsFailed", {
|
||||
defaultValue: "加载 Copilot 模型列表失败",
|
||||
}),
|
||||
);
|
||||
}
|
||||
})
|
||||
.finally(() => {
|
||||
if (!cancelled) setModelsLoading(false);
|
||||
});
|
||||
return () => {
|
||||
cancelled = true;
|
||||
};
|
||||
}, [isCopilotPreset, isCopilotAuthenticated, selectedGitHubAccountId]);
|
||||
|
||||
// 模型输入框：支持手动输入 + 下拉选择
|
||||
const renderModelInput = (
|
||||
id: string,
|
||||
value: string,
|
||||
field: ClaudeFormFieldsProps["onModelChange"] extends (
|
||||
f: infer F,
|
||||
v: string,
|
||||
) => void
|
||||
? F
|
||||
: never,
|
||||
placeholder?: string,
|
||||
) => {
|
||||
if (isCopilotPreset && copilotModels.length > 0) {
|
||||
// 按 vendor 分组
|
||||
const grouped: Record<string, CopilotModel[]> = {};
|
||||
for (const model of copilotModels) {
|
||||
const vendor = model.vendor || "Other";
|
||||
if (!grouped[vendor]) grouped[vendor] = [];
|
||||
grouped[vendor].push(model);
|
||||
}
|
||||
const vendors = Object.keys(grouped).sort();
|
||||
|
||||
return (
|
||||
<div className="flex gap-1">
|
||||
<Input
|
||||
id={id}
|
||||
type="text"
|
||||
value={value}
|
||||
onChange={(e) => onModelChange(field, e.target.value)}
|
||||
placeholder={placeholder}
|
||||
autoComplete="off"
|
||||
className="flex-1"
|
||||
/>
|
||||
<DropdownMenu>
|
||||
<DropdownMenuTrigger asChild>
|
||||
<Button variant="outline" size="icon" className="shrink-0">
|
||||
<ChevronDown className="h-4 w-4" />
|
||||
</Button>
|
||||
</DropdownMenuTrigger>
|
||||
<DropdownMenuContent
|
||||
align="end"
|
||||
className="max-h-64 overflow-y-auto z-[200]"
|
||||
>
|
||||
{vendors.map((vendor, vi) => (
|
||||
<div key={vendor}>
|
||||
{vi > 0 && <DropdownMenuSeparator />}
|
||||
<DropdownMenuLabel>{vendor}</DropdownMenuLabel>
|
||||
{grouped[vendor].map((model) => (
|
||||
<DropdownMenuItem
|
||||
key={model.id}
|
||||
onSelect={() => onModelChange(field, model.id)}
|
||||
>
|
||||
{model.id}
|
||||
</DropdownMenuItem>
|
||||
))}
|
||||
</div>
|
||||
))}
|
||||
</DropdownMenuContent>
|
||||
</DropdownMenu>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
if (isCopilotPreset && modelsLoading) {
|
||||
return (
|
||||
<div className="flex gap-1">
|
||||
<Input
|
||||
id={id}
|
||||
type="text"
|
||||
value={value}
|
||||
onChange={(e) => onModelChange(field, e.target.value)}
|
||||
placeholder={placeholder}
|
||||
autoComplete="off"
|
||||
className="flex-1"
|
||||
/>
|
||||
<Button variant="outline" size="icon" className="shrink-0" disabled>
|
||||
<Loader2 className="h-4 w-4 animate-spin" />
|
||||
</Button>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
return (
|
||||
<Input
|
||||
id={id}
|
||||
type="text"
|
||||
value={value}
|
||||
onChange={(e) => onModelChange(field, e.target.value)}
|
||||
placeholder={placeholder}
|
||||
autoComplete="off"
|
||||
/>
|
||||
);
|
||||
};
|
||||
|
||||
return (
|
||||
<>
|
||||
{/* API Key 输入框 */}
|
||||
{shouldShowApiKey && (
|
||||
{/* GitHub Copilot OAuth 认证 */}
|
||||
{isCopilotPreset && (
|
||||
<CopilotAuthSection
|
||||
selectedAccountId={selectedGitHubAccountId}
|
||||
onAccountSelect={onGitHubAccountSelect}
|
||||
/>
|
||||
)}
|
||||
|
||||
{/* API Key 输入框（非 OAuth 预设时显示） */}
|
||||
{shouldShowApiKey && !usesOAuth && (
|
||||
<ApiKeySection
|
||||
value={apiKey}
|
||||
onChange={onApiKeyChange}
|
||||
@@ -200,188 +398,185 @@ export function ClaudeFormFields({
|
||||
/>
|
||||
)}
|
||||
|
||||
{/* API 格式选择（仅非官方、非云服务商显示） */}
|
||||
{shouldShowModelSelector && category !== "cloud_provider" && (
|
||||
<div className="space-y-2">
|
||||
<FormLabel htmlFor="apiFormat">
|
||||
{t("providerForm.apiFormat", { defaultValue: "API 格式" })}
|
||||
</FormLabel>
|
||||
<Select value={apiFormat} onValueChange={onApiFormatChange}>
|
||||
<SelectTrigger id="apiFormat" className="w-full">
|
||||
<SelectValue />
|
||||
</SelectTrigger>
|
||||
<SelectContent>
|
||||
<SelectItem value="anthropic">
|
||||
{t("providerForm.apiFormatAnthropic", {
|
||||
defaultValue: "Anthropic Messages (原生)",
|
||||
})}
|
||||
</SelectItem>
|
||||
<SelectItem value="openai_chat">
|
||||
{t("providerForm.apiFormatOpenAIChat", {
|
||||
defaultValue: "OpenAI Chat Completions (需转换)",
|
||||
})}
|
||||
</SelectItem>
|
||||
<SelectItem value="openai_responses">
|
||||
{t("providerForm.apiFormatOpenAIResponses", {
|
||||
defaultValue: "OpenAI Responses API (需转换)",
|
||||
})}
|
||||
</SelectItem>
|
||||
</SelectContent>
|
||||
</Select>
|
||||
<p className="text-xs text-muted-foreground">
|
||||
{t("providerForm.apiFormatHint", {
|
||||
defaultValue: "选择供应商 API 的输入格式",
|
||||
})}
|
||||
</p>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* 认证字段选择器 */}
|
||||
{/* 高级选项（API 格式 + 认证字段 + 模型映射） */}
|
||||
{shouldShowModelSelector && (
|
||||
<div className="space-y-2">
|
||||
<FormLabel>
|
||||
{t("providerForm.authField", { defaultValue: "认证字段" })}
|
||||
</FormLabel>
|
||||
<Select
|
||||
value={apiKeyField}
|
||||
onValueChange={(v) => onApiKeyFieldChange(v as ClaudeApiKeyField)}
|
||||
>
|
||||
<SelectTrigger>
|
||||
<SelectValue />
|
||||
</SelectTrigger>
|
||||
<SelectContent>
|
||||
<SelectItem value="ANTHROPIC_AUTH_TOKEN">
|
||||
{t("providerForm.authFieldAuthToken", {
|
||||
defaultValue: "ANTHROPIC_AUTH_TOKEN（默认）",
|
||||
})}
|
||||
</SelectItem>
|
||||
<SelectItem value="ANTHROPIC_API_KEY">
|
||||
{t("providerForm.authFieldApiKey", {
|
||||
defaultValue: "ANTHROPIC_API_KEY",
|
||||
})}
|
||||
</SelectItem>
|
||||
</SelectContent>
|
||||
</Select>
|
||||
<p className="text-xs text-muted-foreground">
|
||||
{t("providerForm.authFieldHint", {
|
||||
defaultValue: "选择写入配置的认证环境变量名",
|
||||
})}
|
||||
</p>
|
||||
</div>
|
||||
)}
|
||||
<Collapsible
|
||||
open={advancedExpanded}
|
||||
onOpenChange={setAdvancedExpanded}
|
||||
>
|
||||
<CollapsibleTrigger asChild>
|
||||
<Button
|
||||
type="button"
|
||||
variant={null}
|
||||
size="sm"
|
||||
className="h-8 gap-1.5 px-0 text-sm font-medium text-foreground hover:opacity-70"
|
||||
>
|
||||
{advancedExpanded ? (
|
||||
<ChevronDown className="h-4 w-4" />
|
||||
) : (
|
||||
<ChevronRight className="h-4 w-4" />
|
||||
)}
|
||||
{t("providerForm.advancedOptionsToggle")}
|
||||
</Button>
|
||||
</CollapsibleTrigger>
|
||||
{!advancedExpanded && (
|
||||
<p className="text-xs text-muted-foreground mt-1 ml-1">
|
||||
{t("providerForm.advancedOptionsHint")}
|
||||
</p>
|
||||
)}
|
||||
<CollapsibleContent className="space-y-4 pt-2">
|
||||
{/* API 格式选择（仅非云服务商显示） */}
|
||||
{category !== "cloud_provider" && (
|
||||
<div className="space-y-2">
|
||||
<FormLabel htmlFor="apiFormat">
|
||||
{t("providerForm.apiFormat", { defaultValue: "API 格式" })}
|
||||
</FormLabel>
|
||||
<Select value={apiFormat} onValueChange={onApiFormatChange}>
|
||||
<SelectTrigger id="apiFormat" className="w-full">
|
||||
<SelectValue />
|
||||
</SelectTrigger>
|
||||
<SelectContent>
|
||||
<SelectItem value="anthropic">
|
||||
{t("providerForm.apiFormatAnthropic", {
|
||||
defaultValue: "Anthropic Messages (原生)",
|
||||
})}
|
||||
</SelectItem>
|
||||
<SelectItem value="openai_chat">
|
||||
{t("providerForm.apiFormatOpenAIChat", {
|
||||
defaultValue: "OpenAI Chat Completions (需转换)",
|
||||
})}
|
||||
</SelectItem>
|
||||
<SelectItem value="openai_responses">
|
||||
{t("providerForm.apiFormatOpenAIResponses", {
|
||||
defaultValue: "OpenAI Responses API (需转换)",
|
||||
})}
|
||||
</SelectItem>
|
||||
</SelectContent>
|
||||
</Select>
|
||||
<p className="text-xs text-muted-foreground">
|
||||
{t("providerForm.apiFormatHint", {
|
||||
defaultValue: "选择供应商 API 的输入格式",
|
||||
})}
|
||||
</p>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* 模型选择器 */}
|
||||
{shouldShowModelSelector && (
|
||||
<div className="space-y-3">
|
||||
<div className="grid grid-cols-1 md:grid-cols-2 gap-4">
|
||||
{/* 主模型 */}
|
||||
{/* 认证字段选择器 */}
|
||||
<div className="space-y-2">
|
||||
<FormLabel htmlFor="claudeModel">
|
||||
{t("providerForm.anthropicModel", { defaultValue: "主模型" })}
|
||||
<FormLabel>
|
||||
{t("providerForm.authField", { defaultValue: "认证字段" })}
|
||||
</FormLabel>
|
||||
<Input
|
||||
id="claudeModel"
|
||||
type="text"
|
||||
value={claudeModel}
|
||||
onChange={(e) =>
|
||||
onModelChange("ANTHROPIC_MODEL", e.target.value)
|
||||
<Select
|
||||
value={apiKeyField}
|
||||
onValueChange={(v) =>
|
||||
onApiKeyFieldChange(v as ClaudeApiKeyField)
|
||||
}
|
||||
placeholder={t("providerForm.modelPlaceholder", {
|
||||
defaultValue: "",
|
||||
>
|
||||
<SelectTrigger>
|
||||
<SelectValue />
|
||||
</SelectTrigger>
|
||||
<SelectContent>
|
||||
<SelectItem value="ANTHROPIC_AUTH_TOKEN">
|
||||
{t("providerForm.authFieldAuthToken", {
|
||||
defaultValue: "ANTHROPIC_AUTH_TOKEN（默认）",
|
||||
})}
|
||||
</SelectItem>
|
||||
<SelectItem value="ANTHROPIC_API_KEY">
|
||||
{t("providerForm.authFieldApiKey", {
|
||||
defaultValue: "ANTHROPIC_API_KEY",
|
||||
})}
|
||||
</SelectItem>
|
||||
</SelectContent>
|
||||
</Select>
|
||||
<p className="text-xs text-muted-foreground">
|
||||
{t("providerForm.authFieldHint", {
|
||||
defaultValue: "选择写入配置的认证环境变量名",
|
||||
})}
|
||||
autoComplete="off"
|
||||
/>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
{/* 推理模型 */}
|
||||
<div className="space-y-2">
|
||||
<FormLabel htmlFor="reasoningModel">
|
||||
{t("providerForm.anthropicReasoningModel")}
|
||||
</FormLabel>
|
||||
<Input
|
||||
id="reasoningModel"
|
||||
type="text"
|
||||
value={reasoningModel}
|
||||
onChange={(e) =>
|
||||
onModelChange("ANTHROPIC_REASONING_MODEL", e.target.value)
|
||||
}
|
||||
autoComplete="off"
|
||||
/>
|
||||
{/* 模型映射 */}
|
||||
<div className="space-y-1 pt-2 border-t">
|
||||
<FormLabel>{t("providerForm.modelMappingLabel")}</FormLabel>
|
||||
<p className="text-xs text-muted-foreground">
|
||||
{t("providerForm.modelMappingHint")}
|
||||
</p>
|
||||
</div>
|
||||
<div className="grid grid-cols-1 md:grid-cols-2 gap-4">
|
||||
{/* 主模型 */}
|
||||
<div className="space-y-2">
|
||||
<FormLabel htmlFor="claudeModel">
|
||||
{t("providerForm.anthropicModel", {
|
||||
defaultValue: "主模型",
|
||||
})}
|
||||
</FormLabel>
|
||||
{renderModelInput(
|
||||
"claudeModel",
|
||||
claudeModel,
|
||||
"ANTHROPIC_MODEL",
|
||||
t("providerForm.modelPlaceholder", { defaultValue: "" }),
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* 默认 Haiku */}
|
||||
<div className="space-y-2">
|
||||
<FormLabel htmlFor="claudeDefaultHaikuModel">
|
||||
{t("providerForm.anthropicDefaultHaikuModel", {
|
||||
defaultValue: "Haiku 默认模型",
|
||||
})}
|
||||
</FormLabel>
|
||||
<Input
|
||||
id="claudeDefaultHaikuModel"
|
||||
type="text"
|
||||
value={defaultHaikuModel}
|
||||
onChange={(e) =>
|
||||
onModelChange("ANTHROPIC_DEFAULT_HAIKU_MODEL", e.target.value)
|
||||
}
|
||||
placeholder={t("providerForm.haikuModelPlaceholder", {
|
||||
defaultValue: "",
|
||||
})}
|
||||
autoComplete="off"
|
||||
/>
|
||||
</div>
|
||||
{/* 推理模型 */}
|
||||
<div className="space-y-2">
|
||||
<FormLabel htmlFor="reasoningModel">
|
||||
{t("providerForm.anthropicReasoningModel")}
|
||||
</FormLabel>
|
||||
{renderModelInput(
|
||||
"reasoningModel",
|
||||
reasoningModel,
|
||||
"ANTHROPIC_REASONING_MODEL",
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* 默认 Sonnet */}
|
||||
<div className="space-y-2">
|
||||
<FormLabel htmlFor="claudeDefaultSonnetModel">
|
||||
{t("providerForm.anthropicDefaultSonnetModel", {
|
||||
defaultValue: "Sonnet 默认模型",
|
||||
})}
|
||||
</FormLabel>
|
||||
<Input
|
||||
id="claudeDefaultSonnetModel"
|
||||
type="text"
|
||||
value={defaultSonnetModel}
|
||||
onChange={(e) =>
|
||||
onModelChange(
|
||||
"ANTHROPIC_DEFAULT_SONNET_MODEL",
|
||||
e.target.value,
|
||||
)
|
||||
}
|
||||
placeholder={t("providerForm.modelPlaceholder", {
|
||||
defaultValue: "",
|
||||
})}
|
||||
autoComplete="off"
|
||||
/>
|
||||
</div>
|
||||
{/* 默认 Haiku */}
|
||||
<div className="space-y-2">
|
||||
<FormLabel htmlFor="claudeDefaultHaikuModel">
|
||||
{t("providerForm.anthropicDefaultHaikuModel", {
|
||||
defaultValue: "Haiku 默认模型",
|
||||
})}
|
||||
</FormLabel>
|
||||
{renderModelInput(
|
||||
"claudeDefaultHaikuModel",
|
||||
defaultHaikuModel,
|
||||
"ANTHROPIC_DEFAULT_HAIKU_MODEL",
|
||||
t("providerForm.haikuModelPlaceholder", { defaultValue: "" }),
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* 默认 Opus */}
|
||||
<div className="space-y-2">
|
||||
<FormLabel htmlFor="claudeDefaultOpusModel">
|
||||
{t("providerForm.anthropicDefaultOpusModel", {
|
||||
defaultValue: "Opus 默认模型",
|
||||
})}
|
||||
</FormLabel>
|
||||
<Input
|
||||
id="claudeDefaultOpusModel"
|
||||
type="text"
|
||||
value={defaultOpusModel}
|
||||
onChange={(e) =>
|
||||
onModelChange("ANTHROPIC_DEFAULT_OPUS_MODEL", e.target.value)
|
||||
}
|
||||
placeholder={t("providerForm.modelPlaceholder", {
|
||||
defaultValue: "",
|
||||
})}
|
||||
autoComplete="off"
|
||||
/>
|
||||
{/* 默认 Sonnet */}
|
||||
<div className="space-y-2">
|
||||
<FormLabel htmlFor="claudeDefaultSonnetModel">
|
||||
{t("providerForm.anthropicDefaultSonnetModel", {
|
||||
defaultValue: "Sonnet 默认模型",
|
||||
})}
|
||||
</FormLabel>
|
||||
{renderModelInput(
|
||||
"claudeDefaultSonnetModel",
|
||||
defaultSonnetModel,
|
||||
"ANTHROPIC_DEFAULT_SONNET_MODEL",
|
||||
t("providerForm.modelPlaceholder", { defaultValue: "" }),
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* 默认 Opus */}
|
||||
<div className="space-y-2">
|
||||
<FormLabel htmlFor="claudeDefaultOpusModel">
|
||||
{t("providerForm.anthropicDefaultOpusModel", {
|
||||
defaultValue: "Opus 默认模型",
|
||||
})}
|
||||
</FormLabel>
|
||||
{renderModelInput(
|
||||
"claudeDefaultOpusModel",
|
||||
defaultOpusModel,
|
||||
"ANTHROPIC_DEFAULT_OPUS_MODEL",
|
||||
t("providerForm.modelPlaceholder", { defaultValue: "" }),
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<p className="text-xs text-muted-foreground">
|
||||
{t("providerForm.modelHelper", {
|
||||
defaultValue:
|
||||
"可选：指定默认使用的 Claude 模型，留空则使用系统默认。",
|
||||
})}
|
||||
</p>
|
||||
</div>
|
||||
</CollapsibleContent>
|
||||
</Collapsible>
|
||||
)}
|
||||
</>
|
||||
);
|
||||
|
||||
@@ -1,6 +1,11 @@
|
||||
import React, { useEffect, useState } from "react";
|
||||
import React, { useCallback, useEffect, useMemo, useRef, useState } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import JsonEditor from "@/components/JsonEditor";
|
||||
import {
|
||||
extractCodexTopLevelInt,
|
||||
setCodexTopLevelInt,
|
||||
removeCodexTopLevelField,
|
||||
} from "@/utils/providerConfigUtils";
|
||||
|
||||
interface CodexAuthSectionProps {
|
||||
value: string;
|
||||
@@ -115,6 +120,95 @@ export const CodexConfigSection: React.FC<CodexConfigSectionProps> = ({
|
||||
return () => observer.disconnect();
|
||||
}, []);
|
||||
|
||||
// Mirror value prop to local state (same pattern as CommonConfigEditor)
|
||||
const [localValue, setLocalValue] = useState(value);
|
||||
const localValueRef = useRef(value);
|
||||
useEffect(() => {
|
||||
setLocalValue(value);
|
||||
localValueRef.current = value;
|
||||
}, [value]);
|
||||
|
||||
const handleLocalChange = useCallback(
|
||||
(newValue: string) => {
|
||||
if (newValue === localValueRef.current) return;
|
||||
localValueRef.current = newValue;
|
||||
setLocalValue(newValue);
|
||||
onChange(newValue);
|
||||
},
|
||||
[onChange],
|
||||
);
|
||||
|
||||
// Parse toggle states from TOML text
|
||||
const toggleStates = useMemo(() => {
|
||||
const contextWindow = extractCodexTopLevelInt(
|
||||
localValue,
|
||||
"model_context_window",
|
||||
);
|
||||
const compactLimit = extractCodexTopLevelInt(
|
||||
localValue,
|
||||
"model_auto_compact_token_limit",
|
||||
);
|
||||
return {
|
||||
contextWindow1M: contextWindow === 1000000,
|
||||
compactLimit: compactLimit ?? 900000,
|
||||
};
|
||||
}, [localValue]);
|
||||
|
||||
// Debounce timer for compact limit input
|
||||
const compactTimerRef = useRef<ReturnType<typeof setTimeout>>();
|
||||
|
||||
const handleContextWindowToggle = useCallback(
|
||||
(checked: boolean) => {
|
||||
let toml = localValueRef.current || "";
|
||||
if (checked) {
|
||||
toml = setCodexTopLevelInt(toml, "model_context_window", 1000000);
|
||||
// Auto-set compact limit if not already present
|
||||
if (
|
||||
extractCodexTopLevelInt(toml, "model_auto_compact_token_limit") ===
|
||||
undefined
|
||||
) {
|
||||
toml = setCodexTopLevelInt(
|
||||
toml,
|
||||
"model_auto_compact_token_limit",
|
||||
900000,
|
||||
);
|
||||
}
|
||||
} else {
|
||||
toml = removeCodexTopLevelField(toml, "model_context_window");
|
||||
toml = removeCodexTopLevelField(
|
||||
toml,
|
||||
"model_auto_compact_token_limit",
|
||||
);
|
||||
}
|
||||
handleLocalChange(toml);
|
||||
},
|
||||
[handleLocalChange],
|
||||
);
|
||||
|
||||
const handleCompactLimitChange = useCallback(
|
||||
(inputValue: string) => {
|
||||
clearTimeout(compactTimerRef.current);
|
||||
compactTimerRef.current = setTimeout(() => {
|
||||
const num = parseInt(inputValue, 10);
|
||||
if (!Number.isNaN(num) && num > 0) {
|
||||
handleLocalChange(
|
||||
setCodexTopLevelInt(
|
||||
localValueRef.current || "",
|
||||
"model_auto_compact_token_limit",
|
||||
num,
|
||||
),
|
||||
);
|
||||
}
|
||||
}, 500);
|
||||
},
|
||||
[handleLocalChange],
|
||||
);
|
||||
|
||||
// Cleanup debounce timer
|
||||
useEffect(() => {
|
||||
return () => clearTimeout(compactTimerRef.current);
|
||||
}, []);
|
||||
|
||||
return (
|
||||
<div className="space-y-2">
|
||||
<div className="flex items-center justify-between">
|
||||
@@ -152,9 +246,34 @@ export const CodexConfigSection: React.FC<CodexConfigSectionProps> = ({
|
||||
</p>
|
||||
)}
|
||||
|
||||
<div className="flex flex-wrap items-center gap-x-4 gap-y-1">
|
||||
<label className="inline-flex items-center gap-2 text-sm text-muted-foreground cursor-pointer">
|
||||
<input
|
||||
type="checkbox"
|
||||
checked={toggleStates.contextWindow1M}
|
||||
onChange={(e) => handleContextWindowToggle(e.target.checked)}
|
||||
className="w-4 h-4 text-blue-500 bg-white dark:bg-gray-800 border-border-default rounded focus:ring-blue-500 dark:focus:ring-blue-400 focus:ring-2"
|
||||
/>
|
||||
<span>{t("codexConfig.contextWindow1M")}</span>
|
||||
</label>
|
||||
<label className="inline-flex items-center gap-2 text-sm text-muted-foreground">
|
||||
<span>{t("codexConfig.autoCompactLimit")}:</span>
|
||||
<input
|
||||
type="text"
|
||||
inputMode="numeric"
|
||||
pattern="[0-9]*"
|
||||
key={toggleStates.compactLimit}
|
||||
defaultValue={toggleStates.compactLimit}
|
||||
disabled={!toggleStates.contextWindow1M}
|
||||
onChange={(e) => handleCompactLimitChange(e.target.value)}
|
||||
className="w-28 h-7 px-2 text-sm rounded border border-border bg-background text-foreground disabled:opacity-50 disabled:cursor-not-allowed"
|
||||
/>
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<JsonEditor
|
||||
value={value}
|
||||
onChange={onChange}
|
||||
value={localValue}
|
||||
onChange={handleLocalChange}
|
||||
placeholder=""
|
||||
darkMode={isDarkMode}
|
||||
rows={8}
|
||||
|
||||
@@ -75,16 +75,20 @@ export function CommonConfigEditor({
|
||||
return {
|
||||
hideAttribution:
|
||||
config?.attribution?.commit === "" && config?.attribution?.pr === "",
|
||||
alwaysThinking: config?.alwaysThinkingEnabled === true,
|
||||
teammates:
|
||||
config?.env?.CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS === "1" ||
|
||||
config?.env?.CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS === 1,
|
||||
enableToolSearch:
|
||||
config?.env?.ENABLE_TOOL_SEARCH === "true" ||
|
||||
config?.env?.ENABLE_TOOL_SEARCH === "1",
|
||||
effortHigh: config?.effortLevel === "high",
|
||||
};
|
||||
} catch {
|
||||
return {
|
||||
hideAttribution: false,
|
||||
alwaysThinking: false,
|
||||
teammates: false,
|
||||
enableToolSearch: false,
|
||||
effortHigh: false,
|
||||
};
|
||||
}
|
||||
}, [localValue]);
|
||||
@@ -102,13 +106,6 @@ export function CommonConfigEditor({
|
||||
delete config.attribution;
|
||||
}
|
||||
break;
|
||||
case "alwaysThinking":
|
||||
if (checked) {
|
||||
config.alwaysThinkingEnabled = true;
|
||||
} else {
|
||||
delete config.alwaysThinkingEnabled;
|
||||
}
|
||||
break;
|
||||
case "teammates":
|
||||
if (!config.env) config.env = {};
|
||||
if (checked) {
|
||||
@@ -118,6 +115,22 @@ export function CommonConfigEditor({
|
||||
if (Object.keys(config.env).length === 0) delete config.env;
|
||||
}
|
||||
break;
|
||||
case "enableToolSearch":
|
||||
if (!config.env) config.env = {};
|
||||
if (checked) {
|
||||
config.env.ENABLE_TOOL_SEARCH = "true";
|
||||
} else {
|
||||
delete config.env.ENABLE_TOOL_SEARCH;
|
||||
if (Object.keys(config.env).length === 0) delete config.env;
|
||||
}
|
||||
break;
|
||||
case "effortHigh":
|
||||
if (checked) {
|
||||
config.effortLevel = "high";
|
||||
} else {
|
||||
delete config.effortLevel;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
handleLocalChange(JSON.stringify(config, null, 2));
|
||||
@@ -178,15 +191,6 @@ export function CommonConfigEditor({
|
||||
/>
|
||||
<span>{t("claudeConfig.hideAttribution")}</span>
|
||||
</label>
|
||||
<label className="inline-flex items-center gap-2 text-sm text-muted-foreground cursor-pointer">
|
||||
<input
|
||||
type="checkbox"
|
||||
checked={toggleStates.alwaysThinking}
|
||||
onChange={(e) => handleToggle("alwaysThinking", e.target.checked)}
|
||||
className="w-4 h-4 text-blue-500 bg-white dark:bg-gray-800 border-border-default rounded focus:ring-blue-500 dark:focus:ring-blue-400 focus:ring-2"
|
||||
/>
|
||||
<span>{t("claudeConfig.alwaysThinking")}</span>
|
||||
</label>
|
||||
<label className="inline-flex items-center gap-2 text-sm text-muted-foreground cursor-pointer">
|
||||
<input
|
||||
type="checkbox"
|
||||
@@ -196,6 +200,26 @@ export function CommonConfigEditor({
|
||||
/>
|
||||
<span>{t("claudeConfig.enableTeammates")}</span>
|
||||
</label>
|
||||
<label className="inline-flex items-center gap-2 text-sm text-muted-foreground cursor-pointer">
|
||||
<input
|
||||
type="checkbox"
|
||||
checked={toggleStates.enableToolSearch}
|
||||
onChange={(e) =>
|
||||
handleToggle("enableToolSearch", e.target.checked)
|
||||
}
|
||||
className="w-4 h-4 text-blue-500 bg-white dark:bg-gray-800 border-border-default rounded focus:ring-blue-500 dark:focus:ring-blue-400 focus:ring-2"
|
||||
/>
|
||||
<span>{t("claudeConfig.enableToolSearch")}</span>
|
||||
</label>
|
||||
<label className="inline-flex items-center gap-2 text-sm text-muted-foreground cursor-pointer">
|
||||
<input
|
||||
type="checkbox"
|
||||
checked={toggleStates.effortHigh}
|
||||
onChange={(e) => handleToggle("effortHigh", e.target.checked)}
|
||||
className="w-4 h-4 text-blue-500 bg-white dark:bg-gray-800 border-border-default rounded focus:ring-blue-500 dark:focus:ring-blue-400 focus:ring-2"
|
||||
/>
|
||||
<span>{t("claudeConfig.effortHigh")}</span>
|
||||
</label>
|
||||
</div>
|
||||
<JsonEditor
|
||||
value={localValue}
|
||||
|
||||
@@ -0,0 +1,367 @@
|
||||
import React from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import { Badge } from "@/components/ui/badge";
|
||||
import { Label } from "@/components/ui/label";
|
||||
import {
|
||||
Select,
|
||||
SelectContent,
|
||||
SelectItem,
|
||||
SelectTrigger,
|
||||
SelectValue,
|
||||
} from "@/components/ui/select";
|
||||
import {
|
||||
Loader2,
|
||||
Github,
|
||||
LogOut,
|
||||
Copy,
|
||||
Check,
|
||||
ExternalLink,
|
||||
Plus,
|
||||
X,
|
||||
User,
|
||||
} from "lucide-react";
|
||||
import { useCopilotAuth } from "./hooks/useCopilotAuth";
|
||||
import type { GitHubAccount } from "@/lib/api";
|
||||
|
||||
interface CopilotAuthSectionProps {
|
||||
className?: string;
|
||||
/** 当前选中的 GitHub 账号 ID */
|
||||
selectedAccountId?: string | null;
|
||||
/** 账号选择回调 */
|
||||
onAccountSelect?: (accountId: string | null) => void;
|
||||
}
|
||||
|
||||
/**
|
||||
* Copilot OAuth 认证区块
|
||||
*
|
||||
* 显示 GitHub Copilot 的认证状态，支持多账号管理和选择。
|
||||
*/
|
||||
export const CopilotAuthSection: React.FC<CopilotAuthSectionProps> = ({
|
||||
className,
|
||||
selectedAccountId,
|
||||
onAccountSelect,
|
||||
}) => {
|
||||
const { t } = useTranslation();
|
||||
const [copied, setCopied] = React.useState(false);
|
||||
|
||||
const {
|
||||
accounts,
|
||||
defaultAccountId,
|
||||
migrationError,
|
||||
hasAnyAccount,
|
||||
pollingState,
|
||||
deviceCode,
|
||||
error,
|
||||
isPolling,
|
||||
isAddingAccount,
|
||||
isRemovingAccount,
|
||||
isSettingDefaultAccount,
|
||||
addAccount,
|
||||
removeAccount,
|
||||
setDefaultAccount,
|
||||
cancelAuth,
|
||||
logout,
|
||||
} = useCopilotAuth();
|
||||
|
||||
// 复制用户码
|
||||
const copyUserCode = async () => {
|
||||
if (deviceCode?.user_code) {
|
||||
await navigator.clipboard.writeText(deviceCode.user_code);
|
||||
setCopied(true);
|
||||
setTimeout(() => setCopied(false), 2000);
|
||||
}
|
||||
};
|
||||
|
||||
// 处理账号选择
|
||||
const handleAccountSelect = (value: string) => {
|
||||
onAccountSelect?.(value === "none" ? null : value);
|
||||
};
|
||||
|
||||
// 处理移除账号
|
||||
const handleRemoveAccount = (accountId: string, e: React.MouseEvent) => {
|
||||
e.stopPropagation();
|
||||
e.preventDefault();
|
||||
removeAccount(accountId);
|
||||
// 如果移除的是当前选中的账号，清除选择
|
||||
if (selectedAccountId === accountId) {
|
||||
onAccountSelect?.(null);
|
||||
}
|
||||
};
|
||||
|
||||
// 渲染账号头像
|
||||
const renderAvatar = (account: GitHubAccount) => {
|
||||
return <CopilotAccountAvatar account={account} />;
|
||||
};
|
||||
|
||||
return (
|
||||
<div className={`space-y-4 ${className || ""}`}>
|
||||
{/* 认证状态标题 */}
|
||||
<div className="flex items-center justify-between">
|
||||
<Label>{t("copilot.authStatus", "GitHub Copilot 认证")}</Label>
|
||||
<Badge
|
||||
variant={hasAnyAccount ? "default" : "secondary"}
|
||||
className={hasAnyAccount ? "bg-green-500 hover:bg-green-600" : ""}
|
||||
>
|
||||
{hasAnyAccount
|
||||
? t("copilot.accountCount", {
|
||||
count: accounts.length,
|
||||
defaultValue: `${accounts.length} 个账号`,
|
||||
})
|
||||
: t("copilot.notAuthenticated", "未认证")}
|
||||
</Badge>
|
||||
</div>
|
||||
|
||||
{migrationError && (
|
||||
<p className="text-sm text-amber-600 dark:text-amber-400">
|
||||
{t("copilot.migrationFailed", {
|
||||
error: migrationError,
|
||||
defaultValue: `旧认证数据迁移失败：${migrationError}`,
|
||||
})}
|
||||
</p>
|
||||
)}
|
||||
|
||||
{/* 账号选择器（有账号时显示） */}
|
||||
{hasAnyAccount && onAccountSelect && (
|
||||
<div className="space-y-2">
|
||||
<Label className="text-sm text-muted-foreground">
|
||||
{t("copilot.selectAccount", "选择账号")}
|
||||
</Label>
|
||||
<Select
|
||||
value={selectedAccountId || "none"}
|
||||
onValueChange={handleAccountSelect}
|
||||
>
|
||||
<SelectTrigger>
|
||||
<SelectValue
|
||||
placeholder={t(
|
||||
"copilot.selectAccountPlaceholder",
|
||||
"选择一个 GitHub 账号",
|
||||
)}
|
||||
/>
|
||||
</SelectTrigger>
|
||||
<SelectContent>
|
||||
<SelectItem value="none">
|
||||
<span className="text-muted-foreground">
|
||||
{t("copilot.useDefaultAccount", "使用默认账号")}
|
||||
</span>
|
||||
</SelectItem>
|
||||
{accounts.map((account) => (
|
||||
<SelectItem key={account.id} value={account.id}>
|
||||
<div className="flex items-center gap-2">
|
||||
{renderAvatar(account)}
|
||||
<span>{account.login}</span>
|
||||
</div>
|
||||
</SelectItem>
|
||||
))}
|
||||
</SelectContent>
|
||||
</Select>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* 已登录账号列表 */}
|
||||
{hasAnyAccount && (
|
||||
<div className="space-y-2">
|
||||
<Label className="text-sm text-muted-foreground">
|
||||
{t("copilot.loggedInAccounts", "已登录账号")}
|
||||
</Label>
|
||||
<div className="space-y-1">
|
||||
{accounts.map((account) => (
|
||||
<div
|
||||
key={account.id}
|
||||
className="flex items-center justify-between p-2 rounded-md border bg-muted/30"
|
||||
>
|
||||
<div className="flex items-center gap-2">
|
||||
{renderAvatar(account)}
|
||||
<span className="text-sm font-medium">{account.login}</span>
|
||||
{defaultAccountId === account.id && (
|
||||
<Badge variant="secondary" className="text-xs">
|
||||
{t("copilot.defaultAccount", "默认")}
|
||||
</Badge>
|
||||
)}
|
||||
{selectedAccountId === account.id && (
|
||||
<Badge variant="outline" className="text-xs">
|
||||
{t("copilot.selected", "已选中")}
|
||||
</Badge>
|
||||
)}
|
||||
</div>
|
||||
<div className="flex items-center gap-1">
|
||||
{defaultAccountId !== account.id && (
|
||||
<Button
|
||||
type="button"
|
||||
variant="ghost"
|
||||
size="sm"
|
||||
className="h-7 px-2 text-xs text-muted-foreground"
|
||||
onClick={() => setDefaultAccount(account.id)}
|
||||
disabled={isSettingDefaultAccount}
|
||||
>
|
||||
{t("copilot.setAsDefault", "设为默认")}
|
||||
</Button>
|
||||
)}
|
||||
<Button
|
||||
type="button"
|
||||
variant="ghost"
|
||||
size="icon"
|
||||
className="h-7 w-7 text-muted-foreground hover:text-red-500"
|
||||
onClick={(e) => handleRemoveAccount(account.id, e)}
|
||||
disabled={isRemovingAccount}
|
||||
title={t("copilot.removeAccount", "移除账号")}
|
||||
>
|
||||
<X className="h-4 w-4" />
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* 未认证状态 - 登录按钮 */}
|
||||
{!hasAnyAccount && pollingState === "idle" && (
|
||||
<Button
|
||||
type="button"
|
||||
onClick={addAccount}
|
||||
className="w-full"
|
||||
variant="outline"
|
||||
>
|
||||
<Github className="mr-2 h-4 w-4" />
|
||||
{t("copilot.loginWithGitHub", "使用 GitHub 登录")}
|
||||
</Button>
|
||||
)}
|
||||
|
||||
{/* 已有账号 - 添加更多账号按钮 */}
|
||||
{hasAnyAccount && pollingState === "idle" && (
|
||||
<Button
|
||||
type="button"
|
||||
onClick={addAccount}
|
||||
className="w-full"
|
||||
variant="outline"
|
||||
disabled={isAddingAccount}
|
||||
>
|
||||
<Plus className="mr-2 h-4 w-4" />
|
||||
{t("copilot.addAnotherAccount", "添加其他账号")}
|
||||
</Button>
|
||||
)}
|
||||
|
||||
{/* 轮询中状态 */}
|
||||
{isPolling && deviceCode && (
|
||||
<div className="space-y-3 p-4 rounded-lg border border-border bg-muted/50">
|
||||
<div className="flex items-center justify-center gap-2 text-sm text-muted-foreground">
|
||||
<Loader2 className="h-4 w-4 animate-spin" />
|
||||
{t("copilot.waitingForAuth", "等待授权中...")}
|
||||
</div>
|
||||
|
||||
{/* 用户码 */}
|
||||
<div className="text-center">
|
||||
<p className="text-xs text-muted-foreground mb-1">
|
||||
{t("copilot.enterCode", "在浏览器中输入以下代码：")}
|
||||
</p>
|
||||
<div className="flex items-center justify-center gap-2">
|
||||
<code className="text-2xl font-mono font-bold tracking-wider bg-background px-4 py-2 rounded border">
|
||||
{deviceCode.user_code}
|
||||
</code>
|
||||
<Button
|
||||
type="button"
|
||||
size="icon"
|
||||
variant="ghost"
|
||||
onClick={copyUserCode}
|
||||
title={t("copilot.copyCode", "复制代码")}
|
||||
>
|
||||
{copied ? (
|
||||
<Check className="h-4 w-4 text-green-500" />
|
||||
) : (
|
||||
<Copy className="h-4 w-4" />
|
||||
)}
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* 验证链接 */}
|
||||
<div className="text-center">
|
||||
<a
|
||||
href={deviceCode.verification_uri}
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
className="inline-flex items-center gap-1 text-sm text-blue-500 hover:underline"
|
||||
>
|
||||
{deviceCode.verification_uri}
|
||||
<ExternalLink className="h-3 w-3" />
|
||||
</a>
|
||||
</div>
|
||||
|
||||
{/* 取消按钮 */}
|
||||
<div className="text-center">
|
||||
<Button
|
||||
type="button"
|
||||
variant="ghost"
|
||||
size="sm"
|
||||
onClick={cancelAuth}
|
||||
>
|
||||
{t("common.cancel", "取消")}
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* 错误状态 */}
|
||||
{pollingState === "error" && error && (
|
||||
<div className="space-y-2">
|
||||
<p className="text-sm text-red-500">{error}</p>
|
||||
<div className="flex gap-2">
|
||||
<Button
|
||||
type="button"
|
||||
onClick={addAccount}
|
||||
variant="outline"
|
||||
size="sm"
|
||||
>
|
||||
{t("copilot.retry", "重试")}
|
||||
</Button>
|
||||
<Button
|
||||
type="button"
|
||||
onClick={cancelAuth}
|
||||
variant="ghost"
|
||||
size="sm"
|
||||
>
|
||||
{t("common.cancel", "取消")}
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* 注销所有账号按钮 */}
|
||||
{hasAnyAccount && accounts.length > 1 && (
|
||||
<Button
|
||||
type="button"
|
||||
variant="outline"
|
||||
onClick={logout}
|
||||
className="w-full text-red-500 hover:text-red-600 hover:bg-red-50 dark:hover:bg-red-950"
|
||||
>
|
||||
<LogOut className="mr-2 h-4 w-4" />
|
||||
{t("copilot.logoutAll", "注销所有账号")}
|
||||
</Button>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
const CopilotAccountAvatar: React.FC<{ account: GitHubAccount }> = ({
|
||||
account,
|
||||
}) => {
|
||||
const [failed, setFailed] = React.useState(false);
|
||||
|
||||
if (!account.avatar_url || failed) {
|
||||
return <User className="h-5 w-5 text-muted-foreground" />;
|
||||
}
|
||||
|
||||
return (
|
||||
<img
|
||||
src={account.avatar_url}
|
||||
alt={account.login}
|
||||
className="h-5 w-5 rounded-full"
|
||||
loading="lazy"
|
||||
referrerPolicy="no-referrer"
|
||||
onError={() => setFailed(true)}
|
||||
/>
|
||||
);
|
||||
};
|
||||
|
||||
export default CopilotAuthSection;
|
||||
@@ -80,6 +80,7 @@ import {
|
||||
useOpencodeFormState,
|
||||
useOmoDraftState,
|
||||
useOpenclawFormState,
|
||||
useCopilotAuth,
|
||||
} from "./hooks";
|
||||
import {
|
||||
CLAUDE_DEFAULT_CONFIG,
|
||||
@@ -89,6 +90,7 @@ import {
|
||||
OPENCLAW_DEFAULT_CONFIG,
|
||||
normalizePricingSource,
|
||||
} from "./helpers/opencodeFormUtils";
|
||||
import { resolveManagedAccountId } from "@/lib/authBinding";
|
||||
|
||||
type PresetEntry = {
|
||||
id: string;
|
||||
@@ -331,6 +333,14 @@ export function ProviderForm({
|
||||
[localApiKeyField, form, handleSettingsConfigChange],
|
||||
);
|
||||
|
||||
// Copilot OAuth 认证状态（仅 Claude 应用需要）
|
||||
const { isAuthenticated: isCopilotAuthenticated } = useCopilotAuth();
|
||||
|
||||
// 选中的 GitHub 账号 ID（多账号支持）
|
||||
const [selectedGitHubAccountId, setSelectedGitHubAccountId] = useState<
|
||||
string | null
|
||||
>(() => resolveManagedAccountId(initialData?.meta, "github_copilot"));
|
||||
|
||||
const {
|
||||
codexAuth,
|
||||
codexConfig,
|
||||
@@ -660,6 +670,21 @@ export function ProviderForm({
|
||||
|
||||
// 非官方供应商必填校验：端点和 API Key
|
||||
// cloud_provider（如 Bedrock）通过模板变量处理认证，跳过通用校验
|
||||
// GitHub Copilot 使用 OAuth 认证，不需要 API Key
|
||||
const isCopilotProvider =
|
||||
templatePreset?.providerType === "github_copilot" ||
|
||||
initialData?.meta?.providerType === "github_copilot" ||
|
||||
baseUrl.includes("githubcopilot.com");
|
||||
// GitHub Copilot 必须先登录才能添加
|
||||
if (isCopilotProvider && !isCopilotAuthenticated) {
|
||||
toast.error(
|
||||
t("copilot.loginRequired", {
|
||||
defaultValue: "请先登录 GitHub Copilot",
|
||||
}),
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
if (category !== "official" && category !== "cloud_provider") {
|
||||
if (appId === "claude") {
|
||||
if (!baseUrl.trim()) {
|
||||
@@ -670,7 +695,7 @@ export function ProviderForm({
|
||||
);
|
||||
return;
|
||||
}
|
||||
if (!apiKey.trim()) {
|
||||
if (!isCopilotProvider && !apiKey.trim()) {
|
||||
toast.error(
|
||||
t("providerForm.apiKeyRequired", {
|
||||
defaultValue: "非官方供应商请填写 API Key",
|
||||
@@ -867,6 +892,11 @@ export function ProviderForm({
|
||||
|
||||
const baseMeta: ProviderMeta | undefined =
|
||||
payload.meta ?? (initialData?.meta ? { ...initialData.meta } : undefined);
|
||||
|
||||
// 确定 providerType（新建时从预设获取，编辑时从现有数据获取）
|
||||
const providerType =
|
||||
templatePreset?.providerType || initialData?.meta?.providerType;
|
||||
|
||||
payload.meta = {
|
||||
...(baseMeta ?? {}),
|
||||
commonConfigEnabled:
|
||||
@@ -878,6 +908,20 @@ export function ProviderForm({
|
||||
? useGeminiCommonConfigFlag
|
||||
: undefined,
|
||||
endpointAutoSelect,
|
||||
// 保存 providerType（用于识别 Copilot 等特殊供应商）
|
||||
providerType,
|
||||
authBinding: isCopilotProvider
|
||||
? {
|
||||
source: "managed_account",
|
||||
authProvider: "github_copilot",
|
||||
accountId: selectedGitHubAccountId ?? undefined,
|
||||
}
|
||||
: undefined,
|
||||
// GitHub Copilot 多账号：保存关联的账号 ID
|
||||
githubAccountId:
|
||||
isCopilotProvider && selectedGitHubAccountId
|
||||
? selectedGitHubAccountId
|
||||
: undefined,
|
||||
testConfig: testConfig.enabled ? testConfig : undefined,
|
||||
proxyConfig: proxyConfig.enabled ? proxyConfig : undefined,
|
||||
costMultiplier: pricingConfig.enabled
|
||||
@@ -1318,6 +1362,20 @@ export function ProviderForm({
|
||||
websiteUrl={claudeWebsiteUrl}
|
||||
isPartner={isClaudePartner}
|
||||
partnerPromotionKey={claudePartnerPromotionKey}
|
||||
isCopilotPreset={
|
||||
templatePreset?.providerType === "github_copilot" ||
|
||||
initialData?.meta?.providerType === "github_copilot" ||
|
||||
baseUrl.includes("githubcopilot.com")
|
||||
}
|
||||
usesOAuth={
|
||||
templatePreset?.requiresOAuth === true ||
|
||||
templatePreset?.providerType === "github_copilot" ||
|
||||
initialData?.meta?.providerType === "github_copilot" ||
|
||||
baseUrl.includes("githubcopilot.com")
|
||||
}
|
||||
isCopilotAuthenticated={isCopilotAuthenticated}
|
||||
selectedGitHubAccountId={selectedGitHubAccountId}
|
||||
onGitHubAccountSelect={setSelectedGitHubAccountId}
|
||||
templateValueEntries={templateValueEntries}
|
||||
templateValues={templateValues}
|
||||
templatePresetName={templatePreset?.name || ""}
|
||||
@@ -1607,7 +1665,9 @@ export function ProviderForm({
|
||||
<Button variant="outline" type="button" onClick={onCancel}>
|
||||
{t("common.cancel")}
|
||||
</Button>
|
||||
<Button type="submit" disabled={isSubmitting}>{submitLabel}</Button>
|
||||
<Button type="submit" disabled={isSubmitting}>
|
||||
{submitLabel}
|
||||
</Button>
|
||||
</div>
|
||||
)}
|
||||
</form>
|
||||
|
||||
@@ -28,6 +28,7 @@ export const OPENCODE_DEFAULT_CONFIG = JSON.stringify(
|
||||
options: {
|
||||
baseURL: "",
|
||||
apiKey: "",
|
||||
setCacheKey: true,
|
||||
},
|
||||
models: {},
|
||||
},
|
||||
|
||||
@@ -11,8 +11,10 @@ export { useCodexCommonConfig } from "./useCodexCommonConfig";
|
||||
export { useSpeedTestEndpoints } from "./useSpeedTestEndpoints";
|
||||
export { useCodexTomlValidation } from "./useCodexTomlValidation";
|
||||
export { useGeminiConfigState } from "./useGeminiConfigState";
|
||||
export { useManagedAuth } from "./useManagedAuth";
|
||||
export { useGeminiCommonConfig } from "./useGeminiCommonConfig";
|
||||
export { useOmoModelSource } from "./useOmoModelSource";
|
||||
export { useOpencodeFormState } from "./useOpencodeFormState";
|
||||
export { useOmoDraftState } from "./useOmoDraftState";
|
||||
export { useOpenclawFormState } from "./useOpenclawFormState";
|
||||
export { useCopilotAuth } from "./useCopilotAuth";
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
import type { GitHubAccount } from "@/lib/api";
|
||||
import { useManagedAuth } from "./useManagedAuth";
|
||||
|
||||
export function useCopilotAuth() {
|
||||
const managedAuth = useManagedAuth("github_copilot");
|
||||
const defaultAccount =
|
||||
managedAuth.accounts.find(
|
||||
(account) => account.id === managedAuth.defaultAccountId,
|
||||
) ?? managedAuth.accounts[0];
|
||||
|
||||
return {
|
||||
...managedAuth,
|
||||
authStatus: managedAuth.authStatus
|
||||
? {
|
||||
authenticated: managedAuth.authStatus.authenticated,
|
||||
username: defaultAccount?.login ?? null,
|
||||
// Managed auth status does not expose a single provider-wide token expiry.
|
||||
expires_at: null,
|
||||
default_account_id: managedAuth.defaultAccountId,
|
||||
migration_error: managedAuth.migrationError,
|
||||
accounts: managedAuth.accounts as GitHubAccount[],
|
||||
}
|
||||
: undefined,
|
||||
// Managed auth status no longer exposes a single default token expiry.
|
||||
username: defaultAccount?.login ?? null,
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,233 @@
|
||||
import { useState, useCallback, useRef, useEffect } from "react";
|
||||
import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query";
|
||||
import { authApi, settingsApi } from "@/lib/api";
|
||||
import type {
|
||||
ManagedAuthProvider,
|
||||
ManagedAuthStatus,
|
||||
ManagedAuthDeviceCodeResponse,
|
||||
} from "@/lib/api";
|
||||
|
||||
type PollingState = "idle" | "polling" | "success" | "error";
|
||||
|
||||
export function useManagedAuth(authProvider: ManagedAuthProvider) {
|
||||
const queryClient = useQueryClient();
|
||||
const queryKey = ["managed-auth-status", authProvider];
|
||||
|
||||
const [pollingState, setPollingState] = useState<PollingState>("idle");
|
||||
const [deviceCode, setDeviceCode] =
|
||||
useState<ManagedAuthDeviceCodeResponse | null>(null);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
|
||||
const pollingIntervalRef = useRef<ReturnType<typeof setInterval> | null>(
|
||||
null,
|
||||
);
|
||||
const pollingTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
|
||||
|
||||
const {
|
||||
data: authStatus,
|
||||
isLoading: isLoadingStatus,
|
||||
refetch: refetchStatus,
|
||||
} = useQuery<ManagedAuthStatus>({
|
||||
queryKey,
|
||||
queryFn: () => authApi.authGetStatus(authProvider),
|
||||
staleTime: 30000,
|
||||
});
|
||||
|
||||
const stopPolling = useCallback(() => {
|
||||
if (pollingIntervalRef.current) {
|
||||
clearInterval(pollingIntervalRef.current);
|
||||
pollingIntervalRef.current = null;
|
||||
}
|
||||
if (pollingTimeoutRef.current) {
|
||||
clearTimeout(pollingTimeoutRef.current);
|
||||
pollingTimeoutRef.current = null;
|
||||
}
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
return () => {
|
||||
stopPolling();
|
||||
};
|
||||
}, [stopPolling]);
|
||||
|
||||
const startLoginMutation = useMutation({
|
||||
mutationFn: () => authApi.authStartLogin(authProvider),
|
||||
onSuccess: async (response) => {
|
||||
setDeviceCode(response);
|
||||
setPollingState("polling");
|
||||
setError(null);
|
||||
|
||||
try {
|
||||
await navigator.clipboard.writeText(response.user_code);
|
||||
} catch (e) {
|
||||
console.debug("[ManagedAuth] Failed to copy user code:", e);
|
||||
}
|
||||
|
||||
try {
|
||||
await settingsApi.openExternal(response.verification_uri);
|
||||
} catch (e) {
|
||||
console.debug("[ManagedAuth] Failed to open browser:", e);
|
||||
}
|
||||
|
||||
// Add a small buffer on top of GitHub's suggested interval to avoid
|
||||
// hitting slow_down responses too aggressively during device polling.
|
||||
const interval = Math.max((response.interval || 5) + 3, 8) * 1000;
|
||||
const expiresAt = Date.now() + response.expires_in * 1000;
|
||||
|
||||
const pollOnce = async () => {
|
||||
if (Date.now() > expiresAt) {
|
||||
stopPolling();
|
||||
setPollingState("error");
|
||||
setError("Device code expired. Please try again.");
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
const newAccount = await authApi.authPollForAccount(
|
||||
authProvider,
|
||||
response.device_code,
|
||||
);
|
||||
if (newAccount) {
|
||||
stopPolling();
|
||||
setPollingState("success");
|
||||
await refetchStatus();
|
||||
await queryClient.invalidateQueries({ queryKey });
|
||||
setPollingState("idle");
|
||||
setDeviceCode(null);
|
||||
}
|
||||
} catch (e) {
|
||||
const errorMessage = e instanceof Error ? e.message : String(e);
|
||||
if (
|
||||
!errorMessage.includes("pending") &&
|
||||
!errorMessage.includes("slow_down")
|
||||
) {
|
||||
stopPolling();
|
||||
setPollingState("error");
|
||||
setError(errorMessage);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
void pollOnce();
|
||||
pollingIntervalRef.current = setInterval(pollOnce, interval);
|
||||
pollingTimeoutRef.current = setTimeout(() => {
|
||||
stopPolling();
|
||||
setPollingState("error");
|
||||
setError("Device code expired. Please try again.");
|
||||
}, response.expires_in * 1000);
|
||||
},
|
||||
onError: (e) => {
|
||||
setPollingState("error");
|
||||
setError(e instanceof Error ? e.message : String(e));
|
||||
},
|
||||
});
|
||||
|
||||
const logoutMutation = useMutation({
|
||||
mutationFn: () => authApi.authLogout(authProvider),
|
||||
onSuccess: async () => {
|
||||
setPollingState("idle");
|
||||
setDeviceCode(null);
|
||||
setError(null);
|
||||
queryClient.setQueryData(queryKey, {
|
||||
provider: authProvider,
|
||||
authenticated: false,
|
||||
default_account_id: null,
|
||||
accounts: [],
|
||||
});
|
||||
await queryClient.invalidateQueries({ queryKey });
|
||||
},
|
||||
onError: async (e) => {
|
||||
console.error("[ManagedAuth] Failed to logout:", e);
|
||||
setError(e instanceof Error ? e.message : String(e));
|
||||
await refetchStatus();
|
||||
},
|
||||
});
|
||||
|
||||
const removeAccountMutation = useMutation({
|
||||
mutationFn: (accountId: string) =>
|
||||
authApi.authRemoveAccount(authProvider, accountId),
|
||||
onSuccess: async () => {
|
||||
setPollingState("idle");
|
||||
setDeviceCode(null);
|
||||
setError(null);
|
||||
await refetchStatus();
|
||||
await queryClient.invalidateQueries({ queryKey });
|
||||
},
|
||||
onError: (e) => {
|
||||
console.error("[ManagedAuth] Failed to remove account:", e);
|
||||
setError(e instanceof Error ? e.message : String(e));
|
||||
},
|
||||
});
|
||||
|
||||
const setDefaultAccountMutation = useMutation({
|
||||
mutationFn: (accountId: string) =>
|
||||
authApi.authSetDefaultAccount(authProvider, accountId),
|
||||
onSuccess: async () => {
|
||||
await refetchStatus();
|
||||
await queryClient.invalidateQueries({ queryKey });
|
||||
},
|
||||
onError: (e) => {
|
||||
console.error("[ManagedAuth] Failed to set default account:", e);
|
||||
setError(e instanceof Error ? e.message : String(e));
|
||||
},
|
||||
});
|
||||
|
||||
const startAuth = useCallback(() => {
|
||||
setPollingState("idle");
|
||||
setDeviceCode(null);
|
||||
setError(null);
|
||||
stopPolling();
|
||||
startLoginMutation.mutate();
|
||||
}, [startLoginMutation, stopPolling]);
|
||||
|
||||
const cancelAuth = useCallback(() => {
|
||||
stopPolling();
|
||||
setPollingState("idle");
|
||||
setDeviceCode(null);
|
||||
setError(null);
|
||||
}, [stopPolling]);
|
||||
|
||||
const logout = useCallback(() => {
|
||||
logoutMutation.mutate();
|
||||
}, [logoutMutation]);
|
||||
|
||||
const removeAccount = useCallback(
|
||||
(accountId: string) => {
|
||||
removeAccountMutation.mutate(accountId);
|
||||
},
|
||||
[removeAccountMutation],
|
||||
);
|
||||
|
||||
const setDefaultAccount = useCallback(
|
||||
(accountId: string) => {
|
||||
setDefaultAccountMutation.mutate(accountId);
|
||||
},
|
||||
[setDefaultAccountMutation],
|
||||
);
|
||||
|
||||
const accounts = authStatus?.accounts ?? [];
|
||||
|
||||
return {
|
||||
authStatus,
|
||||
isLoadingStatus,
|
||||
accounts,
|
||||
hasAnyAccount: accounts.length > 0,
|
||||
isAuthenticated: authStatus?.authenticated ?? false,
|
||||
defaultAccountId: authStatus?.default_account_id ?? null,
|
||||
migrationError: authStatus?.migration_error ?? null,
|
||||
pollingState,
|
||||
deviceCode,
|
||||
error,
|
||||
isPolling: pollingState === "polling",
|
||||
isAddingAccount: startLoginMutation.isPending || pollingState === "polling",
|
||||
isRemovingAccount: removeAccountMutation.isPending,
|
||||
isSettingDefaultAccount: setDefaultAccountMutation.isPending,
|
||||
startAuth,
|
||||
addAccount: startAuth,
|
||||
cancelAuth,
|
||||
logout,
|
||||
removeAccount,
|
||||
setDefaultAccount,
|
||||
refetchStatus,
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,55 @@
|
||||
import { Github, ShieldCheck } from "lucide-react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { Badge } from "@/components/ui/badge";
|
||||
import { CopilotAuthSection } from "@/components/providers/forms/CopilotAuthSection";
|
||||
|
||||
export function AuthCenterPanel() {
|
||||
const { t } = useTranslation();
|
||||
|
||||
return (
|
||||
<div className="space-y-6">
|
||||
<section className="rounded-xl border border-border/60 bg-card/60 p-6">
|
||||
<div className="flex items-start justify-between gap-4">
|
||||
<div className="space-y-2">
|
||||
<div className="flex items-center gap-2">
|
||||
<ShieldCheck className="h-5 w-5 text-primary" />
|
||||
<h3 className="text-base font-semibold">
|
||||
{t("settings.authCenter.title", {
|
||||
defaultValue: "OAuth 认证中心",
|
||||
})}
|
||||
</h3>
|
||||
</div>
|
||||
<p className="text-sm text-muted-foreground">
|
||||
{t("settings.authCenter.description", {
|
||||
defaultValue:
|
||||
"集中管理跨应用复用的 OAuth 账号。Provider 只绑定这些认证源，不再重复登录。",
|
||||
})}
|
||||
</p>
|
||||
</div>
|
||||
<Badge variant="secondary">
|
||||
{t("settings.authCenter.beta", { defaultValue: "Beta" })}
|
||||
</Badge>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section className="rounded-xl border border-border/60 bg-card/60 p-6">
|
||||
<div className="mb-4 flex items-center gap-3">
|
||||
<div className="flex h-10 w-10 items-center justify-center rounded-xl bg-muted">
|
||||
<Github className="h-5 w-5" />
|
||||
</div>
|
||||
<div>
|
||||
<h4 className="font-medium">GitHub Copilot</h4>
|
||||
<p className="text-sm text-muted-foreground">
|
||||
{t("settings.authCenter.copilotDescription", {
|
||||
defaultValue:
|
||||
"管理 GitHub Copilot 账号、默认账号以及供 Claude / Codex / Gemini 绑定的托管凭据。",
|
||||
})}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<CopilotAuthSection />
|
||||
</section>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -9,6 +9,7 @@ import {
|
||||
ScrollText,
|
||||
HardDriveDownload,
|
||||
FlaskConical,
|
||||
KeyRound,
|
||||
} from "lucide-react";
|
||||
import { toast } from "sonner";
|
||||
import {
|
||||
@@ -42,6 +43,7 @@ import { ProxyTabContent } from "@/components/settings/ProxyTabContent";
|
||||
import { ModelTestConfigPanel } from "@/components/usage/ModelTestConfigPanel";
|
||||
import { UsageDashboard } from "@/components/usage/UsageDashboard";
|
||||
import { LogConfigPanel } from "@/components/settings/LogConfigPanel";
|
||||
import { AuthCenterPanel } from "@/components/settings/AuthCenterPanel";
|
||||
import { useSettings } from "@/hooks/useSettings";
|
||||
import { useImportExport } from "@/hooks/useImportExport";
|
||||
import { useTranslation } from "react-i18next";
|
||||
@@ -189,11 +191,14 @@ export function SettingsPage({
|
||||
onValueChange={setActiveTab}
|
||||
className="flex flex-col h-full"
|
||||
>
|
||||
<TabsList className="grid w-full grid-cols-5 mb-6 glass rounded-lg">
|
||||
<TabsList className="grid w-full grid-cols-6 mb-6 glass rounded-lg">
|
||||
<TabsTrigger value="general">
|
||||
{t("settings.tabGeneral")}
|
||||
</TabsTrigger>
|
||||
<TabsTrigger value="proxy">{t("settings.tabProxy")}</TabsTrigger>
|
||||
<TabsTrigger value="auth">
|
||||
{t("settings.tabAuth", { defaultValue: "认证" })}
|
||||
</TabsTrigger>
|
||||
<TabsTrigger value="advanced">
|
||||
{t("settings.tabAdvanced")}
|
||||
</TabsTrigger>
|
||||
@@ -249,6 +254,34 @@ export function SettingsPage({
|
||||
) : null}
|
||||
</TabsContent>
|
||||
|
||||
<TabsContent value="auth" className="space-y-6 mt-0 pb-4">
|
||||
<motion.div
|
||||
initial={{ opacity: 0, y: 10 }}
|
||||
animate={{ opacity: 1, y: 0 }}
|
||||
transition={{ duration: 0.3 }}
|
||||
className="space-y-6"
|
||||
>
|
||||
<div className="flex items-center gap-3 px-1">
|
||||
<KeyRound className="h-5 w-5 text-primary" />
|
||||
<div>
|
||||
<h2 className="text-base font-semibold">
|
||||
{t("settings.authCenter.heading", {
|
||||
defaultValue: "认证中心",
|
||||
})}
|
||||
</h2>
|
||||
<p className="text-sm text-muted-foreground">
|
||||
{t("settings.authCenter.headingDescription", {
|
||||
defaultValue:
|
||||
"统一管理可跨应用复用的 OAuth 账号和默认认证来源。",
|
||||
})}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<AuthCenterPanel />
|
||||
</motion.div>
|
||||
</TabsContent>
|
||||
|
||||
<TabsContent value="advanced" className="space-y-6 mt-0 pb-4">
|
||||
{settings ? (
|
||||
<motion.div
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { useTranslation } from "react-i18next";
|
||||
import type { SettingsFormState } from "@/hooks/useSettings";
|
||||
import { AppWindow, MonitorUp, Power, EyeOff, Search } from "lucide-react";
|
||||
import { AppWindow, MonitorUp, Power, EyeOff } from "lucide-react";
|
||||
import { ToggleRow } from "@/components/ui/toggle-row";
|
||||
import { AnimatePresence, motion } from "framer-motion";
|
||||
|
||||
@@ -66,14 +66,6 @@ export function WindowSettings({ settings, onChange }: WindowSettingsProps) {
|
||||
onCheckedChange={(value) => onChange({ skipClaudeOnboarding: value })}
|
||||
/>
|
||||
|
||||
<ToggleRow
|
||||
icon={<Search className="h-4 w-4 text-amber-500" />}
|
||||
title={t("settings.toolSearchBypass")}
|
||||
description={t("settings.toolSearchBypassDescription")}
|
||||
checked={!!settings.toolSearchBypass}
|
||||
onCheckedChange={(value) => onChange({ toolSearchBypass: value })}
|
||||
/>
|
||||
|
||||
<ToggleRow
|
||||
icon={<AppWindow className="h-4 w-4 text-blue-500" />}
|
||||
title={t("settings.minimizeToTray")}
|
||||
|
||||
@@ -50,6 +50,13 @@ export interface ProviderPreset {
|
||||
// - "openai_chat": OpenAI Chat Completions 格式，需要格式转换
|
||||
// - "openai_responses": OpenAI Responses API 格式，需要格式转换
|
||||
apiFormat?: "anthropic" | "openai_chat" | "openai_responses";
|
||||
|
||||
// 供应商类型标识（用于特殊供应商检测）
|
||||
// - "github_copilot": GitHub Copilot 供应商（需要 OAuth 认证）
|
||||
providerType?: "github_copilot";
|
||||
|
||||
// 是否需要 OAuth 认证（而非 API Key）
|
||||
requiresOAuth?: boolean;
|
||||
}
|
||||
|
||||
export const providerPresets: ProviderPreset[] = [
|
||||
@@ -679,6 +686,25 @@ export const providerPresets: ProviderPreset[] = [
|
||||
icon: "novita",
|
||||
iconColor: "#000000",
|
||||
},
|
||||
{
|
||||
name: "GitHub Copilot",
|
||||
websiteUrl: "https://github.com/features/copilot",
|
||||
settingsConfig: {
|
||||
env: {
|
||||
ANTHROPIC_BASE_URL: "https://api.githubcopilot.com",
|
||||
ANTHROPIC_MODEL: "claude-opus-4.6",
|
||||
ANTHROPIC_DEFAULT_HAIKU_MODEL: "claude-haiku-4.5",
|
||||
ANTHROPIC_DEFAULT_SONNET_MODEL: "claude-sonnet-4.6",
|
||||
ANTHROPIC_DEFAULT_OPUS_MODEL: "claude-opus-4.6",
|
||||
},
|
||||
},
|
||||
category: "third_party",
|
||||
apiFormat: "openai_chat",
|
||||
providerType: "github_copilot",
|
||||
requiresOAuth: true,
|
||||
icon: "github",
|
||||
iconColor: "#000000",
|
||||
},
|
||||
{
|
||||
name: "Nvidia",
|
||||
websiteUrl: "https://build.nvidia.com",
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
// Provider 类型常量
|
||||
export const PROVIDER_TYPES = {
|
||||
GITHUB_COPILOT: "github_copilot",
|
||||
} as const;
|
||||
|
||||
// 用量脚本模板类型常量
|
||||
export const TEMPLATE_TYPES = {
|
||||
CUSTOM: "custom",
|
||||
GENERAL: "general",
|
||||
NEW_API: "newapi",
|
||||
GITHUB_COPILOT: "github_copilot",
|
||||
} as const;
|
||||
|
||||
export type TemplateType =
|
||||
(typeof TEMPLATE_TYPES)[keyof typeof TEMPLATE_TYPES];
|
||||
@@ -300,6 +300,7 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [
|
||||
options: {
|
||||
baseURL: "https://api.deepseek.com/v1",
|
||||
apiKey: "",
|
||||
setCacheKey: true,
|
||||
},
|
||||
models: {
|
||||
"deepseek-chat": { name: "DeepSeek V3.2" },
|
||||
@@ -327,6 +328,7 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [
|
||||
options: {
|
||||
baseURL: "https://open.bigmodel.cn/api/paas/v4",
|
||||
apiKey: "",
|
||||
setCacheKey: true,
|
||||
},
|
||||
models: {
|
||||
"glm-5": { name: "GLM-5" },
|
||||
@@ -359,6 +361,7 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [
|
||||
options: {
|
||||
baseURL: "https://api.z.ai/v1",
|
||||
apiKey: "",
|
||||
setCacheKey: true,
|
||||
},
|
||||
models: {
|
||||
"glm-5": { name: "GLM-5" },
|
||||
@@ -391,6 +394,7 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [
|
||||
options: {
|
||||
baseURL: "https://dashscope.aliyuncs.com/compatible-mode/v1",
|
||||
apiKey: "",
|
||||
setCacheKey: true,
|
||||
},
|
||||
models: {},
|
||||
},
|
||||
@@ -421,6 +425,7 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [
|
||||
options: {
|
||||
baseURL: "https://api.moonshot.cn/v1",
|
||||
apiKey: "",
|
||||
setCacheKey: true,
|
||||
},
|
||||
models: {
|
||||
"kimi-k2.5": { name: "Kimi K2.5" },
|
||||
@@ -453,6 +458,7 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [
|
||||
options: {
|
||||
baseURL: "https://api.kimi.com/v1",
|
||||
apiKey: "",
|
||||
setCacheKey: true,
|
||||
},
|
||||
models: {
|
||||
"kimi-for-coding": { name: "Kimi For Coding" },
|
||||
@@ -485,6 +491,7 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [
|
||||
options: {
|
||||
baseURL: "https://api.stepfun.ai/v1",
|
||||
apiKey: "",
|
||||
setCacheKey: true,
|
||||
},
|
||||
models: {
|
||||
"step-3.5-flash": { name: "Step 3.5 Flash" },
|
||||
@@ -517,6 +524,7 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [
|
||||
options: {
|
||||
baseURL: "https://api-inference.modelscope.cn/v1",
|
||||
apiKey: "",
|
||||
setCacheKey: true,
|
||||
},
|
||||
models: {
|
||||
"ZhipuAI/GLM-5": { name: "GLM-5" },
|
||||
@@ -550,6 +558,7 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [
|
||||
baseURL:
|
||||
"https://vanchin.streamlake.ai/api/gateway/v1/endpoints/${ENDPOINT_ID}/openai",
|
||||
apiKey: "",
|
||||
setCacheKey: true,
|
||||
},
|
||||
models: {
|
||||
"KAT-Coder-Pro": { name: "KAT-Coder Pro" },
|
||||
@@ -589,6 +598,7 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [
|
||||
options: {
|
||||
baseURL: "https://api.longcat.chat/v1",
|
||||
apiKey: "",
|
||||
setCacheKey: true,
|
||||
},
|
||||
models: {
|
||||
"LongCat-Flash-Chat": { name: "LongCat Flash Chat" },
|
||||
@@ -621,6 +631,7 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [
|
||||
options: {
|
||||
baseURL: "https://api.minimaxi.com/v1",
|
||||
apiKey: "",
|
||||
setCacheKey: true,
|
||||
},
|
||||
models: {
|
||||
"MiniMax-M2.5": { name: "MiniMax M2.5" },
|
||||
@@ -653,6 +664,7 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [
|
||||
options: {
|
||||
baseURL: "https://api.minimax.io/v1",
|
||||
apiKey: "",
|
||||
setCacheKey: true,
|
||||
},
|
||||
models: {
|
||||
"MiniMax-M2.5": { name: "MiniMax M2.5" },
|
||||
@@ -685,6 +697,7 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [
|
||||
options: {
|
||||
baseURL: "https://ark.cn-beijing.volces.com/api/v3",
|
||||
apiKey: "",
|
||||
setCacheKey: true,
|
||||
},
|
||||
models: {
|
||||
"doubao-seed-2-0-code-preview-latest": {
|
||||
@@ -712,6 +725,7 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [
|
||||
options: {
|
||||
baseURL: "https://api.tbox.cn/v1",
|
||||
apiKey: "",
|
||||
setCacheKey: true,
|
||||
},
|
||||
models: {
|
||||
"Ling-2.5-1T": { name: "Ling 2.5-1T" },
|
||||
@@ -736,6 +750,7 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [
|
||||
options: {
|
||||
baseURL: "https://api.xiaomimimo.com/v1",
|
||||
apiKey: "",
|
||||
setCacheKey: true,
|
||||
},
|
||||
models: {
|
||||
"mimo-v2-flash": { name: "MiMo V2 Flash" },
|
||||
@@ -763,6 +778,7 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [
|
||||
options: {
|
||||
baseURL: "https://aihubmix.com/v1",
|
||||
apiKey: "",
|
||||
setCacheKey: true,
|
||||
},
|
||||
models: {
|
||||
"claude-sonnet-4-6": { name: "Claude Sonnet 4.6" },
|
||||
@@ -790,6 +806,7 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [
|
||||
options: {
|
||||
baseURL: "https://www.dmxapi.cn/v1",
|
||||
apiKey: "",
|
||||
setCacheKey: true,
|
||||
},
|
||||
models: {
|
||||
"claude-sonnet-4-6": { name: "Claude Sonnet 4.6" },
|
||||
@@ -817,6 +834,7 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [
|
||||
options: {
|
||||
baseURL: "https://openrouter.ai/api/v1",
|
||||
apiKey: "",
|
||||
setCacheKey: true,
|
||||
},
|
||||
models: {
|
||||
"anthropic/claude-sonnet-4.6": { name: "Claude Sonnet 4.6" },
|
||||
@@ -844,6 +862,7 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [
|
||||
options: {
|
||||
baseURL: "https://api.novita.ai/openai",
|
||||
apiKey: "",
|
||||
setCacheKey: true,
|
||||
},
|
||||
models: {
|
||||
"zai-org/glm-5": { name: "GLM-5" },
|
||||
@@ -870,6 +889,7 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [
|
||||
options: {
|
||||
baseURL: "https://integrate.api.nvidia.com/v1",
|
||||
apiKey: "",
|
||||
setCacheKey: true,
|
||||
},
|
||||
models: {
|
||||
"moonshotai/kimi-k2.5": { name: "Kimi K2.5" },
|
||||
@@ -897,6 +917,7 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [
|
||||
options: {
|
||||
baseURL: "https://www.packyapi.com/v1",
|
||||
apiKey: "",
|
||||
setCacheKey: true,
|
||||
},
|
||||
models: {
|
||||
"claude-sonnet-4-6": { name: "Claude Sonnet 4.6" },
|
||||
@@ -925,6 +946,7 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [
|
||||
options: {
|
||||
baseURL: "https://api.cubence.com/v1",
|
||||
apiKey: "",
|
||||
setCacheKey: true,
|
||||
},
|
||||
models: {
|
||||
"claude-sonnet-4-6": { name: "Claude Sonnet 4.6" },
|
||||
@@ -954,6 +976,7 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [
|
||||
options: {
|
||||
baseURL: "https://api.aigocode.com",
|
||||
apiKey: "",
|
||||
setCacheKey: true,
|
||||
},
|
||||
models: {
|
||||
"claude-sonnet-4-6": { name: "Claude Sonnet 4.6" },
|
||||
@@ -983,6 +1006,7 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [
|
||||
options: {
|
||||
baseURL: "https://right.codes/codex/v1",
|
||||
apiKey: "",
|
||||
setCacheKey: true,
|
||||
},
|
||||
models: {
|
||||
"gpt-5.4": { name: "GPT-5.4" },
|
||||
@@ -1011,6 +1035,7 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [
|
||||
options: {
|
||||
baseURL: "https://api.aicodemirror.com/api/claudecode",
|
||||
apiKey: "",
|
||||
setCacheKey: true,
|
||||
},
|
||||
models: {
|
||||
"claude-sonnet-4.6": { name: "Claude Sonnet 4.6" },
|
||||
@@ -1040,6 +1065,7 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [
|
||||
options: {
|
||||
baseURL: "https://api.aicoding.sh",
|
||||
apiKey: "",
|
||||
setCacheKey: true,
|
||||
},
|
||||
models: {
|
||||
"claude-sonnet-4-6": { name: "Claude Sonnet 4.6" },
|
||||
@@ -1069,6 +1095,7 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [
|
||||
options: {
|
||||
baseURL: "https://crazyrouter.com",
|
||||
apiKey: "",
|
||||
setCacheKey: true,
|
||||
},
|
||||
models: {
|
||||
"claude-sonnet-4-6": { name: "Claude Sonnet 4.6" },
|
||||
@@ -1098,6 +1125,7 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [
|
||||
options: {
|
||||
baseURL: "https://node-hk.sssaicode.com/api/v1",
|
||||
apiKey: "",
|
||||
setCacheKey: true,
|
||||
},
|
||||
models: {
|
||||
"claude-sonnet-4-6": { name: "Claude Sonnet 4.6" },
|
||||
@@ -1127,6 +1155,7 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [
|
||||
options: {
|
||||
baseURL: "https://www.openclaudecode.cn/v1",
|
||||
apiKey: "",
|
||||
setCacheKey: true,
|
||||
},
|
||||
models: {
|
||||
"claude-opus-4-6": { name: "Claude Opus 4.6" },
|
||||
@@ -1156,6 +1185,7 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [
|
||||
options: {
|
||||
baseURL: "https://x-code.cc/v1",
|
||||
apiKey: "",
|
||||
setCacheKey: true,
|
||||
},
|
||||
models: {
|
||||
"claude-opus-4-6": { name: "Claude Opus 4.6" },
|
||||
@@ -1185,6 +1215,7 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [
|
||||
options: {
|
||||
baseURL: "https://api.ctok.ai/v1",
|
||||
apiKey: "",
|
||||
setCacheKey: true,
|
||||
},
|
||||
models: {
|
||||
"claude-opus-4-6": { name: "Claude Opus 4.6" },
|
||||
@@ -1214,6 +1245,7 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [
|
||||
region: "${region}",
|
||||
accessKeyId: "${accessKeyId}",
|
||||
secretAccessKey: "${secretAccessKey}",
|
||||
setCacheKey: true,
|
||||
},
|
||||
models: {
|
||||
"global.anthropic.claude-opus-4-6-v1": { name: "Claude Opus 4.6" },
|
||||
@@ -1260,6 +1292,7 @@ export const opencodeProviderPresets: OpenCodeProviderPreset[] = [
|
||||
options: {
|
||||
baseURL: "",
|
||||
apiKey: "",
|
||||
setCacheKey: true,
|
||||
},
|
||||
models: {},
|
||||
},
|
||||
|
||||
@@ -197,44 +197,6 @@ export function useSettings(): UseSettingsResult {
|
||||
}
|
||||
}
|
||||
|
||||
// Tool Search bypass: apply/restore patch when toggled
|
||||
const nextToolSearchBypass = updates.toolSearchBypass;
|
||||
if (
|
||||
nextToolSearchBypass !== undefined &&
|
||||
nextToolSearchBypass !== (data?.toolSearchBypass ?? false)
|
||||
) {
|
||||
try {
|
||||
const results = nextToolSearchBypass
|
||||
? await settingsApi.applyToolSearchPatch()
|
||||
: await settingsApi.restoreToolSearchPatch();
|
||||
const failed = results.find((r) => !r.success);
|
||||
if (failed) {
|
||||
throw new Error(failed.error ?? "Tool Search patch failed");
|
||||
}
|
||||
} catch (error) {
|
||||
console.warn(
|
||||
"[useSettings] Failed to sync Tool Search bypass",
|
||||
error,
|
||||
);
|
||||
// Rollback: revert the setting we already saved
|
||||
const rolledBack = {
|
||||
...payload,
|
||||
toolSearchBypass: !nextToolSearchBypass,
|
||||
};
|
||||
await saveMutation.mutateAsync(rolledBack);
|
||||
updateSettings({ toolSearchBypass: !nextToolSearchBypass });
|
||||
toast.error(
|
||||
nextToolSearchBypass
|
||||
? t("notifications.toolSearchPatchFailed", {
|
||||
defaultValue: "Tool Search 补丁操作失败",
|
||||
})
|
||||
: t("notifications.toolSearchRestoreFailed", {
|
||||
defaultValue: "Tool Search 恢复操作失败",
|
||||
}),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
// 持久化语言偏好
|
||||
try {
|
||||
if (typeof window !== "undefined" && updates.language) {
|
||||
@@ -266,7 +228,7 @@ export function useSettings(): UseSettingsResult {
|
||||
throw error;
|
||||
}
|
||||
},
|
||||
[data, saveMutation, settings, t, updateSettings],
|
||||
[data, saveMutation, settings, t],
|
||||
);
|
||||
|
||||
// 完整保存设置（用于 Advanced 标签页的手动保存）
|
||||
|
||||
@@ -85,7 +85,6 @@ export function useSettingsForm(): UseSettingsFormResult {
|
||||
data.enableClaudePluginIntegration ?? false,
|
||||
silentStartup: data.silentStartup ?? false,
|
||||
skipClaudeOnboarding: data.skipClaudeOnboarding ?? false,
|
||||
toolSearchBypass: data.toolSearchBypass ?? false,
|
||||
claudeConfigDir: sanitizeDir(data.claudeConfigDir),
|
||||
codexConfigDir: sanitizeDir(data.codexConfigDir),
|
||||
geminiConfigDir: sanitizeDir(data.geminiConfigDir),
|
||||
@@ -108,7 +107,6 @@ export function useSettingsForm(): UseSettingsFormResult {
|
||||
minimizeToTrayOnClose: true,
|
||||
enableClaudePluginIntegration: false,
|
||||
skipClaudeOnboarding: false,
|
||||
toolSearchBypass: false,
|
||||
language: readPersistedLanguage(),
|
||||
} as SettingsFormState);
|
||||
|
||||
@@ -145,7 +143,6 @@ export function useSettingsForm(): UseSettingsFormResult {
|
||||
serverData.enableClaudePluginIntegration ?? false,
|
||||
silentStartup: serverData.silentStartup ?? false,
|
||||
skipClaudeOnboarding: serverData.skipClaudeOnboarding ?? false,
|
||||
toolSearchBypass: serverData.toolSearchBypass ?? false,
|
||||
claudeConfigDir: sanitizeDir(serverData.claudeConfigDir),
|
||||
codexConfigDir: sanitizeDir(serverData.codexConfigDir),
|
||||
geminiConfigDir: sanitizeDir(serverData.geminiConfigDir),
|
||||
|
||||
@@ -63,8 +63,9 @@
|
||||
"extractFailed": "Extract failed: {{error}}",
|
||||
"saveFailed": "Save failed: {{error}}",
|
||||
"hideAttribution": "Hide AI Attribution",
|
||||
"alwaysThinking": "Extended Thinking",
|
||||
"enableTeammates": "Teammates Mode"
|
||||
"enableTeammates": "Teammates Mode",
|
||||
"enableToolSearch": "Enable Tool Search",
|
||||
"effortHigh": "High Effort Thinking"
|
||||
},
|
||||
"header": {
|
||||
"viewOnGithub": "View on GitHub",
|
||||
@@ -166,8 +167,6 @@
|
||||
"syncClaudePluginFailed": "Sync Claude plugin failed",
|
||||
"skipClaudeOnboardingFailed": "Failed to skip Claude Code first-run confirmation",
|
||||
"clearClaudeOnboardingSkipFailed": "Failed to restore Claude Code first-run confirmation",
|
||||
"toolSearchPatchFailed": "Failed to apply Tool Search patch",
|
||||
"toolSearchRestoreFailed": "Failed to restore Tool Search patch",
|
||||
"updateSuccess": "Provider updated successfully",
|
||||
"updateFailed": "Failed to update provider: {{error}}",
|
||||
"deleteSuccess": "Provider deleted",
|
||||
@@ -465,8 +464,6 @@
|
||||
"enableClaudePluginIntegrationDescription": "When enabled, the VS Code Claude Code extension provider will switch with this app",
|
||||
"skipClaudeOnboarding": "Skip Claude Code first-run confirmation",
|
||||
"skipClaudeOnboardingDescription": "When enabled, Claude Code will skip the first-run confirmation",
|
||||
"toolSearchBypass": "Bypass Tool Search domain restriction",
|
||||
"toolSearchBypassDescription": "Remove the Tool Search domain whitelist in the active Claude Code installation. Auto-reapplied after that installation updates",
|
||||
"appVisibility": {
|
||||
"title": "Homepage Display",
|
||||
"description": "Choose which apps to show on the homepage",
|
||||
@@ -760,11 +757,45 @@
|
||||
"smallModelPlaceholder": "",
|
||||
"haikuModelPlaceholder": "",
|
||||
"modelHelper": "Optional: Specify default Claude model to use, leave blank to use system default.",
|
||||
"modelMappingLabel": "Model Mapping",
|
||||
"modelMappingHint": "Usually not needed if the provider natively serves Claude models. Only configure when you need to map requests to different model names.",
|
||||
"advancedOptionsToggle": "Advanced Options",
|
||||
"advancedOptionsHint": "Includes API format, auth field, and model mapping. Defaults work for most use cases.",
|
||||
"categoryOfficial": "Official",
|
||||
"categoryCnOfficial": "Opensource Official",
|
||||
"categoryAggregation": "Aggregation",
|
||||
"categoryThirdParty": "Third Party"
|
||||
},
|
||||
"copilot": {
|
||||
"authSection": "GitHub Copilot Authentication",
|
||||
"authStatus": "Authentication Status",
|
||||
"authenticated": "Authenticated as {{username}}",
|
||||
"notAuthenticated": "Not authenticated",
|
||||
"loginWithGitHub": "Login with GitHub",
|
||||
"loginRequired": "Please login to GitHub Copilot first",
|
||||
"waitingForAuth": "Waiting for authorization...",
|
||||
"enterCode": "Please enter the code in your browser:",
|
||||
"logout": "Logout",
|
||||
"authSuccess": "GitHub Copilot authentication successful",
|
||||
"authFailed": "Authentication failed: {{error}}",
|
||||
"authTimeout": "Authentication timed out, please try again",
|
||||
"tokenExpired": "Token expired, please re-authenticate",
|
||||
"accountCount": "{{count}} account(s)",
|
||||
"selectAccount": "Select Account",
|
||||
"selectAccountPlaceholder": "Select a GitHub account",
|
||||
"useDefaultAccount": "Use default account",
|
||||
"loggedInAccounts": "Logged in accounts",
|
||||
"defaultAccount": "Default",
|
||||
"selected": "Selected",
|
||||
"removeAccount": "Remove account",
|
||||
"setAsDefault": "Set as default",
|
||||
"addAnotherAccount": "Add another account",
|
||||
"logoutAll": "Logout all accounts",
|
||||
"retry": "Retry",
|
||||
"copyCode": "Copy code",
|
||||
"migrationFailed": "Legacy auth migration failed: {{error}}",
|
||||
"loadModelsFailed": "Failed to load Copilot models"
|
||||
},
|
||||
"endpointTest": {
|
||||
"title": "API Endpoint Management",
|
||||
"endpoints": "endpoints",
|
||||
@@ -835,7 +866,10 @@
|
||||
"saveFailed": "Save failed: {{error}}",
|
||||
"modelNameHint": "Specify the model to use, will be auto-updated in config.toml",
|
||||
"modelName": "Model Name",
|
||||
"modelNamePlaceholder": "e.g., gpt-5-codex"
|
||||
"modelNamePlaceholder": "e.g., gpt-5-codex",
|
||||
"contextWindow1M": "1M Context Window",
|
||||
"autoCompactLimit": "Auto Compact Limit",
|
||||
"autoCompactLimitHint": "Auto-compacts history when context reaches this token limit"
|
||||
},
|
||||
"geminiConfig": {
|
||||
"envFile": "Environment Variables (.env)",
|
||||
@@ -1017,6 +1051,10 @@
|
||||
"templateCustom": "Custom",
|
||||
"templateGeneral": "General",
|
||||
"templateNewAPI": "NewAPI",
|
||||
"templateCopilot": "GitHub Copilot",
|
||||
"copilotAutoAuth": "Auto OAuth authentication, no manual credentials needed",
|
||||
"resetDate": "Reset date",
|
||||
"premiumRequests": "Premium Requests",
|
||||
"credentialsConfig": "Credentials",
|
||||
"credentialsHint": "Leave empty to use provider config",
|
||||
"optional": "optional",
|
||||
|
||||
@@ -63,8 +63,9 @@
|
||||
"extractFailed": "抽出に失敗しました: {{error}}",
|
||||
"saveFailed": "保存に失敗しました: {{error}}",
|
||||
"hideAttribution": "AI署名を非表示",
|
||||
"alwaysThinking": "拡張思考",
|
||||
"enableTeammates": "Teammates モード"
|
||||
"enableTeammates": "Teammates モード",
|
||||
"enableToolSearch": "Tool Search を有効化",
|
||||
"effortHigh": "高強度思考"
|
||||
},
|
||||
"header": {
|
||||
"viewOnGithub": "GitHub で見る",
|
||||
@@ -166,8 +167,6 @@
|
||||
"syncClaudePluginFailed": "Claude プラグインとの同期に失敗しました",
|
||||
"skipClaudeOnboardingFailed": "Claude Code の初回確認スキップに失敗しました",
|
||||
"clearClaudeOnboardingSkipFailed": "Claude Code の初回確認の復元に失敗しました",
|
||||
"toolSearchPatchFailed": "Tool Search パッチの適用に失敗しました",
|
||||
"toolSearchRestoreFailed": "Tool Search パッチの復元に失敗しました",
|
||||
"updateSuccess": "プロバイダーを更新しました",
|
||||
"updateFailed": "プロバイダーの更新に失敗しました: {{error}}",
|
||||
"deleteSuccess": "プロバイダーを削除しました",
|
||||
@@ -465,8 +464,6 @@
|
||||
"enableClaudePluginIntegrationDescription": "オンにすると VS Code の Claude Code 拡張のプロバイダーも同期します",
|
||||
"skipClaudeOnboarding": "Claude Code の初回確認をスキップ",
|
||||
"skipClaudeOnboardingDescription": "オンにすると Claude Code の初回インストール確認をスキップします",
|
||||
"toolSearchBypass": "Tool Search ドメイン制限を解除",
|
||||
"toolSearchBypassDescription": "現在アクティブな Claude Code インストールの Tool Search ドメインホワイトリスト制限を解除します。そのインストールの更新後は自動で再適用されます",
|
||||
"appVisibility": {
|
||||
"title": "ホームページ表示",
|
||||
"description": "ホームページに表示するアプリを選択",
|
||||
@@ -760,11 +757,45 @@
|
||||
"smallModelPlaceholder": "",
|
||||
"haikuModelPlaceholder": "",
|
||||
"modelHelper": "任意: 既定で使いたい Claude モデルを指定。空欄ならシステム既定を使用します。",
|
||||
"modelMappingLabel": "モデルマッピング",
|
||||
"modelMappingHint": "プロバイダーが Claude モデルをネイティブ提供している場合、通常は設定不要です。リクエストを別のモデル名にマッピングする場合のみ設定してください。",
|
||||
"advancedOptionsToggle": "高級オプション",
|
||||
"advancedOptionsHint": "API フォーマット、認証フィールド、モデルマッピングの設定を含みます。通常はデフォルトのままで問題ありません。",
|
||||
"categoryOfficial": "公式",
|
||||
"categoryCnOfficial": "オープンソース公式",
|
||||
"categoryAggregation": "アグリゲーター",
|
||||
"categoryThirdParty": "サードパーティ"
|
||||
},
|
||||
"copilot": {
|
||||
"authSection": "GitHub Copilot 認証",
|
||||
"authStatus": "認証状態",
|
||||
"authenticated": "認証済み: {{username}}",
|
||||
"notAuthenticated": "未認証",
|
||||
"loginWithGitHub": "GitHub でログイン",
|
||||
"loginRequired": "先に GitHub Copilot にログインしてください",
|
||||
"waitingForAuth": "認証を待っています...",
|
||||
"enterCode": "ブラウザで以下のコードを入力してください：",
|
||||
"logout": "ログアウト",
|
||||
"authSuccess": "GitHub Copilot 認証に成功しました",
|
||||
"authFailed": "認証に失敗しました: {{error}}",
|
||||
"authTimeout": "認証がタイムアウトしました。もう一度お試しください",
|
||||
"tokenExpired": "トークンの有効期限が切れました。再認証してください",
|
||||
"accountCount": "{{count}} アカウント",
|
||||
"selectAccount": "アカウントを選択",
|
||||
"selectAccountPlaceholder": "GitHub アカウントを選択",
|
||||
"useDefaultAccount": "デフォルトアカウントを使用",
|
||||
"loggedInAccounts": "ログイン済みアカウント",
|
||||
"defaultAccount": "デフォルト",
|
||||
"selected": "選択中",
|
||||
"removeAccount": "アカウントを削除",
|
||||
"setAsDefault": "デフォルトに設定",
|
||||
"addAnotherAccount": "別のアカウントを追加",
|
||||
"logoutAll": "すべてのアカウントをログアウト",
|
||||
"retry": "再試行",
|
||||
"copyCode": "コードをコピー",
|
||||
"migrationFailed": "旧認証データの移行に失敗しました: {{error}}",
|
||||
"loadModelsFailed": "Copilot モデル一覧の読み込みに失敗しました"
|
||||
},
|
||||
"endpointTest": {
|
||||
"title": "API エンドポイント管理",
|
||||
"endpoints": "エンドポイント",
|
||||
@@ -835,7 +866,10 @@
|
||||
"saveFailed": "保存に失敗しました: {{error}}",
|
||||
"modelNameHint": "使用するモデルを指定します。config.toml に自動更新されます",
|
||||
"modelName": "モデル名",
|
||||
"modelNamePlaceholder": "例: gpt-5-codex"
|
||||
"modelNamePlaceholder": "例: gpt-5-codex",
|
||||
"contextWindow1M": "1M コンテキストウィンドウ",
|
||||
"autoCompactLimit": "自動圧縮しきい値",
|
||||
"autoCompactLimitHint": "コンテキストトークン数がこのしきい値に達すると履歴を自動圧縮"
|
||||
},
|
||||
"geminiConfig": {
|
||||
"envFile": "環境変数 (.env)",
|
||||
@@ -1017,6 +1051,10 @@
|
||||
"templateCustom": "カスタム",
|
||||
"templateGeneral": "General",
|
||||
"templateNewAPI": "NewAPI",
|
||||
"templateCopilot": "GitHub Copilot",
|
||||
"copilotAutoAuth": "OAuth 認証を自動使用、手動設定不要",
|
||||
"resetDate": "リセット日",
|
||||
"premiumRequests": "Premium リクエスト",
|
||||
"credentialsConfig": "認証情報",
|
||||
"credentialsHint": "空欄の場合はプロバイダー設定を使用",
|
||||
"optional": "オプション",
|
||||
|
||||
@@ -63,8 +63,9 @@
|
||||
"extractFailed": "提取失败: {{error}}",
|
||||
"saveFailed": "保存失败: {{error}}",
|
||||
"hideAttribution": "隐藏 AI 署名",
|
||||
"alwaysThinking": "扩展思考",
|
||||
"enableTeammates": "Teammates 模式"
|
||||
"enableTeammates": "Teammates 模式",
|
||||
"enableToolSearch": "启用 Tool Search",
|
||||
"effortHigh": "高强度思考"
|
||||
},
|
||||
"header": {
|
||||
"viewOnGithub": "在 GitHub 上查看",
|
||||
@@ -166,8 +167,6 @@
|
||||
"syncClaudePluginFailed": "同步 Claude 插件失败",
|
||||
"skipClaudeOnboardingFailed": "跳过 Claude Code 初次安装确认失败",
|
||||
"clearClaudeOnboardingSkipFailed": "恢复 Claude Code 初次安装确认失败",
|
||||
"toolSearchPatchFailed": "Tool Search 补丁操作失败",
|
||||
"toolSearchRestoreFailed": "Tool Search 恢复操作失败",
|
||||
"updateSuccess": "供应商更新成功",
|
||||
"updateFailed": "更新供应商失败：{{error}}",
|
||||
"deleteSuccess": "供应商已删除",
|
||||
@@ -465,8 +464,6 @@
|
||||
"enableClaudePluginIntegrationDescription": "开启后 Vscode Claude Code 插件的供应商将随本软件切换",
|
||||
"skipClaudeOnboarding": "跳过 Claude Code 初次安装确认",
|
||||
"skipClaudeOnboardingDescription": "开启后跳过 Claude Code 初次安装确认",
|
||||
"toolSearchBypass": "解除 Tool Search 域名限制",
|
||||
"toolSearchBypassDescription": "解除当前活跃 Claude Code 安装的 Tool Search 域名白名单限制。该安装更新后会自动重新应用",
|
||||
"appVisibility": {
|
||||
"title": "主页面显示",
|
||||
"description": "选择在主页面显示的应用",
|
||||
@@ -760,11 +757,45 @@
|
||||
"smallModelPlaceholder": "",
|
||||
"haikuModelPlaceholder": "",
|
||||
"modelHelper": "可选：指定默认使用的 Claude 模型，留空则使用系统默认。",
|
||||
"modelMappingLabel": "模型映射",
|
||||
"modelMappingHint": "如果供应商原生提供 Claude 系列模型，通常无需配置。仅在需要将请求映射到不同模型名称时填写。",
|
||||
"advancedOptionsToggle": "高级选项",
|
||||
"advancedOptionsHint": "包含 API 格式、认证字段、模型映射等配置。大多数场景下保持默认即可。",
|
||||
"categoryOfficial": "官方",
|
||||
"categoryCnOfficial": "开源官方",
|
||||
"categoryAggregation": "聚合服务",
|
||||
"categoryThirdParty": "第三方"
|
||||
},
|
||||
"copilot": {
|
||||
"authSection": "GitHub Copilot 认证",
|
||||
"authStatus": "认证状态",
|
||||
"authenticated": "已认证: {{username}}",
|
||||
"notAuthenticated": "未认证",
|
||||
"loginWithGitHub": "使用 GitHub 登录",
|
||||
"loginRequired": "请先登录 GitHub Copilot",
|
||||
"waitingForAuth": "等待授权中...",
|
||||
"enterCode": "请在浏览器中输入验证码：",
|
||||
"logout": "注销",
|
||||
"authSuccess": "GitHub Copilot 认证成功",
|
||||
"authFailed": "认证失败: {{error}}",
|
||||
"authTimeout": "认证超时，请重试",
|
||||
"tokenExpired": "令牌已过期，请重新认证",
|
||||
"accountCount": "{{count}} 个账号",
|
||||
"selectAccount": "选择账号",
|
||||
"selectAccountPlaceholder": "选择一个 GitHub 账号",
|
||||
"useDefaultAccount": "使用默认账号",
|
||||
"loggedInAccounts": "已登录账号",
|
||||
"defaultAccount": "默认",
|
||||
"selected": "已选中",
|
||||
"removeAccount": "移除账号",
|
||||
"setAsDefault": "设为默认",
|
||||
"addAnotherAccount": "添加其他账号",
|
||||
"logoutAll": "注销所有账号",
|
||||
"retry": "重试",
|
||||
"copyCode": "复制代码",
|
||||
"migrationFailed": "旧认证数据迁移失败：{{error}}",
|
||||
"loadModelsFailed": "加载 Copilot 模型列表失败"
|
||||
},
|
||||
"endpointTest": {
|
||||
"title": "请求地址管理",
|
||||
"endpoints": "个端点",
|
||||
@@ -835,7 +866,10 @@
|
||||
"saveFailed": "保存失败: {{error}}",
|
||||
"modelNameHint": "指定使用的模型，将自动更新到 config.toml 中",
|
||||
"modelName": "模型名称",
|
||||
"modelNamePlaceholder": "例如: gpt-5-codex"
|
||||
"modelNamePlaceholder": "例如: gpt-5-codex",
|
||||
"contextWindow1M": "1M 上下文窗口",
|
||||
"autoCompactLimit": "压缩阈值",
|
||||
"autoCompactLimitHint": "上下文 token 数达到此阈值时自动压缩历史"
|
||||
},
|
||||
"geminiConfig": {
|
||||
"envFile": "环境变量 (.env)",
|
||||
@@ -1017,6 +1051,10 @@
|
||||
"templateCustom": "自定义",
|
||||
"templateGeneral": "通用模板",
|
||||
"templateNewAPI": "NewAPI",
|
||||
"templateCopilot": "GitHub Copilot",
|
||||
"copilotAutoAuth": "自动使用 OAuth 认证，无需手动配置凭证",
|
||||
"resetDate": "重置日期",
|
||||
"premiumRequests": "Premium 请求",
|
||||
"credentialsConfig": "凭证配置",
|
||||
"credentialsHint": "留空则自动使用供应商配置",
|
||||
"optional": "可选",
|
||||
|
||||
@@ -0,0 +1,101 @@
|
||||
import { invoke } from "@tauri-apps/api/core";
|
||||
|
||||
export type ManagedAuthProvider = "github_copilot";
|
||||
|
||||
export interface ManagedAuthAccount {
|
||||
id: string;
|
||||
provider: ManagedAuthProvider;
|
||||
login: string;
|
||||
avatar_url: string | null;
|
||||
authenticated_at: number;
|
||||
is_default: boolean;
|
||||
}
|
||||
|
||||
export interface ManagedAuthStatus {
|
||||
provider: ManagedAuthProvider;
|
||||
authenticated: boolean;
|
||||
default_account_id: string | null;
|
||||
migration_error?: string | null;
|
||||
accounts: ManagedAuthAccount[];
|
||||
}
|
||||
|
||||
export interface ManagedAuthDeviceCodeResponse {
|
||||
provider: ManagedAuthProvider;
|
||||
device_code: string;
|
||||
user_code: string;
|
||||
verification_uri: string;
|
||||
expires_in: number;
|
||||
interval: number;
|
||||
}
|
||||
|
||||
export async function authStartLogin(
|
||||
authProvider: ManagedAuthProvider,
|
||||
): Promise<ManagedAuthDeviceCodeResponse> {
|
||||
return invoke<ManagedAuthDeviceCodeResponse>("auth_start_login", {
|
||||
authProvider,
|
||||
});
|
||||
}
|
||||
|
||||
export async function authPollForAccount(
|
||||
authProvider: ManagedAuthProvider,
|
||||
deviceCode: string,
|
||||
): Promise<ManagedAuthAccount | null> {
|
||||
return invoke<ManagedAuthAccount | null>("auth_poll_for_account", {
|
||||
authProvider,
|
||||
deviceCode,
|
||||
});
|
||||
}
|
||||
|
||||
export async function authListAccounts(
|
||||
authProvider: ManagedAuthProvider,
|
||||
): Promise<ManagedAuthAccount[]> {
|
||||
return invoke<ManagedAuthAccount[]>("auth_list_accounts", {
|
||||
authProvider,
|
||||
});
|
||||
}
|
||||
|
||||
export async function authGetStatus(
|
||||
authProvider: ManagedAuthProvider,
|
||||
): Promise<ManagedAuthStatus> {
|
||||
return invoke<ManagedAuthStatus>("auth_get_status", {
|
||||
authProvider,
|
||||
});
|
||||
}
|
||||
|
||||
export async function authRemoveAccount(
|
||||
authProvider: ManagedAuthProvider,
|
||||
accountId: string,
|
||||
): Promise<void> {
|
||||
return invoke("auth_remove_account", {
|
||||
authProvider,
|
||||
accountId,
|
||||
});
|
||||
}
|
||||
|
||||
export async function authSetDefaultAccount(
|
||||
authProvider: ManagedAuthProvider,
|
||||
accountId: string,
|
||||
): Promise<void> {
|
||||
return invoke("auth_set_default_account", {
|
||||
authProvider,
|
||||
accountId,
|
||||
});
|
||||
}
|
||||
|
||||
export async function authLogout(
|
||||
authProvider: ManagedAuthProvider,
|
||||
): Promise<void> {
|
||||
return invoke("auth_logout", {
|
||||
authProvider,
|
||||
});
|
||||
}
|
||||
|
||||
export const authApi = {
|
||||
authStartLogin,
|
||||
authPollForAccount,
|
||||
authListAccounts,
|
||||
authGetStatus,
|
||||
authRemoveAccount,
|
||||
authSetDefaultAccount,
|
||||
authLogout,
|
||||
};
|
||||
@@ -0,0 +1,256 @@
|
||||
/**
|
||||
* GitHub Copilot OAuth API
|
||||
*
|
||||
* 提供 GitHub Copilot OAuth 设备码流程相关的 API 函数。
|
||||
* 支持多账号管理。
|
||||
*/
|
||||
|
||||
import { invoke } from "@tauri-apps/api/core";
|
||||
|
||||
/**
|
||||
* GitHub 设备码响应
|
||||
*/
|
||||
export interface CopilotDeviceCodeResponse {
|
||||
device_code: string;
|
||||
user_code: string;
|
||||
verification_uri: string;
|
||||
expires_in: number;
|
||||
interval: number;
|
||||
}
|
||||
|
||||
/**
|
||||
* GitHub 账号信息（公开信息）
|
||||
*/
|
||||
export interface GitHubAccount {
|
||||
/** GitHub 用户 ID（唯一标识） */
|
||||
id: string;
|
||||
/** GitHub 用户名 */
|
||||
login: string;
|
||||
/** 头像 URL */
|
||||
avatar_url: string | null;
|
||||
/** 认证时间戳（Unix 秒） */
|
||||
authenticated_at: number;
|
||||
}
|
||||
|
||||
/**
|
||||
* Copilot 认证状态（多账号版本）
|
||||
*/
|
||||
export interface CopilotAuthStatus {
|
||||
/** 是否已认证（有任意账号）- 向后兼容 */
|
||||
authenticated: boolean;
|
||||
/** 默认账号 ID */
|
||||
default_account_id: string | null;
|
||||
/** 旧认证数据迁移失败时的状态消息 */
|
||||
migration_error?: string | null;
|
||||
/** 第一个账号的用户名 - 向后兼容 */
|
||||
username: string | null;
|
||||
/** Copilot Token 过期时间 - 向后兼容 */
|
||||
expires_at: number | null;
|
||||
/** 所有已认证账号列表 */
|
||||
accounts: GitHubAccount[];
|
||||
}
|
||||
|
||||
/**
|
||||
* 启动 GitHub OAuth 设备码流程
|
||||
*
|
||||
* @returns 设备码响应，包含用户码和验证 URL
|
||||
*/
|
||||
export async function copilotStartDeviceFlow(): Promise<CopilotDeviceCodeResponse> {
|
||||
return invoke<CopilotDeviceCodeResponse>("copilot_start_device_flow");
|
||||
}
|
||||
|
||||
/**
|
||||
* 轮询 OAuth Token
|
||||
*
|
||||
* 使用设备码轮询 GitHub，等待用户完成授权。
|
||||
*
|
||||
* @param deviceCode - 设备码
|
||||
* @returns true 表示认证成功，false 表示仍在等待用户授权
|
||||
*/
|
||||
export async function copilotPollForAuth(deviceCode: string): Promise<boolean> {
|
||||
return invoke<boolean>("copilot_poll_for_auth", {
|
||||
deviceCode,
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取 Copilot 认证状态
|
||||
*
|
||||
* @returns 认证状态，包含是否已认证、用户名和过期时间
|
||||
*/
|
||||
export async function copilotGetAuthStatus(): Promise<CopilotAuthStatus> {
|
||||
return invoke<CopilotAuthStatus>("copilot_get_auth_status");
|
||||
}
|
||||
|
||||
/**
|
||||
* 注销 Copilot 认证
|
||||
*/
|
||||
export async function copilotLogout(): Promise<void> {
|
||||
return invoke("copilot_logout");
|
||||
}
|
||||
|
||||
/**
|
||||
* 检查是否已认证
|
||||
*
|
||||
* @returns true 表示已认证
|
||||
*/
|
||||
export async function copilotIsAuthenticated(): Promise<boolean> {
|
||||
return invoke<boolean>("copilot_is_authenticated");
|
||||
}
|
||||
|
||||
/**
|
||||
* Copilot 可用模型
|
||||
*/
|
||||
export interface CopilotModel {
|
||||
id: string;
|
||||
name: string;
|
||||
vendor: string;
|
||||
model_picker_enabled: boolean;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取有效的 Copilot Token
|
||||
*
|
||||
* 内部使用，用于代理请求。
|
||||
*
|
||||
* @returns Copilot Token
|
||||
*/
|
||||
export async function copilotGetToken(): Promise<string> {
|
||||
return invoke<string>("copilot_get_token");
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取 Copilot 可用模型列表
|
||||
*
|
||||
* @returns 可用模型列表
|
||||
*/
|
||||
export async function copilotGetModels(): Promise<CopilotModel[]> {
|
||||
return invoke<CopilotModel[]>("copilot_get_models");
|
||||
}
|
||||
|
||||
/**
|
||||
* 配额详情
|
||||
*/
|
||||
export interface QuotaDetail {
|
||||
entitlement: number;
|
||||
remaining: number;
|
||||
percent_remaining: number;
|
||||
unlimited: boolean;
|
||||
}
|
||||
|
||||
/**
|
||||
* 配额快照
|
||||
*/
|
||||
export interface QuotaSnapshots {
|
||||
chat: QuotaDetail;
|
||||
completions: QuotaDetail;
|
||||
premium_interactions: QuotaDetail;
|
||||
}
|
||||
|
||||
/**
|
||||
* Copilot 使用量响应
|
||||
*/
|
||||
export interface CopilotUsageResponse {
|
||||
copilot_plan: string;
|
||||
quota_reset_date: string;
|
||||
quota_snapshots: QuotaSnapshots;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取 Copilot 使用量信息
|
||||
*
|
||||
* @returns 使用量信息，包含计划类型、重置日期和配额快照
|
||||
*/
|
||||
export async function copilotGetUsage(): Promise<CopilotUsageResponse> {
|
||||
return invoke<CopilotUsageResponse>("copilot_get_usage");
|
||||
}
|
||||
|
||||
// ==================== 多账号管理 API ====================
|
||||
|
||||
/**
|
||||
* 列出所有已认证的 GitHub 账号
|
||||
*
|
||||
* @returns 账号列表
|
||||
*/
|
||||
export async function copilotListAccounts(): Promise<GitHubAccount[]> {
|
||||
return invoke<GitHubAccount[]>("copilot_list_accounts");
|
||||
}
|
||||
|
||||
/**
|
||||
* 轮询 OAuth Token（多账号版本）
|
||||
*
|
||||
* 使用设备码轮询 GitHub，等待用户完成授权。
|
||||
* 授权成功后返回新添加的账号信息。
|
||||
*
|
||||
* @param deviceCode - 设备码
|
||||
* @returns 新添加的账号信息，如果仍在等待则返回 null
|
||||
*/
|
||||
export async function copilotPollForAccount(
|
||||
deviceCode: string,
|
||||
): Promise<GitHubAccount | null> {
|
||||
return invoke<GitHubAccount | null>("copilot_poll_for_account", {
|
||||
deviceCode,
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 移除指定的 GitHub 账号
|
||||
*
|
||||
* @param accountId - GitHub 用户 ID
|
||||
*/
|
||||
export async function copilotRemoveAccount(accountId: string): Promise<void> {
|
||||
return invoke("copilot_remove_account", { accountId });
|
||||
}
|
||||
|
||||
/**
|
||||
* 设置默认 GitHub 账号
|
||||
*
|
||||
* @param accountId - GitHub 用户 ID
|
||||
*/
|
||||
export async function copilotSetDefaultAccount(
|
||||
accountId: string,
|
||||
): Promise<void> {
|
||||
return invoke("copilot_set_default_account", { accountId });
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取指定账号的有效 Copilot Token
|
||||
*
|
||||
* 内部使用，用于代理请求。
|
||||
*
|
||||
* @param accountId - GitHub 用户 ID
|
||||
* @returns Copilot Token
|
||||
*/
|
||||
export async function copilotGetTokenForAccount(
|
||||
accountId: string,
|
||||
): Promise<string> {
|
||||
return invoke<string>("copilot_get_token_for_account", { accountId });
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取指定账号的 Copilot 可用模型列表
|
||||
*
|
||||
* @param accountId - GitHub 用户 ID
|
||||
* @returns 可用模型列表
|
||||
*/
|
||||
export async function copilotGetModelsForAccount(
|
||||
accountId: string,
|
||||
): Promise<CopilotModel[]> {
|
||||
return invoke<CopilotModel[]>("copilot_get_models_for_account", {
|
||||
accountId,
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取指定账号的 Copilot 使用量信息
|
||||
*
|
||||
* @param accountId - GitHub 用户 ID
|
||||
* @returns 使用量信息
|
||||
*/
|
||||
export async function copilotGetUsageForAccount(
|
||||
accountId: string,
|
||||
): Promise<CopilotUsageResponse> {
|
||||
return invoke<CopilotUsageResponse>("copilot_get_usage_for_account", {
|
||||
accountId,
|
||||
});
|
||||
}
|
||||
@@ -12,5 +12,18 @@ export { openclawApi } from "./openclaw";
|
||||
export { sessionsApi } from "./sessions";
|
||||
export { workspaceApi } from "./workspace";
|
||||
export * as configApi from "./config";
|
||||
export * as authApi from "./auth";
|
||||
export * as copilotApi from "./copilot";
|
||||
export type { ProviderSwitchEvent } from "./providers";
|
||||
export type { Prompt } from "./prompts";
|
||||
export type {
|
||||
CopilotDeviceCodeResponse,
|
||||
CopilotAuthStatus,
|
||||
GitHubAccount,
|
||||
} from "./copilot";
|
||||
export type {
|
||||
ManagedAuthProvider,
|
||||
ManagedAuthAccount,
|
||||
ManagedAuthStatus,
|
||||
ManagedAuthDeviceCodeResponse,
|
||||
} from "./auth";
|
||||
|
||||
@@ -86,18 +86,6 @@ export const settingsApi = {
|
||||
return await invoke("clear_claude_onboarding_skip");
|
||||
},
|
||||
|
||||
async applyToolSearchPatch(): Promise<
|
||||
Array<{ path: string; success: boolean; error?: string }>
|
||||
> {
|
||||
return await invoke("apply_toolsearch_patch");
|
||||
},
|
||||
|
||||
async restoreToolSearchPatch(): Promise<
|
||||
Array<{ path: string; success: boolean; error?: string }>
|
||||
> {
|
||||
return await invoke("restore_toolsearch_patch");
|
||||
},
|
||||
|
||||
async saveFileDialog(defaultName: string): Promise<string | null> {
|
||||
return await invoke("save_file_dialog", { defaultName });
|
||||
},
|
||||
|
||||
@@ -12,6 +12,7 @@ import type {
|
||||
} from "@/types/usage";
|
||||
import type { UsageResult } from "@/types";
|
||||
import type { AppId } from "./types";
|
||||
import type { TemplateType } from "@/config/constants";
|
||||
|
||||
export const usageApi = {
|
||||
// Provider usage script methods
|
||||
@@ -28,7 +29,7 @@ export const usageApi = {
|
||||
baseUrl?: string,
|
||||
accessToken?: string,
|
||||
userId?: string,
|
||||
templateType?: "custom" | "general" | "newapi",
|
||||
templateType?: TemplateType,
|
||||
): Promise<UsageResult> => {
|
||||
return invoke("testUsageScript", {
|
||||
providerId,
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
import type { ProviderMeta } from "@/types";
|
||||
|
||||
export function resolveManagedAccountId(
|
||||
meta: ProviderMeta | undefined,
|
||||
authProvider: string,
|
||||
): string | null {
|
||||
const binding = meta?.authBinding;
|
||||
|
||||
if (
|
||||
binding?.source === "managed_account" &&
|
||||
binding.authProvider === authProvider
|
||||
) {
|
||||
return binding.accountId ?? null;
|
||||
}
|
||||
|
||||
if (authProvider === "github_copilot") {
|
||||
return meta?.githubAccountId ?? null;
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
+17
-3
@@ -49,13 +49,15 @@ export interface EndpointCandidate {
|
||||
isCustom?: boolean;
|
||||
}
|
||||
|
||||
import type { TemplateType } from "./config/constants";
|
||||
|
||||
// 用量查询脚本配置
|
||||
export interface UsageScript {
|
||||
enabled: boolean; // 是否启用用量查询
|
||||
language: "javascript"; // 脚本语言
|
||||
code: string; // 脚本代码（JSON 格式配置）
|
||||
timeout?: number; // 超时时间（秒，默认 10）
|
||||
templateType?: "custom" | "general" | "newapi"; // 模板类型（用于后端判断验证规则）
|
||||
templateType?: TemplateType; // 模板类型（用于后端判断验证规则）
|
||||
apiKey?: string; // 用量查询专用的 API Key（通用模板使用）
|
||||
baseUrl?: string; // 用量查询专用的 Base URL（通用和 NewAPI 模板使用）
|
||||
accessToken?: string; // 访问令牌（NewAPI 模板使用）
|
||||
@@ -122,6 +124,14 @@ export interface ProviderProxyConfig {
|
||||
proxyPassword?: string;
|
||||
}
|
||||
|
||||
export type AuthBindingSource = "provider_config" | "managed_account";
|
||||
|
||||
export interface AuthBinding {
|
||||
source: AuthBindingSource;
|
||||
authProvider?: string;
|
||||
accountId?: string;
|
||||
}
|
||||
|
||||
// 供应商元数据（字段名与后端一致，保持 snake_case）
|
||||
export interface ProviderMeta {
|
||||
// 自定义端点：以 URL 为键，值为端点信息
|
||||
@@ -149,10 +159,16 @@ export interface ProviderMeta {
|
||||
// - "openai_chat": OpenAI Chat Completions 格式，需要格式转换
|
||||
// - "openai_responses": OpenAI Responses API 格式，需要格式转换
|
||||
apiFormat?: "anthropic" | "openai_chat" | "openai_responses";
|
||||
// 通用认证绑定
|
||||
authBinding?: AuthBinding;
|
||||
// Claude 认证字段名
|
||||
apiKeyField?: ClaudeApiKeyField;
|
||||
// Prompt cache key for OpenAI-compatible endpoints (improves cache hit rate)
|
||||
promptCacheKey?: string;
|
||||
// 供应商类型（用于识别 Copilot 等特殊供应商）
|
||||
providerType?: string;
|
||||
// GitHub Copilot 关联账号 ID（旧字段，保留兼容读取）
|
||||
githubAccountId?: string;
|
||||
}
|
||||
|
||||
// Skill 同步方式
|
||||
@@ -226,8 +242,6 @@ export interface Settings {
|
||||
enableClaudePluginIntegration?: boolean;
|
||||
// 跳过 Claude Code 初次安装确认（写入 ~/.claude.json 的 hasCompletedOnboarding）
|
||||
skipClaudeOnboarding?: boolean;
|
||||
// 解除 Tool Search 域名限制
|
||||
toolSearchBypass?: boolean;
|
||||
// 是否开机自启
|
||||
launchOnStartup?: boolean;
|
||||
// 静默启动（程序启动时不显示主窗口）
|
||||
|
||||
@@ -837,3 +837,82 @@ export const setCodexModelName = (
|
||||
lines.splice(topLevelEndIndex, 0, replacementLine);
|
||||
return finalizeTomlText(lines);
|
||||
};
|
||||
|
||||
// ========== Codex top-level integer field utils ==========
|
||||
|
||||
const tomlTopLevelIntPattern = (field: string) =>
|
||||
new RegExp(`^\\s*${field}\\s*=\\s*(\\d+)\\s*(?:#.*)?$`);
|
||||
|
||||
const findTopLevelIntMatch = (
|
||||
lines: string[],
|
||||
fieldName: string,
|
||||
topLevelEndIndex: number,
|
||||
): { index: number; value: number } | undefined => {
|
||||
const pattern = tomlTopLevelIntPattern(fieldName);
|
||||
for (let i = 0; i < topLevelEndIndex; i += 1) {
|
||||
const m = lines[i].match(pattern);
|
||||
if (m) {
|
||||
return { index: i, value: Number(m[1]) };
|
||||
}
|
||||
}
|
||||
return undefined;
|
||||
};
|
||||
|
||||
// 从 Codex TOML 配置中提取顶级整数字段
|
||||
export const extractCodexTopLevelInt = (
|
||||
configText: string | undefined | null,
|
||||
fieldName: string,
|
||||
): number | undefined => {
|
||||
try {
|
||||
const raw = typeof configText === "string" ? configText : "";
|
||||
const text = normalizeTomlText(raw);
|
||||
if (!text) return undefined;
|
||||
const lines = text.split("\n");
|
||||
return findTopLevelIntMatch(lines, fieldName, getTopLevelEndIndex(lines))
|
||||
?.value;
|
||||
} catch {
|
||||
return undefined;
|
||||
}
|
||||
};
|
||||
|
||||
// 在 Codex TOML 配置中设置或更新顶级整数字段
|
||||
export const setCodexTopLevelInt = (
|
||||
configText: string,
|
||||
fieldName: string,
|
||||
value: number,
|
||||
): string => {
|
||||
const normalizedText = normalizeTomlText(configText);
|
||||
const lines = normalizedText ? normalizedText.split("\n") : [];
|
||||
const topLevelEndIndex = getTopLevelEndIndex(lines);
|
||||
const existing = findTopLevelIntMatch(lines, fieldName, topLevelEndIndex);
|
||||
const replacementLine = `${fieldName} = ${value}`;
|
||||
|
||||
if (existing) {
|
||||
lines[existing.index] = replacementLine;
|
||||
return finalizeTomlText(lines);
|
||||
}
|
||||
|
||||
// 插入位置：顶级区域末尾（section header 之前）
|
||||
if (lines.length === 0) {
|
||||
return `${replacementLine}\n`;
|
||||
}
|
||||
|
||||
lines.splice(topLevelEndIndex, 0, replacementLine);
|
||||
return finalizeTomlText(lines);
|
||||
};
|
||||
|
||||
// 从 Codex TOML 配置中移除顶级字段行
|
||||
export const removeCodexTopLevelField = (
|
||||
configText: string,
|
||||
fieldName: string,
|
||||
): string => {
|
||||
const normalizedText = normalizeTomlText(configText);
|
||||
if (!normalizedText) return normalizedText;
|
||||
const lines = normalizedText.split("\n");
|
||||
const topLevelEndIndex = getTopLevelEndIndex(lines);
|
||||
const existing = findTopLevelIntMatch(lines, fieldName, topLevelEndIndex);
|
||||
if (existing) {
|
||||
lines.splice(existing.index, 1);
|
||||
}
|
||||
return finalizeTomlText(lines);
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user