dsh-neotui 0.2.0 → 0.2.1

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 0.2.1 — 2026-08-16
+
+### Fixed
+
+- AskUser 问题始终显示“输入自己的回答”和常驻输入栏。
+- “跳过此问题”改为真实、可导航的列表项，不再使用重复的底部按钮。
+- 自定义回答支持左右键、Home、End、Backspace、Delete 和光标位置插入。
+- 鼠标只在选项实际文字区域内生效，同行空白区域不再误提交。
+- 自定义输入栏固定在自定义回答项下一行，跳过项固定在输入栏下方。
+
 ## 0.2.0 — 2026-08-16
 
 ### Added

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-neotui",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Neo-TUI: mouse-driven terminal UI client for DeepSeek Harness (B-tier per dsh-tui-design.md)",
   "type": "module",
   "bin": {

package/src/views.js

@@ -2356,10 +2356,7 @@ export class QuestionPopup extends Popup {
       x: Math.max(0, Math.floor((app.screen.w - w) / 2)), y: Math.max(0, Math.floor((app.screen.h - h) / 2)),
       w, h, title: planReview ? "✎ 计划审阅" : "❓ 需要你的回答",
       lines: ["", ...questions.map((q) => q.question ?? q.id)],
-      buttons: planReview ? [] : [
-        { label: "回答…", action: "custom" },
-        { label: "跳过", action: "cancel" },
-      ],
+      buttons: [],
     });
     this.app = app;
     this.frame = frame;
@@ -2368,14 +2365,13 @@ export class QuestionPopup extends Popup {
     this.detailScrollY = 0;
     this.detailPage = 1;
     this.optionRows = [];
+    this.optionHitboxes = [];
     this.questionIdx = 0;
     this.drafts = questions.map(() => ({ selected: [], custom: "", skipped: false }));
     this.selIdx = 0;
-    this.onAction = (btn) => {
-      if (btn.action === "cancel") this.#skipCurrent();
-      else if (btn.action === "custom") this.#continueCurrent();
-      else if (btn.action === "__cancel__") this.#cancel();
-    };
+    this.customEditing = false;
+    this.customCursor = 0;
+    this.onAction = (btn) => { if (btn.action === "__cancel__") this.#cancel(); };
     this.#layout();
   }
 
@@ -2410,16 +2406,26 @@ export class QuestionPopup extends Popup {
         screen.text(this.x + 2, ly++, `计划 ${start}–${end} / ${detailLines.length} 行 · PgUp/PgDn/Home/End/滚轮`, { fg: K.FAINT });
       }
     }
-    this.optionRows = [];
+    this.optionRows = []; this.optionHitboxes = [];
     for (let i = 0; i < opts.length && ly < this.y + this.h - 3; i++) {
       this.optionRows[i] = ly;
       const chosen = draft.selected.includes(opts[i].label);
       const cursor = this.selIdx === i;
       const glyph = q.multiSelect ? (chosen ? "☑" : "☐") : (chosen ? "●" : "○");
-      screen.text(this.x + 2, ly++, truncate(` ${cursor ? "▸" : " "} ${glyph} ${opts[i].label}`, this.w - 6), { fg: cursor ? T.SELFG : K.TXT, bg: cursor ? T.MENUSEL : -1 });
+      const optionText=truncate(` ${cursor ? "▸" : " "} ${glyph} ${opts[i].label}`, this.w - 6);
+      this.optionHitboxes[i]={x1:this.x+2,x2:this.x+2+strWidth(optionText)-1,y1:ly,y2:ly+(opts[i].description?1:0)};
+      screen.text(this.x + 2, ly++, optionText, { fg: cursor ? T.SELFG : K.TXT, bg: cursor ? T.MENUSEL : -1 });
       if (opts[i].description && ly < this.y + this.h - 3) screen.text(this.x + 7, ly++, truncate(opts[i].description, this.w - 10), { fg: K.FAINT });
     }
-    if (draft.custom) screen.text(this.x + 2, Math.min(ly, this.y + this.h - 3), truncate(`自定义: ${draft.custom}`, this.w - 4), { fg: K.ACCENT });
+    if (!this.planReview && ly < this.y + this.h - 3) {
+      this.optionRows[opts.length] = ly;
+      const cursor = this.selIdx === opts.length;
+      const customText=truncate(` ${cursor ? "▸" : " "} ✎ 输入自己的回答`, this.w - 6);
+      this.optionHitboxes[opts.length]={x1:this.x+2,x2:this.x+2+strWidth(customText)-1,y1:ly,y2:ly};
+      screen.text(this.x + 2, ly++, customText, { fg: cursor ? T.SELFG : K.ACCENT, bg: cursor ? T.MENUSEL : -1 });
+      if(ly<this.y+this.h-3){const chars=Array.from(draft.custom),shown=this.customEditing?[...chars.slice(0,this.customCursor),"▏",...chars.slice(this.customCursor)].join(""):draft.custom;const inputText=truncate(`   > ${shown||"在此输入…"}`,this.w-8);screen.text(this.x+2,ly++,inputText,{fg:this.customEditing?K.TXT:K.FAINT,bg:this.customEditing?T.BG2:-1});}
+      if(ly<this.y+this.h-3){this.optionRows[opts.length+1]=ly;const skip=this.selIdx===opts.length+1,skipText=` ${skip?"▸":" "} ↷ 跳过此问题`;this.optionHitboxes[opts.length+1]={x1:this.x+2,x2:this.x+2+strWidth(skipText)-1,y1:ly,y2:ly};screen.text(this.x+2,ly++,skipText,{fg:skip?T.SELFG:K.FAINT,bg:skip?T.MENUSEL:-1});}
+    }
   }
 
   #choose(i) {
@@ -2442,13 +2448,16 @@ export class QuestionPopup extends Popup {
     if (ev.kind === "press" && ev.button === 0) {
       const q = this.questions[this.questionIdx];
       for (let i = 0; i < (q?.options?.length ?? 0); i++) {
-        const ly = this.optionRows[i];
-        if (ly != null && (ev.y === ly || (q.options[i].description && ev.y === ly + 1))) {
-          this.selIdx = i; this.#choose(i);
+        const box=this.optionHitboxes[i];
+        if (box && ev.x>=box.x1 && ev.x<=box.x2 && ev.y>=box.y1 && ev.y<=box.y2) {
+          this.selIdx = i; this.customEditing = false; this.#choose(i);
           if (!q.multiSelect) this.#continueCurrent();
           return true;
         }
       }
+      const count=q?.options?.length??0,customBox=this.optionHitboxes[count];
+      if(customBox&&ev.x>=customBox.x1&&ev.x<=customBox.x2&&ev.y===customBox.y1){this.selIdx=count;this.customEditing=true;this.customCursor=Array.from(this.drafts[this.questionIdx].custom).length;this.drafts[this.questionIdx].selected=[];this.app.redraw();return true;}
+      const skipBox=this.optionHitboxes[count+1];if(skipBox&&ev.x>=skipBox.x1&&ev.x<=skipBox.x2&&ev.y===skipBox.y1){this.selIdx=count+1;this.#skipCurrent();return true;}
     }
     return super.onMouse(ev);
   }
@@ -2456,9 +2465,10 @@ export class QuestionPopup extends Popup {
   onKey(ev) {
     const q = this.questions[this.questionIdx];
     const draft = this.drafts[this.questionIdx];
-    if (ev.type === "text") { draft.custom += ev.text; draft.skipped = false; return true; }
-    if (ev.type !== "key") return false;
     const count = q?.options?.length ?? 0;
+    const choices = count + (this.planReview ? 0 : 2);
+    if (ev.type === "text") { if(this.customEditing||this.selIdx===count){this.customEditing=true;draft.selected=[];const chars=Array.from(draft.custom);chars.splice(this.customCursor,0,...Array.from(ev.text));draft.custom=chars.join("");this.customCursor+=Array.from(ev.text).length;draft.skipped=false;return true;} return false; }
+    if (ev.type !== "key") return false;
     if (this.planReview && ["pageup", "pagedown", "home", "end"].includes(ev.name)) {
       const total = String(q?.detail ?? "").split("\n").length;
       if (ev.name === "pageup") this.detailScrollY = Math.max(0, this.detailScrollY - this.detailPage);
@@ -2467,11 +2477,19 @@ export class QuestionPopup extends Popup {
       else this.detailScrollY = Math.max(0, total - this.detailPage);
       this.app.redraw(); return true;
     }
-    if (ev.name === "up") { this.selIdx = Math.max(0, this.selIdx - 1); return true; }
-    if (ev.name === "down") { this.selIdx = Math.min(Math.max(0, count - 1), this.selIdx + 1); return true; }
-    if (ev.name === "char" && ev.key === " " && count) { this.#choose(this.selIdx); return true; }
-    if (ev.name === "backspace" && draft.custom) { draft.custom = Array.from(draft.custom).slice(0, -1).join(""); return true; }
+    if(this.customEditing&&ev.name==="left"){this.customCursor=Math.max(0,this.customCursor-1);return true;}
+    if(this.customEditing&&ev.name==="right"){this.customCursor=Math.min(Array.from(draft.custom).length,this.customCursor+1);return true;}
+    if(this.customEditing&&ev.name==="home"){this.customCursor=0;return true;}
+    if(this.customEditing&&ev.name==="end"){this.customCursor=Array.from(draft.custom).length;return true;}
+    if (ev.name === "up") { this.customEditing=false;this.selIdx = Math.max(0, this.selIdx - 1); return true; }
+    if (ev.name === "down") { this.customEditing=false;this.selIdx = Math.min(Math.max(0, choices - 1), this.selIdx + 1); return true; }
+    if (ev.name === "char" && ev.key === " " && count && this.selIdx<count) { this.#choose(this.selIdx); return true; }
+    if (ev.name === "backspace" && this.customEditing && this.customCursor>0) {const chars=Array.from(draft.custom);chars.splice(this.customCursor-1,1);draft.custom=chars.join("");this.customCursor--;return true;}
+    if(ev.name==="delete"&&this.customEditing){const chars=Array.from(draft.custom);if(this.customCursor<chars.length){chars.splice(this.customCursor,1);draft.custom=chars.join("");}return true;}
     if (ev.name === "enter") {
+      if(!this.planReview&&this.selIdx===count+1){this.#skipCurrent();return true;}
+      if(!this.planReview&&this.selIdx===count&&!this.customEditing){this.customEditing=true;this.customCursor=Array.from(draft.custom).length;draft.selected=[];return true;}
+      if(this.customEditing){if(!draft.custom.trim()){this.app.toast("请输入自己的回答");return true;}this.#continueCurrent();return true;}
       if (count && draft.selected.length === 0 && !draft.custom) this.#choose(this.selIdx);
       this.#continueCurrent(); return true;
     }
@@ -2491,7 +2509,7 @@ export class QuestionPopup extends Popup {
   }
 
   #advanceOrSubmit() {
-    if (this.questionIdx < this.questions.length - 1) { this.questionIdx++; this.selIdx = 0; this.detailScrollY = 0; this.#layout(); this.app.redraw(); return; }
+    if (this.questionIdx < this.questions.length - 1) { this.questionIdx++; this.selIdx = 0; this.customEditing=false;this.customCursor=0;this.detailScrollY = 0; this.#layout(); this.app.redraw(); return; }
     this.#submit();
   }