@theia/scm 1.71.0-next.72 → 1.71.0

package/lib/browser/scm-provider.d.ts

@@ -1,9 +1,11 @@
 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;
     readonly groups: ScmResourceGroup[];
     readonly onDidChange: Event<void>;
@@ -15,6 +17,7 @@ export interface ScmProvider extends Disposable {
     readonly actionButton?: ScmActionButton;
     readonly onDidChangeActionButton?: Event<ScmActionButton | undefined>;
     readonly providerContextValue?: string;
+    readonly historyProvider?: ScmHistoryProvider;
 }
 export declare const ScmResourceGroup: unique symbol;
 export interface ScmResourceGroup extends Disposable {
@@ -66,4 +69,62 @@ 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>;
+}
 //# sourceMappingURL=scm-provider.d.ts.map

package/lib/browser/scm-provider.d.ts.map

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

package/lib/browser/scm-provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"scm-provider.js","sourceRoot":"","sources":["../../src/browser/scm-provider.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AA+BnE,QAAA,gBAAgB,GAAG,MAAM,CAAC,kBAAkB,CAAC,CAAC"}
+{"version":3,"file":"scm-provider.js","sourceRoot":"","sources":["../../src/browser/scm-provider.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAmCnE,QAAA,gBAAgB,GAAG,MAAM,CAAC,kBAAkB,CAAC,CAAC"}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@theia/scm",
-  "version": "1.71.0-next.72+95c8dba0e",
+  "version": "1.71.0",
   "description": "Theia - Source control Extension",
   "dependencies": {
-    "@theia/core": "1.71.0-next.72+95c8dba0e",
-    "@theia/editor": "1.71.0-next.72+95c8dba0e",
-    "@theia/filesystem": "1.71.0-next.72+95c8dba0e",
-    "@theia/monaco": "1.71.0-next.72+95c8dba0e",
+    "@theia/core": "1.71.0",
+    "@theia/editor": "1.71.0",
+    "@theia/filesystem": "1.71.0",
+    "@theia/monaco": "1.71.0",
     "@theia/monaco-editor-core": "1.108.201",
     "@types/diff": "^5.2.3",
     "diff": "^5.2.2",
@@ -50,10 +50,10 @@
     "watch": "theiaext watch"
   },
   "devDependencies": {
-    "@theia/ext-scripts": "1.70.0"
+    "@theia/ext-scripts": "1.71.0"
   },
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "95c8dba0ee6349c6be262ac2cf383909a3b62761"
+  "gitHead": "d8a596fc99f0a8e68b466828ed162569d79e3a71"
 }

package/src/browser/dirty-diff/dirty-diff-widget.ts

@@ -282,11 +282,11 @@ class DirtyDiffPeekView extends MonacoEditorPeekViewWidget {
         try {
             this.bodyElement = document.createElement('div');
             this.bodyElement.classList.add('body');
+            super.create();
             this.diffEditorPromise = this.widget.editorProvider.createEmbeddedDiffEditor(this.editor, this.bodyElement, this.widget.previousRevisionUri);
             const diffEditor = await this.diffEditorPromise;
             this.diffEditor = diffEditor;
             this.toDispose.push(diffEditor);
-            super.create();
             return diffEditor;
         } catch (e) {
             this.dispose();

package/src/browser/scm-context-key-service.ts

@@ -48,6 +48,21 @@ export class ScmContextKeyService {
         return this._scmProviderCount;
     }
 
+    protected _scmHistoryItemRef: ContextKey<string | undefined>;
+    get scmHistoryItemRef(): ContextKey<string | undefined> {
+        return this._scmHistoryItemRef;
+    }
+
+    protected _scmCurrentHistoryItemRefHasRemote: ContextKey<boolean>;
+    get scmCurrentHistoryItemRefHasRemote(): ContextKey<boolean> {
+        return this._scmCurrentHistoryItemRefHasRemote;
+    }
+
+    protected _scmCurrentHistoryItemRefHasBase: ContextKey<boolean>;
+    get scmCurrentHistoryItemRefHasBase(): ContextKey<boolean> {
+        return this._scmCurrentHistoryItemRefHasBase;
+    }
+
     @postConstruct()
     protected init(): void {
         this._scmProvider = this.contextKeyService.createKey<string | undefined>('scmProvider', undefined);
@@ -55,6 +70,9 @@ export class ScmContextKeyService {
         this._scmResourceGroup = this.contextKeyService.createKey<string | undefined>('scmResourceGroup', undefined);
         this._scmResourceGroupState = this.contextKeyService.createKey<string | undefined>('scmResourceGroupState', undefined);
         this._scmProviderCount = this.contextKeyService.createKey<number>('scm.providerCount', 0);
+        this._scmHistoryItemRef = this.contextKeyService.createKey<string | undefined>('scmHistoryItemRef', undefined);
+        this._scmCurrentHistoryItemRefHasRemote = this.contextKeyService.createKey<boolean>('scmCurrentHistoryItemRefHasRemote', false);
+        this._scmCurrentHistoryItemRefHasBase = this.contextKeyService.createKey<boolean>('scmCurrentHistoryItemRefHasBase', false);
     }
 
     match(expression: string | undefined): boolean {

package/src/browser/scm-contribution.ts

@@ -411,6 +411,147 @@ export class ScmContribution extends AbstractViewContribution<ScmWidget> impleme
      */
     registerColors(colors: ColorRegistry): void {
         colors.register(
+            // SCM Graph lane colors (matching VS Code's scm.graph.* color IDs)
+            {
+                id: 'scmGraph.historyItemHoverDefaultLabelForeground',
+                defaults: {
+                    dark: '#0078d4',
+                    light: '#0078d4',
+                    hcDark: '#0078d4',
+                    hcLight: '#0078d4'
+                },
+                description: 'Default foreground color for history item labels in the SCM history graph on hover.'
+            },
+            {
+                id: 'scmGraph.historyItemHoverAdditionsForeground',
+                defaults: {
+                    dark: '#81b88b',
+                    light: '#388a34',
+                    hcDark: '#81b88b',
+                    hcLight: '#388a34'
+                },
+                description: 'Foreground color for additions in the SCM history graph on hover.'
+            },
+            {
+                id: 'scmGraph.historyItemHoverDeletionsForeground',
+                defaults: {
+                    dark: '#c74e39',
+                    light: '#a1260d',
+                    hcDark: '#c74e39',
+                    hcLight: '#a1260d'
+                },
+                description: 'Foreground color for deletions in the SCM history graph on hover.'
+            },
+            {
+                id: 'scmGraph.historyItemHoverLabelForeground',
+                defaults: {
+                    dark: '#e2e2e2',
+                    light: '#3b3b3b',
+                    hcDark: '#ffffff',
+                    hcLight: '#000000'
+                },
+                description: 'Foreground color for labels in the SCM history graph on hover.'
+            },
+            {
+                id: 'scmGraph.historyItemRefForeground',
+                defaults: {
+                    dark: '#ffffff',
+                    light: '#ffffff',
+                    hcDark: '#ffffff',
+                    hcLight: '#ffffff'
+                },
+                description: 'Foreground color for ref badge labels in the SCM history graph.'
+            },
+            {
+                id: 'scmGraph.historyItemRefColor',
+                defaults: {
+                    dark: '#0078d4',
+                    light: '#0078d4',
+                    hcDark: '#0078d4',
+                    hcLight: '#0078d4'
+                },
+                description: 'Color for ref labels in the SCM history graph.'
+            },
+            {
+                id: 'scmGraph.historyItemRemoteRefColor',
+                defaults: {
+                    dark: '#b267e6',
+                    light: '#8b009b',
+                    hcDark: '#b267e6',
+                    hcLight: '#8b009b'
+                },
+                description: 'Color for remote ref labels in the SCM history graph.'
+            },
+            {
+                id: 'scmGraph.historyItemTagRefColor',
+                defaults: {
+                    dark: '#d7ba7d',
+                    light: '#8d6914',
+                    hcDark: '#d7ba7d',
+                    hcLight: '#8d6914'
+                },
+                description: 'Color for tag ref labels in the SCM history graph.'
+            },
+            {
+                id: 'scmGraph.historyItemBaseRefColor',
+                defaults: {
+                    dark: '#a1260d',
+                    light: '#a1260d',
+                    hcDark: '#a1260d',
+                    hcLight: '#a1260d'
+                },
+                description: 'Color for base ref labels in the SCM history graph.'
+            },
+            {
+                id: 'scmGraph.foreground1',
+                defaults: {
+                    dark: '#ffb000',
+                    light: '#ffb000',
+                    hcDark: '#ffb000',
+                    hcLight: '#ffb000'
+                },
+                description: 'Foreground color 1 for additional lanes in the SCM history graph.'
+            },
+            {
+                id: 'scmGraph.foreground2',
+                defaults: {
+                    dark: '#dc267f',
+                    light: '#dc267f',
+                    hcDark: '#dc267f',
+                    hcLight: '#dc267f'
+                },
+                description: 'Foreground color 2 for additional lanes in the SCM history graph.'
+            },
+            {
+                id: 'scmGraph.foreground3',
+                defaults: {
+                    dark: '#994f00',
+                    light: '#994f00',
+                    hcDark: '#994f00',
+                    hcLight: '#994f00'
+                },
+                description: 'Foreground color 3 for additional lanes in the SCM history graph.'
+            },
+            {
+                id: 'scmGraph.foreground4',
+                defaults: {
+                    dark: '#40b0a6',
+                    light: '#40b0a6',
+                    hcDark: '#40b0a6',
+                    hcLight: '#40b0a6'
+                },
+                description: 'Foreground color 4 for additional lanes in the SCM history graph.'
+            },
+            {
+                id: 'scmGraph.foreground5',
+                defaults: {
+                    dark: '#b66dff',
+                    light: '#b66dff',
+                    hcDark: '#b66dff',
+                    hcLight: '#b66dff'
+                },
+                description: 'Foreground color 5 for additional lanes in the SCM history graph.'
+            },
             {
                 id: ScmColors.editorGutterModifiedBackground, defaults: {
                     dark: '#1B81A8',

package/src/browser/scm-frontend-module.ts

@@ -45,6 +45,8 @@ import { LabelProviderContribution } from '@theia/core/lib/browser/label-provide
 import { bindScmPreferences } from '../common/scm-preferences';
 import { bindMergeEditor } from './merge-editor/merge-editor-module';
 import { ScmRepositoriesWidget } from './scm-repositories-widget';
+import { ScmHistoryGraphWidget } from './scm-history-graph-widget';
+import { ScmHistoryGraphModel } from './scm-history-graph-model';
 
 export default new ContainerModule(bind => {
     bind(ScmContextKeyService).toSelf().inSingletonScope();
@@ -88,6 +90,13 @@ export default new ContainerModule(bind => {
         createWidget: () => container.get(ScmRepositoriesWidget)
     })).inSingletonScope();
 
+    bind(ScmHistoryGraphModel).toSelf().inSingletonScope();
+    bind(ScmHistoryGraphWidget).toSelf();
+    bind(WidgetFactory).toDynamicValue(({ container }) => ({
+        id: ScmHistoryGraphWidget.ID,
+        createWidget: () => container.get(ScmHistoryGraphWidget)
+    })).inSingletonScope();
+
     bind(WidgetFactory).toDynamicValue(({ container }) => ({
         id: SCM_VIEW_CONTAINER_ID,
         createWidget: async () => {
@@ -110,6 +119,12 @@ export default new ContainerModule(bind => {
                 canHide: false,
                 initiallyCollapsed: false
             });
+            const graphWidget = await widgetManager.getOrCreateWidget(ScmHistoryGraphWidget.ID);
+            viewContainer.addWidget(graphWidget, {
+                order: 2,
+                canHide: true,
+                initiallyCollapsed: true
+            });
             return viewContainer;
         }
     })).inSingletonScope();

package/src/browser/scm-history-graph-helpers.ts

@@ -0,0 +1,175 @@
+// *****************************************************************************
+// 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 { ScmHistoryItemRef, ScmHistoryItemChange } from './scm-provider';
+
+/**
+ * Returns the CSS color variable for the given lane index.
+ * Uses Theia's `--theia-scmGraph-*` variables, mirroring the VS Code
+ * scm graph color scheme:
+ *   lane 0 (current ref)  → historyItemRefColor
+ *   lane 1 (remote ref)   → historyItemRemoteRefColor
+ *   lane 2 (base ref)     → historyItemBaseRefColor
+ *   lane 3–7              → foreground1–5
+ */
+export function laneColor(index: number): string {
+    switch (index % 8) {
+        case 0: return 'var(--theia-scmGraph-historyItemRefColor)';
+        case 1: return 'var(--theia-scmGraph-historyItemRemoteRefColor)';
+        case 2: return 'var(--theia-scmGraph-historyItemBaseRefColor)';
+        case 3: return 'var(--theia-scmGraph-foreground1)';
+        case 4: return 'var(--theia-scmGraph-foreground2)';
+        case 5: return 'var(--theia-scmGraph-foreground3)';
+        case 6: return 'var(--theia-scmGraph-foreground4)';
+        default: return 'var(--theia-scmGraph-foreground5)';
+    }
+}
+
+export function getChangeStatus(change: ScmHistoryItemChange): string {
+    if (!change.originalUri) {
+        return 'A';
+    }
+    if (!change.modifiedUri) {
+        return 'D';
+    }
+    if (change.renameUri) {
+        return 'R';
+    }
+    return 'M';
+}
+
+export function getFileName(uri: string): string {
+    const parts = uri.split('/');
+    return parts[parts.length - 1] || uri;
+}
+
+export function getFilePath(uri: string): string {
+    try {
+        const u = new URL(uri);
+        return u.pathname;
+    } catch {
+        return uri;
+    }
+}
+
+/**
+ * Returns the repo-relative path of the given URI, stripping the rootUri prefix.
+ * Falls back to the full path if rootUri is unavailable or doesn't match.
+ */
+export function getRepoRelativePath(uri: string, rootUri: string | undefined): string {
+    const fullPath = getFilePath(uri);
+    if (!rootUri) {
+        return fullPath;
+    }
+    const rootPath = getFilePath(rootUri);
+    // Normalize: ensure rootPath ends with '/'
+    const rootPrefix = rootPath.endsWith('/') ? rootPath : rootPath + '/';
+    if (fullPath.startsWith(rootPrefix)) {
+        return fullPath.slice(rootPrefix.length);
+    }
+    return fullPath;
+}
+
+export function getRefBadgeClass(ref: ScmHistoryItemRef): string {
+    const cat = (ref.category ?? '').toLowerCase();
+    if (cat === 'heads' || cat === 'head' || ref.id.startsWith('refs/heads/')) {
+        return 'head';
+    }
+    if (cat === 'remotes' || cat === 'remote' || ref.id.startsWith('refs/remotes/')) {
+        return 'remote';
+    }
+    if (cat === 'tags' || cat === 'tag' || ref.id.startsWith('refs/tags/')) {
+        return 'tag';
+    }
+    if (cat === 'base') {
+        return 'base';
+    }
+    return 'head';
+}
+
+export function isTagRef(ref: ScmHistoryItemRef): boolean {
+    const cat = (ref.category ?? '').toLowerCase();
+    if (cat === 'tags' || cat === 'tag') {
+        return true;
+    }
+    // Fall back to checking the ref id prefix (e.g. 'refs/tags/v1.0')
+    return ref.id.startsWith('refs/tags/');
+}
+
+export function isRemoteRef(ref: ScmHistoryItemRef): boolean {
+    const cat = (ref.category ?? '').toLowerCase();
+    if (cat === 'remotes' || cat === 'remote') {
+        return true;
+    }
+    // Fall back to checking the ref id prefix (e.g. 'refs/remotes/origin/main')
+    return ref.id.startsWith('refs/remotes/');
+}
+
+/**
+ * Extracts the local branch name from a remote ref name like "origin/master" → "master".
+ * Falls back to the full name if no slash is found.
+ */
+export function getLocalNameFromRemote(remoteName: string): string {
+    const slashIdx = remoteName.indexOf('/');
+    return slashIdx >= 0 ? remoteName.slice(slashIdx + 1) : remoteName;
+}
+
+export interface DeduplicatedRef {
+    ref: ScmHistoryItemRef;
+    /** True when both a local and a remote ref for this branch exist on this commit. */
+    hasBoth: boolean;
+}
+
+/**
+ * Deduplicates refs: when a local branch (e.g. "master") and a remote branch
+ * (e.g. "origin/master") both appear, collapse them into one entry with `hasBoth=true`.
+ * Tags and other ref types are passed through unchanged.
+ */
+export function deduplicateRefs(refs: readonly ScmHistoryItemRef[]): DeduplicatedRef[] {
+    const localNames = new Set<string>();
+    for (const ref of refs) {
+        if (!isRemoteRef(ref) && !isTagRef(ref)) {
+            localNames.add(ref.name.toLowerCase());
+        }
+    }
+
+    const result: DeduplicatedRef[] = [];
+    const suppressedRemotes = new Set<string>();
+
+    // First pass: identify remote refs that have a matching local branch
+    for (const ref of refs) {
+        if (isRemoteRef(ref)) {
+            const localName = getLocalNameFromRemote(ref.name).toLowerCase();
+            if (localNames.has(localName)) {
+                suppressedRemotes.add(ref.id);
+            }
+        }
+    }
+
+    // Second pass: emit all refs except suppressed remote ones;
+    // mark local branches that have a matching remote with hasBoth=true
+    for (const ref of refs) {
+        if (suppressedRemotes.has(ref.id)) {
+            continue;
+        }
+        const hasBoth = !isRemoteRef(ref) && !isTagRef(ref)
+            ? refs.some(r => isRemoteRef(r) && getLocalNameFromRemote(r.name).toLowerCase() === ref.name.toLowerCase())
+            : false;
+        result.push({ ref, hasBoth });
+    }
+
+    return result;
+}