dsh-plugin-prompt-tool 0.2.0 → 0.3.1

package/preset/near-anchor.mjs

@@ -33,9 +33,6 @@ const ANCHOR_INSPECT = "Start your reasoning with the exact sentence: 'We need t
 /** 复杂规划类：放行 Let 深度规划路径。 */
 const ANCHOR_DEEP = "Start your reasoning with the exact sentence: 'Let me think through the design before changing anything.'"
 
-/** Flash 模型附加三锚（回顾已完成 + 信息足够就产出 + 禁止环境检查/穷举）。 */
-const FLASH_ANCHORS = ' Before acting, briefly review what you have already done in this session and continue from where you left off; do not repeat completed steps. When you have gathered enough information, stop exploring and produce the deliverable. Do not run environment checks (echo, whoami, uname, node --version, date) or exhaustive grep/glob scans.'
-
 /** 生成消息 id：优先加密随机 id，旧运行时回退到随机串。 */
 function newMessageId() {
   return typeof crypto !== 'undefined' && typeof crypto.randomUUID === 'function'
@@ -60,7 +57,7 @@ function chooseAnchor(text, modelId, customText, useCustom) {
   if (COMPLEX_RE.test(text)) anchor = ANCHOR_DEEP
   else if (BUILD_RE.test(text)) anchor = ANCHOR_BUILD
   else anchor = ANCHOR_INSPECT
-  if (typeof modelId === 'string' && /flash/i.test(modelId)) return anchor + FLASH_ANCHORS
+  // Flash 主会话的 persona 已由 router-first-turn 注入三锚，这里不再重复。
   return anchor
 }
 

package/preset/router-first-turn.mjs

@@ -1,59 +1,70 @@
-/**
- * router-first-turn — prompt-tool 本地附加件（最优组合）。
- *
- * 依据 dsh-router-standard 的 router-bootstrap 组装逻辑：
- *   - 只替换 persona 段为官方训练原句，保留计划模式段与其他第三方
- *     section（applyPersona 语义，不是整段丢弃）；
- *   - 首轮隐藏 mnemon:* 自动注入段（记忆路由/热记忆上下文）并清空 contexts，
- *     晋升后两者都恢复——与 anchored-standard 的“首轮剥离自动注入”一致；
- *   - 子代理（委托深度 > 0）直接放行完整结果，保证 dsh-mnemon 等插件
- *     通过工具白名单要求的 mnemon_* 工具首轮可见。
- *
- * 工具目录裁剪仍由上游 tool-bootstrap 负责（首轮 = 真实 Minimal 工具对；
- * 晋升后 = resident 集），本模块不触碰 tools，避免两层过滤器冲突。
- * 计划模式段必须保留：router-standard 早期实测证明整段替换 section 会
- * 丢失 plan 边界，导致模型离开计划模式后重复探索（“失忆”问题）。
- */
-
-/** Cordis 插件名，供 loader 诊断使用。 */
-export const name = 'router-first-turn'
-
-/** 无服务依赖，只监听 system-prompt 组装。 */
-export const inject = []
-
-/** 官方 RL 训练原句（保持与 Minimal 预设逐字节一致）。 */
-const RL_PERSONA = 'You are a helpful software engineer assistant.'
-
-/** 是否为 persona 段：旧 persona 段由本模块替换。 */
-function isPersonaSection(section) {
-  if (section === null || typeof section !== 'object') return false
-  const name = String(section.name ?? '')
-  return name === 'persona' || /persona/i.test(name)
-}
-
-/** 首轮需要隐藏的 mnemon 自动注入段（晋升后恢复）。 */
-function isMnemonSection(section) {
-  if (section === null || typeof section !== 'object') return false
-  return String(section.name ?? '').startsWith('mnemon:')
-}
-
-export function apply(ctx) {
-  ctx.on('system-prompt/assemble', async (_assembly, context, next) => {
-    const assembled = await next()
-    const agent = context.agent
-    if (agent === undefined) return assembled
-    const session = agent.session
-    if (session === undefined) return assembled
-
-    // 子代理不裁剪任何 section/context：它与 dsh-mnemon 的工具白名单协作。
-    if ((session.header?.delegationDepth ?? 0) > 0) return assembled
-
-    const sections = assembled.sections ?? []
-    const promoted = session.events.some((event) => event.type === 'tool/call')
-    const kept = sections.filter((section) => !isPersonaSection(section) && (promoted || !isMnemonSection(section)))
-    const routerSections = [...kept, { name: 'router-persona', text: RL_PERSONA, order: 0 }]
-    return promoted
-      ? { ...assembled, sections: routerSections }
-      : { ...assembled, sections: routerSections, contexts: [] }
-  })
-}
+/**
+ * router-first-turn — prompt-tool 本地附加件（最优组合）。
+ *
+ * 依据 dsh-router-standard 的 router-bootstrap 组装逻辑：
+ *   - 只替换 persona 段，保留计划模式段与其他第三方 section；
+ *   - 首轮隐藏 mnemon:* 自动注入段并清空 contexts，晋升后恢复；
+ *   - 按主会话模型自动选择 persona：
+ *       Pro  → 官方训练原句；
+ *       Flash → dsh-router-standard 的 Flash 弱路由人设（build/fix 分类 +
+ *               回顾锚 + 收敛锚 + 反跑题锚 + 先深想再产出）；
+ *   - 子代理（委托深度 > 0）直接放行完整结果，保证 dsh-mnemon 等插件
+ *     通过工具白名单要求的 mnemon_* 工具首轮可见。
+ *
+ * 工具目录裁剪仍由上游 tool-bootstrap 负责（首轮 = 真实 Minimal 工具对；
+ * 晋升后 = resident 集），本模块不触碰 tools，避免两层过滤器冲突。
+ */
+
+/** Cordis 插件名，供 loader 诊断使用。 */
+export const name = 'router-first-turn'
+
+/** 无服务依赖，只监听 system-prompt 组装。 */
+export const inject = []
+
+/** 官方 RL 训练原句（保持与 Minimal 预设逐字节一致）。 */
+const RL_PERSONA = 'You are a helpful software engineer assistant.'
+
+/** dsh-router-standard 的 Flash 弱路由人设（build/fix 分类 + 三锚 + 深想）。 */
+const FLASH_PERSONA = [
+  'You are a helpful assistant.',
+  'Before acting, decide the task type (build or fix) and adopt the matching style: build → hands-on production; fix → inspect-and-plan.',
+  'Before acting, briefly review what you have already done in this session and continue from where you left off; do not repeat completed steps. Do not run environment checks (echo, whoami, uname, node --version, date) or exhaustive grep/glob scans.',
+  'Think deeply first, then produce.',
+].join('\n')
+
+/** 是否为 persona 段：旧 persona 段由本模块替换。 */
+function isPersonaSection(section) {
+  if (section === null || typeof section !== 'object') return false
+  const name = String(section.name ?? '')
+  return name === 'persona' || /persona/i.test(name)
+}
+
+/** 首轮需要隐藏的 mnemon 自动注入段（晋升后恢复）。 */
+function isMnemonSection(section) {
+  if (section === null || typeof section !== 'object') return false
+  return String(section.name ?? '').startsWith('mnemon:')
+}
+
+export function apply(ctx) {
+  ctx.on('system-prompt/assemble', async (_assembly, context, next) => {
+    const assembled = await next()
+    const agent = context.agent
+    if (agent === undefined) return assembled
+    const session = agent.session
+    if (session === undefined) return assembled
+
+    // 子代理不裁剪任何 section/context：它与 dsh-mnemon 的工具白名单协作。
+    if ((session.header?.delegationDepth ?? 0) > 0) return assembled
+
+    const modelId = agent.options?.model
+    const persona = typeof modelId === 'string' && /flash/i.test(modelId) ? FLASH_PERSONA : RL_PERSONA
+
+    const sections = assembled.sections ?? []
+    const promoted = session.events.some((event) => event.type === 'tool/call')
+    const kept = sections.filter((section) => !isPersonaSection(section) && (promoted || !isMnemonSection(section)))
+    const routerSections = [...kept, { name: 'router-persona', text: persona, order: 0 }]
+    return promoted
+      ? { ...assembled, sections: routerSections }
+      : { ...assembled, sections: routerSections, contexts: [] }
+  })
+}

package/preset/router-guide.mjs

@@ -0,0 +1,85 @@
+/**
+ * router-guide — Flash 主会话每轮近距离深度引导（dsh-router-standard 方案）。
+ *
+ * 只在主会话模型为 Flash、且会话已晋升后启用；每个真实用户消息之后追加一条
+ * 固定引导（近距离零衰减，缓存友好）：
+ *   - 复杂任务：深度引导（架构/边界/集成点，信息足够就产出，每块以决策或信息缺口收尾）；
+ *   - 简单任务：快速收敛引导（分类 + 直接产出）。
+ * config.useCustom=true 时 Pro 与 Flash 一样每轮注入：文本未改动默认值时按
+ * 任务自动选择 GUIDE_WEAK/GUIDE_DEEP，改动后固定使用 config.text；空文本不注入。
+ * false（默认）时自动模式仅 Flash 主会话注入（router 实测 Pro 不需要）。
+ * 子代理不注入；首轮不注入（首句锚定由 near-anchor 负责）。
+ */
+
+/** Cordis 插件名，供 loader 诊断使用。 */
+export const name = 'router-guide'
+
+/** 无服务依赖，只监听 pre-step 消息组装。 */
+export const inject = []
+
+/** 复杂任务判定：长度或架构关键词。 */
+const COMPLEX_RE = /(架构|重构|全面|详细|设计|系统|优化|分析|architecture|refactor|comprehensive|detailed|design|system|optimize|analyze)/i
+
+const GUIDE_WEAK = '\nRouter: classify this task (build or fix) now, then adopt the matching style — build: direct production; fix: inspect-first. Think deeply first, then commit and act.'
+const GUIDE_DEEP = '\nRouter: classify this task (build or fix) now, then adopt the matching style — build: direct production; fix: inspect-first. Think deeply about the architecture, edge cases, and integration points. Do not spend reasoning on the environment or tooling. Produce when your information is complete. End each reasoning block with a decision or an information need.'
+
+function newMessageId() {
+  return typeof crypto !== 'undefined' && typeof crypto.randomUUID === 'function'
+    ? crypto.randomUUID()
+    : `router-guide-${Date.now()}-${Math.random().toString(36).slice(2)}`
+}
+
+function extractText(message) {
+  if (!message) return ''
+  const content = Array.isArray(message.content) ? message.content : []
+  return content.map((block) => (typeof block === 'string' ? block : (block?.text ?? ''))).join(' ').trim()
+}
+
+export function apply(ctx, config) {
+  const useCustom = config?.useCustom === true
+  const customText = typeof config?.text === 'string' ? config.text : ''
+  const enabled = config?.enabled !== false
+  // 与宿主写入的默认内容一致：打开自定义但未改动默认文本时，等价自动模式。
+  const DEFAULT_GUIDE_TEXT = ['简单任务自动引导：', GUIDE_WEAK.trim(), '', '复杂任务自动引导：', GUIDE_DEEP.trim()].join('\n')
+  const unchangedDefault = customText.trim() === DEFAULT_GUIDE_TEXT.trim()
+  const effectiveAuto = !useCustom || unchangedDefault
+
+  ctx.on('agent/pre-step', async ({ agent }, next) => {
+    const decision = await next()
+    if (decision.kind === 'reject' || !enabled) return decision
+    if (agent === undefined) return decision
+    const session = agent.session
+    if (session === undefined) return decision
+    // 子代理不注入。
+    if ((session.header?.delegationDepth ?? 0) > 0) return decision
+    // 自动模式只对 Flash 主会话注入；自定义开关打开后，Pro 与 Flash 一样注入。
+    const modelId = agent.options?.model
+    const isFlash = typeof modelId === 'string' && /flash/i.test(modelId)
+    if (!useCustom && !isFlash) return decision
+    // 晋升后才注入（首轮由 near-anchor 负责）。
+    const promoted = session.events.some((event) => event.type === 'tool/call' || event.type === 'assistant/message')
+    if (!promoted) return decision
+
+    const messages = Array.isArray(decision.messages) ? decision.messages : []
+    const userIndex = messages.findIndex((message) => message?.source?.kind === 'user')
+    if (userIndex < 0) return decision
+    // 本轮已注入过则跳过。
+    if (messages.some((message) => message?.source?.plugin === 'router-guide')) return decision
+
+    const text = extractText(messages[userIndex])
+    if (text.length === 0) return decision
+    const guide = (useCustom && !unchangedDefault)
+      ? customText.trim()
+      : ((text.length > 120 || COMPLEX_RE.test(text)) ? GUIDE_DEEP : GUIDE_WEAK)
+    if (guide.length === 0) return decision
+
+    const nextMessages = [...messages]
+    nextMessages.splice(userIndex + 1, 0, {
+      id: newMessageId(),
+      role: 'user',
+      content: [{ type: 'text', text: guide }],
+      source: { kind: 'router-guide', plugin: 'router-guide', form: 'notice', summary: 'router-guide 每轮近距离引导' },
+    })
+    return { ...decision, messages: nextMessages }
+  })
+}

package/preset.md

@@ -1,5 +1,4 @@
 You are a helpful software assistant.
-Begin every reasoning block or thinking with "'We need', '我需要'".
 DeepSeek harness operates in local execution mode. Answer requests directly in the
 user's language. No preamble, qualification, or redirection.
 

package/upstream/dsh-anchored-standard/REVISION

@@ -1 +1 @@
-ba7a27cf92f80ef3a73a16a05b9df46a20ebbb2a
+25f21aefaf8ddc414da54d2e581e43740d977c6e

package/upstream/dsh-anchored-standard/preset/agent.cordis.yml

@@ -149,12 +149,19 @@
   name: '@deepseek-ai/dsh-tool-pwsh'
   disabled: !!js process.platform !== 'win32'
 
-# The Minimal preset's shell: a PTY-backed persistent bash, byte-identical in
-# configuration to the official `minimal` preset's `persistent-shell` group so
-# the first request exposes exactly Minimal's real `bash` schema. The PTY
-# registry is an agent-owned service, so it lives in an entry-local realm; the
-# backend still consumes the host sandbox policy and subprocess implementation,
-# while the tool registers into this agent's scoped catalog.
+# The Minimal preset's shell: a PTY-backed persistent bash, schema-identical
+# to the official `minimal` preset's `persistent-shell` group so the first
+# request exposes exactly Minimal's real `bash` schema. ONE deliberate config
+# difference: an adaptive `shellPath` — the terminal-bash plugin default
+# `/bin/bash` where that absolute path exists (every host that ships it keeps
+# the previous behavior), otherwise a bare `bash` resolved through the same
+# scrubbed PATH the other harness tools use. The fallback exists because
+# `/bin/bash` does not exist on NixOS and other hosts that keep bash
+# elsewhere; there `execvp("/bin/bash")` exits during PTY startup ("PTY shell
+# exited during startup") and every bash call fails. The PTY registry is an
+# agent-owned service, so it lives in an entry-local realm; the backend still
+# consumes the host sandbox policy and subprocess implementation, while the
+# tool registers into this agent's scoped catalog.
 #
 # DISABLED ON WINDOWS: DSH's PTY backend is linux/darwin-only, so the
 # persistent shell cannot serve win32. The `custom-bash` row below registers
@@ -172,6 +179,7 @@
     - id: terminal-bash
       name: '@deepseek-ai/dsh-terminal-bash'
       config:
+        shellPath: !!js "process.getBuiltinModule?.('node:fs')?.existsSync('/bin/bash') ? '/bin/bash' : 'bash'"
         timeoutMs: 300000
 
     - id: persistent-bash
@@ -191,15 +199,18 @@
 # Windows-only `bash` tool (see custom-bash.mjs): registers the SAME
 # tool name as the persistent shell with a Minimal-compatible description, but
 # executes through the ordinary cross-platform subprocess seam (`bash -c`)
-# instead of a PTY. `bashPath` defaults to `bash` on PATH; point it at Git
-# Bash explicitly when the WSL shim would otherwise be picked up. No OS
+# instead of a PTY. The shell is resolved WITHOUT a hardcoded install path
+# (issue #24): `bashPath` unset probes the `git` executable's install root,
+# then the well-known Git-for-Windows roots (Program Files(/x86), per-user
+# LOCALAPPDATA, scoop's `current` junction), then plain `bash` on PATH — set
+# `bashPath` explicitly only to pin a shell that probing cannot find. No OS
 # sandbox confinement on Windows (landlock is linux-only); the tool
-# description says so.
+# description says so. When no bash exists at all the tool errors with
+# guidance instead of switching shells — pwsh stays its own tool in the
+# promoted catalog.
 - id: custom-bash
   name: ./custom-bash.mjs
   disabled: !!js process.platform !== 'win32'
-  config:
-    bashPath: 'C:\Program Files\Git\bin\bash.exe'
 
 # ── filesystem ──────────────────────────────────────────────────────────────
 

package/upstream/dsh-anchored-standard/preset/custom-bash.mjs

@@ -13,9 +13,27 @@
  * the ordinary (cross-platform) subprocess seam keeps the schema anchor
  * without the PTY dependency.
  *
- * Executable resolution (config `bashPath`):
- *  - explicit absolute path (e.g. `C:\Program Files\Git\bin\bash.exe`), or
- *  - `bash` resolved through `ctx.subprocess.resolveExecutable` (PATH lookup).
+ * Executable resolution (config `bashPath`, issue #24 — no hardcoded install
+ * path): an explicit non-empty `bashPath` wins unconditionally. Unset, the
+ * Git Bash executable is INFERRED, in probe order:
+ *  1. the `git` executable on PATH — its install root carries `bin\bash.exe`
+ *     one level up from `cmd\`, beside `bin\`, or two levels up from
+ *     `mingw64\bin\` (the standard installer, choco, and winget all resolve
+ *     here; a scoop SHIM does not — its directory is the shims root, not the
+ *     app — which is what step 2 covers);
+ *  2. the well-known Git-for-Windows roots derived from environment variables
+ *     (`ProgramFiles`, `ProgramFiles(x86)`, per-user `LOCALAPPDATA\Programs
+ *     \Git`, scoop's `~\scoop\apps\git\current` junction);
+ *  3. plain `bash` through `ctx.subprocess.resolveExecutable` (PATH lookup —
+ *     last resort, since on Windows that may pick the WSL shim; WSL bash is
+ *     still true bash, only the filesystem paths shift to /mnt/…).
+ *
+ * If NOTHING resolves, the tool fails with an actionable error naming the
+ * remedies — it does NOT silently execute under a different shell: the
+ * schema above promises `bash -c` semantics, and pwsh/cmd are different
+ * command languages. PowerShell stays available as its OWN tool (`pwsh`,
+ * present in the promoted catalog on Windows, unlockable via
+ * dev_tool_search).
  *
  * Semantics mirror the official bash tool: `bash -c <command>` in a fresh
  * process, bounded output, non-zero exit reported not thrown. No sandbox
@@ -24,6 +42,9 @@
  * `str_replace_editor` (Minimal's two tools).
  */
 
+import { access } from 'node:fs/promises'
+import { dirname, join } from 'node:path'
+
 /** Cordis plugin name used by loader diagnostics. */
 export const name = 'custom-bash'
 
@@ -33,6 +54,34 @@ export const inject = ['subprocess', 'tools']
 const DEFAULT_TIMEOUT_MS = 120000
 const DEFAULT_MAX_OUTPUT_BYTES = 64000
 
+/**
+ * Git Bash candidate paths, in probe order (see the header): the `git`
+ * executable's install root first, then the well-known env-derived roots.
+ * Exported for tests; pure — existence probing happens at the call site.
+ */
+export function bashCandidates(env, gitExe) {
+  const candidates = []
+  // git at <root>\cmd\git.exe (installer/scoop) or <root>\bin\git.exe →
+  // <root>\bin\bash.exe; <root>\mingw64\bin\git.exe (portable) → two up.
+  // A bare relative name means `git` did not actually resolve to a path.
+  if (typeof gitExe === 'string' && /[/\\]/.test(gitExe)) {
+    const dir = dirname(gitExe)
+    const root = dirname(dir)
+    candidates.push(
+      join(root, 'bin', 'bash.exe'),
+      join(dir, 'bash.exe'),
+      join(dirname(root), 'bin', 'bash.exe'),
+    )
+  }
+  if (env.ProgramFiles) candidates.push(join(env.ProgramFiles, 'Git', 'bin', 'bash.exe'))
+  if (env['ProgramFiles(x86)']) candidates.push(join(env['ProgramFiles(x86)'], 'Git', 'bin', 'bash.exe'))
+  if (env.LOCALAPPDATA) candidates.push(join(env.LOCALAPPDATA, 'Programs', 'Git', 'bin', 'bash.exe'))
+  if (env.USERPROFILE) candidates.push(join(env.USERPROFILE, 'scoop', 'apps', 'git', 'current', 'bin', 'bash.exe'))
+  // Layouts overlap (a `bin` git.exe derives the same bash twice) — probe
+  // order survives the dedupe, insertion order is preserved.
+  return [...new Set(candidates)]
+}
+
 /** Tool parameter schema for the model-facing command. */
 const commandSchema = {
   type: 'object',
@@ -52,10 +101,54 @@ const commandSchema = {
 
 /** Register the model-facing `bash` tool. */
 export function apply(ctx, config) {
-  const bashPath = typeof config?.bashPath === 'string' && config.bashPath.length > 0 ? config.bashPath : 'bash'
+  const explicitBashPath = typeof config?.bashPath === 'string' && config.bashPath.length > 0 ? config.bashPath : undefined
   const timeoutMs = Number.isSafeInteger(config?.timeoutMs) && config.timeoutMs > 0 ? config.timeoutMs : DEFAULT_TIMEOUT_MS
   const maxOutputBytes = Number.isSafeInteger(config?.maxOutputBytes) && config.maxOutputBytes > 0 ? config.maxOutputBytes : DEFAULT_MAX_OUTPUT_BYTES
 
+  // The inferred executable is memoized per plugin instance: candidate probing
+  // walks the filesystem, and the answer cannot change within a mount. A
+  // failed inference is NOT memoized — the plain `bash` fallback resolves
+  // fresh on every execute until some probe succeeds.
+  let inferredShell
+  const exists = (path) => access(path).then(() => true, () => false)
+  const resolveShell = async (signal) => {
+    if (explicitBashPath !== undefined) {
+      // A misconfigured explicit path must fail as itself, not as a
+      // discovery miss — the raw resolution error says which path failed.
+      return ctx.subprocess.resolveExecutable(explicitBashPath, undefined, signal)
+    }
+    if (inferredShell !== undefined) {
+      return ctx.subprocess.resolveExecutable(inferredShell, undefined, signal)
+    }
+    let gitExe
+    try {
+      gitExe = await ctx.subprocess.resolveExecutable('git', undefined, signal)
+    } catch {
+      // git unresolvable → the env-derived candidates below still apply
+    }
+    for (const candidate of bashCandidates(process.env, gitExe)) {
+      if (!(await exists(candidate))) continue
+      try {
+        inferredShell = await ctx.subprocess.resolveExecutable(candidate, undefined, signal)
+        return inferredShell
+      } catch {
+        // Exists but unresolvable (EPERM, a broken scoop junction): keep
+        // probing — one bad root must not block the rest of the chain, and
+        // nothing is memoized so later executes can still find a good one.
+        continue
+      }
+    }
+    try {
+      return await ctx.subprocess.resolveExecutable('bash', undefined, signal)
+    } catch (error) {
+      // Total discovery failure (no Git Bash root, no env root, no bash on
+      // PATH): name the remedies instead of leaking a raw ENOENT. Never
+      // fall back to pwsh/cmd here — the schema promises `bash -c`
+      // semantics; a different shell would silently break every command.
+      throw new Error(`bash executable not found — install Git for Windows, expose a bash on PATH, or set the custom-bash \`bashPath\` config (${String((error && error.message) || error)})`)
+    }
+  }
+
   ctx.tools.register({
     name: 'bash',
     description: [
@@ -81,7 +174,7 @@ export function apply(ctx, config) {
       render: (_args, value) => [{ type: 'text', text: value.text }],
     },
     async execute(args, exec) {
-      const shell = await ctx.subprocess.resolveExecutable(bashPath, undefined, exec?.signal)
+      const shell = await resolveShell(exec?.signal)
       const workdir = typeof args.workdir === 'string' && args.workdir.length > 0
         ? args.workdir
         : exec?.agent?.session?.header?.cwd