@migor/agentia 0.9.4 → 0.10.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +1280 -4
- package/README.en.md +61 -3
- package/README.md +66 -4
- package/dist/AGENTS.md +330 -45
- package/dist/container/container.js +21 -0
- package/dist/container/container.js.map +1 -1
- package/dist/core/limits.d.ts +101 -14
- package/dist/core/limits.js +103 -13
- package/dist/core/limits.js.map +1 -1
- package/dist/core/line-framing.d.ts +36 -0
- package/dist/core/line-framing.js +39 -0
- package/dist/core/line-framing.js.map +1 -0
- package/dist/core/message.d.ts +11 -0
- package/dist/core/run.d.ts +68 -4
- package/dist/core/run.js +27 -1
- package/dist/core/run.js.map +1 -1
- package/dist/core/schema.js +59 -8
- package/dist/core/schema.js.map +1 -1
- package/dist/core/timeout.d.ts +43 -1
- package/dist/core/timeout.js +76 -3
- package/dist/core/timeout.js.map +1 -1
- package/dist/core/tool.d.ts +25 -1
- package/dist/core/trace.d.ts +40 -1
- package/dist/core/trace.js +26 -0
- package/dist/core/trace.js.map +1 -1
- package/dist/engine/budget.js +14 -0
- package/dist/engine/budget.js.map +1 -1
- package/dist/engine/defer.d.ts +49 -0
- package/dist/engine/defer.js +72 -0
- package/dist/engine/defer.js.map +1 -0
- package/dist/engine/errors.d.ts +23 -1
- package/dist/engine/errors.js +24 -0
- package/dist/engine/errors.js.map +1 -1
- package/dist/engine/forwarded.d.ts +14 -5
- package/dist/engine/forwarded.js +4 -1
- package/dist/engine/forwarded.js.map +1 -1
- package/dist/engine/loop-result.d.ts +65 -7
- package/dist/engine/loop-result.js +24 -5
- package/dist/engine/loop-result.js.map +1 -1
- package/dist/engine/loop.d.ts +2 -0
- package/dist/engine/loop.js +157 -17
- package/dist/engine/loop.js.map +1 -1
- package/dist/engine/mcp-server-http.d.ts +2 -0
- package/dist/engine/mcp-server-http.js +215 -0
- package/dist/engine/mcp-server-http.js.map +1 -0
- package/dist/engine/mcp-server-stdio.d.ts +15 -0
- package/dist/engine/mcp-server-stdio.js +106 -0
- package/dist/engine/mcp-server-stdio.js.map +1 -0
- package/dist/engine/mcp-server.d.ts +134 -0
- package/dist/engine/mcp-server.js +232 -0
- package/dist/engine/mcp-server.js.map +1 -0
- package/dist/engine/menu-drift.d.ts +34 -0
- package/dist/engine/menu-drift.js +81 -0
- package/dist/engine/menu-drift.js.map +1 -0
- package/dist/engine/policy.d.ts +2 -1
- package/dist/engine/policy.js +7 -1
- package/dist/engine/policy.js.map +1 -1
- package/dist/engine/replay.d.ts +2 -1
- package/dist/engine/replay.js +3 -2
- package/dist/engine/replay.js.map +1 -1
- package/dist/engine/resume-input.d.ts +10 -0
- package/dist/engine/resume-input.js +11 -0
- package/dist/engine/resume-input.js.map +1 -1
- package/dist/engine/run-config.d.ts +26 -2
- package/dist/engine/run-config.js +60 -0
- package/dist/engine/run-config.js.map +1 -1
- package/dist/engine/spec.d.ts +33 -4
- package/dist/engine/spec.js.map +1 -1
- package/dist/engine/tool-context.d.ts +10 -5
- package/dist/engine/tool-context.js +5 -1
- package/dist/engine/tool-context.js.map +1 -1
- package/dist/engine/tracer.d.ts +43 -5
- package/dist/engine/tracer.js +73 -10
- package/dist/engine/tracer.js.map +1 -1
- package/dist/engine/trimming.js +28 -2
- package/dist/engine/trimming.js.map +1 -1
- package/dist/engine/turn.d.ts +60 -3
- package/dist/engine/turn.js +180 -71
- package/dist/engine/turn.js.map +1 -1
- package/dist/engine/types.d.ts +89 -3
- package/dist/engine/types.js +38 -2
- package/dist/engine/types.js.map +1 -1
- package/dist/eval/export.d.ts +48 -0
- package/dist/eval/export.js +146 -0
- package/dist/eval/export.js.map +1 -0
- package/dist/eval/harvest.js +7 -2
- package/dist/eval/harvest.js.map +1 -1
- package/dist/index.d.ts +8 -5
- package/dist/index.js +6 -1
- package/dist/index.js.map +1 -1
- package/dist/integrations/adapter-options.d.ts +22 -0
- package/dist/integrations/adapter-options.js +51 -0
- package/dist/integrations/adapter-options.js.map +1 -1
- package/dist/integrations/anthropic.d.ts +4 -2
- package/dist/integrations/anthropic.js +27 -27
- package/dist/integrations/anthropic.js.map +1 -1
- package/dist/integrations/file-sink.d.ts +20 -0
- package/dist/integrations/file-sink.js +27 -0
- package/dist/integrations/file-sink.js.map +1 -0
- package/dist/integrations/mcp-http.d.ts +3 -3
- package/dist/integrations/mcp-http.js +1 -1
- package/dist/integrations/mcp-http.js.map +1 -1
- package/dist/integrations/mcp-protocol.d.ts +115 -0
- package/dist/integrations/mcp-protocol.js +69 -0
- package/dist/integrations/mcp-protocol.js.map +1 -0
- package/dist/integrations/mcp-stdio.d.ts +3 -3
- package/dist/integrations/mcp-stdio.js +17 -3
- package/dist/integrations/mcp-stdio.js.map +1 -1
- package/dist/integrations/mcp.d.ts +6 -95
- package/dist/integrations/mcp.js +24 -66
- package/dist/integrations/mcp.js.map +1 -1
- package/dist/integrations/metrics-otlp.js +52 -7
- package/dist/integrations/metrics-otlp.js.map +1 -1
- package/dist/integrations/metrics-render.d.ts +15 -0
- package/dist/integrations/metrics-render.js +79 -2
- package/dist/integrations/metrics-render.js.map +1 -1
- package/dist/integrations/metrics-state.d.ts +99 -1
- package/dist/integrations/metrics-state.js +128 -4
- package/dist/integrations/metrics-state.js.map +1 -1
- package/dist/integrations/metrics.d.ts +62 -6
- package/dist/integrations/metrics.js +49 -8
- package/dist/integrations/metrics.js.map +1 -1
- package/dist/integrations/openai.js +9 -31
- package/dist/integrations/openai.js.map +1 -1
- package/dist/integrations/otlp.d.ts +3 -3
- package/dist/integrations/report.d.ts +7 -0
- package/dist/integrations/report.js +20 -1
- package/dist/integrations/report.js.map +1 -1
- package/dist/runtime/memory.d.ts +61 -1
- package/dist/runtime/memory.js +47 -7
- package/dist/runtime/memory.js.map +1 -1
- package/dist/runtime/run.d.ts +12 -2
- package/dist/runtime/run.js +126 -17
- package/dist/runtime/run.js.map +1 -1
- package/dist/store/fsStore.js +10 -4
- package/dist/store/fsStore.js.map +1 -1
- package/dist/store/record.d.ts +41 -0
- package/dist/store/record.js +54 -0
- package/dist/store/record.js.map +1 -0
- package/dist/store/redisStore.d.ts +24 -1
- package/dist/store/redisStore.js +42 -7
- package/dist/store/redisStore.js.map +1 -1
- package/dist/store/sqliteStore.d.ts +23 -0
- package/dist/store/sqliteStore.js +103 -8
- package/dist/store/sqliteStore.js.map +1 -1
- package/dist/store/store.d.ts +65 -2
- package/dist/store/store.js +5 -2
- package/dist/store/store.js.map +1 -1
- package/dist/toolkit/capability-cycles.d.ts +50 -0
- package/dist/toolkit/capability-cycles.js +88 -0
- package/dist/toolkit/capability-cycles.js.map +1 -0
- package/dist/toolkit/capability-slice.d.ts +86 -0
- package/dist/toolkit/capability-slice.js +98 -0
- package/dist/toolkit/capability-slice.js.map +1 -0
- package/dist/toolkit/module.d.ts +7 -1
- package/dist/toolkit/module.js +65 -32
- package/dist/toolkit/module.js.map +1 -1
- package/dist/transport/approval-policy.d.ts +1 -1
- package/dist/transport/approval-policy.js +8 -4
- package/dist/transport/approval-policy.js.map +1 -1
- package/dist/transport/approval-supervisor.d.ts +73 -0
- package/dist/transport/approval-supervisor.js +252 -0
- package/dist/transport/approval-supervisor.js.map +1 -0
- package/dist/transport/async.d.ts +159 -56
- package/dist/transport/async.js +627 -269
- package/dist/transport/async.js.map +1 -1
- package/dist/transport/drain-gate.d.ts +6 -2
- package/dist/transport/drain-gate.js +14 -2
- package/dist/transport/drain-gate.js.map +1 -1
- package/dist/transport/http-endpoints.d.ts +151 -0
- package/dist/transport/http-endpoints.js +480 -0
- package/dist/transport/http-endpoints.js.map +1 -0
- package/dist/transport/http-io.d.ts +66 -0
- package/dist/transport/http-io.js +145 -0
- package/dist/transport/http-io.js.map +1 -0
- package/dist/transport/http-route.d.ts +10 -3
- package/dist/transport/http-route.js +18 -3
- package/dist/transport/http-route.js.map +1 -1
- package/dist/transport/http-shapes.d.ts +11 -0
- package/dist/transport/http-shapes.js +31 -1
- package/dist/transport/http-shapes.js.map +1 -1
- package/dist/transport/http.d.ts +22 -35
- package/dist/transport/http.js +98 -476
- package/dist/transport/http.js.map +1 -1
- package/dist/transport/owner-id.d.ts +29 -0
- package/dist/transport/owner-id.js +46 -0
- package/dist/transport/owner-id.js.map +1 -0
- package/dist/transport/owner-liveness.d.ts +8 -0
- package/dist/transport/owner-liveness.js +56 -0
- package/dist/transport/owner-liveness.js.map +1 -0
- package/dist/transport/resume-policy.d.ts +48 -10
- package/dist/transport/resume-policy.js +25 -10
- package/dist/transport/resume-policy.js.map +1 -1
- package/dist/transport/resume-scanner.d.ts +55 -0
- package/dist/transport/resume-scanner.js +219 -0
- package/dist/transport/resume-scanner.js.map +1 -0
- package/dist/transport/scheduler.js +9 -23
- package/dist/transport/scheduler.js.map +1 -1
- package/dist/transport/signal-supervisor.d.ts +80 -0
- package/dist/transport/signal-supervisor.js +129 -0
- package/dist/transport/signal-supervisor.js.map +1 -0
- package/dist/transport/slot-pool.d.ts +9 -1
- package/dist/transport/slot-pool.js +9 -1
- package/dist/transport/slot-pool.js.map +1 -1
- package/dist/transport/task-events.d.ts +34 -3
- package/dist/transport/task-events.js +93 -5
- package/dist/transport/task-events.js.map +1 -1
- package/dist/transport/wake-policy.d.ts +50 -0
- package/dist/transport/wake-policy.js +43 -0
- package/dist/transport/wake-policy.js.map +1 -0
- package/package.json +14 -4
|
@@ -0,0 +1,98 @@
|
|
|
1
|
+
import { collectTools } from './tool.js';
|
|
2
|
+
import { collectSubAgents, subagentToTool } from './subagent.js';
|
|
3
|
+
import { collectSkills, skillToTool } from './skill.js';
|
|
4
|
+
import { collectPromptEntries } from './prompt.js';
|
|
5
|
+
/**
|
|
6
|
+
* 注册表 —— **加一类能力就在这里加一行**。
|
|
7
|
+
*
|
|
8
|
+
* ⚠️ 类型是映射类型(每行各自收窄到自己的载荷类型),所以:
|
|
9
|
+
* ① 少了任何一行 ⇒ `TS2741`;② 行里的方法签名与载荷类型不匹配 ⇒ 当场报错;
|
|
10
|
+
* ③ 遍历代码(下面几个 helper)不需要跟着改 —— 它们从这张表派生。
|
|
11
|
+
*/
|
|
12
|
+
export const KIND_SPEC = {
|
|
13
|
+
tool: {
|
|
14
|
+
collect: (inst) => collectTools(inst),
|
|
15
|
+
toolNames: (tools) => tools.map((t) => t.name),
|
|
16
|
+
count: (tools) => tools.length,
|
|
17
|
+
toTools: (tools) => tools,
|
|
18
|
+
},
|
|
19
|
+
subagent: {
|
|
20
|
+
collect: (inst) => collectSubAgents(inst),
|
|
21
|
+
toolNames: (caps) => caps.map((c) => c.name),
|
|
22
|
+
count: (caps) => caps.length,
|
|
23
|
+
toTools: (caps, resolve) => caps.map((capability) => subagentToTool(capability, resolve(`@SubAgent "${capability.name}"`, capability.spec.tools))),
|
|
24
|
+
},
|
|
25
|
+
skill: {
|
|
26
|
+
collect: (inst) => collectSkills(inst),
|
|
27
|
+
toolNames: (caps) => caps.map((c) => c.name),
|
|
28
|
+
count: (caps) => caps.length,
|
|
29
|
+
toTools: (caps, resolve) => caps.map((capability) => skillToTool(capability, resolve(`@Skill "${capability.name}"`, capability.spec.tools))),
|
|
30
|
+
},
|
|
31
|
+
prompt: {
|
|
32
|
+
collect: (inst) => collectPromptEntries(inst),
|
|
33
|
+
toolNames: (p) => p.tools.map((t) => t.name),
|
|
34
|
+
count: (p) => p.tools.length,
|
|
35
|
+
toTools: (p) => p.tools,
|
|
36
|
+
versions: (p) => p.versions,
|
|
37
|
+
},
|
|
38
|
+
};
|
|
39
|
+
/**
|
|
40
|
+
* 遍历顺序 = 这张表的键序(收集 / 展开 / 计数都用它)。
|
|
41
|
+
* **从表派生而不是另写一份清单** —— 否则「加了表项忘了加清单」又是一种静默漏项。
|
|
42
|
+
*/
|
|
43
|
+
export const CAPABILITY_KINDS = Object.keys(KIND_SPEC);
|
|
44
|
+
/**
|
|
45
|
+
* 按类遍历的**唯一**类型擦除点。
|
|
46
|
+
*
|
|
47
|
+
* 为什么必须有这一处:TS 无法把一个循环变量 `kind: CapabilityKind` 与「它对应的那个载荷类型」
|
|
48
|
+
* 关联起来(相关联合,microsoft/TypeScript#30581)—— 泛型在这里推不出来,只能擦除一次。
|
|
49
|
+
* 安全性由三件事共同兜住:① `KIND_SPEC` 是映射类型,**每一行在定义处就逐个收窄**(不是
|
|
50
|
+
* 在这里靠断言);② `CAPABILITY_KINDS` 从表派生 ⇒ 擦除的覆盖面就是表的覆盖面;
|
|
51
|
+
* ③ `tests/toolkit/capability-slice.test.ts` 用真数据逐类驱动(每类都真的被走到过)。
|
|
52
|
+
*/
|
|
53
|
+
function specOf(kind) {
|
|
54
|
+
return KIND_SPEC[kind];
|
|
55
|
+
}
|
|
56
|
+
/** 收集一个 provider 实例上的四类能力(每类都在场,空数组也算在场) */
|
|
57
|
+
export function collectCapabilities(inst) {
|
|
58
|
+
// 逐类填满:`{}` 起步 + 下方立刻补齐全部键(键集 = CAPABILITY_KINDS = 表的键集)
|
|
59
|
+
const out = {};
|
|
60
|
+
const sink = out;
|
|
61
|
+
for (const kind of CAPABILITY_KINDS) {
|
|
62
|
+
sink[kind] = specOf(kind).collect(inst);
|
|
63
|
+
}
|
|
64
|
+
return out;
|
|
65
|
+
}
|
|
66
|
+
/** 该 token 的**可用名单**(引用某个不存在的能力名时,报错文案里列的那串) */
|
|
67
|
+
export function capabilityToolNames(collected) {
|
|
68
|
+
const out = [];
|
|
69
|
+
for (const kind of CAPABILITY_KINDS)
|
|
70
|
+
out.push(...specOf(kind).toolNames(collected[kind]));
|
|
71
|
+
return out;
|
|
72
|
+
}
|
|
73
|
+
/** 该 token 的能力切片(主菜单的一路;调用方再用中间件包装) */
|
|
74
|
+
export function buildCapabilitySlice(collected, resolve) {
|
|
75
|
+
const out = [];
|
|
76
|
+
for (const kind of CAPABILITY_KINDS)
|
|
77
|
+
out.push(...specOf(kind).toTools(collected[kind], resolve));
|
|
78
|
+
return out;
|
|
79
|
+
}
|
|
80
|
+
/** 该 token 上的**能力**条数(孤儿告警口径:能力数,不是编译出来的工具数) */
|
|
81
|
+
export function capabilityCount(collected) {
|
|
82
|
+
let n = 0;
|
|
83
|
+
for (const kind of CAPABILITY_KINDS)
|
|
84
|
+
n += specOf(kind).count(collected[kind]);
|
|
85
|
+
return n;
|
|
86
|
+
}
|
|
87
|
+
/** 该 token 上的资产版本表(只有 `@Prompt` 有;无可版本化资产时返回 `undefined`) */
|
|
88
|
+
export function capabilityVersions(collected) {
|
|
89
|
+
const out = {};
|
|
90
|
+
for (const kind of CAPABILITY_KINDS) {
|
|
91
|
+
const spec = specOf(kind);
|
|
92
|
+
if (!spec.versions)
|
|
93
|
+
continue; // 本类不参与版本表(缺省,见 CapabilityKindSpec.versions)
|
|
94
|
+
Object.assign(out, spec.versions(collected[kind]));
|
|
95
|
+
}
|
|
96
|
+
return Object.keys(out).length > 0 ? out : undefined;
|
|
97
|
+
}
|
|
98
|
+
//# sourceMappingURL=capability-slice.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"capability-slice.js","sourceRoot":"","sources":["../../src/toolkit/capability-slice.ts"],"names":[],"mappings":"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"}
|
package/dist/toolkit/module.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { MessageParam } from '../core/message.js';
|
|
2
2
|
import type { AgentTool, JsonSchema, ModelPricing, SchemaType } from '../core/tool.js';
|
|
3
|
-
import type { SystemParam } from '../engine/types.js';
|
|
3
|
+
import type { ModelFallbackLink, SystemParam } from '../engine/types.js';
|
|
4
4
|
import { SystemPrompt } from '../runtime/systemPrompt.js';
|
|
5
5
|
import type { RunInvocationOptions } from '../engine/spec.js';
|
|
6
6
|
import type { SessionStore } from '../runtime/session.js';
|
|
@@ -46,6 +46,12 @@ export interface AppOptions {
|
|
|
46
46
|
system: SystemPrompt | SystemParam;
|
|
47
47
|
/** 缺省模型;不给则走 engine 默认(claude-opus-5) */
|
|
48
48
|
model?: string;
|
|
49
|
+
/** 缺省模型 fallback 链(可被单次 run 覆盖);见 `RunAgentOptions.fallbacks`(R8-P2) */
|
|
50
|
+
fallbacks?: ModelFallbackLink[];
|
|
51
|
+
/** 缺省记录 assistant 文本进 trace(`'full'`;可被单次 run 覆盖);见 `RunAgentOptions.traceContent`(R8-P3a) */
|
|
52
|
+
traceContent?: 'full';
|
|
53
|
+
/** 缺省归因标签(可被单次 run 覆盖 —— 注意是**整体替换**不是合并);见 `RunAgentOptions.labels`(R8-P4) */
|
|
54
|
+
labels?: Record<string, string>;
|
|
49
55
|
/** 缺省 maxTokens(流式给足避免中途截断) */
|
|
50
56
|
maxTokens?: number;
|
|
51
57
|
/** 缺省循环上限 */
|
package/dist/toolkit/module.js
CHANGED
|
@@ -4,11 +4,9 @@ import { composeTraceEvents } from '../core/trace.js';
|
|
|
4
4
|
import { Container } from '../container/container.js';
|
|
5
5
|
import { omitUndefined } from '../core/object.js';
|
|
6
6
|
import { discoverProviders } from './discover.js';
|
|
7
|
-
import {
|
|
8
|
-
import { collectSubAgents, subagentToTool } from './subagent.js';
|
|
9
|
-
import { collectSkills, skillToTool } from './skill.js';
|
|
10
|
-
import { collectPromptEntries } from './prompt.js';
|
|
7
|
+
import { buildCapabilitySlice, capabilityCount, capabilityToolNames, capabilityVersions, collectCapabilities, } from './capability-slice.js';
|
|
11
8
|
import { applyMiddleware } from './middleware.js';
|
|
9
|
+
import { buildCapabilityGraph, findCapabilityCycle } from './capability-cycles.js';
|
|
12
10
|
/** 定义能力包:identity 函数,仅给第三方包一个类型锚点与导出约定 */
|
|
13
11
|
export function defineModule(m) {
|
|
14
12
|
return m;
|
|
@@ -69,6 +67,9 @@ export class AgentApp {
|
|
|
69
67
|
this.onTraceEvent = opts.onTraceEvent;
|
|
70
68
|
this.base = {
|
|
71
69
|
model: opts.model,
|
|
70
|
+
fallbacks: opts.fallbacks,
|
|
71
|
+
traceContent: opts.traceContent,
|
|
72
|
+
labels: opts.labels,
|
|
72
73
|
maxTokens: opts.maxTokens,
|
|
73
74
|
maxIterations: opts.maxIterations,
|
|
74
75
|
contextPolicy: opts.contextPolicy,
|
|
@@ -82,18 +83,14 @@ export class AgentApp {
|
|
|
82
83
|
maxEventChars: opts.maxEventChars,
|
|
83
84
|
traceLimits: opts.traceLimits,
|
|
84
85
|
};
|
|
85
|
-
// 先为每个 provider
|
|
86
|
+
// 先为每个 provider 解析实例并预收集它的四类能力(@Tool / @SubAgent / @Skill / @Prompt)。
|
|
87
|
+
// 「四类」这件事只活在 `capability-slice.ts` 的注册表里 —— 本文件按类**遍历**,不按类分支,
|
|
88
|
+
// 所以新增第五类能力不会在这里留下一处「忘了改」的静默点(外部深评 K2)。
|
|
86
89
|
// 子 agent / skill 的 tools token 在装配期即解析到该 provider 的 @Tool 菜单(静态校验)。
|
|
87
|
-
const
|
|
88
|
-
const capabilitiesByToken = new Map();
|
|
89
|
-
const skillsByToken = new Map();
|
|
90
|
-
const promptsByToken = new Map();
|
|
90
|
+
const collectedByToken = new Map();
|
|
91
91
|
for (const p of providerList) {
|
|
92
92
|
const inst = this.di.resolve(p.provide);
|
|
93
|
-
|
|
94
|
-
capabilitiesByToken.set(p.provide, collectSubAgents(inst));
|
|
95
|
-
skillsByToken.set(p.provide, collectSkills(inst));
|
|
96
|
-
promptsByToken.set(p.provide, collectPromptEntries(inst));
|
|
93
|
+
collectedByToken.set(p.provide, collectCapabilities(inst));
|
|
97
94
|
}
|
|
98
95
|
// 能力调用中间件:装配期包裹整个菜单(洋葱模型,对 engine 零侵入);
|
|
99
96
|
// 模块级中间件在前(更外层),应用级在后。
|
|
@@ -126,20 +123,14 @@ export class AgentApp {
|
|
|
126
123
|
: { token: ref.slice(0, slash), name: ref.slice(slash + 1) };
|
|
127
124
|
});
|
|
128
125
|
for (const { token, name } of parsed) {
|
|
129
|
-
if (!
|
|
126
|
+
if (!collectedByToken.has(token)) {
|
|
130
127
|
throw new Error(`${owner} tools 引用未注册 provider: "${token}"`);
|
|
131
128
|
}
|
|
132
129
|
if (name !== undefined) {
|
|
133
130
|
// 可用名单 = 该 provider 收集菜单全量(@Tool 与它的 subagent/skill/prompt
|
|
134
131
|
// 工具名),按名排序给出,方便作者对照改正。
|
|
135
|
-
const
|
|
136
|
-
|
|
137
|
-
...(capabilitiesByToken.get(token) ?? []),
|
|
138
|
-
...(skillsByToken.get(token) ?? []),
|
|
139
|
-
...(promptsByToken.get(token)?.tools ?? []),
|
|
140
|
-
]
|
|
141
|
-
.map((t) => t.name)
|
|
142
|
-
.sort();
|
|
132
|
+
const collected = collectedByToken.get(token);
|
|
133
|
+
const available = (collected === undefined ? [] : capabilityToolNames(collected)).sort();
|
|
143
134
|
if (!available.includes(name)) {
|
|
144
135
|
throw new Error(`${owner} tools 引用 "${token}" 中不存在的能力: "${name}"(可用: ${available.join(', ')})`);
|
|
145
136
|
}
|
|
@@ -152,12 +143,11 @@ export class AgentApp {
|
|
|
152
143
|
return name === undefined ? wrapped : wrapped.filter((t) => t.name === name);
|
|
153
144
|
});
|
|
154
145
|
};
|
|
146
|
+
// 一路「按类展开」:每类怎么变成工具由 `capability-slice.ts` 的注册表决定(含它的
|
|
147
|
+
// 引用提示词 `@SubAgent "x"` / `@Skill "x"`),本文件不再有四路展开。
|
|
155
148
|
const buildSlice = (token) => {
|
|
156
|
-
const
|
|
157
|
-
|
|
158
|
-
const skillTools = (skillsByToken.get(token) ?? []).map((capability) => skillToTool(capability, resolveRefTools(`@Skill "${capability.name}"`, capability.spec.tools)));
|
|
159
|
-
const promptTools = promptsByToken.get(token)?.tools ?? [];
|
|
160
|
-
return [...plain, ...subTools, ...skillTools, ...promptTools];
|
|
149
|
+
const collected = collectedByToken.get(token);
|
|
150
|
+
return collected === undefined ? [] : buildCapabilitySlice(collected, resolveRefTools);
|
|
161
151
|
};
|
|
162
152
|
// 全部 provider 都切片并包装:主菜单只取 sources,但被 toolSources 排除的
|
|
163
153
|
// provider 上的能力仍可被其他能力的 tools 引用(引用是作者显式声明,不受收窄影响)——
|
|
@@ -165,6 +155,43 @@ export class AgentApp {
|
|
|
165
155
|
for (const p of providerList) {
|
|
166
156
|
wrappedByToken.set(p.provide, wrap(buildSlice(p.provide)));
|
|
167
157
|
}
|
|
158
|
+
// ── 能力引用图成环检测(2026-09-28)────────────────────────────────────────────
|
|
159
|
+
// 上面那次切片已经把**引用存在性**校验完了(未注册 provider / 不存在的能力名都在
|
|
160
|
+
// `resolveRefTools` 里抛过),所以这里可以放心按 token 扇出。
|
|
161
|
+
//
|
|
162
|
+
// 为什么要挡成环:能力是**运行期**展开的(`subagentToTool` 的 resolveTools 是延迟 thunk,
|
|
163
|
+
// `wrappedByToken` 此刻已全部建满)⇒ 一旦成环,模型点一次就是无限递归;而 `maxIterations`
|
|
164
|
+
// 只限每层的**宽度**、深度没有任何闸 ⇒ 树按 宽度^深度 炸开(token 与内存双爆),
|
|
165
|
+
// 且要到运行期才显形。DI 容器有环检测(`container.ts`),能力图此前没有。
|
|
166
|
+
// 实现在 `capability-cycles.ts`(纯件:不碰 DI、可单独单测)。
|
|
167
|
+
// ⚠️ 这里**刻意只取两类**(不遍历 CAPABILITY_KINDS):只有 @SubAgent / @Skill 有
|
|
168
|
+
// `tools` 引用,@Tool 与 @Prompt 没有「能力引用」这回事 —— 那是语义上的不对称,不是漏项
|
|
169
|
+
//(同一条说明也在 capability-slice.ts 的文件头,别为了「看起来整齐」改成遍历)。
|
|
170
|
+
const graphInputs = providerList.flatMap((p) => {
|
|
171
|
+
const collected = collectedByToken.get(p.provide);
|
|
172
|
+
if (collected === undefined)
|
|
173
|
+
return [];
|
|
174
|
+
return [
|
|
175
|
+
...collected.subagent.map((c) => ({
|
|
176
|
+
token: p.provide,
|
|
177
|
+
kind: 'subagent',
|
|
178
|
+
name: c.name,
|
|
179
|
+
refs: c.spec.tools ?? [],
|
|
180
|
+
})),
|
|
181
|
+
...collected.skill.map((c) => ({
|
|
182
|
+
token: p.provide,
|
|
183
|
+
kind: 'skill',
|
|
184
|
+
name: c.name,
|
|
185
|
+
refs: c.spec.tools ?? [],
|
|
186
|
+
})),
|
|
187
|
+
];
|
|
188
|
+
});
|
|
189
|
+
const cycle = findCapabilityCycle(buildCapabilityGraph(graphInputs));
|
|
190
|
+
if (cycle !== undefined) {
|
|
191
|
+
throw new Error(`能力引用成环:${cycle.map((n) => n.label).join(' → ')}。` +
|
|
192
|
+
'@SubAgent / @Skill 的 tools 引用不得绕回自己 —— 递归能力没有深度闸,' +
|
|
193
|
+
'模型一次自我调用就是无限递归(拆掉环,或把「递归」改成普通工具自己实现)');
|
|
194
|
+
}
|
|
168
195
|
// toolSources 是「取哪些 provider 的能力」的白名单,同一 token 写重只该取一次:
|
|
169
196
|
// 不去重则会 flatMap 收两遍该 provider 的能力,最后撞上「菜单能力重名」——
|
|
170
197
|
// 报错指向能力定义(错误来源),而真正的问题是这份清单里重复写了 token。
|
|
@@ -175,7 +202,9 @@ export class AgentApp {
|
|
|
175
202
|
// 收窄同样生效)汇总各 @Prompt 的 最终菜单名→version;run() 固定传给 engine。
|
|
176
203
|
const promptVersions = {};
|
|
177
204
|
for (const token of sources) {
|
|
178
|
-
|
|
205
|
+
const collected = collectedByToken.get(token);
|
|
206
|
+
if (collected !== undefined)
|
|
207
|
+
Object.assign(promptVersions, capabilityVersions(collected));
|
|
179
208
|
}
|
|
180
209
|
this.promptVersions = Object.keys(promptVersions).length > 0 ? promptVersions : undefined;
|
|
181
210
|
this._tools = [
|
|
@@ -205,10 +234,8 @@ export class AgentApp {
|
|
|
205
234
|
for (const p of providerList) {
|
|
206
235
|
if (included.has(p.provide))
|
|
207
236
|
continue;
|
|
208
|
-
const
|
|
209
|
-
|
|
210
|
-
(skillsByToken.get(p.provide)?.length ?? 0) +
|
|
211
|
-
(promptsByToken.get(p.provide)?.tools.length ?? 0);
|
|
237
|
+
const collected = collectedByToken.get(p.provide);
|
|
238
|
+
const orphanCount = collected === undefined ? 0 : capabilityCount(collected);
|
|
212
239
|
if (orphanCount > 0) {
|
|
213
240
|
console.warn(`[agentia] 孤儿能力告警:provider "${p.provide}" 上的 ${orphanCount} 个能力不在 toolSources 内,` +
|
|
214
241
|
`不进主菜单(模型无法直接调用);若被其他能力的 tools 引用仍可被调用`);
|
|
@@ -249,6 +276,9 @@ export class AgentApp {
|
|
|
249
276
|
// 一律 `?? 缺省` 取值。
|
|
250
277
|
...omitUndefined({
|
|
251
278
|
model: opts.model ?? this.base.model,
|
|
279
|
+
fallbacks: opts.fallbacks ?? this.base.fallbacks,
|
|
280
|
+
traceContent: opts.traceContent ?? this.base.traceContent,
|
|
281
|
+
labels: opts.labels ?? this.base.labels,
|
|
252
282
|
maxTokens: opts.maxTokens ?? this.base.maxTokens,
|
|
253
283
|
maxIterations: opts.maxIterations ?? this.base.maxIterations,
|
|
254
284
|
client: opts.client,
|
|
@@ -271,6 +301,9 @@ export class AgentApp {
|
|
|
271
301
|
// HITL:审批决定(tool_use_id → 决定)原样进引擎;恢复挂起任务时由
|
|
272
302
|
// AsyncRunner 经它把落库的决定喂回来
|
|
273
303
|
approvals: opts.approvals,
|
|
304
|
+
// 事件投入口(2026-09-28 ⑥):与 approvals 同一条「契约字段必须原样透传」的规则
|
|
305
|
+
// (漏掉这一行 = AsyncRunner 投递的事件在 app.run 门口静默丢掉)
|
|
306
|
+
events: opts.events,
|
|
274
307
|
contextPolicy: opts.contextPolicy ?? this.base.contextPolicy,
|
|
275
308
|
retry: opts.retry ?? this.base.retry,
|
|
276
309
|
maxTotalTokens: opts.maxTotalTokens ?? this.base.maxTotalTokens,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module.js","sourceRoot":"","sources":["../../src/toolkit/module.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAK/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAGtD,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAGtD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAEjE,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAExD,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAEnD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAiBlD,0CAA0C;AAC1C,MAAM,UAAU,YAAY,CAAC,CAAc;IACzC,OAAO,CAAC,CAAC;AACX,CAAC;AAED,MAAM,YAAY,GAAgB,EAAE,CAAC;AAErC,sEAAsE;AACtE,MAAM,UAAU,wBAAwB,CAAC,IAAe;IACtD,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC1B,CAAC;AA0ID;;;;;;;;;GASG;AACH,MAAM,OAAO,QAAQ;IACV,IAAI,CAAS;IACL,EAAE,CAAY;IACd,MAAM,CAA6B;IACnC,IAAI,CAcnB;IACM,MAAM,GAAgB,EAAE,CAAC;IACjC;;;;OAIG;IACc,cAAc,CAAqC;IACnD,KAAK,CAAc;IACpC;;;OAGG;IACc,YAAY,CAA8C;IAC3E,2DAA2D;IAC1C,SAAS,CAAsC;IAEhE,YAAY,IAAgB;QAC1B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,IAAI,KAAK,CAAC;QAC/B,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC;QACnC,mDAAmD;QACnD,qDAAqD;QACrD,kDAAkD;QAClD,MAAM,YAAY,GAAG;YACnB,GAAG,IAAI,GAAG,CACR,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,EAAE,GAAG,CAAC,IAAI,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;gBAC7E,CAAC,CAAC,OAAO;gBACT,CAAC;aACF,CAAC,CACH,CAAC,MAAM,EAAE;SACX,CAAC;QACF,IAAI,CAAC,EAAE,GAAG,IAAI,SAAS,EAAE,CAAC,QAAQ,CAAC,GAAG,YAAY,CAAC,CAAC;QACpD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC1B,0DAA0D;QAC1D,IAAI,CAAC,KAAK,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,EAAE,GAAG,YAAY,CAAC,CAAC;QACtD,8CAA8C;QAC9C,8CAA8C;QAC9C,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;QACtC,IAAI,CAAC,IAAI,GAAG;YACV,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,cAAc,EAAE,IAAI,CAAC,cAAc;YACnC,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,cAAc,EAAE,IAAI,CAAC,cAAc;YACnC,eAAe,EAAE,IAAI,CAAC,eAAe;YACrC,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;YAC3C,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,WAAW,EAAE,IAAI,CAAC,WAAW;SAC9B,CAAC;QAEF,iEAAiE;QACjE,qEAAqE;QACrE,MAAM,YAAY,GAAG,IAAI,GAAG,EAAsB,CAAC;QACnD,MAAM,mBAAmB,GAAG,IAAI,GAAG,EAA+B,CAAC;QACnE,MAAM,aAAa,GAAG,IAAI,GAAG,EAA4B,CAAC;QAC1D,MAAM,cAAc,GAAG,IAAI,GAAG,EAA2B,CAAC;QAC1D,KAAK,MAAM,CAAC,IAAI,YAAY,EAAE,CAAC;YAC7B,MAAM,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC,OAAO,CAAS,CAAC,CAAC,OAAO,CAAC,CAAC;YAChD,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC;YAChD,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC;YAC3D,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC;YAClD,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC;QAC5D,CAAC;QAED,wCAAwC;QACxC,uBAAuB;QACvB,MAAM,UAAU,GAAG,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,IAAI,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,CAAC;QAC/F,MAAM,IAAI,GAAG,CAAC,KAAkB,EAAe,EAAE,CAC/C,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,eAAe,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;QACjE,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QAEtB;;;;;;;WAOG;QACH,MAAM,cAAc,GAAG,IAAI,GAAG,EAAsB,CAAC;QAErD,gDAAgD;QAChD,2CAA2C;QAC3C,sCAAsC;QACtC,EAAE;QACF,gBAAgB;QAChB,uEAAuE;QACvE,+CAA+C;QAC/C,mDAAmD;QACnD,gCAAgC;QAChC,MAAM,eAAe,GAAG,CAAC,KAAa,EAAE,IAA0B,EAAuB,EAAE;YACzF,MAAM,MAAM,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;gBACtC,MAAM,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;gBAC/B,OAAO,KAAK,KAAK,CAAC,CAAC;oBACjB,CAAC,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,SAA+B,EAAE;oBACvD,CAAC,CAAC,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,EAAE,CAAC;YACjE,CAAC,CAAC,CAAC;YACH,KAAK,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,MAAM,EAAE,CAAC;gBACrC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;oBAC7B,MAAM,IAAI,KAAK,CAAC,GAAG,KAAK,2BAA2B,KAAK,GAAG,CAAC,CAAC;gBAC/D,CAAC;gBACD,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;oBACvB,2DAA2D;oBAC3D,wBAAwB;oBACxB,MAAM,SAAS,GAAG;wBAChB,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;wBAClC,GAAG,CAAC,mBAAmB,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;wBACzC,GAAG,CAAC,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;wBACnC,GAAG,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,KAAK,IAAI,EAAE,CAAC;qBAC5C;yBACE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;yBAClB,IAAI,EAAE,CAAC;oBACV,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;wBAC9B,MAAM,IAAI,KAAK,CACb,GAAG,KAAK,cAAc,KAAK,eAAe,IAAI,SAAS,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAC/E,CAAC;oBACJ,CAAC;gBACH,CAAC;YACH,CAAC;YACD,OAAO,GAAG,EAAE,CACV,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,EAAE;gBACjC,MAAM,OAAO,GAAG,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;gBAChD,sDAAsD;gBACtD,eAAe;gBACf,OAAO,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;YAC/E,CAAC,CAAC,CAAC;QACP,CAAC,CAAC;QAEF,MAAM,UAAU,GAAG,CAAC,KAAY,EAAe,EAAE;YAC/C,MAAM,KAAK,GAAG,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;YAC5C,MAAM,QAAQ,GAAG,CAAC,mBAAmB,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CACzE,cAAc,CACZ,UAAU,EACV,eAAe,CAAC,cAAc,UAAU,CAAC,IAAI,GAAG,EAAE,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CACzE,CACF,CAAC;YACF,MAAM,UAAU,GAAG,CAAC,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CACrE,WAAW,CACT,UAAU,EACV,eAAe,CAAC,WAAW,UAAU,CAAC,IAAI,GAAG,EAAE,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CACtE,CACF,CAAC;YACF,MAAM,WAAW,GAAG,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,KAAK,IAAI,EAAE,CAAC;YAC3D,OAAO,CAAC,GAAG,KAAK,EAAE,GAAG,QAAQ,EAAE,GAAG,UAAU,EAAE,GAAG,WAAW,CAAC,CAAC;QAChE,CAAC,CAAC;QAEF,sDAAsD;QACtD,qDAAqD;QACrD,kDAAkD;QAClD,KAAK,MAAM,CAAC,IAAI,YAAY,EAAE,CAAC;YAC7B,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QAC7D,CAAC;QAED,wDAAwD;QACxD,iDAAiD;QACjD,yCAAyC;QACzC,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW;YAC9B,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAChC,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QACvC,uDAAuD;QACvD,wDAAwD;QACxD,MAAM,cAAc,GAA2B,EAAE,CAAC;QAClD,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;YAC5B,MAAM,CAAC,MAAM,CAAC,cAAc,EAAE,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,QAAQ,CAAC,CAAC;QACrE,CAAC;QACD,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,SAAS,CAAC;QAC1F,IAAI,CAAC,MAAM,GAAG;YACZ,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;gBAC3B,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;oBACxB,MAAM,IAAI,KAAK,CAAC,gCAAgC,KAAK,GAAG,CAAC,CAAC;gBAC5D,CAAC;gBACD,OAAO,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;YACzC,CAAC,CAAC;YACF,gDAAgD;YAChD,sCAAsC;YACtC,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;SAC1B,CAAC;QAEF,8CAA8C;QAC9C,MAAM,GAAG,GAAG,IAAI,GAAG,EAAkB,CAAC;QACtC,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,MAAM;YAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QACzE,MAAM,QAAQ,GAAG,CAAC,GAAG,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;QAC7E,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CACb,8CAA8C,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CACpE,CAAC;QACJ,CAAC;QAED,kDAAkD;QAClD,gDAAgD;QAChD,sBAAsB;QACtB,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACrB,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAC3C,KAAK,MAAM,CAAC,IAAI,YAAY,EAAE,CAAC;gBAC7B,IAAI,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC;oBAAE,SAAS;gBACtC,MAAM,WAAW,GACf,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC,CAAC;oBAC1C,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC,CAAC;oBACjD,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC,CAAC;oBAC3C,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC;gBACrD,IAAI,WAAW,GAAG,CAAC,EAAE,CAAC;oBACpB,OAAO,CAAC,IAAI,CACV,8BAA8B,CAAC,CAAC,OAAO,QAAQ,WAAW,uBAAuB;wBAC/E,uCAAuC,CAC1C,CAAC;gBACJ,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,oCAAoC;IACpC,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED,YAAY;IACZ,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,EAAE,CAAC;IACjB,CAAC;IAED;;;OAGG;IACH,GAAG,CACD,QAAwB,EACxB,IAAI,GAAqB,EAAE;QAE3B,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC;QACvC,MAAM,MAAM,GAAgB,GAAG,YAAY,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;QAE3F,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC;QAC7B,OAAO,UAAU,CAAI;YACnB,MAAM;YACN,QAAQ;YACR,+DAA+D;YAC/D,uDAAuD;YACvD,2DAA2D;YAC3D,kCAAkC;YAClC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM;YAC5D,OAAO,EAAE,IAAI,CAAC,IAAI;YAClB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,0CAA0C;YAC1C,uEAAuE;YACvE,2DAA2D;YAC3D,6CAA6C;YAC7C,iBAAiB;YACjB,GAAG,aAAa,CAAC;gBACf,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK;gBACpC,SAAS,EAAE,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS;gBAChD,aAAa,EAAE,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,IAAI,CAAC,aAAa;gBAC5D,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,2DAA2D;gBAC3D,sEAAsE;gBACtE,sDAAsD;gBACtD,2DAA2D;gBAC3D,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,mDAAmD;gBACnD,mDAAmD;gBACnD,YAAY,EAAE,IAAI,CAAC,YAAY;gBAC/B,cAAc,EAAE,IAAI,CAAC,cAAc;gBACnC,oDAAoD;gBACpD,uEAAuE;gBACvE,iCAAiC;gBACjC,YAAY,EAAE,kBAAkB,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,YAAY,CAAC;gBACtE,yDAAyD;gBACzD,WAAW,EAAE,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW;gBACtD,4CAA4C;gBAC5C,0BAA0B;gBAC1B,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,aAAa,EAAE,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,IAAI,CAAC,aAAa;gBAC5D,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK;gBACpC,cAAc,EAAE,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,IAAI,CAAC,cAAc;gBAC/D,UAAU,EAAE,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU;gBACnD,cAAc,EAAE,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,IAAI,CAAC,cAAc;gBAC/D,eAAe,EAAE,IAAI,CAAC,eAAe,IAAI,IAAI,CAAC,IAAI,CAAC,eAAe;gBAClE,aAAa,EAAE,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,IAAI,CAAC,aAAa;gBAC5D,kBAAkB,EAAE,IAAI,CAAC,kBAAkB,IAAI,IAAI,CAAC,IAAI,CAAC,kBAAkB;gBAC3E,aAAa,EAAE,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,IAAI,CAAC,aAAa;gBAC5D,YAAY,EAAE,IAAI,CAAC,YAAY;gBAC/B,qDAAqD;gBACrD,+DAA+D;gBAC/D,aAAa,EAAE,GAAG,YAAY,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS;gBACpE,kDAAkD;gBAClD,qCAAqC;gBACrC,cAAc,EAAE,IAAI,CAAC,cAAc;gBACnC,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,0DAA0D;gBAC1D,kDAAkD;gBAClD,WAAW,EAAE,IAAI,CAAC,WAAW;aAC9B,CAAC;YACF,WAAW,EAAE,CAAC,GAAG,EAAE,EAAE;gBACnB,IAAI,IAAI,EAAE,CAAC;oBACT,2CAA2C;oBAC3C,oCAAoC;oBACpC,MAAM,OAAO,GAAG,IAA+B,CAAC;oBAChD,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;wBAAE,GAAG,CAAC,GAAG,CAAC,GAAoB,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;gBACtF,CAAC;YACH,CAAC;SACF,CAAC,CAAC;IACL,CAAC;CACF;AAQD,MAAM,UAAU,SAAS,CAAC,IAAgB;IACxC,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;QAClB,OAAO,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI;QAC1C,2DAA2D;QAC3D,wCAAwC;QACxC,6CAA6C;QAC7C,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,QAAQ,CAAC,EAAE,GAAG,IAAI,EAAE,SAAS,EAAE,CAAC,GAAG,KAAK,EAAE,GAAG,CAAC,IAAI,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CACvF,CAAC;IACJ,CAAC;IACD,OAAO,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC;AAC5B,CAAC"}
|
|
1
|
+
{"version":3,"file":"module.js","sourceRoot":"","sources":["../../src/toolkit/module.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
import type { TaskRecord } from '../store/store.js';
|
|
14
14
|
/**
|
|
15
15
|
* 审批超时判定(HITL,**惰性**:不起定时器,只在 approve / poll / resumePending 读到
|
|
16
|
-
* awaiting 记录时判)。基准是 `
|
|
16
|
+
* awaiting 记录时判)。基准是 `suspendedSince`(挂起时刻,挂起时落库);缺失时按
|
|
17
17
|
* startedAt → createdAt 退化(容忍手工塞进来的记录)。`timeoutMs <= 0` = 不启用超时;
|
|
18
18
|
* 边界是**严格大于**(恰好等于不算过期)。
|
|
19
19
|
*/
|
|
@@ -1,13 +1,17 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* 审批超时判定(HITL,**惰性**:不起定时器,只在 approve / poll / resumePending 读到
|
|
3
|
-
* awaiting 记录时判)。基准是 `
|
|
3
|
+
* awaiting 记录时判)。基准是 `suspendedSince`(挂起时刻,挂起时落库);缺失时按
|
|
4
4
|
* startedAt → createdAt 退化(容忍手工塞进来的记录)。`timeoutMs <= 0` = 不启用超时;
|
|
5
5
|
* 边界是**严格大于**(恰好等于不算过期)。
|
|
6
6
|
*/
|
|
7
7
|
export function approvalExpired(rec, now, timeoutMs) {
|
|
8
8
|
return (timeoutMs > 0 &&
|
|
9
|
-
rec.status === '
|
|
10
|
-
|
|
9
|
+
rec.status === 'suspended' &&
|
|
10
|
+
// ⚠️ 必须再卡**原因**(2026-09-28 ①):`approvalTimeoutMs` 是「等人工」的闸,
|
|
11
|
+
// 拿它去判一条在等时刻的 run(reason='timer')= 提前叫醒它,而且
|
|
12
|
+
// `#expireAndResume` 紧接着就重派(补不出任何 deny 决定,因为它没有待决项)。
|
|
13
|
+
rec.suspendedReason === 'approval' &&
|
|
14
|
+
now - (rec.suspendedSince ?? rec.startedAt ?? rec.createdAt) > timeoutMs);
|
|
11
15
|
}
|
|
12
16
|
/**
|
|
13
17
|
* 超时自动拒绝:**仍空着的**待决项补上 deny(已有人工决定的不覆盖 —— 第一次决定赢)。
|
|
@@ -23,7 +27,7 @@ export function fillTimeoutDenials(rec, now) {
|
|
|
23
27
|
reason: '审批超时',
|
|
24
28
|
decidedBy: 'system',
|
|
25
29
|
decidedAt: now,
|
|
26
|
-
...(rec.
|
|
30
|
+
...(rec.suspendedSince !== undefined ? { requestedAt: rec.suspendedSince } : {}),
|
|
27
31
|
};
|
|
28
32
|
}
|
|
29
33
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"approval-policy.js","sourceRoot":"","sources":["../../src/transport/approval-policy.ts"],"names":[],"mappings":"AAcA;;;;;GAKG;AACH,MAAM,UAAU,eAAe,CAAC,GAAe,EAAE,GAAW,EAAE,SAAiB;IAC7E,OAAO,CACL,SAAS,GAAG,CAAC;QACb,GAAG,CAAC,MAAM,KAAK,
|
|
1
|
+
{"version":3,"file":"approval-policy.js","sourceRoot":"","sources":["../../src/transport/approval-policy.ts"],"names":[],"mappings":"AAcA;;;;;GAKG;AACH,MAAM,UAAU,eAAe,CAAC,GAAe,EAAE,GAAW,EAAE,SAAiB;IAC7E,OAAO,CACL,SAAS,GAAG,CAAC;QACb,GAAG,CAAC,MAAM,KAAK,WAAW;QAC1B,4DAA4D;QAC5D,4CAA4C;QAC5C,qDAAqD;QACrD,GAAG,CAAC,eAAe,KAAK,UAAU;QAClC,GAAG,GAAG,CAAC,GAAG,CAAC,cAAc,IAAI,GAAG,CAAC,SAAS,IAAI,GAAG,CAAC,SAAS,CAAC,GAAG,SAAS,CACzE,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,kBAAkB,CAAC,GAAe,EAAE,GAAW;IAC7D,GAAG,CAAC,SAAS,KAAK,EAAE,CAAC;IACrB,KAAK,MAAM,EAAE,IAAI,GAAG,CAAC,gBAAgB,IAAI,EAAE,EAAE,CAAC;QAC5C,IAAI,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;YAAE,SAAS;QAChC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,GAAG;YAClB,QAAQ,EAAE,KAAK;YACf,MAAM,EAAE,MAAM;YACd,SAAS,EAAE,QAAQ;YACnB,SAAS,EAAE,GAAG;YACd,GAAG,CAAC,GAAG,CAAC,cAAc,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,GAAG,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACjF,CAAC;IACJ,CAAC;AACH,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,iBAAiB,CAAC,GAAe;IAC/C,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,EAAE,CAAC,KAAK,SAAS,CAAC,CAAC;AACvF,CAAC"}
|
|
@@ -0,0 +1,73 @@
|
|
|
1
|
+
import type { SuspendedSummary } from './wake-policy.js';
|
|
2
|
+
import type { TaskRecord, TaskStore } from '../store/store.js';
|
|
3
|
+
/** `approve` 的入参:一批 tool_use_id → 批准/拒绝(理由可选) */
|
|
4
|
+
export type ApprovalDecisions = Record<string, {
|
|
5
|
+
approved: boolean;
|
|
6
|
+
reason?: string;
|
|
7
|
+
}>;
|
|
8
|
+
/**
|
|
9
|
+
* `approve` 的失败:带 HTTP 语义的状态码(404 = 任务不存在,409 = 任务当前不在
|
|
10
|
+
* `suspended` 状态),HTTP 宿主据此回对应响应。
|
|
11
|
+
* module 级 export —— 不进公共导出面(纯宿主内部实现细节)。
|
|
12
|
+
*/
|
|
13
|
+
export declare class TaskApproveError extends Error {
|
|
14
|
+
/** 400 = 入参语义不合法(decisions 里有本任务待决之外的 id,2026-09-28 深评 P1-2) */
|
|
15
|
+
readonly status: 400 | 404 | 409;
|
|
16
|
+
constructor(status: 400 | 404 | 409, message: string);
|
|
17
|
+
}
|
|
18
|
+
/** `ApprovalSupervisor` 的注入依赖(全部由 `AsyncRunner` 构造时提供) */
|
|
19
|
+
export interface ApprovalSupervisorDeps {
|
|
20
|
+
store: TaskStore;
|
|
21
|
+
/** 恢复执行时写进记录的宿主标识(`approve` / 超时恢复都要 `rec.ownerId = ownerId`) */
|
|
22
|
+
ownerId: string;
|
|
23
|
+
/** 审批超时的毫秒数(0 = 不限)。已由 `AsyncRunner` 构造期校验为「≥ 0 的有限数」 */
|
|
24
|
+
approvalTimeoutMs: number;
|
|
25
|
+
/** 派发入口(`AsyncRunner.#dispatch`:停机闸 + 唯一派发点 + 停机窗口里的一次告警) */
|
|
26
|
+
dispatch(rec: TaskRecord): void;
|
|
27
|
+
}
|
|
28
|
+
export declare class ApprovalSupervisor {
|
|
29
|
+
#private;
|
|
30
|
+
constructor(deps: ApprovalSupervisorDeps);
|
|
31
|
+
/** 挂起读数:按原因分组的条数 + 最早的目标时刻(无时间挂起时为 `null`) */
|
|
32
|
+
get summary(): SuspendedSummary;
|
|
33
|
+
/** 登记一条挂起(纪律①)。原因缺失的记录不进表 —— 分不了组,宁可少数也不猜一个原因出来 */
|
|
34
|
+
markSuspended(rec: TaskRecord): void;
|
|
35
|
+
/** 除名(纪律②):任务离开挂起态时调用(恢复、终态都算) */
|
|
36
|
+
unmarkSuspended(taskId: string): void;
|
|
37
|
+
/**
|
|
38
|
+
* 按 store 的**全表**重建挂起集(读数纪律③)—— `resumePending` 扫描时调用。
|
|
39
|
+
* 扫描本来就 `list()` 了全表,顺手把读数对齐一遍;顺带把**他进程**(或本进程上一世)
|
|
40
|
+
* 留下的挂起也算进本进程可见的那些(口径见 `summary` 的注释)。
|
|
41
|
+
*/
|
|
42
|
+
rebuild(recs: TaskRecord[]): void;
|
|
43
|
+
/**
|
|
44
|
+
* 惰性审批超时:`approvalExpired` 为真 ⇒ 进在飞闸 + 自动全拒 + 落库 + 派发。返回是否命中。
|
|
45
|
+
*
|
|
46
|
+
* 与原 `#lazyGates` / `#redispatch` 里那两句 `if (approvalExpired(...)) #expireAndResume(...)`
|
|
47
|
+
* **逐字等价** —— `approvalExpired` 内部已判 `status === 'suspended'` 与
|
|
48
|
+
* `reason === 'approval'`(见 approval-policy.ts),所以 `#redispatch` 原写法里那句额外的
|
|
49
|
+
* `rec.status !== 'suspended'` 短路是冗余的,合并到本方法不改变任何可观测行为。
|
|
50
|
+
*/
|
|
51
|
+
expireIfExpired(rec: TaskRecord, now: number): boolean;
|
|
52
|
+
/**
|
|
53
|
+
* 审批一个处于 `suspended` 的任务(HITL)。
|
|
54
|
+
*
|
|
55
|
+
* - **逐 tool_use_id 幂等**:已存在的决定不覆盖(第一次决定赢)—— 重复提交 /
|
|
56
|
+
* 并发点击不会推翻已有决定,也不会让恢复段重复执行;
|
|
57
|
+
* - **并发重入共享在飞那次**:同一任务的并发 approve(双击「批准」/两个审批人
|
|
58
|
+
* 同时批)返回同一个 Promise —— 否则两个调用都在对方落库前读到
|
|
59
|
+
* `suspended`、各自判「决定齐了」、**各派发一次**(同一任务重复执行,
|
|
60
|
+
* 与 resumePending 的闸门同一 bug 类)。被共享的那次覆盖不到的决定不丢:
|
|
61
|
+
* 调用方从返回的记录看到任务仍在等待,重试即并入;
|
|
62
|
+
* - 决定齐了就恢复:`status` 回 `running`、**先落库再派发**(与 `#redispatch`
|
|
63
|
+
* 同一条纪律 —— 没落库就恢复,进程崩在窗口里会丢决定);恢复段带着
|
|
64
|
+
* `rec.approvals` 与扩展后的消息历史(`rec.spec.messages`,末尾是含未决
|
|
65
|
+
* tool_use 的那条 assistant 消息)重进引擎循环;
|
|
66
|
+
* - 决定**没**齐:只把本批决定落库,任务继续等(可能多轮审批);
|
|
67
|
+
* - 返回当前 TaskRecord(快照)。任务不存在抛 404 语义、状态不对抛 409 语义
|
|
68
|
+
* 的 `TaskApproveError`。
|
|
69
|
+
*/
|
|
70
|
+
approve(taskId: string, decisions: ApprovalDecisions, opts?: {
|
|
71
|
+
decidedBy?: string;
|
|
72
|
+
}): Promise<TaskRecord>;
|
|
73
|
+
}
|