dsh-gitbash-shell 0.39.3 → 0.39.4

package/CHANGELOG.md

@@ -3,6 +3,38 @@
 > 倒序排列,新版本条目在最上面。条目格式:`## vX.Y.Z — YYYY-MM-DD` + 类型(feat / fix / docs / chore)+ 要点 + 相关链接。
 > 纪律见 AGENTS.md「变更记录纪律」:发版前先更新本文件并随版本提交;事故复盘、复现与真机验证记录也记在这里。
 
+## v0.39.4 — 2026-10-14
+
+**类型**:feat(dsh-ops 0.3.0 互通:gb_* 退役 + 统一方言桥) / fix(docs)。
+
+### dsh-ops 0.3.0 互通:gb_* 退役 + 双工具家族统一 `/c/` 方言
+
+dsh-ops(T-Auto)0.3.0 起以原生 Rust `ops_*` 文件工具(`ops_inspect_local_file`/`ops_grep`/`ops_glob`/`ops_replace`,
+走 DSH 原生 policy/sandbox/subprocess 通道)取代 FastCtx 上游,并新增 PTC 批量能力(`ops_batch`/`ops_result`,
+opt-in)与跨平台(win/mac/linux)支持。本版把并存形态收敛为「各司其职 + 方言由本插件统一」:
+
+- **`fastctxTools` 默认关(弃用声明)**:上游 FastCtx 已被亲爹弃用,`ops_*` 同职能且更强(原生沙箱 mediation、
+  统一 `path` 契约、CAS 原子替换、跨平台)。默认值 true→false(schema、stub reader、live reader、client 卡
+  四处同步);显式开启可恢复,已装 dsh-ops 时无论开关如何都自动让位(既有 `opsPresent` 检测,0.3.0 工具名
+  未变,零改动兼容)。
+- **bash 不让位(产品裁决,2026-10-14)**:dsh-ops 的 `ops_bash` 仅 full-access 会话发布且走裸 `ctx.subprocess`
+  (无沙箱 confine、无 unconfined 如实标注);受限会话只有本插件的 bash 可用,且两工具不同名并存无害——
+  本插件继续是「全模式真 Git Bash 沙箱通道」,`ops_bash` 是 full-access 下的第二选择。
+- **入参翻译扩展**:字段白名单加 `root`(ops_batch/ops_result 的路径参数,官方工具无此键,零碰撞);
+  新增 `operations[]` 对象数组的 `path`/`to` 与 `protect[]` 字符串数组的嵌套翻译(同 present `files[].path`
+  的先例)。模型说 `/c/...`,Rust worker 收到原生绝对路径。
+- **出参成功面回流**:ops_* 六件加入 `rewriteResultPaths`——文件四件的 `items[].path`/`matches[].path`
+  (Rust 端所有路径字段统一叫 `path`)与 PTC 两件的 `root` 回显 `/c/`;`detailsRef` 等引用 ID 不透明不改写。
+- **失败面回流**:`ERROR_CONTENT_TOOLS` 加 ops_* 六件——失败 content 与 `error.message` 里的 Windows 路径
+  统一回答 `/c/`(`error.message` 走无条件 `msysEcho`,自动覆盖)。
+- **提示词无需改动**:dsh-ops 的提示走 `systemPrompt.section`(与官方同挂点),本插件的 `windowsToMsys`
+  源头替换覆盖全部 sections;其文案无 `C:/` 字面量(「正斜杠分隔符」与 `/c/` 方言天然兼容)。
+- **已知事项**:未安装 dsh-better-sidebar 的部署,启动时宿主对探测式 patch edit 打一条
+  `entry "better-sidebar" not found` warn——宿主 patch 引擎对缺失行的固有行为,插件侧无法在保留该 edit
+  功能(boot 层侧栏终端 shell 默认)的前提下去除,README 已说明。
+- **测试**:新增 dsh-ops 互通矩阵(入参 root/operations/protect、出参 items/matches/root、失败 content/message、
+  wrapper 门控源码断言、fastctxTools 默认关断言);全量 **172/172**(+1 win32-only skip)。
+
 ## v0.39.3 — 2026-10-14
 
 **类型**:fix(自有 bash 工具的宿主服务兼容 #27、MSYS 参数/编码提示、源码路径边界与 unconfined 可观测性) / test / docs。

package/README.md

@@ -36,10 +36,14 @@ POSIX 宿主上完整保留;
   会话隐藏,主机保持 bash 优先;开启后它直接可见可用——无需安装任何额外组件。
   旧 PowerShell 7 旁路工具(v0.37–v0.38.5 的独立工具)已随 v0.39.0 新架构退役;
   命令仍然首选 bash 工具。
-- **`gb_*` FastCtx 文件工具(默认开)**:`gb_inspect_local_file`/`gb_grep`/
+- **`gb_*` FastCtx 文件工具(默认关,v0.39.4 起弃用)**:`gb_inspect_local_file`/`gb_grep`/
   `gb_glob`/`gb_replace`(Rust 实现:批量范围读取带 token 预算、grep 截断
   标注、编码探测)。它们是官方 read/grep/glob/edit 的**补充**——官方工具接
-  文件沙箱,仍是默认推荐;已安装 dsh-ops 时本组自动让位。
+  文件沙箱,仍是默认推荐。**dsh-ops 0.3.0 起原生 `ops_*` 文件工具取代了
+  FastCtx 上游,本组默认关闭**(`fastctxTools` 显式开启可恢复);已安装
+  dsh-ops 时无论开关如何都会自动让位。与 dsh-ops 并存时本插件继续负责
+  `/c/` 方言统一:`ops_*` 的入参(含 `root`/`operations[].path`/`protect`)
+  自动转换、返回与报错路径自动回流 `/c/`。
 
 四个「· Git Bash」**变体 preset 仍保留,默认关闭**(`variantPresets` 开关,
 设置卡可开):开启后注册 `standard-gitbash`/`minimal-gitbash`/`code-gitbash`/

package/README_EN.md

@@ -10,9 +10,10 @@
 > on a PRIVATE Git Bash executor instance, gives the four OFFICIAL presets
 > Git Bash through a per-agent inline tool patch (v0.35.0), keeps the
 > official `pwsh` tool (REAL PowerShell) hidden behind a switch (`pwshTool`,
-> off by default), publishes the `gb_*` FastCtx file
-> tools, and keeps the four `· Git Bash` variant presets behind a switch
-> (`variantPresets`, off by default).
+> off by default), keeps the `gb_*` FastCtx file tools behind a switch
+> (`fastctxTools`, off by default since v0.39.4 — dsh-ops 0.3.0's native
+> `ops_*` tools superseded FastCtx), and keeps the four `· Git Bash` variant
+> presets behind a switch (`variantPresets`, off by default).
 
 ### Host requirement & preset alignment
 
@@ -60,8 +61,12 @@ The old "replace the executor" three-step patch became runtime work:
    tool face says "pwsh yes / bash no"; the official `pwsh` tool (REAL
    PowerShell) stays hidden behind the `pwshTool` switch (off by default);
    the `gb_*`
-   FastCtx tools
-   (`src/fastctx-bridge.js`) publish alongside. With the switch on, it registers the four
+   FastCtx tools (`src/fastctx-bridge.js`) publish alongside — **retired to
+   an explicit opt-in from v0.39.4** (dsh-ops 0.3.0 replaced FastCtx with
+   native `ops_*` file tools; when dsh-ops is present the bridge stands down
+   regardless, and this plugin keeps the `/c/` dialect unified across both
+   tool families by translating `ops_*` arguments and echoing their results
+   and errors back in MSYS form). With the switch on, it registers the four
    preset variants **declaratively** (`ctx.agentPresets.register`,
    v0.32.0+) — the row sets are committed, diffable JS data
    (`src/compositions.js`) and **no directory is ever materialized**;

package/dsh.plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "dsh-external/dsh-gitbash-shell",
-  "version": "0.39.3",
+  "version": "0.39.4",
   "main": "./src/index.js",
   "description": "Windows 全模式 Git Bash:自带 bash 工具(私有 Git Bash 执行器实例,官方 PowerShell 执行器原样保留),官方四个模式经行内工具补位直接获得 Git Bash(v0.35.0 起;v0.39.0 起不再替换宿主执行器),四个 *·Git Bash 变体 preset 可开关;官方 pwsh 工具默认隐藏、开关可见(真 PowerShell);附带 gb_* FastCtx 文件工具,检测到 dsh-ops 自动让位。联动:dsh-ptc-cordis-preset(PTC 创造模式带 Git Bash 行且可去重)+ dsh-better-sidebar(终端标签自动切 Git Bash)。",
   "engines": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-gitbash-shell",
-  "version": "0.39.3",
+  "version": "0.39.4",
   "description": "Windows 上给 agent 一个真正的 Git Bash 命令工具:私有 Git Bash 执行器实例(官方 PowerShell 执行器原样保留),统一 MSYS 盘根路径方言,官方 pwsh 工具默认隐藏可开关,物化四个内置预设的 Git Bash 变体,侧栏终端接管可开关。· Give agents a real Git Bash tool on Windows: a private Git Bash executor instance (the official PowerShell executor stays untouched), a unified MSYS drive-root path dialect, an opt-in official pwsh tool, and four Git Bash preset variants.",
   "type": "module",
   "repository": {

package/src/client.js

@@ -2299,7 +2299,8 @@ window.__ModuleLoader__.load({
 			   writeField exactly like every other row on this card. */
 			var variantOn = snap.value.variantPresets === true;
 			var pwshOn = snap.value.pwshTool !== false;
-			var fctxOn = snap.value.fastctxTools !== false;
+			// Default OFF (v0.39.4): must match the host's `=== true` reader.
+			var fctxOn = snap.value.fastctxTools === true;
 
 			var modeSection = fold("sec.mode",
 				E("div", { className: "gb-row" },

package/src/index.js

@@ -517,7 +517,7 @@ export const Config = Schema === null ? undefined : Schema.object({
    * Default ON; Windows-only payload, stands down entirely when dsh-ops is
    * present (its ops_* tools already cover the same ground).
    */
-  fastctxTools: live(Schema.boolean().default(true)),
+  fastctxTools: live(Schema.boolean().default(false)),
 })
 
 /** Read one Config value across eras: Volatile ref (>= 0.1.7) or plain value. */
@@ -582,8 +582,8 @@ function makeLiveReader(ctx, config) {
       variantPresets: valueOf(config.variantPresets) === true,
       // Default ON (v0.35.0): the pwsh replacement fills the denied host tool.
       pwshTool: valueOf(config.pwshTool) !== false,
-      // Default ON (v0.35.0): the FastCtx bridge stands down when dsh-ops is present.
-      fastctxTools: valueOf(config.fastctxTools) !== false,
+      // Default OFF (v0.39.4, dsh-ops 0.3.0): FastCtx is dead upstream and dsh-ops ships stronger native ops_* file tools; an explicit true re-enables the bridge. It still stands down when dsh-ops is present.
+      fastctxTools: valueOf(config.fastctxTools) === true,
     }
   }
   return {
@@ -593,7 +593,7 @@ function makeLiveReader(ctx, config) {
     autoTerminalShell: () => dialect().autoTerminalShell !== false,
     variantPresets: () => (hasConfig ? valueOf(config.variantPresets) === true : false),
     pwshTool: () => (hasConfig ? valueOf(config.pwshTool) !== false : true),
-    fastctxTools: () => (hasConfig ? valueOf(config.fastctxTools) !== false : true),
+    fastctxTools: () => (hasConfig ? valueOf(config.fastctxTools) === true : false),
     // Default OFF: only an explicit true asks for deduplication.
     suppressPeerCordis: () => (hasConfig ? valueOf(config.suppressPeerCordis) === true : false),
   }
@@ -773,7 +773,9 @@ function pathEcho(value, env) {
  * content VERBATIM: output is data, never rewritten (the same red line as
  * file content in successful results).
  */
-const ERROR_CONTENT_TOOLS = new Set(['read', 'read_image', 'write', 'edit', 'glob', 'grep', 'present'])
+// ops_* six (v0.39.4, dsh-ops 0.3.0): their failures quote Windows paths too —
+// the error content and error.message must answer in the same /c/ dialect.
+const ERROR_CONTENT_TOOLS = new Set(['read', 'read_image', 'write', 'edit', 'glob', 'grep', 'present', 'ops_inspect_local_file', 'ops_glob', 'ops_grep', 'ops_replace', 'ops_batch', 'ops_result'])
 
 export function rewriteErrorContent(content, options) {
   if (!Array.isArray(content)) return content
@@ -868,6 +870,37 @@ export function rewriteResultPaths(name, value, env) {
     })
     return changed ? { ...value, files } : value
   }
+  // v0.39.4 (dsh-ops 0.3.0): ops_* tools answer with the same paths the
+  // model must keep speaking /c/ about. Their Rust worker names every path
+  // field `path` (items[] / matches[]) and ops_batch/ops_result echo the
+  // operation `root`; detailsRef ids are opaque, never rewritten.
+  if (name === 'ops_grep' && Array.isArray(value.matches)) {
+    let changed = false
+    const matches = value.matches.map((match) => {
+      if (!match || typeof match !== 'object' || typeof match.path !== 'string' || match.path === '') return match
+      const out = toMsys(match.path)
+      if (out === match.path) return match
+      changed = true
+      return { ...match, path: out }
+    })
+    return changed ? { ...value, matches } : value
+  }
+  if ((name === 'ops_inspect_local_file' || name === 'ops_glob' || name === 'ops_replace') && Array.isArray(value.items)) {
+    let changed = false
+    const items = value.items.map((item) => {
+      if (!item || typeof item !== 'object' || typeof item.path !== 'string' || item.path === '') return item
+      const out = toMsys(item.path)
+      if (out === item.path) return item
+      changed = true
+      return { ...item, path: out }
+    })
+    return changed ? { ...value, items } : value
+  }
+  if ((name === 'ops_batch' || name === 'ops_result') && typeof value.root === 'string' && value.root !== '') {
+    const out = toMsys(value.root)
+    if (out !== value.root) return { ...value, root: out }
+    return value
+  }
   if (name === 'glob' && Array.isArray(value.paths)) {
     let changed = false
     const paths = value.paths.map((p) => {
@@ -909,7 +942,9 @@ export function rewriteResultPaths(name, value, env) {
 
 const MSYS_DRIVE_ROOT = /^\/([a-z])\/(.*)$/i
 const MSYS_BARE_DRIVE = /^\/([a-z])$/i
-const TRANSLATABLE_PATH_FIELDS = new Set(['file_path', 'path', 'workdir'])
+// 'root' (v0.39.4): dsh-ops ops_batch/ops_result name their path argument `root`;
+// no official tool uses that key, so the extra alias is collision-free.
+const TRANSLATABLE_PATH_FIELDS = new Set(['file_path', 'path', 'workdir', 'root'])
 
 // ── virtual mounts + env (v0.17.0) ─────────────────────────────────────
 //
@@ -1143,6 +1178,37 @@ export function translatePathArguments(args, env) {
       changed = true
     }
   }
+  // v0.39.4 (dsh-ops 0.3.0): ops_batch carries its paths one level down —
+  // operations[] objects with path/to, and protect[] as a plain string
+  // array. Same deal as present's files[].path: the field-name whitelist
+  // only sees top-level keys. The model speaks /c/ everywhere; these
+  // arrive at the Rust worker as native absolute paths.
+  if (Array.isArray(next.operations)) {
+    const operations = next.operations.map((operation) => {
+      if (!operation || typeof operation !== 'object') return operation
+      let out = operation
+      for (const field of ['path', 'to']) {
+        if (typeof out[field] !== 'string') continue
+        const translated = translateMsysPath(out[field], env)
+        if (translated !== out[field]) out = { ...out, [field]: translated }
+      }
+      return out
+    })
+    if (operations.some((operation, index) => operation !== next.operations[index])) {
+      next.operations = operations
+      changed = true
+    }
+  }
+  if (Array.isArray(next.protect)) {
+    const protect = next.protect.map((entry) => {
+      if (typeof entry !== 'string') return entry
+      return translateMsysPath(entry, env)
+    })
+    if (protect.some((entry, index) => entry !== next.protect[index])) {
+      next.protect = protect
+      changed = true
+    }
+  }
   return changed ? next : args
 }
 

package/src/inline-tools.js

@@ -285,19 +285,20 @@ export function mountInlineTools(ctx, deps) {
       const fiber = scope.ctx.plugin(module)
       await untilDisposed(fiber, state.controller.signal)
       if (!isLive(agent, state)) return
-      retained = true
       // An INACTIVE fiber resolves its await() without ever running apply()
       // (issue #27): awaiting the plugin proves nothing, so read the registry
-      // back before claiming success. A miss gets an explicit failure line —
-      // never a silent no-tool session behind a success-shaped log.
+      // back before claiming success. A miss THROWS — the catch below logs the
+      // explicit activation failure and the finally disposes this half-mounted
+      // scope instead of leaking it for the agent's lifetime (shape credit:
+      // KouzakiUmi's PR #28).
       const registeredNames = scope.ctx.get !== undefined
         ? ((scope.ctx.get('tools')?.schemas?.(agent) ?? []).map((schema) => schema && typeof schema.name === 'string' ? schema.name : ''))
         : []
-      if (registeredNames.includes('bash')) {
-        log('own bash tool activated for this agent (Git Bash execution; official pwsh tool real but hidden by default)')
-      } else {
-        log('own bash tool did NOT register for this agent: the module fiber likely went INACTIVE (this host lacks an injected service the module requires) or the tools read-back is unavailable — bash is NOT available in this session; please report this with your dsh version (issue #27 pattern)')
+      if (registeredNames.includes('bash') === false) {
+        throw new Error('bash tool did not register for this agent (module fiber INACTIVE — this host lacks an injected service the module requires — or the tools read-back is unavailable); bash is NOT available in this session, please report this with your dsh version (issue #27)')
       }
+      retained = true
+      log('own bash tool activated for this agent (Git Bash execution; official pwsh tool real but hidden by default)')
     } catch (error) {
       if (isLive(agent, state)) log(`own bash tool activation failed for this agent: ${error?.message ?? error}`)
     } finally {