merge branch v2 (release 2.0.0-beta.44)

Author: marcantondahmen

CHANGELOG.md

@@ -1,8 +1,24 @@
 # Changelog
 
-## [v2.0.0-beta.43](https://github.com/marcantondahmen/automad/commit/5814fd5fd37c8260b4edbab1cda460f6ae3fa07b)
+## [v2.0.0-beta.44](https://github.com/marcantondahmen/automad/commit/5719c15ba70ffba792a21759de3e87be48151e96)
 
-Sun, 14 Jun 2026 20:35:51 +0200
+Sat, 20 Jun 2026 11:46:22 +0200
+
+### New Features
+
+- update standard lite theme ([9a863a771](https://github.com/marcantondahmen/automad/commit/9a863a77134c2959683d62804c238118a4ea3652))
+
+### Bugfixes
+
+- clear cache when changing ai provider settings in order to display changes correctly ([03f0fc3df](https://github.com/marcantondahmen/automad/commit/03f0fc3df1b69bd80e8606b117eec7063492dfa9))
+- fix height calculation of auto-sized textareas ([a4f8c7511](https://github.com/marcantondahmen/automad/commit/a4f8c7511f806632efbcbea4fe2c4701501fae16))
+- fix selecting a tag from dropdown when using the enter key ([319ba32d1](https://github.com/marcantondahmen/automad/commit/319ba32d1d6aeb3c88eff44cdabd5b70e3fddd72))
+- fix warning when unserializing ai provider configs ([b5fb2751b](https://github.com/marcantondahmen/automad/commit/b5fb2751b55b884bbfde9363ef5efd880b1466d5))
+- remove markdown code blocks from ai assistance output ([f7904fed1](https://github.com/marcantondahmen/automad/commit/f7904fed178e6062bbb8b53be7dac54c05aa4136))
+
+## [v2.0.0-beta.43](https://github.com/marcantondahmen/automad/commit/f652576a419b0b2993815e480228f74a1da6f510)
+
+Sun, 14 Jun 2026 20:39:14 +0200
 
 ### Bugfixes
 

automad/src/client/admin/components/Root.ts

@@ -45,7 +45,6 @@ import {
 	initTooltips,
 	requestAPI,
 	Attr,
-	initEnterKeyHandler,
 	initWindowErrorHandler,
 	fire,
 	EventName,
@@ -117,7 +116,6 @@ export class RootComponent extends BaseComponent {
 			App.root.update();
 		});
 
-		initEnterKeyHandler();
 		initInputChangeHandler();
 		this.validateSession();
 

automad/src/client/admin/core/events.ts

@@ -208,19 +208,6 @@ export const listenToClassChange = (
 	return { remove };
 };
 
-/**
- * Make any focused element clickable using the enter key.
- *
- * @return the listener
- */
-export const initEnterKeyHandler = (): Listener => {
-	return listen(document, 'keydown', (event: KeyboardEvent): void => {
-		if (event.keyCode == 13) {
-			(document.activeElement as HTMLButtonElement).click();
-		}
-	});
-};
-
 /**
  * Add validate class to changed input field.
  *

automad/src/client/admin/styles/components/field.less

@@ -33,6 +33,7 @@
  */
 
 .am-c-field {
+	position: relative;
 	display: flex;
 	flex-direction: column;
 	gap: @am-flex-gap;

automad/src/client/admin/styles/form/input.less

@@ -133,6 +133,9 @@
 		resize: none;
 		scrollbar-width: thin !important;
 		overflow-y: hidden;
+		text-wrap: wrap;
+		word-break: break-word;
+		overflow-wrap: break-word;
 	}
 
 	&-combo {

automad/src/server/App.php

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

automad/src/server/Controllers/API/AiAssistanceController.php

@@ -92,7 +92,7 @@ public static function text(): Response {
 		$ConfigFile->set('AM_AI_PROVIDER_ID', $providerId);
 		$ConfigFile->write();
 
-		$Response->setData(array('output' => $provider->requestTextApi($prompt, $target, $context, $Messenger)));
+		$Response->setData(array('output' => $provider->generate($prompt, $target, $context, $Messenger)));
 
 		return $Response->setError($Messenger->getError());
 	}

automad/src/server/Controllers/API/AiProviderController.php

@@ -36,6 +36,7 @@
 namespace Automad\Controllers\API;
 
 use Automad\API\Response;
+use Automad\Core\Cache;
 use Automad\Core\Request;
 use Automad\Core\Text;
 use Automad\System\Ai\ProviderCollection;
@@ -106,6 +107,8 @@ public static function remove(): Response {
 
 		$provider->remove();
 
+		Cache::clear();
+
 		return $Response;
 	}
 
@@ -137,6 +140,8 @@ public static function setApiKey(): Response {
 
 		$provider->setApiKey($apiKey);
 
+		Cache::clear();
+
 		return $Response;
 	}
 
@@ -164,6 +169,8 @@ public static function setModel(): Response {
 
 		$provider->setModel($model);
 
+		Cache::clear();
+
 		return $Response;
 	}
 

automad/src/server/System/Ai/ProviderConfig.php

@@ -99,7 +99,7 @@ public static function load(string $providerId): ProviderConfig|null {
 		}
 
 		try {
-			return unserialize(strval(file_get_contents($path)));
+			return unserialize(trim(strval(file_get_contents($path))));
 		} catch (\Throwable $th) {
 			return null;
 		}

automad/src/server/System/Ai/Providers/AbstractProvider.php

@@ -37,6 +37,7 @@
 
 use Automad\Core\Debug;
 use Automad\Core\Messenger;
+use Automad\Core\Str;
 use Automad\System\Ai\ProviderConfig;
 use Automad\System\Fetch;
 
@@ -62,6 +63,24 @@ public function __construct() {
 		$this->ProviderConfig = ProviderConfig::load($this->getId()) ?? new ProviderConfig($this->getId());
 	}
 
+	/**
+	 * Generate text.
+	 *
+	 * @param string $prompt
+	 * @param string $target
+	 * @param string $context
+	 * @param Messenger $Messenger
+	 * @return string
+	 */
+	public function generate(string $prompt, string $target, string $context, Messenger $Messenger): string {
+		$output = $this->requestTextApi($prompt, $target, $context, $Messenger);
+
+		$output = Str::stripStart($output, '```html');
+		$output = Str::stripEnd($output, '```');
+
+		return trim($output);
+	}
+
 	/**
 	 * The help text that is shown alongside the API key dialog on setup.
 	 *
@@ -123,17 +142,6 @@ public function remove(): void {
 		$this->ProviderConfig->delete();
 	}
 
-	/**
-	 * Make a request to the provider's text endpoint.
-	 *
-	 * @param string $prompt
-	 * @param string $target
-	 * @param string $context
-	 * @param Messenger $Messenger
-	 * @return string
-	 */
-	abstract public function requestTextApi(string $prompt, string $target, string $context, Messenger $Messenger): string;
-
 	/**
 	 * Set a provider api key.
 	 *
@@ -303,6 +311,7 @@ protected function getInstructions(): string {
 			- explain changes
 			- add introductions
 			- add labels
+			- add markdown
 			- mention the task
 			- wrap the result in quotes
 
@@ -349,4 +358,15 @@ protected function requestProviderApi(string $endpoint, array|null $data = null,
 
 		return $response;
 	}
+
+	/**
+	 * Make a request to the provider's text endpoint.
+	 *
+	 * @param string $prompt
+	 * @param string $target
+	 * @param string $context
+	 * @param Messenger $Messenger
+	 * @return string
+	 */
+	abstract protected function requestTextApi(string $prompt, string $target, string $context, Messenger $Messenger): string;
 }