jupyterlab_ai_code_assistants_extension 1.0.10 → 1.0.19

package/lib/core/icons.d.ts

@@ -3,7 +3,7 @@ export declare const assistantsIcon: LabIcon;
 export declare const starFilledIcon: LabIcon;
 export declare const refreshIcon: LabIcon;
 export declare const removeIcon: LabIcon;
-export declare const warningIcon: LabIcon;
+export declare const shieldIcon: LabIcon;
 export declare const addIcon: LabIcon;
 export declare const branchIcon: LabIcon;
 export declare const switchIcon: LabIcon;

package/lib/core/icons.js

@@ -37,21 +37,23 @@ export const removeIcon = new LabIcon({
     name: `${ICON_PREFIX}:remove`,
     svgstr: removeSvgStr
 });
-// Marks the unsafe launch variants. A shield reads as "protected", which is
-// the inverse of what these entries do, so the caution triangle carries them
-// instead. Material "warning" outline.
+// Marks the unsafe launch variants. The shield is the established marker for
+// an action that touches the permission system (the UAC pattern), and it is
+// what the reference implementation used; Material "shield" half-fill, kept
+// per user direction 2026-08-11 over the earlier caution triangle.
 //
 // 16x16 and `jp-icon-warn0`, like every other icon in these menus and unlike
 // them in colour: authored at 13x13 in `jp-icon3` it rendered smaller than
 // its neutral siblings AND in the identical grey, measured rgb(97,97,97) in
 // the light theme and rgb(189,189,189) in the dark one - the one glyph whose
-// whole job is to say "this differs" was the least conspicuous in the menu.
-const warningSvgStr = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="16" height="16">
-  <path class="jp-icon-warn0" fill="#f57c00" d="M1 21h22L12 2 1 21zm12-3h-2v-2h2v2zm0-4h-2v-4h2v4z"/>
+// whole job is to say "this differs" was the least conspicuous in the menu
+// (DEF-40, and the reason the reference's 13x13 grey is not copied verbatim).
+const shieldSvgStr = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="16" height="16">
+  <path class="jp-icon-warn0" fill="#f57c00" d="M12 1L3 5v6c0 5.55 3.84 10.74 9 12 5.16-1.26 9-6.45 9-12V5l-9-4zm0 10.99h7c-.53 4.12-3.28 7.79-7 8.94V12H5V6.3l7-3.11v8.8z"/>
 </svg>`;
-export const warningIcon = new LabIcon({
-    name: `${ICON_PREFIX}:warning`,
-    svgstr: warningSvgStr
+export const shieldIcon = new LabIcon({
+    name: `${ICON_PREFIX}:shield`,
+    svgstr: shieldSvgStr
 });
 const addSvgStr = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="16" height="16">
   <path class="jp-icon3" fill="#616161" d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>

package/lib/core/limits.d.ts

@@ -0,0 +1,12 @@
+/** The ONE home for the Recent section's size bounds. `src/core/panel.ts`
+ * clamps with them, `src/index.ts` defaults with them, and
+ * `scripts/generate-schema.mjs` writes them into `schema/plugin.json`, so a
+ * change here is the only change needed.
+ *
+ * Keep this module import-free. The schema generator loads the compiled
+ * `lib/core/limits.js` under plain Node, exactly as it loads the provider
+ * barrel; a single browser-only import would break that.
+ */
+export declare const DEFAULT_RECENT_LIMIT = 10;
+export declare const MIN_RECENT_LIMIT = 1;
+export declare const MAX_RECENT_LIMIT = 100;

package/lib/core/limits.js

@@ -0,0 +1,12 @@
+/** The ONE home for the Recent section's size bounds. `src/core/panel.ts`
+ * clamps with them, `src/index.ts` defaults with them, and
+ * `scripts/generate-schema.mjs` writes them into `schema/plugin.json`, so a
+ * change here is the only change needed.
+ *
+ * Keep this module import-free. The schema generator loads the compiled
+ * `lib/core/limits.js` under plain Node, exactly as it loads the provider
+ * barrel; a single browser-only import would break that.
+ */
+export const DEFAULT_RECENT_LIMIT = 10;
+export const MIN_RECENT_LIMIT = 1;
+export const MAX_RECENT_LIMIT = 100;

package/lib/core/panel.d.ts

@@ -5,13 +5,6 @@ import { IColourfulTabs } from 'jupyterlab_colourful_tab_extension';
 import { Message } from '@lumino/messaging';
 import { Widget } from '@lumino/widgets';
 import { IProviderDescriptor, IProviderHooks } from './types';
-/** Default and bounds for the Recent section's size. Exported because
- * `src/index.ts` reads the same setting and used to restate all three as
- * literals; `schema/plugin.json` declares the identical default, minimum and
- * maximum, so a change here is a change there. */
-export declare const DEFAULT_RECENT_LIMIT = 10;
-export declare const MIN_RECENT_LIMIT = 1;
-export declare const MAX_RECENT_LIMIT = 100;
 export type PresentationMode = 'name' | 'path';
 export declare const DEFAULT_PRESENTATION_MODE: PresentationMode;
 /** Widget id for one provider's panel - what the layout restorer keys on. */
@@ -68,6 +61,10 @@ export declare class AssistantSessionsPanel extends Widget {
     /** Inline, per-panel error. One provider's unreachable server must leave the
      * other panels alone, so nothing here is modal. */
     private _setInlineError;
+    /** A polled or refreshed fetch failed. Only these two paths own a retry, so
+     * only they may promise one. DEF-81: a client-side timeout means the server
+     * was REACHED and did not answer in time, which is a different thing to
+     * report than a server that is gone. */
     private _showError;
     /** A one-shot action failed. Nothing retries it, so the copy names what did
      * not happen instead of promising a retry the poll loop alone performs. */

package/lib/core/panel.js

@@ -4,11 +4,12 @@ import { CommandRegistry } from '@lumino/commands';
 import { UUID } from '@lumino/coreutils';
 import { Widget } from '@lumino/widgets';
 import { ColourStore } from './colour';
-import { addIcon, branchIcon, filterIcon, providerIcon, refreshIcon, removeIcon, starFilledIcon, switchIcon, warningIcon } from './icons';
+import { addIcon, branchIcon, filterIcon, providerIcon, refreshIcon, removeIcon, shieldIcon, starFilledIcon, switchIcon } from './icons';
+import { DEFAULT_RECENT_LIMIT, MAX_RECENT_LIMIT, MIN_RECENT_LIMIT } from './limits';
 import { resolveLaunchMode, resolvedLaunchModeEntry } from './modes';
 import { showManageSessionsPopup } from './popup';
 import { LOG_PREFIX } from './registry';
-import { isResponseStatus, requestProvider, withQuery } from './request';
+import { isRequestTimeout, isResponseStatus, requestProvider, withQuery } from './request';
 import { TerminalManager } from './terminals';
 // Rows refresh on this cadence. It is also what refreshes whatever roster the
 // server caches for the context menu, so raising it past the server's cache
@@ -33,13 +34,6 @@ const REFRESH_SPIN_FLOOR_MS = 500;
 // faster cadence (bounded) so a new branch surfaces in seconds.
 const BRANCH_WATCH_INTERVAL_MS = 2000;
 const BRANCH_WATCH_MAX_ATTEMPTS = 90; // ~3 minutes
-/** Default and bounds for the Recent section's size. Exported because
- * `src/index.ts` reads the same setting and used to restate all three as
- * literals; `schema/plugin.json` declares the identical default, minimum and
- * maximum, so a change here is a change there. */
-export const DEFAULT_RECENT_LIMIT = 10;
-export const MIN_RECENT_LIMIT = 1;
-export const MAX_RECENT_LIMIT = 100;
 /** Conversations listed inline in a branch submenu before the popup takes over. */
 const INLINE_BRANCH_LIMIT = 5;
 export const DEFAULT_PRESENTATION_MODE = 'name';
@@ -528,10 +522,17 @@ export class AssistantSessionsPanel extends Widget {
         this._errorEl.textContent = message !== null && message !== void 0 ? message : '';
         this._errorEl.hidden = !message;
     }
+    /** A polled or refreshed fetch failed. Only these two paths own a retry, so
+     * only they may promise one. DEF-81: a client-side timeout means the server
+     * was REACHED and did not answer in time, which is a different thing to
+     * report than a server that is gone. */
     _showError(err) {
         const message = err instanceof Error ? err.message : String(err);
         this._logError(message);
-        this._setInlineError(`Could not reach the server - retrying. ${message}`);
+        const copy = isRequestTimeout(err)
+            ? 'The server is not answering - retrying.'
+            : 'Could not reach the server - retrying.';
+        this._setInlineError(`${copy} ${message}`);
     }
     /** A one-shot action failed. Nothing retries it, so the copy names what did
      * not happen instead of promising a retry the poll loop alone performs. */
@@ -704,7 +705,6 @@ export class AssistantSessionsPanel extends Widget {
             bar.remove();
             message.classList.add('jp-AiAssistantsPanel-cleanupError');
             message.textContent = `Cleanup failed: ${err instanceof Error ? err.message : String(err)}`;
-            this._showError(err);
         }
     }
     // ---------------------------------------------------------------- launch
@@ -790,7 +790,7 @@ export class AssistantSessionsPanel extends Widget {
         }
         const parentColour = this._terminals.colourFor(session);
         let name;
-        if (this._descriptor.namingStrategy !== 'none') {
+        if (this._descriptor.promptsForBranchName) {
             const named = await InputDialog.getText({
                 title: 'Branch Session',
                 label: 'Name for the new session',
@@ -872,6 +872,18 @@ export class AssistantSessionsPanel extends Widget {
      * answers with the new id, so the branch exists before the terminal opens
      * and one refresh surfaces it - no watcher needed. */
     async _branchByServerCopy(session, name, force) {
+        // Let the parent's colour settle before the server reads it (DEF-74). The
+        // server copies the store entry while minting the fork, so a colour picked
+        // on the parent's tab moments earlier - still queued in this store's
+        // request chain, unsent - is not in the server's store yet and the branch
+        // is born wearing the PREVIOUS tint. Same gate as `_inheritColour`
+        // (DEF-31): a reload is a queued request like every other of this store's
+        // (DEF-30), so it is not sent until the capture ahead of it has been
+        // answered, and awaiting it is what makes the server's read fresh. Only
+        // inside the capture window, so an ordinary fork still costs no request.
+        if (this._colours.isPending(session.session_id)) {
+            await this._colours.load();
+        }
         try {
             const fork = await requestProvider(this._descriptor.id, 'branch', this._serverSettings, {
                 method: 'POST',
@@ -1679,7 +1691,7 @@ export class AssistantSessionsPanel extends Widget {
     /** The glyph, only where the mode WIDENS what runs without asking. */
     _variantIcon() {
         var _a;
-        return ((_a = this._resolvedVariant()) === null || _a === void 0 ? void 0 : _a.unsafe) ? warningIcon : undefined;
+        return ((_a = this._resolvedVariant()) === null || _a === void 0 ? void 0 : _a.unsafe) ? shieldIcon : undefined;
     }
     _setupCommands() {
         this._commands = new CommandRegistry();
@@ -1704,7 +1716,7 @@ export class AssistantSessionsPanel extends Widget {
                 const verb = (_c = (_b = (_a = this._hooks).resumeLabel) === null || _b === void 0 ? void 0 : _b.call(_a, active())) !== null && _c !== void 0 ? _c : 'Resume';
                 return variant ? `${verb} (${variant.label})` : verb;
             },
-            icon: () => { var _a; return (((_a = this._resumeVariant()) === null || _a === void 0 ? void 0 : _a.unsafe) ? warningIcon : undefined); },
+            icon: () => { var _a; return (((_a = this._resumeVariant()) === null || _a === void 0 ? void 0 : _a.unsafe) ? shieldIcon : undefined); },
             execute: () => {
                 const s = active();
                 if (s) {
@@ -1715,7 +1727,7 @@ export class AssistantSessionsPanel extends Widget {
         for (const mode of this._variantModes) {
             this._commands.addCommand(this._cmd(`resume-${mode.id}`), {
                 label: `Resume (${mode.menuLabel})`,
-                icon: warningIcon,
+                icon: shieldIcon,
                 // Absent while the plain item already resolves to this same mode - it
                 // would be a second entry building an identical launch.
                 isVisible: () => !this._buildsSameLaunch(mode),
@@ -1732,13 +1744,13 @@ export class AssistantSessionsPanel extends Widget {
             });
             this._commands.addCommand(this._cmd(`new-session-${mode.id}`), {
                 label: `New ${this._descriptor.label} Session (${mode.menuLabel})`,
-                icon: warningIcon,
+                icon: shieldIcon,
                 isVisible: () => !this._buildsSameLaunch(mode),
                 execute: () => void this._newSession(mode.id)
             });
             this._commands.addCommand(this._cmd(`branch-session-${mode.id}`), {
                 label: mode.menuLabel,
-                icon: warningIcon,
+                icon: shieldIcon,
                 isVisible: () => !this._buildsSameLaunch(mode),
                 execute: () => void this._branchSession(mode.id)
             });
@@ -1761,7 +1773,7 @@ export class AssistantSessionsPanel extends Widget {
                 }
                 this._app.commands
                     .execute('terminal:create-new', { cwd: rel })
-                    .catch(err => this._showError(err));
+                    .catch(err => this._showActionError('Could not open a terminal for this session - try again.', err));
             }
         });
         this._commands.addCommand(this._cmd('show-in-filebrowser'), {
@@ -1779,7 +1791,7 @@ export class AssistantSessionsPanel extends Widget {
                 }
                 this._app.commands
                     .execute('filebrowser:go-to-path', { path: rel })
-                    .catch(err => this._showError(err));
+                    .catch(err => this._showActionError('Could not open the project folder - try again.', err));
             }
         });
         this._commands.addCommand(this._cmd('copy-path'), {
@@ -1828,7 +1840,7 @@ export class AssistantSessionsPanel extends Widget {
             // separator was added to protect, and both delete history that cannot be
             // recovered; leaving this one bare made the pair read as one dangerous
             // item beside an ordinary one (DEF-45).
-            icon: warningIcon,
+            icon: shieldIcon,
             isVisible: () => { var _a, _b; return ((_b = (_a = active()) === null || _a === void 0 ? void 0 : _a.extra_sessions) !== null && _b !== void 0 ? _b : 0) > 0; },
             execute: () => {
                 const s = active();
@@ -1897,7 +1909,7 @@ export class AssistantSessionsPanel extends Widget {
             // danger everywhere else in this menu - spending it on a branch glyph
             // left `Branch Session (Skip Permissions)` looking exactly as safe as
             // Show in File Browser while `Resume (Skip Permissions)` beside it wore
-            // the triangle. The branch glyph is the fallback, not the winner.
+            // the shield. The branch glyph is the fallback, not the winner.
             icon: () => {
                 var _a;
                 return (_a = this._variantIcon()) !== null && _a !== void 0 ? _a : (this._visibleVariantCount() === 0 ? branchIcon : undefined);

package/lib/core/types.d.ts

@@ -18,13 +18,6 @@ export type ForkStrategy = 'native-flag' | 'native-command' | 'server-copy';
 /** Where a conversation's DEFAULT tab tint comes from. A user-set colour in
  * the extension's own write-back store always wins over all three. */
 export type ColourSource = 'native' | 'derived' | 'none';
-/** Who owns a branched conversation's name.
- *
- * - `launch-flag` - the CLI is told the name at launch and stamps it itself
- * - `server-side` - the server writes the name into the copied store entry
- * - `none` - the assistant has no naming surface, so no name is asked for
- */
-export type NamingStrategy = 'launch-flag' | 'server-side' | '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.
@@ -76,7 +69,9 @@ export interface IProviderDescriptor {
     cliBinary: string;
     forkStrategy: ForkStrategy;
     colourSource: ColourSource;
-    namingStrategy: NamingStrategy;
+    /** Whether the branch flow asks the user to name the new conversation.
+     * Where that name then GOES is `forkStrategy`'s job. */
+    promptsForBranchName: boolean;
     /** The CLI starts a brand-new conversation under an id we give it, so a
      * fresh session is identifiable from its argv on the first poll instead of
      * being an unknown terminal until it writes its store entry. Independent of
@@ -211,7 +206,7 @@ export interface ILaunchRequest {
     fork_session_id?: string;
     /** Parent conversation to fork from (`forkStrategy: 'native-command'`). */
     fork_from?: string;
-    /** Name to stamp on the new conversation (`namingStrategy: 'launch-flag'`). */
+    /** Name to stamp on the new conversation (`promptsForBranchName: true`). */
     name?: string;
     /** The launch mode this action runs under, as one token in the assistant's
      * own terminology: a boolean mode is its bare `ILaunchMode.id`, an enum mode

package/lib/index.js

@@ -4,7 +4,8 @@ import { IDefaultFileBrowser } from '@jupyterlab/filebrowser';
 import { ISettingRegistry } from '@jupyterlab/settingregistry';
 import { ITerminalTracker } from '@jupyterlab/terminal';
 import { IColourfulTabs } from 'jupyterlab_colourful_tab_extension';
-import { AssistantSessionsPanel, DEFAULT_PRESENTATION_MODE, DEFAULT_RECENT_LIMIT, commandId, panelWidgetId } from './core/panel';
+import { DEFAULT_RECENT_LIMIT } from './core/limits';
+import { AssistantSessionsPanel, DEFAULT_PRESENTATION_MODE, commandId, panelWidgetId } from './core/panel';
 import { LOG_PREFIX, ProviderRegistry } from './core/registry';
 import { requestAPI } from './core/request';
 import { PROVIDERS } from './providers';

package/lib/providers/claude.js

@@ -45,7 +45,7 @@ export const descriptor = {
     // `-n <name>` at launch: Claude stamps the name itself and re-stamps it on
     // every turn, which is the only way a fork's name survives - a title written
     // after the fact loses to the parent title the fork inherits.
-    namingStrategy: 'launch-flag',
+    promptsForBranchName: true,
     mintsNewSessionId: true,
     launchModes: [
         {

package/lib/providers/codex.js

@@ -40,7 +40,7 @@ export const descriptor = {
     colourSource: 'none',
     // Forks are unnamed - Codex has no naming flag and no writable title field,
     // so the panel never asks for a name it could not stamp anywhere.
-    namingStrategy: 'none',
+    promptsForBranchName: false,
     // A bare `codex` mints its own thread id; there is no `--session-id`.
     mintsNewSessionId: false,
     launchModes: [

package/lib/providers/gemini.js

@@ -9,9 +9,9 @@
 // * `colourSource: 'none'` - no colour command, and nothing in the chat store
 //   records one, so a tab tint only ever comes from the extension's own
 //   write-back store
-// * `namingStrategy: 'server-side'` - a fork's name is stamped into the copied
-//   chat file's `summary`, which is the field the CLI itself displays a
-//   conversation under; there is no naming flag to pass it to
+// * `promptsForBranchName: true` - the branch flow asks for a name, which the
+//   server stamps into the copied chat file's `summary`, the field the CLI
+//   itself displays a conversation under; there is no naming flag to pass it to
 // * `mintsNewSessionId: true` - `--session-id <uuid>` starts a fresh
 //   conversation under an id we chose, so a new session is identifiable from
 //   its argv on the first poll instead of being an unknown terminal
@@ -46,7 +46,7 @@ export const descriptor = {
     colourSource: 'none',
     // The fork's name is written into the copy by the server; the CLI has no
     // naming flag to take it.
-    namingStrategy: 'server-side',
+    promptsForBranchName: true,
     // `--session-id <uuid>` starts a conversation under an id we mint.
     mintsNewSessionId: true,
     launchModes: [

package/lib/providers/kimi.js

@@ -9,8 +9,8 @@
 // * `colourSource: 'derived'` - kimi has no `/color`, so the default tint is a
 //   stable hash of the conversation id (a user-set colour still wins, per the
 //   Colour section of the acceptance criteria)
-// * `namingStrategy: 'server-side'` - the name is stamped into the copied
-//   `state.json`, not passed to the CLI
+// * `promptsForBranchName: true` - the branch flow asks for a name, which the
+//   server stamps into the copied `state.json`, not passed to the CLI
 // * one launch mode, `--yolo`, under kimi's own name
 //
 // The only hook is the branch label: kimi's conversation titles are
@@ -112,7 +112,7 @@ export const descriptor = {
     colourSource: 'derived',
     // The fork's name is written into the copy's `state.json` by the server; the
     // CLI has no naming flag to take it.
-    namingStrategy: 'server-side',
+    promptsForBranchName: true,
     // A bare `kimi` mints its own id and writes it on the first turn, and `-S`
     // only ever resumes - so a new conversation cannot be launched under an id
     // we chose, and is identified from the store on the next poll instead.

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "jupyterlab_ai_code_assistants_extension",
-    "version": "1.0.10",
+    "version": "1.0.19",
     "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/src/__tests__/core-neutrality.spec.ts

@@ -84,7 +84,12 @@ const CORE_DIR = path.resolve(__dirname, '..', 'core');
 /** Drop block and line comments, leaving code and string literals. */
 function stripComments(source: string): string {
   return source
-    .replace(/\/\*[\s\S]*?\*\//g, '')
+    .replace(/\/\*[\s\S]*?\*\//g, match =>
+      // DEF-80: keep the comment's newlines, or every line after a block
+      // comment is reported at the wrong number - the licence header alone
+      // shifts a real violation by the length of the header.
+      '\n'.repeat((match.match(/\n/g) ?? []).length)
+    )
     .replace(/^[^\n]*?\/\/.*$/gm, line =>
       // Keep the part before a trailing `//`, so code on a commented line is
       // still scanned - but drop a whole-line comment entirely.
@@ -200,4 +205,14 @@ describe('the comment-stripping the scan relies on', () => {
       ASSISTANT_NAMES
     );
   });
+
+  it('reports a violation at its real line number, past a block comment', () => {
+    // DEF-80: the block comment used to be replaced by nothing, so every line
+    // after it was reported short by the comment's height - a violation under
+    // a header comment pointed at unrelated code.
+    const source = `/**\n * ported\n * from a comment\n */\nconst id = 'claude';`;
+    expect(offenders(source, ASSISTANT_NAMES)).toEqual([
+      [5, "const id = 'claude';"]
+    ]);
+  });
 });

package/src/__tests__/panel.spec.ts

@@ -42,7 +42,7 @@ jest.mock('../core/request', () => ({
 }));
 
 import { TAB_COLOUR_IDS, fnv1aColour } from '../core/colour';
-import { addIcon, branchIcon, warningIcon } from '../core/icons';
+import { addIcon, branchIcon, shieldIcon } from '../core/icons';
 import { AssistantSessionsPanel, commandId } from '../core/panel';
 import { requestProvider } from '../core/request';
 import { IProviderDescriptor, ISession } from '../core/types';
@@ -59,7 +59,7 @@ const DESCRIPTOR: IProviderDescriptor = {
   cliBinary: 'testbed',
   forkStrategy: 'native-flag',
   colourSource: 'derived',
-  namingStrategy: 'launch-flag',
+  promptsForBranchName: true,
   mintsNewSessionId: true,
   launchModes: [
     {
@@ -284,7 +284,7 @@ describe('the + button names and marks the launch it performs', () => {
     expect(glyphs()).toEqual([addIcon.name]);
     panel.setModes({ skip: true });
     expect((panel as any)._visibleVariantCount()).toEqual(0);
-    expect(glyphs()).toEqual([warningIcon.name]);
+    expect(glyphs()).toEqual([shieldIcon.name]);
     // `LabIcon.element` appends, so a button that is not cleared collects one
     // svg per settings change.
     panel.setModes({ skip: false });
@@ -314,7 +314,7 @@ describe('DEF-35 / DEF-39 - the branch entry with no visible variants', () => {
     panel.setModes({ skip: true });
     // The suffix names the mode in words, but the icon slot is what marks
     // danger everywhere else in this menu.
-    expect(cmds(panel).icon(id(panel, 'branch-session'), {})).toBe(warningIcon);
+    expect(cmds(panel).icon(id(panel, 'branch-session'), {})).toBe(shieldIcon);
   });
 
   it('goes back to naming the launch alone while the variants render', () => {
@@ -354,7 +354,7 @@ describe('DEF-40 - the warning glyph is sized and coloured to stand out', () =>
   it('renders at 16x16, like its neutral siblings', () => {
     // Authored at 13x13 it rendered SMALLER than every icon beside it - the one
     // glyph whose job is to say "this differs" was also the least visible.
-    for (const icon of [warningIcon, addIcon, branchIcon]) {
+    for (const icon of [shieldIcon, addIcon, branchIcon]) {
       const el = svg(icon.svgstr);
       expect([
         icon.name,
@@ -365,11 +365,11 @@ describe('DEF-40 - the warning glyph is sized and coloured to stand out', () =>
   });
 
   it('paints in jp-icon-warn0 and not the neutral grey', () => {
-    // `jp-icon3` is the theme's neutral: in it the triangle measured the same
+    // `jp-icon3` is the theme's neutral: in it the glyph measured the same
     // rgb(97,97,97) as the icons it was supposed to differ from.
-    const path = svg(warningIcon.svgstr).querySelector('path')!;
+    const path = svg(shieldIcon.svgstr).querySelector('path')!;
     expect(path.getAttribute('class')).toEqual('jp-icon-warn0');
-    expect(warningIcon.svgstr).not.toContain('jp-icon3');
+    expect(shieldIcon.svgstr).not.toContain('jp-icon3');
   });
 });
 
@@ -380,7 +380,7 @@ describe('DEF-45 - both destructive menu entries are marked alike', () => {
     const commands = (panel as any)._commands;
     expect(
       commands.icon(commandId(DESCRIPTOR.id, 'cleanup-parallel'), {})
-    ).toBe(warningIcon);
+    ).toBe(shieldIcon);
     expect(commands.icon(commandId(DESCRIPTOR.id, 'remove'), {})).toBeDefined();
   });
 });

package/src/__tests__/registry.spec.ts

@@ -17,7 +17,6 @@ const EXPECTED_IDS = ['claude', 'codex', 'kimi', 'gemini'];
 
 const FORK_STRATEGIES = ['native-flag', 'native-command', 'server-copy'];
 const COLOUR_SOURCES = ['native', 'derived', 'none'];
-const NAMING_STRATEGIES = ['launch-flag', 'server-side', 'none'];
 
 function stub(id: string): IProviderModule {
   return {
@@ -30,7 +29,7 @@ function stub(id: string): IProviderModule {
       cliBinary: id,
       forkStrategy: 'server-copy',
       colourSource: 'none',
-      namingStrategy: 'none',
+      promptsForBranchName: false,
       mintsNewSessionId: false,
       launchModes: [],
       hasRemoteControl: false,
@@ -65,7 +64,7 @@ describe('the providers barrel', () => {
       expect(descriptor.iconSvg).toContain('<svg');
       expect(FORK_STRATEGIES).toContain(descriptor.forkStrategy);
       expect(COLOUR_SOURCES).toContain(descriptor.colourSource);
-      expect(NAMING_STRATEGIES).toContain(descriptor.namingStrategy);
+      expect(typeof descriptor.promptsForBranchName).toBe('boolean');
       expect(typeof descriptor.mintsNewSessionId).toBe('boolean');
       expect(typeof descriptor.hasRemoteControl).toBe('boolean');
       expect(typeof descriptor.hasBgAgents).toBe('boolean');

package/src/core/icons.ts

@@ -48,22 +48,24 @@ export const removeIcon = new LabIcon({
   svgstr: removeSvgStr
 });
 
-// Marks the unsafe launch variants. A shield reads as "protected", which is
-// the inverse of what these entries do, so the caution triangle carries them
-// instead. Material "warning" outline.
+// Marks the unsafe launch variants. The shield is the established marker for
+// an action that touches the permission system (the UAC pattern), and it is
+// what the reference implementation used; Material "shield" half-fill, kept
+// per user direction 2026-08-11 over the earlier caution triangle.
 //
 // 16x16 and `jp-icon-warn0`, like every other icon in these menus and unlike
 // them in colour: authored at 13x13 in `jp-icon3` it rendered smaller than
 // its neutral siblings AND in the identical grey, measured rgb(97,97,97) in
 // the light theme and rgb(189,189,189) in the dark one - the one glyph whose
-// whole job is to say "this differs" was the least conspicuous in the menu.
-const warningSvgStr = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="16" height="16">
-  <path class="jp-icon-warn0" fill="#f57c00" d="M1 21h22L12 2 1 21zm12-3h-2v-2h2v2zm0-4h-2v-4h2v4z"/>
+// whole job is to say "this differs" was the least conspicuous in the menu
+// (DEF-40, and the reason the reference's 13x13 grey is not copied verbatim).
+const shieldSvgStr = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="16" height="16">
+  <path class="jp-icon-warn0" fill="#f57c00" d="M12 1L3 5v6c0 5.55 3.84 10.74 9 12 5.16-1.26 9-6.45 9-12V5l-9-4zm0 10.99h7c-.53 4.12-3.28 7.79-7 8.94V12H5V6.3l7-3.11v8.8z"/>
 </svg>`;
 
-export const warningIcon = new LabIcon({
-  name: `${ICON_PREFIX}:warning`,
-  svgstr: warningSvgStr
+export const shieldIcon = new LabIcon({
+  name: `${ICON_PREFIX}:shield`,
+  svgstr: shieldSvgStr
 });
 
 const addSvgStr = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="16" height="16">

package/src/core/limits.ts

@@ -0,0 +1,12 @@
+/** The ONE home for the Recent section's size bounds. `src/core/panel.ts`
+ * clamps with them, `src/index.ts` defaults with them, and
+ * `scripts/generate-schema.mjs` writes them into `schema/plugin.json`, so a
+ * change here is the only change needed.
+ *
+ * Keep this module import-free. The schema generator loads the compiled
+ * `lib/core/limits.js` under plain Node, exactly as it loads the provider
+ * barrel; a single browser-only import would break that.
+ */
+export const DEFAULT_RECENT_LIMIT = 10;
+export const MIN_RECENT_LIMIT = 1;
+export const MAX_RECENT_LIMIT = 100;

package/src/core/panel.ts

@@ -30,10 +30,15 @@ import {
   providerIcon,
   refreshIcon,
   removeIcon,
+  shieldIcon,
   starFilledIcon,
-  switchIcon,
-  warningIcon
+  switchIcon
 } from './icons';
+import {
+  DEFAULT_RECENT_LIMIT,
+  MAX_RECENT_LIMIT,
+  MIN_RECENT_LIMIT
+} from './limits';
 import {
   IResolvedLaunchMode,
   resolveLaunchMode,
@@ -41,7 +46,12 @@ import {
 } from './modes';
 import { showManageSessionsPopup } from './popup';
 import { LOG_PREFIX } from './registry';
-import { isResponseStatus, requestProvider, withQuery } from './request';
+import {
+  isRequestTimeout,
+  isResponseStatus,
+  requestProvider,
+  withQuery
+} from './request';
 import { TerminalManager } from './terminals';
 import {
   IBranch,
@@ -83,13 +93,6 @@ const REFRESH_SPIN_FLOOR_MS = 500;
 // faster cadence (bounded) so a new branch surfaces in seconds.
 const BRANCH_WATCH_INTERVAL_MS = 2_000;
 const BRANCH_WATCH_MAX_ATTEMPTS = 90; // ~3 minutes
-/** Default and bounds for the Recent section's size. Exported because
- * `src/index.ts` reads the same setting and used to restate all three as
- * literals; `schema/plugin.json` declares the identical default, minimum and
- * maximum, so a change here is a change there. */
-export const DEFAULT_RECENT_LIMIT = 10;
-export const MIN_RECENT_LIMIT = 1;
-export const MAX_RECENT_LIMIT = 100;
 /** Conversations listed inline in a branch submenu before the popup takes over. */
 const INLINE_BRANCH_LIMIT = 5;
 
@@ -601,10 +604,17 @@ export class AssistantSessionsPanel extends Widget {
     this._errorEl.hidden = !message;
   }
 
+  /** A polled or refreshed fetch failed. Only these two paths own a retry, so
+   * only they may promise one. DEF-81: a client-side timeout means the server
+   * was REACHED and did not answer in time, which is a different thing to
+   * report than a server that is gone. */
   private _showError(err: unknown): void {
     const message = err instanceof Error ? err.message : String(err);
     this._logError(message);
-    this._setInlineError(`Could not reach the server - retrying. ${message}`);
+    const copy = isRequestTimeout(err)
+      ? 'The server is not answering - retrying.'
+      : 'Could not reach the server - retrying.';
+    this._setInlineError(`${copy} ${message}`);
   }
 
   /** A one-shot action failed. Nothing retries it, so the copy names what did
@@ -815,7 +825,6 @@ export class AssistantSessionsPanel extends Widget {
       message.textContent = `Cleanup failed: ${
         err instanceof Error ? err.message : String(err)
       }`;
-      this._showError(err);
     }
   }
 
@@ -916,7 +925,7 @@ export class AssistantSessionsPanel extends Widget {
     const parentColour = this._terminals.colourFor(session);
 
     let name: string | undefined;
-    if (this._descriptor.namingStrategy !== 'none') {
+    if (this._descriptor.promptsForBranchName) {
       const named = await InputDialog.getText({
         title: 'Branch Session',
         label: 'Name for the new session',
@@ -1019,6 +1028,18 @@ export class AssistantSessionsPanel extends Widget {
     name: string | undefined,
     force: string | undefined
   ): Promise<void> {
+    // Let the parent's colour settle before the server reads it (DEF-74). The
+    // server copies the store entry while minting the fork, so a colour picked
+    // on the parent's tab moments earlier - still queued in this store's
+    // request chain, unsent - is not in the server's store yet and the branch
+    // is born wearing the PREVIOUS tint. Same gate as `_inheritColour`
+    // (DEF-31): a reload is a queued request like every other of this store's
+    // (DEF-30), so it is not sent until the capture ahead of it has been
+    // answered, and awaiting it is what makes the server's read fresh. Only
+    // inside the capture window, so an ordinary fork still costs no request.
+    if (this._colours.isPending(session.session_id)) {
+      await this._colours.load();
+    }
     try {
       const fork = await requestProvider<IForkResponse>(
         this._descriptor.id,
@@ -1975,7 +1996,7 @@ export class AssistantSessionsPanel extends Widget {
 
   /** The glyph, only where the mode WIDENS what runs without asking. */
   private _variantIcon(): LabIcon | undefined {
-    return this._resolvedVariant()?.unsafe ? warningIcon : undefined;
+    return this._resolvedVariant()?.unsafe ? shieldIcon : undefined;
   }
 
   private _setupCommands(): void {
@@ -2003,7 +2024,7 @@ export class AssistantSessionsPanel extends Widget {
         const verb = this._hooks.resumeLabel?.(active()) ?? 'Resume';
         return variant ? `${verb} (${variant.label})` : verb;
       },
-      icon: () => (this._resumeVariant()?.unsafe ? warningIcon : undefined),
+      icon: () => (this._resumeVariant()?.unsafe ? shieldIcon : undefined),
       execute: () => {
         const s = active();
         if (s) {
@@ -2015,7 +2036,7 @@ export class AssistantSessionsPanel extends Widget {
     for (const mode of this._variantModes) {
       this._commands.addCommand(this._cmd(`resume-${mode.id}`), {
         label: `Resume (${mode.menuLabel})`,
-        icon: warningIcon,
+        icon: shieldIcon,
         // Absent while the plain item already resolves to this same mode - it
         // would be a second entry building an identical launch.
         isVisible: () => !this._buildsSameLaunch(mode),
@@ -2032,13 +2053,13 @@ export class AssistantSessionsPanel extends Widget {
       });
       this._commands.addCommand(this._cmd(`new-session-${mode.id}`), {
         label: `New ${this._descriptor.label} Session (${mode.menuLabel})`,
-        icon: warningIcon,
+        icon: shieldIcon,
         isVisible: () => !this._buildsSameLaunch(mode),
         execute: () => void this._newSession(mode.id)
       });
       this._commands.addCommand(this._cmd(`branch-session-${mode.id}`), {
         label: mode.menuLabel as string,
-        icon: warningIcon,
+        icon: shieldIcon,
         isVisible: () => !this._buildsSameLaunch(mode),
         execute: () => void this._branchSession(mode.id)
       });
@@ -2065,7 +2086,12 @@ export class AssistantSessionsPanel extends Widget {
         }
         this._app.commands
           .execute('terminal:create-new', { cwd: rel })
-          .catch(err => this._showError(err));
+          .catch(err =>
+            this._showActionError(
+              'Could not open a terminal for this session - try again.',
+              err
+            )
+          );
       }
     });
 
@@ -2087,7 +2113,12 @@ export class AssistantSessionsPanel extends Widget {
         }
         this._app.commands
           .execute('filebrowser:go-to-path', { path: rel })
-          .catch(err => this._showError(err));
+          .catch(err =>
+            this._showActionError(
+              'Could not open the project folder - try again.',
+              err
+            )
+          );
       }
     });
 
@@ -2140,7 +2171,7 @@ export class AssistantSessionsPanel extends Widget {
       // separator was added to protect, and both delete history that cannot be
       // recovered; leaving this one bare made the pair read as one dangerous
       // item beside an ordinary one (DEF-45).
-      icon: warningIcon,
+      icon: shieldIcon,
       isVisible: () => (active()?.extra_sessions ?? 0) > 0,
       execute: () => {
         const s = active();
@@ -2213,7 +2244,7 @@ export class AssistantSessionsPanel extends Widget {
       // danger everywhere else in this menu - spending it on a branch glyph
       // left `Branch Session (Skip Permissions)` looking exactly as safe as
       // Show in File Browser while `Resume (Skip Permissions)` beside it wore
-      // the triangle. The branch glyph is the fallback, not the winner.
+      // the shield. The branch glyph is the fallback, not the winner.
       icon: () =>
         this._variantIcon() ??
         (this._visibleVariantCount() === 0 ? branchIcon : undefined),

package/src/core/types.ts

@@ -26,14 +26,6 @@ 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';
 
-/** Who owns a branched conversation's name.
- *
- * - `launch-flag` - the CLI is told the name at launch and stamps it itself
- * - `server-side` - the server writes the name into the copied store entry
- * - `none` - the assistant has no naming surface, so no name is asked for
- */
-export type NamingStrategy = 'launch-flag' | 'server-side' | '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.
@@ -86,7 +78,9 @@ export interface IProviderDescriptor {
   cliBinary: string;
   forkStrategy: ForkStrategy;
   colourSource: ColourSource;
-  namingStrategy: NamingStrategy;
+  /** Whether the branch flow asks the user to name the new conversation.
+   * Where that name then GOES is `forkStrategy`'s job. */
+  promptsForBranchName: boolean;
   /** The CLI starts a brand-new conversation under an id we give it, so a
    * fresh session is identifiable from its argv on the first poll instead of
    * being an unknown terminal until it writes its store entry. Independent of
@@ -235,7 +229,7 @@ export interface ILaunchRequest {
   fork_session_id?: string;
   /** Parent conversation to fork from (`forkStrategy: 'native-command'`). */
   fork_from?: string;
-  /** Name to stamp on the new conversation (`namingStrategy: 'launch-flag'`). */
+  /** Name to stamp on the new conversation (`promptsForBranchName: true`). */
   name?: string;
   /** The launch mode this action runs under, as one token in the assistant's
    * own terminology: a boolean mode is its bare `ILaunchMode.id`, an enum mode

package/src/index.ts

@@ -11,10 +11,10 @@ import { ITerminalTracker } from '@jupyterlab/terminal';
 import { IColourfulTabs } from 'jupyterlab_colourful_tab_extension';
 import { IDisposable } from '@lumino/disposable';
 
+import { DEFAULT_RECENT_LIMIT } from './core/limits';
 import {
   AssistantSessionsPanel,
   DEFAULT_PRESENTATION_MODE,
-  DEFAULT_RECENT_LIMIT,
   PresentationMode,
   commandId,
   panelWidgetId

package/src/providers/claude.ts

@@ -49,7 +49,7 @@ export const descriptor: IProviderDescriptor = {
   // `-n <name>` at launch: Claude stamps the name itself and re-stamps it on
   // every turn, which is the only way a fork's name survives - a title written
   // after the fact loses to the parent title the fork inherits.
-  namingStrategy: 'launch-flag',
+  promptsForBranchName: true,
   mintsNewSessionId: true,
   launchModes: [
     {

package/src/providers/codex.ts

@@ -45,7 +45,7 @@ export const descriptor: IProviderDescriptor = {
   colourSource: 'none',
   // Forks are unnamed - Codex has no naming flag and no writable title field,
   // so the panel never asks for a name it could not stamp anywhere.
-  namingStrategy: 'none',
+  promptsForBranchName: false,
   // A bare `codex` mints its own thread id; there is no `--session-id`.
   mintsNewSessionId: false,
   launchModes: [

package/src/providers/gemini.ts

@@ -9,9 +9,9 @@
 // * `colourSource: 'none'` - no colour command, and nothing in the chat store
 //   records one, so a tab tint only ever comes from the extension's own
 //   write-back store
-// * `namingStrategy: 'server-side'` - a fork's name is stamped into the copied
-//   chat file's `summary`, which is the field the CLI itself displays a
-//   conversation under; there is no naming flag to pass it to
+// * `promptsForBranchName: true` - the branch flow asks for a name, which the
+//   server stamps into the copied chat file's `summary`, the field the CLI
+//   itself displays a conversation under; there is no naming flag to pass it to
 // * `mintsNewSessionId: true` - `--session-id <uuid>` starts a fresh
 //   conversation under an id we chose, so a new session is identifiable from
 //   its argv on the first poll instead of being an unknown terminal
@@ -51,7 +51,7 @@ export const descriptor: IProviderDescriptor = {
   colourSource: 'none',
   // The fork's name is written into the copy by the server; the CLI has no
   // naming flag to take it.
-  namingStrategy: 'server-side',
+  promptsForBranchName: true,
   // `--session-id <uuid>` starts a conversation under an id we mint.
   mintsNewSessionId: true,
   launchModes: [

package/src/providers/kimi.ts

@@ -9,8 +9,8 @@
 // * `colourSource: 'derived'` - kimi has no `/color`, so the default tint is a
 //   stable hash of the conversation id (a user-set colour still wins, per the
 //   Colour section of the acceptance criteria)
-// * `namingStrategy: 'server-side'` - the name is stamped into the copied
-//   `state.json`, not passed to the CLI
+// * `promptsForBranchName: true` - the branch flow asks for a name, which the
+//   server stamps into the copied `state.json`, not passed to the CLI
 // * one launch mode, `--yolo`, under kimi's own name
 //
 // The only hook is the branch label: kimi's conversation titles are
@@ -124,7 +124,7 @@ export const descriptor: IProviderDescriptor = {
   colourSource: 'derived',
   // The fork's name is written into the copy's `state.json` by the server; the
   // CLI has no naming flag to take it.
-  namingStrategy: 'server-side',
+  promptsForBranchName: true,
   // A bare `kimi` mints its own id and writes it on the first turn, and `-S`
   // only ever resumes - so a new conversation cannot be launched under an id
   // we chose, and is identified from the store on the next poll instead.