From 7a900e939a4e91264adab87d4de7a4642b54b1e3 Mon Sep 17 00:00:00 2001
From: maxtara <max.tarasuik@gmail.com>
Date: Sun, 8 Feb 2026 12:05:59 +1100
Subject: [PATCH 1/2] Add copy button to Git Branch widget and move worktree
 indicator to label

- Add copy button to GitBranchWidget matching Directory section pattern
- Move worktree indicator from badge to label as '(worktree)'
- Add onWorktreeChange callback to notify parent of worktree status
- Update both sidebar variants for consistency
---
 src/renderer/App.tsx                        | 12 +++-
 src/renderer/components/GitBranchWidget.tsx | 65 +++++++++++++++++----
 2 files changed, 64 insertions(+), 13 deletions(-)

diff --git a/src/renderer/App.tsx b/src/renderer/App.tsx
index 9f91f2b..3142041 100644
--- a/src/renderer/App.tsx
+++ b/src/renderer/App.tsx
@@ -589,6 +589,7 @@ const App: React.FC = () => {
   const [addCommandValue, setAddCommandValue] = useState('');
   const [showEditedFiles, setShowEditedFiles] = useState(false);
   const [cwdCopied, setCwdCopied] = useState(false);
+  const [isWorktreeSession, setIsWorktreeSession] = useState(false);
   const [filePreviewPath, setFilePreviewPath] = useState<string | null>(null);
   const [isGitRepo, setIsGitRepo] = useState<boolean>(true);
   const [showCommitModal, setShowCommitModal] = useState(false);
@@ -4861,9 +4862,13 @@ Only when ALL the above are verified complete, output exactly: ${RALPH_COMPLETIO
               {/* Git Branch */}
               <div className="px-4 py-3 border-b border-copilot-border">
                 <div className="text-xs text-copilot-text-muted uppercase tracking-wide mb-2">
-                  Git Branch
+                  Git Branch{isWorktreeSession && ' (worktree)'}
                 </div>
-                <GitBranchWidget cwd={activeTab?.cwd} refreshKey={activeTab?.gitBranchRefresh} />
+                <GitBranchWidget
+                  cwd={activeTab?.cwd}
+                  refreshKey={activeTab?.gitBranchRefresh}
+                  onWorktreeChange={setIsWorktreeSession}
+                />
               </div>
 
               {/* Edited Files Count */}
@@ -6913,12 +6918,13 @@ Only when ALL the above are verified complete, output exactly: ${RALPH_COMPLETIO
                   <div className="px-3 py-2 border-b border-copilot-surface">
                     <div className="flex items-center justify-between gap-2 mb-1">
                       <div className="text-[10px] text-copilot-text-muted uppercase tracking-wide">
-                        Git Branch
+                        Git Branch{isWorktreeSession && ' (worktree)'}
                       </div>
                     </div>
                     <GitBranchWidget
                       cwd={activeTab?.cwd}
                       refreshKey={activeTab?.gitBranchRefresh}
+                      onWorktreeChange={setIsWorktreeSession}
                     />
                   </div>
 
diff --git a/src/renderer/components/GitBranchWidget.tsx b/src/renderer/components/GitBranchWidget.tsx
index dff359a..ca41513 100644
--- a/src/renderer/components/GitBranchWidget.tsx
+++ b/src/renderer/components/GitBranchWidget.tsx
@@ -3,13 +3,19 @@ import React, { useState, useEffect } from 'react';
 interface GitBranchWidgetProps {
   cwd?: string;
   refreshKey?: number;
+  onWorktreeChange?: (isWorktree: boolean) => void;
 }
 
-export const GitBranchWidget: React.FC<GitBranchWidgetProps> = ({ cwd, refreshKey }) => {
+export const GitBranchWidget: React.FC<GitBranchWidgetProps> = ({
+  cwd,
+  refreshKey,
+  onWorktreeChange,
+}) => {
   const [branch, setBranch] = useState<string | null>(null);
   const [isLoading, setIsLoading] = useState(false);
   const [error, setError] = useState<string | null>(null);
   const [isWorktree, setIsWorktree] = useState(false);
+  const [copied, setCopied] = useState(false);
 
   useEffect(() => {
     if (!cwd) {
@@ -41,12 +47,15 @@ export const GitBranchWidget: React.FC<GitBranchWidgetProps> = ({ cwd, refreshKe
         });
         // Also check if cwd itself is a worktree path
         const isWorktreePath = cwd.includes('.copilot-sessions');
-        setIsWorktree(!!worktreeSession || isWorktreePath);
+        const worktreeValue = !!worktreeSession || isWorktreePath;
+        setIsWorktree(worktreeValue);
+        onWorktreeChange?.(worktreeValue);
       } catch (err) {
         console.error('Failed to get git branch:', err);
         setError('Failed to get branch');
         setBranch(null);
         setIsWorktree(false);
+        onWorktreeChange?.(false);
       } finally {
         setIsLoading(false);
       }
@@ -83,6 +92,18 @@ export const GitBranchWidget: React.FC<GitBranchWidgetProps> = ({ cwd, refreshKe
     );
   }
 
+  const handleCopy = () => {
+    if (branch) {
+      navigator.clipboard
+        .writeText(branch)
+        .then(() => {
+          setCopied(true);
+          setTimeout(() => setCopied(false), 2000);
+        })
+        .catch(() => {});
+    }
+  };
+
   return (
     <div className="flex items-center gap-1.5 text-xs min-w-0" data-testid="git-branch-widget">
       <svg
@@ -102,14 +123,38 @@ export const GitBranchWidget: React.FC<GitBranchWidgetProps> = ({ cwd, refreshKe
       <span className="text-copilot-text font-mono truncate" title={branch}>
         {branch}
       </span>
-      {isWorktree && (
-        <span
-          className="px-1.5 py-0.5 bg-copilot-accent/20 text-copilot-accent rounded text-[10px] font-medium shrink-0"
-          title="This session is running in an isolated worktree"
-        >
-          worktree
-        </span>
-      )}
+      <button
+        className="shrink-0 p-0.5 rounded hover:bg-copilot-surface text-copilot-text-muted hover:text-copilot-text transition-colors"
+        title={copied ? 'Copied!' : 'Copy branch'}
+        aria-label={copied ? 'Copied!' : 'Copy branch'}
+        onClick={handleCopy}
+      >
+        {copied ? (
+          <svg
+            width="12"
+            height="12"
+            viewBox="0 0 24 24"
+            fill="none"
+            stroke="currentColor"
+            strokeWidth="2"
+            className="text-copilot-success"
+          >
+            <path d="M20 6L9 17l-5-5" />
+          </svg>
+        ) : (
+          <svg
+            width="12"
+            height="12"
+            viewBox="0 0 24 24"
+            fill="none"
+            stroke="currentColor"
+            strokeWidth="2"
+          >
+            <rect x="9" y="9" width="13" height="13" rx="2" ry="2" />
+            <path d="M5 15H4a2 2 0 01-2-2V4a2 2 0 012-2h9a2 2 0 012 2v1" />
+          </svg>
+        )}
+      </button>
     </div>
   );
 };

From c6d4c184eef2ede0111dceccd5894aeeae31899a Mon Sep 17 00:00:00 2001
From: maxtara <max.tarasuik@gmail.com>
Date: Sun, 8 Feb 2026 12:12:49 +1100
Subject: [PATCH 2/2] Add copy button to Git Branch widget and move worktree
 indicator to label

- Add copy button to GitBranchWidget matching Directory section pattern
- Move worktree indicator from inline badge to section label as '(worktree)'
- Add onWorktreeChange callback to notify parent of worktree status
- Use shared CopyIcon/CheckIcon components
---
 src/renderer/components/GitBranchWidget.tsx | 33 +++------------------
 1 file changed, 4 insertions(+), 29 deletions(-)

diff --git a/src/renderer/components/GitBranchWidget.tsx b/src/renderer/components/GitBranchWidget.tsx
index ca41513..a20c989 100644
--- a/src/renderer/components/GitBranchWidget.tsx
+++ b/src/renderer/components/GitBranchWidget.tsx
@@ -1,4 +1,5 @@
 import React, { useState, useEffect } from 'react';
+import { CopyIcon, CheckIcon } from './Icons';
 
 interface GitBranchWidgetProps {
   cwd?: string;
@@ -47,15 +48,13 @@ export const GitBranchWidget: React.FC<GitBranchWidgetProps> = ({
         });
         // Also check if cwd itself is a worktree path
         const isWorktreePath = cwd.includes('.copilot-sessions');
-        const worktreeValue = !!worktreeSession || isWorktreePath;
-        setIsWorktree(worktreeValue);
-        onWorktreeChange?.(worktreeValue);
+        setIsWorktree(!!worktreeSession || isWorktreePath);
+        onWorktreeChange?.(!!worktreeSession || isWorktreePath);
       } catch (err) {
         console.error('Failed to get git branch:', err);
         setError('Failed to get branch');
         setBranch(null);
         setIsWorktree(false);
-        onWorktreeChange?.(false);
       } finally {
         setIsLoading(false);
       }
@@ -129,31 +128,7 @@ export const GitBranchWidget: React.FC<GitBranchWidgetProps> = ({
         aria-label={copied ? 'Copied!' : 'Copy branch'}
         onClick={handleCopy}
       >
-        {copied ? (
-          <svg
-            width="12"
-            height="12"
-            viewBox="0 0 24 24"
-            fill="none"
-            stroke="currentColor"
-            strokeWidth="2"
-            className="text-copilot-success"
-          >
-            <path d="M20 6L9 17l-5-5" />
-          </svg>
-        ) : (
-          <svg
-            width="12"
-            height="12"
-            viewBox="0 0 24 24"
-            fill="none"
-            stroke="currentColor"
-            strokeWidth="2"
-          >
-            <rect x="9" y="9" width="13" height="13" rx="2" ry="2" />
-            <path d="M5 15H4a2 2 0 01-2-2V4a2 2 0 012-2h9a2 2 0 012 2v1" />
-          </svg>
-        )}
+        {copied ? <CheckIcon size={12} className="text-copilot-success" /> : <CopyIcon size={12} />}
       </button>
     </div>
   );