1 files changed, 24 insertions, 0 deletions

diff --git a/renderer/src/App.tsx b/renderer/src/App.tsx
index 7c5c969..5fb3dd1 100644
--- a/renderer/src/App.tsx
+++ b/renderer/src/App.tsx
@@ -432,6 +432,14 @@ export function App() {
           phase: advanced.phase,
           git_branch: advanced.git_branch,
         });
+        // Keep sessions array in sync so Sidebar reflects the new phase immediately.
+        setSessions((prev) =>
+          prev.map((s) =>
+            s.id === id
+              ? { ...s, phase: advanced.phase, git_branch: advanced.git_branch }
+              : s
+          )
+        );
         setLoadingBySession((prev) => ({ ...prev, [id]: true }));
         const initialMsg =
           advanced.phase === "plan"
@@ -479,6 +487,22 @@ export function App() {
     setMessages([]);
     setDocumentContent("");
     setOriginalContent("");
+
+    // For sessions that start beyond research, kick off Claude immediately
+    // with the same message used when advancing into that phase via Submit.
+    if (phase === "plan" || phase === "implement") {
+      const initialMsg =
+        phase === "plan"
+          ? "Create a detailed implementation plan based on the research."
+          : "Begin implementing the plan.";
+      setLoadingBySession((prev) => ({ ...prev, [session.id]: true }));
+      try {
+        await api.sendMessage(session.id, initialMsg);
+      } catch (err) {
+        setError(err instanceof Error ? err.message : "Failed to start session");
+        setLoadingBySession((prev) => ({ ...prev, [session.id]: false }));
+      }
+    }
   };
 
   const handleDeleteProject = async (id: string) => {