@skaile/workspaces 4.35.0 → 4.37.0

package/dist/{chunk-AO7TCPOS.js → chunk-USJWXEXS.js}

@@ -1,30 +1,30 @@
-import { WorkspacePlugin } from './chunk-XTOTP7MJ.js';
-import { buildWorkspaceToolDefs } from './chunk-N2UGG6WV.js';
-import { findAiAssetsRoot } from './chunk-7IH3RKKK.js';
+import { WorkspacePlugin } from './chunk-ENXE4BKS.js';
+import { buildWorkspaceToolDefs } from './chunk-A5RRXBLI.js';
+import { findAiAssetsRoot } from './chunk-OEBAXTQ4.js';
 import { WebSocketServerTransport } from './chunk-5LKOAX7I.js';
 import { assembleSystemPrompt, buildCapabilitiesPromptSection } from './chunk-W3UDISS2.js';
 import { prepareNativePolicy, codexInstanceEnvironment, parseCodexCredential, parseCodexRefreshInput, parseCodexRefreshResult } from './chunk-HCYS7GFP.js';
-import { resolveFlowPath } from './chunk-J4ANCOQ4.js';
-import { findAiAssetsRoot as findAiAssetsRoot$1, deployCatalogEntry, undeployCatalogEntry } from './chunk-Q6NDQ6BH.js';
-import { ConnectFailureCarryOver, registerBuiltinConnectors, buildConnectorPromptSection, findMissingPackages, installNpmPackages, ConnectorManager, buildSdkConnectorTools, buildLazySdkFlowTools, describeFlowOperations, buildConnectorToolDefs, buildFlowToolDefs, SessionNodeExecutor, SessionSubpromptRunner, ClassifierSubpromptRunner, SessionInlineSubFlowRunner, driveOrchestratorTurn, buildSdkFlowTools } from './chunk-IFUQ6XBQ.js';
-import { loadYamlConnectorDeclarations, withMaterializedConnectorDeclarations, SecretProviderChain, ConnectorStartupError, isKnownSecretRef, EnvSecretProvider, PreMintedSecretProvider, InMemorySecretProvider, resolvedConfigToDeclarations, deriveSingleMaterializedConnectorDeclaration } from './chunk-DHLE66FV.js';
-import { EventNormalizer } from './chunk-NVQLE4MK.js';
-import { probeResumeTranscript, transcriptStoreForRuntime } from './chunk-LX3FKVLL.js';
+import { resolveFlowPath } from './chunk-SGMCSVTO.js';
+import { findAiAssetsRoot as findAiAssetsRoot$1, deployCatalogEntry, undeployCatalogEntry } from './chunk-5JAO4MXA.js';
+import { ConnectFailureCarryOver, registerBuiltinConnectors, buildConnectorPromptSection, findMissingPackages, installNpmPackages, ConnectorManager, buildSdkConnectorTools, buildLazySdkFlowTools, describeFlowOperations, buildConnectorToolDefs, buildFlowToolDefs, SessionNodeExecutor, SessionSubpromptRunner, ClassifierSubpromptRunner, SessionInlineSubFlowRunner, driveOrchestratorTurn, buildSdkFlowTools } from './chunk-WTBXGJCD.js';
+import { loadYamlConnectorDeclarations, withMaterializedConnectorDeclarations, SecretProviderChain, ConnectorStartupError, isKnownSecretRef, EnvSecretProvider, PreMintedSecretProvider, InMemorySecretProvider, resolvedConfigToDeclarations, deriveSingleMaterializedConnectorDeclaration } from './chunk-S63H4HDH.js';
+import { EventNormalizer } from './chunk-5SGS5SN2.js';
+import { probeResumeTranscript, transcriptStoreForRuntime } from './chunk-NTASYPDN.js';
 import { scopeReconfigureModel } from './chunk-EINLFFP6.js';
 import { CodexNativeStateUnavailable } from './chunk-LOO5CB5M.js';
-import { dispatchCapability } from './chunk-TTITGVXV.js';
+import { dispatchCapability } from './chunk-RZXP5ZER.js';
 import { classifyClaudeSdkError } from './chunk-XBSQ4KMC.js';
 import { agentExecRequested } from './chunk-YROR332M.js';
-import { toAgentEffort, createDriver, catalogLayer, providerCredentialEnvName, toMergedRegistry, registryCredentialEnv, AI_PROVIDER_PRESETS, AgentDriver } from './chunk-MTWZ7KHZ.js';
-import { loadFlow } from './chunk-7HJ6SFFF.js';
+import { toAgentEffort, createDriver, catalogLayer, providerCredentialEnvName, toMergedRegistry, registryCredentialEnv, AI_PROVIDER_PRESETS, AgentDriver } from './chunk-WQULDAH2.js';
+import { loadFlow } from './chunk-FLGLODDF.js';
 import { parseFlowDefinition } from './chunk-DIQDYNXZ.js';
 import { renderStimulusPrompt } from './chunk-K3IBZ2UZ.js';
-import { withActivityLabelJsonSchema, TOOL_ACTIVITY_PROMPT_SECTION, SESSION_ROOT_CONNECTOR_ID, PROTOCOL_VERSION } from './chunk-JS7DCCDA.js';
-import { resolveSettings, loadProviderRegistry } from './chunk-3ELIPWCH.js';
-import { resolveRuntimeAssets } from './chunk-JRIU5GA7.js';
+import { withActivityLabelJsonSchema, TOOL_ACTIVITY_PROMPT_SECTION, SESSION_ROOT_CONNECTOR_ID, PROTOCOL_VERSION } from './chunk-V2OQ3BI6.js';
+import { resolveSettings, loadProviderRegistry } from './chunk-FJYOQMXT.js';
+import { resolveRuntimeAssets } from './chunk-VRFKCF3R.js';
 import { resolveDriverPaths } from './chunk-K5GBV4SA.js';
-import { resolveSkWorkspaceConfig, resolveAgentDir, loadMcpServerDeclarations, COMPACTION_DEFAULTS, resolveCompactionThresholdPercent, validateAssetRecipeAttr, deriveSingleMaterializedMcpDeclaration, stageMaterializedSkills, readSkillAllowList, isStagedSkillMarkerFor, unstageSkill, STAGED_SKILL_MARKER } from './chunk-LRCSWOZO.js';
-import { withFsDeadline, FsDeadlineError, fsDeadlineMs, parseFrontmatter, tryWithFsDeadline } from './chunk-2FBPAR2V.js';
+import { resolveSkWorkspaceConfig, resolveAgentDir, loadMcpServerDeclarations, COMPACTION_DEFAULTS, resolveCompactionThresholdPercent, validateAssetRecipeAttr, deriveSingleMaterializedMcpDeclaration, stageMaterializedSkills, readSkillAllowList, isStagedSkillMarkerFor, unstageSkill, STAGED_SKILL_MARKER } from './chunk-QKXDRBLL.js';
+import { withFsDeadline, FsDeadlineError, fsDeadlineMs, parseFrontmatter, tryWithFsDeadline } from './chunk-SQ7IN7KR.js';
 import { parseAssetRef } from './chunk-GEEW6SY2.js';
 import { resolveLogStoreConfig, createLogStoreFromConfig, OnLogBridgeSink, WsLogSink, resolveLogsRetention, enforceLogsRetention } from './chunk-JMKB7IB4.js';
 import { pickRegistryEntries, registryEntries, resolveEntryBaseUrl, parseModelRef, isEntryEnabled, parseCredentialRef } from './chunk-MJHSLODD.js';
@@ -51,6 +51,8 @@ import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 import { SSEClientTransport } from '@modelcontextprotocol/sdk/client/sse.js';
 import { getDefaultEnvironment, StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js';
 import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
+import { Agent, request } from 'https';
+import { Readable } from 'stream';
 import mime from 'mime';
 import { Worker } from 'worker_threads';
 
@@ -1517,6 +1519,58 @@ var FileChangedCoalescer = class {
     state.dirCapHit = false;
   }
 };
+var isBun = typeof globalThis.Bun !== "undefined";
+var NULL_BODY_STATUSES = /* @__PURE__ */ new Set([204, 205, 304]);
+function createPinnedCaFetch(ca) {
+  if (isBun) {
+    return (url, init) => {
+      assertHttps(url);
+      return fetch(url, { ...init, keepalive: false, tls: { ca } });
+    };
+  }
+  const agent = new Agent({ ca });
+  return (url, init) => {
+    assertHttps(url);
+    return nodeHttpsFetch(new URL(String(url)), init, agent);
+  };
+}
+function assertHttps(url) {
+  if (new URL(String(url)).protocol !== "https:") {
+    throw new Error("an MCP server with a pinned CA must use an https URL");
+  }
+}
+async function nodeHttpsFetch(url, init, agent) {
+  const headers = {};
+  new Headers(init?.headers).forEach((value, key) => {
+    headers[key] = value;
+  });
+  const body = init?.body == null ? void 0 : Buffer.from(await new Response(init.body).arrayBuffer());
+  return new Promise((resolve4, reject) => {
+    const req = request(
+      url,
+      { method: init?.method ?? "GET", headers, agent, signal: init?.signal ?? void 0 },
+      (res) => {
+        const responseHeaders = new Headers();
+        for (const [key, value] of Object.entries(res.headers)) {
+          if (value === void 0) continue;
+          for (const v of Array.isArray(value) ? value : [value]) responseHeaders.append(key, v);
+        }
+        const status = res.statusCode ?? 0;
+        const responseBody = NULL_BODY_STATUSES.has(status) ? null : Readable.toWeb(res);
+        if (responseBody === null) res.resume();
+        resolve4(
+          new Response(responseBody, {
+            status,
+            statusText: res.statusMessage,
+            headers: responseHeaders
+          })
+        );
+      }
+    );
+    req.on("error", reject);
+    req.end(body);
+  });
+}
 var execFileAsync2 = promisify(execFile);
 var DEFAULT_NIX_TIMEOUT_MS = 3e4;
 var NIX_TIMEOUT_ENV_VAR = "SKAILE_NIX_TIMEOUT_MS";
@@ -1753,6 +1807,20 @@ function resolveMcpUrl(decl, secrets) {
     throw new Error(`resolved url for MCP server '${decl.id}' is not a valid URL`);
   }
 }
+function resolveMcpCa(decl, secrets) {
+  const raw = decl.ca;
+  if (raw === void 0 || raw === "") return void 0;
+  const value = isKnownSecretRef(raw) ? secrets?.resolve(raw) : raw;
+  if (value === void 0) {
+    throw new Error(
+      `CA for MCP server '${decl.id}' unavailable \u2014 unresolved secret ref '${raw}' in ca`
+    );
+  }
+  if (!value.includes("-----BEGIN CERTIFICATE-----")) {
+    throw new Error(`ca for MCP server '${decl.id}' is not a PEM certificate`);
+  }
+  return value;
+}
 var RESERVED_MCP_SERVER_IDS = /* @__PURE__ */ new Set([
   "skaile-connectors",
   "skaile-workspace",
@@ -1887,7 +1955,11 @@ function buildTransport(decl, secrets) {
       serverId: decl.id,
       kind: "header"
     });
-    return new SSEClientTransport(resolveMcpUrl(decl, secrets), { requestInit: { headers } });
+    const pinned = pinnedFetch(decl, secrets);
+    return new SSEClientTransport(resolveMcpUrl(decl, secrets), {
+      requestInit: { headers },
+      ...pinned ? { fetch: pinned } : {}
+    });
   }
   if (transport === "http") {
     if (!decl.url) throw new Error(`http MCP server '${decl.id}' is missing 'url'`);
@@ -1895,12 +1967,18 @@ function buildTransport(decl, secrets) {
       serverId: decl.id,
       kind: "header"
     });
+    const pinned = pinnedFetch(decl, secrets);
     return new StreamableHTTPClientTransport(resolveMcpUrl(decl, secrets), {
-      requestInit: { headers }
+      requestInit: { headers },
+      ...pinned ? { fetch: pinned } : {}
     });
   }
   throw new Error(`Unknown MCP transport '${transport}' for server '${decl.id}'`);
 }
+function pinnedFetch(decl, secrets) {
+  const ca = resolveMcpCa(decl, secrets);
+  return ca === void 0 ? void 0 : createPinnedCaFetch(ca);
+}
 function defaultMcpClientConnector(secrets) {
   return async (decl) => {
     const transport = buildTransport(decl, secrets);
@@ -2564,6 +2642,15 @@ function wireExternalMcpServersForSdk(mcpServers, resolvedDecls, secretProvider,
     instance: sessionMeta?.sessionId ?? "no-session"
   });
   for (const decl of resolvedDecls) {
+    if (decl.ca && decl.transport && decl.transport !== "stdio") {
+      mcpLog.warn(
+        "MCP server skipped: it pins a CA, which the SDK mcpServers config cannot carry",
+        {
+          id: decl.id
+        }
+      );
+      continue;
+    }
     const serverConfig = toSdkMcpServerConfig(
       decl,
       secretProvider
@@ -3524,13 +3611,19 @@ var CapabilityRegistry = class {
   }
 };
 function computeCapabilitySignature(caps) {
-  const canonical2 = caps.slice().sort((a, b) => a.name.localeCompare(b.name)).map((c) => ({
+  const canonical2 = caps.filter((c) => !isConnectionScopedAppCapability(c)).sort((a, b) => a.name.localeCompare(b.name)).map((c) => ({
     name: c.name,
     origin: c.origin.kind,
     schemaSha256: sha256(JSON.stringify(c.inputSchema ?? {}))
   }));
   return sha256(JSON.stringify(canonical2));
 }
+function capabilitySignatureInputs(caps) {
+  return caps.filter((c) => !isConnectionScopedAppCapability(c)).map((c) => `${c.name}:${c.origin.kind}`).sort();
+}
+function isConnectionScopedAppCapability(cap) {
+  return cap.origin.kind === "app" || cap.name.startsWith(APP_CAPABILITY_PREFIX);
+}
 function sha256(input) {
   return createHash("sha256").update(input).digest("hex");
 }
@@ -4805,6 +4898,41 @@ function compactionGateTimeoutMs() {
   const raw = Number(process.env.SKAILE_COMPACTION_GATE_TIMEOUT_MS);
   return Number.isFinite(raw) && raw > 0 ? raw : DEFAULT_COMPACTION_GATE_TIMEOUT_MS;
 }
+var DEFAULT_COMPACTION_TURN_WAIT_MS = 10 * 6e4;
+function compactionTurnWaitMs() {
+  const raw = Number(process.env.SKAILE_COMPACTION_TURN_WAIT_MS);
+  return Number.isFinite(raw) && raw > 0 ? raw : DEFAULT_COMPACTION_TURN_WAIT_MS;
+}
+var PLATFORM_COMPACTION_TURN_WAIT_MS = 3e4;
+function compactionTurnWaitFor(trigger) {
+  return trigger === "threshold" ? compactionTurnWaitMs() : PLATFORM_COMPACTION_TURN_WAIT_MS;
+}
+async function claimDriverForCompaction(deps) {
+  const hold = deps.gate.begin();
+  let released = false;
+  const release2 = () => {
+    if (released) return;
+    released = true;
+    deps.gate.settle(hold);
+  };
+  const timeoutMs = deps.timeoutMs ?? compactionTurnWaitMs();
+  if (await raceDeadline(deps.awaitClaimedTurns(), timeoutMs) === "opened") return release2;
+  release2();
+  deps.log(
+    `[serve] compaction skipped: a turn still held the driver after ${Math.round(timeoutMs / 1e3)}s`
+  );
+  return null;
+}
+var TURN_COMPACTION_YIELD_ATTEMPTS = 3;
+async function beginTurnClearOfCompaction(deps, maxAttempts = TURN_COMPACTION_YIELD_ATTEMPTS) {
+  for (let attempt = 0; attempt < maxAttempts; attempt += 1) {
+    if (!await deps.awaitIdle()) return null;
+    const endTurn = await deps.claimTurn();
+    if (deps.gate.isIdle()) return endTurn;
+    endTurn();
+  }
+  throw new Error(`turn overtaken by a compaction ${maxAttempts} times running`);
+}
 var COMPACTION_GATE_TIMEOUT_MESSAGE = "The session is still compacting its history and could not take this message. Send it again in a moment.";
 async function guardTurnAgainstCompaction(deps) {
   const outcome = await deps.gate.awaitIdle(deps.timeoutMs ?? compactionGateTimeoutMs());
@@ -4816,6 +4944,7 @@ async function guardTurnAgainstCompaction(deps) {
 }
 
 // runner/src/driver-swap-gate.ts
+var TURN_BIND_ATTEMPTS = 3;
 var DriverSwapGate = class {
   /** Resolves when the in-flight driver recreate settles (resolve or reject). */
   activeDriverSwap = null;
@@ -4861,6 +4990,25 @@ var DriverSwapGate = class {
     }
     return endTurn;
   }
+  /**
+   * Claim a turn slot on a driver no swap is about to replace. `prepare` is the
+   * turn's async pre-flight (the driver start); a swap that registers during it
+   * has already passed its turn wait, so the prompt waits that swap out and
+   * prepares again on the fresh driver instead of dispatching onto the one being
+   * killed. The slot is claimed in the same tick as the final check, so any later
+   * swap waits for the turn. A failed swap releases the waiter; a throwing
+   * `prepare` rejects with no slot claimed. Returns `endTurn`, as `beginTurn` does.
+   * Bounded like the driver start: swaps overtaking every attempt is pathological,
+   * and failing loudly beats spinning.
+   */
+  async beginTurnOnLiveDriver(prepare, maxAttempts = TURN_BIND_ATTEMPTS) {
+    for (let attempt = 0; attempt < maxAttempts; attempt += 1) {
+      await this.awaitSwap();
+      await prepare();
+      if (!this.isSwapping()) return this.beginTurn();
+    }
+    throw new Error(`turn's driver replaced by a swap ${maxAttempts} times running`);
+  }
   /** Whether a driver swap is registered and has not settled yet. */
   isSwapping() {
     return this.activeDriverSwap !== null;
@@ -5043,6 +5191,61 @@ var PendingTurns = class {
   }
 };
 
+// runner/src/prompt-turn-queue.ts
+var PromptTurnQueue = class {
+  entries = [];
+  /** Take the next place. Call before the first `await` of the prompt's handler. */
+  join(owner = {}) {
+    const queued = this.entries.length > 0;
+    let release2;
+    const ready = new Promise((resolve4) => {
+      release2 = resolve4;
+    });
+    const entry = { owner, active: false, dropped: false, release: release2 };
+    this.entries.push(entry);
+    if (!queued) this.activate(entry);
+    return {
+      queued,
+      ready,
+      get dropped() {
+        return entry.dropped;
+      },
+      leave: () => this.remove(entry)
+    };
+  }
+  /**
+   * Drop every waiting prompt `senderId` sent, in queue order. The head is not
+   * waiting (its turn is the one a cancel aborts), and a prompt with no sender
+   * belongs to nobody a cancel can name, so neither is dropped.
+   */
+  dropQueuedFrom(senderId) {
+    const dropped = [];
+    for (const entry of [...this.entries]) {
+      if (entry.active || entry.owner.senderId !== senderId) continue;
+      entry.dropped = true;
+      this.remove(entry);
+      entry.release();
+      dropped.push(entry.owner.messageId !== void 0 ? { messageId: entry.owner.messageId } : {});
+    }
+    return dropped;
+  }
+  /** Prompts that joined and have not left yet; for diagnostics and tests. */
+  get size() {
+    return this.entries.length;
+  }
+  activate(entry) {
+    entry.active = true;
+    entry.release();
+  }
+  remove(entry) {
+    const index = this.entries.indexOf(entry);
+    if (index === -1) return;
+    this.entries.splice(index, 1);
+    const head = this.entries[0];
+    if (index === 0 && head && !head.active) this.activate(head);
+  }
+};
+
 // runner/src/serial-lock.ts
 function createSerialLock() {
   let tail = Promise.resolve();
@@ -5741,7 +5944,12 @@ var CompactionOrchestrator = class {
     this._isCompacting = true;
     this._startFired = false;
     this._endFired = false;
+    let releaseDriver = null;
     try {
+      if (this.opts.claimDriver) {
+        releaseDriver = await this.opts.claimDriver(trigger);
+        if (!releaseDriver) return null;
+      }
       return await this._doCompact(trigger, focus);
     } finally {
       this._isCompacting = false;
@@ -5752,7 +5960,11 @@ var CompactionOrchestrator = class {
           `[compaction] onCompactionEnd threw while unwinding: ${err instanceof Error ? err.message : String(err)}`
         );
       } finally {
-        this.opts.onCompactionSettled?.();
+        try {
+          this.opts.onCompactionSettled?.();
+        } finally {
+          releaseDriver?.();
+        }
       }
     }
   }
@@ -9456,6 +9668,7 @@ async function startAgentServer(opts) {
   const pendingTurns = new PendingTurns(() => {
     if (!compacting) sendEvent({ type: "status", phase: "idle" });
   });
+  const promptTurns = new PromptTurnQueue();
   let driverRestartChain = Promise.resolve();
   let liveDriverActiveAfterTurn = false;
   let driver = secretsMode === "env" ? agentSession.driver : void 0;
@@ -9527,6 +9740,15 @@ async function startAgentServer(opts) {
         compactionGate.settle(gateHold);
         gateHold = null;
       },
+      // A user turn that already holds a slot keeps the driver; the compaction
+      // waits for it rather than prompting the driver under it. A platform call
+      // waits briefly: a turn paused on a question can hold its slot for hours.
+      claimDriver: (trigger) => claimDriverForCompaction({
+        gate: compactionGate,
+        awaitClaimedTurns: () => driverSwapGate.awaitActiveTurn(),
+        log,
+        timeoutMs: compactionTurnWaitFor(trigger)
+      }),
       onLog: (line) => log(`[serve] ${line}`),
       // Phase 3: stamp every CompactionAttemptEvent with the registry's
       // current signature so wake-time tier-1 selection has the input it
@@ -10640,6 +10862,9 @@ async function startAgentServer(opts) {
           log(
             `[serve] tier-1 resume rejected: signature mismatch (expected=${cfgExpectedSig.slice(0, 12)} current=${currentSig.slice(0, 12)})`
           );
+          log(
+            `[serve] tier-1 resume signed set: ${capabilitySignatureInputs(capabilityRegistry.list()).join(",")}`
+          );
           sendEvent({
             type: "resume_failed",
             resumeSessionId: cfgResumeSessionId,
@@ -10745,6 +10970,21 @@ async function startAgentServer(opts) {
   const awaitCompactionIdle = (what) => guardTurnAgainstCompaction({ gate: compactionGate, what, log, sendEvent });
   async function handlePrompt(cmd) {
     if (cmd.messageId) sendEvent({ type: "prompt_ack", messageId: cmd.messageId });
+    const place = promptTurns.join({ senderId: cmd.senderId, messageId: cmd.messageId });
+    try {
+      if (place.queued) {
+        driver?.supersedePendingQuestion?.();
+        const queuedAt = Date.now();
+        await place.ready;
+        logPhase("prompt_queue_wait", queuedAt, { dropped: place.dropped });
+        if (place.dropped) return;
+      }
+      await runPromptTurn(cmd, place.leave);
+    } finally {
+      place.leave();
+    }
+  }
+  async function runPromptTurn(cmd, leaveQueue) {
     const promptReceivedAt = Date.now();
     const sessionIsReady = await awaitSessionReadyOrFail();
     logPhase("prompt_gate_wait", promptReceivedAt, { ready: sessionIsReady });
@@ -10765,6 +11005,7 @@ async function startAgentServer(opts) {
     await restageMaterializedSkills(true);
     const activeFlow = pickChatFlowTarget(activeFlows.values());
     if (activeFlow) {
+      leaveQueue();
       sendEvent({ type: "status", phase: "thinking" });
       try {
         const bus = getOrCreateStimulusBus();
@@ -10793,19 +11034,31 @@ async function startAgentServer(opts) {
     }
     const driverStartStartedAt = Date.now();
     let driverStartOk = false;
+    let driverStartAttempts = 0;
+    let endTurn;
     try {
-      await ensureDriverStarted();
-      driverStartOk = true;
+      endTurn = await beginTurnClearOfCompaction({
+        gate: compactionGate,
+        awaitIdle: () => awaitCompactionIdle("prompt"),
+        claimTurn: () => driverSwapGate.beginTurnOnLiveDriver(() => {
+          driverStartAttempts += 1;
+          return ensureDriverStarted();
+        })
+      });
+      driverStartOk = endTurn !== null;
     } catch (err) {
       const errMsg = err instanceof Error ? err.message : String(err);
       log(`[serve] driver start failed: ${errMsg}`);
       sendEvent({ type: "error", message: `Driver start failed: ${errMsg}`, fatal: true });
       return;
     } finally {
-      logPhase("driver_start", driverStartStartedAt, { ok: driverStartOk });
+      logPhase("driver_start", driverStartStartedAt, {
+        ok: driverStartOk,
+        attempts: driverStartAttempts
+      });
     }
+    if (!endTurn) return;
     sendEvent({ type: "status", phase: "thinking" });
-    const endTurn = driverSwapGate.beginTurn();
     try {
       await driver.promptInput({ text: cmd.prompt, attachments: cmd.attachments });
     } catch (err) {
@@ -10836,8 +11089,22 @@ async function startAgentServer(opts) {
     });
     if (routed === "answered") return;
     if (!driver.acceptsReplyAsPrompt) return;
-    if (!await awaitCompactionIdle("reply")) return;
-    const endTurn = driverSwapGate.beginTurn();
+    let endTurn;
+    try {
+      endTurn = await beginTurnClearOfCompaction({
+        gate: compactionGate,
+        awaitIdle: () => awaitCompactionIdle("reply"),
+        claimTurn: () => driverSwapGate.beginTurnOnLiveDriver(ensureDriverStarted)
+      });
+    } catch (err) {
+      sendEvent({
+        type: "error",
+        message: `Reply failed: ${err instanceof Error ? err.message : String(err)}`,
+        fatal: false
+      });
+      return;
+    }
+    if (!endTurn) return;
     try {
       await driver.prompt(cmd.answer);
     } catch (err) {
@@ -10850,7 +11117,19 @@ async function startAgentServer(opts) {
       endTurn();
     }
   }
-  async function handleCancel() {
+  async function handleCancel(cmd) {
+    if (cmd.senderId) {
+      const dropped = promptTurns.dropQueuedFrom(cmd.senderId);
+      if (dropped.length > 0) {
+        log(`[serve] cancel dropped ${dropped.length} queued prompt(s) of the presser`);
+        sendEvent({
+          type: "queued_prompts_dropped",
+          senderId: cmd.senderId,
+          messageIds: dropped.flatMap((p) => p.messageId !== void 0 ? [p.messageId] : []),
+          count: dropped.length
+        });
+      }
+    }
     if (!await awaitSessionReadyOrFail()) return;
     log("[serve] cancel");
     try {
@@ -11120,7 +11399,7 @@ async function startAgentServer(opts) {
         await countPendingTurn(() => handleReply(cmd));
         break;
       case "cancel":
-        await handleCancel();
+        await handleCancel(cmd);
         break;
       // v3: compact + lifecycle removed — reachable via runner.lifecycle capability
       // (the v3 `runner.lifecycle` cap takes `{ phase: 'hibernate' | 'close' | 'compact' }`).
@@ -11426,6 +11705,6 @@ function touchSession(state) {
   return { ...state, updatedAt: (/* @__PURE__ */ new Date()).toISOString() };
 }
 
-export { CLAUDE_CODE_CREDENTIALS_KEY, COMPILE_MANIFEST_FILENAME, CONNECTOR_MUTATE_NOT_READY, CapabilityRegistry, DEFAULT_CAPABILITY_CALL_TIMEOUT_MS, DEFAULT_COALESCE_MS, DEFAULT_FLOW_MUTATE_CONNECTOR_WAIT_MS, MOUNT_LIST_MAX_DEPTH, MOUNT_LIST_MAX_ENTRIES, MOUNT_READ_DEADLINE_FACTOR, MOUNT_READ_MAX_CHUNK_BYTES, MOUNT_STAT_BUDGET_MS, MOUNT_STAT_MAX_ENTRIES, MOUNT_TREE_OP_DEADLINE_FACTOR, MarkdownStreamer, PreInitRingSink, ResourceOperationError, SESSION_ROOT_WRITABLE_DIRS, SESSION_ROOT_WRITABLE_FILES, WS_AUTH_TOKEN_ENV, WS_AUTH_TOKEN_FILE_ENV, agentDefinitionExists, bootstrapCapabilityRegistry, bootstrapRunnerLogStore, buildAgentResources, buildClientCapabilityHandler, buildConnectorTokenMediator, buildContextSection, buildEnvironmentSection, buildResourcesAvailablePayload, buildStoreSnapshotReplay, builtinCapabilities, capabilityLogInstance, clearPreInitRingSink, clearSession, compileComposition, computeCapabilitySignature, computeDirectoryTotals, connectorRefreshKind, createAgentSession, createFlowConnectorReadiness, createManagedCodexSubpromptDriver, createSessionStimulusBus, defineCapability, deleteSession, dispatchResourceRequest, dispatchRunnerCapabilityInvocation, driverActiveAfterTurnEnd, emitSystemPromptComposed, ensureClaudeSettingsDisablesConnectors, ensureGitConfigInclude, executeConnectorMutate, extractClaudeAiOauthExpiresAt, flowRunDrivesTurns, flowStartNeedsDriverRestart, getPreInitRingSink, handleMountResourceRequest, handleResourceRequest, handleSessionRootResourceRequest, hasNonTerminalFlow, hostOpResumeStimulus, installPreInitRingSink, isSessionRootPathAllowed, isTerminalFlowStatus, listSessions, loadAgentManifest, loadCompileManifest, loadCompileManifestFromDir, loadManagedCodexHostConfig, loadSession, loadSessionById, mcpAuthSecretKey, newSession, nulTailPaddingLength, pickChatFlowTarget, pickFlowToolTarget, pickRepointedManager, planFlowMutate, prepareCodexTools, reconcilePendingDecisions, reconnectedRunNeedsAgentTurn, recreateKeepingLiveFlows, registerActiveFlow, registerCompositionCapabilities, rejectCapabilityOnApprovalDeny, rejectPendingCapabilityCallsOnDisconnect, resetRunnerLogStore, resolveAgentComposition, resolveAgentMixins, resolveBinding, resolveCapabilityCallTimeoutMs, resolveCapabilityResult, resolveComposition, resolveFlowMutateConnectorWaitMs, resolveMixin, restoredRunHasWorkToResume, runAgentChat, saveSession, setCurrentSession, setUpFlowConnector, startAgentServer, stimulusFromMetas, supportsLiveToolUpdates, takeRunnerWsAuthToken, toActiveFlowTarget, touchSession, validateInputResponse, writeClaudeCodeCredentialsFile };
-//# sourceMappingURL=chunk-AO7TCPOS.js.map
-//# sourceMappingURL=chunk-AO7TCPOS.js.map
+export { CLAUDE_CODE_CREDENTIALS_KEY, COMPILE_MANIFEST_FILENAME, CONNECTOR_MUTATE_NOT_READY, CapabilityRegistry, DEFAULT_CAPABILITY_CALL_TIMEOUT_MS, DEFAULT_COALESCE_MS, DEFAULT_FLOW_MUTATE_CONNECTOR_WAIT_MS, MOUNT_LIST_MAX_DEPTH, MOUNT_LIST_MAX_ENTRIES, MOUNT_READ_DEADLINE_FACTOR, MOUNT_READ_MAX_CHUNK_BYTES, MOUNT_STAT_BUDGET_MS, MOUNT_STAT_MAX_ENTRIES, MOUNT_TREE_OP_DEADLINE_FACTOR, MarkdownStreamer, PreInitRingSink, ResourceOperationError, SESSION_ROOT_WRITABLE_DIRS, SESSION_ROOT_WRITABLE_FILES, WS_AUTH_TOKEN_ENV, WS_AUTH_TOKEN_FILE_ENV, agentDefinitionExists, bootstrapCapabilityRegistry, bootstrapRunnerLogStore, buildAgentResources, buildClientCapabilityHandler, buildConnectorTokenMediator, buildContextSection, buildEnvironmentSection, buildResourcesAvailablePayload, buildStoreSnapshotReplay, builtinCapabilities, capabilityLogInstance, capabilitySignatureInputs, clearPreInitRingSink, clearSession, compileComposition, computeCapabilitySignature, computeDirectoryTotals, connectorRefreshKind, createAgentSession, createFlowConnectorReadiness, createManagedCodexSubpromptDriver, createSessionStimulusBus, defineCapability, deleteSession, dispatchResourceRequest, dispatchRunnerCapabilityInvocation, driverActiveAfterTurnEnd, emitSystemPromptComposed, ensureClaudeSettingsDisablesConnectors, ensureGitConfigInclude, executeConnectorMutate, extractClaudeAiOauthExpiresAt, flowRunDrivesTurns, flowStartNeedsDriverRestart, getPreInitRingSink, handleMountResourceRequest, handleResourceRequest, handleSessionRootResourceRequest, hasNonTerminalFlow, hostOpResumeStimulus, installPreInitRingSink, isSessionRootPathAllowed, isTerminalFlowStatus, listSessions, loadAgentManifest, loadCompileManifest, loadCompileManifestFromDir, loadManagedCodexHostConfig, loadSession, loadSessionById, mcpAuthSecretKey, newSession, nulTailPaddingLength, pickChatFlowTarget, pickFlowToolTarget, pickRepointedManager, planFlowMutate, prepareCodexTools, reconcilePendingDecisions, reconnectedRunNeedsAgentTurn, recreateKeepingLiveFlows, registerActiveFlow, registerCompositionCapabilities, rejectCapabilityOnApprovalDeny, rejectPendingCapabilityCallsOnDisconnect, resetRunnerLogStore, resolveAgentComposition, resolveAgentMixins, resolveBinding, resolveCapabilityCallTimeoutMs, resolveCapabilityResult, resolveComposition, resolveFlowMutateConnectorWaitMs, resolveMixin, restoredRunHasWorkToResume, runAgentChat, saveSession, setCurrentSession, setUpFlowConnector, startAgentServer, stimulusFromMetas, supportsLiveToolUpdates, takeRunnerWsAuthToken, toActiveFlowTarget, touchSession, validateInputResponse, writeClaudeCodeCredentialsFile };
+//# sourceMappingURL=chunk-USJWXEXS.js.map
+//# sourceMappingURL=chunk-USJWXEXS.js.map