@mzzsfy/dsh-shell-select 0.2.0 → 0.3.1

package/README.md

@@ -6,7 +6,8 @@ Windows shell 链接管:禁用官方 `pwsh` 工具与执行器,替换为可配
 
 - bundle 补丁按 id 禁用官方 `tool-pwsh`、`pwsh-sandbox` 两行,插入本包主行(`ctx.shell` 执行器 + `shell` 工具 + 设置节 + 浏览器设置页路由)与 guard 哨兵行;卸载本包即补丁消失,官方行自动复位。
 - client 半区 `dsh.client.inject` 声明(官方机制,dsh-client-file-upload 等官方包同款):保证 client 运行时模块表中 `primitives`/`slots` 面在场;primitives 另有 try/catch 降级自绘兜底。
-- 本包执行器完整实现官方 `ctx.shell` seam(`resolve`/`run`/`start`/`runFor`/`startFor`/`entryFor`/`sandboxMode`),结构官方 PwshLocalExecutor 同构(实例状态/方法全公有——cordis 服务代理会把经 `ctx.shell` 调用的方法 `this` 重定向到阴影对象,`#` 私有触发品牌检查错误)。agent preset 注入的官方 `pwsh` 工具因此照常可用:经 `ctx.shell` 代理走默认客户端;`shell` 工具提供多客户端选择面。
+- 本包执行器完整实现官方 `ctx.shell` seam(`resolve`/`run`/`start`/`runFor`/`startFor`/`entryFor`/`sandboxMode`),结构官方 PwshLocalExecutor 同构(实例状态/方法全公有——cordis 服务代理会把经 `ctx.shell` 调用的方法 `this` 重定向到阴影对象,`#` 私有触发品牌检查错误)。
+- preset 面收口:web 面把 agent 平面后移到每会话 agent preset,内置 standard 预设在 win32 重新声明官方 `pwsh` 工具行,bundle 补丁对 preset 组合树不可达。本包自带预设 `shell-select`(standard 全量副本 − tool-pwsh 行,`presets/shell-select/`),经补丁覆写 `agent-presets` 行接入:win32 默认预设切到本包预设(POSIX 保持 standard,行为与上游一致),`roots` 指向本包 presets 目录;`agent-presets.default` 的 settings 值恒优先于补丁缺省,用户显式选择不被劫持。上游预设漂移由 `test/preset-drift.test.mjs` 逐行守卫,升级后按官方实文对表。
 - 沙箱语义官方同构:`danger-full-access` 直跑;受限模式经 `ctx.sandbox.confine` 包装并按官方方言分类拒绝/runner 失败,权限模型不变。
 - 死态自愈:用户 patch 层禁用主行的窗口内,guard 哨兵(id 含 `/`,市场不写该层)代挂官方 `dsh-tool-pwsh` + `dsh-pwsh-sandbox` 恢复 host 面服务与 boot 组合(预载失败退避重试,至多 3 次),任一方复活先卸代挂。哨兵/复活让位语义逐项同构 `dsh-llm-pi-gateway`。边界:cordis 服务按 fiber 树解析,代挂对 agent preset 作用域不可见,死态窗口新会话的 preset tool-pwsh 行拒挂(报错清晰)属预期。
 - POSIX 上本包全部行停用,官方 bash 链不受影响。
@@ -59,7 +60,7 @@ env 优先级(同键高右):内置覆盖集(NO_COLOR/PAGER/GIT_PAGER)< 条目 `e
 
 - 配置节顶层 `deny`:正则字符串数组,对模型提交的整条命令文本匹配(大小写不敏感),命中即拒绝——**deny 绝对,无豁免语义**;空数组 = 不拦截(出厂默认)。
 - 精细放行在模式内用正则前瞻表达:`deny: ['rm -rf\\s+(?!\\S*node_modules)']` 禁 rm -rf 但放行清依赖目录;默认放行系统下独立 allow 列表的唯一语义就是覆盖 deny,与"deny 绝对"矛盾,故不设。
-- 拦截点在执行器 runFor/startFor 入口:经 `ctx.shell` 代理的官方 pwsh 工具同样受管。拒绝以模型可见标记返回:`[blocked by shell-select: matches deny pattern …]`,后台任务在启动前同步拒绝,不产生僵尸任务。
+- 拦截点在执行器 runFor/startFor 入口:经 `ctx.shell` 代理的消费方(如 hooks 桥)与 preset 预设切换前的官方 pwsh 工具同样受管。拒绝以模型可见标记返回:`[blocked by shell-select: matches deny pattern …]`,后台任务在启动前同步拒绝,不产生僵尸任务。
 - 定位是防误触护栏而非安全边界:整文本正则挡不住间接包装(编码/嵌套壳),真正的边界始终是访问模式与沙箱。坏正则条目容错跳过,不瘫执行链;设置页为逐条规则编辑器(每条规则独立行,行级即时校验并标错,保存时按行定位拦截非法正则)。
 
 ### bash 形探测与 msys2

package/cordis.patch.yml

@@ -14,6 +14,17 @@
 # 哨兵自愈与复活让位语义逐项同构 packages/dsh-llm-pi-gateway 的 guard/takeover,
 # 差异仅两处:官方代挂对象为 tool-pwsh + pwsh-sandbox 两行;行配置读官方
 # `shell` settings 节(pwsh-sandbox 经其 Config 消费,保持官方 pwshPath 配置)。
+#
+# preset 面:web 面把 agent 平面后移到每会话 agent preset,内置 standard 预设
+# 在 win32 重新声明 tool-pwsh 行,bundle patch 对 preset 组合树不可达。收口方式:
+# 本包自带 preset(standard 全量副本 − tool-pwsh 行,见 presets/shell-select/),
+# 经 agent-presets 行覆写接入——roots 指向本包 presets 目录(default 'user' 承接
+# schema 缺省),default 在 win32 切到本包预设、POSIX 保持 standard(本包行在
+# POSIX 全停用,行为须与上游逐字一致)。路径表达式由 ctx.baseUrl(profile 目录)
+# 推 node_modules/@mzzsfy/dsh-shell-select/presets/:bundle 必经 profile node_modules
+# 解析(resolveBundleDir 顺序),本 patch 在执行即证目录在。default 仅为 settings
+# `agent-presets.default` 缺省(config.default 是其 base),用户显式选择恒优先;
+# 上游行更名/缺行时 patch 告警跳过,行为自然回落 standard。
 
 - id: pwsh-sandbox
   disabled: true
@@ -21,6 +32,13 @@
 - id: tool-pwsh
   disabled: true
 
+- id: agent-presets
+  name: '@deepseek-ai/dsh-agent-presets'
+  config:
+    default: !!js "process.platform === 'win32' ? 'shell-select' : 'standard'"
+    roots:
+      - path: !!js decodeURIComponent(new URL('node_modules/@mzzsfy/dsh-shell-select/presets/', ctx.baseUrl).pathname).replace(/^\/([A-Za-z]:)/, '$1')
+
 - insert:
     - id: shell-select
       name: '@mzzsfy/dsh-shell-select'

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mzzsfy/dsh-shell-select",
   "description": "Windows shell 接管:替换默认 pwsh 工具为可配置多客户端的 shell 工具(git bash/WSL/cmd/pwsh,自定义路径,默认客户端,模型按名选择)",
-  "version": "0.2.0",
+  "version": "0.3.1",
   "type": "module",
   "main": "src/executor.mjs",
   "exports": {
@@ -59,7 +59,8 @@
     "@deepseek-ai/dsh-subprocess": "0.1.5-rc.2",
     "@deepseek-ai/dsh-timeout": "0.1.5-rc.2",
     "@deepseek-ai/dsh-tools": "0.1.5-rc.2",
-    "@deepseek-ai/schemastery": "3.18.2"
+    "@deepseek-ai/schemastery": "3.18.2",
+    "js-yaml": "4.3.2"
   },
   "files": [
     "src",

package/src/client.js

@@ -65,6 +65,31 @@ window.__ModuleLoader__.load({
       return payload
     }
 
+    // 工具卡客户端名册缓存:GET /config 单飞拉取,shell 徽章按 id→用户命名解析。
+    // 失败置 null(徽章不渲染),不重试——下次页面加载自然重取
+    let clientCatalog = null
+    let clientCatalogPromise = null
+    // LOGIC-BEGIN ensureClientCatalog
+    function ensureClientCatalog() {
+      if (clientCatalogPromise === null) {
+        clientCatalogPromise = api(API.config).then((section) => {
+          const byId = {}
+          for (const entry of section.resolved?.shells ?? []) byId[entry.id] = entry.name
+          clientCatalog = { default: section.resolved?.default, byId }
+        }).catch(() => { })
+      }
+      return clientCatalogPromise
+    }
+    // LOGIC-END ensureClientCatalog
+    // 显式 shell 参数按 id 取用户命名;缺省落 default 客户端的用户命名(配置即当前解析事实)
+    // LOGIC-BEGIN clientDisplayName
+    function clientDisplayName(requested) {
+      if (clientCatalog === null) return undefined
+      const id = requested !== undefined && requested !== '' ? requested : clientCatalog.default
+      return id !== undefined ? clientCatalog.byId[id] : undefined
+    }
+    // LOGIC-END clientDisplayName
+
     const CSS = [
       '.sls-card { display:flex; flex-direction:column; gap:10px; }',
       '.sls-row { display:flex; align-items:center; gap:8px; flex-wrap:wrap; }',
@@ -96,23 +121,26 @@ window.__ModuleLoader__.load({
       '.sls-rule--bad .sls-rule__input { border-color:#c44; }',
       '.sls-rule__err { flex:none; max-width:40%; font-size:11px; color:#c44; overflow:hidden; text-overflow:ellipsis; white-space:nowrap; }',
       '.sls-rule__del { flex:none; padding:2px 8px; }',
-      // tool.call.toolview 卡片(key 'shell'):官方 terminal 行同构 + 复制/折行增强
-      '.sls-tv { font-size:13px; line-height:1.45; }',
+      // tool.call.toolview 卡片(key 'shell'):官方 terminal 行同构 + 复制/折行增强。
+      // 色彩对齐官方 ToolRow:标题 label-secondary、icon 盒 label-tertiary(实证自
+      // 官方行 computed style);token 缺失时回退 inherit 不致不可读
+      '.sls-tv { font-size:13px; line-height:1.45; color:var(--dsw-alias-label-secondary, inherit); }',
       '.sls-tv__row { display:flex; align-items:center; gap:7px; padding:2px 0; cursor:default; }',
       '.sls-tv__row--exp { cursor:pointer; user-select:none; }',
-      '.sls-tv__lead { display:flex; align-items:center; gap:4px; color:inherit; }',
+      '.sls-tv__lead { display:flex; align-items:center; gap:4px; color:var(--dsw-alias-label-tertiary, inherit); }',
       '.sls-tv__chev { opacity:.45; transition:transform .15s ease; }',
       '.sls-tv__row[data-open="1"] .sls-tv__chev { transform:rotate(-90deg); }',
       '.sls-tv__sr { position:absolute; width:1px; height:1px; overflow:hidden; clip:rect(0 0 0 0); }',
-      '.sls-tv__title { font-weight:500; }',
-      '.sls-tv__sep { width:3px; height:3px; border-radius:50%; background:currentColor; opacity:.35; flex:none; }',
-      '.sls-tv__sum { opacity:.6; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; }',
-      '.sls-tv__sum--err { color:#d4553f; opacity:.95; }',
+      '.sls-tv__title { font-weight:400; }',
+      '.sls-tv__sep { width:2px; height:2px; border-radius:1px; background:var(--dsw-alias-label-caption, currentColor); opacity:.8; flex:none; }',
+      '.sls-tv__sum { color:var(--dsw-alias-label-tertiary, inherit); white-space:nowrap; overflow:hidden; text-overflow:ellipsis; }',
+      '.sls-tv__sum--err { color:var(--dsw-alias-state-error-primary, #d4553f); }',
       '.sls-tv__body { margin:6px 0 4px; border:1px solid rgba(128,128,128,.28); border-radius:8px; overflow:hidden; }',
       '.sls-tv__head { display:flex; align-items:center; gap:8px; padding:6px 10px; border-bottom:1px solid rgba(128,128,128,.18); background:rgba(128,128,128,.05); }',
       '.sls-tv__cwd { font-family:var(--sls-mono, monospace); font-size:12px; opacity:.7; }',
       '.sls-tv__badge { font-size:11px; padding:0 7px; border-radius:999px; border:1px solid rgba(128,128,128,.35); opacity:.85; flex:none; }',
       '.sls-tv__pill { font-size:12px; color:#d4553f; flex:none; }',
+      '.sls-tv__pill--bg { color:var(--dsw-alias-label-tertiary, inherit); }',
       '.sls-tv__sp { flex:1; }',
       '.sls-tv__copy { display:flex; align-items:center; gap:2px; flex:none; }',
       '.sls-tv__copyBtn { padding:2px 8px; border:1px solid rgba(128,128,128,.35); border-radius:6px; background:transparent; color:inherit; cursor:pointer; font-size:12px; }',
@@ -592,27 +620,31 @@ window.__ModuleLoader__.load({
       } catch { /* 结构外形态走 generic */ }
       const command = typeof args?.command === 'string' && args.command.trim() !== '' ? args.command : ''
       const description = typeof args?.description === 'string' && args.description.trim() !== '' ? args.description : undefined
-      const cwdDir = (() => {
-        const dir = displayCwd(typeof args?.workdir === 'string' ? args.workdir : undefined, sessionCwd)
-        return dir !== undefined ? lastSegment(dir) : undefined
-      })()
-      const shellName = typeof args?.shell === 'string' && args.shell !== '' ? args.shell : undefined
+      const cwdFull = displayCwd(typeof args?.workdir === 'string' ? args.workdir : undefined, sessionCwd)
+      const cwdDir = cwdFull !== undefined ? lastSegment(cwdFull) : undefined
+      // shell 名 = 用户在配置页起的条目名;args.shell 缺省时按 default 客户端解析(配置当前读数)
+      const shellName = clientDisplayName(typeof args?.shell === 'string' ? args.shell : undefined)
       if (command === '') return { kind: 'generic', command: '', summary: undefined, output: null }
 
       if (!settled) {
         // running persistent(进行中无描述):回退行但状态点用进行中灰,非 warning 黄
         if (description === undefined) return { kind: 'generic', command, summary: undefined, output: null, running: true }
-        return { kind: 'terminal', status: 'running', command, description, cwdDir, shellName, output: undefined, exitCode: undefined, signal: undefined, code: undefined }
+        return { kind: 'terminal', status: 'running', command, description, cwdDir, cwdFull, shellName, output: undefined, exitCode: undefined, signal: undefined, code: undefined }
       }
 
       const contentText = (block.content ?? []).map((part) => (part.type === 'text' ? part.text : '')).filter((text) => text !== '').join('\n')
+      // 后台 ack:独立卡呈现命令全文与任务号徽标,ack 原文作输出(不再落 generic 简版行)
+      if (args.run_in_background === true) {
+        const jobId = /started background job (\S+)/.exec(contentText)?.[1]
+        return { kind: 'background', status: 'background', command, description, cwdDir, cwdFull, shellName, output: contentText, jobId }
+      }
       // 空结果落 generic:官方 singleResultText 无文本即回通用卡,避免空输出伪 done 终端卡
-      if (contentText === '' || block.isError === true || block.error !== undefined || args.run_in_background === true || description === undefined || hasSpillNotice(contentText)) {
+      if (contentText === '' || block.isError === true || block.error !== undefined || description === undefined || hasSpillNotice(contentText)) {
         return { kind: 'generic', command, summary: description, output: contentText }
       }
       const tail = parseExitTail(contentText)
       const status = tail.signal !== undefined ? 'signaled' : tail.exitCode !== 0 ? 'failed' : 'done'
-      return { kind: 'terminal', status, command, description, cwdDir, shellName, output: tail.output, exitCode: tail.exitCode, signal: tail.signal, code: undefined }
+      return { kind: 'terminal', status, command, description, cwdDir, cwdFull, shellName, output: tail.output, exitCode: tail.exitCode, signal: tail.signal, code: undefined }
     }
     // LOGIC-END shellCardModel
 
@@ -627,6 +659,7 @@ window.__ModuleLoader__.load({
     function statusTextOf(status, en) {
       switch (status) {
         case 'running': return en ? 'Running' : '运行中'
+        case 'background': return en ? 'Background' : '后台'
         case 'failed': case 'signaled': return en ? 'Failed' : '失败'
         default: return null
       }
@@ -635,6 +668,13 @@ window.__ModuleLoader__.load({
     function headMetaOf(model, en) {
       switch (model.status) {
         case 'running': return { dot: 'ongoing', label: en ? 'Running' : '运行中', pill: undefined }
+        // ack 块静态不反映 job 生命周期,状态点用中性工具图标,文案不带"运行中"
+        case 'background': return {
+          dot: 'none',
+          label: en ? 'Background' : '后台',
+          pill: model.jobId !== undefined ? (en ? `bg ${model.jobId}` : `后台 ${model.jobId}`) : undefined,
+          pillTone: 'bg',
+        }
         case 'done': return { dot: 'done', label: en ? 'Done' : '已完成', pill: undefined }
         case 'failed': return { dot: 'error', label: en ? 'Failed' : '失败', pill: en ? `exit ${model.exitCode}` : `退出码 ${model.exitCode}` }
         case 'signaled': return { dot: 'error', label: en ? 'Failed' : '失败', pill: en ? `signal ${model.signal}` : `信号 ${model.signal}` }
@@ -715,10 +755,10 @@ window.__ModuleLoader__.load({
             TOOLVIEW_ICONS.StateDot({ state: meta.dot }),
             h('span', { className: 'sls-tv__sr' }, meta.label),
           ),
-          model.cwdDir !== undefined ? h('span', { className: 'sls-tv__cwd' }, model.cwdDir) : null,
-          model.shellName !== undefined ? h('span', { className: 'sls-tv__badge' }, model.shellName) : null,
+          model.cwdDir !== undefined ? h('span', { className: 'sls-tv__cwd', title: 'pwd: ' + (model.cwdFull ?? model.cwdDir) }, model.cwdDir) : null,
+          model.shellName !== undefined ? h('span', { className: 'sls-tv__badge', title: en ? 'Shell client' : 'Shell 客户端' }, model.shellName) : null,
           h('span', { className: 'sls-tv__sp' }),
-          meta.pill !== undefined ? h('span', { className: 'sls-tv__pill' }, meta.pill) : null,
+          meta.pill !== undefined ? h('span', { className: 'sls-tv__pill' + (meta.pillTone === 'bg' ? ' sls-tv__pill--bg' : '') }, meta.pill) : null,
           h('span', { className: 'sls-tv__copy' },
             h(CopyButton, {
               label: copyCommandLabel,
@@ -744,7 +784,12 @@ window.__ModuleLoader__.load({
       const { block, cwd, inspect } = props
       const en = detectEnglish()
       const [open, setOpen] = useState(false)
-      const model = shellCardModel(block, cwd)
+      const [, setCatalogReady] = useState(false)
+      useEffect(() => {
+        let disposed = false
+        ensureClientCatalog().then(() => { if (!disposed) setCatalogReady(true) })
+        return () => { disposed = true }
+      }, [])
       if (model.kind === 'generic') return h(GenericShellRow, { model, inspect, en })
       const expandable = true
       const srStatus = statusTextOf(model.status, en)
@@ -773,6 +818,9 @@ window.__ModuleLoader__.load({
           h('span', { className: 'sls-tv__title' }, 'Shell'),
           h('span', { className: 'sls-tv__sep', 'aria-hidden': true }),
           h('span', { className: 'sls-tv__sum' + (failed ? ' sls-tv__sum--err' : '') }, summary),
+          model.status === 'background' && model.jobId !== undefined
+            ? h('span', { className: 'sls-tv__badge', title: en ? 'Background job' : '后台任务' }, en ? `bg ${model.jobId}` : `后台 ${model.jobId}`)
+            : null,
         ),
         open ? h(ShellCard, { model, inspect, en }) : null,
       )

package/test/client-card.test.mjs

@@ -18,10 +18,16 @@ function extractLogic(name, deps = {}) {
   return new Function(...keys, 'return (' + match[1].trim() + ')')(...keys.map((key) => deps[key]))
 }
 
-function cardModel() {
+function cardModel(catalog = null) {
   const lastSegment = extractLogic('lastSegment')
   const displayCwd = extractLogic('displayCwd', { lastSegment })
-  return extractLogic('shellCardModel', { displayCwd, lastSegment, parseExitTail: extractLogic('parseExitTail'), hasSpillNotice: extractLogic('hasSpillNotice') })
+  return extractLogic('shellCardModel', {
+    displayCwd,
+    lastSegment,
+    parseExitTail: extractLogic('parseExitTail'),
+    hasSpillNotice: extractLogic('hasSpillNotice'),
+    clientDisplayName: extractLogic('clientDisplayName', { clientCatalog: catalog }),
+  })
 }
 
 function parseEnvText() {
@@ -77,14 +83,72 @@ test('S12b running 完整参数:terminal running 卡', () => {
   assert.equal(model.status, 'running')
 })
 
-test('S12c 后台 ack 与 isError 仍走 generic(回归)', () => {
-  const background = cardModel()(
-    settledBlock(JSON.stringify({ ...JSON.parse(ARGS), run_in_background: true }), 'started', { isError: false }),
-    SESSION_CWD,
-  )
-  assert.equal(background.kind, 'generic')
+test('S15 shell 徽章命名:显式参数按 id 取用户命名,缺省落 default 客户端命名', () => {
+  const catalog = { default: 'git-bash', byId: { 'git-bash': 'Git Bash', pwsh: 'PowerShell' } }
+  const explicit = cardModel(catalog)(
+    settledBlock(JSON.stringify({ command: 'ls', description: 'list', shell: 'pwsh' }), 'out\n[exit code: 0]'), SESSION_CWD)
+  assert.equal(explicit.shellName, 'PowerShell')
+  const fallback = cardModel(catalog)(
+    settledBlock(ARGS, 'out\n[exit code: 0]'), SESSION_CWD)
+  assert.equal(fallback.shellName, 'Git Bash')
+  const unknown = cardModel(catalog)(
+    settledBlock(JSON.stringify({ command: 'ls', description: 'list', shell: 'ghost' }), 'out\n[exit code: 0]'), SESSION_CWD)
+  assert.equal(unknown.shellName, undefined)
+})
+
+test('S15b cwd 悬浮全路径:model 携带 cwdFull', () => {
+  const model = cardModel()(
+    settledBlock(JSON.stringify({ command: 'git status', description: 'Show working tree status', workdir: 'sub' }), 'out\n[exit code: 0]'), SESSION_CWD)
+  assert.equal(model.cwdDir, 'sub')
+  assert.equal(model.cwdFull, 'C:\\repo\\sub')
+  const noWorkdir = cardModel()(
+    settledBlock(JSON.stringify({ command: 'git status', description: 'Show working tree status' }), 'out\n[exit code: 0]'), SESSION_CWD)
+  assert.equal(noWorkdir.cwdFull, SESSION_CWD)
+})
+
+test('S16 cwd 悬浮说明:可见文本为 basename,title 为 pwd: + 全路径(渲染守卫)', () => {
+  // BDD:Given shell 调用带 workdir,When 悬浮 cwd 元数据,Then 可见文本为 basename,title 为 'pwd: <全路径>' 单段说明
+  assert.match(source, /title: 'pwd: ' \+ \(model\.cwdFull \?\? model\.cwdDir\)/)
+  assert.match(source, /\}, model\.cwdDir\)/)
+})
+
+test('S17 后台 ack:派生 background 卡,命令在场且解析出 jobId', () => {
+  // BDD:Given run_in_background 调用已定,When 派生卡片模型,Then kind=background,jobId 取自 ack 标记,命令与 ack 原文保留
+  const model = cardModel()(settledBlock(
+    JSON.stringify({ command: 'node server.js', description: 'Boot server', run_in_background: true }),
+    'started background job shell-11'), SESSION_CWD)
+  assert.equal(model.kind, 'background')
+  assert.equal(model.jobId, 'shell-11')
+  assert.equal(model.command, 'node server.js')
+  assert.equal(model.output, 'started background job shell-11')
+})
+
+test('S17b 后台 ack 异常文本:仍 background,jobId 缺省不冒充', () => {
+  const model = cardModel()(settledBlock(
+    JSON.stringify({ command: 'x', description: 'd', run_in_background: true }), 'other'), SESSION_CWD)
+  assert.equal(model.kind, 'background')
+  assert.equal(model.jobId, undefined)
+})
+
+test('S17c 后台行默认收起,收起行携带任务号徽标(渲染守卫)', () => {
+  // BDD:Given 后台 ack 卡,When 行渲染,Then 默认收起与其余行一致,收起态可见 job id 徽标
+  assert.match(source, /case 'background':/)
+  assert.match(source, /sls-tv__pill--bg/)
+  assert.doesNotMatch(source, /useState\(model\.kind === 'background'\)/)
+  assert.match(source, /model\.status === 'background' && model\.jobId !== undefined/)
+})
+
+test('S17d 后台状态中性:不断言运行中,点为中性图标(渲染守卫)', () => {
+  // BDD:Given ack 块静态且不反映 job 生命周期,When 渲染后台状态,Then 文案与点均不断言 ongoing
+  assert.doesNotMatch(source, /case 'background':\s*\r?\n\s*dot: 'ongoing'/)
+  assert.doesNotMatch(source, /case 'background': return en \? 'Background' : '后台运行'/)
+})
+
+test('S12c isError 与空结果仍走 generic(回归)', () => {
   const errored = cardModel()(settledBlock(ARGS, 'boom', { isError: true }), SESSION_CWD)
   assert.equal(errored.kind, 'generic')
+  const empty = cardModel()(settledBlock(ARGS, ''), SESSION_CWD)
+  assert.equal(empty.kind, 'generic')
 })
 
 test('S13 注册面:shell/pwsh/bash 三 key 且 priority -1(文本守卫)', () => {

package/test/preset-drift.test.mjs

@@ -0,0 +1,174 @@
+// preset 接管守卫:本包自带预设(standard 副本 − tool-pwsh 行)与 bundle patch
+// 的 agent-presets 覆写形态。漂移守卫对照已安装 dsh 的内置 standard 预设——
+// 上游增删行/改表达式即红,升级后按官方实文对表镜像;宿主缺失(无 dsh 本体的
+// 最小环境)时 skip,不制造假红。
+
+import { test } from 'node:test'
+import assert from 'node:assert/strict'
+import { readFileSync, existsSync, mkdirSync, symlinkSync, rmSync, readdirSync } from 'node:fs'
+import { fileURLToPath, pathToFileURL } from 'node:url'
+import { dirname, join, resolve } from 'node:path'
+import { createRequire } from 'node:module'
+import { tmpdir } from 'node:os'
+import { execPath } from 'node:process'
+
+const here = dirname(fileURLToPath(import.meta.url))
+const pkgRoot = join(here, '..')
+const presetText = readFileSync(join(pkgRoot, 'presets', 'shell-select', 'agent.cordis.yml'), 'utf8')
+const metaText = readFileSync(join(pkgRoot, 'presets', 'shell-select', 'preset.yml'), 'utf8')
+const patchText = readFileSync(join(pkgRoot, 'cordis.patch.yml'), 'utf8')
+
+// ── 宿主侧 yaml 能力探测:js-yaml 与官方 entryListSchema 经 dsh 安装位解析 ──
+
+function locateHarnessDir() {
+  // 候选锚:运行中 node 的全局安装位(nvm/全局布局:execPath 目录/node_modules)→
+  // 仓库 compat 隔离宿主(.dsh-versions/<v>/package)。缺失即返回 null(skip)。
+  const candidates = [
+    resolve(dirname(execPath), 'node_modules', '@deepseek-ai', 'dsh'),
+  ]
+  const versionsDir = resolve(pkgRoot, '..', '..', '.dsh-versions')
+  try {
+    for (const version of readdirSync(versionsDir)) {
+      candidates.push(join(versionsDir, version, 'package'))
+    }
+  } catch { /* 无 .dsh-versions,忽略 */ }
+  for (const candidate of candidates) {
+    if (existsSync(join(candidate, 'package.json'))) return candidate
+  }
+  return null
+}
+
+// yaml 能力与宿主解耦:js-yaml 为 devDep(CI 无宿主也可解析本包文件)。
+// !!js 标签本地同形 Type:tag 必须写完整 URI(tag:yaml.org,2002:js)——文档简写
+// !!js 展开后按完整 URI 匹配,字面 '!!js' 永不命中(unknown tag,CI 假绿教训)。
+// 形态场景恒走 LOCAL_SCHEMA(本机/CI 同路径);漂移守卫在场时改用官方
+// entryListSchema 求同(对照面只在有宿主时跑)
+import yamlStatic from 'js-yaml'
+
+const LOCAL_SCHEMA = yamlStatic.JSON_SCHEMA.extend(new yamlStatic.Type('tag:yaml.org,2002:js', {
+  kind: 'scalar',
+  resolve: (data) => typeof data === 'string',
+  construct: (data) => ({ __jsExpr: data }),
+  represent: (data) => data['__jsExpr'],
+}))
+
+let harness = null
+let entryListSchema = LOCAL_SCHEMA
+try {
+  harness = locateHarnessDir()
+  if (harness !== null) {
+    const req = createRequire(join(harness, 'package.json'))
+    const toUrl = (specifier) => pathToFileURL(req.resolve(specifier)).href
+    entryListSchema = (await import(toUrl('@deepseek-ai/cordis-plugin-include'))).entryListSchema
+  }
+} catch { /* 官方 schema 缺失按本地同形标签处理 */ }
+
+const loadYaml = (text) => yamlStatic.load(text, { schema: entryListSchema })
+
+// 镜像 loader 的表达式求值形态(new Function + with(ctx),全局可用)
+const evalExpr = (expr, ctx) => new Function('ctx', `with (ctx) { return (${expr}) }`)(ctx)
+
+// ── 结构对比:展平行树为 id → {name, disabled, config 键集} ──
+
+function flattenRows(rows, out = new Map()) {
+  for (const row of rows ?? []) {
+    if (row.id !== undefined) {
+      out.set(row.id, {
+        name: row.name,
+        disabled: row.disabled === undefined ? undefined : row.disabled.__jsExpr ?? row.disabled,
+        configKeys: row.config && !Array.isArray(row.config) ? Object.keys(row.config).sort() : undefined,
+      })
+    }
+    if (row.group && Array.isArray(row.config)) flattenRows(row.config, out)
+  }
+  return out
+}
+
+// ── 场景 ──
+
+test('预设形态:preset.yml 元数据在场', () => {
+  const meta = metaText.trim().split('\n').map((line) => line.split(/:(.*)/s)[0])
+  assert.ok(meta.includes('name'), 'preset.yml 缺 name')
+  assert.ok(metaText.includes('description:'), 'preset.yml 缺 description')
+})
+
+test('预设形态:agent.cordis.yml 可解析且无 tool-pwsh 行', () => {
+  // 形态断言恒走本地同形 schema:本机与 CI 同一路径,官方 schema 在场与否不影响本场景
+  const rows = yamlStatic.load(presetText, { schema: LOCAL_SCHEMA })
+  assert.ok(Array.isArray(rows), '预设组合必须是行数组')
+  const ids = new Set()
+  const walk = (list) => {
+    for (const row of list) {
+      if (row.id !== undefined) ids.add(row.id)
+      if (row.group && Array.isArray(row.config)) walk(row.config)
+    }
+  }
+  walk(rows)
+  assert.ok(ids.has('tool-bash'), 'POSIX bash 工具行必须保留')
+  assert.ok(!ids.has('tool-pwsh'), 'tool-pwsh 行必须移除(win32 shell 面由本包接管)')
+})
+
+test('漂移守卫:与已安装 standard 逐行对表(缺失宿主则 skip)', (t) => {
+  if (harness === null) return t.skip('未找到 dsh 本体安装,无对照源')
+  const standardPath = join(harness, 'node_modules', '@deepseek-ai', 'dsh-agent-presets', 'presets', 'standard', 'agent.cordis.yml')
+  if (!existsSync(standardPath)) return t.skip('dsh 安装位无 standard 预设,无对照源')
+  const standard = flattenRows(loadYaml(readFileSync(standardPath, 'utf8')))
+  const ours = flattenRows(loadYaml(presetText))
+  for (const [id, row] of standard) {
+    if (id === 'tool-pwsh') {
+      assert.ok(!ours.has(id), 'standard 有 tool-pwsh 而本包预设也出现了:镜像被污染')
+      continue
+    }
+    assert.ok(ours.has(id), `standard 行 ${id} 在本包预设缺失,须对表镜像`)
+    assert.deepEqual(ours.get(id), row, `行 ${id} 与 standard 漂移,升级后按官方实文对表`)
+  }
+  for (const id of ours.keys()) {
+    assert.ok(standard.has(id), `本包预设多出 standard 没有的行 ${id}:镜像越界`)
+  }
+})
+
+test('schema 同构:本地 !!js Type 与官方 entryListSchema 产物 deepEqual(缺失宿主则 skip)', (t) => {
+  if (harness === null) return t.skip('未找到 dsh 本体安装,无官方 schema 对照')
+  // harness 命中时 entryListSchema 已是官方版:loadYaml=官方路径,与 LOCAL_SCHEMA 逐文本对照。
+  // 本地同形标签的语义漂移曾以 unknown tag 形态炸穿 CI,此处固化为机器断言
+  for (const [label, text] of [['预设组合', presetText], ['bundle patch', patchText]]) {
+    assert.deepEqual(
+      yamlStatic.load(text, { schema: LOCAL_SCHEMA }),
+      loadYaml(text),
+      `${label} 双 schema 产物漂移,本地 !!js Type 须与官方 JsExpr 同构`,
+    )
+  }
+})
+
+test('patch 形态:agent-presets 覆写带 name 防御且含 default 与 roots', () => {
+  const patch = yamlStatic.load(patchText, { schema: LOCAL_SCHEMA })
+  const row = patch.find((entry) => entry.id === 'agent-presets')
+  assert.ok(row, 'patch 缺 agent-presets 覆写行')
+  assert.equal(row.name, '@deepseek-ai/dsh-agent-presets', 'name 字段是官方行改名防御,必须钉住包名')
+  assert.match(row.config.default.__jsExpr, /'shell-select'/)
+  assert.match(row.config.default.__jsExpr, /'standard'/)
+  assert.equal(row.config.roots.length, 1)
+  assert.match(row.config.roots[0].path.__jsExpr, /ctx\.baseUrl/)
+})
+
+test('patch 表达式求值:default 按平台切换,roots 指向本包 presets 目录', () => {
+  const patch = yamlStatic.load(patchText, { schema: LOCAL_SCHEMA })
+  const config = patch.find((entry) => entry.id === 'agent-presets').config
+  const expectedDefault = process.platform === 'win32' ? 'shell-select' : 'standard'
+  assert.equal(evalExpr(config.default.__jsExpr, { baseUrl: 'file:///any/profile/dir/' }), expectedDefault)
+  // 合成 profile 布局:baseUrl 锚 <profile>/profiles/web,其下 node_modules/@mzzsfy/dsh-shell-select
+  // 为符号链接桥(自依赖桥同构;junction 穿透到真实包目录)
+  const fakeProfile = join(tmpdir(), 'shell-select-preset-probe-' + process.pid)
+  const linkDir = join(fakeProfile, 'profiles', 'web', 'node_modules', '@mzzsfy')
+  mkdirSync(linkDir, { recursive: true })
+  symlinkSync(pkgRoot, join(linkDir, 'dsh-shell-select'), 'junction')
+  try {
+    const evaluated = evalExpr(config.roots[0].path.__jsExpr, {
+      baseUrl: pathToFileURL(join(fakeProfile, 'profiles', 'web') + '/').href,
+    })
+    assert.ok(/presets\/$/.test(evaluated), '求值路径必须锚在包内 presets 目录: ' + evaluated)
+    assert.ok(existsSync(join(evaluated, 'shell-select', 'agent.cordis.yml')), '求值路径必须落在本包 presets 目录(符号链接桥穿透)')
+  } finally {
+    rmSync(fakeProfile, { recursive: true, force: true })
+  }
+})