From d40275c1f1e4b068cb8a058c863d4f83a33e889e Mon Sep 17 00:00:00 2001
From: Charles Vien <charles.v@posthog.com>
Date: Mon, 13 Apr 2026 12:22:03 -0700
Subject: [PATCH] Fix session race condition killing active agents and retry
 loop

---
 apps/code/src/main/services/agent/service.ts                | 5 ++++-
 apps/code/src/renderer/features/sessions/service/service.ts | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/code/src/main/services/agent/service.ts b/apps/code/src/main/services/agent/service.ts
index 5ae20bf0b..ba8228961 100644
--- a/apps/code/src/main/services/agent/service.ts
+++ b/apps/code/src/main/services/agent/service.ts
@@ -573,7 +573,10 @@ When creating pull requests, add the following footer at the end of the PR descr
       }
 
       for (const proc of this.processTracking.getByTaskId(taskId)) {
-        if (proc.category === "agent" || proc.category === "child") {
+        if (
+          (proc.category === "agent" || proc.category === "child") &&
+          proc.metadata?.taskRunId === taskRunId
+        ) {
           this.processTracking.kill(proc.pid);
         }
       }
diff --git a/apps/code/src/renderer/features/sessions/service/service.ts b/apps/code/src/renderer/features/sessions/service/service.ts
index 2e20eaa82..c0bb1a8b9 100644
--- a/apps/code/src/renderer/features/sessions/service/service.ts
+++ b/apps/code/src/renderer/features/sessions/service/service.ts
@@ -1121,6 +1121,7 @@ export class SessionService {
           isPromptPending: false,
           isCompacting: false,
           promptStartedAt: null,
+          initialPrompt: undefined,
         });
       } else {
         sessionStoreSetters.updateSession(session.taskRunId, {