fix(opencode): preserve MCP config on cleanup failure

Co-Authored-By: GPT-5.6 <noreply@openai.com>

Author: sergical

packages/installer/src/__tests__/harnesses.test.ts

@@ -438,6 +438,18 @@ function testOpenCodeHarness(testCase: OpenCodeHarnessCase) {
       expect(cleaned).toBe("Removed the incompatible Sentry OpenCode bundle and MCP configuration");
     });
 
+    it("preserves MCP configuration when incompatible bundle removal fails", async () => {
+      const system = fakeSystem({
+        homedir: "/home/user",
+        existing: [target, incompatibleMarker],
+        files: { [configPath]: testCase.configWithIncompatibleMcp },
+        run: () => ({ ok: false, stderr: "bundle is locked" }),
+      });
+
+      await expect(testCase.create(system).cleanup!()).rejects.toThrow("bundle is locked");
+      expect(system.writeTextFile).not.toHaveBeenCalled();
+    });
+
     it("leaves its own bundle untouched during cleanup", async () => {
       const system = fakeSystem({ homedir: "/home/user", existing: [target, marker] });
       expect(await testCase.create(system).cleanup!()).toBeNull();

packages/installer/src/harnesses/opencode-common.ts

@@ -117,12 +117,13 @@ export function createOpenCodeHarness(
     cleanup: async (output) => {
       const incompatibleBundle = hasIncompatibleBundle();
       const partialBundle = system.exists(bundleDir(system)) && !hasOwnBundle();
-      const incompatibleMcp = removeMcpConfigPaths(system, [options.incompatibleMcpConfigPath]);
 
       if (incompatibleBundle || partialBundle) {
         await removeBundle(system, output);
       }
 
+      const incompatibleMcp = removeMcpConfigPaths(system, [options.incompatibleMcpConfigPath]);
+
       if (incompatibleBundle) {
         return incompatibleMcp
           ? "Removed the incompatible Sentry OpenCode bundle and MCP configuration"