diff --git a/CHANGELOG.md b/CHANGELOG.md index 09f32127..94252f43 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,8 +7,20 @@ Write each change in both `### English` and `### 中文` under `## Unreleased`. ### English +- Fetch WorkBuddy Global model catalogs from `/v2/enterprises/personal/models` instead of the console OIDC page, and return catalog failures as 503 JSON so reverse proxies do not replace them with HTML +- After dropping caller system prompts, send WorkBuddy an empty leading system message so Global no longer rejects the request with `11128 first message is not system prompt` +- Show account-type skeletons in the add-account dialog until `/api/providers` returns, instead of flashing the default Qoder Global tile +- Show first-token time on Logs and label token counts as input / output +- Drop auth-type from account cards, keep cards mounted on refresh so quota and runtime meters can animate, and give those meters a very light same-hue gradient + ### 中文 +- WorkBuddy 国际版模型目录改打 `/v2/enterprises/personal/models`,不再走会 500 HTML 的 console 页面;目录失败改为 503 JSON,避免反代把错误换成 HTML 整页 +- 丢弃调用方系统提示词后,仍给 WorkBuddy 补一条空的 system,避免国际版 `11128 first message is not system prompt` +- 添加账号弹窗等 `/api/providers` 返回后再显示类型,加载中用骨架屏,不再先闪默认 Qoder Global +- Logs 请求历史增加首字时间,Tokens 用小字标出输入 / 输出 +- 账号卡片去掉认证方式;刷新时卡片保持挂载,额度和状态柱用 GSAP 过渡,色条加很浅的同色渐变 + ## 0.2.15 - 2026-08-28 ### English diff --git a/docs/DESIGN.md b/docs/DESIGN.md index d0ae573b..a60a4f4f 100644 --- a/docs/DESIGN.md +++ b/docs/DESIGN.md @@ -122,8 +122,8 @@ - 圆角 8px 或更小,除非现有组件已用更大值 - 账号/资源列表卡片优先使用浅边框和平面表面,不强制最小高度,不额外叠加强阴影 -- 账号卡片保持操作台密度:单行身份(名称可直接改 + provider/auth/UID),状态 Chip 只出现一次,运行状态用 12 格短柱、额度用 `scaleX` 填充条;并发和优先级可在卡片上改,重启次数仍是只读辅助数字 -- 添加账号是两步向导:第一步选类型、名称和可选高级选项,第二步再选登录方式。不要把登录方式再摊回第一步。类型 ≤ 6 用两列 tile,超过则用下拉;未知 provider 直接用后端 descriptor 的 label,不要静默丢掉。登录方式按 `capabilities` 隐藏,只有一种时不要再渲染选择器。 +- 账号卡片保持操作台密度:单行身份(名称 + provider/UID,不展示认证方式),状态 Chip 只出现一次,运行状态用 12 格短柱、额度用 `scaleX` 填充条;名称、并发和优先级通过卡片编辑弹窗修改,重启次数仍是只读辅助数字。控制台刷新时卡片保持挂载,让额度和状态柱用 GSAP 过渡,不要整卡换成骨架屏。色条只用很浅的同色渐变,不要换新强调色。 +- 添加账号是两步向导:第一步选类型、名称和可选高级选项,第二步再选登录方式。不要把登录方式再摊回第一步。打开弹窗时类型列表先显示骨架屏,等 `/api/providers` 返回后再渲染真实选项,不要先闪默认 Qoder Global。类型 ≤ 6 用两列 tile,超过则用下拉;未知 provider 直接用后端 descriptor 的 label,不要静默丢掉。登录方式按 `capabilities` 隐藏,只有一种时不要再渲染选择器。 - 账号网格用 `lg:grid-cols-2 xl:grid-cols-3`,卡片间距 `gap-2.5`,内边距约 12px - 主卡片只有在确实需要抬升层级时才用 `shadow-card` - 边框克制使用;避免边框 + 阴影 + 有色背景同时出现 diff --git a/docs/PROVIDERS.md b/docs/PROVIDERS.md index 8cd86ff0..e77ee37f 100644 --- a/docs/PROVIDERS.md +++ b/docs/PROVIDERS.md @@ -50,7 +50,7 @@ WorkBuddy2API 把 **WorkBuddy CN / CodeBuddy**(`copilot.tencent.com` / `www.co | 凭证 | 加密 `.auth/user` blob + `machine_id` | `accessToken` / `refreshToken` / uid / domain | | 登录 | 浏览器 device-flow / PAT / `qoder-native-v1` 导入 | `POST /v2/plugin/auth/state`,无 PKCE,服务端发 state | | 对话入口 | worker 内 `prepareInferRequest` → `agent_chat_generation?Encode=1` | `POST {chatBase}/v2/chat/completions` | -| 模型目录 | 登录后的 Qoder in-process catalog,失败即空 | `GET /console/enterprises/personal/models`,失败回退静态表 | +| 模型目录 | 登录后的 Qoder in-process catalog,失败即空 | CN `GET /console/enterprises/personal/models`;Global `GET /v2/enterprises/personal/models`。参考仓库失败回退静态表;本仓库失败即报错 | | 账号存储 | SQLite + 派生 runtime HOME | `auths/workbuddy-.json` + `state.json` | | 调度 | Go round-robin + pin + inflight + 错误分类 | 剩余积分最高者优先 | | 产品附加 | 控制台、托管更新、Anthropic 协议规划 | 每日签到、积分查询、token keepalive | @@ -91,13 +91,14 @@ WorkBuddy2API 把 **WorkBuddy CN / CodeBuddy**(`copilot.tencent.com` / `www.co - URL:CN `https://copilot.tencent.com/v2/chat/completions`;global `https://www.workbuddy.ai/v2/chat/completions` - 上游拒绝非流式,发出前强制 `stream: true`;对本仓库客户端的非流式请求,应在适配器内聚合 SSE - `tool_choice` 必须是 string。对象形式会 `400 code=11101` +- 国际版要求第一条必须是 `system`(`code=11128 first message is not system prompt`)。账号打开「丢弃系统提示词」时,只剥调用方内容,发出前补一条空 `system`,不要让 user 排到第一位 - 关键头:`Authorization`、`X-User-Id`、`X-Enterprise-Id` 或 `X-No-*`、`X-Product: SaaS`、`X-Domain`、UA `CLI/2.139.0 CodeBuddy/2.139.0` - Chat 另加官方 CLI 通道头(CN/Global 同名,Origin/host 仍按区域分开):`X-IDE-Type/Name/Version`、`X-Agent-Type/Intent`、`X-Request-ID` / conversation/session IDs、`X-Product-Version`、`X-Private-Data: false`。Refresh 不带这些头,也绝不带 `X-API-Key` - SSE 已是 OpenAI chunk 形态,含 `delta.content`、`delta.reasoning_content`、按 index 合并的 `tool_calls` ### 模型 -`GET {chatBase}/console/enterprises/personal/models` +CN:`GET {chatBase}/console/enterprises/personal/models`。国际站这条 console 路径是 OIDC 页面(未登录 302 到 Keycloak,带 Bearer 500 HTML),必须改打 `GET https://www.workbuddy.ai/v2/enterprises/personal/models`。`GET /api/models` 目录失败用 503,不要 502,避免反代把 JSON 换成 HTML 错误页。 只暴露 CLI agent 的模型 ID(`cli` / `CLI` / `codebuddy` / `workbuddy`),再和 `data.models` 交叉,跳过 `disabled`。上游没有 agents 时,退回全部未禁用模型。字段用 `maxInputTokens` / `maxOutputTokens`,不是 `contextWindow`。按账号拉目录失败时,`GET /api/models?account=` 返回明确错误,不把空列表当成「没有模型」。 diff --git a/frontend/src/components/AddAccountModal.tsx b/frontend/src/components/AddAccountModal.tsx index 1fc52fcd..65d1cc43 100644 --- a/frontend/src/components/AddAccountModal.tsx +++ b/frontend/src/components/AddAccountModal.tsx @@ -1,5 +1,5 @@ import { useEffect, useRef, useState } from 'react' -import { Button, Description, Input, Label, ListBox, Modal, Select, TextArea } from '@heroui/react' +import { Button, Description, Input, Label, ListBox, Modal, Select, Skeleton, TextArea } from '@heroui/react' import { ArrowSquareOut, CaretLeft, CaretRight, CheckCircle, FileCode, Key, ShieldCheck, SpinnerGap, X } from '@phosphor-icons/react' import { ProviderMark } from '@/components/ProviderMark' import { CompactSwitch } from '@/components/ui/CompactSwitch' @@ -54,16 +54,21 @@ const hintKeys: Record = { 'workbuddy-global': 'accountTypeWorkBuddyGlobalHint', } -const fallbackProviderOptions: ProviderOption[] = [ - { - id: 'qoder-global', provider: 'qoder', region: 'global', - descriptor: { - id: 'qoder', label: 'Qoder', runtime: 'child_process', default_region: 'global', - capabilities: { browser_login: true, pat_login: true, import_export: true }, - regions: [{ id: 'global', label: 'Global' }], - }, - }, -] +function AccountTypeSkeleton({ ariaLabel }: { ariaLabel: string }) { + return ( +
+ {Array.from({ length: 4 }, (_, index) => ( +
+ +
+ + +
+
+ ))} +
+ ) +} async function loadProviderOptions(): Promise { const output = await fetchProviders().catch(() => null) @@ -74,7 +79,7 @@ async function loadProviderOptions(): Promise { options.push({ id: `${descriptor.id}-${region.id}`, provider: descriptor.id, region: region.id, descriptor }) } } - return options.length ? options : fallbackProviderOptions + return options } function optionLabel(option: ProviderOption, t: (key: string) => string) { @@ -88,7 +93,8 @@ function optionLabel(option: ProviderOption, t: (key: string) => string) { return `${option.descriptor.label}${suffix}`.trim() } -function optionHint(option: ProviderOption, t: (key: string) => string) { +function optionHint(option: ProviderOption | undefined, t: (key: string) => string) { + if (!option) return '' const key = hintKeys[option.id] if (!key) return '' const localized = t(key) @@ -111,8 +117,9 @@ export function AddAccountModal({ isOpen, onClose, onAdded }: Props) { const { t } = useI18n() const [step, setStep] = useState('method') const [tab, setTab] = useState('browser') - const [accountType, setAccountType] = useState('qoder-global') - const [providerOptions, setProviderOptions] = useState(fallbackProviderOptions) + const [accountType, setAccountType] = useState('') + const [providerOptions, setProviderOptions] = useState([]) + const [typesLoading, setTypesLoading] = useState(false) const [advancedOpen, setAdvancedOpen] = useState(false) const [name, setName] = useState('') const [maxInFlight, setMaxInFlight] = useState('4') @@ -140,20 +147,30 @@ export function AddAccountModal({ isOpen, onClose, onAdded }: Props) { useEffect(() => { if (!isOpen) return - void loadProviderOptions().then((options) => { - setProviderOptions(options) - if (!options.some((option) => option.id === accountType)) { - setAccountType(options[0]?.id || 'qoder-global') + let cancelled = false + setTypesLoading(true) + setProviderOptions([]) + setAccountType('') + void loadProviderOptions() + .then((options) => { + if (cancelled) return + setProviderOptions(options) + setAccountType(options[0]?.id || '') setTab('browser') - } - }) - // eslint-disable-next-line react-hooks/exhaustive-deps + }) + .finally(() => { + if (!cancelled) setTypesLoading(false) + }) + return () => { + cancelled = true + } }, [isOpen]) - const activeOption = providerOptions.find((option) => option.id === accountType) || fallbackProviderOptions[0] - const showPatTab = activeOption.descriptor.capabilities?.pat_login !== false - const showImportTab = activeOption.descriptor.capabilities?.import_export !== false - const showDropSystem = activeOption.provider === 'workbuddy' + const activeOption = providerOptions.find((option) => option.id === accountType) + const typesReady = Boolean(activeOption) && !typesLoading + const showPatTab = activeOption?.descriptor.capabilities?.pat_login !== false + const showImportTab = activeOption?.descriptor.capabilities?.import_export !== false + const showDropSystem = activeOption?.provider === 'workbuddy' const busy = phase === 'busy' || phase === 'polling' const settingsLocked = Boolean(createdId.current) || busy const isDone = phase === 'done' @@ -188,7 +205,9 @@ export function AddAccountModal({ isOpen, onClose, onAdded }: Props) { stopPolling() setStep('method') setTab('browser') - setAccountType('qoder-global') + setAccountType('') + setProviderOptions([]) + setTypesLoading(false) setName('') setMaxInFlight('4') setPriority('50') @@ -209,7 +228,7 @@ export function AddAccountModal({ isOpen, onClose, onAdded }: Props) { } function goLogin(next: TabKey) { - if (busy) return + if (busy || !typesReady) return setTab(next) setMessage('') setStep('login') @@ -217,6 +236,7 @@ export function AddAccountModal({ isOpen, onClose, onAdded }: Props) { async function ensureAccount(): Promise { if (createdId.current) return createdId.current + if (!activeOption) throw new Error(t('accountTypeHint')) const options = accountOptions() const account = await createAccount(name.trim() || t('account'), activeOption.provider, activeOption.region, options) const id = account?.id || account?.data?.id @@ -290,6 +310,7 @@ export function AddAccountModal({ isOpen, onClose, onAdded }: Props) { setMessage(t('wizardBadJson')) return } + if (!activeOption) { setMessage(t('accountTypeHint')); return } if (activeOption.provider === 'qoder' && (typeof bundle.user_blob !== 'string' || typeof bundle.machine_id !== 'string')) { setMessage(t('wizardBadJson')) return @@ -350,7 +371,7 @@ export function AddAccountModal({ isOpen, onClose, onAdded }: Props) { const tabLead = tab === 'browser' ? t('wizardBrowserLead') : tab === 'pat' - ? t(activeOption.region === 'cn' && activeOption.provider === 'qoder' ? 'wizardPatLeadCN' : 'wizardPatLead') + ? t(activeOption?.region === 'cn' && activeOption?.provider === 'qoder' ? 'wizardPatLeadCN' : 'wizardPatLead') : t('wizardImportLead') return ( @@ -371,7 +392,17 @@ export function AddAccountModal({ isOpen, onClose, onAdded }: Props) { {step === 'method' ? ( <>
- {useTypeSelect ? ( + {typesLoading ? ( + <> + {t('accountType')} + + + ) : !typesReady ? ( + <> + {t('accountType')} +

{t('accountTypeHint')}

+ + ) : useTypeSelect ? ( { - const next = event.target.value.trim() - if (!next || next === (account.name || '')) { - event.target.value = account.name || '' - return - } - onRename(next) - }} - onKeyDown={(event) => { - if (event.key === 'Enter') (event.target as HTMLInputElement).blur() - }} - /> +
{account.name || account.id}
{meta}
@@ -207,55 +187,13 @@ export function AccountCard({ ) : null}
- - + + {inFlight}/{account.max_inflight ?? 4} + {' '}{t('inFlight')} + + + {t('priority')} {account.priority ?? 50} + {t('restarts')} {account.restarts ?? 0} @@ -325,6 +263,9 @@ export function AccountCard({ > {t('authentication')} + + + + + + + + ) +} diff --git a/frontend/src/components/account/QuotaMeter.tsx b/frontend/src/components/account/QuotaMeter.tsx index 4c046c5d..d54aeb3c 100644 --- a/frontend/src/components/account/QuotaMeter.tsx +++ b/frontend/src/components/account/QuotaMeter.tsx @@ -14,8 +14,10 @@ type Props = { export function QuotaMeter({ quota, label, remainingLabel, addOnLabel, exceededLabel }: Props) { const rootRef = useRef(null) const fillRef = useRef(null) + const remainingRef = useRef(null) + const remainingValueRef = useRef({ remaining: quota.remaining ?? 0, total: quota.total ?? 0 }) const primedRef = useRef(false) - const animateRef = useRef<((ratio: number) => void) | null>(null) + const animateRef = useRef<((ratio: number, remaining: number, total: number) => void) | null>(null) const ratio = quotaUsedRatio(quota) const tone = quotaTone(quota) const remaining = `${formatQuotaAmount(quota.remaining)} / ${formatQuotaAmount(quota.total)} ${quota.unit || 'credits'}` @@ -30,18 +32,37 @@ export function QuotaMeter({ quota, label, remainingLabel, addOnLabel, exceededL media.add({ all: 'all', reduceMotion: '(prefers-reduced-motion: reduce)' }, (match) => { const reduceMotion = Boolean(match.conditions?.reduceMotion) gsap.set(fill, { transformOrigin: 'left center' }) - animateRef.current = (nextRatio) => { - const duration = reduceMotion ? 0 : primedRef.current ? 0.2 : 0.22 + animateRef.current = (nextRatio, remainingValue, totalValue) => { + const duration = reduceMotion ? 0 : primedRef.current ? 0.28 : 0.32 if (!primedRef.current) { - gsap.fromTo(fill, { scaleX: 0 }, { scaleX: nextRatio, duration, ease: 'power2.out', overwrite: true }) + gsap.fromTo(fill, { scaleX: 0, autoAlpha: 0.72 }, { scaleX: nextRatio, autoAlpha: 1, duration, ease: 'power2.out', overwrite: true }) } else { - gsap.to(fill, { scaleX: nextRatio, duration, ease: 'power2.out', overwrite: true }) + gsap.to(fill, { scaleX: nextRatio, autoAlpha: 1, duration, ease: 'power2.out', overwrite: true }) + } + if (remainingRef.current) { + if (reduceMotion) { + remainingValueRef.current = { remaining: remainingValue, total: totalValue } + remainingRef.current.textContent = `${formatQuotaAmount(remainingValue)} / ${formatQuotaAmount(totalValue)}` + } else { + gsap.to(remainingValueRef.current, { + remaining: remainingValue, + total: totalValue, + duration, + ease: 'power2.out', + overwrite: true, + onUpdate: () => { + if (!remainingRef.current) return + remainingRef.current.textContent = `${formatQuotaAmount(remainingValueRef.current.remaining)} / ${formatQuotaAmount(remainingValueRef.current.total)}` + }, + }) + } } primedRef.current = true } return () => { animateRef.current = null gsap.killTweensOf(fill) + gsap.killTweensOf(remainingValueRef.current) } }) }, root) @@ -53,8 +74,8 @@ export function QuotaMeter({ quota, label, remainingLabel, addOnLabel, exceededL }, []) useLayoutEffect(() => { - animateRef.current?.(ratio) - }, [ratio, tone]) + animateRef.current?.(ratio, quota.remaining ?? 0, quota.total ?? 0) + }, [quota.remaining, quota.total, ratio, tone]) return (
@@ -64,7 +85,8 @@ export function QuotaMeter({ quota, label, remainingLabel, addOnLabel, exceededL {quota.exceeded ? {exceededLabel} : null}
- {remaining} + {formatQuotaAmount(quota.remaining)} / {formatQuotaAmount(quota.total)} + {` ${quota.unit || 'credits'}`} {quota.has_add_on ? ( {' · '}{addOnLabel} {formatQuotaAmount(quota.add_on_used)} / {formatQuotaAmount(quota.add_on_total)} {quota.add_on_unit || 'credits'} diff --git a/frontend/src/components/account/RuntimeMeter.tsx b/frontend/src/components/account/RuntimeMeter.tsx index f55bd49e..a6069d04 100644 --- a/frontend/src/components/account/RuntimeMeter.tsx +++ b/frontend/src/components/account/RuntimeMeter.tsx @@ -30,19 +30,15 @@ export function RuntimeMeter({ state, label, stateCopy }: Props) { media.add('(prefers-reduced-motion: no-preference)', () => { gsap.set(segments, { transformOrigin: 'center bottom' }) - gsap.set(empty, { scaleY: 0.32, autoAlpha: 0.45 }) - gsap.fromTo( - filled, - { scaleY: 0.18, autoAlpha: 0.35 }, - { - scaleY: 1, - autoAlpha: 1, - duration: 0.18, - ease: 'power2.out', - stagger: { amount: 0.04 }, - overwrite: true, - }, - ) + gsap.to(empty, { scaleY: 0.32, autoAlpha: 0.45, duration: 0.18, ease: 'power2.out', overwrite: true }) + gsap.to(filled, { + scaleY: 1, + autoAlpha: 1, + duration: 0.22, + ease: 'power2.out', + stagger: { amount: 0.08, from: 'start' }, + overwrite: true, + }) }) }, root) diff --git a/frontend/src/components/ui/PageSkeletons.tsx b/frontend/src/components/ui/PageSkeletons.tsx index 3e0fea14..f1ae9de0 100644 --- a/frontend/src/components/ui/PageSkeletons.tsx +++ b/frontend/src/components/ui/PageSkeletons.tsx @@ -84,17 +84,18 @@ export function AccessPageSkeleton() { export function LogsRequestListSkeleton() { return (
-
- {Array.from({ length: 7 }, (_, index) => )} +
+ {Array.from({ length: 8 }, (_, index) => )}
{Array.from({ length: 8 }, (_, index) => ( -
+
+
))} diff --git a/frontend/src/i18n/messages.ts b/frontend/src/i18n/messages.ts index 66b828d6..68d3753c 100644 --- a/frontend/src/i18n/messages.ts +++ b/frontend/src/i18n/messages.ts @@ -119,7 +119,10 @@ export const messages: Record = { logsColModel: 'Model', logsColStatus: 'Status', logsColLatency: 'Latency', + logsColTTFT: 'First token', logsColTokens: 'Tokens', + logsTokensIn: 'in', + logsTokensOut: 'out', logsColStream: 'Mode', logsStreamYes: 'stream', logsStreamNo: 'sync', @@ -347,7 +350,7 @@ export const messages: Record = { inFlight: 'In-flight', restarts: 'Restarts', dropSystemPrompt: 'Drop system prompt', - dropSystemPromptHint: 'Strip caller system prompts before sending to this account; avoids upstream content-screening rejections', + dropSystemPromptHint: 'Strip caller system prompts before sending; WorkBuddy still gets an empty leading system slot so Global does not reject the request', quota: 'Quota', quotaRemaining: 'Remaining', quotaAddOn: 'Add-on', @@ -387,11 +390,16 @@ export const messages: Record = { wizardAdvanced: 'Advanced options', wizardContinue: 'Continue', wizardBack: 'Back', - wizardSettingsHint: 'Set these before login. You can still change them later on the account card.', + wizardSettingsHint: 'Set these before login. You can still change them later from Edit on the account card.', + editAccount: 'Edit', + editAccountTitle: 'Edit {name}', + editAccountHint: 'Change the display name, concurrency, and routing priority.', + maxInflightInvalid: 'Concurrency must be an integer from 1 to 32.', + priorityInvalid: 'Priority must be an integer from 1 to 100.', wizardNamePh: 'Account name', maxInflightHint: 'How many chats this account may run at once. Changing it later restarts the worker.', priorityHint: 'Higher numbers are preferred when routing later uses this field. Default 50.', - dropSystemPromptCreateHint: 'WorkBuddy only. Strip caller system prompts to avoid upstream content screening.', + dropSystemPromptCreateHint: 'WorkBuddy only. Strip caller system prompts, then send an empty leading system slot so Global still accepts the request.', wizardBrowserLead: 'Opens the authorization page. Finish in the browser and this wizard continues automatically.', wizardStartBrowser: 'Start browser login', wizardOpenBrowser: 'Open authorization page', @@ -536,7 +544,10 @@ export const messages: Record = { logsColModel: '模型', logsColStatus: '状态', logsColLatency: '延迟', + logsColTTFT: '首字', logsColTokens: 'Tokens', + logsTokensIn: '输入', + logsTokensOut: '输出', logsColStream: '模式', logsStreamYes: '流式', logsStreamNo: '同步', @@ -764,7 +775,7 @@ export const messages: Record = { inFlight: '进行中', restarts: '重启次数', dropSystemPrompt: '丢弃系统提示词', - dropSystemPromptHint: '发送前剥离调用方的系统提示词,避免触发上游内容审核拦截', + dropSystemPromptHint: '发送前剥离调用方的系统提示词;仍会补一条空的 system,避免国际版要求第一条必须是系统提示词', quota: '额度', quotaRemaining: '剩余', quotaAddOn: '附加包', @@ -804,11 +815,16 @@ export const messages: Record = { wizardAdvanced: '高级选项', wizardContinue: '继续', wizardBack: '返回', - wizardSettingsHint: '登录前先设好这些选项,之后仍可在账号卡片上改。', + wizardSettingsHint: '登录前先设好这些选项,之后仍可在账号卡片上点编辑修改。', + editAccount: '编辑', + editAccountTitle: '编辑 {name}', + editAccountHint: '修改显示名称、并发和调度优先级。', + maxInflightInvalid: '并发必须是 1 到 32 之间的整数。', + priorityInvalid: '优先级必须是 1 到 100 之间的整数。', wizardNamePh: '账号名称', maxInflightHint: '这个账号同时能跑多少条对话。之后改并发会重启该账号的 worker。', priorityHint: '数字越大,之后调度会越优先选这个账号。默认 50。', - dropSystemPromptCreateHint: '仅 WorkBuddy。发送前剥离调用方系统提示词,避免上游内容审核拦截。', + dropSystemPromptCreateHint: '仅 WorkBuddy。剥离调用方系统提示词后仍补一条空的 system,避免国际版拒绝请求。', wizardBrowserLead: '会打开授权页。在浏览器完成授权后,向导会自动继续。', wizardStartBrowser: '开始浏览器登录', wizardOpenBrowser: '打开授权页', diff --git a/frontend/src/index.css b/frontend/src/index.css index 3d39fb77..d6eb5487 100644 --- a/frontend/src/index.css +++ b/frontend/src/index.css @@ -414,19 +414,19 @@ select { } .runtime-meter__seg[data-tone="ok"] { - background: var(--app-ok); + background: linear-gradient(180deg, color-mix(in srgb, var(--app-ok) 82%, white 18%) 0%, var(--app-ok) 100%); } .runtime-meter__seg[data-tone="warn"] { - background: var(--warning); + background: linear-gradient(180deg, color-mix(in srgb, var(--warning) 78%, white 22%) 0%, var(--warning) 100%); } .runtime-meter__seg[data-tone="danger"] { - background: var(--app-danger); + background: linear-gradient(180deg, color-mix(in srgb, var(--app-danger) 78%, white 22%) 0%, var(--app-danger) 100%); } .runtime-meter__seg[data-tone="muted"] { - background: var(--app-faint); + background: linear-gradient(180deg, color-mix(in srgb, var(--app-faint) 70%, white 30%) 0%, var(--app-faint) 100%); } .quota-meter { @@ -441,18 +441,18 @@ select { height: 100%; width: 100%; border-radius: inherit; - background: var(--app-ok); + background: linear-gradient(90deg, color-mix(in srgb, var(--app-ok) 78%, white 22%) 0%, var(--app-ok) 100%); transform: scaleX(0); transform-origin: left center; will-change: transform, opacity; } .quota-meter__fill[data-tone="warn"] { - background: var(--warning); + background: linear-gradient(90deg, color-mix(in srgb, var(--warning) 76%, white 24%) 0%, var(--warning) 100%); } .quota-meter__fill[data-tone="danger"] { - background: var(--app-danger); + background: linear-gradient(90deg, color-mix(in srgb, var(--app-danger) 76%, white 24%) 0%, var(--app-danger) 100%); } .button { diff --git a/frontend/src/pages/AccountsPage.tsx b/frontend/src/pages/AccountsPage.tsx index 790cbf01..66df56ce 100644 --- a/frontend/src/pages/AccountsPage.tsx +++ b/frontend/src/pages/AccountsPage.tsx @@ -8,6 +8,7 @@ import { } from '@phosphor-icons/react' import { AccountCard, type AccountBusyKind } from '@/components/account/AccountCard' import { AccountModelsModal } from '@/components/account/AccountModelsModal' +import { EditAccountModal } from '@/components/account/EditAccountModal' import { AddAccountModal } from '@/components/AddAccountModal' import { BrandMark } from '@/components/BrandMark' import { useI18n } from '@/hooks/useI18n' @@ -21,7 +22,7 @@ import { startDeviceLogin, updateAccount, } from '@/api/overview' -import { AccountsListSkeleton, AccountsPageSkeleton } from '@/components/ui/PageSkeletons' +import { AccountsPageSkeleton } from '@/components/ui/PageSkeletons' import { accountState, isAvailable, @@ -48,6 +49,7 @@ export function AccountsPage() { const [urlById, setUrlById] = useState>({}) const [confirmId, setConfirmId] = useState(null) const [modelsId, setModelsId] = useState(null) + const [editId, setEditId] = useState(null) const [authPanelId, setAuthPanelId] = useState(null) const [query, setQuery] = useState('') const [filter, setFilter] = useState('all') @@ -76,6 +78,7 @@ export function AccountsPage() { const inFlightCount = displayRows.reduce((total, account) => total + (account.in_flight ?? account.inFlight ?? 0), 0) const confirmAccount = displayRows.find((account) => account.id === confirmId) const modelsAccount = displayRows.find((account) => account.id === modelsId) || null + const editAccount = displayRows.find((account) => account.id === editId) || null const filteredRows = useMemo(() => { const normalized = query.trim().toLowerCase() return displayRows.filter((account) => { @@ -175,43 +178,35 @@ export function AccountsPage() { }) } - async function onRename(id: string, name: string) { - setNameById((current) => ({ ...current, [id]: name })) - await run(id, 'settings', async () => { - await updateAccount(id, { name }) - await refresh(undefined, { silent: true }) - }) - setNameById((current) => { - const next = { ...current } - delete next[id] - return next - }) - } - - async function onMaxInFlight(id: string, value: number) { - setInflightById((current) => ({ ...current, [id]: value })) - await run(id, 'settings', async () => { - await updateAccount(id, { max_inflight: value }) - await refresh(undefined, { silent: true }) - }) - setInflightById((current) => { - const next = { ...current } - delete next[id] - return next - }) - } - - async function onPriority(id: string, value: number) { - setPriorityById((current) => ({ ...current, [id]: value })) - await run(id, 'settings', async () => { - await updateAccount(id, { priority: value }) + async function onSaveSettings(id: string, input: { name: string; max_inflight: number; priority: number }) { + if (!id) throw new Error(t('accountNameRequired')) + setNameById((current) => ({ ...current, [id]: input.name })) + setInflightById((current) => ({ ...current, [id]: input.max_inflight })) + setPriorityById((current) => ({ ...current, [id]: input.priority })) + setBusy({ id, kind: 'settings' }) + try { + await updateAccount(id, input) await refresh(undefined, { silent: true }) - }) - setPriorityById((current) => { - const next = { ...current } - delete next[id] - return next - }) + } catch (error) { + throw error instanceof Error ? error : new Error(String(error)) + } finally { + setBusy(null) + setNameById((current) => { + const next = { ...current } + delete next[id] + return next + }) + setInflightById((current) => { + const next = { ...current } + delete next[id] + return next + }) + setPriorityById((current) => { + const next = { ...current } + delete next[id] + return next + }) + } } return ( @@ -239,6 +234,14 @@ export function AccountsPage() { setAddOpen(false)} onAdded={() => void refresh(undefined, { silent: true })} /> setModelsId(null)} /> + setEditId(null)} + onSave={(input) => onSaveSettings(editId || '', input)} + /> { if (!next) setConfirmId(null) }}> @@ -307,7 +310,7 @@ export function AccountsPage() {
) : null} - {hasAccounts && !refreshing && !filteredRows.length ? ( + {hasAccounts && !filteredRows.length ? (
@@ -317,10 +320,7 @@ export function AccountsPage() {
) : null} - {refreshing ? ( - - ) : ( -
+
{filteredRows.map((account) => ( setConfirmId(account.id)} onToggle={(selected) => void onToggle(account.id, selected)} onToggleDropSystem={(selected) => void onToggleDropSystem(account.id, selected)} - onRename={(name) => void onRename(account.id, name)} - onMaxInFlight={(value) => void onMaxInFlight(account.id, value)} - onPriority={(value) => void onPriority(account.id, value)} + onEdit={() => setEditId(account.id)} onToggleAuthPanel={() => setAuthPanelId((current) => current === account.id ? null : account.id)} onViewModels={() => setModelsId(account.id)} /> ))}
- )}
) } diff --git a/frontend/src/pages/LogsPage.tsx b/frontend/src/pages/LogsPage.tsx index 77e877c9..5c36e806 100644 --- a/frontend/src/pages/LogsPage.tsx +++ b/frontend/src/pages/LogsPage.tsx @@ -69,11 +69,18 @@ function formatTime(value?: string | null, lang: 'en' | 'zh' = 'zh') { }).format(date) } -function formatTokens(log: RequestLog) { +function TokenSplit({ log, inLabel, outLabel }: { log: RequestLog; inLabel: string; outLabel: string }) { const prompt = log.prompt_tokens const completion = log.completion_tokens - if (prompt == null && completion == null) return '—' - return `${prompt ?? 0} / ${completion ?? 0}` + if (prompt == null && completion == null) { + return — + } + return ( +
+
{prompt ?? 0} / {completion ?? 0}
+
{inLabel} / {outLabel}
+
+ ) } function formatLatency(ms?: number | null) { @@ -504,6 +511,7 @@ export function LogsPage() { {t('logsColStatus')} {t('logsColStream')} {t('logsColLatency')} + {t('logsColTTFT')} {t('logsColTokens')} @@ -533,7 +541,8 @@ export function LogsPage() { {item.stream ? t('logsStreamYes') : t('logsStreamNo')} {formatLatency(item.latency_ms)} - {formatTokens(item)} + {formatLatency(item.ttfb_ms)} + ))} @@ -673,7 +682,7 @@ export function LogsPage() { [t('logsColModel'), selected?.requested_model || '—'], [t('logsColAccount'), selected?.account_id ? (accountNameById.get(selected.account_id) || selected.account_id) : '—'], [t('logsColLatency'), formatLatency(selected?.latency_ms)], - [t('logsColTokens'), selected ? formatTokens(selected) : '—'], + [t('logsColTTFT'), formatLatency(selected?.ttfb_ms)], [t('logsColStream'), selected?.stream ? t('logsStreamYes') : t('logsStreamNo')], ].map(([label, value]) => (
@@ -681,6 +690,14 @@ export function LogsPage() {
{value}
))} +
+
{t('logsColTokens')}
+
+ {selected ? ( + + ) : '—'} +
+
{selected?.error_message ? (
diff --git a/internal/api/auth_test.go b/internal/api/auth_test.go index 4fe6868c..64d74642 100644 --- a/internal/api/auth_test.go +++ b/internal/api/auth_test.go @@ -4,6 +4,7 @@ import ( "bytes" "context" "encoding/json" + "fmt" "io" "net/http" "net/http/httptest" @@ -12,6 +13,7 @@ import ( "github.com/caigee-cmd/cli2api/internal/accounts" "github.com/caigee-cmd/cli2api/internal/config" + "github.com/caigee-cmd/cli2api/internal/providers" "github.com/caigee-cmd/cli2api/internal/translate" ) @@ -128,6 +130,36 @@ func TestModelContextSettingsAPI(t *testing.T) { } } +type failingCatalog struct{} + +func (failingCatalog) Models(context.Context, string) ([]providers.ModelInfo, error) { + return nil, fmt.Errorf("models status=500: upstream html error page (internal server error)") +} + +func TestModelsAPICatalogFailureUses503(t *testing.T) { + srv := New(config.Config{ + Host: "127.0.0.1", Port: 3010, ProxyAPIKey: "secret", + QoderHome: t.TempDir(), DataDir: t.TempDir(), + }) + defer srv.Close() + srv.pool.Upsert(accounts.Item{ID: "wb-global", Provider: "workbuddy", Runtime: string(providers.RuntimeInProcess)}) + srv.providers.Register(providers.Adapter{ID: "workbuddy", Models: failingCatalog{}}) + + req := httptest.NewRequest(http.MethodGet, "/api/models?account=wb-global", nil) + req.Header.Set("Authorization", "Bearer secret") + rec := httptest.NewRecorder() + srv.Handler().ServeHTTP(rec, req) + if rec.Code != http.StatusServiceUnavailable { + t.Fatalf("catalog failure status=%d body=%s", rec.Code, rec.Body.String()) + } + if rec.Code == http.StatusBadGateway { + t.Fatal("catalog failures must not use 502; reverse proxies replace that with HTML") + } + if !bytes.Contains(rec.Body.Bytes(), []byte(`"catalog_failed"`)) { + t.Fatalf("body=%s", rec.Body.String()) + } +} + func TestLegacyDiagnosticRoutesAreRemoved(t *testing.T) { srv := New(config.Config{ Host: "127.0.0.1", diff --git a/internal/api/chat.go b/internal/api/chat.go index 30803aee..cceb7f6d 100644 --- a/internal/api/chat.go +++ b/internal/api/chat.go @@ -38,6 +38,7 @@ type streamRelayStats struct { UsageSource string Credits *float64 Model string + FirstTokenAt *time.Time } func relayOpenAIStream(w http.ResponseWriter, body io.Reader) (streamRelayStats, error) { @@ -52,7 +53,12 @@ func relayOpenAIStream(w http.ResponseWriter, body io.Reader) (streamRelayStats, var stats streamRelayStats for scanner.Scan() { line := scanner.Text() + if stats.FirstTokenAt == nil && sseDeltaHasToken(line) { + now := time.Now() + stats.FirstTokenAt = &now + } if usage, ok := parseStreamUsageLine(line); ok { + usage.FirstTokenAt = stats.FirstTokenAt stats = usage } if _, err := io.WriteString(writer, line+"\n"); err != nil { @@ -71,6 +77,53 @@ func relayOpenAIStream(w http.ResponseWriter, body io.Reader) (streamRelayStats, return stats, nil } +func sseDeltaHasToken(line string) bool { + payload := strings.TrimSpace(strings.TrimPrefix(line, "data:")) + if payload == "" || payload == "[DONE]" { + return false + } + var parsed struct { + Choices []struct { + Delta struct { + Content json.RawMessage `json:"content"` + ReasoningContent json.RawMessage `json:"reasoning_content"` + ToolCalls json.RawMessage `json:"tool_calls"` + } `json:"delta"` + } `json:"choices"` + } + if json.Unmarshal([]byte(payload), &parsed) != nil || len(parsed.Choices) == 0 { + return false + } + delta := parsed.Choices[0].Delta + return jsonHasText(delta.Content) || jsonHasText(delta.ReasoningContent) || jsonHasArray(delta.ToolCalls) +} + +func jsonHasText(raw json.RawMessage) bool { + if len(raw) == 0 || string(raw) == "null" { + return false + } + var text string + if json.Unmarshal(raw, &text) == nil { + return strings.TrimSpace(text) != "" + } + var parts []any + if json.Unmarshal(raw, &parts) == nil { + return len(parts) > 0 + } + return true +} + +func jsonHasArray(raw json.RawMessage) bool { + if len(raw) == 0 || string(raw) == "null" { + return false + } + var parts []any + if json.Unmarshal(raw, &parts) != nil { + return false + } + return len(parts) > 0 +} + func parseStreamUsageLine(line string) (streamRelayStats, bool) { payload := strings.TrimSpace(strings.TrimPrefix(line, "data:")) if payload == "" || payload == "[DONE]" { @@ -136,7 +189,10 @@ func (s *Server) handleModelsAPI(w http.ResponseWriter, r *http.Request) { refresh := r.URL.Query().Get("refresh") == "1" models, err := s.fetchWorkerModelsFor(refresh, s.requestedAccount(r)) if err != nil { - writeErr(w, http.StatusBadGateway, "catalog_failed", err.Error()) + // 503, not 502: some reverse proxies replace origin 502 JSON with + // their own HTML error page, which the console then renders as the + // catalog failure message. + writeErr(w, http.StatusServiceUnavailable, "catalog_failed", err.Error()) return } writeJSON(w, http.StatusOK, map[string]any{ @@ -213,7 +269,14 @@ func (s *Server) handleChatCompletions(w http.ResponseWriter, r *http.Request) { status = accounts.RequestStatusError } } - s.finishRequestLog(requestID, started, req, publicModel, upstream.AccountID, status, upstream.TTFBMs, &stats, relayErr, upstream.AttemptCount) + ttfb := upstream.TTFBMs + if stats.FirstTokenAt != nil { + ttfb = int(stats.FirstTokenAt.Sub(started).Milliseconds()) + if ttfb < 1 { + ttfb = 1 + } + } + s.finishRequestLog(requestID, started, req, publicModel, upstream.AccountID, status, ttfb, &stats, relayErr, upstream.AttemptCount) if relayErr != nil { panic(http.ErrAbortHandler) } @@ -348,6 +411,8 @@ func (s *Server) finishRequestLog(requestID string, started time.Time, req trans } if ttfb > 0 { entry.TTFBMs = &ttfb + } else if !req.Stream && entry.LatencyMs != nil { + entry.TTFBMs = entry.LatencyMs } if stats != nil { entry.PromptTokens = stats.PromptTokens diff --git a/internal/api/chat_usage_test.go b/internal/api/chat_usage_test.go index 851efb8a..608a310b 100644 --- a/internal/api/chat_usage_test.go +++ b/internal/api/chat_usage_test.go @@ -77,4 +77,25 @@ func TestRelayOpenAIStreamCapturesUsageChunk(t *testing.T) { stats.CompletionTokens == nil || *stats.CompletionTokens != 2 || stats.UsageSource != "upstream" { t.Fatalf("stats = %+v", stats) } + if stats.FirstTokenAt == nil { + t.Fatal("first token timestamp missing") + } +} + +func TestSSEDeltaHasTokenIgnoresEmptyRoleChunks(t *testing.T) { + if sseDeltaHasToken(`data: {"choices":[{"delta":{"role":"assistant"}}]}`) { + t.Fatal("role-only chunk is not a token") + } + if sseDeltaHasToken(`data: {"choices":[{"delta":{"content":""}}]}`) { + t.Fatal("empty content is not a token") + } + if !sseDeltaHasToken(`data: {"choices":[{"delta":{"content":"OK"}}]}`) { + t.Fatal("content delta should count as first token") + } + if !sseDeltaHasToken(`data: {"choices":[{"delta":{"reasoning_content":"think"}}]}`) { + t.Fatal("reasoning delta should count as first token") + } + if !sseDeltaHasToken(`data: {"choices":[{"delta":{"tool_calls":[{"index":0}]}}]}`) { + t.Fatal("tool call delta should count as first token") + } } diff --git a/internal/executor/chat.go b/internal/executor/chat.go index 9f264e49..4f071e0e 100644 --- a/internal/executor/chat.go +++ b/internal/executor/chat.go @@ -380,6 +380,8 @@ func (e ChatExecutor) ChatNonStream(ctx context.Context, req translate.ChatReque // sanitizeForItem applies the account-level system-prompt policy. Provider // families with upstream content screening (WorkBuddy) strip caller system // prompts when the account opts in; Qoder workers intentionally preserve them. +// WorkBuddy still needs a leading system slot after the strip (code 11128); +// the adapter inserts an empty placeholder, this helper only drops caller text. func sanitizeForItem(item accounts.Item, req translate.ChatRequest) translate.ChatRequest { if item.DropSystemPrompt && item.Provider != "" && item.Provider != "qoder" { return translate.DropSystemMessages(req) diff --git a/internal/providers/workbuddy/client.go b/internal/providers/workbuddy/client.go index 347db752..dd8bfeea 100644 --- a/internal/providers/workbuddy/client.go +++ b/internal/providers/workbuddy/client.go @@ -34,10 +34,20 @@ type Client struct { loginStates map[string]string } +const catalogTimeout = 15 * time.Second + func NewClient(store Store) *Client { return &Client{ - store: store, - http: &http.Client{Timeout: 120 * time.Second}, + store: store, + http: &http.Client{ + Timeout: 120 * time.Second, + // Catalog and plugin APIs 302 to OIDC HTML when the path is a + // console page. Following that rewrite turns a 302 into a login + // document and hides the real status. + CheckRedirect: func(*http.Request, []*http.Request) error { + return http.ErrUseLastResponse + }, + }, loginStates: map[string]string{}, } } @@ -286,13 +296,15 @@ func (c *Client) Models(ctx context.Context, accountID string) ([]providers.Mode if err != nil { return nil, err } - body, status, err := c.do(ctx, http.MethodGet, credential.ChatBase()+pathModels, nil, + ctx, cancel := context.WithTimeout(ctx, catalogTimeout) + defer cancel() + body, status, err := c.do(ctx, http.MethodGet, credential.ChatBase()+credential.catalogPath(), nil, func(h http.Header) { SetCatalogHeaders(h, credential) }) if err != nil { return nil, err } if status >= 300 { - return nil, fmt.Errorf("models status=%d: %s", status, string(body)) + return nil, fmt.Errorf("models status=%d: %s", status, catalogErrorBody(body)) } var env struct { Code int `json:"code"` @@ -311,7 +323,10 @@ func (c *Client) Models(ctx context.Context, accountID string) ([]providers.Mode } `json:"agents"` } `json:"data"` } - if err := json.Unmarshal(body, &env); err != nil || env.Code != 0 { + if err := json.Unmarshal(body, &env); err != nil { + return nil, fmt.Errorf("models parse: %s", catalogErrorBody(body)) + } + if env.Code != 0 { return nil, fmt.Errorf("models envelope code=%d msg=%s", env.Code, env.Msg) } cliModels := map[string]struct{}{} @@ -490,9 +505,10 @@ func Classify(status int, body string) providers.ClassifiedError { return providers.ClassifiedError{Kind: accounts.KindRateLimit, Status: 429, Message: strings.TrimSpace(body)} case status == 404: return providers.ClassifiedError{Kind: accounts.KindUnavailable, Status: 404, Message: strings.TrimSpace(body)} - case status == 400 || accounts.IsInvalidRequestText(body): - // Request-level rejection (content screening, malformed fields): - // retrying on another account cannot help and the account is healthy. + case status == 400 || accounts.IsInvalidRequestText(body) || isMissingSystemPrompt(body): + // Request-level rejection (content screening, malformed fields, + // missing leading system message): retrying on another account + // cannot help and the account is healthy. return providers.ClassifiedError{Kind: accounts.KindInvalidRequest, Status: firstNonEmptyStatus(status, 400), Message: strings.TrimSpace(body)} case status >= 500: return providers.ClassifiedError{Kind: accounts.KindUnavailable, Status: status, Message: strings.TrimSpace(body)} @@ -502,7 +518,7 @@ func Classify(status int, body string) providers.ClassifiedError { if env.Code == sessionDeadCode || strings.Contains(strings.ToLower(env.Msg), sessionDeadText) { return providers.ClassifiedError{Kind: accounts.KindAuth, Status: 401, Message: "session dead; re-login required"} } - if accounts.IsInvalidRequestText(env.Msg) { + if accounts.IsInvalidRequestText(env.Msg) || isMissingSystemPrompt(env.Msg) || env.Code == missingSystemPromptCode { return providers.ClassifiedError{Kind: accounts.KindInvalidRequest, Status: firstNonEmptyStatus(status, 400), Message: env.Msg} } return providers.ClassifiedError{Kind: accounts.KindUnavailable, Status: 502, Message: env.Msg} @@ -517,6 +533,36 @@ func firstNonEmptyStatus(status, fallback int) int { return fallback } +func isMissingSystemPrompt(text string) bool { + lower := strings.ToLower(text) + return strings.Contains(lower, missingSystemPromptText) || + strings.Contains(lower, fmt.Sprintf("%d", missingSystemPromptCode)) +} + +func catalogErrorBody(body []byte) string { + text := strings.TrimSpace(string(body)) + if text == "" { + return "" + } + if strings.Contains(strings.ToLower(text), " 240 { + return text[:240] + } + return text +} + // Probe reports whether the stored credential is usable. There is no WASM hot // state; Hot mirrors Ready so the accounts console can treat signed-in accounts // as available without probing a child-process /health URL. diff --git a/internal/providers/workbuddy/client_test.go b/internal/providers/workbuddy/client_test.go index 1a00fb5a..7f3b5c64 100644 --- a/internal/providers/workbuddy/client_test.go +++ b/internal/providers/workbuddy/client_test.go @@ -137,6 +137,14 @@ func TestChatNonStreamAggregatesToolsAndReasoning(t *testing.T) { if body["stream"] != true { t.Fatalf("stream=%v, upstream requires true", body["stream"]) } + messages, _ := body["messages"].([]any) + if len(messages) < 2 { + t.Fatalf("messages=%v", body["messages"]) + } + first, _ := messages[0].(map[string]any) + if first["role"] != "system" { + t.Fatalf("global/CN chat requires a leading system slot, got %v", body["messages"]) + } w.Header().Set("Content-Type", "text/event-stream") _, _ = w.Write([]byte(chatSSE)) })) @@ -163,7 +171,7 @@ func TestModelsFiltersCliAgentAndDisabled(t *testing.T) { payload, _ := Credential{AccessToken: "at", UID: "u1", Domain: "codebuddy.cn", ExpiresAt: 4102444800}.Encode() store := &memStore{items: map[string][]byte{"acc1": payload}} server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - if r.URL.Path != pathModels { + if r.URL.Path != pathModelsCN { t.Fatalf("path=%s", r.URL.Path) } _ = json.NewEncoder(w).Encode(map[string]any{"code": 0, "data": map[string]any{ @@ -197,7 +205,7 @@ func TestModelsAcceptsGlobalCLIAgentNamesAndUsesAccountRegion(t *testing.T) { store := &memStore{items: map[string][]byte{"acc1": payload}, region: "global"} var origin, requestHost, ideType string server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - if r.URL.Path != pathModels { + if r.URL.Path != pathModelsGlobal { t.Fatalf("path=%s", r.URL.Path) } origin = r.Header.Get("Origin") @@ -238,6 +246,9 @@ func TestModelsWithoutAgentsReturnsEnabledModels(t *testing.T) { payload, _ := Credential{AccessToken: "at", UID: "u1", Domain: "www.workbuddy.ai", ExpiresAt: 4102444800}.Encode() store := &memStore{items: map[string][]byte{"acc1": payload}, region: "global"} server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + if r.URL.Path != pathModelsGlobal { + t.Fatalf("path=%s", r.URL.Path) + } _ = json.NewEncoder(w).Encode(map[string]any{"code": 0, "data": map[string]any{ "models": []map[string]any{ {"id": "glm-5.2", "name": "GLM"}, @@ -272,6 +283,47 @@ func TestIsGlobalRecognizesWorkBuddyDomains(t *testing.T) { if (Credential{}).IsGlobal() { t.Fatal("empty domain should not be global") } + if (Credential{Domain: "www.workbuddy.ai"}).catalogPath() != pathModelsGlobal { + t.Fatal("global catalog must use the plugin JSON path") + } + if (Credential{Domain: "codebuddy.cn"}).catalogPath() != pathModelsCN { + t.Fatal("CN catalog must keep the console path") + } +} + +func TestModelsGlobalHTMLErrorDoesNotLeakPage(t *testing.T) { + payload, _ := Credential{AccessToken: "at", UID: "u1", Domain: "www.workbuddy.ai", ExpiresAt: 4102444800}.Encode() + store := &memStore{items: map[string][]byte{"acc1": payload}, region: "global"} + var sawConsolePath bool + server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + if r.URL.Path == pathModelsCN { + sawConsolePath = true + } + if r.URL.Path != pathModelsGlobal { + t.Fatalf("path=%s", r.URL.Path) + } + w.Header().Set("Content-Type", "text/html") + w.WriteHeader(http.StatusInternalServerError) + _, _ = w.Write([]byte(`500 Internal Server Erroropenresty`)) + })) + defer server.Close() + client := NewClient(store) + client.http = server.Client() + client.http.Transport = rewriteTransport{server: server.URL, round: server.Client().Transport} + + _, err := client.Models(context.Background(), "acc1") + if err == nil { + t.Fatal("expected catalog error") + } + if sawConsolePath { + t.Fatal("global catalog must not hit the console OIDC path") + } + if !strings.Contains(err.Error(), "models status=500") || strings.Contains(err.Error(), "()=>(t||(e((t={exports:{}}).exports,t),e=null),t.exports),s=(e,i,o,s)=>{if(i&&typeof i==`object`||typeof i==`function`)for(var c=r(i),l=0,u=c.length,d;li[e]).bind(null,d),enumerable:!(s=n(i,d))||s.enumerable});return e},c=(n,r,o)=>(o=n==null?{}:e(i(n)),s(r||!n||!n.__esModule||!a.call(n,`default`)?t(o,`default`,{value:n,enumerable:!0}):o,n));(function(){let e=document.createElement(`link`).relList;if(e&&e.supports&&e.supports(`modulepreload`))return;for(let e of document.querySelectorAll(`link[rel="modulepreload"]`))n(e);new MutationObserver(e=>{for(let t of e)if(t.type===`childList`)for(let e of t.addedNodes)e.tagName===`LINK`&&e.rel===`modulepreload`&&n(e)}).observe(document,{childList:!0,subtree:!0});function t(e){let t={};return e.integrity&&(t.integrity=e.integrity),e.referrerPolicy&&(t.referrerPolicy=e.referrerPolicy),t.credentials=e.crossOrigin===`use-credentials`?`include`:e.crossOrigin===`anonymous`?`omit`:`same-origin`,t}function n(e){if(e.ep)return;e.ep=!0;let n=t(e);fetch(e.href,n)}})();var l=o((e=>{var t=Symbol.for(`react.transitional.element`),n=Symbol.for(`react.portal`),r=Symbol.for(`react.fragment`),i=Symbol.for(`react.strict_mode`),a=Symbol.for(`react.profiler`),o=Symbol.for(`react.consumer`),s=Symbol.for(`react.context`),c=Symbol.for(`react.forward_ref`),l=Symbol.for(`react.suspense`),u=Symbol.for(`react.memo`),d=Symbol.for(`react.lazy`),f=Symbol.for(`react.activity`),p=Symbol.iterator;function m(e){return typeof e!=`object`||!e?null:(e=p&&e[p]||e[`@@iterator`],typeof e==`function`?e:null)}var h={isMounted:function(){return!1},enqueueForceUpdate:function(){},enqueueReplaceState:function(){},enqueueSetState:function(){}},g=Object.assign,_={};function v(e,t,n){this.props=e,this.context=t,this.refs=_,this.updater=n||h}v.prototype.isReactComponent={},v.prototype.setState=function(e,t){if(typeof e!=`object`&&typeof e!=`function`&&e!=null)throw Error(`takes an object of state variables to update or a function which returns an object of state variables.`);this.updater.enqueueSetState(this,e,t,`setState`)},v.prototype.forceUpdate=function(e){this.updater.enqueueForceUpdate(this,e,`forceUpdate`)};function y(){}y.prototype=v.prototype;function b(e,t,n){this.props=e,this.context=t,this.refs=_,this.updater=n||h}var x=b.prototype=new y;x.constructor=b,g(x,v.prototype),x.isPureReactComponent=!0;var S=Array.isArray;function C(){}var w={H:null,A:null,T:null,S:null},T=Object.prototype.hasOwnProperty;function E(e,n,r){var i=r.ref;return{$$typeof:t,type:e,key:n,ref:i===void 0?null:i,props:r}}function D(e,t){return E(e.type,t,e.props)}function O(e){return typeof e==`object`&&!!e&&e.$$typeof===t}function k(e){var t={"=":`=0`,":":`=2`};return`$`+e.replace(/[=:]/g,function(e){return t[e]})}var A=/\/+/g;function j(e,t){return typeof e==`object`&&e&&e.key!=null?k(``+e.key):t.toString(36)}function M(e){switch(e.status){case`fulfilled`:return e.value;case`rejected`:throw e.reason;default:switch(typeof e.status==`string`?e.then(C,C):(e.status=`pending`,e.then(function(t){e.status===`pending`&&(e.status=`fulfilled`,e.value=t)},function(t){e.status===`pending`&&(e.status=`rejected`,e.reason=t)})),e.status){case`fulfilled`:return e.value;case`rejected`:throw e.reason}}throw e}function N(e,r,i,a,o){var s=typeof e;(s===`undefined`||s===`boolean`)&&(e=null);var c=!1;if(e===null)c=!0;else switch(s){case`bigint`:case`string`:case`number`:c=!0;break;case`object`:switch(e.$$typeof){case t:case n:c=!0;break;case d:return c=e._init,N(c(e._payload),r,i,a,o)}}if(c)return o=o(e),c=a===``?`.`+j(e,0):a,S(o)?(i=``,c!=null&&(i=c.replace(A,`$&/`)+`/`),N(o,r,i,``,function(e){return e})):o!=null&&(O(o)&&(o=D(o,i+(o.key==null||e&&e.key===o.key?``:(``+o.key).replace(A,`$&/`)+`/`)+c)),r.push(o)),1;c=0;var l=a===``?`.`:a+`:`;if(S(e))for(var u=0;u{t.exports=l()})),d=o((e=>{function t(e,t){var n=e.length;e.push(t);a:for(;0>>1,a=e[r];if(0>>1;ri(c,n))li(u,c)?(e[r]=u,e[l]=n,r=l):(e[r]=c,e[s]=n,r=s);else if(li(u,n))e[r]=u,e[l]=n,r=l;else break a}}return t}function i(e,t){var n=e.sortIndex-t.sortIndex;return n===0?e.id-t.id:n}if(e.unstable_now=void 0,typeof performance==`object`&&typeof performance.now==`function`){var a=performance;e.unstable_now=function(){return a.now()}}else{var o=Date,s=o.now();e.unstable_now=function(){return o.now()-s}}var c=[],l=[],u=1,d=null,f=3,p=!1,m=!1,h=!1,g=!1,_=typeof setTimeout==`function`?setTimeout:null,v=typeof clearTimeout==`function`?clearTimeout:null,y=typeof setImmediate<`u`?setImmediate:null;function b(e){for(var i=n(l);i!==null;){if(i.callback===null)r(l);else if(i.startTime<=e)r(l),i.sortIndex=i.expirationTime,t(c,i);else break;i=n(l)}}function x(e){if(h=!1,b(e),!m){if(n(c)!==null)m=!0,S||(S=!0,O());else{var t=n(l);t!==null&&j(x,t.startTime-e)}}}var S=!1,C=-1,w=5,T=-1;function E(){return g?!0:!(e.unstable_now()-Tt&&E());){var o=d.callback;if(typeof o==`function`){d.callback=null,f=d.priorityLevel;var s=o(d.expirationTime<=t);if(t=e.unstable_now(),typeof s==`function`){d.callback=s,b(t),i=!0;break b}d===n(c)&&r(c),b(t)}else r(c);d=n(c)}if(d!==null)i=!0;else{var u=n(l);u!==null&&j(x,u.startTime-t),i=!1}}break a}finally{d=null,f=a,p=!1}i=void 0}}finally{i?O():S=!1}}}var O;if(typeof y==`function`)O=function(){y(D)};else if(typeof MessageChannel<`u`){var k=new MessageChannel,A=k.port2;k.port1.onmessage=D,O=function(){A.postMessage(null)}}else O=function(){_(D,0)};function j(t,n){C=_(function(){t(e.unstable_now())},n)}e.unstable_IdlePriority=5,e.unstable_ImmediatePriority=1,e.unstable_LowPriority=4,e.unstable_NormalPriority=3,e.unstable_Profiling=null,e.unstable_UserBlockingPriority=2,e.unstable_cancelCallback=function(e){e.callback=null},e.unstable_forceFrameRate=function(e){0>e||125o?(r.sortIndex=a,t(l,r),n(c)===null&&r===n(l)&&(h?(v(C),C=-1):h=!0,j(x,a-o))):(r.sortIndex=s,t(c,r),m||p||(m=!0,S||(S=!0,O()))),r},e.unstable_shouldYield=E,e.unstable_wrapCallback=function(e){var t=f;return function(){var n=f;f=t;try{return e.apply(this,arguments)}finally{f=n}}}})),f=o(((e,t)=>{t.exports=d()})),p=o((e=>{var t=u();function n(e){var t=`https://react.dev/errors/`+e;if(1{function n(){if(!(typeof __REACT_DEVTOOLS_GLOBAL_HOOK__>`u`||typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.checkDCE!=`function`))try{__REACT_DEVTOOLS_GLOBAL_HOOK__.checkDCE(n)}catch(e){console.error(e)}}n(),t.exports=p()})),h=o((e=>{var t=f(),n=u(),r=m();function i(e){var t=`https://react.dev/errors/`+e;if(1te||(e.current=R[te],R[te]=null,te--)}function re(e,t){te++,R[te]=e.current,e.current=t}var ie=ne(null),ae=ne(null),oe=ne(null),se=ne(null);function ce(e,t){switch(re(oe,t),re(ae,e),re(ie,null),t.nodeType){case 9:case 11:e=(e=t.documentElement)&&(e=e.namespaceURI)?Gd(e):0;break;default:if(e=t.tagName,t=t.namespaceURI)t=Gd(t),e=Kd(t,e);else switch(e){case`svg`:e=1;break;case`math`:e=2;break;default:e=0}}z(ie),re(ie,e)}function le(){z(ie),z(ae),z(oe)}function ue(e){e.memoizedState!==null&&re(se,e);var t=ie.current,n=Kd(t,e.type);t!==n&&(re(ae,e),re(ie,n))}function de(e){ae.current===e&&(z(ie),z(ae)),se.current===e&&(z(se),np._currentValue=ee)}var fe,pe;function me(e){if(fe===void 0)try{throw Error()}catch(e){var t=e.stack.trim().match(/\n( *(at )?)/);fe=t&&t[1]||``,pe=-1)`:-1i||c[r]!==l[i]){var u=` +`+c[r].replace(` at new `,` at `);return e.displayName&&u.includes(``)&&(u=u.replace(``,e.displayName)),u}while(1<=r&&0<=i);break}}}finally{he=!1,Error.prepareStackTrace=n}return(n=e?e.displayName||e.name:``)?me(n):``}function _e(e,t){switch(e.tag){case 26:case 27:case 5:return me(e.type);case 16:return me(`Lazy`);case 13:return e.child!==t&&t!==null?me(`Suspense Fallback`):me(`Suspense`);case 19:return me(`SuspenseList`);case 0:case 15:return ge(e.type,!1);case 11:return ge(e.type.render,!1);case 1:return ge(e.type,!0);case 31:return me(`Activity`);default:return``}}function ve(e){try{var t=``,n=null;do t+=_e(e,n),n=e,e=e.return;while(e);return t}catch(e){return` +Error generating stack: `+e.message+` +`+e.stack}}var ye=Object.prototype.hasOwnProperty,be=t.unstable_scheduleCallback,xe=t.unstable_cancelCallback,Se=t.unstable_shouldYield,Ce=t.unstable_requestPaint,we=t.unstable_now,Te=t.unstable_getCurrentPriorityLevel,Ee=t.unstable_ImmediatePriority,De=t.unstable_UserBlockingPriority,Oe=t.unstable_NormalPriority,ke=t.unstable_LowPriority,Ae=t.unstable_IdlePriority,je=t.log,Me=t.unstable_setDisableYieldValue,Ne=null,Pe=null;function Fe(e){if(typeof je==`function`&&Me(e),Pe&&typeof Pe.setStrictMode==`function`)try{Pe.setStrictMode(Ne,e)}catch{}}var Ie=Math.clz32?Math.clz32:ze,Le=Math.log,Re=Math.LN2;function ze(e){return e>>>=0,e===0?32:31-(Le(e)/Re|0)|0}var Be=256,Ve=262144,He=4194304;function Ue(e){var t=e&42;if(t!==0)return t;switch(e&-e){case 1:return 1;case 2:return 2;case 4:return 4;case 8:return 8;case 16:return 16;case 32:return 32;case 64:return 64;case 128:return 128;case 256:case 512:case 1024:case 2048:case 4096:case 8192:case 16384:case 32768:case 65536:case 131072:return e&261888;case 262144:case 524288:case 1048576:case 2097152:return e&3932160;case 4194304:case 8388608:case 16777216:case 33554432:return e&62914560;case 67108864:return 67108864;case 134217728:return 134217728;case 268435456:return 268435456;case 536870912:return 536870912;case 1073741824:return 0;default:return e}}function We(e,t,n){var r=e.pendingLanes;if(r===0)return 0;var i=0,a=e.suspendedLanes,o=e.pingedLanes;e=e.warmLanes;var s=r&134217727;return s===0?(s=r&~a,s===0?o===0?n||(n=r&~e,n!==0&&(i=Ue(n))):i=Ue(o):i=Ue(s)):(r=s&~a,r===0?(o&=s,o===0?n||(n=s&~e,n!==0&&(i=Ue(n))):i=Ue(o)):i=Ue(r)),i===0?0:t!==0&&t!==i&&(t&a)===0&&(a=i&-i,n=t&-t,a>=n||a===32&&n&4194048)?t:i}function Ge(e,t){return(e.pendingLanes&~(e.suspendedLanes&~e.pingedLanes)&t)===0}function Ke(e,t){switch(e){case 1:case 2:case 4:case 8:case 64:return t+250;case 16:case 32:case 128:case 256:case 512:case 1024:case 2048:case 4096:case 8192:case 16384:case 32768:case 65536:case 131072:case 262144:case 524288:case 1048576:case 2097152:return t+5e3;case 4194304:case 8388608:case 16777216:case 33554432:return-1;case 67108864:case 134217728:case 268435456:case 536870912:case 1073741824:return-1;default:return-1}}function qe(){var e=He;return He<<=1,!(He&62914560)&&(He=4194304),e}function Je(e){for(var t=[],n=0;31>n;n++)t.push(e);return t}function Ye(e,t){e.pendingLanes|=t,t!==268435456&&(e.suspendedLanes=0,e.pingedLanes=0,e.warmLanes=0)}function Xe(e,t,n,r,i,a){var o=e.pendingLanes;e.pendingLanes=n,e.suspendedLanes=0,e.pingedLanes=0,e.warmLanes=0,e.expiredLanes&=n,e.entangledLanes&=n,e.errorRecoveryDisabledLanes&=n,e.shellSuspendCounter=0;var s=e.entanglements,c=e.expirationTimes,l=e.hiddenUpdates;for(n=o&~n;0`u`||window.document===void 0||window.document.createElement===void 0),ln=!1;if(cn)try{var un={};Object.defineProperty(un,"passive",{get:function(){ln=!0}}),window.addEventListener(`test`,un,un),window.removeEventListener(`test`,un,un)}catch{ln=!1}var dn=null,fn=null,pn=null;function mn(){if(pn)return pn;var e,t=fn,n=t.length,r,i=`value`in dn?dn.value:dn.textContent,a=i.length;for(e=0;e=Kn),Yn=` `,Xn=!1;function Zn(e,t){switch(e){case`keyup`:return Wn.indexOf(t.keyCode)!==-1;case`keydown`:return t.keyCode!==229;case`keypress`:case`mousedown`:case`focusout`:return!0;default:return!1}}function Qn(e){return e=e.detail,typeof e==`object`&&`data`in e?e.data:null}var $n=!1;function er(e,t){switch(e){case`compositionend`:return Qn(t);case`keypress`:return t.which===32?(Xn=!0,Yn):null;case`textInput`:return e=t.data,e===Yn&&Xn?null:e;default:return null}}function tr(e,t){if($n)return e===`compositionend`||!Gn&&Zn(e,t)?(e=mn(),pn=fn=dn=null,$n=!1,e):null;switch(e){case`paste`:return null;case`keypress`:if(!(t.ctrlKey||t.altKey||t.metaKey)||t.ctrlKey&&t.altKey){if(t.char&&1=t)return{node:n,offset:t-e};e=r}a:{for(;n;){if(n.nextSibling){n=n.nextSibling;break a}n=n.parentNode}n=void 0}n=B(n)}}function wr(e,t){return e&&t?e===t?!0:e&&e.nodeType===3?!1:t&&t.nodeType===3?wr(e,t.parentNode):`contains`in e?e.contains(t):e.compareDocumentPosition?!!(e.compareDocumentPosition(t)&16):!1:!1}function Tr(e){e=e!=null&&e.ownerDocument!=null&&e.ownerDocument.defaultView!=null?e.ownerDocument.defaultView:window;for(var t=Ft(e.document);t instanceof e.HTMLIFrameElement;){try{var n=typeof t.contentWindow.location.href==`string`}catch{n=!1}if(n)e=t.contentWindow;else break;t=Ft(e.document)}return t}function Er(e){var t=e&&e.nodeName&&e.nodeName.toLowerCase();return t&&(t===`input`&&(e.type===`text`||e.type===`search`||e.type===`tel`||e.type===`url`||e.type===`password`)||t===`textarea`||e.contentEditable===`true`)}var Dr=cn&&`documentMode`in document&&11>=document.documentMode,Or=null,kr=null,Ar=null,jr=!1;function Mr(e,t,n){var r=n.window===n?n.document:n.nodeType===9?n:n.ownerDocument;jr||Or==null||Or!==Ft(r)||(r=Or,`selectionStart`in r&&Er(r)?r={start:r.selectionStart,end:r.selectionEnd}:(r=(r.ownerDocument&&r.ownerDocument.defaultView||window).getSelection(),r={anchorNode:r.anchorNode,anchorOffset:r.anchorOffset,focusNode:r.focusNode,focusOffset:r.focusOffset}),Ar&&Sr(Ar,r)||(Ar=r,r=kd(kr,`onSelect`),0>=o,i-=o,wi=1<<32-Ie(t)+i|n<h?(g=d,d=null):g=d.sibling;var _=p(i,d,s[h],c);if(_===null){d===null&&(d=g);break}e&&d&&_.alternate===null&&t(i,d),a=o(_,a,h),u===null?l=_:u.sibling=_,u=_,d=g}if(h===s.length)return n(i,d),Ni&&Ei(i,h),l;if(d===null){for(;hg?(_=h,h=null):_=h.sibling;var y=p(a,h,v.value,l);if(y===null){h===null&&(h=_);break}e&&h&&y.alternate===null&&t(a,h),s=o(y,s,g),d===null?u=y:d.sibling=y,d=y,h=_}if(v.done)return n(a,h),Ni&&Ei(a,g),u;if(h===null){for(;!v.done;g++,v=c.next())v=f(a,v.value,l),v!==null&&(s=o(v,s,g),d===null?u=v:d.sibling=v,d=v);return Ni&&Ei(a,g),u}for(h=r(h);!v.done;g++,v=c.next())v=m(h,a,g,v.value,l),v!==null&&(e&&v.alternate!==null&&h.delete(v.key===null?g:v.key),s=o(v,s,g),d===null?u=v:d.sibling=v,d=v);return e&&h.forEach(function(e){return t(a,e)}),Ni&&Ei(a,g),u}function b(e,r,o,c){if(typeof o==`object`&&o&&o.type===y&&o.key===null&&(o=o.props.children),typeof o==`object`&&o){switch(o.$$typeof){case _:a:{for(var l=o.key;r!==null;){if(r.key===l){if(l=o.type,l===y){if(r.tag===7){n(e,r.sibling),c=a(r,o.props.children),c.return=e,e=c;break a}}else if(r.elementType===l||typeof l==`object`&&l&&l.$$typeof===O&&V(l)===r.type){n(e,r.sibling),c=a(r,o.props),Na(c,o),c.return=e,e=c;break a}n(e,r);break}t(e,r),r=r.sibling}o.type===y?(c=di(o.props.children,e.mode,c,o.key),c.return=e,e=c):(c=ui(o.type,o.key,o.props,null,e.mode,c),Na(c,o),c.return=e,e=c)}return s(e);case v:a:{for(l=o.key;r!==null;){if(r.key===l){if(r.tag===4&&r.stateNode.containerInfo===o.containerInfo&&r.stateNode.implementation===o.implementation){n(e,r.sibling),c=a(r,o.children||[]),c.return=e,e=c;break a}n(e,r);break}t(e,r),r=r.sibling}c=mi(o,e.mode,c),c.return=e,e=c}return s(e);case O:return o=V(o),b(e,r,o,c)}if(F(o))return h(e,r,o,c);if(M(o)){if(l=M(o),typeof l!=`function`)throw Error(i(150));return o=l.call(o),g(e,r,o,c)}if(typeof o.then==`function`)return b(e,r,Ma(o),c);if(o.$$typeof===C)return b(e,r,ta(e,o),c);Pa(e,o)}return typeof o==`string`&&o!==``||typeof o==`number`||typeof o==`bigint`?(o=``+o,r!==null&&r.tag===6?(n(e,r.sibling),c=a(r,o),c.return=e,e=c):(n(e,r),c=fi(o,e.mode,c),c.return=e,e=c),s(e)):n(e,r)}return function(e,t,n,r){try{ja=0;var i=b(e,t,n,r);return Aa=null,i}catch(t){if(t===xa||t===Ca)throw t;var a=oi(29,t,null,e.mode);return a.lanes=r,a.return=e,a}}}var Ia=Fa(!0),La=Fa(!1),Ra=!1;function za(e){e.updateQueue={baseState:e.memoizedState,firstBaseUpdate:null,lastBaseUpdate:null,shared:{pending:null,lanes:0,hiddenCallbacks:null},callbacks:null}}function Ba(e,t){e=e.updateQueue,t.updateQueue===e&&(t.updateQueue={baseState:e.baseState,firstBaseUpdate:e.firstBaseUpdate,lastBaseUpdate:e.lastBaseUpdate,shared:e.shared,callbacks:null})}function Va(e){return{lane:e,tag:0,payload:null,callback:null,next:null}}function Ha(e,t,n){var r=e.updateQueue;if(r===null)return null;if(r=r.shared,Ll&2){var i=r.pending;return i===null?t.next=t:(t.next=i.next,i.next=t),r.pending=t,t=ri(e),ni(e,null,n),t}return $r(e,r,t,n),ri(e)}function Ua(e,t,n){if(t=t.updateQueue,t!==null&&(t=t.shared,n&4194048)){var r=t.lanes;r&=e.pendingLanes,n|=r,t.lanes=n,Qe(e,n)}}function Wa(e,t){var n=e.updateQueue,r=e.alternate;if(r!==null&&(r=r.updateQueue,n===r)){var i=null,a=null;if(n=n.firstBaseUpdate,n!==null){do{var o={lane:n.lane,tag:n.tag,payload:n.payload,callback:null,next:null};a===null?i=a=o:a=a.next=o,n=n.next}while(n!==null);a===null?i=a=t:a=a.next=t}else i=a=t;n={baseState:r.baseState,firstBaseUpdate:i,lastBaseUpdate:a,shared:r.shared,callbacks:r.callbacks},e.updateQueue=n;return}e=n.lastBaseUpdate,e===null?n.firstBaseUpdate=t:e.next=t,n.lastBaseUpdate=t}var Ga=!1;function Ka(){if(Ga){var e=fa;if(e!==null)throw e}}function qa(e,t,n,r){Ga=!1;var i=e.updateQueue;Ra=!1;var a=i.firstBaseUpdate,o=i.lastBaseUpdate,s=i.shared.pending;if(s!==null){i.shared.pending=null;var c=s,l=c.next;c.next=null,o===null?a=l:o.next=l,o=c;var u=e.alternate;u!==null&&(u=u.updateQueue,s=u.lastBaseUpdate,s!==o&&(s===null?u.firstBaseUpdate=l:s.next=l,u.lastBaseUpdate=c))}if(a!==null){var d=i.baseState;o=0,u=l=c=null,s=a;do{var f=s.lane&-536870913,p=f!==s.lane;if(p?(Bl&f)===f:(r&f)===f){f!==0&&f===da&&(Ga=!0),u!==null&&(u=u.next={lane:0,tag:s.tag,payload:s.payload,callback:null,next:null});a:{var m=e,g=s;f=t;var _=n;switch(g.tag){case 1:if(m=g.payload,typeof m==`function`){d=m.call(_,d,f);break a}d=m;break a;case 3:m.flags=m.flags&-65537|128;case 0:if(m=g.payload,f=typeof m==`function`?m.call(_,d,f):m,f==null)break a;d=h({},d,f);break a;case 2:Ra=!0}}f=s.callback,f!==null&&(e.flags|=64,p&&(e.flags|=8192),p=i.callbacks,p===null?i.callbacks=[f]:p.push(f))}else p={lane:f,tag:s.tag,payload:s.payload,callback:s.callback,next:null},u===null?(l=u=p,c=d):u=u.next=p,o|=f;if(s=s.next,s===null){if(s=i.shared.pending,s===null)break;p=s,s=p.next,p.next=null,i.lastBaseUpdate=p,i.shared.pending=null}}while(1);u===null&&(c=d),i.baseState=c,i.firstBaseUpdate=l,i.lastBaseUpdate=u,a===null&&(i.shared.lanes=0),ql|=o,e.lanes=o,e.memoizedState=d}}function Ja(e,t){if(typeof e!=`function`)throw Error(i(191,e));e.call(t)}function Ya(e,t){var n=e.callbacks;if(n!==null)for(e.callbacks=null,e=0;ea?a:8;var o=I.T,s={};I.T=s,js(e,!1,t,n);try{var c=i(),l=I.S;l!==null&&l(s,c),typeof c==`object`&&c&&typeof c.then==`function`?As(e,t,ha(c,r),hu(e)):As(e,t,r,hu(e))}catch(n){As(e,t,{then:function(){},status:`rejected`,reason:n},hu())}finally{L.p=a,o!==null&&s.types!==null&&(o.types=s.types),I.T=o}}function bs(){}function xs(e,t,n,r){if(e.tag!==5)throw Error(i(476));var a=Ss(e).queue;ys(e,a,t,ee,n===null?bs:function(){return Cs(e),n(r)})}function Ss(e){var t=e.memoizedState;if(t!==null)return t;t={memoizedState:ee,baseState:ee,baseQueue:null,queue:{pending:null,lanes:0,dispatch:null,lastRenderedReducer:No,lastRenderedState:ee},next:null};var n={};return t.next={memoizedState:n,baseState:n,baseQueue:null,queue:{pending:null,lanes:0,dispatch:null,lastRenderedReducer:No,lastRenderedState:n},next:null},e.memoizedState=t,e=e.alternate,e!==null&&(e.memoizedState=t),t}function Cs(e){var t=Ss(e);t.next===null&&(t=e.alternate.memoizedState),As(e,t.next.queue,{},hu())}function ws(){return ea(np)}function Ts(){return Oo().memoizedState}function Es(){return Oo().memoizedState}function Ds(e){for(var t=e.return;t!==null;){switch(t.tag){case 24:case 3:var n=hu();e=Va(n);var r=Ha(t,e,n);r!==null&&(_u(r,t,n),Ua(r,t,n)),t={cache:sa()},e.payload=t;return}t=t.return}}function Os(e,t,n){var r=hu();n={lane:r,revertLane:0,gesture:null,action:n,hasEagerState:!1,eagerState:null,next:null},Ms(e)?Ns(t,n):(n=ei(e,t,n,r),n!==null&&(_u(n,e,r),Ps(n,t,r)))}function ks(e,t,n){As(e,t,n,hu())}function As(e,t,n,r){var i={lane:r,revertLane:0,gesture:null,action:n,hasEagerState:!1,eagerState:null,next:null};if(Ms(e))Ns(t,i);else{var a=e.alternate;if(e.lanes===0&&(a===null||a.lanes===0)&&(a=t.lastRenderedReducer,a!==null))try{var o=t.lastRenderedState,s=a(o,n);if(i.hasEagerState=!0,i.eagerState=s,xr(s,o))return $r(e,t,i,0),Rl===null&&Qr(),!1}catch{}if(n=ei(e,t,i,r),n!==null)return _u(n,e,r),Ps(n,t,r),!0}return!1}function js(e,t,n,r){if(r={lane:2,revertLane:pd(),gesture:null,action:r,hasEagerState:!1,eagerState:null,next:null},Ms(e)){if(t)throw Error(i(479))}else t=ei(e,n,r,2),t!==null&&_u(t,e,2)}function Ms(e){var t=e.alternate;return e===lo||t!==null&&t===lo}function Ns(e,t){po=W=!0;var n=e.pending;n===null?t.next=t:(t.next=n.next,n.next=t),e.pending=t}function Ps(e,t,n){if(n&4194048){var r=t.lanes;r&=e.pendingLanes,n|=r,t.lanes=n,Qe(e,n)}}var Fs={readContext:ea,use:jo,useCallback:G,useContext:G,useEffect:G,useImperativeHandle:G,useLayoutEffect:G,useInsertionEffect:G,useMemo:G,useReducer:G,useRef:G,useState:G,useDebugValue:G,useDeferredValue:G,useTransition:G,useSyncExternalStore:G,useId:G,useHostTransitionStatus:G,useFormState:G,useActionState:G,useOptimistic:G,useMemoCache:G,useCacheRefresh:G};Fs.useEffectEvent=G;var Is={readContext:ea,use:jo,useCallback:function(e,t){return Do().memoizedState=[e,t===void 0?null:t],e},useContext:ea,useEffect:ss,useImperativeHandle:function(e,t,n){n=n==null?null:n.concat([e]),as(4194308,4,ps.bind(null,t,e),n)},useLayoutEffect:function(e,t){return as(4194308,4,e,t)},useInsertionEffect:function(e,t){as(4,2,e,t)},useMemo:function(e,t){var n=Do();t=t===void 0?null:t;var r=e();if(mo){Fe(!0);try{e()}finally{Fe(!1)}}return n.memoizedState=[r,t],r},useReducer:function(e,t,n){var r=Do();if(n!==void 0){var i=n(t);if(mo){Fe(!0);try{n(t)}finally{Fe(!1)}}}else i=t;return r.memoizedState=r.baseState=i,e={pending:null,lanes:0,dispatch:null,lastRenderedReducer:e,lastRenderedState:i},r.queue=e,e=e.dispatch=Os.bind(null,lo,e),[r.memoizedState,e]},useRef:function(e){var t=Do();return e={current:e},t.memoizedState=e},useState:function(e){e=Uo(e);var t=e.queue,n=ks.bind(null,lo,t);return t.dispatch=n,[e.memoizedState,n]},useDebugValue:hs,useDeferredValue:function(e,t){return vs(Do(),e,t)},useTransition:function(){var e=Uo(!1);return e=ys.bind(null,lo,e.queue,!0,!1),Do().memoizedState=e,[!1,e]},useSyncExternalStore:function(e,t,n){var r=lo,a=Do();if(Ni){if(n===void 0)throw Error(i(407));n=n()}else{if(n=t(),Rl===null)throw Error(i(349));Bl&127||Ro(r,t,n)}a.memoizedState=n;var o={value:n,getSnapshot:t};return a.queue=o,ss(Bo.bind(null,r,o,e),[e]),r.flags|=2048,rs(9,{destroy:void 0},zo.bind(null,r,o,n,t),null),n},useId:function(){var e=Do(),t=Rl.identifierPrefix;if(Ni){var n=Ti,r=wi;n=(r&~(1<<32-Ie(r)-1)).toString(32)+n,t=`_`+t+`R_`+n,n=ho++,0<\/script>`,o=o.removeChild(o.firstChild);break;case`select`:o=typeof r.is==`string`?s.createElement(`select`,{is:r.is}):s.createElement(`select`),r.multiple?o.multiple=!0:r.size&&(o.size=r.size);break;default:o=typeof r.is==`string`?s.createElement(a,{is:r.is}):s.createElement(a)}}o[at]=t,o[ot]=r;a:for(s=t.child;s!==null;){if(s.tag===5||s.tag===6)o.appendChild(s.stateNode);else if(s.tag!==4&&s.tag!==27&&s.child!==null){s.child.return=s,s=s.child;continue}if(s===t)break a;for(;s.sibling===null;){if(s.return===null||s.return===t)break a;s=s.return}s.sibling.return=s.return,s=s.sibling}t.stateNode=o;a:switch(Rd(o,a,r),a){case`button`:case`input`:case`select`:case`textarea`:r=!!r.autoFocus;break a;case`img`:r=!0;break a;default:r=!1}r&&Ac(t)}}return Fc(t),jc(t,t.type,e===null?null:e.memoizedProps,t.pendingProps,n),null;case 6:if(e&&t.stateNode!=null)e.memoizedProps!==r&&Ac(t);else{if(typeof r!=`string`&&t.stateNode===null)throw Error(i(166));if(e=oe.current,Bi(t)){if(e=t.stateNode,n=t.memoizedProps,r=null,a=ji,a!==null)switch(a.tag){case 27:case 5:r=a.memoizedProps}e[at]=t,e=!!(e.nodeValue===n||r!==null&&!0===r.suppressHydrationWarning||Fd(e.nodeValue,n)),e||Li(t,!0)}else e=Wd(e).createTextNode(r),e[at]=t,t.stateNode=e}return Fc(t),null;case 31:if(n=t.memoizedState,e===null||e.memoizedState!==null){if(r=Bi(t),n!==null){if(e===null){if(!r)throw Error(i(318));if(e=t.memoizedState,e=e===null?null:e.dehydrated,!e)throw Error(i(557));e[at]=t}else Vi(),!(t.flags&128)&&(t.memoizedState=null),t.flags|=4;Fc(t),e=!1}else n=Hi(),e!==null&&e.memoizedState!==null&&(e.memoizedState.hydrationErrors=n),e=!0;if(!e)return t.flags&256?(ao(t),t):(ao(t),null);if(t.flags&128)throw Error(i(558))}return Fc(t),null;case 13:if(r=t.memoizedState,e===null||e.memoizedState!==null&&e.memoizedState.dehydrated!==null){if(a=Bi(t),r!==null&&r.dehydrated!==null){if(e===null){if(!a)throw Error(i(318));if(a=t.memoizedState,a=a===null?null:a.dehydrated,!a)throw Error(i(317));a[at]=t}else Vi(),!(t.flags&128)&&(t.memoizedState=null),t.flags|=4;Fc(t),a=!1}else a=Hi(),e!==null&&e.memoizedState!==null&&(e.memoizedState.hydrationErrors=a),a=!0;if(!a)return t.flags&256?(ao(t),t):(ao(t),null)}return ao(t),t.flags&128?(t.lanes=n,t):(n=r!==null,e=e!==null&&e.memoizedState!==null,n&&(r=t.child,a=null,r.alternate!==null&&r.alternate.memoizedState!==null&&r.alternate.memoizedState.cachePool!==null&&(a=r.alternate.memoizedState.cachePool.pool),o=null,r.memoizedState!==null&&r.memoizedState.cachePool!==null&&(o=r.memoizedState.cachePool.pool),o!==a&&(r.flags|=2048)),n!==e&&n&&(t.child.flags|=8192),Nc(t,t.updateQueue),Fc(t),null);case 4:return le(),e===null&&Td(t.stateNode.containerInfo),Fc(t),null;case 10:return Ji(t.type),Fc(t),null;case 19:if(z(oo),r=t.memoizedState,r===null)return Fc(t),null;if(a=!!(t.flags&128),o=r.rendering,o===null){if(a)Pc(r,!1);else{if(Kl!==0||e!==null&&e.flags&128)for(e=t.child;e!==null;){if(o=so(e),o!==null){for(t.flags|=128,Pc(r,!1),e=o.updateQueue,t.updateQueue=e,Nc(t,e),t.subtreeFlags=0,e=n,n=t.child;n!==null;)li(n,e),n=n.sibling;return re(oo,oo.current&1|2),Ni&&Ei(t,r.treeForkCount),t.child}e=e.sibling}r.tail!==null&&we()>ru&&(t.flags|=128,a=!0,Pc(r,!1),t.lanes=4194304)}}else{if(!a){if(e=so(o),e!==null){if(t.flags|=128,a=!0,e=e.updateQueue,t.updateQueue=e,Nc(t,e),Pc(r,!0),r.tail===null&&r.tailMode===`hidden`&&!o.alternate&&!Ni)return Fc(t),null}else 2*we()-r.renderingStartTime>ru&&n!==536870912&&(t.flags|=128,a=!0,Pc(r,!1),t.lanes=4194304)}r.isBackwards?(o.sibling=t.child,t.child=o):(e=r.last,e===null?t.child=o:e.sibling=o,r.last=o)}return r.tail===null?(Fc(t),null):(e=r.tail,r.rendering=e,r.tail=e.sibling,r.renderingStartTime=we(),e.sibling=null,n=oo.current,re(oo,a?n&1|2:n&1),Ni&&Ei(t,r.treeForkCount),e);case 22:case 23:return ao(t),eo(),r=t.memoizedState!==null,e===null?r&&(t.flags|=8192):e.memoizedState!==null!==r&&(t.flags|=8192),r?n&536870912&&!(t.flags&128)&&(Fc(t),t.subtreeFlags&6&&(t.flags|=8192)):Fc(t),n=t.updateQueue,n!==null&&Nc(t,n.retryQueue),n=null,e!==null&&e.memoizedState!==null&&e.memoizedState.cachePool!==null&&(n=e.memoizedState.cachePool.pool),r=null,t.memoizedState!==null&&t.memoizedState.cachePool!==null&&(r=t.memoizedState.cachePool.pool),r!==n&&(t.flags|=2048),e!==null&&z(_a),null;case 24:return n=null,e!==null&&(n=e.memoizedState.cache),t.memoizedState.cache!==n&&(t.flags|=2048),Ji(oa),Fc(t),null;case 25:return null;case 30:return null}throw Error(i(156,t.tag))}function Lc(e,t){switch(ki(t),t.tag){case 1:return e=t.flags,e&65536?(t.flags=e&-65537|128,t):null;case 3:return Ji(oa),le(),e=t.flags,e&65536&&!(e&128)?(t.flags=e&-65537|128,t):null;case 26:case 27:case 5:return de(t),null;case 31:if(t.memoizedState!==null){if(ao(t),t.alternate===null)throw Error(i(340));Vi()}return e=t.flags,e&65536?(t.flags=e&-65537|128,t):null;case 13:if(ao(t),e=t.memoizedState,e!==null&&e.dehydrated!==null){if(t.alternate===null)throw Error(i(340));Vi()}return e=t.flags,e&65536?(t.flags=e&-65537|128,t):null;case 19:return z(oo),null;case 4:return le(),null;case 10:return Ji(t.type),null;case 22:case 23:return ao(t),eo(),e!==null&&z(_a),e=t.flags,e&65536?(t.flags=e&-65537|128,t):null;case 24:return Ji(oa),null;case 25:return null;default:return null}}function Rc(e,t){switch(ki(t),t.tag){case 3:Ji(oa),le();break;case 26:case 27:case 5:de(t);break;case 4:le();break;case 31:t.memoizedState!==null&&ao(t);break;case 13:ao(t);break;case 19:z(oo);break;case 10:Ji(t.type);break;case 22:case 23:ao(t),eo(),e!==null&&z(_a);break;case 24:Ji(oa)}}function zc(e,t){try{var n=t.updateQueue,r=n===null?null:n.lastEffect;if(r!==null){var i=r.next;n=i;do{if((n.tag&e)===e){r=void 0;var a=n.create,o=n.inst;r=a(),o.destroy=r}n=n.next}while(n!==i)}}catch(e){qu(t,t.return,e)}}function Bc(e,t,n){try{var r=t.updateQueue,i=r===null?null:r.lastEffect;if(i!==null){var a=i.next;r=a;do{if((r.tag&e)===e){var o=r.inst,s=o.destroy;if(s!==void 0){o.destroy=void 0,i=t;var c=n,l=s;try{l()}catch(e){qu(i,c,e)}}}r=r.next}while(r!==a)}}catch(e){qu(t,t.return,e)}}function Vc(e){var t=e.updateQueue;if(t!==null){var n=e.stateNode;try{Ya(t,n)}catch(t){qu(e,e.return,t)}}}function Hc(e,t,n){n.props=Us(e.type,e.memoizedProps),n.state=e.memoizedState;try{n.componentWillUnmount()}catch(n){qu(e,t,n)}}function Uc(e,t){try{var n=e.ref;if(n!==null){switch(e.tag){case 26:case 27:case 5:var r=e.stateNode;break;case 30:r=e.stateNode;break;default:r=e.stateNode}typeof n==`function`?e.refCleanup=n(r):n.current=r}}catch(n){qu(e,t,n)}}function Wc(e,t){var n=e.ref,r=e.refCleanup;if(n!==null){if(typeof r==`function`)try{r()}catch(n){qu(e,t,n)}finally{e.refCleanup=null,e=e.alternate,e!=null&&(e.refCleanup=null)}else if(typeof n==`function`)try{n(null)}catch(n){qu(e,t,n)}else n.current=null}}function Gc(e){var t=e.type,n=e.memoizedProps,r=e.stateNode;try{a:switch(t){case`button`:case`input`:case`select`:case`textarea`:n.autoFocus&&r.focus();break a;case`img`:n.src?r.src=n.src:n.srcSet&&(r.srcset=n.srcSet)}}catch(t){qu(e,e.return,t)}}function Kc(e,t,n){try{var r=e.stateNode;zd(r,e.type,n,t),r[ot]=t}catch(t){qu(e,e.return,t)}}function qc(e){return e.tag===5||e.tag===3||e.tag===26||e.tag===27&&tf(e.type)||e.tag===4}function Jc(e){a:for(;;){for(;e.sibling===null;){if(e.return===null||qc(e.return))return null;e=e.return}for(e.sibling.return=e.return,e=e.sibling;e.tag!==5&&e.tag!==6&&e.tag!==18;){if(e.tag===27&&tf(e.type)||e.flags&2||e.child===null||e.tag===4)continue a;e.child.return=e,e=e.child}if(!(e.flags&2))return e.stateNode}}function Yc(e,t,n){var r=e.tag;if(r===5||r===6)e=e.stateNode,t?(n.nodeType===9?n.body:n.nodeName===`HTML`?n.ownerDocument.body:n).insertBefore(e,t):(t=n.nodeType===9?n.body:n.nodeName===`HTML`?n.ownerDocument.body:n,t.appendChild(e),n=n._reactRootContainer,n!=null||t.onclick!==null||(t.onclick=Qt));else if(r!==4&&(r===27&&tf(e.type)&&(n=e.stateNode,t=null),e=e.child,e!==null))for(Yc(e,t,n),e=e.sibling;e!==null;)Yc(e,t,n),e=e.sibling}function Xc(e,t,n){var r=e.tag;if(r===5||r===6)e=e.stateNode,t?n.insertBefore(e,t):n.appendChild(e);else if(r!==4&&(r===27&&tf(e.type)&&(n=e.stateNode),e=e.child,e!==null))for(Xc(e,t,n),e=e.sibling;e!==null;)Xc(e,t,n),e=e.sibling}function Zc(e){var t=e.stateNode,n=e.memoizedProps;try{for(var r=e.type,i=t.attributes;i.length;)t.removeAttributeNode(i[0]);Rd(t,r,n),t[at]=e,t[ot]=n}catch(t){qu(e,e.return,t)}}var Qc=!1,$c=!1,el=!1,tl=typeof WeakSet==`function`?WeakSet:Set,nl=null;function rl(e,t){if(e=e.containerInfo,Hd=dp,e=Tr(e),Er(e)){if(`selectionStart`in e)var n={start:e.selectionStart,end:e.selectionEnd};else a:{n=(n=e.ownerDocument)&&n.defaultView||window;var r=n.getSelection&&n.getSelection();if(r&&r.rangeCount!==0){n=r.anchorNode;var a=r.anchorOffset,o=r.focusNode;r=r.focusOffset;try{n.nodeType,o.nodeType}catch{n=null;break a}var s=0,c=-1,l=-1,u=0,d=0,f=e,p=null;b:for(;;){for(var m;f!==n||a!==0&&f.nodeType!==3||(c=s+a),f!==o||r!==0&&f.nodeType!==3||(l=s+r),f.nodeType===3&&(s+=f.nodeValue.length),(m=f.firstChild)!==null;)p=f,f=m;for(;;){if(f===e)break b;if(p===n&&++u===a&&(c=s),p===o&&++d===r&&(l=s),(m=f.nextSibling)!==null)break;f=p,p=f.parentNode}f=m}n=c===-1||l===-1?null:{start:c,end:l}}else n=null}n||={start:0,end:0}}else n=null;for(Ud={focusedElem:e,selectionRange:n},dp=!1,nl=t;nl!==null;)if(t=nl,e=t.child,t.subtreeFlags&1028&&e!==null)e.return=t,nl=e;else for(;nl!==null;){switch(t=nl,o=t.alternate,e=t.flags,t.tag){case 0:if(e&4&&(e=t.updateQueue,e=e===null?null:e.events,e!==null))for(n=0;n title`))),Rd(o,r,n),o[at]=e,vt(o),r=o;break a;case`link`:var s=Gf(`link`,`href`,a).get(r+(n.href||``));if(s){for(var c=0;cg&&(o=g,g=h,h=o);var _=Cr(s,h),v=Cr(s,g);if(_&&v&&(p.rangeCount!==1||p.anchorNode!==_.node||p.anchorOffset!==_.offset||p.focusNode!==v.node||p.focusOffset!==v.offset)){var y=d.createRange();y.setStart(_.node,_.offset),p.removeAllRanges(),h>g?(p.addRange(y),p.extend(v.node,v.offset)):(y.setEnd(v.node,v.offset),p.addRange(y))}}}}for(d=[],p=s;p=p.parentNode;)p.nodeType===1&&d.push({element:p,left:p.scrollLeft,top:p.scrollTop});for(typeof s.focus==`function`&&s.focus(),s=0;sn?32:n,I.T=null,n=du,du=null;var o=su,s=lu;if(ou=0,cu=su=null,lu=0,Ll&6)throw Error(i(331));var c=Ll;if(Ll|=4,Nl(o.current),Tl(o,o.current,s,n),Ll=c,od(0,!1),Pe&&typeof Pe.onPostCommitFiberRoot==`function`)try{Pe.onPostCommitFiberRoot(Ne,o)}catch{}return!0}finally{L.p=a,I.T=r,Uu(e,t)}}function Ku(e,t,n){t=gi(n,t),t=Ys(e.stateNode,t,2),e=Ha(e,t,2),e!==null&&(Ye(e,2),ad(e))}function qu(e,t,n){if(e.tag===3)Ku(e,e,n);else for(;t!==null;){if(t.tag===3){Ku(t,e,n);break}if(t.tag===1){var r=t.stateNode;if(typeof t.type.getDerivedStateFromError==`function`||typeof r.componentDidCatch==`function`&&(au===null||!au.has(r))){e=gi(n,e),n=Xs(2),r=Ha(t,n,2),r!==null&&(Zs(n,r,t,e),Ye(r,2),ad(r));break}}t=t.return}}function Ju(e,t,n){var r=e.pingCache;if(r===null){r=e.pingCache=new Il;var i=new Set;r.set(t,i)}else i=r.get(t),i===void 0&&(i=new Set,r.set(t,i));i.has(n)||(Wl=!0,i.add(n),e=Yu.bind(null,e,t,n),t.then(e,e))}function Yu(e,t,n){var r=e.pingCache;r!==null&&r.delete(t),e.pingedLanes|=e.suspendedLanes&n,e.warmLanes&=~n,Rl===e&&(Bl&n)===n&&(Kl===4||Kl===3&&(Bl&62914560)===Bl&&300>we()-tu?!(Ll&2)&&wu(e,0):Yl|=n,Zl===Bl&&(Zl=0)),ad(e)}function Xu(e,t){t===0&&(t=qe()),e=ti(e,t),e!==null&&(Ye(e,t),ad(e))}function Zu(e){var t=e.memoizedState,n=0;t!==null&&(n=t.retryLane),Xu(e,n)}function Qu(e,t){var n=0;switch(e.tag){case 31:case 13:var r=e.stateNode,a=e.memoizedState;a!==null&&(n=a.retryLane);break;case 19:r=e.stateNode;break;case 22:r=e.stateNode._retryCache;break;default:throw Error(i(314))}r!==null&&r.delete(t),Xu(e,n)}function $u(e,t){return be(e,t)}var ed=null,td=null,Y=!1,nd=!1,rd=!1,id=0;function ad(e){e!==td&&e.next===null&&(td===null?ed=td=e:td=td.next=e),nd=!0,Y||(Y=!0,fd())}function od(e,t){if(!rd&&nd){rd=!0;do for(var n=!1,r=ed;r!==null;){if(!t){if(e!==0){var i=r.pendingLanes;if(i===0)var a=0;else{var o=r.suspendedLanes,s=r.pingedLanes;a=(1<<31-Ie(42|e)+1)-1,a&=i&~(o&~s),a=a&201326741?a&201326741|1:a?a|2:0}a!==0&&(n=!0,dd(r,a))}else a=Bl,a=We(r,r===Rl?a:0,r.cancelPendingCommit!==null||r.timeoutHandle!==-1),!(a&3)||Ge(r,a)||(n=!0,dd(r,a))}r=r.next}while(n);rd=!1}}function sd(){cd()}function cd(){nd=Y=!1;var e=0;id!==0&&Yd()&&(e=id);for(var t=we(),n=null,r=ed;r!==null;){var i=r.next,a=ld(r,t);a===0?(r.next=null,n===null?ed=i:n.next=i,i===null&&(td=n)):(n=r,(e!==0||a&3)&&(nd=!0)),r=i}ou!==0&&ou!==5||od(e,!1),id!==0&&(id=0)}function ld(e,t){for(var n=e.suspendedLanes,r=e.pingedLanes,i=e.expirationTimes,a=e.pendingLanes&-62914561;0s)break;var u=c.transferSize,d=c.initiatorType;u&&Bd(d)&&(c=c.responseEnd,o+=u*(c`u`?null:document;function Tf(e,t,n){var r=wf;if(r&&typeof t==`string`&&t){var i=Lt(t);i=`link[rel="`+e+`"][href="`+i+`"]`,typeof n==`string`&&(i+=`[crossorigin="`+n+`"]`),yf.has(i)||(yf.add(i),e={rel:e,crossOrigin:n,href:t},r.querySelector(i)===null&&(t=r.createElement(`link`),Rd(t,`link`,e),vt(t),r.head.appendChild(t)))}}function Ef(e){xf.D(e),Tf(`dns-prefetch`,e,null)}function Df(e,t){xf.C(e,t),Tf(`preconnect`,e,t)}function Of(e,t,n){xf.L(e,t,n);var r=wf;if(r&&e&&t){var i=`link[rel="preload"][as="`+Lt(t)+`"]`;t===`image`&&n&&n.imageSrcSet?(i+=`[imagesrcset="`+Lt(n.imageSrcSet)+`"]`,typeof n.imageSizes==`string`&&(i+=`[imagesizes="`+Lt(n.imageSizes)+`"]`)):i+=`[href="`+Lt(e)+`"]`;var a=i;switch(t){case`style`:a=Pf(e);break;case`script`:a=Rf(e)}vf.has(a)||(e=h({rel:`preload`,href:t===`image`&&n&&n.imageSrcSet?void 0:e,as:t},n),vf.set(a,e),r.querySelector(i)!==null||t===`style`&&r.querySelector(Ff(a))||t===`script`&&r.querySelector(zf(a))||(t=r.createElement(`link`),Rd(t,`link`,e),vt(t),r.head.appendChild(t)))}}function kf(e,t){xf.m(e,t);var n=wf;if(n&&e){var r=t&&typeof t.as==`string`?t.as:`script`,i=`link[rel="modulepreload"][as="`+Lt(r)+`"][href="`+Lt(e)+`"]`,a=i;switch(r){case`audioworklet`:case`paintworklet`:case`serviceworker`:case`sharedworker`:case`worker`:case`script`:a=Rf(e)}if(!vf.has(a)&&(e=h({rel:`modulepreload`,href:e},t),vf.set(a,e),n.querySelector(i)===null)){switch(r){case`audioworklet`:case`paintworklet`:case`serviceworker`:case`sharedworker`:case`worker`:case`script`:if(n.querySelector(zf(a)))return}r=n.createElement(`link`),Rd(r,`link`,e),vt(r),n.head.appendChild(r)}}}function Af(e,t,n){xf.S(e,t,n);var r=wf;if(r&&e){var i=_t(r).hoistableStyles,a=Pf(e);t||=`default`;var o=i.get(a);if(!o){var s={loading:0,preload:null};if(o=r.querySelector(Ff(a)))s.loading=5;else{e=h({rel:`stylesheet`,href:e,"data-precedence":t},n),(n=vf.get(a))&&Hf(e,n);var c=o=r.createElement(`link`);vt(c),Rd(c,`link`,e),c._p=new Promise(function(e,t){c.onload=e,c.onerror=t}),c.addEventListener(`load`,function(){s.loading|=1}),c.addEventListener(`error`,function(){s.loading|=2}),s.loading|=4,Vf(o,t,r)}o={type:`stylesheet`,instance:o,count:1,state:s},i.set(a,o)}}}function jf(e,t){xf.X(e,t);var n=wf;if(n&&e){var r=_t(n).hoistableScripts,i=Rf(e),a=r.get(i);a||(a=n.querySelector(zf(i)),a||(e=h({src:e,async:!0},t),(t=vf.get(i))&&Uf(e,t),a=n.createElement(`script`),vt(a),Rd(a,`link`,e),n.head.appendChild(a)),a={type:`script`,instance:a,count:1,state:null},r.set(i,a))}}function Mf(e,t){xf.M(e,t);var n=wf;if(n&&e){var r=_t(n).hoistableScripts,i=Rf(e),a=r.get(i);a||(a=n.querySelector(zf(i)),a||(e=h({src:e,async:!0,type:`module`},t),(t=vf.get(i))&&Uf(e,t),a=n.createElement(`script`),vt(a),Rd(a,`link`,e),n.head.appendChild(a)),a={type:`script`,instance:a,count:1,state:null},r.set(i,a))}}function Nf(e,t,n,r){var a=(a=oe.current)?bf(a):null;if(!a)throw Error(i(446));switch(e){case`meta`:case`title`:return null;case`style`:return typeof n.precedence==`string`&&typeof n.href==`string`?(t=Pf(n.href),n=_t(a).hoistableStyles,r=n.get(t),r||(r={type:`style`,instance:null,count:0,state:null},n.set(t,r)),r):{type:`void`,instance:null,count:0,state:null};case`link`:if(n.rel===`stylesheet`&&typeof n.href==`string`&&typeof n.precedence==`string`){e=Pf(n.href);var o=_t(a).hoistableStyles,s=o.get(e);if(s||(a=a.ownerDocument||a,s={type:`stylesheet`,instance:null,count:0,state:{loading:0,preload:null}},o.set(e,s),(o=a.querySelector(Ff(e)))&&!o._p&&(s.instance=o,s.state.loading=5),vf.has(e)||(n={rel:`preload`,as:`style`,href:n.href,crossOrigin:n.crossOrigin,integrity:n.integrity,media:n.media,hrefLang:n.hrefLang,referrerPolicy:n.referrerPolicy},vf.set(e,n),o||Lf(a,e,n,s.state))),t&&r===null)throw Error(i(528,``));return s}if(t&&r!==null)throw Error(i(529,``));return null;case`script`:return t=n.async,n=n.src,typeof n==`string`&&t&&typeof t!=`function`&&typeof t!=`symbol`?(t=Rf(n),n=_t(a).hoistableScripts,r=n.get(t),r||(r={type:`script`,instance:null,count:0,state:null},n.set(t,r)),r):{type:`void`,instance:null,count:0,state:null};default:throw Error(i(444,e))}}function Pf(e){return`href="`+Lt(e)+`"`}function Ff(e){return`link[rel="stylesheet"][`+e+`]`}function If(e){return h({},e,{"data-precedence":e.precedence,precedence:null})}function Lf(e,t,n,r){e.querySelector(`link[rel="preload"][as="style"][`+t+`]`)?r.loading=1:(t=e.createElement(`link`),r.preload=t,t.addEventListener(`load`,function(){return r.loading|=1}),t.addEventListener(`error`,function(){return r.loading|=2}),Rd(t,`link`,n),vt(t),e.head.appendChild(t))}function Rf(e){return`[src="`+Lt(e)+`"]`}function zf(e){return`script[async]`+e}function Bf(e,t,n){if(t.count++,t.instance===null)switch(t.type){case`style`:var r=e.querySelector(`style[data-href~="`+Lt(n.href)+`"]`);if(r)return t.instance=r,vt(r),r;var a=h({},n,{"data-href":n.href,"data-precedence":n.precedence,href:null,precedence:null});return r=(e.ownerDocument||e).createElement(`style`),vt(r),Rd(r,`style`,a),Vf(r,n.precedence,e),t.instance=r;case`stylesheet`:a=Pf(n.href);var o=e.querySelector(Ff(a));if(o)return t.state.loading|=4,t.instance=o,vt(o),o;r=If(n),(a=vf.get(a))&&Hf(r,a),o=(e.ownerDocument||e).createElement(`link`),vt(o);var s=o;return s._p=new Promise(function(e,t){s.onload=e,s.onerror=t}),Rd(o,`link`,r),t.state.loading|=4,Vf(o,n.precedence,e),t.instance=o;case`script`:return o=Rf(n.src),(a=e.querySelector(zf(o)))?(t.instance=a,vt(a),a):(r=n,(a=vf.get(o))&&(r=h({},n),Uf(r,a)),e=e.ownerDocument||e,a=e.createElement(`script`),vt(a),Rd(a,`link`,r),e.head.appendChild(a),t.instance=a);case`void`:return null;default:throw Error(i(443,t.type))}else t.type===`stylesheet`&&!(t.state.loading&4)&&(r=t.instance,t.state.loading|=4,Vf(r,n.precedence,e));return t.instance}function Vf(e,t,n){for(var r=n.querySelectorAll(`link[rel="stylesheet"][data-precedence],style[data-precedence]`),i=r.length?r[r.length-1]:null,a=i,o=0;o title`):null)}function qf(e,t,n){if(n===1||t.itemProp!=null)return!1;switch(e){case`meta`:case`title`:return!0;case`style`:if(typeof t.precedence!=`string`||typeof t.href!=`string`||t.href===``)break;return!0;case`link`:if(typeof t.rel!=`string`||typeof t.href!=`string`||t.href===``||t.onLoad||t.onError)break;switch(t.rel){case`stylesheet`:return e=t.disabled,typeof t.precedence==`string`&&e==null;default:return!0}case`script`:if(t.async&&typeof t.async!=`function`&&typeof t.async!=`symbol`&&!t.onLoad&&!t.onError&&t.src&&typeof t.src==`string`)return!0}return!1}function Jf(e){return!(e.type===`stylesheet`&&!(e.state.loading&3))}function Yf(e,t,n,r){if(n.type===`stylesheet`&&(typeof r.media!=`string`||!1!==matchMedia(r.media).matches)&&!(n.state.loading&4)){if(n.instance===null){var i=Pf(r.href),a=t.querySelector(Ff(i));if(a){t=a._p,typeof t==`object`&&t&&typeof t.then==`function`&&(e.count++,e=Qf.bind(e),t.then(e,e)),n.state.loading|=4,n.instance=a,vt(a);return}a=t.ownerDocument||t,r=If(r),(i=vf.get(i))&&Hf(r,i),a=a.createElement(`link`),vt(a);var o=a;o._p=new Promise(function(e,t){o.onload=e,o.onerror=t}),Rd(a,`link`,r),n.instance=a}e.stylesheets===null&&(e.stylesheets=new Map),e.stylesheets.set(n,t),(t=n.state.preload)&&!(n.state.loading&3)&&(e.count++,n=Qf.bind(e),t.addEventListener(`load`,n),t.addEventListener(`error`,n))}}var Xf=0;function Zf(e,t){return e.stylesheets&&e.count===0&&ep(e,e.stylesheets),0Xf?50:800)+t);return e.unsuspend=n,function(){e.unsuspend=null,clearTimeout(r),clearTimeout(i)}}:null}function Qf(){if(this.count--,this.count===0&&(this.imgCount===0||!this.waitingForImages)){if(this.stylesheets)ep(this,this.stylesheets);else if(this.unsuspend){var e=this.unsuspend;this.unsuspend=null,e()}}}var $f=null;function ep(e,t){e.stylesheets=null,e.unsuspend!==null&&(e.count++,$f=new Map,t.forEach(tp,e),$f=null,Qf.call(e))}function tp(e,t){if(!(t.state.loading&4)){var n=$f.get(e);if(n)var r=n.get(null);else{n=new Map,$f.set(e,n);for(var i=e.querySelectorAll(`link[data-precedence],style[data-precedence]`),a=0;a{function n(){if(!(typeof __REACT_DEVTOOLS_GLOBAL_HOOK__>`u`||typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.checkDCE!=`function`))try{__REACT_DEVTOOLS_GLOBAL_HOOK__.checkDCE(n)}catch(e){console.error(e)}}n(),t.exports=h()})),_=c(u(),1),v=g(),y=`modulepreload`,b=function(e){return`/`+e},x={},S=function(e,t,n){let r=Promise.resolve();if(t&&t.length>0){let e=document.getElementsByTagName(`link`),i=document.querySelector(`meta[property=csp-nonce]`),a=i?.nonce||i?.getAttribute(`nonce`);function o(e){return Promise.all(e.map(e=>Promise.resolve(e).then(e=>({status:`fulfilled`,value:e}),e=>({status:`rejected`,reason:e}))))}function s(e){return import.meta.resolve?import.meta.resolve(e):new URL(e,import.meta.url).href}r=o(t.map(t=>{if(t=b(t,n),t=s(t),t in x)return;x[t]=!0;let r=t.endsWith(`.css`);for(let n=e.length-1;n>=0;n--){let i=e[n];if(i.href===t&&(!r||i.rel===`stylesheet`))return}let i=document.createElement(`link`);if(i.rel=r?`stylesheet`:y,r||(i.as=`script`),i.crossOrigin=``,i.href=t,a&&i.setAttribute(`nonce`,a),document.head.appendChild(i),r)return new Promise((e,n)=>{i.addEventListener(`load`,e),i.addEventListener(`error`,()=>n(Error(`Unable to preload CSS for ${t}`)))})}))}function i(e){let t=new Event(`vite:preloadError`,{cancelable:!0});if(t.payload=e,window.dispatchEvent(t),!t.defaultPrevented)throw e}return r.then(t=>{for(let e of t||[])e.status===`rejected`&&i(e.reason);return e().catch(i)})},C=/^(?:[a-z][a-z0-9+.-]*:|[\\/]{2})/i,w=/^[\\/]{2}/;function T(e,t){return t+e.replace(/\\/g,`/`)}var E=`popstate`;function D(e){return typeof e==`object`&&!!e&&`pathname`in e&&`search`in e&&`hash`in e&&`state`in e&&`key`in e}function O(e={}){function t(e,t){let n=t.state?.masked,{pathname:r,search:i,hash:a}=n||e.location;return N(``,{pathname:r,search:i,hash:a},t.state&&t.state.usr||null,t.state&&t.state.key||`default`,n?{pathname:e.location.pathname,search:e.location.search,hash:e.location.hash}:void 0)}function n(e,t){return typeof t==`string`?t:P(t)}return I(t,n,null,e)}function k(e,t){if(e===!1||e==null)throw Error(t)}function A(e,t){if(!e){typeof console<`u`&&console.warn(t);try{throw Error(t)}catch{}}}function j(){return Math.random().toString(36).substring(2,10)}function M(e,t){return{usr:e.state,key:e.key,idx:t,masked:e.mask?{pathname:e.pathname,search:e.search,hash:e.hash}:void 0}}function N(e,t,n=null,r,i){return{pathname:typeof e==`string`?e:e.pathname,search:``,hash:``,...typeof t==`string`?F(t):t,state:n,key:t&&t.key||r||j(),mask:i}}function P({pathname:e=`/`,search:t=``,hash:n=``}){return t&&t!==`?`&&(e+=t.charAt(0)===`?`?t:`?`+t),n&&n!==`#`&&(e+=n.charAt(0)===`#`?n:`#`+n),e}function F(e){let t={};if(e){let n=e.indexOf(`#`);n>=0&&(t.hash=e.substring(n),e=e.substring(0,n));let r=e.indexOf(`?`);r>=0&&(t.search=e.substring(r),e=e.substring(0,r)),e&&(t.pathname=e)}return t}function I(e,t,n,r={}){let{window:i=document.defaultView,v5Compat:a=!1}=r,o=i.history,s=`POP`,c=null,l=u();l??(l=0,o.replaceState({...o.state,idx:l},``));function u(){return(o.state||{idx:null}).idx}function d(){s=`POP`;let e=u(),t=e==null?null:e-l;l=e,c&&c({action:s,location:h.location,delta:t})}function f(e,t){s=`PUSH`;let r=D(e)?e:N(h.location,e,t);n&&n(r,e),l=u()+1;let d=M(r,l),f=h.createHref(r.mask||r);try{o.pushState(d,``,f)}catch(e){if(e instanceof DOMException&&e.name===`DataCloneError`)throw e;i.location.assign(f)}a&&c&&c({action:s,location:h.location,delta:1})}function p(e,t){s=`REPLACE`;let r=D(e)?e:N(h.location,e,t);n&&n(r,e),l=u();let i=M(r,l),d=h.createHref(r.mask||r);o.replaceState(i,``,d),a&&c&&c({action:s,location:h.location,delta:0})}function m(e){return L(i,e)}let h={get action(){return s},get location(){return e(i,o)},listen(e){if(c)throw Error(`A history only accepts one active listener`);return i.addEventListener(E,d),c=e,()=>{i.removeEventListener(E,d),c=null}},createHref(e){return t(i,e)},createURL:m,encodeLocation(e){let t=m(e);return{pathname:t.pathname,search:t.search,hash:t.hash}},push:f,replace:p,go(e){return o.go(e)}};return h}function L(e,t,n=!1){let r=`http://localhost`;e&&(r=e.location.origin===`null`?e.location.href:e.location.origin),k(r,`No window.location.(origin|href) available to create URL`);let i=typeof t==`string`?t:P(t);return i=i.replace(/ $/,`%20`),!n&&w.test(i)&&(i=r+i),new URL(i,r)}function ee(e,t,n=`/`){return R(e,t,n,!1)}function R(e,t,n,r,i){let a=ve((typeof t==`string`?F(t):t).pathname||`/`,n);if(a==null)return null;let o=i??te(e),s=null,c=_e(a);for(let e=0;s==null&&e{let c={relativePath:s===void 0?e.path||``:s,caseSensitive:e.caseSensitive===!0,childrenIndex:a,route:e};if(c.relativePath.startsWith(`/`)){if(!c.relativePath.startsWith(r)&&o)return;k(c.relativePath.startsWith(r),`Absolute route path "${c.relativePath}" nested under path "${r}" is not valid. An absolute child route path must start with the combined path of all its parent routes.`),c.relativePath=c.relativePath.slice(r.length)}let l=Ee([r,c.relativePath]),u=n.concat(c);e.children&&e.children.length>0&&(k(e.index!==!0,`Index routes must not have child routes. Please remove all child routes from route path "${l}".`),ne(e.children,t,u,l,o)),!(e.path==null&&!e.index)&&t.push({path:l,score:de(l,e.index),routesMeta:u.map((e,t)=>{let[n,r]=ge(e.relativePath,e.caseSensitive,t===u.length-1);return{...e,matcher:n,compiledParams:r}})})};return e.forEach((e,t)=>{if(e.path===``||!e.path?.includes(`?`))a(e,t);else for(let n of z(e.path))a(e,t,!0,n)}),t}function z(e){let t=e.split(`/`);if(t.length===0)return[];let[n,...r]=t,i=n.endsWith(`?`),a=n.replace(/\?$/,``);if(r.length===0)return i?[a,``]:[a];let o=z(r.join(`/`)),s=[];return s.push(...o.map(e=>e===``?a:[a,e].join(`/`))),i&&s.push(...o),s.map(t=>e.startsWith(`/`)&&t===``?`/`:t)}function re(e){e.sort((e,t)=>e.score===t.score?fe(e.routesMeta.map(e=>e.childrenIndex),t.routesMeta.map(e=>e.childrenIndex)):t.score-e.score)}var ie=/^:[\w-]+$/,ae=3,oe=2,se=1,ce=10,le=-2,ue=e=>e===`*`;function de(e,t){let n=e.split(`/`),r=n.length;return n.some(ue)&&(r+=le),t&&(r+=oe),n.filter(e=>!ue(e)).reduce((e,t)=>e+(ie.test(t)?ae:t===``?se:ce),r)}function fe(e,t){return e.length===t.length&&e.slice(0,-1).every((e,n)=>e===t[n])?e[e.length-1]-t[t.length-1]:0}function pe(e,t,n=!1){let{routesMeta:r}=e,i={},a=`/`,o=[];for(let e=0;e{if(t===`*`){let e=s[r]||``;o=a.slice(0,a.length-e.length).replace(/(.)\/+$/,`$1`)}let i=s[r];return e[t]=n&&!i?void 0:(i||``).replace(/%2F/g,`/`),e},{}),pathname:a,pathnameBase:o,pattern:e}}function ge(e,t=!1,n=!0){A(e===`*`||!e.endsWith(`*`)||e.endsWith(`/*`),`Route path "${e}" will be treated as if it were "${e.replace(/\*$/,`/*`)}" because the \`*\` character must always follow a \`/\` in the pattern. To get rid of this warning, please change the route path to "${e.replace(/\*$/,`/*`)}".`);let r=[],i=`^`+e.replace(/\/*\*?$/,``).replace(/^\/*/,`/`).replace(/[\\.*+^${}|()[\]]/g,`\\$&`).replace(/\/:([\w-]+)(\?)?/g,(e,t,n,i,a)=>{if(r.push({paramName:t,isOptional:n!=null}),n){let t=a.charAt(i+e.length);return t&&t!==`/`?`/([^\\/]*)`:`(?:/([^\\/]*))?`}return`/([^\\/]+)`}).replace(/\/([\w-]+)\?(\/|$)/g,`(/$1)?$2`);return e.endsWith(`*`)?(r.push({paramName:`*`}),i+=e===`*`||e===`/*`?`(.*)$`:`(?:\\/(.+)|\\/*)$`):n?i+=`\\/*$`:e!==``&&e!==`/`&&(i+=`(?:(?=\\/|$))`),[new RegExp(i,t?void 0:`i`),r]}function _e(e){try{return e.split(`/`).map(e=>decodeURIComponent(e).replace(/\//g,`%2F`)).join(`/`)}catch(t){return A(!1,`The URL path "${e}" could not be decoded because it is a malformed URL segment. This is probably due to a bad percent encoding (${t}).`),e}}function ve(e,t){if(t===`/`)return e;if(!e.toLowerCase().startsWith(t.toLowerCase()))return null;let n=t.endsWith(`/`)?t.length-1:t.length,r=e.charAt(n);return r&&r!==`/`?null:e.slice(n)||`/`}function ye(e,t=`/`){let{pathname:n,search:r=``,hash:i=``}=typeof e==`string`?F(e):e,a;return n?(n=Te(n),a=n.startsWith(`/`)?be(n.substring(1),`/`):be(n,t)):a=t,{pathname:a,search:ke(r),hash:Ae(i)}}function be(e,t){let n=De(t).split(`/`);return e.split(`/`).forEach(e=>{e===`..`?n.length>1&&n.pop():e!==`.`&&n.push(e)}),n.length>1?n.join(`/`):`/`}function xe(e,t,n,r){return`Cannot include a '${e}' character in a manually specified \`to.${t}\` field [${JSON.stringify(r)}]. Please separate it out to the \`to.${n}\` field. Alternatively you may provide the full path as a string in and the router will parse it for you.`}function Se(e){return e.filter((e,t)=>t===0||e.route.path&&e.route.path.length>0)}function Ce(e){let t=Se(e);return t.map((e,n)=>n===t.length-1?e.pathname:e.pathnameBase)}function we(e,t,n,r=!1){let i;typeof e==`string`?i=F(e):(i={...e},k(!i.pathname||!i.pathname.includes(`?`),xe(`?`,`pathname`,`search`,i)),k(!i.pathname||!i.pathname.includes(`#`),xe(`#`,`pathname`,`hash`,i)),k(!i.search||!i.search.includes(`#`),xe(`#`,`search`,`hash`,i)));let a=e===``||i.pathname===``,o=a?`/`:i.pathname,s;if(o==null)s=n;else{let e=t.length-1;if(!r&&o.startsWith(`..`)){let t=o.split(`/`);for(;t[0]===`..`;)t.shift(),--e;i.pathname=t.join(`/`)}s=e>=0?t[e]:`/`}let c=ye(i,s),l=o&&o!==`/`&&o.endsWith(`/`),u=(a||o===`.`)&&n.endsWith(`/`);return!c.pathname.endsWith(`/`)&&(l||u)&&(c.pathname+=`/`),c}var Te=e=>e.replace(/[\\/]{2,}/g,`/`),Ee=e=>Te(e.join(`/`)),De=e=>e.replace(/\/+$/,``),Oe=e=>De(e).replace(/^\/*/,`/`),ke=e=>!e||e===`?`?``:e.startsWith(`?`)?e:`?`+e,Ae=e=>!e||e===`#`?``:e.startsWith(`#`)?e:`#`+e,je=class{constructor(e,t,n,r=!1){this.status=e,this.statusText=t||``,this.internal=r,n instanceof Error?(this.data=n.toString(),this.error=n):this.data=n}};function Me(e){return e!=null&&typeof e.status==`number`&&typeof e.statusText==`string`&&typeof e.internal==`boolean`&&`data`in e}function Ne(e){return Ee(e.map(e=>e.route.path).filter(Boolean))||`/`}var Pe=typeof window<`u`&&window.document!==void 0&&window.document.createElement!==void 0;function Fe(e,t){let n=e;if(typeof n!=`string`||!C.test(n))return{absoluteURL:void 0,isExternal:!1,to:n};let r=n,i=!1;if(Pe)try{let e=new URL(window.location.href),r=w.test(n)?new URL(T(n,e.protocol)):new URL(n),a=ve(r.pathname,t);r.origin===e.origin&&a!=null?n=a+r.search+r.hash:i=!0}catch{A(!1,` contains an invalid URL which will probably break when clicked - please update to a valid URL path.`)}return{absoluteURL:r,isExternal:i,to:n}}Object.getOwnPropertyNames(Object.prototype).sort().join(`\0`);var Ie=[`POST`,`PUT`,`PATCH`,`DELETE`];new Set(Ie);var Le=[`GET`,...Ie];new Set(Le);var Re=[`about:`,`blob:`,`chrome:`,`chrome-untrusted:`,`content:`,`data:`,`devtools:`,`file:`,`filesystem:`,`javascript:`];function ze(e){try{return Re.includes(new URL(e).protocol)}catch{return!1}}var Be=_.createContext(null);Be.displayName=`DataRouter`;var Ve=_.createContext(null);Ve.displayName=`DataRouterState`;var He=_.createContext(!1);function Ue(){return _.useContext(He)}var We=_.createContext({isTransitioning:!1});We.displayName=`ViewTransition`;var Ge=_.createContext(new Map);Ge.displayName=`Fetchers`;var Ke=_.createContext(null);Ke.displayName=`Await`;var qe=_.createContext(null);qe.displayName=`Navigation`;var Je=_.createContext(null);Je.displayName=`Location`;var Ye=_.createContext({outlet:null,matches:[],isDataRoute:!1});Ye.displayName=`Route`;var Xe=_.createContext(null);Xe.displayName=`RouteError`;var Ze=`REACT_ROUTER_ERROR`,Qe=`REDIRECT`,$e=`ROUTE_ERROR_RESPONSE`;function et(e){if(e.startsWith(`${Ze}:${Qe}:{`))try{let t=JSON.parse(e.slice(28));if(typeof t==`object`&&t&&typeof t.status==`number`&&typeof t.statusText==`string`&&typeof t.location==`string`&&typeof t.reloadDocument==`boolean`&&typeof t.replace==`boolean`)return t}catch{}}function tt(e){if(e.startsWith(`${Ze}:${$e}:{`))try{let t=JSON.parse(e.slice(40));if(typeof t==`object`&&t&&typeof t.status==`number`&&typeof t.statusText==`string`)return new je(t.status,t.statusText,t.data)}catch{}}function nt(e,{relative:t}={}){k(rt(),`useHref() may be used only in the context of a component.`);let{basename:n,navigator:r}=_.useContext(qe),{hash:i,pathname:a,search:o}=dt(e,{relative:t}),s=a;return n!==`/`&&(s=a===`/`?n:Ee([n,a])),r.createHref({pathname:s,search:o,hash:i})}function rt(){return _.useContext(Je)!=null}function it(){return k(rt(),`useLocation() may be used only in the context of a component.`),_.useContext(Je).location}var at=`You should call navigate() in a React.useEffect(), not when your component is first rendered.`;function ot(e){_.useContext(qe).static||_.useLayoutEffect(e)}function st(){let{isDataRoute:e}=_.useContext(Ye);return e?Ot():ct()}function ct(){k(rt(),`useNavigate() may be used only in the context of a component.`);let e=_.useContext(Be),{basename:t,navigator:n}=_.useContext(qe),{matches:r}=_.useContext(Ye),{pathname:i}=it(),a=JSON.stringify(Ce(r)),o=_.useRef(!1);return ot(()=>{o.current=!0}),_.useCallback((r,s={})=>{if(A(o.current,at),!o.current)return;if(typeof r==`number`){n.go(r);return}let c=we(r,JSON.parse(a),i,s.relative===`path`);e==null&&t!==`/`&&(c.pathname=c.pathname===`/`?t:Ee([t,c.pathname])),(s.replace?n.replace:n.push)(c,s.state,s)},[t,n,a,i,e])}var lt=_.createContext(null);function ut(e){let t=_.useContext(Ye).outlet;return _.useMemo(()=>t&&_.createElement(lt.Provider,{value:e},t),[t,e])}function dt(e,{relative:t}={}){let{matches:n}=_.useContext(Ye),{pathname:r}=it(),i=JSON.stringify(Ce(n));return _.useMemo(()=>we(e,JSON.parse(i),r,t===`path`),[e,i,r,t])}function ft(e,t){return pt(e,t)}function pt(e,t,n){k(rt(),`useRoutes() may be used only in the context of a component.`);let{navigator:r}=_.useContext(qe),{matches:i}=_.useContext(Ye),a=i[i.length-1],o=a?a.params:{},s=a?a.pathname:`/`,c=a?a.pathnameBase:`/`,l=a&&a.route;{let e=l&&l.path||``;At(s,!l||e.endsWith(`*`)||e.endsWith(`*?`),`You rendered descendant (or called \`useRoutes()\`) at "${s}" (under ) but the parent route path has no trailing "*". This means if you navigate deeper, the parent won't match anymore and therefore the child routes will never render. + +Please change the parent to .`)}let u=it(),d;if(t){let e=typeof t==`string`?F(t):t;k(c===`/`||e.pathname?.startsWith(c),`When overriding the location using \`\` or \`useRoutes(routes, location)\`, the location pathname must begin with the portion of the URL pathname that was matched by all parent routes. The current pathname base is "${c}" but pathname "${e.pathname}" was given in the \`location\` prop.`),d=e}else d=u;let f=d.pathname||`/`,p=f;if(c!==`/`){let e=c.replace(/^\//,``).split(`/`);p=`/`+f.replace(/^\//,``).split(`/`).slice(e.length).join(`/`)}let m=n&&n.state.matches.length?n.state.matches.map(e=>Object.assign(e,{route:n.manifest[e.route.id]||e.route})):ee(e,{pathname:p});A(l||m!=null,`No routes matched location "${d.pathname}${d.search}${d.hash}" `),A(m==null||m[m.length-1].route.element!==void 0||m[m.length-1].route.Component!==void 0||m[m.length-1].route.lazy!==void 0,`Matched leaf route at location "${d.pathname}${d.search}${d.hash}" does not have an element or Component. This means it will render an with a null value by default resulting in an "empty" page.`);let h=bt(m&&m.map(e=>Object.assign({},e,{params:Object.assign({},o,e.params),pathname:Ee([c,r.encodeLocation?r.encodeLocation(e.pathname.replace(/%/g,`%25`).replace(/\?/g,`%3F`).replace(/#/g,`%23`)).pathname:e.pathname]),pathnameBase:e.pathnameBase===`/`?c:Ee([c,r.encodeLocation?r.encodeLocation(e.pathnameBase.replace(/%/g,`%25`).replace(/\?/g,`%3F`).replace(/#/g,`%23`)).pathname:e.pathnameBase])})),i,n);return t&&h?_.createElement(Je.Provider,{value:{location:{pathname:`/`,search:``,hash:``,state:null,key:`default`,mask:void 0,...d},navigationType:`POP`}},h):h}function mt(){let e=Dt(),t=Me(e)?`${e.status} ${e.statusText}`:e instanceof Error?e.message:JSON.stringify(e),n=e instanceof Error?e.stack:null,r=`rgba(200,200,200, 0.5)`,i={padding:`0.5rem`,backgroundColor:r},a={padding:`2px 4px`,backgroundColor:r},o=null;return console.error(`Error handled by React Router default ErrorBoundary:`,e),o=_.createElement(_.Fragment,null,_.createElement(`p`,null,`💿 Hey developer 👋`),_.createElement(`p`,null,`You can provide a way better UX than this when your app throws errors by providing your own `,_.createElement(`code`,{style:a},`ErrorBoundary`),` or`,` `,_.createElement(`code`,{style:a},`errorElement`),` prop on your route.`)),_.createElement(_.Fragment,null,_.createElement(`h2`,null,`Unexpected Application Error!`),_.createElement(`h3`,{style:{fontStyle:`italic`}},t),n?_.createElement(`pre`,{style:i},n):null,o)}var ht=_.createElement(mt,null),gt=class extends _.Component{constructor(e){super(e),this.state={location:e.location,revalidation:e.revalidation,error:e.error}}static getDerivedStateFromError(e){return{error:e}}static getDerivedStateFromProps(e,t){return t.location!==e.location||t.revalidation!==`idle`&&e.revalidation===`idle`?{error:e.error,location:e.location,revalidation:e.revalidation}:{error:e.error===void 0?t.error:e.error,location:t.location,revalidation:e.revalidation||t.revalidation}}componentDidCatch(e,t){this.props.onError?this.props.onError(e,t):console.error(`React Router caught the following error during render`,e)}render(){let e=this.state.error;if(this.context&&typeof e==`object`&&e&&`digest`in e&&typeof e.digest==`string`){let t=tt(e.digest);t&&(e=t)}let t=e===void 0?this.props.children:_.createElement(Ye.Provider,{value:this.props.routeContext},_.createElement(Xe.Provider,{value:e,children:this.props.component}));return this.context?_.createElement(vt,{error:e},t):t}};gt.contextType=He;var _t=new WeakMap;function vt({children:e,error:t}){let{basename:n}=_.useContext(qe);if(typeof t==`object`&&t&&`digest`in t&&typeof t.digest==`string`){let e=et(t.digest);if(e){let r=_t.get(t);if(r)throw r;let i=Fe(e.location,n),a=i.absoluteURL||i.to;if(ze(a))throw Error(`Invalid redirect location`);if(Pe&&!_t.get(t)){if(i.isExternal||e.reloadDocument)window.location.href=a;else{let n=Promise.resolve().then(()=>window.__reactRouterDataRouter.navigate(i.to,{replace:e.replace}));throw _t.set(t,n),n}}return _.createElement(`meta`,{httpEquiv:`refresh`,content:`0;url=${a}`})}}return e}function yt({routeContext:e,match:t,children:n}){let r=_.useContext(Be);return r&&r.static&&r.staticContext&&(t.route.errorElement||t.route.ErrorBoundary)&&(r.staticContext._deepestRenderedBoundaryId=t.route.id),_.createElement(Ye.Provider,{value:e},n)}function bt(e,t=[],n){let r=n?.state;if(e==null){if(!r)return null;if(r.errors)e=r.matches;else if(t.length===0&&!r.initialized&&r.matches.length>0)e=r.matches;else return null}let i=e,a=r?.errors;if(a!=null){let e=i.findIndex(e=>e.route.id&&a?.[e.route.id]!==void 0);k(e>=0,`Could not find a matching route for errors on route IDs: ${Object.keys(a).join(`,`)}`),i=i.slice(0,Math.min(i.length,e+1))}let o=!1,s=-1;if(n&&r){o=r.renderFallback;for(let e=0;e=0?i.slice(0,s+1):[i[0]];break}}}}let c=n?.onError,l=r&&c?(e,t)=>{c(e,{location:r.location,params:r.matches?.[0]?.params??{},pattern:Ne(r.matches),errorInfo:t})}:void 0;return i.reduceRight((e,n,c)=>{let u,d=!1,f=null,p=null;r&&(u=a&&n.route.id?a[n.route.id]:void 0,f=n.route.errorElement||ht,o&&(s<0&&c===0?(At(`route-fallback`,!1,"No `HydrateFallback` element provided to render during initial hydration"),d=!0,p=null):s===c&&(d=!0,p=n.route.hydrateFallbackElement||null)));let m=t.concat(i.slice(0,c+1)),h=()=>{let t;return t=u?f:d?p:n.route.Component?_.createElement(n.route.Component,null):n.route.element?n.route.element:e,_.createElement(yt,{match:n,routeContext:{outlet:e,matches:m,isDataRoute:r!=null},children:t})};return r&&(n.route.ErrorBoundary||n.route.errorElement||c===0)?_.createElement(gt,{location:r.location,revalidation:r.revalidation,component:f,error:u,children:h(),routeContext:{outlet:null,matches:m,isDataRoute:!0},onError:l}):h()},null)}function xt(e){return`${e} must be used within a data router. See https://reactrouter.com/en/main/routers/picking-a-router.`}function St(e){let t=_.useContext(Be);return k(t,xt(e)),t}function Ct(e){let t=_.useContext(Ve);return k(t,xt(e)),t}function wt(e){let t=_.useContext(Ye);return k(t,xt(e)),t}function Tt(e){let t=wt(e),n=t.matches[t.matches.length-1];return k(n.route.id,`${e} can only be used on routes that contain a unique "id"`),n.route.id}function Et(){return Tt(`useRouteId`)}function Dt(){let e=_.useContext(Xe),t=Ct(`useRouteError`),n=Tt(`useRouteError`);return e===void 0?t.errors?.[n]:e}function Ot(){let{router:e}=St(`useNavigate`),t=Tt(`useNavigate`),n=_.useRef(!1);return ot(()=>{n.current=!0}),_.useCallback(async(r,i={})=>{A(n.current,at),n.current&&(typeof r==`number`?await e.navigate(r):await e.navigate(r,{fromRouteId:t,...i}))},[e,t])}var kt={};function At(e,t,n){!t&&!kt[e]&&(kt[e]=!0,A(!1,n))}_.memo(jt);function jt({routes:e,manifest:t,future:n,state:r,isStatic:i,onError:a}){return pt(e,void 0,{manifest:t,state:r,isStatic:i,onError:a,future:n})}function Mt({to:e,replace:t,state:n,relative:r}){k(rt(),` may be used only in the context of a component.`);let{static:i}=_.useContext(qe);A(!i,` must not be used on the initial render in a . This is a no-op, but you should modify your code so the is only ever rendered in response to some user interaction or state change.`);let{matches:a}=_.useContext(Ye),{pathname:o}=it(),s=st(),c=we(e,Ce(a),o,r===`path`),l=JSON.stringify(c);return _.useEffect(()=>{s(JSON.parse(l),{replace:t,state:n,relative:r})},[s,l,r,t,n]),null}function Nt(e){return ut(e.context)}function Pt(e){k(!1,`A is only ever to be used as the child of element, never rendered directly. Please wrap your in a .`)}function Ft({basename:e=`/`,children:t=null,location:n,navigationType:r=`POP`,navigator:i,static:a=!1,useTransitions:o}){k(!rt(),`You cannot render a inside another . You should never have more than one in your app.`);let s=e.replace(/^\/*/,`/`),c=_.useMemo(()=>({basename:s,navigator:i,static:a,useTransitions:o,future:{}}),[s,i,a,o]);typeof n==`string`&&(n=F(n));let{pathname:l=`/`,search:u=``,hash:d=``,state:f=null,key:p=`default`,mask:m}=n,h=_.useMemo(()=>{let e=ve(l,s);return e==null?null:{location:{pathname:e,search:u,hash:d,state:f,key:p,mask:m},navigationType:r}},[s,l,u,d,f,p,r,m]);return A(h!=null,` is not able to match the URL "${l}${u}${d}" because it does not start with the basename, so the won't render anything.`),h==null?null:_.createElement(qe.Provider,{value:c},_.createElement(Je.Provider,{children:t,value:h}))}function It({children:e,location:t}){return ft(Lt(e),t)}_.Component;function Lt(e,t=[]){let n=[];return _.Children.forEach(e,(e,r)=>{if(!_.isValidElement(e))return;let i=[...t,r];if(e.type===_.Fragment){n.push.apply(n,Lt(e.props.children,i));return}k(e.type===Pt,`[${typeof e.type==`string`?e.type:e.type.name}] is not a component. All component children of must be a or `),k(!e.props.index||!e.props.children,`An index route cannot have child routes.`);let a={id:e.props.id||i.join(`-`),caseSensitive:e.props.caseSensitive,element:e.props.element,Component:e.props.Component,index:e.props.index,path:e.props.path,middleware:e.props.middleware,loader:e.props.loader,action:e.props.action,hydrateFallbackElement:e.props.hydrateFallbackElement,HydrateFallback:e.props.HydrateFallback,errorElement:e.props.errorElement,ErrorBoundary:e.props.ErrorBoundary,hasErrorBoundary:e.props.hasErrorBoundary===!0||e.props.ErrorBoundary!=null||e.props.errorElement!=null,shouldRevalidate:e.props.shouldRevalidate,handle:e.props.handle,lazy:e.props.lazy};e.props.children&&(a.children=Lt(e.props.children,i)),n.push(a)}),n}var Rt=`get`,zt=`application/x-www-form-urlencoded`;function Bt(e){return typeof HTMLElement<`u`&&e instanceof HTMLElement}function Vt(e){return Bt(e)&&e.tagName.toLowerCase()===`button`}function Ht(e){return Bt(e)&&e.tagName.toLowerCase()===`form`}function Ut(e){return Bt(e)&&e.tagName.toLowerCase()===`input`}function Wt(e){return!!(e.metaKey||e.altKey||e.ctrlKey||e.shiftKey)}function Gt(e,t){return e.button===0&&(!t||t===`_self`)&&!Wt(e)}var Kt=null;function qt(){if(Kt===null)try{new FormData(document.createElement(`form`),0),Kt=!1}catch{Kt=!0}return Kt}var Jt=new Set([`application/x-www-form-urlencoded`,`multipart/form-data`,`text/plain`]);function Yt(e){return e!=null&&!Jt.has(e)?(A(!1,`"${e}" is not a valid \`encType\` for \`
\`/\`\` and will default to "${zt}"`),null):e}function Xt(e,t){let n,r,i,a,o;if(Ht(e)){let o=e.getAttribute(`action`);r=o?ve(o,t):null,n=e.getAttribute(`method`)||Rt,i=Yt(e.getAttribute(`enctype`))||zt,a=new FormData(e)}else if(Vt(e)||Ut(e)&&(e.type===`submit`||e.type===`image`)){let o=e.form;if(o==null)throw Error(`Cannot submit a