source-code-mgmt 1.5.0 → 1.10.0

package/lib/client.js

@@ -7,9 +7,13 @@
  *
  *   - 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.
+ *   - branch B: not installed → register a「代码管理」button into the DSH
+ *     `conversation.session.header.utilities` slot (the right-aligned list that
+ *     holds "Session log"), so it sits beside "Session log" with the same pill
+ *     look and 8px gap; clicking opens a RIGHT-side integrated panel (pushing
+ *     #root left, dsh-better-sidebar style) holding the existing panel.
+ *     If the `slots` service is unavailable, it falls back to a floating
+ *     top-right button opening the same right-side panel.
  *
  * The old left-rail bottom button (`sidebar.footer.action` slot) is removed.
  * Either way clicking the entry opens a "源代码管理" panel with:
@@ -55,13 +59,14 @@ window.__ModuleLoader__.load({
 		};
 
 		// ---------- fetch helpers ----------
+		// 每个请求都带上当前语言（?lang=zh|en），host 端据此返回对应语言的错误/结果消息。
 		async function jget(path) {
-			const res = await fetch(API + path);
+			const res = await fetch(API + path + (path.indexOf("?") >= 0 ? "&" : "?") + "lang=" + currentLang());
 			if (!res.ok) throw new Error("HTTP " + String(res.status));
 			return await res.json();
 		}
 		async function jpost(path, body) {
-			const res = await fetch(API + path, {
+			const res = await fetch(API + path + (path.indexOf("?") >= 0 ? "&" : "?") + "lang=" + currentLang(), {
 				method: "POST",
 				headers: { "content-type": "application/json" },
 				body: JSON.stringify(body || {}),
@@ -71,14 +76,15 @@ window.__ModuleLoader__.load({
 		}
 
 		// ---------- preload cache ----------
-		// DSH 打开（插件激活）时就预先检测并缓存，点开「代码管理」面板直接秒显，
-		// 不再每次点击重新加载。
+		// 只在打开插件时按需拉取仓库状态；DSH 打开（插件激活）时只预取静态的 env / ssh /
+		// workspaces / 默认工作区，绝不联网同步仓库——避免打开 DSH 就 fetch、并把可能过期的
+		// 数据缓存起来，导致打开/重开面板时显示旧状态（如旧的「无改动」）。
 		const cache = {
 			env: null,
 			ssh: null,
 			defDir: null,
 			repo: null,
-			// 各工作区的 full 同步结果（dir -> repo 状态），打开 DSH 时预取，切换工作区可秒显。
+			// 各工作区的最近一次结果（dir -> repo 状态），仅作展示历史，不再用于「秒显无刷新」。
 			reposByDir: {},
 			// 单文件改动 diff 缓存（"dir\u0000path" -> diff 文本），点击「查看」秒出。
 			diffs: {},
@@ -122,7 +128,8 @@ window.__ModuleLoader__.load({
 			await Promise.all(workers)
 		}
 
-		/** 预取 env / ssh / default-dir / repo / workspaces，结果写入 cache。可并发安全。 */
+		/** 预取 env / ssh / default-dir / workspaces（仅静态资源），结果写入 cache。可并发安全。
+		 *  注意：仓库状态不在此预取（需要用户打开面板/切换工作区时才按需联网获取，并显示刷新中）。 */
 		function preload() {
 			if (!preloadPromise) {
 				preloadPromise = (async () => {
@@ -144,19 +151,6 @@ window.__ModuleLoader__.load({
 						if (def && def.dir) {
 							cache.defDir = def.dir;
 						}
-						// 打开 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 {
 						/* 保持部分缓存 */
@@ -166,23 +160,6 @@ 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);
@@ -201,6 +178,31 @@ window.__ModuleLoader__.load({
 		// ---------- small presentational bits ----------
 		const h = React.createElement;
 
+// ---------- i18n: follows DSH’s language setting (Settings → General → Language), live ----------
+const EN_DICT = {"展开":"Expand","折叠":"Collapse","展开该部分":"Expand this section","折叠该部分":"Collapse this section","已安装":"Installed","❌ 未安装":"❌ Not installed","复制安装命令":"Copy install command","一键安装（会自动选包管理器）":"Install automatically (picks a package manager)","安装中…":"Installing…","安装":"Install"," 执行成功":" executed successfully","（如未生效需以管理员身份重试）":" (retry as administrator if it did not take effect)","安装失败":"Install failed","① 环境检查":"① Environment","✅ 均存在":"✅ All present","操作系统":"OS","已找到":"Found","检测中":"Checking","失败: ":"Failed: ","未找到的工具可用上方「安装」按钮一键安装（":"Missing tools can be installed with the \"Install\" button above (","Windows 用 winget / 内置功能":"winget / built-in features on Windows","用系统包管理器":"your system package manager","，可能需管理员权限）；也可手动复制安装命令执行，安装后点「重新检查」。":"; admin rights may be required). You can also copy the install command and run it manually, then click \"Re-check\".","重新检查":"Re-check","：已存在，无需重复操作":": already exists, no need to repeat","成功":" succeeded","失败":" failed","失败：":"Failed: ","平台":"Platform","选择代码托管平台：GitHub 或 Gitee（默认 GitHub），③代码管理会跟随切换":"Choose the code hosting platform: GitHub or Gitee (GitHub default); step ③ follows this switch","GitHub（默认）":"GitHub (default)","② SSH 密钥与连接":"② SSH Key & Connection","密钥":"Key"," 已生成":" generated","⚠️ 未生成":"⚠️ Not generated","GH 登录":"GH login","已登录":"Logged in","⚠️ 未登录":"⚠️ Not logged in","SSH 配置":"SSH config"," 已配置(443)":" configured (443)","⚠️ 未配置/限制 22 端口需配置":"⚠️ Not configured / port 22 blocked — use 443","生成密钥":"Generate key","配置 SSH(config)":"Configure SSH config","配置 SSH":"Configure SSH","测试连接":"Test connection","SSH 连接成功（":"SSH connection succeeded (","已认证":"authenticated","连接失败，请确认密钥已上传到 ":"Connection failed. Make sure the key is uploaded to "," 或已登录 gh":" or that gh is logged in","测试失败：":"Test failed: ","公钥（复制上传到 ":"Public key (copy and upload to ","Gitee → 设置 → SSH 公钥":"Gitee → Settings → SSH keys","，或运行 gh auth login 自动上传）：":", or run gh auth login to upload it automatically):","该目录不是 git 仓库":"This folder is not a git repository","读取令牌状态失败：":"Failed to read token status: ","已保存 Gitee 令牌（账号：":"Gitee token saved (account: ","保存令牌失败":"Failed to save token","保存令牌失败：":"Failed to save token: ","已清除 Gitee 令牌":"Gitee token cleared","清除失败":"Clear failed","清除令牌失败：":"Failed to clear token: ","已推送":"Pushed","推送失败":"Push failed","推送失败：":"Push failed: ","已拉取远程更新（本地已对齐到远程最新状态）":"Pulled remote updates (local is now aligned with the latest remote state)","拉取失败":"Pull failed","拉取失败：":"Pull failed: ","已拉取远程更新并推送更改":"Pulled remote updates and pushed changes","合并推送失败":"Merge-push failed","合并推送失败：":"Merge-push failed: ","强制推送会用本地版本覆盖远程仓库，远程上非本地的更改将被丢弃。确定继续？":"Force-push overwrites the remote repo with your local version; remote-only changes will be lost. Continue?","已强制推送，远程已更新为本地状态":"Force-pushed; the remote is now your local state","强制推送失败":"Force-push failed","强制推送失败：":"Force-push failed: ","强制拉取会把远程更新并入本地。如果本地有不想保留的内容，将按冲突处理或遗失。确定继续？":"Force-pull merges remote updates into local; anything you don't want kept may conflict or be lost. Continue?","已强制拉取远程更新":"Force-pulled remote updates","强制拉取失败":"Force-pull failed","强制拉取失败：":"Force-pull failed: ","请先加载一个有效的文件夹":"Load a valid folder first","确定把仓库 ":"Change repo "," 改为「":" visibility to「","公开":"Public","私有":"Private","」？修改可见性可能影响 Star、关注者等。":"」? Changing visibility may affect stars, watchers, etc.","已把仓库设置为「":"Repo set to「","修改可见性失败":"Failed to change visibility","修改可见性失败：":"Failed to change visibility: ","仓库已创建并推送：":"Repo created and pushed: ","创建失败":"Create failed","创建失败：":"Create failed: ","未选择目录":"No folder selected","选择失败：":"Selection failed: ","请输入或选择目录路径":"Enter or pick a folder path","添加目录失败":"Failed to add folder","添加目录失败：":"Failed to add folder: ","删除失败":"Delete failed","删除失败：":"Delete failed: ","强制对齐会用远程分支覆盖本地（丢弃本地未推送的更改与提交），确定继续？":"Force-align overwrites local with the remote branch (drops unpushed local changes and commits). Continue?","已强制对齐到远程分支":"Force-aligned to the remote branch","强制对齐失败":"Force-align failed","强制对齐失败：":"Force-align failed: ","已是 git 仓库":"Already a git repository","已创建 git 仓库，请自行拉取或推送":"Git repository created — pull or push as you wish","创建 git 失败":"Failed to init git","创建 git 失败：":"Failed to init git: ","暂存失败":"Stage failed","暂存失败：":"Stage failed: ","取消暂存失败":"Unstage failed","取消暂存失败：":"Unstage failed: ","已提交 ":"Committed "," 个文件":" file(s)","提交失败":"Commit failed","提交失败：":"Commit failed: ","已提交「":"Committed「","（自动生成）":" (auto-generated)","」并推送":"」 and pushed","已推送本地已有的提交":"Pushed existing local commits","读取分支失败":"Failed to load branches","读取分支失败：":"Failed to load branches: ","切换到分支「":"Switch to branch「","」？（若当前有未提交改动，git 会拒绝切换）":"」? (git will refuse if you have uncommitted changes)","已切换到分支 ":"Switched to branch ","切换分支失败":"Failed to switch branch","切换分支失败：":"Failed to switch branch: ","读取历史失败":"Failed to load history","读取历史失败：":"Failed to load history: ","revert 提交「":"Revert commit「","」——会生成一个反向提交，期间可能产生冲突，确定继续？":"」 — this creates a reverse commit and may cause conflicts. Continue?","已 revert 提交 ":"Reverted commit ","revert 失败":"Revert failed","revert 失败：":"Revert failed: ","cherry-pick 提交「":"Cherry-pick commit「","」到当前分支——期间可能产生冲突，确定继续？":"」 onto the current branch — this may cause conflicts. Continue?","已 cherry-pick 提交 ":"Cherry-picked commit ","cherry-pick 失败":"Cherry-pick failed","cherry-pick 失败：":"Cherry-pick failed: ","读取失败":"Failed to load","已复制":"Copied","短哈希":"short hash","完整哈希":"full hash","提交信息":"commit message","复制失败：请手动复制":"Copy failed — copy it manually","③ 代码管理":"③ Code Management","Gitee 私人令牌（OpenAPI，需 projects 权限）":"Gitee personal token (OpenAPI, requires projects permission)","✅ 已配置":"✅ Configured","（账号 ":" (account ","清除令牌":"Clear token","粘贴 Gitee 私人令牌（https://gitee.com/personal_access_tokens）":"Paste the Gitee personal token (https://gitee.com/personal_access_tokens)","保存令牌":"Save token","令牌只保存在本机 ~/.dsh/storages（0600），不会写进插件目录；需勾选个人令牌的 projects 权限。公钥需已上传到 Gitee（② 里检查）。":"The token is stored only on this machine at ~/.dsh/storages (0600), never in the plugin directory; the personal token must have projects permission. Your public key must be uploaded to Gitee (checked in ②).","选择工作区":"Workspace","选择 DSH 已登记的工作区文件夹":"Choose a workspace folder registered in DSH","（暂无可选工作区）":"(no workspaces available)","— 请选择 —":"— Select —","选择目录":"Choose folder","自定义目录：":"Custom folder: ","删除该目录记录":"Remove this folder entry","删除该目录记录（不删除实际文件夹）":"Remove this folder entry (does not delete the actual folder)","目录":"Folder","分支":"Branch","（无）":"(none)","切换分支":"Switch branch","切换":"Switch","查看提交历史":"View commit history","历史":"History","远程":"Remote","改动":"Changes","无":"None","查看改动的文件列表":"View the list of changed files","查看":"View","同步":"Sync","本地领先 ":"Ahead by "," 提交":" commit(s)","、落后 ":", behind by ","落后 ":"behind by ","与远程一致":"Up to date with remote","查看本地与远程的提交差异":"View commit differences between local and remote","⚠️ 以下 ":"⚠️ The following "," 项 >100MB（超过 GitHub 限制，推送时将自动忽略不上传）：":" item(s) >100MB (over GitHub's limit — auto-ignored on push):","/（整个文件夹）":"/ (entire folder)","创建 Git":"Init Git","仅初始化 git 仓库，不拉取不推送，由你决定下一步":"Initializes a git repo only — no pull/push; you decide the next step","本地有改动且远程有更新，可直接用「强制对齐」将本地重置为远程状态":"You have local changes AND remote updates — use \"Force align\" to reset local to the remote state","强制对齐":"Force align","本地完全重置为远程分支（丢弃本地差异），解决“文件相同仍显示同步差异”的情况":"Fully resets local to the remote branch (drops local differences); fixes \"files identical but sync still shows a difference\"","推送更改":"Push changes","拉取更新":"Pull updates","✓ 已是最新":"✓ Up to date","⟳ 正在刷新状态，联网同步 GitHub/Gitee 最新数据…":"⟳ Refreshing status — syncing the latest GitHub/Gitee data…","⟳ 切换平台，正在重新检测「":"⟳ Switching platform, re-checking「","」仓库状态…":"」 repo status…","推送中…":"Pushing…","推送暂存":"Push staged","把已暂存的内容用填写的（或自动生成的）信息提交后推送到远程；不会自动暂存其他未暂存的改动":"Commits only what is staged (with your message, or auto-generated) and pushes it; does not auto-stage other changes","刷新中…":"Refreshing…","刷新状态":"Refresh status","提交信息（留空则用默认）":"Commit message (default if empty)","填写提交信息后点「提交」；留空则自动生成（chore: update <文件夹名>）":"Type a message then click \"Commit\"; leave empty to auto-generate (chore: update <folder>)","提交":"Commit","仓库名称自动取文件夹名（不可修改）":"Repo name is taken from the folder name (read-only)","（未加载文件夹）":"(no folder loaded)","仓库可见性：私有 / 公开":"Repo visibility: private / public","（修改当前仓库的可见性）":" (changes the current repo's visibility)","新建仓库并推送":"Create repo & push","修改仓库状态":"Change repo status","✓ 仓库已是「":"✓ Repo is already「","」状态，如需修改请调整左侧可见性选择。":"」 — to change it, adjust the visibility dropdown.","将把仓库从「":"Will change the repo from「","」改为「":"」 to「","」，点击「修改仓库状态」执行。":"」 — click \"Change repo status\" to apply.","⚠️ 同名仓库已经创建（无法读取当前可见性，可能未":"⚠️ A repo with this name already exists (couldn't read its visibility — maybe not ","配置 Gitee 令牌":"Gitee token configured","登录 gh":"logged into gh","✓ 同名仓库 ":"✓ No repo named "," 不存在，可在 ":" exists — you can create it on ","「新建仓库并推送」创建（可选私有/公开）。":" with \"Create repo & push\" (private or public).","已忽略未上传（":"Skipped uploads ("," 项 >100MB）：":" item(s) >100MB):","已提交":"Committed"," 并推送":" and pushed","（推送省略）":" (push skipped)","查看详情":"View details","改动文件":"Changed files","提交历史":"Commit history","与远程同步差异":"Sync differences vs remote","关闭":"Close","已安装 dsh-better-sidebar，此处只列改动文件列表；具体改动内容请到 dsh-better-sidebar 的「源代码管理 / Git 面板」查看。":"dsh-better-sidebar is installed — this lists changed files only; see the actual changes in its \"Source Control / Git\" panel.","点击收起":"Click to collapse","点击查看改动内容":"Click to view the diff","新文件（untracked）暂无内容 diff":"New (untracked) file — no diff yet","已暂存":"Staged","未暂存":"Unstaged","取消暂存":"Unstage","暂存":"Stage","加载中…":"Loading…","▾ 收起":"▾ Collapse","▸ 查看":"▸ View","正在加载改动内容…":"Loading changes…","（无内容差异）":"(no diff)","当前没有改动。":"No changes.","正在读取分支…":"Loading branches…","（无分支）":"(no branches)","（当前）":"(current)","正在读取历史…":"Loading history…","（暂无提交）":"(no commits)","更多操作（右键也可打开）":"More actions (right-click also works)","查看提交差异":"View commit diff","复制短哈希":"Copy short hash","复制完整哈希":"Copy full hash","复制提交信息":"Copy commit message","还原此提交":"Revert this commit","拾取此提交":"Cherry-pick this commit","正在加载提交 diff…":"Loading commit diff…","本地落后 ":"Behind by "," 个提交（远程有而本地没有）：":" commit(s) (on remote, not local):"," 个提交（本地有而远程没有）：":" commit(s) (on local, not remote):","✓ 已与远程同步，无差异。":"✓ In sync with remote — no differences.","选择代码目录":"Choose a code folder","可手动输入/粘贴目录绝对路径，或点击「浏览…」弹出本地文件夹选择器。确认后将添加到下方下拉并记住，下次打开无需重新选择。":"Paste an absolute folder path, or click \"Browse…\" for the native picker. Confirmed folders are added to the dropdown and remembered.","C:\\Users\\你的用户名\\项目目录":"C:\\Users\\your-name\\project","浏览…":"Browse…","取消":"Cancel","确定":"OK","新增":"Added","删除":"Deleted","重命名":"Renamed","修改":"Modified","旧版本":"Old","新版本":"New","源代码管理":"Source Control","按顺序完成：①环境检查 → ②SSH 密钥与连接 → ③代码管理。推送会自动忽略 >100MB 的文件（":"Work through in order: ① Environment → ② SSH Key & Connection → ③ Code Management. Files over 100MB are auto-ignored on push ("," 限制）并说明原因。":" limit) with the reason shown.","代码管理":"Code Management","拖动调整面板宽度":"Drag to resize the panel"};
+let scmLang = (() => { try { return String(navigator.language || "zh").toLowerCase().split("-")[0] === "en" ? "en" : "zh" } catch { return "zh" } })();
+let scmLocaleFace = null; // ctx.locale (the DSH LocaleRuntime), set in apply()
+function currentLang() { try { if (scmLocaleFace && typeof scmLocaleFace.getLocale === "function") return scmLocaleFace.getLocale().active } catch {} return scmLang }
+function t(key, params) {
+  let s = key;
+  try { if (currentLang() === "en") s = EN_DICT[key] ?? key } catch {}
+  if (params && params.length) { let i = 0; s = String(s).replace(/\$\{\}/g, () => String(params[i++] ?? "")) }
+  return s
+}
+/** Re-render the subtree when DSH switches language (subscribe to the LocaleRuntime).
+ *  依赖 scmLocaleFace：若 client-locale 晚于本插件激活、捕获发生在组件挂载之后，
+ *  effect 会重跑并补上订阅；订阅后立即重渲染一次，晚捕获时立刻用上当前语言。 */
+function useLocale() {
+  const [, force] = useState(0);
+  useEffect(() => {
+    if (!scmLocaleFace || typeof scmLocaleFace.subscribe !== "function") return;
+    const off = scmLocaleFace.subscribe(() => force((n) => n + 1));
+    force((n) => n + 1);
+    return off;
+  }, [scmLocaleFace]);
+}
+
+
 		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),
@@ -251,8 +253,8 @@ window.__ModuleLoader__.load({
 					canCollapse ? h("span", { style: { flex: 1 } }) : null,
 					canCollapse ? h("button", {
 						type: "button",
-						title: collapsed ? "展开" : "折叠",
-						"aria-label": collapsed ? "展开该部分" : "折叠该部分",
+						title: collapsed ? t("展开") : t("折叠"),
+						"aria-label": collapsed ? t("展开该部分") : t("折叠该部分"),
 						onClick: () => setCollapsed(!collapsed),
 						style: collapseBtnStyle(),
 					}, collapsed ? "▸" : "▾") : null
@@ -316,16 +318,16 @@ window.__ModuleLoader__.load({
 			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: { color: T.label, fontSize: 13 } }, "✅ " + (version || t("已安装")))
 					: 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 ? "安装中…" : "安装")
+						h("span", { style: { color: T.danger, fontSize: 13 } }, t("❌ 未安装")),
+						h("button", { type: "button", title: t("复制安装命令"), disabled: installing !== null, style: changeBtnStyle(), onClick: (e) => { e.stopPropagation(); void copyText(hint); } }, t("复制安装命令")),
+						h("button", { type: "button", title: t("一键安装（会自动选包管理器）"), disabled: installing !== null, style: { ...changeBtnStyle(), color: T.brand, fontWeight: 600 }, onClick: (e) => { e.stopPropagation(); void doInstall(tool); } }, installing === tool ? t("安装中…") : t("安装"))
 					)
 				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 : "")))
+						? h("div", { style: { marginTop: 4, color: T.success, fontSize: 12 } }, "✅ " + (installResult.command || t("已安装")) + t(" 执行成功") + (installResult.needElevation ? t("（如未生效需以管理员身份重试）") : ""))
+						: h("div", { style: { marginTop: 4, color: T.danger, fontSize: 12 } }, "❌ " + (installResult.error || t("安装失败")) + (installResult.command ? "：" + installResult.command : "")))
 					: null
 				return h("div", { key: tool, style: { marginTop: 4 } },
 					h(Field, { label }, status),
@@ -333,16 +335,16 @@ window.__ModuleLoader__.load({
 				)
 			}
 
-			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) : "...")),
+			return h(Box, { title: t("① 环境检查"), badge: allPresent ? t("✅ 均存在") : null, defaultCollapsed: !!allPresent },
+				h(Field, { label: t("操作系统") }, h("span", { style: { color: T.label, fontSize: 13 } }, env ? (env.platformLabel || env.platform) : "...")),
 				env ? h(React.Fragment, null,
 					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 : "…" }),
+					toolRow("ssh", "SSH", !!(env.ssh && env.ssh.installed), env.ssh && env.ssh.installed ? t("已找到") : null)
+				) : h(Field, { label: t("检测中"), value: err ? t("失败: ") + 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" })
+					t("未找到的工具可用上方「安装」按钮一键安装（") + (winOs ? t("Windows 用 winget / 内置功能") : t("用系统包管理器")) + t("，可能需管理员权限）；也可手动复制安装命令执行，安装后点「重新检查」。")
+				) : h(Btn, { label: t("重新检查"), onClick: load, tone: "ghost" })
 			);
 		}
 
@@ -370,11 +372,11 @@ window.__ModuleLoader__.load({
 				setBusy(true); setMsg(null); setErr(null);
 				try {
 					const r = await jpost(path, payload);
-					if (r.alreadyExists || r.alreadyConfigured) setMsg(label + "：已存在，无需重复操作");
-					else if (r.ok) setMsg(label + "成功");
-					else setErr(r.error || label + "失败");
+					if (r.alreadyExists || r.alreadyConfigured) setMsg(label + t("：已存在，无需重复操作"));
+					else if (r.ok) setMsg(label + t("成功"));
+					else setErr(r.error || label + t("失败"));
 					void load();
-				} catch (e) { setErr(label + "失败：" + e); }
+				} catch (e) { setErr(label + t("失败：") + e); }
 				finally { setBusy(false); }
 			}, [load]);
 
@@ -386,52 +388,52 @@ window.__ModuleLoader__.load({
 
 			// 标题行的平台切换下拉：折叠时也可见、可交互；切换后自动展开（要做配置）。
 			const titleExtra = h("span", { style: { display: "inline-flex", alignItems: "center", gap: 6, flexShrink: 0 } },
-				h("span", { style: { fontSize: 12, color: T.secondary } }, "平台"),
+				h("span", { style: { fontSize: 12, color: T.secondary } }, t("平台")),
 				h("select", {
 					value: prov,
 					onChange: (e) => { setProv(e.target.value); setCollapsed(false); },
-					title: "选择代码托管平台：GitHub 或 Gitee（默认 GitHub），③代码管理会跟随切换",
+					title: t("选择代码托管平台：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: "github" }, t("GitHub（默认）")),
 					h("option", { value: "gitee" }, "Gitee"),
 				)
 			);
 
 			return h(Box, {
-				title: "② SSH 密钥与连接",
+				title: t("② 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 ? "✅ " + (ssh.keyBase || "id_ed25519") + " 已生成" : "⚠️ 未生成") : "…")
+				h(Field, { label: t("密钥") }, h("span", { style: { color: T.label, fontSize: 13 } },
+					ssh ? (ssh.hasKey ? "✅ " + (ssh.keyBase || "id_ed25519") + t(" 已生成") : t("⚠️ 未生成")) : "…")
 				),
-				h(Field, { label: "GH 登录" }, h("span", { style: { color: T.label, fontSize: 13 } },
-					ssh ? (ssh.ghLoggedIn ? "✅ " + (ssh.ghAccount || "已登录") : "⚠️ 未登录") : "…")
+				h(Field, { label: t("GH 登录") }, h("span", { style: { color: T.label, fontSize: 13 } },
+					ssh ? (ssh.ghLoggedIn ? "✅ " + (ssh.ghAccount || t("已登录")) : t("⚠️ 未登录")) : "…")
 				),
-				h(Field, { label: "SSH 配置" }, h("span", { style: { color: T.label, fontSize: 13 } },
-					ssh ? (providerConfigured ? "✅ " + providerHost + " 已配置(443)" : "⚠️ 未配置/限制 22 端口需配置") : "…")
+				h(Field, { label: t("SSH 配置") }, h("span", { style: { color: T.label, fontSize: 13 } },
+					ssh ? (providerConfigured ? "✅ " + providerHost + t(" 已配置(443)") : t("⚠️ 未配置/限制 22 端口需配置")) : "…")
 				),
 
 				h("div", { style: { display: "flex", gap: 8, flexWrap: "wrap", marginTop: 10 } },
-					h(Btn, { label: "生成密钥", onClick: () => act("/gen-key", "生成密钥"), disabled: busy }),
-					h(Btn, { label: "配置 SSH(config)", onClick: () => act("/write-config", "配置 SSH", { provider: prov }), disabled: busy }),
-					h(Btn, { label: "测试连接", onClick: async () => {
+					h(Btn, { label: t("生成密钥"), onClick: () => act("/gen-key", t("生成密钥")), disabled: busy }),
+					h(Btn, { label: t("配置 SSH(config)"), onClick: () => act("/write-config", t("配置 SSH"), { provider: prov }), disabled: busy }),
+					h(Btn, { label: t("测试连接"), onClick: async () => {
 						setBusy(true); setErr(null); setMsg(null);
 						try {
 							const r = await jpost("/ssh-test", { provider: prov });
-							if (r.connected) setMsg("SSH 连接成功（" + (prov === "gitee" ? "Gitee" : "GitHub") + "）：" + (r.account ? "Hi " + r.account : "已认证"));
-							else setErr("连接失败，请确认密钥已上传到 " + (prov === "gitee" ? "Gitee" : "GitHub") + " 或已登录 gh");
+							if (r.connected) setMsg(t("SSH 连接成功（") + (prov === "gitee" ? "Gitee" : "GitHub") + "）：" + (r.account ? "Hi " + r.account : t("已认证")));
+							else setErr(t("连接失败，请确认密钥已上传到 ") + (prov === "gitee" ? "Gitee" : "GitHub") + t(" 或已登录 gh"));
 							void load();
-						} catch (e) { setErr("测试失败：" + e); }
+						} catch (e) { setErr(t("测试失败：") + e); }
 						finally { setBusy(false); }
 					}, tone: "primary", noBg: true, disabled: busy }),
 				),
 				ssh && ssh.pubContent ? h("div", { style: { marginTop: 10 } },
-					h("div", { style: { color: T.secondary, fontSize: 12, marginBottom: 4 } }, "公钥（复制上传到 " + (prov === "gitee" ? "Gitee → 设置 → SSH 公钥" : "GitHub → Settings → SSH keys") + "，或运行 gh auth login 自动上传）："),
+					h("div", { style: { color: T.secondary, fontSize: 12, marginBottom: 4 } }, t("公钥（复制上传到 ") + (prov === "gitee" ? t("Gitee → 设置 → SSH 公钥") : "GitHub → Settings → SSH keys") + t("，或运行 gh auth login 自动上传）：")),
 					h("code", { style: { display: "block", whiteSpace: "pre-wrap", wordBreak: "break-all", fontSize: 11, lineHeight: 1.5, color: T.secondary, background: T.layer1, padding: 10, borderRadius: 8 } }, ssh.pubContent)
 				) : null,
 				msg ? h("div", { style: { marginTop: 10, color: T.success, fontSize: 13 } }, "✅ " + msg) : null,
@@ -448,6 +450,8 @@ window.__ModuleLoader__.load({
 			const [dirDraft, setDirDraft] = useState(() => cache.defDir ?? "");
 			const [repo, setRepo] = useState(() => cache.repo);
 			const [busy, setBusy] = useState(false);
+			// 「推送暂存」进行中标记：把已暂存的内容用填写的（或自动生成的）信息提交后推送。
+			const [pushStagedBusy, setPushStagedBusy] = useState(false);
 			// 刷新状态（联网同步）进行中的提示状态，避免刷新时界面闪成「未加载文件夹」。
 			const [refreshing, setRefreshing] = useState(false);
 			// 切换平台（② 里 GitHub/Gitee）时，③ 需要重新拉取对应平台的仓库状态；此标记在拉取期间为真，
@@ -526,28 +530,15 @@ window.__ModuleLoader__.load({
 				// 结果/错误提示，造成「点了按钮没有任何反馈」。需要清空 err 的调用方
 				// （切换目录 / 切换平台 / 刷新状态）自行清空。
 				// full=true 时才让 host 端执行 git fetch 联网同步（用于「刷新状态」及
-				// 推送/拉取/对齐等操作后的刷新）；默认 false（快速模式）：跳过 fetch，
-				// 秒出本地状态。full 模式自动显示「刷新中…」提示，提示只在最新一次调用归来时关闭。
+				// 推送/拉取/对齐等操作后的刷新）；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 = curProv;
 					const r = await jget("/repo?dir=" + encodeURIComponent(d) + "&provider=" + encodeURIComponent(p) + (doFull ? "&full=1" : ""));
@@ -565,10 +556,8 @@ window.__ModuleLoader__.load({
 						setDir(r.dir);
 						cache.defDir = r.dir;
 					}
-					// 缓存最新 repo 状态
+					// 记录最新 repo 状态（仅作展示历史，绝不再用于「无刷新秒显」）。
 					cache.repo = r;
-					// 按目录缓存（含 provider），下次同一平台可用快速缓存秒显；切平台时因 provider
-					// 不匹配会跳过缓存重新拉取，避免显示上个平台的检测内容。
 					if (r && r.dir) cache.reposByDir[r.dir] = r;
 					// 默认可见性：优先当前仓库实际状态；无远程（即将新建的仓库）默认「公开」。
 					syncVisibility(r);
@@ -576,7 +565,7 @@ window.__ModuleLoader__.load({
 					// 先清掉上次残留的缓存（文件集刚可能变化），再并发拉取。
 					clearDiffCache(r && r.dir);
 					if (!hasBetterSidebar) void prefetchDiffs(r && r.dir, r && r.changedFiles, 3);
-					if (r && !r.isGitRepo) setErr(r.error || "该目录不是 git 仓库");
+					if (r && !r.isGitRepo) setErr(r.error || t("该目录不是 git 仓库"));
 				} catch (e) { setErr(String(e)); }
 				finally {
 					// 只有本次是最新调用时才收起「刷新中…」提示，避免旧请求失败把提示提前关掉。
@@ -585,9 +574,9 @@ window.__ModuleLoader__.load({
 			}, []);
 
 			useEffect(() => {
-				// 首次加载：优先用 DSH 打开时已 full 同步好的 cache.repo 秒显；
-				// 无论预加载是否已在此时完成，都走 preload()（幂等），在 .then 里
-				// 直接用预取结果，避免「先显示（未加载文件夹）空白再等一会儿」。
+				// 首次加载：只预取静态的 env/ssh/workspaces/默认目录；仓库状态一律在面板打开后
+				// 通过 loadRepo(..., true) 联网获取最新（并显示「刷新中…」），绝不命中可能过期的
+				// 缓存——这样关闭面板再打开、或切换工作区，都会重新同步，不会停留在旧的「无改动」。
 				if (cache.workspaces && cache.workspaces.length) setWorkspaces(cache.workspaces);
 				if (cache.customDirs && cache.customDirs.length) setCustomDirs(cache.customDirs);
 				void preload().then(() => {
@@ -598,15 +587,8 @@ window.__ModuleLoader__.load({
 						|| dir || "";
 					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);
-					}
+					// 始终 full 同步（联网 fetch + 显示刷新中），获取当前工作区的最新状态。
+					loadRepo(d, true, true);
 				});
 				// eslint-disable-next-line react-hooks/exhaustive-deps
 			}, []);
@@ -619,7 +601,7 @@ window.__ModuleLoader__.load({
 					setGiteeOwnerName(r.owner || "");
 					setGiteeTokenMsg(null);
 					setGiteeTokenErr(null);
-				} catch (e) { setGiteeConfigured(false); setGiteeTokenErr("读取令牌状态失败：" + e); }
+				} catch (e) { setGiteeConfigured(false); setGiteeTokenErr(t("读取令牌状态失败：") + e); }
 			}, []);
 
 			const saveGiteeToken = useCallback(async () => {
@@ -630,14 +612,14 @@ window.__ModuleLoader__.load({
 						setGiteeConfigured(true);
 						setGiteeOwnerName(r.owner || "");
 						setGiteeToken("");
-						setGiteeTokenMsg("已保存 Gitee 令牌（账号：" + (r.owner || "？") + "）");
+						setGiteeTokenMsg(t("已保存 Gitee 令牌（账号：") + (r.owner || "？") + "）");
 						// 令牌就绪后刷新仓库，让同名检测等按 Gitee 生效
-						loadRepo(dir || cache.defDir || "", true);
+						loadRepo(dir || cache.defDir || "", true, true);
 					} else {
 						setGiteeConfigured(false);
-						setGiteeTokenErr(r.error || "保存令牌失败");
+						setGiteeTokenErr(r.error || t("保存令牌失败"));
 					}
-				} catch (e) { setGiteeConfigured(false); setGiteeTokenErr("保存令牌失败：" + e); }
+				} catch (e) { setGiteeConfigured(false); setGiteeTokenErr(t("保存令牌失败：") + e); }
 				finally { setGiteeTokenBusy(false); }
 			}, [giteeToken, dir, loadRepo]);
 
@@ -648,9 +630,9 @@ window.__ModuleLoader__.load({
 					setGiteeConfigured(false);
 					setGiteeOwnerName("");
 					setGiteeToken("");
-					setGiteeTokenMsg(r.ok ? "已清除 Gitee 令牌" : "清除失败");
-					loadRepo(dir || cache.defDir || "", true);
-				} catch (e) { setGiteeTokenErr("清除令牌失败：" + e); }
+					setGiteeTokenMsg(r.ok ? t("已清除 Gitee 令牌") : t("清除失败"));
+					loadRepo(dir || cache.defDir || "", true, true);
+				} catch (e) { setGiteeTokenErr(t("清除令牌失败：") + e); }
 				finally { setGiteeTokenBusy(false); }
 			}, [dir, loadRepo]);
 
@@ -662,7 +644,7 @@ window.__ModuleLoader__.load({
 				if (dir || cache.defDir) {
 					// 显示「切换平台，正在重新检测…」提示，避免切换后旧内容停留几秒看起来像没变化。
 					setSwitching(true);
-					loadRepo(dir || cache.defDir || "", true).finally(() => setSwitching(false));
+					loadRepo(dir || cache.defDir || "", true, true).finally(() => setSwitching(false));
 				}
 				// eslint-disable-next-line react-hooks/exhaustive-deps
 			}, [prov]);
@@ -672,10 +654,10 @@ window.__ModuleLoader__.load({
 				try {
 					const r = await jpost("/push", { dir: dir || undefined });
 					setResult(r);
-					if (r.ok) setMsg("已推送");
-					else setErr(r.error || r.pushError || "推送失败");
+					if (r.ok) setMsg(t("已推送"));
+					else setErr(r.error || r.pushError || t("推送失败"));
 					void loadRepo(dir, true, true);
-				} catch (e) { setErr("推送失败：" + e); }
+				} catch (e) { setErr(t("推送失败：") + e); }
 				finally { setBusy(false); }
 			}, [dir, loadRepo]);
 
@@ -688,10 +670,10 @@ window.__ModuleLoader__.load({
 				try {
 					const r = await jpost("/align", { dir: dir || undefined });
 					setResult(r);
-					if (r.ok) setMsg("已拉取远程更新（本地已对齐到远程最新状态）");
-					else setErr(r.error || "拉取失败");
+					if (r.ok) setMsg(t("已拉取远程更新（本地已对齐到远程最新状态）"));
+					else setErr(r.error || t("拉取失败"));
 					void loadRepo(dir, true, true);
-				} catch (e) { setErr("拉取失败：" + e); }
+				} catch (e) { setErr(t("拉取失败：") + e); }
 				finally { setBusy(false); }
 			}, [dir, loadRepo]);
 
@@ -700,66 +682,66 @@ window.__ModuleLoader__.load({
 				try {
 					const r = await jpost("/merge-push", { dir: dir || undefined });
 					setResult(r);
-					if (r.ok) setMsg("已拉取远程更新并推送更改");
-					else setErr(r.error || "合并推送失败");
+					if (r.ok) setMsg(t("已拉取远程更新并推送更改"));
+					else setErr(r.error || t("合并推送失败"));
 					void loadRepo(dir, true, true);
-				} catch (e) { setErr("合并推送失败：" + e); }
+				} catch (e) { setErr(t("合并推送失败：") + e); }
 				finally { setBusy(false); }
 			}, [dir, loadRepo]);
 
 			const forcePush = useCallback(async () => {
-				if (!window.confirm("强制推送会用本地版本覆盖远程仓库，远程上非本地的更改将被丢弃。确定继续？")) return;
+				if (!window.confirm(t("强制推送会用本地版本覆盖远程仓库，远程上非本地的更改将被丢弃。确定继续？"))) return;
 				setBusy(true); setMsg(null); setErr(null); setResult(null);
 				try {
 					const r = await jpost("/force-push", { dir: dir || undefined });
 					setResult(r);
-					if (r.ok) setMsg("已强制推送，远程已更新为本地状态");
-					else setErr(r.error || "强制推送失败");
+					if (r.ok) setMsg(t("已强制推送，远程已更新为本地状态"));
+					else setErr(r.error || t("强制推送失败"));
 					void loadRepo(dir, true, true);
-				} catch (e) { setErr("强制推送失败：" + e); }
+				} catch (e) { setErr(t("强制推送失败：") + e); }
 				finally { setBusy(false); }
 			}, [dir, loadRepo]);
 
 			const forcePull = useCallback(async () => {
-				if (!window.confirm("强制拉取会把远程更新并入本地。如果本地有不想保留的内容，将按冲突处理或遗失。确定继续？")) return;
+				if (!window.confirm(t("强制拉取会把远程更新并入本地。如果本地有不想保留的内容，将按冲突处理或遗失。确定继续？"))) return;
 				setBusy(true); setMsg(null); setErr(null); setResult(null);
 				try {
 					const r = await jpost("/force-pull", { dir: dir || undefined });
 					setResult(r);
-					if (r.ok) setMsg("已强制拉取远程更新");
-					else setErr(r.error || "强制拉取失败");
+					if (r.ok) setMsg(t("已强制拉取远程更新"));
+					else setErr(r.error || t("强制拉取失败"));
 					void loadRepo(dir, true, true);
-				} catch (e) { setErr("强制拉取失败：" + e); }
+				} catch (e) { setErr(t("强制拉取失败：") + e); }
 				finally { setBusy(false); }
 			}, [dir, loadRepo]);
 
 			const changeVisibility = useCallback(async () => {
 				const name = (repo && repo.defaultRepoName) || "";
-				if (!name) { setErr("请先加载一个有效的文件夹"); return; }
+				if (!name) { setErr(t("请先加载一个有效的文件夹")); return; }
 				const target = visibility === "public" ? "public" : "private";
-				if (!window.confirm("确定把仓库 " + name + " 改为「" + (target === "public" ? "公开" : "私有") + "」？修改可见性可能影响 Star、关注者等。")) return;
+				if (!window.confirm(t("确定把仓库 ") + name + t(" 改为「") + (target === "public" ? t("公开") : t("私有")) + t("」？修改可见性可能影响 Star、关注者等。"))) return;
 				setBusy(true); setMsg(null); setErr(null); setResult(null);
 				try {
 					const r = await jpost("/set-visibility", { dir: dir || undefined, name, visibility: target, provider: provRef.current || "github" });
 					setResult(r);
-					if (r.ok) setMsg("已把仓库设置为「" + (target === "public" ? "公开" : "私有") + "」");
-					else setErr(r.error || "修改可见性失败");
+					if (r.ok) setMsg(t("已把仓库设置为「") + (target === "public" ? t("公开") : t("私有")) + "」");
+					else setErr(r.error || t("修改可见性失败"));
 					void loadRepo(dir, true, true);
-				} catch (e) { setErr("修改可见性失败：" + e); }
+				} catch (e) { setErr(t("修改可见性失败：") + e); }
 				finally { setBusy(false); }
 			}, [dir, repo, visibility, loadRepo]);
 
 			const create = useCallback(async () => {
 				const name = (repo && repo.defaultRepoName) || "";
-				if (!name) { setErr("请先加载一个有效的文件夹"); return; }
+				if (!name) { setErr(t("请先加载一个有效的文件夹")); return; }
 				setBusy(true); setMsg(null); setErr(null); setResult(null);
 				try {
 					const r = await jpost("/create", { dir: dir || undefined, name, visibility, provider: provRef.current || "github" });
 					setResult(r);
-					if (r.ok) setMsg("仓库已创建并推送：" + (r.url || name) + (r.provider === "gitee" ? "（Gitee）" : ""));
-					else setErr(r.error || "创建失败");
+					if (r.ok) setMsg(t("仓库已创建并推送：") + (r.url || name) + (r.provider === "gitee" ? "（Gitee）" : ""));
+					else setErr(r.error || t("创建失败"));
 					void loadRepo(dir, true, true);
-				} catch (e) { setErr("创建失败：" + e); }
+				} catch (e) { setErr(t("创建失败：") + e); }
 				finally { setBusy(false); }
 			}, [dir, repo, visibility, loadRepo]);
 
@@ -776,15 +758,15 @@ window.__ModuleLoader__.load({
 				try {
 					const r = await jpost("/pick-dir", { initial: pickPath || cache.defDir || undefined });
 					if (r.ok && r.dir) setPickPath(r.dir);
-					else setPickErr(r.error || "未选择目录");
-				} catch (e) { setPickErr("选择失败：" + e); }
+					else setPickErr(r.error || t("未选择目录"));
+				} catch (e) { setPickErr(t("选择失败：") + e); }
 				finally { setPicking(false); }
 			}, [pickPath]);
 
 			// 确认：持久化加入列表 + 加载
 			const confirmPick = useCallback(async () => {
 				const path = String(pickPath || "").trim();
-				if (!path) { setPickErr("请输入或选择目录路径"); return; }
+				if (!path) { setPickErr(t("请输入或选择目录路径")); return; }
 				setPicking(true); setPickErr(null);
 				try {
 					const r = await jpost("/add-workspace", { dir: path });
@@ -796,11 +778,11 @@ window.__ModuleLoader__.load({
 						// 切换到新目录，清空上一个目录的操作结果/提示。
 						setResult(null); setMsg(null); setErr(null);
 						setPickOpen(false);
-						loadRepo(r.dir);
+						loadRepo(r.dir, true, true);
 					} else {
-						setPickErr(r.error || "添加目录失败");
+						setPickErr(r.error || t("添加目录失败"));
 					}
-				} catch (e) { setPickErr("添加目录失败：" + e); }
+				} catch (e) { setPickErr(t("添加目录失败：") + e); }
 				finally { setPicking(false); }
 			}, [pickPath, loadRepo]);
 
@@ -822,26 +804,26 @@ window.__ModuleLoader__.load({
 						if (dir === path) {
 							const next = (r.workspaces && r.workspaces[0]) || "";
 							setDir(next); setDirDraft(next);
-							if (next) loadRepo(next); else setRepo(null);
+							if (next) loadRepo(next, true, true); else setRepo(null);
 						}
 					} else {
-						setErr(r.error || "删除失败");
+						setErr(r.error || t("删除失败"));
 					}
-				} catch (e) { setErr("删除失败：" + e); }
+				} catch (e) { setErr(t("删除失败：") + e); }
 				finally { setBusy(false); }
 			}, [dir, loadRepo]);
 
 			// 强制对齐：本地完全重置为远程分支状态（丢弃本地差异）
 			const align = useCallback(async () => {
-				if (!window.confirm("强制对齐会用远程分支覆盖本地（丢弃本地未推送的更改与提交），确定继续？")) return;
+				if (!window.confirm(t("强制对齐会用远程分支覆盖本地（丢弃本地未推送的更改与提交），确定继续？"))) return;
 				setBusy(true); setMsg(null); setErr(null); setResult(null);
 				try {
 					const r = await jpost("/align", { dir: dir || undefined });
 					setResult(r);
-					if (r.ok) setMsg("已强制对齐到远程分支");
-					else setErr(r.error || "强制对齐失败");
-					void loadRepo(dir);
-				} catch (e) { setErr("强制对齐失败：" + e); }
+					if (r.ok) setMsg(t("已强制对齐到远程分支"));
+					else setErr(r.error || t("强制对齐失败"));
+					void loadRepo(dir, true, true);
+				} catch (e) { setErr(t("强制对齐失败：") + e); }
 				finally { setBusy(false); }
 			}, [dir, loadRepo]);
 
@@ -851,10 +833,10 @@ window.__ModuleLoader__.load({
 				try {
 					const r = await jpost("/init-git", { dir: dir || undefined });
 					setResult(r);
-					if (r.ok) setMsg(r.alreadyRepo ? "已是 git 仓库" : "已创建 git 仓库，请自行拉取或推送");
-					else setErr(r.error || "创建 git 失败");
-					void loadRepo(dir);
-				} catch (e) { setErr("创建 git 失败：" + e); }
+					if (r.ok) setMsg(r.alreadyRepo ? t("已是 git 仓库") : t("已创建 git 仓库，请自行拉取或推送"));
+					else setErr(r.error || t("创建 git 失败"));
+					void loadRepo(dir, true, true);
+				} catch (e) { setErr(t("创建 git 失败：") + e); }
 				finally { setBusy(false); }
 			}, [dir, loadRepo]);
 
@@ -869,9 +851,9 @@ window.__ModuleLoader__.load({
 						// 暂存会改变文件的 staged 状态：清掉该目录的缓存快照，强制走网络路径
 						// 重新拉取最新 repo（含最新「已暂存/未暂存」标记），并清 diff 展开状态。
 						if (dir) delete cache.reposByDir[dir];
-						loadRepo(dir, true);
-					} else setErr(r.error || "暂存失败");
-				} catch (e) { setErr("暂存失败：" + e); }
+						loadRepo(dir, true, true);
+					} else setErr(r.error || t("暂存失败"));
+				} catch (e) { setErr(t("暂存失败：") + e); }
 				finally { setStageBusy(false); }
 			}, [dir, loadRepo]);
 
@@ -882,9 +864,9 @@ window.__ModuleLoader__.load({
 					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); }
+						loadRepo(dir, true, true);
+					} else setErr(r.error || t("取消暂存失败"));
+				} catch (e) { setErr(t("取消暂存失败：") + e); }
 				finally { setStageBusy(false); }
 			}, [dir, loadRepo]);
 
@@ -897,38 +879,58 @@ window.__ModuleLoader__.load({
 					const r = await jpost("/commit", { dir: dir || undefined, message });
 					setResult(r);
 					if (r.ok) {
-						setMsg("已提交 " + r.staged + " 个文件" + (r.hash ? "（" + r.hash + "）" : ""));
+						setMsg(t("已提交 ") + r.staged + t(" 个文件") + (r.hash ? "（" + r.hash + "）" : ""));
 						setCommitMsg("");
 						void loadRepo(dir, true, true);
-					} else setErr(r.error || "提交失败");
-				} catch (e) { setErr("提交失败：" + e); }
+					} else setErr(r.error || t("提交失败"));
+				} catch (e) { setErr(t("提交失败：") + e); }
 				finally { setBusy(false); }
 			}, [dir, repo, commitMsg, repoName, loadRepo]);
 
+			// 「推送暂存」：把已暂存的内容用填写的（或自动生成的）信息提交后推送远程。
+			// 与「推送更改」不同：它只提交暂存区、沿用自定义信息，不自动 add 全部改动。
+			const doPushStaged = useCallback(async () => {
+				setPushStagedBusy(true); setMsg(null); setErr(null); setResult(null);
+				try {
+					const r = await jpost("/push-staged", { dir: dir || undefined, message: commitMsg.trim() });
+					setResult(r);
+					if (r.ok) {
+						const info = r.committed
+							? t("已提交「") + (r.message || t("（自动生成）")) + t("」并推送") + (r.commitHash ? "（" + r.commitHash + "）" : "")
+							: t("已推送本地已有的提交");
+						setMsg(info);
+						setCommitMsg("");
+					} else setErr(r.error || r.pushError || t("推送失败"));
+					// 推送成功后刷新状态（full 联网同步，显示「刷新中…」）。
+					void loadRepo(dir, true, true);
+				} catch (e) { setErr(t("推送失败：") + e); }
+				finally { setPushStagedBusy(false); }
+			}, [dir, commitMsg, 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); }
+					else setErr(r.error || t("读取分支失败"));
+				} catch (e) { setErr(t("读取分支失败：") + e); }
 				finally { setBranchBusy(false); }
 			}, [dir]);
 
 			// 切换到某分支。
 			const doCheckout = useCallback(async (branch) => {
 				if (branch === branchCurrent) { setDetail(null); return; }
-				if (!window.confirm("切换到分支「" + branch + "」？（若当前有未提交改动，git 会拒绝切换）")) return;
+				if (!window.confirm(t("切换到分支「") + branch + t("」？（若当前有未提交改动，git 会拒绝切换）"))) return;
 				setBranchBusy(true); setMsg(null); setErr(null);
 				try {
 					const r = await jpost("/checkout", { dir: dir || undefined, branch });
 					if (r.ok) {
-						setMsg("已切换到分支 " + branch);
+						setMsg(t("已切换到分支 ") + branch);
 						setDetail(null);
 						void loadRepo(dir, true, true);
-					} else setErr(r.error || "切换分支失败");
-				} catch (e) { setErr("切换分支失败：" + e); }
+					} else setErr(r.error || t("切换分支失败"));
+				} catch (e) { setErr(t("切换分支失败：") + e); }
 				finally { setBranchBusy(false); }
 			}, [dir, branchCurrent, loadRepo]);
 
@@ -938,38 +940,38 @@ window.__ModuleLoader__.load({
 				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); }
+					else setErr(r.error || t("读取历史失败"));
+				} catch (e) { setErr(t("读取历史失败：") + e); }
 				finally { setCommitsLoading(false); }
 			}, [dir]);
 
 			// 对某提交执行 revert（改写历史，需确认）。
 			const doRevert = useCallback(async (hash, subject) => {
-				if (!window.confirm("revert 提交「" + (subject || hash) + "」——会生成一个反向提交，期间可能产生冲突，确定继续？")) return;
+				if (!window.confirm(t("revert 提交「") + (subject || hash) + t("」——会生成一个反向提交，期间可能产生冲突，确定继续？"))) return;
 				setHistoryBusy(true); setMsg(null); setErr(null);
 				try {
 					const r = await jpost("/revert", { dir: dir || undefined, hash });
 					if (r.ok) {
-						setMsg("已 revert 提交 " + hash);
+						setMsg(t("已 revert 提交 ") + hash);
 						setDetail(null);
 						void loadRepo(dir, true, true);
-					} else setErr(r.error || "revert 失败");
-				} catch (e) { setErr("revert 失败：" + e); }
+					} else setErr(r.error || t("revert 失败"));
+				} catch (e) { setErr(t("revert 失败：") + e); }
 				finally { setHistoryBusy(false); }
 			}, [dir, loadRepo]);
 
 			// 对某提交执行 cherry-pick（改写历史，需确认）。
 			const doCherryPick = useCallback(async (hash, subject) => {
-				if (!window.confirm("cherry-pick 提交「" + (subject || hash) + "」到当前分支——期间可能产生冲突，确定继续？")) return;
+				if (!window.confirm(t("cherry-pick 提交「") + (subject || hash) + t("」到当前分支——期间可能产生冲突，确定继续？"))) return;
 				setHistoryBusy(true); setMsg(null); setErr(null);
 				try {
 					const r = await jpost("/cherrypick", { dir: dir || undefined, hash });
 					if (r.ok) {
-						setMsg("已 cherry-pick 提交 " + hash);
+						setMsg(t("已 cherry-pick 提交 ") + hash);
 						setDetail(null);
 						void loadRepo(dir, true, true);
-					} else setErr(r.error || "cherry-pick 失败");
-				} catch (e) { setErr("cherry-pick 失败：" + e); }
+					} else setErr(r.error || t("cherry-pick 失败"));
+				} catch (e) { setErr(t("cherry-pick 失败：") + e); }
 				finally { setHistoryBusy(false); }
 			}, [dir, loadRepo]);
 
@@ -979,7 +981,7 @@ window.__ModuleLoader__.load({
 				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 });
+					setHistoryDetail({ hash, loading: false, diff: (r && r.diff) || "", error: r && !r.ok ? (r.error || t("读取失败")) : null });
 				} catch (e) {
 					setHistoryDetail({ hash, loading: false, diff: "", error: String(e) });
 				}
@@ -994,42 +996,42 @@ window.__ModuleLoader__.load({
 				const ok = await copyText(text);
 				setCommitMenu(null);
 				if (ok) {
-					setCopiedTip("已复制" + (kind === "short" ? "短哈希" : kind === "full" ? "完整哈希" : "提交信息"));
+					setCopiedTip(t("已复制") + (kind === "short" ? t("短哈希") : kind === "full" ? t("完整哈希") : t("提交信息")));
 					window.setTimeout(() => setCopiedTip(null), 1600);
 				} else {
-					setErr("复制失败：请手动复制");
+					setErr(t("复制失败：请手动复制"));
 				}
 			}, []);
 
-			return h(Box, { title: "③ 代码管理" },
+			return h(Box, { title: t("③ 代码管理") },
 				// 平台提示 + Gitee 令牌（仅 gitee 模式）
 				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 权限）"),
+						t("Gitee 私人令牌（OpenAPI，需 projects 权限）")),
 					giteeConfigured === true
 						? h("div", { style: { display: "flex", alignItems: "center", gap: 8, flexWrap: "wrap" } },
-							h("span", { style: { color: T.success, fontSize: 12 } }, "✅ 已配置" + (giteeOwnerName ? "（账号 " + giteeOwnerName + "）" : "")),
-							h(Btn, { label: "清除令牌", onClick: clearGiteeToken, disabled: giteeTokenBusy, noBg: true, tone: "danger" })
+							h("span", { style: { color: T.success, fontSize: 12 } }, t("✅ 已配置") + (giteeOwnerName ? t("（账号 ") + giteeOwnerName + "）" : "")),
+							h(Btn, { label: t("清除令牌"), onClick: clearGiteeToken, disabled: giteeTokenBusy, noBg: true, tone: "danger" })
 						)
 						: h("div", null,
 							h("div", { style: { display: "flex", gap: 8, flexWrap: "wrap", alignItems: "center" } },
 								h("input", {
 									type: "password", value: giteeToken, disabled: giteeTokenBusy,
-									placeholder: "粘贴 Gitee 私人令牌（https://gitee.com/personal_access_tokens）",
+									placeholder: t("粘贴 Gitee 私人令牌（https://gitee.com/personal_access_tokens）"),
 									onChange: (e) => setGiteeToken(e.target.value),
 									onKeyDown: (e) => { if (e.key === "Enter") void saveGiteeToken(); },
 									style: { flex: 1, minWidth: 200, font: "inherit", fontSize: 12, padding: "6px 10px", border: "1px solid " + T.border, borderRadius: 8, background: "var(--dsw-alias-bg-layer-2, rgba(128,128,128,.14))", color: T.label, outline: "none" },
 								}),
-								h(Btn, { label: "保存令牌", onClick: saveGiteeToken, tone: "primary", noBg: true, disabled: giteeTokenBusy || !String(giteeToken || "").trim() }),
+								h(Btn, { label: t("保存令牌"), onClick: saveGiteeToken, tone: "primary", noBg: true, disabled: giteeTokenBusy || !String(giteeToken || "").trim() }),
 							),
 							h("div", { style: { fontSize: 11, color: T.secondary, marginTop: 6, lineHeight: 1.6 } },
-								"令牌只保存在本机 ~/.dsh/storages（0600），不会写进插件目录；需勾选个人令牌的 projects 权限。公钥需已上传到 Gitee（② 里检查）。")
+								t("令牌只保存在本机 ~/.dsh/storages（0600），不会写进插件目录；需勾选个人令牌的 projects 权限。公钥需已上传到 Gitee（② 里检查）。"))
 						),
 					giteeTokenMsg ? h("div", { style: { marginTop: 6, color: T.success, fontSize: 12 } }, "✅ " + giteeTokenMsg) : null,
 					giteeTokenErr ? h("div", { style: { marginTop: 6, color: T.danger, fontSize: 12 } }, "❌ " + giteeTokenErr) : null
 				) : null,
 				h("div", { style: { display: "flex", gap: 8, marginBottom: 10, alignItems: "center" } },
-					h("span", { style: { color: T.secondary, fontSize: 13, whiteSpace: "nowrap" } }, "选择工作区"),
+					h("span", { style: { color: T.secondary, fontSize: 13, whiteSpace: "nowrap" } }, t("选择工作区")),
 					h("select", {
 						value: dir,
 						disabled: workspaces.length === 0,
@@ -1040,85 +1042,86 @@ window.__ModuleLoader__.load({
 							setResult(null); setMsg(null); setErr(null);
 							setDir(v);
 							setDirDraft(v);
-							loadRepo(v);
+							// full 同步：联网获取切换后工作区的最新状态，并显示「刷新中…」。
+							loadRepo(v, true, true);
 						},
-						title: "选择 DSH 已登记的工作区文件夹",
+						title: t("选择 DSH 已登记的工作区文件夹"),
 						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", cursor: "pointer" },
 					},
-						workspaces.length === 0 ? h("option", { key: "__empty", value: "" }, "（暂无可选工作区）")
-							: h("option", { key: "__none", value: "" }, "— 请选择 —"),
+						workspaces.length === 0 ? h("option", { key: "__empty", value: "" }, t("（暂无可选工作区）"))
+							: h("option", { key: "__none", value: "" }, t("— 请选择 —")),
 						workspaces.map((w) =>
 							h("option", { key: w, value: w }, String(w).split(/[\\/]/).filter(Boolean).pop() || w)
 						)
 					),
-					h(Btn, { label: "选择目录", onClick: openPicker, disabled: picking, noBg: true, tone: "primary" }),
+					h(Btn, { label: t("选择目录"), onClick: openPicker, disabled: picking, noBg: true, tone: "primary" }),
 				),
 				dir && customDirs && customDirs.includes(dir) ? h("div", { style: { display: "flex", flexWrap: "wrap", gap: 6, marginBottom: 10, alignItems: "center" } },
-					h("span", { style: { color: T.secondary, fontSize: 12, whiteSpace: "nowrap" } }, "自定义目录："),
-					h("span", { key: dir, style: { display: "inline-flex", alignItems: "center", gap: 4, padding: "2px 8px", border: "1px solid " + T.border, borderRadius: 12, fontSize: 12, background: T.layer1, color: T.label, cursor: "pointer" }, title: dir, onClick: () => { setResult(null); setMsg(null); setErr(null); setDir(dir); setDirDraft(dir); loadRepo(dir); } },
+					h("span", { style: { color: T.secondary, fontSize: 12, whiteSpace: "nowrap" } }, t("自定义目录：")),
+					h("span", { key: dir, style: { display: "inline-flex", alignItems: "center", gap: 4, padding: "2px 8px", border: "1px solid " + T.border, borderRadius: 12, fontSize: 12, background: T.layer1, color: T.label, cursor: "pointer" }, title: dir, onClick: () => { setResult(null); setMsg(null); setErr(null); setDir(dir); setDirDraft(dir); loadRepo(dir, true, true); } },
 						String(dir).split(/[\\/]/).filter(Boolean).pop() || dir,
 						h("span", {
-							role: "button", "aria-label": "删除该目录记录",
-							title: "删除该目录记录（不删除实际文件夹）",
+							role: "button", "aria-label": t("删除该目录记录"),
+							title: t("删除该目录记录（不删除实际文件夹）"),
 							onClick: (e) => { e.stopPropagation(); void removeWorkspace(dir); },
 							style: { color: T.danger, fontWeight: 700, padding: "0 2px", cursor: "pointer" },
 						}, "✕")
 					)
 				) : null,
 				repo && repo.isGitRepo ? h("div", { style: { marginBottom: 10 } },
-					h(Field, { label: "目录", value: repo.dir }),
-					h(Field, { label: "分支" }, h("span", { style: { display: "inline-flex", alignItems: "center", gap: 8 } },
-						h("span", { style: { color: T.label, fontSize: 13 } }, repo.branch || "（无）"),
+					h(Field, { label: t("目录"), value: repo.dir }),
+					h(Field, { label: t("分支") }, h("span", { style: { display: "inline-flex", alignItems: "center", gap: 8 } },
+						h("span", { style: { color: T.label, fontSize: 13 } }, repo.branch || t("（无）")),
 						!hasBetterSidebar ? h(React.Fragment, null,
 							repo.branch ? h("button", {
 								type: "button",
 								onClick: openBranches,
-								title: "切换分支",
+								title: t("切换分支"),
 								style: changeBtnStyle(),
-							}, "切换") : null,
+							}, t("切换")) : null,
 							h("button", {
 								type: "button",
 								onClick: openHistory,
-								title: "查看提交历史",
+								title: t("查看提交历史"),
 								style: changeBtnStyle(),
-							}, "历史")
+							}, t("历史"))
 						) : 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 + " 个文件" : "无"),
+					h(Field, { label: t("远程"), value: repo.remoteUrl || t("（无）") }),
+					h(Field, { label: t("改动") }, h("span", { style: { display: "inline-flex", alignItems: "center", gap: 8 } },
+						h("span", { style: { color: T.label, fontSize: 13 } }, repo.dirty ? repo.dirtyCount + t(" 个文件") : t("无")),
 						repo.changedFiles && repo.changedFiles.length > 0 ? h("button", {
 							type: "button",
 							onClick: () => setDetail("changes"),
-							title: "查看改动的文件列表",
+							title: t("查看改动的文件列表"),
 							style: changeBtnStyle(),
-						}, "查看")
+						}, t("查看"))
 							: null
 					)),
-					h(Field, { label: "同步" }, h("span", { style: { display: "inline-flex", alignItems: "center", gap: 8 } },
+					h(Field, { label: t("同步") }, h("span", { style: { display: "inline-flex", alignItems: "center", gap: 8 } },
 						h("span", { style: { color: T.label, fontSize: 13 } },
 							// 没有（属于当前账号/平台的）远程时不做同步判断，避免误显示「与远程一致」
 							!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) ? "与远程一致" : "")
+								? t("（无）")
+								: (repo.ahead > 0 ? t("本地领先 ") + repo.ahead + t(" 提交") : "") +
+								  (repo.ahead > 0 && repo.behind > 0 ? t("、落后 ") + repo.behind + t(" 提交") : (repo.behind > 0 ? t("落后 ") + repo.behind + t(" 提交") : "")) +
+								  ((repo.ahead === 0 && repo.behind === 0) ? t("与远程一致") : "")
 						),
 						(repo.ahead > 0 || repo.behind > 0) ? h("button", {
 							type: "button",
 							onClick: () => setDetail("sync"),
-							title: "查看本地与远程的提交差异",
+							title: t("查看本地与远程的提交差异"),
 							style: changeBtnStyle(),
-						}, "查看")
+						}, t("查看"))
 							: null
 					)),
 					repo.ignoredLarge && repo.ignoredLarge.length > 0 ? h("div", { style: { marginTop: 8 } },
 						h("div", { style: { color: T.warn, fontSize: 12, marginBottom: 4 } },
-							"⚠️ 以下 " + repo.ignoredLarge.length + " 项 >100MB（超过 GitHub 限制，推送时将自动忽略不上传）："),
+							t("⚠️ 以下 ") + repo.ignoredLarge.length + t(" 项 >100MB（超过 GitHub 限制，推送时将自动忽略不上传）：")),
 						h("div", { style: { maxHeight: 120, overflow: "auto", background: T.layer1, borderRadius: 8, padding: 8 } },
 							repo.ignoredLarge.slice(0, 30).map((f, i) =>
 								h("div", { key: i, style: { fontSize: 11, color: T.secondary, lineHeight: 1.5 } },
-									(f.kind === "dir" ? "📁 " + f.path + "/（整个文件夹）" : "📄 " + f.path) +
+									(f.kind === "dir" ? "📁 " + f.path + t("/（整个文件夹）") : "📄 " + f.path) +
 									" — " + fmtMB(f.bytes))
 							)
 						)
@@ -1134,7 +1137,7 @@ window.__ModuleLoader__.load({
 					const btns = [];
 					// 非 git 仓库但远程存在同名仓库 -> 只「创建 Git」（由用户决定后续拉取/推送）
 					if (repo && !repo.isGitRepo && repo.repoExists === true) {
-						btns.push(h(Btn, { key: "init", label: "创建 Git", onClick: initGit, tone: "primary", noBg: true, disabled: isBlocked, title: "仅初始化 git 仓库，不拉取不推送，由你决定下一步" }));
+						btns.push(h(Btn, { key: "init", label: t("创建 Git"), onClick: initGit, tone: "primary", noBg: true, disabled: isBlocked, title: t("仅初始化 git 仓库，不拉取不推送，由你决定下一步") }));
 					} else if (hasRemote) {
 						if (localChanges && remoteUpdates) {
 							// 本地和远程都有更新：原名展示「拉取更新并推送更改 / 强制推送 /
@@ -1142,34 +1145,45 @@ window.__ModuleLoader__.load({
 							// 分支保护等原因失败且行为难预测，故不再展示——该状态唯一的
 							// 操作按钮是「强制对齐」（fetch + reset --hard，本地完全重置为远程）。
 							btns.push(h("span", { key: "both-note", style: { color: T.warn, fontSize: 12 } },
-								"本地有改动且远程有更新，可直接用「强制对齐」将本地重置为远程状态"));
+								t("本地有改动且远程有更新，可直接用「强制对齐」将本地重置为远程状态")));
 							if (repo && repo.isGitRepo) {
-								btns.push(h(Btn, { key: "align", label: "强制对齐", onClick: align, disabled: isBlocked, title: "本地完全重置为远程分支（丢弃本地差异），解决“文件相同仍显示同步差异”的情况" }));
+								btns.push(h(Btn, { key: "align", label: t("强制对齐"), onClick: align, disabled: isBlocked, title: t("本地完全重置为远程分支（丢弃本地差异），解决“文件相同仍显示同步差异”的情况") }));
 							}
 						} else if (localChanges) {
 							// 只有本地有更改 -> 只显示推送（正常 push）
-							btns.push(h(Btn, { key: "push", label: "推送更改", onClick: push, tone: "primary", noBg: true, disabled: isBlocked || repo?.repoExists === false }));
+							btns.push(h(Btn, { key: "push", label: t("推送更改"), onClick: push, tone: "primary", noBg: true, disabled: isBlocked || repo?.repoExists === false }));
 						} else if (remoteUpdates) {
 							// 只有远程有更新（本地干净）-> 只显示「拉取更新」。
 							// 实现复用「强制对齐」逻辑（fetch + reset --hard）：本地干净
 							// 无改动可丢，reset 等同快速前进到远程最新，直接执行不弹确认。
-							btns.push(h(Btn, { key: "pull", label: "拉取更新", onClick: pull, disabled: isBlocked || repo?.repoExists !== true }));
+							btns.push(h(Btn, { key: "pull", label: t("拉取更新"), onClick: pull, disabled: isBlocked || repo?.repoExists !== true }));
 						} else {
 							// 完全同步 -> 无按钮，显示已是最新
-							btns.push(h("span", { key: "synced", style: { color: T.success, fontSize: 13 } }, "✓ 已是最新"));
+							btns.push(h("span", { key: "synced", style: { color: T.success, fontSize: 13 } }, t("✓ 已是最新")));
 						}
 					}
 					// 刷新/切换平台进行中给出明确提示，让用户知道正在联网同步或重新检测。
 					const refreshingTip = refreshing
-						? h("div", { style: { color: T.brand, fontSize: 12, marginTop: 8 } }, "⟳ 正在刷新状态，联网同步 GitHub/Gitee 最新数据…")
+						? h("div", { style: { color: T.brand, fontSize: 12, marginTop: 8 } }, t("⟳ 正在刷新状态，联网同步 GitHub/Gitee 最新数据…"))
 						: switching
-						? h("div", { style: { color: T.brand, fontSize: 12, marginTop: 8 } }, "⟳ 切换平台，正在重新检测「" + (prov === "gitee" ? "Gitee" : "GitHub") + "」仓库状态…")
+						? h("div", { style: { color: T.brand, fontSize: 12, marginTop: 8 } }, t("⟳ 切换平台，正在重新检测「") + (prov === "gitee" ? "Gitee" : "GitHub") + t("」仓库状态…"))
 						: null
 					return h("div", { style: { display: "flex", gap: 8, flexWrap: "wrap", alignItems: "center" } },
 						btns,
+						// 「推送暂存」：放在「推送更改」与「刷新状态」之间，按需显示——
+						// 有远程且「本地领先有提交」或「有已暂存的改动」时才出现（未装 better-sidebar 时）。
+						(!hasBetterSidebar && repo && repo.hasRemote
+							&& (repo.ahead > 0 || ((repo.changedFiles || []).some((f) => f.staged)))) ? h(Btn, {
+							key: "push-staged",
+							label: pushStagedBusy ? t("推送中…") : t("推送暂存"),
+							onClick: doPushStaged,
+							tone: "primary", noBg: true,
+							disabled: busy || pushStagedBusy || !dir,
+							title: t("把已暂存的内容用填写的（或自动生成的）信息提交后推送到远程；不会自动暂存其他未暂存的改动"),
+						}) : null,
 						// keepRepo=true 保留旧内容避免闪烁；full=true 触发 loadRepo 的「刷新中…」提示 + 联网同步。
 						h(Btn, {
-							label: refreshing ? "刷新中…" : "刷新状态",
+							label: refreshing ? t("刷新中…") : t("刷新状态"),
 							onClick: () => { setResult(null); setMsg(null); setErr(null); loadRepo(dir, true, true); },
 							disabled: busy || refreshing,
 						}),
@@ -1180,62 +1194,62 @@ window.__ModuleLoader__.load({
 				!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 <文件夹名>）",
+						placeholder: t("提交信息（留空则用默认）"),
+						title: t("填写提交信息后点「提交」；留空则自动生成（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 }),
+					h(Btn, { label: t("提交"), 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,
-						title: "仓库名称自动取文件夹名（不可修改）",
-						placeholder: "（未加载文件夹）",
+						title: t("仓库名称自动取文件夹名（不可修改）"),
+						placeholder: t("（未加载文件夹）"),
 						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", cursor: "not-allowed", opacity: 0.85 },
 					}),
 					h("select", {
 						value: visibility,
 						onChange: (e) => setVisibility(e.target.value),
-						title: "仓库可见性：私有 / 公开" + (repo && repo.repoExists === true ? "（修改当前仓库的可见性）" : ""),
+						title: t("仓库可见性：私有 / 公开") + (repo && repo.repoExists === true ? t("（修改当前仓库的可见性）") : ""),
 						style: { font: "inherit", fontSize: 12, padding: "6px 8px", border: "1px solid " + T.border, borderRadius: 8, background: T.layer1, color: T.label, outline: "none", cursor: "pointer" },
 					},
-						h("option", { value: "private" }, "私有"),
-						h("option", { value: "public" }, "公开")
+						h("option", { value: "private" }, t("私有")),
+						h("option", { value: "public" }, t("公开"))
 					),
 					repo && repo.repoExists === true ? (
 						// 仓库已存在：根据所选值与当前实际可见性决定按钮 / 提示
 						repo.visibility === visibility ? h(Btn, {
-							key: "create", label: "新建仓库并推送", onClick: create, tone: "success",
+							key: "create", label: t("新建仓库并推送"), onClick: create, tone: "success",
 							disabled: true,
 						}) : h(Btn, {
-							key: "setvis", label: "修改仓库状态", onClick: changeVisibility, tone: "success",
+							key: "setvis", label: t("修改仓库状态"), onClick: changeVisibility, tone: "success",
 							disabled: busy || !repoName,
 						})
 					) : h(Btn, {
-						key: "create", label: "新建仓库并推送", onClick: create, tone: "success",
+						key: "create", label: t("新建仓库并推送"), onClick: create, tone: "success",
 						disabled: busy || !repoName,
 					})
 				),
 				repo && repo.repoExists === true ? h("div", { style: { marginTop: 8, fontSize: 12 } },
 					repo.visibility
 						? (repo.visibility === visibility
-							? h("span", { style: { color: T.success } }, "✓ 仓库已是「" + (repo.visibility === "public" ? "公开" : "私有") + "」状态，如需修改请调整左侧可见性选择。")
-							: h("span", { style: { color: T.warn } }, "将把仓库从「" + (repo.visibility === "public" ? "公开" : "私有") + "」改为「" + (visibility === "public" ? "公开" : "私有") + "」，点击「修改仓库状态」执行。"))
-						: h("span", { style: { color: T.secondary } }, "⚠️ 同名仓库已经创建（无法读取当前可见性，可能未" + (prov === "gitee" ? "配置 Gitee 令牌" : "登录 gh") + "）")
+							? h("span", { style: { color: T.success } }, t("✓ 仓库已是「") + (repo.visibility === "public" ? t("公开") : t("私有")) + t("」状态，如需修改请调整左侧可见性选择。"))
+							: h("span", { style: { color: T.warn } }, t("将把仓库从「") + (repo.visibility === "public" ? t("公开") : t("私有")) + t("」改为「") + (visibility === "public" ? t("公开") : t("私有")) + t("」，点击「修改仓库状态」执行。")))
+						: h("span", { style: { color: T.secondary } }, t("⚠️ 同名仓库已经创建（无法读取当前可见性，可能未") + (prov === "gitee" ? t("配置 Gitee 令牌") : t("登录 gh")) + "）")
 				) : repo && repo.repoExists === false ? h("div", { style: { marginTop: 8, color: T.success, fontSize: 12 } },
-					"✓ 同名仓库 " + repoName + " 不存在，可在 " + (prov === "gitee" ? "Gitee" : "GitHub") + "「新建仓库并推送」创建（可选私有/公开）。"
+					t("✓ 同名仓库 ") + repoName + t(" 不存在，可在 ") + (prov === "gitee" ? "Gitee" : "GitHub") + t("「新建仓库并推送」创建（可选私有/公开）。")
 				) : null,
 
 				result ? h("div", { style: { marginTop: 12, borderTop: "1px solid " + T.border, paddingTop: 10 } },
 					msg ? h("div", { style: { color: T.success, fontSize: 13 } }, "✅ " + msg) : null,
 					result.skipped && result.skipped.length > 0 ? h("div", { style: { marginTop: 8 } },
 						h("div", { style: { color: T.warn, fontSize: 12, marginBottom: 4 } },
-							"已忽略未上传（" + result.skipped.length + " 项 >100MB）："),
+							t("已忽略未上传（") + result.skipped.length + t(" 项 >100MB）：")),
 						result.skipped.map((s, i) => h("div", { key: i, style: { fontSize: 11, color: T.warn, lineHeight: 1.5 } }, "· " + s.path + " — " + s.reason)))
 					: result.ok ? h("div", { style: { color: T.success, fontSize: 12, marginTop: 6 } },
-						"已提交" + (result.commitHash ? " " + result.commitHash : "") + (result.pushed ? " 并推送" : "（推送省略）"))
+						t("已提交") + (result.commitHash ? " " + result.commitHash : "") + (result.pushed ? t(" 并推送") : t("（推送省略）")))
 					: err ? h("div", { style: { marginTop: 8, color: T.danger, fontSize: 12 } }, "❌ " + err)
 					: result.pushError ? h("div", { style: { marginTop: 8, color: T.danger, fontSize: 12 } }, "❌ " + result.pushError)
 					: null
@@ -1243,19 +1257,19 @@ 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: 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: { 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": t("查看详情") },
 							h("div", { style: { display: "flex", alignItems: "flex-start", gap: 12, marginBottom: 10 } },
 								h("div", { style: { fontSize: 15, fontWeight: 600, flex: 1 } },
-									detail === "changes" ? "改动文件"
-										: detail === "branches" ? "切换分支"
-										: detail === "history" ? "提交历史"
-										: "与远程同步差异"),
-								h("button", { type: "button", style: closeBtnStyle(), "aria-label": "关闭", onClick: () => setDetail(null) }, "✕")
+									detail === "changes" ? t("改动文件")
+										: detail === "branches" ? t("切换分支")
+										: detail === "history" ? t("提交历史")
+										: t("与远程同步差异")),
+								h("button", { type: "button", style: closeBtnStyle(), "aria-label": t("关闭"), onClick: () => setDetail(null) }, "✕")
 							),
 							h("div", { style: { flex: 1, overflow: "auto" } },
 								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 面板」查看。")
+										t("已安装 dsh-better-sidebar，此处只列改动文件列表；具体改动内容请到 dsh-better-sidebar 的「源代码管理 / Git 面板」查看。"))
 										: null,
 									repo && repo.changedFiles && repo.changedFiles.length > 0
 										? repo.changedFiles.map((f, i) => {
@@ -1297,46 +1311,46 @@ window.__ModuleLoader__.load({
 														borderBottom: "1px solid " + T.border, padding: "3px 2px",
 														cursor: canHaveDiff ? "pointer" : "default",
 													},
-													title: canHaveDiff ? (open ? "点击收起" : "点击查看改动内容") : "新文件（untracked）暂无内容 diff",
+													title: canHaveDiff ? (open ? t("点击收起") : t("点击查看改动内容")) : t("新文件（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("span", { style: { fontSize: 11, flexShrink: 0, color: f.staged ? T.success : T.secondary } }, f.staged ? t("已暂存") : t("未暂存")),
 														h("button", {
 															type: "button",
-															title: f.staged ? "取消暂存" : "暂存",
+															title: f.staged ? t("取消暂存") : t("暂存"),
 															disabled: stageBusy,
 															style: changeBtnStyle(),
 															onClick: (e) => { e.stopPropagation(); if (f.staged) void doUnstage(f.path); else void doStage(f.path); },
-														}, f.staged ? "取消暂存" : "暂存"),
+														}, f.staged ? t("取消暂存") : t("暂存")),
 														canHaveDiff ? h("span", { style: { color: T.brand, fontSize: 11, flexShrink: 0 } },
-															d.loading ? "加载中…" : (open ? "▾ 收起" : "▸ 查看"))
+															d.loading ? t("加载中…") : (open ? t("▾ 收起") : t("▸ 查看")))
 															: null
 													) : null
 												),
 												open && canHaveDiff ? (
-													d.loading ? h("div", { style: { fontSize: 12, color: T.secondary, padding: "4px 8px" } }, "正在加载改动内容…")
+													d.loading ? h("div", { style: { fontSize: 12, color: T.secondary, padding: "4px 8px" } }, t("正在加载改动内容…"))
 														: 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" } }, "（无内容差异）")
+														: d.diff ? renderSideBySideDiff(d.diff) : h("div", { style: { fontSize: 12, color: T.secondary, padding: "4px 8px" } }, t("（无内容差异）"))
 												) : null
 											);
 										})
-										: h("div", { style: { color: T.secondary, fontSize: 13 } }, "当前没有改动。")
+										: h("div", { style: { color: T.secondary, fontSize: 13 } }, t("当前没有改动。"))
 								) : detail === "branches" ? (
-									branchBusy ? h("div", { style: { color: T.secondary, fontSize: 13 } }, "正在读取分支…")
-										: branches.length === 0 ? h("div", { style: { color: T.secondary, fontSize: 13 } }, "（无分支）")
+									branchBusy ? h("div", { style: { color: T.secondary, fontSize: 13 } }, t("正在读取分支…"))
+										: branches.length === 0 ? h("div", { style: { color: T.secondary, fontSize: 13 } }, t("（无分支）"))
 										: 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
+													b + (b === branchCurrent ? t("（当前）") : "")),
+												b !== branchCurrent ? h(Btn, { label: t("切换"), 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 } }, "（暂无提交）")
+									commitsLoading ? h("div", { style: { color: T.secondary, fontSize: 13 } }, t("正在读取历史…"))
+										: commits.length === 0 ? h("div", { style: { color: T.secondary, fontSize: 13 } }, t("（暂无提交）"))
 										: commits.map((c) => {
 											const hd = historyDetail && historyDetail.hash === c.hash ? historyDetail : null
 											const menuOpen = commitMenu === c.hashFull
@@ -1349,28 +1363,28 @@ window.__ModuleLoader__.load({
 												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("button", { type: "button", title: t("更多操作（右键也可打开）"), 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("span", { style: { width: 16, fontSize: 11, textAlign: "center", color: T.secondary } }, "▸"), t("查看提交差异")),
 													h("div", { ...hoverProps(), style: menuItemStyle(), onClick: () => copyCommit("short", c) },
-														h("span", { style: { width: 16, fontSize: 11, textAlign: "center", color: T.secondary } }, "⧉"), "复制短哈希"),
+														h("span", { style: { width: 16, fontSize: 11, textAlign: "center", color: T.secondary } }, "⧉"), t("复制短哈希")),
 													h("div", { ...hoverProps(), style: menuItemStyle(), onClick: () => copyCommit("full", c) },
-														h("span", { style: { width: 16, fontSize: 11, textAlign: "center", color: T.secondary } }, "⧉"), "复制完整哈希"),
+														h("span", { style: { width: 16, fontSize: 11, textAlign: "center", color: T.secondary } }, "⧉"), t("复制完整哈希")),
 													h("div", { ...hoverProps(), style: menuItemStyle(), onClick: () => copyCommit("msg", c) },
-														h("span", { style: { width: 16, fontSize: 11, textAlign: "center", color: T.secondary } }, "⧉"), "复制提交信息"),
+														h("span", { style: { width: 16, fontSize: 11, textAlign: "center", color: T.secondary } }, "⧉"), t("复制提交信息")),
 													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("span", { style: { width: 16, fontSize: 11, textAlign: "center", color: T.danger } }, "↩"), t("还原此提交")),
 													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 } }, "↪"), "拾取此提交")
+														h("span", { style: { width: 16, fontSize: 11, textAlign: "center", color: T.danger } }, "↪"), t("拾取此提交"))
 												) : null,
 												hd ? (
-													hd.loading ? h("div", { style: { fontSize: 12, color: T.secondary, padding: "4px 8px" } }, "正在加载提交 diff…")
+													hd.loading ? h("div", { style: { fontSize: 12, color: T.secondary, padding: "4px 8px" } }, t("正在加载提交 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" } }, "（无内容差异）")
+														: hd.diff ? renderSideBySideDiff(hd.diff) : h("div", { style: { fontSize: 12, color: T.secondary, padding: "4px 8px" } }, t("（无内容差异）"))
 												) : null
 											)
 										})
@@ -1378,18 +1392,18 @@ window.__ModuleLoader__.load({
 									h("div", null,
 										repo && (repo.ahead > 0 || repo.behind > 0) ? h("div", null,
 											repo.behind > 0 ? h("div", { style: { marginBottom: 10 } },
-												h("div", { style: { color: T.warn, fontSize: 12, fontWeight: 600, marginBottom: 4 } }, "本地落后 " + repo.behind + " 个提交（远程有而本地没有）："),
+												h("div", { style: { color: T.warn, fontSize: 12, fontWeight: 600, marginBottom: 4 } }, t("本地落后 ") + repo.behind + t(" 个提交（远程有而本地没有）：")),
 												repo.behindCommits && repo.behindCommits.length > 0
 													? repo.behindCommits.map((c, i) => h("div", { key: i, style: { fontSize: 12, color: T.secondary, lineHeight: 1.7, fontFamily: "var(--ds-font-family-code, ui-monospace, monospace)" } }, c))
 													: null
 											) : null,
 											repo.ahead > 0 ? h("div", null,
-												h("div", { style: { color: T.brand, fontSize: 12, fontWeight: 600, marginBottom: 4 } }, "本地领先 " + repo.ahead + " 个提交（本地有而远程没有）："),
+												h("div", { style: { color: T.brand, fontSize: 12, fontWeight: 600, marginBottom: 4 } }, t("本地领先 ") + repo.ahead + t(" 个提交（本地有而远程没有）：")),
 												repo.aheadCommits && repo.aheadCommits.length > 0
 													? repo.aheadCommits.map((c, i) => h("div", { key: i, style: { fontSize: 12, color: T.secondary, lineHeight: 1.7, fontFamily: "var(--ds-font-family-code, ui-monospace, monospace)" } }, c))
 													: null
 											) : null
-										) : h("div", { style: { color: T.success, fontSize: 13 } }, "✓ 已与远程同步，无差异。")
+										) : h("div", { style: { color: T.success, fontSize: 13 } }, t("✓ 已与远程同步，无差异。"))
 									)
 								)
 							)
@@ -1400,22 +1414,22 @@ window.__ModuleLoader__.load({
 				pickOpen ? 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: cancelPick }),
-						h("div", { style: { position: "relative", zIndex: 1, width: 480, maxWidth: "calc(100vw - 48px)", 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: { fontSize: 15, fontWeight: 600, marginBottom: 10 } }, "选择代码目录"),
+						h("div", { style: { position: "relative", zIndex: 1, width: 480, maxWidth: "calc(100vw - 48px)", 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": t("选择目录") },
+							h("div", { style: { fontSize: 15, fontWeight: 600, marginBottom: 10 } }, t("选择代码目录")),
 							h("div", { style: { fontSize: 12, color: T.secondary, marginBottom: 8, lineHeight: 1.6 } },
-								"可手动输入/粘贴目录绝对路径，或点击「浏览…」弹出本地文件夹选择器。确认后将添加到下方下拉并记住，下次打开无需重新选择。"),
+								t("可手动输入/粘贴目录绝对路径，或点击「浏览…」弹出本地文件夹选择器。确认后将添加到下方下拉并记住，下次打开无需重新选择。")),
 							h("input", {
 								type: "text", value: pickPath, disabled: picking,
-								placeholder: "C:\\Users\\你的用户名\\项目目录",
+								placeholder: t("C:\\Users\\你的用户名\\项目目录"),
 								onChange: (e) => setPickPath(e.target.value),
 								onKeyDown: (e) => { if (e.key === "Enter") void confirmPick(); },
 								style: { width: "100%", boxSizing: "border-box", font: "inherit", fontSize: 13, padding: "8px 10px", border: "1px solid " + T.border, borderRadius: 8, background: T.layer1, color: T.label, outline: "none" },
 							}),
 							pickErr ? h("div", { style: { marginTop: 8, color: T.danger, fontSize: 12 } }, "❌ " + pickErr) : null,
 							h("div", { style: { display: "flex", gap: 8, marginTop: 14, justifyContent: "flex-end" } },
-								h(Btn, { label: "浏览…", onClick: browseDir, disabled: picking, noBg: true }),
-								h(Btn, { label: "取消", onClick: cancelPick, disabled: picking }),
-								h(Btn, { label: "确定", onClick: confirmPick, tone: "primary", noBg: true, disabled: picking || !String(pickPath || "").trim() })
+								h(Btn, { label: t("浏览…"), onClick: browseDir, disabled: picking, noBg: true }),
+								h(Btn, { label: t("取消"), onClick: cancelPick, disabled: picking }),
+								h(Btn, { label: t("确定"), onClick: confirmPick, tone: "primary", noBg: true, disabled: picking || !String(pickPath || "").trim() })
 							)
 						)
 					),
@@ -1485,13 +1499,13 @@ window.__ModuleLoader__.load({
 			} catch { return false; }
 		}
 
-		/** Chinese label for a changed-file status type. */
-		function typeLabel(t) {
-			return { untracked: "新增", added: "新增", deleted: "删除", renamed: "重命名", modified: "修改" }[t] || "修改";
+		/** Localized label for a changed-file status type. */
+		function typeLabel(type) {
+			return { untracked: t("新增"), added: t("新增"), deleted: t("删除"), renamed: t("重命名"), modified: t("修改") }[type] || t("修改");
 		}
 		/** Color for a changed-file status type. */
-		function typeColor(t) {
-			return { untracked: T.success, added: T.success, deleted: T.danger, renamed: T.warn, modified: T.brand }[t] || T.label;
+		function typeColor(type) {
+			return { untracked: T.success, added: T.success, deleted: T.danger, renamed: T.warn, modified: T.brand }[type] || T.label;
 		}
 
 		/**
@@ -1558,8 +1572,8 @@ window.__ModuleLoader__.load({
 			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 } }, "新版本")
+					h("div", { style: { flex: 1, padding: "3px 8px", fontSize: 12, fontWeight: 600, color: T.danger } }, t("旧版本")),
+					h("div", { style: { flex: 1, padding: "3px 8px", fontSize: 12, fontWeight: 600, color: T.success } }, t("新版本"))
 				),
 				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)" } },
@@ -1573,19 +1587,21 @@ window.__ModuleLoader__.load({
 		}
 
 		// ---------- the main panel ----------
-		// `variant` 决定布局：'drawer'（右侧栏抽屉，显示关闭按钮）与 'tab'
+		// `variant` 决定布局：'drawer'（右侧栏集成面板，显示关闭按钮、填充容器）与 'tab'
 		// （作为 dsh-better-sidebar 侧边栏 Tab 内容，填充容器、隐藏关闭按钮）。
 		function ScmPanel({ onClose, variant }) {
+			// 跟随 DSH 语言设置：切换语言时整个面板（①②③）实时重渲染。
+			useLocale();
 			// 代码托管平台选择在②里操作、在③里跟随：lift 到面板级别共享。
 			const [provider, setProvider] = useState("github");
 			const embedded = variant === "tab" || variant === "drawer";
-			return h("div", { style: panelStyle(variant), role: "dialog", "aria-modal": embedded ? undefined : "true", "aria-label": "源代码管理" },
+			return h("div", { style: panelStyle(variant), role: "dialog", "aria-modal": embedded ? undefined : "true", "aria-label": t("源代码管理") },
 				h("div", { style: { display: "flex", alignItems: "flex-start", gap: 12 } },
-					h("h2", { style: { margin: 0, fontSize: 16, fontWeight: 600, lineHeight: 1.4, flex: 1 } }, "源代码管理"),
-					embedded ? null : h("button", { type: "button", style: closeBtnStyle(T), "aria-label": "关闭", onClick: onClose }, "✕")
+					h("h2", { style: { margin: 0, fontSize: 16, fontWeight: 600, lineHeight: 1.4, flex: 1 } }, t("源代码管理")),
+					variant === "tab" ? null : h("button", { type: "button", style: closeBtnStyle(T), "aria-label": t("关闭"), onClick: onClose }, "✕")
 				),
 				h("p", { style: { margin: "6px 0 14px", color: T.secondary, fontSize: 12, lineHeight: 1.6 } },
-					"按顺序完成：①环境检查 → ②SSH 密钥与连接 → ③代码管理。推送会自动忽略 >100MB 的文件（" + (provider === "gitee" ? "Gitee" : "GitHub") + " 限制）并说明原因。"),
+					t("按顺序完成：①环境检查 → ②SSH 密钥与连接 → ③代码管理。推送会自动忽略 >100MB 的文件（") + (provider === "gitee" ? "Gitee" : "GitHub") + t(" 限制）并说明原因。")),
 				h(EnvSection, null),
 				h("div", { style: { height: 12 } }),
 				h(SshSection, { provider, setProvider }),
@@ -1595,8 +1611,8 @@ window.__ModuleLoader__.load({
 		}
 
 		function panelStyle(variant) {
-			// 'tab' / 'drawer'：填充宿主容器（不设固定宽高、无边框阴影圆角），由外层
-			// （dsh-better-sidebar 的 Tab 区或右侧抽屉）负责尺寸与表面。
+			// 'tab' / 'drawer'：填充宿主容器（不设固定宽高、无边框阴影圆角），
+			// 由外层（dsh-better-sidebar 的 Tab 区或本插件的右侧面板）负责尺寸与表面。
 			if (variant === "tab" || variant === "drawer") {
 				return {
 					position: "relative", display: "flex", flexDirection: "column", gap: 4,
@@ -1619,11 +1635,31 @@ 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 maskStyle() {
-			return { position: "absolute", inset: 0, background: T.mask, backdropFilter: "var(--dsw-mask-blur, blur(4px))" };
+		/** 注入的布局推挤样式（仅一次）：右侧面板展开时把 #root 往左推，形成「集成侧边栏」，
+		 *  与 dsh-better-sidebar 右侧面板同一机制（margin + width calc）。 */
+		const LAYOUT_CSS_ID = "source-code-mgmt-layout";
+		let layoutCssInjected = false;
+		function ensureLayoutCss() {
+			if (layoutCssInjected) return;
+			layoutCssInjected = true;
+			const tag = document.createElement("style");
+			tag.id = LAYOUT_CSS_ID;
+			tag.setAttribute("data-source-code-mgmt-css", "");
+			tag.textContent =
+				// 推挤 #root：右侧面板占据布局而非浮在内容上方（VSCode 侧边栏手感），
+				// 用 calc(100% - var) 避免桌面壳把 #root 设成 width:100% 时的加性溢出。
+				"#root {" +
+				" margin-right: var(--scm-push, 0px);" +
+				" width: calc(100% - var(--scm-push, 0px));" +
+				" transition: margin-right var(--ds-transition-duration-slow, .25s) var(--ds-ease-in-out, ease)," +
+				" width var(--ds-transition-duration-slow, .25s) var(--ds-ease-in-out, ease);" +
+				" }\n" +
+				"body[data-source-code-mgmt-dragging] #root { transition: none; }\n" +
+				"body[data-source-code-mgmt-dragging] { cursor: col-resize; user-select: none; }\n";
+			document.head.appendChild(tag);
 		}
 
-		/** 共享的「仓库 / 分支」小图标：既用于右上角浮动按钮，也用作侧边栏 Tab 图标。 */
+		/** 共享的「仓库 / 分支」小图标：既用于左轨按钮，也用作侧边栏 Tab 图标。 */
 		function repoIcon(size) {
 			const s = size || 18;
 			return h("svg", {
@@ -1637,47 +1673,103 @@ window.__ModuleLoader__.load({
 			);
 		}
 
-		/** 右上角浮动按钮样式（未安装 dsh-better-sidebar 时的入口）。 */
-		function floatBtnStyle() {
+		// ---------- branch B:右上角 header 入口 + 右侧集成面板 ----------
+		// 未安装 dsh-better-sidebar 时使用：把「代码管理」按钮注册进 DSH 的
+		// conversation.session.header.utilities 槽位（Session log 所在的右对齐列表），
+		// 因此它天然出现在 Session log 旁、样式一致的胶囊按钮、间距 8px 不挤在一起；
+		// 点击后在右侧展开一个 dsh-better-sidebar 外观的固定面板（推挤 #root），复用 ScmPanel。
+		const SCM_PANEL_W = 620;
+
+		/** Session log 同款胶囊按钮样式（描边、圆角 18、透明底），放在 header utilities 列表里。 */
+		function headerBtnStyle() {
 			return {
-				position: "fixed", top: 12, right: 16, zIndex: 2147483000,
-				display: "inline-flex", alignItems: "center", gap: 6,
-				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))",
+				display: "inline-flex", alignItems: "center", justifyContent: "center", gap: 4,
+				height: 32, padding: "6px 12px",
+				border: "1px solid " + T.border, borderRadius: 18,
+				color: T.label, background: "transparent",
+				font: "inherit", fontSize: 13, fontWeight: 400, lineHeight: 1,
+				cursor: "pointer", whiteSpace: "nowrap",
 			};
 		}
 
-		/** 右侧栏抽屉外层样式：右对齐、全高、固定宽度。 */
-		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))",
+		/** 右侧面板的最小 / 最大宽度（拖拽改宽时钳制，防止拖得过窄或超出视口）。 */
+		const SCM_PANEL_MIN = 360;
+		const SCM_PANEL_MAX_FRAC = 0.92; // 拖拽上限：视口宽度的 92%
+
+		/** 右侧集成面板拖拽改宽：拖动面板左边缘调整宽度（像 dsh-better-sidebar）。要点：
+		 *  拖拽期间逐帧直接写 DOM（面板 style.width + --scm-push CSS 变量），避免每帧触发
+		 *  React 重渲染造成卡顿；在 pointerup 时把最终宽度提交进 state，重开面板仍保持。 */
+		function makeResizeHandler(getPanelEl, getW, onCommit) {
+			return (e) => {
+				e.preventDefault();
+				const startX = e.clientX;
+				const startW = getW();
+				let lastW = startW;
+				const body = document.body;
+				body.setAttribute("data-source-code-mgmt-dragging", "");
+				const onMove = (ev) => {
+					// 面板贴右（right:0），往左拖 = 变宽；增量 = 起点X - 当前X。
+					let w = startW + (startX - ev.clientX);
+					const max = Math.round(window.innerWidth * SCM_PANEL_MAX_FRAC);
+					w = Math.round(Math.max(SCM_PANEL_MIN, Math.min(max, w)));
+					lastW = w;
+					const el = getPanelEl();
+					if (el) el.style.width = w + "px";
+					document.documentElement.style.setProperty("--scm-push", w + "px");
+				};
+				const onUp = () => {
+					body.removeAttribute("data-source-code-mgmt-dragging");
+					window.removeEventListener("pointermove", onMove);
+					window.removeEventListener("pointerup", onUp);
+					if (lastW !== startW) onCommit(lastW);
+				};
+				window.addEventListener("pointermove", onMove);
+				window.addEventListener("pointerup", onUp);
 			};
 		}
 
-		// ---------- branch B:右上角浮动按钮 + 右侧抽屉入口 ----------
-		// 未安装 dsh-better-sidebar 时使用：一个紧贴右上角的浮动按钮，点击后展开
-		// 一个右侧栏抽屉（形态类似 dsh-better-sidebar 的右栏），内容放现有 ScmPanel。
-		function ScmFloatingEntry() {
+		/** 右上角「代码管理」按钮 + 点击后打开的右侧集成面板（dsh-better-sidebar 外观，
+		 *  可拖拽左边缘调整宽度）。 */
+		function HeaderScmAction() {
+			// 跟随 DSH 语言设置：按钮文字（代码管理）实时切换。
+			useLocale();
 			const [open, setOpen] = useState(false);
+			const [panelW, setPanelW] = useState(SCM_PANEL_W);
+			const panelRef = useRef(null);
+			useEffect(() => { ensureLayoutCss(); }, []);
+			// 右侧面板打开时推挤 #root（margin-right），关闭时归零。宽度跟随 panelW。
+			useEffect(() => {
+				document.documentElement.style.setProperty("--scm-push", open ? panelW + "px" : "0px");
+				return () => { document.documentElement.style.removeProperty("--scm-push"); };
+			}, [open, panelW]);
+			// 拖拽改宽处理器（面板左边缘的拖拽条）。
+			const onResize = makeResizeHandler(
+				() => panelRef.current,
+				() => panelW,
+				(w) => setPanelW(w),
+			);
 			return h(React.Fragment, null,
-				h("button", {
-					type: "button",
-					style: floatBtnStyle(),
-					title: "源代码管理",
-					"aria-label": "源代码管理",
-					onClick: () => setOpen(true),
-				}, repoIcon(16), h("span", { style: { fontSize: 13 } }, "代码管理")),
+				h("button", { type: "button", style: headerBtnStyle(), title: t("源代码管理"), "aria-label": t("源代码管理"), onClick: () => setOpen(true) },
+					repoIcon(14), h("span", { style: { fontSize: 13 } }, t("代码管理"))),
 				open ? ReactDOM.createPortal(
-					h("div", { style: { position: "fixed", inset: 0, zIndex: 1000 }, role: "presentation" },
-						h("div", { style: maskStyle(), "aria-hidden": "true", onClick: () => setOpen(false) }),
-						h("div", { style: drawerStyle() },
+					h("div", { style: { position: "fixed", inset: 0, zIndex: 1000, pointerEvents: "none" }, role: "presentation" },
+						h("div", { ref: panelRef, style: {
+							position: "absolute", top: 0, right: 0, bottom: 0, width: panelW + "px",
+							boxSizing: "border-box", overflow: "visible", pointerEvents: "auto",
+							background: "var(--dsw-alias-bg-layer-1, rgba(128,128,128,.08))",
+							borderLeft: "1px solid " + T.border,
+							boxShadow: "var(--dsw-overlay-shadow, 0 12px 32px rgba(0,0,0,.35))",
+						} },
+							// 左边缘拖拽条（改宽）
+							h("div", {
+								onPointerDown: onResize,
+								title: t("拖动调整面板宽度"),
+								"aria-label": t("拖动调整面板宽度"),
+								style: {
+									position: "absolute", top: 0, bottom: 0, left: -3, width: 7,
+									cursor: "col-resize", pointerEvents: "auto", zIndex: 1,
+								},
+							}),
 							h(ScmPanel, { variant: "drawer", onClose: () => setOpen(false) })
 						)
 					),
@@ -1703,10 +1795,11 @@ window.__ModuleLoader__.load({
 		}
 
 		// ---------- cordis plugin body ----------
-		// 不写死 inject：better-sidebar 是可选集成，未安装时绝不能因为缺服务而让本
-		// 插件报错。改在 apply 里用 ctx.get('betterSidebar') 判空——一次性属性读取，
-		// 零 I/O、零网络，毫秒级，不影响 DSH 启动速度。
-		const inject = [];
+		// 声明 'locale'：DSH 的客户端插件都靠 inject 声明保证服务先于 apply 就绪（loader
+		// 依赖图排序）。client-locale 是 web-app 核心服务（与 slots/connection 同级），
+		// 必在 loader 树里；better-sidebar 仍是可选集成（不入 inject），照旧用
+		// ctx.get('betterSidebar') 判空 + 延迟重试，未安装时绝不会因为缺服务而报错。
+		const inject = ['locale'];
 
 		// 是否已安装（并激活）dsh-better-sidebar：决定「③代码管理」是否隐藏本插件自带的
 		// 本地 Git 工作流（暂存/提交/分支/历史/并排 diff）——这些能力 better-sidebar 的
@@ -1714,6 +1807,32 @@ window.__ModuleLoader__.load({
 		let hasBetterSidebar = false;
 
 		function apply(ctx) {
+			// 接管 DSH 的语言设置：client-locale 插件提供 ctx.locale（LocaleRuntime），
+			// t() 实时读它；语言切换经 subscribe 触发 useLocale 重渲染。
+			// 注意：client-locale 可能比本插件晚激活（和 better-sidebar 同样的顺序问题），
+			// 因此捕获要带重试；重试窗口内组件先以浏览器语言渲染，捕获后立即切到 DSH 设置。
+			const captureLocale = () => {
+				try {
+					if (scmLocaleFace) return true;
+					const lf = (ctx && ctx.locale) || (typeof ctx.get === "function" ? ctx.get("locale") : undefined);
+					if (lf && typeof lf.getLocale === "function") {
+						scmLocaleFace = lf;
+						try { scmLang = lf.getLocale().active || scmLang } catch {}
+						return true;
+					}
+					return false;
+				} catch { return false }
+			};
+			if (!captureLocale()) {
+				// 兜底：等 client-locale 激活后再补抓（单次延迟，零轮询、零 I/O）。
+				window.setTimeout(() => {
+					const ok = captureLocale();
+					if (!ok && typeof console !== "undefined") {
+						console.warn("[source-code-mgmt] DSH locale service not found — UI follows the browser language. Install/enable @deepseek-ai/dsh-client-locale for live language switching.");
+					}
+				}, 1200);
+			}
+
 			// DSH 打开（插件激活）时就预取环境/SSH/默认工作区/仓库状态，
 			// 点开「代码管理」面板时直接使用缓存，无需重新加载。
 			void preload();
@@ -1729,36 +1848,65 @@ window.__ModuleLoader__.load({
 				// 分支 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 的浮动按钮，立即拆除它。
+				// 语言切换时实时更新 Tab 标题（title 变了才重注册，避免注册抖动）。
+				let lastTabTitle = null;
+				let tabDisposer = null;
+				const registerTabNow = () => {
+					const title = t("代码管理");
+					if (title === lastTabTitle) return;
+					if (typeof tabDisposer === "function") { try { tabDisposer() } catch {} }
+					lastTabTitle = title;
+					tabDisposer = bs.registerTab({
+						id: PLUGIN_ID,
+						title,
+						icon: (size) => repoIcon(size),
+						order: 50,
+						single: true,
+						component: () => h(ScmPanel, { variant: "tab" }),
+					});
+				};
+				ctx.effect(() => {
+					registerTabNow();
+					return () => { if (typeof tabDisposer === "function") { try { tabDisposer() } catch {} } };
+				});
+				if (scmLocaleFace && typeof scmLocaleFace.subscribe === "function") {
+					ctx.effect(() => scmLocaleFace.subscribe(() => { try { registerTabNow(); } catch {} }),
+						'source-code-mgmt: tab title locale sync');
+				}
+				// 若此前已挂载了分支 B 的 header 入口（降级路径），立即拆除它。
 				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; } };
-			});
+			// 分支 B：此刻未检测到 dsh-better-sidebar —— 把「代码管理」按钮注册进 DSH 的
+			// conversation.session.header.utilities 槽位（Session log 所在的右对齐列表），
+			// 因此它天然出现在 Session log 旁、间距 8px 不挤在一起；点击后 HeaderScmAction
+			// 打开右侧 dsh-better-sidebar 外观的集成面板（推挤 #root）。
+			const slots = typeof ctx.get === "function" ? ctx.get("slots") : undefined;
+			if (slots && typeof slots.inject === "function") {
+				ctx.effect(() => slots.inject('conversation.session.header.utilities', () => slots.register({
+					name: 'conversation.session.header.utilities',
+					id: 'source-code-mgmt',
+					order: 200,
+				}, HeaderScmAction)), 'source-code-mgmt: header utility');
+			} else if (ReactDOM) {
+				// slots 服务不可用（极少数环境）——降级：右上角浮动按钮 + 右侧面板。
+				ctx.effect(() => {
+					const hostEl = document.createElement("div");
+					hostEl.setAttribute("data-source-code-mgmt-entry", "");
+					document.body.appendChild(hostEl);
+					const root = mountClientRoot(hostEl, h(HeaderScmAction));
+					entryUnmount = () => {
+						try { if (root && typeof root.unmount === "function") root.unmount(); } catch {}
+						hostEl.remove();
+					};
+					return () => { if (entryUnmount) { entryUnmount(); entryUnmount = null; } };
+				});
+			}
 
-			// 兜底重试一次：better-sidebar 若在本插件之后激活，延迟补注册 Tab 并拆除浮动按钮。
+			// 兜底重试一次：better-sidebar 若在本插件之后激活，延迟补注册 Tab 并拆除 header 入口。
 			// 单次 setTimeout，无轮询、零 I/O，几乎不耗资源；插件卸载时清除。
 			const retryTimer = window.setTimeout(() => { tryRegisterTab(); }, 1500);
 			ctx.effect(() => () => window.clearTimeout(retryTimer));