dsh-gitbash-shell 0.21.0 → 0.21.1

package/dsh.plugin.json

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

package/src/index.js

@@ -696,18 +696,12 @@ const PATH_DIALECT_KEY = 'DSH_PATH_DIALECT'
 const PATH_DIALECT_VALUE = 'msys'
 const PATH_DIALECT_DESCRIPTION = 'Path dialect for tool calls and tool results: MSYS drive roots (/c/Users/...) plus the bash-native mounts (~, /tmp, /dev/null, /usr); every tool accepts these forms directly.'
 
-// v0.21.0 — line endings for the MODEL's git commands. Windows Git defaults to
-// core.autocrlf=true, so an LF file the model writes comes back CRLF after a
-// checkout (scripts break on the stray \r, byte assertions fail); a Linux guest
-// has autocrlf=false. GIT_CONFIG_* are per-invocation settings: they reach only
-// the commands this plugin's shell runs, never the user's own terminal, and a
-// repository's .gitattributes still wins.
-const GIT_CONFIG_COUNT_KEY = 'GIT_CONFIG_COUNT'
-const GIT_CONFIG_KEY_0 = 'GIT_CONFIG_KEY_0'
-const GIT_CONFIG_VALUE_0 = 'GIT_CONFIG_VALUE_0'
-const GIT_CONFIG_KEY_1 = 'GIT_CONFIG_KEY_1'
-const GIT_CONFIG_VALUE_1 = 'GIT_CONFIG_VALUE_1'
-const GIT_EOL_DESCRIPTION = 'Git line endings for model-run commands: core.autocrlf=false / core.eol=lf, matching a Linux guest (the user own git config is untouched).'
+// v0.21.1 — line endings for the MODEL's git commands live in the EXECUTOR
+// (src/shell.js, withParityEnv): Windows Git defaults to core.autocrlf=true, so
+// an LF file the model writes comes back CRLF after a checkout (scripts break on
+// the stray \r, byte assertions fail), while a Linux guest has autocrlf=false.
+// They cannot ride the shell-env registry below: that registry accepts DSH_*
+// facts only, and a non-DSH key throws the whole contribution away.
 
 /** Read the posixPaths switch from the live settings service; never throws. */
 export function readPosixPaths(ctxLike) {
@@ -1700,29 +1694,16 @@ export async function apply(ctx, config = {}) {
           if (!shellEnv || typeof shellEnv.register !== 'function') return
           const unregister = shellEnv.register({
             name: 'gitbash-shell',
-            variables: {
-              [PATH_DIALECT_KEY]: { description: PATH_DIALECT_DESCRIPTION },
-              [GIT_CONFIG_COUNT_KEY]: { description: GIT_EOL_DESCRIPTION },
-              [GIT_CONFIG_KEY_0]: { description: GIT_EOL_DESCRIPTION },
-              [GIT_CONFIG_VALUE_0]: { description: GIT_EOL_DESCRIPTION },
-              [GIT_CONFIG_KEY_1]: { description: GIT_EOL_DESCRIPTION },
-              [GIT_CONFIG_VALUE_1]: { description: GIT_EOL_DESCRIPTION },
-            },
+            // The registry accepts DSH_* FACTS ONLY (a non-DSH key makes the
+            // whole contribution throw — learned in v0.21.0, see CHANGELOG):
+            // git line endings and anything else non-DSH_* ride the executor's
+            // own env layer (src/shell.js), not this registry.
+            variables: { [PATH_DIALECT_KEY]: { description: PATH_DIALECT_DESCRIPTION } },
             resolve() {
-              const dialect = readDialectSettings(envCtx)
-              if (dialect.posixPaths !== true) return {}
-              const values = { [PATH_DIALECT_KEY]: PATH_DIALECT_VALUE }
-              if (dialect.gitAutocrlf === true) {
-                values[GIT_CONFIG_COUNT_KEY] = '2'
-                values[GIT_CONFIG_KEY_0] = 'core.autocrlf'
-                values[GIT_CONFIG_VALUE_0] = 'false'
-                values[GIT_CONFIG_KEY_1] = 'core.eol'
-                values[GIT_CONFIG_VALUE_1] = 'lf'
-              }
-              return values
+              return readPosixPaths(envCtx) ? { [PATH_DIALECT_KEY]: PATH_DIALECT_VALUE } : {}
             },
           })
-           envCtx.effect(() => unregister, 'dsh-gitbash-shell: shellEnv path-dialect fact')
+          envCtx.effect(() => unregister, 'dsh-gitbash-shell: shellEnv path-dialect fact')
           console.log(`${TAG} shellEnv fact registered: ${PATH_DIALECT_KEY} (gated by the posixPaths setting)`)
         } catch (error) {
           console.log(`${TAG} shellEnv fact registration failed: ${error?.message ?? error}`)

package/src/shell.js

@@ -128,7 +128,41 @@ export class GitBashSandboxExecutor extends SandboxBashExecutor {
    * #1, see the file header): route them through the unconfined argv path
    * and label the result honestly so callers can tell.
    */
+  /**
+   * Linux-parity environment for the MODEL's shell (v0.21.1). The official
+   * shell-env registry accepts DSH_* facts only — registering anything else
+   * throws and takes the whole contribution (including DSH_PATH_DIALECT) down
+   * with it — so non-DSH parity facts are merged into the trusted dshEnv map
+   * HERE, right before the spawn. Windows Git defaults to core.autocrlf=true,
+   * so an LF file the model writes comes back CRLF after a checkout (scripts
+   * break on the stray \r, byte assertions fail); a Linux guest has
+   * autocrlf=false. GIT_CONFIG_* are per-invocation settings: only the
+   * commands this executor runs see them, the user's own terminal and a
+   * repository's .gitattributes are untouched.
+   * @param {object} spec the shell request
+   * @returns {object} the request with the parity facts merged in
+   */
+  withParityEnv(spec) {
+    try {
+      const settings = this.ctx && typeof this.ctx.get === 'function' ? this.ctx.get('settings') : undefined
+      const value = settings && typeof settings.get === 'function' ? settings.get('gitbash-shell') : undefined
+      if (!value || value.posixPaths !== true || value.gitAutocrlf === false) return spec
+      const dshEnv = {
+        ...(spec.dshEnv === undefined ? {} : spec.dshEnv),
+        GIT_CONFIG_COUNT: '2',
+        GIT_CONFIG_KEY_0: 'core.autocrlf',
+        GIT_CONFIG_VALUE_0: 'false',
+        GIT_CONFIG_KEY_1: 'core.eol',
+        GIT_CONFIG_VALUE_1: 'lf',
+      }
+      return { ...spec, dshEnv }
+    } catch {
+      return spec
+    }
+  }
+
   async run(spec) {
+    spec = this.withParityEnv(spec)
     const policy = spec.sandboxPolicy
     if (policy === undefined) return super.run(spec)
     const { mode } = policy
@@ -149,6 +183,7 @@ export class GitBashSandboxExecutor extends SandboxBashExecutor {
   }
 
   start(spec) {
+    spec = this.withParityEnv(spec)
     const policy = spec.sandboxPolicy
     if (policy === undefined) return super.start(spec)
     const { mode } = policy