1 files changed, 23 insertions, 7 deletions

diff --git a/src/main/ipc/handlers.ts b/src/main/ipc/handlers.ts
index f0a5b82..774eb63 100644
--- a/src/main/ipc/handlers.ts
+++ b/src/main/ipc/handlers.ts
@@ -2,7 +2,7 @@ import { ipcMain, dialog, type BrowserWindow } from "electron";
 import * as projects from "../db/projects";
 import * as sessions from "../db/sessions";
 import * as claude from "../claude";
-import { createSessionBranch } from "../git";
+import { createSessionBranch, ensureGitIgnore } from "../git";
 import type { UserPermissionMode } from "../claude/phases";
 
 export function registerIpcHandlers(mainWindow: BrowserWindow): void {
@@ -26,12 +26,11 @@ export function registerIpcHandlers(mainWindow: BrowserWindow): void {
 
     const session = sessions.createSession(projectId, name);
 
-    const branchName = createSessionBranch(project.path, session.name, session.id);
-    if (branchName) {
-      sessions.updateSession(session.id, { git_branch: branchName });
-    }
+    // Ensure .claude-flow/ is gitignored from day one.
+    // Branch creation is deferred until the session advances to implement.
+    try { ensureGitIgnore(project.path); } catch { /* non-fatal */ }
 
-    return { ...session, git_branch: branchName ?? null };
+    return session;
   });
   
   ipcMain.handle("sessions:delete", (_, id: string) => {
@@ -103,7 +102,24 @@ export function registerIpcHandlers(mainWindow: BrowserWindow): void {
   ipcMain.handle("workflow:advance", (_, sessionId: string) => {
     const session = sessions.getSession(sessionId);
     if (!session) throw new Error("Session not found");
-    return claude.advancePhase(session);
+
+    const nextPhase = claude.advancePhase(session);
+    if (!nextPhase) return null;
+
+    let git_branch = session.git_branch;
+
+    if (nextPhase === "implement") {
+      const project = projects.getProject(session.project_id);
+      if (project) {
+        const branchName = createSessionBranch(project.path, session.name, session.id);
+        if (branchName) {
+          sessions.updateSession(sessionId, { git_branch: branchName });
+          git_branch = branchName;
+        }
+      }
+    }
+
+    return { phase: nextPhase, git_branch };
   });
 
   ipcMain.handle(