@zhushanwen/pi-ask-user 0.0.2 → 0.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhushanwen/pi-ask-user",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "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",

package/src/__tests__/component.test.ts

@@ -362,6 +362,83 @@ describe("AskUserComponent — Other free-text editor", () => {
 	});
 });
 
+// ── 5e2. 多字符粘贴（M2/M7：完整保留，过滤控制字符，emoji 不丢）──
+// 回归 MUST_FIX-M2：handleEditorInput 按 code point 迭代粘贴 chunk，去掉了
+// `c.length === 1` 守卫（它误杀 BMP 之外的代理对，如 emoji）。
+describe("AskUserComponent — multi-char paste in editor", () => {
+	it("C-PASTE-1: multi-char chunk pasted at once is fully captured", () => {
+		// 终端把整段粘贴文本作为一个 data chunk 投递。修复前只取首字符。
+		const { c } = make([singleQ]);
+		c.handleInput(DOWN);
+		c.handleInput(DOWN);
+		c.handleInput(ENTER); // 打开 freeform 编辑器
+		c.handleInput("hello world"); // 一次粘贴多字符
+		const lines = c.render(60);
+		const editorLine = lines.find((l) => l.includes("█"));
+		expect(editorLine).toBeDefined();
+		// 完整文本保留（非仅首字符 "h"）
+		expect(editorLine).toContain("hello world");
+	});
+
+	it("C-PASTE-2: paste with emoji (surrogate pair) preserves emoji (M2)", () => {
+		// 修复前：`c.length === 1` 守卫把代理对（🐛 length===2）过滤掉，emoji 被静默丢弃。
+		const { c } = make([singleQ]);
+		c.handleInput(DOWN);
+		c.handleInput(DOWN);
+		c.handleInput(ENTER);
+		c.handleInput("fix the 🐛 bug");
+		const lines = c.render(60);
+		const editorLine = lines.find((l) => l.includes("█"));
+		expect(editorLine).toBeDefined();
+		// emoji 完整保留，不丢失
+		expect(editorLine).toContain("fix the 🐛 bug");
+		expect(editorLine).toContain("🐛");
+	});
+
+	it("C-PASTE-3: multi-char chunk with control chars filters control, keeps printable", () => {
+		// 粘贴 "ab\tcd"：\t（U+0009）< 空格 → 被过滤；a/b/c/d 保留。
+		const { c } = make([singleQ]);
+		c.handleInput(DOWN);
+		c.handleInput(DOWN);
+		c.handleInput(ENTER);
+		c.handleInput("ab\tcd");
+		const lines = c.render(60);
+		const editorLine = lines.find((l) => l.includes("█"));
+		expect(editorLine).toBeDefined();
+		// 可打印字符保留，控制字符 \t 被过滤
+		expect(editorLine).toContain("abcd");
+		expect(editorLine).not.toContain("\t");
+	});
+
+	it("C-PASTE-4: empty string input is a no-op (no side effects)", () => {
+		const { c, result } = make([singleQ]);
+		c.handleInput(DOWN);
+		c.handleInput(DOWN);
+		c.handleInput(ENTER); // 打开编辑器
+		const before = c.render(60);
+		c.handleInput(""); // 空字符串，无副作用
+		const after = c.render(60);
+		// 未解析、未崩溃、视图不变
+		expect(result.val).toBeUndefined();
+		expect(after).toEqual(before);
+		// 编辑器仍在（光标在），editorText 仍为空
+		expect(after.some((l) => l.includes("█"))).toBe(true);
+	});
+
+	it("C-PASTE-5: single printable char still works (backward-compat)", () => {
+		// 回归：修复去掉守卫后单字符行为不变（与 C-27 等价的逐字符输入）。
+		const { c } = make([singleQ]);
+		c.handleInput(DOWN);
+		c.handleInput(DOWN);
+		c.handleInput(ENTER);
+		c.handleInput("x"); // 单字符
+		const lines = c.render(60);
+		const editorLine = lines.find((l) => l.includes("█"));
+		expect(editorLine).toBeDefined();
+		expect(editorLine).toContain("x");
+	});
+});
+
 // ── 5f. 评论流程（FR-4.6 / FR-11 / AC-6/12/17）─────────
 describe("AskUserComponent — comment flow", () => {
 	it("C-33: single-select + allowComment Enter enters comment mode", () => {

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

@@ -271,11 +271,12 @@ describe("renderQuestionView — Other editor mode", () => {
 			true,
 			huge,
 		);
-		// 统计含 'y' 的行数 = input 渲染行数（应被截到 5 行）
-		const yLines = lines.filter((l) => l.includes("y"));
-		expect(yLines.length).toBe(5);
+		// 统计含输入内容的行数 = input 渲染行数（应被截到 5 行）
+		// 编号 "3. " 现在是 styled 内容的一部分，首行包裹段 "3." 不含 'y'
+		const inputLines = lines.filter((l) => l.includes("y") || l.includes("3."));
+		expect(inputLines.length).toBe(5);
 		// 最后一行带省略号（表示还有更多，光标已被省略号取代）
-		expect(yLines[yLines.length - 1]).toContain("…");
+		expect(inputLines[inputLines.length - 1]).toContain("…");
 	});
 
 	it("Q-30: 已保存 freeText 预览超屏宽时多行换行展示", () => {

package/src/component.ts

@@ -382,9 +382,21 @@ export class AskUserComponent implements Component {
 			this.tui.requestRender();
 			return;
 		}
-		// Printable char
-		if (data.length === 1 && data >= " ") {
-			this.editorText += data;
+		// Printable char(s) — handle both single keystrokes and multi-char paste.
+		// Terminals deliver pasted text as a single data chunk; iterating each char
+		// ensures the full paste is captured instead of silently dropping everything
+		// after the first character.
+		// for...of 按 code point 迭代：代理对（如 😀 U+1F600）作为一个 c（length===2）出现，
+		// 因此不能用 `c.length === 1` 守卫——那会把所有 BMP 之外的字符（emoji、部分 CJK 扩展）全过滤。
+		// 只保留 `c >= " "`（code point 比较），过滤控制字符（< 空格 U+0020）。
+		let changed = false;
+		for (const c of data) {
+			if (c >= " ") {
+				this.editorText += c;
+				changed = true;
+			}
+		}
+		if (changed) {
 			this.invalidate();
 			this.tui.requestRender();
 			return;

package/src/question-view.ts

@@ -107,14 +107,14 @@ function buildOptionLines(
 
 		if (isOther) {
 			if (state.mode === "freeform") {
-				// 原地编辑：与普通选项的 [ ] 框 + 编号视觉对齐（单选无勾选语义则留空）。
-				// lead = "> [ ] N. "，输入文本跟在编号后，与其他选项整体一致。
+				// 原地编辑：与普通选项的 [ ] 框视觉对齐（单选无勾选语义则留空）。
+				// lead = "> [ ] "，编号 + 输入文本跟在框后，内容起始列与普通选项一致。
 				const box = q.multiSelect ? t.fg("dim", "[ ]") : "  ";
 				const num = i + 1;
-				const lead = `${prefix} ${box} ${t.fg("muted", `${num}. `)}`;
+				const lead = `${prefix} ${box} `;
 				const avail = Math.max(1, width - visibleWidth(lead));
-				// 文本 + 末尾光标 █ 整体软换行（空 input 时仅光标，wrapTextWithAnsi("█") 单行）
-				const styled = `${t.fg("text", editorText)}${t.fg("accent", "█")}`;
+				// 编号 + 文本 + 末尾光标 █ 整体软换行（空 input 时仅编号 + 光标，wrapTextWithAnsi 单行）
+				const styled = `${t.fg("muted", `${num}. `)}${t.fg("text", editorText)}${t.fg("accent", "█")}`;
 				addWrappedInput(add, lead, styled, avail, MAX_EDITOR_LINES);
 			} else {
 				const hasFreeText = state.freeTextValue !== null;
@@ -124,7 +124,7 @@ function buildOptionLines(
 				add(`${prefix} ${check} ${t.fg(labelColor, `${num}. ${opt.label}`)}`);
 				if (hasFreeText) {
 					// 已保存 freeText 预览：软换行展示，最多 MAX_EDITOR_LINES 行（不再单行截断）
-					const lead = "     "; // 5 列缩进，与上方 label 行对齐
+					const lead = "      "; // 6 列缩进，与上方 label 行对齐（prefix1 + sp1 + check1 + sp1 + num2 = 6）
 					const avail = Math.max(1, width - visibleWidth(lead));
 					const styled = t.fg("dim", `"${state.freeTextValue ?? ""}"`);
 					addWrappedInput(add, lead, styled, avail, MAX_EDITOR_LINES);
@@ -137,8 +137,8 @@ function buildOptionLines(
 			const num = i + 1;
 			add(`${prefix} ${box} ${t.fg(labelColor, `${num}. ${opt.label}`)}`);
 			if (opt.description && !hideDescriptions) {
-				const wrapped = wrapTextWithAnsi(t.fg("muted", opt.description), width - 7);
-				for (const line of wrapped) add(`       ${line}`);
+				const wrapped = wrapTextWithAnsi(t.fg("muted", opt.description), width - 10);
+				for (const line of wrapped) add(`          ${line}`);
 			}
 		} else {
 			const isConfirmed = state.selectedIndex === i;
@@ -147,8 +147,8 @@ function buildOptionLines(
 			const num = i + 1;
 			add(`${prefix} ${check} ${t.fg(labelColor, `${num}. ${opt.label}`)}`);
 			if (opt.description && !hideDescriptions) {
-				const wrapped = wrapTextWithAnsi(t.fg("muted", opt.description), width - 5);
-				for (const line of wrapped) add(`     ${line}`);
+				const wrapped = wrapTextWithAnsi(t.fg("muted", opt.description), width - 8);
+				for (const line of wrapped) add(`        ${line}`);
 			}
 		}
 	}