xtralab 0.11.1 → 0.12.1

package/lib/fileBrowser/fileBrowser.d.ts

@@ -2,7 +2,7 @@ import * as React from 'react';
 import { IDocumentManager } from '@jupyterlab/docmanager';
 import { Contents } from '@jupyterlab/services';
 import type { XtralabFileBrowser } from './widget';
-export interface IFileBrowserProps {
+interface IFileBrowserProps {
     contentsManager: Contents.IManager;
     docManager: IDocumentManager;
     onOpenFile?: (serverPath: string) => void;
@@ -22,3 +22,4 @@ export interface IFileBrowserProps {
  * state map.
  */
 export declare function FileBrowserComponent(props: IFileBrowserProps): React.ReactElement;
+export {};

package/lib/fileBrowser/widget.d.ts

@@ -4,14 +4,7 @@ import { Toolbar } from '@jupyterlab/ui-components';
 import { ISignal } from '@lumino/signaling';
 import { Widget } from '@lumino/widgets';
 export declare const FILE_BROWSER_ID = "xtralab:file-browser";
-/**
- * The CSS class added to the xtralab file browser widget. The selectors that
- * bind application context menu items hang off this class, so it must remain
- * specific enough not to clash with other browsers (such as the default
- * `jp-FileBrowser`).
- */
-export declare const FILE_BROWSER_CSS_CLASS = "jp-xtralab-FileBrowser";
-export interface IXtralabFileBrowserOptions {
+interface IXtralabFileBrowserOptions {
     contentsManager: Contents.IManager;
     docManager: IDocumentManager;
     onOpenFile?: (serverPath: string) => void;
@@ -78,7 +71,9 @@ export interface IXtralabFileBrowser {
      * directories, calling `.collapse()` on each expanded one.
      */
     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;
     /**
      * Notify the React component that a new path was created and should
@@ -143,3 +138,4 @@ export declare class XtralabFileBrowser extends Widget implements IXtralabFileBr
     private _toolbar;
     private _content;
 }
+export {};

package/lib/fileBrowser/widget.js

@@ -11,7 +11,7 @@ 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';
 /**

package/lib/fileTypeIcons/index.js

@@ -120,8 +120,12 @@ const plugin = {
                     }
                 };
                 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);
+                });
             });
         }
         if (gitExtension !== null) {
@@ -134,7 +138,6 @@ const plugin = {
                     if (icon === null) {
                         continue;
                     }
-                    // Cross jupyterlab-git's nested `LabIcon` package boundary.
                     file.type = { ...file.type, icon };
                 }
             });

package/lib/git/api.d.ts

@@ -1,11 +1,4 @@
 import { GitReference, IFileChange, IGitContentResult, IGitStatusFile, IGitStatusResult } from './tokens';
-/**
- * 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 declare function showTopLevel(repoPath: string): Promise<string | null>;
 /**
  * Fetch `git status --porcelain` for the repository the server resolves at
  * `repoPath`. When `repoPath` is the empty string, git resolves the repo
@@ -18,16 +11,6 @@ export declare function status(repoPath: string): Promise<IGitStatusResult>;
  * of {@link status}'s response).
  */
 export declare function content(repoPath: string, filename: string, reference: GitReference): Promise<IGitContentResult>;
-/** Stage a single file. */
-export declare function add(repoPath: string, filename: string): Promise<void>;
-/** Stage every changed file (including untracked). */
-export declare function addAll(repoPath: string): Promise<void>;
-/** Unstage a single file. */
-export declare function reset(repoPath: string, filename: string): Promise<void>;
-/** Unstage every file. */
-export declare function resetAll(repoPath: string): Promise<void>;
-/** Restore a single file to the version in the index (i.e. discard worktree changes). */
-export declare function checkout(repoPath: string, filename: string): Promise<void>;
 /**
  * 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
@@ -39,12 +22,3 @@ export declare function checkout(repoPath: string, filename: string): Promise<vo
  * don't pin our `tsconfig.lib` to ES2019.
  */
 export declare function expandStatusFiles(files: IGitStatusFile[]): IFileChange[];
-/**
- * Translate one entry in the porcelain `files` array into the panel's
- * preferred shape. A single porcelain entry may represent up to two changes
- * (one in the index, one in the worktree); we emit one {@link IFileChange}
- * per non-empty side, so a "modified-staged-and-then-modified-again" file
- * shows up twice in the panel — once under "Staged Changes" and once under
- * "Changes" — matching the layout the user sees in VS Code.
- */
-export declare function porcelainToFileChanges(file: IGitStatusFile): IFileChange[];

package/lib/git/api.js

@@ -32,7 +32,7 @@ async function postWithPath(endpoint, repoPath, body) {
         try {
             data = JSON.parse(text);
         }
-        catch (_err) {
+        catch (_c) {
             // Fall through into the error handling below.
         }
     }
@@ -42,25 +42,6 @@ async function postWithPath(endpoint, repoPath, body) {
     }
     return (data !== null && data !== void 0 ? data : {});
 }
-/**
- * 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) {
-    let result;
-    try {
-        result = await postWithPath('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
@@ -80,29 +61,6 @@ export async function content(repoPath, filename, reference) {
         reference
     });
 }
-/** Stage a single file. */
-export async function add(repoPath, filename) {
-    await postWithPath('add', repoPath, { add_all: false, filename });
-}
-/** Stage every changed file (including untracked). */
-export async function addAll(repoPath) {
-    await postWithPath('add', repoPath, { add_all: true });
-}
-/** Unstage a single file. */
-export async function reset(repoPath, filename) {
-    await postWithPath('reset', repoPath, { reset_all: false, filename });
-}
-/** Unstage every file. */
-export async function resetAll(repoPath) {
-    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, filename) {
-    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
@@ -130,7 +88,7 @@ export function expandStatusFiles(files) {
  * 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) {
+function porcelainToFileChanges(file) {
     const result = [];
     // Untracked files are reported with `??` and only appear under "Changes".
     if (file.x === '?' && file.y === '?') {

package/lib/git/askRequest.d.ts

@@ -0,0 +1,23 @@
+import type { TranslationBundle } from '@jupyterlab/translation';
+import type { SelectedLineRange } from '@pierre/diffs';
+import type { IAskAgentRequest } from '../askAgent/tokens';
+import type { IXtralabDiffModel } from './diffWidget';
+/**
+ * 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 declare function buildDiffAskRequest(options: {
+    model: IXtralabDiffModel;
+    oldText: string;
+    newText: string;
+    range: SelectedLineRange;
+    anchor: DOMRect | null;
+    trans: TranslationBundle;
+}): IAskAgentRequest;

package/lib/git/askRequest.js

@@ -0,0 +1,90 @@
+import { Git } from '@jupyterlab/git';
+/**
+ * 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, fallback) {
+    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) {
+    return side === 'deletions' ? 'old side' : 'new side';
+}
+/**
+ * Extract lines `startLine`–`endLine` (1-indexed, inclusive) from `text`.
+ */
+function sliceLines(text, startLine, endLine) {
+    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) {
+    var _a, _b, _c;
+    const { model, oldText, newText, range, anchor, trans } = options;
+    const repositoryPath = (_a = model.repositoryPath) !== null && _a !== void 0 ? _a : '';
+    const base = {
+        path: model.filename,
+        ...(repositoryPath.length > 0 ? { cwd: repositoryPath } : {})
+    };
+    const startSide = (_b = range.side) !== null && _b !== void 0 ? _b : 'additions';
+    const endSide = (_c = range.endSide) !== null && _c !== void 0 ? _c : 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/lib/git/commands.d.ts

@@ -2,7 +2,9 @@ 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 { ISignal } from '@lumino/signaling';
+import type { IAskAgent } from '../askAgent/tokens';
 import { XtralabDiffWidget } from './diffWidget';
 import { IFileChange } from './tokens';
 /**
@@ -33,7 +35,7 @@ export declare function pinnedDiffWidgetId(change: IFileChange): string;
  * Launcher-owned host for a shared diff widget.
  */
 export declare class DiffMainAreaWidget extends MainAreaWidget<XtralabDiffWidget> {
-    constructor(options: MainAreaWidget.IOptions<XtralabDiffWidget>, change: IFileChange, pinned: boolean);
+    constructor(options: MainAreaWidget.IOptions<XtralabDiffWidget>, change: IFileChange, pinned: boolean, trans: TranslationBundle);
     get change(): IFileChange;
     get pinned(): boolean;
     pin(): void;
@@ -41,9 +43,10 @@ export declare class DiffMainAreaWidget extends MainAreaWidget<XtralabDiffWidget
     setChange(repoPath: string, change: IFileChange): void;
     private _change;
     private _pinned;
+    private _trans;
     private _pinnedChanged;
 }
-export interface IRegisterGitCommandsOptions {
+interface IRegisterGitCommandsOptions {
     app: JupyterFrontEnd;
     themeManager: IThemeManager | null;
     /**
@@ -54,6 +57,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.
      */
@@ -69,3 +80,4 @@ export interface IRegisterGitCommandsOptions {
  * registry.
  */
 export declare function registerGitCommands(options: IRegisterGitCommandsOptions): void;
+export {};

package/lib/git/commands.js

@@ -21,21 +21,22 @@ export const PREVIEW_DIFF_WIDGET_ID = 'xtralab:diff:preview';
 export function pinnedDiffWidgetId(change) {
     return `xtralab:diff:pinned:${change.group}:${change.path}`;
 }
-function formatTitle(change) {
+function formatTitle(change, trans) {
     var _a;
     const name = (_a = change.path.split('/').pop()) !== null && _a !== void 0 ? _a : change.path;
-    const groupLabel = change.group === 'staged' ? 'Staged' : 'Working';
+    const groupLabel = change.group === 'staged' ? trans.__('Staged') : trans.__('Working');
     return `${name} (${groupLabel})`;
 }
 /**
  * Launcher-owned host for a shared diff widget.
  */
 export class DiffMainAreaWidget extends MainAreaWidget {
-    constructor(options, change, pinned) {
+    constructor(options, change, pinned, trans) {
         super(options);
         this._pinnedChanged = new Signal(this);
         this._change = change;
         this._pinned = pinned;
+        this._trans = trans;
     }
     get change() {
         return this._change;
@@ -56,7 +57,7 @@ export class DiffMainAreaWidget extends MainAreaWidget {
     setChange(repoPath, change) {
         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);
     }
@@ -66,12 +67,12 @@ export class DiffMainAreaWidget extends MainAreaWidget {
  */
 function createDiffWidget(options) {
     var _a;
-    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 });
-    const widget = new DiffMainAreaWidget({ content }, change, pinned);
+    const content = new XtralabDiffWidget(fileChangeToDiffModel(repoPath, change), { contentsManager, rendermime, themeManager, askAgent, trans });
+    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);
@@ -80,7 +81,7 @@ function createDiffWidget(options) {
     const onPinned = (_a = options.onPinned) !== null && _a !== void 0 ? _a : (() => undefined);
     const pinButton = new ToolbarButton({
         icon: launchIcon,
-        tooltip: 'Pin tab',
+        tooltip: trans.__('Pin tab'),
         onClick: () => widget.pin()
     });
     if (widget.pinned) {
@@ -100,7 +101,7 @@ function createDiffWidget(options) {
             widget.toolbar.hide();
         }
     };
-    const onPinnedChanged = (_sender, value) => {
+    const onPinnedChanged = (sender, value) => {
         if (widget.isDisposed) {
             return;
         }
@@ -138,11 +139,11 @@ function createDiffWidget(options) {
  * registry.
  */
 export function registerGitCommands(options) {
-    const { app, themeManager, contentsManager, rendermime, trackDiff, findDiff, onPinned } = options;
+    const { app, themeManager, contentsManager, rendermime, askAgent, trans, trackDiff, findDiff, onPinned } = options;
     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) => {
             const typed = args;
             if ((typed === null || typed === void 0 ? void 0 : typed.change) === undefined) {
@@ -163,6 +164,8 @@ export function registerGitCommands(options) {
                 themeManager,
                 contentsManager,
                 rendermime,
+                askAgent,
+                trans,
                 pinned: pin,
                 onPinned
             });

package/lib/git/diffModel.d.ts

@@ -1,13 +1,5 @@
 import type { IXtralabDiffModel } from './diffWidget';
-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 declare function resolveReferences(change: IFileChange): {
-    oldRef: GitReference | null;
-    newRef: GitReference | null;
-};
+import type { IFileChange } from './tokens';
 /**
  * Build a diff model for a single {@link IFileChange}.
  */

package/lib/git/diffModel.js

@@ -5,7 +5,7 @@ import { content } from './api';
  * 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) {
+function resolveReferences(change) {
     if (change.status === 'untracked') {
         return { oldRef: null, newRef: { special: 'WORKING' } };
     }

package/lib/git/diffProvider.js

@@ -1,6 +1,8 @@
 import { IThemeManager } from '@jupyterlab/apputils';
 import { IRenderMimeRegistry } from '@jupyterlab/rendermime';
+import { ITranslator, nullTranslator } from '@jupyterlab/translation';
 import { IGitExtension } from '@jupyterlab/git';
+import { IAskAgent } from '../askAgent/tokens';
 import { XtralabDiffWidget, addDiffToolbarItems } from './diffWidget';
 import { IMAGE_DIFF_EXTENSIONS } from './imageDiff';
 /**
@@ -20,12 +22,15 @@ const diffProviderPlugin = {
     description: "Replaces jupyterlab-git's notebook, text and image diff plugins with xtralab's renderer.",
     autoStart: true,
     requires: [IGitExtension],
-    optional: [IRenderMimeRegistry, IThemeManager],
-    activate: (app, gitExtension, rendermime, themeManager) => {
+    optional: [IRenderMimeRegistry, IThemeManager, ITranslator, IAskAgent],
+    activate: (app, gitExtension, rendermime, themeManager, translator, askAgent) => {
+        const trans = (translator !== null && translator !== void 0 ? translator : nullTranslator).load('jupyterlab');
         const factory = makeXtralabDiffFactory({
             contentsManager: app.serviceManager.contents,
             rendermime,
-            themeManager
+            themeManager,
+            askAgent,
+            trans
         });
         // Use one shared factory; the surface detects notebooks/images by filename.
         gitExtension.registerDiffProvider('XtralabNotebook', ['.ipynb'], factory);

package/lib/git/diffSurface.d.ts

@@ -1,6 +1,8 @@
 import * as React from 'react';
 import { IThemeManager } from '@jupyterlab/apputils';
 import { IRenderMimeRegistry } from '@jupyterlab/rendermime';
+import type { TranslationBundle } from '@jupyterlab/translation';
+import { type SelectedLineRange } from '@pierre/diffs';
 /**
  * The CSS class added to the diff main-area widget. The selectors that
  * style the embedded `@pierre/diffs` viewer hang off this class.
@@ -42,12 +44,12 @@ export declare function isPierreTheme(themeManager: IThemeManager | null): boole
  * the on-disk path) and triggers any follow-up refresh in
  * {@link IHunkDiscard.onAfterSave}.
  */
-export interface IHunkDiscard {
+interface IHunkDiscard {
     enabled: boolean;
     save: (fullText: string) => Promise<void>;
     onAfterSave: () => void;
 }
-export interface IDiffSurfaceProps {
+interface IDiffSurfaceProps {
     /**
      * Whether the host is still resolving the file contents.
      */
@@ -124,6 +126,18 @@ export interface IDiffSurfaceProps {
      * Optional per-hunk discard wiring; omit for a read-only diff.
      */
     hunkDiscard?: IHunkDiscard;
+    /**
+     * When provided, the textual/code file diff gets line selection: clicking
+     * or dragging over the line numbers selects a range, and a gutter "+"
+     * button appears on the hovered/selected lines. Clicking that button
+     * invokes this callback with the selected range and the button's viewport
+     * rectangle (to anchor a popup to), `null` when it cannot be measured.
+     */
+    onLineAsk?: (range: SelectedLineRange, anchor: DOMRect | null) => void;
+    /**
+     * Translation bundle for user-facing strings.
+     */
+    trans: TranslationBundle;
 }
 /**
  * Shared renderer for text, notebook and image diffs.
@@ -139,6 +153,7 @@ export declare function NotebookViewModeControl(props: {
     mode: NotebookDiffViewMode;
     available: boolean;
     onChange: (mode: NotebookDiffViewMode) => void;
+    trans: TranslationBundle;
 }): React.ReactElement;
 /**
  * Segmented Split/Unified selector. Mirrors {@link NotebookViewModeControl}:
@@ -151,4 +166,6 @@ export declare function DiffStyleControl(props: {
     diffStyle: DiffStyle;
     available: boolean;
     onChange: (style: DiffStyle) => void;
+    trans: TranslationBundle;
 }): React.ReactElement;
+export {};