Merge pull request #403 from Opencode-DCP/dev

Tarquinen · web-flow · commit 508ced3db4ca · 2026-02-21T14:41:32.000-05:00
merge dev into master
diff --git a/lib/commands/sweep.ts b/lib/commands/sweep.ts
@@ -15,7 +15,7 @@ import { formatPrunedItemsList } from "../ui/utils"
 import { getCurrentParams, getTotalToolTokens } from "../strategies/utils"
 import { buildToolIdList, isIgnoredUserMessage } from "../messages/utils"
 import { saveSessionState } from "../state/persistence"
-import { isMessageCompacted } from "../shared-utils"
+import { getLastUserMessage, isMessageCompacted } from "../shared-utils"
 import { getFilePathsFromParameters, isProtected } from "../protected-file-patterns"
 import { syncToolCache } from "../state/tool-cache"
 
@@ -215,11 +215,21 @@ export async function handleSweepCommand(ctx: SweepCommandContext): Promise<void
     }
 
     const tokensSaved = getTotalToolTokens(state, newToolIds)
+    const originMessageId = getLastUserMessage(messages)?.info.id || ""
+    if (!originMessageId) {
+        logger.warn("Sweep prune origin unavailable - missing user message")
+    }
 
     // Add to prune list
     for (const id of newToolIds) {
         const entry = state.toolParameters.get(id)
         state.prune.tools.set(id, entry?.tokenCount ?? 0)
+        if (originMessageId) {
+            state.prune.origins.set(id, {
+                source: "sweep",
+                originMessageId,
+            })
+        }
     }
     state.stats.pruneTokenCounter += tokensSaved
     state.stats.totalPruneTokens += state.stats.pruneTokenCounter
diff --git a/lib/config.ts b/lib/config.ts
@@ -90,6 +90,8 @@ const DEFAULT_PROTECTED_TOOLS = [
     "batch",
     "plan_enter",
     "plan_exit",
+    "write",
+    "edit",
 ]
 
 // Valid config keys for validation against user config
diff --git a/lib/hooks.ts b/lib/hooks.ts
@@ -4,7 +4,7 @@ import type { PluginConfig } from "./config"
 import { assignMessageRefs } from "./message-ids"
 import { syncToolCache } from "./state/tool-cache"
 import { deduplicate, supersedeWrites, purgeErrors } from "./strategies"
-import { prune, insertPruneToolContext, insertMessageIdContext } from "./messages"
+import { prune, syncToolOrigins, insertPruneToolContext, insertMessageIdContext } from "./messages"
 import { buildToolIdList, isIgnoredUserMessage } from "./messages/utils"
 import { checkSession } from "./state"
 import { renderSystemPrompt } from "./prompts"
@@ -113,6 +113,7 @@ export function createChatMessageTransformHandler(
 
         syncToolCache(state, config, logger, output.messages)
         buildToolIdList(state, output.messages, logger)
+        syncToolOrigins(state, logger, output.messages)
 
         deduplicate(state, logger, config, output.messages)
         supersedeWrites(state, logger, config, output.messages)
diff --git a/lib/messages/index.ts b/lib/messages/index.ts
@@ -1,3 +1,4 @@
 export { prune } from "./prune"
+export { syncToolOrigins } from "./sync"
 export { insertPruneToolContext } from "./inject"
 export { insertMessageIdContext } from "./inject"
diff --git a/lib/messages/prune.ts b/lib/messages/prune.ts
@@ -108,13 +108,14 @@ const pruneToolInputs = (state: SessionState, logger: Logger, messages: WithPart
             if (part.type !== "tool") {
                 continue
             }
-            if (part.tool === "compress" && part.state.status === "completed") {
-                const content = part.state.input?.content
-                if (content && typeof content === "object" && "summary" in content) {
-                    content.summary = PRUNED_COMPRESS_SUMMARY_REPLACEMENT
-                }
-                continue
-            }
+
+            // if (part.tool === "compress" && part.state.status === "completed") {
+            //     const content = part.state.input?.content
+            //     if (content && typeof content === "object" && "summary" in content) {
+            //         content.summary = PRUNED_COMPRESS_SUMMARY_REPLACEMENT
+            //     }
+            //     continue
+            // }
 
             if (!state.prune.tools.has(part.callID)) {
                 continue
diff --git a/lib/messages/sync.ts b/lib/messages/sync.ts
@@ -0,0 +1,39 @@
+import type { SessionState, WithParts } from "../state"
+import type { Logger } from "../logger"
+
+export const syncToolOrigins = (
+    state: SessionState,
+    logger: Logger,
+    messages: WithParts[],
+): void => {
+    if (!state.prune.origins?.size) {
+        return
+    }
+
+    const messageIds = new Set(messages.map((msg) => msg.info.id))
+    let removedToolCount = 0
+    let removedOriginCount = 0
+
+    for (const [toolId, origin] of state.prune.origins.entries()) {
+        if (!state.prune.tools.has(toolId)) {
+            state.prune.origins.delete(toolId)
+            removedOriginCount++
+            continue
+        }
+
+        if (!messageIds.has(origin.originMessageId)) {
+            state.prune.origins.delete(toolId)
+            removedOriginCount++
+            if (state.prune.tools.delete(toolId)) {
+                removedToolCount++
+            }
+        }
+    }
+
+    if (removedToolCount > 0 || removedOriginCount > 0) {
+        logger.info("Synced prune origins", {
+            removedToolCount,
+            removedOriginCount,
+        })
+    }
+}
diff --git a/lib/messages/utils.ts b/lib/messages/utils.ts
@@ -84,10 +84,15 @@ export const createSyntheticToolPart = (
     const partId = generateStableId("prt_dcp_tool", deterministicSeed)
     const callId = generateStableId("call_dcp_tool", deterministicSeed)
 
-    // Gemini requires thoughtSignature bypass to accept synthetic tool parts
+    // Gemini requires a thought signature on synthetic function calls.
+    // Keep this metadata both on the part and on state so whichever
+    // conversion path is used can forward it to providerOptions.
     const toolPartMetadata = isGeminiModel(modelID)
-        ? { google: { thoughtSignature: "skip_thought_signature_validator" } }
-        : {}
+        ? {
+              google: { thoughtSignature: "skip_thought_signature_validator" },
+              vertex: { thoughtSignature: "skip_thought_signature_validator" },
+          }
+        : undefined
 
     return {
         id: partId,
@@ -96,14 +101,15 @@ export const createSyntheticToolPart = (
         type: "tool" as const,
         callID: callId,
         tool: "context_info",
+        ...(toolPartMetadata ? { metadata: toolPartMetadata } : {}),
         state: {
             status: "completed" as const,
             input: {},
             output: content,
             title: "Context Info",
-            metadata: toolPartMetadata,
+            ...(toolPartMetadata ? { metadata: toolPartMetadata } : {}),
             time: { start: now, end: now },
-        },
+        } as any,
     }
 }
 
diff --git a/lib/state/persistence.ts b/lib/state/persistence.ts
@@ -8,14 +8,15 @@ import * as fs from "fs/promises"
 import { existsSync } from "fs"
 import { homedir } from "os"
 import { join } from "path"
-import type { SessionState, SessionStats, CompressSummary } from "./types"
+import type { SessionState, SessionStats, CompressSummary, PruneOrigin } from "./types"
 import type { Logger } from "../logger"
 
 /** Prune state as stored on disk */
 export interface PersistedPrune {
     // New format: tool/message IDs with token counts
     tools?: Record<string, number>
     messages?: Record<string, number>
+    origins?: Record<string, PruneOrigin>
     // Legacy format: plain ID arrays (backward compatibility)
     toolIds?: string[]
     messageIds?: string[]
@@ -64,6 +65,7 @@ export async function saveSessionState(
             prune: {
                 tools: Object.fromEntries(sessionState.prune.tools),
                 messages: Object.fromEntries(sessionState.prune.messages),
+                origins: Object.fromEntries(sessionState.prune.origins),
             },
             compressSummaries: sessionState.compressSummaries,
             stats: sessionState.stats,
diff --git a/lib/state/state.ts b/lib/state/state.ts
@@ -7,6 +7,7 @@ import {
     countTurns,
     resetOnCompaction,
     loadPruneMap,
+    loadPruneOriginMap,
 } from "./utils"
 import { getLastUserMessage } from "../shared-utils"
 
@@ -67,6 +68,7 @@ export function createSessionState(): SessionState {
         prune: {
             tools: new Map<string, number>(),
             messages: new Map<string, number>(),
+            origins: new Map(),
         },
         compressSummaries: [],
         stats: {
@@ -97,6 +99,7 @@ export function resetSessionState(state: SessionState): void {
     state.prune = {
         tools: new Map<string, number>(),
         messages: new Map<string, number>(),
+        origins: new Map(),
     }
     state.compressSummaries = []
     state.stats = {
@@ -151,6 +154,7 @@ export async function ensureSessionInitialized(
 
     state.prune.tools = loadPruneMap(persisted.prune.tools, persisted.prune.toolIds)
     state.prune.messages = loadPruneMap(persisted.prune.messages, persisted.prune.messageIds)
+    state.prune.origins = loadPruneOriginMap(persisted.prune.origins)
     state.compressSummaries = persisted.compressSummaries || []
     state.stats = {
         pruneTokenCounter: persisted.stats?.pruneTokenCounter || 0,
diff --git a/lib/state/types.ts b/lib/state/types.ts
@@ -27,9 +27,23 @@ export interface CompressSummary {
     summary: string
 }
 
+export type PruneOriginSource =
+    | "prune"
+    | "distill"
+    | "sweep"
+    | "deduplication"
+    | "supersedeWrites"
+    | "purgeErrors"
+
+export interface PruneOrigin {
+    source: PruneOriginSource
+    originMessageId: string
+}
+
 export interface Prune {
     tools: Map<string, number>
     messages: Map<string, number>
+    origins: Map<string, PruneOrigin>
 }
 
 export interface PendingManualTrigger {
diff --git a/lib/state/utils.ts b/lib/state/utils.ts
@@ -1,4 +1,4 @@
-import type { SessionState, WithParts } from "./types"
+import type { PruneOrigin, SessionState, WithParts } from "./types"
 import { isMessageCompacted } from "../shared-utils"
 
 export async function isSubAgentSession(client: any, sessionID: string): Promise<boolean> {
@@ -45,10 +45,32 @@ export function loadPruneMap(
     return new Map()
 }
 
+export function loadPruneOriginMap(obj?: Record<string, PruneOrigin>): Map<string, PruneOrigin> {
+    if (!obj || typeof obj !== "object") {
+        return new Map()
+    }
+
+    const entries: [string, PruneOrigin][] = []
+    for (const [toolId, origin] of Object.entries(obj)) {
+        if (
+            origin &&
+            typeof origin === "object" &&
+            typeof origin.source === "string" &&
+            typeof origin.originMessageId === "string" &&
+            origin.originMessageId.length > 0
+        ) {
+            entries.push([toolId, origin])
+        }
+    }
+
+    return new Map(entries)
+}
+
 export function resetOnCompaction(state: SessionState): void {
     state.toolParameters.clear()
     state.prune.tools = new Map<string, number>()
     state.prune.messages = new Map<string, number>()
+    state.prune.origins = new Map()
     state.compressSummaries = []
     state.messageIds = {
         byRawId: new Map<string, string>(),
diff --git a/lib/strategies/deduplication.ts b/lib/strategies/deduplication.ts
@@ -2,6 +2,7 @@ import { PluginConfig } from "../config"
 import { Logger } from "../logger"
 import type { SessionState, WithParts } from "../state"
 import { getFilePathsFromParameters, isProtected } from "../protected-file-patterns"
+import { getLastUserMessage } from "../shared-utils"
 import { getTotalToolTokens } from "./utils"
 
 /**
@@ -79,11 +80,21 @@ export const deduplicate = (
     }
 
     state.stats.totalPruneTokens += getTotalToolTokens(state, newPruneIds)
+    const decisionMessageId = getLastUserMessage(messages)?.info.id || ""
 
     if (newPruneIds.length > 0) {
+        if (!decisionMessageId) {
+            logger.warn("Deduplication prune origin unavailable - missing user message")
+        }
         for (const id of newPruneIds) {
             const entry = state.toolParameters.get(id)
             state.prune.tools.set(id, entry?.tokenCount ?? 0)
+            if (decisionMessageId) {
+                state.prune.origins.set(id, {
+                    source: "deduplication",
+                    originMessageId: decisionMessageId,
+                })
+            }
         }
         logger.debug(`Marked ${newPruneIds.length} duplicate tool calls for pruning`)
     }
diff --git a/lib/strategies/purge-errors.ts b/lib/strategies/purge-errors.ts
@@ -2,6 +2,7 @@ import { PluginConfig } from "../config"
 import { Logger } from "../logger"
 import type { SessionState, WithParts } from "../state"
 import { getFilePathsFromParameters, isProtected } from "../protected-file-patterns"
+import { getLastUserMessage } from "../shared-utils"
 import { getTotalToolTokens } from "./utils"
 
 /**
@@ -72,10 +73,20 @@ export const purgeErrors = (
     }
 
     if (newPruneIds.length > 0) {
+        const decisionMessageId = getLastUserMessage(messages)?.info.id || ""
+        if (!decisionMessageId) {
+            logger.warn("Purge errors prune origin unavailable - missing user message")
+        }
         state.stats.totalPruneTokens += getTotalToolTokens(state, newPruneIds)
         for (const id of newPruneIds) {
             const entry = state.toolParameters.get(id)
             state.prune.tools.set(id, entry?.tokenCount ?? 0)
+            if (decisionMessageId) {
+                state.prune.origins.set(id, {
+                    source: "purgeErrors",
+                    originMessageId: decisionMessageId,
+                })
+            }
         }
         logger.debug(
             `Marked ${newPruneIds.length} error tool calls for pruning (older than ${turnThreshold} turns)`,
diff --git a/lib/strategies/supersede-writes.ts b/lib/strategies/supersede-writes.ts
@@ -2,6 +2,7 @@ import { PluginConfig } from "../config"
 import { Logger } from "../logger"
 import type { SessionState, WithParts } from "../state"
 import { getFilePathsFromParameters, isProtected } from "../protected-file-patterns"
+import { getLastUserMessage } from "../shared-utils"
 import { getTotalToolTokens } from "./utils"
 
 /**
@@ -105,10 +106,20 @@ export const supersedeWrites = (
     }
 
     if (newPruneIds.length > 0) {
+        const decisionMessageId = getLastUserMessage(messages)?.info.id || ""
+        if (!decisionMessageId) {
+            logger.warn("Supersede writes prune origin unavailable - missing user message")
+        }
         state.stats.totalPruneTokens += getTotalToolTokens(state, newPruneIds)
         for (const id of newPruneIds) {
             const entry = state.toolParameters.get(id)
             state.prune.tools.set(id, entry?.tokenCount ?? 0)
+            if (decisionMessageId) {
+                state.prune.origins.set(id, {
+                    source: "supersedeWrites",
+                    originMessageId: decisionMessageId,
+                })
+            }
         }
         logger.debug(`Marked ${newPruneIds.length} superseded write tool calls for pruning`)
     }
diff --git a/lib/tools/distill.ts b/lib/tools/distill.ts
@@ -53,6 +53,7 @@ export function createDistillTool(ctx: PruneToolContext): ReturnType<typeof tool
                 ids,
                 "extraction" as PruneReason,
                 "Distill",
+                "distill",
                 distillations,
             )
         },
diff --git a/lib/tools/prune-shared.ts b/lib/tools/prune-shared.ts
diff --git a/lib/tools/prune.ts b/lib/tools/prune.ts

Original file line number	Diff line number	Diff line change
`@@ -90,6 +90,8 @@ const DEFAULT_PROTECTED_TOOLS = [`
`90`	`90`	`"batch",`
`91`	`91`	`"plan_enter",`
`92`	`92`	`"plan_exit",`
	`93`	`+ "write",`
	`94`	`+ "edit",`
`93`	`95`	`]`
`94`	`96`
`95`	`97`	`// Valid config keys for validation against user config`