simplify compress mode handling

Author: Tarquinen

index.ts

@@ -1,13 +1,13 @@
 import type { Plugin } from "@opencode-ai/plugin"
 import { getConfig } from "./lib/config"
+import { createCompressMessageTool, createCompressRangeTool } from "./lib/tools"
 import {
     compressDisabledByOpencode,
     hasExplicitToolPermission,
     type HostPermissionSnapshot,
 } from "./lib/host-permissions"
 import { Logger } from "./lib/logger"
 import { createSessionState } from "./lib/state"
-import { createCompressTool } from "./lib/tools"
 import { PromptStore } from "./lib/prompts/store"
 import {
     createChatMessageTransformHandler,
@@ -41,6 +41,15 @@ const plugin: Plugin = (async (ctx) => {
         strategies: config.strategies,
     })
 
+    const compressToolContext = {
+        client: ctx.client,
+        state,
+        logger,
+        config,
+        workingDirectory: ctx.directory,
+        prompts,
+    }
+
     return {
         "experimental.chat.system.transform": createSystemPromptHandler(
             state,
@@ -81,14 +90,10 @@ const plugin: Plugin = (async (ctx) => {
         ),
         tool: {
             ...(config.compress.permission !== "deny" && {
-                compress: createCompressTool({
-                    client: ctx.client,
-                    state,
-                    logger,
-                    config,
-                    workingDirectory: ctx.directory,
-                    prompts,
-                }),
+                compress:
+                    config.compress.mode === "message"
+                        ? createCompressMessageTool(compressToolContext)
+                        : createCompressRangeTool(compressToolContext),
             }),
         },
         config: async (opencodeConfig) => {

lib/commands/manual.ts

@@ -33,7 +33,8 @@ function getTriggerPrompt(
     userFocus?: string,
 ): string {
     const base = COMPRESS_TRIGGER_PROMPT
-    const compressedBlockGuidance = buildCompressedBlockGuidance(state, config)
+    const compressedBlockGuidance =
+        config.compress.mode === "message" ? "" : buildCompressedBlockGuidance(state)
 
     const sections = [base, compressedBlockGuidance]
     if (userFocus && userFocus.trim().length > 0) {

lib/messages/inject/utils.ts

@@ -169,15 +169,7 @@ export function addAnchor(
     return anchorMessageIds.size !== previousSize
 }
 
-export function buildCompressedBlockGuidance(state: SessionState, config: PluginConfig): string {
-    if (config.compress.mode === "message") {
-        return [
-            "Compressed message context:",
-            "- Message mode is active. Compress individual raw messages using `mNNNN` IDs only.",
-            "- Do not use block placeholders or `bN` references in message mode.",
-        ].join("\n")
-    }
-
+export function buildCompressedBlockGuidance(state: SessionState): string {
     const refs = Array.from(state.prune.messages.activeBlockIds)
         .filter((id) => Number.isInteger(id) && id > 0)
         .sort((a, b) => a - b)
@@ -193,6 +185,10 @@ export function buildCompressedBlockGuidance(state: SessionState, config: Plugin
 }
 
 function appendGuidanceToDcpTag(hintText: string, guidance: string): string {
+    if (!guidance.trim()) {
+        return hintText
+    }
+
     const closeTag = "</dcp-system-reminder>"
     const closeTagIndex = hintText.lastIndexOf(closeTag)
 
@@ -246,7 +242,8 @@ export function applyAnchoredNudges(
     messages: WithParts[],
     prompts: RuntimePrompts,
 ): void {
-    const compressedBlockGuidance = buildCompressedBlockGuidance(state, config)
+    const compressedBlockGuidance =
+        config.compress.mode === "message" ? "" : buildCompressedBlockGuidance(state)
 
     const contextLimitNudge = appendGuidanceToDcpTag(
         prompts.contextLimitNudge,

lib/tools/compress.ts

@@ -1,4 +1,3 @@
 export { ToolContext } from "./types"
-export { createCompressTool } from "./compress"
 export { createCompressMessageTool } from "./compress-message"
 export { createCompressRangeTool } from "./compress-range"

lib/tools/index.ts

@@ -3,7 +3,7 @@ import test from "node:test"
 import { join } from "node:path"
 import { tmpdir } from "node:os"
 import { mkdirSync } from "node:fs"
-import { createCompressTool } from "../lib/tools/compress"
+import { createCompressMessageTool } from "../lib/tools/compress-message"
 import { createSessionState, type WithParts } from "../lib/state"
 import type { PluginConfig } from "../lib/config"
 import { Logger } from "../lib/logger"
@@ -149,7 +149,7 @@ test("compress message mode batches individual message summaries", async () => {
     const rawMessages = buildMessages(sessionID)
     const state = createSessionState()
     const logger = new Logger(false)
-    const tool = createCompressTool({
+    const tool = createCompressMessageTool({
         client: {
             session: {
                 messages: async () => ({ data: rawMessages }),
@@ -216,7 +216,7 @@ test("compress message mode rejects compressed block ids", async () => {
     const rawMessages = buildMessages(sessionID)
     const state = createSessionState()
     const logger = new Logger(false)
-    const tool = createCompressTool({
+    const tool = createCompressMessageTool({
         client: {
             session: {
                 messages: async () => ({ data: rawMessages }),
@@ -287,7 +287,7 @@ test("compress message mode allows messages containing compress tool parts", asy
 
     const state = createSessionState()
     const logger = new Logger(false)
-    const tool = createCompressTool({
+    const tool = createCompressMessageTool({
         client: {
             session: {
                 messages: async () => ({ data: rawMessages }),
@@ -340,7 +340,7 @@ test("compress message mode sends one aggregated notification for batched messag
     config.pruneNotificationType = "toast"
 
     const toastCalls: string[] = []
-    const tool = createCompressTool({
+    const tool = createCompressMessageTool({
         client: {
             session: {
                 messages: async () => ({ data: rawMessages }),
@@ -398,7 +398,7 @@ test("compress message mode skips invalid batch entries and reports issues", asy
     const rawMessages = buildMessages(sessionID)
     const state = createSessionState()
     const logger = new Logger(false)
-    const tool = createCompressTool({
+    const tool = createCompressMessageTool({
         client: {
             session: {
                 messages: async () => ({ data: rawMessages }),
@@ -463,7 +463,7 @@ test("compress message mode reports issues when every batch entry is skipped", a
     const rawMessages = buildMessages(sessionID)
     const state = createSessionState()
     const logger = new Logger(false)
-    const tool = createCompressTool({
+    const tool = createCompressMessageTool({
         client: {
             session: {
                 messages: async () => ({ data: rawMessages }),