@tarquinen/opencode-dcp 2.1.3 → 2.1.4

package/dist/lib/tools/compress.js

@@ -2,12 +2,11 @@ import { tool } from "@opencode-ai/plugin";
 import { ensureSessionInitialized } from "../state";
 import { saveSessionState } from "../state/persistence";
 import { loadPrompt } from "../prompts";
-import { getCurrentParams, getTotalToolTokens, countMessageTextTokens } from "../strategies/utils";
-import { findStringInMessages, collectToolIdsInRange, collectMessageIdsInRange } from "./utils";
+import { getCurrentParams, getTotalToolTokens } from "../strategies/utils";
 import { sendCompressNotification } from "../ui/notification";
-import { prune as applyPruneTransforms } from "../messages/prune";
+import { assignMessageRefs } from "../message-ids";
+import { addCompressedBlockHeader, allocateBlockId, buildSearchContext, fetchSessionMessages, injectBlockPlaceholders, parseBlockPlaceholders, resolveAnchorMessageId, resolveBoundaryIds, resolveRange, upsertCompressedSummary, validateCompressArgs, validateSummaryPlaceholders, } from "./compress-utils";
 const COMPRESS_TOOL_DESCRIPTION = loadPrompt("compress-tool-spec");
-const COMPRESS_SUMMARY_PREFIX = "[Compressed conversation block]\n\n";
 export function createCompressTool(ctx) {
     return tool({
         description: COMPRESS_TOOL_DESCRIPTION,
@@ -17,17 +16,17 @@ export function createCompressTool(ctx) {
                 .describe("Short label (3-5 words) for display - e.g., 'Auth System Exploration'"),
             content: tool.schema
                 .object({
-                startString: tool.schema
+                startId: tool.schema
                     .string()
-                    .describe("Unique text from conversation marking the beginning of range"),
-                endString: tool.schema
+                    .describe("Message or block ID marking the beginning of range (e.g. m0000, b2)"),
+                endId: tool.schema
                     .string()
-                    .describe("Unique text marking the end of range"),
+                    .describe("Message or block ID marking the end of range (e.g. m0012, b5)"),
                 summary: tool.schema
                     .string()
                     .describe("Complete technical summary replacing all content in range"),
             })
-                .describe("The compression details: boundaries and replacement summary"),
+                .describe("Compression details: ID boundaries and replacement summary"),
         },
         async execute(args, toolCtx) {
             const { client, state, logger } = ctx;
@@ -38,84 +37,29 @@ export function createCompressTool(ctx) {
                 always: ["*"],
                 metadata: {},
             });
-            const { topic, content } = args;
-            const { startString, endString, summary } = content || {};
-            if (!topic || typeof topic !== "string") {
-                throw new Error("topic is required and must be a non-empty string");
-            }
-            if (!startString || typeof startString !== "string") {
-                throw new Error("content.startString is required and must be a non-empty string");
-            }
-            if (!endString || typeof endString !== "string") {
-                throw new Error("content.endString is required and must be a non-empty string");
-            }
-            if (!summary || typeof summary !== "string") {
-                throw new Error("content.summary is required and must be a non-empty string");
-            }
-            // logger.info("Compress tool invoked")
-            // logger.info(
-            //     JSON.stringify({
-            //         startString: startString?.substring(0, 50) + "...",
-            //         endString: endString?.substring(0, 50) + "...",
-            //         topic: topic,
-            //         summaryLength: summary?.length,
-            //     }),
-            // )
-            const messagesResponse = await client.session.messages({
-                path: { id: sessionId },
-            });
-            const messages = messagesResponse.data || messagesResponse;
-            await ensureSessionInitialized(client, state, sessionId, logger, messages, ctx.config.manualMode.enabled);
-            const transformedMessages = structuredClone(messages);
-            applyPruneTransforms(state, logger, ctx.config, transformedMessages);
-            const startResult = findStringInMessages(transformedMessages, startString, logger, "startString");
-            const endResult = findStringInMessages(transformedMessages, endString, logger, "endString");
-            let rawStartIndex = messages.findIndex((m) => m.info.id === startResult.messageId);
-            let rawEndIndex = messages.findIndex((m) => m.info.id === endResult.messageId);
-            // If a boundary matched inside a synthetic compress summary message,
-            // resolve it back to the summary's anchor message in the raw messages
-            if (rawStartIndex === -1) {
-                const summary = state.compressSummaries.find((s) => s.summary.includes(startString));
-                if (summary) {
-                    rawStartIndex = messages.findIndex((m) => m.info.id === summary.anchorMessageId);
-                }
-            }
-            if (rawEndIndex === -1) {
-                const summary = state.compressSummaries.find((s) => s.summary.includes(endString));
-                if (summary) {
-                    rawEndIndex = messages.findIndex((m) => m.info.id === summary.anchorMessageId);
-                }
-            }
-            if (rawStartIndex === -1 || rawEndIndex === -1) {
-                throw new Error(`Failed to map boundary matches back to raw messages`);
-            }
-            if (rawStartIndex > rawEndIndex) {
-                throw new Error(`startString appears after endString in the conversation. Start must come before end.`);
-            }
-            const containedToolIds = collectToolIdsInRange(messages, rawStartIndex, rawEndIndex);
-            const containedMessageIds = collectMessageIdsInRange(messages, rawStartIndex, rawEndIndex);
-            // Remove any existing summaries whose anchors are now inside this range
-            // This prevents duplicate injections when a larger compress subsumes a smaller one
-            const removedSummaries = state.compressSummaries.filter((s) => containedMessageIds.includes(s.anchorMessageId));
-            if (removedSummaries.length > 0) {
-                state.compressSummaries = state.compressSummaries.filter((s) => !containedMessageIds.includes(s.anchorMessageId));
-            }
-            const compressSummary = {
-                anchorMessageId: startResult.messageId,
-                summary: COMPRESS_SUMMARY_PREFIX + summary,
-            };
-            state.compressSummaries.push(compressSummary);
-            const compressedMessageIds = containedMessageIds.filter((id) => !state.prune.messages.has(id));
-            const compressedToolIds = containedToolIds.filter((id) => !state.prune.tools.has(id));
+            const compressArgs = args;
+            validateCompressArgs(compressArgs);
+            const rawMessages = await fetchSessionMessages(client, sessionId);
+            await ensureSessionInitialized(client, state, sessionId, logger, rawMessages, ctx.config.manualMode.enabled);
+            assignMessageRefs(state, rawMessages);
+            const searchContext = buildSearchContext(state, rawMessages);
+            const { startReference, endReference } = resolveBoundaryIds(searchContext, state, compressArgs.content.startId, compressArgs.content.endId);
+            const range = resolveRange(searchContext, startReference, endReference);
+            const anchorMessageId = resolveAnchorMessageId(range.startReference);
+            const parsedPlaceholders = parseBlockPlaceholders(compressArgs.content.summary);
+            validateSummaryPlaceholders(parsedPlaceholders, range.requiredBlockIds, range.startReference, range.endReference, searchContext.summaryByBlockId);
+            const injected = injectBlockPlaceholders(compressArgs.content.summary, parsedPlaceholders, searchContext.summaryByBlockId, range.startReference, range.endReference);
+            const blockId = allocateBlockId(state.compressSummaries);
+            const storedSummary = addCompressedBlockHeader(blockId, injected.expandedSummary);
+            state.compressSummaries = upsertCompressedSummary(state.compressSummaries, blockId, anchorMessageId, storedSummary, injected.consumedBlockIds);
+            const compressedMessageIds = range.messageIds.filter((id) => !state.prune.messages.has(id));
             let textTokens = 0;
-            for (const msgId of compressedMessageIds) {
-                const msg = messages.find((m) => m.info.id === msgId);
-                if (msg) {
-                    const tokens = countMessageTextTokens(msg);
-                    textTokens += tokens;
-                    state.prune.messages.set(msgId, tokens);
-                }
+            for (const messageId of compressedMessageIds) {
+                const tokenCount = range.messageTokenById.get(messageId) || 0;
+                textTokens += tokenCount;
+                state.prune.messages.set(messageId, tokenCount);
             }
+            const compressedToolIds = range.toolIds.filter((id) => !state.prune.tools.has(id));
             const toolTokens = getTotalToolTokens(state, compressedToolIds);
             for (const id of compressedToolIds) {
                 const entry = state.toolParameters.get(id);
@@ -123,23 +67,34 @@ export function createCompressTool(ctx) {
             }
             const estimatedCompressedTokens = textTokens + toolTokens;
             state.stats.pruneTokenCounter += estimatedCompressedTokens;
-            const rawStartResult = { messageId: startResult.messageId, messageIndex: rawStartIndex };
-            const rawEndResult = { messageId: endResult.messageId, messageIndex: rawEndIndex };
-            const currentParams = getCurrentParams(state, messages, logger);
-            await sendCompressNotification(client, logger, ctx.config, state, sessionId, compressedToolIds, compressedMessageIds, topic, summary, rawStartResult, rawEndResult, messages.length, currentParams);
+            const rawStartResult = {
+                messageId: getBoundaryMessageId(startReference),
+                messageIndex: startReference.rawIndex,
+            };
+            const rawEndResult = {
+                messageId: getBoundaryMessageId(endReference),
+                messageIndex: endReference.rawIndex,
+            };
+            const currentParams = getCurrentParams(state, rawMessages, logger);
+            await sendCompressNotification(client, logger, ctx.config, state, sessionId, compressedToolIds, compressedMessageIds, compressArgs.topic, injected.expandedSummary, rawStartResult, rawEndResult, rawMessages.length, currentParams);
             state.stats.totalPruneTokens += state.stats.pruneTokenCounter;
             state.stats.pruneTokenCounter = 0;
             state.nudgeCounter = 0;
-            // logger.info("Compress range created", {
-            //     startMessageId: startResult.messageId,
-            //     endMessageId: endResult.messageId,
-            //     toolIdsRemoved: containedToolIds.length,
-            //     messagesInRange: containedMessageIds.length,
-            //     estimatedTokens: estimatedCompressedTokens,
-            // })
-            saveSessionState(state, logger).catch((err) => logger.error("Failed to persist state", { error: err.message }));
+            await saveSessionState(state, logger);
             return `Compressed ${compressedMessageIds.length} messages (${compressedToolIds.length} tool calls) into summary. The content will be replaced with your summary.`;
         },
     });
 }
+function getBoundaryMessageId(reference) {
+    if (reference.kind === "message") {
+        if (!reference.messageId) {
+            throw new Error("Failed to map boundary matches back to raw messages");
+        }
+        return reference.messageId;
+    }
+    if (!reference.anchorMessageId) {
+        throw new Error("Failed to map boundary matches back to raw messages");
+    }
+    return reference.anchorMessageId;
+}
 //# sourceMappingURL=compress.js.map

package/dist/lib/tools/compress.js.map

@@ -1 +1 @@
-{"version":3,"file":"compress.js","sourceRoot":"","sources":["../../../lib/tools/compress.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"compress.js","sourceRoot":"","sources":["../../../lib/tools/compress.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
     "$schema": "https://json.schemastore.org/package.json",
     "name": "@tarquinen/opencode-dcp",
-    "version": "2.1.3",
+    "version": "2.1.4",
     "type": "module",
     "description": "OpenCode plugin that optimizes token usage by pruning obsolete tool outputs from conversation context",
     "main": "./dist/index.js",
@@ -44,9 +44,7 @@
     "dependencies": {
         "@anthropic-ai/tokenizer": "^0.0.4",
         "@opencode-ai/sdk": "^1.1.48",
-        "fuzzball": "^2.2.3",
         "jsonc-parser": "^3.3.1",
-        "ulid": "^3.0.2",
         "zod": "^4.3.6"
     },
     "devDependencies": {

package/dist/lib/tools/utils.d.ts

@@ -1,14 +0,0 @@
-import type { WithParts } from "../state";
-import type { Logger } from "../logger";
-export interface FuzzyConfig {
-    minScore: number;
-    minGap: number;
-}
-export declare const DEFAULT_FUZZY_CONFIG: FuzzyConfig;
-export declare function findStringInMessages(messages: WithParts[], searchString: string, logger: Logger, stringType: "startString" | "endString", fuzzyConfig?: FuzzyConfig): {
-    messageId: string;
-    messageIndex: number;
-};
-export declare function collectToolIdsInRange(messages: WithParts[], startIndex: number, endIndex: number): string[];
-export declare function collectMessageIdsInRange(messages: WithParts[], startIndex: number, endIndex: number): string[];
-//# sourceMappingURL=utils.d.ts.map

package/dist/lib/tools/utils.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../lib/tools/utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAA;AACzC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;AAGvC,MAAM,WAAW,WAAW;IACxB,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;CACjB;AAED,eAAO,MAAM,oBAAoB,EAAE,WAGlC,CAAA;AAsHD,wBAAgB,oBAAoB,CAChC,QAAQ,EAAE,SAAS,EAAE,EACrB,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,aAAa,GAAG,WAAW,EACvC,WAAW,GAAE,WAAkC,GAChD;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,CAkE7C;AAED,wBAAgB,qBAAqB,CACjC,QAAQ,EAAE,SAAS,EAAE,EACrB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,GACjB,MAAM,EAAE,CAiBV;AAED,wBAAgB,wBAAwB,CACpC,QAAQ,EAAE,SAAS,EAAE,EACrB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,GACjB,MAAM,EAAE,CAWV"}

package/dist/lib/tools/utils.js

@@ -1,171 +0,0 @@
-import { partial_ratio } from "fuzzball";
-import { isIgnoredUserMessage } from "../messages/utils";
-export const DEFAULT_FUZZY_CONFIG = {
-    minScore: 95,
-    minGap: 15,
-};
-function extractMessageContent(msg) {
-    const parts = Array.isArray(msg.parts) ? msg.parts : [];
-    let content = "";
-    for (const part of parts) {
-        const p = part;
-        if (part.ignored) {
-            continue;
-        }
-        switch (part.type) {
-            case "text":
-            case "reasoning":
-                if (typeof p.text === "string") {
-                    content += " " + p.text;
-                }
-                break;
-            case "tool": {
-                const state = p.state;
-                if (!state)
-                    break;
-                // Include tool output (completed or error)
-                if (state.status === "completed" && typeof state.output === "string") {
-                    content += " " + state.output;
-                }
-                else if (state.status === "error" && typeof state.error === "string") {
-                    content += " " + state.error;
-                }
-                // Include tool input
-                if (state.input) {
-                    content +=
-                        " " +
-                            (typeof state.input === "string"
-                                ? state.input
-                                : JSON.stringify(state.input));
-                }
-                break;
-            }
-            case "compaction":
-                if (typeof p.summary === "string") {
-                    content += " " + p.summary;
-                }
-                break;
-            case "subtask":
-                if (typeof p.summary === "string") {
-                    content += " " + p.summary;
-                }
-                if (typeof p.result === "string") {
-                    content += " " + p.result;
-                }
-                break;
-        }
-    }
-    return content;
-}
-function findExactMatches(messages, searchString) {
-    const matches = [];
-    for (let i = 0; i < messages.length; i++) {
-        const msg = messages[i];
-        if (isIgnoredUserMessage(msg)) {
-            continue;
-        }
-        const content = extractMessageContent(msg);
-        if (content.includes(searchString)) {
-            matches.push({
-                messageId: msg.info.id,
-                messageIndex: i,
-                score: 100,
-                matchType: "exact",
-            });
-        }
-    }
-    return matches;
-}
-function findFuzzyMatches(messages, searchString, minScore) {
-    const matches = [];
-    for (let i = 0; i < messages.length; i++) {
-        const msg = messages[i];
-        if (isIgnoredUserMessage(msg)) {
-            continue;
-        }
-        const content = extractMessageContent(msg);
-        const score = partial_ratio(searchString, content);
-        if (score >= minScore) {
-            matches.push({
-                messageId: msg.info.id,
-                messageIndex: i,
-                score,
-                matchType: "fuzzy",
-            });
-        }
-    }
-    return matches;
-}
-export function findStringInMessages(messages, searchString, logger, stringType, fuzzyConfig = DEFAULT_FUZZY_CONFIG) {
-    const searchableMessages = messages.length > 1 ? messages.slice(0, -1) : messages;
-    const lastMessage = messages.length > 0 ? messages[messages.length - 1] : undefined;
-    const exactMatches = findExactMatches(searchableMessages, searchString);
-    if (exactMatches.length === 1) {
-        return { messageId: exactMatches[0].messageId, messageIndex: exactMatches[0].messageIndex };
-    }
-    if (exactMatches.length > 1) {
-        throw new Error(`Found multiple matches for ${stringType}. ` +
-            `Provide more surrounding context to uniquely identify the intended match.`);
-    }
-    const fuzzyMatches = findFuzzyMatches(searchableMessages, searchString, fuzzyConfig.minScore);
-    if (fuzzyMatches.length === 0) {
-        if (lastMessage && !isIgnoredUserMessage(lastMessage)) {
-            const lastMsgContent = extractMessageContent(lastMessage);
-            const lastMsgIndex = messages.length - 1;
-            if (lastMsgContent.includes(searchString)) {
-                // logger.info(
-                //     `${stringType} found in last message (last resort) at index ${lastMsgIndex}`,
-                // )
-                return {
-                    messageId: lastMessage.info.id,
-                    messageIndex: lastMsgIndex,
-                };
-            }
-        }
-        throw new Error(`${stringType} not found in conversation. ` +
-            `Make sure the string exists and is spelled exactly as it appears.`);
-    }
-    fuzzyMatches.sort((a, b) => b.score - a.score);
-    const best = fuzzyMatches[0];
-    const secondBest = fuzzyMatches[1];
-    // Log fuzzy match candidates
-    // logger.info(
-    //     `Fuzzy match for ${stringType}: best=${best.score}% (msg ${best.messageIndex})` +
-    //     (secondBest
-    //         ? `, secondBest=${secondBest.score}% (msg ${secondBest.messageIndex})`
-    //         : ""),
-    // )
-    // Check confidence gap - best must be significantly better than second best
-    if (secondBest && best.score - secondBest.score < fuzzyConfig.minGap) {
-        throw new Error(`Found multiple matches for ${stringType}. ` +
-            `Provide more unique surrounding context to disambiguate.`);
-    }
-    logger.info(`Fuzzy matched ${stringType} with ${best.score}% confidence at message index ${best.messageIndex}`);
-    return { messageId: best.messageId, messageIndex: best.messageIndex };
-}
-export function collectToolIdsInRange(messages, startIndex, endIndex) {
-    const toolIds = [];
-    for (let i = startIndex; i <= endIndex; i++) {
-        const msg = messages[i];
-        const parts = Array.isArray(msg.parts) ? msg.parts : [];
-        for (const part of parts) {
-            if (part.type === "tool" && part.callID) {
-                if (!toolIds.includes(part.callID)) {
-                    toolIds.push(part.callID);
-                }
-            }
-        }
-    }
-    return toolIds;
-}
-export function collectMessageIdsInRange(messages, startIndex, endIndex) {
-    const messageIds = [];
-    for (let i = startIndex; i <= endIndex; i++) {
-        const msgId = messages[i].info.id;
-        if (!messageIds.includes(msgId)) {
-            messageIds.push(msgId);
-        }
-    }
-    return messageIds;
-}
-//# sourceMappingURL=utils.js.map

package/dist/lib/tools/utils.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../lib/tools/utils.ts"],"names":[],"mappings":"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"}