@agent-proxy/zcode 0.11.3 → 0.12.1

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import type { HostServices, GatewayPlugin } from "@agent-proxy/plugin-api";
+import type { HostServices, GatewayPlugin, ClientProtocol } from "@agent-proxy/plugin-api";
 import type { ZcodeConfigCache, ZcodeSelection } from "./config.ts";
 import { ZcodeEndpointRouting } from "./endpoint-routing.ts";
 import { ZcodeClientSigning } from "./client-signing.ts";
@@ -32,15 +32,13 @@ export interface ZcodeDependencies {
 export type GatewayHandler = ((request: Request) => Promise<Response>) & {
     close(): void;
 };
-/** 插件启停仅由 ZCode 开关决定，default 上游路由策略不参与。 */
-export declare function zcodeEnabled<Config extends AgentConfig>(config: Config): boolean;
-export declare function validateZcodeConfig<Config extends AgentConfig>(config: Config): void;
+export declare function validateZcodeConfig(config: AgentConfig): void;
 export declare function zcodeError(status: number, message: string, type?: string): Response;
-export declare function createZcodeAdapter<Config extends AgentConfig>(config: Config, dependencies?: ZcodeDependencies): {
+export declare function createZcodeAdapter(config: AgentConfig, dependencies?: ZcodeDependencies): {
     catalog(): Promise<ModelCatalog>;
     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 ZCODE_MODEL_PATTERNS: readonly string[];

package/dist/index.js

@@ -6,7 +6,7 @@ import { createZcodeConfigCache, readZcodeAPIKeyProviders, zcodeConfigPresent, Z
 import { clearModelsCacheEntries, invalidateModelsCache, withAgentSystemPrompt } from "@agent-proxy/plugin-api";
 import { buildZcodeVendorCatalog, createZcodeCatalog, isZcodeModel, writeZcodeServedCatalog, zcodeAPIProviderIDFromModel, zcodeModelPlan, zcodeUpstreamModel, } from "./catalog.js";
 import { translateZcodeRequest, ZcodeRequestError } from "./request.js";
-import { createZcodeResponse } from "./response.js";
+import { createZcodeClientResponse } from "./response.js";
 import { executeZcodeAnalyzeImage, matchZcodeAnalyzeImage } from "./vision.js";
 import { ZcodeEndpointRouting } from "./endpoint-routing.js";
 import { clientSigningVerifyRejection, ZcodeClientSigning } from "./client-signing.js";
@@ -14,37 +14,22 @@ import { isZcodeRecord } from "./wire.js";
 import { buildZcodeModelHeaders, createZcodeContexts, decorateZcodeBody, readZcodeIdentity, zcodePlan, ZCODE_AGENT_SYSTEM_PROMPT } from "./request-context.js";
 import { localTime, logExchange, logGroupFromPath, requestLogDir } from "@agent-proxy/plugin-api";
 import { logGatewayError, logRequestSummary } from "@agent-proxy/plugin-api";
-/** 插件启停仅由 ZCode 开关决定，default 上游路由策略不参与。 */
-export function zcodeEnabled(config) {
-    return config.zcode === undefined || config.zcode === true;
-}
 export function validateZcodeConfig(config) {
-    if (config.zcode !== undefined && typeof config.zcode !== "boolean")
-        throw new Error("zcode 必须为 boolean");
-    if (!zcodeEnabled(config))
-        return;
     const host = config.host;
     if (!(host === "localhost" || host === "::1" || host === "[::1]" || (isIP(host) === 4 && host.startsWith("127.")))) {
         throw new Error("启用 ZCode 时网关只能监听环回地址");
     }
-    if (config.prefix && ("zcode/".startsWith(config.prefix) || config.prefix.startsWith("zcode/")
-        || config.prefix.startsWith("zcode-"))) {
-        throw new Error("启用 ZCode 时 zcode/ 与 zcode- 前缀保留给 ZCode，请调整第三方 prefix");
-    }
 }
 export function zcodeError(status, message, type = "invalid_request_error") {
     return Response.json({ error: { type, message } }, { status });
 }
 function buildZcodeAdapter(config, dependencies = {}) {
     validateZcodeConfig(config);
-    const enabled = zcodeEnabled(config);
     const manual = dependencies.catalogMode === "manual";
     // 自管目录文件一律放运行主目录，不从 catalogPath 位置倒推。
     const cacheDirectory = dependencies.cacheDirectory ?? resolvePaths().runtimeHome;
     // 厂商元数据只取模型包预设；账号或套餐刷新仅重新投影支持集合。
-    const vendorCatalog = enabled
-        ? buildZcodeVendorCatalog()
-        : undefined;
+    const vendorCatalog = buildZcodeVendorCatalog();
     /** 套餐或选择变化时立即撤下 Codex 缓存里的旧 ZCode 条目，避免旧套餐模型继续可选。 */
     const dropCachedZcodeModels = () => {
         if (dependencies.codexModelsCacheFile) {
@@ -84,8 +69,6 @@ function buildZcodeAdapter(config, dependencies = {}) {
     ];
     let synchronizeAPIKeyRoutes = () => { };
     const republishFromPlans = (force = false) => {
-        if (!vendorCatalog)
-            return;
         const current = planRoutes.map((route) => route.snapshot);
         const previous = publishedSnapshots;
         if (!force && previous && current.length === previous.length
@@ -108,121 +91,119 @@ function buildZcodeAdapter(config, dependencies = {}) {
         }
         publishServedCatalog({ models });
     };
-    if (enabled) {
-        // 注入模式（测试）只为显式给出的套餐建缓存，避免读到真实的 ~/.zcode。
-        const injected = dependencies.planCaches
-            ?? (dependencies.apiKeyCaches ? {} : dependencies.configCache ? { "api-key": dependencies.configCache } : undefined);
-        for (const route of planRoutes) {
-            route.cache = injected?.[route.plan]
-                ?? (injected ? undefined : createZcodeConfigCache(home, {
-                    plan: route.plan,
-                    refreshOnStart: false,
-                    // 选择变化只撤下本套餐的快照并重发并集；另一个套餐的条目不受影响。
-                    onSelectionChange: () => {
-                        if (manual)
-                            return;
-                        route.snapshot = undefined;
-                        republishFromPlans();
-                    },
-                    onSnapshotChange: (snapshot) => {
-                        if (manual)
-                            return;
-                        route.snapshot = snapshot;
-                        republishFromPlans();
-                    },
-                }));
+    // 注入模式（测试）只为显式给出的套餐建缓存，避免读到真实的 ~/.zcode。
+    const injected = dependencies.planCaches
+        ?? (dependencies.apiKeyCaches ? {} : dependencies.configCache ? { "api-key": dependencies.configCache } : undefined);
+    for (const route of planRoutes) {
+        route.cache = injected?.[route.plan]
+            ?? (injected ? undefined : createZcodeConfigCache(home, {
+                plan: route.plan,
+                refreshOnStart: false,
+                // 选择变化只撤下本套餐的快照并重发并集；另一个套餐的条目不受影响。
+                onSelectionChange: () => {
+                    if (manual)
+                        return;
+                    route.snapshot = undefined;
+                    republishFromPlans();
+                },
+                onSnapshotChange: (snapshot) => {
+                    if (manual)
+                        return;
+                    route.snapshot = snapshot;
+                    republishFromPlans();
+                },
+            }));
+    }
+    if (injected) {
+        const apiCaches = dependencies.apiKeyCaches
+            ?? (dependencies.planCaches?.["api-key"] || dependencies.configCache
+                ? { current: dependencies.planCaches?.["api-key"] ?? dependencies.configCache }
+                : {});
+        for (const [apiProviderID, cache] of Object.entries(apiCaches)) {
+            planRoutes.push({ plan: "api-key", ...(apiProviderID === "current" ? {} : { apiProviderID }), cache });
         }
-        if (injected) {
-            const apiCaches = dependencies.apiKeyCaches
-                ?? (dependencies.planCaches?.["api-key"] || dependencies.configCache
-                    ? { current: dependencies.planCaches?.["api-key"] ?? dependencies.configCache }
-                    : {});
-            for (const [apiProviderID, cache] of Object.entries(apiCaches)) {
-                planRoutes.push({ plan: "api-key", ...(apiProviderID === "current" ? {} : { apiProviderID }), cache });
+    }
+    else {
+        const createAPIRoute = (provider) => {
+            const route = { plan: "api-key", apiProviderID: provider.providerID };
+            route.cache = createZcodeConfigCache(home, {
+                plan: "api-key",
+                apiProviderID: provider.providerID,
+                refreshOnStart: false,
+                onSelectionChange: () => {
+                    if (manual)
+                        return;
+                    route.snapshot = undefined;
+                    republishFromPlans();
+                },
+                onSnapshotChange: (snapshot) => {
+                    if (manual)
+                        return;
+                    route.snapshot = snapshot;
+                    republishFromPlans();
+                },
+            });
+            return route;
+        };
+        const synchronize = (republish = true, strict = false) => {
+            let providers = [];
+            try {
+                providers = readZcodeAPIKeyProviders(home);
             }
-        }
-        else {
-            const createAPIRoute = (provider) => {
-                const route = { plan: "api-key", apiProviderID: provider.providerID };
-                route.cache = createZcodeConfigCache(home, {
-                    plan: "api-key",
-                    apiProviderID: provider.providerID,
-                    refreshOnStart: false,
-                    onSelectionChange: () => {
-                        if (manual)
-                            return;
-                        route.snapshot = undefined;
-                        republishFromPlans();
-                    },
-                    onSnapshotChange: (snapshot) => {
-                        if (manual)
-                            return;
-                        route.snapshot = snapshot;
-                        republishFromPlans();
-                    },
-                });
-                return route;
-            };
-            const synchronize = (republish = true, strict = false) => {
-                let providers = [];
-                try {
-                    providers = readZcodeAPIKeyProviders(home);
-                }
-                catch (error) {
-                    if (strict)
-                        throw error;
-                    /* 动态目录撤下无效 API Key；套餐路由不受影响。 */
-                }
-                const targetIDs = new Set(providers.map((provider) => provider.providerID));
-                let changed = false;
-                const removed = planRoutes.filter((route) => route.plan === "api-key" && route.apiProviderID && !targetIDs.has(route.apiProviderID));
-                for (const route of removed)
-                    route.cache?.close();
-                if (removed.length) {
-                    for (let index = planRoutes.length - 1; index >= 0; index--) {
-                        if (removed.includes(planRoutes[index]))
-                            planRoutes.splice(index, 1);
-                    }
-                    changed = true;
-                }
-                for (const provider of providers) {
-                    if (planRoutes.some((route) => route.plan === "api-key" && route.apiProviderID === provider.providerID))
-                        continue;
-                    planRoutes.push(createAPIRoute(provider));
-                    changed = true;
+            catch (error) {
+                if (strict)
+                    throw error;
+                /* 动态目录撤下无效 API Key；套餐路由不受影响。 */
+            }
+            const targetIDs = new Set(providers.map((provider) => provider.providerID));
+            let changed = false;
+            const removed = planRoutes.filter((route) => route.plan === "api-key" && route.apiProviderID && !targetIDs.has(route.apiProviderID));
+            for (const route of removed)
+                route.cache?.close();
+            if (removed.length) {
+                for (let index = planRoutes.length - 1; index >= 0; index--) {
+                    if (removed.includes(planRoutes[index]))
+                        planRoutes.splice(index, 1);
                 }
-                if (changed && republish)
-                    republishFromPlans();
-            };
-            synchronizeAPIKeyRoutes = (strict) => synchronize(!manual, strict);
-            synchronize(false);
-            // /models 与未知 API 前缀请求都会重新同步，支持新增/删除 provider；现有
-            // provider 的 Key 与模型变化由各自 cache 的 provider_config watcher 驱动。
-        }
+                changed = true;
+            }
+            for (const provider of providers) {
+                if (planRoutes.some((route) => route.plan === "api-key" && route.apiProviderID === provider.providerID))
+                    continue;
+                planRoutes.push(createAPIRoute(provider));
+                changed = true;
+            }
+            if (changed && republish)
+                republishFromPlans();
+        };
+        synchronizeAPIKeyRoutes = (strict) => synchronize(!manual, strict);
+        synchronize(false);
+        // /models 与未知 API 前缀请求都会重新同步，支持新增/删除 provider；现有
+        // provider 的 Key 与模型变化由各自 cache 的 provider_config watcher 驱动。
     }
     const fetchUpstream = dependencies.fetch ?? ((url, init) => fetch(url, init));
     const activeRequests = new Set();
-    const identity = enabled ? dependencies.identity ?? readZcodeIdentity() : undefined;
-    const endpointRouting = enabled && dependencies.endpointRouting !== null
+    const identity = dependencies.identity ?? readZcodeIdentity();
+    const endpointRouting = dependencies.endpointRouting !== null
         ? dependencies.endpointRouting ?? new ZcodeEndpointRouting({
-            identity: identity,
+            identity,
             fetch: (url, init) => fetchUpstream(url, init),
         })
         : undefined;
     // coding plan 官方客户端签名：逐请求补 X-Client-* 签名头；fail-open，失败按未签名继续。
-    const clientSigning = enabled && dependencies.clientSigning !== null
+    const clientSigning = dependencies.clientSigning !== null
         ? dependencies.clientSigning ?? new ZcodeClientSigning({ fetch: (url, init) => fetchUpstream(url, init) })
         : undefined;
     const contexts = createZcodeContexts();
     const sink = config.requestLogging === true ? {
-        dir: requestLogDir(config),
+        dir: requestLogDir(),
         maxLogs: Math.max(0, Math.trunc(config.maxRequestLogs ?? 0)),
         processLog: dependencies.processLog,
     } : undefined;
     let closed = false;
     let refreshPromise;
     const readCatalog = async (mode) => {
-        if (closed || !enabled)
+        if (closed)
             return { models: [] };
         synchronizeAPIKeyRoutes(manual && mode !== "get");
         const neverPublished = publishedSnapshots === undefined;
@@ -279,7 +260,7 @@ function buildZcodeAdapter(config, dependencies = {}) {
         return promise;
     };
     /** 启动首读仍允许凭据授权，手动策略仅停止后续目录自动发布。 */
-    const startup = enabled && vendorCatalog && dependencies.refreshCatalogOnStart !== false
+    const startup = dependencies.refreshCatalogOnStart !== false
         ? refreshCatalog() : Promise.resolve({ models: [] });
     // 构造适配器与等待 modelsReady 之间允许异步间隙；失败由公开目录接口传递。
     void startup.catch(() => { });
@@ -297,7 +278,7 @@ function buildZcodeAdapter(config, dependencies = {}) {
                 await refreshPromise;
             return readCatalog("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);
@@ -426,7 +407,7 @@ function buildZcodeAdapter(config, dependencies = {}) {
                     cleanup();
                     return fail(404, "此模型不属于 ZCode 当前套餐或厂商目录");
                 }
-                const translated = translateZcodeRequest(input, model);
+                const translated = await translateZcodeRequest(input, model, to);
                 const baseUpstreamUrl = `${snapshot.baseURL}${snapshot.baseURL.endsWith("/v1") ? "/messages" : "/v1/messages"}`;
                 const routedUrl = endpointRouting
                     // 跟随 z.ai 服务端下发的端点映射（如 zcode.z.ai ultra 中转）；resolve 内部 fail-open，失败保持原 URL。
@@ -562,7 +543,7 @@ function buildZcodeAdapter(config, dependencies = {}) {
                 }
                 let chunks = "";
                 const stream = !mapResult && input.stream === true;
-                const response = await createZcodeResponse(upstream, {
+                const response = await createZcodeClientResponse(to, upstream, {
                     model: String(input.model), tools: translated.tools, stream, signal: abort.signal,
                     gatewayTools,
                     sanitizeError: (error) => ({
@@ -637,9 +618,7 @@ export function createZcodePlugin(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: "Zcode 模型仅支持 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,5 +1,16 @@
+import type { ClientProtocol } from "@agent-proxy/plugin-api";
 import type { ZcodeTranslatedRequest } from "./wire.ts";
+/**
+ * ZCode 请求准备：标准消息/工具/参数统一经 @agent-proxy/llm-bridge 的
+ * convertRequest(to, "anthropic")；z.ai 私有形状（web_search_20250305 服务端工具、
+ * thinking 预算表、zcode-thinking 信封回放、analyze_image 代执行）作为插件前后处理。
+ *
+ * Responses 源的私有 history 项（reasoning / web_search_call / 其它服务器调用）不能
+ * 进标准转换：按项把 input 切成「标准段 + 私有项」，标准段逐段调用公共入口，私有段
+ * 由本模块转换，最后按 main 的同角色合并语义拼装。
+ */
 export declare class ZcodeRequestError extends Error {
     constructor(message: string);
 }
-export declare function translateZcodeRequest(body: Record<string, unknown>, upstreamModel: string): ZcodeTranslatedRequest;
+/** to 为路由端点（客户端入口）协议：请求方向 to → anthropic，响应方向 anthropic → to。 */
+export declare function translateZcodeRequest(body: Record<string, unknown>, upstreamModel: string, to?: ClientProtocol): Promise<ZcodeTranslatedRequest>;