@agent-proxy/zcode 0.18.0 → 0.19.0

package/dist/index.js

@@ -3,7 +3,7 @@ import path from "node:path";
 import { isIP } from "node:net";
 import { resolvePaths } from "@agent-proxy/plugin-api";
 import { createZcodeConfigCache, readZcodeAPIKeyProviders, zcodeConfigPresent, ZcodeConfigError } from "./config.js";
-import { clearModelsCacheEntries, invalidateModelsCache, withAgentSystemPrompt } from "@agent-proxy/plugin-api";
+import { clearModelsCacheEntries, invalidateModelsCache } from "@agent-proxy/plugin-api";
 import { buildZcodeVendorCatalog, createZcodeCatalog, isZcodeModel, writeZcodeServedCatalog, zcodeAPIProviderIDFromModel, zcodeModelPlan, zcodeUpstreamModel, } from "./catalog.js";
 import { translateZcodeRequest, ZcodeRequestError } from "./request.js";
 import { createZcodeClientResponse } from "./response.js";
@@ -11,7 +11,7 @@ import { executeZcodeAnalyzeImage, matchZcodeAnalyzeImage } from "./vision.js";
 import { ZcodeEndpointRouting } from "./endpoint-routing.js";
 import { clientSigningVerifyRejection, ZcodeClientSigning } from "./client-signing.js";
 import { isZcodeRecord } from "./wire.js";
-import { buildZcodeModelHeaders, createZcodeContexts, decorateZcodeBody, readZcodeIdentity, zcodePlan, ZCODE_AGENT_SYSTEM_PROMPT } from "./request-context.js";
+import { buildZcodeModelHeaders, createZcodeContexts, decorateZcodeBody, readZcodeIdentity, zcodePlan } from "./request-context.js";
 import { localTime, logExchange, logGroupFromPath, requestLogDir } from "@agent-proxy/plugin-api";
 import { logGatewayError, logRequestSummary } from "@agent-proxy/plugin-api";
 export function validateZcodeConfig(config) {
@@ -52,10 +52,10 @@ function buildZcodeAdapter(config, dependencies = {}) {
         return clearModelsCacheEntries(dependencies.codexModelsCacheFile, (slug) => isZcodeModel(slug) && !current.has(slug.toLowerCase()));
     };
     const publishServedCatalog = (catalog) => {
-        // 系统提示词在发布成品时替换（含 model_messages 模板）：zcode-catalog.json 落盘即终态，
-        // 与其它适配器的合成期替换对齐；Codex 客户端优先按模板渲染系统提示词，只改
-        // base_instructions 无效（2026-10-09 实测）。
-        servedCatalog = { models: catalog.models.map((entry) => withAgentSystemPrompt(entry, ZCODE_AGENT_SYSTEM_PROMPT)) };
+        // 目录条目保持 vendor 预设基底（base_instructions 为空串、无 model_messages 模板）；
+        // 官方 ZCode 提示词由请求转换层整体注入（request.ts，任何客户端协议进入均生效），
+        // catalog 不再改写提示词。
+        servedCatalog = { models: catalog.models };
         const changed = writeZcodeServedCatalog(servedCatalogFile, servedCatalog);
         if (!changed || !dependencies.codexModelsCacheFile)
             return;

package/dist/request.js

@@ -1,5 +1,6 @@
-import { BridgeConversionError, convertRequest, normalizeResponsesToolDeclarations } from "@agent-proxy/llm-bridge";
+import { BridgeConversionError, convertRequest, normalizeResponsesToolDeclarations, stripClientSystemPrompt } from "@agent-proxy/llm-bridge";
 import { createHash } from "node:crypto";
+import { ZCODE_AGENT_SYSTEM_PROMPT } from "./request-context.js";
 import { decodeZcodeThinking, isZcodeRecord } from "./wire.js";
 import { ANALYZE_IMAGE_SYSTEM_NOTE, ANALYZE_IMAGE_TOOL_DECLARATION, ANALYZE_IMAGE_TOOL_NAME, collectZcodeImages } from "./vision.js";
 /**
@@ -267,6 +268,9 @@ export async function translateZcodeRequest(body, upstreamModel, to = "responses
     }
     if (body.instructions !== undefined && typeof body.instructions !== "string")
         fail("instructions 必须是字符串");
+    // 官方 ZCode 提示词整体替换客户端系统内容（catalog 不再注入，任何客户端协议
+    // 进入都在转换层统一注入）：入口先剥离 instructions 与 system/developer 内容。
+    body = stripClientSystemPrompt(to, body);
     // 上游 token 上限按来源取参：responses 用 max_output_tokens，chat-completions /
     // anthropic 用 max_tokens，gemini 用 generationConfig.maxOutputTokens；缺省走服务默认 16384。
     const sourceLimit = to === "responses"
@@ -281,9 +285,9 @@ export async function translateZcodeRequest(body, upstreamModel, to = "responses
     const clientModel = body.model === undefined ? upstreamModel : string(body.model, "model");
     const identities = new Map();
     const messages = [];
-    const system = [];
-    if (typeof body.instructions === "string" && body.instructions)
-        system.push(body.instructions);
+    // 官方 ZCode 提示词为上游系统槽唯一基底；客户端系统内容已入口剥离，
+    // 网关旁白（dropped 工具通告、视觉适配说明）随后拼装。
+    const system = [ZCODE_AGENT_SYSTEM_PROMPT];
     let passthroughChoice;
     let passthroughStopSequences;
     let passthroughTools;
@@ -301,8 +305,6 @@ export async function translateZcodeRequest(body, upstreamModel, to = "responses
                 identities.set(mapped, identity);
             for (const message of anthropicMessagesOf(converted))
                 addMessage(messages, message.role, message.content);
-            if (typeof converted.body.system === "string" && converted.body.system)
-                system.push(converted.body.system);
             passthroughTools = Array.isArray(converted.body.tools) ? converted.body.tools.filter(record) : undefined;
             passthroughChoice = converted.body.tool_choice;
             if (Array.isArray(converted.body.stop_sequences) && converted.body.stop_sequences.every((entry) => typeof entry === "string")) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-proxy/zcode",
-  "version": "0.18.0",
+  "version": "0.19.0",
   "description": "Agent Proxy zcode 插件；保留基线转换行为。",
   "type": "module",
   "exports": {
@@ -35,11 +35,11 @@
     "url": "git+https://github.com/aceHubert/codex-cliproxy-gateway.git"
   },
   "devDependencies": {
-    "@agent-proxy/models": "0.18.0"
+    "@agent-proxy/models": "0.19.0"
   },
   "dependencies": {
-    "@agent-proxy/llm-bridge": "0.18.0",
-    "@agent-proxy/plugin-api": "0.18.0"
+    "@agent-proxy/llm-bridge": "0.19.0",
+    "@agent-proxy/plugin-api": "0.19.0"
   },
-  "gitHead": "952c260940541ec72d0859d3d66bb39738e1c40f"
+  "gitHead": "20dff92139f68670155c173ba94849415c7ef21e"
 }