Opencode jsonc resolution (#226)

Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: Aiden Bai <aidenybai@users.noreply.github.com>

Author: aidenybai

packages/cli/src/utils/install-mcp.ts

@@ -48,6 +48,16 @@ const getZedConfigPath = (): string => {
   return path.join(os.homedir(), ".config", "zed", "settings.json");
 };
 
+export const getOpenCodeConfigPath = (): string => {
+  const configDir = path.join(getXdgConfigHome(), "opencode");
+  const jsoncPath = path.join(configDir, "opencode.jsonc");
+  const jsonPath = path.join(configDir, "opencode.json");
+
+  if (fs.existsSync(jsoncPath)) return jsoncPath;
+  if (fs.existsSync(jsonPath)) return jsonPath;
+  return jsoncPath;
+};
+
 const getClients = (): ClientDefinition[] => {
   const homeDir = os.homedir();
   const baseDir = getBaseDir();
@@ -84,7 +94,7 @@ const getClients = (): ClientDefinition[] => {
     },
     {
       name: "OpenCode",
-      configPath: path.join(getXdgConfigHome(), "opencode", "opencode.json"),
+      configPath: getOpenCodeConfigPath(),
       configKey: "mcp",
       format: "json",
       serverConfig: {

packages/cli/test/install-mcp.test.ts

@@ -8,6 +8,7 @@ import {
   installJsonClient,
   installTomlClient,
   getMcpClientNames,
+  getOpenCodeConfigPath,
 } from "../src/utils/install-mcp.js";
 
 let tempDir: string;
@@ -185,6 +186,50 @@ describe("upsertIntoJsonc", () => {
   });
 });
 
+describe("getOpenCodeConfigPath", () => {
+  let originalXdgConfigHome: string | undefined;
+
+  beforeEach(() => {
+    originalXdgConfigHome = process.env.XDG_CONFIG_HOME;
+    process.env.XDG_CONFIG_HOME = tempDir;
+  });
+
+  afterEach(() => {
+    if (originalXdgConfigHome === undefined) {
+      delete process.env.XDG_CONFIG_HOME;
+    } else {
+      process.env.XDG_CONFIG_HOME = originalXdgConfigHome;
+    }
+  });
+
+  it("should prefer opencode.jsonc when both files exist", () => {
+    const opencodeDir = path.join(tempDir, "opencode");
+    fs.mkdirSync(opencodeDir, { recursive: true });
+    fs.writeFileSync(path.join(opencodeDir, "opencode.json"), "{}");
+    fs.writeFileSync(path.join(opencodeDir, "opencode.jsonc"), "{}");
+
+    const result = getOpenCodeConfigPath();
+
+    expect(result).toBe(path.join(opencodeDir, "opencode.jsonc"));
+  });
+
+  it("should use opencode.json when only it exists", () => {
+    const opencodeDir = path.join(tempDir, "opencode");
+    fs.mkdirSync(opencodeDir, { recursive: true });
+    fs.writeFileSync(path.join(opencodeDir, "opencode.json"), "{}");
+
+    const result = getOpenCodeConfigPath();
+
+    expect(result).toBe(path.join(opencodeDir, "opencode.json"));
+  });
+
+  it("should default to opencode.jsonc when neither file exists", () => {
+    const result = getOpenCodeConfigPath();
+
+    expect(result).toBe(path.join(tempDir, "opencode", "opencode.jsonc"));
+  });
+});
+
 describe("installTomlClient", () => {
   it("should create a new TOML file when none exists", () => {
     const client = makeTomlClient();