@zhushanwen/pi-ask-user 0.1.0 → 0.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhushanwen/pi-ask-user",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "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",
@@ -25,6 +25,9 @@
     "README.md",
     "ARCHITECTURE.md"
   ],
+  "dependencies": {
+    "@xyz-agent/extension-protocol": "^0.2.0"
+  },
   "devDependencies": {
     "@earendil-works/pi-tui": "*",
     "@sinclair/typebox": "*",

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

@@ -0,0 +1,107 @@
+// src/__tests__/answer-format.test.ts
+//
+// answer-format.ts 独立单元测试。
+// 覆盖审查 S5 发现的覆盖盲区：
+//   - parseAnswerParts 子串误匹配（"A" 不应命中 "AB"）
+//   - formatAnswer 空 parts → null
+//   - comment 分隔符边界
+
+import { describe, expect, it } from "vitest";
+
+import { formatAnswer, parseAnswerParts } from "../answer-format.js";
+import { ANSWER_COMMENT_SEPARATOR } from "../types.js";
+
+describe("formatAnswer", () => {
+	it("returns null for empty parts (unanswered)", () => {
+		expect(formatAnswer([])).toBeNull();
+	});
+
+	it("returns null for empty parts even with comment", () => {
+		// parts 空 = 没有选中选项，即使有 comment 也不应产出有效答案行
+		expect(formatAnswer([], "some comment")).toBeNull();
+	});
+
+	it("joins single part without separator", () => {
+		expect(formatAnswer(["yes"])).toBe("yes");
+	});
+
+	it("joins multiple parts with ', '", () => {
+		expect(formatAnswer(["A", "B", "C"])).toBe("A, B, C");
+	});
+
+	it("appends comment with ANSWER_COMMENT_SEPARATOR", () => {
+		const result = formatAnswer(["A", "B"], "my comment");
+		expect(result).toBe(`A, B${ANSWER_COMMENT_SEPARATOR}my comment`);
+	});
+
+	it("handles null comment (no separator appended)", () => {
+		expect(formatAnswer(["A"], null)).toBe("A");
+	});
+});
+
+describe("parseAnswerParts", () => {
+	it("extracts selected labels by exact match", () => {
+		const labels = ["yes", "no", "maybe"];
+		const result = parseAnswerParts("yes, no", labels);
+		expect(result.selected).toEqual(["yes", "no"]);
+		expect(result.comment).toBeUndefined();
+	});
+
+	// S5 核心：防子串误匹配——"A" 不应命中 label "AB"
+	it("does NOT match substring labels (A vs AB)", () => {
+		const labels = ["A", "AB", "ABC"];
+		// 答案 "A, AB" 应精确匹配两个 label，而非 "A" 匹配三次
+		const result = parseAnswerParts("A, AB", labels);
+		expect(result.selected).toEqual(["A", "AB"]);
+	});
+
+	it("does NOT match 'A' when only 'AB' is in answer", () => {
+		const labels = ["A", "AB"];
+		// 答案 "AB" 只应命中 "AB"，不应命中 "A"
+		const result = parseAnswerParts("AB", labels);
+		expect(result.selected).toEqual(["AB"]);
+	});
+
+	it("preserves order of appearance in answer (not label order)", () => {
+		const labels = ["A", "B", "C"];
+		// 用户选择顺序可能与 options 定义顺序不同
+		const result = parseAnswerParts("C, A", labels);
+		expect(result.selected).toEqual(["C", "A"]);
+	});
+
+	it("extracts comment after ANSWER_COMMENT_SEPARATOR", () => {
+		const labels = ["yes"];
+		const answer = `yes${ANSWER_COMMENT_SEPARATOR}because reasons`;
+		const result = parseAnswerParts(answer, labels);
+		expect(result.selected).toEqual(["yes"]);
+		expect(result.comment).toBe("because reasons");
+	});
+
+	it("handles full-width comma (，) as separator", () => {
+		const labels = ["A", "B"];
+		const result = parseAnswerParts("A，B", labels);
+		expect(result.selected).toEqual(["A", "B"]);
+	});
+
+	it("returns non-matching tokens as neither selected nor comment (Other free text)", () => {
+		const labels = ["yes", "no"];
+		// "custom text" 不匹配任何 label → 是 Other 自由文本
+		const result = parseAnswerParts("custom text", labels);
+		expect(result.selected).toEqual([]);
+		expect(result.comment).toBeUndefined();
+	});
+
+	it("handles empty answer string", () => {
+		const result = parseAnswerParts("", ["A", "B"]);
+		expect(result.selected).toEqual([]);
+		expect(result.comment).toBeUndefined();
+	});
+
+	it("handles answer with only comment (no selected labels)", () => {
+		const labels = ["A"];
+		const answer = `${ANSWER_COMMENT_SEPARATOR}just a comment`;
+		const result = parseAnswerParts(answer, labels);
+		expect(result.selected).toEqual([]);
+		expect(result.comment).toBe("just a comment");
+	});
+});

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

@@ -473,37 +473,6 @@ describe("AskUserComponent — unknown control sequence leak fix (C-CSI)", () =>
 		expect(editorLine).toContain("hello");
 		expect(editorLine).not.toContain("[200~");
 	});
-
-	it("C-CSI-R5: arrow keys still no-op", () => {
-		const c = openFreeform([singleQ]);
-		c.handleInput(RIGHT);
-		c.handleInput(RIGHT);
-		c.handleInput(RIGHT);
-		c.handleInput("a");
-		c.handleInput("b");
-		const lines = c.render(60);
-		const editorLine = lines.find((l) => l.includes("\x1b[7m"));
-		expect(editorLine).toContain("ab");
-		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-R6: backspace still works", () => {
-		const c = openFreeform([singleQ]);
-		c.handleInput("abc");
-		c.handleInput(BKSP);
-		const lines = c.render(60);
-		const editorLine = lines.find((l) => l.includes("\x1b[7m"));
-		expect(editorLine).toContain("ab");
-		expect(editorLine).not.toContain("abc");
-	});
-
-	it("C-CSI-R7: Esc still exits editor", () => {
-		const c = openFreeform([singleQ]);
-		c.handleInput("abc");
-		c.handleInput(ESC);
-		const lines = c.render(60);
-		expect(lines.some((l) => l.includes("\x1b[7m"))).toBe(false);
-	});
 });
 
 // 🐛 = U+1F41B，UTF-16 surrogate pair（占 2 个 code unit，index 1=高代理 / 2=低代理）。

package/src/__tests__/e2e-harness.ts

@@ -72,6 +72,7 @@ export function makeE2E(questions: Question[], opts: E2EOptions = {}): E2EApi {
 		controller.signal,
 		undefined,
 		{
+			mode: hasUI ? "tui" : "print",
 			hasUI,
 			signal: controller.signal,
 			ui: {

package/src/__tests__/editor-ops.test.ts

@@ -0,0 +1,179 @@
+// src/__tests__/editor-ops.test.ts
+//
+// editor-ops.ts 独立单元测试。
+// 覆盖审查 S5 发现的 surrogate pair 边界盲区：
+//   - moveCursorLeft/Right 在 emoji（surrogate pair）边界正确按 code point 移动
+//   - deleteCharBeforeCursor 删整个 emoji code point
+//
+// 之前仅靠 component.test.ts 黑盒间接覆盖，无法直接锁定 surrogate 行为。
+
+import { describe, expect, it } from "vitest";
+
+import {
+	deleteCharBeforeCursor,
+	handleEditorPaste,
+	insertAtCursor,
+	moveCursorEnd,
+	moveCursorHome,
+	moveCursorLeft,
+	moveCursorRight,
+} from "../editor-ops.js";
+import { createQuestionState, type QuestionState } from "../types.js";
+
+function stateWith(text: string, cursor = text.length): QuestionState {
+	const s = createQuestionState();
+	s.draftText = text;
+	s.cursorIndex = cursor;
+	return s;
+}
+
+describe("moveCursorLeft", () => {
+	it("moves left by 1 for ASCII", () => {
+		const s = stateWith("abc", 3);
+		moveCursorLeft(s);
+		expect(s.cursorIndex).toBe(2);
+	});
+
+	it("moves left by 1 code point (2 UTF-16 units) for emoji", () => {
+		// "a😀b" → length=4 (a=1, 😀=2, b=1)，光标在末尾(4)
+		const s = stateWith("a😀b", 4);
+		moveCursorLeft(s); // 从 4 → 跳过 b 到 3
+		expect(s.cursorIndex).toBe(3);
+		moveCursorLeft(s); // 从 3 → 跳过 emoji 到 1（不是 2）
+		expect(s.cursorIndex).toBe(1);
+	});
+
+	it("does not go below 0", () => {
+		const s = stateWith("abc", 0);
+		moveCursorLeft(s);
+		expect(s.cursorIndex).toBe(0);
+	});
+
+	it("stops at 0 after emoji", () => {
+		const s = stateWith("😀", 2);
+		moveCursorLeft(s);
+		expect(s.cursorIndex).toBe(0);
+	});
+});
+
+describe("moveCursorRight", () => {
+	it("moves right by 1 for ASCII", () => {
+		const s = stateWith("abc", 0);
+		moveCursorRight(s);
+		expect(s.cursorIndex).toBe(1);
+	});
+
+	it("moves right by 1 code point (2 UTF-16 units) for emoji", () => {
+		// "a😀b" → 光标在 0，右移应到 1（a），再到 3（跳过 emoji 的 2 个 unit）
+		const s = stateWith("a😀b", 0);
+		moveCursorRight(s); // 0 → 1
+		expect(s.cursorIndex).toBe(1);
+		moveCursorRight(s); // 1 → 3（跳过 😀 的 2 个 unit）
+		expect(s.cursorIndex).toBe(3);
+	});
+
+	it("does not exceed draftText.length", () => {
+		const s = stateWith("ab", 2);
+		moveCursorRight(s);
+		expect(s.cursorIndex).toBe(2);
+	});
+
+	it("stops at end after emoji", () => {
+		const s = stateWith("x😀", 1);
+		moveCursorRight(s);
+		expect(s.cursorIndex).toBe(3); // 跳到末尾
+		moveCursorRight(s); // 不超出
+		expect(s.cursorIndex).toBe(3);
+	});
+});
+
+describe("deleteCharBeforeCursor", () => {
+	it("deletes single ASCII char", () => {
+		const s = stateWith("abc", 2);
+		const changed = deleteCharBeforeCursor(s);
+		expect(changed).toBe(true);
+		expect(s.draftText).toBe("ac");
+		expect(s.cursorIndex).toBe(1);
+	});
+
+	it("deletes entire emoji code point (2 UTF-16 units)", () => {
+		// "a😀b" 光标在 4（末尾），删除应删掉 b → "a😀"
+		const s = stateWith("a😀b", 4);
+		deleteCharBeforeCursor(s);
+		expect(s.draftText).toBe("a😀");
+		expect(s.cursorIndex).toBe(3);
+		// 再删一次应删掉整个 emoji（2 units），不是只删 1
+		deleteCharBeforeCursor(s);
+		expect(s.draftText).toBe("a");
+		expect(s.cursorIndex).toBe(1);
+	});
+
+	it("returns false at cursor 0 (nothing to delete)", () => {
+		const s = stateWith("abc", 0);
+		const changed = deleteCharBeforeCursor(s);
+		expect(changed).toBe(false);
+		expect(s.draftText).toBe("abc");
+		expect(s.cursorIndex).toBe(0);
+	});
+
+	it("deletes emoji at start of text", () => {
+		const s = stateWith("😀hello", 2);
+		deleteCharBeforeCursor(s);
+		expect(s.draftText).toBe("hello");
+		expect(s.cursorIndex).toBe(0);
+	});
+});
+
+describe("insertAtCursor", () => {
+	it("inserts text at cursor position", () => {
+		const s = stateWith("abc", 1);
+		insertAtCursor(s, "X");
+		expect(s.draftText).toBe("aXbc");
+		expect(s.cursorIndex).toBe(2);
+	});
+});
+
+describe("moveCursorHome / moveCursorEnd", () => {
+	it("home sets cursor to 0", () => {
+		const s = stateWith("abc", 2);
+		moveCursorHome(s);
+		expect(s.cursorIndex).toBe(0);
+	});
+
+	it("end sets cursor to draftText.length", () => {
+		const s = stateWith("a😀b", 0);
+		moveCursorEnd(s);
+		expect(s.cursorIndex).toBe(4);
+	});
+});
+
+describe("handleEditorPaste", () => {
+	it("inserts printable text", () => {
+		const s = stateWith("ab", 1);
+		const changed = handleEditorPaste(s, "XY");
+		expect(changed).toBe(true);
+		expect(s.draftText).toBe("aXYb");
+		expect(s.cursorIndex).toBe(3);
+	});
+
+	it("inserts emoji correctly (surrogate pair via Array.from)", () => {
+		const s = stateWith("", 0);
+		handleEditorPaste(s, "😀");
+		expect(s.draftText).toBe("😀");
+		expect(s.cursorIndex).toBe(2);
+	});
+
+	it("rejects unknown escape sequences (non-bracketed)", () => {
+		const s = stateWith("ab", 1);
+		const changed = handleEditorPaste(s, "\x1b[6n");
+		expect(changed).toBe(false);
+		expect(s.draftText).toBe("ab");
+	});
+
+	it("strips bracketed paste markers", () => {
+		const s = stateWith("", 0);
+		const changed = handleEditorPaste(s, "\x1b[200~hello\x1b[201~");
+		expect(changed).toBe(true);
+		expect(s.draftText).toBe("hello");
+	});
+});