dsh-gitbash-shell 0.38.0 → 0.38.1

package/CHANGELOG.md

@@ -3,6 +3,16 @@
 > 倒序排列,新版本条目在最上面。条目格式:`## vX.Y.Z — YYYY-MM-DD` + 类型(feat / fix / docs / chore)+ 要点 + 相关链接。
 > 纪律见 AGENTS.md「变更记录纪律」:发版前先更新本文件并随版本提交;事故复盘、复现与真机验证记录也记在这里。
 
+## v0.38.1 — 2026-10-13
+
+**类型**:fix(bash 补位在桌面版宿主解析不到官方包;真机反复确认的最后一个开放问题)。
+
+- **根因(无日志下的代码级定位,待真机确认)**:bash 激活的解析通道用的是裸 `createRequire(ctx.baseUrl).resolve('@deepseek-ai/dsh-tool-bash')`——**桌面版宿主把官方包打进 `app.asar`,从插件的 profile 布局裸解析必然失败**(返回空 → 日志 "not resolvable" → bash 永缺)。这也解释了为何同一进程里 deny/pwsh7/gb_* 全部正常(插件自带代码,不依赖该解析)而唯独 bash 缺。
+- **修复:解析通道改为宿主 loader 优先**——`ctx.loader.internal.import(name, ctx.baseUrl, {})`,与宿主挂载行包**完全相同的调用**(`vendor/loader/src/config/tree.ts:122`),走宿主自己的 resolve 钩子(可达 asar 内部);失败才退回裸 createRequire(旧通道,非桌面布局保底)。两通道都失败才如实记日志。
+- `resolveToolBashEntry` 返回形状从 href 字符串改为 `{ load }` 惰性加载器;`activateOfficialBash` 接收 loader 对象;调用点与缓存变量同步更名。
+- **冒烟**:118 项全绿;新增「bash resolution tries the HOST loader before a plain require」(断言通道顺序、官方包名、baseUrl 透传、惰性加载)。
+- **待真机复验**:升级重启后官方模式新建会话,工具面应出现 `bash`;日志应出现 `official bash tool activated for this agent`。
+
 ## v0.38.0 — 2026-10-13
 
 **类型**:feat(设置卡折叠分区;用户反馈「开关堆一列不知道主题」)。

package/dsh.plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "dsh-external/dsh-gitbash-shell",
-  "version": "0.38.0",
+  "version": "0.38.1",
   "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.0",
+  "version": "0.38.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/inline-tools.js

@@ -221,19 +221,40 @@ export function validatePwshArgs(args) {
   return undefined
 }
 
+/** The official bash-tool package the inline patch activates. */
+const TOOL_BASH_PACKAGE = '@deepseek-ai/dsh-tool-bash'
+
 /**
- * Resolve the OFFICIAL @deepseek-ai/dsh-tool-bash module entry from the
- * host's own resolution base (the same seam probeHostExtras uses). Returns
- * the absolute entry URL, or '' when the host does not ship the package.
+ * Resolve the OFFICIAL @deepseek-ai/dsh-tool-bash module. TWO channels, in
+ * order (v0.38.1, the desktop-host field report):
+ *
+ *   ① THE HOST'S OWN LOADER — `ctx.loader.internal.import(name, baseUrl, {})`,
+ *      the exact call the row mount itself uses
+ *      (vendor/loader/src/config/tree.ts:122). It runs the host's resolve
+ *      hooks, so it reaches packages inside the desktop app.asar that a bare
+ *      Node resolver cannot see from the plugin's profile layout.
+ *   ② A plain createRequire from the host base — the v0.35.0 channel, kept
+ *      for layouts where the internal loader is absent.
+ *
+ * @returns {Promise<{ load: async () => object }|undefined>} a lazy loader for
+ *   the module, or undefined when neither channel resolves it.
  */
 export async function resolveToolBashEntry(ctx) {
+  try {
+    const internal = ctx?.loader?.internal
+    if (internal && typeof internal.import === 'function') {
+      const mod = await internal.import(TOOL_BASH_PACKAGE, ctx?.baseUrl, {})
+      if (mod && typeof mod.apply === 'function') return { load: async () => mod }
+    }
+  } catch { /* fall through to the plain resolution */ }
   try {
     const { createRequire } = await import('node:module')
     const { pathToFileURL } = await import('node:url')
     const req = createRequire(ctx?.baseUrl ?? import.meta.url)
-    return pathToFileURL(req.resolve('@deepseek-ai/dsh-tool-bash')).href
+    const href = pathToFileURL(req.resolve(TOOL_BASH_PACKAGE)).href
+    return { load: async () => import(href) }
   } catch {
-    return ''
+    return undefined
   }
 }
 
@@ -245,10 +266,10 @@ 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, toolBashHref, createScopeFn, log) {
+export async function activateOfficialBash(agent, resolved, createScopeFn, log) {
   let mod
   try {
-    mod = await import(toolBashHref)
+    mod = await resolved.load()
   } catch (error) {
     log(`official tool-bash module import failed: ${error?.message ?? error}`)
     return undefined
@@ -294,7 +315,7 @@ export function mountInlineTools(ctx, deps) {
   const { tools, agents, createScope, allowed, spawn, pwshPath, echo, log } = deps
   /** agent -> { timer, scope, denyPwsh, pwshScope }; named `tracked` because `agents` above is the host service */
   const tracked = new Map()
-  let toolBashHrefPromise
+  let toolBashResolvePromise
 
   const faceNames = (agent) => {
     try {
@@ -383,13 +404,13 @@ export function mountInlineTools(ctx, deps) {
       }
     }
     if (needs.needsBash && !state.scope) {
-      if (toolBashHrefPromise === undefined) toolBashHrefPromise = resolveToolBashEntry(ctx)
-      void toolBashHrefPromise.then(async (href) => {
-        if (href === '') {
-          log('official @deepseek-ai/dsh-tool-bash is not resolvable from the host base; bash stays absent for this agent')
+      if (toolBashResolvePromise === undefined) toolBashResolvePromise = resolveToolBashEntry(ctx)
+      void toolBashResolvePromise.then(async (resolved) => {
+        if (!resolved) {
+          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, href, createScope, log)
+        const scope = await activateOfficialBash(agent, resolved, createScope, log)
         if (scope && tracked.get(agent) === state) {
           state.scope = scope
           log('official bash tool activated for this agent (Git Bash host; fake pwsh denied)')