Merge PR #478: Branch refresh + other color

Fix: branch labels refresh faster + blue for no-prefix

Author: web3dev1337

client/app.js

@@ -31,6 +31,7 @@ class ClaudeOrchestrator {
     this.githubLinks = new Map(); // Track GitHub PR/branch links per session
     this.githubLinkLogs = new Map(); // Track last logged GitHub links per session
     this.sessionActivity = new Map(); // Track which sessions have been used
+    this.branchRefreshRequestAt = new Map(); // sessionId -> last refresh timestamp (ms)
     this.dismissedStartupUI = new Map(); // Track which sessions have dismissed startup UI
     this.startupUIDebounce = new Map(); // Debounce startup UI showing
     this.sessionAgentPreferences = new Map(); // Track agent preferences per session
@@ -451,6 +452,9 @@ class ClaudeOrchestrator {
           this.detectGitHubLinks(sessionId, data);
         }
 
+        // Fast-path branch refresh when git reports a branch change in output.
+        this.maybeRequestBranchRefreshFromOutput(sessionId, data);
+
         // Detect clear commands to reset PR links and activity
         if (data.includes('/clear') || data.includes('clear')) {
           this.clearGitHubLinks(sessionId);
@@ -3490,6 +3494,38 @@ class ClaudeOrchestrator {
     };
   }
 
+  maybeRequestBranchRefreshFromOutput(sessionId, data) {
+    if (!this.socket) return;
+
+    const sid = String(sessionId || '').trim();
+    if (!sid) return;
+
+    const t = String(data || '');
+    if (!t) return;
+
+    // Cheap filter first.
+    if (!/(switched to|already on|on branch|head is now at|your branch is up to date)/i.test(t)) {
+      return;
+    }
+
+    // Only trigger when output is very likely a branch-changing/branch-reporting git message.
+    const looksLikeBranchEvent =
+      /Switched to (a new )?branch\b/i.test(t) ||
+      /\bAlready on\b/i.test(t) ||
+      /^\s*On branch\b/im.test(t) ||
+      /\bHEAD is now at\b/i.test(t) ||
+      /\bYour branch is up to date with\b/i.test(t);
+
+    if (!looksLikeBranchEvent) return;
+
+    const now = Date.now();
+    const last = this.branchRefreshRequestAt.get(sid) || 0;
+    if (now - last < 1500) return;
+    this.branchRefreshRequestAt.set(sid, now);
+
+    this.socket.emit('refresh-branch', { sessionId: sid });
+  }
+
 	  updateTerminalBranchLabel(sessionId, branch) {
 	    const terminalElement = document.querySelector(`#wrapper-${sessionId} .terminal-branch`);
 	    if (!terminalElement) return;

client/styles.css

@@ -328,9 +328,9 @@ body {
 }
 
 .worktree-branch.branch-type-other {
-  color: var(--accent-primary);
-  background: rgba(31, 111, 235, 0.14);
-  border-color: rgba(31, 111, 235, 0.4);
+  color: #3b82f6;
+  background: rgba(59, 130, 246, 0.14);
+  border-color: rgba(59, 130, 246, 0.4);
 }
 
 /* Agent status dots (waiting/busy/idle) */
@@ -792,9 +792,9 @@ header h1 {
 }
 
 .terminal-branch.branch-type-other {
-  color: var(--accent-primary);
-  background: rgba(31, 111, 235, 0.12);
-  border-color: rgba(31, 111, 235, 0.4);
+  color: #3b82f6;
+  background: rgba(59, 130, 246, 0.12);
+  border-color: #3b82f6;
 }
 
 .terminal-controls {

server/index.js

@@ -339,6 +339,25 @@ io.on('connection', (socket) => {
     logger.debug('Terminal input received', { sessionId, dataLength: inputData.length });
     sessionManager.writeToSession(sessionId, inputData);
   });
+
+  // Client hint: terminal output suggests the branch changed (e.g. "Switched to branch ...").
+  // This is a best-effort fast path to keep branch labels from staying stuck on "unknown".
+  socket.on('refresh-branch', ({ sessionId }) => {
+    const sid = String(sessionId || '').trim();
+    if (!sid) return;
+
+    const session = sessionManager.sessions.get(sid);
+    if (!session) return;
+    if (session.type !== 'claude' && session.type !== 'codex' && session.type !== 'server') return;
+
+    const cwd = (typeof sessionManager.getSessionCwd === 'function')
+      ? (sessionManager.getSessionCwd(session) || session?.config?.cwd || null)
+      : (session?.config?.cwd || null);
+    if (!cwd) return;
+
+    const worktreeId = session.worktreeId || sid;
+    sessionManager.updateGitBranch(worktreeId, cwd, true);
+  });
 
   // Handle terminal resize
   socket.on('terminal-resize', ({ sessionId, cols, rows }) => {