@comfanion/usethis_search 4.3.0-dev.3 → 4.3.0-dev.4

package/hooks/message-before.ts

@@ -1,21 +1,25 @@
 /**
- * History Pruning Hook (v2 — no injection)
+ * History Pruning Hook (v3 — workspace-only, DCP handles the rest)
  *
  * Uses "experimental.chat.messages.transform" to prune old workspace tool
  * outputs from chat history. Only the LAST workspace state is kept in context.
  *
- * v2: Removed workspace injection entirely.
- *     Each tool (search, workspace_list, etc.) now returns full workspace
- *     state inline. This hook only prunes previous outputs to prevent
- *     context bloat.
+ * v3: Removed read pruning and tool compaction — delegated to DCP plugin
+ *     (@tarquinen/opencode-dcp) which handles deduplication, supersede-writes,
+ *     error purging, and agent-facing discard/extract tools.
+ *
+ *     This hook ONLY handles workspace state pruning — something DCP can't do
+ *     because it doesn't understand that different search queries produce
+ *     workspace state blocks that supersede each other.
  *
  * Pruning strategy:
- *   1. WORKSPACE TOOLS: Find all outputs from search/workspace_* tools.
- *      Keep only the LAST one (it has the latest workspace state).
- *      Replace the rest with compact 1-line summaries.
- *   2. READ TOOLS: Replace old read() outputs with compact summaries.
- *      Keep the last read output (agent may reference it).
- *   3. COMPACT: Remove old tool call parts entirely (keep last N turns).
+ *   Find all outputs from search/workspace_* tools that contain
+ *   <workspace_state> blocks. Keep only the LAST one. Replace the rest
+ *   with compact 1-line summaries.
+ *
+ * DCP companion config (.opencode/dcp.jsonc):
+ *   Our workspace tools are added to DCP's protectedTools so DCP
+ *   doesn't try to prune them (we handle them ourselves).
  */
 
 import type { SessionState } from "./types.ts"
@@ -56,17 +60,11 @@ const WORKSPACE_TOOLS = new Set([
 /** Minimum output length to consider pruning. Short outputs are kept as-is. */
 const MIN_PRUNE_LENGTH = 500
 
-/** Keep last N turns intact (don't compact recent tool calls). */
-const KEEP_LAST_N_TURNS = 5
-
-/** Tools eligible for compaction (removing old call + output parts). */
-const COMPACT_TOOLS = new Set(["search", "read", "Read", "workspace_list", "workspace_forget", "workspace_clear", "workspace_restore"])
-
 // ── Hook ────────────────────────────────────────────────────────────────────
 
 /**
  * Create the history pruning handler.
- * No injection — only prunes old tool outputs from chat history.
+ * Only prunes old workspace state outputs — DCP handles everything else.
  */
 export function createWorkspaceInjectionHandler(state: SessionState) {
   return async (_input: {}, output: { messages: Message[] }) => {
@@ -74,8 +72,6 @@ export function createWorkspaceInjectionHandler(state: SessionState) {
     if (state.isSubAgent) return
 
     pruneWorkspaceToolOutputs(output.messages)
-    pruneReadToolOutputs(output.messages)
-    compactOldToolCalls(output.messages)
   }
 }
 
@@ -84,13 +80,18 @@ export function createWorkspaceInjectionHandler(state: SessionState) {
 /**
  * Replace old workspace tool outputs with compact summaries.
  *
- * Workspace tools (search, workspace_list, etc.) now return full workspace
+ * Workspace tools (search, workspace_list, etc.) return full workspace
  * state in their output. Only the LAST such output is kept — all previous
  * ones are replaced with a 1-line summary.
  *
  * This ensures only ONE copy of workspace state is in context at any time.
+ *
+ * Note: DCP's deduplication only prunes IDENTICAL tool calls (same params).
+ * Two different search queries wouldn't be deduplicated by DCP, but both
+ * contain workspace state that supersedes each other. That's why we need
+ * this workspace-specific pruning.
  */
-function pruneWorkspaceToolOutputs(messages: Message[]): void {
+export function pruneWorkspaceToolOutputs(messages: Message[]): void {
   const wsParts: { msgIdx: number; partIdx: number; part: MessagePart }[] = []
 
   for (let i = 0; i < messages.length; i++) {
@@ -139,174 +140,3 @@ function pruneWorkspaceToolOutputs(messages: Message[]): void {
     }
   }
 }
-
-// ── Read Tool Pruning ───────────────────────────────────────────────────────
-
-/**
- * Replace old read() tool outputs with compact summaries.
- * Keep the last read output (agent may reference it).
- */
-function pruneReadToolOutputs(messages: Message[]): void {
-  const readParts: { msgIdx: number; partIdx: number; part: MessagePart }[] = []
-
-  for (let i = 0; i < messages.length; i++) {
-    const msg = messages[i]
-    const parts = Array.isArray(msg.parts) ? msg.parts : []
-
-    for (let j = 0; j < parts.length; j++) {
-      const part = parts[j]
-      if (
-        part.type === "tool" &&
-        (part.tool === "read" || part.tool === "Read") &&
-        part.state?.status === "completed" &&
-        typeof part.state?.output === "string" &&
-        part.state.output.length > MIN_PRUNE_LENGTH
-      ) {
-        readParts.push({ msgIdx: i, partIdx: j, part })
-      }
-    }
-  }
-
-  // Keep the last read output — prune the rest
-  if (readParts.length <= 1) return
-
-  const toPrune = readParts.slice(0, -1)
-
-  for (const { part } of toPrune) {
-    const output = part.state!.output as string
-
-    // Skip already-pruned outputs
-    if (output.startsWith("[") || output.startsWith("✓")) continue
-
-    // Extract file path from input or output
-    const filePath = part.input?.filePath || extractFilePathFromOutput(output)
-
-    part.state!.output = `[Read "${filePath || "file"}" — content pruned from history]`
-  }
-}
-
-/**
- * Extract file path from read() output.
- */
-function extractFilePathFromOutput(output: string): string | null {
-  const firstLine = output.split("\n")[0]
-  const pathMatch = firstLine.match(/##?\s*(.+?\.(ts|js|go|py|md|txt|yaml|json|tsx|jsx|rs|java|kt|swift|c|cpp|h|cs|rb|php))/)
-  if (pathMatch) {
-    return pathMatch[1].trim()
-  }
-  return null
-}
-
-// ── Tool Call Compaction ────────────────────────────────────────────────────
-
-/**
- * Remove old tool call parts from chat history.
- *
- * Strategy:
- * - Keep last N turns intact
- * - Only compact search/read/workspace tools
- * - Only compact completed calls with pruned outputs
- * - Add compact marker showing how many calls removed
- */
-function compactOldToolCalls(messages: Message[]): void {
-  const toolPairs = findToolCallPairs(messages)
-
-  if (toolPairs.length === 0) return
-
-  const totalTurns = messages.length
-
-  // Filter: only old, completed, compactable tools with pruned outputs
-  const toCompact = toolPairs.filter(pair => {
-    const turnsFromEnd = totalTurns - pair.msgIndex
-    return (
-      turnsFromEnd > KEEP_LAST_N_TURNS &&
-      pair.status === "completed" &&
-      COMPACT_TOOLS.has(pair.tool) &&
-      pair.outputPart &&
-      isPrunedOutput(pair.outputPart.state?.output || "")
-    )
-  })
-
-  if (toCompact.length === 0) return
-
-  // Remove tool parts from messages
-  const removedIds = new Set<string>()
-
-  for (const pair of toCompact) {
-    if (pair.callPart.id) removedIds.add(pair.callPart.id)
-    if (pair.outputPart?.id) removedIds.add(pair.outputPart.id)
-  }
-
-  for (const msg of messages) {
-    if (!msg.parts || !Array.isArray(msg.parts)) continue
-    msg.parts = msg.parts.filter(part => !part.id || !removedIds.has(part.id))
-  }
-
-  // Add compact marker to first user message
-  const firstUserMsg = messages.find(m => m?.info?.role === "user")
-  if (firstUserMsg && firstUserMsg.parts) {
-    const marker = {
-      type: "text",
-      text: `<!-- ${toCompact.length} tool calls compacted (search/read/workspace results pruned) -->`,
-      id: "compact-marker-" + Date.now(),
-    }
-    firstUserMsg.parts.unshift(marker)
-  }
-}
-
-interface ToolCallPair {
-  msgIndex: number
-  callPart: MessagePart
-  outputPart?: MessagePart
-  tool: string
-  status: string
-}
-
-/**
- * Find all tool call + output pairs in messages.
- */
-function findToolCallPairs(messages: Message[]): ToolCallPair[] {
-  const pairs: ToolCallPair[] = []
-
-  for (let i = 0; i < messages.length; i++) {
-    const msg = messages[i]
-    if (!msg.parts || !Array.isArray(msg.parts)) continue
-
-    for (const part of msg.parts) {
-      if (part.type === "tool" && part.tool) {
-        const status = part.state?.status || "unknown"
-
-        // Find matching output part (usually in same message)
-        let outputPart: MessagePart | undefined
-        for (const p of msg.parts) {
-          if (p.type === "tool" && p.tool === part.tool && p.state?.output && p.id !== part.id) {
-            outputPart = p
-            break
-          }
-        }
-
-        pairs.push({
-          msgIndex: i,
-          callPart: part,
-          outputPart,
-          tool: part.tool,
-          status,
-        })
-      }
-    }
-  }
-
-  return pairs
-}
-
-/**
- * Check if output is pruned (compact format).
- */
-function isPrunedOutput(output: string): boolean {
-  if (!output) return false
-  return output.startsWith("[") || output.startsWith("✓")
-}
-
-// ── Exports for testing ─────────────────────────────────────────────────────
-
-export { pruneWorkspaceToolOutputs, pruneReadToolOutputs, compactOldToolCalls }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@comfanion/usethis_search",
-  "version": "4.3.0-dev.3",
+  "version": "4.3.0-dev.4",
   "description": "OpenCode plugin: semantic search with context-efficient workspace state (v4.3: no injection, each tool returns full state inline, auto-prune history, auto-detect modes, line numbers, LSP memory leak fixed)",
   "type": "module",
   "main": "./index.ts",