mslxdff 0.1.203 → 0.1.207

package/src/providers/zcode/index.js

@@ -1,124 +1,124 @@
-// zcode 供应商工厂：keyring 多号轮换 + 差异化冷却（auth/限流/服务端=短冷却、1005=长冷却、3007/参数=不冷却）。
-import { compatFetch } from "../../compat.js";
-import { envInt } from "../base.js";
-import { createKeyRing } from "../keyring.js";
-import { loadProviderKeys } from "../../state.js";
-import { createModelsService } from "./models.js";
-import { forwardZcodeChat } from "./chat.js";
-import { fetchZcodeBalance } from "./quota.js";
-import { listZcodeAccountDocs } from "./account-store.js";
-
-// 冷却策略：auth/限流/服务端/网络=短冷却；quota=长冷却（按日重置）；security/param/unknown=不冷却（换号无意义）
-const COOLDOWN_BY_KIND = { auth: "short", rate_limit: "short", server: "short", network: "short", quota: "long" };
-
-function notLoggedInResponse() {
-  return new Response(
-    JSON.stringify({ error: { message: "zcode: 无可用账号 —— 先运行 mslxdff -provider zcode login", type: "auth_error" } }),
-    { status: 401, headers: { "Content-Type": "application/json" } },
-  );
-}
-
-function allCoolingResponse() {
-  return new Response(
-    JSON.stringify({ error: { message: "zcode: 账号暂不可用（冷却中，可能额度用尽或限流），请稍后重试", type: "all_cooling" } }),
-    { status: 429, headers: { "Content-Type": "application/json", "x-mslxdff-zcode-all-cooling": "1" } },
-  );
-}
-
-export function createZcodeProvider({
-  id = "zcode",
-  apiKeys,
-  file,
-  fetchImpl,
-  cooldownMs = envInt("MSLXDFF_ZCODE_COOLDOWN_MS", 30_000),
-  quotaCooldownMs = envInt("MSLXDFF_ZCODE_QUOTA_COOLDOWN_MS", 3_600_000),
-  timeoutMs = Number(process.env.MSLXDFF_ZCODE_TIMEOUT_MS) || 120_000,
-} = {}) {
-  if (!fetchImpl) fetchImpl = compatFetch;
-  const keys = (() => {
-    if (Array.isArray(apiKeys) && apiKeys.length) return [...new Set(apiKeys.map((k) => String(k).trim()).filter(Boolean))];
-    try {
-      return loadProviderKeys(id, file ? { file } : {});
-    } catch {
-      return [];
-    }
-  })();
-  const ring = createKeyRing(keys, { cooldownMs });
-
-  // JWT → deviceMid 映射（设备身份跟账号走，取自 auths/zcode-<uid>.json）
-  let midCache = null;
-  function deviceMidFor(key) {
-    if (midCache === null) {
-      try {
-        midCache = new Map(listZcodeAccountDocs().map((d) => [d.jwt, d.deviceMid]));
-      } catch {
-        midCache = new Map();
-      }
-    }
-    return midCache.get(key) || "";
-  }
-
-  const modelsSvc = createModelsService({
-    id,
-    hasAccount: () => ring.keys.length > 0,
-    // balance capabilities 探测：entitlement 名 → canonical 目录交集（失败/空 → 服务回退全量目录）
-    probe: async () => {
-      const token = ring.keys[0];
-      if (!token) return [];
-      const r = await fetchZcodeBalance({ token, deviceMid: deviceMidFor(token), fetchImpl });
-      return r.ok ? r.modelIds : [];
-    },
-  });
-
-  async function chat(body, opts = {}) {
-    const total = ring.keys.length;
-    if (!total) return notLoggedInResponse();
-    let lastRes = null;
-    for (let hop = 0; hop <= total; hop++) {
-      const key = ring.next();
-      if (!key) break;
-      const res = await forwardZcodeChat({ body, token: key, deviceMid: deviceMidFor(key), fetchImpl, timeoutMs });
-      const kind = res.headers.get("x-mslxdff-zcode-kind");
-      if (!kind) return res;
-      const mode = COOLDOWN_BY_KIND[kind] || "none";
-      if (mode === "long") ring.onError(key, quotaCooldownMs);
-      else if (mode === "short") ring.onError(key, cooldownMs);
-      lastRes = res;
-      if (mode === "none") break; // security/param/unknown：换号无意义，如实透出
-      if (ring.available() === 0) break; // 没有别的可用号
-    }
-    if (lastRes) return lastRes;
-    return allCoolingResponse();
-  }
-
-  async function listModels() {
-    return modelsSvc.listModels();
-  }
-
-  async function preheat() {
-    try {
-      const list = await modelsSvc.listModels();
-      return list.length ? { ok: true } : { ok: false, error: "no catalog" };
-    } catch (e) {
-      return { ok: false, error: String(e?.message || e).slice(0, 120) };
-    }
-  }
-
-  async function close() {}
-
-  async function chatWithKeys(body, keysOverride, opts) {
-    const tmp = createZcodeProvider({ id, apiKeys: keysOverride, file, fetchImpl, cooldownMs, quotaCooldownMs, timeoutMs });
-    return tmp.chat(body, opts);
-  }
-
-  return {
-    id,
-    chat,
-    chatWithKeys,
-    listModels,
-    preheat,
-    close,
-    keyRing: ring,
-    baseUrl: "zcode://native",
-  };
-}
+// zcode 供应商工厂：keyring 多号轮换 + 差异化冷却（auth/限流/服务端=短冷却、1005=长冷却、3007/参数=不冷却）。
+import { compatFetch } from "../../compat.js";
+import { envInt } from "../base.js";
+import { createKeyRing } from "../keyring.js";
+import { loadProviderKeys } from "../../state.js";
+import { createModelsService } from "./models.js";
+import { forwardZcodeChat } from "./chat.js";
+import { fetchZcodeBalance } from "./quota.js";
+import { listZcodeAccountDocs } from "./account-store.js";
+
+// 冷却策略：auth/限流/服务端/网络=短冷却；quota=长冷却（按日重置）；security/param/unknown=不冷却（换号无意义）
+const COOLDOWN_BY_KIND = { auth: "short", rate_limit: "short", server: "short", network: "short", quota: "long" };
+
+function notLoggedInResponse() {
+  return new Response(
+    JSON.stringify({ error: { message: "zcode: 无可用账号 —— 先运行 mslxdff -provider zcode login", type: "auth_error" } }),
+    { status: 401, headers: { "Content-Type": "application/json" } },
+  );
+}
+
+function allCoolingResponse() {
+  return new Response(
+    JSON.stringify({ error: { message: "zcode: 账号暂不可用（冷却中，可能额度用尽或限流），请稍后重试", type: "all_cooling" } }),
+    { status: 429, headers: { "Content-Type": "application/json", "x-mslxdff-zcode-all-cooling": "1" } },
+  );
+}
+
+export function createZcodeProvider({
+  id = "zcode",
+  apiKeys,
+  file,
+  fetchImpl,
+  cooldownMs = envInt("MSLXDFF_ZCODE_COOLDOWN_MS", 30_000),
+  quotaCooldownMs = envInt("MSLXDFF_ZCODE_QUOTA_COOLDOWN_MS", 3_600_000),
+  timeoutMs = Number(process.env.MSLXDFF_ZCODE_TIMEOUT_MS) || 120_000,
+} = {}) {
+  if (!fetchImpl) fetchImpl = compatFetch;
+  const keys = (() => {
+    if (Array.isArray(apiKeys) && apiKeys.length) return [...new Set(apiKeys.map((k) => String(k).trim()).filter(Boolean))];
+    try {
+      return loadProviderKeys(id, file ? { file } : {});
+    } catch {
+      return [];
+    }
+  })();
+  const ring = createKeyRing(keys, { cooldownMs });
+
+  // JWT → deviceMid 映射（设备身份跟账号走，取自 auths/zcode-<uid>.json）
+  let midCache = null;
+  function deviceMidFor(key) {
+    if (midCache === null) {
+      try {
+        midCache = new Map(listZcodeAccountDocs().map((d) => [d.jwt, d.deviceMid]));
+      } catch {
+        midCache = new Map();
+      }
+    }
+    return midCache.get(key) || "";
+  }
+
+  const modelsSvc = createModelsService({
+    id,
+    hasAccount: () => ring.keys.length > 0,
+    // balance capabilities 探测：entitlement 名 → canonical 目录交集（失败/空 → 服务回退全量目录）
+    probe: async () => {
+      const token = ring.keys[0];
+      if (!token) return [];
+      const r = await fetchZcodeBalance({ token, deviceMid: deviceMidFor(token), fetchImpl });
+      return r.ok ? r.modelIds : [];
+    },
+  });
+
+  async function chat(body, opts = {}) {
+    const total = ring.keys.length;
+    if (!total) return notLoggedInResponse();
+    let lastRes = null;
+    for (let hop = 0; hop <= total; hop++) {
+      const key = ring.next();
+      if (!key) break;
+      const res = await forwardZcodeChat({ body, token: key, deviceMid: deviceMidFor(key), fetchImpl, timeoutMs });
+      const kind = res.headers.get("x-mslxdff-zcode-kind");
+      if (!kind) return res;
+      const mode = COOLDOWN_BY_KIND[kind] || "none";
+      if (mode === "long") ring.onError(key, quotaCooldownMs);
+      else if (mode === "short") ring.onError(key, cooldownMs);
+      lastRes = res;
+      if (mode === "none") break; // security/param/unknown：换号无意义，如实透出
+      if (ring.available() === 0) break; // 没有别的可用号
+    }
+    if (lastRes) return lastRes;
+    return allCoolingResponse();
+  }
+
+  async function listModels() {
+    return modelsSvc.listModels();
+  }
+
+  async function preheat() {
+    try {
+      const list = await modelsSvc.listModels();
+      return list.length ? { ok: true } : { ok: false, error: "no catalog" };
+    } catch (e) {
+      return { ok: false, error: String(e?.message || e).slice(0, 120) };
+    }
+  }
+
+  async function close() {}
+
+  async function chatWithKeys(body, keysOverride, opts) {
+    const tmp = createZcodeProvider({ id, apiKeys: keysOverride, file, fetchImpl, cooldownMs, quotaCooldownMs, timeoutMs });
+    return tmp.chat(body, opts);
+  }
+
+  return {
+    id,
+    chat,
+    chatWithKeys,
+    listModels,
+    preheat,
+    close,
+    keyRing: ring,
+    baseUrl: "zcode://native",
+  };
+}

package/src/providers/zcode/models.js

@@ -1,65 +1,65 @@
-// zcode 模型目录：内置 Start/Coding Plan 目录 + allowlist 只增不减补齐 + 目录服务（可选按额度 capabilities 过滤）。
-import { joinModelId } from "../model-id.js";
-import { loadProviderAllowedModels, saveProviderAllowedModels } from "../../state.js";
-import { ZCODE_MODEL_CATALOG } from "./const.js";
-
-const CREATED = 1753600000;
-const CACHE_TTL_MS = 10 * 60 * 1000;
-
-// 登录后开箱可用：内置目录只增不减并入 allowlist（对齐 cline allowlist-sync 先例，避免显式请求 403）。
-export function seedZcodeAllowlist({ ids = ZCODE_MODEL_CATALOG, file } = {}) {
-  const opts = file ? { file } : {};
-  const cur = loadProviderAllowedModels("zcode", opts);
-  const added = ids.filter((m) => !cur.includes(m));
-  if (added.length) saveProviderAllowedModels("zcode", [...cur, ...added], opts);
-  return { allowed: [...cur, ...added], added };
-}
-
-// 对外目录条目（免费池：价格 0.00；id 带 provider 前缀，对齐 joinModelId 契约）。
-export function buildZcodeModelList({ id = "zcode", ids = ZCODE_MODEL_CATALOG } = {}) {
-  return ids.map((raw) => ({
-    id: joinModelId(id, raw),
-    object: "model",
-    created: CREATED,
-    owned_by: "zcode",
-    name: raw,
-    price: "0.00",
-    enable: true,
-    free: true,
-    mark: "*", // 可用标注：免费额度内，登录后可直接调用
-  }));
-}
-
-// 目录服务：静态目录 + 可选 probe()（额度 capabilities 的 live id 列表）过滤；10 分钟缓存。
-// probe 缺失/失败/为空 → 返回全量目录（宁可多列不可误删）。
-export function createModelsService({ id = "zcode", probe, hasAccount = () => true, clock = Date.now } = {}) {
-  let cache = null;
-  let fetchedAt = 0;
-
-  async function listModels() {
-    if (!hasAccount()) return []; // 未登录：空目录（不假装有额度）
-    const now = clock();
-    if (cache && now - fetchedAt < CACHE_TTL_MS) return cache;
-    let ids = ZCODE_MODEL_CATALOG;
-    if (typeof probe === "function") {
-      try {
-        const live = await probe();
-        if (Array.isArray(live) && live.length) {
-          const low = new Set(live.map((m) => String(m).toLowerCase()));
-          const filtered = ZCODE_MODEL_CATALOG.filter((m) => low.has(m.toLowerCase()));
-          ids = filtered.length ? filtered : ZCODE_MODEL_CATALOG;
-        }
-      } catch {}
-    }
-    cache = buildZcodeModelList({ id, ids });
-    fetchedAt = now;
-    return cache;
-  }
-
-  function clearCache() {
-    cache = null;
-    fetchedAt = 0;
-  }
-
-  return { listModels, clearCache, _cache: () => cache };
-}
+// zcode 模型目录：内置 Start/Coding Plan 目录 + allowlist 只增不减补齐 + 目录服务（可选按额度 capabilities 过滤）。
+import { joinModelId } from "../model-id.js";
+import { loadProviderAllowedModels, saveProviderAllowedModels } from "../../state.js";
+import { ZCODE_MODEL_CATALOG } from "./const.js";
+
+const CREATED = 1753600000;
+const CACHE_TTL_MS = 10 * 60 * 1000;
+
+// 登录后开箱可用：内置目录只增不减并入 allowlist（对齐 cline allowlist-sync 先例，避免显式请求 403）。
+export function seedZcodeAllowlist({ ids = ZCODE_MODEL_CATALOG, file } = {}) {
+  const opts = file ? { file } : {};
+  const cur = loadProviderAllowedModels("zcode", opts);
+  const added = ids.filter((m) => !cur.includes(m));
+  if (added.length) saveProviderAllowedModels("zcode", [...cur, ...added], opts);
+  return { allowed: [...cur, ...added], added };
+}
+
+// 对外目录条目（免费池：价格 0.00；id 带 provider 前缀，对齐 joinModelId 契约）。
+export function buildZcodeModelList({ id = "zcode", ids = ZCODE_MODEL_CATALOG } = {}) {
+  return ids.map((raw) => ({
+    id: joinModelId(id, raw),
+    object: "model",
+    created: CREATED,
+    owned_by: "zcode",
+    name: raw,
+    price: "0.00",
+    enable: true,
+    free: true,
+    mark: "*", // 可用标注：免费额度内，登录后可直接调用
+  }));
+}
+
+// 目录服务：静态目录 + 可选 probe()（额度 capabilities 的 live id 列表）过滤；10 分钟缓存。
+// probe 缺失/失败/为空 → 返回全量目录（宁可多列不可误删）。
+export function createModelsService({ id = "zcode", probe, hasAccount = () => true, clock = Date.now } = {}) {
+  let cache = null;
+  let fetchedAt = 0;
+
+  async function listModels() {
+    if (!hasAccount()) return []; // 未登录：空目录（不假装有额度）
+    const now = clock();
+    if (cache && now - fetchedAt < CACHE_TTL_MS) return cache;
+    let ids = ZCODE_MODEL_CATALOG;
+    if (typeof probe === "function") {
+      try {
+        const live = await probe();
+        if (Array.isArray(live) && live.length) {
+          const low = new Set(live.map((m) => String(m).toLowerCase()));
+          const filtered = ZCODE_MODEL_CATALOG.filter((m) => low.has(m.toLowerCase()));
+          ids = filtered.length ? filtered : ZCODE_MODEL_CATALOG;
+        }
+      } catch {}
+    }
+    cache = buildZcodeModelList({ id, ids });
+    fetchedAt = now;
+    return cache;
+  }
+
+  function clearCache() {
+    cache = null;
+    fetchedAt = 0;
+  }
+
+  return { listModels, clearCache, _cache: () => cache };
+}

package/src/providers/zcode/oauth.js

@@ -1,120 +1,120 @@
-// zcode CLI 轮询 OAuth：POST cli/init → 浏览器授权 → GET cli/poll/{flow_id} 拿 zcode JWT。
-// 契约对齐 zcode-switch oauth.rs（init 自带 poll_token 鉴权；服务端返回的 poll_token 优先；3004=流程过期）。
-import { randomBytes } from "node:crypto";
-import { timeoutSignal } from "../../compat.js";
-import { sleep } from "../base.js";
-import { ZCODE_CLI_INIT_URL, zcodeCliPollUrl, zcodeAppVersion } from "./const.js";
-import { buildZcodeHeaders } from "./headers.js";
-
-const INIT_TIMEOUT_MS = 20_000;
-const POLL_TIMEOUT_MS = 15_000;
-const DEFAULT_FLOW_TTL_MS = 300_000;
-
-export class ZcodeOAuthError extends Error {
-  constructor(message, code = 0) {
-    super(message);
-    this.name = "ZcodeOAuthError";
-    this.code = code;
-  }
-}
-
-function parseExpiresAtMs(v) {
-  const n = Number(v);
-  return Number.isFinite(n) && n > 0 ? n * 1000 : 0;
-}
-
-export async function initZcodeFlow({ provider = "zai", fetchImpl, deviceMid, version } = {}) {
-  const pollToken = randomBytes(32).toString("hex");
-  const headers = {
-    ...buildZcodeHeaders({ token: pollToken, deviceMid, version: version || zcodeAppVersion() }),
-    "Content-Type": "application/json",
-  };
-  const res = await fetchImpl(ZCODE_CLI_INIT_URL, {
-    method: "POST",
-    headers,
-    body: JSON.stringify({ provider }),
-    signal: timeoutSignal(INIT_TIMEOUT_MS),
-  });
-  const payload = await res.json().catch(() => null);
-  if (!res.ok || payload?.code !== 0) {
-    const msg = String(payload?.msg || "").trim();
-    throw new ZcodeOAuthError(`zcode 登录初始化失败：HTTP ${res.status}${msg ? ` ${msg}` : ""}`, Number(payload?.code) || 0);
-  }
-  const data = payload?.data || {};
-  const flowId = String(data.flow_id || "").trim();
-  const authorizeUrl = String(data.authorize_url || "").trim();
-  if (!flowId || !authorizeUrl) throw new ZcodeOAuthError("zcode 登录初始化响应缺少 flow_id/authorize_url");
-  let parsed;
-  try { parsed = new URL(authorizeUrl); } catch { throw new ZcodeOAuthError("zcode authorize_url 非法"); }
-  if (parsed.protocol !== "https:") throw new ZcodeOAuthError("zcode authorize_url 必须 https");
-  const state = parsed.searchParams.get("state") || "";
-  if (!state) throw new ZcodeOAuthError("zcode authorize_url 缺少 state");
-  return {
-    provider,
-    flowId,
-    authorizeUrl,
-    state,
-    deviceMid: String(deviceMid || ""),
-    pollUrl: zcodeCliPollUrl(flowId),
-    pollToken: String(data.poll_token || "").trim() || pollToken,
-    expiresAtMs: parseExpiresAtMs(data.expires_at) || Date.now() + DEFAULT_FLOW_TTL_MS,
-    pollIntervalMs: Math.max(1000, Number(data.poll_interval_sec) * 1000 || 3000),
-  };
-}
-
-// 单次轮询：pending 继续、ready 返回凭据；3004/failed 抛终态；网络抖动按 pending（不判死）。
-export async function pollZcodeFlowOnce({ pollUrl, pollToken, deviceMid, version, fetchImpl } = {}) {
-  let res;
-  try {
-    res = await fetchImpl(pollUrl, {
-      headers: buildZcodeHeaders({ token: pollToken, deviceMid, version: version || zcodeAppVersion() }),
-      signal: timeoutSignal(POLL_TIMEOUT_MS),
-    });
-  } catch {
-    return { status: "pending" };
-  }
-  if (res.status >= 400) {
-    if (res.status === 408 || res.status === 429) return { status: "pending" };
-    const body = await res.json().catch(() => null);
-    const code = Number(body?.code) || 0;
-    if (code === 3004) throw new ZcodeOAuthError("授权已过期，请重新运行 login", 3004);
-    const msg = String(body?.msg || "").trim();
-    throw new ZcodeOAuthError(`zcode 登录轮询失败：HTTP ${res.status}${msg ? ` ${msg}` : ""}`, code);
-  }
-  const payload = await res.json().catch(() => null);
-  if (!payload || payload.code !== 0) {
-    const msg = String(payload?.msg || "响应异常").trim();
-    throw new ZcodeOAuthError(`zcode 登录轮询失败：${msg}`, Number(payload?.code) || 0);
-  }
-  const data = payload?.data || {};
-  const status = String(data.status || "").trim();
-  if (status === "pending") return { status: "pending" };
-  if (status === "failed") throw new ZcodeOAuthError("授权失败（服务端标记 failed），请重试", 0);
-  if (status === "ready") {
-    const jwt = String(data.token || "").trim();
-    const accessToken = String(data?.zai?.access_token || data?.bigmodel?.access_token || "").trim();
-    const user = {
-      userId: String(data?.user?.user_id || "").trim(),
-      name: String(data?.user?.name || "").trim(),
-      email: String(data?.user?.email || "").trim(),
-    };
-    if (!jwt || !user.userId) throw new ZcodeOAuthError("zcode 登录响应缺少 token/user_id");
-    return { status: "ready", jwt, accessToken, user };
-  }
-  throw new ZcodeOAuthError(`zcode 登录轮询未知状态：${status || "(空)"}`);
-}
-
-export async function waitForZcodeLogin({ flow, fetchImpl, log = () => {}, sleepFn = sleep, now = Date.now } = {}) {
-  if (!flow?.pollUrl) throw new ZcodeOAuthError("缺少轮询信息");
-  while (now() < (flow.expiresAtMs || 0)) {
-    const out = await pollZcodeFlowOnce({
-      pollUrl: flow.pollUrl,
-      pollToken: flow.pollToken,
-      deviceMid: flow.deviceMid,
-      fetchImpl,
-    });
-    if (out.status === "ready") return { ...out, provider: flow.provider || "zai" };
-    await sleepFn(flow.pollIntervalMs || 3000);
-  }
-  throw new ZcodeOAuthError("授权已过期，请重新运行 login", 3004);
-}
+// zcode CLI 轮询 OAuth：POST cli/init → 浏览器授权 → GET cli/poll/{flow_id} 拿 zcode JWT。
+// 契约对齐 zcode-switch oauth.rs（init 自带 poll_token 鉴权；服务端返回的 poll_token 优先；3004=流程过期）。
+import { randomBytes } from "node:crypto";
+import { timeoutSignal } from "../../compat.js";
+import { sleep } from "../base.js";
+import { ZCODE_CLI_INIT_URL, zcodeCliPollUrl, zcodeAppVersion } from "./const.js";
+import { buildZcodeHeaders } from "./headers.js";
+
+const INIT_TIMEOUT_MS = 20_000;
+const POLL_TIMEOUT_MS = 15_000;
+const DEFAULT_FLOW_TTL_MS = 300_000;
+
+export class ZcodeOAuthError extends Error {
+  constructor(message, code = 0) {
+    super(message);
+    this.name = "ZcodeOAuthError";
+    this.code = code;
+  }
+}
+
+function parseExpiresAtMs(v) {
+  const n = Number(v);
+  return Number.isFinite(n) && n > 0 ? n * 1000 : 0;
+}
+
+export async function initZcodeFlow({ provider = "zai", fetchImpl, deviceMid, version } = {}) {
+  const pollToken = randomBytes(32).toString("hex");
+  const headers = {
+    ...buildZcodeHeaders({ token: pollToken, deviceMid, version: version || zcodeAppVersion() }),
+    "Content-Type": "application/json",
+  };
+  const res = await fetchImpl(ZCODE_CLI_INIT_URL, {
+    method: "POST",
+    headers,
+    body: JSON.stringify({ provider }),
+    signal: timeoutSignal(INIT_TIMEOUT_MS),
+  });
+  const payload = await res.json().catch(() => null);
+  if (!res.ok || payload?.code !== 0) {
+    const msg = String(payload?.msg || "").trim();
+    throw new ZcodeOAuthError(`zcode 登录初始化失败：HTTP ${res.status}${msg ? ` ${msg}` : ""}`, Number(payload?.code) || 0);
+  }
+  const data = payload?.data || {};
+  const flowId = String(data.flow_id || "").trim();
+  const authorizeUrl = String(data.authorize_url || "").trim();
+  if (!flowId || !authorizeUrl) throw new ZcodeOAuthError("zcode 登录初始化响应缺少 flow_id/authorize_url");
+  let parsed;
+  try { parsed = new URL(authorizeUrl); } catch { throw new ZcodeOAuthError("zcode authorize_url 非法"); }
+  if (parsed.protocol !== "https:") throw new ZcodeOAuthError("zcode authorize_url 必须 https");
+  const state = parsed.searchParams.get("state") || "";
+  if (!state) throw new ZcodeOAuthError("zcode authorize_url 缺少 state");
+  return {
+    provider,
+    flowId,
+    authorizeUrl,
+    state,
+    deviceMid: String(deviceMid || ""),
+    pollUrl: zcodeCliPollUrl(flowId),
+    pollToken: String(data.poll_token || "").trim() || pollToken,
+    expiresAtMs: parseExpiresAtMs(data.expires_at) || Date.now() + DEFAULT_FLOW_TTL_MS,
+    pollIntervalMs: Math.max(1000, Number(data.poll_interval_sec) * 1000 || 3000),
+  };
+}
+
+// 单次轮询：pending 继续、ready 返回凭据；3004/failed 抛终态；网络抖动按 pending（不判死）。
+export async function pollZcodeFlowOnce({ pollUrl, pollToken, deviceMid, version, fetchImpl } = {}) {
+  let res;
+  try {
+    res = await fetchImpl(pollUrl, {
+      headers: buildZcodeHeaders({ token: pollToken, deviceMid, version: version || zcodeAppVersion() }),
+      signal: timeoutSignal(POLL_TIMEOUT_MS),
+    });
+  } catch {
+    return { status: "pending" };
+  }
+  if (res.status >= 400) {
+    if (res.status === 408 || res.status === 429) return { status: "pending" };
+    const body = await res.json().catch(() => null);
+    const code = Number(body?.code) || 0;
+    if (code === 3004) throw new ZcodeOAuthError("授权已过期，请重新运行 login", 3004);
+    const msg = String(body?.msg || "").trim();
+    throw new ZcodeOAuthError(`zcode 登录轮询失败：HTTP ${res.status}${msg ? ` ${msg}` : ""}`, code);
+  }
+  const payload = await res.json().catch(() => null);
+  if (!payload || payload.code !== 0) {
+    const msg = String(payload?.msg || "响应异常").trim();
+    throw new ZcodeOAuthError(`zcode 登录轮询失败：${msg}`, Number(payload?.code) || 0);
+  }
+  const data = payload?.data || {};
+  const status = String(data.status || "").trim();
+  if (status === "pending") return { status: "pending" };
+  if (status === "failed") throw new ZcodeOAuthError("授权失败（服务端标记 failed），请重试", 0);
+  if (status === "ready") {
+    const jwt = String(data.token || "").trim();
+    const accessToken = String(data?.zai?.access_token || data?.bigmodel?.access_token || "").trim();
+    const user = {
+      userId: String(data?.user?.user_id || "").trim(),
+      name: String(data?.user?.name || "").trim(),
+      email: String(data?.user?.email || "").trim(),
+    };
+    if (!jwt || !user.userId) throw new ZcodeOAuthError("zcode 登录响应缺少 token/user_id");
+    return { status: "ready", jwt, accessToken, user };
+  }
+  throw new ZcodeOAuthError(`zcode 登录轮询未知状态：${status || "(空)"}`);
+}
+
+export async function waitForZcodeLogin({ flow, fetchImpl, log = () => {}, sleepFn = sleep, now = Date.now } = {}) {
+  if (!flow?.pollUrl) throw new ZcodeOAuthError("缺少轮询信息");
+  while (now() < (flow.expiresAtMs || 0)) {
+    const out = await pollZcodeFlowOnce({
+      pollUrl: flow.pollUrl,
+      pollToken: flow.pollToken,
+      deviceMid: flow.deviceMid,
+      fetchImpl,
+    });
+    if (out.status === "ready") return { ...out, provider: flow.provider || "zai" };
+    await sleepFn(flow.pollIntervalMs || 3000);
+  }
+  throw new ZcodeOAuthError("授权已过期，请重新运行 login", 3004);
+}