@v587d/capital-generation 2.9.2 → 2.10.1

package/lib/chart/html.js

@@ -59,7 +59,9 @@ function formatCapturedAt(epochMs) {
 export function buildStandaloneHtml(input) {
     const { payload, library } = input;
     const meta = payload.meta;
+    const kindLabel = payload.kind === 'candlestick' ? 'K 线图' : payload.kind === 'bar' ? 'OHLC 图' : payload.kind === 'column' ? '柱状图' : payload.kind === 'area' ? '面积图' : '折线图';
     const facts = [];
+    facts.push(kindLabel);
     facts.push(`${meta.points} 个数据点`);
     if (meta.downsampled)
         facts.push(`已从 ${meta.original_points} 点下采样（保留极值形状，非全量）`);
@@ -73,6 +75,18 @@ export function buildStandaloneHtml(input) {
         facts.push(`时间字段 ${meta.time_field}`);
     if (meta.axis === 'index')
         facts.push('分类轴（按行序）');
+    const guide = [];
+    guide.push(meta.axis === 'index' ? '横轴为分类，按数据行序排列；纵轴为数值。' : '横轴为时间；纵轴为数值。');
+    if (payload.ohlc)
+        guide.push('K 线红涨绿跌，下方成交量柱按当日涨跌着色。');
+    else if (payload.volume)
+        guide.push('下方成交量柱按涨跌方向着色。');
+    if (payload.series.length > 0)
+        guide.push(`序列：${payload.series.map((item) => item.label).join('、')}。`);
+    if (meta.downsampled)
+        guide.push('曲线为下采样后的形状，数值结论请回到表格/查询结果。');
+    if (meta.warnings.length > 0)
+        guide.push('数据提示见下方 warnings。');
     const warnings = meta.warnings.length > 0
         ? `<ul class="warnings">${meta.warnings.map((warning) => `<li>${escapeHtml(warning)}</li>`).join('')}</ul>`
         : '';
@@ -108,6 +122,7 @@ export function buildStandaloneHtml(input) {
   body { font: 14px/1.6 -apple-system, "PingFang SC", "Microsoft YaHei", system-ui, sans-serif; padding: 16px 20px 24px; }
   h1 { margin: 0 0 4px; font-size: 16px; font-weight: 600; }
   .facts { margin: 0; color: var(--dsw-alias-label-secondary); font-size: 12px; }
+  .guide { margin: 6px 0 0; color: var(--dsw-alias-label-secondary); font-size: 12px; line-height: 1.7; }
   main { margin-top: 12px; height: 460px; min-height: 320px; }
   .warnings { margin: 12px 0 0; padding-left: 18px; color: var(--dsw-alias-label-secondary); font-size: 12px; }
   footer { margin-top: 16px; color: var(--dsw-alias-label-secondary); font-size: 11px; }
@@ -117,6 +132,7 @@ export function buildStandaloneHtml(input) {
 <header>
   <h1>${escapeHtml(payload.title)}</h1>
   <p class="facts">${facts.map((fact) => escapeHtml(fact)).join(' · ')}</p>
+  <p class="guide">${guide.map((line) => escapeHtml(line)).join(' ')}</p>
 </header>
 <main id="chart"></main>
 ${warnings}

package/lib/chart/present-tool.js

@@ -55,6 +55,52 @@ function normalizeTaskId(value) {
         throw new Error('present_charts 的 task_id 必须是非空字符串');
     return value.trim();
 }
+const TITLE_SUBJECT_CODE = /(?<!\d)(\d{6})(?!\d)/g;
+function titleSubjectCodes(title) {
+    return [...title.matchAll(TITLE_SUBJECT_CODE)].map((match) => match[1]);
+}
+/** Strip six-digit codes and punctuation so “同花顺 300033 日K” and “同花顺 300803 日K” share a key. */
+function titleDedupeKey(title) {
+    return title
+        .normalize('NFKC')
+        .toLowerCase()
+        .replace(TITLE_SUBJECT_CODE, '')
+        .replace(/[\s\p{P}\p{S}]+/gu, '');
+}
+function artifactQualityFailure(artifact) {
+    const codes = titleSubjectCodes(artifact.title);
+    if (codes.length === 0 || artifact.subject_code === null)
+        return undefined;
+    const mismatched = [...new Set(codes.filter((code) => code !== artifact.subject_code))];
+    if (mismatched.length === 0)
+        return undefined;
+    return `标题里的股票代码 ${mismatched.join('、')} 与 dataset 对应的 ${artifact.subject_code} 不一致；请改正标题后重绘，未登记这张图`;
+}
+function dedupeArtifacts(artifacts) {
+    const kept = [];
+    const failed = [];
+    const seen = new Map();
+    for (const artifact of artifacts) {
+        const qualityFailure = artifactQualityFailure(artifact);
+        if (qualityFailure !== undefined) {
+            failed.push({ chart_ref: artifact.chart_ref, reason: qualityFailure });
+            continue;
+        }
+        const titleKey = titleDedupeKey(artifact.title);
+        const key = `${artifact.dataset_id ?? 'no-dataset'}|${artifact.kind}|${titleKey.length > 0 ? titleKey : artifact.chart_ref}`;
+        const previous = seen.get(key);
+        if (previous !== undefined) {
+            failed.push({
+                chart_ref: artifact.chart_ref,
+                reason: `重复图表：与 ${previous.chart_ref} 的 dataset/kind/标题相同；只登记第一张`,
+            });
+            continue;
+        }
+        seen.set(key, artifact);
+        kept.push(artifact);
+    }
+    return { kept, failed };
+}
 /** Present refs first; otherwise present the whole task so compaction cannot strand the charts. */
 function selectArtifacts(input, session, refs, taskId) {
     const failed = [];
@@ -89,8 +135,9 @@ export function registerPresentChartsTool(ctx, input) {
         return;
     const definition = {
         name: 'present_charts',
-        description: '把本会话已生成的图表登记为**最终答复的交付物**（官方 deliverables/presented）：用户会在答复末尾的「本轮文件改动 / 交付」行看到卡片，点开即渲染自包含 chart.html。'
+        description: '把本会话已生成的图表登记为**最终答复的交付物**（官方 deliverables/presented）：用户会在答复末尾的「本轮文件改动 / 交付」行看到卡片，点开即渲染自包含 HTML（文件名带代码/标题或图形类型，如 `300803-kline-<短id>.html`）。'
             + '**由主 Agent 调用一次**：参数是 data_junior 回传的 chart_refs（一次传入，最多 32 个）；refs 已丢失时改传 task_id 登记该任务的全部图表。'
+            + '登记前会按 dataset + kind + 标题去重，并校验标题里的 6 位股票代码与 dataset 一致；重复或错标题的 ref 会进 failed，不会出现在交付卡片里。'
             + '这里只记录本轮要交付的图，宿主会在**最终答复之前**统一写入交付行——提前调用不会落进中间轮，不必等“最后一刻”，也不要在过程轮反复调用。'
             + '不要传文件路径或 HTML（路径由宿主解析）；不调用时宿主仍会在收尾时自动登记本 exchange 已生成的图表。',
         parameters,
@@ -101,7 +148,9 @@ export function registerPresentChartsTool(ctx, input) {
             if (refs.length === 0 && taskId === undefined) {
                 throw new Error('present_charts 需要 chart_refs 或 task_id：两者都不给就无法确定要登记哪几张图');
             }
-            const { selected, failed } = selectArtifacts(input, session, refs, taskId);
+            const { selected: selectedRaw, failed } = selectArtifacts(input, session, refs, taskId);
+            const { kept: selected, failed: qualityFailed } = dedupeArtifacts(selectedRaw);
+            failed.push(...qualityFailed);
             const receipt = { presented: [], failed };
             if (selected.length === 0)
                 return receipt;
@@ -124,7 +173,7 @@ export function registerPresentChartsTool(ctx, input) {
                 throw new Error(blocked);
             const publisher = input.chartEvents();
             if (publisher === undefined) {
-                throw new Error('图表交付通道不可用（sessions / sessionProjections 解析不到）：图表已落盘，可在 workspace 打开 chart.html');
+                throw new Error('图表交付通道不可用（sessions / sessionProjections 解析不到）：图表已落盘，可在 workspace 打开 html_path 指向的 HTML');
             }
             const accepted = publisher.publishMany !== undefined
                 ? publisher.publishMany(session.id, inputs)

package/lib/chart/tool.js

@@ -16,6 +16,49 @@ function newChartId() {
     const suffix = cryptoLike?.randomUUID ? cryptoLike.randomUUID() : `${Date.now().toString(36)}${Math.random().toString(36).slice(2, 10)}`;
     return `ch_${suffix}`;
 }
+const SUBJECT_KEYS = ['thscode', 'ts_code', 'ticker', 'symbol', 'stock_code', 'sec_code', 'code'];
+/** Six-digit A-share/HK/US ticker; `thscode` wins over generic API status fields such as `code`. */
+function subjectCodeOf(value) {
+    if (!value || typeof value !== 'object' || Array.isArray(value))
+        return null;
+    const record = value;
+    for (const key of SUBJECT_KEYS) {
+        const raw = record[key];
+        if (typeof raw === 'string') {
+            const match = /(?<!\d)(\d{6})(?!\d)/.exec(raw);
+            if (match)
+                return match[1];
+        }
+        if (typeof raw === 'number' && Number.isSafeInteger(raw) && raw >= 100_000 && raw <= 999_999) {
+            return String(raw);
+        }
+    }
+    return null;
+}
+function chartSubjectCode(envelope, rows) {
+    const fromEnvelope = subjectCodeOf(envelope);
+    if (fromEnvelope !== null)
+        return fromEnvelope;
+    for (const row of rows.slice(0, 3)) {
+        const fromRow = subjectCodeOf(row);
+        if (fromRow !== null)
+            return fromRow;
+    }
+    return null;
+}
+/** Readable, collision-resistant filename: ASCII title slug + short chart id. The store's artifact
+ * name gate is deliberately ASCII, so Chinese titles fall back to the chart kind (code stays when
+ * the title/envelope carries one). */
+function chartHtmlName(title, kind, chartId, subjectCode) {
+    const kindSlug = kind === 'candlestick' ? 'kline' : kind === 'bar' ? 'ohlc' : kind === 'column' ? 'column' : kind === 'area' ? 'area' : 'line';
+    const words = title.normalize('NFKC').match(/[A-Za-z0-9]+/g) ?? [];
+    const parts = subjectCode !== null && !words.includes(subjectCode) ? [subjectCode, ...words] : [...words];
+    if (parts.length === 0 || (subjectCode !== null && parts.every((part) => part === subjectCode)))
+        parts.push(kindSlug);
+    const safe = parts.join('-').replace(/-+/g, '-').replace(/^[.\-]+|[.\-]+$/g, '').slice(0, 48);
+    const suffix = chartId.replace(/^ch_/, '').slice(0, 8);
+    return `${safe.length > 0 ? safe : kindSlug}-${suffix}.html`;
+}
 function sessionOf(exec) {
     const session = exec.agent?.session;
     if (!session || typeof session.id !== 'string' || session.id.length === 0) {
@@ -125,18 +168,27 @@ export async function renderChart(input, args, exec) {
         spec.title = args.title.trim().slice(0, 200);
     // The token carries the direct data-agent session; the nested child never sees raw rows.
     let rows;
+    let subjectCode;
     let meta;
     if (datasetId !== undefined) {
         const readSession = tokenSource?.sourceSession ?? session;
-        const { ref, rows: datasetRows } = await input.store.readPresentationRows({ session: readSession, dataset_id: datasetId, signal: exec.signal });
+        const { ref, rows: datasetRows, envelope } = await input.store.readPresentationRows({ session: readSession, dataset_id: datasetId, signal: exec.signal });
         rows = datasetRows;
-        meta = { source_kind: 'dataset', dataset_id: ref.dataset_id, source_label: ref.source_label, captured_at: ref.captured_at };
+        subjectCode = chartSubjectCode(envelope, datasetRows);
+        meta = {
+            source_kind: 'dataset',
+            dataset_id: ref.dataset_id,
+            source_label: ref.source_label,
+            captured_at: ref.captured_at,
+            ...(subjectCode === null ? {} : { subject_code: subjectCode }),
+        };
     }
     else {
         const parsed = await input.store.readWorkspaceJson({ session, path: path, signal: exec.signal });
         const extracted = extractRows(parsed);
         rows = extracted.rows;
-        meta = { source_kind: 'path' };
+        subjectCode = chartSubjectCode(parsed, extracted.rows);
+        meta = { source_kind: 'path', ...(subjectCode === null ? {} : { subject_code: subjectCode }) };
     }
     const chartId = newChartId();
     const payload = buildChartPayload({ chart_id: chartId, spec, rows, meta });
@@ -144,13 +196,14 @@ export async function renderChart(input, args, exec) {
     const generatedAt = now();
     const html = buildStandaloneHtml({ payload, library, generatedAt });
     const dir = `${CHART_ARTIFACT_DIR}/${chartId}`;
+    const htmlName = chartHtmlName(payload.title, payload.kind, chartId, subjectCode);
     const written = await input.store.writeWorkspaceFiles({
         session,
         dir,
         files: [
-            { name: 'spec.json', content: `${JSON.stringify({ chart_id: chartId, created_at: generatedAt, source: { dataset_id: meta.dataset_id ?? null, path: path ?? null }, spec }, null, 2)}\n` },
+            { name: 'spec.json', content: `${JSON.stringify({ chart_id: chartId, created_at: generatedAt, source: { dataset_id: meta.dataset_id ?? null, path: path ?? null, subject_code: subjectCode }, spec }, null, 2)}\n` },
             { name: 'series.json', content: `${JSON.stringify(payload)}\n` },
-            { name: 'chart.html', content: html },
+            { name: htmlName, content: html },
         ],
         signal: exec.signal,
     });
@@ -175,13 +228,14 @@ export async function renderChart(input, args, exec) {
         dataset_id: meta.dataset_id ?? null,
         source_label: meta.source_label ?? null,
         captured_at: meta.captured_at ?? null,
+        subject_code: subjectCode,
         kind: payload.kind,
         axis: payload.axis,
         title: payload.title,
         chart_url: chartUrl,
         spec_path: pathOf('spec.json'),
         series_path: pathOf('series.json'),
-        html_path: pathOf('chart.html'),
+        html_path: pathOf(htmlName),
         created_at: generatedAt,
     });
     // Unit callers without the registry still get a stable receipt.
@@ -202,7 +256,7 @@ export async function renderChart(input, args, exec) {
                 ownerSessionId,
                 chart_id: chartId,
                 title: payload.title,
-                html_path: pathOf('chart.html'),
+                html_path: pathOf(htmlName),
             });
             deliverableTrace = `publish=${accepted ? '受理' : '拒绝'} ownerSessionId=${ownerSessionId} | ${publisher.lastTrace?.() ?? '(无轨迹)'}`;
         }
@@ -242,7 +296,7 @@ export async function renderChart(input, args, exec) {
         chart_url: chartUrl,
         spec_path: pathOf('spec.json'),
         series_path: pathOf('series.json'),
-        html_path: pathOf('chart.html'),
+        html_path: pathOf(htmlName),
         warnings: payload.meta.warnings,
     };
 }
@@ -252,7 +306,7 @@ export function registerChartTool(ctx, options) {
         return;
     const definition = {
         name: 'render_chart',
-        description: `把已经取到的数据渲染成一张可交互图，产物落在 workspace 的 ${CHART_ARTIFACT_DIR}/<chart_id>/（chart.html 可离线打开）。` +
+        description: `把已经取到的数据渲染成一张可交互图，产物落在 workspace 的 ${CHART_ARTIFACT_DIR}/<chart_id>/（HTML 以标题/代码命名，如「600519-kline-<短id>.html」，可离线打开）。` +
             '**只回一条小回执，不回任何原始数据行**：序列走旁路，不进入上下文。' +
             '来源三选一：dataset_id（已授权的 DatasetRef）、path（workspace 相对路径的 JSON，支持顶层数组或含行数组的 envelope），或 chart_source_ref（宿主签发给 visualization_specialist 的短期 token；使用它时还要提供 task_id）。' +
             'spec 是自由对象，至少给出 kind（line / area / column / candlestick / bar；后两者要 ohlc 四字段与真实时间列）与字段选择（series 或 ohlc），' +

package/lib/data-collector/store.d.ts

@@ -353,6 +353,7 @@ export declare class WorkspaceDatasetStore {
     }): Promise<{
         ref: DatasetRef;
         rows: unknown[];
+        envelope?: Record<string, unknown>;
     }>;
     /**
      * Host-internal workspace text read; with readWorkspaceBytes it shares containment and size

package/lib/data-collector/store.js

@@ -332,7 +332,7 @@ export class WorkspaceDatasetStore {
         if (raw.rows.length > maxRows) {
             throw new DatasetStoreError('dataset_too_large', `Dataset has ${raw.rows.length} rows; presentation reads are capped at ${maxRows}`);
         }
-        return { ref, rows: raw.rows };
+        return { ref, rows: raw.rows, ...(raw.envelope === undefined ? {} : { envelope: raw.envelope }) };
     }
     /**
      * Host-internal workspace text read; with readWorkspaceBytes it shares containment and size
@@ -500,7 +500,7 @@ export class WorkspaceDatasetStore {
         if (isRecord(value)) {
             const rows = rowsAtPath(value, rowKey ?? 'item');
             if (rows !== undefined)
-                return { kind: 'rows', rows, shape: 'envelope_item' };
+                return { kind: 'rows', rows, shape: 'envelope_item', envelope: value };
         }
         if (isRecord(value))
             return { kind: 'document', value };

package/lib/index.d.ts

@@ -1,15 +1,16 @@
 import { Context } from '@deepseek-ai/cordis';
 import z from '@deepseek-ai/schemastery';
-import { type SelectedSkillSelection } from './agents/selected-skills-provider.js';
+import { type SelectedSkillSelection, type SelectedSkillsMode } from './agents/selected-skills-provider.js';
+import { CAPITAL_CONFIG_ENTRY_ID } from './capital-settings.js';
 import { type RetrieverConfig } from './retriever-config.js';
 export { LOCAL_FETCH_DEFAULTS, PADDLE_OCR_DEFAULTS, resolveLocalFetchConfig, type LocalFetchConfig, type PaddleOcrConfig, type RetrieverConfig, type WindDocsConfig, } from './retriever-config.js';
 export { resolveUserCustomizationSection } from './user-customization.js';
 export declare const name = "capital-generation";
-/** Entry id shared by `cordis.patch.yml`, `config/index.js` and `client.src.cjs`; drift hides the settings card. */
-export declare const CAPITAL_CONFIG_ENTRY_ID = "capital-config";
+export { CAPITAL_CONFIG_ENTRY_ID };
 export interface Config {
     customPersona?: string;
     selectedSkills?: SelectedSkillSelection;
+    selectedSkillsMode?: SelectedSkillsMode;
     fuyaoCredentialRef?: string;
     ftshareCredentialRef?: string;
     retriever?: RetrieverConfig;
@@ -21,6 +22,7 @@ export declare const Config: z<Schemastery.ObjectS<NoInfer<{
     }>>, Schemastery.ObjectT<NoInfer<{
         [k: string]: z<boolean, boolean, "defined">;
     }>>, "defined">;
+    selectedSkillsMode: z<"manual" | "auto", "manual" | "auto", "defined">;
     fuyaoCredentialRef: z<string, string, "defined">;
     ftshareCredentialRef: z<string, string, "defined">;
     retriever: z<Schemastery.ObjectS<NoInfer<{
@@ -107,6 +109,7 @@ export declare const Config: z<Schemastery.ObjectS<NoInfer<{
     }>>, Schemastery.ObjectT<NoInfer<{
         [k: string]: z<boolean, boolean, "defined">;
     }>>, "defined">;
+    selectedSkillsMode: z<"manual" | "auto", "manual" | "auto", "defined">;
     fuyaoCredentialRef: z<string, string, "defined">;
     ftshareCredentialRef: z<string, string, "defined">;
     retriever: z<Schemastery.ObjectS<NoInfer<{

package/lib/index.js

@@ -10,6 +10,7 @@ import { registerChartTool } from './chart/tool.js';
 import { createChartEventPublisher } from './chart/events.js';
 import { chartEventContextOf } from './chart/event-context.js';
 import { SELECTED_SKILL_CATALOG } from './agents/selected-skills-provider.js';
+import { CAPITAL_CONFIG_ENTRY_ID, readCapitalEntry } from './capital-settings.js';
 import { registerChartSourceTool } from './chart/source-token.js';
 import { registerSourceTools, registerWebRetrieverTools } from './web-retriever/tools.js';
 import { LOCAL_FETCH_DEFAULTS, PADDLE_OCR_DEFAULTS, } from './retriever-config.js';
@@ -17,8 +18,7 @@ import { createRetrieverRuntime } from './retriever-runtime.js';
 export { LOCAL_FETCH_DEFAULTS, PADDLE_OCR_DEFAULTS, resolveLocalFetchConfig, } from './retriever-config.js';
 export { resolveUserCustomizationSection } from './user-customization.js';
 export const name = 'capital-generation';
-/** Entry id shared by `cordis.patch.yml`, `config/index.js` and `client.src.cjs`; drift hides the settings card. */
-export const CAPITAL_CONFIG_ENTRY_ID = 'capital-config';
+export { CAPITAL_CONFIG_ENTRY_ID };
 const WindDocsSchema = z.object({
     endpoint: z.string().default('').description('可选：覆盖 Wind 文档检索端点'),
     credentialRef: z.string().default('').description('可选：DSH credentials 引用名，空 = WIND_API_KEY'),
@@ -51,13 +51,16 @@ const RetrieverSchema = z.object({
 // Derive toggles from the catalog: a hand-copied list silently drops defaults at the entry→plugin boundary.
 const SelectedSkillsSchema = z.object(Object.fromEntries(SELECTED_SKILL_CATALOG.map(({ key, name }) => [
     key,
-    z.boolean().default(false).description(`Enable the community experiment "${name}" for the Auto mode root Agent`),
+    z.boolean().default(false).description(`Enable the community method "${name}" for the Capital role(s) that own it`),
 ]))).default(Object.fromEntries(SELECTED_SKILL_CATALOG.map(({ key }) => [key, false])));
 export const Config = z.object({
     customPersona: z.string()
         .default('')
         .description('自动模式的附加人设文本（独立 section，非 deployment:persona）；核心安全约束始终保留'),
-    selectedSkills: SelectedSkillsSchema.description('Community selected-skill experiments; default off and visible only to the Auto mode root Agent'),
+    selectedSkills: SelectedSkillsSchema.description('Community selected methods; default off, each visible only to the Capital role(s) that own it'),
+    selectedSkillsMode: z.union(['manual', 'auto'])
+        .default('manual')
+        .description('精选 Skill 暴露方式：manual = 只用勾选；auto = 按角色开放全部方法，运行期忽略勾选'),
     fuyaoCredentialRef: z.string()
         .default('FUYAO_API_KEY')
         .description('Fuyao credentials 引用名，空 = FUYAO_API_KEY'),
@@ -70,22 +73,10 @@ export const Config = z.object({
 /** Fallback order: settings.describe → configEditor.entries → boot preset, so unreadable never
  * reads as "all toggles off". Resolve services per call: boot fibers apply in parallel. */
 export function readCapitalSettings(ctx, bootConfig) {
-    const settings = ctx.get('settings');
-    try {
-        const resolved = settings?.describe?.().find((entry) => entry.ns === CAPITAL_CONFIG_ENTRY_ID)?.value;
+    const entry = readCapitalEntry(ctx);
+    if (entry.value !== undefined) {
         // Re-parse through this plugin's schema: fills defaults and surfaces schema drift.
-        if (resolved && typeof resolved === 'object')
-            return { config: Config(resolved), source: 'settings-describe' };
-    }
-    catch {
-    }
-    const configEditor = ctx.get('configEditor');
-    try {
-        const raw = configEditor?.entries?.().find((row) => row?.options?.id === CAPITAL_CONFIG_ENTRY_ID)?.options?.config;
-        if (raw && typeof raw === 'object')
-            return { config: Config(raw), source: 'config-editor' };
-    }
-    catch {
+        return { config: Config(entry.value), source: entry.source ?? 'settings-describe' };
     }
     return { config: bootConfig, source: 'preset' };
 }

package/lib/orchestration-entry.d.ts

@@ -0,0 +1,11 @@
+/**
+ * `tools/orchestration` row: the root-only `wait_for_agents` tool.
+ *
+ * Leaves don't mount this row: a child has no delegated tree to wait for and must use send_message
+ * to report upward. The tool also rejects the subagent origin at call time, so a mis-mounted row
+ * cannot turn into a child-side polling loop.
+ */
+import type { Context } from '@deepseek-ai/cordis';
+export declare const name = "capital-orchestration-tools";
+export declare const inject: string[];
+export declare function apply(ctx: Context): void;

package/lib/orchestration-entry.js

@@ -0,0 +1,6 @@
+import { registerWaitForAgentsTool } from './agents/wait-for-agents.js';
+export const name = 'capital-orchestration-tools';
+export const inject = ['tools'];
+export function apply(ctx) {
+    registerWaitForAgentsTool(ctx);
+}

package/lib/present-entry.js

@@ -2,6 +2,7 @@ import { createChartDelivery } from './chart/delivery.js';
 import { createChartEventPublisher } from './chart/events.js';
 import { chartEventContextOf } from './chart/event-context.js';
 import { registerPresentChartsTool } from './chart/present-tool.js';
+import { createSettledWakeGuard } from './agents/settled-wake.js';
 import { capitalSharedRuntimeOf } from './chart-source-entry.js';
 export const name = 'capital-present-tools';
 export const inject = ['tools'];
@@ -59,10 +60,12 @@ export function apply(ctx) {
     const shared = capitalSharedRuntimeOf(ctx);
     const publisherOf = () => createChartEventPublisher(chartEventContextOf(ctx));
     const eventCtx = ctx;
+    const wakeGuard = createSettledWakeGuard();
     const delivery = createChartDelivery({
         artifacts: shared.artifacts,
         publish: (sessionId, inputs) => publisherOf()?.publishMany(sessionId, inputs) ?? false,
         inboxOf: inboxOf(ctx),
+        onClosing: (_session, agent) => wakeGuard.acceptClosing(agent),
     });
     // The preset row is applied in the root agent's scope: these events are the root's own.
     const disposers = [];
@@ -71,10 +74,22 @@ export function apply(ctx) {
             const payload = args[0];
             if (payload?.frame === undefined)
                 return;
-            delivery.acceptStream(payload.agent?.session, payload.frame);
+            delivery.acceptStream(payload.agent?.session, payload.frame, payload.agent);
+        }));
+        disposers.push(eventCtx.on('subagent/start', (...args) => {
+            const info = args[0];
+            delivery.acceptSubagentStart(info ?? {});
+            wakeGuard.acceptSubagentStart(info ?? {});
         }));
-        disposers.push(eventCtx.on('subagent/start', (...args) => delivery.acceptSubagentStart(args[0])));
         disposers.push(eventCtx.on('subagent/end', (...args) => delivery.acceptSubagentEnd(args[0])));
+        // Scoped to the root agent: only the root inbox is inspected. A settled notice inserted after
+        // the closing frame would otherwise make the loop open a step for a redundant "done" message.
+        disposers.push(eventCtx.on('agent/inbox/inserted', (...args) => {
+            const payload = args[0];
+            if (payload?.agent === undefined || payload.message === undefined)
+                return;
+            wakeGuard.acceptInboxInserted(payload.agent, payload.message);
+        }));
     }
     // Session events are not agent-scoped: listen on the unscoped root and filter by payload.
     const listen = (eventCtx.root ?? ctx);
@@ -92,11 +107,17 @@ export function apply(ctx) {
                     delivery.acceptSubagentEnd({ id: source.senderSessionId });
                 return;
             }
-            if (source?.kind !== 'user')
+            if (typeof session?.id !== 'string' || source === undefined)
                 return;
-            if (typeof session?.id !== 'string')
+            if (source.kind === 'user') {
+                delivery.acceptUserMessage(session.id, typeof event.time === 'number' ? event.time : Date.now());
+                wakeGuard.acceptUserMessage(session, source);
                 return;
-            delivery.acceptUserMessage(session.id, typeof event.time === 'number' ? event.time : Date.now());
+            }
+            // `user/message` is committed only when admitted, so this is exactly the "child already
+            // reported its result" marker the closing guard needs.
+            if (source.kind === 'agent-message')
+                wakeGuard.acceptUserMessage(session, source);
         }));
     }
     ctx.effect(() => () => {

package/lib/root-extras-entry.d.ts

@@ -1,15 +1,12 @@
 /**
- * `tools/root-extras` row: root-only selected-skills provider and the `customPersona`
- * system-prompt section. This row registers no tools; both pieces re-read settings
- * every turn so saved changes apply on the next step.
+ * `tools/root-extras` row: the `customPersona` system-prompt section. Root-only; this row
+ * registers no tools. Selected skills moved to the role-scoped `tools/selected-skills` row.
  */
 import type { Context } from '@deepseek-ai/cordis';
-import { type SelectedSkillSelection } from './agents/selected-skills-provider.js';
 export declare const name = "capital-root-extras";
 export declare const inject: string[];
 interface RootExtrasConfig {
     customPersona?: string;
-    selectedSkills?: SelectedSkillSelection;
 }
 /** Re-read per turn so a settings save applies to the same session on the next step. */
 export declare function readRootExtrasConfig(ctx: Context): RootExtrasConfig;

package/lib/root-extras-entry.js

@@ -1,4 +1,3 @@
-import { registerRootSelectedSkills } from './agents/selected-skills-provider.js';
 import { userCustomizationSection } from './user-customization.js';
 import { readCapitalConfig } from './capital-settings.js';
 export const name = 'capital-root-extras';
@@ -6,10 +5,9 @@ export const inject = ['systemPrompt'];
 /** Re-read per turn so a settings save applies to the same session on the next step. */
 export function readRootExtrasConfig(ctx) {
     const config = readCapitalConfig(ctx);
-    return { customPersona: config.customPersona, selectedSkills: config.selectedSkills };
+    return { customPersona: config.customPersona };
 }
 export function apply(ctx) {
-    registerRootSelectedSkills(ctx, () => readRootExtrasConfig(ctx).selectedSkills ?? {});
     let lastPersonaError;
     const section = userCustomizationSection(() => readRootExtrasConfig(ctx).customPersona, (error) => {
         const message = error instanceof Error ? error.message : String(error);

package/lib/selected-skills-entry.d.ts

@@ -0,0 +1,14 @@
+/**
+ * `tools/selected-skills` row: role-scoped selected-skill catalog plus its role prompt section.
+ * The row is mounted once per Capital preset (`config.role`) and registers into that Agent's
+ * own scope only; it never writes to the preset standing scope or the host scope.
+ */
+import type { Context } from '@deepseek-ai/cordis';
+import { type SelectedSkillRole } from './agents/selected-skills-provider.js';
+export declare const name = "capital-selected-skills";
+export declare const inject: string[];
+interface Config {
+    role?: SelectedSkillRole;
+}
+export declare function apply(ctx: Context, config?: Config): void;
+export {};

package/lib/selected-skills-entry.js

@@ -0,0 +1,43 @@
+import { registerSelectedSkills, renderSelectedSkillsBrief, SELECTED_SKILL_ENTRY_ROLES, } from './agents/selected-skills-provider.js';
+import { readCapitalConfig } from './capital-settings.js';
+export const name = 'capital-selected-skills';
+export const inject = ['systemPrompt'];
+const SECTION_NAME = 'capital:selected-skills';
+/** After the persona, before the user-customization section (order 100). */
+const SECTION_ORDER = 60;
+const accessOf = (ctx) => ({
+    selection: () => readCapitalConfig(ctx).selectedSkills ?? {},
+    mode: () => (readCapitalConfig(ctx).selectedSkillsMode === 'auto' ? 'auto' : 'manual'),
+});
+export function apply(ctx, config = {}) {
+    const role = config.role ?? 'main';
+    if (!SELECTED_SKILL_ENTRY_ROLES.includes(role)) {
+        throw new Error(`capital-selected-skills: unknown role "${String(role)}"`);
+    }
+    registerSelectedSkills(ctx, role, accessOf(ctx));
+    let lastRenderError;
+    ctx.effect(() => {
+        const dispose = ctx.systemPrompt.section({
+            name: SECTION_NAME,
+            order: SECTION_ORDER,
+            // Upstream-derived prose can contain `{{...}}`; this section is literal.
+            interpolate: false,
+            text: (context) => {
+                try {
+                    // dsh-agent passes its Agent as the assembly scope; the usage ledger is keyed by session.
+                    const agent = context?.agent;
+                    return renderSelectedSkillsBrief(role, accessOf(ctx), agent);
+                }
+                catch (error) {
+                    const message = error instanceof Error ? error.message : String(error);
+                    if (message !== lastRenderError) {
+                        lastRenderError = message;
+                        ctx.logger?.warn?.(`capital-generation: selected skill prompt unreadable (${message})`);
+                    }
+                    return '';
+                }
+            },
+        });
+        return typeof dispose === 'function' ? dispose : () => { };
+    }, 'capital-generation.selected-skills()');
+}

package/lib/web-retriever/local-fetch.d.ts

@@ -3,7 +3,7 @@
  * Known limit: DNS resolves per request but the IP is not pinned to the connection,
  * so a rebinding window remains (same trade-off as dsh-search-first).
  */
-export declare const LOCAL_FETCH_CLIENT_VERSION = "2.9.2";
+export declare const LOCAL_FETCH_CLIENT_VERSION = "2.10.1";
 export declare const LOCAL_FETCH_MAX_URL_LENGTH = 2048;
 export type LocalFetchErrorCode = 'ABORTED' | 'TIMEOUT' | 'INVALID_URL' | 'BLOCKED_URL' | 'DNS' | 'REDIRECT' | 'HTTP' | 'TOO_LARGE' | 'UNSUPPORTED_CONTENT_TYPE';
 export declare class LocalFetchError extends Error {

package/lib/web-retriever/local-fetch.js

@@ -4,7 +4,7 @@
  * so a rebinding window remains (same trade-off as dsh-search-first).
  */
 import { htmlToMarkdown, stripInvisibleText } from './html-markdown.js';
-export const LOCAL_FETCH_CLIENT_VERSION = '2.9.2';
+export const LOCAL_FETCH_CLIENT_VERSION = '2.10.1';
 export const LOCAL_FETCH_MAX_URL_LENGTH = 2048;
 export class LocalFetchError extends Error {
     code;

package/lib/web-retriever/wind-client.d.ts

@@ -35,7 +35,7 @@ export interface WindCallResult {
     code?: WindErrorCode;
 }
 /** Must match `package.json` version; a test pins the two together. */
-export declare const WIND_CLIENT_VERSION = "2.9.2";
+export declare const WIND_CLIENT_VERSION = "2.10.1";
 export interface WindClient {
     callTool(toolName: string, args: Record<string, unknown>, signal?: AbortSignal): Promise<WindCallResult>;
 }

package/lib/web-retriever/wind-client.js

@@ -19,7 +19,7 @@ export const WIND_SERVER_ENDPOINTS = {
     analytics_data: 'https://mcp.wind.com.cn/vserver_analytics_data/mcp/',
 };
 /** Must match `package.json` version; a test pins the two together. */
-export const WIND_CLIENT_VERSION = '2.9.2';
+export const WIND_CLIENT_VERSION = '2.10.1';
 function errorText(error) {
     return error instanceof Error ? error.message : String(error);
 }