jupyterlab_ai_code_assistants_extension 1.0.21 → 1.0.23

package/README.md

@@ -32,7 +32,7 @@ Chat-panel extensions re-implement the agent loop and trail the real tool. This
 - **One-click resume** - click a row to jump back into that session in a terminal; an open terminal for the project is reused instead of duplicated
 - **Conversation switcher** - a right-click "Switch and Manage Sessions" submenu lists a project's other conversations by name and short id with last-activity time; "Manage Sessions..." opens a searchable popup over the full list with multi-select delete and per-row open and copy-id buttons
 - **Branch session** - fork the current conversation into a new named session via the right-click menu; each assistant forks its own way (Claude's native `--fork-session`, Codex's `codex fork`, server-side copies for Kimi and Gemini) behind the same menu item
-- **Launch modes under each assistant's own name** - Claude's skip-permissions, Codex's approval bypass, Kimi's `--yolo`, Gemini's YOLO and approval modes; unsafe variants carry a warning glyph
+- **Launch modes under each assistant's own name** - Claude's skip-permissions, Codex's approval bypass, Kimi's `--yolo`, Gemini's YOLO; unsafe variants carry a shield glyph in the launch menus
 - **Coloured terminal tabs** - each session's colour tints its terminal tab via the companion `jupyterlab_colourful_tab_extension` (installed automatically). Claude's own `/color` supplies its default, Kimi derives a stable colour from the conversation id; Codex and Gemini have no colour of their own until you set one, and a branched session inherits its parent's colour, which it keeps even if the parent's colour later changes or is reset
 - **Your own tab colour wins** - set a colour on a terminal tab and the extension remembers it for that conversation, overriding whatever the assistant chose. `Reset Tab Colour (n)` in the session's right-click menu hands back every colour you set by hand on that project's conversations, and appears once there is one to hand back. Use it rather than the tab menu's own Clear, which will not release a stored colour. A Codex or Kimi conversation that has never been resumed cannot be tracked yet, so a colour set on its tab is not kept
 - **Favorites** - star projects you keep coming back to via the right-click menu; favourites from the standalone extensions are migrated on first run

package/lib/core/modes.d.ts

@@ -2,7 +2,7 @@ import { ILaunchMode } from './types';
 /** A resolved launch mode, with what to call it and whether to warn. */
 export interface IResolvedLaunchMode {
     mode: ILaunchMode;
-    /** What the menu should call it - the value, or the mode's own label. */
+    /** What the menu should call it - the mode's own label. */
     label: string;
     /** Whether this widens what the assistant may do without asking. */
     unsafe: boolean;
@@ -12,11 +12,8 @@ export interface IResolvedLaunchMode {
  *
  * The payload carries at most one mode, because the server maps one token to
  * one flag. `force` wins outright - that is what the menu's variant entries
- * do. Otherwise an enum mode moved off its default takes precedence over any
- * boolean switch: the enum is the explicit statement of intent, so a boolean
- * left on must not silently invert it. A boolean fires only while every enum
- * mode sits at its default. An enum at its default sends nothing - it is what
- * the CLI would do unasked.
+ * do. Otherwise the first switch that is on fires. Every mode is a boolean
+ * skip-approval switch, so "on" always means the same thing.
  */
 export declare function resolveLaunchMode(launchModes: ILaunchMode[], values: Record<string, boolean | string>, force?: string): string | undefined;
 /**

package/lib/core/modes.js

@@ -1,34 +1,22 @@
 // Launch-mode resolution: which single mode token, if any, one launch carries.
 //
 // Its own module because the panel is the only caller but not the only reader -
-// the precedence between a boolean switch and an enum ladder is a rule worth
-// asserting on its own, and this file pulls in no JupyterLab surface.
+// the rule that one launch carries at most one mode is worth asserting on its
+// own, and this file pulls in no JupyterLab surface.
 /**
  * The single launch-mode token for one action, or undefined for a plain launch.
  *
  * The payload carries at most one mode, because the server maps one token to
  * one flag. `force` wins outright - that is what the menu's variant entries
- * do. Otherwise an enum mode moved off its default takes precedence over any
- * boolean switch: the enum is the explicit statement of intent, so a boolean
- * left on must not silently invert it. A boolean fires only while every enum
- * mode sits at its default. An enum at its default sends nothing - it is what
- * the CLI would do unasked.
+ * do. Otherwise the first switch that is on fires. Every mode is a boolean
+ * skip-approval switch, so "on" always means the same thing.
  */
 export function resolveLaunchMode(launchModes, values, force) {
     if (force) {
         return force;
     }
     for (const mode of launchModes) {
-        const value = values[mode.id];
-        if (mode.kind !== 'boolean' &&
-            typeof value === 'string' &&
-            value &&
-            value !== mode.default) {
-            return `${mode.id}=${value}`;
-        }
-    }
-    for (const mode of launchModes) {
-        if (mode.kind === 'boolean' && values[mode.id] === true) {
+        if (values[mode.id] === true) {
             return mode.id;
         }
     }
@@ -45,28 +33,20 @@ export function resolveLaunchMode(launchModes, values, force) {
  * assistant's own wording.
  */
 export function resolvedLaunchModeEntry(launchModes, values) {
-    var _a, _b;
+    var _a;
     const token = resolveLaunchMode(launchModes, values);
     if (!token) {
         return null;
     }
-    const [id, value] = token.split('=');
-    const mode = launchModes.find(m => m.id === id);
+    const mode = launchModes.find(m => m.id === token);
     if (!mode) {
         return null;
     }
-    // A boolean mode with a menu label IS the assistant's skip-approval switch;
-    // an enum only widens on the values its provider declared. `plan` resolves
-    // to a mode and is stricter than the default, so "resolved at all" is the
-    // wrong question to ask about danger.
-    const unsafe = value
-        ? ((_a = mode.unsafeValues) !== null && _a !== void 0 ? _a : []).indexOf(value) !== -1
-        : !!mode.menuLabel;
-    // Name the VALUE where there is one - three enum values sharing the mode's
-    // title render as one indistinguishable label.
+    // Carrying a menu label IS a boolean mode's declaration that it skips
+    // approval - it is what puts a variant in the menu.
     return {
         mode,
-        label: (_b = value !== null && value !== void 0 ? value : mode.menuLabel) !== null && _b !== void 0 ? _b : mode.title,
-        unsafe
+        label: (_a = mode.menuLabel) !== null && _a !== void 0 ? _a : mode.title,
+        unsafe: !!mode.menuLabel
     };
 }

package/lib/core/panel.d.ts

@@ -188,7 +188,7 @@ export declare class AssistantSessionsPanel extends Widget {
     private _setRefreshSpinning;
     private _setActiveRow;
     private _cmd;
-    /** Boolean launch modes that produce a menu variant - the assistant's own
+    /** Launch modes that produce a menu variant - the assistant's own
      * skip-approval switch, under the assistant's own name. */
     private get _variantModes();
     /** The launch mode a PLAIN action resolves to right now, or null.
@@ -298,8 +298,6 @@ export declare class AssistantSessionsPanel extends Widget {
     private _newSessionMenu;
     /** Re-writes the `+` button's title. Set once the shell exists. */
     private _renameNewButton;
-    /** Re-draws the `+` button's glyph. Set once the shell exists. */
-    private _repaintNewIcon;
     private _lastBranches;
     private _lastBranchesCurrent;
     private _colouredTabs;

package/lib/core/panel.js

@@ -107,8 +107,6 @@ export class AssistantSessionsPanel extends Widget {
         this._roving = {};
         /** Re-writes the `+` button's title. Set once the shell exists. */
         this._renameNewButton = null;
-        /** Re-draws the `+` button's glyph. Set once the shell exists. */
-        this._repaintNewIcon = null;
         this._lastBranches = [];
         this._lastBranchesCurrent = '';
         this._colouredTabs = true;
@@ -220,14 +218,12 @@ export class AssistantSessionsPanel extends Widget {
     /** Current values of this provider's launch modes, read from settings. Each
      * key is an `ILaunchMode.id` in the assistant's own terminology. */
     setModes(modes) {
-        var _a, _b;
+        var _a;
         this._modes = { ...modes };
         // Menu labels are lazy and re-read this on every open; the button's title
-        // is a written string, so it has to be rewritten here.
+        // is a written string, so it has to be rewritten here. The glyph needs no
+        // such hook - it is always "+", whatever mode is armed (DEF-112).
         (_a = this._renameNewButton) === null || _a === void 0 ? void 0 : _a.call(this);
-        // Same for its glyph - a menu item re-reads its icon on every open, a
-        // painted button does not.
-        (_b = this._repaintNewIcon) === null || _b === void 0 ? void 0 : _b.call(this);
     }
     setColouredTabs(on) {
         this._colouredTabs = on;
@@ -282,25 +278,11 @@ export class AssistantSessionsPanel extends Widget {
         // after turning an approval-free mode on (DEF-38).
         this._renameNewButton = nameNewButton;
         nameNewButton();
-        // The glyph follows the same rule the menu entries follow: where a mode
-        // WIDENS what runs without asking, the mode's warning glyph wins over the
-        // action's own (DEF-35). It matters most here - with a mode in force the
-        // variants suppress themselves and this button launches on click, so a
-        // plain "+" would be the only one-click approval-free launch in the panel
-        // wearing no warning at all.
-        const paintNewIcon = () => {
-            var _a;
-            const icon = (_a = (this._visibleVariantCount() === 0 ? this._variantIcon() : undefined)) !== null && _a !== void 0 ? _a : addIcon;
-            // `LabIcon.element` appends into the container, so the previous glyph
-            // has to go or the button would collect one svg per settings change.
-            newBtn.replaceChildren();
-            icon.element({ container: newBtn });
-        };
-        // Held for the same reason the title is: the shell is built before
-        // settings arrive, so what is drawn here can only say "no mode in force"
-        // and `setModes` has to repaint it (DEF-38).
-        this._repaintNewIcon = paintNewIcon;
-        paintNewIcon();
+        // The glyph is always "+", whatever mode is armed (DEF-112): the shield
+        // marks the menu ENTRIES that skip approval, while the button that offers
+        // or launches stays neutral - an armed mode is still named in the title
+        // above, so the launch never goes unnamed.
+        addIcon.element({ container: newBtn });
         newBtn.addEventListener('click', () => {
             // With a mode in force the variant items suppress themselves, leaving a
             // dropdown with one entry - two clicks for its only outcome. Do it.
@@ -1637,10 +1619,10 @@ export class AssistantSessionsPanel extends Widget {
     _cmd(action) {
         return commandId(this._descriptor.id, action);
     }
-    /** Boolean launch modes that produce a menu variant - the assistant's own
+    /** Launch modes that produce a menu variant - the assistant's own
      * skip-approval switch, under the assistant's own name. */
     get _variantModes() {
-        return this._descriptor.launchModes.filter(m => m.kind === 'boolean' && !!m.menuLabel);
+        return this._descriptor.launchModes.filter(m => !!m.menuLabel);
     }
     /** The launch mode a PLAIN action resolves to right now, or null.
      *

package/lib/core/types.d.ts

@@ -19,9 +19,8 @@ export type ForkStrategy = 'native-flag' | 'native-command' | 'server-copy';
  * the extension's own write-back store always wins over all three. */
 export type ColourSource = 'native' | 'derived' | 'none';
 /** One launch-behaviour setting of an assistant, in that assistant's own
- * terminology. `boolean` modes are the unsafe/skip-approval switches: they get
- * a settings toggle (off by default) AND a context-menu launch variant.
- * `enum` modes are settings-only choices passed through on every launch. */
+ * terminology. A launch mode is a boolean skip-approval switch: it gets a
+ * settings toggle (off by default) AND a context-menu launch variant. */
 export interface ILaunchMode {
     /** Settings key under `providers.<id>.` and launch-payload key. Uses the
      * assistant's own terminology, never a normalised core name. */
@@ -30,24 +29,12 @@ export interface ILaunchMode {
     title: string;
     /** Settings description. */
     description: string;
-    kind: 'boolean' | 'enum';
-    /** Allowed values, `enum` modes only. */
-    values?: string[];
-    /** Default value. Boolean modes default to `false` without exception. */
-    default: boolean | string;
+    /** Default value - `false` without exception. */
+    default: boolean;
     /** Menu label for the launch variant this mode produces, e.g.
-     * `Skip Permissions`. Boolean modes only; absent means settings-only. */
+     * `Skip Permissions`. Carrying one IS the mode's declaration that it skips
+     * approval - it is what puts a variant in the menu. */
     menuLabel?: string;
-    /** `enum` modes only: the values that WIDEN what the assistant may do
-     * without asking. The panel warns on these and names the value; every other
-     * value is a settings choice and is marked as one.
-     *
-     * Declared per provider rather than inferred, because "a mode resolved at
-     * all" is not the same question: Gemini's `plan` is read-only - stricter
-     * than the default - and marking it the same as `yolo` says nothing about
-     * either. A boolean mode needs no entry here; carrying a `menuLabel` is
-     * already its declaration that it skips approval. */
-    unsafeValues?: string[];
 }
 /** Everything the core needs to know about one assistant. Pure data - no
  * JupyterLab imports - so the settings-schema generator can read it under

package/lib/providers/claude.js

@@ -52,7 +52,6 @@ export const descriptor = {
             id: 'dangerouslySkipPermissions',
             title: 'Dangerously skip permissions',
             description: 'When enabled, newly spawned and resumed sessions are launched with `--dangerously-skip-permissions`. Bypasses every Claude Code permission prompt - only enable in sandboxes you trust.',
-            kind: 'boolean',
             default: false,
             menuLabel: 'Skip Permissions'
         }

package/lib/providers/codex.js

@@ -48,7 +48,6 @@ export const descriptor = {
             id: BYPASS_MODE,
             title: 'Bypass Codex approvals and sandbox',
             description: 'When enabled, newly spawned and resumed sessions are launched with `--dangerously-bypass-approvals-and-sandbox`. Bypasses every Codex approval prompt and sandbox - only enable in environments you trust.',
-            kind: 'boolean',
             default: false,
             menuLabel: 'Bypass Approvals'
         }

package/lib/providers/gemini.js

@@ -28,11 +28,10 @@
 const geminiSvgStr = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 65 65" width="16" height="16">
   <path class="jp-icon3" fill="#616161" d="M32.447 0c.68 0 1.273.465 1.439 1.125a38.904 38.904 0 001.999 5.905c2.152 5 5.105 9.376 8.854 13.125 3.751 3.75 8.126 6.703 13.125 8.855a38.98 38.98 0 005.906 1.999c.66.166 1.124.758 1.124 1.438 0 .68-.464 1.273-1.125 1.439a38.902 38.902 0 00-5.905 1.999c-5 2.152-9.375 5.105-13.125 8.854-3.749 3.751-6.702 8.126-8.854 13.125a38.973 38.973 0 00-2 5.906 1.485 1.485 0 01-1.438 1.124c-.68 0-1.272-.464-1.438-1.125a38.913 38.913 0 00-2-5.905c-2.151-5-5.103-9.375-8.854-13.125-3.75-3.749-8.125-6.702-13.125-8.854a38.973 38.973 0 00-5.905-2A1.485 1.485 0 010 32.448c0-.68.465-1.272 1.125-1.438a38.903 38.903 0 005.905-2c5-2.151 9.376-5.104 13.125-8.854 3.75-3.749 6.703-8.125 8.855-13.125a38.972 38.972 0 001.999-5.905A1.485 1.485 0 0132.447 0z"/>
 </svg>`;
-// Gemini's own names for its two launch surfaces. Kept in the assistant's
-// terminology rather than normalised, because each is both the settings key
+// Gemini's own name for its approval switch. Kept in the assistant's
+// terminology rather than normalised, because it is both the settings key
 // under `providers.gemini.` and the mode token the server maps to a CLI flag.
 const YOLO_MODE = 'yoloMode';
-const APPROVAL_MODE = 'approvalMode';
 export const descriptor = {
     id: 'gemini',
     label: 'Gemini',
@@ -54,19 +53,8 @@ export const descriptor = {
             id: YOLO_MODE,
             title: 'YOLO mode',
             description: 'When enabled, newly spawned and resumed sessions are launched with `--yolo`. Gemini auto-approves every tool call without asking - only enable in workspaces you trust.',
-            kind: 'boolean',
             default: false,
             menuLabel: 'YOLO'
-        },
-        {
-            id: APPROVAL_MODE,
-            title: 'Approval mode',
-            description: 'Approval ladder passed as `--approval-mode` when set to a value other than the default. A non-default value here takes precedence over the YOLO switch; only the forced YOLO menu action overrides it. `default` prompts for approval, `auto_edit` auto-approves edit tools, `yolo` auto-approves every tool, `plan` is read-only.',
-            kind: 'enum',
-            values: ['default', 'auto_edit', 'yolo', 'plan'],
-            default: 'default',
-            // `plan` is read-only and `default` prompts, so neither widens anything.
-            unsafeValues: ['auto_edit', 'yolo']
         }
     ],
     hasRemoteControl: false,

package/lib/providers/kimi.js

@@ -122,7 +122,6 @@ export const descriptor = {
             id: 'yoloMode',
             title: 'YOLO mode',
             description: 'When enabled, newly spawned and resumed sessions are launched with `--yolo`. Kimi auto-approves regular tool calls without asking - only enable in workspaces you trust.',
-            kind: 'boolean',
             default: false,
             menuLabel: 'YOLO'
         }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "jupyterlab_ai_code_assistants_extension",
-    "version": "1.0.21",
+    "version": "1.0.23",
     "description": "Jupyterlab extension to replace individual jupyterlab_*_code_extension and integrate into one, that offers joint capability, joint settings page and individual right toolbar panels per code assistant, with the ability in settings to decide which code assistant support is on (default - all are enabled)",
     "keywords": [
         "jupyter",

package/schema/plugin.json

@@ -69,13 +69,6 @@
       "description": "When enabled, newly spawned and resumed sessions are launched with `--yolo`. Gemini auto-approves every tool call without asking - only enable in workspaces you trust.",
       "default": false
     },
-    "providers.gemini.approvalMode": {
-      "type": "string",
-      "title": "Gemini: Approval mode",
-      "description": "Approval ladder passed as `--approval-mode` when set to a value other than the default. A non-default value here takes precedence over the YOLO switch; only the forced YOLO menu action overrides it. `default` prompts for approval, `auto_edit` auto-approves edit tools, `yolo` auto-approves every tool, `plan` is read-only.",
-      "default": "default",
-      "enum": ["default", "auto_edit", "yolo", "plan"]
-    },
     "providers.kimi.enabled": {
       "type": "boolean",
       "title": "Kimi: enabled",

package/src/__tests__/launch-mode.spec.ts

@@ -1,10 +1,10 @@
 /**
- * Launch-mode precedence.
+ * Launch-mode resolution.
  *
- * A provider can expose both a boolean switch and an enum ladder over the same
- * approval surface, and the payload carries only one token. An enum moved off
- * its default is the user's explicit statement, so it has to beat a boolean
- * left on - otherwise a read-only ladder setting launches wide open.
+ * Every mode is a boolean skip-approval switch in the assistant's own
+ * terminology (DEF-111 retired the one enum ladder, Gemini's `approvalMode`),
+ * and the payload carries only one token: `force` wins outright, otherwise
+ * the first switch that is on fires.
  */
 
 import { resolveLaunchMode, resolvedLaunchModeEntry } from '../core/modes';
@@ -15,44 +15,33 @@ const MODES: ILaunchMode[] = [
     id: 'yoloMode',
     title: 'YOLO',
     description: 'Boolean switch.',
-    kind: 'boolean',
     default: false,
     // Carrying a menu label IS a boolean mode's declaration that it skips
     // approval - it is what puts a variant in the menu.
     menuLabel: 'YOLO'
-  },
-  {
-    id: 'approvalMode',
-    title: 'Approval',
-    description: 'Enum ladder.',
-    kind: 'enum',
-    values: ['default', 'plan', 'yolo'],
-    default: 'default',
-    unsafeValues: ['yolo']
   }
 ];
 
 describe('resolveLaunchMode', () => {
-  it('lets a non-default enum beat a boolean that is on', () => {
-    expect(
-      resolveLaunchMode(MODES, { yoloMode: true, approvalMode: 'plan' })
-    ).toEqual('approvalMode=plan');
-  });
-
-  it('sends the boolean while every enum sits at its default', () => {
-    expect(
-      resolveLaunchMode(MODES, { yoloMode: true, approvalMode: 'default' })
-    ).toEqual('yoloMode');
+  it('sends the boolean that is on', () => {
+    expect(resolveLaunchMode(MODES, { yoloMode: true })).toEqual('yoloMode');
   });
 
   it('sends nothing when no mode is set', () => {
     expect(resolveLaunchMode(MODES, {})).toBeUndefined();
+    expect(resolveLaunchMode(MODES, { yoloMode: false })).toBeUndefined();
   });
 
   it('forces the requested mode whatever the settings say', () => {
+    expect(resolveLaunchMode(MODES, {}, 'yoloMode')).toEqual('yoloMode');
+  });
+
+  it('ignores a token from a retired setting', () => {
+    // A stale `approvalMode` value in saved settings is not a boolean that is
+    // on - it must never become a launch token (DEF-111).
     expect(
-      resolveLaunchMode(MODES, { approvalMode: 'plan' }, 'yoloMode')
-    ).toEqual('yoloMode');
+      resolveLaunchMode(MODES, { approvalMode: 'plan' } as any)
+    ).toBeUndefined();
   });
 });
 
@@ -60,8 +49,7 @@ describe('resolvedLaunchModeEntry', () => {
   // What the panel marks its PLAIN menu items from. Deciding the warning glyph
   // from the menu's `force` argument instead leaves the entry the user
   // actually clicks unmarked, while marking a forced duplicate that builds the
-  // identical launch. Deciding it from "a mode resolved at all" is the same
-  // error one level down: it warns on Gemini's `plan`, which is read-only.
+  // identical launch.
   it('warns on a boolean skip-approval switch and names it', () => {
     const r = resolvedLaunchModeEntry(MODES, { yoloMode: true });
     expect(r?.mode.id).toEqual('yoloMode');
@@ -69,32 +57,8 @@ describe('resolvedLaunchModeEntry', () => {
     expect(r?.unsafe).toBe(true);
   });
 
-  it('warns on an enum value the provider declared as widening', () => {
-    const r = resolvedLaunchModeEntry(MODES, { approvalMode: 'yolo' });
-    expect(r?.mode.id).toEqual('approvalMode');
-    expect(r?.label).toEqual('yolo');
-    expect(r?.unsafe).toBe(true);
-  });
-
-  it('does NOT warn on an enum value that is stricter than the default', () => {
-    // `plan` is read-only. Marking it like `yolo` says nothing about either.
-    const r = resolvedLaunchModeEntry(MODES, { approvalMode: 'plan' });
-    expect(r?.mode.id).toEqual('approvalMode');
-    expect(r?.label).toEqual('plan');
-    expect(r?.unsafe).toBe(false);
-  });
-
-  it('names the mode that actually wins, not both', () => {
-    expect(
-      resolvedLaunchModeEntry(MODES, { yoloMode: true, approvalMode: 'plan' })
-        ?.mode.id
-    ).toEqual('approvalMode');
-  });
-
   it('names nothing for a launch that carries no mode', () => {
     expect(resolvedLaunchModeEntry(MODES, {})).toBeNull();
-    expect(
-      resolvedLaunchModeEntry(MODES, { approvalMode: 'default' })
-    ).toBeNull();
+    expect(resolvedLaunchModeEntry(MODES, { yoloMode: false })).toBeNull();
   });
 });

package/src/__tests__/panel.spec.ts

@@ -66,7 +66,6 @@ const DESCRIPTOR: IProviderDescriptor = {
       id: 'skip',
       title: 'Skip approvals',
       description: 'Run without asking.',
-      kind: 'boolean',
       default: false,
       menuLabel: 'Skip Permissions'
     }
@@ -277,16 +276,14 @@ describe('the + button names and marks the launch it performs', () => {
     expect(newBtn().title).not.toContain('(Skip Permissions)');
   });
 
-  it('DEF-35 / DEF-38 - the glyph follows the mode, one svg at a time', () => {
-    // With the mode in force every variant suppresses itself, so this button
-    // stops dropping a menu and launches on click - a plain + would be the one
-    // one-click approval-free launch in the panel wearing no warning.
+  it('DEF-112 - the glyph is always +, one svg at a time', () => {
+    // The shield marks the menu entries that skip approval; the button that
+    // offers or launches stays neutral in every mode state. The mode is still
+    // named in the title, per DEF-36 above.
     expect(glyphs()).toEqual([addIcon.name]);
     panel.setModes({ skip: true });
     expect((panel as any)._visibleVariantCount()).toEqual(0);
-    expect(glyphs()).toEqual([shieldIcon.name]);
-    // `LabIcon.element` appends, so a button that is not cleared collects one
-    // svg per settings change.
+    expect(glyphs()).toEqual([addIcon.name]);
     panel.setModes({ skip: false });
     expect(glyphs()).toEqual([addIcon.name]);
   });

package/src/__tests__/registry.spec.ts

@@ -79,13 +79,8 @@ describe('the providers barrel', () => {
         expect(mode.id.trim()).toBeTruthy();
         expect(mode.title.trim()).toBeTruthy();
         expect(mode.description.trim()).toBeTruthy();
-        if (mode.kind === 'boolean') {
-          // Every unsafe switch is off by default, without exception.
-          expect(mode.default).toBe(false);
-        } else {
-          expect(mode.values).toBeDefined();
-          expect(mode.values).toContain(mode.default as string);
-        }
+        // Every unsafe switch is off by default, without exception.
+        expect(mode.default).toBe(false);
       }
       const ids = descriptor.launchModes.map(m => m.id);
       expect(new Set(ids).size).toEqual(ids.length);

package/src/core/modes.ts

@@ -1,15 +1,15 @@
 // Launch-mode resolution: which single mode token, if any, one launch carries.
 //
 // Its own module because the panel is the only caller but not the only reader -
-// the precedence between a boolean switch and an enum ladder is a rule worth
-// asserting on its own, and this file pulls in no JupyterLab surface.
+// the rule that one launch carries at most one mode is worth asserting on its
+// own, and this file pulls in no JupyterLab surface.
 
 import { ILaunchMode } from './types';
 
 /** A resolved launch mode, with what to call it and whether to warn. */
 export interface IResolvedLaunchMode {
   mode: ILaunchMode;
-  /** What the menu should call it - the value, or the mode's own label. */
+  /** What the menu should call it - the mode's own label. */
   label: string;
   /** Whether this widens what the assistant may do without asking. */
   unsafe: boolean;
@@ -20,11 +20,8 @@ export interface IResolvedLaunchMode {
  *
  * The payload carries at most one mode, because the server maps one token to
  * one flag. `force` wins outright - that is what the menu's variant entries
- * do. Otherwise an enum mode moved off its default takes precedence over any
- * boolean switch: the enum is the explicit statement of intent, so a boolean
- * left on must not silently invert it. A boolean fires only while every enum
- * mode sits at its default. An enum at its default sends nothing - it is what
- * the CLI would do unasked.
+ * do. Otherwise the first switch that is on fires. Every mode is a boolean
+ * skip-approval switch, so "on" always means the same thing.
  */
 export function resolveLaunchMode(
   launchModes: ILaunchMode[],
@@ -35,18 +32,7 @@ export function resolveLaunchMode(
     return force;
   }
   for (const mode of launchModes) {
-    const value = values[mode.id];
-    if (
-      mode.kind !== 'boolean' &&
-      typeof value === 'string' &&
-      value &&
-      value !== mode.default
-    ) {
-      return `${mode.id}=${value}`;
-    }
-  }
-  for (const mode of launchModes) {
-    if (mode.kind === 'boolean' && values[mode.id] === true) {
+    if (values[mode.id] === true) {
       return mode.id;
     }
   }
@@ -71,23 +57,15 @@ export function resolvedLaunchModeEntry(
   if (!token) {
     return null;
   }
-  const [id, value] = token.split('=');
-  const mode = launchModes.find(m => m.id === id);
+  const mode = launchModes.find(m => m.id === token);
   if (!mode) {
     return null;
   }
-  // A boolean mode with a menu label IS the assistant's skip-approval switch;
-  // an enum only widens on the values its provider declared. `plan` resolves
-  // to a mode and is stricter than the default, so "resolved at all" is the
-  // wrong question to ask about danger.
-  const unsafe = value
-    ? (mode.unsafeValues ?? []).indexOf(value) !== -1
-    : !!mode.menuLabel;
-  // Name the VALUE where there is one - three enum values sharing the mode's
-  // title render as one indistinguishable label.
+  // Carrying a menu label IS a boolean mode's declaration that it skips
+  // approval - it is what puts a variant in the menu.
   return {
     mode,
-    label: value ?? mode.menuLabel ?? mode.title,
-    unsafe
+    label: mode.menuLabel ?? mode.title,
+    unsafe: !!mode.menuLabel
   };
 }

package/src/core/panel.ts

@@ -276,11 +276,9 @@ export class AssistantSessionsPanel extends Widget {
   setModes(modes: Record<string, boolean | string>): void {
     this._modes = { ...modes };
     // Menu labels are lazy and re-read this on every open; the button's title
-    // is a written string, so it has to be rewritten here.
+    // is a written string, so it has to be rewritten here. The glyph needs no
+    // such hook - it is always "+", whatever mode is armed (DEF-112).
     this._renameNewButton?.();
-    // Same for its glyph - a menu item re-reads its icon on every open, a
-    // painted button does not.
-    this._repaintNewIcon?.();
   }
 
   setColouredTabs(on: boolean): void {
@@ -344,26 +342,11 @@ export class AssistantSessionsPanel extends Widget {
     // after turning an approval-free mode on (DEF-38).
     this._renameNewButton = nameNewButton;
     nameNewButton();
-    // The glyph follows the same rule the menu entries follow: where a mode
-    // WIDENS what runs without asking, the mode's warning glyph wins over the
-    // action's own (DEF-35). It matters most here - with a mode in force the
-    // variants suppress themselves and this button launches on click, so a
-    // plain "+" would be the only one-click approval-free launch in the panel
-    // wearing no warning at all.
-    const paintNewIcon = (): void => {
-      const icon =
-        (this._visibleVariantCount() === 0 ? this._variantIcon() : undefined) ??
-        addIcon;
-      // `LabIcon.element` appends into the container, so the previous glyph
-      // has to go or the button would collect one svg per settings change.
-      newBtn.replaceChildren();
-      icon.element({ container: newBtn });
-    };
-    // Held for the same reason the title is: the shell is built before
-    // settings arrive, so what is drawn here can only say "no mode in force"
-    // and `setModes` has to repaint it (DEF-38).
-    this._repaintNewIcon = paintNewIcon;
-    paintNewIcon();
+    // The glyph is always "+", whatever mode is armed (DEF-112): the shield
+    // marks the menu ENTRIES that skip approval, while the button that offers
+    // or launches stays neutral - an armed mode is still named in the title
+    // above, so the launch never goes unnamed.
+    addIcon.element({ container: newBtn });
     newBtn.addEventListener('click', () => {
       // With a mode in force the variant items suppress themselves, leaving a
       // dropdown with one entry - two clicks for its only outcome. Do it.
@@ -1928,12 +1911,10 @@ export class AssistantSessionsPanel extends Widget {
     return commandId(this._descriptor.id, action);
   }
 
-  /** Boolean launch modes that produce a menu variant - the assistant's own
+  /** Launch modes that produce a menu variant - the assistant's own
    * skip-approval switch, under the assistant's own name. */
   private get _variantModes(): ILaunchMode[] {
-    return this._descriptor.launchModes.filter(
-      m => m.kind === 'boolean' && !!m.menuLabel
-    );
+    return this._descriptor.launchModes.filter(m => !!m.menuLabel);
   }
 
   /** The launch mode a PLAIN action resolves to right now, or null.
@@ -2656,8 +2637,6 @@ export class AssistantSessionsPanel extends Widget {
   private _newSessionMenu!: Menu;
   /** Re-writes the `+` button's title. Set once the shell exists. */
   private _renameNewButton: (() => void) | null = null;
-  /** Re-draws the `+` button's glyph. Set once the shell exists. */
-  private _repaintNewIcon: (() => void) | null = null;
   private _lastBranches: IBranch[] = [];
   private _lastBranchesCurrent = '';
   private _colouredTabs = true;

package/src/core/types.ts

@@ -27,9 +27,8 @@ export type ForkStrategy = 'native-flag' | 'native-command' | 'server-copy';
 export type ColourSource = 'native' | 'derived' | 'none';
 
 /** One launch-behaviour setting of an assistant, in that assistant's own
- * terminology. `boolean` modes are the unsafe/skip-approval switches: they get
- * a settings toggle (off by default) AND a context-menu launch variant.
- * `enum` modes are settings-only choices passed through on every launch. */
+ * terminology. A launch mode is a boolean skip-approval switch: it gets a
+ * settings toggle (off by default) AND a context-menu launch variant. */
 export interface ILaunchMode {
   /** Settings key under `providers.<id>.` and launch-payload key. Uses the
    * assistant's own terminology, never a normalised core name. */
@@ -38,24 +37,12 @@ export interface ILaunchMode {
   title: string;
   /** Settings description. */
   description: string;
-  kind: 'boolean' | 'enum';
-  /** Allowed values, `enum` modes only. */
-  values?: string[];
-  /** Default value. Boolean modes default to `false` without exception. */
-  default: boolean | string;
+  /** Default value - `false` without exception. */
+  default: boolean;
   /** Menu label for the launch variant this mode produces, e.g.
-   * `Skip Permissions`. Boolean modes only; absent means settings-only. */
+   * `Skip Permissions`. Carrying one IS the mode's declaration that it skips
+   * approval - it is what puts a variant in the menu. */
   menuLabel?: string;
-  /** `enum` modes only: the values that WIDEN what the assistant may do
-   * without asking. The panel warns on these and names the value; every other
-   * value is a settings choice and is marked as one.
-   *
-   * Declared per provider rather than inferred, because "a mode resolved at
-   * all" is not the same question: Gemini's `plan` is read-only - stricter
-   * than the default - and marking it the same as `yolo` says nothing about
-   * either. A boolean mode needs no entry here; carrying a `menuLabel` is
-   * already its declaration that it skips approval. */
-  unsafeValues?: string[];
 }
 
 /** Everything the core needs to know about one assistant. Pure data - no

package/src/providers/claude.ts

@@ -57,7 +57,6 @@ export const descriptor: IProviderDescriptor = {
       title: 'Dangerously skip permissions',
       description:
         'When enabled, newly spawned and resumed sessions are launched with `--dangerously-skip-permissions`. Bypasses every Claude Code permission prompt - only enable in sandboxes you trust.',
-      kind: 'boolean',
       default: false,
       menuLabel: 'Skip Permissions'
     }

package/src/providers/codex.ts

@@ -54,7 +54,6 @@ export const descriptor: IProviderDescriptor = {
       title: 'Bypass Codex approvals and sandbox',
       description:
         'When enabled, newly spawned and resumed sessions are launched with `--dangerously-bypass-approvals-and-sandbox`. Bypasses every Codex approval prompt and sandbox - only enable in environments you trust.',
-      kind: 'boolean',
       default: false,
       menuLabel: 'Bypass Approvals'
     }

package/src/providers/gemini.ts

@@ -32,11 +32,10 @@ const geminiSvgStr = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 65 65
   <path class="jp-icon3" fill="#616161" d="M32.447 0c.68 0 1.273.465 1.439 1.125a38.904 38.904 0 001.999 5.905c2.152 5 5.105 9.376 8.854 13.125 3.751 3.75 8.126 6.703 13.125 8.855a38.98 38.98 0 005.906 1.999c.66.166 1.124.758 1.124 1.438 0 .68-.464 1.273-1.125 1.439a38.902 38.902 0 00-5.905 1.999c-5 2.152-9.375 5.105-13.125 8.854-3.749 3.751-6.702 8.126-8.854 13.125a38.973 38.973 0 00-2 5.906 1.485 1.485 0 01-1.438 1.124c-.68 0-1.272-.464-1.438-1.125a38.913 38.913 0 00-2-5.905c-2.151-5-5.103-9.375-8.854-13.125-3.75-3.749-8.125-6.702-13.125-8.854a38.973 38.973 0 00-5.905-2A1.485 1.485 0 010 32.448c0-.68.465-1.272 1.125-1.438a38.903 38.903 0 005.905-2c5-2.151 9.376-5.104 13.125-8.854 3.75-3.749 6.703-8.125 8.855-13.125a38.972 38.972 0 001.999-5.905A1.485 1.485 0 0132.447 0z"/>
 </svg>`;
 
-// Gemini's own names for its two launch surfaces. Kept in the assistant's
-// terminology rather than normalised, because each is both the settings key
+// Gemini's own name for its approval switch. Kept in the assistant's
+// terminology rather than normalised, because it is both the settings key
 // under `providers.gemini.` and the mode token the server maps to a CLI flag.
 const YOLO_MODE = 'yoloMode';
-const APPROVAL_MODE = 'approvalMode';
 
 export const descriptor: IProviderDescriptor = {
   id: 'gemini',
@@ -60,20 +59,8 @@ export const descriptor: IProviderDescriptor = {
       title: 'YOLO mode',
       description:
         'When enabled, newly spawned and resumed sessions are launched with `--yolo`. Gemini auto-approves every tool call without asking - only enable in workspaces you trust.',
-      kind: 'boolean',
       default: false,
       menuLabel: 'YOLO'
-    },
-    {
-      id: APPROVAL_MODE,
-      title: 'Approval mode',
-      description:
-        'Approval ladder passed as `--approval-mode` when set to a value other than the default. A non-default value here takes precedence over the YOLO switch; only the forced YOLO menu action overrides it. `default` prompts for approval, `auto_edit` auto-approves edit tools, `yolo` auto-approves every tool, `plan` is read-only.',
-      kind: 'enum',
-      values: ['default', 'auto_edit', 'yolo', 'plan'],
-      default: 'default',
-      // `plan` is read-only and `default` prompts, so neither widens anything.
-      unsafeValues: ['auto_edit', 'yolo']
     }
   ],
   hasRemoteControl: false,

package/src/providers/kimi.ts

@@ -135,7 +135,6 @@ export const descriptor: IProviderDescriptor = {
       title: 'YOLO mode',
       description:
         'When enabled, newly spawned and resumed sessions are launched with `--yolo`. Kimi auto-approves regular tool calls without asking - only enable in workspaces you trust.',
-      kind: 'boolean',
       default: false,
       menuLabel: 'YOLO'
     }