Skip to content

A self-improving RLM agent for coding workflows and long-running autonomous tasks.

Rust

fix(coding-agent): prevent overlapping daemon snapshot catch-ups (#580)

Florian Brand699f43259b10
diff --git a/packages/coding-agent/CHANGELOG.md b/packages/coding-agent/CHANGELOG.md
index b52274531c..9866e0106a 100644
--- a/packages/coding-agent/CHANGELOG.md
+++ b/packages/coding-agent/CHANGELOG.md
@@ -7,6 +7,7 @@
- Changed top-level CLI help and documentation to expose autonomous mode, quality gates, and their limits.
- Fixed compaction retaining runtime resources after an explicitly deleted subagent had a transient cleanup failure.
- Fixed long-running thinking timers to display hours and days instead of unbounded minutes.
+- Fixed overlapping daemon snapshot catch-ups closing healthy workers and preventing new sessions from starting.
## [0.4.0] - 2026-08-01
diff --git a/packages/coding-agent/src/modes/daemon/active-session-state.ts b/packages/coding-agent/src/modes/daemon/active-session-state.ts
index b0a9c7f0ee..7d6c2433e4 100644
--- a/packages/coding-agent/src/modes/daemon/active-session-state.ts
+++ b/packages/coding-agent/src/modes/daemon/active-session-state.ts
@@ -22,6 +22,7 @@ export interface DaemonSocketClient {
snapshotActiveSessionIds?: Set<string>;
snapshotActiveSessionCounts?: Map<string, number>;
snapshotTransferAbortControllers?: Map<string, AbortController>;
+ snapshotTransferTails?: Map<string, Promise<void>>;
detachInput: () => void;
supportsExtensionUi: boolean;
capabilities: Set<DaemonClientCapability>;
diff --git a/packages/coding-agent/src/modes/daemon/daemon-mode.ts b/packages/coding-agent/src/modes/daemon/daemon-mode.ts
index a284cb39c6..e76e012f75 100644
--- a/packages/coding-agent/src/modes/daemon/daemon-mode.ts
+++ b/packages/coding-agent/src/modes/daemon/daemon-mode.ts
@@ -3913,6 +3913,16 @@ export class AgentDaemon {
transcript.dispose?.();
return;
}
+ client.snapshotTransferTails ??= new Map();
+ const previousTransfer = client.snapshotTransferTails.get(result.activeSessionId);
+ let finishTransfer!: () => void;
+ const transfer = new Promise<void>((resolve) => {
+ finishTransfer = resolve;
+ });
+ client.snapshotTransferTails.set(result.activeSessionId, transfer);
+ if (previousTransfer) {
+ await previousTransfer;
+ }
const { messages: _messages, ...snapshot } = result.snapshot;
const snapshotBegin: DaemonOutbound = {
type: "session_snapshot_begin",
@@ -4021,6 +4031,10 @@ export class AgentDaemon {
await deliverSnapshotFailure(streamError);
throw streamError;
} finally {
+ finishTransfer();
+ if (client.snapshotTransferTails.get(result.activeSessionId) === transfer) {
+ client.snapshotTransferTails.delete(result.activeSessionId);
+ }
finishClientSnapshotStreaming(client, result.activeSessionId);
transcript.dispose?.();
if (!client.snapshotStreaming && client.catchupActiveSessionIds?.size) {
diff --git a/packages/coding-agent/src/modes/daemon/daemon-supervisor.ts b/packages/coding-agent/src/modes/daemon/daemon-supervisor.ts
index 096eea28f5..a27d859fe9 100644
--- a/packages/coding-agent/src/modes/daemon/daemon-supervisor.ts
+++ b/packages/coding-agent/src/modes/daemon/daemon-supervisor.ts
@@ -296,6 +296,8 @@ class SupervisorRecoveryCancelledError extends Error {
readonly code = "supervisor_recovery_cancelled" as const;
}
+class SnapshotLoadInvalidatedError extends Error {}
+
function isSupervisorGenerationStale(error: unknown): boolean {
return (
typeof error === "object" &&
@@ -2841,32 +2843,73 @@ export class DaemonSupervisor {
}
if (!result) {
const snapshotLoadKey = `${activeSessionId}:${client.capabilities.has("chunked_snapshot") ? "chunked" : "full"}`;
- let loading = match.worker.snapshotLoads.get(snapshotLoadKey);
- if (!loading) {
- const observedSnapshotId =
- match.worker.transcriptCaches.get(activeSessionId)?.snapshotId ??
- match.worker.snapshotCache.get(activeSessionId)?.snapshotStream?.id;
- loading = (async () => {
- if (!match.worker.client) {
- throw new Error("Session worker is not connected");
+ let retryInvalidatedLoad = true;
+ while (!result) {
+ let loading = match.worker.snapshotLoads.get(snapshotLoadKey);
+ if (!loading) {
+ const observedSnapshotId =
+ match.worker.transcriptCaches.get(activeSessionId)?.snapshotId ??
+ match.worker.snapshotCache.get(activeSessionId)?.snapshotStream?.id;
+ loading = (async () => {
+ if (!match.worker.client) {
+ throw new Error("Session worker is not connected");
+ }
+ const response = await match.worker.client.request({
+ type: "attach",
+ activeSessionId,
+ capabilities: client.capabilities.has("chunked_snapshot")
+ ? ["attach_snapshot", "event_sequence", "slim_attach", "chunked_snapshot"]
+ : ["attach_snapshot", "event_sequence", "slim_attach"],
+ supportsExtensionUi: false,
+ env: command.env ?? collectDaemonClientEnv(),
+ });
+ const loaded = attachResultFromResponse(response);
+ if (match.worker.snapshotLoads.get(snapshotLoadKey) !== loading) {
+ throw new SnapshotLoadInvalidatedError("Session snapshot changed during attach");
+ }
+ return this.cacheLoadedSnapshot(match.worker, activeSessionId, loaded, observedSnapshotId);
+ })();
+ match.worker.snapshotLoads.set(snapshotLoadKey, loading);
+ void loading.then(
+ async (loaded) => {
+ try {
+ const snapshotId = loaded.snapshotStream?.id;
+ const transcript = snapshotId
+ ? this.snapshotGeneration(match.worker, loaded.activeSessionId, snapshotId)?.transcript
+ : undefined;
+ if (transcript && !transcript.complete) {
+ let chunkIndex = 0;
+ while (await transcript.waitForChunk(chunkIndex)) {
+ chunkIndex++;
+ }
+ }
+ } catch {
+ // Failed transfers must allow a fresh snapshot request.
+ } finally {
+ if (match.worker.snapshotLoads.get(snapshotLoadKey) === loading) {
+ match.worker.snapshotLoads.delete(snapshotLoadKey);
+ }
+ }
+ },
+ () => {
+ if (match.worker.snapshotLoads.get(snapshotLoadKey) === loading) {
+ match.worker.snapshotLoads.delete(snapshotLoadKey);
+ }
+ },
+ );
+ }
+ try {
+ result = await loading;
+ } catch (error) {
+ if (!(error instanceof SnapshotLoadInvalidatedError)) {
+ throw error;
}
- const response = await match.worker.client.request({
- type: "attach",
- activeSessionId,
- capabilities: client.capabilities.has("chunked_snapshot")
- ? ["attach_snapshot", "event_sequence", "slim_attach", "chunked_snapshot"]
- : ["attach_snapshot", "event_sequence", "slim_attach"],
- supportsExtensionUi: false,
- env: command.env ?? collectDaemonClientEnv(),
- });
- const loaded = attachResultFromResponse(response);
- return this.cacheLoadedSnapshot(match.worker, activeSessionId, loaded, observedSnapshotId);
- })().finally(() => {
- match.worker.snapshotLoads.delete(snapshotLoadKey);
- });
- match.worker.snapshotLoads.set(snapshotLoadKey, loading);
+ if (!retryInvalidatedLoad) {
+ throw error;
+ }
+ retryInvalidatedLoad = false;
+ }
}
- result = await loading;
}
const wasAttached = client.attachedActiveSessionIds.has(activeSessionId);
let transcript: SnapshotTranscriptCache | undefined;
@@ -3645,6 +3688,8 @@ export class DaemonSupervisor {
if (!transcriptChanged) {
return;
}
+ worker.snapshotLoads.delete(`${activeSessionId}:chunked`);
+ worker.snapshotLoads.delete(`${activeSessionId}:full`);
const transcript = worker.transcriptCaches.get(activeSessionId);
if (transcript) {
this.retireWorkerSnapshotCache(worker, activeSessionId, transcript);