style: fix ktlint multiline-expression-wrapping and string-template violations (#94)

jpicklyk · claude · web-flow · commit 20b186419833 · 2026-04-03T12:28:55.000-04:00
Auto-formatted via ktlintFormat. Fixes CI lint check failures introduced
in v2.5.2 refactoring commits.

Co-authored-by: Claude Opus 4.6 (1M context) &lt;noreply@anthropic.com&gt;
diff --git a/current/src/main/kotlin/io/github/jpicklyk/mcptask/current/application/service/SchemaEntryJsonBuilder.kt b/current/src/main/kotlin/io/github/jpicklyk/mcptask/current/application/service/SchemaEntryJsonBuilder.kt
@@ -60,9 +60,7 @@ fun buildExpectedNotesJson(
  *
  * @param schema Schema entries, or null if no schema matches
  */
-fun buildSchemaResponseFields(
-    schema: List<NoteSchemaEntry>?
-): SchemaResponseFields =
+fun buildSchemaResponseFields(schema: List<NoteSchemaEntry>?): SchemaResponseFields =
     SchemaResponseFields(
         schemaMatch = schema != null,
         expectedNotes = buildExpectedNotesJson(schema)
diff --git a/current/src/main/kotlin/io/github/jpicklyk/mcptask/current/application/tools/compound/CreateWorkTreeTool.kt b/current/src/main/kotlin/io/github/jpicklyk/mcptask/current/application/tools/compound/CreateWorkTreeTool.kt
@@ -352,9 +352,10 @@ Atomically create a hierarchical work tree: root item, child items, dependencies
         val idToRef = treeResult.refToId.entries.associate { (ref, id) -> id to ref }
 
         val rootResultItem = treeResult.items.first()
-        val rootSchemaFields = buildSchemaResponseFields(
-            context.noteSchemaService().getSchemaForTags(rootResultItem.tagList())
-        )
+        val rootSchemaFields =
+            buildSchemaResponseFields(
+                context.noteSchemaService().getSchemaForTags(rootResultItem.tagList())
+            )
         val rootJson =
             buildJsonObject {
                 put("id", JsonPrimitive(rootResultItem.id.toString()))
@@ -370,9 +371,10 @@ Atomically create a hierarchical work tree: root item, child items, dependencies
             JsonArray(
                 treeResult.items.drop(1).map { item ->
                     val ref = idToRef[item.id] ?: "unknown"
-                    val childSchemaFields = buildSchemaResponseFields(
-                        context.noteSchemaService().getSchemaForTags(item.tagList())
-                    )
+                    val childSchemaFields =
+                        buildSchemaResponseFields(
+                            context.noteSchemaService().getSchemaForTags(item.tagList())
+                        )
                     buildJsonObject {
                         put("ref", JsonPrimitive(ref))
                         put("id", JsonPrimitive(item.id.toString()))
diff --git a/current/src/main/kotlin/io/github/jpicklyk/mcptask/current/application/tools/workflow/AdvanceItemTool.kt b/current/src/main/kotlin/io/github/jpicklyk/mcptask/current/application/tools/workflow/AdvanceItemTool.kt
@@ -454,11 +454,12 @@ Trigger-based role transitions for WorkItems with validation, cascade detection,
                 val existingKeys = notesByKey.keys
 
                 // Build expectedNotes: schema entries matching the new role (tool-specific, includes "exists")
-                expectedNotesJson = buildExpectedNotesJson(
-                    schema = schema,
-                    existingNoteKeys = existingKeys,
-                    filterRole = targetRole
-                )
+                expectedNotesJson =
+                    buildExpectedNotesJson(
+                        schema = schema,
+                        existingNoteKeys = existingKeys,
+                        filterRole = targetRole
+                    )
 
                 // Use shared PhaseNoteContext for guidancePointer and noteProgress
                 val phaseContext = computePhaseNoteContext(targetRole, schema, notesByKey)
diff --git a/current/src/main/kotlin/io/github/jpicklyk/mcptask/current/application/tools/workflow/GetContextTool.kt b/current/src/main/kotlin/io/github/jpicklyk/mcptask/current/application/tools/workflow/GetContextTool.kt
@@ -162,11 +162,12 @@ Parameters:
 
         // Build schema list with exists/filled status
         val filledKeys = notes.filter { it.body.isNotBlank() }.map { it.key }.toSet()
-        val schemaEntriesArray = buildExpectedNotesJson(
-            schema = schema,
-            existingNoteKeys = notesByKey.keys,
-            filledNoteKeys = filledKeys
-        )
+        val schemaEntriesArray =
+            buildExpectedNotesJson(
+                schema = schema,
+                existingNoteKeys = notesByKey.keys,
+                filledNoteKeys = filledKeys
+            )
 
         // Gate status for current phase — uses shared computation
         val phaseContext = computePhaseNoteContext(item.role, schema, notesByKey)
diff --git a/current/src/main/kotlin/io/github/jpicklyk/mcptask/current/infrastructure/config/YamlNoteSchemaService.kt b/current/src/main/kotlin/io/github/jpicklyk/mcptask/current/infrastructure/config/YamlNoteSchemaService.kt
@@ -67,34 +67,38 @@ class YamlNoteSchemaService(
             return SchemaLoadResult(emptyMap(), warnings)
         }
 
-        val schemas = try {
-            val yaml = Yaml()
-            FileReader(configPath.toFile()).use { reader ->
-                val root = yaml.load<Map<String, Any>>(reader)
-                    ?: return@use emptyMap<String, List<NoteSchemaEntry>>()
-
-                if (!root.containsKey("note_schemas")) {
-                    warnings.add("Config file is missing 'note_schemas' key; no schemas loaded")
-                    return@use emptyMap()
-                }
-
-                val noteSchemas = root["note_schemas"] as? Map<String, Any>
-                    ?: return@use emptyMap<String, List<NoteSchemaEntry>>()
+        val schemas =
+            try {
+                val yaml = Yaml()
+                FileReader(configPath.toFile()).use { reader ->
+                    val root =
+                        yaml.load<Map<String, Any>>(reader)
+                            ?: return@use emptyMap<String, List<NoteSchemaEntry>>()
+
+                    if (!root.containsKey("note_schemas")) {
+                        warnings.add("Config file is missing 'note_schemas' key; no schemas loaded")
+                        return@use emptyMap()
+                    }
 
-                noteSchemas.entries.associate { (schemaName, rawEntries) ->
-                    val entryList = rawEntries as? List<Map<String, Any>> ?: emptyList()
-                    val entries = entryList.mapIndexedNotNull { index, raw ->
-                        parseEntry(raw, schemaName, index, warnings)
+                    val noteSchemas =
+                        root["note_schemas"] as? Map<String, Any>
+                            ?: return@use emptyMap<String, List<NoteSchemaEntry>>()
+
+                    noteSchemas.entries.associate { (schemaName, rawEntries) ->
+                        val entryList = rawEntries as? List<Map<String, Any>> ?: emptyList()
+                        val entries =
+                            entryList.mapIndexedNotNull { index, raw ->
+                                parseEntry(raw, schemaName, index, warnings)
+                            }
+                        schemaName to entries
                     }
-                    schemaName to entries
                 }
+            } catch (e: Exception) {
+                val msg = "Failed to load note schemas from '$configPath': ${e.message}"
+                warnings.add(msg)
+                logger.warn(msg)
+                emptyMap()
             }
-        } catch (e: Exception) {
-            val msg = "Failed to load note schemas from '${configPath}': ${e.message}"
-            warnings.add(msg)
-            logger.warn(msg)
-            emptyMap()
-        }
 
         val totalEntries = schemas.values.sumOf { it.size }
         warnings.forEach { w -> logger.warn(w) }
@@ -138,14 +142,15 @@ class YamlNoteSchemaService(
         }
 
         val requiredRaw = raw["required"]
-        val required = if (requiredRaw != null && requiredRaw !is Boolean) {
-            warnings.add(
-                "Schema '$schemaName' entry (key='$key') has non-boolean 'required' value '$requiredRaw'; defaulting to false"
-            )
-            false
-        } else {
-            requiredRaw as? Boolean ?: false
-        }
+        val required =
+            if (requiredRaw != null && requiredRaw !is Boolean) {
+                warnings.add(
+                    "Schema '$schemaName' entry (key='$key') has non-boolean 'required' value '$requiredRaw'; defaulting to false"
+                )
+                false
+            } else {
+                requiredRaw as? Boolean ?: false
+            }
 
         val description = raw["description"] as? String ?: ""
         val guidance = raw["guidance"] as? String
diff --git a/current/src/test/kotlin/io/github/jpicklyk/mcptask/current/application/service/NoteSchemaServiceTest.kt b/current/src/test/kotlin/io/github/jpicklyk/mcptask/current/application/service/NoteSchemaServiceTest.kt
@@ -34,7 +34,7 @@ class NoteSchemaServiceTest {
     // --- Gap M8: default method hasReviewPhase on NoOpNoteSchemaService ---
 
     @Test
-    fun `NoOp hasReviewPhase default method returns false via getSchemaForTags returning null`(): Unit {
+    fun `NoOp hasReviewPhase default method returns false via getSchemaForTags returning null`() {
         // The hasReviewPhase default method on NoteSchemaService calls getSchemaForTags and
         // checks if any entry has role=REVIEW. When getSchemaForTags returns null (as NoOp does),
         // the elvis operator returns false. This test verifies the default method contract.
@@ -43,12 +43,13 @@ class NoteSchemaServiceTest {
     }
 
     @Test
-    fun `NoOp returns null which causes hasReviewPhase to return false via default implementation`(): Unit {
+    fun `NoOp returns null which causes hasReviewPhase to return false via default implementation`() {
         // Verify that a custom NoteSchemaService returning null also gets false from the default
         // hasReviewPhase — confirming the default method logic is correct.
-        val customService = object : NoteSchemaService {
-            override fun getSchemaForTags(tags: List<String>) = null
-        }
+        val customService =
+            object : NoteSchemaService {
+                override fun getSchemaForTags(tags: List<String>) = null
+            }
         assertFalse(customService.hasReviewPhase(listOf("tag1")))
         assertFalse(customService.hasReviewPhase(emptyList()))
     }
diff --git a/current/src/test/kotlin/io/github/jpicklyk/mcptask/current/application/service/SchemaEntryJsonBuilderTest.kt b/current/src/test/kotlin/io/github/jpicklyk/mcptask/current/application/service/SchemaEntryJsonBuilderTest.kt
diff --git a/current/src/test/kotlin/io/github/jpicklyk/mcptask/current/application/service/WorkTreeServiceIntegrationTest.kt b/current/src/test/kotlin/io/github/jpicklyk/mcptask/current/application/service/WorkTreeServiceIntegrationTest.kt
diff --git a/current/src/test/kotlin/io/github/jpicklyk/mcptask/current/infrastructure/config/YamlNoteSchemaServiceTest.kt b/current/src/test/kotlin/io/github/jpicklyk/mcptask/current/infrastructure/config/YamlNoteSchemaServiceTest.kt
