dsh-git-branch-manage 1.2.0 → 1.3.1

package/CHANGELOG.md

@@ -2,6 +2,29 @@
 
 本文件记录 `dsh-git-branch-manage` 的重要变更。版本号遵循语义化版本。
 
+## [1.3.1] - 2026-11-15
+
+### 修复
+
+- **会话框分支菜单藏起已被工作树占用的本地分支**（决策 0048）：`buildBranchRows` 曾把已被 linked worktree 检出的本地分支从「本地分支」组剔除，而主仓库会话开始后又整体不渲染「工作树」组，于是这些分支在菜单里完全不可见，容易被误认为分支丢失。现在菜单如实列出全部本地分支；同一分支在本目录检出仍由 git 自己拒绝并报错，不额外加标注或拦截。
+
+## [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
 
 ### 新增

package/README.md

@@ -1,5 +1,169 @@
 # dsh-git-branch
 
+[![npm version](https://img.shields.io/npm/v/dsh-git-branch-manage)](https://www.npmjs.com/package/dsh-git-branch-manage)
+[![license](https://img.shields.io/badge/license-MIT-blue)](./LICENSE)
+
+DSH（DeepSeek Harness）插件：在对话框里提供 git 分支管理以及代码推送、拉取功能。
+
 提供 git 分支与 worktree 管理：输入框工具栏显示当前分支、可原地切换；支持 IDEA 风格分支选择器、远程分支检出、右键操作菜单（新建/重命名/删除/复制）、推送与更新当前分支，以及把分支隔离到独立 worktree 工作区，并管理其创建与删除。
 
-![alt text](./docs/image-1.png)
+> npm 包名 [`dsh-git-branch-manage`](https://www.npmjs.com/package/dsh-git-branch-manage)，插件 id `dsh-git-branch`，展示名「git 分支管理」（[包名由来见决策 0003](./docs/decisions/0003-rename-package-to-dsh-git-branch-manage.md)）。
+
+## 目录
+
+- [截图](#截图)
+- [功能](#功能)
+  - [输入框分支工具栏](#输入框分支工具栏)
+  - [Git 管理面板（侧边栏）](#git-管理面板侧边栏)
+  - [worktree 隔离工作区](#worktree-隔离工作区)
+  - [凭据管理](#凭据管理)
+  - [远程管理](#远程管理)
+  - [网络可靠性](#网络可靠性)
+  - [AI 工具](#ai-工具)
+- [安装](#安装)
+- [配置](#配置)
+- [开发](#开发)
+- [文档](#文档)
+- [许可](#许可)
+
+## 截图
+
+输入框工具栏的分支 chip 与 IDEA 风格分支选择器（右键菜单含新建、新建并检出、新建分支并创建工作树、重命名、复制）：
+
+![输入框工具栏的分支选择器与右键菜单](./docs/image-1.png)
+
+侧边栏 Git 管理面板（未提交变更 / 分支 / 提交历史图）：
+
+![Git 管理面板：未提交变更、分支树与提交历史图](./image.png)
+
+## 功能
+
+### 输入框分支工具栏
+
+- 当前分支 chip 常驻输入框工具栏；会话目录不是 git 仓库时不渲染。
+- IDEA 风格分支选择器：**本地分支 / 远程分支 / 工作树** 分组、分支搜索框、全部展开/折叠、一键定位当前分支。
+- 分支行右键菜单：检出、跳转到该分支的工作树、新建、新建并检出、新建分支并创建工作树、重命名、删除、复制分支名 / 复制路径。
+- 一键 **fetch**、**更新当前分支**、**推送当前分支**（无可推送提交时禁用，[决策 0009](./docs/decisions/0009-disable-empty-push.md)）。
+- 原地 `git switch`：失败时 toast 透出 git 原始错误并回显原分支；已被其他 worktree 检出的分支在菜单里预防性禁用。
+- 会话启动后目录固定，切换只作用于当前会话自己的检出，不动主 checkout。
+
+### Git 管理面板（侧边栏）
+
+注册为右侧边栏的一个页签（通过可选插件 `dsh-better-sidebar` 发布的 `ctx.betterSidebar` 注册，[决策 0013](./docs/decisions/0013-git-history-panel.md)）。**该插件是可选的**：未安装时本页签不出现，输入框 chip 与设置卡照常工作。
+
+- **未提交变更**：勾选文件加入暂存区、提交信息输入、**AI 生成**提交信息、提交；顶部另有 提取 / 更新当前分支 / 推送当前分支。
+- **分支**：搜索框、本地/远程分组树、全部展开/折叠、新建分支、管理远程。
+- **提交历史**：提交连线图（[决策 0019](./docs/decisions/0019-git-history-graph-panel.md)）、按提交人 / 分支 / 范围筛选、右键推送标签（[决策 0020](./docs/decisions/0020-push-tag-action.md)）。
+- 顶栏：仓库路径 pill、刷新、**国内加速** 配置浮层、**密钥配置** 入口。
+
+### worktree 隔离工作区
+
+- 勾选 worktree 后基于所选分支创建独立 worktree 并**注册为 DSH workspace、直接开始会话**；同名 worktree 已存在则幂等复用（[决策 0015](./docs/decisions/0015-branch-context-menu-and-switch-target.md)）。
+- 目录规划 `<rootDir>/<仓库名>/<规范化分支名>`：`/` → `-`，剔除 Windows 非法字符与尾随点/空格，避免多仓库同名分支冲突。
+- 创建前可选 fetch 所有远程（失败不阻断创建）；创建后可选惰性清理陈旧 worktree，`keepWorktrees` 控制保留上限。
+- 创建后可拷贝配置文件（`postCreateCopyFiles`）；存在 `.worktreeinclude` 时不拷贝。
+- **worktree 管理对话框**：全量列表、脏工作区检查、删除 / 清除目录、孤儿（已删目录的残留注册）识别；目录内仍有 RUNNING 会话时拒绝删除，删除会连同会话归档与 workspace 注册一起清理，被检出的分支本身保留（[决策 0014](./docs/decisions/0014-panel-card-height-and-branch-collapse.md)）。
+
+### 凭据管理
+
+- 面板里存一次，**直接读写本机 `~/.git-credentials`**（权限 0600），并经 `~/.gitconfig` 的 URL 作用域 `include` 装上 git 内置 `store` helper（[决策 0037](./docs/decisions/0037-local-git-credentials-backend.md)）——因此面板、任何 shell 里的 `git push/pull`、AI 工具走的是同一账号。
+- 启动时**自动从本机导入**：按用户 gitconfig 声明过的域名逐个 `git credential fill` 探测（串行 + 20 秒超时），`gh`、GCM、`store` 里的账号一次接管（[决策 0038](./docs/decisions/0038-import-machine-credentials.md)）；面板另有手动「从本机导入」。
+- 表单支持**浏览器登录**与令牌创建入口（[决策 0024](./docs/decisions/0024-credentials-browser-sign-in.md)）。
+- 文件里不属于本插件的行（注释、`ssh://` 等）原样保留，**卸载插件后凭据仍属于用户**；未存域名 fail-fast（`GIT_TERMINAL_PROMPT=0`），不弹凭据对话框。
+- 面板元数据（`method` / `updatedAt`）另存不含 secret 的旁文件。
+
+### 远程管理
+
+面板内管理仓库的多个远程地址（新增 / 编辑 / 删除，[决策 0022](./docs/decisions/0022-remote-address-management.md)）。
+
+### 网络可靠性
+
+面向大陆网络下 GitHub 直连不稳定的三层处理（[设计文档](./docs/design/network-reliability.md)）：
+
+- **国内加速**：读操作（fetch / update）把 `https://github.com/` 重写为「加速前缀 + 完整 URL」（默认前缀 `https://gh-proxy.com/`，[决策 0040](./docs/decisions/0040-accelerate-complete-github-url.md)）；**推送永不走镜像**，镜像读失败自动回直连再走备用链（[决策 0044](./docs/decisions/0044-mirror-as-read-accelerator-and-ssh-hint.md)）。
+- **显式代理**：`networkProxy` 支持 `http(s)://` / `socks5://`，另可只读探测系统代理给出建议。
+- **IP 优选备用通道**：直连发生可重试故障时，对 GitHub 地址做运行时 DoH 查询并用真实 git 请求竞速选路（[决策 0042](./docs/decisions/0042-ip-optimized-fallback-channel.md)）。
+- **分级预算与核验**：按探测 / 读取 / 写入 / 超时核验分别设预算；推送前探测远端，推送超时后核验远端 ref，按失败类型给出建议（[决策 0041](./docs/decisions/0041-network-budgets-and-push-verification.md)）。
+- 面板「**检测网络**」诊断入口；SSH 远端不做无效的 HTTP 通道探测，错误信息改为提示 HTTPS 方案。
+
+### AI 工具
+
+插件向模型注册两个只读优先的工具（[决策 0029](./docs/decisions/0029-ai-network-credentials-tool.md)）：
+
+| 工具 | 作用 | 边界 |
+| --- | --- | --- |
+| `git_credentials` | 列出已配置的 git 主机与掩码后的凭据 | 只读；`includeSecret` 才返回明文 |
+| `git_network` | 用本机凭据执行一条 git 网络命令 | 子命令白名单 `fetch` / `pull` / `push` / `ls-remote`；`repoPath` 必须绝对路径；禁止 `--force`、`--delete`、`-c`、`--upload-pack` / `--receive-pack` 等 |
+
+凭据经 git 原生 `credential-store` 通道生效，**不进入命令行参数、不进入对话上下文**。
+
+## 安装
+
+前置条件：
+
+- 已安装 DSH（DeepSeek Harness）；
+- `git` 在 PATH 中可用；
+- Node.js `>= 22.19`（插件运行环境要求，见 `package.json` 的 `engines`）。
+
+安装方式（任选其一）：
+
+1. DSH 的插件管理（Plugins）页签里搜索并安装 npm 包 **`dsh-git-branch-manage`**；
+2. CLI：`dsh plugin add dsh-git-branch-manage`（见 [notes/FIRST-SPEC.md](./notes/FIRST-SPEC.md)）。
+
+peer 依赖（`@deepseek-ai/cordis`、`@deepseek-ai/dsh-settings`、`@deepseek-ai/dsh-host-webserver`、`@deepseek-ai/schemastery`）由 DSH 宿主提供，无需单独安装。侧边栏 Git 面板需要额外安装可选插件 `dsh-better-sidebar`。
+
+## 配置
+
+在 DSH 设置 → 插件 → **git 分支管理**（Host 条目 `dsh-git-branch`）的配置卡中修改；所有字段即时生效并写回 profile 的 `cordis.patch.yml`。未知配置键会被直接拒绝（防止拼写错误被默认值掩盖）。
+
+| 配置项 | 默认值 | 说明 |
+| --- | --- | --- |
+| `rootDir` | `$DSH_HOME/gitworktree`（即 `~/.dsh/gitworktree`） | worktree 存放根路径；必须是绝对路径 |
+| `groupSidebar` | `true` | 侧边栏把同一仓库的 worktree 归入一个分组 |
+| `fetchBeforeCreate` | `false` | 创建 worktree 前 fetch 所有远程（失败不阻断创建） |
+| `autoPruneWorktrees` | `false` | 创建后惰性清理陈旧 worktree |
+| `keepWorktrees` | `30` | 清理保留上限，整数且 `>= 1`，只统计有效的 git worktree |
+| `postCreateCopyFiles` | `[]` | 无 `.worktreeinclude` 时，创建后拷贝的配置文件列表 |
+| `cnAccelerate` | `false` | 国内加速：仅重写 fetch / update 读操作，**push 永不重写** |
+| `cnAccelerateUrl` | `https://gh-proxy.com/` | 加速前缀，须为不含空白的 http(s) URL |
+| `networkProxy` | 空 | 显式代理，`http(s)` / `socks5` URL，不允许携带凭据与路径 |
+
+## 开发
+
+```bash
+pnpm install            # 需要 pnpm 11.8.0（packageManager 字段）
+pnpm run build          # 服务端：tsc -p tsconfig.json → lib/
+pnpm run build:client   # 客户端：tsdown → lib/client.js
+pnpm run build:all      # 上面两步
+pnpm run watch:client   # 客户端增量构建
+pnpm run test           # vitest run
+pnpm run typecheck      # tsc -p tsconfig.client.json --noEmit
+```
+
+`prepublishOnly` 会依次执行 `typecheck` → `test` → `build:all`。
+
+目录速览：
+
+| 路径 | 内容 |
+| --- | --- |
+| `src/index.ts` | host 半边：设置 schema 与校验、HTTP 路由挂载、AI 工具注册 |
+| `src/client/` | 浏览器半边：分支 chip、Git 面板、设置卡、worktree 对话框 |
+| `src/wire.ts` | 双端共享的路由常量与请求/响应类型（零依赖契约） |
+| `src/git.ts` | git 执行器：参数拼装 + porcelain 解析，exec 注入式 seam |
+| `src/credential-service.ts` | 凭据唯一入口（store / include / shell 环境） |
+| `src/network*.ts` | 网络通道：加速、代理、IP 优选、探测与预算 |
+| `tests/*.spec.ts` | vitest 用例（37 个 spec），含真实 git 端到端回归 `shell-bridge-e2e` |
+| `locale/*.json` | 插件展示元数据（标题/描述）的中英文词典；界面文案在 `src/client/locales.ts` |
+| `docs/decisions/` | 决策记录（ADR），非平凡变更须随同一提交更新 |
+| `.github/workflows/` | CI 与 tag 触发的 npm 发布（[决策 0010](./docs/decisions/0010-github-actions-ci-and-npm-release.md)） |
+
+## 文档
+
+- [CHANGELOG.md](./CHANGELOG.md) — 版本变更记录（语义化版本）
+- [docs/decisions/README.md](./docs/decisions/README.md) — 决策记录索引与规范
+- [docs/design/network-reliability.md](./docs/design/network-reliability.md)、[docs/design/cn-accelerate.md](./docs/design/cn-accelerate.md) — 网络可靠性与国内加速设计
+- [notes/FIRST-SPEC.md](./notes/FIRST-SPEC.md)、[notes/GIT-PANEL-SPEC.md](./notes/GIT-PANEL-SPEC.md) — 初始需求与面板规格
+
+## 许可
+
+[MIT](./LICENSE) © GaoHu1997

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`;
@@ -223,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.
@@ -2577,12 +2619,13 @@ window.__ModuleLoader__.load({
 		* a fact-spelling confirm (uncommitted count, ahead commits, sessions to
 		* be archived — the branch itself survives; a directory holding a running
 		* session withholds the verb). On the main checkout's BLANK session the
-		* group doubles as
-		* the only way to reach a branch held by a worktree — those have left the
-		* local group (git refuses to check them out twice, so a local-group row
-		* would be a dead end). A linked-worktree session keeps that group and
-		* gains the main checkout row (see {@link buildLinkedWorktreeRows}); a
-		* started MAIN-checkout session drops the group — its directory is fixed.
+		* group is also the direct hop into a branch held by another worktree —
+		* that branch now ALSO keeps its local-group row (it is the user's branch
+		* and hiding it read as missing), while the hop row is the way to open a
+		* session already on it without touching the checkout. A linked-worktree
+		* session keeps that group and gains the main checkout row (see
+		* {@link buildLinkedWorktreeRows}); a started MAIN-checkout session drops
+		* the group — its directory is fixed.
 		*/
 		/**
 		* Read the repository status for a directory; refetch on demand.
@@ -2633,11 +2676,13 @@ window.__ModuleLoader__.load({
 		}
 		/**
 		* Build the branch rows for the picker on the MAIN checkout, in three
-		* kinds: LOCAL branches not held by a linked worktree, REMOTE branches,
-		* and one WORKTREE row per linked worktree. A branch held by a worktree
-		* LEAVES the local group — git refuses to check it out twice, so the row
-		* would be a dead end; the worktree group is the way INTO it instead (a
-		* direct session hop, see the owner's onAdoptWorktree).
+		* kinds: EVERY local branch, REMOTE branches, and one WORKTREE row per
+		* linked worktree. A local branch held by another worktree STAYS in the
+		* local group: hiding it made the picker look like branches had gone
+		* missing. It is still listed as a worktree row too (the direct session
+		* hop, see the owner's onAdoptWorktree) — the local row keeps the branch
+		* visible and named; checking it out in place stays git's call, which
+		* refuses a branch already checked out elsewhere.
 		*
 		* The worktree group is "every worktree EXCEPT the one this session sits
 		* in" — here that is the main checkout itself (the session IS the main
@@ -2653,10 +2698,9 @@ window.__ModuleLoader__.load({
 		* "not usable in this directory".
 		*/
 		function buildBranchRows$1(branches, worktrees) {
-			const held = new Set(worktrees.flatMap((w) => w.main || w.branch === void 0 ? [] : [w.branch]));
 			const localMap = new Map(branches.filter((b) => b.kind === "local").map((b) => [b.name, b]));
 			return [
-				...branches.filter((b) => b.kind === "local" && !held.has(b.name)).map((b) => ({
+				...branches.filter((b) => b.kind === "local").map((b) => ({
 					name: b.name,
 					kind: "local",
 					...b.ahead === void 0 ? {} : { ahead: b.ahead },
@@ -3558,6 +3602,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.
 		*
@@ -3571,6 +3617,7 @@ window.__ModuleLoader__.load({
 			listeners = /* @__PURE__ */ new Set();
 			enabledDraft;
 			urlDraft;
+			proxyDraft;
 			saving = false;
 			failed = false;
 			/**
@@ -3611,6 +3658,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;
@@ -3618,9 +3670,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();
 					}
@@ -3632,6 +3685,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
@@ -3640,11 +3698,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();
@@ -3652,14 +3713,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;
@@ -3675,17 +3738,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. */
@@ -4620,8 +4688,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)(() => {
@@ -4640,7 +4717,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();
@@ -4660,6 +4737,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,
@@ -4715,6 +4811,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", {
@@ -4725,7 +4861,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")
 						})]
@@ -7125,6 +7261,7 @@ window.__ModuleLoader__.load({
 										accel,
 										t,
 										pushToast,
+										cwd,
 										onClose: closeAccel
 									}) : null]
 								}),
@@ -7946,7 +8083,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,
@@ -8170,6 +8307,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", {
@@ -8479,11 +8643,18 @@ 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",
@@ -8769,11 +8940,18 @@ 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": "已关闭国内加速",