fix

Author: Wangzy455

spring-ai-alibaba-agent-framework/src/main/java/com/alibaba/cloud/ai/graph/agent/hook/skills/SkillMetadata.java

@@ -24,7 +24,7 @@
 /**
  * Metadata for a Claude-style Skill.
  * 
- * A Skill is a reusable package of instructions and context that extends Claude's capabilities.
+ * A Skill is a reusable package of instructions and context that extends the LLM's capabilities.
  * Skills are automatically discovered and used by the LLM when relevant to the user's request.
  */
 public class SkillMetadata {
@@ -88,9 +88,9 @@ public void setModel(String model) {
 
 	/**
 	 * Load the full content of the SKILL.md file.
-	 * The content is cached after the first load.
+	 * The content is cached after the first load (lazy loading).
 	 * 
-	 * @return the full content of the skill (without frontmatter)
+	 * @return the full content of SKILL.md (without frontmatter)
 	 * @throws IOException if the skill file cannot be read
 	 */
 	public String loadFullContent() throws IOException {

spring-ai-alibaba-agent-framework/src/main/java/com/alibaba/cloud/ai/graph/agent/hook/skills/SkillRegistry.java

@@ -114,6 +114,28 @@ public void clear() {
 		logger.debug("Cleared all skills");
 	}
 
+	/**
+	 * Unregister a skill by name.
+	 * Package-private: Only used internally by SkillsHook.
+	 * 
+	 * @param name the skill name to unregister
+	 * @return true if the skill was removed, false if it didn't exist
+	 */
+	boolean unregister(String name) {
+		if (name == null || name.isEmpty()) {
+			throw new IllegalArgumentException("Skill name cannot be null or empty");
+		}
+		
+		SkillMetadata removed = skills.remove(name);
+		if (removed != null) {
+			logger.info("Unregistered skill: {}", name);
+			return true;
+		} else {
+			logger.debug("Attempted to unregister non-existent skill: {}", name);
+			return false;
+		}
+	}
+
 	/**
 	 * Match skills based on user request.
 	 * 
@@ -170,7 +192,7 @@ private boolean isStopWord(String word) {
 	/**
 	 * Generate a prompt describing all available skills.
 	 * This prompt is injected into the LLM's context to enable skill discovery.
-	 * 
+	 *
 	 * @return the skills list prompt
 	 */
 	public String generateSkillsListPrompt() {

spring-ai-alibaba-agent-framework/src/main/java/com/alibaba/cloud/ai/graph/agent/hook/skills/SkillsHook.java

@@ -107,13 +107,10 @@ public CompletableFuture<Map<String, Object>> beforeModel(OverAllState state, Ru
 
 		List<Message> newMessages = new ArrayList<>(messages);
 
-		// Check if this is the first call for this thread
 		boolean isFirstCall = !skillsListInjectedPerThread.getOrDefault(threadId, false);
-		
-		// Get user request for skill matching
+
 		String userRequest = extractLastUserMessage(messages);
-		
-		// Match relevant skills
+
 		List<SkillMetadata> matchedSkills = new ArrayList<>();
 		Set<String> loadedSkills = loadedSkillsPerThread.computeIfAbsent(
 			threadId, k -> new HashSet<>());
@@ -124,38 +121,33 @@ public CompletableFuture<Map<String, Object>> beforeModel(OverAllState state, Ru
 				.toList();
 		}
 
-		// Only inject if it's first call OR there are new matched skills
 		if (isFirstCall || !matchedSkills.isEmpty()) {
 			try {
-				// Build complete system prompt (single message)
 				String systemPrompt = buildSystemPrompt(isFirstCall, matchedSkills);
 
 				if (!systemPrompt.isEmpty()) {
 					SystemMessage skillsMessage = new SystemMessage(systemPrompt);
-					
-					// Insert at the beginning (after any existing system messages)
+
 					int insertIndex = findSystemMessageInsertIndex(newMessages);
 					newMessages.add(insertIndex, skillsMessage);
-					
-					// Mark as injected
+
 					if (isFirstCall) {
 						skillsListInjectedPerThread.put(threadId, true);
-						logger.debug("[Thread {}] Injected skills overview with {} skills", 
+						logger.debug("Thread {} Injected skills overview with {} skills",
 							threadId, skillRegistry.size());
 					}
-					
-					// Mark matched skills as loaded
+
 					for (SkillMetadata skill : matchedSkills) {
 						loadedSkills.add(skill.getName());
-						logger.info("[Thread {}] Activated skill '{}'", threadId, skill.getName());
+						logger.info("Thread {} Activated skill '{}'", threadId, skill.getName());
 					}
 
 					Map<String, Object> update = new HashMap<>();
 					update.put("messages", newMessages);
 					return CompletableFuture.completedFuture(update);
 				}
 			} catch (Exception e) {
-				logger.error("[Thread {}] Failed to inject skills: {}", 
+				logger.error("Thread {} Failed to inject skills: {}",
 					threadId, e.getMessage(), e);
 			}
 		}
@@ -165,9 +157,8 @@ public CompletableFuture<Map<String, Object>> beforeModel(OverAllState state, Ru
 
 	@Override
 	public Map<String, KeyStrategy> getKeyStrategys() {
-		// No custom key strategies needed
-		return Map.of();
-	}
+        return super.getKeyStrategys();
+    }
 
 	/**
 	 * Extract messages from state.
@@ -203,17 +194,9 @@ private String extractLastUserMessage(List<Message> messages) {
 	private String buildSystemPrompt(boolean includeOverview, List<SkillMetadata> matchedSkills) {
 		StringBuilder prompt = new StringBuilder();
 
-		// Part 1: Skills overview (only on first call)
 		if (includeOverview && skillRegistry.size() > 0) {
-			prompt.append("You are an AI assistant with access to specialized skills.\n");
-			prompt.append("When a user's request aligns with a skill's purpose, you should apply that skill's instructions.\n\n");
-			prompt.append("Available Skills:\n");
-			
-			for (SkillMetadata skill : skillRegistry.listAll()) {
-				prompt.append(String.format("- **%s**: %s\n", skill.getName(), skill.getDescription()));
-			}
-			
-			prompt.append("\n");
+			String skillsListPrompt = skillRegistry.generateSkillsListPrompt();
+			prompt.append(skillsListPrompt);
 		}
 
 		// Part 2: Activated skills (full content)
@@ -274,6 +257,81 @@ public boolean hasSkill(String skillName) {
 		return skillRegistry.contains(skillName);
 	}
 
+	/**
+	 * Load a skill from a directory at runtime.
+	 * This allows dynamically adding skills without restarting the application.
+	 * 
+	 * @param skillDirectory the directory containing SKILL.md
+	 * @return true if the skill was loaded successfully
+	 */
+	public boolean loadSkill(String skillDirectory) {
+		try {
+			SkillScanner scanner = new SkillScanner();
+			SkillMetadata skill = scanner.loadSkill(java.nio.file.Path.of(skillDirectory));
+			
+			if (skill != null) {
+				skillRegistry.register(skill);
+				logger.info("Loaded skill '{}' from {}", skill.getName(), skillDirectory);
+				return true;
+			} else {
+				logger.warn("Failed to load skill from {}", skillDirectory);
+				return false;
+			}
+		} catch (Exception e) {
+			logger.error("Error loading skill from {}: {}", skillDirectory, e.getMessage(), e);
+			return false;
+		}
+	}
+
+	/**
+	 * Unload a skill at runtime.
+	 * This removes the skill from the registry.
+	 * 
+	 * <p>Example usage:
+	 * <pre>{@code
+	 * hook.unloadSkill("pdf-extractor");
+	 * }</pre>
+	 * 
+	 * @param skillName the name of the skill to unload
+	 * @return true if the skill was unloaded successfully
+	 */
+	public boolean unloadSkill(String skillName) {
+		boolean removed = skillRegistry.unregister(skillName);
+		if (removed) {
+			logger.info("Unloaded skill '{}'", skillName);
+		}
+		return removed;
+	}
+
+	/**
+	 * Reload a skill at runtime.
+	 * This unloads the existing skill and loads it again from disk.
+	 * Useful for updating skill definitions without restarting.
+	 * 
+	 * <p>Example usage:
+	 * <pre>{@code
+	 * hook.reloadSkill("pdf-extractor", "./skills/pdf-extractor");
+	 * }</pre>
+	 * 
+	 * @param skillName the name of the skill to reload
+	 * @param skillDirectory the directory containing SKILL.md
+	 * @return true if the skill was reloaded successfully
+	 */
+	public boolean reloadSkill(String skillName, String skillDirectory) {
+		logger.info("Reloading skill '{}'", skillName);
+		unloadSkill(skillName);
+		return loadSkill(skillDirectory);
+	}
+
+	/**
+	 * Get all registered skills.
+	 * 
+	 * @return list of all skill metadata
+	 */
+	public List<SkillMetadata> listSkills() {
+		return skillRegistry.listAll();
+	}
+
 	/**
 	 * Get all required tools from registered skills.
 	 * This method analyzes all skills' allowed-tools and returns a set of tool names.

spring-ai-alibaba-agent-framework/src/test/java/com/alibaba/cloud/ai/graph/agent/hooks/skills/SkillsHookTest.java

@@ -95,8 +95,7 @@ void testSkillsHookIntegrationWithScriptExecution(@TempDir Path tempDir) throws
 			.model(chatModel)
 			.saver(new MemorySaver())
 			.hooks(
-				hook,  // SkillsHook
-				// ShellToolAgentHook 会自动从 tools 中提取 ShellTool 并管理其生命周期
+				hook,
 				ShellToolAgentHook.builder()
 					.shellToolName("shell")  // 匹配工具名称
 					.build()
@@ -169,14 +168,5 @@ void testSkillsHookIntegrationWithScriptExecution(@TempDir Path tempDir) throws
 			System.out.println("   [" + i + "] " + msgType + ": " + 
 				preview.replace("\n", " ") + (msg.getText().length() > 200 ? "..." : ""));
 		}
-
-		System.out.println("\n集成测试通过！");
-		System.out.println("Skills 自动加载");
-		System.out.println("工具自动创建");
-		System.out.println("Skills 指令注入（单条 SystemMess age）");
-		System.out.println("ReactAgent 正常工作");
-		if (hasToolResponse) {
-			System.out.println("   - 工具调用成功");
-		}
 	}
 }