merge branch v2 (release 2.0.0-beta.36)

Author: marcantondahmen

CHANGELOG.md

@@ -1,8 +1,16 @@
 # Changelog
 
-## [v2.0.0-beta.35](https://github.com/marcantondahmen/automad/commit/c89c1eff7308b588cb18c49bfe5c828c5e049f36)
+## [v2.0.0-beta.36](https://github.com/marcantondahmen/automad/commit/180984108f21b71c57a39acbbcaf4e96f065d464)
 
-Tue, 2 Jun 2026 20:44:15 +0200
+Tue, 2 Jun 2026 21:31:12 +0200
+
+### New Features
+
+- show count of selected blocks in ai assistance prompt ui ([180984108](https://github.com/marcantondahmen/automad/commit/180984108f21b71c57a39acbbcaf4e96f065d464))
+
+## [v2.0.0-beta.35](https://github.com/marcantondahmen/automad/commit/c59a7aebda4f74e28fa54087aea1f9481fedd65a)
+
+Tue, 2 Jun 2026 20:50:37 +0200
 
 ### Bugfixes
 

automad/lang/english.json

@@ -45,7 +45,9 @@
 	"back": "Back",
 	"backgroundColor": "Background Color",
 	"backgroundImage": "Background Image",
+	"block": "block",
 	"blockquote": "Blockquote",
+	"blocks": "blocks",
 	"blur": "Blur",
 	"blurTool": "Blur",
 	"bold": "Bold",
@@ -520,9 +522,9 @@
 	"systemAi": "AI Assistance",
 	"systemAiCardInfo": "Configure AI providers for an AI assisted editing experience",
 	"systemAiChangeApiKey": "API key",
+	"systemAiClaudeSetupHelp": "Using the Claude API requires an account on their <a href='{urlPlatform}' target='_blank'>API platform page</a>, an active billing setup, and a valid API key, which can be managed <a href='{urlApiKeys}' target='_blank'>here</a>.",
 	"systemAiInfo": "Enable AI-assisted editing to enhance your writing workflow directly in the editor. Use the AI assistant to rewrite, expand, summarize, translate, and refine content, helping you create and improve text more efficiently.",
 	"systemAiOpenAiSetupHelp": "Using OpenAI requires an account on their <a href='{urlPlatform}' target='_blank'>API platform page</a>, an active billing setup, and a valid API key, which can be managed <a href='{urlApiKeys}' target='_blank'>here</a>.",
-	"systemAiClaudeSetupHelp": "Using the Claude API requires an account on their <a href='{urlPlatform}' target='_blank'>API platform page</a>, an active billing setup, and a valid API key, which can be managed <a href='{urlApiKeys}' target='_blank'>here</a>.",
 	"systemAiProviderApiKeyModalButton": "Validate and save",
 	"systemAiProviderApiKeyModalTitle": "API Key",
 	"systemAiProviderInfo": "Configure one or more AI providers below by adding an API key and selecting the models you want to make available in the editor.",

automad/src/client/admin/editor/plugins/AiAssistance.ts

@@ -625,6 +625,7 @@ export class AiAssistance extends BasePlugin {
 						this.editor.blocks.getCurrentBlockIndex();
 
 					this.selectedBlocks = [];
+					this.toggleSelectedBlockHighlighting(false);
 
 					selectionBinding.value =
 						this.selectedRange?.toString() || '';
@@ -633,14 +634,14 @@ export class AiAssistance extends BasePlugin {
 				if (!target.closest(`.${AiAssistance.CLS}`)) {
 					this.selectedBlocks =
 						this.editor.blockSelection.selectedBlocks;
-
-					this.toggleSelectedBlockHighlighting(false);
 				}
 
 				if (this.selectedBlocks.length > 0) {
+					const count = this.selectedBlocks.length;
+
+					selectionBinding.value = `↪ ${count} ${count > 1 ? App.text('blocks') : App.text('block')}`;
+
 					this.selectedRange = null;
-					selectionBinding.value =
-						this.selectedRange?.toString() || '';
 				}
 			})
 		);

automad/src/server/App.php

@@ -56,7 +56,7 @@
  * @license See LICENSE.md for license information
  */
 class App {
-	const VERSION = '2.0.0-beta.35';
+	const VERSION = '2.0.0-beta.36';
 
 	/**
 	 * Required PHP version.

lib/composer.lock

@@ -1,6 +1,6 @@
 {
   "name": "automad",
-  "version": "2.0.0-beta.35",
+  "version": "2.0.0-beta.36",
   "description": "Automad",
   "author": "Marc Anton Dahmen",
   "private": true,