@nextclaw/nextclaw-ncp-runtime-plugin-codex-sdk 0.1.23 → 0.1.25

package/dist/index.d.ts

@@ -1,4 +1,3 @@
-import { Config } from '@nextclaw/core';
 import { NcpAgentRuntime } from '@nextclaw/ncp';
 import { RuntimeFactoryParams } from '@nextclaw/ncp-toolkit';
 
@@ -15,9 +14,45 @@ type SessionTypeDescriptor = {
     } | null;
 };
 
+type ResolvedProviderSpec = {
+    isGateway?: boolean;
+    isLocal?: boolean;
+    supportsResponsesApi?: boolean;
+};
+type ResolvedProviderConfig = {
+    wireApi?: string | null;
+    extraHeaders?: Record<string, string> | null;
+};
+type ResolvedProviderRuntime = {
+    resolvedModel: string;
+    providerLocalModel: string;
+    provider: ResolvedProviderConfig | null;
+    providerName: string | null;
+    providerDisplayName: string | null;
+    providerSpec: ResolvedProviderSpec | null;
+    apiKey: string | null;
+    apiBase: string | null;
+};
+type AgentRuntimeApi = {
+    defaults: {
+        workspace?: string;
+        model?: string;
+    };
+    resolveWorkspacePath: (workspace?: string) => string;
+    resolveProviderRuntime: (model?: string) => ResolvedProviderRuntime;
+    buildRuntimeUserPrompt: (params: {
+        workspace?: string;
+        sessionKey?: string;
+        metadata?: Record<string, unknown>;
+        userMessage: string;
+    }) => string;
+};
 type PluginApi = {
-    config: Config;
+    config?: Record<string, unknown>;
     pluginConfig?: Record<string, unknown>;
+    runtime: {
+        agent: AgentRuntimeApi;
+    };
     registerNcpAgentRuntime: (registration: {
         kind: string;
         label?: string;

package/dist/index.js

@@ -1,10 +1,4 @@
 // src/index.ts
-import {
-  findProviderByModel,
-  findProviderByName,
-  resolveProviderRuntime,
-  getWorkspacePath
-} from "@nextclaw/core";
 import {
   CodexSdkNcpAgentRuntime
 } from "@nextclaw/nextclaw-ncp-runtime-codex-sdk";
@@ -97,24 +91,6 @@ function resolveCodexAccessMode(pluginConfig) {
 }
 
 // src/codex-input-builder.ts
-import {
-  buildRequestedSkillsUserPrompt,
-  SkillsLoader
-} from "@nextclaw/core";
-function readString(value) {
-  if (typeof value !== "string") {
-    return void 0;
-  }
-  const trimmed = value.trim();
-  return trimmed || void 0;
-}
-function readRequestedSkills(metadata) {
-  const raw = metadata.requested_skills ?? metadata.requestedSkills;
-  if (!Array.isArray(raw)) {
-    return [];
-  }
-  return raw.map((entry) => readString(entry)).filter((entry) => Boolean(entry)).slice(0, 8);
-}
 function readUserText(input) {
   for (let index = input.messages.length - 1; index >= 0; index -= 1) {
     const message = input.messages[index];
@@ -128,13 +104,16 @@ function readUserText(input) {
   }
   return "";
 }
-function buildCodexInputBuilder(workspace) {
-  const skillsLoader = new SkillsLoader(workspace);
+function buildCodexInputBuilder(runtimeAgent, workspace) {
   return async (input) => {
     const userText = readUserText(input);
     const metadata = input.metadata && typeof input.metadata === "object" && !Array.isArray(input.metadata) ? input.metadata : {};
-    const requestedSkills = readRequestedSkills(metadata);
-    return buildRequestedSkillsUserPrompt(skillsLoader, requestedSkills, userText);
+    return runtimeAgent.buildRuntimeUserPrompt({
+      workspace,
+      sessionKey: input.sessionId,
+      metadata,
+      userMessage: userText
+    });
   };
 }
 
@@ -143,7 +122,7 @@ import { randomUUID } from "crypto";
 import { createServer } from "http";
 
 // src/codex-openai-responses-bridge-shared.ts
-function readString2(value) {
+function readString(value) {
   if (typeof value !== "string") {
     return void 0;
   }
@@ -201,7 +180,7 @@ function stripModelPrefix(model, prefixes) {
 }
 function resolveUpstreamModel(requestedModel, config) {
   const prefixes = (config.modelPrefixes ?? []).filter((value) => value.trim().length > 0);
-  const model = stripModelPrefix(readString2(requestedModel) ?? "", prefixes) || stripModelPrefix(config.defaultModel ?? "", prefixes);
+  const model = stripModelPrefix(readString(requestedModel) ?? "", prefixes) || stripModelPrefix(config.defaultModel ?? "", prefixes);
   if (!model) {
     throw new Error("Codex bridge could not resolve an upstream model.");
   }
@@ -212,27 +191,27 @@ function normalizeTextPart(value) {
   if (!record) {
     return "";
   }
-  const type = readString2(record.type);
+  const type = readString(record.type);
   if (type !== "input_text" && type !== "output_text") {
     return "";
   }
-  return readString2(record.text) ?? "";
+  return readString(record.text) ?? "";
 }
 function normalizeImageUrl(value) {
   const record = readRecord(value);
-  if (!record || readString2(record.type) !== "input_image") {
+  if (!record || readString(record.type) !== "input_image") {
     return null;
   }
   const source = readRecord(record.source);
   if (!source) {
     return null;
   }
-  if (readString2(source.type) === "url") {
-    return readString2(source.url) ?? null;
+  if (readString(source.type) === "url") {
+    return readString(source.url) ?? null;
   }
-  if (readString2(source.type) === "base64") {
-    const mediaType = readString2(source.media_type) ?? "application/octet-stream";
-    const data = readString2(source.data);
+  if (readString(source.type) === "base64") {
+    const mediaType = readString(source.media_type) ?? "application/octet-stream";
+    const data = readString(source.data);
     if (!data) {
       return null;
     }
@@ -288,7 +267,7 @@ function buildChatContent(content) {
   }
   const textOnly = chatContent.every((entry) => entry.type === "text");
   if (textOnly) {
-    return chatContent.map((entry) => readString2(entry.text) ?? "").join("\n");
+    return chatContent.map((entry) => readString(entry.text) ?? "").join("\n");
   }
   return chatContent;
 }
@@ -299,10 +278,10 @@ function readAssistantMessageText(content) {
   if (!Array.isArray(content)) {
     return "";
   }
-  return content.filter((entry) => entry.type === "text").map((entry) => readString2(entry.text) ?? "").join("\n");
+  return content.filter((entry) => entry.type === "text").map((entry) => readString(entry.text) ?? "").join("\n");
 }
 function appendMessageInputItem(params) {
-  const role = readString2(params.item.role);
+  const role = readString(params.item.role);
   const content = buildChatContent(params.item.content);
   if (role === "assistant") {
     const text = readAssistantMessageText(content);
@@ -321,12 +300,12 @@ function appendMessageInputItem(params) {
   }
 }
 function appendFunctionCallItem(params) {
-  const name = readString2(params.item.name);
-  const argumentsText = readString2(params.item.arguments) ?? "{}";
+  const name = readString(params.item.name);
+  const argumentsText = readString(params.item.arguments) ?? "{}";
   if (!name) {
     return;
   }
-  const callId = readString2(params.item.call_id) ?? readString2(params.item.id) ?? `call_${params.assistantToolCalls.length}`;
+  const callId = readString(params.item.call_id) ?? readString(params.item.id) ?? `call_${params.assistantToolCalls.length}`;
   params.assistantToolCalls.push({
     id: callId,
     type: "function",
@@ -338,7 +317,7 @@ function appendFunctionCallItem(params) {
 }
 function appendFunctionCallOutputItem(params) {
   params.flushAssistant();
-  const callId = readString2(params.item.call_id);
+  const callId = readString(params.item.call_id);
   if (!callId) {
     return;
   }
@@ -350,7 +329,7 @@ function appendFunctionCallOutputItem(params) {
 }
 function buildOpenAiMessages(input, instructions) {
   const messages = [];
-  const instructionText = readString2(instructions);
+  const instructionText = readString(instructions);
   if (instructionText) {
     messages.push({
       role: "system",
@@ -387,7 +366,7 @@ function buildOpenAiMessages(input, instructions) {
     if (!item) {
       continue;
     }
-    const type = readString2(item.type);
+    const type = readString(item.type);
     if (type === "message") {
       appendMessageInputItem({
         messages,
@@ -420,13 +399,13 @@ function toOpenAiTools(value) {
   const tools = [];
   for (const entry of readArray(value)) {
     const tool = readRecord(entry);
-    const type = readString2(tool?.type);
+    const type = readString(tool?.type);
     const fn = readRecord(tool?.function);
-    const name = readString2(fn?.name) ?? readString2(tool?.name);
+    const name = readString(fn?.name) ?? readString(tool?.name);
     if (type !== "function" || !name) {
       continue;
     }
-    const description = (fn ? readString2(fn.description) : void 0) ?? readString2(tool?.description);
+    const description = (fn ? readString(fn.description) : void 0) ?? readString(tool?.description);
     const parameters = (fn ? readRecord(fn.parameters) : void 0) ?? readRecord(tool?.parameters);
     const strict = (fn ? readBoolean(fn.strict) : void 0) ?? readBoolean(tool?.strict);
     tools.push({
@@ -450,8 +429,8 @@ function toOpenAiToolChoice(value) {
   }
   const record = readRecord(value);
   const fn = readRecord(record?.function);
-  const name = readString2(fn?.name) ?? readString2(record?.name);
-  if (readString2(record?.type) === "function" && name) {
+  const name = readString(fn?.name) ?? readString(record?.name);
+  if (readString(record?.type) === "function" && name) {
     return {
       type: "function",
       function: {
@@ -500,7 +479,7 @@ async function callOpenAiCompatibleUpstream(params) {
   }
   if (!upstreamResponse.ok) {
     throw new Error(
-      readString2(parsed.error?.message) ?? rawText.slice(0, 240) ?? `HTTP ${upstreamResponse.status}`
+      readString(parsed.error?.message) ?? rawText.slice(0, 240) ?? `HTTP ${upstreamResponse.status}`
     );
   }
   return {
@@ -522,9 +501,9 @@ function extractAssistantText(content) {
     if (!record) {
       return "";
     }
-    const type = readString2(record.type);
+    const type = readString(record.type);
     if (type === "text" || type === "output_text") {
-      return readString2(record.text) ?? "";
+      return readString(record.text) ?? "";
     }
     return "";
   }).filter(Boolean).join("");
@@ -555,12 +534,12 @@ function buildOpenResponsesOutputItems(response, responseId) {
   toolCalls.forEach((entry, index) => {
     const toolCall = readRecord(entry);
     const fn = readRecord(toolCall?.function);
-    const name = readString2(fn?.name);
-    const argumentsText = readString2(fn?.arguments) ?? "{}";
+    const name = readString(fn?.name);
+    const argumentsText = readString(fn?.arguments) ?? "{}";
     if (!name) {
       return;
     }
-    const callId = readString2(toolCall?.id) ?? `${responseId}:call:${index}`;
+    const callId = readString(toolCall?.id) ?? `${responseId}:call:${index}`;
     outputItems.push({
       type: "function_call",
       id: `${responseId}:function:${index}`,
@@ -606,7 +585,7 @@ function cloneRecord(value) {
   return structuredClone(value);
 }
 function buildInProgressOutputItem(item) {
-  const type = readString2(item.type);
+  const type = readString(item.type);
   if (type === "message") {
     return {
       ...cloneRecord(item),
@@ -624,10 +603,10 @@ function buildInProgressOutputItem(item) {
   return cloneRecord(item);
 }
 function writeMessageOutputItemEvents(params) {
-  const itemId = readString2(params.item.id);
+  const itemId = readString(params.item.id);
   const content = readArray(params.item.content);
-  const textPart = content.find((entry) => readString2(readRecord(entry)?.type) === "output_text");
-  const text = readString2(readRecord(textPart)?.text) ?? "";
+  const textPart = content.find((entry) => readString(readRecord(entry)?.type) === "output_text");
+  const text = readString(readRecord(textPart)?.text) ?? "";
   writeSseEvent(params.response, "response.output_item.added", {
     type: "response.output_item.added",
     sequence_number: nextSequenceNumber(params.sequenceState),
@@ -686,8 +665,8 @@ function writeMessageOutputItemEvents(params) {
   });
 }
 function writeFunctionCallOutputItemEvents(params) {
-  const itemId = readString2(params.item.id);
-  const argumentsText = readString2(params.item.arguments) ?? "";
+  const itemId = readString(params.item.id);
+  const argumentsText = readString(params.item.arguments) ?? "";
   writeSseEvent(params.response, "response.output_item.added", {
     type: "response.output_item.added",
     sequence_number: nextSequenceNumber(params.sequenceState),
@@ -721,7 +700,7 @@ function writeFunctionCallOutputItemEvents(params) {
 }
 function writeResponseOutputItemEvents(params) {
   params.outputItems.forEach((item, outputIndex) => {
-    const type = readString2(item.type);
+    const type = readString(item.type);
     if (type === "message") {
       writeMessageOutputItemEvents({
         response: params.response,
@@ -950,7 +929,7 @@ function readErrorMessage(value) {
     return "";
   }
   const record = value;
-  return readString2(record.message) ?? readString2(record.error) ?? "";
+  return readString(record.message) ?? readString(record.error) ?? "";
 }
 function shouldTreatResponsesProbeFailureAsUnsupported(params) {
   const normalizedMessage = params.message.trim().toLowerCase();
@@ -1005,7 +984,7 @@ async function probeCodexResponsesApiSupport(params) {
     }
     const parsedRecord = parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : null;
     const message = readErrorMessage(parsedRecord?.error) || readErrorMessage(parsed) || rawText.slice(0, 240);
-    const responseFailed = readString2(parsedRecord?.status)?.toLowerCase() === "failed" || Boolean(parsedRecord?.error);
+    const responseFailed = readString(parsedRecord?.status)?.toLowerCase() === "failed" || Boolean(parsedRecord?.error);
     if (response.ok && !responseFailed) {
       return true;
     }
@@ -1029,7 +1008,7 @@ async function resolveCodexResponsesApiSupport(params) {
   if (params.capabilitySpec?.supportsResponsesApi === false) {
     return false;
   }
-  const explicitWireApi = readString2(params.wireApi)?.toLowerCase();
+  const explicitWireApi = readString(params.wireApi)?.toLowerCase();
   if (explicitWireApi === "chat") {
     return false;
   }
@@ -1045,7 +1024,7 @@ async function resolveCodexResponsesApiSupport(params) {
 }
 
 // src/codex-session-type.ts
-function readString3(value) {
+function readString2(value) {
   if (typeof value !== "string") {
     return void 0;
   }
@@ -1056,47 +1035,51 @@ function readStringArray(value) {
   if (!Array.isArray(value)) {
     return void 0;
   }
-  const values = value.map((entry) => readString3(entry)).filter((entry) => Boolean(entry));
+  const values = value.map((entry) => readString2(entry)).filter((entry) => Boolean(entry));
   return values.length > 0 ? values : void 0;
 }
 function dedupeStrings(values) {
   return Array.from(new Set(values));
 }
-function resolveConfiguredCodexModels(params) {
-  const explicitSupportedModels = readStringArray(params.pluginConfig.supportedModels);
-  if (explicitSupportedModels) {
-    return dedupeStrings(explicitSupportedModels);
+function resolveConfiguredCodexModels(pluginConfig) {
+  const explicitSupportedModels = readStringArray(pluginConfig.supportedModels);
+  if (!explicitSupportedModels) {
+    return void 0;
   }
-  const configuredProviders = params.config.providers && typeof params.config.providers === "object" && !Array.isArray(params.config.providers) ? params.config.providers : {};
-  const configuredModels = Object.entries(configuredProviders).flatMap(
-    ([providerName, provider]) => (provider.models ?? []).map((modelName) => readString3(modelName)).filter((modelName) => Boolean(modelName)).map((modelName) => `${providerName}/${modelName}`)
-  );
-  const fallbackModel = readString3(params.pluginConfig.model) ?? params.config.agents.defaults.model;
-  const fallbackModels = fallbackModel ? [fallbackModel] : [];
-  return dedupeStrings(configuredModels.length > 0 ? configuredModels : fallbackModels);
+  const normalizedModels = dedupeStrings(explicitSupportedModels);
+  if (normalizedModels.includes("*")) {
+    return void 0;
+  }
+  return normalizedModels;
 }
 function resolveRecommendedCodexModel(params) {
-  const configuredModel = readString3(params.pluginConfig.model) ?? params.config.agents.defaults.model;
-  if (params.supportedModels.includes(configuredModel)) {
+  const configuredModel = readString2(params.pluginConfig.model) ?? params.defaultModel;
+  if (!configuredModel) {
+    return params.supportedModels?.[0] ?? null;
+  }
+  if (!params.supportedModels || params.supportedModels.includes(configuredModel)) {
     return configuredModel;
   }
   return params.supportedModels[0] ?? configuredModel ?? null;
 }
 function createDescribeCodexSessionType(params) {
   return () => {
-    const supportedModels = resolveConfiguredCodexModels(params);
-    return {
+    const supportedModels = resolveConfiguredCodexModels(params.pluginConfig);
+    const descriptor = {
       ready: true,
       reason: null,
       reasonMessage: null,
-      supportedModels,
       recommendedModel: resolveRecommendedCodexModel({
-        config: params.config,
+        defaultModel: params.defaultModel,
         pluginConfig: params.pluginConfig,
         supportedModels
       }),
       cta: null
     };
+    if (supportedModels) {
+      descriptor.supportedModels = supportedModels;
+    }
+    return descriptor;
   };
 }
 
@@ -1122,7 +1105,7 @@ var DeferredCodexSdkNcpAgentRuntime = class {
     return stream();
   }
 };
-function readString4(value) {
+function readString3(value) {
   if (typeof value !== "string") {
     return void 0;
   }
@@ -1142,14 +1125,9 @@ function readStringArray2(value) {
   if (!Array.isArray(value)) {
     return void 0;
   }
-  const values = value.map((entry) => readString4(entry)).filter((entry) => Boolean(entry));
+  const values = value.map((entry) => readString3(entry)).filter((entry) => Boolean(entry));
   return values.length > 0 ? values : void 0;
 }
-function resolveCodexCapabilitySpec(params) {
-  const providerSpec = params.providerName ? findProviderByName(params.providerName) : void 0;
-  const modelSpec = params.model ? findProviderByModel(params.model) : void 0;
-  return providerSpec?.isGateway ? modelSpec ?? providerSpec : providerSpec ?? modelSpec;
-}
 function readStringRecord(value) {
   if (!value || typeof value !== "object" || Array.isArray(value)) {
     return void 0;
@@ -1178,9 +1156,9 @@ function readThinkingLevel(value) {
   return void 0;
 }
 function resolveCodexExecutionOptions(params) {
-  const configuredWorkingDirectory = readString4(params.pluginConfig.workingDirectory);
-  const workspace = getWorkspacePath(
-    configuredWorkingDirectory ?? params.config.agents.defaults.workspace
+  const configuredWorkingDirectory = readString3(params.pluginConfig.workingDirectory);
+  const workspace = params.runtimeAgent.resolveWorkspacePath(
+    configuredWorkingDirectory ?? params.runtimeAgent.defaults.workspace
   );
   return {
     workingDirectory: workspace,
@@ -1189,14 +1167,14 @@ function resolveCodexExecutionOptions(params) {
 }
 function resolveCodexCliConfig(params) {
   const explicitConfig = readRecord2(params.pluginConfig.config);
-  const modelProvider = readString4(params.modelProviderOverride) ?? resolveExternalModelProvider({
+  const modelProvider = readString3(params.modelProviderOverride) ?? resolveExternalModelProvider({
     explicitModelProvider: params.pluginConfig.modelProvider,
     providerName: params.providerName,
     providerDisplayName: params.providerDisplayName,
     pluginId: PLUGIN_ID
   });
-  const preferredAuthMethod = readString4(params.pluginConfig.preferredAuthMethod) ?? "apikey";
-  const apiBase = readString4(params.pluginConfig.apiBase) ?? readString4(params.apiBase);
+  const preferredAuthMethod = readString3(params.pluginConfig.preferredAuthMethod) ?? "apikey";
+  const apiBase = readString3(params.pluginConfig.apiBase) ?? readString3(params.apiBase);
   const config = {
     model_provider: modelProvider,
     preferred_auth_method: preferredAuthMethod
@@ -1217,7 +1195,7 @@ function resolveCodexCliConfig(params) {
   };
 }
 function resolveCodexModel(params) {
-  return readString4(params.sessionMetadata.preferred_model) ?? readString4(params.sessionMetadata.model) ?? readString4(params.pluginConfig.model) ?? params.config.agents.defaults.model;
+  return readString3(params.sessionMetadata.preferred_model) ?? readString3(params.sessionMetadata.model) ?? readString3(params.pluginConfig.model) ?? params.runtimeAgent.defaults.model ?? "";
 }
 var plugin = {
   id: PLUGIN_ID,
@@ -1231,7 +1209,7 @@ var plugin = {
   register(api) {
     const pluginConfig = readRecord2(api.pluginConfig) ?? {};
     const describeCodexSessionType = createDescribeCodexSessionType({
-      config: api.config,
+      defaultModel: readString3(api.runtime.agent.defaults.model),
       pluginConfig
     });
     api.registerNcpAgentRuntime({
@@ -1240,22 +1218,19 @@ var plugin = {
       describeSessionType: describeCodexSessionType,
       createRuntime: (runtimeParams) => {
         return new DeferredCodexSdkNcpAgentRuntime(async () => {
-          const nextConfig = api.config;
           const model = resolveCodexModel({
-            config: nextConfig,
+            runtimeAgent: api.runtime.agent,
             pluginConfig,
             sessionMetadata: runtimeParams.sessionMetadata
           });
-          const resolvedProviderRuntime = resolveProviderRuntime(nextConfig, model);
+          const resolvedProviderRuntime = api.runtime.agent.resolveProviderRuntime(model);
           const providerName = resolvedProviderRuntime.providerName;
-          const capabilitySpec = resolveCodexCapabilitySpec({
-            model,
-            providerName
-          });
+          const capabilitySpec = resolvedProviderRuntime.providerSpec ?? null;
+          const providerDisplayName = resolvedProviderRuntime.providerDisplayName;
           const externalModelProvider = resolveExternalModelProvider({
             explicitModelProvider: pluginConfig.modelProvider,
             providerName,
-            providerDisplayName: resolvedProviderRuntime.providerDisplayName,
+            providerDisplayName,
             pluginId: PLUGIN_ID
           });
           const userFacingModelRoute = buildUserFacingModelRoute({
@@ -1263,8 +1238,8 @@ var plugin = {
             providerLocalModel: resolvedProviderRuntime.providerLocalModel,
             resolvedModel: resolvedProviderRuntime.resolvedModel
           });
-          const upstreamApiBase = readString4(pluginConfig.apiBase) ?? resolvedProviderRuntime.apiBase ?? void 0;
-          const apiKey = readString4(pluginConfig.apiKey) ?? resolvedProviderRuntime.apiKey ?? void 0;
+          const upstreamApiBase = readString3(pluginConfig.apiBase) ?? resolvedProviderRuntime.apiBase ?? void 0;
+          const apiKey = readString3(pluginConfig.apiKey) ?? resolvedProviderRuntime.apiKey ?? void 0;
           if (!apiKey) {
             throw new Error(
               `[codex] missing apiKey. Set plugins.entries.${PLUGIN_ID}.config.apiKey or providers.*.apiKey for model "${userFacingModelRoute}".`
@@ -1279,7 +1254,7 @@ var plugin = {
           let codexModelProviderOverride;
           const supportsResponsesApi = await resolveCodexResponsesApiSupport({
             capabilitySpec,
-            wireApi: readString4(resolvedProviderRuntime.provider?.wireApi),
+            wireApi: readString3(resolvedProviderRuntime.provider?.wireApi),
             apiBase: upstreamApiBase,
             apiKey,
             extraHeaders: resolvedProviderRuntime.provider?.extraHeaders ?? null,
@@ -1303,7 +1278,7 @@ var plugin = {
             );
           }
           const executionOptions = resolveCodexExecutionOptions({
-            config: nextConfig,
+            runtimeAgent: api.runtime.agent,
             pluginConfig
           });
           const accessMode = resolveCodexAccessMode(pluginConfig);
@@ -1313,20 +1288,23 @@ var plugin = {
             apiKey,
             apiBase: codexApiBase,
             model: resolvedProviderRuntime.providerLocalModel,
-            threadId: readString4(runtimeParams.sessionMetadata.codex_thread_id) ?? null,
-            codexPathOverride: readString4(pluginConfig.codexPathOverride),
+            threadId: readString3(runtimeParams.sessionMetadata.codex_thread_id) ?? null,
+            codexPathOverride: readString3(pluginConfig.codexPathOverride),
             env: readStringRecord(pluginConfig.env),
             cliConfig: resolveCodexCliConfig({
               pluginConfig,
               providerName,
-              providerDisplayName: resolvedProviderRuntime.providerDisplayName,
+              providerDisplayName,
               apiBase: codexApiBase,
               modelProviderOverride: codexModelProviderOverride
             }),
             stateManager: runtimeParams.stateManager,
             sessionMetadata: runtimeParams.sessionMetadata,
             setSessionMetadata: runtimeParams.setSessionMetadata,
-            inputBuilder: buildCodexInputBuilder(executionOptions.workingDirectory),
+            inputBuilder: buildCodexInputBuilder(
+              api.runtime.agent,
+              executionOptions.workingDirectory
+            ),
             threadOptions: {
               model,
               sandboxMode: mapAccessModeToSandboxMode(accessMode),
@@ -1334,7 +1312,7 @@ var plugin = {
               skipGitRepoCheck: executionOptions.skipGitRepoCheck,
               modelReasoningEffort: thinkingLevel,
               networkAccessEnabled: readBoolean2(pluginConfig.networkAccessEnabled),
-              webSearchMode: readString4(pluginConfig.webSearchMode),
+              webSearchMode: readString3(pluginConfig.webSearchMode),
               webSearchEnabled: readBoolean2(pluginConfig.webSearchEnabled),
               approvalPolicy: CODEX_APPROVAL_POLICY,
               additionalDirectories: readStringArray2(pluginConfig.additionalDirectories)

package/openclaw.plugin.json

@@ -17,6 +17,12 @@
       "model": {
         "type": "string"
       },
+      "supportedModels": {
+        "type": "array",
+        "items": {
+          "type": "string"
+        }
+      },
       "modelProvider": {
         "type": "string"
       },
@@ -74,6 +80,11 @@
     "model": {
       "label": "Default Model"
     },
+    "supportedModels": {
+      "label": "Supported Models",
+      "help": "Optional advanced allowlist. Leave empty for no model restriction. Use [\"*\"] to explicitly allow any model.",
+      "advanced": true
+    },
     "modelProvider": {
       "label": "External Model Provider",
       "help": "Optional override for the provider id exposed to Codex SDK. Recommended for custom providers whose display name is not the actual upstream provider id.",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nextclaw/nextclaw-ncp-runtime-plugin-codex-sdk",
-  "version": "0.1.23",
+  "version": "0.1.25",
   "private": false,
   "description": "NextClaw plugin that registers Codex SDK as an optional NCP runtime.",
   "type": "module",
@@ -21,10 +21,9 @@
     ]
   },
   "dependencies": {
-    "@nextclaw/core": "0.11.2",
-    "@nextclaw/ncp": "0.3.3",
-    "@nextclaw/ncp-toolkit": "0.4.3",
-    "@nextclaw/nextclaw-ncp-runtime-codex-sdk": "0.1.4"
+    "@nextclaw/ncp": "0.4.0",
+    "@nextclaw/ncp-toolkit": "0.4.4",
+    "@nextclaw/nextclaw-ncp-runtime-codex-sdk": "0.1.5"
   },
   "devDependencies": {
     "@types/node": "^20.17.6",