From 4227f413451acdb51f08aaca0cbbb1ae41306fc7 Mon Sep 17 00:00:00 2001
From: linletian <lin@letian.name>
Date: Fri, 19 Jun 2026 10:24:33 +0800
Subject: [PATCH 1/5] docs: add ghostty-web research report
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

调研 anomalyco/ghostty-web（Ghostty VT 解析器 WASM 化 + xterm.js API 兼容）
与 myworktree 的相似/差异点，以及作为 xterm.js 替代 renderer 的借鉴方案。

结论：精准命中 TERMINAL_FILTER_REVIEW.md 与 CHINESE_IME_ANALYSIS.md 已记录
的 OSC/DA 回声与复杂脚本渲染两类痛点，建议以 feature flag 灰度引入。
---
 docs/GHOSTTY_WEB_RESEARCH.md | 139 +++++++++++++++++++++++++++++++++++
 1 file changed, 139 insertions(+)
 create mode 100644 docs/GHOSTTY_WEB_RESEARCH.md

diff --git a/docs/GHOSTTY_WEB_RESEARCH.md b/docs/GHOSTTY_WEB_RESEARCH.md
new file mode 100644
index 0000000..0bb9e8f
--- /dev/null
+++ b/docs/GHOSTTY_WEB_RESEARCH.md
@@ -0,0 +1,139 @@
+# ghostty-web 调研报告：与 myworktree 的对比与借鉴
+
+**调研日期**: 2026-06-19
+**目标项目**: https://github.com/anomalyco/ghostty-web
+**调研目的**: 评估 ghostty-web 是否可作为 myworktree 前端终端渲染器（xterm.js）的替代方案
+**结论摘要**: ghostty-web 精准命中 myworktree 已记录的两类 xterm.js 痛点（OSC/DA 查询回声、复杂脚本渲染），推荐作为可选 renderer 引入，feature flag 灰度过渡。
+
+---
+
+## 1. 项目背景
+
+**ghostty-web** 是 Coder 公司 fork 自 `coder/ghostty-web` 的一个 TypeScript 库，把原生 [Ghostty](https://github.com/ghostty-org/ghostty) 终端模拟器的解析层编译成 WASM，在浏览器里跑出 xterm.js 兼容的 `Terminal` API。
+
+**核心卖点**（来自上游 README）：
+- 与 xterm.js 完全 API 兼容：「Migrate from xterm by changing your import: `@xterm/xterm` → `ghostty-web`」
+- WASM 编译的 VT 解析器，与原生 Ghostty 共用同一份经过实战检验的代码
+- 零运行时依赖，~400KB WASM bundle
+- 修掉 xterm.js 的两个长期 issue：
+  - 复杂脚本（Devanagari、Arabic）渲染
+  - XTPUSHSGR/XTPOPSGR 等控制序列缺失
+- 依赖 Mitchell Hashimoto 正在做的 [libghostty](https://mitchellh.com/writing/libghostty-is-coming)，目前 patch 极小（见 `patches/ghostty-wasm-api.patch`）
+
+**目录结构**：
+```
+ghostty-web/
+├── lib/            # TS 库主体（Terminal、Buffer、Renderer、InputHandler、SelectionManager、LinkDetector…）
+├── demo/           # Web demo，连接真实 shell
+├── dist/           # 构建产物
+├── ghostty/        # 子模块：upstream Ghostty 源码
+├── patches/        # Ghostty 的 WASM 补丁
+├── scripts/        # 构建脚本
+├── bench/          # 基准测试
+├── AGENTS.md       # AI 协作指南
+├── biome.json      # Biome 格式化 + lint 配置
+├── bun.lock        # Bun 依赖锁
+├── vite.config.js  # Vite 构建
+└── flake.nix       # Nix 开发环境
+```
+
+---
+
+## 2. 与 myworktree 的相同点
+
+两者都面向「**浏览器里的终端体验**」，且都把一个终端渲染器 vendored 到前端用：
+
+| 维度 | ghostty-web | myworktree |
+|---|---|---|
+| 终端渲染器 | `ghostty-vt.wasm`（Zig→WASM 的 Ghostty VT 解析器） | `xterm.js v6.0.0` + `xterm-addon-fit`（vendor 在 `internal/ui/static/vendor/`） |
+| 接入方式 | 前端 JS 库 + WASM | 前端 `<script>` 标签引用 vendored 文件 |
+| 核心 API | `Terminal` / `write` / `onData`（xterm.js 兼容） | `Terminal` / `fitAddon.fit()` / `term.write` / `term.onData` |
+| 部署形态 | npm 包（库） | Go 二进制 + 内嵌 `index.html`（应用） |
+| License | MIT | MIT |
+| Demo | 内置 web demo，连真实 shell 跑 `npx @ghostty-web/demo@next` | `mw` 自带 web UI + PTY 实例 |
+
+### 2.1 关键交集：都吃 xterm.js 的亏
+
+ghostty-web 的 README 直接点名 xterm.js 在 OSC 11/DA/CPR 等查询序列上的 bug；myworktree 的 `docs/TERMINAL_FILTER_REVIEW.md:45-54` 记录了**完全一样的问题**（实例时 `11;rgb:...`、`1;2c`、`;1R` 串到 PTY 里污染 TUI），并且专门写了一个 `isTerminalQueryResponse()` 前端过滤器去兜底。
+
+这是少见的「第三方库的 README 第一条吐槽就精准命中你的痛点」的情况。
+
+---
+
+## 3. 与 myworktree 的不同点
+
+| 维度 | ghostty-web | myworktree |
+|---|---|---|
+| 角色 | **库**（只做 VT 解析 + 渲染） | **应用**（worktree + 实例 + 标签 + 鉴权 + MCP + Portal 全套） |
+| 语言 | TypeScript + Zig | Go |
+| 进程管理 | ❌ 不管 | ✅ `internal/instance` 管理 PTY 生命周期、Tag 模板、restart 链式记录 |
+| Git worktree | ❌ | ✅ `internal/gitx` + `internal/worktree` |
+| 服务端传输层 | Demo 用 WS，但库本身无服务 | ✅ WS + SSE + polling 三档降级 + 状态显示 |
+| MCP | ❌ | ✅ `/api/mcp/tools`, `/api/mcp/call` |
+| 鉴权 / Portal | ❌ | ✅ 全局 token + HttpOnly Cookie + CSRF + Tailscale + Portal 反向代理 |
+| TUI 输入净化 | ✅ 渲染器层面修掉 | ⚠️ 前端正则过滤 + 后端 redact 已禁用（见 `TERMINAL_FILTER_REVIEW.md:14-22`） |
+| 复杂脚本/IME | ✅ "Proper grapheme handling" | ⚠️ 有专门的 `docs/CHINESE_IME_ANALYSIS.md`（中文 AI CLI 场景痛点） |
+| 构建链 | Bun + Vite + WASM patch | `go build` + `scripts/download-xterm.sh` 拉 vendor |
+| 包大小 | ~400KB WASM、零运行时依赖 | xterm.js v6 + addon-fit，零依赖 |
+| 成熟度 | 预发布（无 GitHub release、依赖上游 libghostty） | 已发 v0.2.0，darwin amd64/arm64 release |
+
+---
+
+## 4. 可以借鉴的地方
+
+### 4.1 直接替换 xterm.js（最大收益）
+
+README 原话：「**Migrate from xterm by changing your import: `@xterm/xterm` → `ghostty-web`**」。myworktree 用了 ~3500 行 `internal/ui/static/index.html`，但 `Terminal` / `FitAddon` / `write` / `onData` / `onResize` 调用面是兼容的，理论上是个**单点替换**。
+
+落地步骤：
+- 删 `scripts/download-xterm.sh` → 新增 `scripts/download-ghostty-web.sh`（拉 wasm + js + css + 完整性校验）
+- `internal/ui/static/index.html:1346-1348` 把 `<script src="/static/vendor/xterm/xterm.js">` 换成 `<script type="module">` 引入 ghostty-web
+- `new Terminal(...)` 前加 `await init()`
+- 调用点大概率零改动
+
+直接收益：
+- 干掉 `internal/ui/ui_test.go:41-51` 里的 `isTerminalQueryResponse()` 前端过滤器（ghostty 自身不会把这些 OSC/DA 回声送回 `onData`）
+- 干掉 `internal/redact` 里那段坏过 TUI 的 `controlSeqRemnant`（已禁用但代码还在）
+- 解决 `CHINESE_IME_ANALYSIS.md` 里的复杂脚本/IME 渲染问题——目标用户是 Claude/MiniMax/Qwen 中文 CLI
+- 顺手干掉 vendor 目录里独立维护的 `xterm-addon-fit`（ghostty-web 内置 fit）
+
+### 4.2 借鉴「API 兼容」策略做替换过渡
+
+ghostty-web 没强行让用户改业务代码，只换 import。这是 myworktree 可以直接照抄的迁移方法论：**不破坏既有 3500 行 `index.html` 的存量调用**。
+
+具体落地建议保留 `isTerminalQueryResponse()` 过滤器一两个版本作为 fallback（feature flag），确认 ghostty-web 在 PTY 回放 / TUI 应用（opencode、Claude Code、lazygit）这些场景下都稳了再删。
+
+### 4.3 借鉴 demo / 验证流程
+
+ghostty-web 有 `demo/index.html` 跑真实 shell + ephemeral VM 做端到端验证。myworktree 的 `internal/ui/ui_test.go` 目前是字符串级断言（检查 `let terminalSessions = {}` 出现），可以借鉴 ghostty-web 的 `lib/*.test.ts`（`buffer.test.ts`、`renderer.test.ts`、`selection-manager.test.ts` 等）做基于真实渲染产物的快照测试——对 `codecliteams.png` / `webui.png` 演示质量会有帮助。
+
+### 4.4 借鉴「上游合并」策略
+
+`patches/ghostty-wasm-api.patch` 维持极小补丁，跟上游 libghostty 演进。这是和 myworktree `internal/redact` 那段历史教训（regex 误伤 TUI）**互为镜像**的教训：别在渲染/解析层硬塞项目特定逻辑，改用配置/hook。myworktree 这边可以反过来审视——前端那坨 `isTerminalQueryResponse` 正犯了同样的错。
+
+### 4.5 不建议直接照搬的点
+
+- **WASM 加载 + 完整性校验**需要新增（参照 `scripts/download-xterm.sh` 现有 pattern）
+- **400KB WASM** 比 xterm.js v6 大，但换来零运行时依赖 + 复杂脚本正确性，trade-off 划算
+- **License 归因**：`NOTICE` 要追加 ghostty-web (MIT) + Ghostty (MIT) + 任何 patch
+- **成熟度风险**：ghostty-web 没有 release、依赖未发布的 libghostty、`patches/ghostty-wasm-api.patch` 注释说「we expect them to get smaller」——myworktree 的卖点是「实例常驻不掉」，渲染层引入预发布 WASM 库需要评估故障面
+- **测试断言**：现有 `ui_test.go:41` 显式断言 `let terminalSessions = {}` 字符串，迁移后要更新
+
+---
+
+## 5. 推荐落地顺序
+
+1. **新增** `scripts/download-ghostty-web.sh`（与现有 `download-xterm.sh` 并存）
+2. **加 feature flag** `mw -terminal-renderer=xterm|ghostty`（默认 xterm 不变）
+3. **shadow 模式跑一版**——同时挂两个 renderer，对比 PTY 输入回显是否还有 `1;2c` 这类噪声
+4. **CI 加 `lib/*.test.ts` 风格的快照测试**（buffer / 渲染输出）
+5. **稳了再默认切 ghostty-web**，删前端 `isTerminalQueryResponse` 过滤器、`redact.go` 里的相关代码、`xterm-addon-fit`
+
+---
+
+## 6. 关键判断
+
+- **收益明确**：替换后能消掉 `TERMINAL_FILTER_REVIEW.md` + `CHINESE_IME_ANALYSIS.md` 两份文档描述的痛点，对中文 AI CLI 工作流尤其友好
+- **风险可控**：xterm.js 路径保留为默认 + feature flag，灰度切换，故障时可一键回滚
+- **维护成本**：新增一个 vendor 下载脚本 + 一份完整性校验，长期减少对 `isTerminalQueryResponse` 正则黑名单的维护负担
+- **战略对齐**：ghostty-web 依赖 Mitchell Hashimoto 正在做的 libghostty（Ghostty 官方 WASM 化路径），押注 Ghostty 生态是低风险长期赌注

From f759246c8e6cd769dcb955b9dd062e2f3dd0ce70 Mon Sep 17 00:00:00 2001
From: linletian <linletian@users.noreply.github.com>
Date: Fri, 19 Jun 2026 12:14:11 +0800
Subject: [PATCH 2/5] feat: surface github.com link in sidebar main workspace

Render a small GitHub Mark icon to the right of the sidebar main
workspace project name when the main repo's git remote resolves to
github.com. Clicking opens the canonical https://github.com/<owner>/<repo>
URL in a new tab via <a target="_blank" rel="noopener noreferrer">,
with event.stopPropagation() so the icon click does not trigger the
row's selectWorktree handler.

Backend:
- Add gitx.GitHubURL(root) resolver. Prefers 'origin', then iterates
  'git remote'. Normalizes SCP / HTTPS / ssh:// forms, strips .git and
  trailing slashes, and returns '' for any host other than github.com
  (case-insensitive). GitHub Enterprise and non-Git remotes are
  intentionally not surfaced.
- /api/main response gains a github_url string field (always present;
  empty when no link can be resolved).

Tests cover all three URL formats, malformed inputs, GitHub Enterprise,
non-GitHub hosts, .git suffix, and the /api/main field plumbing.

Docs (per docs-first convention): CHANGELOG, API, ARCHITECTURE, PRD,
README.md, README.zh-CN.md.
---
 CHANGELOG.md                  |   4 ++
 README.md                     |   1 +
 README.zh-CN.md               |   1 +
 docs/API.md                   |  14 ++++-
 docs/ARCHITECTURE.md          |   3 +-
 docs/PRD.md                   |   3 +-
 internal/app/app.go           |   5 +-
 internal/app/app_test.go      |  16 +++++
 internal/gitx/gitx_test.go    | 113 ++++++++++++++++++++++++++++++++++
 internal/gitx/remote.go       | 112 +++++++++++++++++++++++++++++++++
 internal/ui/static/index.html |  84 ++++++++++++++++++++++---
 11 files changed, 342 insertions(+), 14 deletions(-)
 create mode 100644 internal/gitx/remote.go

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b8a9817..12518cd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Unreleased
+
+- Sidebar main workspace now shows a GitHub icon to the right of the project name. The icon is rendered only when `git remote` points at `github.com`; clicking opens the canonical `https://github.com/<owner>/<repo>` URL in a new tab. Source of truth is a new `github_url` field on `GET /api/main`, computed via the new `gitx.GitHubURL` helper (prefers `origin`, then falls back to iterating `git remote`; normalizes SCP / HTTPS / `ssh://` forms; strips `.git`). GitHub Enterprise and non-GitHub remotes are intentionally not surfaced.
+
 ## v0.3.0
 
 Release focused on remote collaboration, build robustness, and Apple Silicon reliability.
diff --git a/README.md b/README.md
index 145cce9..24bd9de 100644
--- a/README.md
+++ b/README.md
@@ -37,6 +37,7 @@ myworktree is a thin management layer that:
 - MCP tool endpoints (`/api/mcp/tools`, `/api/mcp/call`)
 - Portal Dashboard with shared entry port, auto-discovery of running instances across repos
 - Global auth token (HttpOnly Cookie, CSRF protection, tailscale serve integration)
+- Sidebar main workspace shows a GitHub icon next to the project name when the repo's git remote points at `github.com`; clicking opens the canonical `https://github.com/<owner>/<repo>` URL in a new tab. GitHub Enterprise and non-GitHub remotes are intentionally not surfaced.
 
 ## Requirements
 - macOS 12+ (other platforms are not validated yet)
diff --git a/README.zh-CN.md b/README.zh-CN.md
index ffe12e4..908b045 100644
--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@@ -37,6 +37,7 @@ myworktree 只做管理，不碰项目具体内容：
 - MCP 接口（`/api/mcp/tools`、`/api/mcp/call`）
 - Portal 仪表板：共享入口端口，跨仓库自动发现运行实例
 - 全局认证 Token（HttpOnly Cookie、CSRF 防护、Tailscale Serve 自动集成）
+- 侧栏主工作区项目名旁在仓库 remote 指向 `github.com` 时渲染 GitHub 图标；点击在新窗口打开 `https://github.com/<owner>/<repo>` 规范 URL。GitHub Enterprise 与非 GitHub remote 不展示。
 
 ## 运行环境
 - macOS 12+ 其他平台未验证
diff --git a/docs/API.md b/docs/API.md
index d54f927..df28e19 100644
--- a/docs/API.md
+++ b/docs/API.md
@@ -31,11 +31,21 @@ Returns the main (host) git repository name and its currently checked-out branch
 
 Response:
 ```json
-{ "name": "myproject", "branch": "feature/ui-update" }
+{
+  "name": "myproject",
+  "branch": "feature/ui-update",
+  "github_url": "https://github.com/owner/myproject"
+}
 ```
 
-- `name`: basename of the git root directory
+- `name`: basename of the git root directory.
 - `branch`: currently checked-out branch (via `git rev-parse --abbrev-ref HEAD`). Returns empty string on detached HEAD (e.g., CI shallow clones).
+- `github_url`: when the main repo has a git remote pointing at `github.com`, returns the canonical `https://github.com/<owner>/<repo>` URL; otherwise returns an empty string. Resolution order:
+  1. `git remote get-url origin` (preferred).
+  2. If `origin` is missing or not parseable, fall back to iterating `git remote` and trying each remote in declared order.
+  3. Supported URL formats: `git@github.com:owner/repo.git` (SCP-style), `https://github.com/owner/repo.git`, `ssh://[user@]github.com/owner/repo.git` (no explicit port — `ssh://git@github.com:22/...` is **not** recognized). The `.git` suffix and a trailing `/` are stripped.
+  4. Only host `github.com` (case-insensitive) is recognized. GitHub Enterprise (`*.ghe.com`, self-hosted) and any non-GitHub host (GitLab, Bitbucket, local paths, `file://`) yield an empty string.
+  5. The field is always present in the JSON response (an empty string means "no GitHub link to show").
 
 ## 2) Worktrees
 ### List
diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md
index 93e169d..50868a3 100644
--- a/docs/ARCHITECTURE.md
+++ b/docs/ARCHITECTURE.md
@@ -59,7 +59,8 @@ It does **not** analyze project code or prevent concurrent write conflicts insid
 
 The sidebar shows a pinned **Main Workspace** item at the top (purple accent), followed by a "Worktrees" divider and the managed worktree list.
 
-- **Main repo**: `GET /api/main` returns `{name, branch}`. The branch is live — queried via `git rev-parse --abbrev-ref HEAD` (via `gitx.CurrentBranch`). Returns empty string for `branch` on detached HEAD (e.g., CI shallow clones), otherwise returns the current branch name.
+- **Main repo**: `GET /api/main` returns `{name, branch, github_url}`. The branch is live — queried via `git rev-parse --abbrev-ref HEAD` (via `gitx.CurrentBranch`). Returns empty string for `branch` on detached HEAD (e.g., CI shallow clones), otherwise returns the current branch name.
+- **GitHub link on the main repo row**: When `state.mainRepo.github_url` is non-empty, the sidebar main-workspace row renders a small GitHub Mark icon to the right of the project name. The icon is an `<a target="_blank" rel="noopener noreferrer">` (so middle-click / right-click "Open in new tab" still work), with `event.stopPropagation()` so clicking the icon does not trigger the row's `selectWorktree` handler. The URL is resolved on every `/api/main` request via `gitx.GitHubURL(root)`: it inspects `origin` first, then falls back to iterating `git remote`, normalizes SCP / HTTPS / `ssh://` forms, and returns `""` for any host other than `github.com` (case-insensitive) — GitHub Enterprise and non-Git remotes intentionally do not surface a link. When the field is empty, the icon is omitted entirely (the project name occupies the full row width).
 - **Worktrees**: `GET /api/worktrees` also returns live branches — `worktree.Manager.List()` queries `git rev-parse --abbrev-ref HEAD` per worktree path on each call. The `branch` field reflects the currently checked-out branch, not the creation-time branch.
 - **Quick actions**: The main repo item and each managed worktree row render two SVG shortcut buttons when the UI is accessed via `localhost` or `127.0.0.1`: one opens Terminal at the target path, the other opens Finder. These buttons are intentionally hidden for remote/browser sessions because the action targets the host machine running `myworktree`, not the remote client device.
 - **Server-side boundary**: The backend does not trust the frontend visibility check. `POST /api/worktrees/open-terminal` and `POST /api/worktrees/open-finder` reject non-loopback clients based on the request's remote address, so remote callers cannot trigger host GUI actions by directly invoking the API.
diff --git a/docs/PRD.md b/docs/PRD.md
index 309c551..aff5f1c 100644
--- a/docs/PRD.md
+++ b/docs/PRD.md
@@ -71,7 +71,8 @@
   - ~~Tailscale Serve 自动管理（自动配置 `tailscale serve` 提供 `https://<machine>.ts.net` 域名访问）~~ **（暂未启用，见 §6 安全说明）**
   - 双层认证架构（Portal 层 Cookie + CSRF，实例层 loopback 绕过）
 - 浏览器关闭保护：前端在 `beforeunload` 事件时，无论是否存在运行中实例，均触发浏览器原生确认对话框，防止误操作关闭页面。
-- **Main workspace 分支查询**：`GET /api/main` 返回 `{name, branch}`。branch 字段实时查询（`git rev-parse --abbrev-ref HEAD`），在 detached HEAD 场景（如 CI 浅克隆）下返回空字符串而非错误。
+- **Main workspace 分支查询**：`GET /api/main` 返回 `{name, branch, github_url}`。branch 字段实时查询（`git rev-parse --abbrev-ref HEAD`），在 detached HEAD 场景（如 CI 浅克隆）下返回空字符串而非错误。github_url 字段基于 `git remote` 推算（优先 origin，回退到 `git remote` 列表），规范化 SCP / HTTPS / ssh:// 三种形式，仅识别 `github.com`，返回 `https://github.com/<owner>/<repo>`，其它情况返回空串。
+- **已实现侧栏主工作区 GitHub 链接**：侧栏主工作区项目名右侧条件渲染 GitHub 图标，链接到 `state.mainRepo.github_url`（来源：`/api/main` 的 github_url 字段，由 `gitx.GitHubURL` 计算）。点击在新窗口打开，使用 `<a target="_blank" rel="noopener noreferrer">` 并通过 `event.stopPropagation()` 避免触发 `selectWorktree`。非 GitHub remote、无 remote 或解析失败时不渲染图标。仅识别 `github.com`，不含 GitHub Enterprise。
 
 ## 8. 验收标准（MVP）
 - 可创建/列出/删除 worktree（dirty 删除被拒绝）。
diff --git a/internal/app/app.go b/internal/app/app.go
index d2831e2..41ed7d1 100644
--- a/internal/app/app.go
+++ b/internal/app/app.go
@@ -576,8 +576,9 @@ func (s *Server) handleMain(w http.ResponseWriter, r *http.Request) {
 	name := filepath.Base(filepath.Clean(s.root))
 	branch, _ := gitx.CurrentBranch(s.root) // returns empty string on detached HEAD
 	writeJSON(w, http.StatusOK, map[string]any{
-		"name":   name,
-		"branch": branch,
+		"name":       name,
+		"branch":     branch,
+		"github_url": gitx.GitHubURL(s.root),
 	})
 }
 
diff --git a/internal/app/app_test.go b/internal/app/app_test.go
index ca9b1ad..801bb3b 100644
--- a/internal/app/app_test.go
+++ b/internal/app/app_test.go
@@ -13,6 +13,7 @@ import (
 	"time"
 
 	"myworktree/internal/config"
+	"myworktree/internal/gitx"
 	"myworktree/internal/store"
 )
 
@@ -780,6 +781,21 @@ func TestHandleMain(t *testing.T) {
 		t.Fatalf("GET /api/main: missing branch field")
 	}
 
+	// github_url field is present as a string. The expected value is derived
+	// from whatever the resolver (covered by its own tests) produces for the
+	// same git root, so the assertion stays valid across owner / repo
+	// renames, forks, and org transfers. We only require the API to surface
+	// the same string the resolver returns (or "" when the resolver yields
+	// nothing).
+	gh, ok := resp["github_url"].(string)
+	if !ok {
+		t.Fatalf("GET /api/main: expected github_url to be a string, got %T (%v)", resp["github_url"], resp["github_url"])
+	}
+	wantGitHub := gitx.GitHubURL(srv.root)
+	if gh != wantGitHub {
+		t.Fatalf("GET /api/main: github_url = %q, want %q (resolver output)", gh, wantGitHub)
+	}
+
 	// POST → 405
 	reqPost := httptest.NewRequest(http.MethodPost, "/api/main", nil)
 	wPost := httptest.NewRecorder()
diff --git a/internal/gitx/gitx_test.go b/internal/gitx/gitx_test.go
index 30ef867..c34c121 100644
--- a/internal/gitx/gitx_test.go
+++ b/internal/gitx/gitx_test.go
@@ -54,6 +54,119 @@ func TestDefaultBranch(t *testing.T) {
 	}
 }
 
+func TestGitHubURL(t *testing.T) {
+	cases := []struct {
+		name string
+		url  string
+		want string
+	}{
+		{"scp style", "git@github.com:owner/repo.git", "https://github.com/owner/repo"},
+		{"scp style no .git", "git@github.com:owner/repo", "https://github.com/owner/repo"},
+		{"https", "https://github.com/owner/repo.git", "https://github.com/owner/repo"},
+		{"https no .git", "https://github.com/owner/repo", "https://github.com/owner/repo"},
+		{"https trailing slash", "https://github.com/owner/repo.git/", "https://github.com/owner/repo"},
+		{"http", "http://github.com/owner/repo.git", "https://github.com/owner/repo"},
+		{"ssh url", "ssh://git@github.com/owner/repo.git", "https://github.com/owner/repo"},
+		{"ssh url no user", "ssh://github.com/owner/repo.git", "https://github.com/owner/repo"},
+		{"uppercase host", "git@GITHUB.COM:owner/repo.git", "https://github.com/owner/repo"},
+		{"dotted owner", "git@github.com:my.org/awesome.repo.git", "https://github.com/my.org/awesome.repo"},
+		{"gitlab rejected", "git@gitlab.com:owner/repo.git", ""},
+		{"bitbucket rejected", "https://bitbucket.org/owner/repo.git", ""},
+		{"ghe rejected", "git@github.acme.com:owner/repo.git", ""},
+		{"local path rejected", "/path/to/repo", ""},
+		{"file scheme rejected", "file:///path/to/repo", ""},
+		{"empty", "", ""},
+		{"whitespace only", "   ", ""},
+		{"missing repo", "git@github.com:owner/", ""},
+	}
+
+	for _, c := range cases {
+		t.Run("parse/"+c.name, func(t *testing.T) {
+			got := normalizeGitHubURL(c.url)
+			if got != c.want {
+				t.Fatalf("normalizeGitHubURL(%q) = %q, want %q", c.url, got, c.want)
+			}
+		})
+	}
+
+	// End-to-end: GitHubURL against the real repo's origin. We compute the
+	// expected value from the actual `git remote get-url origin` output so
+	// the assertion survives owner / repo renames and forks.
+	t.Run("e2e/real repo", func(t *testing.T) {
+		root, err := GitRoot(".")
+		if err != nil {
+			t.Skipf("not a git repo: %v", err)
+		}
+		originCmd := exec.Command("git", "remote", "get-url", "origin")
+		originCmd.Dir = root
+		originOut, originErr := originCmd.Output()
+		if originErr != nil {
+			t.Skipf("origin not configured: %v", originErr)
+		}
+		origin := strings.TrimSpace(string(originOut))
+		want := normalizeGitHubURL(origin)
+		if want == "" {
+			t.Skipf("origin %q does not point at github.com; skipping end-to-end check", origin)
+		}
+		if got := GitHubURL(root); got != want {
+			t.Fatalf("GitHubURL(root) = %q, want %q", got, want)
+		}
+	})
+
+	// End-to-end: a freshly-initialized repo with no remotes yields "".
+	t.Run("e2e/no remotes", func(t *testing.T) {
+		dir := t.TempDir()
+		runGit(t, dir, "init", "-q")
+		if got := GitHubURL(dir); got != "" {
+			t.Fatalf("GitHubURL(no-remote repo) = %q, want empty", got)
+		}
+	})
+
+	// End-to-end: a repo whose only remote is GitLab yields "".
+	t.Run("e2e/gitlab only", func(t *testing.T) {
+		dir := t.TempDir()
+		runGit(t, dir, "init", "-q")
+		runGit(t, dir, "remote", "add", "origin", "git@gitlab.com:foo/bar.git")
+		if got := GitHubURL(dir); got != "" {
+			t.Fatalf("GitHubURL(gitlab origin) = %q, want empty", got)
+		}
+	})
+
+	// End-to-end: origin is non-GitHub but a non-origin remote is GitHub —
+	// the fallback iterates `git remote` and finds the GitHub URL.
+	t.Run("e2e/origin rejected, upstream accepted", func(t *testing.T) {
+		dir := t.TempDir()
+		runGit(t, dir, "init", "-q")
+		runGit(t, dir, "remote", "add", "origin", "https://gitlab.com/foo/bar.git")
+		runGit(t, dir, "remote", "add", "upstream", "git@github.com:foo/bar.git")
+		if got := GitHubURL(dir); got != "https://github.com/foo/bar" {
+			t.Fatalf("GitHubURL(fallback) = %q, want %q", got, "https://github.com/foo/bar")
+		}
+	})
+
+	// End-to-end: HTTPS GitHub remote with no .git suffix.
+	t.Run("e2e/https no dotgit", func(t *testing.T) {
+		dir := t.TempDir()
+		runGit(t, dir, "init", "-q")
+		runGit(t, dir, "remote", "add", "origin", "https://github.com/hello/world")
+		if got := GitHubURL(dir); got != "https://github.com/hello/world" {
+			t.Fatalf("GitHubURL = %q, want %q", got, "https://github.com/hello/world")
+		}
+	})
+}
+
+// runGit is a test-only helper that runs a git command inside dir with a
+// short context-derived timeout. Used by TestGitHubURL e2e subtests to set
+// up throwaway remotes without depending on gitx internals.
+func runGit(t *testing.T, dir string, args ...string) {
+	t.Helper()
+	cmd := exec.Command("git", args...)
+	cmd.Dir = dir
+	if out, err := cmd.CombinedOutput(); err != nil {
+		t.Fatalf("git %v: %v\n%s", args, err, string(out))
+	}
+}
+
 func TestGitCommandTimeoutStopsHungGit(t *testing.T) {
 	dir := t.TempDir()
 	script := filepath.Join(dir, "git")
diff --git a/internal/gitx/remote.go b/internal/gitx/remote.go
new file mode 100644
index 0000000..646ed5a
--- /dev/null
+++ b/internal/gitx/remote.go
@@ -0,0 +1,112 @@
+package gitx
+
+import (
+	"regexp"
+	"strings"
+	"time"
+)
+
+// GitHubURL inspects the git remotes of gitRoot and returns the canonical
+// GitHub.com HTTPS URL for the repository, or an empty string when no GitHub
+// remote can be resolved.
+//
+// Resolution order:
+//  1. `git remote get-url origin` (preferred; honors the conventional name).
+//  2. If origin is missing or unparseable, iterate `git remote` and try each
+//     remote in declared order.
+//
+// Supported URL formats (after leading/trailing whitespace is trimmed):
+//   - git@github.com:owner/repo.git       (SCP-style, default SSH port only)
+//   - https://github.com/owner/repo.git
+//   - http://github.com/owner/repo.git
+//   - ssh://[user@]github.com/owner/repo.git (no explicit port)
+//
+// `.git` suffixes and trailing slashes are stripped. Only host `github.com`
+// (case-insensitive) is recognized; GitHub Enterprise and any other host
+// (GitLab, Bitbucket, local paths, file://, etc.) yield an empty string.
+//
+// The function never errors out: timeouts, missing remotes, and unparseable
+// URLs all degrade to an empty string so the caller can treat the result as
+// a pure "should we render a link?" boolean.
+func GitHubURL(gitRoot string) string {
+	// Origin is preferred; resolve it first and short-circuit on a positive
+	// match. This avoids spawning `git remote` (and one extra `get-url` per
+	// non-origin remote) on the common single-origin case.
+	if u := getRemoteURL(gitRoot, "origin"); u != "" {
+		if url := normalizeGitHubURL(u); url != "" {
+			return url
+		}
+	}
+	for _, name := range listRemotes(gitRoot) {
+		if name == "origin" {
+			continue
+		}
+		if u := getRemoteURL(gitRoot, name); u != "" {
+			if url := normalizeGitHubURL(u); url != "" {
+				return url
+			}
+		}
+	}
+	return ""
+}
+
+func getRemoteURL(gitRoot, name string) string {
+	if strings.TrimSpace(name) == "" {
+		return ""
+	}
+	cmd := GitCommand(2*time.Second, gitRoot, "remote", "get-url", name)
+	out, err := cmd.Output()
+	if err != nil {
+		return ""
+	}
+	return strings.TrimSpace(string(out))
+}
+
+func listRemotes(gitRoot string) []string {
+	cmd := GitCommand(2*time.Second, gitRoot, "remote")
+	out, err := cmd.Output()
+	if err != nil {
+		return nil
+	}
+	lines := strings.Split(strings.TrimSpace(string(out)), "\n")
+	names := make([]string, 0, len(lines))
+	for _, line := range lines {
+		n := strings.TrimSpace(line)
+		if n != "" {
+			names = append(names, n)
+		}
+	}
+	return names
+}
+
+// githubHTTPRE matches the path portion of an HTTPS / http GitHub URL.
+// Group 1 = owner, group 2 = repo (without `.git`).
+var githubHTTPRE = regexp.MustCompile(`(?i)^https?://github\.com/([A-Za-z0-9._-]+)/([A-Za-z0-9._-]+?)(?:\.git)?/?$`)
+
+// githubSCPRE matches git@github.com:owner/repo[.git] (SCP-style).
+// Group 1 = owner, group 2 = repo (without `.git`).
+var githubSCPRE = regexp.MustCompile(`(?i)^git@github\.com:([A-Za-z0-9._-]+)/([A-Za-z0-9._-]+?)(?:\.git)?$`)
+
+// githubSSHRE matches ssh://[user@]github.com/owner/repo[.git].
+// Group 1 = owner, group 2 = repo (without `.git`).
+var githubSSHRE = regexp.MustCompile(`(?i)^ssh://(?:[^@/]+@)?github\.com/([A-Za-z0-9._-]+)/([A-Za-z0-9._-]+?)(?:\.git)?/?$`)
+
+func normalizeGitHubURL(raw string) string {
+	raw = strings.TrimSpace(raw)
+	if raw == "" {
+		return ""
+	}
+	for _, re := range []*regexp.Regexp{githubHTTPRE, githubSCPRE, githubSSHRE} {
+		m := re.FindStringSubmatch(raw)
+		if m == nil {
+			continue
+		}
+		owner := strings.TrimSpace(m[1])
+		repo := strings.TrimSpace(m[2])
+		if owner == "" || repo == "" {
+			return ""
+		}
+		return "https://github.com/" + owner + "/" + repo
+	}
+	return ""
+}
diff --git a/internal/ui/static/index.html b/internal/ui/static/index.html
index 485b9b3..c128aef 100644
--- a/internal/ui/static/index.html
+++ b/internal/ui/static/index.html
@@ -409,6 +409,48 @@
             word-break: break-all;
         }
 
+        /* Main row hosts a flex layout (name + optional GitHub link icon). */
+        .wt-item-main .wt-name {
+            display: flex;
+            align-items: center;
+            gap: 6px;
+        }
+
+        .wt-item-main .wt-name-text {
+            flex: 1;
+            min-width: 0;
+        }
+
+        .wt-github-link {
+            flex-shrink: 0;
+            margin-left: auto;
+            display: inline-flex;
+            align-items: center;
+            justify-content: center;
+            color: var(--text-muted);
+            border-radius: 3px;
+            padding: 1px 2px;
+            text-decoration: none;
+            transition: color 0.15s, background 0.15s;
+        }
+
+        .wt-github-link:hover {
+            color: var(--text-primary);
+            background: var(--hover-bg);
+        }
+
+        .wt-github-link:focus-visible {
+            outline: 2px solid var(--active-color);
+            outline-offset: 1px;
+        }
+
+        .wt-github-link svg {
+            width: 14px;
+            height: 14px;
+            fill: currentColor;
+            display: block;
+        }
+
         .wt-branch {
             font-size: 11px;
             color: var(--text-muted);
@@ -1355,6 +1397,16 @@
         let knownServerRev = "";
         let serverRevReloading = false;
 
+        // escapeHtml neutralises the five HTML metacharacters so that
+        // user-controlled strings (worktree names, branch labels) can be
+        // safely interpolated into innerHTML templates.
+        const escapeHtml = (s) => String(s ?? "")
+            .replace(/&/g, "&amp;")
+            .replace(/</g, "&lt;")
+            .replace(/>/g, "&gt;")
+            .replace(/"/g, "&quot;")
+            .replace(/'/g, "&#39;");
+
         // Global State
         let state = {
             worktrees: [],
@@ -1803,10 +1855,10 @@
 
                 return `
                 <div class="wt-actions">
-                    <span class="wt-action-btn ${isTermLoading ? 'loading' : ''}" title="Open Terminal" onclick="openTerminal('${id}', event)">
+                    <span class="wt-action-btn ${isTermLoading ? 'loading' : ''}" title="Open Terminal" onclick="openTerminal('${escapeHtml(id)}', event)">
                         ${termIcon}
                     </span>
-                    <span class="wt-action-btn ${isFinderLoading ? 'loading' : ''}" title="Open Finder" onclick="openFinder('${id}', event)">
+                    <span class="wt-action-btn ${isFinderLoading ? 'loading' : ''}" title="Open Finder" onclick="openFinder('${escapeHtml(id)}', event)">
                         ${finderIcon}
                     </span>
                 </div>`;
@@ -1816,11 +1868,26 @@
             if (state.mainRepo) {
                 const branchLabel = state.mainRepo.branch;
                 const isMainActive = state.activeWT === MAIN_WT_ID;
+                // GitHub link is rendered only when the backend resolved a
+                // github.com remote. Older backends that don't expose this
+                // field also leave the icon hidden (falsy short-circuit).
+                const githubUrl = state.mainRepo.github_url;
+                const githubLinkHtml = githubUrl ? `
+                    <a class="wt-github-link" href="${encodeURI(githubUrl)}" target="_blank" rel="noopener noreferrer"
+                       title="Open GitHub repository" aria-label="Open GitHub repository in a new tab"
+                       onclick="event.stopPropagation();">
+                        <svg viewBox="0 0 24 24" aria-hidden="true" focusable="false">
+                            <path d="M12 .5C5.65.5.5 5.65.5 12c0 5.08 3.29 9.39 7.86 10.91.58.11.79-.25.79-.56 0-.28-.01-1.02-.02-2-3.2.7-3.87-1.54-3.87-1.54-.52-1.33-1.27-1.69-1.27-1.69-1.04-.71.08-.7.08-.7 1.15.08 1.76 1.18 1.76 1.18 1.02 1.76 2.69 1.25 3.34.96.1-.74.4-1.25.72-1.54-2.55-.29-5.24-1.28-5.24-5.7 0-1.26.45-2.29 1.18-3.1-.12-.29-.51-1.46.11-3.04 0 0 .97-.31 3.18 1.18a11.1 11.1 0 0 1 5.79 0c2.21-1.5 3.18-1.18 3.18-1.18.63 1.58.24 2.75.12 3.04.74.81 1.18 1.84 1.18 3.1 0 4.43-2.7 5.41-5.26 5.69.41.36.78 1.06.78 2.14 0 1.55-.01 2.79-.01 3.17 0 .31.21.68.8.56C20.21 21.39 23.5 17.08 23.5 12 23.5 5.65 18.35.5 12 .5Z"/>
+                        </svg>
+                    </a>` : '';
                 html += `
             <li class="wt-item wt-item-main ${isMainActive ? 'active' : ''}" onclick="selectWorktree(MAIN_WT_ID)">
-              <div class="wt-name">${state.mainRepo.name}</div>
+              <div class="wt-name">
+                <span class="wt-name-text">${escapeHtml(state.mainRepo.name)}</span>
+                ${githubLinkHtml}
+              </div>
               <div class="wt-branch">
-                <span>🏠</span> ${branchLabel}
+                <span>🏠</span> ${escapeHtml(branchLabel)}
                 <div style="margin-left: auto; display: flex; gap: 4px; align-items: center;">
                     ${shortcuts(MAIN_WT_ID)}
                 </div>
@@ -1835,14 +1902,15 @@
             // Regular worktrees
             html += state.worktrees.map(w => {
                 const isActive = state.activeWT === w.id;
+                const wIdEsc = escapeHtml(w.id);
                 return `
-            <li class="wt-item ${isActive ? 'active' : ''}" onclick="selectWorktree('${w.id}')">
-              <div class="wt-name">${w.name}</div>
+            <li class="wt-item ${isActive ? 'active' : ''}" onclick="selectWorktree('${wIdEsc}')">
+              <div class="wt-name">${escapeHtml(w.name)}</div>
               <div class="wt-branch">
-                <span>🌱</span> ${w.branch}
+                <span>🌱</span> ${escapeHtml(w.branch)}
                 <div style="margin-left: auto; display: flex; gap: 4px; align-items: center;">
                     ${shortcuts(w.id)}
-                    ${isActive ? `<span style="font-size:10px;cursor:pointer;padding:2px 4px;" onclick="deleteWorktree('${w.id}', event)">✕</span>` : ''}
+                    ${isActive ? `<span style="font-size:10px;cursor:pointer;padding:2px 4px;" onclick="deleteWorktree('${wIdEsc}', event)">✕</span>` : ''}
                 </div>
               </div>
             </li>

From 231ebf98ed4aea31c0fba817b8fbe17ae9b9a5d7 Mon Sep 17 00:00:00 2001
From: linletian <linletian@users.noreply.github.com>
Date: Fri, 19 Jun 2026 12:24:43 +0800
Subject: [PATCH 3/5] fix(gitx): accept arbitrary SSH user in SCP-style GitHub
 URLs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The githubSCPRE regex hardcoded 'git@github.com:...' as the only
recognized SCP-style prefix. Repositories whose origin URL uses a
non-'git' username (e.g. a '\~/.ssh/config' alias mapping
'github.com' to 'User mywork', or a CI bot configured as
'ci-bot@github.com:...') would silently fail to surface a GitHub
icon in the sidebar — the URL was still valid, but the resolver
returned '' so the icon was never rendered.

Loosen the regex to '[^@/]+@github\.com:...' so it accepts any
non-empty user segment, mirroring the existing githubSSHRE pattern
and bringing the two ssh-shaped forms back into symmetry.

- remote.go: relax githubSCPRE; update Go doc to mention arbitrary
  user and replace the misleading 'default SSH port only' line.
- gitx_test.go: add three new parse cases (ssh config alias user,
  CI bot user, dotted user) so the relaxation is covered.
- docs/API.md: update the supported URL formats list to call out
  the arbitrary user segment.

No behavior change for existing 'git@' URLs; tests + vet + build
all green.
---
 docs/API.md                |  2 +-
 internal/gitx/gitx_test.go |  3 +++
 internal/gitx/remote.go    | 12 +++++++++---
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/docs/API.md b/docs/API.md
index df28e19..e0defdd 100644
--- a/docs/API.md
+++ b/docs/API.md
@@ -43,7 +43,7 @@ Response:
 - `github_url`: when the main repo has a git remote pointing at `github.com`, returns the canonical `https://github.com/<owner>/<repo>` URL; otherwise returns an empty string. Resolution order:
   1. `git remote get-url origin` (preferred).
   2. If `origin` is missing or not parseable, fall back to iterating `git remote` and trying each remote in declared order.
-  3. Supported URL formats: `git@github.com:owner/repo.git` (SCP-style), `https://github.com/owner/repo.git`, `ssh://[user@]github.com/owner/repo.git` (no explicit port — `ssh://git@github.com:22/...` is **not** recognized). The `.git` suffix and a trailing `/` are stripped.
+  3. Supported URL formats: `<user>@github.com:owner/repo.git` (SCP-style; the user segment is arbitrary — `git` is the conventional default, but `~/.ssh/config` aliases and CI bots commonly use other usernames), `https://github.com/owner/repo.git`, `ssh://[user@]github.com/owner/repo.git` (no explicit port — `ssh://git@github.com:22/...` is **not** recognized). The `.git` suffix and a trailing `/` are stripped.
   4. Only host `github.com` (case-insensitive) is recognized. GitHub Enterprise (`*.ghe.com`, self-hosted) and any non-GitHub host (GitLab, Bitbucket, local paths, `file://`) yield an empty string.
   5. The field is always present in the JSON response (an empty string means "no GitHub link to show").
 
diff --git a/internal/gitx/gitx_test.go b/internal/gitx/gitx_test.go
index c34c121..cde2dc3 100644
--- a/internal/gitx/gitx_test.go
+++ b/internal/gitx/gitx_test.go
@@ -62,6 +62,9 @@ func TestGitHubURL(t *testing.T) {
 	}{
 		{"scp style", "git@github.com:owner/repo.git", "https://github.com/owner/repo"},
 		{"scp style no .git", "git@github.com:owner/repo", "https://github.com/owner/repo"},
+		{"scp style with ssh config alias user", "mywork@github.com:owner/repo.git", "https://github.com/owner/repo"},
+		{"scp style with ci bot user", "ci-bot@github.com:owner/repo.git", "https://github.com/owner/repo"},
+		{"scp style with dotted user", "first.last@github.com:owner/repo.git", "https://github.com/owner/repo"},
 		{"https", "https://github.com/owner/repo.git", "https://github.com/owner/repo"},
 		{"https no .git", "https://github.com/owner/repo", "https://github.com/owner/repo"},
 		{"https trailing slash", "https://github.com/owner/repo.git/", "https://github.com/owner/repo"},
diff --git a/internal/gitx/remote.go b/internal/gitx/remote.go
index 646ed5a..56ead7d 100644
--- a/internal/gitx/remote.go
+++ b/internal/gitx/remote.go
@@ -16,7 +16,9 @@ import (
 //     remote in declared order.
 //
 // Supported URL formats (after leading/trailing whitespace is trimmed):
-//   - git@github.com:owner/repo.git       (SCP-style, default SSH port only)
+//   - <user>@github.com:owner/repo.git     (SCP-style; user is arbitrary —
+//     `git` is the conventional default, but `~/.ssh/config` aliases and CI
+//     bots commonly use other usernames such as `mywork` or `ci-bot`)
 //   - https://github.com/owner/repo.git
 //   - http://github.com/owner/repo.git
 //   - ssh://[user@]github.com/owner/repo.git (no explicit port)
@@ -83,9 +85,13 @@ func listRemotes(gitRoot string) []string {
 // Group 1 = owner, group 2 = repo (without `.git`).
 var githubHTTPRE = regexp.MustCompile(`(?i)^https?://github\.com/([A-Za-z0-9._-]+)/([A-Za-z0-9._-]+?)(?:\.git)?/?$`)
 
-// githubSCPRE matches git@github.com:owner/repo[.git] (SCP-style).
+// githubSCPRE matches <user>@github.com:owner/repo[.git] (SCP-style).
+// The user segment is intentionally arbitrary: the SSH `git@` prefix is
+// just a convention; `~/.ssh/config` aliases and CI bots commonly use
+// other usernames (e.g. `mywork@`, `ci-bot@`). The `[^@/]+` shape mirrors
+// `githubSSHRE` below so the two ssh-shaped forms are treated symmetrically.
 // Group 1 = owner, group 2 = repo (without `.git`).
-var githubSCPRE = regexp.MustCompile(`(?i)^git@github\.com:([A-Za-z0-9._-]+)/([A-Za-z0-9._-]+?)(?:\.git)?$`)
+var githubSCPRE = regexp.MustCompile(`(?i)^[^@/]+@github\.com:([A-Za-z0-9._-]+)/([A-Za-z0-9._-]+?)(?:\.git)?$`)
 
 // githubSSHRE matches ssh://[user@]github.com/owner/repo[.git].
 // Group 1 = owner, group 2 = repo (without `.git`).

From 6a70d72573efd33d483c5f0d5de85ab58bfbcfd7 Mon Sep 17 00:00:00 2001
From: Letian Lin <lin@letian.name>
Date: Sat, 20 Jun 2026 19:44:09 +0800
Subject: [PATCH 4/5] refactor(gitx): consolidate listRemotes into exported
 ListRemotes

PR #40 (GitHub sidebar link) and PR #42 (branch divergence detection) both
inlined a ~10-line `git remote` parser in their respective files. Git's
content-level merge cannot detect duplicate top-level symbols across files,
so the collision only surfaced as a Go compiler error after the merge. The
fix was to drop the divergent.go copy in the merge commit, leaving a single
implementation in remote.go.

This commit goes one step further: move that single implementation to a
new remotes.go file and export it as ListRemotes, so future features that
need the same helper have a clearly signposted canonical entry point
instead of being tempted to inline their own copy.

No behavior change. The two existing callers (GitHubURL in remote.go and
effectiveHead in diverged.go) now invoke ListRemotes directly.
---
 internal/gitx/diverged.go |  4 ++--
 internal/gitx/remote.go   | 19 +------------------
 internal/gitx/remotes.go  | 39 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 20 deletions(-)
 create mode 100644 internal/gitx/remotes.go

diff --git a/internal/gitx/diverged.go b/internal/gitx/diverged.go
index 1d72a84..bddca18 100644
--- a/internal/gitx/diverged.go
+++ b/internal/gitx/diverged.go
@@ -106,7 +106,7 @@ func effectiveHead(gitRoot, branch string) (string, error) {
 
 		var maxRemoteAhead int
 		var maxRemoteHead string
-		for _, remote := range listRemotes(gitRoot) {
+		for _, remote := range ListRemotes(gitRoot) {
 			if remote == "origin" {
 				continue
 			}
@@ -132,7 +132,7 @@ func effectiveHead(gitRoot, branch string) (string, error) {
 	if remoteHeadVal := remoteHead(gitRoot, "origin", branch); remoteHeadVal != "" {
 		return remoteHeadVal, nil
 	}
-	for _, remote := range listRemotes(gitRoot) {
+	for _, remote := range ListRemotes(gitRoot) {
 		if remote == "origin" {
 			continue
 		}
diff --git a/internal/gitx/remote.go b/internal/gitx/remote.go
index 56ead7d..af39771 100644
--- a/internal/gitx/remote.go
+++ b/internal/gitx/remote.go
@@ -39,7 +39,7 @@ func GitHubURL(gitRoot string) string {
 			return url
 		}
 	}
-	for _, name := range listRemotes(gitRoot) {
+	for _, name := range ListRemotes(gitRoot) {
 		if name == "origin" {
 			continue
 		}
@@ -64,23 +64,6 @@ func getRemoteURL(gitRoot, name string) string {
 	return strings.TrimSpace(string(out))
 }
 
-func listRemotes(gitRoot string) []string {
-	cmd := GitCommand(2*time.Second, gitRoot, "remote")
-	out, err := cmd.Output()
-	if err != nil {
-		return nil
-	}
-	lines := strings.Split(strings.TrimSpace(string(out)), "\n")
-	names := make([]string, 0, len(lines))
-	for _, line := range lines {
-		n := strings.TrimSpace(line)
-		if n != "" {
-			names = append(names, n)
-		}
-	}
-	return names
-}
-
 // githubHTTPRE matches the path portion of an HTTPS / http GitHub URL.
 // Group 1 = owner, group 2 = repo (without `.git`).
 var githubHTTPRE = regexp.MustCompile(`(?i)^https?://github\.com/([A-Za-z0-9._-]+)/([A-Za-z0-9._-]+?)(?:\.git)?/?$`)
diff --git a/internal/gitx/remotes.go b/internal/gitx/remotes.go
new file mode 100644
index 0000000..ae67340
--- /dev/null
+++ b/internal/gitx/remotes.go
@@ -0,0 +1,39 @@
+package gitx
+
+import (
+	"strings"
+	"time"
+)
+
+// ListRemotes returns the names of all git remotes configured for the
+// repository at gitRoot, with surrounding whitespace stripped and empty
+// entries dropped. The returned slice is in the order `git remote` reports
+// them — typically origin first, but callers should not rely on this for
+// correctness; treat it as "best-effort priority" and explicitly prefer
+// "origin" when needed.
+//
+// On any error (git not installed, timeout, non-git directory, etc.) the
+// function returns nil so callers can use a plain `len(result) == 0` check
+// to fall back to local-only logic. The 2-second timeout matches the rest
+// of the gitx package's helper conventions.
+//
+// This is the single source of truth for "what remotes does this repo
+// have?". Use it instead of inlining `git remote` parsing — the original
+// duplicate copies of this logic in remote.go and diverged.go were
+// consolidated here so future features only need to call ListRemotes.
+func ListRemotes(gitRoot string) []string {
+	cmd := GitCommand(2*time.Second, gitRoot, "remote")
+	out, err := cmd.Output()
+	if err != nil {
+		return nil
+	}
+	lines := strings.Split(strings.TrimSpace(string(out)), "\n")
+	names := make([]string, 0, len(lines))
+	for _, line := range lines {
+		n := strings.TrimSpace(line)
+		if n != "" {
+			names = append(names, n)
+		}
+	}
+	return names
+}
\ No newline at end of file

From ef62f78ba04d3cdd5954a7540720ab21d4451f60 Mon Sep 17 00:00:00 2001
From: Letian Lin <lin@letian.name>
Date: Sat, 20 Jun 2026 20:10:01 +0800
Subject: [PATCH 5/5] style(gitx): add trailing newline to remotes.go

`gofmt -l` on Linux/macOS CI rejects the file without a trailing
newline. Run gofmt to comply.
---
 internal/gitx/remotes.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/internal/gitx/remotes.go b/internal/gitx/remotes.go
index ae67340..7dd8012 100644
--- a/internal/gitx/remotes.go
+++ b/internal/gitx/remotes.go
@@ -36,4 +36,4 @@ func ListRemotes(gitRoot string) []string {
 		}
 	}
 	return names
-}
\ No newline at end of file
+}