fix: enhance Copilot CLI configuration to merge trusted directories with custom settings

Author: DevelopmentCats

registry/coder-labs/modules/copilot-cli/README.md

@@ -83,10 +83,6 @@ module "copilot_cli" {
   copilot_config = jsonencode({
     banner = "never"
     theme  = "dark"
-    trusted_folders = [
-      "/home/coder/workspace",
-      "/home/coder/project"
-    ]
   })
 
   # MCP server configuration

registry/coder-labs/modules/copilot-cli/copilot-cli.tftest.hcl

@@ -159,21 +159,60 @@ run "custom_copilot_config_overrides_default" {
   variables {
     agent_id = "test-agent"
     workdir  = "/home/coder"
+    copilot_config = jsonencode({
+      banner = "always"
+      theme  = "dark"
+    })
+  }
+
+  assert {
+    condition     = var.copilot_config != ""
+    error_message = "Custom copilot config should be set"
+  }
+
+  assert {
+    condition     = jsondecode(local.final_copilot_config).banner == "always"
+    error_message = "Custom banner setting should be applied"
+  }
+
+  assert {
+    condition     = jsondecode(local.final_copilot_config).theme == "dark"
+    error_message = "Custom theme setting should be applied"
+  }
+}
+
+run "trusted_directories_merged_with_custom_config" {
+  command = plan
+
+  variables {
+    agent_id = "test-agent"
+    workdir  = "/home/coder/project"
     copilot_config = jsonencode({
       banner          = "always"
       theme           = "dark"
       trusted_folders = ["/custom"]
     })
+    trusted_directories = ["/workspace", "/data"]
   }
 
   assert {
-    condition     = var.copilot_config != ""
-    error_message = "Custom copilot config should be set"
+    condition     = contains(jsondecode(local.final_copilot_config).trusted_folders, "/custom")
+    error_message = "Custom trusted folder should be included"
+  }
+
+  assert {
+    condition     = contains(jsondecode(local.final_copilot_config).trusted_folders, "/home/coder/project")
+    error_message = "Workdir should be included in trusted folders"
+  }
+
+  assert {
+    condition     = contains(jsondecode(local.final_copilot_config).trusted_folders, "/workspace")
+    error_message = "trusted_directories should be merged into config"
   }
 
   assert {
-    condition     = local.final_copilot_config == var.copilot_config
-    error_message = "Custom copilot config should override default"
+    condition     = contains(jsondecode(local.final_copilot_config).trusted_folders, "/data")
+    error_message = "All trusted_directories should be merged into config"
   }
 }
 

registry/coder-labs/modules/copilot-cli/main.test.ts

@@ -115,4 +115,22 @@ describe("copilot-cli", async () => {
       }),
     ).resolves.toBeDefined();
   });
+
+  it("merges trusted_directories with custom copilot_config", async () => {
+    const state = await runTerraformApply(import.meta.dir, {
+      agent_id: "test-agent",
+      workdir: "/home/coder/project",
+      trusted_directories: JSON.stringify(["/workspace", "/data"]),
+      copilot_config: JSON.stringify({
+        banner: "always",
+        theme: "dark",
+        trusted_folders: ["/custom"],
+      }),
+    });
+
+    // Verify that the state was created successfully with the merged config
+    // The actual merging logic is tested in the .tftest.hcl file
+    expect(state).toBeDefined();
+    expect(state.resources).toBeDefined();
+  });
 });

registry/coder-labs/modules/copilot-cli/main.tf

@@ -197,13 +197,24 @@ locals {
   start_script    = file("${path.module}/scripts/start.sh")
   module_dir_name = ".copilot-module"
 
-  default_copilot_config = jsonencode({
-    banner          = "never"
-    theme           = "auto"
-    trusted_folders = concat([local.workdir], var.trusted_directories)
-  })
+  all_trusted_folders = concat([local.workdir], var.trusted_directories)
 
-  final_copilot_config = var.copilot_config != "" ? var.copilot_config : local.default_copilot_config
+  parsed_custom_config = try(jsondecode(var.copilot_config), {})
+
+  existing_trusted_folders = try(local.parsed_custom_config.trusted_folders, [])
+
+  merged_copilot_config = merge(
+    {
+      banner = "never"
+      theme  = "auto"
+    },
+    local.parsed_custom_config,
+    {
+      trusted_folders = concat(local.existing_trusted_folders, local.all_trusted_folders)
+    }
+  )
+
+  final_copilot_config = jsonencode(local.merged_copilot_config)
 }
 
 resource "coder_env" "mcp_app_status_slug" {