dsh-loadout 0.12.0 → 0.12.2

package/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 「装备栏」是一个 DeepSeek Harness 插件：给每个对话选一套工具（套装），只把用得上的工具投给模型。
 
+## 0.12.2
+
+- **修「绑定到已不存在的套装」**：如果某个对话绑的套装在应用关着的时候被删掉（旧版本、手改 loadout.json、或别的机器同步过来的文件），启动后它会被当成「空套装」套用——等于把这对话的工具连同内置工具一起裁光，只剩 kit_*。现在这种绑定在第一次被读到时回退到「全部」，并把 ssignments 里那个失效名字改成 
+ull，日志里留一行说明。回归断言： binding to a deleted kit falls back to 全部（用第二个模块实例模拟重启）。
+## 0.12.1
+
+- **修卡死**：编辑（覆盖保存）、重命名或删除一个正在被对话使用的套装时，宿主会遍历「正在用它的对话」并逐个重新套用工具；这个遍历边改边往 `Map` 里重写条目，迭代器被塞回一个已经走过的键，于是永远走不完——表现是界面点下去没有任何反应、进程占满一个核。现在遍历快照（`[...state]`），编辑与删除都会立刻返回。
+- 测试补齐验收表：`selftest` 新增「同名不同大小写/空格被拒绝」「预置名不能被用户套装占用」「连续改默认不影响已有对话」「删除套装报告并释放全部绑定」「删除默认套装同时清空默认」「改名不动绑定」「写盘不留临时文件」「预置也能当默认」八项断言；`client-smoke` 的预置夹具改为随包发布的五套（仅聊天 / 编程用 / 查找资料 / 项目梳理 / 写作）。
+
 ## 未发布
 
 - 修 `kit_list`：返回值里带 `note`，但输出 schema 没有声明它，宿主按 schema 校验，于是这个工具**每次调用都直接失败**（`kit_list returned invalid output: "note" is not a declared property`）。现在 `note` 是合法字段，渲染时也会在套装名后显示备注；`selftest` 新增断言 `kit_list declares every field it returns`，防止返回值与 schema 再次漂移。

package/index.js

@@ -1132,8 +1132,19 @@ export function apply(ctx, config = {}) {
    */
   function ensureBindingApplied(agent) {
     if (agent === undefined || agent === null) return
-    const value = ensureBinding(agent)
+    let value = ensureBinding(agent)
     if (value === undefined) return
+    // A stored binding can name a kit that no longer exists — an older build, a
+    // hand-edited store, or a kit deleted while the app was closed. Applying it
+    // would compute an empty allow list and strip the conversation down to the
+    // kit_* tools, so such a conversation falls back to 全部 and the dangling
+    // name is rewritten to stop it resurfacing on every read.
+    if (value !== null && value !== DEFAULT_DSH && resolveKit(lastAgent, value) === undefined) {
+      book.assignments[sessionIdOf(agent)] = null
+      save()
+      ctx.logger?.warn(`dsh-loadout: 套装「${value}」已不存在，这个对话回到「全部」`)
+      value = null
+    }
     const selection = selectionForBinding(value)
     const current = state.get(agent)?.selection
     if (current !== undefined && sameSelection(current, selection)) return
@@ -1516,7 +1527,7 @@ export function apply(ctx, config = {}) {
         throw new Error('至少要选一个内置工具或一个插件，否则这个包等于"全部"')
       }
       if (oldName !== kit.name) {
-        for (const [agent, entry] of state) {
+        for (const [agent, entry] of [...state]) {
           if (entry.selection.base === BASE_KIT && entry.selection.kit === oldName) {
             entry.selection = { ...entry.selection, kit: kit.name }
             entry.label = labelOf(agent, entry.selection)
@@ -1526,7 +1537,11 @@ export function apply(ctx, config = {}) {
       // Editing the tools of the kit a conversation is running has to change that
       // conversation now: a saved edit that only takes effect after the next
       // switch reads as "the edit did nothing".
-      for (const [agent, entry] of state) {
+      //
+      // Iterate a snapshot: `useSelection` deletes and re-adds the agent's entry,
+      // and a Map iterator that is handed back an entry it already passed never
+      // finishes (that is a hang, not a slow loop).
+      for (const [agent, entry] of [...state]) {
         if (entry.selection.base === BASE_KIT && entry.selection.kit === kit.name) {
           useSelection(agent, { base: BASE_KIT, kit: kit.name, extras: [...entry.selection.extras] })
         }
@@ -1553,7 +1568,9 @@ export function apply(ctx, config = {}) {
       for (const [sessionId, value] of Object.entries(book.assignments)) {
         if (value === kit.name) book.assignments[sessionId] = null
       }
-      for (const [agent, entry] of state) {
+      // Snapshot for the same reason as `update`: each `useSelection` rewrites the
+      // map entry it belongs to.
+      for (const [agent, entry] of [...state]) {
         if (entry.selection.base === BASE_KIT && entry.selection.kit === kit.name) {
           useSelection(agent, emptySelection())
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-loadout",
-  "version": "0.12.0",
+  "version": "0.12.2",
   "description": "Loadout for DeepSeek Harness: group tools into kits, keep only the current kit's tools visible in each conversation, and manage everything from a settings panel.",
   "type": "module",
   "main": "./index.js",

package/scripts/client-smoke.mjs

@@ -179,11 +179,13 @@ const fixture = {
   ok: true,
   source: 'C:/fake/.dsh/loadout.json',
   presets: [
+    { name: 'chat', title: '仅聊天', allow: ['ask_user_question', 'web_search', 'read'] },
+    { name: 'coding', title: '编程用', allow: ['pwsh', 'read'] },
+    { name: 'research', title: '查找资料', allow: ['web_search', 'web_fetch'] },
+    { name: 'plan', title: '项目梳理', allow: ['read', 'write', 'todo_write'] },
     { name: 'writing', title: '写作', allow: ['read', 'write', 'edit'] },
-    { name: 'research', title: '调研', allow: ['web_search', 'web_fetch'] },
-    { name: 'coding', title: '编程', allow: ['pwsh', 'read'] },
   ],
-  presetNames: ['writing', 'research', 'coding'],
+  presetNames: ['chat', 'coding', 'research', 'plan', 'writing'],
   kits: [
     { name: 'mine', title: '我的套', note: '用于视频制作', builtins: ['read'], plugins: [], allow: ['read'], description: '内置 1 个', tokens: 860, isDefault: true },
     { name: 'other', title: '另一套', builtins: ['write'], plugins: [], allow: ['write'], description: '内置 1 个', tokens: 420, isDefault: false },
@@ -246,7 +248,7 @@ if (menu !== undefined) {
   check('我的套装 counts user kits only', allText.includes('我的套装（2）'), allText.slice(0, 400))
   // Presets are back from 0.12: they are the quickest way to start a known kind
   // of work, they stay read-only, and each one now says what it leaves out.
-  check('menu lists the presets again', allText.includes('预设套装（3）') && allText.includes('写作'), allText.slice(0, 400))
+  check('menu lists the presets again', allText.includes('预设套装（5）') && allText.includes('写作') && allText.includes('仅聊天'), allText.slice(0, 400))
   check('加挂 counts extras', allText.includes('加挂（1）'), allText.slice(0, 400))
   check('footer text is the approved sentence', allText.includes(FOOTER))
   check('the menu shows the note with the kit name', allText.includes('我的套（用于视频制作）'), allText.slice(0, 400))
@@ -320,7 +322,7 @@ try {
 try {
   const panel = expand(registration.component({ preview: { data: fixture, openSections: { presets: true, kits: true } } }))
   const panelText = textOf(panel)
-  check('settings lists the presets again', panelText.includes('预设套装 · 只读（3）') && panelText.includes('写作'), panelText.slice(0, 400))
+  check('settings lists the presets again', panelText.includes('预设套装 · 只读（5）') && panelText.includes('写作') && panelText.includes('项目梳理'), panelText.slice(0, 400))
   check('settings lists my kits', panelText.includes('我的套装'), panelText.slice(0, 400))
   check('settings picks a default kit', panelText.includes('新对话默认套装') && panelText.includes('仅内置'), panelText.slice(0, 400))
   check('a note rides next to the kit name', panelText.includes('我的套（用于视频制作）'), panelText.slice(0, 400))
@@ -335,7 +337,7 @@ try {
   const copyButtons = nodesIn(panel, (node) => node.type === 'button' && textOf(node) === '复制切换命令')
   const defaultButtons = nodesIn(panel, (node) => node.type === 'button' && textOf(node) === '设为默认')
   // 2 defaults + 3 presets + 2 user kits — every card carries both actions.
-  check('全部 and 仅内置 are cards with the two actions', copyButtons.length === 7 && defaultButtons.length === 7, `${copyButtons.length}/${defaultButtons.length}`)
+  check('全部 and 仅内置 are cards with the two actions', copyButtons.length === 9 && defaultButtons.length === 9, `${copyButtons.length}/${defaultButtons.length}`)
   check('preset cards no longer offer save-as', !panelText.includes('另存为我的套装'), panelText.slice(0, 400))
   const editButtons = nodesIn(panel, (node) => node.type === 'button' && textOf(node) === '编辑')
   check('settings offers an edit action for saved kits', editButtons.length === 2, `${editButtons.length} · 编辑`)

package/scripts/selftest.mjs

@@ -151,13 +151,50 @@ function childFor(dependencies, built, commands, routes) {
   return child
 }
 
+const COLLAB = ['send_message', 'list_agents', 'interrupt_agent', 'subagent', 'subagent_fork']
+
+// The coding preset restricted to what the fake runtime actually exposes: the
+// collaboration five are listed by the real preset, but this fake agent only owns
+// subagent from that group, and a tool it cannot see can never survive a mask.
+const CODING_KEPT = ['pwsh', 'read', 'write', 'edit', 'glob', 'grep', 'todo_write', 'subagent', ...OWN_TOOLS]
+
+// Mirrors the presets in `cordis.patch.yml` (the host hands this same shape to
+// `apply`). The last check in this block keeps the two lists from drifting.
 const config = {
   defaultKit: 'writing',
   kits: [
-    { name: 'writing', title: '写作', builtins: ['read', 'write', 'edit'] },
-    { name: 'research', title: '调研', builtins: ['web_search', 'web_fetch'] },
-    { name: 'coding', title: '编程', builtins: ['pwsh', 'read'] },
-  ],
+    {
+      name: 'chat',
+      title: '仅聊天',
+      builtins: ['ask_user_question', 'weather', 'web_search', 'web_fetch', 'read'],
+    },
+    { name: 'coding', title: '编程用', builtins: ['pwsh', 'read', 'write', 'edit', 'glob', 'grep', 'todo_write'] },
+    {
+      name: 'research',
+      title: '查找资料',
+      builtins: ['web_search', 'web_fetch', 'advanced_search', 'research', 'platform_search', 'read', 'write', 'glob', 'grep'],
+    },
+    {
+      name: 'plan',
+      title: '项目梳理',
+      builtins: ['ask_user_question', 'web_search', 'web_fetch', 'read', 'write', 'edit', 'glob', 'grep', 'todo_write'],
+    },
+    { name: 'writing', title: '写作', builtins: ['read', 'write', 'edit', 'glob', 'grep'] },
+  ].map((preset) => ({
+    ...preset,
+    // Every preset carries the collaboration five, or a subagent running it
+    // cannot answer its parent at all.
+    builtins: [...preset.builtins, 'send_message', 'list_agents', 'interrupt_agent', 'subagent', 'subagent_fork'],
+  })),
+}
+
+// The five preset ids must exist in the shipped patch too — the test's copy above
+// is hand-written, and a rename in one place without the other is silent drift.
+{
+  const patch = readFileSync(new URL('../cordis.patch.yml', import.meta.url), 'utf8')
+  const missing = config.kits.filter((preset) => !new RegExp(`name:\\s*${preset.name}\\b`).test(patch))
+  check('the shipped patch carries every preset the tests use',
+    missing.length === 0, missing.map((preset) => preset.name).join(','))
 }
 
 const ctx = makeCtx()
@@ -345,7 +382,7 @@ let listed = await run('kit_list', {}, agent)
 check('kit_list active title', listed.active === '写作', listed.active)
 check('kit_list base is kit', listed.base === 'kit', listed.base)
 check('kit_list prefers the shipped config', listed.source === 'bundle 配置', listed.source)
-check('kit_list has three presets', listed.presets.length === 3, String(listed.presets.length))
+check('kit_list lists the five shipped presets', listed.presets.length === 5, String(listed.presets.length))
 check('kit_list has no user kit yet', listed.kits.length === 0, String(listed.kits.length))
 // The host validates execute() output against the declared schema, so a field
 // that is returned but not declared fails the whole call at runtime
@@ -360,12 +397,12 @@ check('kit_list has no user kit yet', listed.kits.length === 0, String(listed.ki
 }
 
 // ---- kit_apply by title ------------------------------------------------------
-const appliedKit = await run('kit_apply', { kit: '编程' }, agent)
+const appliedKit = await run('kit_apply', { kit: '编程用' }, agent)
 check('kit_apply by title', appliedKit.kit === 'coding', appliedKit.kit)
 check('previous restriction released', agent.filters[0].active === false)
 check(
   'preset keeps exactly its built-ins plus own tools',
-  sameSet(keptOf(agent), ['pwsh', 'read', ...OWN_TOOLS]),
+  sameSet(keptOf(agent), CODING_KEPT),
   keptOf(agent).join(','),
 )
 
@@ -380,7 +417,7 @@ check('unknown kit throws', unknownError.includes('未知套装'), unknownError)
 // ---- GET /state exposes the whole model -------------------------------------
 let state = await getState()
 check('state route 200', state.status === 200, String(state.status))
-check('state lists presets with names', JSON.stringify(state.body.presetNames) === JSON.stringify(['writing', 'research', 'coding']), JSON.stringify(state.body.presetNames))
+check('state lists presets with names', JSON.stringify(state.body.presetNames) === JSON.stringify(['chat', 'coding', 'research', 'plan', 'writing']), JSON.stringify(state.body.presetNames))
 check('state lists preset allow', Array.isArray(state.body.presets) && state.body.presets[0].allow.includes('read'), JSON.stringify(state.body.presets?.[0]))
 check('state splits the catalog', Array.isArray(state.body.catalog.builtins) && Array.isArray(state.body.catalog.plugins), JSON.stringify(state.body.catalog))
 check(
@@ -433,7 +470,7 @@ check('presets carry a token estimate', Number.isFinite(answer.body.presets[0].t
 answer = await post({ action: 'applyBase', sessionId: SESSION_ID, base: 'kit', kit: 'coding' })
 const kitKept = keptOf(agent)
 check('applyBase kit 200', answer.status === 200, JSON.stringify(answer.body))
-check('kit keeps only its built-ins', sameSet(kitKept, ['pwsh', 'read', ...OWN_TOOLS]), kitKept.join(','))
+check('kit keeps only its built-ins', sameSet(kitKept, CODING_KEPT), kitKept.join(','))
 check('kit masks plugin tools', !kitKept.includes('demo_search'), kitKept.join(','))
 
 let badBase = await post({ action: 'applyBase', sessionId: SESSION_ID, base: 'kit', kit: 'ghost' })
@@ -678,7 +715,7 @@ check('GET answers for the Session it names', firstView.body.selection.kit === '
 check('GET answers for a different Session', secondView.body.selection.kit === 'research', JSON.stringify(secondView.body.selection))
 check(
   'two Sessions do not leak into each other',
-  firstView.body.label === '编程' && secondView.body.label === '调研',
+  firstView.body.label === '编程用' && secondView.body.label === '查找资料',
   JSON.stringify([firstView.body.label, secondView.body.label]),
 )
 
@@ -785,6 +822,102 @@ try {
 }
 check('a reserved name is refused', /全部/u.test(reservedError ?? ''), reservedError)
 
+// T18: the same name with different case or surrounding space is the same kit.
+let caseDupError
+await ctxV2.registered.get('kit_create').execute(
+  { name: 'qa', title: '问答', builtins: ['read'], plugins: [] }, exec(agentB))
+try {
+  await ctxV2.registered.get('kit_create').execute(
+    { name: ' QA ', title: '重复', builtins: ['read'], plugins: [] }, exec(agentB))
+} catch (error) {
+  caseDupError = String(error?.message ?? error)
+}
+check('a name that differs only by case or space is refused',
+  /已存在/u.test(caseDupError ?? ''), caseDupError)
+
+// T24: a user kit may not shadow a shipped preset.
+let presetClashError
+try {
+  await ctxV2.registered.get('kit_create').execute(
+    { name: 'chat', title: '冒充预置', builtins: ['read'], plugins: [] }, exec(agentB))
+} catch (error) {
+  presetClashError = String(error?.message ?? error)
+}
+check('a preset name cannot be taken by a user kit',
+  /预置/u.test(presetClashError ?? ''), presetClashError)
+
+// T22: a binding that names a kit removed outside the app falls back to 全部.
+// Simulated the way it really happens: the kit is gone from the store file when
+// the app starts again, so a fresh module instance has to cope with it.
+await ctxV2.registered.get('kit_create').execute(
+  { name: 'ghost-kit', title: '已删除的', builtins: ['read'], plugins: [] }, exec(agentB))
+await ctxV2.registered.get('kit_assign').execute({ sessionId: 'session-ghost', kit: 'ghost-kit' }, exec(agentB))
+const storeWithGhost = storeOf()
+storeWithGhost.kits = storeWithGhost.kits.filter((kit) => kit.name !== 'ghost-kit')
+writeFileSync(join(v2Home, '.dsh', 'loadout.json'), JSON.stringify(storeWithGhost), 'utf8')
+const v2b = await import('../index.js?v2=2')
+const ctxV2b = makeCtx()
+v2b.apply(ctxV2b, { defaultKit: '', kits: config.kits })
+const agentGhost = makeAgent(undefined, { id: 'session-ghost' })
+for (const handler of ctxV2b.handlers.get('agent/created') ?? []) handler(agentGhost)
+check('a binding to a deleted kit falls back to 全部',
+  storeOf().assignments['session-ghost'] === null && keptOf(agentGhost).includes('web_search'),
+  JSON.stringify({ assignments: storeOf().assignments, kept: keptOf(agentGhost) }))
+
+// T03/T05: the default changes again; conversations that already answered keep theirs.
+const agentC = makeAgent(undefined, { id: 'session-c' })
+await ctxV2.registered.get('kit_set_default').execute({ name: 'chat' }, exec(agentB))
+fireCreated(agentC)
+check('changing the default twice keeps earlier conversations',
+  storeOf().assignments['session-a'] === null && storeOf().assignments['session-c'] === 'chat',
+  JSON.stringify(storeOf().assignments))
+
+// T08: deleting a kit reports and releases every conversation that held it.
+await ctxV2.registered.get('kit_create').execute(
+  { name: 'shared', title: '共享', builtins: ['read'], plugins: [] }, exec(agentB))
+for (const id of ['session-a', 'session-b', 'session-c']) {
+  await ctxV2.registered.get('kit_assign').execute({ sessionId: id, kit: 'shared' }, exec(agentB))
+}
+const sharedDelete = await ctxV2.registered.get('kit_delete').execute({ name: 'shared' }, exec(agentB))
+check('deleting a kit reports every conversation it held',
+  sharedDelete.affectedSessions === 3
+    && ['session-a', 'session-b', 'session-c'].every((id) => storeOf().assignments[id] === null),
+  JSON.stringify({ sharedDelete, assignments: storeOf().assignments }))
+
+// T09: deleting the default kit also clears the default.
+await ctxV2.registered.get('kit_create').execute(
+  { name: 'shared-two', title: '共享二', builtins: ['read'], plugins: [] }, exec(agentB))
+await ctxV2.registered.get('kit_set_default').execute({ name: 'shared-two' }, exec(agentB))
+await ctxV2.registered.get('kit_assign').execute({ sessionId: 'session-a', kit: 'shared-two' }, exec(agentB))
+const defaultDelete = await ctxV2.registered.get('kit_delete').execute({ name: 'shared-two' }, exec(agentB))
+check('deleting the default kit clears the default',
+  defaultDelete.affectedSessions === 1
+    && (storeOf().defaultKit === null || storeOf().defaultKit === ''),
+  JSON.stringify({ defaultDelete, defaultKit: storeOf().defaultKit }))
+
+// T10: renaming changes the display name only; bindings point at the stable id.
+await ctxV2.registered.get('kit_create').execute(
+  { name: 'stable', title: '稳定', builtins: ['read'], plugins: [] }, exec(agentB))
+await ctxV2.registered.get('kit_assign').execute({ sessionId: 'session-b', kit: 'stable' }, exec(agentB))
+await ctxV2.registered.get('kit_rename').execute({ name: 'stable', title: '稳定改名' }, exec(agentB))
+check('renaming a bound kit keeps the binding',
+  storeOf().assignments['session-b'] === 'stable'
+    && storeOf().kits.some((kit) => kit.name === 'stable' && kit.title === '稳定改名'),
+  JSON.stringify(storeOf().kits.map((kit) => [kit.name, kit.title])))
+
+// T15: every write is a complete file — the temporary one never survives.
+check('the store write leaves no temporary file',
+  !existsSync(join(v2Home, '.dsh', 'loadout.json.tmp')), 'loadout.json.tmp is still there')
+
+// T25: a shipped preset can be the new-conversation default too.
+await ctxV2.registered.get('kit_set_default').execute({ name: 'plan' }, exec(agentB))
+const agentD = makeAgent(undefined, { id: 'session-d' })
+fireCreated(agentD)
+check('a preset can be the default',
+  storeOf().assignments['session-d'] === 'plan'
+    && keptOf(agentD).includes('read') && !keptOf(agentD).includes('pwsh'),
+  JSON.stringify({ binding: storeOf().assignments['session-d'], kept: keptOf(agentD) }))
+
 process.env.USERPROFILE = savedHomeV2
 process.env.HOME = savedHomeV2b
 rmSync(v2Home, { recursive: true, force: true })