jupyterlab_claude_code_extension 1.2.4 → 1.2.7

package/README.md

@@ -20,7 +20,8 @@ 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)`
+- **Conversation switcher** - a right-click "Switch and Manage Sessions" submenu lists a project's other conversations by name and short session id, e.g. `home (3f2a1b9c)`, with last-activity time; pick one and it becomes the row's current conversation - the next click resumes exactly that one. The submenu shows the 5 most recent; "Manage Sessions..." opens a searchable popup over the full list where conversations can also be deleted - select one, many, or all via checkboxes, then confirm with a two-step Delete button (removed files honour the trash setting). Rows with multiple conversations show the count in brackets after the name, e.g. `workspace (2)`
+- **Activity at a glance** - each row shows its last activity (`now`, `5m ago`, `2h ago`, `3d ago`); rows active within the last minute light up in the theme's brand colour, rows idle for over a week dim slightly
 - **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

@@ -60,6 +60,13 @@ export interface ISwitchResponse {
     requested: string;
     current: string | null;
 }
+export interface IDeleteBranchesRequest {
+    encoded_path: string;
+    session_ids: string[];
+}
+export interface IDeleteBranchesResponse {
+    removed_count: number;
+}
 export interface ILaunchTerminalRequest {
     project_path: string;
     /** Omit to start a brand-new claude session instead of resuming one. */

package/lib/widget.d.ts

@@ -92,6 +92,11 @@ export declare class ClaudeCodeSessionsWidget extends Widget {
      * case the file browser has no way to address it. */
     private _pathUnderRoot;
     private _formatRelativeTime;
+    /** Branch entry display: conversation name plus short session id in
+     * brackets; branches share the project path so only the name and id
+     * distinguish them. Skips the suffix when the label already is the
+     * short id (the backend's last-resort fallback). */
+    private _branchDisplayName;
     private _setRefreshSpinning;
     private _setActiveRow;
     private _setupContextMenu;
@@ -103,9 +108,16 @@ export declare class ClaudeCodeSessionsWidget extends Widget {
      * 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. */
+    /** Popup with the project's full branch list - browse, filter, switch
+     * and manage. Clicking an entry switches while nothing is selected;
+     * checkbox selection (one, many, or select-all) arms a two-step Delete
+     * button that removes the chosen sessions. The current conversation is
+     * shown first, badged and untouchable. */
     private _showBranchPopup;
+    /** Delete the given branch sessions of the active row's project.
+     * Returns the removed count, or null on failure (after notifying).
+     * Always resyncs the panel so the row's conversation count drops. */
+    private _deleteBranches;
     /** 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. */
@@ -124,6 +136,7 @@ export declare class ClaudeCodeSessionsWidget extends Widget {
     private _contextMenu;
     private _branchSubmenu;
     private _lastBranches;
+    private _lastBranchesCurrent;
     private _newSessionMenu;
     private _activeSession;
     private _activeRowEl;

package/lib/widget.js

@@ -65,6 +65,7 @@ export class ClaudeCodeSessionsWidget extends Widget {
         this._sessions = null;
         this._expanded = loadExpanded();
         this._lastBranches = [];
+        this._lastBranchesCurrent = '';
         this._activeSession = null;
         this._activeRowEl = null;
         this._pollHandle = null;
@@ -783,6 +784,17 @@ export class ClaudeCodeSessionsWidget extends Widget {
         const row = document.createElement('div');
         row.className = 'jp-ClaudeSessionsPanel-row';
         row.title = this._buildRowTooltip(session);
+        // Age emphasis: active within the last minute reads bright, idle for
+        // over a week dims; the state decays/promotes on the next refresh.
+        if (session.file_mtime) {
+            const age = Date.now() - session.file_mtime;
+            if (age < 60000) {
+                row.classList.add('jp-mod-recentlyActive');
+            }
+            else if (age > 7 * 86400000) {
+                row.classList.add('jp-mod-stale');
+            }
+        }
         const removing = this._removingPaths.has(session.encoded_path);
         if (removing) {
             row.classList.add('jp-mod-busy');
@@ -914,6 +926,14 @@ export class ClaudeCodeSessionsWidget extends Widget {
         }
         return `${Math.floor(diff / 86400000)}d ago`;
     }
+    /** Branch entry display: conversation name plus short session id in
+     * brackets; branches share the project path so only the name and id
+     * distinguish them. Skips the suffix when the label already is the
+     * short id (the backend's last-resort fallback). */
+    _branchDisplayName(b) {
+        const shortId = b.session_id.slice(0, 8);
+        return b.label === shortId ? b.label : `${b.label} (${shortId})`;
+    }
     _setRefreshSpinning(on) {
         if (!this._refreshBtn) {
             return;
@@ -1035,9 +1055,9 @@ export class ClaudeCodeSessionsWidget extends Widget {
             }
         });
         this._commands.addCommand('claude-code-sessions:switch-branch-more', {
-            label: () => `More... (${this._lastBranches.length} total)`,
+            label: () => `Manage Sessions... (${this._lastBranches.length})`,
             execute: () => {
-                void this._showBranchPopup(this._lastBranches);
+                void this._showBranchPopup(this._lastBranches, this._lastBranchesCurrent);
             }
         });
         this._commands.addCommand('claude-code-sessions:remove', {
@@ -1073,7 +1093,7 @@ export class ClaudeCodeSessionsWidget extends Widget {
         // sessions/branches fetch.
         this._branchSubmenu = new Menu({ commands: this._commands });
         this._branchSubmenu.addClass('jp-ClaudeSessionsContextMenu');
-        this._branchSubmenu.title.label = 'Switch Conversation Branch';
+        this._branchSubmenu.title.label = 'Switch and Manage Sessions';
         this._contextMenu = new Menu({ commands: this._commands });
         this._contextMenu.addClass('jp-ClaudeSessionsContextMenu');
         this._rebuildContextMenu(false);
@@ -1125,24 +1145,25 @@ export class ClaudeCodeSessionsWidget extends Widget {
             try {
                 const data = await requestAPI(`sessions/branches?encoded_path=${encodeURIComponent(session.encoded_path)}`, this._serverSettings, { cache: 'no-store' });
                 this._lastBranches = data.branches;
+                this._lastBranchesCurrent = data.current;
                 this._branchSubmenu.clearItems();
-                // The submenu shows only the 5 most recent; the full list lives
-                // behind "More..." in a searchable popup.
+                this._branchSubmenu.title.label = `Switch and Manage Sessions (${data.branches.length})`;
+                // The submenu shows only the 5 most recent inline (fewest clicks
+                // for often-used sessions); the full list plus management lives
+                // behind the always-present "Manage Sessions..." 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)}`
+                            label: `${this._branchDisplayName(b)} - ${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'
-                    });
-                }
+                this._branchSubmenu.addItem({ type: 'separator' });
+                this._branchSubmenu.addItem({
+                    command: 'claude-code-sessions:switch-branch-more'
+                });
                 hasBranches = data.branches.length > 0;
             }
             catch (_a) {
@@ -1152,35 +1173,90 @@ export class ClaudeCodeSessionsWidget extends Widget {
         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) {
+    /** Popup with the project's full branch list - browse, filter, switch
+     * and manage. Clicking an entry switches while nothing is selected;
+     * checkbox selection (one, many, or select-all) arms a two-step Delete
+     * button that removes the chosen sessions. The current conversation is
+     * shown first, badged and untouchable. */
+    _showBranchPopup(branches, current) {
+        // Local working copy so deletions can refresh the list in place.
+        let items = [...branches];
+        const selected = new Set();
+        let confirmArmed = false;
         const body = document.createElement('div');
         body.className = 'jp-ClaudeSessionsPanel-branchPopup';
         const search = document.createElement('input');
         search.type = 'search';
-        search.placeholder = 'Filter branches...';
+        search.placeholder = 'Filter sessions...';
         search.className = 'jp-ClaudeSessionsPanel-branchSearch';
         body.appendChild(search);
+        const selectAllBar = document.createElement('label');
+        selectAllBar.className = 'jp-ClaudeSessionsPanel-branchSelectAll';
+        const selectAll = document.createElement('input');
+        selectAll.type = 'checkbox';
+        selectAllBar.appendChild(selectAll);
+        selectAllBar.appendChild(document.createTextNode('Select all'));
+        body.appendChild(selectAllBar);
         const list = document.createElement('div');
         list.className = 'jp-ClaudeSessionsPanel-branchList';
         body.appendChild(list);
+        const footer = document.createElement('div');
+        footer.className = 'jp-ClaudeSessionsPanel-branchFooter';
+        const deleteBtn = document.createElement('button');
+        deleteBtn.className = 'jp-ClaudeSessionsPanel-branchDelete';
+        footer.appendChild(deleteBtn);
+        body.appendChild(footer);
         const bodyWidget = new Widget({ node: body });
         const dialog = new Dialog({
-            title: 'Switch Conversation Branch',
+            title: 'Switch and Manage Sessions',
             body: bodyWidget,
             buttons: [Dialog.cancelButton()]
         });
-        const render = () => {
+        const visibleMatches = () => {
             const needle = search.value.trim().toLowerCase();
-            list.replaceChildren();
-            const matches = branches.filter(b => !needle ||
+            return items.filter(b => !needle ||
                 b.label.toLowerCase().includes(needle) ||
                 b.session_id.toLowerCase().includes(needle));
+        };
+        // Any selection change disarms a pending confirm.
+        const updateControls = () => {
+            confirmArmed = false;
+            deleteBtn.disabled = selected.size === 0;
+            deleteBtn.textContent = `Delete (${selected.size})`;
+            deleteBtn.classList.remove('jp-mod-confirm');
+            const visible = visibleMatches();
+            const visibleSelected = visible.filter(b => selected.has(b.session_id)).length;
+            selectAll.checked =
+                visible.length > 0 && visibleSelected === visible.length;
+            selectAll.indeterminate =
+                visibleSelected > 0 && visibleSelected < visible.length;
+        };
+        const render = () => {
+            list.replaceChildren();
+            // The current conversation leads the list - badged, unselectable,
+            // undeletable; only the extras below it are manageable.
+            const currentRow = document.createElement('div');
+            currentRow.className = 'jp-ClaudeSessionsPanel-branchRow jp-mod-current';
+            currentRow.title = `Session id: ${current}`;
+            const currentLabel = document.createElement('span');
+            currentLabel.className = 'jp-ClaudeSessionsPanel-branchLabel';
+            const currentName = this._activeSession
+                ? this._lookupName(this._activeSession)
+                : current.slice(0, 8);
+            currentLabel.textContent = `${currentName} (${current.slice(0, 8)})`;
+            currentRow.appendChild(currentLabel);
+            const badge = document.createElement('span');
+            badge.className = 'jp-ClaudeSessionsPanel-branchCurrentBadge';
+            badge.textContent = 'current';
+            currentRow.appendChild(badge);
+            list.appendChild(currentRow);
+            const matches = visibleMatches();
             if (matches.length === 0) {
                 const empty = document.createElement('div');
                 empty.className = 'jp-ClaudeSessionsPanel-emptySection';
-                empty.textContent = 'No matching branches.';
+                empty.textContent = items.length
+                    ? 'No matching sessions.'
+                    : 'No other conversations.';
                 list.appendChild(empty);
                 return;
             }
@@ -1188,26 +1264,120 @@ export class ClaudeCodeSessionsWidget extends Widget {
                 const row = document.createElement('div');
                 row.className = 'jp-ClaudeSessionsPanel-branchRow';
                 row.title = `Session id: ${b.session_id}`;
+                const check = document.createElement('input');
+                check.type = 'checkbox';
+                check.checked = selected.has(b.session_id);
+                // The checkbox is its own click zone - ticking must not switch.
+                check.addEventListener('click', e => {
+                    e.stopPropagation();
+                    if (check.checked) {
+                        selected.add(b.session_id);
+                    }
+                    else {
+                        selected.delete(b.session_id);
+                    }
+                    updateControls();
+                });
+                row.appendChild(check);
                 const label = document.createElement('span');
                 label.className = 'jp-ClaudeSessionsPanel-branchLabel';
-                label.textContent = b.label;
+                label.textContent = this._branchDisplayName(b);
                 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', () => {
+                    // Selection mode: while anything is ticked, row clicks toggle
+                    // selection - no accidental switch mid-selection.
+                    if (selected.size > 0) {
+                        if (selected.has(b.session_id)) {
+                            selected.delete(b.session_id);
+                        }
+                        else {
+                            selected.add(b.session_id);
+                        }
+                        check.checked = selected.has(b.session_id);
+                        updateControls();
+                        return;
+                    }
                     dialog.dispose();
                     void this._switchBranch(b.session_id);
                 });
                 list.appendChild(row);
             }
         };
-        search.addEventListener('input', render);
+        selectAll.addEventListener('change', () => {
+            // Select-all acts on the visible (filtered) rows only.
+            const visible = visibleMatches();
+            if (selectAll.checked) {
+                visible.forEach(b => selected.add(b.session_id));
+            }
+            else {
+                visible.forEach(b => selected.delete(b.session_id));
+            }
+            render();
+            updateControls();
+        });
+        deleteBtn.addEventListener('click', () => {
+            if (selected.size === 0) {
+                return;
+            }
+            if (!confirmArmed) {
+                // Two-step delete: first click arms, second click executes.
+                confirmArmed = true;
+                deleteBtn.textContent = `Confirm delete (${selected.size})`;
+                deleteBtn.classList.add('jp-mod-confirm');
+                return;
+            }
+            void this._deleteBranches([...selected]).then(deleted => {
+                if (deleted === null) {
+                    return;
+                }
+                items = items.filter(b => !selected.has(b.session_id));
+                selected.clear();
+                this._lastBranches = items;
+                render();
+                updateControls();
+            });
+        });
+        search.addEventListener('input', () => {
+            render();
+            updateControls();
+        });
         render();
+        updateControls();
         void dialog.launch();
         search.focus();
     }
+    /** Delete the given branch sessions of the active row's project.
+     * Returns the removed count, or null on failure (after notifying).
+     * Always resyncs the panel so the row's conversation count drops. */
+    async _deleteBranches(sessionIds) {
+        const session = this._activeSession;
+        if (!session) {
+            return null;
+        }
+        try {
+            const result = await requestAPI('sessions/delete-branches', this._serverSettings, {
+                method: 'POST',
+                body: JSON.stringify({
+                    encoded_path: session.encoded_path,
+                    session_ids: sessionIds
+                })
+            });
+            return result.removed_count;
+        }
+        catch (err) {
+            Notification.error(`Delete failed: ${String(err)}`, {
+                autoClose: 4000
+            });
+            return null;
+        }
+        finally {
+            await this._fetch();
+        }
+    }
     /** 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. */

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "jupyterlab_claude_code_extension",
-    "version": "1.2.4",
+    "version": "1.2.7",
     "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

@@ -150,10 +150,35 @@ describe('launch spinner dismiss contract', () => {
       expect(openMenu).toMatch(/_rebuildContextMenu\(hasBranches\)/);
     });
 
-    it('caps the submenu at 5 and adds More... beyond that', () => {
+    it('caps the inline submenu at 5 most recent', () => {
       expect(openMenu).toMatch(/\.slice\(0, 5\)/);
+    });
+
+    it('always adds the Manage Sessions entry, no >5 gate', () => {
+      // The popup is the management hub - it must be reachable even for
+      // projects with 2-5 conversations, so the entry is unconditional.
+      expect(openMenu).toMatch(/switch-branch-more/);
+      expect(openMenu).not.toMatch(/branches\.length > 5/);
+      expect(widgetSrc).toMatch(/`Manage Sessions\.\.\. \(\$\{/);
+    });
+
+    it('titles the submenu Switch and Manage Sessions with the count', () => {
       expect(openMenu).toMatch(
-        /branches\.length > 5[\s\S]*?switch-branch-more/
+        /title\.label = `Switch and Manage Sessions \(\$\{data\.branches\.length\}\)`/
+      );
+    });
+
+    it('branch entries render name plus short id via _branchDisplayName', () => {
+      const display = (widgetSrc.match(
+        /private _branchDisplayName[\s\S]*?\n  \}/
+      ) ?? [''])[0];
+      expect(display).toMatch(/session_id\.slice\(0, 8\)/);
+      expect(display).toMatch(/`\$\{b\.label\} \(\$\{shortId\}\)`/);
+      expect(widgetSrc).toMatch(
+        /label: `\$\{this\._branchDisplayName\(b\)\} - \$\{this\._formatRelativeTime\(b\.file_mtime\)\}`/
+      );
+      expect(widgetSrc).toMatch(
+        /label\.textContent = this\._branchDisplayName\(b\)/
       );
     });
 
@@ -169,6 +194,70 @@ describe('launch spinner dismiss contract', () => {
       );
     });
 
+    it('popup leads with the current row, badged and without checkbox', () => {
+      const popup = (widgetSrc.match(
+        /private _showBranchPopup[\s\S]*?\n  \}/
+      ) ?? [''])[0];
+      expect(popup).toMatch(/jp-mod-current/);
+      expect(popup).toMatch(/branchCurrentBadge/);
+      // The current row is appended before any checkbox is created.
+      const currentIdx = popup.indexOf('jp-mod-current');
+      const checkboxIdx = popup.indexOf("check.type = 'checkbox'");
+      expect(currentIdx).toBeGreaterThan(-1);
+      expect(checkboxIdx).toBeGreaterThan(currentIdx);
+    });
+
+    it('checkbox is its own click zone and selection gates row switch', () => {
+      const popup = (widgetSrc.match(
+        /private _showBranchPopup[\s\S]*?\n  \}/
+      ) ?? [''])[0];
+      expect(popup).toMatch(/stopPropagation\(\)/);
+      // Selection mode: row click toggles while anything is selected.
+      expect(popup).toMatch(
+        /if \(selected\.size > 0\) \{[\s\S]*?return;[\s\S]*?dialog\.dispose\(\)/
+      );
+    });
+
+    it('select-all toggles the visible (filtered) rows only', () => {
+      const popup = (widgetSrc.match(
+        /private _showBranchPopup[\s\S]*?\n  \}/
+      ) ?? [''])[0];
+      expect(popup).toMatch(
+        /selectAll\.addEventListener\('change'[\s\S]*?visibleMatches\(\)/
+      );
+    });
+
+    it('delete is two-step and any selection change disarms it', () => {
+      const popup = (widgetSrc.match(
+        /private _showBranchPopup[\s\S]*?\n  \}/
+      ) ?? [''])[0];
+      expect(popup).toMatch(/`Confirm delete \(\$\{selected\.size\}\)`/);
+      // updateControls (run on every selection change) resets the armed
+      // state and the button label.
+      expect(popup).toMatch(
+        /const updateControls = \(\) => \{\s*confirmArmed = false/
+      );
+    });
+
+    it('delete posts to delete-branches and resyncs the panel', () => {
+      const del = (widgetSrc.match(
+        /private async _deleteBranches[\s\S]*?\n  \}/
+      ) ?? [''])[0];
+      expect(del).toMatch(/sessions\/delete-branches/);
+      expect(del).toMatch(/finally[\s\S]*?await this\._fetch\(\)/);
+    });
+
+    it('rows carry age emphasis classes at the 60s and 7d thresholds', () => {
+      expect(widgetSrc).toMatch(/age < 60_000[\s\S]*?jp-mod-recentlyActive/);
+      expect(widgetSrc).toMatch(/age > 7 \* 86_400_000[\s\S]*?jp-mod-stale/);
+      const css: string = fs.readFileSync(
+        path.join(__dirname, '..', '..', 'style', 'base.css'),
+        'utf-8'
+      );
+      expect(css).toMatch(/jp-mod-recentlyActive[\s\S]*?--jp-brand-color1/);
+      expect(css).toMatch(/jp-mod-stale \{\s*opacity/);
+    });
+
     it('opens the menu without the submenu when the fetch fails', () => {
       expect(openMenu).toMatch(/catch[\s\S]*?hasBranches = false/);
     });

package/src/types.ts

@@ -73,6 +73,15 @@ export interface ISwitchResponse {
   current: string | null;
 }
 
+export interface IDeleteBranchesRequest {
+  encoded_path: string;
+  session_ids: string[];
+}
+
+export interface IDeleteBranchesResponse {
+  removed_count: number;
+}
+
 export interface ILaunchTerminalRequest {
   project_path: string;
   /** Omit to start a brand-new claude session instead of resuming one. */

package/src/widget.ts

@@ -26,6 +26,7 @@ import {
 import {
   IBranch,
   IBranchesResponse,
+  IDeleteBranchesResponse,
   IFavouriteResponse,
   ILaunchTerminalResponse,
   ICleanupResponse,
@@ -928,6 +929,17 @@ export class ClaudeCodeSessionsWidget extends Widget {
     row.className = 'jp-ClaudeSessionsPanel-row';
     row.title = this._buildRowTooltip(session);
 
+    // Age emphasis: active within the last minute reads bright, idle for
+    // over a week dims; the state decays/promotes on the next refresh.
+    if (session.file_mtime) {
+      const age = Date.now() - session.file_mtime;
+      if (age < 60_000) {
+        row.classList.add('jp-mod-recentlyActive');
+      } else if (age > 7 * 86_400_000) {
+        row.classList.add('jp-mod-stale');
+      }
+    }
+
     const removing = this._removingPaths.has(session.encoded_path);
     if (removing) {
       row.classList.add('jp-mod-busy');
@@ -1068,6 +1080,15 @@ export class ClaudeCodeSessionsWidget extends Widget {
     return `${Math.floor(diff / 86_400_000)}d ago`;
   }
 
+  /** Branch entry display: conversation name plus short session id in
+   * brackets; branches share the project path so only the name and id
+   * distinguish them. Skips the suffix when the label already is the
+   * short id (the backend's last-resort fallback). */
+  private _branchDisplayName(b: IBranch): string {
+    const shortId = b.session_id.slice(0, 8);
+    return b.label === shortId ? b.label : `${b.label} (${shortId})`;
+  }
+
   private _setRefreshSpinning(on: boolean): void {
     if (!this._refreshBtn) {
       return;
@@ -1205,9 +1226,12 @@ export class ClaudeCodeSessionsWidget extends Widget {
     });
 
     this._commands.addCommand('claude-code-sessions:switch-branch-more', {
-      label: () => `More... (${this._lastBranches.length} total)`,
+      label: () => `Manage Sessions... (${this._lastBranches.length})`,
       execute: () => {
-        void this._showBranchPopup(this._lastBranches);
+        void this._showBranchPopup(
+          this._lastBranches,
+          this._lastBranchesCurrent
+        );
       }
     });
 
@@ -1248,7 +1272,7 @@ export class ClaudeCodeSessionsWidget extends Widget {
     // sessions/branches fetch.
     this._branchSubmenu = new Menu({ commands: this._commands });
     this._branchSubmenu.addClass('jp-ClaudeSessionsContextMenu');
-    this._branchSubmenu.title.label = 'Switch Conversation Branch';
+    this._branchSubmenu.title.label = 'Switch and Manage Sessions';
 
     this._contextMenu = new Menu({ commands: this._commands });
     this._contextMenu.addClass('jp-ClaudeSessionsContextMenu');
@@ -1312,24 +1336,25 @@ export class ClaudeCodeSessionsWidget extends Widget {
           { cache: 'no-store' }
         );
         this._lastBranches = data.branches;
+        this._lastBranchesCurrent = data.current;
         this._branchSubmenu.clearItems();
-        // The submenu shows only the 5 most recent; the full list lives
-        // behind "More..." in a searchable popup.
+        this._branchSubmenu.title.label = `Switch and Manage Sessions (${data.branches.length})`;
+        // The submenu shows only the 5 most recent inline (fewest clicks
+        // for often-used sessions); the full list plus management lives
+        // behind the always-present "Manage Sessions..." 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)}`
+              label: `${this._branchDisplayName(b)} - ${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'
-          });
-        }
+        this._branchSubmenu.addItem({ type: 'separator' });
+        this._branchSubmenu.addItem({
+          command: 'claude-code-sessions:switch-branch-more'
+        });
         hasBranches = data.branches.length > 0;
       } catch {
         hasBranches = false;
@@ -1339,42 +1364,106 @@ export class ClaudeCodeSessionsWidget extends Widget {
     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 {
+  /** Popup with the project's full branch list - browse, filter, switch
+   * and manage. Clicking an entry switches while nothing is selected;
+   * checkbox selection (one, many, or select-all) arms a two-step Delete
+   * button that removes the chosen sessions. The current conversation is
+   * shown first, badged and untouchable. */
+  private _showBranchPopup(branches: IBranch[], current: string): void {
+    // Local working copy so deletions can refresh the list in place.
+    let items = [...branches];
+    const selected = new Set<string>();
+    let confirmArmed = false;
+
     const body = document.createElement('div');
     body.className = 'jp-ClaudeSessionsPanel-branchPopup';
 
     const search = document.createElement('input');
     search.type = 'search';
-    search.placeholder = 'Filter branches...';
+    search.placeholder = 'Filter sessions...';
     search.className = 'jp-ClaudeSessionsPanel-branchSearch';
     body.appendChild(search);
 
+    const selectAllBar = document.createElement('label');
+    selectAllBar.className = 'jp-ClaudeSessionsPanel-branchSelectAll';
+    const selectAll = document.createElement('input');
+    selectAll.type = 'checkbox';
+    selectAllBar.appendChild(selectAll);
+    selectAllBar.appendChild(document.createTextNode('Select all'));
+    body.appendChild(selectAllBar);
+
     const list = document.createElement('div');
     list.className = 'jp-ClaudeSessionsPanel-branchList';
     body.appendChild(list);
 
+    const footer = document.createElement('div');
+    footer.className = 'jp-ClaudeSessionsPanel-branchFooter';
+    const deleteBtn = document.createElement('button');
+    deleteBtn.className = 'jp-ClaudeSessionsPanel-branchDelete';
+    footer.appendChild(deleteBtn);
+    body.appendChild(footer);
+
     const bodyWidget = new Widget({ node: body });
     const dialog = new Dialog({
-      title: 'Switch Conversation Branch',
+      title: 'Switch and Manage Sessions',
       body: bodyWidget,
       buttons: [Dialog.cancelButton()]
     });
 
-    const render = () => {
+    const visibleMatches = (): IBranch[] => {
       const needle = search.value.trim().toLowerCase();
-      list.replaceChildren();
-      const matches = branches.filter(
+      return items.filter(
         b =>
           !needle ||
           b.label.toLowerCase().includes(needle) ||
           b.session_id.toLowerCase().includes(needle)
       );
+    };
+
+    // Any selection change disarms a pending confirm.
+    const updateControls = () => {
+      confirmArmed = false;
+      deleteBtn.disabled = selected.size === 0;
+      deleteBtn.textContent = `Delete (${selected.size})`;
+      deleteBtn.classList.remove('jp-mod-confirm');
+      const visible = visibleMatches();
+      const visibleSelected = visible.filter(b =>
+        selected.has(b.session_id)
+      ).length;
+      selectAll.checked =
+        visible.length > 0 && visibleSelected === visible.length;
+      selectAll.indeterminate =
+        visibleSelected > 0 && visibleSelected < visible.length;
+    };
+
+    const render = () => {
+      list.replaceChildren();
+
+      // The current conversation leads the list - badged, unselectable,
+      // undeletable; only the extras below it are manageable.
+      const currentRow = document.createElement('div');
+      currentRow.className = 'jp-ClaudeSessionsPanel-branchRow jp-mod-current';
+      currentRow.title = `Session id: ${current}`;
+      const currentLabel = document.createElement('span');
+      currentLabel.className = 'jp-ClaudeSessionsPanel-branchLabel';
+      const currentName = this._activeSession
+        ? this._lookupName(this._activeSession)
+        : current.slice(0, 8);
+      currentLabel.textContent = `${currentName} (${current.slice(0, 8)})`;
+      currentRow.appendChild(currentLabel);
+      const badge = document.createElement('span');
+      badge.className = 'jp-ClaudeSessionsPanel-branchCurrentBadge';
+      badge.textContent = 'current';
+      currentRow.appendChild(badge);
+      list.appendChild(currentRow);
+
+      const matches = visibleMatches();
       if (matches.length === 0) {
         const empty = document.createElement('div');
         empty.className = 'jp-ClaudeSessionsPanel-emptySection';
-        empty.textContent = 'No matching branches.';
+        empty.textContent = items.length
+          ? 'No matching sessions.'
+          : 'No other conversations.';
         list.appendChild(empty);
         return;
       }
@@ -1383,9 +1472,24 @@ export class ClaudeCodeSessionsWidget extends Widget {
         row.className = 'jp-ClaudeSessionsPanel-branchRow';
         row.title = `Session id: ${b.session_id}`;
 
+        const check = document.createElement('input');
+        check.type = 'checkbox';
+        check.checked = selected.has(b.session_id);
+        // The checkbox is its own click zone - ticking must not switch.
+        check.addEventListener('click', e => {
+          e.stopPropagation();
+          if (check.checked) {
+            selected.add(b.session_id);
+          } else {
+            selected.delete(b.session_id);
+          }
+          updateControls();
+        });
+        row.appendChild(check);
+
         const label = document.createElement('span');
         label.className = 'jp-ClaudeSessionsPanel-branchLabel';
-        label.textContent = b.label;
+        label.textContent = this._branchDisplayName(b);
         row.appendChild(label);
 
         const time = document.createElement('span');
@@ -1394,19 +1498,102 @@ export class ClaudeCodeSessionsWidget extends Widget {
         row.appendChild(time);
 
         row.addEventListener('click', () => {
+          // Selection mode: while anything is ticked, row clicks toggle
+          // selection - no accidental switch mid-selection.
+          if (selected.size > 0) {
+            if (selected.has(b.session_id)) {
+              selected.delete(b.session_id);
+            } else {
+              selected.add(b.session_id);
+            }
+            check.checked = selected.has(b.session_id);
+            updateControls();
+            return;
+          }
           dialog.dispose();
           void this._switchBranch(b.session_id);
         });
         list.appendChild(row);
       }
     };
-    search.addEventListener('input', render);
+
+    selectAll.addEventListener('change', () => {
+      // Select-all acts on the visible (filtered) rows only.
+      const visible = visibleMatches();
+      if (selectAll.checked) {
+        visible.forEach(b => selected.add(b.session_id));
+      } else {
+        visible.forEach(b => selected.delete(b.session_id));
+      }
+      render();
+      updateControls();
+    });
+
+    deleteBtn.addEventListener('click', () => {
+      if (selected.size === 0) {
+        return;
+      }
+      if (!confirmArmed) {
+        // Two-step delete: first click arms, second click executes.
+        confirmArmed = true;
+        deleteBtn.textContent = `Confirm delete (${selected.size})`;
+        deleteBtn.classList.add('jp-mod-confirm');
+        return;
+      }
+      void this._deleteBranches([...selected]).then(deleted => {
+        if (deleted === null) {
+          return;
+        }
+        items = items.filter(b => !selected.has(b.session_id));
+        selected.clear();
+        this._lastBranches = items;
+        render();
+        updateControls();
+      });
+    });
+
+    search.addEventListener('input', () => {
+      render();
+      updateControls();
+    });
     render();
+    updateControls();
 
     void dialog.launch();
     search.focus();
   }
 
+  /** Delete the given branch sessions of the active row's project.
+   * Returns the removed count, or null on failure (after notifying).
+   * Always resyncs the panel so the row's conversation count drops. */
+  private async _deleteBranches(sessionIds: string[]): Promise<number | null> {
+    const session = this._activeSession;
+    if (!session) {
+      return null;
+    }
+    try {
+      const result = await requestAPI<IDeleteBranchesResponse>(
+        'sessions/delete-branches',
+        this._serverSettings,
+        {
+          method: 'POST',
+          body: JSON.stringify({
+            encoded_path: session.encoded_path,
+            session_ids: sessionIds
+          })
+        }
+      );
+      return result.removed_count;
+    } catch (err) {
+      Notification.error(`Delete failed: ${String(err)}`, {
+        autoClose: 4000
+      });
+      return null;
+    } finally {
+      await this._fetch();
+    }
+  }
+
   /** 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. */
@@ -1484,6 +1671,7 @@ export class ClaudeCodeSessionsWidget extends Widget {
   private _contextMenu!: Menu;
   private _branchSubmenu!: Menu;
   private _lastBranches: IBranch[] = [];
+  private _lastBranchesCurrent = '';
   private _newSessionMenu!: Menu;
   private _activeSession: ISession | null = null;
   private _activeRowEl: HTMLElement | null = null;

package/style/base.css

@@ -347,6 +347,72 @@
   font-size: var(--jp-ui-font-size0);
 }
 
+.jp-ClaudeSessionsPanel-branchRow input[type='checkbox'] {
+  flex: none;
+  margin: 0;
+  cursor: pointer;
+}
+
+/* The current conversation leads the popup list - badged, untouchable. */
+.jp-ClaudeSessionsPanel-branchRow.jp-mod-current {
+  cursor: default;
+  color: var(--jp-ui-font-color2);
+}
+
+.jp-ClaudeSessionsPanel-branchRow.jp-mod-current:hover {
+  background: transparent;
+}
+
+.jp-ClaudeSessionsPanel-branchCurrentBadge {
+  flex: none;
+  padding: 0 6px;
+  border: 1px solid var(--jp-border-color2);
+  border-radius: 8px;
+  color: var(--jp-ui-font-color2);
+  font-size: var(--jp-ui-font-size0);
+}
+
+.jp-ClaudeSessionsPanel-branchSelectAll {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  padding: 0 6px;
+  cursor: pointer;
+  color: var(--jp-ui-font-color2);
+  font-size: var(--jp-ui-font-size0);
+  user-select: none;
+}
+
+.jp-ClaudeSessionsPanel-branchSelectAll input[type='checkbox'] {
+  margin: 0;
+  cursor: pointer;
+}
+
+.jp-ClaudeSessionsPanel-branchFooter {
+  display: flex;
+  justify-content: flex-end;
+}
+
+.jp-ClaudeSessionsPanel-branchDelete {
+  padding: 4px 12px;
+  border: 1px solid var(--jp-border-color1);
+  border-radius: 2px;
+  background: var(--jp-layout-color1);
+  color: var(--jp-ui-font-color1);
+  cursor: pointer;
+}
+
+.jp-ClaudeSessionsPanel-branchDelete:disabled {
+  opacity: 0.5;
+  cursor: default;
+}
+
+/* Armed state of the two-step delete - second click executes. */
+.jp-ClaudeSessionsPanel-branchDelete.jp-mod-confirm {
+  border-color: var(--jp-error-color1);
+  color: var(--jp-error-color1);
+}
+
 /* Last-activity time on session rows - dim, right of the name. */
 .jp-ClaudeSessionsPanel-rowTime {
   flex: 0 0 auto;
@@ -354,3 +420,13 @@
   color: var(--jp-ui-font-color2);
   font-size: var(--jp-ui-font-size0);
 }
+
+/* Age emphasis: a row active within the last minute reads bright, a row
+   idle for over a week dims; both decay/promote on the next refresh. */
+.jp-ClaudeSessionsPanel-row.jp-mod-recentlyActive .jp-ClaudeSessionsPanel-name {
+  color: var(--jp-brand-color1);
+}
+
+.jp-ClaudeSessionsPanel-row.jp-mod-stale {
+  opacity: 0.65;
+}