@code-yeongyu/senpi-ai 2026.7.28 → 2026.7.29-4
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/api/openai-client-auth.d.ts +7 -0
- package/dist/api/openai-client-auth.d.ts.map +1 -0
- package/dist/api/openai-client-auth.js +15 -0
- package/dist/api/openai-client-auth.js.map +1 -0
- package/dist/api/openai-completions.d.ts.map +1 -1
- package/dist/api/openai-completions.js +125 -58
- package/dist/api/openai-completions.js.map +1 -1
- package/dist/api/openai-responses.d.ts.map +1 -1
- package/dist/api/openai-responses.js +9 -22
- package/dist/api/openai-responses.js.map +1 -1
- package/dist/auth/headers.d.ts +5 -0
- package/dist/auth/headers.d.ts.map +1 -0
- package/dist/auth/headers.js +41 -0
- package/dist/auth/headers.js.map +1 -0
- package/dist/index.d.ts +3 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +3 -1
- package/dist/index.js.map +1 -1
- package/dist/providers/data/.manifest.json +1 -1
- package/dist/providers/data/openrouter.json +1 -1
- package/dist/providers/data/vercel-ai-gateway.json +1 -1
- package/dist/tool-call-middleware/context-transformer.d.ts.map +1 -1
- package/dist/tool-call-middleware/context-transformer.js +9 -0
- package/dist/tool-call-middleware/context-transformer.js.map +1 -1
- package/dist/tool-call-middleware/index.d.ts +5 -0
- package/dist/tool-call-middleware/index.d.ts.map +1 -1
- package/dist/tool-call-middleware/index.js +12 -2
- package/dist/tool-call-middleware/index.js.map +1 -1
- package/dist/tool-call-middleware/protocols/kimi-xtml/format.d.ts +5 -0
- package/dist/tool-call-middleware/protocols/kimi-xtml/format.d.ts.map +1 -0
- package/dist/tool-call-middleware/protocols/kimi-xtml/format.js +54 -0
- package/dist/tool-call-middleware/protocols/kimi-xtml/format.js.map +1 -0
- package/dist/tool-call-middleware/protocols/kimi-xtml/index.d.ts +4 -0
- package/dist/tool-call-middleware/protocols/kimi-xtml/index.d.ts.map +1 -0
- package/dist/tool-call-middleware/protocols/kimi-xtml/index.js +4 -0
- package/dist/tool-call-middleware/protocols/kimi-xtml/index.js.map +1 -0
- package/dist/tool-call-middleware/protocols/kimi-xtml/markers.d.ts +10 -0
- package/dist/tool-call-middleware/protocols/kimi-xtml/markers.d.ts.map +1 -0
- package/dist/tool-call-middleware/protocols/kimi-xtml/markers.js +30 -0
- package/dist/tool-call-middleware/protocols/kimi-xtml/markers.js.map +1 -0
- package/dist/tool-call-middleware/protocols/kimi-xtml/parse.d.ts +12 -0
- package/dist/tool-call-middleware/protocols/kimi-xtml/parse.d.ts.map +1 -0
- package/dist/tool-call-middleware/protocols/kimi-xtml/parse.js +95 -0
- package/dist/tool-call-middleware/protocols/kimi-xtml/parse.js.map +1 -0
- package/dist/tool-call-middleware/protocols/kimi-xtml/recovery-stream.d.ts +5 -0
- package/dist/tool-call-middleware/protocols/kimi-xtml/recovery-stream.d.ts.map +1 -0
- package/dist/tool-call-middleware/protocols/kimi-xtml/recovery-stream.js +207 -0
- package/dist/tool-call-middleware/protocols/kimi-xtml/recovery-stream.js.map +1 -0
- package/dist/tool-call-middleware/protocols/kimi-xtml/stream.d.ts +4 -0
- package/dist/tool-call-middleware/protocols/kimi-xtml/stream.d.ts.map +1 -0
- package/dist/tool-call-middleware/protocols/kimi-xtml/stream.js +181 -0
- package/dist/tool-call-middleware/protocols/kimi-xtml/stream.js.map +1 -0
- package/dist/tool-call-middleware/recovery-diagnostics.d.ts +2 -1
- package/dist/tool-call-middleware/recovery-diagnostics.d.ts.map +1 -1
- package/dist/tool-call-middleware/recovery-diagnostics.js +2 -2
- package/dist/tool-call-middleware/recovery-diagnostics.js.map +1 -1
- package/dist/tool-call-middleware/recovery-native-projection.d.ts +3 -2
- package/dist/tool-call-middleware/recovery-native-projection.d.ts.map +1 -1
- package/dist/tool-call-middleware/recovery-native-projection.js +3 -2
- package/dist/tool-call-middleware/recovery-native-projection.js.map +1 -1
- package/dist/tool-call-middleware/recovery-stream-failure.d.ts +6 -1
- package/dist/tool-call-middleware/recovery-stream-failure.d.ts.map +1 -1
- package/dist/tool-call-middleware/recovery-stream-failure.js +3 -2
- package/dist/tool-call-middleware/recovery-stream-failure.js.map +1 -1
- package/dist/tool-call-middleware/recovery-stream-wrapper.d.ts +7 -1
- package/dist/tool-call-middleware/recovery-stream-wrapper.d.ts.map +1 -1
- package/dist/tool-call-middleware/recovery-stream-wrapper.js +12 -5
- package/dist/tool-call-middleware/recovery-stream-wrapper.js.map +1 -1
- package/dist/tool-call-middleware/recovery-text-projection.d.ts +7 -1
- package/dist/tool-call-middleware/recovery-text-projection.d.ts.map +1 -1
- package/dist/tool-call-middleware/recovery-text-projection.js +6 -4
- package/dist/tool-call-middleware/recovery-text-projection.js.map +1 -1
- package/dist/tool-call-middleware/types.d.ts +2 -1
- package/dist/tool-call-middleware/types.d.ts.map +1 -1
- package/dist/tool-call-middleware/types.js.map +1 -1
- package/dist/types.d.ts +1 -1
- package/dist/types.js.map +1 -1
- package/dist/utils/retry.d.ts +7 -0
- package/dist/utils/retry.d.ts.map +1 -1
- package/dist/utils/retry.js +29 -0
- package/dist/utils/retry.js.map +1 -1
- package/package.json +14 -14
|
@@ -0,0 +1,207 @@
|
|
|
1
|
+
import { getPartialXtmlSuffix, parseXtmlAttributes, XTML_ARGUMENT_CLOSE, XTML_ARGUMENT_OPEN, XTML_CALL_CLOSE, XTML_CALL_OPEN, XTML_SEP, XTML_TOOLS_CLOSE, XTML_TOOLS_OPEN, } from "./markers.js";
|
|
2
|
+
import { coerceXtmlArgumentValue } from "./parse.js";
|
|
3
|
+
const CHANNEL_MARKER_PATTERN = /^<\|(?:open|close)\|>[a-zA-Z_][a-zA-Z0-9_]*<\|sep\|>/;
|
|
4
|
+
const OPEN_PREFIX = "<|open|>";
|
|
5
|
+
const CLOSE_PREFIX = "<|close|>";
|
|
6
|
+
function couldBeMarkerPrefix(tail) {
|
|
7
|
+
if (OPEN_PREFIX.startsWith(tail) || CLOSE_PREFIX.startsWith(tail))
|
|
8
|
+
return true;
|
|
9
|
+
for (const prefix of [OPEN_PREFIX, CLOSE_PREFIX]) {
|
|
10
|
+
if (!tail.startsWith(prefix))
|
|
11
|
+
continue;
|
|
12
|
+
const rest = tail.slice(prefix.length);
|
|
13
|
+
const angleIndex = rest.indexOf("<");
|
|
14
|
+
if (angleIndex === -1)
|
|
15
|
+
return /^[a-zA-Z0-9_]*$/.test(rest);
|
|
16
|
+
if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(rest.slice(0, angleIndex)))
|
|
17
|
+
return false;
|
|
18
|
+
return XTML_SEP.startsWith(rest.slice(angleIndex));
|
|
19
|
+
}
|
|
20
|
+
return false;
|
|
21
|
+
}
|
|
22
|
+
export function createXtmlRecoveryStreamParser(tools, options) {
|
|
23
|
+
let buffer = "";
|
|
24
|
+
let mode = "text";
|
|
25
|
+
let callIndex = -1;
|
|
26
|
+
let callName = "";
|
|
27
|
+
let callArgs = {};
|
|
28
|
+
let callStarted = false;
|
|
29
|
+
let callInvalidReason = null;
|
|
30
|
+
let argumentKey = "";
|
|
31
|
+
let argumentType;
|
|
32
|
+
function resetCall() {
|
|
33
|
+
callName = "";
|
|
34
|
+
callArgs = {};
|
|
35
|
+
callStarted = false;
|
|
36
|
+
callInvalidReason = null;
|
|
37
|
+
argumentKey = "";
|
|
38
|
+
argumentType = undefined;
|
|
39
|
+
}
|
|
40
|
+
function endCall(events, incomplete) {
|
|
41
|
+
if (!callStarted) {
|
|
42
|
+
resetCall();
|
|
43
|
+
return;
|
|
44
|
+
}
|
|
45
|
+
const event = {
|
|
46
|
+
type: "toolcall_end",
|
|
47
|
+
index: callIndex,
|
|
48
|
+
name: callName,
|
|
49
|
+
id: `recovered-xtml-${callIndex}`,
|
|
50
|
+
arguments: callArgs,
|
|
51
|
+
};
|
|
52
|
+
if (incomplete) {
|
|
53
|
+
event.incomplete = true;
|
|
54
|
+
if (callInvalidReason)
|
|
55
|
+
event.errorMessage = callInvalidReason;
|
|
56
|
+
}
|
|
57
|
+
events.push(event);
|
|
58
|
+
resetCall();
|
|
59
|
+
mode = "tools";
|
|
60
|
+
}
|
|
61
|
+
function processText(events) {
|
|
62
|
+
const openIndex = buffer.indexOf(OPEN_PREFIX);
|
|
63
|
+
const closeIndex = buffer.indexOf(CLOSE_PREFIX);
|
|
64
|
+
const markerIndex = [openIndex, closeIndex].filter((index) => index !== -1).sort((a, b) => a - b)[0];
|
|
65
|
+
if (markerIndex === undefined) {
|
|
66
|
+
const partial = getPartialXtmlSuffix(buffer, [OPEN_PREFIX, CLOSE_PREFIX]);
|
|
67
|
+
const flushable = partial ? buffer.slice(0, -partial.length) : buffer;
|
|
68
|
+
if (flushable)
|
|
69
|
+
events.push({ type: "text", text: flushable });
|
|
70
|
+
buffer = partial;
|
|
71
|
+
return false;
|
|
72
|
+
}
|
|
73
|
+
if (markerIndex > 0) {
|
|
74
|
+
events.push({ type: "text", text: buffer.slice(0, markerIndex) });
|
|
75
|
+
buffer = buffer.slice(markerIndex);
|
|
76
|
+
return true;
|
|
77
|
+
}
|
|
78
|
+
const markerMatch = CHANNEL_MARKER_PATTERN.exec(buffer);
|
|
79
|
+
if (markerMatch) {
|
|
80
|
+
const marker = markerMatch[0];
|
|
81
|
+
buffer = buffer.slice(marker.length);
|
|
82
|
+
if (marker === XTML_TOOLS_OPEN)
|
|
83
|
+
mode = "tools";
|
|
84
|
+
return true;
|
|
85
|
+
}
|
|
86
|
+
if (couldBeMarkerPrefix(buffer))
|
|
87
|
+
return false;
|
|
88
|
+
events.push({ type: "text", text: buffer.slice(0, 2) });
|
|
89
|
+
buffer = buffer.slice(2);
|
|
90
|
+
return true;
|
|
91
|
+
}
|
|
92
|
+
function process(events) {
|
|
93
|
+
for (;;) {
|
|
94
|
+
if (mode === "text") {
|
|
95
|
+
if (!processText(events))
|
|
96
|
+
return;
|
|
97
|
+
continue;
|
|
98
|
+
}
|
|
99
|
+
if (mode === "tools") {
|
|
100
|
+
const callStart = buffer.indexOf(XTML_CALL_OPEN);
|
|
101
|
+
const toolsEnd = buffer.indexOf(XTML_TOOLS_CLOSE);
|
|
102
|
+
if (toolsEnd !== -1 && (callStart === -1 || toolsEnd < callStart)) {
|
|
103
|
+
buffer = buffer.slice(toolsEnd + XTML_TOOLS_CLOSE.length);
|
|
104
|
+
mode = "text";
|
|
105
|
+
continue;
|
|
106
|
+
}
|
|
107
|
+
if (callStart === -1)
|
|
108
|
+
return;
|
|
109
|
+
buffer = buffer.slice(callStart + XTML_CALL_OPEN.length);
|
|
110
|
+
mode = "call-header";
|
|
111
|
+
continue;
|
|
112
|
+
}
|
|
113
|
+
if (mode === "call-header" || mode === "argument-header") {
|
|
114
|
+
const sepIndex = buffer.indexOf(XTML_SEP);
|
|
115
|
+
if (sepIndex === -1)
|
|
116
|
+
return;
|
|
117
|
+
const attributes = parseXtmlAttributes(buffer.slice(0, sepIndex));
|
|
118
|
+
buffer = buffer.slice(sepIndex + XTML_SEP.length);
|
|
119
|
+
if (mode === "call-header") {
|
|
120
|
+
const name = attributes.tool ?? "";
|
|
121
|
+
if (!tools.some((candidate) => candidate.name === name)) {
|
|
122
|
+
options?.onError?.(`kimi-xtml recovery: call for unknown tool "${name}".`, {});
|
|
123
|
+
mode = "discard-call";
|
|
124
|
+
continue;
|
|
125
|
+
}
|
|
126
|
+
callIndex += 1;
|
|
127
|
+
callName = name;
|
|
128
|
+
callStarted = true;
|
|
129
|
+
events.push({ type: "toolcall_start", index: callIndex, name, id: `recovered-xtml-${callIndex}` });
|
|
130
|
+
mode = "call-body";
|
|
131
|
+
continue;
|
|
132
|
+
}
|
|
133
|
+
argumentKey = attributes.key ?? "";
|
|
134
|
+
argumentType = attributes.type;
|
|
135
|
+
mode = "argument-value";
|
|
136
|
+
continue;
|
|
137
|
+
}
|
|
138
|
+
if (mode === "call-body") {
|
|
139
|
+
const argStart = buffer.indexOf(XTML_ARGUMENT_OPEN);
|
|
140
|
+
const callEnd = buffer.indexOf(XTML_CALL_CLOSE);
|
|
141
|
+
if (callEnd !== -1 && (argStart === -1 || callEnd < argStart)) {
|
|
142
|
+
buffer = buffer.slice(callEnd + XTML_CALL_CLOSE.length);
|
|
143
|
+
endCall(events, callInvalidReason !== null);
|
|
144
|
+
continue;
|
|
145
|
+
}
|
|
146
|
+
if (argStart === -1)
|
|
147
|
+
return;
|
|
148
|
+
buffer = buffer.slice(argStart + XTML_ARGUMENT_OPEN.length);
|
|
149
|
+
mode = "argument-header";
|
|
150
|
+
continue;
|
|
151
|
+
}
|
|
152
|
+
if (mode === "argument-value") {
|
|
153
|
+
const valueEnd = buffer.indexOf(XTML_ARGUMENT_CLOSE);
|
|
154
|
+
if (valueEnd === -1)
|
|
155
|
+
return;
|
|
156
|
+
const coerced = coerceXtmlArgumentValue(buffer.slice(0, valueEnd), argumentType);
|
|
157
|
+
buffer = buffer.slice(valueEnd + XTML_ARGUMENT_CLOSE.length);
|
|
158
|
+
if (!coerced.ok) {
|
|
159
|
+
callInvalidReason = `kimi-xtml recovery: invalid value for argument "${argumentKey}".`;
|
|
160
|
+
options?.onError?.(callInvalidReason, { toolCall: callName });
|
|
161
|
+
}
|
|
162
|
+
else if (argumentKey) {
|
|
163
|
+
callArgs[argumentKey] = coerced.value;
|
|
164
|
+
events.push({ type: "toolcall_delta", index: callIndex, argumentsDelta: JSON.stringify(callArgs) });
|
|
165
|
+
}
|
|
166
|
+
mode = "call-body";
|
|
167
|
+
continue;
|
|
168
|
+
}
|
|
169
|
+
const callEnd = buffer.indexOf(XTML_CALL_CLOSE);
|
|
170
|
+
if (callEnd === -1)
|
|
171
|
+
return;
|
|
172
|
+
buffer = buffer.slice(callEnd + XTML_CALL_CLOSE.length);
|
|
173
|
+
resetCall();
|
|
174
|
+
mode = "tools";
|
|
175
|
+
}
|
|
176
|
+
}
|
|
177
|
+
return {
|
|
178
|
+
feed(textDelta) {
|
|
179
|
+
buffer += textDelta;
|
|
180
|
+
const events = [];
|
|
181
|
+
process(events);
|
|
182
|
+
return events;
|
|
183
|
+
},
|
|
184
|
+
interrupt() {
|
|
185
|
+
const events = [];
|
|
186
|
+
if (mode === "text" && buffer) {
|
|
187
|
+
events.push({ type: "text", text: buffer });
|
|
188
|
+
buffer = "";
|
|
189
|
+
}
|
|
190
|
+
return events;
|
|
191
|
+
},
|
|
192
|
+
finish() {
|
|
193
|
+
const events = [];
|
|
194
|
+
if (mode === "text") {
|
|
195
|
+
if (buffer)
|
|
196
|
+
events.push({ type: "text", text: buffer });
|
|
197
|
+
}
|
|
198
|
+
else if (callStarted) {
|
|
199
|
+
endCall(events, true);
|
|
200
|
+
}
|
|
201
|
+
buffer = "";
|
|
202
|
+
mode = "text";
|
|
203
|
+
return events;
|
|
204
|
+
},
|
|
205
|
+
};
|
|
206
|
+
}
|
|
207
|
+
//# sourceMappingURL=recovery-stream.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"recovery-stream.js","sourceRoot":"","sources":["../../../../src/tool-call-middleware/protocols/kimi-xtml/recovery-stream.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Tool } from \"../../../types.ts\";\nimport type { ParserOptions, StreamParserEvent } from \"../../types.ts\";\nimport type { RecoveryStreamParser } from \"../anthropic-xml/recovery-stream.ts\";\nimport {\n\tgetPartialXtmlSuffix,\n\tparseXtmlAttributes,\n\tXTML_ARGUMENT_CLOSE,\n\tXTML_ARGUMENT_OPEN,\n\tXTML_CALL_CLOSE,\n\tXTML_CALL_OPEN,\n\tXTML_SEP,\n\tXTML_TOOLS_CLOSE,\n\tXTML_TOOLS_OPEN,\n} from \"./markers.ts\";\nimport { coerceXtmlArgumentValue } from \"./parse.ts\";\n\ntype ParserMode =\n\t| \"text\"\n\t| \"tools\"\n\t| \"call-header\"\n\t| \"call-body\"\n\t| \"argument-header\"\n\t| \"argument-value\"\n\t| \"discard-call\";\n\nconst CHANNEL_MARKER_PATTERN = /^<\\|(?:open|close)\\|>[a-zA-Z_][a-zA-Z0-9_]*<\\|sep\\|>/;\nconst OPEN_PREFIX = \"<|open|>\";\nconst CLOSE_PREFIX = \"<|close|>\";\n\nfunction couldBeMarkerPrefix(tail: string): boolean {\n\tif (OPEN_PREFIX.startsWith(tail) || CLOSE_PREFIX.startsWith(tail)) return true;\n\tfor (const prefix of [OPEN_PREFIX, CLOSE_PREFIX]) {\n\t\tif (!tail.startsWith(prefix)) continue;\n\t\tconst rest = tail.slice(prefix.length);\n\t\tconst angleIndex = rest.indexOf(\"<\");\n\t\tif (angleIndex === -1) return /^[a-zA-Z0-9_]*$/.test(rest);\n\t\tif (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(rest.slice(0, angleIndex))) return false;\n\t\treturn XTML_SEP.startsWith(rest.slice(angleIndex));\n\t}\n\treturn false;\n}\n\nexport function createXtmlRecoveryStreamParser(tools: readonly Tool[], options?: ParserOptions): RecoveryStreamParser {\n\tlet buffer = \"\";\n\tlet mode: ParserMode = \"text\";\n\tlet callIndex = -1;\n\tlet callName = \"\";\n\tlet callArgs: Record<string, unknown> = {};\n\tlet callStarted = false;\n\tlet callInvalidReason: string | null = null;\n\tlet argumentKey = \"\";\n\tlet argumentType: string | undefined;\n\n\tfunction resetCall(): void {\n\t\tcallName = \"\";\n\t\tcallArgs = {};\n\t\tcallStarted = false;\n\t\tcallInvalidReason = null;\n\t\targumentKey = \"\";\n\t\targumentType = undefined;\n\t}\n\n\tfunction endCall(events: StreamParserEvent[], incomplete: boolean): void {\n\t\tif (!callStarted) {\n\t\t\tresetCall();\n\t\t\treturn;\n\t\t}\n\t\tconst event: StreamParserEvent = {\n\t\t\ttype: \"toolcall_end\",\n\t\t\tindex: callIndex,\n\t\t\tname: callName,\n\t\t\tid: `recovered-xtml-${callIndex}`,\n\t\t\targuments: callArgs,\n\t\t};\n\t\tif (incomplete) {\n\t\t\tevent.incomplete = true;\n\t\t\tif (callInvalidReason) event.errorMessage = callInvalidReason;\n\t\t}\n\t\tevents.push(event);\n\t\tresetCall();\n\t\tmode = \"tools\";\n\t}\n\n\tfunction processText(events: StreamParserEvent[]): boolean {\n\t\tconst openIndex = buffer.indexOf(OPEN_PREFIX);\n\t\tconst closeIndex = buffer.indexOf(CLOSE_PREFIX);\n\t\tconst markerIndex = [openIndex, closeIndex].filter((index) => index !== -1).sort((a, b) => a - b)[0];\n\t\tif (markerIndex === undefined) {\n\t\t\tconst partial = getPartialXtmlSuffix(buffer, [OPEN_PREFIX, CLOSE_PREFIX]);\n\t\t\tconst flushable = partial ? buffer.slice(0, -partial.length) : buffer;\n\t\t\tif (flushable) events.push({ type: \"text\", text: flushable });\n\t\t\tbuffer = partial;\n\t\t\treturn false;\n\t\t}\n\t\tif (markerIndex > 0) {\n\t\t\tevents.push({ type: \"text\", text: buffer.slice(0, markerIndex) });\n\t\t\tbuffer = buffer.slice(markerIndex);\n\t\t\treturn true;\n\t\t}\n\t\tconst markerMatch = CHANNEL_MARKER_PATTERN.exec(buffer);\n\t\tif (markerMatch) {\n\t\t\tconst marker = markerMatch[0];\n\t\t\tbuffer = buffer.slice(marker.length);\n\t\t\tif (marker === XTML_TOOLS_OPEN) mode = \"tools\";\n\t\t\treturn true;\n\t\t}\n\t\tif (couldBeMarkerPrefix(buffer)) return false;\n\t\tevents.push({ type: \"text\", text: buffer.slice(0, 2) });\n\t\tbuffer = buffer.slice(2);\n\t\treturn true;\n\t}\n\n\tfunction process(events: StreamParserEvent[]): void {\n\t\tfor (;;) {\n\t\t\tif (mode === \"text\") {\n\t\t\t\tif (!processText(events)) return;\n\t\t\t\tcontinue;\n\t\t\t}\n\t\t\tif (mode === \"tools\") {\n\t\t\t\tconst callStart = buffer.indexOf(XTML_CALL_OPEN);\n\t\t\t\tconst toolsEnd = buffer.indexOf(XTML_TOOLS_CLOSE);\n\t\t\t\tif (toolsEnd !== -1 && (callStart === -1 || toolsEnd < callStart)) {\n\t\t\t\t\tbuffer = buffer.slice(toolsEnd + XTML_TOOLS_CLOSE.length);\n\t\t\t\t\tmode = \"text\";\n\t\t\t\t\tcontinue;\n\t\t\t\t}\n\t\t\t\tif (callStart === -1) return;\n\t\t\t\tbuffer = buffer.slice(callStart + XTML_CALL_OPEN.length);\n\t\t\t\tmode = \"call-header\";\n\t\t\t\tcontinue;\n\t\t\t}\n\t\t\tif (mode === \"call-header\" || mode === \"argument-header\") {\n\t\t\t\tconst sepIndex = buffer.indexOf(XTML_SEP);\n\t\t\t\tif (sepIndex === -1) return;\n\t\t\t\tconst attributes = parseXtmlAttributes(buffer.slice(0, sepIndex));\n\t\t\t\tbuffer = buffer.slice(sepIndex + XTML_SEP.length);\n\t\t\t\tif (mode === \"call-header\") {\n\t\t\t\t\tconst name = attributes.tool ?? \"\";\n\t\t\t\t\tif (!tools.some((candidate) => candidate.name === name)) {\n\t\t\t\t\t\toptions?.onError?.(`kimi-xtml recovery: call for unknown tool \"${name}\".`, {});\n\t\t\t\t\t\tmode = \"discard-call\";\n\t\t\t\t\t\tcontinue;\n\t\t\t\t\t}\n\t\t\t\t\tcallIndex += 1;\n\t\t\t\t\tcallName = name;\n\t\t\t\t\tcallStarted = true;\n\t\t\t\t\tevents.push({ type: \"toolcall_start\", index: callIndex, name, id: `recovered-xtml-${callIndex}` });\n\t\t\t\t\tmode = \"call-body\";\n\t\t\t\t\tcontinue;\n\t\t\t\t}\n\t\t\t\targumentKey = attributes.key ?? \"\";\n\t\t\t\targumentType = attributes.type;\n\t\t\t\tmode = \"argument-value\";\n\t\t\t\tcontinue;\n\t\t\t}\n\t\t\tif (mode === \"call-body\") {\n\t\t\t\tconst argStart = buffer.indexOf(XTML_ARGUMENT_OPEN);\n\t\t\t\tconst callEnd = buffer.indexOf(XTML_CALL_CLOSE);\n\t\t\t\tif (callEnd !== -1 && (argStart === -1 || callEnd < argStart)) {\n\t\t\t\t\tbuffer = buffer.slice(callEnd + XTML_CALL_CLOSE.length);\n\t\t\t\t\tendCall(events, callInvalidReason !== null);\n\t\t\t\t\tcontinue;\n\t\t\t\t}\n\t\t\t\tif (argStart === -1) return;\n\t\t\t\tbuffer = buffer.slice(argStart + XTML_ARGUMENT_OPEN.length);\n\t\t\t\tmode = \"argument-header\";\n\t\t\t\tcontinue;\n\t\t\t}\n\t\t\tif (mode === \"argument-value\") {\n\t\t\t\tconst valueEnd = buffer.indexOf(XTML_ARGUMENT_CLOSE);\n\t\t\t\tif (valueEnd === -1) return;\n\t\t\t\tconst coerced = coerceXtmlArgumentValue(buffer.slice(0, valueEnd), argumentType);\n\t\t\t\tbuffer = buffer.slice(valueEnd + XTML_ARGUMENT_CLOSE.length);\n\t\t\t\tif (!coerced.ok) {\n\t\t\t\t\tcallInvalidReason = `kimi-xtml recovery: invalid value for argument \"${argumentKey}\".`;\n\t\t\t\t\toptions?.onError?.(callInvalidReason, { toolCall: callName });\n\t\t\t\t} else if (argumentKey) {\n\t\t\t\t\tcallArgs[argumentKey] = coerced.value;\n\t\t\t\t\tevents.push({ type: \"toolcall_delta\", index: callIndex, argumentsDelta: JSON.stringify(callArgs) });\n\t\t\t\t}\n\t\t\t\tmode = \"call-body\";\n\t\t\t\tcontinue;\n\t\t\t}\n\t\t\tconst callEnd = buffer.indexOf(XTML_CALL_CLOSE);\n\t\t\tif (callEnd === -1) return;\n\t\t\tbuffer = buffer.slice(callEnd + XTML_CALL_CLOSE.length);\n\t\t\tresetCall();\n\t\t\tmode = \"tools\";\n\t\t}\n\t}\n\n\treturn {\n\t\tfeed(textDelta: string): StreamParserEvent[] {\n\t\t\tbuffer += textDelta;\n\t\t\tconst events: StreamParserEvent[] = [];\n\t\t\tprocess(events);\n\t\t\treturn events;\n\t\t},\n\t\tinterrupt(): StreamParserEvent[] {\n\t\t\tconst events: StreamParserEvent[] = [];\n\t\t\tif (mode === \"text\" && buffer) {\n\t\t\t\tevents.push({ type: \"text\", text: buffer });\n\t\t\t\tbuffer = \"\";\n\t\t\t}\n\t\t\treturn events;\n\t\t},\n\t\tfinish(): StreamParserEvent[] {\n\t\t\tconst events: StreamParserEvent[] = [];\n\t\t\tif (mode === \"text\") {\n\t\t\t\tif (buffer) events.push({ type: \"text\", text: buffer });\n\t\t\t} else if (callStarted) {\n\t\t\t\tendCall(events, true);\n\t\t\t}\n\t\t\tbuffer = \"\";\n\t\t\tmode = \"text\";\n\t\t\treturn events;\n\t\t},\n\t};\n}\n"]}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"stream.d.ts","sourceRoot":"","sources":["../../../../src/tool-call-middleware/protocols/kimi-xtml/stream.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAqB,MAAM,gBAAgB,CAAC;AA0BrF,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,YAAY,CA8K/F"}
|
|
@@ -0,0 +1,181 @@
|
|
|
1
|
+
import { getPartialXtmlSuffix, parseXtmlAttributes, XTML_ARGUMENT_CLOSE, XTML_ARGUMENT_OPEN, XTML_CALL_CLOSE, XTML_CALL_OPEN, XTML_SEP, XTML_TOOLS_CLOSE, XTML_TOOLS_OPEN, } from "./markers.js";
|
|
2
|
+
import { coerceXtmlArgumentValue } from "./parse.js";
|
|
3
|
+
const TEXT_BOUNDARY_TOKENS = [XTML_TOOLS_OPEN];
|
|
4
|
+
const TOOLS_BOUNDARY_TOKENS = [XTML_CALL_OPEN, XTML_TOOLS_CLOSE];
|
|
5
|
+
export function createKimiXtmlStreamParser(tools, options) {
|
|
6
|
+
let buffer = "";
|
|
7
|
+
let mode = "text";
|
|
8
|
+
let callIndex = -1;
|
|
9
|
+
let callName = "";
|
|
10
|
+
let callArgs = {};
|
|
11
|
+
let callStarted = false;
|
|
12
|
+
let callInvalidReason = null;
|
|
13
|
+
let argumentKey = "";
|
|
14
|
+
let argumentType;
|
|
15
|
+
function resetCall() {
|
|
16
|
+
callName = "";
|
|
17
|
+
callArgs = {};
|
|
18
|
+
callStarted = false;
|
|
19
|
+
callInvalidReason = null;
|
|
20
|
+
argumentKey = "";
|
|
21
|
+
argumentType = undefined;
|
|
22
|
+
}
|
|
23
|
+
function startCall(events, name) {
|
|
24
|
+
callIndex += 1;
|
|
25
|
+
callName = name;
|
|
26
|
+
callStarted = true;
|
|
27
|
+
events.push({ type: "toolcall_start", index: callIndex, name, id: `kimi-xtml-tool-${callIndex}` });
|
|
28
|
+
}
|
|
29
|
+
function endCall(events, incomplete) {
|
|
30
|
+
if (!callStarted) {
|
|
31
|
+
resetCall();
|
|
32
|
+
return;
|
|
33
|
+
}
|
|
34
|
+
const event = {
|
|
35
|
+
type: "toolcall_end",
|
|
36
|
+
index: callIndex,
|
|
37
|
+
name: callName,
|
|
38
|
+
id: `kimi-xtml-tool-${callIndex}`,
|
|
39
|
+
arguments: callArgs,
|
|
40
|
+
};
|
|
41
|
+
if (incomplete) {
|
|
42
|
+
event.incomplete = true;
|
|
43
|
+
if (callInvalidReason)
|
|
44
|
+
event.errorMessage = callInvalidReason;
|
|
45
|
+
}
|
|
46
|
+
events.push(event);
|
|
47
|
+
resetCall();
|
|
48
|
+
mode = "tools";
|
|
49
|
+
}
|
|
50
|
+
function hold(events, tokens, flushAsText) {
|
|
51
|
+
const partial = getPartialXtmlSuffix(buffer, tokens);
|
|
52
|
+
if (!flushAsText)
|
|
53
|
+
return;
|
|
54
|
+
const flushable = partial ? buffer.slice(0, -partial.length) : buffer;
|
|
55
|
+
if (flushable)
|
|
56
|
+
events.push({ type: "text", text: flushable });
|
|
57
|
+
buffer = partial;
|
|
58
|
+
}
|
|
59
|
+
function process(events) {
|
|
60
|
+
for (;;) {
|
|
61
|
+
if (mode === "text") {
|
|
62
|
+
const start = buffer.indexOf(XTML_TOOLS_OPEN);
|
|
63
|
+
if (start === -1) {
|
|
64
|
+
hold(events, TEXT_BOUNDARY_TOKENS, true);
|
|
65
|
+
return;
|
|
66
|
+
}
|
|
67
|
+
if (start > 0)
|
|
68
|
+
events.push({ type: "text", text: buffer.slice(0, start) });
|
|
69
|
+
buffer = buffer.slice(start + XTML_TOOLS_OPEN.length);
|
|
70
|
+
mode = "tools";
|
|
71
|
+
continue;
|
|
72
|
+
}
|
|
73
|
+
if (mode === "tools") {
|
|
74
|
+
const callStart = buffer.indexOf(XTML_CALL_OPEN);
|
|
75
|
+
const toolsEnd = buffer.indexOf(XTML_TOOLS_CLOSE);
|
|
76
|
+
if (toolsEnd !== -1 && (callStart === -1 || toolsEnd < callStart)) {
|
|
77
|
+
buffer = buffer.slice(toolsEnd + XTML_TOOLS_CLOSE.length);
|
|
78
|
+
mode = "text";
|
|
79
|
+
continue;
|
|
80
|
+
}
|
|
81
|
+
if (callStart === -1) {
|
|
82
|
+
hold(events, TOOLS_BOUNDARY_TOKENS, false);
|
|
83
|
+
return;
|
|
84
|
+
}
|
|
85
|
+
buffer = buffer.slice(callStart + XTML_CALL_OPEN.length);
|
|
86
|
+
mode = "call-header";
|
|
87
|
+
continue;
|
|
88
|
+
}
|
|
89
|
+
if (mode === "call-header" || mode === "argument-header") {
|
|
90
|
+
const sepIndex = buffer.indexOf(XTML_SEP);
|
|
91
|
+
if (sepIndex === -1) {
|
|
92
|
+
hold(events, [XTML_SEP], false);
|
|
93
|
+
return;
|
|
94
|
+
}
|
|
95
|
+
const attributes = parseXtmlAttributes(buffer.slice(0, sepIndex));
|
|
96
|
+
buffer = buffer.slice(sepIndex + XTML_SEP.length);
|
|
97
|
+
if (mode === "call-header") {
|
|
98
|
+
const name = attributes.tool ?? "";
|
|
99
|
+
if (!tools.some((candidate) => candidate.name === name)) {
|
|
100
|
+
options?.onError?.(`kimi-xtml: call for unknown tool "${name}".`, {});
|
|
101
|
+
mode = "discard-call";
|
|
102
|
+
continue;
|
|
103
|
+
}
|
|
104
|
+
startCall(events, name);
|
|
105
|
+
mode = "call-body";
|
|
106
|
+
continue;
|
|
107
|
+
}
|
|
108
|
+
argumentKey = attributes.key ?? "";
|
|
109
|
+
argumentType = attributes.type;
|
|
110
|
+
mode = "argument-value";
|
|
111
|
+
continue;
|
|
112
|
+
}
|
|
113
|
+
if (mode === "call-body") {
|
|
114
|
+
const argStart = buffer.indexOf(XTML_ARGUMENT_OPEN);
|
|
115
|
+
const callEnd = buffer.indexOf(XTML_CALL_CLOSE);
|
|
116
|
+
if (callEnd !== -1 && (argStart === -1 || callEnd < argStart)) {
|
|
117
|
+
buffer = buffer.slice(callEnd + XTML_CALL_CLOSE.length);
|
|
118
|
+
endCall(events, callInvalidReason !== null);
|
|
119
|
+
continue;
|
|
120
|
+
}
|
|
121
|
+
if (argStart === -1) {
|
|
122
|
+
hold(events, [XTML_ARGUMENT_OPEN, XTML_CALL_CLOSE], false);
|
|
123
|
+
return;
|
|
124
|
+
}
|
|
125
|
+
buffer = buffer.slice(argStart + XTML_ARGUMENT_OPEN.length);
|
|
126
|
+
mode = "argument-header";
|
|
127
|
+
continue;
|
|
128
|
+
}
|
|
129
|
+
if (mode === "argument-value") {
|
|
130
|
+
const valueEnd = buffer.indexOf(XTML_ARGUMENT_CLOSE);
|
|
131
|
+
if (valueEnd === -1) {
|
|
132
|
+
hold(events, [XTML_ARGUMENT_CLOSE], false);
|
|
133
|
+
return;
|
|
134
|
+
}
|
|
135
|
+
const coerced = coerceXtmlArgumentValue(buffer.slice(0, valueEnd), argumentType);
|
|
136
|
+
buffer = buffer.slice(valueEnd + XTML_ARGUMENT_CLOSE.length);
|
|
137
|
+
if (!coerced.ok) {
|
|
138
|
+
callInvalidReason = `kimi-xtml: invalid value for argument "${argumentKey}".`;
|
|
139
|
+
options?.onError?.(callInvalidReason, { toolCall: callName });
|
|
140
|
+
}
|
|
141
|
+
else if (argumentKey) {
|
|
142
|
+
callArgs[argumentKey] = coerced.value;
|
|
143
|
+
events.push({ type: "toolcall_delta", index: callIndex, argumentsDelta: JSON.stringify(callArgs) });
|
|
144
|
+
}
|
|
145
|
+
mode = "call-body";
|
|
146
|
+
continue;
|
|
147
|
+
}
|
|
148
|
+
const callEnd = buffer.indexOf(XTML_CALL_CLOSE);
|
|
149
|
+
if (callEnd === -1) {
|
|
150
|
+
hold(events, [XTML_CALL_CLOSE], false);
|
|
151
|
+
return;
|
|
152
|
+
}
|
|
153
|
+
buffer = buffer.slice(callEnd + XTML_CALL_CLOSE.length);
|
|
154
|
+
resetCall();
|
|
155
|
+
mode = "tools";
|
|
156
|
+
}
|
|
157
|
+
}
|
|
158
|
+
return {
|
|
159
|
+
feed(textDelta) {
|
|
160
|
+
buffer += textDelta;
|
|
161
|
+
const events = [];
|
|
162
|
+
process(events);
|
|
163
|
+
return events;
|
|
164
|
+
},
|
|
165
|
+
finish() {
|
|
166
|
+
const events = [];
|
|
167
|
+
if (mode === "text") {
|
|
168
|
+
if (buffer)
|
|
169
|
+
events.push({ type: "text", text: buffer });
|
|
170
|
+
buffer = "";
|
|
171
|
+
return events;
|
|
172
|
+
}
|
|
173
|
+
if (callStarted)
|
|
174
|
+
endCall(events, true);
|
|
175
|
+
buffer = "";
|
|
176
|
+
mode = "text";
|
|
177
|
+
return events;
|
|
178
|
+
},
|
|
179
|
+
};
|
|
180
|
+
}
|
|
181
|
+
//# sourceMappingURL=stream.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"stream.js","sourceRoot":"","sources":["../../../../src/tool-call-middleware/protocols/kimi-xtml/stream.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Tool } from \"../../../types.ts\";\nimport type { ParserOptions, StreamParser, StreamParserEvent } from \"../../types.ts\";\nimport {\n\tgetPartialXtmlSuffix,\n\tparseXtmlAttributes,\n\tXTML_ARGUMENT_CLOSE,\n\tXTML_ARGUMENT_OPEN,\n\tXTML_CALL_CLOSE,\n\tXTML_CALL_OPEN,\n\tXTML_SEP,\n\tXTML_TOOLS_CLOSE,\n\tXTML_TOOLS_OPEN,\n} from \"./markers.ts\";\nimport { coerceXtmlArgumentValue } from \"./parse.ts\";\n\ntype ParserMode =\n\t| \"text\"\n\t| \"tools\"\n\t| \"call-header\"\n\t| \"call-body\"\n\t| \"argument-header\"\n\t| \"argument-value\"\n\t| \"discard-call\";\n\nconst TEXT_BOUNDARY_TOKENS = [XTML_TOOLS_OPEN] as const;\nconst TOOLS_BOUNDARY_TOKENS = [XTML_CALL_OPEN, XTML_TOOLS_CLOSE] as const;\n\nexport function createKimiXtmlStreamParser(tools: Tool[], options?: ParserOptions): StreamParser {\n\tlet buffer = \"\";\n\tlet mode: ParserMode = \"text\";\n\tlet callIndex = -1;\n\tlet callName = \"\";\n\tlet callArgs: Record<string, unknown> = {};\n\tlet callStarted = false;\n\tlet callInvalidReason: string | null = null;\n\tlet argumentKey = \"\";\n\tlet argumentType: string | undefined;\n\n\tfunction resetCall(): void {\n\t\tcallName = \"\";\n\t\tcallArgs = {};\n\t\tcallStarted = false;\n\t\tcallInvalidReason = null;\n\t\targumentKey = \"\";\n\t\targumentType = undefined;\n\t}\n\n\tfunction startCall(events: StreamParserEvent[], name: string): void {\n\t\tcallIndex += 1;\n\t\tcallName = name;\n\t\tcallStarted = true;\n\t\tevents.push({ type: \"toolcall_start\", index: callIndex, name, id: `kimi-xtml-tool-${callIndex}` });\n\t}\n\n\tfunction endCall(events: StreamParserEvent[], incomplete: boolean): void {\n\t\tif (!callStarted) {\n\t\t\tresetCall();\n\t\t\treturn;\n\t\t}\n\t\tconst event: StreamParserEvent = {\n\t\t\ttype: \"toolcall_end\",\n\t\t\tindex: callIndex,\n\t\t\tname: callName,\n\t\t\tid: `kimi-xtml-tool-${callIndex}`,\n\t\t\targuments: callArgs,\n\t\t};\n\t\tif (incomplete) {\n\t\t\tevent.incomplete = true;\n\t\t\tif (callInvalidReason) event.errorMessage = callInvalidReason;\n\t\t}\n\t\tevents.push(event);\n\t\tresetCall();\n\t\tmode = \"tools\";\n\t}\n\n\tfunction hold(events: StreamParserEvent[], tokens: readonly string[], flushAsText: boolean): void {\n\t\tconst partial = getPartialXtmlSuffix(buffer, tokens);\n\t\tif (!flushAsText) return;\n\t\tconst flushable = partial ? buffer.slice(0, -partial.length) : buffer;\n\t\tif (flushable) events.push({ type: \"text\", text: flushable });\n\t\tbuffer = partial;\n\t}\n\n\tfunction process(events: StreamParserEvent[]): void {\n\t\tfor (;;) {\n\t\t\tif (mode === \"text\") {\n\t\t\t\tconst start = buffer.indexOf(XTML_TOOLS_OPEN);\n\t\t\t\tif (start === -1) {\n\t\t\t\t\thold(events, TEXT_BOUNDARY_TOKENS, true);\n\t\t\t\t\treturn;\n\t\t\t\t}\n\t\t\t\tif (start > 0) events.push({ type: \"text\", text: buffer.slice(0, start) });\n\t\t\t\tbuffer = buffer.slice(start + XTML_TOOLS_OPEN.length);\n\t\t\t\tmode = \"tools\";\n\t\t\t\tcontinue;\n\t\t\t}\n\t\t\tif (mode === \"tools\") {\n\t\t\t\tconst callStart = buffer.indexOf(XTML_CALL_OPEN);\n\t\t\t\tconst toolsEnd = buffer.indexOf(XTML_TOOLS_CLOSE);\n\t\t\t\tif (toolsEnd !== -1 && (callStart === -1 || toolsEnd < callStart)) {\n\t\t\t\t\tbuffer = buffer.slice(toolsEnd + XTML_TOOLS_CLOSE.length);\n\t\t\t\t\tmode = \"text\";\n\t\t\t\t\tcontinue;\n\t\t\t\t}\n\t\t\t\tif (callStart === -1) {\n\t\t\t\t\thold(events, TOOLS_BOUNDARY_TOKENS, false);\n\t\t\t\t\treturn;\n\t\t\t\t}\n\t\t\t\tbuffer = buffer.slice(callStart + XTML_CALL_OPEN.length);\n\t\t\t\tmode = \"call-header\";\n\t\t\t\tcontinue;\n\t\t\t}\n\t\t\tif (mode === \"call-header\" || mode === \"argument-header\") {\n\t\t\t\tconst sepIndex = buffer.indexOf(XTML_SEP);\n\t\t\t\tif (sepIndex === -1) {\n\t\t\t\t\thold(events, [XTML_SEP], false);\n\t\t\t\t\treturn;\n\t\t\t\t}\n\t\t\t\tconst attributes = parseXtmlAttributes(buffer.slice(0, sepIndex));\n\t\t\t\tbuffer = buffer.slice(sepIndex + XTML_SEP.length);\n\t\t\t\tif (mode === \"call-header\") {\n\t\t\t\t\tconst name = attributes.tool ?? \"\";\n\t\t\t\t\tif (!tools.some((candidate) => candidate.name === name)) {\n\t\t\t\t\t\toptions?.onError?.(`kimi-xtml: call for unknown tool \"${name}\".`, {});\n\t\t\t\t\t\tmode = \"discard-call\";\n\t\t\t\t\t\tcontinue;\n\t\t\t\t\t}\n\t\t\t\t\tstartCall(events, name);\n\t\t\t\t\tmode = \"call-body\";\n\t\t\t\t\tcontinue;\n\t\t\t\t}\n\t\t\t\targumentKey = attributes.key ?? \"\";\n\t\t\t\targumentType = attributes.type;\n\t\t\t\tmode = \"argument-value\";\n\t\t\t\tcontinue;\n\t\t\t}\n\t\t\tif (mode === \"call-body\") {\n\t\t\t\tconst argStart = buffer.indexOf(XTML_ARGUMENT_OPEN);\n\t\t\t\tconst callEnd = buffer.indexOf(XTML_CALL_CLOSE);\n\t\t\t\tif (callEnd !== -1 && (argStart === -1 || callEnd < argStart)) {\n\t\t\t\t\tbuffer = buffer.slice(callEnd + XTML_CALL_CLOSE.length);\n\t\t\t\t\tendCall(events, callInvalidReason !== null);\n\t\t\t\t\tcontinue;\n\t\t\t\t}\n\t\t\t\tif (argStart === -1) {\n\t\t\t\t\thold(events, [XTML_ARGUMENT_OPEN, XTML_CALL_CLOSE], false);\n\t\t\t\t\treturn;\n\t\t\t\t}\n\t\t\t\tbuffer = buffer.slice(argStart + XTML_ARGUMENT_OPEN.length);\n\t\t\t\tmode = \"argument-header\";\n\t\t\t\tcontinue;\n\t\t\t}\n\t\t\tif (mode === \"argument-value\") {\n\t\t\t\tconst valueEnd = buffer.indexOf(XTML_ARGUMENT_CLOSE);\n\t\t\t\tif (valueEnd === -1) {\n\t\t\t\t\thold(events, [XTML_ARGUMENT_CLOSE], false);\n\t\t\t\t\treturn;\n\t\t\t\t}\n\t\t\t\tconst coerced = coerceXtmlArgumentValue(buffer.slice(0, valueEnd), argumentType);\n\t\t\t\tbuffer = buffer.slice(valueEnd + XTML_ARGUMENT_CLOSE.length);\n\t\t\t\tif (!coerced.ok) {\n\t\t\t\t\tcallInvalidReason = `kimi-xtml: invalid value for argument \"${argumentKey}\".`;\n\t\t\t\t\toptions?.onError?.(callInvalidReason, { toolCall: callName });\n\t\t\t\t} else if (argumentKey) {\n\t\t\t\t\tcallArgs[argumentKey] = coerced.value;\n\t\t\t\t\tevents.push({ type: \"toolcall_delta\", index: callIndex, argumentsDelta: JSON.stringify(callArgs) });\n\t\t\t\t}\n\t\t\t\tmode = \"call-body\";\n\t\t\t\tcontinue;\n\t\t\t}\n\t\t\tconst callEnd = buffer.indexOf(XTML_CALL_CLOSE);\n\t\t\tif (callEnd === -1) {\n\t\t\t\thold(events, [XTML_CALL_CLOSE], false);\n\t\t\t\treturn;\n\t\t\t}\n\t\t\tbuffer = buffer.slice(callEnd + XTML_CALL_CLOSE.length);\n\t\t\tresetCall();\n\t\t\tmode = \"tools\";\n\t\t}\n\t}\n\n\treturn {\n\t\tfeed(textDelta: string): StreamParserEvent[] {\n\t\t\tbuffer += textDelta;\n\t\t\tconst events: StreamParserEvent[] = [];\n\t\t\tprocess(events);\n\t\t\treturn events;\n\t\t},\n\t\tfinish(): StreamParserEvent[] {\n\t\t\tconst events: StreamParserEvent[] = [];\n\t\t\tif (mode === \"text\") {\n\t\t\t\tif (buffer) events.push({ type: \"text\", text: buffer });\n\t\t\t\tbuffer = \"\";\n\t\t\t\treturn events;\n\t\t\t}\n\t\t\tif (callStarted) endCall(events, true);\n\t\t\tbuffer = \"\";\n\t\t\tmode = \"text\";\n\t\t\treturn events;\n\t\t},\n\t};\n}\n"]}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { ToolCall } from "../types.ts";
|
|
2
2
|
import type { StreamMessageProjection } from "./stream-wrapper-shared.ts";
|
|
3
|
-
|
|
3
|
+
import type { ToolCallFormat } from "./types.ts";
|
|
4
|
+
export declare function appendRecoveryDiagnostic(projection: StreamMessageProjection, toolCall: ToolCall, protocol: ToolCallFormat): void;
|
|
4
5
|
//# sourceMappingURL=recovery-diagnostics.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recovery-diagnostics.d.ts","sourceRoot":"","sources":["../../src/tool-call-middleware/recovery-diagnostics.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"recovery-diagnostics.d.ts","sourceRoot":"","sources":["../../src/tool-call-middleware/recovery-diagnostics.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAC1E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAEjD,wBAAgB,wBAAwB,CACvC,UAAU,EAAE,uBAAuB,EACnC,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,cAAc,GACtB,IAAI,CAWN"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
export function appendRecoveryDiagnostic(projection, toolCall) {
|
|
1
|
+
export function appendRecoveryDiagnostic(projection, toolCall, protocol) {
|
|
2
2
|
projection.appendDiagnostic({
|
|
3
3
|
type: "text_tool_call_recovery",
|
|
4
4
|
timestamp: Date.now(),
|
|
5
5
|
details: {
|
|
6
|
-
protocol
|
|
6
|
+
protocol,
|
|
7
7
|
toolName: toolCall.name,
|
|
8
8
|
id: toolCall.id,
|
|
9
9
|
status: toolCall.incomplete === true ? "incomplete" : "complete",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recovery-diagnostics.js","sourceRoot":"","sources":["../../src/tool-call-middleware/recovery-diagnostics.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"recovery-diagnostics.js","sourceRoot":"","sources":["../../src/tool-call-middleware/recovery-diagnostics.ts"],"names":[],"mappings":"AAIA,MAAM,UAAU,wBAAwB,CACvC,UAAmC,EACnC,QAAkB,EAClB,QAAwB;IAExB,UAAU,CAAC,gBAAgB,CAAC;QAC3B,IAAI,EAAE,yBAAyB;QAC/B,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;QACrB,OAAO,EAAE;YACR,QAAQ;YACR,QAAQ,EAAE,QAAQ,CAAC,IAAI;YACvB,EAAE,EAAE,QAAQ,CAAC,EAAE;YACf,MAAM,EAAE,QAAQ,CAAC,UAAU,KAAK,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,UAAU;SAChE;KACD,CAAC,CAAC;AACJ,CAAC","sourcesContent":["import type { ToolCall } from \"../types.ts\";\nimport type { StreamMessageProjection } from \"./stream-wrapper-shared.ts\";\nimport type { ToolCallFormat } from \"./types.ts\";\n\nexport function appendRecoveryDiagnostic(\n\tprojection: StreamMessageProjection,\n\ttoolCall: ToolCall,\n\tprotocol: ToolCallFormat,\n): void {\n\tprojection.appendDiagnostic({\n\t\ttype: \"text_tool_call_recovery\",\n\t\ttimestamp: Date.now(),\n\t\tdetails: {\n\t\t\tprotocol,\n\t\t\ttoolName: toolCall.name,\n\t\t\tid: toolCall.id,\n\t\t\tstatus: toolCall.incomplete === true ? \"incomplete\" : \"complete\",\n\t\t},\n\t});\n}\n"]}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { AssistantMessage, AssistantMessageEventStream, ToolCall } from "../types.ts";
|
|
2
|
-
import type { StreamParserEvent } from "./types.ts";
|
|
2
|
+
import type { StreamParserEvent, ToolCallFormat } from "./types.ts";
|
|
3
3
|
/** Maintains source-index order and native/recovered ID ownership for recovery streams. */
|
|
4
4
|
export declare class RecoveryNativeProjection {
|
|
5
5
|
private readonly stream;
|
|
@@ -9,9 +9,10 @@ export declare class RecoveryNativeProjection {
|
|
|
9
9
|
private readonly reservedIds;
|
|
10
10
|
private readonly recoveredIds;
|
|
11
11
|
private readonly recoveredIdByParserIndex;
|
|
12
|
+
private readonly recoveredIdPrefix;
|
|
12
13
|
private highestProjectedInnerIndex;
|
|
13
14
|
private nextRecoveredId;
|
|
14
|
-
constructor(stream: AssistantMessageEventStream, message: AssistantMessage);
|
|
15
|
+
constructor(stream: AssistantMessageEventStream, message: AssistantMessage, protocol?: ToolCallFormat);
|
|
15
16
|
reserveVisibleIds(source: AssistantMessage): void;
|
|
16
17
|
synchronizeLower(source: AssistantMessage, contentIndex: number): boolean;
|
|
17
18
|
synchronizeRemaining(source: AssistantMessage): boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recovery-native-projection.d.ts","sourceRoot":"","sources":["../../src/tool-call-middleware/recovery-native-projection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,2BAA2B,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAC3F,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"recovery-native-projection.d.ts","sourceRoot":"","sources":["../../src/tool-call-middleware/recovery-native-projection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,2BAA2B,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAC3F,OAAO,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAepE,2FAA2F;AAC3F,qBAAa,wBAAwB;IACpC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA8B;IACrD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAmB;IAC3C,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAmC;IACtE,OAAO,CAAC,QAAQ,CAAC,2BAA2B,CAAsC;IAClF,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAqB;IACjD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAqB;IAClD,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAA6B;IACtE,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAS;IAC3C,OAAO,CAAC,0BAA0B,CAAM;IACxC,OAAO,CAAC,eAAe,CAAK;IAE5B,YAAY,MAAM,EAAE,2BAA2B,EAAE,OAAO,EAAE,gBAAgB,EAAE,QAAQ,GAAE,cAAwB,EAI7G;IAED,iBAAiB,CAAC,MAAM,EAAE,gBAAgB,GAAG,IAAI,CAIhD;IAED,gBAAgB,CAAC,MAAM,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAMxE;IAED,oBAAoB,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAMtD;IAED,SAAS,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAGzD;IAED,oBAAoB,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAEpE;IAED,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAGnC;IAED,kBAAkB,CAAC,MAAM,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,GAAG,WAAW,GAAG,WAAW,GAAG,SAAS,CAYtG;IAED,kBAAkB,CAAC,MAAM,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAQvF;IAED,gBAAgB,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAchE;IAED,kBAAkB,CAAC,MAAM,EAAE,SAAS,iBAAiB,EAAE,GAAG,iBAAiB,EAAE,CAc5E;IAED,OAAO,CAAC,iBAAiB;IASzB,OAAO,CAAC,WAAW;IAOnB,OAAO,CAAC,mBAAmB;CAU3B"}
|
|
@@ -8,7 +8,7 @@ function cloneToolCall(toolCall) {
|
|
|
8
8
|
}
|
|
9
9
|
/** Maintains source-index order and native/recovered ID ownership for recovery streams. */
|
|
10
10
|
export class RecoveryNativeProjection {
|
|
11
|
-
constructor(stream, message) {
|
|
11
|
+
constructor(stream, message, protocol = "antml") {
|
|
12
12
|
this.rangesByInnerIndex = new Map();
|
|
13
13
|
this.nativeLifecycleByInnerIndex = new Map();
|
|
14
14
|
this.reservedIds = new Set();
|
|
@@ -18,6 +18,7 @@ export class RecoveryNativeProjection {
|
|
|
18
18
|
this.nextRecoveredId = 0;
|
|
19
19
|
this.stream = stream;
|
|
20
20
|
this.message = message;
|
|
21
|
+
this.recoveredIdPrefix = `recovered-${protocol}-`;
|
|
21
22
|
}
|
|
22
23
|
reserveVisibleIds(source) {
|
|
23
24
|
for (const block of source.content) {
|
|
@@ -135,7 +136,7 @@ export class RecoveryNativeProjection {
|
|
|
135
136
|
}
|
|
136
137
|
allocateRecoveredId() {
|
|
137
138
|
for (;;) {
|
|
138
|
-
const id =
|
|
139
|
+
const id = `${this.recoveredIdPrefix}${this.nextRecoveredId}`;
|
|
139
140
|
this.nextRecoveredId += 1;
|
|
140
141
|
if (this.reservedIds.has(id))
|
|
141
142
|
continue;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recovery-native-projection.js","sourceRoot":"","sources":["../../src/tool-call-middleware/recovery-native-projection.ts"],"names":[],"mappings":"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","sourcesContent":["import type { AssistantMessage, AssistantMessageEventStream, ToolCall } from \"../types.ts\";\nimport type { StreamParserEvent } from \"./types.ts\";\n\ntype ContentBlock = AssistantMessage[\"content\"][number];\ntype ContentRange = { start: number; end: number };\ntype NativeLifecycle = \"started\" | \"ended\";\n\nfunction cloneContentBlock(block: ContentBlock): ContentBlock {\n\tif (block.type === \"toolCall\") return { ...block, arguments: { ...block.arguments } };\n\treturn { ...block };\n}\n\nfunction cloneToolCall(toolCall: ToolCall): ToolCall {\n\treturn { ...toolCall, arguments: { ...toolCall.arguments } };\n}\n\n/** Maintains source-index order and native/recovered ID ownership for recovery streams. */\nexport class RecoveryNativeProjection {\n\tprivate readonly stream: AssistantMessageEventStream;\n\tprivate readonly message: AssistantMessage;\n\tprivate readonly rangesByInnerIndex = new Map<number, ContentRange>();\n\tprivate readonly nativeLifecycleByInnerIndex = new Map<number, NativeLifecycle>();\n\tprivate readonly reservedIds = new Set<string>();\n\tprivate readonly recoveredIds = new Set<string>();\n\tprivate readonly recoveredIdByParserIndex = new Map<number, string>();\n\tprivate highestProjectedInnerIndex = -1;\n\tprivate nextRecoveredId = 0;\n\n\tconstructor(stream: AssistantMessageEventStream, message: AssistantMessage) {\n\t\tthis.stream = stream;\n\t\tthis.message = message;\n\t}\n\n\treserveVisibleIds(source: AssistantMessage): void {\n\t\tfor (const block of source.content) {\n\t\t\tif (block.type === \"toolCall\") this.reservedIds.add(block.id);\n\t\t}\n\t}\n\n\tsynchronizeLower(source: AssistantMessage, contentIndex: number): boolean {\n\t\tfor (let innerIndex = 0; innerIndex < contentIndex && innerIndex < source.content.length; innerIndex += 1) {\n\t\t\tif (this.rangesByInnerIndex.has(innerIndex)) continue;\n\t\t\tif (!this.appendUnannounced(source, innerIndex)) return false;\n\t\t}\n\t\treturn true;\n\t}\n\n\tsynchronizeRemaining(source: AssistantMessage): boolean {\n\t\tfor (let innerIndex = 0; innerIndex < source.content.length; innerIndex += 1) {\n\t\t\tif (this.rangesByInnerIndex.has(innerIndex)) continue;\n\t\t\tif (!this.appendUnannounced(source, innerIndex)) return false;\n\t\t}\n\t\treturn true;\n\t}\n\n\tstartText(innerIndex: number, outerIndex: number): boolean {\n\t\tif (!this.recordRange(innerIndex, { start: outerIndex, end: this.message.content.length })) return false;\n\t\treturn true;\n\t}\n\n\trecordProjectedBlock(innerIndex: number, outerIndex: number): boolean {\n\t\treturn this.recordRange(innerIndex, { start: outerIndex, end: outerIndex + 1 });\n\t}\n\n\textendText(innerIndex: number): void {\n\t\tconst range = this.rangesByInnerIndex.get(innerIndex);\n\t\tif (range) range.end = this.message.content.length;\n\t}\n\n\tprojectNativeStart(source: AssistantMessage, innerIndex: number): \"projected\" | \"collision\" | \"invalid\" {\n\t\tif (this.nativeLifecycleByInnerIndex.has(innerIndex) || this.rangesByInnerIndex.has(innerIndex)) return \"invalid\";\n\t\tconst block = source.content[innerIndex];\n\t\tif (block?.type !== \"toolCall\" || innerIndex <= this.highestProjectedInnerIndex) return \"invalid\";\n\t\tif (this.recoveredIds.has(block.id)) return \"collision\";\n\t\tthis.reservedIds.add(block.id);\n\t\tconst outerIndex = this.message.content.length;\n\t\tthis.message.content.push(cloneContentBlock(block));\n\t\tif (!this.recordRange(innerIndex, { start: outerIndex, end: outerIndex + 1 })) return \"invalid\";\n\t\tthis.nativeLifecycleByInnerIndex.set(innerIndex, \"started\");\n\t\tthis.stream.push({ type: \"toolcall_start\", contentIndex: outerIndex, partial: this.message });\n\t\treturn \"projected\";\n\t}\n\n\tprojectNativeDelta(source: AssistantMessage, innerIndex: number, delta: string): boolean {\n\t\tif (this.nativeLifecycleByInnerIndex.get(innerIndex) !== \"started\") return false;\n\t\tconst outerIndex = this.rangesByInnerIndex.get(innerIndex)?.start;\n\t\tconst block = source.content[innerIndex];\n\t\tif (outerIndex == null || block?.type !== \"toolCall\") return false;\n\t\tthis.message.content[outerIndex] = cloneContentBlock(block);\n\t\tthis.stream.push({ type: \"toolcall_delta\", contentIndex: outerIndex, delta, partial: this.message });\n\t\treturn true;\n\t}\n\n\tprojectNativeEnd(innerIndex: number, toolCall: ToolCall): boolean {\n\t\tif (this.nativeLifecycleByInnerIndex.get(innerIndex) !== \"started\") return false;\n\t\tconst outerIndex = this.rangesByInnerIndex.get(innerIndex)?.start;\n\t\tif (outerIndex == null) return false;\n\t\tconst finalToolCall = cloneToolCall(toolCall);\n\t\tthis.message.content[outerIndex] = finalToolCall;\n\t\tthis.nativeLifecycleByInnerIndex.set(innerIndex, \"ended\");\n\t\tthis.stream.push({\n\t\t\ttype: \"toolcall_end\",\n\t\t\tcontentIndex: outerIndex,\n\t\t\ttoolCall: finalToolCall,\n\t\t\tpartial: this.message,\n\t\t});\n\t\treturn true;\n\t}\n\n\tassignRecoveredIds(events: readonly StreamParserEvent[]): StreamParserEvent[] {\n\t\treturn events.map((event) => {\n\t\t\tif (event.type === \"toolcall_start\") {\n\t\t\t\tconst id = this.allocateRecoveredId();\n\t\t\t\tthis.recoveredIdByParserIndex.set(event.index, id);\n\t\t\t\treturn { ...event, id };\n\t\t\t}\n\t\t\tif (event.type === \"toolcall_end\") {\n\t\t\t\tconst id = this.recoveredIdByParserIndex.get(event.index) ?? event.id;\n\t\t\t\tthis.recoveredIdByParserIndex.delete(event.index);\n\t\t\t\treturn { ...event, id };\n\t\t\t}\n\t\t\treturn event;\n\t\t});\n\t}\n\n\tprivate appendUnannounced(source: AssistantMessage, innerIndex: number): boolean {\n\t\tconst block = source.content[innerIndex];\n\t\tif (!block || innerIndex <= this.highestProjectedInnerIndex) return false;\n\t\tif (block.type === \"toolCall\" && this.recoveredIds.has(block.id)) return false;\n\t\tconst outerIndex = this.message.content.length;\n\t\tthis.message.content.push(cloneContentBlock(block));\n\t\treturn this.recordRange(innerIndex, { start: outerIndex, end: outerIndex + 1 });\n\t}\n\n\tprivate recordRange(innerIndex: number, range: ContentRange): boolean {\n\t\tif (this.rangesByInnerIndex.has(innerIndex) || innerIndex <= this.highestProjectedInnerIndex) return false;\n\t\tthis.rangesByInnerIndex.set(innerIndex, range);\n\t\tthis.highestProjectedInnerIndex = innerIndex;\n\t\treturn true;\n\t}\n\n\tprivate allocateRecoveredId(): string {\n\t\tfor (;;) {\n\t\t\tconst id = `recovered-antml-${this.nextRecoveredId}`;\n\t\t\tthis.nextRecoveredId += 1;\n\t\t\tif (this.reservedIds.has(id)) continue;\n\t\t\tthis.reservedIds.add(id);\n\t\t\tthis.recoveredIds.add(id);\n\t\t\treturn id;\n\t\t}\n\t}\n}\n"]}
|
|
1
|
+
{"version":3,"file":"recovery-native-projection.js","sourceRoot":"","sources":["../../src/tool-call-middleware/recovery-native-projection.ts"],"names":[],"mappings":"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","sourcesContent":["import type { AssistantMessage, AssistantMessageEventStream, ToolCall } from \"../types.ts\";\nimport type { StreamParserEvent, ToolCallFormat } from \"./types.ts\";\n\ntype ContentBlock = AssistantMessage[\"content\"][number];\ntype ContentRange = { start: number; end: number };\ntype NativeLifecycle = \"started\" | \"ended\";\n\nfunction cloneContentBlock(block: ContentBlock): ContentBlock {\n\tif (block.type === \"toolCall\") return { ...block, arguments: { ...block.arguments } };\n\treturn { ...block };\n}\n\nfunction cloneToolCall(toolCall: ToolCall): ToolCall {\n\treturn { ...toolCall, arguments: { ...toolCall.arguments } };\n}\n\n/** Maintains source-index order and native/recovered ID ownership for recovery streams. */\nexport class RecoveryNativeProjection {\n\tprivate readonly stream: AssistantMessageEventStream;\n\tprivate readonly message: AssistantMessage;\n\tprivate readonly rangesByInnerIndex = new Map<number, ContentRange>();\n\tprivate readonly nativeLifecycleByInnerIndex = new Map<number, NativeLifecycle>();\n\tprivate readonly reservedIds = new Set<string>();\n\tprivate readonly recoveredIds = new Set<string>();\n\tprivate readonly recoveredIdByParserIndex = new Map<number, string>();\n\tprivate readonly recoveredIdPrefix: string;\n\tprivate highestProjectedInnerIndex = -1;\n\tprivate nextRecoveredId = 0;\n\n\tconstructor(stream: AssistantMessageEventStream, message: AssistantMessage, protocol: ToolCallFormat = \"antml\") {\n\t\tthis.stream = stream;\n\t\tthis.message = message;\n\t\tthis.recoveredIdPrefix = `recovered-${protocol}-`;\n\t}\n\n\treserveVisibleIds(source: AssistantMessage): void {\n\t\tfor (const block of source.content) {\n\t\t\tif (block.type === \"toolCall\") this.reservedIds.add(block.id);\n\t\t}\n\t}\n\n\tsynchronizeLower(source: AssistantMessage, contentIndex: number): boolean {\n\t\tfor (let innerIndex = 0; innerIndex < contentIndex && innerIndex < source.content.length; innerIndex += 1) {\n\t\t\tif (this.rangesByInnerIndex.has(innerIndex)) continue;\n\t\t\tif (!this.appendUnannounced(source, innerIndex)) return false;\n\t\t}\n\t\treturn true;\n\t}\n\n\tsynchronizeRemaining(source: AssistantMessage): boolean {\n\t\tfor (let innerIndex = 0; innerIndex < source.content.length; innerIndex += 1) {\n\t\t\tif (this.rangesByInnerIndex.has(innerIndex)) continue;\n\t\t\tif (!this.appendUnannounced(source, innerIndex)) return false;\n\t\t}\n\t\treturn true;\n\t}\n\n\tstartText(innerIndex: number, outerIndex: number): boolean {\n\t\tif (!this.recordRange(innerIndex, { start: outerIndex, end: this.message.content.length })) return false;\n\t\treturn true;\n\t}\n\n\trecordProjectedBlock(innerIndex: number, outerIndex: number): boolean {\n\t\treturn this.recordRange(innerIndex, { start: outerIndex, end: outerIndex + 1 });\n\t}\n\n\textendText(innerIndex: number): void {\n\t\tconst range = this.rangesByInnerIndex.get(innerIndex);\n\t\tif (range) range.end = this.message.content.length;\n\t}\n\n\tprojectNativeStart(source: AssistantMessage, innerIndex: number): \"projected\" | \"collision\" | \"invalid\" {\n\t\tif (this.nativeLifecycleByInnerIndex.has(innerIndex) || this.rangesByInnerIndex.has(innerIndex)) return \"invalid\";\n\t\tconst block = source.content[innerIndex];\n\t\tif (block?.type !== \"toolCall\" || innerIndex <= this.highestProjectedInnerIndex) return \"invalid\";\n\t\tif (this.recoveredIds.has(block.id)) return \"collision\";\n\t\tthis.reservedIds.add(block.id);\n\t\tconst outerIndex = this.message.content.length;\n\t\tthis.message.content.push(cloneContentBlock(block));\n\t\tif (!this.recordRange(innerIndex, { start: outerIndex, end: outerIndex + 1 })) return \"invalid\";\n\t\tthis.nativeLifecycleByInnerIndex.set(innerIndex, \"started\");\n\t\tthis.stream.push({ type: \"toolcall_start\", contentIndex: outerIndex, partial: this.message });\n\t\treturn \"projected\";\n\t}\n\n\tprojectNativeDelta(source: AssistantMessage, innerIndex: number, delta: string): boolean {\n\t\tif (this.nativeLifecycleByInnerIndex.get(innerIndex) !== \"started\") return false;\n\t\tconst outerIndex = this.rangesByInnerIndex.get(innerIndex)?.start;\n\t\tconst block = source.content[innerIndex];\n\t\tif (outerIndex == null || block?.type !== \"toolCall\") return false;\n\t\tthis.message.content[outerIndex] = cloneContentBlock(block);\n\t\tthis.stream.push({ type: \"toolcall_delta\", contentIndex: outerIndex, delta, partial: this.message });\n\t\treturn true;\n\t}\n\n\tprojectNativeEnd(innerIndex: number, toolCall: ToolCall): boolean {\n\t\tif (this.nativeLifecycleByInnerIndex.get(innerIndex) !== \"started\") return false;\n\t\tconst outerIndex = this.rangesByInnerIndex.get(innerIndex)?.start;\n\t\tif (outerIndex == null) return false;\n\t\tconst finalToolCall = cloneToolCall(toolCall);\n\t\tthis.message.content[outerIndex] = finalToolCall;\n\t\tthis.nativeLifecycleByInnerIndex.set(innerIndex, \"ended\");\n\t\tthis.stream.push({\n\t\t\ttype: \"toolcall_end\",\n\t\t\tcontentIndex: outerIndex,\n\t\t\ttoolCall: finalToolCall,\n\t\t\tpartial: this.message,\n\t\t});\n\t\treturn true;\n\t}\n\n\tassignRecoveredIds(events: readonly StreamParserEvent[]): StreamParserEvent[] {\n\t\treturn events.map((event) => {\n\t\t\tif (event.type === \"toolcall_start\") {\n\t\t\t\tconst id = this.allocateRecoveredId();\n\t\t\t\tthis.recoveredIdByParserIndex.set(event.index, id);\n\t\t\t\treturn { ...event, id };\n\t\t\t}\n\t\t\tif (event.type === \"toolcall_end\") {\n\t\t\t\tconst id = this.recoveredIdByParserIndex.get(event.index) ?? event.id;\n\t\t\t\tthis.recoveredIdByParserIndex.delete(event.index);\n\t\t\t\treturn { ...event, id };\n\t\t\t}\n\t\t\treturn event;\n\t\t});\n\t}\n\n\tprivate appendUnannounced(source: AssistantMessage, innerIndex: number): boolean {\n\t\tconst block = source.content[innerIndex];\n\t\tif (!block || innerIndex <= this.highestProjectedInnerIndex) return false;\n\t\tif (block.type === \"toolCall\" && this.recoveredIds.has(block.id)) return false;\n\t\tconst outerIndex = this.message.content.length;\n\t\tthis.message.content.push(cloneContentBlock(block));\n\t\treturn this.recordRange(innerIndex, { start: outerIndex, end: outerIndex + 1 });\n\t}\n\n\tprivate recordRange(innerIndex: number, range: ContentRange): boolean {\n\t\tif (this.rangesByInnerIndex.has(innerIndex) || innerIndex <= this.highestProjectedInnerIndex) return false;\n\t\tthis.rangesByInnerIndex.set(innerIndex, range);\n\t\tthis.highestProjectedInnerIndex = innerIndex;\n\t\treturn true;\n\t}\n\n\tprivate allocateRecoveredId(): string {\n\t\tfor (;;) {\n\t\t\tconst id = `${this.recoveredIdPrefix}${this.nextRecoveredId}`;\n\t\t\tthis.nextRecoveredId += 1;\n\t\t\tif (this.reservedIds.has(id)) continue;\n\t\t\tthis.reservedIds.add(id);\n\t\t\tthis.recoveredIds.add(id);\n\t\t\treturn id;\n\t\t}\n\t}\n}\n"]}
|
|
@@ -1,5 +1,10 @@
|
|
|
1
1
|
import type { AssistantMessage, AssistantMessageEventStream } from "../types.ts";
|
|
2
2
|
import type { StreamMessageProjection } from "./stream-wrapper-shared.ts";
|
|
3
|
+
import type { ToolCallFormat } from "./types.ts";
|
|
3
4
|
export type RecoveryStreamFailure = "collision" | "invalid_content_event_order" | "invalid_native_event_order";
|
|
4
|
-
export declare function terminateRecoveryStreamForFailure(stream: AssistantMessageEventStream, projection: StreamMessageProjection,
|
|
5
|
+
export declare function terminateRecoveryStreamForFailure(stream: AssistantMessageEventStream, projection: StreamMessageProjection, options: {
|
|
6
|
+
source: AssistantMessage;
|
|
7
|
+
failure: RecoveryStreamFailure;
|
|
8
|
+
protocol: ToolCallFormat;
|
|
9
|
+
}): void;
|
|
5
10
|
//# sourceMappingURL=recovery-stream-failure.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recovery-stream-failure.d.ts","sourceRoot":"","sources":["../../src/tool-call-middleware/recovery-stream-failure.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,2BAA2B,EAAE,MAAM,aAAa,CAAC;AACjF,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"recovery-stream-failure.d.ts","sourceRoot":"","sources":["../../src/tool-call-middleware/recovery-stream-failure.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,2BAA2B,EAAE,MAAM,aAAa,CAAC;AACjF,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAC1E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAEjD,MAAM,MAAM,qBAAqB,GAAG,WAAW,GAAG,6BAA6B,GAAG,4BAA4B,CAAC;AAqB/G,wBAAgB,iCAAiC,CAChD,MAAM,EAAE,2BAA2B,EACnC,UAAU,EAAE,uBAAuB,EACnC,OAAO,EAAE;IACR,MAAM,EAAE,gBAAgB,CAAC;IACzB,OAAO,EAAE,qBAAqB,CAAC;IAC/B,QAAQ,EAAE,cAAc,CAAC;CACzB,GACC,IAAI,CAkBN"}
|