@zhushanwen/pi-ask-user 6.0.1 → 7.0.2

package/ARCHITECTURE.md

@@ -2,7 +2,7 @@
 
 Internals reference for maintainers. For the usage contract (what the tool does, when an agent should call it), see [README.md](./README.md). This document covers how the code is structured, the state machine, the defensive execute flow, and where each design invariant is enforced — so a change does not silently break an invariant.
 
-Source: 6 files in `src/`, ~1320 lines total.
+Source: 10 files in `src/`, ~1970 lines total.
 
 ## File dependency graph
 
@@ -10,33 +10,59 @@ Source: 6 files in `src/`, ~1320 lines total.
                           ┌─────────────┐
                           │  types.ts   │  ← shared leaf; imports only typebox
                           │ Schema +    │     holds QuestionState / ThemeLike /
-                          │ shared      │     createQuestionState here (NOT in
-                          │ state types │     component.ts) to break the cycle
-                          └──────▲──────┘
+                          │ shared      │     AnswerValue / createQuestionState
+                          │ state types │     here (NOT in component.ts) to break
+                          └──────▲──────┘     the cycle
                                  │ imported by all
-              ┌──────────────────┼──────────────────┐
-              │                  │                  │
-       ┌──────┴──────┐    ┌──────┴──────┐    ┌──────┴──────┐
-       │ validate.ts │    │question-view│    │ submit-view │
-       │ pure check  │    │ pure render │    │ pure render │
-       └──────▲──────┘    └──────▲──────┘    └──────▲──────┘
-              │                  │                  │
-              │           ┌──────┴──────────────────┘
-              │           │
-       ┌──────┴───────────┴──┐
-       │   component.ts      │  ← state machine + input routing + race guards
-       │                      │     imports question-view + submit-view
-       └──────────▲──────────┘
-                  │
-           ┌──────┴──────┐
-           │  index.ts   │  ← Tool factory + execute (6-step flow) + renderCall/renderResult
-           └─────────────┘     imports component + validate + types
+              ┌──────────────────┼─────────────────────┬─────────────────┐
+              │                  │                     │                 │
+       ┌──────┴──────┐    ┌──────┴──────┐    ┌─────────┴──────┐  ┌───────┴────────┐
+       │ validate.ts │    │question-view│    │  submit-view   │  │  answer-codec  │
+       │ pure check  │    │ pure render │    │  pure render   │  │ AnswerValue →  │
+       └──────▲──────┘    └──────▲──────┘    │  + buildResult  │  │ proto entries  │
+              │                  │           └──────▲─────────┘  └───────▲────────┘
+              │           ┌──────┴──────────────────┘                    │
+              │           │                                              │
+       ┌──────┴───────────┴──┐    ┌────────────────────┐                 │
+       │   component.ts      │◀───│   editor-ops.ts    │                 │
+       │  state machine +    │    │ editor pure ops    │                 │
+       │  input routing +    │    │ (insert/delete/    │                 │
+       │  race guards        │    │  cursor/paste)     │                 │
+       └──────────▲──────────┘    └────────────────────┘                 │
+                  │                                                      │
+                  │                 ┌────────────────────┐               │
+                  ├────────────────▶│ channel-handler.ts │◀──────────────┘
+                  │  (AskUserComp.) │ subagent passthru  │
+                  │                 └─────────▲──────────┘
+                  │                           │
+                  │                 ┌─────────┴──────────┐
+                  │                 │channel-registry-   │
+                  │                 │register.ts         │
+                  │                 │globalThis Symbol   │
+                  │                 │handshake           │
+                  │                 └────────────────────┘
+           ┌──────┴───────────┐
+           │     index.ts     │  ← Tool factory + execute (6-step flow) + renderCall/renderResult
+           └──────────────────┘     imports component + validate + types + submit-view +
+                                    channel-handler + channel-registry-register
 ```
 
 **No cycles.** All imports flow one direction; `types.ts` is the single leaf depended on by everyone.
 
 **Why `QuestionState` / `ThemeLike` live in `types.ts`, not `component.ts`** (see the comment in `types.ts`): `question-view.ts` and `submit-view.ts` are pure render functions that read/write `QuestionState` and need the `ThemeLike` interface. If those types lived in `component.ts`, the render views would import `component.ts`, and `component.ts` imports the render views — a cycle. Sinking the shared types to the dependency-free leaf keeps every arrow monotone. **Do not move these types back** without reintroducing the cycle.
 
+## Answer model & protocol boundary (D1)
+
+`AnswerValue` (`types.ts`) is the single structured answer model — `{ selected: string[]; other: string | null }`. The old internal/proto double model is gone: proto `AskUserOption.value` equaled `label` (both were the same string), so the proto layer consumes the same single model (`Result.answers: Record<string, AnswerValue>`, key = question text).
+
+Serialization happens **once, at the protocol boundary**: `encodeAnswer(value, { key, multiSelect })` in `answer-codec.ts` converts an `AnswerValue` into proto answers entries, byte-aligned with `@xyz-agent/extension-protocol` helpers' decode contract (`getAskUserAnswer` / `getAskUserOther`):
+
+- 单选：`answers[key] = selected[0]`
+- 多选：`answers[key] = JSON.stringify(selected)`
+- Other：`answers[`${key}__other`] = other`（仅在 other 非空时写入）
+
+Encoding is **one-way** — the old `parseAnswerParts` text reverse-parsing was deleted with the double model; there is no decode counterpart inside the extension. `channel-handler.ts` reads `AnswerValue` directly and calls `encodeAnswer` when forwarding to subagents.
+
 ## `execute` defensive flow (6 steps)
 
 `execute` in `src/index.ts` runs six ordered checks. Order is not arbitrary — each early step is cheaper than the next and some have side effects that must precede the rest.
@@ -54,33 +80,27 @@ Source: 6 files in `src/`, ~1320 lines total.
 
 ## `QuestionState` machine
 
-Each question has a `QuestionState` (`types.ts`). Its `mode` field is a three-state machine:
+Each question has a `QuestionState` (`types.ts`). Its `mode` field is a two-state machine:
 
 ```
-                       Enter (on Other row)
-            ┌────────────────────────────────────┐
-            ▼                                     │
-     ┌─────────────┐   Enter (normal opt,          ┌──────────────┐
-     │   options   │   allowComment=true) ────────▶│   comment    │
-     │  (default)  │                               │ (note input) │
-     └─────┬───▲───┘◀────────────────── afterConfirm└──────┬───▲───┘
-           │   │                                     Enter │   │ Esc
-   Enter   │   │ Esc (discard)              (save note)    │   │ (AC-17: skip,
-   (Other) │   │                                          │   │  keep old value)
-           ▼   │                                          ▼   │
-     ┌─────────────┐   Enter (text → save)          ┌─────────────┐
-     │  freeform   │───────────────────────────────▶│   options   │
-     │ (Other edit)│                                │ (back to list)│
-     └─────┬───▲───┘                                └─────────────┘
-           │   │
-           ▼   │ Esc (discard)
-     Enter (empty → clear freeTextValue)
-           │
-           ▼
-        options
+                     Enter (on Other row)
+            ┌────────────────────────────────────────┐
+            ▼                                        │
+     ┌─────────────┐   Enter (text → save +          ┌──────────────┐
+     │   options   │   afterConfirm + advance) ────▶ │   freeform   │
+     │  (default)  │ ◀───────────────────────────────│  (editor)    │
+     └─────┬───▲───┘  Esc (save draft → back) /      └──────┬───▲───┘
+           │   │      Enter empty (clear value → back)      │   │
+   Enter   │   │ Esc (back to previous tab;                 │   │
+   (normal     on first tab → confirm-cancel overlay)       │   │
+    option)                                                 │   │
+           ▼                                                 │
+   afterConfirm → advance (next tab / Submit tab)            │
+                                                             │
+           └─────────────────────────────────────────────────┘
 ```
 
-Transitions live in `component.ts`: `options → freeform` (Enter on Other), `freeform → options` (Enter saves / Enter empty clears / Esc discards), `options → comment` (via `afterConfirm` when `allowComment`), `comment → options` (Enter saves / Esc skips per AC-17).
+Transitions live in `component.ts`: `options → freeform` (Enter on the Other row — the last option — prefills `draftText` from `freeTextValue ?? freeDraft`), `freeform → options` (Enter saves trimmed text into `freeTextValue` and calls `afterConfirm`; Enter on empty text clears `freeTextValue`; Esc saves the draft into `freeDraft` and returns to the list, restoring the saved options cursor). There is **no comment mode** — the freeform editor is the only text input; `QuestionMode = "options" | "freeform"`.
 
 ### `confirmed` invariant
 
@@ -95,14 +115,14 @@ Four assignment sites maintain it (`component.ts`):
 |------|------|----------------------|
 | `afterConfirm()` | `true` | Safe: caller has already set `selectedIndex` / `selectedIndices` / `freeTextValue`. |
 | `autoConfirmIfAnswered()` | `true` | Safe: guarded by `if (hasAnswer)` — never sets `true` without an answer. |
-| `toggleIndex()` when multi-select empties | `false` | Necessary: un-checking the last option must drop `confirmed` to preserve the contrapositive. |
-| `handleEditorInput` freeform empty-Enter | `false` | Necessary: clearing `freeTextValue` with no other answer must drop `confirmed`. |
+| `toggleIndex()` when multi-select empties | `false` | Necessary: un-checking the last option (with no free text) must drop `confirmed` to preserve the contrapositive. |
+| `handleEditorEnter` freeform empty-Enter | `false` | Necessary: clearing `freeTextValue` with no other answer must drop `confirmed`. |
 
 If you add a new path that changes the answer set, audit both directions of this invariant.
 
 ### `autoConfirmIfAnswered` trigger
 
-Called only from `gotoTab()` — when the user navigates between tabs via Tab/Shift+Tab without pressing Enter. It promotes an implicitly-answered tab (toggled but not confirmed) to `confirmed`. It deliberately **skips the comment input** (a Tab navigation intent should not force a comment prompt); only the Enter path enters comment mode via `afterConfirm`.
+Called only from `gotoTab()` — when the user navigates between tabs via Tab/Shift+Tab without pressing Enter. It promotes an implicitly-answered tab (toggled but not confirmed) to `confirmed`. A Tab navigation intent should not force a confirm prompt — only the Enter path confirms via `afterConfirm`.
 
 ## Race guards
 
@@ -151,13 +171,12 @@ Design spec: `.xyz-harness/2026-06-15-ask-user/spec.md` (FR = functional require
 | FR-2 (param schema/validation) | `types.ts` schema + `validate.ts` |
 | FR-3 (inline render, no overlay) | `execute` → `ctx.ui.custom` without `options` |
 | FR-4 (question view) | `question-view.ts` `renderQuestionView` |
-| FR-6 (input handling) | `component.ts` `handleInput` / `handleEditorInput` |
+| FR-6 (input handling) | `component.ts` `handleInput` / `handleOptionsInput` / `handleEditorInput` |
 | FR-8 (headless disable) | `execute` step 2 |
 | FR-9 (custom render) | `renderCall` / `renderResult` |
 | FR-10 (signal abort) | `execute` step 3 + step 4 abort listener |
 | FR-12 (re-entry guard) | `_resolved` field + `cancel()` shared by abort listener |
 | FR-13 (error catch-all) | `execute` step 4 try/catch |
-| AC-17 (Esc in comment skips, keeps value) | `handleEditorInput` comment-mode Esc branch |
 
 When you change one of these behaviors, update both the code comment (which cites the FR/AC) and this table.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhushanwen/pi-ask-user",
-  "version": "6.0.1",
+  "version": "7.0.2",
   "description": "Inline adaptive ask_user tool for Pi — single/multi-question structured input with split-pane preview, inline editor and optional comments.",
   "type": "module",
   "main": "index.ts",
@@ -26,19 +26,20 @@
     "ARCHITECTURE.md"
   ],
   "dependencies": {
-    "@xyz-agent/extension-protocol": "^0.3.1"
+    "@xyz-agent/extension-protocol": "^0.4.0"
   },
   "devDependencies": {
     "@earendil-works/pi-tui": "*",
-    "typebox": "*",
     "@types/node": "^24.0.0",
+    "fast-check": "^4.9.0",
+    "typebox": "*",
     "vitest": "^4.1.8"
   },
   "peerDependencies": {
     "@earendil-works/pi-coding-agent": "*",
     "@earendil-works/pi-tui": "*",
     "typebox": "*",
-    "@zhushanwen/pi-subagent-workflow": "7.0.0"
+    "@zhushanwen/pi-subagent-workflow": "7.1.0"
   },
   "peerDependenciesMeta": {
     "@earendil-works/pi-tui": {

package/src/__tests__/answer-codec.test.ts

@@ -0,0 +1,102 @@
+// src/__tests__/answer-codec.test.ts
+// encodeAnswer 单向序列化 round-trip 测试（TC-09）。
+// 反向验证用 @xyz-agent/extension-protocol 的解码 helper（getAskUserAnswer / getAskUserOther）
+// ——该 helper 是 proto answers 格式的唯一解码 SSOT，encode 输出必须与其字节级对齐。
+// m1 增量（TC-01）：property-based describe 作为 5 个确定性用例的随机化超集补充。
+import { getAskUserAnswer, getAskUserOther } from "@xyz-agent/extension-protocol";
+import fc from "fast-check";
+import { describe, expect, it } from "vitest";
+
+import { encodeAnswer } from "../answer-codec";
+
+describe("encodeAnswer", () => {
+	it("single-select: 主 key 写选中 label，other=null 不写 __other；getAskUserAnswer 解码得 string", () => {
+		const answers = encodeAnswer({ selected: ["A"], other: null }, { key: "db", multiSelect: false });
+		expect(answers).toEqual({ db: "A" });
+		expect(getAskUserAnswer(answers, { question: "db", options: [{ label: "A" }] })).toBe("A");
+	});
+
+	it("multi-select: 主 key 写 JSON.stringify(selected)；getAskUserAnswer 解码得 string[]", () => {
+		const answers = encodeAnswer({ selected: ["A", "B"], other: null }, { key: "lang", multiSelect: true });
+		expect(answers).toEqual({ lang: '["A","B"]' });
+		expect(getAskUserAnswer(answers, { question: "lang", multiSelect: true })).toEqual(["A", "B"]);
+	});
+
+	it("selected 空 + other 有值: 只写 ${key}__other 不写主 key；getAskUserOther 解码得文本", () => {
+		const answers = encodeAnswer({ selected: [], other: "foo" }, { key: "db", multiSelect: false });
+		expect(answers).toEqual({ db__other: "foo" });
+		expect(getAskUserOther(answers, { question: "db" })).toBe("foo");
+	});
+
+	it("selected 空 + other null/空串: 返回 {}（未答，调用方不写入）", () => {
+		expect(encodeAnswer({ selected: [], other: null }, { key: "db", multiSelect: false })).toEqual({});
+		expect(encodeAnswer({ selected: [], other: "" }, { key: "db", multiSelect: true })).toEqual({});
+	});
+
+	it("selected 与 other 同时有值: 主 key + __other 都写；两个 helper 各自解码", () => {
+		const answers = encodeAnswer(
+			{ selected: ["A"], other: "custom" },
+			{ key: "db", multiSelect: false },
+		);
+		expect(answers).toEqual({ db: "A", db__other: "custom" });
+		expect(getAskUserAnswer(answers, { question: "db", options: [{ label: "A" }] })).toBe("A");
+		expect(getAskUserOther(answers, { question: "db" })).toBe("custom");
+	});
+});
+
+// ── m1 property-based round-trip（TC-01）─────────────────
+// fast-check 随机生成合法 AnswerValue 组合 → encodeAnswer → 用协议解码 helper 反向验证
+// 信息保持。六分支断言对应 encodeAnswer 序列化契约（C1）与解码契约（C2）：
+//   (1) selected 非空 + multiSelect → 解码 deepEqual selected
+//   (2) selected 非空 + 单选 → 解码 === selected[0]
+//   (3) selected 空 → 主 key 不存在
+//   (4) other 非 null 非空串 → getAskUserOther 精确还原；否则 undefined
+//   (5) selected 空 + other null/空串 → 返回 {}（未答，调用方不写入）
+//   (6) 输出对象无多余键（主 key + __other 至多 2 个）
+// key 生成器过滤 Object.prototype 属性名（toString/constructor/__proto__ 等）：
+// 这些名字读 answers[key] 会落到原型链（拿到 Function/原型对象而非 undefined），
+// 是 plain-object answers 的既有协议局限（编码侧赋值本身安全），m1 只测不改 src/。
+describe("encodeAnswer — property-based round-trip", () => {
+	it("任意 AnswerValue 组合序列化后经解码 helper 不丢信息", () => {
+		fc.assert(
+			fc.property(
+				fc.string().filter((k) => Object.prototype[k] === undefined),
+				fc.boolean(),
+				fc.array(fc.string(), { maxLength: 5 }),
+				fc.option(fc.string(), { nil: null }),
+				(key, multiSelect, selected, other) => {
+					const answers = encodeAnswer({ selected, other }, { key, multiSelect });
+
+					// (6) 输出对象无多余键
+					expect(Object.keys(answers).length).toBeLessThanOrEqual(2);
+
+					if (selected.length > 0) {
+						// (1)(2) 主 key 写入：多选 JSON.stringify(selected) / 单选 selected[0]
+						const decoded = getAskUserAnswer(answers, { question: key, multiSelect });
+						if (multiSelect) {
+							expect(decoded).toEqual(selected);
+						} else {
+							expect(decoded).toBe(selected[0]);
+						}
+					} else {
+						// (3) selected 空 → 主 key 不产生
+						expect(answers[key]).toBeUndefined();
+						expect(getAskUserAnswer(answers, { question: key, multiSelect })).toBeUndefined();
+					}
+
+					// (4) other：非 null 非空串才写 __other，解码精确还原
+					if (other !== null && other !== "") {
+						expect(getAskUserOther(answers, { question: key })).toBe(other);
+					} else {
+						expect(getAskUserOther(answers, { question: key })).toBeUndefined();
+					}
+
+					// (5) 全空 → 返回 {}（未答，调用方不写入）
+					if (selected.length === 0 && (other === null || other === "")) {
+						expect(answers).toEqual({});
+					}
+				},
+			),
+		);
+	});
+});

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

@@ -6,7 +6,8 @@
 //   - RPC 路径（ctx.mode === 'rpc'）：转发器——handler 内部调 askUserInteract（select 通道），
 //     把 proto answers JSON.stringify 成 {value} 返回，子进程 JSON.parse(value) 正确 decode。
 //   - TUI 路径（ctx.mode === 'tui'）：handler 走 ctx.ui.custom（mock 成返回预设 Result），
-//     验证内部 Result → proto AskUserAnswers 重新编码（single/multi/Other/comment 四种答案形态）。
+//     验证内部结构化 Result.answers（AnswerValue）→ proto AskUserAnswers 重新编码
+//     （single/multi/Other 三种答案形态，经 encodeAnswer 序列化）。
 //   - 取消（askUserInteract/custom 返回 null 或 cancelled）→ {cancelled: true}
 //   - 输入校验（channelPayload 缺失/无 questions）→ {cancelled: true}
 import type { AskUserQuestion } from "@xyz-agent/extension-protocol";
@@ -61,24 +62,14 @@ function makeCtx(opts: MockCtxOpts): {
 // ── 样例 proto questions（handler 收到的格式） ──────────
 const singleProto: AskUserQuestion = {
 	question: "Which DB?",
-	options: [{ label: "Postgres", value: "Postgres" }, { label: "SQLite", value: "SQLite" }],
+	options: [{ label: "Postgres" }, { label: "SQLite" }],
 };
 
 const multiProto: AskUserQuestion = {
 	question: "Which tools?",
 	header: "Tools",
 	multiSelect: true,
-	options: [
-		{ label: "A", value: "A" },
-		{ label: "B", value: "B" },
-		{ label: "C", value: "C" },
-	],
-};
-
-const commentProto: AskUserQuestion = {
-	question: "Which DB?",
-	allowComment: true,
-	options: [{ label: "Postgres", value: "Postgres" }, { label: "SQLite", value: "SQLite" }],
+	options: [{ label: "A" }, { label: "B" }, { label: "C" }],
 };
 
 // ── Tests ───────────────────────────────────────────────
@@ -103,16 +94,15 @@ describe("createAskUserChannelHandler", () => {
 		expect(resp).toEqual({ value: JSON.stringify({ Tools: JSON.stringify(["A", "C"]) }) });
 	});
 
-	it("RPC: Other + comment proto answers → 透传", async () => {
+	it("RPC: Other proto answers → 透传", async () => {
 		const protoAnswers = {
 			"Which DB?": "Postgres",
 			"Which DB?__other": "Custom DB",
-			"Which DB?__comment": "prod constraint",
 		};
 		const handler = createAskUserChannelHandler(
 			makeCtx({ mode: "rpc", selectResult: JSON.stringify(protoAnswers) }) as never,
 		);
-		const resp = await handler({ channelPayload: { questions: [commentProto] } });
+		const resp = await handler({ channelPayload: { questions: [singleProto] } });
 		expect(resp).toEqual({ value: JSON.stringify(protoAnswers) });
 	});
 
@@ -124,11 +114,11 @@ describe("createAskUserChannelHandler", () => {
 		expect(resp).toEqual({ cancelled: true });
 	});
 
-	it("TUI: internal Result single-select → 重新编码为 proto answers", async () => {
-		// 内部 Result.answers：key = question 全文，value = 选中 label
+	it("TUI: internal Result single-select AnswerValue → 重新编码为 proto answers", async () => {
+		// 内部 Result.answers：key = question 全文，value = 结构化 AnswerValue
 		const internalResult: Result = {
 			questions: [],
-			answers: { "Which DB?": "Postgres" },
+			answers: { "Which DB?": { selected: ["Postgres"], other: null } },
 			cancelled: false,
 		};
 		const handler = createAskUserChannelHandler(
@@ -142,7 +132,7 @@ describe("createAskUserChannelHandler", () => {
 	it("TUI: multi-select internal Result → proto JSON array value", async () => {
 		const internalResult: Result = {
 			questions: [],
-			answers: { "Which tools?": "A, C" },
+			answers: { "Which tools?": { selected: ["A", "C"], other: null } },
 			cancelled: false,
 		};
 		const handler = createAskUserChannelHandler(
@@ -153,59 +143,11 @@ describe("createAskUserChannelHandler", () => {
 		expect(resp).toEqual({ value: JSON.stringify({ Tools: JSON.stringify(["A", "C"]) }) });
 	});
 
-	it("TUI: value≠label single-select → encodeTuiResultToProto 回查 proto option value（PR #85 #8 回归守护）", async () => {
-		// value≠label 是 #8 修复的核心场景：TUI 渲染用 label，但 proto 期望回传 option.value。
-		// 若 #8 修复回归（直接 push label），此测试会失败：返回 "显示名A" 而非 "val_a"。
-		const valueNeqLabelProto: AskUserQuestion = {
-			question: "选哪个?",
-			options: [
-				{ label: "显示名A", value: "val_a" },
-				{ label: "显示名B", value: "val_b" },
-			],
-		};
-		// 内部 Result.answers：用户在 TUI 选了"显示名A"（label）
-		const internalResult: Result = {
-			questions: [],
-			answers: { "选哪个?": "显示名A" },
-			cancelled: false,
-		};
-		const handler = createAskUserChannelHandler(
-			makeCtx({ mode: "tui", customResult: internalResult }) as never,
-		);
-		const resp = await handler({ channelPayload: { questions: [valueNeqLabelProto] } });
-		// 期望：proto answers 回查 value，返回 "val_a"（不是 label "显示名A"）
-		expect(resp).toEqual({ value: JSON.stringify({ "选哪个?": "val_a" }) });
-	});
-
-	it("TUI: value≠label multi-select → proto JSON 数组元素回查 value（PR #85 #8 回归守护）", async () => {
-		// 多选路径同样依赖 #8 修复：selected.push(opt?.value ?? t)，多选会 JSON.stringify 数组。
-		const valueNeqLabelMultiProto: AskUserQuestion = {
-			question: "选哪些?",
-			header: "Opts",
-			multiSelect: true,
-			options: [
-				{ label: "显示名A", value: "val_a" },
-				{ label: "显示名B", value: "val_b" },
-			],
-		};
-		const internalResult: Result = {
-			questions: [],
-			answers: { "选哪些?": "显示名A, 显示名B" },
-			cancelled: false,
-		};
-		const handler = createAskUserChannelHandler(
-			makeCtx({ mode: "tui", customResult: internalResult }) as never,
-		);
-		const resp = await handler({ channelPayload: { questions: [valueNeqLabelMultiProto] } });
-		// 期望：多选 JSON 数组，每个元素回查 value（["val_a","val_b"]，不是 label）
-		expect(resp).toEqual({ value: JSON.stringify({ Opts: JSON.stringify(["val_a", "val_b"]) }) });
-	});
-
 	it("TUI: Other free text → ${key}__other", async () => {
-		// 内部 Result：selected label + Other 文本逗号拼接（与 getAnswerText 语义一致）
+		// 内部 Result：selected label + Other 文本分离存储（AnswerValue.other）
 		const internalResult: Result = {
 			questions: [],
-			answers: { "Which DB?": "Postgres, Custom DB" },
+			answers: { "Which DB?": { selected: ["Postgres"], other: "Custom DB" } },
 			cancelled: false,
 		};
 		const handler = createAskUserChannelHandler(
@@ -217,43 +159,18 @@ describe("createAskUserChannelHandler", () => {
 		});
 	});
 
-	it("TUI: comment → ${key}__comment", async () => {
-		const internalResult: Result = {
-			questions: [],
-			answers: { "Which DB?": "Postgres — prod constraint" },
-			cancelled: false,
-		};
-		const handler = createAskUserChannelHandler(
-			makeCtx({ mode: "tui", customResult: internalResult }) as never,
-		);
-		const resp = await handler({ channelPayload: { questions: [commentProto] } });
-		expect(resp).toEqual({
-			value: JSON.stringify({ "Which DB?": "Postgres", "Which DB?__comment": "prod constraint" }),
-		});
-	});
-
-	it("TUI: label containing ' — ' keeps full selection (MF-2)", async () => {
-		// label 含 ANSWER_COMMENT_SEPARATOR（"Postgres — prod"）时，首分隔符切分
-		// 会拦腰截断 label → 无法精确匹配 → 选中值静默丢失；修复后选中保留、comment 完整
-		const sepLabelProto: AskUserQuestion = {
-			question: "Which DB?",
-			allowComment: true,
-			options: [{ label: "Postgres — prod", value: "Postgres — prod" }, { label: "SQLite", value: "SQLite" }],
-		};
+	it("TUI: Other-only answer（selected 空）→ 只写 ${key}__other 不写主 key", async () => {
 		const internalResult: Result = {
 			questions: [],
-			answers: { "Which DB?": "Postgres — prod — constraint" },
+			answers: { "Which DB?": { selected: [], other: "custom text" } },
 			cancelled: false,
 		};
 		const handler = createAskUserChannelHandler(
 			makeCtx({ mode: "tui", customResult: internalResult }) as never,
 		);
-		const resp = await handler({ channelPayload: { questions: [sepLabelProto] } });
+		const resp = await handler({ channelPayload: { questions: [singleProto] } });
 		expect(resp).toEqual({
-			value: JSON.stringify({
-				"Which DB?": "Postgres — prod",
-				"Which DB?__comment": "constraint",
-			}),
+			value: JSON.stringify({ "Which DB?__other": "custom text" }),
 		});
 	});
 

package/src/__tests__/component-keymap.test.ts

@@ -30,7 +30,6 @@ import {
 	INSERT,
 	LEFT,
 	make,
-	multiQWithComment,
 	OSC_BEL,
 	OSC_ST,
 	PAGE_DOWN,
@@ -51,14 +50,6 @@ import {
 	UP,
 } from "./fixtures";
 
-/** Helper: 打开 comment 编辑器并返回 component（多问题避免单问题 auto-submit） */
-function openComment(): AskUserComponent {
-	const { c } = make(multiQWithComment);
-	// Q1 (allowComment): select A → enters comment mode
-	c.handleInput(ENTER);
-	return c;
-}
-
 /** Helper: 打开 freeform 编辑器并返回 component（不渲染，避免缓存） */
 function openFreeform(q: Question[]): AskUserComponent {
 	const { c } = make(q);
@@ -264,25 +255,6 @@ describe("AskUserComponent — key leak fix (C-ARROW / C-KEYMAP)", () => {
 		expect(editorLine).not.toContain("abc");
 	});
 
-	// ── C-KEYMAP-COMMENT-UP: arrow key no-op in comment editor too ──
-	it("C-KEYMAP-COMMENT-UP: arrow keys are no-op in comment editor", () => {
-		const c = openComment();
-		c.handleInput("a");
-		c.handleInput(UP);
-		c.handleInput(RIGHT);
-		c.handleInput("b");
-		// comment editor renders text and cursor on separate lines;
-		// check the text line (before cursor) contains "ab"
-		const lines = c.render(60);
-		const textLine = lines.find((l) => l.includes("ab"));
-		expect(textLine).toBeDefined();
-		expect(textLine).toContain("ab");
-		// Ensure no leaked bracket characters from arrow escape sequences
-		const allText = lines.join("\n");
-		expect(allText).not.toMatch(/\[A/); // no leaked UP sequence
-		expect(allText).not.toMatch(/\[C/); // no leaked RIGHT sequence
-	});
-
 	// ── C-KEYMAP-MOD: modifier key combinations matrix (18 cases) ──
 	const modifierCases: Array<{ name: string; seq: string }> = [
 		{ name: "ctrl+up", seq: CTRL_UP },
@@ -429,8 +401,8 @@ describe("AskUserComponent — unknown control sequence leak fix (C-CSI)", () =>
 		expect(editorLine).not.toContain("\x1b[A"); expect(editorLine).not.toContain("\x1b[B"); expect(editorLine).not.toContain("\x1b[C"); expect(editorLine).not.toContain("\x1b[D");
 	});
 
-	it("C-CSI-10: unknown CSI does not leak in comment editor", () => {
-		const c = openComment();
+	it("C-CSI-10: unknown CSI does not leak in editor", () => {
+		const c = openFreeform([singleQ]);
 		c.handleInput(UNKNOWN_CSI);
 		c.handleInput("ab");
 		const lines = c.render(60);