opencode-acp 1.18.1-pr.409.168 → 1.18.1-pr.412.171

package/dist/index.js

@@ -2904,12 +2904,24 @@ function drainSaveQueue(key) {
   });
 }
 async function loadSessionState(sessionId, logger, storageDir) {
+  const filePath = getSessionFilePath(sessionId, storageDir);
+  let content;
   try {
-    const filePath = getSessionFilePath(sessionId, storageDir);
-    if (!existsSync2(filePath)) {
+    content = await fs.readFile(filePath, "utf-8");
+  } catch (error) {
+    if (error?.code === "ENOENT") {
       return null;
     }
-    const content = await fs.readFile(filePath, "utf-8");
+    if (error?.code === "EISDIR" || error?.code === "ENOTDIR") {
+      logger.warn("Invalid session state file location, ignoring", {
+        sessionId,
+        error: error?.message
+      });
+      return null;
+    }
+    throw error;
+  }
+  try {
     const state = JSON.parse(content);
     const hasPruneMessages = state?.prune?.messages && typeof state.prune.messages === "object";
     const hasNudgeFormat = state?.nudges && typeof state.nudges === "object";
@@ -4555,29 +4567,8 @@ function fingerprintMessage(message) {
   });
   return createHash("sha256").update(JSON.stringify({ role: message.info.role, parts })).digest("hex");
 }
-function normalizeParentMessageIds(messageIds) {
-  if (!messageIds) return void 0;
-  const migrate = (ref) => {
-    const parsed = parseMessageRef(ref);
-    return parsed !== null ? formatMessageRef(parsed) : ref;
-  };
-  const byRawId = {};
-  const byRef = {};
-  for (const [rawId, ref] of Object.entries(messageIds.byRawId || {})) {
-    const normalized = migrate(ref);
-    byRawId[rawId] = normalized;
-    byRef[normalized] = rawId;
-  }
-  for (const [ref, rawId] of Object.entries(messageIds.byRef || {})) {
-    const normalized = migrate(ref);
-    if (byRef[normalized] === void 0) {
-      byRef[normalized] = rawId;
-    }
-  }
-  return { byRef, byRawId, nextRef: messageIds.nextRef || 1 };
-}
 function mapForkIds(state, parent, parentMessages, forkMessages) {
-  const parentRefs = normalizeParentMessageIds(parent.messageIds)?.byRef;
+  const parentRefs = parent.messageIds?.byRef;
   if (!parentRefs) return null;
   const parentById = new Map(parentMessages.map((message) => [message.info.id, message]));
   const forkById = new Map(forkMessages.map((message) => [message.info.id, message]));
@@ -5044,6 +5035,22 @@ 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;
@@ -5066,10 +5073,7 @@ async function ensureSessionInitialized(client, state, sessionId, logger, messag
       let restored = 0;
       if (parentSessionId) {
         try {
-          let parent = await loadSessionState(parentSessionId, logger, state.storageDir);
-          if (!parent && state.storageDir) {
-            parent = await loadSessionState(parentSessionId, logger);
-          }
+          const parent = await loadSessionState(parentSessionId, logger);
           const response = parent ? await client.session.messages({ path: { id: parentSessionId } }) : void 0;
           const parentMessages = Array.isArray(response?.data) ? response.data : Array.isArray(response) ? response : [];
           if (parent && parentMessages.length > 0) {
@@ -5150,14 +5154,6 @@ async function ensureSessionInitialized(client, state, sessionId, logger, messag
   if (persistedAny._persistedLastCompaction !== void 0) {
     state.lastCompaction = Math.max(state.lastCompaction, persistedAny._persistedLastCompaction);
   }
-  const persistedBoundary = typeof persistedAny._persistedLastCompaction === "number" ? persistedAny._persistedLastCompaction : 0;
-  if (state.lastCompaction > persistedBoundary) {
-    resetOnCompaction(state);
-    logger.info("Restarted after native compaction - reset stale transient state", {
-      timestamp: state.lastCompaction,
-      persistedBoundary
-    });
-  }
   if (typeof persisted.modelContextLimit === "number" && persisted.modelContextLimit > 0) {
     state.modelContextLimit = persisted.modelContextLimit;
     state.modelProviderID = persisted.modelProviderID;
@@ -10576,7 +10572,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.409.168" : "dev";
+var LOG_VERSION = true ? "1.18.1-pr.412.171" : "dev";
 var LEVEL_RANK = {
   debug: 10,
   info: 20,
@@ -13260,7 +13256,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.409.168" : "dev",
+    version: true ? "1.18.1-pr.412.171" : "dev",
     workspace: ctx.directory,
     logLevel: logger.level,
     debug: config.debug,