dsh-gitbash-shell 0.38.1 → 0.38.3

package/CHANGELOG.md

@@ -3,6 +3,23 @@
 > 倒序排列,新版本条目在最上面。条目格式:`## vX.Y.Z — YYYY-MM-DD` + 类型(feat / fix / docs / chore)+ 要点 + 相关链接。
 > 纪律见 AGENTS.md「变更记录纪律」:发版前先更新本文件并随版本提交;事故复盘、复现与真机验证记录也记在这里。
 
+## v0.38.3 — 2026-10-13
+
+**类型**:fix(补位激活的 scope 上下文时序;用户终端日志一锤定音)。
+
+- **根因(日志 `official tool-bash activation failed: Cannot read properties of undefined (reading 'shell')`)**:cordis 的 `ctx.plugin()` **只创建 Fiber 就返回,插件的 apply 回调是异步启动的**(`vendor/cordis/lib/index.js:1619`,wrapped fiber 是 thenable)——`createScope` 返回时 `childCtx` 还是 `undefined`,`mod.apply(undefined, {})` 在官方模块第一行 `ctx.shell.sandboxMode` 上炸。此前的解析修复(v0.38.1)已生效:模块拿到了,死在最后一步。
+- **修复**:`createScope` 返回 `{ fiber, get ctx(), dispose }`;`activateOfficialBash` 与 `providePwsh`(同款隐患,此前 pwsh7 开了也会静默发不出)在动手前 `await scope.fiber` 等回调跑完,再校验 `scope.ctx` 就绪。
+- **冒烟**:118 项全绿。
+- **真机判据**:升级重启新建会话 → 工具面出现 `bash`;日志出现 `official bash tool activated for this agent`。若再现 activation failed,错误行会指向官方模块内部的真实原因(而非 ctx undefined)。
+
+## v0.38.2 — 2026-10-13
+
+**类型**:fix(v0.38.0 折叠分区在真机上完全失效;用户截图定位)。
+
+- **`fold()` helper 签名与调用点不匹配(实锤 bug)**:七个调用点是 `fold("sec.xxx", 行, 行, ...)`,实现却按 `(key, titleKey, ...行)` 解析——**每个分区的第一行内容被吞进标题参数**,`t(<React元素>)` 得到空标题,卡片退化成一列无标题的平铺开关(v0.38.0 的折叠在真机从未生效)。修复:实现改为 `(titleKey, ...行)`,折叠状态键直接用词典键,调用点零改动。
+- 官方用法核对(SystemPromptRow/PresentRow):`DisclosureRow` 的 props 形状(icon/title/open/expandable/expandOnRowClick/onToggle/children)与本插件用法一致,问题只在签名错乱。
+- **冒烟**:118 项全绿;断言改锁 `folds[titleKey]`。
+
 ## v0.38.1 — 2026-10-13
 
 **类型**:fix(bash 补位在桌面版宿主解析不到官方包;真机反复确认的最后一个开放问题)。

package/dsh.plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "dsh-external/dsh-gitbash-shell",
-  "version": "0.38.1",
+  "version": "0.38.3",
   "main": "./src/index.js",
   "description": "Windows 全模式 Git Bash:用 Git for Windows bash 替换 PowerShell 执行器;官方四个模式经行内工具补位直接获得 Git Bash(v0.35.0,默认),四个 *·Git Bash 变体 preset 可开关;附带 gitbash_pwsh(系统 PowerShell 7)与 gb_* FastCtx 文件工具,检测到 dsh-ops 自动让位。联动:dsh-ptc-cordis-preset(PTC 创造模式带 Git Bash 行且可去重)+ dsh-better-sidebar(终端标签自动切 Git Bash)。",
   "engines": {

package/package.json

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

package/src/client.js

@@ -2107,7 +2107,11 @@ window.__ModuleLoader__.load({
 			   and expands the one theme they recognise. A stripped-down host
 			   without the export degrades to the static title+stack card. */
 			var DisclosureRowComponent = icon("DisclosureRow");
-			function fold(key, titleKey) {
+			/* v0.38.2 BUGFIX: the call sites are `fold("sec.xxx", row, row, ...)`
+			   — one dictionary key followed by the section's rows. The previous
+			   draft parsed (key, titleKey, ...) and ATE the first row into the
+			   title slot (t(<element>) → empty header, nothing folded). */
+			function fold(titleKey) {
 				var body = [];
 				for (var i = 1; i < arguments.length; i++) body.push(arguments[i]);
 				if (!DisclosureRowComponent || typeof DisclosureRowComponent !== "function") {
@@ -2120,10 +2124,10 @@ window.__ModuleLoader__.load({
 					className: "gb-fold",
 					icon: null,
 					title: t(titleKey),
-					open: folds[key] === true,
+					open: folds[titleKey] === true,
 					expandable: true,
 					expandOnRowClick: true,
-					onToggle: function () { toggleFold(key); },
+					onToggle: function () { toggleFold(titleKey); },
 				}, E("div", { className: "gb-stack" }, body));
 			}
 

package/src/index.js

@@ -2618,7 +2618,14 @@ export async function apply(ctx, config = {}) {
           let childCtx
           const fiber = agentCtx.plugin((c) => { childCtx = c })
           return {
-            ctx: childCtx,
+            // cordis plugin() starts the fiber ASYNCHRONOUSLY — the apply
+            // callback that captures childCtx has NOT run when plugin()
+            // returns. The wrapped fiber is a thenable (`fiber.await()`):
+            // awaiting it is the only way to observe childCtx being set
+            // (v0.38.3, real machine: apply(undefined) crashed with
+            // "Cannot read properties of undefined (reading 'shell')").
+            fiber,
+            get ctx() { return childCtx },
             dispose: async () => { try { await fiber?.dispose?.() } catch { /* already gone */ } },
           }
         },

package/src/inline-tools.js

@@ -279,6 +279,20 @@ export async function activateOfficialBash(agent, resolved, createScopeFn, log)
     return undefined
   }
   const scope = createScopeFn(agent.ctx)
+  // plugin() starts the fiber asynchronously; awaiting the wrapped thenable
+  // guarantees the apply callback has captured scope.ctx before we hand it
+  // to the official module (v0.38.2-and-earlier passed undefined here and
+  // crashed inside `ctx.shell`).
+  if (scope.fiber) {
+    try { await scope.fiber } catch (error) {
+      log(`official tool-bash scope fiber failed to start: ${error?.message ?? error}`)
+      return undefined
+    }
+  }
+  if (!scope.ctx) {
+    log('official tool-bash scope context did not initialize; activation skipped')
+    return undefined
+  }
   try {
     await mod.apply(scope.ctx, {})
     return scope
@@ -332,12 +346,15 @@ export function mountInlineTools(ctx, deps) {
    * pure ADDITION — it shadows nothing and requires no deny juggling. The
    * scope keeps the registration revertible at agent disposal.
    */
-  const providePwsh = (agent, state) => {
+  const providePwsh = async (agent, state) => {
     if (state.pwshScope) return
     if (typeof spawn !== 'function' || !pwshPath) return
     if (!createScope) return
     try {
       const scope = createScope(agent.ctx)
+      // Same asynchronous-fiber shape as activateOfficialBash: wait for the
+      // apply callback to capture scope.ctx before touching its tools.
+      if (scope.fiber) { try { await scope.fiber } catch { /* disposed */ } }
       const registry = scope.ctx?.tools
       if (!registry || typeof registry.register !== 'function') {
         void scope.dispose().catch(() => {})
@@ -400,7 +417,7 @@ export function mountInlineTools(ctx, deps) {
             log(`fake-pwsh deny failed: ${error?.message ?? error}`)
           }
         }
-        if (deps.pwshEnabled && deps.pwshEnabled() === true) providePwsh(agent, state)
+        if (deps.pwshEnabled && deps.pwshEnabled() === true) void providePwsh(agent, state)
       }
     }
     if (needs.needsBash && !state.scope) {