Update for latest Spring AI version

base/build.gradle

@@ -14,10 +14,11 @@ dependencies {
 
     implementation 'org.springframework.ai:spring-ai-client-chat'
     implementation 'org.springframework.ai:spring-ai-starter-mcp-client'
+    implementation 'org.springframework.ai:spring-ai-tool-search-advisor'
+    implementation 'org.springframework.ai:spring-ai-tool-search-tool'
+    implementation(libs.spring.ai.lucene)
 
     implementation(libs.spring.ai.agent.utils)
-    implementation(libs.spring.ai.tool.search)
-    implementation(libs.spring.ai.tool.search.lucene)
 
     runtimeOnly 'com.h2database:h2'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'

base/src/main/java/ai/javaclaw/JavaClawConfiguration.java

@@ -10,11 +10,11 @@
 import org.springaicommunity.agent.tools.FileSystemTools;
 import org.springaicommunity.agent.tools.SkillsTool;
 import org.springaicommunity.agent.tools.SmartWebFetchTool;
-import org.springaicommunity.tool.search.ToolSearchToolCallAdvisor;
 import org.springframework.ai.chat.client.ChatClient;
 import org.springframework.ai.chat.client.advisor.MessageChatMemoryAdvisor;
 import org.springframework.ai.chat.client.advisor.SimpleLoggerAdvisor;
-import org.springframework.ai.chat.client.advisor.ToolCallAdvisor;
+import org.springframework.ai.chat.client.advisor.ToolCallingAdvisor;
+import org.springframework.ai.chat.client.advisor.toolsearch.ToolSearchToolCallingAdvisor;
 import org.springframework.ai.chat.memory.ChatMemory;
 import org.springframework.ai.chat.memory.ChatMemoryRepository;
 import org.springframework.ai.chat.memory.MessageWindowChatMemory;
@@ -70,7 +70,7 @@ public ChatClient.Builder chatClientBuilder(ObjectProvider<ChatModel> chatModelP
     @DependsOn({"mcpHeaderCustomizer"})
     public ChatClient chatClient(ChatClient.Builder chatClientBuilder,
                                  ChatMemory chatMemory,
-                                 ObjectProvider<ToolSearchToolCallAdvisor> toolSearchToolCallAdvisorProvider,
+                                 ObjectProvider<ToolSearchToolCallingAdvisor> toolSearchToolCallAdvisorProvider,
                                  SyncMcpToolCallbackProvider mcpToolProvider,
                                  TaskManager taskManager,
                                  ConfigurationManager configurationManager,
@@ -85,9 +85,9 @@ public ChatClient chatClient(ChatClient.Builder chatClientBuilder,
         String agentPrompt = agentMd.getContentAsString(StandardCharsets.UTF_8) + System.lineSeparator()
                 + workspace.createRelative("INFO.md").getContentAsString(StandardCharsets.UTF_8) + System.lineSeparator();
 
-        ToolCallAdvisor toolCallAdvisor = toolSearchToolCallAdvisorProvider.getIfAvailable();
+        ToolCallingAdvisor toolCallAdvisor = toolSearchToolCallAdvisorProvider.getIfAvailable();
         if (toolCallAdvisor == null) {
-            toolCallAdvisor = ToolCallAdvisor.builder().build();
+            toolCallAdvisor = ToolCallingAdvisor.builder().build();
         }
 
         chatClientBuilder

base/src/main/java/ai/javaclaw/agent/memory/FileSystemChatMemoryRepository.java

@@ -2,7 +2,7 @@
 
 import ai.javaclaw.files.YamlDocument;
 import ai.javaclaw.files.YamlParser;
-import org.springframework.ai.chat.memory.AppendableChatMemoryRepository;
+import org.springframework.ai.chat.memory.ChatMemoryRepository;
 import org.springframework.ai.chat.messages.Message;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.Resource;
@@ -39,7 +39,7 @@
  * </pre>
  */
 @Component
-public class FileSystemChatMemoryRepository implements AppendableChatMemoryRepository {
+public class FileSystemChatMemoryRepository implements ChatMemoryRepository {
 
     private final Path conversationsDir;
 
@@ -73,13 +73,6 @@ public List<Message> findByConversationId(String conversationId) {
         }
     }
 
-    @Override
-    public void appendAll(String conversationId, List<Message> messages) {
-        List<Message> existing = findByConversationId(conversationId);
-        List<Message> combined = Stream.concat(existing.stream(), messages.stream()).toList();
-        saveAll(conversationId, combined);
-    }
-
     @Override
     public void saveAll(String conversationId, List<Message> messages) {
         Path file = resolveFile(conversationId);

base/src/main/java/ai/javaclaw/tools/search/DynamicToolDiscoveryConfiguration.java

@@ -1,8 +1,8 @@
 package ai.javaclaw.tools.search;
 
-import org.springaicommunity.tool.search.ToolSearchToolCallAdvisor;
-import org.springaicommunity.tool.search.ToolSearcher;
-import org.springaicommunity.tool.searcher.LuceneToolSearcher;
+import org.springframework.ai.chat.client.advisor.toolsearch.ToolSearchToolCallingAdvisor;
+import org.springframework.ai.tool.toolsearch.ToolIndex;
+import org.springframework.ai.tool.toolsearch.index.lucene.LuceneToolIndex;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -14,15 +14,15 @@
 public class DynamicToolDiscoveryConfiguration {
 
     @Bean(destroyMethod = "close")
-    public ToolSearcher toolSearcher(DynamicToolDiscoveryProperties properties) {
-        return new LuceneToolSearcher(properties.luceneMinScoreThreshold());
+    public LuceneToolIndex toolIndex(DynamicToolDiscoveryProperties properties) {
+        return new LuceneToolIndex(properties.luceneMinScoreThreshold());
     }
 
     @Bean
-    public ToolSearchToolCallAdvisor toolSearchToolCallAdvisor(ToolSearcher toolSearcher,
-                                                               DynamicToolDiscoveryProperties properties) {
-        return ToolSearchToolCallAdvisor.builder()
-                .toolSearcher(toolSearcher)
+    public ToolSearchToolCallingAdvisor toolSearchToolCallingAdvisor(ToolIndex toolIndex,
+                                                                     DynamicToolDiscoveryProperties properties) {
+        return ToolSearchToolCallingAdvisor.builder()
+                .toolIndex(toolIndex)
                 .maxResults(properties.maxResults())
                 .build();
     }