@nexus-cortex/core 4.124.38 → 4.124.40
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/.env.defaults +31 -6
- package/dist/config/effectiveConfig.d.ts.map +1 -1
- package/dist/config/effectiveConfig.js +2 -0
- package/dist/config/effectiveConfig.js.map +1 -1
- package/dist/middleware/HelperModelMiddleware.js +1 -1
- package/dist/middleware/HelperModelMiddleware.js.map +1 -1
- package/dist/orchestrator/CortexOrchestrator.d.ts +7 -0
- package/dist/orchestrator/CortexOrchestrator.d.ts.map +1 -1
- package/dist/orchestrator/CortexOrchestrator.js +37 -2
- package/dist/orchestrator/CortexOrchestrator.js.map +1 -1
- package/dist/orchestrator/SubAgentTypes.d.ts +2 -0
- package/dist/orchestrator/SubAgentTypes.d.ts.map +1 -1
- package/dist/orchestrator/pid1Guard.d.ts +35 -0
- package/dist/orchestrator/pid1Guard.d.ts.map +1 -0
- package/dist/orchestrator/pid1Guard.js +101 -0
- package/dist/orchestrator/pid1Guard.js.map +1 -0
- package/dist/training/DecisionStore.d.ts +1 -1
- package/dist/training/DecisionStore.d.ts.map +1 -1
- package/dist/training/DecisionStore.js.map +1 -1
- package/dist/training/endTurnResolver.d.ts +8 -1
- package/dist/training/endTurnResolver.d.ts.map +1 -1
- package/dist/training/endTurnResolver.js +10 -3
- package/dist/training/endTurnResolver.js.map +1 -1
- package/dist/training/usageAccounting.d.ts +17 -0
- package/dist/training/usageAccounting.d.ts.map +1 -1
- package/dist/training/usageAccounting.js +21 -2
- package/dist/training/usageAccounting.js.map +1 -1
- package/package.json +3 -3
|
@@ -1,5 +1,22 @@
|
|
|
1
1
|
export function emptySessionUsage() {
|
|
2
|
-
return { requests: 0, inputTokens: 0, outputTokens: 0, cacheReadTokens: 0, cacheCreationTokens: 0, uncachedInputTokens: 0, reasoningTokens: 0, helper: { calls: 0, inputTokensEst: 0, outputTokensEst: 0, bySurface: {} } };
|
|
2
|
+
return { requests: 0, inputTokens: 0, outputTokens: 0, cacheReadTokens: 0, cacheCreationTokens: 0, uncachedInputTokens: 0, reasoningTokens: 0, helper: { calls: 0, inputTokensEst: 0, outputTokensEst: 0, bySurface: {} }, subagents: { calls: 0, requests: 0, inputTokens: 0, outputTokens: 0, cacheReadTokens: 0, uncachedInputTokens: 0, reasoningTokens: 0, helperInputTokensEst: 0, helperOutputTokensEst: 0 } };
|
|
3
|
+
}
|
|
4
|
+
/** Fold one finished sub-agent's own session ledger into the parent's: its exact main usage into the totals AND the subagents breakdown,
|
|
5
|
+
* its helper estimates into the breakdown only. Missing / malformed child usage → the call is still counted (calls + 1). Pure. */
|
|
6
|
+
export function addSubagentUsage(acc, child) {
|
|
7
|
+
const sa = acc.subagents ?? emptySessionUsage().subagents;
|
|
8
|
+
const n = (v) => (typeof v === 'number' && Number.isFinite(v) && v > 0 ? v : 0);
|
|
9
|
+
const c = child ?? {};
|
|
10
|
+
const req = n(c.requests), inp = n(c.inputTokens), out = n(c.outputTokens), cr = n(c.cacheReadTokens), cc = n(c.cacheCreationTokens), un = n(c.uncachedInputTokens), rt = n(c.reasoningTokens);
|
|
11
|
+
const hi = n(c.helper?.inputTokensEst), ho = n(c.helper?.outputTokensEst);
|
|
12
|
+
return {
|
|
13
|
+
...acc,
|
|
14
|
+
requests: acc.requests + req,
|
|
15
|
+
inputTokens: acc.inputTokens + inp, outputTokens: acc.outputTokens + out,
|
|
16
|
+
cacheReadTokens: acc.cacheReadTokens + cr, cacheCreationTokens: acc.cacheCreationTokens + cc, uncachedInputTokens: acc.uncachedInputTokens + un,
|
|
17
|
+
reasoningTokens: acc.reasoningTokens + rt,
|
|
18
|
+
subagents: { calls: sa.calls + 1, requests: sa.requests + req, inputTokens: sa.inputTokens + inp, outputTokens: sa.outputTokens + out, cacheReadTokens: sa.cacheReadTokens + cr, uncachedInputTokens: sa.uncachedInputTokens + un, reasoningTokens: sa.reasoningTokens + rt, helperInputTokensEst: sa.helperInputTokensEst + hi, helperOutputTokensEst: sa.helperOutputTokensEst + ho },
|
|
19
|
+
};
|
|
3
20
|
}
|
|
4
21
|
/** Add one main-model request's provider usage. A usage with no tokens at all (synthesized streaming usage) is ignored. Pure. */
|
|
5
22
|
export function addMainUsage(acc, usage) {
|
|
@@ -30,7 +47,9 @@ export function addHelperEstimate(acc, promptChars, outputChars, surface = 'help
|
|
|
30
47
|
/** Cost of the session at the given per-million prices; helper calls priced at the helper rates when given, else the main rates. Pure. */
|
|
31
48
|
export function usageCost(acc, p) {
|
|
32
49
|
const main = (acc.uncachedInputTokens * p.inputPerM + acc.cacheReadTokens * p.cacheHitPerM + acc.outputTokens * p.outputPerM) / 1e6;
|
|
33
|
-
const
|
|
50
|
+
const hIn = acc.helper.inputTokensEst + (acc.subagents?.helperInputTokensEst ?? 0);
|
|
51
|
+
const hOut = acc.helper.outputTokensEst + (acc.subagents?.helperOutputTokensEst ?? 0);
|
|
52
|
+
const helperEst = (hIn * (p.helperInputPerM ?? p.inputPerM) + hOut * (p.helperOutputPerM ?? p.outputPerM)) / 1e6;
|
|
34
53
|
const denom = acc.cacheReadTokens + acc.uncachedInputTokens;
|
|
35
54
|
return { main, helperEst, total: main + helperEst, cacheHitRate: denom > 0 ? acc.cacheReadTokens / denom : 0 };
|
|
36
55
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"usageAccounting.js","sourceRoot":"","sources":["../../src/training/usageAccounting.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"usageAccounting.js","sourceRoot":"","sources":["../../src/training/usageAccounting.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nexus-cortex/core",
|
|
3
|
-
"version": "4.124.
|
|
3
|
+
"version": "4.124.40",
|
|
4
4
|
"description": "Core orchestration library implementing Claude CLI architecture patterns",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./dist/index.js",
|
|
@@ -47,8 +47,8 @@
|
|
|
47
47
|
"@google/generative-ai": "^0.2.1",
|
|
48
48
|
"@gradio/client": "^2.3.1",
|
|
49
49
|
"@modelcontextprotocol/sdk": "^1.20.2",
|
|
50
|
-
"@nexus-cortex/executors": "4.124.
|
|
51
|
-
"@nexus-cortex/types": "4.124.
|
|
50
|
+
"@nexus-cortex/executors": "4.124.40",
|
|
51
|
+
"@nexus-cortex/types": "4.124.40",
|
|
52
52
|
"@types/uuid": "^10.0.0",
|
|
53
53
|
"ajv": "^8.12.0",
|
|
54
54
|
"chokidar": "^3.6.0",
|