xtralab 0.4.0 → 0.6.0

package/lib/topBar/index.js

@@ -0,0 +1,86 @@
+import { ILabShell } from '@jupyterlab/application';
+import { ITranslator, nullTranslator } from '@jupyterlab/translation';
+import { CommandToolbarButton } from '@jupyterlab/ui-components';
+import { leftSidebarIcon, rightSidebarIcon } from './icons';
+const PLUGIN_ID = 'xtralab:top-bar';
+/**
+ * Upstream commands from `@jupyterlab/application-extension` that collapse or
+ * expand the side areas. We bind the buttons to these rather than
+ * reimplementing the toggle, so behavior (and the `isToggled`/`isEnabled`
+ * state the buttons reflect) stays in lockstep with the View menu entries
+ * and their keyboard shortcuts.
+ */
+const TOGGLE_LEFT_AREA = 'application:toggle-left-area';
+const TOGGLE_RIGHT_AREA = 'application:toggle-right-area';
+const BUTTONS = [
+    {
+        id: 'xtralab-toggle-left-sidebar',
+        command: TOGGLE_LEFT_AREA,
+        icon: leftSidebarIcon,
+        caption: trans => trans.__('Toggle left sidebar'),
+        rank: -1,
+        sideClass: 'xtralab-TopBarButton-left'
+    },
+    {
+        id: 'xtralab-toggle-right-sidebar',
+        command: TOGGLE_RIGHT_AREA,
+        icon: rightSidebarIcon,
+        caption: trans => trans.__('Toggle right sidebar'),
+        rank: 1000,
+        sideClass: 'xtralab-TopBarButton-right'
+    }
+];
+/**
+ * Add two icon buttons to the top bar that toggle the left and right side
+ * areas, mirroring the macOS-style sidebar buttons: a left-sidebar button at
+ * the leading edge and a right-sidebar button at the far edge.
+ *
+ * Each is a `CommandToolbarButton` wrapping an existing
+ * `application:toggle-{left,right}-area` command, so clicking it runs the
+ * same toggle as the View menu and the button reflects the command's state —
+ * pressed while the matching sidebar is open, and disabled when the area is
+ * empty. Note xtralab ships nothing in the right area by default (the
+ * property inspector, table of contents and debugger are all disabled), so
+ * the right button stays disabled until a widget is moved or added there.
+ */
+const plugin = {
+    id: PLUGIN_ID,
+    description: 'Add left and right sidebar toggle buttons to the top bar.',
+    autoStart: true,
+    requires: [ILabShell],
+    optional: [ITranslator],
+    activate: (app, labShell, translator) => {
+        const { commands } = app;
+        const trans = (translator !== null && translator !== void 0 ? translator : nullTranslator).load('jupyterlab');
+        // Defer to `app.restored` so the upstream toggle commands are already in
+        // the registry: `CommandToolbarButton` renders nothing until its command
+        // exists and only re-renders on `commandChanged` of type `changed` /
+        // `many-changed` (not `added`), so mounting earlier could leave a button
+        // blank until the next unrelated command change.
+        void app.restored.then(() => {
+            for (const spec of BUTTONS) {
+                const button = new CommandToolbarButton({
+                    commands,
+                    id: spec.command,
+                    icon: spec.icon,
+                    // Empty label keeps the button icon-only: the override is forwarded
+                    // verbatim and the component skips the label span when it is falsy.
+                    label: '',
+                    caption: spec.caption(trans),
+                    // Toggle on mousedown without focusing the button. Otherwise
+                    // ToolbarButtonComponent calls `event.target.focus()` on click,
+                    // leaving the stealth button showing a focus fill/outline (the
+                    // stray "border") until you click elsewhere — unwanted chrome for a
+                    // title-bar control. Keyboard Tab focus still works, so this stays
+                    // accessible.
+                    noFocusOnClick: true
+                });
+                button.id = spec.id;
+                button.addClass('xtralab-TopBarButton');
+                button.addClass(spec.sideClass);
+                labShell.add(button, 'top', { rank: spec.rank });
+            }
+        });
+    }
+};
+export default plugin;

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "xtralab",
-    "version": "0.4.0",
-    "description": "An opinionated JupyterLab meta-package that bundles a curated set of extensions, ships a path-first file browser and a VS Code-style git changes panel, and applies a quieter default workspace configuration.",
+    "version": "0.6.0",
+    "description": "An opinionated JupyterLab meta-package that bundles a curated set of extensions, ships a path-first file browser, renders jupyterlab-git's text, notebook and image diffs with its own viewers, and applies a quieter default workspace configuration.",
     "keywords": [
         "jupyter",
         "jupyterlab",
@@ -30,27 +30,28 @@
         "type": "git",
         "url": "https://github.com/jtpio/xtralab.git"
     },
+    "packageManager": "pnpm@10.28.0",
     "scripts": {
-        "build": "jlpm build:lib && jlpm build:labextension:dev",
-        "build:prod": "jlpm clean && jlpm build:lib:prod && jlpm build:labextension",
+        "build": "pnpm build:lib && pnpm build:labextension:dev",
+        "build:prod": "pnpm clean && pnpm build:lib:prod && pnpm build:labextension",
         "build:labextension": "jupyter-builder build .",
         "build:labextension:dev": "jupyter-builder build --development True .",
         "build:lib": "tsc --sourceMap",
         "build:lib:prod": "tsc",
-        "clean": "jlpm clean:lib",
+        "clean": "pnpm clean:lib",
         "clean:lib": "rimraf lib tsconfig.tsbuildinfo",
         "clean:lintcache": "rimraf .eslintcache .stylelintcache",
         "clean:labextension": "rimraf xtralab/labextension xtralab/_version.py",
-        "clean:all": "jlpm clean:lib && jlpm clean:labextension && jlpm clean:lintcache",
-        "eslint": "jlpm eslint:check --fix",
+        "clean:all": "pnpm clean:lib && pnpm clean:labextension && pnpm clean:lintcache",
+        "eslint": "pnpm eslint:check --fix",
         "eslint:check": "eslint . --cache --ext .ts,.tsx",
-        "install:extension": "jlpm build",
-        "lint": "jlpm stylelint && jlpm prettier && jlpm eslint",
-        "lint:check": "jlpm stylelint:check && jlpm prettier:check && jlpm eslint:check",
-        "prettier": "jlpm prettier:base --write --list-different",
+        "install:extension": "pnpm build",
+        "lint": "pnpm stylelint && pnpm prettier && pnpm eslint",
+        "lint:check": "pnpm stylelint:check && pnpm prettier:check && pnpm eslint:check",
+        "prettier": "pnpm prettier:base --write --list-different",
         "prettier:base": "prettier \"**/*{.ts,.tsx,.js,.jsx,.css,.json,.md}\"",
-        "prettier:check": "jlpm prettier:base --check",
-        "stylelint": "jlpm stylelint:check --fix",
+        "prettier:check": "pnpm prettier:base --check",
+        "stylelint": "pnpm stylelint:check --fix",
         "stylelint:check": "stylelint --cache \"style/**/*.css\"",
         "watch": "run-p watch:src watch:labextension",
         "watch:src": "tsc -w --sourceMap",
@@ -60,24 +61,25 @@
         "@codemirror/language": "^6.12.1",
         "@codemirror/state": "^6.5.4",
         "@codemirror/view": "^6.39.14",
-        "@jupyterlab/application": "^4.6.0-alpha.5",
-        "@jupyterlab/apputils": "^4.7.0-alpha.5",
-        "@jupyterlab/codemirror": "^4.6.0-alpha.5",
-        "@jupyterlab/coreutils": "^6.6.0-alpha.5",
-        "@jupyterlab/docmanager": "^4.6.0-alpha.5",
-        "@jupyterlab/docregistry": "^4.6.0-alpha.5",
-        "@jupyterlab/launcher": "^4.6.0-alpha.5",
-        "@jupyterlab/mainmenu": "^4.6.0-alpha.5",
-        "@jupyterlab/nbformat": "^4.6.0-alpha.5",
-        "@jupyterlab/outputarea": "^4.6.0-alpha.5",
-        "@jupyterlab/rendermime": "^4.6.0-alpha.5",
-        "@jupyterlab/services": "^7.6.0-alpha.5",
-        "@jupyterlab/settingregistry": "^4.6.0-alpha.5",
-        "@jupyterlab/statusbar": "^4.6.0-alpha.5",
-        "@jupyterlab/terminal": "^4.6.0-alpha.5",
-        "@jupyterlab/translation": "^4.6.0-alpha.5",
-        "@jupyterlab/ui-components": "^4.6.0-alpha.5",
+        "@jupyterlab/application": "^4.6.0-beta.0",
+        "@jupyterlab/apputils": "^4.7.0-beta.0",
+        "@jupyterlab/codemirror": "^4.6.0-beta.0",
+        "@jupyterlab/coreutils": "^6.6.0-beta.0",
+        "@jupyterlab/docmanager": "^4.6.0-beta.0",
+        "@jupyterlab/docregistry": "^4.6.0-beta.0",
+        "@jupyterlab/git": "^0.54.0-a1",
+        "@jupyterlab/launcher": "^4.6.0-beta.0",
+        "@jupyterlab/mainmenu": "^4.6.0-beta.0",
+        "@jupyterlab/nbformat": "^4.6.0-beta.0",
+        "@jupyterlab/outputarea": "^4.6.0-beta.0",
+        "@jupyterlab/rendermime": "^4.6.0-beta.0",
+        "@jupyterlab/services": "^7.6.0-beta.0",
+        "@jupyterlab/settingregistry": "^4.6.0-beta.0",
+        "@jupyterlab/terminal": "^4.6.0-beta.0",
+        "@jupyterlab/translation": "^4.6.0-beta.0",
+        "@jupyterlab/ui-components": "^4.6.0-beta.0",
         "@lumino/algorithm": "^2.0.0",
+        "@lumino/commands": "^2.0.0",
         "@lumino/coreutils": "^2.0.0",
         "@lumino/disposable": "^2.0.0",
         "@lumino/dragdrop": "^2.0.0",
@@ -93,7 +95,7 @@
         "react-dom": "^18.2.0"
     },
     "devDependencies": {
-        "@jupyter/builder": "^0.0.8",
+        "@jupyter/builder": "^1.0.0-beta.1",
         "@types/json-schema": "^7.0.11",
         "@types/react": "^18.0.26",
         "@types/react-addons-linked-state-mixin": "^0.14.22",
@@ -116,8 +118,10 @@
         "typescript": "~5.5.4",
         "yjs": "^13.5.0"
     },
-    "resolutions": {
-        "lib0": "0.2.111"
+    "pnpm": {
+        "ignoredBuiltDependencies": [
+            "@fortawesome/fontawesome-free"
+        ]
     },
     "sideEffects": [
         "style/*.css",
@@ -131,8 +135,16 @@
         "extension": true,
         "outputDir": "xtralab/labextension",
         "schemaDir": "schema",
+        "sharedPackages": {
+            "@jupyterlab/git": {
+                "bundled": false,
+                "singleton": true
+            }
+        },
         "disabledExtensions": [
-            "@jupyterlab/git",
+            "@jupyterlab/git:notebook-diff",
+            "@jupyterlab/git:plain-text-diff",
+            "@jupyterlab/git:image-diff",
             "@jupyterlab/launcher-extension"
         ]
     },
@@ -140,7 +152,12 @@
         "node_modules",
         "dist",
         "coverage",
-        "**/*.d.ts"
+        "**/*.d.ts",
+        "desktop/out",
+        "desktop/dist",
+        "desktop/python/wheels",
+        "desktop/python/runtime",
+        "desktop/python/runtime.staging"
     ],
     "eslintConfig": {
         "extends": [

package/schema/launcher.json

@@ -7,7 +7,7 @@
   "properties": {
     "agents": {
       "title": "Agents",
-      "description": "Override or extend the built-in list of agents shown on the launcher. Each entry must include an `id`. When the id matches a built-in (claude, codex, gemini, copilot, goose, opencode, kiro, mistral-vibe), the fields you set override the corresponding defaults; leave a field out to keep the default. New ids define brand-new cards. Set `enabled: false` to hide a default. Set `requireAvailable: false` for shell aliases that should always show even though they aren't on PATH.",
+      "description": "Override or extend the built-in list of agents shown on the launcher. Each entry must include an `id`. When the id matches a built-in (claude, codex, antigravity, copilot, goose, opencode, kiro, mistral-vibe), the fields you set override the corresponding defaults; leave a field out to keep the default. New ids define brand-new cards. Set `enabled: false` to hide a default. Set `requireAvailable: false` for shell aliases that should always show even though they aren't on PATH.",
       "type": "array",
       "default": [],
       "items": {
@@ -65,6 +65,61 @@
           }
         }
       }
+    },
+    "editors": {
+      "title": "Editors",
+      "description": "Override or extend the terminal editors offered in the launcher's Open section (and recognized in the Terminals panel). Each entry must include an `id`. When the id matches a built-in (nvim, vim), the fields you set override the corresponding defaults; leave a field out to keep the default. New ids define additional editors. The launcher shows a single tile — the first editor, by `rank`, whose `command` is on PATH (Neovim before Vim by default). Set `enabled: false` to hide a built-in; disable both to remove the tile entirely. Set `requireAvailable: false` for a shell alias that should show even though it isn't on PATH.",
+      "type": "array",
+      "default": [],
+      "items": {
+        "type": "object",
+        "additionalProperties": false,
+        "required": ["id"],
+        "properties": {
+          "id": {
+            "title": "ID",
+            "description": "Stable identifier. Match a built-in (nvim, vim) to override, or pick a new id to define a new editor.",
+            "type": "string"
+          },
+          "label": {
+            "title": "Label",
+            "description": "Tile title shown on the launcher.",
+            "type": "string"
+          },
+          "caption": {
+            "title": "Caption",
+            "description": "Tooltip shown for the tile.",
+            "type": "string"
+          },
+          "command": {
+            "title": "Command",
+            "description": "Literal string typed into the new terminal (e.g. `nvim`). Aliases work because shells expand them on interactive lines.",
+            "type": "string"
+          },
+          "iconSvg": {
+            "title": "Icon SVG",
+            "description": "Inline SVG for the tile icon. Required only for new editors whose icon is not already shipped by xtralab.",
+            "type": "string"
+          },
+          "rank": {
+            "title": "Rank",
+            "description": "Preference order (lower numbers come first). The launcher shows the first available editor by rank.",
+            "type": "number"
+          },
+          "enabled": {
+            "title": "Enabled",
+            "description": "When false, hides the editor from the launcher (and the Terminals panel stops badging it).",
+            "type": "boolean",
+            "default": true
+          },
+          "requireAvailable": {
+            "title": "Require available",
+            "description": "When false, the launcher skips the availability check for this entry (useful for a shell alias that isn't on PATH but resolves in an interactive shell).",
+            "type": "boolean",
+            "default": true
+          }
+        }
+      }
     }
   }
 }

package/src/agentSessions.ts

@@ -0,0 +1,94 @@
+import type { JupyterFrontEndPlugin } from '@jupyterlab/application';
+import { Token } from '@lumino/coreutils';
+import { ISignal, Signal } from '@lumino/signaling';
+
+/**
+ * A shared map from a terminal session name to the agent command it was
+ * *launched* with (e.g. `claude`).
+ *
+ * This is the optimistic half of the running-agent badge: when the launcher
+ * (or the terminals panel's `+` menu) starts an agent via a
+ * `xtralab:start-agent:<id>` command, it records the session here so the
+ * panel can show the agent's logo immediately, before the server-side
+ * process detection has had a chance to confirm it. Server detection is the
+ * authoritative source once it reports on a session; this tag only fills the
+ * gap right after launch (and serves as a fallback if detection is
+ * unavailable).
+ *
+ * It exists as its own token, provided by a tiny dependency-free plugin,
+ * specifically so the launcher (the writer) and the terminals panel (the
+ * reader) can share it without depending on each other — a direct
+ * launcher↔terminals token pair would form an activation cycle.
+ */
+export interface IAgentSessions {
+  /**
+   * The agent command a session was launched with, or `null` if we never
+   * launched an agent into it (e.g. a plain terminal, or one started before
+   * this ran).
+   */
+  get(sessionName: string): string | null;
+
+  /** Record that a session was launched as the given agent command. */
+  set(sessionName: string, command: string): void;
+
+  /** Forget a session — called when it shuts down so the map stays bounded. */
+  delete(sessionName: string): void;
+
+  /**
+   * Emitted with the affected session name whenever a record is added or
+   * removed, so readers can re-render.
+   */
+  readonly changed: ISignal<IAgentSessions, string>;
+}
+
+/**
+ * DI token for {@link IAgentSessions}. Provided by `xtralab:agent-sessions`;
+ * consumed (optionally) by both `xtralab:launcher` and `xtralab:terminals`.
+ */
+export const IAgentSessions = new Token<IAgentSessions>(
+  'xtralab:IAgentSessions',
+  'A shared map from terminal session name to the agent command it was launched with.'
+);
+
+class AgentSessions implements IAgentSessions {
+  get(sessionName: string): string | null {
+    return this._byName.get(sessionName) ?? null;
+  }
+
+  set(sessionName: string, command: string): void {
+    if (this._byName.get(sessionName) === command) {
+      return;
+    }
+    this._byName.set(sessionName, command);
+    this._changed.emit(sessionName);
+  }
+
+  delete(sessionName: string): void {
+    if (this._byName.delete(sessionName)) {
+      this._changed.emit(sessionName);
+    }
+  }
+
+  get changed(): ISignal<IAgentSessions, string> {
+    return this._changed;
+  }
+
+  private _byName = new Map<string, string>();
+  private _changed = new Signal<IAgentSessions, string>(this);
+}
+
+/**
+ * Provides {@link IAgentSessions}. Deliberately has no dependencies so it can
+ * sit underneath both the launcher and the terminals panel without creating
+ * a dependency cycle between them.
+ */
+const plugin: JupyterFrontEndPlugin<IAgentSessions> = {
+  id: 'xtralab:agent-sessions',
+  description:
+    'Shared map from terminal session to the agent command it was launched with, used to badge terminal rows with the running agent.',
+  autoStart: true,
+  provides: IAgentSessions,
+  activate: (): IAgentSessions => new AgentSessions()
+};
+
+export default plugin;

package/src/fileBrowser/index.ts

@@ -37,7 +37,11 @@ const plugin: JupyterFrontEndPlugin<void> = {
         void app.commands.execute('docmanager:open', { path: serverPath });
       }
     });
-    app.shell.add(browser, 'left', { rank: 50 });
+    // Ranks just under the Terminals panel in the left sidebar. The shipped
+    // `layout` setting assigns the default ranks (rank only, no area pin),
+    // so this browser stays movable via the "Move Widget" context menu; the
+    // `rank` here is the in-code fallback for when that setting is absent.
+    app.shell.add(browser, 'left', { rank: 2 });
     if (restorer) {
       restorer.add(browser, browser.id);
     }

package/src/git/commands.ts

@@ -1,8 +1,7 @@
 import { JupyterFrontEnd } from '@jupyterlab/application';
-import { ICommandPalette, IThemeManager } from '@jupyterlab/apputils';
+import { IThemeManager } from '@jupyterlab/apputils';
 import { IRenderMimeRegistry } from '@jupyterlab/rendermime';
 import { Contents } from '@jupyterlab/services';
-import { refreshIcon } from '@jupyterlab/ui-components';
 import { ReadonlyPartialJSONObject } from '@lumino/coreutils';
 
 import {
@@ -10,16 +9,15 @@ import {
   diffWidgetId,
   updateGitDiffWidget
 } from './diffWidget';
-import { GitPanel } from './panel';
 import { IFileChange } from './tokens';
 
 /**
- * Command IDs exposed by the git plugin. Both are registered in
- * {@link registerGitCommands} so other extensions, the command palette and
- * keybindings can drive the panel without going through the React internals.
+ * Command IDs exposed by the launcher's git diff path. The launcher
+ * dashboard's "Changes" section drives {@link CommandIDs.openDiff} to open
+ * its own diff tab, independent of `jupyterlab-git` (whose panel reaches
+ * the same rendering via the providers in `diffProvider.tsx`).
  */
 export namespace CommandIDs {
-  export const refresh = 'xtralab:git:refresh';
   export const openDiff = 'xtralab:git:open-diff';
 }
 
@@ -39,9 +37,7 @@ export namespace CommandArguments {
 
 export interface IRegisterGitCommandsOptions {
   app: JupyterFrontEnd;
-  panel: GitPanel;
   themeManager: IThemeManager | null;
-  commandPalette: ICommandPalette | null;
   /**
    * Contents manager used by the diff widget to write hunk-discard
    * results back to the working tree.
@@ -56,7 +52,10 @@ export interface IRegisterGitCommandsOptions {
   rendermime: IRenderMimeRegistry | null;
   /**
    * Called whenever the diff widget mutates the working tree (e.g. after
-   * a hunk discard) so the plugin can refresh the changes panel.
+   * a hunk discard). The launcher dashboard polls git status on its own
+   * cadence and `jupyterlab-git`'s panel auto-refreshes on the contents
+   * `fileChanged` signal the save emits, so this is a hook for any extra
+   * bookkeeping rather than a required refresh.
    */
   onChanged: () => void;
   /**
@@ -77,18 +76,15 @@ export interface IRegisterGitCommandsOptions {
 }
 
 /**
- * Register the git commands on the application command registry. Returns
- * a disposer that clears the command palette items the registration created
- * (the commands themselves stay registered for the lifetime of the plugin).
+ * Register the launcher's git diff command on the application command
+ * registry.
  */
 export function registerGitCommands(
   options: IRegisterGitCommandsOptions
-): () => void {
+): void {
   const {
     app,
-    panel,
     themeManager,
-    commandPalette,
     contentsManager,
     rendermime,
     onChanged,
@@ -98,15 +94,6 @@ export function registerGitCommands(
   } = options;
   const { commands } = app;
 
-  commands.addCommand(CommandIDs.refresh, {
-    label: 'Refresh Git Changes',
-    caption: 'Refresh the git changes panel',
-    icon: refreshIcon,
-    execute: () => {
-      panel.refresh();
-    }
-  });
-
   commands.addCommand(CommandIDs.openDiff, {
     label: 'Open Git Diff',
     caption: 'Open a side-by-side diff for a changed file',
@@ -139,19 +126,6 @@ export function registerGitCommands(
       app.shell.activateById(widget.id);
     }
   });
-
-  const paletteItems = commandPalette
-    ? [
-        commandPalette.addItem({
-          command: CommandIDs.refresh,
-          category: 'Git'
-        })
-      ]
-    : [];
-
-  return () => {
-    paletteItems.forEach(item => item.dispose());
-  };
 }
 
 export { diffWidgetId };