3 files changed, 24 insertions, 35 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;