dsh-gitbash-shell 0.17.1 → 0.18.0

package/dsh.plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "dsh-external/dsh-gitbash-shell",
-  "version": "0.17.1",
+  "version": "0.18.0",
   "main": "./src/index.js",
   "description": "Windows 全模式 Git Bash:用 Git for Windows bash 替换 PowerShell 执行器,并物化 standard/minimal/code/cordis 的 Git Bash 变体 preset。双 era 适配 dsh <= 0.1.1(内置 id 'code')与 >= 0.1.2(改名 'ptc'),启动探测自动选择,preset id 永不变。联动:dsh-ptc-cordis-preset(两者同装时 PTC 创造模式自动物化为 Git Bash 版)+ dsh-better-sidebar(终端 UI 标签与模型 terminal_* 工具自动切到 Git Bash)。",
   "engines": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-gitbash-shell",
-  "version": "0.17.1",
+  "version": "0.18.0",
   "description": "Windows 上让 agent 的每条 shell 命令改经 Git for Windows bash 执行;物化四个内置预设的 Git Bash 变体,统一 MSYS 盘根路径方言,侧栏终端接管可开关。· Run every agent shell command through Git for Windows bash on Windows; materialize Git Bash variants of the built-in presets, unify the MSYS drive-root path dialect, and adopt the sidebar terminal behind a switch.",
   "type": "module",
   "repository": {

package/src/index.js

@@ -753,6 +753,18 @@ export function rewriteErrorContent(content) {
     changed = true
     return { ...block, text: out }
   })
+  // /dev/null x file tools: the harness realpath step rejects device
+  // paths, so the failure is EXPECTED — append one guidance line (v0.18.0)
+  // instead of leaving the model to puzzle over EINVAL. The original
+  // diagnostic stays verbatim; only a hint block is appended.
+  const nulHit = content.some((block) => {
+    const t = block && typeof block === 'object' && typeof block.text === 'string' ? block.text : ''
+    return t.includes('EINVAL') && t.includes('NUL')
+  })
+  if (nulHit) {
+    next.push({ type: 'text', text: 'hint: /dev/null is the NUL device — file tools cannot target device paths (their realpath step rejects them); discard output through bash instead (echo ... > /dev/null)' })
+    changed = true
+  }
   return changed ? next : content
 }
 
@@ -911,11 +923,53 @@ export function buildTranslateEnv() {
  * resolve after the drive roots; any other shape returns the input
  * unchanged. Pure: the env is a plain fact bag, nothing is probed here.
  */
+/**
+ * Expand a leading dollar-sign NAME / braced NAME path variable the way
+ * Git Bash would (pure, string surgery, v0.18.0): HOME is the user home,
+ * TMPDIR/TMP/TEMP all mean the /tmp mount. Unknown names and NAMEX-style
+ * false positives return the input verbatim (written without any dollar
+ * literal — a code-transport layer mangles that byte inside quotes).
+ */
+function expandLeadingVar(value, env) {
+  if (!env || typeof value !== 'string' || value.length < 2) return value
+  if (value.charCodeAt(0) !== 36) return value
+  let name = ''
+  let rest = ''
+  if (value.charCodeAt(1) === 123) {
+    const close = value.indexOf('}', 2)
+    if (close < 0) return value
+    name = value.slice(2, close)
+    rest = value.slice(close + 1)
+  } else {
+    const head = value.slice(1)
+    let i = 0
+    while (i < head.length) {
+      const c = head.charCodeAt(i)
+      const letter = (c >= 65 && c <= 90) || (c >= 97 && c <= 122) || c === 95
+      const digit = c >= 48 && c <= 57
+      if (i === 0 ? !letter : !(letter || digit)) break
+      i++
+    }
+    if (i === 0) return value
+    name = head.slice(0, i)
+    rest = head.slice(i)
+  }
+  if (rest !== '' && rest.charCodeAt(0) !== 47) return value
+  let base
+  if (name === 'HOME') base = env.home
+  else if (name === 'TMPDIR' || name === 'TMP' || name === 'TEMP') base = env.tmpDir
+  else return value
+  return base ? (rest !== '' ? base + rest : base) : value
+}
 export function translateMsysPath(value, env) {
   if (typeof value !== 'string') return value
   if (env && env.home && (value === '~' || value.startsWith('~/'))) {
     return value === '~' ? env.home : env.home + '/' + value.slice(2)
   }
+  if (env) {
+    const expanded = expandLeadingVar(value, env)
+    if (expanded !== value) return expanded
+  }
   const match = MSYS_DRIVE_ROOT.exec(value)
   if (match) return match[1].toUpperCase() + ':/' + match[2]
   const bare = MSYS_BARE_DRIVE.exec(value)