impel-cli 0.11.0 → 0.11.2

package/README.md

@@ -633,7 +633,8 @@ Explicitly use the configured impel-acme-research-agent for this request and wai
 ```
 
 Claude exposes native custom agents in its `@` typeahead. Current Codex releases
-load and display the generated native agents but do not provide an `@agent`
+load the generated standalone definitions directly from `$CODEX_HOME/agents/`
+but do not provide an `@agent`
 mention target; named spawning remains model-mediated and may also be limited by
 the active MultiAgentV2 tool schema. Use `/agent` in Codex to inspect spawned
 agent threads.
@@ -702,8 +703,11 @@ a stable, unique bundle identifier and gateway configuration:
   to the authenticated aggregate Claude subscription pool exposed by the Impel
   gateway.
 - Impel ChatGPT wraps an APFS-cloned official app while preserving the nested
-  OpenAI-signed bundle and executable. Its outer resource root contains the
-  narrowly patched renderer ASAR used at runtime. The wrapper sets `CODEX_HOME`,
+  OpenAI-signed bundle and executable. A wrapper-owned startup preload pins
+  Electron's application name before the native menu is created, so macOS
+  shows `Impel ChatGPT (<org>)` without changing OpenAI's signed code. Its outer
+  resource root contains the narrowly patched renderer ASAR used at runtime.
+  The wrapper sets `CODEX_HOME`,
   passes a separate Chromium `--user-data-dir`, and writes its provider config
   and model catalog below `~/.config/impel/apps/tenants/<org>/chatgpt`. It also supplies a
   process-scoped, Codex-compatible wrapper around the Impel PAT so native

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "impel-cli",
-  "version": "0.11.0",
+  "version": "0.11.2",
   "description": "Configure Claude Code and Codex CLI to talk to Impel's gateway, authenticated by an Impel Personal Access Token",
   "type": "module",
   "bin": {

package/src/agents.js

@@ -398,13 +398,13 @@ function readManifest(manifestPath) {
 
 function profileIsFresh(profile, tenantId, now, ttlMs) {
   const manifest = readManifest(path.join(profile.root, "agents", MANAGED_AGENT_DIRECTORY, MANAGED_AGENT_MANIFEST));
-  if (!manifest || manifest.tenantId !== tenantId) return false;
+  if (!manifest || manifest.version !== 2 || manifest.tenantId !== tenantId) return false;
   const syncedAt = Date.parse(manifest.syncedAt || "");
   if (!Number.isFinite(syncedAt) || now - syncedAt >= ttlMs) return false;
   return manifest.files.every((fileName) =>
     typeof fileName === "string"
     && path.basename(fileName) === fileName
-    && fs.existsSync(path.join(profile.root, "agents", MANAGED_AGENT_DIRECTORY, fileName))
+    && fs.existsSync(path.join(profile.root, "agents", fileName))
   );
 }
 
@@ -420,9 +420,25 @@ export function syncAgentProfile({ client, root, label, tenantId, agents, now =
   const manifestPath = path.join(managedDir, MANAGED_AGENT_MANIFEST);
   const prior = readManifest(manifestPath);
   const rendered = renderManagedAgents(client, tenantId, agents);
+  const priorFiles = new Set(prior?.files || []);
+  const priorUsesDiscoveryRoot = prior?.version === 2;
 
+  // Native clients discover standalone definitions directly under `agents/`.
+  // Preflight every destination before writing so an unmanaged file with the
+  // same generated name is never overwritten.
   for (const agent of rendered) {
-    atomicPrivateWrite(path.join(managedDir, agent.fileName), agent.contents);
+    const destination = path.join(agentsDir, agent.fileName);
+    if (fs.existsSync(destination)) {
+      if (!priorUsesDiscoveryRoot || !priorFiles.has(agent.fileName)) {
+        throw new Error(`refusing to overwrite unmanaged native-agent file ${destination}`);
+      }
+      if (fs.lstatSync(destination).isSymbolicLink()) {
+        throw new Error(`refusing to overwrite symlinked native-agent file ${destination}`);
+      }
+    }
+  }
+  for (const agent of rendered) {
+    atomicPrivateWrite(path.join(agentsDir, agent.fileName), agent.contents);
   }
   const currentFiles = new Set(rendered.map((agent) => agent.fileName));
   for (const stale of prior?.files || []) {
@@ -432,11 +448,22 @@ export function syncAgentProfile({ client, root, label, tenantId, agents, now =
       && !currentFiles.has(stale)
       && (stale.endsWith(".md") || stale.endsWith(".toml"))
     ) {
-      fs.rmSync(path.join(managedDir, stale), { force: true });
+      fs.rmSync(path.join(priorUsesDiscoveryRoot ? agentsDir : managedDir, stale), { force: true });
+    }
+  }
+  if (!priorUsesDiscoveryRoot) {
+    for (const legacy of prior?.files || []) {
+      if (
+        typeof legacy === "string"
+        && path.basename(legacy) === legacy
+        && (legacy.endsWith(".md") || legacy.endsWith(".toml"))
+      ) {
+        fs.rmSync(path.join(managedDir, legacy), { force: true });
+      }
     }
   }
   atomicPrivateWrite(manifestPath, `${JSON.stringify({
-    version: 1,
+    version: 2,
     tenantId,
     client,
     syncedAt: new Date(now).toISOString(),

package/src/apps.js

@@ -193,6 +193,7 @@ export function bundleIsCurrent(status) {
       compatibility.vendorSignaturesPreserved === true
       && compatibility.resourceRoot === CHATGPT_RESOURCE_ROOT
       && compatibility.patches?.fastModeForGatewayAuth > 0
+      && compatibility.patches?.tenantDisplayNamePreload === 1
     )),
   );
 }
@@ -1060,6 +1061,11 @@ function writeVendoredChatGPTBundle(paths, vendorPath, gatewayUrl) {
       vendoredChatGPTLauncher(paths, vendorBundleName, executableName, gatewayUrl),
       0o755,
     );
+    writeAtomic(
+      path.join(staging, "Contents", "Resources", "impel-chatgpt-preload.cjs"),
+      vendoredChatGPTDisplayNamePreload(),
+      0o644,
+    );
     writeAtomic(path.join(staging, "Contents", "Resources", "impel-compatibility.json"), JSON.stringify({
       schemaVersion: 2,
       cliVersion: CLI_VERSION,
@@ -1070,7 +1076,11 @@ function writeVendoredChatGPTBundle(paths, vendorPath, gatewayUrl) {
       profileRoot: paths.chatgpt.root,
       codexHome: paths.chatgpt.codexHome,
       browserData: paths.chatgpt.browserData,
-      patches: { fastModeForGatewayAuth: fastModePatchCount, desktopAPIForGatewayAuth: 0 },
+      patches: {
+        fastModeForGatewayAuth: fastModePatchCount,
+        desktopAPIForGatewayAuth: 0,
+        tenantDisplayNamePreload: 1,
+      },
       vendorSignaturesPreserved: true,
       resourceRoot: CHATGPT_RESOURCE_ROOT,
       asarHeaderSha256: asarHash,
@@ -1384,14 +1394,138 @@ unset TOKEN
 secure_codex_home
 BROWSER_DATA=${shellQuote(paths.chatgpt.browserData)}
 mkdir -p "$BROWSER_DATA"
-# Electron resolves resources from the Impel wrapper when a nested app is
-# executed directly. The wrapper exposes the vendor resource tree there, so
-# app.asar and companion binaries resolve without LaunchServices handing the
-# process to the separately running, identically identified vendor app.
+export IMPEL_APP_DISPLAY_NAME=${shellQuote(paths.chatgpt.displayName)}
+PRELOAD="$HERE/../Resources/impel-chatgpt-preload.cjs"
+export NODE_OPTIONS="--require=\\\"$PRELOAD\\\""
+# Electron resolves resources from the Impel wrapper when the nested app is
+# executed directly. The wrapper exposes the vendor resource tree there while
+# preserving the nested OpenAI-signed executable and bundle. The startup
+# preload pins Electron's application name before its native menu is created.
 exec "$VENDOR_APP/Contents/MacOS/${executableName}" --user-data-dir="$BROWSER_DATA" "$@"
 `;
 }
 
+function vendoredChatGPTDisplayNamePreload() {
+  return `"use strict";
+
+const displayName = process.env.IMPEL_APP_DISPLAY_NAME;
+if (process.type === "browser" && displayName) {
+  const Module = require("node:module");
+  const path = require("node:path");
+  const load = Module._load;
+  let objc;
+  let appKit;
+  let launchServicesNamed = false;
+  let activationPolicyRefreshed = false;
+
+  const loadNativeBridge = () => {
+    objc ||= require(path.join(
+      process.resourcesPath,
+      "app.asar.unpacked/node_modules/objc-js/dist/index.js",
+    ));
+    appKit ||= new objc.NobjcLibrary("/System/Library/Frameworks/AppKit.framework/AppKit");
+    return { objc, appKit };
+  };
+
+  const setLaunchServicesApplicationName = () => {
+    if (launchServicesNamed) return;
+    try {
+      const native = loadNativeBridge();
+      new native.objc.NobjcLibrary(
+        "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/ApplicationServices",
+      );
+      const title = native.appKit.NSString.stringWithUTF8String$(displayName);
+      const info = native.appKit.NSMutableDictionary.dictionaryWithDictionary$(
+        native.appKit.NSBundle.mainBundle().infoDictionary(),
+      );
+      for (const key of ["CFBundleName", "CFBundleDisplayName"]) {
+        info.setObject$forKey$(title, native.appKit.NSString.stringWithUTF8String$(key));
+      }
+      native.objc.callFunction(
+        "_LSSetApplicationLaunchServicesServerConnectionStatus",
+        { returns: "v", args: ["Q", "@"] },
+        0,
+        null,
+      );
+      const checked = native.objc.callFunction(
+        "_LSApplicationCheckIn",
+        { returns: "@", args: ["i", "@"] },
+        -2,
+        info,
+      );
+      const asn = native.objc.callFunction("_LSGetCurrentApplicationASN", { returns: "@" });
+      if (!checked || !asn) return;
+      const status = native.objc.callFunction(
+        "_LSSetApplicationInformationItem",
+        { returns: "i", args: ["i", "@", "@", "@", "@"] },
+        -2,
+        asn,
+        native.appKit.NSString.stringWithUTF8String$("LSDisplayName"),
+        title,
+        null,
+      );
+      launchServicesNamed = status === 0;
+    } catch {
+      // Keep the signed vendor app usable if LaunchServices changes this
+      // private-but-established process-title API in a future macOS release.
+    }
+  };
+
+  const setNativeApplicationMenuTitle = () => {
+    try {
+      const native = loadNativeBridge();
+      const title = native.appKit.NSString.stringWithUTF8String$(displayName);
+      native.appKit.NSProcessInfo.processInfo().setProcessName$(title);
+      const application = native.appKit.NSApplication.sharedApplication();
+      application.setAccessibilityTitle$(title);
+      const menu = application.mainMenu();
+      if (menu && menu.numberOfItems() > 0) {
+        const item = menu.itemAtIndex$(0);
+        item.setTitle$(title);
+        item.setAccessibilityTitle$(title);
+        item.setAccessibilityLabel$(title);
+      }
+    } catch {
+      // The OpenAI-signed native bridge is version-specific. Leave the app
+      // usable if a future vendor build removes it; compatibility metadata
+      // will force the next CLI version to rebuild the wrapper.
+    }
+  };
+
+  Module._load = function (request) {
+    const loaded = load.apply(this, arguments);
+    if (request === "electron" && loaded?.app) {
+      Module._load = load;
+      const setName = loaded.app.setName.bind(loaded.app);
+      setName(displayName);
+      loaded.app.setName = () => setName(displayName);
+      setLaunchServicesApplicationName();
+      setNativeApplicationMenuTitle();
+      const setApplicationMenu = loaded.Menu.setApplicationMenu.bind(loaded.Menu);
+      loaded.Menu.setApplicationMenu = (menu) => {
+        const result = setApplicationMenu(menu);
+        setNativeApplicationMenuTitle();
+        if (!activationPolicyRefreshed) {
+          activationPolicyRefreshed = true;
+          loaded.app.setActivationPolicy("accessory");
+          setTimeout(() => {
+            loaded.app.setActivationPolicy("regular");
+            launchServicesNamed = false;
+            setLaunchServicesApplicationName();
+            setApplicationMenu(menu);
+            setNativeApplicationMenuTitle();
+          }, 0);
+        }
+        setTimeout(setNativeApplicationMenuTitle, 0);
+        return result;
+      };
+    }
+    return loaded;
+  };
+}
+`;
+}
+
 function signVendoredApp(bundle, vendorExecutable, label) {
   if (process.platform !== "darwin" || !isMachO(vendorExecutable)) return;
   spawnSync("/usr/bin/xattr", ["-dr", "com.apple.quarantine", bundle], { stdio: "ignore" });