refactor: remove compress wrappers

Author: Tarquinen

lib/tools/compress-utils.ts

@@ -1,7 +1,7 @@
 import type { SessionState, WithParts, CompressSummary } from "../state"
 import { formatBlockRef, formatMessageIdTag, parseBoundaryId } from "../message-ids"
 import { isIgnoredUserMessage } from "../messages/utils"
-import { countAllMessageTokens, countTokens } from "../strategies/utils"
+import { countAllMessageTokens } from "../strategies/utils"
 
 const BLOCK_PLACEHOLDER_REGEX = /\(b(\d+)\)|\{block_(\d+)\}/gi
 
@@ -55,13 +55,7 @@ export interface AppliedCompressionResult {
     messageIds: string[]
 }
 
-export function formatCompressedBlockHeader(blockId: number): string {
-    return "[Compressed conversation section]"
-}
-
-export function formatCompressedBlockFooter(blockId: number): string {
-    return formatMessageIdTag(formatBlockRef(blockId))
-}
+export const COMPRESSED_BLOCK_HEADER = "[Compressed conversation section]"
 
 export function formatBlockPlaceholder(blockId: number): string {
     return `(b${blockId})`
@@ -510,8 +504,8 @@ export function allocateBlockId(summaries: CompressSummary[]): number {
 }
 
 export function wrapCompressedSummary(blockId: number, summary: string): string {
-    const header = formatCompressedBlockHeader(blockId)
-    const footer = formatCompressedBlockFooter(blockId)
+    const header = COMPRESSED_BLOCK_HEADER
+    const footer = formatMessageIdTag(formatBlockRef(blockId))
     const body = summary.trim()
     if (body.length === 0) {
         return `${header}\n${footer}`
@@ -558,10 +552,6 @@ export function applyCompressionState(
     }
 }
 
-export function countSummaryTokens(summary: string): number {
-    return countTokens(summary)
-}
-
 function restoreStoredCompressedSummary(summary: string): string {
     const headerMatch = summary.match(/^\s*\[Compressed conversation(?: section)?(?: b\d+)?\]/i)
     if (!headerMatch) {

lib/tools/compress.ts

@@ -7,9 +7,8 @@ import {
     allocateBlockId,
     applyCompressionState,
     buildSearchContext,
-    countSummaryTokens,
     fetchSessionMessages,
-    formatCompressedBlockHeader,
+    COMPRESSED_BLOCK_HEADER,
     injectBlockPlaceholders,
     parseBlockPlaceholders,
     resolveAnchorMessageId,
@@ -19,7 +18,7 @@ import {
     validateSummaryPlaceholders,
     type CompressToolArgs,
 } from "./compress-utils"
-import { getCurrentParams, getCurrentTokenUsage } from "../strategies/utils"
+import { getCurrentParams, getCurrentTokenUsage, countTokens } from "../strategies/utils"
 import { saveSessionState } from "../state/persistence"
 import { sendCompressNotification } from "../ui/notification"
 
@@ -103,7 +102,7 @@ export function createCompressTool(ctx: ToolContext): ReturnType<typeof tool> {
 
             const blockId = allocateBlockId(ctx.state.compressSummaries)
             const storedSummary = wrapCompressedSummary(blockId, injected.expandedSummary)
-            const summaryTokens = countSummaryTokens(storedSummary)
+            const summaryTokens = countTokens(storedSummary)
 
             const applied = applyCompressionState(
                 ctx.state,
@@ -138,7 +137,7 @@ export function createCompressTool(ctx: ToolContext): ReturnType<typeof tool> {
                 params,
             )
 
-            return `Compressed ${applied.messageIds.length} messages into ${formatCompressedBlockHeader(blockId)}.`
+            return `Compressed ${applied.messageIds.length} messages into ${COMPRESSED_BLOCK_HEADER}.`
         },
     })
 }