Merge pull request #382 from Opencode-DCP/dev

merge dev into master

Author: Tarquinen

lib/messages/inject.ts

@@ -117,6 +117,20 @@ const shouldInjectCompressNudge = (
         return false
     }
 
+    const lastAssistant = messages.findLast((msg) => msg.info.role === "assistant")
+    if (lastAssistant) {
+        const parts = Array.isArray(lastAssistant.parts) ? lastAssistant.parts : []
+        const hasDcpTool = parts.some(
+            (part) =>
+                part.type === "tool" &&
+                part.state.status === "completed" &&
+                (part.tool === "compress" || part.tool === "prune" || part.tool === "distill"),
+        )
+        if (hasDcpTool) {
+            return false
+        }
+    }
+
     const contextLimit = resolveContextLimit(config, state, providerId, modelId)
     if (contextLimit === undefined) {
         return false

lib/messages/prune.ts

@@ -9,6 +9,8 @@ const PRUNED_TOOL_OUTPUT_REPLACEMENT =
     "[Output removed to save context - information superseded or no longer needed]"
 const PRUNED_TOOL_ERROR_INPUT_REPLACEMENT = "[input removed due to failed tool call]"
 const PRUNED_QUESTION_INPUT_REPLACEMENT = "[questions removed - see output for user's answers]"
+const PRUNED_COMPRESS_INPUT_REPLACEMENT =
+    "[compress content removed - topic retained for reference]"
 
 export const prune = (
     state: SessionState,
@@ -39,11 +41,6 @@ const pruneFullTool = (state: SessionState, logger: Logger, messages: WithParts[
                 continue
             }
 
-            if (part.tool === "compress" && part.state.status === "completed") {
-                partsToRemove.push(part.callID)
-                continue
-            }
-
             if (!state.prune.tools.has(part.callID)) {
                 continue
             }
@@ -111,6 +108,13 @@ const pruneToolInputs = (state: SessionState, logger: Logger, messages: WithPart
             if (part.type !== "tool") {
                 continue
             }
+            if (part.tool === "compress" && part.state.status === "completed") {
+                if (part.state.input?.content !== undefined) {
+                    part.state.input.content = PRUNED_COMPRESS_INPUT_REPLACEMENT
+                }
+                continue
+            }
+
             if (!state.prune.tools.has(part.callID)) {
                 continue
             }

lib/tools/utils.ts

@@ -1,6 +1,7 @@
 import { partial_ratio } from "fuzzball"
 import type { WithParts } from "../state"
 import type { Logger } from "../logger"
+import { isIgnoredUserMessage } from "../messages/utils"
 
 export interface FuzzyConfig {
     minScore: number
@@ -25,6 +26,9 @@ function extractMessageContent(msg: WithParts): string {
 
     for (const part of parts) {
         const p = part as Record<string, unknown>
+        if ((part as any).ignored) {
+            continue
+        }
 
         switch (part.type) {
             case "text":
@@ -81,6 +85,9 @@ function findExactMatches(messages: WithParts[], searchString: string): MatchRes
 
     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({
@@ -104,6 +111,9 @@ function findFuzzyMatches(
 
     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) {
@@ -145,7 +155,7 @@ export function findStringInMessages(
     const fuzzyMatches = findFuzzyMatches(searchableMessages, searchString, fuzzyConfig.minScore)
 
     if (fuzzyMatches.length === 0) {
-        if (lastMessage) {
+        if (lastMessage && !isIgnoredUserMessage(lastMessage)) {
             const lastMsgContent = extractMessageContent(lastMessage)
             const lastMsgIndex = messages.length - 1
             if (lastMsgContent.includes(searchString)) {