kami/correx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(damn): detekt, build, tests, formatting

Browse Source 
fixed detekt issues where possible.
fixed disttar failing build because tools is added twice in the server module.
added workflowId where required.
fixed some tests not being recognized because of runBlocking without explicit return type.
formatting + imports.
This commit is contained in:
kami
2026-05-22 00:10:05 +04:00
parent 2c459da009
commit f827685ed0
185 changed files with 1134 additions and 832 deletions
Download Patch File Download Diff File Expand all files Collapse all files
infrastructure/tools/filesystem/src/main/kotlin/com/correx/infrastructure/tools/filesystem/FileReadTool.kt
+1 -1
View File
@@ -32,7 +32,7 @@ class FileReadTool(
(request.parameters["path"] as? String)?.let { pathString ->
runCatching {
val path = Paths.get(pathString).normalize().toAbsolutePath()
if (allowedPaths.isNotEmpty() && allowedPaths.none { path.startsWith(it.normalize().toAbsolutePath()) }) {
if (allowedPaths.none { path.startsWith(it.normalize().toAbsolutePath()) }) {
return@runCatching ValidationResult.Invalid("Path '$pathString' is not in the allowed list")
}
ValidationResult.Valid
infrastructure/tools/filesystem/src/main/kotlin/com/correx/infrastructure/tools/filesystem/FileWriteTool.kt
+5 -1
View File
@@ -65,7 +65,11 @@ class FileWriteTool(
}
put(
"required",
buildJsonArray { add(JsonPrimitive("path")); add(JsonPrimitive("content")); add(JsonPrimitive("operation")) },
buildJsonArray {
add(JsonPrimitive("path"))
add(JsonPrimitive("content"))
add(JsonPrimitive("operation"))
},
)
}
override val tier: Tier = Tier.T2
infrastructure/tools/filesystem/src/test/kotlin/com/correx/infrastructure/tools/filesystem/FileEditToolTest.kt
+9 -9
View File
@@ -33,7 +33,7 @@ class FileEditToolTest {
}
@Test
fun `execute patch success`() = runBlocking {
fun `execute patch success`(): Unit = runBlocking {
val tempDir = Files.createTempDirectory("file_edit_patch")
val filePath = tempDir.resolve("test.txt")
Files.writeString(filePath, "line1\nline2\nline3\n")
@@ -63,7 +63,7 @@ class FileEditToolTest {
}
@Test
fun `validateRequest returns Invalid for disallowed path`() = runBlocking {
fun `validateRequest returns Invalid for disallowed path`(): Unit = runBlocking {
val tempDir = Files.createTempDirectory("file_edit_test")
val otherDir = Files.createTempDirectory("other_dir")
val tool = FileEditTool(allowedPaths = setOf(tempDir))
@@ -80,7 +80,7 @@ class FileEditToolTest {
}
@Test
fun `validateRequest returns Invalid for non-existent file`() = runBlocking {
fun `validateRequest returns Invalid for non-existent file`(): Unit = runBlocking {
val tempDir = Files.createTempDirectory("file_edit_test")
val tool = FileEditTool(allowedPaths = setOf(tempDir))
val request = createRequest(
@@ -96,7 +96,7 @@ class FileEditToolTest {
}
@Test
fun `validateRequest returns Invalid for missing parameters`() = runBlocking {
fun `validateRequest returns Invalid for missing parameters`(): Unit = runBlocking {
val tempDir = Files.createTempDirectory("file_edit_test")
val filePath = tempDir.resolve("test.txt")
Files.writeString(filePath, "content")
@@ -120,7 +120,7 @@ class FileEditToolTest {
}
@Test
fun `execute append success`() = runBlocking {
fun `execute append success`(): Unit = runBlocking {
val tempDir = Files.createTempDirectory("file_edit_append")
val filePath = tempDir.resolve("test.txt")
Files.writeString(filePath, "hello")
@@ -139,7 +139,7 @@ class FileEditToolTest {
}
@Test
fun `execute replace success`() = runBlocking {
fun `execute replace success`(): Unit = runBlocking {
val tempDir = Files.createTempDirectory("file_edit_replace")
val filePath = tempDir.resolve("test.txt")
Files.writeString(filePath, "the quick brown fox")
@@ -159,7 +159,7 @@ class FileEditToolTest {
}
@Test
fun `execute replace failure zero matches`() = runBlocking {
fun `execute replace failure zero matches`(): Unit = runBlocking {
val tempDir = Files.createTempDirectory("file_edit_replace_fail")
val filePath = tempDir.resolve("test.txt")
Files.writeString(filePath, "the quick brown fox")
@@ -180,7 +180,7 @@ class FileEditToolTest {
}
@Test
fun `execute replace failure multiple matches`() = runBlocking {
fun `execute replace failure multiple matches`(): Unit = runBlocking {
val tempDir = Files.createTempDirectory("file_edit_replace_fail_multi")
val filePath = tempDir.resolve("test.txt")
Files.writeString(filePath, "fox fox fox")
@@ -202,7 +202,7 @@ class FileEditToolTest {
@Test
fun `execute patch failure`() = runBlocking {
fun `execute patch failure`(): Unit = runBlocking {
val tempDir = Files.createTempDirectory("file_edit_patch_fail")
val filePath = tempDir.resolve("test.txt")
Files.writeString(filePath, "original")
infrastructure/tools/filesystem/src/test/kotlin/com/correx/infrastructure/tools/filesystem/FileReadToolTest.kt
+8 -8
View File
@@ -31,15 +31,15 @@ class FileReadToolTest {
}
@Test
fun `validateRequest returns Valid for allowed path`() = runBlocking {
val tool = FileReadTool(allowedPaths = emptySet())
fun `validateRequest returns Valid for allowed path`(): Unit = runBlocking {
val tempFile = Files.createTempFile("test_allowed", ".txt")
val tool = FileReadTool(allowedPaths = setOf(tempFile.parent))
val request = createRequest(tempFile.toString())
assertEquals(ValidationResult.Valid, tool.validateRequest(request))
}
@Test
fun `validateRequest returns Invalid for disallowed path`() = runBlocking {
fun `validateRequest returns Invalid for disallowed path`(): Unit = runBlocking {
val tempFile = Files.createTempFile("test_disallowed", ".txt")
val tool = FileReadTool(allowedPaths = setOf(tempFile.parent.resolve("subdir")))
val request = createRequest(tempFile.toString())
@@ -49,7 +49,7 @@ class FileReadToolTest {
}
@Test
fun `validateRequest returns Invalid for missing path parameter`() = runBlocking {
fun `validateRequest returns Invalid for missing path parameter`(): Unit = runBlocking {
val tool = FileReadTool()
val request = ToolRequest(
invocationId = invocationId,
@@ -67,12 +67,12 @@ class FileReadToolTest {
}
@Test
fun `execute returns Success for valid file`() = runBlocking {
fun `execute returns Success for valid file`(): Unit = runBlocking {
val content = "Hello, world!"
val tempFile = Files.createTempFile("test_content", ".txt")
Files.writeString(tempFile, content)
val tool = FileReadTool(allowedPaths = emptySet())
val tool = FileReadTool(allowedPaths = setOf(tempFile.parent))
val request = createRequest(tempFile.toString())
val result = tool.execute(request)
@@ -83,7 +83,7 @@ class FileReadToolTest {
}
@Test
fun `execute returns Failure for non-existent file`() = runBlocking {
fun `execute returns Failure for non-existent file`(): Unit = runBlocking {
val tempDir = Files.createTempDirectory("test_dir")
val nonExistentFile = tempDir.resolve("missing.txt")
@@ -98,7 +98,7 @@ class FileReadToolTest {
}
@Test
fun `execute returns Failure for disallowed path`() = runBlocking {
fun `execute returns Failure for disallowed path`(): Unit = runBlocking {
val tempFile = Files.createTempFile("test_disallowed_exec", ".txt")
val tool = FileReadTool(allowedPaths = setOf(tempFile.parent.resolve("other")))
val request = createRequest(tempFile.toString())
infrastructure/tools/filesystem/src/test/kotlin/com/correx/infrastructure/tools/filesystem/FileWriteToolTest.kt
+11 -16
View File
@@ -34,7 +34,7 @@ class FileWriteToolTest {
}
@Test
fun `validateRequest returns Valid for allowed path and valid operation`() = runBlocking {
fun `validateRequest returns Valid for allowed path and valid operation`(): Unit = runBlocking {
val tempDir = Files.createTempDirectory("file_write_test")
val tool = FileWriteTool(allowedPaths = setOf(tempDir))
val request = createRequest(
@@ -48,7 +48,7 @@ class FileWriteToolTest {
}
@Test
fun `validateRequest returns Invalid for disallowed path`() = runBlocking {
fun `validateRequest returns Invalid for disallowed path`(): Unit = runBlocking {
val tempDir = Files.createTempDirectory("file_write_test")
val otherDir = Files.createTempDirectory("other_dir")
val tool = FileWriteTool(allowedPaths = setOf(tempDir))
@@ -65,7 +65,7 @@ class FileWriteToolTest {
}
@Test
fun `validateRequest returns Invalid for missing operation`() = runBlocking {
fun `validateRequest returns Invalid for missing operation`(): Unit = runBlocking {
val tempDir = Files.createTempDirectory("file_write_test")
val tool = FileWriteTool(allowedPaths = setOf(tempDir))
val request = createRequest(
@@ -83,7 +83,7 @@ class FileWriteToolTest {
}
@Test
fun `validateRequest returns Invalid for missing path`() = runBlocking {
fun `validateRequest returns Invalid for missing path`(): Unit = runBlocking {
val tempDir = Files.createTempDirectory("file_write_test")
val tool = FileWriteTool(allowedPaths = setOf(tempDir))
val request = createRequest(
@@ -98,7 +98,7 @@ class FileWriteToolTest {
}
@Test
fun `validateRequest returns Invalid for missing content on write`() = runBlocking {
fun `validateRequest returns Invalid for missing content on write`(): Unit = runBlocking {
val tempDir = Files.createTempDirectory("file_write_test")
val tool = FileWriteTool(allowedPaths = setOf(tempDir))
val request = createRequest(
@@ -113,7 +113,7 @@ class FileWriteToolTest {
}
@Test
fun `validateRequest returns Invalid for unknown operation`() = runBlocking {
fun `validateRequest returns Invalid for unknown operation`(): Unit = runBlocking {
val tempDir = Files.createTempDirectory("file_write_test")
val tool = FileWriteTool(allowedPaths = setOf(tempDir))
val request = createRequest(
@@ -128,7 +128,7 @@ class FileWriteToolTest {
}
@Test
fun `execute returns Success for write operation`() = runBlocking {
fun `execute returns Success for write operation`(): Unit = runBlocking {
val tempDir = Files.createTempDirectory("file_write_test")
val tool = FileWriteTool(allowedPaths = setOf(tempDir))
val filePath = tempDir.resolve("test.txt")
@@ -151,7 +151,7 @@ class FileWriteToolTest {
}
@Test
fun `execute returns Success for delete operation`() = runBlocking {
fun `execute returns Success for delete operation`(): Unit = runBlocking {
val tempDir = Files.createTempDirectory("file_write_test")
val tool = FileWriteTool(allowedPaths = setOf(tempDir))
val filePath = tempDir.resolve("to_delete.txt")
@@ -164,12 +164,7 @@ class FileWriteToolTest {
),
)
println("TempDir: $tempDir")
println("FilePath: $filePath")
println("PathString from request: ${request.parameters["path"]}")
val result = tool.execute(request)
println("Result: $result")
println("Exists after: ${Files.exists(filePath)}")
assertTrue(result is ToolResult.Success)
val success = result as ToolResult.Success
assertEquals("File deleted successfully: $filePath", success.output)
@@ -178,7 +173,7 @@ class FileWriteToolTest {
}
@Test
fun `execute returns Failure for deleting non-existent file`() = runBlocking {
fun `execute returns Failure for deleting non-existent file`(): Unit = runBlocking {
val tempDir = Files.createTempDirectory("file_write_test")
val tool = FileWriteTool(allowedPaths = setOf(tempDir))
val filePath = tempDir.resolve("non_existent.txt")
@@ -199,7 +194,7 @@ class FileWriteToolTest {
}
@Test
fun `execute returns Failure for disallowed path`() = runBlocking {
fun `execute returns Failure for disallowed path`(): Unit = runBlocking {
val tempDir = Files.createTempDirectory("file_write_test")
val otherDir = Files.createTempDirectory("other_dir")
val tool = FileWriteTool(allowedPaths = setOf(tempDir))
@@ -221,7 +216,7 @@ class FileWriteToolTest {
}
@Test
fun `validateRequest returns Valid for existing file in allowed directory`() = runBlocking {
fun `validateRequest returns Valid for existing file in allowed directory`(): Unit = runBlocking {
val tempDir = Files.createTempDirectory("file_write_test_existing")
val filePath = tempDir.resolve("existing.txt")
Files.writeString(filePath, "content")