@mzzsfy/dsh-shell-select 0.4.7 → 0.4.9

package/README.md

@@ -96,3 +96,5 @@ env 优先级(同键高右):内置覆盖集(NO_COLOR/PAGER/GIT_PAGER)< 条目 `e
 ## dsh 版本兼容
 
 按仓库动态窗口验证(scripts/compat/window.mjs),不预置任何固定版本槽:主测 = 渠道 dist-tag 最新 rc,完全适配口径;基线 = npm latest,不崩溃底线口径;主测与基线同版时收敛单槽。本包声明 `dsh.hostMin = "0.1.7-rc.1"`:低于该代际的宿主 API 面未验证,compat 装载层自动排除。逐轮实测结论见 `docs/兼容性测试/逐包测试进度.md`(本地维护,不入库)与本包 `兼容性测试.md`。
+
+dsh **0.2.2-rc.1** 实测两处代际契约变更均已适配:system-prompt assemble 的 tools 移到 waterfall 之后合并(投影面特性检测透传,过滤失效仅告警);设置写事务重评行 disabled 的 `!!js` 表达式(官方 pwsh-sandbox 被 runtime-disable 后可能被翻回启用)——guard 监视该翻回,dispose 主行执行器让位官方链,服务不真空、写事务不被拒。

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mzzsfy/dsh-shell-select",
   "description": "Windows shell 接管:替换默认 pwsh 工具为可配置多客户端的 shell 工具(git bash/WSL/cmd/pwsh,自定义路径,默认客户端,模型按名选择);支持命令 deny 黑名单、会话终端卡增强和直接 pwsh 接管徽章,接管失败自动回退官方 pwsh 链",
-  "version": "0.4.7",
+  "version": "0.4.9",
   "type": "module",
   "main": "src/index.js",
   "exports": {

package/src/apply-state.mjs

@@ -32,3 +32,9 @@ export function recordTakeover(event) {
 export function shellSelectTakeoverTrace() {
   return takeoverTrace
 }
+
+// 主行执行器 fiber 句柄(HOST-022 让位通道):mountExecutor 挂载成功后回填,
+// guard 监视官方行翻回启用时 dispose 让位;执行器不在场(guard 代挂态/挂载
+// 失败)恒 undefined,guard 零动作不与代挂官方链抢权。模块级单例,主行 fiber
+// 生命周期内有效。
+export const shellSelectExecutorFiber = { current: undefined }

package/src/guard.js

@@ -9,7 +9,7 @@
 import { MAIN_ROW_ID, OFFICIAL_ROW_IDS, detectDeadState, rowState, rowScan } from './guard-state.mjs'
 import { officialRowConfig, readSettingsDocument, resolveFromHostTree } from './guard-config.mjs'
 import { officialRowState } from './takeover.mjs'
-import { shellSelectApplyState, shellSelectTakeoverTrace } from './apply-state.mjs'
+import { shellSelectApplyState, shellSelectTakeoverTrace, shellSelectExecutorFiber } from './apply-state.mjs'
 
 // 官方包 npm 名(与行 id 独立:行 id 是 dsh-base 组合行,包名才是模块解析键)
 const OFFICIAL_PACKAGES = {
@@ -171,10 +171,34 @@ export async function installGuard(ctx, {
     }
   }
 
-  // 复活让位:受控行任一即将 init 且本方在场,先卸代挂(waterfall 保证先于其 apply)
+  // 复活让位:受控行任一即将 init 且本方在场,先卸代挂(waterfall 保证先于其 apply)。
+  // HOST-022 分支(0.2.2 写事务重评 !!js 表达式):官方行翻回启用且主行执行器
+  // 在场(句柄在场 = 主行活态接管中),dispose 执行器让位官方链——官方行激活
+  // 与 ShellSelectExecutor 撞 ctx.shell 会炸行激活并被写入门控放大为
+  // settings/rejected;求值抛错按零动作安全向(让位制造 shell 真空,不确定时
+  // 保持现状由 sweep 兜底)。
   const patchContextGuard = async (entry, next) => {
     const id = entry?.options?.id
     if (id !== MAIN_ROW_ID && !OFFICIAL_ROW_IDS.includes(id)) return next()
+    if (id !== MAIN_ROW_ID && entry.fiber?.uid == null && shellSelectExecutorFiber.current !== undefined) {
+      let state
+      try {
+        state = officialRowState(ctx.loader, id)
+      } catch {
+        state = null
+      }
+      if (state?.present === true && state.disabled === false && state.disabledUnreliable === false) {
+        const fiber = shellSelectExecutorFiber.current
+        shellSelectExecutorFiber.current = undefined
+        ctx.logger.warn(`shell-select/guard: 官方行 ${id} 翻回启用,主行执行器卸载让位(官方链接管)`)
+        try {
+          await fiber.dispose()
+        } catch (error) {
+          ctx.logger.warn(`shell-select/guard: 执行器让位 dispose 失败(${error?.message ?? error});官方行激活可能撞服务,由宿主行级失败兜底`)
+        }
+        return next()
+      }
+    }
     if (entry.fiber?.uid != null) return next()
     if (mounted.size === 0 && mounting === null) return next()
     ctx.logger.warn(`shell-select/guard: ${id} 行复活,卸代挂让位`)

package/src/index.js

@@ -32,6 +32,7 @@ import {
   takeoverDecision,
 } from './takeover.mjs'
 import { coerceServiceable } from './config.mjs'
+import { shellSelectExecutorFiber } from './apply-state.mjs'
 
 export const name = 'shell-select'
 
@@ -110,9 +111,9 @@ function unwrapConfigSnapshot(config) {
  * [object Object]" 拒挂(真机实证);解包产物必须 structuredClone:ref
  * .get() 返回 cosmokit snapshot 深冻结对象,cordis 挂载管线对 section 原地
  * resolve,冻结 env 直接炸 "Cannot assign to read only property" 并触发
- * 接管回滚。快照的陈旧由 apply 里的 loader/volatile-update 监听补偿:
- * volatile-only 变更宿主换值后发事件不重挂行,监听器现取 ref 解包成新
- * 快照经 ctx.shell.refresh 换源并重建工具。
+ * 接管回滚。快照的陈旧由设置页写路径收口补偿(F18:注释曾宣称的
+ * loader/volatile-update 监听为幻影机制,apply 零宿主事件监听是锁定契约;
+ * 设置页写成功后直接经 ctx.shell.refresh 换源,见 client/写路径)。
  */
 async function mountExecutor(ctx, config) {
   // 用户声明值挂载前 coercing:任意配置(坏类型/空 shells/悬空 default/坏
@@ -128,6 +129,10 @@ async function mountExecutor(ctx, config) {
     const waiting = fiber?.inject ? Object.keys(fiber.inject).join(',') : '?'
     throw new Error(`执行器 fiber 未激活(state=${fiber?.state},inject=${waiting})`)
   }
+  // 执行器句柄回填(HOST-022):0.2.2 写事务重评官方行 disabled 表达式可翻回
+  // 启用,官方行复活与本方执行器撞 ctx.shell——guard 监视 patch 事件,官方行
+  // 翻回启用即经此句柄 dispose 本方执行器让位。dispose 后句柄清空防重入。
+  shellSelectExecutorFiber.current = fiber
 }
 
 /**
@@ -147,8 +152,12 @@ async function runtimeTakeover(ctx, config, targets) {
   }
   const exited = await awaitOfficialExit(targets)
   if (!exited) {
-    ctx.logger.warn('shell-select: 官方行退场超时,放弃接管(官方 fiber 仍在服务);重启后由行树声明态收敛')
-    recordTakeover({ event: 'runtime 退场超时,放弃挂载' })
+    // 退场超时回滚已禁行(F18):本包不挂载,官方链必须复活自服务,
+    // 不留"官方已禁+本包未挂"的 shell 真空窗口
+    ctx.logger.warn('shell-select: 官方行退场超时,回滚启用并放弃接管')
+    recordTakeover({ event: 'runtime 退场超时,回滚已禁行,放弃挂载' })
+    await rollbackDisabledRows(disabled)
+    recordTakeover({ event: `rolledBack=${disabled.length}, 退场超时` })
     return
   }
   try {

package/src/prompt-projection.mjs

@@ -1,10 +1,20 @@
 // 只收敛模型投影，不改工具注册或执行策略；旧调用保持原 PowerShell 契约。
+// tools/sections 特性检测：0.2.2 起 system-prompt 的 assemble 把 tools 移到
+// waterfall 之后合并，链值不再携带该字段（0.2.1 内联 orderTools）——字段缺席时
+// 原样透传，pwsh 过滤失效只告警，绝不抛错打断回合管线（宿主升级即崩形态）。
 export function mountShellPromptProjection(ctx) {
   if (typeof ctx.on !== 'function') return
   let warned = false
   return ctx.on('system-prompt/assemble', async (assembly, context, next) => {
     const result = await next()
     if (ctx.tools.get('shell', context.scope) === undefined) return result
+    if (!Array.isArray(result.tools) || !Array.isArray(result.sections)) {
+      if (!warned) {
+        warned = true
+        ctx.logger.warn(`shell-select: 宿主 assemble 链值缺 tools/sections 数组，pwsh 投影停用（宿主 ${'system-prompt'} 契约变更，登记 dsh-api-alignment）`)
+      }
+      return result
+    }
     let sections = result.sections
     const sdk = sections.find((section) => section.name === 'tools:sdk' && section.text.trim() !== '')
     if (sdk !== undefined) {

package/test/guard-entry.test.mjs

@@ -4,7 +4,7 @@ import { test } from 'node:test'
 import assert from 'node:assert/strict'
 import { installGuard } from '../src/guard.js'
 import { MAIN_ROW_ID, OFFICIAL_ROW_IDS } from '../src/guard-state.mjs'
-import { shellSelectApplyState } from '../src/apply-state.mjs'
+import { shellSelectApplyState, shellSelectExecutorFiber } from '../src/apply-state.mjs'
 
 function row({ id, disabled = false, running = false }) {
   return {
@@ -158,3 +158,79 @@ test('模块归一:两形态皆无的官方包按预载失败处理,停用自愈
   assert.equal(mounts.length, 0)
   assert.ok(log.some(([level, msg]) => level === 'warn' && msg.includes('停用')))
 })
+
+// HOST-022(0.2.2 写事务重评 !!js 表达式):官方行翻回启用且主行执行器在场
+// (句柄在场),guard 卸执行器让位;句柄空缺(guard 代挂态)零动作。
+test('官方行翻回启用+执行器在场:dispose 句柄让位', async () => {
+  const rows = [
+    row({ id: MAIN_ROW_ID, disabled: false, running: true }),
+    row({ id: 'tool-pwsh', disabled: true }),
+    row({ id: 'pwsh-sandbox', disabled: false }),
+  ]
+  const { ctx, log, listeners } = stubCtx({ rows })
+  await installGuard(ctx, { importOfficial: makeImport(), delay: async () => {}, sweepIntervalMs: 3600 * 1000 })
+  const patchContext = listeners.get('loader/patch-context')
+  let disposed = 0
+  shellSelectExecutorFiber.current = { dispose: () => { disposed += 1; return Promise.resolve() } }
+  try {
+    await patchContext(rows[2], () => 'passed')
+    assert.equal(disposed, 1)
+    assert.equal(shellSelectExecutorFiber.current, undefined)
+    assert.ok(log.some(([level, msg]) => level === 'warn' && msg.includes('让位')))
+  } finally {
+    shellSelectExecutorFiber.current = undefined
+  }
+})
+
+test('官方行保持禁用态 patch:零动作', async () => {
+  const rows = [
+    row({ id: MAIN_ROW_ID, disabled: false, running: true }),
+    row({ id: 'tool-pwsh', disabled: true }),
+    row({ id: 'pwsh-sandbox', disabled: true }),
+  ]
+  const { ctx, listeners } = stubCtx({ rows })
+  await installGuard(ctx, { importOfficial: makeImport(), delay: async () => {}, sweepIntervalMs: 3600 * 1000 })
+  const patchContext = listeners.get('loader/patch-context')
+  let disposed = 0
+  shellSelectExecutorFiber.current = { dispose: () => { disposed += 1; return Promise.resolve() } }
+  try {
+    await patchContext(rows[1], () => 'passed')
+    assert.equal(disposed, 0)
+    assert.notEqual(shellSelectExecutorFiber.current, undefined)
+  } finally {
+    shellSelectExecutorFiber.current = undefined
+  }
+})
+
+test('句柄空缺(guard 代挂态):官方行翻回零动作', async () => {
+  const rows = [
+    row({ id: MAIN_ROW_ID, disabled: true }),
+    row({ id: 'tool-pwsh', disabled: true }),
+    row({ id: 'pwsh-sandbox', disabled: false }),
+  ]
+  const { ctx, listeners } = stubCtx({ rows })
+  await installGuard(ctx, { importOfficial: makeImport(), delay: async () => {}, sweepIntervalMs: 3600 * 1000 })
+  const patchContext = listeners.get('loader/patch-context')
+  await patchContext(rows[2], () => 'passed')
+  assert.equal(shellSelectExecutorFiber.current, undefined)
+})
+
+test('官方行求值抛错(disabledUnreliable):零动作安全向', async () => {
+  const rows = [
+    row({ id: MAIN_ROW_ID, disabled: false, running: true }),
+    row({ id: 'tool-pwsh', disabled: true }),
+    row({ id: 'pwsh-sandbox', disabled: true }),
+  ]
+  const { ctx, listeners } = stubCtx({ rows })
+  await installGuard(ctx, { importOfficial: makeImport(), delay: async () => {}, sweepIntervalMs: 3600 * 1000 })
+  const patchContext = listeners.get('loader/patch-context')
+  let disposed = 0
+  shellSelectExecutorFiber.current = { dispose: () => { disposed += 1; return Promise.resolve() } }
+  try {
+    const hostile = { options: { id: 'pwsh-sandbox' }, get disabled() { throw new Error('broken') }, fiber: undefined }
+    await patchContext(hostile, () => 'passed')
+    assert.equal(disposed, 0)
+  } finally {
+    shellSelectExecutorFiber.current = undefined
+  }
+})

package/test/prompt-projection.test.mjs

@@ -118,3 +118,32 @@ test('SDK 投影不可用时整体不改并告警', async () => {
   assert.equal(await handlers[0](final, {}, async () => final), final)
   assert.equal(warnings.length, 1)
 })
+
+// Given 0.2.2 宿主 assemble 把 tools 移到 waterfall 之后合并,链值只含 sections/contexts/variables;
+// When 投影读到链值缺 tools 数组;Then 原样透传不抛错,一次性告警登记契约变更(回合管线不崩)。
+test('链值缺 tools 数组(0.2.2 契约)时透传且告警', async () => {
+  const handlers = []
+  const warnings = []
+  const ctx = { on: (name, handler) => { handlers.push(handler); return () => {} }, tools: { get: () => ({}) }, logger: { warn: (msg) => warnings.push(msg) } }
+  projection.mountShellPromptProjection(ctx)
+  const chainValue = { sections: [{ name: 'tool:pwsh' }, { name: 'policy' }], contexts: [], variables: {} }
+  const result = await handlers[0]({}, { scope: 'scope' }, async () => chainValue)
+  assert.equal(result, chainValue)
+  assert.deepEqual(result.sections.map((s) => s.name), ['tool:pwsh', 'policy'])
+  assert.equal(warnings.length, 1)
+  // 第二次组装不再重复告警
+  await handlers[0]({}, { scope: 'scope' }, async () => chainValue)
+  assert.equal(warnings.length, 1)
+})
+
+// Given sections 缺席而 tools 在场的畸形链值;When 投影;Then 同样透传告警,不半改。
+test('链值缺 sections 数组时同样透传告警', async () => {
+  const handlers = []
+  const warnings = []
+  const ctx = { on: (name, handler) => { handlers.push(handler); return () => {} }, tools: { get: () => ({}) }, logger: { warn: (msg) => warnings.push(msg) } }
+  projection.mountShellPromptProjection(ctx)
+  const chainValue = { tools: [{ name: 'pwsh' }] }
+  const result = await handlers[0]({}, { scope: 'scope' }, async () => chainValue)
+  assert.equal(result, chainValue)
+  assert.equal(warnings.length, 1)
+})