Package moves

Author: johnsonr

src/main/kotlin/com/embabel/coding/agent/AgentProjectCreator.kt

@@ -21,6 +21,7 @@ import com.embabel.agent.api.annotation.AgentCapabilities
 import com.embabel.agent.api.annotation.fromForm
 import com.embabel.agent.api.common.OperationContext
 import com.embabel.coding.domain.SoftwareProject
+import com.embabel.coding.domain.TaskFocus
 import org.slf4j.LoggerFactory
 import org.springframework.context.annotation.Profile
 import java.io.File
@@ -42,9 +43,9 @@ data class AgentRequirements(
 )
 @Profile("!test")
 class AgentProjectCreator(
-    val root: File = File(System.getProperty("user.dir")).parentFile,
-//    val workingDirName: String = "embabel-coder",
+    private val coderProperties: CoderProperties,
     private val taskFocus: TaskFocus,
+    properties: CoderProperties,
 ) {
 
     private val logger = LoggerFactory.getLogger(AgentProjectCreator::class.java)
@@ -60,18 +61,12 @@ class AgentProjectCreator(
     ): SoftwareProject {
         logger.info("Creating Agent project named {}", requirements.projectName)
 
-        val workDir = root//File(root, workingDirName)
-
-        // TODO is this safe
-//        val projectDir = File(root, requirements.projectName)
-//        projectDir.mkdirs()
-
+        val workDir = coderProperties.root
         val newAgentProject = createProject(workDir, requirements)
         taskFocus.saveAndSwitch(newAgentProject)
         return newAgentProject
     }
 
-
     @Action(
         pre = [
             CoderConditions.BUILD_SUCCEEDED],

src/main/kotlin/com/embabel/coding/agent/Coder.kt

@@ -22,7 +22,7 @@ import com.embabel.agent.api.common.create
 import com.embabel.agent.core.CoreToolGroups
 import com.embabel.agent.core.count
 import com.embabel.agent.domain.io.UserInput
-import com.embabel.coding.domain.SoftwareProject
+import com.embabel.coding.domain.*
 import com.embabel.coding.tools.BuildResult
 import com.embabel.common.util.time
 import org.slf4j.LoggerFactory

src/main/kotlin/com/embabel/coding/agent/CoderProperties.kt

@@ -19,16 +19,25 @@ import com.embabel.agent.config.models.AnthropicModels
 import com.embabel.common.ai.model.LlmOptions
 import com.embabel.common.ai.model.ModelSelectionCriteria
 import com.embabel.common.ai.prompt.PromptContributor
-import com.embabel.common.util.loggerFor
 import org.springframework.boot.context.properties.ConfigurationProperties
+import java.io.File
 
 /**
  * Common configuration and utilities
+ * @param primaryCodingModel The primary coding model to use for code modifications.
+ * @param fixCodingModel The model to use for fixing broken builds.
+ * @param projectRoot The root directory for the coding agent. Defaults to the parent
+ * of the current working directory.
+ * @param findNestedProjects Whether to search for nested projects in the project root.
+ * For example, nested Maven projects. Slows down loading if set to true.
  */
-@ConfigurationProperties(prefix = "embabel.coding")
+@ConfigurationProperties(prefix = "embabel.coder")
 data class CoderProperties(
-    val primaryCodingModel: String = AnthropicModels.Companion.CLAUDE_37_SONNET,//OllamaModels.QWEN2_5_CODER,
+    val primaryCodingModel: String = AnthropicModels.Companion.CLAUDE_37_SONNET,
     val fixCodingModel: String = AnthropicModels.Companion.CLAUDE_40_OPUS,
+    val projectRoot: String? = null,
+    val findNestedProjects: Boolean = false,
+    val defaultProject: String? = null,
     private val codeModificationDirections: String = """
         Use the file tools to read code and directories.
         Use the web tools if you are asked to use a technology you don't know about.
@@ -37,14 +46,12 @@ data class CoderProperties(
     """.trimIndent()
 ) {
 
+    val root: File = File(projectRoot ?: System.getProperty("user.dir")).parentFile
+
     fun codeModificationDirections() = PromptContributor.fixed(
         codeModificationDirections,
     )
 
-    init {
-        loggerFor<CoderProperties>().info("Coding properties: {}", this)
-    }
-
     /**
      * Primary coding Llm
      */

src/main/kotlin/com/embabel/coding/agent/CodingCommands.kt

@@ -15,6 +15,7 @@
  */
 package com.embabel.coding.agent
 
+import com.embabel.coding.domain.TaskFocus
 import org.springframework.shell.standard.ShellComponent
 import org.springframework.shell.standard.ShellMethod
 import org.springframework.shell.standard.ShellOption

src/main/kotlin/com/embabel/coding/agent/LogWriter.kt

@@ -15,7 +15,9 @@
  */
 package com.embabel.coding.agent
 
+import com.embabel.coding.domain.CodeModificationRequest
 import com.embabel.coding.domain.SoftwareProject
+import com.embabel.coding.domain.SuccessfulCodeModification
 
 /**
  * Log the changes we've made to the codebase.

src/main/kotlin/com/embabel/coding/agent/TaskFocus.kt

@@ -1,9 +1,9 @@
 package com.embabel.coding.agent.support
 
-import com.embabel.coding.agent.CodeModificationRequest
 import com.embabel.coding.agent.LogWriter
-import com.embabel.coding.agent.SuccessfulCodeModification
+import com.embabel.coding.domain.CodeModificationRequest
 import com.embabel.coding.domain.SoftwareProject
+import com.embabel.coding.domain.SuccessfulCodeModification
 import com.fasterxml.jackson.databind.ObjectMapper
 import org.springframework.stereotype.Service
 

src/main/kotlin/com/embabel/coding/agent/support/InProjectLogWriter.kt

@@ -1,4 +1,4 @@
-package com.embabel.coding.agent
+package com.embabel.coding.domain
 
 import com.embabel.agent.domain.library.HasContent
 import com.embabel.common.core.MobyNameGenerator
@@ -57,7 +57,7 @@ data class CodeModificationReport(
     val text: String,
     val filesChanged: List<String>
 ) : HasContent {
-    
+
     override val content: String
         get() = text
 }

src/main/kotlin/com/embabel/coding/agent/domain.kt renamed to src/main/kotlin/com/embabel/coding/domain/CodeModification.kt

@@ -17,16 +17,16 @@ package com.embabel.coding.domain
 
 import com.embabel.agent.domain.InMemoryCrudRepository
 import com.embabel.agent.tools.file.FileTools
+import com.embabel.coding.agent.CoderProperties
 import org.slf4j.LoggerFactory
 import org.springframework.stereotype.Service
-import java.io.File
 
 /**
- * Look under directory
+ * Look for parallel directories
  */
 @Service
 class FromDiskSoftwareProjectRepository(
-    val root: File = File(System.getProperty("user.dir")).parentFile,
+    private val properties: CoderProperties,
 ) : SoftwareProjectRepository,
     InMemoryCrudRepository<SoftwareProject>(
         idGetter = { it.root },
@@ -37,14 +37,18 @@ class FromDiskSoftwareProjectRepository(
 
     init {
         this.saveAll(findProjectsUnderRoot())
+        logger.info("Loaded {} projects from disk", this.count())
+        logger.info(
+            "Projects:\n\t{}", this.findAll().sortedBy { it.root }.joinToString("\n\t") { it.root })
     }
 
     private fun findProjectsUnderRoot(): List<SoftwareProject> {
-        val rootFileTools = FileTools.readOnly(root.absolutePath)
+        val rootFileTools = FileTools.readOnly(properties.root.absolutePath)
         logger.info("Looking under {} for projects", rootFileTools.root)
-        val pomFiles = rootFileTools.findFiles("**/pom.xml")
-            // TODO why is this needed?
-            .filterNot { it.contains("..") }
+        val pomFiles = rootFileTools.findFiles(
+            glob = "**/pom.xml",
+            findHighest = !properties.findNestedProjects
+        )
         logger.info("Found {} Maven projects", pomFiles.size)
         return pomFiles
             .map { it.replace("pom.xml", "") }

src/main/kotlin/com/embabel/coding/domain/FromDiskSoftwareProjectRepository.kt

@@ -0,0 +1,58 @@
+package com.embabel.coding.domain
+
+import com.embabel.agent.tools.file.FileReadTools
+import com.embabel.agent.tools.file.WellKnownFileContentTransformers
+import com.embabel.common.ai.prompt.PromptContributor
+import com.embabel.common.core.types.Described
+import com.embabel.common.core.types.Named
+import com.embabel.common.util.StringTransformer
+
+/**
+ * Reference
+ * Must be added as tools and prompt contributor
+ */
+interface Reference : PromptContributor, Named, Described
+
+/**
+ * Reference to another project
+ */
+class ProjectReference(
+    override val name: String,
+    override val description: String,
+    override val root: String,
+) : Reference, FileReadTools {
+
+    override val fileContentTransformers: List<StringTransformer>
+        get() = listOf(WellKnownFileContentTransformers.removeApacheLicenseHeader)
+
+    override fun contribution(): String {
+        return """
+            |Software project: $name
+            |Description: $description
+            |Root: $root
+            |Use file tools to read files in the project.
+            """".trimIndent()
+    }
+}
+
+/**
+ * Directory structure but not a software project
+ */
+class FilesReference(
+    override val name: String,
+    override val description: String,
+    override val root: String,
+) : Reference, FileReadTools {
+
+    override val fileContentTransformers: List<StringTransformer>
+        get() = listOf(WellKnownFileContentTransformers.removeApacheLicenseHeader)
+
+    override fun contribution(): String {
+        return """
+            |Documentation: $name
+            |Description: $description
+            |Root: $root
+            |Use file tools to read documents.
+            """".trimIndent()
+    }
+}