@prestyj/ai 5.11.0 → 5.13.0

package/dist/index.d.cts

@@ -314,7 +314,7 @@ declare class StreamResult implements AsyncIterable<StreamEvent> {
  * Local model ids are namespaced by endpoint (`local/<endpointId>/<rawId>`) so
  * the same model name served by two machines stays distinct in the registry.
  * The server only knows the raw id, so strip the routing prefix here — at the
- * one place that talks to the wire. Counterpart to gg-core's
+ * one place that talks to the wire. Counterpart to @prestyj/core's
  * `formatLocalModelId`/`parseLocalModelId`.
  */
 declare function localWireModelId(id: string): string;
@@ -383,7 +383,7 @@ declare class ProviderRegistryImpl {
 declare const providerRegistry: ProviderRegistryImpl;
 
 /**
- * Error model for gg-ai and downstream consumers.
+ * Error model for @prestyj/ai and downstream consumers.
  *
  * Every error users see should answer one question: "is this me or them?"
  * That answer drives whether they retry, switch model, log in, or report a
@@ -450,7 +450,7 @@ declare class ProviderError extends EZCoderAIError {
  * transient per-minute throttle)? These don't clear with a quick retry — the
  * user has to wait for the window to reset — so callers must surface them as a
  * hard stop, not silently retry for minutes. Detected from the canonical
- * "usage limit reached" message gg-ai stamps onto the ProviderError.
+ * "usage limit reached" message @prestyj/ai stamps onto the ProviderError.
  */
 declare function isUsageLimitError(err: unknown): boolean;
 /**
@@ -521,7 +521,7 @@ declare function sliceTail(text: string, chars: number): string;
 declare function sanitizeMessagesForWire(messages: Message[]): Message[];
 
 /**
- * Provider-level diagnostic hook. Mirrors the pattern used by gg-agent's
+ * Provider-level diagnostic hook. Mirrors the pattern used by @prestyj/agent's
  * setStreamDiagnostic — the host app wires a callback (typically writing to
  * a debug log) and providers call `providerDiag(...)` to record interesting
  * lifecycle events (e.g. raw SSE event types and timings).
@@ -530,6 +530,47 @@ type ProviderDiagnosticFn = (phase: string, data?: Record<string, unknown>) => v
 /** Register a diagnostic callback for provider-level tracing. */
 declare function setProviderDiagnostic(fn: ProviderDiagnosticFn | null): void;
 
+/**
+ * Converts a Zod schema to a JSON Schema object suitable for provider tool
+ * parameter definitions.
+ *
+ * Anthropic's `input_schema` validator is strict in two ways:
+ *
+ *   1. The root must be `type: "object"`. Returns 400 with
+ *      `tools.N.custom.input_schema.type: Field required` otherwise.
+ *
+ *   2. The root must NOT contain `oneOf`, `anyOf`, or `allOf`. Returns 400 with
+ *      `input_schema does not support oneOf, allOf, or anyOf at the top level`.
+ *
+ * Both rules trip whenever a tool's parameters are defined via
+ * `z.discriminatedUnion(...)` or `z.union(...)` — Zod 4's
+ * `z.toJSONSchema` emits `{oneOf: [...]}` at the root with no `type`.
+ *
+ * The fix is to collapse the union into a single flat object schema:
+ *
+ *   - properties = union of all branch properties (later branches win on
+ *     conflict; that's fine because the model only uses these for hints —
+ *     Zod's actual `tool.parameters.parse(args)` is the real validator)
+ *   - required = intersection of branch `required` arrays (a field is only
+ *     required if EVERY branch requires it)
+ *   - if the union has a discriminator field (every branch has the same
+ *     property as a `const`), we replace the discriminator's per-branch
+ *     `const` with an `enum` listing every literal — the model gets a clear
+ *     hint of the valid action values without needing oneOf
+ *
+ * The flattening is lossy for *schema-level* constraints (e.g. "if action=X,
+ * then field Y is required") — Zod still enforces those at parse time. For
+ * the model's purposes this is identical to a single object with optional
+ * fields and a discriminator enum, which is exactly how Anthropic-supported
+ * tools are typically authored anyway.
+ */
+type JsonSchema = Record<string, unknown>;
+/**
+ * Resolve a tool's JSON Schema for provider tool definitions: prefer the
+ * tool's pre-built `rawInputSchema`, otherwise convert its Zod `parameters`.
+ */
+declare function resolveToolSchema(tool: Tool): JsonSchema;
+
 /**
  * Cap historical images before provider dispatch, removing the oldest first.
  * The persisted/live conversation is never mutated; only modified messages and
@@ -642,4 +683,4 @@ interface PalsuProviderConfig {
  */
 declare function registerPalsuProvider(config?: PalsuProviderConfig): PalsuProviderHandle;
 
-export { type AssistantMessage, type CacheRetention, type ContentPart, type DoneEvent, EZCoderAIError, type ErrorEvent, type ErrorSource, EventStream, type FormattedError, type ImageContent, type Message, type MessageProvenance, type MessageProvenanceKind, type MessageProvenanceSource, type MessageProvenanceVisibility, type PalsuModelConfig, type PalsuModelHandle, type PalsuProviderConfig, type PalsuProviderHandle, type PalsuProviderState, type PalsuResponse, type PalsuResponseFactory, type Provider, type ProviderDiagnosticFn, type ProviderEntry, ProviderError, type ProviderStreamFn, REDACTED as REDACTION_MARKER, type RawContent, type RedactionOptions, type ServerToolCall, type ServerToolCallEvent, type ServerToolDefinition, type ServerToolResult, type ServerToolResultEvent, type StopReason, type StreamEvent, type StreamOptions, type StreamResponse, StreamResult, type SystemMessage, type TextContent, type TextDeltaEvent, type ThinkingContent, type ThinkingDeltaEvent, type ThinkingLevel, type Tool, type ToolCall, type ToolCallDeltaEvent, type ToolCallDoneEvent, type ToolChoice, type ToolResult, type ToolResultContent, type ToolResultMessage, type Usage, type UserMessage, type VideoContent, clampProviderContextImages, classifyProviderError, environmentSecrets, formatError, formatErrorForDisplay, hasLoneSurrogate, isHardBillingMessage, isUsageLimitError, localWireModelId, palsuAssistantMessage, palsuText, palsuThinking, palsuToolCall, prewarmAnthropicCache, providerRegistry, redactText, redactValue, registerPalsuProvider, sanitizeMessagesForWire, setProviderDiagnostic, sliceHead, sliceTail, stream, toAnthropicMessages, toOpenAIMessages, toWellFormedText };
+export { type AssistantMessage, type CacheRetention, type ContentPart, type DoneEvent, EZCoderAIError, type ErrorEvent, type ErrorSource, EventStream, type FormattedError, type ImageContent, type Message, type MessageProvenance, type MessageProvenanceKind, type MessageProvenanceSource, type MessageProvenanceVisibility, type PalsuModelConfig, type PalsuModelHandle, type PalsuProviderConfig, type PalsuProviderHandle, type PalsuProviderState, type PalsuResponse, type PalsuResponseFactory, type Provider, type ProviderDiagnosticFn, type ProviderEntry, ProviderError, type ProviderStreamFn, REDACTED as REDACTION_MARKER, type RawContent, type RedactionOptions, type ServerToolCall, type ServerToolCallEvent, type ServerToolDefinition, type ServerToolResult, type ServerToolResultEvent, type StopReason, type StreamEvent, type StreamOptions, type StreamResponse, StreamResult, type SystemMessage, type TextContent, type TextDeltaEvent, type ThinkingContent, type ThinkingDeltaEvent, type ThinkingLevel, type Tool, type ToolCall, type ToolCallDeltaEvent, type ToolCallDoneEvent, type ToolChoice, type ToolResult, type ToolResultContent, type ToolResultMessage, type Usage, type UserMessage, type VideoContent, clampProviderContextImages, classifyProviderError, environmentSecrets, formatError, formatErrorForDisplay, hasLoneSurrogate, isHardBillingMessage, isUsageLimitError, localWireModelId, palsuAssistantMessage, palsuText, palsuThinking, palsuToolCall, prewarmAnthropicCache, providerRegistry, redactText, redactValue, registerPalsuProvider, resolveToolSchema, sanitizeMessagesForWire, setProviderDiagnostic, sliceHead, sliceTail, stream, toAnthropicMessages, toOpenAIMessages, toWellFormedText };

package/dist/index.d.ts

@@ -314,7 +314,7 @@ declare class StreamResult implements AsyncIterable<StreamEvent> {
  * Local model ids are namespaced by endpoint (`local/<endpointId>/<rawId>`) so
  * the same model name served by two machines stays distinct in the registry.
  * The server only knows the raw id, so strip the routing prefix here — at the
- * one place that talks to the wire. Counterpart to gg-core's
+ * one place that talks to the wire. Counterpart to @prestyj/core's
  * `formatLocalModelId`/`parseLocalModelId`.
  */
 declare function localWireModelId(id: string): string;
@@ -383,7 +383,7 @@ declare class ProviderRegistryImpl {
 declare const providerRegistry: ProviderRegistryImpl;
 
 /**
- * Error model for gg-ai and downstream consumers.
+ * Error model for @prestyj/ai and downstream consumers.
  *
  * Every error users see should answer one question: "is this me or them?"
  * That answer drives whether they retry, switch model, log in, or report a
@@ -450,7 +450,7 @@ declare class ProviderError extends EZCoderAIError {
  * transient per-minute throttle)? These don't clear with a quick retry — the
  * user has to wait for the window to reset — so callers must surface them as a
  * hard stop, not silently retry for minutes. Detected from the canonical
- * "usage limit reached" message gg-ai stamps onto the ProviderError.
+ * "usage limit reached" message @prestyj/ai stamps onto the ProviderError.
  */
 declare function isUsageLimitError(err: unknown): boolean;
 /**
@@ -521,7 +521,7 @@ declare function sliceTail(text: string, chars: number): string;
 declare function sanitizeMessagesForWire(messages: Message[]): Message[];
 
 /**
- * Provider-level diagnostic hook. Mirrors the pattern used by gg-agent's
+ * Provider-level diagnostic hook. Mirrors the pattern used by @prestyj/agent's
  * setStreamDiagnostic — the host app wires a callback (typically writing to
  * a debug log) and providers call `providerDiag(...)` to record interesting
  * lifecycle events (e.g. raw SSE event types and timings).
@@ -530,6 +530,47 @@ type ProviderDiagnosticFn = (phase: string, data?: Record<string, unknown>) => v
 /** Register a diagnostic callback for provider-level tracing. */
 declare function setProviderDiagnostic(fn: ProviderDiagnosticFn | null): void;
 
+/**
+ * Converts a Zod schema to a JSON Schema object suitable for provider tool
+ * parameter definitions.
+ *
+ * Anthropic's `input_schema` validator is strict in two ways:
+ *
+ *   1. The root must be `type: "object"`. Returns 400 with
+ *      `tools.N.custom.input_schema.type: Field required` otherwise.
+ *
+ *   2. The root must NOT contain `oneOf`, `anyOf`, or `allOf`. Returns 400 with
+ *      `input_schema does not support oneOf, allOf, or anyOf at the top level`.
+ *
+ * Both rules trip whenever a tool's parameters are defined via
+ * `z.discriminatedUnion(...)` or `z.union(...)` — Zod 4's
+ * `z.toJSONSchema` emits `{oneOf: [...]}` at the root with no `type`.
+ *
+ * The fix is to collapse the union into a single flat object schema:
+ *
+ *   - properties = union of all branch properties (later branches win on
+ *     conflict; that's fine because the model only uses these for hints —
+ *     Zod's actual `tool.parameters.parse(args)` is the real validator)
+ *   - required = intersection of branch `required` arrays (a field is only
+ *     required if EVERY branch requires it)
+ *   - if the union has a discriminator field (every branch has the same
+ *     property as a `const`), we replace the discriminator's per-branch
+ *     `const` with an `enum` listing every literal — the model gets a clear
+ *     hint of the valid action values without needing oneOf
+ *
+ * The flattening is lossy for *schema-level* constraints (e.g. "if action=X,
+ * then field Y is required") — Zod still enforces those at parse time. For
+ * the model's purposes this is identical to a single object with optional
+ * fields and a discriminator enum, which is exactly how Anthropic-supported
+ * tools are typically authored anyway.
+ */
+type JsonSchema = Record<string, unknown>;
+/**
+ * Resolve a tool's JSON Schema for provider tool definitions: prefer the
+ * tool's pre-built `rawInputSchema`, otherwise convert its Zod `parameters`.
+ */
+declare function resolveToolSchema(tool: Tool): JsonSchema;
+
 /**
  * Cap historical images before provider dispatch, removing the oldest first.
  * The persisted/live conversation is never mutated; only modified messages and
@@ -642,4 +683,4 @@ interface PalsuProviderConfig {
  */
 declare function registerPalsuProvider(config?: PalsuProviderConfig): PalsuProviderHandle;
 
-export { type AssistantMessage, type CacheRetention, type ContentPart, type DoneEvent, EZCoderAIError, type ErrorEvent, type ErrorSource, EventStream, type FormattedError, type ImageContent, type Message, type MessageProvenance, type MessageProvenanceKind, type MessageProvenanceSource, type MessageProvenanceVisibility, type PalsuModelConfig, type PalsuModelHandle, type PalsuProviderConfig, type PalsuProviderHandle, type PalsuProviderState, type PalsuResponse, type PalsuResponseFactory, type Provider, type ProviderDiagnosticFn, type ProviderEntry, ProviderError, type ProviderStreamFn, REDACTED as REDACTION_MARKER, type RawContent, type RedactionOptions, type ServerToolCall, type ServerToolCallEvent, type ServerToolDefinition, type ServerToolResult, type ServerToolResultEvent, type StopReason, type StreamEvent, type StreamOptions, type StreamResponse, StreamResult, type SystemMessage, type TextContent, type TextDeltaEvent, type ThinkingContent, type ThinkingDeltaEvent, type ThinkingLevel, type Tool, type ToolCall, type ToolCallDeltaEvent, type ToolCallDoneEvent, type ToolChoice, type ToolResult, type ToolResultContent, type ToolResultMessage, type Usage, type UserMessage, type VideoContent, clampProviderContextImages, classifyProviderError, environmentSecrets, formatError, formatErrorForDisplay, hasLoneSurrogate, isHardBillingMessage, isUsageLimitError, localWireModelId, palsuAssistantMessage, palsuText, palsuThinking, palsuToolCall, prewarmAnthropicCache, providerRegistry, redactText, redactValue, registerPalsuProvider, sanitizeMessagesForWire, setProviderDiagnostic, sliceHead, sliceTail, stream, toAnthropicMessages, toOpenAIMessages, toWellFormedText };
+export { type AssistantMessage, type CacheRetention, type ContentPart, type DoneEvent, EZCoderAIError, type ErrorEvent, type ErrorSource, EventStream, type FormattedError, type ImageContent, type Message, type MessageProvenance, type MessageProvenanceKind, type MessageProvenanceSource, type MessageProvenanceVisibility, type PalsuModelConfig, type PalsuModelHandle, type PalsuProviderConfig, type PalsuProviderHandle, type PalsuProviderState, type PalsuResponse, type PalsuResponseFactory, type Provider, type ProviderDiagnosticFn, type ProviderEntry, ProviderError, type ProviderStreamFn, REDACTED as REDACTION_MARKER, type RawContent, type RedactionOptions, type ServerToolCall, type ServerToolCallEvent, type ServerToolDefinition, type ServerToolResult, type ServerToolResultEvent, type StopReason, type StreamEvent, type StreamOptions, type StreamResponse, StreamResult, type SystemMessage, type TextContent, type TextDeltaEvent, type ThinkingContent, type ThinkingDeltaEvent, type ThinkingLevel, type Tool, type ToolCall, type ToolCallDeltaEvent, type ToolCallDoneEvent, type ToolChoice, type ToolResult, type ToolResultContent, type ToolResultMessage, type Usage, type UserMessage, type VideoContent, clampProviderContextImages, classifyProviderError, environmentSecrets, formatError, formatErrorForDisplay, hasLoneSurrogate, isHardBillingMessage, isUsageLimitError, localWireModelId, palsuAssistantMessage, palsuText, palsuThinking, palsuToolCall, prewarmAnthropicCache, providerRegistry, redactText, redactValue, registerPalsuProvider, resolveToolSchema, sanitizeMessagesForWire, setProviderDiagnostic, sliceHead, sliceTail, stream, toAnthropicMessages, toOpenAIMessages, toWellFormedText };

package/dist/index.js

@@ -1105,6 +1105,9 @@ function toLocalReasoningEffort(level) {
   if (level === "max" || level === "ultra" || level === "xhigh") return "max";
   return level;
 }
+function toGlmReasoningEffort(level) {
+  return level === "ultra" ? "max" : level;
+}
 function toOpenAIReasoningEffort(level, model) {
   const effort = level === "max" || level === "ultra" ? "xhigh" : level;
   if (model.startsWith("fugu") && (effort === "low" || effort === "medium")) {
@@ -1160,7 +1163,7 @@ function parseToolArguments(argsJson) {
 var NON_STREAMING_TIMEOUT_MS = 60 * 60 * 1e3;
 var anthropicClientCache = /* @__PURE__ */ new Map();
 function fineGrainedToolStreamingEnabled() {
-  const raw = process.env.GG_FINE_GRAINED_TOOL_STREAMING ?? process.env.CLAUDE_CODE_ENABLE_FINE_GRAINED_TOOL_STREAMING;
+  const raw = process.env.EZ_FINE_GRAINED_TOOL_STREAMING ?? process.env.CLAUDE_CODE_ENABLE_FINE_GRAINED_TOOL_STREAMING;
   if (!raw) return false;
   const v = raw.trim().toLowerCase();
   return v === "1" || v === "true" || v === "yes" || v === "on";
@@ -1974,6 +1977,11 @@ async function* runStream2(options) {
   if (usesThinkingParam) {
     if (options.thinking) {
       params.thinking = { type: "enabled" };
+      if (options.provider === "glm") {
+        params.reasoning_effort = toGlmReasoningEffort(
+          options.thinking
+        );
+      }
     } else {
       params.thinking = { type: "disabled" };
     }
@@ -2025,7 +2033,15 @@ async function* runStream2(options) {
       if (chunk.usage) {
         ({ inputTokens, outputTokens, cacheRead, cacheWrite } = extractOpenAIUsage(chunk.usage));
       }
-      if (!choice) continue;
+      if (!choice) {
+        const gatewayError = classifyChoicelessFrame(chunk);
+        if (gatewayError) {
+          throw new ProviderError(providerName, gatewayError.message, {
+            statusCode: gatewayError.statusCode
+          });
+        }
+        continue;
+      }
       if (choice.finish_reason) {
         finishReason = choice.finish_reason;
       }
@@ -2209,6 +2225,31 @@ function completionToResponse(completion, endpointKey) {
     }
   };
 }
+function classifyChoicelessFrame(frame) {
+  if (!frame || typeof frame !== "object" || Array.isArray(frame)) return null;
+  const rec = frame;
+  if (Array.isArray(rec.choices)) return null;
+  const statusOf = (value) => {
+    const n = typeof value === "string" ? Number(value) : value;
+    return typeof n === "number" && Number.isFinite(n) && n >= 400 && n <= 599 ? n : void 0;
+  };
+  const statusCode = statusOf(rec.status) ?? statusOf(rec.statusCode) ?? statusOf(rec.code);
+  const typeIsError = typeof rec.type === "string" && rec.type.toLowerCase() === "error";
+  let detailText;
+  const detail = rec.detail;
+  if (typeof detail === "string" && detail.trim()) {
+    detailText = detail.trim();
+  } else if (Array.isArray(detail)) {
+    const parts = detail.map(
+      (d) => d && typeof d === "object" && typeof d.msg === "string" ? d.msg : typeof d === "string" ? d : ""
+    ).filter(Boolean);
+    if (parts.length) detailText = parts.join("; ");
+  }
+  if (statusCode === void 0 && !typeIsError && !detailText) return null;
+  const rawMessage = (typeof rec.message === "string" && rec.message.trim() ? rec.message.trim() : void 0) ?? detailText ?? (typeof rec.error === "string" && rec.error.trim() ? rec.error.trim() : void 0) ?? (statusCode !== void 0 ? `Gateway returned status ${statusCode}.` : "Gateway error.");
+  const message = rawMessage.slice(0, 500);
+  return { message, statusCode };
+}
 function classifyOpenAICompatLimit(args) {
   const { status, code, type, message } = args;
   const codeType = `${code ?? ""} ${type ?? ""}`.toLowerCase();
@@ -2220,6 +2261,7 @@ function classifyOpenAICompatLimit(args) {
   return null;
 }
 function toError2(err, provider = "openai") {
+  if (err instanceof ProviderError) return err;
   if (err instanceof OpenAI.APIError) {
     const body = err.error;
     const bodyMessage = typeof body?.message === "string" && body.message.trim() ? body.message.trim() : void 0;
@@ -3580,6 +3622,8 @@ function sanitizeMessagesForWire(messages) {
 // src/stream.ts
 var GLM_CODING_BASE_URL = "https://api.z.ai/api/coding/paas/v4";
 var KIMI_CODE_USER_AGENT = `kimi-code-cli/${process.env.KIMI_CODE_VERSION ?? "1.0.11"}`;
+var GROK_CLI_PROXY_HOST = "cli-chat-proxy.grok.com";
+var GROK_CLI_VERSION = process.env.GROK_CLI_VERSION ?? "0.2.101";
 providerRegistry.register("anthropic", {
   stream: (options) => streamAnthropic(options)
 });
@@ -3646,13 +3690,25 @@ providerRegistry.register("xai", {
   // xAI's public API (console.x.ai key) is OpenAI-compatible — ride the Chat
   // Completions transport like Moonshot/DeepSeek. Grok reasoning models take
   // top-level `reasoning_effort` (low/medium/high), which the shared thinking
-  // path already sends. xAI's OAuth path exists but only via the Grok CLI's
-  // private Responses proxy (cli-chat-proxy.grok.com) with reverse-engineered
-  // attribution headers and account-tier gating — intentionally not wired.
-  stream: (options) => streamOpenAI({
-    ...options,
-    baseUrl: options.baseUrl ?? "https://api.x.ai/v1"
-  })
+  // path already sends.
+  //
+  // Subscription OAuth (SuperGrok / X Premium) routes to the Grok CLI chat proxy
+  // instead, which speaks the same Chat Completions wire but gates on Grok-CLI
+  // client identity. Inject those headers centrally here — exactly as the Kimi
+  // endpoint above — so EVERY stream (agent loop, compaction, title-gen,
+  // sub-agents) is accepted rather than depending on each call site to thread
+  // headers. Caller-provided headers still win on collision.
+  stream: (options) => {
+    const baseUrl = options.baseUrl ?? "https://api.x.ai/v1";
+    const defaultHeaders = baseUrl.includes(GROK_CLI_PROXY_HOST) ? {
+      "X-XAI-Token-Auth": "xai-grok-cli",
+      "x-grok-client-version": GROK_CLI_VERSION,
+      "x-grok-client-identifier": "ezcoder",
+      "x-grok-model-override": options.model,
+      ...options.defaultHeaders
+    } : options.defaultHeaders;
+    return streamOpenAI({ ...options, baseUrl, defaultHeaders });
+  }
 });
 providerRegistry.register("minimax", {
   stream: (options) => streamAnthropic({
@@ -4114,6 +4170,7 @@ export {
   redactText,
   redactValue,
   registerPalsuProvider,
+  resolveToolSchema,
   sanitizeMessagesForWire,
   setProviderDiagnostic,
   sliceHead,