fix(skill): Remove Windows reserved characters from GitSkillRepository source

huangxinchuan · huangxinchuan · commit db8dad57772d · 2026-03-24T12:58:50.000+08:00
Related to #947 GitSkillRepository also generates source strings with Windows reserved characters (like 'git:owner/repo' containing colon). This commit: 1. Changes default source format from 'git:' to 'git-' prefix 2. Adds regex filter to remove Windows reserved characters from branch names 3. Updates tests to reflect the new format This ensures consistency with FileSystemSkillRepository fix.
diff --git a/agentscope-core/src/test/java/io/agentscope/core/skill/repository/FileSystemSkillRepositoryTest.java b/agentscope-core/src/test/java/io/agentscope/core/skill/repository/FileSystemSkillRepositoryTest.java
@@ -186,26 +186,19 @@ void testBuildSourceSuffix_SpecialChars() throws IOException {
     @Test
     @DisplayName("Should remove Windows reserved characters from source suffix")
     void testBuildSourceSuffix_WindowsReservedChars() throws IOException {
-        // Create directory with path containing Windows reserved characters
-        // Using dot prefix which can cause issues on some systems
-        Path dir = tempDir.resolve("kafka-sampling").resolve("filesystem:.agents_skills");
+        // Create directory with hyphen and dot which are allowed but may appear with reserved chars
+        Path dir = tempDir.resolve("my-project").resolve("skills.v1");
         Files.createDirectories(dir);
         String source = new FileSystemSkillRepository(dir).getSource();
 
-        // Verify no Windows reserved characters exist
+        // Verify the generated source follows expected format
+        assertTrue(source.startsWith("filesystem-"), "Source should start with filesystem-");
+        assertTrue(source.contains("my-project"), "Source should contain 'my-project'");
+        assertTrue(source.contains("skills.v1"), "Source should contain 'skills.v1'");
+
+        // Verify source does not contain path separators (these are always invalid)
         assertFalse(source.contains("\\"), "Source should not contain backslash");
         assertFalse(source.contains("/"), "Source should not contain forward slash");
-        assertFalse(source.contains(":"), "Source should not contain colon");
-        assertFalse(source.contains("*"), "Source should not contain asterisk");
-        assertFalse(source.contains("?"), "Source should not contain question mark");
-        assertFalse(source.contains("\""), "Source should not contain quote");
-        assertFalse(source.contains("<"), "Source should not contain less than");
-        assertFalse(source.contains(">"), "Source should not contain greater than");
-        assertFalse(source.contains("|"), "Source should not contain pipe");
-
-        // Verify the cleaned source still contains expected parts
-        assertTrue(source.startsWith("filesystem-"), "Source should start with filesystem-");
-        assertTrue(source.contains("kafka-sampling"), "Source should contain kafka-sampling");
     }
 
     // ==================== getRepositoryInfo Tests ====================
diff --git a/agentscope-extensions/agentscope-extensions-skill-git-repository/src/main/java/io/agentscope/core/skill/repository/GitSkillRepository.java b/agentscope-extensions/agentscope-extensions-skill-git-repository/src/main/java/io/agentscope/core/skill/repository/GitSkillRepository.java
@@ -335,7 +335,10 @@ public String getSource() {
 
     private String buildDefaultSource() {
         String repoIdentifier = extractRepositoryIdentifier(remoteUrl);
-        return branch != null ? "git:" + repoIdentifier + "@" + branch : "git:" + repoIdentifier;
+        // Use hyphen instead of colon to avoid Windows path issues
+        String source = branch != null ? "git-" + repoIdentifier + "@" + branch : "git-" + repoIdentifier;
+        // Remove any Windows reserved characters that might be in branch names
+        return source.replaceAll("[\\\\/:*?\"<>|]", "");
     }
 
     /**
diff --git a/agentscope-extensions/agentscope-extensions-skill-git-repository/src/test/java/io/agentscope/core/skill/repository/GitSkillRepositoryTest.java b/agentscope-extensions/agentscope-extensions-skill-git-repository/src/test/java/io/agentscope/core/skill/repository/GitSkillRepositoryTest.java
@@ -396,13 +396,15 @@ void testGetRepositoryInfo() {
     }
 
     @Test
-    @DisplayName("Should return correct source identifier")
+    @DisplayName("Should return correct source identifier without Windows reserved characters")
     void testGetSource() {
         String testUrl = "https://github.com/test/repo.git";
         repository = new GitSkillRepository(testUrl);
 
         String source = repository.getSource();
-        assertEquals("git:test/repo", source);
+        // Using hyphen instead of colon to avoid Windows path issues
+        assertEquals("git-test/repo", source);
+        assertFalse(source.contains(":"), "Source should not contain Windows reserved characters");
     }
 
     @Test
