@migor/agentia 0.2.0 → 0.2.2

package/dist/toolkit/module.js

@@ -1,5 +1,5 @@
-import { SystemPrompt } from '../run/systemPrompt.js';
-import { executeRun } from '../run/run.js';
+import { SystemPrompt } from '../runtime/systemPrompt.js';
+import { executeRun } from '../runtime/run.js';
 import { Container } from '../container/container.js';
 import { discoverProviders } from './discover.js';
 import { collectTools } from './tool.js';
@@ -11,12 +11,28 @@ import { applyMiddleware } from './middleware.js';
 export function defineModule(m) {
     return m;
 }
+const defaultSinks = [];
+/** 注册全局默认 trace sink（观测 / dev 工具用）。createApp 构造期快照合并，已建应用不受后续注册影响。 */
+export function registerDefaultTraceSink(sink) {
+    defaultSinks.push(sink);
+}
+/**
+ * Agentia —— 应用装配（spec §4/§6：主 agent + 可调工具菜单）。
+ *
+ * createApp 组装：DI 容器注册 providers（手动和/或 discover 目录发现）→
+ * 从容器实例自动扫描 @Tool / @SubAgent / @Skill / @Prompt 收集成本 app 的工具菜单
+ * → agent.run(messages) 带着菜单走 executeRun。装配期统一静态校验（§7）：
+ * 菜单查重、tools 引用存在性、toolSources 指向。
+ * 主 agent 的 system 可由 SystemPrompt 实例给出（内部 build({cache:true})
+ * 打稳定前缀 breakpoint），也接受已拼好的 SystemParam 原样透传。
+ */
 export class AgentApp {
     name;
     di;
     system;
     base;
-    _tools;
+    _tools = [];
+    sinks;
     constructor(opts) {
         this.name = opts.name ?? 'app';
         const modules = opts.modules ?? [];
@@ -31,87 +47,127 @@ export class AgentApp {
         ];
         this.di = new Container().register(...providerList);
         this.system = opts.system;
+        // trace 出口：应用级 sinks 在前，全局默认 sink 在后（构造期快照，注册表后续变化不影响本应用）
+        this.sinks = [...(opts.sinks ?? []), ...defaultSinks];
         this.base = {
             model: opts.model,
             maxTokens: opts.maxTokens,
             maxIterations: opts.maxIterations,
             contextPolicy: opts.contextPolicy,
+            retry: opts.retry,
+            maxTotalTokens: opts.maxTotalTokens,
+            maxCostUsd: opts.maxCostUsd,
+            priceOverrides: opts.priceOverrides,
+            onUnpricedModel: opts.onUnpricedModel,
+            toolTimeoutMs: opts.toolTimeoutMs,
+            maxToolConcurrency: opts.maxToolConcurrency,
         };
         // 先为每个 provider 解析实例并预收集它的 @Tool / @SubAgent / @Skill / @Prompt；
         // 子 agent / skill 的 tools token 在装配期即解析到该 provider 的 @Tool 菜单（静态校验）。
         const plainByToken = new Map();
-        const unitsByToken = new Map();
+        const capabilitiesByToken = new Map();
         const skillsByToken = new Map();
         const promptsByToken = new Map();
         for (const p of providerList) {
             const inst = this.di.resolve(p.provide);
             plainByToken.set(p.provide, collectTools(inst));
-            unitsByToken.set(p.provide, collectSubAgents(inst));
+            capabilitiesByToken.set(p.provide, collectSubAgents(inst));
             skillsByToken.set(p.provide, collectSkills(inst));
             promptsByToken.set(p.provide, collectPrompts(inst));
         }
+        // 能力调用中间件：装配期包裹整个菜单（洋葱模型，对 engine 零侵入）；
+        // 模块级中间件在前（更外层），应用级在后。
+        const middleware = [...modules.flatMap((m) => m.middleware ?? []), ...(opts.middleware ?? [])];
+        const wrap = (tools) => middleware.length ? applyMiddleware(tools, middleware) : tools;
+        /**
+         * 中间件包装**之后**的每 provider 菜单。
+         *
+         * 嵌套能力（子 agent / skill）解析自身 tools 引用时必须从这里取 —— 若取
+         * 「中间件包装之前的原始菜单」，子 agent 内部调用的每一个工具都会绕过中间件
+         * （鉴权 / 限流 / 审计 / 结果缓存全部失效），是 spec §10 记录在案的既知问题。
+         * 该 map 在 resolveRefTools 的 thunk 被真正调用（运行时）前已填充完毕。
+         */
+        const wrappedByToken = new Map();
         // 装配期立即解析 tools 引用（§7 启动期静态校验）：引用未注册 provider 在
-        // createApp 即抛错，不延迟到模型调用该单元的运行时。
+        // createApp 即抛错，不延迟到模型调用该能力的运行时。实际取值延迟到运行时
+        // （惰性 thunk）—— 那时 wrappedByToken 已就绪。
         const resolveRefTools = (owner, refs) => {
-            const resolved = (refs ?? []).flatMap((t) => {
-                const inner = plainByToken.get(t);
-                if (!inner) {
+            for (const t of refs ?? []) {
+                if (!plainByToken.has(t)) {
                     throw new Error(`${owner} tools 引用未注册 provider: "${t}"`);
                 }
-                return inner;
-            });
-            return () => resolved;
-        };
-        const sources = opts.toolSources ?? providerList.map((p) => p.provide);
-        this._tools = sources.flatMap((token) => {
-            if (!this.di.has(token)) {
-                throw new Error(`toolSources 指向未注册 provider: "${token}"`);
             }
+            return () => (refs ?? []).flatMap((t) => wrappedByToken.get(t) ?? []);
+        };
+        const buildSlice = (token) => {
             const plain = plainByToken.get(token) ?? [];
-            const subTools = (unitsByToken.get(token) ?? []).map((unit) => subagentToTool(unit, resolveRefTools(`@SubAgent "${unit.name}"`, unit.spec.tools)));
-            const skillTools = (skillsByToken.get(token) ?? []).map((unit) => skillToTool(unit, resolveRefTools(`@Skill "${unit.name}"`, unit.spec.tools)));
+            const subTools = (capabilitiesByToken.get(token) ?? []).map((capability) => subagentToTool(capability, resolveRefTools(`@SubAgent "${capability.name}"`, capability.spec.tools)));
+            const skillTools = (skillsByToken.get(token) ?? []).map((capability) => skillToTool(capability, resolveRefTools(`@Skill "${capability.name}"`, capability.spec.tools)));
             const promptTools = promptsByToken.get(token) ?? [];
             return [...plain, ...subTools, ...skillTools, ...promptTools];
-        });
+        };
+        // 全部 provider 都切片并包装：主菜单只取 sources，但被 toolSources 排除的
+        // provider 上的能力仍可被其他能力的 tools 引用（引用是作者显式声明，不受收窄影响）——
+        // 因此包装必须覆盖全部 provider，否则 ref 解析会拿到未包装（可绕过中间件）的工具。
+        for (const p of providerList) {
+            wrappedByToken.set(p.provide, wrap(buildSlice(p.provide)));
+        }
+        // toolSources 是「取哪些 provider 的能力」的白名单，同一 token 写重只该取一次：
+        // 不去重则会 flatMap 收两遍该 provider 的能力，最后撞上「菜单能力重名」——
+        // 报错指向能力定义（错误来源），而真正的问题是这份清单里重复写了 token。
+        const sources = opts.toolSources
+            ? [...new Set(opts.toolSources)]
+            : providerList.map((p) => p.provide);
+        this._tools = [
+            ...sources.flatMap((token) => {
+                if (!this.di.has(token)) {
+                    throw new Error(`toolSources 指向未注册 provider: "${token}"`);
+                }
+                return wrappedByToken.get(token) ?? [];
+            }),
+            // 裸工具（AppOptions.tools）：与装饰器收集来的能力同等 —— 一样过中间件、
+            // 一样进下面的重名查重。**不是旁路**（旁路会绕过鉴权/限流/审计）。
+            ...wrap(opts.tools ?? []),
+        ];
         // §7 静态校验（最小落地）：菜单统一查重 —— 重名会让模型在歧义菜单里猜，直接报错。
         const dup = new Map();
         for (const t of this._tools)
             dup.set(t.name, (dup.get(t.name) ?? 0) + 1);
         const dupNames = [...dup.entries()].filter(([, n]) => n > 1).map(([n]) => n);
         if (dupNames.length > 0) {
-            throw new Error(`菜单单元重名（tool/skill/subagent/prompt 共用命名空间）: ${dupNames.join(', ')}`);
+            throw new Error(`菜单能力重名（tool/skill/subagent/prompt 共用命名空间）: ${dupNames.join(', ')}`);
         }
-        // 孤儿单元告警：toolSources 显式收窄时，被排除 provider 上的单元不可达
+        // 孤儿能力告警：toolSources 显式收窄时，被排除 provider 上的能力不在主菜单
+        // （模型无法直接调用）；但**仍可被其他能力的 tools 引用**（引用是作者显式声明），
+        // 所以只是「不在主菜单」而非「不可达」。
         if (opts.toolSources) {
             const included = new Set(opts.toolSources);
             for (const p of providerList) {
                 if (included.has(p.provide))
                     continue;
                 const orphanCount = (plainByToken.get(p.provide)?.length ?? 0) +
-                    (unitsByToken.get(p.provide)?.length ?? 0) +
+                    (capabilitiesByToken.get(p.provide)?.length ?? 0) +
                     (skillsByToken.get(p.provide)?.length ?? 0) +
                     (promptsByToken.get(p.provide)?.length ?? 0);
                 if (orphanCount > 0) {
-                    console.warn(`[agentia] 孤儿单元告警：provider "${p.provide}" 上的 ${orphanCount} 个单元不在 toolSources 内，不可达`);
+                    console.warn(`[agentia] 孤儿能力告警：provider "${p.provide}" 上的 ${orphanCount} 个能力不在 toolSources 内，` +
+                        `不进主菜单（模型无法直接调用）；若被其他能力的 tools 引用仍可被调用`);
                 }
             }
         }
-        // 单元调用中间件：装配期包裹整个菜单（洋葱模型，对 engine 零侵入）；
-        // 模块级中间件在前（更外层），应用级在后。
-        const middleware = [...modules.flatMap((m) => m.middleware ?? []), ...(opts.middleware ?? [])];
-        if (middleware.length) {
-            this._tools = applyMiddleware(this._tools, middleware);
-        }
     }
     /** app 已装配好的工具菜单（构建期即从容器解析，静态稳定） */
     get tools() {
-        return this._tools ?? [];
+        return this._tools;
     }
-    /** 容器访问点（后续 trace 拦截器/生命周期回调可用） */
+    /** 容器访问点 */
     get container() {
         return this.di;
     }
-    /** 执行一次主 agent run。system 每 run 从 SystemPrompt 重建，保证 volatile 新鲜。 */
+    /**
+     * 执行一次主 agent run。system 每 run 从 SystemPrompt 重建，保证 volatile 新鲜。
+     * 传 `resultSchema: fromZod<T>(...)` 时返回值 `result.typed` 为 `T | undefined`。
+     */
     run(messages, opts = {}) {
         const sys = opts.system ?? this.system;
         const system = sys instanceof SystemPrompt ? sys.build({ cache: true }) : sys;
@@ -128,11 +184,27 @@ export class AgentApp {
             runName: this.name,
             idempotencyKey: opts.idempotencyKey,
             contextPolicy: opts.contextPolicy ?? this.base.contextPolicy,
+            retry: opts.retry ?? this.base.retry,
+            maxTotalTokens: opts.maxTotalTokens ?? this.base.maxTotalTokens,
+            maxCostUsd: opts.maxCostUsd ?? this.base.maxCostUsd,
+            priceOverrides: opts.priceOverrides ?? this.base.priceOverrides,
+            onUnpricedModel: opts.onUnpricedModel ?? this.base.onUnpricedModel,
+            toolTimeoutMs: opts.toolTimeoutMs ?? this.base.toolTimeoutMs,
+            maxToolConcurrency: opts.maxToolConcurrency ?? this.base.maxToolConcurrency,
+            resultSchema: opts.resultSchema,
+            // 提示词版本化（D4）：system 是 SystemPrompt 实例时自动带上它的 version
+            // （run 根 attribute `system.version`）；传已拼好的 SystemParam 则无版本可记。
+            systemVersion: sys instanceof SystemPrompt ? sys.version : undefined,
+            session: opts.session,
             rethrow: opts.rethrow,
+            sinks: this.sinks,
             contextInit: (ctx) => {
                 if (seed) {
-                    for (const key of Object.keys(seed))
-                        ctx.set(key, seed[key]);
+                    // 种子键是运行期字符串，类型上无从与「用户声明的 Blackboard」对齐 ——
+                    // 走文档里给用户的同一条逃生口：断言为 BlackboardKey。
+                    const entries = seed;
+                    for (const key of Object.keys(entries))
+                        ctx.set(key, entries[key]);
                 }
             },
         });
@@ -140,7 +212,11 @@ export class AgentApp {
 }
 export function createApp(opts) {
     if (opts.discover) {
-        return discoverProviders(opts.discover).then((found) => new AgentApp({ ...opts, providers: [...(opts.providers ?? []), ...found] }));
+        return discoverProviders(opts.discover).then(
+        // 显式 providers 放在发现结果**之后**：AppOptions.providers 是应用级显式声明，
+        // 同 token 时应覆盖「目录里扫出来的」（后注册覆盖先注册）。反过来会让
+        // capabilities/ 下一个同名文件夹悄悄顶掉调用方手写的 provider。
+        (found) => new AgentApp({ ...opts, providers: [...found, ...(opts.providers ?? [])] }));
     }
     return new AgentApp(opts);
 }

package/dist/toolkit/module.js.map

@@ -1 +1 @@
-{"version":3,"file":"module.js","sourceRoot":"","sources":["../../src/toolkit/module.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"module.js","sourceRoot":"","sources":["../../src/toolkit/module.ts"],"names":[],"mappings":"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"}

package/dist/toolkit/prompt.d.ts

@@ -1,10 +1,11 @@
+import type { CapabilityDecoratorContext } from './collect.js';
 import type { AgentTool, JsonSchema } from '../core/tool.js';
 /**
- * Agentia —— Prompt 单元（spec §3：纯文本资产 —— 模板/宏/playbook，被选中时注入上下文）。
+ * Agentia —— Prompt 能力（spec §3：纯文本资产 —— 模板/宏/playbook，被选中时注入上下文）。
  *
  * 运行时本质：把 prompt 编译成主 agent 菜单里一个**无副作用拉取型 AgentTool** ——
  * 模型判定“这活儿需要该资产”时调用它，返回文本以 tool_result 进上下文。这是
- * 我们现成唯一的“被选中”机制（unit 本身不跑循环、不调模型）。
+ * 我们现成唯一的“被选中”机制（capability 本身不跑循环、不调模型）。
  *
  * 声明形态（标准装饰器下字段装饰器拿不到值/类引用，故只支持方法形态，与
  * spec §4 草图的 `static brand = '…'` 用 `static method` 同效表达）：
@@ -21,10 +22,7 @@ export interface PromptSpec {
     schema?: JsonSchema;
 }
 /** 方法装饰器（实例或 static 均可）：登记 prompt spec。返回值 = 资产文本。 */
-export declare function Prompt(spec: PromptSpec): (value: Function, context: {
-    kind: string;
-    name: string | symbol;
-}) => void;
+export declare function Prompt(spec: PromptSpec): (value: Function, context: CapabilityDecoratorContext) => void;
 /**
  * 收集容器实例（+ 其类上的静态方法）里所有 @Prompt，产出 AgentTool[]。
  * 实例方法沿原型链（含继承）；静态方法扫描 instance.constructor 自身属性。

package/dist/toolkit/prompt.js

@@ -1,4 +1,4 @@
-import { scanDecoratedMethods, unitName } from './collect.js';
+import { assertMethodTarget, scanDecoratedMethods, capabilityName } from './collect.js';
 const promptSpecs = new WeakMap();
 const EMPTY_SCHEMA = {
     type: 'object',
@@ -7,10 +7,8 @@ const EMPTY_SCHEMA = {
 };
 /** 方法装饰器（实例或 static 均可）：登记 prompt spec。返回值 = 资产文本。 */
 export function Prompt(spec) {
-    return function (value, context) {
-        if (context.kind !== 'method') {
-            throw new Error(`@Prompt 只能修饰方法（static 方法亦可），收到 kind=${String(context.kind)}`);
-        }
+    return (value, context) => {
+        assertMethodTarget(context, '@Prompt');
         promptSpecs.set(value, spec);
     };
 }
@@ -20,18 +18,21 @@ export function Prompt(spec) {
  */
 export function collectPrompts(instance) {
     const tools = [];
-    const pushTool = (name, fn, thisArg, spec) => {
+    // 传 key 而非捕获的 fn：子类「未装饰地 override」时 spec 继承自父类，
+    // 但实现必须取**实例/类上**的（否则会绕开子类实现，与 @Tool 语义不一致）。
+    const pushTool = (name, target, key, spec) => {
         tools.push({
             name: spec.name ?? name,
             description: spec.description,
             inputSchema: spec.schema ?? EMPTY_SCHEMA,
-            run: (input) => Reflect.apply(fn, thisArg, [input]),
+            run: (input) => Reflect.apply(target[key], target, [input]),
         });
     };
     // 实例方法（沿原型链）
     const found = scanDecoratedMethods(instance, promptSpecs);
-    for (const { key, fn, spec } of found) {
-        pushTool(unitName(spec, key, '@Prompt'), fn, instance, spec);
+    const inst = instance;
+    for (const { key, spec } of found) {
+        pushTool(capabilityName(spec, key, '@Prompt'), inst, key, spec);
     }
     // 静态方法（类自身属性）；已被实例方法占用的 key 跳过
     const seen = new Set(found.map((f) => f.key));
@@ -48,7 +49,7 @@ export function collectPrompts(instance) {
             if (!spec)
                 continue;
             seen.add(key);
-            pushTool(key, fn, cls, spec);
+            pushTool(key, ctor, key, spec);
         }
     }
     return tools;

package/dist/toolkit/prompt.js.map

@@ -1 +1 @@
-{"version":3,"file":"prompt.js","sourceRoot":"","sources":["../../src/toolkit/prompt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAyB9D,MAAM,WAAW,GAAG,IAAI,OAAO,EAAwB,CAAC;AAExD,MAAM,YAAY,GAAe;IAC/B,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE,EAAE;IACd,oBAAoB,EAAE,KAAK;CAC5B,CAAC;AAEF,sDAAsD;AACtD,MAAM,UAAU,MAAM,CAAC,IAAgB;IACrC,OAAO,UACL,KAAe,EACf,OAAgD;QAEhD,IAAI,OAAO,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC9B,MAAM,IAAI,KAAK,CAAC,uCAAuC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACjF,CAAC;QACD,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IAC/B,CAAC,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,cAAc,CAAC,QAAgB;IAC7C,MAAM,KAAK,GAAgB,EAAE,CAAC;IAC9B,MAAM,QAAQ,GAAG,CAAC,IAAY,EAAE,EAAY,EAAE,OAAgB,EAAE,IAAgB,EAAQ,EAAE;QACxF,KAAK,CAAC,IAAI,CAAC;YACT,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,IAAI;YACvB,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,WAAW,EAAE,IAAI,CAAC,MAAM,IAAI,YAAY;YACxC,GAAG,EAAE,CAAC,KAAc,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,EAAE,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC;SAC7D,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,aAAa;IACb,MAAM,KAAK,GAAG,oBAAoB,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;IAC1D,KAAK,MAAM,EAAE,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,KAAK,EAAE,CAAC;QACtC,QAAQ,CAAC,QAAQ,CAAC,IAAI,EAAE,GAAG,EAAE,SAAS,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;IAC/D,CAAC;IAED,+BAA+B;IAC/B,MAAM,IAAI,GAAG,IAAI,GAAG,CAAkB,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IAC/D,MAAM,GAAG,GAAa,QAAsC,CAAC,WAAW,CAAC;IACzE,IAAI,OAAO,GAAG,KAAK,UAAU,EAAE,CAAC;QAC9B,MAAM,IAAI,GAAG,GAAyC,CAAC;QACvD,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,mBAAmB,CAAC,IAAI,CAAC,EAAE,CAAC;YACnD,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;gBAAE,SAAS;YAC5B,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;YACrB,IAAI,OAAO,EAAE,KAAK,UAAU;gBAAE,SAAS;YACvC,MAAM,IAAI,GAAG,WAAW,CAAC,GAAG,CAAC,EAAc,CAAC,CAAC;YAC7C,IAAI,CAAC,IAAI;gBAAE,SAAS;YACpB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACd,QAAQ,CAAC,GAAG,EAAE,EAAc,EAAE,GAAa,EAAE,IAAI,CAAC,CAAC;QACrD,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC"}
+{"version":3,"file":"prompt.js","sourceRoot":"","sources":["../../src/toolkit/prompt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AA0BxF,MAAM,WAAW,GAAG,IAAI,OAAO,EAAwB,CAAC;AAExD,MAAM,YAAY,GAAe;IAC/B,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE,EAAE;IACd,oBAAoB,EAAE,KAAK;CAC5B,CAAC;AAEF,sDAAsD;AACtD,MAAM,UAAU,MAAM,CAAC,IAAgB;IACrC,OAAO,CAAC,KAAe,EAAE,OAAmC,EAAQ,EAAE;QACpE,kBAAkB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QACvC,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IAC/B,CAAC,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,cAAc,CAAC,QAAgB;IAC7C,MAAM,KAAK,GAAgB,EAAE,CAAC;IAC9B,gDAAgD;IAChD,6CAA6C;IAC7C,MAAM,QAAQ,GAAG,CACf,IAAY,EACZ,MAAwC,EACxC,GAAoB,EACpB,IAAgB,EACV,EAAE;QACR,KAAK,CAAC,IAAI,CAAC;YACT,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,IAAI;YACvB,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,WAAW,EAAE,IAAI,CAAC,MAAM,IAAI,YAAY;YACxC,GAAG,EAAE,CAAC,KAAc,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAa,EAAE,MAAM,EAAE,CAAC,KAAK,CAAC,CAAC;SACjF,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,aAAa;IACb,MAAM,KAAK,GAAG,oBAAoB,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;IAC1D,MAAM,IAAI,GAAG,QAA4C,CAAC;IAC1D,KAAK,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,KAAK,EAAE,CAAC;QAClC,QAAQ,CAAC,cAAc,CAAC,IAAI,EAAE,GAAG,EAAE,SAAS,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;IAClE,CAAC;IAED,+BAA+B;IAC/B,MAAM,IAAI,GAAG,IAAI,GAAG,CAAkB,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IAC/D,MAAM,GAAG,GAAa,QAAsC,CAAC,WAAW,CAAC;IACzE,IAAI,OAAO,GAAG,KAAK,UAAU,EAAE,CAAC;QAC9B,MAAM,IAAI,GAAG,GAAyC,CAAC;QACvD,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,mBAAmB,CAAC,IAAI,CAAC,EAAE,CAAC;YACnD,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;gBAAE,SAAS;YAC5B,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;YACrB,IAAI,OAAO,EAAE,KAAK,UAAU;gBAAE,SAAS;YACvC,MAAM,IAAI,GAAG,WAAW,CAAC,GAAG,CAAC,EAAc,CAAC,CAAC;YAC7C,IAAI,CAAC,IAAI;gBAAE,SAAS;YACpB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACd,QAAQ,CAAC,GAAG,EAAE,IAAwC,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;QACrE,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC"}

package/dist/toolkit/skill.d.ts

@@ -1,18 +1,19 @@
+import type { CapabilityDecoratorContext } from './collect.js';
 import type Anthropic from '@anthropic-ai/sdk';
 import type { AgentTool, JsonSchema } from '../core/tool.js';
 import type { AgentStopReason } from '../engine/types.js';
-import { SystemPrompt } from '../run/systemPrompt.js';
+import { SystemPrompt } from '../runtime/systemPrompt.js';
 /**
- * Agentia —— Skill 单元（spec §3：指令 + 脚本，受限子运行，回产物/结论）。
+ * Agentia —— Skill 能力（spec §3：指令 + 脚本，受限子运行，回产物/结论）。
  *
  * 与 @SubAgent 的可感知区别：
  * - 子 agent = **模型自主循环**：你只给 role/任务/工具，走几步、何时停由模型决定；
  * - Skill     = **代码控制的流程**：方法体是确定性脚本，把“要不要调模型、调几次、
  *   拿结果怎么算”写死在代码里 —— 模型调用只在你显式 `ctx.llm()` 时发生（受限子运行），
- *   每次都在 skill 自己的 `unit` span 下开 llm.turn 记账，中间结果可继续加工，
+ *   每次都在 skill 自己的 `capability` span 下开 llm.turn 记账，中间结果可继续加工，
  *   方法返回值即产物/结论，以 tool_result 交回主 agent。
  *
- * trace：skill = 主 trace 里一个 `unit` span（attribute `skill`），内部 ctx.llm() 的
+ * trace：skill = 主 trace 里一个 `capability` span（attribute `skill`），内部 ctx.llm() 的
  * llm.turn 递归成它的子孙 —— 与 @SubAgent 同款 parentSpanId 传播，不双开 run 根。
  */
 export interface SkillSpec {
@@ -47,10 +48,10 @@ export interface SkillLlmResult {
 export interface SkillContext {
     /** 本次 skill 的缺省模型（spec.model 或 undefined → engine 缺省） */
     readonly model?: string;
-    /** 受限子运行：每次调用在 skill unit span 下开一轮独立 agent 循环（无工具则纯文本）。 */
+    /** 受限子运行：每次调用在 skill capability span 下开一轮独立 agent 循环（无工具则纯文本）。 */
     llm(opts: SkillLlmOptions): Promise<SkillLlmResult>;
 }
-export interface SkillUnit {
+export interface SkillCapability {
     name: string;
     description: string;
     inputSchema: JsonSchema;
@@ -59,16 +60,13 @@ export interface SkillUnit {
     invoke: (input: unknown, skillCtx: SkillContext) => unknown | Promise<unknown>;
 }
 /** 方法装饰器：登记 skill spec。被装饰方法体由运行时以 (input, skillCtx) 调用。 */
-export declare function Skill(spec: SkillSpec): (value: Function, context: {
-    kind: string;
-    name: string | symbol;
-}) => void;
-/** 把容器实例上所有 @Skill 方法收集成 SkillUnit[]（沿原型链）。 */
-export declare function collectSkills(instance: object): SkillUnit[];
+export declare function Skill(spec: SkillSpec): (value: Function, context: CapabilityDecoratorContext) => void;
+/** 把容器实例上所有 @Skill 方法收集成 SkillCapability[]（沿原型链）。 */
+export declare function collectSkills(instance: object): SkillCapability[];
 /**
- * 把 SkillUnit 变成主 agent 菜单里的 AgentTool。
+ * 把 SkillCapability 变成主 agent 菜单里的 AgentTool。
  * run(input, ctx) 需要 ToolRunContext（engine 调用时必有）；手动直调会抛错提示。
- * 开 `unit` span → 构造 SkillContext（llm 闭包挂 unit 下）→ 执行方法体 →
- * 返回值字符串化交回；抛错关 unit error 后重抛（引擎包成 is_error，不中断 run）。
+ * 开 `capability` span → 构造 SkillContext（llm 闭包挂 capability 下）→ 执行方法体 →
+ * 返回值字符串化交回；抛错关 capability error 后重抛（引擎包成 is_error，不中断 run）。
  */
-export declare function skillToTool(unit: SkillUnit, resolveTools: () => AgentTool[]): AgentTool;
+export declare function skillToTool(capability: SkillCapability, resolveTools: () => AgentTool[]): AgentTool;

package/dist/toolkit/skill.js

@@ -1,7 +1,8 @@
-import { scanDecoratedMethods, unitName } from './collect.js';
+import { assertMethodTarget, scanDecoratedMethods, capabilityName } from './collect.js';
+import { isSuccessStopReason } from '../engine/types.js';
 import { runAgentScoped } from '../engine/loop.js';
 import { classifyError } from '../engine/errors.js';
-import { SystemPrompt } from '../run/systemPrompt.js';
+import { SystemPrompt } from '../runtime/systemPrompt.js';
 /** 方法函数 → spec（与 @Tool 同款 WeakMap 注册表，零反射） */
 const skillSpecs = new WeakMap();
 const EMPTY_SCHEMA = {
@@ -11,48 +12,49 @@ const EMPTY_SCHEMA = {
 };
 /** 方法装饰器：登记 skill spec。被装饰方法体由运行时以 (input, skillCtx) 调用。 */
 export function Skill(spec) {
-    return function (value, context) {
-        if (context.kind !== 'method') {
-            throw new Error(`@Skill 只能修饰类方法，收到 kind=${String(context.kind)}`);
-        }
+    return (value, context) => {
+        assertMethodTarget(context, '@Skill');
         skillSpecs.set(value, spec);
     };
 }
-/** 把容器实例上所有 @Skill 方法收集成 SkillUnit[]（沿原型链）。 */
+/** 把容器实例上所有 @Skill 方法收集成 SkillCapability[]（沿原型链）。 */
 export function collectSkills(instance) {
-    return scanDecoratedMethods(instance, skillSpecs).map(({ key, fn, spec }) => ({
-        name: unitName(spec, key, '@Skill'),
+    // 动态查表而非捕获 fn：子类「未装饰地 override」时 spec 继承自父类，
+    // 实现必须取实例上的（与 @Tool 的 run 同款），否则子类 override 被静默绕过。
+    const inst = instance;
+    return scanDecoratedMethods(instance, skillSpecs).map(({ key, spec }) => ({
+        name: capabilityName(spec, key, '@Skill'),
         description: spec.description,
         inputSchema: spec.schema ?? EMPTY_SCHEMA,
         spec,
-        invoke: (input, skillCtx) => Reflect.apply(fn, instance, [input, skillCtx]),
+        invoke: (input, skillCtx) => Reflect.apply(inst[key], instance, [input, skillCtx]),
     }));
 }
 /**
- * 把 SkillUnit 变成主 agent 菜单里的 AgentTool。
+ * 把 SkillCapability 变成主 agent 菜单里的 AgentTool。
  * run(input, ctx) 需要 ToolRunContext（engine 调用时必有）；手动直调会抛错提示。
- * 开 `unit` span → 构造 SkillContext（llm 闭包挂 unit 下）→ 执行方法体 →
- * 返回值字符串化交回；抛错关 unit error 后重抛（引擎包成 is_error，不中断 run）。
+ * 开 `capability` span → 构造 SkillContext（llm 闭包挂 capability 下）→ 执行方法体 →
+ * 返回值字符串化交回；抛错关 capability error 后重抛（引擎包成 is_error，不中断 run）。
  */
-export function skillToTool(unit, resolveTools) {
-    const { name, spec } = unit;
+export function skillToTool(capability, resolveTools) {
+    const { name, spec } = capability;
     return {
         name,
         description: spec.description,
-        inputSchema: unit.inputSchema,
+        inputSchema: capability.inputSchema,
         run: async (input, ctx) => {
             if (!ctx) {
                 throw new Error(`skill "${name}" 只能在主 agent 运行中被调用（engine 会注入 ToolRunContext）`);
             }
             const recorder = ctx.recorder;
-            const unitId = recorder.begin('unit', name, ctx.parentSpanId);
-            recorder.setAttribute(unitId, 'skill', name);
+            const capabilityId = recorder.begin('capability', name, ctx.parentSpanId);
+            recorder.setAttribute(capabilityId, 'skill', name);
             let closed = false;
             const close = (patch) => {
                 if (closed)
                     return;
                 closed = true;
-                recorder.end(unitId, patch);
+                recorder.end(capabilityId, patch);
             };
             const skillCtx = {
                 model: spec.model,
@@ -63,9 +65,7 @@ export function skillToTool(unit, resolveTools) {
                     if (messages.length === 0) {
                         throw new Error(`skill "${name}".llm 需要 prompt 或 messages`);
                     }
-                    const system = opts.system instanceof SystemPrompt
-                        ? opts.system.build({ cache: true })
-                        : opts.system;
+                    const system = opts.system instanceof SystemPrompt ? opts.system.build({ cache: true }) : opts.system;
                     const loop = await runAgentScoped({
                         client: ctx.client,
                         model: opts.model ?? spec.model,
@@ -75,22 +75,29 @@ export function skillToTool(unit, resolveTools) {
                         messages,
                         tools: spec.tools?.length ? resolveTools() : [],
                         recorder,
-                        parentSpanId: unitId,
+                        parentSpanId: capabilityId,
+                        signal: ctx.signal,
+                        // 价格覆盖透传（F1）：子循环用同一模型也要能算成本
+                        priceOverrides: ctx.priceOverrides,
                     });
-                    if (loop.stopReason !== 'end_turn') {
+                    if (!isSuccessStopReason(loop.stopReason)) {
                         const report = `skill "${name}".llm ${loop.stopReason}: ${(loop.finalText || loop.error?.message || '').slice(0, 2000)}`;
                         const error = loop.error ?? {
                             type: 'agent_error',
                             message: report,
                             retryable: true,
                         };
+                        // 先把丰富错误挂到 capability span（loop.error 的 type/retryable 比新造的
+                        // Error 信息量大），再抛出走外层 catch 的通用收尾 —— 外层 close 幂等，
+                        // 不会覆盖这里写的 error（与 subagent.ts 同款）。
+                        close({ status: 'error', error });
                         throw new Error(report);
                     }
                     return { text: loop.finalText, stopReason: loop.stopReason };
                 },
             };
             try {
-                const out = await unit.invoke(input ?? {}, skillCtx);
+                const out = await capability.invoke(input ?? {}, skillCtx);
                 close({ status: 'ok' });
                 return out;
             }

package/dist/toolkit/skill.js.map

@@ -1 +1 @@
-{"version":3,"file":"skill.js","sourceRoot":"","sources":["../../src/toolkit/skill.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"skill.js","sourceRoot":"","sources":["../../src/toolkit/skill.ts"],"names":[],"mappings":"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"}

package/dist/toolkit/subagent.d.ts

@@ -1,8 +1,9 @@
+import type { CapabilityDecoratorContext } from './collect.js';
 import type { AgentTool, JsonSchema } from '../core/tool.js';
 import type { SystemParam } from '../engine/types.js';
-import { SystemPrompt } from '../run/systemPrompt.js';
+import { SystemPrompt } from '../runtime/systemPrompt.js';
 /**
- * Agentia —— 子 agent 单元（spec §3/§5：独立 agent 循环 + 裁剪上下文 + 隔离报告）。
+ * Agentia —— 子 agent 能力（spec §3/§5：独立 agent 循环 + 裁剪上下文 + 隔离报告）。
  *
  * 语义（spec §5）：
  * - 子 agent = **完整独立循环**：自己的 system（role）、自己的工具、自己的 model；
@@ -11,7 +12,7 @@ import { SystemPrompt } from '../run/systemPrompt.js';
  * - **隔离报告**：它的中间往返全部不进主上下文，唯一回流主 agent 的是
  *   stop_reason=end_turn 的最终文本 —— 以 tool_result 交回（非 end_turn 则抛错 → is_error）。
  *
- * trace：子 agent 是主 trace 里的一个 `unit` span（挂在发起它的 llm.turn 下），
+ * trace：子 agent 是主 trace 里的一个 `capability` span（挂在发起它的 llm.turn 下），
  * 其内部 llm.turn 递归成它的子孙 —— 见 engine/loop.ts 的 runAgentScoped。
  */
 export interface SubAgentSpec {
@@ -39,22 +40,19 @@ export interface SubAgentSpec {
      */
     resultSchema?: JsonSchema;
 }
-export interface SubAgentUnit {
+export interface SubAgentCapability {
     name: string;
     description: string;
     inputSchema: JsonSchema;
     spec: SubAgentSpec;
 }
 /** 方法装饰器：登记子 agent spec。被装饰方法体不执行 —— 运行时拉起独立循环。 */
-export declare function SubAgent(spec: SubAgentSpec): (value: Function, context: {
-    kind: string;
-    name: string | symbol;
-}) => void;
-/** 把容器实例上所有 @SubAgent 方法收集成 SubAgentUnit[]（沿原型链）。 */
-export declare function collectSubAgents(instance: object): SubAgentUnit[];
+export declare function SubAgent(spec: SubAgentSpec): (value: Function, context: CapabilityDecoratorContext) => void;
+/** 把容器实例上所有 @SubAgent 方法收集成 SubAgentCapability[]（沿原型链）。 */
+export declare function collectSubAgents(instance: object): SubAgentCapability[];
 /**
- * 把 SubAgentUnit 变成主 agent 菜单里的 AgentTool。
+ * 把 SubAgentCapability 变成主 agent 菜单里的 AgentTool。
  * run(input, ctx) 需要 ToolRunContext（engine 调用时必有）；手动直调会抛错提示。
  * tools token 列表 → resolveTools() 由装配层给出（该 token 的 @Tool 菜单）。
  */
-export declare function subagentToTool(unit: SubAgentUnit, resolveTools: () => AgentTool[]): AgentTool;
+export declare function subagentToTool(capability: SubAgentCapability, resolveTools: () => AgentTool[]): AgentTool;