dsh-gitbash-shell 0.13.0 → 0.13.1

package/dsh.plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "dsh-external/dsh-gitbash-shell",
-  "version": "0.12.0",
+  "version": "0.13.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.13.0",
+  "version": "0.13.1",
   "description": "DSH plugin: run every agent shell command through Git for Windows bash on Windows instead of PowerShell. Replaces the pwsh executor with a Git Bash ctx.shell provider and materializes Git Bash variants of the standard/minimal/code/cordis agent presets into your user preset root at startup. On Windows it also adopts dsh-better-sidebar's terminal shell (UI tabs and the model-facing terminal_* tools) through the sidebar's official settings seam, and pairs with dsh-ptc-cordis-preset so the PTC Creation-mode preset materializes as its Git Bash variant. Ships both composition eras for dsh <= 0.1.1 (built-in preset id 'code') and dsh >= 0.1.2 (renamed id 'ptc') — the era is probed per boot and re-materialized automatically after a dsh upgrade, in either upgrade order; preset ids never change so pinned sessions stay valid.",
   "type": "module",
   "repository": {
@@ -41,7 +41,8 @@
     "LICENSE"
   ],
   "scripts": {
-    "test": "node --test tests/smoke.mjs"
+    "test": "node --test tests/smoke.mjs",
+    "version": "node -e \"const fs=require('fs');const m=JSON.parse(fs.readFileSync('dsh.plugin.json','utf8'));const v=JSON.parse(fs.readFileSync('package.json','utf8')).version;m.version=v;fs.writeFileSync('dsh.plugin.json',JSON.stringify(m,null,2)+'\\n')\" && git add dsh.plugin.json"
   },
   "keywords": [
     "dsh",

package/src/index.js

@@ -205,6 +205,32 @@ export async function detectPersonaEra(agentPresets) {
   }
 }
 
+/**
+ * Does the SHIPPED composition already carry the official `present` row? The
+ * row (`@deepseek-ai/dsh-tool-present`, immutable file-delivery download
+ * cards) first shipped with dsh 0.1.5-alpha.2, and a composition row that
+ * cannot be imported rejects the WHOLE preset mount — so the row is injected
+ * only on hosts whose own shipped presets have it. The live roster is the
+ * authority: package resolution alone would lie on CLI installs (first-party
+ * packages live outside the profile) and on linked development trees.
+ * `minimal` never gains the row (single-tool preset). Never throws.
+ */
+async function detectPresentSupport(agentPresets) {
+  try {
+    const list = await agentPresets.list()
+    const entries = Array.isArray(list) ? list : []
+    const entry = ['ptc', 'standard', 'cordis']
+      .map((id) => entries.find((p) => p && p.id === id && typeof p.path === 'string'))
+      .find(Boolean)
+    if (!entry) return false
+    const file = /\.yml$/.test(entry.path) ? entry.path : join(entry.path, 'agent.cordis.yml')
+    return readFileSync(file, 'utf8').includes("'@deepseek-ai/dsh-tool-present'")
+  } catch (error) {
+    console.log(`${TAG} present-row probe failed (${error?.message ?? error}) — not injecting the row`)
+    return false
+  }
+}
+
 /**
  * Pick the committed composition asset inside one variant directory (pure).
  * The ptc-era twin is preferred when the roster says `ptc`; the persona-split
@@ -920,7 +946,11 @@ export async function apply(ctx, config = {}) {
   const skillsSource = await findSkillsSource(ctx.agentPresets)
   const base = await detectBase(ctx.agentPresets)
   const persona = await detectPersonaEra(ctx.agentPresets)
-  const present = await hostHasToolPresent()
+  // Two independent signals, either of which is sufficient: the shipped
+  // composition text (authoritative on every install layout) and the package
+  // resolving from this plugin's own tree (covers hosts where the roster
+  // probe is unavailable).
+  const present = (await detectPresentSupport(ctx.agentPresets)) || (await hostHasToolPresent())
   const userRootPath = userRoot.path
   purgeOrphans(userRootPath, presetIds)
 
@@ -965,4 +995,4 @@ export async function apply(ctx, config = {}) {
 }
 
 // Test surface: pure helpers, no Cordis context required.
-export const _internal = { PRESET_IDS, translateMsysPath, translatePathArguments, readPosixPaths, windowsToMsys, rewriteResultPaths, MARKER_FILE, classify, materialize, cleanupOnDispose, firstUserRoot, hashTree, skillsHashes, syncDecision, installRegisterShim, baseForRoster, detectBase, pickComposition, personaEraForText, detectPersonaEra, injectPresentRow, hostHasToolPresent }
+export const _internal = { PRESET_IDS, translateMsysPath, translatePathArguments, readPosixPaths, windowsToMsys, rewriteResultPaths, MARKER_FILE, classify, materialize, cleanupOnDispose, firstUserRoot, hashTree, skillsHashes, syncDecision, installRegisterShim, baseForRoster, detectBase, pickComposition, personaEraForText, detectPersonaEra, injectPresentRow, hostHasToolPresent, detectPresentSupport }