Files
openclaw/src/plugin-sdk/provider-tools.ts
Peter Steinberger bb46b79d3c refactor: internalize OpenClaw agent runtime (#85341)
* 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
2026-05-27 19:24:04 +01:00

517 lines
15 KiB
TypeScript

import type { TSchema } from "typebox";
import {
cleanSchemaForGemini,
GEMINI_UNSUPPORTED_SCHEMA_KEYWORDS,
} from "../agents/schema/clean-for-gemini.js";
import { stripUnsupportedSchemaKeywords } from "../shared/schema-keyword-strip.js";
import type {
AnyAgentTool,
ProviderNormalizeToolSchemasContext,
ProviderToolSchemaDiagnostic,
} from "./plugin-entry.js";
// Shared provider-tool helpers for plugin-owned schema compatibility rewrites.
export { cleanSchemaForGemini, GEMINI_UNSUPPORTED_SCHEMA_KEYWORDS, stripUnsupportedSchemaKeywords };
export function findUnsupportedSchemaKeywords(
schema: unknown,
path: string,
unsupportedKeywords: ReadonlySet<string>,
): string[] {
if (!schema || typeof schema !== "object") {
return [];
}
if (Array.isArray(schema)) {
return schema.flatMap((item, index) =>
findUnsupportedSchemaKeywords(item, `${path}[${index}]`, unsupportedKeywords),
);
}
const record = schema as Record<string, unknown>;
const violations: string[] = [];
const properties =
record.properties && typeof record.properties === "object" && !Array.isArray(record.properties)
? (record.properties as Record<string, unknown>)
: undefined;
if (properties) {
for (const [key, value] of Object.entries(properties)) {
violations.push(
...findUnsupportedSchemaKeywords(value, `${path}.properties.${key}`, unsupportedKeywords),
);
}
}
for (const [key, value] of Object.entries(record)) {
if (key === "properties") {
continue;
}
if (unsupportedKeywords.has(key)) {
violations.push(`${path}.${key}`);
}
if (value && typeof value === "object") {
violations.push(
...findUnsupportedSchemaKeywords(value, `${path}.${key}`, unsupportedKeywords),
);
}
}
return violations;
}
export function normalizeGeminiToolSchemas(
ctx: ProviderNormalizeToolSchemasContext,
): AnyAgentTool[] {
return ctx.tools.map((tool) => {
if (!tool.parameters || typeof tool.parameters !== "object") {
return tool;
}
return {
...tool,
parameters: cleanSchemaForGemini(tool.parameters),
};
});
}
export function inspectGeminiToolSchemas(
ctx: ProviderNormalizeToolSchemasContext,
): ProviderToolSchemaDiagnostic[] {
return ctx.tools.flatMap((tool, toolIndex) => {
const violations = findUnsupportedSchemaKeywords(
tool.parameters,
`${tool.name}.parameters`,
GEMINI_UNSUPPORTED_SCHEMA_KEYWORDS,
);
if (violations.length === 0) {
return [];
}
return [{ toolName: tool.name, toolIndex, violations }];
});
}
export function normalizeOpenAIToolSchemas(
ctx: ProviderNormalizeToolSchemasContext,
): AnyAgentTool[] {
if (!shouldApplyOpenAIToolCompat(ctx)) {
return ctx.tools;
}
return ctx.tools.map((tool) => {
if (tool.parameters == null) {
return {
...tool,
parameters: normalizeOpenAIStrictCompatSchema({}),
};
}
if (typeof tool.parameters !== "object") {
return tool;
}
return {
...tool,
parameters: normalizeOpenAIStrictCompatSchema(tool.parameters),
};
});
}
function normalizeOpenAIStrictCompatSchema(schema: unknown): TSchema {
return normalizeOpenAIStrictCompatSchemaRecursive(schema, {
promoteEmptyObject: true,
}) as TSchema;
}
function shouldApplyOpenAIToolCompat(ctx: ProviderNormalizeToolSchemasContext): boolean {
const provider = (ctx.model?.provider ?? ctx.provider ?? "").trim().toLowerCase();
const api = (ctx.model?.api ?? ctx.modelApi ?? "").trim().toLowerCase();
const baseUrl = (ctx.model?.baseUrl ?? "").trim().toLowerCase();
if (provider === "openai") {
return api === "openai-responses" && (!baseUrl || isOpenAIResponsesBaseUrl(baseUrl));
}
if (provider === "openai-codex") {
return (
api === "openai-codex-responses" &&
(!baseUrl || isOpenAIResponsesBaseUrl(baseUrl) || isOpenAICodexBaseUrl(baseUrl))
);
}
return false;
}
function isOpenAIResponsesBaseUrl(baseUrl: string): boolean {
return /^https:\/\/api\.openai\.com(?:\/v1)?(?:\/|$)/i.test(baseUrl);
}
function isOpenAICodexBaseUrl(baseUrl: string): boolean {
return /^https:\/\/chatgpt\.com\/backend-api(?:\/|$)/i.test(baseUrl);
}
type NormalizeOpenAIStrictCompatOptions = {
promoteEmptyObject: boolean;
};
const OPENAI_STRICT_COMPAT_SCHEMA_MAP_KEYS = new Set([
"$defs",
"definitions",
"dependentSchemas",
"patternProperties",
"properties",
]);
const OPENAI_STRICT_COMPAT_SCHEMA_NESTED_KEYS = new Set([
"additionalProperties",
"allOf",
"anyOf",
"contains",
"else",
"if",
"items",
"not",
"oneOf",
"prefixItems",
"propertyNames",
"then",
"unevaluatedItems",
"unevaluatedProperties",
]);
function normalizeOpenAIStrictCompatSchemaMap(schema: unknown): unknown {
if (!schema || typeof schema !== "object" || Array.isArray(schema)) {
return schema;
}
let changed = false;
const normalized: Record<string, unknown> = {};
for (const [key, value] of Object.entries(schema as Record<string, unknown>)) {
const next = normalizeOpenAIStrictCompatSchemaRecursive(value, {
promoteEmptyObject: false,
});
normalized[key] = next;
changed ||= next !== value;
}
return changed ? normalized : schema;
}
function normalizeOpenAIStrictCompatSchemaRecursive(
schema: unknown,
options: NormalizeOpenAIStrictCompatOptions,
): unknown {
if (Array.isArray(schema)) {
let changed = false;
const normalized = schema.map((entry) => {
const next = normalizeOpenAIStrictCompatSchemaRecursive(entry, {
promoteEmptyObject: false,
});
changed ||= next !== entry;
return next;
});
return changed ? normalized : schema;
}
if (!schema || typeof schema !== "object") {
return schema;
}
const record = schema as Record<string, unknown>;
let changed = false;
const normalized: Record<string, unknown> = {};
for (const [key, value] of Object.entries(record)) {
const next = OPENAI_STRICT_COMPAT_SCHEMA_MAP_KEYS.has(key)
? normalizeOpenAIStrictCompatSchemaMap(value)
: OPENAI_STRICT_COMPAT_SCHEMA_NESTED_KEYS.has(key)
? normalizeOpenAIStrictCompatSchemaRecursive(value, {
promoteEmptyObject: false,
})
: value;
normalized[key] = next;
changed ||= next !== value;
}
if (Object.keys(normalized).length === 0) {
if (!options.promoteEmptyObject) {
return schema;
}
return {
type: "object",
properties: {},
required: [],
additionalProperties: false,
};
}
const hasObjectShapeHints =
!("type" in normalized) &&
((normalized.properties &&
typeof normalized.properties === "object" &&
!Array.isArray(normalized.properties)) ||
Array.isArray(normalized.required));
if (hasObjectShapeHints) {
normalized.type = "object";
changed = true;
}
if (normalized.type === "object" && !("properties" in normalized)) {
normalized.properties = {};
changed = true;
}
const hasEmptyProperties =
normalized.properties &&
typeof normalized.properties === "object" &&
!Array.isArray(normalized.properties) &&
Object.keys(normalized.properties as Record<string, unknown>).length === 0;
if (normalized.type === "object" && !Array.isArray(normalized.required) && hasEmptyProperties) {
normalized.required = [];
changed = true;
}
if (
normalized.type === "object" &&
hasEmptyProperties &&
!("additionalProperties" in normalized)
) {
normalized.additionalProperties = false;
changed = true;
}
return changed ? normalized : schema;
}
export function findOpenAIStrictSchemaViolations(
schema: unknown,
path: string,
options?: { requireObjectRoot?: boolean },
): string[] {
if (Array.isArray(schema)) {
if (options?.requireObjectRoot) {
return [`${path}.type`];
}
return schema.flatMap((item, index) =>
findOpenAIStrictSchemaViolations(item, `${path}[${index}]`),
);
}
if (!schema || typeof schema !== "object") {
if (options?.requireObjectRoot) {
return [`${path}.type`];
}
return [];
}
const record = schema as Record<string, unknown>;
const violations: string[] = [];
for (const key of ["anyOf", "oneOf", "allOf"] as const) {
if (Array.isArray(record[key])) {
violations.push(`${path}.${key}`);
}
}
if (Array.isArray(record.type)) {
violations.push(`${path}.type`);
}
const properties =
record.properties && typeof record.properties === "object" && !Array.isArray(record.properties)
? (record.properties as Record<string, unknown>)
: undefined;
if (record.type === "object") {
if (record.additionalProperties !== false) {
violations.push(`${path}.additionalProperties`);
}
const required = Array.isArray(record.required)
? record.required.filter((entry): entry is string => typeof entry === "string")
: undefined;
if (!required) {
violations.push(`${path}.required`);
} else if (properties) {
const requiredSet = new Set(required);
for (const key of Object.keys(properties)) {
if (!requiredSet.has(key)) {
violations.push(`${path}.required.${key}`);
}
}
}
}
if (properties) {
for (const [key, value] of Object.entries(properties)) {
violations.push(...findOpenAIStrictSchemaViolations(value, `${path}.properties.${key}`));
}
}
for (const [key, value] of Object.entries(record)) {
if (key === "properties") {
continue;
}
if (value && typeof value === "object") {
violations.push(...findOpenAIStrictSchemaViolations(value, `${path}.${key}`));
}
}
return violations;
}
export function inspectOpenAIToolSchemas(
ctx: ProviderNormalizeToolSchemasContext,
): ProviderToolSchemaDiagnostic[] {
if (!shouldApplyOpenAIToolCompat(ctx)) {
return [];
}
// Native OpenAI transports fall back to `strict: false` when any tool schema is not
// strict-compatible, so these findings are expected for optional-heavy tool schemas.
return [];
}
export const DEEPSEEK_UNSUPPORTED_SCHEMA_KEYWORDS = new Set(["anyOf", "oneOf"]);
function isNullSchemaVariant(schema: unknown): boolean {
if (!schema || typeof schema !== "object" || Array.isArray(schema)) {
return false;
}
const record = schema as Record<string, unknown>;
if (record.type === "null") {
return true;
}
if (Array.isArray(record.type) && record.type.length === 1 && record.type[0] === "null") {
return true;
}
if ("const" in record && record.const === null) {
return true;
}
return Array.isArray(record.enum) && record.enum.length === 1 && record.enum[0] === null;
}
function normalizeDeepSeekSchema(schema: unknown): unknown {
if (Array.isArray(schema)) {
let changed = false;
const normalized = schema.map((entry) => {
const next = normalizeDeepSeekSchema(entry);
changed ||= next !== entry;
return next;
});
return changed ? normalized : schema;
}
if (!schema || typeof schema !== "object") {
return schema;
}
const record = schema as Record<string, unknown>;
const unionKey = Array.isArray(record.anyOf)
? "anyOf"
: Array.isArray(record.oneOf)
? "oneOf"
: undefined;
let changed = false;
const normalized: Record<string, unknown> = {};
for (const [key, value] of Object.entries(record)) {
if (key === "anyOf" || key === "oneOf") {
if (key === unionKey) {
changed = true;
continue;
}
}
const next = normalizeDeepSeekSchema(value);
normalized[key] = next;
changed ||= next !== value;
}
if (!unionKey) {
return changed ? normalized : schema;
}
const variants = record[unionKey] as unknown[];
const normalizedVariants = variants.map((entry) => normalizeDeepSeekSchema(entry));
const nonNullVariants = normalizedVariants.filter((entry) => !isNullSchemaVariant(entry));
const hasNullVariant = nonNullVariants.length < normalizedVariants.length;
// Preserve string-const unions as a flat string enum so DeepSeek tool
// callers still see every allowed literal. Without this, a Typebox
// `Type.Union([Type.Literal("a"), Type.Literal("b"), ...])` collapses to
// only the first const and the model can never pick any other value.
if (nonNullVariants.length > 1 && nonNullVariants.every((entry) => isStringConstVariant(entry))) {
const enumValues = nonNullVariants.map((entry) => (entry as { const: string }).const);
const merged: Record<string, unknown> = {
...normalized,
type: "string",
enum: enumValues,
};
if (hasNullVariant) {
merged.nullable = true;
}
return merged;
}
const selected = nonNullVariants[0] ?? normalizedVariants[0];
if (!selected || typeof selected !== "object" || Array.isArray(selected)) {
return normalized;
}
const merged = {
...(selected as Record<string, unknown>),
...normalized,
};
if (hasNullVariant) {
merged.nullable = true;
}
return merged;
}
function isStringConstVariant(entry: unknown): entry is { const: string } {
if (!entry || typeof entry !== "object" || Array.isArray(entry)) {
return false;
}
const record = entry as Record<string, unknown>;
return typeof record.const === "string";
}
export function normalizeDeepSeekToolSchemas(
ctx: ProviderNormalizeToolSchemasContext,
): AnyAgentTool[] {
return ctx.tools.map((tool) => {
if (!tool.parameters || typeof tool.parameters !== "object") {
return tool;
}
const parameters = normalizeDeepSeekSchema(tool.parameters);
return parameters === tool.parameters
? tool
: {
...tool,
parameters: parameters as TSchema,
};
});
}
export function inspectDeepSeekToolSchemas(
ctx: ProviderNormalizeToolSchemasContext,
): ProviderToolSchemaDiagnostic[] {
return ctx.tools.flatMap((tool, toolIndex) => {
const violations = findUnsupportedSchemaKeywords(
tool.parameters,
`${tool.name}.parameters`,
DEEPSEEK_UNSUPPORTED_SCHEMA_KEYWORDS,
);
if (violations.length === 0) {
return [];
}
return [{ toolName: tool.name, toolIndex, violations }];
});
}
export type ProviderToolCompatFamily = "deepseek" | "gemini" | "openai";
export function buildProviderToolCompatFamilyHooks(family: ProviderToolCompatFamily): {
normalizeToolSchemas: (ctx: ProviderNormalizeToolSchemasContext) => AnyAgentTool[];
inspectToolSchemas: (ctx: ProviderNormalizeToolSchemasContext) => ProviderToolSchemaDiagnostic[];
} {
switch (family) {
case "deepseek":
return {
normalizeToolSchemas: normalizeDeepSeekToolSchemas,
inspectToolSchemas: inspectDeepSeekToolSchemas,
};
case "gemini":
return {
normalizeToolSchemas: normalizeGeminiToolSchemas,
inspectToolSchemas: inspectGeminiToolSchemas,
};
case "openai":
return {
normalizeToolSchemas: normalizeOpenAIToolSchemas,
inspectToolSchemas: inspectOpenAIToolSchemas,
};
}
throw new Error("Unsupported provider tool compatibility family");
}