dsh-gitbash-shell 0.5.1 → 0.5.3

package/README.md

@@ -118,7 +118,7 @@ preset 会被插件自动清理;宿主 shell 回退为 PowerShell。
 
 ## 与 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_*` 工具统一生效**,不改对方一行代码、新开的终端即生效。规则:
+装了 [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_*` 工具统一生效**,不改对方一行代码、新开的终端即生效。此外,**本插件的 bundle patch 还会给对方的行补上 `config.shell`**(启动期解析,连 **tab 标题也会显示 bash**;对方未安装时该行无害跳过)。规则:
 
 - **插件全权接管**:Windows 上每次启动都无条件把它的 `terminalShell` 设为 Git Bash——即使你在设置页/别处改过,下次插件启动也会改回来;
 - 卸载本插件 → 自动还原为你改之前的原值(回到它的默认解析:pwsh / powershell);

package/README_EN.md

@@ -51,7 +51,7 @@ 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:
+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. In addition, this bundle's patch also sets `config.shell` on the sidebar's row (boot-time resolution, so the **tab label reads `bash` too**; the row edit is harmless-skipped when the sidebar is not installed). Rules:
 
 - **The plugin owns the pref while installed**: on every Windows boot it unconditionally sets `terminalShell` to Git Bash — a value you set elsewhere is overwritten again on the next boot;
 - Removing this plugin restores the previous value (the sidebar returns to what it had before, e.g. its default pwsh / powershell resolution);

package/cordis.patch.yml

@@ -35,4 +35,17 @@
         bashPath: "C:/Program Files/Git/bin/bash.exe"
 
     - id: gitbash-presets
-      name: dsh-gitbash-shell
+      name: dsh-gitbash-shell
+
+# Edit the dsh-better-sidebar row when it is mounted (their own bundle
+# inserted it; our bundle is later in the stack, so this edit lands on the
+# existing row — empty-config rows absorb it, missing rows warn and skip, so
+# profiles without the sidebar are unaffected). The boot-time shell
+# resolution drives BOTH the spawn chain and the client tab title
+# ('shell.get' name), so pointing config.shell at Git Bash on Windows makes
+# the sidebar terminal open bash AND display a 'bash' tab label; per-open
+# settings overrides (which this plugin also fills) then agree with it.
+- id: better-sidebar
+  name: dsh-better-sidebar
+  config:
+    shell: !!js process.platform === 'win32' ? 'C:/Program Files/Git/bin/bash.exe' : ''

package/dsh.plugin.json

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-gitbash-shell",
-  "version": "0.5.1",
+  "version": "0.5.3",
   "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

@@ -246,18 +246,32 @@ export function installRegisterShim(reg) {
 // this plugin returns the sidebar to what it was before.
 
 const SIDEBAR_NS = 'dsh-better-sidebar'
+const SIDEBAR_TRIES = 12
+const SIDEBAR_RETRY_MS = 1500
 
 /**
- * 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.
+ * Write the sidebar's `terminalShell` pref through the settings service.
+ * Polls until the settings service (and the sidebar's namespace) are ready:
+ * at boot the service may not be provided yet when this row's apply runs, so
+ * the first attempt can silently see nothing — every attempt after the first
+ * catches the service once it exists. Never throws; always logs the outcome.
  */
 function adoptSidebarShell(ctx, bashPath) {
   let tried = 0
+  let timer = null
+  ctx.effect(() => () => { if (timer) clearTimeout(timer) }, 'dsh-gitbash-shell: sidebar adoption polling')
   const run = async () => {
     tried += 1
     const settings = ctx.get('settings')
-    if (!settings || typeof settings.update !== 'function') return
+    const ready = settings && typeof settings.update === 'function' && typeof settings.get === 'function'
+    if (!ready) {
+      if (tried < SIDEBAR_TRIES) {
+        timer = setTimeout(run, SIDEBAR_RETRY_MS)
+        return
+      }
+      console.log(`${TAG} better-sidebar shell adoption skipped: settings service unavailable after ${tried} tries`)
+      return
+    }
     let current
     try {
       current = settings.get(SIDEBAR_NS)
@@ -269,9 +283,8 @@ function adoptSidebarShell(ctx, bashPath) {
     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')
+      if (tried < SIDEBAR_TRIES) {
+        timer = setTimeout(run, SIDEBAR_RETRY_MS)
         return
       }
       console.log(`${TAG} better-sidebar shell adoption unavailable: ${error?.message ?? error}`)
@@ -291,7 +304,7 @@ function adoptSidebarShell(ctx, bashPath) {
           return
         }
         if (String(now?.terminalShell ?? '') === bashPath) {
-          s.update(SIDEBAR_NS, { terminalShell: '' }).catch(() => {})
+          s.update(SIDEBAR_NS, { terminalShell: previous }).catch(() => {})
         }
       },
       'dsh-gitbash-shell: sidebar shell revert',