jupyterlab_claude_code_extension 1.1.31 → 1.2.4

package/README.md

@@ -20,6 +20,7 @@ Browse, resume, and manage your Claude Code sessions from a JupyterLab side pane
 - **Favorites** - star projects you keep coming back to via the right-click menu
 - **Remove** - drop a project's Claude history from the panel via the right-click menu; the history folder is moved to the trash (it honours JupyterLab's "move files to trash" setting), not deleted permanently
 - **Clean up parallel sessions** - when a project has accumulated extra sessions beyond the main one, a right-click menu item (showing the count in brackets) removes them all, keeping only the main session; removed files honour the same trash setting
+- **Switch conversation branch** - a right-click submenu lists a project's other conversations (5 most recent, with a searchable "More..." popup for longer lists) and switches the row's current one; rows with multiple conversations show the count in brackets after the name, e.g. `workspace (2)`
 - **Search** - fuzzy filter toggled by the funnel button next to refresh
 - **Presentation modes** - label rows by session name (so a `/rename` shows through), folder name, or path relative to the JupyterLab root
 - **Hover tooltip** with project path, last activity, message count, branch, and session id

package/lib/types.d.ts

@@ -42,6 +42,24 @@ export interface ICleanupRequest {
 export interface ICleanupResponse {
     removed_count: number;
 }
+export interface IBranch {
+    session_id: string;
+    file_mtime: number;
+    label: string;
+}
+export interface IBranchesResponse {
+    current: string;
+    total: number;
+    branches: IBranch[];
+}
+export interface ISwitchRequest {
+    encoded_path: string;
+    session_id: string;
+}
+export interface ISwitchResponse {
+    requested: string;
+    current: string | null;
+}
 export interface ILaunchTerminalRequest {
     project_path: string;
     /** Omit to start a brand-new claude session instead of resuming one. */

package/lib/widget.d.ts

@@ -95,6 +95,21 @@ export declare class ClaudeCodeSessionsWidget extends Widget {
     private _setRefreshSpinning;
     private _setActiveRow;
     private _setupContextMenu;
+    /** Rebuild the context menu's items. Lumino submenu-type items have no
+     * ``isVisible`` hook, so the menu is rebuilt per open and the branch
+     * submenu inserted only when the row actually has branches. */
+    private _rebuildContextMenu;
+    /** Open the row context menu, populating the branch submenu first when
+     * the project has more than one conversation. On a fetch failure the
+     * menu opens without the submenu. */
+    private _openContextMenu;
+    /** Popup with the project's full branch list - browse and filter when
+     * the list is too large for the submenu. Clicking an entry switches. */
+    private _showBranchPopup;
+    /** Switch the active row's project to another conversation branch.
+     * The backend touches the branch JSONL's mtime; a refresh then shows
+     * the selected conversation as the row's current one. */
+    private _switchBranch;
     private _startPolling;
     private _stopPolling;
     private readonly _app;
@@ -107,6 +122,8 @@ export declare class ClaudeCodeSessionsWidget extends Widget {
     private _expanded;
     private _commands;
     private _contextMenu;
+    private _branchSubmenu;
+    private _lastBranches;
     private _newSessionMenu;
     private _activeSession;
     private _activeRowEl;

package/lib/widget.js

@@ -1,4 +1,5 @@
 import { Clipboard, Dialog, Notification, showDialog } from '@jupyterlab/apputils';
+import { ServerConnection } from '@jupyterlab/services';
 import { folderIcon, terminalIcon } from '@jupyterlab/ui-components';
 import { CommandRegistry } from '@lumino/commands';
 import { Menu, Widget } from '@lumino/widgets';
@@ -63,6 +64,7 @@ export class ClaudeCodeSessionsWidget extends Widget {
         this._searchEl = null;
         this._sessions = null;
         this._expanded = loadExpanded();
+        this._lastBranches = [];
         this._activeSession = null;
         this._activeRowEl = null;
         this._pollHandle = null;
@@ -804,8 +806,18 @@ export class ClaudeCodeSessionsWidget extends Widget {
         }
         const name = document.createElement('span');
         name.className = 'jp-ClaudeSessionsPanel-name';
-        name.textContent = this._lookupName(session);
+        // Conversation count in brackets - only when the project has branches.
+        name.textContent =
+            session.extra_sessions > 0
+                ? `${this._lookupName(session)} (${session.extra_sessions + 1})`
+                : this._lookupName(session);
         row.appendChild(name);
+        if (session.file_mtime) {
+            const time = document.createElement('span');
+            time.className = 'jp-ClaudeSessionsPanel-rowTime';
+            time.textContent = this._formatRelativeTime(session.file_mtime);
+            row.appendChild(time);
+        }
         // No star in the Favorites section - every row there is a favorite
         // by definition; stars are an indicator only useful in Recent/All.
         if (session.favourite && sectionKey !== 'favourites') {
@@ -828,7 +840,7 @@ export class ClaudeCodeSessionsWidget extends Widget {
             }
             this._activeSession = session;
             this._setActiveRow(row);
-            this._contextMenu.open(e.clientX, e.clientY);
+            void this._openContextMenu(session, e.clientX, e.clientY);
         });
         return row;
     }
@@ -845,6 +857,9 @@ export class ClaudeCodeSessionsWidget extends Widget {
         if (s.message_count) {
             lines.push(`Messages: ${s.message_count}`);
         }
+        if (s.extra_sessions > 0) {
+            lines.push(`Conversations: ${s.extra_sessions + 1}`);
+        }
         if (s.git_branch) {
             lines.push(`Branch: ${s.git_branch}`);
         }
@@ -889,7 +904,7 @@ export class ClaudeCodeSessionsWidget extends Widget {
         }
         const diff = Date.now() - epochMs;
         if (diff < 60000) {
-            return 'just now';
+            return 'now';
         }
         if (diff < 3600000) {
             return `${Math.floor(diff / 60000)}m ago`;
@@ -897,10 +912,7 @@ export class ClaudeCodeSessionsWidget extends Widget {
         if (diff < 86400000) {
             return `${Math.floor(diff / 3600000)}h ago`;
         }
-        if (diff < 30 * 86400000) {
-            return `${Math.floor(diff / 86400000)}d ago`;
-        }
-        return new Date(epochMs).toLocaleDateString();
+        return `${Math.floor(diff / 86400000)}d ago`;
     }
     _setRefreshSpinning(on) {
         if (!this._refreshBtn) {
@@ -1012,6 +1024,22 @@ export class ClaudeCodeSessionsWidget extends Widget {
                 }
             }
         });
+        this._commands.addCommand('claude-code-sessions:switch-branch', {
+            label: args => { var _a; return String((_a = args.label) !== null && _a !== void 0 ? _a : ''); },
+            execute: args => {
+                var _a;
+                const sessionId = String((_a = args.session_id) !== null && _a !== void 0 ? _a : '');
+                if (sessionId) {
+                    void this._switchBranch(sessionId);
+                }
+            }
+        });
+        this._commands.addCommand('claude-code-sessions:switch-branch-more', {
+            label: () => `More... (${this._lastBranches.length} total)`,
+            execute: () => {
+                void this._showBranchPopup(this._lastBranches);
+            }
+        });
         this._commands.addCommand('claude-code-sessions:remove', {
             label: 'Remove from Claude',
             icon: removeIcon,
@@ -1040,8 +1068,28 @@ export class ClaudeCodeSessionsWidget extends Widget {
         this._newSessionMenu.addItem({
             command: 'claude-code-sessions:new-session-dangerous'
         });
+        // Submenu listing the project's other conversations ("branches") -
+        // items are rebuilt on every context-menu open from a fresh
+        // sessions/branches fetch.
+        this._branchSubmenu = new Menu({ commands: this._commands });
+        this._branchSubmenu.addClass('jp-ClaudeSessionsContextMenu');
+        this._branchSubmenu.title.label = 'Switch Conversation Branch';
         this._contextMenu = new Menu({ commands: this._commands });
         this._contextMenu.addClass('jp-ClaudeSessionsContextMenu');
+        this._rebuildContextMenu(false);
+        this._contextMenu.aboutToClose.connect(() => {
+            // Only clear the visual highlight - DO NOT null _activeSession.
+            // Lumino fires aboutToClose BEFORE the activated item's command runs,
+            // so the command callback still needs to read _activeSession. The
+            // field is overwritten on the next contextmenu open.
+            this._setActiveRow(null);
+        });
+    }
+    /** Rebuild the context menu's items. Lumino submenu-type items have no
+     * ``isVisible`` hook, so the menu is rebuilt per open and the branch
+     * submenu inserted only when the row actually has branches. */
+    _rebuildContextMenu(withBranches) {
+        this._contextMenu.clearItems();
         this._contextMenu.addItem({ command: 'claude-code-sessions:resume' });
         this._contextMenu.addItem({
             command: 'claude-code-sessions:resume-dangerous'
@@ -1057,17 +1105,141 @@ export class ClaudeCodeSessionsWidget extends Widget {
         });
         this._contextMenu.addItem({ command: 'claude-code-sessions:copy-path' });
         this._contextMenu.addItem({ type: 'separator' });
+        if (withBranches) {
+            this._contextMenu.addItem({
+                type: 'submenu',
+                submenu: this._branchSubmenu
+            });
+        }
         this._contextMenu.addItem({
             command: 'claude-code-sessions:cleanup-parallel'
         });
         this._contextMenu.addItem({ command: 'claude-code-sessions:remove' });
-        this._contextMenu.aboutToClose.connect(() => {
-            // Only clear the visual highlight - DO NOT null _activeSession.
-            // Lumino fires aboutToClose BEFORE the activated item's command runs,
-            // so the command callback still needs to read _activeSession. The
-            // field is overwritten on the next contextmenu open.
-            this._setActiveRow(null);
+    }
+    /** Open the row context menu, populating the branch submenu first when
+     * the project has more than one conversation. On a fetch failure the
+     * menu opens without the submenu. */
+    async _openContextMenu(session, x, y) {
+        let hasBranches = false;
+        if (session.extra_sessions > 0) {
+            try {
+                const data = await requestAPI(`sessions/branches?encoded_path=${encodeURIComponent(session.encoded_path)}`, this._serverSettings, { cache: 'no-store' });
+                this._lastBranches = data.branches;
+                this._branchSubmenu.clearItems();
+                // The submenu shows only the 5 most recent; the full list lives
+                // behind "More..." in a searchable popup.
+                for (const b of data.branches.slice(0, 5)) {
+                    this._branchSubmenu.addItem({
+                        command: 'claude-code-sessions:switch-branch',
+                        args: {
+                            session_id: b.session_id,
+                            label: `${b.label} - ${this._formatRelativeTime(b.file_mtime)}`
+                        }
+                    });
+                }
+                if (data.branches.length > 5) {
+                    this._branchSubmenu.addItem({ type: 'separator' });
+                    this._branchSubmenu.addItem({
+                        command: 'claude-code-sessions:switch-branch-more'
+                    });
+                }
+                hasBranches = data.branches.length > 0;
+            }
+            catch (_a) {
+                hasBranches = false;
+            }
+        }
+        this._rebuildContextMenu(hasBranches);
+        this._contextMenu.open(x, y);
+    }
+    /** Popup with the project's full branch list - browse and filter when
+     * the list is too large for the submenu. Clicking an entry switches. */
+    _showBranchPopup(branches) {
+        const body = document.createElement('div');
+        body.className = 'jp-ClaudeSessionsPanel-branchPopup';
+        const search = document.createElement('input');
+        search.type = 'search';
+        search.placeholder = 'Filter branches...';
+        search.className = 'jp-ClaudeSessionsPanel-branchSearch';
+        body.appendChild(search);
+        const list = document.createElement('div');
+        list.className = 'jp-ClaudeSessionsPanel-branchList';
+        body.appendChild(list);
+        const bodyWidget = new Widget({ node: body });
+        const dialog = new Dialog({
+            title: 'Switch Conversation Branch',
+            body: bodyWidget,
+            buttons: [Dialog.cancelButton()]
         });
+        const render = () => {
+            const needle = search.value.trim().toLowerCase();
+            list.replaceChildren();
+            const matches = branches.filter(b => !needle ||
+                b.label.toLowerCase().includes(needle) ||
+                b.session_id.toLowerCase().includes(needle));
+            if (matches.length === 0) {
+                const empty = document.createElement('div');
+                empty.className = 'jp-ClaudeSessionsPanel-emptySection';
+                empty.textContent = 'No matching branches.';
+                list.appendChild(empty);
+                return;
+            }
+            for (const b of matches) {
+                const row = document.createElement('div');
+                row.className = 'jp-ClaudeSessionsPanel-branchRow';
+                row.title = `Session id: ${b.session_id}`;
+                const label = document.createElement('span');
+                label.className = 'jp-ClaudeSessionsPanel-branchLabel';
+                label.textContent = b.label;
+                row.appendChild(label);
+                const time = document.createElement('span');
+                time.className = 'jp-ClaudeSessionsPanel-branchTime';
+                time.textContent = this._formatRelativeTime(b.file_mtime);
+                row.appendChild(time);
+                row.addEventListener('click', () => {
+                    dialog.dispose();
+                    void this._switchBranch(b.session_id);
+                });
+                list.appendChild(row);
+            }
+        };
+        search.addEventListener('input', render);
+        render();
+        void dialog.launch();
+        search.focus();
+    }
+    /** Switch the active row's project to another conversation branch.
+     * The backend touches the branch JSONL's mtime; a refresh then shows
+     * the selected conversation as the row's current one. */
+    async _switchBranch(sessionId) {
+        const session = this._activeSession;
+        if (!session) {
+            return;
+        }
+        try {
+            const result = await requestAPI('sessions/switch', this._serverSettings, {
+                method: 'POST',
+                body: JSON.stringify({
+                    encoded_path: session.encoded_path,
+                    session_id: sessionId
+                })
+            });
+            if (result.current !== result.requested) {
+                // The branch's recorded cwd is inconsistent with the project dir,
+                // so the recency resolution cannot make it current.
+                Notification.warning('Branch cannot become current - its recorded folder does not match the project.', { autoClose: 4000 });
+            }
+        }
+        catch (err) {
+            const notFound = err instanceof ServerConnection.ResponseError &&
+                err.response.status === 404;
+            Notification.error(notFound
+                ? 'Branch no longer exists - the session list has been refreshed.'
+                : `Branch switch failed: ${err}`, { autoClose: 4000 });
+        }
+        finally {
+            await this._fetch();
+        }
     }
     // --------------------------------------------------------------- polling
     _startPolling() {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "jupyterlab_claude_code_extension",
-    "version": "1.1.31",
+    "version": "1.2.4",
     "description": "Browse, resume, and manage your Claude Code CLI sessions from a JupyterLab side panel. One click reactivates the right terminal - no duplicate tabs, live remote-control indicator, and favourites for the projects you keep coming back to.",
     "keywords": [
         "jupyter",

package/src/__tests__/jupyterlab_claude_code_extension.spec.ts

@@ -122,6 +122,90 @@ describe('launch spinner dismiss contract', () => {
     });
   });
 
+  /**
+   * Contract for branch switching: the context menu is rebuilt on every
+   * open (Lumino submenu items have no isVisible hook), the branch
+   * submenu is repopulated from a fresh sessions/branches fetch, the
+   * row name carries the conversation count only when branches exist,
+   * and _switchBranch always resyncs the list - including after a 404
+   * for a branch that vanished between menu display and click.
+   */
+  describe('branch switching contract', () => {
+    const openMenu = (widgetSrc.match(
+      /private async _openContextMenu[\s\S]*?\n  \}/
+    ) ?? [''])[0];
+    const switchBranch = (widgetSrc.match(
+      /private async _switchBranch[\s\S]*?\n  \}/
+    ) ?? [''])[0];
+
+    it('shows the conversation count only when the project has branches', () => {
+      expect(widgetSrc).toMatch(
+        /session\.extra_sessions > 0\s*\?\s*`\$\{this\._lookupName\(session\)\} \(\$\{session\.extra_sessions \+ 1\}\)`/
+      );
+    });
+
+    it('rebuilds submenu items from a fresh branches fetch on open', () => {
+      expect(openMenu).toMatch(/sessions\/branches\?encoded_path=/);
+      expect(openMenu).toMatch(/_branchSubmenu\.clearItems\(\)/);
+      expect(openMenu).toMatch(/_rebuildContextMenu\(hasBranches\)/);
+    });
+
+    it('caps the submenu at 5 and adds More... beyond that', () => {
+      expect(openMenu).toMatch(/\.slice\(0, 5\)/);
+      expect(openMenu).toMatch(
+        /branches\.length > 5[\s\S]*?switch-branch-more/
+      );
+    });
+
+    it('More... popup filters by label or session id and switches on click', () => {
+      const popup = (widgetSrc.match(
+        /private _showBranchPopup[\s\S]*?\n  \}/
+      ) ?? [''])[0];
+      expect(popup).toMatch(/createElement\('input'\)/);
+      expect(popup).toMatch(/label\.toLowerCase\(\)\.includes\(needle\)/);
+      expect(popup).toMatch(/session_id\.toLowerCase\(\)\.includes\(needle\)/);
+      expect(popup).toMatch(
+        /dialog\.dispose\(\);\s*void this\._switchBranch\(b\.session_id\)/
+      );
+    });
+
+    it('opens the menu without the submenu when the fetch fails', () => {
+      expect(openMenu).toMatch(/catch[\s\S]*?hasBranches = false/);
+    });
+
+    it('resyncs the session list after every switch attempt', () => {
+      expect(switchBranch).toMatch(/finally[\s\S]*?await this\._fetch\(\)/);
+    });
+
+    it('reports a removed branch distinctly via the 404 status', () => {
+      expect(switchBranch).toMatch(/status === 404/);
+      expect(switchBranch).toMatch(/Branch no longer exists/);
+    });
+
+    it('shows last activity on session rows via the shared formatter', () => {
+      expect(widgetSrc).toMatch(
+        /jp-ClaudeSessionsPanel-rowTime[\s\S]*?_formatRelativeTime\(session\.file_mtime\)/
+      );
+    });
+
+    it('formats relative time as now / m / h / d ago, no date fallback', () => {
+      const fmt = (widgetSrc.match(
+        /private _formatRelativeTime[\s\S]*?\n  \}/
+      ) ?? [''])[0];
+      expect(fmt).toMatch(/return 'now'/);
+      expect(fmt).toMatch(/m ago/);
+      expect(fmt).toMatch(/h ago/);
+      expect(fmt).toMatch(/d ago/);
+      expect(fmt).not.toMatch(/toLocaleDateString/);
+    });
+
+    it('warns when the resolved current differs from the requested branch', () => {
+      expect(switchBranch).toMatch(
+        /result\.current !== result\.requested[\s\S]*?Notification\.warning/
+      );
+    });
+  });
+
   it('_doResumeInTerminal dismisses spinner via dispose(), not resolve()', () => {
     expect(widgetSrc).toMatch(/spinner\.dispose\(\)/);
     expect(widgetSrc).not.toMatch(/spinner\.resolve\(\)/);

package/src/types.ts

@@ -51,6 +51,28 @@ export interface ICleanupResponse {
   removed_count: number;
 }
 
+export interface IBranch {
+  session_id: string;
+  file_mtime: number;
+  label: string;
+}
+
+export interface IBranchesResponse {
+  current: string;
+  total: number;
+  branches: IBranch[];
+}
+
+export interface ISwitchRequest {
+  encoded_path: string;
+  session_id: string;
+}
+
+export interface ISwitchResponse {
+  requested: string;
+  current: string | null;
+}
+
 export interface ILaunchTerminalRequest {
   project_path: string;
   /** Omit to start a brand-new claude session instead of resuming one. */

package/src/widget.ts

@@ -24,12 +24,15 @@ import {
   starFilledIcon
 } from './icons';
 import {
+  IBranch,
+  IBranchesResponse,
   IFavouriteResponse,
   ILaunchTerminalResponse,
   ICleanupResponse,
   IRemoveResponse,
   ISession,
-  ISessionsListResponse
+  ISessionsListResponse,
+  ISwitchResponse
 } from './types';
 
 const POLL_INTERVAL_MS = 30_000;
@@ -948,9 +951,20 @@ export class ClaudeCodeSessionsWidget extends Widget {
 
     const name = document.createElement('span');
     name.className = 'jp-ClaudeSessionsPanel-name';
-    name.textContent = this._lookupName(session);
+    // Conversation count in brackets - only when the project has branches.
+    name.textContent =
+      session.extra_sessions > 0
+        ? `${this._lookupName(session)} (${session.extra_sessions + 1})`
+        : this._lookupName(session);
     row.appendChild(name);
 
+    if (session.file_mtime) {
+      const time = document.createElement('span');
+      time.className = 'jp-ClaudeSessionsPanel-rowTime';
+      time.textContent = this._formatRelativeTime(session.file_mtime);
+      row.appendChild(time);
+    }
+
     // No star in the Favorites section - every row there is a favorite
     // by definition; stars are an indicator only useful in Recent/All.
     if (session.favourite && sectionKey !== 'favourites') {
@@ -974,7 +988,7 @@ export class ClaudeCodeSessionsWidget extends Widget {
       }
       this._activeSession = session;
       this._setActiveRow(row);
-      this._contextMenu.open(e.clientX, e.clientY);
+      void this._openContextMenu(session, e.clientX, e.clientY);
     });
 
     return row;
@@ -993,6 +1007,9 @@ export class ClaudeCodeSessionsWidget extends Widget {
     if (s.message_count) {
       lines.push(`Messages: ${s.message_count}`);
     }
+    if (s.extra_sessions > 0) {
+      lines.push(`Conversations: ${s.extra_sessions + 1}`);
+    }
     if (s.git_branch) {
       lines.push(`Branch: ${s.git_branch}`);
     }
@@ -1040,7 +1057,7 @@ export class ClaudeCodeSessionsWidget extends Widget {
     }
     const diff = Date.now() - epochMs;
     if (diff < 60_000) {
-      return 'just now';
+      return 'now';
     }
     if (diff < 3_600_000) {
       return `${Math.floor(diff / 60_000)}m ago`;
@@ -1048,10 +1065,7 @@ export class ClaudeCodeSessionsWidget extends Widget {
     if (diff < 86_400_000) {
       return `${Math.floor(diff / 3_600_000)}h ago`;
     }
-    if (diff < 30 * 86_400_000) {
-      return `${Math.floor(diff / 86_400_000)}d ago`;
-    }
-    return new Date(epochMs).toLocaleDateString();
+    return `${Math.floor(diff / 86_400_000)}d ago`;
   }
 
   private _setRefreshSpinning(on: boolean): void {
@@ -1180,6 +1194,23 @@ export class ClaudeCodeSessionsWidget extends Widget {
       }
     });
 
+    this._commands.addCommand('claude-code-sessions:switch-branch', {
+      label: args => String(args.label ?? ''),
+      execute: args => {
+        const sessionId = String(args.session_id ?? '');
+        if (sessionId) {
+          void this._switchBranch(sessionId);
+        }
+      }
+    });
+
+    this._commands.addCommand('claude-code-sessions:switch-branch-more', {
+      label: () => `More... (${this._lastBranches.length} total)`,
+      execute: () => {
+        void this._showBranchPopup(this._lastBranches);
+      }
+    });
+
     this._commands.addCommand('claude-code-sessions:remove', {
       label: 'Remove from Claude',
       icon: removeIcon,
@@ -1212,8 +1243,31 @@ export class ClaudeCodeSessionsWidget extends Widget {
       command: 'claude-code-sessions:new-session-dangerous'
     });
 
+    // Submenu listing the project's other conversations ("branches") -
+    // items are rebuilt on every context-menu open from a fresh
+    // sessions/branches fetch.
+    this._branchSubmenu = new Menu({ commands: this._commands });
+    this._branchSubmenu.addClass('jp-ClaudeSessionsContextMenu');
+    this._branchSubmenu.title.label = 'Switch Conversation Branch';
+
     this._contextMenu = new Menu({ commands: this._commands });
     this._contextMenu.addClass('jp-ClaudeSessionsContextMenu');
+    this._rebuildContextMenu(false);
+
+    this._contextMenu.aboutToClose.connect(() => {
+      // Only clear the visual highlight - DO NOT null _activeSession.
+      // Lumino fires aboutToClose BEFORE the activated item's command runs,
+      // so the command callback still needs to read _activeSession. The
+      // field is overwritten on the next contextmenu open.
+      this._setActiveRow(null);
+    });
+  }
+
+  /** Rebuild the context menu's items. Lumino submenu-type items have no
+   * ``isVisible`` hook, so the menu is rebuilt per open and the branch
+   * submenu inserted only when the row actually has branches. */
+  private _rebuildContextMenu(withBranches: boolean): void {
+    this._contextMenu.clearItems();
     this._contextMenu.addItem({ command: 'claude-code-sessions:resume' });
     this._contextMenu.addItem({
       command: 'claude-code-sessions:resume-dangerous'
@@ -1229,18 +1283,171 @@ export class ClaudeCodeSessionsWidget extends Widget {
     });
     this._contextMenu.addItem({ command: 'claude-code-sessions:copy-path' });
     this._contextMenu.addItem({ type: 'separator' });
+    if (withBranches) {
+      this._contextMenu.addItem({
+        type: 'submenu',
+        submenu: this._branchSubmenu
+      });
+    }
     this._contextMenu.addItem({
       command: 'claude-code-sessions:cleanup-parallel'
     });
     this._contextMenu.addItem({ command: 'claude-code-sessions:remove' });
+  }
 
-    this._contextMenu.aboutToClose.connect(() => {
-      // Only clear the visual highlight - DO NOT null _activeSession.
-      // Lumino fires aboutToClose BEFORE the activated item's command runs,
-      // so the command callback still needs to read _activeSession. The
-      // field is overwritten on the next contextmenu open.
-      this._setActiveRow(null);
+  /** Open the row context menu, populating the branch submenu first when
+   * the project has more than one conversation. On a fetch failure the
+   * menu opens without the submenu. */
+  private async _openContextMenu(
+    session: ISession,
+    x: number,
+    y: number
+  ): Promise<void> {
+    let hasBranches = false;
+    if (session.extra_sessions > 0) {
+      try {
+        const data = await requestAPI<IBranchesResponse>(
+          `sessions/branches?encoded_path=${encodeURIComponent(session.encoded_path)}`,
+          this._serverSettings,
+          { cache: 'no-store' }
+        );
+        this._lastBranches = data.branches;
+        this._branchSubmenu.clearItems();
+        // The submenu shows only the 5 most recent; the full list lives
+        // behind "More..." in a searchable popup.
+        for (const b of data.branches.slice(0, 5)) {
+          this._branchSubmenu.addItem({
+            command: 'claude-code-sessions:switch-branch',
+            args: {
+              session_id: b.session_id,
+              label: `${b.label} - ${this._formatRelativeTime(b.file_mtime)}`
+            }
+          });
+        }
+        if (data.branches.length > 5) {
+          this._branchSubmenu.addItem({ type: 'separator' });
+          this._branchSubmenu.addItem({
+            command: 'claude-code-sessions:switch-branch-more'
+          });
+        }
+        hasBranches = data.branches.length > 0;
+      } catch {
+        hasBranches = false;
+      }
+    }
+    this._rebuildContextMenu(hasBranches);
+    this._contextMenu.open(x, y);
+  }
+
+  /** Popup with the project's full branch list - browse and filter when
+   * the list is too large for the submenu. Clicking an entry switches. */
+  private _showBranchPopup(branches: IBranch[]): void {
+    const body = document.createElement('div');
+    body.className = 'jp-ClaudeSessionsPanel-branchPopup';
+
+    const search = document.createElement('input');
+    search.type = 'search';
+    search.placeholder = 'Filter branches...';
+    search.className = 'jp-ClaudeSessionsPanel-branchSearch';
+    body.appendChild(search);
+
+    const list = document.createElement('div');
+    list.className = 'jp-ClaudeSessionsPanel-branchList';
+    body.appendChild(list);
+
+    const bodyWidget = new Widget({ node: body });
+    const dialog = new Dialog({
+      title: 'Switch Conversation Branch',
+      body: bodyWidget,
+      buttons: [Dialog.cancelButton()]
     });
+
+    const render = () => {
+      const needle = search.value.trim().toLowerCase();
+      list.replaceChildren();
+      const matches = branches.filter(
+        b =>
+          !needle ||
+          b.label.toLowerCase().includes(needle) ||
+          b.session_id.toLowerCase().includes(needle)
+      );
+      if (matches.length === 0) {
+        const empty = document.createElement('div');
+        empty.className = 'jp-ClaudeSessionsPanel-emptySection';
+        empty.textContent = 'No matching branches.';
+        list.appendChild(empty);
+        return;
+      }
+      for (const b of matches) {
+        const row = document.createElement('div');
+        row.className = 'jp-ClaudeSessionsPanel-branchRow';
+        row.title = `Session id: ${b.session_id}`;
+
+        const label = document.createElement('span');
+        label.className = 'jp-ClaudeSessionsPanel-branchLabel';
+        label.textContent = b.label;
+        row.appendChild(label);
+
+        const time = document.createElement('span');
+        time.className = 'jp-ClaudeSessionsPanel-branchTime';
+        time.textContent = this._formatRelativeTime(b.file_mtime);
+        row.appendChild(time);
+
+        row.addEventListener('click', () => {
+          dialog.dispose();
+          void this._switchBranch(b.session_id);
+        });
+        list.appendChild(row);
+      }
+    };
+    search.addEventListener('input', render);
+    render();
+
+    void dialog.launch();
+    search.focus();
+  }
+
+  /** Switch the active row's project to another conversation branch.
+   * The backend touches the branch JSONL's mtime; a refresh then shows
+   * the selected conversation as the row's current one. */
+  private async _switchBranch(sessionId: string): Promise<void> {
+    const session = this._activeSession;
+    if (!session) {
+      return;
+    }
+    try {
+      const result = await requestAPI<ISwitchResponse>(
+        'sessions/switch',
+        this._serverSettings,
+        {
+          method: 'POST',
+          body: JSON.stringify({
+            encoded_path: session.encoded_path,
+            session_id: sessionId
+          })
+        }
+      );
+      if (result.current !== result.requested) {
+        // The branch's recorded cwd is inconsistent with the project dir,
+        // so the recency resolution cannot make it current.
+        Notification.warning(
+          'Branch cannot become current - its recorded folder does not match the project.',
+          { autoClose: 4000 }
+        );
+      }
+    } catch (err) {
+      const notFound =
+        err instanceof ServerConnection.ResponseError &&
+        err.response.status === 404;
+      Notification.error(
+        notFound
+          ? 'Branch no longer exists - the session list has been refreshed.'
+          : `Branch switch failed: ${err}`,
+        { autoClose: 4000 }
+      );
+    } finally {
+      await this._fetch();
+    }
   }
 
   // --------------------------------------------------------------- polling
@@ -1275,6 +1482,8 @@ export class ClaudeCodeSessionsWidget extends Widget {
   private _expanded: Record<SectionKey, boolean> = loadExpanded();
   private _commands!: CommandRegistry;
   private _contextMenu!: Menu;
+  private _branchSubmenu!: Menu;
+  private _lastBranches: IBranch[] = [];
   private _newSessionMenu!: Menu;
   private _activeSession: ISession | null = null;
   private _activeRowEl: HTMLElement | null = null;

package/style/base.css

@@ -301,3 +301,56 @@
   display: block;
   margin: 0 auto;
 }
+
+/* Branch-switch popup: search box over a scrollable branch list. */
+.jp-ClaudeSessionsPanel-branchPopup {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+  min-width: 320px;
+}
+
+.jp-ClaudeSessionsPanel-branchSearch {
+  width: 100%;
+  box-sizing: border-box;
+  padding: 4px 6px;
+}
+
+.jp-ClaudeSessionsPanel-branchList {
+  max-height: 280px;
+  overflow-y: auto;
+}
+
+.jp-ClaudeSessionsPanel-branchRow {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 12px;
+  padding: 4px 6px;
+  cursor: pointer;
+  border-radius: 2px;
+}
+
+.jp-ClaudeSessionsPanel-branchRow:hover {
+  background: var(--jp-layout-color2);
+}
+
+.jp-ClaudeSessionsPanel-branchLabel {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.jp-ClaudeSessionsPanel-branchTime {
+  flex: none;
+  color: var(--jp-ui-font-color2);
+  font-size: var(--jp-ui-font-size0);
+}
+
+/* Last-activity time on session rows - dim, right of the name. */
+.jp-ClaudeSessionsPanel-rowTime {
+  flex: 0 0 auto;
+  margin-left: 6px;
+  color: var(--jp-ui-font-color2);
+  font-size: var(--jp-ui-font-size0);
+}