dsh-loadout 0.12.1 → 0.12.3

package/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 「装备栏」是一个 DeepSeek Harness 插件：给每个对话选一套工具（套装），只把用得上的工具投给模型。
 
+## 0.12.3
+
+- **标题栏按钮不再「点一下才对」**：芯片只在菜单被打开时才去读状态，所以进对话先看到「装备栏」，点开一次才换成套装名。现在挂载就读一次，并监听 dsh-loadout:changed 与窗口 ocus，别处切了套装也会立刻跟上。
+- **设置页「预设套装」默认折叠**：与「我的套装」一致——折叠时只显示当前被设为默认的那一套，展开才列出五套。
+- **同名撞车**：0.12 之前手建的套装如果叫 chat / plan 这类预置名，
+- 回归断言： user kit shadowing a preset is renamed、	he renamed kit keeps its default and its bindings、presets start collapsed、 collapsed preset group keeps the default visible。
+## 0.12.2
+
+- **修「绑定到已不存在的套装」**：如果某个对话绑的套装在应用关着的时候被删掉（旧版本、手改 loadout.json、或别的机器同步过来的文件），启动后它会被当成「空套装」套用——等于把这对话的工具连同内置工具一起裁光，只剩 kit_*。现在这种绑定在第一次被读到时回退到「全部」，并把 ssignments 里那个失效名字改成 
+ull，日志里留一行说明。回归断言： binding to a deleted kit falls back to 全部（用第二个模块实例模拟重启）。
 ## 0.12.1
 
 - **修卡死**：编辑（覆盖保存）、重命名或删除一个正在被对话使用的套装时，宿主会遍历「正在用它的对话」并逐个重新套用工具；这个遍历边改边往 `Map` 里重写条目，迭代器被塞回一个已经走过的键，于是永远走不完——表现是界面点下去没有任何反应、进程占满一个核。现在遍历快照（`[...state]`），编辑与删除都会立刻返回。

package/client.js

@@ -475,9 +475,24 @@ window.__ModuleLoader__.load({
         }
       }, [sessionId])
 
+      // The label is this conversation's persisted binding, so read it as soon as
+      // the chip mounts: waiting for the first click is what made a bound
+      // conversation show 装备栏 until the menu was opened once.
       useEffect(() => {
-        if (open) refresh()
-      }, [open, refresh])
+        refresh()
+      }, [refresh])
+
+      // Another surface (the settings page, the /kit command) may have changed
+      // this conversation's binding while the chip sat idle.
+      useEffect(() => {
+        const sync = () => { refresh() }
+        document.addEventListener('dsh-loadout:changed', sync)
+        window.addEventListener('focus', sync)
+        return () => {
+          document.removeEventListener('dsh-loadout:changed', sync)
+          window.removeEventListener('focus', sync)
+        }
+      }, [refresh])
 
       useEffect(() => {
         if (!open) return undefined
@@ -946,7 +961,7 @@ window.__ModuleLoader__.load({
       // 我的套装 starts collapsed, like the chip: the page's job is "which set does
       // a new conversation start with", and a list of five kits does not answer it.
       // The test seam can seed it open so the card assertions never depend on a click.
-      const [openSections, setOpenSections] = useState(preview?.openSections ?? { presets: true, kits: false })
+      const [openSections, setOpenSections] = useState(preview?.openSections ?? { presets: false, kits: false })
 
       const refresh = useCallback(async () => {
         try {
@@ -1007,6 +1022,7 @@ window.__ModuleLoader__.load({
       // A collapsed 我的套装 still answers "which kit is the default", the same way
       // the chip does.
       const defaultKitRow = kits.find((kit) => kit.name === data.defaultKit)
+      const defaultPresetRow = presets.find((preset) => preset.name === data.defaultKit)
 
       const saveDraft = async () => {
         if (draft === null) return
@@ -1195,6 +1211,21 @@ window.__ModuleLoader__.load({
                 onDelete: () => {},
               }))))
           : null,
+        SHOW_PRESETS === true && openSections.presets === false
+          // Collapsed, exactly like 我的套装: only the preset that is the
+          // default stays visible, so the group still answers "new conversations
+          // start with this".
+          ? (defaultPresetRow === undefined
+            ? null
+            : h(MenuRow, {
+              key: `default-preset-${defaultPresetRow.name}`,
+              label: kitLabel(defaultPresetRow),
+              hint: '当前默认',
+              indent: true,
+              active: true,
+              onClick: () => act({ action: 'default', name: defaultPresetRow.name }),
+            }))
+          : null,
         h(GroupHead, {
           title: '我的套装',
           count: kits.length,

package/index.js

@@ -418,7 +418,46 @@ export function apply(ctx, config = {}) {
     }
   }
 
+  /**
+   * A kit saved before the preset list existed may carry a preset's name or
+   * title (`chat`, `plan`, `写作`…). `resolveKit` prefers user kits, so a
+   * default naming such a preset would actually answer the user's kit while the
+   * settings page marked the preset — two rows claiming 「默认」. Renaming is the
+   * only honest fix: keep the user's kit (with its tools) under a free name and
+   * repoint every binding that used the old one.
+   */
+  function disambiguatePresetClashes() {
+    const taken = new Set(presets.flatMap((preset) => [preset.name.toLowerCase(), preset.title.toLowerCase()]))
+    const changed = []
+    for (const kit of book.kits) {
+      const nameClash = taken.has(kit.name.toLowerCase())
+      const titleClash = taken.has(kit.title.toLowerCase())
+      if (!nameClash && !titleClash) continue
+      const before = kit.name
+      if (nameClash) {
+        let suffix = 2
+        let candidate = `${before}-${suffix}`
+        while (taken.has(candidate.toLowerCase()) || findKit(book.kits, candidate) !== undefined) {
+          suffix += 1
+          candidate = `${before}-${suffix}`
+        }
+        kit.name = candidate
+        taken.add(candidate.toLowerCase())
+      }
+      if (titleClash) kit.title = `${kit.title}（自建）`
+      for (const [sessionId, value] of Object.entries(book.assignments)) {
+        if (value === before) book.assignments[sessionId] = kit.name
+      }
+      if (book.defaultKit === before) book.defaultKit = kit.name
+      changed.push(`${before} → ${kit.name}`)
+    }
+    if (changed.length === 0) return
+    save()
+    ctx.logger?.warn(`dsh-loadout: 自建套装与预置同名，已改名（没有删除）：${changed.join('，')}`)
+  }
+
   migrateBook()
+  disambiguatePresetClashes()
 
   /** agent -> { selection: {base,kit,extras}, label, dispose } */
   const state = new Map()
@@ -1132,8 +1171,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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-loadout",
-  "version": "0.12.1",
+  "version": "0.12.3",
   "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

@@ -344,6 +344,21 @@ try {
   check('kit cards show their own estimate', panelText.includes('≈860 tokens') && panelText.includes('≈420 tokens'), panelText.slice(0, 400))
   const deleteButtons = nodesIn(panel, (node) => node.type === 'button' && textOf(node) === '删除')
   check('only my kits can be deleted', deleteButtons.length === 2, `${deleteButtons.length} · 删除@${panelText.indexOf('删除')} · ${panelText.slice(0, 200)}`)
+
+  // Presets start collapsed, and while collapsed they behave like 我的套装: the
+  // one that is the default stays visible so the page still answers "a new
+  // conversation starts with this".
+  const presetDefault = { ...fixture, defaultKit: 'chat', selection: { base: 'kit', kit: 'chat', extras: [] } }
+  const collapsed = expand(registration.component({ preview: { data: presetDefault } }))
+  const collapsedText = textOf(collapsed)
+  check('presets start collapsed',
+    collapsedText.includes('预设套装 · 只读（5）') && !collapsedText.includes('写作'), collapsedText.slice(0, 400))
+  check('a collapsed preset group keeps the default visible',
+    collapsedText.includes('仅聊天') && collapsedText.includes('当前默认'), collapsedText.slice(0, 400))
+  const presetExpanded = expand(registration.component({ preview: { data: presetDefault, openSections: { presets: true, kits: false } } }))
+  const presetExpandedText = textOf(presetExpanded)
+  check('only the default preset carries the default tag',
+    presetExpandedText.includes('仅聊天') && presetExpandedText.includes('默认'), presetExpandedText.slice(0, 400))
   const renameButtons = nodesIn(panel, (node) => node.type === 'button' && textOf(node) === '重命名')
   // Renaming moved into 编辑: one editor for name, note and tools on the card.
   check('renaming lives inside 编辑 rather than its own button', renameButtons.length === 0 && editButtons.length === 2, `${renameButtons.length} · 重命名 / ${editButtons.length} · 编辑`)

package/scripts/selftest.mjs

@@ -846,6 +846,24 @@ try {
 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))
@@ -904,6 +922,38 @@ process.env.USERPROFILE = savedHomeV2
 process.env.HOME = savedHomeV2b
 rmSync(v2Home, { recursive: true, force: true })
 
+// ---- a user kit that shadows a preset is renamed, never deleted ------------
+// Stores written before the preset list existed can carry `chat` / `plan`, which
+// `resolveKit` prefers over the preset of the same name — the settings page then
+// showed two rows as 默认. The upgrade renames the user's kit and repoints every
+// binding that used it.
+const clashHome = join(tmpdir(), `loadout-clash-${process.pid}`)
+rmSync(clashHome, { recursive: true, force: true })
+mkdirSync(join(clashHome, '.dsh', 'sessions', 'ws', 'session-clash'), { recursive: true })
+process.env.USERPROFILE = clashHome
+process.env.HOME = clashHome
+writeFileSync(join(clashHome, '.dsh', 'loadout.json'), JSON.stringify({
+  schema: 2,
+  kits: [{ name: 'chat', title: '聊天', builtins: ['read'], plugins: [] }],
+  defaultKit: 'chat',
+  assignments: { 'session-clash': 'chat' },
+  migratedAt: new Date().toISOString(),
+}), 'utf8')
+const clash = await import('../index.js?clash=1')
+const ctxClash = makeCtx()
+clash.apply(ctxClash, { defaultKit: '', kits: config.kits })
+const clashStore = JSON.parse(readFileSync(join(clashHome, '.dsh', 'loadout.json'), 'utf8'))
+check('a user kit shadowing a preset is renamed',
+  clashStore.kits.length === 1 && clashStore.kits[0].name === 'chat-2'
+    && clashStore.kits[0].title === '聊天' && clashStore.kits[0].builtins.join(',') === 'read',
+  JSON.stringify(clashStore.kits))
+check('the renamed kit keeps its default and its bindings',
+  clashStore.defaultKit === 'chat-2' && clashStore.assignments['session-clash'] === 'chat-2',
+  JSON.stringify({ defaultKit: clashStore.defaultKit, assignments: clashStore.assignments }))
+process.env.USERPROFILE = savedHomeV2
+process.env.HOME = savedHomeV2b
+rmSync(clashHome, { recursive: true, force: true })
+
 // ---- legacy store: plugin-kits.json is read once ---------------------------
 const legacyHome = join(tmpdir(), `loadout-legacy-${process.pid}`)
 rmSync(legacyHome, { recursive: true, force: true })