dsh-gitbar-lite 0.2.0 → 0.2.1

package/README.en.md

@@ -23,6 +23,7 @@ The column is narrow (300px minimum, and a narrow viewport makes it full-screen)
 | Commit | Commits exactly what is ticked — because ticking wrote the index |
 | Commit and Push | Commits, then pushes. **A failed push never claims the commit failed**: the commit happened, and the panel says "committed `abc1234`, but the push failed" |
 | Context button | **Push** when local commits are unpushed, **Publish** when the branch has no upstream, **Fetch** otherwise |
+| Automatic fetch | Every five minutes while the panel is visible and the repository has a remote (`autoFetchMs`, `0` to disable). Failures are silent — no error banner |
 | Discard | One file or all of them; the diff is archived *before* anything is restored, and the confirmation offers "delete for good" |
 | Trash | Its own tab. Every discard keeps a diff, recorded **against the commit it was taken from** (`abc1234 initial commit`) |
 | Diff preview | Double-click a file, or a trash entry, to open a diff tab in the column — **one tab, ever**, re-navigated in place |
@@ -137,12 +138,14 @@ The order is fixed and cannot be swapped:
 | `maxFileBytes` | `2097152` | Larger untracked files are listed but not read, archived, or diffed |
 | `trashLimit` | `200` | Trash entries kept; the oldest are dropped along with their diff files |
 | `scanDepth` | `3` | Directory depth the picker scans below the workspace root |
+| `autoFetchMs` | `300000` | How often the panel fetches on its own; `0` disables it, leaving the manual button |
 
 Every field is volatile, so a change on the settings page takes effect without a restart.
 
 **Where state lives**: `<DSH_HOME>/dsh-gitbar-lite/` (falling back to `~/.dsh`) — `bindings.json` (workspace →
-repository), `prefs.json` (the two remembered choices), and `trash/index.json` plus `trash/<id>.diff`. Every write
-goes through a temp file and a rename, so a crash mid-write cannot truncate a file.
+repository), `prefs.json` (the two remembered choices), `trash/index.json` plus `trash/<id>.diff`, and
+`trash/<id>.content.json` (the raw contents a restore needs). Every write goes through a temp file and a rename, so a
+crash mid-write cannot truncate a file.
 
 ## How it works
 

package/README.md

@@ -23,6 +23,7 @@ DSH 的右栏本来就是一个常驻的标签区。Git 面板放这里，意味
 | Commit | 只提交勾上的（因为勾选写进了索引） |
 | Commit and Push | 提交后立刻推送；**推送失败不会说「提交失败」**——提交已经发生了，面板会明说「已提交 xxx，但推送失败」 |
 | 上下文按钮 | 有本地未推送提交时是 **Push**，没有上游时是 **Publish**，否则是 **Fetch** |
+| 自动 Fetch | 面板可见且仓库有远端时，每 5 分钟自己 fetch 一次（`autoFetchMs` 可调，`0` 关掉）。失败是静默的，不弹错误 |
 | 舍弃更改 | 单个文件或「全部舍弃」；动手前先把这次改动的 diff 归档，确认框里可以勾「彻底删除」 |
 | 回收站 | 独立 tab。每次舍弃存一份 diff，并记下**是对哪个提交（`abc1234 初始提交`）取的 diff** |
 | diff 预览 | 双击文件，或点回收站里的一条，在右栏开一个 diff 标签页——**永远只占一个**，再点就复用 |
@@ -132,11 +133,13 @@ dsh plugin --profile <你的 profile> remove dsh-gitbar-lite
 | `maxFileBytes` | `2097152` | 比这大的未跟踪文件只列出来，不读内容、不归档、不出 diff |
 | `trashLimit` | `200` | 回收站保留多少条；超出丢弃最旧的连同它的 diff 文件 |
 | `scanDepth` | `3` | 「不是仓库时」扫描工作区找仓库的目录深度 |
+| `autoFetchMs` | `300000` | 面板自己多久 fetch 一次；`0` = 关掉，只用手动按钮 |
 
 每个字段都是 volatile 的，所以在设置页改了立刻生效、不用重启。
 
 **状态存在哪**：`<DSH_HOME>/dsh-gitbar-lite/`（没有 `DSH_HOME` 就回落 `~/.dsh`）——
-`bindings.json`（工作区 → 仓库）、`prefs.json`（那两个勾选偏好）、`trash/index.json` + `trash/<id>.diff`。
+`bindings.json`（工作区 → 仓库）、`prefs.json`（那两个勾选偏好）、`trash/index.json` + `trash/<id>.diff` +
+`trash/<id>.content.json`（恢复用的原始内容）。
 都是先写临时文件再 rename，所以写到一半崩了也不会把文件截断。
 
 ## 工作原理

package/lib/client.js

@@ -861,8 +861,11 @@ window.__ModuleLoader__.load({
       '.gitbar-status-conflicted{color:var(--dsw-alias-state-error-primary,#b91c1c)}',
       '.gitbar-path{flex:1 1 auto;min-width:0;display:flex;align-items:baseline;gap:0;overflow:hidden}',
       '.gitbar-dir{flex:1 1 auto;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;direction:rtl;text-align:left;color:var(--dsw-alias-label-tertiary,#6b7280)}',
-      '.gitbar-sep{flex:none;color:var(--dsw-alias-label-tertiary,#6b7280)}',
-      '.gitbar-name{flex:0 1 auto;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}',
+      // `direction` is inherited, so the rtl above would otherwise reach the
+      // separator (moving the slash to the wrong end) and the file name (right-
+      // aligning it). Both are spelled back to ltr explicitly.
+      '.gitbar-sep{flex:none;direction:ltr;color:var(--dsw-alias-label-tertiary,#6b7280)}',
+      '.gitbar-name{flex:0 1 auto;min-width:0;direction:ltr;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}',
       '.gitbar-stats{flex:none;display:flex;gap:3px;font-size:10.5px;font-family:ui-monospace,SFMono-Regular,Menlo,Consolas,monospace}',
       '.gitbar-plus{color:var(--dsw-alias-state-success-primary,#15803d)}',
       '.gitbar-minus{color:var(--dsw-alias-state-error-primary,#b91c1c)}',
@@ -1334,6 +1337,50 @@ window.__ModuleLoader__.load({
         }
       }, [tab.visible, sessionId, load])
 
+      // Fetch on a rhythm, unattended, while the panel is actually being looked
+      // at. Three conditions gate it, and each one exists for a reason:
+      //
+      //   * the tab must be visible — a hidden panel has no business touching the
+      //     network every few minutes, and the host may have several sessions;
+      //   * the repository must have a remote — otherwise `fetch` is a guaranteed
+      //     E_NO_REMOTE, and a timer that only ever fails is noise;
+      //   * nothing else may be in flight — a user mid-commit must not have an
+      //     extra git child appear under them.
+      //
+      // A failure is silent. The button stays there, the banner stays quiet, and
+      // the next tick tries again: a fetch that failed once (offline, credential
+      // prompt suppressed) usually succeeds later, and a panel that pops an error
+      // every five minutes for a laptop that was closed is worse than one that
+      // says nothing. Success refreshes the status, which is what moves
+      // ahead/behind and the "last fetch" line.
+      //
+      // The conditions are read through a ref rather than listed as dependencies
+      // on purpose: a dependency on `state` would restart the clock on every
+      // refresh, and a panel the user keeps interacting with would then never
+      // fetch at all.
+      const latest = useRef({ state: null, busy: null })
+      latest.current = { state, busy }
+
+      const autoFetchMs = typeof state?.autoFetchMs === 'number' && state.autoFetchMs > 0 ? state.autoFetchMs : 0
+      useEffect(() => {
+        if (autoFetchMs === 0) return undefined
+        if (tab.visible === false) return undefined
+
+        const timer = setInterval(() => {
+          const current = latest.current
+          if (current.busy !== null) return
+          if (!Array.isArray(current.state?.remotes) || current.state.remotes.length === 0) return
+          void rpc(ACTIONS.FETCH, { sessionId }, tab.signal)
+            .then(() => {
+              if (alive.current) void load({ quiet: true })
+            })
+            .catch(() => {
+              // Deliberately swallowed: see the note above.
+            })
+        }, autoFetchMs)
+        return () => clearInterval(timer)
+      }, [autoFetchMs, tab.visible, tab.signal, sessionId, load])
+
       // The column's refresh shortcut, when it has one.
       useEffect(
         () => (typeof tab.actions?.bindCommands === 'function' ? tab.actions.bindCommands({ refresh: () => void load({ quiet: true }) }) : undefined),

package/lib/host/repo.js

@@ -206,6 +206,13 @@ async function fetchTimeOf(gitDirResult) {
  * @param {object} config resolved plugin config
  */
 export function createRepo(git, config) {
+  /**
+   * How often the panel should fetch on its own, in milliseconds, or 0 for
+   * "never". Resolved once: the value rides along with every status payload,
+   * because a client bundle cannot read the host's config.
+   */
+  const autoFetchMs = Number.isFinite(config.autoFetchMs) && config.autoFetchMs > 0 ? Math.floor(config.autoFetchMs) : 0
+
   /**
    * Identity, branch and working-tree status of one repository.
    *
@@ -305,6 +312,10 @@ export function createRepo(git, config) {
       counts,
       primary,
       lastFetchAt,
+      // The panel cannot read the host's config (a client bundle has no access to
+      // it), so the rhythm it should fetch on travels with the status it is
+      // already reading. Zero means "never, on your own".
+      autoFetchMs,
     }
   }
 

package/lib/index.js

@@ -67,6 +67,15 @@ export const Config = vol(
     trashLimit: z.number().default(200),
     /** Directory depth the repository picker scans below the workspace root. */
     scanDepth: z.number().default(3),
+    /**
+     * How often the panel fetches on its own, in milliseconds.
+     *
+     * A fetch only moves remote refs, never the working tree, so it is safe to
+     * do unattended — but it does hit the network and it does write
+     * `.git/FETCH_HEAD`, which is why it is opt-out rather than opt-in. Set to 0
+     * to disable it; the button still works.
+     */
+    autoFetchMs: z.number().default(300000),
   }),
 )
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-gitbar-lite",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "A GitHub Desktop-style Git panel for DSH: changed files, tick-to-stage, Summary + Description, Commit and Commit and Push, discard-to-trash, and diff preview, in the built-in right sidebar.",
   "type": "module",
   "license": "MIT",