jupyterlab_ai_code_assistants_extension 1.2.294 → 1.2.299

package/lib/core/panel.js

@@ -786,23 +786,23 @@ export class AssistantSessionsPanel extends Widget {
         };
         askCount(extra);
         confirmBody.node.appendChild(question);
-        // One sentence, twelve words or fewer: what happens, not the detail.
+        // The second line states what happens to the rest: the count, the short
+        // ids once the branch list names them, and the disposal the setting chose.
         const hint = document.createElement('p');
         hint.className = 'jp-AiAssistantsPanel-cleanupHint';
-        hint.textContent = this._deleteToTrash
-            ? 'The current conversation is kept; the rest go to the trash.'
-            : 'The current conversation is kept; the rest are deleted permanently.';
+        // Announced when restated with the short ids; an aria-label change is not.
+        hint.setAttribute('role', 'status');
+        const stateHint = (ids) => {
+            const shortIds = ids === null || ids === void 0 ? void 0 : ids.map(id => shortSessionId(id, this._descriptor.sessionIdPrefix));
+            hint.textContent =
+                `Remaining ${extra} session${extra === 1 ? '' : 's'}` +
+                    ((shortIds === null || shortIds === void 0 ? void 0 : shortIds.length) ? ` ${shortIds.join(', ')}` : '') +
+                    (this._deleteToTrash
+                        ? ' will be removed.'
+                        : ' will be deleted permanently.');
+        };
+        stateHint(null);
         confirmBody.node.appendChild(hint);
-        // The irreversible note is a safety statement, not the hint, so it keeps
-        // its own line. With the trash on it names the refusal: a refused move
-        // deletes permanently, while the hint promises the trash
-        // (DEF-PANE-363-CAUTION-REFUSAL).
-        const caution = document.createElement('p');
-        caution.className = 'jp-AiAssistantsPanel-cleanupCaution';
-        caution.textContent = this._deleteToTrash
-            ? 'A refused trash move deletes permanently and cannot be undone.'
-            : 'This cannot be undone.';
-        confirmBody.node.appendChild(caution);
         const title = this._trans.__('Clean Up Parallel Sessions');
         let warning = null;
         const confirmDialog = new Dialog({
@@ -819,16 +819,15 @@ export class AssistantSessionsPanel extends Widget {
         // Scopes the armed style in base.css to this one dialog.
         confirmDialog.addClass('jp-AiAssistantsPanel-cleanupDialog');
         // The Dialog names itself only when its body is a string, and this body is
-        // a Widget: name it here, and again when the question is restated and the
-        // warning joins it.
+        // a Widget: name it here, and again when the question and hint are
+        // restated and the warning joins it.
         const nameDialog = () => {
-            var _a, _b, _c, _d;
+            var _a, _b, _c;
             confirmDialog.node.setAttribute('aria-label', [
                 title,
                 (_a = question.textContent) !== null && _a !== void 0 ? _a : '',
                 (_b = hint.textContent) !== null && _b !== void 0 ? _b : '',
-                (_c = caution.textContent) !== null && _c !== void 0 ? _c : '',
-                (_d = warning === null || warning === void 0 ? void 0 : warning.textContent) !== null && _d !== void 0 ? _d : ''
+                (_c = warning === null || warning === void 0 ? void 0 : warning.textContent) !== null && _c !== void 0 ? _c : ''
             ]
                 .filter(part => part)
                 .join(' '));
@@ -935,11 +934,11 @@ export class AssistantSessionsPanel extends Widget {
         updateAccept();
         // Alongside the question, never in front of it: the request layer allows
         // 60 s, and the confirmation must open at once. When the list lands the
-        // question states its length and a conversation newer than the kept one
-        // adds the warning, drawn last so it reads after the caution. The same
-        // list is what the removal deletes. A failed fetch leaves the question as
-        // the row reported it, with no warning, and the removal fetches again
-        // below.
+        // question and hint state its length and ids, and a conversation newer
+        // than the kept one adds the warning, drawn last so it reads after the
+        // hint. The same list is what the removal deletes. A failed fetch leaves
+        // the question as the row reported it, with no ids and no warning, and
+        // the removal fetches again below.
         const branchesReady = this._fetchBranches(session).then(fetched => {
             const list = fetched === null || fetched === void 0 ? void 0 : fetched.branches;
             if (list && list.length === 0) {
@@ -954,6 +953,7 @@ export class AssistantSessionsPanel extends Widget {
             else if (list) {
                 extra = list.length;
                 askCount(extra);
+                stateHint(list.map(branch => branch.session_id));
                 const newer = list.filter(branch => branch.file_mtime > session.file_mtime).length;
                 if (newer > 0) {
                     warning = document.createElement('div');
@@ -961,7 +961,7 @@ export class AssistantSessionsPanel extends Widget {
                     warning.setAttribute('role', 'alert');
                     warning.textContent =
                         `${newer} parallel session${newer === 1 ? ' was' : 's were'} ` +
-                            'active after the one kept.';
+                            'active after the current session.';
                     confirmBody.node.appendChild(warning);
                 }
                 // The list just decided what the button acts on: an arm given while

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "jupyterlab_ai_code_assistants_extension",
-    "version": "1.2.294",
+    "version": "1.2.299",
     "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

@@ -2317,15 +2317,17 @@ describe('ACC-SESS-61, ACC-SESS-62 - what the destructive confirmations state',
     expect(request).not.toHaveBeenCalled();
   });
 
-  it('ACC-SESS-62 - the cleanup confirmation states how many go and that one stays', async () => {
+  it('ACC-SESS-62 - the cleanup confirmation names the three removed sessions by short id', async () => {
     // The fetched list is what the question counts: three branches despite a
-    // row that claims nine. It also gives Cancel a DELETE to withhold.
+    // row that claims nine. It also gives Cancel a DELETE to withhold. The
+    // ids differ in their first eight characters, so each short id names one
+    // conversation.
     request.mockImplementationOnce(() =>
       Promise.resolve({
         current: 'sid-ledger-tools',
         total: 4,
-        branches: [0, 1, 2].map(index => ({
-          session_id: `sid-branch-${index}`,
+        branches: ['alpha', 'bravo', 'charlie'].map((name, index) => ({
+          session_id: `sess-${name}`,
           file_mtime: 1,
           label: `Branch ${index}`
         }))
@@ -2338,7 +2340,9 @@ describe('ACC-SESS-61, ACC-SESS-62 - what the destructive confirmations state',
 
     expect(body).toContain('3 parallel sessions');
     expect(body).toContain('ledger-tools');
-    expect(body).toContain('current conversation is kept');
+    expect(body).toContain(
+      'Remaining 3 sessions sess-alp, sess-bra, sess-cha will be removed.'
+    );
     pressEnter();
     await done;
     // Cancelling after the question's branches fetch sends no DELETE.
@@ -2414,6 +2418,10 @@ describe('ACC-PANE-221, ACC-PANE-222 - the cleanup confirmation warning and hint
     expect(
       document.querySelector('.jp-Dialog-body p')!.getAttribute('role')
     ).toBe('status');
+    // The hint is a live region too, because the fetch restates it with the
+    // short ids (DEF-PANE-374-HINT-ANNOUNCE).
+    const hint = document.querySelector('.jp-AiAssistantsPanel-cleanupHint')!;
+    expect(hint.getAttribute('role')).toBe('status');
     // The Widget body leaves showDialog no string to name the dialog from, so
     // the name is set here and carries the question on screen.
     expect(
@@ -2431,8 +2439,12 @@ describe('ACC-PANE-221, ACC-PANE-222 - the cleanup confirmation warning and hint
       '.jp-AiAssistantsPanel-cleanupWarning'
     )!;
     expect(warning.textContent).toBe(
-      '1 parallel session was active after the one kept.'
+      '1 parallel session was active after the current session.'
     );
+    // The restatement kept the hint a live region and put the ids in it, so
+    // the change is announced.
+    expect(hint.getAttribute('role')).toBe('status');
+    expect(hint.textContent).toContain('sid-bran');
     // The warning is announced, and the dialog's name follows the restated
     // question and the warning.
     expect(warning.getAttribute('role')).toBe('alert');
@@ -2502,7 +2514,7 @@ describe('ACC-PANE-221, ACC-PANE-222 - the cleanup confirmation warning and hint
     );
   });
 
-  it('warns when a conversation it removes was active after the one kept', async () => {
+  it('warns when a conversation it removes was active after the current session', async () => {
     const now = Date.now();
     const row = session({
       name: 'ledger-tools',
@@ -2549,7 +2561,7 @@ describe('ACC-PANE-221, ACC-PANE-222 - the cleanup confirmation warning and hint
     await done;
   });
 
-  it('states its hint in at most twelve words, in both disposal settings', async () => {
+  it('lists the sessions it removes by short id in both disposal settings', async () => {
     const now = Date.now();
     const row = session({ name: 'ledger-tools', extra_sessions: 1 });
     request.mockResolvedValueOnce(branches([now - 3 * HOUR]));
@@ -2559,14 +2571,30 @@ describe('ACC-PANE-221, ACC-PANE-222 - the cleanup confirmation warning and hint
     let hint = document.querySelector(
       '.jp-AiAssistantsPanel-cleanupHint'
     )!.textContent!;
-    expect(hint.trim().split(/\s+/).length).toBeLessThanOrEqual(12);
-    expect(hint).toContain('go to the trash');
-    // The hint promises the trash; the caution names the refusal that deletes
-    // permanently.
+    // The fetched branch is `sid-branch-0`; its short id is its first eight
+    // characters, which for Claude is the whole display id.
+    expect(hint).toBe('Remaining 1 session sid-bran will be removed.');
+    // A live region from creation: the restatement with the ids is announced
+    // (DEF-PANE-374-HINT-ANNOUNCE).
     expect(
-      document.querySelector('.jp-AiAssistantsPanel-cleanupCaution')!
-        .textContent
-    ).toContain('A refused trash move deletes permanently');
+      document
+        .querySelector('.jp-AiAssistantsPanel-cleanupHint')!
+        .getAttribute('role')
+    ).toBe('status');
+    // The caution line is gone from the confirmation entirely.
+    expect(
+      document.querySelector('.jp-AiAssistantsPanel-cleanupCaution')
+    ).toBeNull();
+    pressEnter();
+    await done;
+
+    // A failed fetch leaves no ids known: the hint states the count alone.
+    request.mockRejectedValueOnce(new Error('offline'));
+    done = (panel as any)._cleanupParallel(row) as Promise<void>;
+    await openButtons();
+    expect(
+      document.querySelector('.jp-AiAssistantsPanel-cleanupHint')!.textContent
+    ).toBe('Remaining 1 session will be removed.');
     pressEnter();
     await done;
 
@@ -2577,13 +2605,18 @@ describe('ACC-PANE-221, ACC-PANE-222 - the cleanup confirmation warning and hint
     hint = document.querySelector(
       '.jp-AiAssistantsPanel-cleanupHint'
     )!.textContent!;
-    expect(hint.trim().split(/\s+/).length).toBeLessThanOrEqual(12);
-    expect(hint).toContain('deleted permanently');
-    // The caution is not the hint: it stays visible on its own.
+    expect(hint).toBe(
+      'Remaining 1 session sid-bran will be deleted permanently.'
+    );
+    // The live region holds with the trash off as well.
     expect(
-      document.querySelector('.jp-AiAssistantsPanel-cleanupCaution')!
-        .textContent
-    ).toContain('cannot be undone');
+      document
+        .querySelector('.jp-AiAssistantsPanel-cleanupHint')!
+        .getAttribute('role')
+    ).toBe('status');
+    expect(
+      document.querySelector('.jp-AiAssistantsPanel-cleanupCaution')
+    ).toBeNull();
     pressEnter();
     await done;
   });

package/src/core/panel.ts

@@ -881,23 +881,25 @@ export class AssistantSessionsPanel extends Widget {
     };
     askCount(extra);
     confirmBody.node.appendChild(question);
-    // One sentence, twelve words or fewer: what happens, not the detail.
+    // The second line states what happens to the rest: the count, the short
+    // ids once the branch list names them, and the disposal the setting chose.
     const hint = document.createElement('p');
     hint.className = 'jp-AiAssistantsPanel-cleanupHint';
-    hint.textContent = this._deleteToTrash
-      ? 'The current conversation is kept; the rest go to the trash.'
-      : 'The current conversation is kept; the rest are deleted permanently.';
+    // Announced when restated with the short ids; an aria-label change is not.
+    hint.setAttribute('role', 'status');
+    const stateHint = (ids: string[] | null): void => {
+      const shortIds = ids?.map(id =>
+        shortSessionId(id, this._descriptor.sessionIdPrefix)
+      );
+      hint.textContent =
+        `Remaining ${extra} session${extra === 1 ? '' : 's'}` +
+        (shortIds?.length ? ` ${shortIds.join(', ')}` : '') +
+        (this._deleteToTrash
+          ? ' will be removed.'
+          : ' will be deleted permanently.');
+    };
+    stateHint(null);
     confirmBody.node.appendChild(hint);
-    // The irreversible note is a safety statement, not the hint, so it keeps
-    // its own line. With the trash on it names the refusal: a refused move
-    // deletes permanently, while the hint promises the trash
-    // (DEF-PANE-363-CAUTION-REFUSAL).
-    const caution = document.createElement('p');
-    caution.className = 'jp-AiAssistantsPanel-cleanupCaution';
-    caution.textContent = this._deleteToTrash
-      ? 'A refused trash move deletes permanently and cannot be undone.'
-      : 'This cannot be undone.';
-    confirmBody.node.appendChild(caution);
 
     const title = this._trans.__('Clean Up Parallel Sessions');
     let warning: HTMLElement | null = null;
@@ -915,8 +917,8 @@ export class AssistantSessionsPanel extends Widget {
     // Scopes the armed style in base.css to this one dialog.
     confirmDialog.addClass('jp-AiAssistantsPanel-cleanupDialog');
     // The Dialog names itself only when its body is a string, and this body is
-    // a Widget: name it here, and again when the question is restated and the
-    // warning joins it.
+    // a Widget: name it here, and again when the question and hint are
+    // restated and the warning joins it.
     const nameDialog = (): void => {
       confirmDialog.node.setAttribute(
         'aria-label',
@@ -924,7 +926,6 @@ export class AssistantSessionsPanel extends Widget {
           title,
           question.textContent ?? '',
           hint.textContent ?? '',
-          caution.textContent ?? '',
           warning?.textContent ?? ''
         ]
           .filter(part => part)
@@ -1048,11 +1049,11 @@ export class AssistantSessionsPanel extends Widget {
 
     // Alongside the question, never in front of it: the request layer allows
     // 60 s, and the confirmation must open at once. When the list lands the
-    // question states its length and a conversation newer than the kept one
-    // adds the warning, drawn last so it reads after the caution. The same
-    // list is what the removal deletes. A failed fetch leaves the question as
-    // the row reported it, with no warning, and the removal fetches again
-    // below.
+    // question and hint state its length and ids, and a conversation newer
+    // than the kept one adds the warning, drawn last so it reads after the
+    // hint. The same list is what the removal deletes. A failed fetch leaves
+    // the question as the row reported it, with no ids and no warning, and
+    // the removal fetches again below.
     const branchesReady = this._fetchBranches(session).then(
       fetched => {
         const list = fetched?.branches;
@@ -1067,6 +1068,7 @@ export class AssistantSessionsPanel extends Widget {
         } else if (list) {
           extra = list.length;
           askCount(extra);
+          stateHint(list.map(branch => branch.session_id));
           const newer = list.filter(
             branch => branch.file_mtime > session.file_mtime
           ).length;
@@ -1076,7 +1078,7 @@ export class AssistantSessionsPanel extends Widget {
             warning.setAttribute('role', 'alert');
             warning.textContent =
               `${newer} parallel session${newer === 1 ? ' was' : 's were'} ` +
-              'active after the one kept.';
+              'active after the current session.';
             confirmBody.node.appendChild(warning);
           }
           // The list just decided what the button acts on: an arm given while

package/style/base.css

@@ -684,7 +684,7 @@ body[data-jp-theme-light='true'] .jp-AiAssistantsPanel-dotHalo {
 }
 
 /* The two destructive confirmations' lines: the Remove question with its
-   caution, and the cleanup question, hint, caution and warning. The warning
+   caution, and the cleanup question, hint and warning. The warning
    box is separate from the body text because it answers one question - is a
    conversation this removal deletes newer than the one kept? - and it uses the
    warning colour, not the error colour: the removal is still the user's call.