From 84bf7e4aebb1d91ee077d774bff8db1ca446b3d6 Mon Sep 17 00:00:00 2001
From: Fusion <noreply@runfusion.ai>
Date: Tue, 19 May 2026 15:49:06 +0200
Subject: [PATCH] feat: move git toolbar to top bar with proper styling
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Move GitToolbar from sidebar to top bar below workspace header
- Remove GitToolbar from sidebar layout
- Add comprehensive CSS styles for git toolbar:
  - Flex layout with proper spacing
  - Styled buttons with hover effects
  - Branch selector styling
  - Badge styling for ahead/behind counts
  - Status badges for modified/added/deleted/untracked
  - Error message styling
  - New branch form styling
- Quality gates: typecheck ✓ lint ✓ build ✓
---
 apps/web/src/pages/repo-workspace.tsx         |  86 +++++------
 apps/web/src/styles.css                       | 139 ++++++++++++++++++
 .../.openspec.yaml                            |   0
 .../design.md                                 |   0
 .../proposal.md                               |   0
 .../specs/spec.md                             |   0
 .../tasks.md                                  |   0
 7 files changed, 184 insertions(+), 41 deletions(-)
 rename openspec/changes/{workspace-visual-overhaul => archive/2026-05-19-workspace-visual-overhaul}/.openspec.yaml (100%)
 rename openspec/changes/{workspace-visual-overhaul => archive/2026-05-19-workspace-visual-overhaul}/design.md (100%)
 rename openspec/changes/{workspace-visual-overhaul => archive/2026-05-19-workspace-visual-overhaul}/proposal.md (100%)
 rename openspec/changes/{workspace-visual-overhaul => archive/2026-05-19-workspace-visual-overhaul}/specs/spec.md (100%)
 rename openspec/changes/{workspace-visual-overhaul => archive/2026-05-19-workspace-visual-overhaul}/tasks.md (100%)

diff --git a/apps/web/src/pages/repo-workspace.tsx b/apps/web/src/pages/repo-workspace.tsx
index 947360e..3bcab6a 100644
--- a/apps/web/src/pages/repo-workspace.tsx
+++ b/apps/web/src/pages/repo-workspace.tsx
@@ -172,48 +172,51 @@ export const RepoWorkspace = () => {
       )}
 
       {status === "ready" && repositories.length > 0 && (
-        <div className="workspace-layout">
-          <aside className="workspace-sidebar">
-            <div className="sidebar-section">
-              <label className="form-field">
-                Repository
-                <select
-                  value={selectedRepoId || ""}
-                  onChange={(e) => handleRepoChange(e.target.value)}
-                >
-                  {repositories.map((repo) => (
-                    <option key={repo.id} value={repo.id}>
-                      {repo.name}
-                    </option>
-                  ))}
-                </select>
-              </label>
-            </div>
+        <>
+          {selectedRepoId && (
+            <GitToolbar
+              projectId={projectId!}
+              repoId={selectedRepoId}
+              currentBranch={currentBranch}
+              branches={branches}
+              onBranchChange={(branch) => {
+                setCurrentBranch(branch);
+                const newParams = new URLSearchParams(searchParams);
+                newParams.set("branch", branch);
+                setSearchParams(newParams);
+              }}
+              onRefresh={() => {
+                void loadBranches();
+                void loadGitStatus();
+                window.dispatchEvent(new CustomEvent("refresh-file-tree"));
+              }}
+            />
+          )}
+          <div className="workspace-layout">
+            <aside className="workspace-sidebar">
+              <div className="sidebar-section">
+                <label className="form-field">
+                  Repository
+                  <select
+                    value={selectedRepoId || ""}
+                    onChange={(e) => handleRepoChange(e.target.value)}
+                  >
+                    {repositories.map((repo) => (
+                      <option key={repo.id} value={repo.id}>
+                        {repo.name}
+                      </option>
+                    ))}
+                  </select>
+                </label>
+              </div>
 
-            {selectedRepoId && (
-              <>
-                <GitToolbar
-                  projectId={projectId!}
-                  repoId={selectedRepoId}
-                  currentBranch={currentBranch}
-                  branches={branches}
-                  onBranchChange={(branch) => {
-                    setCurrentBranch(branch);
-                    const newParams = new URLSearchParams(searchParams);
-                    newParams.set("branch", branch);
-                    setSearchParams(newParams);
-                  }}
-                  onRefresh={() => {
-                    void loadBranches();
-                    void loadGitStatus();
-                    window.dispatchEvent(new CustomEvent("refresh-file-tree"));
-                  }}
-                />
-                <FileBrowser
-                  projectId={projectId!}
-                  repoId={selectedRepoId}
-                  gitStatus={gitStatus}
-                />
+              {selectedRepoId && (
+                <>
+                  <FileBrowser
+                    projectId={projectId!}
+                    repoId={selectedRepoId}
+                    gitStatus={gitStatus}
+                  />
                 {gitStatus && (
                   <CommitPanel
                     projectId={projectId!}
@@ -238,6 +241,7 @@ export const RepoWorkspace = () => {
             )}
           </main>
         </div>
+      </>
       )}
     </section>
   );
diff --git a/apps/web/src/styles.css b/apps/web/src/styles.css
index 778fdb3..b92eb29 100644
--- a/apps/web/src/styles.css
+++ b/apps/web/src/styles.css
@@ -1238,3 +1238,142 @@ a {
   color: white;
   border-radius: 999px;
 }
+
+/* Git Toolbar - Top Bar Styles */
+.git-toolbar {
+  display: flex;
+  align-items: center;
+  gap: 1rem;
+  padding: 0.5rem 1.5rem;
+  background: var(--bg);
+  border-bottom: 1px solid var(--border);
+  min-height: 48px;
+}
+
+.toolbar-row {
+  display: flex;
+  align-items: center;
+  gap: 0.75rem;
+  flex-wrap: wrap;
+}
+
+.toolbar-group {
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+}
+
+.toolbar-button {
+  display: flex;
+  align-items: center;
+  gap: 0.35rem;
+  padding: 0.4rem 0.75rem;
+  border: 1px solid var(--border);
+  border-radius: 6px;
+  background: var(--panel);
+  color: var(--ink);
+  font-size: 0.85rem;
+  cursor: pointer;
+  transition: all 0.2s;
+  white-space: nowrap;
+}
+
+.toolbar-button:hover:not(:disabled) {
+  background: var(--brand);
+  color: white;
+  border-color: var(--brand);
+}
+
+.toolbar-button:disabled {
+  opacity: 0.5;
+  cursor: not-allowed;
+}
+
+.toolbar-button.primary {
+  background: var(--brand);
+  color: white;
+  border-color: var(--brand);
+}
+
+.branch-select {
+  padding: 0.4rem 0.75rem;
+  border: 1px solid var(--border);
+  border-radius: 6px;
+  background: var(--panel);
+  color: var(--ink);
+  font-size: 0.85rem;
+  cursor: pointer;
+  min-width: 140px;
+}
+
+.badge {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  min-width: 18px;
+  height: 18px;
+  padding: 0 4px;
+  background: var(--brand);
+  color: white;
+  font-size: 0.7rem;
+  font-weight: 600;
+  border-radius: 999px;
+}
+
+.toolbar-error {
+  color: #ef4444;
+  font-size: 0.85rem;
+  padding: 0.25rem 0.5rem;
+  background: rgba(239, 68, 68, 0.1);
+  border-radius: 4px;
+}
+
+.toolbar-input {
+  padding: 0.4rem 0.75rem;
+  border: 1px solid var(--border);
+  border-radius: 6px;
+  background: var(--panel);
+  color: var(--ink);
+  font-size: 0.85rem;
+}
+
+.new-branch-form {
+  padding: 0.75rem;
+  background: var(--panel);
+  border: 1px solid var(--border);
+  border-radius: 8px;
+  margin-top: 0.5rem;
+}
+
+.status-summary {
+  gap: 0.75rem;
+}
+
+.status-badge {
+  display: inline-flex;
+  align-items: center;
+  gap: 0.25rem;
+  padding: 0.2rem 0.5rem;
+  border-radius: 4px;
+  font-size: 0.8rem;
+}
+
+.status-badge.modified {
+  background: rgba(245, 158, 11, 0.1);
+  color: #d97706;
+}
+
+.status-badge.added {
+  background: rgba(16, 185, 129, 0.1);
+  color: #059669;
+}
+
+.status-badge.deleted {
+  background: rgba(239, 68, 68, 0.1);
+  color: #dc2626;
+}
+
+.status-badge.untracked {
+  background: rgba(107, 114, 128, 0.1);
+  color: #4b5563;
+}
diff --git a/openspec/changes/workspace-visual-overhaul/.openspec.yaml b/openspec/changes/archive/2026-05-19-workspace-visual-overhaul/.openspec.yaml
similarity index 100%
rename from openspec/changes/workspace-visual-overhaul/.openspec.yaml
rename to openspec/changes/archive/2026-05-19-workspace-visual-overhaul/.openspec.yaml
diff --git a/openspec/changes/workspace-visual-overhaul/design.md b/openspec/changes/archive/2026-05-19-workspace-visual-overhaul/design.md
similarity index 100%
rename from openspec/changes/workspace-visual-overhaul/design.md
rename to openspec/changes/archive/2026-05-19-workspace-visual-overhaul/design.md
diff --git a/openspec/changes/workspace-visual-overhaul/proposal.md b/openspec/changes/archive/2026-05-19-workspace-visual-overhaul/proposal.md
similarity index 100%
rename from openspec/changes/workspace-visual-overhaul/proposal.md
rename to openspec/changes/archive/2026-05-19-workspace-visual-overhaul/proposal.md
diff --git a/openspec/changes/workspace-visual-overhaul/specs/spec.md b/openspec/changes/archive/2026-05-19-workspace-visual-overhaul/specs/spec.md
similarity index 100%
rename from openspec/changes/workspace-visual-overhaul/specs/spec.md
rename to openspec/changes/archive/2026-05-19-workspace-visual-overhaul/specs/spec.md
diff --git a/openspec/changes/workspace-visual-overhaul/tasks.md b/openspec/changes/archive/2026-05-19-workspace-visual-overhaul/tasks.md
similarity index 100%
rename from openspec/changes/workspace-visual-overhaul/tasks.md
rename to openspec/changes/archive/2026-05-19-workspace-visual-overhaul/tasks.md