Skip to content

Commit b7bc466

Browse files
shivamhwpclaude
andcommitted
fix(server): forget a thread's load before refreshing its linking tools
Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent f67c718 commit b7bc466

1 file changed

Lines changed: 21 additions & 22 deletions

File tree

‎apps/server/src/orchestration-v2/ProviderSessionManager.ts‎

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1737,31 +1737,35 @@ export const layerWithOptions = (
17371737
})
17381738
.pipe(Effect.catchCause(() => Effect.succeed(true)));
17391739
if (hasPendingWork) return;
1740-
const latest = (yield* Ref.get(sessions)).get(key);
1741-
if (
1742-
latest?.runtime !== entry.runtime ||
1743-
latest.linkedEnvironmentsByThread.get(input.threadId) !== loadedWith ||
1744-
hasBusyTurn(latest, input.providerThread.id)
1745-
) {
1746-
return;
1747-
}
1740+
// Forget the load first so a timed-out unload still resumes natively next turn.
1741+
const unloading = yield* Ref.modify(sessions, (current) => {
1742+
const latest = current.get(key);
1743+
if (
1744+
latest?.runtime !== entry.runtime ||
1745+
latest.linkedEnvironmentsByThread.get(input.threadId) !== loadedWith ||
1746+
hasBusyTurn(latest, input.providerThread.id)
1747+
) {
1748+
return [false, current] as const;
1749+
}
1750+
const loadedProviderThreadKeyByThread = new Map(
1751+
latest.loadedProviderThreadKeyByThread,
1752+
);
1753+
loadedProviderThreadKeyByThread.delete(input.threadId);
1754+
return [
1755+
true,
1756+
new Map(current).set(key, { ...latest, loadedProviderThreadKeyByThread }),
1757+
] as const;
1758+
});
1759+
if (!unloading) return;
17481760
yield* unloadThread({ providerThread: input.providerThread }).pipe(
17491761
Effect.timeout(UNLOAD_THREAD_TIMEOUT_MS),
17501762
Effect.tap(() =>
17511763
Ref.update(sessions, (current) => {
17521764
const latest = current.get(key);
17531765
if (latest?.runtime !== entry.runtime) return current;
1754-
const loadedProviderThreadKeyByThread = new Map(
1755-
latest.loadedProviderThreadKeyByThread,
1756-
);
1757-
loadedProviderThreadKeyByThread.delete(input.threadId);
17581766
const linkedEnvironmentsByThread = new Map(latest.linkedEnvironmentsByThread);
17591767
linkedEnvironmentsByThread.delete(input.threadId);
1760-
return new Map(current).set(key, {
1761-
...latest,
1762-
loadedProviderThreadKeyByThread,
1763-
linkedEnvironmentsByThread,
1764-
});
1768+
return new Map(current).set(key, { ...latest, linkedEnvironmentsByThread });
17651769
}),
17661770
),
17671771
Effect.catchCause((cause) =>
@@ -2220,14 +2224,9 @@ export const layerWithOptions = (
22202224
latest.loadedProviderThreadKeyByThread,
22212225
);
22222226
loadedProviderThreadKeyByThread.delete(threadId);
2223-
const linkedEnvironmentsByThread = new Map(latest.linkedEnvironmentsByThread);
2224-
if (linkedEnvironmentsByThread.has(threadId)) {
2225-
linkedEnvironmentsByThread.set(threadId, null);
2226-
}
22272227
return new Map(sessions).set(key, {
22282228
...latest,
22292229
loadedProviderThreadKeyByThread,
2230-
linkedEnvironmentsByThread,
22312230
});
22322231
});
22332232
}

0 commit comments

Comments
 (0)