@code-yeongyu/senpi-ai 2026.7.30 → 2026.7.31
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/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/providers/data/.manifest.json +1 -1
- package/dist/providers/data/huggingface.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/index.d.ts +2 -1
- package/dist/tool-call-middleware/index.d.ts.map +1 -1
- package/dist/tool-call-middleware/index.js +13 -0
- package/dist/tool-call-middleware/index.js.map +1 -1
- package/dist/tool-call-middleware/protocols/kimi-xtml/recovery-stream.js +2 -2
- package/dist/tool-call-middleware/protocols/kimi-xtml/recovery-stream.js.map +1 -1
- package/dist/tool-call-middleware/protocols/kimi-xtml/thinking-recovery-stream.d.ts +3 -0
- package/dist/tool-call-middleware/protocols/kimi-xtml/thinking-recovery-stream.d.ts.map +1 -0
- package/dist/tool-call-middleware/protocols/kimi-xtml/thinking-recovery-stream.js +29 -0
- package/dist/tool-call-middleware/protocols/kimi-xtml/thinking-recovery-stream.js.map +1 -0
- package/dist/tool-call-middleware/protocols/kimi-xtml/thinking-recovery.d.ts +3 -0
- package/dist/tool-call-middleware/protocols/kimi-xtml/thinking-recovery.d.ts.map +1 -0
- package/dist/tool-call-middleware/protocols/kimi-xtml/thinking-recovery.js +82 -0
- package/dist/tool-call-middleware/protocols/kimi-xtml/thinking-recovery.js.map +1 -0
- package/package.json +1 -1
|
@@ -1,6 +1,6 @@
|
|
|
1
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
2
|
import { coerceXtmlArgumentValue } from "./parse.js";
|
|
3
|
-
const CHANNEL_MARKER_PATTERN = /^<\|(?:open|close)\|>[a-zA-Z_][a-zA-Z0-9_]
|
|
3
|
+
const CHANNEL_MARKER_PATTERN = /^<\|(?:open|close)\|>(?:[a-zA-Z_][a-zA-Z0-9_]*)?<\|sep\|>/;
|
|
4
4
|
const OPEN_PREFIX = "<|open|>";
|
|
5
5
|
const CLOSE_PREFIX = "<|close|>";
|
|
6
6
|
function couldBeMarkerPrefix(tail) {
|
|
@@ -13,7 +13,7 @@ function couldBeMarkerPrefix(tail) {
|
|
|
13
13
|
const angleIndex = rest.indexOf("<");
|
|
14
14
|
if (angleIndex === -1)
|
|
15
15
|
return /^[a-zA-Z0-9_]*$/.test(rest);
|
|
16
|
-
if (!/^[a-zA-Z_][a-zA-Z0-9_]
|
|
16
|
+
if (!/^(?:[a-zA-Z_][a-zA-Z0-9_]*)?$/.test(rest.slice(0, angleIndex)))
|
|
17
17
|
return false;
|
|
18
18
|
return XTML_SEP.startsWith(rest.slice(angleIndex));
|
|
19
19
|
}
|
|
@@ -1 +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"]}
|
|
1
|
+
{"version":3,"file":"recovery-stream.js","sourceRoot":"","sources":["../../../../src/tool-call-middleware/protocols/kimi-xtml/recovery-stream.ts"],"names":[],"mappings":"AAGA,OAAO,EACN,oBAAoB,EACpB,mBAAmB,EACnB,mBAAmB,EACnB,kBAAkB,EAClB,eAAe,EACf,cAAc,EACd,QAAQ,EACR,gBAAgB,EAChB,eAAe,GACf,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,uBAAuB,EAAE,MAAM,YAAY,CAAC;AAWrD,MAAM,sBAAsB,GAAG,2DAA2D,CAAC;AAC3F,MAAM,WAAW,GAAG,UAAU,CAAC;AAC/B,MAAM,YAAY,GAAG,WAAW,CAAC;AAEjC,SAAS,mBAAmB,CAAC,IAAY;IACxC,IAAI,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IAC/E,KAAK,MAAM,MAAM,IAAI,CAAC,WAAW,EAAE,YAAY,CAAC,EAAE,CAAC;QAClD,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;YAAE,SAAS;QACvC,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACvC,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACrC,IAAI,UAAU,KAAK,CAAC,CAAC;YAAE,OAAO,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC3D,IAAI,CAAC,+BAA+B,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC;YAAE,OAAO,KAAK,CAAC;QACnF,OAAO,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;IACpD,CAAC;IACD,OAAO,KAAK,CAAC;AACd,CAAC;AAED,MAAM,UAAU,8BAA8B,CAAC,KAAsB,EAAE,OAAuB;IAC7F,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,IAAI,IAAI,GAAe,MAAM,CAAC;IAC9B,IAAI,SAAS,GAAG,CAAC,CAAC,CAAC;IACnB,IAAI,QAAQ,GAAG,EAAE,CAAC;IAClB,IAAI,QAAQ,GAA4B,EAAE,CAAC;IAC3C,IAAI,WAAW,GAAG,KAAK,CAAC;IACxB,IAAI,iBAAiB,GAAkB,IAAI,CAAC;IAC5C,IAAI,WAAW,GAAG,EAAE,CAAC;IACrB,IAAI,YAAgC,CAAC;IAErC,SAAS,SAAS;QACjB,QAAQ,GAAG,EAAE,CAAC;QACd,QAAQ,GAAG,EAAE,CAAC;QACd,WAAW,GAAG,KAAK,CAAC;QACpB,iBAAiB,GAAG,IAAI,CAAC;QACzB,WAAW,GAAG,EAAE,CAAC;QACjB,YAAY,GAAG,SAAS,CAAC;IAC1B,CAAC;IAED,SAAS,OAAO,CAAC,MAA2B,EAAE,UAAmB;QAChE,IAAI,CAAC,WAAW,EAAE,CAAC;YAClB,SAAS,EAAE,CAAC;YACZ,OAAO;QACR,CAAC;QACD,MAAM,KAAK,GAAsB;YAChC,IAAI,EAAE,cAAc;YACpB,KAAK,EAAE,SAAS;YAChB,IAAI,EAAE,QAAQ;YACd,EAAE,EAAE,kBAAkB,SAAS,EAAE;YACjC,SAAS,EAAE,QAAQ;SACnB,CAAC;QACF,IAAI,UAAU,EAAE,CAAC;YAChB,KAAK,CAAC,UAAU,GAAG,IAAI,CAAC;YACxB,IAAI,iBAAiB;gBAAE,KAAK,CAAC,YAAY,GAAG,iBAAiB,CAAC;QAC/D,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACnB,SAAS,EAAE,CAAC;QACZ,IAAI,GAAG,OAAO,CAAC;IAChB,CAAC;IAED,SAAS,WAAW,CAAC,MAA2B;QAC/C,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAC9C,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QAChD,MAAM,WAAW,GAAG,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACrG,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;YAC/B,MAAM,OAAO,GAAG,oBAAoB,CAAC,MAAM,EAAE,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC,CAAC;YAC1E,MAAM,SAAS,GAAG,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;YACtE,IAAI,SAAS;gBAAE,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;YAC9D,MAAM,GAAG,OAAO,CAAC;YACjB,OAAO,KAAK,CAAC;QACd,CAAC;QACD,IAAI,WAAW,GAAG,CAAC,EAAE,CAAC;YACrB,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC;YAClE,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;YACnC,OAAO,IAAI,CAAC;QACb,CAAC;QACD,MAAM,WAAW,GAAG,sBAAsB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACxD,IAAI,WAAW,EAAE,CAAC;YACjB,MAAM,MAAM,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;YAC9B,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YACrC,IAAI,MAAM,KAAK,eAAe;gBAAE,IAAI,GAAG,OAAO,CAAC;YAC/C,OAAO,IAAI,CAAC;QACb,CAAC;QACD,IAAI,mBAAmB,CAAC,MAAM,CAAC;YAAE,OAAO,KAAK,CAAC;QAC9C,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QACxD,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACzB,OAAO,IAAI,CAAC;IACb,CAAC;IAED,SAAS,OAAO,CAAC,MAA2B;QAC3C,SAAS,CAAC;YACT,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;gBACrB,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC;oBAAE,OAAO;gBACjC,SAAS;YACV,CAAC;YACD,IAAI,IAAI,KAAK,OAAO,EAAE,CAAC;gBACtB,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;gBACjD,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;gBAClD,IAAI,QAAQ,KAAK,CAAC,CAAC,IAAI,CAAC,SAAS,KAAK,CAAC,CAAC,IAAI,QAAQ,GAAG,SAAS,CAAC,EAAE,CAAC;oBACnE,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,QAAQ,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;oBAC1D,IAAI,GAAG,MAAM,CAAC;oBACd,SAAS;gBACV,CAAC;gBACD,IAAI,SAAS,KAAK,CAAC,CAAC;oBAAE,OAAO;gBAC7B,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,SAAS,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;gBACzD,IAAI,GAAG,aAAa,CAAC;gBACrB,SAAS;YACV,CAAC;YACD,IAAI,IAAI,KAAK,aAAa,IAAI,IAAI,KAAK,iBAAiB,EAAE,CAAC;gBAC1D,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;gBAC1C,IAAI,QAAQ,KAAK,CAAC,CAAC;oBAAE,OAAO;gBAC5B,MAAM,UAAU,GAAG,mBAAmB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC;gBAClE,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC;gBAClD,IAAI,IAAI,KAAK,aAAa,EAAE,CAAC;oBAC5B,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,IAAI,EAAE,CAAC;oBACnC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;wBACzD,OAAO,EAAE,OAAO,EAAE,CAAC,8CAA8C,IAAI,IAAI,EAAE,EAAE,CAAC,CAAC;wBAC/E,IAAI,GAAG,cAAc,CAAC;wBACtB,SAAS;oBACV,CAAC;oBACD,SAAS,IAAI,CAAC,CAAC;oBACf,QAAQ,GAAG,IAAI,CAAC;oBAChB,WAAW,GAAG,IAAI,CAAC;oBACnB,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE,EAAE,kBAAkB,SAAS,EAAE,EAAE,CAAC,CAAC;oBACnG,IAAI,GAAG,WAAW,CAAC;oBACnB,SAAS;gBACV,CAAC;gBACD,WAAW,GAAG,UAAU,CAAC,GAAG,IAAI,EAAE,CAAC;gBACnC,YAAY,GAAG,UAAU,CAAC,IAAI,CAAC;gBAC/B,IAAI,GAAG,gBAAgB,CAAC;gBACxB,SAAS;YACV,CAAC;YACD,IAAI,IAAI,KAAK,WAAW,EAAE,CAAC;gBAC1B,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;gBACpD,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;gBAChD,IAAI,OAAO,KAAK,CAAC,CAAC,IAAI,CAAC,QAAQ,KAAK,CAAC,CAAC,IAAI,OAAO,GAAG,QAAQ,CAAC,EAAE,CAAC;oBAC/D,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;oBACxD,OAAO,CAAC,MAAM,EAAE,iBAAiB,KAAK,IAAI,CAAC,CAAC;oBAC5C,SAAS;gBACV,CAAC;gBACD,IAAI,QAAQ,KAAK,CAAC,CAAC;oBAAE,OAAO;gBAC5B,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,QAAQ,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC;gBAC5D,IAAI,GAAG,iBAAiB,CAAC;gBACzB,SAAS;YACV,CAAC;YACD,IAAI,IAAI,KAAK,gBAAgB,EAAE,CAAC;gBAC/B,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;gBACrD,IAAI,QAAQ,KAAK,CAAC,CAAC;oBAAE,OAAO;gBAC5B,MAAM,OAAO,GAAG,uBAAuB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,EAAE,YAAY,CAAC,CAAC;gBACjF,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,QAAQ,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC;gBAC7D,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC;oBACjB,iBAAiB,GAAG,mDAAmD,WAAW,IAAI,CAAC;oBACvF,OAAO,EAAE,OAAO,EAAE,CAAC,iBAAiB,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;gBAC/D,CAAC;qBAAM,IAAI,WAAW,EAAE,CAAC;oBACxB,QAAQ,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC;oBACtC,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;gBACrG,CAAC;gBACD,IAAI,GAAG,WAAW,CAAC;gBACnB,SAAS;YACV,CAAC;YACD,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;YAChD,IAAI,OAAO,KAAK,CAAC,CAAC;gBAAE,OAAO;YAC3B,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;YACxD,SAAS,EAAE,CAAC;YACZ,IAAI,GAAG,OAAO,CAAC;QAChB,CAAC;IACF,CAAC;IAED,OAAO;QACN,IAAI,CAAC,SAAiB;YACrB,MAAM,IAAI,SAAS,CAAC;YACpB,MAAM,MAAM,GAAwB,EAAE,CAAC;YACvC,OAAO,CAAC,MAAM,CAAC,CAAC;YAChB,OAAO,MAAM,CAAC;QACf,CAAC;QACD,SAAS;YACR,MAAM,MAAM,GAAwB,EAAE,CAAC;YACvC,IAAI,IAAI,KAAK,MAAM,IAAI,MAAM,EAAE,CAAC;gBAC/B,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;gBAC5C,MAAM,GAAG,EAAE,CAAC;YACb,CAAC;YACD,OAAO,MAAM,CAAC;QACf,CAAC;QACD,MAAM;YACL,MAAM,MAAM,GAAwB,EAAE,CAAC;YACvC,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;gBACrB,IAAI,MAAM;oBAAE,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;YACzD,CAAC;iBAAM,IAAI,WAAW,EAAE,CAAC;gBACxB,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;YACvB,CAAC;YACD,MAAM,GAAG,EAAE,CAAC;YACZ,IAAI,GAAG,MAAM,CAAC;YACd,OAAO,MAAM,CAAC;QACf,CAAC;KACD,CAAC;AACH,CAAC","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":"thinking-recovery-stream.d.ts","sourceRoot":"","sources":["../../../../src/tool-call-middleware/protocols/kimi-xtml/thinking-recovery-stream.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,mBAAmB,CAAC;AAIrE,wBAAgB,kCAAkC,CACjD,WAAW,EAAE,2BAA2B,GACtC,2BAA2B,CA0B7B"}
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
import { AssistantMessageEventStream as AssistantMessageEventStreamImpl } from "../../../utils/event-stream.js";
|
|
2
|
+
import { recoverKimiXtmlThinking } from "./thinking-recovery.js";
|
|
3
|
+
export function wrapStreamWithKimiThinkingRecovery(innerStream) {
|
|
4
|
+
const outerStream = new AssistantMessageEventStreamImpl();
|
|
5
|
+
void (async () => {
|
|
6
|
+
try {
|
|
7
|
+
for await (const event of innerStream) {
|
|
8
|
+
if (event.type === "done") {
|
|
9
|
+
const message = recoverKimiXtmlThinking(event.message);
|
|
10
|
+
outerStream.push({ type: "done", reason: event.reason, message });
|
|
11
|
+
outerStream.end();
|
|
12
|
+
return;
|
|
13
|
+
}
|
|
14
|
+
if (event.type === "error") {
|
|
15
|
+
outerStream.push(event);
|
|
16
|
+
outerStream.end();
|
|
17
|
+
return;
|
|
18
|
+
}
|
|
19
|
+
outerStream.push(event);
|
|
20
|
+
}
|
|
21
|
+
outerStream.end(recoverKimiXtmlThinking(await innerStream.result()));
|
|
22
|
+
}
|
|
23
|
+
catch (error) {
|
|
24
|
+
outerStream.fail(error);
|
|
25
|
+
}
|
|
26
|
+
})();
|
|
27
|
+
return outerStream;
|
|
28
|
+
}
|
|
29
|
+
//# sourceMappingURL=thinking-recovery-stream.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"thinking-recovery-stream.js","sourceRoot":"","sources":["../../../../src/tool-call-middleware/protocols/kimi-xtml/thinking-recovery-stream.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,2BAA2B,IAAI,+BAA+B,EAAE,MAAM,gCAAgC,CAAC;AAChH,OAAO,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AAEjE,MAAM,UAAU,kCAAkC,CACjD,WAAwC;IAExC,MAAM,WAAW,GAAG,IAAI,+BAA+B,EAAE,CAAC;IAE1D,KAAK,CAAC,KAAK,IAAmB,EAAE;QAC/B,IAAI,CAAC;YACJ,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,WAAW,EAAE,CAAC;gBACvC,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;oBAC3B,MAAM,OAAO,GAAG,uBAAuB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;oBACvD,WAAW,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;oBAClE,WAAW,CAAC,GAAG,EAAE,CAAC;oBAClB,OAAO;gBACR,CAAC;gBACD,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;oBAC5B,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;oBACxB,WAAW,CAAC,GAAG,EAAE,CAAC;oBAClB,OAAO;gBACR,CAAC;gBACD,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACzB,CAAC;YACD,WAAW,CAAC,GAAG,CAAC,uBAAuB,CAAC,MAAM,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QACtE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACzB,CAAC;IACF,CAAC,CAAC,EAAE,CAAC;IAEL,OAAO,WAAW,CAAC;AACpB,CAAC","sourcesContent":["import type { AssistantMessageEventStream } from \"../../../types.ts\";\nimport { AssistantMessageEventStream as AssistantMessageEventStreamImpl } from \"../../../utils/event-stream.ts\";\nimport { recoverKimiXtmlThinking } from \"./thinking-recovery.ts\";\n\nexport function wrapStreamWithKimiThinkingRecovery(\n\tinnerStream: AssistantMessageEventStream,\n): AssistantMessageEventStream {\n\tconst outerStream = new AssistantMessageEventStreamImpl();\n\n\tvoid (async (): Promise<void> => {\n\t\ttry {\n\t\t\tfor await (const event of innerStream) {\n\t\t\t\tif (event.type === \"done\") {\n\t\t\t\t\tconst message = recoverKimiXtmlThinking(event.message);\n\t\t\t\t\touterStream.push({ type: \"done\", reason: event.reason, message });\n\t\t\t\t\touterStream.end();\n\t\t\t\t\treturn;\n\t\t\t\t}\n\t\t\t\tif (event.type === \"error\") {\n\t\t\t\t\touterStream.push(event);\n\t\t\t\t\touterStream.end();\n\t\t\t\t\treturn;\n\t\t\t\t}\n\t\t\t\touterStream.push(event);\n\t\t\t}\n\t\t\touterStream.end(recoverKimiXtmlThinking(await innerStream.result()));\n\t\t} catch (error) {\n\t\t\touterStream.fail(error);\n\t\t}\n\t})();\n\n\treturn outerStream;\n}\n"]}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"thinking-recovery.d.ts","sourceRoot":"","sources":["../../../../src/tool-call-middleware/protocols/kimi-xtml/thinking-recovery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAmB,MAAM,mBAAmB,CAAC;AA6D3E,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,gBAAgB,GAAG,gBAAgB,CA8BnF"}
|
|
@@ -0,0 +1,82 @@
|
|
|
1
|
+
import { createRecoveryCodeMask } from "../../recovery-code-mask.js";
|
|
2
|
+
const CHANNEL_MARKER_PATTERN = /<\|(open|close)\|>([a-zA-Z_][a-zA-Z0-9_]*)?<\|sep\|>|<\|(?:open|close|sep)\|>/g;
|
|
3
|
+
function recoverThinkingContent(input) {
|
|
4
|
+
const mask = createRecoveryCodeMask();
|
|
5
|
+
let channel = "thinking";
|
|
6
|
+
let thinking = "";
|
|
7
|
+
let response = "";
|
|
8
|
+
let changed = false;
|
|
9
|
+
let recoveredResponse = false;
|
|
10
|
+
const append = (text) => {
|
|
11
|
+
if (channel === "response")
|
|
12
|
+
response += text;
|
|
13
|
+
else
|
|
14
|
+
thinking += text;
|
|
15
|
+
};
|
|
16
|
+
const scan = (text) => {
|
|
17
|
+
let offset = 0;
|
|
18
|
+
for (const match of text.matchAll(CHANNEL_MARKER_PATTERN)) {
|
|
19
|
+
const index = match.index;
|
|
20
|
+
if (index === undefined)
|
|
21
|
+
continue;
|
|
22
|
+
append(text.slice(offset, index));
|
|
23
|
+
const action = match[1];
|
|
24
|
+
const name = match[2];
|
|
25
|
+
changed = true;
|
|
26
|
+
if (action === "open" && name === "response") {
|
|
27
|
+
channel = "response";
|
|
28
|
+
recoveredResponse = true;
|
|
29
|
+
}
|
|
30
|
+
else if (action === "open" && name === "think") {
|
|
31
|
+
channel = "thinking";
|
|
32
|
+
}
|
|
33
|
+
else if (action === "close" && name === "response") {
|
|
34
|
+
channel = "thinking";
|
|
35
|
+
}
|
|
36
|
+
offset = index + match[0].length;
|
|
37
|
+
}
|
|
38
|
+
append(text.slice(offset));
|
|
39
|
+
};
|
|
40
|
+
for (const segment of [...mask.feed(input), ...mask.finish()]) {
|
|
41
|
+
if (segment.scan)
|
|
42
|
+
scan(segment.text);
|
|
43
|
+
else
|
|
44
|
+
append(segment.text);
|
|
45
|
+
}
|
|
46
|
+
return { thinking, response, changed, recoveredResponse };
|
|
47
|
+
}
|
|
48
|
+
function recoveredThinkingBlock(block, thinking) {
|
|
49
|
+
return { ...block, thinking };
|
|
50
|
+
}
|
|
51
|
+
export function recoverKimiXtmlThinking(message) {
|
|
52
|
+
let changed = false;
|
|
53
|
+
let recoveredResponse = false;
|
|
54
|
+
const content = [];
|
|
55
|
+
for (const block of message.content) {
|
|
56
|
+
if (block.type !== "thinking") {
|
|
57
|
+
content.push(block);
|
|
58
|
+
continue;
|
|
59
|
+
}
|
|
60
|
+
const recovered = recoverThinkingContent(block.thinking);
|
|
61
|
+
changed = changed || recovered.changed;
|
|
62
|
+
recoveredResponse = recoveredResponse || recovered.recoveredResponse;
|
|
63
|
+
content.push(recoveredThinkingBlock(block, recovered.thinking));
|
|
64
|
+
if (recovered.response.length > 0)
|
|
65
|
+
content.push({ type: "text", text: recovered.response });
|
|
66
|
+
}
|
|
67
|
+
if (!changed)
|
|
68
|
+
return message;
|
|
69
|
+
return {
|
|
70
|
+
...message,
|
|
71
|
+
content,
|
|
72
|
+
diagnostics: [
|
|
73
|
+
...(message.diagnostics ?? []),
|
|
74
|
+
{
|
|
75
|
+
type: "kimi_xtml_thinking_recovery",
|
|
76
|
+
timestamp: Date.now(),
|
|
77
|
+
details: { recoveredResponse },
|
|
78
|
+
},
|
|
79
|
+
],
|
|
80
|
+
};
|
|
81
|
+
}
|
|
82
|
+
//# sourceMappingURL=thinking-recovery.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"thinking-recovery.js","sourceRoot":"","sources":["../../../../src/tool-call-middleware/protocols/kimi-xtml/thinking-recovery.ts"],"names":[],"mappings":"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","sourcesContent":["import type { AssistantMessage, ThinkingContent } from \"../../../types.ts\";\nimport { createRecoveryCodeMask } from \"../../recovery-code-mask.ts\";\n\ntype OutputChannel = \"thinking\" | \"response\";\n\ntype RecoveredThinking = {\n\treadonly thinking: string;\n\treadonly response: string;\n\treadonly changed: boolean;\n\treadonly recoveredResponse: boolean;\n};\n\nconst CHANNEL_MARKER_PATTERN = /<\\|(open|close)\\|>([a-zA-Z_][a-zA-Z0-9_]*)?<\\|sep\\|>|<\\|(?:open|close|sep)\\|>/g;\n\nfunction recoverThinkingContent(input: string): RecoveredThinking {\n\tconst mask = createRecoveryCodeMask();\n\tlet channel: OutputChannel = \"thinking\";\n\tlet thinking = \"\";\n\tlet response = \"\";\n\tlet changed = false;\n\tlet recoveredResponse = false;\n\n\tconst append = (text: string): void => {\n\t\tif (channel === \"response\") response += text;\n\t\telse thinking += text;\n\t};\n\n\tconst scan = (text: string): void => {\n\t\tlet offset = 0;\n\t\tfor (const match of text.matchAll(CHANNEL_MARKER_PATTERN)) {\n\t\t\tconst index = match.index;\n\t\t\tif (index === undefined) continue;\n\t\t\tappend(text.slice(offset, index));\n\t\t\tconst action = match[1];\n\t\t\tconst name = match[2];\n\t\t\tchanged = true;\n\t\t\tif (action === \"open\" && name === \"response\") {\n\t\t\t\tchannel = \"response\";\n\t\t\t\trecoveredResponse = true;\n\t\t\t} else if (action === \"open\" && name === \"think\") {\n\t\t\t\tchannel = \"thinking\";\n\t\t\t} else if (action === \"close\" && name === \"response\") {\n\t\t\t\tchannel = \"thinking\";\n\t\t\t}\n\t\t\toffset = index + match[0].length;\n\t\t}\n\t\tappend(text.slice(offset));\n\t};\n\n\tfor (const segment of [...mask.feed(input), ...mask.finish()]) {\n\t\tif (segment.scan) scan(segment.text);\n\t\telse append(segment.text);\n\t}\n\n\treturn { thinking, response, changed, recoveredResponse };\n}\n\nfunction recoveredThinkingBlock(block: ThinkingContent, thinking: string): ThinkingContent {\n\treturn { ...block, thinking };\n}\n\nexport function recoverKimiXtmlThinking(message: AssistantMessage): AssistantMessage {\n\tlet changed = false;\n\tlet recoveredResponse = false;\n\tconst content: AssistantMessage[\"content\"] = [];\n\n\tfor (const block of message.content) {\n\t\tif (block.type !== \"thinking\") {\n\t\t\tcontent.push(block);\n\t\t\tcontinue;\n\t\t}\n\t\tconst recovered = recoverThinkingContent(block.thinking);\n\t\tchanged = changed || recovered.changed;\n\t\trecoveredResponse = recoveredResponse || recovered.recoveredResponse;\n\t\tcontent.push(recoveredThinkingBlock(block, recovered.thinking));\n\t\tif (recovered.response.length > 0) content.push({ type: \"text\", text: recovered.response });\n\t}\n\n\tif (!changed) return message;\n\treturn {\n\t\t...message,\n\t\tcontent,\n\t\tdiagnostics: [\n\t\t\t...(message.diagnostics ?? []),\n\t\t\t{\n\t\t\t\ttype: \"kimi_xtml_thinking_recovery\",\n\t\t\t\ttimestamp: Date.now(),\n\t\t\t\tdetails: { recoveredResponse },\n\t\t\t},\n\t\t],\n\t};\n}\n"]}
|