xtralab 0.11.0 → 0.11.1

package/README.md

@@ -210,8 +210,10 @@ Edit the `agents` array:
     // Hide an agent
     { "id": "kiro", "enabled": false },
 
-    // Override an agent's command (e.g. point Claude at a shell alias)
-    { "id": "claude", "command": "cl", "requireAvailable": false },
+    // Override an agent's command, e.g. point Claude at a shell alias.
+    // Changing the command keeps the card visible even when the alias is
+    // not on PATH, so requireAvailable: false is no longer needed here.
+    { "id": "claude", "command": "cl" },
 
     // Add a new agent; promptArgs: [] appends the prompt as a positional arg
     { "id": "aider", "label": "Aider", "command": "aider", "promptArgs": [] }

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

@@ -139,6 +139,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 +159,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/editors.d.ts

@@ -53,7 +53,12 @@ export interface IEditorSettings {
      * the editor tile entirely. Defaults to true.
      */
     enabled?: boolean;
-    /** See {@link IEditor.requireAvailable}. */
+    /**
+     * See {@link IEditor.requireAvailable}. Defaults to true for a built-in
+     * editor 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;
 }
 /**
@@ -69,7 +74,9 @@ export declare function defaultEditorSettings(): IEditorSettings[];
  * entries keep their 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 re-check the flag). The result is sorted by rank, which
- * is also the launcher's tile-preference order. Mirrors `mergeAgents`.
+ * is also the launcher's tile-preference order. Mirrors `mergeAgents`, including
+ * turning `requireAvailable` off when the user overrides a built-in's `command`
+ * so an aliased editor still shows.
  */
 export declare function mergeEditors(overrides: IEditorSettings[]): IEditor[];
 /**

package/lib/launcher/editors.js

@@ -58,7 +58,9 @@ function resolveEditorIcon(id, iconSvg) {
  * entries keep their 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 re-check the flag). The result is sorted by rank, which
- * is also the launcher's tile-preference order. Mirrors `mergeAgents`.
+ * is also the launcher's tile-preference order. Mirrors `mergeAgents`, including
+ * turning `requireAvailable` off when the user overrides a built-in's `command`
+ * so an aliased editor still shows.
  */
 export function mergeEditors(overrides) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
@@ -74,16 +76,23 @@ export function mergeEditors(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
                 ? resolveEditorIcon(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
+            // See `mergeAgents`: once the user points a built-in editor at their own
+            // command (e.g. a shell alias `which` can't resolve), stop requiring
+            // availability so the tile still shows. The check stays on only while the
+            // command is xtralab's default.
+            requireAvailable: command === base.command
+                ? ((_e = override.requireAvailable) !== null && _e !== void 0 ? _e : base.requireAvailable)
+                : false
         });
     }
     // What remains in `overrideById` are ids that don't match a built-in — treat

package/lib/launcher/index.js

@@ -27,7 +27,9 @@ const PLUGIN_ID = 'xtralab:launcher';
  * The agent list is the merge of xtralab's defaults with the user's
  * `xtralab:launcher` settings, then filtered by a server-side `which`
  * check so users only see agents that are actually installed. Agents with
- * `requireAvailable: false` (e.g. shell aliases) skip the filter.
+ * `requireAvailable: false` skip the filter, as does any built-in whose
+ * `command` the user has overridden (a user-chosen command — often a shell
+ * alias the server can't resolve — is trusted and always shown).
  *
  * The plugin deliberately does NOT provide the `ILauncher` token: other
  * extensions register notebook/console/terminal cards on it as a side

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "xtralab",
-    "version": "0.11.0",
+    "version": "0.11.1",
     "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",

package/schema/launcher.json

@@ -8,7 +8,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, 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. The full built-in list is shown as the default below, so you can copy an entry and tweak it in place.",
+      "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. Changing a built-in's `command` (for example to a shell alias like `ccm`) keeps the card visible even though the alias isn't on PATH; use `requireAvailable: false` only when you want to skip the check without changing the command. The full built-in list is shown as the default below, so you can copy an entry and tweak it in place.",
       "type": "array",
       "default": [],
       "items": {
@@ -54,7 +54,7 @@
           },
           "requireAvailable": {
             "title": "Require available",
-            "description": "When false, the launcher skips the availability check for this entry (useful for shell aliases that aren't on PATH but resolve in an interactive shell).",
+            "description": "When false, the launcher skips the availability check for this entry (useful for shell aliases that aren't on PATH but resolve in an interactive shell). Overriding a built-in agent's command turns this off automatically, so an aliased command still shows; set it explicitly to force the check on or off.",
             "type": "boolean",
             "default": true
           },
@@ -69,7 +69,7 @@
     },
     "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. The full built-in list is shown as the default below, so you can copy an entry and tweak it in place.",
+      "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. Changing a built-in's `command` (for example to a shell alias) keeps the tile visible even though the alias isn't on PATH; use `requireAvailable: false` only when you want to skip the check without changing the command. The full built-in list is shown as the default below, so you can copy an entry and tweak it in place.",
       "type": "array",
       "default": [],
       "items": {
@@ -115,7 +115,7 @@
           },
           "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).",
+            "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). Overriding a built-in editor's command turns this off automatically, so an aliased command still shows; set it explicitly to force the check on or off.",
             "type": "boolean",
             "default": true
           }

package/src/launcher/agents.ts

@@ -63,7 +63,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
@@ -215,6 +220,11 @@ function resolveIcon(id: string, iconSvg: string | undefined): LabIcon {
  * 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: IAgentSettings[]): IAgent[] {
   const overrideById = new Map(overrides.map(entry => [entry.id, entry]));
@@ -230,16 +240,31 @@ export function mergeAgents(overrides: IAgentSettings[]): IAgent[] {
     if (override.enabled === false) {
       continue;
     }
+    const command = override.command ?? base.command;
     merged.push({
       id: base.id,
       label: override.label ?? base.label,
       caption: override.caption ?? base.caption,
-      command: override.command ?? base.command,
+      command,
       icon: override.iconSvg
         ? resolveIcon(base.id, override.iconSvg)
         : base.icon,
       rank: override.rank ?? base.rank,
-      requireAvailable: override.requireAvailable ?? 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
+          ? (override.requireAvailable ?? 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/src/launcher/editors.ts

@@ -57,7 +57,12 @@ export interface IEditorSettings {
    * the editor tile entirely. Defaults to true.
    */
   enabled?: boolean;
-  /** See {@link IEditor.requireAvailable}. */
+  /**
+   * See {@link IEditor.requireAvailable}. Defaults to true for a built-in
+   * editor 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;
 }
 
@@ -121,7 +126,9 @@ function resolveEditorIcon(id: string, iconSvg: string | undefined): LabIcon {
  * entries keep their 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 re-check the flag). The result is sorted by rank, which
- * is also the launcher's tile-preference order. Mirrors `mergeAgents`.
+ * is also the launcher's tile-preference order. Mirrors `mergeAgents`, including
+ * turning `requireAvailable` off when the user overrides a built-in's `command`
+ * so an aliased editor still shows.
  */
 export function mergeEditors(overrides: IEditorSettings[]): IEditor[] {
   const overrideById = new Map(overrides.map(entry => [entry.id, entry]));
@@ -137,16 +144,24 @@ export function mergeEditors(overrides: IEditorSettings[]): IEditor[] {
     if (override.enabled === false) {
       continue;
     }
+    const command = override.command ?? base.command;
     merged.push({
       id: base.id,
       label: override.label ?? base.label,
       caption: override.caption ?? base.caption,
-      command: override.command ?? base.command,
+      command,
       icon: override.iconSvg
         ? resolveEditorIcon(base.id, override.iconSvg)
         : base.icon,
       rank: override.rank ?? base.rank,
-      requireAvailable: override.requireAvailable ?? base.requireAvailable
+      // See `mergeAgents`: once the user points a built-in editor at their own
+      // command (e.g. a shell alias `which` can't resolve), stop requiring
+      // availability so the tile still shows. The check stays on only while the
+      // command is xtralab's default.
+      requireAvailable:
+        command === base.command
+          ? (override.requireAvailable ?? base.requireAvailable)
+          : false
     });
   }
 

package/src/launcher/index.ts

@@ -37,7 +37,9 @@ const PLUGIN_ID = 'xtralab:launcher';
  * The agent list is the merge of xtralab's defaults with the user's
  * `xtralab:launcher` settings, then filtered by a server-side `which`
  * check so users only see agents that are actually installed. Agents with
- * `requireAvailable: false` (e.g. shell aliases) skip the filter.
+ * `requireAvailable: false` skip the filter, as does any built-in whose
+ * `command` the user has overridden (a user-chosen command — often a shell
+ * alias the server can't resolve — is trusted and always shown).
  *
  * The plugin deliberately does NOT provide the `ILauncher` token: other
  * extensions register notebook/console/terminal cards on it as a side