@nextclaw/nextclaw-ncp-runtime-plugin-codex-sdk 0.1.15 → 0.1.16

package/dist/index.js

@@ -1,23 +1,44 @@
 import {
   findProviderByModel,
   findProviderByName,
-  buildRequestedSkillsUserPrompt,
   resolveProviderRuntime,
-  getWorkspacePath,
-  SkillsLoader
+  getWorkspacePath
 } from "@nextclaw/core";
 import {
   CodexSdkNcpAgentRuntime
 } from "@nextclaw/nextclaw-ncp-runtime-codex-sdk";
 import {
   buildUserFacingModelRoute,
+  buildCodexBridgeModelProviderId,
   resolveExternalModelProvider
 } from "./codex-model-provider.js";
+import { buildCodexInputBuilder } from "./codex-input-builder.js";
+import { ensureCodexOpenAiResponsesBridge } from "./codex-openai-responses-bridge.js";
+import { resolveCodexResponsesApiSupport } from "./codex-responses-capability.js";
 import {
   createDescribeCodexSessionType
 } from "./codex-session-type.js";
 const PLUGIN_ID = "nextclaw-ncp-runtime-plugin-codex-sdk";
 const CODEX_RUNTIME_KIND = "codex";
+class DeferredCodexSdkNcpAgentRuntime {
+  constructor(createRuntime) {
+    this.createRuntime = createRuntime;
+  }
+  runtimePromise = null;
+  run(input, options) {
+    const resolveRuntime = async () => {
+      if (!this.runtimePromise) {
+        this.runtimePromise = this.createRuntime();
+      }
+      return await this.runtimePromise;
+    };
+    const stream = async function* () {
+      const runtime = await resolveRuntime();
+      yield* runtime.run(input, options);
+    }.bind(this);
+    return stream();
+  }
+}
 function readString(value) {
   if (typeof value !== "string") {
     return void 0;
@@ -85,7 +106,7 @@ function resolveCodexExecutionOptions(params) {
 }
 function resolveCodexCliConfig(params) {
   const explicitConfig = readRecord(params.pluginConfig.config);
-  const modelProvider = resolveExternalModelProvider({
+  const modelProvider = readString(params.modelProviderOverride) ?? resolveExternalModelProvider({
     explicitModelProvider: params.pluginConfig.modelProvider,
     providerName: params.providerName,
     providerDisplayName: params.providerDisplayName,
@@ -112,35 +133,6 @@ function resolveCodexCliConfig(params) {
     ...explicitConfig ?? {}
   };
 }
-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];
-    if (message?.role !== "user") {
-      continue;
-    }
-    const text = message.parts.filter((part) => part.type === "text").map((part) => part.text).join("").trim();
-    if (text) {
-      return text;
-    }
-  }
-  return "";
-}
-function buildCodexInputBuilder(workspace) {
-  const skillsLoader = new SkillsLoader(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);
-  };
-}
 function resolveCodexModel(params) {
   return readString(params.sessionMetadata.preferred_model) ?? readString(params.sessionMetadata.model) ?? readString(params.pluginConfig.model) ?? params.config.agents.defaults.model;
 }
@@ -164,77 +156,106 @@ const plugin = {
       label: "Codex",
       describeSessionType: describeCodexSessionType,
       createRuntime: (runtimeParams) => {
-        const nextConfig = api.config;
-        const model = resolveCodexModel({
-          config: nextConfig,
-          pluginConfig,
-          sessionMetadata: runtimeParams.sessionMetadata
-        });
-        const resolvedProviderRuntime = resolveProviderRuntime(nextConfig, model);
-        const providerName = resolvedProviderRuntime.providerName;
-        const capabilitySpec = resolveCodexCapabilitySpec({
-          model,
-          providerName
-        });
-        const externalModelProvider = resolveExternalModelProvider({
-          explicitModelProvider: pluginConfig.modelProvider,
-          providerName,
-          providerDisplayName: resolvedProviderRuntime.providerDisplayName,
-          pluginId: PLUGIN_ID
-        });
-        const userFacingModelRoute = buildUserFacingModelRoute({
-          externalModelProvider,
-          providerLocalModel: resolvedProviderRuntime.providerLocalModel,
-          resolvedModel: resolvedProviderRuntime.resolvedModel
-        });
-        const apiBase = readString(pluginConfig.apiBase) ?? resolvedProviderRuntime.apiBase ?? void 0;
-        const apiKey = readString(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}".`
-          );
-        }
-        if (capabilitySpec?.supportsResponsesApi === false) {
-          const capabilityProviderName = capabilitySpec.displayName ?? capabilitySpec.name ?? resolvedProviderRuntime.providerDisplayName ?? externalModelProvider;
-          throw new Error(
-            `[codex] model "${userFacingModelRoute}" is routed through "${capabilityProviderName}", which does not support the Responses API. Codex SDK currently only supports models available through the Responses API.`
-          );
-        }
-        const executionOptions = resolveCodexExecutionOptions({
-          config: nextConfig,
-          pluginConfig
-        });
-        const thinkingLevel = readThinkingLevel(runtimeParams.sessionMetadata.preferred_thinking) ?? readThinkingLevel(runtimeParams.sessionMetadata.thinking) ?? void 0;
-        return new CodexSdkNcpAgentRuntime({
-          sessionId: runtimeParams.sessionId,
-          apiKey,
-          apiBase,
-          model: resolvedProviderRuntime.providerLocalModel,
-          threadId: readString(runtimeParams.sessionMetadata.codex_thread_id) ?? null,
-          codexPathOverride: readString(pluginConfig.codexPathOverride),
-          env: readStringRecord(pluginConfig.env),
-          cliConfig: resolveCodexCliConfig({
+        return new DeferredCodexSdkNcpAgentRuntime(async () => {
+          const nextConfig = api.config;
+          const model = resolveCodexModel({
+            config: nextConfig,
             pluginConfig,
+            sessionMetadata: runtimeParams.sessionMetadata
+          });
+          const resolvedProviderRuntime = resolveProviderRuntime(nextConfig, model);
+          const providerName = resolvedProviderRuntime.providerName;
+          const capabilitySpec = resolveCodexCapabilitySpec({
+            model,
+            providerName
+          });
+          const externalModelProvider = resolveExternalModelProvider({
+            explicitModelProvider: pluginConfig.modelProvider,
             providerName,
             providerDisplayName: resolvedProviderRuntime.providerDisplayName,
-            apiBase
-          }),
-          stateManager: runtimeParams.stateManager,
-          sessionMetadata: runtimeParams.sessionMetadata,
-          setSessionMetadata: runtimeParams.setSessionMetadata,
-          inputBuilder: buildCodexInputBuilder(executionOptions.workingDirectory),
-          threadOptions: {
-            model,
-            sandboxMode: readString(pluginConfig.sandboxMode),
-            workingDirectory: executionOptions.workingDirectory,
-            skipGitRepoCheck: executionOptions.skipGitRepoCheck,
-            modelReasoningEffort: thinkingLevel,
-            networkAccessEnabled: readBoolean(pluginConfig.networkAccessEnabled),
-            webSearchMode: readString(pluginConfig.webSearchMode),
-            webSearchEnabled: readBoolean(pluginConfig.webSearchEnabled),
-            approvalPolicy: readString(pluginConfig.approvalPolicy),
-            additionalDirectories: readStringArray(pluginConfig.additionalDirectories)
+            pluginId: PLUGIN_ID
+          });
+          const userFacingModelRoute = buildUserFacingModelRoute({
+            externalModelProvider,
+            providerLocalModel: resolvedProviderRuntime.providerLocalModel,
+            resolvedModel: resolvedProviderRuntime.resolvedModel
+          });
+          const upstreamApiBase = readString(pluginConfig.apiBase) ?? resolvedProviderRuntime.apiBase ?? void 0;
+          const apiKey = readString(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}".`
+            );
+          }
+          if (!upstreamApiBase) {
+            throw new Error(
+              `[codex] missing apiBase for model "${userFacingModelRoute}". Configure plugins.entries.${PLUGIN_ID}.config.apiBase or providers.*.apiBase.`
+            );
+          }
+          let codexApiBase = upstreamApiBase;
+          let codexModelProviderOverride;
+          const supportsResponsesApi = await resolveCodexResponsesApiSupport({
+            capabilitySpec,
+            wireApi: readString(resolvedProviderRuntime.provider?.wireApi),
+            apiBase: upstreamApiBase,
+            apiKey,
+            extraHeaders: resolvedProviderRuntime.provider?.extraHeaders ?? null,
+            model: resolvedProviderRuntime.providerLocalModel
+          });
+          if (!supportsResponsesApi) {
+            const bridge = await ensureCodexOpenAiResponsesBridge({
+              upstreamApiBase,
+              upstreamApiKey: apiKey,
+              upstreamExtraHeaders: resolvedProviderRuntime.provider?.extraHeaders ?? void 0,
+              defaultModel: resolvedProviderRuntime.providerLocalModel,
+              modelPrefixes: [
+                providerName ?? "",
+                externalModelProvider,
+                resolvedProviderRuntime.providerDisplayName ?? ""
+              ]
+            });
+            codexApiBase = bridge.baseUrl;
+            codexModelProviderOverride = buildCodexBridgeModelProviderId(
+              externalModelProvider
+            );
           }
+          const executionOptions = resolveCodexExecutionOptions({
+            config: nextConfig,
+            pluginConfig
+          });
+          const thinkingLevel = readThinkingLevel(runtimeParams.sessionMetadata.preferred_thinking) ?? readThinkingLevel(runtimeParams.sessionMetadata.thinking) ?? void 0;
+          return new CodexSdkNcpAgentRuntime({
+            sessionId: runtimeParams.sessionId,
+            apiKey,
+            apiBase: codexApiBase,
+            model: resolvedProviderRuntime.providerLocalModel,
+            threadId: readString(runtimeParams.sessionMetadata.codex_thread_id) ?? null,
+            codexPathOverride: readString(pluginConfig.codexPathOverride),
+            env: readStringRecord(pluginConfig.env),
+            cliConfig: resolveCodexCliConfig({
+              pluginConfig,
+              providerName,
+              providerDisplayName: resolvedProviderRuntime.providerDisplayName,
+              apiBase: codexApiBase,
+              modelProviderOverride: codexModelProviderOverride
+            }),
+            stateManager: runtimeParams.stateManager,
+            sessionMetadata: runtimeParams.sessionMetadata,
+            setSessionMetadata: runtimeParams.setSessionMetadata,
+            inputBuilder: buildCodexInputBuilder(executionOptions.workingDirectory),
+            threadOptions: {
+              model,
+              sandboxMode: readString(pluginConfig.sandboxMode),
+              workingDirectory: executionOptions.workingDirectory,
+              skipGitRepoCheck: executionOptions.skipGitRepoCheck,
+              modelReasoningEffort: thinkingLevel,
+              networkAccessEnabled: readBoolean(pluginConfig.networkAccessEnabled),
+              webSearchMode: readString(pluginConfig.webSearchMode),
+              webSearchEnabled: readBoolean(pluginConfig.webSearchEnabled),
+              approvalPolicy: readString(pluginConfig.approvalPolicy),
+              additionalDirectories: readStringArray(pluginConfig.additionalDirectories)
+            }
+          });
         });
       }
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nextclaw/nextclaw-ncp-runtime-plugin-codex-sdk",
-  "version": "0.1.15",
+  "version": "0.1.16",
   "private": false,
   "description": "NextClaw plugin that registers Codex SDK as an optional NCP runtime.",
   "type": "module",