fix: keep receipt typing and single-site test compatibility

Author: superdav42

includes/Core/ConversationTrimmer.php

@@ -597,6 +597,9 @@ private static function is_post_creation_tool( string $name ): bool {
 	}
 
 	/** Preserve the stable identifiers returned by media and form creation tools. */
+	/**
+	 * @param array<string,mixed> $function_response Serialized function response.
+	 */
 	private static function compact_resource_response_receipt( array $function_response ): string {
 		[ $name, $response ] = self::compact_response_identity( $function_response );
 		if ( ! self::is_compact_resource_tool( $name ) ) {
@@ -612,6 +615,9 @@ private static function compact_resource_response_receipt( array $function_respo
 	}
 
 	/** Preserve bounded intent for media and form creation calls. */
+	/**
+	 * @param array<string,mixed> $function_call Serialized function call.
+	 */
 	private static function compact_resource_call_receipt( array $function_call ): string {
 		[ $name, $args ] = self::compact_call_identity( $function_call );
 		if ( ! self::is_compact_resource_tool( $name ) ) {
@@ -898,6 +904,10 @@ private static function tool_name_has_suffix( string $name, string $suffix ): bo
 	 *
 	 * @return array{0:string,1:array<string,mixed>}
 	 */
+	/**
+	 * @param array<string,mixed> $function_call Serialized function call.
+	 * @return array{0:string,1:array<string,mixed>}
+	 */
 	private static function compact_call_identity( array $function_call ): array {
 		$name = self::compact_tool_name( $function_call['name'] ?? 'tool' );
 		$args = self::compact_tool_payload_array( $function_call['args'] ?? array() );
@@ -914,6 +924,10 @@ private static function compact_call_identity( array $function_call ): array {
 	 *
 	 * @return array{0:string,1:array<string,mixed>}
 	 */
+	/**
+	 * @param array<string,mixed> $function_response Serialized function response.
+	 * @return array{0:string,1:array<string,mixed>}
+	 */
 	private static function compact_response_identity( array $function_response ): array {
 		$name     = self::compact_tool_name( $function_response['name'] ?? 'tool' );
 		$response = self::compact_tool_payload_array( $function_response['response'] ?? array() );
@@ -929,20 +943,43 @@ private static function compact_response_identity( array $function_response ): a
 		return array( $name, $response );
 	}
 
-	/** Normalize a JSON-or-array tool payload without retaining it beyond the caller. */
+	/**
+	 * Normalize a JSON-or-array tool payload without retaining it beyond the caller.
+	 *
+	 * @return array<string,mixed>
+	 */
 	private static function compact_tool_payload_array( mixed $payload ): array {
 		if ( is_array( $payload ) ) {
-			return $payload;
+			/** @var array<string,mixed> $normalized */
+			$normalized = self::string_keyed_payload( $payload );
+			return $normalized;
 		}
 
 		if ( is_string( $payload ) ) {
 			$decoded = json_decode( $payload, true );
-			return is_array( $decoded ) ? $decoded : array();
+			if ( is_array( $decoded ) ) {
+				return self::string_keyed_payload( $decoded );
+			}
+			return array();
 		}
 
 		return array();
 	}
 
+	/**
+	 * @param array $payload Tool payload.
+	 * @return array<string,mixed> String-keyed payload.
+	 */
+	private static function string_keyed_payload( array $payload ): array {
+		$normalized = array();
+		foreach ( $payload as $key => $value ) {
+			if ( is_string( $key ) ) {
+				$normalized[ $key ] = $value;
+			}
+		}
+		return $normalized;
+	}
+
 	/** Normalize and bound one safe receipt value. */
 	private static function compact_receipt_value( string $value ): string {
 		$value = self::normalize_compact_text( wp_strip_all_tags( $value ) );

tests/SdAiAgent/REST/SessionControllerTest.php

@@ -41,11 +41,15 @@ public function test_background_dispatcher_queues_job_on_main_site_once(): void
 		};
 		add_filter( 'pre_http_request', $intercept );
 
-		switch_to_blog( $tenant_id );
+		if ( is_multisite() ) {
+			switch_to_blog( $tenant_id );
+		}
 		BackgroundJobDispatcher::dispatch( $job_id, 'test-token' );
 		BackgroundJobDispatcher::dispatch( $job_id, 'test-token' );
 		$this->assertSame( $tenant_id, get_current_blog_id() );
-		restore_current_blog();
+		if ( is_multisite() ) {
+			restore_current_blog();
+		}
 		remove_filter( 'pre_http_request', $intercept );
 
 		$this->assertNotFalse( wp_next_scheduled( BackgroundJobDispatcher::HOOK, $args ) );