mirror of
https://github.com/openclaw/openclaw.git
synced 2026-06-02 21:35:18 +00:00
* refactor: extract agent core package Introduce packages/agent-core as the OpenClaw-owned home for reusable agent loop, harness, session, prompt, and runtime dependency contracts. * refactor: extract shared llm runtime Move provider model registries, stream wrappers, OAuth helpers, and LLM utilities into src/llm with plugin-sdk barrels instead of depending on the old embedded runtime layout. * refactor: remove pi runtime internals Rename remaining Pi-shaped agent surfaces to OpenClaw agent runtime names, delete obsolete Pi docs and package graph checks, and add the third-party notice for incorporated code. * refactor: tighten agent session runtime Make agent-core/runtime dependencies explicit, consolidate compaction and session transcript helpers, and move model/session helpers behind OpenClaw-owned contracts. * refactor: remove static model and pi auth paths Drop static model catalogs and Pi auth bridges, move model/provider facts to manifest-owned runtime contracts, and harden internal embedded-agent utilities. * refactor: remove legacy provider compat paths * docs: remove agent parity notes * fix: skip provider wildcard metadata parsing * refactor: share session extension sdk loading * refactor: inline acpx proxy error formatter * refactor: fold edit recovery into edit tool * fix: accept extension batch separator * test: align startup provider plugin expectations * fix: restore provider-scoped release discovery * test: align static asset packaging expectations * fix: run static provider catalogs during scoped discovery * fix: add provider entry catalogs for scoped live discovery * fix: load lightweight provider catalog entries * fix: refresh provider-scoped plugin metadata * fix: keep provider catalog entries on release live path * fix: keep static manifest models in release live checks * fix: harden release model discovery * fix: reduce OpenAI live cache probe reasoning * fix: disable OpenAI cache probe reasoning * ci: extend OpenAI gateway live timeout * fix: extend live gateway model budget * fix: stabilize release validation regressions * fix: honor provider aliases in model rows * fix: stabilize release validation lanes * fix: stabilize release memory qa * ci: stabilize release validation lanes * ci: prefer ipv4 for live docker node calls * fix: restore shared tool-call stream wrapper * ci: remove legacy pi test shard alias * fix: clean up embedded agent test drift * fix: stabilize runtime alias status * fix: clean up embedded agent ci drift * fix: restore release ci invariants * fix: clean up post-rebase runtime drift * fix: restore release ci checks * fix: restore release ci after rebase * fix: remove stale pi runtime path * test: align compaction runtime expectations * test: update plugin prerelease expectations * fix: handle claude live tool approvals * fix: stabilize release validation gates * fix: finish agent runtime import * test: finish post-rebase agent runtime mocks * fix: keep codex compaction native * fix: stabilize codex app-server hook tests * test: isolate codex diagnostic active run * test: remove codex diagnostic completion race # Conflicts: # extensions/codex/src/app-server/run-attempt.test.ts * ci: fix full release manifest performance run id * refactor: narrow llm plugin sdk boundary * chore: drop generated google boundary stamps * fix: repair rebase fallout * fix: clean up rebased runtime references * fix: decode codex jwt payloads as base64url * fix: preserve shipped pi runtime alias * fix: add scoped sdk virtual modules * fix: decode llm codex oauth jwt as base64url * fix: avoid stale vertex adc negative cache * fix: harden tool arg decoding and codeql path * fix: keep vertex adc negative checks live * refactor: consolidate codex jwt and edit helpers * fix: await codex oauth node runtime imports * fix: preserve sdk tool and notice contracts * fix: preserve shipped compat config boundaries * fix: align codex oauth callback host * fix: terminate agent-core loop streams on failure * fix: keep codex oauth callback alive during fallback * ci: include session tools in critical codeql scans * fix: keep Cloudflare Anthropic provider auth header * docs: redirect legacy pi runtime pages * fix: honor bundled web provider compat discovery * fix: protect session output spill files * fix: keep legacy agent dir env blocked * fix: contain auto-discovered skill symlinks * fix: harden agent core sdk proxy surfaces * fix: restore approval reaction sdk compat * fix: keep live docker runs bounded * fix: keep codex oauth redirect host aligned * fix: resolve post-rebase agent runtime drift * fix: redact anthropic oauth parse failures * fix: preserve responses strict tool shaping * fix: repair agent runtime rebase cleanup * docs: redirect retired parity pages * fix: bound auto-discovered resources to roots * fix: repair post-rebase agent test drift * fix: preserve bundled provider allowlist migration * fix: preserve manifest-owned provider aliases * fix: declare photon image dependency * fix: keep provider headers out of proxy body * fix: preserve shipped env aliases * fix: refresh control ui i18n generated state * fix: quote read fallback paths * fix: preview edits through configured backend * test: satisfy core test typecheck * fix: preserve ZAI usage auth fallback * test: repair codex diagnostic test * fix: repair agent runtime rebase drift * test: finish embedded runner import rename * fix: repair agent runtime rebase integrations * test: align compaction oauth fallback expectations * fix: allow sdk-auth session models * fix: update doctor tool schema import * fix: preserve bedrock plugin region * fix: stream harmony-like prose immediately * ci: include session runtime in codeql shards * fix: repair latest rebase integrations * fix: honor explicit codex websocket transport * fix: keep openai-compatible credentials provider-scoped * fix: refresh sdk api baseline after rebase * fix: route cli runtime aliases through openclaw harness * test: rename stale harness mock expectation * test: rename embedded agent overflow calls * test: clean embedded auth test wording * test: use openclaw stream types in deepinfra cache test * fix: refresh sdk api baseline on latest main * fix: honor bundled discovery compat allowlists * fix: refresh sdk api baseline after latest rebase * fix: remove stale rebase imports * test: rename stale model catalog mock * test: mock renamed doctor runtime modules * fix: map canonical kimi env auth * fix: use internal model registry in bench script * fix: migrate deepinfra provider catalog entry * fix: enforce builtin tool suppression * fix: route compaction auth and proxy payloads safely * refactor: prune unused llm registry leftovers * test: update codex hooks session import * test: fix model picker ci coverage * test: align model picker auth mock types
245 lines
9.3 KiB
TypeScript
245 lines
9.3 KiB
TypeScript
import { defineSingleProviderPluginEntry } from "openclaw/plugin-sdk/provider-entry";
|
|
import { OPENAI_COMPATIBLE_REPLAY_HOOKS } from "openclaw/plugin-sdk/provider-model-shared";
|
|
import { defaultToolStreamExtraParams } from "openclaw/plugin-sdk/provider-stream-shared";
|
|
import { jsonResult } from "openclaw/plugin-sdk/provider-web-search";
|
|
import { Type } from "typebox";
|
|
import {
|
|
applyXaiRuntimeModelCompat,
|
|
buildXaiImageGenerationProvider,
|
|
normalizeXaiModelId,
|
|
resolveXaiTransport,
|
|
} from "./api.js";
|
|
import { applyXaiConfig, XAI_DEFAULT_MODEL_REF } from "./onboard.js";
|
|
import { buildXaiProvider } from "./provider-catalog.js";
|
|
import { isModernXaiModel, resolveXaiForwardCompatModel } from "./provider-models.js";
|
|
import { resolveThinkingProfile } from "./provider-policy-api.js";
|
|
import { buildXaiRealtimeTranscriptionProvider } from "./realtime-transcription-provider.js";
|
|
import { buildXaiSpeechProvider } from "./speech-provider.js";
|
|
import {
|
|
isXaiToolEnabled,
|
|
resolveFallbackXaiAuth,
|
|
type XaiToolAuthContext,
|
|
} from "./src/tool-auth-shared.js";
|
|
import { resolveEffectiveXSearchConfig } from "./src/x-search-config.js";
|
|
import { wrapXaiProviderStream } from "./stream.js";
|
|
import { buildXaiMediaUnderstandingProvider } from "./stt.js";
|
|
import { buildXaiVideoGenerationProvider } from "./video-generation-provider.js";
|
|
import { createXaiWebSearchProvider } from "./web-search.js";
|
|
import {
|
|
buildMissingXSearchApiKeyPayload,
|
|
createXSearchToolDefinition,
|
|
} from "./x-search-tool-shared.js";
|
|
import {
|
|
createXaiDeviceCodeAuthMethod,
|
|
createXaiOAuthAuthMethod,
|
|
refreshXaiOAuthCredential,
|
|
} from "./xai-oauth.js";
|
|
|
|
const PROVIDER_ID = "xai";
|
|
type CodeExecutionModule = typeof import("./code-execution.js");
|
|
type XSearchModule = typeof import("./x-search.js");
|
|
|
|
const XAI_CREDIT_OR_SPENDING_LIMIT_RE =
|
|
/\b(?:used all available credits|monthly spending limit|purchase more credits|raise your spending limit)\b/i;
|
|
const XAI_RATE_LIMIT_RE = /\b(?:rate limit exceeded|too many requests)\b/i;
|
|
|
|
let codeExecutionModulePromise: Promise<CodeExecutionModule> | undefined;
|
|
let xSearchModulePromise: Promise<XSearchModule> | undefined;
|
|
|
|
function loadCodeExecutionModule(): Promise<CodeExecutionModule> {
|
|
codeExecutionModulePromise ??= import("./code-execution.js");
|
|
return codeExecutionModulePromise;
|
|
}
|
|
|
|
function loadXSearchModule(): Promise<XSearchModule> {
|
|
xSearchModulePromise ??= import("./x-search.js");
|
|
return xSearchModulePromise;
|
|
}
|
|
|
|
function classifyXaiFailoverReason(errorMessage: string) {
|
|
if (XAI_CREDIT_OR_SPENDING_LIMIT_RE.test(errorMessage)) {
|
|
return "billing" as const;
|
|
}
|
|
if (XAI_RATE_LIMIT_RE.test(errorMessage)) {
|
|
return "rate_limit" as const;
|
|
}
|
|
return undefined;
|
|
}
|
|
|
|
function hasResolvableXaiApiKey(config: unknown, auth?: XaiToolAuthContext): boolean {
|
|
return isXaiToolEnabled({ sourceConfig: config as never, auth });
|
|
}
|
|
|
|
function isCodeExecutionEnabled(config: unknown, auth?: XaiToolAuthContext): boolean {
|
|
if (!config || typeof config !== "object") {
|
|
return hasResolvableXaiApiKey(config, auth);
|
|
}
|
|
const entries = (config as Record<string, unknown>).plugins;
|
|
const pluginEntries =
|
|
entries && typeof entries === "object"
|
|
? ((entries as Record<string, unknown>).entries as Record<string, unknown> | undefined)
|
|
: undefined;
|
|
const xaiEntry =
|
|
pluginEntries && typeof pluginEntries.xai === "object"
|
|
? (pluginEntries.xai as Record<string, unknown>)
|
|
: undefined;
|
|
const pluginConfig =
|
|
xaiEntry && typeof xaiEntry.config === "object"
|
|
? (xaiEntry.config as Record<string, unknown>)
|
|
: undefined;
|
|
const codeExecution =
|
|
pluginConfig && typeof pluginConfig.codeExecution === "object"
|
|
? (pluginConfig.codeExecution as Record<string, unknown>)
|
|
: undefined;
|
|
if (codeExecution?.enabled === false) {
|
|
return false;
|
|
}
|
|
return hasResolvableXaiApiKey(config, auth);
|
|
}
|
|
|
|
function isXSearchEnabled(config: unknown, auth?: XaiToolAuthContext): boolean {
|
|
const resolved =
|
|
config && typeof config === "object"
|
|
? resolveEffectiveXSearchConfig(config as never)
|
|
: undefined;
|
|
if (resolved?.enabled === false) {
|
|
return false;
|
|
}
|
|
return hasResolvableXaiApiKey(config, auth);
|
|
}
|
|
|
|
function createLazyCodeExecutionTool(ctx: {
|
|
config?: Record<string, unknown>;
|
|
runtimeConfig?: Record<string, unknown>;
|
|
hasAuthForProvider?: XaiToolAuthContext["hasAuthForProvider"];
|
|
resolveApiKeyForProvider?: XaiToolAuthContext["resolveApiKeyForProvider"];
|
|
}) {
|
|
const effectiveConfig = ctx.runtimeConfig ?? ctx.config;
|
|
if (!isCodeExecutionEnabled(effectiveConfig, ctx)) {
|
|
return null;
|
|
}
|
|
|
|
return {
|
|
label: "Code Execution",
|
|
name: "code_execution",
|
|
description:
|
|
"Run sandboxed Python analysis with xAI. Use for calculations, tabulation, summaries, and chart-style analysis without local machine access.",
|
|
parameters: Type.Object({
|
|
task: Type.String({
|
|
description:
|
|
"The full analysis task for xAI's remote Python sandbox. Include any data to analyze directly in the task.",
|
|
}),
|
|
}),
|
|
execute: async (toolCallId: string, args: Record<string, unknown>) => {
|
|
const { createCodeExecutionTool } = await loadCodeExecutionModule();
|
|
const tool = createCodeExecutionTool({
|
|
config: ctx.config as never,
|
|
runtimeConfig: (ctx.runtimeConfig as never) ?? null,
|
|
auth: ctx,
|
|
});
|
|
if (!tool) {
|
|
return jsonResult({
|
|
error: "missing_xai_api_key",
|
|
message:
|
|
"code_execution needs xAI credentials. Run `openclaw onboard --auth-choice xai-oauth` to sign in with Grok, run `openclaw onboard --auth-choice xai-api-key`, set `XAI_API_KEY` in the Gateway environment, or configure `plugins.entries.xai.config.webSearch.apiKey`.",
|
|
docs: "https://docs.openclaw.ai/tools/code-execution",
|
|
});
|
|
}
|
|
return await tool.execute(toolCallId, args);
|
|
},
|
|
};
|
|
}
|
|
|
|
function createLazyXSearchTool(ctx: {
|
|
config?: Record<string, unknown>;
|
|
runtimeConfig?: Record<string, unknown>;
|
|
hasAuthForProvider?: XaiToolAuthContext["hasAuthForProvider"];
|
|
resolveApiKeyForProvider?: XaiToolAuthContext["resolveApiKeyForProvider"];
|
|
}) {
|
|
const effectiveConfig = ctx.runtimeConfig ?? ctx.config;
|
|
if (!isXSearchEnabled(effectiveConfig, ctx)) {
|
|
return null;
|
|
}
|
|
|
|
return createXSearchToolDefinition(async (toolCallId: string, args: Record<string, unknown>) => {
|
|
const { createXSearchTool } = await loadXSearchModule();
|
|
const tool = createXSearchTool({
|
|
config: ctx.config as never,
|
|
runtimeConfig: (ctx.runtimeConfig as never) ?? null,
|
|
auth: ctx,
|
|
});
|
|
if (!tool) {
|
|
return jsonResult(buildMissingXSearchApiKeyPayload());
|
|
}
|
|
return await tool.execute(toolCallId, args);
|
|
});
|
|
}
|
|
|
|
export default defineSingleProviderPluginEntry({
|
|
id: "xai",
|
|
name: "xAI Plugin",
|
|
description: "Bundled xAI plugin",
|
|
provider: {
|
|
label: "xAI",
|
|
aliases: ["x-ai"],
|
|
docsPath: "/providers/xai",
|
|
auth: [
|
|
{
|
|
methodId: "api-key",
|
|
label: "xAI API key",
|
|
hint: "API key",
|
|
optionKey: "xaiApiKey",
|
|
flagName: "--xai-api-key",
|
|
envVar: "XAI_API_KEY",
|
|
promptMessage: "Enter xAI API key",
|
|
defaultModel: XAI_DEFAULT_MODEL_REF,
|
|
applyConfig: (cfg) => applyXaiConfig(cfg),
|
|
wizard: {
|
|
groupLabel: "xAI (Grok)",
|
|
},
|
|
},
|
|
],
|
|
extraAuth: [createXaiOAuthAuthMethod(), createXaiDeviceCodeAuthMethod()],
|
|
catalog: {
|
|
buildProvider: buildXaiProvider,
|
|
},
|
|
...OPENAI_COMPATIBLE_REPLAY_HOOKS,
|
|
prepareExtraParams: (ctx) => defaultToolStreamExtraParams(ctx.extraParams),
|
|
wrapStreamFn: wrapXaiProviderStream,
|
|
// Provider-specific fallback auth stays owned by the xAI plugin so core
|
|
// auth/discovery code can consume it generically without parsing xAI's
|
|
// private config layout. Callers may receive a real key from the active
|
|
// runtime snapshot or a non-secret SecretRef marker from source config.
|
|
resolveSyntheticAuth: ({ config }) => {
|
|
const fallbackAuth = resolveFallbackXaiAuth(config);
|
|
if (!fallbackAuth) {
|
|
return undefined;
|
|
}
|
|
return {
|
|
apiKey: fallbackAuth.apiKey,
|
|
source: fallbackAuth.source,
|
|
mode: "api-key" as const,
|
|
};
|
|
},
|
|
normalizeResolvedModel: ({ model }) => applyXaiRuntimeModelCompat(model),
|
|
normalizeTransport: ({ provider, api, baseUrl }) =>
|
|
resolveXaiTransport({ provider, api, baseUrl }),
|
|
normalizeModelId: ({ modelId }) => normalizeXaiModelId(modelId),
|
|
resolveDynamicModel: (ctx) => resolveXaiForwardCompatModel({ providerId: PROVIDER_ID, ctx }),
|
|
refreshOAuth: refreshXaiOAuthCredential,
|
|
resolveThinkingProfile,
|
|
isModernModelRef: ({ modelId }) => isModernXaiModel(modelId),
|
|
classifyFailoverReason: ({ errorMessage }) => classifyXaiFailoverReason(errorMessage),
|
|
},
|
|
register(api) {
|
|
api.registerWebSearchProvider(createXaiWebSearchProvider());
|
|
api.registerMediaUnderstandingProvider(buildXaiMediaUnderstandingProvider());
|
|
api.registerVideoGenerationProvider(buildXaiVideoGenerationProvider());
|
|
api.registerImageGenerationProvider(buildXaiImageGenerationProvider());
|
|
api.registerSpeechProvider(buildXaiSpeechProvider());
|
|
api.registerRealtimeTranscriptionProvider(buildXaiRealtimeTranscriptionProvider());
|
|
api.registerTool((ctx) => createLazyCodeExecutionTool(ctx), { name: "code_execution" });
|
|
api.registerTool((ctx) => createLazyXSearchTool(ctx), { name: "x_search" });
|
|
},
|
|
});
|