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

package/dist/index.js

@@ -4990,6 +4990,30 @@ async function updatePerTurnState(state, logger, messages) {
   state.currentTurn = countTurns(state, messages);
 }
 var REGISTRY_SOFT_CAP = 32;
+function createSessionGuard() {
+  const locks = /* @__PURE__ */ new Map();
+  return async (sessionId, fn) => {
+    const previous = locks.get(sessionId) ?? Promise.resolve();
+    let release;
+    const released = new Promise((resolve2) => {
+      release = resolve2;
+    });
+    const chain = previous.then(() => released);
+    locks.set(sessionId, chain);
+    try {
+      await previous;
+    } catch {
+    }
+    try {
+      return await fn();
+    } finally {
+      release();
+      if (locks.get(sessionId) === chain) {
+        locks.delete(sessionId);
+      }
+    }
+  };
+}
 var SessionStateRegistry = class {
   constructor(logger, projectDir) {
     this.logger = logger;
@@ -5049,9 +5073,17 @@ var SessionStateRegistry = class {
   get size() {
     return this.states.size;
   }
+  // [Issue #404] Per-session FIFO mutex serializing same-session mutations
+  // (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 (assigned synchronously before any await),
-  // so repeat calls for the same session never re-reset.
+  // state.sessionId === sessionId, and coalesces concurrent inits per state
+  // object ([Issue #404]), so racing calls for the same session never
+  // re-reset or observe partially initialized state.
   async getOrCreate(client, sessionId, messages, config) {
     let state = this.states.get(sessionId);
     if (!state) {
@@ -5185,10 +5217,33 @@ function resetSessionState(state) {
   state.imagePruneDone = false;
   state.stickyTruncations = {};
 }
+var inflightInits = /* @__PURE__ */ new WeakMap();
 async function ensureSessionInitialized(client, state, sessionId, logger, messages, config, projectDir) {
+  const inflight = inflightInits.get(state);
+  if (inflight) {
+    await inflight;
+    return;
+  }
   if (state.sessionId === sessionId) {
     return;
   }
+  const run = runSessionInitialization(
+    client,
+    state,
+    sessionId,
+    logger,
+    messages,
+    config,
+    projectDir
+  );
+  inflightInits.set(state, run);
+  try {
+    await run;
+  } finally {
+    inflightInits.delete(state);
+  }
+}
+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;
@@ -8199,240 +8254,243 @@ function createCompressRangeTool(factoryCtx) {
         }
       }
       const callId = typeof toolCtx.callID === "string" ? toolCtx.callID : void 0;
-      const { rawMessages, searchContext } = await prepareSession(
-        ctx0,
-        toolCtx,
-        `Compress Range: ${input.topic ?? "(batch)"}`
-      );
-      const { providerId, modelId } = getModelInfo(rawMessages);
-      const ctx = {
-        ...ctx0,
-        config: applyCompressOverrides(ctx0.config, providerId, modelId)
-      };
-      const needsSmartPlan = requiresSmartPlan(
-        ctx.config.compress.smartPlanRequired === true,
-        input.content
-      );
-      if (needsSmartPlan && input.content.length !== 1) {
-        throw new Error(
-          'Raw-message compression accepts exactly one canonical SMART PLAN range per call. Use the latest ACP nudge, or call acp_status({scope:"uncompressed"}) to refresh it.'
-        );
-      }
-      const { plans: filteredPlans, totalChars } = prepareExecutableRangePlans(
-        input,
-        searchContext,
-        ctx.state,
-        ctx.config,
-        ctx.logger
-      );
-      if (needsSmartPlan) {
-        validateSmartPlan(
-          toolCtx.sessionID,
-          filteredPlans[0].entry.startId,
-          filteredPlans[0].entry.endId,
-          filteredPlans[0].selection.messageIds,
-          totalChars,
-          ctx.state.prune.messages.structureVersion ?? 0
-        );
-      }
-      const notifications = [];
-      let preparedPlans = [];
-      let totalCompressedMessages = 0;
-      for (const plan of filteredPlans) {
-        const parsedPlaceholders = parseBlockPlaceholders(plan.entry.summary);
-        validateSummaryPlaceholders(
-          parsedPlaceholders,
-          plan.selection.requiredBlockIds,
-          plan.selection.startReference,
-          plan.selection.endReference,
-          searchContext.summaryByBlockId,
-          ctx.logger
+      const run = async () => {
+        const { rawMessages, searchContext } = await prepareSession(
+          ctx0,
+          toolCtx,
+          `Compress Range: ${input.topic ?? "(batch)"}`
         );
-        const injected = injectBlockPlaceholders(
-          plan.entry.summary,
-          parsedPlaceholders,
-          searchContext.summaryByBlockId,
-          plan.selection.startReference,
-          plan.selection.endReference
-        );
-        const summaryWithUsers = appendProtectedUserMessages(
-          injected.expandedSummary,
-          plan.selection,
-          searchContext,
-          ctx.state,
-          ctx.config.compress.protectUserMessages
+        const { providerId, modelId } = getModelInfo(rawMessages);
+        const ctx = {
+          ...ctx0,
+          config: applyCompressOverrides(ctx0.config, providerId, modelId)
+        };
+        const needsSmartPlan = requiresSmartPlan(
+          ctx.config.compress.smartPlanRequired === true,
+          input.content
         );
-        const summaryWithPromptInfo = appendProtectedPromptInfo(
-          summaryWithUsers,
-          plan.selection,
+        if (needsSmartPlan && input.content.length !== 1) {
+          throw new Error(
+            'Raw-message compression accepts exactly one canonical SMART PLAN range per call. Use the latest ACP nudge, or call acp_status({scope:"uncompressed"}) to refresh it.'
+          );
+        }
+        const { plans: filteredPlans, totalChars } = prepareExecutableRangePlans(
+          input,
           searchContext,
           ctx.state,
-          ctx.config.compress.protectTags
-        );
-        const summaryWithTools = await appendProtectedTools(
-          ctx.client,
-          ctx.state,
-          summaryWithPromptInfo,
-          plan.selection,
-          searchContext,
-          ctx.config.compress.protectedTools,
-          ctx.config.protectedFilePatterns
-        );
-        const completedSummary = appendMissingBlockSummaries(
-          summaryWithTools,
-          [],
-          searchContext.summaryByBlockId,
-          injected.consumedBlockIds
-        );
-        const boundaryConsumed = extractBoundaryConsumedBlocks2(
-          plan.selection.startReference,
-          plan.selection.endReference
+          ctx.config,
+          ctx.logger
         );
-        const seenConsumed = /* @__PURE__ */ new Set();
-        const mergeConsumedBlockIds = [
-          ...plan.selection.requiredBlockIds,
-          ...boundaryConsumed
-        ].filter((id) => {
-          if (seenConsumed.has(id)) return false;
-          seenConsumed.add(id);
-          return true;
-        });
-        preparedPlans.push({
-          entry: plan.entry,
-          selection: plan.selection,
-          anchorMessageId: plan.anchorMessageId,
-          finalSummary: appendArchivedImagePointers(
-            completedSummary.expandedSummary,
+        if (needsSmartPlan) {
+          validateSmartPlan(
+            toolCtx.sessionID,
+            filteredPlans[0].entry.startId,
+            filteredPlans[0].entry.endId,
+            filteredPlans[0].selection.messageIds,
+            totalChars,
+            ctx.state.prune.messages.structureVersion ?? 0
+          );
+        }
+        const notifications = [];
+        let preparedPlans = [];
+        let totalCompressedMessages = 0;
+        for (const plan of filteredPlans) {
+          const parsedPlaceholders = parseBlockPlaceholders(plan.entry.summary);
+          validateSummaryPlaceholders(
+            parsedPlaceholders,
+            plan.selection.requiredBlockIds,
+            plan.selection.startReference,
+            plan.selection.endReference,
+            searchContext.summaryByBlockId,
+            ctx.logger
+          );
+          const injected = injectBlockPlaceholders(
+            plan.entry.summary,
+            parsedPlaceholders,
+            searchContext.summaryByBlockId,
+            plan.selection.startReference,
+            plan.selection.endReference
+          );
+          const summaryWithUsers = appendProtectedUserMessages(
+            injected.expandedSummary,
+            plan.selection,
+            searchContext,
+            ctx.state,
+            ctx.config.compress.protectUserMessages
+          );
+          const summaryWithPromptInfo = appendProtectedPromptInfo(
+            summaryWithUsers,
+            plan.selection,
+            searchContext,
+            ctx.state,
+            ctx.config.compress.protectTags
+          );
+          const summaryWithTools = await appendProtectedTools(
+            ctx.client,
+            ctx.state,
+            summaryWithPromptInfo,
             plan.selection,
+            searchContext,
+            ctx.config.compress.protectedTools,
+            ctx.config.protectedFilePatterns
+          );
+          const completedSummary = appendMissingBlockSummaries(
+            summaryWithTools,
+            [],
+            searchContext.summaryByBlockId,
+            injected.consumedBlockIds
+          );
+          const boundaryConsumed = extractBoundaryConsumedBlocks2(
+            plan.selection.startReference,
+            plan.selection.endReference
+          );
+          const seenConsumed = /* @__PURE__ */ new Set();
+          const mergeConsumedBlockIds = [
+            ...plan.selection.requiredBlockIds,
+            ...boundaryConsumed
+          ].filter((id) => {
+            if (seenConsumed.has(id)) return false;
+            seenConsumed.add(id);
+            return true;
+          });
+          preparedPlans.push({
+            entry: plan.entry,
+            selection: plan.selection,
+            anchorMessageId: plan.anchorMessageId,
+            finalSummary: appendArchivedImagePointers(
+              completedSummary.expandedSummary,
+              plan.selection,
+              ctx.state,
+              ctx.config.compress.images?.enabled !== false
+            ),
+            consumedBlockIds: mergeConsumedBlockIds
+          });
+        }
+        const partition = partitionPhantomPlans(
+          identifyPhantomPlans(
             ctx.state,
-            ctx.config.compress.images?.enabled !== false
+            preparedPlans.map((p) => ({
+              messageIds: p.selection.messageIds,
+              consumedBlockIds: p.consumedBlockIds
+            }))
           ),
-          consumedBlockIds: mergeConsumedBlockIds
-        });
-      }
-      const partition = partitionPhantomPlans(
-        identifyPhantomPlans(
-          ctx.state,
-          preparedPlans.map((p) => ({
-            messageIds: p.selection.messageIds,
-            consumedBlockIds: p.consumedBlockIds
-          }))
-        ),
-        preparedPlans.length
-      );
-      let phantomSkipNotice = null;
-      if (partition.kind === "all-phantom") {
-        ctx.logger.warn("Batch compress: ALL entries phantom", {
-          totalCount: preparedPlans.length,
-          details: partition.details
-        });
-        throw new Error(buildPhantomErrorMessage(partition.details));
-      }
-      if (partition.kind === "partial") {
-        ctx.logger.warn("Batch compress: phantom entries detected", {
-          phantomCount: partition.dropIndices.length,
-          totalCount: preparedPlans.length,
-          phantomIndices: partition.dropIndices,
-          details: partition.details
-        });
-        const dropSet = new Set(partition.dropIndices);
-        preparedPlans = preparedPlans.filter((_, i) => !dropSet.has(i));
-        phantomSkipNotice = partition.notice;
-      }
-      const acknowledgeRisk = args.acknowledgeRisk === true;
-      const qualityGateRetryPendingBefore = ctx.state.qualityGateRetryPending;
-      const bypassQuality = acknowledgeRisk && ctx.state.qualityGateRetryPending;
-      const ignoredAcknowledgeRisk = acknowledgeRisk && !ctx.state.qualityGateRetryPending;
-      if (ignoredAcknowledgeRisk) {
-        ctx.logger.warn(
-          "compress: acknowledgeRisk ignored \u2014 no quality gate rejection pending"
+          preparedPlans.length
         );
-      }
-      ctx.state.qualityGateRetryPending = false;
-      if (!bypassQuality) {
-        for (const plan of preparedPlans) {
-          const result = evaluatePreCommitQuality(
-            rawMessages,
-            plan.selection.messageIds,
-            plan.selection.messageTokenById,
-            plan.finalSummary,
-            ctx.config,
-            ctx.logger
+        let phantomSkipNotice = null;
+        if (partition.kind === "all-phantom") {
+          ctx.logger.warn("Batch compress: ALL entries phantom", {
+            totalCount: preparedPlans.length,
+            details: partition.details
+          });
+          throw new Error(buildPhantomErrorMessage(partition.details));
+        }
+        if (partition.kind === "partial") {
+          ctx.logger.warn("Batch compress: phantom entries detected", {
+            phantomCount: partition.dropIndices.length,
+            totalCount: preparedPlans.length,
+            phantomIndices: partition.dropIndices,
+            details: partition.details
+          });
+          const dropSet = new Set(partition.dropIndices);
+          preparedPlans = preparedPlans.filter((_, i) => !dropSet.has(i));
+          phantomSkipNotice = partition.notice;
+        }
+        const acknowledgeRisk = args.acknowledgeRisk === true;
+        const qualityGateRetryPendingBefore = ctx.state.qualityGateRetryPending;
+        const bypassQuality = acknowledgeRisk && ctx.state.qualityGateRetryPending;
+        const ignoredAcknowledgeRisk = acknowledgeRisk && !ctx.state.qualityGateRetryPending;
+        if (ignoredAcknowledgeRisk) {
+          ctx.logger.warn(
+            "compress: acknowledgeRisk ignored \u2014 no quality gate rejection pending"
           );
-          if (result && !result.passed) {
-            ctx.state.qualityGateRetryPending = true;
-            throw buildQualityRejectionError(
-              {
-                startId: plan.entry.startId,
-                endId: plan.entry.endId,
-                summary: plan.finalSummary,
-                messageIds: plan.selection.messageIds,
-                messageTokenById: plan.selection.messageTokenById
-              },
-              result,
+        }
+        ctx.state.qualityGateRetryPending = false;
+        if (!bypassQuality) {
+          for (const plan of preparedPlans) {
+            const result = evaluatePreCommitQuality(
+              rawMessages,
+              plan.selection.messageIds,
+              plan.selection.messageTokenById,
+              plan.finalSummary,
+              ctx.config,
               ctx.logger
             );
+            if (result && !result.passed) {
+              ctx.state.qualityGateRetryPending = true;
+              throw buildQualityRejectionError(
+                {
+                  startId: plan.entry.startId,
+                  endId: plan.entry.endId,
+                  summary: plan.finalSummary,
+                  messageIds: plan.selection.messageIds,
+                  messageTokenById: plan.selection.messageTokenById
+                },
+                result,
+                ctx.logger
+              );
+            }
           }
         }
-      }
-      const snapshot = snapshotCompressionState(ctx.state);
-      const runId = allocateRunId(ctx.state);
-      try {
-        for (const preparedPlan of preparedPlans) {
-          const blockId = allocateBlockId(ctx.state);
-          const keepResult = resolveKeepMarkers(
-            preparedPlan.finalSummary,
-            rawMessages,
-            ctx.state,
-            ctx.config
-          );
-          preparedPlan.finalSummary = keepResult.summary;
-          const storedSummary = wrapCompressedSummary(blockId, preparedPlan.finalSummary);
-          const summaryTokens = countTokens2(storedSummary);
-          const applied = applyCompressionState(
-            ctx.state,
-            {
-              topic: preparedPlan.entry.topic ?? input.topic ?? "",
-              batchTopic: input.topic,
-              startId: preparedPlan.entry.startId,
-              endId: preparedPlan.entry.endId,
-              mode: "range",
+        const snapshot = snapshotCompressionState(ctx.state);
+        const runId = allocateRunId(ctx.state);
+        try {
+          for (const preparedPlan of preparedPlans) {
+            const blockId = allocateBlockId(ctx.state);
+            const keepResult = resolveKeepMarkers(
+              preparedPlan.finalSummary,
+              rawMessages,
+              ctx.state,
+              ctx.config
+            );
+            preparedPlan.finalSummary = keepResult.summary;
+            const storedSummary = wrapCompressedSummary(blockId, preparedPlan.finalSummary);
+            const summaryTokens = countTokens2(storedSummary);
+            const applied = applyCompressionState(
+              ctx.state,
+              {
+                topic: preparedPlan.entry.topic ?? input.topic ?? "",
+                batchTopic: input.topic,
+                startId: preparedPlan.entry.startId,
+                endId: preparedPlan.entry.endId,
+                mode: "range",
+                runId,
+                compressMessageId: toolCtx.messageID,
+                compressCallId: callId,
+                summaryTokens
+              },
+              preparedPlan.selection,
+              preparedPlan.anchorMessageId,
+              blockId,
+              storedSummary,
+              preparedPlan.consumedBlockIds,
+              ctx.config.gc
+            );
+            totalCompressedMessages += applied.messageIds.length;
+            notifications.push({
+              blockId,
               runId,
-              compressMessageId: toolCtx.messageID,
-              compressCallId: callId,
+              summary: preparedPlan.finalSummary,
               summaryTokens
-            },
-            preparedPlan.selection,
-            preparedPlan.anchorMessageId,
-            blockId,
-            storedSummary,
-            preparedPlan.consumedBlockIds,
-            ctx.config.gc
-          );
-          totalCompressedMessages += applied.messageIds.length;
-          notifications.push({
-            blockId,
-            runId,
-            summary: preparedPlan.finalSummary,
-            summaryTokens
-          });
+            });
+          }
+          await finalizeSession(ctx, toolCtx, rawMessages, notifications, input.topic);
+          if (needsSmartPlan) consumeSmartPlan(toolCtx.sessionID);
+        } catch (error) {
+          restoreCompressionState(ctx.state, snapshot);
+          ctx.state.qualityGateRetryPending = qualityGateRetryPendingBefore;
+          throw error;
         }
-        await finalizeSession(ctx, toolCtx, rawMessages, notifications, input.topic);
-        if (needsSmartPlan) consumeSmartPlan(toolCtx.sessionID);
-      } catch (error) {
-        restoreCompressionState(ctx.state, snapshot);
-        ctx.state.qualityGateRetryPending = qualityGateRetryPendingBefore;
-        throw error;
-      }
-      const skippedNote = phantomSkipNotice !== null ? `
+        const skippedNote = phantomSkipNotice !== null ? `
 \u26A0\uFE0F ${phantomSkipNotice}
 ` : "";
-      const ackNote = ignoredAcknowledgeRisk ? `
+        const ackNote = ignoredAcknowledgeRisk ? `
 \u26A0\uFE0F acknowledgeRisk was ignored: no quality gate rejection was pending, so quality checks ran normally. Only pass it when retrying immediately after a quality gate rejection.
 ` : "";
-      return `Compressed ${totalCompressedMessages} messages into ${COMPRESSED_BLOCK_HEADER}.${skippedNote}${ackNote}
+        return `Compressed ${totalCompressedMessages} messages into ${COMPRESSED_BLOCK_HEADER}.${skippedNote}${ackNote}
 IMPORTANT: This was an automatic context compression. You MUST continue your previous task exactly where you left off. Do NOT ask the user what to do next.
 \u{1F4A1} Tip: Use search_context('keyword') to find compressed content when you need it later.`;
+      };
+      return factoryCtx.registry.withSessionGuard(toolCtx.sessionID, () => run());
     }
   });
 }
@@ -10468,139 +10526,142 @@ function createDecompressTool(factoryCtx) {
     args: buildSchema2(),
     async execute(args, toolCtx) {
       const ctx = resolveToolContext(factoryCtx, toolCtx.sessionID);
-      const { rawMessages } = await prepareDecompressSession(ctx, toolCtx);
-      const effectiveLimitBefore = resolveEffectiveContextLimit(ctx.state, ctx.config);
-      const contextUsageBefore = effectiveLimitBefore ? Math.round(
-        getCurrentTokenUsage(ctx.state, rawMessages) / effectiveLimitBefore.limit * 100
-      ) : void 0;
-      const resolved = resolveTargets(args, ctx.state, rawMessages, ctx.logger);
-      if (!resolved.ok) {
-        return resolved.error;
-      }
-      const targets = resolved.targets;
-      const messagesState = ctx.state.prune.messages;
-      const activeBlocks = [];
-      for (const target of targets) {
-        for (const block of target.blocks) {
-          if (block.active) {
-            activeBlocks.push(block);
-          }
+      const run = async () => {
+        const { rawMessages } = await prepareDecompressSession(ctx, toolCtx);
+        const effectiveLimitBefore = resolveEffectiveContextLimit(ctx.state, ctx.config);
+        const contextUsageBefore = effectiveLimitBefore ? Math.round(
+          getCurrentTokenUsage(ctx.state, rawMessages) / effectiveLimitBefore.limit * 100
+        ) : void 0;
+        const resolved = resolveTargets(args, ctx.state, rawMessages, ctx.logger);
+        if (!resolved.ok) {
+          return resolved.error;
         }
-      }
-      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 targets = resolved.targets;
+        const messagesState = ctx.state.prune.messages;
+        const activeBlocks = [];
+        for (const target of targets) {
+          for (const block of target.blocks) {
+            if (block.active) {
+              activeBlocks.push(block);
+            }
+          }
         }
-        const msgIdSet = /* @__PURE__ */ new Set();
-        for (const block of activeBlocks) {
-          for (const id of block.effectiveMessageIds ?? []) {
-            msgIdSet.add(id);
+        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 msgIdSet = /* @__PURE__ */ new Set();
+          for (const block of activeBlocks) {
+            for (const id of block.effectiveMessageIds ?? []) {
+              msgIdSet.add(id);
+            }
+          }
+          const blockMessages = rawMessages.filter((m) => msgIdSet.has(extractMessageId(m)));
+          const lines2 = blockMessages.map(extractMessageText2);
+          const { writeFile: writeFile4 } = await import("fs/promises");
+          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 (${sourceNote}, ${fileContent.length} chars) written to ${targetPath}. Block(s) stay compressed \u2014 context unchanged. Use read tool to access specific parts.`;
         }
-        const blockMessages = rawMessages.filter((m) => msgIdSet.has(extractMessageId(m)));
-        const lines2 = blockMessages.map(extractMessageText2);
-        const { writeFile: writeFile4 } = await import("fs/promises");
-        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 (${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 availability = checkDecompressSourceAvailability(
+          messagesState,
+          targets,
+          { full: args.full === true },
+          new Set(rawMessages.map((m) => m.info.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
+        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);
+        for (const target of targets) {
+          deactivateCompressionTarget(messagesState, target, { full: args.full === true });
+        }
+        syncCompressionBlocks(ctx.state, ctx.logger, rawMessages);
+        const { restoredMessageCount, restoredTokens } = computeRestoredMessages(
+          messagesState,
+          activeMessagesBefore
+        );
+        const reactivatedBlockIds = computeReactivatedBlockIds(
+          messagesState,
+          activeBlockIdsBefore
+        );
+        ctx.state.stats.totalPruneTokens = Math.max(
+          0,
+          ctx.state.stats.totalPruneTokens - restoredTokens
+        );
+        const effectiveLimitAfter = resolveEffectiveContextLimit(ctx.state, ctx.config);
+        const contextUsageAfter = effectiveLimitAfter ? Math.round(
+          getCurrentTokenUsage(ctx.state, rawMessages) / effectiveLimitAfter.limit * 100
+        ) : void 0;
+        await finalizeDecompressSession(ctx);
+        const restoredContentPreview = buildRestoredContentPreview(
+          rawMessages,
+          activeMessagesBefore,
+          messagesState
+        );
+        const displayIds = targets.map((t) => `b${t.displayId}`).join(", ");
+        const lines = [];
+        const headerNoun = targets.length === 1 ? "block" : "blocks";
+        lines.push(
+          `Decompressed ${headerNoun} ${displayIds}. Restored ${restoredMessageCount} message(s) (~${formatTokenCount(restoredTokens)}).`
+        );
+        if (contextUsageBefore !== void 0 && contextUsageAfter !== void 0) {
+          lines.push(`Context usage: ${contextUsageBefore}% \u2192 ${contextUsageAfter}%.`);
+        }
+        if (reactivatedBlockIds.length > 0) {
+          const refs = reactivatedBlockIds.map((id) => `b${id}`).join(", ");
+          lines.push(`Also restored nested block(s): ${refs}.`);
+        }
+        if (restoredContentPreview) {
+          lines.push("");
+          lines.push("RESTORED CONTENT (condensed):");
+          lines.push(restoredContentPreview);
+        }
+        ctx.logger.info("Decompress tool completed", {
+          mode: typeof args.startId === "string" ? "range" : "block",
+          targetBlockIds: targets.map((t) => t.displayId),
+          restoredMessageCount,
+          restoredTokens,
+          reactivatedBlockIds
         });
-        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);
-      for (const target of targets) {
-        deactivateCompressionTarget(messagesState, target, { full: args.full === true });
-      }
-      syncCompressionBlocks(ctx.state, ctx.logger, rawMessages);
-      const { restoredMessageCount, restoredTokens } = computeRestoredMessages(
-        messagesState,
-        activeMessagesBefore
-      );
-      const reactivatedBlockIds = computeReactivatedBlockIds(
-        messagesState,
-        activeBlockIdsBefore
-      );
-      ctx.state.stats.totalPruneTokens = Math.max(
-        0,
-        ctx.state.stats.totalPruneTokens - restoredTokens
-      );
-      const effectiveLimitAfter = resolveEffectiveContextLimit(ctx.state, ctx.config);
-      const contextUsageAfter = effectiveLimitAfter ? Math.round(
-        getCurrentTokenUsage(ctx.state, rawMessages) / effectiveLimitAfter.limit * 100
-      ) : void 0;
-      await finalizeDecompressSession(ctx);
-      const restoredContentPreview = buildRestoredContentPreview(
-        rawMessages,
-        activeMessagesBefore,
-        messagesState
-      );
-      const displayIds = targets.map((t) => `b${t.displayId}`).join(", ");
-      const lines = [];
-      const headerNoun = targets.length === 1 ? "block" : "blocks";
-      lines.push(
-        `Decompressed ${headerNoun} ${displayIds}. Restored ${restoredMessageCount} message(s) (~${formatTokenCount(restoredTokens)}).`
-      );
-      if (contextUsageBefore !== void 0 && contextUsageAfter !== void 0) {
-        lines.push(`Context usage: ${contextUsageBefore}% \u2192 ${contextUsageAfter}%.`);
-      }
-      if (reactivatedBlockIds.length > 0) {
-        const refs = reactivatedBlockIds.map((id) => `b${id}`).join(", ");
-        lines.push(`Also restored nested block(s): ${refs}.`);
-      }
-      if (restoredContentPreview) {
-        lines.push("");
-        lines.push("RESTORED CONTENT (condensed):");
-        lines.push(restoredContentPreview);
-      }
-      ctx.logger.info("Decompress tool completed", {
-        mode: typeof args.startId === "string" ? "range" : "block",
-        targetBlockIds: targets.map((t) => t.displayId),
-        restoredMessageCount,
-        restoredTokens,
-        reactivatedBlockIds
-      });
-      return lines.join("\n");
+        return lines.join("\n");
+      };
+      return factoryCtx.registry.withSessionGuard(toolCtx.sessionID, () => run());
     }
   });
 }
@@ -11358,7 +11419,7 @@ import { writeFile as writeFile2, mkdir as mkdir2 } from "fs/promises";
 import { join as join5 } 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";
+var LOG_VERSION = true ? "1.18.5-pr.408.227" : "dev";
 var LEVEL_RANK = {
   debug: 10,
   info: 20,
@@ -13491,22 +13552,24 @@ function createSystemPromptHandler(registry4, logger, config, prompts) {
       logger.info("Skipping DCP system prompt injection for internal agent");
       return;
     }
-    if (input.model?.limit?.context) {
-      const limit = input.model.limit.context;
-      const providerID = input.model?.providerID;
-      const modelID = input.model?.id;
-      const changed = state.modelContextLimit !== limit || providerID !== void 0 && state.modelProviderID !== providerID || modelID !== void 0 && state.modelID !== modelID;
-      state.modelContextLimit = limit;
-      if (providerID !== void 0) {
-        state.modelProviderID = providerID;
-      }
-      if (modelID !== void 0) {
-        state.modelID = modelID;
-      }
-      if (changed) {
-        saveSessionState(state, logger).catch(() => {
-        });
-      }
+    if (input.model?.limit?.context && input.sessionID) {
+      await registry4.withSessionGuard(input.sessionID, () => {
+        const limit = input.model.limit.context;
+        const providerID = input.model?.providerID;
+        const modelID = input.model?.id;
+        const changed = state.modelContextLimit !== limit || providerID !== void 0 && state.modelProviderID !== providerID || modelID !== void 0 && state.modelID !== modelID;
+        state.modelContextLimit = limit;
+        if (providerID !== void 0) {
+          state.modelProviderID = providerID;
+        }
+        if (modelID !== void 0) {
+          state.modelID = modelID;
+        }
+        if (changed) {
+          saveSessionState(state, logger).catch(() => {
+          });
+        }
+      });
     }
     const effectivePermission = compressPermission(state, config);
     if (effectivePermission === "deny") {
@@ -13541,11 +13604,172 @@ function createChatMessageTransformHandler(client, registry4, logger, config, pr
       return;
     }
     const lastUserMessage = getLastUserMessage(messages);
-    let state;
+    const runPipeline = async (state) => {
+      syncCompressPermissionState(state, config, hostPermissions, output.messages);
+      if (state.isSubAgent && !config.allowSubAgents) {
+        return;
+      }
+      stripHallucinations(output.messages);
+      const dropReasoningModel = lastUserMessage?.info?.model;
+      const reasoningConfig = applyCompressOverrides(
+        config,
+        dropReasoningModel?.providerID ?? state.modelProviderID,
+        dropReasoningModel?.modelID ?? state.modelID
+      ).compress.reasoning;
+      if (reasoningConfig?.drop !== false) {
+        const droppedReasoning = dropCompressReasoning(
+          output.messages,
+          reasoningConfig?.threshold ?? DEFAULT_COMPRESS_REASONING.threshold
+        );
+        if (droppedReasoning > 0) {
+          logger.debug("compress.reasoning: dropped oversized reasoning parts", {
+            dropped: droppedReasoning,
+            threshold: reasoningConfig?.threshold ?? DEFAULT_COMPRESS_REASONING.threshold
+          });
+        }
+      }
+      ensureBuiltinFiltersRegistered();
+      const effectiveLimit = resolveEffectiveContextLimit(state, config);
+      applyMessageFilters(output.messages, config.messageFilters, logger, {
+        sessionId: state.sessionId ?? "",
+        isSubAgent: state.isSubAgent,
+        modelContextLimit: effectiveLimit?.limit
+      });
+      cacheSystemPromptTokens(state, output.messages);
+      assignMessageRefs(state, output.messages);
+      const imagesConfig = config.compress.images ?? DEFAULT_COMPRESS_IMAGES;
+      if (imagesConfig.enabled) {
+        const archivedImages = archiveSessionImages(
+          state,
+          output.messages,
+          imagesConfig,
+          logger
+        );
+        if (archivedImages > 0) {
+          saveSessionState(state, logger).catch(() => {
+          });
+        }
+        pruneImageArchive(state, imagesConfig, logger);
+      }
+      const activeBlockCountBefore = state.prune.messages.activeBlockIds.size;
+      const compressionStateChanged = syncCompressionBlocks(state, logger, output.messages);
+      if (compressionStateChanged || state.prune.messages.activeBlockIds.size !== activeBlockCountBefore) {
+        saveSessionState(state, logger).catch(() => {
+        });
+      }
+      syncToolCache(state, config, logger, output.messages);
+      buildToolIdList(state, output.messages);
+      const batchResult = runBatchCleanup(state, config, logger, output.messages);
+      if (batchResult.mergedCount > 0) {
+        saveSessionState(state, logger).catch(() => {
+        });
+      }
+      const prePruneTokens = getCurrentTokenUsage(state, output.messages);
+      const candidateMessages = config.compress.candidates === true ? output.messages.slice() : void 0;
+      prune(state, logger, config, output.messages);
+      hideConsumedCompressCalls(state, output.messages);
+      assignMessageRefs(state, output.messages);
+      const compressionPriorities = buildPriorityMap(config, state, output.messages);
+      prompts.reload();
+      injectCompressNudges(
+        state,
+        config,
+        logger,
+        output.messages,
+        prompts.getRuntimePrompts(),
+        compressionPriorities,
+        config.debug ? (text) => {
+          logger.debug(`[ACP Debug] Nudge injected:
+${text}`);
+          client.tui.showToast({
+            body: {
+              title: "ACP: Nudge Injected",
+              message: text.slice(0, 500),
+              variant: "info",
+              duration: 5e3
+            }
+          }).catch(() => {
+          });
+        } : void 0,
+        prePruneTokens,
+        candidateMessages
+      );
+      const emergencyTruncationEnabled = applyCompressOverrides(
+        config,
+        dropReasoningModel?.providerID ?? state.modelProviderID,
+        dropReasoningModel?.modelID ?? state.modelID
+      ).compress.emergencyTruncation;
+      if (emergencyTruncationEnabled === true) {
+        applyStickyTruncations(state, output.messages, logger);
+        const toolOutputsBefore = snapshotToolOutputs(output.messages);
+        truncateLargeToolOutputs(
+          state,
+          config,
+          logger,
+          output.messages.filter((message) => !isSyntheticMessage(message))
+        );
+        enforceContextBudget(state, config, logger, output.messages);
+        const frozenCount = recordStickyTruncations(
+          state,
+          output.messages,
+          toolOutputsBefore,
+          logger
+        );
+        if (frozenCount > 0) {
+          saveSessionState(state, logger).catch(() => {
+          });
+        }
+      }
+      injectMessageIds(state, config, output.messages, compressionPriorities);
+      hideFailedCompressCalls(output.messages);
+      stripStaleMetadata(output.messages);
+      dropEmptyMessages(output.messages);
+      const smartPlanEnabled = applyCompressOverrides(
+        config,
+        state.modelProviderID,
+        state.modelID
+      ).compress.smartPlanRequired;
+      if (state.sessionId && smartPlanEnabled === true) {
+        recordVisibleMessages(state.sessionId, output.messages);
+      }
+      const postTokens = getCurrentTokenUsage(state, output.messages);
+      if (postTokens !== void 0 && effectiveLimit) {
+        const budget = effectiveLimit.limit - (state.systemPromptTokens ?? 0) - OUTPUT_RESERVE_TOKENS;
+        if (postTokens > budget) {
+          logger.error(
+            "ACP hard guard: context exceeds model budget after in-flight reduction",
+            {
+              session: state.sessionId,
+              postTokens,
+              budget,
+              contextLimit: effectiveLimit.limit,
+              contextLimitSource: effectiveLimit.source,
+              hint: "request will likely be rejected; run /compact or start a new session"
+            }
+          );
+        }
+      }
+      logger.info("Chat transform complete", {
+        session: state.sessionId,
+        model: state.modelID,
+        messages: output.messages.length,
+        prePruneTokens,
+        postTokens,
+        contextLimit: effectiveLimit?.limit,
+        contextLimitSource: effectiveLimit?.source,
+        usagePct: postTokens !== void 0 && effectiveLimit ? `${(postTokens / effectiveLimit.limit * 100).toFixed(1)}%` : void 0,
+        nudged: state.nudges.shouldInjectThisTurn
+      });
+      if (state.sessionId) {
+        await logger.saveContext(state.sessionId, output.messages);
+      }
+    };
     if (!lastUserMessage) {
-      state = createSessionState();
-    } else {
-      state = await registry4.getOrCreate(
+      await runPipeline(createSessionState());
+      return;
+    }
+    await registry4.withSessionGuard(lastUserMessage.info.sessionID, async () => {
+      const state = await registry4.getOrCreate(
         client,
         lastUserMessage.info.sessionID,
         messages,
@@ -13602,165 +13826,8 @@ function createChatMessageTransformHandler(client, registry4, logger, config, pr
           }
         );
       }
-    }
-    syncCompressPermissionState(state, config, hostPermissions, output.messages);
-    if (state.isSubAgent && !config.allowSubAgents) {
-      return;
-    }
-    stripHallucinations(output.messages);
-    const dropReasoningModel = lastUserMessage?.info?.model;
-    const reasoningConfig = applyCompressOverrides(
-      config,
-      dropReasoningModel?.providerID ?? state.modelProviderID,
-      dropReasoningModel?.modelID ?? state.modelID
-    ).compress.reasoning;
-    if (reasoningConfig?.drop !== false) {
-      const droppedReasoning = dropCompressReasoning(
-        output.messages,
-        reasoningConfig?.threshold ?? DEFAULT_COMPRESS_REASONING.threshold
-      );
-      if (droppedReasoning > 0) {
-        logger.debug("compress.reasoning: dropped oversized reasoning parts", {
-          dropped: droppedReasoning,
-          threshold: reasoningConfig?.threshold ?? DEFAULT_COMPRESS_REASONING.threshold
-        });
-      }
-    }
-    ensureBuiltinFiltersRegistered();
-    const effectiveLimit = resolveEffectiveContextLimit(state, config);
-    applyMessageFilters(output.messages, config.messageFilters, logger, {
-      sessionId: state.sessionId ?? "",
-      isSubAgent: state.isSubAgent,
-      modelContextLimit: effectiveLimit?.limit
-    });
-    cacheSystemPromptTokens(state, output.messages);
-    assignMessageRefs(state, output.messages);
-    const imagesConfig = config.compress.images ?? DEFAULT_COMPRESS_IMAGES;
-    if (imagesConfig.enabled) {
-      const archivedImages = archiveSessionImages(
-        state,
-        output.messages,
-        imagesConfig,
-        logger
-      );
-      if (archivedImages > 0) {
-        saveSessionState(state, logger).catch(() => {
-        });
-      }
-      pruneImageArchive(state, imagesConfig, logger);
-    }
-    const activeBlockCountBefore = state.prune.messages.activeBlockIds.size;
-    const compressionStateChanged = syncCompressionBlocks(state, logger, output.messages);
-    if (compressionStateChanged || state.prune.messages.activeBlockIds.size !== activeBlockCountBefore) {
-      saveSessionState(state, logger).catch(() => {
-      });
-    }
-    syncToolCache(state, config, logger, output.messages);
-    buildToolIdList(state, output.messages);
-    const batchResult = runBatchCleanup(state, config, logger, output.messages);
-    if (batchResult.mergedCount > 0) {
-      saveSessionState(state, logger).catch(() => {
-      });
-    }
-    const prePruneTokens = getCurrentTokenUsage(state, output.messages);
-    const candidateMessages = config.compress.candidates === true ? output.messages.slice() : void 0;
-    prune(state, logger, config, output.messages);
-    hideConsumedCompressCalls(state, output.messages);
-    assignMessageRefs(state, output.messages);
-    const compressionPriorities = buildPriorityMap(config, state, output.messages);
-    prompts.reload();
-    injectCompressNudges(
-      state,
-      config,
-      logger,
-      output.messages,
-      prompts.getRuntimePrompts(),
-      compressionPriorities,
-      config.debug ? (text) => {
-        logger.debug(`[ACP Debug] Nudge injected:
-${text}`);
-        client.tui.showToast({
-          body: {
-            title: "ACP: Nudge Injected",
-            message: text.slice(0, 500),
-            variant: "info",
-            duration: 5e3
-          }
-        }).catch(() => {
-        });
-      } : void 0,
-      prePruneTokens,
-      candidateMessages
-    );
-    const emergencyTruncationEnabled = applyCompressOverrides(
-      config,
-      dropReasoningModel?.providerID ?? state.modelProviderID,
-      dropReasoningModel?.modelID ?? state.modelID
-    ).compress.emergencyTruncation;
-    if (emergencyTruncationEnabled === true) {
-      applyStickyTruncations(state, output.messages, logger);
-      const toolOutputsBefore = snapshotToolOutputs(output.messages);
-      truncateLargeToolOutputs(
-        state,
-        config,
-        logger,
-        output.messages.filter((message) => !isSyntheticMessage(message))
-      );
-      enforceContextBudget(state, config, logger, output.messages);
-      const frozenCount = recordStickyTruncations(
-        state,
-        output.messages,
-        toolOutputsBefore,
-        logger
-      );
-      if (frozenCount > 0) {
-        saveSessionState(state, logger).catch(() => {
-        });
-      }
-    }
-    injectMessageIds(state, config, output.messages, compressionPriorities);
-    hideFailedCompressCalls(output.messages);
-    stripStaleMetadata(output.messages);
-    dropEmptyMessages(output.messages);
-    const smartPlanEnabled = applyCompressOverrides(
-      config,
-      state.modelProviderID,
-      state.modelID
-    ).compress.smartPlanRequired;
-    if (state.sessionId && smartPlanEnabled === true) {
-      recordVisibleMessages(state.sessionId, output.messages);
-    }
-    const postTokens = getCurrentTokenUsage(state, output.messages);
-    if (postTokens !== void 0 && effectiveLimit) {
-      const budget = effectiveLimit.limit - (state.systemPromptTokens ?? 0) - OUTPUT_RESERVE_TOKENS;
-      if (postTokens > budget) {
-        logger.error(
-          "ACP hard guard: context exceeds model budget after in-flight reduction",
-          {
-            session: state.sessionId,
-            postTokens,
-            budget,
-            contextLimit: effectiveLimit.limit,
-            contextLimitSource: effectiveLimit.source,
-            hint: "request will likely be rejected; run /compact or start a new session"
-          }
-        );
-      }
-    }
-    logger.info("Chat transform complete", {
-      session: state.sessionId,
-      model: state.modelID,
-      messages: output.messages.length,
-      prePruneTokens,
-      postTokens,
-      contextLimit: effectiveLimit?.limit,
-      contextLimitSource: effectiveLimit?.source,
-      usagePct: postTokens !== void 0 && effectiveLimit ? `${(postTokens / effectiveLimit.limit * 100).toFixed(1)}%` : void 0,
-      nudged: state.nudges.shouldInjectThisTurn
+      await runPipeline(state);
     });
-    if (state.sessionId) {
-      await logger.saveContext(state.sessionId, output.messages);
-    }
   };
 }
 function buildHelpText() {
@@ -13787,8 +13854,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,
@@ -13892,18 +13962,27 @@ function createEventHandler(registry4, logger) {
         callId: part.callID,
         durationMs
       });
+      const settles = [];
       for (const state of registry4.all()) {
-        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
-          });
+        if (!state.sessionId) {
+          continue;
         }
+        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") {
@@ -14156,7 +14235,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.408.227" : "dev",
     workspace: ctx.directory,
     logLevel: logger.level,
     debug: config.debug,