@mzzsfy/dsh-shell-select 0.3.1 → 0.4.1

package/test/executor.test.mjs

@@ -3,8 +3,8 @@
 
 import { test } from 'node:test'
 import assert from 'node:assert/strict'
-import ShellSelectExecutor, { assertServiceableConfig } from '../src/executor.mjs'
-import { Config } from '../src/config.mjs'
+import ShellSelectExecutor from '../src/executor.mjs'
+import { resolveConfig, assertServiceableConfig, defaultConfig } from '../src/config.mjs'
 
 // --- 桩具 ---
 
@@ -29,18 +29,14 @@ function stubSpawn(stdoutText = '', stderrText = '', exitCode = 0) {
 }
 
 function stubCtx({ withSettings = true, sandboxMode = 'danger-full-access', spawn = stubSpawn() } = {}) {
-  const registered = { tools: [], sections: [], promptSections: [], routes: [] }
+  const registered = { tools: [], sections: [], promptSections: [], routes: [], policies: [] }
   const settingsImpl = {
-    installSection: (ctx, ns, schema, base, hooks) => {
-      registered.sections.push({ ns, schema, base, hooks })
-      settingsImpl._source = () => Config(base ?? {})
-    },
-    update: (ns, patch) => {
-      settingsImpl._patch = { ns, patch }
-      registered.sections[0].hooks.onChange()
+    configure: (presentation, fiber) => {
+      registered.policies.push({ presentation, fiber })
     },
   }
   const disposers = []
+  const childEffects = []
   const ctx = {
     // cordis Service 基类构造期要求 reflect.provide(登记服务实例),桩空转
     reflect: { provide: () => {} },
@@ -51,6 +47,18 @@ function stubCtx({ withSettings = true, sandboxMode = 'danger-full-access', spaw
       }
       return undefined
     },
+    // 可选子级注入(设置页策略形态):子级立即执行,effect 收集待验
+    inject(services, fn) {
+      const child = {
+        settings: withSettings ? settingsImpl : undefined,
+        effect: (effectFn) => {
+          const disposer = effectFn()
+          childEffects.push(disposer)
+          return disposer
+        },
+      }
+      fn(child)
+    },
     subprocess: spawn,
     sandbox: {
       confine: (argv, policy) => ({
@@ -84,6 +92,7 @@ function stubCtx({ withSettings = true, sandboxMode = 'danger-full-access', spaw
       disposers.push(disposer)
       return disposer
     },
+    _childEffects: childEffects,
   }
   return { ctx, registered, disposers }
 }
@@ -110,24 +119,50 @@ function build() {
 
 // --- 断言 ---
 
-test('构造:注册 shell 工具、systemPrompt 段、shell-select 设置节、三条路由(config 双方法单注册)', () => {
+test('构造:注册 shell+pwsh 双工具与 systemPrompt 段,路由不再由主行挂载', () => {
   const { registered } = build()
-  assert.equal(registered.tools.length, 1)
-  assert.equal(registered.tools[0].name, 'shell')
-  assert.match(registered.tools[0].description, /git-bash/)
+  assert.deepEqual(registered.tools.map((tool) => tool.name).sort(), ['pwsh', 'shell'])
+  const shell = registered.tools.find((tool) => tool.name === 'shell')
+  const pwsh = registered.tools.find((tool) => tool.name === 'pwsh')
+  assert.match(shell.description, /git-bash/)
+  // 兼容工具描述一句话:不要调用,使用 shell
+  assert.equal(pwsh.description, 'Do not call; use `shell`.')
+  assert.ok(!('shell' in pwsh.parameters.properties))
+  assert.ok('shell' in shell.parameters.properties)
   assert.equal(registered.promptSections.length, 1)
-  assert.equal(registered.sections[0].ns, 'shell-select')
-  // exact 路由 path 为唯一键:config/probe/detect 三条,GET/POST 分流在 handler 内
-  const routePaths = registered.routes.filter((path) => path.startsWith('/api/shell-select/'))
-  assert.equal(routePaths.length, 3)
-  assert.equal(new Set(routePaths).size, 3)
+  // 数据通道迁至 web-routes 行:主行零路由
+  const routePaths = registered.routes.filter((path) => String(path).startsWith('/api/shell-select/'))
+  assert.equal(routePaths.length, 0)
+})
+
+test('settings 在场:注册 auto:false 页面策略挂本行 fiber(自带设置页,官方同构)', () => {
+  const { ctx, registered } = stubCtx()
+  const fiber = { id: 'fiber-1' }
+  ctx.fiber = fiber
+  new ShellSelectExecutor(ctx, baseConfig())
+  assert.equal(registered.policies.length, 1)
+  assert.deepEqual(registered.policies[0].presentation, { auto: false })
+  assert.equal(registered.policies[0].fiber, fiber)
 })
 
-test('settings 缺席:降级不 installSection,工具照常注册', () => {
+test('settings 缺席:策略静默跳过,双工具照常注册(业务插件无 settings 也可运行)', () => {
   const { ctx, registered } = stubCtx({ withSettings: false })
   new ShellSelectExecutor(ctx, baseConfig())
-  assert.equal(registered.sections.length, 0)
-  assert.equal(registered.tools.length, 1)
+  assert.equal(registered.policies.length, 0)
+  assert.equal(registered.tools.length, 2)
+})
+
+test('pwsh 工具钉死 pwsh 客户端:default 漂移不改变落点(旧会话语义保真)', async () => {
+  const spawn = stubSpawn('ok', '', 0)
+  const { ctx, registered } = stubCtx({ spawn })
+  const executor = new ShellSelectExecutor(ctx, baseConfig())
+  const pwshTool = registered.tools.find((tool) => tool.name === 'pwsh')
+  // 模型无 shell 参数可传(pinned 工具),default 漂到 git-bash 也不影响
+  executor.refresh({ shells: baseConfig().shells, default: 'git-bash' })
+  await pwshTool.execute({ command: 'Get-Date', description: 'probe', workdir: process.cwd() }, { signal: new AbortController().signal })
+  assert.equal(spawn.calls[0].argv[0], NODE_EXE)
+  assert.match(spawn.calls[0].argv.at(-1), /Get-Date$/)
+  assert.deepEqual(spawn.calls[0].argv.slice(1, 5), ['-NoLogo', '-NoProfile', '-NonInteractive', '-Command'])
 })
 
 test('listShells:出厂条目自动解析为真实路径(pwsh/cmd 必在本机)', () => {
@@ -223,102 +258,6 @@ test('runFor pwsh 条目:非交互形 + 编码前缀进 argv', async () => {
   assert.match(argv[5], /OutputEncoding/)
 })
 
-test('settings.update 触发 onChange:工具重注册且描述更新', () => {
-  const { executor, registered } = stubCtxAndBuild()
-  const before = registered.tools.length
-  assert.ok(before >= 1)
-  registered.sections[0].hooks.onChange()
-  assert.ok(registered.tools.length >= 1)
-})
-
-test('updateConfig:await settings.update 后读数即新值(setSource 接线)', async () => {
-  const { ctx, registered } = stubCtx()
-  // 桩 settings:installSection 后 setSource 接 scope;replace wholesale 后 setSource 到新值
-  const scope = { value: Config({}) }
-  registered.sectionsHook = null
-  ctx.settings.installSection = (ctx2, ns, schema, base, hooks) => {
-    registered.sections.push({ ns, schema, base, hooks })
-    scope.value = Config(base ?? {})
-    hooks.setSource(() => scope.value)
-    registered.sectionsHook = hooks
-  }
-  ctx.settings.replace = async (ns, section) => {
-    scope.value = Config(section)
-    registered.sectionsHook.onChange()
-  }
-  const executor = new ShellSelectExecutor(ctx, baseConfig())
-  assert.equal(executor.config.default, 'pwsh')
-  await executor.updateConfig({ default: 'git-bash' })
-  assert.equal(executor.config.default, 'git-bash')
-  assert.equal(executor.listShells().default, 'git-bash')
-})
-
-test('updateConfig:部分补丁归并当前节后 replace(单改 default 不丢 shells)', async () => {
-  const { ctx, registered } = stubCtx()
-  const written = []
-  ctx.settings.replace = async (ns, section) => {
-    written.push(section)
-  }
-  const executor = new ShellSelectExecutor(ctx, baseConfig())
-  await executor.updateConfig({ default: 'git-bash' })
-  assert.equal(written[0].shells.length, 3)
-  assert.equal(written[0].default, 'git-bash')
-})
-
-test('api POST config:await updateConfig,resolved 即新清单(async 修复)', async () => {
-  const { ctx, registered } = stubCtx()
-  ctx.get = (service) => {
-    if (service === 'webServer') {
-      const routes = []
-      ctx.__routes = routes
-      return { register: (item) => routes.push(item) }
-    }
-    return undefined
-  }
-  ctx.settings.replace = async (ns, section) => {
-    registered.sections[0].hooks.setSource(() => section)
-    registered.sections[0].hooks.onChange()
-  }
-  const executor = new ShellSelectExecutor(ctx, baseConfig())
-  const handler = ctx.__routes.find((r) => r.path === '/api/shell-select/config').handler
-  let captured = null
-  const fakeRes = {
-    writeHead: () => {},
-    end: (body) => {
-      captured = JSON.parse(body)
-    },
-  }
-  const body = JSON.stringify({ default: 'git-bash', shells: executor.config.shells })
-  const fakeReq = {
-    method: 'POST',
-    headers: { origin: 'http://127.0.0.1:9191', host: '127.0.0.1:9191' },
-    on(event, cb) {
-      if (event === 'data') setImmediate(() => cb(Buffer.from(body)))
-      if (event === 'end') setImmediate(cb)
-    },
-    destroy: () => {},
-  }
-  await handler(fakeReq, fakeRes)
-  assert.equal(captured.ok, true)
-  assert.equal(captured.resolved.default, 'git-bash')
-  assert.equal(captured.resolved.shells.length, 3)
-})
-
-test('updateConfig:入参 path 反斜杠归一(防 yaml 无引号落盘字面翻倍)', async () => {
-  // 归一是 Windows 宿主行为(linux 无反斜杠翻倍怪癖,源码层按平台守卫)
-  if (process.platform !== 'win32') return
-  const { ctx, registered } = stubCtx()
-  const written = []
-  ctx.settings.replace = async (ns, section) => {
-    written.push(section)
-  }
-  const executor = new ShellSelectExecutor(ctx, baseConfig())
-  await executor.updateConfig({
-    shells: [{ id: 'pwsh', name: 'PowerShell', kind: 'pwsh', path: 'C:\\\\WINDOWS\\\\System32\\\\powershell.exe' }],
-  })
-  assert.equal(written[0].shells[0].path, 'C:\\WINDOWS\\System32\\powershell.exe')
-})
-
 test('entryFor:双反斜杠污染路径被归一后仍可用', () => {
   const { executor } = stubCtxAndBuild()
   const ctx2 = stubCtx()
@@ -368,9 +307,9 @@ test('startFor danger:返回进程句柄,readOutput 增量与 done 定局', asyn
 })
 
 test('assertServiceableConfig:空 shells/default 不在列/重复 id 全拒', () => {
-  assert.throws(() => assertServiceableConfig(Config({ shells: [], default: 'x' })), /shells/)
-  assert.throws(() => assertServiceableConfig(Config({ shells: [{ id: 'a', name: 'A', kind: 'bash', path: '' }], default: 'b' })), /default/)
-  assert.throws(() => assertServiceableConfig(Config({
+  assert.throws(() => assertServiceableConfig(resolveConfig({ shells: [], default: 'x' })), /shells/)
+  assert.throws(() => assertServiceableConfig(resolveConfig({ shells: [{ id: 'a', name: 'A', kind: 'bash', path: '' }], default: 'b' })), /default/)
+  assert.throws(() => assertServiceableConfig(resolveConfig({
     shells: [
       { id: 'a', name: 'A', kind: 'bash', path: '' },
       { id: 'a', name: 'A2', kind: 'cmd', path: '' },
@@ -378,3 +317,175 @@ test('assertServiceableConfig:空 shells/default 不在列/重复 id 全拒', ()
     default: 'a',
   })), /duplicate/)
 })
+
+// --- execute 官方契约(ShellExecutor 抽象方法,官方 tool-pwsh 唯一执行入口)---
+
+test('execute 契约:danger 直跑,返回句柄形态,result() 前台投影无 sandbox 键', async () => {
+  const spawn = stubSpawn('exec-out', '', 0)
+  const { ctx } = stubCtx({ spawn })
+  const executor = new ShellSelectExecutor(ctx, baseConfig())
+  const handle = await executor.execute(executor.resolve({ command: 'hi', workdir: process.cwd() }))
+  assert.ok(['running', 'completed'].includes(handle.status))
+  assert.equal(typeof handle.readOutput, 'function')
+  assert.equal(typeof handle.kill, 'function')
+  assert.equal(typeof handle.observed.stdout.readFrom, 'function')
+  const result = await handle.result()
+  assert.equal(result.exitCode, 0)
+  assert.equal(result.timedOut, false)
+  assert.equal(result.aborted, false)
+  assert.equal(result.stdout.text, 'exec-out')
+  assert.equal(result.sandbox, undefined)
+  assert.equal(spawn.calls[0].argv[0], NODE_EXE)
+  assert.match(spawn.calls[0].argv.at(-1), /hi$/)
+})
+
+test('execute 契约:onExpiry none 不武装 deadline(后台注册形态)', async () => {
+  const spawn = stubSpawn('bg', '', 0)
+  const { ctx } = stubCtx({ spawn })
+  const executor = new ShellSelectExecutor(ctx, baseConfig())
+  const handle = await executor.execute(executor.resolve({ command: 'x', workdir: process.cwd(), onExpiry: 'none' }))
+  const result = await handle.result()
+  assert.equal(result.exitCode, 0)
+  assert.equal(result.timedOut, false)
+})
+
+test('execute 契约:provider spawn 失败,done 定局 killed 不 reject,result() 携带同一失败', async () => {
+  const spawn = { spawn: () => { throw new Error('spawn exploded') } }
+  const { ctx } = stubCtx({ spawn })
+  const executor = new ShellSelectExecutor(ctx, baseConfig())
+  const handle = await executor.execute(executor.resolve({ command: 'x', workdir: process.cwd() }))
+  await handle.done
+  assert.equal(handle.status, 'killed')
+  const read = handle.readOutput()
+  assert.match(read.delta, /subprocess failed before reporting an outcome/)
+  await assert.rejects(() => handle.result(), /spawn exploded/)
+})
+
+test('execute 契约:受限模式经 confine,定案写 proc.sandbox 并入 result', async () => {
+  const spawn = stubSpawn('', 'file access denied under read-only', 1)
+  const { ctx } = stubCtx({ spawn, sandboxMode: 'read-only' })
+  const executor = new ShellSelectExecutor(ctx, baseConfig())
+  const handle = await executor.execute(executor.resolve({ command: 'dir', workdir: process.cwd() }))
+  assert.equal(spawn.calls[0].argv[0], 'WRAPPED')
+  const result = await handle.result()
+  assert.equal(result.sandbox.mode, 'read-only')
+  assert.equal(result.sandbox.denied, true)
+  assert.equal(result.sandbox.enforcement, 'full')
+})
+
+test('execute 契约:deny 命中拒绝执行,不产生句柄', async () => {
+  const spawn = stubSpawn('', '', 0)
+  const { ctx } = stubCtx({ spawn })
+  const executor = new ShellSelectExecutor(ctx, { ...baseConfig(), deny: ['rm -rf'] })
+  await assert.rejects(
+    () => executor.execute(executor.resolve({ command: 'rm -rf /', workdir: process.cwd() })),
+    (error) => error.code === 'SHELL_COMMAND_BLOCKED',
+  )
+  assert.equal(spawn.calls.length, 0)
+})
+
+test('execute 契约:默认客户端解析,显式 onExpiry kill 正常完成', async () => {
+  const spawn = stubSpawn('ok', '', 0)
+  const { ctx } = stubCtx({ spawn })
+  const executor = new ShellSelectExecutor(ctx, baseConfig())
+  const handle = await executor.execute(executor.resolve({ command: 'x', workdir: process.cwd(), onExpiry: 'kill', timeoutMs: 5000 }))
+  const result = await handle.result()
+  assert.equal(result.exitCode, 0)
+  assert.equal(result.timeoutMs, 5000)
+})
+
+test('refresh:换源后执行面即时收紧(已删 id 拒绝,新清单生效)', async () => {
+  const { ctx, registered } = stubCtx()
+  const executor = new ShellSelectExecutor(ctx, baseConfig())
+  assert.equal(executor.entryFor('cmd').id, 'cmd')
+  const toolsBefore = registered.tools.length
+  executor.refresh({
+    shells: baseConfig().shells.filter((entry) => entry.id !== 'cmd'),
+    default: 'pwsh',
+  })
+  assert.throws(() => executor.entryFor('cmd'), /cmd/)
+  assert.equal(executor.entryFor('pwsh').id, 'pwsh')
+  assert.equal(executor.entryFor(undefined).id, 'pwsh')
+  assert.equal(registered.tools.length, toolsBefore)
+})
+
+// 真机宿主形态:行 config 经宿主按 static Config resolve,volatile 字段是
+// boxed ref({get}),非普通对象。构造/refresh 直存该形态时 resolveConfig 的
+// 类型对账会把 ref 全部当非法输入丢弃,执行面静默回落出厂默认(行 config
+// 永不生效,真机 0.2.0-rc.2 实证)。回归锁定:boxed 形态必须解箱生效。
+
+// cordis resolve 产物的同构 boxed 形态:每字段值包 {get}
+function boxFields(config) {
+  return Object.fromEntries(Object.entries(config).map(([key, value]) => [key, { get: () => value }]))
+}
+
+test('构造:boxed volatile 字段(宿主 resolve 产物)解箱生效,不回落出厂默认', () => {
+  const { ctx, registered } = stubCtx()
+  const userConfig = {
+    shells: baseConfig().shells.filter((entry) => entry.id !== 'cmd'),
+    default: 'git-bash',
+  }
+  const executor = new ShellSelectExecutor(ctx, boxFields(userConfig))
+  const listing = executor.listShells()
+  assert.equal(listing.default, 'git-bash')
+  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\)/)
+})
+
+test('refresh:boxed volatile 字段换源同样解箱生效', () => {
+  const { ctx } = stubCtx()
+  const executor = new ShellSelectExecutor(ctx, baseConfig())
+  executor.refresh(boxFields({
+    shells: baseConfig().shells,
+    default: 'git-bash',
+  }))
+  assert.equal(executor.entryFor(undefined).id, 'git-bash')
+  const listing = executor.listShells()
+  assert.equal(listing.default, 'git-bash')
+  assert.equal(listing.shells.length, 3)
+})
+
+test('构造:混合形态(部分字段 boxed 部分普通)逐字段解箱生效', () => {
+  const { ctx } = stubCtx()
+  const executor = new ShellSelectExecutor(ctx, {
+    shells: boxFields({ shells: baseConfig().shells }).shells,
+    default: 'git-bash',
+    timeoutMs: 30000,
+  })
+  assert.equal(executor.entryFor(undefined).id, 'git-bash')
+  assert.equal(executor.config.timeoutMs, 30000)
+})
+
+test('入参缺省:null/undefined 落出厂默认,不抛', () => {
+  const { ctx } = stubCtx()
+  // 出厂默认 path=RESOLVED_AUTO('') → entryFor 走真实磁盘探测,linux CI 无
+  // pwsh.exe 必抛 no executable(出厂清单其余条目同);node 自身全平台存在,
+  // 以显式 path 覆写探测面,断言目标(id 落定与缺省容错)不受影响。
+  // refresh(null) 会把 #entry 归零回出厂(auto 路径),其后 entryFor 同样
+  // 需要探测面覆写:refresh 收 bypass 配置,null/undefined 容错语义(归零
+  // 不抛)由 refresh 调用本身不抛保证
+  const autoBypass = (entryConfig) => ({
+    ...entryConfig,
+    shells: entryConfig.shells.map((item) => ({ ...item, path: NODE_EXE })),
+  })
+  const fromNull = new ShellSelectExecutor(ctx, autoBypass(defaultConfig()))
+  assert.equal(fromNull.entryFor(undefined).id, 'pwsh')
+  fromNull.refresh(autoBypass(defaultConfig()))
+  assert.equal(fromNull.entryFor(undefined).id, 'pwsh')
+  const fromUndefined = new ShellSelectExecutor(ctx, autoBypass(defaultConfig()))
+  assert.equal(fromUndefined.entryFor(undefined).id, 'pwsh')
+})
+
+test('fail-loud:解箱后仍非法的形态炸在挂载点,不静默回落出厂默认', () => {
+  const { ctx } = stubCtx()
+  // ref 容器但解箱值非法(模拟宿主 resolve 形态契约变化):strict 必须抛
+  assert.throws(
+    () => new ShellSelectExecutor(ctx, { shells: { get: () => 'not-array' }, default: 'pwsh' }),
+    /形态非法.*shells/,
+  )
+  // 同形态宽容路径(resolveConfig)不抛——降级语义仅保留给持久化读回
+  assert.doesNotThrow(() => new ShellSelectExecutor(ctx, baseConfig()))
+})

package/test/guard-state.test.mjs

@@ -2,7 +2,7 @@
 
 import { test } from 'node:test'
 import assert from 'node:assert/strict'
-import { detectDeadState, rowState, effectiveDisabled, MAIN_ROW_ID, OFFICIAL_ROW_IDS } from '../src/guard-state.mjs'
+import { detectDeadState, rowState, rowScan, effectiveDisabled, MAIN_ROW_ID, OFFICIAL_ROW_IDS } from '../src/guard-state.mjs'
 import { officialRowConfig } from '../src/guard-config.mjs'
 
 // --- 桩 loader / 行 ---
@@ -101,6 +101,51 @@ test('主行禁用停稳时旗标不阻断判定(行确已停,残留旗标无意
   assert.equal(detectDeadState(rows, { applyState: () => 'pending' }), true)
 })
 
+test('运行时接管常态:主行崩(pending)且官方两行启用 → 非死态(官方自服务,guard 空闲)', () => {
+  const crashed = loader([
+    row({ id: MAIN }),
+    row({ id: OFF_TOOL }),
+    row({ id: OFF_EXEC }),
+  ])
+  assert.equal(detectDeadState(crashed, { applyState: () => 'pending' }), false)
+})
+
+test('rowScan:全树枚举 pwsh 行(声明态类型/求值禁用/fiber 存活),无 root 按空', () => {
+  assert.deepEqual(rowScan({}), [])
+  assert.deepEqual(rowScan(undefined), [])
+  const entryOf = (r) => ({
+    options: { id: r.id, name: r.name ?? `@x/${r.id}`, disabled: r.rawDisabled ?? r.disabled },
+    get disabled() {
+      if (r.disabled === 'throw') throw new Error('expr eval failed')
+      return r.disabled
+    },
+    fiber: r.running ? { uid: 'f1' } : undefined,
+  })
+  const treeLoader = (rows) => ({ root: { tree: { store: Object.fromEntries(rows.map((r) => [r.id, entryOf(r)])) } } })
+  const hits = rowScan(treeLoader([
+    { id: 'tool-pwsh', disabled: true },
+    { id: 'pwsh-sandbox', rawDisabled: { expr: true }, disabled: false, running: true },
+    { id: 'shell-select', disabled: false },
+  ]))
+  assert.deepEqual(hits, [
+    { id: 'tool-pwsh', rawType: 'boolean', evalDisabled: true, running: false },
+    { id: 'pwsh-sandbox', rawType: 'object', evalDisabled: false, running: true },
+  ])
+})
+
+test('rowScan:disabled getter 抛错按 throw 标记,不中断扫描', () => {
+  const entry = (r) => ({
+    options: { id: r.id, disabled: false },
+    get disabled() {
+      throw new Error('expr eval failed')
+    },
+    fiber: undefined,
+  })
+  const treeLoader = (rows) => ({ root: { tree: { store: Object.fromEntries(rows.map((r) => [r.id, entry(r)])) } } })
+  const hits = rowScan(treeLoader([{ id: 'pwsh-sandbox' }]))
+  assert.deepEqual(hits, [{ id: 'pwsh-sandbox', rawType: 'boolean', evalDisabled: 'throw', running: false }])
+})
+
 test('officialRowConfig:读 settings.yaml shell 节,缺失返回空对象', async () => {
   const section = await officialRowConfig(async () => ({ shell: { pwshPath: 'C:\\x\\pwsh.exe' } }))
   assert.deepEqual(section, { pwshPath: 'C:\\x\\pwsh.exe' })

package/test/preset-drift.test.mjs

@@ -1,21 +1,19 @@
-// preset 接管守卫:本包自带预设(standard 副本 − tool-pwsh 行)与 bundle patch
-// 的 agent-presets 覆写形态。漂移守卫对照已安装 dsh 的内置 standard 预设——
-// 上游增删行/改表达式即红,升级后按官方实文对表镜像;宿主缺失(无 dsh 本体的
-// 最小环境)时 skip,不制造假红。
+// preset 接管守卫(0.1.7 预设架构):本包 patch insert 自带预设声明
+// (preset-shell-select,standard 内联 roster − tool-pwsh 行)并覆写
+// agent-preset-registry 的 default。漂移守卫对照已安装 dsh 的
+// dsh-web-app/presets/standard.patch.yml——上游增删行/改表达式即红,升级后
+// 按官方实文对表镜像;宿主缺失(无 dsh 本体的最小环境)时 skip,不制造假红。
 
 import { test } from 'node:test'
 import assert from 'node:assert/strict'
-import { readFileSync, existsSync, mkdirSync, symlinkSync, rmSync, readdirSync } from 'node:fs'
+import { readFileSync, existsSync, 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 安装位解析 ──
@@ -41,8 +39,6 @@ function locateHarnessDir() {
 // 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', {
@@ -68,7 +64,9 @@ 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 键集} ──
+// ── 结构对比:展平行树为 id → {name, disabled, isolate, config 全值} ──
+// config 比全值而非键集:键集守不住文本漂移(plan-mode section 曾落后官方一句
+// 而守卫全绿),镜像声明即「standard 全量 − tool-pwsh 逐项同构」,值必须对表
 
 function flattenRows(rows, out = new Map()) {
   for (const row of rows ?? []) {
@@ -76,7 +74,8 @@ function flattenRows(rows, out = new Map()) {
       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,
+        isolate: row.isolate === undefined ? undefined : JSON.parse(JSON.stringify(row.isolate)),
+        config: row.config === undefined ? undefined : JSON.parse(JSON.stringify(row.config)),
       })
     }
     if (row.group && Array.isArray(row.config)) flattenRows(row.config, out)
@@ -84,18 +83,16 @@ function flattenRows(rows, out = new Map()) {
   return out
 }
 
-// ── 场景 ──
+// 本包 patch 解析:insert 的预设声明行 + 各覆写行
+const patchRows = yamlStatic.load(patchText, { schema: LOCAL_SCHEMA })
+const insertRows = patchRows.filter((entry) => entry.insert !== undefined).flatMap((entry) => entry.insert)
+const ourPresetRow = insertRows.find((row) => row.id === 'preset-shell-select')
+const ourPlugins = ourPresetRow?.config?.plugins ?? []
 
-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), '预设组合必须是行数组')
+test('patch 形态:自带预设声明行(preset-shell-select,0.1.7 内联架构)', () => {
+  assert.ok(ourPresetRow, 'patch 缺 preset-shell-select 声明(insert 段)')
+  assert.equal(ourPresetRow.name, '@deepseek-ai/dsh-agent-preset')
+  assert.equal(ourPresetRow.config.id, 'shell-select')
   const ids = new Set()
   const walk = (list) => {
     for (const row of list) {
@@ -103,17 +100,35 @@ test('预设形态:agent.cordis.yml 可解析且无 tool-pwsh 行', () => {
       if (row.group && Array.isArray(row.config)) walk(row.config)
     }
   }
-  walk(rows)
+  walk(ourPlugins)
   assert.ok(ids.has('tool-bash'), 'POSIX bash 工具行必须保留')
   assert.ok(!ids.has('tool-pwsh'), 'tool-pwsh 行必须移除(win32 shell 面由本包接管)')
+  assert.ok(!ids.has('persistent-pwsh'), 'persistent-pwsh 行不得进入本包预设')
 })
 
-test('漂移守卫:与已安装 standard 逐行对表(缺失宿主则 skip)', (t) => {
+test('patch 形态:agent-preset-registry 覆写含平台 default(patch 语义为整体替换 config)', () => {
+  const row = patchRows.find((entry) => entry.id === 'agent-preset-registry')
+  assert.ok(row, 'patch 缺 agent-preset-registry 覆写行')
+  assert.equal(row.name, undefined, 'registry 行是本包上层已 insert 的行,覆写按 id 匹配即无须 name')
+  assert.match(row.config.default.__jsExpr, /'shell-select'/)
+  assert.match(row.config.default.__jsExpr, /'standard'/)
+})
+
+test('patch 表达式求值:default 按平台切换', () => {
+  const row = patchRows.find((entry) => entry.id === 'agent-preset-registry')
+  const expected = process.platform === 'win32' ? 'shell-select' : 'standard'
+  assert.equal(evalExpr(row.config.default.__jsExpr, {}), expected)
+})
+
+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))
+  const standardPath = join(harness, 'node_modules', '@deepseek-ai', 'dsh-web-app', 'presets', 'standard.patch.yml')
+  if (!existsSync(standardPath)) return t.skip('dsh 安装位无 standard 预设声明,无对照源')
+  const standardPatch = yamlStatic.load(readFileSync(standardPath, 'utf8'), { schema: LOCAL_SCHEMA })
+  const declared = standardPatch.filter((entry) => entry.insert !== undefined).flatMap((entry) => entry.insert).find((row) => row.id === 'preset-standard')
+  assert.ok(declared, 'standard.patch.yml 缺 preset-standard 声明')
+  const standard = flattenRows(declared.config.plugins)
+  const ours = flattenRows(ourPlugins)
   for (const [id, row] of standard) {
     if (id === 'tool-pwsh') {
       assert.ok(!ours.has(id), 'standard 有 tool-pwsh 而本包预设也出现了:镜像被污染')
@@ -131,44 +146,9 @@ test('schema 同构:本地 !!js Type 与官方 entryListSchema 产物 deepEqual(
   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 })
-  }
+  assert.deepEqual(
+    yamlStatic.load(patchText, { schema: LOCAL_SCHEMA }),
+    loadYaml(patchText),
+    'bundle patch 双 schema 产物漂移,本地 !!js Type 须与官方 JsExpr 同构',
+  )
 })