Use Companion bundle id for BetterCodex

Author: advaitpaliwal

STATUS.md

@@ -112,6 +112,7 @@ Current marketplace architecture update:
 - `/Applications/BetterCodex.app` was refreshed with `npm run desktop -- install --launch=false`; bundle id remains `com.openai.codex.bettercodex`.
 - Current installed-app verification after the icon refresh: `/Applications/BetterCodex.app` has loader `yes`, repair agent `no`, ASAR integrity `yes`, codesign `yes`, and `CFBundleIconFile` is `bettercodex.icns`.
 - BetterCodex icon install now overwrites the sibling app's legacy icon resources as well as `bettercodex.icns`: `icon.icns`, `electron.icns`, `app.icns`, `icon.png`, `icon-codex-dark-color.png`, `icon-codex-light.png`, and `default_app/icon.png` all point to the gradient BetterCodex asset in `/Applications/BetterCodex.app`; Launch Services was re-registered, Quick Look cache reset, Dock restarted, and the app relaunched.
+- BetterCodex sibling app identity is now Companion-owned: `/Applications/BetterCodex.app` uses bundle id `com.companion.bettercodex` so macOS does not associate it with the official `com.openai.codex` app identity or icon cache.
 - Official `/Applications/Codex.app` stayed clean after the BetterCodex icon/install refresh: loader `no`, repair agent `no`, ASAR integrity `yes`, and codesign `yes`.
 - Live `https://bettercodex-web.companion-inc.workers.dev/api/addons` returned schema version `1`, zero add-ons, and `Focus Contrast` absent after the registry cleanup.
 - Disposable CDP smoke against `/tmp/Codex-BetterCodex-MarketplaceSmoke.app` verified top-level tabs `Plugins`/`Themes`, no `Skills`/`Store` text inside BetterCodex, Marketplace under both active surfaces, `Example Theme` install from Themes Marketplace, and local file write to `/tmp/bettercodex-marketplace-smoke-home/themes/example.theme.css`.

apps/desktop/src/bundler.js

@@ -13,6 +13,7 @@ function createBundle(options = {}) {
   const installRoot = options.installRoot || defaultInstallRoot;
   const name = normalizeName(options.name || "BetterCodex");
   const slug = slugify(name);
+  const bundleId = bundleIdentifierForSlug(slug);
   const destination = options.destination
     ? path.resolve(options.destination)
     : defaultDestination(appRoot, name);
@@ -24,7 +25,7 @@ function createBundle(options = {}) {
     if (!options.replace) {
       throw new Error(`Destination exists: ${destination}. Rerun with --replace to overwrite it.`);
     }
-    quitBundle(`com.openai.codex.${slug}`, destination);
+    quitBundle(bundleId, destination);
     fs.rmSync(destination, {force: true, recursive: true});
   }
 
@@ -41,7 +42,7 @@ function createBundle(options = {}) {
   const infoPlist = path.join(destination, "Contents", "Info.plist");
   setPlist(infoPlist, "CFBundleDisplayName", name);
   setPlist(infoPlist, "CFBundleName", name);
-  setPlist(infoPlist, "CFBundleIdentifier", `com.openai.codex.${slug}`);
+  setPlist(infoPlist, "CFBundleIdentifier", bundleId);
   if (installBetterCodexIcon(destination)) {
     setPlist(infoPlist, "CFBundleIconFile", "bettercodex.icns");
   }
@@ -53,7 +54,7 @@ function createBundle(options = {}) {
   }
 
   return {
-    bundleId: `com.openai.codex.${slug}`,
+    bundleId,
     destination,
     installResult: result,
     userDataDir: userDataDir(name),
@@ -87,6 +88,10 @@ function slugify(name) {
     .replace(/-+/g, "-") || "bettercodex";
 }
 
+function bundleIdentifierForSlug(slug) {
+  return `com.companion.${slug || "bettercodex"}`;
+}
+
 function quitBundle(bundleId, destination) {
   const ownPids = new Set([process.pid, process.ppid].filter(Boolean).map(String));
   childProcess.spawnSync("/usr/bin/osascript", [
@@ -221,6 +226,7 @@ function signAndVerify(destination) {
 
 module.exports = {
   betterCodexIconPython,
+  bundleIdentifierForSlug,
   createBundle,
   defaultDestination,
   normalizeName,

apps/desktop/src/installer.js

@@ -222,12 +222,15 @@ function assertCodexApp(paths) {
   }
   const bundleId = readPlistValue(paths.infoPlistPath, "CFBundleIdentifier");
   if (!isCodexBundleIdentifier(bundleId)) {
-    throw new Error(`Expected com.openai.codex or com.openai.codex.<name>, found ${bundleId || "unknown bundle id"}`);
+    throw new Error(`Expected com.openai.codex or a supported BetterCodex sibling id, found ${bundleId || "unknown bundle id"}`);
   }
 }
 
 function isCodexBundleIdentifier(bundleId) {
-  return bundleId === "com.openai.codex" || String(bundleId || "").startsWith("com.openai.codex.");
+  const value = String(bundleId || "");
+  return value === "com.openai.codex"
+    || value.startsWith("com.openai.codex.")
+    || value === "com.companion.bettercodex";
 }
 
 function backupAppState(paths, installRoot, metadata) {

apps/desktop/src/runtimeFiles.js

@@ -159,7 +159,11 @@ function assertCodexApp(paths) {
   if (!fs.existsSync(paths.asarPath)) throw new Error("Codex app.asar not found: " + paths.asarPath);
   if (!fs.existsSync(paths.infoPlistPath)) throw new Error("Codex Info.plist not found: " + paths.infoPlistPath);
   const bundleId = readPlistValue(paths.infoPlistPath, "CFBundleIdentifier");
-  if (bundleId !== "com.openai.codex" && !String(bundleId || "").startsWith("com.openai.codex.")) {
+  if (
+    bundleId !== "com.openai.codex"
+    && !String(bundleId || "").startsWith("com.openai.codex.")
+    && bundleId !== "com.companion.bettercodex"
+  ) {
     throw new Error("Expected Codex bundle id, found " + (bundleId || "unknown"));
   }
 }

test/bundler.test.js

@@ -5,6 +5,7 @@ const assert = require("node:assert/strict");
 
 const {
   betterCodexIconPython,
+  bundleIdentifierForSlug,
   defaultDestination,
   normalizeName,
   slugify,
@@ -32,6 +33,10 @@ test("default BetterCodex user data path is not Codex-prefixed", () => {
   assert.match(userDataDir("BetterCodex"), /\/Library\/Application Support\/BetterCodex$/);
 });
 
+test("BetterCodex bundle id is Companion-owned", () => {
+  assert.equal(bundleIdentifierForSlug(slugify("BetterCodex")), "com.companion.bettercodex");
+});
+
 test("BetterCodex icon generator resizes the generated app icon asset", () => {
   const source = betterCodexIconPython();
   assert.match(source, /Image\.open\(source\)\.convert\("RGBA"\)/);

test/installer.test.js

@@ -8,6 +8,7 @@ const {isCodexBundleIdentifier} = require("../apps/desktop/src/installer");
 test("isCodexBundleIdentifier accepts official and BetterCodex sibling ids", () => {
   assert.equal(isCodexBundleIdentifier("com.openai.codex"), true);
   assert.equal(isCodexBundleIdentifier("com.openai.codex.smoke"), true);
+  assert.equal(isCodexBundleIdentifier("com.companion.bettercodex"), true);
   assert.equal(isCodexBundleIdentifier("com.openai.codexmalformed"), false);
   assert.equal(isCodexBundleIdentifier("com.example.codex"), false);
 });