Merge branch dev into published

Author: PEZ

.github/copilot-instructions.md

@@ -1,35 +1,2 @@
-## Design Context
-
-### Users
-
-VS Code developers adopting or practicing Clojure/ClojureScript. The audience spans from **complete Clojure beginners** (the explicit growth mission) to **experienced Clojurians** who chose VS Code as their editor. They arrive with VS Code muscle memory and expectations — syntax highlighting, command palette, familiar keybindings — and need the REPL to feel like a natural extension of that, not a foreign system bolted on.
-
-The context of use is deep-focus programming: long sessions, high cognitive load, frequent context-switching between code and REPL output. The interface must never compete for attention with the code itself.
-
-### Brand Personality
-
-**Approachable, precise, alive.**
-
-Calva is named after Calvados — a spirit that gains its character from what it's distilled from (CIDER/nREPL) and what it matures in (VS Code). The brand voice is that of a master distiller: confident but unhurried, opinionated but welcoming, spartan but *not* poor. As the Tao states: "VS Code and Clojure brought together has the capacity to create something amazingly rich and luxurious."
-
-The emotional goals are **confidence** (I know what's happening), **flow** (nothing breaks my concentration), and **precision** (sharp, exact, professional). The anti-reference is GitLens — invasive, attention-grabbing, too much visual presence in the editor.
-
-### Aesthetic Direction
-
-- **Theme**: Native VS Code. Custom surfaces (webviews, output panels) should feel like they belong to the user's chosen VS Code theme, not to Calva's own visual system. Use `var(--vscode-*)` CSS custom properties as the primary palette.
-- **Brand color**: Golden amber `#db9550` — core brand accent. Use sparingly: status indicators, the Calva logo, moments of identity. Never as a dominant surface color.
-- **Font**: Fira Code is the bundled code font for webviews. Body/UI text inherits from VS Code's editor font family.
-- **Tone**: Quiet competence. The interface should feel like a well-made tool — present when needed, invisible when not. Spartan in the Halloway sense: few features, each done right.
-- **Anti-patterns**: Invasive decorations, unsolicited overlays, attention-competing UI, feature clutter. Calva should never make the user aware of Calva when they're trying to think about Clojure.
-
-### Design Principles
-
-1. **The VS Code way is Calva's way.** Leverage existing VS Code patterns and conventions. What's old is old; what's new should be as easy as possible to pick up. Don't invent new interaction patterns when VS Code already has one.
-
-2. **Remove obstacles to the REPL.** Every UI decision should be evaluated by: does this help or hinder the developer's path to evaluating code and understanding results? The REPL connection is the critical moment; evaluation results are the critical data.
-
-3. **Spartan, not poor.** Resist feature creep. Few knobs, sane defaults. But the knobs that exist should feel luxurious — well-considered, well-placed, well-documented. Quality over quantity.
-
-4. **Simplify the complex.** Calva has organic complexity (multiple output destinations, REPL window maintenance, session routing). Design should actively work to reduce cognitive load around these areas rather than expose the underlying complexity.
-
-5. **Invisible when working, present when needed.** Status information, connection state, session routing — these should be discoverable but not intrusive. The developer's attention belongs to their code, not to Calva's UI.
+* When delegating Calva design/development to a subagent, use the calva-nucleus agent. It has the Tao of Calva encoded.
+* When designing UI and Ux, follow the principles in [.impeccable.md](../.impeccable.md).

.impeccable.md

@@ -2,7 +2,7 @@
 
 ## Users
 
-VS Code developers adopting or practicing Clojure/ClojureScript. The audience spans from **complete Clojure beginners** (the explicit growth mission) to **experienced Clojurians** who chose VS Code as their editor. They arrive with VS Code muscle memory and expectations — syntax highlighting, command palette, familiar keybindings — and need the REPL to feel like a natural extension of that, not a foreign system bolted on.
+VS Code developers adopting or practicing Clojure/ClojureScript and all dialects. The audience spans from **complete Clojure beginners** (the explicit growth mission) to **experienced Clojurians** who chose VS Code as their editor. They arrive with VS Code muscle memory and expectations — syntax highlighting, command palette, familiar keybindings — and need the REPL to feel like a natural extension of that, not a foreign system bolted on.
 
 The context of use is deep-focus programming: long sessions, high cognitive load, frequent context-switching between code and REPL output. The interface must never compete for attention with the code itself.
 
@@ -12,7 +12,7 @@ The context of use is deep-focus programming: long sessions, high cognitive load
 
 Calva is named after Calvados — a spirit that gains its character from what it's distilled from (CIDER/nREPL) and what it matures in (VS Code). The brand voice is that of a master distiller: confident but unhurried, opinionated but welcoming, spartan but *not* poor. As the Tao states: "VS Code and Clojure brought together has the capacity to create something amazingly rich and luxurious."
 
-The emotional goals are **confidence** (I know what's happening), **flow** (nothing breaks my concentration), and **precision** (sharp, exact, professional). The anti-reference is GitLens — invasive, attention-grabbing, too much visual presence in the editor.
+The emotional goals are **confidence** (I know what's happening), **flow** (nothing breaks my concentration), and **precision** (sharp, exact, professional). The anti-reference is invasive, attention-grabbing, too much visual presence in the editor.
 
 ## Aesthetic Direction
 
@@ -30,6 +30,4 @@ The emotional goals are **confidence** (I know what's happening), **flow** (noth
 
 3. **Spartan, not poor.** Resist feature creep. Few knobs, sane defaults. But the knobs that exist should feel luxurious — well-considered, well-placed, well-documented. Quality over quantity.
 
-4. **Simplify the complex.** Calva has organic complexity (multiple output destinations, REPL window maintenance, session routing). Design should actively work to reduce cognitive load around these areas rather than expose the underlying complexity.
-
-5. **Invisible when working, present when needed.** Status information, connection state, session routing — these should be discoverable but not intrusive. The developer's attention belongs to their code, not to Calva's UI.
+4. **Invisible when working, present when needed.** Status information, connection state, session routing — these should be discoverable but not intrusive. The developer's attention belongs to their code, not to Calva's UI.

CHANGELOG.md

@@ -4,6 +4,11 @@ Changes to Calva.
 
 ## [Unreleased]
 
+## [2.0.584] - 2026-05-07
+
+- [enable new clojure-lsp code actions: inline function, if<->cond, extract selection to function, move to :let](https://github.com/BetterThanTomorrow/calva/issues/3204)
+- Fix: [Calva forgets the renamed session name on disconnect->reconnect](https://github.com/BetterThanTomorrow/calva/issues/3207)
+
 ## [2.0.583] - 2026-05-04
 
 - [Enable renaming of REPL sessions](https://github.com/BetterThanTomorrow/calva/issues/3197)

package-lock.json

@@ -3,7 +3,7 @@
   "displayName": "Calva: Clojure & ClojureScript Interactive Programming",
   "description": "Integrated REPL, formatter, Paredit, and more. Powered by cider-nrepl and clojure-lsp.",
   "icon": "assets/calva.png",
-  "version": "2.0.583",
+  "version": "2.0.584",
   "publisher": "betterthantomorrow",
   "author": {
     "name": "Better Than Tomorrow",

package.json

@@ -98,6 +98,7 @@ async function connectViaWebSocket(
   isJackIn = false
 ): Promise<ConnectResult> {
   let activeClient: nrepl.NReplClient | undefined;
+  let preservedRenames: Partial<sessionRoleUtils.SessionRoleKeys> | undefined;
   const baseSessionNames = sessionRoleUtils.deriveSessionRoleKeys(connectSequence);
   const projectRootPath = state.getProjectRootUri().fsPath;
   const projectRoot = state.getProjectRootUri().toString();
@@ -193,6 +194,7 @@ async function connectViaWebSocket(
           connectSequence,
           baseSessionNames,
           suffix: resolution.suffix,
+          renamedSessionNames: preservedRenames,
         },
       });
 
@@ -211,19 +213,29 @@ async function connectViaWebSocket(
       });
       clientRegistry.setCljcTargetForConnection(client.clientKey, 'primary');
 
+      // Apply preserved rename from previous browser connection
+      const renamedPrimary = preservedRenames?.primary;
+      if (renamedPrimary && renamedPrimary !== mainKey) {
+        sessionRegistry.renameSession(mainKey, renamedPrimary);
+      }
+      const effectiveMainKey = renamedPrimary ?? mainKey;
+      preservedRenames = undefined;
+
       status.update();
-      output.appendLineOtherOut(`Connected session: ${mainKey}, ws://${wsHost}:${currentPort}`);
+      output.appendLineOtherOut(
+        `Connected session: ${effectiveMainKey}, ws://${wsHost}:${currentPort}`
+      );
       replSession.updateReplSessionType();
 
-      outputWindow.setSession(mainSession, client.ns, mainKey);
+      outputWindow.setSession(mainSession, client.ns, effectiveMainKey);
 
       if (config.getConfig().autoEvaluateCode.onConnect.clj) {
         output.appendLineOtherOut(
           `Evaluating code from settings: 'calva.autoEvaluateCode.onConnect.clj'`
         );
         await evaluate.evaluateInOutputWindow(
           config.getConfig().autoEvaluateCode.onConnect.clj,
-          mainKey,
+          effectiveMainKey,
           outputWindow.getNs(),
           {}
         );
@@ -234,7 +246,12 @@ async function connectViaWebSocket(
         connectSequence.afterPrimaryReplConnectedCode ?? connectSequence.afterCLJReplJackInCode;
       if (afterMainReplCode) {
         output.appendLineOtherOut(`Evaluating 'afterPrimaryReplConnectedCode'`);
-        await evaluate.evaluateInOutputWindow(afterMainReplCode, mainKey, outputWindow.getNs(), {});
+        await evaluate.evaluateInOutputWindow(
+          afterMainReplCode,
+          effectiveMainKey,
+          outputWindow.getNs(),
+          {}
+        );
       }
       if (!connectSequence.cljsType || connectSequence.cljsType === 'none') {
         output.maybePrintLegacyREPLWindowOutputMessage();
@@ -305,6 +322,9 @@ async function connectViaWebSocket(
         output.appendLineOtherOut('Browser REPL disconnected, waiting for reconnection...');
         state.connectionLogChannel().appendLine('Browser REPL disconnected');
 
+        // Preserve renames across browser reconnections
+        preservedRenames = clientRegistry.getConnectionState(clientKey)?.renamedSessionNames;
+
         // Clean up client and sessions but keep server alive
         clientTeardown.releaseClientSuffix(clientKey);
         const wasRegistered = clientRegistry.unregisterClient(clientKey);
@@ -466,6 +486,7 @@ async function connectToHost(
         connectSequence,
         baseSessionNames,
         suffix: resolution.suffix,
+        renamedSessionNames: resolution.renamedSessionNames,
       },
     });
     localClient.addOnCloseHandler((c) => {
@@ -504,19 +525,26 @@ async function connectToHost(
     });
     clientRegistry.setCljcTargetForConnection(localClient.clientKey, 'primary');
 
+    // Apply preserved rename from previous connection
+    const renamedPrimary = resolution.renamedSessionNames?.primary;
+    if (renamedPrimary && renamedPrimary !== mainKey) {
+      sessionRegistry.renameSession(mainKey, renamedPrimary);
+    }
+    const effectivePrimaryKey = renamedPrimary ?? mainKey;
+
     status.update();
-    output.appendLineOtherOut(`Connected session: ${mainKey}, port: ${port}`);
+    output.appendLineOtherOut(`Connected session: ${effectivePrimaryKey}, port: ${port}`);
     replSession.updateReplSessionType();
 
-    outputWindow.setSession(mainSession, localClient.ns, mainKey);
+    outputWindow.setSession(mainSession, localClient.ns, effectivePrimaryKey);
 
     if (config.getConfig().autoEvaluateCode.onConnect.clj) {
       output.appendLineOtherOut(
         `Evaluating code from settings: 'calva.autoEvaluateCode.onConnect.clj'`
       );
       await evaluate.evaluateInOutputWindow(
         config.getConfig().autoEvaluateCode.onConnect.clj,
-        mainKey,
+        effectivePrimaryKey,
         outputWindow.getNs(),
         {}
       );
@@ -527,14 +555,19 @@ async function connectToHost(
       connectSequence.afterPrimaryReplConnectedCode ?? connectSequence.afterCLJReplJackInCode;
     if (afterMainReplCode) {
       output.appendLineOtherOut(`Evaluating 'afterPrimaryReplConnectedCode'`);
-      await evaluate.evaluateInOutputWindow(afterMainReplCode, mainKey, outputWindow.getNs(), {});
+      await evaluate.evaluateInOutputWindow(
+        afterMainReplCode,
+        effectivePrimaryKey,
+        outputWindow.getNs(),
+        {}
+      );
     }
     if (!connectSequence.cljsType || connectSequence.cljsType === 'none') {
       output.maybePrintLegacyREPLWindowOutputMessage();
     }
     void output.replWindowAppendPrompt();
 
-    clojureDocs.probeAndSetSession(mainSession, mainKey);
+    clojureDocs.probeAndSetSession(mainSession, effectivePrimaryKey);
 
     let cljsSession = null,
       cljsBuild = null;
@@ -700,24 +733,34 @@ async function setUpCljsRepl(
   });
   clientRegistry.setCljcTargetForConnection(clientKey, 'secondary');
 
-  clojureDocs.probeAndSetSession(session, cljsKey);
+  // Apply preserved rename from previous connection
+  const renamedSecondary =
+    clientRegistry.getConnectionState(clientKey)?.renamedSessionNames?.secondary;
+  const effectiveCljsKey =
+    renamedSecondary && renamedSecondary !== cljsKey
+      ? (sessionRegistry.renameSession(cljsKey, renamedSecondary), renamedSecondary)
+      : cljsKey;
+
+  clojureDocs.probeAndSetSession(session, effectiveCljsKey);
 
   status.update();
-  output.appendLineOtherOut(`Connected session: ${cljsKey}${build ? ', repl: ' + build : ''}`);
+  output.appendLineOtherOut(
+    `Connected session: ${effectiveCljsKey}${build ? ', repl: ' + build : ''}`
+  );
   outputWindow.appendLine(
     resultsOutputUtil.formatAsLineComments(outputWindow.CLJS_CONNECT_GREETINGS)
   );
   const description = await session.describe(true);
   const ns = description.aux?.['current-ns'] || 'user';
   await session.eval(`(in-ns '${ns})`, 'user').value;
-  outputWindow.setSession(session, ns, cljsKey);
+  outputWindow.setSession(session, ns, effectiveCljsKey);
   if (config.getConfig().autoEvaluateCode.onConnect.cljs) {
     output.appendLineOtherOut(
       `Evaluating code from settings: 'calva.autoEvaluateCode.onConnect.cljs'`
     );
     await evaluate.evaluateInOutputWindow(
       config.getConfig().autoEvaluateCode.onConnect.cljs,
-      cljsKey,
+      effectiveCljsKey,
       ns,
       {}
     );