opencode-acp 1.18.2-pr.447.191 → 1.18.2-pr.449.193

package/dist/index.js

@@ -9832,6 +9832,81 @@ function computeRestoredMessages(messagesState, activeMessagesBefore) {
   }
   return { restoredMessageCount, restoredTokens };
 }
+function collectRequiredDecompressMessageIds(messagesState, targets, options = {}) {
+  const targetBlockIds = /* @__PURE__ */ new Set();
+  for (const target of targets) {
+    for (const block of target.blocks) {
+      targetBlockIds.add(block.blockId);
+    }
+  }
+  if (targetBlockIds.size === 0) {
+    return [];
+  }
+  const consumedClosure = /* @__PURE__ */ new Set();
+  const queue = [];
+  for (const target of targets) {
+    for (const block of target.blocks) {
+      for (const id of block.consumedBlockIds ?? []) {
+        if (!consumedClosure.has(id)) {
+          queue.push(id);
+        }
+      }
+    }
+  }
+  while (queue.length > 0) {
+    const id = queue.shift();
+    if (consumedClosure.has(id)) continue;
+    consumedClosure.add(id);
+    const consumed = messagesState.blocksById.get(id);
+    if (consumed) {
+      for (const nested of consumed.consumedBlockIds ?? []) {
+        if (!consumedClosure.has(nested)) {
+          queue.push(nested);
+        }
+      }
+    }
+  }
+  let shieldedMessageIds = null;
+  if (!options.full) {
+    shieldedMessageIds = /* @__PURE__ */ new Set();
+    for (const id of consumedClosure) {
+      const block = messagesState.blocksById.get(id);
+      if (!block || block.deactivatedByUser || block.deactivatedByUserDeep) continue;
+      for (const messageId of block.effectiveMessageIds ?? []) {
+        shieldedMessageIds.add(messageId);
+      }
+    }
+  }
+  const required = [];
+  for (const [messageId, entry] of messagesState.byMessageId) {
+    if (entry.activeBlockIds.length === 0) continue;
+    let exclusivelyCoveredByTargets = true;
+    for (const blockId of entry.activeBlockIds) {
+      if (!targetBlockIds.has(blockId)) {
+        exclusivelyCoveredByTargets = false;
+        break;
+      }
+    }
+    if (!exclusivelyCoveredByTargets) continue;
+    if (shieldedMessageIds?.has(messageId)) continue;
+    required.push(messageId);
+  }
+  required.sort();
+  return required;
+}
+function checkDecompressSourceAvailability(messagesState, targets, options, presentInHistory) {
+  const requiredMessageIds = collectRequiredDecompressMessageIds(messagesState, targets, options);
+  const available = [];
+  const missing = [];
+  for (const messageId of requiredMessageIds) {
+    if (presentInHistory.has(messageId)) {
+      available.push(messageId);
+    } else {
+      missing.push(messageId);
+    }
+  }
+  return { requiredMessageIds, availableMessageIds: available, missingMessageIds: missing };
+}
 function computeReactivatedBlockIds(messagesState, activeBlockIdsBefore) {
   return Array.from(messagesState.activeBlockIds).filter((blockId) => !activeBlockIdsBefore.has(blockId)).sort((a, b) => a - b);
 }
@@ -10040,14 +10115,31 @@ function buildSchema2() {
   };
 }
 function extractMessageId(m) {
-  return m.id ?? m.messageId ?? "";
+  return m?.info?.id ?? "";
+}
+function serializeMessagePart(part) {
+  if (!part || typeof part !== "object") return null;
+  if (part.type === "text") {
+    return typeof part.text === "string" && part.text.length > 0 ? part.text : null;
+  }
+  if (part.type === "tool") {
+    const contents = extractToolContent(part);
+    if (contents.length === 0) return null;
+    const toolName = "tool" in part && typeof part.tool === "string" && part.tool.length > 0 ? part.tool : "tool";
+    return `[${toolName}] ${contents.join("\n")}`;
+  }
+  return null;
 }
 function extractMessageText2(m) {
-  const msg = m;
-  const role = msg.role || msg.type || "unknown";
-  const content = typeof msg.content === "string" ? msg.content : typeof msg.text === "string" ? msg.text : JSON.stringify(msg.content || msg.text || "");
+  const role = m?.info?.role ?? "unknown";
+  const parts = Array.isArray(m.parts) ? m.parts : [];
+  const segments = [];
+  for (const part of parts) {
+    const serialized = serializeMessagePart(part);
+    if (serialized !== null) segments.push(serialized);
+  }
   return `[${role}]
-${content}`;
+${segments.join("\n\n")}`;
 }
 function createDecompressTool(factoryCtx) {
   return tool3({
@@ -10099,10 +10191,40 @@ function createDecompressTool(factoryCtx) {
         const blockMessages = rawMessages.filter((m) => msgIdSet.has(extractMessageId(m)));
         const lines2 = blockMessages.map(extractMessageText2);
         const { writeFile: writeFile4 } = await import("fs/promises");
-        const fileContent = lines2.length > 0 ? lines2.join("\n\n---\n\n") : targets[0]?.blocks[0]?.summary ?? "(no content available)";
+        let fileContent;
+        let sourceNote;
+        if (lines2.length > 0) {
+          fileContent = lines2.join("\n\n---\n\n");
+          sourceNote = `${blockMessages.length} original message${blockMessages.length === 1 ? "" : "s"}`;
+        } else {
+          fileContent = targets[0]?.blocks[0]?.summary ?? "(no content available)";
+          sourceNote = `no original messages found; wrote block summary (${targets.length} block${targets.length === 1 ? "" : "s"})`;
+        }
         await writeFile4(targetPath, fileContent, "utf-8");
         const displayIds2 = targets.map((t) => `b${t.displayId}`).join(", ");
-        return `Block(s) ${displayIds2} content (${blockMessages.length} messages, ${fileContent.length} chars) written to ${targetPath}. Block(s) stay compressed \u2014 context unchanged. Use read tool to access specific parts.`;
+        return `Block(s) ${displayIds2} content (${sourceNote}, ${fileContent.length} chars) written to ${targetPath}. Block(s) stay compressed \u2014 context unchanged. Use read tool to access specific parts.`;
+      }
+      const availability = checkDecompressSourceAvailability(
+        messagesState,
+        targets,
+        { full: args.full === true },
+        new Set(rawMessages.map((m) => m.info.id))
+      );
+      if (availability.missingMessageIds.length > 0) {
+        const displayIds2 = targets.map((t) => `b${t.displayId}`).join(", ");
+        const missingRefs = availability.missingMessageIds.map(
+          (id) => ctx.state.messageIds.byRawId.get(id) ?? id
+        );
+        const shownRefs = missingRefs.slice(0, 10).join(", ");
+        const extraCount = missingRefs.length - Math.min(missingRefs.length, 10);
+        ctx.logger.warn("Decompress aborted: source messages missing from host history", {
+          targetDisplayIds: displayIds2,
+          full: args.full === true,
+          requiredCount: availability.requiredMessageIds.length,
+          missingCount: availability.missingMessageIds.length,
+          missingRefs
+        });
+        return `Error: Cannot decompress ${displayIds2}: ${availability.missingMessageIds.length} of ${availability.requiredMessageIds.length} source message(s) are no longer present in session history (removed by native compaction or external deletion). Missing: ${shownRefs}` + (extraCount > 0 ? ` (+${extraCount} more)` : "") + `. Block(s) stay compressed \u2014 the summary remains available and nothing was changed. This is a missing-source condition, not a transient fetch failure.`;
       }
       const activeMessagesBefore = snapshotActiveMessages(messagesState);
       const activeBlockIdsBefore = new Set(messagesState.activeBlockIds);
@@ -10915,7 +11037,7 @@ import { writeFile as writeFile2, mkdir as mkdir2 } from "fs/promises";
 import { join as join4 } from "path";
 import { existsSync as existsSync4 } from "fs";
 import { homedir as homedir3 } from "os";
-var LOG_VERSION = true ? "1.18.2-pr.447.191" : "dev";
+var LOG_VERSION = true ? "1.18.2-pr.449.193" : "dev";
 var LEVEL_RANK = {
   debug: 10,
   info: 20,
@@ -13633,7 +13755,7 @@ var server = (async (ctx) => {
   }
   const logger = new Logger(config.debug, config.debug ? "debug" : config.logLevel);
   logger.info("ACP plugin initialized", {
-    version: true ? "1.18.2-pr.447.191" : "dev",
+    version: true ? "1.18.2-pr.449.193" : "dev",
     workspace: ctx.directory,
     logLevel: logger.level,
     debug: config.debug,