dsh-plugin-capabilities 0.1.2 → 0.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-plugin-capabilities",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "Manage skills and MCP servers from the Web UI Settings. 在设置页管理 dsh 的技能与 MCP 服务器。",
   "type": "module",
   "main": "lib/index.js",
@@ -14,7 +14,14 @@
     "url": "https://github.com/qinyre/dsh-plugin-capabilities/issues"
   },
   "homepage": "https://github.com/qinyre/dsh-plugin-capabilities#readme",
-  "keywords": ["deepseek", "harness", "dsh", "dsh-plugin", "skills", "mcp"],
+  "keywords": [
+    "deepseek",
+    "harness",
+    "dsh",
+    "dsh-plugin",
+    "skills",
+    "mcp"
+  ],
   "dsh": {
     "bundle": {
       "patch": "./cordis.patch.yml"
@@ -36,7 +43,12 @@
     "./cordis.patch.yml": "./cordis.patch.yml",
     "./package.json": "./package.json"
   },
-  "files": ["lib", "src", "cordis.patch.yml", "LICENSE"],
+  "files": [
+    "lib",
+    "src",
+    "cordis.patch.yml",
+    "LICENSE"
+  ],
   "scripts": {
     "build": "node scripts/build-node.mjs && node scripts/build-client.mjs && node scripts/verify-bundle.mjs",
     "prepare": "node scripts/build-node.mjs && node scripts/build-client.mjs && node scripts/verify-bundle.mjs",

package/src/client/McpTab.tsx

@@ -44,6 +44,26 @@ interface EditorState {
   headers: string
 }
 
+/** One import entry together with its index in the flat state array —
+ *  checkbox handlers rewrite the flat array, so indices must survive grouping. */
+type ImportItem = { server: ImportedServerView; existing: boolean; checked: boolean }
+
+/** Group import candidates by source agent, known agents first. */
+export function importGroups(items: ImportItem[]): Array<{ agent: string; label: string; items: Array<{ item: ImportItem; index: number }> }> {
+  const label = (agent: string) => agent === 'claude-code' ? 'Claude Code' : agent === 'codex' ? 'Codex' : agent
+  const order = ['claude-code', 'codex']
+  const agents = [...new Set(items.map(item => item.server.agent))]
+    .sort((a, b) => {
+      const rank = (agent: string) => { const at = order.indexOf(agent); return at === -1 ? order.length : at }
+      return rank(a) - rank(b) || a.localeCompare(b)
+    })
+  return agents.map(agent => ({
+    agent,
+    label: label(agent),
+    items: items.map((item, index) => ({ item, index })).filter(({ item }) => item.server.agent === agent),
+  }))
+}
+
 /** KEY=VALUE / KEY: VALUE lines to a map. */
 function parsePairs(text: string, separator: ':' | '='): Record<string, string> {
   const map: Record<string, string> = {}
@@ -394,41 +414,73 @@ export function McpTab(props: { t: Translate; injected: McpInjected }): ReactEle
         open={importOpen}
         onClose={() => setImportOpen(false)}
         title={t('importServers')}
+        className="dpc-modalWide"
       >
         <div className="dpc-form">
           <p className="dpc-intro" style={{ margin: 0 }}>{t('importIntro')}</p>
           {importItems === null && <p className="dpc-empty">{t('loading')}</p>}
           {importItems !== null && importItems.length === 0 && <p className="dpc-empty">{t('importEmpty')}</p>}
           {importItems !== null && importItems.length > 0 && (
-            <ul className="dpc-cards" style={{ gridTemplateColumns: 'minmax(0, 1fr)' }}>
-              {importItems.map((item, index) => (
-                <li className="dpc-card" key={`${item.server.agent}/${item.server.name}`} style={{ opacity: item.existing ? 0.55 : 1 }}>
-                  <div className="dpc-cardTop">
-                    <label style={{ display: 'inline-flex', alignItems: 'center', gap: 8, minWidth: 0, cursor: item.existing ? 'default' : 'pointer' }}>
-                      <input
-                        type="checkbox"
-                        checked={item.checked}
-                        disabled={item.existing}
-                        onChange={(event) => {
-                          const next = importItems.slice()
-                          next[index] = { ...item, checked: event.target.checked }
-                          setImportItems(next)
-                        }}
-                      />
-                      <strong className="dpc-cardTitle" title={item.server.name}>{item.server.name}</strong>
-                    </label>
-                    <span className="dpc-tag" data-kind="source">{item.server.agent === 'claude-code' ? 'Claude Code' : 'Codex'}</span>
-                    <span className="dpc-tag">{item.server.transport}</span>
-                    {item.existing && <span className="dpc-tag">{t('importExisting')}</span>}
-                  </div>
-                  <p className="dpc-cardDesc">
-                    {item.server.transport === 'stdio'
-                      ? `${item.server.command ?? ''} ${(item.server.args ?? []).join(' ')}`
-                      : item.server.url ?? ''}
-                  </p>
-                </li>
-              ))}
-            </ul>
+            <div className="dpc-importScroll">
+              {importGroups(importItems).map(group => {
+                const selectable = group.items
+                  .filter(({ item }) => !item.existing)
+                  .map(({ index }) => index)
+                const allChecked = selectable.length > 0
+                  && selectable.every(index => importItems[index].checked)
+                return (
+                  <section className="dpc-importGroup" key={group.agent}>
+                    <div className="dpc-importHead">
+                      <span className="dpc-tag" data-kind="source">{group.label}</span>
+                      <span className="dpc-importCount">{group.items.length}</span>
+                      {selectable.length > 0 && (
+                        <label className="dpc-importAll">
+                          <input
+                            type="checkbox"
+                            checked={allChecked}
+                            onChange={(event) => {
+                              const next = importItems.slice()
+                              for (const index of selectable) next[index] = { ...next[index], checked: event.target.checked }
+                              setImportItems(next)
+                            }}
+                          />
+                          {t('importSelectAll')}
+                        </label>
+                      )}
+                    </div>
+                    <ul className="dpc-cards" style={{ gridTemplateColumns: 'minmax(0, 1fr)' }}>
+                      {group.items.map(({ item, index }) => {
+                        const command = item.server.transport === 'stdio'
+                          ? `${item.server.command ?? ''} ${(item.server.args ?? []).join(' ')}`.trim()
+                          : item.server.url ?? ''
+                        return (
+                          <li className="dpc-card" key={`${item.server.agent}/${item.server.name}`} style={{ opacity: item.existing ? 0.55 : 1 }}>
+                            <div className="dpc-cardTop">
+                              <label style={{ display: 'inline-flex', alignItems: 'center', gap: 8, minWidth: 0, cursor: item.existing ? 'default' : 'pointer' }}>
+                                <input
+                                  type="checkbox"
+                                  checked={item.checked}
+                                  disabled={item.existing}
+                                  onChange={(event) => {
+                                    const next = importItems.slice()
+                                    next[index] = { ...item, checked: event.target.checked }
+                                    setImportItems(next)
+                                  }}
+                                />
+                                <strong className="dpc-cardTitle" title={item.server.name}>{item.server.name}</strong>
+                              </label>
+                              <span className="dpc-tag">{item.server.transport}</span>
+                              {item.existing && <span className="dpc-tag">{t('importExisting')}</span>}
+                            </div>
+                            <p className="dpc-cardDesc" title={command}>{command}</p>
+                          </li>
+                        )
+                      })}
+                    </ul>
+                  </section>
+                )
+              })}
+            </div>
           )}
           {formError !== null && <p className="dpc-formError">{formError}</p>}
           <div className="dpc-cardRow">

package/src/client/css.ts

@@ -43,5 +43,14 @@ export const CSS = `
 .dpc-checks{display:flex;gap:16px;font-size:13px;line-height:20px}
 .dpc-checks label{display:inline-flex;align-items:center;gap:6px;cursor:pointer}
 .dpc-formError{margin:0;color:var(--dsw-alias-state-error-primary);font-size:12px;line-height:18px}
+/* Import dialog: wider than the host's 380px default; the server list gets
+   its own scroll so title, intro, and footer stay pinned. The doubled class
+   beats the host dialog's module CSS regardless of injection order. */
+.dpc-modalWide.dpc-modalWide{width:min(680px,100%)}
+.dpc-importScroll{display:flex;flex-direction:column;gap:14px;max-height:min(400px,52vh);overflow-y:auto;padding:2px 4px 2px 2px}
+.dpc-importGroup{display:flex;flex-direction:column;gap:8px}
+.dpc-importHead{display:flex;align-items:center;gap:8px;padding:0 2px}
+.dpc-importCount{font-size:12px;line-height:18px;color:var(--dsw-alias-label-tertiary);font-variant-numeric:tabular-nums}
+.dpc-importAll{margin-left:auto;display:inline-flex;align-items:center;gap:6px;font-size:12px;line-height:18px;color:var(--dsw-alias-label-secondary);cursor:pointer}
 @media(max-width:680px){.dpc-cards{grid-template-columns:minmax(0,1fr)}}
 `

package/src/client/locales.ts

@@ -56,6 +56,7 @@ export const zh = {
   importServers: '从其他 Agent 导入',
   importIntro: '扫描 Claude Code（~/.claude.json）与 Codex（~/.codex/config.toml）的 MCP 服务器配置，勾选后导入为本 profile 的服务器行。',
   importEmpty: '没有发现可导入的 MCP 服务器',
+  importSelectAll: '全选',
   importExisting: '已存在',
   importSelected: '导入选中项',
   restartNeeded: '配置已写入，重启 dsh 后生效。',
@@ -126,6 +127,7 @@ export const en = {
   importServers: 'Import from other agents',
   importIntro: 'Scans Claude Code (~/.claude.json) and Codex (~/.codex/config.toml) MCP server configs; selected entries become server rows in this profile.',
   importEmpty: 'No importable MCP servers found',
+  importSelectAll: 'Select all',
   importExisting: 'already here',
   importSelected: 'Import selected',
   restartNeeded: 'Configuration written — restart dsh to apply.',

package/src/mcp.test.ts

@@ -44,6 +44,41 @@ describe('profile patch CRUD', () => {
     expect(rows[0].env).toEqual({ GITHUB_TOKEN: 'secret' })
   })
 
+  it('writes rows inside an anonymous insert list, never as bare entries', () => {
+    // The loader skips bare `- id:` entries whose target does not exist;
+    // only `- insert:` rows mount. This is the contract that made 0.1.2
+    // rows invisible to the agent.
+    const text = readFileSync(patch(), 'utf8')
+    expect(text).toContain('- insert:')
+    expect(text).not.toMatch(/^- id: mcp-/m)
+    expect(text).toMatch(/^ {4}- id: mcp-github$/m)
+  })
+
+  it('absorbs legacy bare rows into the insert list on the next write', () => {
+    writeFileSync(patch(), [
+      '- id: dsh-market',
+      '  config:',
+      '    allowRestart: false',
+      '- id: mcp-open-websearch',
+      '  name: "@deepseek-ai/dsh-mcp-client"',
+      '  config:',
+      '    serverName: open-websearch',
+      '    transport: stdio',
+      '    command: npx',
+      '',
+    ].join('\n'))
+
+    expect(listMcp(profile)).toHaveLength(1)
+    expect(listMcp(profile)[0]).toMatchObject({ id: 'mcp-open-websearch', serverName: 'open-websearch' })
+
+    upsertMcp(profile, { id: '', serverName: 'context7', transport: 'stdio', command: 'npx' })
+    const text = readFileSync(patch(), 'utf8')
+    expect(text).not.toMatch(/^- id: mcp-open-websearch/m)
+    expect(text).toMatch(/^ {4}- id: mcp-open-websearch$/m)
+    expect(text).toContain('dsh-market')
+    expect(listMcp(profile)).toHaveLength(2)
+  })
+
   it('preserves foreign rows and comments across edits', () => {
     writeFileSync(patch(), [
       '# user comment',
@@ -90,4 +125,11 @@ describe('profile patch CRUD', () => {
     expect(listMcp(profile).find(row => row.id === 'mcp-github')).toBeUndefined()
     expect(removeMcp(profile, 'mcp-github')).toBe(false)
   })
+
+  it('drops the insert entry once its last row is removed', () => {
+    for (const row of listMcp(profile)) removeMcp(profile, row.id)
+    const text = readFileSync(patch(), 'utf8')
+    expect(text).not.toContain('- insert:')
+    expect(listMcp(profile)).toHaveLength(0)
+  })
 })

package/src/mcp.ts

@@ -3,6 +3,13 @@
  * `@deepseek-ai/dsh-mcp-client` row per server. The YAML document API keeps
  * foreign rows and comments intact across edits. Row changes need a dsh
  * restart to compose — callers surface that as a pending-restart notice.
+ *
+ * The loader's patch grammar distinguishes creates from overrides: a bare
+ * `- id: …` entry only overrides an existing row (target missing → skipped
+ * with a warning), while new rows must live in an anonymous `- insert:`
+ * list. Managed rows therefore always sit inside one insert entry, and any
+ * legacy bare rows (written before this contract was understood) are
+ * absorbed into it on the next write.
  */
 
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs'
@@ -38,7 +45,12 @@ export type McpInput = Omit<McpRow, 'disabled'> & { disabled?: boolean }
 function loadPatch(profileDirPath: string): Document {
   const path = join(profileDirPath, 'cordis.patch.yml')
   const text = existsSync(path) ? readFileSync(path, 'utf8') : '[]'
-  return parseDocument(text)
+  const doc = parseDocument(text)
+  const contents = doc.contents as YAMLSeq | null
+  // The default-empty file parses as a flow `[]`; the patch layer is
+  // human-edited block YAML, so flip the flag before anything appends.
+  if (contents !== null && contents.flow === true && contents.items.length === 0) contents.flow = false
+  return doc
 }
 
 function savePatch(profileDirPath: string, doc: Document): void {
@@ -53,13 +65,57 @@ function toNode<T>(value: unknown): T {
 
 /** The patch row sequence; an empty file's null root becomes an empty seq. */
 function rowSeq(doc: Document): YAMLSeq<YAMLMap> {
-  if (doc.contents === null) doc.contents = toNode<YAMLSeq<YAMLMap>>([])
+  if (doc.contents === null) {
+    doc.contents = toNode<YAMLSeq<YAMLMap>>([])
+    // An empty seq defaults to flow style (`[]`); the file must stay block.
+    ;(doc.contents as YAMLSeq).flow = false
+  }
   return doc.contents as YAMLSeq<YAMLMap>
 }
 
-/** Rows whose `name` is the MCP client plugin. */
-function mcpRows(doc: Document): YAMLMap[] {
-  return (rowSeq(doc).items ?? []).filter(item => item.get('name') === MCP_PLUGIN)
+function isSeqNode(value: unknown): value is YAMLSeq<YAMLMap> {
+  return typeof value === 'object' && value !== null && Array.isArray((value as YAMLSeq).items)
+}
+
+/** A patch entry's insert list when it is the anonymous create form. */
+function insertListOf(item: YAMLMap): YAMLSeq<YAMLMap> | undefined {
+  if (item.has('id')) return undefined
+  const node = item.get('insert')
+  return isSeqNode(node) ? node : undefined
+}
+
+/** Every managed row: legacy bare entries (no list) and insert-list rows. */
+function mcpRowItems(doc: Document): { node: YAMLMap, list?: YAMLSeq<YAMLMap> }[] {
+  const found: { node: YAMLMap, list?: YAMLSeq<YAMLMap> }[] = []
+  for (const item of rowSeq(doc).items ?? []) {
+    if (item.get('name') === MCP_PLUGIN) found.push({ node: item })
+    const list = insertListOf(item)
+    for (const row of list?.items ?? []) {
+      if (row.get('name') === MCP_PLUGIN) found.push({ node: row, list })
+    }
+  }
+  return found
+}
+
+/** Map one row node to its browser-facing shape. */
+function rowToMcp(doc: Document, item: YAMLMap): McpRow {
+  // config is a YAMLMap node — materialize it before property access.
+  const configNode = item.get('config') as unknown
+  const plain = (typeof configNode === 'object' && configNode !== null && typeof (configNode as { toJS?: unknown }).toJS === 'function'
+    ? (configNode as { toJS(document: Document): unknown }).toJS(doc)
+    : {}) as Record<string, unknown>
+  return {
+    id: String(item.get('id') ?? ''),
+    serverName: String(plain.serverName ?? ''),
+    transport: plain.transport === 'streamable-http' ? 'streamable-http' : 'stdio',
+    disabled: item.get('disabled') === true,
+    ...(typeof plain.command === 'string' && plain.command !== '' ? { command: plain.command } : {}),
+    ...(Array.isArray(plain.args) ? { args: plain.args.map(String) } : {}),
+    ...(isStringMap(plain.env) ? { env: plain.env } : {}),
+    ...(typeof plain.cwd === 'string' && plain.cwd !== '' ? { cwd: plain.cwd } : {}),
+    ...(typeof plain.url === 'string' && plain.url !== '' ? { url: plain.url } : {}),
+    ...(isStringMap(plain.headers) ? { headers: plain.headers } : {}),
+  }
 }
 
 function isStringMap(value: unknown): value is Record<string, string> {
@@ -67,28 +123,52 @@ function isStringMap(value: unknown): value is Record<string, string> {
   return Object.values(value).every(entry => typeof entry === 'string')
 }
 
+/**
+ * The insert list that owns managed rows, creating it when absent and
+ * absorbing legacy bare rows into it. Absorbed rows were inert under the
+ * loader's override-only reading of bare entries, so the move is not just
+ * cosmetic — it is what makes them compose.
+ */
+function managedInsert(doc: Document): YAMLSeq<YAMLMap> {
+  const seq = rowSeq(doc)
+  const bare: YAMLMap[] = []
+  let target: YAMLSeq<YAMLMap> | undefined
+  for (const item of seq.items ?? []) {
+    if (item.get('name') === MCP_PLUGIN) bare.push(item)
+    const list = insertListOf(item)
+    if (list !== undefined && list.items.some(row => row.get('name') === MCP_PLUGIN)) target ??= list
+  }
+  if (target === undefined) {
+    const entry = toNode<YAMLMap>({ insert: [] })
+    seq.add(entry)
+    target = entry.get('insert') as YAMLSeq<YAMLMap>
+    target.flow = false
+  }
+  for (const row of bare) {
+    seq.items.splice(seq.items.indexOf(row), 1)
+    target.add(row)
+  }
+  return target
+}
+
+/** Every id in use: top-level patch entries and rows inside insert lists. */
+function takenIds(doc: Document): Set<string> {
+  const taken = new Set<string>()
+  for (const item of rowSeq(doc).items ?? []) {
+    const id = String(item.get('id') ?? '')
+    if (id !== '') taken.add(id)
+    for (const row of insertListOf(item)?.items ?? []) {
+      const rowId = String(row.get('id') ?? '')
+      if (rowId !== '') taken.add(rowId)
+    }
+  }
+  return taken
+}
+
 /** Read every mcp-client row in the profile layer. */
 export function listMcp(profileDirPath: string): McpRow[] {
   const doc = loadPatch(profileDirPath)
-  return mcpRows(doc).map(item => {
-    // config is a YAMLMap node — materialize it before property access.
-    const configNode = item.get('config') as unknown
-    const plain = (typeof configNode === 'object' && configNode !== null && typeof (configNode as { toJS?: unknown }).toJS === 'function'
-      ? (configNode as { toJS(document: Document): unknown }).toJS(doc)
-      : {}) as Record<string, unknown>
-    return {
-      id: String(item.get('id') ?? ''),
-      serverName: String(plain.serverName ?? ''),
-      transport: plain.transport === 'streamable-http' ? 'streamable-http' : 'stdio',
-      disabled: item.get('disabled') === true,
-      ...(typeof plain.command === 'string' && plain.command !== '' ? { command: plain.command } : {}),
-      ...(Array.isArray(plain.args) ? { args: plain.args.map(String) } : {}),
-      ...(isStringMap(plain.env) ? { env: plain.env } : {}),
-      ...(typeof plain.cwd === 'string' && plain.cwd !== '' ? { cwd: plain.cwd } : {}),
-      ...(typeof plain.url === 'string' && plain.url !== '' ? { url: plain.url } : {}),
-      ...(isStringMap(plain.headers) ? { headers: plain.headers } : {}),
-    }
-  })
+  return mcpRowItems(doc).map(({ node }) => rowToMcp(doc, node))
 }
 
 /** Validate one write request; returns the rejection reason or null. */
@@ -109,17 +189,15 @@ export function validateMcpInput(input: McpInput): string | null {
 export function upsertMcp(profileDirPath: string, input: McpInput): string {
   const inputId = input.id ?? ''
   const doc = loadPatch(profileDirPath)
-  const seq = rowSeq(doc)
+  const list = managedInsert(doc)
 
   const existing = inputId !== ''
-    ? mcpRows(doc).find(item => item.get('id') === inputId)
+    ? mcpRowItems(doc).find(({ node }) => String(node.get('id') ?? '') === inputId)
     : undefined
 
   let id = inputId !== '' ? inputId : `mcp-${input.serverName}`
   if (existing === undefined) {
-    const taken = new Set(
-      (seq.items ?? []).map(item => String(item.get('id') ?? '')).filter(id => id !== ''),
-    )
+    const taken = takenIds(doc)
     let suffix = 2
     while (taken.has(id)) id = `mcp-${input.serverName}-${suffix++}`
   }
@@ -143,8 +221,14 @@ export function upsertMcp(profileDirPath: string, input: McpInput): string {
   if (input.disabled === true) row.disabled = true
 
   const node = toNode<YAMLMap>(row)
-  if (existing === undefined) seq.add(node)
-  else seq.items[seq.items.indexOf(existing)] = node
+  if (existing === undefined) {
+    list.add(node)
+  } else if (existing.list !== undefined) {
+    existing.list.items.splice(existing.list.items.indexOf(existing.node), 1, node)
+  } else {
+    // Bare rows were absorbed above; reaching here means a foreign-shaped row.
+    rowSeq(doc).items.splice(rowSeq(doc).items.indexOf(existing.node), 1, node)
+  }
 
   savePatch(profileDirPath, doc)
   return id
@@ -153,10 +237,11 @@ export function upsertMcp(profileDirPath: string, input: McpInput): string {
 /** Flip one row's disabled flag (absent = enabled). Returns false when missing. */
 export function setMcpDisabled(profileDirPath: string, id: string, disabled: boolean): boolean {
   const doc = loadPatch(profileDirPath)
-  const item = mcpRows(doc).find(row => row.get('id') === id)
-  if (item === undefined) return false
-  if (disabled) item.set('disabled', true)
-  else item.delete('disabled')
+  managedInsert(doc)
+  const hit = mcpRowItems(doc).find(({ node }) => String(node.get('id') ?? '') === id)
+  if (hit === undefined) return false
+  if (disabled) hit.node.set('disabled', true)
+  else hit.node.delete('disabled')
   savePatch(profileDirPath, doc)
   return true
 }
@@ -164,10 +249,19 @@ export function setMcpDisabled(profileDirPath: string, id: string, disabled: boo
 /** Remove one server row. Returns false when missing. */
 export function removeMcp(profileDirPath: string, id: string): boolean {
   const doc = loadPatch(profileDirPath)
-  const item = mcpRows(doc).find(row => row.get('id') === id)
-  if (item === undefined) return false
+  managedInsert(doc)
+  const hit = mcpRowItems(doc).find(({ node }) => String(node.get('id') ?? '') === id)
+  if (hit === undefined || hit.list === undefined) return false
+  hit.list.items.splice(hit.list.items.indexOf(hit.node), 1)
+
+  // An insert entry left with no rows is dead weight; drop it when the
+  // insert list is all it holds.
   const seq = rowSeq(doc)
-  seq.items.splice(seq.items.indexOf(item), 1)
+  const owner = (seq.items ?? []).find(item => insertListOf(item) === hit.list)
+  if (owner !== undefined && hit.list.items.length === 0 && owner.items.length === 1) {
+    seq.items.splice(seq.items.indexOf(owner), 1)
+  }
+
   savePatch(profileDirPath, doc)
   return true
 }