fix: render tool schemas with root-level anyOf/oneOf composition
A tool's `inputSchema` may carry composition keywords at its root — the 2026-07-28 revision makes this explicit — but both form builders enumerate the root's `properties` and nothing else. A schema keeping its fields on `allOf`/`oneOf`/`anyOf` branches therefore rendered no controls at all: no branch picker, no fields, not even the raw-JSON fallback a union-typed *property* falls back to, so the tool could only be called with empty arguments. Adds `core/json/rootUnion.ts`, one flattening shared by all three clients so they cannot drift on which schemas they can render: - `allOf` is merged unconditionally (conjunctive — there is no choice to present), a root `oneOf`/`anyOf` is returned as branches. - Web `SchemaForm` renders a Variant picker above the fields and prunes the outgoing branch's values on a switch, since they are no longer visible and would describe a shape the call is not making. - TUI `schemaToForm` gives each branch its own section with optional fields — ink-form is static, and only one alternative applies to a call. - `convertToolParameters` looks through the branches, so a CLI `--tool-arg` is typed by the schema that declares it rather than sent as a string. Required-field gating asks whether *any* branch is satisfied, which is selection-independent and never blocks arguments the schema accepts. A `const` is seeded like a `default` and rendered read-only: it admits exactly one value, so anything else the user could type produces a rejected call. Adds a `root-union-schemas-http.json` showcase server. Closes #2123 Signed-off-by: cliffhall <cliff@futurescale.com>
This commit is contained in:
parent
ca2846de28
commit
5933162dd0
1 changed files with 1259 additions and 29 deletions
|
|
@ -408,4 +408,89 @@ describe("schemaToForm", () => {
|
|||
});
|
||||
});
|
||||
});
|
||||
describe("root composition (#2123)", () => {
|
||||
const UNION = {
|
||||
type: "object",
|
||||
properties: { note: { type: "string" } },
|
||||
discriminator: { propertyName: "kind" },
|
||||
oneOf: [
|
||||
{
|
||||
type: "object",
|
||||
properties: {
|
||||
kind: { type: "string", const: "email" },
|
||||
address: { type: "string" },
|
||||
},
|
||||
required: ["kind", "address"],
|
||||
},
|
||||
{
|
||||
type: "object",
|
||||
properties: {
|
||||
kind: { type: "string", const: "sms" },
|
||||
count: { type: "integer" },
|
||||
},
|
||||
required: ["kind", "count"],
|
||||
},
|
||||
],
|
||||
};
|
||||
|
||||
it("gives each branch its own section instead of rendering no fields", () => {
|
||||
const form = schemaToForm(UNION, "union_tool");
|
||||
expect(form.sections.map((section) => section.title)).toEqual([
|
||||
"Parameters",
|
||||
"email",
|
||||
"sms",
|
||||
]);
|
||||
expect(form.sections[0]!.fields.map((field) => field.name)).toEqual([
|
||||
"note",
|
||||
]);
|
||||
expect(form.sections[1]!.fields.map((field) => field.name)).toEqual([
|
||||
"kind",
|
||||
"address",
|
||||
]);
|
||||
});
|
||||
|
||||
it("keeps a branch's typed fields typed", () => {
|
||||
const form = schemaToForm(UNION, "union_tool");
|
||||
expect(form.sections[2]!.fields[1]).toMatchObject({
|
||||
name: "count",
|
||||
type: "integer",
|
||||
});
|
||||
});
|
||||
|
||||
it("renders branch fields optional, since only one branch applies", () => {
|
||||
const form = schemaToForm(UNION, "union_tool");
|
||||
for (const field of form.sections[1]!.fields) {
|
||||
expect(field.required).toBe(false);
|
||||
}
|
||||
});
|
||||
|
||||
it("seeds a branch's discriminator const so it need not be typed", () => {
|
||||
const form = schemaToForm(UNION, "union_tool");
|
||||
expect(form.sections[1]!.fields[0]).toMatchObject({
|
||||
name: "kind",
|
||||
initialValue: "email",
|
||||
});
|
||||
});
|
||||
|
||||
it("merges a root allOf into the parameters section", () => {
|
||||
const form = schemaToForm(
|
||||
{
|
||||
type: "object",
|
||||
properties: { a: { type: "string" } },
|
||||
allOf: [{ type: "object", properties: { b: { type: "boolean" } } }],
|
||||
},
|
||||
"allof_tool",
|
||||
);
|
||||
expect(form.sections).toHaveLength(1);
|
||||
expect(form.sections[0]!.fields.map((field) => field.name)).toEqual([
|
||||
"a",
|
||||
"b",
|
||||
]);
|
||||
});
|
||||
|
||||
it("still renders an empty form for a schema with no properties", () => {
|
||||
const form = schemaToForm({ type: "object" }, "empty_tool");
|
||||
expect(form.sections).toEqual([{ title: "Parameters", fields: [] }]);
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
|
|||
Loading…
Reference in a new issue