@mzzsfy/dsh-shell-select 0.4.1 → 0.4.4

package/test/client-render.test.mjs

@@ -10,7 +10,7 @@ import { dirname, join } from 'node:path'
 const here = dirname(fileURLToPath(import.meta.url))
 const source = readFileSync(join(here, '..', 'src', 'client.js'), 'utf8')
 
-function reactStub() {
+function reactStub(expanded = false) {
   // 函数组件即时执行(模拟渲染语义):组件体内的未定义引用/坏访问当场抛出
   const createElement = (type, props, ...children) => {
     if (typeof type === 'function') return type(props ?? {})
@@ -18,14 +18,14 @@ function reactStub() {
   }
   return {
     createElement,
-    useState: (init) => [typeof init === 'function' ? init() : init, () => {}],
+    useState: (init) => [expanded || (typeof init === 'function' ? init() : init), () => {}],
     useEffect: () => {},
   }
 }
 
 // 加载 client.js 并执行 apply,返回 slots 注册面
-function loadClient() {
-  const React = reactStub()
+function loadClient(expanded = false) {
+  const React = reactStub(expanded)
   const registrations = []
   const slots = {
     inject: (_name, factory) => factory(),
@@ -70,6 +70,39 @@ function settledBlock(argsRaw, text) {
   }
 }
 
+test('直接 pwsh 接管:折叠与展开都有独立徽章，复制输出剥离事实标记', () => {
+  // Given 已接管 pwsh 结果；When折叠/展开渲染；Then徽章可见且输出不泄露内部标记。
+  const args = JSON.stringify({ command: 'Get-Date', description: 'probe' })
+  for (const expanded of [false, true]) {
+    const component = toolviewOf(loadClient(expanded), 'pwsh')
+    const block = settledBlock(args, 'out\n[exit code: 2]')
+    block.content.push({ type: 'shell-select-takeover', tool: 'pwsh' })
+    const element = component({ block, cwd: 'C:\\repo' })
+    const nodes = []
+    const walk = (node) => { if (!node || typeof node !== 'object') return; if (Array.isArray(node)) return node.forEach(walk); nodes.push(node); node.children?.forEach(walk) }
+    walk(element)
+    assert.ok(nodes.some(node => node.props?.className === 'sls-tv__takeover' && node.children.includes('插件接管')))
+    assert.doesNotMatch(JSON.stringify(element), /\[shell-select: pwsh takeover\]/)
+    if (expanded) assert.ok(nodes.some(node => node.props?.className === 'sls-tv__badge' && node.children.includes('pwsh')))
+  }
+})
+
+test('历史 stdout 恰含标记也不得冒充接管事实或丢失输出', () => {
+  // Given历史pwsh stdout含旧标记；When展开；Then没有接管徽章且原文保留。
+  const element = toolviewOf(loadClient(true), 'pwsh')({ block: settledBlock(JSON.stringify({ command: 'Write-Output marker', description: 'history' }), '[shell-select: pwsh takeover]'), cwd: 'C:\\repo' })
+  assert.doesNotMatch(JSON.stringify(element), /插件接管/)
+  assert.match(JSON.stringify(element), /\[shell-select: pwsh takeover\]/)
+})
+
+test('未标记历史 pwsh 与普通 shell 不显示接管徽章', () => {
+  // Given普通/历史结果；When渲染；Then不由工具名或当前配置臆测接管。
+  const args = JSON.stringify({ command: 'echo x', description: 'probe' })
+  for (const key of ['pwsh', 'shell']) {
+    const element = toolviewOf(loadClient(true), key)({ block: settledBlock(args, 'out'), cwd: 'C:\\repo' })
+    assert.doesNotMatch(JSON.stringify(element), /插件接管/)
+  }
+})
+
 test('渲染守卫:settled terminal 调用组件执行不抛(引用完整)', () => {
   const component = toolviewOf(loadClient(), 'shell')
   const element = component({
@@ -108,13 +141,6 @@ test('渲染守卫:后台 ack 块(默认收起行 + 任务号徽标)组件执行
   assert.notEqual(element, undefined)
 })
 
-test('设置卡注册:settings.section 单卡 id shell-select', () => {
-  const registrations = loadClient()
-  const card = registrations.find((item) => item.meta.name === 'settings.section')
-  assert.notEqual(card, undefined)
-  assert.equal(card.meta.id, 'shell-select')
-})
-
 test('图标名守卫:0.1.7 primitives 字重后缀名在场,尺寸后缀旧名不在首选位', () => {
   // 0.1.7 图标改名:尺寸从名字移除(IconApiOutline14 → IconApiOutlineRegular/Medium),
   // 旧名 miss 使 IconApi 落淡灰 fallback 被当成"空白 icon"(实测事故)
@@ -156,7 +182,7 @@ test('hooks 恒序守卫:组件内 hook 调用必须全部位于第一个提前
     const m = /return h\(/.exec(scope)
     return m === null ? Number.POSITIVE_INFINITY : beginLine + scope.slice(0, m.index).split('\n').length - 1
   }
-  for (const name of ['ShellToolRow', 'GenericShellRow', 'CopyButton', 'RunningDuration', 'ShellSelectApp']) {
+  for (const name of ['ShellToolRow', 'GenericShellRow', 'CopyButton', 'RunningDuration']) {
     const { hookLines } = extract(name)
     const scopeBody = source.slice(source.indexOf(`function ${name}(`))
     const end = scopeBody.indexOf('\n    function ', 1)

package/test/client-settings.test.mjs

@@ -0,0 +1,251 @@
+import { test } from 'node:test'
+import assert from 'node:assert/strict'
+import { readFileSync } from 'node:fs'
+
+const source = readFileSync(new URL('../src/client.js', import.meta.url), 'utf8')
+const section = () => ({
+  default: 'git-bash', deny: ['^format\\s', ' foo ', ' ', 'echo\nsecret'], timeoutMs: 120000,
+  shells: [
+    { id: 'git-bash', kind: 'bash', path: '', args: ['-c', 'echo two words', '{command}', '', 'a"b', "a'b", 'C:\\path', 'line\nbreak', 'tab\tcr\r', "$'literal'", 'C:\\tail\\'], env: { NOTE: 'a=b c', MULTI: 'line1\nOTHER=two', PATH: 'C:\\temp\\file', LITERAL: '\\n', QUOTED: '"literal"', CR: 'first\rsecond', TRAIL: 'C:\\temp\\' }, login: true, distro: '' },
+    { id: 'pwsh', kind: 'pwsh', path: '', args: [], env: {}, login: false, distro: '' },
+  ],
+  resolved: { default: 'git-bash', shells: [{ id: 'git-bash', available: true, path: 'C:/Git/bash.exe' }, { id: 'pwsh', available: true }] },
+})
+
+async function page({ failLoad = false, failSave = false, failReadBack = false } = {}) {
+  const state = [], effects = [], registrations = [], requests = []
+  let cursor = 0, effectCursor = 0, loaded
+  const React = {
+    createElement: (type, props, ...children) => typeof type === 'function' ? type(props ?? {}) : { type, props: props ?? {}, children },
+    useState(initial) {
+      const at = cursor++
+      if (!(at in state)) state[at] = typeof initial === 'function' ? initial() : initial
+      return [state[at], (next) => { state[at] = typeof next === 'function' ? next(state[at]) : next }]
+    },
+    useEffect(fn, deps) {
+      const at = effectCursor++
+      const prior = effects[at]
+      if (!prior || deps.some((value, index) => value !== prior.deps[index])) {
+        prior?.cleanup?.()
+        effects[at] = { fn, deps, pending: true }
+      }
+    },
+  }
+  const window = { __ModuleLoader__: { load: (value) => { loaded = value } } }
+  const document = { documentElement: { lang: 'zh' }, createElement: () => ({ setAttribute() {}, remove() {} }), head: { appendChild() {} } }
+  let current = section()
+  const fetch = async (path, options = {}) => {
+    requests.push({ path, ...options })
+    if (path.endsWith('/probe')) return { ok: true, json: async () => ({ exists: true }) }
+    if (path.endsWith('/detect')) return { ok: true, json: async () => ({ found: [{ path: 'C:/Git/bash.exe' }] }) }
+    if (failReadBack && options.method !== 'POST' && requests.some((row) => row.method === 'POST')) return { ok: false, status: 503, json: async () => ({ error: '回读故障' }) }
+    if (failLoad && options.method !== 'POST') return { ok: false, status: 503, json: async () => ({ error: '加载故障' }) }
+    if (options.method === 'POST') {
+      if (failSave) return { ok: false, status: 400, json: async () => ({ error: '写入故障' }) }
+      current = { ...JSON.parse(options.body), resolved: current.resolved }
+      return { ok: true, json: async () => ({ ok: true, resolved: current.resolved }) }
+    }
+    return { ok: true, json: async () => structuredClone(current) }
+  }
+  new Function('window', 'document', 'navigator', 'fetch', source)(window, document, {}, fetch)
+  loaded.factory((name) => { if (name === 'react') return React; throw new Error(name) }).apply({
+    effect: (fn) => fn(), slots: { inject: (_name, fn) => fn(), register: (meta, component) => { const entry = { meta, component }; registrations.push(entry); return () => registrations.splice(registrations.indexOf(entry), 1) } },
+  })
+  const view = registrations.find(({ meta }) => meta.name === 'settings.section' && meta.id === 'shell-select')
+  assert.ok(view, '设置导航缺少 shell-select 页面')
+  assert.equal(view.meta.label, 'Shell 管理')
+  const render = () => { cursor = 0; effectCursor = 0; return view.component() }
+  const flush = async () => {
+    for (const effect of effects) if (effect.pending) { effect.pending = false; effect.cleanup = effect.fn() }
+    await new Promise(setImmediate)
+  }
+  const initial = render()
+  await flush()
+  const nodes = (tree) => {
+    const found = []
+    const walk = (node) => { if (Array.isArray(node)) return node.forEach(walk); if (!node || typeof node !== 'object') return; found.push(node); node.children?.forEach(walk) }
+    walk(tree)
+    return found
+  }
+  const button = (tree, label) => nodes(tree).find((node) => node.type === 'button' && node.children.includes(label))
+  const field = (tree, label) => nodes(tree).find((node) => node.props['aria-label'] === label)
+  const dirty = () => {
+    const input = field(render(), '客户端 1 id')
+    input.props.onChange({ target: { value: input.props.value } })
+  }
+  return { initial, render, flush, nodes, button, field, dirty, requests, restoreLoad: () => { failLoad = false } }
+}
+
+// Given 插件启用；When 打开设置；Then 页面注册并加载当前配置而非出厂值。
+test('设置入口:注册 Shell 管理并展示当前客户端、默认值与加载状态', async () => {
+  const p = await page()
+  assert.match(JSON.stringify(p.initial), /加载中/)
+  const tree = p.render()
+  assert.equal(p.field(tree, '客户端 1 默认').props.checked, true)
+  assert.equal(p.field(tree, '客户端 1 默认').props.type, 'radio')
+  assert.equal(p.field(tree, '客户端 1 id').props.value, 'git-bash')
+  assert.equal(p.button(tree, '保存').props.disabled, true)
+  assert.equal(p.field(tree, '客户端 1 参数').type, 'input')
+  assert.match(p.field(tree, '客户端 1 环境').props.value, /^NOTE=a=b c\nMULTI=/)
+  assert.equal(p.field(tree, '黑名单第 2 条').props.value, ' foo ')
+  assert.equal(p.field(tree, '默认客户端'), undefined)
+  p.field(tree, '客户端 2 默认').props.onChange()
+  assert.equal(p.field(p.render(), '客户端 2 默认').props.checked, true)
+  assert.equal(p.button(p.render(), '保存').props.disabled, false)
+})
+
+// Given 已有含空格参数和环境值；When 保存；Then 完整保留客户端字段、deny 与顶层配置。
+test('保存:参数、环境、黑名单及预算字段无损往返', async () => {
+  const p = await page()
+  p.dirty()
+  await p.button(p.render(), '保存').props.onClick()
+  assert.equal(p.button(p.render(), '保存').props.disabled, true)
+  const written = JSON.parse(p.requests.find((row) => row.method === 'POST').body)
+  assert.deepEqual(written.shells, section().shells)
+  assert.deepEqual(written.deny, section().deny)
+  assert.equal(written.timeoutMs, 120000)
+  assert.equal(written.default, 'git-bash')
+  assert.ok(!('resolved' in written))
+  assert.match(JSON.stringify(p.render()), /已保存/)
+})
+
+// Given 多个客户端；When 改默认 id 或删除默认项；Then 默认值始终指向现有客户端。
+test('编辑:重命名及删除默认客户端同步更新默认值', async () => {
+  const p = await page()
+  p.field(p.render(), '客户端 1 id').props.onChange({ target: { value: 'bash-local' } })
+  assert.equal(p.field(p.render(), '客户端 1 默认').props.checked, true)
+  p.nodes(p.render()).find((node) => node.props['aria-label'] === '移除客户端 1').props.onClick()
+  assert.equal(p.field(p.render(), '客户端 1 默认').props.checked, true)
+})
+
+test('编辑:多个同类客户端可新增并保存独立 id', async () => {
+  const p = await page()
+  p.button(p.render(), '添加客户端').props.onClick()
+  p.field(p.render(), '客户端 3 id').props.onChange({ target: { value: 'bash-extra' } })
+  await p.button(p.render(), '保存').props.onClick()
+  const payload = JSON.parse(p.requests.find((row) => row.method === 'POST').body)
+  assert.deepEqual(payload.shells.map((entry) => entry.id), ['git-bash', 'pwsh', 'bash-extra'])
+})
+
+// Given 非法配置；When 保存；Then 错误可见且不发写请求。
+for (const [label, value, error] of [
+  ['客户端 2 id', 'git-bash', '重复'],
+  ['客户端 1 参数', '"unterminated', '引号'],
+  ['客户端 1 环境', 'invalid', '环境'],
+  ['黑名单第 1 条', '[', '正则'],
+]) test('非法输入阻止保存: ' + label, async () => {
+  const p = await page()
+  p.field(p.render(), label).props.onChange({ target: { value } })
+  await p.button(p.render(), '保存').props.onClick()
+  assert.equal(p.requests.filter((row) => row.method === 'POST').length, 0)
+  assert.match(JSON.stringify(p.render()), new RegExp(error))
+})
+
+test('加载失败:显示错误及重新加载操作', async () => {
+  const p = await page({ failLoad: true })
+  assert.match(JSON.stringify(p.render()), /加载故障/)
+  assert.ok(p.button(p.render(), '重新加载'))
+  p.restoreLoad()
+  p.button(p.render(), '重新加载').props.onClick()
+  p.render()
+  await p.flush()
+  assert.equal(p.field(p.render(), '客户端 1 默认').props.checked, true)
+})
+
+test('原规则交互:添加空行不生成空正则,逐行删除与编辑可保存', async () => {
+  const p = await page()
+  p.button(p.render(), '添加规则').props.onClick()
+  assert.equal(p.field(p.render(), '黑名单第 5 条').props.value, '')
+  p.field(p.render(), '黑名单第 1 条').props.onChange({ target: { value: '^danger' } })
+  p.field(p.render(), '删除规则 2').props.onClick()
+  await p.button(p.render(), '保存').props.onClick()
+  const payload = JSON.parse(p.requests.find((row) => row.method === 'POST').body)
+  assert.deepEqual(payload.deny, ['^danger', ' ', 'echo\nsecret'])
+})
+
+test('原参数环境文本:引号内空格与 K=V 值可编辑,不暴露 JSON', async () => {
+  const p = await page()
+  p.field(p.render(), '客户端 1 参数').props.onChange({ target: { value: '-c "echo new words" {command}' } })
+  p.field(p.render(), '客户端 1 环境').props.onChange({ target: { value: 'NOTE=a=b c\nOTHER= two words ' } })
+  await p.button(p.render(), '保存').props.onClick()
+  const shell = JSON.parse(p.requests.find((row) => row.method === 'POST').body).shells[0]
+  assert.deepEqual(shell.args, ['-c', 'echo new words', '{command}'])
+  assert.deepEqual(shell.env, { NOTE: 'a=b c', OTHER: ' two words ' })
+})
+
+test('编辑再还原:参数与环境原始数组和换行值仍无损', async () => {
+  const p = await page()
+  for (const label of ['客户端 1 参数', '客户端 1 环境']) {
+    const original = p.field(p.render(), label).props.value
+    p.field(p.render(), label).props.onChange({ target: { value: 'temporary' } })
+    p.field(p.render(), label).props.onChange({ target: { value: original } })
+  }
+  await p.button(p.render(), '保存').props.onClick()
+  const shell = JSON.parse(p.requests.find((row) => row.method === 'POST').body).shells[0]
+  assert.deepEqual(shell.args, section().shells[0].args)
+  assert.deepEqual(shell.env, section().shells[0].env)
+})
+
+test('修改单个环境变量:其他含换行与反斜线的值保持不变', async () => {
+  const p = await page()
+  const original = p.field(p.render(), '客户端 1 环境').props.value
+  p.field(p.render(), '客户端 1 环境').props.onChange({ target: { value: original.replace('NOTE=a=b c', 'NOTE=changed value') } })
+  await p.button(p.render(), '保存').props.onClick()
+  const posted = p.requests.find((row) => row.method === 'POST')
+  assert.ok(posted, '编辑普通变量不应使已有多行值阻止保存')
+  assert.deepEqual(JSON.parse(posted.body).shells[0].env, { ...section().shells[0].env, NOTE: 'changed value' })
+})
+
+test('双引号 Windows 参数:路径反斜线不能被当成 JSON 控制字符', async () => {
+  const p = await page()
+  const path = 'C:\\Program Files\\Git\\bin\\bash.exe'
+  p.field(p.render(), '客户端 1 参数').props.onChange({ target: { value: '-c "' + path + '" {command}' } })
+  await p.button(p.render(), '保存').props.onClick()
+  const posted = p.requests.find((row) => row.method === 'POST')
+  assert.ok(posted)
+  assert.deepEqual(JSON.parse(posted.body).shells[0].args, ['-c', path, '{command}'])
+})
+
+test('参数修改保真:只追加参数仍保留原有空项、引号、反斜线与控制字符', async () => {
+  const p = await page()
+  const original = p.field(p.render(), '客户端 1 参数').props.value
+  p.field(p.render(), '客户端 1 参数').props.onChange({ target: { value: original + ' extra' } })
+  await p.button(p.render(), '保存').props.onClick()
+  const posted = p.requests.find((row) => row.method === 'POST')
+  assert.ok(posted)
+  assert.deepEqual(JSON.parse(posted.body).shells[0].args, [...section().shells[0].args, 'extra'])
+})
+
+test('扫描不产生未保存改动:保存仍禁用', async () => {
+  const p = await page()
+  await p.button(p.render(), '扫描本机').props.onClick()
+  assert.equal(p.button(p.render(), '保存').props.disabled, true)
+})
+
+test('探测:独立调用路径与扫描接口,不提交配置', async () => {
+  const p = await page()
+  p.field(p.render(), '客户端 1 路径').props.onChange({ target: { value: 'C:/Git/bash.exe' } })
+  await p.button(p.render(), '探测路径').props.onClick()
+  assert.match(JSON.stringify(p.render()), /路径存在/)
+  await p.button(p.render(), '扫描本机').props.onClick()
+  assert.match(JSON.stringify(p.render()), /C:\/Git\/bash.exe/)
+  assert.equal(p.requests.filter((row) => row.path.endsWith('/config') && row.method === 'POST').length, 0)
+})
+
+test('提交成功但回读失败:明确已保存,不误报提交失败', async () => {
+  const p = await page({ failReadBack: true })
+  p.dirty()
+  await p.button(p.render(), '保存').props.onClick()
+  assert.equal(p.requests.filter((row) => row.method === 'POST').length, 1)
+  const text = JSON.stringify(p.render())
+  assert.match(text, /已保存.*刷新失败.*回读故障/)
+  assert.doesNotMatch(text, /保存失败/)
+})
+
+test('保存失败:保留输入并显示服务端错误', async () => {
+  const p = await page({ failSave: true })
+  p.field(p.render(), '客户端 1 id').props.onChange({ target: { value: 'edited' } })
+  await p.button(p.render(), '保存').props.onClick()
+  assert.equal(p.field(p.render(), '客户端 1 id').props.value, 'edited')
+  assert.match(JSON.stringify(p.render()), /写入故障/)
+})

package/test/config-entry.test.mjs

@@ -1,4 +1,4 @@
-// 条目级 env 与 wsl distro:schema 默认、argv 形、entryFor 透传。BDD 场景见 docs/feat-shell-select-optim/plan.md S5-S10。
+// 条目级 env 与 wsl distro:schema 默认、argv 形、entryFor 透传。BDD 场景见 docs/feat-shell-select-optim/plan.md S5-S10。
 
 import { test } from 'node:test'
 import assert from 'node:assert/strict'
@@ -69,6 +69,7 @@ function stubCtxFor(config) {
   const registered = { sections: [], tools: [], promptSections: [], routes: [] }
   return {
     reflect: { provide: () => {} },
+    on: () => () => {},
     logger: { warn: () => {} },
     effect: (fn) => { registered.routes.push(fn) },
     get() { return { register: () => {} } },

package/test/deny-output-schema.test.mjs

@@ -0,0 +1,53 @@
+// FIND-020-3 回归:deny 命中返回对象必须通过工具输出 foreground oneOf 分支校验
+// (additionalProperties:false)——历史缺陷:blocked/blockedBy 声明外字段致宿主判
+// INVALID_TOOL_OUTPUT,拒绝文案在真机不可达。
+
+import { test } from 'node:test'
+import assert from 'node:assert/strict'
+import { readFileSync } from 'node:fs'
+import { fileURLToPath } from 'node:url'
+import { dirname, join } from 'node:path'
+import { DenyError } from '../src/denylist.mjs'
+
+const here = dirname(fileURLToPath(import.meta.url))
+const source = readFileSync(join(here, '..', 'src', 'tool.mjs'), 'utf8')
+
+// 前台输出分支属性表与 additionalProperties 与 src/tool.mjs 同源抽取
+function extractForegroundProperties(src) {
+  const start = src.indexOf('function foregroundOutputProperties()')
+  const body = src.slice(start, src.indexOf('\n}\n', start))
+  return body
+}
+
+function pickStringProps(propsSource) {
+  const names = [...propsSource.matchAll(/^\s{4}(\w+):/gm)].map((m) => m[1])
+  return names
+}
+
+test('deniedForeground 返回对象逐字段落 foreground 分支声明内', () => {
+  const propsSource = extractForegroundProperties(source)
+  const declared = pickStringProps(propsSource)
+  assert.ok(declared.includes('kind') && declared.includes('stderr'), '属性表抽取自净(schema 自身声明)')
+  // deniedForeground 构造器字段全部在声明表内(拒绝实现不再携带声明外字段)
+  const fnStart = source.indexOf('function deniedForeground(')
+  const fnBody = source.slice(fnStart, source.indexOf('\n}\n', fnStart))
+  const used = [...fnBody.matchAll(/^\s{4}(\w+):/gm)].map((m) => m[1])
+  const extra = used.filter((k) => !declared.includes(k))
+  assert.deepEqual(extra, [], `deniedForeground 不得携带声明外字段: ${extra.join(',')}`)
+  assert.doesNotMatch(fnBody, /blocked:/)
+  assert.doesNotMatch(fnBody, /blockedBy:/)
+})
+
+test('两执行分支 catch 均走 deniedForeground(不再内联声明外字段对象)', () => {
+  assert.equal((source.match(/deniedForeground\(error, entry\.id\)/g) ?? []).length, 2)
+  assert.doesNotMatch(source, /kind: 'foreground', shell: entry\.id, blocked: true/)
+})
+
+test('拒绝文案仍含契约锚(模型可见 [blocked by shell-select: matches deny pattern …])', () => {
+  const error = new DenyError('echo\\\\s', 'echo x')
+  const fnStart = source.indexOf('function deniedForeground(')
+  const fnBody = source.slice(fnStart, source.indexOf('\n}\n', fnStart))
+  assert.match(fnBody, /blockedMarker\(error\)/)
+  assert.match(source, /function blockedMarker\(error\)/)
+  assert.ok(error.pattern.length > 0)
+})

package/test/executor-seam.test.mjs

@@ -1,4 +1,4 @@
-// executor 官方 seam 集成(桩 ctx):BDD 场景见本文件与 README「官方工具兼容」。
+// executor 官方 seam 集成(桩 ctx):BDD 场景见本文件与 README「官方工具兼容」。
 // 背景:preset 注入的官方 tool-pwsh 经 cordis 服务代理(ctx.shell)调用执行器,
 // 代理把方法 this 重定向到阴影对象;执行器公开面必须与官方 PwshLocalExecutor
 // 同构地使用公有字段/方法(#私有在阴影 receiver 下触发品牌检查错误)。
@@ -38,6 +38,7 @@ function stubCtx({ sandboxMode = 'danger-full-access', spawn = stubSpawn() } = {
   }
   const ctx = {
     reflect: { provide: () => {} },
+    on: () => () => {},
     logger: { warn: () => {} },
     get(service) {
       if (service === 'webServer') return { register: (item) => registered.routes.push(item.path) }

package/test/executor.test.mjs

@@ -6,6 +6,13 @@ import assert from 'node:assert/strict'
 import ShellSelectExecutor from '../src/executor.mjs'
 import { resolveConfig, assertServiceableConfig, defaultConfig } from '../src/config.mjs'
 
+test('执行器激活后挂模型工具投影', () => {
+  // Given 有模型服务；When构造执行器；Then组装事件由执行器生命周期持有。
+  const { ctx, registered } = stubCtx()
+  new ShellSelectExecutor(ctx, baseConfig())
+  assert.equal(registered.listeners?.filter((row) => row.name === 'system-prompt/assemble').length, 1)
+})
+
 // --- 桩具 ---
 
 function stubReader(text) {
@@ -59,6 +66,11 @@ function stubCtx({ withSettings = true, sandboxMode = 'danger-full-access', spaw
       }
       fn(child)
     },
+    on(name, handler) {
+      registered.listeners ??= []
+      registered.listeners.push({ name, handler })
+      return () => {}
+    },
     subprocess: spawn,
     sandbox: {
       confine: (argv, policy) => ({
@@ -431,12 +443,18 @@ test('构造:boxed volatile 字段(宿主 resolve 产物)解箱生效,不回落
   assert.deepEqual(listing.shells.map((entry) => entry.id), ['pwsh', 'git-bash'])
   assert.equal(executor.entryFor(undefined).id, 'git-bash')
   const shell = registered.tools.find((tool) => tool.name === 'shell')
-  assert.match(shell.description, /git-bash \(bash\)$|default client is "git-bash"/)
-  assert.doesNotMatch(shell.description, /cmd \(cmd\)/)
+  assert.match(shell.description, /^Execute commands using shell="git-bash" by default/)
+  assert.doesNotMatch(shell.description, /^- cmd —/m)
+  assert.equal(shell.parameters.properties.shell.description, 'Override the default shell using an id listed above.')
+  assert.doesNotMatch(shell.parameters.properties.sandbox_permissions.description, /retry/)
+  const prompt = registered.promptSections.find((section) => section.name === 'tool:shell').text
+  assert.match(prompt, /investigate failures/)
+  assert.match(prompt, /after an interruption/)
+  assert.doesNotMatch(prompt, /fresh processes|default client|Pass the `shell`/)
 })
 
 test('refresh:boxed volatile 字段换源同样解箱生效', () => {
-  const { ctx } = stubCtx()
+  const { ctx, registered } = stubCtx()
   const executor = new ShellSelectExecutor(ctx, baseConfig())
   executor.refresh(boxFields({
     shells: baseConfig().shells,
@@ -446,6 +464,8 @@ test('refresh:boxed volatile 字段换源同样解箱生效', () => {
   const listing = executor.listShells()
   assert.equal(listing.default, 'git-bash')
   assert.equal(listing.shells.length, 3)
+  assert.match(registered.tools.findLast((tool) => tool.name === 'shell').description,
+    /^Execute commands using shell="git-bash" by default/)
 })
 
 test('构造:混合形态(部分字段 boxed 部分普通)逐字段解箱生效', () => {