@zhushanwen/pi-ask-user 6.0.1 → 7.0.2

package/src/__tests__/index.test.ts

@@ -329,7 +329,7 @@ describe("execute — result handling (FR-7)", () => {
 		const tool = getTool();
 		const fakeResult = {
 			questions: [{ question: "Which DB?", options: [{ label: "Postgres" }] }],
-			answers: { "Which DB?": "Postgres" },
+			answers: { "Which DB?": { selected: ["Postgres"], other: null } },
 			cancelled: false,
 		};
 		const result = await tool.execute(
@@ -347,7 +347,7 @@ describe("execute — result handling (FR-7)", () => {
 		const tool = getTool();
 		const fakeResult = {
 			questions: [{ question: "Which DB?", options: [{ label: "Postgres" }] }],
-			answers: { "Which DB?": "Postgres" },
+			answers: { "Which DB?": { selected: ["Postgres"], other: null } },
 			cancelled: false,
 		};
 		const result = await tool.execute(
@@ -358,7 +358,7 @@ describe("execute — result handling (FR-7)", () => {
 			makeCtx({ customResult: fakeResult }),
 		);
 		expect(result.details.questions).toEqual(fakeResult.questions);
-		expect(result.details.answers["Which DB?"]).toBe("Postgres");
+		expect(result.details.answers["Which DB?"]).toEqual({ selected: ["Postgres"], other: null });
 	});
 
 	it("I-14: cancelled (null) → 'User cancelled'", async () => {
@@ -442,7 +442,7 @@ describe("renderCall / renderResult (FR-9)", () => {
 			{
 				details: {
 					questions: [{ question: "Q", header: "H", options: [{ label: "A" }] }],
-					answers: { Q: "A" },
+					answers: { Q: { selected: ["A"], other: null } },
 					cancelled: false,
 				},
 			},
@@ -506,7 +506,7 @@ describe("renderCall / renderResult (FR-9)", () => {
 							options: [{ label: "Postgres" }, { label: "SQLite" }],
 						},
 					],
-					answers: { "Which DB?": "Postgres" },
+					answers: { "Which DB?": { selected: ["Postgres"], other: null } },
 					cancelled: false,
 				},
 			},
@@ -575,11 +575,11 @@ describe("execute — RPC mode (askUserInteract via select channel)", () => {
 			makeCtx({ mode: "rpc", selectResult: protoAnswers }),
 		);
 		expect(result.details.cancelled).toBe(false);
-		expect(result.details.answers["Which DB?"]).toBe("Postgres");
+		expect(result.details.answers["Which DB?"]).toEqual({ selected: ["Postgres"], other: null });
 		expect(result.content[0].text).toContain("Postgres");
 	});
 
-	it("R-2: multi-select answer (JSON array) → comma-joined labels", async () => {
+	it("R-2: multi-select answer (JSON array) → AnswerValue.selected", async () => {
 		const tool = getTool();
 		const multi = {
 			questions: [
@@ -600,7 +600,7 @@ describe("execute — RPC mode (askUserInteract via select channel)", () => {
 			undefined,
 			makeCtx({ mode: "rpc", selectResult: protoAnswers }),
 		);
-		expect(result.details.answers["Which tools?"]).toBe("A, C");
+		expect(result.details.answers["Which tools?"]).toEqual({ selected: ["A", "C"], other: null });
 	});
 
 	it("R-2b: multi-select 乱序回传 → 按 options 定义顺序排序（S#3）", async () => {
@@ -624,10 +624,12 @@ describe("execute — RPC mode (askUserInteract via select channel)", () => {
 			undefined,
 			makeCtx({ mode: "rpc", selectResult: protoAnswers }),
 		);
-		expect(result.details.answers["Which tools?"]).toBe("A, C");
+		expect(result.details.answers["Which tools?"]).toEqual({ selected: ["A", "C"], other: null });
 	});
 
-	it("R-3: Other free text → appended to answer parts", async () => {
+	// R-3 用例名（TC-03）：旧措辞（parseAnswerParts 时代的拼接语义）残留，
+	// 断言已结构化（{selected, other} 分离），更名为实际契约：AnswerValue.other 独立字段。
+	it("R-3: Other free text → AnswerValue.other 独立字段", async () => {
 		const tool = getTool();
 		// 单选 Postgres + Other "Custom DB"
 		const protoAnswers = JSON.stringify({
@@ -641,59 +643,25 @@ describe("execute — RPC mode (askUserInteract via select channel)", () => {
 			undefined,
 			makeCtx({ mode: "rpc", selectResult: protoAnswers }),
 		);
-		// TUI 语义：parts = [selected, other].join(", ")
-		expect(result.details.answers["Which DB?"]).toBe("Postgres, Custom DB");
+		// 结构化：selected + other 分离
+		expect(result.details.answers["Which DB?"]).toEqual({ selected: ["Postgres"], other: "Custom DB" });
 	});
 
-	it("R-4: comment → inlined with ' — ' separator", async () => {
+	it("R-3b: other-only answer (no main key) → AnswerValue {selected:[], other}", async () => {
 		const tool = getTool();
-		const withComment = {
-			questions: [
-				{
-					question: "Which DB?",
-					options: [{ label: "Postgres" }, { label: "SQLite" }],
-					allowComment: true,
-				},
-			],
-		};
+		// 修复后前端无选项自由文本问题只写 `${key}__other`（与 encodeAnswer 契约一致），
+		// 不写主 key——解码必须得 {selected:[], other}，不得产生 selected 双持有。
 		const protoAnswers = JSON.stringify({
-			"Which DB?": "Postgres",
-			"Which DB?__comment": "prod constraint",
-		});
-		const result = await tool.execute(
-			"id",
-			withComment,
-			undefined,
-			undefined,
-			makeCtx({ mode: "rpc", selectResult: protoAnswers }),
-		);
-		expect(result.details.answers["Which DB?"]).toBe("Postgres — prod constraint");
-	});
-
-	it("R-4b: comment-only answer → 保留（MF-1 回归：无选中 + comment 不静默丢失）", async () => {
-		const tool = getTool();
-		const withComment = {
-			questions: [
-				{
-					question: "Which DB?",
-					options: [{ label: "Postgres" }, { label: "SQLite" }],
-					allowComment: true,
-				},
-			],
-		};
-		// GUI 只填评论提交（无选中）：answers 只有 __comment key、无主 key
-		const protoAnswers = JSON.stringify({
-			"Which DB?__comment": "生产环境都不能用，需评估新方案",
+			"Which DB?__other": "Custom DB",
 		});
 		const result = await tool.execute(
 			"id",
-			withComment,
+			validSingle,
 			undefined,
 			undefined,
 			makeCtx({ mode: "rpc", selectResult: protoAnswers }),
 		);
-		// formatAnswer 空 parts 不再返回 null——comment-only 以 " — comment" 形式保留
-		expect(result.details.answers["Which DB?"]).toBe(" — 生产环境都不能用，需评估新方案");
+		expect(result.details.answers["Which DB?"]).toEqual({ selected: [], other: "Custom DB" });
 	});
 
 	it("R-5: user cancel (select returns undefined) → cancelled details", async () => {
@@ -744,10 +712,10 @@ describe("execute — RPC mode (askUserInteract via select channel)", () => {
 			makeCtx({ mode: "rpc", selectResult: protoAnswers }),
 		);
 		// 转换后 key 必须是 question 全文（与 TUI 版 buildResult 一致）
-		expect(result.details.answers["Which database?"]).toBe("Postgres");
+		expect(result.details.answers["Which database?"]).toEqual({ selected: ["Postgres"], other: null });
 	});
 
-	it("R-8: multi-question mixed (single-select + multi-select + Other + comment)", async () => {
+	it("R-8: multi-question mixed (single-select + multi-select + Other)", async () => {
 		const tool = getTool();
 		const mixed = {
 			questions: [
@@ -766,7 +734,6 @@ describe("execute — RPC mode (askUserInteract via select channel)", () => {
 					question: "Which region?",
 					header: "Region",
 					options: [{ label: "US" }, { label: "EU" }],
-					allowComment: true,
 				},
 			],
 		};
@@ -789,46 +756,11 @@ describe("execute — RPC mode (askUserInteract via select channel)", () => {
 
 		expect(result.details.cancelled).toBe(false);
 		// Q1: single-select
-		expect(result.details.answers["Which database?"]).toBe("Postgres");
+		expect(result.details.answers["Which database?"]).toEqual({ selected: ["Postgres"], other: null });
 		// Q2: multi-select 重排 + Other
-		expect(result.details.answers["Which tools?"]).toBe("A, C, Custom");
+		expect(result.details.answers["Which tools?"]).toEqual({ selected: ["A", "C"], other: "Custom" });
 		// Q3: 无选中 → 跳过（不在 answers map 中）
 		expect(result.details.answers["Which region?"]).toBeUndefined();
 	});
 
-	it("R-9: multi-question with comment on one question", async () => {
-		const tool = getTool();
-		const multiQ = {
-			questions: [
-				{
-					question: "Which DB?",
-					header: "DB",
-					options: [{ label: "Postgres" }],
-				},
-				{
-					question: "Why?",
-					header: "Reason",
-					options: [{ label: "Performance" }],
-					allowComment: true,
-				},
-			],
-		};
-		const protoAnswers = JSON.stringify({
-			DB: "Postgres",
-			Reason: "Performance",
-			"Reason__comment": "benchmarked",
-		});
-		const result = await tool.execute(
-			"id",
-			multiQ,
-			undefined,
-			undefined,
-			makeCtx({ mode: "rpc", selectResult: protoAnswers }),
-		);
-
-		// Q1: 无 comment
-		expect(result.details.answers["Which DB?"]).toBe("Postgres");
-		// Q2: 有 comment → 内联
-		expect(result.details.answers["Why?"]).toBe("Performance — benchmarked");
-	});
 });

package/src/__tests__/question-view.test.ts

@@ -252,7 +252,7 @@ describe("renderQuestionView — Other editor mode", () => {
 	});
 
 	it("Q-28-WIDE: freeform 模式在宽终端下用全宽渲染（不被分屏左列压窄）", () => {
-		// 回归：freeform/comment 模式忽略分屏，编辑器用全 width。
+		// 回归：freeform 模式忽略分屏，编辑器用全 width。
 		// 修复前：宽终端走 split.left(≈40)，Other 输入被压在左半屏换行频繁。
 		const width = 100;
 		// getSplitPaneWidths(100) 非 null（宽终端会进分屏分支），但 freeform 应绕过它
@@ -335,35 +335,6 @@ describe("renderQuestionView — Other editor mode", () => {
 	});
 });
 
-// ── Q-18 ~ Q-19: 评论模式 ───────────────────────────────
-describe("renderQuestionView — comment mode", () => {
-	it("Q-18: comment mode renders editor with note text", () => {
-		const lines = rv(
-			singleQ,
-			makeState({ mode: "comment", selectedIndex: 0 }),
-			stubTheme,
-			60,
-			true,
-			"my note",
-		);
-		const t = text(lines);
-		expect(t.toLowerCase()).toContain("comment");
-		expect(t).toContain("my note");
-	});
-
-	it("Q-19: comment prompt includes (optional)", () => {
-		const lines = rv(
-			singleQ,
-			makeState({ mode: "comment", selectedIndex: 0 }),
-			stubTheme,
-			60,
-			true,
-			"",
-		);
-		expect(text(lines)).toContain("(optional)");
-	});
-});
-
 // ── Q-20 ~ Q-23: 帮助行 ─────────────────────────────────
 describe("renderQuestionView — help line", () => {
 	it("Q-20: single-select help shows 'Enter select'", () => {

package/src/__tests__/submit-view.test.ts

@@ -80,19 +80,19 @@ describe("renderSubmitView", () => {
 
 // ── S-5 ~ S-10: getAnswerText ────────────────────────────
 describe("getAnswerText", () => {
-	it("S-5: single-select returns label", () => {
+	it("S-5: single-select returns AnswerValue with label", () => {
 		const s = makeState({ confirmed: true, selectedIndex: 0 });
-		expect(getAnswerText(q1, s)).toBe("Postgres");
+		expect(getAnswerText(q1, s)).toEqual({ selected: ["Postgres"], other: null });
 	});
 
-	it("S-6: multi-select returns labels joined in index order", () => {
+	it("S-6: multi-select returns labels sorted in index order", () => {
 		const multiQ: Question = {
 			question: "Features",
 			multiSelect: true,
 			options: [{ label: "A" }, { label: "B" }, { label: "C" }],
 		};
 		const s = makeState({ confirmed: true, selectedIndices: new Set([0, 1]) });
-		expect(getAnswerText(multiQ, s)).toBe("A, B");
+		expect(getAnswerText(multiQ, s)).toEqual({ selected: ["A", "B"], other: null });
 	});
 
 	it("S-7: multi-select out-of-order toggle still sorts by index", () => {
@@ -103,7 +103,7 @@ describe("getAnswerText", () => {
 		};
 		// toggle order: 1, then 0, then 2 → Set may iterate 1,0,2 but output should be A, B, C
 		const s = makeState({ confirmed: true, selectedIndices: new Set([1, 0, 2]) });
-		expect(getAnswerText(multiQ, s)).toBe("A, B, C");
+		expect(getAnswerText(multiQ, s)).toEqual({ selected: ["A", "B", "C"], other: null });
 	});
 
 	it("S-7b: multi-select out-of-range indices are filtered out (defensive branch)", () => {
@@ -116,17 +116,12 @@ describe("getAnswerText", () => {
 		};
 		// index 5 越界（只有 2 个选项），应被过滤；只保留 A
 		const s = makeState({ confirmed: true, selectedIndices: new Set([0, 5]) });
-		expect(getAnswerText(multiQ, s)).toBe("A");
+		expect(getAnswerText(multiQ, s)).toEqual({ selected: ["A"], other: null });
 	});
 
-	it("S-8: Other free-text appended", () => {
+	it("S-8: Other free-text goes to other field", () => {
 		const s = makeState({ confirmed: true, selectedIndex: null, freeTextValue: "custom" });
-		expect(getAnswerText(q1, s)).toBe("custom");
-	});
-
-	it("S-9: comment appended with separator", () => {
-		const s = makeState({ confirmed: true, selectedIndex: 0, commentValue: "fast" });
-		expect(getAnswerText(q1, s)).toBe("Postgres — fast");
+		expect(getAnswerText(q1, s)).toEqual({ selected: [], other: "custom" });
 	});
 
 	it("S-10: unconfirmed returns null", () => {
@@ -149,19 +144,18 @@ describe("getAnswerText", () => {
 		expect(getAnswerText(multiQ, sEmptyMulti)).toBeNull();
 	});
 
-	it("S-9b: multi-select + comment combined", () => {
+	it("S-9: selected + other combined in one AnswerValue", () => {
 		const multiQ: Question = {
 			question: "Features",
 			multiSelect: true,
-			allowComment: true,
 			options: [{ label: "A" }, { label: "B" }],
 		};
 		const s = makeState({
 			confirmed: true,
 			selectedIndices: new Set([0, 1]),
-			commentValue: "nice",
+			freeTextValue: "nice",
 		});
-		expect(getAnswerText(multiQ, s)).toBe("A, B — nice");
+		expect(getAnswerText(multiQ, s)).toEqual({ selected: ["A", "B"], other: "nice" });
 	});
 });
 
@@ -172,7 +166,7 @@ describe("buildResult", () => {
 		const states = [makeState({ confirmed: true, selectedIndex: 1 })];
 		const result = buildResult(questions, states);
 		expect(result.cancelled).toBe(false);
-		expect(result.answers["Which DB?"]).toBe("SQLite");
+		expect(result.answers["Which DB?"]).toEqual({ selected: ["SQLite"], other: null });
 		expect(result.questions).toBe(questions);
 	});
 
@@ -186,7 +180,7 @@ describe("buildResult", () => {
 			makeState({ confirmed: false }),
 		];
 		const result = buildResult(questions, states);
-		expect(result.answers["Q1"]).toBe("A");
+		expect(result.answers["Q1"]).toEqual({ selected: ["A"], other: null });
 		expect(result.answers["Q2"]).toBeUndefined();
 	});
 });

package/src/__tests__/types.test.ts

@@ -40,7 +40,6 @@ describe("types", () => {
 		expect(s.selectedIndices).toBeInstanceOf(Set);
 		expect(s.confirmed).toBe(false);
 		expect(s.freeTextValue).toBeNull();
-		expect(s.commentValue).toBeNull();
 		expect(s.mode).toBe("options");
 	});
 

package/src/__tests__/validate.test.ts

@@ -82,7 +82,7 @@ describe("validateInput", () => {
 	});
 
 	// V-10/S3: 多 question 时 header 必须唯一——重复 header 会导致 askUserKey 碰撞
-	// （协议 helper 用 header 作 answers 读取 key，后一个覆盖前一个的 Other/comment）
+	// （协议 helper 用 header 作 answers 读取 key，后一个覆盖前一个的 Other）
 	it("rejects duplicate headers across different questions", () => {
 		const result = validateInput([
 			q({ question: "Q1", header: "Same" }),
@@ -172,6 +172,9 @@ describe("validateInput", () => {
 // 目标（任务核心）：弱模型误用 "options":["A","B"] 不能被 schema 层干报错拦死，
 // 必须能进 validateInput 拿到带 Correct 正例的友好文案。Value.Check 是 Pi 运行时
 // TypeCompiler.Check 的等价校验（同一引擎），这里直接断言 schema 行为。
+// 原 3 用例缩减为 2（TC-03）："string options then caught by validateInput..." 与
+// V-17 逐字重复（同 options:["Postgres","SQLite"]、同 3 断言），已删除；
+// 保留的 2 用例是分层增量——V-17 只测 validateInput 层，此 describe 测 schema→validate 链路。
 describe("schema-vs-validate integration (options 字符串下沉)", () => {
 	it("string options PASS the schema layer (reach execute, not raw ajv error)", () => {
 		const malformed = {
@@ -180,15 +183,6 @@ describe("schema-vs-validate integration (options 字符串下沉)", () => {
 		expect(Value.Check(InputSchema, malformed)).toBe(true);
 	});
 
-	it("string options then caught by validateInput with a friendly Correct example", () => {
-		const result = validateInput([
-			{ question: "Which DB?", options: ["Postgres", "SQLite"] },
-		]);
-		expect(result).not.toBeNull();
-		expect(result).toContain("objects, not strings");
-		expect(result).toContain('Correct: "options":[{"label"');
-	});
-
 	it("well-formed object options still pass schema AND validateInput", () => {
 		const wellFormed = {
 			questions: [

package/src/__tests__/w2-draft-hint.test.ts

@@ -13,7 +13,6 @@ import {
 	multiQ,
 	RIGHT,
 	singleQ,
-	singleQWithComment,
 	stubTheme,
 	UP,
 } from "./fixtures";
@@ -78,15 +77,6 @@ describe("W2 — draftText migration", () => {
 		expect(editorLine1).toContain("aaa");
 		expect(editorLine1).not.toContain("ccc");
 	});
-
-	it("C-BC4C: comment flow submits comment with answer", () => {
-		const { c, result } = make([singleQWithComment]);
-		c.handleInput(ENTER); // select A → comment mode
-		c.handleInput("my note");
-		c.handleInput(ENTER); // submit
-		expect(result.val).toBeDefined();
-		expect(result.val!.answers["Which DB? (with comment)"]).toBe("Postgres — my note");
-	});
 });
 
 // ── hint line: append-only UX hint ──
@@ -102,16 +92,6 @@ describe("W2 — hint line", () => {
 		expect(hintLine).toContain("Enter submit");
 		expect(hintLine).toContain("Esc back");
 	});
-
-	it("C-HINT-2: comment editor hint contains all expected hints", () => {
-		const { c } = make([singleQWithComment]);
-		c.handleInput(ENTER);
-		const lines = c.render(80);
-		const hintLine = lines.find((l: string) => l.includes("move") && l.includes("Backspace deletes"));
-		expect(hintLine).toBeDefined();
-		expect(hintLine).toContain("Enter submit");
-		expect(hintLine).toContain("Esc back");
-	});
 });
 
 // ── freeDraft 隔离：丢弃的 freeform 草稿不污染答案、不触发 auto-confirm ──
@@ -150,7 +130,7 @@ describe("C-FREEDRAFT: discarded draft isolation", () => {
 		// Submit
 		c.handleInput(ENTER);
 		expect(result.val).toBeDefined();
-		expect(result.val!.answers["Q1"]).toBe("A");
+		expect(result.val!.answers["Q1"]).toEqual({ selected: ["A"], other: null });
 		// 丢弃的草稿 "abc" 不应出现在任何答案中
 		expect(JSON.stringify(result.val!.answers)).not.toContain("abc");
 	});

package/src/__tests__/w3-regression.test.ts

@@ -1,5 +1,5 @@
 // src/__tests__/w3-regression.test.ts
-// W3: Forward regression — freeform/comment/bksp edge cases.
+// W3: Forward regression — freeform/bksp edge cases.
 // No-op keymap coverage moved to component-keymap.test.ts (deduplicated).
 import { describe, expect, it } from "vitest";
 
@@ -14,7 +14,6 @@ import {
 	LEFT,
 	mockTui,
 	multiQ,
-	multiQWithComment,
 	RIGHT,
 	singleQ,
 	stubTheme,
@@ -47,7 +46,7 @@ describe("W3 — freeform Enter clears selectedIndex (C-BC4B)", () => {
 		c.handleInput(ENTER); // confirm freeform → afterConfirm → submit
 		expect(result.val).toBeDefined();
 		// The answer should be the freeform text
-		expect(result.val!.answers["Which DB?"]).toBe("custom answer");
+		expect(result.val!.answers["Which DB?"]).toEqual({ selected: [], other: "custom answer" });
 	});
 
 	it("C-BC4B-SELECT: freeform on same question clears selectedIndex", () => {
@@ -68,34 +67,7 @@ describe("W3 — freeform Enter clears selectedIndex (C-BC4B)", () => {
 		c.handleInput(ENTER);
 		expect(result.val).toBeDefined();
 		// Q1 answer should be the freeform text only
-		expect(result.val!.answers["Q1"]).toBe("override");
-	});
-});
-
-// ── C-BC4C: comment edge cases ──
-// C-BC4C-REEDIT (initial comment submit) removed — duplicate of w2-draft-hint C-BC4C.
-describe("W3 — comment re-edit (C-BC4C-CLEAR)", () => {
-	it("C-BC4C-CLEAR: Esc in comment mode skips comment, keeps existing commentValue", () => {
-		const { c, result } = make(multiQWithComment);
-		// Q1: select A → comment mode
-		c.handleInput(ENTER);
-		c.handleInput("my note");
-		c.handleInput(ENTER); // submit comment → advance to Q2
-		// Q2: select X
-		c.handleInput(ENTER);
-		c.handleInput(ENTER); // confirm Q2 → advance to submit tab
-		// Go back to Q1
-		c.handleInput(LEFT);
-		// Q1 is already confirmed, re-select A to trigger comment again
-		c.handleInput(ENTER); // re-select A → afterConfirm → comment mode
-		c.handleInput(ESC); // skip comment
-		// Submit
-		c.handleInput(RIGHT);
-		c.handleInput(RIGHT); // navigate to submit tab
-		c.handleInput(ENTER);
-		expect(result.val).toBeDefined();
-		// Comment should still be "my note" (Esc preserved commentValue)
-		expect(result.val!.answers["Q1"]).toBe("A — my note");
+		expect(result.val!.answers["Q1"]).toEqual({ selected: [], other: "override" });
 	});
 });
 

package/src/answer-codec.ts

@@ -0,0 +1,33 @@
+// src/answer-codec.ts
+// AnswerValue → proto answers 条目的单向序列化（协议边界 SSOT）。
+// 与 @xyz-agent/extension-protocol helpers.ts 的解码契约字节级对齐：
+//   - 单选：answers[key] = selected[0]
+//   - 多选：answers[key] = JSON.stringify(selected)
+//   - Other：answers[`${key}__other`] = other
+// helpers.ts 的 getAskUserAnswer / getAskUserOther 是输出格式的唯一解码 SSOT。
+// 单向 encode，无 parse 对偶（文本反解析已随双模型文本往返删除）。
+import type { AnswerValue } from "./types";
+
+/**
+ * 把结构化 AnswerValue 序列化为 proto answers 条目。
+ *
+ * @param value 结构化答案（selected = option label 数组，other = Other 自由文本）
+ * @param opts.key 协议 key（header ?? question 全文）
+ * @param opts.multiSelect 多选时主 key 写 JSON 数组，单选写首个 label
+ * @returns proto answers 条目；selected 空 && other 空/空串 → {}（未答，调用方不写入）
+ */
+export function encodeAnswer(
+	value: AnswerValue,
+	opts: { key: string; multiSelect: boolean },
+): Record<string, string> {
+	const out: Record<string, string> = {};
+	if (value.selected.length > 0) {
+		out[opts.key] = opts.multiSelect
+			? JSON.stringify(value.selected)
+			: value.selected[0]!;
+	}
+	if (value.other !== null && value.other !== "") {
+		out[`${opts.key}__other`] = value.other;
+	}
+	return out;
+}

package/src/channel-handler.ts

@@ -9,8 +9,8 @@
 //     不循环）。返回 {value: JSON.stringify(answers)} 让子进程 JSON.parse(value) decode。
 //   - TUI：走 ctx.ui.custom + AskUserComponent。三步：(1) protoQuestions → 内部 Question[]，
 //     (2) ctx.ui.custom 渲染拿内部 Result，(3) 内部 Result.answers（key=question 全文，
-//     value="label1, label2 — comment"）→ 重新编码为 proto AskUserAnswers（key=header/question，
-//     单选=value，多选=JSON 数组，Other→__other，comment→__comment），让子进程 decode 一致。
+//     value=结构化 AnswerValue）→ 用 encodeAnswer 重新编码为 proto AskUserAnswers
+//     （key=header/question，单选=string，多选=JSON 数组，Other→__other），让子进程 decode 一致。
 //
 // handler 收到的 req.channelPayload = {questions: AskUserQuestion[], allowCancel}（proto 格式，
 // 由子进程 askUserInteract 编码、subagent-workflow parseChannel 解析 options[0] JSON 得到）。
@@ -23,8 +23,8 @@ import {
 } from "@xyz-agent/extension-protocol";
 
 import { AskUserComponent } from "./component";
-import { parseAnswerParts } from "./answer-format";
-import { type Option, type Question, type Result, type ThemeLike } from "./types";
+import { encodeAnswer } from "./answer-codec";
+import { type AnswerValue, type Option, type Question, type Result, type ThemeLike } from "./types";
 
 /**
  * channel handler 签名——与 subagent-workflow 的 UiChannelRegistry.ChannelHandler 一致
@@ -60,7 +60,6 @@ function protoToInternalQuestions(protoQuestions: AskUserQuestion[]): Question[]
 			...(pq.context !== undefined ? { context: pq.context } : {}),
 			options: opts,
 			...(pq.multiSelect !== undefined ? { multiSelect: pq.multiSelect } : {}),
-			...(pq.allowComment !== undefined ? { allowComment: pq.allowComment } : {}),
 		};
 	});
 }
@@ -68,18 +67,16 @@ function protoToInternalQuestions(protoQuestions: AskUserQuestion[]): Question[]
 /**
  * 把 TUI 路径产出的内部 Result.answers 重新编码为 proto AskUserAnswers。
  *
- * 内部 Result.answers：key = question 全文，value = "label1, label2 — comment"
- * （Other 自由文本与 selected 标签逗号拼接，comment 用 ANSWER_COMMENT_SEPARATOR 分隔）。
+ * 内部 Result.answers：key = question 全文，value = 结构化 AnswerValue
+ * （selected = option label 数组，other = Other 自由文本）。
  *
  * proto AskUserAnswers 契约（@xyz-agent/extension-protocol）：
  *   - key = question.header ?? question 全文
- *   - 单选：value = 选中项 value string
- *   - 多选：value = JSON.stringify(选中项 value 数组)
+ *   - 单选：value = 选中项 label string
+ *   - 多选：value = JSON.stringify(选中项 label 数组)
  *   - Other 自由文本：单独 key `${header}__other`
- *   - comment：单独 key `${header}__comment`
  *
- * 解码（无信息丢失）：用 protoQuestion.options 的 label 集合精确匹配 selected；
- * 不匹配的 token = Other 自由文本；comment 由 ANSWER_COMMENT_SEPARATOR 切出。
+ * 序列化走 encodeAnswer（answer-codec.ts 是唯一 encode 实现，与协议包解码 helper 对齐）。
  */
 function encodeTuiResultToProto(
 	protoQuestions: AskUserQuestion[],
@@ -87,43 +84,15 @@ function encodeTuiResultToProto(
 ): AskUserAnswers {
 	const answers: AskUserAnswers = {};
 	for (const pq of protoQuestions) {
-		const key = pq.header ?? pq.question;
-		const internalText = result.answers[pq.question];
-		if (internalText === undefined) continue; // 该问题未答（protoAnswersToResult 也跳过未答）
-
-		// 已知选项 label 集合（protoQuestion.options 的 label/value 都作候选——value 缺失时用 label）
-		const knownLabels = new Set<string>();
-		for (const o of pq.options ?? []) {
-			knownLabels.add(o.label);
-			if (o.value !== undefined) knownLabels.add(o.value);
-		}
-
-		// body/comment 切分 + 选中/Other 识别：复用 parseAnswerParts（answer-format.ts 是
-		// 唯一权威切分实现——label 含 ANSWER_COMMENT_SEPARATOR 时首分隔符切分会把 label
-		// 拦腰截断导致选中丢失，两处各自实现必然漂移；复用保证 TUI/RPC 解码行为一致，
-		// comment 自身含分隔符也正确往返）。knownLabels 传 label+value 并集（value 缺失时
-		// 用 label）。
-		const { selected: matchedLabels, comment, otherTokens } = parseAnswerParts(internalText, [...knownLabels]);
-
-		// matched label 回查 proto option 的 value（PR #85 #8）：TUI 渲染用 label，但 RPC 路径
-		// （askUserInteract）回传的是 option.value。value≠label 时若直接 push label，
-		// TUI/RPC 两条路径产出分裂。value 缺失时 fallback label（保持 ask-user 自身
-		// toProtoQuestions 的 value=label 语义，以及历史行为）。
-		const selected = matchedLabels.map((t: string) => {
-			const opt = pq.options?.find(o => o.label === t || o.value === t);
-			return opt?.value ?? t;
-		});
-		const otherText = otherTokens.join(", ") || undefined;
-
-		// 主 key：单选 = 首个选中 value；多选 = JSON 数组（即便为空也写入，与 RPC 契约一致）
-		if (pq.multiSelect) {
-			answers[key] = JSON.stringify(selected);
-		} else if (selected.length > 0) {
-			answers[key] = selected[0]!;
-		}
-
-		if (otherText) answers[`${key}__other`] = otherText;
-		if (comment) answers[`${key}__comment`] = comment;
+		const av: AnswerValue | undefined = result.answers[pq.question];
+		if (av === undefined) continue; // 该问题未答（buildResult 跳过未答）
+		Object.assign(
+			answers,
+			encodeAnswer(av, {
+				key: pq.header ?? pq.question,
+				multiSelect: pq.multiSelect === true,
+			}),
+		);
 	}
 	return answers;
 }