fix: resolve merge conflicts and preserve runtime test fixes

This commit is contained in:
Peter Steinberger
2026-04-06 22:45:51 +01:00
parent 9d7459f182
commit 80c8567f9d
79 changed files with 861 additions and 378 deletions

View File

@@ -312,7 +312,7 @@ describe("stripAssistantInternalScaffolding", () => {
describe("model special token stripping", () => {
it("strips Kimi/GLM special tokens in isolation", () => {
expectVisibleText("<|assistant|>Here is the answer<|end|>", "Here is the answer ");
expectVisibleText("<|assistant|>Here is the answer<|end|>", "Here is the answer");
});
it("strips full-width pipe DeepSeek tokens", () => {
@@ -322,7 +322,7 @@ describe("stripAssistantInternalScaffolding", () => {
it("strips special tokens mixed with normal text", () => {
expectVisibleText(
"Start <|tool_call_result_begin|>middle<|tool_call_result_end|> end",
"Start middle end",
"Start middle end",
);
});
@@ -392,8 +392,8 @@ describe("stripAssistantInternalScaffolding", () => {
});
it("resets special-token regex state between calls", () => {
expect(stripModelSpecialTokens("prefix <|assistant|>")).toBe("prefix ");
expect(stripModelSpecialTokens("<|assistant|>short")).toBe(" short");
expect(stripModelSpecialTokens("prefix <|assistant|>")).toBe("prefix ");
expect(stripModelSpecialTokens("<|assistant|>short")).toBe("short");
});
});
});