opencode-acp 1.18.1-pr.408.164 → 1.18.1-pr.408.169

package/dist/index.js

@@ -4917,6 +4917,8 @@ var SessionStateRegistry = class {
   // (message transforms, compress/decompress tools, event-hook saves,
   // system-hook limit writes). Shared factory so test stubs compose the
   // exact same implementation instead of drifting.
+  // Not readonly: the session-guard wiring test wraps this to observe
+  // acquisition order (Issue #404).
   withSessionGuard = createSessionGuard();
   // Idempotent: ensureSessionInitialized returns immediately once
   // state.sessionId === sessionId, and coalesces concurrent inits per state
@@ -5059,7 +5061,15 @@ async function ensureSessionInitialized(client, state, sessionId, logger, messag
   if (state.sessionId === sessionId) {
     return;
   }
-  const run = runSessionInitialization(client, state, sessionId, logger, messages, config, projectDir);
+  const run = runSessionInitialization(
+    client,
+    state,
+    sessionId,
+    logger,
+    messages,
+    config,
+    projectDir
+  );
   inflightInits.set(state, run);
   try {
     await run;
@@ -10595,7 +10605,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.408.164" : "dev";
+var LOG_VERSION = true ? "1.18.1-pr.408.169" : "dev";
 var LEVEL_RANK = {
   debug: 10,
   info: 20,
@@ -12911,8 +12921,11 @@ function createCommandExecuteHandler(client, registry4, logger, config, workingD
         path: { id: input.sessionID }
       });
       const messages = filterMessages(messagesResponse.data || messagesResponse);
-      const state = await registry4.getOrCreate(client, input.sessionID, messages, config);
-      syncCompressPermissionState(state, config, hostPermissions, messages);
+      const state = await registry4.withSessionGuard(input.sessionID, async () => {
+        const s = await registry4.getOrCreate(client, input.sessionID, messages, config);
+        syncCompressPermissionState(s, config, hostPermissions, messages);
+        return s;
+      });
       const commandCtx = {
         client,
         state,
@@ -12990,23 +13003,27 @@ function createEventHandler(registry4, logger) {
         callId: part.callID,
         durationMs
       });
+      const settles = [];
       for (const state of registry4.all()) {
         if (!state.sessionId) {
           continue;
         }
-        await registry4.withSessionGuard(state.sessionId, async () => {
-          const updates = applyPendingCompressionDurations(state);
-          if (updates > 0) {
-            await saveSessionState(state, logger);
-            logger.info("Attached compression time to blocks", {
-              messageID: part.messageID,
-              callID: part.callID,
-              blocks: updates,
-              durationMs
-            });
-          }
-        });
+        settles.push(
+          registry4.withSessionGuard(state.sessionId, async () => {
+            const updates = applyPendingCompressionDurations(state);
+            if (updates > 0) {
+              await saveSessionState(state, logger);
+              logger.info("Attached compression time to blocks", {
+                messageID: part.messageID,
+                callID: part.callID,
+                blocks: updates,
+                durationMs
+              });
+            }
+          })
+        );
       }
+      await Promise.allSettled(settles);
       return;
     }
     if (part.state.status === "running") {
@@ -13290,7 +13307,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.408.164" : "dev",
+    version: true ? "1.18.1-pr.408.169" : "dev",
     workspace: ctx.directory,
     logLevel: logger.level,
     debug: config.debug,