@theia/scm 1.75.0-next.3 → 1.75.0-next.35

package/lib/browser/scm-history-graph-tooltip.spec.js

@@ -0,0 +1,213 @@
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2026 Safi Seid-Ahmad, K2view and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+Object.defineProperty(exports, "__esModule", { value: true });
+const jsdom_1 = require("@theia/core/lib/browser/test/jsdom");
+const disableJSDOM = (0, jsdom_1.enableJSDOM)();
+const chai_1 = require("chai");
+const markdown_string_1 = require("@theia/core/lib/common/markdown-rendering/markdown-string");
+const markdown_link_handler_1 = require("@theia/core/lib/browser/markdown-rendering/markdown-link-handler");
+const disposable_1 = require("@theia/core/lib/common/disposable");
+const scm_history_graph_tooltip_1 = require("./scm-history-graph-tooltip");
+disableJSDOM();
+function makeEntry(item) {
+    return {
+        item: {
+            id: '1a56ba96fdc9b6df3a230df7b44e22e5785e3abd',
+            subject: 'fix something',
+            parentIds: [],
+            ...item,
+        },
+        graphRow: { lane: 0, color: 0, topColor: 0, edges: [], hasContinuation: false, hasTopLine: false },
+        isCurrent: false,
+    };
+}
+const markdownRenderer = {
+    render: () => ({ element: document.createElement('div'), dispose: () => { } })
+};
+describe('buildHtmlTooltip', () => {
+    let restoreJSDOM;
+    before(() => {
+        restoreJSDOM = (0, jsdom_1.enableJSDOM)();
+    });
+    after(() => {
+        restoreJSDOM();
+    });
+    it('renders the author as a bold mailto link when the email is known', () => {
+        const tooltip = (0, scm_history_graph_tooltip_1.buildHtmlTooltip)(makeEntry({ author: 'Jane Doe', authorEmail: 'jane@example.com', timestamp: 1000 }), markdownRenderer);
+        const link = tooltip.querySelector('a[href="mailto:jane@example.com"]');
+        (0, chai_1.expect)(link, 'mailto link').to.not.be.null;
+        (0, chai_1.expect)(link.textContent).to.contain('Jane Doe');
+        (0, chai_1.expect)(link.querySelector('strong'), 'bold author').to.not.be.null;
+    });
+    it('renders a plain bold author when no email is known', () => {
+        const tooltip = (0, scm_history_graph_tooltip_1.buildHtmlTooltip)(makeEntry({ author: 'Jane Doe', timestamp: 1000 }), markdownRenderer);
+        (0, chai_1.expect)(tooltip.querySelector('a[href^="mailto:"]')).to.be.null;
+        const strong = tooltip.querySelector('.scm-history-tooltip-header strong');
+        (0, chai_1.expect)(strong).to.not.be.null;
+        (0, chai_1.expect)(strong.textContent).to.equal('Jane Doe');
+    });
+    it('renders the author avatar image when authorIcon is a URL', () => {
+        const tooltip = (0, scm_history_graph_tooltip_1.buildHtmlTooltip)(makeEntry({ author: 'Jane Doe', authorIcon: 'https://avatars.example.com/u/1' }), markdownRenderer);
+        const img = tooltip.querySelector('img.scm-history-tooltip-avatar');
+        (0, chai_1.expect)(img, 'avatar image').to.not.be.null;
+        (0, chai_1.expect)(img.src).to.equal('https://avatars.example.com/u/1');
+    });
+    it('falls back to the account icon without an avatar', () => {
+        const tooltip = (0, scm_history_graph_tooltip_1.buildHtmlTooltip)(makeEntry({ author: 'Jane Doe' }), markdownRenderer);
+        (0, chai_1.expect)(tooltip.querySelector('img.scm-history-tooltip-avatar')).to.be.null;
+        (0, chai_1.expect)(tooltip.querySelector('.scm-history-tooltip-header .codicon-account')).to.not.be.null;
+    });
+    it('renders an Open Commit action with the short hash', () => {
+        let opened = 0;
+        const actions = { openCommit: () => { opened++; } };
+        const tooltip = (0, scm_history_graph_tooltip_1.buildHtmlTooltip)(makeEntry({ displayId: '1a56ba9' }), markdownRenderer, undefined, actions);
+        const action = tooltip.querySelector('[title="Open Commit"]');
+        (0, chai_1.expect)(action, 'open commit action').to.not.be.null;
+        (0, chai_1.expect)(action.textContent).to.contain('1a56ba9');
+        action.click();
+        (0, chai_1.expect)(opened).to.equal(1);
+    });
+    it('renders a Copy Commit Hash action', () => {
+        let copied = 0;
+        const actions = { copyCommitHash: () => { copied++; } };
+        const tooltip = (0, scm_history_graph_tooltip_1.buildHtmlTooltip)(makeEntry({}), markdownRenderer, undefined, actions);
+        const action = tooltip.querySelector('[title="Copy Commit Hash"]');
+        (0, chai_1.expect)(action, 'copy hash action').to.not.be.null;
+        action.click();
+        (0, chai_1.expect)(copied).to.equal(1);
+    });
+    it('shows the short hash as plain text when no actions are given', () => {
+        const tooltip = (0, scm_history_graph_tooltip_1.buildHtmlTooltip)(makeEntry({ displayId: '1a56ba9' }), markdownRenderer);
+        (0, chai_1.expect)(tooltip.querySelector('[title="Open Commit"]')).to.be.null;
+        (0, chai_1.expect)(tooltip.querySelector('[title="Copy Commit Hash"]')).to.be.null;
+        (0, chai_1.expect)(tooltip.textContent).to.contain('1a56ba9');
+    });
+});
+describe('buildProviderTooltip', () => {
+    let restoreJSDOM;
+    let opened;
+    let toDispose;
+    /** Renders the markdown value as HTML, so that the wiring of the resulting links can be asserted. */
+    const htmlRenderer = {
+        render: (markdown) => {
+            const element = document.createElement('div');
+            element.innerHTML = markdown.value;
+            return { element, dispose: () => { } };
+        }
+    };
+    const openerService = {
+        getOpener: (uri) => Promise.resolve({
+            canHandle: () => 1,
+            open: () => {
+                // decoded, as `HttpOpenHandler` does when opening the target externally
+                opened.push(uri.toString(true));
+                return Promise.resolve(undefined);
+            }
+        })
+    };
+    /** Clicks the anchor and waits for the asynchronous opener lookup to settle. */
+    async function click(tooltip, selector) {
+        const anchor = tooltip.querySelector(selector);
+        (0, chai_1.expect)(anchor, selector).to.not.be.null;
+        anchor.dispatchEvent(new MouseEvent('click', { bubbles: true, cancelable: true }));
+        await new Promise(resolve => setTimeout(resolve, 0));
+    }
+    before(() => {
+        restoreJSDOM = (0, jsdom_1.enableJSDOM)();
+    });
+    after(() => {
+        restoreJSDOM();
+    });
+    beforeEach(() => {
+        opened = [];
+        toDispose = new disposable_1.DisposableCollection();
+    });
+    afterEach(() => {
+        toDispose.dispose();
+    });
+    it('renders each section in order', () => {
+        const tooltip = (0, scm_history_graph_tooltip_1.buildProviderTooltip)([new markdown_string_1.MarkdownStringImpl('<span>first</span>'), new markdown_string_1.MarkdownStringImpl('<span>second</span>')], htmlRenderer, openerService, toDispose);
+        (0, chai_1.expect)(tooltip, 'tooltip').to.not.be.undefined;
+        (0, chai_1.expect)(tooltip.textContent).to.equal('firstsecond');
+    });
+    // `vscode.git` ends its author and statistics sections with a horizontal rule of its own,
+    // so adding separators here would render every boundary as a double line.
+    it('adds no separators of its own between sections', () => {
+        const tooltip = (0, scm_history_graph_tooltip_1.buildProviderTooltip)([new markdown_string_1.MarkdownStringImpl('<span>first</span><hr>'), new markdown_string_1.MarkdownStringImpl('<span>second</span>')], htmlRenderer, openerService, toDispose);
+        (0, chai_1.expect)(tooltip.querySelectorAll('hr').length, 'rules').to.equal(1);
+    });
+    it('renders a plain string tooltip', () => {
+        const tooltip = (0, scm_history_graph_tooltip_1.buildProviderTooltip)('just text', htmlRenderer, openerService, toDispose);
+        (0, chai_1.expect)(tooltip, 'tooltip').to.not.be.undefined;
+        (0, chai_1.expect)(tooltip.textContent).to.equal('just text');
+    });
+    it('returns undefined when the provider supplies no usable content', () => {
+        (0, chai_1.expect)((0, scm_history_graph_tooltip_1.buildProviderTooltip)('   ', htmlRenderer, openerService, toDispose)).to.be.undefined;
+        (0, chai_1.expect)((0, scm_history_graph_tooltip_1.buildProviderTooltip)([], htmlRenderer, openerService, toDispose)).to.be.undefined;
+    });
+    it('routes an author mailto link through the opener service', async () => {
+        const tooltip = (0, scm_history_graph_tooltip_1.buildProviderTooltip)(new markdown_string_1.MarkdownStringImpl('<a href="mailto:jane@example.com">Jane Doe</a>'), htmlRenderer, openerService, toDispose);
+        await click(tooltip, 'a[href^="mailto:"]');
+        (0, chai_1.expect)(opened).to.deep.equal(['mailto:jane@example.com']);
+    });
+    it('executes a command link that the section trusts', async () => {
+        const section = new markdown_string_1.MarkdownStringImpl('<a href="command:git.viewCommit">Open Commit</a>');
+        section.isTrusted = { enabledCommands: ['git.viewCommit'] };
+        const tooltip = (0, scm_history_graph_tooltip_1.buildProviderTooltip)(section, htmlRenderer, openerService, toDispose);
+        await click(tooltip, 'a[href^="command:"]');
+        (0, chai_1.expect)(opened).to.deep.equal(['command:git.viewCommit']);
+    });
+    it('blocks a command link that the section does not trust', async () => {
+        const section = new markdown_string_1.MarkdownStringImpl('<a href="command:git.viewCommit">Open Commit</a>');
+        section.isTrusted = { enabledCommands: ['git.copyContentToClipboard'] };
+        const tooltip = (0, scm_history_graph_tooltip_1.buildProviderTooltip)(section, htmlRenderer, openerService, toDispose);
+        await click(tooltip, 'a[href^="command:"]');
+        (0, chai_1.expect)(opened).to.be.empty;
+    });
+    it('does not open a link twice when the renderer already wired it', async () => {
+        // The Monaco-based renderer used at runtime routes link activation through the opener
+        // service itself, so wiring a second handler on top would open every link twice.
+        const wiringRenderer = {
+            render: (markdown) => {
+                const element = document.createElement('div');
+                element.innerHTML = markdown.value;
+                (0, markdown_link_handler_1.markMarkdownLinksWired)(element);
+                element.addEventListener('click', event => {
+                    event.preventDefault();
+                    opened.push(event.target.getAttribute('href'));
+                });
+                return { element, dispose: () => { } };
+            }
+        };
+        const section = new markdown_string_1.MarkdownStringImpl('<a href="command:git.viewCommit">Open Commit</a>');
+        section.isTrusted = { enabledCommands: ['git.viewCommit'] };
+        const tooltip = (0, scm_history_graph_tooltip_1.buildProviderTooltip)(section, wiringRenderer, openerService, toDispose);
+        await click(tooltip, 'a[href^="command:"]');
+        (0, chai_1.expect)(opened).to.deep.equal(['command:git.viewCommit']);
+    });
+    it('does not let one section authorize another section\'s commands', async () => {
+        const untrusted = new markdown_string_1.MarkdownStringImpl('<a id="untrusted" href="command:git.viewCommit">Open Commit</a>');
+        const trusted = new markdown_string_1.MarkdownStringImpl('<a id="trusted" href="command:git.copyContentToClipboard">Copy</a>');
+        trusted.isTrusted = { enabledCommands: ['git.copyContentToClipboard'] };
+        const tooltip = (0, scm_history_graph_tooltip_1.buildProviderTooltip)([untrusted, trusted], htmlRenderer, openerService, toDispose);
+        await click(tooltip, 'a#untrusted');
+        (0, chai_1.expect)(opened, 'untrusted section').to.be.empty;
+        await click(tooltip, 'a#trusted');
+        (0, chai_1.expect)(opened, 'trusted section').to.deep.equal(['command:git.copyContentToClipboard']);
+    });
+});
+//# sourceMappingURL=scm-history-graph-tooltip.spec.js.map

package/lib/browser/scm-history-graph-tooltip.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"scm-history-graph-tooltip.spec.js","sourceRoot":"","sources":["../../src/browser/scm-history-graph-tooltip.spec.ts"],"names":[],"mappings":"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"}

package/lib/browser/scm-history-graph-widget.d.ts

@@ -2,33 +2,42 @@ import * as React from '@theia/core/shared/react';
 import { ReactWidget } from '@theia/core/lib/browser/widgets/react-widget';
 import { LabelProvider } from '@theia/core/lib/browser/label-provider';
 import { HoverService } from '@theia/core/lib/browser/hover-service';
+import { ClipboardService } from '@theia/core/lib/browser/clipboard-service';
 import { MarkdownRenderer, MarkdownRendererFactory } from '@theia/core/lib/browser/markdown-rendering/markdown-renderer';
 import { ScmHistoryGraphModel, HistoryGraphEntry } from './scm-history-graph-model';
 import { ScmHistoryItemRef, ScmHistoryItemChange } from './scm-provider';
 import { ScmService } from './scm-service';
 import { GraphRow } from './scm-history-graph-lanes';
 import { CancellationTokenSource } from '@theia/core/lib/common/cancellation';
+import { DisposableCollection } from '@theia/core/lib/common/disposable';
+import { Emitter, Event } from '@theia/core/lib/common/event';
+import { DynamicToolbarWidget } from '@theia/core/lib/browser/view-container';
 import { MenuPath } from '@theia/core/lib/common/menu/menu-types';
 import { ContextMenuRenderer } from '@theia/core/lib/browser/context-menu-renderer';
 import { OpenerService } from '@theia/core/lib/browser/opener-service';
 import { ScmContextKeyService } from './scm-context-key-service';
+import { ScmPreferences } from '../common/scm-preferences';
+import { ILogger } from '@theia/core';
 /** Menu path matching the VS Code 'scm/history/title' contribution point (graph section toolbar). */
 export declare const SCM_HISTORY_TITLE_MENU: MenuPath;
 /** Menu path matching the VS Code 'scm/historyItem/context' contribution point (commit row context menu). */
 export declare const SCM_HISTORY_ITEM_CONTEXT_MENU: MenuPath;
 /** Menu path matching the VS Code 'scm/historyItemRef/context' contribution point (ref badge context menu). */
 export declare const SCM_HISTORY_ITEM_REF_CONTEXT_MENU: MenuPath;
-export declare class ScmHistoryGraphWidget extends ReactWidget {
+export declare class ScmHistoryGraphWidget extends ReactWidget implements DynamicToolbarWidget {
     static readonly ID = "scm-history-graph-widget";
     static readonly LABEL: string;
     protected readonly model: ScmHistoryGraphModel;
     protected readonly hoverService: HoverService;
+    protected readonly clipboardService: ClipboardService;
     protected readonly markdownRendererFactory: MarkdownRendererFactory;
     protected readonly scmService: ScmService;
     protected readonly labelProvider: LabelProvider;
     protected readonly contextMenuRenderer: ContextMenuRenderer;
     protected readonly openerService: OpenerService;
     protected readonly scmContextKeys: ScmContextKeyService;
+    protected readonly scmPreferences: ScmPreferences;
+    protected readonly logger: ILogger;
     protected selectedIndex: number;
     /** Currently selected change row key (`${itemId}-${ci}`), or undefined. */
     protected selectedChangeKey: string | undefined;
@@ -38,6 +47,11 @@ export declare class ScmHistoryGraphWidget extends ReactWidget {
     protected expandedIds: Set<string>;
     /** Map from commit id → in-flight CancellationTokenSource for loadChanges. */
     protected loadChangesCts: Map<string, CancellationTokenSource>;
+    /** Cleanup for the content of the hover currently being shown. */
+    protected readonly toDisposeOnHover: DisposableCollection;
+    protected readonly onDidChangeToolbarItemsEmitter: Emitter<void>;
+    /** Re-renders the part toolbar on model changes, e.g. to reflect the toggled state of the ref filter picker. */
+    readonly onDidChangeToolbarItems: Event<void>;
     constructor();
     protected init(): void;
     protected updateContextKeys(): void;
@@ -47,6 +61,14 @@ export declare class ScmHistoryGraphWidget extends ReactWidget {
     protected _markdownRenderer: MarkdownRenderer | undefined;
     protected get markdownRenderer(): MarkdownRenderer;
     protected handleRowMouseEnter: (e: React.MouseEvent<HTMLDivElement>, entry: HistoryGraphEntry) => void;
+    /**
+     * Prefers the hover content supplied by the provider, so that its own links and commands
+     * (author `mailto:`, "Open Commit", remote actions) stay intact, and falls back to the hover
+     * derived from the history item's fields for providers that supply none.
+     */
+    protected buildTooltip(entry: HistoryGraphEntry): HTMLElement;
+    /** Selects the commit and expands its changes, closing the hover first. */
+    protected openCommitFromTooltip(entry: HistoryGraphEntry): void;
     protected renderChangesRows(itemId: string, svgWidth: number, graphRow: GraphRow, changes: ScmHistoryItemChange[] | 'loading' | undefined): React.ReactElement;
     protected renderChangeRow(change: ScmHistoryItemChange, ci: number, itemId: string, svgWidth: number, graphRow: GraphRow): React.ReactElement;
     protected handleChangeClick: (e: React.MouseEvent, change: ScmHistoryItemChange, changeKey: string) => void;

package/lib/browser/scm-history-graph-widget.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scm-history-graph-widget.d.ts","sourceRoot":"","sources":["../../src/browser/scm-history-graph-widget.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"scm-history-graph-widget.d.ts","sourceRoot":"","sources":["../../src/browser/scm-history-graph-widget.tsx"],"names":[],"mappings":"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"}

package/lib/browser/scm-history-graph-widget.js

@@ -24,17 +24,22 @@ const inversify_1 = require("@theia/core/shared/inversify");
 const react_widget_1 = require("@theia/core/lib/browser/widgets/react-widget");
 const label_provider_1 = require("@theia/core/lib/browser/label-provider");
 const hover_service_1 = require("@theia/core/lib/browser/hover-service");
+const clipboard_service_1 = require("@theia/core/lib/browser/clipboard-service");
 const markdown_renderer_1 = require("@theia/core/lib/browser/markdown-rendering/markdown-renderer");
 const scm_history_graph_model_1 = require("./scm-history-graph-model");
 const scm_service_1 = require("./scm-service");
 const uri_1 = require("@theia/core/lib/common/uri");
 const nls_1 = require("@theia/core/lib/common/nls");
 const cancellation_1 = require("@theia/core/lib/common/cancellation");
+const disposable_1 = require("@theia/core/lib/common/disposable");
+const event_1 = require("@theia/core/lib/common/event");
 const context_menu_renderer_1 = require("@theia/core/lib/browser/context-menu-renderer");
 const opener_service_1 = require("@theia/core/lib/browser/opener-service");
 const diff_uris_1 = require("@theia/core/lib/browser/diff-uris");
 const scm_context_key_service_1 = require("./scm-context-key-service");
+const scm_preferences_1 = require("../common/scm-preferences");
 const scm_history_graph_helpers_1 = require("./scm-history-graph-helpers");
+const core_1 = require("@theia/core");
 const scm_history_graph_tooltip_1 = require("./scm-history-graph-tooltip");
 /** Menu path matching the VS Code 'scm/history/title' contribution point (graph section toolbar). */
 exports.SCM_HISTORY_TITLE_MENU = ['plugin_scm/history/title'];
@@ -68,14 +73,20 @@ let ScmHistoryGraphWidget = class ScmHistoryGraphWidget extends react_widget_1.R
         this.expandedIds = new Set();
         /** Map from commit id → in-flight CancellationTokenSource for loadChanges. */
         this.loadChangesCts = new Map();
+        /** Cleanup for the content of the hover currently being shown. */
+        this.toDisposeOnHover = new disposable_1.DisposableCollection();
+        this.onDidChangeToolbarItemsEmitter = new event_1.Emitter();
+        /** Re-renders the part toolbar on model changes, e.g. to reflect the toggled state of the ref filter picker. */
+        this.onDidChangeToolbarItems = this.onDidChangeToolbarItemsEmitter.event;
         this.handleEndReached = () => {
             if (this.model.hasMore && !this.model.loading) {
                 this.model.loadMore();
             }
         };
         this.handleRowMouseEnter = (e, entry) => {
+            this.toDisposeOnHover.dispose();
             this.hoverService.requestHover({
-                content: (0, scm_history_graph_tooltip_1.buildHtmlTooltip)(entry, this.markdownRenderer),
+                content: this.buildTooltip(entry),
                 target: e.currentTarget,
                 position: 'right',
                 interactive: true,
@@ -167,9 +178,16 @@ let ScmHistoryGraphWidget = class ScmHistoryGraphWidget extends react_widget_1.R
         this.node.tabIndex = 0;
     }
     init() {
+        this.toDispose.push(this.onDidChangeToolbarItemsEmitter);
         this.toDispose.push(this.model.onDidChange(() => {
             this.updateContextKeys();
             this.update();
+            this.onDidChangeToolbarItemsEmitter.fire();
+        }));
+        this.toDispose.push(this.scmPreferences.onPreferenceChanged(e => {
+            if (e.preferenceName.startsWith('scm.graph.')) {
+                this.update();
+            }
         }));
         this.toDispose.push({
             dispose: () => {
@@ -180,12 +198,15 @@ let ScmHistoryGraphWidget = class ScmHistoryGraphWidget extends react_widget_1.R
                 this.loadChangesCts.clear();
             }
         });
+        this.toDispose.push(this.toDisposeOnHover);
         this.update();
     }
     updateContextKeys() {
         const provider = this.model.provider;
         this.scmContextKeys.scmCurrentHistoryItemRefHasRemote.set(!!provider?.currentHistoryItemRemoteRef);
         this.scmContextKeys.scmCurrentHistoryItemRefHasBase.set(!!provider?.currentHistoryItemBaseRef);
+        // Commands like git.pullRef/git.pushRef gate their enablement on this key.
+        this.scmContextKeys.scmCurrentHistoryItemRefInFilter.set(!!provider?.currentHistoryItemRef && this.model.isCurrentRefInFilter());
     }
     render() {
         const { entries, hasMore, loading } = this.model;
@@ -209,15 +230,14 @@ let ScmHistoryGraphWidget = class ScmHistoryGraphWidget extends react_widget_1.R
             : hasMore
                 ? () => (React.createElement("div", { className: 'scm-history-load-more', onClick: this.handleLoadMore, role: 'button', tabIndex: 0, onKeyDown: this.handleLoadMoreKey }, nls_1.nls.localizeByDefault('Load more')))
                 : undefined;
-        return (React.createElement(react_virtuoso_1.Virtuoso, { className: 'scm-history-graph-list', data: entries, itemContent: (idx, entry) => this.renderRow(entry, idx, svgWidth), endReached: hasMore && !loading ? this.handleEndReached : undefined, overscan: 500, components: footer ? { Footer: footer } : {}, style: { overflowX: 'hidden' } }));
+        return (React.createElement(react_virtuoso_1.Virtuoso, { className: 'scm-history-graph-list', data: entries, itemContent: (idx, entry) => this.renderRow(entry, idx, svgWidth), endReached: hasMore && !loading && this.scmPreferences['scm.graph.pageOnScroll'] !== false ? this.handleEndReached : undefined, overscan: 500, components: footer ? { Footer: footer } : {}, style: { overflowX: 'hidden' } }));
     }
     renderRow(entry, idx, svgWidth) {
         const { item, graphRow } = entry;
         const isSelected = idx === this.selectedIndex;
         const isExpanded = this.expandedIds.has(item.id);
         const changes = this.expandedChanges.get(item.id);
-        // The first commit (idx === 0) on lane 0 is treated as HEAD/current
-        const isHead = idx === 0 && graphRow.lane === 0;
+        const isHead = entry.isCurrent;
         return (React.createElement(React.Fragment, { key: item.id },
             React.createElement("div", { className: `scm-history-graph-row${isSelected ? ' selected' : ''}`, onClick: () => this.handleRowClick(idx, entry), onContextMenu: e => this.handleRowContextMenu(e, entry), onMouseEnter: e => this.handleRowMouseEnter(e, entry) },
                 this.renderGraphSvg(graphRow, svgWidth, isHead),
@@ -231,6 +251,39 @@ let ScmHistoryGraphWidget = class ScmHistoryGraphWidget extends react_widget_1.R
         this._markdownRenderer ||= this.markdownRendererFactory();
         return this._markdownRenderer;
     }
+    /**
+     * Prefers the hover content supplied by the provider, so that its own links and commands
+     * (author `mailto:`, "Open Commit", remote actions) stay intact, and falls back to the hover
+     * derived from the history item's fields for providers that supply none.
+     */
+    buildTooltip(entry) {
+        const { tooltip } = entry.item;
+        if (tooltip) {
+            const provided = (0, scm_history_graph_tooltip_1.buildProviderTooltip)(tooltip, this.markdownRenderer, this.openerService, this.toDisposeOnHover);
+            if (provided) {
+                return provided;
+            }
+        }
+        return (0, scm_history_graph_tooltip_1.buildHtmlTooltip)(entry, this.markdownRenderer, this.model.provider, {
+            openCommit: () => this.openCommitFromTooltip(entry),
+            copyCommitHash: () => this.clipboardService.writeText(entry.item.id),
+        });
+    }
+    /** Selects the commit and expands its changes, closing the hover first. */
+    openCommitFromTooltip(entry) {
+        this.hoverService.cancelHover();
+        const idx = this.model.entries.indexOf(entry);
+        if (idx < 0) {
+            return;
+        }
+        if (this.expandedIds.has(entry.item.id)) {
+            this.selectedIndex = idx;
+            this.update();
+        }
+        else {
+            this.handleRowClick(idx, entry);
+        }
+    }
     renderChangesRows(itemId, svgWidth, graphRow, changes) {
         if (changes === 'loading' || changes === undefined) {
             return (React.createElement("div", { key: `${itemId}-loading`, className: 'scm-history-changes-loading' }, nls_1.nls.localizeByDefault('Loading')));
@@ -282,7 +335,7 @@ let ScmHistoryGraphWidget = class ScmHistoryGraphWidget extends react_widget_1.R
             }
         }
         catch (err) {
-            console.error('ScmHistoryGraphWidget: failed to open change', err);
+            this.logger.error('Failed to open change', err);
         }
     }
     renderChangeRowSvg(graphRow, svgWidth) {
@@ -345,9 +398,11 @@ let ScmHistoryGraphWidget = class ScmHistoryGraphWidget extends react_widget_1.R
         }
         // Commit lane lines — split at cy=11
         // Top segment: only drawn if there is an incoming line from above
-        // (i.e. this commit was referenced as a parent by an earlier row)
+        // (i.e. this commit was referenced as a parent by an earlier row).
+        // It keeps the color inherited from the chain above, which may differ
+        // from the commit's own (ref-based) color.
         if (row.hasTopLine) {
-            elements.push(React.createElement("path", { key: `top-${keyIdx++}`, fill: 'none', strokeWidth: '1px', strokeLinecap: 'round', d: `M ${commitX} 0 V ${cy}`, style: { stroke: commitColor } }));
+            elements.push(React.createElement("path", { key: `top-${keyIdx++}`, fill: 'none', strokeWidth: '1px', strokeLinecap: 'round', d: `M ${commitX} 0 V ${cy}`, style: { stroke: (0, scm_history_graph_helpers_1.laneColor)(row.topColor) } }));
         }
         // Bottom segment: only drawn if the lane continues to a parent below
         if (row.hasContinuation) {
@@ -381,11 +436,14 @@ let ScmHistoryGraphWidget = class ScmHistoryGraphWidget extends react_widget_1.R
         if (!refs || refs.length === 0) {
             return undefined;
         }
+        const provider = this.model.provider;
+        const visibleRefs = (0, scm_history_graph_helpers_1.filterRefsForBadges)(refs, provider, this.scmPreferences['scm.graph.badges'] ?? 'filter', this.model.historyItemRefFilter);
+        if (visibleRefs.length === 0) {
+            return undefined;
+        }
         const laneColorValue = entry ? (0, scm_history_graph_helpers_1.laneColor)(entry.graphRow.color) : undefined;
-        const deduplicated = (0, scm_history_graph_helpers_1.deduplicateRefs)(refs);
-        const style = laneColorValue
-            ? { backgroundColor: laneColorValue, color: 'var(--theia-scmGraph-historyItemRefForeground, var(--theia-badge-foreground))' }
-            : {};
+        const deduplicated = (0, scm_history_graph_helpers_1.deduplicateRefs)(visibleRefs);
+        const badgeForeground = 'var(--theia-scmGraph-historyItemRefForeground, var(--theia-badge-foreground))';
         const badges = [];
         for (const info of deduplicated) {
             if (badges.length >= 3) {
@@ -395,18 +453,16 @@ let ScmHistoryGraphWidget = class ScmHistoryGraphWidget extends react_widget_1.R
             const isTag = (0, scm_history_graph_helpers_1.isTagRef)(ref);
             const isRemote = (0, scm_history_graph_helpers_1.isRemoteRef)(ref);
             const onContextMenu = entry ? (e) => this.handleRefBadgeContextMenu(e, entry, ref) : undefined;
-            if (isTag) {
-                badges.push(renderJsxRefBadge(ref, 'codicon-tag', false, style, ref.id, onContextMenu));
-            }
-            else if (isRemote) {
-                badges.push(renderJsxRefBadge(ref, 'codicon-cloud', true, style, ref.id, onContextMenu));
-            }
-            else {
-                badges.push(renderJsxRefBadge(ref, 'codicon-git-branch', true, style, ref.id, onContextMenu));
-                if (hasBoth && badges.length < 3) {
-                    badges.push(React.createElement("span", { key: `${ref.id}-cloud`, className: 'scm-history-ref-badge scm-history-ref-badge-cloud', title: ref.description ?? ref.name, style: style },
-                        React.createElement("i", { className: 'codicon codicon-cloud scm-history-ref-icon' })));
-                }
+            // Current/remote/base refs are colored by role, others by the row's lane color
+            const { iconClass, colorIndex } = (0, scm_history_graph_helpers_1.getRefBadgePresentation)(ref, provider);
+            const backgroundColor = colorIndex !== undefined ? (0, scm_history_graph_helpers_1.laneColor)(colorIndex) : laneColorValue;
+            const style = backgroundColor
+                ? { backgroundColor, color: badgeForeground }
+                : {};
+            badges.push(renderJsxRefBadge(ref, iconClass, !isTag, style, ref.id, onContextMenu));
+            if (!isTag && !isRemote && hasBoth && badges.length < 3) {
+                badges.push(React.createElement("span", { key: `${ref.id}-cloud`, className: 'scm-history-ref-badge scm-history-ref-badge-cloud', title: ref.description ?? ref.name, style: style },
+                    React.createElement("i", { className: 'codicon codicon-cloud scm-history-ref-icon' })));
             }
         }
         return badges;
@@ -434,7 +490,7 @@ let ScmHistoryGraphWidget = class ScmHistoryGraphWidget extends react_widget_1.R
         }
         catch (err) {
             if (!cts.token.isCancellationRequested) {
-                console.error('ScmHistoryGraphWidget: failed to load changes', err);
+                this.logger.error('Failed to load changes', err);
                 this.expandedChanges.set(item.id, []);
                 this.update();
             }
@@ -453,6 +509,10 @@ tslib_1.__decorate([
     (0, inversify_1.inject)(hover_service_1.HoverService),
     tslib_1.__metadata("design:type", hover_service_1.HoverService)
 ], ScmHistoryGraphWidget.prototype, "hoverService", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.inject)(clipboard_service_1.ClipboardService),
+    tslib_1.__metadata("design:type", Object)
+], ScmHistoryGraphWidget.prototype, "clipboardService", void 0);
 tslib_1.__decorate([
     (0, inversify_1.inject)(markdown_renderer_1.MarkdownRendererFactory),
     tslib_1.__metadata("design:type", Function)
@@ -477,6 +537,15 @@ tslib_1.__decorate([
     (0, inversify_1.inject)(scm_context_key_service_1.ScmContextKeyService),
     tslib_1.__metadata("design:type", scm_context_key_service_1.ScmContextKeyService)
 ], ScmHistoryGraphWidget.prototype, "scmContextKeys", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.inject)(scm_preferences_1.ScmPreferences),
+    tslib_1.__metadata("design:type", Object)
+], ScmHistoryGraphWidget.prototype, "scmPreferences", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.inject)(core_1.ILogger),
+    (0, inversify_1.named)('scm:ScmHistoryGraphWidget'),
+    tslib_1.__metadata("design:type", Object)
+], ScmHistoryGraphWidget.prototype, "logger", void 0);
 tslib_1.__decorate([
     (0, inversify_1.postConstruct)(),
     tslib_1.__metadata("design:type", Function),