@agent-proxy/agy 0.18.0 → 0.20.0

package/dist/catalog.js

@@ -2,9 +2,9 @@ import fs from "node:fs";
 import path from "node:path";
 import { createHash } from "node:crypto";
 import { getCodexBaselineEntry } from "./resources/models.js";
-import { invalidateModelsCache, withAgentSystemPrompt } from "@agent-proxy/plugin-api";
+import { invalidateModelsCache } from "@agent-proxy/plugin-api";
 import { atomicWrite } from "@agent-proxy/plugin-api";
-import { AGY_AGENT_SYSTEM_PROMPT, AGY_ENDPOINT } from "./transport.js";
+import { AGY_ENDPOINT } from "./transport.js";
 import { THINKING_LEVELS } from "./request.js";
 /**
  * Antigravity 模型目录：`POST /v1internal:fetchAvailableModels` 拉取，以 `models`
@@ -238,7 +238,7 @@ export function buildAgyCatalog(data) {
             delete model.max_context_window;
             delete model.effective_context_window_percent;
         }
-        return withAgentSystemPrompt(model, AGY_AGENT_SYSTEM_PROMPT);
+        return model;
     };
     const emitted = new Set();
     const models = [];

package/dist/index.js

@@ -112,7 +112,7 @@ function buildAgyAdapter(config, dependencies = {}) {
         async catalog() {
             if (closed)
                 return { models: [] };
-            // 系统提示词已在 buildAgyCatalog 合成时替换（含 model_messages 模板），缓存即成品。
+            // 目录缓存即成品（官方提示词由请求转换层整体注入，任何客户端协议进入均生效）。
             return { models: (await loadCatalogMeta()) ?? [] };
         },
         /** 显式刷新不吞错；无 last-good 时由命令报告失败。 */

package/dist/request.js

@@ -1,5 +1,5 @@
 import { createHash } from "node:crypto";
-import { AGY_DEFAULT_PROJECT } from "./transport.js";
+import { AGY_AGENT_SYSTEM_PROMPT, AGY_DEFAULT_PROJECT } from "./transport.js";
 /**
  * Codex Responses → Antigravity v1internal generateContent 请求转换。
  *
@@ -90,24 +90,6 @@ function safeToolName(name) {
 function textPart(value, field) {
     return { text: string(value.text, `${field}.text`) };
 }
-function systemText(value, field) {
-    if (typeof value === "string")
-        return value;
-    if (!Array.isArray(value))
-        fail(`${field} 必须是字符串或内容数组`);
-    const parts = [];
-    for (const raw of value) {
-        if (!record(raw))
-            fail(`${field} 包含无效内容块`);
-        if (raw.type === "input_text" || raw.type === "output_text" || raw.type === "text") {
-            parts.push(string(raw.text, `${field}.text`));
-        }
-        else {
-            fail(`${field} 的 system 内容不支持图片等非文本块`);
-        }
-    }
-    return parts.join("\n\n");
-}
 function toolIdentity(rawName, rawNamespace) {
     const original = string(rawName, "工具 name");
     if (!original)
@@ -604,8 +586,9 @@ export function translateAgyRequest(body, upstreamModel, to = "responses") {
             }
             if (item.type === "message" || item.type === undefined) {
                 if (item.role === "system" || item.role === "developer") {
+                    // 客户端系统级内容整体替换为官方 AGY 提示词（catalog 不再注入，任何
+                    // 客户端协议进入都在转换层统一注入），不再收集进 system。
                     pendingAssistant = undefined;
-                    system.push(systemText(item.content, `${item.role} 消息`));
                     continue;
                 }
                 if (item.role !== "user" && item.role !== "assistant")
@@ -646,6 +629,46 @@ export function translateAgyRequest(body, upstreamModel, to = "responses") {
                 (item.role === "assistant" ? assistantContent() : userContent()).parts.push(...parts);
                 continue;
             }
+            if (item.type === "agent_message") {
+                // Codex 多智能体历史：agent 产出的消息（author/recipient 为内部路由元数据）
+                // 按 assistant 回放文本与图片；encrypted_content 是上游私有加密载荷，跨厂商
+                // 不可解，直接剥离。
+                const parts = [];
+                const content = item.content;
+                if (typeof content === "string")
+                    parts.push({ text: content });
+                else if (Array.isArray(content)) {
+                    for (const raw of content) {
+                        if (!record(raw))
+                            fail("agent_message 包含无效内容块");
+                        if (raw.type === "encrypted_content")
+                            continue;
+                        if (raw.type === "input_text" || raw.type === "output_text" || raw.type === "text")
+                            parts.push(textPart(raw, "agent_message"));
+                        else if (raw.type === "input_image" || raw.type === "image") {
+                            const source = raw.image_url ?? raw.url;
+                            const url = typeof source === "string" ? source : record(source) ? source.url : undefined;
+                            if (typeof url !== "string" || !url)
+                                fail("agent_message 的 input_image 缺少 image_url");
+                            if (url.startsWith("data:")) {
+                                const match = /^data:([^;,]*)(?:;charset=[^;,]*)?;base64,(.*)$/s.exec(url);
+                                if (!match)
+                                    fail("agent_message 的 data URI 必须是 base64 编码");
+                                parts.push({ inlineData: { mimeType: match[1] || "image/png", data: match[2] } });
+                            }
+                            else {
+                                parts.push({ fileData: { fileUri: url } });
+                            }
+                        }
+                        else
+                            fail(`agent_message 包含不支持的内容块类型 ${String(raw.type)}`);
+                    }
+                }
+                else
+                    fail("agent_message 的 content 必须是字符串或数组");
+                assistantContent().parts.push(...parts);
+                continue;
+            }
             if (item.type === "function_call" || item.type === "custom_tool_call") {
                 const identity = toolIdentity(item.name, item.namespace);
                 const custom = item.type === "custom_tool_call";
@@ -736,9 +759,9 @@ export function translateAgyRequest(body, upstreamModel, to = "responses") {
     }
     const inner = {
         contents,
-        ...(system.length || body.instructions !== undefined ? {
-            systemInstruction: { role: "user", parts: [...(body.instructions !== undefined ? [{ text: body.instructions }] : []), ...system.map((text) => ({ text }))] },
-        } : {}),
+        // 官方 AGY 提示词为 systemInstruction 唯一基底；客户端 instructions 与
+        // system/developer 内容已剥离，网关旁白（dropped 工具通告）接在其后。
+        systemInstruction: { role: "user", parts: [{ text: AGY_AGENT_SYSTEM_PROMPT }, ...system.map((text) => ({ text }))] },
         ...(convertedTools.tools.length ? { tools: [{ functionDeclarations: convertedTools.tools }] } : {}),
         generationConfig,
     };

package/package.json

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