opencode-acp 1.18.4-pr.488.221 → 1.18.5-pr.416.226

package/dist/index.js

@@ -2596,6 +2596,209 @@ import { existsSync as existsSync2 } from "fs";
 import { homedir as homedir2 } from "os";
 import { isAbsolute, join as join2 } from "path";
 
+// lib/message-ids.ts
+var MESSAGE_REF_REGEX = /^m(\d{4,5})$/;
+var BLOCK_REF_REGEX = /^b([1-9]\d*)$/;
+var MESSAGE_ID_TAG_NAME = "dcp-message-id";
+var MESSAGE_REF_WIDTH = 5;
+var MESSAGE_REF_MIN_INDEX = 1;
+var MESSAGE_REF_MAX_INDEX = 99999;
+function formatMessageRef(index) {
+  if (!Number.isInteger(index) || index < MESSAGE_REF_MIN_INDEX || index > MESSAGE_REF_MAX_INDEX) {
+    throw new Error(
+      `Message ID index out of bounds: ${index}. Supported range is ${MESSAGE_REF_MIN_INDEX}-${MESSAGE_REF_MAX_INDEX}.`
+    );
+  }
+  return `m${index.toString().padStart(MESSAGE_REF_WIDTH, "0")}`;
+}
+function formatBlockRef(blockId) {
+  if (!Number.isInteger(blockId) || blockId < 1) {
+    throw new Error(`Invalid block ID: ${blockId}`);
+  }
+  return `b${blockId}`;
+}
+function parseMessageRef(ref) {
+  const normalized = ref.trim().toLowerCase();
+  const match = normalized.match(MESSAGE_REF_REGEX);
+  if (!match) {
+    return null;
+  }
+  const index = Number.parseInt(match[1], 10);
+  if (!Number.isInteger(index)) {
+    return null;
+  }
+  if (index < MESSAGE_REF_MIN_INDEX || index > MESSAGE_REF_MAX_INDEX) {
+    return null;
+  }
+  return index;
+}
+function migrateMessageRef(ref) {
+  const index = parseMessageRef(ref);
+  return index === null ? ref : formatMessageRef(index);
+}
+function parseBlockRef(ref) {
+  const normalized = ref.trim().toLowerCase();
+  const match = normalized.match(BLOCK_REF_REGEX);
+  if (!match) {
+    return null;
+  }
+  const id = Number.parseInt(match[1], 10);
+  return Number.isInteger(id) ? id : null;
+}
+function parseBoundaryId(id) {
+  const normalized = id.trim().toLowerCase();
+  const messageIndex = parseMessageRef(normalized);
+  if (messageIndex !== null) {
+    return {
+      kind: "message",
+      ref: formatMessageRef(messageIndex),
+      index: messageIndex
+    };
+  }
+  const blockId = parseBlockRef(normalized);
+  if (blockId !== null) {
+    return {
+      kind: "compressed-block",
+      ref: formatBlockRef(blockId),
+      blockId
+    };
+  }
+  return null;
+}
+function escapeXmlAttribute(value) {
+  return value.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+}
+function formatMessageIdTag(ref, attributes) {
+  const serializedAttributes = Object.entries(attributes || {}).sort(([left], [right]) => left.localeCompare(right)).map(([name, value]) => {
+    if (name.trim().length === 0 || typeof value !== "string" || value.length === 0) {
+      return "";
+    }
+    return ` ${name}="${escapeXmlAttribute(value)}"`;
+  }).join("");
+  return `
+<${MESSAGE_ID_TAG_NAME}${serializedAttributes}>${ref}</${MESSAGE_ID_TAG_NAME}>`;
+}
+function formatTokenSize(tokens) {
+  if (tokens < 1e3) return String(tokens);
+  if (tokens < 1e4) return `${(tokens / 1e3).toFixed(1)}K`;
+  return `${Math.round(tokens / 1e3)}K`;
+}
+function classifyMessageType(parts) {
+  let hasTool = false;
+  let hasText = false;
+  let hasReasoning = false;
+  const toolNames = [];
+  for (const part of parts) {
+    if (part.type === "tool") {
+      hasTool = true;
+      if (typeof part.tool === "string" && !toolNames.includes(part.tool)) {
+        toolNames.push(part.tool);
+      }
+    } else if (part.type === "text") {
+      hasText = true;
+    } else if (part.type === "reasoning") {
+      hasReasoning = true;
+    }
+  }
+  if (hasTool) {
+    return toolNames.length > 0 ? `tool:${toolNames.join(",")}` : "tool";
+  }
+  if (hasReasoning && !hasText) return "reasoning";
+  return "text";
+}
+function assignMessageRefs(state, messages) {
+  let assigned = 0;
+  let skippedSubAgentPrompt = false;
+  for (const message of messages) {
+    if (isIgnoredUserMessage(message)) {
+      continue;
+    }
+    if (state.isSubAgent && !skippedSubAgentPrompt && message.info.role === "user") {
+      skippedSubAgentPrompt = true;
+      continue;
+    }
+    const rawMessageId = message.info.id;
+    if (typeof rawMessageId !== "string" || rawMessageId.length === 0) {
+      continue;
+    }
+    if (rawMessageId.startsWith("msg_dcp_summary_") || rawMessageId.startsWith("msg_dcp_text_")) {
+      continue;
+    }
+    const existingRef = state.messageIds.byRawId.get(rawMessageId);
+    if (existingRef) {
+      if (state.messageIds.byRef.get(existingRef) !== rawMessageId) {
+        state.messageIds.byRef.set(existingRef, rawMessageId);
+      }
+      continue;
+    }
+    const ref = allocateNextMessageRef(state);
+    state.messageIds.byRawId.set(rawMessageId, ref);
+    state.messageIds.byRef.set(ref, rawMessageId);
+    assigned++;
+  }
+  return assigned;
+}
+function repairNonMonotonicMessageRefs(state, messages) {
+  const eligible = messages.filter((message) => {
+    if (isIgnoredUserMessage(message)) return false;
+    const id = message.info.id;
+    return typeof id === "string" && id.length > 0 && !id.startsWith("msg_dcp_summary_") && !id.startsWith("msg_dcp_text_");
+  });
+  let previous = 0;
+  let corrupted = false;
+  for (const message of eligible) {
+    const ref = state.messageIds.byRawId.get(message.info.id);
+    const parsed = ref ? parseMessageRef(ref) : null;
+    if (parsed === null) continue;
+    if (parsed <= previous) {
+      corrupted = true;
+      break;
+    }
+    previous = parsed;
+  }
+  if (!corrupted) return false;
+  const oldRawIds = [...state.messageIds.byRawId.keys()];
+  state.messageIds.byRawId.clear();
+  state.messageIds.byRef.clear();
+  state.messageIds.nextRef = 1;
+  for (const message of eligible) {
+    const rawId = message.info.id;
+    const ref = allocateNextMessageRef(state);
+    state.messageIds.byRawId.set(rawId, ref);
+    state.messageIds.byRef.set(ref, rawId);
+  }
+  for (const rawId of oldRawIds) {
+    if (state.messageIds.byRawId.has(rawId)) continue;
+    const ref = allocateNextMessageRef(state);
+    state.messageIds.byRawId.set(rawId, ref);
+    state.messageIds.byRef.set(ref, rawId);
+  }
+  for (const block of state.prune.messages.blocksById.values()) {
+    const ids = [.../* @__PURE__ */ new Set([...block.effectiveMessageIds, ...block.directMessageIds])].filter((id) => state.messageIds.byRawId.has(id)).sort(
+      (left, right) => (parseMessageRef(state.messageIds.byRawId.get(left)) ?? 0) - (parseMessageRef(state.messageIds.byRawId.get(right)) ?? 0)
+    );
+    if (ids.length === 0) continue;
+    block.startId = state.messageIds.byRawId.get(ids[0]);
+    block.endId = state.messageIds.byRawId.get(ids[ids.length - 1]);
+  }
+  state.prune.messages.structureVersion = (state.prune.messages.structureVersion ?? 0) + 1;
+  return true;
+}
+function allocateNextMessageRef(state) {
+  let candidate = Number.isInteger(state.messageIds.nextRef) ? Math.max(MESSAGE_REF_MIN_INDEX, state.messageIds.nextRef) : MESSAGE_REF_MIN_INDEX;
+  while (candidate <= MESSAGE_REF_MAX_INDEX) {
+    const ref = formatMessageRef(candidate);
+    if (!state.messageIds.byRef.has(ref)) {
+      state.messageIds.nextRef = candidate + 1;
+      return ref;
+    }
+    candidate++;
+  }
+  throw new Error(
+    `Message ID alias capacity exceeded. Cannot allocate more than ${formatMessageRef(MESSAGE_REF_MAX_INDEX)} aliases in this session.`
+  );
+}
+
 // lib/state/utils.ts
 var isMessageCompacted = (state, msg) => {
   if (!isMessageWithInfo(msg)) {
@@ -2747,8 +2950,10 @@ function loadPruneMessagesState(persisted) {
         mode: block.mode === "range" || block.mode === "message" ? block.mode : void 0,
         topic: typeof block.topic === "string" ? block.topic : "",
         batchTopic: typeof block.batchTopic === "string" ? block.batchTopic : typeof block.topic === "string" ? block.topic : "",
-        startId: typeof block.startId === "string" ? block.startId : "",
-        endId: typeof block.endId === "string" ? block.endId : "",
+        // [Issue #415] Migrate legacy 4-digit boundary refs (pre-1.1.0 state)
+        // to canonical 5-digit form, matching the messageIds ref migration.
+        startId: typeof block.startId === "string" ? migrateMessageRef(block.startId) : "",
+        endId: typeof block.endId === "string" ? migrateMessageRef(block.endId) : "",
         anchorMessageId: typeof block.anchorMessageId === "string" ? block.anchorMessageId : "",
         compressMessageId: typeof block.compressMessageId === "string" ? block.compressMessageId : "",
         compressCallId: typeof block.compressCallId === "string" ? block.compressCallId : void 0,
@@ -2975,8 +3180,8 @@ function saveSessionState(sessionState, logger, sessionName) {
     queue = { pending: [], waiters: [], draining: false };
     saveQueues.set(key, queue);
   }
-  const promise = new Promise((resolve2, reject) => {
-    queue.waiters.push({ resolve: resolve2, reject });
+  const promise = new Promise((resolve3, reject) => {
+    queue.waiters.push({ resolve: resolve3, reject });
   });
   queue.pending.push({
     sessionId: sessionState.sessionId,
@@ -3100,205 +3305,6 @@ import { existsSync as existsSync3 } from "fs";
 import { join as join3 } from "path";
 import { cwd } from "process";
 
-// lib/message-ids.ts
-var MESSAGE_REF_REGEX = /^m(\d{4,5})$/;
-var BLOCK_REF_REGEX = /^b([1-9]\d*)$/;
-var MESSAGE_ID_TAG_NAME = "dcp-message-id";
-var MESSAGE_REF_WIDTH = 5;
-var MESSAGE_REF_MIN_INDEX = 1;
-var MESSAGE_REF_MAX_INDEX = 99999;
-function formatMessageRef(index) {
-  if (!Number.isInteger(index) || index < MESSAGE_REF_MIN_INDEX || index > MESSAGE_REF_MAX_INDEX) {
-    throw new Error(
-      `Message ID index out of bounds: ${index}. Supported range is ${MESSAGE_REF_MIN_INDEX}-${MESSAGE_REF_MAX_INDEX}.`
-    );
-  }
-  return `m${index.toString().padStart(MESSAGE_REF_WIDTH, "0")}`;
-}
-function formatBlockRef(blockId) {
-  if (!Number.isInteger(blockId) || blockId < 1) {
-    throw new Error(`Invalid block ID: ${blockId}`);
-  }
-  return `b${blockId}`;
-}
-function parseMessageRef(ref) {
-  const normalized = ref.trim().toLowerCase();
-  const match = normalized.match(MESSAGE_REF_REGEX);
-  if (!match) {
-    return null;
-  }
-  const index = Number.parseInt(match[1], 10);
-  if (!Number.isInteger(index)) {
-    return null;
-  }
-  if (index < MESSAGE_REF_MIN_INDEX || index > MESSAGE_REF_MAX_INDEX) {
-    return null;
-  }
-  return index;
-}
-function parseBlockRef(ref) {
-  const normalized = ref.trim().toLowerCase();
-  const match = normalized.match(BLOCK_REF_REGEX);
-  if (!match) {
-    return null;
-  }
-  const id = Number.parseInt(match[1], 10);
-  return Number.isInteger(id) ? id : null;
-}
-function parseBoundaryId(id) {
-  const normalized = id.trim().toLowerCase();
-  const messageIndex = parseMessageRef(normalized);
-  if (messageIndex !== null) {
-    return {
-      kind: "message",
-      ref: formatMessageRef(messageIndex),
-      index: messageIndex
-    };
-  }
-  const blockId = parseBlockRef(normalized);
-  if (blockId !== null) {
-    return {
-      kind: "compressed-block",
-      ref: formatBlockRef(blockId),
-      blockId
-    };
-  }
-  return null;
-}
-function escapeXmlAttribute(value) {
-  return value.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
-}
-function formatMessageIdTag(ref, attributes) {
-  const serializedAttributes = Object.entries(attributes || {}).sort(([left], [right]) => left.localeCompare(right)).map(([name, value]) => {
-    if (name.trim().length === 0 || typeof value !== "string" || value.length === 0) {
-      return "";
-    }
-    return ` ${name}="${escapeXmlAttribute(value)}"`;
-  }).join("");
-  return `
-<${MESSAGE_ID_TAG_NAME}${serializedAttributes}>${ref}</${MESSAGE_ID_TAG_NAME}>`;
-}
-function formatTokenSize(tokens) {
-  if (tokens < 1e3) return String(tokens);
-  if (tokens < 1e4) return `${(tokens / 1e3).toFixed(1)}K`;
-  return `${Math.round(tokens / 1e3)}K`;
-}
-function classifyMessageType(parts) {
-  let hasTool = false;
-  let hasText = false;
-  let hasReasoning = false;
-  const toolNames = [];
-  for (const part of parts) {
-    if (part.type === "tool") {
-      hasTool = true;
-      if (typeof part.tool === "string" && !toolNames.includes(part.tool)) {
-        toolNames.push(part.tool);
-      }
-    } else if (part.type === "text") {
-      hasText = true;
-    } else if (part.type === "reasoning") {
-      hasReasoning = true;
-    }
-  }
-  if (hasTool) {
-    return toolNames.length > 0 ? `tool:${toolNames.join(",")}` : "tool";
-  }
-  if (hasReasoning && !hasText) return "reasoning";
-  return "text";
-}
-function assignMessageRefs(state, messages) {
-  let assigned = 0;
-  let skippedSubAgentPrompt = false;
-  for (const message of messages) {
-    if (isIgnoredUserMessage(message)) {
-      continue;
-    }
-    if (state.isSubAgent && !skippedSubAgentPrompt && message.info.role === "user") {
-      skippedSubAgentPrompt = true;
-      continue;
-    }
-    const rawMessageId = message.info.id;
-    if (typeof rawMessageId !== "string" || rawMessageId.length === 0) {
-      continue;
-    }
-    if (rawMessageId.startsWith("msg_dcp_summary_") || rawMessageId.startsWith("msg_dcp_text_")) {
-      continue;
-    }
-    const existingRef = state.messageIds.byRawId.get(rawMessageId);
-    if (existingRef) {
-      if (state.messageIds.byRef.get(existingRef) !== rawMessageId) {
-        state.messageIds.byRef.set(existingRef, rawMessageId);
-      }
-      continue;
-    }
-    const ref = allocateNextMessageRef(state);
-    state.messageIds.byRawId.set(rawMessageId, ref);
-    state.messageIds.byRef.set(ref, rawMessageId);
-    assigned++;
-  }
-  return assigned;
-}
-function repairNonMonotonicMessageRefs(state, messages) {
-  const eligible = messages.filter((message) => {
-    if (isIgnoredUserMessage(message)) return false;
-    const id = message.info.id;
-    return typeof id === "string" && id.length > 0 && !id.startsWith("msg_dcp_summary_") && !id.startsWith("msg_dcp_text_");
-  });
-  let previous = 0;
-  let corrupted = false;
-  for (const message of eligible) {
-    const ref = state.messageIds.byRawId.get(message.info.id);
-    const parsed = ref ? parseMessageRef(ref) : null;
-    if (parsed === null) continue;
-    if (parsed <= previous) {
-      corrupted = true;
-      break;
-    }
-    previous = parsed;
-  }
-  if (!corrupted) return false;
-  const oldRawIds = [...state.messageIds.byRawId.keys()];
-  state.messageIds.byRawId.clear();
-  state.messageIds.byRef.clear();
-  state.messageIds.nextRef = 1;
-  for (const message of eligible) {
-    const rawId = message.info.id;
-    const ref = allocateNextMessageRef(state);
-    state.messageIds.byRawId.set(rawId, ref);
-    state.messageIds.byRef.set(ref, rawId);
-  }
-  for (const rawId of oldRawIds) {
-    if (state.messageIds.byRawId.has(rawId)) continue;
-    const ref = allocateNextMessageRef(state);
-    state.messageIds.byRawId.set(rawId, ref);
-    state.messageIds.byRef.set(ref, rawId);
-  }
-  for (const block of state.prune.messages.blocksById.values()) {
-    const ids = [.../* @__PURE__ */ new Set([...block.effectiveMessageIds, ...block.directMessageIds])].filter((id) => state.messageIds.byRawId.has(id)).sort(
-      (left, right) => (parseMessageRef(state.messageIds.byRawId.get(left)) ?? 0) - (parseMessageRef(state.messageIds.byRawId.get(right)) ?? 0)
-    );
-    if (ids.length === 0) continue;
-    block.startId = state.messageIds.byRawId.get(ids[0]);
-    block.endId = state.messageIds.byRawId.get(ids[ids.length - 1]);
-  }
-  state.prune.messages.structureVersion = (state.prune.messages.structureVersion ?? 0) + 1;
-  return true;
-}
-function allocateNextMessageRef(state) {
-  let candidate = Number.isInteger(state.messageIds.nextRef) ? Math.max(MESSAGE_REF_MIN_INDEX, state.messageIds.nextRef) : MESSAGE_REF_MIN_INDEX;
-  while (candidate <= MESSAGE_REF_MAX_INDEX) {
-    const ref = formatMessageRef(candidate);
-    if (!state.messageIds.byRef.has(ref)) {
-      state.messageIds.nextRef = candidate + 1;
-      return ref;
-    }
-    candidate++;
-  }
-  throw new Error(
-    `Message ID alias capacity exceeded. Cannot allocate more than ${formatMessageRef(MESSAGE_REF_MAX_INDEX)} aliases in this session.`
-  );
-}
-
 // lib/compress/state.ts
 var DEFAULT_PROMOTION_THRESHOLD = 5;
 var COMPRESSED_BLOCK_HEADER = "[Compressed conversation section]";
@@ -4770,7 +4776,11 @@ function restoreForkCompressionState(state, forkMessages, parent, parentMessages
       directMessageIds,
       directToolIds,
       effectiveMessageIds,
-      effectiveToolIds
+      effectiveToolIds,
+      // [Issue #415] The parent record is raw persisted JSON; legacy
+      // 4-digit boundary refs must be normalized like every other ref.
+      startId: typeof block.startId === "string" ? migrateMessageRef(block.startId) : block.startId,
+      endId: typeof block.endId === "string" ? migrateMessageRef(block.endId) : block.endId
     });
   }
   const activeParentIds = new Set(parent.prune.messages.activeBlockIds);
@@ -10283,6 +10293,102 @@ function extractTextContent(msg) {
   return textParts.join(" ").replace(/\s+/g, " ").trim();
 }
 
+// lib/compress/tofile-target.ts
+import * as fsp from "fs/promises";
+import { homedir as homedir3, tmpdir } from "os";
+import { dirname as dirname2, join as join5, relative, resolve } from "path";
+async function resolveSafeToFileTarget(targetPath, options) {
+  const osTmp = tmpdir();
+  const allowedDirs = options?.allowedDirs ?? [osTmp, join5(homedir3(), ".cache", "opencode")];
+  const dirList = allowedDirs.join(" or ");
+  if (typeof targetPath !== "string" || targetPath.length === 0) {
+    return {
+      ok: false,
+      error: `Error: toFile path must be under ${dirList}. Got: ${targetPath}`
+    };
+  }
+  const resolvedPath = resolve(targetPath);
+  const lexicallyAllowed = allowedDirs.some((dir) => {
+    const rel = relative(resolve(dir), resolvedPath);
+    return rel === "" || !rel.startsWith("..") && !rel.startsWith("/") && !isWinAbsolute(rel);
+  });
+  if (!lexicallyAllowed) {
+    return {
+      ok: false,
+      error: `Error: toFile path must be under ${dirList}. Got: ${targetPath}`
+    };
+  }
+  let realAncestor = null;
+  const tail = [];
+  let current = resolvedPath;
+  while (true) {
+    try {
+      realAncestor = await fsp.realpath(current);
+      break;
+    } catch (err) {
+      const code = err.code;
+      if (code !== "ENOENT" && code !== "ENOTDIR") {
+        return {
+          ok: false,
+          error: `Error: cannot validate toFile path: ${err.message}`
+        };
+      }
+      const parent = dirname2(current);
+      if (parent === current) {
+        return {
+          ok: false,
+          error: `Error: cannot validate toFile path: no existing ancestor found`
+        };
+      }
+      tail.unshift(basename(current));
+      current = parent;
+    }
+  }
+  const physicalPath = tail.length > 0 ? join5(realAncestor, ...tail) : realAncestor;
+  const realAllowedDirs = [];
+  for (const dir of allowedDirs) {
+    try {
+      realAllowedDirs.push(await fsp.realpath(resolve(dir)));
+    } catch {
+    }
+  }
+  const physicallyAllowed = realAllowedDirs.some((dir) => containsOrIs(dir, physicalPath));
+  if (!physicallyAllowed) {
+    return {
+      ok: false,
+      error: `Error: toFile path resolves outside the allowed directories via a symlink. Got: ${targetPath}`
+    };
+  }
+  try {
+    const stat = await fsp.lstat(resolvedPath);
+    if (stat.isSymbolicLink()) {
+      return {
+        ok: false,
+        error: `Error: toFile target exists as a symlink and will not be followed. Got: ${targetPath}`
+      };
+    }
+  } catch (err) {
+    const code = err.code;
+    if (code !== "ENOENT") {
+      return {
+        ok: false,
+        error: `Error: cannot validate toFile path: ${err.message}`
+      };
+    }
+  }
+  return { ok: true, filePath: resolvedPath };
+}
+function isWinAbsolute(p) {
+  return /^[a-zA-Z]:[\\/]/.test(p);
+}
+function basename(p) {
+  return p.split(/[\\/]/).filter(Boolean).pop() ?? p;
+}
+function containsOrIs(root, p) {
+  const rel = relative(root, p);
+  return rel === "" || !rel.startsWith("..") && !rel.startsWith("/") && !isWinAbsolute(rel);
+}
+
 // lib/compress/decompress.ts
 async function prepareDecompressSession(ctx, toolCtx) {
   await toolCtx.ask({
@@ -10316,7 +10422,13 @@ function resolveTargets(args, state, rawMessages, logger) {
   if (mode.mode === "block") {
     return resolveSingleBlockTarget(messagesState, args.blockId);
   }
-  return resolveRangeTarget(state, rawMessages, args.startId, args.endId, logger);
+  return resolveRangeTarget(
+    state,
+    rawMessages,
+    args.startId,
+    args.endId,
+    logger
+  );
 }
 function resolveSingleBlockTarget(messagesState, blockIdArg) {
   const targetBlockId = parseBlockIdArg(blockIdArg);
@@ -10428,11 +10540,21 @@ IMPORTANT:
 - Do NOT call this tool in parallel with compress \u2014 their state mutations may conflict.`;
 function buildSchema2() {
   return {
-    blockId: tool3.schema.string().optional().describe('Block reference to decompress (e.g., "b0", "b2"). Mutually exclusive with startId/endId.'),
-    startId: tool3.schema.string().optional().describe('Range start: message ref (e.g., "m00150") or block ref (e.g., "b2"). Used with endId.'),
-    endId: tool3.schema.string().optional().describe('Range end: message ref (e.g., "m00200") or block ref (e.g., "b5"). Used with startId.'),
-    toFile: tool3.schema.string().optional().describe("If provided, writes restored content to this file path instead of inflating context. Block stays compressed. Path must be under /tmp or ~/.cache/opencode/. Example: '/tmp/block52.txt'"),
-    full: tool3.schema.boolean().optional().describe("If true, restores ALL content down to original messages (multi-level decompress). Default: false \u2014 restores one tier up (e.g., decompressing a T2 block restores T1 summaries, not raw messages). Use full:true only when you need the exact original content and have context budget for it.")
+    blockId: tool3.schema.string().optional().describe(
+      'Block reference to decompress (e.g., "b0", "b2"). Mutually exclusive with startId/endId.'
+    ),
+    startId: tool3.schema.string().optional().describe(
+      'Range start: message ref (e.g., "m00150") or block ref (e.g., "b2"). Used with endId.'
+    ),
+    endId: tool3.schema.string().optional().describe(
+      'Range end: message ref (e.g., "m00200") or block ref (e.g., "b5"). Used with startId.'
+    ),
+    toFile: tool3.schema.string().optional().describe(
+      "If provided, writes restored content to this file path instead of inflating context. Block stays compressed. Path must be under /tmp or ~/.cache/opencode/. Example: '/tmp/block52.txt'"
+    ),
+    full: tool3.schema.boolean().optional().describe(
+      "If true, restores ALL content down to original messages (multi-level decompress). Default: false \u2014 restores one tier up (e.g., decompressing a T2 block restores T1 summaries, not raw messages). Use full:true only when you need the exact original content and have context budget for it."
+    )
   };
 }
 function extractMessageId(m) {
@@ -10473,7 +10595,12 @@ function createDecompressTool(factoryCtx) {
       const contextUsageBefore = effectiveLimitBefore ? Math.round(
         getCurrentTokenUsage(ctx.state, rawMessages) / effectiveLimitBefore.limit * 100
       ) : void 0;
-      const resolved = resolveTargets(args, ctx.state, rawMessages, ctx.logger);
+      const resolved = resolveTargets(
+        args,
+        ctx.state,
+        rawMessages,
+        ctx.logger
+      );
       if (!resolved.ok) {
         return resolved.error;
       }
@@ -10489,19 +10616,9 @@ function createDecompressTool(factoryCtx) {
       }
       if (args.toFile) {
         const targetPath = args.toFile;
-        const os = await import("os");
-        const path = await import("path");
-        const allowedDirs = [
-          os.tmpdir() + "/",
-          path.join(os.homedir(), ".cache", "opencode") + "/"
-        ];
-        const resolvedPath = path.resolve(targetPath);
-        const isAllowed = allowedDirs.some((dir) => {
-          const rel = path.relative(dir, resolvedPath);
-          return rel === "" || !rel.startsWith("..") && !path.isAbsolute(rel);
-        });
-        if (!isAllowed) {
-          return `Error: toFile path must be under ${os.tmpdir()} or ~/.cache/opencode/. Got: ${targetPath}`;
+        const safe = await resolveSafeToFileTarget(targetPath);
+        if (!safe.ok) {
+          return safe.error;
         }
         const msgIdSet = /* @__PURE__ */ new Set();
         for (const block of activeBlocks) {
@@ -10511,7 +10628,8 @@ 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 fsp2 = await import("fs/promises");
+        const { constants } = await import("fs");
         let fileContent;
         let sourceNote;
         if (lines2.length > 0) {
@@ -10521,9 +10639,19 @@ function createDecompressTool(factoryCtx) {
           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 flags = constants.O_WRONLY | constants.O_CREAT | constants.O_TRUNC | (process.platform === "win32" ? 0 : constants.O_NOFOLLOW);
+        try {
+          const handle = await fsp2.open(safe.filePath, flags, 384);
+          try {
+            await handle.write(Buffer.from(fileContent, "utf-8"));
+          } finally {
+            await handle.close();
+          }
+        } catch (err) {
+          return `Error: toFile write failed: ${err.message}`;
+        }
         const displayIds2 = targets.map((t) => `b${t.displayId}`).join(", ");
-        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.`;
+        return `Block(s) ${displayIds2} content (${sourceNote}, ${fileContent.length} chars) written to ${safe.filePath}. Block(s) stay compressed \u2014 context unchanged. Use read tool to access specific parts.`;
       }
       const availability = checkDecompressSourceAvailability(
         messagesState,
@@ -10620,7 +10748,9 @@ function isLiveBlock(block) {
   return block.active && !block.deactivatedByUser && !block.deactivatedByUserDeep;
 }
 function rangeKey(startId, endId) {
-  return `${startId}::${endId}`;
+  const s = typeof startId === "string" ? migrateMessageRef(startId) : startId;
+  const e = typeof endId === "string" ? migrateMessageRef(endId) : endId;
+  return `${s}::${e}`;
 }
 function rewriteCompressInput(part, liveKeys) {
   if (part.type !== "tool") return null;
@@ -11355,10 +11485,10 @@ function hideFailedCompressCalls(messages) {
 
 // lib/logger.ts
 import { writeFile as writeFile2, mkdir as mkdir2 } from "fs/promises";
-import { join as join5 } from "path";
+import { join as join6 } from "path";
 import { existsSync as existsSync5 } from "fs";
-import { homedir as homedir3 } from "os";
-var LOG_VERSION = true ? "1.18.4-pr.488.221" : "dev";
+import { homedir as homedir4 } from "os";
+var LOG_VERSION = true ? "1.18.5-pr.416.226" : "dev";
 var LEVEL_RANK = {
   debug: 10,
   info: 20,
@@ -11378,8 +11508,8 @@ var Logger = class {
   constructor(enabled, level) {
     const resolved = level !== void 0 && LEVEL_RANK[level] !== void 0 ? level : void 0;
     this.level = resolved ?? (enabled ? "debug" : "warn");
-    const configHome = process.env.XDG_CONFIG_HOME || join5(homedir3(), ".config");
-    this.logDir = join5(configHome, "opencode", "logs", "acp");
+    const configHome = process.env.XDG_CONFIG_HOME || join6(homedir4(), ".config");
+    this.logDir = join6(configHome, "opencode", "logs", "acp");
   }
   /** Back-compat view of the old flag: true only at full debug verbosity. */
   get enabled() {
@@ -11441,11 +11571,11 @@ var Logger = class {
       const dataStr = this.formatData(data);
       const logLine = `${timestamp} ${level.padEnd(5)} ${component}: ${message}${dataStr ? " | " + dataStr : ""} | v=${LOG_VERSION}
 `;
-      const dailyLogDir = join5(this.logDir, "daily");
+      const dailyLogDir = join6(this.logDir, "daily");
       if (!existsSync5(dailyLogDir)) {
         await mkdir2(dailyLogDir, { recursive: true });
       }
-      const logFile = join5(dailyLogDir, `${(/* @__PURE__ */ new Date()).toISOString().split("T")[0]}.log`);
+      const logFile = join6(dailyLogDir, `${(/* @__PURE__ */ new Date()).toISOString().split("T")[0]}.log`);
       await writeFile2(logFile, logLine, { flag: "a" });
     } catch (error) {
     }
@@ -11556,7 +11686,7 @@ var Logger = class {
   async saveContext(sessionId, messages) {
     if (this.level !== "debug") return;
     try {
-      const contextDir = join5(this.logDir, "context", sessionId);
+      const contextDir = join6(this.logDir, "context", sessionId);
       if (!existsSync5(contextDir)) {
         await mkdir2(contextDir, { recursive: true });
       }
@@ -11564,9 +11694,9 @@ var Logger = class {
         (msg) => msg.parts && msg.parts.length > 0
       );
       const timestamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
-      const contextFile = join5(contextDir, `${timestamp}.json`);
+      const contextFile = join6(contextDir, `${timestamp}.json`);
       await writeFile2(contextFile, JSON.stringify(minimized, null, 2));
-      const versionFile = join5(contextDir, "_version");
+      const versionFile = join6(contextDir, "_version");
       if (!existsSync5(versionFile)) {
         await writeFile2(versionFile, LOG_VERSION);
       }
@@ -11577,8 +11707,8 @@ var Logger = class {
 
 // lib/prompts/store.ts
 import { existsSync as existsSync6, mkdirSync as mkdirSync3, readFileSync as readFileSync2, writeFileSync as writeFileSync3, statSync as statSync3 } from "fs";
-import { join as join6, dirname as dirname2 } from "path";
-import { homedir as homedir4 } from "os";
+import { join as join7, dirname as dirname3 } from "path";
+import { homedir as homedir5 } from "os";
 
 // lib/prompts/system.ts
 var ACP_STATUS_TOOL_LINE_RANGES = `- \`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.`;
@@ -11885,7 +12015,7 @@ function createBundledRuntimePrompts(candidatesEnabled) {
 function findOpencodeDir2(startDir) {
   let current = startDir;
   while (current !== "/") {
-    const candidate = join6(current, ".opencode");
+    const candidate = join7(current, ".opencode");
     if (existsSync6(candidate)) {
       try {
         if (statSync3(candidate).isDirectory()) {
@@ -11894,7 +12024,7 @@ function findOpencodeDir2(startDir) {
       } catch {
       }
     }
-    const parent = dirname2(current);
+    const parent = dirname3(current);
     if (parent === current) {
       break;
     }
@@ -11903,13 +12033,13 @@ function findOpencodeDir2(startDir) {
   return null;
 }
 function resolvePromptPaths(workingDirectory) {
-  const configHome = process.env.XDG_CONFIG_HOME || join6(homedir4(), ".config");
-  const globalRoot = join6(configHome, "opencode", "acp-prompts");
-  const defaultsDir = join6(globalRoot, "defaults");
-  const globalOverridesDir = join6(globalRoot, "overrides");
-  const configDirOverridesDir = process.env.OPENCODE_CONFIG_DIR ? join6(process.env.OPENCODE_CONFIG_DIR, "acp-prompts", "overrides") : null;
+  const configHome = process.env.XDG_CONFIG_HOME || join7(homedir5(), ".config");
+  const globalRoot = join7(configHome, "opencode", "acp-prompts");
+  const defaultsDir = join7(globalRoot, "defaults");
+  const globalOverridesDir = join7(globalRoot, "overrides");
+  const configDirOverridesDir = process.env.OPENCODE_CONFIG_DIR ? join7(process.env.OPENCODE_CONFIG_DIR, "acp-prompts", "overrides") : null;
   const opencodeDir = findOpencodeDir2(workingDirectory);
-  const projectOverridesDir = opencodeDir ? join6(opencodeDir, "acp-prompts", "overrides") : null;
+  const projectOverridesDir = opencodeDir ? join7(opencodeDir, "acp-prompts", "overrides") : null;
   return {
     defaultsDir,
     globalOverridesDir,
@@ -12082,16 +12212,16 @@ var PromptStore = class {
     const candidates = [];
     if (this.paths.projectOverridesDir) {
       candidates.push({
-        path: join6(this.paths.projectOverridesDir, fileName)
+        path: join7(this.paths.projectOverridesDir, fileName)
       });
     }
     if (this.paths.configDirOverridesDir) {
       candidates.push({
-        path: join6(this.paths.configDirOverridesDir, fileName)
+        path: join7(this.paths.configDirOverridesDir, fileName)
       });
     }
     candidates.push({
-      path: join6(this.paths.globalOverridesDir, fileName)
+      path: join7(this.paths.globalOverridesDir, fileName)
     });
     return candidates;
   }
@@ -12115,7 +12245,7 @@ var PromptStore = class {
       const managedContent = buildDefaultPromptFileContent(
         bundledEditable || bundledPrompts[definition.runtimeField]
       );
-      const filePath = join6(this.paths.defaultsDir, definition.fileName);
+      const filePath = join7(this.paths.defaultsDir, definition.fileName);
       try {
         const existing = readFileIfExists(filePath);
         if (existing === managedContent) {
@@ -12129,7 +12259,7 @@ var PromptStore = class {
         });
       }
     }
-    const readmePath = join6(this.paths.defaultsDir, DEFAULTS_README_FILE);
+    const readmePath = join7(this.paths.defaultsDir, DEFAULTS_README_FILE);
     const readmeContent = buildDefaultsReadmeContent();
     try {
       const existing = readFileIfExists(readmePath);
@@ -12672,7 +12802,7 @@ ${report}`;
 // lib/commands/export.ts
 import * as fs2 from "fs/promises";
 import { existsSync as existsSync7 } from "fs";
-import { dirname as dirname3, isAbsolute as isAbsolute2, join as join7, resolve } from "path";
+import { dirname as dirname4, isAbsolute as isAbsolute2, join as join8, resolve as resolve2 } from "path";
 var ALL_TIERS = [1, 2, 3];
 var TIER_NAMES = {
   1: "Tier 1 \u2014 Capture",
@@ -12785,7 +12915,7 @@ function parseTiers(raw) {
 }
 function resolveDefaultOutputPath(sessionId, cwd2) {
   const short = (sessionId || "session").slice(0, 8);
-  return join7(cwd2, ".opencode", `acp-export-${short}.md`);
+  return join8(cwd2, ".opencode", `acp-export-${short}.md`);
 }
 function formatTokens2(n) {
   if (!Number.isFinite(n) || n <= 0) return "0";
@@ -12913,9 +13043,9 @@ async function handleExportCommand(ctx, args) {
     return;
   }
   const cwd2 = ctx.workingDirectory || process.cwd();
-  const targetPath = options.outputPath !== "" ? isAbsolute2(options.outputPath) ? options.outputPath : resolve(cwd2, options.outputPath) : resolveDefaultOutputPath(sessionId, cwd2);
+  const targetPath = options.outputPath !== "" ? isAbsolute2(options.outputPath) ? options.outputPath : resolve2(cwd2, options.outputPath) : resolveDefaultOutputPath(sessionId, cwd2);
   try {
-    const dir = dirname3(targetPath);
+    const dir = dirname4(targetPath);
     if (!existsSync7(dir)) {
       await fs2.mkdir(dir, { recursive: true });
     }
@@ -13945,7 +14075,7 @@ function configureClientAuth(client) {
 
 // lib/update.ts
 import { readFile as readFile2, rm } from "fs/promises";
-import { basename, dirname as dirname4, join as join8 } from "path";
+import { basename as basename2, dirname as dirname5, join as join9 } from "path";
 import { fileURLToPath } from "url";
 var PACKAGE_NAME = "opencode-acp";
 function startAutoUpdate(ctx, enabled, logger) {
@@ -13992,7 +14122,7 @@ async function checkAutoUpdate(signal, logger) {
     logger?.info("Auto-update skipped: package dir not found");
     return { updated: false };
   }
-  const pkg = await readPackageJson(join8(packageDir, "package.json"));
+  const pkg = await readPackageJson(join9(packageDir, "package.json"));
   if (!pkg?.name || !pkg.version) {
     logger?.info("Auto-update skipped: package.json unreadable", { packageDir });
     return { updated: false };
@@ -14031,21 +14161,21 @@ async function checkAutoUpdate(signal, logger) {
   return { updated: true, name: pkg.name, current: pkg.version, latest };
 }
 async function findPackageDir(name) {
-  let dir = dirname4(fileURLToPath(import.meta.url));
+  let dir = dirname5(fileURLToPath(import.meta.url));
   for (; ; ) {
-    const pkg = await readPackageJson(join8(dir, "package.json"));
+    const pkg = await readPackageJson(join9(dir, "package.json"));
     if (pkg?.name === name) return dir;
-    const parent = dirname4(dir);
+    const parent = dirname5(dir);
     if (parent === dir) return void 0;
     dir = parent;
   }
 }
 async function updateTarget(packageDir, name) {
-  const packageParent = dirname4(packageDir);
-  const nodeModulesDir = basename(packageParent).startsWith("@") ? dirname4(packageParent) : packageParent;
-  if (basename(nodeModulesDir) !== "node_modules") return void 0;
-  const wrapperDir = dirname4(nodeModulesDir);
-  const wrapperPkg = await readPackageJson(join8(wrapperDir, "package.json"));
+  const packageParent = dirname5(packageDir);
+  const nodeModulesDir = basename2(packageParent).startsWith("@") ? dirname5(packageParent) : packageParent;
+  if (basename2(nodeModulesDir) !== "node_modules") return void 0;
+  const wrapperDir = dirname5(nodeModulesDir);
+  const wrapperPkg = await readPackageJson(join9(wrapperDir, "package.json"));
   const spec = wrapperSpec(wrapperDir, name) ?? wrapperPkg?.dependencies?.[name];
   if (!spec || !isAutoUpdatableSpec(spec)) return void 0;
   return { removeDir: wrapperDir, spec };
@@ -14053,13 +14183,13 @@ async function updateTarget(packageDir, name) {
 function wrapperSpec(wrapperDir, name) {
   if (name.startsWith("@")) {
     const [scope, pkg] = name.split("/");
-    if (!scope || !pkg || basename(dirname4(wrapperDir)) !== scope) return void 0;
+    if (!scope || !pkg || basename2(dirname5(wrapperDir)) !== scope) return void 0;
     const prefix2 = `${pkg}@`;
-    const base2 = basename(wrapperDir);
+    const base2 = basename2(wrapperDir);
     return base2.startsWith(prefix2) ? base2.slice(prefix2.length) : void 0;
   }
   const prefix = `${name}@`;
-  const base = basename(wrapperDir);
+  const base = basename2(wrapperDir);
   return base.startsWith(prefix) ? base.slice(prefix.length) : void 0;
 }
 function isAutoUpdatableSpec(spec) {
@@ -14156,7 +14286,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.4-pr.488.221" : "dev",
+    version: true ? "1.18.5-pr.416.226" : "dev",
     workspace: ctx.directory,
     logLevel: logger.level,
     debug: config.debug,