xtralab 0.13.1 → 0.14.1

package/src/omnibox/index.ts

@@ -6,7 +6,7 @@ import { ICommandPalette } from '@jupyterlab/apputils';
 import { ISettingRegistry } from '@jupyterlab/settingregistry';
 import { IStateDB } from '@jupyterlab/statedb';
 import { ITranslator, nullTranslator } from '@jupyterlab/translation';
-import { Widget } from '@lumino/widgets';
+import { CommandPalette, Widget } from '@lumino/widgets';
 
 import { IAgentRegistry } from '../launcher/tokens';
 
@@ -19,9 +19,11 @@ const PLUGIN_ID = 'xtralab:omnibox';
 /**
  * The omnibox: a single launcher overlay that fuzzy-searches workspace files
  * (via jupyterlab-quickopen's gitignore-aware endpoint) and JupyterLab
- * commands, and routes a typed prompt to one of the configured agents (running
- * it in a fresh terminal through the launcher's `xtralab:start-agent:<id>`
- * commands). It is opened by the top-bar command bar.
+ * commands (the command palette's entries plus registry commands the palette
+ * doesn't list), and routes a typed prompt to one of the configured agents
+ * (running it in a fresh terminal through the launcher's
+ * `xtralab:start-agent:<id>` commands). It is opened by the top-bar command
+ * bar.
  *
  * Commands run and files opened through the overlay are remembered (persisted
  * in the state database) and offered again at the top while the query is
@@ -55,6 +57,18 @@ const plugin: JupyterFrontEndPlugin<IOmnibox> = {
     const trans = (translator ?? nullTranslator).load('jupyterlab');
     const placeholder = trans.__('Search files and commands, or ask an agent…');
 
+    // The palette's items carry per-item args (e.g. one "Use Theme: …" per
+    // theme) that a raw command-registry scan can't see, but `ICommandPalette`
+    // exposes no item list and the widget itself is unreachable through the
+    // shell (`LabShell.add` defers it until layout restore, after which the
+    // modal setting re-parents it out of the left area). The wrapper's
+    // `_palette` field is private in TypeScript only, so read it guarded.
+    const paletteItems = (): ReadonlyArray<CommandPalette.IItem> => {
+      const widget = (palette as unknown as { _palette?: unknown } | null)
+        ?._palette;
+      return widget instanceof CommandPalette ? [...widget.items] : [];
+    };
+
     const recents = new OmniboxRecents({ state });
 
     // Restore the persisted recents only after the configured cap is known:
@@ -100,6 +114,7 @@ const plugin: JupyterFrontEndPlugin<IOmnibox> = {
       close();
       const widget = new OmniboxWidget({
         commands,
+        paletteItems: paletteItems(),
         docRegistry,
         agents: agentRegistry ? agentRegistry.agents : [],
         placeholder,

package/src/omnibox/model.ts

@@ -3,6 +3,8 @@ import type { TranslationBundle } from '@jupyterlab/translation';
 import { fileIcon, LabIcon } from '@jupyterlab/ui-components';
 import { StringExt } from '@lumino/algorithm';
 import type { CommandRegistry } from '@lumino/commands';
+import type { ReadonlyPartialJSONObject } from '@lumino/coreutils';
+import type { CommandPalette } from '@lumino/widgets';
 
 import type { IAgent } from '../launcher/agents';
 import { agentCommandId } from '../launcher/tokens';
@@ -61,6 +63,11 @@ interface IOmniboxSections {
 interface IComputeOptions {
   query: string;
   commands: CommandRegistry;
+  /**
+   * The command palette's items, whose labels are computed with each item's
+   * args — the only form in which entries like "Use Theme: …" exist.
+   */
+  paletteItems: ReadonlyArray<CommandPalette.IItem>;
   docRegistry: DocumentRegistry;
   agents: IAgent[];
   files: string[];
@@ -131,12 +138,13 @@ export function computeSections(options: IComputeOptions): IOmniboxSections {
 function executeCommand(
   commands: CommandRegistry,
   recents: OmniboxRecents | null,
-  id: string
+  id: string,
+  args?: ReadonlyPartialJSONObject
 ): void {
   void commands
-    .execute(id)
+    .execute(id, args)
     .then(() => {
-      recents?.touch('command', id);
+      recents?.touch('command', id, args);
     })
     .catch(reason => {
       console.error(`xtralab omnibox: command "${id}" failed`, reason);
@@ -169,17 +177,18 @@ function openFile(
  */
 function commandDisplay(
   commands: CommandRegistry,
-  id: string
+  id: string,
+  args?: ReadonlyPartialJSONObject
 ): { label: string; caption: string } | null {
   if (!commands.hasCommand(id)) {
     return null;
   }
   try {
-    const label = commands.label(id);
-    if (!label || !commands.isVisible(id)) {
+    const label = commands.label(id, args);
+    if (!label || !commands.isVisible(id, args)) {
       return null;
     }
-    return { label, caption: commands.caption(id) };
+    return { label, caption: commands.caption(id, args) };
   } catch {
     return null;
   }
@@ -207,18 +216,18 @@ function buildRecentItems(
   const items: IOmniboxItem[] = [];
   for (const entry of recents.entries(kind)) {
     if (entry.kind === 'command') {
-      const display = commandDisplay(commands, entry.id);
+      const display = commandDisplay(commands, entry.id, entry.args);
       if (!display) {
         continue;
       }
       items.push({
         kind: 'command',
-        key: `recent:command:${entry.id}`,
+        key: `recent:command:${entry.id}:${JSON.stringify(entry.args ?? null)}`,
         label: display.label,
         matchIndices: [],
         caption: display.caption || undefined,
         execute: () => {
-          executeCommand(commands, recents, entry.id);
+          executeCommand(commands, recents, entry.id, entry.args);
         }
       });
     } else {
@@ -240,11 +249,64 @@ function buildRecentItems(
   return items;
 }
 
+/**
+ * Match the query against the palette's items first — their labels carry each
+ * item's args (one "Use Theme: …" per theme, one row per font-size key), which
+ * a raw registry scan can never produce — then against registry commands the
+ * palette doesn't present. Palette-covered ids are skipped in the registry
+ * pass so a command never also surfaces under its argless label.
+ */
 function matchCommands(options: IComputeOptions, term: string): IOmniboxItem[] {
-  const { commands, recents } = options;
+  const { commands, paletteItems, recents } = options;
   const query = term.toLowerCase();
   const scored: Array<{ score: number; item: IOmniboxItem }> = [];
+  const inPalette = new Set<string>();
+  const seenKeys = new Set<string>();
+  for (const item of paletteItems) {
+    inPalette.add(item.command);
+    const { command: id, args } = item;
+    let label = '';
+    let visible = true;
+    let caption = '';
+    try {
+      // An item's accessors can throw if the command assumes a context (e.g.
+      // an active notebook) the omnibox doesn't provide; skip those.
+      label = item.label;
+      visible = item.isVisible;
+      caption = item.caption;
+    } catch {
+      continue;
+    }
+    if (!label || !visible) {
+      continue;
+    }
+    const key = `command:${id}:${JSON.stringify(args)}`;
+    if (seenKeys.has(key)) {
+      continue;
+    }
+    seenKeys.add(key);
+    const match = StringExt.matchSumOfSquares(label.toLowerCase(), query);
+    if (!match) {
+      continue;
+    }
+    scored.push({
+      score: match.score,
+      item: {
+        kind: 'command',
+        key,
+        label,
+        matchIndices: match.indices,
+        caption: caption || undefined,
+        execute: () => {
+          executeCommand(commands, recents, id, args);
+        }
+      }
+    });
+  }
   for (const id of commands.listCommands()) {
+    if (inPalette.has(id)) {
+      continue;
+    }
     let label = '';
     let visible = true;
     let caption = '';

package/src/omnibox/recents.ts

@@ -1,5 +1,5 @@
 import type { IStateDB } from '@jupyterlab/statedb';
-import type { PartialJSONObject } from '@lumino/coreutils';
+import type { ReadonlyPartialJSONObject } from '@lumino/coreutils';
 
 /**
  * Kinds of omnibox results whose uses are recorded.
@@ -15,6 +15,19 @@ interface IRecentEntry {
    * The command id, or the workspace-relative file path.
    */
   id: string;
+  /**
+   * Arguments the command ran with, for palette-style entries whose label
+   * and behavior depend on them (e.g. one "Use Theme: …" per theme).
+   */
+  args?: ReadonlyPartialJSONObject;
+}
+
+/**
+ * Identity of an entry: two uses only match when kind, id and args all do,
+ * so runs of one command with different args stay distinct entries.
+ */
+function entryKey(entry: IRecentEntry): string {
+  return `${entry.kind}\0${entry.id}\0${JSON.stringify(entry.args ?? null)}`;
 }
 
 /**
@@ -65,13 +78,15 @@ export class OmniboxRecents {
   }
 
   /**
-   * Record a use of `id`, moving it to the front of its kind's list.
+   * Record a use of `id` (with the args it ran with, if any), moving it to
+   * the front of its kind's list.
    */
-  touch(kind: RecentKind, id: string): void {
-    const rest = this._entries.filter(
-      entry => !(entry.kind === kind && entry.id === id)
-    );
-    this._entries = this._trim([{ kind, id }, ...rest]);
+  touch(kind: RecentKind, id: string, args?: ReadonlyPartialJSONObject): void {
+    const entry: IRecentEntry =
+      args === undefined ? { kind, id } : { kind, id, args };
+    const key = entryKey(entry);
+    const rest = this._entries.filter(existing => entryKey(existing) !== key);
+    this._entries = this._trim([entry, ...rest]);
     this._save();
   }
 
@@ -90,23 +105,35 @@ export class OmniboxRecents {
       return;
     }
     const persisted: IRecentEntry[] = Array.isArray(fetched)
-      ? fetched.filter(
-          (entry): entry is IRecentEntry =>
-            !!entry &&
-            typeof entry === 'object' &&
-            ((entry as IRecentEntry).kind === 'command' ||
-              (entry as IRecentEntry).kind === 'file') &&
-            typeof (entry as IRecentEntry).id === 'string'
-        )
+      ? fetched.filter((entry): entry is IRecentEntry => {
+          if (!entry || typeof entry !== 'object') {
+            return false;
+          }
+          const candidate = entry as IRecentEntry;
+          if (candidate.kind !== 'command' && candidate.kind !== 'file') {
+            return false;
+          }
+          if (typeof candidate.id !== 'string') {
+            return false;
+          }
+          const args: unknown = candidate.args;
+          return (
+            args === undefined ||
+            (typeof args === 'object' && args !== null && !Array.isArray(args))
+          );
+        })
       : [];
+    const known = new Set(this._entries.map(entryKey));
     const merged = [...this._entries];
     for (const entry of persisted) {
-      if (
-        !merged.some(
-          existing => existing.kind === entry.kind && existing.id === entry.id
-        )
-      ) {
-        merged.push({ kind: entry.kind, id: entry.id });
+      const key = entryKey(entry);
+      if (!known.has(key)) {
+        known.add(key);
+        merged.push(
+          entry.args === undefined
+            ? { kind: entry.kind, id: entry.id }
+            : { kind: entry.kind, id: entry.id, args: entry.args }
+        );
       }
     }
     this._entries = this._trim(merged);
@@ -128,10 +155,11 @@ export class OmniboxRecents {
     if (!this._state) {
       return;
     }
-    const value = this._entries.map<PartialJSONObject>(entry => ({
-      kind: entry.kind,
-      id: entry.id
-    }));
+    const value = this._entries.map<ReadonlyPartialJSONObject>(entry =>
+      entry.args === undefined
+        ? { kind: entry.kind, id: entry.id }
+        : { kind: entry.kind, id: entry.id, args: entry.args }
+    );
     this._state.save(STATE_KEY, value).catch(reason => {
       console.error('xtralab omnibox: failed to save recents', reason);
     });

package/src/omnibox/widget.tsx

@@ -2,6 +2,7 @@ import type { DocumentRegistry } from '@jupyterlab/docregistry';
 import type { TranslationBundle } from '@jupyterlab/translation';
 import { LabIcon, ReactWidget } from '@jupyterlab/ui-components';
 import type { CommandRegistry } from '@lumino/commands';
+import type { CommandPalette } from '@lumino/widgets';
 import * as React from 'react';
 
 import type { IAgent } from '../launcher/agents';
@@ -68,6 +69,7 @@ function renderIcon(icon?: LabIcon): React.ReactNode {
 function OmniboxComponent(props: OmniboxWidget.IOptions): JSX.Element {
   const {
     commands,
+    paletteItems,
     docRegistry,
     agents,
     placeholder,
@@ -103,13 +105,14 @@ function OmniboxComponent(props: OmniboxWidget.IOptions): JSX.Element {
       computeSections({
         query,
         commands,
+        paletteItems,
         docRegistry,
         agents,
         files,
         recents,
         trans
       }),
-    [query, commands, docRegistry, agents, files, recents, trans]
+    [query, commands, paletteItems, docRegistry, agents, files, recents, trans]
   );
   const flat = React.useMemo(
     () => [
@@ -334,6 +337,11 @@ export namespace OmniboxWidget {
    */
   export interface IOptions {
     commands: CommandRegistry;
+    /**
+     * Snapshot of the command palette's items, read once when the overlay
+     * opens; empty when the palette isn't available.
+     */
+    paletteItems: ReadonlyArray<CommandPalette.IItem>;
     docRegistry: DocumentRegistry;
     /**
      * Snapshot of the available agents, read once when the overlay opens.

package/src/svg.d.ts

@@ -0,0 +1,4 @@
+declare module '*.svg' {
+  const value: string;
+  export default value;
+}

package/style/about.css

@@ -0,0 +1,66 @@
+/*
+ * About dialog (xtralab:about). The header block is the dialog title, so it
+ * inherits the jp-Dialog-header type (size2/600 under chrome.css) — the
+ * wordmark scales up from there and the version line drops back to body
+ * size, weight and a muted color.
+ */
+
+.jp-xtralab-About-header {
+  display: flex;
+  align-items: center;
+  gap: 14px;
+}
+
+.jp-xtralab-About-logo {
+  flex-shrink: 0;
+}
+
+.jp-xtralab-About-header-info {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  gap: 2px;
+}
+
+.jp-xtralab-About-wordmark {
+  font-size: var(--jp-ui-font-size3);
+  font-weight: 700;
+  letter-spacing: -0.01em;
+  line-height: 1.2;
+}
+
+.jp-xtralab-About-version {
+  font-size: var(--jp-ui-font-size1);
+  font-weight: 400;
+  color: var(--jp-ui-font-color2);
+}
+
+.jp-xtralab-About-body {
+  display: flex;
+  flex-direction: column;
+  min-width: 360px;
+  font-size: var(--jp-ui-font-size1);
+  color: var(--jp-ui-font-color1);
+}
+
+.jp-xtralab-About-basedOn {
+  color: var(--jp-ui-font-color2);
+}
+
+.jp-xtralab-About-externalLinks {
+  padding-top: 12px;
+}
+
+.jp-xtralab-About-externalLinks > a {
+  color: var(--jp-content-link-color);
+  text-decoration: none;
+}
+
+.jp-xtralab-About-externalLinks > a:hover {
+  text-decoration: underline;
+}
+
+.jp-xtralab-About-copyright {
+  padding-top: 12px;
+  color: var(--jp-ui-font-color3);
+}

package/style/index.css

@@ -1,4 +1,5 @@
 @import url('base.css');
+@import url('about.css');
 @import url('askAgent.css');
 @import url('chrome.css');
 @import url('commandBar.css');

package/style/index.js

@@ -1,4 +1,5 @@
 import './base.css';
+import './about.css';
 import './askAgent.css';
 import './chrome.css';
 import './commandBar.css';