nolo-cli 0.149.0-alpha.1 → 0.151.0-alpha.3

package/chunk-G6OOUQWJ.js

@@ -0,0 +1,417 @@
+import {
+  describeAttachmentForModel
+} from "./chunk-WJZOQR2J.js";
+
+// packages/ai/attachments/projectUserPart.ts
+var isRecord = (value) => typeof value === "object" && value !== null;
+var projectUserPartForModel = (part) => {
+  if (!isRecord(part) || typeof part.type !== "string") return [];
+  if (part.type === "text") {
+    return typeof part.text === "string" && part.text.trim() ? [part] : [];
+  }
+  if (part.type === "image_url") {
+    return isRecord(part.image_url) && typeof part.image_url.url === "string" && part.image_url.url.trim() ? [part] : [];
+  }
+  if (part.type === "attachment") return [{ type: "text", text: describeAttachmentForModel(part) }];
+  if (part.type === "media_job") {
+    const name = typeof part.name === "string" && part.name.trim() ? part.name.trim() : "\u672A\u547D\u540D\u6587\u4EF6";
+    const jobId = typeof part.jobId === "string" ? part.jobId : typeof part.id === "string" ? part.id : "";
+    return [{ type: "text", text: `[\u5A92\u4F53\u9644\u4EF6] \u6587\u4EF6=${name}${jobId ? ` jobId=${jobId}` : ""}` }];
+  }
+  if (typeof part.pageKey === "string" && ["page", "pdf", "docx"].includes(part.type)) return [];
+  return [{ type: "text", text: `[\u672A\u8BC6\u522B\u7684\u9644\u4EF6\u7C7B\u578B: ${part.type}]` }];
+};
+
+// packages/agent-runtime/outboundRequestDiagnostics.ts
+var OUTBOUND_DIAGNOSTIC_PREFIX = "[outbound-diagnostic]";
+var OUTBOUND_DIAGNOSTICS_ENV = "NOLO_OUTBOUND_DIAGNOSTICS";
+var MAX_PROVIDER_TOKEN_LENGTH = 96;
+var MAX_CALL_ID_LENGTH = 128;
+var MAX_UPSTREAM_REQUEST_ID_LENGTH = 128;
+var IDENTIFIER_PATTERN = /^[A-Za-z0-9._:@+/~-]+$/;
+var REQUEST_ID_PATTERN = /^[A-Za-z0-9._:-]+$/;
+var CONTROL_CHAR_PATTERN = /[\u0000-\u001f\u007f]/;
+var UPSTREAM_REQUEST_ID_HEADERS = ["x-request-id", "request-id"];
+var THINKING_VALUES = /* @__PURE__ */ new Set([
+  "enabled",
+  "disabled",
+  "unspecified",
+  "other"
+]);
+var REASONING_EFFORT_VALUES = /* @__PURE__ */ new Set([
+  "none",
+  "minimal",
+  "low",
+  "medium",
+  "high",
+  "xhigh",
+  "unspecified",
+  "other"
+]);
+var ERROR_CATEGORY_VALUES = /* @__PURE__ */ new Set([
+  "none",
+  "reasoning-contract",
+  "invalid-request",
+  "authentication",
+  "rate-limit",
+  "upstream",
+  "other"
+]);
+var TERMINAL_OUTCOME_VALUES = /* @__PURE__ */ new Set([
+  "completed",
+  "http-error",
+  "network-error",
+  "aborted",
+  "stream-error"
+]);
+var SEAM_VALUES = /* @__PURE__ */ new Set([
+  "local-runtime",
+  "chat",
+  "server-loop"
+]);
+var WIRE_VALUES = /* @__PURE__ */ new Set(["chat.completions", "responses"]);
+var HOST_VALUES = /* @__PURE__ */ new Set(["client", "server"]);
+function isRawIdentifierAcceptable(value, maxLength) {
+  if (typeof value !== "string") return false;
+  if (value.length === 0) return false;
+  if (value.length > maxLength) return false;
+  if (CONTROL_CHAR_PATTERN.test(value)) return false;
+  return true;
+}
+function sanitizeProviderModelToken(value) {
+  if (!isRawIdentifierAcceptable(value, MAX_PROVIDER_TOKEN_LENGTH)) return "other";
+  const normalized = value.trim();
+  if (!normalized || !IDENTIFIER_PATTERN.test(normalized)) return "other";
+  return normalized;
+}
+function sanitizeCallId(value) {
+  if (!isRawIdentifierAcceptable(value, MAX_CALL_ID_LENGTH)) return void 0;
+  const normalized = value.trim();
+  if (!normalized || !REQUEST_ID_PATTERN.test(normalized)) return void 0;
+  return normalized;
+}
+function sanitizeUpstreamRequestId(value) {
+  if (!isRawIdentifierAcceptable(value, MAX_UPSTREAM_REQUEST_ID_LENGTH)) return void 0;
+  const normalized = value.trim();
+  if (!normalized || !REQUEST_ID_PATTERN.test(normalized)) return void 0;
+  return normalized;
+}
+function pickUpstreamRequestId(headers) {
+  if (!headers || typeof headers.get !== "function") return void 0;
+  try {
+    for (const name of UPSTREAM_REQUEST_ID_HEADERS) {
+      const raw = headers.get(name);
+      const safe = sanitizeUpstreamRequestId(raw);
+      if (safe) return safe;
+    }
+  } catch {
+    return void 0;
+  }
+  return void 0;
+}
+function classifyOutboundErrorCategory(status, errorText) {
+  const numeric = typeof status === "number" && Number.isFinite(status) ? status : 0;
+  if (numeric === 401 || numeric === 403) return "authentication";
+  if (numeric === 429) return "rate-limit";
+  if (numeric >= 500) return "upstream";
+  const text = typeof errorText === "string" ? errorText : "";
+  if (numeric >= 400) {
+    if (looksLikeReasoningContractError(text)) return "reasoning-contract";
+    return "invalid-request";
+  }
+  if (numeric === 0) return "other";
+  return numeric >= 200 && numeric < 300 ? "none" : "other";
+}
+function looksLikeReasoningContractError(text) {
+  if (!text) return false;
+  if (!/reasoning_content|reasoning/i.test(text)) return false;
+  return /expected a sequence|invalid type|serde|deserializ|type error|missing field/i.test(text);
+}
+function createRequestShapingCounts() {
+  return {
+    assistantToolTurns: 0,
+    missingReasoningTurns: 0,
+    placeholderInjectedTurns: 0,
+    reasoningStrippedTurns: 0
+  };
+}
+function createRequestFacts() {
+  return {
+    assistantToolTurns: 0,
+    missingReasoningTurns: 0,
+    // 未观测：只有塑形直连点（collector）能给出「本次注入」。
+    placeholderInjectedTurns: null,
+    reasoningStrippedTurns: null,
+    thinking: "unspecified",
+    reasoningEffort: "unspecified",
+    projection: { observed: false }
+  };
+}
+function applyShapingCounts(facts, counts) {
+  if (!counts) return facts;
+  facts.assistantToolTurns = toCount(counts.assistantToolTurns);
+  facts.missingReasoningTurns = toCount(counts.missingReasoningTurns);
+  facts.placeholderInjectedTurns = toCount(counts.placeholderInjectedTurns);
+  facts.reasoningStrippedTurns = toCount(counts.reasoningStrippedTurns);
+  return facts;
+}
+function attachProjectionFacts(facts, stats) {
+  if (!stats) {
+    facts.projection = { observed: false };
+    return facts;
+  }
+  facts.projection = {
+    observed: true,
+    badArguments: {
+      truncated: toCount(stats.badArguments?.truncated),
+      malformed: toCount(stats.badArguments?.malformed)
+    },
+    rewrittenToolCalls: toCount(stats.rewrittenToolCalls),
+    rewrittenAssistantMessages: toCount(stats.rewrittenAssistantMessages),
+    rewrittenToolMessages: toCount(stats.rewrittenToolMessages)
+  };
+  return facts;
+}
+function writeThinkingFacts(facts, body) {
+  const record = asRecord(body);
+  facts.thinking = resolveThinkingEnum(record);
+  facts.reasoningEffort = resolveReasoningEffortEnum(record);
+  return facts;
+}
+function resolveThinkingEnum(body) {
+  const thinking = asRecord(body.thinking);
+  if (typeof thinking.type === "string") {
+    const type = thinking.type.trim().toLowerCase();
+    if (type === "enabled") return "enabled";
+    if (type === "disabled") return "disabled";
+    return "other";
+  }
+  const chatTemplateKwargs = asRecord(body.chat_template_kwargs);
+  const enableThinking = body.enable_thinking ?? chatTemplateKwargs.enable_thinking;
+  if (typeof enableThinking === "boolean") return enableThinking ? "enabled" : "disabled";
+  return "unspecified";
+}
+function resolveReasoningEffortEnum(body) {
+  const raw = body.reasoning_effort;
+  if (typeof raw === "string") {
+    const value = raw.trim().toLowerCase();
+    if (REASONING_EFFORT_VALUES.has(value)) return value;
+    return "other";
+  }
+  const reasoning = asRecord(body.reasoning);
+  if (reasoning.enabled === false) return "none";
+  return "unspecified";
+}
+function deriveRequestFactsFromBody(body, shapingCounts) {
+  const facts = createRequestFacts();
+  writeThinkingFacts(facts, body);
+  const messages = extractMessages(body);
+  if (messages) {
+    for (const message of messages) {
+      const record = asRecord(message);
+      if (record.role !== "assistant") continue;
+      const toolCalls = record.tool_calls;
+      if (!Array.isArray(toolCalls) || toolCalls.length === 0) continue;
+      facts.assistantToolTurns += 1;
+      const reasoning = typeof record.reasoning_content === "string" ? record.reasoning_content : "";
+      if (reasoning.length === 0) {
+        facts.missingReasoningTurns += 1;
+      }
+    }
+  }
+  return applyShapingCounts(facts, shapingCounts);
+}
+function extractMessages(body) {
+  const record = asRecord(body);
+  if (Array.isArray(record.messages)) return record.messages;
+  if (Array.isArray(record.input)) return record.input;
+  return void 0;
+}
+function resolveOutboundWire(value, explicit) {
+  if (explicit) return explicit;
+  const text = typeof value === "string" ? value : "";
+  return /\/responses(?:[/?#]|$)/.test(text) ? "responses" : "chat.completions";
+}
+function isOutboundDiagnosticsEnabled(env = readProcessEnv()) {
+  return env?.[OUTBOUND_DIAGNOSTICS_ENV] === "1";
+}
+function readProcessEnv() {
+  if (typeof process === "undefined") return void 0;
+  return process.env;
+}
+function createConsoleOutboundDiagnosticSink(log = defaultLog) {
+  return (event) => {
+    try {
+      const serialized = serializeOutboundDiagnosticEvent(event);
+      log(`${OUTBOUND_DIAGNOSTIC_PREFIX} ${JSON.stringify(serialized)}`);
+    } catch {
+    }
+  };
+}
+function defaultLog(...args) {
+  console.log(...args);
+}
+function resolveOutboundDiagnosticSink(option) {
+  if (option?.sink) return option.sink;
+  if (option?.enabled === false) return void 0;
+  if (option?.enabled === true) return createConsoleOutboundDiagnosticSink();
+  if (isOutboundDiagnosticsEnabled()) return createConsoleOutboundDiagnosticSink();
+  return void 0;
+}
+function createOutboundDiagnosticCallId() {
+  return `obd_${Math.random().toString(36).slice(2, 10)}${Date.now().toString(36)}`;
+}
+function createOutboundDiagnosticCall(args) {
+  const callId = sanitizeCallId(args.callId) ?? createOutboundDiagnosticCallId();
+  const base = {
+    callId,
+    seam: args.seam,
+    host: args.host,
+    wire: args.wire,
+    provider: sanitizeProviderModelToken(args.provider),
+    model: sanitizeProviderModelToken(args.model)
+  };
+  return {
+    callId,
+    dispatch(attempt, facts) {
+      emitOutboundDiagnostic(args.sink, {
+        ...base,
+        version: 1,
+        phase: "dispatch",
+        attempt: toAttempt(attempt),
+        facts
+      });
+    },
+    httpResult(attempt, result) {
+      const upstreamRequestId = pickUpstreamRequestId(result.headers);
+      const providerCallId = sanitizeCallId(result.providerCallId);
+      emitOutboundDiagnostic(args.sink, {
+        ...base,
+        version: 1,
+        phase: "http-result",
+        attempt: toAttempt(attempt),
+        status: toStatus(result.status),
+        errorCategory: result.errorCategory ?? classifyOutboundErrorCategory(result.status),
+        ...providerCallId ? { providerCallId } : {},
+        ...upstreamRequestId ? { upstreamRequestId } : {}
+      });
+    },
+    terminal(attempt, outcome, providerCallId) {
+      const safeProviderCallId = sanitizeCallId(providerCallId);
+      emitOutboundDiagnostic(args.sink, {
+        ...base,
+        version: 1,
+        phase: "terminal",
+        attempt: toAttempt(attempt),
+        outcome,
+        ...safeProviderCallId ? { providerCallId: safeProviderCallId } : {}
+      });
+    }
+  };
+}
+function emitOutboundDiagnostic(sink, event) {
+  if (!sink) return;
+  try {
+    sink(event);
+  } catch {
+  }
+}
+function serializeOutboundDiagnosticEvent(event) {
+  const record = event;
+  const out = {
+    version: 1,
+    phase: toEnum(record.phase, /* @__PURE__ */ new Set(["dispatch", "http-result", "terminal"]), "dispatch"),
+    callId: sanitizeCallId(record.callId) ?? "unknown",
+    attempt: toAttempt(record.attempt),
+    seam: toEnum(record.seam, SEAM_VALUES, void 0) ?? void 0,
+    host: toEnum(record.host, HOST_VALUES, void 0) ?? void 0,
+    wire: toEnum(record.wire, WIRE_VALUES, void 0) ?? void 0,
+    provider: sanitizeProviderModelToken(record.provider),
+    model: sanitizeProviderModelToken(record.model)
+  };
+  const providerCallId = sanitizeCallId(record.providerCallId);
+  if (providerCallId) out.providerCallId = providerCallId;
+  if (out.phase === "dispatch") {
+    out.facts = serializeRequestFacts(record.facts);
+  } else if (out.phase === "http-result") {
+    out.status = toStatus(record.status);
+    out.errorCategory = toEnum(
+      record.errorCategory,
+      ERROR_CATEGORY_VALUES,
+      "other"
+    );
+    const upstreamRequestId = sanitizeUpstreamRequestId(record.upstreamRequestId);
+    if (upstreamRequestId) out.upstreamRequestId = upstreamRequestId;
+  } else {
+    out.outcome = toEnum(record.outcome, TERMINAL_OUTCOME_VALUES, "other");
+  }
+  for (const key of Object.keys(out)) {
+    if (out[key] === void 0) delete out[key];
+  }
+  return out;
+}
+function serializeRequestFacts(value) {
+  const record = asRecord(value);
+  const projection = asRecord(record.projection);
+  const output = {
+    assistantToolTurns: toCount(record.assistantToolTurns),
+    missingReasoningTurns: toCount(record.missingReasoningTurns),
+    placeholderInjectedTurns: typeof record.placeholderInjectedTurns === "number" ? toCount(record.placeholderInjectedTurns) : null,
+    reasoningStrippedTurns: typeof record.reasoningStrippedTurns === "number" ? toCount(record.reasoningStrippedTurns) : null,
+    thinking: toEnum(record.thinking, THINKING_VALUES, "unspecified"),
+    reasoningEffort: toEnum(
+      record.reasoningEffort,
+      REASONING_EFFORT_VALUES,
+      "unspecified"
+    )
+  };
+  if (projection.observed === true) {
+    const bad = asRecord(projection.badArguments);
+    output.projection = {
+      observed: true,
+      badArguments: {
+        truncated: toCount(bad.truncated),
+        malformed: toCount(bad.malformed)
+      },
+      rewrittenToolCalls: toCount(projection.rewrittenToolCalls),
+      rewrittenAssistantMessages: toCount(projection.rewrittenAssistantMessages),
+      rewrittenToolMessages: toCount(projection.rewrittenToolMessages)
+    };
+  } else {
+    output.projection = { observed: false };
+  }
+  return output;
+}
+function toCount(value) {
+  if (typeof value !== "number" || !Number.isFinite(value) || value < 0) return 0;
+  return Math.floor(value);
+}
+function toAttempt(value) {
+  const count = toCount(value);
+  return count > 0 ? count : 1;
+}
+function toStatus(value) {
+  if (typeof value !== "number" || !Number.isFinite(value)) return 0;
+  return Math.floor(value);
+}
+function toEnum(value, allowed, fallback) {
+  if (typeof value === "string" && allowed.has(value)) return value;
+  return fallback;
+}
+function asRecord(value) {
+  return value && typeof value === "object" ? value : {};
+}
+
+export {
+  projectUserPartForModel,
+  classifyOutboundErrorCategory,
+  createRequestShapingCounts,
+  createRequestFacts,
+  applyShapingCounts,
+  attachProjectionFacts,
+  writeThinkingFacts,
+  deriveRequestFactsFromBody,
+  resolveOutboundWire,
+  resolveOutboundDiagnosticSink,
+  createOutboundDiagnosticCall
+};

package/{chunk-PQWU42UQ.js → chunk-GCKHQECX.js}

@@ -1,13 +1,13 @@
 import {
   findModelConfig,
   getProviderByModelName
-} from "./chunk-3BXNTXYI.js";
-import {
-  asTrimmedLowercaseString
-} from "./chunk-QSJ3HFEF.js";
+} from "./chunk-I4SN4NUQ.js";
 import {
   asOptionalTrimmedString
 } from "./chunk-G3SUCT4W.js";
+import {
+  asTrimmedLowercaseString
+} from "./chunk-QSJ3HFEF.js";
 
 // packages/ai/agent/toolOutputPolicy.ts
 var MAX_IN_TURN_TOOL_CONTENT_CHARS = 4e3;
@@ -23,8 +23,8 @@ var TOOL_OUTPUT_PROFILES = {
   execShell: { maxChars: 4e3, headRatio: 0.35 },
   runCommand: { maxChars: 4e3, headRatio: 0.35 },
   launchProcess: { maxChars: 2800, headRatio: 0.35 },
-  editFile: { maxChars: 2800, headRatio: 0.62 },
-  writeFile: { maxChars: 2400, headRatio: 0.62 },
+  editFile: { maxChars: 1200, headRatio: 0.62 },
+  writeFile: { maxChars: 1e3, headRatio: 0.62 },
   readPastedText: { maxChars: 4800, headRatio: 0.5, historicalMaxChars: 4800 }
 };
 function resolveToolOutputProfile(toolName) {

package/chunk-GKXCHNTE.js

@@ -0,0 +1,15 @@
+import {
+  BUILTIN_NOLO_AGENT_KEY
+} from "./chunk-EZVK3N5L.js";
+
+// packages/core/init.ts
+var nolotusId = "0e95801d90";
+var ADMIN_IDS = /* @__PURE__ */ new Set([nolotusId]);
+var isSystemAdmin = (userId) => userId != null && ADMIN_IDS.has(userId);
+var noloAgentId = BUILTIN_NOLO_AGENT_KEY;
+
+export {
+  nolotusId,
+  isSystemAdmin,
+  noloAgentId
+};

package/{chunk-P6GMCCAT.js → chunk-GQV5KHJU.js}

@@ -1,11 +1,11 @@
 import {
   streamSseDataValues
-} from "./chunk-GMZLP5DV.js";
+} from "./chunk-HNUWUO75.js";
 import {
   getAntigravityUserAgent,
   readAntigravityProjectId,
   resolveAntigravityCloudCodeBaseUrl
-} from "./chunk-S5XGT6GB.js";
+} from "./chunk-XZNCX52W.js";
 import {
   asOptionalTrimmedString
 } from "./chunk-G3SUCT4W.js";
@@ -40,6 +40,16 @@ var WIRE_PROFILES = {
   // 证据确认 3.8 的 wire modelEnum，禁止虚构，先只声明同档输出上限；enum 待
   // discovery 证据到位后补齐。
   "gemini-3.8-flash-tiered": { maxOutputTokens: 65536 },
+  // Gemini 4 Argon：fetchAvailableModels（2026-10 实测）仅返回键 `gemini-4-argon-disabled`
+  // （MODEL_PLACEHOLDER_M421，maxOutputTokens 65536，disabled=true，提示「仅 Ultra 订阅可用」）。
+  // 该键名带 -disabled 后缀，不是已验证可调用的 wire id：对 streamGenerateContent 用
+  // gemini-4-argon / -disabled / -tiered / -low 均返回 404。因此这里以 logical id 作为
+  // 透传 wire id（开放后若 discovery 给出真实 id，只需改这一行与 resolve 分支），
+  // enum 取自 discovery 的 M421，不凭空推测 low/medium/high 档位 id。
+  // 2026-10-13 实测：UA 升到官方 2.23.1 后 discovery 与 2.18.1 完全一致（仍仅 gemini-4-argon-disabled，
+  // disabled=true，tagTitle "Unavailable"，tagDescription "currently available to Ultra plan subscribers"），
+  // streamGenerateContent 仍 404；loadCodeAssist currentTier=free-tier，账号非 Ultra，故保持占位映射。
+  "gemini-4-argon": { modelEnum: "MODEL_PLACEHOLDER_M421", maxOutputTokens: 65536 },
   "gemini-3.6-flash-low": { maxOutputTokens: 65536 },
   "gemini-3.6-flash-medium": { maxOutputTokens: 65536 },
   "gemini-3.6-flash-high": { maxOutputTokens: 65536 },
@@ -70,6 +80,10 @@ function resolveAntigravityWireModel(logicalModelId) {
     const wireModelId = "gemini-3.8-flash-tiered";
     return { wireModelId, profile: WIRE_PROFILES[wireModelId] };
   }
+  if (lower === "gemini-4-argon" || ["gemini-4-argon-low", "gemini-4-argon-medium", "gemini-4-argon-high"].includes(lower)) {
+    const wireModelId = "gemini-4-argon";
+    return { wireModelId, profile: WIRE_PROFILES[wireModelId] };
+  }
   if (lower === "gemini-3.6-flash") {
     const wireModelId = "gemini-3.6-flash-low";
     return { wireModelId, profile: WIRE_PROFILES[wireModelId] };
@@ -295,6 +309,43 @@ function sanitizeGeminiSchemaNode(node, active) {
     seen.delete(node);
   }
 }
+var enumMetaByNode = /* @__PURE__ */ new WeakMap();
+function enumMetaOf(node) {
+  return node && typeof node === "object" ? enumMetaByNode.get(node) : void 0;
+}
+function rawEnumValues(src) {
+  if (Array.isArray(src.enum) && src.enum.length > 0) return src.enum;
+  if ("const" in src && src.const !== void 0) return [src.const];
+  return void 0;
+}
+function geminiEnumFields(values, baseDescription) {
+  if (values.every((v) => typeof v === "string")) {
+    return {
+      enum: [...new Set(values)],
+      description: baseDescription
+    };
+  }
+  if (values.every((v) => typeof v === "number" || typeof v === "boolean")) {
+    const allowed2 = [...new Set(values.map((v) => String(v)))].join(", ");
+    const note2 = `(allowed: ${allowed2})`;
+    return {
+      description: baseDescription ? `${baseDescription} ${note2}` : note2
+    };
+  }
+  const allowed = [...new Set(values.map(geminiEnumLiteral))].join(", ");
+  const note = `(allowed: ${allowed})`;
+  return {
+    description: baseDescription ? `${baseDescription} ${note}` : note
+  };
+}
+function geminiEnumLiteral(value) {
+  const json = JSON.stringify(value);
+  return json === void 0 ? String(value) : json;
+}
+function applyGeminiEnum(out, fields) {
+  if (fields.enum) out.enum = fields.enum;
+  if (fields.description !== void 0) out.description = fields.description;
+}
 function sanitizeGeminiSchemaNodeInner(src, out, seen) {
   if (Array.isArray(src.type)) {
     const firstNonNull = src.type.find((t) => t !== "null");
@@ -306,10 +357,12 @@ function sanitizeGeminiSchemaNodeInner(src, out, seen) {
   if (typeof src.description === "string") out.description = src.description;
   if (typeof src.minimum === "number") out.minimum = src.minimum;
   if (typeof src.maximum === "number") out.maximum = src.maximum;
-  if (Array.isArray(src.enum) && src.enum.length > 0) out.enum = src.enum;
   if (src.nullable === true) out.nullable = true;
-  if ("const" in src && src.const !== void 0 && !out.enum) {
-    out.enum = [src.const];
+  const enumValues = rawEnumValues(src);
+  if (enumValues) {
+    const baseDescription = typeof src.description === "string" ? src.description : void 0;
+    enumMetaByNode.set(out, { values: enumValues, baseDescription });
+    applyGeminiEnum(out, geminiEnumFields(enumValues, baseDescription));
   }
   const variantBranches = [
     ...Array.isArray(src.oneOf) ? src.oneOf : [],
@@ -323,13 +376,19 @@ function sanitizeGeminiSchemaNodeInner(src, out, seen) {
       const branchProperties = sanitized.properties ?? {};
       for (const [key, value] of Object.entries(branchProperties)) {
         const previous = mergedProperties[key];
-        const prevEnum = previous?.enum;
-        const nextEnum = value?.enum;
-        if (prevEnum && nextEnum) {
-          mergedProperties[key] = {
-            ...value,
-            enum: [.../* @__PURE__ */ new Set([...prevEnum, ...nextEnum])]
+        const prevMeta = enumMetaOf(previous);
+        const nextMeta = enumMetaOf(value);
+        if (prevMeta && nextMeta) {
+          const values = [...prevMeta.values, ...nextMeta.values];
+          const baseDescription = nextMeta.baseDescription ?? prevMeta.baseDescription;
+          const node = {
+            ...value
           };
+          delete node.enum;
+          delete node.description;
+          applyGeminiEnum(node, geminiEnumFields(values, baseDescription));
+          enumMetaByNode.set(node, { values, baseDescription });
+          mergedProperties[key] = node;
         } else {
           mergedProperties[key] = value;
         }
@@ -427,11 +486,17 @@ function applyGeminiChunk(chunk, state, options) {
       // cached ⊆ prompt；对畸形上游防御性钳位，避免 cache_read > input 破坏归一化与计费
       Math.min(Math.max(0, Math.floor(meta.cachedContentTokenCount)), prompt)
     ) : 0;
+    const thoughts = typeof meta.thoughtsTokenCount === "number" ? meta.thoughtsTokenCount : Array.isArray(meta.candidatesTokensDetails) && typeof meta.candidatesTokensDetails[0]?.tokensCount === "number" ? meta.candidatesTokensDetails[0].tokensCount : void 0;
     state.usage = {
       prompt_tokens: prompt,
       completion_tokens: candidates2,
       total_tokens: total,
-      ...cached > 0 ? { cache_read_input_tokens: cached } : {}
+      ...cached > 0 ? { cache_read_input_tokens: cached } : {},
+      ...thoughts !== void 0 ? {
+        completion_tokens_details: {
+          reasoning_tokens: thoughts
+        }
+      } : {}
     };
     state.events.push({ kind: "usage", usage: state.usage });
   }
@@ -856,6 +921,7 @@ export {
   parseSseDataLineJson,
   parseSseDataLineObject,
   parseUpstreamErrorBody,
+  resolveGeminiModelQuirks,
   isGemini3Model,
   accumulateGeminiChunks,
   shouldUseGeminiNativeToolRoute,