xtralab 0.11.1 → 0.12.0

package/src/fileBrowser/commands.ts

@@ -59,9 +59,9 @@ export namespace CommandIDs {
  * core's populator does not try to fill ours with items derived from the
  * default file browser's selection.
  */
-export const OPEN_WITH_SUBMENU_ID = 'jp-contextmenu-xtralab-open-with';
+const OPEN_WITH_SUBMENU_ID = 'jp-contextmenu-xtralab-open-with';
 
-export interface IRegisterCommandsOptions {
+interface IRegisterCommandsOptions {
   app: JupyterFrontEnd;
   browser: IXtralabFileBrowser;
   docManager: IDocumentManager;
@@ -132,7 +132,9 @@ function getOpenPaths(
   return candidates.filter(path => !path.endsWith('/'));
 }
 
-/** True iff there is an actionable target for a command on the right-click. */
+/**
+ * True iff there is an actionable target for a command on the right-click.
+ */
 function hasTarget(
   app: JupyterFrontEnd,
   browser: IXtralabFileBrowser
@@ -270,7 +272,9 @@ export function registerCommands(opts: IRegisterCommandsOptions): () => void {
 
   commands.addCommand(CommandIDs.open, {
     label: args =>
-      ((args.label as string) ?? (args.factory as string) ?? 'Open') as string,
+      ((args.label as string) ??
+        (args.factory as string) ??
+        trans.__('Open')) as string,
     icon: args => {
       const factoryName = args.factory as string | undefined;
       if (factoryName !== undefined) {
@@ -299,7 +303,7 @@ export function registerCommands(opts: IRegisterCommandsOptions): () => void {
   });
 
   commands.addCommand(CommandIDs.openBrowserTab, {
-    label: 'Open in New Browser Tab',
+    label: trans.__('Open in New Browser Tab'),
     icon: fileIcon.bindprops({ stylesheet: 'menuItem' }),
     isEnabled: () => getTargetKind(app) === 'file',
     isVisible: () => getTargetKind(app) === 'file',
@@ -315,7 +319,7 @@ export function registerCommands(opts: IRegisterCommandsOptions): () => void {
   });
 
   commands.addCommand(CommandIDs.rename, {
-    label: 'Rename…',
+    label: trans.__('Rename…'),
     icon: editIcon.bindprops({ stylesheet: 'menuItem' }),
     mnemonic: 0,
     isEnabled: () => hasTarget(app, browser),
@@ -327,10 +331,10 @@ export function registerCommands(opts: IRegisterCommandsOptions): () => void {
       const serverPath = toServerPath(targetPath);
       const oldName = PathExt.basename(serverPath);
       const result = await InputDialog.getText({
-        title: 'Rename',
-        label: 'Enter a new name',
+        title: trans.__('Rename'),
+        label: trans.__('Enter a new name'),
         text: oldName,
-        okLabel: 'Rename'
+        okLabel: trans.__('Rename')
       });
       const newName = result.value?.trim();
       if (
@@ -346,7 +350,7 @@ export function registerCommands(opts: IRegisterCommandsOptions): () => void {
         await browser.contentsManager.rename(serverPath, newPath);
         browser.refresh();
       } catch (err) {
-        await showErrorMessage('Rename failed', err as Error);
+        await showErrorMessage(trans.__('Rename failed'), err as Error);
       }
     }
   });
@@ -354,8 +358,8 @@ export function registerCommands(opts: IRegisterCommandsOptions): () => void {
   commands.addCommand(CommandIDs.del, {
     label: () =>
       PageConfig.getOption('delete_to_trash') === 'true'
-        ? 'Move to Trash'
-        : 'Delete',
+        ? trans.__('Move to Trash')
+        : trans.__('Delete'),
     icon: closeIcon.bindprops({ stylesheet: 'menuItem' }),
     mnemonic: 0,
     isEnabled: () => hasTarget(app, browser),
@@ -367,11 +371,18 @@ export function registerCommands(opts: IRegisterCommandsOptions): () => void {
       const serverPath = toServerPath(targetPath);
       const trashing = PageConfig.getOption('delete_to_trash') === 'true';
       const result = await showDialog({
-        title: trashing ? 'Move to Trash' : 'Delete',
-        body: `Are you sure you want to permanently delete: ${serverPath}?`,
+        title: trashing ? trans.__('Move to Trash') : trans.__('Delete'),
+        body: trashing
+          ? trans.__('Are you sure you want to move to trash: %1?', serverPath)
+          : trans.__(
+              'Are you sure you want to permanently delete: %1?',
+              serverPath
+            ),
         buttons: [
           Dialog.cancelButton(),
-          Dialog.warnButton({ label: trashing ? 'Move to Trash' : 'Delete' })
+          Dialog.warnButton({
+            label: trashing ? trans.__('Move to Trash') : trans.__('Delete')
+          })
         ]
       });
       if (result.button.accept !== true) {
@@ -381,13 +392,13 @@ export function registerCommands(opts: IRegisterCommandsOptions): () => void {
         await browser.contentsManager.delete(serverPath);
         browser.refresh();
       } catch (err) {
-        await showErrorMessage('Delete failed', err as Error);
+        await showErrorMessage(trans.__('Delete failed'), err as Error);
       }
     }
   });
 
   commands.addCommand(CommandIDs.duplicate, {
-    label: 'Duplicate',
+    label: trans.__('Duplicate'),
     icon: copyIcon.bindprops({ stylesheet: 'menuItem' }),
     isEnabled: () => getTargetKind(app) === 'file',
     isVisible: () => getTargetKind(app) === 'file',
@@ -402,13 +413,13 @@ export function registerCommands(opts: IRegisterCommandsOptions): () => void {
         const created = await browser.contentsManager.copy(serverPath, dir);
         browser.notifyPathAdded(toCanonicalPath(created));
       } catch (err) {
-        await showErrorMessage('Duplicate failed', err as Error);
+        await showErrorMessage(trans.__('Duplicate failed'), err as Error);
       }
     }
   });
 
   commands.addCommand(CommandIDs.copyPath, {
-    label: 'Copy Path',
+    label: trans.__('Copy Path'),
     icon: fileIcon.bindprops({ stylesheet: 'menuItem' }),
     isEnabled: () => hasTarget(app, browser),
     execute: async () => {
@@ -431,7 +442,7 @@ export function registerCommands(opts: IRegisterCommandsOptions): () => void {
   });
 
   commands.addCommand(CommandIDs.download, {
-    label: 'Download',
+    label: trans.__('Download'),
     icon: downloadIcon.bindprops({ stylesheet: 'menuItem' }),
     isEnabled: () => getTargetKind(app) === 'file',
     isVisible: () => getTargetKind(app) === 'file',
@@ -450,14 +461,14 @@ export function registerCommands(opts: IRegisterCommandsOptions): () => void {
         anchor.click();
         document.body.removeChild(anchor);
       } catch (err) {
-        await showErrorMessage('Download failed', err as Error);
+        await showErrorMessage(trans.__('Download failed'), err as Error);
       }
     }
   });
 
   commands.addCommand(CommandIDs.refresh, {
-    label: 'Refresh File List',
-    caption: 'Refresh the file browser',
+    label: trans.__('Refresh File List'),
+    caption: trans.__('Refresh the file browser'),
     icon: refreshIcon.bindprops({ stylesheet: 'menuItem' }),
     execute: () => {
       browser.refresh();
@@ -465,8 +476,8 @@ export function registerCommands(opts: IRegisterCommandsOptions): () => void {
   });
 
   commands.addCommand(CommandIDs.collapseAll, {
-    label: 'Collapse All Folders',
-    caption: 'Collapse all folders in the file browser',
+    label: trans.__('Collapse All Folders'),
+    caption: trans.__('Collapse all folders in the file browser'),
     icon: collapseAllIcon.bindprops({ stylesheet: 'menuItem' }),
     execute: () => {
       browser.collapseAll();
@@ -482,7 +493,7 @@ export function registerCommands(opts: IRegisterCommandsOptions): () => void {
   // there is no tree row for the root itself, so the browser is asked
   // to scroll back to the top and clear its selection instead.
   commands.addCommand(CommandIDs.revealPath, {
-    label: 'Reveal in File Browser',
+    label: trans.__('Reveal in File Browser'),
     execute: (args: ReadonlyPartialJSONObject) => {
       const path = (args.path as string | undefined) ?? '';
       app.shell.activateById(FILE_BROWSER_ID);
@@ -512,8 +523,8 @@ export function registerCommands(opts: IRegisterCommandsOptions): () => void {
   });
 
   commands.addCommand(CommandIDs.createNewDirectory, {
-    label: 'New Folder',
-    caption: 'Create a new folder',
+    label: trans.__('New Folder'),
+    caption: trans.__('Create a new folder'),
     icon: newFolderIcon.bindprops({ stylesheet: 'menuItem' }),
     execute: async () => {
       const cwd = getWorkingDirectory(browser);
@@ -524,14 +535,17 @@ export function registerCommands(opts: IRegisterCommandsOptions): () => void {
         });
         browser.notifyPathAdded(toCanonicalPath(created));
       } catch (err) {
-        await showErrorMessage('Could not create folder', err as Error);
+        await showErrorMessage(
+          trans.__('Could not create folder'),
+          err as Error
+        );
       }
     }
   });
 
   commands.addCommand(CommandIDs.newLauncher, {
-    label: 'New Launcher',
-    caption: 'Open a new launcher',
+    label: trans.__('New Launcher'),
+    caption: trans.__('Open a new launcher'),
     // Skip the `menuItem` bindprops the other commands use: this command
     // lives on the toolbar, where the launcher-extension's blue button
     // styling expects the raw `jp-icon3` paths from `addIcon` so it can

package/src/fileBrowser/contents.ts

@@ -30,10 +30,14 @@ export function toServerPath(canonicalPath: string): string {
     : canonicalPath;
 }
 
-export interface IListedDirectory {
-  /** Canonical paths for every immediate child of the requested directory. */
+interface IListedDirectory {
+  /**
+   * Canonical paths for every immediate child of the requested directory.
+   */
   paths: string[];
-  /** Subset of {@link IListedDirectory.paths} that are directories. */
+  /**
+   * Subset of {@link IListedDirectory.paths} that are directories.
+   */
   subdirectories: string[];
 }
 

package/src/fileBrowser/fileBrowser.tsx

@@ -99,7 +99,7 @@ const FILE_TREE_UNSAFE_CSS =
   'border-left-color: transparent;' +
   '}';
 
-export interface IFileBrowserProps {
+interface IFileBrowserProps {
   contentsManager: Contents.IManager;
   docManager: IDocumentManager;
   onOpenFile?: (serverPath: string) => void;

package/src/fileBrowser/widget.tsx

@@ -17,12 +17,12 @@ export const FILE_BROWSER_ID = 'xtralab:file-browser';
  * specific enough not to clash with other browsers (such as the default
  * `jp-FileBrowser`).
  */
-export const FILE_BROWSER_CSS_CLASS = 'jp-xtralab-FileBrowser';
+const FILE_BROWSER_CSS_CLASS = 'jp-xtralab-FileBrowser';
 
 const TOOLBAR_CSS_CLASS = 'jp-xtralab-FileBrowser-toolbar';
 const CONTENT_CSS_CLASS = 'jp-xtralab-FileBrowser-content';
 
-export interface IXtralabFileBrowserOptions {
+interface IXtralabFileBrowserOptions {
   contentsManager: Contents.IManager;
   docManager: IDocumentManager;
   onOpenFile?: (serverPath: string) => void;
@@ -99,7 +99,9 @@ export interface IXtralabFileBrowser {
    */
   readonly collapseAllRequested: ISignal<IXtralabFileBrowser, void>;
 
-  /** Trigger a refresh of every loaded directory in the tree. */
+  /**
+   * Trigger a refresh of every loaded directory in the tree.
+   */
   refresh(): void;
 
   /**

package/src/fileTypeIcons/index.ts

@@ -148,8 +148,12 @@ const plugin: JupyterFrontEndPlugin<void> = {
           }
         };
         setIcon();
-        // Keep the tab icon right after a rename.
+        // Keep the tab icon right after a rename, and release the listener
+        // when the document closes.
         widget.context.pathChanged.connect(setIcon);
+        widget.disposed.connect(() => {
+          widget.context.pathChanged.disconnect(setIcon);
+        });
       });
     }
 
@@ -163,8 +167,7 @@ const plugin: JupyterFrontEndPlugin<void> = {
           if (icon === null) {
             continue;
           }
-          // Cross jupyterlab-git's nested `LabIcon` package boundary.
-          file.type = { ...file.type, icon } as unknown as typeof file.type;
+          file.type = { ...file.type, icon };
         }
       });
     }

package/src/git/api.ts

@@ -49,7 +49,7 @@ async function postWithPath<T>(
   if (text.length > 0) {
     try {
       data = JSON.parse(text) as T;
-    } catch (_err) {
+    } catch {
       // Fall through into the error handling below.
     }
   }
@@ -61,34 +61,6 @@ async function postWithPath<T>(
   return (data ?? ({} as T)) as T;
 }
 
-/**
- * Fetch the absolute filesystem path of the git top-level for the given
- * server-relative path. Returns `null` when the path is not in a git
- * repository — the server returns a non-zero `code` (or `path: null`) in
- * that case, which is expected and not a fatal error.
- */
-export async function showTopLevel(repoPath: string): Promise<string | null> {
-  interface IShowTopLevelResult {
-    code: number;
-    path?: string | null;
-    message?: string;
-  }
-  let result: IShowTopLevelResult;
-  try {
-    result = await postWithPath<IShowTopLevelResult>(
-      'show_top_level',
-      repoPath,
-      {}
-    );
-  } catch (err) {
-    return null;
-  }
-  if (result.code !== 0 || !result.path) {
-    return null;
-  }
-  return result.path;
-}
-
 /**
  * Fetch `git status --porcelain` for the repository the server resolves at
  * `repoPath`. When `repoPath` is the empty string, git resolves the repo
@@ -114,37 +86,6 @@ export async function content(
   });
 }
 
-/** Stage a single file. */
-export async function add(repoPath: string, filename: string): Promise<void> {
-  await postWithPath('add', repoPath, { add_all: false, filename });
-}
-
-/** Stage every changed file (including untracked). */
-export async function addAll(repoPath: string): Promise<void> {
-  await postWithPath('add', repoPath, { add_all: true });
-}
-
-/** Unstage a single file. */
-export async function reset(repoPath: string, filename: string): Promise<void> {
-  await postWithPath('reset', repoPath, { reset_all: false, filename });
-}
-
-/** Unstage every file. */
-export async function resetAll(repoPath: string): Promise<void> {
-  await postWithPath('reset', repoPath, { reset_all: true });
-}
-
-/** Restore a single file to the version in the index (i.e. discard worktree changes). */
-export async function checkout(
-  repoPath: string,
-  filename: string
-): Promise<void> {
-  await postWithPath('checkout', repoPath, {
-    checkout_branch: false,
-    filename
-  });
-}
-
 /**
  * Expand the porcelain `files` array into one entry per logical change.
  * A single porcelain row may map to two `IFileChange` rows (a file that's
@@ -173,7 +114,7 @@ export function expandStatusFiles(files: IGitStatusFile[]): IFileChange[] {
  * shows up twice in the panel — once under "Staged Changes" and once under
  * "Changes" — matching the layout the user sees in VS Code.
  */
-export function porcelainToFileChanges(file: IGitStatusFile): IFileChange[] {
+function porcelainToFileChanges(file: IGitStatusFile): IFileChange[] {
   const result: IFileChange[] = [];
   // Untracked files are reported with `??` and only appear under "Changes".
   if (file.x === '?' && file.y === '?') {

package/src/git/askRequest.ts

@@ -0,0 +1,113 @@
+import { Git } from '@jupyterlab/git';
+import type { TranslationBundle } from '@jupyterlab/translation';
+import type { SelectedLineRange } from '@pierre/diffs';
+
+import type { IAskAgentRequest } from '../askAgent/tokens';
+
+import type { IXtralabDiffModel } from './diffWidget';
+
+type DiffSide = 'deletions' | 'additions';
+
+/**
+ * Agent-facing name of a diff content source: the special refs get plain
+ * words, a git ref string is used verbatim, anything else falls back to the
+ * side name. English on purpose — this ends up in the agent prompt, not in
+ * the UI.
+ */
+function describeSource(source: unknown, fallback: string): string {
+  if (source === Git.Diff.SpecialRef.WORKING) {
+    return 'working tree';
+  }
+  if (source === Git.Diff.SpecialRef.INDEX) {
+    return 'staged';
+  }
+  if (source === Git.Diff.SpecialRef.BASE) {
+    return 'merge base';
+  }
+  if (typeof source === 'string' && source.length > 0) {
+    return source;
+  }
+  return fallback;
+}
+
+function sideName(side: DiffSide): string {
+  return side === 'deletions' ? 'old side' : 'new side';
+}
+
+/**
+ * Extract lines `startLine`–`endLine` (1-indexed, inclusive) from `text`.
+ */
+function sliceLines(text: string, startLine: number, endLine: number): string {
+  return text
+    .split('\n')
+    .slice(startLine - 1, endLine)
+    .join('\n');
+}
+
+/**
+ * Build the ask-agent request for a line range selected in a git diff.
+ *
+ * The range's `side` decides which file version the line numbers (and the
+ * embedded snippet) refer to: `deletions` reads from the reference text,
+ * anything else — including the sideless context rows of a unified diff,
+ * whose gutter shows new-side numbers — reads from the challenger text. A
+ * gutter drag that crosses the two split columns has endpoints in different
+ * line-number spaces, so it is described textually instead of as a numeric
+ * range.
+ */
+export function buildDiffAskRequest(options: {
+  model: IXtralabDiffModel;
+  oldText: string;
+  newText: string;
+  range: SelectedLineRange;
+  anchor: DOMRect | null;
+  trans: TranslationBundle;
+}): IAskAgentRequest {
+  const { model, oldText, newText, range, anchor, trans } = options;
+  const repositoryPath = model.repositoryPath ?? '';
+  const base = {
+    path: model.filename,
+    ...(repositoryPath.length > 0 ? { cwd: repositoryPath } : {})
+  };
+
+  const startSide: DiffSide = range.side ?? 'additions';
+  const endSide: DiffSide = range.endSide ?? startSide;
+
+  if (startSide !== endSide) {
+    return {
+      context: {
+        ...base,
+        text: '',
+        location:
+          `lines ${range.start} (${sideName(startSide)}) through ` +
+          `${range.end} (${sideName(endSide)}) of the current git diff`,
+        note: trans.__('diff selection')
+      },
+      anchor
+    };
+  }
+
+  const startLine = Math.min(range.start, range.end);
+  const endLine = Math.max(range.start, range.end);
+  const isOld = startSide === 'deletions';
+  const source = isOld ? model.reference.source : model.challenger.source;
+  const ref = describeSource(source, isOld ? 'old' : 'new');
+  return {
+    context: {
+      ...base,
+      startLine,
+      endLine,
+      // Only new-side lines of a working-tree diff index the file on disk;
+      // old-side and historical line numbers must not be used to highlight
+      // the working file.
+      linesInWorkingFile:
+        !isOld && model.challenger.source === Git.Diff.SpecialRef.WORKING,
+      text: sliceLines(isOld ? oldText : newText, startLine, endLine),
+      location: `the ${sideName(startSide)} (${ref}) of the current git diff`,
+      // New-side lines read as the file's current content, so only old-side
+      // ranges need a clarifying tag in the popup header.
+      ...(isOld ? { note: trans.__('old version') } : {})
+    },
+    anchor
+  };
+}

package/src/git/commands.ts

@@ -2,10 +2,12 @@ import { JupyterFrontEnd } from '@jupyterlab/application';
 import { IThemeManager, MainAreaWidget } from '@jupyterlab/apputils';
 import { IRenderMimeRegistry } from '@jupyterlab/rendermime';
 import { Contents } from '@jupyterlab/services';
+import type { TranslationBundle } from '@jupyterlab/translation';
 import { ToolbarButton, launchIcon } from '@jupyterlab/ui-components';
 import { ReadonlyPartialJSONObject } from '@lumino/coreutils';
 import { ISignal, Signal } from '@lumino/signaling';
 
+import type { IAskAgent } from '../askAgent/tokens';
 import { getTreeIcon } from '../fileBrowser/icons';
 import { fileChangeToDiffModel } from './diffModel';
 import {
@@ -45,9 +47,10 @@ export function pinnedDiffWidgetId(change: IFileChange): string {
   return `xtralab:diff:pinned:${change.group}:${change.path}`;
 }
 
-function formatTitle(change: IFileChange): string {
+function formatTitle(change: IFileChange, trans: TranslationBundle): string {
   const name = change.path.split('/').pop() ?? change.path;
-  const groupLabel = change.group === 'staged' ? 'Staged' : 'Working';
+  const groupLabel =
+    change.group === 'staged' ? trans.__('Staged') : trans.__('Working');
   return `${name} (${groupLabel})`;
 }
 
@@ -58,11 +61,13 @@ export class DiffMainAreaWidget extends MainAreaWidget<XtralabDiffWidget> {
   constructor(
     options: MainAreaWidget.IOptions<XtralabDiffWidget>,
     change: IFileChange,
-    pinned: boolean
+    pinned: boolean,
+    trans: TranslationBundle
   ) {
     super(options);
     this._change = change;
     this._pinned = pinned;
+    this._trans = trans;
   }
 
   get change(): IFileChange {
@@ -88,13 +93,14 @@ export class DiffMainAreaWidget extends MainAreaWidget<XtralabDiffWidget> {
   setChange(repoPath: string, change: IFileChange): void {
     this._change = change;
     this.content.setModel(fileChangeToDiffModel(repoPath, change));
-    this.title.label = formatTitle(change);
+    this.title.label = formatTitle(change, this._trans);
     this.title.caption = change.path;
     this.title.icon = getTreeIcon(change.path);
   }
 
   private _change: IFileChange;
   private _pinned: boolean;
+  private _trans: TranslationBundle;
   private _pinnedChanged = new Signal<this, boolean>(this);
 }
 
@@ -104,6 +110,8 @@ interface ICreateDiffWidgetOptions {
   themeManager: IThemeManager | null;
   contentsManager: Contents.IManager;
   rendermime: IRenderMimeRegistry | null;
+  askAgent: IAskAgent | null;
+  trans: TranslationBundle;
   pinned?: boolean;
   onPinned?: (widget: DiffMainAreaWidget) => void;
 }
@@ -114,16 +122,23 @@ interface ICreateDiffWidgetOptions {
 function createDiffWidget(
   options: ICreateDiffWidgetOptions
 ): DiffMainAreaWidget {
-  const { repoPath, change, themeManager, contentsManager, rendermime } =
-    options;
+  const {
+    repoPath,
+    change,
+    themeManager,
+    contentsManager,
+    rendermime,
+    askAgent,
+    trans
+  } = options;
   const pinned = options.pinned === true;
   const content = new XtralabDiffWidget(
     fileChangeToDiffModel(repoPath, change),
-    { contentsManager, rendermime, themeManager }
+    { contentsManager, rendermime, themeManager, askAgent, trans }
   );
-  const widget = new DiffMainAreaWidget({ content }, change, pinned);
+  const widget = new DiffMainAreaWidget({ content }, change, pinned, trans);
   widget.id = pinned ? pinnedDiffWidgetId(change) : PREVIEW_DIFF_WIDGET_ID;
-  widget.title.label = formatTitle(change);
+  widget.title.label = formatTitle(change, trans);
   widget.title.caption = change.path;
   widget.title.closable = true;
   widget.title.icon = getTreeIcon(change.path);
@@ -134,7 +149,7 @@ function createDiffWidget(
 
   const pinButton = new ToolbarButton({
     icon: launchIcon,
-    tooltip: 'Pin tab',
+    tooltip: trans.__('Pin tab'),
     onClick: () => widget.pin()
   });
   if (widget.pinned) {
@@ -155,7 +170,7 @@ function createDiffWidget(
     }
   };
   const onPinnedChanged = (
-    _sender: DiffMainAreaWidget,
+    sender: DiffMainAreaWidget,
     value: boolean
   ): void => {
     if (widget.isDisposed) {
@@ -191,7 +206,7 @@ function createDiffWidget(
   return widget;
 }
 
-export interface IRegisterGitCommandsOptions {
+interface IRegisterGitCommandsOptions {
   app: JupyterFrontEnd;
   themeManager: IThemeManager | null;
   /**
@@ -202,6 +217,14 @@ export interface IRegisterGitCommandsOptions {
    * Rendermime registry used by notebook diffs; may be `null`.
    */
   rendermime: IRenderMimeRegistry | null;
+  /**
+   * Ask-agent popup for prompting an agent about diff lines; may be `null`.
+   */
+  askAgent: IAskAgent | null;
+  /**
+   * Translation bundle for user-facing strings.
+   */
+  trans: TranslationBundle;
   /**
    * Track newly created diff widgets before they are added to the shell.
    */
@@ -225,6 +248,8 @@ export function registerGitCommands(
     themeManager,
     contentsManager,
     rendermime,
+    askAgent,
+    trans,
     trackDiff,
     findDiff,
     onPinned
@@ -232,8 +257,8 @@ export function registerGitCommands(
   const { commands } = app;
 
   commands.addCommand(CommandIDs.openDiff, {
-    label: 'Open Git Diff',
-    caption: 'Open a side-by-side diff for a changed file',
+    label: trans.__('Open Git Diff'),
+    caption: trans.__('Open a side-by-side diff for a changed file'),
     execute: async (args: ReadonlyPartialJSONObject) => {
       const typed = args as unknown as CommandArguments.IOpenDiff;
       if (typed?.change === undefined) {
@@ -254,6 +279,8 @@ export function registerGitCommands(
         themeManager,
         contentsManager,
         rendermime,
+        askAgent,
+        trans,
         pinned: pin,
         onPinned
       });

package/src/git/diffModel.ts

@@ -9,7 +9,7 @@ import type { GitReference, IFileChange } from './tokens';
  * Resolve the old/new git refs for a launcher file change. Staged diffs are
  * INDEX vs HEAD; unstaged diffs are WORKING vs INDEX.
  */
-export function resolveReferences(change: IFileChange): {
+function resolveReferences(change: IFileChange): {
   oldRef: GitReference | null;
   newRef: GitReference | null;
 } {