From d22bd71d0dd3a5f5d5306e161a14c222f364b6c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A4cker=2C=20Henning?= <henning.haecker@vector.com>
Date: Fri, 24 Apr 2026 15:58:05 +0200
Subject: [PATCH] fix(start-work): narrow existing state before resume

---
 src/hooks/start-work/context-info-builder.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hooks/start-work/context-info-builder.ts b/src/hooks/start-work/context-info-builder.ts
index 394b75d35..c91ad6ec2 100644
--- a/src/hooks/start-work/context-info-builder.ts
+++ b/src/hooks/start-work/context-info-builder.ts
@@ -495,7 +495,7 @@ export function buildStartWorkContextInfo(params: {
       worktreeBlock,
       directory: ctx.directory,
     })
-  } else if (shouldResumeExistingState({ existingState, preferredPlanPath })) {
+  } else if (existingState && shouldResumeExistingState({ existingState, preferredPlanPath })) {
     contextInfo = buildExistingSessionContext({
       existingState,
       sessionId,