codex-copilot-dx 0.6.1 → 0.6.3

package/src/cli-options.mjs

@@ -1,7 +1,28 @@
 const HELP_COMMANDS = new Set(["help", "--help", "-h"]);
 const VERSION_COMMANDS = new Set(["version", "--version", "-v"]);
-const START_OPTIONS = new Set(["--configure-claude-desktop", "--show-request-id"]);
-const CLI_COMMANDS = new Set(["ccdx", "codex-copilot-dx"]);
+const START_OPTIONS = new Map([
+  ["--configure-claude-desktop", "configure-claude-app"],
+  ["--configure-claude-app", "configure-claude-app"],
+  ["--show-request-id", "show-request-id"],
+]);
+const PM_COMMANDS = new Set(["pms", "pm-studio"]);
+const HELP_TOPICS = new Set([
+  "",
+  "start",
+  "auth",
+  "auth status",
+  "auth login",
+  "doctor",
+  "status",
+  "models",
+  "pms",
+  "pms setup",
+  "pms status",
+  "usage",
+  "auto-review-model",
+  "update",
+  "version",
+]);
 
 function unexpectedArgs(args) {
   throw new Error(`Unexpected argument${args.length === 1 ? "" : "s"}: ${args.join(" ")}`);
@@ -39,40 +60,97 @@ function checkedProfile(value, { allowAll = false } = {}) {
   return profile;
 }
 
+function baseCommand(command, extra = {}) {
+  return {
+    command,
+    configureClaudeDesktop: false,
+    showRequestId: false,
+    online: false,
+    compat: false,
+    ...extra,
+  };
+}
+
+function checkedHelpTopic(parts = []) {
+  const normalized = parts.map((part, index) => {
+    if (index === 0 && part === "pm-studio") return "pms";
+    return part;
+  }).join(" ");
+  if (!HELP_TOPICS.has(normalized)) throw new Error(`Unknown help topic: ${parts.join(" ")}`);
+  return normalized;
+}
+
+function helpCommand(parts = []) {
+  return baseCommand("help", { helpTopic: checkedHelpTopic(parts) });
+}
+
+function nestedHelp(command, rest) {
+  if (!rest.length || !HELP_COMMANDS.has(rest.at(-1))) return null;
+  const args = rest.slice(0, -1);
+  if (PM_COMMANDS.has(command)) {
+    if (args.length > 1) unexpectedArgs(args.slice(1));
+    return helpCommand(["pms", ...args]);
+  }
+  if (command === "auth") {
+    if (args[0] === "login" && args[1] === "claude" && args.length === 2) {
+      return helpCommand(["auth", "login"]);
+    }
+    if (args.length > 1) unexpectedArgs(args.slice(1));
+    return helpCommand(["auth", ...args]);
+  }
+  if (args.length) unexpectedArgs(args);
+  return helpCommand([command]);
+}
+
+function parseStartOptions(args) {
+  const seen = new Set();
+  for (const option of args) {
+    const kind = START_OPTIONS.get(option);
+    if (!kind || seen.has(kind)) unexpectedArgs([option]);
+    seen.add(kind);
+  }
+  return baseCommand("start", {
+    configureClaudeDesktop: seen.has("configure-claude-app"),
+    showRequestId: seen.has("show-request-id"),
+  });
+}
+
 export function parseCliArgs(args = []) {
   const [command, ...rest] = args;
-  if (!command) return { command: "start", configureClaudeDesktop: false, showRequestId: false, online: false, compat: false };
+  if (!command) return baseCommand("start");
   if (HELP_COMMANDS.has(command)) {
-    if (rest.length) unexpectedArgs(rest);
-    return { command: "help", configureClaudeDesktop: false, showRequestId: false, online: false, compat: false };
+    const topic = rest[0] === "auth" && rest[1] === "login" && rest[2] === "claude"
+      ? ["auth", "login"]
+      : rest;
+    if (topic.length > 2) unexpectedArgs(topic.slice(2));
+    return helpCommand(topic);
   }
+  const requestedHelp = nestedHelp(command, rest);
+  if (requestedHelp) return requestedHelp;
   if (VERSION_COMMANDS.has(command)) {
     if (rest.length) unexpectedArgs(rest);
-    return { command: "version", configureClaudeDesktop: false, showRequestId: false, online: false, compat: false };
+    return baseCommand("version");
   }
+  if (command === "start") return parseStartOptions(rest);
   if (command === "status" || command === "--status") {
     if (rest.length) unexpectedArgs(rest);
-    return { command: "status", configureClaudeDesktop: false, showRequestId: false, online: false, compat: false };
+    return baseCommand("status");
   }
   if (command === "usage") {
     if (rest.length) unexpectedArgs(rest);
-    return { command: "usage", configureClaudeDesktop: false, showRequestId: false, online: false, compat: false };
+    return baseCommand("usage");
   }
-  if (command === "pms") {
+  if (PM_COMMANDS.has(command)) {
     const [action, ...pmsArgs] = rest;
-    if (!action) throw new Error("Missing pms action: expected setup");
-    if (action !== "setup") throw new Error(`Unknown pms action: ${action}`);
+    if (!action) throw new Error("Missing pms action: expected setup or status");
+    if (!new Set(["setup", "status"]).has(action)) throw new Error(`Unknown pms action: ${action}`);
     if (pmsArgs.length) unexpectedArgs(pmsArgs);
-    return { command: "pms", action: "setup", configureClaudeDesktop: false, showRequestId: false, online: false, compat: false };
+    return baseCommand("pms", { action });
   }
   if (command === "models") {
     const options = parseOptions(rest, new Map([["--profile", "value"]]));
     return {
-      command: "models",
-      configureClaudeDesktop: false,
-      showRequestId: false,
-      online: false,
-      compat: false,
+      ...baseCommand("models"),
       profile: checkedProfile(options["--profile"]),
     };
   }
@@ -82,13 +160,10 @@ export function parseCliArgs(args = []) {
     if (action === "status") {
       const options = parseOptions(authArgs, new Map([["--online", "flag"]]));
       return {
-        command: "auth",
+        ...baseCommand("auth"),
         action: "status",
         profile: "",
-        configureClaudeDesktop: false,
-        showRequestId: false,
         online: Boolean(options["--online"]),
-        compat: false,
         expectedLogin: "",
         reauth: false,
       };
@@ -102,13 +177,9 @@ export function parseCliArgs(args = []) {
         ["--reauth", "flag"],
       ]));
       return {
-        command: "auth",
+        ...baseCommand("auth"),
         action: "login",
         profile: "claude",
-        configureClaudeDesktop: false,
-        showRequestId: false,
-        online: false,
-        compat: false,
         expectedLogin: options["--github-login"] || "",
         reauth: Boolean(options["--reauth"]),
       };
@@ -117,7 +188,7 @@ export function parseCliArgs(args = []) {
   }
   if (command === "auto-review-model") {
     if (rest.length) unexpectedArgs(rest);
-    return { command: "auto-review-model", configureClaudeDesktop: false, showRequestId: false, online: false, compat: false };
+    return baseCommand("auto-review-model");
   }
   if (command === "update") {
     if (rest.length > 1) unexpectedArgs(rest.slice(1));
@@ -126,11 +197,7 @@ export function parseCliArgs(args = []) {
       throw new Error(`Update source must be npm or github: ${source}`);
     }
     return {
-      command: "update",
-      configureClaudeDesktop: false,
-      showRequestId: false,
-      online: false,
-      compat: false,
+      ...baseCommand("update"),
       updateSource: source === "gh" ? "github" : source,
     };
   }
@@ -141,29 +208,13 @@ export function parseCliArgs(args = []) {
       ["--profile", "value"],
     ]));
     return {
-      command: "doctor",
-      configureClaudeDesktop: false,
-      showRequestId: false,
+      ...baseCommand("doctor"),
       online: Boolean(options["--online"]),
       compat: Boolean(options["--compat"]),
       profile: checkedProfile(options["--profile"], { allowAll: true }),
     };
   }
-  if (START_OPTIONS.has(command)) {
-    const options = [command, ...rest];
-    const invalid = options.filter((arg) => !START_OPTIONS.has(arg));
-    if (invalid.length) unexpectedArgs(invalid);
-    for (const option of START_OPTIONS) {
-      if (options.filter((arg) => arg === option).length > 1) unexpectedArgs([option]);
-    }
-    return {
-      command: "start",
-      configureClaudeDesktop: options.includes("--configure-claude-desktop"),
-      showRequestId: options.includes("--show-request-id"),
-      online: false,
-      compat: false,
-    };
-  }
+  if (START_OPTIONS.has(command)) return parseStartOptions([command, ...rest]);
   throw new Error(`Unknown command or option: ${command}`);
 }
 
@@ -201,22 +252,42 @@ export function parseAdapterProbeOptions(env = process.env) {
   };
 }
 
-export function cliCommandName(executable = process.argv[1]) {
-  const name = String(executable || "").split(/[\\/]/).pop();
-  if (name === "codex-copilot-dx.mjs") return "codex-copilot-dx";
-  return CLI_COMMANDS.has(name) ? name : "ccdx";
+export function cliCommandName() {
+  return "ccdx";
+}
+
+function topicHelp(name, topic) {
+  const sections = {
+    start: `Usage:\n  ${name} [start] [--configure-claude-app] [--show-request-id]\n\nStarts or reuses the local adapter, updates Codex and Claude Code configuration, and opens Codex.\n--configure-claude-app also creates or updates the managed Claude App gateway profile.`,
+    auth: `Usage:\n  ${name} auth status [--online]\n  ${name} auth login claude [--github-login <login>] [--reauth]\n\nShows the two account profiles or configures the isolated Claude account. Device login starts only when no reusable local Copilot credential is available or --reauth is used.`,
+    "auth status": `Usage:\n  ${name} auth status [--online]\n\nShows account routing without exposing credentials. --online also verifies both configured Copilot entitlements and model catalogs.`,
+    "auth login": `Usage:\n  ${name} auth login claude [--github-login <login>] [--reauth]\n\nReuses a compatible local Copilot credential when possible. --reauth forces GitHub Device Flow.`,
+    doctor: `Usage:\n  ${name} doctor [--online] [--compat] [--profile codex|claude|all]\n\nChecks local credentials, client configuration, PM Studio state, and the adapter. --online validates account entitlement; --compat sends minimal inference requests and consumes a small amount of Copilot usage.`,
+    status: `Usage:\n  ${name} status\n\nShows bounded runtime, routing, performance, cache, queue, and PM relay metrics from a running adapter.`,
+    models: `Usage:\n  ${name} models [--profile codex|claude]\n\nPerforms a fresh, read-only Copilot model-directory lookup for one saved profile.`,
+    pms: `Usage:\n  ${name} pms status\n  ${name} pms setup\n  ${name} pm-studio status\n  ${name} pm-studio setup\n\nInspects or installs the version-locked PM Studio loopback patch. setup modifies the installed app only after all preflight checks pass.`,
+    "pms setup": `Usage:\n  ${name} pms setup\n\nBacks up, patches, verifies, and ad-hoc signs an exactly supported PM Studio bundle. Unknown versions and drift are never modified.`,
+    "pms status": `Usage:\n  ${name} pms status\n\nRead-only inspection of the installed PM Studio version, patch integrity, Claude profile, and relay availability.`,
+    usage: `Usage:\n  ${name} usage\n\nSummarizes local token usage metadata without reading prompt or completion content.`,
+    "auto-review-model": `Usage:\n  ${name} auto-review-model\n\nInteractively selects an enabled Responses model for Codex Auto-review.`,
+    update: `Usage:\n  ${name} update [npm|github]\n\nUpdates the global package from the configured npm registry or GitHub main. With no source, an interactive terminal prompts for one.`,
+    version: `Usage:\n  ${name} --version`,
+  };
+  return sections[topic];
 }
 
-export function cliHelp(commandName = "ccdx") {
-  const name = CLI_COMMANDS.has(commandName) ? commandName : "ccdx";
-  const alias = name === "ccdx" ? "codex-copilot-dx" : "ccdx";
+export function cliHelp(commandName = "ccdx", topic = "") {
+  const name = "ccdx";
+  const normalizedTopic = checkedHelpTopic(topic ? topic.split(" ") : []);
+  if (normalizedTopic) return topicHelp(name, normalizedTopic);
   return `Usage:
-  ${name} [--configure-claude-desktop] [--show-request-id]
+  ${name} [start] [--configure-claude-app] [--show-request-id]
   ${name} auth status [--online]
   ${name} auth login claude [--github-login <login>] [--reauth]
   ${name} doctor [--online] [--compat] [--profile codex|claude|all]
   ${name} status
   ${name} models [--profile codex|claude]
+  ${name} pms status
   ${name} pms setup
   ${name} usage
   ${name} auto-review-model
@@ -224,5 +295,16 @@ export function cliHelp(commandName = "ccdx") {
   ${name} --version
   ${name} --help
 
-Equivalent command: ${alias}`;
+Commands:
+  start              Start or reuse the adapter and configure local clients
+  auth               Inspect or configure the Codex and Claude accounts
+  doctor             Diagnose local config; optional live and inference checks
+  status             Show runtime routing, performance, queue, and cache health
+  models             Query a saved account's live Copilot model catalog
+  pms, pm-studio     Inspect or install the PM Studio patch
+  usage              Summarize locally recorded token usage
+  auto-review-model  Select the Codex Auto-review Responses model
+  update             Update the global package from npm or GitHub
+
+Run ${name} <command> --help for command details.`;
 }

package/src/cli-status.mjs

@@ -70,6 +70,33 @@ function routingTarget(value) {
   return "unknown";
 }
 
+function pmRouteSummary(requests = {}) {
+  const routes = requests.by_route;
+  if (!routes || typeof routes !== "object") return null;
+  const names = ["pm_models", "pm_chat_completions", "pm_responses", "pm_embeddings"];
+  const totals = names.reduce((summary, name) => {
+    const route = routes[name] || {};
+    summary.total += finiteNumber(route.total) || 0;
+    summary.active += finiteNumber(route.active) || 0;
+    summary.errors += finiteNumber(route.errors) || 0;
+    return summary;
+  }, { total: 0, active: 0, errors: 0 });
+  return `PM relay: ${count(totals.total)} requests, ${count(totals.active)} active, ${count(totals.errors)} errors; models ${count(routes.pm_models?.total)}, chat ${count(routes.pm_chat_completions?.total)}, responses ${count(routes.pm_responses?.total)}, embeddings ${count(routes.pm_embeddings?.total)}`;
+}
+
+function errorCode(error) {
+  const seen = new Set();
+  const pending = [error];
+  while (pending.length) {
+    const current = pending.shift();
+    if (!current || typeof current !== "object" || seen.has(current)) continue;
+    seen.add(current);
+    if (typeof current.code === "string") return current.code;
+    pending.push(current.cause, ...(Array.isArray(current.errors) ? current.errors : []));
+  }
+  return "";
+}
+
 export async function readAdapterStatus({
   host = "127.0.0.1",
   port = 2026,
@@ -101,12 +128,16 @@ export async function readAdapterStatus({
     }
     return { baseUrl, data };
   } catch (error) {
+    const code = errorCode(error);
     const reason = ctrl.signal.aborted
       ? `timed out after ${timeoutMs}ms`
-      : error?.cause?.code === "ECONNREFUSED"
+      : code === "ECONNREFUSED" || code === "ENETUNREACH"
         ? "adapter is not running"
         : error?.message || String(error);
-    throw new Error(`Could not read adapter status at ${baseUrl}: ${reason}`);
+    const nextStep = reason === "adapter is not running"
+      ? `. Run ccdx start, then retry ccdx status`
+      : "";
+    throw new Error(`Could not read adapter status at ${baseUrl}: ${reason}${nextStep}`);
   } finally {
     clearTimeout(timer);
   }
@@ -118,6 +149,7 @@ export function formatAdapterStatus({ baseUrl, data }, { commandName = "ccdx", c
   const admission = data.admission || {};
   const history = data.response_history || {};
   const images = data.image_optimization || {};
+  const imageHistory = data.image_history_pressure;
   const models = data.models || {};
   const copilot = data.copilot || {};
   const limits = data.limits || {};
@@ -135,14 +167,19 @@ export function formatAdapterStatus({ baseUrl, data }, { commandName = "ccdx", c
     status("info", `Memory: RSS ${mebibytes(processStats.rss_bytes)}, heap ${mebibytes(processStats.heap_used_bytes)}`),
     status("info", `History: ${mebibytes(history.bytes)} / ${mebibytes(limits.response_history_max_bytes)}, ${count(history.entries)} entries, ${count(history.evicted)} evicted`),
     status("info", `Image cache: ${count(images.cache_entries)} entries, ${cacheHitRate(images)} hits, ${mebibytes(images.cache_bytes)} / ${mebibytes(images.cache_max_bytes)}`),
-    status("info", `Models: ${count(models.models)} total, ${count(models.claude_models)} Claude; Copilot token ${copilot.token_cached ? `cached (${duration(copilot.token_expires_in_ms)} remaining)` : "not cached"}`),
   ];
+  if (imageHistory && typeof imageHistory === "object") {
+    lines.push(status("info", `Visual history: ${count(imageHistory.active_recovery_trees)} recovery trees, ${count(imageHistory.adapted_requests)} adapted requests, ${count(imageHistory.historical_images_omitted)} older images omitted, ${count(imageHistory.timeouts_recorded)} timeouts`));
+  }
+  lines.push(status("info", `Models: ${count(models.models)} total, ${count(models.claude_models)} Claude; Copilot token ${copilot.token_cached ? `cached (${duration(copilot.token_expires_in_ms)} remaining)` : "not cached"}`));
   if (data.profiles?.codex || data.profiles?.claude) {
     lines.push(status("info", `Profiles: ${profileSummary("Codex", data.profiles?.codex)}; ${profileSummary("Claude", data.profiles?.claude)}`));
   }
   if (data.routing) {
     lines.push(status("info", `Routing: /v1/responses -> ${routingTarget(data.routing.responses)}; /v1/messages -> ${routingTarget(data.routing.messages)}`));
   }
+  const pmSummary = pmRouteSummary(requests);
+  if (pmSummary) lines.push(status("info", pmSummary));
   lines.push(status("info", `Limits: request body ${mebibytes(limits.max_body_bytes)}, decoded body ${mebibytes(limits.max_decoded_body_bytes)}`));
   return lines.join("\n");
 }

package/src/copilot-client.mjs

@@ -85,6 +85,7 @@ export function createCopilotClientRuntime({
     fetchImpl,
     retryOptions,
     bodyText,
+    onUpstreamStart,
   } = {}) {
     const token = await tokenSession.getToken({ signal });
     const upstreamReq = chatReq.stream === true ? withChatStreamUsage(chatReq) : chatReq;
@@ -99,6 +100,7 @@ export function createCopilotClientRuntime({
       vision: computeVision(messages),
     });
     headers["Content-Length"] = String(Buffer.byteLength(serializedBody));
+    onUpstreamStart?.();
     if (upstreamReq.stream === true) markUpstreamStarted();
     return fetchCopilotUpstream(`${tokenSession.getApiBase()}/chat/completions`, {
       method: "POST",
@@ -152,6 +154,7 @@ export function createCopilotClientRuntime({
     fetchImpl,
     retryOptions,
     currentInputStart = 0,
+    onUpstreamStart,
     payloadPrepared = false,
     payloadOptions = {},
   } = {}) {
@@ -175,6 +178,7 @@ export function createCopilotClientRuntime({
     headers["Content-Length"] = String(bodyBytes);
     headers.Accept = reqBody.stream ? "text/event-stream" : "application/json";
     try {
+      onUpstreamStart?.();
       if (reqBody.stream === true) markUpstreamStarted();
       return await fetchCopilotUpstream(`${tokenSession.getApiBase()}${responsesEndpointPath()}`, {
         method: "POST",
@@ -183,6 +187,7 @@ export function createCopilotClientRuntime({
         signal,
       }, { fetchImpl, ...retryOptions });
     } catch (error) {
+      if (signal?.aborted) throw abortError(signal);
       const cause = error?.cause;
       const causeText = cause ? ` (${[cause.code, cause.message].filter(Boolean).join(": ")})` : "";
       throw new Error(`Copilot responses fetch failed: ${error.message}${causeText}`);

package/src/doctor.mjs

@@ -251,7 +251,11 @@ export function inspectAuthProfiles({ home = os.homedir() } = {}) {
     if (!claude.configured) {
       checks.push({ kind: "ok", message: "Claude authentication profile is not isolated and inherits Codex" });
     } else if (!claude.valid) {
-      checks.push({ kind: "err", message: `Claude isolated authentication profile is invalid: ${claude.reason}` });
+      checks.push({
+        kind: "err",
+        message: `Claude isolated authentication profile is invalid: ${claude.reason}`,
+        fix: "ccdx auth login claude --reauth",
+      });
     } else {
       const account = claude.identity?.login ? ` for ${claude.identity.login}` : "";
       checks.push({ kind: "ok", message: `Claude isolated authentication profile is configured${account}` });
@@ -455,7 +459,11 @@ export function inspectClaudeAppConfig({
   const meta = readJson(paths.metaPath);
   const appliedId = meta.ok ? String(meta.json?.appliedId || "").trim() : "";
   if (!appliedId) {
-    checks.push({ kind: "warn", message: "Claude App gateway profile is not configured; run with --configure-claude-desktop" });
+    checks.push({
+      kind: "warn",
+      message: "Claude App gateway profile is not configured",
+      fix: "ccdx start --configure-claude-app",
+    });
     return checks;
   }
 
@@ -508,6 +516,7 @@ export async function collectDoctorChecks({
   host = "127.0.0.1",
   port = 2026,
   checkAdapter = true,
+  checkPmStudio = checkAdapter,
   checkAdapterListeningFn = checkAdapterListening,
   checkRunningAdapterFn = checkRunningAdapter,
   online = false,
@@ -517,6 +526,7 @@ export async function collectDoctorChecks({
   onlineTimeoutMs = 10000,
   compatTimeoutMs = 120000,
   inspectAdapterCompatibilityFn = inspectAdapterCompatibility,
+  inspectPmStudioHealthFn,
 } = {}) {
   const checks = [
     ...inspectAuthProfiles({ home }),
@@ -552,7 +562,43 @@ export async function collectDoctorChecks({
       const listening = await checkAdapterListeningFn({ host, port });
       checks.push(listening
         ? { kind: "warn", message: `A service is listening on ${localGatewayBaseUrl(host, port)}, but it is not a compatible codex-copilot-dx adapter` }
-        : { kind: "warn", message: `Adapter is not listening on ${localGatewayBaseUrl(host, port)}` });
+        : {
+          kind: "warn",
+          message: `Adapter is not listening on ${localGatewayBaseUrl(host, port)}`,
+          fix: "ccdx start",
+        });
+    }
+  }
+
+  if (checkPmStudio && platform === "darwin") {
+    const inspect = inspectPmStudioHealthFn || (async (options) => {
+      const module = await import("./pm-studio-status.mjs");
+      return module.inspectPmStudioStatus(options);
+    });
+    const pm = await inspect({ home });
+    const version = pm.app.metadata ? `${pm.app.metadata.version} build ${pm.app.metadata.build}` : "";
+    if (pm.app.state === "patched") {
+      checks.push({ kind: "ok", message: `PM Studio ${version} patch is verified` });
+      if (!pm.claude.valid) {
+        checks.push({
+          kind: "warn",
+          message: "PM Studio Claude routing requires a valid isolated Claude profile",
+          fix: "ccdx auth login claude --reauth",
+        });
+      }
+      if (!pm.adapter?.ok) {
+        checks.push({ kind: "warn", message: "PM Studio relay is not currently available", fix: "ccdx start" });
+      }
+    } else if (pm.app.state === "clean") {
+      checks.push({
+        kind: "warn",
+        message: `PM Studio ${version} is supported but not patched`,
+        fix: "ccdx pms setup",
+      });
+    } else if (pm.app.state === "unsupported") {
+      checks.push({ kind: "warn", message: `PM Studio ${version} has no exact patch recipe; no files will be changed` });
+    } else if (pm.app.state === "drift" || pm.app.state === "error") {
+      checks.push({ kind: "err", message: `PM Studio integrity check failed: ${pm.app.issues.join("; ")}` });
     }
   }
 
@@ -604,5 +650,12 @@ export async function runDoctor(options = {}) {
   log(`${options.commandName || "ccdx"} doctor${flags.length ? ` ${flags.join(" ")}` : ""}`);
   const checks = await collectDoctorChecks(options);
   for (const check of checks) log(status(check.kind, check.message));
+  const totals = { ok: 0, warn: 0, err: 0 };
+  for (const check of checks) totals[check.kind] = (totals[check.kind] || 0) + 1;
+  log(status(totals.err ? "err" : totals.warn ? "warn" : "ok",
+    `Summary: ${totals.ok} passed, ${totals.warn} warning(s), ${totals.err} error(s)`));
+  for (const fix of new Set(checks.map((check) => check.fix).filter(Boolean))) {
+    log(status("info", `Next step: ${fix}`));
+  }
   return checks;
 }

package/src/http-transport.mjs

@@ -327,7 +327,7 @@ export function isAbortLikeError(err) {
 }
 
 export function abortErrorStatusCode(reason) {
-  if (["upstream_timeout", "stream_handshake_timeout", "stream_idle_timeout"].includes(reason)) return 504;
+  if (["responses_prepare_timeout", "upstream_timeout", "stream_handshake_timeout", "stream_idle_timeout"].includes(reason)) return 504;
   if (reason === "client_aborted" || reason === "client_closed") return 499;
   return 502;
 }

package/src/observability.mjs

@@ -4,6 +4,7 @@ import { copilotRuntimeStatus } from "./copilot.mjs";
 import { imageOptimizationStats } from "./image-optimization.mjs";
 import { responseHistoryStats } from "./response-history.mjs";
 import { loadRuntimeConfig } from "./runtime-config.mjs";
+import { profileRouting } from "./profile-routing.mjs";
 
 export { ADAPTER_STATUS_PATH };
 const OBSERVABILITY_RUNTIME_CONFIG = loadRuntimeConfig();
@@ -153,6 +154,7 @@ export function runtimeStatusPayload({
   metrics,
   streamPerformance,
   admission,
+  imagePressure,
   modelRegistry,
   codexClient,
   claudeClient,
@@ -185,16 +187,14 @@ export function runtimeStatusPayload({
     admission: admission?.diagnostics?.() || admission?.stats?.() || null,
     response_history: responseHistoryStats(),
     image_optimization: imageOptimizationStats(),
+    image_history_pressure: imagePressure?.snapshot?.() || null,
     copilot: codexRuntime,
     models: codexModels,
     profiles: {
       codex: { mode: "legacy", client: codexRuntime, models: codexModels },
       claude: { mode: resolvedClaudeMode, client: claudeRuntime, models: claudeModels },
     },
-    routing: {
-      responses: "codex",
-      messages: resolvedClaudeMode === "isolated" ? "claude" : "codex",
-    },
+    routing: profileRouting({ claudeMode: resolvedClaudeMode }),
     limits: {
       max_body_bytes: OBSERVABILITY_RUNTIME_CONFIG.maxBodyBytes,
       max_decoded_body_bytes: OBSERVABILITY_RUNTIME_CONFIG.maxDecodedBodyBytes,

package/src/pm-studio-relay.mjs

@@ -10,6 +10,7 @@ import {
   writeOrDrain,
 } from "./http-transport.mjs";
 import { isLoopbackAddress } from "./observability.mjs";
+import { createPmStudioModelRouter } from "./profile-routing.mjs";
 import { loadRuntimeConfig, parsePositiveInteger } from "./runtime-config.mjs";
 import { requireUpstreamEventStream } from "./stream-contract.mjs";
 import { safeUpstreamResponseHeaders } from "./upstream-headers.mjs";
@@ -147,48 +148,6 @@ function catalogData(catalog) {
   return Array.isArray(catalog?.data) ? catalog.data : null;
 }
 
-function originalClaudeModels(registry) {
-  return catalogData(registry?.models) || [];
-}
-
-function isClaudeCatalogEntry(model) {
-  const id = String(model?.id || "").trim();
-  const vendor = String(model?.vendor || "").trim().toLowerCase();
-  return Boolean(id) && (vendor === "anthropic" || id.toLowerCase().startsWith("claude-"));
-}
-
-function isAllowedClaudeModel(model) {
-  return isClaudeCatalogEntry(model)
-    && String(model?.vendor || "").trim().toLowerCase() === "anthropic"
-    && model?.model_picker_enabled !== false
-    && Array.isArray(model?.supported_endpoints)
-    && model.supported_endpoints.includes("/chat/completions");
-}
-
-function claudeAvailability(options) {
-  const enabled = options.claudeMode === "isolated"
-    && options.claudeProfile?.valid === true
-    && typeof options.claudeClient?.chatCompletions === "function";
-  const catalog = originalClaudeModels(options.claudeModelRegistry);
-  const allowed = new Map();
-  const known = new Set();
-  for (const model of catalog) {
-    const id = String(model?.id || "").trim();
-    if (!id || !isClaudeCatalogEntry(model)) continue;
-    known.add(id);
-    if (enabled && isAllowedClaudeModel(model) && !allowed.has(id)) allowed.set(id, model);
-  }
-  return { allowed, known };
-}
-
-function classifyModel(modelId, options) {
-  const id = String(modelId || "").trim();
-  const { allowed, known } = claudeAvailability(options);
-  if (allowed.has(id)) return "claude";
-  if (known.has(id) || id.toLowerCase().startsWith("claude-")) return "unsupported_claude";
-  return "enterprise";
-}
-
 async function responseSnapshot(response) {
   return {
     status: response.status,
@@ -218,10 +177,10 @@ function rejectUpstreamRedirect(response) {
   return response;
 }
 
-function mergeModelCatalog(snapshot, options) {
+function mergeModelCatalog(snapshot, modelRouter) {
   if (!snapshot.ok) return null;
-  const { allowed } = claudeAvailability(options);
-  if (!allowed.size) return null;
+  const allowed = modelRouter.allowedModels();
+  if (!allowed.length) return null;
   let enterprise;
   try {
     enterprise = JSON.parse(snapshot.body.toString("utf8"));
@@ -232,7 +191,8 @@ function mergeModelCatalog(snapshot, options) {
   if (!data) return null;
   const seen = new Set(data.map((model) => String(model?.id || "").trim()).filter(Boolean));
   const additions = [];
-  for (const [id, model] of allowed) {
+  for (const model of allowed) {
+    const id = String(model?.id || "").trim();
     if (seen.has(id)) continue;
     seen.add(id);
     additions.push(model);
@@ -332,6 +292,12 @@ export function createPmStudioRelayHandler(options = {}) {
   const validated = new Map();
   const validationFlights = new Map();
   let activeModelRequests = 0;
+  const modelRouter = createPmStudioModelRouter({
+    getCatalog: () => options.claudeModelRegistry?.models,
+    isClaudeEnabled: () => options.claudeMode === "isolated"
+      && options.claudeProfile?.valid === true
+      && typeof options.claudeClient?.chatCompletions === "function",
+  });
 
   function isValidated(fingerprint) {
     const expiresAt = validated.get(fingerprint);
@@ -452,7 +418,7 @@ export function createPmStudioRelayHandler(options = {}) {
       sendSnapshot(res, snapshot);
       return;
     }
-    const merged = mergeModelCatalog(snapshot, options);
+    const merged = mergeModelCatalog(snapshot, modelRouter);
     if (!merged) {
       sendSnapshot(res, snapshot);
       return;
@@ -480,7 +446,7 @@ export function createPmStudioRelayHandler(options = {}) {
       }
       abort.setTimeout(requestTimeoutMs, timeoutReason);
 
-      const modelType = classifyModel(body?.model, options);
+      const modelType = modelRouter.classify(body?.model);
       if (modelType === "unsupported_claude" || (modelType === "claude" && pathname !== "/chat/completions")) {
         throw localError(400, "model_not_supported", "The requested Claude model is not available for this endpoint");
       }