fix(question): surface schema failures as friendly tool errors (#28563)
This commit is contained in:
@@ -146,12 +146,26 @@ export const layer = Layer.effect(
|
|||||||
log.info("asking", { id, questions: input.questions.length })
|
log.info("asking", { id, questions: input.questions.length })
|
||||||
|
|
||||||
const deferred = yield* Deferred.make<ReadonlyArray<Answer>, RejectedError>()
|
const deferred = yield* Deferred.make<ReadonlyArray<Answer>, RejectedError>()
|
||||||
const info = Schema.decodeUnknownSync(Request)({
|
// Use the Effect-returning decode so a schema failure surfaces as a
|
||||||
|
// typed error the tool wrap can turn into a "rewrite the input" tool
|
||||||
|
// result. The previous `decodeUnknownSync` would throw uncaught, which
|
||||||
|
// crashed the assistant turn for any payload that slipped past the
|
||||||
|
// wrap-level validation (#28438).
|
||||||
|
const info = yield* Schema.decodeUnknownEffect(Request)({
|
||||||
id,
|
id,
|
||||||
sessionID: input.sessionID,
|
sessionID: input.sessionID,
|
||||||
questions: input.questions,
|
questions: input.questions,
|
||||||
tool: input.tool,
|
tool: input.tool,
|
||||||
})
|
}).pipe(
|
||||||
|
Effect.mapError(
|
||||||
|
(error) =>
|
||||||
|
new Error(
|
||||||
|
`The question tool was called with invalid arguments: ${error}.\nPlease rewrite the input so it satisfies the expected schema.`,
|
||||||
|
{ cause: error },
|
||||||
|
),
|
||||||
|
),
|
||||||
|
Effect.orDie,
|
||||||
|
)
|
||||||
pending.set(id, { info, deferred })
|
pending.set(id, { info, deferred })
|
||||||
yield* bus.publish(Event.Asked, info)
|
yield* bus.publish(Event.Asked, info)
|
||||||
|
|
||||||
|
|||||||
@@ -416,6 +416,46 @@ it.live("pending question rejects on instance dispose", () =>
|
|||||||
}),
|
}),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// Regression for #28438: when an invalid payload reaches `Question.ask`
|
||||||
|
// (one that's missing a required field like `question`), the previous
|
||||||
|
// `Schema.decodeUnknownSync` would throw uncaught and crash the whole
|
||||||
|
// assistant turn. The fix routes the failure through `Effect.orDie` with a
|
||||||
|
// "rewrite the input" Error so the surrounding tool wrap can hand it back to
|
||||||
|
// the model as a tool-call error rather than killing the session.
|
||||||
|
it.instance(
|
||||||
|
"ask - invalid payload surfaces as a friendly defect, not a thrown SchemaError",
|
||||||
|
() =>
|
||||||
|
Effect.gen(function* () {
|
||||||
|
const exit = yield* askEffect({
|
||||||
|
sessionID: SessionID.make("ses_invalid"),
|
||||||
|
// Cast: bypassing the public type to simulate an upstream caller
|
||||||
|
// (or a future schema divergence) that lets a missing required
|
||||||
|
// field reach the decode boundary.
|
||||||
|
questions: [
|
||||||
|
{
|
||||||
|
header: "Pick mode",
|
||||||
|
options: [
|
||||||
|
{ label: "A", description: "x" },
|
||||||
|
{ label: "B", description: "y" },
|
||||||
|
],
|
||||||
|
} as unknown as Question.Info,
|
||||||
|
],
|
||||||
|
}).pipe(Effect.exit)
|
||||||
|
|
||||||
|
expect(Exit.isFailure(exit)).toBe(true)
|
||||||
|
if (Exit.isFailure(exit)) {
|
||||||
|
const message = exit.cause.toString()
|
||||||
|
// Friendly preamble the AI SDK feeds back to the model so it can retry.
|
||||||
|
expect(message).toContain("invalid arguments")
|
||||||
|
expect(message).toContain("Please rewrite the input")
|
||||||
|
// The exact JSON path pinpointing the missing field, so the model
|
||||||
|
// knows which question and which field to fix.
|
||||||
|
expect(message).toContain(`["questions"][0]["question"]`)
|
||||||
|
}
|
||||||
|
}),
|
||||||
|
{ git: true },
|
||||||
|
)
|
||||||
|
|
||||||
it.live("pending question rejects on instance reload", () =>
|
it.live("pending question rejects on instance reload", () =>
|
||||||
Effect.gen(function* () {
|
Effect.gen(function* () {
|
||||||
const dir = yield* tmpdirScoped({ git: true })
|
const dir = yield* tmpdirScoped({ git: true })
|
||||||
|
|||||||
Reference in New Issue
Block a user