Merge PR #6439: fix(compaction): stop feeding reasoning back to Claude summarizer (@roboomp)
This commit is contained in:
@@ -16,6 +16,9 @@
|
||||
### Fixed
|
||||
|
||||
- Improved resilience against transient stream JSON parse failures by recovering completed tool calls while safely preventing incomplete, unknown, refused, or sensitive calls from executing.
|
||||
### Fixed
|
||||
|
||||
- Fixed compaction/summarization serializing prior assistant reasoning back to Claude as text (rendered verbatim inside `<thinking>` tags for the `anthropic` dialect), which tripped Anthropic's `reasoning_extraction` refusal and blocked compaction on Fable 5 sessions; `serializeConversation` now drops `thinking` blocks for Anthropic-dialect summary targets while other dialects (e.g. Harmony) keep their native reasoning ([#6093](https://github.com/can1357/oh-my-pi/issues/6093)).
|
||||
|
||||
## [17.0.5] - 2026-07-18
|
||||
|
||||
|
||||
@@ -234,10 +234,21 @@ export function serializeConversation(messages: Message[], dialect?: Dialect): s
|
||||
}
|
||||
}
|
||||
if (dialect) {
|
||||
// Claude's classifier refuses inputs that reproduce the model's own
|
||||
// reasoning as text ("reasoning_extraction"), and the anthropic dialect
|
||||
// otherwise renders thinking verbatim inside <thinking> tags. Reasoning is
|
||||
// ephemeral and low-signal for a summary, so drop it from Anthropic-target
|
||||
// summary input. Other dialects (e.g. Harmony) carry reasoning natively in
|
||||
// their transcript format and keep it.
|
||||
const dropThinking = dialect === "anthropic";
|
||||
const processed: Message[] = [];
|
||||
for (const msg of messages) {
|
||||
if (msg.role === "assistant") {
|
||||
const content = msg.content.filter(block => block.type !== "toolCall" || !uselessCallIds.has(block.id));
|
||||
const content = msg.content.filter(
|
||||
block =>
|
||||
(block.type !== "toolCall" || !uselessCallIds.has(block.id)) &&
|
||||
(!dropThinking || block.type !== "thinking"),
|
||||
);
|
||||
if (content.length > 0) processed.push(content.length === msg.content.length ? msg : { ...msg, content });
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -130,4 +130,39 @@ describe("serializeConversation — useless pairs", () => {
|
||||
|
||||
expect(out).toBe("");
|
||||
});
|
||||
|
||||
test("strips assistant reasoning from Anthropic-dialect summary input but keeps text and tool calls", () => {
|
||||
const reasoning = "PRIVATE chain of thought that must not be replayed to Claude";
|
||||
const out = serializeConversation(
|
||||
[
|
||||
assistantMessage([
|
||||
{ type: "thinking", thinking: reasoning },
|
||||
{ type: "text", text: "The visible answer." },
|
||||
{ type: "toolCall", id: "c1", name: "search", arguments: { pattern: "delta" } },
|
||||
]),
|
||||
],
|
||||
"anthropic",
|
||||
);
|
||||
|
||||
expect(out).not.toContain(reasoning);
|
||||
expect(out).not.toContain("<thinking>");
|
||||
expect(out).toContain("The visible answer.");
|
||||
expect(out).toContain("<function_calls>");
|
||||
});
|
||||
|
||||
test("keeps assistant reasoning for non-Anthropic dialects", () => {
|
||||
const reasoning = "reasoning kept for the XML transcript";
|
||||
const out = serializeConversation(
|
||||
[
|
||||
assistantMessage([
|
||||
{ type: "thinking", thinking: reasoning },
|
||||
{ type: "text", text: "answer" },
|
||||
]),
|
||||
],
|
||||
"xml",
|
||||
);
|
||||
|
||||
expect(out).toContain(reasoning);
|
||||
expect(out).toContain("<thinking>");
|
||||
});
|
||||
});
|
||||
|
||||
@@ -315,6 +315,9 @@
|
||||
### Changed
|
||||
|
||||
- Changed `providers.webSearch` preferred provider failure handling to fall back and cascade through other configured/default search providers rather than stopping immediately.
|
||||
### Fixed
|
||||
|
||||
- Fixed snapcompact archiving reproduced assistant reasoning (`¶think:` sections) into frames replayed to the model on every subsequent request, wedging Fable 5 sessions on `reasoning_extraction` refusals; snapcompact serialization now excludes reasoning when the session model uses the Anthropic dialect ([#6093](https://github.com/can1357/oh-my-pi/issues/6093)).
|
||||
|
||||
## [17.0.5] - 2026-07-18
|
||||
|
||||
|
||||
@@ -131,6 +131,7 @@ import { toolWireSchema } from "@oh-my-pi/pi-ai/utils/schema";
|
||||
import { GeminiHeaderRunDetector, isGeminiThinkingModel } from "@oh-my-pi/pi-ai/utils/thinking-loop";
|
||||
import { type RepeatedToolCallDetection, ToolCallLoopGuard } from "@oh-my-pi/pi-ai/utils/tool-call-loop-guard";
|
||||
import { isFireworksFastModelId, toFireworksBaseModelId } from "@oh-my-pi/pi-catalog/fireworks-model-id";
|
||||
import { preferredDialect } from "@oh-my-pi/pi-catalog/identity";
|
||||
import { getSupportedEfforts } from "@oh-my-pi/pi-catalog/model-thinking";
|
||||
import { modelsAreEqual } from "@oh-my-pi/pi-catalog/models";
|
||||
import { MacOSPowerAssertion } from "@oh-my-pi/pi-natives";
|
||||
@@ -11414,6 +11415,11 @@ export class AgentSession {
|
||||
let snapcompactReady = wantsSnapcompact;
|
||||
const snapcompactShapeSetting = this.settings.get("snapcompact.shape");
|
||||
let snapcompactShape: snapcompact.Shape | undefined;
|
||||
// Claude refuses inputs that reproduce its own reasoning as text
|
||||
// ("reasoning_extraction"), and the snapcompact archive is replayed as
|
||||
// text into every later request; drop `¶think:` sections for
|
||||
// Anthropic-dialect targets (issue #6093).
|
||||
const snapcompactIncludeThinking = preferredDialect(this.model.id) !== "anthropic";
|
||||
if (wantsSnapcompact && !this.model.input.includes("image")) {
|
||||
if (explicitSnapcompact) {
|
||||
this.emitNotice(
|
||||
@@ -11432,6 +11438,7 @@ export class AgentSession {
|
||||
} else if (snapcompactReady) {
|
||||
const text = snapcompact.serializeConversation(
|
||||
convertToLlm(preparation.messagesToSummarize.concat(preparation.turnPrefixMessages)),
|
||||
{ includeThinking: snapcompactIncludeThinking },
|
||||
);
|
||||
const probeText = snapcompact.renderabilityProbeText(
|
||||
text,
|
||||
@@ -11487,6 +11494,7 @@ export class AgentSession {
|
||||
model: this.model,
|
||||
...(snapcompactShapeSetting === "auto" ? {} : { shape }),
|
||||
maxFrames,
|
||||
includeThinking: snapcompactIncludeThinking,
|
||||
});
|
||||
const framePayloadBytes = this.#snapcompactFramePayloadBytes(snapcompactResult);
|
||||
if (framePayloadBytes > snapcompact.FRAME_DATA_BYTES_BUDGET) {
|
||||
@@ -14698,8 +14706,13 @@ export class AgentSession {
|
||||
let snapcompactResult: snapcompact.CompactionResult | undefined;
|
||||
let snapcompactBlocker: string | undefined;
|
||||
if (action === "snapcompact" && compactionPrep.kind !== "fromHook") {
|
||||
// Drop `¶think:` sections for Anthropic-dialect targets: the archive
|
||||
// is replayed as text and Claude refuses reproduced reasoning
|
||||
// ("reasoning_extraction", issue #6093).
|
||||
const snapcompactIncludeThinking = preferredDialect(this.model.id) !== "anthropic";
|
||||
const text = snapcompact.serializeConversation(
|
||||
convertToLlm(preparation.messagesToSummarize.concat(preparation.turnPrefixMessages)),
|
||||
{ includeThinking: snapcompactIncludeThinking },
|
||||
);
|
||||
const probeText = snapcompact.renderabilityProbeText(
|
||||
text,
|
||||
@@ -14730,6 +14743,7 @@ export class AgentSession {
|
||||
model: this.model,
|
||||
...(shapeSetting === "auto" ? {} : { shape }),
|
||||
maxFrames,
|
||||
includeThinking: snapcompactIncludeThinking,
|
||||
});
|
||||
const framePayloadBytes = this.#snapcompactFramePayloadBytes(snapcompactResult);
|
||||
if (framePayloadBytes > snapcompact.FRAME_DATA_BYTES_BUDGET) {
|
||||
|
||||
@@ -2,6 +2,10 @@
|
||||
|
||||
## [Unreleased]
|
||||
|
||||
### Added
|
||||
|
||||
- Added an `includeThinking` serialize option (default `true`) so callers can exclude assistant reasoning (`¶think:` sections) from archived transcripts; used to keep reproduced reasoning out of frames replayed to Anthropic-dialect models ([#6093](https://github.com/can1357/oh-my-pi/issues/6093)).
|
||||
|
||||
## [16.5.0] - 2026-07-13
|
||||
|
||||
### Changed
|
||||
|
||||
@@ -735,6 +735,12 @@ export interface SerializeOptions {
|
||||
/** Print tool-result text in dim gray ink so archived conversation reads
|
||||
* louder than archived tool noise. Defaults to `true`. */
|
||||
dimToolResults?: boolean;
|
||||
/** Serialize assistant reasoning as `¶think:` sections. Defaults to `true`.
|
||||
* Callers archiving for a Claude/Anthropic-dialect model set this `false`:
|
||||
* the archive frames are replayed as text into every later request, and
|
||||
* reasoning rendered back to Claude trips its `reasoning_extraction`
|
||||
* classifier (issue #6093). */
|
||||
includeThinking?: boolean;
|
||||
}
|
||||
|
||||
/** Keep the head and tail of `text`, eliding the middle beyond `maxChars`. */
|
||||
@@ -773,6 +779,7 @@ export function serializeConversation(messages: Message[], options?: SerializeOp
|
||||
const toolCallMaxChars = options?.toolCallMaxChars ?? TOOL_CALL_MAX_CHARS;
|
||||
const headRatio = options?.truncateHeadRatio ?? TRUNCATE_HEAD_RATIO;
|
||||
const dimToolResults = options?.dimToolResults !== false;
|
||||
const includeThinking = options?.includeThinking !== false;
|
||||
const parts: string[] = [];
|
||||
let lastPrefix: string | null = null;
|
||||
|
||||
@@ -845,6 +852,7 @@ export function serializeConversation(messages: Message[], options?: SerializeOp
|
||||
const text = stripDimMarkers(block.text);
|
||||
if (text.trim()) pendingText.push(text);
|
||||
} else if (block.type === "thinking") {
|
||||
if (!includeThinking) continue;
|
||||
const thinking = stripDimMarkers(block.thinking);
|
||||
if (thinking.trim()) pendingThinking.push(thinking);
|
||||
} else if (block.type === "toolCall") {
|
||||
|
||||
@@ -717,6 +717,21 @@ describe("serializeConversation", () => {
|
||||
expect(out).toBe("¶think:weigh options\n\n¶ai:the answer");
|
||||
});
|
||||
|
||||
it("drops ¶think reasoning sections when includeThinking is false but keeps the reply", () => {
|
||||
const out = snapcompact.serializeConversation(
|
||||
[
|
||||
createAssistantMessage([
|
||||
{ type: "thinking", thinking: "private chain of thought" },
|
||||
{ type: "text", text: "the answer" },
|
||||
]),
|
||||
],
|
||||
{ includeThinking: false },
|
||||
);
|
||||
expect(out).not.toContain("¶think:");
|
||||
expect(out).not.toContain("private chain of thought");
|
||||
expect(out).toBe("¶ai:the answer");
|
||||
});
|
||||
|
||||
it("gives a thinking-only turn its own heading before the tool calls", () => {
|
||||
const out = snapcompact.serializeConversation([
|
||||
createAssistantMessage([
|
||||
|
||||
Reference in New Issue
Block a user