From b7af14ad3f0aa63c3d8265720e823ae8a383a05c Mon Sep 17 00:00:00 2001
From: Julius Marminge <julius0216@outlook.com>
Date: Thu, 12 Feb 2026 14:44:51 -0800
Subject: [PATCH] Rework chat header actions and GitActions styling

- Remove branch badge and terminal toggle from ChatView header
- Keep GitActionsControl in the header action area
- Adjust GitActionsControl button styles to emphasize completed action state

Co-authored-by: codex <codex@users.noreply.github.com>
---
 apps/web/src/components/ChatView.tsx          | 18 +-----------------
 apps/web/src/components/GitActionsControl.tsx |  8 ++++++--
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/apps/web/src/components/ChatView.tsx b/apps/web/src/components/ChatView.tsx
index d490f7443a6c5f0127e05b6253a5d60c94b797d3..ceefd6ad7b82eda3b33036dc06990e63c8e06180 100644
--- a/apps/web/src/components/ChatView.tsx
+++ b/apps/web/src/components/ChatView.tsx
@@ -654,12 +654,6 @@ export default function ChatView() {
               {activeProject.name}
             </span>
           )}
-          {activeThread.branch && (
-            <span className="rounded-full bg-accent px-2 py-0.5 font-mono text-[10px] text-muted-foreground/50">
-              {activeThread.branch}
-              {activeThread.worktreePath ? " (worktree)" : ""}
-            </span>
-          )}
         </div>
         <div className="flex items-center gap-3">
           {/* Open in editor */}
@@ -695,18 +689,8 @@ export default function ChatView() {
           )}
           {/* Git actions */}
           {activeProject && <GitActionsControl api={api} gitCwd={gitCwd} />}
+
           {/* Diff toggle */}
-          <button
-            type="button"
-            className={`rounded-md px-2 py-1 text-[10px] transition-colors duration-150 ${
-              activeThread.terminalOpen
-                ? "bg-accent text-foreground"
-                : "text-muted-foreground/40 hover:text-muted-foreground/60"
-            }`}
-            onClick={toggleTerminalVisibility}
-          >
-            Terminal <span className="text-muted-foreground/50">{terminalShortcutHint}</span>
-          </button>
           <button
             type="button"
             className={`rounded-md px-2 py-1 text-[10px] transition-colors duration-150 ${
diff --git a/apps/web/src/components/GitActionsControl.tsx b/apps/web/src/components/GitActionsControl.tsx
index bd1ef53ad0f2b85fff9e6669de59e648d2c1c6bc..fcbd9e0f1cde4cdc1bb8d7c5c613a98c751c5aa5 100644
--- a/apps/web/src/components/GitActionsControl.tsx
+++ b/apps/web/src/components/GitActionsControl.tsx
@@ -551,7 +551,7 @@ export default function GitActionsControl({ api, gitCwd }: GitActionsControlProp
       <div className="relative" ref={gitMenuRef}>
         <button
           type="button"
-          className="inline-flex items-center gap-1.5 rounded-md border border-border px-2 py-1 text-[10px] text-muted-foreground/70 transition-colors duration-150 hover:bg-accent hover:text-foreground/80 disabled:cursor-not-allowed disabled:opacity-60"
+          className="inline-flex items-center gap-1.5 rounded-md px-2 py-1 text-[10px] text-muted-foreground/70 transition-colors duration-150 hover:bg-accent hover:text-foreground/80 disabled:cursor-not-allowed disabled:opacity-60"
           onClick={() => {
             if (!isGitMenuOpen) {
               void refreshGitStatus().catch(() => undefined);
@@ -798,7 +798,11 @@ export default function GitActionsControl({ api, gitCwd }: GitActionsControlProp
               )}
               <button
                 type="button"
-                className="rounded-xl border border-border px-4 py-2 text-sm text-foreground transition-colors duration-150 hover:bg-accent disabled:cursor-not-allowed disabled:opacity-60"
+                className={
+                  gitModalResult
+                    ? "rounded-xl bg-foreground px-4 py-2 text-sm font-medium text-background transition-colors duration-150 hover:bg-foreground/90 disabled:cursor-not-allowed disabled:opacity-60"
+                    : "rounded-xl border border-border px-4 py-2 text-sm text-foreground transition-colors duration-150 hover:bg-accent disabled:cursor-not-allowed disabled:opacity-60"
+                }
                 onClick={closeGitActionModal}
                 disabled={isGitActionRunning}
               >
-- 
2.54.0