source-code-mgmt 1.13.0 → 1.15.1

package/lib/client.js

@@ -74,6 +74,39 @@ window.__ModuleLoader__.load({
 			if (!res.ok) throw new Error("HTTP " + String(res.status));
 			return await res.json();
 		}
+		/** POST 并逐行消费 NDJSON 事件流（{type:'step'|'out'|'result'}，用于一键安装进度）。返回 result 对象。 */
+		async function jpostStream(path, body, onEvent) {
+			const res = await fetch(API + path + (path.indexOf("?") >= 0 ? "&" : "?") + "lang=" + currentLang(), {
+				method: "POST",
+				headers: { "content-type": "application/json" },
+				body: JSON.stringify(body || {}),
+			});
+			if (!res.ok || !res.body) {
+				const text = await res.text().catch(() => "");
+				throw new Error("HTTP " + String(res.status) + (text ? ": " + text : ""));
+			}
+			const reader = res.body.getReader();
+			const decoder = new TextDecoder();
+			let buf = "";
+			let result = null;
+			for (;;) {
+				const { done, value } = await reader.read();
+				if (done) break;
+				buf += decoder.decode(value, { stream: true });
+				let nl;
+				while ((nl = buf.indexOf("\n")) >= 0) {
+					const line = buf.slice(0, nl).trim();
+					buf = buf.slice(nl + 1);
+					if (!line) continue;
+					let evt;
+					try { evt = JSON.parse(line); } catch { continue }
+					if (evt && evt.type === "result") result = evt.result;
+					else if (onEvent) { try { onEvent(evt); } catch {} }
+				}
+			}
+			if (result === null) throw new Error("no result");
+			return result;
+		}
 
 		// ---------- preload cache ----------
 		// 只在打开插件时按需拉取仓库状态；DSH 打开（插件激活）时只预取静态的 env / ssh /
@@ -179,7 +212,7 @@ window.__ModuleLoader__.load({
 		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 的「源代码管理面板」查看。":"dsh-better-sidebar is installed — this lists changed files only; see the actual changes in its \"Source Control 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","二进制文件，无法查看文本内容":"Binary file — text preview unavailable","（空文件）":"(empty file)"};
+const EN_DICT = {"展开":"Expand","折叠":"Collapse","展开该部分":"Expand this section","折叠该部分":"Collapse this section","已安装":"Installed","❌ 未安装":"❌ Not installed","复制安装命令":"Copy install command","一键安装（会自动选包管理器）":"Install automatically (picks a package manager)","安装中…":"Installing…","安装中，请稍候…":"Installing, please wait…","安装完成":"Installation complete","安装完成，需要重启 DSH 生效。点击「重启 DSH」立即重启，页面会短暂断开，恢复后请刷新。":"Installation complete — restart DSH to apply. Click \"Restart DSH\" to restart now; the page will briefly disconnect, refresh once it is back.","重启 DSH":"Restart DSH","正在重启 DSH，页面将短暂断开；恢复后请刷新网页。":"Restarting DSH — the page will briefly disconnect; refresh once it is back.","重启失败：":"Restart failed: ","重启似乎未生效，请手动重启 dsh。":"The restart does not seem to have taken effect — please restart dsh manually.","，需要重启 DSH 生效":" — restart DSH to apply","安装":"Install"," 执行成功":" executed successfully","（已装到 ~/.local/bin，免 sudo）":" (installed to ~/.local/bin, no sudo needed)","（如未生效需以管理员身份重试）":" (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 的「源代码管理面板」查看。":"dsh-better-sidebar is installed — this lists changed files only; see the actual changes in its \"Source Control 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","二进制文件，无法查看文本内容":"Binary file — text preview unavailable","（空文件）":"(empty file)"};
 Object.assign(EN_DICT, {
   // ④ 克隆仓库
   "④ 克隆仓库": "④ Clone repos",
@@ -207,47 +240,9 @@ Object.assign(EN_DICT, {
   "请先登录 GitHub CLI（gh）": "Log in to GitHub CLI (gh) first",
   "需要先配置 Gitee 私人令牌": "Configure the Gitee personal token first",
   "克隆一个账号下的远程仓库到本地": "Clone a remote repo from your account locally",
-  // ⑤ 提交 PR
-  "⑤ 提交 PR": "⑤ Pull Request",
-  "目标仓库地址": "Target repo URL",
-  "（如 https://github.com/owner/repo 或 owner/repo）": "(e.g. https://github.com/owner/repo or owner/repo)",
-  "记录到本地": "Save locally",
-  "已记录仓库": "Saved repos",
-  "分析 PR 规则": "Analyze PR rules",
-  "重新分析（忽略缓存）": "Re-analyze (ignore cache)",
-  "AI 正在思考该仓库的 PR 规则…": "AI is analyzing this repo's PR rules…",
-  "已使用缓存规则（插件目录 rules/，无需重新分析）": "Using cached rules (plugin rules/ dir, no re-analysis needed)",
-  "AI 已生成规则并缓存到插件目录 rules/": "AI generated rules and cached them in the plugin rules/ dir",
-  "规则步骤：": "Rule steps: ",
-  "上游分支（base）": "Upstream branch (base)",
-  "PR 标题": "PR title",
-  "PR 描述": "PR description",
-  "条目文件内容（entry，可留空）": "Entry file content (entry, optional)",
-  "插件信息（供 AI 生成 PR 描述）": "Plugin info (for AI to generate the PR description)",
-  "插件名 owner/repo": "Plugin name owner/repo",
-  "分类 category": "Category",
-  "描述 en": "Description (en)",
-  "描述 zh": "Description (zh)",
-  "生成 PR 内容（AI）": "Generate PR content (AI)",
-  "已生成，请确认 / 修改后再执行": "Generated — review / edit before running",
-  "执行 PR": "Run PR",
-  "PR 执行中…": "Running PR…",
-  "PR 已创建：": "PR created: ",
-  "PR 流程已完成": "PR flow completed",
-  "PR 执行失败": "PR flow failed",
-  "PR 执行失败：": "PR flow failed: ",
-  "工作目录（fork 克隆位置，默认=默认工作区）": "Working dir (where the fork is cloned; default = default workspace)",
-  "生成失败": "Generation failed",
-  "生成失败：": "Generation failed: ",
-  "分析失败": "Analysis failed",
-  "分析失败：": "Analysis failed: ",
-  "请填写目标仓库地址": "Enter the target repo URL first",
-  "请先填写仓库并分析规则": "Enter the repo and analyze its rules first",
-  "保存失败": "Save failed",
-  "目标仓库地址会记录到本地 ~/.dsh/storages（不写入插件目录）": "Target repo URLs are saved to local ~/.dsh/storages (not the plugin dir)",
   "删除": "Remove",
-  // ⑥ 发布 npm 包
-  "⑥ 发布 npm 包": "⑥ Publish npm package",
+  // ⑤ 发布 npm 包
+  "⑤ 发布 npm 包": "⑤ Publish npm package",
   "目标目录（含 package.json）": "Target dir (contains package.json)",
   "① 确认源（registry）": "① Check registry",
   "② 查看认证配置（config list）": "② Auth config (config list)",
@@ -261,13 +256,14 @@ Object.assign(EN_DICT, {
   "未登录 npm": "Not logged in to npm",
   "npm 状态": "npm status",
   "registry：": "registry: ",
+"发布将使用官方源：": "Publishing uses the official registry: ",
   "我已核对以上内容，确认发布到 npm registry": "I've reviewed the above — confirm publishing to the npm registry",
   "发布完成": "Publish complete",
   "发布失败": "Publish failed",
   "发布失败：": "Publish failed: ",
   "读取 npm 状态失败：": "Failed to read npm status: ",
   "发布 npm 包五步向导：确认源 → 认证配置 → 身份 → 打包预览 → 发布": "Five-step npm publish guide: registry → auth config → identity → pack preview → publish",
-  "按顺序完成：①环境检查 → ②SSH 密钥与连接 → ③代码管理，以及 ④克隆仓库 / ⑤提交 PR / ⑥发布 npm 包。推送会自动忽略 >100MB 的文件（": "In order: ①Environment → ②SSH key & connection → ③Code management, plus ④Clone repos / ⑤Pull Request / ⑥Publish npm. Pushing auto-ignores >100MB files (",
+  "按顺序完成：①环境检查 → ②SSH 密钥与连接 → ③代码管理，以及 ④克隆仓库 / ⑤发布 npm 包。推送会自动忽略 >100MB 的文件（": "In order: ①Environment → ②SSH key & connection → ③Code management, plus ④Clone repos / ⑤Publish npm. Pushing auto-ignores >100MB files (",
   " 限制）并说明原因。": " limit) with a reason.",
   // ④ 目录选择（复用 ③ 的「选择目录」交互）
   "克隆到目录（默认=用户主目录 home）": "Clone into (default = user home directory)",
@@ -276,18 +272,8 @@ Object.assign(EN_DICT, {
   "已记住目录": "Directory remembered",
   "记住目录失败：": "Failed to remember dir: ",
   "目录不存在或不是文件夹：": "Directory does not exist or is not a folder: ",
-  // ⑤ 通用 PR 流程
-  "通用 PR 流程（未分析，可点击「分析 PR 规则」生成专属规则）": "Generic PR flow (not analyzed — click \"Analyze PR rules\" to generate a repo-specific one)",
-  "该仓库暂无本地规则": "No local rule for this repo yet",
-  "已加载本地规则（插件目录 rules/）": "Loaded local rule (plugin rules/ dir)",
-  "请先分析该仓库的 PR 规则再执行": "Analyze this repo's PR rules before running",
-  "已按模板生成（可编辑，未消耗 AI）": "Generated from the template (editable, no AI spent)",
-  "分析完成，规则已缓存到插件目录 rules/（下次直接使用，无需重新分析）": "Analyzed — rule cached to the plugin rules/ dir (used directly next time)",
-  "该仓库暂无本地规则，当前为通用 PR 流程": "No local rule for this repo yet — showing the generic PR flow",
-  "点击「分析 PR 规则」可让 AI 生成该仓库专属规则（并缓存到插件目录 rules/）": "Click \"Analyze PR rules\" to have AI generate a repo-specific rule (cached to the plugin rules/ dir)",
-  "已加载预置规则（插件目录 rules/）": "Preset rule loaded (plugin rules/ dir)",
   "可手动输入/粘贴目录绝对路径，或点击「浏览…」弹出本地文件夹选择器。确认后将添加到常用目录并记住，下次打开无需重新选择。": "Type/paste an absolute path, or click \"Browse…\" to open the native folder picker. Confirming adds it to your favorite dirs so you won't re-pick it next time.",
-  // ⑥ npm 登录与目录
+  // ⑤ npm 登录与目录
   "未登录 npm，发布前需先登录": "Not logged in to npm — log in before publishing",
   "打开终端执行 npm login": "Open a terminal to run npm login",
   "复制登录命令": "Copy login command",
@@ -298,22 +284,7 @@ Object.assign(EN_DICT, {
   "请手动在终端运行：": "Run this manually in a terminal: ",
   "已复制：": "Copied: ",
   "目录不存在：": "Directory does not exist: ",
-  "确保 fork": "Ensure fork",
-  "克隆 fork": "Clone fork",
-  "加上游": "Add upstream",
-  "拉取上游": "Fetch upstream",
-  "新建分支": "Create branch",
-  "写入条目": "Write entry",
   "提交": "Commit",
-  "推送": "Push",
-  "创建 PR": "Create PR",
-  "该仓库已有规则，是否重新分析？": "A rule already exists for this repo — re-analyze?",
-  "分析 PR 规则（可选：手动填写规则或规则文件，留空则由 AI 自动查找）": "Analyze PR rules (optional: type the rules or a rule file; leave empty and AI will find them)",
-  "手动填写该仓库的 PR 规则（可选）": "Manually type this repo's PR rules (optional)",
-  "或提供规则文件（本地路径 / URL，如某仓库 README）": "Or provide a rules file (local path / URL, e.g. a repo README)",
-  "留空则由 AI 自动抓取该仓库文档（README / CONTRIBUTING / PR 模板）分析": "Leave empty and AI will auto-fetch this repo's docs (README / CONTRIBUTING / PR template)",
-  "开始分析": "Start analysis",
-  "已按你提供的规则分析并缓存到插件目录 rules/": "Analyzed with your supplied rules and cached to the plugin rules/ dir",
   "取消": "Cancel",
   // ④ 按地址克隆
   "也可以按仓库地址克隆到任意位置": "You can also clone any repo by URL into any location",
@@ -322,12 +293,7 @@ Object.assign(EN_DICT, {
   "请输入仓库地址": "Enter a repo URL",
   "请选择克隆到目录": "Choose a destination directory first",
   "无法从地址识别仓库名称": "Cannot derive a repo name from this URL",
-  // ⑤ 固定 awesome-dsh-plugin 收录 PR
-  "⑤ 提交 awesome-dsh-plugin 插件收录 PR": "⑤ Submit an awesome-dsh-plugin listing PR",
-  "目标仓库": "Target repo",
-  "已加载该仓库的收录规则（预置）": "Loaded this repo's listing rules (preset)",
-  "正在加载收录规则…": "Loading listing rules…",
-  // ⑥ 目录默认留空，需手动选择
+  // ⑤ 目录默认留空，需手动选择
   "请先选择目标目录": "Choose a target directory first",
   "请先选择目标目录（当前留空，不会自动使用默认目录）": "Choose a target directory first (left empty on purpose — it will NOT auto-use the default dir)",
 });
@@ -447,11 +413,88 @@ function useSession() {
 			gh: "winget install --id GitHub.cli -e",
 			ssh: "Add-WindowsCapability -Online -Name OpenSSH.Client",
 		};
+		// 一键安装进度弹窗：实时展示分步进度 + 尾部输出 + 结果 / 重启提示。
+		function InstallDialog({ tool, logs, result, onClose }) {
+			const scrollRef = useRef(null);
+			const restartTimer = useRef(null);
+			const [restartState, setRestartState] = useState(null); // null | 'restarting' | 'error'
+			const [restartError, setRestartError] = useState(null);
+			useEffect(() => {
+				if (scrollRef.current) scrollRef.current.scrollTop = scrollRef.current.scrollHeight;
+			}, [logs]);
+			useEffect(() => () => { if (restartTimer.current) clearTimeout(restartTimer.current); }, []);
+			/** 一键重启 dsh：服务端 detached helper 按原命令拉起新进程（机制同 dsh-update）。 */
+			const doRestart = async () => {
+				setRestartState("restarting"); setRestartError(null);
+				try {
+					const res = await fetch(API + "/restart", { method: "POST" });
+					if (!res.ok) {
+						let detail = "";
+						try { detail = await res.text(); } catch {}
+						throw new Error("HTTP " + String(res.status) + (detail !== "" ? ": " + detail : ""));
+					}
+					// 成功后本进程约 500ms 退出、helper 接管——页面会短暂断开。
+					// 若 12 秒后组件仍存活（异常情况），提示手动重启。
+					restartTimer.current = window.setTimeout(() => {
+						setRestartState((s) => (s === "restarting" ? "error" : s));
+					}, 12000);
+				} catch (e) {
+					setRestartState("error");
+					setRestartError(String(e));
+				}
+			};
+			const done = result !== null;
+			const ok = !!(result && result.ok);
+			const toolName = tool === "gh" ? "GitHub CLI" : tool === "git" ? "Git" : "SSH";
+			const needRestart = done && !!(result && result.restartNeeded);
+			return h("div", { style: { position: "fixed", inset: 0, zIndex: 9999, background: T.mask, display: "flex", alignItems: "center", justifyContent: "center" } },
+				h("div", { style: { width: 460, maxWidth: "92vw", background: T.layer1, border: "1px solid " + T.border, borderRadius: 14, padding: 16, display: "flex", flexDirection: "column", gap: 10 } },
+					h("div", { style: { fontSize: 14, fontWeight: 600, color: T.label } },
+						(done ? (ok ? "✅ " : "❌ ") : "⏳ ") + toolName + " " + (done ? t("安装完成") : t("安装中…"))),
+					h("div", { ref: scrollRef, style: { overflowY: "auto", maxHeight: 240, fontFamily: "var(--ds-font-family-code, ui-monospace, monospace)", fontSize: 12, lineHeight: 1.7 } },
+						logs.length === 0
+							? h("div", { style: { color: T.secondary } }, "…")
+							: logs.map((log, i) =>
+								h("div", { key: i, style: { display: "flex", gap: 6, alignItems: "baseline" } },
+									h("span", { style: { color: log.state === "running" ? T.brand : T.success } },
+										log.state === "running" ? "▶" : "✓"),
+									h("span", { style: { color: T.label, whiteSpace: "pre-wrap", wordBreak: "break-all" } },
+										log.label + (log.tail ? " " + log.tail : "")),
+								)
+							)),
+					done
+						? needRestart
+							? h("div", { style: { fontSize: 12, color: T.warn, lineHeight: 1.6 } },
+								t("安装完成，需要重启 DSH 生效。点击「重启 DSH」立即重启，页面会短暂断开，恢复后请刷新。"))
+							: ok
+							? h("div", { style: { fontSize: 12, color: T.success } },
+								t("安装完成") + (result.userLevel ? t("（已装到 ~/.local/bin，免 sudo）") : ""))
+							: h("div", { style: { fontSize: 12, color: T.danger } },
+								"❌ " + (result.error || t("安装失败")) + (result.command && !result.manual ? "：" + result.command : ""))
+						: h("div", { style: { fontSize: 12, color: T.secondary } }, t("安装中，请稍候…")),
+					restartState === "restarting"
+						? h("div", { style: { fontSize: 12, color: T.brand, lineHeight: 1.6 } },
+							t("正在重启 DSH，页面将短暂断开；恢复后请刷新网页。"))
+						: restartState === "error"
+						? h("div", { style: { fontSize: 12, color: T.danger, lineHeight: 1.6 } },
+							(restartError ? t("重启失败：") + restartError + " " : "") + t("重启似乎未生效，请手动重启 dsh。"))
+						: null,
+					h("div", { style: { display: "flex", justifyContent: "flex-end", gap: 8 } },
+						needRestart
+							? h(Btn, { label: t("重启 DSH"), onClick: doRestart, tone: "primary", disabled: restartState !== null })
+							: null,
+						h(Btn, { label: t("关闭"), onClick: onClose, tone: "ghost", disabled: restartState === "restarting" })
+					)
+				)
+			);
+		}
+
 		function EnvSection() {
 			const [env, setEnv] = useState(() => cache.env);
 			const [err, setErr] = useState(null);
 			const [installing, setInstalling] = useState(null); // 'git'|'gh'|'ssh'|null
 			const [installResult, setInstallResult] = useState(null);
+			const [installLogs, setInstallLogs] = useState([]); // [{label, state:'running'|'done', tail}]
 			const load = useCallback(async () => {
 				setErr(null);
 				// 先读缓存（DSH 打开时已预取），再后台刷新保持最新
@@ -461,12 +504,28 @@ function useSession() {
 			}, []);
 			useEffect(() => { void preload().then(load); }, [load]);
 
-			// 一键安装：调用 host 选定包管理器安装缺失工具，成功后重新检测。
+			// 一键安装：流式调用 host（NDJSON 进度事件），弹窗实时展示分步进度，成功后重新检测。
 			const doInstall = useCallback(async (tool) => {
-				setInstalling(tool); setInstallResult(null);
+				setInstalling(tool); setInstallResult(null); setInstallLogs([]);
 				try {
-					const r = await jpost("/install-tool", { tool });
+					const r = await jpostStream("/install-tool", { tool }, (evt) => {
+						if (evt.type === "step") {
+							setInstallLogs((logs) => [
+								...logs.map((l) => l.state === "running" ? { ...l, state: "done" } : l),
+								{ label: evt.label, state: "running", tail: "" },
+							]);
+						} else if (evt.type === "out" && typeof evt.text === "string") {
+							setInstallLogs((logs) => {
+								if (logs.length === 0) return logs;
+								const next = [...logs];
+								const last = next[next.length - 1];
+								next[next.length - 1] = { ...last, tail: (last.tail + evt.text).slice(-300) };
+								return next;
+							});
+						}
+					});
 					setInstallResult(r);
+					setInstallLogs((logs) => logs.map((l) => l.state === "running" ? { ...l, state: "done" } : l));
 					if (r.ok) void load();
 				} catch (e) { setInstallResult({ ok: false, tool, error: String(e) }); }
 				finally { setInstalling(null); }
@@ -481,7 +540,10 @@ function useSession() {
 
 			// 渲染单个工具行；缺失时带安装命令 + 安装按钮。
 			const toolRow = (tool, label, installed, version) => {
-				const hint = INSTALL_HINTS[tool] || ""
+				// 优先用 host 返回的平台自适应命令（与「一键安装」同源）；
+				// Windows 兜底用内置提示；非 Windows 且 host 未返回时留空（不误导）。
+				const hint = (env && env.installHints && env.installHints[tool])
+					|| (winOs ? INSTALL_HINTS[tool] : "")
 				const status = installed
 					? h("span", { style: { color: T.label, fontSize: 13 } }, "✅ " + (version || t("已安装")))
 					: h("span", { style: { display: "inline-flex", alignItems: "center", gap: 8 } },
@@ -490,9 +552,11 @@ function useSession() {
 						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 || t("已安装")) + t(" 执行成功") + (installResult.needElevation ? t("（如未生效需以管理员身份重试）") : ""))
-						: h("div", { style: { marginTop: 4, color: T.danger, fontSize: 12 } }, "❌ " + (installResult.error || t("安装失败")) + (installResult.command ? "：" + installResult.command : "")))
+					? (installResult.started
+						? h("div", { style: { marginTop: 4, color: T.secondary, fontSize: 12 } }, "⏳ " + (installResult.error || ""))
+						: installResult.ok
+						? h("div", { style: { marginTop: 4, color: T.success, fontSize: 12 } }, "✅ " + (installResult.command || t("已安装")) + t(" 执行成功") + (installResult.userLevel ? t("（已装到 ~/.local/bin，免 sudo）") : "") + (installResult.needElevation ? t("（如未生效需以管理员身份重试）") : "") + (installResult.restartNeeded ? t("，需要重启 DSH 生效") : ""))
+						: h("div", { style: { marginTop: 4, color: T.danger, fontSize: 12 } }, "❌ " + (installResult.error || t("安装失败")) + (installResult.command && !installResult.manual ? "：" + installResult.command : "")))
 					: null
 				return h("div", { key: tool, style: { marginTop: 4 } },
 					h(Field, { label }, status),
@@ -509,7 +573,8 @@ function useSession() {
 				) : 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 } },
 					t("未找到的工具可用上方「安装」按钮一键安装（") + (winOs ? t("Windows 用 winget / 内置功能") : t("用系统包管理器")) + t("，可能需管理员权限）；也可手动复制安装命令执行，安装后点「重新检查」。")
-				) : h(Btn, { label: t("重新检查"), onClick: load, tone: "ghost" })
+				) : h(Btn, { label: t("重新检查"), onClick: load, tone: "ghost" }),
+				installing !== null ? h(InstallDialog, { tool: installing, logs: installLogs, result: installResult, onClose: () => { setInstalling(null); } }) : null
 			);
 		}
 
@@ -1624,7 +1689,7 @@ function useSession() {
 			};
 		}
 
-		/** Shared text input style for the new sections (④⑤⑥). */
+		/** Shared text input style for the new sections (④⑤). */
 		function inputStyle() {
 			return {
 				flex: 1, minWidth: 0, font: "inherit", fontSize: 12,
@@ -1980,135 +2045,9 @@ function useSession() {
 			);
 		}
 
-		// ---------- section 5: 提交 PR ----------
-		// ⑤ 固定目标仓库：awesome-dsh-plugin 插件收录 PR（隐藏地址输入 / 记录 / 规则分析）。
-		const PR_TARGET_URL = "https://github.com/awesome-dsh-plugin/awesome-dsh-plugin";
-		function PrSection() {
-			const [url, setUrl] = useState(PR_TARGET_URL);
-			const [rule, setRule] = useState(null);       // 预置规则
-			const [ruleCached, setRuleCached] = useState(false);
-			const [ruleSource, setRuleSource] = useState(null); // 'preset' | 'cached' | null
-			const [workdir, setWorkdir] = useState("");
-			const [pName, setPName] = useState("");
-			const [pCategory, setPCategory] = useState("");
-			const [pDescEn, setPDescEn] = useState("");
-			const [pDescZh, setPDescZh] = useState("");
-			const [title, setTitle] = useState("");
-			const [body, setBody] = useState("");
-			const [entry, setEntry] = useState("");
-			const [genBusy, setGenBusy] = useState(false);
-			const [execBusy, setExecBusy] = useState(false);
-			const [logs, setLogs] = useState([]);
-			const [prUrl, setPrUrl] = useState(null);
-			const [msg, setMsg] = useState(null);
-			const [err, setErr] = useState(null);
-
-			useEffect(() => { jget("/clone/default-dir").then((r) => { if (r && r.ok && r.dir) setWorkdir(r.dir); }).catch(() => {}); }, []);
+		
 
-			// 加载 awesome-dsh-plugin 预置规则（只读，不触发 AI、不生成）。固定目标地址，仅挂载时查一次。
-			const lookupRule = useCallback(async (u) => {
-				const urlTxt = String(u || "").trim();
-				try {
-					const r = await jget("/pr/rule?url=" + encodeURIComponent(urlTxt));
-					if (r && r.ok) {
-						if (r.hasRule && r.rule) {
-							setRule(r.rule);
-							setRuleCached(true);
-							setRuleSource(r.rule.preset ? "preset" : "cached");
-							setErr(null);
-						} else {
-							setRule(null);
-							setRuleCached(false);
-							setRuleSource(null);
-						}
-					}
-				} catch (e) { /* 静默：保持现状 */ }
-			}, []);
-			useEffect(() => { void lookupRule(PR_TARGET_URL); }, [lookupRule]);
-
-			const generate = useCallback(async () => {
-				const u = String(url || "").trim();
-				if (!u || !rule) { setErr(t("请先填写仓库并分析规则")); return; }
-				setGenBusy(true); setErr(null); setMsg(null);
-				try {
-					const r = await jpost("/pr/generate", {
-						url: u, rule,
-						pluginInfo: { name: pName, category: pCategory, descriptionEn: pDescEn, descriptionZh: pDescZh },
-					});
-					if (r && r.ok) {
-						setTitle(r.title || ""); setBody(r.body || ""); setEntry(r.entry || "");
-						setMsg(r.fromTemplate ? t("已按模板生成（可编辑，未消耗 AI）") : t("已生成，请确认 / 修改后再执行"));
-					} else setErr((r && r.error) || t("生成失败"));
-				} catch (e) { setErr(t("生成失败：") + e); }
-				finally { setGenBusy(false); }
-			}, [url, rule, pName, pCategory, pDescEn, pDescZh]);
-
-			const execute = useCallback(async () => {
-				const u = String(url || "").trim();
-				if (!u || !rule) { setErr(t("请先填写仓库并分析规则")); return; }
-				setExecBusy(true); setErr(null); setMsg(null); setLogs([]); setPrUrl(null);
-				try {
-					const r = await jpost("/pr/execute", {
-						url: u, workdir, rule, entryContent: entry, title, body,
-						base: (rule && rule.baseBranch) || "main",
-					});
-					setLogs((r && r.logs) || []);
-					if (r && r.ok) {
-						if (r.prUrl) { setPrUrl(r.prUrl); setMsg(t("PR 已创建：") + r.prUrl); }
-						else setMsg(t("PR 流程已完成"));
-					} else setErr((r && r.error) || t("PR 执行失败"));
-				} catch (e) { setErr(t("PR 执行失败：") + e); }
-				finally { setExecBusy(false); }
-			}, [url, rule, workdir, entry, title, body]);
-
-			return h(Box, { title: t("⑤ 提交 awesome-dsh-plugin 插件收录 PR"), defaultCollapsed: true },
-				h("div", { style: { fontSize: 11, color: T.secondary, marginBottom: 8, lineHeight: 1.6 } },
-					t("目标仓库") + ": https://github.com/awesome-dsh-plugin/awesome-dsh-plugin　" +
-					(rule ? t("已加载该仓库的收录规则（预置）") : t("正在加载收录规则…"))),
-				h("div", { style: { border: "1px solid " + T.border, borderRadius: 8, padding: 8, marginBottom: 8 } },
-					h("div", { style: { fontSize: 12, fontWeight: 600, color: T.label, marginBottom: 6 } }, t("插件信息（供 AI 生成 PR 描述）")),
-					h(Field, { label: t("插件名 owner/repo") }, h("input", { type: "text", value: pName, placeholder: "Zhucy123/source-code-mgmt", onChange: (e) => setPName(e.target.value), style: inputStyle() })),
-					h(Field, { label: t("分类 category") }, h("input", { type: "text", value: pCategory, placeholder: "git", onChange: (e) => setPCategory(e.target.value), style: inputStyle() })),
-					h(Field, { label: t("描述 en") }, h("input", { type: "text", value: pDescEn, onChange: (e) => setPDescEn(e.target.value), style: inputStyle() })),
-					h(Field, { label: t("描述 zh") }, h("input", { type: "text", value: pDescZh, onChange: (e) => setPDescZh(e.target.value), style: inputStyle() })),
-					h("div", { style: { display: "flex", gap: 8, marginTop: 6 } },
-						h(Btn, { label: genBusy ? t("生成中…") : t("生成 PR 内容（AI）"), onClick: generate, disabled: genBusy || !url || !rule, tone: "primary", noBg: true }),
-					),
-				),
-				h("div", { style: { marginBottom: 6 } },
-					h("div", { style: { color: T.secondary, fontSize: 12, marginBottom: 4 } }, t("PR 标题")),
-					h("input", { type: "text", value: title, onChange: (e) => setTitle(e.target.value), style: inputStyle() }),
-				),
-				h("div", { style: { marginBottom: 6 } },
-					h("div", { style: { color: T.secondary, fontSize: 12, marginBottom: 4 } }, t("PR 描述")),
-					h("textarea", { rows: 3, value: body, onChange: (e) => setBody(e.target.value), style: { ...inputStyle(), minHeight: 60, resize: "vertical" } }),
-				),
-				h("div", { style: { marginBottom: 6 } },
-					h("div", { style: { color: T.secondary, fontSize: 12, marginBottom: 4 } }, t("条目文件内容（entry，可留空）")),
-					h("textarea", { rows: 4, value: entry, onChange: (e) => setEntry(e.target.value), style: { ...inputStyle(), minHeight: 70, resize: "vertical", fontFamily: "var(--ds-font-family-code, ui-monospace, monospace)", fontSize: 11 } }),
-				),
-				h("div", { style: { marginBottom: 6 } },
-					h("div", { style: { color: T.secondary, fontSize: 12, marginBottom: 4 } }, t("工作目录（fork 克隆位置，默认=默认工作区）")),
-					h("input", { type: "text", value: workdir, onChange: (e) => setWorkdir(e.target.value), style: inputStyle() }),
-				),
-				h("div", { style: { display: "flex", gap: 8, marginTop: 6, alignItems: "center", flexWrap: "wrap" } },
-					h(Btn, { label: execBusy ? t("PR 执行中…") : t("执行 PR"), onClick: execute, disabled: execBusy || !url || !rule, tone: "success" }),
-					prUrl ? h("a", { href: prUrl, target: "_blank", rel: "noreferrer", style: { color: T.brand, fontSize: 12 } }, prUrl) : null,
-				),
-				logs.length > 0 ? h("div", { style: { marginTop: 8, maxHeight: 200, overflow: "auto", background: T.layer1, borderRadius: 8, padding: 8 } },
-					logs.map((lg, i) =>
-						h("div", { key: i, style: { fontSize: 11, lineHeight: 1.6 } },
-							h("span", { style: { color: lg.ok ? T.success : T.danger, fontWeight: 600, marginRight: 6 } }, (lg.ok ? "✅" : "❌") + " " + (lg.label || "")),
-							lg.output ? h("span", { style: { color: T.secondary } }, lg.output) : null
-						)
-					)
-				) : null,
-				msg ? h("div", { style: { color: T.success, fontSize: 12, marginTop: 6 } }, "✅ " + msg) : null,
-				err ? h("div", { style: { color: T.danger, fontSize: 12, marginTop: 6 } }, "❌ " + err) : null,
-			);
-		}
-
-		// ---------- section 6: 发布 npm 包 ----------
+		// ---------- section 5: 发布 npm 包 ----------
 		function NpmSection() {
 			const [dir, setDir] = useState("");
 			const [dirs, setDirs] = useState([]);
@@ -2132,7 +2071,7 @@ function useSession() {
 						jget("/workspaces").catch(() => null),
 					]);
 					const list = [];
-					// ⑥ 目标目录默认留空，由用户手动选择（不复选默认目录）。
+					// ⑤ 目标目录默认留空，由用户手动选择（不复选默认目录）。
 					if (def && def.dir) { if (!list.includes(def.dir)) list.push(def.dir); }
 					if (ws) {
 						if (Array.isArray(ws.workspaces)) for (const w of ws.workspaces) if (!list.includes(w)) list.push(w);
@@ -2220,7 +2159,7 @@ function useSession() {
 				{ key: "publish", label: t("⑤ 发布（publish）") },
 			];
 
-			return h(Box, { title: t("⑥ 发布 npm 包"), defaultCollapsed: true },
+			return h(Box, { title: t("⑤ 发布 npm 包"), defaultCollapsed: true },
 				h("div", { style: { fontSize: 11, color: T.secondary, marginBottom: 8 } }, t("发布 npm 包五步向导：确认源 → 认证配置 → 身份 → 打包预览 → 发布")),
 				h("div", { style: { display: "flex", gap: 8, marginBottom: 8, alignItems: "center" } },
 					h("span", { style: { color: T.secondary, fontSize: 12, whiteSpace: "nowrap" } }, t("目标目录（含 package.json）")),
@@ -2247,6 +2186,7 @@ function useSession() {
 						: null,
 					h("div", null, (status.installed ? "" : t("npm 未安装（请先在 ① 环境检查安装）") + " ") + (status.npmPath || "npm")),
 					status.registry ? h("div", null, t("registry：") + status.registry) : null,
+					status.publishRegistry ? h("div", { style: status.mirrorConfigured ? { color: T.warn } : { color: T.secondary } }, (status.mirrorConfigured ? "⚠️ " : "") + t("发布将使用官方源：") + status.publishRegistry) : null,
 					status.whoami
 						? h("div", { style: { color: T.success } }, t("已登录：") + status.whoami)
 						: h("div", { style: { color: T.warn } }, "⚠️ " + (status.whoamiError || t("未登录 npm"))),
@@ -2256,7 +2196,7 @@ function useSession() {
 						h("div", { style: { fontSize: 12, color: T.warn, marginBottom: 6 } }, t("未登录 npm，发布前需先登录")),
 						h("div", { style: { display: "flex", gap: 8, flexWrap: "wrap" } },
 							h(Btn, { label: loginBusy ? t("执行中…") : t("打开终端执行 npm login"), onClick: openLogin, disabled: loginBusy || !String(dir || "").trim(), tone: "primary", noBg: true }),
-							h(Btn, { label: t("复制登录命令"), onClick: () => { void copyText("npm login"); setMsg(t("已复制：") + "npm login"); }, noBg: true }),
+							h(Btn, { label: t("复制登录命令"), onClick: () => { void copyText("npm login --registry=https://registry.npmjs.org"); setMsg(t("已复制：") + "npm login --registry=https://registry.npmjs.org"); }, noBg: true }),
 						),
 					) : null,
 				steps.map((s) =>
@@ -2321,7 +2261,7 @@ function useSession() {
 					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 } },
-					t("按顺序完成：①环境检查 → ②SSH 密钥与连接 → ③代码管理，以及 ④克隆仓库 / ⑤提交 PR / ⑥发布 npm 包。推送会自动忽略 >100MB 的文件（") + (provider === "gitee" ? "Gitee" : "GitHub") + t(" 限制）并说明原因。")),
+					t("按顺序完成：①环境检查 → ②SSH 密钥与连接 → ③代码管理，以及 ④克隆仓库 / ⑤发布 npm 包。推送会自动忽略 >100MB 的文件（") + (provider === "gitee" ? "Gitee" : "GitHub") + t(" 限制）并说明原因。")),
 				h(EnvSection, null),
 				h("div", { style: { height: 12 } }),
 				h(SshSection, { provider, setProvider }),
@@ -2330,8 +2270,6 @@ function useSession() {
 				h("div", { style: { height: 12 } }),
 				h(CloneSection, { provider, setProvider }),
 				h("div", { style: { height: 12 } }),
-				h(PrSection, null),
-				h("div", { style: { height: 12 } }),
 				h(NpmSection, null)
 			);
 		}