@@ -5,6 +5,7 @@ import { autocomplete, confirm, log } from "@clack/prompts"
 import { Effect, Option } from "effect"
 import { applyEdits, createScanner, findNodeAtLocation, parse, parseTree, type ParseError } from "jsonc-parser"
 import { Global } from "@opencode/util/global"
+import { ConfigFile } from "@opencode/util/config-file"
 import { Commands } from "../../commands"
 import { Runtime } from "../../../framework/runtime"
 import { handlePromptErrors, prompt, requireInteractive } from "../../../ui/prompt"
@@ -26,11 +27,8 @@ export default Runtime.handler(
     inventory.warnings.forEach((message) => log.warn(`Skipping config: ${message}`))
     const entries = inventory.entries.filter((entry) => !name || entry.name === name)
     if (!entries.length) {
-      process.stdout.write(
-        name
-          ? `MCP server "${name}" is not configured in the selected scope${EOL}`
-          : `No configured MCP servers found${EOL}`,
-      )
+      if (name) return yield* Effect.fail(new Error(`MCP server "${name}" is not configured in the selected scope`))
+      process.stdout.write(`No configured MCP servers found${EOL}`)
       return
     }
     if (entries.length > 1)
@@ -90,8 +88,8 @@ export async function configuredServers(directory: string, global: string, scope
   const warnings: string[] = []
   for (const source of sources) {
     for (const name of source.scope === "Global"
-      ? ["opencode.json", "opencode.jsonc"]
-      : ["opencode.json", "opencode.jsonc", ".opencode/opencode.json", ".opencode/opencode.jsonc"]) {
+      ? ConfigFile.names
+      : [...ConfigFile.names, ...ConfigFile.names.map((name) => path.join(".opencode", name))]) {
       const file = path.join(source.directory, name)
       // A global config must not reappear as an inherited project config through a symlink.
       const resolved = await realpath(file).catch(() => file)
 
@@ -1,9 +1,9 @@
 import { expect, test } from "bun:test"
 import path from "node:path"
-import { mkdir } from "node:fs/promises"
+import { mkdir, realpath } from "node:fs/promises"
 import { parse, type ParseError } from "jsonc-parser"
 import { configuredServers, removeServer } from "../src/commands/handlers/mcp/remove"
-import { tmpdir } from "../../core/test/fixture/tmpdir"
+import { tmpdir } from "./fixture/tmpdir"
 import { isolatedEnv } from "./fixture/environment"
 
 test("removes only the selected local non-OAuth server, preserving JSONC and unrelated settings", async () => {
@@ -37,8 +37,9 @@ test("removes only the selected local non-OAuth server, preserving JSONC and unr
 
 test("enumerates native and legacy entries by source, including reserved legacy server names", async () => {
   await using tmp = await tmpdir()
-  const global = path.join(tmp.path, "global")
-  const project = path.join(tmp.path, "project")
+  const root = await realpath(tmp.path)
+  const global = path.join(root, "global")
+  const project = path.join(root, "project")
   const directory = path.join(project, "nested")
   await mkdir(directory, { recursive: true })
   const files = [
@@ -115,7 +116,7 @@ test("warns and skips malformed files during discovery, but refuses a malformed
   expect(await Bun.file(file).text()).toBe(broken)
 })
 
-test("CLI rejects ambiguous names without edits and removes one global legacy entry with --yes", async () => {
+test("CLI rejects unknown or ambiguous names without edits and removes one scoped legacy entry", async () => {
   await using tmp = await tmpdir()
   const global = path.join(tmp.path, "config")
   const directory = path.join(tmp.path, "project")
@@ -124,7 +125,7 @@ test("CLI rejects ambiguous names without edits and removes one global legacy en
   const globalFile = path.join(global, "opencode.json")
   await Bun.write(projectFile, JSON.stringify(config))
   await Bun.write(globalFile, JSON.stringify(config))
-  const cli = async (args: string[]) => {
+  const cli = async (args: string[], name = "paper") => {
     const child = Bun.spawn(
       [
         process.execPath,
@@ -134,7 +135,7 @@ test("CLI rejects ambiguous names without edits and removes one global legacy en
         path.join(import.meta.dir, "../src/index.ts"),
         "mcp",
         "remove",
-        "paper",
+        name,
         "--yes",
         ...args,
       ],
@@ -152,8 +153,13 @@ test("CLI rejects ambiguous names without edits and removes one global legacy en
   expect(ambiguous.code).toBe(1)
   expect(await Bun.file(projectFile).json()).toEqual(config)
   expect(await Bun.file(globalFile).json()).toEqual(config)
+  const unknown = await cli(["--global"], "missing")
+  expect(unknown.stderr).toBe("")
+  expect(unknown.stdout).toContain('MCP server "missing" is not configured in the selected scope')
+  expect(unknown.code).toBe(1)
+  expect(await Bun.file(globalFile).json()).toEqual(config)
   const removed = await cli(["--global"])
-  expect(removed.stdout).toContain(`removed from ${globalFile}`)
+  expect(removed.stdout).toContain(`removed from ${await realpath(globalFile)}`)
   expect(removed.stderr).toBe("")
   expect(removed.code).toBe(0)
   expect(await Bun.file(globalFile).json()).toEqual({ mcp: {} })
 
@@ -4,12 +4,13 @@ import os from "os"
 import path from "path"
 import { Effect } from "effect"
 import { FSUtil } from "@opencode/util/fs-util"
+import { ConfigFile } from "@opencode/util/config-file"
 import { Global } from "@opencode/util/global"
 import { Location } from "../location.js"
 import { AbsolutePath } from "../schema.js"
 import type { Options } from "../config.js"
 
-export const names = ["opencode.json", "opencode.jsonc"]
+export const names = ConfigFile.names
 
 /** Eligible sources in priority order, including paths that may appear later. */
 export interface Sources {
 
@@ -0,0 +1,3 @@
+export * as ConfigFile from "./config-file.js"
+
+export const names = ["opencode.json", "opencode.jsonc"]
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+export * as ConfigFile from "./config-file.js"`
	`2`	`+`
	`3`	`+export const names = ["opencode.json", "opencode.jsonc"]`