source-code-mgmt 1.1.0 → 1.5.0

package/lib/client.js

@@ -1,10 +1,18 @@
 /**
  * source-code-mgmt — browser half (client.js).
  *
- * Classic-script plugin bundle (no build step): registers into the sidebar
- * footer via the official `sidebar.footer.action` list slot with a negative
- * order so the trigger renders at the bottom of the left rail (above other
- * footer entries). Clicking the trigger opens a "源代码管理" panel with:
+ * Classic-script plugin bundle (no build step). On activation it detects
+ * whether dsh-better-sidebar is installed (a single in-memory `ctx.get`,
+ * zero I/O — does not slow DSH startup):
+ *
+ *   - branch A: dsh-better-sidebar installed → register「代码管理」as a new
+ *     sidebar Tab page through `ctx.betterSidebar.registerTab`.
+ *   - branch B: not installed → render a floating button pinned to the top
+ *     right; clicking expands a right-side drawer (like better-sidebar's
+ *     right rail) holding the existing panel.
+ *
+ * The old left-rail bottom button (`sidebar.footer.action` slot) is removed.
+ * Either way clicking the entry opens a "源代码管理" panel with:
  *
  *   1. 环境检查 — git / gh presence & version
  *   2. SSH — key presence, ed25519 generation, github.com ssh config, test
@@ -70,12 +78,50 @@ window.__ModuleLoader__.load({
 			ssh: null,
 			defDir: null,
 			repo: null,
+			// 各工作区的 full 同步结果（dir -> repo 状态），打开 DSH 时预取，切换工作区可秒显。
+			reposByDir: {},
+			// 单文件改动 diff 缓存（"dir\u0000path" -> diff 文本），点击「查看」秒出。
+			diffs: {},
 			workspaces: [],
 			customDirs: [],
 			ready: false,
 		};
 		let preloadPromise = null;
 
+		/** 清空某个目录（或全部）的 diff 缓存，避免切目录后残留上一个目录的文件 diff。 */
+		function clearDiffCache(dir) {
+			if (!dir) { cache.diffs = {}; return }
+			const prefix = dir + "\u0000"
+			for (const key of Object.keys(cache.diffs)) {
+				if (key.startsWith(prefix)) delete cache.diffs[key]
+			}
+		}
+
+		/** 并发上限 N 地预取一批改动文件的 diff，结果写入 cache.diffs，用于点击「查看」秒出。
+		 *  纯本地 git 读取（host 端 /repo-diff），并发低、不阻塞主流程，后台慢慢填。 */
+		async function prefetchDiffs(dir, files, limit) {
+			if (!dir || !Array.isArray(files) || files.length === 0) return;
+			let i = 0
+			const worker = async () => {
+				while (i < files.length) {
+					const f = files[i++]
+					if (!f || typeof f !== "object") continue
+					const key = dir + "\u0000" + f.path
+					if (cache.diffs[key] !== undefined) continue
+					try {
+						// untracked 新文件 git 不跟踪，无 diff，直接标记为空。
+						if (f.type === "untracked") { cache.diffs[key] = ""; continue }
+						const r = await jget("/repo-diff?dir=" + encodeURIComponent(dir) + "&path=" + encodeURIComponent(f.path)).catch(() => null)
+						cache.diffs[key] = (r && typeof r.diff === "string") ? r.diff : null
+					} catch { cache.diffs[key] = null }
+				}
+			}
+			const n = Math.max(1, Math.min(limit || 3, files.length || 1))
+			const workers = []
+			for (let k = 0; k < n; k++) workers.push(worker())
+			await Promise.all(workers)
+		}
+
 		/** 预取 env / ssh / default-dir / repo / workspaces，结果写入 cache。可并发安全。 */
 		function preload() {
 			if (!preloadPromise) {
@@ -97,7 +143,19 @@ window.__ModuleLoader__.load({
 						}
 						if (def && def.dir) {
 							cache.defDir = def.dir;
-							cache.repo = await jget("/repo?dir=" + encodeURIComponent(def.dir)).catch(() => null);
+						}
+						// 打开 DSH 时即对所有工作区做一次完整同步（full=1 会 git fetch 联网），
+						// 这样点开「代码管理」或切换任意工作区都直接显示已同步的最新状态，无需再等。
+						// 用并发上限 5 控制，避免一次性对大量仓库同时打满网络。
+						const dirs = Array.from(new Set([
+							...(cache.workspaces || []),
+							...(cache.customDirs || []),
+							...(def && def.dir ? [def.dir] : []),
+						].filter(Boolean)))
+						await syncAllRepos(dirs, 5)
+						// 默认工作区的同步结果作为面板首次秒显内容。
+						if (def && def.dir && cache.reposByDir[def.dir]) {
+							cache.repo = cache.reposByDir[def.dir];
 						}
 						cache.ready = true;
 					} catch {
@@ -107,6 +165,24 @@ window.__ModuleLoader__.load({
 			}
 			return preloadPromise;
 		}
+
+		/** 并发上限 N 地对所有目录做 full 同步，结果写入 cache.reposByDir[dir]。 */
+		async function syncAllRepos(dirs, limit) {
+			let i = 0
+			const worker = async () => {
+				while (i < dirs.length) {
+					const d = dirs[i++]
+					try {
+						const r = await jget("/repo?dir=" + encodeURIComponent(d) + "&full=1").catch(() => null)
+						if (r) cache.reposByDir[d] = r
+					} catch { /* 单个失败不影响其他 */ }
+				}
+			}
+			const workers = []
+			const n = Math.max(1, Math.min(limit || 5, dirs.length || 1))
+			for (let k = 0; k < n; k++) workers.push(worker())
+			await Promise.all(workers)
+		}
 		/** 忽略缓存强制重新拉取某个资源并更新 cache。 */
 		async function refreshCache(key) {
 			if (key === "env") cache.env = await jget("/env").catch(() => cache.env);
@@ -125,9 +201,6 @@ window.__ModuleLoader__.load({
 		// ---------- small presentational bits ----------
 		const h = React.createElement;
 
-		function Dot({ color }) {
-			return h("span", { style: { color, marginRight: 4 } }, "●");
-		}
 		function Field({ label, value, children }) {
 			return h("div", { style: { display: "flex", alignItems: "center", gap: 8, marginBottom: 6 } },
 				h("span", { style: { color: T.secondary, fontSize: 13, width: 84, flexShrink: 0 } }, label),
@@ -159,20 +232,59 @@ window.__ModuleLoader__.load({
 				},
 			}, label);
 		}
-		function Box({ title, children }) {
+		function Box({ title, badge, defaultCollapsed, collapsible, titleExtra, collapsed: controlledCollapsed, onToggle, children }) {
+			// 每个部分默认可折叠：标题行右侧一个「折叠/展开」按钮，点击收起只显示标题。
+			// defaultCollapsed 控制初始是否收起（如①环境检查全就绪时默认折叠）。
+			// titleExtra：标题行里标题与折叠按钮之间的额外内容（如②的平台切换下拉），
+			//            折叠时仍可见、可交互（切换平台会由调用方触发展开）。
+			// 受控模式：传入 collapsed/onToggle 时由父组件接管折叠状态（用于「切换标题行控件
+			//            后自动展开」）；否则用内部 state。
+			const [inner, setInner] = useState(!!defaultCollapsed);
+			const collapsed = controlledCollapsed !== undefined ? !!controlledCollapsed : inner;
+			const setCollapsed = controlledCollapsed !== undefined ? onToggle : setInner;
+			const canCollapse = collapsible !== false;
 			return h("div", { style: { border: "1px solid " + T.border, borderRadius: 12, padding: 14 } },
-				h("div", { style: { fontSize: 13, fontWeight: 600, color: T.label, marginBottom: 10 } }, title),
-				children
+				h("div", { style: { display: "flex", alignItems: "center", gap: 8, flexWrap: "wrap" } },
+					h("span", { style: { fontSize: 13, fontWeight: 600, color: T.label, flexShrink: 0, minWidth: 0 } }, title),
+					titleExtra || null,
+					badge ? h("span", { style: { fontSize: 12, color: T.success, flexShrink: 0, whiteSpace: "nowrap" } }, badge) : null,
+					canCollapse ? h("span", { style: { flex: 1 } }) : null,
+					canCollapse ? h("button", {
+						type: "button",
+						title: collapsed ? "展开" : "折叠",
+						"aria-label": collapsed ? "展开该部分" : "折叠该部分",
+						onClick: () => setCollapsed(!collapsed),
+						style: collapseBtnStyle(),
+					}, collapsed ? "▸" : "▾") : null
+				),
+				collapsed ? null : h("div", { style: { marginTop: 10 } }, children)
 			);
 		}
+		// 折叠/展开按钮样式（标题行右侧的小圆角按钮）。
+		function collapseBtnStyle() {
+			return {
+				appearance: "none", border: "none", background: "transparent",
+				color: T.secondary, cursor: "pointer", fontSize: 14, lineHeight: 1,
+				width: 24, height: 24, borderRadius: 6, flexShrink: 0, padding: 0,
+				display: "inline-flex", alignItems: "center", justifyContent: "center",
+			};
+		}
 		function pre(code) {
 			return h("pre", { style: { whiteSpace: "pre-wrap", fontFamily: "var(--ds-font-family-code, ui-monospace, monospace)", fontSize: 12, lineHeight: 1.6, color: T.secondary, margin: 0 } }, code);
 		}
 
 		// ---------- section 1: 环境检查 ----------
+		// 每类工具缺失时给出安装命令 + 「一键安装」按钮（best-effort，走 host 自动选包管理器）。
+		const INSTALL_HINTS = {
+			git: "winget install --id Git.Git -e",
+			gh: "winget install --id GitHub.cli -e",
+			ssh: "Add-WindowsCapability -Online -Name OpenSSH.Client",
+		};
 		function EnvSection() {
 			const [env, setEnv] = useState(() => cache.env);
 			const [err, setErr] = useState(null);
+			const [installing, setInstalling] = useState(null); // 'git'|'gh'|'ssh'|null
+			const [installResult, setInstallResult] = useState(null);
 			const load = useCallback(async () => {
 				setErr(null);
 				// 先读缓存（DSH 打开时已预取），再后台刷新保持最新
@@ -182,16 +294,54 @@ window.__ModuleLoader__.load({
 			}, []);
 			useEffect(() => { void preload().then(load); }, [load]);
 
-			return h(Box, { title: "① 环境检查" },
+			// 一键安装：调用 host 选定包管理器安装缺失工具，成功后重新检测。
+			const doInstall = useCallback(async (tool) => {
+				setInstalling(tool); setInstallResult(null);
+				try {
+					const r = await jpost("/install-tool", { tool });
+					setInstallResult(r);
+					if (r.ok) void load();
+				} catch (e) { setInstallResult({ ok: false, tool, error: String(e) }); }
+				finally { setInstalling(null); }
+			}, [load]);
+
+			// 是否所有工具都就绪（git / gh / ssh 均已安装）——就绪时该部分默认折叠，
+			// 只显示「① 环境检查」标题 + 「均存在」提示；否则默认展开让用户看到缺什么。
+			const allPresent = !!(cache.env && cache.env.git && cache.env.git.installed
+				&& cache.env.gh && cache.env.gh.installed
+				&& cache.env.ssh && cache.env.ssh.installed);
+			const winOs = (env && env.platform === "win32");
+
+			// 渲染单个工具行；缺失时带安装命令 + 安装按钮。
+			const toolRow = (tool, label, installed, version) => {
+				const hint = INSTALL_HINTS[tool] || ""
+				const status = installed
+					? h("span", { style: { color: T.label, fontSize: 13 } }, "✅ " + (version || "已安装"))
+					: h("span", { style: { display: "inline-flex", alignItems: "center", gap: 8 } },
+						h("span", { style: { color: T.danger, fontSize: 13 } }, "❌ 未安装"),
+						h("button", { type: "button", title: "复制安装命令", disabled: installing !== null, style: changeBtnStyle(), onClick: (e) => { e.stopPropagation(); void copyText(hint); } }, "复制安装命令"),
+						h("button", { type: "button", title: "一键安装（会自动选包管理器）", disabled: installing !== null, style: { ...changeBtnStyle(), color: T.brand, fontWeight: 600 }, onClick: (e) => { e.stopPropagation(); void doInstall(tool); } }, installing === tool ? "安装中…" : "安装")
+					)
+				const feedback = installResult && installResult.tool === tool
+					? (installResult.ok
+						? h("div", { style: { marginTop: 4, color: T.success, fontSize: 12 } }, "✅ " + (installResult.command || "已安装") + " 执行成功" + (installResult.needElevation ? "（如未生效需以管理员身份重试）" : ""))
+						: h("div", { style: { marginTop: 4, color: T.danger, fontSize: 12 } }, "❌ " + (installResult.error || "安装失败") + (installResult.command ? "：" + installResult.command : "")))
+					: null
+				return h("div", { key: tool, style: { marginTop: 4 } },
+					h(Field, { label }, status),
+					feedback
+				)
+			}
+
+			return h(Box, { title: "① 环境检查", badge: allPresent ? "✅ 均存在" : null, defaultCollapsed: !!allPresent },
 				h(Field, { label: "操作系统" }, h("span", { style: { color: T.label, fontSize: 13 } }, env ? (env.platformLabel || env.platform) : "...")),
 				env ? h(React.Fragment, null,
-					h(Field, { label: "Git", value: env.git.installed ? "✅ " + env.git.version : "❌ 未安装" }),
-					h(Field, { label: "GitHub CLI", value: env.gh.installed ? "✅ " + env.gh.version : "❌ 未安装" }),
-					h(Field, { label: "SSH", value: env.ssh && env.ssh.installed ? "✅ 已找到" : "❌ 未找到" })
+					toolRow("git", "Git", env.git.installed, env.git.version),
+					toolRow("gh", "GitHub CLI", env.gh.installed, env.gh.version),
+					toolRow("ssh", "SSH", !!(env.ssh && env.ssh.installed), env.ssh && env.ssh.installed ? "已找到" : null)
 				) : h(Field, { label: "检测中", value: err ? "失败: " + err : "…" }),
-				(!env || !env.git.installed || !env.gh.installed) ? h("div", { style: { marginTop: 8 } },
-					h("span", { style: { color: T.warn, fontSize: 12 } },
-						"未安装工具请先安装 Git for Windows 和 GitHub CLI，然后重启。" + (err ? "（" + err + "）" : ""))
+				(!env || !env.git.installed || !env.gh.installed || !(env.ssh && env.ssh.installed)) ? h("div", { style: { marginTop: 8, fontSize: 12, color: T.secondary, lineHeight: 1.6 } },
+					"未找到的工具可用上方「安装」按钮一键安装（" + (winOs ? "Windows 用 winget / 内置功能" : "用系统包管理器") + "，可能需管理员权限）；也可手动复制安装命令执行，安装后点「重新检查」。"
 				) : h(Btn, { label: "重新检查", onClick: load, tone: "ghost" })
 			);
 		}
@@ -205,6 +355,8 @@ window.__ModuleLoader__.load({
 			// 平台状态由 ScmPanel 共享（②里选择，③跟随）
 			const prov = provider || "github";
 			const setProv = setProvider || (() => {});
+			// ② 默认折叠；在标题行也能切平台，切换时自动展开（因为要做后续配置）。
+			const [collapsed, setCollapsed] = useState(true);
 
 			const load = useCallback(async () => {
 				setErr(null);
@@ -232,23 +384,30 @@ window.__ModuleLoader__.load({
 				: !!(ssh && ssh.sshGitHubConfigured);
 			const providerHost = prov === "gitee" ? "gitee.com" : "github.com";
 
-			return h(Box, { title: "② SSH 密钥与连接" },
-				// 平台选择（默认 GitHub），③代码管理跟随
-				h("div", { style: { display: "flex", alignItems: "center", gap: 8, marginBottom: 10 } },
-					h("span", { style: { color: T.secondary, fontSize: 13, width: 84, flexShrink: 0 } }, "平台"),
-					h("select", {
-						value: prov,
-						onChange: (e) => setProv(e.target.value),
-						title: "选择代码托管平台：GitHub 或 Gitee（默认 GitHub），③代码管理会跟随切换",
-						style: { font: "inherit", fontSize: 13, padding: "6px 10px", border: "1px solid " + T.border, borderRadius: 8, background: T.layer1, color: T.label, outline: "none", cursor: "pointer" },
-					},
-						h("option", { value: "github" }, "GitHub（默认）"),
-						h("option", { value: "gitee" }, "Gitee"),
-					)
-				),
-				// key status
+			// 标题行的平台切换下拉：折叠时也可见、可交互；切换后自动展开（要做配置）。
+			const titleExtra = h("span", { style: { display: "inline-flex", alignItems: "center", gap: 6, flexShrink: 0 } },
+				h("span", { style: { fontSize: 12, color: T.secondary } }, "平台"),
+				h("select", {
+					value: prov,
+					onChange: (e) => { setProv(e.target.value); setCollapsed(false); },
+					title: "选择代码托管平台：GitHub 或 Gitee（默认 GitHub），③代码管理会跟随切换",
+					style: { font: "inherit", fontSize: 12, padding: "3px 6px", border: "1px solid " + T.border, borderRadius: 6, background: T.layer1, color: T.label, outline: "none", cursor: "pointer" },
+				},
+					h("option", { value: "github" }, "GitHub（默认）"),
+					h("option", { value: "gitee" }, "Gitee"),
+				)
+			);
+
+			return h(Box, {
+				title: "② SSH 密钥与连接",
+				defaultCollapsed: true,
+				collapsed,
+				onToggle: (v) => setCollapsed(v),
+				titleExtra,
+			},
+				// key status（显示实际检测到的密钥名，可能不是 id_ed25519）
 				h(Field, { label: "密钥" }, h("span", { style: { color: T.label, fontSize: 13 } },
-					ssh ? (ssh.hasKey ? "✅ id_ed25519 已生成" : "⚠️ 未生成") : "…")
+					ssh ? (ssh.hasKey ? "✅ " + (ssh.keyBase || "id_ed25519") + " 已生成" : "⚠️ 未生成") : "…")
 				),
 				h(Field, { label: "GH 登录" }, h("span", { style: { color: T.label, fontSize: 13 } },
 					ssh ? (ssh.ghLoggedIn ? "✅ " + (ssh.ghAccount || "已登录") : "⚠️ 未登录") : "…")
@@ -289,6 +448,11 @@ window.__ModuleLoader__.load({
 			const [dirDraft, setDirDraft] = useState(() => cache.defDir ?? "");
 			const [repo, setRepo] = useState(() => cache.repo);
 			const [busy, setBusy] = useState(false);
+			// 刷新状态（联网同步）进行中的提示状态，避免刷新时界面闪成「未加载文件夹」。
+			const [refreshing, setRefreshing] = useState(false);
+			// 切换平台（② 里 GitHub/Gitee）时，③ 需要重新拉取对应平台的仓库状态；此标记在拉取期间为真，
+			// 用于显示「切换平台，正在重新检测…」提示——避免保留原内容几秒而让用户以为没反应。
+			const [switching, setSwitching] = useState(false);
 			const [result, setResult] = useState(null);
 			const [msg, setMsg] = useState(null);
 			const [err, setErr] = useState(null);
@@ -303,8 +467,30 @@ window.__ModuleLoader__.load({
 			const [giteeTokenBusy, setGiteeTokenBusy] = useState(false);
 			// 自定义目录（用户手动选择的非 DSH 工作区，持久化于插件本地），用于给下拉项加 X 删除
 			const [customDirs, setCustomDirs] = useState(() => cache.customDirs || []);
-			// 详情弹窗：'changes'（改动文件列表）| 'sync'（同步差异）| null（关闭）
+			// 详情弹窗：'changes'（改动文件列表）| 'sync'（同步差异）| 'branches'（分支切换）
+			// | 'history'（提交历史）| null（关闭）
 			const [detail, setDetail] = useState(null);
+			// 改动详情里被展开显示 diff 的文件下标集合（点击文件名展开/收起内容）
+			const [expandedDiffs, setExpandedDiffs] = useState(() => new Set());
+			// 按需加载的 diff：{ [index]: { loading, diff, error } }，点开文件行时才请求 /repo-diff
+			const [diffs, setDiffs] = useState({});
+			// 提交信息输入框 + 暂存/取消暂存进行中标记
+			const [commitMsg, setCommitMsg] = useState("");
+			const [stageBusy, setStageBusy] = useState(false);
+			// 分支切换弹窗数据 + 进行中标记
+			const [branches, setBranches] = useState([]);
+			const [branchCurrent, setBranchCurrent] = useState("");
+			const [branchBusy, setBranchBusy] = useState(false);
+			// 提交历史弹窗数据 + 进行中标记；historyDetail 存放某条 commit 的并排 diff
+			const [commits, setCommits] = useState([]);
+			const [commitsLoading, setCommitsLoading] = useState(false);
+			const [historyBusy, setHistoryBusy] = useState(false);
+			// historyDetail：{ hash, loading, diff, error }，点某提交时按需拉 /commit-diff
+			const [historyDetail, setHistoryDetail] = useState(null);
+			// 提交行右键/更多菜单：当前打开的 commit（hashFull）或 null
+			const [commitMenu, setCommitMenu] = useState(null);
+			// 复制成功的即时提示（菜单里短暂显示「已复制」）
+			const [copiedTip, setCopiedTip] = useState(null);
 			// 仓库名称强制 = 文件夹名（不允许手动填写）
 			const repoName = (repo && repo.defaultRepoName) || "";
 			// 目录选择器状态
@@ -317,13 +503,61 @@ window.__ModuleLoader__.load({
 			const provRef = useRef(prov);
 			provRef.current = prov;
 
-			const loadRepo = useCallback(async (d, keepRepo) => {
-				setErr(null);
-				if (!keepRepo) setRepo(null);
+			// 竞态保护：loadRepo 是异步的（await 网络），首次挂载的预加载请求可能与
+			// 用户手动切换工作区/平台的请求并发。若旧请求后返回，会把它对应的目录
+			// 内容（并 setDir 改回旧目录）覆盖到界面上，表现为「切换后过一会儿又跳回
+			// 切换前的目录」。用自增 token 保证只有最新一次调用才允许写入状态。
+			const loadSeq = useRef(0);
+
+			// 可见性默认取值：优先用当前仓库的实际私有/公开状态；当该工作区没有远程
+			// （属于当前账号/平台的远程、即即将新建的仓库）时，默认选「公开」。供
+			// loadRepo 的各个返回路径（网络 / 快速缓存 / 预取秒显）统一调用。
+			const syncVisibility = useCallback((r) => {
+				if (r && r.repoExists === true && (r.visibility === "public" || r.visibility === "private")) {
+					setVisibility(r.visibility);
+				} else if (r && !r.hasRemote) {
+					setVisibility("public");
+				}
+			}, []);
+
+			const loadRepo = useCallback(async (d, keepRepo, full) => {
+				// 注意：不能在这里无条件清空 err —— 操作回调（推送/拉取/对齐等）会先
+				// setErr/setMsg 再调 loadRepo 刷新状态，此处清空会立刻抹掉刚设置的
+				// 结果/错误提示，造成「点了按钮没有任何反馈」。需要清空 err 的调用方
+				// （切换目录 / 切换平台 / 刷新状态）自行清空。
+				// full=true 时才让 host 端执行 git fetch 联网同步（用于「刷新状态」及
+				// 推送/拉取/对齐等操作后的刷新）；默认 false（快速模式）：跳过 fetch，
+				// 秒出本地状态。full 模式自动显示「刷新中…」提示，提示只在最新一次调用归来时关闭。
+				const doFull = full === true;
+				const mySeq = ++loadSeq.current;
+				if (doFull) setRefreshing(true);
+				const dirty = !keepRepo;
+				if (dirty) setRepo(null);
+				// 快速模式且预取已同步过该目录：直接秒显缓存，不再等网络（打开 DSH 时已全部 full 同步）。
+				// 注意：缓存是按目录存的，但内容随平台（github/gitee）不同。只有缓存的 provider 与
+				// 当前平台一致才可秒显；否则跳过缓存，走网络重新拉取对应平台的仓库状态，避免切换
+				// 平台后仍显示上一个平台的检测内容。
+				const curProv = provRef.current || "github";
+				if (!doFull && cache.reposByDir[d] && cache.reposByDir[d].provider === curProv) {
+					const cached = cache.reposByDir[d];
+					if (mySeq === loadSeq.current) {
+						setRepo(cached);
+						if (cached.dir) { setDirDraft(cached.dir); setDir(cached.dir); }
+						syncVisibility(cached);
+						if (!hasBetterSidebar) void prefetchDiffs(cached.dir, cached.changedFiles, 3);
+					}
+					return;
+				}
 				try {
-					const p = provRef.current || "github";
-					const r = await jget("/repo?dir=" + encodeURIComponent(d) + "&provider=" + encodeURIComponent(p));
+					const p = curProv;
+					const r = await jget("/repo?dir=" + encodeURIComponent(d) + "&provider=" + encodeURIComponent(p) + (doFull ? "&full=1" : ""));
+					// 竞态保护：若期间又发起了更新的 loadRepo（序列号更大），丢弃本次过期结果，
+					// 避免旧请求后到时把界面刷回旧目录。
+					if (mySeq !== loadSeq.current) return;
 					setRepo(r);
+					// 切换仓库/刷新后清空旧的改动 diff 缓存与展开状态，避免残留上一个目录的内容。
+					setExpandedDiffs(new Set());
+					setDiffs({});
 					// 默认选中当前工作区：/repo 在未传 dir 时返回当前工作区路径，
 					// 把返回的实际目录同步到输入框和当前选中目录。
 					if (r && r.dir) {
@@ -333,32 +567,46 @@ window.__ModuleLoader__.load({
 					}
 					// 缓存最新 repo 状态
 					cache.repo = r;
-					// 仓库已存在且能读到实际可见性时，让下拉框默认选中实际状态，
-					// 这样「修改仓库状态」按钮只在用户主动切换时出现。
-					if (r && r.repoExists === true && (r.visibility === "public" || r.visibility === "private")) {
-						setVisibility(r.visibility);
-					}
+					// 按目录缓存（含 provider），下次同一平台可用快速缓存秒显；切平台时因 provider
+					// 不匹配会跳过缓存重新拉取，避免显示上个平台的检测内容。
+					if (r && r.dir) cache.reposByDir[r.dir] = r;
+					// 默认可见性：优先当前仓库实际状态；无远程（即将新建的仓库）默认「公开」。
+					syncVisibility(r);
+					// 后台预取本目录所有改动文件的 diff，点击「查看」时秒出。
+					// 先清掉上次残留的缓存（文件集刚可能变化），再并发拉取。
+					clearDiffCache(r && r.dir);
+					if (!hasBetterSidebar) void prefetchDiffs(r && r.dir, r && r.changedFiles, 3);
 					if (r && !r.isGitRepo) setErr(r.error || "该目录不是 git 仓库");
 				} catch (e) { setErr(String(e)); }
+				finally {
+					// 只有本次是最新调用时才收起「刷新中…」提示，避免旧请求失败把提示提前关掉。
+					if (doFull && mySeq === loadSeq.current) setRefreshing(false);
+				}
 			}, []);
 
 			useEffect(() => {
-				// 首次加载：先看缓存（DSH 打开时已预取当前工作区），秒显；
-				// 无缓存则 preload（取默认工作区）后加载。
-				if (cache.repo) {
-					setRepo(cache.repo);
-					if (cache.defDir) { setDir(cache.defDir); setDirDraft(cache.defDir); }
-				}
+				// 首次加载：优先用 DSH 打开时已 full 同步好的 cache.repo 秒显；
+				// 无论预加载是否已在此时完成，都走 preload()（幂等），在 .then 里
+				// 直接用预取结果，避免「先显示（未加载文件夹）空白再等一会儿」。
 				if (cache.workspaces && cache.workspaces.length) setWorkspaces(cache.workspaces);
 				if (cache.customDirs && cache.customDirs.length) setCustomDirs(cache.customDirs);
 				void preload().then(() => {
 					if (cache.workspaces && cache.workspaces.length) setWorkspaces(cache.workspaces);
 					if (cache.customDirs && cache.customDirs.length) setCustomDirs(cache.customDirs);
-					// 默认工作区：优先 defDir，否则第一个工作区
 					const d = cache.defDir
 						|| (cache.workspaces && cache.workspaces[0])
 						|| dir || "";
-					if (d) { setDir(d); setDirDraft(d); loadRepo(d); }
+					if (!d) return;
+					setDir(d); setDirDraft(d);
+					if (cache.repo) {
+						// 预加载已做 full 同步，直接秒显，不再发重复请求。
+						setRepo(cache.repo);
+						syncVisibility(cache.repo);
+						if (!hasBetterSidebar) void prefetchDiffs(cache.repo.dir, cache.repo.changedFiles, 3);
+					} else {
+						// 兜底：预加载未拿到（如请求失败），发一次 full 同步刷新。
+						loadRepo(d, true, true);
+					}
 				});
 				// eslint-disable-next-line react-hooks/exhaustive-deps
 			}, []);
@@ -409,7 +657,13 @@ window.__ModuleLoader__.load({
 			// 平台切换：gitee 时读取令牌状态；无论切到哪都刷新仓库（跟随平台检测/显示）
 			useEffect(() => {
 				if (prov === "gitee") void loadGiteeTokenStatus();
-				if (dir || cache.defDir) loadRepo(dir || cache.defDir || "", true);
+				// 切换平台等同切换检测目标，清掉旧的错误提示，避免残留上一个平台的报错。
+				setErr(null);
+				if (dir || cache.defDir) {
+					// 显示「切换平台，正在重新检测…」提示，避免切换后旧内容停留几秒看起来像没变化。
+					setSwitching(true);
+					loadRepo(dir || cache.defDir || "", true).finally(() => setSwitching(false));
+				}
 				// eslint-disable-next-line react-hooks/exhaustive-deps
 			}, [prov]);
 
@@ -420,19 +674,23 @@ window.__ModuleLoader__.load({
 					setResult(r);
 					if (r.ok) setMsg("已推送");
 					else setErr(r.error || r.pushError || "推送失败");
-					void loadRepo(dir, true);
+					void loadRepo(dir, true, true);
 				} catch (e) { setErr("推送失败：" + e); }
 				finally { setBusy(false); }
 			}, [dir, loadRepo]);
 
 			const pull = useCallback(async () => {
+				// 「拉取更新」在“本地干净 + 远程有更新”状态出现：本地没有任何改动/提交，
+				// reset --hard 不会丢失任何内容，因此直接复用「强制对齐」的实现
+				// （git fetch + git reset --hard origin/<branch>），且无需弹确认框，
+				// 等同于把本地快速前进到远程最新状态。
 				setBusy(true); setMsg(null); setErr(null); setResult(null);
 				try {
-					const r = await jpost("/pull", { dir: dir || undefined });
+					const r = await jpost("/align", { dir: dir || undefined });
 					setResult(r);
-					if (r.ok) setMsg(r.upToDate ? "已是最新，无需拉取" : "拉取成功，已更新到最新");
+					if (r.ok) setMsg("已拉取远程更新（本地已对齐到远程最新状态）");
 					else setErr(r.error || "拉取失败");
-					void loadRepo(dir, true);
+					void loadRepo(dir, true, true);
 				} catch (e) { setErr("拉取失败：" + e); }
 				finally { setBusy(false); }
 			}, [dir, loadRepo]);
@@ -444,7 +702,7 @@ window.__ModuleLoader__.load({
 					setResult(r);
 					if (r.ok) setMsg("已拉取远程更新并推送更改");
 					else setErr(r.error || "合并推送失败");
-					void loadRepo(dir, true);
+					void loadRepo(dir, true, true);
 				} catch (e) { setErr("合并推送失败：" + e); }
 				finally { setBusy(false); }
 			}, [dir, loadRepo]);
@@ -457,7 +715,7 @@ window.__ModuleLoader__.load({
 					setResult(r);
 					if (r.ok) setMsg("已强制推送，远程已更新为本地状态");
 					else setErr(r.error || "强制推送失败");
-					void loadRepo(dir, true);
+					void loadRepo(dir, true, true);
 				} catch (e) { setErr("强制推送失败：" + e); }
 				finally { setBusy(false); }
 			}, [dir, loadRepo]);
@@ -470,7 +728,7 @@ window.__ModuleLoader__.load({
 					setResult(r);
 					if (r.ok) setMsg("已强制拉取远程更新");
 					else setErr(r.error || "强制拉取失败");
-					void loadRepo(dir, true);
+					void loadRepo(dir, true, true);
 				} catch (e) { setErr("强制拉取失败：" + e); }
 				finally { setBusy(false); }
 			}, [dir, loadRepo]);
@@ -486,7 +744,7 @@ window.__ModuleLoader__.load({
 					setResult(r);
 					if (r.ok) setMsg("已把仓库设置为「" + (target === "public" ? "公开" : "私有") + "」");
 					else setErr(r.error || "修改可见性失败");
-					void loadRepo(dir, true);
+					void loadRepo(dir, true, true);
 				} catch (e) { setErr("修改可见性失败：" + e); }
 				finally { setBusy(false); }
 			}, [dir, repo, visibility, loadRepo]);
@@ -500,7 +758,7 @@ window.__ModuleLoader__.load({
 					setResult(r);
 					if (r.ok) setMsg("仓库已创建并推送：" + (r.url || name) + (r.provider === "gitee" ? "（Gitee）" : ""));
 					else setErr(r.error || "创建失败");
-					void loadRepo(dir, true);
+					void loadRepo(dir, true, true);
 				} catch (e) { setErr("创建失败：" + e); }
 				finally { setBusy(false); }
 			}, [dir, repo, visibility, loadRepo]);
@@ -600,10 +858,151 @@ window.__ModuleLoader__.load({
 				finally { setBusy(false); }
 			}, [dir, loadRepo]);
 
+			// ---- 本地 Git 工作流：选择性暂存 / 提交 / 分支 / 历史 / revert / cherry-pick ----
+
+			// 暂存某文件（path 空 = 全部），成功后刷新 repo 状态。
+			const doStage = useCallback(async (path) => {
+				setStageBusy(true); setErr(null);
+				try {
+					const r = await jpost("/stage", { dir: dir || undefined, path: path || undefined });
+					if (r.ok) {
+						// 暂存会改变文件的 staged 状态：清掉该目录的缓存快照，强制走网络路径
+						// 重新拉取最新 repo（含最新「已暂存/未暂存」标记），并清 diff 展开状态。
+						if (dir) delete cache.reposByDir[dir];
+						loadRepo(dir, true);
+					} else setErr(r.error || "暂存失败");
+				} catch (e) { setErr("暂存失败：" + e); }
+				finally { setStageBusy(false); }
+			}, [dir, loadRepo]);
+
+			// 取消暂存某文件（path 空 = 全部）。
+			const doUnstage = useCallback(async (path) => {
+				setStageBusy(true); setErr(null);
+				try {
+					const r = await jpost("/unstage", { dir: dir || undefined, path: path || undefined });
+					if (r.ok) {
+						if (dir) delete cache.reposByDir[dir];
+						loadRepo(dir, true);
+					} else setErr(r.error || "取消暂存失败");
+				} catch (e) { setErr("取消暂存失败：" + e); }
+				finally { setStageBusy(false); }
+			}, [dir, loadRepo]);
+
+			// 用自定义信息提交暂存区；成功后刷新并提示。
+			const doCommit = useCallback(async () => {
+				const name = repoName || (repo && repo.dir ? String(repo.dir).split(/[\\/]/).filter(Boolean).pop() : "");
+				const message = commitMsg.trim() || ("chore: update " + name);
+				setBusy(true); setMsg(null); setErr(null); setResult(null);
+				try {
+					const r = await jpost("/commit", { dir: dir || undefined, message });
+					setResult(r);
+					if (r.ok) {
+						setMsg("已提交 " + r.staged + " 个文件" + (r.hash ? "（" + r.hash + "）" : ""));
+						setCommitMsg("");
+						void loadRepo(dir, true, true);
+					} else setErr(r.error || "提交失败");
+				} catch (e) { setErr("提交失败：" + e); }
+				finally { setBusy(false); }
+			}, [dir, repo, commitMsg, repoName, loadRepo]);
+
+			// 打开分支切换弹窗。
+			const openBranches = useCallback(async () => {
+				setDetail("branches"); setBranchBusy(true); setBranches([]);
+				try {
+					const r = await jpost("/branches", { dir: dir || undefined });
+					if (r.ok) { setBranches(r.branches || []); setBranchCurrent(r.current || ""); }
+					else setErr(r.error || "读取分支失败");
+				} catch (e) { setErr("读取分支失败：" + e); }
+				finally { setBranchBusy(false); }
+			}, [dir]);
+
+			// 切换到某分支。
+			const doCheckout = useCallback(async (branch) => {
+				if (branch === branchCurrent) { setDetail(null); return; }
+				if (!window.confirm("切换到分支「" + branch + "」？（若当前有未提交改动，git 会拒绝切换）")) return;
+				setBranchBusy(true); setMsg(null); setErr(null);
+				try {
+					const r = await jpost("/checkout", { dir: dir || undefined, branch });
+					if (r.ok) {
+						setMsg("已切换到分支 " + branch);
+						setDetail(null);
+						void loadRepo(dir, true, true);
+					} else setErr(r.error || "切换分支失败");
+				} catch (e) { setErr("切换分支失败：" + e); }
+				finally { setBranchBusy(false); }
+			}, [dir, branchCurrent, loadRepo]);
+
+			// 打开提交历史弹窗。
+			const openHistory = useCallback(async () => {
+				setDetail("history"); setCommitsLoading(true); setCommits([]); setHistoryDetail(null);
+				try {
+					const r = await jpost("/log", { dir: dir || undefined, count: 30 });
+					if (r.ok) setCommits(r.commits || []);
+					else setErr(r.error || "读取历史失败");
+				} catch (e) { setErr("读取历史失败：" + e); }
+				finally { setCommitsLoading(false); }
+			}, [dir]);
+
+			// 对某提交执行 revert（改写历史，需确认）。
+			const doRevert = useCallback(async (hash, subject) => {
+				if (!window.confirm("revert 提交「" + (subject || hash) + "」——会生成一个反向提交，期间可能产生冲突，确定继续？")) return;
+				setHistoryBusy(true); setMsg(null); setErr(null);
+				try {
+					const r = await jpost("/revert", { dir: dir || undefined, hash });
+					if (r.ok) {
+						setMsg("已 revert 提交 " + hash);
+						setDetail(null);
+						void loadRepo(dir, true, true);
+					} else setErr(r.error || "revert 失败");
+				} catch (e) { setErr("revert 失败：" + e); }
+				finally { setHistoryBusy(false); }
+			}, [dir, loadRepo]);
+
+			// 对某提交执行 cherry-pick（改写历史，需确认）。
+			const doCherryPick = useCallback(async (hash, subject) => {
+				if (!window.confirm("cherry-pick 提交「" + (subject || hash) + "」到当前分支——期间可能产生冲突，确定继续？")) return;
+				setHistoryBusy(true); setMsg(null); setErr(null);
+				try {
+					const r = await jpost("/cherrypick", { dir: dir || undefined, hash });
+					if (r.ok) {
+						setMsg("已 cherry-pick 提交 " + hash);
+						setDetail(null);
+						void loadRepo(dir, true, true);
+					} else setErr(r.error || "cherry-pick 失败");
+				} catch (e) { setErr("cherry-pick 失败：" + e); }
+				finally { setHistoryBusy(false); }
+			}, [dir, loadRepo]);
+
+			// 打开某提交的并排 diff（复用 /commit-diff）。
+			const openCommitDiff = useCallback(async (hash) => {
+				if (historyDetail && historyDetail.hash === hash) { setHistoryDetail(null); return; }
+				setHistoryDetail({ hash, loading: true, diff: "", error: null });
+				try {
+					const r = await jpost("/commit-diff", { dir: dir || undefined, hash });
+					setHistoryDetail({ hash, loading: false, diff: (r && r.diff) || "", error: r && !r.ok ? (r.error || "读取失败") : null });
+				} catch (e) {
+					setHistoryDetail({ hash, loading: false, diff: "", error: String(e) });
+				}
+			}, [dir, historyDetail]);
+
+			// 复制提交相关信息（短哈希 / 完整哈希 / 提交信息），成功后短暂提示并关闭菜单。
+			const copyCommit = useCallback(async (kind, commit) => {
+				let text = "";
+				if (kind === "short") text = commit.hash;
+				else if (kind === "full") text = commit.hashFull;
+				else text = commit.subject || "";
+				const ok = await copyText(text);
+				setCommitMenu(null);
+				if (ok) {
+					setCopiedTip("已复制" + (kind === "short" ? "短哈希" : kind === "full" ? "完整哈希" : "提交信息"));
+					window.setTimeout(() => setCopiedTip(null), 1600);
+				} else {
+					setErr("复制失败：请手动复制");
+				}
+			}, []);
+
 			return h(Box, { title: "③ 代码管理" },
 				// 平台提示 + Gitee 令牌（仅 gitee 模式）
-				h("div", { style: { marginBottom: 10, fontSize: 12, color: T.secondary, lineHeight: 1.6 } },
-					"当前平台：<" + (prov === "gitee" ? "Gitee" : "GitHub") + ">（在 ② SSH 里切换，③ 的同名检测 / 新建仓库 / 可见性会跟随）。"),
 				prov === "gitee" ? h("div", { style: { border: "1px solid " + T.border, borderRadius: 10, padding: 10, marginBottom: 10, background: T.layer1 } },
 					h("div", { style: { fontSize: 12, fontWeight: 600, color: T.label, marginBottom: 6 } },
 						"Gitee 私人令牌（OpenAPI，需 projects 权限）"),
@@ -668,7 +1067,23 @@ window.__ModuleLoader__.load({
 				) : null,
 				repo && repo.isGitRepo ? h("div", { style: { marginBottom: 10 } },
 					h(Field, { label: "目录", value: repo.dir }),
-					h(Field, { label: "分支", value: repo.branch }),
+					h(Field, { label: "分支" }, h("span", { style: { display: "inline-flex", alignItems: "center", gap: 8 } },
+						h("span", { style: { color: T.label, fontSize: 13 } }, repo.branch || "（无）"),
+						!hasBetterSidebar ? h(React.Fragment, null,
+							repo.branch ? h("button", {
+								type: "button",
+								onClick: openBranches,
+								title: "切换分支",
+								style: changeBtnStyle(),
+							}, "切换") : null,
+							h("button", {
+								type: "button",
+								onClick: openHistory,
+								title: "查看提交历史",
+								style: changeBtnStyle(),
+							}, "历史")
+						) : null
+					)),
 					h(Field, { label: "远程", value: repo.remoteUrl || "（无）" }),
 					h(Field, { label: "改动" }, h("span", { style: { display: "inline-flex", alignItems: "center", gap: 8 } },
 						h("span", { style: { color: T.label, fontSize: 13 } }, repo.dirty ? repo.dirtyCount + " 个文件" : "无"),
@@ -682,9 +1097,12 @@ window.__ModuleLoader__.load({
 					)),
 					h(Field, { label: "同步" }, h("span", { style: { display: "inline-flex", alignItems: "center", gap: 8 } },
 						h("span", { style: { color: T.label, fontSize: 13 } },
-							(repo.ahead > 0 ? "本地领先 " + repo.ahead + " 提交" : "") +
-							(repo.ahead > 0 && repo.behind > 0 ? "、落后 " + repo.behind + " 提交" : (repo.behind > 0 ? "落后 " + repo.behind + " 提交" : "")) +
-							((repo.ahead === 0 && repo.behind === 0) ? "与远程一致" : "")
+							// 没有（属于当前账号/平台的）远程时不做同步判断，避免误显示「与远程一致」
+							!repo.hasRemote
+								? "（无）"
+								: (repo.ahead > 0 ? "本地领先 " + repo.ahead + " 提交" : "") +
+								  (repo.ahead > 0 && repo.behind > 0 ? "、落后 " + repo.behind + " 提交" : (repo.behind > 0 ? "落后 " + repo.behind + " 提交" : "")) +
+								  ((repo.ahead === 0 && repo.behind === 0) ? "与远程一致" : "")
 						),
 						(repo.ahead > 0 || repo.behind > 0) ? h("button", {
 							type: "button",
@@ -719,30 +1137,57 @@ window.__ModuleLoader__.load({
 						btns.push(h(Btn, { key: "init", label: "创建 Git", onClick: initGit, tone: "primary", noBg: true, disabled: isBlocked, title: "仅初始化 git 仓库，不拉取不推送，由你决定下一步" }));
 					} else if (hasRemote) {
 						if (localChanges && remoteUpdates) {
-							// 本地和远程都有更新 -> 三按钮：合并推送 / 强制推送 / 强制拉取
-							btns.push(h(Btn, { key: "mp", label: "拉取更新并推送更改", onClick: mergePush, tone: "primary", noBg: true, disabled: isBlocked }));
-							btns.push(h(Btn, { key: "fp", label: "强制推送", onClick: forcePush, disabled: isBlocked, title: "用本地版本覆盖远程（远程非本地更改被丢弃）" }));
-							btns.push(h(Btn, { key: "fpl", label: "强制拉取", onClick: forcePull, disabled: isBlocked, title: "强制并入远程更新" }));
+							// 本地和远程都有更新：原名展示「拉取更新并推送更改 / 强制推送 /
+							// 强制拉取」三按钮，但这三种操作在此场景下容易因未提交改动、
+							// 分支保护等原因失败且行为难预测，故不再展示——该状态唯一的
+							// 操作按钮是「强制对齐」（fetch + reset --hard，本地完全重置为远程）。
+							btns.push(h("span", { key: "both-note", style: { color: T.warn, fontSize: 12 } },
+								"本地有改动且远程有更新，可直接用「强制对齐」将本地重置为远程状态"));
+							if (repo && repo.isGitRepo) {
+								btns.push(h(Btn, { key: "align", label: "强制对齐", onClick: align, disabled: isBlocked, title: "本地完全重置为远程分支（丢弃本地差异），解决“文件相同仍显示同步差异”的情况" }));
+							}
 						} else if (localChanges) {
 							// 只有本地有更改 -> 只显示推送（正常 push）
 							btns.push(h(Btn, { key: "push", label: "推送更改", onClick: push, tone: "primary", noBg: true, disabled: isBlocked || repo?.repoExists === false }));
 						} else if (remoteUpdates) {
-							// 只有远程有更新 -> 只显示拉取（正常 pull）
+							// 只有远程有更新（本地干净）-> 只显示「拉取更新」。
+							// 实现复用「强制对齐」逻辑（fetch + reset --hard）：本地干净
+							// 无改动可丢，reset 等同快速前进到远程最新，直接执行不弹确认。
 							btns.push(h(Btn, { key: "pull", label: "拉取更新", onClick: pull, disabled: isBlocked || repo?.repoExists !== true }));
 						} else {
 							// 完全同步 -> 无按钮，显示已是最新
 							btns.push(h("span", { key: "synced", style: { color: T.success, fontSize: 13 } }, "✓ 已是最新"));
 						}
-						// 有远程时总是提供「强制对齐」作为兜底（本地完全重置为远程状态）
-						if (repo && repo.isGitRepo) {
-							btns.push(h(Btn, { key: "align", label: "强制对齐", onClick: align, disabled: isBlocked, title: "本地完全重置为远程分支（丢弃本地差异），解决“文件相同仍显示同步差异”的情况" }));
-						}
 					}
+					// 刷新/切换平台进行中给出明确提示，让用户知道正在联网同步或重新检测。
+					const refreshingTip = refreshing
+						? h("div", { style: { color: T.brand, fontSize: 12, marginTop: 8 } }, "⟳ 正在刷新状态，联网同步 GitHub/Gitee 最新数据…")
+						: switching
+						? h("div", { style: { color: T.brand, fontSize: 12, marginTop: 8 } }, "⟳ 切换平台，正在重新检测「" + (prov === "gitee" ? "Gitee" : "GitHub") + "」仓库状态…")
+						: null
 					return h("div", { style: { display: "flex", gap: 8, flexWrap: "wrap", alignItems: "center" } },
 						btns,
-						h(Btn, { label: "刷新状态", onClick: () => { setResult(null); setMsg(null); setErr(null); loadRepo(dir); }, disabled: busy })
+						// keepRepo=true 保留旧内容避免闪烁；full=true 触发 loadRepo 的「刷新中…」提示 + 联网同步。
+						h(Btn, {
+							label: refreshing ? "刷新中…" : "刷新状态",
+							onClick: () => { setResult(null); setMsg(null); setErr(null); loadRepo(dir, true, true); },
+							disabled: busy || refreshing,
+						}),
+						refreshingTip,
 					);
 				})(),
+				// 提交信息输入框 + 「提交」（仅 git 仓库且有改动时、且未装 better-sidebar 时显示）。
+				!hasBetterSidebar && repo && repo.isGitRepo && repo.dirty ? h("div", { style: { display: "flex", gap: 8, marginTop: 10, alignItems: "center" } },
+					h("input", {
+						type: "text", value: commitMsg,
+						placeholder: "提交信息（留空则用默认）",
+						title: "填写提交信息后点「提交」；留空则自动生成（chore: update <文件夹名>）",
+						onChange: (e) => setCommitMsg(e.target.value),
+						onKeyDown: (e) => { if (e.key === "Enter") void doCommit(); },
+						style: { flex: 1, font: "inherit", fontSize: 12, padding: "6px 10px", border: "1px solid " + T.border, borderRadius: 8, background: T.layer1, color: T.label, outline: "none" },
+					}),
+					h(Btn, { label: "提交", onClick: doCommit, tone: "primary", noBg: true, disabled: busy || stageBusy || repo.dirtyCount <= 0 || !dir }),
+				) : null,
 				h("div", { style: { display: "flex", gap: 8, marginTop: 10, alignItems: "center" } },
 					h("input", {
 						type: "text", value: repoName, readOnly: true,
@@ -798,20 +1243,137 @@ window.__ModuleLoader__.load({
 				detail ? ReactDOM.createPortal(
 					h("div", { style: { position: "fixed", inset: 0, zIndex: 2000, display: "flex", alignItems: "center", justifyContent: "center" }, role: "presentation" },
 						h("div", { style: { position: "absolute", inset: 0, background: T.mask }, "aria-hidden": "true", onClick: () => setDetail(null) }),
-						h("div", { style: { position: "relative", zIndex: 1, width: 520, maxWidth: "calc(100vw - 48px)", maxHeight: "calc(100vh - 100px)", display: "flex", flexDirection: "column", background: "var(--dsw-alias-bg-layer-3, #fff)", border: "1px solid " + T.border, borderRadius: 14, padding: 18, color: T.label, boxShadow: "var(--dsw-overlay-shadow, 0 12px 32px rgba(0,0,0,.35))" }, role: "dialog", "aria-modal": "true", "aria-label": "查看详情" },
+						h("div", { style: { position: "relative", zIndex: 1, width: detail === "changes" ? 700 : 520, maxWidth: "calc(100vw - 48px)", maxHeight: "calc(100vh - 100px)", display: "flex", flexDirection: "column", background: "var(--dsw-alias-bg-layer-3, #fff)", border: "1px solid " + T.border, borderRadius: 14, padding: 18, color: T.label, boxShadow: "var(--dsw-overlay-shadow, 0 12px 32px rgba(0,0,0,.35))" }, role: "dialog", "aria-modal": "true", "aria-label": "查看详情" },
 							h("div", { style: { display: "flex", alignItems: "flex-start", gap: 12, marginBottom: 10 } },
 								h("div", { style: { fontSize: 15, fontWeight: 600, flex: 1 } },
-									detail === "changes" ? "改动文件" : "与远程同步差异"),
+									detail === "changes" ? "改动文件"
+										: detail === "branches" ? "切换分支"
+										: detail === "history" ? "提交历史"
+										: "与远程同步差异"),
 								h("button", { type: "button", style: closeBtnStyle(), "aria-label": "关闭", onClick: () => setDetail(null) }, "✕")
 							),
 							h("div", { style: { flex: 1, overflow: "auto" } },
-								detail === "changes" ? (
+								detail === "changes" ? h(React.Fragment, null,
+									hasBetterSidebar ? h("div", { style: { marginBottom: 10, padding: "8px 10px", borderRadius: 8, background: T.layer1, color: T.secondary, fontSize: 12, lineHeight: 1.6 } },
+										"已安装 dsh-better-sidebar，此处只列改动文件列表；具体改动内容请到 dsh-better-sidebar 的「源代码管理 / Git 面板」查看。")
+										: null,
 									repo && repo.changedFiles && repo.changedFiles.length > 0
-										? repo.changedFiles.map((f, i) => h("div", { key: i, style: { display: "flex", gap: 8, alignItems: "baseline", fontSize: 13, lineHeight: 1.8, borderBottom: "1px solid " + T.border, padding: "3px 2px" } },
-											h("span", { style: { color: typeColor(f.type), fontSize: 11, flexShrink: 0, width: 52 } }, typeLabel(f.type)),
-											h("span", { style: { color: T.label, wordBreak: "break-all", flex: 1 } }, f.path)
-										))
+										? repo.changedFiles.map((f, i) => {
+											// untracked 新文件 git 不跟踪，没有 diff，不可展开。
+											// 未装 better-sidebar 才能展开 diff（装了它由它的 Git 面板负责，避免重复）。
+											const canHaveDiff = !hasBetterSidebar && f.type !== 'untracked'
+											const open = hasBetterSidebar ? false : expandedDiffs.has(i)
+											const d = diffs[i] || {}
+											const onClick = canHaveDiff ? async () => {
+												const next = new Set(expandedDiffs)
+												if (next.has(i)) { next.delete(i); setExpandedDiffs(next); return }
+												next.add(i); setExpandedDiffs(next)
+												// 优先用预取缓存（点击「查看」秒出）；未命中才按需请求并写入缓存。
+												if (!diffs[i]) {
+													const key = (repo.dir || "") + "\u0000" + f.path
+													const cached = cache.diffs[key]
+													// 命中且非失败标记（null=上次预取失败），才秒出；否则重新请求。
+													if (cached !== undefined && cached !== null) {
+														setDiffs(prev => ({ ...prev, [i]: { loading: false, diff: cached, error: null } }))
+														return
+													}
+													setDiffs(prev => ({ ...prev, [i]: { loading: true, diff: '' } }))
+													try {
+														const r = await jget("/repo-diff?dir=" + encodeURIComponent(repo.dir || "") + "&path=" + encodeURIComponent(f.path))
+														const diff = (r && r.diff) || ''
+														cache.diffs[key] = diff
+														setDiffs(prev => ({ ...prev, [i]: { loading: false, diff } }))
+													} catch (e) {
+														cache.diffs[key] = null
+														setDiffs(prev => ({ ...prev, [i]: { loading: false, diff: '', error: String(e) } }))
+													}
+												}
+											} : undefined
+											return h("div", { key: i },
+												h("div", {
+													style: {
+														display: "flex", gap: 8, alignItems: "center",
+														fontSize: 13, lineHeight: 1.8,
+														borderBottom: "1px solid " + T.border, padding: "3px 2px",
+														cursor: canHaveDiff ? "pointer" : "default",
+													},
+													title: canHaveDiff ? (open ? "点击收起" : "点击查看改动内容") : "新文件（untracked）暂无内容 diff",
+													onClick: onClick,
+												},
+													h("span", { style: { color: typeColor(f.type), fontSize: 11, flexShrink: 0, width: 52 } }, typeLabel(f.type)),
+													h("span", { style: { color: T.label, wordBreak: "break-all", flex: 1 } }, f.path),
+													!hasBetterSidebar ? h(React.Fragment, null,
+														h("span", { style: { fontSize: 11, flexShrink: 0, color: f.staged ? T.success : T.secondary } }, f.staged ? "已暂存" : "未暂存"),
+														h("button", {
+															type: "button",
+															title: f.staged ? "取消暂存" : "暂存",
+															disabled: stageBusy,
+															style: changeBtnStyle(),
+															onClick: (e) => { e.stopPropagation(); if (f.staged) void doUnstage(f.path); else void doStage(f.path); },
+														}, f.staged ? "取消暂存" : "暂存"),
+														canHaveDiff ? h("span", { style: { color: T.brand, fontSize: 11, flexShrink: 0 } },
+															d.loading ? "加载中…" : (open ? "▾ 收起" : "▸ 查看"))
+															: null
+													) : null
+												),
+												open && canHaveDiff ? (
+													d.loading ? h("div", { style: { fontSize: 12, color: T.secondary, padding: "4px 8px" } }, "正在加载改动内容…")
+														: d.error ? h("div", { style: { fontSize: 12, color: T.danger, padding: "4px 8px" } }, "❌ " + d.error)
+														: d.diff ? renderSideBySideDiff(d.diff) : h("div", { style: { fontSize: 12, color: T.secondary, padding: "4px 8px" } }, "（无内容差异）")
+												) : null
+											);
+										})
 										: h("div", { style: { color: T.secondary, fontSize: 13 } }, "当前没有改动。")
+								) : detail === "branches" ? (
+									branchBusy ? h("div", { style: { color: T.secondary, fontSize: 13 } }, "正在读取分支…")
+										: branches.length === 0 ? h("div", { style: { color: T.secondary, fontSize: 13 } }, "（无分支）")
+										: branches.map((b) =>
+											h("div", { key: b, style: { display: "flex", alignItems: "center", gap: 8, padding: "6px 2px", borderBottom: "1px solid " + T.border } },
+												h("span", { style: { flex: 1, color: b === branchCurrent ? T.success : T.label, fontSize: 13, fontWeight: b === branchCurrent ? 600 : 400 } },
+													b + (b === branchCurrent ? "（当前）" : "")),
+												b !== branchCurrent ? h(Btn, { label: "切换", onClick: () => doCheckout(b), disabled: historyBusy || branchBusy, noBg: true, tone: "primary" }) : null
+											)
+										)
+								) : detail === "history" ? (
+									commitsLoading ? h("div", { style: { color: T.secondary, fontSize: 13 } }, "正在读取历史…")
+										: commits.length === 0 ? h("div", { style: { color: T.secondary, fontSize: 13 } }, "（暂无提交）")
+										: commits.map((c) => {
+											const hd = historyDetail && historyDetail.hash === c.hash ? historyDetail : null
+											const menuOpen = commitMenu === c.hashFull
+											// 菜单项 hover 高亮。
+											const hoverProps = () => ({
+												onMouseEnter: (e) => { e.currentTarget.style.background = T.hover; },
+												onMouseLeave: (e) => { e.currentTarget.style.background = "transparent"; },
+											})
+											return h("div", { key: c.hashFull, style: { borderBottom: "1px solid " + T.border, padding: "6px 2px", position: "relative" }, onContextMenu: (e) => { e.preventDefault(); setCommitMenu(c.hashFull); } },
+												h("div", { style: { display: "flex", alignItems: "center", gap: 8 } },
+													h("span", { style: { fontFamily: "var(--ds-font-family-code, ui-monospace, monospace)", fontSize: 12, color: T.brand, flexShrink: 0 } }, c.hash),
+													h("span", { style: { flex: 1, color: T.label, fontSize: 13, minWidth: 0, overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap" } }, c.subject || ""),
+													h("button", { type: "button", title: "更多操作（右键也可打开）", disabled: historyBusy, style: changeBtnStyle(), onClick: (e) => { e.stopPropagation(); setCommitMenu(menuOpen ? null : c.hashFull); } }, "⋯")
+												),
+												h("div", { style: { fontSize: 11, color: T.secondary, marginTop: 2 } },
+													c.author + (c.date ? " · " + c.date : "")),
+												menuOpen ? h("div", { style: menuPanelStyle() },
+													h("div", { ...hoverProps(), style: menuItemStyle(), onClick: () => { setCommitMenu(null); openCommitDiff(c.hash); } },
+														h("span", { style: { width: 16, fontSize: 11, textAlign: "center", color: T.secondary } }, "▸"), "查看提交差异"),
+													h("div", { ...hoverProps(), style: menuItemStyle(), onClick: () => copyCommit("short", c) },
+														h("span", { style: { width: 16, fontSize: 11, textAlign: "center", color: T.secondary } }, "⧉"), "复制短哈希"),
+													h("div", { ...hoverProps(), style: menuItemStyle(), onClick: () => copyCommit("full", c) },
+														h("span", { style: { width: 16, fontSize: 11, textAlign: "center", color: T.secondary } }, "⧉"), "复制完整哈希"),
+													h("div", { ...hoverProps(), style: menuItemStyle(), onClick: () => copyCommit("msg", c) },
+														h("span", { style: { width: 16, fontSize: 11, textAlign: "center", color: T.secondary } }, "⧉"), "复制提交信息"),
+													h("div", { ...hoverProps(), style: menuItemStyle({ danger: true }), onClick: () => { setCommitMenu(null); doRevert(c.hash, c.subject); } },
+														h("span", { style: { width: 16, fontSize: 11, textAlign: "center", color: T.danger } }, "↩"), "还原此提交"),
+													h("div", { ...hoverProps(), style: menuItemStyle({ danger: true }), onClick: () => { setCommitMenu(null); doCherryPick(c.hash, c.subject); } },
+														h("span", { style: { width: 16, fontSize: 11, textAlign: "center", color: T.danger } }, "↪"), "拾取此提交")
+												) : null,
+												hd ? (
+													hd.loading ? h("div", { style: { fontSize: 12, color: T.secondary, padding: "4px 8px" } }, "正在加载提交 diff…")
+														: hd.error ? h("div", { style: { fontSize: 12, color: T.danger, padding: "4px 8px" } }, "❌ " + hd.error)
+														: hd.diff ? renderSideBySideDiff(hd.diff) : h("div", { style: { fontSize: 12, color: T.secondary, padding: "4px 8px" } }, "（无内容差异）")
+												) : null
+											)
+										})
 								) : (
 									h("div", null,
 										repo && (repo.ahead > 0 || repo.behind > 0) ? h("div", null,
@@ -858,6 +1420,10 @@ window.__ModuleLoader__.load({
 						)
 					),
 					document.body
+				) : null,
+				copiedTip ? ReactDOM.createPortal(
+					h("div", { style: { position: "fixed", top: 16, left: "50%", transform: "translateX(-50%)", zIndex: 2147483000, padding: "6px 14px", borderRadius: 8, fontSize: 13, color: "#fff", background: "var(--dsw-alias-state-success-primary, #22c55e)", boxShadow: "var(--dsw-overlay-shadow, 0 4px 12px rgba(0,0,0,.3))" } }, "✅ " + copiedTip),
+					document.body
 				) : null
 			);
 		}
@@ -876,6 +1442,49 @@ window.__ModuleLoader__.load({
 			};
 		}
 
+		/** 提交行「更多操作」下拉面板样式（右对齐、向上弹出，避免在弹窗底部被裁）。 */
+		function menuPanelStyle() {
+			return {
+				position: "absolute", right: 0, bottom: "calc(100% + 4px)", zIndex: 5,
+				width: 180, padding: "4px 0",
+				background: "var(--dsw-alias-bg-layer-3, #fff)",
+				border: "1px solid " + T.border, borderRadius: 10,
+				boxShadow: "var(--dsw-overlay-shadow, 0 8px 24px rgba(0,0,0,.3))",
+			};
+		}
+		/** 下拉菜单单项样式。 */
+		function menuItemStyle({ danger } = {}) {
+			return {
+				display: "flex", alignItems: "center", gap: 8,
+				padding: "7px 12px", fontSize: 13, cursor: "pointer",
+				color: danger ? T.danger : T.label,
+			};
+		}
+
+		/** 复制文本到剪贴板（优先异步 Clipboard API，回退 execCommand）。 */
+		function copyText(text) {
+			const str = String(text == null ? "" : text);
+			try {
+				if (navigator.clipboard && navigator.clipboard.writeText) {
+					return navigator.clipboard.writeText(str).then(() => true).catch(() => fallbackCopy(str));
+				}
+			} catch {}
+			return Promise.resolve(fallbackCopy(str));
+		}
+		function fallbackCopy(str) {
+			try {
+				const ta = document.createElement("textarea");
+				ta.value = str;
+				ta.style.position = "fixed";
+				ta.style.opacity = "0";
+				document.body.appendChild(ta);
+				ta.select();
+				const ok = document.execCommand("copy");
+				ta.remove();
+				return ok;
+			} catch { return false; }
+		}
+
 		/** Chinese label for a changed-file status type. */
 		function typeLabel(t) {
 			return { untracked: "新增", added: "新增", deleted: "删除", renamed: "重命名", modified: "修改" }[t] || "修改";
@@ -885,14 +1494,95 @@ window.__ModuleLoader__.load({
 			return { untracked: T.success, added: T.success, deleted: T.danger, renamed: T.warn, modified: T.brand }[t] || T.label;
 		}
 
+		/**
+		 * Render a unified git diff as colored lines: 删除行红色带 -，新增行绿色带 +，
+		 * 其余（上下文/文件头/@@ 行）为灰色。逐行解析，保持 monospace 等宽。
+		 */
+		function renderDiff(diff) {
+			if (!diff || typeof diff !== "string") return null;
+			const lines = diff.replace(/\r\n/g, "\n").split("\n");
+			if (lines.length && lines[lines.length - 1] === "") lines.pop();
+			const out = [];
+			for (let i = 0; i < lines.length; i++) {
+				const line = lines[i];
+				let color = T.secondary;
+				if (line.startsWith("+") && !line.startsWith("+++")) color = T.success;
+				else if (line.startsWith("-") && !line.startsWith("---")) color = T.danger;
+				out.push(h("pre", { key: i, style: { margin: 0, padding: "0 6px", fontFamily: "var(--ds-font-family-code, ui-monospace, monospace)", fontSize: 12, lineHeight: 1.6, color, whiteSpace: "pre-wrap", wordBreak: "break-all", background: color === T.success ? "rgba(34,197,94,.10)" : color === T.danger ? "rgba(239,68,68,.10)" : "transparent" } }, line));
+			}
+			return h("div", { style: { background: "rgba(0,0,0,.06)", borderRadius: 8, padding: "6px 2px", margin: "4px 0 8px", maxHeight: 260, overflow: "auto" } }, out);
+		}
+
+		/**
+		 * 把 unified diff 文本解析成「并排」行对（左=旧/删除，右=新/新增）。
+		 * 按 `@@` 块 + `+`/`-`/` ` 前缀配对：删除行与新增行在同一行左右并排显示，
+		 * 上下文行左右相同；`` 与文件头（---/+++ /diff）跳过。
+		 * @returns {Array<{ left: string|null, right: string|null, oldNo?: string, newNo?: string, type: 'del'|'add'|'ctx' }>}
+		 */
+		function parseUnifiedDiff(diff) {
+			if (!diff || typeof diff !== "string") return [];
+			const lines = diff.replace(/\r\n/g, "\n").split("\n");
+			const rows = [];
+			let oldNo = 0, newNo = 0;
+			for (let i = 0; i < lines.length; i++) {
+				const line = lines[i];
+				// 跳过文件头 / 块头。
+				if (line.startsWith("@@")) {
+					const m = /-(\d+)(?:,\d+)?\s+\+(\d+)(?:,\d+)?/.exec(line);
+					if (m) { oldNo = parseInt(m[1], 10) || 1; newNo = parseInt(m[2], 10) || 1; }
+					continue;
+				}
+				if (line.startsWith("---") || line.startsWith("+++") || line.startsWith("diff ") || line.startsWith("index ")) continue;
+				if (line.startsWith("\\")) continue; // ""
+				const c = line.charAt(0);
+				if (c === "-") {
+					rows.push({ left: line.slice(1), right: "", type: "del", oldNo: oldNo++, newNo: "" });
+				} else if (c === "+") {
+					rows.push({ left: "", right: line.slice(1), type: "add", oldNo: "", newNo: newNo++ });
+				} else if (c === " ") {
+					rows.push({ left: line.slice(1), right: line.slice(1), type: "ctx", oldNo: oldNo++, newNo: newNo++ });
+				} else {
+					// 非 diff 行（如无前缀段）：当上下文处理。
+					rows.push({ left: line, right: line, type: "ctx", oldNo: oldNo++, newNo: newNo++ });
+				}
+			}
+			return rows;
+		}
+
+		/** 并排 diff 渲染器：删除行红底居左、新增行绿底居右，上下文两列相同。 */
+		function renderSideBySideDiff(diff) {
+			const rows = parseUnifiedDiff(diff);
+			if (rows.length === 0) return renderDiff(diff);
+			const mono = { fontFamily: "var(--ds-font-family-code, ui-monospace, monospace)", fontSize: 12, lineHeight: 1.55, whiteSpace: "pre-wrap", wordBreak: "break-all" };
+			const cellBg = { del: "rgba(239,68,68,.12)", add: "rgba(34,197,94,.12)", ctx: "transparent" };
+			const gutter = { ...mono, fontSize: 10, lineHeight: 1.55, color: T.secondary, textAlign: "right", padding: "0 6px", whiteSpace: "nowrap", wordBreak: "normal", opacity: 0.7 };
+			return h("div", { style: { border: "1px solid " + T.border, borderRadius: 8, overflow: "hidden", margin: "4px 0 8px", maxHeight: 280, overflowY: "auto", background: "rgba(0,0,0,.04)" } },
+				h("div", { style: { display: "flex", borderBottom: "1px solid " + T.border, position: "sticky", top: 0, background: "var(--dsw-alias-bg-layer-3, #fff)", zIndex: 1 } },
+					h("div", { style: { flex: 1, padding: "3px 8px", fontSize: 12, fontWeight: 600, color: T.danger } }, "旧版本"),
+					h("div", { style: { flex: 1, padding: "3px 8px", fontSize: 12, fontWeight: 600, color: T.success } }, "新版本")
+				),
+				rows.map((r, i) =>
+					h("div", { key: i, style: { display: "flex", background: cellBg[r.type] || "transparent", borderBottom: r.type === "ctx" ? "none" : "1px solid rgba(128,128,128,.1)" } },
+						h("div", { style: { width: 34, flexShrink: 0, ...gutter } }, r.oldNo || ""),
+						h("div", { style: { flex: 1, padding: "0 0 0 2px", color: r.type === "del" ? T.danger : T.label } }, h("pre", { style: { margin: 0, ...mono } }, r.left || " ")),
+						h("div", { style: { width: 34, flexShrink: 0, ...gutter } }, r.newNo || ""),
+						h("div", { style: { flex: 1, padding: "0 0 0 2px", color: r.type === "add" ? T.success : r.type === "del" ? "rgba(128,128,128,.6)" : T.label } }, h("pre", { style: { margin: 0, ...mono } }, r.right || " "))
+					)
+				)
+			);
+		}
+
 		// ---------- the main panel ----------
-		function ScmPanel({ onClose }) {
+		// `variant` 决定布局：'drawer'（右侧栏抽屉，显示关闭按钮）与 'tab'
+		// （作为 dsh-better-sidebar 侧边栏 Tab 内容，填充容器、隐藏关闭按钮）。
+		function ScmPanel({ onClose, variant }) {
 			// 代码托管平台选择在②里操作、在③里跟随：lift 到面板级别共享。
 			const [provider, setProvider] = useState("github");
-			return h("div", { style: panelStyle(T), role: "dialog", "aria-modal": "true", "aria-label": "源代码管理" },
+			const embedded = variant === "tab" || variant === "drawer";
+			return h("div", { style: panelStyle(variant), role: "dialog", "aria-modal": embedded ? undefined : "true", "aria-label": "源代码管理" },
 				h("div", { style: { display: "flex", alignItems: "flex-start", gap: 12 } },
 					h("h2", { style: { margin: 0, fontSize: 16, fontWeight: 600, lineHeight: 1.4, flex: 1 } }, "源代码管理"),
-					h("button", { type: "button", style: closeBtnStyle(T), "aria-label": "关闭", onClick: onClose }, "✕")
+					embedded ? null : h("button", { type: "button", style: closeBtnStyle(T), "aria-label": "关闭", onClick: onClose }, "✕")
 				),
 				h("p", { style: { margin: "6px 0 14px", color: T.secondary, fontSize: 12, lineHeight: 1.6 } },
 					"按顺序完成：①环境检查 → ②SSH 密钥与连接 → ③代码管理。推送会自动忽略 >100MB 的文件（" + (provider === "gitee" ? "Gitee" : "GitHub") + " 限制）并说明原因。"),
@@ -904,7 +1594,18 @@ window.__ModuleLoader__.load({
 			);
 		}
 
-		function panelStyle() {
+		function panelStyle(variant) {
+			// 'tab' / 'drawer'：填充宿主容器（不设固定宽高、无边框阴影圆角），由外层
+			// （dsh-better-sidebar 的 Tab 区或右侧抽屉）负责尺寸与表面。
+			if (variant === "tab" || variant === "drawer") {
+				return {
+					position: "relative", display: "flex", flexDirection: "column", gap: 4,
+					width: "100%", maxWidth: "100%", height: "100%", maxHeight: "100%",
+					boxSizing: "border-box", overflow: "auto",
+					padding: variant === "tab" ? 16 : 20, borderRadius: 0,
+					background: "transparent", border: "none", color: T.label,
+				};
+			}
 			return {
 				position: "relative", zIndex: 1, display: "flex", flexDirection: "column", gap: 4,
 				width: 620, maxWidth: "calc(100vw - 48px)",
@@ -918,19 +1619,15 @@ window.__ModuleLoader__.load({
 			return { appearance: "none", border: "none", background: "transparent", color: T.secondary, cursor: "pointer", fontSize: 18, lineHeight: 1, padding: "2px 6px", borderRadius: 6 };
 		}
 
-		function overlayStyle() {
-			return { position: "fixed", inset: 0, zIndex: 1000, display: "flex", alignItems: "center", justifyContent: "center" };
-		}
 		function maskStyle() {
 			return { position: "absolute", inset: 0, background: T.mask, backdropFilter: "var(--dsw-mask-blur, blur(4px))" };
 		}
 
-		// ---------- the sidebar footer trigger ----------
-		function ScmTrigger({ wide }) {
-			const [open, setOpen] = useState(false);
-
-			const icon = h("svg", {
-				viewBox: "0 0 16 16", width: wide ? 16 : 18, height: wide ? 16 : 18,
+		/** 共享的「仓库 / 分支」小图标：既用于右上角浮动按钮，也用作侧边栏 Tab 图标。 */
+		function repoIcon(size) {
+			const s = size || 18;
+			return h("svg", {
+				viewBox: "0 0 16 16", width: s, height: s,
 				fill: "none", stroke: "currentColor", strokeWidth: 1.5,
 				strokeLinecap: "round", strokeLinejoin: "round", "aria-hidden": "true",
 			},
@@ -938,55 +1635,133 @@ window.__ModuleLoader__.load({
 				h("rect", { x: "1.5", y: "2.5", width: "9", height: "11", rx: "1.5" }),
 				h("path", { d: "M14 6.5v3.5a2 2 0 0 1-2 2H5.5" })
 			);
+		}
 
-			const wideStyle = {
+		/** 右上角浮动按钮样式（未安装 dsh-better-sidebar 时的入口）。 */
+		function floatBtnStyle() {
+			return {
+				position: "fixed", top: 12, right: 16, zIndex: 2147483000,
 				display: "inline-flex", alignItems: "center", gap: 6,
-				height: 30, padding: "0 12px", border: "none", borderRadius: 15,
-				background: "transparent", color: T.secondary, cursor: "pointer",
+				height: 32, padding: "0 12px", border: "none", borderRadius: 16,
+				background: T.brand, color: "#fff", cursor: "pointer",
 				fontSize: 13, lineHeight: 1,
+				boxShadow: "var(--dsw-overlay-shadow, 0 4px 12px rgba(0,0,0,.3))",
 			};
-			const railStyle = {
-				display: "inline-flex", alignItems: "center", justifyContent: "center",
-				width: 36, height: 36, border: "none", borderRadius: "50%", padding: 0,
-				background: "transparent", color: T.secondary, cursor: "pointer",
+		}
+
+		/** 右侧栏抽屉外层样式：右对齐、全高、固定宽度。 */
+		function drawerStyle() {
+			return {
+				position: "relative", zIndex: 1, height: "100%", width: 640, maxWidth: "100vw",
+				marginLeft: "auto", display: "flex", flexDirection: "column",
+				boxSizing: "border-box", padding: 0,
+				background: "var(--dsw-alias-bg-layer-3, #fff)", color: T.label,
+				borderLeft: "1px solid " + T.border,
+				boxShadow: "var(--dsw-overlay-shadow, 0 12px 32px rgba(0,0,0,.35))",
 			};
+		}
 
+		// ---------- branch B:右上角浮动按钮 + 右侧抽屉入口 ----------
+		// 未安装 dsh-better-sidebar 时使用：一个紧贴右上角的浮动按钮，点击后展开
+		// 一个右侧栏抽屉（形态类似 dsh-better-sidebar 的右栏），内容放现有 ScmPanel。
+		function ScmFloatingEntry() {
+			const [open, setOpen] = useState(false);
 			return h(React.Fragment, null,
 				h("button", {
 					type: "button",
-					style: wide ? wideStyle : railStyle,
+					style: floatBtnStyle(),
 					title: "源代码管理",
 					"aria-label": "源代码管理",
 					onClick: () => setOpen(true),
-					onMouseEnter: (e) => { e.currentTarget.style.background = T.hover; e.currentTarget.style.color = T.label; },
-					onMouseLeave: (e) => { e.currentTarget.style.background = "transparent"; e.currentTarget.style.color = T.secondary; },
-				},
-					icon,
-					wide ? h("span", { style: { fontSize: 13 } }, "代码管理") : null
-				),
+				}, repoIcon(16), h("span", { style: { fontSize: 13 } }, "代码管理")),
 				open ? ReactDOM.createPortal(
-					h("div", { style: overlayStyle(), role: "presentation" },
+					h("div", { style: { position: "fixed", inset: 0, zIndex: 1000 }, role: "presentation" },
 						h("div", { style: maskStyle(), "aria-hidden": "true", onClick: () => setOpen(false) }),
-						h(ScmPanel, { onClose: () => setOpen(false) })
+						h("div", { style: drawerStyle() },
+							h(ScmPanel, { variant: "drawer", onClose: () => setOpen(false) })
+						)
 					),
 					document.body
 				) : null
 			);
 		}
 
+		/** 挂载一个经典脚本 React 根（React 18 用 createRoot，老版本回退 render）。 */
+		function mountClientRoot(container, element) {
+			try {
+				if (ReactDOM.createRoot) {
+					const root = ReactDOM.createRoot(container);
+					root.render(element);
+					return root;
+				}
+				if (ReactDOM.render) {
+					ReactDOM.render(element, container);
+					return { unmount: () => ReactDOM.unmountComponentAtNode(container) };
+				}
+			} catch (e) { console.error("[source-code-mgmt] mount failed:", e); }
+			return null;
+		}
+
 		// ---------- cordis plugin body ----------
-		const inject = ["slots"];
+		// 不写死 inject：better-sidebar 是可选集成，未安装时绝不能因为缺服务而让本
+		// 插件报错。改在 apply 里用 ctx.get('betterSidebar') 判空——一次性属性读取，
+		// 零 I/O、零网络，毫秒级，不影响 DSH 启动速度。
+		const inject = [];
+
+		// 是否已安装（并激活）dsh-better-sidebar：决定「③代码管理」是否隐藏本插件自带的
+		// 本地 Git 工作流（暂存/提交/分支/历史/并排 diff）——这些能力 better-sidebar 的
+		// Git 面板已覆盖，装了它就不重复展示。React 组件通过这个模块级标记读取。
+		let hasBetterSidebar = false;
 
 		function apply(ctx) {
 			// DSH 打开（插件激活）时就预取环境/SSH/默认工作区/仓库状态，
 			// 点开「代码管理」面板时直接使用缓存，无需重新加载。
 			void preload();
-			if (!ctx.slots || typeof ctx.slots.inject !== "function") return;
-			ctx.slots.inject("sidebar.footer.action", () => ctx.slots.register({
-				name: "sidebar.footer.action",
-				id: PLUGIN_ID,
-				order: -100,
-			}, ScmTrigger));
+
+			// better-sidebar 是可选集成：若本插件先于它激活，第一次读取会拿到 undefined；
+			// 这里用一次性重试保证无论激活顺序如何，最终都能正确落到分支 A（注册 Tab）。
+			let entryUnmount = null;
+			hasBetterSidebar = false;
+
+			const tryRegisterTab = () => {
+				const bs = typeof ctx.get === "function" ? ctx.get("betterSidebar") : undefined;
+				if (!bs || typeof bs.registerTab !== "function") return false;
+				// 分支 A：已安装 dsh-better-sidebar —— 把「代码管理」注册成它的侧边栏新 Tab
+				// 页面。ctx.effect 保证 HMR / 插件卸载时自动注销该 Tab。
+				hasBetterSidebar = true;
+				ctx.effect(() => bs.registerTab({
+					id: PLUGIN_ID,
+					title: "代码管理",
+					icon: (size) => repoIcon(size),
+					order: 50,
+					single: true,
+					component: () => h(ScmPanel, { variant: "tab" }),
+				}));
+				// 若此前已挂载了分支 B 的浮动按钮，立即拆除它。
+				if (entryUnmount) { entryUnmount(); entryUnmount = null; }
+				return true;
+			};
+
+			if (tryRegisterTab()) return;
+
+			// 分支 B：此刻未检测到 dsh-better-sidebar —— 右上角浮动按钮 + 右侧栏抽屉。
+			if (!ReactDOM) return;
+			ctx.effect(() => {
+				const hostEl = document.createElement("div");
+				hostEl.setAttribute("data-source-code-mgmt-entry", "");
+				document.body.appendChild(hostEl);
+				const root = mountClientRoot(hostEl, h(ScmFloatingEntry));
+				entryUnmount = () => {
+					try { if (root && typeof root.unmount === "function") root.unmount(); } catch {}
+					hostEl.remove();
+				};
+				return () => { if (entryUnmount) { entryUnmount(); entryUnmount = null; } };
+			});
+
+			// 兜底重试一次：better-sidebar 若在本插件之后激活，延迟补注册 Tab 并拆除浮动按钮。
+			// 单次 setTimeout，无轮询、零 I/O，几乎不耗资源；插件卸载时清除。
+			const retryTimer = window.setTimeout(() => { tryRegisterTab(); }, 1500);
+			ctx.effect(() => () => window.clearTimeout(retryTimer));
 		}
 
 		exports.name = PLUGIN_ID;