Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion lib/state/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
Expand Down
3 changes: 2 additions & 1 deletion lib/v2/messages.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 []
})
Expand Down
27 changes: 26 additions & 1 deletion tests/message-ids.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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<string, unknown> = { finish: "stop" },
): WithParts[] {
return [
{
info: {
Expand All @@ -24,6 +27,7 @@ function buildCompactedMessages(sessionID: string): WithParts[] {
agent: "assistant",
summary: true,
time: { created: 2 },
...summaryInfo,
} as WithParts["info"],
parts: [
textPart(
Expand Down Expand Up @@ -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)
}
})
11 changes: 10 additions & 1 deletion tests/v2-messages.test.ts
Original file line number Diff line number Diff line change
@@ -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"
Expand Down Expand Up @@ -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<typeof history>[0]
assert.equal(findLastCompactionTimestamp(history(entries, session)), 5)
})
Loading