feat: adapter model discovery, reasoning effort, and improved codex formatting

Add dynamic OpenAI model list fetching for codex adapter with caching,
async listModels interface, reasoning effort support for both claude and
codex adapters, optional timeouts (default to unlimited), wakeCommentId
context propagation, and richer codex stdout event parsing/formatting.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

server/src/adapters/codex-models.ts

@@ -0,0 +1,104 @@
+import type { AdapterModel } from "./types.js";
+import { models as codexFallbackModels } from "@paperclip/adapter-codex-local";
+import { readConfigFile } from "../config-file.js";
+
+const OPENAI_MODELS_ENDPOINT = "https://api.openai.com/v1/models";
+const OPENAI_MODELS_TIMEOUT_MS = 5000;
+const OPENAI_MODELS_CACHE_TTL_MS = 60_000;
+
+let cached: { keyFingerprint: string; expiresAt: number; models: AdapterModel[] } | null = null;
+
+function fingerprint(apiKey: string): string {
+  return `${apiKey.length}:${apiKey.slice(-6)}`;
+}
+
+function dedupeModels(models: AdapterModel[]): AdapterModel[] {
+  const seen = new Set<string>();
+  const deduped: AdapterModel[] = [];
+  for (const model of models) {
+    const id = model.id.trim();
+    if (!id || seen.has(id)) continue;
+    seen.add(id);
+    deduped.push({ id, label: model.label.trim() || id });
+  }
+  return deduped;
+}
+
+function mergedWithFallback(models: AdapterModel[]): AdapterModel[] {
+  return dedupeModels([
+    ...models,
+    ...codexFallbackModels,
+  ]).sort((a, b) => a.id.localeCompare(b.id, "en", { numeric: true, sensitivity: "base" }));
+}
+
+function resolveOpenAiApiKey(): string | null {
+  const envKey = process.env.OPENAI_API_KEY?.trim();
+  if (envKey) return envKey;
+
+  const config = readConfigFile();
+  if (config?.llm?.provider !== "openai") return null;
+  const configKey = config.llm.apiKey?.trim();
+  return configKey && configKey.length > 0 ? configKey : null;
+}
+
+async function fetchOpenAiModels(apiKey: string): Promise<AdapterModel[]> {
+  const controller = new AbortController();
+  const timeout = setTimeout(() => controller.abort(), OPENAI_MODELS_TIMEOUT_MS);
+  try {
+    const response = await fetch(OPENAI_MODELS_ENDPOINT, {
+      headers: {
+        Authorization: `Bearer ${apiKey}`,
+      },
+      signal: controller.signal,
+    });
+    if (!response.ok) return [];
+
+    const payload = (await response.json()) as { data?: unknown };
+    const data = Array.isArray(payload.data) ? payload.data : [];
+    const models: AdapterModel[] = [];
+    for (const item of data) {
+      if (typeof item !== "object" || item === null) continue;
+      const id = (item as { id?: unknown }).id;
+      if (typeof id !== "string" || id.trim().length === 0) continue;
+      models.push({ id, label: id });
+    }
+    return dedupeModels(models);
+  } catch {
+    return [];
+  } finally {
+    clearTimeout(timeout);
+  }
+}
+
+export async function listCodexModels(): Promise<AdapterModel[]> {
+  const apiKey = resolveOpenAiApiKey();
+  const fallback = dedupeModels(codexFallbackModels);
+  if (!apiKey) return fallback;
+
+  const now = Date.now();
+  const keyFingerprint = fingerprint(apiKey);
+  if (cached && cached.keyFingerprint === keyFingerprint && cached.expiresAt > now) {
+    return cached.models;
+  }
+
+  const fetched = await fetchOpenAiModels(apiKey);
+  if (fetched.length > 0) {
+    const merged = mergedWithFallback(fetched);
+    cached = {
+      keyFingerprint,
+      expiresAt: now + OPENAI_MODELS_CACHE_TTL_MS,
+      models: merged,
+    };
+    return merged;
+  }
+
+  if (cached && cached.keyFingerprint === keyFingerprint && cached.models.length > 0) {
+    return cached.models;
+  }
+
+  return fallback;
+}
+
+export function resetCodexModelsCacheForTests() {
+  cached = null;
+}

server/src/adapters/http/execute.ts

@@ -7,13 +7,13 @@ export async function execute(ctx: AdapterExecutionContext): Promise<AdapterExec
   if (!url) throw new Error("HTTP adapter missing url");
 
   const method = asString(config.method, "POST");
-  const timeoutMs = asNumber(config.timeoutMs, 15000);
+  const timeoutMs = asNumber(config.timeoutMs, 0);
   const headers = parseObject(config.headers) as Record<string, string>;
   const payloadTemplate = parseObject(config.payloadTemplate);
   const body = { ...payloadTemplate, agentId: agent.id, runId, context };
 
   const controller = new AbortController();
-  const timer = setTimeout(() => controller.abort(), timeoutMs);
+  const timer = timeoutMs > 0 ? setTimeout(() => controller.abort(), timeoutMs) : null;
 
   try {
     const res = await fetch(url, {
@@ -23,7 +23,7 @@ export async function execute(ctx: AdapterExecutionContext): Promise<AdapterExec
         ...headers,
       },
       body: JSON.stringify(body),
-      signal: controller.signal,
+      ...(timer ? { signal: controller.signal } : {}),
     });
 
     if (!res.ok) {
@@ -37,6 +37,6 @@ export async function execute(ctx: AdapterExecutionContext): Promise<AdapterExec
       summary: `HTTP ${method} ${url}`,
     };
   } finally {
-    clearTimeout(timer);
+    if (timer) clearTimeout(timer);
   }
 }

server/src/adapters/process/execute.ts

@@ -22,7 +22,7 @@ export async function execute(ctx: AdapterExecutionContext): Promise<AdapterExec
     if (typeof v === "string") env[k] = v;
   }
 
-  const timeoutSec = asNumber(config.timeoutSec, 900);
+  const timeoutSec = asNumber(config.timeoutSec, 0);
   const graceSec = asNumber(config.graceSec, 15);
 
   if (onMeta) {

server/src/adapters/registry.ts

@@ -3,6 +3,7 @@ import { execute as claudeExecute, sessionCodec as claudeSessionCodec } from "@p
 import { agentConfigurationDoc as claudeAgentConfigurationDoc, models as claudeModels } from "@paperclip/adapter-claude-local";
 import { execute as codexExecute, sessionCodec as codexSessionCodec } from "@paperclip/adapter-codex-local/server";
 import { agentConfigurationDoc as codexAgentConfigurationDoc, models as codexModels } from "@paperclip/adapter-codex-local";
+import { listCodexModels } from "./codex-models.js";
 import { processAdapter } from "./process/index.js";
 import { httpAdapter } from "./http/index.js";
 
@@ -20,6 +21,7 @@ const codexLocalAdapter: ServerAdapterModule = {
   execute: codexExecute,
   sessionCodec: codexSessionCodec,
   models: codexModels,
+  listModels: listCodexModels,
   supportsLocalAgentJwt: true,
   agentConfigurationDoc: codexAgentConfigurationDoc,
 };
@@ -37,8 +39,14 @@ export function getServerAdapter(type: string): ServerAdapterModule {
   return adapter;
 }
 
-export function listAdapterModels(type: string): { id: string; label: string }[] {
-  return adaptersByType.get(type)?.models ?? [];
+export async function listAdapterModels(type: string): Promise<{ id: string; label: string }[]> {
+  const adapter = adaptersByType.get(type);
+  if (!adapter) return [];
+  if (adapter.listModels) {
+    const discovered = await adapter.listModels();
+    if (discovered.length > 0) return discovered;
+  }
+  return adapter.models ?? [];
 }
 
 export function listServerAdapters(): ServerAdapterModule[] {

server/src/adapters/types.ts

@@ -9,5 +9,6 @@ export type {
   AdapterInvocationMeta,
   AdapterExecutionContext,
   AdapterSessionCodec,
+  AdapterModel,
   ServerAdapterModule,
 } from "@paperclip/adapter-utils";