@theia/scm 1.71.0-next.8 → 1.71.0

package/src/browser/scm-provider.ts

@@ -18,11 +18,13 @@
 
 import { Disposable, Event } from '@theia/core/lib/common';
 import URI from '@theia/core/lib/common/uri';
+import { CancellationToken } from '@theia/core/lib/common/cancellation';
 
 export interface ScmProvider extends Disposable {
     readonly id: string;
     readonly label: string;
     readonly rootUri: string;
+    readonly handle?: number;
 
     readonly acceptInputCommand?: ScmCommand;
 
@@ -41,6 +43,8 @@ export interface ScmProvider extends Disposable {
     readonly onDidChangeActionButton?: Event<ScmActionButton | undefined>;
 
     readonly providerContextValue?: string;
+
+    readonly historyProvider?: ScmHistoryProvider;
 }
 
 export const ScmResourceGroup = Symbol('ScmResourceGroup');
@@ -102,3 +106,67 @@ export interface ScmActionButton {
     enabled?: boolean;
     description?: string;
 }
+
+export interface ScmHistoryItemRef {
+    readonly id: string;
+    readonly name: string;
+    readonly description?: string;
+    readonly revision?: string;
+    readonly icon?: string;
+    readonly category?: string;
+}
+
+export interface ScmHistoryItemRefsChangeEvent {
+    readonly added: readonly ScmHistoryItemRef[];
+    readonly removed: readonly ScmHistoryItemRef[];
+    readonly modified: readonly ScmHistoryItemRef[];
+}
+
+export interface ScmHistoryOptions {
+    readonly skip?: number;
+    readonly limit?: number | { id?: string };
+    readonly historyItemRefs?: readonly string[];
+    readonly filterText?: string;
+}
+
+export interface ScmHistoryItemStatistics {
+    readonly files: number;
+    readonly insertions: number;
+    readonly deletions: number;
+}
+
+export interface ScmHistoryItem {
+    readonly id: string;
+    readonly parentIds?: readonly string[];
+    readonly subject: string;
+    readonly message?: string;
+    readonly author?: string;
+    readonly authorEmail?: string;
+    readonly authorIcon?: string;
+    readonly displayId?: string;
+    readonly timestamp?: number;
+    readonly tooltip?: string;
+    readonly statistics?: ScmHistoryItemStatistics;
+    readonly references?: readonly ScmHistoryItemRef[];
+}
+
+export interface ScmHistoryItemChange {
+    readonly uri: string;
+    readonly originalUri?: string;
+    readonly modifiedUri?: string;
+    readonly renameUri?: string;
+}
+
+export interface ScmHistoryProvider {
+    readonly currentHistoryItemRef?: ScmHistoryItemRef;
+    readonly currentHistoryItemRemoteRef?: ScmHistoryItemRef;
+    readonly currentHistoryItemBaseRef?: ScmHistoryItemRef;
+    readonly onDidChangeCurrentHistoryItemRefs: Event<void>;
+    readonly onDidChangeHistoryItemRefs: Event<ScmHistoryItemRefsChangeEvent>;
+
+    provideHistoryItemRefs(historyItemRefs: string[] | undefined, token: CancellationToken): Promise<ScmHistoryItemRef[] | undefined>;
+    provideHistoryItems(options: ScmHistoryOptions, token: CancellationToken): Promise<ScmHistoryItem[] | undefined>;
+    provideHistoryItemChanges(historyItemId: string, historyItemParentId: string | undefined, token: CancellationToken): Promise<ScmHistoryItemChange[] | undefined>;
+    resolveHistoryItem(historyItemId: string, token: CancellationToken): Promise<ScmHistoryItem | undefined>;
+    resolveHistoryItemRefsCommonAncestor(historyItemRefs: string[], token: CancellationToken): Promise<string | undefined>;
+}

package/src/browser/scm-repositories-widget.spec.ts

@@ -89,7 +89,7 @@ function createWidget(opts: CreateWidgetOptions): ScmRepositoriesWidget {
     };
 
     const mockContextMenuRenderer = { render: () => ({ dispose: () => { } }) };
-    const mockScmContextKeys = { scmProvider: { set: () => { } } };
+    const mockScmContextKeys = { scmProvider: { set: () => { } }, scmProviderContext: { set: () => { } } };
 
     (widget as unknown as Record<string, unknown>).scmService = mockScmService;
     (widget as unknown as Record<string, unknown>).labelProvider = mockLabelProvider;

package/src/browser/scm-repositories-widget.tsx

@@ -32,10 +32,15 @@ import { ScmContextKeyService } from './scm-context-key-service';
 export const SCM_TITLE_MENU: MenuPath = ['plugin_scm/title'];
 /** Menu path matching the VS Code 'scm/sourceControl' contribution point (inline toolbar actions on repo entries). */
 export const SCM_SOURCE_CONTROL_MENU: MenuPath = ['plugin_scm/sourceControl'];
-/** Menu path matching the VS Code 'scm/sourceControl/context' contribution point (context menu on repo entries). */
+/**
+ * @deprecated The 'scm/sourceControl/context' contribution point does not exist in VS Code.
+ * Use {@link SCM_SOURCE_CONTROL_MENU} instead.
+ */
 export const SCM_SOURCE_CONTROL_CONTEXT_MENU: MenuPath = ['plugin_scm/sourceControl/context'];
 /** Menu path matching the VS Code 'scm/sourceControl/title' contribution point (REPOSITORIES section header toolbar). */
 export const SCM_SOURCE_CONTROL_TITLE_MENU: MenuPath = ['plugin_scm/sourceControl/title'];
+/** Menu path matching the VS Code 'scm/repository' contribution point (per-repo \`...\` button). */
+export const SCM_REPOSITORY_MENU: MenuPath = ['plugin_scm/repository'];
 
 interface RepoGroup {
     root: ScmRepository;
@@ -297,11 +302,12 @@ export class ScmRepositoriesWidget extends ReactWidget {
         // Select the repo and set the context key so command when-clauses resolve correctly.
         this.scmService.selectedRepository = repo;
         this.scmContextKeys.scmProvider.set(repo.provider.id);
+        this.scmContextKeys.scmProviderContext.set(repo.provider.providerContextValue);
         const anchor = e.nativeEvent;
         // Defer one tick so the selectedRepository change propagates through context keys.
         setTimeout(() => {
             this.contextMenuRenderer.render({
-                menuPath: SCM_TITLE_MENU,
+                menuPath: SCM_REPOSITORY_MENU,
                 anchor,
                 args: [repo],
                 context: this.node
@@ -312,10 +318,11 @@ export class ScmRepositoriesWidget extends ReactWidget {
     protected showSourceControlContextMenu(e: React.MouseEvent, repo: ScmRepository): void {
         this.scmService.selectedRepository = repo;
         this.scmContextKeys.scmProvider.set(repo.provider.id);
+        this.scmContextKeys.scmProviderContext.set(repo.provider.providerContextValue);
         const anchor = e.nativeEvent;
         setTimeout(() => {
             this.contextMenuRenderer.render({
-                menuPath: SCM_SOURCE_CONTROL_CONTEXT_MENU,
+                menuPath: SCM_SOURCE_CONTROL_MENU,
                 anchor,
                 args: [repo],
                 context: this.node

package/src/browser/scm-service.spec.ts

@@ -0,0 +1,91 @@
+// *****************************************************************************
+// Copyright (C) 2026 EclipseSource GmbH 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
+// *****************************************************************************
+
+import { expect } from 'chai';
+import { Emitter } from '@theia/core/lib/common/event';
+import { ScmService } from './scm-service';
+import { ScmProvider } from './scm-provider';
+
+function makeProvider(id: string, rootUri: string): ScmProvider {
+    return {
+        id,
+        label: id,
+        rootUri,
+        groups: [],
+        onDidChange: new Emitter<void>().event,
+        onDidChangeCommitTemplate: new Emitter<string>().event,
+        dispose: () => { }
+    } as unknown as ScmProvider;
+}
+
+describe('ScmService - repository removal event ordering', () => {
+    let service: ScmService;
+
+    beforeEach(() => {
+        service = new ScmService();
+        // ScmService declares a ScmContextKeyService injection but does not use it
+        // in the paths exercised here. Stub it to stay resilient against future use.
+        (service as unknown as Record<string, unknown>).contextKeys = {};
+    });
+
+    it('should update selectedRepository before firing onDidRemoveRepository', () => {
+        const repoA = service.registerScmProvider(makeProvider('git', '/a'));
+        const repoB = service.registerScmProvider(makeProvider('git', '/b'));
+
+        // Select repoA explicitly (registerScmProvider auto-selects the first one).
+        service.selectedRepository = repoA;
+        expect(service.selectedRepository).to.equal(repoA);
+
+        let selectedDuringRemoveEvent: unknown;
+        service.onDidRemoveRepository(() => {
+            selectedDuringRemoveEvent = service.selectedRepository;
+        });
+
+        repoA.dispose();
+
+        // When a subscriber of onDidRemoveRepository inspects selectedRepository,
+        // it must not observe the disposed repository as still being selected.
+        expect(selectedDuringRemoveEvent).to.not.equal(repoA);
+        expect(selectedDuringRemoveEvent).to.equal(repoB);
+        expect(service.selectedRepository).to.equal(repoB);
+    });
+
+    it('should clear selectedRepository to undefined when the last repository is removed', () => {
+        const repo = service.registerScmProvider(makeProvider('git', '/a'));
+        expect(service.selectedRepository).to.equal(repo);
+
+        let selectedDuringRemoveEvent: unknown = 'unset';
+        service.onDidRemoveRepository(() => {
+            selectedDuringRemoveEvent = service.selectedRepository;
+        });
+
+        repo.dispose();
+
+        expect(selectedDuringRemoveEvent).to.be.undefined;
+        expect(service.selectedRepository).to.be.undefined;
+    });
+
+    it('should fire onDidRemoveRepository and leave _repositories empty after disposing the only repo', () => {
+        const repo = service.registerScmProvider(makeProvider('git', '/a'));
+        let removed: unknown;
+        service.onDidRemoveRepository(r => { removed = r; });
+
+        repo.dispose();
+
+        expect(removed).to.equal(repo);
+        expect(service.repositories).to.have.length(0);
+    });
+});

package/src/browser/scm-service.ts

@@ -92,10 +92,13 @@ export class ScmService {
         repository.dispose = () => {
             this._repositories.delete(key);
             dispose.bind(repository)();
-            this.onDidRemoveRepositoryEmitter.fire(repository);
+            // Update the selected repository before firing the remove event so
+            // subscribers do not observe a stale selection pointing at the just
+            // disposed repository.
             if (this._selectedRepository === repository) {
                 this.selectedRepository = this._repositories.values().next().value;
             }
+            this.onDidRemoveRepositoryEmitter.fire(repository);
         };
         this._repositories.set(key, repository);
         this.onDidAddRepositoryEmitter.fire(repository);

package/src/browser/style/index.css

@@ -14,15 +14,14 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
  ********************************************************************************/
 
+@import './scm-history-graph.css';
+
 .theia-scm-commit {
   overflow: hidden;
   font-size: var(--theia-ui-font-size1);
   max-height: calc(100% - var(--theia-border-width));
   position: relative;
-  padding: var(--theia-ui-padding)
-           max(var(--theia-ui-padding), var(--theia-scrollbar-width))
-           var(--theia-ui-padding)
-           calc(var(--theia-ui-padding) * 3);
+  padding: var(--theia-ui-padding) max(var(--theia-ui-padding), var(--theia-scrollbar-width)) var(--theia-ui-padding) calc(var(--theia-ui-padding) * 3);
 }
 
 .theia-scm {
@@ -141,9 +140,9 @@
 .theia-scm-validation-message-info {
   background-color: var(--theia-inputValidation-infoBackground) !important;
   color: var(--theia-inputValidation-infoForeground);
-  border: var(--theia-border-width) solid
-    var(--theia-inputValidation-infoBorder);
-  border-top: none; /* remove top border since the input declares it already */
+  border: var(--theia-border-width) solid var(--theia-inputValidation-infoBorder);
+  border-top: none;
+  /* remove top border since the input declares it already */
 }
 
 .theia-scm-validation-message-success {
@@ -155,17 +154,17 @@
 .theia-scm-validation-message-warning {
   background-color: var(--theia-inputValidation-warningBackground) !important;
   color: var(--theia-inputValidation-warningForeground);
-  border: var(--theia-border-width) solid
-    var(--theia-inputValidation-warningBorder);
-  border-top: none; /* remove top border since the input declares it already */
+  border: var(--theia-border-width) solid var(--theia-inputValidation-warningBorder);
+  border-top: none;
+  /* remove top border since the input declares it already */
 }
 
 .theia-scm-validation-message-error {
   background-color: var(--theia-inputValidation-errorBackground) !important;
   color: var(--theia-inputValidation-errorForeground);
-  border: var(--theia-border-width) solid
-    var(--theia-inputValidation-errorBorder);
-  border-top: none; /* remove top border since the input declares it already */
+  border: var(--theia-border-width) solid var(--theia-inputValidation-errorBorder);
+  border-top: none;
+  /* remove top border since the input declares it already */
 }
 
 .theia-scm-action-button-container {

package/src/browser/style/scm-history-graph.css

@@ -0,0 +1,313 @@
+/********************************************************************************
+ * Copyright (C) 2026 EclipseSource GmbH 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
+ ********************************************************************************/
+
+/* ── Widget container ────────────────────────────────────────────────────── */
+.scm-history-graph-container {
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+    overflow: hidden;
+    font-size: var(--theia-ui-font-size1);
+}
+
+/* ── Scrollable list area ────────────────────────────────────────────────── */
+.scm-history-graph-list {
+    flex: 1;
+    overflow-y: auto;
+    overflow-x: hidden;
+}
+
+/* ── Individual commit row ───────────────────────────────────────────────── */
+.scm-history-graph-row {
+    display: flex;
+    align-items: flex-start;
+    height: 22px;
+    cursor: pointer;
+    padding-right: var(--theia-ui-padding);
+    box-sizing: border-box;
+    overflow: hidden;
+}
+
+.scm-history-graph-row:hover {
+    background-color: var(--theia-list-hoverBackground);
+    color: var(--theia-list-hoverForeground);
+}
+
+.scm-history-graph-row.selected {
+    background-color: var(--theia-list-activeSelectionBackground);
+    color: var(--theia-list-activeSelectionForeground);
+}
+
+/* ── SVG lane column ─────────────────────────────────────────────────────── */
+.scm-history-graph-svg {
+    flex-shrink: 0;
+    overflow: visible;
+    display: block;
+}
+
+/* ── Commit info column ──────────────────────────────────────────────────── */
+.scm-history-graph-info {
+    flex: 1;
+    display: flex;
+    align-items: center;
+    min-width: 0;
+    gap: 4px;
+    padding-left: 4px;
+    overflow: hidden;
+    height: 22px;
+}
+
+/* ── Subject line (primary content) ─────────────────────────────────────── */
+.scm-history-subject {
+    flex-shrink: 1;
+    min-width: 0;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    font-weight: normal;
+}
+
+/* ── Author name (dimmed, next to subject) ───────────────────────────────── */
+.scm-history-author {
+    flex-shrink: 1;
+    min-width: 0;
+    font-size: var(--theia-ui-font-size0);
+    opacity: 0.7;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    padding-left: 4px;
+}
+
+/* ── Badges container (pushed to the right) ─────────────────────────────── */
+.scm-history-badges {
+    display: flex;
+    align-items: center;
+    gap: 2px;
+    flex-shrink: 0;
+    padding-left: 4px;
+}
+
+.scm-history-badges-right {
+    margin-left: auto;
+}
+
+/* ── Ref badges (branch / tag labels) ───────────────────────────────────── */
+.scm-history-ref-badge {
+    display: inline-flex;
+    align-items: center;
+    gap: 3px;
+    padding: 0 6px;
+    border-radius: 10px;
+    font-size: var(--theia-ui-font-size0);
+    line-height: 1;
+    min-height: 15px;
+    white-space: nowrap;
+    flex-shrink: 0;
+    max-width: 140px;
+    overflow: hidden;
+    box-sizing: border-box;
+}
+
+.scm-history-ref-badge .scm-history-ref-text {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    min-width: 0;
+}
+
+.scm-history-ref-badge .scm-history-ref-icon {
+    flex-shrink: 0;
+    font-size: 11px;
+    line-height: 1;
+}
+
+/* Tooltip badges always show text, override max-width */
+.scm-history-ref-badge.tooltip-badge {
+    max-width: none;
+}
+
+/* Fallback colors when no inline lane color is set */
+.scm-history-ref-badge.head {
+    background-color: var(--theia-scmGraph-historyItemRefColor, var(--theia-badge-background));
+    color: var(--theia-badge-foreground);
+}
+
+.scm-history-ref-badge.remote {
+    background-color: var(--theia-scmGraph-historyItemRemoteRefColor, var(--theia-statusBar-background));
+    color: var(--theia-statusBar-foreground);
+}
+
+.scm-history-ref-badge.tag {
+    background-color: var(--theia-scmGraph-historyItemBaseRefColor, var(--theia-inputValidation-warningBackground));
+    color: var(--theia-inputValidation-warningForeground);
+}
+
+.scm-history-ref-badge.base {
+    background-color: var(--theia-list-inactiveSelectionBackground);
+    color: var(--theia-list-inactiveSelectionForeground);
+}
+
+/* Icon-only cloud badge (remote tracking indicator) */
+.scm-history-ref-badge-cloud {
+    padding: 0 4px;
+    max-width: none;
+}
+
+/* ── Changed files rows (expanded below a commit) ───────────────────────── */
+.scm-history-change-row {
+    display: flex;
+    align-items: center;
+    height: 22px;
+    box-sizing: border-box;
+    padding-right: var(--theia-ui-padding);
+    cursor: pointer;
+}
+
+.scm-history-change-row:hover {
+    background-color: var(--theia-list-hoverBackground);
+    color: var(--theia-list-hoverForeground);
+}
+
+.scm-history-change-row.selected {
+    background-color: var(--theia-list-activeSelectionBackground);
+    color: var(--theia-list-activeSelectionForeground);
+}
+
+.scm-history-change-info {
+    flex: 1;
+    display: flex;
+    align-items: center;
+    min-width: 0;
+    gap: 4px;
+    padding-left: 4px;
+    overflow: hidden;
+}
+
+.scm-history-change-file-icon {
+    flex-shrink: 0;
+}
+
+.scm-history-change-name-container {
+    flex: 1;
+    display: flex;
+    align-items: center;
+    min-width: 0;
+    overflow: hidden;
+}
+
+.scm-history-change-name {
+    flex-shrink: 0;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
+.scm-history-change-dir {
+    flex: 1;
+    font-size: var(--theia-ui-font-size0);
+    opacity: 0.6;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    padding-left: 4px;
+}
+
+.scm-history-change-status {
+    flex-shrink: 0;
+    font-size: var(--theia-ui-font-size0);
+    font-weight: bold;
+    width: 14px;
+    text-align: center;
+    margin-left: auto;
+}
+
+.scm-history-change-status.added {
+    color: var(--theia-gitDecoration-addedResourceForeground, #388a34);
+}
+
+.scm-history-change-status.deleted {
+    color: var(--theia-gitDecoration-deletedResourceForeground, #a1260d);
+}
+
+.scm-history-change-status.modified {
+    color: var(--theia-gitDecoration-modifiedResourceForeground, #0078d4);
+}
+
+.scm-history-change-status.renamed {
+    color: var(--theia-gitDecoration-renamedResourceForeground, #b180d7);
+}
+
+.scm-history-changes-loading,
+.scm-history-changes-empty {
+    display: flex;
+    align-items: center;
+    height: 22px;
+    padding-left: 24px;
+    font-size: var(--theia-ui-font-size0);
+    opacity: 0.6;
+}
+
+/* ── Load-more button ────────────────────────────────────────────────────── */
+.scm-history-load-more {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 28px;
+    cursor: pointer;
+    font-size: var(--theia-ui-font-size1);
+    color: var(--theia-textLink-foreground);
+    flex-shrink: 0;
+}
+
+.scm-history-load-more:hover {
+    text-decoration: underline;
+}
+
+/* ── Loading spinner placeholder ────────────────────────────────────────── */
+.scm-history-loading {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 28px;
+    font-size: var(--theia-ui-font-size1);
+    opacity: 0.6;
+}
+
+/* ── Tooltip header icon alignment ──────────────────────────────────────── */
+.scm-history-tooltip-header .icon-inline {
+    vertical-align: middle;
+}
+
+/* ── Tooltip stat colors (used inside .theia-hover) ─────────────────────── */
+.scm-history-stat-added {
+    color: var(--theia-gitDecoration-addedResourceForeground, #388a34);
+}
+
+.scm-history-stat-deleted {
+    color: var(--theia-gitDecoration-deletedResourceForeground, #a1260d);
+}
+
+/* ── Empty state ─────────────────────────────────────────────────────────── */
+.scm-history-empty {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex: 1;
+    opacity: 0.6;
+    font-size: var(--theia-ui-font-size1);
+    padding: var(--theia-ui-padding);
+    text-align: center;
+}