@agent-proxy/agy 0.15.1 → 0.16.0

package/dist/request.js

@@ -16,6 +16,61 @@ function fail(message) { throw new AgyRequestError(message); }
 function record(value) {
     return value !== null && typeof value === "object" && !Array.isArray(value);
 }
+/** AGY 保持独立转换：增补信封先提升为声明，避免进入普通历史回放。 */
+function normalizeAdditionalTools(body) {
+    if (!Array.isArray(body.input))
+        return body;
+    const envelopes = body.input.filter((item) => record(item) && item.type === "additional_tools");
+    if (envelopes.length === 0)
+        return body;
+    if (body.tools !== undefined && !Array.isArray(body.tools))
+        fail("additional_tools 合并要求 tools 为数组");
+    const groups = [body.tools ?? []];
+    for (const envelope of envelopes) {
+        if (!Array.isArray(envelope.tools))
+            fail("additional_tools.tools 必须是数组");
+        groups.push(envelope.tools);
+    }
+    const merge = (entries, inNamespace = false) => {
+        const tools = [];
+        const indices = new Map();
+        for (const group of entries) {
+            for (const raw of group) {
+                if (!record(raw) || typeof raw.type !== "string" || !raw.type)
+                    fail("additional_tools.tools 包含无效工具声明");
+                if (["function", "custom", "namespace"].includes(raw.type) && (typeof raw.name !== "string" || !raw.name)) {
+                    fail("additional_tools 工具 name 必须是非空字符串");
+                }
+                if (raw.type === "function" && !record(raw.parameters))
+                    fail(`additional_tools function 工具 ${String(raw.name)} 缺少对象 parameters`);
+                let tool = raw;
+                if (raw.type === "namespace") {
+                    if (inNamespace || !Array.isArray(raw.tools))
+                        fail("additional_tools namespace.tools 必须是工具数组且不得嵌套 namespace");
+                    tool = { ...raw, tools: merge([raw.tools], true) };
+                }
+                // function/custom 共用名称身份，顶层声明优先于历史信封中的旧类型。
+                const type = tool.type === "function" || tool.type === "custom" ? "callable" : tool.type;
+                const key = JSON.stringify([type, tool.namespace ?? null, tool.name ?? null]);
+                const index = indices.get(key);
+                if (index === undefined) {
+                    indices.set(key, tools.length);
+                    tools.push(tool);
+                }
+                else if (tool.type === "namespace") {
+                    const existing = tools[index];
+                    tools[index] = { ...existing, tools: merge([existing.tools, tool.tools], true) };
+                }
+            }
+        }
+        return tools;
+    };
+    return {
+        ...body,
+        tools: merge(groups),
+        input: body.input.filter((item) => !record(item) || item.type !== "additional_tools"),
+    };
+}
 function string(value, field) {
     if (typeof value !== "string")
         fail(`${field} 必须是字符串`);
@@ -476,6 +531,8 @@ function normalizeSourceItems(body, to) {
 export function translateAgyRequest(body, upstreamModel, to = "responses") {
     if (typeof upstreamModel !== "string" || !upstreamModel)
         fail("上游模型不能为空");
+    if (to === "responses")
+        body = normalizeAdditionalTools(body);
     body = normalizeSourceItems(body, to);
     if (body.previous_response_id !== undefined && body.previous_response_id !== null && body.previous_response_id !== "") {
         fail("Antigravity 不支持 previous_response_id；请提供完整 input 历史");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-proxy/agy",
-  "version": "0.15.1",
+  "version": "0.16.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.15.0"
+    "@agent-proxy/models": "0.16.0"
   },
   "dependencies": {
-    "@agent-proxy/plugin-api": "0.15.0"
+    "@agent-proxy/plugin-api": "0.16.0"
   },
-  "gitHead": "cfb03c81e31c64da3a7314c43c51d954f5302111"
+  "gitHead": "062121f545d3391665789b2e8baae842029262be"
 }