@@ -62,6 +62,18 @@ export const discover = Effect.fn("ConfigDiscovery.discover")(function* (options
     )
     .map(({ item }) => item)
 
+  // Optional roots vanish when disabled; their global directory joins only
+  // while the global scope is enabled.
+  const optionalRoots = (name: string, globalPath: AbsolutePath, enabled = true) =>
+    enabled
+      ? [
+          ...new Set([
+            ...(globalEnabled ? [globalPath] : []),
+            ...visible.filter((item) => path.basename(item) === name).toReversed(),
+          ]),
+        ]
+      : []
+
   return {
     global: globalEnabled ? globalDirectory : undefined,
     explicit: options?.file ? AbsolutePath.make(path.resolve(options.file)) : undefined,
@@ -70,19 +82,7 @@ export const discover = Effect.fn("ConfigDiscovery.discover")(function* (options
       visible.filter((item) => path.basename(item) === ".opencode").toReversed(),
       (directory) => fs.isDir(directory).pipe(Effect.map((present) => ({ path: directory, present }))),
     ),
-    claude: disableClaudeCode
-      ? []
-      : [
-          ...new Set([
-            ...(globalEnabled ? [globalClaudeDirectory] : []),
-            ...visible.filter((item) => path.basename(item) === ".claude").toReversed(),
-          ]),
-        ],
-    agents: [
-      ...new Set([
-        ...(globalEnabled ? [globalAgentsDirectory] : []),
-        ...visible.filter((item) => path.basename(item) === ".agents").toReversed(),
-      ]),
-    ],
+    claude: optionalRoots(".claude", globalClaudeDirectory, !disableClaudeCode),
+    agents: optionalRoots(".agents", globalAgentsDirectory),
   } satisfies Sources
 })