dsh-gitbash-shell 0.5.0 → 0.5.2

package/README.md

@@ -120,8 +120,8 @@ preset 会被插件自动清理;宿主 shell 回退为 PowerShell。
 
 装了 [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);
+- **插件全权接管**:Windows 上每次启动都无条件把它的 `terminalShell` 设为 Git Bash——即使你在设置页/别处改过,下次插件启动也会改回来;
+- 卸载本插件 → 自动还原为你改之前的原值(回到它的默认解析:pwsh / powershell);
 - 想关掉本联动 → 本插件 row 配置加 `betterSidebarShell: false`。
 
 ## 许可

package/README_EN.md

@@ -53,8 +53,8 @@ preset stays as its own plugin manages it.
 
 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);
+- **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);
 - Disable the adoption with `betterSidebarShell: false` in this plugin's row config.
 
 ## License

package/dsh.plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "dsh-external/dsh-gitbash-shell",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "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.0",
+  "version": "0.5.2",
   "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

@@ -239,24 +239,39 @@ export function installRegisterShim(reg) {
 // (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.
+// model-facing terminal_* tools at Git Bash on Windows. The plugin TAKES
+// OVER the pref unconditionally while installed (a value set elsewhere is
+// overwritten at every boot — that is the contract); the previous value is
+// captured and restored on disposal (reload/update/uninstall), so removing
+// 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)
@@ -264,14 +279,12 @@ function adoptSidebarShell(ctx, bashPath) {
       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
+    const previous = typeof value.terminalShell === 'string' ? value.terminalShell : ''
     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,12 +304,15 @@ 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',
     )
-    console.log(`${TAG} dsh-better-sidebar terminal shell -> Git Bash (${bashPath})`)
+    console.log(
+      `${TAG} dsh-better-sidebar terminal shell -> Git Bash (${bashPath})` +
+        (previous ? ` (took over from '${previous}')` : ''),
+    )
   }
   void run()
 }