@nextclaw/nextclaw-ncp-runtime-plugin-codex-sdk 0.1.0 → 0.1.2

package/dist/index.js

@@ -1,6 +1,7 @@
 import {
   getApiBase,
   getProvider,
+  getProviderName,
   getWorkspacePath,
   SkillsLoader
 } from "@nextclaw/core";
@@ -59,6 +60,52 @@ function readThinkingLevel(value) {
   }
   return void 0;
 }
+function resolveCodexExecutionOptions(params) {
+  const configuredWorkingDirectory = readString(params.pluginConfig.workingDirectory);
+  const workspace = getWorkspacePath(
+    configuredWorkingDirectory ?? params.config.agents.defaults.workspace
+  );
+  return {
+    workingDirectory: workspace,
+    skipGitRepoCheck: readBoolean(params.pluginConfig.skipGitRepoCheck) ?? true
+  };
+}
+function resolveCodexCliConfig(params) {
+  const explicitConfig = readRecord(params.pluginConfig.config);
+  const modelProvider = readString(params.pluginConfig.modelProvider) ?? readString(params.providerName) ?? "openai";
+  const preferredAuthMethod = readString(params.pluginConfig.preferredAuthMethod) ?? "apikey";
+  const apiBase = readString(params.pluginConfig.apiBase) ?? readString(params.apiBase);
+  const config = {
+    model_provider: modelProvider,
+    preferred_auth_method: preferredAuthMethod
+  };
+  if (modelProvider && apiBase) {
+    config.model_providers = {
+      [modelProvider]: {
+        name: modelProvider,
+        base_url: apiBase,
+        wire_api: "responses",
+        requires_openai_auth: true
+      }
+    };
+  }
+  return {
+    ...config,
+    ...explicitConfig ?? {}
+  };
+}
+function stripProviderPrefix(model, providerName) {
+  const normalizedModel = model.trim();
+  const normalizedProvider = providerName?.trim().toLowerCase();
+  if (!normalizedModel || !normalizedProvider) {
+    return normalizedModel;
+  }
+  const prefix = `${normalizedProvider}/`;
+  if (!normalizedModel.toLowerCase().startsWith(prefix)) {
+    return normalizedModel;
+  }
+  return normalizedModel.slice(prefix.length);
+}
 function readRequestedSkills(metadata) {
   const raw = metadata.requested_skills ?? metadata.requestedSkills;
   if (!Array.isArray(raw)) {
@@ -123,33 +170,41 @@ const plugin = {
           sessionMetadata: runtimeParams.sessionMetadata
         });
         const provider = getProvider(nextConfig, model);
+        const providerName = getProviderName(nextConfig, model);
+        const apiBase = readString(pluginConfig.apiBase) ?? getApiBase(nextConfig, model) ?? void 0;
         const apiKey = readString(pluginConfig.apiKey) ?? provider?.apiKey ?? void 0;
         if (!apiKey) {
           throw new Error(
             `[codex] missing apiKey. Set plugins.entries.${PLUGIN_ID}.config.apiKey or providers.*.apiKey for model "${model}".`
           );
         }
-        const workspace = getWorkspacePath(
-          readString(pluginConfig.workingDirectory) ?? nextConfig.agents.defaults.workspace
-        );
+        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: readString(pluginConfig.apiBase) ?? getApiBase(nextConfig, model) ?? void 0,
-          model,
+          apiBase,
+          model: stripProviderPrefix(model, providerName),
           threadId: readString(runtimeParams.sessionMetadata.codex_thread_id) ?? null,
           codexPathOverride: readString(pluginConfig.codexPathOverride),
           env: readStringRecord(pluginConfig.env),
-          cliConfig: readRecord(pluginConfig.config),
+          cliConfig: resolveCodexCliConfig({
+            pluginConfig,
+            providerName,
+            apiBase
+          }),
+          stateManager: runtimeParams.stateManager,
           sessionMetadata: runtimeParams.sessionMetadata,
           setSessionMetadata: runtimeParams.setSessionMetadata,
-          inputBuilder: buildCodexInputBuilder(workspace),
+          inputBuilder: buildCodexInputBuilder(executionOptions.workingDirectory),
           threadOptions: {
             model,
             sandboxMode: readString(pluginConfig.sandboxMode),
-            workingDirectory: workspace,
-            skipGitRepoCheck: readBoolean(pluginConfig.skipGitRepoCheck),
+            workingDirectory: executionOptions.workingDirectory,
+            skipGitRepoCheck: executionOptions.skipGitRepoCheck,
             modelReasoningEffort: thinkingLevel,
             networkAccessEnabled: readBoolean(pluginConfig.networkAccessEnabled),
             webSearchMode: readString(pluginConfig.webSearchMode),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nextclaw/nextclaw-ncp-runtime-plugin-codex-sdk",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "private": false,
   "description": "NextClaw plugin that registers Codex SDK as an optional NCP runtime.",
   "type": "module",
@@ -21,10 +21,10 @@
     ]
   },
   "dependencies": {
-    "@nextclaw/nextclaw-ncp-runtime-codex-sdk": "0.1.0",
     "@nextclaw/ncp": "0.3.0",
-    "@nextclaw/ncp-toolkit": "0.3.0",
-    "@nextclaw/core": "0.9.0"
+    "@nextclaw/core": "0.9.1",
+    "@nextclaw/nextclaw-ncp-runtime-codex-sdk": "0.1.0",
+    "@nextclaw/ncp-toolkit": "0.4.0"
   },
   "devDependencies": {
     "@types/node": "^20.17.6",