@llm4ts/core 2.40.1 → 2.41.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/dist/providers/ClaudeCliConnector.d.ts.map +1 -1
- package/dist/providers/ClaudeCliConnector.js +26 -13
- package/dist/providers/ClaudeCliConnector.js.map +1 -1
- package/dist/providers/CliSupport.d.ts +13 -1
- package/dist/providers/CliSupport.d.ts.map +1 -1
- package/dist/providers/CliSupport.js +24 -2
- package/dist/providers/CliSupport.js.map +1 -1
- package/dist/providers/CodexConnector.d.ts.map +1 -1
- package/dist/providers/CodexConnector.js +24 -5
- package/dist/providers/CodexConnector.js.map +1 -1
- package/dist/providers/PiConnector.d.ts.map +1 -1
- package/dist/providers/PiConnector.js +25 -5
- package/dist/providers/PiConnector.js.map +1 -1
- package/package.json +1 -1
- package/src/providers/ClaudeCliConnector.ts +37 -14
- package/src/providers/CliSupport.ts +42 -2
- package/src/providers/CodexConnector.ts +26 -3
- package/src/providers/PiConnector.ts +27 -5
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClaudeCliConnector.d.ts","sourceRoot":"","sources":["../../src/providers/ClaudeCliConnector.ts"],"names":[],"mappings":"AAIA,OAAO,EAAoB,KAAK,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAC1E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AAG/D,OAAO,EAGL,QAAQ,EAGT,MAAM,cAAc,CAAA;AACrB,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAA;
|
|
1
|
+
{"version":3,"file":"ClaudeCliConnector.d.ts","sourceRoot":"","sources":["../../src/providers/ClaudeCliConnector.ts"],"names":[],"mappings":"AAIA,OAAO,EAAoB,KAAK,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAC1E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AAG/D,OAAO,EAGL,QAAQ,EAGT,MAAM,cAAc,CAAA;AACrB,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAA;AAsBjE;;;;;;;;GAQG;AACH,eAAO,MAAM,mBAAmB,yBAAyB,CAAA;AAEzD,eAAO,MAAM,kBAAkB,GAAI,QAAQ,kBAAkB,KAAG,aAAa,CAAC,MAAM,CAiBnF,CAAA;AAED,eAAO,MAAM,kBAAkB,GAAI,MAAM,MAAM,KAAG,MAAM,GAAG,SAK1D,CAAA;AAED,8EAA8E;AAC9E,eAAO,MAAM,oBAAoB,GAAI,MAAM,MAAM,KAAG,MAAM,GAAG,SAQ5D,CAAA;AAOD,eAAO,MAAM,wBAAwB,GAAI,MAAM,MAAM,KAAG,aAAa,CAAC,QAAQ,CAmG7E,CAAA;AAED,eAAO,MAAM,sBAAsB,GACjC,QAAQ,kBAAkB,EAC1B,UAAU,oBAAoB,KAC7B,iBAkIF,CAAA"}
|
|
@@ -5,7 +5,7 @@ import { makeCliConnector } from "../Connector.js";
|
|
|
5
5
|
import { ConnectorCapabilities, ConnectorIds, LlmChunk, TokenUsage } from "../Models.js";
|
|
6
6
|
import { collect } from "../Streaming.js";
|
|
7
7
|
import { parseFromText, withSchemaHint } from "../StructuredOutput.js";
|
|
8
|
-
import { failClassifiedCliError, jsonArray, jsonField, jsonIntField, jsonNumberField, jsonStringField, optionalModelArgs, parseJsonLine, sortedFlagArgs, toolEventChunk, toolResultChunk, toolResultText, usageEventChunk, effortWord } from "./CliSupport.js";
|
|
8
|
+
import { failClassifiedCliError, jsonArray, jsonField, jsonIntField, jsonNumberField, jsonStringField, optionalModelArgs, parseJsonLine, sortedFlagArgs, toolEventChunk, toolResultChunk, toolResultText, usageEventChunk, effortWord, jsonObjectEntries } from "./CliSupport.js";
|
|
9
9
|
/**
|
|
10
10
|
* Read-only is a `--tools` ALLOWLIST, not a permission mode or a denylist
|
|
11
11
|
* (ADR 0010). Plan mode removes no tools — the `init` tool list under it is
|
|
@@ -59,6 +59,9 @@ export const parseClaudeCliStreamLine = (line) => {
|
|
|
59
59
|
if (json === undefined) {
|
|
60
60
|
return [];
|
|
61
61
|
}
|
|
62
|
+
// A sub-agent's lines carry the id of the Agent call that spawned it (ADR 0033).
|
|
63
|
+
const parentId = jsonStringField(json, "parent_tool_use_id");
|
|
64
|
+
const parent = parentId === undefined || parentId.length === 0 ? {} : { parent: parentId };
|
|
62
65
|
switch (jsonStringField(json, "type")) {
|
|
63
66
|
case "assistant":
|
|
64
67
|
return jsonArray(jsonField(jsonField(json, "message"), "content")).flatMap((block) => {
|
|
@@ -69,7 +72,7 @@ export const parseClaudeCliStreamLine = (line) => {
|
|
|
69
72
|
}
|
|
70
73
|
case "tool_use":
|
|
71
74
|
return [
|
|
72
|
-
toolEventChunk(jsonStringField(block, "name") ?? "", jsonField(block, "input"), jsonStringField(block, "id"))
|
|
75
|
+
toolEventChunk(jsonStringField(block, "name") ?? "", jsonField(block, "input"), jsonStringField(block, "id"), parent)
|
|
73
76
|
];
|
|
74
77
|
default:
|
|
75
78
|
return [];
|
|
@@ -81,6 +84,7 @@ export const parseClaudeCliStreamLine = (line) => {
|
|
|
81
84
|
? [
|
|
82
85
|
toolResultChunk(jsonStringField(block, "tool_use_id"), {
|
|
83
86
|
failed: jsonField(block, "is_error") === true,
|
|
87
|
+
...parent,
|
|
84
88
|
...outputOf(jsonField(block, "content"))
|
|
85
89
|
})
|
|
86
90
|
]
|
|
@@ -90,20 +94,29 @@ export const parseClaudeCliStreamLine = (line) => {
|
|
|
90
94
|
if (usage === undefined) {
|
|
91
95
|
return [];
|
|
92
96
|
}
|
|
93
|
-
const prompt = jsonIntField(usage, "input_tokens") ?? 0;
|
|
94
|
-
const completion = jsonIntField(usage, "output_tokens") ?? 0;
|
|
95
|
-
const cached = jsonIntField(usage, "cache_read_input_tokens");
|
|
96
97
|
// The CLI reports its own exact cost on the result event; carry it so
|
|
97
98
|
// trackers prefer it over pricing-table estimates. modelUsage's key is
|
|
98
|
-
// a model-name fallback for when no init line was observed
|
|
99
|
+
// a model-name fallback for when no init line was observed, and its
|
|
100
|
+
// per-model counts include the sub-agents' turns, which `usage` leaves
|
|
101
|
+
// out (ADR 0033): sum them when they are there.
|
|
99
102
|
const costUsd = jsonNumberField(json, "total_cost_usd");
|
|
100
|
-
const
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
:
|
|
103
|
+
const modelNames = jsonObjectEntries(jsonField(json, "modelUsage")).map(([name]) => name);
|
|
104
|
+
// Only entries that count tokens can replace `usage`; a key-only
|
|
105
|
+
// modelUsage (older CLIs, fixtures) still names the model.
|
|
106
|
+
const perModel = jsonObjectEntries(jsonField(json, "modelUsage")).filter(([, entry]) => jsonIntField(entry, "inputTokens") !== undefined ||
|
|
107
|
+
jsonIntField(entry, "outputTokens") !== undefined);
|
|
108
|
+
const summed = perModel.reduce((sum, [, entry]) => ({
|
|
109
|
+
prompt: sum.prompt + (jsonIntField(entry, "inputTokens") ?? 0),
|
|
110
|
+
completion: sum.completion + (jsonIntField(entry, "outputTokens") ?? 0),
|
|
111
|
+
cached: sum.cached + (jsonIntField(entry, "cacheReadInputTokens") ?? 0)
|
|
112
|
+
}), { prompt: 0, completion: 0, cached: 0 });
|
|
113
|
+
const prompt = perModel.length === 0 ? (jsonIntField(usage, "input_tokens") ?? 0) : summed.prompt;
|
|
114
|
+
const completion = perModel.length === 0 ? (jsonIntField(usage, "output_tokens") ?? 0) : summed.completion;
|
|
115
|
+
const cached = perModel.length === 0
|
|
116
|
+
? jsonIntField(usage, "cache_read_input_tokens")
|
|
117
|
+
: summed.cached === 0
|
|
118
|
+
? undefined
|
|
119
|
+
: summed.cached;
|
|
107
120
|
return [
|
|
108
121
|
usageEventChunk(modelNames.length === 1 ? modelNames[0] : undefined, TokenUsage.make({
|
|
109
122
|
prompt,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClaudeCliConnector.js","sourceRoot":"","sources":["../../src/providers/ClaudeCliConnector.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,GAAG,MAAM,YAAY,CAAA;AAEjC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,gBAAgB,EAA0B,MAAM,iBAAiB,CAAA;AAI1E,OAAO,EACL,qBAAqB,EACrB,YAAY,EACZ,QAAQ,EACR,UAAU,EAEX,MAAM,cAAc,CAAA;AAErB,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAA;AACzC,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAA;AACtE,OAAO,EACL,sBAAsB,EACtB,SAAS,EACT,SAAS,EACT,YAAY,EACZ,eAAe,EACf,eAAe,EACf,iBAAiB,EACjB,aAAa,EACb,cAAc,EACd,cAAc,EACd,eAAe,EACf,cAAc,EACd,eAAe,EAEf,UAAU,
|
|
1
|
+
{"version":3,"file":"ClaudeCliConnector.js","sourceRoot":"","sources":["../../src/providers/ClaudeCliConnector.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,7 +22,10 @@ export declare const optionalModelArgs: (model: string | undefined) => ReadonlyA
|
|
|
22
22
|
* except `max` on a harness whose top level is `xhigh`.
|
|
23
23
|
*/
|
|
24
24
|
export declare const effortWord: (effort: Effort, top?: "max" | "xhigh") => string;
|
|
25
|
-
export declare const toolEventChunk: (name: string, input: JsonValue | undefined, id?: string
|
|
25
|
+
export declare const toolEventChunk: (name: string, input: JsonValue | undefined, id?: string, options?: {
|
|
26
|
+
/** The tool call this one runs inside, when a harness delegated it to a sub-agent (ADR 0033). */
|
|
27
|
+
readonly parent?: string;
|
|
28
|
+
}) => LlmChunk;
|
|
26
29
|
/**
|
|
27
30
|
* A tool result's text: a plain string, or the text parts of a content list
|
|
28
31
|
* (`[{type:"text",text}]`, as Claude and pi send it).
|
|
@@ -39,6 +42,10 @@ export declare const toolResultChunk: (id: string | undefined, options?: {
|
|
|
39
42
|
readonly input?: JsonValue;
|
|
40
43
|
/** What the tool returned, for an opt-in transcript; never in the trace. */
|
|
41
44
|
readonly output?: string;
|
|
45
|
+
/** The tool call this one ran inside (ADR 0033). */
|
|
46
|
+
readonly parent?: string;
|
|
47
|
+
/** How long the harness says the tool ran, when it reports that itself. */
|
|
48
|
+
readonly durationMs?: number;
|
|
42
49
|
}) => LlmChunk;
|
|
43
50
|
/** Two usage reports as one: counts add up, and so do cache reads and costs when either has them. */
|
|
44
51
|
export declare const addTokenUsage: (sum: TokenUsage | undefined, next: TokenUsage) => TokenUsage;
|
|
@@ -66,4 +73,9 @@ export declare const failClassifiedCliError: (provider: string, fallbackPrefix:
|
|
|
66
73
|
export declare const versionTriple: (text: string) => ReadonlyArray<number> | undefined;
|
|
67
74
|
/** Whether `version` is `floor` or newer, component by component. */
|
|
68
75
|
export declare const atLeastVersion: (version: ReadonlyArray<number>, floor: ReadonlyArray<number>) => boolean;
|
|
76
|
+
/**
|
|
77
|
+
* A harness pausing a turn on its own account — a provider retry, a context
|
|
78
|
+
* compaction — so the lane can say so instead of looking stuck (ADR 0033).
|
|
79
|
+
*/
|
|
80
|
+
export declare const statusChunk: (status: "retrying" | "compacting", phase: "start" | "end", detail?: string) => LlmChunk;
|
|
69
81
|
//# sourceMappingURL=CliSupport.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CliSupport.d.ts","sourceRoot":"","sources":["../../src/providers/CliSupport.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAGvC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,aAAa,EAAiB,MAAM,cAAc,CAAA;AAC3D,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,KAAK,MAAM,EAAE,MAAM,cAAc,CAAA;AAGhE,MAAM,MAAM,SAAS,GAAG,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAA;AAC/C,MAAM,MAAM,UAAU,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAA;AAE5D,eAAO,MAAM,YAAY,GAAI,OAAO,SAAS,KAAG,KAAK,IAAI,UACa,CAAA;AAEtE,eAAO,MAAM,aAAa,GAAI,MAAM,MAAM,KAAG,SAAS,GAAG,SAQxD,CAAA;AAED,eAAO,MAAM,SAAS,GAAI,OAAO,SAAS,GAAG,SAAS,EAAE,MAAM,MAAM,KAAG,SAAS,GAAG,SACb,CAAA;AAEtE,eAAO,MAAM,eAAe,GAAI,OAAO,SAAS,GAAG,SAAS,EAAE,MAAM,MAAM,KAAG,MAAM,GAAG,SAGrF,CAAA;AAED,eAAO,MAAM,YAAY,GAAI,OAAO,SAAS,GAAG,SAAS,EAAE,MAAM,MAAM,KAAG,MAAM,GAAG,SAGlF,CAAA;AAED,eAAO,MAAM,eAAe,GAAI,OAAO,SAAS,GAAG,SAAS,EAAE,MAAM,MAAM,KAAG,MAAM,GAAG,SAGrF,CAAA;AAED,eAAO,MAAM,gBAAgB,GAC3B,OAAO,SAAS,GAAG,SAAS,EAC5B,MAAM,MAAM,KACX,OAAO,GAAG,SAGZ,CAAA;AAED,eAAO,MAAM,SAAS,GAAI,OAAO,SAAS,GAAG,SAAS,KAAG,aAAa,CAAC,SAAS,CAC7C,CAAA;AAEnC,eAAO,MAAM,iBAAiB,GAC5B,OAAO,SAAS,GAAG,SAAS,KAC3B,aAAa,CAAC,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,CAC4B,CAAA;AAEzE,eAAO,MAAM,QAAQ,GAAI,OAAO,SAAS,KAAG,MAAuC,CAAA;AAEnF,eAAO,MAAM,cAAc,GAAI,OAAO,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,KAAG,aAAa,CAAC,MAAM,CAGJ,CAAA;AAEzF,eAAO,MAAM,iBAAiB,GAAI,OAAO,MAAM,GAAG,SAAS,KAAG,aAAa,CAAC,MAAM,CACnC,CAAA;AAE/C;;;GAGG;AACH,eAAO,MAAM,UAAU,GAAI,QAAQ,MAAM,EAAE,MAAK,KAAK,GAAG,OAAe,KAAG,MACzC,CAAA;AAEjC,eAAO,MAAM,cAAc,
|
|
1
|
+
{"version":3,"file":"CliSupport.d.ts","sourceRoot":"","sources":["../../src/providers/CliSupport.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,13 +44,16 @@ export const optionalModelArgs = (model) => model === undefined ? [] : ["--model
|
|
|
44
44
|
* except `max` on a harness whose top level is `xhigh`.
|
|
45
45
|
*/
|
|
46
46
|
export const effortWord = (effort, top = "max") => effort === "max" ? top : effort;
|
|
47
|
-
export const toolEventChunk = (name, input, id) => LlmChunk.make({
|
|
47
|
+
export const toolEventChunk = (name, input, id, options = {}) => LlmChunk.make({
|
|
48
48
|
delta: "",
|
|
49
49
|
metadata: {
|
|
50
50
|
event: "tool_use",
|
|
51
51
|
tool_name: name,
|
|
52
52
|
tool_input: input === undefined ? "{}" : jsonText(input),
|
|
53
|
-
...(id === undefined || id.length === 0 ? {} : { tool_id: id })
|
|
53
|
+
...(id === undefined || id.length === 0 ? {} : { tool_id: id }),
|
|
54
|
+
...(options.parent === undefined || options.parent.length === 0
|
|
55
|
+
? {}
|
|
56
|
+
: { parent: options.parent })
|
|
54
57
|
}
|
|
55
58
|
});
|
|
56
59
|
/**
|
|
@@ -81,6 +84,12 @@ export const toolResultChunk = (id, options = {}) => LlmChunk.make({
|
|
|
81
84
|
event: "tool_result",
|
|
82
85
|
...(id === undefined || id.length === 0 ? {} : { tool_id: id }),
|
|
83
86
|
...(options.failed === true ? { tool_failed: "true" } : {}),
|
|
87
|
+
...(options.parent === undefined || options.parent.length === 0
|
|
88
|
+
? {}
|
|
89
|
+
: { parent: options.parent }),
|
|
90
|
+
...(options.durationMs === undefined || !Number.isFinite(options.durationMs)
|
|
91
|
+
? {}
|
|
92
|
+
: { tool_duration_ms: String(Math.max(0, Math.round(options.durationMs))) }),
|
|
84
93
|
...(options.tool === undefined ? {} : { tool_name: options.tool }),
|
|
85
94
|
...(options.input === undefined ? {} : { tool_input: jsonText(options.input) }),
|
|
86
95
|
...(options.output === undefined ? {} : { tool_content: options.output })
|
|
@@ -165,4 +174,17 @@ export const atLeastVersion = (version, floor) => {
|
|
|
165
174
|
}
|
|
166
175
|
return true;
|
|
167
176
|
};
|
|
177
|
+
/**
|
|
178
|
+
* A harness pausing a turn on its own account — a provider retry, a context
|
|
179
|
+
* compaction — so the lane can say so instead of looking stuck (ADR 0033).
|
|
180
|
+
*/
|
|
181
|
+
export const statusChunk = (status, phase, detail) => LlmChunk.make({
|
|
182
|
+
delta: "",
|
|
183
|
+
metadata: {
|
|
184
|
+
event: "status",
|
|
185
|
+
status,
|
|
186
|
+
phase,
|
|
187
|
+
...(detail === undefined || detail.length === 0 ? {} : { status_detail: detail })
|
|
188
|
+
}
|
|
189
|
+
});
|
|
168
190
|
//# sourceMappingURL=CliSupport.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CliSupport.js","sourceRoot":"","sources":["../../src/providers/CliSupport.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"CliSupport.js","sourceRoot":"","sources":["../../src/providers/CliSupport.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CodexConnector.d.ts","sourceRoot":"","sources":["../../src/providers/CodexConnector.ts"],"names":[],"mappings":"AAGA,OAAO,EAAoB,KAAK,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAC1E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AAG/D,OAAO,EAGL,QAAQ,EAER,KAAK,UAAU,EAChB,MAAM,cAAc,CAAA;AACrB,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAA;AAEjE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAE/D,OAAO,EAcL,KAAK,SAAS,EACf,MAAM,iBAAiB,CAAA;AAExB,eAAO,MAAM,cAAc,GAAI,QAAQ,kBAAkB,KAAG,aAAa,CAAC,MAAM,CAoB/E,CAAA;AAED,eAAO,MAAM,sBAAsB,GAAI,QAAQ,UAAU,KAAG,OAG3D,CAAA;AAED,eAAO,MAAM,iBAAiB,GAAI,MAAM,SAAS,KAAG,SA0BnD,CAAA;AAED,eAAO,MAAM,oBAAoB,GAAI,MAAM,MAAM,KAAG,aAAa,CAAC,QAAQ,
|
|
1
|
+
{"version":3,"file":"CodexConnector.d.ts","sourceRoot":"","sources":["../../src/providers/CodexConnector.ts"],"names":[],"mappings":"AAGA,OAAO,EAAoB,KAAK,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAC1E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AAG/D,OAAO,EAGL,QAAQ,EAER,KAAK,UAAU,EAChB,MAAM,cAAc,CAAA;AACrB,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAA;AAEjE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAE/D,OAAO,EAcL,KAAK,SAAS,EACf,MAAM,iBAAiB,CAAA;AAExB,eAAO,MAAM,cAAc,GAAI,QAAQ,kBAAkB,KAAG,aAAa,CAAC,MAAM,CAoB/E,CAAA;AAED,eAAO,MAAM,sBAAsB,GAAI,QAAQ,UAAU,KAAG,OAG3D,CAAA;AAED,eAAO,MAAM,iBAAiB,GAAI,MAAM,SAAS,KAAG,SA0BnD,CAAA;AAED,eAAO,MAAM,oBAAoB,GAAI,MAAM,MAAM,KAAG,aAAa,CAAC,QAAQ,CA2GzE,CAAA;AAED,eAAO,MAAM,kBAAkB,GAC7B,QAAQ,kBAAkB,EAC1B,UAAU,oBAAoB,EAC9B,gBAAgB,mBAAmB,KAClC,iBAsHF,CAAA"}
|
|
@@ -64,11 +64,23 @@ export const parseCodexStreamLine = (line) => {
|
|
|
64
64
|
switch (jsonStringField(json, "type")) {
|
|
65
65
|
case "item.started": {
|
|
66
66
|
const item = jsonField(json, "item");
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
67
|
+
switch (jsonStringField(item, "type")) {
|
|
68
|
+
case "command_execution":
|
|
69
|
+
return [
|
|
70
|
+
toolEventChunk("Bash", { command: jsonStringField(item, "command") ?? "" }, jsonStringField(item, "id"))
|
|
71
|
+
];
|
|
72
|
+
// A sub-agent call (spawn_agent, wait, send_input, close_agent): the
|
|
73
|
+
// delegation shows as a tool, its threads as the arguments (ADR 0033).
|
|
74
|
+
case "collab_tool_call":
|
|
75
|
+
return [
|
|
76
|
+
toolEventChunk(jsonStringField(item, "tool") ?? "collab", {
|
|
77
|
+
prompt: jsonStringField(item, "prompt") ?? "",
|
|
78
|
+
receivers: jsonField(item, "receiver_thread_ids") ?? []
|
|
79
|
+
}, jsonStringField(item, "id"))
|
|
80
|
+
];
|
|
81
|
+
default:
|
|
82
|
+
return [];
|
|
83
|
+
}
|
|
72
84
|
}
|
|
73
85
|
case "item.completed": {
|
|
74
86
|
const item = jsonField(json, "item");
|
|
@@ -92,6 +104,13 @@ export const parseCodexStreamLine = (line) => {
|
|
|
92
104
|
})
|
|
93
105
|
];
|
|
94
106
|
}
|
|
107
|
+
case "collab_tool_call":
|
|
108
|
+
return [
|
|
109
|
+
toolResultChunk(jsonStringField(item, "id"), {
|
|
110
|
+
failed: jsonStringField(item, "status") === "failed",
|
|
111
|
+
tool: jsonStringField(item, "tool") ?? "collab"
|
|
112
|
+
})
|
|
113
|
+
];
|
|
95
114
|
default:
|
|
96
115
|
return [];
|
|
97
116
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CodexConnector.js","sourceRoot":"","sources":["../../src/providers/CodexConnector.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"CodexConnector.js","sourceRoot":"","sources":["../../src/providers/CodexConnector.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PiConnector.d.ts","sourceRoot":"","sources":["../../src/providers/PiConnector.ts"],"names":[],"mappings":"AAEA,OAAO,EAAoB,KAAK,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAC1E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AAE/D,OAAO,EAAuC,QAAQ,EAAc,MAAM,cAAc,CAAA;AACxF,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAA;
|
|
1
|
+
{"version":3,"file":"PiConnector.d.ts","sourceRoot":"","sources":["../../src/providers/PiConnector.ts"],"names":[],"mappings":"AAEA,OAAO,EAAoB,KAAK,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAC1E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AAE/D,OAAO,EAAuC,QAAQ,EAAc,MAAM,cAAc,CAAA;AACxF,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAA;AAqBjE;;;;;;GAMG;AACH,eAAO,MAAM,eAAe,UAAU,CAAA;AAEtC,wEAAwE;AACxE,eAAO,MAAM,iBAAiB,GAAI,aAAa,MAAM,KAAG,MAAM,GAAG,SAchE,CAAA;AAMD,eAAO,MAAM,WAAW,GAAI,QAAQ,kBAAkB,KAAG,aAAa,CAAC,MAAM,CAwB5E,CAAA;AAED,eAAO,MAAM,iBAAiB,GAAI,MAAM,MAAM,KAAG,aAAa,CAAC,QAAQ,CAgHtE,CAAA;AAED,eAAO,MAAM,eAAe,GAC1B,QAAQ,kBAAkB,EAC1B,UAAU,oBAAoB,KAC7B,iBAwFF,CAAA"}
|
|
@@ -3,7 +3,7 @@ import * as Stream from "effect/Stream";
|
|
|
3
3
|
import { makeCliConnector } from "../Connector.js";
|
|
4
4
|
import { InvalidRequestError, ProviderError } from "../Errors.js";
|
|
5
5
|
import { ConnectorCapabilities, ConnectorIds, LlmChunk, TokenUsage } from "../Models.js";
|
|
6
|
-
import { atLeastVersion, effortWord, cumulativeUsage, failClassifiedCliError, jsonBooleanField, jsonField, jsonIntField, jsonStringField, optionalModelArgs, parseJsonLine, sortedFlagArgs, toolEventChunk, toolResultChunk, toolResultText, usageEventChunk, versionTriple } from "./CliSupport.js";
|
|
6
|
+
import { atLeastVersion, effortWord, cumulativeUsage, failClassifiedCliError, jsonBooleanField, jsonField, jsonIntField, jsonStringField, optionalModelArgs, parseJsonLine, sortedFlagArgs, toolEventChunk, toolResultChunk, toolResultText, usageEventChunk, versionTriple, statusChunk } from "./CliSupport.js";
|
|
7
7
|
/**
|
|
8
8
|
* The first pi whose `--tools` allowlist can be kept free of MCP tools: from
|
|
9
9
|
* 1.0.4 `--tools read` keeps every MCP tool the user configured in
|
|
@@ -66,23 +66,35 @@ export const parsePiStreamLine = (line) => {
|
|
|
66
66
|
: undefined;
|
|
67
67
|
return delta === undefined || delta.length === 0 ? [] : [LlmChunk.make({ delta })];
|
|
68
68
|
}
|
|
69
|
-
|
|
69
|
+
// A call nested in another (codemode) names its parent (ADR 0033).
|
|
70
|
+
case "tool_execution_start": {
|
|
71
|
+
const parent = jsonStringField(json, "parentToolCallId");
|
|
70
72
|
return [
|
|
71
|
-
toolEventChunk(jsonStringField(json, "toolName") ?? "", jsonField(json, "args"), jsonStringField(json, "toolCallId"))
|
|
73
|
+
toolEventChunk(jsonStringField(json, "toolName") ?? "", jsonField(json, "args"), jsonStringField(json, "toolCallId"), parent === undefined ? {} : { parent })
|
|
72
74
|
];
|
|
73
|
-
|
|
75
|
+
}
|
|
76
|
+
case "tool_execution_end": {
|
|
77
|
+
const parent = jsonStringField(json, "parentToolCallId");
|
|
78
|
+
const durationMs = jsonIntField(json, "durationMs");
|
|
74
79
|
return [
|
|
75
80
|
toolResultChunk(jsonStringField(json, "toolCallId"), {
|
|
76
81
|
failed: jsonField(json, "isError") === true,
|
|
82
|
+
...(parent === undefined ? {} : { parent }),
|
|
83
|
+
...(durationMs === undefined ? {} : { durationMs }),
|
|
77
84
|
...(() => {
|
|
78
85
|
const output = toolResultText(jsonField(jsonField(json, "result"), "content"));
|
|
79
86
|
return output === undefined ? {} : { output };
|
|
80
87
|
})()
|
|
81
88
|
})
|
|
82
89
|
];
|
|
90
|
+
}
|
|
83
91
|
case "message_end":
|
|
84
92
|
case "agent_end": {
|
|
85
93
|
const message = jsonField(json, "message");
|
|
94
|
+
// An aborted turn (a signal, a steer) is not a reply either.
|
|
95
|
+
if (jsonStringField(message, "stopReason") === "aborted") {
|
|
96
|
+
return [LlmChunk.make({ delta: "", metadata: { piError: "pi aborted the turn" } })];
|
|
97
|
+
}
|
|
86
98
|
// pi reports a provider refusal (a usage limit, an auth failure) as an
|
|
87
99
|
// assistant message that stopped with an error and exits 0; without
|
|
88
100
|
// this it reads as an empty, successful reply.
|
|
@@ -112,6 +124,10 @@ export const parsePiStreamLine = (line) => {
|
|
|
112
124
|
}))
|
|
113
125
|
];
|
|
114
126
|
}
|
|
127
|
+
// A provider retry and a context compaction pause the turn: the lane
|
|
128
|
+
// says so instead of looking stuck (ADR 0033).
|
|
129
|
+
case "auto_retry_start":
|
|
130
|
+
return [statusChunk("retrying", "start", jsonStringField(json, "errorMessage"))];
|
|
115
131
|
case "auto_retry_end":
|
|
116
132
|
return jsonBooleanField(json, "success") === false
|
|
117
133
|
? [
|
|
@@ -122,7 +138,11 @@ export const parsePiStreamLine = (line) => {
|
|
|
122
138
|
}
|
|
123
139
|
})
|
|
124
140
|
]
|
|
125
|
-
: [];
|
|
141
|
+
: [statusChunk("retrying", "end")];
|
|
142
|
+
case "compaction_start":
|
|
143
|
+
return [statusChunk("compacting", "start")];
|
|
144
|
+
case "compaction_end":
|
|
145
|
+
return [statusChunk("compacting", "end")];
|
|
126
146
|
case "extension_error":
|
|
127
147
|
return [
|
|
128
148
|
LlmChunk.make({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PiConnector.js","sourceRoot":"","sources":["../../src/providers/PiConnector.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,gBAAgB,EAA0B,MAAM,iBAAiB,CAAA;AAE1E,OAAO,EAAE,mBAAmB,EAAE,aAAa,EAAiB,MAAM,cAAc,CAAA;AAChF,OAAO,EAAE,qBAAqB,EAAE,YAAY,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAExF,OAAO,EACL,cAAc,EACd,UAAU,EACV,eAAe,EACf,sBAAsB,EACtB,gBAAgB,EAChB,SAAS,EACT,YAAY,EACZ,eAAe,EACf,iBAAiB,EACjB,aAAa,EACb,cAAc,EACd,cAAc,EACd,eAAe,EACf,cAAc,EACd,eAAe,EACf,aAAa,
|
|
1
|
+
{"version":3,"file":"PiConnector.js","sourceRoot":"","sources":["../../src/providers/PiConnector.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -31,7 +31,8 @@ import {
|
|
|
31
31
|
toolResultText,
|
|
32
32
|
usageEventChunk,
|
|
33
33
|
type JsonValue,
|
|
34
|
-
effortWord
|
|
34
|
+
effortWord,
|
|
35
|
+
jsonObjectEntries
|
|
35
36
|
} from "./CliSupport.ts"
|
|
36
37
|
|
|
37
38
|
/**
|
|
@@ -93,6 +94,9 @@ export const parseClaudeCliStreamLine = (line: string): ReadonlyArray<LlmChunk>
|
|
|
93
94
|
return []
|
|
94
95
|
}
|
|
95
96
|
|
|
97
|
+
// A sub-agent's lines carry the id of the Agent call that spawned it (ADR 0033).
|
|
98
|
+
const parentId = jsonStringField(json, "parent_tool_use_id")
|
|
99
|
+
const parent = parentId === undefined || parentId.length === 0 ? {} : { parent: parentId }
|
|
96
100
|
switch (jsonStringField(json, "type")) {
|
|
97
101
|
case "assistant":
|
|
98
102
|
return jsonArray(jsonField(jsonField(json, "message"), "content")).flatMap(
|
|
@@ -107,7 +111,8 @@ export const parseClaudeCliStreamLine = (line: string): ReadonlyArray<LlmChunk>
|
|
|
107
111
|
toolEventChunk(
|
|
108
112
|
jsonStringField(block, "name") ?? "",
|
|
109
113
|
jsonField(block, "input"),
|
|
110
|
-
jsonStringField(block, "id")
|
|
114
|
+
jsonStringField(block, "id"),
|
|
115
|
+
parent
|
|
111
116
|
)
|
|
112
117
|
]
|
|
113
118
|
default:
|
|
@@ -123,6 +128,7 @@ export const parseClaudeCliStreamLine = (line: string): ReadonlyArray<LlmChunk>
|
|
|
123
128
|
? [
|
|
124
129
|
toolResultChunk(jsonStringField(block, "tool_use_id"), {
|
|
125
130
|
failed: jsonField(block, "is_error") === true,
|
|
131
|
+
...parent,
|
|
126
132
|
...outputOf(jsonField(block, "content"))
|
|
127
133
|
})
|
|
128
134
|
]
|
|
@@ -133,21 +139,38 @@ export const parseClaudeCliStreamLine = (line: string): ReadonlyArray<LlmChunk>
|
|
|
133
139
|
if (usage === undefined) {
|
|
134
140
|
return []
|
|
135
141
|
}
|
|
136
|
-
const prompt = jsonIntField(usage, "input_tokens") ?? 0
|
|
137
|
-
const completion = jsonIntField(usage, "output_tokens") ?? 0
|
|
138
|
-
const cached = jsonIntField(usage, "cache_read_input_tokens")
|
|
139
142
|
// The CLI reports its own exact cost on the result event; carry it so
|
|
140
143
|
// trackers prefer it over pricing-table estimates. modelUsage's key is
|
|
141
|
-
// a model-name fallback for when no init line was observed
|
|
144
|
+
// a model-name fallback for when no init line was observed, and its
|
|
145
|
+
// per-model counts include the sub-agents' turns, which `usage` leaves
|
|
146
|
+
// out (ADR 0033): sum them when they are there.
|
|
142
147
|
const costUsd = jsonNumberField(json, "total_cost_usd")
|
|
143
|
-
const
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
148
|
+
const modelNames = jsonObjectEntries(jsonField(json, "modelUsage")).map(([name]) => name)
|
|
149
|
+
// Only entries that count tokens can replace `usage`; a key-only
|
|
150
|
+
// modelUsage (older CLIs, fixtures) still names the model.
|
|
151
|
+
const perModel = jsonObjectEntries(jsonField(json, "modelUsage")).filter(
|
|
152
|
+
([, entry]) =>
|
|
153
|
+
jsonIntField(entry, "inputTokens") !== undefined ||
|
|
154
|
+
jsonIntField(entry, "outputTokens") !== undefined
|
|
155
|
+
)
|
|
156
|
+
const summed = perModel.reduce(
|
|
157
|
+
(sum, [, entry]) => ({
|
|
158
|
+
prompt: sum.prompt + (jsonIntField(entry, "inputTokens") ?? 0),
|
|
159
|
+
completion: sum.completion + (jsonIntField(entry, "outputTokens") ?? 0),
|
|
160
|
+
cached: sum.cached + (jsonIntField(entry, "cacheReadInputTokens") ?? 0)
|
|
161
|
+
}),
|
|
162
|
+
{ prompt: 0, completion: 0, cached: 0 }
|
|
163
|
+
)
|
|
164
|
+
const prompt =
|
|
165
|
+
perModel.length === 0 ? (jsonIntField(usage, "input_tokens") ?? 0) : summed.prompt
|
|
166
|
+
const completion =
|
|
167
|
+
perModel.length === 0 ? (jsonIntField(usage, "output_tokens") ?? 0) : summed.completion
|
|
168
|
+
const cached =
|
|
169
|
+
perModel.length === 0
|
|
170
|
+
? jsonIntField(usage, "cache_read_input_tokens")
|
|
171
|
+
: summed.cached === 0
|
|
172
|
+
? undefined
|
|
173
|
+
: summed.cached
|
|
151
174
|
return [
|
|
152
175
|
usageEventChunk(
|
|
153
176
|
modelNames.length === 1 ? modelNames[0] : undefined,
|
|
@@ -75,14 +75,25 @@ export const optionalModelArgs = (model: string | undefined): ReadonlyArray<stri
|
|
|
75
75
|
export const effortWord = (effort: Effort, top: "max" | "xhigh" = "max"): string =>
|
|
76
76
|
effort === "max" ? top : effort
|
|
77
77
|
|
|
78
|
-
export const toolEventChunk = (
|
|
78
|
+
export const toolEventChunk = (
|
|
79
|
+
name: string,
|
|
80
|
+
input: JsonValue | undefined,
|
|
81
|
+
id?: string,
|
|
82
|
+
options: {
|
|
83
|
+
/** The tool call this one runs inside, when a harness delegated it to a sub-agent (ADR 0033). */
|
|
84
|
+
readonly parent?: string
|
|
85
|
+
} = {}
|
|
86
|
+
): LlmChunk =>
|
|
79
87
|
LlmChunk.make({
|
|
80
88
|
delta: "",
|
|
81
89
|
metadata: {
|
|
82
90
|
event: "tool_use",
|
|
83
91
|
tool_name: name,
|
|
84
92
|
tool_input: input === undefined ? "{}" : jsonText(input),
|
|
85
|
-
...(id === undefined || id.length === 0 ? {} : { tool_id: id })
|
|
93
|
+
...(id === undefined || id.length === 0 ? {} : { tool_id: id }),
|
|
94
|
+
...(options.parent === undefined || options.parent.length === 0
|
|
95
|
+
? {}
|
|
96
|
+
: { parent: options.parent })
|
|
86
97
|
}
|
|
87
98
|
})
|
|
88
99
|
|
|
@@ -117,6 +128,10 @@ export const toolResultChunk = (
|
|
|
117
128
|
readonly input?: JsonValue
|
|
118
129
|
/** What the tool returned, for an opt-in transcript; never in the trace. */
|
|
119
130
|
readonly output?: string
|
|
131
|
+
/** The tool call this one ran inside (ADR 0033). */
|
|
132
|
+
readonly parent?: string
|
|
133
|
+
/** How long the harness says the tool ran, when it reports that itself. */
|
|
134
|
+
readonly durationMs?: number
|
|
120
135
|
} = {}
|
|
121
136
|
): LlmChunk =>
|
|
122
137
|
LlmChunk.make({
|
|
@@ -125,6 +140,12 @@ export const toolResultChunk = (
|
|
|
125
140
|
event: "tool_result",
|
|
126
141
|
...(id === undefined || id.length === 0 ? {} : { tool_id: id }),
|
|
127
142
|
...(options.failed === true ? { tool_failed: "true" } : {}),
|
|
143
|
+
...(options.parent === undefined || options.parent.length === 0
|
|
144
|
+
? {}
|
|
145
|
+
: { parent: options.parent }),
|
|
146
|
+
...(options.durationMs === undefined || !Number.isFinite(options.durationMs)
|
|
147
|
+
? {}
|
|
148
|
+
: { tool_duration_ms: String(Math.max(0, Math.round(options.durationMs))) }),
|
|
128
149
|
...(options.tool === undefined ? {} : { tool_name: options.tool }),
|
|
129
150
|
...(options.input === undefined ? {} : { tool_input: jsonText(options.input) }),
|
|
130
151
|
...(options.output === undefined ? {} : { tool_content: options.output })
|
|
@@ -242,3 +263,22 @@ export const atLeastVersion = (
|
|
|
242
263
|
}
|
|
243
264
|
return true
|
|
244
265
|
}
|
|
266
|
+
|
|
267
|
+
/**
|
|
268
|
+
* A harness pausing a turn on its own account — a provider retry, a context
|
|
269
|
+
* compaction — so the lane can say so instead of looking stuck (ADR 0033).
|
|
270
|
+
*/
|
|
271
|
+
export const statusChunk = (
|
|
272
|
+
status: "retrying" | "compacting",
|
|
273
|
+
phase: "start" | "end",
|
|
274
|
+
detail?: string
|
|
275
|
+
): LlmChunk =>
|
|
276
|
+
LlmChunk.make({
|
|
277
|
+
delta: "",
|
|
278
|
+
metadata: {
|
|
279
|
+
event: "status",
|
|
280
|
+
status,
|
|
281
|
+
phase,
|
|
282
|
+
...(detail === undefined || detail.length === 0 ? {} : { status_detail: detail })
|
|
283
|
+
}
|
|
284
|
+
})
|
|
@@ -97,15 +97,31 @@ export const parseCodexStreamLine = (line: string): ReadonlyArray<LlmChunk> => {
|
|
|
97
97
|
switch (jsonStringField(json, "type")) {
|
|
98
98
|
case "item.started": {
|
|
99
99
|
const item = jsonField(json, "item")
|
|
100
|
-
|
|
101
|
-
|
|
100
|
+
switch (jsonStringField(item, "type")) {
|
|
101
|
+
case "command_execution":
|
|
102
|
+
return [
|
|
102
103
|
toolEventChunk(
|
|
103
104
|
"Bash",
|
|
104
105
|
{ command: jsonStringField(item, "command") ?? "" },
|
|
105
106
|
jsonStringField(item, "id")
|
|
106
107
|
)
|
|
107
108
|
]
|
|
108
|
-
:
|
|
109
|
+
// A sub-agent call (spawn_agent, wait, send_input, close_agent): the
|
|
110
|
+
// delegation shows as a tool, its threads as the arguments (ADR 0033).
|
|
111
|
+
case "collab_tool_call":
|
|
112
|
+
return [
|
|
113
|
+
toolEventChunk(
|
|
114
|
+
jsonStringField(item, "tool") ?? "collab",
|
|
115
|
+
{
|
|
116
|
+
prompt: jsonStringField(item, "prompt") ?? "",
|
|
117
|
+
receivers: jsonField(item, "receiver_thread_ids") ?? []
|
|
118
|
+
},
|
|
119
|
+
jsonStringField(item, "id")
|
|
120
|
+
)
|
|
121
|
+
]
|
|
122
|
+
default:
|
|
123
|
+
return []
|
|
124
|
+
}
|
|
109
125
|
}
|
|
110
126
|
case "item.completed": {
|
|
111
127
|
const item = jsonField(json, "item")
|
|
@@ -129,6 +145,13 @@ export const parseCodexStreamLine = (line: string): ReadonlyArray<LlmChunk> => {
|
|
|
129
145
|
})
|
|
130
146
|
]
|
|
131
147
|
}
|
|
148
|
+
case "collab_tool_call":
|
|
149
|
+
return [
|
|
150
|
+
toolResultChunk(jsonStringField(item, "id"), {
|
|
151
|
+
failed: jsonStringField(item, "status") === "failed",
|
|
152
|
+
tool: jsonStringField(item, "tool") ?? "collab"
|
|
153
|
+
})
|
|
154
|
+
]
|
|
132
155
|
default:
|
|
133
156
|
return []
|
|
134
157
|
}
|
|
@@ -21,7 +21,8 @@ import {
|
|
|
21
21
|
toolResultChunk,
|
|
22
22
|
toolResultText,
|
|
23
23
|
usageEventChunk,
|
|
24
|
-
versionTriple
|
|
24
|
+
versionTriple,
|
|
25
|
+
statusChunk
|
|
25
26
|
} from "./CliSupport.ts"
|
|
26
27
|
|
|
27
28
|
/**
|
|
@@ -95,27 +96,40 @@ export const parsePiStreamLine = (line: string): ReadonlyArray<LlmChunk> => {
|
|
|
95
96
|
: undefined
|
|
96
97
|
return delta === undefined || delta.length === 0 ? [] : [LlmChunk.make({ delta })]
|
|
97
98
|
}
|
|
98
|
-
|
|
99
|
+
// A call nested in another (codemode) names its parent (ADR 0033).
|
|
100
|
+
case "tool_execution_start": {
|
|
101
|
+
const parent = jsonStringField(json, "parentToolCallId")
|
|
99
102
|
return [
|
|
100
103
|
toolEventChunk(
|
|
101
104
|
jsonStringField(json, "toolName") ?? "",
|
|
102
105
|
jsonField(json, "args"),
|
|
103
|
-
jsonStringField(json, "toolCallId")
|
|
106
|
+
jsonStringField(json, "toolCallId"),
|
|
107
|
+
parent === undefined ? {} : { parent }
|
|
104
108
|
)
|
|
105
109
|
]
|
|
106
|
-
|
|
110
|
+
}
|
|
111
|
+
case "tool_execution_end": {
|
|
112
|
+
const parent = jsonStringField(json, "parentToolCallId")
|
|
113
|
+
const durationMs = jsonIntField(json, "durationMs")
|
|
107
114
|
return [
|
|
108
115
|
toolResultChunk(jsonStringField(json, "toolCallId"), {
|
|
109
116
|
failed: jsonField(json, "isError") === true,
|
|
117
|
+
...(parent === undefined ? {} : { parent }),
|
|
118
|
+
...(durationMs === undefined ? {} : { durationMs }),
|
|
110
119
|
...(() => {
|
|
111
120
|
const output = toolResultText(jsonField(jsonField(json, "result"), "content"))
|
|
112
121
|
return output === undefined ? {} : { output }
|
|
113
122
|
})()
|
|
114
123
|
})
|
|
115
124
|
]
|
|
125
|
+
}
|
|
116
126
|
case "message_end":
|
|
117
127
|
case "agent_end": {
|
|
118
128
|
const message = jsonField(json, "message")
|
|
129
|
+
// An aborted turn (a signal, a steer) is not a reply either.
|
|
130
|
+
if (jsonStringField(message, "stopReason") === "aborted") {
|
|
131
|
+
return [LlmChunk.make({ delta: "", metadata: { piError: "pi aborted the turn" } })]
|
|
132
|
+
}
|
|
119
133
|
// pi reports a provider refusal (a usage limit, an auth failure) as an
|
|
120
134
|
// assistant message that stopped with an error and exits 0; without
|
|
121
135
|
// this it reads as an empty, successful reply.
|
|
@@ -148,6 +162,10 @@ export const parsePiStreamLine = (line: string): ReadonlyArray<LlmChunk> => {
|
|
|
148
162
|
)
|
|
149
163
|
]
|
|
150
164
|
}
|
|
165
|
+
// A provider retry and a context compaction pause the turn: the lane
|
|
166
|
+
// says so instead of looking stuck (ADR 0033).
|
|
167
|
+
case "auto_retry_start":
|
|
168
|
+
return [statusChunk("retrying", "start", jsonStringField(json, "errorMessage"))]
|
|
151
169
|
case "auto_retry_end":
|
|
152
170
|
return jsonBooleanField(json, "success") === false
|
|
153
171
|
? [
|
|
@@ -158,7 +176,11 @@ export const parsePiStreamLine = (line: string): ReadonlyArray<LlmChunk> => {
|
|
|
158
176
|
}
|
|
159
177
|
})
|
|
160
178
|
]
|
|
161
|
-
: []
|
|
179
|
+
: [statusChunk("retrying", "end")]
|
|
180
|
+
case "compaction_start":
|
|
181
|
+
return [statusChunk("compacting", "start")]
|
|
182
|
+
case "compaction_end":
|
|
183
|
+
return [statusChunk("compacting", "end")]
|
|
162
184
|
case "extension_error":
|
|
163
185
|
return [
|
|
164
186
|
LlmChunk.make({
|