dsh-git-changes 0.1.1 → 0.1.3

package/README.en.md

@@ -24,13 +24,17 @@ DSH's builtin review shows one hunk at a time; this panel gives you the **whole
 - **Project tab** — a second segment next to Changes that browses the whole workspace tree; opening a file there is plain code viewing, not a diff
 - **AI commit messages**: the ✨ button in the commit box asks the Host default model to draft a message from the staged (or unstaged) diff; edit it before committing
 - **Line blame**: pause the cursor on a line for about a second to see `author · time · subject` at the line end; hover the annotation for a commit card (author, time, full message, sha)
-- **Commit graph**: a collapsible lane graph at the bottom of the changes panel lists the latest 80 commits; clicking one opens its diff as the baseline
 - **Inline / side-by-side diffs** — one click to switch; `auto` mode picks a layout from the panel width (900px breakpoint)
 - **Controlled git writes** — only touches the git index and commits: never rewrites files, never runs arbitrary commands, never force pushes; every write goes through a session-authenticated local route
 - **Follows the DSH light/dark theme automatically**
 
 ## 🆕 What's New
 
+### v0.1.3 · Entry & baseline fixes
+
+- **Composer pill fixed** — opening the panel from the "this turn" pill now selects the turn baseline and the turn's first changed file instead of an empty Git panel after the work was committed.
+- **Empty-worktree fallback** — when the default Git uncommitted panel has nothing to show but the turn changed files, the panel switches to the turn baseline and says so.
+
 ### v0.1.1 · Polish
 
 - **New Project tab** — a second segment beside Changes that browses the whole workspace tree; opening a file there is plain code viewing.
@@ -39,7 +43,6 @@ DSH's builtin review shows one hunk at a time; this panel gives you the **whole
 - **Tree / list toggle**, file-type icons on every change row.
 - **Blame on cursor dwell** — the toolbar switch is gone: pause on a line for about a second to see the line-end annotation; hover it for a commit card. Works on both sides of a side-by-side diff.
 - **AI commit messages** — the ✨ button drafts a Chinese message following Conventional Commits, retrying when needed.
-- **Commit graph** — a lane graph at the bottom of the changes panel; click a commit to diff against it.
 - **Simpler baselines** — fixed to Git uncommitted by default; the baseline dropdown, the changed-only filter and the official diff-review button were removed; other baselines live in the command palette.
 
 ### v0.1.0 · Git changes panel (first release of this fork)

package/README.md

@@ -24,13 +24,17 @@ DSH 自带的审查是一个个 hunk 片段；这个插件给的是**整个文
 - **「项目」标签**：右侧栏另一个分段，浏览整个工作区的文件树；点击文件是纯代码查看，不会进入 diff 模式
 - **AI 生成提交信息**：提交框右侧 ✨ 按钮调用 Host 的默认模型，根据已暂存（无暂存时用未暂存）改动生成提交信息，填入后仍可修改
 - **行级 Blame**：光标在某行停留约 1 秒后，行尾显示「作者 · 时间 · 提交说明」；鼠标移到标注上弹出提交详情卡片（作者、时间、完整 commit message、提交号）
-- **提交图谱**：更改面板底部「提交图谱」折叠区，用 lane 图展示最近 80 条提交，点击任意提交即以该版本为对比基线打开 diff
 - **内联 / 左右并排 diff**：一键切换，`auto` 模式按面板宽度自动选择（900px 阈值）
 - **可控的 Git 写操作**：只碰 Git 索引与提交，不写文件、不执行任意命令、不 force push；所有写操作都走 DSH 会话鉴权的本地接口
 - **自动跟随 DSH 明暗主题**
 
 ## 🆕 版本更新
 
+### v0.1.3 · 入口与基线修复
+
+- **「本轮修改」入口修复**：从聊天输入框上方的胶囊打开时，直接进入「本轮改动」基线并选中该轮的首个改动文件，不再因工作区已提交而显示空面板。
+- **空工作区回落**：默认的 Git 未提交面板若没有改动、而本轮对话有改动，会自动切换到本轮基线并提示。
+
 ### v0.1.1 · 细节打磨
 
 - **新增「项目」标签**：与「更改」并列的第二个分段，浏览整个工作区文件树；从项目树打开文件为纯代码查看。
@@ -40,7 +44,6 @@ DSH 自带的审查是一个个 hunk 片段；这个插件给的是**整个文
 - **文件类型图标**：更改面板的每个文件行显示与项目树一致的图标。
 - **Blame 改为光标停留触发**：移除工具栏开关，光标在某行停留约 1 秒显示行尾注释，悬停弹出提交详情卡片；并排 diff 两侧都支持。
 - **AI 提交信息**：提交框 ✨ 按钮生成中文提交信息（遵循 Conventional Commits，必要时自动重试）。
-- **提交图谱**：更改面板底部 lane 图，点击提交直接以该版本为基线打开 diff。
 - **更简单的基线**：默认固定「Git 未提交」，移除比较基线下拉与「仅看改动」「官方 Diff 审查」按钮；其他基线从命令面板切换。
 
 ### v0.1.0 · Git 更改面板（本 fork 首个版本）

package/lib/client.js

@@ -393,6 +393,7 @@ const ZH = {
 
   'mode.turn': 'Agent 本轮',
   'mode.turn.desc': '本轮对话里 Agent 改了什么（与开始时对比）',
+  'mode.git.emptyToTurn': '工作区没有未提交改动，已切换到「本轮改动」',
   'mode.turn.emptyToGit': '本轮没有可审查的改动，已切换到「Git 未提交」',
   'mode.git.desc': '本地还没提交的改动（暂存看 HEAD，未暂存看索引）',
   'mode.commit.desc': '最近一次提交改了什么',
@@ -666,6 +667,7 @@ const EN = {
 
   'mode.turn': 'Agent turn',
   'mode.turn.desc': 'What the agent changed this turn (vs the turn start)',
+  'mode.git.emptyToTurn': 'The working tree is clean; switched to this turn\'s changes',
   'mode.turn.emptyToGit': 'No conversation changes to review; switched to uncommitted changes',
   'mode.git.desc': 'Uncommitted local changes (staged vs HEAD, unstaged vs index)',
   'mode.commit.desc': 'What the latest commit changed',
@@ -5838,6 +5840,21 @@ function changesReviewAddressOf(sessionId, seq, turn) {
   return CHANGES_REVIEW_PREFIX + encodeURIComponent(sessionId) + '/' + String(seq) + '/' + String(turn)
 }
 
+/**
+ * Parse a builtin hunk-review address back into its turn coordinates.
+ * @param {string|null|undefined} address resource address
+ * @returns {{seq:number,turn:number}|null} parsed coordinates or null
+ */
+function turnAddressOf(address) {
+  if (typeof address !== 'string' || address.indexOf(CHANGES_REVIEW_PREFIX) !== 0) return null
+  const parts = address.slice(CHANGES_REVIEW_PREFIX.length).split('/')
+  if (parts.length < 3) return null
+  const seq = Number(parts[1])
+  const turn = Number(parts[2])
+  if (!Number.isFinite(seq) || !Number.isFinite(turn)) return null
+  return { seq, turn }
+}
+
 /**
  * Call `openResource` defensively; returns false instead of throwing.
  * @param {any} right sidebarRight controller
@@ -6322,6 +6339,17 @@ function ReviewPage(props) {
       autoOpenedRef.current = true
       return
     }
+    // Opened from the chat composer's "this turn" pill: the builtin review
+    // address carries the turn coordinates, so this visit is about that turn
+    // even when a previous visit left another baseline behind.
+    const addressTurn = turnAddressOf(address)
+    if (addressTurn && latest.available) {
+      setMode('turn')
+      setModeTouched(true)
+      autoOpenedRef.current = false
+      restoreLoadRef.current = false
+      return
+    }
     const saved = rememberedPageState(sessionId)
     if (!saved) {
       // First mount in this app run: honour the baseline the user left behind in
@@ -6372,7 +6400,7 @@ function ReviewPage(props) {
     setRevision(nextRevision)
     setMode(nextMode)
     setModeTouched(saved.modeTouched === true)
-  }, [latest, gitStatus, sessionId])
+  }, [latest, gitStatus, sessionId, address])
 
   // Persist the page's workspace state before this tab body unmounts. DSH
   // unmounts the previous conversation's sidebar tab bodies on a session switch,
@@ -6473,6 +6501,20 @@ function ReviewPage(props) {
     notify(t('mode.turn.emptyToGit'), 'info')
   }, [mode, modeTouched, comparison, regions.length, notify, t])
 
+  // The mirror case: a clean working tree plus a turn that did change files
+  // should not open on an empty Git panel.
+  React.useEffect(() => {
+    if (mode !== 'git' || modeTouched) return
+    if (!latest || latest.available !== true) return
+    const files = latest.summary && Array.isArray(latest.summary.files) ? latest.summary.files : []
+    if (files.length === 0) return
+    const status = gitStatus
+    if (!status || status.available !== true || !Array.isArray(status.files) || status.files.length > 0) return
+    setMode('turn')
+    setModeTouched(true)
+    notify(t('mode.git.emptyToTurn'), 'info')
+  }, [mode, modeTouched, latest, gitStatus, notify, t])
+
   /** Load one file's current content, using the per-path cache for instant switch. */
   const loadFile = React.useCallback(async (path, options) => {
     if (!sessionId || !path) return

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "dsh-git-changes",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "type": "module",
   "license": "MIT",
-  "description": "Cursor-style Git changes panel for the DSH right sidebar: staged/unstaged trees, stage/unstage, commit & push, inline or side-by-side diffs, AI commit messages, blame, commit graph and full-source review.",
+  "description": "Cursor-style Git changes panel for the DSH right sidebar: staged/unstaged trees, stage/unstage, commit & push, inline or side-by-side diffs, AI commit messages, blame and full-source review.",
   "keywords": [
     "dsh",
     "dsh-plugin",

package/src/client/10-i18n.js

@@ -14,6 +14,7 @@ const ZH = {
 
   'mode.turn': 'Agent 本轮',
   'mode.turn.desc': '本轮对话里 Agent 改了什么（与开始时对比）',
+  'mode.git.emptyToTurn': '工作区没有未提交改动，已切换到「本轮改动」',
   'mode.turn.emptyToGit': '本轮没有可审查的改动，已切换到「Git 未提交」',
   'mode.git.desc': '本地还没提交的改动（暂存看 HEAD，未暂存看索引）',
   'mode.commit.desc': '最近一次提交改了什么',
@@ -287,6 +288,7 @@ const EN = {
 
   'mode.turn': 'Agent turn',
   'mode.turn.desc': 'What the agent changed this turn (vs the turn start)',
+  'mode.git.emptyToTurn': 'The working tree is clean; switched to this turn\'s changes',
   'mode.turn.emptyToGit': 'No conversation changes to review; switched to uncommitted changes',
   'mode.git.desc': 'Uncommitted local changes (staged vs HEAD, unstaged vs index)',
   'mode.commit.desc': 'What the latest commit changed',

package/src/client/30-page.js

@@ -207,6 +207,21 @@ function changesReviewAddressOf(sessionId, seq, turn) {
   return CHANGES_REVIEW_PREFIX + encodeURIComponent(sessionId) + '/' + String(seq) + '/' + String(turn)
 }
 
+/**
+ * Parse a builtin hunk-review address back into its turn coordinates.
+ * @param {string|null|undefined} address resource address
+ * @returns {{seq:number,turn:number}|null} parsed coordinates or null
+ */
+function turnAddressOf(address) {
+  if (typeof address !== 'string' || address.indexOf(CHANGES_REVIEW_PREFIX) !== 0) return null
+  const parts = address.slice(CHANGES_REVIEW_PREFIX.length).split('/')
+  if (parts.length < 3) return null
+  const seq = Number(parts[1])
+  const turn = Number(parts[2])
+  if (!Number.isFinite(seq) || !Number.isFinite(turn)) return null
+  return { seq, turn }
+}
+
 /**
  * Call `openResource` defensively; returns false instead of throwing.
  * @param {any} right sidebarRight controller
@@ -691,6 +706,17 @@ function ReviewPage(props) {
       autoOpenedRef.current = true
       return
     }
+    // Opened from the chat composer's "this turn" pill: the builtin review
+    // address carries the turn coordinates, so this visit is about that turn
+    // even when a previous visit left another baseline behind.
+    const addressTurn = turnAddressOf(address)
+    if (addressTurn && latest.available) {
+      setMode('turn')
+      setModeTouched(true)
+      autoOpenedRef.current = false
+      restoreLoadRef.current = false
+      return
+    }
     const saved = rememberedPageState(sessionId)
     if (!saved) {
       // First mount in this app run: honour the baseline the user left behind in
@@ -741,7 +767,7 @@ function ReviewPage(props) {
     setRevision(nextRevision)
     setMode(nextMode)
     setModeTouched(saved.modeTouched === true)
-  }, [latest, gitStatus, sessionId])
+  }, [latest, gitStatus, sessionId, address])
 
   // Persist the page's workspace state before this tab body unmounts. DSH
   // unmounts the previous conversation's sidebar tab bodies on a session switch,
@@ -842,6 +868,20 @@ function ReviewPage(props) {
     notify(t('mode.turn.emptyToGit'), 'info')
   }, [mode, modeTouched, comparison, regions.length, notify, t])
 
+  // The mirror case: a clean working tree plus a turn that did change files
+  // should not open on an empty Git panel.
+  React.useEffect(() => {
+    if (mode !== 'git' || modeTouched) return
+    if (!latest || latest.available !== true) return
+    const files = latest.summary && Array.isArray(latest.summary.files) ? latest.summary.files : []
+    if (files.length === 0) return
+    const status = gitStatus
+    if (!status || status.available !== true || !Array.isArray(status.files) || status.files.length > 0) return
+    setMode('turn')
+    setModeTouched(true)
+    notify(t('mode.git.emptyToTurn'), 'info')
+  }, [mode, modeTouched, latest, gitStatus, notify, t])
+
   /** Load one file's current content, using the per-path cache for instant switch. */
   const loadFile = React.useCallback(async (path, options) => {
     if (!sessionId || !path) return