@zhushanwen/pi-ask-user 0.0.4 → 0.2.0

package/src/submit-view.ts

@@ -1,8 +1,8 @@
 // src/submit-view.ts
 import { truncateToWidth } from "@mariozechner/pi-tui";
 
+import { formatAnswer } from "./answer-format";
 import {
-	ANSWER_COMMENT_SEPARATOR,
 	HEADER_MAX_CHARS,
 	type Question,
 	type QuestionState,
@@ -10,6 +10,22 @@ import {
 	type ThemeLike,
 } from "./types";
 
+/** 渲染 [ Submit ]   [ Cancel ] 按钮栏，返回带样式的单行字符串。
+ *  focus: null=纯展示（问题 tab footer），"submit"/"cancel"=高亮对应按钮（Submit tab）。
+ *  统一了 component.ts footer 版与 submit-view 内嵌版的样式逻辑。 */
+export function renderButtonBar(theme: ThemeLike, allDone: boolean, focus: "submit" | "cancel" | null): string {
+	const t = theme;
+	const isSubmit = focus === "submit";
+	const isCancel = focus === "cancel";
+	const submit = isSubmit
+		? (allDone ? t.fg("success", t.bold(" Submit ")) : t.fg("accent", t.bold(" Submit ")))
+		: (allDone ? t.fg("success", " Submit ") : t.fg("dim", " Submit "));
+	const cancel = isCancel
+		? t.fg("accent", t.bold(" Cancel "))
+		: t.fg("muted", " Cancel ");
+	return `${t.fg("dim", "[")}${submit}${t.fg("dim", "]")}   ${t.fg("dim", "[")}${cancel}${t.fg("dim", "]")}`;
+}
+
 /**
  * 获取单问题的答案文本（供 Submit tab 显示）。
  * 返回 null 表示未答。
@@ -28,9 +44,7 @@ export function getAnswerText(q: Question, s: QuestionState): string | null {
 		if (label) parts.push(label);
 	}
 	if (s.freeTextValue !== null) parts.push(s.freeTextValue);
-	if (parts.length === 0) return null;
-	const base = parts.join(", ");
-	return s.commentValue ? `${base}${ANSWER_COMMENT_SEPARATOR}${s.commentValue}` : base;
+	return formatAnswer(parts, s.commentValue);
 }
 
 /**
@@ -84,13 +98,7 @@ export function renderSubmitView(
 
 	// 内嵌按钮栏：[ Submit ]   [ Cancel ]，根据 focus 高亮
 	add("");
-	const isSubmit = focus === "submit";
-	const isCancel = focus === "cancel";
-	const submitBtn = isSubmit
-		? (allDone ? t.fg("success", t.bold(" Submit ")) : t.fg("accent", t.bold(" Submit ")))
-		: (allDone ? t.fg("success", " Submit ") : t.fg("dim", " Submit "));
-	const cancelBtn = isCancel ? t.fg("accent", t.bold(" Cancel ")) : t.fg("muted", " Cancel ");
-	add(`${t.fg("dim", "[")}${submitBtn}${t.fg("dim", "]")}   ${t.fg("dim", "[")}${cancelBtn}${t.fg("dim", "]")}`);
+	add(renderButtonBar(t, allDone, focus));
 
 	// Submit tab 帮助行
 	add("");

package/src/types.ts

@@ -30,7 +30,7 @@ export const OptionSchema = Type.Object({
 export const QuestionSchema = Type.Object({
 	question: Type.String({
 		description:
-			"Full question text. Must be one self-contained decision; avoid multi-part questions. Plain text only (no newlines or control characters).",
+			"Full question text. Must be one self-contained decision; avoid multi-part questions. ≤1000 chars; plain single-line text only (no newlines or control characters).",
 	}),
 	header: Type.Optional(
 		Type.String({
@@ -63,7 +63,6 @@ export const InputSchema = Type.Object({
 // ── 派生类型 ─────────────────────────────────────────
 export type Option = Static<typeof OptionSchema>;
 export type Question = Static<typeof QuestionSchema>;
-export type Input = Static<typeof InputSchema>;
 
 // ── Result schema（details，renderResult 数据源） ─────
 export const ResultSchema = Type.Object({
@@ -108,10 +107,17 @@ export interface QuestionState {
 	confirmed: boolean;
 	/** Other 自由文本答案；null=未输入 */
 	freeTextValue: string | null;
+	/** freeform Esc 保存的未提交草稿；null=无草稿。
+	 *  与 freeTextValue（已提交答案）分离，避免放弃的草稿污染答案、触发 auto-confirm。 */
+	freeDraft: string | null;
 	/** 可选评论；null=未输入 */
 	commentValue: string | null;
 	/** 当前交互模式 */
 	mode: QuestionMode;
+	/** 编辑器草稿文本（每问题独立持有，进编辑器时预填、退出时清空） */
+	draftText: string;
+	/** 进入编辑器前保存的 options 光标位置（退出编辑器时恢复） */
+	savedOptionsCursorIndex: number;
 }
 
 /** 创建初始 QuestionState */
@@ -122,7 +128,23 @@ export function createQuestionState(): QuestionState {
 		selectedIndices: new Set<number>(),
 		confirmed: false,
 		freeTextValue: null,
+		freeDraft: null,
 		commentValue: null,
 		mode: "options",
+		draftText: "",
+		savedOptionsCursorIndex: 0,
 	};
 }
+
+// ── UTF-16 surrogate pair 工具（编辑器光标移动/删除/渲染共用） ──
+/** 高代理位掩码：charCode & 0xFC00 === 0xD800 判定 surrogate pair 前半 */
+export const SURROGATE_HIGH_MASK = 0xFC00;
+/** 高代理起始码点（surrogate pair 前半的判定值） */
+export const SURROGATE_HIGH_START = 0xD800;
+/** 一个 surrogate pair 占用的 UTF-16 code unit 数 */
+export const SURROGATE_PAIR_LEN = 2;
+
+/** 检查 s[i] 是否是 UTF-16 高代理（surrogate pair 的前半部分） */
+export function isHighSurrogate(s: string, i: number): boolean {
+	return (s.charCodeAt(i) & SURROGATE_HIGH_MASK) === SURROGATE_HIGH_START;
+}

package/src/validate.ts

@@ -1,5 +1,5 @@
 // src/validate.ts
-import { type Question,QUESTION_MAX_CHARS } from "./types";
+import { HEADER_MAX_CHARS, type Question, QUESTION_MAX_CHARS } from "./types";
 
 /** 控制字符（含 \n \r \t 等）：question 文本禁止包含，避免 answers key 含不可见字符（spec FR-2） */
 const CONTROL_CHAR_RE = /[\x00-\x1f\x7f]/;
@@ -55,6 +55,25 @@ export function validateInput(questions: Question[]): string | null {
 				return `Question "${q.question}" requires a non-empty header in multi-question mode (it labels the tab). Provide a header of <=12 chars.`;
 			}
 		}
+
+		// S3: 多问题时 header 唯一——重复 header 会导致 askUserKey 碰撞，
+		// 后一个 question 的 __other/__comment 覆盖前一个（协议 helper 用 header 作 answers 读取 key）。
+		const seenHeaders = new Set<string>();
+		for (const q of questions) {
+			const h = q.header!.trim();
+			if (seenHeaders.has(h)) {
+				return `Duplicate header "${h}" in questions. Headers must be unique in multi-question mode — shared headers cause answer key collisions (one question's Other/comment overwrites another's). Rephrase one header to differ.`;
+			}
+			seenHeaders.add(h);
+		}
+	}
+
+	// 4. header 长度上限（若提供）。单/多问题均校验：超出会在 tab 栏被静默截断，
+	//    这里提前拒绝，让 LLM 拿到可修复错误而非残缺 UI（兑现 schema description 的 ≤12 契约）。
+	for (const q of questions) {
+		if (q.header !== undefined && q.header.length > HEADER_MAX_CHARS) {
+			return `Header exceeds ${HEADER_MAX_CHARS} chars: "${q.header.slice(0, 20)}..." in question "${q.question}". Shorten it; longer headers are truncated in the tab bar.`;
+		}
 	}
 
 	return null;