@zhushanwen/pi-ask-user 7.3.2 → 7.3.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhushanwen/pi-ask-user",
-  "version": "7.3.2",
+  "version": "7.3.4",
   "description": "Inline adaptive ask_user tool for Pi — single/multi-question structured input with split-pane preview and an inline free-text editor.",
   "type": "module",
   "main": "index.ts",
@@ -29,7 +29,7 @@
     "ARCHITECTURE.md"
   ],
   "dependencies": {
-    "@zhushanwen/extension-protocol": "0.15.0",
+    "@zhushanwen/extension-protocol": "0.17.0",
     "@zhushanwen/pi-ext-guards": "0.4.2",
     "@zhushanwen/pi-extension-logger": "0.6.1"
   },

package/src/__tests__/channel-handler.test.ts

@@ -18,6 +18,7 @@
 import type { AskUserQuestion, FormQuestion } from "@zhushanwen/extension-protocol";
 import { describe, expect, it } from "vitest";
 
+import { encodeAnswer } from "../answer-codec";
 import { createAskUserChannelHandler } from "../channel-handler";
 import type { Result } from "../types";
 
@@ -332,3 +333,64 @@ describe("createAskUserChannelHandler — input 校验", () => {
 		expect(resp).toEqual({ cancelled: true });
 	});
 });
+
+// ── 输出等价锚（plan-mode-audit-remediation 批次 3 活路径去重）──
+// TUI 三格式往返收敛为单次转换：handler 编码直接迭代 internal Question[]（formToInternalQuestions
+// 单次转换产物），不再构造 legacy AskUserQuestion[] 中转视图（formToAskUserQuestions 已删）。
+// 本组断言钉死：新路径产出 ≡ 旧「proto 中转视图 + encodeAnswer」链路的产出——proto 视图以
+// 字面量充当被删转换的参考实现（key = header ?? question、multiSelect === true 语义不变）。
+describe("TUI encode 输出等价锚（internal 单次转换 ≡ 旧 proto 中转视图链路）", () => {
+	it("handler 编码结果 ≡ 旧链路参考实现（single/multi/Other 三形态对拍）", async () => {
+		const formQuestions: FormQuestion[] = [
+			{ type: "choice", question: "Which DB?", options: [{ label: "Postgres" }, { label: "SQLite" }] },
+			{
+				type: "choice",
+				question: "Which tools?",
+				header: "Tools",
+				multi: true,
+				options: [{ label: "A" }, { label: "B" }],
+			},
+		];
+		// 被删 formToAskUserQuestions 的逐字产出形态（参考实现字面量）
+		const deletedProtoView: AskUserQuestion[] = [
+			{
+				question: "Which DB?",
+				options: [{ label: "Postgres" }, { label: "SQLite" }],
+			},
+			{
+				question: "Which tools?",
+				header: "Tools",
+				multiSelect: true,
+				options: [{ label: "A" }, { label: "B" }],
+			},
+		];
+		const internalResult: Result = {
+			questions: [],
+			answers: {
+				"Which DB?": { selected: ["Postgres"], other: "Custom DB" },
+				"Which tools?": { selected: ["B", "A"], other: null },
+			},
+			cancelled: false,
+		};
+
+		const handler = createAskUserChannelHandler(
+			makeCtx({ mode: "tui", customResult: internalResult }) as never,
+		);
+		const resp = await handler({ channelPayload: { formQuestions } });
+
+		// 旧链路参考实现：proto 中转视图 + encodeAnswer（encode SSOT 未删未改，唯一变量是视图）
+		const expected: Record<string, string> = {};
+		for (const pq of deletedProtoView) {
+			const av = internalResult.answers[pq.question];
+			if (av === undefined) continue;
+			Object.assign(expected, encodeAnswer(av, { key: pq.header ?? pq.question, multiSelect: pq.multiSelect === true }));
+		}
+		expect(resp).toEqual({ value: JSON.stringify(expected) });
+		// 主 key/Other 键逐字形态（防 expected 构造自身退化成恒真对拍）
+		expect(JSON.parse((resp as { value: string }).value)).toEqual({
+			"Which DB?": "Postgres",
+			"Which DB?__other": "Custom DB",
+			"Tools": JSON.stringify(["B", "A"]),
+		});
+	});
+});

package/src/__tests__/form-adapter.test.ts

@@ -8,7 +8,6 @@ import { describe, expect, it } from "vitest";
 
 import {
 	askUserToFormQuestions,
-	formToAskUserQuestions,
 	formToInternalQuestions,
 	internalToFormQuestions,
 } from "../form-adapter";
@@ -79,49 +78,6 @@ describe("askUserToFormQuestions（D9 旧 payload 归一）", () => {
 	});
 });
 
-describe("formToAskUserQuestions（解码视图）", () => {
-	it("choice：multi 还原为 multiSelect，保持解码 helper 契约", () => {
-		const [q] = formToAskUserQuestions([
-			{ type: "choice", question: "q", options: [{ label: "A" }], multi: true },
-		]);
-		expect(q).toEqual({ question: "q", options: [{ label: "A" }], multiSelect: true });
-	});
-
-	it("text：无 options 字段（答案经 __other 键解码）", () => {
-		const [q] = formToAskUserQuestions([{ type: "text", question: "q" }]);
-		expect(q).toEqual({ question: "q" });
-	});
-
-	it("schedule：跳过（ask-user 链路不产生）", () => {
-		const out = formToAskUserQuestions([
-			{ type: "schedule", question: "when?" },
-			{ type: "text", question: "q" },
-		]);
-		expect(out).toEqual([{ question: "q" }]);
-	});
-
-	it("round trip：internal → Form → AskUser 与旧 toProtoQuestions 语义等价", () => {
-		const form = internalToFormQuestions([internalSingle, internalMulti]);
-		const decodeView = formToAskUserQuestions(form);
-		expect(decodeView[0]).toEqual({
-			question: "Which DB?",
-			options: [
-				{ label: "Postgres", description: "Mature" },
-				{ label: "SQLite" },
-			],
-			allowOther: true,
-		});
-		expect(decodeView[1]).toEqual({
-			question: "Which tools?",
-			header: "Tools",
-			context: "pick many",
-			options: [{ label: "A" }, { label: "B" }],
-			multiSelect: true,
-			allowOther: true,
-		});
-	});
-});
-
 describe("formToInternalQuestions（TUI 组件形态）", () => {
 	it("choice → options 原样 + multiSelect 还原", () => {
 		const [q] = formToInternalQuestions([

package/src/__tests__/index.test.ts

@@ -1,5 +1,6 @@
 // src/__tests__/index.test.ts
 // Tests the factory + execute orchestration (FR-1/7/8/9/10/13) with mocked ctx/pi.
+import { getAskUserAnswer, getAskUserOther } from "@zhushanwen/extension-protocol";
 import { describe, expect, it } from "vitest";
 
 import factory from "../index";
@@ -493,7 +494,12 @@ describe("factory registration (FR-1)", () => {
 		expect(tool.name).toBe("ask_user");
 		expect(tool.label).toBe("Ask User");
 		expect(tool.description).toBeTruthy();
-		expect(tool.parameters).toBeTruthy();
+		// 结构锚定：parameters 须为 { type: 'object', properties: { questions } }（InputSchema 投影），
+		// 防 parameters 被替换成任意 truthy 值仍绿的弱断言
+		expect(tool.parameters).toMatchObject({
+			type: "object",
+			properties: expect.objectContaining({ questions: expect.anything() }),
+		});
 		expect(typeof tool.execute).toBe("function");
 		expect(typeof tool.renderCall).toBe("function");
 		expect(typeof tool.renderResult).toBe("function");
@@ -849,3 +855,78 @@ describe("execute — RPC mode (uiFormInteract via select channel)", () => {
 	});
 
 });
+
+// ── 输出等价锚（plan-mode-audit-remediation 批次 3 活路径去重）──
+// protoQuestions 副本对齐：index.ts 的 toProtoQuestions 副本已删，RPC 解码直接以
+// internal Question 调协议 helper。本组断言钉死两种视图在解码 SSOT（getAskUserAnswer /
+// getAskUserOther）下输出逐字一致——proto 视图以字面量充当被删副本的参考实现。
+describe("protoAnswersToResult 解码视图等价锚（internal Question ≡ 旧 protoQuestions 副本）", () => {
+	// internal Question（validateInput 通过后的形态）
+	const internal = [
+		{
+			question: "Which DB?",
+			options: [{ label: "Postgres" }, { label: "SQLite" }],
+		},
+		{
+			question: "Which tools?",
+			header: "Tools",
+			context: "pick many",
+			options: [{ label: "A" }, { label: "B" }],
+			multiSelect: true,
+		},
+	] as const;
+
+	// 被删 toProtoQuestions 的逐字产出形态（副本的参考实现字面量）
+	const protoView = [
+		{
+			header: undefined,
+			question: "Which DB?",
+			context: undefined,
+			options: [
+				{ label: "Postgres", description: undefined },
+				{ label: "SQLite", description: undefined },
+			],
+			multiSelect: undefined,
+			allowOther: true,
+		},
+		{
+			header: "Tools",
+			question: "Which tools?",
+			context: "pick many",
+			options: [
+				{ label: "A", description: undefined },
+				{ label: "B", description: undefined },
+			],
+			multiSelect: true,
+			allowOther: true,
+		},
+	] as const;
+
+	const answerShapes: Record<string, Record<string, string>> = {
+		"single selection": { "Which DB?": "Postgres" },
+		"multi selection (JSON array)": { Tools: JSON.stringify(["B", "A"]) },
+		"multi + other": {
+			Tools: JSON.stringify(["A"]),
+			"Tools__other": "Custom",
+		},
+		"unanswered": {},
+	};
+
+	it.each(Object.entries(answerShapes))(
+		"%s: decode via internal Question ≡ decode via deleted proto copy",
+		(_name, answers) => {
+			internal.forEach((q, i) => {
+				const pq = protoView[i]!;
+				expect(getAskUserAnswer(answers, q)).toEqual(getAskUserAnswer(answers, pq));
+				expect(getAskUserOther(answers, q) ?? null).toEqual(getAskUserOther(answers, pq) ?? null);
+			});
+		},
+	);
+
+	it("decoded values pinned（防双向同错空转）", () => {
+		expect(getAskUserAnswer({ "Which DB?": "Postgres" }, internal[0]!)).toBe("Postgres");
+		expect(getAskUserAnswer({ Tools: JSON.stringify(["B", "A"]) }, internal[1]!)).toEqual(["B", "A"]);
+		expect(getAskUserOther({ "Tools__other": "Custom" }, internal[1]!)).toBe("Custom");
+		expect(getAskUserAnswer({}, internal[0]!)).toBeUndefined();
+	});
+});

package/src/channel-handler.ts

@@ -35,12 +35,8 @@ import { getLogger } from "@zhushanwen/pi-extension-logger";
 
 import { AskUserComponent } from "./component";
 import { encodeAnswer } from "./answer-codec";
-import {
-	askUserToFormQuestions,
-	formToAskUserQuestions,
-	formToInternalQuestions,
-} from "./form-adapter";
-import { type AnswerValue, type Result, type ThemeLike } from "./types";
+import { askUserToFormQuestions, formToInternalQuestions } from "./form-adapter";
+import { type AnswerValue, type Question, type Result, type ThemeLike } from "./types";
 
 const logger = getLogger("ask-user");
 
@@ -94,6 +90,10 @@ function payloadToFormQuestions(payload: ChannelRequest["channelPayload"]): Form
  * 内部 Result.answers：key = question 全文，value = 结构化 AnswerValue
  * （selected = option label 数组，other = Other 自由文本）。
  *
+ * 迭代直接走 internal Question[]（formToInternalQuestions 的单次转换产物）——
+ * internal Question 自带编码所需 key（header ?? question）与 multiSelect 语义，
+ * 无需再经 legacy AskUserQuestion[] 中转视图。
+ *
  * proto FormAnswers 契约（@zhushanwen/extension-protocol，choice/text 部分与旧
  * AskUserAnswers 逐字兼容）：
  *   - key = question.header ?? question 全文
@@ -104,19 +104,16 @@ function payloadToFormQuestions(payload: ChannelRequest["channelPayload"]): Form
  * 序列化走 encodeAnswer（answer-codec.ts 是本扩展内的唯一 encode 实现，与协议包解码
  * helper 对齐；renderer 前端组件无法 import extension 包，独立实现对齐同一解码契约）。
  */
-function encodeTuiResultToProto(
-	protoQuestions: AskUserQuestion[],
-	result: Result,
-): FormAnswers {
+function encodeTuiResultToProto(questions: Question[], result: Result): FormAnswers {
 	const answers: FormAnswers = {};
-	for (const pq of protoQuestions) {
-		const av: AnswerValue | undefined = result.answers[pq.question];
+	for (const q of questions) {
+		const av: AnswerValue | undefined = result.answers[q.question];
 		if (av === undefined) continue; // 该问题未答（buildResult 跳过未答）
 		Object.assign(
 			answers,
 			encodeAnswer(av, {
-				key: pq.header ?? pq.question,
-				multiSelect: pq.multiSelect === true,
+				key: q.header ?? q.question,
+				multiSelect: q.multiSelect === true,
 			}),
 		);
 	}
@@ -152,7 +149,7 @@ async function runTuiProtoInteraction(
 	// 显式 undefined 守卫：裸 result.cancelled 对 undefined 会抛 TypeError（W4 修复前
 	// 靠 dialog-queue 兜底为 {cancelled:true}，现源头短路，语义等价且不再依赖兜底）。
 	if (result === null || result === undefined || result.cancelled) return null;
-	return encodeTuiResultToProto(formToAskUserQuestions(formQuestions), result);
+	return encodeTuiResultToProto(questions, result);
 }
 
 /**

package/src/channel-registry-register.ts

@@ -27,7 +27,7 @@ const logger = getLogger("ask-user");
  * 完全一致——两边用同一字符串确保拿到同一 slot 实例。改名必须两侧同步。
  */
 export const CHANNEL_HANDSHAKE_KEY = Symbol.for(
-	"@zhushanwen/pi-subagents.channelHandshake",
+	"@zhushanwen/subagent-core.channelHandshake",
 );
 
 /** 握手协议版本号。读写 slot 时校验 version !== 1 视为不兼容（warn + 重建 slot）。 */

package/src/form-adapter.ts

@@ -68,30 +68,6 @@ export function askUserToFormQuestions(legacy: AskUserQuestion[]): FormQuestion[
 	});
 }
 
-/** FormQuestion[] → legacy AskUserQuestion[]（解码视图：复用协议包
- *  getAskUserAnswer/getAskUserOther 的解码 SSOT，multi 还原为 multiSelect）。
- *  保持顺序、跳过 schedule（ask-user 链路不产生；与 formToInternalQuestions 同规则）。 */
-export function formToAskUserQuestions(form: FormQuestion[]): AskUserQuestion[] {
-	return form.flatMap((q: FormQuestion): AskUserQuestion[] => {
-		if (q.type === "schedule") return [];
-		const common = {
-			header: q.header,
-			question: q.question,
-			context: q.context,
-		};
-		return [
-			q.type === "choice"
-				? {
-						...common,
-						options: q.options,
-						multiSelect: q.multi,
-						allowOther: q.allowOther,
-					}
-				: common,
-		];
-	});
-}
-
 /** FormQuestion[] → internal Question[]（TUI 组件渲染形态）。
  *  choice → options 原样（multiSelect 还原）；text → 空 options（组件渲染为仅 Other
  *  行的自由输入，与旧 payload 无 options 问题的现状处理一致）；schedule 跳过

package/src/index.ts

@@ -4,7 +4,6 @@ import type { AgentToolResult, AgentToolUpdateCallback, ExtensionAPI, ExtensionC
 import { type Static } from "typebox";
 import {
 	type AskUserAnswers,
-	type AskUserQuestion,
 	getAskUserAnswer,
 	getAskUserOther,
 	uiFormInteract,
@@ -109,47 +108,26 @@ function renderExpandedOptions(
 	return out;
 }
 
-/**
- * 把 ask-user 内部 Question[] 映射为协议包 AskUserQuestion[]（RPC 交互声明）。
- *
- * ask-user 的 Question.options 只有 label/description（协议 AskUserOption 也无 value
- * 字段——回传值统一用 label，与 ask-user 语义一致）。
- * allowOther 固定 true：ask-user 无条件自动追加 Other（schema 不暴露此字段）。
- */
-function toProtoQuestions(questions: Question[]): AskUserQuestion[] {
-	return questions.map((q: Question) => ({
-		header: q.header,
-		question: q.question,
-		context: q.context,
-		options: q.options.map((o: Option) => ({
-			label: o.label,
-			description: o.description,
-		})),
-		multiSelect: q.multiSelect,
-		allowOther: true,
-	}));
-}
-
 /**
  * 把协议包 AskUserAnswers 转换为 ask-user 内部 Result.answers（结构化 AnswerValue）。
  *
  * 协议格式：key=header/question, 单选=string, 多选=JSON数组, Other=__other
  * ask-user 格式：key=question 全文, value=AnswerValue（selected=label 数组、other=自由文本）
  *
- * 解码走协议包 helper（getAskUserAnswer/getAskUserOther，proto 格式的唯一解码 SSOT）；
+ * 解码直接以内部 Question 调协议包 helper（getAskUserAnswer/getAskUserOther，proto
+ * 格式的唯一解码 SSOT）——internal Question 结构上就是 proto 视图（header/question/
+ * multiSelect 同名同义），无需再构造一份 AskUserQuestion[] 副本；
  * selected 空 && other 无 → 该问题未答，跳过不写入。
  */
 function protoAnswersToResult(
 	questions: Question[],
-	protoQuestions: AskUserQuestion[],
 	answers: AskUserAnswers,
 ): Record<string, AnswerValue> {
 	const out: Record<string, AnswerValue> = {};
 	for (let i = 0; i < questions.length; i++) {
 		const q = questions[i]!;
-		const iq = protoQuestions[i]!;
-		const selected = getAskUserAnswer(answers, iq);
-		const other = getAskUserOther(answers, iq) ?? null;
+		const selected = getAskUserAnswer(answers, q);
+		const other = getAskUserOther(answers, q) ?? null;
 
 		let selectedArr: string[];
 		if (Array.isArray(selected)) {
@@ -194,7 +172,6 @@ async function runRpcInteraction(
 	signal: AbortSignal | undefined,
 	ctx: ExtensionContext,
 ): Promise<Result> {
-	const protoQuestions = toProtoQuestions(questions);
 	const formQuestions = internalToFormQuestions(questions);
 	const guiCtx = {
 		mode: ctx.mode,
@@ -226,7 +203,7 @@ async function runRpcInteraction(
 	}
 	return {
 		questions,
-		answers: protoAnswersToResult(questions, protoQuestions, interact.answers),
+		answers: protoAnswersToResult(questions, interact.answers),
 		cancelled: false,
 	};
 }