@rynfar/meridian 1.71.0 → 1.72.0

package/dist/{cli-6c6dj69q.js → cli-ab7zkp1a.js}

@@ -28,7 +28,7 @@ import {
   profileBarHtml,
   profileBarJs,
   themeCss
-} from "./cli-8yp89fan.js";
+} from "./cli-hj61zpt7.js";
 import {
   CANONICAL_SONNET_MODEL,
   OAUTH_CLIENT_ID,
@@ -75,9 +75,10 @@ import {
   PRIORITY_ATTESTATION_HEADER,
   checkPluginConfigured,
   init_priorityAttestation,
+  isPluginlessOpenCodeRequest,
   notePluginlessOpenCodeRequest,
   verifyPriorityAttestation
-} from "./cli-zdbv40d5.js";
+} from "./cli-hxxy0m1z.js";
 import {
   __commonJS,
   __esm,
@@ -22111,6 +22112,9 @@ var WINDOWS_START_PATTERN = /^[1-9][0-9]{0,31}$/;
 var DARWIN_START_PATTERN = /^(Sun|Mon|Tue|Wed|Thu|Fri|Sat) (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) [ 0-3][0-9] [0-2][0-9]:[0-5][0-9]:[0-6][0-9] [0-9]{4}$/;
 var PROBE_TIMEOUT_MS = 2000;
 var WINDOWS_PROBE_TIMEOUT_MS = 1e4;
+function processIncarnationProbeBudgetMs() {
+  return process.platform === "win32" ? WINDOWS_PROBE_TIMEOUT_MS : PROBE_TIMEOUT_MS;
+}
 var cachedLocalBootIdentity;
 var cachedCurrentProcessIncarnation;
 function hashIdentity(value) {
@@ -23785,6 +23789,14 @@ function classifyError(errMsg, model) {
       message: `Claude Code process exited unexpectedly (code ${code}). Check proxy logs for details. If this persists, try 'claude login' to refresh authentication.`
     };
   }
+  if (lower.includes("timed out waiting for") && lower.includes(".lock") || lower.includes("ownership backlog is full") || lower.includes("ownership capacity is full")) {
+    const reason = lower.includes("ownership backlog is full") ? "the retirement backlog is full" : lower.includes("ownership capacity is full") ? "the ownership capacity is full" : "a bookkeeping lock is busy";
+    return {
+      status: 503,
+      type: "overloaded_error",
+      message: `Meridian's session bookkeeping is saturated: ${reason}. This is proxy load, not the request; retry shortly.`
+    };
+  }
   if (lower.includes("timeout") || lower.includes("timed out")) {
     return {
       status: 504,
@@ -32685,6 +32697,7 @@ import {
   closeSync as closeSync2,
   existsSync as existsSync6,
   fchmodSync,
+  fstatSync,
   fsyncSync as fsyncSync2,
   linkSync,
   lstatSync as lstatSync3,
@@ -33438,6 +33451,38 @@ function validateStoreMeta(value) {
     priorityRollbackMappings
   };
 }
+var storeDocumentCache;
+function readStoreDocumentCached(path3) {
+  let fd;
+  try {
+    const info = statSync(path3);
+    const cached2 = storeDocumentCache;
+    if (cached2?.path === path3 && cached2.ino === info.ino && cached2.mtimeMs === info.mtimeMs && cached2.size === info.size) {
+      return cached2.document;
+    }
+    fd = openSync2(path3, "r");
+    const identity = fstatSync(fd);
+    const document = parseStoreDocument(readFileSync6(fd, "utf8"));
+    storeDocumentCache = { path: path3, ino: identity.ino, mtimeMs: identity.mtimeMs, size: identity.size, document };
+    return document;
+  } catch (error51) {
+    if (error51.code !== "ENOENT")
+      throw error51;
+    storeDocumentCache = undefined;
+    return emptyStoreDocument();
+  } finally {
+    if (fd !== undefined)
+      closeSync2(fd);
+  }
+}
+function publishStoreCache(path3, document) {
+  try {
+    const info = statSync(path3);
+    storeDocumentCache = { path: path3, ino: info.ino, mtimeMs: info.mtimeMs, size: info.size, document };
+  } catch {
+    storeDocumentCache = undefined;
+  }
+}
 function readStoreDocumentStrict(path3) {
   let data;
   try {
@@ -33447,6 +33492,9 @@ function readStoreDocumentStrict(path3) {
       return emptyStoreDocument();
     throw error51;
   }
+  return parseStoreDocument(data);
+}
+function parseStoreDocument(data) {
   const parsed = JSON.parse(data);
   if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
     throw new Error("session store must contain a JSON object");
@@ -33479,13 +33527,13 @@ function readStoreDocumentStrict(path3) {
   return { sessions, meta: meta3 };
 }
 function readStoreStrict(path3) {
-  return readStoreDocumentStrict(path3).sessions;
+  return readStoreDocumentCached(path3).sessions;
 }
 function readSessionStoreSnapshot() {
   return readStoreStrict(getStorePath());
 }
 function readSessionStoreGenerationSnapshot(adapterSessionId, profileIds = []) {
-  const document = readStoreDocumentStrict(getStorePath());
+  const document = readStoreDocumentCached(getStorePath());
   const keys = new Set(Object.keys(document.sessions).filter((key) => key === adapterSessionId || key.endsWith(`:${adapterSessionId}`)));
   keys.add(adapterSessionId);
   for (const profileId of profileIds) {
@@ -33517,7 +33565,7 @@ function writeStore(path3, document) {
     fd = openSync2(tmp, "wx", 384);
     fchmodSync(fd, 384);
     const serialized = { [STORE_META_KEY]: document.meta, ...document.sessions };
-    writeFileSync2(fd, JSON.stringify(serialized, null, 2), "utf8");
+    writeFileSync2(fd, JSON.stringify(serialized), "utf8");
     fsyncSync2(fd);
     closeSync2(fd);
     fd = undefined;
@@ -33546,8 +33594,10 @@ function mutateStore(mutator) {
   const lock = acquireLock(`${path3}.lock`);
   try {
     const document = readStoreDocumentStrict(path3);
-    if (mutator(document))
+    if (mutator(document)) {
       writeStore(path3, document);
+      publishStoreCache(path3, document);
+    }
   } finally {
     releaseLock(lock);
   }
@@ -33558,7 +33608,7 @@ function hasLegacyUserDenialBoundary(session) {
 }
 function lookupSharedSessionResult(key) {
   try {
-    const document = readStoreDocumentStrict(getStorePath());
+    const document = readStoreDocumentCached(getStorePath());
     const session = document.sessions[key];
     const generation = keyGeneration(key, session, document.meta);
     if (!session)
@@ -33578,7 +33628,7 @@ function lookupSharedSession(key) {
 }
 function lookupPriorityAssignmentResult(routeKey) {
   try {
-    const document = readStoreDocumentStrict(getStorePath());
+    const document = readStoreDocumentCached(getStorePath());
     const assignment = document.meta.version === PRIORITY_STORE_META_VERSION ? document.meta.priorityAssignments[routeKey] : undefined;
     const generation = priorityAssignmentGeneration(routeKey, assignment, document.meta);
     const attempt = document.meta.version === PRIORITY_STORE_META_VERSION ? document.meta.priorityAttempts[routeKey] : undefined;
@@ -33591,7 +33641,7 @@ function lookupPriorityAssignmentResult(routeKey) {
 }
 function lookupSharedSessionByClaudeIdResult(claudeSessionId) {
   try {
-    const document = readStoreDocumentStrict(getStorePath());
+    const document = readStoreDocumentCached(getStorePath());
     let newest;
     let newestKey;
     for (const [key, session] of Object.entries(document.sessions)) {
@@ -33672,8 +33722,8 @@ function storeSharedSession(key, claudeSessionId, messageCount, lineageHash, mes
       passthroughToolCallAssistantUuid: passthroughToolCallAssistantUuid === undefined ? existing?.passthroughToolCallAssistantUuid : passthroughToolCallAssistantUuid ?? undefined,
       passthroughToolCallIds: passthroughToolCallIds === undefined ? existing?.passthroughToolCallIds : passthroughToolCallIds ?? undefined,
       contextUsage: contextUsage ?? existing?.contextUsage,
-      ...resolvedCurrentTranscript ? { currentTranscript: resolvedCurrentTranscript } : {},
-      ...previousTranscript ? { previousTranscript } : {},
+      ...resolvedCurrentTranscript ? { currentTranscript: { ...resolvedCurrentTranscript } } : {},
+      ...previousTranscript ? { previousTranscript: { ...previousTranscript } } : {},
       ...previousClaudeSessionId ? { previousClaudeSessionId } : {}
     };
     const maxEntries = getMaxStoredSessionsLimit();
@@ -34099,7 +34149,7 @@ function attachSharedTranscriptLocator(key, expectedClaudeSessionId, locator, ex
     if (expectedGeneration !== undefined && getStoredSessionGeneration(existing, key) !== expectedGeneration)
       return false;
     if (!sameTranscriptLocator(existing.currentTranscript, locator)) {
-      existing.currentTranscript = locator;
+      existing.currentTranscript = { ...locator };
       existing.revision = (existing.revision ?? 0) + 1;
       existing.generationId = randomUUID2();
       advanceKeySlot(key, meta3);
@@ -35092,7 +35142,7 @@ class CrossProcessTurnCoordinator {
 
 // src/proxy/sessionLifecycle.ts
 import { createHash as createHash9, randomUUID as randomUUID4 } from "node:crypto";
-import { spawn } from "node:child_process";
+import { spawn, spawnSync as spawnSync2 } from "node:child_process";
 import { realpathSync as realpathSync2 } from "node:fs";
 import {
   chmod as chmod2,
@@ -35119,9 +35169,11 @@ var DEFAULT_LOCK_RETRY_MS = 25;
 var DEFAULT_LOCK_STALE_MS = 60000;
 var DEFAULT_PREPARED_GRACE_MS = 5 * 60000;
 var DEFAULT_RETIRED_GRACE_MS = 11 * 60000;
+var DEFAULT_UNARMED_LEASE_TTL_MS = 11 * 60000;
 var DEFAULT_RETRY_BASE_MS = 5000;
 var DEFAULT_RETRY_MAX_MS = 60 * 60000;
 var DEFAULT_DELETE_TIMEOUT_MS = 30000;
+var SESSION_GC_NOT_FOUND_EXIT_CODE = 69;
 
 class SessionLifecycleError extends Error {
 }
@@ -35160,13 +35212,14 @@ async function acquireActiveTranscriptLease(locators, options = {}) {
   const token = randomUUID4();
   await withSidecarLock(options, async (paths) => {
     const sidecar = await readSidecar(paths.sidecar);
+    const unarmedLeaseTtlMs = nonNegativeOption(options.unarmedLeaseTtlMs, DEFAULT_UNARMED_LEASE_TTL_MS, "unarmedLeaseTtlMs");
     for (const [key, locator] of normalized) {
       const resource = sidecar.resources[key];
       if (!resource)
         throw new SessionLifecycleError(`cannot lease unjournaled transcript ${key}`);
       assertSameLocator(resource.locator, locator);
       assertExactLifecycleGeneration(resource, locator);
-      pruneDeadActiveLeases(resource);
+      pruneDeadActiveLeases(resource, nowMs(options), unarmedLeaseTtlMs);
       if (Object.values(resource.activeLeases ?? {}).some((lease) => lease.purpose !== "publication")) {
         throw new SessionLifecycleError(`transcript ${key} already has an active SDK writer`);
       }
@@ -35483,8 +35536,9 @@ async function reconcile(pins, options = {}) {
     const now = nowMs(options);
     const preparedCutoff = now - nonNegativeOption(options.preparedGraceMs, DEFAULT_PREPARED_GRACE_MS, "preparedGraceMs");
     let changed = false;
+    const unarmedLeaseTtlMs = nonNegativeOption(options.unarmedLeaseTtlMs, DEFAULT_UNARMED_LEASE_TTL_MS, "unarmedLeaseTtlMs");
     for (const resource of Object.values(sidecar.resources)) {
-      if (pruneDeadActiveLeases(resource))
+      if (pruneDeadActiveLeases(resource, now, unarmedLeaseTtlMs))
         changed = true;
     }
     let pending = pendingResourceCount(sidecar);
@@ -35493,7 +35547,7 @@ async function reconcile(pins, options = {}) {
     for (const resource of Object.values(sidecar.resources)) {
       if (resource.state !== "deleting")
         continue;
-      const executorDead = resource.deletionExecutor && resource.deletionProcessGroupId !== undefined ? processIncarnationIsDead(resource.deletionExecutor) && processGroupIsEmpty(resource.deletionProcessGroupId) : false;
+      const executorDead = resource.deletionExecutor && resource.deletionProcessGroupId !== undefined ? processIncarnationIsDead(resource.deletionExecutor) && (process.platform === "win32" || processGroupIsEmpty(resource.deletionProcessGroupId)) : false;
       const ownerDiedBeforeHandshake = !resource.deletionExecutor && resource.deletionOwner !== undefined && processIncarnationIsDead(resource.deletionOwner);
       if (!executorDead && !ownerDiedBeforeHandshake)
         continue;
@@ -35549,14 +35603,6 @@ async function reconcile(pins, options = {}) {
 async function runGc(pins, options = {}) {
   await reconcile(pins, options);
   let currentPins = pins.map(canonicalizeTranscriptLocator);
-  if (!options.deleter && process.platform === "win32") {
-    return {
-      deleted: 0,
-      notFound: 0,
-      failed: 0,
-      deferred: await countDeferred(currentPins, options)
-    };
-  }
   const limit = option(options.maxDeletesPerRun, DEFAULT_MAX_DELETES, "maxDeletesPerRun");
   const result = { deleted: 0, notFound: 0, failed: 0, deferred: 0 };
   const runTimeoutMs = option(options.runTimeoutMs, DEFAULT_DELETE_TIMEOUT_MS, "runTimeoutMs");
@@ -35610,9 +35656,10 @@ async function claimDeletion(pins, options) {
     const sidecar = await readSidecar(paths.sidecar);
     const finalPins = (options.pinProvider?.() ?? pins).map(canonicalizeTranscriptLocator);
     const now = nowMs(options);
+    const unarmedLeaseTtlMs = nonNegativeOption(options.unarmedLeaseTtlMs, DEFAULT_UNARMED_LEASE_TTL_MS, "unarmedLeaseTtlMs");
     let leasesChanged = false;
     for (const resource of Object.values(sidecar.resources)) {
-      if (pruneDeadActiveLeases(resource))
+      if (pruneDeadActiveLeases(resource, now, unarmedLeaseTtlMs))
         leasesChanged = true;
     }
     const candidate = Object.values(sidecar.resources).filter((resource) => resource.state === "retired" && !resourceIsPinned(resource, finalPins) && !hasActiveTranscriptLease(resource) && (resource.nextAttemptAt ?? 0) <= now).sort((left, right) => left.updatedAt - right.updatedAt || left.key.localeCompare(right.key))[0];
@@ -35686,6 +35733,9 @@ async function countDeferred(pins, options) {
 
 class DeletionStillRunningError extends Error {
 }
+
+class TranscriptAlreadyAbsentError extends Error {
+}
 async function awaitCustomDeleter(deletion, timeoutMs) {
   let timer;
   const timeout = new Promise((_resolve, reject) => {
@@ -35707,8 +35757,9 @@ async function awaitCustomDeleter(deletion, timeoutMs) {
   }
 }
 function processGroupIsEmpty(processGroupId) {
-  if (process.platform === "win32")
-    return false;
+  if (process.platform === "win32") {
+    throw new SessionLifecycleError("process-group probes are POSIX-only");
+  }
   try {
     process.kill(-processGroupId, 0);
     return false;
@@ -35717,8 +35768,13 @@ function processGroupIsEmpty(processGroupId) {
   }
 }
 function signalProcessGroup(processGroupId, signal) {
-  if (process.platform === "win32")
+  if (process.platform === "win32") {
+    spawnSync2("taskkill", ["/PID", String(processGroupId), "/T", "/F"], {
+      stdio: "ignore",
+      windowsHide: true
+    });
     return;
+  }
   try {
     process.kill(-processGroupId, signal);
   } catch (error51) {
@@ -35752,7 +35808,7 @@ async function waitForDeletionExit(exited, timeoutMs) {
   }
 }
 async function deleteWithSdkChild(locator, deletionToken, timeoutMs, attachExecutor, options) {
-  const sdkUrl = import.meta.resolve("@anthropic-ai/claude-agent-sdk");
+  const sdkUrl = options.sdkModuleUrl ?? import.meta.resolve("@anthropic-ai/claude-agent-sdk");
   const gateDirectory = join10(getStoreDir(options), "deletion-gates");
   await mkdir5(gateDirectory, { recursive: true, mode: 448 });
   const gatePath = join10(gateDirectory, `${deletionToken}.go`);
@@ -35769,15 +35825,31 @@ while (!existsSync(process.env.MERIDIAN_GC_GATE_PATH)) {
   await wait(10);
 }
 const sdk = await import(process.env.MERIDIAN_GC_SDK_URL);
+const sessionId = process.env.MERIDIAN_GC_SESSION_ID;
 const options = process.env.MERIDIAN_GC_PROJECT_DIR
   ? { dir: process.env.MERIDIAN_GC_PROJECT_DIR }
   : undefined;
+// Only the SDK's session-specific verdict means "already absent". A generic
+// "not found" can be the SDK or the child itself failing to load, and must stay
+// a retryable failure rather than tombstone a transcript still on disk.
+const absent = (message) => message.includes(process.env.MERIDIAN_GC_ABSENT_PHRASE);
 try {
-  await sdk.deleteSession(process.env.MERIDIAN_GC_SESSION_ID, options);
+  await sdk.deleteSession(sessionId, options);
 } catch (error) {
   const message = error instanceof Error ? error.message : String(error);
-  if (!options || !message.includes("not found")) throw error;
-  await sdk.deleteSession(process.env.MERIDIAN_GC_SESSION_ID);
+  if (!message.includes("not found")) throw error;
+  if (options) {
+    try {
+      await sdk.deleteSession(sessionId);
+      process.exit(0); // The dir-less retry deleted it: a deletion, not an absence.
+    } catch (fallbackError) {
+      const fallbackMessage = fallbackError instanceof Error ? fallbackError.message : String(fallbackError);
+      if (!absent(fallbackMessage)) throw fallbackError;
+      process.exit(${SESSION_GC_NOT_FOUND_EXIT_CODE});
+    }
+  }
+  if (!absent(message)) throw error;
+  process.exit(${SESSION_GC_NOT_FOUND_EXIT_CODE});
 }
 `;
   const child = spawn(getSessionGcNodeExecutable(), ["--input-type=module", "--eval", script], {
@@ -35786,9 +35858,10 @@ try {
       CLAUDE_CONFIG_DIR: locator.configDir,
       MERIDIAN_GC_SDK_URL: sdkUrl,
       MERIDIAN_GC_SESSION_ID: locator.sessionId,
+      MERIDIAN_GC_ABSENT_PHRASE: sessionAbsentPhrase(locator.sessionId),
       MERIDIAN_GC_PROJECT_DIR: locator.projectDir ?? "",
       MERIDIAN_GC_GATE_PATH: gatePath,
-      MERIDIAN_GC_GATE_TIMEOUT_MS: String(timeoutMs)
+      MERIDIAN_GC_GATE_TIMEOUT_MS: String(timeoutMs + processIncarnationProbeBudgetMs())
     },
     stdio: ["ignore", "pipe", "pipe"],
     windowsHide: true,
@@ -35810,15 +35883,21 @@ try {
   let timer;
   const joinTimeoutMs = Math.max(100, Math.min(2000, timeoutMs));
   const processGroupId = child.pid;
+  let deletionTreeKilled = false;
+  const killDeletionTree = () => {
+    if (!processGroupId || deletionTreeKilled)
+      return;
+    if (process.platform === "win32" && (child.exitCode !== null || child.signalCode !== null))
+      return;
+    signalProcessGroup(processGroupId, "SIGKILL");
+    deletionTreeKilled = true;
+  };
   try {
     if (!processGroupId)
       throw new Error("session deletion child has no PID");
     const executor = captureProcessIncarnation(processGroupId);
     if (!executor)
       throw new Error("cannot capture session deletion executor incarnation");
-    if (process.platform === "win32") {
-      throw new SessionLifecycleError("fenced session deletion is unavailable on win32");
-    }
     await attachExecutor(executor, processGroupId);
     const gateHandle = await open3(gatePath, "wx", 384);
     try {
@@ -35830,27 +35909,30 @@ try {
     }
     const timeout = new Promise((_resolve, reject) => {
       timer = setTimeout(() => {
-        signalProcessGroup(processGroupId, "SIGKILL");
+        killDeletionTree();
         reject(new Error("session deletion process group timed out and was killed"));
       }, timeoutMs);
       timer.unref?.();
     });
     const status = await Promise.race([exited, timeout]);
-    joined = await waitForProcessGroupEmpty(processGroupId, joinTimeoutMs);
+    joined = process.platform === "win32" ? true : await waitForProcessGroupEmpty(processGroupId, joinTimeoutMs);
     if (!joined) {
       throw new DeletionStillRunningError("session deletion process group remains active");
     }
+    if (status.code === SESSION_GC_NOT_FOUND_EXIT_CODE) {
+      throw new TranscriptAlreadyAbsentError(`session deletion child reported transcript ${locator.sessionId} already absent`);
+    }
     if (status.code !== 0) {
-      throw new Error(`session deletion child exited ${status.code ?? status.signal}: ${output.slice(-4000)}`);
+      throw new Error(`session deletion child exited ${status.code ?? status.signal}: ${clipChildOutput(output)}`);
     }
   } finally {
     if (timer)
       clearTimeout(timer);
     if (!joined && processGroupId) {
-      signalProcessGroup(processGroupId, "SIGKILL");
+      killDeletionTree();
       const [leaderExited, groupEmpty] = await Promise.all([
         waitForDeletionExit(exited, joinTimeoutMs),
-        waitForProcessGroupEmpty(processGroupId, joinTimeoutMs)
+        process.platform === "win32" ? Promise.resolve(true) : waitForProcessGroupEmpty(processGroupId, joinTimeoutMs)
       ]);
       joined = leaderExited && groupEmpty;
       unjoined = !joined;
@@ -35865,6 +35947,15 @@ try {
     }
   }
 }
+function clipChildOutput(output) {
+  const halfBudget = 2000;
+  if (output.length <= halfBudget * 2)
+    return output;
+  const elided = output.length - halfBudget * 2;
+  return `${output.slice(0, halfBudget)}
+…[${elided} chars elided]…
+${output.slice(-halfBudget)}`;
+}
 function getStoreDir(options) {
   if (options.storeDir)
     return options.storeDir;
@@ -36174,7 +36265,7 @@ async function writeSidecar(path3, sidecar) {
   let handle;
   try {
     handle = await open3(temp, "wx", 384);
-    await handle.writeFile(`${JSON.stringify(sidecar, null, 2)}
+    await handle.writeFile(`${JSON.stringify(sidecar)}
 `, "utf8");
     await handle.sync();
     await handle.close();
@@ -36317,14 +36408,15 @@ function releasePublicationLease(resource) {
     delete resource.activeLeases;
   return changed;
 }
-function pruneDeadActiveLeases(resource) {
+function pruneDeadActiveLeases(resource, now, unarmedLeaseTtlMs) {
   if (!resource.activeLeases)
     return false;
   let changed = false;
   for (const [token, lease] of Object.entries(resource.activeLeases)) {
     const executorDead = lease.executor && lease.executorRecoverable !== false ? processIncarnationIsDead(lease.executor) : false;
     const unarmedOwnerDead = !lease.executor && processIncarnationIsDead(lease.owner);
-    if (!executorDead && !unarmedOwnerDead)
+    const unarmedLeaseExpired = !lease.executor && now - lease.createdAt > unarmedLeaseTtlMs;
+    if (!executorDead && !unarmedOwnerDead && !unarmedLeaseExpired)
       continue;
     delete resource.activeLeases[token];
     changed = true;
@@ -36394,11 +36486,32 @@ function assertSameLocator(left, right) {
 function isState(value) {
   return value === "prepared" || value === "live" || value === "retired" || value === "deleting" || value === "deleted";
 }
+function sessionAbsentPhrase(sessionId) {
+  return `Session ${sessionId} not found`;
+}
 function isNotFoundError(error51, sessionId) {
-  return errorMessage(error51).includes(`Session ${sessionId} not found`);
+  if (error51 instanceof TranscriptAlreadyAbsentError)
+    return true;
+  return errorMessage(error51).includes(sessionAbsentPhrase(sessionId));
 }
+var sessionGcNodeExecutable;
 function getSessionGcNodeExecutable() {
-  return typeof process.versions.bun === "string" ? "node" : process.execPath;
+  if (typeof process.versions.bun !== "string")
+    return process.execPath;
+  if (sessionGcNodeExecutable)
+    return sessionGcNodeExecutable;
+  const probe = spawnSync2("node", ["-p", "process.execPath"], {
+    encoding: "utf8",
+    timeout: 5000,
+    maxBuffer: 16 * 1024,
+    windowsHide: true
+  });
+  const executable = probe.stdout?.trim();
+  if (probe.error || probe.status !== 0 || !executable || !isAbsolute5(executable)) {
+    throw new SessionLifecycleError("cannot resolve Node executable for session deletion");
+  }
+  sessionGcNodeExecutable = realpathSync2(executable);
+  return sessionGcNodeExecutable;
 }
 function errorMessage(error51) {
   return error51 instanceof Error ? error51.message : String(error51);
@@ -36916,6 +37029,8 @@ function createProxyServer(config2 = {}) {
     maxDeletesPerRun: Math.max(1, envInt("SESSION_GC_MAX_DELETES", 16)),
     preparedGraceMs: Math.max(SESSION_TURN_MAX_HOLD_MS + 60000, envInt("SESSION_GC_PREPARED_GRACE_MS", SESSION_TURN_MAX_HOLD_MS + 60000)),
     retiredGraceMs: Math.max(0, envInt("SESSION_GC_GRACE_MS", SESSION_TURN_MAX_HOLD_MS + 60000)),
+    lockWaitMs: Math.max(100, envInt("SESSION_GC_LOCK_WAIT_MS", 2000)),
+    unarmedLeaseTtlMs: SESSION_TURN_MAX_HOLD_MS + 60000,
     deletionTimeoutMs: Math.max(1000, envInt("SESSION_GC_DELETE_TIMEOUT_MS", 30000)),
     runTimeoutMs: Math.max(1000, envInt("SESSION_GC_RUN_TIMEOUT_MS", 30000))
   };
@@ -37841,6 +37956,10 @@ data: ${JSON.stringify(lastError)}
         const taskBudget = Number.isFinite(parsedBudget) ? { total: parsedBudget } : body.task_budget ? { total: body.task_budget.total ?? body.task_budget } : undefined;
         const betas = betaFilter.forwarded;
         const agentSessionId = adapter.getSessionId(c, body);
+        const pluginlessOpenCode = isPluginlessOpenCodeRequest({
+          userAgent: c.req.header("user-agent"),
+          agentModeHeader: c.req.header("x-opencode-agent-mode")
+        });
         const pluginlessWarning = notePluginlessOpenCodeRequest({
           userAgent: c.req.header("user-agent"),
           agentModeHeader: c.req.header("x-opencode-agent-mode"),
@@ -37907,8 +38026,9 @@ data: ${JSON.stringify(lastError)}
         if (lineageResult.type === "undo" && adapterBase === "opencode" && !agentSessionId) {
           lineageResult = { type: "diverged", reason: "missing-session-header" };
         }
+        const protocolRunsConcurrentTurnsPerSessionKey = adapter.runsConcurrentTurnsPerSessionKey === true || pluginlessOpenCode;
         const declaresPerRequestConcurrentFlow = requestSource?.startsWith("fork-") === true || isSubagentRequest;
-        const declaresConcurrentFlow = declaresPerRequestConcurrentFlow || adapter.runsConcurrentTurnsPerSessionKey === true;
+        const declaresConcurrentFlow = declaresPerRequestConcurrentFlow || protocolRunsConcurrentTurnsPerSessionKey;
         const durableCheckpointIds = durableMappingAtTurn.status === "found" ? durableMappingAtTurn.session.passthroughToolCallIds : undefined;
         const trailingSystemReminderOptions = adapterBase === "claude-code" ? { allowTrailingSystemReminder: true } : undefined;
         const durableCheckpointContinuation = durableCheckpointIds?.length && durableMappingAtTurn.status === "found" && matchesStoredLineagePrefix(durableMappingAtTurn.session, lineageMessages) ? coalesceCompleteToolResultContinuation((body.messages || []).slice(durableMappingAtTurn.session.messageCount), durableCheckpointIds, trailingSystemReminderOptions) : undefined;
@@ -37968,7 +38088,7 @@ data: ${JSON.stringify(lastError)}
             headers: { "Content-Type": "application/json" }
           });
         }
-        if (lostRaceWhileWaiting && !declaresPerRequestConcurrentFlow && adapter.runsConcurrentTurnsPerSessionKey === true && lineageResult.type === "undo") {
+        if (lostRaceWhileWaiting && !declaresPerRequestConcurrentFlow && protocolRunsConcurrentTurnsPerSessionKey && lineageResult.type === "undo") {
           lineageResult = { type: "diverged", reason: "concurrent-race" };
         }
         if (options.forceFreshPriorityReplay) {
@@ -38125,7 +38245,7 @@ data: ${JSON.stringify(lastError)}
           if (managedForkTarget)
             return;
           managedFreshTarget = false;
-          managedForkSource = cachedSession?.currentTranscript?.sessionId === sourceSessionId ? cachedSession.currentTranscript : transcriptLocator(sourceSessionId);
+          managedForkSource = cachedSession?.currentTranscript?.sessionId === sourceSessionId ? { ...cachedSession.currentTranscript } : transcriptLocator(sourceSessionId);
           managedForkTarget = transcriptLocator(randomUUID6());
           releaseManagedForkPins = pinActiveSessionGcLocators(managedForkSource, managedForkTarget);
           const attachedGeneration = lifecycleMappingKey ? await attachPinnedTranscript(managedForkSource, () => {
@@ -40110,7 +40230,8 @@ data: ${JSON.stringify({
                     if (!recoverySourceId || !lifecycleMappingKey) {
                       throw new Error("Silent recovery has no durable source mapping");
                     }
-                    recoveryForkSource = lookupSharedSession(lifecycleMappingKey)?.currentTranscript ?? transcriptLocator(recoverySourceId);
+                    const storedRecoverySource = lookupSharedSession(lifecycleMappingKey)?.currentTranscript;
+                    recoveryForkSource = storedRecoverySource ? { ...storedRecoverySource } : transcriptLocator(recoverySourceId);
                     const recoveryAttachedGeneration = recoveryForkSource.sessionId === recoverySourceId ? await attachPinnedTranscript(recoveryForkSource, () => {
                       assertDurableWritesAllowed();
                       return attachSharedTranscriptLocator(lifecycleMappingKey, recoverySourceId, recoveryForkSource, mappingExpectedGeneration ?? undefined);
@@ -41464,7 +41585,7 @@ data: ${JSON.stringify({
     });
   });
   app.get("/profiles", async (c) => {
-    const { profilePageHtml } = await import("./profilePage-vfj2dbhn.js");
+    const { profilePageHtml } = await import("./profilePage-mamej7kp.js");
     return c.html(profilePageHtml);
   });
   app.post("/profiles/active", async (c) => {
@@ -41532,7 +41653,7 @@ data: ${JSON.stringify({
     }
   });
   app.get("/plugins", async (c) => {
-    const { pluginPageHtml } = await import("./pluginPage-n3gdtbmj.js");
+    const { pluginPageHtml } = await import("./pluginPage-f5gdmbxc.js");
     return c.html(pluginPageHtml);
   });
   app.post("/auth/refresh", async (c) => {

package/dist/{cli-zdbv40d5.js → cli-hxxy0m1z.js}

@@ -900,17 +900,20 @@ var pluginlessWarned = new LRUMap(256);
 function clearPluginlessWarnings() {
   pluginlessWarned.clear();
 }
-function notePluginlessOpenCodeRequest(input) {
+function isPluginlessOpenCodeRequest(input) {
   if (!input.userAgent?.toLowerCase().startsWith("opencode/"))
-    return;
-  if (input.agentModeHeader)
+    return false;
+  return !input.agentModeHeader;
+}
+function notePluginlessOpenCodeRequest(input) {
+  if (!isPluginlessOpenCodeRequest(input))
     return;
   const key = input.sessionId || "(keyless)";
   if (pluginlessWarned.get(key))
     return;
   pluginlessWarned.set(key, true);
   const shortId = input.sessionId ? `${input.sessionId.slice(0, 12)}…` : "(no session header)";
-  return `OpenCode request without the Meridian plugin's agent headers (session ${shortId}). ` + `OpenCode runs its internal title/summary agents under your session id, so Meridian ` + `cannot tell them apart from your conversation: the first turn of each session can fail ` + `with a 400 or replay against a cold cache. Fix: meridian setup (or update the plugin).`;
+  return `OpenCode request without the Meridian plugin's agent headers (session ${shortId}). ` + `OpenCode runs its internal title/summary agents under your session id, so Meridian ` + `cannot tell them apart from your conversation: concurrent turns are admitted rather ` + `than refused, but the one that loses the race replays against a cold prompt cache — ` + `slower and billed as uncached input. Fix: meridian setup (or update the plugin).`;
 }
 function runSetup(pluginPath, configPath, generation = "v1") {
   const path = configPath ?? findOpencodeConfigPath();
@@ -971,4 +974,4 @@ function runSetup(pluginPath, configPath, generation = "v1") {
   return { configPath: path, pluginPath, alreadyConfigured, removedStale, created: false };
 }
 
-export { LRUMap, PRIORITY_ATTESTATION_HEADER, verifyPriorityAttestation, init_priorityAttestation, UnparseableConfigError, MissingV1PluginError, MissingV2PluginError, DuplicateMeridianConfigError, findOpencodeConfigPath, findPluginPath, SUPPORTED_OPENCODE_V2_VERSIONS, findV2PluginPath, classifyOpenCodeVersion, detectOpenCodeGeneration, pluginPathForGeneration, checkPluginConfigured, clearPluginlessWarnings, notePluginlessOpenCodeRequest, runSetup };
+export { LRUMap, PRIORITY_ATTESTATION_HEADER, verifyPriorityAttestation, init_priorityAttestation, UnparseableConfigError, MissingV1PluginError, MissingV2PluginError, DuplicateMeridianConfigError, findOpencodeConfigPath, findPluginPath, SUPPORTED_OPENCODE_V2_VERSIONS, findV2PluginPath, classifyOpenCodeVersion, detectOpenCodeGeneration, pluginPathForGeneration, checkPluginConfigured, clearPluginlessWarnings, isPluginlessOpenCodeRequest, notePluginlessOpenCodeRequest, runSetup };

package/dist/cli.js

@@ -1,16 +1,16 @@
 #!/usr/bin/env node
 import {
   startProxyServer
-} from "./cli-6c6dj69q.js";
+} from "./cli-ab7zkp1a.js";
 import"./cli-5jxyma6z.js";
 import"./cli-sry5aqdj.js";
-import"./cli-8yp89fan.js";
+import"./cli-hj61zpt7.js";
 import {
   resolveClaudeExecutableAsync
 } from "./cli-9e5cxp89.js";
 import"./cli-khhjyk04.js";
 import"./cli-vj9cv18n.js";
-import"./cli-zdbv40d5.js";
+import"./cli-hxxy0m1z.js";
 import {
   __require
 } from "./cli-p9swy5t3.js";
@@ -93,7 +93,7 @@ if (args[0] === "setup") {
     runSetup,
     SUPPORTED_OPENCODE_V2_VERSIONS,
     UnparseableConfigError
-  } = await import("./setup-b3ymd9z8.js");
+  } = await import("./setup-ndmjpy23.js");
   const forceV1 = args.includes("--v1");
   const forceV2 = args.includes("--v2");
   if (forceV1 && forceV2) {
@@ -205,7 +205,7 @@ async function runCli(start = startProxyServer, runAuthCheck = async () => {
   return execFile(claudePath, ["auth", "status"], { timeout: 5000 });
 }) {
   try {
-    const { findOpencodeConfigPath, checkPluginConfigured, findPluginPath } = await import("./setup-b3ymd9z8.js");
+    const { findOpencodeConfigPath, checkPluginConfigured, findPluginPath } = await import("./setup-ndmjpy23.js");
     const configPath = findOpencodeConfigPath();
     const { existsSync } = await import("fs");
     if (existsSync(configPath) && !checkPluginConfigured(configPath)) {

package/dist/{pluginPage-n3gdtbmj.js → pluginPage-f5gdmbxc.js}

@@ -4,7 +4,7 @@ import {
   profileBarHtml,
   profileBarJs,
   themeCss
-} from "./cli-8yp89fan.js";
+} from "./cli-hj61zpt7.js";
 import"./cli-p9swy5t3.js";
 
 // src/proxy/plugins/pluginPage.ts

package/dist/{profilePage-vfj2dbhn.js → profilePage-mamej7kp.js}

@@ -4,7 +4,7 @@ import {
   profileBarHtml,
   profileBarJs,
   themeCss
-} from "./cli-8yp89fan.js";
+} from "./cli-hj61zpt7.js";
 import"./cli-p9swy5t3.js";
 
 // src/telemetry/profilePage.ts