Skip to content

Commit a0ffa0e

Browse files
committed
Drop foreign-pid hosted rows on restart; remove unreachable branch
The hosted rehydrate branch ran for every surviving row, so a foreign- pid hosted set would re-host sessions whose harnesses died with the old process (the wake hazard the wrapup branch already guards against). Hosted rows now rehydrate only on a same-process reload; the restart branch deletes them.
1 parent 006650b commit a0ffa0e

2 files changed

Lines changed: 11 additions & 3 deletions

File tree

‎src/runtime.ts‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -504,6 +504,14 @@ export async function createRuntime(input: {
504504
} else if (row.kind === "watchers") {
505505
watchers.hydrate((row.value ?? []) as Watcher[]);
506506
} else if (row.kind === "hosted") {
507+
// Rehydrate only on a same-process reload. A foreign-pid hosted row
508+
// (restart) would re-host sessions whose harnesses died - dropping
509+
// it is the point: the resumed session re-hosts itself through the
510+
// event stream instead.
511+
if (!samePid) {
512+
db.runtimeStateDelete(row.kind, row.sessionID);
513+
continue;
514+
}
507515
for (const id of (row.value ?? []) as string[]) rehostedSessions.add(id);
508516
} else if (row.kind === "child") {
509517
const rec = row.value as { parentID?: string; snapshot?: ToolInteraction[]; metrics?: { new: number; updated: number; deleted: number } };
@@ -527,9 +535,6 @@ export async function createRuntime(input: {
527535
db.runtimeStateDelete(row.kind, row.sessionID);
528536
continue;
529537
}
530-
} else if (row.kind === "hosted") {
531-
db.runtimeStateDelete(row.kind, row.sessionID);
532-
continue;
533538
} else if (row.kind === "wrapup") {
534539
if (!samePid) {
535540
// An armed wrap-up inherited across a restart could auto-fire

‎tests/state-persistence.test.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,9 @@ describe("runtime rehydration through server()", () => {
147147
// Restart case: foreign pid (the api stamps the current pid by default,
148148
// so override), no startup resume -> pruned.
149149
db.runtimeStatePut("buffer", "ses_dead", [ix("ses_dead")], WORK_DIR, process.pid + 999);
150+
// A foreign-pid hosted set must be dropped too - re-hosting it would
151+
// wake sessions whose harnesses died with the old process.
152+
db.runtimeStatePut("hosted", WORK_DIR, ["ses_dead"], WORK_DIR, process.pid + 999);
150153
db.close();
151154

152155
let hooks: { dispose?: () => Promise<void> } | undefined;

0 commit comments

Comments
 (0)