source-code-mgmt 1.5.0 → 1.10.0

package/lib/index.js

@@ -24,6 +24,20 @@ import {
 import { join, dirname } from 'node:path'
 import { homedir } from 'node:os'
 
+import { AsyncLocalStorage } from 'node:async_hooks'
+
+// ---------- i18n: host messages follow the client’s language (?lang= query param, per request) ----------
+const HOST_EN = {"尚未配置 Gitee 私人令牌（请打开 ③ 代码管理输入令牌）":"No Gitee personal token configured (enter one in ③ Code Management)","Gitee API 请求失败（需要 curl）":"Gitee API request failed (curl required)","not a git repository（尚未 git init，可用「新建仓库并推送」初始化为 git 仓库并上传）":"not a git repository (run \"Create repo & push\" to init one and upload)","超过 GitHub 100MB 单文件限制（${}），已被 .gitignore 的 \"${}\" 排除":"Exceeds GitHub's 100MB file limit (${}) — already excluded by .gitignore entry \"${}\"","超过 GitHub 100MB 单文件限制（${}），${} 所在的一级目录「${}」整体忽略（该文件夹为一整体）":"Exceeds GitHub's 100MB file limit (${}) — the whole first-level folder \"${}\" of ${} is ignored (the folder is one unit)","超过 GitHub 100MB 单文件限制（${}），已忽略单个文件「${}」":"Exceeds GitHub's 100MB file limit (${}) — the file \"${}\" was ignored individually","尚未配置远程仓库 origin，请使用「新建仓库」创建远程仓库。":"No origin remote configured — use \"Create repo\" to create a remote repo.","not a git repository（尚未 git init，无法拉取）":"not a git repository (no git init yet — cannot pull)","尚未配置远程仓库 origin，无法拉取。":"No origin remote configured — cannot pull.","拉取存在冲突：本地有未合并改动或与远程冲突，请手动 git pull 处理合并。":"Pull conflicts: you have unmerged local changes or conflicts with the remote — resolve them manually with git pull.","git pull 失败":"git pull failed","not a git repository（尚未 git init）":"not a git repository (run git init first)","拉取并推送失败：合并存在冲突，请手动解决后重试。":"Pull-and-push failed: merge conflicts — resolve them manually and retry.","pull --rebase 失败":"pull --rebase failed","push 失败":"push failed","push --force 失败":"push --force failed","强制拉取存在冲突，请手动处理。":"Force-pull conflicts — handle them manually.","git pull --force 失败":"git pull --force failed","缺少仓库名称":"Repo name required","仓库名称包含非法字符（仅允许字母、数字、点、下划线、横线）":"Repo name contains invalid characters (only letters, digits, dots, underscores, dashes)","git add 失败：${}":"git add failed: ${}","需要先配置 Gitee 私人令牌":"Configure the Gitee personal token first","Gitee 创建仓库失败":"Failed to create the Gitee repo","缺少文件路径":"File path required","无法识别当前分支":"Cannot determine the current branch","尚未配置远程仓库 origin，无法对齐。":"No origin remote configured — cannot align.","git fetch 失败":"git fetch failed","git reset --hard 失败":"git reset --hard failed","git init 失败":"git init failed","git add 失败":"git add failed","git reset 失败":"git reset failed","提交信息不能为空":"Commit message cannot be empty","没有已暂存（staged）的改动可提交":"Nothing staged to commit","git commit 失败":"git commit failed","缺少分支名":"Branch name required","切换分支失败":"Failed to switch branch","git log 失败":"git log failed","缺少 commit hash":"Commit hash required","revert 失败（可能有冲突，请手动处理）":"revert failed (possible conflicts — handle manually)","cherry-pick 失败（可能有冲突，请手动处理）":"cherry-pick failed (possible conflicts — handle manually)","读取提交 diff 失败":"Failed to read the commit diff","未知工具：":"Unknown tool: ","未找到可用的包管理器（":"No usable package manager found (","）。请手动安装。":"). Please install manually.","安装成功":"Installed successfully","安装失败":"Installation failed","$dlg.Description = '选择本地目录';":"$dlg.Description = 'Choose a local folder';","Gitee 修改可见性失败":"Failed to change Gitee visibility","需要先登录 GitHub CLI（gh）":"Log in to the GitHub CLI (gh) first","修改可见性失败：${}":"Failed to change visibility: ${}","gh repo edit 失败":"gh repo edit failed","缺少目录路径":"Folder path required","未选择目录":"No folder selected","目录不存在或不是文件夹：":"Folder does not exist or is not a directory: ","令牌不能为空":"Token cannot be empty","Gitee 令牌无效，请检查（需有 projects 权限）":"Invalid Gitee token — check it (needs projects permission)"};
+const requestLangStore = new AsyncLocalStorage();
+function langOf(req) { try { const l = new URL(req.url ?? "", "http://localhost").searchParams.get("lang"); return l === "en" ? "en" : "zh" } catch { return "zh" } }
+function lang() { return requestLangStore.getStore() ?? "zh" }
+function tr(key, params) {
+  let s = lang() === "en" ? (HOST_EN[key] ?? key) : key;
+  if (params && params.length) { let i = 0; s = String(s).replace(/\$\{\}/g, () => String(params[i++] ?? "")) }
+  return s
+}
+
+
 /** Stable cordis plugin name (also the browser bundle id). */
 export const name = 'source-code-mgmt'
 
@@ -525,7 +539,7 @@ function saveGiteeToken(token) {
  */
 function giteeApi(method, path, body, token) {
   const tok = token || readGiteeToken()
-  if (!tok) return { ok: false, error: '尚未配置 Gitee 私人令牌（请打开 ③ 代码管理输入令牌）' }
+  if (!tok) return { ok: false, error: tr('尚未配置 Gitee 私人令牌（请打开 ③ 代码管理输入令牌）') }
   const args = [
     '-sS', '-L',
     '-X', String(method || 'GET').toUpperCase(),
@@ -539,7 +553,7 @@ function giteeApi(method, path, body, token) {
   args.push('https://gitee.com/api/v5/' + String(path).replace(/^\/+/, ''))
   const r = run(CURL, args, { timeout: 70_000 })
   if (!r.ok) {
-    return { ok: false, error: (r.stderr || r.stdout || '').trim() || 'Gitee API 请求失败（需要 curl）' }
+    return { ok: false, error: (r.stderr || r.stdout || '').trim() || tr('Gitee API 请求失败（需要 curl）') }
   }
   let data
   try { data = JSON.parse(r.stdout || '{}') } catch { data = null }
@@ -733,7 +747,7 @@ function repoStatus(dir, provider = 'github', full = false) {
       repoOwner: ev.owner,
       visibility: ev.checked && ev.exists ? ev.visibility : undefined,
       provider,
-      error: 'not a git repository（尚未 git init，可用「新建仓库并推送」初始化为 git 仓库并上传）',
+      error: tr('not a git repository（尚未 git init，可用「新建仓库并推送」初始化为 git 仓库并上传）'),
     }
   }
 
@@ -910,10 +924,10 @@ function pushFlow(dir) {
   const plan = ignorePlan(dir)
   const skipped = plan.entries.map((e) => {
     const reason = e.ignored
-      ? `超过 GitHub 100MB 单文件限制（${fmtMB(e.bytes)}），已被 .gitignore 的 "${e.path}" 排除`
+      ? tr("超过 GitHub 100MB 单文件限制（${}），已被 .gitignore 的 \"${}\" 排除", [fmtMB(e.bytes), e.path])
       : e.kind === 'dir'
-        ? `超过 GitHub 100MB 单文件限制（${fmtMB(e.bytes)}），${e.source} 所在的一级目录「${e.path}」整体忽略（该文件夹为一整体）`
-        : `超过 GitHub 100MB 单文件限制（${fmtMB(e.bytes)}），已忽略单个文件「${e.path}」`
+        ? tr("超过 GitHub 100MB 单文件限制（${}），${} 所在的一级目录「${}」整体忽略（该文件夹为一整体）", [fmtMB(e.bytes), e.source, e.path])
+        : tr("超过 GitHub 100MB 单文件限制（${}），已忽略单个文件「${}」", [fmtMB(e.bytes), e.path])
     return { path: e.kind === 'dir' ? e.path + '/' : e.path, reason }
   })
 
@@ -965,7 +979,7 @@ function pushFlow(dir) {
     return {
       ok: false, needsRemote: true, branch: branchName,
       committed, commitHash, skipped,
-      error: '尚未配置远程仓库 origin，请使用「新建仓库」创建远程仓库。',
+      error: tr('尚未配置远程仓库 origin，请使用「新建仓库」创建远程仓库。'),
     }
   }
 
@@ -994,11 +1008,11 @@ function pushFlow(dir) {
 function pullFlow(dir) {
   if (!dir || !existsSync(dir)) return { ok: false, error: 'folder does not exist' }
   if (!existsSync(join(dir, '.git'))) {
-    return { ok: false, error: 'not a git repository（尚未 git init，无法拉取）' }
+    return { ok: false, error: tr('not a git repository（尚未 git init，无法拉取）') }
   }
   const hasRemote = run(GIT, ['-C', dir, 'remote', 'get-url', 'origin']).ok
   if (!hasRemote) {
-    return { ok: false, error: '尚未配置远程仓库 origin，无法拉取。' }
+    return { ok: false, error: tr('尚未配置远程仓库 origin，无法拉取。') }
   }
 
   // Was already up to date? First cheap check via ls-remote comparison.
@@ -1028,8 +1042,8 @@ function pullFlow(dir) {
     conflict,
     branch: branchName,
     error: conflict
-      ? '拉取存在冲突：本地有未合并改动或与远程冲突，请手动 git pull 处理合并。'
-      : (pull.stderr || pull.stdout).trim() || 'git pull 失败',
+      ? tr('拉取存在冲突：本地有未合并改动或与远程冲突，请手动 git pull 处理合并。')
+      : (pull.stderr || pull.stdout).trim() || tr('git pull 失败'),
     detail: blob,
   }
 }
@@ -1043,7 +1057,7 @@ function pullFlow(dir) {
 function mergePushFlow(dir) {
   if (!dir || !existsSync(dir)) return { ok: false, error: 'folder does not exist' }
   if (!existsSync(join(dir, '.git'))) {
-    return { ok: false, error: 'not a git repository（尚未 git init）' }
+    return { ok: false, error: tr('not a git repository（尚未 git init）') }
   }
   const branch = run(GIT, ['-C', dir, 'rev-parse', '--abbrev-ref', 'HEAD'])
   const branchName = branch.ok ? branch.stdout.trim() : 'main'
@@ -1057,8 +1071,8 @@ function mergePushFlow(dir) {
     return {
       ok: false, conflict, branch: branchName,
       error: conflict
-        ? '拉取并推送失败：合并存在冲突，请手动解决后重试。'
-        : (rebase.stderr || rebase.stdout).trim() || 'pull --rebase 失败',
+        ? tr('拉取并推送失败：合并存在冲突，请手动解决后重试。')
+        : (rebase.stderr || rebase.stdout).trim() || tr('pull --rebase 失败'),
       detail: blob,
     }
   }
@@ -1069,7 +1083,7 @@ function mergePushFlow(dir) {
   if (!push.ok) {
     return {
       ok: false, branch: branchName, detail: (push.stdout + '\n' + push.stderr).trim(),
-      error: (push.stderr || push.stdout).trim() || 'push 失败',
+      error: (push.stderr || push.stdout).trim() || tr('push 失败'),
     }
   }
   return { ok: true, branch: branchName, rebased: true, pushed: true }
@@ -1084,7 +1098,7 @@ function mergePushFlow(dir) {
 function forcePushFlow(dir) {
   if (!dir || !existsSync(dir)) return { ok: false, error: 'folder does not exist' }
   if (!existsSync(join(dir, '.git'))) {
-    return { ok: false, error: 'not a git repository（尚未 git init）' }
+    return { ok: false, error: tr('not a git repository（尚未 git init）') }
   }
   const branch = run(GIT, ['-C', dir, 'rev-parse', '--abbrev-ref', 'HEAD'])
   const branchName = branch.ok ? branch.stdout.trim() : 'main'
@@ -1094,7 +1108,7 @@ function forcePushFlow(dir) {
   const blob = (push.stdout + '\n' + push.stderr).trim()
   return {
     ok: push.ok, branch: branchName, forced: push.ok,
-    error: push.ok ? undefined : (push.stderr || push.stdout).trim() || 'push --force 失败',
+    error: push.ok ? undefined : (push.stderr || push.stdout).trim() || tr('push --force 失败'),
     detail: blob,
   }
 }
@@ -1109,7 +1123,7 @@ function forcePushFlow(dir) {
 function forcePullFlow(dir) {
   if (!dir || !existsSync(dir)) return { ok: false, error: 'folder does not exist' }
   if (!existsSync(join(dir, '.git'))) {
-    return { ok: false, error: 'not a git repository（尚未 git init）' }
+    return { ok: false, error: tr('not a git repository（尚未 git init）') }
   }
   const branch = run(GIT, ['-C', dir, 'rev-parse', '--abbrev-ref', 'HEAD'])
   const branchName = branch.ok ? branch.stdout.trim() : 'main'
@@ -1122,8 +1136,8 @@ function forcePullFlow(dir) {
     ok: pull.ok, conflict, branch: branchName,
     error: !pull.ok
       ? (conflict
-        ? '强制拉取存在冲突，请手动处理。'
-        : (pull.stderr || pull.stdout).trim() || 'git pull --force 失败')
+        ? tr('强制拉取存在冲突，请手动处理。')
+        : (pull.stderr || pull.stdout).trim() || tr('git pull --force 失败'))
       : undefined,
     detail: blob,
   }
@@ -1144,9 +1158,9 @@ function forcePullFlow(dir) {
 function createRepoFlow(dir, name, visibility, provider = 'github') {
   if (!dir || !existsSync(dir)) return { ok: false, error: 'folder does not exist' }
   const repoName = String(name || '').trim()
-  if (!repoName) return { ok: false, error: '缺少仓库名称' }
+  if (!repoName) return { ok: false, error: tr('缺少仓库名称') }
   if (!/^[A-Za-z0-9._-]+$/.test(repoName) || repoName === '.') {
-    return { ok: false, error: '仓库名称包含非法字符（仅允许字母、数字、点、下划线、横线）' }
+    return { ok: false, error: tr('仓库名称包含非法字符（仅允许字母、数字、点、下划线、横线）') }
   }
   if (!existsSync(join(dir, '.git'))) {
     const init = run(GIT, ['-C', dir, 'init'])
@@ -1167,7 +1181,7 @@ function createRepoFlow(dir, name, visibility, provider = 'github') {
   if (!head.ok) {
     const stagedCount = run(GIT, ['-C', dir, 'add', '-A'])
     if (!stagedCount.ok) {
-      return { ok: false, error: `git add 失败：${(stagedCount.stderr || '')}` }
+      return { ok: false, error: tr("git add 失败：${}", [(stagedCount.stderr || '')]) }
     }
     const commit = run(GIT, ['-C', dir, 'commit', '-m', 'init: initial commit from DSH source-code-mgmt'])
     if (!commit.ok) {
@@ -1182,10 +1196,10 @@ function createRepoFlow(dir, name, visibility, provider = 'github') {
     // 1) Create the empty remote repo via the Gitee OpenAPI.
     const owner = giteeOwner()
     const token = readGiteeToken()
-    if (!owner || !token) return { ok: false, error: '需要先配置 Gitee 私人令牌' }
+    if (!owner || !token) return { ok: false, error: tr('需要先配置 Gitee 私人令牌') }
     const api = giteeApi('POST', 'user/repos', { name: repoName, private: vis === 'private' }, token)
     if (!api.ok || giteeApiFailed(api.data)) {
-      return { ok: false, error: (api.error || (api.data && api.data.message) || 'Gitee 创建仓库失败'), detail: api.data }
+      return { ok: false, error: (api.error || (api.data && api.data.message) || tr('Gitee 创建仓库失败')), detail: api.data }
     }
     // 2) Point origin at the SSH remote and push (SSH per user's choice).
     const sshUrl = 'git@gitee.com:' + owner + '/' + repoName + '.git'
@@ -1244,7 +1258,7 @@ function repoDiffFlow(dir, path) {
     return { ok: false, error: 'not a git repository' }
   }
   const p = String(path || '').trim()
-  if (!p) return { ok: false, error: '缺少文件路径' }
+  if (!p) return { ok: false, error: tr('缺少文件路径') }
   // Untracked files have no tracked diff.
   const status = run(GIT, ['-C', dir, 'status', '--porcelain', '--', p])
   const isUntracked = status.ok && /^\?\?/.test(status.stdout.trim().slice(0, 2))
@@ -1266,23 +1280,23 @@ function repoDiffFlow(dir, path) {
 function alignFlow(dir) {
   if (!dir || !existsSync(dir)) return { ok: false, error: 'folder does not exist' }
   if (!existsSync(join(dir, '.git'))) {
-    return { ok: false, error: 'not a git repository（尚未 git init）' }
+    return { ok: false, error: tr('not a git repository（尚未 git init）') }
   }
   const branch = run(GIT, ['-C', dir, 'rev-parse', '--abbrev-ref', 'HEAD'])
   const branchName = branch.ok ? branch.stdout.trim() : undefined
-  if (!branchName) return { ok: false, error: '无法识别当前分支' }
+  if (!branchName) return { ok: false, error: tr('无法识别当前分支') }
   const hasRemote = run(GIT, ['-C', dir, 'remote', 'get-url', 'origin']).ok
-  if (!hasRemote) return { ok: false, error: '尚未配置远程仓库 origin，无法对齐。' }
+  if (!hasRemote) return { ok: false, error: tr('尚未配置远程仓库 origin，无法对齐。') }
 
   const fetch = run(GIT, ['-C', dir, 'fetch', 'origin'], { timeout: 120_000 })
   if (!fetch.ok) {
-    return { ok: false, error: (fetch.stderr || fetch.stdout).trim() || 'git fetch 失败', detail: (fetch.stdout + '\n' + fetch.stderr).trim() }
+    return { ok: false, error: (fetch.stderr || fetch.stdout).trim() || tr('git fetch 失败'), detail: (fetch.stdout + '\n' + fetch.stderr).trim() }
   }
   const reset = run(GIT, ['-C', dir, 'reset', '--hard', 'origin/' + branchName], { timeout: 60_000 })
   return {
     ok: reset.ok,
     branch: branchName,
-    error: reset.ok ? undefined : (reset.stderr || reset.stdout).trim() || 'git reset --hard 失败',
+    error: reset.ok ? undefined : (reset.stderr || reset.stdout).trim() || tr('git reset --hard 失败'),
     detail: (fetch.stdout + '\n' + reset.stdout).trim(),
   }
 }
@@ -1299,7 +1313,7 @@ function initGitFlow(dir) {
     return { ok: true, alreadyRepo: true, dir }
   }
   const init = run(GIT, ['-C', dir, 'init'])
-  if (!init.ok) return { ok: false, error: (init.stderr || init.stdout).trim() || 'git init 失败' }
+  if (!init.ok) return { ok: false, error: (init.stderr || init.stdout).trim() || tr('git init 失败') }
   const ident = run(GIT, ['-C', dir, 'config', 'user.email'])
   if (!ident.ok) {
     run(GIT, ['-C', dir, 'config', 'user.name', 'DSH User'])
@@ -1316,7 +1330,7 @@ function initGitFlow(dir) {
 /** Basic guard: the folder must exist and be a git repo; returns an error object or null. */
 function requireGitRepo(dir) {
   if (!dir || !existsSync(dir)) return { error: 'folder does not exist' }
-  if (!existsSync(join(dir, '.git'))) return { error: 'not a git repository（尚未 git init）' }
+  if (!existsSync(join(dir, '.git'))) return { error: tr('not a git repository（尚未 git init）') }
   return null
 }
 
@@ -1331,7 +1345,7 @@ function stageFlow(dir, path) {
   const args = ['-C', dir, 'add', '-A']
   if (path && String(path).trim() !== '') args.push('--', String(path).trim())
   const r = run(GIT, args)
-  if (!r.ok) return { ok: false, error: (r.stderr || r.stdout).trim() || 'git add 失败' }
+  if (!r.ok) return { ok: false, error: (r.stderr || r.stdout).trim() || tr('git add 失败') }
   return { ok: true, path: path || null }
 }
 
@@ -1346,7 +1360,7 @@ function unstageFlow(dir, path) {
   const args = ['-C', dir, 'reset', '-q']
   if (path && String(path).trim() !== '') args.push('--', String(path).trim())
   const r = run(GIT, args)
-  if (!r.ok) return { ok: false, error: (r.stderr || r.stdout).trim() || 'git reset 失败' }
+  if (!r.ok) return { ok: false, error: (r.stderr || r.stdout).trim() || tr('git reset 失败') }
   return { ok: true, path: path || null }
 }
 
@@ -1364,7 +1378,7 @@ function commitFlow(dir, message, paths) {
   const guard = requireGitRepo(dir)
   if (guard) return { ok: false, error: guard.error }
   const msg = String(message || '').trim()
-  if (msg === '') return { ok: false, error: '提交信息不能为空' }
+  if (msg === '') return { ok: false, error: tr('提交信息不能为空') }
 
   const ident = run(GIT, ['-C', dir, 'config', 'user.email'])
   if (!ident.ok) {
@@ -1377,7 +1391,7 @@ function commitFlow(dir, message, paths) {
   if (list.length > 0) {
     // 只提交指定文件：先把这些文件 add 进暂存区。
     const add = run(GIT, ['-C', dir, 'add', '--', ...list])
-    if (!add.ok) return { ok: false, error: (add.stderr || add.stdout).trim() || 'git add 失败' }
+    if (!add.ok) return { ok: false, error: (add.stderr || add.stdout).trim() || tr('git add 失败') }
     stagedPaths = list
   } else {
     // 提交整个暂存区：列出已暂存文件用于提示。
@@ -1387,10 +1401,10 @@ function commitFlow(dir, message, paths) {
 
   // 无可提交内容时避免报错。
   const hasChanges = run(GIT, ['-C', dir, 'diff', '--cached', '--quiet']).code !== 0
-  if (!hasChanges) return { ok: false, error: '没有已暂存（staged）的改动可提交', staged: 0 }
+  if (!hasChanges) return { ok: false, error: tr('没有已暂存（staged）的改动可提交'), staged: 0 }
 
   const commit = run(GIT, ['-C', dir, 'commit', '-m', msg])
-  if (!commit.ok) return { ok: false, error: (commit.stderr || commit.stdout).trim() || 'git commit 失败', staged: stagedPaths.length }
+  if (!commit.ok) return { ok: false, error: (commit.stderr || commit.stdout).trim() || tr('git commit 失败'), staged: stagedPaths.length }
 
   const rev = run(GIT, ['-C', dir, 'rev-parse', '--short', 'HEAD'])
   return {
@@ -1402,6 +1416,62 @@ function commitFlow(dir, message, paths) {
   }
 }
 
+/**
+ * Push STAGED changes only: commit whatever is currently staged (using the
+ * given message, or an autogenerated one when empty), then push to origin.
+ * Unlike {@link pushFlow} it does NOT go on to stage untracked/unstaged files
+ * itself and does NOT overwrite the user's own commit message. When nothing is
+ * newly staged yet (e.g. the local branch already has commits ahead), it simply
+ * pushes those existing commits.
+ * @param {string} dir - local folder.
+ * @param {string} [message] - commit message used only when something is staged
+ *   and the caller supplies one; empty falls back to an autogenerated message.
+ */
+function pushStagedFlow(dir, message) {
+  const guard = requireGitRepo(dir)
+  if (guard) return { ok: false, error: guard.error }
+
+  // Remote must exist before we can push.
+  const hasRemote = run(GIT, ['-C', dir, 'remote', 'get-url', 'origin']).ok
+  if (!hasRemote) {
+    return { ok: false, needsRemote: true, error: tr('尚未配置远程仓库 origin，请使用「新建仓库」创建远程仓库。') }
+  }
+
+  const msg = String(message || '').trim()
+  let committed = false
+  let commitHash
+  // Commit staged content only if there is anything staged right now.
+  const hasStaged = run(GIT, ['-C', dir, 'diff', '--cached', '--quiet']).code !== 0
+  if (hasStaged) {
+    const ident = run(GIT, ['-C', dir, 'config', 'user.email'])
+    if (!ident.ok) {
+      run(GIT, ['-C', dir, 'config', 'user.name', 'DSH User'])
+      run(GIT, ['-C', dir, 'config', 'user.email', 'dsh@localhost'])
+    }
+    const useMsg = msg || ('chore: update ' + baseName(dir))
+    const commit = run(GIT, ['-C', dir, 'commit', '-m', useMsg])
+    if (!commit.ok) return { ok: false, error: (commit.stderr || commit.stdout).trim() || tr('git commit 失败') }
+    committed = true
+    const rev = run(GIT, ['-C', dir, 'rev-parse', '--short', 'HEAD'])
+    commitHash = rev.ok ? rev.stdout.trim() : undefined
+  }
+
+  const curBranch = run(GIT, ['-C', dir, 'rev-parse', '--abbrev-ref', 'HEAD'])
+  const branchName = curBranch.ok ? curBranch.stdout.trim() : 'main'
+  const push = run(GIT, ['-C', dir, 'push', '-u', 'origin', branchName], { timeout: 120_000 })
+  const pushed = push.ok
+  return {
+    ok: pushed,
+    needsRemote: false,
+    committed,
+    commitHash,
+    message: msg || (committed ? ('chore: update ' + baseName(dir)) : undefined),
+    branch: branchName,
+    pushed,
+    pushError: pushed ? undefined : (push.stderr || push.stdout).trim(),
+  }
+}
+
 /**
  * List branches (current first) using `git for-each-ref`.
  * @param {string} dir - local folder.
@@ -1426,9 +1496,9 @@ function checkoutFlow(dir, branch) {
   const guard = requireGitRepo(dir)
   if (guard) return { ok: false, error: guard.error }
   const b = String(branch || '').trim()
-  if (b === '') return { ok: false, error: '缺少分支名' }
+  if (b === '') return { ok: false, error: tr('缺少分支名') }
   const r = run(GIT, ['-C', dir, 'checkout', b])
-  if (!r.ok) return { ok: false, error: (r.stderr || r.stdout).trim() || '切换分支失败' }
+  if (!r.ok) return { ok: false, error: (r.stderr || r.stdout).trim() || tr('切换分支失败') }
   return { ok: true, branch: b }
 }
 
@@ -1449,7 +1519,7 @@ function logFlow(dir, count) {
     if (/does not have any commits|bad revision|your current branch/i.test((r.stderr || r.stdout))) {
       return { ok: true, commits: [] }
     }
-    return { ok: false, error: (r.stderr || r.stdout).trim() || 'git log 失败' }
+    return { ok: false, error: (r.stderr || r.stdout).trim() || tr('git log 失败') }
   }
   const commits = r.stdout.split(/\r?\n/).filter((l) => l.trim() !== '').map((line) => {
     const [short, subject, author, date, full, refs] = line.split('\x1f')
@@ -1474,9 +1544,9 @@ function revertFlow(dir, hash) {
   const guard = requireGitRepo(dir)
   if (guard) return { ok: false, error: guard.error }
   const h = String(hash || '').trim()
-  if (h === '') return { ok: false, error: '缺少 commit hash' }
+  if (h === '') return { ok: false, error: tr('缺少 commit hash') }
   const r = run(GIT, ['-C', dir, 'revert', '--no-edit', h], { timeout: 60_000 })
-  if (!r.ok) return { ok: false, error: (r.stderr || r.stdout).trim() || 'revert 失败（可能有冲突，请手动处理）' }
+  if (!r.ok) return { ok: false, error: (r.stderr || r.stdout).trim() || tr('revert 失败（可能有冲突，请手动处理）') }
   return { ok: true, hash: h }
 }
 
@@ -1489,9 +1559,9 @@ function cherryPickFlow(dir, hash) {
   const guard = requireGitRepo(dir)
   if (guard) return { ok: false, error: guard.error }
   const h = String(hash || '').trim()
-  if (h === '') return { ok: false, error: '缺少 commit hash' }
+  if (h === '') return { ok: false, error: tr('缺少 commit hash') }
   const r = run(GIT, ['-C', dir, 'cherry-pick', h], { timeout: 60_000 })
-  if (!r.ok) return { ok: false, error: (r.stderr || r.stdout).trim() || 'cherry-pick 失败（可能有冲突，请手动处理）' }
+  if (!r.ok) return { ok: false, error: (r.stderr || r.stdout).trim() || tr('cherry-pick 失败（可能有冲突，请手动处理）') }
   return { ok: true, hash: h }
 }
 
@@ -1505,9 +1575,9 @@ function commitDiffFlow(dir, hash) {
   const guard = requireGitRepo(dir)
   if (guard) return { ok: false, error: guard.error }
   const h = String(hash || '').trim()
-  if (h === '') return { ok: false, error: '缺少 commit hash' }
+  if (h === '') return { ok: false, error: tr('缺少 commit hash') }
   const r = run(GIT, ['-C', dir, 'show', '--no-ext-diff', '--no-color', '--format=', '-m', '--first-parent', h])
-  if (!r.ok) return { ok: false, error: (r.stderr || r.stdout).trim() || '读取提交 diff 失败' }
+  if (!r.ok) return { ok: false, error: (r.stderr || r.stdout).trim() || tr('读取提交 diff 失败') }
   return { ok: true, hash: h, diff: r.stdout }
 }
 
@@ -1577,7 +1647,7 @@ function installCommand(tool) {
  */
 function installToolFlow(tool) {
   const t = String(tool || '').trim().toLowerCase()
-  if (t !== 'git' && t !== 'gh' && t !== 'ssh') return { ok: false, error: '未知工具：' + tool }
+  if (t !== 'git' && t !== 'gh' && t !== 'ssh') return { ok: false, error: tr('未知工具：') + tool }
   // 已安装就直接返回，不重复安装。
   const present = t === 'git' ? (GIT && GIT !== 'git')
     : t === 'gh' ? (GH && GH !== 'gh')
@@ -1586,7 +1656,7 @@ function installToolFlow(tool) {
 
   const cmd = installCommand(t)
   if (!cmd) {
-    return { ok: false, error: '未找到可用的包管理器（' + (IS_WIN ? 'winget / choco / scoop' : process.platform === 'darwin' ? 'brew' : 'apt-get / dnf / pacman') + '）。请手动安装。', tool: t }
+    return { ok: false, error: tr('未找到可用的包管理器（') + (IS_WIN ? 'winget / choco / scoop' : process.platform === 'darwin' ? 'brew' : 'apt-get / dnf / pacman') + tr('）。请手动安装。'), tool: t }
   }
   const r = run(cmd.bin, cmd.args, { timeout: 300_000 })
   const output = (r.stdout + '\n' + r.stderr).trim()
@@ -1596,7 +1666,7 @@ function installToolFlow(tool) {
     ok,
     tool: t,
     command: cmd.label,
-    output: output || (ok ? '安装成功' : '安装失败'),
+    output: output || (ok ? tr('安装成功') : tr('安装失败')),
     needElevation: IS_WIN && t === 'ssh',
   }
 }
@@ -1755,7 +1825,7 @@ function pickDirDialog(initialDir) {
   const script =
     'Add-Type -AssemblyName System.Windows.Forms;' +
     '$dlg = New-Object System.Windows.Forms.FolderBrowserDialog;' +
-    '$dlg.Description = \'选择本地目录\';' +
+    tr('$dlg.Description = \'选择本地目录\';') +
     (initial ? `$dlg.SelectedPath = '${initial}';` : '') +
     'if ($dlg.ShowDialog() -eq [System.Windows.Forms.DialogResult]::OK) { Write-Output $dlg.SelectedPath }'
   const r = run('powershell', ['-NoProfile', '-STA', '-Command', script], { timeout: 180_000 })
@@ -1882,15 +1952,15 @@ function setVisibilityFlow(name, target, provider = 'github') {
   const vis = target === 'public' ? 'public' : 'private'
   if (provider === 'gitee') {
     const owner = giteeOwner()
-    if (!owner || !name) return { ok: false, error: '需要先配置 Gitee 私人令牌' }
+    if (!owner || !name) return { ok: false, error: tr('需要先配置 Gitee 私人令牌') }
     const api = giteeApi('PATCH', 'repos/' + owner + '/' + name, { private: vis === 'private' })
     if (!api.ok || giteeApiFailed(api.data)) {
-      return { ok: false, error: (api.error || (api.data && api.data.message) || 'Gitee 修改可见性失败') }
+      return { ok: false, error: (api.error || (api.data && api.data.message) || tr('Gitee 修改可见性失败')) }
     }
     return { ok: true, name, visibility: vis, provider: 'gitee' }
   }
   const owner = ghOwner()
-  if (!owner || !name) return { ok: false, error: '需要先登录 GitHub CLI（gh）' }
+  if (!owner || !name) return { ok: false, error: tr('需要先登录 GitHub CLI（gh）') }
   const r = run(GH, [
     'repo', 'edit', owner + '/' + name,
     '--visibility', vis,
@@ -1899,7 +1969,7 @@ function setVisibilityFlow(name, target, provider = 'github') {
   if (!r.ok) {
     return {
       ok: false,
-      error: `修改可见性失败：${(r.stderr || r.stdout || '').trim() || 'gh repo edit 失败'}`,
+      error: tr("修改可见性失败：${}", [(r.stderr || r.stdout || '').trim() || tr('gh repo edit 失败')]),
     }
   }
   return { ok: true, name, visibility: vis, provider: 'github' }
@@ -1914,11 +1984,13 @@ function baseName(p) {
 
 export function apply(ctx) {
   const fallbackDir = resolveDefaultDir(process.cwd())
-  const handle = async (req, res, fn) => {
+  // 每个请求按 ?lang= 参数跑在独立语言上下文里（AsyncLocalStorage），
+  // 所有 flow 函数内的 tr() 都能读到当前请求的语言，并发请求互不干扰。
+  const handle = async (req, res, fn) => requestLangStore.run(langOf(req), async () => {
     if (!isLoopbackRequest(req)) return forbidden(res)
     const payload = await fn(req)
     json(res, 200, payload)
-  }
+  })
 
   const routes = {
     '/env': (req, res) => handle(req, res, async () => ({ ok: true, ...checkEnv() })),
@@ -1966,7 +2038,7 @@ export function apply(ctx) {
       await handle(req, res, async (req) => {
         const body = JSON.parse((await readBody(req)) || '{}')
         const dir = String(body.dir || '').trim()
-        if (!dir) return { ok: false, error: '缺少目录路径' }
+        if (!dir) return { ok: false, error: tr('缺少目录路径') }
         removeCustomDir(dir)
         return { ok: true, removed: dir, customDirs: readCustomDirs(), workspaces: listWorkspaces() }
       })
@@ -1990,7 +2062,7 @@ export function apply(ctx) {
       await handle(req, res, async (req) => {
         const body = JSON.parse((await readBody(req)) || '{}')
         const picked = pickDirDialog(body.initial || fallbackDir)
-        if (!picked) return { ok: false, cancelled: true, error: '未选择目录' }
+        if (!picked) return { ok: false, cancelled: true, error: tr('未选择目录') }
         return { ok: true, dir: picked, name: baseName(picked) }
       })
     },
@@ -1999,9 +2071,9 @@ export function apply(ctx) {
       await handle(req, res, async (req) => {
         const body = JSON.parse((await readBody(req)) || '{}')
         const dir = String(body.dir || '').trim()
-        if (!dir) return { ok: false, error: '缺少目录路径' }
+        if (!dir) return { ok: false, error: tr('缺少目录路径') }
         if (!existsSync(dir) || !statSync(dir).isDirectory()) {
-          return { ok: false, error: '目录不存在或不是文件夹：' + dir }
+          return { ok: false, error: tr('目录不存在或不是文件夹：') + dir }
         }
         saveCustomDir(dir)
         return { ok: true, dir, name: baseName(dir), workspaces: listWorkspaces(), customDirs: readCustomDirs() }
@@ -2099,6 +2171,13 @@ export function apply(ctx) {
         return pushFlow(body.dir || fallbackDir)
       })
     },
+    '/push-staged': async (req, res) => {
+      if (req.method !== 'POST') return methodNotAllowed(res, req.method)
+      await handle(req, res, async (req) => {
+        const body = JSON.parse((await readBody(req)) || '{}')
+        return pushStagedFlow(body.dir || fallbackDir, body.message)
+      })
+    },
     '/pull': async (req, res) => {
       if (req.method !== 'POST') return methodNotAllowed(res, req.method)
       await handle(req, res, async (req) => {
@@ -2158,13 +2237,13 @@ export function apply(ctx) {
             return { ok: true, configured: false, cleared: true }
           }
           const token = String(body.token || '').trim()
-          if (!token) return { ok: false, error: '令牌不能为空' }
+          if (!token) return { ok: false, error: tr('令牌不能为空') }
           saveGiteeToken(token)
           const owner = giteeOwner()
           if (!owner) {
             // 令牌无效则清掉，避免留有坏令牌。
             saveGiteeToken('')
-            return { ok: false, error: 'Gitee 令牌无效，请检查（需有 projects 权限）' }
+            return { ok: false, error: tr('Gitee 令牌无效，请检查（需有 projects 权限）') }
           }
           return { ok: true, configured: true, owner }
         })

package/package.json

@@ -1,38 +1,41 @@
-{
-  "name": "source-code-mgmt",
-  "version": "1.5.0",
-  "description": "DSH plugin: source code management. Registers「代码管理」as a dsh-better-sidebar sidebar Tab when installed, otherwise a top-right floating button + right drawer — env checks (git/gh), SSH ed25519 key setup, GitHub/Gitee dual-platform (SSH config 443 + Gitee OpenAPI), connectivity test, push / new repo, and auto-ignore files over 100MB with per-file skipped reasons. Cross-platform (Windows / Linux / macOS).",
-  "type": "module",
-  "main": "lib/index.js",
-  "exports": {
-    ".": {
-      "default": "./lib/index.js"
-    },
-    "./client": {
-      "default": "./lib/client.js"
-    },
-    "./package.json": "./package.json"
-  },
-  "dsh": {
-    "bundle": "./lib/index.js",
-    "client": {
-      "inject": [
-        "@deepseek-ai/dsh-client-runtime"
-      ],
-      "platform": "web"
-    }
-  },
-  "peerDependencies": {
-    "react": "^18.2.0",
-    "dsh-better-sidebar": ">=0.4.0"
-  },
-  "peerDependenciesMeta": {
-    "dsh-better-sidebar": {
-      "optional": true
-    }
-  },
-  "files": [
-    "lib/**/*.js"
-  ],
-  "license": "MIT"
-}
+{
+  "name": "source-code-mgmt",
+  "version": "1.10.0",
+  "description": "DSH plugin: source code management. Registers「代码管理」as a dsh-better-sidebar sidebar Tab when installed, otherwise a button in the DSH session header's right-aligned utilities (beside \"Session log\") opening a right-side integrated panel that pushes the main content — env checks (git/gh), SSH ed25519 key setup, GitHub/Gitee dual-platform (SSH config 443 + Gitee OpenAPI), connectivity test, push / new repo, and auto-ignore files over 100MB with per-file skipped reasons. Cross-platform (Windows / Linux / macOS).",
+  "type": "module",
+  "main": "lib/index.js",
+  "exports": {
+    ".": {
+      "default": "./lib/index.js"
+    },
+    "./client": {
+      "default": "./lib/client.js"
+    },
+    "./package.json": "./package.json"
+  },
+  "dsh": {
+    "bundle": {
+      "patch": "./cordis.patch.yml"
+    },
+    "client": {
+      "inject": [
+        "@deepseek-ai/dsh-client-runtime"
+      ],
+      "platform": "web"
+    }
+  },
+  "peerDependencies": {
+    "react": "^18.2.0",
+    "dsh-better-sidebar": ">=0.4.0"
+  },
+  "peerDependenciesMeta": {
+    "dsh-better-sidebar": {
+      "optional": true
+    }
+  },
+  "files": [
+    "lib/**/*.js",
+    "cordis.patch.yml"
+  ],
+  "license": "MIT"
+}