@ferris1225/pi-subagents 4.2.4 → 4.2.5

package/src/runtime.ts

@@ -258,7 +258,7 @@ export function createRuntime(pi: ExtensionAPI, configPath: string): SubagentRun
 			// thread whose settlement finished during the wait above already
 			// wrote (or removed) its own record; the lastResult-derived state
 			// below matches it.
-			const settledIds: number[] = [];
+			const settled: Array<{ runId: number; cwd: string }> = [];
 			const records: ThreadRecord[] = [];
 			for (const thread of runtime.threads.values()) {
 				if (thread.retired) continue;
@@ -272,11 +272,11 @@ export function createRuntime(pi: ExtensionAPI, configPath: string): SubagentRun
 					state = "parked";
 				}
 				if (state === "parked") records.push(threadRecordFromThread(thread, state));
-				else settledIds.push(thread.id);
+				else settled.push({ runId: thread.id, cwd: thread.cwd });
 			}
 			await Promise.all([
 				...records.map((record) => upsertThreadRecord(runtime.configPath, record).catch(() => undefined)),
-				...settledIds.map((runId) => removeThreadRecord(runtime.configPath, runId).catch(() => undefined)),
+				...settled.map(({ runId, cwd }) => removeThreadRecord(runtime.configPath, runId, cwd).catch(() => undefined)),
 			]);
 			// Retained-failure recovery records are persisted by the finalization
 			// itself; shutdown only drops sessions no record claims anymore.

package/src/thread-lifecycle.ts

@@ -27,6 +27,7 @@ import {
 } from "./config.ts";
 import {
 	isCurrentBoot,
+	migrateLegacyThreadsManifest,
 	readThreadRecords,
 	referencedDurablePaths,
 	removeThreadRecord,
@@ -225,7 +226,7 @@ export function persistThreadCheckpoint(
 ): void {
 	const write = state === "parked"
 		? upsertThreadRecord(runtime.configPath, threadRecordFromThread(thread, state))
-		: removeThreadRecord(runtime.configPath, thread.id);
+		: removeThreadRecord(runtime.configPath, thread.id, thread.cwd);
 	void write.catch(() => undefined);
 }
 
@@ -1145,7 +1146,7 @@ async function discardRestoredRecord(runtime: SubagentRuntime, record: ThreadRec
 		const worktree = await restoreWorktreeIsolation(record.worktree).catch(() => undefined);
 		await worktree?.discard().catch(() => undefined);
 	}
-	await removeThreadRecord(runtime.configPath, record.runId).catch(() => undefined);
+	await removeThreadRecord(runtime.configPath, record.runId, record.cwd).catch(() => undefined);
 }
 
 /** Project-scoped <projectRoot>/results for a completion's artifacts. */
@@ -1273,6 +1274,9 @@ export async function restoreDurableThreads(runtime: SubagentRuntime): Promise<n
 export function bootstrapDurableState(runtime: SubagentRuntime): Promise<void> {
 	const restore = (async () => {
 		try {
+			// Records from a pre-per-project manifest must land in their project
+			// roots before restore reads anything.
+			await migrateLegacyThreadsManifest(runtime.configPath);
 			runtime.restoredRunIds = await restoreDurableThreads(runtime);
 		} catch {
 			/* restore is best-effort */

package/src/tools.ts

@@ -344,7 +344,7 @@ export function registerLookupTools(pi: ExtensionAPI, runtime: SubagentRuntime):
 				runtime.retireThreadSession(thread);
 				// The destructive retire removes the durable record with the session;
 				// an id never resurrects after subagent_stop.
-				await removeThreadRecord(runtime.configPath, runId).catch(() => undefined);
+				await removeThreadRecord(runtime.configPath, runId, thread.cwd).catch(() => undefined);
 				if (thread.lifecycleVersion === stopVersion && thread.lifecycleOperation === "stop") {
 					thread.lifecycleOperation = undefined;
 				}