mirror of
https://github.com/openclaw/openclaw.git
synced 2026-08-26 04:15:48 -06:00
095f3e1a44
* feat(xai): add Grok 4.6 catalog and preserve OAuth xhigh Add first-class Grok 4.6 discovery, pricing, and reasoning metadata while keeping the existing Grok 4.3 API-key and server-tool defaults unchanged. Preserve xhigh only for Grok 4.6 so OAuth auto no longer inherits the Grok 4.5 high downgrade. Closes nothing; tracks #122734. * fix(xai): resolve the OAuth auto alias to its canonical model in the thinking policy The OAuth catalog row keeps id "auto" and records the provider-selected target in params.canonicalModelId; judging the raw alias collapsed the default OAuth route to an off-only thinking picker for every model. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * test(xai): refresh catalog-order assertions and restore stream deadlines for Grok 4.6 Exact-order catalog and onboarding arrays now include the new row with its metadata assertion; payload-capture timeouts return to their original values, Grok 4.5 off-clamp and Grok 4.3 modern-model coverage are restored, and the Grok 4.6 xhigh boundary test passes its id explicitly. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(agents): add Grok 4.6 to the curated high-signal live matrix xai is a curated-only high-signal provider, so the new flagship was structurally excluded from default live sweeps; add it alongside Grok 4.5 with its test and docs mirrors, matching the 4.5 precedent. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(xai): align Grok frontier metadata * fix(xai): align Grok 4.6 catalog contract Remove the unsupported moving alias, centralize OAuth auto target resolution, correct cached pricing, and keep live coverage on the stable xhigh completion path. Co-authored-by: Kiran Magic <262980978+kiranmagic7@users.noreply.github.com> --------- Co-authored-by: Kiran Magic <262980978+kiranmagic7@users.noreply.github.com> Co-authored-by: Kiran Magic <kiran@Alices-Laptop.local> Co-authored-by: Claude Fable 5 <noreply@anthropic.com> Co-authored-by: Kiran <kiranmagic7@users.noreply.github.com> Co-authored-by: Peter Steinberger <steipete@gmail.com>
62 lines
2.1 KiB
TypeScript
62 lines
2.1 KiB
TypeScript
// Xai provider module implements model/runtime integration.
|
|
import type {
|
|
ProviderResolveDynamicModelContext,
|
|
ProviderRuntimeModel,
|
|
} from "openclaw/plugin-sdk/plugin-entry";
|
|
import { normalizeModelCompat } from "openclaw/plugin-sdk/provider-model-shared";
|
|
import {
|
|
normalizeOptionalLowercaseString,
|
|
normalizeOptionalString,
|
|
} from "openclaw/plugin-sdk/string-coerce-runtime";
|
|
import { resolveXaiCatalogEntry, XAI_BASE_URL } from "./model-definitions.js";
|
|
import { normalizeXaiModelId, resolveXaiOAuthAutoModelId } from "./model-id.js";
|
|
import { applyXaiRuntimeModelCompat } from "./runtime-model-compat.js";
|
|
|
|
const XAI_MODERN_MODEL_PREFIXES = [
|
|
"grok-4.6",
|
|
"grok-4.5",
|
|
"grok-build-0.1",
|
|
"grok-4.3",
|
|
"grok-4.20",
|
|
] as const;
|
|
|
|
export function isModernXaiModel(modelId: string): boolean {
|
|
const normalized = normalizeXaiModelId(modelId.trim());
|
|
const lower = normalizeOptionalLowercaseString(normalized) ?? "";
|
|
if (!lower || lower.includes("multi-agent")) {
|
|
return false;
|
|
}
|
|
return XAI_MODERN_MODEL_PREFIXES.some((prefix) => lower.startsWith(prefix));
|
|
}
|
|
|
|
export function resolveXaiForwardCompatModel(params: {
|
|
providerId: string;
|
|
ctx: ProviderResolveDynamicModelContext;
|
|
}) {
|
|
const definition = resolveXaiCatalogEntry(params.ctx.modelId);
|
|
if (!definition) {
|
|
return undefined;
|
|
}
|
|
|
|
return applyXaiRuntimeModelCompat(
|
|
normalizeModelCompat({
|
|
id: definition.id,
|
|
name: definition.name,
|
|
api: params.ctx.providerConfig?.api ?? "openai-responses",
|
|
provider: params.providerId,
|
|
baseUrl: normalizeOptionalString(params.ctx.providerConfig?.baseUrl) ?? XAI_BASE_URL,
|
|
reasoning: definition.reasoning,
|
|
input: definition.input,
|
|
cost: definition.cost,
|
|
contextWindow: definition.contextWindow,
|
|
maxTokens: definition.maxTokens,
|
|
} as ProviderRuntimeModel),
|
|
);
|
|
}
|
|
|
|
export function normalizeXaiResolvedModel(model: ProviderRuntimeModel): ProviderRuntimeModel {
|
|
const resolvedModelId = resolveXaiOAuthAutoModelId(model.id, model.params);
|
|
const resolved = resolvedModelId === model.id ? model : { ...model, id: resolvedModelId };
|
|
return applyXaiRuntimeModelCompat(resolved);
|
|
}
|