@agent-proxy/agy 0.11.3 → 0.12.1

package/dist/catalog.d.ts

@@ -46,7 +46,7 @@ export declare function parseAgyCatalogData(value: unknown): AgyCatalogData;
 export declare function agyEffortTier(effort: unknown): AgyTier;
 /** 家族内按档位解析上游模型 id；目标档缺失时按「就近偏高」回退，家族必有成员。 */
 export declare function resolveAgyFamilyModel(family: AgyModelFamily, effort: unknown): string;
-/** Codex 行为字段沿用 gpt-5.5 快照基底；模型名与能力仅由当前账号目录决定。
+/** Codex 行为字段沿用快照基底（优先 gpt-5.5，缺失回退首条）；模型名与能力仅由当前账号目录决定。
  *  多档位家族合并为一个 `agy/<base>` 条目（能力/窗口取成员并集或最大值），
  *  `supported_reasoning_levels` 只列家族实际存在的档位；无档位后缀的模型保持
  *  独立条目且不暴露档位选择。 */

package/dist/catalog.js

@@ -1,7 +1,7 @@
 import fs from "node:fs";
 import path from "node:path";
 import { createHash } from "node:crypto";
-import { getCodexModelSnapshot } from "./resources/models.js";
+import { getCodexBaselineEntry } from "./resources/models.js";
 import { invalidateModelsCache, withAgentSystemPrompt } from "@agent-proxy/plugin-api";
 import { atomicWrite } from "@agent-proxy/plugin-api";
 import { AGY_AGENT_SYSTEM_PROMPT, AGY_ENDPOINT } from "./transport.js";
@@ -166,14 +166,12 @@ const baseLevelDescriptions = (base) => new Map((Array.isArray(base.supported_re
     ? base.supported_reasoning_levels
     : []).filter((level) => typeof level.effort === "string" && typeof level.description === "string")
     .map((level) => [level.effort, level.description]));
-/** Codex 行为字段沿用 gpt-5.5 快照基底；模型名与能力仅由当前账号目录决定。
+/** Codex 行为字段沿用快照基底（优先 gpt-5.5，缺失回退首条）；模型名与能力仅由当前账号目录决定。
  *  多档位家族合并为一个 `agy/<base>` 条目（能力/窗口取成员并集或最大值），
  *  `supported_reasoning_levels` 只列家族实际存在的档位；无档位后缀的模型保持
  *  独立条目且不暴露档位选择。 */
 export function buildAgyCatalog(data) {
-    const BASE = getCodexModelSnapshot().models.find((entry) => entry.slug === "gpt-5.5");
-    if (!BASE)
-        throw new Error("Codex 模型快照缺少 gpt-5.5 基底条目");
+    const BASE = getCodexBaselineEntry();
     const BASE_LEVEL_DESCRIPTIONS = baseLevelDescriptions(BASE);
     const familyByMember = new Map();
     for (const family of data.families) {

package/dist/index.d.ts

@@ -1,7 +1,16 @@
-import type { HostServices, GatewayPlugin } from "@agent-proxy/plugin-api";
+import type { HostServices, GatewayPlugin, ClientProtocol } from "@agent-proxy/plugin-api";
 import type { AgyCredentials } from "./credentials.ts";
 import { isAgyModel, mergeAgyCatalog } from "./catalog.ts";
 import type { AgentConfig, ModelCatalog, ProcessLogTarget } from "@agent-proxy/plugin-api";
+declare module "@agent-proxy/plugin-api" {
+    interface AgentConfig {
+        /**
+         * 是否开启调试转储：上游错误时把完整请求体落盘到日志目录（当前覆盖 agy 上游 400 的 agy-debug-400.json）。
+         * 与 requestLogging 互相独立，默认关闭。
+         */
+        debug?: boolean;
+    }
+}
 /**
  * Antigravity（agy）入口门面：凭据只读消费（过期即失败，绝不刷新）、fetchAvailableModels
  * 动态目录、Responses ↔ v1internal streamGenerateContent 双向转换。`catalog()` 供
@@ -29,8 +38,7 @@ export interface AgyDependencies {
     /** 进程日志目标（gateway.log）。 */
     processLog?: ProcessLogTarget;
 }
-export declare function agyEnabled<Config extends AgentConfig>(config: Config): boolean;
-export declare function validateAgyConfig<Config extends AgentConfig>(config: Config): void;
+export declare function validateAgyConfig(config: AgentConfig): void;
 export declare function agyError(status: number, message: string, type?: string): Response;
 export interface SafeAgyError {
     code: string;
@@ -42,12 +50,12 @@ export interface SafeAgyError {
 export declare function safeAgyUpstreamError(status: number, body: string): SafeAgyError;
 export { isAgyModel, mergeAgyCatalog };
 export { AGY_RUNTIME_ARTIFACTS } from "./catalog.ts";
-export declare function createAgyAdapter<Config extends AgentConfig>(config: Config, dependencies?: AgyDependencies): {
+export declare function createAgyAdapter(config: AgentConfig, dependencies?: AgyDependencies): {
     catalog(): Promise<ModelCatalog>;
     /** 显式刷新不吞错；无 last-good 时由命令报告失败。 */
     refreshCatalog(): Promise<ModelCatalog>;
     reloadCatalog(): Promise<ModelCatalog>;
-    forward(request: Request, input: Record<string, unknown>, mapResult?: (payload: Record<string, unknown>) => Response): Promise<Response>;
+    forward(request: Request, input: Record<string, unknown>, to?: ClientProtocol, mapResult?: (payload: Record<string, unknown>) => Response): Promise<Response>;
     close(): void;
 };
 export declare const AGY_MODEL_PATTERNS: readonly string[];

package/dist/index.js

@@ -7,26 +7,16 @@ import { agyTokenStale, loadAgyCredentials, AgyCredentialError, defaultAgyCreden
 import { createAgyTransport, AgyTransportError } from "./transport.js";
 import { AGY_PREFIX, agyUpstreamModel, createAgyCatalogStore, isAgyModel, mergeAgyCatalog, resolveAgyFamilyModel, } from "./catalog.js";
 import { translateAgyRequest, AgyRequestError } from "./request.js";
-import { createAgyResponse } from "./response.js";
+import { createAgyClientResponse } from "./response.js";
 import { localTime, logExchange, logGroupFromPath, requestLogDir } from "@agent-proxy/plugin-api";
 import { logGatewayError, logRequestSummary } from "@agent-proxy/plugin-api";
 /** CLI 的模型轮询周期是 360 秒（见调研文档 §5.5），网关按同一节奏刷新目录。 */
 const DEFAULT_CATALOG_REFRESH_INTERVAL_MS = 360_000;
-export function agyEnabled(config) {
-    return config.agy === undefined || config.agy === true;
-}
 export function validateAgyConfig(config) {
-    if (config.agy !== undefined && typeof config.agy !== "boolean")
-        throw new Error("agy 必须为 boolean");
-    if (!agyEnabled(config))
-        return;
     const host = config.host;
     if (!(host === "localhost" || host === "::1" || host === "[::1]" || (isIP(host) === 4 && host.startsWith("127.")))) {
         throw new Error("启用 agy 时网关只能监听环回地址");
     }
-    if (config.prefix && (AGY_PREFIX.startsWith(config.prefix) || config.prefix.startsWith(AGY_PREFIX))) {
-        throw new Error(`启用 agy 时 ${AGY_PREFIX} 前缀保留给 Antigravity，请调整第三方 prefix`);
-    }
 }
 export function agyError(status, message, type = "invalid_request_error") {
     return Response.json({ error: { type, message } }, { status });
@@ -54,7 +44,6 @@ export function safeAgyUpstreamError(status, body) {
 }
 function buildAgyAdapter(config, dependencies = {}) {
     validateAgyConfig(config);
-    const enabled = agyEnabled(config);
     const credentialFile = dependencies.credentialFile ?? defaultAgyCredentialFile();
     const loadCredentials = async () => {
         if (dependencies.credentials)
@@ -68,35 +57,31 @@ function buildAgyAdapter(config, dependencies = {}) {
     };
     const transport = createAgyTransport({ endpoint: dependencies.endpoint, fetch: dependencies.fetch });
     // 请求日志与调试转储共用同一目录解析规则；两者开关（requestLogging / debug）互相独立。
-    const logDir = requestLogDir(config);
+    const logDir = requestLogDir();
     const sink = config.requestLogging === true ? {
         dir: logDir,
         maxLogs: Math.max(0, Math.trunc(config.maxRequestLogs ?? 0)),
         processLog: dependencies.processLog,
     } : undefined;
-    const store = enabled
-        ? createAgyCatalogStore({
-            cacheDirectory: dependencies.cacheDirectory ?? resolvePaths().runtimeHome,
-            credentials: loadCredentials,
-            codexModelsCacheFile: dependencies.codexModelsCacheFile,
-            endpoint: dependencies.endpoint,
-            fetchCatalog: (credential) => transport.fetchModels(credential, AbortSignal.timeout(30_000)),
-            catalogMode: dependencies.catalogMode,
-        })
-        : undefined;
+    const store = createAgyCatalogStore({
+        cacheDirectory: dependencies.cacheDirectory ?? resolvePaths().runtimeHome,
+        credentials: loadCredentials,
+        codexModelsCacheFile: dependencies.codexModelsCacheFile,
+        endpoint: dependencies.endpoint,
+        fetchCatalog: (credential) => transport.fetchModels(credential, AbortSignal.timeout(30_000)),
+        catalogMode: dependencies.catalogMode,
+    });
     const schedule = dependencies.setInterval ?? setInterval;
     const cancel = dependencies.clearInterval ?? clearInterval;
     let timer;
     let startupRefresh;
-    if (store) {
-        if (dependencies.refreshCatalogOnStart !== false) {
-            startupRefresh = store.refresh();
-            void startupRefresh.catch(() => { });
-        }
-        if (dependencies.catalogMode !== "manual") {
-            timer = schedule(() => { void store.refresh().catch(() => { }); }, Math.max(1_000, dependencies.catalogRefreshIntervalMs ?? DEFAULT_CATALOG_REFRESH_INTERVAL_MS));
-            timer.unref?.();
-        }
+    if (dependencies.refreshCatalogOnStart !== false) {
+        startupRefresh = store.refresh();
+        void startupRefresh.catch(() => { });
+    }
+    if (dependencies.catalogMode !== "manual") {
+        timer = schedule(() => { void store.refresh().catch(() => { }); }, Math.max(1_000, dependencies.catalogRefreshIntervalMs ?? DEFAULT_CATALOG_REFRESH_INTERVAL_MS));
+        timer.unref?.();
     }
     const activeRequests = new Set();
     /** 已知模型集合（含重定向前的旧 id）；空目录视为不可校验，透传由上游判定。 */
@@ -116,8 +101,6 @@ function buildAgyAdapter(config, dependencies = {}) {
     };
     /** 尽力加载目录元数据（含磁盘缓存回退）；失败时保持未加载状态，由上游判定。 */
     const loadCatalogMeta = async () => {
-        if (!store)
-            return undefined;
         try {
             await startupRefresh?.catch(() => { });
             return updateCatalogMeta(await store.catalog()).models;
@@ -127,24 +110,24 @@ function buildAgyAdapter(config, dependencies = {}) {
     let closed = false;
     return {
         async catalog() {
-            if (!store || closed)
+            if (closed)
                 return { models: [] };
             // 系统提示词已在 buildAgyCatalog 合成时替换（含 model_messages 模板），缓存即成品。
             return { models: (await loadCatalogMeta()) ?? [] };
         },
         /** 显式刷新不吞错；无 last-good 时由命令报告失败。 */
         async refreshCatalog() {
-            if (!store || closed)
+            if (closed)
                 return { models: [] };
             await store.refresh();
             return updateCatalogMeta(await store.catalog());
         },
         async reloadCatalog() {
-            if (!store || closed)
+            if (closed)
                 return { models: [] };
             return updateCatalogMeta(await store.reload());
         },
-        async forward(request, input, mapResult) {
+        async forward(request, input, to = "responses", mapResult) {
             const start = Date.now();
             const requestTime = localTime();
             const incoming = new URL(request.url);
@@ -175,8 +158,8 @@ function buildAgyAdapter(config, dependencies = {}) {
                 log(status, JSON.stringify({ error: { type, message } }), response.headers);
                 return response;
             };
-            if (!store || closed)
-                return fail(503, "Antigravity 入口未启用或网关已关闭", "configuration_error");
+            if (closed)
+                return fail(503, "Antigravity 入口已关闭", "configuration_error");
             const abort = new AbortController();
             const onAbort = () => abort.abort(request.signal.reason);
             let cleaned = false;
@@ -261,10 +244,10 @@ function buildAgyAdapter(config, dependencies = {}) {
                         }
                     }
                 }
-                const translated = translateAgyRequest(input, resolvedModel);
+                const translated = translateAgyRequest(input, resolvedModel, to);
                 abort.signal.throwIfAborted();
                 const upstream = await transport.streamInfer(credential, translated.wrapper, abort.signal);
-                const response = await createAgyResponse(upstream, {
+                const response = await createAgyClientResponse(to, upstream, {
                     model, tools: translated.tools, stream, signal: abort.signal,
                     sanitizeError: (error) => {
                         // 上游流内错误的原始对象只进本机网关日志（截断），供排查；客户端只见预定义分类。
@@ -375,9 +358,7 @@ export function createAgyPlugin(host, dependencies = {}) {
                 const input = await context.body.json();
                 if (!input || typeof input !== "object" || Array.isArray(input))
                     return Response.json({ error: { type: "invalid_request_error", message: "请求正文必须是 JSON 对象" } }, { status: 400 });
-                if (context.from !== "responses")
-                    return Response.json({ error: { type: "invalid_request_error", message: "Agy 模型仅支持 Responses API" } }, { status: 400 });
-                return adapter.forward(context.request, input);
+                return adapter.forward(context.request, input, context.to);
             },
             getCatalog: () => adapter.catalog(),
             refreshCatalog: () => adapter.refreshCatalog(),

package/dist/request.d.ts

@@ -1,3 +1,4 @@
+import type { ClientProtocol } from "@agent-proxy/plugin-api";
 /**
  * Codex Responses → Antigravity v1internal generateContent 请求转换。
  *
@@ -25,4 +26,4 @@ export interface AgyTranslatedRequest {
 /** reasoning.effort → Gemini thinkingLevel；unknown 档位映射到最近的低/高档。
  *  档位名同时是多档位家族的上游变体后缀，catalog.ts 复用该映射做 effort → 变体解析。 */
 export declare const THINKING_LEVELS: Record<string, string>;
-export declare function translateAgyRequest(body: Record<string, unknown>, upstreamModel: string): AgyTranslatedRequest;
+export declare function translateAgyRequest(body: Record<string, unknown>, upstreamModel: string, to?: ClientProtocol): AgyTranslatedRequest;

package/dist/request.js

@@ -268,9 +268,215 @@ function translateTools(value) {
         visit(value);
     return { tools, map, dropped };
 }
-export function translateAgyRequest(body, upstreamModel) {
+/**
+ * Chat Completions / Anthropic 源归一化为 Responses 形状的 history 项与参数，
+ * 复用既有 Responses → CloudCodeAssist 构建路径；三种来源共用同一工具身份表。
+ */
+function normalizeSourceItems(body, to) {
+    if (to === "responses")
+        return body;
+    if (to === "gemini") {
+        if (!Array.isArray(body.contents))
+            fail("contents 必须是数组");
+        const items = [];
+        const systemTexts = [];
+        const instruction = body.systemInstruction;
+        if (typeof instruction === "string" && instruction)
+            systemTexts.push(instruction);
+        else if (record(instruction) && Array.isArray(instruction.parts)) {
+            for (const part of instruction.parts) {
+                if (record(part) && typeof part.text === "string" && part.text)
+                    systemTexts.push(part.text);
+            }
+        }
+        let callSeq = 0;
+        const nameToOpenCall = new Map();
+        const idByCallId = new Map();
+        for (const message of body.contents) {
+            if (!record(message) || (message.role !== "user" && message.role !== "model")) {
+                fail("contents 必须是 user/model 角色条目");
+            }
+            for (const raw of Array.isArray(message.parts) ? message.parts : []) {
+                if (!record(raw))
+                    fail("parts 包含非对象块");
+                if (typeof raw.text === "string" && raw.text) {
+                    if (raw.thought === true)
+                        continue; // 思考块不进入 CloudCodeAssist 回放。
+                    items.push({ type: "message", role: message.role === "model" ? "assistant" : "user", content: raw.text });
+                }
+                else if (record(raw.functionCall)) {
+                    const name = typeof raw.functionCall.name === "string" && raw.functionCall.name ? raw.functionCall.name : fail("functionCall.name 必须是非空字符串");
+                    const id = typeof raw.functionCall.id === "string" && raw.functionCall.id ? raw.functionCall.id : `agy_gemini_call_${callSeq++}`;
+                    idByCallId.set(id, id);
+                    if (!(typeof raw.functionCall.id === "string" && raw.functionCall.id))
+                        nameToOpenCall.set(name, id);
+                    items.push({ type: "function_call", call_id: id, name, arguments: JSON.stringify(record(raw.functionCall.args) ? raw.functionCall.args : {}) });
+                }
+                else if (record(raw.functionResponse)) {
+                    const name = typeof raw.functionResponse.name === "string" ? raw.functionResponse.name : "";
+                    let id = typeof raw.functionResponse.id === "string" && raw.functionResponse.id ? raw.functionResponse.id : nameToOpenCall.get(name);
+                    if (!id)
+                        fail(`functionResponse 无法配对到 functionCall（${name || "未命名"}）`);
+                    nameToOpenCall.delete(name);
+                    items.push({ type: "function_call_output", call_id: id, output: JSON.stringify(record(raw.functionResponse.response) ? raw.functionResponse.response : raw.functionResponse.response ?? "") });
+                }
+                else if (record(raw.inlineData) || record(raw.fileData)) {
+                    fail("Antigravity gemini 入口暂不支持图片 parts，请改用 responses/chat/anthropic 入口");
+                }
+                else {
+                    fail("parts 包含不支持的块");
+                }
+            }
+        }
+        return {
+            ...body,
+            instructions: [typeof body.instructions === "string" ? body.instructions : "", ...systemTexts].filter(Boolean).join("\n\n") || undefined,
+            input: items,
+        };
+    }
+    if (to === "chat-completions") {
+        if (!Array.isArray(body.messages))
+            fail("messages 必须是数组");
+        const items = [];
+        for (const raw of body.messages) {
+            if (!record(raw))
+                fail("messages 包含非对象项");
+            if (raw.role === "system" || raw.role === "developer") {
+                items.push({ type: "message", role: raw.role, content: raw.content });
+                continue;
+            }
+            if (raw.role === "tool") {
+                items.push({ type: "function_call_output", call_id: raw.tool_call_id ?? "", output: raw.content });
+                continue;
+            }
+            if (raw.role === "assistant" && Array.isArray(raw.tool_calls)) {
+                if (typeof raw.content === "string" && raw.content)
+                    items.push({ type: "message", role: "assistant", content: raw.content });
+                for (const call of raw.tool_calls) {
+                    if (!record(call) || !record(call.function))
+                        fail("assistant.tool_calls 包含无效调用");
+                    items.push({ type: "function_call", call_id: typeof call.id === "string" ? call.id : "", name: call.function.name ?? "", arguments: typeof call.function.arguments === "string" ? call.function.arguments : JSON.stringify(call.function.arguments ?? {}) });
+                }
+                continue;
+            }
+            if (raw.role === "user" || raw.role === "assistant") {
+                items.push({ type: "message", role: raw.role, content: raw.content });
+                continue;
+            }
+            fail(`不支持的消息 role ${String(raw.role)}`);
+        }
+        const normalized = {
+            ...body,
+            input: items,
+            ...(typeof body.max_tokens === "number" ? { max_output_tokens: body.max_tokens } : typeof body.max_completion_tokens === "number" ? { max_output_tokens: body.max_completion_tokens } : {}),
+        };
+        delete normalized.messages;
+        delete normalized.max_tokens;
+        delete normalized.max_completion_tokens;
+        if (typeof body.reasoning_effort === "string" && body.reasoning === undefined) {
+            normalized.reasoning = { effort: body.reasoning_effort };
+            delete normalized.reasoning_effort;
+        }
+        if (record(body.tool_choice) && body.tool_choice.type === "function" && record(body.tool_choice.function)) {
+            normalized.tool_choice = { type: "function", name: body.tool_choice.function.name };
+        }
+        if (Array.isArray(body.tools)) {
+            normalized.tools = body.tools.map((raw) => {
+                if (record(raw) && raw.type === "function" && record(raw.function)) {
+                    return { type: "function", name: raw.function.name, ...(typeof raw.function.description === "string" ? { description: raw.function.description } : {}), parameters: record(raw.function.parameters) ? raw.function.parameters : { type: "object" } };
+                }
+                return raw;
+            });
+        }
+        return normalized;
+    }
+    // anthropic 源
+    if (!Array.isArray(body.messages))
+        fail("messages 必须是数组");
+    const items = [];
+    for (const raw of body.messages) {
+        if (!record(raw) || !Array.isArray(raw.content))
+            fail("messages 必须是 user/assistant 与内容块数组");
+        const calls = [];
+        const results = [];
+        const parts = [];
+        for (const block of raw.content) {
+            if (!record(block))
+                fail("messages 包含无效内容块");
+            if (block.type === "tool_use") {
+                calls.push({ type: "function_call", call_id: typeof block.id === "string" ? block.id : "", name: typeof block.name === "string" ? block.name : "", arguments: JSON.stringify(block.input ?? {}) });
+            }
+            else if (block.type === "tool_result") {
+                results.push({ type: "function_call_output", call_id: typeof block.tool_use_id === "string" ? block.tool_use_id : "", output: block.content });
+            }
+            else if (block.type === "text" || block.type === "image" || block.type === "thinking") {
+                if (block.type === "text") {
+                    parts.push({ type: "input_text", text: typeof block.text === "string" ? block.text : "" });
+                }
+                else if (block.type === "image") {
+                    const source = record(block.source) ? block.source : undefined;
+                    const url = source && source.type === "url" && typeof source.url === "string"
+                        ? source.url
+                        : `data:${String(source?.media_type ?? "image/png")};base64,${String(source?.data ?? "")}`;
+                    parts.push({ type: "input_image", image_url: url });
+                }
+                else {
+                    parts.push({ type: "input_text", text: `[thinking] ${typeof block.thinking === "string" ? block.thinking : ""}` });
+                }
+            }
+        }
+        if (results.length > 0)
+            items.push(...results);
+        else if (parts.length > 0)
+            items.push({ type: "message", role: raw.role, content: parts });
+        if (calls.length > 0)
+            items.push(...calls);
+    }
+    // Anthropic 的 system（字符串或块数组）语义等同 Responses instructions。
+    let systemInstruction;
+    if (typeof body.system === "string")
+        systemInstruction = body.system;
+    else if (Array.isArray(body.system)) {
+        const texts = [];
+        for (const part of body.system) {
+            if (record(part) && typeof part.text === "string")
+                texts.push(part.text);
+        }
+        if (texts.length > 0)
+            systemInstruction = texts.join("\n\n");
+    }
+    const normalized = {
+        ...body,
+        input: items,
+        ...(systemInstruction !== undefined ? { instructions: systemInstruction } : {}),
+        ...(typeof body.max_tokens === "number" ? { max_output_tokens: body.max_tokens } : {}),
+    };
+    delete normalized.messages;
+    delete normalized.max_tokens;
+    delete normalized.system;
+    if (record(body.tool_choice)) {
+        const choice = body.tool_choice;
+        if (choice.type === "tool" && typeof choice.name === "string")
+            normalized.tool_choice = { type: "function", name: choice.name };
+        else if (choice.type === "any")
+            normalized.tool_choice = "required";
+        else if (choice.type === "auto" || choice.type === "none")
+            normalized.tool_choice = choice.type;
+    }
+    if (Array.isArray(body.tools)) {
+        normalized.tools = body.tools.map((raw) => {
+            if (record(raw) && typeof raw.name === "string") {
+                return { type: "function", name: raw.name, ...(typeof raw.description === "string" ? { description: raw.description } : {}), parameters: record(raw.input_schema) ? raw.input_schema : { type: "object" } };
+            }
+            return raw;
+        });
+    }
+    return normalized;
+}
+export function translateAgyRequest(body, upstreamModel, to = "responses") {
     if (typeof upstreamModel !== "string" || !upstreamModel)
         fail("上游模型不能为空");
+    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 历史");
     }