6 files changed, 128 insertions, 49 deletions

diff --git a/renderer/src/App.tsx b/renderer/src/App.tsx
index ecbb5b2..74b1f91 100644
--- a/renderer/src/App.tsx
+++ b/renderer/src/App.tsx
@@ -263,13 +263,17 @@ export function App() {
         selectedSession.phase === "research" ? "research.md" : "plan.md";
       await api.writeSessionArtifact(selectedProject.id, selectedSession.id, filename, documentContent);
 
-      const nextPhase = await api.advancePhase(selectedSession.id);
-      if (nextPhase) {
-        setSelectedSession({ ...selectedSession, phase: nextPhase });
+      const advanced = await api.advancePhase(selectedSession.id);
+      if (advanced) {
+        setSelectedSession({
+          ...selectedSession,
+          phase: advanced.phase,
+          git_branch: advanced.git_branch,
+        });
         // Trigger initial message for next phase
         setIsLoading(true);
         const initialMsg =
-          nextPhase === "plan"
+          advanced.phase === "plan"
             ? "Create a detailed implementation plan based on the research."
             : "Begin implementing the plan.";
         await api.sendMessage(selectedSession.id, initialMsg);
diff --git a/renderer/src/components/Header.tsx b/renderer/src/components/Header.tsx
index e56264f..fc0289d 100644
--- a/renderer/src/components/Header.tsx
+++ b/renderer/src/components/Header.tsx
@@ -152,21 +152,23 @@ export function Header({
                 {sessions.map((s) => (
                   <option key={s.id} value={s.id}>
                     {s.name}
-                    {s.git_branch ? ` · ${s.git_branch}` : " · git unavailable"}
                   </option>
                 ))}
               </select>
             )}
             <button onClick={onCreateSession}>+ Session</button>
-            {selectedSession && onRenameSession && !isRenamingSession && (
-              <button
-                onClick={startRename}
-                className="btn-rename"
-                title="Rename session"
-              >
-                ✏️
-              </button>
-            )}
+            {selectedSession &&
+              onRenameSession &&
+              !isRenamingSession &&
+              selectedSession.phase !== "implement" && (
+                <button
+                  onClick={startRename}
+                  className="btn-rename"
+                  title="Rename session"
+                >
+                  ✏️
+                </button>
+              )}
             {selectedSession && onDeleteSession && (
               <button
                 onClick={handleDeleteSession}
@@ -204,26 +206,15 @@ export function Header({
         )}
 
         {/* ── Branch badge ── */}
-        {selectedSession && (
+        {selectedSession && gitBranch && (
           <button
-            className={[
-              "branch-badge",
-              gitBranch ? "" : "branch-unavailable",
-              copied ? "branch-copied" : "",
-            ]
+            className={["branch-badge", copied ? "branch-copied" : ""]
               .filter(Boolean)
               .join(" ")}
             onClick={handleCopyBranch}
-            disabled={!gitBranch}
-            title={
-              gitBranch
-                ? copied
-                  ? "Copied!"
-                  : `Click to copy: ${gitBranch}`
-                : "Git unavailable for this session"
-            }
+            title={copied ? "Copied!" : `Click to copy: ${gitBranch}`}
           >
-            ⎇ {gitBranch ?? "git unavailable"}
+            ⎇ {gitBranch}
           </button>
         )}
 
diff --git a/renderer/src/styles/globals.css b/renderer/src/styles/globals.css
index 9d37742..ef0275e 100644
--- a/renderer/src/styles/globals.css
+++ b/renderer/src/styles/globals.css
@@ -206,12 +206,6 @@ html[data-theme="light"] .session-rename-input {
   color: white;
 }
 
-.branch-badge.branch-unavailable {
-  border-style: dashed;
-  opacity: 0.5;
-  cursor: default;
-}
-
 /* ── Main Content ─────────────────────────────────────────────── */
 .main-content {
   flex: 1;
diff --git a/src/main/git.ts b/src/main/git.ts
index 58dc860..20362a7 100644
--- a/src/main/git.ts
+++ b/src/main/git.ts
@@ -146,6 +146,81 @@ function extractTaskName(checkboxLine: string): string {
 }
 
 // ---------------------------------------------------------------------------
+// Commit subject builders
+// ---------------------------------------------------------------------------
+
+const LOCK_FILES = new Set([
+  "package-lock.json",
+  "yarn.lock",
+  "pnpm-lock.yaml",
+  "bun.lockb",
+  "Cargo.lock",
+  "Gemfile.lock",
+  "poetry.lock",
+]);
+
+/**
+ * Builds a `feat:` subject from completed task names.
+ * Keeps the total subject ≤ 72 chars.
+ *   1 task  → "feat: {name}"
+ *   N tasks → "feat: {name} (+N-1 more)"
+ */
+function buildTaskSubject(taskNames: string[]): string {
+  const prefix = "feat: ";
+  const MAX = 72;
+
+  if (taskNames.length === 1) {
+    const full = `${prefix}${taskNames[0]}`;
+    if (full.length <= MAX) return full;
+    return `${prefix}${taskNames[0].slice(0, MAX - prefix.length - 1)}\u2026`;
+  }
+
+  const suffix = ` (+${taskNames.length - 1} more)`;
+  const available = MAX - prefix.length - suffix.length;
+  const first = taskNames[0];
+  const truncated =
+    first.length > available ? `${first.slice(0, available - 1)}\u2026` : first;
+  return `${prefix}${truncated}${suffix}`;
+}
+
+/**
+ * Returns the basenames of staged files, excluding lock files.
+ * Returns empty array on any failure.
+ */
+function getStagedFileNames(projectPath: string): string[] {
+  try {
+    const raw = execFileSync("git", ["diff", "--cached", "--name-only"], {
+      cwd: projectPath,
+      stdio: "pipe",
+    })
+      .toString()
+      .trim();
+    if (!raw) return [];
+    return raw
+      .split("\n")
+      .map((f) => path.basename(f.trim()))
+      .filter((f) => f && !LOCK_FILES.has(f));
+  } catch {
+    return [];
+  }
+}
+
+/**
+ * Builds a `chore:` subject from the staged file list when no tasks completed.
+ *   1 file   → "chore: Update {file}"
+ *   2 files  → "chore: Update {file1}, {file2}"
+ *   3+ files → "chore: Update {file1} (+N more files)"
+ *   0 files  → "chore: Implement progress"
+ */
+function buildFileSubject(projectPath: string): string {
+  const files = getStagedFileNames(projectPath);
+  if (files.length === 0) return "chore: Implement progress";
+  if (files.length === 1) return `chore: Update ${files[0]}`;
+  if (files.length === 2) return `chore: Update ${files[0]}, ${files[1]}`;
+  return `chore: Update ${files[0]} (+${files.length - 1} more files)`;
+}
+
+// ---------------------------------------------------------------------------
 // Auto-commit
 // ---------------------------------------------------------------------------
 
@@ -184,13 +259,12 @@ export function autoCommitTurn(
 
     let commitMsg: string;
     if (newlyCompleted.length > 0) {
-      const count = newlyCompleted.length;
-      const taskLines = newlyCompleted
-        .map((l) => `- ✅ ${extractTaskName(l)}`)
-        .join("\n");
-      commitMsg = `feat: Complete ${count} task${count > 1 ? "s" : ""}\n\n${taskLines}`;
+      const taskNames = newlyCompleted.map(extractTaskName);
+      const subject = buildTaskSubject(taskNames);
+      const body = taskNames.map((t) => `- \u2705 ${t}`).join("\n");
+      commitMsg = `${subject}\n\n${body}`;
     } else {
-      commitMsg = "chore: Implement progress (no tasks completed this turn)";
+      commitMsg = buildFileSubject(projectPath);
     }
 
     execFileSync("git", ["commit", "-m", commitMsg], { cwd: projectPath });
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(
diff --git a/src/main/preload.ts b/src/main/preload.ts
index f377639..299a1b5 100644
--- a/src/main/preload.ts
+++ b/src/main/preload.ts
@@ -26,7 +26,7 @@ export interface ClaudeFlowAPI {
 
   // Workflow
   triggerReview: (sessionId: string) => Promise<void>;
-  advancePhase: (sessionId: string) => Promise<Phase | null>;
+  advancePhase: (sessionId: string) => Promise<{ phase: Phase; git_branch: string | null } | null>;
   setPermissionMode: (
     sessionId: string,
     mode: UserPermissionMode