@agent-proxy/zcode 0.20.0 → 0.20.2

package/dist/catalog.d.ts

@@ -13,7 +13,12 @@ export declare function zcodeAPIProviderIDFromModel(model: string): string | und
 export declare function zcodeUpstreamModel(model: string, snapshot: ZcodeProviderSnapshot): string | undefined;
 /**
  * 仅由模型包的厂商预设合成全量裸 ID 目录。纯内存计算，
- * 重建成本与模型条数同级，不需要磁盘缓存，也不携带任何套餐或授权信息。
+ * 重建成本与模型条数同级，不需要磁盘缓存，不携带任何套餐或授权信息。
+ * 合成策略与其余 agent 插件（agy/qoder/zen/codebuddy）一致：以 Codex 基线整包
+ * 克隆为底座，厂商预设作为自定义替换层逐字段覆盖——tool_mode、multi_agent_version、
+ * use_responses_lite 等 Codex 行为字段默认继承基线（客户端据此组装 additional_tools
+ * 与全量 MCP 工具集），z.ai 预设声明真实能力（context_window、reasoning 档位）并以
+ * 空值中和不适用的基线字段（base_instructions 置空、experimental_supported_tools 清空）。
  */
 export declare function buildZcodeVendorCatalog(): ModelCatalog;
 /** /models 只按快照套餐的支持集合筛选并加套餐作用域前缀，不重新合成厂商元数据。 */

package/dist/catalog.js

@@ -1,7 +1,6 @@
 import fs from "node:fs";
 import { createHash } from "node:crypto";
-import { getVendorModelPresets } from "./resources/models.js";
-import { compileModelOverrides, synthesizeModelEntry } from "@agent-proxy/plugin-api";
+import { getCodexBaselineEntry, getVendorModelPresets } from "./resources/models.js";
 import { atomicWrite } from "@agent-proxy/plugin-api";
 const vendorModelIds = () => (getVendorModelPresets()["z.ai"] ?? []).map((model) => model.name);
 /** 旧版单 API Key 命名空间；新版多 Key 目录不再生成该前缀。 */
@@ -84,24 +83,30 @@ function stripZcodeChannelLabel(name) {
 }
 /**
  * 仅由模型包的厂商预设合成全量裸 ID 目录。纯内存计算，
- * 重建成本与模型条数同级，不需要磁盘缓存，也不携带任何套餐或授权信息。
+ * 重建成本与模型条数同级，不需要磁盘缓存，不携带任何套餐或授权信息。
+ * 合成策略与其余 agent 插件（agy/qoder/zen/codebuddy）一致：以 Codex 基线整包
+ * 克隆为底座，厂商预设作为自定义替换层逐字段覆盖——tool_mode、multi_agent_version、
+ * use_responses_lite 等 Codex 行为字段默认继承基线（客户端据此组装 additional_tools
+ * 与全量 MCP 工具集），z.ai 预设声明真实能力（context_window、reasoning 档位）并以
+ * 空值中和不适用的基线字段（base_instructions 置空、experimental_supported_tools 清空）。
  */
 export function buildZcodeVendorCatalog() {
-    const vendorModels = getVendorModelPresets();
-    const modelIds = (vendorModels["z.ai"] ?? []).map((model) => model.name);
-    const vendors = compileModelOverrides(vendorModels, "vendor_models.json");
-    const preset = { models: modelIds.map((id, index) => synthesizeModelEntry(`z.ai/${id}`, index, { models: [] }, vendors)) };
-    return { models: preset.models.map((entry) => {
-            const slug = entry.slug.slice("z.ai/".length);
-            return {
-                ...entry,
-                slug,
-                display_name: entry.display_name ?? slug,
-                prefer_websockets: false,
-                // zcode 链路已把 Responses web_search 原生映射为 web_search_20250305（实测 z.ai 支持）。
-                supports_search_tool: true,
-            };
-        }) };
+    const presets = getVendorModelPresets()["z.ai"] ?? [];
+    const base = getCodexBaselineEntry();
+    const models = presets.map((preset, index) => {
+        const { name, display_name, ...overrides } = preset;
+        const entry = { ...structuredClone(base), ...overrides };
+        entry.slug = name;
+        entry.display_name = typeof display_name === "string" && display_name ? display_name : name;
+        entry.priority = index;
+        return entry;
+    });
+    return { models: models.map((entry) => ({
+            ...entry,
+            prefer_websockets: false,
+            // zcode 链路已把 Responses web_search 原生映射为 web_search_20250305（实测 z.ai 支持）。
+            supports_search_tool: true,
+        })) };
 }
 /** /models 只按快照套餐的支持集合筛选并加套餐作用域前缀，不重新合成厂商元数据。 */
 export function createZcodeCatalog(snapshot, cached) {

package/dist/index.js

@@ -13,6 +13,7 @@ import { clientSigningVerifyRejection, ZcodeClientSigning } from "./client-signi
 import { isZcodeRecord } from "./wire.js";
 import { buildZcodeModelHeaders, createZcodeContexts, decorateZcodeBody, readZcodeIdentity, zcodePlan } from "./request-context.js";
 import { createStartPlanFetch, dressZcodeStartPlanBody, startPlanUpstreamUrl, zcodeStartPlanRefusalHint } from "./start-plan-request.js";
+import { zcodeStartPlanEntitledFromLog } from "./plans.js";
 import { localTime, logExchange, logGroupFromPath, requestLogDir } from "@agent-proxy/plugin-api";
 import { logGatewayError, logRequestSummary } from "@agent-proxy/plugin-api";
 export function validateZcodeConfig(config) {
@@ -71,19 +72,33 @@ function buildZcodeAdapter(config, dependencies = {}) {
     ];
     const identity = dependencies.identity ?? readZcodeIdentity(home);
     let synchronizeAPIKeyRoutes = () => { };
+    /** 上次发布时的 Start Plan 门禁结果；undefined（无日志信号）不参与变化判定。 */
+    let publishedStartPlanGate;
     const republishFromPlans = (force = false) => {
         const current = planRoutes.map((route) => route.snapshot);
         const previous = publishedSnapshots;
+        // Start Plan 权益由 ZCode 宿主日志判定：无记录为 undefined（不拦截发布，沿用上游
+        // 405/3012 兜底）；快照不变而门禁翻转（计划开始/结束）同样要重投影，让 get 路径
+        // 也能即时增删免费档条目。
+        const startPlanSnapshot = planRoutes.find((route) => route.plan === "start-plan")?.snapshot;
+        const startPlanGate = startPlanSnapshot
+            ? zcodeStartPlanEntitledFromLog(home, startPlanSnapshot.family)
+            : undefined;
         if (!force && previous && current.length === previous.length
-            && current.every((snapshot, index) => snapshot === previous[index]))
+            && current.every((snapshot, index) => snapshot === previous[index])
+            && startPlanGate === publishedStartPlanGate)
             return;
         publishedSnapshots = current;
+        publishedStartPlanGate = startPlanGate;
         // 各可用套餐目录的并集：单套餐失效只撤下自己的条目，其余套餐继续可选。
         const models = [];
         const seen = new Set();
         for (const route of planRoutes) {
             if (!route.snapshot)
                 continue;
+            // 日志判定无权益：撤下免费档条目；会话点名已撤模型仍由上游 405/3012 拒绝。
+            if (route.plan === "start-plan" && startPlanGate === false)
+                continue;
             for (const entry of createZcodeCatalog(route.snapshot, vendorCatalog).models) {
                 const slug = entry.slug.toLowerCase();
                 if (seen.has(slug))

package/dist/plans.d.ts

@@ -17,3 +17,17 @@ export declare function isZcodeStartPlanIdentity(planId: unknown, name: unknown)
 export declare function parseZcodeBillingPlans(value: unknown): ZcodeBillingPlanModels[];
 /** 汇总多个有效套餐的模型能力，按模型 ID 大小写不敏感去重。 */
 export declare function mergeZcodeBillingModelIds(plans: readonly ZcodeBillingPlanModels[]): string[];
+/**
+ * 读取 `~/.zcode/v2/logs/<当天>.log` 尾部最后一条 Start Plan 的 billing/balance 响应。
+ * ZCode 宿主进程周期性拉取 billing 并把完整 payload 落盘（权威的权益判定结果，与
+ * LocalQuotaBar 同源），这里只消费该公开元数据，不触碰凭据。返回 undefined 表示当天
+ * 无可用信号（宿主未运行、日志缺失或尾部窗口内无匹配行），调用方应保持现状。
+ */
+export declare function latestZcodeStartPlanBillingPayload(home: string, family: string): unknown;
+/**
+ * 由宿主日志判定 Start Plan 当前是否仍有有效权益实例：
+ * - 记录存在且能解析出 active 且带模型能力的计划 → true（发布免费档目录）；
+ * - 记录存在但解析为空（计划到期后宿主拉到空 plans/balances）→ false（撤下条目）；
+ * - 无记录（undefined）→ 不干预，沿用「条目常驻、上游 405/3012 拒绝」的现状。
+ */
+export declare function zcodeStartPlanEntitledFromLog(home: string, family: string): boolean | undefined;

package/dist/plans.js

@@ -1,3 +1,5 @@
+import fs from "node:fs";
+import path from "node:path";
 /** ZCode 客户端用于把 billing 计划归入 Start Plan 的字符串规则。 */
 export function isZcodeStartPlanIdentity(planId, name) {
     const id = typeof planId === "string" ? planId.trim().toLowerCase() : "";
@@ -72,3 +74,90 @@ export function mergeZcodeBillingModelIds(plans) {
         }
     return result;
 }
+/**
+ * 宿主日志尾部扫描窗口：ZCode 宿主分钟级追加 billing 记录，1MB 覆盖全天记录量；
+ * 窗口外更早的记录不参与判定（视为无信号，保持现状）。有界读取，避免整文件扫描。
+ */
+const HOST_LOG_TAIL_BYTES = 1024 * 1024;
+/** 当天日志文件名（宿主按本地时区日期滚动，与 LocalQuotaBar 实证路径一致）。 */
+function hostLogFileName(date = new Date()) {
+    return `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, "0")}-${String(date.getDate()).padStart(2, "0")}.log`;
+}
+/** 只读文件尾部；返回文本与是否发生截断，文件缺失或不可读返回 undefined。 */
+function readFileTail(file, bytes) {
+    try {
+        const stat = fs.statSync(file);
+        if (!stat.isFile() || stat.size === 0)
+            return undefined;
+        const length = Math.min(stat.size, bytes);
+        const buffer = Buffer.alloc(length);
+        const fd = fs.openSync(file, "r");
+        try {
+            fs.readSync(fd, buffer, 0, length, stat.size - length);
+        }
+        finally {
+            fs.closeSync(fd);
+        }
+        return { text: buffer.toString("utf8"), truncated: length < stat.size };
+    }
+    catch {
+        return undefined;
+    }
+}
+/** 宿主日志里 Start Plan 记录的 providerId 形态：builtin:<family>-start-plan 或 account:<family>-start-plan。 */
+function isStartPlanLogProviderID(providerID, family) {
+    if (typeof providerID !== "string")
+        return false;
+    const lowered = providerID.trim().toLowerCase();
+    return lowered === `builtin:${family}-start-plan` || lowered === `account:${family}-start-plan`;
+}
+/**
+ * 读取 `~/.zcode/v2/logs/<当天>.log` 尾部最后一条 Start Plan 的 billing/balance 响应。
+ * ZCode 宿主进程周期性拉取 billing 并把完整 payload 落盘（权威的权益判定结果，与
+ * LocalQuotaBar 同源），这里只消费该公开元数据，不触碰凭据。返回 undefined 表示当天
+ * 无可用信号（宿主未运行、日志缺失或尾部窗口内无匹配行），调用方应保持现状。
+ */
+export function latestZcodeStartPlanBillingPayload(home, family) {
+    const tail = readFileTail(path.join(home, "v2", "logs", hostLogFileName()), HOST_LOG_TAIL_BYTES);
+    if (!tail)
+        return undefined;
+    const lines = tail.text.split("\n");
+    // 窗口截断时首行必是被拦腰截断的半行，丢弃；其余行倒序找最新记录。
+    for (let index = lines.length - 1; index >= (tail.truncated ? 1 : 0); index--) {
+        const line = lines[index];
+        const marker = line.indexOf("billing/balance");
+        if (marker < 0)
+            continue;
+        const body = line.indexOf("{", marker);
+        if (body < 0)
+            continue;
+        let record;
+        try {
+            record = JSON.parse(line.slice(body));
+        }
+        catch {
+            continue;
+        }
+        if (!record || typeof record !== "object" || Array.isArray(record))
+            continue;
+        const fields = record;
+        if (!isStartPlanLogProviderID(fields.providerId, family))
+            continue;
+        if (fields.payload === undefined || fields.payload === null)
+            continue;
+        return fields.payload;
+    }
+    return undefined;
+}
+/**
+ * 由宿主日志判定 Start Plan 当前是否仍有有效权益实例：
+ * - 记录存在且能解析出 active 且带模型能力的计划 → true（发布免费档目录）；
+ * - 记录存在但解析为空（计划到期后宿主拉到空 plans/balances）→ false（撤下条目）；
+ * - 无记录（undefined）→ 不干预，沿用「条目常驻、上游 405/3012 拒绝」的现状。
+ */
+export function zcodeStartPlanEntitledFromLog(home, family) {
+    const payload = latestZcodeStartPlanBillingPayload(home, family);
+    if (payload === undefined)
+        return undefined;
+    return parseZcodeBillingPlans(payload).length > 0;
+}

package/dist/resources/models.js

@@ -5871,7 +5871,6 @@ var vendor_models_default = {
       max_context_window: 1048576,
       effective_context_window_percent: 95,
       supports_parallel_tool_calls: true,
-      experimental_supported_tools: [],
       input_modalities: ["text", "image"]
     },
     {
@@ -5910,7 +5909,6 @@ var vendor_models_default = {
       max_context_window: 1048576,
       effective_context_window_percent: 95,
       supports_parallel_tool_calls: true,
-      experimental_supported_tools: [],
       input_modalities: ["text", "image"]
     },
     {
@@ -5949,7 +5947,6 @@ var vendor_models_default = {
       max_context_window: 1048576,
       effective_context_window_percent: 95,
       supports_parallel_tool_calls: true,
-      experimental_supported_tools: [],
       input_modalities: ["text", "image"]
     },
     {
@@ -5975,7 +5972,6 @@ var vendor_models_default = {
       max_context_window: 204800,
       effective_context_window_percent: 95,
       supports_parallel_tool_calls: true,
-      experimental_supported_tools: [],
       input_modalities: ["text"]
     }
   ],

package/package.json

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