dsh-subagent-profile 0.3.0 → 0.3.1

package/README.md

@@ -4,7 +4,7 @@
 <div align="center">
   <b style="font-size: 1.15em;">Subagent dispatch, profiled — the right agent for the right task (preset / model / reasoning effort)</b><br /><br />
   <img alt="License: MIT" src="https://img.shields.io/badge/License-MIT-yellow.svg" />
-  <img alt="Version: v0.3.0" src="https://img.shields.io/badge/Version-v0.3.0-blue.svg" />
+  <img alt="Version: v0.3.1" src="https://img.shields.io/badge/Version-v0.3.1-blue.svg" />
   <img alt="npm" src="https://img.shields.io/npm/v/dsh-subagent-profile.svg" />
   <img alt="DSH" src="https://img.shields.io/badge/DSH-0.1.0--rc.6%20~%200.1.1--rc.2-blue.svg" />
 </div>

package/README.zh.md

@@ -4,7 +4,7 @@
 <div align="center">
   <b style="font-size: 1.15em;">子 Agent 派发方案化插件 —— 用对的人（预设 / 模型 / 推理强度）干对的事</b><br /><br />
   <img alt="License: MIT" src="https://img.shields.io/badge/License-MIT-yellow.svg" />
-  <img alt="Version: v0.3.0" src="https://img.shields.io/badge/Version-v0.3.0-blue.svg" />
+  <img alt="Version: v0.3.1" src="https://img.shields.io/badge/Version-v0.3.1-blue.svg" />
   <img alt="npm" src="https://img.shields.io/npm/v/dsh-subagent-profile.svg" />
   <img alt="DSH" src="https://img.shields.io/badge/DSH-0.1.0--rc.6%20~%200.1.1--rc.2-blue.svg" />
 </div>

package/index.mjs

@@ -1,4 +1,4 @@
-// index.mjs — dsh-subagent-profile 宿主侧正式插件 bundle（只做装配）。
+// index.mjs — dsh-subagent-profile 宿主侧正式插件 bundle（只做装配）。
 // 源自原型动态插件 `code.host` 主体；宿主导入面（registerTool/defineTool/
 // handle）收敛在 lib/core/shims.mjs，装配块按模块拆分驻留 lib/core/（catalog /
 // presets-sync / profiles-store / cost-guard / whitelist / intersection /
@@ -13,6 +13,8 @@ import { dshHome, createProfileStore } from './lib/core/profiles-store.mjs';
 import { createHttpRoutes } from './lib/core/http-routes.mjs';
 import { createProfileProvider } from './lib/core/profile-provider.mjs';
 import { createDispatchTool } from './lib/core/dispatch-tool.mjs';
+import { createCatalogCache } from './lib/core/catalog-cache.mjs';
+import { tierSortKey } from './lib/core/pure.mjs';
 
 export const name = 'dsh-subagent-profile';
 export const inject = ['subagents', 'tools', 'agents'];
@@ -98,6 +100,7 @@ function profileSectionText(store, gate, context) {
   if (!gate(context)) return '';
   const rows = [...store.profiles.values()]
     .filter((p) => p.enabled !== false)
+    .sort((a, b) => tierSortKey(a.tokenTier) - tierSortKey(b.tokenTier))
     .map((p) => {
       const desc = typeof p.description === 'string' && p.description.length > 0 ? `"${p.description}"` : '(无描述)';
       return `- ${p.id}: ${desc}${p.preset !== undefined ? ` (preset: ${p.preset})` : ''}`;
@@ -141,7 +144,7 @@ function registerSystemPromptSections(ctx, store, getEnabled) {
 // (listen) is async and may not be ready when this plugin's inject deps
 // resolve, so register inside an inject sub-scope that waits for it
 // (ctx.get would read undefined at apply time).
-function registerSettingsRoutes(ctx, store, getEnabled, setEnabled, syncTool) {
+function registerSettingsRoutes(ctx, store, getEnabled, setEnabled, syncTool, catalog) {
   ctx.inject(['webServer'], (scope) => {
     scope.effect(createHttpRoutes({
       webServer: scope.webServer,
@@ -149,14 +152,24 @@ function registerSettingsRoutes(ctx, store, getEnabled, setEnabled, syncTool) {
       getEnabled,
       setEnabled,
       syncTool,
-      getLlm: () => ctx.get('llm'),
-      getAgentPresets: () => ctx.get('agentPresets'),
-      getTools: () => ctx.tools,
+      catalog,
       logger: ctx.logger,
     }), 'dsh-subagent-profile: settings routes');
   });
 }
 
+// 进程级共享 catalog 快照工厂：一处快照同时喂 /options 三路由与 dispatch 的
+// cost guard（cost guard 经 parent.ctx.get('llm') 传父实例，同一 host llm 下
+// 命中同一条目）。
+function createSharedCatalog(ctx) {
+  return createCatalogCache({
+    getLlm: () => ctx.get('llm'),
+    getAgentPresets: () => ctx.get('agentPresets'),
+    getTools: () => ctx.tools,
+    logger: ctx.logger,
+  });
+}
+
 export async function apply(ctx) {
   // Enable/disable switch (default on, runtime-toggled by the settings
   // page, persisted across restarts) + profile registry — lib/profiles-store
@@ -167,6 +180,8 @@ export async function apply(ctx) {
   store.loadProfiles();
   // Self-install the bundled "orchestrator" preset (idempotent, fail-soft).
   syncBundledPresetsToHome(ctx);
+  // 进程级共享 catalog 快照（/options 三路由 + dispatch cost guard 共用）。
+  const catalog = createSharedCatalog(ctx);
   // `dispatch` tool — lib/core/dispatch-tool.mjs: defineTool block (schema +
   // execute), the result-schema consistency lock and the syncTool
   // register/unregister logic.
@@ -179,6 +194,7 @@ export async function apply(ctx) {
     getService: (name) => ctx.get(name),
     logger: ctx.logger,
     subagents: ctx.subagents,
+    catalog,
   });
   // subagent-profiles service over the store's per-apply profiles Map.
   provideProfileService(ctx, store);
@@ -191,10 +207,11 @@ export async function apply(ctx) {
     store,
     getEnabled: () => enabled,
     logger: ctx.logger,
+    catalog,
   });
   if (typeof disposeProvider === 'function') ctx.effect(() => disposeProvider);
   // HTTP loopback routes for the Client settings UI — lib/core/http-routes.mjs.
-  registerSettingsRoutes(ctx, store, () => enabled, (next) => { enabled = next; }, dispatch.syncTool);
+  registerSettingsRoutes(ctx, store, () => enabled, (next) => { enabled = next; }, dispatch.syncTool, catalog);
   // Teardown: unregister the dispatch tool (if still registered).
   ctx.effect(() => dispatch.dispose);
 }

package/lib/client.js

@@ -14,8 +14,10 @@
  * bordered card per row with a layered name / description / meta layout, and a
  * dashed "+ 新增" button that expands an inline form card instead of a
  * permanently-visible input row. Dropdown options (preset / provider / model /
- * reasoning effort) are served by the host `/options` route from the live
- * presets roster and llm directory.
+ * reasoning effort) are served by the host `/options/summary` (models + presets,
+ * on settings open), `/options/efforts` (per-model, lazy on model select) and
+ * `/options/tools` (tool directory, lazy when the restriction panel opens)
+ * routes from the live presets roster and llm directory.
  *
  * 结构：纯数据（CSS/ZH 文案表）与纯函数（api/解析/文案映射等）驻留模块作用域
  * （load 调用之前的顶层声明）；依赖 React 的组件经参数注入的 maker 函数装配
@@ -40,6 +42,7 @@ const CSS = [
   '.sap-rowActions{align-items:center;gap:4px;margin-left:auto;display:inline-flex}',
   '.sap-desc{color:var(--dsw-alias-label-secondary);margin:0;font-size:12px;line-height:18px}',
   '.sap-warn{color:var(--dsw-alias-state-warn-label);margin:0;font-size:12px;line-height:18px}',
+  '.sap-versionWarn{background:var(--dsw-alias-state-warn-tertiary);border:1px solid var(--dsw-alias-state-warn-tertiary);color:var(--dsw-alias-state-warn-label);border-radius:8px;flex-direction:column;gap:4px;padding:10px 12px;font-size:12px;line-height:18px;margin:0;display:flex}',
   '.sap-chips{flex-wrap:wrap;gap:6px;display:flex}',
   '.sap-chip{box-sizing:border-box;border:1px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-bg-layer-1);color:var(--dsw-alias-label-primary);border-radius:6px;flex:none;align-items:center;gap:5px;padding:2px 8px;font-size:12px;line-height:18px;display:inline-flex}',
   '.sap-chipLabel{color:var(--dsw-alias-label-tertiary);font-size:11px;line-height:16px}',
@@ -122,6 +125,7 @@ const ZH = {
   toolForeground: '前台',
   toolRunning: '运行中',
   tierZh: { cheap: '省 token（cheap）', balanced: '均衡（balanced）', premium: '高成本（premium）' },
+  stopReasonZh: { completed: '完成', 'max-tokens': '超出预算', aborted: '已中止', refusal: '已拒绝', error: '出错' },
   persistFail: '已保存但未持久化',
   persistFailHint: '（磁盘写入未成功，重启 dsh web 后该改动可能丢失）'
 }
@@ -225,7 +229,7 @@ function readDispatchRequest(block) {
 // 生效值来源——结构化 value 只存在于执行局部（dsh-tools 约定），且宿主未
 // 定义 output.presentationMeta（block.meta 为空）。解析成功返回
 // {kind, id, fields, ignored}；任何一步不符预期返回 null，调用方回退请求值。
-const DISPATCH_RESULT_KEYS = ['profile', 'preset', 'provider', 'model', 'reasoningEffort', 'tokenTier']
+const DISPATCH_RESULT_KEYS = ['profile', 'preset', 'provider', 'model', 'reasoningEffort', 'tokenTier', 'childTotalTokens', 'elapsedMs', 'stopReason']
 function parseDispatchText(text) {
   if (typeof text !== 'string') return null
   const firstLine = text.split('\n')[0] ?? ''
@@ -280,6 +284,44 @@ function readDispatchResult(block) {
   return null
 }
 
+// childTotalTokens 文本后缀：宿主 render 行里的 `childTotalTokens=<number>` 经
+// parseDispatchText 解析为字符串，此处归一为「≈N tokens」。仅前台/后台 completed
+// 结算携带；无值返回空串（不显示）。渲染位置紧邻后续的耗时显示。
+function tokensSuffix(result, block) {
+  let raw = null
+  if (result && result.fields && result.fields.childTotalTokens !== undefined && result.fields.childTotalTokens !== '') {
+    raw = result.fields.childTotalTokens
+  } else if (block && block.meta && typeof block.meta === 'object' && block.meta.childTotalTokens !== undefined) {
+    raw = block.meta.childTotalTokens
+  }
+  const n = typeof raw === 'number' ? raw : (typeof raw === 'string' && raw !== '' ? Number(raw) : NaN)
+  return Number.isFinite(n) ? ` · ≈${n} tokens` : ''
+}
+
+// 耗时 + 结束原因后缀：宿主 render 行里的 `elapsedMs=<n>` / `stopReason=<enum>`
+// 经 parseDispatchText 解析为字符串，此处归一为「耗时=<n>ms · stopReason=<中文映射>」。
+// 仅前台 completed 结算携带；后台结算经 job 结果呈现（不进 dispatch 卡片），
+// continuable 不结算、不携带。任一字段缺失即省略该段。
+function observabilitySuffix(result, block) {
+  let elapsedRaw = null
+  let stopRaw = null
+  if (result && result.fields) {
+    if (result.fields.elapsedMs !== undefined && result.fields.elapsedMs !== '') elapsedRaw = result.fields.elapsedMs
+    if (result.fields.stopReason !== undefined && result.fields.stopReason !== '') stopRaw = result.fields.stopReason
+  } else if (block && block.meta && typeof block.meta === 'object') {
+    // 运行中（无结果）或旧版结果：回退调用块 meta（向前兼容，与 tokenTier 同口径）。
+    if (block.meta.elapsedMs !== undefined) elapsedRaw = block.meta.elapsedMs
+    if (block.meta.stopReason !== undefined) stopRaw = block.meta.stopReason
+  }
+  const ms = typeof elapsedRaw === 'number' ? elapsedRaw : (typeof elapsedRaw === 'string' && elapsedRaw !== '' ? Number(elapsedRaw) : NaN)
+  const stopZh = typeof stopRaw === 'string' ? (ZH.stopReasonZh[stopRaw] || stopRaw) : ''
+  if (!Number.isFinite(ms) && stopZh === '') return ''
+  let out = ''
+  if (Number.isFinite(ms)) out += ` · 耗时=${ms}ms`
+  if (stopZh !== '') out += ` · stopReason=${stopZh}`
+  return out
+}
+
 // ── dispatch 工具卡（React 依赖经参数注入）─────────────────────────────────
 
 // 生效值：结果解析成功用结果（优先），字段缺失回退请求值。
@@ -331,7 +373,7 @@ function buildDispatchChips(el, chip, eff, result, block, ignored, request) {
   const m = rawOrInherit(eff.model)
   chips.push(chip('providerModel', `${ZH.chipProvider}·${ZH.chipModel}`, p === ZH.inherit && m === ZH.inherit ? ZH.inherit : `${p} / ${m}`, { dim: p === ZH.inherit && m === ZH.inherit }))
   chips.push(chip('effort', ZH.chipEffort, effortZh(eff.reasoningEffort), { dim: eff.reasoningEffort === '' || eff.reasoningEffort === '(default)' }))
-  // tokenTier：宿主当前渲染结果尚未产出该字段；字段一旦出现即渲染（向前兼容）。
+  // tokenTier：宿主 render 行已产出；result.fields 缺失时回退 block.meta（向前兼容旧结果）。
   let tier = ''
   if (result && result.fields && typeof result.fields.tokenTier === 'string' && result.fields.tokenTier !== '') {
     tier = result.fields.tokenTier
@@ -377,7 +419,7 @@ function makeDispatchToolview(el, chip) {
     const chips = buildDispatchChips(el, chip, eff, result, block, ignored, request)
     const p = rawOrInherit(eff.provider)
     const m = rawOrInherit(eff.model)
-    const text = `${ZH.toolLabel}：${kindLabel} · 方案=${profileZh(eff.profile)} · 预设=${presetZh(eff.preset)} · 提供方=${p} · 模型=${m} · 推理强度=${effortZh(eff.reasoningEffort)}`
+    const text = `${ZH.toolLabel}：${kindLabel} · 方案=${profileZh(eff.profile)} · 预设=${presetZh(eff.preset)} · 提供方=${p} · 模型=${m} · 推理强度=${effortZh(eff.reasoningEffort)}${tokensSuffix(result, block)}${observabilitySuffix(result, block)}`
     return el('div', { className: 'sap-toolview' },
       el('div', { className: 'sap-chips' }, chips),
       el('div', { className: 'sap-toolText' }, text)
@@ -404,7 +446,7 @@ function makeApplyWrite(s) {
   return applyWrite
 }
 
-function makeFormActions(s) {
+function makeFormActions(s, loadEfforts, loadTools) {
   const setField = (key) => (event) => {
     const value = event && event.target ? event.target.value : ''
     s.setForm((prev) => {
@@ -412,8 +454,14 @@ function makeFormActions(s) {
       if (key === 'model') next.reasoningEffort = '' // 换模型时重置推理强度
       return next
     })
+    if (key === 'model' && value !== '') {
+      loadEfforts(value) // 选中模型 → 懒拉该模型 efforts
+    }
+  }
+  const setToolMode = (mode) => () => {
+    if (mode !== 'none') loadTools() // 工具限制面板启用 → 拉完整工具目录
+    s.setForm((prev) => ({ ...prev, toolMode: mode }))
   }
-  const setToolMode = (mode) => () => s.setForm((prev) => ({ ...prev, toolMode: mode }))
   const toggleTool = (name) => () => {
     s.setForm((prev) => {
       const cur = Array.isArray(prev.toolList) ? prev.toolList : []
@@ -439,7 +487,7 @@ function makeFormActions(s) {
   return { setField, setToolMode, toggleTool, selectLayer, clearLayer, invertLayer }
 }
 
-function makeEditActions(s) {
+function makeEditActions(s, loadEfforts, loadTools) {
   const openAdd = () => {
     s.setError('')
     s.setSavedNotice('')
@@ -454,6 +502,10 @@ function makeEditActions(s) {
     const allowArr = Array.isArray(tf.allow) ? tf.allow.slice() : []
     const denyArr = Array.isArray(tf.deny) ? tf.deny.slice() : []
     const toolMode = allowArr.length > 0 ? 'allow' : (denyArr.length > 0 ? 'deny' : 'none')
+    if (toolMode !== 'none') loadTools() // 编辑含 toolFilter 的 profile → 预拉工具目录
+    if (typeof profile.model === 'string' && profile.model !== '') {
+      loadEfforts(profile.model) // 编辑含 model 的 profile → 预拉该模型 efforts（下拉不空白）
+    }
     s.setForm({
       id: profile.id,
       description: typeof profile.description === 'string' ? profile.description : '',
@@ -547,10 +599,41 @@ function makeRowActions(api, s, refresh, applyWrite) {
   return { toggleEnabled, setProfileEnabled, resetAll, remove }
 }
 
-function makeProfilesActions(api, s, refresh, applyWrite) {
+// 选中模型 → 懒拉 /options/efforts（按模型 id 存入 options.efforts）。
+function makeEffortsLoader(api, setOptions) {
+  return (model) => {
+    const q = `?model=${encodeURIComponent(model)}`
+    api(`/options/efforts${q}`)
+      .then((data) => {
+        const list = Array.isArray(data.efforts) ? data.efforts : []
+        setOptions((prev) => ({ ...prev, efforts: { ...prev.efforts, [model]: list } }))
+      })
+      .catch(() => {})
+  }
+}
+
+// 工具限制面板启用 → 拉 /options/tools（完整工具目录）。
+function makeToolsLoader(api, setTools) {
+  return () => {
+    api('/options/tools')
+      .then((data) => setTools(Array.isArray(data.tools) ? data.tools : []))
+      .catch(() => {})
+  }
+}
+
+// 版本探测 → 拉 /options/versions；warnings 非空时设置页顶部常驻 amber 提示条。
+function makeVersionsLoader(api, setVersionWarnings) {
+  return () => {
+    api('/options/versions')
+      .then((data) => setVersionWarnings(Array.isArray(data.warnings) ? data.warnings : []))
+      .catch(() => {})
+  }
+}
+
+function makeProfilesActions(api, s, refresh, applyWrite, loadEfforts, loadTools) {
   return {
-    ...makeFormActions(s),
-    ...makeEditActions(s),
+    ...makeFormActions(s, loadEfforts, loadTools),
+    ...makeEditActions(s, loadEfforts, loadTools),
     ...makeSubmitActions(api, s, refresh, applyWrite),
     ...makeRowActions(api, s, refresh, applyWrite),
   }
@@ -700,11 +783,14 @@ function buildAddCard(el, s, actions, toolSection) {
     ),
     buildSelectField(el, s, actions.setField, '模型（子 agent 使用的模型）', 'model', s.options.models,
       (m) => el('option', { key: m.id, value: m.id }, m.name && m.name !== m.id ? `${m.name}（${m.providerName || m.provider}）` : m.id)),
+    s.options.models.length === 0 ? el('p', { className: 'sap-metaValueDefault', style: { margin: '0' } }, '未检测到模型目录（headless 部署）——派发成本护栏将按「兼容模式」开关决定放行或拒绝') : null,
     el('details', { className: 'sap-customized' },
       el('summary', { className: 'sap-customizedSummary' }, '高级选项'),
       el('div', { className: 'sap-customizedBody' },
+        el('p', { className: 'sap-metaValueDefault', style: { margin: '0' } }, 'continuable 模式忽略 preset 换用与推理强度（子 Agent 继承父预设），派发结果以「ignored」标注'),
         buildSelectField(el, s, actions.setField, '目标预设（切换子 agent 使用的 Agent 预设）', 'preset', s.options.presets,
           (p) => el('option', { key: p.id, value: p.id }, p.name && p.name !== p.id ? `${p.name}（${p.id}）` : p.id)),
+        s.options.presets.length === 0 ? el('p', { className: 'sap-metaValueDefault', style: { margin: '0' } }, '未检测到 system-trust 预设名册（rosterless）——目标预设下拉不可用') : null,
         buildSelectField(el, s, actions.setField, '提供方（模型服务商）', 'provider', providers,
           (p) => el('option', { key: p.id, value: p.id }, p.name && p.name !== p.id ? `${p.name}（${p.id}）` : p.id)),
         s.form.model === ''
@@ -734,6 +820,9 @@ function buildSectionReturn(el, s, actions, rows, addCard) {
         el('span', null, s.enabled ? '已启用' : '已禁用')
       )
     ),
+    s.versionWarnings.length > 0
+      ? el('div', { className: 'sap-versionWarn' }, s.versionWarnings.map((warning, index) => el('span', { key: index }, warning)))
+      : null,
     el('p', { className: 'sap-intro' }, '在此管理「派发子 Agent」工具可用的 profile。内置方案可编辑、可删除、可点下方按钮批量重置回默认；每个方案可单独启用/禁用。'),
     el('div', { className: 'sap-addActions', style: { margin: '4px 0' } },
       el('button', { type: 'button', className: 'sap-secondaryButton', style: { height: '28px', padding: '0 12px', fontSize: '12px', borderRadius: '14px' }, onClick: actions.resetAll }, '重置所有内置方案')
@@ -763,32 +852,38 @@ function makeProfilesSection(el, api, chip, useState, useEffect, useCallback) {
     const [persistWarning, setPersistWarning] = useState('')
     const [form, setForm] = useState(EMPTY_FORM)
     const [tools, setTools] = useState([])
-    const s = { profiles, options, enabled, adding, editingId, error, savedNotice, persistWarning, form, tools,
-      setProfiles, setOptions, setEnabled, setAdding, setEditingId, setError, setSavedNotice, setPersistWarning, setForm, setTools }
+    const [versionWarnings, setVersionWarnings] = useState([])
+    const s = { profiles, options, enabled, adding, editingId, error, savedNotice, persistWarning, form, tools, versionWarnings,
+      setProfiles, setOptions, setEnabled, setAdding, setEditingId, setError, setSavedNotice, setPersistWarning, setForm, setTools, setVersionWarnings }
     const refresh = useCallback(() => {
       api('/list')
         .then((data) => setProfiles(Array.isArray(data.profiles) ? data.profiles : []))
         .catch((err) => setError(String((err && err.message) || err)))
     }, [])
     const loadOptions = useCallback(() => {
-      api('/options')
+      api('/options/summary')
         .then((data) => {
           setEnabled(data.enabled !== false)
           setOptions({
             models: Array.isArray(data.models) ? data.models : [],
-            efforts: data.efforts && typeof data.efforts === 'object' ? data.efforts : {},
+            efforts: {},
             presets: Array.isArray(data.presets) ? data.presets : []
           })
-          setTools(Array.isArray(data.tools) ? data.tools : [])
         })
         .catch(() => {})
     }, [])
+    const loadEfforts = makeEffortsLoader(api, setOptions)
+    const loadTools = makeToolsLoader(api, setTools)
+    // 版本探测只挂载时拉一次：useCallback([]) 稳定引用，防 effect 依赖恒变
+    // 导致设置页打开期间无限重取（与 loadOptions 同款稳定化）。
+    const loadVersions = useCallback(() => makeVersionsLoader(api, setVersionWarnings)(), [])
     useEffect(() => {
       refresh()
       loadOptions()
-    }, [refresh, loadOptions])
+      loadVersions()
+    }, [refresh, loadOptions, loadVersions])
     const applyWrite = makeApplyWrite(s)
-    const actions = makeProfilesActions(api, s, refresh, applyWrite)
+    const actions = makeProfilesActions(api, s, refresh, applyWrite, loadEfforts, loadTools)
     const rows = buildProfileRows(el, chip, s, actions)
     const toolSection = buildToolSection(el, s, actions)
     return buildSectionReturn(el, s, actions, rows, buildAddCard(el, s, actions, toolSection))

package/lib/core/catalog-cache.mjs

@@ -0,0 +1,235 @@
+// lib/core/catalog-cache.mjs — 进程级共享 catalog 快照：一次拉取 llm 目录
+// （providers + 每 provider 的 models + 每模型 reasoning-effort 等级）、
+// system-trust 预设名册与完整工具目录，按 TTL 缓存后同时喂给设置页 /options
+// 三路由与 dispatch 的 cost guard。TTL 过期自动重拉；同 key 在途 Promise 去重；
+// /options/refresh 手动清缓存兜底。
+//
+// 依赖边界（无 @deepseek-ai 依赖）：仅 import 纯数据表
+// lib/core/catalog.mjs（工具名 → 中文/分类，零依赖）。服务经注入 getter 传入：
+//   getLlm          () => ctx.get('llm')           （headless 下可为 undefined）
+//   getAgentPresets  () => ctx.get('agentPresets')
+//   getTools         () => ctx.tools
+// cost guard 校验的是「父 Agent 的 llm 实例」；同一进程内父 ctx 与插件 ctx 读到的
+// 是同一个 host llm 服务，故 getSnapshot 接受可选 llm 覆盖（父实例）时仍命中同一条目。
+//
+// 缓存只提速目录解析，不复检安全门：provider/model/reasoningEffort 的校验逻辑与
+// fail-loud 文案留在 lib/core/cost-guard.mjs（逐字不变），此处仅提供目录数据。
+
+import { TOOL_ZH, TOOL_CATEGORY } from './catalog.mjs';
+
+const DEFAULT_TTL_MS = 60000;
+
+// --- 目录构建（无缓存；行为与 http-routes 原 collector 逐字一致）----------------
+
+// llm 目录：providers + 每 provider models + 每模型 efforts。listProviders 失败
+// 记入 providersError（cost guard 据此判「目录为空」）；每 provider 的 listModels
+// 失败单独记录——cost guard 需要区分「空目录短路」与「listModels 抛错」的 fail-loud 文案。
+async function collectLlmDirectory(llm) {
+  const models = [];
+  const efforts = Object.create(null);
+  const modelsByProvider = Object.create(null);
+  if (llm === undefined || typeof llm.listProviders !== 'function') {
+    return { providersError: undefined, providers: [], modelsByProvider, models, efforts };
+  }
+  let providers;
+  let providersError;
+  try {
+    providers = (await llm.listProviders()) ?? [];
+  } catch (error) {
+    providersError = error instanceof Error ? error : new Error(String(error));
+    return { providersError, providers: [], modelsByProvider, models, efforts };
+  }
+  for (const provider of providers) {
+    const providerId = provider && provider.id;
+    if (typeof providerId !== 'string') continue;
+    let entry;
+    try {
+      const modelList = await llm.listModels(providerId);
+      entry = { ok: true, models: modelList ?? [] };
+    } catch (error) {
+      entry = { ok: false, error: error instanceof Error ? error : new Error(String(error)) };
+    }
+    modelsByProvider[providerId] = entry;
+    if (entry.ok !== true) continue; // 该 provider 目录拉取失败 → 跳过其 UI 目录
+    for (const model of entry.models) {
+      if (!model || typeof model.id !== 'string') continue;
+      models.push({ provider: providerId, providerName: provider.name ?? providerId, id: model.id, name: model.name ?? model.id });
+      try {
+        const info = await llm.resolveModelInfo(providerId, model.id);
+        const effortsList = info && info.reasoning && Array.isArray(info.reasoning.efforts) ? info.reasoning.efforts : [];
+        efforts[model.id] = effortsList.map((effort) => ({
+          id: effort.id,
+          name: effort.name ?? effort.id,
+          ...(effort.description !== undefined ? { description: effort.description } : {})
+        }));
+      } catch { /* 精确模型查询可能拒绝；跳过其 efforts */ }
+    }
+  }
+  return { providersError: undefined, providers, modelsByProvider, models, efforts };
+}
+
+// System-trust 预设名册（agentPresets 可选，fail-soft）。
+async function collectSystemPresets(agentPresets) {
+  const presets = [];
+  if (agentPresets === undefined || typeof agentPresets.list !== 'function') return presets;
+  try {
+    const list = await agentPresets.list();
+    for (const preset of (list ?? [])) {
+      if (preset && preset.trust === 'system') {
+        presets.push({ id: preset.id, name: preset.name ?? preset.id });
+      }
+    }
+  } catch { /* presets roster unavailable; leave empty */ }
+  return presets;
+}
+
+// 完整工具目录 = global 层（部署插件）+ 每个 preset 的 standing scope
+// （agent.cordis.yml 工具行）。工具按其来源打标：'global' 或 preset id——分组完全
+// 动态，源自运行时名册。整体失败 fail-soft（返回空目录 + 告警），不破坏设置页。
+async function collectToolsDirectory(getTools, getAgentPresets, logger) {
+  try {
+    const tools = [];
+    const seen = new Set();
+    const OFFICIAL_PRESETS = ['standard', 'code', 'minimal', 'cordis'];
+    const layerOf = (source) => {
+      if (source === 'global') return 'plugin';
+      if (OFFICIAL_PRESETS.includes(source)) return 'core';
+      return 'custom';
+    };
+    const groupOf = (name, source) => {
+      const layer = layerOf(source);
+      if (layer === 'core') return TOOL_CATEGORY[name] ?? '其他';
+      if (layer === 'plugin') return name.includes('_') ? name.split('_')[0] : name;
+      return source;
+    };
+    const push = (schemas, source) => {
+      for (const s of (Array.isArray(schemas) ? schemas : [])) {
+        if (!s || typeof s.name !== 'string' || s.name === 'run_code' || seen.has(s.name)) continue;
+        seen.add(s.name);
+        tools.push({ name: s.name, description: typeof s.description === 'string' ? s.description : '', zh: TOOL_ZH[s.name] ?? '', source, layer: layerOf(source), group: groupOf(s.name, source) });
+      }
+    };
+    const toolsService = typeof getTools === 'function' ? getTools() : undefined;
+    if (toolsService && typeof toolsService.schemas === 'function') {
+      push(toolsService.schemas(), 'global');
+      const agentPresets = typeof getAgentPresets === 'function' ? getAgentPresets() : undefined;
+      if (agentPresets !== undefined && typeof agentPresets.list === 'function' && typeof agentPresets.standingKeyFor === 'function') {
+        const presets = await agentPresets.list();
+        for (const preset of (presets ?? [])) {
+          if (!preset || typeof preset.id !== 'string') continue;
+          try {
+            push(toolsService.schemas(await agentPresets.standingKeyFor(preset.id)), preset.id);
+          } catch { /* 单个 preset 的 standing scope 不可用；跳过 */ }
+        }
+      }
+    }
+    return tools;
+  } catch (error) {
+    if (logger !== undefined && typeof logger.warn === 'function') {
+      logger.warn('[dsh-subagent-profile] tools directory failed:', error instanceof Error ? error.message : String(error));
+    }
+    return [];
+  }
+}
+
+// 构建一份完整快照（无缓存）。`llm` 可选：cost guard 用它传入父 Agent 的 llm 实例。
+export async function getCatalogSnapshot({ getLlm, getAgentPresets, getTools, llm, logger }) {
+  const effectiveLlm = llm !== undefined ? llm : (typeof getLlm === 'function' ? getLlm() : undefined);
+  const agentPresets = typeof getAgentPresets === 'function' ? getAgentPresets() : undefined;
+  const dir = await collectLlmDirectory(effectiveLlm);
+  const presets = await collectSystemPresets(agentPresets);
+  const tools = await collectToolsDirectory(getTools, getAgentPresets, logger);
+  return {
+    llm: { providersError: dir.providersError, providers: dir.providers, modelsByProvider: dir.modelsByProvider },
+    models: dir.models,
+    efforts: dir.efforts,
+    presets,
+    tools,
+  };
+}
+
+// --- TTL 缓存（按 llm 实例分键；同 key 在途去重；hit/miss 计数走 host logger）----
+
+const NO_LLM = Symbol('catalog-cache:no-llm');
+
+function makeAudit(logger) {
+  if (logger !== undefined && typeof logger.info === 'function') {
+    return (outcome, hits, misses) => logger.info(`[dsh-subagent-profile] catalog cache ${outcome} (hit=${hits}, miss=${misses})`);
+  }
+  return () => {};
+}
+
+// 命中/未命中判定 + TTL 过期重拉；并发 cache-miss 复用同一条在途 Promise（只拉一次）。
+async function resolveSnapshot(state, llm) {
+  // 无参时按注入的 getLlm() 取 llm 实例作 key——保证 /options 侧（无参）与
+  // cost guard 侧（传父实例）在同一 host llm 实例下命中同一条目。
+  const effectiveLlm = llm !== undefined ? llm : (typeof state.getLlm === 'function' ? state.getLlm() : undefined);
+  const key = effectiveLlm !== undefined ? effectiveLlm : NO_LLM;
+  const at = state.clock();
+  const entry = state.entries.get(key);
+  if (entry !== undefined) {
+    if (entry.snapshot !== undefined && entry.expiresAt > at) {
+      state.hits += 1;
+      state.audit('hit', state.hits, state.misses);
+      return entry.snapshot;
+    }
+    if (entry.inflight !== undefined) {
+      state.hits += 1;
+      state.audit('hit', state.hits, state.misses);
+      return entry.inflight;
+    }
+  }
+  state.misses += 1;
+  state.audit('miss', state.hits, state.misses);
+  const inflight = getCatalogSnapshot({
+    getLlm: state.getLlm,
+    getAgentPresets: state.getAgentPresets,
+    getTools: state.getTools,
+    llm: effectiveLlm,
+    logger: state.logger,
+  });
+  const fresh = { expiresAt: at + state.ttl, snapshot: undefined, inflight };
+  state.entries.set(key, fresh);
+  try {
+    const snapshot = await inflight;
+    fresh.snapshot = snapshot;
+    fresh.inflight = undefined;
+    // 目录错误态不缓存：providersError 意味着 listProviders 瞬时失败或目录为空，
+    // 缓存会让瞬时故障自愈延迟一个 TTL；每次重试既保持安全门保守又恢复更快。
+    if (snapshot.llm.providersError !== undefined) {
+      state.entries.delete(key);
+    }
+    return snapshot;
+  } catch (error) {
+    fresh.inflight = undefined;
+    state.entries.delete(key);
+    throw error;
+  }
+}
+
+function invalidateSnapshot(state, llm) {
+  if (llm !== undefined) state.entries.delete(llm);
+  else state.entries.clear();
+}
+
+// 工厂返回 { getSnapshot, invalidate, stats }。getSnapshot(llm?) 接受可选 llm 覆盖；
+// 无参时走注入的 getLlm()。stats() 供审计/测试读取 hit/miss 计数。
+export function createCatalogCache({ getLlm, getAgentPresets, getTools, logger, ttlMs, now }) {
+  const state = {
+    getLlm,
+    getAgentPresets,
+    getTools,
+    logger,
+    ttl: typeof ttlMs === 'number' && ttlMs > 0 ? ttlMs : DEFAULT_TTL_MS,
+    clock: typeof now === 'function' ? now : () => Date.now(),
+    entries: new Map(),
+    hits: 0,
+    misses: 0,
+    audit: makeAudit(logger),
+  };
+  return {
+    getSnapshot: (llm) => resolveSnapshot(state, llm),
+    invalidate: (llm) => invalidateSnapshot(state, llm),
+    stats: () => ({ hits: state.hits, misses: state.misses }),
+  };
+}

package/lib/core/catalog.mjs

@@ -1,6 +1,6 @@
-// lib/core/catalog.mjs — settings-page data tables moved verbatim from index.mjs
+// lib/core/catalog.mjs — settings-page data tables moved verbatim from index.mjs
 // (import-free, no @deepseek-ai dependency — node builtins only, none used
-// here). The /options tool-directory builder itself lives in lib/core/http-routes.mjs:
+// here). The /options tool-directory builder itself lives in lib/core/catalog-cache.mjs:
 // it reads ctx.tools/agentPresets (non-pure), so it is not part of this module.
 
 // Tool-name → 中文说明 map, shown beside the raw tool name in the toolFilter