Feature/add assistant name support

memory/repository/spring-ai-model-chat-memory-repository-neo4j/src/main/java/org/springframework/ai/chat/memory/repository/neo4j/Neo4jChatMemoryRepository.java

@@ -193,6 +193,7 @@ private Message buildAssistantMessage(org.neo4j.driver.Record record, Map<String
 						(String) toolCallMap.get("name"), (String) toolCallMap.get("arguments"));
 			}))
 			.media(mediaList)
+			.name((String) messageMap.get("name"))
 			.build();
 		return message;
 	}

models/spring-ai-azure-openai/src/main/java/org/springframework/ai/azure/openai/AzureOpenAiChatModel.java

@@ -16,6 +16,8 @@
 
 package org.springframework.ai.azure.openai;
 
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Base64;
 import java.util.Collections;
@@ -600,6 +602,16 @@ private List<ChatRequestMessage> fromSpringAiMessage(Message message) {
 				}
 				var azureAssistantMessage = new ChatRequestAssistantMessage(message.getText());
 				azureAssistantMessage.setToolCalls(toolCalls);
+				// Try to set name field if supported by Azure OpenAI SDK
+				try {
+					// Use reflection to check if setName method exists and call it
+					Method setNameMethod = azureAssistantMessage.getClass().getMethod("setName", String.class);
+					setNameMethod.invoke(azureAssistantMessage, assistantMessage.getName());
+				}
+				catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
+					// Name field not supported in current Azure OpenAI SDK version
+					// This is expected behavior for some SDK versions
+				}
 				return List.of(azureAssistantMessage);
 			case TOOL:
 				ToolResponseMessage toolMessage = (ToolResponseMessage) message;

models/spring-ai-deepseek/src/main/java/org/springframework/ai/deepseek/DeepSeekAssistantMessage.java

@@ -92,6 +92,28 @@ protected DeepSeekAssistantMessage(String content, String reasoningContent, Bool
 		this.prefix = prefix;
 	}
 
+	// Constructors with name parameter
+	public DeepSeekAssistantMessage(String content, Map<String, Object> properties, String name) {
+		super(content, properties, name);
+	}
+
+	public DeepSeekAssistantMessage(String content, Map<String, Object> properties, List<ToolCall> toolCalls,
+			String name) {
+		super(content, properties, toolCalls, name);
+	}
+
+	public DeepSeekAssistantMessage(String content, String reasoningContent, Map<String, Object> properties,
+			List<ToolCall> toolCalls, String name) {
+		super(content, properties, toolCalls, name);
+		this.reasoningContent = reasoningContent;
+	}
+
+	public DeepSeekAssistantMessage(String content, String reasoningContent, Map<String, Object> properties,
+			List<ToolCall> toolCalls, List<Media> media, String name) {
+		super(content, properties, toolCalls, media, name);
+		this.reasoningContent = reasoningContent;
+	}
+
 	public static DeepSeekAssistantMessage prefixAssistantMessage(String content) {
 		return prefixAssistantMessage(content, null);
 	}

models/spring-ai-deepseek/src/main/java/org/springframework/ai/deepseek/DeepSeekChatModel.java

@@ -452,8 +452,9 @@ else if (message.getMessageType() == MessageType.ASSISTANT) {
 						&& Boolean.TRUE.equals(((DeepSeekAssistantMessage) message).getPrefix())) {
 					isPrefixAssistantMessage = true;
 				}
-				return List.of(new ChatCompletionMessage(assistantMessage.getText(),
-						ChatCompletionMessage.Role.ASSISTANT, null, null, toolCalls, isPrefixAssistantMessage, null));
+				return List
+					.of(new ChatCompletionMessage(assistantMessage.getText(), ChatCompletionMessage.Role.ASSISTANT,
+							assistantMessage.getName(), null, toolCalls, isPrefixAssistantMessage, null));
 			}
 			else if (message.getMessageType() == MessageType.TOOL) {
 				ToolResponseMessage toolMessage = (ToolResponseMessage) message;

models/spring-ai-minimax/src/main/java/org/springframework/ai/minimax/MiniMaxChatModel.java

@@ -528,7 +528,7 @@ else if (message.getMessageType() == MessageType.ASSISTANT) {
 					}).toList();
 				}
 				return List.of(new ChatCompletionMessage(assistantMessage.getText(),
-						ChatCompletionMessage.Role.ASSISTANT, null, null, toolCalls));
+						ChatCompletionMessage.Role.ASSISTANT, assistantMessage.getName(), null, toolCalls));
 			}
 			else if (message.getMessageType() == MessageType.TOOL) {
 				ToolResponseMessage toolMessage = (ToolResponseMessage) message;

models/spring-ai-openai/src/main/java/org/springframework/ai/openai/OpenAiChatModel.java

@@ -605,8 +605,9 @@ else if (message.getMessageType() == MessageType.ASSISTANT) {
 					audioOutput = new AudioOutput(assistantMessage.getMedia().get(0).getId(), null, null, null);
 
 				}
-				return List.of(new ChatCompletionMessage(assistantMessage.getText(),
-						ChatCompletionMessage.Role.ASSISTANT, null, null, toolCalls, null, audioOutput, null));
+				return List
+					.of(new ChatCompletionMessage(assistantMessage.getText(), ChatCompletionMessage.Role.ASSISTANT,
+							assistantMessage.getName(), null, toolCalls, null, audioOutput, null));
 			}
 			else if (message.getMessageType() == MessageType.TOOL) {
 				ToolResponseMessage toolMessage = (ToolResponseMessage) message;

models/spring-ai-zhipuai/src/main/java/org/springframework/ai/zhipuai/ZhiPuAiChatModel.java

@@ -521,7 +521,7 @@ else if (message.getMessageType() == MessageType.ASSISTANT) {
 					}).toList();
 				}
 				return List.of(new ChatCompletionMessage(assistantMessage.getText(),
-						ChatCompletionMessage.Role.ASSISTANT, null, null, toolCalls, null));
+						ChatCompletionMessage.Role.ASSISTANT, assistantMessage.getName(), null, toolCalls, null));
 			}
 			else if (message.getMessageType() == MessageType.TOOL) {
 				ToolResponseMessage toolMessage = (ToolResponseMessage) message;

spring-ai-model/src/main/java/org/springframework/ai/chat/messages/AssistantMessage.java

@@ -42,6 +42,8 @@ public class AssistantMessage extends AbstractMessage implements MediaContent {
 
 	protected final List<Media> media;
 
+	private final String name;
+
 	public AssistantMessage(String content) {
 		this(content, Map.of());
 	}
@@ -68,11 +70,29 @@ public AssistantMessage(String content, Map<String, Object> properties, List<Too
 	@Deprecated
 	public AssistantMessage(String content, Map<String, Object> properties, List<ToolCall> toolCalls,
 			List<Media> media) {
+		this(content, properties, toolCalls, media, null);
+	}
+
+	public AssistantMessage(String content, String name) {
+		this(content, Map.of(), name);
+	}
+
+	public AssistantMessage(String content, Map<String, Object> properties, String name) {
+		this(content, properties, List.of(), name);
+	}
+
+	public AssistantMessage(String content, Map<String, Object> properties, List<ToolCall> toolCalls, String name) {
+		this(content, properties, toolCalls, List.of(), name);
+	}
+
+	public AssistantMessage(String content, Map<String, Object> properties, List<ToolCall> toolCalls, List<Media> media,
+			String name) {
 		super(MessageType.ASSISTANT, content, properties);
 		Assert.notNull(toolCalls, "Tool calls must not be null");
 		Assert.notNull(media, "Media must not be null");
 		this.toolCalls = toolCalls;
 		this.media = media;
+		this.name = name;
 	}
 
 	public List<ToolCall> getToolCalls() {
@@ -88,6 +108,16 @@ public List<Media> getMedia() {
 		return this.media;
 	}
 
+	/**
+	 * Get the name of the assistant. This field allows the model to distinguish the name
+	 * of the assistant, making it easier for building multi-agent systems to share global
+	 * context.
+	 * @return the assistant name, or null if not set
+	 */
+	public String getName() {
+		return this.name;
+	}
+
 	@Override
 	public boolean equals(Object o) {
 		if (this == o) {
@@ -99,18 +129,19 @@ public boolean equals(Object o) {
 		if (!super.equals(o)) {
 			return false;
 		}
-		return Objects.equals(this.toolCalls, that.toolCalls) && Objects.equals(this.media, that.media);
+		return Objects.equals(this.toolCalls, that.toolCalls) && Objects.equals(this.media, that.media)
+				&& Objects.equals(this.name, that.name);
 	}
 
 	@Override
 	public int hashCode() {
-		return Objects.hash(super.hashCode(), this.toolCalls, this.media);
+		return Objects.hash(super.hashCode(), this.toolCalls, this.media, this.name);
 	}
 
 	@Override
 	public String toString() {
 		return "AssistantMessage [messageType=" + this.messageType + ", toolCalls=" + this.toolCalls + ", textContent="
-				+ this.textContent + ", metadata=" + this.metadata + "]";
+				+ this.textContent + ", name=" + this.name + ", metadata=" + this.metadata + "]";
 	}
 
 	public static Builder builder() {
@@ -131,6 +162,8 @@ public static final class Builder {
 
 		private List<Media> media = List.of();
 
+		private String name;
+
 		private Builder() {
 		}
 
@@ -154,8 +187,13 @@ public Builder media(List<Media> media) {
 			return this;
 		}
 
+		public Builder name(String name) {
+			this.name = name;
+			return this;
+		}
+
 		public AssistantMessage build() {
-			return new AssistantMessage(this.content, this.properties, this.toolCalls, this.media);
+			return new AssistantMessage(this.content, this.properties, this.toolCalls, this.media, this.name);
 		}
 
 	}

spring-ai-model/src/main/java/org/springframework/ai/chat/prompt/Prompt.java

@@ -181,6 +181,8 @@ else if (message instanceof AssistantMessage assistantMessage) {
 					.content(assistantMessage.getText())
 					.properties(assistantMessage.getMetadata())
 					.toolCalls(assistantMessage.getToolCalls())
+					.media(assistantMessage.getMedia())
+					.name(assistantMessage.getName())
 					.build());
 			}
 			else if (message instanceof ToolResponseMessage toolResponseMessage) {

spring-ai-model/src/test/java/org/springframework/ai/chat/messages/AssistantMessageTest.java

@@ -0,0 +1,161 @@
+/*
+ * Copyright 2023-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.ai.chat.messages;
+
+import java.util.List;
+import java.util.Map;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.ai.content.Media;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests for {@link AssistantMessage} with name property support.
+ *
+ * @author Spring AI Team
+ */
+class AssistantMessageTest {
+
+	@Test
+	void shouldCreateAssistantMessageWithName() {
+		AssistantMessage message = new AssistantMessage("Hello", "Alice");
+		assertThat(message.getText()).isEqualTo("Hello");
+		assertThat(message.getName()).isEqualTo("Alice");
+		assertThat(message.getMessageType()).isEqualTo(MessageType.ASSISTANT);
+	}
+
+	@Test
+	void shouldCreateAssistantMessageWithNameAndProperties() {
+		Map<String, Object> properties = Map.of("key", "value");
+		AssistantMessage message = new AssistantMessage("Hello", properties, "Bob");
+		assertThat(message.getText()).isEqualTo("Hello");
+		assertThat(message.getName()).isEqualTo("Bob");
+		assertThat(message.getMetadata()).containsEntry("key", "value");
+	}
+
+	@Test
+	void shouldCreateAssistantMessageWithNameAndToolCalls() {
+		List<AssistantMessage.ToolCall> toolCalls = List
+			.of(new AssistantMessage.ToolCall("1", "function", "testTool", "{}"));
+		AssistantMessage message = new AssistantMessage("Hello", Map.of(), toolCalls, "Charlie");
+		assertThat(message.getText()).isEqualTo("Hello");
+		assertThat(message.getName()).isEqualTo("Charlie");
+		assertThat(message.getToolCalls()).hasSize(1);
+		assertThat(message.getToolCalls().get(0).name()).isEqualTo("testTool");
+	}
+
+	@Test
+	void shouldCreateAssistantMessageWithNameAndMedia() {
+		List<AssistantMessage.ToolCall> toolCalls = List.of();
+		List<Media> media = List.of();
+		AssistantMessage message = new AssistantMessage("Hello", Map.of(), toolCalls, media, "David");
+		assertThat(message.getText()).isEqualTo("Hello");
+		assertThat(message.getName()).isEqualTo("David");
+		assertThat(message.getToolCalls()).isEmpty();
+		assertThat(message.getMedia()).isEmpty();
+	}
+
+	@Test
+	void shouldHandleNullName() {
+		AssistantMessage message = new AssistantMessage("Hello", Map.of(), List.of(), List.of(), null);
+		assertThat(message.getText()).isEqualTo("Hello");
+		assertThat(message.getName()).isNull();
+	}
+
+	@Test
+	void shouldHandleEmptyName() {
+		AssistantMessage message = new AssistantMessage("Hello", "");
+		assertThat(message.getText()).isEqualTo("Hello");
+		assertThat(message.getName()).isEqualTo("");
+	}
+
+	@Test
+	void shouldBeEqualWithSameName() {
+		AssistantMessage message1 = new AssistantMessage("Hello", "Alice");
+		AssistantMessage message2 = new AssistantMessage("Hello", "Alice");
+		assertThat(message1).isEqualTo(message2);
+		assertThat(message1.hashCode()).isEqualTo(message2.hashCode());
+	}
+
+	@Test
+	void shouldNotBeEqualWithDifferentName() {
+		AssistantMessage message1 = new AssistantMessage("Hello", "Alice");
+		AssistantMessage message2 = new AssistantMessage("Hello", "Bob");
+		assertThat(message1).isNotEqualTo(message2);
+	}
+
+	@Test
+	void shouldIncludeNameInToString() {
+		AssistantMessage message = new AssistantMessage("Hello", "Alice");
+		String toString = message.toString();
+		assertThat(toString).contains("name=Alice");
+	}
+
+	@Test
+	void shouldHandleNullNameInToString() {
+		AssistantMessage message = new AssistantMessage("Hello", Map.of(), List.of(), List.of(), null);
+		String toString = message.toString();
+		assertThat(toString).contains("name=null");
+	}
+
+	@Test
+	void shouldCreateAssistantMessageWithBuilder() {
+		AssistantMessage message = AssistantMessage.builder().content("Hello").name("Alice").build();
+		assertThat(message.getText()).isEqualTo("Hello");
+		assertThat(message.getName()).isEqualTo("Alice");
+	}
+
+	@Test
+	void shouldCreateAssistantMessageWithBuilderAndAllProperties() {
+		List<AssistantMessage.ToolCall> toolCalls = List
+			.of(new AssistantMessage.ToolCall("1", "function", "testTool", "{}"));
+		List<Media> media = List.of();
+		Map<String, Object> properties = Map.of("key", "value");
+
+		AssistantMessage message = AssistantMessage.builder()
+			.content("Hello")
+			.properties(properties)
+			.toolCalls(toolCalls)
+			.media(media)
+			.name("Bob")
+			.build();
+
+		assertThat(message.getText()).isEqualTo("Hello");
+		assertThat(message.getName()).isEqualTo("Bob");
+		assertThat(message.getMetadata()).containsEntry("key", "value");
+		assertThat(message.getToolCalls()).hasSize(1);
+		assertThat(message.getToolCalls().get(0).name()).isEqualTo("testTool");
+		assertThat(message.getMedia()).isEmpty();
+	}
+
+	@Test
+	void shouldCreateAssistantMessageWithBuilderAndNullName() {
+		AssistantMessage message = AssistantMessage.builder().content("Hello").name(null).build();
+		assertThat(message.getText()).isEqualTo("Hello");
+		assertThat(message.getName()).isNull();
+	}
+
+	@Test
+	void shouldCreateAssistantMessageWithBuilderAndEmptyName() {
+		AssistantMessage message = AssistantMessage.builder().content("Hello").name("").build();
+		assertThat(message.getText()).isEqualTo("Hello");
+		assertThat(message.getName()).isEqualTo("");
+	}
+
+}