From 8ffaabb7e4ac4f0dc21eb3a87de92ba82a8f8879 Mon Sep 17 00:00:00 2001
From: unknown_ <jeremychan595@gmail.com>
Date: Thu, 7 May 2026 15:49:52 +0800
Subject: [PATCH] refactor: move branch display from sidebar to chat input

---
 .../src/pages/workspace/components/device-session-tab.tsx | 8 ++++++++
 .../workspace/components/workspace-content-layout.tsx     | 6 ------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/app-ai-native/src/pages/workspace/components/device-session-tab.tsx b/packages/app-ai-native/src/pages/workspace/components/device-session-tab.tsx
index 9d16a125a..6b5c15104 100644
--- a/packages/app-ai-native/src/pages/workspace/components/device-session-tab.tsx
+++ b/packages/app-ai-native/src/pages/workspace/components/device-session-tab.tsx
@@ -871,6 +871,14 @@ export function DeviceSessionTab(props: { tabId: string }) {
                             hideAttachButton
                             hidePrompt={!!viewingSessionID()}
                           />
+                          <Show when={workspace.data.vcs?.branch}>
+                            <div class="w-full px-3 pb-2 md:max-w-200 md:mx-auto 2xl:max-w-[1000px]">
+                              <div class="flex items-center gap-1 text-11-regular text-text-weak">
+                                <Icon name="branch" size="small" class="shrink-0" />
+                                <span class="truncate">{workspace.data.vcs?.branch}</span>
+                              </div>
+                            </div>
+                          </Show>
                         </Show>
                         <Show when={!workspace.agentAvailable()}>
                           <div class="shrink-0 w-full pb-3 flex justify-center items-center">
diff --git a/packages/app-ai-native/src/pages/workspace/components/workspace-content-layout.tsx b/packages/app-ai-native/src/pages/workspace/components/workspace-content-layout.tsx
index 673946d7e..d66c21066 100644
--- a/packages/app-ai-native/src/pages/workspace/components/workspace-content-layout.tsx
+++ b/packages/app-ai-native/src/pages/workspace/components/workspace-content-layout.tsx
@@ -621,12 +621,6 @@ function ContentSidebar(props: { directory: string; autoExpandGroup?: () => { gr
                 </div>
               }>
                 <div class="px-0 py-0.5">
-                  <Show when={diff.state().branch}>
-                    <div class="px-1.5 pb-1 text-11-regular text-text-weak flex items-center gap-1">
-                      <Icon name="branch" size="small" class="shrink-0" />
-                      <span class="truncate">{diff.state().branch}</span>
-                    </div>
-                  </Show>
                   <Show when={diff.state().stagedFiles.length > 0}>
                     <div
                       class="px-1.5 pt-1.5 pb-0.5 flex items-center gap-1 text-[11px] font-[600] text-native-muted tracking-wide uppercase cursor-pointer hover:text-native-foreground transition-colors"