Skip to content

fix(server): resume working threads after graceful restart via #9167 #446

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
patroza merged 2 commits into from
Sep 2, 2026
Merged

fix(server): resume working threads after graceful restart via #9167 #446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14308a5
fix(server): drop Tim Smart auto-resume; keep upstream #9167
github-actions[bot] Sep 2, 2026
a545bf9
fix(server): resume working threads after graceful restarts
github-actions[bot] Sep 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 2 additions & 17 deletions apps/server/src/orchestration/Layers/OrphanSessionRecovery.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import {
type OrphanSessionRecoveryShape,
} from "../Services/OrphanSessionRecovery.ts";
import { ProjectionSnapshotQuery } from "../Services/ProjectionSnapshotQuery.ts";
import { readProviderRestartRecoveryMarker } from "../../provider/ProviderRestartRecovery.ts";
import { ProviderService } from "../../provider/Services/ProviderService.ts";
import { ProviderSessionDirectory } from "../../provider/Services/ProviderSessionDirectory.ts";

Expand Down Expand Up @@ -228,25 +227,14 @@ const make = Effect.gen(function* () {
.pipe(Effect.orElseSucceed(() => ({ threads: [] as const })));
const bindings = yield* directory.listBindings().pipe(Effect.orElseSucceed(() => []));
const threadIds = new Set<string>();
const recoveryMarkedThreadIds = new Set(
bindings.flatMap((binding) =>
readProviderRestartRecoveryMarker(binding.runtimePayload) === undefined
? []
: [String(binding.threadId)],
),
);

let settledSessions = 0;
let interruptedSessions = 0;
for (const thread of snapshot.threads) {
if (recoveryMarkedThreadIds.has(String(thread.id))) {
continue;
}
const claimsLive = isLiveClaimingSessionStatus(thread.session?.status);
const processIsLive = claimsLive ? yield* hasLiveProcess(thread.id) : false;
// Provider restart reconciliation runs before this audit and may
// already have resumed the thread. Never classify that replacement
// process as an orphan merely because its projected session is live.
// A replacement process started after boot (for example #9167
// continuation) is live — never classify that as an orphan.
if (
!shouldSettleAfterServerRestart({
claimsLive,
Expand All @@ -269,9 +257,6 @@ const make = Effect.gen(function* () {

let settledRuntimes = 0;
for (const binding of bindings) {
if (recoveryMarkedThreadIds.has(String(binding.threadId))) {
continue;
}
const claimsLive = binding.status === "running" || binding.status === "starting";
if (!claimsLive) {
continue;
Expand Down
Loading
Loading