@simonepri/refined-antigravity-acp 1.6.0 → 1.6.1
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/dist/src/fixes/index.js +1 -1
- package/dist/src/fixes/index.js.map +1 -1
- package/dist/src/fixes/missing-usage-metrics/index.d.ts +1 -0
- package/dist/src/fixes/missing-usage-metrics/index.d.ts.map +1 -1
- package/dist/src/fixes/missing-usage-metrics/index.js +6 -2
- package/dist/src/fixes/missing-usage-metrics/index.js.map +1 -1
- package/dist/src/otel/fix.d.ts +9 -0
- package/dist/src/otel/fix.d.ts.map +1 -1
- package/dist/src/otel/fix.js +65 -1
- package/dist/src/otel/fix.js.map +1 -1
- package/dist/src/otel/tracker.d.ts +7 -1
- package/dist/src/otel/tracker.d.ts.map +1 -1
- package/dist/src/otel/tracker.js +87 -67
- package/dist/src/otel/tracker.js.map +1 -1
- package/package.json +1 -1
package/dist/src/fixes/index.js
CHANGED
|
@@ -46,6 +46,7 @@ export * from "../otel/index.js";
|
|
|
46
46
|
*/
|
|
47
47
|
export function createDefaultFixes() {
|
|
48
48
|
return [
|
|
49
|
+
createTelemetryFix(),
|
|
49
50
|
missingLocalharnessFix,
|
|
50
51
|
missingSystemPromptFix,
|
|
51
52
|
missingSlashSkillsFix,
|
|
@@ -65,7 +66,6 @@ export function createDefaultFixes() {
|
|
|
65
66
|
nonCanonicalModeIdsFix,
|
|
66
67
|
missingQuestionFallbackFix,
|
|
67
68
|
prematureTurnStopFix,
|
|
68
|
-
createTelemetryFix(),
|
|
69
69
|
];
|
|
70
70
|
}
|
|
71
71
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/fixes/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAC1E,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,wBAAwB,EAAE,MAAM,oCAAoC,CAAC;AAC9E,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAC1E,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,EAAE,uBAAuB,EAAE,MAAM,mCAAmC,CAAC;AAC5E,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAC3E,OAAO,EAAE,wBAAwB,EAAE,MAAM,oCAAoC,CAAC;AAC9E,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,EAAE,0BAA0B,EAAE,MAAM,sCAAsC,CAAC;AAClF,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,EAAE,wBAAwB,EAAE,MAAM,qCAAqC,CAAC;AAC/E,OAAO,EAAE,wBAAwB,EAAE,MAAM,oCAAoC,CAAC;AAC9E,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAEtD,cAAc,iCAAiC,CAAC;AAChD,cAAc,kCAAkC,CAAC;AACjD,cAAc,iCAAiC,CAAC;AAChD,cAAc,0BAA0B,CAAC;AACzC,cAAc,oCAAoC,CAAC;AACnD,cAAc,kCAAkC,CAAC;AACjD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,iCAAiC,CAAC;AAChD,cAAc,mCAAmC,CAAC;AAClD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,oCAAoC,CAAC;AACnD,cAAc,mCAAmC,CAAC;AAClD,cAAc,oCAAoC,CAAC;AACnD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,kCAAkC,CAAC;AACjD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,sCAAsC,CAAC;AACrD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,iCAAiC,CAAC;AAChD,cAAc,qCAAqC,CAAC;AACpD,cAAc,kBAAkB,CAAC;AAEjC;;;;GAIG;AACH,MAAM,UAAU,kBAAkB;IAChC,OAAO;QACL,sBAAsB;QACtB,sBAAsB;QACtB,qBAAqB;QACrB,eAAe;QACf,wBAAwB;QACxB,wBAAwB;QACxB,sBAAsB;QACtB,qBAAqB;QACrB,mBAAmB;QACnB,oBAAoB;QACpB,oBAAoB;QACpB,sBAAsB;QACtB,uBAAuB;QACvB,kBAAkB;QAClB,wBAAwB;QACxB,wBAAwB;QACxB,sBAAsB;QACtB,0BAA0B;QAC1B,oBAAoB;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/fixes/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAC1E,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,wBAAwB,EAAE,MAAM,oCAAoC,CAAC;AAC9E,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAC1E,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,EAAE,uBAAuB,EAAE,MAAM,mCAAmC,CAAC;AAC5E,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAC3E,OAAO,EAAE,wBAAwB,EAAE,MAAM,oCAAoC,CAAC;AAC9E,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,EAAE,0BAA0B,EAAE,MAAM,sCAAsC,CAAC;AAClF,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,EAAE,wBAAwB,EAAE,MAAM,qCAAqC,CAAC;AAC/E,OAAO,EAAE,wBAAwB,EAAE,MAAM,oCAAoC,CAAC;AAC9E,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAEtD,cAAc,iCAAiC,CAAC;AAChD,cAAc,kCAAkC,CAAC;AACjD,cAAc,iCAAiC,CAAC;AAChD,cAAc,0BAA0B,CAAC;AACzC,cAAc,oCAAoC,CAAC;AACnD,cAAc,kCAAkC,CAAC;AACjD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,iCAAiC,CAAC;AAChD,cAAc,mCAAmC,CAAC;AAClD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,oCAAoC,CAAC;AACnD,cAAc,mCAAmC,CAAC;AAClD,cAAc,oCAAoC,CAAC;AACnD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,kCAAkC,CAAC;AACjD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,sCAAsC,CAAC;AACrD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,iCAAiC,CAAC;AAChD,cAAc,qCAAqC,CAAC;AACpD,cAAc,kBAAkB,CAAC;AAEjC;;;;GAIG;AACH,MAAM,UAAU,kBAAkB;IAChC,OAAO;QACL,kBAAkB,EAAE;QACpB,sBAAsB;QACtB,sBAAsB;QACtB,qBAAqB;QACrB,eAAe;QACf,wBAAwB;QACxB,wBAAwB;QACxB,sBAAsB;QACtB,qBAAqB;QACrB,mBAAmB;QACnB,oBAAoB;QACpB,oBAAoB;QACpB,sBAAsB;QACtB,uBAAuB;QACvB,kBAAkB;QAClB,wBAAwB;QACxB,wBAAwB;QACxB,sBAAsB;QACtB,0BAA0B;QAC1B,oBAAoB;KACrB,CAAC;AACJ,CAAC"}
|
|
@@ -15,6 +15,7 @@ export interface TokenUsage {
|
|
|
15
15
|
maxTokens: number;
|
|
16
16
|
promptTokens: number;
|
|
17
17
|
candidateTokens: number;
|
|
18
|
+
cachedTokens?: number | undefined;
|
|
18
19
|
}
|
|
19
20
|
export declare function extractUsageFromMetadata(metadata: Uint8Array): TokenUsage | null;
|
|
20
21
|
export declare function getLatestSessionUsage(sessionId: string, customDbPath?: string): TokenUsage | null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/fixes/missing-usage-metrics/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,OAAO,EAKL,KAAK,MAAM,EACX,KAAK,gBAAgB,EAGtB,MAAM,qBAAqB,CAAC;AAI7B,OAAO,EAAY,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEjE,OAAO,EAAE,cAAc,EAAE,CAAC;AAE1B,MAAM,WAAW,UAAU;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/fixes/missing-usage-metrics/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,OAAO,EAKL,KAAK,MAAM,EACX,KAAK,gBAAgB,EAGtB,MAAM,qBAAqB,CAAC;AAI7B,OAAO,EAAY,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEjE,OAAO,EAAE,cAAc,EAAE,CAAC;AAE1B,MAAM,WAAW,UAAU;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACnC;AAED,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,UAAU,GAAG,UAAU,GAAG,IAAI,CAkBhF;AAED,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI,CAmBjG;AAED,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,gBAAgB,CAa/F;AAwBD,wBAAgB,4BAA4B,CAC1C,kBAAkB,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,MAAM,GACjD,MAAM,CAmDR;AAED,eAAO,MAAM,sBAAsB,QAAiC,CAAC;AACrE,eAAO,MAAM,qBAAqB,qCAA+B,CAAC;AAClE,eAAO,MAAM,eAAe,QAAyB,CAAC"}
|
|
@@ -20,13 +20,15 @@ export function extractUsageFromMetadata(metadata) {
|
|
|
20
20
|
return null;
|
|
21
21
|
const promptTokens = getVarintField(f9, 2) ?? 0;
|
|
22
22
|
const candidateTokens = getVarintField(f9, 3) ?? 0;
|
|
23
|
+
const cachedTokens = getVarintField(f9, 5) ?? 0;
|
|
23
24
|
const maxTokens = getVarintField(getField(metadata, 24), 4) ?? 1_000_000;
|
|
24
|
-
const usedTokens = promptTokens + candidateTokens;
|
|
25
|
+
const usedTokens = promptTokens + candidateTokens + cachedTokens;
|
|
25
26
|
return {
|
|
26
27
|
usedTokens,
|
|
27
28
|
maxTokens,
|
|
28
29
|
promptTokens,
|
|
29
30
|
candidateTokens,
|
|
31
|
+
cachedTokens: cachedTokens > 0 ? cachedTokens : undefined,
|
|
30
32
|
};
|
|
31
33
|
}
|
|
32
34
|
export function getLatestSessionUsage(sessionId, customDbPath) {
|
|
@@ -68,14 +70,16 @@ function attachUsageToResult(msg, usage) {
|
|
|
68
70
|
if (!("result" in msg) || !msg.result || typeof msg.result !== "object")
|
|
69
71
|
return msg;
|
|
70
72
|
const resultObj = msg.result;
|
|
73
|
+
const totalInputTokens = usage.promptTokens + (usage.cachedTokens ?? 0);
|
|
71
74
|
return {
|
|
72
75
|
...msg,
|
|
73
76
|
result: {
|
|
74
77
|
...resultObj,
|
|
75
78
|
usage: {
|
|
76
79
|
totalTokens: usage.usedTokens,
|
|
77
|
-
inputTokens:
|
|
80
|
+
inputTokens: totalInputTokens,
|
|
78
81
|
outputTokens: usage.candidateTokens,
|
|
82
|
+
...(usage.cachedTokens !== undefined ? { cachedTokens: usage.cachedTokens } : {}),
|
|
79
83
|
contextWindowMaxTokens: usage.maxTokens,
|
|
80
84
|
contextWindowUsedTokens: usage.usedTokens,
|
|
81
85
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/fixes/missing-usage-metrics/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EACL,WAAW,EACX,eAAe,EACf,gBAAgB,EAChB,iBAAiB,GAKlB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAC1F,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEjE,OAAO,EAAE,cAAc,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/fixes/missing-usage-metrics/index.ts"],"names":[],"mappings":"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"}
|
package/dist/src/otel/fix.d.ts
CHANGED
|
@@ -7,6 +7,15 @@ import { type AcpFix } from "../core/types.js";
|
|
|
7
7
|
import { type OtelConfig } from "./config.js";
|
|
8
8
|
import { type IOtelExporter } from "./exporter.js";
|
|
9
9
|
import { SessionTurnTracker } from "./tracker.js";
|
|
10
|
+
export declare function resolveToolName(update: {
|
|
11
|
+
name?: string | null | undefined;
|
|
12
|
+
tool?: string | null | undefined;
|
|
13
|
+
title?: string | null | undefined;
|
|
14
|
+
rawInput?: unknown;
|
|
15
|
+
}): {
|
|
16
|
+
toolName: string;
|
|
17
|
+
command?: string | undefined;
|
|
18
|
+
};
|
|
10
19
|
export declare function createTelemetryFix(options?: {
|
|
11
20
|
config?: OtelConfig;
|
|
12
21
|
exporter?: IOtelExporter;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fix.d.ts","sourceRoot":"","sources":["../../../src/otel/fix.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAOL,KAAK,MAAM,EAQZ,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAiB,KAAK,UAAU,EAAE,MAAM,aAAa,CAAC;AAC7D,OAAO,EAAgB,KAAK,aAAa,EAAE,MAAM,eAAe,CAAC;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"fix.d.ts","sourceRoot":"","sources":["../../../src/otel/fix.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAOL,KAAK,MAAM,EAQZ,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAiB,KAAK,UAAU,EAAE,MAAM,aAAa,CAAC;AAC7D,OAAO,EAAgB,KAAK,aAAa,EAAE,MAAM,eAAe,CAAC;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAgFlD,wBAAgB,eAAe,CAAC,MAAM,EAAE;IACtC,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IACjC,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IACjC,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IAClC,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,CAgBrD;AAkJD,wBAAgB,kBAAkB,CAAC,OAAO,CAAC,EAAE;IAC3C,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB,QAAQ,CAAC,EAAE,aAAa,CAAC;IACzB,kBAAkB,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,MAAM,CAAC;CACpD,GAAG,MAAM,GAAG;IAAE,OAAO,EAAE,kBAAkB,CAAC;IAAC,QAAQ,EAAE,aAAa,CAAC;IAAC,MAAM,EAAE,UAAU,CAAA;CAAE,CA4CxF;AAED,eAAO,MAAM,YAAY;aA9CD,kBAAkB;cAAY,aAAa;YAAU,UAAU;CA8CvC,CAAC"}
|
package/dist/src/otel/fix.js
CHANGED
|
@@ -30,13 +30,77 @@ function handlePromptResponse(msg, sessionId, tracker, customDbPath) {
|
|
|
30
30
|
customDbPath,
|
|
31
31
|
});
|
|
32
32
|
}
|
|
33
|
+
function extractCommandFromRaw(rawInput) {
|
|
34
|
+
if (!rawInput || typeof rawInput !== "object")
|
|
35
|
+
return undefined;
|
|
36
|
+
const raw = rawInput;
|
|
37
|
+
if (typeof raw.CommandLine === "string")
|
|
38
|
+
return raw.CommandLine;
|
|
39
|
+
if (typeof raw.command === "string")
|
|
40
|
+
return raw.command;
|
|
41
|
+
return undefined;
|
|
42
|
+
}
|
|
43
|
+
function inferToolFromRaw(rawInput) {
|
|
44
|
+
if (rawInput && typeof rawInput === "object") {
|
|
45
|
+
const raw = rawInput;
|
|
46
|
+
if ("CommandLine" in raw)
|
|
47
|
+
return "run_command";
|
|
48
|
+
if ("AbsolutePath" in raw || "TargetFile" in raw || "targetFile" in raw)
|
|
49
|
+
return "view_file";
|
|
50
|
+
}
|
|
51
|
+
return "run_command";
|
|
52
|
+
}
|
|
53
|
+
function cleanToolName(name) {
|
|
54
|
+
if (typeof name !== "string")
|
|
55
|
+
return undefined;
|
|
56
|
+
const trimmed = name.replace(/^Running:?\s+/i, "").trim();
|
|
57
|
+
return trimmed || undefined;
|
|
58
|
+
}
|
|
59
|
+
function inferFromTitle(title, rawInput) {
|
|
60
|
+
const cleaned = cleanToolName(title);
|
|
61
|
+
if (cleaned && /^[a-zA-Z0-9_-]+$/.test(cleaned)) {
|
|
62
|
+
return { toolName: cleaned };
|
|
63
|
+
}
|
|
64
|
+
return {
|
|
65
|
+
toolName: inferToolFromRaw(rawInput),
|
|
66
|
+
command: title,
|
|
67
|
+
};
|
|
68
|
+
}
|
|
69
|
+
function resolveCommand(title, toolName, existingCommand) {
|
|
70
|
+
if (existingCommand || !title)
|
|
71
|
+
return existingCommand;
|
|
72
|
+
if (title === toolName || title === `Running ${toolName}`)
|
|
73
|
+
return undefined;
|
|
74
|
+
return title;
|
|
75
|
+
}
|
|
76
|
+
export function resolveToolName(update) {
|
|
77
|
+
let command = extractCommandFromRaw(update.rawInput);
|
|
78
|
+
let toolName = cleanToolName(update.name) ?? cleanToolName(update.tool);
|
|
79
|
+
const title = typeof update.title === "string" ? update.title.trim() : undefined;
|
|
80
|
+
if (!toolName && title) {
|
|
81
|
+
const inferred = inferFromTitle(title, update.rawInput);
|
|
82
|
+
toolName = inferred.toolName;
|
|
83
|
+
command ??= inferred.command;
|
|
84
|
+
}
|
|
85
|
+
const finalToolName = toolName || "tool";
|
|
86
|
+
return {
|
|
87
|
+
toolName: finalToolName,
|
|
88
|
+
command: resolveCommand(title, finalToolName, command),
|
|
89
|
+
};
|
|
90
|
+
}
|
|
33
91
|
function handleToolUpdate(update, sessionId, tracker) {
|
|
34
92
|
const call = update;
|
|
35
93
|
const callId = call.toolCallId || call.callId || call.id;
|
|
36
94
|
if (!callId)
|
|
37
95
|
return;
|
|
38
96
|
if (update.sessionUpdate === SESSION_UPDATES.TOOL_CALL) {
|
|
39
|
-
|
|
97
|
+
const { toolName, command } = resolveToolName({
|
|
98
|
+
name: call.name,
|
|
99
|
+
tool: call.tool,
|
|
100
|
+
title: call.title,
|
|
101
|
+
rawInput: call.rawInput ?? call.arguments,
|
|
102
|
+
});
|
|
103
|
+
tracker.recordToolCall(sessionId, callId, toolName, command);
|
|
40
104
|
}
|
|
41
105
|
else if (update.sessionUpdate === SESSION_UPDATES.TOOL_CALL_UPDATE && call.status) {
|
|
42
106
|
tracker.updateToolCall(sessionId, callId, call.status);
|
package/dist/src/otel/fix.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fix.js","sourceRoot":"","sources":["../../../src/otel/fix.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACL,WAAW,EACX,eAAe,EACf,sBAAsB,EACtB,gBAAgB,EAChB,iBAAiB,EACjB,wBAAwB,GASzB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAmB,MAAM,aAAa,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAsB,MAAM,eAAe,CAAC;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAElD,SAAS,oBAAoB,CAC3B,GAAyB,EACzB,SAAiB,EACjB,OAA2B,EAC3B,YAAqB;IAErB,IAAI,sBAAsB,CAAC,GAAG,CAAC,EAAE,CAAC;QAChC,OAAO,CAAC,UAAU,CAAC,SAAS,EAAE;YAC5B,eAAe,EAAE,GAAG,CAAC,EAAE;YACvB,OAAO,EAAE,IAAI;YACb,YAAY,EAAE,GAAG,CAAC,KAAK,CAAC,OAAO;YAC/B,YAAY;SACb,CAAC,CAAC;QACH,OAAO;IACT,CAAC;IAED,MAAM,SAAS,GACb,GAAG,CAAC,MAAM,IAAI,OAAO,GAAG,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAE,GAAG,CAAC,MAAkC,CAAC,CAAC,CAAC,EAAE,CAAC;IAC9F,MAAM,UAAU,GAAG,OAAO,SAAS,CAAC,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC;IAC/F,MAAM,KAAK,GAAG,SAAS,CAAC,KAEX,CAAC;IAEd,IAAI,KAAK,EAAE,CAAC;QACV,OAAO,CAAC,mBAAmB,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;IAChD,CAAC;IAED,OAAO,CAAC,UAAU,CAAC,SAAS,EAAE;QAC5B,eAAe,EAAE,GAAG,CAAC,EAAE;QACvB,UAAU;QACV,YAAY;KACb,CAAC,CAAC;AACL,CAAC;AAED,SAAS,gBAAgB,CACvB,MAAkD,EAClD,SAAiB,EACjB,OAA2B;IAE3B,MAAM,IAAI,GAAG,
|
|
1
|
+
{"version":3,"file":"fix.js","sourceRoot":"","sources":["../../../src/otel/fix.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,6 +13,7 @@ export declare function nowUnixNano(): string;
|
|
|
13
13
|
export interface InFlightToolCall {
|
|
14
14
|
toolCallId: string;
|
|
15
15
|
toolName: string;
|
|
16
|
+
command?: string | undefined;
|
|
16
17
|
spanId: string;
|
|
17
18
|
startTimeUnixNano: string;
|
|
18
19
|
endTimeUnixNano?: string;
|
|
@@ -36,6 +37,11 @@ export interface InFlightTurn {
|
|
|
36
37
|
isError?: boolean;
|
|
37
38
|
errorMessage?: string;
|
|
38
39
|
}
|
|
40
|
+
export declare function readTokensFromDb(dbPath: string): {
|
|
41
|
+
promptTokens?: number | undefined;
|
|
42
|
+
candidateTokens?: number | undefined;
|
|
43
|
+
cachedTokens?: number | undefined;
|
|
44
|
+
} | undefined;
|
|
39
45
|
export declare class SessionTurnTracker {
|
|
40
46
|
private readonly config;
|
|
41
47
|
private readonly exporter;
|
|
@@ -49,7 +55,7 @@ export declare class SessionTurnTracker {
|
|
|
49
55
|
startTurn(sessionId: string, promptRequestId: string | number, rawPrompt: string | PromptContentItem[]): InFlightTurn;
|
|
50
56
|
private emitUserPromptLog;
|
|
51
57
|
appendResponseChunk(sessionId: string, text: string): void;
|
|
52
|
-
recordToolCall(sessionId: string, toolCallId: string, toolName: string): void;
|
|
58
|
+
recordToolCall(sessionId: string, toolCallId: string, toolName: string, command?: string | undefined): void;
|
|
53
59
|
updateToolCall(sessionId: string, toolCallId: string, status: "completed" | "failed" | string): void;
|
|
54
60
|
recordUsageUpdate(sessionId: string, used: number, _size?: number): void;
|
|
55
61
|
recordExplicitUsage(sessionId: string, usage: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tracker.d.ts","sourceRoot":"","sources":["../../../src/otel/tracker.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAEnD,OAAO,EAKL,KAAK,QAAQ,EACd,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"tracker.d.ts","sourceRoot":"","sources":["../../../src/otel/tracker.ts"],"names":[],"mappings":"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"}
|
package/dist/src/otel/tracker.js
CHANGED
|
@@ -9,6 +9,7 @@ import { DatabaseSync } from "node:sqlite";
|
|
|
9
9
|
import { truncateUtf8 } from "./utf8.js";
|
|
10
10
|
import { SPAN_KIND, STATUS_CODE, toOtelKeyValues, } from "./types.js";
|
|
11
11
|
import { getLatestSessionUsage } from "../fixes/missing-usage-metrics/index.js";
|
|
12
|
+
import { stripSystemContext } from "../fixes/missing-system-prompt/index.js";
|
|
12
13
|
import { getConversationDbPath } from "../fixes/orphaned-checkpoints/index.js";
|
|
13
14
|
import { getField, getVarintField } from "../lib/protobuf.js";
|
|
14
15
|
export function generateTraceId() {
|
|
@@ -20,22 +21,29 @@ export function generateSpanId() {
|
|
|
20
21
|
export function nowUnixNano() {
|
|
21
22
|
return (BigInt(Date.now()) * 1000000n).toString();
|
|
22
23
|
}
|
|
23
|
-
function
|
|
24
|
+
function parseVarintsFromField9(f9) {
|
|
25
|
+
const promptTokens = getVarintField(f9, 2);
|
|
26
|
+
const candidateTokens = getVarintField(f9, 3);
|
|
27
|
+
const cachedTokens = getVarintField(f9, 5);
|
|
28
|
+
return {
|
|
29
|
+
promptTokens: typeof promptTokens === "number" ? promptTokens : undefined,
|
|
30
|
+
candidateTokens: typeof candidateTokens === "number" ? candidateTokens : undefined,
|
|
31
|
+
cachedTokens: typeof cachedTokens === "number" && cachedTokens > 0 ? cachedTokens : undefined,
|
|
32
|
+
};
|
|
33
|
+
}
|
|
34
|
+
export function readTokensFromDb(dbPath) {
|
|
24
35
|
if (!existsSync(dbPath))
|
|
25
36
|
return undefined;
|
|
26
37
|
let db = null;
|
|
27
38
|
try {
|
|
28
39
|
db = new DatabaseSync(dbPath, { timeout: 1000, readOnly: true });
|
|
29
40
|
const row = db
|
|
30
|
-
.prepare("SELECT metadata FROM steps WHERE step_type
|
|
41
|
+
.prepare("SELECT metadata FROM steps WHERE step_type IN (15, 2) AND metadata IS NOT NULL ORDER BY idx DESC LIMIT 1;")
|
|
31
42
|
.get();
|
|
32
43
|
if (!row?.metadata)
|
|
33
44
|
return undefined;
|
|
34
45
|
const f9 = getField(row.metadata, 9);
|
|
35
|
-
|
|
36
|
-
return undefined;
|
|
37
|
-
const f5 = getVarintField(f9, 5);
|
|
38
|
-
return typeof f5 === "number" && f5 > 0 ? f5 : undefined;
|
|
46
|
+
return f9 ? parseVarintsFromField9(f9) : undefined;
|
|
39
47
|
}
|
|
40
48
|
catch {
|
|
41
49
|
return undefined;
|
|
@@ -44,24 +52,48 @@ function readCachedTokensFromDb(dbPath) {
|
|
|
44
52
|
db?.close();
|
|
45
53
|
}
|
|
46
54
|
}
|
|
55
|
+
function applyTokensToTurn(turn, tokens) {
|
|
56
|
+
if (!tokens)
|
|
57
|
+
return;
|
|
58
|
+
if (turn.cachedInputTokens === undefined && tokens.cachedTokens !== undefined) {
|
|
59
|
+
turn.cachedInputTokens = tokens.cachedTokens;
|
|
60
|
+
}
|
|
61
|
+
if (turn.outputTokens === undefined && tokens.candidateTokens !== undefined) {
|
|
62
|
+
turn.outputTokens = tokens.candidateTokens;
|
|
63
|
+
}
|
|
64
|
+
if (tokens.promptTokens !== undefined) {
|
|
65
|
+
const totalInput = tokens.promptTokens + (tokens.cachedTokens ?? 0);
|
|
66
|
+
if (turn.inputTokens === undefined || turn.inputTokens < totalInput) {
|
|
67
|
+
turn.inputTokens = totalInput;
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
function buildToolSpan(turn, tool, endTimeUnixNano, isError, errorMessage) {
|
|
72
|
+
const toolAttrs = {
|
|
73
|
+
"gen_ai.tool.name": tool.toolName,
|
|
74
|
+
"gen_ai.tool.call.id": tool.toolCallId,
|
|
75
|
+
};
|
|
76
|
+
if (tool.command && tool.command !== tool.toolName) {
|
|
77
|
+
toolAttrs["tool.command"] = tool.command;
|
|
78
|
+
}
|
|
79
|
+
return {
|
|
80
|
+
traceId: turn.traceId,
|
|
81
|
+
spanId: tool.spanId,
|
|
82
|
+
parentSpanId: turn.spanId,
|
|
83
|
+
name: `execute_tool ${tool.toolName}`,
|
|
84
|
+
kind: SPAN_KIND.INTERNAL,
|
|
85
|
+
startTimeUnixNano: tool.startTimeUnixNano,
|
|
86
|
+
endTimeUnixNano,
|
|
87
|
+
attributes: toOtelKeyValues(toolAttrs),
|
|
88
|
+
status: {
|
|
89
|
+
code: isError ? STATUS_CODE.ERROR : STATUS_CODE.OK,
|
|
90
|
+
...(isError && errorMessage ? { message: errorMessage } : {}),
|
|
91
|
+
},
|
|
92
|
+
};
|
|
93
|
+
}
|
|
47
94
|
function closeRemainingTools(turn, endTimeUnixNano, isError) {
|
|
48
95
|
for (const tool of turn.toolCalls.values()) {
|
|
49
|
-
|
|
50
|
-
traceId: turn.traceId,
|
|
51
|
-
spanId: tool.spanId,
|
|
52
|
-
parentSpanId: turn.spanId,
|
|
53
|
-
name: `execute_tool ${tool.toolName}`,
|
|
54
|
-
kind: SPAN_KIND.INTERNAL,
|
|
55
|
-
startTimeUnixNano: tool.startTimeUnixNano,
|
|
56
|
-
endTimeUnixNano,
|
|
57
|
-
attributes: toOtelKeyValues({
|
|
58
|
-
"gen_ai.tool.name": tool.toolName,
|
|
59
|
-
}),
|
|
60
|
-
status: {
|
|
61
|
-
code: isError ? STATUS_CODE.ERROR : STATUS_CODE.OK,
|
|
62
|
-
},
|
|
63
|
-
};
|
|
64
|
-
turn.orderedCompletedTools.push(toolSpan);
|
|
96
|
+
turn.orderedCompletedTools.push(buildToolSpan(turn, tool, endTimeUnixNano, isError));
|
|
65
97
|
}
|
|
66
98
|
turn.toolCalls.clear();
|
|
67
99
|
}
|
|
@@ -120,21 +152,22 @@ export class SessionTurnTracker {
|
|
|
120
152
|
}
|
|
121
153
|
}
|
|
122
154
|
formatPromptText(prompt) {
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
155
|
+
const rawText = typeof prompt === "string"
|
|
156
|
+
? prompt
|
|
157
|
+
: Array.isArray(prompt)
|
|
158
|
+
? prompt
|
|
159
|
+
.map((item) => {
|
|
160
|
+
if (!item || typeof item !== "object")
|
|
161
|
+
return "";
|
|
162
|
+
if (item.type === "text" && typeof item.text === "string") {
|
|
163
|
+
return item.text;
|
|
164
|
+
}
|
|
165
|
+
return `[${item.type || "content"}]`;
|
|
166
|
+
})
|
|
167
|
+
.filter(Boolean)
|
|
168
|
+
.join("\n")
|
|
169
|
+
: String(prompt ?? "");
|
|
170
|
+
return stripSystemContext(rawText).trim();
|
|
138
171
|
}
|
|
139
172
|
startTurn(sessionId, promptRequestId, rawPrompt) {
|
|
140
173
|
const model = this.getModel(sessionId);
|
|
@@ -190,7 +223,7 @@ export class SessionTurnTracker {
|
|
|
190
223
|
return;
|
|
191
224
|
turn.responseChunks.push(text);
|
|
192
225
|
}
|
|
193
|
-
recordToolCall(sessionId, toolCallId, toolName) {
|
|
226
|
+
recordToolCall(sessionId, toolCallId, toolName, command) {
|
|
194
227
|
const turn = this.activeTurnsBySession.get(sessionId);
|
|
195
228
|
if (!turn)
|
|
196
229
|
return;
|
|
@@ -198,6 +231,7 @@ export class SessionTurnTracker {
|
|
|
198
231
|
turn.toolCalls.set(toolCallId, {
|
|
199
232
|
toolCallId,
|
|
200
233
|
toolName: toolName || "tool",
|
|
234
|
+
command,
|
|
201
235
|
spanId: generateSpanId(),
|
|
202
236
|
startTimeUnixNano: nowUnixNano(),
|
|
203
237
|
status: "in_progress",
|
|
@@ -215,23 +249,7 @@ export class SessionTurnTracker {
|
|
|
215
249
|
tool.endTimeUnixNano = endNano;
|
|
216
250
|
const isFailure = status === "failed";
|
|
217
251
|
tool.status = isFailure ? "failed" : "completed";
|
|
218
|
-
|
|
219
|
-
traceId: turn.traceId,
|
|
220
|
-
spanId: tool.spanId,
|
|
221
|
-
parentSpanId: turn.spanId,
|
|
222
|
-
name: `execute_tool ${tool.toolName}`,
|
|
223
|
-
kind: SPAN_KIND.INTERNAL,
|
|
224
|
-
startTimeUnixNano: tool.startTimeUnixNano,
|
|
225
|
-
endTimeUnixNano: endNano,
|
|
226
|
-
attributes: toOtelKeyValues({
|
|
227
|
-
"gen_ai.tool.name": tool.toolName,
|
|
228
|
-
}),
|
|
229
|
-
status: {
|
|
230
|
-
code: isFailure ? STATUS_CODE.ERROR : STATUS_CODE.OK,
|
|
231
|
-
...(isFailure ? { message: "tool call failed" } : {}),
|
|
232
|
-
},
|
|
233
|
-
};
|
|
234
|
-
turn.orderedCompletedTools.push(toolSpan);
|
|
252
|
+
turn.orderedCompletedTools.push(buildToolSpan(turn, tool, endNano, isFailure, isFailure ? "tool call failed" : undefined));
|
|
235
253
|
turn.toolCalls.delete(toolCallId);
|
|
236
254
|
}
|
|
237
255
|
recordUsageUpdate(sessionId, used, _size) {
|
|
@@ -254,17 +272,17 @@ export class SessionTurnTracker {
|
|
|
254
272
|
turn.cachedInputTokens = usage.cachedTokens;
|
|
255
273
|
}
|
|
256
274
|
reconcileTokens(turn, sessionId, customDbPath) {
|
|
257
|
-
if (turn.inputTokens !== undefined &&
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
if (!dbUsage)
|
|
275
|
+
if (turn.inputTokens !== undefined &&
|
|
276
|
+
turn.outputTokens !== undefined &&
|
|
277
|
+
turn.cachedInputTokens !== undefined) {
|
|
261
278
|
return;
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
turn.cachedInputTokens
|
|
279
|
+
}
|
|
280
|
+
const dbPath = customDbPath ?? getConversationDbPath(sessionId);
|
|
281
|
+
applyTokensToTurn(turn, readTokensFromDb(dbPath));
|
|
282
|
+
if (turn.inputTokens === undefined ||
|
|
283
|
+
turn.outputTokens === undefined ||
|
|
284
|
+
turn.cachedInputTokens === undefined) {
|
|
285
|
+
applyTokensToTurn(turn, this.extractDatabaseUsage(sessionId, customDbPath) ?? undefined);
|
|
268
286
|
}
|
|
269
287
|
}
|
|
270
288
|
resolveActiveTurn(sessionId, promptRequestId) {
|
|
@@ -321,11 +339,13 @@ export class SessionTurnTracker {
|
|
|
321
339
|
const usage = getLatestSessionUsage(sessionId, customDbPath);
|
|
322
340
|
if (!usage)
|
|
323
341
|
return null;
|
|
342
|
+
if (usage.cachedTokens !== undefined)
|
|
343
|
+
return usage;
|
|
324
344
|
const dbPath = customDbPath ?? getConversationDbPath(sessionId);
|
|
325
|
-
const
|
|
345
|
+
const dbTokens = readTokensFromDb(dbPath);
|
|
326
346
|
return {
|
|
327
347
|
...usage,
|
|
328
|
-
...(cachedTokens !== undefined ? { cachedTokens } : {}),
|
|
348
|
+
...(dbTokens?.cachedTokens !== undefined ? { cachedTokens: dbTokens.cachedTokens } : {}),
|
|
329
349
|
};
|
|
330
350
|
}
|
|
331
351
|
catch {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tracker.js","sourceRoot":"","sources":["../../../src/otel/tracker.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"tracker.js","sourceRoot":"","sources":["../../../src/otel/tracker.ts"],"names":[],"mappings":"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"}
|