From 9843510e1f02f62875c266a9e10ef7bb2d75e84a Mon Sep 17 00:00:00 2001
From: Hare <kei.hiracchi.0928@gmail.com>
Date: Wed, 26 Aug 2026 23:52:25 +0900
Subject: [PATCH] fix: remove conflicting coder worker control provider

---
 crates/manifest/src/profile.rs       | 15 +++++++++++++++
 crates/workspace-server/src/hosts.rs |  7 +++++++
 resources/profiles/coder.dcdl        |  1 -
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/crates/manifest/src/profile.rs b/crates/manifest/src/profile.rs
index b7494ce6..d84c195d 100644
--- a/crates/manifest/src/profile.rs
+++ b/crates/manifest/src/profile.rs
@@ -1407,6 +1407,21 @@ mod tests {
         }
     }
 
+    #[test]
+    fn builtin_coder_uses_sub_worker_control_without_worker_control() {
+        let tmp = TempDir::new().unwrap();
+        let resolved = ProfileResolver::new()
+            .with_workspace_base(tmp.path())
+            .resolve(
+                &ProfileSelector::source_named(ProfileRegistrySource::Builtin, "coder"),
+                ProfileResolveOptions::with_worker_name("coder-worker"),
+            )
+            .unwrap();
+
+        assert!(resolved.manifest.feature.sub_worker.enabled);
+        assert!(!resolved.manifest.feature.worker.enabled);
+    }
+
     #[test]
     fn builtin_companion_uses_sub_worker_control_without_worker_control() {
         let tmp = TempDir::new().unwrap();
diff --git a/crates/workspace-server/src/hosts.rs b/crates/workspace-server/src/hosts.rs
index 6ff649e7..b701b374 100644
--- a/crates/workspace-server/src/hosts.rs
+++ b/crates/workspace-server/src/hosts.rs
@@ -4411,6 +4411,11 @@ mod tests {
         assert!(companion.feature.manage_workdir.enabled);
         assert!(companion.feature.sub_worker.enabled);
         assert!(!companion.feature.worker.enabled);
+        let coder = archive
+            .resolve_profile("builtin:coder", root.path(), "embedded-test-coder")
+            .unwrap();
+        assert!(coder.feature.sub_worker.enabled);
+        assert!(!coder.feature.worker.enabled);
     }
 
     #[test]
@@ -4437,6 +4442,8 @@ mod tests {
             .resolve_profile("builtin:coder", root.path(), "remote-test-worker")
             .unwrap();
         assert_eq!(manifest.worker.name, "remote-test-worker");
+        assert!(manifest.feature.sub_worker.enabled);
+        assert!(!manifest.feature.worker.enabled);
     }
 
     #[test]
diff --git a/resources/profiles/coder.dcdl b/resources/profiles/coder.dcdl
index 93713b55..4c4dfbfe 100644
--- a/resources/profiles/coder.dcdl
+++ b/resources/profiles/coder.dcdl
@@ -10,7 +10,6 @@ import "./base.dcdl" // {
         web = { enabled = true; };
         sub_worker = { enabled = true; };
         flow = { enabled = true; };
-        worker = { enabled = true; };
         ticket = { enabled = true; thread = true; };
         merge_request = {
             show = true;