惯性聚合 高效追踪和阅读你感兴趣的博客、新闻、科技资讯
阅读原文 在惯性聚合中打开

推荐订阅源

D
DataBreaches.Net
GbyAI
GbyAI
aimingoo的专栏
aimingoo的专栏
freeCodeCamp Programming Tutorials: Python, JavaScript, Git & More
月光博客
月光博客
大猫的无限游戏
大猫的无限游戏
M
MIT News - Artificial intelligence
腾讯CDC
博客园 - Franky
Engineering at Meta
Engineering at Meta
C
Check Point Blog
T
The Blog of Author Tim Ferriss
有赞技术团队
有赞技术团队
Microsoft Azure Blog
Microsoft Azure Blog
MyScale Blog
MyScale Blog
I
InfoQ
Blog — PlanetScale
Blog — PlanetScale
P
Proofpoint News Feed
The GitHub Blog
The GitHub Blog
N
Netflix TechBlog - Medium
Last Week in AI
Last Week in AI
S
SegmentFault 最新的问题
Cyber Security Advisories - MS-ISAC
Cyber Security Advisories - MS-ISAC
WordPress大学
WordPress大学

Recent Commits to openclaw:main

test: merge chat side-result checks · openclaw/openclaw@ddd2c2a test: merge cron history checks · openclaw/openclaw@f7eb746 test: merge responsive navigation shell checks · openclaw/openclaw@c2e4b47 docs(changelog): add codex oauth fixes · openclaw/openclaw@628e6cd test: merge navigation routing cases · openclaw/openclaw@5d8cecb Tests: mock channel registry bundled fallback · openclaw/openclaw@2b08233 Secrets: avoid broad web search discovery for single plugin config · openclaw/openclaw@a464f59 test: merge config view browser checks · openclaw/openclaw@20cf511 fix(status): align oauth health with runtime · openclaw/openclaw@eed7116 feat: add macOS screen snapshots for monitor preview (#67954) thanks … · openclaw/openclaw@f377db1 fix: report shared auth scopes in hello-ok (#67810) thanks @BunsDev · openclaw/openclaw@0b6c39b Auto-reply: avoid eager bundled route fallback · openclaw/openclaw@3ea1bf4 Tests: narrow session binding contract setup · openclaw/openclaw@54e4e16 fix(macOS): enable undo/redo in webchat composer text input (#34962) · openclaw/openclaw@00951dc Tests: speed up channel setup promotion · openclaw/openclaw@82b529a Docs: refresh agent instructions · openclaw/openclaw@5775fe2 fix(auth): serialize OAuth refresh across agents to fix #26322 (#67876) · openclaw/openclaw@8e79080 test: allow ollama public surface boundary test · openclaw/openclaw@7d4f1a6 Docs: add test performance guardrails · openclaw/openclaw@89706d3 Tests: restore context-engine usage proof · openclaw/openclaw@e4c4f95 Tests: slim context engine runtime coverage · openclaw/openclaw@74c198f ci: retry failed custom checkouts · openclaw/openclaw@0ee5baf test: trim duplicate provider auth onboarding cases · openclaw/openclaw@1ffc02e matrix: fix sessions_spawn --thread subagent session spawning (#67643) · openclaw/openclaw@1ce2596 test: reduce auth choice fixture churn · openclaw/openclaw@857b9cd test: mock health status config boundaries · openclaw/openclaw@9d5ab4a test: mock onboard config io boundary · openclaw/openclaw@299694d test: mock legacy state plugin boundaries · openclaw/openclaw@2713089 test: mock channel install boundaries · openclaw/openclaw@b945248 test: mock doctor preview channel boundaries · openclaw/openclaw@b1a3ad4
fix(mcp): inline local refs in bundled tool schemas (#812...
giodl73-repo · 2026-05-17 · via Recent Commits to openclaw:main

@@ -309,14 +309,184 @@ function stripEmptyArrayItemsFromArraySchemas(schema: unknown): unknown {

309309

return changed ? Object.fromEntries(entries) : schema;

310310

}

311311312+

type SchemaDefs = {

313+

$defs: Map<string, unknown>;

314+

definitions: Map<string, unknown>;

315+

};

316+317+

function copySchemaMeta(from: Record<string, unknown>, to: Record<string, unknown>): void {

318+

for (const key of ["title", "description", "default"] as const) {

319+

if (key in from && from[key] !== undefined) {

320+

to[key] = from[key];

321+

}

322+

}

323+

}

324+325+

function extendSchemaDefs(

326+

defs: SchemaDefs | undefined,

327+

schema: Record<string, unknown>,

328+

): SchemaDefs | undefined {

329+

const defsEntry =

330+

schema.$defs && typeof schema.$defs === "object" && !Array.isArray(schema.$defs)

331+

? (schema.$defs as Record<string, unknown>)

332+

: undefined;

333+

const legacyDefsEntry =

334+

schema.definitions &&

335+

typeof schema.definitions === "object" &&

336+

!Array.isArray(schema.definitions)

337+

? (schema.definitions as Record<string, unknown>)

338+

: undefined;

339+340+

if (!defsEntry && !legacyDefsEntry) {

341+

return defs;

342+

}

343+344+

const next: SchemaDefs = defs

345+

? {

346+

$defs: new Map(defs.$defs),

347+

definitions: new Map(defs.definitions),

348+

}

349+

: {

350+

$defs: new Map<string, unknown>(),

351+

definitions: new Map<string, unknown>(),

352+

};

353+

if (defsEntry) {

354+

for (const [key, value] of Object.entries(defsEntry)) {

355+

next.$defs.set(key, value);

356+

}

357+

}

358+

if (legacyDefsEntry) {

359+

for (const [key, value] of Object.entries(legacyDefsEntry)) {

360+

next.definitions.set(key, value);

361+

}

362+

}

363+

return next;

364+

}

365+366+

function decodeJsonPointerSegment(segment: string): string {

367+

return segment.replaceAll("~1", "/").replaceAll("~0", "~");

368+

}

369+370+

function resolveJsonPointerPath(value: unknown, segments: string[]): unknown {

371+

let current = value;

372+

for (const segment of segments) {

373+

if (!current || typeof current !== "object") {

374+

return undefined;

375+

}

376+

const key = decodeJsonPointerSegment(segment);

377+

if (Array.isArray(current)) {

378+

const index = Number(key);

379+

if (!Number.isInteger(index) || index < 0 || index >= current.length) {

380+

return undefined;

381+

}

382+

current = current[index];

383+

continue;

384+

}

385+

const record = current as Record<string, unknown>;

386+

if (!Object.prototype.hasOwnProperty.call(record, key)) {

387+

return undefined;

388+

}

389+

current = record[key];

390+

}

391+

return current;

392+

}

393+394+

function tryResolveLocalRef(ref: string, defs: SchemaDefs | undefined): unknown {

395+

if (!defs) {

396+

return undefined;

397+

}

398+

const match = ref.match(/^#\/(\$defs|definitions)\/([^/]+)(?:\/(.*))?$/);

399+

if (!match) {

400+

return undefined;

401+

}

402+

const namespace = match[1] === "$defs" ? defs.$defs : defs.definitions;

403+

const name = decodeJsonPointerSegment(match[2] ?? "");

404+

const resolved = name ? namespace.get(name) : undefined;

405+

if (resolved === undefined) {

406+

return undefined;

407+

}

408+

const remainingPath = match[3] ? match[3].split("/") : [];

409+

return resolveJsonPointerPath(resolved, remainingPath);

410+

}

411+412+

function inlineLocalSchemaRefsWithDefs(

413+

schema: unknown,

414+

defs: SchemaDefs | undefined,

415+

refStack: Set<string> | undefined,

416+

state: { unresolvedLocalRefs: boolean },

417+

): unknown {

418+

if (!schema || typeof schema !== "object") {

419+

return schema;

420+

}

421+

if (Array.isArray(schema)) {

422+

return schema.map((entry) => inlineLocalSchemaRefsWithDefs(entry, defs, refStack, state));

423+

}

424+425+

const obj = schema as Record<string, unknown>;

426+

const nextDefs = extendSchemaDefs(defs, obj);

427+

const refValue = typeof obj.$ref === "string" ? obj.$ref : undefined;

428+429+

if (refValue) {

430+

if (refStack?.has(refValue)) {

431+

return {};

432+

}

433+

const resolved = tryResolveLocalRef(refValue, nextDefs);

434+

if (resolved === undefined) {

435+

if (refValue.startsWith("#/")) {

436+

state.unresolvedLocalRefs = true;

437+

}

438+

return { ...obj };

439+

}

440+

const nextRefStack = refStack ? new Set(refStack) : new Set<string>();

441+

nextRefStack.add(refValue);

442+

const inlined = inlineLocalSchemaRefsWithDefs(resolved, nextDefs, nextRefStack, state);

443+

if (!inlined || typeof inlined !== "object" || Array.isArray(inlined)) {

444+

return inlined;

445+

}

446+

const result: Record<string, unknown> = { ...(inlined as Record<string, unknown>) };

447+

copySchemaMeta(obj, result);

448+

return result;

449+

}

450+451+

const result: Record<string, unknown> = {};

452+

for (const [key, value] of Object.entries(obj)) {

453+

if (key === "$defs" || key === "definitions") {

454+

continue;

455+

}

456+

result[key] = inlineLocalSchemaRefsWithDefs(value, nextDefs, refStack, state);

457+

}

458+

if (state.unresolvedLocalRefs) {

459+

if ("$defs" in obj) {

460+

result.$defs = obj.$defs;

461+

}

462+

if ("definitions" in obj) {

463+

result.definitions = obj.definitions;

464+

}

465+

}

466+

return result;

467+

}

468+469+

export function inlineLocalToolSchemaRefs(schema: unknown): TSchema {

470+

if (!schema || typeof schema !== "object") {

471+

return schema as TSchema;

472+

}

473+

const defs = extendSchemaDefs(undefined, schema as Record<string, unknown>);

474+

return inlineLocalSchemaRefsWithDefs(schema, defs, undefined, {

475+

unresolvedLocalRefs: false,

476+

}) as TSchema;

477+

}

478+312479

export function normalizeToolParameterSchema(

313480

schema: unknown,

314481

options?: { modelProvider?: string; modelId?: string; modelCompat?: ModelCompatConfig },

315482

): TSchema {

483+

const inlinedSchema = inlineLocalToolSchemaRefs(schema);

316484

const schemaRecord =

317-

schema && typeof schema === "object" ? (schema as Record<string, unknown>) : undefined;

485+

inlinedSchema && typeof inlinedSchema === "object"

486+

? (inlinedSchema as Record<string, unknown>)

487+

: undefined;

318488

if (!schemaRecord) {

319-

return schema as TSchema;

489+

return inlinedSchema;

320490

}

321491322492

// Provider quirks:

@@ -378,9 +548,9 @@ export function normalizeToolParameterSchema(

378548

if (conditionalKey === "allOf") {

379549

// Top-level `allOf` is not safely flattenable with the same heuristics we

380550

// use for unions. Keep it explicit rather than silently rewriting it.

381-

return applyProviderCleaning(schema);

551+

return applyProviderCleaning(inlinedSchema);

382552

}

383-

return applyProviderCleaning(schema);

553+

return applyProviderCleaning(inlinedSchema);

384554

}

385555

const variants = schemaRecord[flattenableVariantKey] as unknown[];

386556

const mergedProperties: Record<string, unknown> = {};