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

package/dist/index.d.ts

@@ -67,6 +67,7 @@ type PluginDefinition = {
     configSchema: Record<string, unknown>;
     register: (api: PluginApi) => void;
 };
+
 declare const plugin: PluginDefinition;
 
 export { plugin as default };

package/dist/index.js

@@ -163,29 +163,7 @@ function nextSequenceNumber(state) {
   return nextValue;
 }
 
-// src/codex-openai-responses-bridge-request.ts
-function stripModelPrefix(model, prefixes) {
-  const normalizedModel = model.trim();
-  for (const prefix of prefixes) {
-    const normalizedPrefix = prefix.trim().toLowerCase();
-    if (!normalizedPrefix) {
-      continue;
-    }
-    const candidatePrefix = `${normalizedPrefix}/`;
-    if (normalizedModel.toLowerCase().startsWith(candidatePrefix)) {
-      return normalizedModel.slice(candidatePrefix.length);
-    }
-  }
-  return normalizedModel;
-}
-function resolveUpstreamModel(requestedModel, config) {
-  const prefixes = (config.modelPrefixes ?? []).filter((value) => value.trim().length > 0);
-  const model = stripModelPrefix(readString(requestedModel) ?? "", prefixes) || stripModelPrefix(config.defaultModel ?? "", prefixes);
-  if (!model) {
-    throw new Error("Codex bridge could not resolve an upstream model.");
-  }
-  return model;
-}
+// src/codex-openai-responses-bridge-message-content.ts
 function normalizeTextPart(value) {
   const record = readRecord(value);
   if (!record) {
@@ -271,6 +249,30 @@ function buildChatContent(content) {
   }
   return chatContent;
 }
+function mergeChatContent(left, right) {
+  if (left === null) {
+    return right;
+  }
+  if (right === null) {
+    return left;
+  }
+  if (typeof left === "string" && typeof right === "string") {
+    return [left, right].filter((value) => value.length > 0).join("\n\n");
+  }
+  const normalizedLeft = typeof left === "string" ? [
+    {
+      type: "text",
+      text: left
+    }
+  ] : left;
+  const normalizedRight = typeof right === "string" ? [
+    {
+      type: "text",
+      text: right
+    }
+  ] : right;
+  return [...normalizedLeft, ...normalizedRight];
+}
 function readAssistantMessageText(content) {
   if (typeof content === "string") {
     return content;
@@ -280,6 +282,30 @@ function readAssistantMessageText(content) {
   }
   return content.filter((entry) => entry.type === "text").map((entry) => readString(entry.text) ?? "").join("\n");
 }
+
+// src/codex-openai-responses-bridge-request.ts
+function stripModelPrefix(model, prefixes) {
+  const normalizedModel = model.trim();
+  for (const prefix of prefixes) {
+    const normalizedPrefix = prefix.trim().toLowerCase();
+    if (!normalizedPrefix) {
+      continue;
+    }
+    const candidatePrefix = `${normalizedPrefix}/`;
+    if (normalizedModel.toLowerCase().startsWith(candidatePrefix)) {
+      return normalizedModel.slice(candidatePrefix.length);
+    }
+  }
+  return normalizedModel;
+}
+function resolveUpstreamModel(requestedModel, config) {
+  const prefixes = (config.modelPrefixes ?? []).filter((value) => value.trim().length > 0);
+  const model = stripModelPrefix(readString(requestedModel) ?? "", prefixes) || stripModelPrefix(config.defaultModel ?? "", prefixes);
+  if (!model) {
+    throw new Error("Codex bridge could not resolve an upstream model.");
+  }
+  return model;
+}
 function appendMessageInputItem(params) {
   const role = readString(params.item.role);
   const content = buildChatContent(params.item.content);
@@ -288,16 +314,20 @@ function appendMessageInputItem(params) {
     if (text.trim()) {
       params.assistantTextParts.push(text);
     }
-    return;
+    return params.systemContent;
   }
   params.flushAssistant();
   const normalizedRole = role === "developer" ? "system" : role;
-  if ((normalizedRole === "system" || normalizedRole === "user") && content !== null) {
+  if (normalizedRole === "system") {
+    return mergeChatContent(params.systemContent, content);
+  }
+  if (normalizedRole === "user" && content !== null) {
     params.messages.push({
-      role: normalizedRole,
+      role: "user",
       content
     });
   }
+  return params.systemContent;
 }
 function appendFunctionCallItem(params) {
   const name = readString(params.item.name);
@@ -329,20 +359,18 @@ function appendFunctionCallOutputItem(params) {
 }
 function buildOpenAiMessages(input, instructions) {
   const messages = [];
-  const instructionText = readString(instructions);
-  if (instructionText) {
+  let systemContent = readString(instructions) ?? null;
+  if (typeof input === "string") {
     messages.push({
-      role: "system",
-      content: instructionText
+      role: "user",
+      content: input
     });
-  }
-  if (typeof input === "string") {
-    return [
-      ...messages,
+    return systemContent === null ? messages : [
       {
-        role: "user",
-        content: input
-      }
+        role: "system",
+        content: systemContent
+      },
+      ...messages
     ];
   }
   const assistantTextParts = [];
@@ -368,8 +396,9 @@ function buildOpenAiMessages(input, instructions) {
     }
     const type = readString(item.type);
     if (type === "message") {
-      appendMessageInputItem({
+      systemContent = appendMessageInputItem({
         messages,
+        systemContent,
         assistantTextParts,
         assistantToolCalls,
         item,
@@ -393,7 +422,13 @@ function buildOpenAiMessages(input, instructions) {
     }
   }
   flushAssistant();
-  return messages;
+  return systemContent === null ? messages : [
+    {
+      role: "system",
+      content: systemContent
+    },
+    ...messages
+  ];
 }
 function toOpenAiTools(value) {
   const tools = [];

package/package.json

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