dsh-gitbash-shell 0.4.3 → 0.5.0

package/README.md

@@ -75,7 +75,7 @@ bundle patch(`cordis.patch.yml`)应用三个改动:
     default: ptc-cordis   # 或 standard-gitbash / minimal-gitbash
 ```
 
-## 配置
+## 配置(执行器)
 
 `gitbash-executor` 行支持:
 
@@ -116,6 +116,14 @@ preset 会被插件自动清理;宿主 shell 回退为 PowerShell。
 > 切换生效后若 `ptc-cordis` 目录已存在且被旧版本物化,删除
 > `~/.dsh/.agent-presets/ptc-cordis` 并重启,即由新逻辑重新物化。
 
+## 与 dsh-better-sidebar 联动
+
+装了 [dsh-better-sidebar](https://github.com/omdsh-dev/DSH-better-sidebar)(v0.15.2+) 时,Windows 上本插件会通过**它的官方设置补丁口**(运行时 `terminalShell` 设置,对方文档明示"settings-page overrides win for terminals opened afterwards")把它打开的终端 shell 指向 Git Bash——**UI 终端标签与模型侧 `terminal_*` 工具统一生效**,不改对方一行代码、新开的终端即生效。规则:
+
+- 你在设置页或 `cordis.patch.yml` 里手动设置过 shell → **尊重你的选择**,绝不覆盖;
+- 卸载本插件 → 自动把该设置还原为空(回到它的默认解析:pwsh / powershell);
+- 想关掉本联动 → 本插件 row 配置加 `betterSidebarShell: false`。
+
 ## 许可
 
 MIT © KannaKuron。参考与致敬:[dsh-ptc-cordis-preset](https://github.com/KannaKuron/dsh-ptc-cordis-preset)。

package/README_EN.md

@@ -49,6 +49,14 @@ the PTC preset is materialized as Git Bash automatically (tool-bash on,
 tool-pwsh off) — no extra mode, no manual edits. Without this plugin the PTC
 preset stays as its own plugin manages it.
 
+## Cooperation with dsh-better-sidebar
+
+When [dsh-better-sidebar](https://github.com/omdsh-dev/DSH-better-sidebar) (v0.15.2+) is installed, on Windows this plugin adopts its official runtime settings seam (`terminalShell` — by the sidebar's own contract, "settings-page overrides win for terminals opened afterwards"), so both the sidebar's UI terminal tabs and the model-facing `terminal_*` tools open Git Bash — no upstream change, new terminals pick it up immediately. Rules:
+
+- A shell you set yourself (settings page / `cordis.patch.yml`) is respected, never overridden;
+- Removing this plugin reverts the pref to empty (the sidebar returns to its default pwsh / powershell resolution);
+- Disable the adoption with `betterSidebarShell: false` in this plugin's row config.
+
 ## License
 
 MIT © KannaKuron. Inspired by

package/dsh.plugin.json

@@ -1,8 +1,8 @@
 {
   "id": "dsh-external/dsh-gitbash-shell",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "main": "./src/index.js",
-  "description": "Windows 全模式 Git Bash:用 Git for Windows bash 替换 PowerShell 执行器,并物化 standard/minimal/code/cordis 的 Git Bash 变体 preset。",
+  "description": "Windows 全模式 Git Bash:用 Git for Windows bash 替换 PowerShell 执行器,并物化 standard/minimal/code/cordis 的 Git Bash 变体 preset。联动 dsh-ptc-cordis-preset:两者同装时 PTC 创造模式自动物化为 Git Bash 版。",
   "engines": {
     "dsh": ">=0.0.1"
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-gitbash-shell",
-  "version": "0.4.3",
+  "version": "0.5.0",
   "description": "DSH plugin: run every agent shell command through Git for Windows bash on Windows instead of PowerShell. Replaces the pwsh executor with a Git Bash ctx.shell provider and materializes Git Bash variants of the standard/minimal/code/cordis agent presets into your user preset root at startup.",
   "type": "module",
   "repository": {

package/src/index.js

@@ -232,6 +232,75 @@ export function installRegisterShim(reg) {
   }
 }
 
+// ── dsh-better-sidebar shell cooperation ───────────────────────────────────
+//
+// dsh-better-sidebar (v0.15.2+) resolves its terminal shell PER OPEN: a
+// settings-page `terminalShell` value wins over the yaml/plugin default
+// (their own words: "values here win for terminals opened afterwards").
+// So this plugin adopts that official runtime seam — zero upstream change,
+// no restart needed — and points the sidebar's UI terminal tabs AND the
+// model-facing terminal_* tools at Git Bash on Windows. A terminal shell
+// the user set themselves is respected (we only fill an empty field), and
+// the write is reverted on disposal (reload/update/uninstall), so removing
+// this plugin returns the sidebar to its auto/default shell.
+
+const SIDEBAR_NS = 'dsh-better-sidebar'
+
+/**
+ * Fill the sidebar's `terminalShell` pref through the settings service.
+ * One-shot; retries once after a short delay in case the sidebar's
+ * namespace registration lands a beat after our row ran. Never throws.
+ */
+function adoptSidebarShell(ctx, bashPath) {
+  let tried = 0
+  const run = async () => {
+    tried += 1
+    const settings = ctx.get('settings')
+    if (!settings || typeof settings.update !== 'function') return
+    let current
+    try {
+      current = settings.get(SIDEBAR_NS)
+    } catch {
+      current = undefined // namespace not registered yet / sidebar absent
+    }
+    const value = current && typeof current === 'object' ? current : {}
+    const existing = typeof value.terminalShell === 'string' ? value.terminalShell.trim() : ''
+    if (existing !== '') return // user/deployment choice — never override
+    try {
+      await settings.update(SIDEBAR_NS, { terminalShell: bashPath })
+    } catch (error) {
+      if (tried < 2) {
+        const timer = setTimeout(run, 1500)
+        ctx.effect(() => () => clearTimeout(timer), 'dsh-gitbash-shell: sidebar adoption retry')
+        return
+      }
+      console.log(`${TAG} better-sidebar shell adoption unavailable: ${error?.message ?? error}`)
+      return
+    }
+    let reverted = false
+    ctx.effect(
+      () => () => {
+        if (reverted) return
+        reverted = true
+        const s = ctx.get('settings')
+        if (!s || typeof s.update !== 'function') return
+        let now
+        try {
+          now = s.get(SIDEBAR_NS)
+        } catch {
+          return
+        }
+        if (String(now?.terminalShell ?? '') === bashPath) {
+          s.update(SIDEBAR_NS, { terminalShell: '' }).catch(() => {})
+        }
+      },
+      'dsh-gitbash-shell: sidebar shell revert',
+    )
+    console.log(`${TAG} dsh-better-sidebar terminal shell -> Git Bash (${bashPath})`)
+  }
+  void run()
+}
+
 // ── plugin ──────────────────────────────────────────────────────────────────
 
 /** First user-trust root: the roster's authoring target. */
@@ -305,6 +374,14 @@ export async function apply(ctx, config = {}) {
   const disposeGitBash = ctx.provide('gitBash', gitBashCapability)
   ctx.effect(() => disposeGitBash, 'dsh-gitbash-shell: gitBash capability')
 
+  // ── dsh-better-sidebar terminal adoption (Windows only) ────────────────
+  // The sidebar resolves its terminal shell through the settings seam per
+  // open; adopt it through that seam (see adoptSidebarShell for rationale).
+  // Disable with `betterSidebarShell: false` in the plugin row config.
+  if (config.betterSidebarShell !== false && process.platform === 'win32') {
+    adoptSidebarShell(ctx, gitBashCapability.bashPath)
+  }
+
   const roots = ctx.agentPresets?.roots ?? []
   const userRoot = firstUserRoot(roots)
   if (!userRoot) {