opencode-acp 1.14.3 → 1.14.5

package/dist/index.js

@@ -883,7 +883,6 @@ var VALID_CONFIG_KEYS = /* @__PURE__ */ new Set([
   "commands.protectedTools",
   "manualMode",
   "manualMode.enabled",
-  "manualMode.automaticStrategies",
   "compress",
   "compress.mode",
   "compress.permission",
@@ -923,14 +922,6 @@ var VALID_CONFIG_KEYS = /* @__PURE__ */ new Set([
   "gc.batchCleanup.lowThreshold",
   "gc.batchCleanup.highThreshold",
   "gc.batchCleanup.forceThreshold",
-  "strategies",
-  "strategies.deduplication",
-  "strategies.deduplication.enabled",
-  "strategies.deduplication.protectedTools",
-  "strategies.purgeErrors",
-  "strategies.purgeErrors.enabled",
-  "strategies.purgeErrors.turns",
-  "strategies.purgeErrors.protectedTools",
   "qualityGate",
   "qualityGate.enabled",
   "qualityGate.algorithm",
@@ -1089,13 +1080,6 @@ function validateConfigTypes(config) {
           actual: typeof manualMode.enabled
         });
       }
-      if (manualMode.automaticStrategies !== void 0 && typeof manualMode.automaticStrategies !== "boolean") {
-        errors.push({
-          key: "manualMode.automaticStrategies",
-          expected: "boolean",
-          actual: typeof manualMode.automaticStrategies
-        });
-      }
     }
   }
   const compress = config.compress;
@@ -1470,81 +1454,6 @@ function validateConfigTypes(config) {
       }
     }
   }
-  const strategies = config.strategies;
-  if (strategies !== void 0) {
-    if (typeof strategies !== "object" || strategies === null || Array.isArray(strategies)) {
-      errors.push({
-        key: "strategies",
-        expected: "object",
-        actual: typeof strategies
-      });
-    } else {
-      const dedup = strategies.deduplication;
-      if (dedup !== void 0) {
-        if (typeof dedup !== "object" || dedup === null || Array.isArray(dedup)) {
-          errors.push({
-            key: "strategies.deduplication",
-            expected: "object",
-            actual: typeof dedup
-          });
-        } else {
-          if (dedup.enabled !== void 0 && typeof dedup.enabled !== "boolean") {
-            errors.push({
-              key: "strategies.deduplication.enabled",
-              expected: "boolean",
-              actual: typeof dedup.enabled
-            });
-          }
-          if (dedup.protectedTools !== void 0 && !Array.isArray(dedup.protectedTools)) {
-            errors.push({
-              key: "strategies.deduplication.protectedTools",
-              expected: "string[]",
-              actual: typeof dedup.protectedTools
-            });
-          }
-        }
-      }
-      const purge = strategies.purgeErrors;
-      if (purge !== void 0) {
-        if (typeof purge !== "object" || purge === null || Array.isArray(purge)) {
-          errors.push({
-            key: "strategies.purgeErrors",
-            expected: "object",
-            actual: typeof purge
-          });
-        } else {
-          if (purge.enabled !== void 0 && typeof purge.enabled !== "boolean") {
-            errors.push({
-              key: "strategies.purgeErrors.enabled",
-              expected: "boolean",
-              actual: typeof purge.enabled
-            });
-          }
-          if (purge.turns !== void 0 && typeof purge.turns !== "number") {
-            errors.push({
-              key: "strategies.purgeErrors.turns",
-              expected: "number",
-              actual: typeof purge.turns
-            });
-          }
-          if (typeof purge.turns === "number" && purge.turns < 1) {
-            errors.push({
-              key: "strategies.purgeErrors.turns",
-              expected: "positive number (>= 1)",
-              actual: `${purge.turns} (will be clamped to 1)`
-            });
-          }
-          if (purge.protectedTools !== void 0 && !Array.isArray(purge.protectedTools)) {
-            errors.push({
-              key: "strategies.purgeErrors.protectedTools",
-              expected: "string[]",
-              actual: typeof purge.protectedTools
-            });
-          }
-        }
-      }
-    }
-  }
   return errors;
 }
 
@@ -1614,8 +1523,7 @@ var defaultConfig = {
     protectedTools: [...DEFAULT_PROTECTED_TOOLS]
   },
   manualMode: {
-    enabled: false,
-    automaticStrategies: true
+    enabled: false
   },
   turnProtection: {
     enabled: false,
@@ -1652,17 +1560,6 @@ var defaultConfig = {
     preserveRecentTokens: 5e3,
     preserveLastUserMessage: true
   },
-  strategies: {
-    deduplication: {
-      enabled: true,
-      protectedTools: []
-    },
-    purgeErrors: {
-      enabled: true,
-      turns: 4,
-      protectedTools: []
-    }
-  },
   gc: {
     algorithm: "truncate",
     promotionThreshold: 5,
@@ -1770,32 +1667,6 @@ function loadConfigFile(configPath) {
     return { data: null, parseError: error.message || "Failed to parse config" };
   }
 }
-function mergeStrategies(base, override) {
-  if (!override) {
-    return base;
-  }
-  return {
-    deduplication: {
-      enabled: override.deduplication?.enabled ?? base.deduplication.enabled,
-      protectedTools: [
-        .../* @__PURE__ */ new Set([
-          ...base.deduplication.protectedTools,
-          ...override.deduplication?.protectedTools ?? []
-        ])
-      ]
-    },
-    purgeErrors: {
-      enabled: override.purgeErrors?.enabled ?? base.purgeErrors.enabled,
-      turns: override.purgeErrors?.turns ?? base.purgeErrors.turns,
-      protectedTools: [
-        .../* @__PURE__ */ new Set([
-          ...base.purgeErrors.protectedTools,
-          ...override.purgeErrors?.protectedTools ?? []
-        ])
-      ]
-    }
-  };
-}
 function mergeCompress(base, override) {
   if (!override) {
     return base;
@@ -1843,8 +1714,7 @@ function mergeCommands(base, override) {
 function mergeManualMode(base, override) {
   if (override === void 0) return base;
   return {
-    enabled: override.enabled ?? base.enabled,
-    automaticStrategies: override.automaticStrategies ?? base.automaticStrategies
+    enabled: override.enabled ?? base.enabled
   };
 }
 function mergeExperimental(base, override) {
@@ -1862,8 +1732,7 @@ function deepCloneConfig(config) {
       protectedTools: [...config.commands.protectedTools]
     },
     manualMode: {
-      enabled: config.manualMode.enabled,
-      automaticStrategies: config.manualMode.automaticStrategies
+      enabled: config.manualMode.enabled
     },
     turnProtection: { ...config.turnProtection },
     experimental: { ...config.experimental },
@@ -1874,16 +1743,6 @@ function deepCloneConfig(config) {
       modelMinLimits: { ...config.compress.modelMinLimits },
       protectedTools: [...config.compress.protectedTools]
     },
-    strategies: {
-      deduplication: {
-        ...config.strategies.deduplication,
-        protectedTools: [...config.strategies.deduplication.protectedTools]
-      },
-      purgeErrors: {
-        ...config.strategies.purgeErrors,
-        protectedTools: [...config.strategies.purgeErrors.protectedTools]
-      }
-    },
     gc: {
       ...config.gc,
       batchCleanup: { ...config.gc.batchCleanup }
@@ -1932,7 +1791,6 @@ function mergeLayer(config, data) {
     ],
     compress: mergeCompress(config.compress, data.compress),
     gc: mergeGC(config.gc, data.gc),
-    strategies: mergeStrategies(config.strategies, data.strategies),
     qualityGate: mergeQualityGate(config.qualityGate, data.qualityGate)
   };
 }
@@ -2000,6 +1858,9 @@ Using previous/default values`
   return config;
 }
 
+// lib/compress/message.ts
+import { tool as tool2 } from "@opencode-ai/plugin";
+
 // lib/compress/types.ts
 function resolveToolContext(factoryCtx, sessionID) {
   const state = factoryCtx.registry.get(sessionID);
@@ -2017,9 +1878,6 @@ function resolveToolContext(factoryCtx, sessionID) {
   };
 }
 
-// lib/compress/message.ts
-import { tool as tool2 } from "@opencode-ai/plugin";
-
 // lib/token-utils.ts
 import * as _anthropicTokenizer from "@anthropic-ai/tokenizer";
 
@@ -2085,6 +1943,16 @@ var messageHasCompress = (message) => {
     (part) => part.type === "tool" && part.tool === "compress" && part.state?.status === "completed"
   );
 };
+var messageHasCompressAttempt = (message) => {
+  if (!isMessageWithInfo(message)) {
+    return false;
+  }
+  if (message.info.role !== "assistant") {
+    return false;
+  }
+  const parts = Array.isArray(message.parts) ? message.parts : [];
+  return parts.some((part) => part.type === "tool" && part.tool === "compress");
+};
 var isIgnoredUserMessage = (message) => {
   if (!isMessageWithInfo(message)) {
     return false;
@@ -2197,14 +2065,6 @@ function extractToolContent(part) {
   }
   return contents;
 }
-function getTotalToolTokens(state, toolIds) {
-  let total = 0;
-  for (const id of toolIds) {
-    const entry = state.toolParameters.get(id);
-    total += entry?.tokenCount ?? 0;
-  }
-  return total;
-}
 function countAllMessageTokens(msg) {
   const parts = Array.isArray(msg.parts) ? msg.parts : [];
   const texts = [];
@@ -2850,20 +2710,20 @@ function matchesGlob(inputPath, pattern) {
   regex += "$";
   return new RegExp(regex).test(input);
 }
-function getFilePathsFromParameters(tool8, parameters) {
+function getFilePathsFromParameters(tool7, parameters) {
   if (typeof parameters !== "object" || parameters === null) {
     return [];
   }
   const paths = [];
   const params = parameters;
-  if (tool8 === "apply_patch" && typeof params.patchText === "string") {
+  if (tool7 === "apply_patch" && typeof params.patchText === "string") {
     const pathRegex = /\*\*\* (?:Add|Delete|Update) File: ([^\n\r]+)/g;
     let match;
     while ((match = pathRegex.exec(params.patchText)) !== null) {
       paths.push(match[1].trim());
     }
   }
-  if (tool8 === "multiedit") {
+  if (tool7 === "multiedit") {
     if (typeof params.filePath === "string") {
       paths.push(params.filePath);
     }
@@ -3200,6 +3060,7 @@ function applyCompressionState(state, input, selection, anchorMessageId, blockId
   const messagesState = state.prune.messages;
   const consumed = [...new Set(consumedBlockIds.filter((id) => Number.isInteger(id) && id > 0))];
   const createdAt = Date.now();
+  const isBlockBoundary = selection.startReference?.kind === "compressed-block" || selection.endReference?.kind === "compressed-block";
   let minConsumedTier;
   for (const consumedBlockId of consumed) {
     const cb = messagesState.blocksById.get(consumedBlockId);
@@ -3210,9 +3071,8 @@ function applyCompressionState(state, input, selection, anchorMessageId, blockId
       }
     }
   }
-  const effectiveMinTier = minConsumedTier ?? 0;
-  const outputTier = Math.min(3, effectiveMinTier + 1);
-  const targetTierForConsumption = effectiveMinTier;
+  const outputTier = isBlockBoundary ? Math.min(3, (minConsumedTier ?? 1) + 1) : 1;
+  const targetTierForConsumption = isBlockBoundary ? minConsumedTier ?? 1 : 1;
   const effectiveMessageIds = new Set(selection.messageIds);
   const effectiveToolIds = new Set(selection.toolIds);
   for (const consumedBlockId of consumed) {
@@ -3686,15 +3546,6 @@ function countTurns(state, messages) {
   }
   return turnCount;
 }
-function loadPruneMap(obj) {
-  if (!obj || typeof obj !== "object") {
-    return /* @__PURE__ */ new Map();
-  }
-  const entries = Object.entries(obj).filter(
-    (entry) => typeof entry[0] === "string" && typeof entry[1] === "number"
-  );
-  return new Map(entries);
-}
 function createPruneMessagesState() {
   return {
     byMessageId: /* @__PURE__ */ new Map(),
@@ -3882,7 +3733,6 @@ function getTierTokenUsage(state) {
 }
 function resetOnCompaction(state) {
   state.toolParameters.clear();
-  state.prune.tools = /* @__PURE__ */ new Map();
   state.nudges = {
     contextLimitAnchors: /* @__PURE__ */ new Set(),
     turnNudgeAnchors: /* @__PURE__ */ new Set(),
@@ -3894,7 +3744,8 @@ function resetOnCompaction(state) {
     lastTier2NudgeTokens: void 0,
     lastTier3NudgeTokens: void 0,
     shouldInjectThisTurn: void 0,
-    compressBaselineSet: false
+    compressBaselineSet: false,
+    lastProcessedCompressMessageId: void 0
   };
   state.messageIds = {
     byRawId: /* @__PURE__ */ new Map(),
@@ -3958,7 +3809,6 @@ async function saveSessionState(sessionState, logger, sessionName) {
   const state = {
     sessionName,
     prune: {
-      tools: Object.fromEntries(sessionState.prune.tools),
       messages: serializePruneMessagesState(sessionState.prune.messages)
     },
     nudges: {
@@ -3993,10 +3843,9 @@ async function loadSessionState(sessionId, logger) {
     }
     const content = await fs.readFile(filePath, "utf-8");
     const state = JSON.parse(content);
-    const hasPruneTools = state?.prune?.tools && typeof state.prune.tools === "object";
     const hasPruneMessages = state?.prune?.messages && typeof state.prune.messages === "object";
     const hasNudgeFormat = state?.nudges && typeof state.nudges === "object";
-    if (!state || !state.prune || !hasPruneTools || !hasPruneMessages || !state.stats || !hasNudgeFormat) {
+    if (!state || !state.prune || !hasPruneMessages || !state.stats || !hasNudgeFormat) {
       logger.warn("Invalid session state file, ignoring", {
         sessionId
       });
@@ -4084,7 +3933,8 @@ async function loadAllSessionStats(logger) {
         const state = JSON.parse(content);
         if (state?.stats?.totalPruneTokens && state?.prune) {
           result.totalTokens += state.stats.totalPruneTokens;
-          result.totalTools += state.prune.tools ? Object.keys(state.prune.tools).length : 0;
+          const legacy = state.prune.tools;
+          result.totalTools += legacy ? Object.keys(legacy).length : 0;
           result.totalMessages += state.prune.messages?.byMessageId ? Object.keys(state.prune.messages.byMessageId).length : 0;
           result.sessionCount++;
         }
@@ -4572,7 +4422,6 @@ function createSessionState() {
     compressPermission: void 0,
     pendingManualTrigger: null,
     prune: {
-      tools: /* @__PURE__ */ new Map(),
       messages: createPruneMessagesState()
     },
     nudges: {
@@ -4586,7 +4435,8 @@ function createSessionState() {
       lastTier2NudgeTokens: void 0,
       lastTier3NudgeTokens: void 0,
       shouldInjectThisTurn: void 0,
-      compressBaselineSet: false
+      compressBaselineSet: false,
+      lastProcessedCompressMessageId: void 0
     },
     stats: {
       pruneTokenCounter: 0,
@@ -4617,7 +4467,6 @@ function resetSessionState(state) {
   state.compressPermission = void 0;
   state.pendingManualTrigger = null;
   state.prune = {
-    tools: /* @__PURE__ */ new Map(),
     messages: createPruneMessagesState()
   };
   state.nudges = {
@@ -4631,7 +4480,8 @@ function resetSessionState(state) {
     lastTier2NudgeTokens: void 0,
     lastTier3NudgeTokens: void 0,
     shouldInjectThisTurn: void 0,
-    compressBaselineSet: false
+    compressBaselineSet: false,
+    lastProcessedCompressMessageId: void 0
   };
   state.stats = {
     pruneTokenCounter: 0,
@@ -4672,7 +4522,6 @@ async function ensureSessionInitialized(client, state, sessionId, logger, messag
     }
     return;
   }
-  state.prune.tools = loadPruneMap(persisted.prune.tools);
   state.prune.messages = loadPruneMessagesState(persisted.prune.messages);
   state.nudges.contextLimitAnchors = new Set(persisted.nudges.contextLimitAnchors || []);
   state.nudges.turnNudgeAnchors = /* @__PURE__ */ new Set([
@@ -4798,255 +4647,7 @@ function trimToolParametersCache(state) {
   }
 }
 
-// lib/strategies/deduplication.ts
-var deduplicate = (state, logger, config, messages) => {
-  if (state.manualMode && !config.manualMode.automaticStrategies) {
-    return;
-  }
-  if (!config.strategies.deduplication.enabled) {
-    return;
-  }
-  const allToolIds = state.toolIdList;
-  if (allToolIds.length === 0) {
-    return;
-  }
-  const unprunedIds = allToolIds.filter((id) => !state.prune.tools.has(id));
-  if (unprunedIds.length === 0) {
-    return;
-  }
-  const protectedTools = config.strategies.deduplication.protectedTools;
-  const signatureMap = /* @__PURE__ */ new Map();
-  for (const id of unprunedIds) {
-    const metadata = state.toolParameters.get(id);
-    if (!metadata) {
-      continue;
-    }
-    if (isToolNameProtected(metadata.tool, protectedTools)) {
-      continue;
-    }
-    const filePaths = getFilePathsFromParameters(metadata.tool, metadata.parameters);
-    if (isFilePathProtected(filePaths, config.protectedFilePatterns)) {
-      continue;
-    }
-    const signature = createToolSignature(metadata.tool, metadata.parameters);
-    if (!signatureMap.has(signature)) {
-      signatureMap.set(signature, []);
-    }
-    const ids = signatureMap.get(signature);
-    if (ids) {
-      ids.push(id);
-    }
-  }
-  const newPruneIds = [];
-  for (const [, ids] of signatureMap.entries()) {
-    if (ids.length > 1) {
-      const idsToRemove = ids.slice(0, -1);
-      newPruneIds.push(...idsToRemove);
-    }
-  }
-  state.stats.totalPruneTokens += getTotalToolTokens(state, newPruneIds);
-  if (newPruneIds.length > 0) {
-    for (const id of newPruneIds) {
-      const entry = state.toolParameters.get(id);
-      state.prune.tools.set(id, entry?.tokenCount ?? 0);
-    }
-    logger.debug(`Marked ${newPruneIds.length} duplicate tool calls for pruning`);
-  }
-};
-function createToolSignature(tool8, parameters) {
-  if (!parameters) {
-    return tool8;
-  }
-  const normalized = normalizeParameters(parameters);
-  const sorted = sortObjectKeys(normalized);
-  return `${tool8}::${JSON.stringify(sorted)}`;
-}
-function normalizeParameters(params) {
-  if (typeof params !== "object" || params === null) return params;
-  if (Array.isArray(params)) return params;
-  const normalized = {};
-  for (const [key, value] of Object.entries(params)) {
-    if (value !== void 0 && value !== null) {
-      normalized[key] = value;
-    }
-  }
-  return normalized;
-}
-function sortObjectKeys(obj) {
-  if (typeof obj !== "object" || obj === null) return obj;
-  if (Array.isArray(obj)) return obj.map(sortObjectKeys);
-  const sorted = {};
-  for (const key of Object.keys(obj).sort()) {
-    sorted[key] = sortObjectKeys(obj[key]);
-  }
-  return sorted;
-}
-
-// lib/strategies/purge-errors.ts
-var purgeErrors = (state, logger, config, messages) => {
-  if (state.manualMode && !config.manualMode.automaticStrategies) {
-    return;
-  }
-  if (!config.strategies.purgeErrors.enabled) {
-    return;
-  }
-  const allToolIds = state.toolIdList;
-  if (allToolIds.length === 0) {
-    return;
-  }
-  const unprunedIds = allToolIds.filter((id) => !state.prune.tools.has(id));
-  if (unprunedIds.length === 0) {
-    return;
-  }
-  const protectedTools = config.strategies.purgeErrors.protectedTools;
-  const turnThreshold = Math.max(1, config.strategies.purgeErrors.turns);
-  const newPruneIds = [];
-  for (const id of unprunedIds) {
-    const metadata = state.toolParameters.get(id);
-    if (!metadata) {
-      continue;
-    }
-    if (isToolNameProtected(metadata.tool, protectedTools)) {
-      continue;
-    }
-    const filePaths = getFilePathsFromParameters(metadata.tool, metadata.parameters);
-    if (isFilePathProtected(filePaths, config.protectedFilePatterns)) {
-      continue;
-    }
-    if (metadata.status !== "error") {
-      continue;
-    }
-    const turnAge = state.currentTurn - metadata.turn;
-    if (turnAge >= turnThreshold) {
-      newPruneIds.push(id);
-    }
-  }
-  if (newPruneIds.length > 0) {
-    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);
-    }
-    logger.debug(
-      `Marked ${newPruneIds.length} error tool calls for pruning (older than ${turnThreshold} turns)`
-    );
-  }
-};
-
 // lib/ui/utils.ts
-function extractParameterKey(tool8, parameters) {
-  if (!parameters) return "";
-  if (tool8 === "read" && parameters.filePath) {
-    const offset = parameters.offset;
-    const limit = parameters.limit;
-    if (offset !== void 0 && limit !== void 0) {
-      return `${parameters.filePath} (lines ${offset}-${offset + limit})`;
-    }
-    if (offset !== void 0) {
-      return `${parameters.filePath} (lines ${offset}+)`;
-    }
-    if (limit !== void 0) {
-      return `${parameters.filePath} (lines 0-${limit})`;
-    }
-    return parameters.filePath;
-  }
-  if ((tool8 === "write" || tool8 === "edit" || tool8 === "multiedit") && parameters.filePath) {
-    return parameters.filePath;
-  }
-  if (tool8 === "apply_patch" && typeof parameters.patchText === "string") {
-    const pathRegex = /\*\*\* (?:Add|Delete|Update) File: ([^\n\r]+)/g;
-    const paths = [];
-    let match;
-    while ((match = pathRegex.exec(parameters.patchText)) !== null) {
-      paths.push(match[1].trim());
-    }
-    if (paths.length > 0) {
-      const uniquePaths = [...new Set(paths)];
-      const count = uniquePaths.length;
-      const plural = count > 1 ? "s" : "";
-      if (count === 1) return uniquePaths[0];
-      if (count === 2) return uniquePaths.join(", ");
-      return `${count} file${plural}: ${uniquePaths[0]}, ${uniquePaths[1]}...`;
-    }
-    return "patch";
-  }
-  if (tool8 === "list") {
-    return parameters.path || "(current directory)";
-  }
-  if (tool8 === "glob") {
-    if (parameters.pattern) {
-      const pathInfo = parameters.path ? ` in ${parameters.path}` : "";
-      return `"${parameters.pattern}"${pathInfo}`;
-    }
-    return "(unknown pattern)";
-  }
-  if (tool8 === "grep") {
-    if (parameters.pattern) {
-      const pathInfo = parameters.path ? ` in ${parameters.path}` : "";
-      return `"${parameters.pattern}"${pathInfo}`;
-    }
-    return "(unknown pattern)";
-  }
-  if (tool8 === "bash") {
-    if (parameters.description) return parameters.description;
-    if (parameters.command) {
-      return parameters.command.length > 50 ? parameters.command.substring(0, 50) + "..." : parameters.command;
-    }
-  }
-  if (tool8 === "webfetch" && parameters.url) {
-    return parameters.url;
-  }
-  if (tool8 === "websearch" && parameters.query) {
-    return `"${parameters.query}"`;
-  }
-  if (tool8 === "codesearch" && parameters.query) {
-    return `"${parameters.query}"`;
-  }
-  if (tool8 === "todowrite") {
-    return `${parameters.todos?.length || 0} todos`;
-  }
-  if (tool8 === "todoread") {
-    return "read todo list";
-  }
-  if (tool8 === "task" && parameters.description) {
-    return parameters.description;
-  }
-  if (tool8 === "skill" && parameters.name) {
-    return parameters.name;
-  }
-  if (tool8 === "lsp") {
-    const op = parameters.operation || "lsp";
-    const path = parameters.filePath || "";
-    const line = parameters.line;
-    const char = parameters.character;
-    if (path && line !== void 0 && char !== void 0) {
-      return `${op} ${path}:${line}:${char}`;
-    }
-    if (path) {
-      return `${op} ${path}`;
-    }
-    return op;
-  }
-  if (tool8 === "question") {
-    const questions = parameters.questions;
-    if (Array.isArray(questions) && questions.length > 0) {
-      const headers = questions.map((q) => q.header || "").filter(Boolean).slice(0, 3);
-      const count = questions.length;
-      const plural = count > 1 ? "s" : "";
-      if (headers.length > 0) {
-        const suffix = count > 3 ? ` (+${count - 3} more)` : "";
-        return `${count} question${plural}: ${headers.join(", ")}${suffix}`;
-      }
-      return `${count} question${plural}`;
-    }
-    return "question";
-  }
-  const paramStr = JSON.stringify(parameters);
-  if (paramStr === "{}" || paramStr === "[]" || paramStr === "null") {
-    return "";
-  }
-  return paramStr.substring(0, 50);
-}
 function formatAge(createdAt) {
   const elapsed = Date.now() - createdAt;
   if (elapsed < 6e4) return "just now";
@@ -5061,10 +4662,6 @@ function formatTokenCount(tokens, compact) {
   }
   return tokens.toString() + suffix;
 }
-function truncate(str, maxLen = 60) {
-  if (str.length <= maxLen) return str;
-  return str.slice(0, maxLen - 3) + "...";
-}
 function formatProgressBar(messageIds, prunedMessages, recentMessageIds, width = 50) {
   const ACTIVE = "\u2588";
   const PRUNED = "\u2591";
@@ -5124,48 +4721,6 @@ function cacheSystemPromptTokens(state, messages) {
   const estimatedSystemTokens = Math.max(0, firstInputTokens - countTokens2(firstUserText));
   state.systemPromptTokens = estimatedSystemTokens > 0 ? estimatedSystemTokens : void 0;
 }
-function shortenPath(input, workingDirectory) {
-  const inPathMatch = input.match(/^(.+) in (.+)$/);
-  if (inPathMatch) {
-    const prefix = inPathMatch[1];
-    const pathPart = inPathMatch[2];
-    const shortenedPath = shortenSinglePath(pathPart, workingDirectory);
-    return `${prefix} in ${shortenedPath}`;
-  }
-  return shortenSinglePath(input, workingDirectory);
-}
-function shortenSinglePath(path, workingDirectory) {
-  if (workingDirectory) {
-    if (path.startsWith(workingDirectory + "/")) {
-      return path.slice(workingDirectory.length + 1);
-    }
-    if (path === workingDirectory) {
-      return ".";
-    }
-  }
-  return path;
-}
-function formatPrunedItemsList(pruneToolIds, toolMetadata, workingDirectory) {
-  const lines = [];
-  for (const id of pruneToolIds) {
-    const metadata = toolMetadata.get(id);
-    if (metadata) {
-      const paramKey = extractParameterKey(metadata.tool, metadata.parameters);
-      if (paramKey) {
-        const displayKey = truncate(shortenPath(paramKey, workingDirectory), 60);
-        lines.push(`\u2192 ${metadata.tool}: ${displayKey}`);
-      } else {
-        lines.push(`\u2192 ${metadata.tool}`);
-      }
-    }
-  }
-  const knownCount = pruneToolIds.filter((id) => toolMetadata.has(id)).length;
-  const unknownCount = pruneToolIds.length - knownCount;
-  if (unknownCount > 0) {
-    lines.push(`\u2192 (${unknownCount} tool${unknownCount > 1 ? "s" : ""} with unknown metadata)`);
-  }
-  return lines;
-}
 
 // lib/ui/notification.ts
 var TOAST_BODY_MAX_LINES = 12;
@@ -5369,6 +4924,10 @@ ${progressBar}`;
   }
   let toastMessage = message;
   toastMessage = config.pruneNotification === "minimal" ? toastMessage : truncateToastBody(toastMessage);
+  if (config.debug) {
+    const chatMessage = config.pruneNotification === "minimal" ? message : truncateToastBody(message);
+    await sendIgnoredMessage(client, sessionId, chatMessage, params, logger);
+  }
   await client.tui.showToast({
     body: {
       title: "ACP: Compress Notification",
@@ -6399,8 +5958,6 @@ async function prepareSession(ctx, toolCtx, title) {
     ctx.config
   );
   assignMessageRefs(ctx.state, rawMessages);
-  deduplicate(ctx.state, ctx.logger, ctx.config, rawMessages);
-  purgeErrors(ctx.state, ctx.logger, ctx.config, rawMessages);
   return {
     rawMessages,
     searchContext: buildSearchContext(ctx.state, rawMessages)
@@ -6523,7 +6080,7 @@ function normalizeRef(ref) {
 }
 function formatKeptMessage(msg, ref, maxChars) {
   const formatted = formatByType(msg);
-  const truncated = truncate2(formatted, maxChars);
+  const truncated = truncate(formatted, maxChars);
   return `
 --- [${ref}: ${labelForMessage(msg)}] ---
 ${truncated}
@@ -6536,11 +6093,11 @@ function formatByType(msg) {
       return part.text;
     }
     if (part.type === "tool") {
-      const tool8 = part.tool || "unknown";
+      const tool7 = part.tool || "unknown";
       const state = part.state || {};
       const input = state.input || {};
       const output = state.output || "";
-      switch (tool8) {
+      switch (tool7) {
         case "bash":
         case "interactive_bash": {
           const cmd = typeof input === "string" ? input : input.command || JSON.stringify(input);
@@ -6569,7 +6126,7 @@ ${content}`;
           if (output && typeof output === "string" && output.length > 0) {
             return output;
           }
-          const compact = JSON.stringify({ tool: tool8, input }, null, 0);
+          const compact = JSON.stringify({ tool: tool7, input }, null, 0);
           return compact.length > 500 ? compact.slice(0, 500) + "..." : compact;
         }
       }
@@ -6580,15 +6137,15 @@ ${content}`;
 function labelForMessage(msg) {
   for (const part of msg.parts || []) {
     if (part.type === "tool") {
-      const tool8 = part.tool || "unknown";
+      const tool7 = part.tool || "unknown";
       const input = part.state?.input || {};
       const fp = input.filePath || input.path || input.command || "";
-      return fp ? `${tool8}: ${String(fp).slice(0, 60)}` : tool8;
+      return fp ? `${tool7}: ${String(fp).slice(0, 60)}` : tool7;
     }
   }
   return msg.info.role === "user" ? "user" : "text";
 }
-function truncate2(text, maxChars) {
+function truncate(text, maxChars) {
   if (text.length <= maxChars) return text;
   return text.slice(0, maxChars) + `
 ... [truncated, ${text.length} chars total]`;
@@ -7303,8 +6860,8 @@ var resolveEffectiveCompressPermission = (basePermission, hostPermissions, agent
     agentName ? hostPermissions.agents[agentName] : void 0
   ) ? "deny" : basePermission;
 };
-var hasExplicitToolPermission = (permissionConfig, tool8) => {
-  return permissionConfig ? Object.prototype.hasOwnProperty.call(permissionConfig, tool8) : false;
+var hasExplicitToolPermission = (permissionConfig, tool7) => {
+  return permissionConfig ? Object.prototype.hasOwnProperty.call(permissionConfig, tool7) : false;
 };
 
 // lib/compress-permission.ts
@@ -7495,7 +7052,7 @@ var dropEmptyMessages = (messages) => {
 };
 
 // lib/prompts/extensions/nudge.ts
-function buildCompressedBlockGuidance(state, gcConfig, context) {
+function buildCompressedBlockGuidance(state, context) {
   const activeBlockIds = Array.from(state.prune.messages.activeBlockIds).filter((id) => Number.isInteger(id) && id > 0).sort((a, b) => a - b);
   const blockCount = activeBlockIds.length;
   const blocksForStats = activeBlockIds.map((id) => state.prune.messages.blocksById.get(id)).filter((b) => b !== void 0 && b.active);
@@ -7536,32 +7093,6 @@ function buildCompressedBlockGuidance(state, gcConfig, context) {
       }
     }
   }
-  const usageRatio = context?.currentTokens && context?.modelContextLimit ? context.currentTokens / context.modelContextLimit : 0;
-  if (gcConfig && usageRatio > 0.9) {
-    const promotionThreshold = gcConfig.promotionThreshold;
-    const agingBlocks = [];
-    for (const blockId of activeBlockIds) {
-      const block = state.prune.messages.blocksById.get(blockId);
-      if (!block) continue;
-      const survived = block.survivedCount ?? 0;
-      const gen = block.generation ?? "young";
-      const sizeK = (block.summary.length / 1e3).toFixed(1);
-      const preview = block.summary.slice(0, 120).replace(/\n/g, " ");
-      if (gen === "old" || survived >= promotionThreshold - 2) {
-        agingBlocks.push(
-          `  b${blockId}: age=${survived}/${promotionThreshold}, gen=${gen}, size=${sizeK}K chars \u2014 ${preview}...`
-        );
-      }
-    }
-    if (agingBlocks.length > 0) {
-      lines.push("");
-      lines.push("\u26A0\uFE0F Block aging warning \u2014 context near limit, these blocks may be truncated by last-resort GC:");
-      lines.push(...agingBlocks);
-      lines.push(
-        "Re-summarize these blocks into concise new ones to preserve key facts. At 100% context, oversized blocks are auto-truncated as a last resort."
-      );
-    }
-  }
   return lines.join("\n");
 }
 function renderMessagePriorityGuidance(priorityLabel, refs) {
@@ -8137,7 +7668,7 @@ function estimateContextComposition(messages, state, protectedTools = [], protec
   perTool.sort((a, b) => b.tokens - a.tokens);
   perCode.sort((a, b) => b.tokens - a.tokens);
   perText.sort((a, b) => b.tokens - a.tokens);
-  const toolTypeBreakdown = Array.from(toolTypeMap.entries()).map(([tool8, tokens]) => ({ tool: tool8, tokens })).sort((a, b) => b.tokens - a.tokens);
+  const toolTypeBreakdown = Array.from(toolTypeMap.entries()).map(([tool7, tokens]) => ({ tool: tool7, tokens })).sort((a, b) => b.tokens - a.tokens);
   return {
     toolTokens,
     codeTokens,
@@ -8492,39 +8023,47 @@ var injectCompressNudges = (state, config, logger, messages, prompts, compressio
     (m) => m.info.role === "user" && !isIgnoredUserMessage(m)
   );
   const currentTurnStart = lastUserIdx >= 0 ? lastUserIdx + 1 : 0;
-  const currentTurnHasCompress = messages.slice(currentTurnStart).some((m) => m.info.role === "assistant" && messageHasCompress(m));
+  const currentTurnHasCompress = messages.slice(currentTurnStart).some((m) => m.info.role === "assistant" && messageHasCompressAttempt(m));
   if (currentTurnHasCompress) {
-    const wasNudgeTriggered = state.nudges.lastNudgeShownTokens !== void 0;
-    state.nudges.contextLimitAnchors.clear();
-    state.nudges.turnNudgeAnchors.clear();
-    state.nudges.iterationNudgeAnchors.clear();
-    state.nudges.lastNudgeShownTokens = void 0;
-    state.nudges.lastToolOutputNudgeTokens = void 0;
-    state.nudges.lastTier2NudgeTokens = void 0;
-    state.nudges.lastTier3NudgeTokens = void 0;
-    if (wasNudgeTriggered && !state.nudges.compressBaselineSet) {
-      const baseline = state.nudges.lastPerMessageNudgeTokens;
-      const postCompress = currentTokens;
-      const preCompress = preCompressTokens;
-      if (baseline !== void 0 && postCompress !== void 0 && preCompress !== void 0 && preCompress > postCompress) {
-        const growth = preCompress - baseline;
-        const compressed = preCompress - postCompress;
-        if (growth > 0 && compressed > 0) {
-          const ratio = Math.min(1, compressed / growth);
-          const adjustment = Math.min(1, ratio * 2);
-          const newBaseline = baseline + Math.round((postCompress - baseline) * adjustment);
-          state.nudges.lastPerMessageNudgeTokens = newBaseline;
+    const lastCompressMsg = messages.slice(currentTurnStart).findLast((m) => m.info.role === "assistant" && messageHasCompressAttempt(m));
+    const lastCompressMsgId = lastCompressMsg?.info?.id;
+    if (lastCompressMsgId !== state.nudges.lastProcessedCompressMessageId) {
+      state.nudges.lastProcessedCompressMessageId = lastCompressMsgId;
+      const wasNudgeTriggered = state.nudges.lastNudgeShownTokens !== void 0;
+      state.nudges.contextLimitAnchors.clear();
+      state.nudges.turnNudgeAnchors.clear();
+      state.nudges.iterationNudgeAnchors.clear();
+      state.nudges.lastNudgeShownTokens = void 0;
+      state.nudges.lastToolOutputNudgeTokens = void 0;
+      state.nudges.lastTier2NudgeTokens = void 0;
+      state.nudges.lastTier3NudgeTokens = void 0;
+      const currentTurnHasSuccessfulCompress = messages.slice(currentTurnStart).some((m) => m.info.role === "assistant" && messageHasCompress(m));
+      if (currentTurnHasSuccessfulCompress && wasNudgeTriggered && !state.nudges.compressBaselineSet) {
+        const baseline = state.nudges.lastPerMessageNudgeTokens;
+        const postCompress = currentTokens;
+        const preCompress = preCompressTokens;
+        if (baseline !== void 0 && postCompress !== void 0 && preCompress !== void 0 && preCompress > postCompress) {
+          const growth = preCompress - baseline;
+          const compressed = preCompress - postCompress;
+          if (growth > 0 && compressed > 0) {
+            const ratio = Math.min(1, compressed / growth);
+            const adjustment = Math.min(1, ratio * 2);
+            state.nudges.lastPerMessageNudgeTokens = baseline + Math.round((postCompress - baseline) * adjustment);
+          } else {
+            state.nudges.lastPerMessageNudgeTokens = postCompress;
+          }
         } else {
           state.nudges.lastPerMessageNudgeTokens = postCompress;
         }
-      } else {
-        state.nudges.lastPerMessageNudgeTokens = postCompress;
+        state.nudges.compressBaselineSet = true;
       }
-      state.nudges.compressBaselineSet = true;
+      state.nudges.shouldInjectThisTurn = false;
+      saveSessionState(state, logger).catch(() => {
+      });
+      return;
     }
-    saveSessionState(state, logger).catch(() => {
-    });
-    return;
+  } else {
+    state.nudges.lastProcessedCompressMessageId = void 0;
   }
   state.nudges.compressBaselineSet = false;
   let anchorsChanged = false;
@@ -8621,9 +8160,6 @@ var injectCompressNudges = (state, config, logger, messages, prompts, compressio
   const growthSinceBaseline = currentTokens !== void 0 && growthReference !== void 0 ? currentTokens - growthReference : void 0;
   const nudgeAllowed = emergencyOverride || decision.shouldNudge && growthSinceBaseline !== void 0 && growthSinceBaseline >= growthFloor;
   const effectiveTipsVariant = emergencyOverride ? "maxLimit" : decision.tipsVariant;
-  if (nudgeAllowed) {
-    applyAnchoredNudges(state, config, messages, prompts, compressionPriorities, currentTokens, modelContextLimit, suffixMessage);
-  }
   if (state.nudges.lastPerMessageNudgeTokens === void 0 && currentTokens !== void 0) {
     state.nudges.lastPerMessageNudgeTokens = currentTokens;
     baselineReEstablished = true;
@@ -8672,10 +8208,18 @@ var injectCompressNudges = (state, config, logger, messages, prompts, compressio
   const allProtected = contextRanges.compressible.length === 0 && contextRanges.protected.length > 0;
   const allInProtectedZone = protectedRefs.size > 0 && unprotectedCompressible.length === 0;
   const nothingToCompress = filterSuppressed || allProtected || allInProtectedZone;
-  let shouldInject = nudgeAllowed && (!nothingToCompress || emergencyOverride);
+  const shouldInjectNudge = nudgeAllowed && (!nothingToCompress || emergencyOverride);
+  let shouldInject = shouldInjectNudge;
   if (nudgeAllowed && nothingToCompress && !emergencyOverride) {
     state.nudges.lastNudgeShownTokens = void 0;
   }
+  if (shouldInjectNudge) {
+    applyAnchoredNudges(state, config, messages, prompts, compressionPriorities, currentTokens, modelContextLimit, suffixMessage);
+  }
+  if (state.nudges.lastPerMessageNudgeTokens === void 0 && currentTokens !== void 0) {
+    state.nudges.lastPerMessageNudgeTokens = currentTokens;
+    baselineReEstablished = true;
+  }
   if (suffixMessage && !shouldInject) {
     const tierUsage = getTierTokenUsage(state);
     const tierChecks = [
@@ -8802,7 +8346,7 @@ ${HOW_TO_COMPRESS_RULES}`;
       const visibleMessageIds = new Set(
         messages.map((message) => message.info.id)
       );
-      const blockGuidance = buildCompressedBlockGuidance(state, config.gc, {
+      const blockGuidance = buildCompressedBlockGuidance(state, {
         currentTokens,
         modelContextLimit,
         includeHint: tipsText !== null,
@@ -9622,7 +9166,7 @@ function renderOverview(visibleMessages, summaryTokens, blocks, fetchFailed, raw
     lines.push(
       `  ${formatTokens(total)} total | ${formatTokens(totalTool)} tool (${toolPct}%) | ${formatTokens(totalText)} text (${textPct}%) | ${formatTokens(summaryTokens)} summaries (${summaryPct}%)`
     );
-    const topTypes = Array.from(toolTypeMap.entries()).map(([tool8, tokens]) => ({ tool: tool8, tokens })).sort((a, b) => b.tokens - a.tokens).slice(0, 3);
+    const topTypes = Array.from(toolTypeMap.entries()).map(([tool7, tokens]) => ({ tool: tool7, tokens })).sort((a, b) => b.tokens - a.tokens).slice(0, 3);
     if (topTypes.length > 0) {
       lines.push(
         `  Top tools: ${topTypes.map((t) => `${t.tool} (${pct(t.tokens, total)}%)`).join(", ")}`
@@ -9947,69 +9491,6 @@ Call with blockId to get the full summary: acp_context_recap({ blockId: N })`);
   });
 }
 
-// lib/compress/prune-tool.ts
-import { tool as tool7 } from "@opencode-ai/plugin";
-var PRUNE_TOOL_DESCRIPTION = `Remove old tool outputs by tool type \u2014 frees context without compression.
-
-Unlike compress (which creates summaries), prune directly strips tool call outputs from context. Use for disposable tool outputs where the content is no longer needed: old todowrite states, edit success echoes, repeated status checks.
-
-Args:
-- toolType: tool name to prune (e.g., "todowrite", "bash", "edit")
-- keepLatest: how many recent calls to keep visible (default 3)`;
-function createPruneTool(factoryCtx) {
-  factoryCtx.prompts.reload();
-  return tool7({
-    description: PRUNE_TOOL_DESCRIPTION,
-    args: {
-      toolType: tool7.schema.string().describe('Tool name to prune (e.g., "todowrite", "bash", "edit")'),
-      keepLatest: tool7.schema.number().optional().describe("How many recent calls to keep visible (default 3)")
-    },
-    async execute(args, toolCtx) {
-      const ctx = resolveToolContext(factoryCtx, toolCtx.sessionID);
-      const keepLatest = args.keepLatest ?? 3;
-      const { rawMessages } = await prepareSession(
-        ctx,
-        toolCtx,
-        `Prune: ${args.toolType}`
-      );
-      const matchingCalls = [];
-      for (let i = 0; i < rawMessages.length; i++) {
-        const msg = rawMessages[i];
-        if (!msg) continue;
-        for (const part of msg.parts || []) {
-          if (part.type !== "tool") continue;
-          const partTool = part?.tool || "";
-          if (partTool !== args.toolType) continue;
-          const callId = part?.callID;
-          if (!callId || typeof callId !== "string") continue;
-          if (ctx.state.prune.tools.has(callId)) continue;
-          const tokens = Math.round(JSON.stringify(part).length / 4);
-          matchingCalls.push({ callId, index: i, tokens });
-        }
-      }
-      if (matchingCalls.length <= keepLatest) {
-        return `Nothing to prune \u2014 only ${matchingCalls.length} ${args.toolType} calls visible (keepLatest=${keepLatest}).`;
-      }
-      matchingCalls.sort((a, b) => a.index - b.index);
-      const toPrune = matchingCalls.slice(0, matchingCalls.length - keepLatest);
-      let totalTokens = 0;
-      for (const item of toPrune) {
-        ctx.state.prune.tools.set(item.callId, item.tokens);
-        totalTokens += item.tokens;
-      }
-      await finalizeSession(
-        ctx,
-        toolCtx,
-        rawMessages,
-        [],
-        `Prune ${args.toolType}`
-      );
-      return `Pruned ${toPrune.length} ${args.toolType} calls (~${totalTokens} tokens). Kept latest ${keepLatest}. Outputs will be stripped on next context refresh.
-IMPORTANT: This was an automatic context pruning. You MUST continue your previous task exactly where you left off. Do NOT ask the user what to do next.`;
-    }
-  });
-}
-
 // lib/compress/hide-consumed.ts
 function hideConsumedCompressCalls(state, messages) {
   if (state.prune.messages.blocksById.size === 0) {
@@ -10062,7 +9543,7 @@ import { writeFile as writeFile2, mkdir as mkdir2 } from "fs/promises";
 import { join as join3 } from "path";
 import { existsSync as existsSync3 } from "fs";
 import { homedir as homedir3 } from "os";
-var LOG_VERSION = true ? "1.14.3" : "dev";
+var LOG_VERSION = true ? "1.14.5" : "dev";
 var Logger = class {
   logDir;
   enabled;
@@ -10292,7 +9773,6 @@ You have five context-management tools:
 - \`compress\` \u2014 Replace a contiguous range of older conversation with a single detailed summary you write. Use when content is genuinely consumed (no longer needed for the current task step). Single range: \`compress({ topic: "API exploration", content: [{ startId: "m00150", endId: "m00220", summary: "..." }] })\`. Batch (multiple unrelated ranges, each with its own topic): \`compress({ content: [{ topic: "Auth", startId: "m00150", endId: "m00220", summary: "..." }, { topic: "Deploy", startId: "m00300", endId: "m00350", summary: "..." }] })\`.
 - \`decompress\` \u2014 Restore a previously compressed block's content. By default restores one tier up (T2\u2192T1 summaries, not raw messages). Use \`full: true\` to restore all the way to original messages. Use \`toFile\` to write to file instead of inflating context. Example: \`decompress({ blockId: "b5" })\` or \`decompress({ blockId: "b5", toFile: "path" })\` or \`decompress({ blockId: "b5", full: true })\`.
 - \`search_context\` \u2014 Search compressed block summaries (and optionally visible messages) by keyword. Use BEFORE decompressing to find the right block. Example: \`search_context({ query: "auth token refresh" })\`.
-- \`prune\` \u2014 Remove old tool outputs by tool type, keeping only recent calls. Unlike compress (which creates summaries), prune directly strips outputs. Use for disposable outputs like old todowrite states or edit echoes. Example: \`prune({ toolType: "todowrite", keepLatest: 3 })\`.
 - \`acp_status\` \u2014 Context status with compressible ranges. No args = overview + ranges. \`scope:"uncompressed"\` for range view; add \`view:"messages"\` for per-message listing with \`tool\`/\`sort\` filters. \`scope:"compressed"\` for block details.
 
 COMPRESSION PHILOSOPHY
@@ -10947,6 +10427,73 @@ function renderSystemPrompt(prompts, protectedToolsExtension, manual, subagent)
   return [prompts.system.trim(), ...extensions].filter(Boolean).join("\n\n").replace(/\n([ \t]*\n)+/g, "\n\n").trim();
 }
 
+// lib/messages/truncate-tools.ts
+var TRUNCATION_MARKER = "[truncated for context space";
+var MIN_OUTPUT_TOKENS = 1e3;
+var KEEP_PREFIX_CHARS = 2e3;
+var KEEP_SUFFIX_CHARS = 2e3;
+var PROTECT_RECENT_MESSAGES = 3;
+function parseGcThreshold(threshold, modelContextLimit) {
+  if (typeof threshold === "number") return threshold;
+  const str = threshold ?? "100%";
+  const match = /^(\d+(?:\.\d+)?)%$/.exec(str);
+  if (match) return Math.round(Number(match[1]) / 100 * modelContextLimit);
+  return modelContextLimit;
+}
+function truncateLargeToolOutputs(state, config, logger, messages) {
+  if (!state.modelContextLimit) return;
+  const currentTokens = getCurrentTokenUsage(state, messages);
+  if (currentTokens === 0) return;
+  const threshold = parseGcThreshold(config.gc?.majorGcThresholdPercent, state.modelContextLimit);
+  if (currentTokens < threshold) return;
+  const protectedIndex = messages.length - PROTECT_RECENT_MESSAGES;
+  const candidates = [];
+  for (let mi = 0; mi < messages.length; mi++) {
+    if (mi >= protectedIndex) break;
+    const msg = messages[mi];
+    const parts = Array.isArray(msg.parts) ? msg.parts : [];
+    for (let pi = 0; pi < parts.length; pi++) {
+      const part = parts[pi];
+      if (part?.type !== "tool") continue;
+      if (part.state?.status !== "completed") continue;
+      const content = extractCompletedToolOutput(part);
+      if (content === void 0) continue;
+      if (content === "[Old tool result content cleared]") continue;
+      if (content.includes(TRUNCATION_MARKER)) continue;
+      const tokens = countTokens2(content);
+      if (tokens < MIN_OUTPUT_TOKENS) continue;
+      candidates.push({ part, content, tokens });
+    }
+  }
+  if (candidates.length === 0) return;
+  candidates.sort((a, b) => b.tokens - a.tokens);
+  const targetTokens = threshold * 0.9;
+  let savedTokens = 0;
+  let truncatedCount = 0;
+  for (const { part, content, tokens } of candidates) {
+    if (currentTokens - savedTokens <= targetTokens) break;
+    if (content.length <= KEEP_PREFIX_CHARS + KEEP_SUFFIX_CHARS) continue;
+    const prefix = content.slice(0, KEEP_PREFIX_CHARS);
+    const suffix = content.slice(-KEEP_SUFFIX_CHARS);
+    const truncated = prefix + `
+
+...${TRUNCATION_MARKER} \u2014 original ~${tokens} tokens]...
+
+` + suffix;
+    part.state.output = truncated;
+    savedTokens += tokens - countTokens2(truncated);
+    truncatedCount++;
+  }
+  if (truncatedCount > 0) {
+    logger.info("Emergency tool output truncation", {
+      truncatedCount,
+      estimatedSavedTokens: Math.round(savedTokens),
+      currentTokens,
+      threshold
+    });
+  }
+}
+
 // lib/commands/context.ts
 function analyzeTokens(state, messages) {
   const breakdown = {
@@ -10995,7 +10542,7 @@ function analyzeTokens(state, messages) {
   let foundFirstUser = false;
   const allToolIds = /* @__PURE__ */ new Set();
   const activeToolIds = /* @__PURE__ */ new Set();
-  const prunedByMessageToolIds = /* @__PURE__ */ new Set();
+  const prunedToolIds = /* @__PURE__ */ new Set();
   const allMessageIds = /* @__PURE__ */ new Set();
   for (const msg of messages) {
     allMessageIds.add(msg.info.id);
@@ -11013,11 +10560,10 @@ function analyzeTokens(state, messages) {
             activeToolIds.add(toolPart.callID);
           }
           if (isMessagePruned) {
-            prunedByMessageToolIds.add(toolPart.callID);
+            prunedToolIds.add(toolPart.callID);
           }
         }
-        const isPruned = toolPart.callID && state.prune.tools.has(toolPart.callID);
-        if (!isCompacted && !isPruned) {
+        if (!isCompacted) {
           if (toolPart.state?.input) {
             const inputStr = typeof toolPart.state.input === "string" ? toolPart.state.input : JSON.stringify(toolPart.state.input);
             toolInputParts.push(inputStr);
@@ -11040,14 +10586,7 @@ function analyzeTokens(state, messages) {
       foundFirstUser = true;
     }
   }
-  const prunedByToolIds = /* @__PURE__ */ new Set();
-  for (const id of allToolIds) {
-    if (state.prune.tools.has(id)) {
-      prunedByToolIds.add(id);
-    }
-  }
-  const prunedToolIds = /* @__PURE__ */ new Set([...prunedByToolIds, ...prunedByMessageToolIds]);
-  const toolsInContextCount = [...activeToolIds].filter((id) => !prunedByToolIds.has(id)).length;
+  const toolsInContextCount = [...activeToolIds].filter((id) => !prunedToolIds.has(id)).length;
   let prunedMessageCount = 0;
   for (const [id, entry] of state.prune.messages.byMessageId) {
     if (allMessageIds.has(id) && entry.activeBlockIds.length > 0) {
@@ -11271,7 +10810,6 @@ async function handleDecompressCommand(ctx) {
 var BASE_COMMANDS = [
   ["/acp context", "Show token usage breakdown for current session"],
   ["/acp stats", "Show ACP pruning statistics"],
-  ["/acp sweep [n]", "Prune tools since last user message, or last n tools"],
   ["/acp manual [on|off]", "Toggle manual mode or set explicit state"]
 ];
 var TOOL_COMMANDS = {
@@ -11323,9 +10861,9 @@ var COMPRESS_TRIGGER_PROMPT = [
   "Follow the active compress mode, preserve all critical implementation details, and choose safe targets.",
   "Return after compress with a brief explanation of what content was compressed."
 ].join("\n\n");
-function getTriggerPrompt(tool8, state, config, userFocus) {
+function getTriggerPrompt(tool7, state, config, userFocus) {
   const base = COMPRESS_TRIGGER_PROMPT;
-  const compressedBlockGuidance = config.compress.mode === "message" ? "" : buildCompressedBlockGuidance(state, config.gc);
+  const compressedBlockGuidance = config.compress.mode === "message" ? "" : buildCompressedBlockGuidance(state);
   const sections = [base, compressedBlockGuidance];
   if (userFocus && userFocus.trim().length > 0) {
     sections.push(`Additional user focus:
@@ -11352,8 +10890,8 @@ async function handleManualToggleCommand(ctx, modeArg) {
   );
   logger.info("Manual mode toggled", { manualMode: state.manualMode });
 }
-async function handleManualTriggerCommand(ctx, tool8, userFocus) {
-  return getTriggerPrompt(tool8, ctx.state, ctx.config, userFocus);
+async function handleManualTriggerCommand(ctx, tool7, userFocus) {
+  return getTriggerPrompt(tool7, ctx.state, ctx.config, userFocus);
 }
 function applyPendingManualTrigger(state, messages, logger) {
   const pending = state.pendingManualTrigger;
@@ -11621,7 +11159,7 @@ async function handleStatsCommand(ctx) {
     (total, target) => total + target.durationMs,
     0
   );
-  const prunedToolIds = new Set(state.prune.tools.keys());
+  const prunedToolIds = /* @__PURE__ */ new Set();
   for (const block of state.prune.messages.blocksById.values()) {
     if (block.active) {
       for (const toolId of block.effectiveToolIds) {
@@ -11659,243 +11197,6 @@ async function handleStatsCommand(ctx) {
   });
 }
 
-// lib/commands/sweep.ts
-function findLastUserMessageIndex(messages) {
-  for (let i = messages.length - 1; i >= 0; i--) {
-    const msg = messages[i];
-    if (msg.info.role === "user" && !isIgnoredUserMessage(msg)) {
-      return i;
-    }
-  }
-  return -1;
-}
-function collectToolIdsAfterIndex(state, messages, afterIndex) {
-  const toolIds = [];
-  for (let i = afterIndex + 1; i < messages.length; i++) {
-    const msg = messages[i];
-    if (isMessageCompacted(state, msg)) {
-      continue;
-    }
-    const parts = Array.isArray(msg.parts) ? msg.parts : [];
-    if (parts.length > 0) {
-      for (const part of parts) {
-        if (part.type === "tool" && part.callID && part.tool) {
-          toolIds.push(part.callID);
-        }
-      }
-    }
-  }
-  return toolIds;
-}
-function formatNoUserMessage() {
-  const lines = [];
-  lines.push("\u256D\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u256E");
-  lines.push("\u2502                      ACP Sweep                            \u2502");
-  lines.push("\u2570\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u256F");
-  lines.push("");
-  lines.push("Nothing swept: no user message found.");
-  return lines.join("\n");
-}
-function formatSweepMessage(toolCount, tokensSaved, mode, toolIds, toolMetadata, workingDirectory, skippedProtected) {
-  const lines = [];
-  lines.push("\u256D\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u256E");
-  lines.push("\u2502                      ACP Sweep                            \u2502");
-  lines.push("\u2570\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u256F");
-  lines.push("");
-  if (toolCount === 0) {
-    if (mode === "since-user") {
-      lines.push("No tools found since the previous user message.");
-    } else {
-      lines.push(`No tools found to sweep.`);
-    }
-    if (skippedProtected && skippedProtected > 0) {
-      lines.push(`(${skippedProtected} protected tool(s) skipped)`);
-    }
-  } else {
-    if (mode === "since-user") {
-      lines.push(`Swept ${toolCount} tool(s) since the previous user message.`);
-    } else {
-      lines.push(`Swept the last ${toolCount} tool(s).`);
-    }
-    lines.push(`Tokens saved: ~${tokensSaved.toLocaleString()}`);
-    if (skippedProtected && skippedProtected > 0) {
-      lines.push(`(${skippedProtected} protected tool(s) skipped)`);
-    }
-    lines.push("");
-    const itemLines = formatPrunedItemsList(toolIds, toolMetadata, workingDirectory);
-    lines.push(...itemLines);
-  }
-  return lines.join("\n");
-}
-async function handleSweepCommand(ctx) {
-  const { client, state, config, logger, sessionId, messages, args, workingDirectory } = ctx;
-  const params = getCurrentParams(state, messages, logger);
-  const protectedTools = config.commands.protectedTools;
-  syncToolCache(state, config, logger, messages);
-  buildToolIdList(state, messages);
-  const numArg = args[0] ? parseInt(args[0], 10) : null;
-  const isLastNMode = numArg !== null && !isNaN(numArg) && numArg > 0;
-  let toolIdsToSweep;
-  let mode;
-  if (isLastNMode) {
-    mode = "last-n";
-    const startIndex = Math.max(0, state.toolIdList.length - numArg);
-    toolIdsToSweep = state.toolIdList.slice(startIndex);
-    logger.info(`Sweep command: last ${numArg} mode, found ${toolIdsToSweep.length} tools`);
-  } else {
-    mode = "since-user";
-    const lastUserMsgIndex = findLastUserMessageIndex(messages);
-    if (lastUserMsgIndex === -1) {
-      const message2 = formatNoUserMessage();
-      await sendIgnoredMessage(client, sessionId, message2, params, logger);
-      logger.info("Sweep command: no user message found");
-      return;
-    } else {
-      toolIdsToSweep = collectToolIdsAfterIndex(state, messages, lastUserMsgIndex);
-      logger.info(
-        `Sweep command: found last user at index ${lastUserMsgIndex}, sweeping ${toolIdsToSweep.length} tools`
-      );
-    }
-  }
-  const newToolIds = toolIdsToSweep.filter((id) => {
-    if (state.prune.tools.has(id)) {
-      return false;
-    }
-    const entry = state.toolParameters.get(id);
-    if (!entry) {
-      return true;
-    }
-    if (isToolNameProtected(entry.tool, protectedTools)) {
-      logger.debug(`Sweep: skipping protected tool ${entry.tool} (${id})`);
-      return false;
-    }
-    const filePaths = getFilePathsFromParameters(entry.tool, entry.parameters);
-    if (isFilePathProtected(filePaths, config.protectedFilePatterns)) {
-      logger.debug(`Sweep: skipping protected file path(s) ${filePaths.join(", ")} (${id})`);
-      return false;
-    }
-    return true;
-  });
-  const skippedProtected = toolIdsToSweep.filter((id) => {
-    const entry = state.toolParameters.get(id);
-    if (!entry) {
-      return false;
-    }
-    if (isToolNameProtected(entry.tool, protectedTools)) {
-      return true;
-    }
-    const filePaths = getFilePathsFromParameters(entry.tool, entry.parameters);
-    if (isFilePathProtected(filePaths, config.protectedFilePatterns)) {
-      return true;
-    }
-    return false;
-  }).length;
-  if (newToolIds.length === 0) {
-    const message2 = formatSweepMessage(
-      0,
-      0,
-      mode,
-      [],
-      /* @__PURE__ */ new Map(),
-      workingDirectory,
-      skippedProtected
-    );
-    await sendIgnoredMessage(client, sessionId, message2, params, logger);
-    logger.info("Sweep command: no new tools to sweep", { skippedProtected });
-    return;
-  }
-  const tokensSaved = getTotalToolTokens(state, newToolIds);
-  for (const id of newToolIds) {
-    const entry = state.toolParameters.get(id);
-    state.prune.tools.set(id, entry?.tokenCount ?? 0);
-  }
-  state.stats.pruneTokenCounter += tokensSaved;
-  state.stats.totalPruneTokens += state.stats.pruneTokenCounter;
-  state.stats.pruneTokenCounter = 0;
-  const toolMetadata = /* @__PURE__ */ new Map();
-  for (const id of newToolIds) {
-    const entry = state.toolParameters.get(id);
-    if (entry) {
-      toolMetadata.set(id, entry);
-    }
-  }
-  saveSessionState(state, logger).catch(
-    (err) => logger.error("Failed to persist state after sweep", { error: err.message })
-  );
-  const message = formatSweepMessage(
-    newToolIds.length,
-    tokensSaved,
-    mode,
-    newToolIds,
-    toolMetadata,
-    workingDirectory,
-    skippedProtected
-  );
-  await sendIgnoredMessage(client, sessionId, message, params, logger);
-  logger.info("Sweep command completed", {
-    toolsSwept: newToolIds.length,
-    tokensSaved,
-    skippedProtected,
-    mode,
-    tools: Array.from(toolMetadata.entries()).map(([id, entry]) => ({
-      id,
-      tool: entry.tool
-    }))
-  });
-}
-
-// lib/gc/truncate.ts
-function runTruncateGC(blocks, params) {
-  let compactedBlocks = 0;
-  let savedTokens = 0;
-  for (const block of blocks) {
-    if (!block.active) continue;
-    if (block.summary.length <= params.maxOldGenSummaryLength) continue;
-    const originalLength = block.summary.length;
-    const truncated = truncateSummary(block.summary, params.maxOldGenSummaryLength, block.blockId);
-    const savedChars = originalLength - truncated.length;
-    if (savedChars > 0) {
-      block.summary = truncated;
-      block.summaryTokens = Math.round(truncated.length / 4);
-      compactedBlocks++;
-      savedTokens += Math.round(savedChars / 4);
-    }
-  }
-  return { compactedBlocks, savedTokens };
-}
-function truncateSummary(summary, maxLength, _blockId) {
-  if (summary.length <= maxLength) return summary;
-  const headerEnd = summary.indexOf("\n");
-  if (headerEnd === -1) return summary.slice(0, maxLength) + "\n...\n[GC truncated]";
-  const header = summary.slice(0, headerEnd + 1);
-  const footerStart = summary.lastIndexOf("\n\n");
-  const footer = footerStart > headerEnd ? summary.slice(footerStart) : "";
-  const availableForContent = maxLength - header.length - footer.length - 20;
-  if (availableForContent < 100) {
-    return header + "...\n[GC truncated]" + footer;
-  }
-  const content = summary.slice(headerEnd + 1, headerEnd + 1 + availableForContent);
-  return header + content + "\n...\n[GC truncated]" + footer;
-}
-function shouldRunMajorGC(currentTokens, modelContextLimit, gcConfig) {
-  if (!modelContextLimit || modelContextLimit === 0) return false;
-  const threshold = parseGcThreshold(gcConfig.majorGcThresholdPercent, modelContextLimit);
-  return currentTokens >= threshold;
-}
-function getGCParams(gcConfig, modelContextLimit, currentTokens) {
-  return {
-    maxOldGenSummaryLength: gcConfig.maxOldGenSummaryLength,
-    modelContextLimit,
-    currentTokens
-  };
-}
-function parseGcThreshold(limit, modelContextLimit) {
-  if (typeof limit === "number") return limit;
-  const percent = parseFloat(limit.slice(0, -1));
-  if (isNaN(percent)) return modelContextLimit;
-  return Math.round(Math.max(0, Math.min(100, Math.round(percent))) / 100 * modelContextLimit);
-}
-
 // lib/gc/merge.ts
 function collectActiveOldGenBlocks(state, maxOldGenSummaryLength) {
   const blocks = [];
@@ -12116,31 +11417,6 @@ function createSystemPromptHandler(registry3, logger, config, prompts) {
     }
   };
 }
-function runMajorGC(state, config, logger, messages) {
-  if (!state.modelContextLimit) return;
-  const currentTokens = getCurrentTokenUsage(state, messages);
-  if (!shouldRunMajorGC(currentTokens, state.modelContextLimit, config.gc)) return;
-  const oldBlocks = [];
-  for (const [blockId, block] of state.prune.messages.blocksById) {
-    if (!block.active) continue;
-    if (block.generation === "old" || block.generation === void 0 || block.summary.length > config.gc.maxOldGenSummaryLength) {
-      oldBlocks.push(block);
-    }
-  }
-  if (oldBlocks.length === 0) return;
-  const params = getGCParams(config.gc, state.modelContextLimit, currentTokens);
-  const result = runTruncateGC(oldBlocks, params);
-  if (result.compactedBlocks > 0) {
-    logger.info("Major GC: truncated old-gen blocks", {
-      compactedBlocks: result.compactedBlocks,
-      savedTokens: result.savedTokens,
-      currentTokens,
-      threshold: config.gc.majorGcThresholdPercent
-    });
-    saveSessionState(state, logger).catch(() => {
-    });
-  }
-}
 function createChatMessageTransformHandler(client, registry3, logger, config, prompts, hostPermissions) {
   return async (input, output) => {
     const receivedMessages = Array.isArray(output.messages) ? output.messages.length : 0;
@@ -12184,7 +11460,6 @@ function createChatMessageTransformHandler(client, registry3, logger, config, pr
     }
     syncToolCache(state, config, logger, output.messages);
     buildToolIdList(state, output.messages);
-    runMajorGC(state, config, logger, output.messages);
     const batchResult = runBatchCleanup(state, config, logger, output.messages);
     if (batchResult.mergedCount > 0) {
       saveSessionState(state, logger).catch(() => {
@@ -12192,6 +11467,7 @@ function createChatMessageTransformHandler(client, registry3, logger, config, pr
     }
     const prePruneTokens = getCurrentTokenUsage(state, output.messages);
     prune(state, logger, config, output.messages);
+    truncateLargeToolOutputs(state, config, logger, output.messages);
     hideConsumedCompressCalls(state, output.messages);
     assignMessageRefs(state, output.messages);
     const compressionPriorities = buildPriorityMap(config, state, output.messages);
@@ -12268,14 +11544,6 @@ function createCommandExecuteHandler(client, registry3, logger, config, workingD
         await handleStatsCommand(commandCtx);
         throw new Error("__DCP_STATS_HANDLED__");
       }
-      if (subcommand === "sweep") {
-        await handleSweepCommand({
-          ...commandCtx,
-          args: subArgs,
-          workingDirectory
-        });
-        throw new Error("__DCP_SWEEP_HANDLED__");
-      }
       if (subcommand === "manual") {
         await handleManualToggleCommand(commandCtx, subArgs[0]?.toLowerCase());
         throw new Error("__DCP_MANUAL_HANDLED__");
@@ -12581,9 +11849,7 @@ var server = (async (ctx) => {
   if (isSecureMode()) {
     configureClientAuth(ctx.client);
   }
-  logger.info("DCP initialized", {
-    strategies: config.strategies
-  });
+  logger.info("DCP initialized");
   startAutoUpdate(ctx, config.autoUpdate);
   const compressToolContext = {
     client: ctx.client,
@@ -12621,7 +11887,6 @@ var server = (async (ctx) => {
       ...config.compress.permission !== "deny" && {
         compress: config.compress.mode === "message" ? createCompressMessageTool(compressToolContext) : createCompressRangeTool(compressToolContext),
         decompress: createDecompressTool(compressToolContext),
-        prune: createPruneTool(compressToolContext),
         search_context: createSearchContextTool(compressToolContext),
         acp_status: createAcpStatusTool(compressToolContext),
         acp_context_recap: createAcpContextRecapTool(compressToolContext)