codex-copilot-dx 0.6.0 → 0.6.2

package/README.md

@@ -1,6 +1,6 @@
 # codex-copilot-dx
 
-Use [Codex Desktop](https://openai.com/codex), [Claude Code](https://claude.com/claude-code), and optionally Claude App with your **GitHub Copilot** subscription.
+Use [Codex Desktop](https://openai.com/codex), [Claude Code](https://claude.com/claude-code), and optionally Claude App or PM Studio with your **GitHub Copilot** subscription.
 
 ## How it works
 
@@ -10,6 +10,7 @@ account by default, or over isolated Codex and Claude accounts when configured:
 - **Codex** -> OpenAI Responses API (`/v1/responses`, `/v1/responses/compact`); Responses-only models and compaction proxy directly, chat models convert to Chat Completions.
 - **Claude Code** -> Anthropic Messages API (`/v1/messages`, `/v1/messages/count_tokens`), translated to/from Chat Completions.
 - **Claude App** -> optional Claude Desktop App gateway profile using the same local Messages API plus local model discovery for the configured gateway key.
+- **PM Studio** -> optional macOS app patch that keeps the active PM profile for GPT models while routing enabled Claude models through an isolated CCDX Claude account.
 
 Supports both HTTP SSE streaming and non-streaming.
 
@@ -19,7 +20,7 @@ Codex Auto-review requests use the hidden `codex-auto-review` model ID. The adap
 
 - GitHub Copilot subscription (Individual, Business, or Enterprise)
 - Node.js 22.15+ (required for built-in Zstandard request decompression)
-- [Codex Desktop](https://openai.com/codex), [Claude Code](https://claude.com/claude-code), and/or Claude App installed
+- [Codex Desktop](https://openai.com/codex), [Claude Code](https://claude.com/claude-code), Claude App, and/or a supported PM Studio installation
 
 ## Usage
 
@@ -33,6 +34,8 @@ command remains an equivalent compatibility alias. For a one-off run without a
 global install, use `npx codex-copilot-dx@latest`.
 Both installed commands expose the same options and subcommands; help, version,
 doctor, status, and argument-error output use the command name that was invoked.
+Run `ccdx <command> --help` (including `auth login claude --help` and
+`pms status --help`) for command-specific behavior and side-effect details.
 
 To query the models currently advertised as selectable for the saved Codex
 Copilot account, run:
@@ -59,11 +62,14 @@ while using a different personal account that has Claude models enabled, run:
 ccdx auth login claude --github-login <personal-github-login>
 ```
 
-This is the only command that starts the additional Device Flow. It verifies
+This is the only command that may start the additional Device Flow. Before
+opening a browser, it checks compatible local Copilot credentials, excludes the
+current Codex identity, and reuses an unambiguous valid account. It then verifies
 the selected GitHub identity, Copilot entitlement, and an enabled Claude model
 before saving anything. It refuses the current Codex account and never changes,
 migrates, or deletes the existing Codex credential. The optional login pin is
-recommended so authorizing the wrong browser account fails before activation.
+recommended so a machine with multiple accounts selects only the requested
+identity. Use `--reauth` to bypass local discovery and force Device Flow.
 
 The existing Codex token remains at
 `~/.local/share/copilot-api/github_token`. The isolated Claude credential is
@@ -79,7 +85,8 @@ Once enabled, routing is fixed by API surface rather than by model name:
 - `/v1/messages/count_tokens` remains local and uses neither account.
 
 The two profiles keep separate service tokens, API bases, refresh/backoff state,
-model endpoint metadata, and model caches. If the isolated Claude profile later
+model endpoint metadata, and credential-bound model caches. Switching either
+GitHub account invalidates that profile's old cache instead of borrowing it. If the isolated Claude profile later
 becomes invalid, Claude requests fail with a reauthentication instruction while
 Codex remains available; CCDX never silently falls back to the enterprise
 account. Reauthorize it explicitly with:
@@ -97,6 +104,83 @@ ccdx models --profile claude
 ccdx doctor --online --profile all
 ```
 
+### PM Studio opt-in patch
+
+CCDX can add the isolated Claude catalog to PM Studio without switching its
+active account or profile. GPT requests continue to use the bearer supplied by
+the current PM profile; exact enabled Anthropic model IDs use the isolated
+CCDX Claude profile. Neither credential is copied into the other application.
+
+The first recipe supports only an exact, unmodified PM Studio 2.9.7 bundle on
+macOS. Authorize the isolated Claude profile first, quit PM Studio and its
+updater, then run the one-time setup command:
+
+```bash
+ccdx auth login claude --reauth --github-login <personal-github-login>
+ccdx pms setup
+```
+
+Inspect the installed version, exact patch integrity, isolated Claude profile,
+and relay without changing files:
+
+```bash
+ccdx pms status
+```
+
+`pm-studio status` and `pm-studio setup` are equivalent long-form aliases.
+
+`ccdx pms setup` performs only local preflight, backup, staging, integrity,
+signing, and replacement work. It never starts Device Flow, the adapter,
+Codex, or PM Studio, and it does not modify PM profiles, cached model lists, or
+saved PM tokens. Unknown versions, hashes, signatures, partial patches, a
+running PM process, insufficient space, and every pre-replacement verification
+failure leave the installed App unchanged. If the final read-only verification
+after an atomic replacement detects an exceptional filesystem drift, setup
+does not attempt a second automatic write: it preserves the verified backup,
+retains any diagnostic stage still present, and prints recovery paths. Repeating
+setup for the exact installed recipe is idempotent.
+
+The patch is App-wide: every PM profile sends its Copilot API traffic through
+the loopback-only `/pm-ccdx/*` relay. Run ordinary `ccdx` before opening PM
+Studio; if port 2026 is unavailable, PM Copilot requests cannot connect. The
+relay explicitly supports only the PM 2.9.7 Copilot paths discovered in the
+validated bundle (`GET /models` and `POST /chat/completions`, `/responses`, and
+`/embeddings`) and is not a general-purpose proxy.
+
+Patching replaces the vendor signature with an ad-hoc signature. PM Studio's
+updater is not disabled; an official update may overwrite the patch or may
+require reinstalling the official App. Setup prints the verified backup and
+manifest paths plus the version-matched restore procedure. Never restore a
+2.9.7 backup over a newer PM Studio installation.
+
+To restore, first quit PM Studio and its updater. Use the exact verified backup
+path printed by setup as `BACKUP_APP`, then confirm that both the installed App
+and backup still report version/build `2.9.7/2.9.7`:
+
+```bash
+BACKUP_APP="<verified-backup-path-from-ccdx-pms-setup>"
+/usr/bin/plutil -extract CFBundleShortVersionString raw -o - "/Applications/PM Studio.app/Contents/Info.plist"
+/usr/bin/plutil -extract CFBundleVersion raw -o - "/Applications/PM Studio.app/Contents/Info.plist"
+/usr/bin/plutil -extract CFBundleShortVersionString raw -o - "$BACKUP_APP/Contents/Info.plist"
+/usr/bin/plutil -extract CFBundleVersion raw -o - "$BACKUP_APP/Contents/Info.plist"
+```
+
+Only when all four values match `2.9.7`, move the patched App aside, restore the
+complete vendor-signed backup, and verify it before launch:
+
+```bash
+RECOVERY_DIR="$(/usr/bin/mktemp -d '/Applications/CCDX-PM-Studio-recovery.XXXXXX')"
+PATCHED_APP="$RECOVERY_DIR/PM Studio.app"
+mv "/Applications/PM Studio.app" "$PATCHED_APP"
+/usr/bin/ditto --rsrc --extattr --acl "$BACKUP_APP" "/Applications/PM Studio.app"
+/usr/bin/codesign --verify --deep --strict --verbose=2 "/Applications/PM Studio.app"
+```
+
+If the version check, copy, or signature verification fails, do not launch the
+restored App. Keep the moved patched bundle at `$PATCHED_APP` and reinstall the official PM Studio
+instead of applying a 2.9.7 backup to unknown content. CCDX never runs these
+restore commands or `sudo` automatically.
+
 To change the model used by Codex Auto-review, run:
 
 ```bash
@@ -163,7 +247,11 @@ ccdx doctor
 
 The command exits with status `1` when it finds an invalid configuration and `0` when checks contain only OK or warning results.
 
-The doctor checks the GitHub token, Codex config, Claude Code settings, Claude App gateway profile, and whether the local adapter port is listening.
+The doctor checks the GitHub token, Codex config, Claude Code settings, Claude
+App gateway profile, adapter availability, and an installed PM Studio bundle.
+It ends with passed/warning/error totals and deduplicated next-step commands.
+An absent PM Studio installation is ignored; unsupported versions are reported
+without modification, while integrity drift remains an error.
 
 For a read-only live check of the saved GitHub token, Copilot entitlement, and models endpoint, run:
 
@@ -198,7 +286,7 @@ loopback endpoint directly:
 curl -s http://127.0.0.1:2026/_ccdx/status | jq
 ```
 
-The status endpoint is restricted to the socket's real loopback address, even when LAN binding is explicitly enabled. It reports fixed-size request counters, bounded TTFT/TPOT histograms for streaming routes, admission pressure, memory use, response-history size, image queue/cache state, model cache counts, and token expiry state. It never retains metric samples or includes prompts, completions, tool arguments, image content, account names, or token values. API responses always include a safe `X-Request-Id` for correlation. To include the same ID as `request_id` in related terminal and file log lines, start the adapter with:
+The status endpoint is restricted to the socket's real loopback address, even when LAN binding is explicitly enabled. It reports fixed-size request counters, bounded TTFT/TPOT histograms for streaming routes, admission pressure, memory use, response-history size, image queue/cache state, profile model cache counts, PM relay route totals, and token expiry state. It never retains metric samples or includes prompts, completions, tool arguments, image content, account names, or token values. API responses always include a safe `X-Request-Id` for correlation. If the adapter is not running, the CLI prints the exact start-and-retry command. To include the same ID as `request_id` in related terminal and file log lines, start the adapter with:
 
 ```bash
 ccdx --show-request-id
@@ -218,9 +306,13 @@ ccdx
 Claude App support is opt-in so the default Codex Desktop and Claude Code setup stays unchanged:
 
 ```bash
-npx codex-copilot-dx@latest --configure-claude-desktop
+npx codex-copilot-dx@latest start --configure-claude-app
 ```
 
+The previous `--configure-claude-desktop` spelling remains a compatibility
+alias. Startup reports Claude App as ready only when a matching managed gateway
+key is restored or the profile is configured in that run.
+
 Or set:
 
 ```bash

package/bin/cli.mjs

@@ -39,7 +39,7 @@ try {
 }
 
 if (CLI.command === "help") {
-  console.log(cliHelp(CLI_NAME));
+  console.log(cliHelp(CLI_NAME, CLI.helpTopic));
   process.exit(0);
 }
 if (CLI.command === "version") {
@@ -123,6 +123,21 @@ if (CLI.command === "update") {
     process.exit(1);
   }
 }
+if (CLI.command === "pms") {
+  try {
+    if (CLI.action === "status") {
+      const { runPmStudioStatus } = await import("../src/pm-studio-status.mjs");
+      const result = await runPmStudioStatus({ commandName: CLI_NAME });
+      process.exit(result.ok ? 0 : 1);
+    }
+    const { runPmStudioSetup } = await import("../src/pm-studio-setup.mjs");
+    await runPmStudioSetup({ commandName: CLI_NAME });
+    process.exit(0);
+  } catch (e) {
+    console.error(status("err", e.message));
+    process.exit(1);
+  }
+}
 
 let RUNTIME;
 try {
@@ -196,7 +211,7 @@ async function reuseRunningAdapterIfAvailable() {
       console.log(status("warn", "Existing adapter is running; skip Claude App profile update unless CCDX_CLAUDE_DESKTOP_API_KEY or CCDX_PROXY_API_KEY is set"));
     }
   } else {
-    console.log(status("ok", "Claude App support available with --configure-claude-desktop"));
+    console.log(status("ok", "Claude App support available with --configure-claude-app"));
   }
 
   await openCodex();
@@ -260,6 +275,7 @@ try {
     codexClient: profileRuntime.codexClient,
     claudeClient: profileRuntime.claudeClient,
     claudeMode: profileRuntime.claudeMode,
+    codexCredentialFingerprint: profileRuntime.codexCredentialFingerprint,
     claudeCredentialFingerprint: profileRuntime.claudeCredentialFingerprint,
     timeoutMs: MODEL_REFRESH_TIMEOUT_MS,
     commandName: CLI_NAME,
@@ -296,6 +312,7 @@ try {
     autoReviewModelResolver: () => autoReviewModelPreference().model,
     codexClient: profileRuntime.codexClient,
     claudeClient: profileRuntime.claudeClient,
+    claudeProfile: profileRuntime.claudeProfile,
     codexModelRegistry: profileModels.codexRegistry,
     claudeModelRegistry: profileModels.claudeRegistry,
     claudeMode: profileRuntime.claudeMode,
@@ -318,7 +335,7 @@ try {
     console.log(status("ok", `Configured Claude App gateway profile at ${result.baseUrl}`));
     console.log(formatClaudeDesktopApplyResult(result));
   } else {
-    console.log(status("ok", "Claude App support available with --configure-claude-desktop"));
+    console.log(status("ok", "Claude App support available with --configure-claude-app"));
   }
 
   // Launch Codex when available.
@@ -334,8 +351,10 @@ try {
     modelRefreshTimer.unref?.();
   }
 
+  const readyClients = ["Codex App", "Claude Code"];
+  if (claudeDesktopApiKey) readyClients.splice(1, 0, "Claude App");
   console.log(`
-  ${status("ok", "Ready, Claude Code, Claude App and Codex App are now ready to use")}
+  ${status("ok", `Ready, ${readyClients.join(", ")} ${readyClients.length === 1 ? "is" : "are"} ready to use`)}
 
   Adapter: ${adapterBaseUrl(ADAPTER_HOST, ADAPTER_PORT)}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codex-copilot-dx",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "description": "Use Codex Desktop, Claude Code, and Claude App with GitHub Copilot",
   "author": "Dale Xiao",
   "type": "module",

package/scripts/benchmark.mjs

@@ -8,6 +8,7 @@ import { setTimeout as delay } from "node:timers/promises";
 import { fileURLToPath } from "node:url";
 import sharp from "sharp";
 import { optimizeImagesInBody, prepareResponsesPayload } from "../src/image-optimization.mjs";
+import { createPmStudioModelRouter } from "../src/profile-routing.mjs";
 
 const packageRoot = fileURLToPath(new URL("../", import.meta.url));
 
@@ -235,6 +236,34 @@ const duplicateImages = {
   optimizer_calls: duplicateCalls,
 };
 
+const routingCatalog = {
+  data: Array.from({ length: 1000 }, (_, index) => index % 5 === 0
+    ? {
+        id: `claude-benchmark-${index}`,
+        vendor: "Anthropic",
+        model_picker_enabled: true,
+        supported_endpoints: ["/chat/completions"],
+      }
+    : { id: `gpt-benchmark-${index}`, vendor: "OpenAI", supported_endpoints: ["/responses"] }),
+};
+const modelRouter = createPmStudioModelRouter({
+  getCatalog: () => routingCatalog,
+  isClaudeEnabled: () => true,
+});
+const routingIterations = 100000;
+const routingStarted = performance.now();
+let claudeClassifications = 0;
+for (let index = 0; index < routingIterations; index += 1) {
+  if (modelRouter.classify("claude-benchmark-0") === "claude") claudeClassifications += 1;
+}
+const pmModelRouting = {
+  catalog_models: routingCatalog.data.length,
+  iterations: routingIterations,
+  elapsed_ms: +(performance.now() - routingStarted).toFixed(1),
+  claude_classifications: claudeClassifications,
+  availability_rebuilds: modelRouter.diagnostics().rebuilds,
+};
+
 const pixels = deterministicPixels(1024 * 1024 * 3, 0x87654321);
 const webp = await sharp(pixels, { raw: { width: 1024, height: 1024, channels: 3 } })
   .webp({ quality: 100 })
@@ -281,6 +310,7 @@ const report = {
   adapter_import: adapterImport,
   token_count_100kb: tokenCount,
   duplicate_images: duplicateImages,
+  pm_model_routing: pmModelRouting,
   oversized_payload: oversizedPayload,
 };
 
@@ -308,6 +338,10 @@ console.log(JSON.stringify(report, null, 2));
 
 if (checkMode) {
   const failures = [];
+  if (report.pm_model_routing.availability_rebuilds !== 1
+    || report.pm_model_routing.claude_classifications !== report.pm_model_routing.iterations) {
+    failures.push("PM Studio model routing did not reuse the memoized catalog classification");
+  }
   const proxy = report.large_token_count.proxy;
   const array = report.large_token_count.materialized_array;
   if (proxy.tokens !== array.tokens) failures.push(`token counts differ: proxy=${proxy.tokens} array=${array.tokens}`);

package/src/adapter.mjs

@@ -11,6 +11,7 @@ import {
   runtimeStatusPayload,
 } from "./observability.mjs";
 import { createRequestId, runWithRequestContext } from "./request-context.mjs";
+import { createPmStudioRelayHandler, PM_STUDIO_RELAY_PREFIX } from "./pm-studio-relay.mjs";
 import { createStreamPerformanceMetrics } from "./stream-performance.mjs";
 import { status } from "./status.mjs";
 import { createTerminalActivityIndicator } from "./terminal-activity.mjs";
@@ -172,6 +173,17 @@ export function createAdapterHandler(options = {}) {
     streamIdleTimeoutMs,
     upstreamTimeoutMs,
   });
+  const pmStudioRelayHandler = createPmStudioRelayHandler({
+    acquireRequest,
+    claudeClient,
+    claudeMode,
+    claudeProfile: options.claudeProfile,
+    claudeModelRegistry,
+    fetchImpl: options.pmStudioFetchImpl,
+    streamHandshakeTimeoutMs,
+    streamIdleTimeoutMs,
+    upstreamTimeoutMs,
+  });
 
   const dispatch = (req, res, pathname) => {
     if (req.method === "GET" && pathname === ADAPTER_STATUS_PATH) {
@@ -201,6 +213,10 @@ export function createAdapterHandler(options = {}) {
       return;
     }
 
+    if (pathname.startsWith(`${PM_STUDIO_RELAY_PREFIX}/`)) {
+      return pmStudioRelayHandler(req, res, pathname);
+    }
+
     if (req.method === "POST" && pathname === "/v1/responses") {
       return responsesHandler(req, res);
     }

package/src/auth.mjs

@@ -326,6 +326,7 @@ export async function discoverGithubToken({
   fetchImpl = fetch,
   signal,
   excludeTokens = [],
+  excludeIdentities = [],
   expectedIdentity,
   strictExpectedIdentity = false,
 } = {}) {
@@ -348,6 +349,10 @@ export async function discoverGithubToken({
 
     const validation = await validateGithubToken(token, { fetchImpl, signal });
     if (validation.ok) {
+      if (excludeIdentities.some((identity) => githubIdentityMatchesExpected(validation, identity))) {
+        failures.push({ source, validation, reason: "github_account_excluded" });
+        continue;
+      }
       const candidate = { ok: true, token, source, validation };
       const explicitSource = source.type === "env" || source.type === "token-file";
       if (expectedIdentity && (strictExpectedIdentity || !explicitSource)) {

package/src/cli-auth.mjs

@@ -1,8 +1,10 @@
 import os from "node:os";
 import { spawn } from "node:child_process";
 import {
+  discoverGithubToken,
   fetchGithubIdentity,
   interpretPoll,
+  sourceDescription,
   validateGithubToken,
 } from "./auth.mjs";
 import {
@@ -19,6 +21,7 @@ import {
   normalizeGithubIdentity,
 } from "./github-identity.mjs";
 import { saveModelCache } from "./model-cache.mjs";
+import { profileRouting } from "./profile-routing.mjs";
 import { status } from "./status.mjs";
 
 const CLIENT_ID = "Iv1.b507a08c87ecfe98";
@@ -267,14 +270,45 @@ export async function authorizeClaudeProfile({
       throw new Error(`Claude profile is configured but invalid (${current.reason}); run ccdx auth login claude --reauth`);
     }
 
-    const githubToken = await requestDeviceFlowToken({
-      fetchImpl,
-      signal,
-      log,
-      openAndCopyFn,
-      sleepImpl,
-      now,
-    });
+    let githubToken = "";
+    if (!reauth) {
+      const codex = readAuthProfileCredentials(AUTH_PROFILE_CODEX, { home });
+      if (!codex.valid) {
+        throw new Error("The existing Codex GitHub account is not configured; refusing to create an unbound Claude profile");
+      }
+      const existingCodex = await codexIdentity({ home, fetchImpl, signal });
+      const pinnedLogin = String(expectedLogin || "").trim();
+      const discovered = await discoverGithubToken({
+        home,
+        env,
+        fetchImpl,
+        signal,
+        excludeTokens: [codex.token],
+        excludeIdentities: [existingCodex.identity],
+        expectedIdentity: pinnedLogin ? { login: pinnedLogin } : undefined,
+        strictExpectedIdentity: Boolean(pinnedLogin),
+      });
+      if (discovered.ambiguous) {
+        const accounts = [...new Set(discovered.candidates
+          .map((candidate) => candidate.login || candidate.id || "unknown"))];
+        throw new Error(`Multiple reusable GitHub Copilot accounts were found (${accounts.join(", ")}). Use --github-login or CCDX_GITHUB_TOKEN_PATH to select the Claude account.`);
+      }
+      if (discovered.ok) {
+        githubToken = discovered.token;
+        const login = discovered.validation?.login ? ` for ${discovered.validation.login}` : "";
+        log(status("info", `Reusing a local Copilot credential from ${sourceDescription(discovered.source)}${login}`));
+      }
+    }
+    if (!githubToken) {
+      githubToken = await requestDeviceFlowToken({
+        fetchImpl,
+        signal,
+        log,
+        openAndCopyFn,
+        sleepImpl,
+        now,
+      });
+    }
     const candidate = await validateClaudeCandidate(githubToken, {
       home,
       expectedLogin,
@@ -350,10 +384,7 @@ export function authStatus({ home = os.homedir() } = {}) {
       codex: publicProfile(codex, "legacy"),
       claude: publicProfile(claude, "isolated"),
     },
-    routing: {
-      responses: AUTH_PROFILE_CODEX,
-      messages: claude.configured ? AUTH_PROFILE_CLAUDE : AUTH_PROFILE_CODEX,
-    },
+    routing: profileRouting({ claudeConfigured: claude.configured }),
   };
 }