From f1bf4da891d6603dab9b65277cf1a8000405201a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Jul 2026 17:58:26 +0200 Subject: [PATCH] chore(deps): bump the minor group with 2 updates (#840) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps the minor group with 2 updates: [@agentclientprotocol/sdk](https://github.com/agentclientprotocol/typescript-sdk) and [hono](https://github.com/honojs/hono). Updates `@agentclientprotocol/sdk` from 1.1.0 to 1.2.0
Release notes

Sourced from @​agentclientprotocol/sdk's releases.

v1.2.0

1.2.0 (2026-07-06)

Features

Bug Fixes

Changelog

Sourced from @​agentclientprotocol/sdk's changelog.

1.2.0 (2026-07-06)

Features

Bug Fixes

Commits

Updates `hono` from 4.12.27 to 4.12.28
Release notes

Sourced from hono's releases.

v4.12.28

What's Changed

New Contributors

Full Changelog: https://github.com/honojs/hono/compare/v4.12.27...v4.12.28

Commits

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself) - `@dependabot ignore minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself) - `@dependabot ignore ` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself) - `@dependabot unignore ` will remove all of the ignore conditions of the specified dependency - `@dependabot unignore ` will remove the ignore condition of the specified dependency and ignore conditions
--------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Ben Brandt --- package-lock.json | 14 ++-- package.json | 2 +- src/elicitation.ts | 127 ++++++++++++++++++++-------------- src/tests/acp-agent.test.ts | 8 ++- src/tests/elicitation.test.ts | 54 +++++++++------ 5 files changed, 123 insertions(+), 82 deletions(-) diff --git a/package-lock.json b/package-lock.json index f796617b..8133efa6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "0.56.0", "license": "Apache-2.0", "dependencies": { - "@agentclientprotocol/sdk": "1.1.0", + "@agentclientprotocol/sdk": "1.2.0", "@anthropic-ai/claude-agent-sdk": "0.3.201", "zod": "^3.25.0 || ^4.0.0" }, @@ -36,9 +36,9 @@ } }, "node_modules/@agentclientprotocol/sdk": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@agentclientprotocol/sdk/-/sdk-1.1.0.tgz", - "integrity": "sha512-NT2KqphUJ3w6EksUL51ZhJgIYgq/ZLGcBPkyMKgRSO5PMVwe9DnKKX+Htnvk6KHh6dUuh34UHK4gKp+4te1Mdg==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@agentclientprotocol/sdk/-/sdk-1.2.0.tgz", + "integrity": "sha512-rJ3766M2eouZsNCaK21JbPD++JLBZ0PWq38dzj1sA4/i0njaQEkiC2F5v7MlizFW6akX+qu5Ks8R00Xw+YMHKA==", "license": "Apache-2.0", "peerDependencies": { "zod": "^3.25.0 || ^4.0.0" @@ -2371,9 +2371,9 @@ } }, "node_modules/hono": { - "version": "4.12.27", - "resolved": "https://registry.npmjs.org/hono/-/hono-4.12.27.tgz", - "integrity": "sha512-1yrb/+w6HWQJrUCLkJ2IF5jNIPvvFkblV5RNOYl6bV+OA6p9GLcMpHFFGTosSvHvcAUibuUukRqhlYI4z32C7Q==", + "version": "4.12.28", + "resolved": "https://registry.npmjs.org/hono/-/hono-4.12.28.tgz", + "integrity": "sha512-YwUvVpSF7m1yOblFPrU3Hbo8XhPheBoiyfGuII6z19LnOr6JpDnyyp7LFNrfV56wS8tpvtBFGRISHN02pDdLOA==", "license": "MIT", "peer": true, "engines": { diff --git a/package.json b/package.json index 01588df6..df973398 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "node": ">=22" }, "dependencies": { - "@agentclientprotocol/sdk": "1.1.0", + "@agentclientprotocol/sdk": "1.2.0", "@anthropic-ai/claude-agent-sdk": "0.3.201", "zod": "^3.25.0 || ^4.0.0" }, diff --git a/src/elicitation.ts b/src/elicitation.ts index 43a3a8ed..4174c2cc 100644 --- a/src/elicitation.ts +++ b/src/elicitation.ts @@ -2,6 +2,8 @@ import { randomUUID } from "node:crypto"; import type { CreateElicitationRequest, CreateElicitationResponse, + ElicitationAcceptAction, + ElicitationContentValue, ElicitationPropertySchema, ElicitationSchema, EnumOption, @@ -68,6 +70,45 @@ export function mcpElicitationToCreateRequest( }; } +/** A wire value allowed in elicitation form content. */ +function isElicitationContentValue(value: unknown): value is ElicitationContentValue { + return ( + typeof value === "string" || + typeof value === "number" || + typeof value === "boolean" || + (Array.isArray(value) && value.every((item) => typeof item === "string")) + ); +} + +/** + * Content of an accepted elicitation response. + * + * The response union includes a custom/future-action variant whose `action` is + * plain `string`, so a positive `=== "accept"` check can never narrow it away + * and `content` reads as `unknown`. Rather than asserting which union member + * this is, validate the values: the SDK's own wire validation has the same + * blind spot (an accept response with malformed content parses via the + * catch-all variant), so ill-typed values are dropped here either way. + */ +function acceptedElicitationContent( + response: CreateElicitationResponse, +): NonNullable { + if (response.action !== "accept") { + return {}; + } + const { content } = response; + if (!content || typeof content !== "object") { + return {}; + } + const validated: NonNullable = {}; + for (const [key, value] of Object.entries(content)) { + if (isElicitationContentValue(value)) { + validated[key] = value; + } + } + return validated; +} + /** * Map an ACP elicitation response back to the MCP `ElicitResult` the SDK expects * to hand back to the requesting server. @@ -77,7 +118,7 @@ export function createElicitationResponseToElicitResult( ): ElicitationResult { switch (response.action) { case "accept": - return { action: "accept", content: response.content ?? {} }; + return { action: "accept", content: acceptedElicitationContent(response) }; case "decline": return { action: "decline" }; case "cancel": @@ -126,33 +167,13 @@ function questionCustomFieldKey(index: number): string { } /** - * `_meta` key under which a bridged enum option carries its structured - * `description`/`preview`, since ACP's `EnumOption` has no field for either. - * Namespaced like the agent's other `_meta` extensions (`_claude/...`). + * `_meta` key under which a bridged enum option carries its `preview`, the one + * option field ACP's `EnumOption` still has no slot for (descriptions are + * first-class as of schema 1.19). Namespaced like the agent's other `_meta` + * extensions (`_claude/...`). */ const OPTION_META_KEY = "_claude/askUserQuestionOption"; -/** A single option as supplied by the AskUserQuestion tool. */ -type AskUserQuestionOption = AskUserQuestion["options"][number]; - -/** - * Build the `_meta` payload that carries an option's structured `description` - * and optional `preview` for clients that can render them as distinct fields. - * Returns `undefined` when neither is present, so we don't emit an empty `_meta`. - */ -function askUserQuestionOptionMeta( - option: AskUserQuestionOption, -): NonNullable | undefined { - const detail: { description?: string; preview?: string } = {}; - if (option.description) { - detail.description = option.description; - } - if (option.preview) { - detail.preview = option.preview; - } - return Object.keys(detail).length > 0 ? { [OPTION_META_KEY]: detail } : undefined; -} - /** * Render the AskUserQuestion tool's questions as an ACP form elicitation. * @@ -160,7 +181,8 @@ function askUserQuestionOptionMeta( * question text, so the question text appears in exactly one place per field. * Single-select questions use a titled `oneOf` enum; multi-select questions use * an array with a titled `anyOf` item enum. The enum `const` is always the - * option label, since that is what the tool records as the answer. + * option label, since that is what the tool records as the answer; an option's + * secondary text travels in the enum option's own `description` field. * * Each question is followed by its own optional free-text "custom answer" field * (`question__custom`), mirroring the CLI's per-question "Other" box: the @@ -180,19 +202,16 @@ export function askUserQuestionsToCreateRequest( const options: EnumOption[] = question.options.map((option) => { const enumOption: EnumOption = { const: option.label, - // `title` stays a flattened "label — description" string so clients that - // only read `const`/`title` still surface the description. Clients that - // understand the `_meta` below should prefer its structured fields (and - // treat `const` as the clean label) rather than parsing this title. - title: option.description ? `${option.label} — ${option.description}` : option.label, + title: option.label, }; - // The SDK option carries a `description` (secondary text) and an optional - // `preview` (mockups, code snippets, comparisons shown on focus). Neither - // has a structural slot in `EnumOption`, so forward them under ACP's - // reserved `_meta` extension point for clients that can render them. - const meta = askUserQuestionOptionMeta(option); - if (meta) { - enumOption._meta = meta; + if (option.description) { + enumOption.description = option.description; + } + // The SDK option's `preview` (mockups, code snippets, comparisons shown + // on focus) still has no structural slot in `EnumOption`, so forward it + // under ACP's reserved `_meta` extension point for clients that render it. + if (option.preview) { + enumOption._meta = { [OPTION_META_KEY]: { preview: option.preview } }; } return enumOption; }); @@ -243,22 +262,23 @@ export type AskUserQuestionOutcome = * custom-answer field (`question__custom`) takes precedence over that * question's selection, since the user typed their own answer instead of * picking one. Decline yields empty answers (the model is told the user skipped - * rather than the turn aborting); cancel aborts the tool call. + * rather than the turn aborting); cancel — and any custom/future action we + * don't understand — aborts the tool call. */ export function applyAskElicitationResponse( response: CreateElicitationResponse, toolInput: Record, questions: AskUserQuestion[], ): AskUserQuestionOutcome { - if (response.action === "cancel") { - return { action: "cancel" }; - } - if (response.action === "decline") { return { action: "answered", updatedInput: { ...toolInput, answers: {} } }; } - const content = response.content ?? {}; + if (response.action !== "accept") { + return { action: "cancel" }; + } + + const content = acceptedElicitationContent(response); // Typed against the tool's own output schema so the answer/response shapes // stay in sync with what the built-in tool's call() expects to read back. const answers: AskUserQuestionOutput["answers"] = {}; @@ -372,7 +392,7 @@ export function refusalFallbackToCreateRequest( sessionId, message: `${prompt.originalModel} declined this request${category}. ` + - `Retry with ${prompt.fallbackModel}? The session would continue on ${prompt.fallbackModel}.` + + `Retry with ${prompt.fallbackModel}?` + guidance, requestedSchema: { type: "object", @@ -380,8 +400,16 @@ export function refusalFallbackToCreateRequest( [REFUSAL_FALLBACK_CHOICE_KEY]: { type: "string", oneOf: [ - { const: RETRY_FALLBACK_RESULT, title: `Retry with ${prompt.fallbackModel}` }, - { const: KEEP_REFUSAL_RESULT, title: "Keep the refusal" }, + { + const: RETRY_FALLBACK_RESULT, + title: `Retry with ${prompt.fallbackModel}`, + description: `The session continues on ${prompt.fallbackModel}.`, + }, + { + const: KEEP_REFUSAL_RESULT, + title: "Keep the refusal", + description: "You can send a new message.", + }, ], }, }, @@ -397,9 +425,6 @@ export function refusalFallbackToCreateRequest( * switch the user didn't ask for. */ export function refusalFallbackResultFromResponse(response: CreateElicitationResponse): string { - if (response.action !== "accept") { - return KEEP_REFUSAL_RESULT; - } - const choice = response.content?.[REFUSAL_FALLBACK_CHOICE_KEY]; + const choice = acceptedElicitationContent(response)[REFUSAL_FALLBACK_CHOICE_KEY]; return choice === RETRY_FALLBACK_RESULT ? RETRY_FALLBACK_RESULT : KEEP_REFUSAL_RESULT; } diff --git a/src/tests/acp-agent.test.ts b/src/tests/acp-agent.test.ts index a577c5d0..f26f68a4 100644 --- a/src/tests/acp-agent.test.ts +++ b/src/tests/acp-agent.test.ts @@ -204,7 +204,9 @@ describe.skipIf(!process.env.RUN_INTEGRATION_TESTS)("ACP subprocess integration" params: CreateElicitationRequest, ): Promise { this.elicitations.push(params); - if (params.mode !== "form") { + // The `in` check also excludes the custom/future-mode variant, whose + // `mode: string` would otherwise survive the literal comparison. + if (params.mode !== "form" || !("requestedSchema" in params)) { return { action: "decline" }; } // Accept the first option of every choice field (skip the free-text one). @@ -436,7 +438,9 @@ describe.skipIf(!process.env.RUN_INTEGRATION_TESTS)("ACP subprocess integration" // which confirms our interception path produced it rather than some other // mechanism. const properties = - elicitation.mode === "form" ? Object.keys(elicitation.requestedSchema.properties ?? {}) : []; + elicitation.mode === "form" && "requestedSchema" in elicitation + ? Object.keys(elicitation.requestedSchema.properties ?? {}) + : []; expect(properties).toContain("question_0"); expect(properties).toContain("question_0_custom"); diff --git a/src/tests/elicitation.test.ts b/src/tests/elicitation.test.ts index 128b031c..920ff9cd 100644 --- a/src/tests/elicitation.test.ts +++ b/src/tests/elicitation.test.ts @@ -22,7 +22,7 @@ const SESSION_ID = "session-1"; /** * Build a question matching the SDK's (strict) AskUserQuestion schema while * keeping test sites terse. Option descriptions default to "" (the tool always - * provides one); pass a description to exercise the "label — description" title. + * provides one); pass a description to exercise the enum option's description. */ function mkQuestion( question: string, @@ -127,6 +127,14 @@ describe("createElicitationResponseToElicitResult", () => { createElicitationResponseToElicitResult({ action: "cancel" } as CreateElicitationResponse), ).toEqual({ action: "cancel" }); }); + + it("maps a custom/future action to cancel", () => { + expect( + createElicitationResponseToElicitResult({ + action: "_zed/snooze", + } as CreateElicitationResponse), + ).toEqual({ action: "cancel" }); + }); }); describe("extractAskUserQuestions", () => { @@ -190,14 +198,10 @@ describe("askUserQuestionsToCreateRequest", () => { title: "Library", description: undefined, oneOf: [ - { - const: "date-fns", - title: "date-fns — Lightweight", - // Structured description forwarded under `_meta` so clients can render - // it as secondary text instead of parsing it out of the title. - _meta: { "_claude/askUserQuestionOption": { description: "Lightweight" } }, - }, - // No description → no `_meta` emitted. + // The description travels in the enum option's first-class field; the + // title stays the clean label (no "label — description" flattening). + { const: "date-fns", title: "date-fns", description: "Lightweight" }, + // No description → the field is omitted entirely. { const: "luxon", title: "luxon" }, ], }); @@ -205,7 +209,7 @@ describe("askUserQuestionsToCreateRequest", () => { expect(schema.properties?.["Which library?"]).toBeUndefined(); }); - it("forwards option description and preview under _meta for rich clients", () => { + it("carries descriptions structurally and forwards previews under _meta", () => { const questions = [ mkQuestion("Which layout?", [ { @@ -226,24 +230,22 @@ describe("askUserQuestionsToCreateRequest", () => { ).requestedSchema; const oneOf = (schema.properties?.["question_0"] as { oneOf: EnumOption[] }).oneOf; - // Both description and preview travel structurally; the title still flattens - // the description for clients that only read const/title. + // The description uses the enum option's own field; only the preview — + // which still has no structural slot — rides under `_meta`. expect(oneOf[0]).toEqual({ const: "Grid", - title: "Grid — Cards in a responsive grid", + title: "Grid", + description: "Cards in a responsive grid", _meta: { "_claude/askUserQuestionOption": { - description: "Cards in a responsive grid", preview: "```\n[ ] [ ] [ ]\n[ ] [ ] [ ]\n```", }, }, }); - // Description only → preview omitted from _meta. - expect(oneOf[1]._meta).toEqual({ - "_claude/askUserQuestionOption": { description: "Stacked rows" }, - }); - // Neither → no _meta at all. - expect(oneOf[2]._meta).toBeUndefined(); + // Description only → no _meta needed. + expect(oneOf[1]).toEqual({ const: "List", title: "List", description: "Stacked rows" }); + // Neither → just the label. + expect(oneOf[2]).toEqual({ const: "Plain", title: "Plain" }); }); it("includes a per-question optional free-text custom-answer field", () => { @@ -379,6 +381,13 @@ describe("applyAskElicitationResponse", () => { }); }); + it("returns cancel for a custom/future action it does not understand", () => { + const response = { action: "_zed/snooze" } as CreateElicitationResponse; + expect(applyAskElicitationResponse(response, toolInput, questions)).toEqual({ + action: "cancel", + }); + }); + it("omits answers for questions the user left unanswered", () => { const response = { action: "accept", @@ -450,11 +459,14 @@ describe("refusalFallbackToCreateRequest", () => { const choice = request.requestedSchema.properties?.choice as { type: string; - oneOf: Array<{ const: string; title: string }>; + oneOf: Array<{ const: string; title: string; description?: string }>; }; expect(choice.type).toBe("string"); expect(choice.oneOf.map((o) => o.const)).toEqual(["retry_fallback", "cancelled"]); expect(choice.oneOf[0].title).toContain("claude-opus-4-8"); + // Each option explains its consequence in the description field. + expect(choice.oneOf[0].description).toContain("claude-opus-4-8"); + expect(choice.oneOf[1].description).toBeTruthy(); }); it("omits the category marker and appends guidance when provided", () => {