4 files changed, 70 insertions, 6 deletions

diff --git a/src/main/git.ts b/src/main/git.ts
index 20362a7..ec81e8f 100644
--- a/src/main/git.ts
+++ b/src/main/git.ts
@@ -58,6 +58,29 @@ export function ensureGitRepo(projectPath: string): void {
 }
 
 // ---------------------------------------------------------------------------
+// Current branch query
+// ---------------------------------------------------------------------------
+
+/**
+ * Returns the name of the currently checked-out branch,
+ * or null if git is unavailable or HEAD is detached.
+ */
+export function getCurrentBranch(projectPath: string): string | null {
+  try {
+    return (
+      execFileSync("git", ["branch", "--show-current"], {
+        cwd: projectPath,
+        stdio: "pipe",
+      })
+        .toString()
+        .trim() || null
+    );
+  } catch {
+    return null;
+  }
+}
+
+// ---------------------------------------------------------------------------
 // Branch creation
 // ---------------------------------------------------------------------------
 
diff --git a/src/main/index.ts b/src/main/index.ts
index a7bed00..f913ac0 100644
--- a/src/main/index.ts
+++ b/src/main/index.ts
@@ -1,4 +1,4 @@
-import { app, BrowserWindow, Menu } from "electron";
+import { app, BrowserWindow, Menu, ipcMain } from "electron";
 import path from "node:path";
 import { getDb, closeDb } from "./db";
 import { registerIpcHandlers } from "./ipc/handlers";
@@ -23,6 +23,18 @@ function createWindow() {
 
   registerIpcHandlers(mainWindow);
 
+  // Maximize toggle — works identically on Linux and macOS
+  ipcMain.handle("window:toggleMaximize", () => {
+    if (mainWindow!.isMaximized()) mainWindow!.unmaximize();
+    else mainWindow!.maximize();
+  });
+
+  // Push state to renderer so the button glyph stays accurate.
+  // On macOS, clicking the green traffic light also fires these events,
+  // keeping our custom button in sync with the native control.
+  mainWindow.on("maximize",   () => mainWindow!.webContents.send("window:maximized", true));
+  mainWindow.on("unmaximize", () => mainWindow!.webContents.send("window:maximized", false));
+
   if (isDev) {
     const url = process.env.VITE_DEV_SERVER_URL ?? "http://localhost:5173";
     mainWindow.loadURL(url).finally(() => {
diff --git a/src/main/ipc/handlers.ts b/src/main/ipc/handlers.ts
index bc7d78d..e0863f3 100644
--- a/src/main/ipc/handlers.ts
+++ b/src/main/ipc/handlers.ts
@@ -3,7 +3,7 @@ import * as projects from "../db/projects";
 import * as sessions from "../db/sessions";
 import * as claude from "../claude";
 import * as settingsDb from "../db/settings";
-import { createSessionBranch, ensureGitIgnore } from "../git";
+import { createSessionBranch, ensureGitIgnore, ensureGitRepo, getCurrentBranch } from "../git";
 import type { UserPermissionMode } from "../claude/phases";
 import { getDefaultSystemPromptTemplate } from "../claude/phases";
 
@@ -113,10 +113,27 @@ export function registerIpcHandlers(mainWindow: BrowserWindow): void {
     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;
+        const branchingSetting = settingsDb.getSetting("git.branchingEnabled");
+        const branchingEnabled = branchingSetting === "true"; // opt-in; default = off
+
+        // Always ensure repo + gitignore so commits work regardless of mode
+        try { ensureGitIgnore(project.path); } catch { /* non-fatal */ }
+        try { ensureGitRepo(project.path); } catch { /* non-fatal */ }
+
+        if (branchingEnabled) {
+          // createSessionBranch internally calls ensureGitIgnore/ensureGitRepo again
+          // (belt-and-suspenders), then checks out a new claude-flow/<slug>-<id> branch
+          const branchName = createSessionBranch(project.path, session.name, session.id);
+          if (branchName) {
+            sessions.updateSession(sessionId, { git_branch: branchName });
+            git_branch = branchName;
+          }
+        } else {
+          // No new branch — commit to whatever branch is currently checked out.
+          // Store the branch name so autoCommitTurn's boolean guard passes.
+          const currentBranch = getCurrentBranch(project.path) ?? "main";
+          sessions.updateSession(sessionId, { git_branch: currentBranch });
+          git_branch = currentBranch;
         }
       }
     }
diff --git a/src/main/preload.ts b/src/main/preload.ts
index 52e947b..44467db 100644
--- a/src/main/preload.ts
+++ b/src/main/preload.ts
@@ -62,6 +62,10 @@ export interface ClaudeFlowAPI {
 
   // Dialogs
   selectDirectory: () => Promise<string | null>;
+
+  // Window
+  toggleMaximize: () => Promise<void>;
+  onWindowMaximized: (cb: (isMaximized: boolean) => void) => () => void;
 }
 
 const api: ClaudeFlowAPI = {
@@ -127,6 +131,14 @@ const api: ClaudeFlowAPI = {
     const result = await ipcRenderer.invoke("dialog:selectDirectory");
     return result;
   },
+
+  // Window
+  toggleMaximize: () => ipcRenderer.invoke("window:toggleMaximize"),
+  onWindowMaximized: (cb) => {
+    const handler = (_: IpcRendererEvent, val: boolean) => cb(val);
+    ipcRenderer.on("window:maximized", handler);
+    return () => ipcRenderer.removeListener("window:maximized", handler);
+  },
 };
 
 contextBridge.exposeInMainWorld("api", api);