dsh-subagent-profile 0.3.0 → 0.3.2

package/lib/core/dispatch-tool.mjs

@@ -1,4 +1,4 @@
-// lib/core/dispatch-tool.mjs — `dispatch` 工具（defineTool schema + execute）、
+// lib/core/dispatch-tool.mjs — `dispatch` 工具（defineTool schema + execute）、
 // 结果 schema 一致性锁与 syncTool 注册/注销逻辑，从 index.mjs 逐字拆出。
 // 仅引用 lib + shims；无 @deepseek-ai 依赖（shims 是唯一入口）。
 //
@@ -17,14 +17,16 @@
 // routes (/set-enabled), dispose runs on plugin teardown.
 //
 // execute 按预检段 + 前台/后台/continuable 三分支拆为模块级私有函数；
-// parameters/output 声明为纯数据，驻留模块级常量（与数据表同性质，不受函数
-// 行门约束）——工厂保持装配态，行为逐字不变。
+// parameters 声明为纯数据，驻留模块级常量（与数据表同性质，不受函数行门约束）；
+// output 结果 schema 已拆至 lib/core/dispatch-schema.mjs（守文件行门）——
+// 工厂保持装配态；除各任务明示的新增行为外，执行路径零漂移。
 
 import { defineTool } from './shims.mjs';
 import { computeContinuableAllow, textFrom, stopReasonError, withPartialText, pruneBlocks, assertResultSchemaConsistency } from './pure.mjs';
 import { resolveWhitelist } from './whitelist.mjs';
 import { assertCostGuard } from './cost-guard.mjs';
-import { settleStart } from './delegation.mjs';
+import { settleStart, collectChildUsage } from './delegation.mjs';
+import { DISPATCH_OUTPUT_SCHEMA } from './dispatch-schema.mjs';
 
 // --- 工具声明纯数据（从工厂提到模块级；defineTool 只读不改）----------------------
 
@@ -34,6 +36,7 @@ const DISPATCH_PARAMETERS = {
   model: { type: 'string', description: 'Explicit model override for the child.' },
   provider: { type: 'string', description: 'Explicit provider override for the child.' },
   reasoningEffort: { type: 'string', description: 'Explicit reasoning-effort override injected into every child request.' },
+  tokenTier: { type: 'string', enum: ['cheap', 'balanced', 'premium'], description: '成本/深度分层（估算口径，非计费）：cheap 省 token、balanced 均衡、premium 高成本。覆盖 profile 的 tokenTier；缺省 balanced。' },
   persona: { type: 'string', description: 'Persona text shadowing the child deployment:persona section.' },
   toolFilter: {
     type: 'object',
@@ -50,65 +53,18 @@ const DISPATCH_PARAMETERS = {
   maxDepth: { type: 'number', description: 'Absolute delegation-depth cap for this child.' },
   run_in_background: { type: 'boolean', description: '异步 one-shot：走 jobs.start 包 start()，返回 jobId；仍单轮即弃，非 continuable' },
   continuable: { type: 'boolean', description: 'Start a durable continuable subagent instead of a one-shot: returns a subagentId immediately and keeps the child conversation available for later turns via the send_message tool. Defaults to false.' },
-  // 信封模式 = opt-in（仅「中段即交付物」的任务用）。当前**仅预留**：工具
-  // schema 暴露此参数作字段契约，execute 不消费它（结构化信封回收尚未启用）。
-  // 见 execute 内注释。
-  envelope: { type: 'boolean', description: '预留：结构化信封回收（V2.0 中期启用，当前不生效）' },
+  // 信封模式 = opt-in（仅「中段即交付物」的任务用）：true 时把信封骨架追加进
+  // 子 persona（systemPrompt 影子段，模型可见），子 Agent 按结构化信封汇报；
+  // 默认 false 走结果剪枝回收。
+  envelope: { type: 'boolean', description: 'true 时子 Agent 按结构化信封汇报（简短结论 + 结构分项 + 关键发现落点），适合中段即交付物的长任务；默认 false 走剪枝回收' },
   prompt: { type: 'string', required: true, description: 'The complete, self-contained task for the child (it does not see this conversation).' }
 };
 
-const DISPATCH_OUTPUT_SCHEMA = {
-  // Observability metadata on every result. OneOf covers the
-  // background variant (kind/jobId) and the foreground variant (output),
-  // both closed and both carrying the effective delegation values.
-  // `ignored` must appear in ALL three branches (with the shared `preset`
-  // / `provider` / `model` / `reasoningEffort` / `profile`), keeping the
-  // closed oneOf consistent — assertResultSchemaConsistency(dispatchTool
-  // .output.schema) in apply() fires if any 分支 忘补该字段.
-  oneOf: [
-    {
-      type: 'object',
-      additionalProperties: false,
-      properties: {
-        kind: { type: 'string', required: true, const: 'background' },
-        jobId: { type: 'string', required: true },
-        profile: { type: 'string' },
-        preset: { type: 'string' },
-        provider: { type: 'string' },
-        model: { type: 'string' },
-        reasoningEffort: { type: 'string' },
-        ignored: { type: 'array', items: { type: 'string' } }
-      }
-    },
-    {
-      type: 'object',
-      additionalProperties: false,
-      properties: {
-        kind: { type: 'string', required: true, const: 'continuable' },
-        subagentId: { type: 'string', required: true },
-        profile: { type: 'string' },
-        preset: { type: 'string' },
-        provider: { type: 'string' },
-        model: { type: 'string' },
-        reasoningEffort: { type: 'string' },
-        ignored: { type: 'array', items: { type: 'string' } }
-      }
-    },
-    {
-      type: 'object',
-      additionalProperties: false,
-      properties: {
-        output: { type: 'string', required: true },
-        profile: { type: 'string' },
-        preset: { type: 'string' },
-        provider: { type: 'string' },
-        model: { type: 'string' },
-        reasoningEffort: { type: 'string' },
-        ignored: { type: 'array', items: { type: 'string' } }
-      }
-    }
-  ]
-};
+// 信封骨架：envelope:true 时追加进子 persona 的结构化汇报契约。三分支共享此
+// 常量；骨架只进 persona（systemPrompt 影子段、模型可见），不进 descriptor
+// （model-hidden、仅 session 记录），故 execute 在三分支创建子 Agent 前统一
+// 追加到 merged.persona。
+const ENVELOPE_SKELETON = '完成前按以下骨架输出：## 结论（1-2 句）\n## 结构分项（逐项）\n## 关键发现落点（文件路径/数据位置）';
 
 // continuable 丢弃 preset 换用与 reasoningEffort —— 渲染行把 `ignored`
 // 列表回显出来（`reasoningEffort=<值>(ignored)`，再加 ignored 项明细），让模型
@@ -117,11 +73,29 @@ const DISPATCH_RENDER = (_args, value) => {
   const ignored = value.ignored !== undefined && value.ignored.length > 0
     ? `(ignored: ${value.ignored.join(', ')})`
     : '';
+  const tier = typeof value.tokenTier === 'string' && value.tokenTier !== ''
+    ? ` · tokenTier=${value.tokenTier}`
+    : '';
+  const tokens = typeof value.childTotalTokens === 'number'
+    ? ` · childTotalTokens=${value.childTotalTokens}`
+    : '';
+  const elapsed = typeof value.elapsedMs === 'number'
+    ? ` · elapsedMs=${value.elapsedMs}`
+    : '';
+  const stopReason = typeof value.stopReason === 'string' && value.stopReason !== ''
+    ? ` · stopReason=${value.stopReason}`
+    : '';
+  // childUsage 是嵌套对象，render 行是扁平的 key=value，故 JSON 序列化为单段
+  // 供 client 侧 parseDispatchText 解析回对象（五段分解）。仅前台 completed 结算
+  // 携带；后台结算经 job 结果携带，continuable 不携带，故该段只在 foreground 行。
+  const usage = value.childUsage !== undefined && value.childUsage !== null && typeof value.childUsage === 'object'
+    ? ` · childUsage=${JSON.stringify(value.childUsage)}`
+    : '';
   const text = value.kind === 'background'
-    ? `[dispatch] background job ${value.jobId} · profile=${value.profile} · preset=${value.preset} · provider=${value.provider} · model=${value.model} · reasoningEffort=${value.reasoningEffort}${ignored}`
+    ? `[dispatch] background job ${value.jobId} · profile=${value.profile} · preset=${value.preset} · provider=${value.provider} · model=${value.model} · reasoningEffort=${value.reasoningEffort}${ignored}${tier}`
     : value.kind === 'continuable'
-      ? `[dispatch] started subagent ${value.subagentId} · profile=${value.profile} · preset=${value.preset} · provider=${value.provider} · model=${value.model} · reasoningEffort=${value.reasoningEffort}${ignored}`
-      : `[dispatch] profile=${value.profile} · preset=${value.preset} · provider=${value.provider} · model=${value.model} · reasoningEffort=${value.reasoningEffort}${ignored}\n\n${value.output}`;
+      ? `[dispatch] started subagent ${value.subagentId} · profile=${value.profile} · preset=${value.preset} · provider=${value.provider} · model=${value.model} · reasoningEffort=${value.reasoningEffort}${ignored}${tier}`
+      : `[dispatch] profile=${value.profile} · preset=${value.preset} · provider=${value.provider} · model=${value.model} · reasoningEffort=${value.reasoningEffort}${ignored}${tier}${tokens}${usage}${elapsed}${stopReason}\n\n${value.output}`;
   return [{ type: 'text', text }];
 };
 
@@ -131,7 +105,7 @@ const DISPATCH_RENDER = (_args, value) => {
 function mergeProfileArgs(args, store) {
   const base = args.profile !== undefined ? store.resolveProfile(args.profile) : {};
   const merged = { ...base };
-  for (const key of ['preset', 'model', 'provider', 'reasoningEffort', 'persona', 'toolFilter', 'maxTokens', 'maxDepth']) {
+  for (const key of ['preset', 'model', 'provider', 'reasoningEffort', 'persona', 'toolFilter', 'maxTokens', 'maxDepth', 'tokenTier']) {
     if (args[key] !== undefined) merged[key] = args[key];
   }
   return merged;
@@ -158,7 +132,8 @@ function buildMeta(args, merged, parent) {
     preset: merged.preset ?? 'inherit',
     provider: merged.provider ?? parent.options.provider ?? '(parent)',
     model: merged.model ?? parent.options.model ?? '(parent)',
-    reasoningEffort: merged.reasoningEffort ?? '(default)'
+    reasoningEffort: merged.reasoningEffort ?? '(default)',
+    tokenTier: merged.tokenTier ?? 'balanced'
   };
 }
 
@@ -262,6 +237,7 @@ async function runContinuable(args, merged, meta, parent, exec, deps) {
     provider: meta.provider,
     model: meta.model,
     reasoningEffort: meta.reasoningEffort,
+    tokenTier: meta.tokenTier,
     ignored: ['preset', 'reasoningEffort']
   };
 }
@@ -271,7 +247,7 @@ async function runContinuable(args, merged, meta, parent, exec, deps) {
 // Background one-shot (job) path — jobs.start wraps start() with a native
 // AbortController (a Node global in a bundle; the dynamic-plugin sandbox needed
 // the hand-rolled shim instead); still one turn, not continuable.
-async function runBackground(args, meta, request, parent, deps, pruneResultOutput) {
+async function runBackground(args, meta, request, parent, deps, pruneResultOutput, t0) {
   const jobs = deps.getService('jobs');
   if (jobs === undefined) {
     throw new Error('dispatch: background jobs unavailable (load @deepseek-ai/dsh-jobs and @deepseek-ai/dsh-tool-jobs)');
@@ -284,54 +260,109 @@ async function runBackground(args, meta, request, parent, deps, pruneResultOutpu
       const controller = new AbortController();
       return {
         cancel: (reason) => controller.abort(reason ?? 'dispatch: background subagent task killed'),
-        done: settleStart(deps.subagents.start('profile', { ...request, signal: controller.signal }), controller.signal, meta, pruneResultOutput)
+        done: settleStart(
+          deps.subagents.start('profile', { ...request, signal: controller.signal }),
+          controller.signal,
+          meta,
+          pruneResultOutput,
+          (session) => measureChildTokens(deps.getService, session),
+          t0
+        )
       };
     }
   });
   return { kind: 'background', jobId, ...meta };
 }
 
+// childTotalTokens：子 Agent 会话的宿主启发式估算 token 总量（surface 口径），
+// 非 provider 计费 usage token。仅 completed 结算时测量；tokenMeter 服务缺失、
+// measure 非函数、返回缺 totalTokens 或抛错时均返回 undefined（fail-soft），
+// 使测量绝不阻断派发结算。
+function measureChildTokens(getService, session) {
+  if (session === undefined || session === null) return undefined;
+  const meter = getService('tokenMeter');
+  if (meter === undefined || typeof meter.measure !== 'function') return undefined;
+  try {
+    const measured = meter.measure(session);
+    return measured !== null && typeof measured === 'object' && typeof measured.totalTokens === 'number'
+      ? measured.totalTokens
+      : undefined;
+  } catch {
+    return undefined;
+  }
+}
+
 // Foreground: collect, always release the handle (dispose even when
 // run.result rejects), then fail loud on a non-completed stop reason.
-async function runForeground(meta, request, parent, deps, pruneResultOutput) {
+async function runForeground(meta, request, parent, deps, pruneResultOutput, t0) {
   const run = await deps.subagents.start('profile', request);
   let result;
+  let childTotalTokens;
+  let childUsage;
   try {
     result = await run.result;
+    // 仅 completed 结算时测量；dispose 前读子 session 保证事件流完整。
+    if (result.stopReason === 'completed') {
+      const childSession = run.localAgent?.session;
+      childTotalTokens = measureChildTokens(deps.getService, childSession);
+      childUsage = collectChildUsage(childSession);
+    }
   } finally {
     await run.dispose().catch(() => {});
   }
-  // A non-'completed' stop reason is a failure; attach the child's
-  // partial output text (withPartialText style).
+  // 非 completed 视为失败，附子输出部分文本。
   const failure = stopReasonError(result);
   if (failure !== undefined) throw new Error(withPartialText(failure, result.output));
-  return { output: textFrom(pruneResultOutput(result.output)), ...meta };
+  // 结算 meta：elapsedMs 自 t0；stopReason 取底层值（此分支必 completed）；
+  // childTotalTokens / childUsage 仅可测量时携带。
+  const metaOut = {
+    ...meta,
+    ...(childTotalTokens !== undefined ? { childTotalTokens } : {}),
+    ...(childUsage !== undefined ? { childUsage } : {}),
+    elapsedMs: Date.now() - t0,
+    stopReason: result.stopReason
+  };
+  return { output: textFrom(pruneResultOutput(result.output)), ...metaOut };
 }
 
 // execute 主体：预检段 + 三分支分派，行为逐字不变。
 async function runDispatch(args, exec, deps) {
   const parent = exec.agent;
   if (!parent) throw new Error('dispatch requires calling agent');
+  // 派发耗时基准：execute 入口记 t0，前台/后台各自在结算处算 elapsedMs。
+  // continuable 不结算、不携带，故 t0 仅穿线到前台/后台。
+  const t0 = Date.now();
   const merged = mergeProfileArgs(args, deps.store);
+  // 信封模式 opt-in：三分支创建子 Agent 前，把信封骨架追加进子 persona。
+  // persona 是 systemPrompt 影子段（模型可见）；descriptor 是 model-hidden，
+  // 故骨架只追加 persona、不触碰 descriptor。既有 persona 为空/未设时直接
+  // 置为骨架，非空时以空行衔接追加，不覆盖原文。
+  if (args.envelope === true) {
+    const hasPersona = merged.persona !== undefined && merged.persona.trim() !== '';
+    merged.persona = hasPersona
+      ? `${merged.persona}\n\n${ENVELOPE_SKELETON}`
+      : ENVELOPE_SKELETON;
+  }
   await assertPresetWhitelist(parent, merged);
-  // Cost guard（运行时推导；硬上限始终生效，llm 能力核验由 allowFailOpen 门控）。
-  await assertCostGuard(parent, merged, deps.store.getAllowFailOpen(), deps.logger);
+  // Cost guard（运行时推导；硬上限始终生效，llm 能力核验由 allowFailOpen 门控；
+  // llm 目录读取走共享 catalog 快照）。
+  await assertCostGuard(parent, merged, deps.store.getAllowFailOpen(), deps.logger, deps.catalog);
   const meta = buildMeta(args, merged, parent);
   const request = buildRequest(args, merged, parent, exec.signal);
   // 结果回收默认剪枝：在 textFrom(result.output) 之前复用宿主
   // toolResultPruner.pruneContent 预剪。`pruneResultOutput` 每次现取
   // ctx.get('toolResultPruner') 以反映服务就绪状态；pruner 缺失时
-  // pruneBlocks 回退为不剪（剪枝是增强、非硬依赖）。envelope 参数虽已在
-  // 工具 schema 暴露（预留），但 execute **不消费**它。
+  // pruneBlocks 回退为不剪（剪枝是增强、非硬依赖）。envelope:true 时信封
+  // 骨架已在上方追加进 merged.persona（不改变此处的剪枝回收路径）。
   const pruneResultOutput = (blocks) => pruneBlocks(blocks, deps.getService('toolResultPruner'));
   logDispatchDecision(deps.logger, args, merged, parent);
   if (args.continuable === true) return runContinuable(args, merged, meta, parent, exec, deps);
-  if (args.run_in_background === true) return runBackground(args, meta, request, parent, deps, pruneResultOutput);
-  return runForeground(meta, request, parent, deps, pruneResultOutput);
+  if (args.run_in_background === true) return runBackground(args, meta, request, parent, deps, pruneResultOutput, t0);
+  return runForeground(meta, request, parent, deps, pruneResultOutput, t0);
 }
 
-export function createDispatchTool({ register, store, getEnabled, getService, logger, subagents }) {
-  const deps = { store, getEnabled, getService, logger, subagents };
+export function createDispatchTool({ register, store, getEnabled, getService, logger, subagents, catalog }) {
+  const deps = { store, getEnabled, getService, logger, subagents, catalog };
   const dispatchTool = defineTool({
     name: 'dispatch',
     description: 'Dispatch a subtask to a derived subagent, optionally overriding its preset, model, provider, reasoning effort, persona, tool whitelist, token budget, or recursion depth. Foreground waits for the result; run_in_background: true starts a background job (single turn); continuable: true starts a durable subagent whose conversation stays available for later turns via the send_message tool. 前瞻：continuable 模式忽略 preset 换用与 reasoningEffort（结果以 ignored 提示）。',

package/lib/core/http-routes.mjs

@@ -1,8 +1,9 @@
-// lib/core/http-routes.mjs — settings HTTP loopback routes for the Client UI,
-// moved verbatim from index.mjs's `ctx.inject(['webServer'], (scope) => {...})`
-// block. Local lib references only: sanitizeProfile from
-// lib/core/pure.mjs, TOOL_ZH/TOOL_CATEGORY from lib/core/catalog.mjs, BUILTIN_SEEDS from
-// lib/core/profiles-store.mjs; no @deepseek-ai dependency.
+// lib/core/http-routes.mjs — settings HTTP loopback routes for the Client UI.
+// Read routes (list / options summary / per-model efforts / tools) + write
+// routes (set-enabled / add / remove / reset / reset-all / set-profile-enabled).
+// The /options catalog (models / presets / tools / efforts) is served from the
+// shared catalog cache (lib/core/catalog-cache.mjs), so these routes no longer
+// walk the llm directory themselves.
 //
 // Injection: every apply-closure / ctx dependency is an explicit parameter —
 //   store         the profile store (profiles Map / persistProfiles /
@@ -11,20 +12,17 @@
 //                 /set-enabled),
 //   setEnabled    writes it,
 //   syncTool      unregisters/registers the dispatch tool on /set-enabled,
-//   getLlm / getAgentPresets / getTools
-//                 request-time service getters (ctx.get('llm') etc. are read
-//                 per request, never at apply time),
-//   logger        ctx.logger (route error / tools-directory warnings).
+//   catalog       the shared catalog cache (getSnapshot / invalidate),
+//   logger        ctx.logger (route error warnings).
 // The factory returns the scope.effect setup function so the caller keeps the
 // exact original registration shape: effect(() => register + disposer).
 //
-// 8 条路由各抽为模块级处理函数（if 链分发保持）；/options 的目录构建抽
-// collectModelDirectory / collectSystemPresets / collectToolsDirectory。
-// 行为逐字不变（错误文案/状态码/schema）。
+// 写路由各抽为模块级处理函数（if 链分发保持）；/options 拆三读路由 + 手动刷新，
+// 目录数据统一来自 catalog 快照。
 
 import { sanitizeProfile } from './pure.mjs';
-import { TOOL_ZH, TOOL_CATEGORY } from './catalog.mjs';
 import { BUILTIN_SEEDS } from './profiles-store.mjs';
+import { detectVersions } from './shims.mjs';
 
 // Only the loopback interfaces may drive the settings HTTP routes.
 const LOOPBACKS = new Set(['127.0.0.1', '::1', '::ffff:127.0.0.1']);
@@ -80,123 +78,36 @@ async function handleList(deps, res) {
   return json(res, 200, { ok: true, profiles: listClean(deps.store) });
 }
 
-// /options 的模型目录 + 每模型 reasoning-effort 等级（llm 可选，失败仅清空）。
-async function collectModelDirectory(llm) {
-  const models = [];
-  const efforts = {};
-  const providers = await llm.listProviders();
-  for (const provider of (providers ?? [])) {
-    const providerId = provider && provider.id;
-    if (typeof providerId !== 'string') continue;
-    let modelList = [];
-    try { modelList = await llm.listModels(providerId); } catch { /* skip this provider's catalog */ }
-    for (const model of (modelList ?? [])) {
-      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 { /* exact-model lookup may reject; skip its efforts */ }
-    }
-  }
-  return { models, efforts };
+// 轻量摘要：enabled + 模型目录（含 provider 信息，客户端据此派生提供方列表）+ 预设名册。
+async function handleSummary(deps, res) {
+  const snapshot = await deps.catalog.getSnapshot();
+  return json(res, 200, { ok: true, enabled: deps.getEnabled(), models: snapshot.models, presets: snapshot.presets });
 }
 
-// System-trust presets（agentPresets 可选，fail-soft）。
-async function collectSystemPresets(agentPresets) {
-  const 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;
+// 每模型 reasoning-effort 等级（懒加载；model 命中快照的 efforts 表）。
+async function handleEfforts(deps, url, res) {
+  const model = url.searchParams.get('model');
+  const snapshot = await deps.catalog.getSnapshot();
+  const efforts = (typeof model === 'string' && model !== '' && snapshot.efforts[model] !== undefined) ? snapshot.efforts[model] : [];
+  return json(res, 200, { ok: true, efforts });
 }
 
-// Full tool directory = global layer (deployment plugins) + every preset's
-// standing scope (the agent.cordis.yml tool rows). Each tool is tagged with
-// its source: 'global' or the preset id — the grouping is fully dynamic,
-// derived from the runtime's preset roster.
-async function collectToolsDirectory(getTools, getAgentPresets) {
-  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 = getTools();
-  if (toolsService && typeof toolsService.schemas === 'function') {
-    push(toolsService.schemas(), 'global');
-    const agentPresets = getAgentPresets();
-    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 { /* one preset's standing scope unavailable; skip */ }
-      }
-    }
-  }
-  return tools;
+// 完整工具目录（面板打开时取）。
+async function handleTools(deps, res) {
+  const snapshot = await deps.catalog.getSnapshot();
+  return json(res, 200, { ok: true, tools: snapshot.tools });
 }
 
-async function handleOptions(deps, res) {
-  const models = [];
-  const efforts = {};
-  const presets = [];
-  // Model directory + per-model reasoning-effort levels. The `llm` service
-  // is optional (headless): a failure only empties the lists, never breaks
-  // the settings page.
-  const llm = deps.getLlm();
-  if (llm !== undefined) {
-    try {
-      const { models: found, efforts: levels } = await collectModelDirectory(llm);
-      models.push(...found);
-      Object.assign(efforts, levels);
-    } catch { /* llm directory unavailable; leave options empty */ }
-  }
-  // System-trust presets (agentPresets is optional; fail-soft).
-  const agentPresets = deps.getAgentPresets();
-  if (agentPresets !== undefined) {
-    presets.push(...await collectSystemPresets(agentPresets));
-  }
-  // Full tool directory = global layer + every preset's standing scope.
-  let tools = [];
-  try {
-    tools = await collectToolsDirectory(deps.getTools, deps.getAgentPresets);
-  } catch (error) {
-    deps.logger.warn('[dsh-subagent-profile] tools directory failed:', error instanceof Error ? error.message : String(error));
-  }
-  return json(res, 200, { ok: true, enabled: deps.getEnabled(), models, efforts, presets, tools });
+// 版本探测：三包 version + 越界/未知的中文 warnings（纯探测，同步）。
+function handleVersions(res) {
+  const { versions, warnings } = detectVersions();
+  return json(res, 200, { ok: true, versions, warnings });
+}
+
+// 手动刷新：清缓存兜底（TTL 过期前的目录变更经此立即生效）。
+async function handleRefresh(deps, res) {
+  deps.catalog.invalidate();
+  return json(res, 200, { ok: true, refreshed: true });
 }
 
 async function handleSetEnabled(deps, req, res) {
@@ -222,6 +133,11 @@ async function handleAdd(deps, req, res) {
     return json(res, 400, { ok: false, error: `写入被拒绝：${detail}` });
   }
   const hadToolFilter = profile.toolFilter !== undefined;
+  // tokenTier 不参与上方通用 merge 循环：sanitizeProfile 对「未提供」恒回填
+  // balanced，若进循环会破坏「未传→保留 existing」语义（编辑内置 researcher
+  // 时 cheap 会被重置为 balanced）。故单独用 raw-body 守卫：传了才写（strict
+  // 模式下非法值已在上面 400 拒绝，clean.tokenTier 必为合法 enum）。
+  const hadTokenTier = profile.tokenTier !== undefined;
   const existing = deps.store.profiles.get(clean.id);
   const seed = BUILTIN_SEEDS.find((s) => s.id === clean.id);
   const isBuiltin = (existing !== undefined && existing.builtin === true) || seed !== undefined;
@@ -245,6 +161,7 @@ async function handleAdd(deps, req, res) {
       delete merged.toolFilter;
     }
   }
+  if (hadTokenTier) merged.tokenTier = clean.tokenTier;
   if (merged.enabled !== undefined) merged.enabled = merged.enabled === false ? false : true;
   deps.store.profiles.set(merged.id, { ...merged, ...(isBuiltin ? { builtin: true } : {}), persisted: true });
   deps.store.deletedBuiltins.delete(merged.id);
@@ -297,8 +214,8 @@ async function handleSetProfileEnabled(deps, req, res) {
   return persistOk(res, { id, enabled: existing.enabled }, deps.store.persistProfiles());
 }
 
-export function createHttpRoutes({ webServer, store, getEnabled, setEnabled, syncTool, getLlm, getAgentPresets, getTools, logger }) {
-  const deps = { store, getEnabled, setEnabled, syncTool, getLlm, getAgentPresets, getTools, logger };
+export function createHttpRoutes({ webServer, store, getEnabled, setEnabled, syncTool, catalog, logger }) {
+  const deps = { store, getEnabled, setEnabled, syncTool, catalog, logger };
   // 路由分发（if 链保持，判断顺序与 404/500 兜底不变）。
   const handler = async (req, res) => {
     const remote = req.socket?.remoteAddress;
@@ -307,7 +224,11 @@ export function createHttpRoutes({ webServer, store, getEnabled, setEnabled, syn
     const sub = (url.pathname.replace(/^\/subagent-profiles/, '') || '/').replace(/\/+$/, '') || '/';
     try {
       if (req.method === 'GET' && (sub === '/' || sub === '/list')) return handleList(deps, res);
-      if (req.method === 'GET' && sub === '/options') return handleOptions(deps, res);
+      if (req.method === 'GET' && sub === '/options/summary') return handleSummary(deps, res);
+      if (req.method === 'GET' && sub === '/options/versions') return handleVersions(res);
+      if (req.method === 'GET' && sub === '/options/efforts') return handleEfforts(deps, url, res);
+      if (req.method === 'GET' && sub === '/options/tools') return handleTools(deps, res);
+      if (req.method === 'POST' && sub === '/options/refresh') return handleRefresh(deps, res);
       if (req.method === 'POST' && sub === '/set-enabled') return handleSetEnabled(deps, req, res);
       if (req.method === 'POST' && sub === '/add') return handleAdd(deps, req, res);
       if (req.method === 'POST' && sub === '/remove') return handleRemove(deps, req, res);

package/lib/core/profile-provider.mjs

@@ -1,4 +1,4 @@
-// lib/core/profile-provider.mjs — `profile` 子 Agent provider
+// lib/core/profile-provider.mjs — `profile` 子 Agent provider
 // （setup/start/prepareContinuable），从 index.mjs 的
 // `ctx.subagents.registerProvider({...})` 块逐字拆出。仅引用 lib + shims；
 // 无 @deepseek-ai 依赖（shims 是唯一入口）。
@@ -55,8 +55,9 @@ async function runStartPreflight(request, deps) {
   if (typeof profile.preset === 'string' && profile.preset !== 'inherit' && !whitelist.has(profile.preset)) {
     throw new Error(`dispatch: preset "${profile.preset}" is not in the target-preset whitelist`);
   }
-  // 权威 cost guard（运行时推导；硬上限始终生效，llm 能力核验由 allowFailOpen 门控）。
-  await assertCostGuard(parent, profile, deps.store.getAllowFailOpen(), deps.logger);
+  // 权威 cost guard（运行时推导；硬上限始终生效，llm 能力核验由 allowFailOpen 门控；
+  // llm 目录读取走共享 catalog 快照）。
+  await assertCostGuard(parent, profile, deps.store.getAllowFailOpen(), deps.logger, deps.catalog);
   // Delegation depth: shipped helpers — assert the cap value, then resolve
   // the child depth (parent floor + 1) and enforce the cap.
   assertSubagentMaxDepth(profile.maxDepth);
@@ -229,8 +230,8 @@ function wireChildLifecycle(handle, request, childId, swapPreset, profile, logge
   };
 }
 
-export function createProfileProvider({ subagents, store, getEnabled, logger }) {
-  const deps = { store, getEnabled, logger };
+export function createProfileProvider({ subagents, store, getEnabled, logger, catalog }) {
+  const deps = { store, getEnabled, logger, catalog };
   return subagents.registerProvider({
     name: 'profile',
     capabilities: { outputSchema: false, depthLimit: true, toolFilter: true, persona: true },

package/lib/core/profiles-store.mjs

@@ -1,4 +1,4 @@
-// lib/core/profiles-store.mjs — profile registry store and enable/disable switch
+// lib/core/profiles-store.mjs — profile registry store and enable/disable switch
 // (moved verbatim from index.mjs and refactored into a factory; import-free —
 // node builtins + lib/core/pure.mjs only, no @deepseek-ai dependency).
 //
@@ -42,8 +42,8 @@ export function dshHome() {
 //    connection.defaults.thinking — this deployment leaves thinking unset,
 //    so the full set is advertised for deepseek-v4-flash).
 export const BUILTIN_SEEDS = [
-  { id: 'swap-standard', name: '标准编码', description: '切换到 standard 预设的完整编码工具集。当父会话不是 standard、但子任务需要完整编码能力时用。', preset: 'standard', builtin: true },
-  { id: 'researcher', name: '调研检索', description: '关闭深度推理省 token，继承父工具。适合查资料、汇总、背景调研，不适合改代码。', reasoningEffort: 'off', persona: 'You are a research subagent: search, read, and summarize only. Do not modify code or files.', builtin: true }
+  { id: 'swap-standard', name: '标准编码', description: '切换到 standard 预设的完整编码工具集。当父会话不是 standard、但子任务需要完整编码能力时用。', preset: 'standard', tokenTier: 'balanced', builtin: true },
+  { id: 'researcher', name: '调研检索', description: '关闭深度推理省 token，继承父工具。适合查资料、汇总、背景调研，不适合改代码。', reasoningEffort: 'off', persona: 'You are a research subagent: search, read, and summarize only. Do not modify code or files.', tokenTier: 'cheap', builtin: true }
 ];
 
 // --- 模块级 store 函数（从工厂拆出；per-apply 状态经 `state` 注入）---------------