refactor: align compress blocks with bN metadata and placeholders

Author: Tarquinen

lib/message-ids.ts

@@ -83,10 +83,6 @@ export function parseBoundaryId(id: string): ParsedBoundaryId | null {
     return null
 }
 
-export function formatMessageIdMarker(ref: string): string {
-    return `Message ID: ${ref}`
-}
-
 export function formatMessageIdTag(ref: string): string {
     return `<${MESSAGE_ID_TAG_NAME}>${ref}</${MESSAGE_ID_TAG_NAME}>`
 }

lib/messages/inject/inject.ts

@@ -1,7 +1,7 @@
 import type { SessionState, WithParts } from "../../state"
 import type { Logger } from "../../logger"
 import type { PluginConfig } from "../../config"
-import { formatMessageIdMarker, formatMessageIdTag } from "../../message-ids"
+import { formatMessageIdTag } from "../../message-ids"
 import { createSyntheticTextPart, createSyntheticToolPart, isIgnoredUserMessage } from "../utils"
 import {
     addAnchor,
@@ -102,16 +102,10 @@ export const insertMessageIdContext = (state: SessionState, messages: WithParts[
             continue
         }
 
-        const marker = formatMessageIdMarker(messageRef)
         const tag = formatMessageIdTag(messageRef)
 
-        if (message.info.role === "user") {
-            const hasMarker = message.parts.some(
-                (part) => part.type === "text" && part.text.trim() === marker,
-            )
-            if (!hasMarker) {
-                message.parts.push(createSyntheticTextPart(message, marker))
-            }
+        if (message.info.role === "user" && !isIgnoredUserMessage(message)) {
+            message.parts.push(createSyntheticTextPart(message, tag))
             continue
         }
 
@@ -124,6 +118,6 @@ export const insertMessageIdContext = (state: SessionState, messages: WithParts[
             continue
         }
 
-        message.parts.push(createSyntheticToolPart(message, marker, toolModelId))
+        message.parts.push(createSyntheticToolPart(message, tag, toolModelId))
     }
 }

lib/tools/compress-utils.ts

@@ -1,9 +1,9 @@
 import type { SessionState, WithParts, CompressSummary } from "../state"
-import { formatBlockRef, parseBoundaryId } from "../message-ids"
+import { formatBlockRef, formatMessageIdTag, parseBoundaryId } from "../message-ids"
 import { isIgnoredUserMessage } from "../messages/utils"
 import { countAllMessageTokens, countTokens } from "../strategies/utils"
 
-const BLOCK_PLACEHOLDER_REGEX = /\{block_(\d+)\}/gi
+const BLOCK_PLACEHOLDER_REGEX = /\(b(\d+)\)|\{block_(\d+)\}/gi
 
 export interface CompressToolArgs {
     topic: string
@@ -56,11 +56,15 @@ export interface AppliedCompressionResult {
 }
 
 export function formatCompressedBlockHeader(blockId: number): string {
-    return `[Compressed conversation b${blockId}]`
+    return "[Compressed conversation section]"
+}
+
+export function formatCompressedBlockFooter(blockId: number): string {
+    return formatMessageIdTag(formatBlockRef(blockId))
 }
 
 export function formatBlockPlaceholder(blockId: number): string {
-    return `{block_${blockId}}`
+    return `(b${blockId})`
 }
 
 export function validateCompressArgs(args: CompressToolArgs): void {
@@ -343,7 +347,8 @@ export function parseBlockPlaceholders(summary: string): ParsedBlockPlaceholder[
     let match: RegExpExecArray | null
     while ((match = regex.exec(summary)) !== null) {
         const full = match[0]
-        const parsed = Number.parseInt(match[1], 10)
+        const blockIdPart = match[1] || match[2]
+        const parsed = Number.parseInt(blockIdPart, 10)
         if (!Number.isInteger(parsed)) {
             continue
         }
@@ -455,7 +460,7 @@ export function injectBlockPlaceholders(
             }
 
             expanded += summary.slice(cursor, placeholder.startIndex)
-            expanded += stripCompressedBlockHeader(target.summary)
+            expanded += restoreStoredCompressedSummary(target.summary)
             cursor = placeholder.endIndex
 
             if (!consumedSeen.has(placeholder.blockId)) {
@@ -506,11 +511,12 @@ export function allocateBlockId(summaries: CompressSummary[]): number {
 
 export function addCompressedBlockHeader(blockId: number, summary: string): string {
     const header = formatCompressedBlockHeader(blockId)
+    const footer = formatCompressedBlockFooter(blockId)
     const body = summary.trim()
     if (body.length === 0) {
-        return header
+        return `${header}\n${footer}`
     }
-    return `${header}\n${body}`
+    return `${header}\n${body}\n\n${footer}`
 }
 
 export function applyCompressionState(
@@ -556,14 +562,17 @@ export function countSummaryTokens(summary: string): number {
     return countTokens(summary)
 }
 
-function stripCompressedBlockHeader(summary: string): string {
-    const headerMatch = summary.match(/^\s*\[Compressed conversation b\d+\]/i)
+function restoreStoredCompressedSummary(summary: string): string {
+    const headerMatch = summary.match(/^\s*\[Compressed conversation(?: section)?(?: b\d+)?\]/i)
     if (!headerMatch) {
         return summary
     }
 
     const afterHeader = summary.slice(headerMatch[0].length)
-    return afterHeader.replace(/^(?:\r?\n)+/, "")
+    const withoutLeadingBreaks = afterHeader.replace(/^(?:\r?\n)+/, "")
+    return withoutLeadingBreaks
+        .replace(/(?:\r?\n)*<dcp-message-id>b\d+<\/dcp-message-id>\s*$/i, "")
+        .replace(/(?:\r?\n)+$/, "")
 }
 
 function injectBoundarySummaryIfMissing(
@@ -586,7 +595,7 @@ function injectBoundarySummaryIfMissing(
         throw new Error(`Compressed block not found: ${formatBlockPlaceholder(reference.blockId)}`)
     }
 
-    const injectedBody = stripCompressedBlockHeader(target.summary)
+    const injectedBody = restoreStoredCompressedSummary(target.summary)
     const next =
         position === "start"
             ? mergeWithSpacing(injectedBody, summary)