@framers/agentos 0.5.9 → 0.5.12
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/README.md +137 -408
- package/dist/api/agency.d.ts.map +1 -1
- package/dist/api/agency.js +0 -2
- package/dist/api/agency.js.map +1 -1
- package/dist/api/runtime/AgentOSOrchestrator.d.ts.map +1 -1
- package/dist/api/runtime/AgentOSOrchestrator.js +6 -3
- package/dist/api/runtime/AgentOSOrchestrator.js.map +1 -1
- package/dist/api/runtime/strategies/debate.d.ts.map +1 -1
- package/dist/api/runtime/strategies/debate.js +64 -21
- package/dist/api/runtime/strategies/debate.js.map +1 -1
- package/dist/api/runtime/strategies/graph.d.ts.map +1 -1
- package/dist/api/runtime/strategies/graph.js +11 -25
- package/dist/api/runtime/strategies/graph.js.map +1 -1
- package/dist/api/runtime/strategies/hierarchical.d.ts.map +1 -1
- package/dist/api/runtime/strategies/hierarchical.js +27 -7
- package/dist/api/runtime/strategies/hierarchical.js.map +1 -1
- package/dist/api/runtime/strategies/parallel.d.ts.map +1 -1
- package/dist/api/runtime/strategies/parallel.js +4 -8
- package/dist/api/runtime/strategies/parallel.js.map +1 -1
- package/dist/api/runtime/strategies/review-loop.d.ts +25 -0
- package/dist/api/runtime/strategies/review-loop.d.ts.map +1 -1
- package/dist/api/runtime/strategies/review-loop.js +5 -13
- package/dist/api/runtime/strategies/review-loop.js.map +1 -1
- package/dist/api/runtime/strategies/sequential.d.ts.map +1 -1
- package/dist/api/runtime/strategies/sequential.js +11 -25
- package/dist/api/runtime/strategies/sequential.js.map +1 -1
- package/dist/api/runtime/strategies/shared.d.ts +45 -8
- package/dist/api/runtime/strategies/shared.d.ts.map +1 -1
- package/dist/api/runtime/strategies/shared.js +47 -8
- package/dist/api/runtime/strategies/shared.js.map +1 -1
- package/dist/api/types.d.ts +16 -0
- package/dist/api/types.d.ts.map +1 -1
- package/dist/api/types.js.map +1 -1
- package/dist/core/llm/providers/implementations/OpenAIProvider.d.ts.map +1 -1
- package/dist/core/llm/providers/implementations/OpenAIProvider.js +26 -0
- package/dist/core/llm/providers/implementations/OpenAIProvider.js.map +1 -1
- package/dist/core/llm/providers/implementations/OpenRouterProvider.d.ts.map +1 -1
- package/dist/core/llm/providers/implementations/OpenRouterProvider.js +31 -3
- package/dist/core/llm/providers/implementations/OpenRouterProvider.js.map +1 -1
- package/dist/orchestration/builders/AgentGraph.d.ts +13 -1
- package/dist/orchestration/builders/AgentGraph.d.ts.map +1 -1
- package/dist/orchestration/builders/AgentGraph.js +5 -3
- package/dist/orchestration/builders/AgentGraph.js.map +1 -1
- package/dist/orchestration/builders/MissionBuilder.d.ts +12 -1
- package/dist/orchestration/builders/MissionBuilder.d.ts.map +1 -1
- package/dist/orchestration/builders/MissionBuilder.js +6 -3
- package/dist/orchestration/builders/MissionBuilder.js.map +1 -1
- package/dist/orchestration/builders/WorkflowBuilder.d.ts +39 -1
- package/dist/orchestration/builders/WorkflowBuilder.d.ts.map +1 -1
- package/dist/orchestration/builders/WorkflowBuilder.js +18 -3
- package/dist/orchestration/builders/WorkflowBuilder.js.map +1 -1
- package/dist/orchestration/ir/types.d.ts +13 -0
- package/dist/orchestration/ir/types.d.ts.map +1 -1
- package/dist/orchestration/runtime/GraphRuntime.d.ts.map +1 -1
- package/dist/orchestration/runtime/GraphRuntime.js +34 -1
- package/dist/orchestration/runtime/GraphRuntime.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"graph.js","sourceRoot":"","sources":["../../../../src/api/runtime/strategies/graph.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,OAAO,EAAE,KAAK,IAAI,WAAW,EAAE,MAAM,aAAa,CAAC;AASnD,OAAO,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,
|
|
1
|
+
{"version":3,"file":"graph.js","sourceRoot":"","sources":["../../../../src/api/runtime/strategies/graph.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hierarchical.d.ts","sourceRoot":"","sources":["../../../../src/api/runtime/strategies/hierarchical.ts"],"names":[],"mappings":"AA+BA,OAAO,KAAK,EACV,aAAa,EACb,gBAAgB,EAChB,KAAK,EACL,eAAe,EAEhB,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"hierarchical.d.ts","sourceRoot":"","sources":["../../../../src/api/runtime/strategies/hierarchical.ts"],"names":[],"mappings":"AA+BA,OAAO,KAAK,EACV,aAAa,EACb,gBAAgB,EAChB,KAAK,EACL,eAAe,EAEhB,MAAM,aAAa,CAAC;AA6CrB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,GAAG,KAAK,CAAC,EAC/C,YAAY,EAAE,aAAa,GAC1B,gBAAgB,CAwJlB"}
|
|
@@ -30,7 +30,7 @@
|
|
|
30
30
|
import { agent as createAgent } from '../agent.js';
|
|
31
31
|
import { mergeAdaptableTools } from '../toolAdapter.js';
|
|
32
32
|
import { AgencyConfigError } from '../types.js';
|
|
33
|
-
import { isAgent, resolveAgent, checkBeforeAgent } from './shared.js';
|
|
33
|
+
import { isAgent, resolveAgent, checkBeforeAgent, accumulateExtraUsage, buildAgentCallUsage, } from './shared.js';
|
|
34
34
|
/**
|
|
35
35
|
* Extracts a human-readable description from an agent config or instance.
|
|
36
36
|
*
|
|
@@ -84,6 +84,14 @@ export function compileHierarchical(agents, agencyConfig) {
|
|
|
84
84
|
return {
|
|
85
85
|
async execute(prompt, opts) {
|
|
86
86
|
const agentCalls = [];
|
|
87
|
+
// Sub-agents called via delegation tools have their own LLM usage.
|
|
88
|
+
// We accumulate it here so the strategy-level usage reflects the
|
|
89
|
+
// FULL cost of the run — manager turns plus every sub-agent turn.
|
|
90
|
+
const subAgentUsage = {
|
|
91
|
+
promptTokens: 0,
|
|
92
|
+
completionTokens: 0,
|
|
93
|
+
totalTokens: 0,
|
|
94
|
+
};
|
|
87
95
|
// Build one tool per sub-agent for the manager to delegate to.
|
|
88
96
|
// The tool name follows the `delegate_to_<name>` convention so the
|
|
89
97
|
// manager can infer the agent's role from the tool name alone.
|
|
@@ -122,13 +130,15 @@ export function compileHierarchical(agents, agencyConfig) {
|
|
|
122
130
|
input: args.task,
|
|
123
131
|
output: resultText,
|
|
124
132
|
toolCalls: resultToolCalls,
|
|
125
|
-
usage:
|
|
126
|
-
promptTokens: resultUsage.promptTokens ?? 0,
|
|
127
|
-
completionTokens: resultUsage.completionTokens ?? 0,
|
|
128
|
-
totalTokens: resultUsage.totalTokens ?? 0,
|
|
129
|
-
},
|
|
133
|
+
usage: buildAgentCallUsage(resultUsage),
|
|
130
134
|
durationMs,
|
|
131
135
|
});
|
|
136
|
+
// Accumulate sub-agent usage so the strategy-level total
|
|
137
|
+
// includes every delegated turn, not just the manager's.
|
|
138
|
+
subAgentUsage.promptTokens += resultUsage.promptTokens ?? 0;
|
|
139
|
+
subAgentUsage.completionTokens += resultUsage.completionTokens ?? 0;
|
|
140
|
+
subAgentUsage.totalTokens += resultUsage.totalTokens ?? 0;
|
|
141
|
+
accumulateExtraUsage(subAgentUsage, resultUsage);
|
|
132
142
|
return { success: true, data: resultText };
|
|
133
143
|
},
|
|
134
144
|
};
|
|
@@ -157,7 +167,17 @@ export function compileHierarchical(agents, agencyConfig) {
|
|
|
157
167
|
maxSteps: agencyConfig.maxSteps ?? 10,
|
|
158
168
|
});
|
|
159
169
|
const result = (await manager.generate(prompt, opts));
|
|
160
|
-
|
|
170
|
+
// Merge manager usage with the accumulated sub-agent usage so the
|
|
171
|
+
// returned `usage` reflects the entire run (manager + delegates).
|
|
172
|
+
const managerUsage = result.usage ?? {};
|
|
173
|
+
const totalUsage = {
|
|
174
|
+
promptTokens: (managerUsage.promptTokens ?? 0) + subAgentUsage.promptTokens,
|
|
175
|
+
completionTokens: (managerUsage.completionTokens ?? 0) + subAgentUsage.completionTokens,
|
|
176
|
+
totalTokens: (managerUsage.totalTokens ?? 0) + subAgentUsage.totalTokens,
|
|
177
|
+
};
|
|
178
|
+
accumulateExtraUsage(totalUsage, managerUsage);
|
|
179
|
+
accumulateExtraUsage(totalUsage, subAgentUsage);
|
|
180
|
+
return { ...result, agentCalls, usage: totalUsage };
|
|
161
181
|
},
|
|
162
182
|
stream(prompt, opts) {
|
|
163
183
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hierarchical.js","sourceRoot":"","sources":["../../../../src/api/runtime/strategies/hierarchical.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,OAAO,EAAE,KAAK,IAAI,WAAW,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AASxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,
|
|
1
|
+
{"version":3,"file":"hierarchical.js","sourceRoot":"","sources":["../../../../src/api/runtime/strategies/hierarchical.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parallel.d.ts","sourceRoot":"","sources":["../../../../src/api/runtime/strategies/parallel.ts"],"names":[],"mappings":"AA2BA,OAAO,KAAK,EACV,aAAa,EACb,gBAAgB,EAChB,KAAK,EACL,eAAe,EAEhB,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"parallel.d.ts","sourceRoot":"","sources":["../../../../src/api/runtime/strategies/parallel.ts"],"names":[],"mappings":"AA2BA,OAAO,KAAK,EACV,aAAa,EACb,gBAAgB,EAChB,KAAK,EACL,eAAe,EAEhB,MAAM,aAAa,CAAC;AA4BrB;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,GAAG,KAAK,CAAC,EAC/C,YAAY,EAAE,aAAa,GAC1B,gBAAgB,CAgJlB"}
|
|
@@ -26,7 +26,7 @@
|
|
|
26
26
|
*/
|
|
27
27
|
import { agent as createAgent } from '../agent.js';
|
|
28
28
|
import { AgencyConfigError } from '../types.js';
|
|
29
|
-
import { isAgent, mergeDefaults, checkBeforeAgent,
|
|
29
|
+
import { isAgent, mergeDefaults, checkBeforeAgent, accumulateExtraUsage, buildAgentCallUsage, } from './shared.js';
|
|
30
30
|
/**
|
|
31
31
|
* Compiles a parallel execution strategy.
|
|
32
32
|
*
|
|
@@ -114,17 +114,13 @@ export function compileParallel(agents, agencyConfig) {
|
|
|
114
114
|
input: prompt,
|
|
115
115
|
output: result.text ?? '',
|
|
116
116
|
toolCalls: resultToolCalls,
|
|
117
|
-
usage:
|
|
118
|
-
promptTokens: resultUsage.promptTokens ?? 0,
|
|
119
|
-
completionTokens: resultUsage.completionTokens ?? 0,
|
|
120
|
-
totalTokens: resultUsage.totalTokens ?? 0,
|
|
121
|
-
},
|
|
117
|
+
usage: buildAgentCallUsage(resultUsage),
|
|
122
118
|
durationMs,
|
|
123
119
|
});
|
|
124
120
|
totalUsage.promptTokens += resultUsage.promptTokens ?? 0;
|
|
125
121
|
totalUsage.completionTokens += resultUsage.completionTokens ?? 0;
|
|
126
122
|
totalUsage.totalTokens += resultUsage.totalTokens ?? 0;
|
|
127
|
-
|
|
123
|
+
accumulateExtraUsage(totalUsage, resultUsage);
|
|
128
124
|
}
|
|
129
125
|
// Synthesize outputs using the agency-level model.
|
|
130
126
|
// Each agent's output is labeled with its name so the synthesizer
|
|
@@ -152,7 +148,7 @@ export function compileParallel(agents, agencyConfig) {
|
|
|
152
148
|
totalUsage.promptTokens += synthUsage.promptTokens ?? 0;
|
|
153
149
|
totalUsage.completionTokens += synthUsage.completionTokens ?? 0;
|
|
154
150
|
totalUsage.totalTokens += synthUsage.totalTokens ?? 0;
|
|
155
|
-
|
|
151
|
+
accumulateExtraUsage(totalUsage, synthUsage);
|
|
156
152
|
return { ...synthesis, agentCalls, usage: totalUsage };
|
|
157
153
|
},
|
|
158
154
|
stream(prompt, opts) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parallel.js","sourceRoot":"","sources":["../../../../src/api/runtime/strategies/parallel.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,OAAO,EAAE,KAAK,IAAI,WAAW,EAAE,MAAM,aAAa,CAAC;AAQnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,
|
|
1
|
+
{"version":3,"file":"parallel.js","sourceRoot":"","sources":["../../../../src/api/runtime/strategies/parallel.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,OAAO,EAAE,KAAK,IAAI,WAAW,EAAE,MAAM,aAAa,CAAC;AAQnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EACL,OAAO,EACP,aAAa,EACb,gBAAgB,EAChB,oBAAoB,EACpB,mBAAmB,GACpB,MAAM,aAAa,CAAC;AAoBrB;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,MAAM,UAAU,eAAe,CAC7B,MAA+C,EAC/C,YAA2B;IAE3B,IAAI,CAAC,YAAY,CAAC,KAAK,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC;QAClD,MAAM,IAAI,iBAAiB,CACzB,oFAAoF,CACrF,CAAC;IACJ,CAAC;IAED,OAAO;QACL,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI;YACxB,2DAA2D;YAC3D,kEAAkE;YAClE,sDAAsD;YACtD,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YACvC,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,UAAU,CACzC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,aAAa,CAAC,EAAE,EAAE;gBAC1C,2DAA2D;gBAC3D,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,YAAY,CAAC,CAAC;gBACxE,IAAI,QAAQ,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;oBACnC,8CAA8C;oBAC9C,OAAO,IAAI,CAAC;gBACd,CAAC;gBAED,MAAM,CAAC,GAAU,OAAO,CAAC,aAAa,CAAC;oBACrC,CAAC,CAAC,aAAa;oBACf,CAAC,CAAC,WAAW,CAAC,EAAE,GAAG,aAAa,CAAC,aAAa,EAAE,YAAY,CAAC,EAAE,CAAC,CAAC;gBAEnE,qEAAqE;gBACrE,MAAM,eAAe,GAAG,QAAQ,EAAE,aAAa,EAAE,YAAY;oBAC3D,CAAC,CAAC,GAAG,MAAM,kCAAkC,QAAQ,CAAC,aAAa,CAAC,YAAY,EAAE;oBAClF,CAAC,CAAC,MAAM,CAAC;gBAEX,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;gBACzB,MAAM,MAAM,GAAG,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,eAAe,EAAE,IAAI,CAAC,CAA4B,CAAC;gBACpF,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC;gBACtC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC;YACtC,CAAC,CAAC,CACH,CAAC;YAEF,mEAAmE;YACnE,qEAAqE;YACrE,0DAA0D;YAC1D,MAAM,OAAO,GAAiF,EAAE,CAAC;YACjG,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC3C,MAAM,OAAO,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;gBAC9B,IAAI,OAAO,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;oBAClC,MAAM,SAAS,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;oBAChC,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,YAAY,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;oBACnG,OAAO,CAAC,KAAK,CAAC,8BAA8B,SAAS,WAAW,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;oBACjF,YAAY,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC;wBACvB,KAAK,EAAE,SAAS;wBAChB,KAAK;wBACL,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;qBACtB,CAAC,CAAC;oBACH,SAAS;gBACX,CAAC;gBACD,4CAA4C;gBAC5C,IAAI,OAAO,CAAC,KAAK,KAAK,IAAI,EAAE,CAAC;oBAC3B,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;gBAC9B,CAAC;YACH,CAAC;YAED,kDAAkD;YAClD,MAAM,UAAU,GAAsB,EAAE,CAAC;YACzC,MAAM,UAAU,GAAuB,EAAE,YAAY,EAAE,CAAC,EAAE,gBAAgB,EAAE,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC;YAEhG,KAAK,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,OAAO,EAAE,CAAC;gBACnD,MAAM,WAAW,GAAI,MAAM,CAAC,KAA6B,IAAI,EAAE,CAAC;gBAChE,MAAM,eAAe,GAAI,MAAM,CAAC,SAAsF,IAAI,EAAE,CAAC;gBAE7H,UAAU,CAAC,IAAI,CAAC;oBACd,KAAK,EAAE,IAAI;oBACX,KAAK,EAAE,MAAM;oBACb,MAAM,EAAG,MAAM,CAAC,IAAe,IAAI,EAAE;oBACrC,SAAS,EAAE,eAAe;oBAC1B,KAAK,EAAE,mBAAmB,CAAC,WAAW,CAAC;oBACvC,UAAU;iBACX,CAAC,CAAC;gBAEH,UAAU,CAAC,YAAY,IAAI,WAAW,CAAC,YAAY,IAAI,CAAC,CAAC;gBACzD,UAAU,CAAC,gBAAgB,IAAI,WAAW,CAAC,gBAAgB,IAAI,CAAC,CAAC;gBACjE,UAAU,CAAC,WAAW,IAAI,WAAW,CAAC,WAAW,IAAI,CAAC,CAAC;gBACvD,oBAAoB,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;YAChD,CAAC;YAED,mDAAmD;YACnD,kEAAkE;YAClE,iDAAiD;YACjD,MAAM,iBAAiB,GAAG,OAAO;iBAC9B,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,OAAO,IAAI,SAAU,MAAM,CAAC,IAAe,IAAI,EAAE,EAAE,CAAC;iBAC9E,IAAI,CAAC,MAAM,CAAC,CAAC;YAEhB,MAAM,iBAAiB,GAAG,YAAY,CAAC,YAAY;gBACjD,CAAC,CAAC,OAAO,YAAY,CAAC,YAAY,EAAE;gBACpC,CAAC,CAAC,EAAE,CAAC;YAEP,MAAM,WAAW,GACf,kDAAkD,MAAM,OAAO;gBAC/D,GAAG,iBAAiB,MAAM;gBAC1B,oDAAoD,iBAAiB,EAAE,CAAC;YAE1E,oEAAoE;YACpE,kEAAkE;YAClE,MAAM,WAAW,GAAG,WAAW,CAAC;gBAC9B,KAAK,EAAE,YAAY,CAAC,KAAK;gBACzB,QAAQ,EAAE,YAAY,CAAC,QAAQ;gBAC/B,MAAM,EAAE,YAAY,CAAC,MAAM;gBAC3B,OAAO,EAAE,YAAY,CAAC,OAAO;gBAC7B,QAAQ,EAAE,CAAC;aACZ,CAAC,CAAC;YAEH,MAAM,SAAS,GAAG,CAAC,MAAM,WAAW,CAAC,QAAQ,CAAC,WAAW,EAAE,IAAI,CAAC,CAAuC,CAAC;YACxG,MAAM,UAAU,GAAI,SAAS,CAAC,KAA6B,IAAI,EAAE,CAAC;YAElE,UAAU,CAAC,YAAY,IAAI,UAAU,CAAC,YAAY,IAAI,CAAC,CAAC;YACxD,UAAU,CAAC,gBAAgB,IAAI,UAAU,CAAC,gBAAgB,IAAI,CAAC,CAAC;YAChE,UAAU,CAAC,WAAW,IAAI,UAAU,CAAC,WAAW,IAAI,CAAC,CAAC;YACtD,oBAAoB,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;YAE7C,OAAO,EAAE,GAAG,SAAS,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC;QACzD,CAAC;QAED,MAAM,CAAC,MAAM,EAAE,IAAI;YACjB;;;;eAIG;YACH,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAqC,CAAC;YACrF,MAAM,WAAW,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAE,CAAC,CAAC,IAAe,IAAI,EAAE,CAAC,CAAC;YAExE,OAAO;gBACL,UAAU,EAAE,CAAC,KAAK,SAAS,CAAC;oBAC1B,MAAM,MAAM,WAAW,CAAC;gBAC1B,CAAC,CAAC,EAAE;gBACJ,UAAU,EAAE,CAAC,KAAK,SAAS,CAAC;oBAC1B,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC;oBAC/B,MAAM,EAAE,IAAI,EAAE,MAAe,EAAE,IAAI,EAAE,CAAC;gBACxC,CAAC,CAAC,EAAE;gBACJ,IAAI,EAAE,WAAW;gBACjB,KAAK,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAA2B,CAAC;gBAC/D,UAAU,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAE,CAAC,CAAC,UAA4C,IAAI,EAAE,CAAC;aAC7F,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -1,3 +1,28 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @file review-loop.ts
|
|
3
|
+
* Review-loop strategy compiler for the Agency API.
|
|
4
|
+
*
|
|
5
|
+
* ## Execution model
|
|
6
|
+
*
|
|
7
|
+
* The first agent (producer) creates or revises work, the second agent
|
|
8
|
+
* (reviewer) evaluates it. The loop continues until the reviewer approves
|
|
9
|
+
* or `maxRounds` is exhausted. Additional agents beyond the first two are
|
|
10
|
+
* reserved for future specialist injection.
|
|
11
|
+
*
|
|
12
|
+
* ## Reviewer response format
|
|
13
|
+
*
|
|
14
|
+
* The reviewer is instructed to respond with JSON:
|
|
15
|
+
* ```json
|
|
16
|
+
* { "approved": true, "feedback": "Looks great!" }
|
|
17
|
+
* ```
|
|
18
|
+
* When the response is not valid JSON or lacks an `approved` boolean, the
|
|
19
|
+
* entire text is treated as rejection feedback and the producer is asked
|
|
20
|
+
* to revise. This graceful fallback ensures the loop always makes progress
|
|
21
|
+
* even when the reviewer doesn't follow the format precisely.
|
|
22
|
+
*
|
|
23
|
+
* @see {@link compileStrategy} -- the dispatcher that selects this compiler.
|
|
24
|
+
* @see {@link compileDebate} -- an alternative iterative strategy for adversarial discourse.
|
|
25
|
+
*/
|
|
1
26
|
import type { AgencyOptions, CompiledStrategy, Agent, BaseAgentConfig } from '../types.js';
|
|
2
27
|
/**
|
|
3
28
|
* Compiles a review-loop execution strategy.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"review-loop.d.ts","sourceRoot":"","sources":["../../../../src/api/runtime/strategies/review-loop.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"review-loop.d.ts","sourceRoot":"","sources":["../../../../src/api/runtime/strategies/review-loop.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,OAAO,KAAK,EACV,aAAa,EACb,gBAAgB,EAChB,KAAK,EACL,eAAe,EAEhB,MAAM,aAAa,CAAC;AA0DrB;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,GAAG,KAAK,CAAC,EAC/C,YAAY,EAAE,aAAa,GAC1B,gBAAgB,CAsIlB"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { AgencyConfigError } from '../types.js';
|
|
2
|
-
import { resolveAgent, checkBeforeAgent,
|
|
2
|
+
import { resolveAgent, checkBeforeAgent, accumulateExtraUsage, buildAgentCallUsage, } from './shared.js';
|
|
3
3
|
/**
|
|
4
4
|
* Attempts to parse a reviewer response as JSON with an `approved` field.
|
|
5
5
|
*
|
|
@@ -104,17 +104,13 @@ export function compileReviewLoop(agents, agencyConfig) {
|
|
|
104
104
|
input: prodPrompt,
|
|
105
105
|
output: prodText,
|
|
106
106
|
toolCalls: prodToolCalls,
|
|
107
|
-
usage:
|
|
108
|
-
promptTokens: prodUsage.promptTokens ?? 0,
|
|
109
|
-
completionTokens: prodUsage.completionTokens ?? 0,
|
|
110
|
-
totalTokens: prodUsage.totalTokens ?? 0,
|
|
111
|
-
},
|
|
107
|
+
usage: buildAgentCallUsage(prodUsage),
|
|
112
108
|
durationMs: prodDuration,
|
|
113
109
|
});
|
|
114
110
|
totalUsage.promptTokens += prodUsage.promptTokens ?? 0;
|
|
115
111
|
totalUsage.completionTokens += prodUsage.completionTokens ?? 0;
|
|
116
112
|
totalUsage.totalTokens += prodUsage.totalTokens ?? 0;
|
|
117
|
-
|
|
113
|
+
accumulateExtraUsage(totalUsage, prodUsage);
|
|
118
114
|
// ---- HITL: check beforeAgent gate for the reviewer ----
|
|
119
115
|
const revDecision = await checkBeforeAgent(reviewerName, prompt, agentCalls, agencyConfig);
|
|
120
116
|
if (revDecision && !revDecision.approved) {
|
|
@@ -136,17 +132,13 @@ export function compileReviewLoop(agents, agencyConfig) {
|
|
|
136
132
|
input: revPrompt,
|
|
137
133
|
output: revText,
|
|
138
134
|
toolCalls: revToolCalls,
|
|
139
|
-
usage:
|
|
140
|
-
promptTokens: revUsage.promptTokens ?? 0,
|
|
141
|
-
completionTokens: revUsage.completionTokens ?? 0,
|
|
142
|
-
totalTokens: revUsage.totalTokens ?? 0,
|
|
143
|
-
},
|
|
135
|
+
usage: buildAgentCallUsage(revUsage),
|
|
144
136
|
durationMs: revDuration,
|
|
145
137
|
});
|
|
146
138
|
totalUsage.promptTokens += revUsage.promptTokens ?? 0;
|
|
147
139
|
totalUsage.completionTokens += revUsage.completionTokens ?? 0;
|
|
148
140
|
totalUsage.totalTokens += revUsage.totalTokens ?? 0;
|
|
149
|
-
|
|
141
|
+
accumulateExtraUsage(totalUsage, revUsage);
|
|
150
142
|
// Parse the review decision. If approved, exit the loop early.
|
|
151
143
|
// If not, capture feedback for the next producer revision.
|
|
152
144
|
const review = parseReview(revText);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"review-loop.js","sourceRoot":"","sources":["../../../../src/api/runtime/strategies/review-loop.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"review-loop.js","sourceRoot":"","sources":["../../../../src/api/runtime/strategies/review-loop.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sequential.d.ts","sourceRoot":"","sources":["../../../../src/api/runtime/strategies/sequential.ts"],"names":[],"mappings":"AAwBA,OAAO,KAAK,EACV,aAAa,EACb,gBAAgB,EAChB,KAAK,EACL,eAAe,
|
|
1
|
+
{"version":3,"file":"sequential.d.ts","sourceRoot":"","sources":["../../../../src/api/runtime/strategies/sequential.ts"],"names":[],"mappings":"AAwBA,OAAO,KAAK,EACV,aAAa,EACb,gBAAgB,EAChB,KAAK,EACL,eAAe,EAGhB,MAAM,aAAa,CAAC;AAmBrB;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,GAAG,KAAK,CAAC,EAC/C,YAAY,EAAE,aAAa,GAC1B,gBAAgB,CA4OlB"}
|
|
@@ -23,7 +23,7 @@
|
|
|
23
23
|
*/
|
|
24
24
|
import { agent as createAgent } from '../agent.js';
|
|
25
25
|
import { createBufferedAsyncReplay } from '../streamBuffer.js';
|
|
26
|
-
import { isAgent, mergeDefaults, checkBeforeAgent,
|
|
26
|
+
import { isAgent, mergeDefaults, checkBeforeAgent, accumulateExtraUsage, buildAgentCallUsage, } from './shared.js';
|
|
27
27
|
/**
|
|
28
28
|
* Compiles a sequential execution strategy.
|
|
29
29
|
*
|
|
@@ -83,17 +83,13 @@ export function compileSequential(agents, agencyConfig) {
|
|
|
83
83
|
input: context,
|
|
84
84
|
output: resultText,
|
|
85
85
|
toolCalls: resultToolCalls,
|
|
86
|
-
usage:
|
|
87
|
-
promptTokens: resultUsage.promptTokens ?? 0,
|
|
88
|
-
completionTokens: resultUsage.completionTokens ?? 0,
|
|
89
|
-
totalTokens: resultUsage.totalTokens ?? 0,
|
|
90
|
-
},
|
|
86
|
+
usage: buildAgentCallUsage(resultUsage),
|
|
91
87
|
durationMs,
|
|
92
88
|
});
|
|
93
89
|
totalUsage.promptTokens += resultUsage.promptTokens ?? 0;
|
|
94
90
|
totalUsage.completionTokens += resultUsage.completionTokens ?? 0;
|
|
95
91
|
totalUsage.totalTokens += resultUsage.totalTokens ?? 0;
|
|
96
|
-
|
|
92
|
+
accumulateExtraUsage(totalUsage, resultUsage);
|
|
97
93
|
// Chain: subsequent agents see the original task plus previous output.
|
|
98
94
|
// This ensures each agent has full context without losing the original prompt.
|
|
99
95
|
context = `Original task: ${prompt}\n\nPrevious agent (${name}) output:\n${resultText}`;
|
|
@@ -141,7 +137,7 @@ export function compileSequential(agents, agencyConfig) {
|
|
|
141
137
|
: createAgent({ ...mergeDefaults(agentOrConfig, agencyConfig) });
|
|
142
138
|
// Delegate to the agent's stream if available, otherwise use generate().
|
|
143
139
|
let agentText = '';
|
|
144
|
-
let resultUsage = {
|
|
140
|
+
let resultUsage = {};
|
|
145
141
|
let resultToolCalls = [];
|
|
146
142
|
try {
|
|
147
143
|
const agentStream = a.stream(effectivePrompt, opts);
|
|
@@ -157,12 +153,7 @@ export function compileSequential(agents, agencyConfig) {
|
|
|
157
153
|
yield { type: 'text', text: agentText, agent: name };
|
|
158
154
|
}
|
|
159
155
|
}
|
|
160
|
-
|
|
161
|
-
resultUsage = {
|
|
162
|
-
promptTokens: streamedUsage.promptTokens ?? 0,
|
|
163
|
-
completionTokens: streamedUsage.completionTokens ?? 0,
|
|
164
|
-
totalTokens: streamedUsage.totalTokens ?? 0,
|
|
165
|
-
};
|
|
156
|
+
resultUsage = (await Promise.resolve(agentStream.usage)) ?? {};
|
|
166
157
|
resultToolCalls = (await Promise.resolve(agentStream.toolCalls)) ?? [];
|
|
167
158
|
}
|
|
168
159
|
else {
|
|
@@ -172,12 +163,7 @@ export function compileSequential(agents, agencyConfig) {
|
|
|
172
163
|
if (agentText) {
|
|
173
164
|
yield { type: 'text', text: agentText, agent: name };
|
|
174
165
|
}
|
|
175
|
-
|
|
176
|
-
resultUsage = {
|
|
177
|
-
promptTokens: generatedUsage.promptTokens ?? 0,
|
|
178
|
-
completionTokens: generatedUsage.completionTokens ?? 0,
|
|
179
|
-
totalTokens: generatedUsage.totalTokens ?? 0,
|
|
180
|
-
};
|
|
166
|
+
resultUsage = result.usage ?? {};
|
|
181
167
|
resultToolCalls = result.toolCalls ?? [];
|
|
182
168
|
}
|
|
183
169
|
agentCalls.push({
|
|
@@ -185,13 +171,13 @@ export function compileSequential(agents, agencyConfig) {
|
|
|
185
171
|
input: currentPrompt,
|
|
186
172
|
output: agentText,
|
|
187
173
|
toolCalls: resultToolCalls,
|
|
188
|
-
usage: resultUsage,
|
|
174
|
+
usage: buildAgentCallUsage(resultUsage),
|
|
189
175
|
durationMs: Date.now() - agentStart,
|
|
190
176
|
});
|
|
191
|
-
totalUsage.promptTokens += resultUsage.promptTokens;
|
|
192
|
-
totalUsage.completionTokens += resultUsage.completionTokens;
|
|
193
|
-
totalUsage.totalTokens += resultUsage.totalTokens;
|
|
194
|
-
|
|
177
|
+
totalUsage.promptTokens += resultUsage.promptTokens ?? 0;
|
|
178
|
+
totalUsage.completionTokens += resultUsage.completionTokens ?? 0;
|
|
179
|
+
totalUsage.totalTokens += resultUsage.totalTokens ?? 0;
|
|
180
|
+
accumulateExtraUsage(totalUsage, resultUsage);
|
|
195
181
|
}
|
|
196
182
|
catch (err) {
|
|
197
183
|
const error = err instanceof Error ? err : new Error(String(err));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sequential.js","sourceRoot":"","sources":["../../../../src/api/runtime/strategies/sequential.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,OAAO,EAAE,KAAK,IAAI,WAAW,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"sequential.js","sourceRoot":"","sources":["../../../../src/api/runtime/strategies/sequential.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,OAAO,EAAE,KAAK,IAAI,WAAW,EAAE,MAAM,aAAa,CAAC;AASnD,OAAO,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,EACL,OAAO,EACP,aAAa,EACb,gBAAgB,EAChB,oBAAoB,EACpB,mBAAmB,GACpB,MAAM,aAAa,CAAC;AAWrB;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAM,UAAU,iBAAiB,CAC/B,MAA+C,EAC/C,YAA2B;IAE3B,OAAO;QACL,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI;YACxB,MAAM,UAAU,GAAsB,EAAE,CAAC;YACzC,IAAI,OAAO,GAAG,MAAM,CAAC;YACrB,IAAI,UAAU,GAAmC,IAAI,CAAC;YACtD,MAAM,UAAU,GAAuB,EAAE,YAAY,EAAE,CAAC,EAAE,gBAAgB,EAAE,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC;YAEhG,KAAK,MAAM,CAAC,IAAI,EAAE,aAAa,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC3D,2DAA2D;gBAC3D,iEAAiE;gBACjE,iCAAiC;gBACjC,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC;gBACjF,IAAI,QAAQ,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;oBACnC,8DAA8D;oBAC9D,qDAAqD;oBACrD,SAAS;gBACX,CAAC;gBAED,MAAM,CAAC,GAAU,OAAO,CAAC,aAAa,CAAC;oBACrC,CAAC,CAAC,aAAa;oBACf,CAAC,CAAC,WAAW,CAAC,EAAE,GAAG,aAAa,CAAC,aAAa,EAAE,YAAY,CAAC,EAAE,CAAC,CAAC;gBAEnE,qEAAqE;gBACrE,oEAAoE;gBACpE,6DAA6D;gBAC7D,MAAM,gBAAgB,GAAG,QAAQ,EAAE,aAAa,EAAE,YAAY;oBAC5D,CAAC,CAAC,GAAG,OAAO,kCAAkC,QAAQ,CAAC,aAAa,CAAC,YAAY,EAAE;oBACnF,CAAC,CAAC,OAAO,CAAC;gBAEZ,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;gBACzB,MAAM,MAAM,GAAG,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAA4B,CAAC;gBACrF,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC;gBAEtC,MAAM,UAAU,GAAI,MAAM,CAAC,IAAe,IAAI,EAAE,CAAC;gBACjD,MAAM,WAAW,GAAI,MAAM,CAAC,KAO1B,IAAI,EAAE,CAAC;gBACT,MAAM,eAAe,GAAI,MAAM,CAAC,SAAsF,IAAI,EAAE,CAAC;gBAE7H,UAAU,CAAC,IAAI,CAAC;oBACd,KAAK,EAAE,IAAI;oBACX,KAAK,EAAE,OAAO;oBACd,MAAM,EAAE,UAAU;oBAClB,SAAS,EAAE,eAAe;oBAC1B,KAAK,EAAE,mBAAmB,CAAC,WAAW,CAAC;oBACvC,UAAU;iBACX,CAAC,CAAC;gBAEH,UAAU,CAAC,YAAY,IAAI,WAAW,CAAC,YAAY,IAAI,CAAC,CAAC;gBACzD,UAAU,CAAC,gBAAgB,IAAI,WAAW,CAAC,gBAAgB,IAAI,CAAC,CAAC;gBACjE,UAAU,CAAC,WAAW,IAAI,WAAW,CAAC,WAAW,IAAI,CAAC,CAAC;gBACvD,oBAAoB,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;gBAE9C,uEAAuE;gBACvE,+EAA+E;gBAC/E,OAAO,GAAG,kBAAkB,MAAM,uBAAuB,IAAI,cAAc,UAAU,EAAE,CAAC;gBACxF,UAAU,GAAG,MAAM,CAAC;YACtB,CAAC;YAED,OAAO,EAAE,GAAG,UAAU,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC;QAC1D,CAAC;QAED,MAAM,CAAC,MAAM,EAAE,IAAI;YACjB;;;;;;;;;;;eAWG;YACH,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAC3B,MAAM,UAAU,GAAuB,EAAE,YAAY,EAAE,CAAC,EAAE,gBAAgB,EAAE,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC;YAChG,MAAM,UAAU,GAAsB,EAAE,CAAC;YAEzC;;;eAGG;YACH,KAAK,SAAS,CAAC,CAAC,eAAe;gBAC7B,IAAI,aAAa,GAAG,MAAM,CAAC;gBAC3B,IAAI,SAAS,GAAG,EAAE,CAAC;gBAEnB,MAAM,EAAE,IAAI,EAAE,aAAsB,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;gBAE3E,KAAK,MAAM,CAAC,IAAI,EAAE,aAAa,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;oBAC3D,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,IAAI,EAAE,aAAa,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC;oBACvF,IAAI,QAAQ,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;wBACnC,SAAS;oBACX,CAAC;oBAED,MAAM,eAAe,GAAG,QAAQ,EAAE,aAAa,EAAE,YAAY;wBAC3D,CAAC,CAAC,GAAG,aAAa,kCAAkC,QAAQ,CAAC,aAAa,CAAC,YAAY,EAAE;wBACzF,CAAC,CAAC,aAAa,CAAC;oBAClB,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;oBAE9B,MAAM,EAAE,IAAI,EAAE,aAAsB,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,eAAe,EAAE,CAAC;oBAE5E,sDAAsD;oBACtD,MAAM,CAAC,GAAU,OAAO,CAAC,aAAa,CAAC;wBACrC,CAAC,CAAC,aAAa;wBACf,CAAC,CAAC,WAAW,CAAC,EAAE,GAAG,aAAa,CAAC,aAAgC,EAAE,YAAY,CAAC,EAAE,CAAC,CAAC;oBAEtF,yEAAyE;oBACzE,IAAI,SAAS,GAAG,EAAE,CAAC;oBACnB,IAAI,WAAW,GAOX,EAAE,CAAC;oBACP,IAAI,eAAe,GAA6E,EAAE,CAAC;oBACnG,IAAI,CAAC;wBACH,MAAM,WAAW,GAAG,CAAC,CAAC,MAAM,CAAC,eAAe,EAAE,IAAI,CAY1C,CAAC;wBAET,IAAI,WAAW,EAAE,UAAU,EAAE,CAAC;4BAC5B,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,WAAW,CAAC,UAAU,EAAE,CAAC;gCACjD,MAAM,EAAE,IAAI,EAAE,MAAe,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;gCAC1D,SAAS,IAAI,KAAK,CAAC;4BACrB,CAAC;4BACD,mEAAmE;4BACnE,IAAI,CAAC,SAAS,IAAI,WAAW,CAAC,IAAI,EAAE,CAAC;gCACnC,SAAS,GAAG,MAAM,WAAW,CAAC,IAAI,CAAC;gCACnC,IAAI,SAAS,EAAE,CAAC;oCACd,MAAM,EAAE,IAAI,EAAE,MAAe,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;gCAChE,CAAC;4BACH,CAAC;4BACD,WAAW,GAAG,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC;4BAC/D,eAAe,GAAG,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,CAAC;wBACzE,CAAC;6BAAM,CAAC;4BACN,2CAA2C;4BAC3C,MAAM,MAAM,GAAG,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,eAAe,EAAE,IAAI,CAAC,CAA4B,CAAC;4BACpF,SAAS,GAAI,MAAM,CAAC,IAAe,IAAI,EAAE,CAAC;4BAC1C,IAAI,SAAS,EAAE,CAAC;gCACd,MAAM,EAAE,IAAI,EAAE,MAAe,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;4BAChE,CAAC;4BACD,WAAW,GAAI,MAAM,CAAC,KAA4B,IAAI,EAAE,CAAC;4BACzD,eAAe,GAAI,MAAM,CAAC,SAAsF,IAAI,EAAE,CAAC;wBACzH,CAAC;wBAED,UAAU,CAAC,IAAI,CAAC;4BACd,KAAK,EAAE,IAAI;4BACX,KAAK,EAAE,aAAa;4BACpB,MAAM,EAAE,SAAS;4BACjB,SAAS,EAAE,eAAe;4BAC1B,KAAK,EAAE,mBAAmB,CAAC,WAAW,CAAC;4BACvC,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,UAAU;yBACpC,CAAC,CAAC;wBAEH,UAAU,CAAC,YAAY,IAAI,WAAW,CAAC,YAAY,IAAI,CAAC,CAAC;wBACzD,UAAU,CAAC,gBAAgB,IAAI,WAAW,CAAC,gBAAgB,IAAI,CAAC,CAAC;wBACjE,UAAU,CAAC,WAAW,IAAI,WAAW,CAAC,WAAW,IAAI,CAAC,CAAC;wBACvD,oBAAoB,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;oBAChD,CAAC;oBAAC,OAAO,GAAG,EAAE,CAAC;wBACb,MAAM,KAAK,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;wBAClE,MAAM,EAAE,IAAI,EAAE,OAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;oBACvD,CAAC;oBAED,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,UAAU,CAAC;oBAC3C,MAAM,EAAE,IAAI,EAAE,WAAoB,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,CAAC;oBAEjF,SAAS,GAAG,SAAS,CAAC;oBACtB,aAAa,GAAG,kBAAkB,MAAM,uBAAuB,IAAI,cAAc,SAAS,EAAE,CAAC;gBAC/F,CAAC;gBAED,MAAM,eAAe,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC;gBAC7C,MAAM;oBACJ,IAAI,EAAE,WAAoB;oBAC1B,KAAK,EAAE,YAAY;oBACnB,MAAM,EAAE,SAAS;oBACjB,UAAU,EAAE,eAAe;iBAC5B,CAAC;YACJ,CAAC;YAED;;;;eAIG;YACH,MAAM,MAAM,GAAG,yBAAyB,CAAC,eAAe,EAAE,CAAC,CAAC;YAE5D,iDAAiD;YACjD,MAAM,WAAW,GAAoB,MAAM,CAAC,cAAc,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CACrE,MAAM;iBACH,WAAW,EAAE;iBACb,MAAM,CAAC,CAAC,CAAC,EAAuD,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC;iBACrF,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;iBAClB,IAAI,CAAC,EAAE,CAAC,CACZ,CAAC;YAEF,MAAM,YAAY,GAChB,MAAM,CAAC,cAAc,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,UAAU,EAAE,CAAC,CAAC,CAAC;YAE1D,MAAM,iBAAiB,GACrB,MAAM,CAAC,cAAc,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC;YAEtD,OAAO;gBACL,UAAU,EAAE,CAAC,KAAK,SAAS,CAAC;oBAC1B,IAAI,KAAK,EAAE,MAAM,IAAI,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;wBACzC,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;4BACzB,MAAM,IAAI,CAAC,IAAI,CAAC;wBAClB,CAAC;oBACH,CAAC;gBACH,CAAC,CAAC,EAAE;gBACJ,UAAU,EAAE,MAAM,CAAC,QAAQ;gBAC3B,IAAI,EAAE,WAAW;gBACjB,KAAK,EAAE,YAAY;gBACnB,UAAU,EAAE,iBAAiB;gBAC7B,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;aAC/B,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -23,34 +23,71 @@ import type { AgencyOptions, Agent, BaseAgentConfig, AgentCallRecord, ApprovalDe
|
|
|
23
23
|
*/
|
|
24
24
|
export declare function isAgent(value: BaseAgentConfig | Agent): value is Agent;
|
|
25
25
|
/**
|
|
26
|
-
* Accumulate
|
|
27
|
-
*
|
|
28
|
-
*
|
|
29
|
-
*
|
|
30
|
-
*
|
|
31
|
-
*
|
|
26
|
+
* Accumulate the optional usage fields (cost + Anthropic prompt-cache
|
|
27
|
+
* tokens) from a per-call usage snapshot onto a running strategy-level
|
|
28
|
+
* totalUsage. Fills in the fields the existing accumulators
|
|
29
|
+
* (promptTokens / completionTokens / totalTokens) already handle — keeping
|
|
30
|
+
* cost and cache metrics undefined on the accumulator until at least one
|
|
31
|
+
* call reports a value, so callers can distinguish "provider does not
|
|
32
|
+
* report cost/cache" (undefined) from "zero" (0).
|
|
32
33
|
*
|
|
33
34
|
* Safe to call against any usage shape: missing fields are skipped
|
|
34
35
|
* without throwing, and numeric zero values are still counted.
|
|
35
36
|
*
|
|
36
37
|
* @param totalUsage - The strategy's running usage accumulator. Mutated
|
|
37
|
-
* in place to add cacheReadTokens / cacheCreationTokens
|
|
38
|
+
* in place to add costUSD / cacheReadTokens / cacheCreationTokens when
|
|
39
|
+
* the per-call snapshot reports them.
|
|
38
40
|
* @param call - The per-call usage snapshot (typically from an Agent
|
|
39
41
|
* result or generateText-style TokenUsage). May be undefined.
|
|
40
42
|
*/
|
|
41
|
-
export declare function
|
|
43
|
+
export declare function accumulateExtraUsage(totalUsage: {
|
|
42
44
|
promptTokens: number;
|
|
43
45
|
completionTokens: number;
|
|
44
46
|
totalTokens: number;
|
|
47
|
+
costUSD?: number;
|
|
45
48
|
cacheReadTokens?: number;
|
|
46
49
|
cacheCreationTokens?: number;
|
|
47
50
|
}, call: {
|
|
48
51
|
promptTokens?: number;
|
|
49
52
|
completionTokens?: number;
|
|
50
53
|
totalTokens?: number;
|
|
54
|
+
costUSD?: number;
|
|
51
55
|
cacheReadTokens?: number;
|
|
52
56
|
cacheCreationTokens?: number;
|
|
53
57
|
} | undefined): void;
|
|
58
|
+
/**
|
|
59
|
+
* Back-compat alias for {@link accumulateExtraUsage}.
|
|
60
|
+
*
|
|
61
|
+
* @deprecated Use {@link accumulateExtraUsage}, which also forwards the
|
|
62
|
+
* per-call `costUSD` field.
|
|
63
|
+
*/
|
|
64
|
+
export declare const accumulateCacheTokens: typeof accumulateExtraUsage;
|
|
65
|
+
/**
|
|
66
|
+
* Build the per-call usage record stored on `AgentCallRecord.usage`,
|
|
67
|
+
* forwarding the optional `costUSD` and prompt-cache token fields when
|
|
68
|
+
* the per-call usage reports them. Mirrors how providers expose extra
|
|
69
|
+
* usage metadata so multi-agent runs preserve cost + cache visibility
|
|
70
|
+
* down to the individual agent invocation.
|
|
71
|
+
*
|
|
72
|
+
* @param resultUsage - Per-call usage snapshot from an Agent result.
|
|
73
|
+
* May be undefined.
|
|
74
|
+
* @returns A normalised usage record suitable for {@link AgentCallRecord}.
|
|
75
|
+
*/
|
|
76
|
+
export declare function buildAgentCallUsage(resultUsage: {
|
|
77
|
+
promptTokens?: number;
|
|
78
|
+
completionTokens?: number;
|
|
79
|
+
totalTokens?: number;
|
|
80
|
+
costUSD?: number;
|
|
81
|
+
cacheReadTokens?: number;
|
|
82
|
+
cacheCreationTokens?: number;
|
|
83
|
+
} | undefined): {
|
|
84
|
+
promptTokens: number;
|
|
85
|
+
completionTokens: number;
|
|
86
|
+
totalTokens: number;
|
|
87
|
+
costUSD?: number;
|
|
88
|
+
cacheReadTokens?: number;
|
|
89
|
+
cacheCreationTokens?: number;
|
|
90
|
+
};
|
|
54
91
|
/**
|
|
55
92
|
* Merge agency-level defaults into an agent config.
|
|
56
93
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../../../src/api/runtime/strategies/shared.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EACV,aAAa,EACb,KAAK,EACL,eAAe,EACf,eAAe,EAEf,gBAAgB,EACjB,MAAM,aAAa,CAAC;AAErB;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,OAAO,CAAC,KAAK,EAAE,eAAe,GAAG,KAAK,GAAG,KAAK,IAAI,KAAK,CAEtE;AAED
|
|
1
|
+
{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../../../src/api/runtime/strategies/shared.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EACV,aAAa,EACb,KAAK,EACL,eAAe,EACf,eAAe,EAEf,gBAAgB,EACjB,MAAM,aAAa,CAAC;AAErB;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,OAAO,CAAC,KAAK,EAAE,eAAe,GAAG,KAAK,GAAG,KAAK,IAAI,KAAK,CAEtE;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,oBAAoB,CAClC,UAAU,EAAE;IACV,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B,EACD,IAAI,EACA;IACE,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B,GACD,SAAS,GACZ,IAAI,CAWN;AAED;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB,6BAAuB,CAAC;AAE1D;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CACjC,WAAW,EACP;IACE,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B,GACD,SAAS,GACZ;IACD,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B,CAoBA;AAED;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAgB,aAAa,CAC3B,WAAW,EAAE,eAAe,EAC5B,YAAY,EAAE,aAAa,GAC1B,eAAe,CAcjB;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,YAAY,CAC1B,aAAa,EAAE,eAAe,GAAG,KAAK,EACtC,YAAY,EAAE,aAAa,GAC1B,KAAK,CAIP;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,eAAe,EAAE,EAC7B,YAAY,EAAE,aAAa,GAC1B,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC,CA2DlC"}
|
|
@@ -38,24 +38,29 @@ export function isAgent(value) {
|
|
|
38
38
|
return typeof value.generate === 'function';
|
|
39
39
|
}
|
|
40
40
|
/**
|
|
41
|
-
* Accumulate
|
|
42
|
-
*
|
|
43
|
-
*
|
|
44
|
-
*
|
|
45
|
-
*
|
|
46
|
-
*
|
|
41
|
+
* Accumulate the optional usage fields (cost + Anthropic prompt-cache
|
|
42
|
+
* tokens) from a per-call usage snapshot onto a running strategy-level
|
|
43
|
+
* totalUsage. Fills in the fields the existing accumulators
|
|
44
|
+
* (promptTokens / completionTokens / totalTokens) already handle — keeping
|
|
45
|
+
* cost and cache metrics undefined on the accumulator until at least one
|
|
46
|
+
* call reports a value, so callers can distinguish "provider does not
|
|
47
|
+
* report cost/cache" (undefined) from "zero" (0).
|
|
47
48
|
*
|
|
48
49
|
* Safe to call against any usage shape: missing fields are skipped
|
|
49
50
|
* without throwing, and numeric zero values are still counted.
|
|
50
51
|
*
|
|
51
52
|
* @param totalUsage - The strategy's running usage accumulator. Mutated
|
|
52
|
-
* in place to add cacheReadTokens / cacheCreationTokens
|
|
53
|
+
* in place to add costUSD / cacheReadTokens / cacheCreationTokens when
|
|
54
|
+
* the per-call snapshot reports them.
|
|
53
55
|
* @param call - The per-call usage snapshot (typically from an Agent
|
|
54
56
|
* result or generateText-style TokenUsage). May be undefined.
|
|
55
57
|
*/
|
|
56
|
-
export function
|
|
58
|
+
export function accumulateExtraUsage(totalUsage, call) {
|
|
57
59
|
if (!call)
|
|
58
60
|
return;
|
|
61
|
+
if (typeof call.costUSD === 'number') {
|
|
62
|
+
totalUsage.costUSD = (totalUsage.costUSD ?? 0) + call.costUSD;
|
|
63
|
+
}
|
|
59
64
|
if (typeof call.cacheReadTokens === 'number') {
|
|
60
65
|
totalUsage.cacheReadTokens = (totalUsage.cacheReadTokens ?? 0) + call.cacheReadTokens;
|
|
61
66
|
}
|
|
@@ -63,6 +68,40 @@ export function accumulateCacheTokens(totalUsage, call) {
|
|
|
63
68
|
totalUsage.cacheCreationTokens = (totalUsage.cacheCreationTokens ?? 0) + call.cacheCreationTokens;
|
|
64
69
|
}
|
|
65
70
|
}
|
|
71
|
+
/**
|
|
72
|
+
* Back-compat alias for {@link accumulateExtraUsage}.
|
|
73
|
+
*
|
|
74
|
+
* @deprecated Use {@link accumulateExtraUsage}, which also forwards the
|
|
75
|
+
* per-call `costUSD` field.
|
|
76
|
+
*/
|
|
77
|
+
export const accumulateCacheTokens = accumulateExtraUsage;
|
|
78
|
+
/**
|
|
79
|
+
* Build the per-call usage record stored on `AgentCallRecord.usage`,
|
|
80
|
+
* forwarding the optional `costUSD` and prompt-cache token fields when
|
|
81
|
+
* the per-call usage reports them. Mirrors how providers expose extra
|
|
82
|
+
* usage metadata so multi-agent runs preserve cost + cache visibility
|
|
83
|
+
* down to the individual agent invocation.
|
|
84
|
+
*
|
|
85
|
+
* @param resultUsage - Per-call usage snapshot from an Agent result.
|
|
86
|
+
* May be undefined.
|
|
87
|
+
* @returns A normalised usage record suitable for {@link AgentCallRecord}.
|
|
88
|
+
*/
|
|
89
|
+
export function buildAgentCallUsage(resultUsage) {
|
|
90
|
+
const usage = resultUsage ?? {};
|
|
91
|
+
const out = {
|
|
92
|
+
promptTokens: usage.promptTokens ?? 0,
|
|
93
|
+
completionTokens: usage.completionTokens ?? 0,
|
|
94
|
+
totalTokens: usage.totalTokens ?? 0,
|
|
95
|
+
};
|
|
96
|
+
if (typeof usage.costUSD === 'number')
|
|
97
|
+
out.costUSD = usage.costUSD;
|
|
98
|
+
if (typeof usage.cacheReadTokens === 'number')
|
|
99
|
+
out.cacheReadTokens = usage.cacheReadTokens;
|
|
100
|
+
if (typeof usage.cacheCreationTokens === 'number') {
|
|
101
|
+
out.cacheCreationTokens = usage.cacheCreationTokens;
|
|
102
|
+
}
|
|
103
|
+
return out;
|
|
104
|
+
}
|
|
66
105
|
/**
|
|
67
106
|
* Merge agency-level defaults into an agent config.
|
|
68
107
|
*
|