opencode-acp 1.18.1-pr.412.173 → 1.18.1-pr.416.175

package/dist/index.js

@@ -2479,6 +2479,163 @@ 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 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)) {
@@ -2630,8 +2787,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,
@@ -2904,24 +3063,12 @@ function drainSaveQueue(key) {
   });
 }
 async function loadSessionState(sessionId, logger, storageDir) {
-  const filePath = getSessionFilePath(sessionId, storageDir);
-  let content;
   try {
-    content = await fs.readFile(filePath, "utf-8");
-  } catch (error) {
-    if (error?.code === "ENOENT") {
-      return null;
-    }
-    if (error?.code === "EISDIR" || error?.code === "ENOTDIR") {
-      logger.warn("Invalid session state file location, ignoring", {
-        sessionId,
-        error: error?.message
-      });
+    const filePath = getSessionFilePath(sessionId, storageDir);
+    if (!existsSync2(filePath)) {
       return null;
     }
-    throw error;
-  }
-  try {
+    const content = await fs.readFile(filePath, "utf-8");
     const state = JSON.parse(content);
     const hasPruneMessages = state?.prune?.messages && typeof state.prune.messages === "object";
     const hasNudgeFormat = state?.nudges && typeof state.nudges === "object";
@@ -2998,159 +3145,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 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]";
@@ -4622,7 +4616,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);
@@ -5035,22 +5033,6 @@ async function ensureSessionInitialized(client, state, sessionId, logger, messag
   if (state.sessionId === sessionId) {
     return;
   }
-  try {
-    await runSessionInitialization(
-      client,
-      state,
-      sessionId,
-      logger,
-      messages,
-      config,
-      projectDir
-    );
-  } catch (error) {
-    state.sessionId = null;
-    throw error;
-  }
-}
-async function runSessionInitialization(client, state, sessionId, logger, messages, config, projectDir) {
   resetSessionState(state);
   state.sessionId = sessionId;
   state.storageDir = config?.storagePath ? resolveStorageDir(config.storagePath, projectDir ?? cwd()) : void 0;
@@ -9906,7 +9888,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;
@@ -10572,7 +10556,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.1-pr.412.173" : "dev";
+var LOG_VERSION = true ? "1.18.1-pr.416.175" : "dev";
 var LEVEL_RANK = {
   debug: 10,
   info: 20,
@@ -13256,7 +13240,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.1-pr.412.173" : "dev",
+    version: true ? "1.18.1-pr.416.175" : "dev",
     workspace: ctx.directory,
     logLevel: logger.level,
     debug: config.debug,