dsh-gitbash-shell 0.12.0 → 0.13.1

package/assets/minimal-gitbash/agent.cordis.ps.yml

@@ -7,13 +7,13 @@
 # change across the 0.1.1 → 0.1.2 code→ptc rename, so no agent.cordis.ptc.yml
 # twin exists here. The plugin probes the roster and writes this file as the
 # preset's own agent.cordis.yml either way.
-# The `minimal` agent preset: a fixed-prompt, two-tool coding-agent composition.
+# The `minimal` agent preset: a fixed-prompt, single-tool coding-agent composition.
 #
 # The persona is the complete system prompt, so global identity, Web orientation,
 # tool guidance, and later assembly listeners cannot add prompt text. Runtime
-# context snapshots are suppressed for this preset, and the model composes only
-# the persistent shell (Git for Windows bash; bash on POSIX) and
-# `str_replace_editor`. Context compaction is absent.
+# context snapshots are suppressed for this preset, and the model receives only
+# the persistent shell (Git for Windows bash; bash on POSIX). Context compaction
+# is absent.
 
 - id: persona
   name: '@deepseek-ai/dsh-persona'
@@ -51,8 +51,7 @@
         description: |-
           Run commands in a bash shell (Git for Windows bash on Windows: native paths like C:/... work, and PATH plus the rest of the environment are inherited from the host)
           * When invoking this tool, the contents of the "command" parameter does NOT need to be XML-escaped.
-          * You don't have access to the internet via this tool.
-          * You do have access to a mirror of common linux and python packages via apt and pip.
+          * Network access depends on the task environment. Prefer configured mirrors/proxies when they are available.
           * State is persistent across command calls and discussions with the user.
           * To inspect a particular line range of a file, e.g. lines 10-25, try 'sed -n 10,25p /path/to/the/file'.
           * Please avoid commands that may produce a very large amount of output.
@@ -78,21 +77,3 @@
           * Use native Windows paths (C:\...) and $env:NAME variables; this is PowerShell, not bash.
           * Please avoid commands that may produce a very large amount of output.
           * Please run long lived commands in the background, e.g. 'Start-Job' or start a server with Start-Process.
-
-# The bare local filesystem shadows the host's sandboxed provider only for this
-# preset. The editor shares that realm and requires absolute paths.
-- id: filesystem
-  name: cordis:group
-  group: true
-  isolate:
-    fs: true
-  config:
-    - id: fs-local
-      name: '@deepseek-ai/dsh-fs-local'
-      config:
-        cwd: !!js process.env.DSH_CWD ?? process.cwd()
-
-    - id: str-replace-editor
-      name: '@deepseek-ai/dsh-tool-str-replace-editor'
-      config:
-        maxOutputChars: 16000

package/assets/minimal-gitbash/agent.cordis.yml

@@ -2,13 +2,13 @@
 # change across the 0.1.1 → 0.1.2 code→ptc rename, so no agent.cordis.ptc.yml
 # twin exists here. The plugin probes the roster and writes this file as the
 # preset's own agent.cordis.yml either way.
-# The `minimal` agent preset: a fixed-prompt, two-tool coding-agent composition.
+# The `minimal` agent preset: a fixed-prompt, single-tool coding-agent composition.
 #
 # The persona is the complete system prompt, so global identity, Web orientation,
 # tool guidance, and later assembly listeners cannot add prompt text. Runtime
-# context snapshots are suppressed for this preset, and the model composes only
-# the persistent shell (Git for Windows bash; bash on POSIX) and
-# `str_replace_editor`. Context compaction is absent.
+# context snapshots are suppressed for this preset, and the model receives only
+# the persistent shell (Git for Windows bash; bash on POSIX). Context compaction
+# is absent.
 
 - id: persona
   name: '@deepseek-ai/dsh-persona'
@@ -46,8 +46,7 @@
         description: |-
           Run commands in a bash shell (Git for Windows bash on Windows: native paths like C:/... work, and PATH plus the rest of the environment are inherited from the host)
           * When invoking this tool, the contents of the "command" parameter does NOT need to be XML-escaped.
-          * You don't have access to the internet via this tool.
-          * You do have access to a mirror of common linux and python packages via apt and pip.
+          * Network access depends on the task environment. Prefer configured mirrors/proxies when they are available.
           * State is persistent across command calls and discussions with the user.
           * To inspect a particular line range of a file, e.g. lines 10-25, try 'sed -n 10,25p /path/to/the/file'.
           * Please avoid commands that may produce a very large amount of output.
@@ -73,21 +72,3 @@
           * Use native Windows paths (C:\...) and $env:NAME variables; this is PowerShell, not bash.
           * Please avoid commands that may produce a very large amount of output.
           * Please run long lived commands in the background, e.g. 'Start-Job' or start a server with Start-Process.
-
-# The bare local filesystem shadows the host's sandboxed provider only for this
-# preset. The editor shares that realm and requires absolute paths.
-- id: filesystem
-  name: cordis:group
-  group: true
-  isolate:
-    fs: true
-  config:
-    - id: fs-local
-      name: '@deepseek-ai/dsh-fs-local'
-      config:
-        cwd: !!js process.env.DSH_CWD ?? process.cwd()
-
-    - id: str-replace-editor
-      name: '@deepseek-ai/dsh-tool-str-replace-editor'
-      config:
-        maxOutputChars: 16000

package/assets/minimal-gitbash/preset.yml

@@ -1,3 +1,3 @@
 name: 极简模式 · Git Bash
-description: 仅提供持久 bash 与 str_replace_editor 的双工具编码 Agent。（Shell 使用 Git Bash）
+description: 仅提供持久 shell 的单工具编码 Agent。（Shell 使用 Git Bash）
 order: 3

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.12.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
@@ -224,11 +250,18 @@ function pickComposition(base, persona, available) {
 }
 
 /** Startup decision for an existing unmodified tree: 'refresh' or 'idle'. */
-function syncDecision({ state, marker, version, sourceHashes, base = 'code', persona = 'text' }) {
+function syncDecision({ state, marker, version, sourceHashes, base = 'code', persona = 'text', present = false }) {
   if (state !== 'unmodified' || !marker) return 'refresh'
   if (marker.version !== version) return 'refresh'
   if (marker.base !== base) return 'refresh'
   if ((marker.persona ?? 'text') !== persona) return 'refresh'
+  // Host-capability flip: @deepseek-ai/dsh-tool-present first shipped with dsh
+  // 0.1.5-alpha.2. A preset composed with the row on a host that lacks the
+  // package REJECTS THE WHOLE MOUNT (mount.ts: a row whose module failed to
+  // import already rejects the mount), so the row is injected only when the
+  // host resolves it — and a host upgrade past that point must re-materialize
+  // to gain it (same marker-dimension pattern as persona).
+  if ((marker.present ?? false) !== present) return 'refresh'
   const recorded = {}
   for (const k of Object.keys(marker.files)) if (k.startsWith('skills/')) recorded[k] = marker.files[k]
   if (sourceHashes === null) return Object.keys(recorded).length === 0 ? 'idle' : 'refresh'
@@ -241,14 +274,56 @@ function syncDecision({ state, marker, version, sourceHashes, base = 'code', per
 
 // ── materialization ─────────────────────────────────────────────────────────
 
+/*
+ * Conditional present-row injection (v0.13.0, dsh 0.1.5-alpha.2 sync). The
+ * official ptc/standard/cordis compositions appended `- id: present / name:
+ * '@deepseek-ai/dsh-tool-present'` (immutable file-delivery download cards).
+ * The row is NOT committed into the ptc-era twin files: a host older than
+ * 0.1.5-alpha.2 lacks the package, and a composition row that fails to
+ * import rejects the WHOLE preset mount. Instead the materializer probes the
+ * host (hostHasToolPresent) and splices the row in as PLAIN TEXT — anchor
+ * string surgery only, never a YAML round-trip, so !!js literals survive.
+ * Placement mirrors the official compositions: right after the
+ * tool-presentation block when the composition has one (all ptc-derived
+ * twins), otherwise appended at the tail (cordis/standard twins). Only
+ * `.ptc.` files are ever touched: code-era (<= 0.1.1) snapshots and the
+ * minimal variants are frozen history (official minimal never gained the
+ * row — it is the single-tool preset).
+ */
+const PRESENT_ROW = "\n- id: present\n  name: '@deepseek-ai/dsh-tool-present'\n"
+const PRESENT_ANCHOR = "  name: '@deepseek-ai/dsh-agent-tool-presentation'\n  config:\n    mode: ptc\n"
+
+function injectPresentRow(text) {
+  if (text.includes("'@deepseek-ai/dsh-tool-present'")) return text
+  const at = text.indexOf(PRESENT_ANCHOR)
+  if (at !== -1) return text.slice(0, at + PRESENT_ANCHOR.length) + PRESENT_ROW + text.slice(at + PRESENT_ANCHOR.length)
+  return text.endsWith('\n') ? text + PRESENT_ROW : text + '\n' + PRESENT_ROW
+}
+
+let toolPresentCache
+/** Probe whether THIS host can resolve the present package (cached per boot). */
+async function hostHasToolPresent() {
+  if (toolPresentCache !== undefined) return toolPresentCache
+  try {
+    const { createRequire } = await import('node:module')
+    createRequire(import.meta.url).resolve('@deepseek-ai/dsh-tool-present')
+    toolPresentCache = true
+  } catch {
+    toolPresentCache = false
+  }
+  return toolPresentCache
+}
+
 /** Write one preset directory from scratch. Returns 'ok' or 'no-skills-source'. */
-function materialize({ target, presetId, skillsSource, version, base = 'code', persona = 'text' }) {
+function materialize({ target, presetId, skillsSource, version, base = 'code', persona = 'text', present = false }) {
   rmSync(target, { recursive: true, force: true })
   mkdirSync(target, { recursive: true })
 
   const available = readdirSync(join(pkgDir, 'assets', presetId)).filter((f) => f.endsWith('.yml'))
   const compositionFile = pickComposition(base, persona, available)
-  writeFileSync(join(target, 'agent.cordis.yml'), readFileSync(join(pkgDir, 'assets', presetId, compositionFile)))
+  let composition = readFileSync(join(pkgDir, 'assets', presetId, compositionFile), 'utf8')
+  if (present && compositionFile.includes('.ptc.')) composition = injectPresentRow(composition)
+  writeFileSync(join(target, 'agent.cordis.yml'), composition)
   writeFileSync(join(target, 'preset.yml'), readFileSync(join(pkgDir, 'assets', presetId, 'preset.yml')))
 
   let skills = 'none'
@@ -262,7 +337,7 @@ function materialize({ target, presetId, skillsSource, version, base = 'code', p
     }
   }
 
-  const marker = { managedBy: MANAGED_BY, version, presetId, base, persona, files: hashTree(target) }
+  const marker = { managedBy: MANAGED_BY, version, presetId, base, persona, present, files: hashTree(target) }
   writeFileSync(join(target, MARKER_FILE), JSON.stringify(marker, null, 2) + '\n')
   return skills
 }
@@ -871,6 +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)
+  // 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)
 
@@ -900,12 +980,12 @@ export async function apply(ctx, config = {}) {
 
     const sourceHashes = presetId === 'cordis-gitbash' ? skillsHashes(skillsSource) : null
     const marker = readMarker(target)
-    if (state === 'unmodified' && syncDecision({ state, marker, version, sourceHashes, base, persona }) === 'idle') {
+    if (state === 'unmodified' && syncDecision({ state, marker, version, sourceHashes, base, persona, present }) === 'idle') {
       ctx.logger?.('gitbash-shell')?.debug?.( `preset '${presetId}' up to date (v${version}, ${base}-era${persona === 'split' ? ', persona-split' : ''}) — idle`)
       continue
     }
 
-    const skills = materialize({ target, presetId, skillsSource, version, base, persona })
+    const skills = materialize({ target, presetId, skillsSource, version, base, persona, present })
     const verb = state === 'absent' ? 'materialized' : 'refreshed'
     console.log(
       `${TAG} ${verb} preset '${presetId}' into ${userRootPath} (v${version}, ${base}-era composition${persona === 'split' ? ', persona-split' : ''})` +
@@ -915,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 }
+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 }