jupyterlab_ai_code_assistants_extension 1.2.71 → 1.2.73

package/README.md

@@ -77,7 +77,7 @@ pip install jupyterlab_ai_code_assistants_extension
 
 ## Migrating from the standalone extensions
 
-This package supersedes `jupyterlab_claude_code_extension`, `jupyterlab_codex_extension` and `jupyterlab_kimi_code_extension`. On first run it carries their settings and favourites over automatically; uninstall the standalones once you are ready:
+This package supersedes `jupyterlab_claude_code_extension`, `jupyterlab_codex_extension` and `jupyterlab_kimi_code_extension`. On first run it carries their settings and favourites over automatically, and it never replaces a setting you have already saved in this extension; uninstall the standalones once you are ready:
 
 ```bash
 pip uninstall jupyterlab_claude_code_extension jupyterlab_codex_extension jupyterlab_kimi_code_extension

package/lib/index.js

@@ -347,6 +347,14 @@ const plugin = {
                 const result = await requestAPI('migrate', serverSettings, { method: 'POST', body: '{}' });
                 for (const entry of (_a = result.migrated) !== null && _a !== void 0 ? _a : []) {
                     for (const [key, value] of Object.entries((_b = entry.keys) !== null && _b !== void 0 ? _b : {})) {
+                        // A value already saved here is the user's newer choice and
+                        // stays. The marker that stops a second migration lives in the
+                        // Jupyter data folder, apart from these settings, so a server
+                        // that shares only the settings folder migrates again and would
+                        // put the retired extension's value back (DEF-RETI-299).
+                        if ((settings === null || settings === void 0 ? void 0 : settings.get(key).user) !== undefined) {
+                            continue;
+                        }
                         // Per key. The server marks EVERY provider migrated before it
                         // answers, so one rejection aborting the loop used to drop the
                         // remaining providers' values with no retry ever offered again -

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "jupyterlab_ai_code_assistants_extension",
-    "version": "1.2.71",
+    "version": "1.2.73",
     "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__/index.spec.ts

@@ -851,14 +851,25 @@ describe('ACC-SETT - settings drive the panels', () => {
       saveRejects?: boolean;
       layoutSaveRejects?: boolean;
       shellNotRestored?: boolean;
+      /** The `migrated` list `POST migrate` answers with; without it the
+       * request fails, as with nothing to carry over. */
+      migrated?: unknown[];
     } = {}
   ): Promise<ISettingsHarness> {
     const serverSettings = {};
-    request.mockImplementation((path: string, settings: unknown) =>
-      path === 'status' && settings === serverSettings
-        ? Promise.resolve(roster())
-        : Promise.reject(new Error('not this activation'))
-    );
+    request.mockImplementation((path: string, settings: unknown) => {
+      if (settings === serverSettings && path === 'status') {
+        return Promise.resolve(roster());
+      }
+      if (
+        settings === serverSettings &&
+        path === 'migrate' &&
+        options.migrated
+      ) {
+        return Promise.resolve({ migrated: options.migrated });
+      }
+      return Promise.reject(new Error('not this activation'));
+    });
 
     const docks: [AssistantSessionsPanel, string][] = [];
     const activated: { id: string; afterDocks: number }[] = [];
@@ -1227,6 +1238,28 @@ describe('ACC-SETT - settings drive the panels', () => {
     dispose(live);
   });
 
+  // ------------------------------------------------------- DEF-RETI-299
+
+  const SKIP_KEY = 'providers.claude.dangerouslySkipPermissions';
+  const migratedSkip = (value: boolean): unknown[] => [
+    { provider_id: 'claude', keys: { [SKIP_KEY]: value }, favourites: [] }
+  ];
+
+  it('DEF-RETI-299 - a migration run again keeps the value the user saved here', async () => {
+    const live = await activate(
+      { [SKIP_KEY]: true },
+      { migrated: migratedSkip(false) }
+    );
+    expect(live.saved).toEqual([]);
+    dispose(live);
+  });
+
+  it('ACC-RETI-85 - a migrated key with nothing saved here is carried over', async () => {
+    const live = await activate({}, { migrated: migratedSkip(true) });
+    expect(live.saved).toEqual([[SKIP_KEY, true]]);
+    dispose(live);
+  });
+
   // ------------------------------------------------------- ACC-SETT-189
 
   const MOVE_TO_PROJ = { path: 'proj', dontShowBrowser: true };

package/src/index.ts

@@ -439,6 +439,14 @@ const plugin: JupyterFrontEndPlugin<void> = {
         );
         for (const entry of result.migrated ?? []) {
           for (const [key, value] of Object.entries(entry.keys ?? {})) {
+            // A value already saved here is the user's newer choice and
+            // stays. The marker that stops a second migration lives in the
+            // Jupyter data folder, apart from these settings, so a server
+            // that shares only the settings folder migrates again and would
+            // put the retired extension's value back (DEF-RETI-299).
+            if (settings?.get(key).user !== undefined) {
+              continue;
+            }
             // Per key. The server marks EVERY provider migrated before it
             // answers, so one rejection aborting the loop used to drop the
             // remaining providers' values with no retry ever offered again -