dsh-gitbash-shell 0.38.2 → 0.38.4

package/CHANGELOG.md

@@ -3,6 +3,24 @@
 > 倒序排列,新版本条目在最上面。条目格式:`## vX.Y.Z — YYYY-MM-DD` + 类型(feat / fix / docs / chore)+ 要点 + 相关链接。
 > 纪律见 AGENTS.md「变更记录纪律」:发版前先更新本文件并随版本提交;事故复盘、复现与真机验证记录也记在这里。
 
+## v0.38.4 — 2026-10-13
+
+**类型**:fix(bash 挂载的服务授权 + 折叠分区自绘;两条真机日志驱动)。
+
+- **bash 挂载改走 cordis 官方插件通道**(`agent.ctx.plugin(mod)`):官方 tool-bash 模块对象自带 `inject: ['tools','shell','systemPrompt','shellEnv','workingDirectory']` 声明;此前手动 `mod.apply(scope.ctx)` 绕过声明,被 cordis 拒读服务(`cannot get property "shell" without inject`——上一版 fiber 时序修复的后续,ctx 已就绪、死在授权)。`ctx.plugin(mod)` 注册**真正的 fiber**(声明生效、cordis 自己跑 apply、Config 走官方 schema),`await fiber` 等激活完成;卸载 = `fiber.dispose()`,回滚语义由 cordis 保证。
+- **折叠分区改为自绘**(按钮头 + 条件体,零外部组件):官方 `DisclosureRow` 在真机的插件受限 require 形状里拿不到(`icon("DisclosureRow")` 为 null),v0.38.0–0.38.3 的每个分区都在静默退化成「静态标题 + 平铺」——正是用户截图里那个"一条线分割的一列"。自绘后:七个带边框卡片、标题行常驻可点、默认全收起。
+- **冒烟**:118 项全绿;断言改锁自绘形态(无外部组件依赖、折叠头、条件体)。
+- **真机判据**:升级重启新建会话 → bash 出现 + 日志 `official bash tool activated for this agent`;设置卡 = 七个可折叠卡片。
+
+## 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 折叠分区在真机上完全失效;用户截图定位)。

package/dsh.plugin.json

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

@@ -1807,6 +1807,11 @@ window.__ModuleLoader__.load({
 			   seven header rows at a glance, switches only visible on expand. */
 			".gb-fold{border:1px solid var(--dsw-alias-border-l2);border-radius:10px;padding:4px 12px 12px;background:var(--dsw-alias-bg-layer-1,transparent)}",
 			".gb-fold .gb-stack{padding-top:10px}",
+			".gb-foldHead{display:flex;align-items:center;gap:8px;width:100%;appearance:none;background:none;border:0;padding:6px 0;font:inherit;font-size:13px;font-weight:600;letter-spacing:.02em;color:var(--dsw-alias-label-secondary);cursor:pointer;text-align:left}",
+			".gb-foldHead:hover{color:var(--dsw-alias-label-primary)}",
+			".gb-foldChevron{flex:none;display:inline-block;color:var(--dsw-alias-label-tertiary);transition:transform .16s}",
+			".gb-foldChevron.gb-foldChevronOpen{transform:rotate(90deg)}",
+			".gb-foldTitle{min-width:0;overflow-wrap:anywhere}",
 			/* Missing-Git-Bash popup (v0.28.0): a root-level modal, because the
 			   user may never be on the settings page when their shell dies. */
 			".gb-modalBackdrop{position:fixed;inset:0;z-index:2147483000;display:flex;align-items:center;justify-content:center;background:rgba(0,0,0,.45)}",
@@ -2100,35 +2105,31 @@ window.__ModuleLoader__.load({
 
 			var Chevron = icon("IconChevronDownOutline14");
 
-			/* v0.38.0: one FOLDABLE section. The header row is the OFFICIAL
-			   `DisclosureRow` from the seed ui-primitives package (required at
-			   the top of this file, same seam as every icon). All sections stay
-			   collapsed by default — the user scans seven labelled header rows
-			   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");
-			/* 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). */
+			/* v0.38.4: one FOLDABLE section, HAND-DRAWN. The official disclosure
+			   component was tried first (v0.38.0-0.38.3) but never rendered on
+			   the real machine — the ui-primitives module shape the plugin's
+			   restricted require returns does not expose it (the icon lookup
+			   comes back null there), so every section silently degraded to a
+			   static title+stack pile. Self-drawing costs one button + one
+			   conditional: header row visible at all times, body only while
+			   open. All sections stay collapsed by default — seven labelled
+			   header rows to scan. */
 			function fold(titleKey) {
 				var body = [];
 				for (var i = 1; i < arguments.length; i++) body.push(arguments[i]);
-				if (!DisclosureRowComponent || typeof DisclosureRowComponent !== "function") {
-					return E("div", { className: "gb-section" },
-						E("div", { className: "gb-sectionTitle" }, t(titleKey)),
-						E("div", { className: "gb-stack" }, body),
-					);
-				}
-				return E(DisclosureRowComponent, {
-					className: "gb-fold",
-					icon: null,
-					title: t(titleKey),
-					open: folds[titleKey] === true,
-					expandable: true,
-					expandOnRowClick: true,
-					onToggle: function () { toggleFold(titleKey); },
-				}, E("div", { className: "gb-stack" }, body));
+				var open = folds[titleKey] === true;
+				return E("div", { className: "gb-fold" },
+					E("button", {
+						type: "button",
+						className: "gb-foldHead",
+						"aria-expanded": open ? "true" : "false",
+						onClick: function () { toggleFold(titleKey); },
+					},
+						E("span", { className: "gb-foldChevron" + (open ? " gb-foldChevronOpen" : ""), "aria-hidden": "true" }, "▸"),
+						E("span", { className: "gb-foldTitle" }, t(titleKey)),
+					),
+					open ? E("div", { className: "gb-stack" }, body) : null,
+				);
 			}
 
 			// dsh 0.1.6-alpha.2: the Plugins page renders this card through the

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

@@ -266,7 +266,7 @@ export async function resolveToolBashEntry(ctx) {
  * prescribes for per-agent variants. The official module is loaded ONCE per
  * process; each agent gets a fresh scope and a fresh apply().
  */
-export async function activateOfficialBash(agent, resolved, createScopeFn, log) {
+export async function activateOfficialBash(agent, resolved, log) {
   let mod
   try {
     mod = await resolved.load()
@@ -278,15 +278,31 @@ export async function activateOfficialBash(agent, resolved, createScopeFn, log)
     log('official tool-bash module has no apply(); activation skipped')
     return undefined
   }
-  const scope = createScopeFn(agent.ctx)
+  // Mount through cordis's OWN plugin path. The official module object
+  // DECLARES its service needs (`inject: ['tools','shell','systemPrompt',
+  // 'shellEnv','workingDirectory']`); a hand-called mod.apply(ctx) has no
+  // such declaration, so cordis refuses every service read with
+  // `cannot get property "shell" without inject` (v0.38.2 field report).
+  // ctx.plugin(mod) registers a REAL fiber with the declaration honored,
+  // runs apply itself, and the wrapped fiber is a thenable — awaiting it
+  // waits for the activation (and its async fiber start) to finish.
+  let fiber
   try {
-    await mod.apply(scope.ctx, {})
-    return scope
+    fiber = agent.ctx.plugin(mod)
   } catch (error) {
-    try { await scope.dispose() } catch { /* best effort */ }
-    log(`official tool-bash activation failed: ${error?.message ?? error}`)
+    log(`official tool-bash mount failed: ${error?.message ?? error}`)
     return undefined
   }
+  try {
+    await fiber
+  } catch (error) {
+    log(`official tool-bash fiber failed: ${error?.message ?? error}`)
+    return undefined
+  }
+  return {
+    fiber,
+    dispose: async () => { try { await fiber?.dispose?.() } catch { /* already gone */ } },
+  }
 }
 
 /**
@@ -332,12 +348,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 +419,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) {
@@ -410,7 +429,7 @@ export function mountInlineTools(ctx, deps) {
           log('official @deepseek-ai/dsh-tool-bash is not resolvable (neither the host loader nor a plain resolution found it); bash stays absent for this agent')
           return
         }
-        const scope = await activateOfficialBash(agent, resolved, createScope, log)
+        const scope = await activateOfficialBash(agent, resolved, log)
         if (scope && tracked.get(agent) === state) {
           state.scope = scope
           log('official bash tool activated for this agent (Git Bash host; fake pwsh denied)')