dsh-gitbash-shell 0.24.1 → 0.24.3

package/dsh.plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "dsh-external/dsh-gitbash-shell",
-  "version": "0.24.1",
+  "version": "0.24.3",
   "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.24.1",
+  "version": "0.24.3",
   "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": {
@@ -12,7 +12,8 @@
     ".": "./src/index.js",
     "./shell": "./src/shell.js",
     "./client": "./src/client.js",
-    "./locale/*.json": "./locale/*.json"
+    "./locale/*.json": "./locale/*.json",
+    "./package.json": "./package.json"
   },
   "engines": {
     "node": ">=18",
@@ -58,8 +59,14 @@
   "license": "MIT",
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
+    "@deepseek-ai/dsh": ">=0.1.0",
     "@deepseek-ai/schemastery": "^3.18.1"
   },
+  "peerDependenciesMeta": {
+    "@deepseek-ai/dsh": {
+      "optional": true
+    }
+  },
   "publishConfig": {
     "access": "public"
   },

package/src/compositions.js

@@ -261,7 +261,7 @@ export function minimalPluginsFor() {
               "* Use native Windows paths (C:\\...) and $env:NAME variables; this is PowerShell, not bash.",
               "* Please avoid commands that may produce a very large amount of output.",
               "* Please run long lived commands in the background, e.g. 'Start-Job' or start a server with Start-Process.",
-            ].join('\n') + '\n',
+            ].join('\n'),
           },
         },
       ],

package/src/index.js

@@ -52,11 +52,36 @@ import {
 } from 'node:fs'
 import { homedir, tmpdir } from 'node:os'
 import { dirname, join } from 'node:path'
-import Schema from '@deepseek-ai/schemastery'
 import { fileURLToPath } from 'node:url'
 
 import { PRESET_META, minimalPluginsFor, pluginsFor } from './compositions.js'
 
+/**
+ * The schemastery module, resolved LAZILY (v0.24.3): `@deepseek-ai/schemastery`
+ * is a PEER — plain Node cannot resolve it from this package, only the host's
+ * own resolution (the profile shared fallback) supplies it. A deployment whose
+ * fallback lacks it used to fail the *static* import at the top of this file,
+ * and the Loader treats a failed plugin import as a non-fatal skip
+ * (`vendor/loader/src/config/entry.ts` `_init()`: logger.error + return, no
+ * fiber) — the row then silently never mounted, which for THIS plugin means no
+ * preset variants, no executor wiring and no client half, while every host log
+ * stays green. Same all-green failure class as dsh-better-workspace issue #9;
+ * verified with a fixture plugin whose only difference was the static peer
+ * import. Deferring the import hides the schema where the module is absent
+ * instead of killing the row.
+ */
+let Schema = null
+try {
+  Schema = (await import('@deepseek-ai/schemastery')).default
+} catch (error) {
+  Schema = null
+  console.warn(
+    '[gitbash-shell] @deepseek-ai/schemastery is not resolvable here; the row Config surface is absent'
+    + ' (the preset registration and the client half do not depend on it): '
+    + (error && error.message || String(error)),
+  )
+}
+
 /** Plugin identity for cordis.yml rows. */
 export const name = 'dsh-gitbash-shell'
 
@@ -679,9 +704,11 @@ function live(schema) {
  * Row Config = the settings surface on dsh >= 0.1.7 (values persist under the
  * row id; the patch row id is 'gitbash-shell', the same string as the old
  * settings namespace, so the one-shot legacy settings.yaml import maps old
- * user values onto the new home). Inert metadata on older hosts.
+ * user values onto the new home). Inert metadata on older hosts, and absent
+ * (undefined) when schemastery is unresolvable: cordis then passes the row
+ * config through unvalidated instead of the whole row disappearing.
  */
-export const Config = Schema.object({
+export const Config = Schema === null ? undefined : Schema.object({
   // Row-level knob predating the Config surface (invariant 6): which preset
   // variants to serve. Ordinary config — an edit remounts the plugin, which
   // is the right weight for a list that changes the roster.
@@ -1649,8 +1676,14 @@ let reconcileSidebar = () => {}
  * value is still ours, so a user's manual choice is never clobbered. The
  * polling keeps the original ready-wait behavior: at boot the settings
  * service may not be provided yet when this row's apply runs. Never throws.
+ *
+ * `readAdopt` is apply()'s era-aware gate getter (`() => liveSettings.
+ * adoptSidebar()`), passed in because this module-level helper cannot see
+ * that scope-local reader itself (v0.24.2 regression fix — referencing
+ * `liveSettings` here threw `ReferenceError: liveSettings is not defined`
+ * from `run()` and aborted the whole plugin mount).
  */
-function adoptSidebarShell(ctx, bashPath) {
+function adoptSidebarShell(ctx, bashPath, readAdopt) {
   let adopted = false
   let previous = ''
   let tried = 0
@@ -1706,7 +1739,7 @@ function adoptSidebarShell(ctx, bashPath) {
 
   const run = () => {
     tried += 1
-    const ok = reconcileSidebar(liveSettings.adoptSidebar())
+    const ok = reconcileSidebar(readAdopt())
     if (ok) {
       // The namespace scope may register after the settings service; hook
       // the live watch once it exists (idempotent via the effect disposer).
@@ -2250,7 +2283,7 @@ export async function apply(ctx, config = {}) {
   // 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)
+    adoptSidebarShell(ctx, gitBashCapability.bashPath, () => liveSettings.adoptSidebar())
   }
 
   // ── era split: declarative registration on dsh >= 0.1.7 ──────────────────