@agent-proxy/zcode 0.11.3 → 0.12.1

package/dist/response.d.ts

@@ -1,3 +1,4 @@
+import type { ClientProtocol } from "@agent-proxy/plugin-api";
 import { type ZcodeToolMap } from "./wire.ts";
 import { type ZcodeGatewayCall } from "./vision.ts";
 /** 网关代执行工具（analyze_image）的驱动层钩子：执行调用并按需发起上游续跑。 */
@@ -24,4 +25,11 @@ export interface ZcodeResponseOptions {
     /** 声明了网关代执行工具时必须提供；否则吸收到相关调用会让响应失败。 */
     gatewayTools?: ZcodeGatewayToolsHook;
 }
+/**
+ * 四种客户端协议的统一入口：zcode 始终以帧级驱动器合成 Responses 事件（多腿、
+ * server tool 折叠与 thinking 信封都在该层），chat-completions / anthropic / gemini
+ * 客户端由 @agent-proxy/llm-bridge 从同一事件流渲染，语义与 Responses 输出一致。
+ */
+/** to 为路由端点（客户端入口）协议：上游 anthropic → to。 */
+export declare function createZcodeClientResponse(to: ClientProtocol, upstream: Response, options: ZcodeResponseOptions): Promise<Response>;
 export declare function createZcodeResponse(upstream: Response, options: ZcodeResponseOptions): Promise<Response>;

package/dist/response.js

@@ -1,4 +1,4 @@
-import { parseAnthropicStream } from "@agent-proxy/llm-bridge";
+import { createClientResponse } from "@agent-proxy/llm-bridge";
 import { encodeZcodeThinking, isZcodeRecord } from "./wire.js";
 import { gatewayToolCallNarration, gatewayToolResultNarration } from "./vision.js";
 /** z.ai 的服务端搜索按 web_search_prime/search_query 形状返回 query；兼容 Anthropic 标准的 query。 */
@@ -108,29 +108,74 @@ async function* readFrames(reader) {
         }
     }
 }
-/** 库只保存一个工具上下文；按帧补入对应块，使交错的块仍通过库正确归一化。 */
+/**
+ * anthropic 帧级归一化（工具事件抽取）。库的 parseAnthropicStream 只保存一个工具
+ * 上下文，交错块会串扰；这里直接从帧结构提取 tool_call_start/delta 事件，不依赖
+ * npm llm-bridge（桥接包不再转发库原语）。
+ */
 async function normalize(frame, block) {
-    const frames = [];
-    if (block?.source.type === "tool_use" && (frame.type === "content_block_delta" || frame.type === "content_block_stop")) {
-        frames.push({ type: "content_block_start", index: frame.index, content_block: block.source });
+    const events = [];
+    if (frame.type === "message_start") {
+        // 驱动器以事件存在性校验 message_start 的可归一化；保持该合同。
+        return [{ type: "message_start" }];
     }
-    frames.push(frame);
-    const stream = new ReadableStream({
-        start(controller) {
-            controller.enqueue(encoder.encode(frames.map((value) => `event: ${value.type}\ndata: ${JSON.stringify(value)}\n\n`).join("")));
-            controller.close();
-        },
-    });
-    const result = [];
-    let skipContext = frames.length > 1;
-    for await (const value of parseAnthropicStream(stream)) {
-        if (skipContext) {
-            skipContext = false;
-            continue;
+    if (frame.type === "error") {
+        // 错误帧透传原始字段（request_id 等），并把 anthropic 的 type 映射为 code
+        //（驱动器按 code 生成 failed 终态的错误标识）。
+        const original = record(frame.error, "error");
+        return [{ type: "error", error: { ...original, ...(original.code === undefined && typeof original.type === "string" ? { code: original.type } : {}) } }];
+    }
+    if (frame.type === "content_block_start") {
+        const source = record(frame.content_block, "content_block");
+        if (source.type === "tool_use") {
+            events.push({ type: "tool_call_start", tool_call: { id: source.id ?? "", name: source.name ?? "" } });
+        }
+        return events;
+    }
+    if (frame.type === "content_block_delta") {
+        const delta = record(frame.delta, "delta");
+        if (block?.source.type === "tool_use") {
+            if (delta.type === "input_json_delta" && typeof delta.partial_json === "string") {
+                events.push({ type: "tool_call_delta", tool_call: { id: block.source.id ?? "", arguments_delta: delta.partial_json } });
+            }
+            return events;
+        }
+        // 文本/思考增量保持 content_delta 事件形状，驱动器按块类型取对应字段。
+        if (delta.type === "text_delta" && typeof delta.text === "string") {
+            events.push({ type: "content_delta", delta: { text: delta.text } });
+        }
+        else if (delta.type === "thinking_delta" && typeof delta.thinking === "string") {
+            events.push({ type: "content_delta", delta: { thinking: delta.thinking } });
         }
-        result.push(value);
+        return events;
     }
-    return result;
+    if (frame.type === "content_block_stop" && block?.source.type === "tool_use") {
+        events.push({ type: "tool_call_end", tool_call: { id: block.source.id ?? "" } });
+        return events;
+    }
+    return events;
+}
+/**
+ * 四种客户端协议的统一入口：zcode 始终以帧级驱动器合成 Responses 事件（多腿、
+ * server tool 折叠与 thinking 信封都在该层），chat-completions / anthropic / gemini
+ * 客户端由 @agent-proxy/llm-bridge 从同一事件流渲染，语义与 Responses 输出一致。
+ */
+/** to 为路由端点（客户端入口）协议：上游 anthropic → to。 */
+export async function createZcodeClientResponse(to, upstream, options) {
+    const responsesOutput = await createZcodeResponse(upstream, options);
+    if (to === "responses")
+        return responsesOutput;
+    const result = await createClientResponse(to, responsesOutput, {
+        upstreamProtocol: "responses",
+        model: options.model,
+        stream: options.stream,
+        signal: options.signal,
+        abort: options.abort,
+        onChunk: options.onChunk,
+        sanitizeError: options.sanitizeError,
+        // Responses 输出已由 zcode 驱动器还原原始工具名，无需再做身份映射。
+    });
+    return result.response;
 }
 export async function createZcodeResponse(upstream, options) {
     let reader = upstream.body?.getReader();

package/dist/wire.d.ts

@@ -1,8 +1,6 @@
+import type { ToolIdentity } from "@agent-proxy/llm-bridge";
 /** ZCode 协议共享类型；元数据不包含授权凭据。 */
-export interface ZcodeToolDefinition {
-    name: string;
-    custom: boolean;
-    namespace?: string;
+export interface ZcodeToolDefinition extends ToolIdentity {
     /** 网关代执行标记：该工具由网关在上游续跑中执行并吸收，不回传客户端。 */
     gateway?: "analyze_image";
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-proxy/zcode",
-  "version": "0.11.3",
+  "version": "0.12.1",
   "description": "Agent Proxy zcode 插件；保留基线转换行为。",
   "type": "module",
   "exports": {
@@ -34,11 +34,11 @@
     "url": "git+https://github.com/aceHubert/codex-cliproxy-gateway.git"
   },
   "devDependencies": {
-    "@agent-proxy/models": "0.11.1"
+    "@agent-proxy/models": "0.12.1"
   },
   "dependencies": {
-    "@agent-proxy/llm-bridge": "0.11.1",
-    "@agent-proxy/plugin-api": "0.11.1"
+    "@agent-proxy/llm-bridge": "0.12.1",
+    "@agent-proxy/plugin-api": "0.12.1"
   },
-  "gitHead": "37235103f935530274005fa391dba83abe522888"
+  "gitHead": "50a77d2e514a6237b097361fd4eb794acaa582d5"
 }