dsh-ide-git 0.14.3 → 0.14.5

package/dsh.plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "dsh-external/dsh-ide-git",
-  "version": "0.14.3",
+  "version": "0.14.5",
   "main": "./src/index.js",
   "description": "IDE 级 Git 操作面板:分支树 + 提交图谱 + 变更/暂存/提交 + 提交详情。装了 dsh-better-sidebar 时挂成它的原生 tab(右侧栏 + 底部工作台);没装时直接挂 DSH 原生右侧栏,单独安装即可用。JetBrains 风格 Git 工具窗口 for DeepSeek Harness.",
   "engines": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-ide-git",
-  "version": "0.14.3",
+  "version": "0.14.5",
   "description": "DSH plugin: an IDE-grade Git tool window as a native dsh-better-sidebar tab — branch tree, commit graph, changes, commit details, JetBrains-style actions, in the right sidebar and the bottom panel. | DSH 插件:IDE 级 Git 工具窗口,以 dsh-better-sidebar 原生 Tab 挂载——分支树 / 提交图谱 / 变更与提交详情 / JetBrains 风格操作,右侧栏与底部面板双布局自适应。",
   "type": "module",
   "repository": {

package/src/client.js

@@ -6659,7 +6659,15 @@ window.__ModuleLoader__.load({
         E('span', { className: 'dig-lf-number' }, row.old === undefined ? '' : String(row.old)),
         E('span', { className: 'dig-lf-number' }, row.new === undefined ? '' : String(row.new)),
         E('span', { className: 'dig-lf-sign' }, row.kind === 'add' ? '+' : row.kind === 'del' ? '\u2212' : ' '),
-        E(DiffText, { text: row.text, spans: row.kind === 'add' ? spans.new.get(row.new) : spans.old.get(row.old) }))
+        /* The guards are load-bearing (FileDiff.tsx uses `highlighted?.new?.get`):
+           highlightLines returns undefined for unknown or not-yet-loaded
+           grammars, so the first frame (and every plain-text file) renders
+           with spans === undefined until the grammar store bumps a re-render.
+           Without the guard the slot entry crashes and 0.2.x unmounts the
+           whole preview pane (blank "Git 预览"). */
+        E(DiffText, { text: row.text, spans: row.kind === 'add'
+          ? (spans.new === undefined ? undefined : spans.new.get(row.new))
+          : (spans.old === undefined ? undefined : spans.old.get(row.old)) }))
     }
 
     /* The wrapped split row: two cells, each its own number + text. */
@@ -7972,13 +7980,19 @@ window.__ModuleLoader__.load({
         setAiNote(null)
         try {
           const settings = props.commitSettings === undefined ? { model: '', reasoning: '', prompt: '' } : props.commitSettings
-          const data = await props.request('commit-message', {
-            cwd: props.cwd,
-            sessionId: props.sessionId,
-            model: settings.model,
-            reasoningEffort: settings.reasoning,
-            prompt: settings.prompt,
-          })
+          /* `base` carries the picked repository ({ cwd, repoRoot }) exactly like
+             every other request: without it the host resolves the repository from
+             the session cwd, which need not be one (several sibling repos). */
+          const data = await props.request('commit-message', Object.assign(
+            {},
+            props.base === undefined ? { cwd: props.cwd } : props.base,
+            {
+              sessionId: props.sessionId,
+              model: settings.model,
+              reasoningEffort: settings.reasoning,
+              prompt: settings.prompt,
+            },
+          ))
           setAiUndo(message === '' ? null : message)
           setMessage(typeof data.message === 'string' ? data.message : '')
           /* Say what the model did NOT see, instead of quietly sending less. */
@@ -8876,8 +8890,8 @@ window.__ModuleLoader__.load({
           try {
             const scopeObject = scope || {}
             previewStore.set(commitHash !== null
-              ? { hash: commitHash, subject: seed.subject || '', cwd: scopeObject.cwd, repoRoot: repoRoot, sessionId: scopeObject.sessionId }
-              : { path: seed.path, staged: seed.staged === true, cwd: scopeObject.cwd, repoRoot: repoRoot, sessionId: scopeObject.sessionId })
+              ? { hash: commitHash, subject: seed.subject || '', path: seed.path !== undefined && seed.path !== null ? seed.path : '', cwd: scopeObject.cwd, repoRoot: repoRoot, sessionId: scopeObject.sessionId }
+              : { path: seed.path, staged: seed.staged === true, untracked: seed.untracked === true ? true : undefined, cwd: scopeObject.cwd, repoRoot: repoRoot, sessionId: scopeObject.sessionId })
             sidebarRight.openTab(NATIVE_PREVIEW_KIND)
             return true
           } catch (error) { void error }
@@ -9360,7 +9374,7 @@ window.__ModuleLoader__.load({
       const commitSettings = readCommitSettings()
       const changesPane = E(ChangesPanel, {
         t: t, summary: summary, busy: busy, compact: compact, hideHeader: compact,
-        request: request, cwd: cwd, sessionId: sessionId, commitSettings: commitSettings,
+        request: request, cwd: cwd, sessionId: sessionId, commitSettings: commitSettings, base: base,
         showIgnored: showIgnored,
         onToggleIgnored: () => setShowIgnored((value) => !value),
         // Commit-and-push carries the confirm flag with it: the button already
@@ -9439,7 +9453,7 @@ window.__ModuleLoader__.load({
           ['untracked', changes.untracked, false],
         ]
         for (const entry of order) {
-          if (entry[1].length > 0) { showDiff({ path: entry[1][0].path, staged: entry[2] }); return }
+          if (entry[1].length > 0) { showDiff({ path: entry[1][0].path, staged: entry[2], untracked: entry[0] === 'untracked' }); return }
         }
         setNote(t('note.noChanges'))
       }
@@ -10509,7 +10523,9 @@ window.__ModuleLoader__.load({
       useEffect(() => previewStore.subscribe(() => { setSeed(previewStore.seed) }), [])
       const seedKey = seed === null
         ? ''
-        : (seed.hash !== undefined && seed.hash !== null ? 'c:' + String(seed.hash) : 'w:' + String(seed.staged === true) + ':' + String(seed.path))
+        : (seed.hash !== undefined && seed.hash !== null
+          ? 'c:' + String(seed.hash) + ':' + String(seed.path !== undefined && seed.path !== null ? seed.path : '')
+          : 'w:' + String(seed.staged === true) + ':' + String(seed.untracked === true) + ':' + String(seed.path))
       const [state, setState] = useState({ loading: false, patch: '', error: null })
       const [refreshTick, setRefreshTick] = useState(0)
       const [copied, setCopied] = useState(false)
@@ -10523,8 +10539,18 @@ window.__ModuleLoader__.load({
           try {
             const payload = { cwd: seed.cwd }
             if (seed.repoRoot !== undefined && seed.repoRoot !== null && seed.repoRoot !== '') payload.repoRoot = seed.repoRoot
-            if (seed.hash !== undefined && seed.hash !== null && seed.hash !== '') payload.hash = seed.hash
-            else { payload.path = seed.path; payload.staged = seed.staged === true }
+            if (seed.hash !== undefined && seed.hash !== null && seed.hash !== '') {
+              payload.hash = seed.hash
+              /* hash+path rides `git show <hash> -- <path>` (host-supported
+                 since the route exists): the preview follows the exact file
+                 the user clicked instead of the commit's first file. */
+              if (seed.path !== undefined && seed.path !== null && seed.path !== '') payload.path = seed.path
+            } else {
+              payload.path = seed.path; payload.staged = seed.staged === true
+              /* untracked files never ride `git diff -- path` (no index entry):
+                 the host switches to a --no-index /dev/null new-file patch. */
+              if (seed.untracked === true) payload.untracked = true
+            }
             const data = await request('diff', payload)
             if (alive === true) setState({ loading: false, patch: data === undefined || data === null || typeof data.patch !== 'string' ? '' : data.patch, error: null })
           } catch (error) {

package/src/index.js

@@ -726,6 +726,38 @@ async function commitDetail(payload) {
 async function diff(payload) {
   const cwd = cwdOf(payload)
   const root = await repoRootOf(cwd, payload)
+  /* Untracked files have no index entry, so plain `git diff [--cached] -- path`
+     is legitimately empty for them — the panel's change list still shows the
+     file and the preview must not go blank. `--no-index /dev/null <file>`
+     produces the honest "new file" patch; its exit code is 1 when differences
+     exist, which is data, not failure (only >1 rejects). */
+  if (payload.untracked === true) {
+    const rel = requireRelativePath(payload.path)
+    const absolute = path.isAbsolute(rel) ? rel : path.join(root, rel)
+    /* --no-index reads the file for real, so unlike the plain `git diff --`
+       form an absolute path must NOT be allowed to escape the repository. */
+    if (absolute !== root && !absolute.startsWith(root + path.sep)) throw badRequest('path must stay inside the repository')
+    const result = await runGit(root, ['diff', '--no-color', '--no-ext-diff', '-U3', '--no-index', '--', '/dev/null', absolute])
+    if (result.code !== 0 && result.code !== 1) {
+      const detail = result.stderr.trim() === '' ? result.stdout.trim() : result.stderr.trim()
+      throw new PanelError('git-failed', 'git diff --no-index failed: ' + (detail === '' ? 'exit ' + result.code : detail), 409)
+    }
+    /* --no-index spells the b/ side with the absolute path we passed; rewrite
+       the header lines back to the repository-relative spelling so the preview
+       reads like every other patch (body lines are left untouched). */
+    let out = result.stdout
+    if (out.indexOf(absolute) >= 0 && out.indexOf('\n') !== -1) {
+      out = out.split('\n').map((line) => {
+        if (line.startsWith('diff --git ') && line.indexOf(absolute) >= 0) return 'diff --git a/' + rel + ' b/' + rel
+        /* the b/ side of --no-index carries the absolute path verbatim (its
+           leading slash merged into the separator): match '+++ b' + absolute. */
+        if (line.startsWith('+++ b' + absolute)) return '+++ b/' + rel
+        return line
+      }).join('\n')
+    }
+    const truncated = out.length > MAX_DIFF_CHARS
+    return { patch: truncated ? out.slice(0, MAX_DIFF_CHARS) : out, truncated }
+  }
   const args = ['diff', '--no-color', '--no-ext-diff', '-U3']
   if (payload.staged === true) args.push('--cached')
   if (typeof payload.hash === 'string' && payload.hash.trim() !== '') {
@@ -1547,10 +1579,17 @@ async function commitMessage(payload) {
   commitBusy = true
   try {
     const cwd = cwdOf(payload)
+    /* The picked repository travels as `repoRoot`, and every other git call
+       threads it through `repoRootOf`. Resolving the root from `cwd` alone made
+       this the one route that answered not-a-repo in a workspace whose own root
+       is not a repository — a workspace holding several sibling repos, which is
+       exactly what the repo picker exists for. */
+    const repoRoot = await repoRootOf(cwd, payload)
+    const scope = { cwd: cwd, repoRoot: repoRoot }
     const route = await commitRouteOf(payload)
-    const sums = await summary({ cwd: cwd })
-    const stagedPatch = sums.changes.staged.length > 0 ? (await diff({ cwd: cwd, staged: true })).patch : ''
-    const input = commitInputOf(stagedPatch, (await diff({ cwd: cwd })).patch)
+    const sums = await summary(scope)
+    const stagedPatch = sums.changes.staged.length > 0 ? (await diff(Object.assign({}, scope, { staged: true }))).patch : ''
+    const input = commitInputOf(stagedPatch, (await diff(scope)).patch)
     if (input.files.length === 0) {
       if (input.dropped > 0) {
         throw new PanelError('only-ignored-changes', 'the only changes are lock files or binary files, which are not sent to the model; stage a source change first')