dsh-git-branch-manage 1.1.0 → 1.3.0

package/CHANGELOG.md

@@ -2,6 +2,40 @@
 
 本文件记录 `dsh-git-branch-manage` 的重要变更。版本号遵循语义化版本。
 
+## [1.3.0] - 2026-11-04
+
+### 新增
+
+- **网络备用通道与代理配置**（决策 0042、0043）：直连发生可重试网络故障时，对 GitHub 地址使用运行时 DoH 查询和真实 Git 请求竞速选择可用 IP；支持显式配置 HTTP(S)/SOCKS 代理，并提供只读系统代理探测建议与「检测网络」诊断。
+- **网络操作状态诊断**（决策 0041）：按探测、读取、写入和超时核验分别设置预算；推送前探测远端，推送超时后核验远端 ref，并按失败类型给出建议。
+
+### 变更
+
+- **镜像仅作为读取加速**（决策 0044）：镜像 fetch/update 失败后自动恢复原始 URL 回直连，再按备用通道链尝试；推送不走镜像，避免将写入交给第三方。
+- SSH 远端不再进行无效的 HTTP 代理/IP 通道探测，错误信息改为提示可执行的 HTTPS 方案。
+- 加速前缀改为拼接完整 GitHub URL（决策 0040），并用真实 Git URL 解析与提取覆盖回归场景。
+
+### 修复
+
+- **CI 在非 Windows 上失败**（决策 0046）：系统代理探测的用例此前无条件假设 Windows 注册表，在 ubuntu-latest 上必然失败；现按平台分派，Windows 侧保留注册表行为覆盖，非 Windows 侧断言不读取注册表。
+
+## [1.2.0] - 2026-11-02
+
+### 新增
+
+- **凭据管理直接读写本机 `~/.git-credentials`**（决策 0037）：面板里存一次，任何 shell、任何子进程的 `git push/fetch/pull` 都用同一账号；文件里不属于本插件的行（注释、`ssh://` 等）原样保留，卸载插件后凭据仍属于用户。
+- **从本机导入凭据，启动时默认执行**（决策 0038）：按用户 gitconfig 里声明过的 credential 域名逐个探测（`git credential fill`，串行 + 20 秒超时），答出令牌即导入面板；面板另有手动「从本机导入」入口（`POST /credentials-import`），toast 汇总导入/跳过/失败数量。`gh`、GCM、`store` 里的账号一次导入即可接管。
+
+### 变更
+
+- 凭据生效通道改用 git 原生机制：`~/.gitconfig` 幂等追加一行 `[include]` 指向生成的 URL 作用域配置（每个已存域名重置 helper 链后装内置 `store`），不再向进程环境注入（废弃 0032/0034 的 `GIT_CONFIG_*` / `GIT_CONFIG_GLOBAL` 通道），令牌也不再进入命令行参数。
+- 未管理域名的机器原有 helper（gh、GCM 等）保持原样，不再被全局清空；未存域名依旧 fail-fast 不弹窗。
+- 令牌明文落在 `~/.git-credentials`（0600）——与 git 自带 `store` helper 一致的安全取舍；面板列表元数据（`method`/`updatedAt`）另存不含 secret 的旁文件。
+
+### 移除
+
+- 删除自研 `git-credential-bridge` helper，改用 git 内置 `credential-store`，不再为每次 git 调用拉起 node 进程。
+
 ## [1.1.0] - 2026-11-02
 
 ### 修复

package/lib/client.js

@@ -65,8 +65,8 @@ window.__ModuleLoader__.load({
 		}
 		/**
 		* Normalize an accepted accelerate URL: trim, and append the trailing `/`
-		* the prefix concatenation requires (`https://gh-proxy.com/` + `o/r.git`
-		* must stay one valid URL). Callers pass the result to `url.<base>.insteadOf`.
+		* the prefix concatenation requires (`https://gh-proxy.com/` + the complete
+		* `https://github.com/o/r.git` URL). accelArgs builds the Git rewrite base.
 		* @param value - an accepted (non-empty, http(s), whitespace-free) URL.
 		* @returns the prefix ending in `/`.
 		*/
@@ -74,6 +74,37 @@ window.__ModuleLoader__.load({
 			const trimmed = value.trim();
 			return trimmed.endsWith("/") ? trimmed : `${trimmed}/`;
 		}
+		/** Schemes git's libcurl accepts for an HTTP(S) remote. */
+		const PROXY_SCHEMES = [
+			"http",
+			"https",
+			"socks5",
+			"socks5h"
+		];
+		/**
+		* Why this proxy value cannot be used, or undefined when it can.
+		*
+		* Credentials are rejected on purpose: the value is stored in the plugin
+		* config and passed as one `-c` argument, so `user:pass@` would be readable
+		* in the settings UI and in any diagnostics (0043).
+		* @param value - candidate proxy URL.
+		* @returns the user-facing reason, or undefined.
+		*/
+		function proxyUrlError(value) {
+			let url;
+			try {
+				url = new URL(value);
+			} catch {
+				return "must be an absolute proxy URL such as http://127.0.0.1:7890";
+			}
+			if (!PROXY_SCHEMES.includes(url.protocol.replace(":", ""))) return `scheme must be one of ${PROXY_SCHEMES.join(", ")}`;
+			if (url.hostname === "") return "must name a proxy host";
+			if (url.port === "") return "must name a proxy port";
+			const port = Number(url.port);
+			if (!Number.isInteger(port) || port < 1 || port > 65535) return "proxy port must be 1-65535";
+			if (url.username !== "" || url.password !== "") return "credentials in the proxy URL are not supported";
+			if (url.pathname !== "" && url.pathname !== "/" || url.search !== "" || url.hash !== "") return "must not carry a path, query, or fragment";
+		}
 		//#endregion
 		//#region src/wire.ts
 		/**
@@ -131,6 +162,8 @@ window.__ModuleLoader__.load({
 		const ROUTE_TAG = `${ROUTE_PREFIX}/tag`;
 		/** POST ROUTE_PREFIX/tag-push — push ONE existing local tag to its remote. */
 		const ROUTE_TAG_PUSH = `${ROUTE_PREFIX}/tag-push`;
+		/** POST ROUTE_PREFIX/network-probe — read the endpoint through every configured channel (diagnostics; no state change). */
+		const ROUTE_NETWORK_PROBE = `${ROUTE_PREFIX}/network-probe`;
 		/** POST ROUTE_PREFIX/credentials — the global per-host credentials, secrets
 		* masked (the stored secret never leaves the host). */
 		const ROUTE_CREDENTIALS = `${ROUTE_PREFIX}/credentials`;
@@ -144,6 +177,9 @@ window.__ModuleLoader__.load({
 		/** POST ROUTE_PREFIX/credentials-oauth-poll — poll a started browser sign-in;
 		* stores the token and answers the fresh masked list once the user approves. */
 		const ROUTE_CREDENTIALS_OAUTH_POLL = `${ROUTE_PREFIX}/credentials-oauth-poll`;
+		/** POST ROUTE_PREFIX/credentials-import — copy the credentials the machine's
+		* own helpers already answer for into the managed store (decision 0038). */
+		const ROUTE_CREDENTIALS_IMPORT = `${ROUTE_PREFIX}/credentials-import`;
 		/** POST ROUTE_PREFIX/remotes — the repository's configured remotes. */
 		const ROUTE_REMOTES = `${ROUTE_PREFIX}/remotes`;
 		/** POST ROUTE_PREFIX/remote — add, re-point or remove ONE remote. */
@@ -220,6 +256,15 @@ window.__ModuleLoader__.load({
 			}
 		}
 		/**
+		* Probe every network channel (direct, proxy, pinned IP) against the
+		* repository's push URL; failures come back per channel rather than as one
+		* error, so the popover can show which route works right now (0043).
+		* @param repoPath - absolute directory inside the repository.
+		*/
+		function requestNetworkProbe(repoPath) {
+			return post(ROUTE_NETWORK_PROBE, { repoPath });
+		}
+		/**
 		* Create or reuse the worktree for a branch.
 		* @param repoPath - absolute directory inside the repository.
 		* @param branch - branch display name.
@@ -508,6 +553,16 @@ window.__ModuleLoader__.load({
 			return post(ROUTE_CREDENTIALS_OAUTH_POLL, body);
 		}
 		/**
+		* Adopt the credentials this machine's own git helpers already answer for
+		* (gh, Windows Credential Manager, Keychain) into the plugin's store. Hosts
+		* the panel already manages are skipped; a host whose helper had nothing is
+		* reported per host, never as a request failure.
+		* @param body - `{}` (probe what the gitconfig names) or `{ hosts }`.
+		*/
+		function requestImportCredentials(body = {}) {
+			return post(ROUTE_CREDENTIALS_IMPORT, body);
+		}
+		/**
 		* The repository's configured remotes (fetch/push URLs).
 		* @param repoPath - absolute directory inside the repository.
 		*/
@@ -3545,6 +3600,8 @@ window.__ModuleLoader__.load({
 		/** The fields this form edits. */
 		const ACCEL_ENABLED_FIELD = "cnAccelerate";
 		const ACCEL_URL_FIELD = "cnAccelerateUrl";
+		/** The proxy channel's config key (0043); blank = no proxy channel. */
+		const NETWORK_PROXY_FIELD = "networkProxy";
 		/**
 		* Stages the cn-accelerate edits over the `dsh-git-branch` Host entry.
 		*
@@ -3558,6 +3615,7 @@ window.__ModuleLoader__.load({
 			listeners = /* @__PURE__ */ new Set();
 			enabledDraft;
 			urlDraft;
+			proxyDraft;
 			saving = false;
 			failed = false;
 			/**
@@ -3598,6 +3656,11 @@ window.__ModuleLoader__.load({
 						this.failed = false;
 						this.publish();
 					},
+					editNetworkProxy: (text) => {
+						this.proxyDraft = text;
+						this.failed = false;
+						this.publish();
+					},
 					restoreAccelDefault: () => {
 						this.urlDraft = ACCEL_DEFAULT_URL;
 						this.failed = false;
@@ -3605,9 +3668,10 @@ window.__ModuleLoader__.load({
 					},
 					saveAccel: () => this.save(),
 					discardAccel: () => {
-						if (this.enabledDraft === void 0 && this.urlDraft === void 0 && !this.failed) return;
+						if (this.enabledDraft === void 0 && this.urlDraft === void 0 && this.proxyDraft === void 0 && !this.failed) return;
 						this.enabledDraft = void 0;
 						this.urlDraft = void 0;
+						this.proxyDraft = void 0;
 						this.failed = false;
 						this.publish();
 					}
@@ -3619,6 +3683,11 @@ window.__ModuleLoader__.load({
 				const value = this.scope.getSnapshot().value?.[ACCEL_URL_FIELD];
 				return this.urlDraft ?? value ?? "https://gh-proxy.com/";
 			}
+			/** The proxy as the user sees it: the live draft, else the stored value. */
+			effectiveProxyText() {
+				const value = this.scope.getSnapshot().value?.[NETWORK_PROXY_FIELD];
+				return this.proxyDraft ?? (typeof value === "string" ? value : "");
+			}
 			/**
 			* Write the switch and the normalized URL TOGETHER, then re-seed from what
 			* the Host accepted. The URL is validated first — an unusable draft blocks
@@ -3627,11 +3696,14 @@ window.__ModuleLoader__.load({
 			* A save that did not land keeps its drafts so the user can correct them.
 			*/
 			async save() {
-				if (this.enabledDraft === void 0 && this.urlDraft === void 0 || this.saving) return;
+				if (this.enabledDraft === void 0 && this.urlDraft === void 0 && this.proxyDraft === void 0 || this.saving) return;
 				const urlText = this.effectiveUrlText();
 				if (accelerateUrlError(urlText) !== void 0) return;
+				const proxyText = this.effectiveProxyText().trim();
+				if (proxyText !== "" && proxyUrlError(proxyText) !== void 0) return;
 				const intendedEnabled = this.enabledDraft ?? this.scope.getSnapshot().value?.["cnAccelerate"] ?? false;
 				const intendedUrl = normalizeAccelerateUrl(urlText);
+				const writeProxy = this.proxyDraft !== void 0;
 				this.saving = true;
 				this.failed = false;
 				this.publish();
@@ -3639,14 +3711,16 @@ window.__ModuleLoader__.load({
 				try {
 					await this.scope.set(ACCEL_ENABLED_FIELD, intendedEnabled);
 					await this.scope.set(ACCEL_URL_FIELD, intendedUrl);
+					if (writeProxy) await this.scope.set(NETWORK_PROXY_FIELD, proxyText);
 					const user = this.userLayer();
-					if (user?.["cnAccelerate"] !== intendedEnabled || user?.["cnAccelerateUrl"] !== intendedUrl) landed = false;
+					if (user?.["cnAccelerate"] !== intendedEnabled || user?.["cnAccelerateUrl"] !== intendedUrl || writeProxy && (user?.["networkProxy"] ?? "") !== proxyText) landed = false;
 				} catch (_settingsWriteFailure) {
 					landed = false;
 				}
 				if (landed) {
 					this.enabledDraft = void 0;
 					this.urlDraft = void 0;
+					this.proxyDraft = void 0;
 				}
 				this.saving = false;
 				this.failed = !landed;
@@ -3662,17 +3736,22 @@ window.__ModuleLoader__.load({
 				const storedEnabled = snapshot.value?.["cnAccelerate"] ?? false;
 				const storedUrl = snapshot.value?.["cnAccelerateUrl"] ?? "https://gh-proxy.com/";
 				const urlText = this.effectiveUrlText();
+				const storedProxy = typeof snapshot.value?.["networkProxy"] === "string" ? snapshot.value[NETWORK_PROXY_FIELD] : "";
+				const proxyText = this.effectiveProxyText();
 				const enabledDirty = this.enabledDraft !== void 0 && this.enabledDraft !== storedEnabled;
 				const urlDirty = this.urlDraft !== void 0 && this.urlDraft !== storedUrl;
+				const proxyDirty = this.proxyDraft !== void 0 && this.proxyDraft !== storedProxy;
 				return {
 					available: snapshot.status === "ready",
 					writable: snapshot.writable,
 					enabled: this.enabledDraft ?? storedEnabled,
 					urlText,
-					dirty: enabledDirty || urlDirty,
+					dirty: enabledDirty || urlDirty || proxyDirty,
 					saving: this.saving,
 					failed: this.failed,
-					urlError: accelerateUrlError(urlText) ?? null
+					urlError: accelerateUrlError(urlText) ?? null,
+					proxyText,
+					proxyError: proxyText.trim() === "" ? null : proxyUrlError(proxyText.trim()) ?? null
 				};
 			}
 			/** Replace the snapshot reference and notify, only when the fact moved. */
@@ -4607,8 +4686,17 @@ window.__ModuleLoader__.load({
 		*
 		* @module git-worktree/client/panel/CnAcceleratePopover
 		*/
+		/** Channel id → its display name; the probe rows stay in host order. */
+		const CHANNEL_LABELS = {
+			direct: (t) => t("accel.channel.direct"),
+			proxy: (t) => t("accel.channel.proxy"),
+			ip: (t) => t("accel.channel.ip")
+		};
 		function CnAcceleratePopover(props) {
-			const { accel, t, pushToast, onClose } = props;
+			const { accel, t, pushToast, cwd, onClose } = props;
+			const [probe, setProbe] = (0, react.useState)(null);
+			const [probing, setProbing] = (0, react.useState)(false);
+			const [probeError, setProbeError] = (0, react.useState)(null);
 			const rootRef = (0, react.useRef)(null);
 			const state = (0, react.useSyncExternalStore)(accel.store.subscribe, accel.store.getSnapshot);
 			(0, react.useEffect)(() => {
@@ -4627,7 +4715,7 @@ window.__ModuleLoader__.load({
 			}, [onClose]);
 			const locked = state.saving || !state.writable;
 			const onSave = (0, react.useCallback)(() => {
-				if (state.saving || state.urlError !== null || !state.writable) return;
+				if (state.saving || state.urlError !== null || state.proxyError !== null || !state.writable) return;
 				(async () => {
 					await accel.saveAccel();
 					const after = accel.store.getSnapshot();
@@ -4647,6 +4735,25 @@ window.__ModuleLoader__.load({
 				state.writable,
 				t
 			]);
+			const onProbe = (0, react.useCallback)(() => {
+				if (cwd === void 0 || probing) return;
+				setProbing(true);
+				setProbeError(null);
+				(async () => {
+					const result = await requestNetworkProbe(cwd);
+					setProbing(false);
+					if (!result.ok) {
+						setProbe(null);
+						setProbeError(result.error);
+						return;
+					}
+					setProbe({
+						url: result.url,
+						channels: result.channels,
+						...result.systemProxy === void 0 ? {} : { systemProxy: result.systemProxy }
+					});
+				})();
+			}, [cwd, probing]);
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 				className: GitHistoryPanel_module_default.cnPop,
 				ref: rootRef,
@@ -4702,6 +4809,46 @@ window.__ModuleLoader__.load({
 						className: GitHistoryPanel_module_default.cnError,
 						children: state.urlError === "empty" ? t("accel.urlEmpty") : t("accel.urlInvalid")
 					}) : null,
+					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+						className: GitHistoryPanel_module_default.cnFieldHead,
+						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+							className: GitHistoryPanel_module_default.cnFieldLabel,
+							children: t("accel.proxyLabel")
+						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+							type: "button",
+							className: GitHistoryPanel_module_default.cnLink,
+							disabled: locked || cwd === void 0 || probing,
+							onClick: onProbe,
+							children: probing ? t("accel.probing") : t("accel.probe")
+						})]
+					}),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
+						type: "text",
+						className: state.proxyError !== null ? GitHistoryPanel_module_default.cnInputBad : GitHistoryPanel_module_default.cnInput,
+						value: state.proxyText,
+						spellCheck: false,
+						disabled: locked,
+						placeholder: "http://127.0.0.1:7890",
+						"aria-invalid": state.proxyError !== null,
+						onChange: (event) => accel.editNetworkProxy(event.target.value)
+					}),
+					state.proxyError !== null ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+						className: GitHistoryPanel_module_default.cnError,
+						children: t("accel.proxyInvalid")
+					}) : null,
+					probe !== null ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+						className: GitHistoryPanel_module_default.cnHint,
+						children: probe.channels.map((channel) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", { children: [
+							channel.ok ? "✓ " : "✗ ",
+							CHANNEL_LABELS[channel.channel](t),
+							` \u00b7 ${String(channel.elapsedMs)} ms`,
+							channel.detail === void 0 ? null : ` \u00b7 ${channel.detail}`
+						] }, channel.channel))
+					}) : null,
+					probeError !== null ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+						className: GitHistoryPanel_module_default.cnError,
+						children: probeError
+					}) : null,
 					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 						className: GitHistoryPanel_module_default.cnFooter,
 						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
@@ -4712,7 +4859,7 @@ window.__ModuleLoader__.load({
 						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 							type: "button",
 							className: GitHistoryPanel_module_default.cnSave,
-							disabled: state.saving || state.urlError !== null || !state.writable,
+							disabled: state.saving || state.urlError !== null || state.proxyError !== null || !state.writable,
 							onClick: onSave,
 							children: t("cardSave")
 						})]
@@ -4784,6 +4931,10 @@ window.__ModuleLoader__.load({
 			const [seed, setSeed] = (0, react.useState)();
 			const [formError, setFormError] = (0, react.useState)();
 			const [busy, setBusy] = (0, react.useState)(false);
+			/** The one-click machine import runs on its own flag: it is read-only on the
+			* form, so it must not disable editing, and a slow helper (a cold keychain
+			* prompt) must not look like a hung save. */
+			const [importing, setImporting] = (0, react.useState)(false);
 			/** Two-step delete: the first click only arms the row. */
 			const [confirmHost, setConfirmHost] = (0, react.useState)();
 			/** The editor starts collapsed; the "+" icon in the header row opens it,
@@ -5006,6 +5157,34 @@ window.__ModuleLoader__.load({
 				seed,
 				t
 			]);
+			/** Adopt what this machine's own git helpers already answer for. The host
+			* decides which hosts to probe (the user's gitconfig names them) and skips
+			* the ones the panel already manages, so this is always safe to click. */
+			const importLocal = (0, react.useCallback)(async () => {
+				if (busy || importing) return;
+				setImporting(true);
+				const result = await requestImportCredentials();
+				setImporting(false);
+				if (!result.ok) {
+					pushToast(result.error, "error");
+					return;
+				}
+				setEntries(result.credentials);
+				if (result.imported.length === 0) {
+					pushToast(t("cred.importNone"), result.failed.length === 0 ? "success" : "error");
+					return;
+				}
+				pushToast(t("cred.importDone", {
+					count: result.imported.length,
+					skipped: result.skipped.length,
+					failed: result.failed.length
+				}), "success");
+			}, [
+				busy,
+				importing,
+				pushToast,
+				t
+			]);
 			const title = seed === void 0 ? t("cred.add") : t("cred.edit");
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(_deepseek_ai_dsh_client_ui_primitives.Modal, {
 				open: true,
@@ -5021,21 +5200,34 @@ window.__ModuleLoader__.load({
 				children: [
 					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 						className: GitHistoryPanel_module_default.credTop,
-						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
-							className: GitHistoryPanel_module_default.credHint,
-							children: t("cred.hint")
-						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
-							type: "button",
-							className: GitHistoryPanel_module_default.credAdd,
-							title: t("cred.add"),
-							"aria-label": t("cred.add"),
-							"aria-expanded": editorOpen,
-							onClick: openNew,
-							children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-								"aria-hidden": "true",
-								children: "+"
+						children: [
+							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+								className: GitHistoryPanel_module_default.credHint,
+								children: t("cred.hint")
+							}),
+							/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Button, {
+								size: "sm",
+								variant: "ghost",
+								disabled: busy || importing,
+								title: t("cred.import"),
+								onClick: () => {
+									importLocal();
+								},
+								children: importing ? t("cred.importing") : t("cred.import")
+							}),
+							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+								type: "button",
+								className: GitHistoryPanel_module_default.credAdd,
+								title: t("cred.add"),
+								"aria-label": t("cred.add"),
+								"aria-expanded": editorOpen,
+								onClick: openNew,
+								children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+									"aria-hidden": "true",
+									children: "+"
+								})
 							})
-						})]
+						]
 					}),
 					loadError !== void 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 						className: GitHistoryPanel_module_default.formError,
@@ -7067,6 +7259,7 @@ window.__ModuleLoader__.load({
 										accel,
 										t,
 										pushToast,
+										cwd,
 										onClose: closeAccel
 									}) : null]
 								}),
@@ -7888,7 +8081,7 @@ window.__ModuleLoader__.load({
 				children: t("cardDescription")
 			});
 			const lockInput = !state.writable;
-			const lockActions = !state.dirty && !accelState.dirty || state.saving || accelState.saving || !state.keepWorktreesValid || accelState.urlError !== null;
+			const lockActions = !state.dirty && !accelState.dirty || state.saving || accelState.saving || !state.keepWorktreesValid || accelState.urlError !== null || accelState.proxyError !== null;
 			const legacyRootText = storage?.legacyRoot ?? (state.rootDir === "" ? "—" : state.rootDir);
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 				className: GitWorktreeCard_module_default.page,
@@ -8112,6 +8305,33 @@ window.__ModuleLoader__.load({
 							}) : null
 						]
 					}),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", {
+						className: `${GitWorktreeCard_module_default.field} ${GitWorktreeCard_module_default.copyFilesRow}`,
+						htmlFor: "git-worktree-card-network-proxy",
+						children: [
+							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+								className: GitWorktreeCard_module_default.fieldLabel,
+								children: t("accel.proxyLabel")
+							}),
+							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
+								id: "git-worktree-card-network-proxy",
+								className: GitWorktreeCard_module_default.accelInput,
+								type: "text",
+								spellCheck: false,
+								placeholder: "http://127.0.0.1:7890",
+								disabled: lockInput || accelState.saving,
+								value: accelState.proxyText,
+								onChange: (event) => {
+									props.editNetworkProxy(event.target.value);
+								}
+							}),
+							accelState.proxyError !== null ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+								className: GitWorktreeCard_module_default.keepBad,
+								role: "alert",
+								children: t("accel.proxyInvalid")
+							}) : null
+						]
+					}),
 					history.length > 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 						className: `${GitWorktreeCard_module_default.field} ${GitWorktreeCard_module_default.historyRow}`,
 						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
@@ -8421,18 +8641,25 @@ window.__ModuleLoader__.load({
 			"panel.stUnmerged": "conflict",
 			"panel.cnAccelerate": "China acceleration",
 			"accel.enable": "Enable acceleration",
-			"accel.hint": "Accelerates https github.com remotes for fetch/update only; push is never proxied. The mirror sees repository content — do not use it for private or sensitive repositories.",
+			"accel.hint": "Enter a proxy prefix (e.g. https://gh-proxy.com/); fetch/update appends the complete GitHub URL. Push stays direct. The mirror sees repository content — do not use it for private or sensitive repositories.",
 			"accel.urlLabel": "Acceleration URL",
 			"accel.restoreDefault": "Restore default",
 			"accel.urlInvalid": "Enter an http(s):// URL",
 			"accel.urlEmpty": "Enter an acceleration URL",
+			"accel.proxyLabel": "Proxy (optional)",
+			"accel.proxyInvalid": "Enter an http(s)/socks5 proxy URL as host:port, without credentials",
+			"accel.probe": "Test network",
+			"accel.probing": "Testing...",
+			"accel.channel.direct": "Direct",
+			"accel.channel.proxy": "Proxy",
+			"accel.channel.ip": "Pinned IP",
 			"accel.saveFailed": "The change did not save. Try again.",
 			"accel.savedOn": "China acceleration enabled: {url}",
 			"accel.savedOff": "China acceleration disabled",
 			"accel.mirrorDownHint": "If the mirror is down, disable acceleration or change the URL",
 			"panel.credentials": "Credentials",
 			"cred.title": "Git credentials",
-			"cred.hint": "Global, one entry per host: a token saved for github.com serves every repository. Stored only on this machine in git-credentials.json.",
+			"cred.hint": "One entry per host, shared by all repos. Stored in ~/.git-credentials, so plain git uses it too.",
 			"cred.empty": "No credentials saved yet",
 			"cred.hostLabel": "Host",
 			"cred.hostPlaceholder": "github.com",
@@ -8447,6 +8674,10 @@ window.__ModuleLoader__.load({
 			"cred.methodPassword": "Password",
 			"cred.getToken": "Get a token",
 			"cred.add": "Add credential",
+			"cred.import": "Import from this machine",
+			"cred.importing": "Importing…",
+			"cred.importDone": "Imported {count} host(s) — skipped {skipped}, failed {failed}",
+			"cred.importNone": "Nothing new to import from this machine",
 			"cred.edit": "Edit",
 			"cred.save": "Save",
 			"cred.saving": "Saving…",
@@ -8707,18 +8938,25 @@ window.__ModuleLoader__.load({
 			"panel.stUnmerged": "冲突",
 			"panel.cnAccelerate": "国内加速",
 			"accel.enable": "启用加速",
-			"accel.hint": "仅加速 https 的 github.com 仓库地址，作用于提取/更新；推送不走加速。第三方加速站可看到仓库内容，请勿用于私有/敏感仓库。",
+			"accel.hint": "填写加速站前缀（如 https://gh-proxy.com/），提取/更新时会在其后拼接完整 GitHub 地址；推送不走加速。第三方加速站可看到仓库内容，请勿用于私有/敏感仓库。",
 			"accel.urlLabel": "加速地址",
 			"accel.restoreDefault": "恢复默认",
 			"accel.urlInvalid": "请输入以 http(s):// 开头的地址",
 			"accel.urlEmpty": "请输入加速地址",
+			"accel.proxyLabel": "代理（可选）",
+			"accel.proxyInvalid": "请输入 主机:端口 形式的 http(s)/socks5 代理地址，且不带账号密码",
+			"accel.probe": "检测网络",
+			"accel.probing": "检测中...",
+			"accel.channel.direct": "直连",
+			"accel.channel.proxy": "代理",
+			"accel.channel.ip": "固定 IP",
 			"accel.saveFailed": "保存未生效，请重试。",
 			"accel.savedOn": "已启用国内加速：{url}",
 			"accel.savedOff": "已关闭国内加速",
 			"accel.mirrorDownHint": "若加速地址不可用，可停用国内加速或更换地址",
 			"panel.credentials": "密钥配置",
 			"cred.title": "Git 密钥配置",
-			"cred.hint": "全局生效：同一域名只需配置一次，该域名的所有仓库共用。密钥只保存在本机 git-credentials.json 中。",
+			"cred.hint": "按域名保存，所有仓库共用；密钥写入本机 ~/.git-credentials，命令行 git 同样生效。",
 			"cred.empty": "还没有配置任何密钥",
 			"cred.hostLabel": "域名",
 			"cred.hostPlaceholder": "github.com",
@@ -8733,6 +8971,10 @@ window.__ModuleLoader__.load({
 			"cred.methodPassword": "密码",
 			"cred.getToken": "获取令牌",
 			"cred.add": "新增密钥",
+			"cred.import": "从本机导入",
+			"cred.importing": "导入中…",
+			"cred.importDone": "已导入 {count} 个域名（跳过 {skipped}，失败 {failed}）",
+			"cred.importNone": "本机没有新的凭据可导入",
 			"cred.edit": "编辑",
 			"cred.save": "保存",
 			"cred.saving": "保存中…",