@nyssance/codex-acp-v2 0.5.0 → 0.6.0

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # Changelog
 
+## 0.6.0 — 2026-09-11
+
+### Added
+
+- Several gateways at once in catalog mode: `providers/set` takes `_meta.codex.id`
+  (default `custom-gateway`); each gateway keeps its own base URL, key, config and models,
+  writes its own `model_providers.<id>` entry, and gets its own select group in every
+  session's `model` option. Model ids must be unique across gateways (`-32602` otherwise).
+  `providers/disable` with `_meta.codex.id` removes one gateway; `providers/list` reports
+  `_meta.codex.gateways`. Route mode is unchanged (one gateway).
+- Pass-throughs: `_codex/session_rename` (`thread/name/set`), `_codex/account_read`
+  (`account/read`), `_codex/rate_limits` (`account/rateLimits/read`) and
+  `_codex/fuzzy_file_search` (`fuzzyFileSearch`); notifications
+  `_codex/rate_limits_updated`, `_codex/fuzzy_file_search_updated` and
+  `_codex/fuzzy_file_search_completed` carry Codex's payloads verbatim. Advertised as
+  `capabilities._meta.codex.rename` / `.account` / `.fuzzyFileSearch`.
+
+### Fixed
+
+- A thread moved from one gateway to another no longer keeps the previous gateway's
+  `model_providers` entry (and bearer token) in its config.
+- Re-registering one gateway no longer re-resumes sessions that sit on other gateways.
+
 ## 0.5.0 — 2026-09-11
 
 ### Added

package/dist/index.js

@@ -21721,7 +21721,7 @@ var package_default = {
   publishConfig: {
     access: "public"
   },
-  version: "0.5.0",
+  version: "0.6.0",
   description: "Native ACP v2 agent for the OpenAI Codex app-server",
   packageManager: "bun@1.4.0",
   engines: {
@@ -23982,7 +23982,7 @@ function modelLacksReasoning(model) {
   const options = supportedEfforts(model);
   return options.length > 0 && options.every((option) => option.reasoningEffort === "none");
 }
-function modelConfigOption(catalog, current, gatewayGroup = null) {
+function modelConfigOption(catalog, current, gatewayGroups = []) {
   const visible = catalog.filter((model) => !model.hidden || model.id === current);
   const options = visible.map((model) => ({
     value: model.id,
@@ -24000,16 +24000,18 @@ function modelConfigOption(catalog, current, gatewayGroup = null) {
     type: "select",
     currentValue: current
   };
-  if (gatewayGroup === null)
+  if (gatewayGroups.length === 0)
     return { ...base, options };
-  const gatewayIds = new Set(gatewayGroup.modelIds);
-  const native = options.filter((option) => !gatewayIds.has(option.value));
-  const gateway = options.filter((option) => gatewayIds.has(option.value));
+  const owner = new Map;
+  for (const group of gatewayGroups)
+    for (const id of group.modelIds)
+      owner.set(id, group.id);
+  const native = options.filter((option) => !owner.has(option.value));
   return {
     ...base,
     options: [
       { groupId: "codex", name: "Codex", options: native },
-      { groupId: "custom-gateway", name: gatewayGroup.name, options: gateway }
+      ...gatewayGroups.map((group) => ({ groupId: group.id, name: group.name, options: options.filter((option) => owner.get(option.value) === group.id) }))
     ]
   };
 }
@@ -25966,7 +25968,7 @@ function sessionConfigOptions(session) {
   const model = findModel(session.catalog, session.model.model);
   const options = [
     modeConfigOption(session.mode),
-    modelConfigOption(session.catalog, session.model.model, session.gatewayGroup),
+    modelConfigOption(session.catalog, session.model.model, session.gatewayGroups),
     effortConfigOption(supportedEfforts(model), session.model.effort),
     collaborationModeConfigOption(session.collaborationMode)
   ];
@@ -26074,31 +26076,41 @@ import path6 from "path";
 var OPENAI_PROVIDER_ID = "openai";
 var GATEWAY_MODEL_PROVIDER = "custom-gateway";
 var DEFAULT_OPENAI_BASE_URL = "https://api.openai.com/v1";
+var GATEWAY_ID_PATTERN = /^[a-z0-9-]+$/;
+
 class ProviderRouting {
   baseConfig;
   configuredProvider;
-  gateway = null;
+  gateways = new Map;
   constructor(baseConfig, configuredProvider) {
     this.baseConfig = baseConfig;
     this.configuredProvider = configuredProvider;
   }
   copy() {
     const copy = new ProviderRouting(this.baseConfig, this.configuredProvider);
-    copy.gateway = this.gateway;
+    copy.gateways = new Map(this.gateways);
     return copy;
   }
   get active() {
-    return this.gateway;
+    return this.gateways.values().next().value ?? null;
+  }
+  gateway(id) {
+    return id === null ? null : this.gateways.get(id) ?? null;
+  }
+  hasGateway(id) {
+    return id !== null && this.gateways.has(id);
   }
   list() {
-    const routed = this.gateway !== null && this.gateway.mode === "route";
+    const first = this.active;
+    const routed = first !== null && first.mode === "route";
+    const summary = (gateway) => ({ id: gateway.id, name: gateway.name, baseUrl: gateway.baseUrl, models: gateway.models.map((model) => model.id) });
     return {
       providers: [{
         providerId: OPENAI_PROVIDER_ID,
         supported: ["openai"],
         required: false,
-        current: routed && this.gateway ? { apiType: "openai", baseUrl: this.gateway.baseUrl } : { apiType: "openai", baseUrl: this.nativeBaseUrl() },
-        ...this.gateway && !routed ? { _meta: { codex: { mode: "catalog", gateway: { name: this.gateway.name, baseUrl: this.gateway.baseUrl, models: this.gateway.models.map((model) => model.id) } } } } : {}
+        current: routed && first ? { apiType: "openai", baseUrl: first.baseUrl } : { apiType: "openai", baseUrl: this.nativeBaseUrl() },
+        ...first && !routed ? { _meta: { codex: { mode: "catalog", gateway: summary(first), gateways: [...this.gateways.values()].map(summary) } } } : {}
       }]
     };
   }
@@ -26114,7 +26126,21 @@ class ProviderRouting {
       throw RequestError.invalidParams({ baseUrl: request.baseUrl }, "baseUrl must be an http(s) URL");
     }
     const hints = readHints(request._meta);
-    this.gateway = {
+    if (hints.id === OPENAI_PROVIDER_ID || hints.id === this.configuredProvider) {
+      throw RequestError.invalidParams({ id: hints.id }, `_meta.codex.id "${hints.id}" is Codex's own provider; pick another gateway id`);
+    }
+    if (hints.mode === "route" || this.mode !== hints.mode)
+      this.gateways.clear();
+    for (const other of this.gateways.values()) {
+      if (other.id === hints.id)
+        continue;
+      const duplicate = hints.models.find((model) => other.models.some((candidate) => candidate.id === model.id));
+      if (duplicate) {
+        throw RequestError.invalidParams({ id: hints.id, model: duplicate.id }, `Model "${duplicate.id}" is already served by gateway "${other.id}"; model ids must be unique across gateways`);
+      }
+    }
+    this.gateways.set(hints.id, {
+      id: hints.id,
       baseUrl,
       headers: { ...request.headers ?? {} },
       name: hints.name ?? "Client-configured gateway",
@@ -26124,41 +26150,65 @@ class ProviderRouting {
       config: hints.config,
       mode: hints.mode,
       catalogEntries: hints.catalogEntries
-    };
+    });
   }
   get mode() {
-    return this.gateway?.mode ?? "route";
+    return this.active?.mode ?? "route";
+  }
+  gatewayFor(modelId) {
+    for (const gateway of this.gateways.values()) {
+      if (gateway.models.some((model) => model.id === modelId))
+        return gateway;
+    }
+    return null;
+  }
+  gatewayIdFor(modelId) {
+    return this.gatewayFor(modelId)?.id ?? null;
   }
   isGatewayModel(modelId) {
-    return this.gateway !== null && this.gateway.models.some((model) => model.id === modelId);
+    return this.gatewayFor(modelId) !== null;
   }
-  gatewayGroup() {
-    if (!this.gateway || this.gateway.mode !== "catalog" || this.gateway.models.length === 0)
-      return null;
-    return { name: this.gateway.name, modelIds: this.gateway.models.map((model) => model.id) };
+  gatewayGroups() {
+    if (this.mode !== "catalog")
+      return [];
+    return [...this.gateways.values()].filter((gateway) => gateway.models.length > 0).map((gateway) => ({ id: gateway.id, name: gateway.name, modelIds: gateway.models.map((model) => model.id) }));
   }
   disable(request) {
-    if (request.providerId === OPENAI_PROVIDER_ID)
-      this.gateway = null;
+    if (request.providerId !== OPENAI_PROVIDER_ID)
+      return;
+    const id = readGatewayId(request._meta);
+    if (id === null)
+      this.gateways.clear();
+    else
+      this.gateways.delete(id);
   }
   modelProvider() {
-    return this.gateway && this.gateway.mode === "route" ? GATEWAY_MODEL_PROVIDER : this.configuredProvider;
+    return this.defaultGatewayId() ?? this.configuredProvider;
   }
   routesByDefault() {
-    return this.gateway !== null && this.gateway.mode === "route";
+    return this.defaultGatewayId() !== null;
+  }
+  defaultGatewayId() {
+    const first = this.active;
+    return first !== null && first.mode === "route" ? first.id : null;
   }
-  threadConfig(onGateway = this.routesByDefault()) {
-    if (!this.gateway || !onGateway)
+  threadConfig(gatewayId = this.defaultGatewayId()) {
+    const gateway = this.gateway(gatewayId);
+    if (!gateway)
       return this.baseConfig;
-    return this.applyGateway(this.baseConfig, this.gateway);
+    return this.applyGateway(this.baseConfig, gateway);
   }
-  routeConfig(config2, onGateway) {
-    return this.rebind(config2, this, onGateway);
+  routeConfig(config2, gatewayId) {
+    return this.rebind(config2, this, gatewayId);
   }
   overrideKeys() {
-    return this.gateway ? Object.keys(this.gateway.config) : [];
+    const keys = new Set;
+    for (const gateway of this.gateways.values())
+      for (const key of Object.keys(gateway.config))
+        keys.add(key);
+    return [...keys];
   }
-  rebind(config2, previous, onGateway = this.routesByDefault()) {
+  rebind(config2, previous, gatewayId = this.defaultGatewayId()) {
     const next = { ...config2 };
     for (const key of previous.overrideKeys()) {
       if (key in this.baseConfig)
@@ -26166,13 +26216,11 @@ class ProviderRouting {
       else
         delete next[key];
     }
-    if (!this.gateway || !onGateway) {
-      delete next["model_providers"];
-      if (isRecord2(this.baseConfig["model_providers"]))
-        next["model_providers"] = this.baseConfig["model_providers"];
-      return next;
-    }
-    return this.applyGateway(next, this.gateway);
+    delete next["model_providers"];
+    if (isRecord2(this.baseConfig["model_providers"]))
+      next["model_providers"] = this.baseConfig["model_providers"];
+    const gateway = this.gateway(gatewayId);
+    return gateway ? this.applyGateway(next, gateway) : next;
   }
   applyGateway(config2, gateway) {
     const existing = isRecord2(config2["model_providers"]) ? config2["model_providers"] : {};
@@ -26187,15 +26235,24 @@ class ProviderRouting {
     return {
       ...config2,
       ...gateway.config,
-      model_providers: { ...existing, [GATEWAY_MODEL_PROVIDER]: entry }
+      model_providers: { ...existing, [gateway.id]: entry }
     };
   }
   catalog(codexCatalog) {
-    if (!this.gateway || this.gateway.models.length === 0)
+    const first = this.active;
+    if (first === null)
       return codexCatalog;
-    const gateway = this.gateway;
-    const own = gateway.models.map((model, index) => gatewayModel(model, gateway.mode === "route" && index === 0, codexCatalog[0], gateway.catalogEntries.get(model.id)));
-    return gateway.mode === "catalog" ? [...codexCatalog, ...own] : own;
+    if (first.mode === "route") {
+      if (first.models.length === 0)
+        return codexCatalog;
+      return first.models.map((model, index) => gatewayModel(model, index === 0, codexCatalog[0], first.catalogEntries.get(model.id)));
+    }
+    const own = [];
+    for (const gateway of this.gateways.values()) {
+      for (const model of gateway.models)
+        own.push(gatewayModel(model, false, codexCatalog[0], gateway.catalogEntries.get(model.id)));
+    }
+    return [...codexCatalog, ...own];
   }
   nativeBaseUrl() {
     const providers = this.baseConfig["model_providers"];
@@ -26212,6 +26269,7 @@ function readHints(meta) {
   const root = isRecord2(meta) ? meta : {};
   const alwith = isRecord2(root["alwith"]) ? root["alwith"] : {};
   const codex = isRecord2(root["codex"]) ? root["codex"] : {};
+  const id = readGatewayId(meta) ?? GATEWAY_MODEL_PROVIDER;
   const models = [];
   if (Array.isArray(alwith["models"])) {
     for (const entry of alwith["models"]) {
@@ -26249,7 +26307,18 @@ function readHints(meta) {
   }
   const catalogPath = config2["model_catalog_json"];
   const catalogEntries = typeof catalogPath === "string" ? readCatalogFile(catalogPath) : new Map;
-  return { models, model, name, bearerToken, config: config2, mode, catalogEntries };
+  return { id, models, model, name, bearerToken, config: config2, mode, catalogEntries };
+}
+function readGatewayId(meta) {
+  const root = isRecord2(meta) ? meta : {};
+  const codex = isRecord2(root["codex"]) ? root["codex"] : {};
+  const raw = codex["id"];
+  if (raw === undefined)
+    return null;
+  if (typeof raw !== "string" || !GATEWAY_ID_PATTERN.test(raw)) {
+    throw RequestError.invalidParams({ id: raw }, "_meta.codex.id must match [a-z0-9-]+");
+  }
+  return raw;
 }
 function readCatalogFile(catalogPath) {
   const resolved = catalogPath.startsWith("~/") ? path6.join(os2.homedir(), catalogPath.slice(2)) : catalogPath;
@@ -26406,6 +26475,12 @@ class CodexAgent {
       }
       if (notification.method === "account/updated")
         this.refreshAccounts().catch((error40) => logger.error("refreshing account failed", error40));
+      if (notification.method === "account/rateLimits/updated")
+        this.forward("_codex/rate_limits_updated", notification.params);
+      if (notification.method === "fuzzyFileSearch/sessionUpdated")
+        this.forward("_codex/fuzzy_file_search_updated", notification.params);
+      if (notification.method === "fuzzyFileSearch/sessionCompleted")
+        this.forward("_codex/fuzzy_file_search_completed", notification.params);
     });
     this.codex.disconnectSignal.addEventListener("abort", stopObserving, { once: true });
   }
@@ -26442,7 +26517,7 @@ class CodexAgent {
           additionalDirectories: {}
         },
         providers: {},
-        _meta: { codex: { archive: true, seedHistory: true, skills: true, plugins: true, providerCatalog: true } }
+        _meta: { codex: { archive: true, seedHistory: true, skills: true, plugins: true, providerCatalog: true, rename: true, account: true, fuzzyFileSearch: true } }
       },
       authMethods: authMethods(this.capabilities, this.env)
     };
@@ -26529,8 +26604,14 @@ class CodexAgent {
         const catalog = await this.withCodex(() => this.codex.allModels(true));
         const nativeProvider = await this.resolveModelProvider(candidate);
         const wholesale = this.providers.active !== null && this.providers.mode === "route" || candidate.active !== null && candidate.mode === "route";
-        const moving = [...this.sessions.values()].filter((runtime) => wholesale || runtime.modelProvider === GATEWAY_MODEL_PROVIDER);
-        const targets = new Map(moving.map((runtime) => [runtime, candidate.active !== null && (candidate.mode === "route" || runtime.modelProvider === GATEWAY_MODEL_PROVIDER)]));
+        const moving = [...this.sessions.values()].filter((runtime) => wholesale || this.providers.hasGateway(runtime.modelProvider) && candidate.gateway(runtime.modelProvider) !== this.providers.gateway(runtime.modelProvider));
+        const targets = new Map(moving.map((runtime) => {
+          if (candidate.active === null)
+            return [runtime, null];
+          if (candidate.mode === "route")
+            return [runtime, candidate.defaultGatewayId()];
+          return [runtime, candidate.hasGateway(runtime.modelProvider) ? runtime.modelProvider : null];
+        }));
         for (const runtime of moving) {
           try {
             await this.codex.threadTurnsList({ threadId: runtime.session.id, limit: 1, itemsView: "notLoaded" });
@@ -26543,10 +26624,10 @@ class CodexAgent {
         }
         const nextCatalog = candidate.catalog(catalog);
         for (const runtime of moving) {
-          const onGateway = targets.get(runtime) === true;
-          const config2 = candidate.rebind(runtime.config, this.providers, onGateway);
-          const modelProvider = onGateway ? GATEWAY_MODEL_PROVIDER : nativeProvider;
-          const keep = findModel(nextCatalog, runtime.session.model.model) && candidate.isGatewayModel(runtime.session.model.model) === onGateway;
+          const target = targets.get(runtime) ?? null;
+          const config2 = candidate.rebind(runtime.config, this.providers, target);
+          const modelProvider = target ?? nativeProvider;
+          const keep = findModel(nextCatalog, runtime.session.model.model) && candidate.gatewayIdFor(runtime.session.model.model) === target;
           const requestedModel = candidate.mode === "route" ? candidate.active?.model ?? (keep ? runtime.session.model.model : null) : keep ? runtime.session.model.model : null;
           const selection = resolveModelSelection(nextCatalog, requestedModel, requestedModel === runtime.session.model.model ? runtime.session.model.effort : null);
           attempted.push(runtime);
@@ -26566,12 +26647,12 @@ class CodexAgent {
           const next = staged.get(runtime);
           if (next) {
             runtime.config = next.config;
-            runtime.modelProvider = targets.get(runtime) === true ? GATEWAY_MODEL_PROVIDER : nativeProvider;
+            runtime.modelProvider = targets.get(runtime) ?? nativeProvider;
             runtime.session.model = next.model;
             runtime.stale = false;
           }
           runtime.session.catalog = nextCatalog;
-          runtime.session.gatewayGroup = candidate.gatewayGroup();
+          runtime.session.gatewayGroups = candidate.gatewayGroups();
           if (!next)
             runtime.session.model = resolveModelSelection(nextCatalog, findModel(nextCatalog, runtime.session.model.model) ? runtime.session.model.model : null, runtime.session.model.effort);
           runtime.client.update({ sessionUpdate: "config_option_update", configOptions: sessionConfigOptions(runtime.session), _meta: { codex: { routing: { stale: false } } } }).catch((error40) => logger.error("Provider config notification failed", error40));
@@ -26663,25 +26744,26 @@ class CodexAgent {
     }
     const mcpServers = request.mcpServers ?? [];
     const requestedModel = requestedModelOf(request._meta);
-    let onGateway = this.providers.routesByDefault();
+    let gatewayId = this.providers.defaultGatewayId();
     if (this.providers.active !== null && this.providers.mode === "catalog") {
       if (requestedModel !== null)
-        onGateway = this.providers.isGatewayModel(requestedModel);
+        gatewayId = this.providers.gatewayIdFor(requestedModel);
       else if (open2.kind === "resume") {
         const known = await this.withCodex(() => this.codex.threadRead({ threadId: open2.request.sessionId, includeTurns: false }));
-        onGateway = known.thread.modelProvider === GATEWAY_MODEL_PROVIDER;
+        gatewayId = this.providers.hasGateway(known.thread.modelProvider) ? known.thread.modelProvider : null;
       }
     }
+    const onGateway = gatewayId !== null;
     let accountVersion = this.accountGeneration;
     const account = await this.withCodex(() => this.codex.accountRead({ refreshToken: false }));
     if (!onGateway && account.requiresOpenaiAuth && account.account === null) {
       throw RequestError.authRequired(undefined, "Log in to Codex first (auth/login)");
     }
     const existingMcp = mcpServers.length > 0 ? await this.withCodex(() => this.configuredMcpServerNames(request.cwd)) : new Set;
-    const config2 = buildThreadConfig(this.providers.threadConfig(onGateway), request.cwd, additionalDirectories, mcpServers, existingMcp);
+    const config2 = buildThreadConfig(this.providers.threadConfig(gatewayId), request.cwd, additionalDirectories, mcpServers, existingMcp);
     const mcpStartupGeneration = this.codex.mcpStartupGeneration;
-    const modelProvider = onGateway ? GATEWAY_MODEL_PROVIDER : await this.withCodex(() => this.resolveModelProvider());
-    const startModel = onGateway ? requestedModel ?? this.providers.active?.model ?? null : requestedModel;
+    const modelProvider = gatewayId ?? await this.withCodex(() => this.resolveModelProvider());
+    const startModel = onGateway ? requestedModel ?? this.providers.gateway(gatewayId)?.model ?? null : requestedModel;
     let readOnly = false;
     const { thread, skills } = await this.withSkillsContext(request.cwd, additionalDirectories, async (skills2) => ({ skills: skills2, thread: await this.withCodex(async () => {
       if (signal?.aborted)
@@ -26735,7 +26817,7 @@ class CodexAgent {
         additionalDirectories,
         mcpServerNames: mcpServerNames(mcpServers).filter((name) => !existingMcp.has(name)),
         catalog,
-        gatewayGroup: this.providers.gatewayGroup(),
+        gatewayGroups: this.providers.gatewayGroups(),
         model,
         mode: initialAgentMode(this.env),
         collaborationMode: DEFAULT_COLLABORATION_MODE,
@@ -26748,7 +26830,7 @@ class CodexAgent {
         contextWindow: null,
         closed: false
       };
-      const runtime = this.installRuntime(session, capabilities, config2, onGateway ? GATEWAY_MODEL_PROVIDER : thread.modelProvider, readOnly);
+      const runtime = this.installRuntime(session, capabilities, config2, gatewayId ?? thread.modelProvider, readOnly);
       const cancelOpening = () => {
         runtime.session.closed = true;
         runtime.lifetime.abort();
@@ -27046,6 +27128,27 @@ class CodexAgent {
   notifySkillsChanged() {
     this.link.notify("_codex/skills_changed", {}).catch((error40) => logger.error("skills change notification failed", error40));
   }
+  forward(method, params) {
+    this.link.notify(method, params).catch((error40) => logger.error(`${method} notification failed`, error40));
+  }
+  async sessionRename(params) {
+    this.requireInitialized("_codex/session_rename");
+    await this.withCodex(() => this.codex.threadSetName({ threadId: params.sessionId, name: params.name }));
+    return {};
+  }
+  async accountRead() {
+    this.requireInitialized("_codex/account_read");
+    return await this.withCodex(() => this.codex.accountRead({ refreshToken: false }));
+  }
+  async rateLimits() {
+    this.requireInitialized("_codex/rate_limits");
+    return await this.withCodex(() => this.codex.accountRateLimitsRead());
+  }
+  async fuzzyFileSearch(params) {
+    this.requireInitialized("_codex/fuzzy_file_search");
+    const request = { query: params.query, roots: params.roots, cancellationToken: params.cancellationToken };
+    return await this.withCodex(() => this.codex.fuzzyFileSearch(request));
+  }
   async closeRuntime(sessionId) {
     const deadline = performance.now() + this.closeGraceMs;
     const runtime = this.sessions.get(sessionId);
@@ -27103,16 +27206,17 @@ class CodexAgent {
     const runtime = this.runtime(params.sessionId, "session/set_config_option");
     assertWritable(runtime);
     if (params.configId === MODEL_CONFIG_ID && this.providers.mode === "catalog" && typeof params.value === "string") {
-      const toGateway = this.providers.isGatewayModel(params.value);
-      if (toGateway !== (runtime.modelProvider === GATEWAY_MODEL_PROVIDER))
-        await this.rerouteSession(runtime, toGateway, params.value);
+      const target = this.providers.gatewayIdFor(params.value);
+      const current = this.providers.hasGateway(runtime.modelProvider) ? runtime.modelProvider : null;
+      if (target !== current)
+        await this.rerouteSession(runtime, target, params.value);
     }
     await this.withCodex(() => applyConfigOption(runtime.session, this.codex, params));
     const configOptions = sessionConfigOptions(runtime.session);
     await runtime.client.update({ sessionUpdate: "config_option_update", configOptions });
     return { configOptions };
   }
-  async rerouteSession(runtime, toGateway, modelId) {
+  async rerouteSession(runtime, gatewayId, modelId) {
     const { session } = runtime;
     this.assertRoutingAvailable();
     if (session.activeTurn !== null) {
@@ -27123,8 +27227,8 @@ class CodexAgent {
     } catch {
       await this.withCodex(() => this.codex.threadInjectItems({ threadId: session.id, items: [providerChangeNote()] }));
     }
-    const config2 = this.providers.routeConfig(runtime.config, toGateway);
-    const modelProvider = toGateway ? GATEWAY_MODEL_PROVIDER : await this.withCodex(() => this.resolveModelProvider());
+    const config2 = this.providers.routeConfig(runtime.config, gatewayId);
+    const modelProvider = gatewayId ?? await this.withCodex(() => this.resolveModelProvider());
     await this.codex.threadUnsubscribe({ threadId: session.id });
     try {
       await this.withCodex(() => this.codex.threadResume({ threadId: session.id, cwd: session.cwd, config: config2, modelProvider, model: modelId, excludeTurns: true }));
@@ -27135,7 +27239,7 @@ class CodexAgent {
         runtime.stale = true;
         logger.error("Provider rollback failed", rollbackError, { sessionId: session.id });
       }
-      throw RequestError.internalError({ sessionId: session.id, stale: runtime.stale }, `Could not move the session to ${toGateway ? "the gateway" : "Codex's provider"}: ${errorMessage(error40)}`);
+      throw RequestError.internalError({ sessionId: session.id, stale: runtime.stale }, `Could not move the session to ${gatewayId !== null ? `gateway "${gatewayId}"` : "Codex's provider"}: ${errorMessage(error40)}`);
     }
     runtime.config = config2;
     runtime.modelProvider = modelProvider;
@@ -27592,6 +27696,28 @@ function interruptedTurn(threadId) {
     turn: { id: "", items: [], itemsView: "notLoaded", status: "interrupted", error: null, startedAt: null, completedAt: null, durationMs: null }
   };
 }
+function parseSessionRenameParams(raw) {
+  const params = objectParams()(raw);
+  if (typeof params.sessionId !== "string" || params.sessionId.length === 0) {
+    throw RequestError.invalidParams({ sessionId: params.sessionId }, "sessionId must be a non-empty string");
+  }
+  if (typeof params.name !== "string")
+    throw RequestError.invalidParams({ name: params.name }, "name must be a string");
+  return { sessionId: params.sessionId, name: params.name };
+}
+function parseFuzzyFileSearchParams(raw) {
+  const params = objectParams()(raw);
+  if (typeof params.query !== "string")
+    throw RequestError.invalidParams({ query: params.query }, "query must be a string");
+  if (!Array.isArray(params.roots) || !params.roots.every((root) => typeof root === "string")) {
+    throw RequestError.invalidParams({ roots: params.roots }, "roots must be an array of directory paths");
+  }
+  const token = params.cancellationToken;
+  if (token !== undefined && token !== null && typeof token !== "string") {
+    throw RequestError.invalidParams({ cancellationToken: token }, "cancellationToken must be a string when given");
+  }
+  return { query: params.query, roots: params.roots, cancellationToken: typeof token === "string" ? token : null };
+}
 function objectParams() {
   return (raw) => {
     if (raw === undefined || raw === null)
@@ -27687,7 +27813,7 @@ function createAgentApp(options) {
   };
   return agent({ name: options.info.name }).onConnect((connection) => {
     agent2 = new CodexAgent(connection.client, options);
-  }).onRequest(methods.agent.initialize, (ctx) => current().initialize(ctx.params)).onRequest(methods.agent.auth.login, (ctx) => current().login(ctx.params, ctx.requestId)).onRequest(methods.agent.auth.logout, (ctx) => current().logout(ctx.params)).onRequest(methods.agent.providers.list, (ctx) => current().listProviders(ctx.params)).onRequest(methods.agent.providers.set, (ctx) => current().setProvider(ctx.params)).onRequest(methods.agent.providers.disable, (ctx) => current().disableProvider(ctx.params)).onRequest(methods.agent.session.new, (ctx) => current().newSession(ctx.params, ctx.signal)).onRequest(methods.agent.session.resume, (ctx) => current().resumeSession(ctx.params, ctx.signal)).onRequest(methods.agent.session.fork, (ctx) => current().forkSession(ctx.params, ctx.signal)).onRequest(methods.agent.session.list, (ctx) => current().listSessions(ctx.params)).onRequest(methods.agent.session.close, (ctx) => current().closeSession(ctx.params)).onRequest(methods.agent.session.delete, (ctx) => current().deleteSession(ctx.params)).onRequest("_codex/session_archive", { parse: parseSessionIdParams }, (ctx) => current().archiveSession(ctx.params)).onRequest("_codex/session_unarchive", { parse: parseSessionIdParams }, (ctx) => current().unarchiveSession(ctx.params)).onRequest("_codex/skills_list", { parse: objectParams() }, (ctx) => current().skillsList(ctx.params)).onRequest("_codex/skills_config_write", { parse: objectParams() }, (ctx) => current().skillsConfigWrite(ctx.params)).onRequest("_codex/plugin_list", { parse: objectParams() }, (ctx) => current().pluginList(ctx.params)).onRequest("_codex/plugin_installed", { parse: objectParams() }, (ctx) => current().pluginInstalled(ctx.params)).onRequest("_codex/plugin_install", { parse: objectParams() }, (ctx) => current().pluginInstall(ctx.params)).onRequest("_codex/plugin_uninstall", { parse: objectParams() }, (ctx) => current().pluginUninstall(ctx.params)).onRequest("_codex/plugin_read", { parse: objectParams() }, (ctx) => current().pluginRead(ctx.params)).onRequest("_codex/marketplace_add", { parse: objectParams() }, (ctx) => current().marketplaceAdd(ctx.params)).onRequest("_codex/marketplace_remove", { parse: objectParams() }, (ctx) => current().marketplaceRemove(ctx.params)).onRequest("_codex/marketplace_upgrade", { parse: objectParams() }, (ctx) => current().marketplaceUpgrade(ctx.params)).onRequest(methods.agent.session.setConfigOption, (ctx) => current().setSessionConfigOption(ctx.params)).onRequest(methods.agent.session.prompt, (ctx) => current().prompt(ctx.params)).onNotification(methods.agent.session.cancel, (ctx) => current().cancel(ctx.params));
+  }).onRequest(methods.agent.initialize, (ctx) => current().initialize(ctx.params)).onRequest(methods.agent.auth.login, (ctx) => current().login(ctx.params, ctx.requestId)).onRequest(methods.agent.auth.logout, (ctx) => current().logout(ctx.params)).onRequest(methods.agent.providers.list, (ctx) => current().listProviders(ctx.params)).onRequest(methods.agent.providers.set, (ctx) => current().setProvider(ctx.params)).onRequest(methods.agent.providers.disable, (ctx) => current().disableProvider(ctx.params)).onRequest(methods.agent.session.new, (ctx) => current().newSession(ctx.params, ctx.signal)).onRequest(methods.agent.session.resume, (ctx) => current().resumeSession(ctx.params, ctx.signal)).onRequest(methods.agent.session.fork, (ctx) => current().forkSession(ctx.params, ctx.signal)).onRequest(methods.agent.session.list, (ctx) => current().listSessions(ctx.params)).onRequest(methods.agent.session.close, (ctx) => current().closeSession(ctx.params)).onRequest(methods.agent.session.delete, (ctx) => current().deleteSession(ctx.params)).onRequest("_codex/session_archive", { parse: parseSessionIdParams }, (ctx) => current().archiveSession(ctx.params)).onRequest("_codex/session_unarchive", { parse: parseSessionIdParams }, (ctx) => current().unarchiveSession(ctx.params)).onRequest("_codex/skills_list", { parse: objectParams() }, (ctx) => current().skillsList(ctx.params)).onRequest("_codex/skills_config_write", { parse: objectParams() }, (ctx) => current().skillsConfigWrite(ctx.params)).onRequest("_codex/plugin_list", { parse: objectParams() }, (ctx) => current().pluginList(ctx.params)).onRequest("_codex/plugin_installed", { parse: objectParams() }, (ctx) => current().pluginInstalled(ctx.params)).onRequest("_codex/plugin_install", { parse: objectParams() }, (ctx) => current().pluginInstall(ctx.params)).onRequest("_codex/plugin_uninstall", { parse: objectParams() }, (ctx) => current().pluginUninstall(ctx.params)).onRequest("_codex/plugin_read", { parse: objectParams() }, (ctx) => current().pluginRead(ctx.params)).onRequest("_codex/marketplace_add", { parse: objectParams() }, (ctx) => current().marketplaceAdd(ctx.params)).onRequest("_codex/marketplace_remove", { parse: objectParams() }, (ctx) => current().marketplaceRemove(ctx.params)).onRequest("_codex/marketplace_upgrade", { parse: objectParams() }, (ctx) => current().marketplaceUpgrade(ctx.params)).onRequest("_codex/session_rename", { parse: parseSessionRenameParams }, (ctx) => current().sessionRename(ctx.params)).onRequest("_codex/account_read", { parse: objectParams() }, () => current().accountRead()).onRequest("_codex/rate_limits", { parse: objectParams() }, () => current().rateLimits()).onRequest("_codex/fuzzy_file_search", { parse: parseFuzzyFileSearchParams }, (ctx) => current().fuzzyFileSearch(ctx.params)).onRequest(methods.agent.session.setConfigOption, (ctx) => current().setSessionConfigOption(ctx.params)).onRequest(methods.agent.session.prompt, (ctx) => current().prompt(ctx.params)).onNotification(methods.agent.session.cancel, (ctx) => current().cancel(ctx.params));
 }
 
 // src/codex/AppServerClient.ts
@@ -28100,6 +28226,15 @@ class AppServerClient {
   accountRead(params) {
     return this.send({ method: "account/read", params });
   }
+  accountRateLimitsRead() {
+    return this.send({ method: "account/rateLimits/read", params: undefined });
+  }
+  threadSetName(params) {
+    return this.send({ method: "thread/name/set", params });
+  }
+  fuzzyFileSearch(params) {
+    return this.send({ method: "fuzzyFileSearch", params });
+  }
   accountLogin(params) {
     return this.send({ method: "account/login/start", params });
   }

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "Native ACP v2 agent for the OpenAI Codex app-server",
   "packageManager": "bun@1.4.0",
   "engines": {