dsh-gitbash-shell 0.46.0 → 0.47.0

package/CHANGELOG.md

@@ -3,6 +3,15 @@
 > 倒序排列,新版本条目在最上面。条目格式:`## vX.Y.Z — YYYY-MM-DD` + 类型(feat / fix / docs / chore)+ 要点 + 相关链接。
 > 纪律见 AGENTS.md「变更记录纪律」:发版前先更新本文件并随版本提交;事故复盘、复现与真机验证记录也记在这里。
 
+## [0.47.0] — 2026-10-30
+
+### feat:适配 dsh 0.2.2-alpha.2(下限抬到 alpha.2,清旧宿主回退)
+
+- **宿主下限**:`engines.dsh`、peer `@deepseek-ai/dsh`、`dsh.compatibility.dsh` 统一到 `>=0.2.2-alpha.2`,`dshReleases` 只保留 alpha.2。本版组合只产出 alpha.2 形状,不再为 0.1.7–0.2.1 保留 `tool-presentation(mode: ptc)` 回退。
+- **组合跟随(无条件)**:PTC 变体固定挂 `tool-executor-ptc`;`tool-subagent-list-agents` 行删除(list_agents 已并入 `tool-subagent-control`);`tool-subagent` 固定 `modelSelection` + `modelDiscovery`;`tool-plugin-manager` / `tool-plugin-market` 随 `profileContext` live 服务启停。time-context / tool-schedule / plugin-market 的包探针保留:包缺失只少行、不拒绝整棵挂载。
+- **assemble 工具面**:0.2.2-alpha.2 的 `system-prompt/assemble` 只带 `toolSet`,不再带 `tools`;`runCodeHintFor` / `applyToolRouting` 改为读 `assembleContext.toolSet` 并调用 `ctx.get('tools').schemas(agent, toolSet)`,不再回退全量 `schemas(agent)`。
+- **测试(342 pass + 1 平台 skip)**:compatibility-regressions 的监听器夹具改为 `toolSet` + `ctx.get('tools').schemas`;smoke 的旧宿主回退断言替换为 alpha.2 无条件形态;market 在无 profileContext 时默认 disabled。
+
 ## [0.46.0] — 2026-10-28
 
 ### fix:跟随 dsh-ops 0.4.3 的 preset-mode 行集(ops_bash 剥离不再失效)

package/dsh.plugin.json

@@ -1,10 +1,10 @@
 {
   "id": "dsh-external/dsh-gitbash-shell",
-  "version": "0.46.0",
+  "version": "0.47.0",
   "main": "./src/index.js",
   "description": "Windows 全模式 Git Bash:自带 bash 工具(私有 Git Bash 执行器实例,官方 PowerShell 执行器原样保留),官方四个模式经行内工具补位直接获得 Git Bash(v0.35.0 起;v0.39.0 起不再替换宿主执行器),四个 *·Git Bash 变体 preset 可开关;官方 pwsh 工具默认隐藏、开关可见(真 PowerShell);附带 gb_* FastCtx 文件工具,检测到 dsh-ops 自动让位。联动:dsh-ptc-cordis-preset(PTC 创造模式带 Git Bash 行且可去重)+ dsh-better-sidebar(终端标签自动切 Git Bash)。",
   "engines": {
-    "dsh": ">=0.1.7-rc"
+    "dsh": ">=0.2.2-alpha.2"
   },
   "contributes": {
     "tools": [],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-gitbash-shell",
-  "version": "0.46.0",
+  "version": "0.47.0",
   "description": "Windows 上给 agent 一个真正的 Git Bash 命令工具:私有 Git Bash 执行器实例(官方 PowerShell 执行器原样保留),统一 MSYS 盘根路径方言,官方 pwsh 工具默认隐藏可开关,物化四个内置预设的 Git Bash 变体,侧栏终端接管可开关。· Give agents a real Git Bash tool on Windows: a private Git Bash executor instance (the official PowerShell executor stays untouched), a unified MSYS drive-root path dialect, an opt-in official pwsh tool, and four Git Bash preset variants.",
   "type": "module",
   "repository": {
@@ -17,7 +17,7 @@
   },
   "engines": {
     "node": ">=18",
-    "dsh": ">=0.1.7-rc"
+    "dsh": ">=0.2.2-alpha.2"
   },
   "dsh": {
     "bundle": {
@@ -32,15 +32,9 @@
       "platform": "web"
     },
     "compatibility": {
-      "dsh": ">=0.1.7-rc",
+      "dsh": ">=0.2.2-alpha.2",
       "dshReleases": {
-        "0.2.0-rc.2": "compatible",
-        "0.2.1-alpha.1": "compatible",
-        "0.2.1-alpha.2": "compatible",
-        "0.2.1-alpha.3": "compatible",
-        "0.2.1-alpha.4": "compatible",
-        "0.2.1-alpha.5": "compatible",
-        "0.2.1-rc.1": "compatible"
+        "0.2.2-alpha.2": "compatible"
       }
     }
   },
@@ -72,7 +66,7 @@
   "license": "MIT",
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh": ">=0.1.7-rc",
+    "@deepseek-ai/dsh": ">=0.2.2-alpha.2",
     "@deepseek-ai/schemastery": "^3.18.1"
   },
   "peerDependenciesMeta": {

package/src/compositions.js

@@ -90,19 +90,18 @@ export function pluginsFor({ kind, gitBash, skillsDir, pythonActive = false, hos
   // toolFilter deny from the subagent/subagent_fork configs (official
   // reminders reach subagents again — the deny was never load-bearing,
   // nothing replaces it); alpha.4 added a tool-plugin-market row to every
-  // full preset. 0.2.2-alpha.2 then reworked the tool execution architecture
-  // (`executorPlugin`): the official executors moved into explicit
-  // tool-executor-native/-ptc rows, the subagent config renamed
-  // `modelSelectionSettings` to `modelSelection` + opt-in `modelDiscovery`,
-  // list-agents folded into the tool-subagent-control row itself (its
-  // separate row is gone), and the manager/market rows enable under a
-  // profile context instead of staying off outside cordis. A preset row whose
-  // package is absent rejects the WHOLE mount, so these ride a host probe
-  // (index.js probeHostExtras, resolved from ctx.baseUrl — the base rows
-  // mount from); absent/older hosts keep the byte-identical earlier row set.
-  // The minimal variant carries its own 0.2.1-alpha.3 delta (tool-fs +
-  // compaction) behind the compaction flag.
-  const { timeContext = false, toolSchedule = false, pluginMarket = false, compaction = false, executorPlugin = false, profileContext = false } = hostExtras
+  // full preset. 0.2.2-alpha.2 then reworked the tool execution architecture:
+  // the official executors moved into explicit tool-executor-native/-ptc
+  // rows, the subagent config renamed `modelSelectionSettings` to
+  // `modelSelection` + opt-in `modelDiscovery`, list-agents folded into the
+  // tool-subagent-control row itself (its separate row is gone), and the
+  // manager/market rows enable only under a profile context. That shape is
+  // unconditional now — the plugin's lower bound is 0.2.2-alpha.2. Optional
+  // 0.2.1 additions still ride a host probe (index.js probeHostExtras,
+  // resolved from ctx.baseUrl — the base rows mount from). The minimal
+  // variant carries its own 0.2.1-alpha.3 delta (tool-fs + compaction) behind
+  // the compaction flag.
+  const { timeContext = false, toolSchedule = false, pluginMarket = false, compaction = false, profileContext = false } = hostExtras
   const rows = [
     {
       id: 'persona',
@@ -176,14 +175,11 @@ export function pluginsFor({ kind, gitBash, skillsDir, pythonActive = false, hos
       config: [
         { id: 'tool-subagent-control', name: '@deepseek-ai/dsh-tool-subagent-control' },
         // 0.2.2-alpha.2 folded list_agents into the control row itself; the
-        // separate child row is gone, so alpha.2+ hosts must not mount it.
-        ...(executorPlugin ? [] : [{ id: 'tool-subagent-list-agents', name: '@deepseek-ai/dsh-tool-subagent-control/list-agents' }]),
+        // separate child row is gone.
         {
           id: 'tool-subagent',
           name: '@deepseek-ai/dsh-tool-subagent',
-          config: executorPlugin
-            ? { provider: 'spawn', toolName: 'subagent', modelSelection: true, modelDiscovery: true, ...(timeContext ? {} : { backgroundMode: 'continuable' }) }
-            : { provider: 'spawn', toolName: 'subagent', modelSelectionSettings: true, ...(timeContext ? {} : { backgroundMode: 'continuable' }) },
+          config: { provider: 'spawn', toolName: 'subagent', modelSelection: true, modelDiscovery: true, ...(timeContext ? {} : { backgroundMode: 'continuable' }) },
         },
         {
           id: 'tool-subagent-fork',
@@ -221,10 +217,8 @@ export function pluginsFor({ kind, gitBash, skillsDir, pythonActive = false, hos
     // 0.2.2-alpha.2 replaced the deprecated presentation selector with the
     // explicit PTC executor row (the base deployment keeps
     // tool-executor-native; a scoped executor row overrides it for this
-    // agent). Older hosts keep the presentation row they ship.
-    rows.push(executorPlugin
-      ? { id: 'tool-executor-ptc', name: '@deepseek-ai/dsh-tool-executor-ptc' }
-      : { id: 'tool-presentation', name: '@deepseek-ai/dsh-agent-tool-presentation', config: { mode: 'ptc' } })
+    // agent).
+    rows.push({ id: 'tool-executor-ptc', name: '@deepseek-ai/dsh-tool-executor-ptc' })
   }
   if (kind === 'cordis') {
     rows.push({ id: 'tool-cordis', name: '@deepseek-ai/dsh-tool-cordis' })
@@ -237,20 +231,15 @@ export function pluginsFor({ kind, gitBash, skillsDir, pythonActive = false, hos
   rows.push({
     id: 'tool-plugin-manager',
     name: '@deepseek-ai/dsh-plugin-manager/tools',
-    // The official rows: before 0.2.2-alpha.2 ptc/standard ship it disabled and
-    // cordis keeps it on (every web deployment has a profile context). From
-    // 0.2.2-alpha.2 on every preset enables it exactly when a profile context
-    // exists, so the probe decides for all three variants.
-    ...(executorPlugin ? off(!profileContext) : off(kind !== 'cordis')),
+    // Every preset enables it exactly when a profile context exists.
+    ...off(!profileContext),
   })
   if (pluginMarket) {
     rows.push({
-      // The official 0.2.1-alpha.4 rows, following the manager's split on
-      // both architectures (alpha.4: disabled on standard/ptc, profile-gated
-      // on cordis; alpha.2 of 0.2.2: profile-gated everywhere).
+      // The official 0.2.1-alpha.4 row, profile-gated like the manager.
       id: 'tool-plugin-market',
       name: '@deepseek-ai/dsh-plugin-market/tools',
-      ...(executorPlugin ? off(!profileContext) : off(kind !== 'cordis')),
+      ...off(!profileContext),
     })
   }
   return rows

package/src/index.js

@@ -1807,14 +1807,12 @@ function cleanupLegacyTrees(presetIds) {
  *
  * `timeContext` / `toolSchedule` / `pluginMarket` / `compaction` are the
  * 0.2.1 rows (durable clock readings, reminder tools, the plugin market row,
- * the minimal tool-fs + compaction delta). `executorPlugin` marks the
- * 0.2.2-alpha.2 tool-execution architecture: the packages tool-executor-native
- * and tool-executor-ptc exist, the official presets mount the latter for PTC,
- * the subagent config renamed `modelSelectionSettings` to
- * `modelSelection` + `modelDiscovery`, and list-agents folded into the control
- * row. `profileContext` is the host fact the manager/market rows gate on since
- * alpha.2 (`!!js "!ctx.get('profileContext')"`) — computed from the live
- * service, not the package set.
+ * the minimal tool-fs + compaction delta). The 0.2.2-alpha.2 tool-execution
+ * architecture is unconditional: the official presets mount
+ * tool-executor-ptc for PTC, the subagent config uses `modelSelection` +
+ * `modelDiscovery`, and list-agents folded into the control row.
+ * `profileContext` is the live host fact the manager/market rows gate on
+ * (`!!js "!ctx.get('profileContext')"`).
  *
  * A preset row whose package is absent rejects the WHOLE mount, so every row
  * rides this probe: each is added only when its package resolves from the
@@ -1827,8 +1825,7 @@ function cleanupLegacyTrees(presetIds) {
  * @param {Function} [resolve] - predicate override for tests; receives a
  *   package specifier, resolves like `require.resolve`, returns boolean.
  * @returns {Promise<{timeContext: boolean, toolSchedule: boolean,
- *   pluginMarket: boolean, compaction: boolean, executorPlugin: boolean,
- *   profileContext: boolean}>}
+ *   pluginMarket: boolean, compaction: boolean, profileContext: boolean}>}
  */
 export async function probeHostExtras(ctx, resolve) {
   let ok = resolve
@@ -1843,12 +1840,11 @@ export async function probeHostExtras(ctx, resolve) {
       ok = () => false
     }
   }
-  const [timeContext, toolSchedule, pluginMarket, compaction, executorPlugin] = await Promise.all([
+  const [timeContext, toolSchedule, pluginMarket, compaction] = await Promise.all([
     Promise.resolve(safeProbe(ok, '@deepseek-ai/dsh-time-context')).then(Boolean),
     Promise.resolve(safeProbe(ok, '@deepseek-ai/dsh-tool-schedule')).then(Boolean),
     Promise.resolve(safeProbe(ok, '@deepseek-ai/dsh-plugin-market/tools')).then(Boolean),
     Promise.resolve(safeProbe(ok, '@deepseek-ai/dsh-compaction-basic')).then(Boolean),
-    Promise.resolve(safeProbe(ok, '@deepseek-ai/dsh-tool-executor-ptc')).then(Boolean),
   ])
   let profileContext = false
   try {
@@ -1856,7 +1852,7 @@ export async function probeHostExtras(ctx, resolve) {
   } catch {
     profileContext = false
   }
-  return { timeContext, toolSchedule, pluginMarket, compaction, executorPlugin, profileContext }
+  return { timeContext, toolSchedule, pluginMarket, compaction, profileContext }
 }
 
 /** Run one probe predicate; ANY failure reads as "absent" (a throwing
@@ -2304,18 +2300,18 @@ export async function apply(ctx, config = {}) {
           const dialect = liveSettings.dialect()
           const applies = dialectApplies(dialect, assembleContext && assembleContext.agent)
           // dsh 0.2.2-alpha.2 narrowed this event to prompt PRESENTATION: it no
-          // longer carries `tools` ("tool declarations remain provider-owned"),
-          // so read the same list back from the tools service; older hosts keep
-          // handing it over on the assembly.
-          const offeredTools = Array.isArray(assembly && assembly.tools)
-            ? assembly.tools
-            : (() => {
-                try {
-                  return ctx.get('tools')?.schemas?.(assembleContext && assembleContext.agent) ?? []
-                } catch {
-                  return []
-                }
-              })()
+          // longer carries `tools` ("tool declarations remain provider-owned").
+          // Read the step's admitted set back from the tools service — the same
+          // toolSet the agent loop resolved for this step, so conditional tools
+          // are judged exactly as execution will judge them.
+          const toolSet = assembleContext && assembleContext.toolSet
+          const offeredTools = (() => {
+            try {
+              return ctx.get('tools')?.schemas?.(assembleContext && assembleContext.agent, toolSet) ?? []
+            } catch {
+              return []
+            }
+          })()
           // Routing is dialect-independent and follows actual offered tools.
           // PTC may expose only run_code here: its generic SDK decision rule
           // relies on the registered bindings' own descriptions, not guessed