jupyterlab_ai_code_assistants_extension 1.2.35 → 1.2.38

package/README.md

@@ -41,7 +41,7 @@ Chat-panel extensions re-implement the agent loop and trail the real tool. This
 - **Favorites** - star projects you keep coming back to via the right-click menu; favourites from the standalone extensions are migrated on first run
 - **Remove and clean up** - drop a project's history or a project's extra parallel sessions from the right-click menu, confirmation dialog first; removed files honour JupyterLab's "move files to trash" setting
 - **Activity at a glance** - each row shows its last activity in an aligned column; rows active within the last minute light up, rows idle for over a week dim, and rows with parallel conversations show a branch icon with the count
-- **Remote control indicator and background agents** (Claude) - a green dot marks sessions actively under remote control, and a conversation held by a running background agent shows a `bg` chip; clicking attaches to the agent instead of copying it
+- **Remote control indicator and background agents** (Claude) - a green dot marks sessions actively under remote control, and a conversation held by a running background agent shows a `bg` chip; clicking stops the agent and resumes the same conversation in your terminal, so it becomes an ordinary interactive session
 - **Search** - fuzzy filter per panel, toggled by the funnel button
 - **Presentation modes** - label rows by session name or by path relative to the JupyterLab root
 - **Conflict-safe upgrade** - if a retired standalone extension is still installed, its panel wins and this extension stands down for that assistant instead of showing a duplicate

package/lib/core/panel.d.ts

@@ -252,24 +252,6 @@ export declare class AssistantSessionsPanel extends Widget {
      * that build a byte-identical launch, and the unmarked one is the default
      * the user clicks. */
     private _resolvedVariant;
-    /** The same mode as it applies to RESUME - of the active row by default, or
-     * of whichever conversation is named.
-     *
-     * An attach is not a launch: the server returns the argv before the flag is
-     * appended, deliberately, so promising the mode on a conversation a live
-     * worker already holds would name something the assistant never receives.
-     * That is true of resuming and of nothing else, so it is tested HERE rather
-     * than in `_resolvedVariant` - which is read by the `+` button and both
-     * new-session and branch items, none of which attach. Testing it there let
-     * one right-click on a background-agent row strip the mode's name off every
-     * one of those surfaces panel-wide, while their launches went on carrying it
-     * (DEF-37).
-     *
-     * The argument is what lets a surface that describes SOMEONE ELSE'S resume -
-     * a row tooltip built during a render, a branch item in the submenu - ask the
-     * question about that conversation rather than about the active row.
-     */
-    private _resumeVariant;
     /** The variant suffix a plain item wears while that mode is in force. */
     private _variantSuffix;
     /** Whether a forced variant would build the launch the plain item already
@@ -311,9 +293,7 @@ export declare class AssistantSessionsPanel extends Widget {
     private _openManagePopup;
     /** Tooltip for one Open button in the Manage Sessions popup. Same rule as the
      * Open Branched Conversation submenu: the button launches a terminal, so it
-     * names the mode that launch carries, and a conversation a live worker holds
-     * is attached to and carries none. The row's own conversation is not in
-     * `_lastBranches`, so it answers from the session. */
+     * names the mode that launch carries. */
     private _openBranchTitle;
     /** The live-worker chip for a branch row, when the provider has workers at
      * all. Returning null lets the popup fall back to its fork marker. */

package/lib/core/panel.js

@@ -1593,9 +1593,9 @@ export class AssistantSessionsPanel extends Widget {
             badge.appendChild(document.createTextNode(String(session.extra_sessions + 1)));
             name.appendChild(badge);
         }
-        // A live worker owns this conversation, so a click joins it rather than
-        // resuming a dormant one. Marked so the difference is visible before the
-        // click, not a surprise after it. No own title: a child title shadows the
+        // A live worker owns this conversation, so a click stops it before
+        // resuming. Marked so the difference is visible before the click, not a
+        // surprise after it. No own title: a child title shadows the
         // row's, which would hide the path behind a two-character chip.
         if (this._descriptor.hasBgAgents && session.bg_id) {
             const bg = document.createElement('span');
@@ -1767,15 +1767,10 @@ export class AssistantSessionsPanel extends Widget {
             lines.push('Status: active');
         }
         if (this._descriptor.hasBgAgents && s.bg_id) {
-            lines.push(`Background agent: ${s.bg_id} (click attaches to it)`);
+            lines.push(`Background agent: ${s.bg_id} (click stops it and resumes here)`);
         }
         lines.push(...((_c = (_b = (_a = this._hooks).tooltipLines) === null || _b === void 0 ? void 0 : _b.call(_a, s)) !== null && _c !== void 0 ? _c : []));
-        // What THIS row's click resolves to, which is the attach-aware question:
-        // the line above may have just said the click joins a live worker, and an
-        // attach is issued before the mode is appended, so `_resolvedVariant`
-        // promised a flag the server discards - one tooltip naming both, a line
-        // apart (DEF-46).
-        const variant = this._resumeVariant(s);
+        const variant = this._resolvedVariant();
         if (variant) {
             // The row click launches with this, and the menu is the only other place
             // that says so.
@@ -1891,27 +1886,6 @@ export class AssistantSessionsPanel extends Widget {
         const resolved = resolvedLaunchModeEntry(this._descriptor.launchModes, this._modes);
         return resolved;
     }
-    /** The same mode as it applies to RESUME - of the active row by default, or
-     * of whichever conversation is named.
-     *
-     * An attach is not a launch: the server returns the argv before the flag is
-     * appended, deliberately, so promising the mode on a conversation a live
-     * worker already holds would name something the assistant never receives.
-     * That is true of resuming and of nothing else, so it is tested HERE rather
-     * than in `_resolvedVariant` - which is read by the `+` button and both
-     * new-session and branch items, none of which attach. Testing it there let
-     * one right-click on a background-agent row strip the mode's name off every
-     * one of those surfaces panel-wide, while their launches went on carrying it
-     * (DEF-37).
-     *
-     * The argument is what lets a surface that describes SOMEONE ELSE'S resume -
-     * a row tooltip built during a render, a branch item in the submenu - ask the
-     * question about that conversation rather than about the active row.
-     */
-    _resumeVariant(target = this._activeSession) {
-        const joining = this._descriptor.hasBgAgents && !!(target === null || target === void 0 ? void 0 : target.bg_id);
-        return joining ? null : this._resolvedVariant();
-    }
     /** The variant suffix a plain item wears while that mode is in force. */
     _variantSuffix() {
         const resolved = this._resolvedVariant();
@@ -1951,16 +1925,15 @@ export class AssistantSessionsPanel extends Widget {
             }
         });
         this._commands.addCommand(this._cmd('resume'), {
-            // Joining a live worker and resuming a dormant conversation are
-            // different verbs, so a provider that has both says which one this row
-            // gets.
+            // Resuming a conversation a live worker holds stops that worker first,
+            // so a provider that has workers says which of the two this row gets.
             label: () => {
                 var _a, _b, _c;
-                const variant = this._resumeVariant();
+                const variant = this._resolvedVariant();
                 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) ? shieldIcon : undefined); },
+            icon: () => { var _a; return (((_a = this._resolvedVariant()) === null || _a === void 0 ? void 0 : _a.unsafe) ? shieldIcon : undefined); },
             execute: () => {
                 const s = active();
                 if (s) {
@@ -1970,15 +1943,13 @@ export class AssistantSessionsPanel extends Widget {
         });
         for (const mode of this._variantModes) {
             this._commands.addCommand(this._cmd(`resume-${mode.id}`), {
-                label: `Resume (${mode.menuLabel})`,
+                // The same verb as the plain item, so a row a live worker holds says
+                // here too that the worker is stopped first.
+                label: () => { var _a, _b, _c; return `${(_c = (_b = (_a = this._hooks).resumeLabel) === null || _b === void 0 ? void 0 : _b.call(_a, active())) !== null && _c !== void 0 ? _c : 'Resume'} (${mode.menuLabel})`; },
                 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),
-                // A conversation a live worker already holds was started in whatever
-                // mode that worker has; joining it cannot change that, so the variant
-                // is disabled rather than silently joining in the wrong mode.
-                isEnabled: () => { var _a; return !(this._descriptor.hasBgAgents && ((_a = active()) === null || _a === void 0 ? void 0 : _a.bg_id)); },
                 execute: () => {
                     const s = active();
                     if (s) {
@@ -2127,13 +2098,11 @@ export class AssistantSessionsPanel extends Widget {
         this._commands.addCommand(this._cmd('open-branch'), {
             // Names the mode the launch carries, like Resume, `+` and Branch Session
             // do - this item opens a terminal, so the mode in force applies to it and
-            // this was the one launch surface that stayed silent about it. Attach-
-            // aware per conversation: the submenu passes `bg`, since a branch a live
-            // worker holds is attached to and takes no mode (DEF-46's rule).
+            // this was the one launch surface that stayed silent about it.
             label: args => {
                 var _a;
                 const base = String((_a = args.label) !== null && _a !== void 0 ? _a : '');
-                const variant = this._resumeVariant(args.bg ? { bg_id: String(args.bg) } : null);
+                const variant = this._resolvedVariant();
                 return variant ? `${base} (${variant.label})` : base;
             },
             // Intent glyph, not row state - see switch-branch above.
@@ -2436,10 +2405,7 @@ export class AssistantSessionsPanel extends Widget {
                 command: this._cmd('open-branch'),
                 args: {
                     session_id: b.session_id,
-                    label: this._branchMenuLabel(b),
-                    // The label reads this to tell an attach from a launch; the
-                    // provider's own worker capability is tested where it is answered.
-                    ...(b.bg_id ? { bg: b.bg_id } : {})
+                    label: this._branchMenuLabel(b)
                 }
             });
         }
@@ -2463,7 +2429,7 @@ export class AssistantSessionsPanel extends Widget {
             branchName: b => this._branchDisplayName(b),
             formatTime: ms => this._formatRelativeTime(ms),
             branchBadge: b => this._bgBadgeFor(b),
-            openTitle: id => this._openBranchTitle(session, id),
+            openTitle: () => this._openBranchTitle(session),
             onSwitch: id => void this._switchBranch(session, id),
             onOpen: id => void this._openSession(session, undefined, id),
             onDelete: ids => this._deleteBranches(session, ids),
@@ -2475,21 +2441,16 @@ export class AssistantSessionsPanel extends Widget {
     }
     /** Tooltip for one Open button in the Manage Sessions popup. Same rule as the
      * Open Branched Conversation submenu: the button launches a terminal, so it
-     * names the mode that launch carries, and a conversation a live worker holds
-     * is attached to and carries none. The row's own conversation is not in
-     * `_lastBranches`, so it answers from the session. */
-    _openBranchTitle(session, sessionId) {
-        var _a, _b, _c, _d;
+     * names the mode that launch carries. */
+    _openBranchTitle(session) {
+        var _a, _b, _c;
         // One terminal serves a project-scoped assistant, so the button focuses
         // or starts it, under the provider's own verb for that.
         if (this._descriptor.terminalScope === 'project') {
             return ((_c = (_b = (_a = this._hooks).resumeLabel) === null || _b === void 0 ? void 0 : _b.call(_a, session)) !== null && _c !== void 0 ? _c : "Open the project's terminal");
         }
         const base = 'Open this conversation in its own terminal';
-        const target = sessionId === session.session_id
-            ? session
-            : ((_d = this._lastBranches.find(b => b.session_id === sessionId)) !== null && _d !== void 0 ? _d : null);
-        const variant = this._resumeVariant(target);
+        const variant = this._resolvedVariant();
         return variant ? `${base} (${variant.label})` : base;
     }
     /** The live-worker chip for a branch row, when the provider has workers at

package/lib/core/types.d.ts

@@ -309,7 +309,8 @@ export interface ITabColourEvents {
  * shared panel. */
 export interface IProviderHooks {
     /** Label for the primary open action, when the provider distinguishes verbs
-     * (joining a live worker is not the same as resuming a dormant store entry). */
+     * (stopping a live worker before resuming is not the same as resuming a
+     * dormant store entry). */
     resumeLabel?: (session: ISession | null) => string;
     /** Extra lines for the row tooltip. */
     tooltipLines?: (session: ISession) => string[];

package/lib/providers/claude.js

@@ -70,7 +70,7 @@ export const descriptor = {
     legacyPluginId: 'jupyterlab_claude_code_extension'
 };
 export const hooks = {
-    // Joining a live agent and resuming a dormant conversation are different
-    // verbs, so the item says which one this row gets before the click.
-    resumeLabel: (session) => (session === null || session === void 0 ? void 0 : session.bg_id) ? 'Attach to Background Agent' : 'Resume'
+    // Opening a conversation a live agent holds stops the agent first, so the
+    // item says so before the click (DEF-PROV-272).
+    resumeLabel: (session) => (session === null || session === void 0 ? void 0 : session.bg_id) ? 'Stop Background Agent and Resume' : 'Resume'
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "jupyterlab_ai_code_assistants_extension",
-    "version": "1.2.35",
+    "version": "1.2.38",
     "description": "A full launcher and manager for every AI code assistant in JupyterLab - Claude Code, Codex, Kimi, Gemini and DeepSeek. Start, resume, fork, switch, and clean up CLI sessions from a side panel per assistant - one click lands you in the right terminal with the assistant already running, no duplicate tabs, no UUID hunting.",
     "keywords": [
         "jupyter",

package/src/__tests__/panel.spec.ts

@@ -645,13 +645,15 @@ describe('DEF-46 - the row tooltip names only a mode the row launches with', ()
     expect(tooltip([session()])).toContain('Launch mode: Skip Permissions');
   });
 
-  it('says nothing about a mode on a row a live worker already holds', () => {
+  it('names the mode on a row a live worker holds, which is resumed too', () => {
     panel.setModes({ skip: true });
-    // An attach is issued before the flag is appended, deliberately, so the
-    // tooltip would otherwise promise something the assistant never receives.
+    // The click stops the worker and resumes the conversation, and a resume
+    // carries the mode (DEF-PROV-272).
     const text = tooltip([session({ bg_id: 'abcd1234' })]);
-    expect(text).toContain('Background agent: abcd1234 (click attaches to it)');
-    expect(text).not.toContain('Launch mode');
+    expect(text).toContain(
+      'Background agent: abcd1234 (click stops it and resumes here)'
+    );
+    expect(text).toContain('Launch mode: Skip Permissions');
   });
 });
 

package/src/core/panel.ts

@@ -1899,9 +1899,9 @@ export class AssistantSessionsPanel extends Widget {
       );
       name.appendChild(badge);
     }
-    // A live worker owns this conversation, so a click joins it rather than
-    // resuming a dormant one. Marked so the difference is visible before the
-    // click, not a surprise after it. No own title: a child title shadows the
+    // A live worker owns this conversation, so a click stops it before
+    // resuming. Marked so the difference is visible before the click, not a
+    // surprise after it. No own title: a child title shadows the
     // row's, which would hide the path behind a two-character chip.
     if (this._descriptor.hasBgAgents && session.bg_id) {
       const bg = document.createElement('span');
@@ -2086,15 +2086,12 @@ export class AssistantSessionsPanel extends Widget {
       lines.push('Status: active');
     }
     if (this._descriptor.hasBgAgents && s.bg_id) {
-      lines.push(`Background agent: ${s.bg_id} (click attaches to it)`);
+      lines.push(
+        `Background agent: ${s.bg_id} (click stops it and resumes here)`
+      );
     }
     lines.push(...(this._hooks.tooltipLines?.(s) ?? []));
-    // What THIS row's click resolves to, which is the attach-aware question:
-    // the line above may have just said the click joins a live worker, and an
-    // attach is issued before the mode is appended, so `_resolvedVariant`
-    // promised a flag the server discards - one tooltip naming both, a line
-    // apart (DEF-46).
-    const variant = this._resumeVariant(s);
+    const variant = this._resolvedVariant();
     if (variant) {
       // The row click launches with this, and the menu is the only other place
       // that says so.
@@ -2230,30 +2227,6 @@ export class AssistantSessionsPanel extends Widget {
     return resolved;
   }
 
-  /** The same mode as it applies to RESUME - of the active row by default, or
-   * of whichever conversation is named.
-   *
-   * An attach is not a launch: the server returns the argv before the flag is
-   * appended, deliberately, so promising the mode on a conversation a live
-   * worker already holds would name something the assistant never receives.
-   * That is true of resuming and of nothing else, so it is tested HERE rather
-   * than in `_resolvedVariant` - which is read by the `+` button and both
-   * new-session and branch items, none of which attach. Testing it there let
-   * one right-click on a background-agent row strip the mode's name off every
-   * one of those surfaces panel-wide, while their launches went on carrying it
-   * (DEF-37).
-   *
-   * The argument is what lets a surface that describes SOMEONE ELSE'S resume -
-   * a row tooltip built during a render, a branch item in the submenu - ask the
-   * question about that conversation rather than about the active row.
-   */
-  private _resumeVariant(
-    target: { bg_id?: string | null } | null = this._activeSession
-  ): IResolvedLaunchMode | null {
-    const joining = this._descriptor.hasBgAgents && !!target?.bg_id;
-    return joining ? null : this._resolvedVariant();
-  }
-
   /** The variant suffix a plain item wears while that mode is in force. */
   private _variantSuffix(): string {
     const resolved = this._resolvedVariant();
@@ -2302,15 +2275,14 @@ export class AssistantSessionsPanel extends Widget {
     });
 
     this._commands.addCommand(this._cmd('resume'), {
-      // Joining a live worker and resuming a dormant conversation are
-      // different verbs, so a provider that has both says which one this row
-      // gets.
+      // Resuming a conversation a live worker holds stops that worker first,
+      // so a provider that has workers says which of the two this row gets.
       label: () => {
-        const variant = this._resumeVariant();
+        const variant = this._resolvedVariant();
         const verb = this._hooks.resumeLabel?.(active()) ?? 'Resume';
         return variant ? `${verb} (${variant.label})` : verb;
       },
-      icon: () => (this._resumeVariant()?.unsafe ? shieldIcon : undefined),
+      icon: () => (this._resolvedVariant()?.unsafe ? shieldIcon : undefined),
       execute: () => {
         const s = active();
         if (s) {
@@ -2321,15 +2293,14 @@ export class AssistantSessionsPanel extends Widget {
 
     for (const mode of this._variantModes) {
       this._commands.addCommand(this._cmd(`resume-${mode.id}`), {
-        label: `Resume (${mode.menuLabel})`,
+        // The same verb as the plain item, so a row a live worker holds says
+        // here too that the worker is stopped first.
+        label: () =>
+          `${this._hooks.resumeLabel?.(active()) ?? 'Resume'} (${mode.menuLabel})`,
         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),
-        // A conversation a live worker already holds was started in whatever
-        // mode that worker has; joining it cannot change that, so the variant
-        // is disabled rather than silently joining in the wrong mode.
-        isEnabled: () => !(this._descriptor.hasBgAgents && active()?.bg_id),
         execute: () => {
           const s = active();
           if (s) {
@@ -2502,14 +2473,10 @@ export class AssistantSessionsPanel extends Widget {
     this._commands.addCommand(this._cmd('open-branch'), {
       // Names the mode the launch carries, like Resume, `+` and Branch Session
       // do - this item opens a terminal, so the mode in force applies to it and
-      // this was the one launch surface that stayed silent about it. Attach-
-      // aware per conversation: the submenu passes `bg`, since a branch a live
-      // worker holds is attached to and takes no mode (DEF-46's rule).
+      // this was the one launch surface that stayed silent about it.
       label: args => {
         const base = String(args.label ?? '');
-        const variant = this._resumeVariant(
-          args.bg ? { bg_id: String(args.bg) } : null
-        );
+        const variant = this._resolvedVariant();
         return variant ? `${base} (${variant.label})` : base;
       },
       // Intent glyph, not row state - see switch-branch above.
@@ -2844,10 +2811,7 @@ export class AssistantSessionsPanel extends Widget {
         command: this._cmd('open-branch'),
         args: {
           session_id: b.session_id,
-          label: this._branchMenuLabel(b),
-          // The label reads this to tell an attach from a launch; the
-          // provider's own worker capability is tested where it is answered.
-          ...(b.bg_id ? { bg: b.bg_id } : {})
+          label: this._branchMenuLabel(b)
         }
       });
     }
@@ -2875,7 +2839,7 @@ export class AssistantSessionsPanel extends Widget {
       branchName: b => this._branchDisplayName(b),
       formatTime: ms => this._formatRelativeTime(ms),
       branchBadge: b => this._bgBadgeFor(b),
-      openTitle: id => this._openBranchTitle(session, id),
+      openTitle: () => this._openBranchTitle(session),
       onSwitch: id => void this._switchBranch(session, id),
       onOpen: id => void this._openSession(session, undefined, id),
       onDelete: ids => this._deleteBranches(session, ids),
@@ -2888,10 +2852,8 @@ export class AssistantSessionsPanel extends Widget {
 
   /** Tooltip for one Open button in the Manage Sessions popup. Same rule as the
    * Open Branched Conversation submenu: the button launches a terminal, so it
-   * names the mode that launch carries, and a conversation a live worker holds
-   * is attached to and carries none. The row's own conversation is not in
-   * `_lastBranches`, so it answers from the session. */
-  private _openBranchTitle(session: ISession, sessionId: string): string {
+   * names the mode that launch carries. */
+  private _openBranchTitle(session: ISession): string {
     // One terminal serves a project-scoped assistant, so the button focuses
     // or starts it, under the provider's own verb for that.
     if (this._descriptor.terminalScope === 'project') {
@@ -2900,11 +2862,7 @@ export class AssistantSessionsPanel extends Widget {
       );
     }
     const base = 'Open this conversation in its own terminal';
-    const target =
-      sessionId === session.session_id
-        ? session
-        : (this._lastBranches.find(b => b.session_id === sessionId) ?? null);
-    const variant = this._resumeVariant(target);
+    const variant = this._resolvedVariant();
     return variant ? `${base} (${variant.label})` : base;
   }
 

package/src/core/types.ts

@@ -349,7 +349,8 @@ export interface ITabColourEvents {
  * shared panel. */
 export interface IProviderHooks {
   /** Label for the primary open action, when the provider distinguishes verbs
-   * (joining a live worker is not the same as resuming a dormant store entry). */
+   * (stopping a live worker before resuming is not the same as resuming a
+   * dormant store entry). */
   resumeLabel?: (session: ISession | null) => string;
   /** Extra lines for the row tooltip. */
   tooltipLines?: (session: ISession) => string[];

package/src/providers/claude.ts

@@ -76,8 +76,8 @@ export const descriptor: IProviderDescriptor = {
 };
 
 export const hooks: IProviderHooks = {
-  // Joining a live agent and resuming a dormant conversation are different
-  // verbs, so the item says which one this row gets before the click.
+  // Opening a conversation a live agent holds stops the agent first, so the
+  // item says so before the click (DEF-PROV-272).
   resumeLabel: (session: ISession | null) =>
-    session?.bg_id ? 'Attach to Background Agent' : 'Resume'
+    session?.bg_id ? 'Stop Background Agent and Resume' : 'Resume'
 };