dsh-loadout 0.12.2 → 0.12.4

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 「装备栏」是一个 DeepSeek Harness 插件：给每个对话选一套工具（套装），只把用得上的工具投给模型。
 
+## 0.12.4（本地测试版，未发布）
+
+- **重名当场说清楚**：新建/编辑套装时，输入框下方直接给出原因——「「仅聊天」是预置套装（标识 chat），不能用这个名字」，或是「已经有叫「我的套」的套装了」。占用时保存按钮置灰，不用等提交后才失败。
+- 说明重名判定：名字先 trim + NFKC + 转小写，然后同时比对**自建套装的 name 与 title**、**预置套装的 name（稳定标识）与 title（界面显示）**、以及保留字（全部 / 仅内置 / all / default…）。所以预置显示「仅聊天」时，chat 依然被占用——chat 是它的标识。
+- 宿主错误文案同步：「仅聊天」是预置套装（标识 chat），不能占用这个名字。
+- **「＋ 新建套装」改成动作色**：蓝色文字 + 浅蓝底 + 悬停加深，右侧补一句「从零配一套」，跟下面那些「点一下就切换」的套装行区分开。
+- **「我的套装」折叠时也留着「＋ 新建套装」**：网格收起只显示当前在用的那一套，创建入口始终在最后一行，不用先点开分组。
+
+## 0.12.3
+
+- **标题栏按钮不再「点一下才对」**：芯片只在菜单被打开时才去读状态，所以进对话先看到「装备栏」，点开一次才换成套装名。现在挂载就读一次，并监听 dsh-loadout:changed 与窗口 focus，别处切了套装也会立刻跟上。
+- **设置页「预设套装」默认折叠**：与「我的套装」一致——折叠时只显示当前被设为默认的那一套，展开才列出五套。
+- **同名撞车**：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 里那个失效名字改成 

package/client.js

@@ -46,6 +46,28 @@ window.__ModuleLoader__.load({
       return kit.note ? `${kit.title}（${kit.note}）` : kit.title
     }
 
+    /**
+     * Why a name cannot be saved, in the user's terms. The host compares a kit
+     * against preset *ids* as well as titles (a preset's `name` is a stable id —
+     * `chat` — while the UI shows its title, 仅聊天), so "chat" is refused even
+     * though it "looks different". Return '' when the name is free.
+     */
+    function nameClash(raw, presets, kits, ignore) {
+      const value = String(raw ?? '').trim().toLowerCase()
+      if (value === '') return ''
+      const preset = (presets ?? []).find((item) =>
+        String(item.name ?? '').toLowerCase() === value || String(item.title ?? '').toLowerCase() === value)
+      if (preset !== undefined) {
+        return `「${preset.title}」是预置套装（标识 ${preset.name}），不能用这个名字，换一个吧`
+      }
+      const kit = (kits ?? []).find((item) =>
+        String(item.name ?? '').toLowerCase() === value || String(item.title ?? '').toLowerCase() === value)
+      if (kit !== undefined && kit.name !== ignore) {
+        return `已经有叫「${kit.title ?? kit.name}」的套装了，换一个名字，或者进去编辑它`
+      }
+      return ''
+    }
+
     /**
      * Presets (仅聊天 / 编程用 / 查找资料 / 项目梳理 / 写作) are shown again from
      * 0.12: they are the fastest way to start a conversation of a known kind,
@@ -133,6 +155,10 @@ window.__ModuleLoader__.load({
       },
       rowHover: { background: 'rgba(59,130,246,.08)' },
       rowActive: { background: 'rgba(59,130,246,.10)' },
+      // The one row that creates something, not selects something: keep it
+      // blue and tinted so it reads as an action at a glance.
+      rowPrimary: { color: '#2563eb', background: 'rgba(37,99,235,.07)', fontWeight: 600 },
+      rowPrimaryHover: { background: 'rgba(37,99,235,.14)' },
       rowDisabled: { opacity: 0.45, cursor: 'default' },
       indent: { paddingLeft: 26 },
       mark: { width: 12, flex: 'none', color: '#2563eb', fontSize: 12, textAlign: 'center' },
@@ -273,7 +299,8 @@ window.__ModuleLoader__.load({
         ...styles.row,
         ...(props.indent === true ? styles.indent : null),
         ...(props.active === true ? styles.rowActive : null),
-        ...(hover && !disabled ? styles.rowHover : null),
+        ...(props.tone === 'primary' ? styles.rowPrimary : null),
+        ...(hover && !disabled ? (props.tone === 'primary' ? styles.rowPrimaryHover : styles.rowHover) : null),
         ...(disabled ? styles.rowDisabled : null),
       }
       const activate = () => {
@@ -295,7 +322,7 @@ window.__ModuleLoader__.load({
         },
       },
       h('span', { style: styles.mark }, props.active === true ? '✓' : ''),
-      h('span', { style: styles.rowTitle },
+      h('span', { style: { ...styles.rowTitle, ...(props.tone === 'primary' ? { color: '#2563eb' } : null) } },
         props.tip === undefined
           ? h('span', null, props.label)
           : h(Tip, { text: props.tip }, h('span', null, props.label))),
@@ -337,7 +364,7 @@ window.__ModuleLoader__.load({
     function Builder(props) {
       const {
         catalog, draft, onChange, busy, onCancel, onSave, saveLabel,
-        title, onSaveAs, saveAsLabel, nameField, namePlaceholder,
+        title, onSaveAs, saveAsLabel, nameField, namePlaceholder, clash,
       } = props
       // Both lists start collapsed: the builder opens with a name field and a
       // summary, not with forty checkboxes.
@@ -368,6 +395,12 @@ window.__ModuleLoader__.load({
           value: draft[nameField ?? 'name'] ?? '',
           onChange: (event) => onChange({ ...draft, [nameField ?? 'name']: event.target.value }),
         }),
+        // The host rejects a name that a preset or another kit already uses;
+        // saying so *here* keeps the user from staring at a save button that
+        // silently does nothing.
+        typeof clash === 'string' && clash !== ''
+          ? h('div', { style: { ...styles.error, marginTop: 4 } }, clash)
+          : null,
         h('input', {
           style: { ...styles.input, marginTop: 6 },
           placeholder: `备注（可选，最多 ${NOTE_MAX} 字），例如 用于视频制作`,
@@ -413,7 +446,12 @@ window.__ModuleLoader__.load({
           onSaveAs === undefined
             ? null
             : h('button', { type: 'button', style: styles.ghost, disabled: busy, onClick: onSaveAs }, saveAsLabel ?? '另存为新套装'),
-          h('button', { type: 'button', style: styles.primary, disabled: busy, onClick: onSave }, saveLabel ?? '保存')))
+          h('button', {
+            type: 'button',
+            style: { ...styles.primary, ...(typeof clash === 'string' && clash !== '' ? { opacity: 0.5 } : null) },
+            disabled: busy || (typeof clash === 'string' && clash !== ''),
+            onClick: onSave,
+          }, saveLabel ?? '保存')))
     }
 
     // ---- the header control -------------------------------------------------
@@ -429,7 +467,7 @@ window.__ModuleLoader__.load({
       // collapsed group still shows the one active row, and clicking the head is
       // how you go browsing.
       const [groups, setGroups] = useState(preview?.groups ?? { kits: false, presets: false, extras: false, applied: false })
-      const [builder, setBuilder] = useState(null)
+      const [builder, setBuilder] = useState(preview?.builder ?? null)
       const [saveAs, setSaveAs] = useState(false)
       const [saveName, setSaveName] = useState('')
       const [saveNote, setSaveNote] = useState('')
@@ -475,9 +513,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
@@ -681,9 +734,10 @@ window.__ModuleLoader__.load({
           tip: '你自己保存的套装。点一下即可切换。',
           onToggle: () => setGroups({ ...groups, kits: !groups.kits }),
         }),
-        // A collapsed group shows exactly one row: the set that is on. Everything
-        // else waits for a click on the head.
+        // A collapsed group shows the set that is on, plus the one action that
+        // creates a set — so "new kit" never needs a click on the head first.
         activeUserKit === undefined ? null : h(MenuRow, {
+          key: 'active-kit',
           label: kitLabel(activeUserKit),
           hint: activeUserKit.isDefault ? '默认' : '',
           active: true,
@@ -691,27 +745,31 @@ window.__ModuleLoader__.load({
           onClick: () => run({ action: 'applyBase', base: 'kit', kit: activeUserKit.name }),
         }),
         groups.kits === true
-          ? h('div', null,
-            ...kits
-              .filter((kit) => activeUserKit === undefined || kit.name !== activeUserKit.name)
-              .map((kit) => h(MenuRow, {
-                key: kit.name,
-                label: kitLabel(kit),
-                hint: kit.isDefault ? '默认' : '',
-                indent: true,
-                onClick: () => {
-                  run({ action: 'applyBase', base: 'kit', kit: kit.name })
-                  // Picking one puts the list away again; the row that stays is the
-                  // one just chosen, right under the group head.
-                  setGroups({ ...groups, kits: false })
-                },
-              })),
-            h(MenuRow, {
-              label: '＋ 新建套装',
+          ? kits
+            .filter((kit) => activeUserKit === undefined || kit.name !== activeUserKit.name)
+            .map((kit) => h(MenuRow, {
+              key: kit.name,
+              label: kitLabel(kit),
+              hint: kit.isDefault ? '默认' : '',
               indent: true,
-              onClick: () => openBuilder({ builtins: allBuiltins, plugins: [] }),
+              onClick: () => {
+                run({ action: 'applyBase', base: 'kit', kit: kit.name })
+                // Picking one puts the list away again; the row that stays is the
+                // one just chosen, right under the group head.
+                setGroups({ ...groups, kits: false })
+              },
             }))
           : null,
+        // Always last inside 我的套装, open or collapsed: the create action sits
+        // where the eye ends up after scanning the kits.
+        h(MenuRow, {
+          key: 'new-kit',
+          label: '＋ 新建套装',
+          tone: 'primary',
+          hint: '从零配一套',
+          indent: true,
+          onClick: () => openBuilder({ builtins: allBuiltins, plugins: [] }),
+        }),
         SHOW_PRESETS === true
           ? h(GroupHead, {
             title: '预设套装',
@@ -835,6 +893,7 @@ window.__ModuleLoader__.load({
           onCancel: () => setBuilder(null),
           onSave: saveBuilder,
           saveLabel: '保存并启用',
+          clash: nameClash(builder.name, presets, kits, null),
         })
 
       return h('div', { style: styles.wrap, ref: box },
@@ -939,14 +998,14 @@ window.__ModuleLoader__.load({
       const [data, setData] = useState(preview?.data ?? null)
       const [busy, setBusy] = useState(false)
       const [message, setMessage] = useState('')
-      const [draft, setDraft] = useState(null)
+      const [draft, setDraft] = useState(preview?.draft ?? null)
       // Editing a saved kit reuses the same builder as creating one; only the
       // action buttons differ (覆盖保存 keeps the name, 另存为新套装 mints a new one).
       const [editingKit, setEditingKit] = useState(null)
       // 我的套装 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 +1066,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
@@ -1130,6 +1190,7 @@ window.__ModuleLoader__.load({
               onCancel: () => setDraft(null),
               onSave: saveDraft,
               saveLabel: '保存',
+              clash: nameClash(draft.name, presets, kits, null),
             })),
         message === '' ? null : h('div', { style: styles.error }, message),
         h('div', { style: styles.ledger },
@@ -1195,6 +1256,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,
@@ -1265,6 +1341,7 @@ window.__ModuleLoader__.load({
                       },
                       onSave: saveOverwrite,
                       saveLabel: '覆盖保存',
+                      clash: nameClash(draft.title, presets, kits, editingKit),
                       onSaveAs: saveEditingAsNew,
                       saveAsLabel: '另存为新套装',
                     }))

package/index.js

@@ -98,7 +98,8 @@ function assertKitName(raw, presets) {
   if (NAME_FORBIDDEN.test(value)) throw new Error('名字里不能有 / \\ : * ? " < > | 或控制字符')
   const lower = value.toLowerCase()
   if (RESERVED_NAMES.includes(lower)) throw new Error(`"${value}" 是保留名字，请换一个名字`)
-  if (presets !== undefined && findKit(presets, value) !== undefined) throw new Error(`"${value}" 与预置套装同名，请换一个名字`)
+  const preset = presets === undefined ? undefined : findKit(presets, value)
+  if (preset !== undefined) throw new Error(`「${preset.title}」是预置套装（标识 ${preset.name}），不能占用这个名字`)
   return value
 }
 
@@ -418,7 +419,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()

package/package.json

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

@@ -233,6 +233,8 @@ if (menuDefault !== undefined) {
   check('presets start collapsed', !flat.includes('写作'), flat.slice(0, 400))
   check('user kits start collapsed', !flat.includes('另一套'), flat.slice(0, 400))
   check('the active kit is the only kit row while collapsed', flat.includes('我的套（用于视频制作）'), flat.slice(0, 400))
+  // Creating a kit must not need a click on the group head first.
+  check('the new-kit row is visible while my kits are collapsed', flat.includes('＋ 新建套装'), flat.slice(0, 400))
   check('applied plugins start collapsed', !flat.includes('alpha 插件'), flat.slice(0, 400))
   check('applied plugins collapse into one summary row', flat.includes('已应用 1 个插件'), flat.slice(0, 400))
   check('menu opens with a status line', flat.includes('当前：我的套') && flat.includes('加挂 1'), flat.slice(0, 200))
@@ -344,9 +346,43 @@ 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))
+  // 「＋ 新建套装」 is the only row that creates something; it must read as an
+  // action (blue, tinted), not as another selectable kit.
+  const menuWithKits = expand(header.component({ sessionId: 'session-1', preview: { data: fixture, open: true, groups: { kits: true, presets: false, extras: false } } }))
+  const newKit = nodesIn(menuWithKits, (node) => node.props?.role === 'menuitem' && node.props?.style?.color === '#2563eb' && textOf(node).includes('＋ 新建套装'))
+  check('the new-kit row is highlighted as an action', newKit.length === 1, String(newKit.length))
   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} · 编辑`)
+
+  // A name the host would refuse is explained where the user typed it: a preset's
+  // `name` is a private id (`chat`), so "chat" looks free and is not.
+  const clashPanel = expand(registration.component({
+    preview: { data: fixture, draft: { name: 'chat', note: '', builtins: ['read'], plugins: [] } },
+  }))
+  const clashText = textOf(clashPanel)
+  check('a name taken by a preset is explained inline',
+    clashText.includes('是预置套装') && clashText.includes('仅聊天'), clashText.slice(0, 600))
+  const clashKitPanel = expand(registration.component({
+    preview: { data: fixture, draft: { name: '我的套', note: '', builtins: ['read'], plugins: [] } },
+  }))
+  check('a name taken by my own kit is explained inline',
+    textOf(clashKitPanel).includes('已经有叫「我的套」的套装了'), textOf(clashKitPanel).slice(0, 600))
 } catch (error) {
   failures.push(`panel render threw: ${error instanceof Error ? error.message : String(error)}`)
 }

package/scripts/selftest.mjs

@@ -922,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 })