dsh-remote-vs 0.9.3 → 0.11.0

package/src/client/exec-output.ts

@@ -0,0 +1,129 @@
+/**
+ * Pure helpers behind the streaming exec surface (the network verbs' live log).
+ *
+ * The host route answers as server-sent events so a 20-minute push can show its
+ * progress (`remote: …`, hook output, pack lines) while it runs, instead of one
+ * line after the fact. Everything here is pure so the local self-check can pin
+ * the frame splitting (a chunk boundary may fall anywhere) and the output cap
+ * without a browser or a host.
+ */
+import { DEFAULT_NETWORK_TIMEOUT_MS, MAX_TIMEOUT_MS } from '../timeouts.ts'
+import { fetchCommand, pullCommand, pushCommand, pushRefspecCommand } from '../git-ops.ts'
+
+/** What a streamed push should do: remembered refspec ('' = plain) + remote. */
+export interface PushTarget {
+  refspec: string
+  remote: string
+}
+
+/**
+ * The commands one network verb runs, in order.
+ *
+ * Pure so the gate can pin the sequence: sync is pull-then-push (the historical
+ * order), and a push with a refspec must not fall back to the bare form.
+ */
+export function networkCommands(root: string, kind: 'fetch' | 'pull' | 'push' | 'sync', push: PushTarget): string[] {
+  if (kind === 'fetch') return [fetchCommand(root)]
+  if (kind === 'pull') return [pullCommand(root)]
+  const pushCmd = push.refspec === '' ? pushCommand(root) : pushRefspecCommand(root, push.remote, push.refspec)
+  if (kind === 'push') return [pushCmd]
+  // Sync keeps its historical order, and honours a refspec when one is given
+  // (the UI currently passes '' for sync, but the API must not quietly drop it).
+  return [pullCommand(root), pushCmd]
+}
+
+/** Live-log cap: keep the TAIL, because the head of a long push is never the point. */
+export const EXEC_OUTPUT_CAP = 200_000
+
+/**
+ * Fold carriage-return progress rewrites for DISPLAY.
+ *
+ * git's progress lines are written as `Counting: 1%\rCounting: 2%\r…` and a
+ * `<pre>` would render every rewrite as its own line (hundreds of them for one
+ * push). Only the content after the last `\r` of a line survives.
+ *
+ * Fold at RENDER time, over the complete accumulated text — not inside
+ * `appendExecOutput`. A chunk can end mid-rewrite (git writes bare `\r`s at
+ * arbitrary boundaries), and folding a fragment loses the state that the next
+ * fragment continues: measured against real `git push --progress` stderr, the
+ * per-chunk fold glued `Counting: 1%Counting: 2%…` into one long line.
+ */
+export function foldExecOutput(text: string): string {
+  if (!text.includes('\r')) return text
+  return text
+    .split('\n')
+    .map(line => {
+      if (!line.includes('\r')) return line
+      // A trailing `\r` (progress finished, then newline) does not erase what
+      // was drawn before it: the visible text is the last NON-EMPTY rewrite.
+      const parts = line.split('\r')
+      for (let index = parts.length - 1; index >= 0; index -= 1) {
+        const part = parts[index] as string
+        if (part !== '') return part
+      }
+      return ''
+    })
+    .join('\n')
+}
+
+/**
+ * Append one decoded chunk, keeping the TAIL.
+ *
+ * The raw `\r` bytes are preserved on purpose: the view folds them once, over
+ * the whole accumulated log, so a rewrite split across two chunks still folds
+ * correctly (`foldExecOutput`).
+ */
+export function appendExecOutput(previous: string, chunk: string, cap = EXEC_OUTPUT_CAP): string {
+  if (chunk === '') return previous
+  const combined = previous + chunk
+  if (combined.length <= cap) return combined
+  return combined.slice(combined.length - cap)
+}
+
+/**
+ * Split an SSE buffer into complete frames and the incomplete tail.
+ *
+ * A chunk can end in the middle of `data: {...}` or between the two newlines
+ * that terminate a frame, so the caller must carry `rest` into the next read.
+ */
+export function takeSseFrames(buffer: string): { frames: string[]; rest: string } {
+  const parts = buffer.split('\n\n')
+  const rest = parts.pop() ?? ''
+  return { frames: parts.filter(frame => frame.trim() !== ''), rest }
+}
+
+/**
+ * One SSE frame's JSON payload; `undefined` for comments (heartbeats), empty
+ * frames and malformed JSON — a broken heartbeat must not kill the stream.
+ */
+export function parseSseFrame(frame: string): unknown | undefined {
+  const data = frame
+    .split('\n')
+    .filter(line => line.startsWith('data:'))
+    .map(line => line.slice(5).trimStart())
+    .join('\n')
+  if (data === '') return undefined
+  try {
+    return JSON.parse(data) as unknown
+  } catch {
+    return undefined
+  }
+}
+
+/** `m:ss` (or `h:mm:ss`) for the running timer. */
+export function formatElapsed(ms: number): string {
+  const total = Math.max(0, Math.floor(ms / 1000))
+  const seconds = total % 60
+  const minutes = Math.floor(total / 60) % 60
+  const hours = Math.floor(total / 3600)
+  const pad = (value: number): string => String(value).padStart(2, '0')
+  return hours > 0 ? `${hours}:${pad(minutes)}:${pad(seconds)}` : `${minutes}:${pad(seconds)}`
+}
+
+/**
+ * The network verbs' budget: at least 20 minutes, or twice the configured git
+ * budget when that is larger, never past the host's 30-minute ceiling.
+ */
+export function networkBudgetMs(gitTimeoutMs: number): number {
+  return Math.min(MAX_TIMEOUT_MS, Math.max(DEFAULT_NETWORK_TIMEOUT_MS, gitTimeoutMs * 2))
+}

package/src/client/i18n.ts

@@ -20,6 +20,13 @@ export const DYNAMIC_KEYS = [
   'scm.hunkStaged',
   'scm.hunkUnstaged',
   'scm.hunkReverted',
+  // Labels reached through a lookup table in `scm/CommitPane.tsx`
+  // (`TAB_LABELS`, a hand-maintained literal map — NOT generated from
+  // HISTORY_TABS; a fourth tab needs an entry here too), not through literal
+  // translator calls. The scanner below must not mistake them for orphans.
+  'history.details',
+  'history.content',
+  'history.diff',
 ] as const
 
 const zh: Record<string, string> = {
@@ -138,7 +145,7 @@ const zh: Record<string, string> = {
   'route.off': '关闭（直通本地）',
   'route.shadow': '影子（记日志仍走本地）',
   'route.enforce': '强制（真路由）',
-  'route.hint': '切换即时生效并写入 profile，无需重启',
+  'route.hint': '切换即时生效并写入 profile，无需重启；默认「强制（真路由）」。',
   'route.saving': '保存中…',
   'route.tombstones': '墓碑',
   'route.aliasPath': '本地别名目录（原生工作区入口）',
@@ -286,7 +293,27 @@ const zh: Record<string, string> = {
   'scm.discoverFound': '工作区内发现的仓库',
   'scm.discoverEmpty': '工作区根 3 层内没发现仓库 —— 请手动进入目录',
   'scm.pushTitle': '推送到远端',
-  'scm.pushText': '将在远端仓库执行 git push，向共享分支写入提交。',
+  'scm.pushText': '填写推送 refspec（Gerrit 用 HEAD:refs/for/<分支>）。留空 = 普通 git push（推到当前分支 upstream）；非空值会被记住。',
+  'scm.pushRefspecPlaceholder': 'HEAD:refs/for/master',
+  'scm.pushRefspecDone': '已推送：{refspec}',
+  // -- streaming network verbs (fetch/pull/push/sync live output)
+  'exec.running': '执行中',
+  'exec.waiting': '等待远端输出…',
+  'exec.copy': '复制输出',
+  'exec.copied': '输出已复制',
+  'exec.cancel': '终止远端 git',
+  'exec.cancelHint': '会杀掉远端进程组（TERM→KILL），操作可能只完成一半；取消前请确认',
+  'exec.collapse': '收起日志',
+  'exec.expand': '展开日志',
+  'exec.log': '执行输出',
+  'exec.noOutput': '（无输出）',
+  'exec.unknownResult': '执行结果未知（输出流中断）',
+  'exec.unaryResult': '老 Host：一次性结果（未观测退出码）',
+  'exec.done': '完成',
+  'exec.failed': '失败',
+  'exec.cancelled': '已取消',
+  'exec.exitCode': '退出码',
+  'exec.timedOut': '超时结束',
   'scm.syncTitle': '同步远端',
   'scm.syncText': '将执行 git pull 然后 git push。',
   'scm.syncDone': '同步完成',
@@ -334,6 +361,47 @@ const zh: Record<string, string> = {
   'scm.checkoutCommitTitle': '检出提交（分离头指针）',
   'scm.checkoutCommitText': '将把远端工作区切到 {hash}，处于分离头指针状态。',
   'history.filter': '过滤提交（信息 / 作者 / 哈希）',
+  'history.details': '提交详情',
+  'history.content': '内容',
+  'history.diff': '差异',
+  'history.paneLabel': '提交详情面板',
+  'history.close': '关闭提交详情',
+  'history.copyHash': '复制完整哈希',
+  'history.parents': '父提交',
+  'history.contentHint': '单击在差异中查看，右键或行尾按钮在编辑器中打开',
+  'history.noFiles': '这个提交没有改动文件。',
+  'history.noTextDiff': '没有文本改动（二进制文件，或仅文件模式变化）。',
+  'history.binaryFile': '二进制文件，无法显示差异。',
+  'history.fileNotRendered': '已达渲染上限，该文件未展开显示（点文件头可展开）。',
+  'history.openInEditor': '在编辑器中打开（双栏对比）',
+  'history.revealInExplorer': '在文件目录中打开',
+  'history.openInTerminal': '在终端中打开',
+  'history.patchTruncated': '补丁较大，已截断显示。',
+  'history.foldFile': '折叠该文件',
+  'history.unfoldFile': '展开该文件',
+  'history.reload': '重新读取',
+  'history.patchNotLoaded': '补丁还没有读取。',
+  'history.resizeHint': '拖拽调整提交详情面板高度',
+  'history.filesCount': '{n} 个文件',
+  'history.filesCountFiltered': '{matched}/{total} 个文件',
+  'history.copyMessage': '复制提交信息',
+  'history.copyFilePatch': '复制该文件补丁',
+  'history.copyCommitPatch': '复制整个补丁',
+  'history.copiedMessage': '已复制提交信息',
+  'history.copiedHash': '已复制完整哈希',
+  'history.copiedSubject': '已复制提交标题',
+  'history.copiedFilePatch': '已复制该文件补丁',
+  'history.copiedCommitPatch': '已复制整个提交的补丁',
+  'history.copySubject': '复制提交标题',
+  'history.filterFiles': '过滤文件（路径）',
+  'history.noMatchFiles': '没有匹配的文件。',
+  'history.viewInDiff': '在差异中查看',
+  'history.wrap': '自动换行',
+  'history.prevFile': '上一个文件',
+  'history.nextFile': '下一个文件',
+  'history.expand': '展开详情面板',
+  'history.restore': '还原列表布局',
+  'history.diffToolbar': '补丁工具',
   'editor.empty': '没有打开的文件。在资源管理器里双击文件，或在源代码管理里点击更改。',
   'editor.saveHint': '保存',
   'editor.preview': '预览',
@@ -494,7 +562,7 @@ const en: Record<string, string> = {
   'route.off': 'Off (local passthrough)',
   'route.shadow': 'Shadow (log only, still local)',
   'route.enforce': 'Enforce (real routing)',
-  'route.hint': 'Applies immediately and persists to the profile; no restart needed.',
+  'route.hint': 'Applies immediately and persists to the profile; no restart needed. Default: enforce (real routing).',
   'route.saving': 'Saving…',
   'route.tombstones': 'tombstones',
   'route.aliasPath': 'Local alias dir (native workspace entry)',
@@ -642,7 +710,27 @@ const en: Record<string, string> = {
   'scm.discoverFound': 'Repositories found in the workspace',
   'scm.discoverEmpty': 'No repository within 3 levels of the workspace root — enter a folder manually',
   'scm.pushTitle': 'Push to remote',
-  'scm.pushText': 'Runs git push on the remote repository, writing commits to the shared branch.',
+  'scm.pushText': 'Enter a push refspec (Gerrit: HEAD:refs/for/<branch>). Empty = plain git push to the current branch upstream; a non-empty value is remembered.',
+  'scm.pushRefspecPlaceholder': 'HEAD:refs/for/master',
+  'scm.pushRefspecDone': 'Pushed: {refspec}',
+  // -- streaming network verbs (fetch/pull/push/sync live output)
+  'exec.running': 'Running',
+  'exec.waiting': 'Waiting for remote output…',
+  'exec.copy': 'Copy output',
+  'exec.copied': 'Output copied',
+  'exec.cancel': 'Stop the remote git',
+  'exec.cancelHint': 'Kills the remote process group (TERM→KILL); the operation may be half-done — confirm first',
+  'exec.collapse': 'Collapse the log',
+  'exec.expand': 'Expand the log',
+  'exec.log': 'Execution output',
+  'exec.noOutput': '(no output)',
+  'exec.unknownResult': 'Result unknown (the output stream was interrupted)',
+  'exec.unaryResult': 'Old Host: one-shot result (exit code not observed)',
+  'exec.done': 'Done',
+  'exec.failed': 'Failed',
+  'exec.cancelled': 'Cancelled',
+  'exec.exitCode': 'exit code',
+  'exec.timedOut': 'timed out',
   'scm.syncTitle': 'Sync with remote',
   'scm.syncText': 'Runs git pull, then git push.',
   'scm.syncDone': 'Sync finished',
@@ -690,6 +778,47 @@ const en: Record<string, string> = {
   'scm.checkoutCommitTitle': 'Check out commit (detached HEAD)',
   'scm.checkoutCommitText': 'The remote working tree switches to {hash} in detached HEAD state.',
   'history.filter': 'Filter commits (message / author / hash)',
+  'history.details': 'Commit details',
+  'history.content': 'Contents',
+  'history.diff': 'Diff',
+  'history.paneLabel': 'Commit details pane',
+  'history.close': 'Close commit details',
+  'history.copyHash': 'Copy full hash',
+  'history.parents': 'Parents',
+  'history.contentHint': 'Click to view the diff, right-click or use the row button to open in the editor',
+  'history.noFiles': 'This commit changes no file.',
+  'history.noTextDiff': 'No text change (binary file, or file mode only).',
+  'history.binaryFile': 'Binary file: no diff to show.',
+  'history.fileNotRendered': 'Display row cap reached: this file is folded (click its header to unfold).',
+  'history.openInEditor': 'Open in editor (side-by-side)',
+  'history.revealInExplorer': 'Reveal in the file explorer',
+  'history.openInTerminal': 'Open in terminal',
+  'history.patchTruncated': 'Large patch: the display is truncated.',
+  'history.foldFile': 'Fold this file',
+  'history.unfoldFile': 'Unfold this file',
+  'history.reload': 'Reload',
+  'history.patchNotLoaded': 'The patch has not been loaded yet.',
+  'history.resizeHint': 'Drag to resize the commit details pane',
+  'history.filesCount': '{n} files',
+  'history.filesCountFiltered': '{matched}/{total} files',
+  'history.copyMessage': 'Copy commit message',
+  'history.copyFilePatch': 'Copy file patch',
+  'history.copyCommitPatch': 'Copy whole patch',
+  'history.copiedMessage': 'Commit message copied',
+  'history.copiedHash': 'Full hash copied',
+  'history.copiedSubject': 'Subject copied',
+  'history.copiedFilePatch': 'File patch copied',
+  'history.copiedCommitPatch': 'Commit patch copied',
+  'history.copySubject': 'Copy subject',
+  'history.filterFiles': 'Filter files (path)',
+  'history.noMatchFiles': 'No files match.',
+  'history.viewInDiff': 'Show in diff',
+  'history.wrap': 'Wrap long lines',
+  'history.prevFile': 'Previous file',
+  'history.nextFile': 'Next file',
+  'history.expand': 'Expand the details pane',
+  'history.restore': 'Restore the list layout',
+  'history.diffToolbar': 'Patch tools',
   'editor.empty': 'No open file. Double-click a file in the explorer, or click a change in source control.',
   'editor.saveHint': 'save',
   'editor.preview': 'Preview',