diff --git a/lib/state/utils.ts b/lib/state/utils.ts index f0caf267..5b13cdd3 100644 --- a/lib/state/utils.ts +++ b/lib/state/utils.ts @@ -66,7 +66,12 @@ export function findLastCompactionTimestamp(messages: WithParts[]): number { if (!isMessageWithInfo(msg)) { continue } - if (msg.info.role === "assistant" && msg.info.summary === true) { + if ( + msg.info.role === "assistant" && + msg.info.summary === true && + msg.info.finish && + !msg.info.error + ) { return msg.info.time.created } } diff --git a/lib/v2/messages.ts b/lib/v2/messages.ts index 62f0c737..2ae93702 100644 --- a/lib/v2/messages.ts +++ b/lib/v2/messages.ts @@ -76,7 +76,8 @@ export function history(entries: History, session: Session): WithParts[] { ] } if (entry.type === "compaction" && entry.status === "completed") { - return [{ info: info(entry.id, "assistant", session, entry), parts: [] } as WithParts] + const summary = { ...info(entry.id, "assistant", session, entry), finish: "stop" } + return [{ info: summary, parts: [] } as WithParts] } return [] }) diff --git a/tests/message-ids.test.ts b/tests/message-ids.test.ts index f128b766..62c8300a 100644 --- a/tests/message-ids.test.ts +++ b/tests/message-ids.test.ts @@ -14,7 +14,10 @@ function textPart(messageID: string, sessionID: string, id: string, text: string } } -function buildCompactedMessages(sessionID: string): WithParts[] { +function buildCompactedMessages( + sessionID: string, + summaryInfo: Record = { finish: "stop" }, +): WithParts[] { return [ { info: { @@ -24,6 +27,7 @@ function buildCompactedMessages(sessionID: string): WithParts[] { agent: "assistant", summary: true, time: { created: 2 }, + ...summaryInfo, } as WithParts["info"], parts: [ textPart( @@ -87,3 +91,24 @@ test("checkSession resets message id aliases after native compaction", async () assert.equal(state.messageIds.byRef.get("m0002"), "msg-user-follow-up") assert.equal(state.messageIds.nextRef, 3) }) + +test("checkSession ignores failed native compaction summaries", async () => { + const failedSummaries = [{}, { finish: "error", error: { name: "UnknownError" } }] + for (const summaryInfo of failedSummaries) { + const sessionID = `ses_message_ids_failed_compaction_${Date.now()}` + const messages = buildCompactedMessages(sessionID, summaryInfo) + const state = createSessionState() + const logger = new Logger(false) + + state.sessionId = sessionID + state.messageIds.byRawId.set("old-message", "m0001") + state.messageIds.byRef.set("m0001", "old-message") + state.messageIds.nextRef = 2 + + await checkSession({} as any, state, logger, messages, false) + + assert.equal(state.lastCompaction, 0) + assert.equal(state.messageIds.byRef.get("m0001"), "old-message") + assert.equal(state.messageIds.nextRef, 2) + } +}) diff --git a/tests/v2-messages.test.ts b/tests/v2-messages.test.ts index 072c99f4..4455cbe7 100644 --- a/tests/v2-messages.test.ts +++ b/tests/v2-messages.test.ts @@ -1,7 +1,8 @@ import assert from "node:assert/strict" import test from "node:test" import type { Message } from "@opencode/ai/schema/messages" -import { project } from "../lib/v2/messages" +import { history, project } from "../lib/v2/messages" +import { findLastCompactionTimestamp } from "../lib/state/utils" import { createSessionState, type CompressionBlock } from "../lib/state" import { assignMessageRefs } from "../lib/message-ids" import { injectMessageIds, prune } from "../lib/messages" @@ -169,3 +170,11 @@ test("V2 inserts summaries after native checkpoints without an ordinary user mes assert.deepEqual(restored[0], native[0]) assert.deepEqual(restored[1]?.content, [{ type: "text", text: "CHECKPOINT_SUMMARY" }]) }) + +test("completed V2 compaction entries count as native compaction", () => { + const entries = [ + { id: "cmp_one", type: "compaction", status: "completed", time: { created: 5 } }, + { id: "msg_user", type: "user", text: "Continue", time: { created: 6 } }, + ] as unknown as Parameters[0] + assert.equal(findLastCompactionTimestamp(history(entries, session)), 5) +})