lite-questionnaire 1.0.4 → 1.0.6

package/core.ts

@@ -183,6 +183,7 @@ export class Core {
    * 优先检查持久化答案；没有答案时再检查当前 UI 草稿/默认值。
    */
   hasAnyValue(q: FlatQuestion, state?: QuestionUIState): boolean {
+    if (q.id === "__lq_notes__") return true;
     const answer = this.answers.get(q.id);
     if (this.answerHasValue(answer)) return true;
 

package/index.ts

@@ -14,7 +14,7 @@ import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
 import { Editor, type EditorTheme, Text, truncateToWidth } from "@earendil-works/pi-tui";
 import { Core } from "./core";
-import type { Answer, CancelledResult, QuestionnaireParams, QuestionnaireResult } from "./types";
+import type { Answer, CancelledResult, QuestionnaireParams, QuestionnaireResult, Question } from "./types";
 import {
   panelTop,
   panelBottom,
@@ -177,8 +177,16 @@ export default function questionnaire(pi: ExtensionAPI) {
       }
 
       const core = new Core();
-      core.init(input.questions);
-      const originalQuestions = input.questions;
+      const notesQuestion: Question = {
+        id: "__lq_notes__",
+        label: "备注",
+        prompt: "有什么需要补充说明的吗？",
+        type: "text",
+        placeholder: "输入备注内容（可选）...",
+      };
+      const allQuestions = [...input.questions, notesQuestion];
+      core.init(allQuestions);
+      const originalQuestions = allQuestions;
       const snapshotKey = questionnaireKey(originalQuestions);
       const snapshot = loadSnapshot(
         ctx.sessionManager.getBranch() as Array<{ type: string; customType?: string; data?: unknown }>,

package/input.ts

@@ -126,7 +126,7 @@ export function createInputHandler(
 
         if (!text) {
           core.deleteAnswer(q.id);
-          if (options.allowEmpty) {
+          if (options.allowEmpty || q.id === "__lq_notes__") {
             return true;
           }
           core.leaveCurrentQuestion();
@@ -256,20 +256,33 @@ export function createInputHandler(
       if (q.type === "confirm") {
         if (matchesKey(data, Key.left)) {
           const state = core.getUIState();
-          state.confirmValue = true;
+          state.optionIndex = 0; // 光标移到「是」
           core.saveUIState(state);
           onUpdate();
           return;
         }
         if (matchesKey(data, Key.right)) {
           const state = core.getUIState();
-          state.confirmValue = false;
+          state.optionIndex = 1; // 光标移到「否」
+          core.saveUIState(state);
+          onUpdate();
+          return;
+        }
+        if (matchesKey(data, Key.space)) {
+          const state = core.getUIState();
+          state.confirmValue = state.optionIndex === 0; // ● 移到光标位置
           core.saveUIState(state);
           onUpdate();
           return;
         }
         if (matchesKey(data, Key.enter)) {
-          advance();
+          const state = core.getUIState();
+          state.confirmValue = state.optionIndex === 0; // 确认选中
+          core.saveUIState(state);
+          core.inputMode = false;
+          core.inputQuestionId = null;
+          saveFn();
+          onUpdate();
           return;
         }
         return;
@@ -492,7 +505,23 @@ export function createInputHandler(
         return;
       }
 
-      case "confirm":
+      case "confirm": {
+        if (matchesKey(data, Key.tab)) {
+          core.inputMode = true;
+          core.inputQuestionId = q.id;
+          // 进入选择态时，光标初始位置与当前 ● 一致
+          const state = core.getUIState();
+          state.optionIndex = state.confirmValue ? 0 : 1;
+          core.saveUIState(state);
+          onUpdate();
+          return;
+        }
+        if (matchesKey(data, Key.enter)) {
+          advance();
+          return;
+        }
+        break;
+      }
       case "rating": {
         if (matchesKey(data, Key.tab)) {
           core.inputMode = true;

package/modules/confirm.ts

@@ -25,18 +25,27 @@ export function renderConfirmQuestion(
   const noLabel = q.noLabel || "否";
   const selectedYes = state.confirmValue === true;
 
-  // 渲染两个按钮
-  const yesBtn = selectedYes
+  // 是否处于选择态（Tab 进入的编辑模式）
+  const isEditing = core.inputMode && core.inputQuestionId === q.id;
+  // 选择态下光标位置：optionIndex=0 表示在「是」，1 表示在「否」
+  const cursorOnYes = isEditing && state.optionIndex === 0;
+  const cursorOnNo = isEditing && state.optionIndex === 1;
+
+  // 渲染两个按钮：● 表示已选中（基于 confirmValue），背景高亮表示光标（仅选择态可见）
+  const dot = theme.fg("success", "●");
+  const blank = " ";
+
+  const yesBtn = cursorOnYes
     ? theme.bg("selectedBg", theme.fg("text", ` [${yesLabel}] `))
     : ` [${yesLabel}] `;
-  const noBtn = !selectedYes
+  const noBtn = cursorOnNo
     ? theme.bg("selectedBg", theme.fg("text", ` [${noLabel}] `))
     : ` [${noLabel}] `;
 
-  const arrow = selectedYes
-    ? theme.fg("accent", ">") + " " + yesBtn + "  " + noBtn
-    : "  " + yesBtn + "  " + theme.fg("accent", ">") + " " + noBtn;
+  const row = selectedYes
+    ? dot + " " + yesBtn + "  " + blank + " " + noBtn
+    : blank + " " + yesBtn + "  " + dot + " " + noBtn;
 
-  lines.push(truncateToWidth(" " + arrow, width));
+  lines.push(truncateToWidth(" " + row, width));
   return lines;
 }

package/modules/select.ts

@@ -33,15 +33,10 @@ export function renderSelectOptions(
     const hasCustomText = opt.isCustom && state.customText !== null;
     const isSelected = state.selectedIndices.includes(i);
 
-    // 前缀
-    let prefix: string;
-    if (isCursor) {
-      prefix = theme.fg("accent", "> ");
-    } else if (isSelected) {
-      prefix = theme.fg("success", "• ");
-    } else {
-      prefix = "  ";
-    }
+    // 前缀：两列独立 — 列0: >, 列1: ●
+    const col0 = isCursor ? theme.fg("accent", ">") : " ";
+    const col1 = isSelected ? theme.fg("success", "●") : " ";
+    const prefix = col0 + col1 + " ";
 
     // 颜色
     const color = isCursor ? "accent" : isSelected ? "success" : "text";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lite-questionnaire",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "轻量级交互式问卷工具 — 单选、多选、文本、确认、评分，带条件子问题和声明式校验",
   "keywords": [
     "pi-package",

package/render.ts

@@ -108,7 +108,7 @@ export function renderTabBar(
   // 提交 Tab
   const isSubmit = core.isSubmitTab();
   const allDone = core.allAnswered();
-  let submitText = " ✓ Submit ";
+  let submitText = " ✓ 提交 ";
   if (isSubmit) {
     submitText = theme.bg("selectedBg", allDone ? theme.fg("success", submitText) : theme.fg("text", submitText));
   } else if (allDone) {
@@ -143,6 +143,9 @@ export function renderHelpBar(
   theme: { fg: (c: string, t: string) => string },
 ): string {
   if (inputMode) {
+    if (q?.type === "confirm") {
+      return theme.fg("dim", " ← → 切换 · Space 选中 · Enter 确认 · Esc 退出");
+    }
     return theme.fg("dim", " ← → 调整/移动 · Enter 保存 · Esc 退出编辑");
   }
 
@@ -162,7 +165,7 @@ export function renderHelpBar(
     case "text":
       return theme.fg("dim", " Tab 编辑 · Enter 提交 · Esc 取消" + (isMultiQuestion ? " · ← → 切换问题" : ""));
     case "confirm":
-      return theme.fg("dim", " Tab 选择 · Enter 确认 · Esc 取消" + (isMultiQuestion ? " · ← → 切换问题" : ""));
+      return theme.fg("dim", " Tab 编辑 · Enter 进入下一栏 · Esc 取消" + (isMultiQuestion ? " · ← → 切换问题" : ""));
     case "rating":
       return theme.fg("dim", " Tab 调整 · Enter 确认 · Esc 取消" + (isMultiQuestion ? " · ← → 切换问题" : ""));
     default:
@@ -187,6 +190,7 @@ export function renderSubmitPage(
 
   for (const q of core.questions) {
     const answer = core.answers.get(q.id);
+    if (q.id === "__lq_notes__" && !answer) continue;
     if (!answer) {
       lines.push(` ⚠ ${theme.fg("error", q.label)}: ${theme.fg("dim", "(未回答)")}`);
     } else if ('text' in answer) {