xtralab 0.11.0 → 0.12.0

package/lib/git/notebookDiff.d.ts

@@ -1,18 +1,13 @@
 import * as React from 'react';
 import { IRenderMimeRegistry } from '@jupyterlab/rendermime';
+import type { TranslationBundle } from '@jupyterlab/translation';
 import { type FileDiffMetadata } from '@pierre/diffs';
-/**
- * The CSS class added to the root of the notebook diff. Selectors that
- * style cell sections, headers, and the per-cell diff blocks hang off this
- * class.
- */
-export declare const NOTEBOOK_DIFF_CSS_CLASS = "jp-xtralab-NotebookDiff";
 /**
  * Minimal slice of nbformat 4.x that the diff inspects. Fields we don't
  * read (attachments, e.g.) are intentionally not narrowed — we still pass
  * them around as part of the cell, but we never project them into the diff.
  */
-export interface INotebookCell {
+interface INotebookCell {
     cell_type: string;
     id?: string;
     source: string | string[];
@@ -21,7 +16,7 @@ export interface INotebookCell {
     execution_count?: number | null;
     attachments?: Record<string, unknown>;
 }
-export interface INotebookOutput {
+interface INotebookOutput {
     output_type: string;
     data?: Record<string, unknown>;
     text?: string | string[];
@@ -32,7 +27,7 @@ export interface INotebookOutput {
     execution_count?: number | null;
     metadata?: Record<string, unknown>;
 }
-export interface INotebook {
+interface INotebook {
     cells: INotebookCell[];
     metadata: Record<string, unknown>;
     nbformat: number;
@@ -45,7 +40,7 @@ export interface INotebook {
  * carry the same payload but live on separate union members so `Extract`
  * narrowing works on `kind` literals downstream.
  */
-export type NotebookCellDiff = {
+type NotebookCellDiff = {
     kind: 'modified';
     oldCell: INotebookCell;
     newCell: INotebookCell;
@@ -87,63 +82,7 @@ export interface INotebookDiffResult {
      */
     notebookMetadataDiff: FileDiffMetadata | null;
 }
-/**
- * Parse notebook JSON. Returns `null` if the text doesn't parse or doesn't
- * look like a notebook (missing `cells` array). The caller falls back to a
- * raw text diff so a malformed file is still inspectable.
- */
-export declare function parseNotebook(text: string): INotebook | null;
-/**
- * nbformat allows multiline string fields (`source`, stream `text`,
- * `text/plain` outputs, …) to be either a single string or an array of
- * strings. Normalize to one string so equality checks and diffs see the
- * same shape regardless of how the writer chose to serialize it.
- */
-export declare function joinMultiline(value: string | string[] | undefined): string;
-export declare function cellSource(cell: INotebookCell): string;
-/**
- * Canonical text representation of a cell's outputs, used both for equality
- * checks and for the per-cell output diff. Stream and `text/plain` data
- * round-trip verbatim; richer mime types (image/png, text/html, …) collapse
- * to a `<mime-type>` placeholder so diffing image bytes doesn't drown the
- * panel in base64 noise.
- */
-export declare function canonicalOutputs(cell: INotebookCell): string;
-/**
- * Stable JSON of the cell's `metadata` object. Keys are sorted recursively
- * so a writer that re-orders the metadata object doesn't surface as a diff.
- * An empty metadata object returns the empty string so freshly-added cells
- * that carry the default `{}` don't produce a `+{}` placeholder section.
- */
-export declare function canonicalMetadata(cell: INotebookCell): string;
-/**
- * Stable JSON of the notebook-level metadata bundle (kernelspec, language
- * info, nbformat). We diff the bundle as a single block so the user sees
- * all environment-level changes in one place.
- */
-export declare function canonicalNotebookMetadata(notebook: INotebook): string;
-/**
- * Equality check used to classify matched cells as `unchanged` vs
- * `modified`. Compares the three things we actually render — type, source,
- * outputs, metadata — using the same canonical representations the diff
- * itself sees, so an "equal" verdict here implies all per-cell diff blocks
- * would be empty.
- */
-export declare function cellsAreEqual(a: INotebookCell, b: INotebookCell): boolean;
-/**
- * Align cells between two notebook revisions. Cells that carry a stable id
- * (nbformat ≥ 4.5) match on their id; remaining cells fall back to
- * positional matching against the next un-consumed unidentified old cell so
- * older notebooks still produce a sensible diff.
- *
- * Output ordering: entries follow new-file order, with cells that exist
- * only in the old revision appended at the end as `removed`. We don't try
- * to interleave removals at their original position — for typical notebook
- * edits this is more readable than guessing alignment between unrelated
- * insertions and deletions.
- */
-export declare function alignNotebookCells(oldCells: INotebookCell[], newCells: INotebookCell[]): NotebookCellDiff[];
-export interface IBuildNotebookDiffOptions {
+interface IBuildNotebookDiffOptions {
     oldText: string;
     newText: string;
 }
@@ -166,6 +105,10 @@ interface INotebookDiffViewProps {
      */
     pierreTheme: boolean;
     rendermime: IRenderMimeRegistry | null;
+    /**
+     * Translation bundle for user-facing strings.
+     */
+    trans: TranslationBundle;
 }
 /**
  * The notebook-level diff view. Lays out cells in a 2-column grid where

package/lib/git/notebookDiff.js

@@ -11,13 +11,13 @@ import { resolveDiffTheme } from './diffTheme';
  * style cell sections, headers, and the per-cell diff blocks hang off this
  * class.
  */
-export const NOTEBOOK_DIFF_CSS_CLASS = 'jp-xtralab-NotebookDiff';
+const NOTEBOOK_DIFF_CSS_CLASS = 'jp-xtralab-NotebookDiff';
 /**
  * Parse notebook JSON. Returns `null` if the text doesn't parse or doesn't
  * look like a notebook (missing `cells` array). The caller falls back to a
  * raw text diff so a malformed file is still inspectable.
  */
-export function parseNotebook(text) {
+function parseNotebook(text) {
     if (text.length === 0) {
         return emptyNotebook();
     }
@@ -53,13 +53,13 @@ function emptyNotebook() {
  * strings. Normalize to one string so equality checks and diffs see the
  * same shape regardless of how the writer chose to serialize it.
  */
-export function joinMultiline(value) {
+function joinMultiline(value) {
     if (value === undefined) {
         return '';
     }
     return Array.isArray(value) ? value.join('') : value;
 }
-export function cellSource(cell) {
+function cellSource(cell) {
     return joinMultiline(cell.source);
 }
 /**
@@ -69,7 +69,7 @@ export function cellSource(cell) {
  * to a `<mime-type>` placeholder so diffing image bytes doesn't drown the
  * panel in base64 noise.
  */
-export function canonicalOutputs(cell) {
+function canonicalOutputs(cell) {
     var _a;
     const outputs = (_a = cell.outputs) !== null && _a !== void 0 ? _a : [];
     if (outputs.length === 0) {
@@ -132,7 +132,7 @@ function stripAnsi(value) {
  * An empty metadata object returns the empty string so freshly-added cells
  * that carry the default `{}` don't produce a `+{}` placeholder section.
  */
-export function canonicalMetadata(cell) {
+function canonicalMetadata(cell) {
     var _a;
     const md = (_a = cell.metadata) !== null && _a !== void 0 ? _a : {};
     if (Object.keys(md).length === 0) {
@@ -145,7 +145,7 @@ export function canonicalMetadata(cell) {
  * info, nbformat). We diff the bundle as a single block so the user sees
  * all environment-level changes in one place.
  */
-export function canonicalNotebookMetadata(notebook) {
+function canonicalNotebookMetadata(notebook) {
     return stableStringify({
         metadata: notebook.metadata,
         nbformat: notebook.nbformat,
@@ -155,11 +155,11 @@ export function canonicalNotebookMetadata(notebook) {
 function stableStringify(value) {
     return JSON.stringify(value, sortKeysReplacer, 2);
 }
-function sortKeysReplacer(_key, value) {
+function sortKeysReplacer(key, value) {
     if (value !== null && typeof value === 'object' && !Array.isArray(value)) {
         const sorted = {};
-        for (const key of Object.keys(value).sort()) {
-            sorted[key] = value[key];
+        for (const name of Object.keys(value).sort()) {
+            sorted[name] = value[name];
         }
         return sorted;
     }
@@ -172,7 +172,7 @@ function sortKeysReplacer(_key, value) {
  * itself sees, so an "equal" verdict here implies all per-cell diff blocks
  * would be empty.
  */
-export function cellsAreEqual(a, b) {
+function cellsAreEqual(a, b) {
     return (a.cell_type === b.cell_type &&
         cellSource(a) === cellSource(b) &&
         canonicalOutputs(a) === canonicalOutputs(b) &&
@@ -190,7 +190,7 @@ export function cellsAreEqual(a, b) {
  * edits this is more readable than guessing alignment between unrelated
  * insertions and deletions.
  */
-export function alignNotebookCells(oldCells, newCells) {
+function alignNotebookCells(oldCells, newCells) {
     const oldById = new Map();
     oldCells.forEach((cell, index) => {
         if (cell.id !== undefined && cell.id.length > 0) {
@@ -544,7 +544,7 @@ function SideBySidePanes(props) {
  */
 function OutputsSection(props) {
     var _a, _b;
-    const { entry, rendermime, placement } = props;
+    const { entry, rendermime, placement, trans } = props;
     const oldCell = 'oldCell' in entry ? entry.oldCell : null;
     const newCell = 'newCell' in entry ? entry.newCell : null;
     const oldOutputs = (_a = oldCell === null || oldCell === void 0 ? void 0 : oldCell.outputs) !== null && _a !== void 0 ? _a : [];
@@ -562,9 +562,9 @@ function OutputsSection(props) {
     const showOld = placement !== 'right' && hasOld;
     const showNew = placement !== 'left' && hasNew;
     if (rendermime === null) {
-        return (React.createElement(SideBySidePanes, { label: "Outputs", hasOld: showOld, hasNew: showNew, oldNode: React.createElement("pre", { className: `${NOTEBOOK_DIFF_CSS_CLASS}-fallbackText` }, oldCell !== null ? canonicalOutputs(oldCell) : ''), newNode: React.createElement("pre", { className: `${NOTEBOOK_DIFF_CSS_CLASS}-fallbackText` }, newCell !== null ? canonicalOutputs(newCell) : '') }));
+        return (React.createElement(SideBySidePanes, { label: trans.__('Outputs'), hasOld: showOld, hasNew: showNew, oldNode: React.createElement("pre", { className: `${NOTEBOOK_DIFF_CSS_CLASS}-fallbackText` }, oldCell !== null ? canonicalOutputs(oldCell) : ''), newNode: React.createElement("pre", { className: `${NOTEBOOK_DIFF_CSS_CLASS}-fallbackText` }, newCell !== null ? canonicalOutputs(newCell) : '') }));
     }
-    return (React.createElement(SideBySidePanes, { label: "Outputs", hasOld: showOld, hasNew: showNew, oldNode: React.createElement(OutputsPreview, { outputs: oldOutputs, rendermime: rendermime }), newNode: React.createElement(OutputsPreview, { outputs: newOutputs, rendermime: rendermime }) }));
+    return (React.createElement(SideBySidePanes, { label: trans.__('Outputs'), hasOld: showOld, hasNew: showNew, oldNode: React.createElement(OutputsPreview, { outputs: oldOutputs, rendermime: rendermime }), newNode: React.createElement(OutputsPreview, { outputs: newOutputs, rendermime: rendermime }) }));
 }
 /**
  * Rendered markdown preview section. Sits next to (and below) the markdown
@@ -572,7 +572,7 @@ function OutputsSection(props) {
  * rendered cell looks. Skipped for non-markdown cells.
  */
 function MarkdownPreviewSection(props) {
-    const { entry, rendermime, placement } = props;
+    const { entry, rendermime, placement, trans } = props;
     const isMarkdown = referenceCellType(entry) === 'markdown';
     if (!isMarkdown || rendermime === null) {
         return null;
@@ -584,7 +584,7 @@ function MarkdownPreviewSection(props) {
     if (!showOld && !showNew) {
         return null;
     }
-    return (React.createElement(SideBySidePanes, { label: "Rendered", hasOld: showOld, hasNew: showNew, oldNode: React.createElement(MarkdownPreview, { source: oldSource, rendermime: rendermime }), newNode: React.createElement(MarkdownPreview, { source: newSource, rendermime: rendermime }) }));
+    return (React.createElement(SideBySidePanes, { label: trans.__('Rendered'), hasOld: showOld, hasNew: showNew, oldNode: React.createElement(MarkdownPreview, { source: oldSource, rendermime: rendermime }), newNode: React.createElement(MarkdownPreview, { source: newSource, rendermime: rendermime }) }));
 }
 /**
  * The notebook-level diff view. Lays out cells in a 2-column grid where
@@ -597,13 +597,13 @@ function MarkdownPreviewSection(props) {
  * the orientation clear without a separate column header.
  */
 export function NotebookDiffView(props) {
-    const { diff, dark, pierreTheme, rendermime } = props;
+    const { diff, dark, pierreTheme, rendermime, trans } = props;
     const theme = resolveDiffTheme(dark, pierreTheme);
     const summary = React.useMemo(() => summarize(diff.cells), [diff.cells]);
     return (React.createElement("div", { className: NOTEBOOK_DIFF_CSS_CLASS },
-        React.createElement(NotebookDiffHeader, { summary: summary }),
-        React.createElement("div", { className: `${NOTEBOOK_DIFF_CSS_CLASS}-grid` }, diff.cells.map(entry => (React.createElement(CellEntryRow, { key: cellEntryKey(entry), entry: entry, language: diff.language, theme: theme, dark: dark, rendermime: rendermime })))),
-        diff.notebookMetadataDiff !== null ? (React.createElement(NotebookMetadataBlock, { metadata: diff.notebookMetadataDiff, theme: theme, dark: dark })) : null));
+        React.createElement(NotebookDiffHeader, { summary: summary, trans: trans }),
+        React.createElement("div", { className: `${NOTEBOOK_DIFF_CSS_CLASS}-grid` }, diff.cells.map(entry => (React.createElement(CellEntryRow, { key: cellEntryKey(entry), entry: entry, language: diff.language, theme: theme, dark: dark, rendermime: rendermime, trans: trans })))),
+        diff.notebookMetadataDiff !== null ? (React.createElement(NotebookMetadataBlock, { metadata: diff.notebookMetadataDiff, theme: theme, dark: dark, trans: trans })) : null));
 }
 /**
  * Place a single cell entry into the outer 2-column grid. Modified /
@@ -614,24 +614,28 @@ export function NotebookDiffView(props) {
  * cell was inserted or removed relative to the other side.
  */
 function CellEntryRow(props) {
-    const { entry } = props;
+    const { entry, trans } = props;
     if (entry.kind === 'added') {
         return (React.createElement(React.Fragment, null,
-            React.createElement(EmptyCellPlaceholder, { side: "old", reason: "added" }),
+            React.createElement(EmptyCellPlaceholder, { side: "old", reason: "added", trans: trans }),
             React.createElement(CellDiffBlock, { ...props, placement: "right" })));
     }
     if (entry.kind === 'removed') {
         return (React.createElement(React.Fragment, null,
             React.createElement(CellDiffBlock, { ...props, placement: "left" }),
-            React.createElement(EmptyCellPlaceholder, { side: "new", reason: "removed" })));
+            React.createElement(EmptyCellPlaceholder, { side: "new", reason: "removed", trans: trans })));
     }
     return React.createElement(CellDiffBlock, { ...props, placement: "full" });
 }
 function EmptyCellPlaceholder(props) {
-    const { side, reason } = props;
-    const label = reason === 'added' ? 'cell added on the right' : 'cell removed';
+    const { side, reason, trans } = props;
+    const label = reason === 'added'
+        ? trans.__('cell added on the right')
+        : trans.__('cell removed');
     return (React.createElement("div", { className: `${NOTEBOOK_DIFF_CSS_CLASS}-empty`, "data-side": side, "aria-label": label },
-        React.createElement("span", { className: `${NOTEBOOK_DIFF_CSS_CLASS}-emptyLabel` }, reason === 'added' ? '— no cell —' : '— cell removed —')));
+        React.createElement("span", { className: `${NOTEBOOK_DIFF_CSS_CLASS}-emptyLabel` }, reason === 'added'
+            ? trans.__('— no cell —')
+            : trans.__('— cell removed —'))));
 }
 function summarize(cells) {
     const summary = {
@@ -646,25 +650,14 @@ function summarize(cells) {
     return summary;
 }
 function NotebookDiffHeader(props) {
-    const { summary } = props;
+    const { summary, trans } = props;
     const total = summary.added + summary.removed + summary.modified + summary.unchanged;
     return (React.createElement("div", { className: `${NOTEBOOK_DIFF_CSS_CLASS}-header` },
-        React.createElement("span", { className: `${NOTEBOOK_DIFF_CSS_CLASS}-headerCount` },
-            total,
-            " cell",
-            total === 1 ? '' : 's'),
-        summary.modified > 0 ? (React.createElement("span", { className: `${NOTEBOOK_DIFF_CSS_CLASS}-stat`, "data-kind": "modified" },
-            summary.modified,
-            " modified")) : null,
-        summary.added > 0 ? (React.createElement("span", { className: `${NOTEBOOK_DIFF_CSS_CLASS}-stat`, "data-kind": "added" },
-            summary.added,
-            " added")) : null,
-        summary.removed > 0 ? (React.createElement("span", { className: `${NOTEBOOK_DIFF_CSS_CLASS}-stat`, "data-kind": "removed" },
-            summary.removed,
-            " removed")) : null,
-        summary.unchanged > 0 ? (React.createElement("span", { className: `${NOTEBOOK_DIFF_CSS_CLASS}-stat`, "data-kind": "unchanged" },
-            summary.unchanged,
-            " unchanged")) : null));
+        React.createElement("span", { className: `${NOTEBOOK_DIFF_CSS_CLASS}-headerCount` }, trans._n('%1 cell', '%1 cells', total)),
+        summary.modified > 0 ? (React.createElement("span", { className: `${NOTEBOOK_DIFF_CSS_CLASS}-stat`, "data-kind": "modified" }, trans.__('%1 modified', summary.modified))) : null,
+        summary.added > 0 ? (React.createElement("span", { className: `${NOTEBOOK_DIFF_CSS_CLASS}-stat`, "data-kind": "added" }, trans.__('%1 added', summary.added))) : null,
+        summary.removed > 0 ? (React.createElement("span", { className: `${NOTEBOOK_DIFF_CSS_CLASS}-stat`, "data-kind": "removed" }, trans.__('%1 removed', summary.removed))) : null,
+        summary.unchanged > 0 ? (React.createElement("span", { className: `${NOTEBOOK_DIFF_CSS_CLASS}-stat`, "data-kind": "unchanged" }, trans.__('%1 unchanged', summary.unchanged))) : null));
 }
 function cellEntryKey(entry) {
     var _a, _b, _c, _d;
@@ -678,7 +671,7 @@ function cellEntryKey(entry) {
 }
 function CellDiffBlock(props) {
     var _a, _b;
-    const { entry, language, theme, dark, rendermime, placement } = props;
+    const { entry, language, theme, dark, rendermime, placement, trans } = props;
     // Unchanged cells start collapsed — the user opted out of seeing those
     // sections by virtue of them being unchanged. A toggle lets them peek if
     // they want.
@@ -698,23 +691,23 @@ function CellDiffBlock(props) {
                 }
             } },
             React.createElement("span", { className: `${NOTEBOOK_DIFF_CSS_CLASS}-cellChevron` }, collapsed ? '▸' : '▾'),
-            React.createElement("span", { className: `${NOTEBOOK_DIFF_CSS_CLASS}-cellBadge`, "data-kind": entry.kind }, kindBadge(entry.kind)),
+            React.createElement("span", { className: `${NOTEBOOK_DIFF_CSS_CLASS}-cellBadge`, "data-kind": entry.kind }, kindBadge(entry.kind, trans)),
             React.createElement("span", { className: `${NOTEBOOK_DIFF_CSS_CLASS}-cellLabel` },
                 indexLabel,
                 " \u00B7 ",
                 cellType),
-            entry.kind === 'unchanged' ? (React.createElement("span", { className: `${NOTEBOOK_DIFF_CSS_CLASS}-cellHint` }, "unchanged")) : null),
-        !collapsed ? (React.createElement("div", { className: `${NOTEBOOK_DIFF_CSS_CLASS}-cellBody` }, entry.kind === 'unchanged' ? (React.createElement(UnchangedCellBody, { entry: entry, rendermime: rendermime })) : (React.createElement(React.Fragment, null,
-            subdiffs.map(sub => (React.createElement(CellSubDiff, { key: sub.kind, kind: sub.kind, metadata: sub.metadata, theme: theme, dark: dark, placement: placement }))),
-            React.createElement(MarkdownPreviewSection, { entry: entry, rendermime: rendermime, placement: placement }),
-            showOutputs ? (React.createElement(OutputsSection, { entry: entry, rendermime: rendermime, placement: placement })) : null,
+            entry.kind === 'unchanged' ? (React.createElement("span", { className: `${NOTEBOOK_DIFF_CSS_CLASS}-cellHint` }, trans.__('unchanged'))) : null),
+        !collapsed ? (React.createElement("div", { className: `${NOTEBOOK_DIFF_CSS_CLASS}-cellBody` }, entry.kind === 'unchanged' ? (React.createElement(UnchangedCellBody, { entry: entry, rendermime: rendermime, trans: trans })) : (React.createElement(React.Fragment, null,
+            subdiffs.map(sub => (React.createElement(CellSubDiff, { key: sub.kind, kind: sub.kind, metadata: sub.metadata, theme: theme, dark: dark, placement: placement, trans: trans }))),
+            React.createElement(MarkdownPreviewSection, { entry: entry, rendermime: rendermime, placement: placement, trans: trans }),
+            showOutputs ? (React.createElement(OutputsSection, { entry: entry, rendermime: rendermime, placement: placement, trans: trans })) : null,
             subdiffs.length === 0 &&
                 !(showOutputs &&
                     (('oldCell' in entry && ((_a = entry.oldCell.outputs) === null || _a === void 0 ? void 0 : _a.length)) ||
-                        ('newCell' in entry && ((_b = entry.newCell.outputs) === null || _b === void 0 ? void 0 : _b.length)))) ? (React.createElement("div", { className: `${NOTEBOOK_DIFF_CSS_CLASS}-cellEmpty` }, "No content differences detected.")) : null)))) : null));
+                        ('newCell' in entry && ((_b = entry.newCell.outputs) === null || _b === void 0 ? void 0 : _b.length)))) ? (React.createElement("div", { className: `${NOTEBOOK_DIFF_CSS_CLASS}-cellEmpty` }, trans.__('No content differences detected.'))) : null)))) : null));
 }
 function CellSubDiff(props) {
-    const { kind, metadata, theme, dark, placement } = props;
+    const { kind, metadata, theme, dark, placement, trans } = props;
     // For modified / unchanged cells the diff spans both outer columns, and
     // split mode lets it visually align with the outer old | new lanes. For
     // added / removed cells the diff sits inside a single outer column, so
@@ -722,7 +715,7 @@ function CellSubDiff(props) {
     // column empty.
     const diffStyle = placement === 'full' ? 'split' : 'unified';
     return (React.createElement("div", { className: `${NOTEBOOK_DIFF_CSS_CLASS}-subdiff`, "data-section": kind },
-        React.createElement("div", { className: `${NOTEBOOK_DIFF_CSS_CLASS}-subdiffLabel` }, subdiffLabel(kind)),
+        React.createElement("div", { className: `${NOTEBOOK_DIFF_CSS_CLASS}-subdiffLabel` }, subdiffLabel(kind, trans)),
         React.createElement(FileDiff, { fileDiff: metadata, 
             // See diffWidget.tsx — the worker bootstrap can't resolve through
             // JupyterLab's federation pipeline, so every diff in this extension
@@ -731,14 +724,14 @@ function CellSubDiff(props) {
             disableWorkerPool: true, options: { ...diffLibraryOptions(theme, dark), diffStyle } })));
 }
 function NotebookMetadataBlock(props) {
-    const { metadata, theme, dark } = props;
+    const { metadata, theme, dark, trans } = props;
     return (React.createElement("section", { className: `${NOTEBOOK_DIFF_CSS_CLASS}-cell`, "data-kind": "modified", "data-cell-type": "metadata" },
-        React.createElement("header", { className: `${NOTEBOOK_DIFF_CSS_CLASS}-cellHeader`, "aria-label": "Notebook metadata" },
+        React.createElement("header", { className: `${NOTEBOOK_DIFF_CSS_CLASS}-cellHeader`, "aria-label": trans.__('Notebook metadata') },
             React.createElement("span", { className: `${NOTEBOOK_DIFF_CSS_CLASS}-cellChevron` }, "\u25BE"),
-            React.createElement("span", { className: `${NOTEBOOK_DIFF_CSS_CLASS}-cellBadge`, "data-kind": "modified" }, "M"),
-            React.createElement("span", { className: `${NOTEBOOK_DIFF_CSS_CLASS}-cellLabel` }, "Notebook metadata")),
+            React.createElement("span", { className: `${NOTEBOOK_DIFF_CSS_CLASS}-cellBadge`, "data-kind": "modified" }, trans.__('M')),
+            React.createElement("span", { className: `${NOTEBOOK_DIFF_CSS_CLASS}-cellLabel` }, trans.__('Notebook metadata'))),
         React.createElement("div", { className: `${NOTEBOOK_DIFF_CSS_CLASS}-cellBody` },
-            React.createElement(CellSubDiff, { kind: "metadata", metadata: metadata, theme: theme, dark: dark, placement: "full" }))));
+            React.createElement(CellSubDiff, { kind: "metadata", metadata: metadata, theme: theme, dark: dark, placement: "full", trans: trans }))));
 }
 /**
  * Body for an unchanged cell when the user has expanded it. The cell's
@@ -750,7 +743,7 @@ function NotebookMetadataBlock(props) {
  */
 function UnchangedCellBody(props) {
     var _a;
-    const { entry, rendermime } = props;
+    const { entry, rendermime, trans } = props;
     const cell = entry.newCell;
     const source = cellSource(cell);
     const isMarkdown = cell.cell_type === 'markdown';
@@ -758,9 +751,9 @@ function UnchangedCellBody(props) {
     const hasOutputs = outputs.length > 0;
     return (React.createElement(React.Fragment, null,
         isMarkdown && rendermime !== null && source.length > 0 ? (React.createElement("div", { className: `${NOTEBOOK_DIFF_CSS_CLASS}-unchangedRendered` },
-            React.createElement(MarkdownPreview, { source: source, rendermime: rendermime }))) : (React.createElement("pre", { className: `${NOTEBOOK_DIFF_CSS_CLASS}-unchangedSource` }, source.length > 0 ? source : '(empty cell)')),
+            React.createElement(MarkdownPreview, { source: source, rendermime: rendermime }))) : (React.createElement("pre", { className: `${NOTEBOOK_DIFF_CSS_CLASS}-unchangedSource` }, source.length > 0 ? source : trans.__('(empty cell)'))),
         hasOutputs && rendermime !== null ? (React.createElement("div", { className: `${NOTEBOOK_DIFF_CSS_CLASS}-unchangedOutputs` },
-            React.createElement("div", { className: `${NOTEBOOK_DIFF_CSS_CLASS}-subdiffLabel` }, "Outputs"),
+            React.createElement("div", { className: `${NOTEBOOK_DIFF_CSS_CLASS}-subdiffLabel` }, trans.__('Outputs')),
             React.createElement(OutputsPreview, { outputs: outputs, rendermime: rendermime }))) : null));
 }
 function referenceCellType(entry) {
@@ -784,23 +777,23 @@ function cellIndexLabel(entry) {
     }
     return `Cell ${entry.oldIndex + 1} → ${entry.newIndex + 1}`;
 }
-function kindBadge(kind) {
+function kindBadge(kind, trans) {
     switch (kind) {
         case 'added':
-            return 'A';
+            return trans.__('A');
         case 'removed':
-            return 'D';
+            return trans.__('D');
         case 'modified':
-            return 'M';
+            return trans.__('M');
         case 'unchanged':
             return '·';
     }
 }
-function subdiffLabel(kind) {
+function subdiffLabel(kind, trans) {
     switch (kind) {
         case 'source':
-            return 'Source';
+            return trans.__('Source');
         case 'metadata':
-            return 'Metadata';
+            return trans.__('Metadata');
     }
 }

package/lib/git/tokens.d.ts

@@ -17,7 +17,9 @@ export interface IGitStatusFile {
     from: string;
     is_binary: boolean | null;
 }
-/** Response shape of `POST /git/<path>/status`. */
+/**
+ * Response shape of `POST /git/<path>/status`.
+ */
 export interface IGitStatusResult {
     code: number;
     branch: string | null;
@@ -58,7 +60,7 @@ export interface IGitContentResult {
  * changes on top of an already-staged version. The panel models that as two
  * separate entries, one per group.
  */
-export type FileChangeGroup = 'staged' | 'unstaged';
+type FileChangeGroup = 'staged' | 'unstaged';
 /**
  * The user-facing status of a file change. Drives the single-letter badge
  * (M/A/D/R/U/?) shown next to each entry in the panel.
@@ -76,3 +78,4 @@ export interface IFileChange {
     status: FileChangeStatus;
     isBinary: boolean | null;
 }
+export {};

package/lib/highlight/index.js

@@ -1,6 +1,7 @@
 import { ICommandPalette } from '@jupyterlab/apputils';
 import { CodeMirrorEditor } from '@jupyterlab/codemirror';
 import { IDocumentManager } from '@jupyterlab/docmanager';
+import { FileEditor } from '@jupyterlab/fileeditor';
 import { ITranslator, nullTranslator } from '@jupyterlab/translation';
 import { StateEffect, StateField } from '@codemirror/state';
 import { Decoration, EditorView } from '@codemirror/view';
@@ -12,7 +13,9 @@ const PLUGIN_ID = 'xtralab:highlight';
  */
 const HIGHLIGHT_LINES_COMMAND = 'xtralab:highlight-lines';
 const CLEAR_HIGHLIGHTS_COMMAND = 'xtralab:clear-highlights';
-/** CodeMirror line-decoration class; styled in style/highlight.css. */
+/**
+ * CodeMirror line-decoration class; styled in style/highlight.css.
+ */
 const HIGHLIGHT_LINE_CLASS = 'jp-xtralab-highlightLine';
 /**
  * A CodeMirror effect carrying the 1-indexed, inclusive line range to
@@ -52,15 +55,16 @@ const highlightField = StateField.define({
     provide: field => EditorView.decorations.from(field)
 });
 /**
- * Return the CodeMirror view backing a widget's editor, or `null` when the
- * widget is not a CodeMirror-based text editor (a notebook, a terminal, the
- * settings editor, …). Duck-typed on `content.editor` so the plugin does not
- * depend on `@jupyterlab/fileeditor`.
+ * Return the CodeMirror view backing a widget's file editor, or `null` when
+ * the widget is not a CodeMirror-based text editor (a notebook, a terminal,
+ * the settings editor, …).
  */
 function viewForWidget(widget) {
-    var _a;
-    const editor = (_a = widget === null || widget === void 0 ? void 0 : widget.content) === null || _a === void 0 ? void 0 : _a.editor;
-    return editor instanceof CodeMirrorEditor ? editor.editor : null;
+    const content = widget === null || widget === void 0 ? void 0 : widget.content;
+    return content instanceof FileEditor &&
+        content.editor instanceof CodeMirrorEditor
+        ? content.editor.editor
+        : null;
 }
 /**
  * Coerce a JSON command argument to a positive integer line number, falling

package/lib/index.js

@@ -1,4 +1,5 @@
 import agentSessionsPlugin from './agentSessions';
+import askAgentPlugin from './askAgent';
 import commandBarPlugin from './commandBar';
 import fileBrowserPlugin from './fileBrowser';
 import fileTypeIconsPlugin from './fileTypeIcons';
@@ -27,6 +28,7 @@ import walkthroughPlugin from './walkthrough';
  */
 const plugins = [
     agentSessionsPlugin,
+    askAgentPlugin,
     commandBarPlugin,
     editorBreadcrumbsPlugin,
     editorIndentPlugin,

package/lib/launcher/agents.d.ts

@@ -59,7 +59,12 @@ export interface IAgentSettings {
      * palette. Defaults to true.
      */
     enabled?: boolean;
-    /** See `IAgent.requireAvailable`. */
+    /**
+     * See `IAgent.requireAvailable`. Defaults to true for a built-in agent that
+     * still uses its shipped command, and to false once you override the
+     * `command` (a user-chosen command — often a shell alias — is trusted and
+     * always shown). Set it explicitly to force the check on or off.
+     */
     requireAvailable?: boolean;
     /**
      * See `IAgent.promptArgs`. Pass an empty array to mark the agent as
@@ -81,5 +86,10 @@ export declare function defaultAgentSettings(): IAgentSettings[];
  * their built-in fields unless explicitly overridden; user-only entries are
  * appended. `enabled: false` filters an entry out of the result entirely
  * (so callers don't need to check the flag again).
+ *
+ * Overriding a built-in agent's `command` also turns its `requireAvailable`
+ * off, so the card survives the launcher's `which`-based availability filter
+ * even when the new command is a shell alias the server can't resolve. See the
+ * built-in branch below for the rationale.
  */
 export declare function mergeAgents(overrides: IAgentSettings[]): IAgent[];

package/lib/launcher/agents.js

@@ -6,10 +6,9 @@ import { BUILTIN_AGENT_ICONS } from './icons';
  * in `jupyter-ai-contrib/jupyter-ai-acp-client` (which is also where their
  * icons come from), but use the bare CLI names a user would type in a
  * terminal rather than the ACP wrapper binaries that project spawns.
- * Antigravity (Google's agent-first IDE/CLI, `agy`) takes the Google slot —
- * Gemini CLI was dropped because Google is sunsetting it for consumer
- * accounts on 2026-06-18. Anything not on the user's `$PATH` is filtered
- * out at activation time, so the wider list is harmless.
+ * Antigravity (Google's agent-first IDE/CLI, `agy`) is the Google agent.
+ * Anything not on the user's `$PATH` is filtered out at activation time, so
+ * the wider list is harmless.
  */
 const DEFAULTS = [
     {
@@ -139,6 +138,11 @@ function resolveIcon(id, iconSvg) {
  * their built-in fields unless explicitly overridden; user-only entries are
  * appended. `enabled: false` filters an entry out of the result entirely
  * (so callers don't need to check the flag again).
+ *
+ * Overriding a built-in agent's `command` also turns its `requireAvailable`
+ * off, so the card survives the launcher's `which`-based availability filter
+ * even when the new command is a shell alias the server can't resolve. See the
+ * built-in branch below for the rationale.
  */
 export function mergeAgents(overrides) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
@@ -154,16 +158,30 @@ export function mergeAgents(overrides) {
         if (override.enabled === false) {
             continue;
         }
+        const command = (_a = override.command) !== null && _a !== void 0 ? _a : base.command;
         merged.push({
             id: base.id,
-            label: (_a = override.label) !== null && _a !== void 0 ? _a : base.label,
-            caption: (_b = override.caption) !== null && _b !== void 0 ? _b : base.caption,
-            command: (_c = override.command) !== null && _c !== void 0 ? _c : base.command,
+            label: (_b = override.label) !== null && _b !== void 0 ? _b : base.label,
+            caption: (_c = override.caption) !== null && _c !== void 0 ? _c : base.caption,
+            command,
             icon: override.iconSvg
                 ? resolveIcon(base.id, override.iconSvg)
                 : base.icon,
             rank: (_d = override.rank) !== null && _d !== void 0 ? _d : base.rank,
-            requireAvailable: (_e = override.requireAvailable) !== null && _e !== void 0 ? _e : base.requireAvailable,
+            // The availability filter exists to prune xtralab's *built-in* command
+            // from the launcher when it isn't installed. Once the user points the
+            // agent at their own command — e.g. the `ccm` alias wrapping `claude
+            // --effort=max …` — the server's `shutil.which` probe can't see it
+            // (aliases and shell functions only exist inside an interactive shell),
+            // so keeping the check on would wrongly hide the card. We therefore only
+            // require availability while the command is still xtralab's default; a
+            // user-chosen command is trusted and always shown. An explicit
+            // `requireAvailable` still applies to the unchanged default command, so a
+            // user can alias `claude` itself and set `requireAvailable: false` (or
+            // force the check back on).
+            requireAvailable: command === base.command
+                ? ((_e = override.requireAvailable) !== null && _e !== void 0 ? _e : base.requireAvailable)
+                : false,
             // `null` is the explicit way to opt out of an agent's default prompt
             // support; an absent key keeps the default. `undefined` from `??` is
             // pruned below.

package/lib/launcher/commands.d.ts

@@ -40,9 +40,13 @@ export declare function registerAgentCommands(app: JupyterFrontEnd, agents: IAge
  */
 export declare function launchInTerminal(commands: CommandRegistry, options: {
     cwd?: string;
-    /** The literal command line typed into the fresh terminal. */
+    /**
+     * The literal command line typed into the fresh terminal.
+     */
     invocation: string;
-    /** Tab/title label applied once the command is sent. */
+    /**
+     * Tab/title label applied once the command is sent.
+     */
     label: string;
     onSession?: (sessionName: string) => void;
 }): Promise<MainAreaWidget<ITerminal.ITerminal>>;