cli: the kill question rides the bar and costs no height

The dialog was a second copy of a question the bar was already carrying: the
sentence in the alert slot, the answers under it in a row of their own. Now
the alert holds 'kill <id>?', the command slot holds [y/N], and the view
underneath is untouched.

Author: gluck

internal/cli/confirm.go

@@ -2,50 +2,35 @@ package cli
 
 import "strings"
 
-// A DESTRUCTIVE VERB ASKS FIRST. `x` on a row and `:kill` put a question on
-// the screen and hold the keyboard until it is answered; `X` on a row does
+// A DESTRUCTIVE VERB ASKS FIRST. `x` on a row and `:kill` put a question to
+// the reader and hold the keyboard until it is answered; `X` on a row does
 // the same work with no question at all.
 //
-// The question is a pit (so the bar names it and every key that is not an
-// answer is swallowed) plus a pinned notice, which is the one alert that does
-// not retire on its own: it stands for exactly as long as the question does.
+// THE QUESTION COSTS NO HEIGHT. It is not a dialog: the sentence rides the
+// bar's alert slot as a pinned notice (the one alert that does not retire on
+// its own), the answers ride the bar's command slot as the pit token, and
+// whatever was on screen stays there. A modal that shoved the conversation
+// down to say six words was two copies of one question.
 
-// confirmAsk is the pending question: the sentence, what a yes runs, and the
-// pit the question was asked from, which comes back either way. A reader who
-// says no must find their list exactly where they left it.
+// confirmAsk is the pending question: the sentence, and what a yes runs.
 type confirmAsk struct {
 	prompt string
 	yes    func()
-	behind pit
 }
 
 // askConfirm puts the question up. The caller's action runs on the input
 // goroutine, so it must hand off anything that dials, exactly as every other
 // hook here does.
 func (t *transcript) askConfirm(prompt string, yes func()) {
-	// THE PIT UNDERNEATH IS NOT CLOSED, it is set aside: showList would close
-	// a hosted view and drop a list's cursor, and the question is a moment,
-	// not a new place to be.
-	behind := t.pit
-	t.confirm = &confirmAsk{prompt: prompt, yes: yes, behind: behind}
-	t.pit = pit{}
-	t.pit.showList(pitConfirm, "", []pitRow{staticRow("  " + prompt + "  [y/N]")})
+	t.confirm = &confirmAsk{prompt: prompt, yes: yes}
 	t.status.pinNotice(prompt)
-	t.focused = focusPit
 	t.render()
 }
 
 // clearConfirm takes the question down and the notice with it, in that order:
 // the bar must not be left holding a sentence about a question nobody can see.
 func (t *transcript) clearConfirm() {
-	ask := t.confirm
 	t.confirm = nil
-	if t.showing(pitConfirm) {
-		t.pit = pit{}
-		if ask != nil {
-			t.pit = ask.behind
-		}
-	}
 	t.status.setNotice("")
 }
 
@@ -64,13 +49,5 @@ func confirmNo(t *transcript) {
 	t.render()
 }
 
-// confirmLines is the question as the drawer draws it.
-func (t *transcript) confirmLines() []string {
-	if t.confirm == nil {
-		return nil
-	}
-	return []string{pitGray(clipToWidth(t.confirm.prompt+"  [y/N]", t.w))}
-}
-
 // killPrompt is the sentence the two kill doors ask.
 func killPrompt(id string) string { return "kill " + strings.TrimSpace(id) + "?" }

internal/cli/confirm_test.go

@@ -33,8 +33,8 @@ func TestConfirm_XAsksAndCapitalXDoesNot(t *testing.T) {
 		if tr.mode() != modeConfirm {
 			t.Fatalf("mode = %v, want the question to own the keyboard", tr.mode())
 		}
-		if got := strings.Join(tr.confirmLines(), ""); !strings.Contains(stripANSI(got), "kill aria1234?") {
-			t.Fatalf("question = %q", got)
+		if got := tr.status.noticeText(); !strings.Contains(got, "kill aria1234?") {
+			t.Fatalf("the bar does not carry the question: %q", got)
 		}
 		// A key that is not an answer changes nothing.
 		tr.key('j')
@@ -70,8 +70,8 @@ func TestConfirm_TheNoticeStandsWhileTheQuestionDoes(t *testing.T) {
 	}
 }
 
-// The question is a moment, not a place: the list it was asked from is still
-// there afterwards, with its cursor where the reader left it.
+// THE QUESTION COSTS NO HEIGHT and takes nothing away: the list it was asked
+// from is untouched, cursor and all, and the bar carries both halves of it.
 func TestConfirm_TheListSurvivesTheQuestion(t *testing.T) {
 	tr, _ := visualFixture(t)
 	tr.dropRow = func(pit, id, next string) {}
@@ -81,7 +81,14 @@ func TestConfirm_TheListSurvivesTheQuestion(t *testing.T) {
 	})
 	tr.focused = focusPit
 	tr.pit.moveSelection(1) // stand on the second row
+	before := len(tr.pit.lines(tr.w, 12))
 	tr.key('x')
+	if got := len(tr.pit.lines(tr.w, 12)); got != before {
+		t.Fatalf("the question took %d rows from the screen", got-before)
+	}
+	if tok := pitConfirm.token(false); tok != "[y/N]" {
+		t.Fatalf("the bar's command slot says %q, want the answers", tok)
+	}
 	tr.key('n')
 	if tr.pit.id != pitOutput {
 		t.Fatalf("the listing did not come back: pit = %q", tr.pit.id)

internal/cli/keymap_equiv_test.go

@@ -1021,13 +1021,7 @@ var pagerOracle = []struct {
 	// have: it has no pre-refactor twin.
 	// The y/n question. Every key that is not an answer is swallowed, which
 	// is the whole point: consent is typed, never stumbled into.
-	{"confirm", "off:same fol=true srch=false q=\"\" mq=\"\" h=false s=false Q=false g=false sel=false exp=0 jmp=false jq=\"\" vis=none", map[string]string{
-		"0x1b": "off:bottom fol=true srch=false q=\"\" mq=\"\" h=false s=false Q=false g=false sel=false exp=0 jmp=false jq=\"\" vis=none",
-		"0x4e": "off:bottom fol=true srch=false q=\"\" mq=\"\" h=false s=false Q=false g=false sel=false exp=0 jmp=false jq=\"\" vis=none",
-		"0x59": "off:bottom fol=true srch=false q=\"\" mq=\"\" h=false s=false Q=false g=false sel=false exp=0 jmp=false jq=\"\" vis=none",
-		"0x6e": "off:bottom fol=true srch=false q=\"\" mq=\"\" h=false s=false Q=false g=false sel=false exp=0 jmp=false jq=\"\" vis=none",
-		"0x79": "off:bottom fol=true srch=false q=\"\" mq=\"\" h=false s=false Q=false g=false sel=false exp=0 jmp=false jq=\"\" vis=none",
-	}},
+	{"confirm", "off:same fol=true srch=false q=\"\" mq=\"\" h=false s=false Q=false g=false sel=false exp=0 jmp=false jq=\"\" vis=none", map[string]string{}},
 	{"fork", "off:same fol=true srch=false q=\"\" mq=\"\" h=false s=false Q=false g=false sel=false exp=0 jmp=false jq=\"\" vis=none", map[string]string{
 		"0x4c": "off:bottom fol=true srch=false q=\"\" mq=\"\" h=false s=false Q=false g=false sel=false exp=0 jmp=false jq=\"\" vis=none",
 		"0x5e": "off:bottom fol=true srch=false q=\"\" mq=\"\" h=false s=false Q=false g=false sel=false exp=0 jmp=false jq=\"\" vis=none",

internal/cli/pitid.go

@@ -26,7 +26,8 @@ const (
 	// Live form views arrive named "form listen", "form show" and so on: the
 	// family is matched by prefix, see face().
 	pitForm pitID = "form"
-	// A question, not a view: it holds the keyboard until it is answered.
+	// A question, not a view: it holds the keyboard until it is answered and
+	// draws nothing but its own token on the bar.
 	pitConfirm pitID = "confirm"
 )
 
@@ -59,8 +60,10 @@ var pitFaces = map[pitID]pitFace{
 	// folded onto. Wide (East Asian W, two cells) rather than ambiguous, so
 	// runewidth reports 2 everywhere and the bar's arithmetic holds. Its
 	// selected row is ⌖, the pin in the body rather than a note in a score.
-	pitForm:    {"웃", "form", "⌖", modePanel},
-	pitConfirm: {"‽", "confirm", "", modeConfirm},
+	pitForm: {"웃", "form", "⌖", modePanel},
+	// The answers ARE the token: a question that costs no height still has to
+	// say what will answer it.
+	pitConfirm: {"[y/N]", "confirm", "", modeConfirm},
 }
 
 // face is the pit's presentation, or the empty face for one nobody has named:

internal/cli/transcript.go

@@ -2882,8 +2882,6 @@ func keepRefsBelow(src map[nodeRef]bool, base int) map[nodeRef]bool {
 func (t *transcript) inputDrawerLines() []string {
 	var rows []string
 	switch {
-	case t.confirm != nil:
-		return t.confirmLines()
 	case t.inSearch:
 		// THE SIGIL IS THE DIRECTION. A box that always says '/' cannot tell
 		// a reader which way the next Enter walks.

skills/figaro/reference/ui-stream.md

@@ -468,7 +468,7 @@ run `figaro show` (full content above, cursor below).
 | `^` | attend this aria's parent, or say it is top-level |
 | `l` / `L` | list this aria's tree / the home tree in the pit, uncapped |
 | `x` / `X` | in a list, kill the aria the selected row names, asking first / at once; in the queue, drop the message |
-| `y` / `n` | answer that question (Esc is no). Nothing else is read while it is up |
+| `y` / `n` | answer that question (Esc is no). Nothing else is read while it is up; the sentence rides the bar's alert and `[y/N]` its command slot, so the question costs no height |
 | `h` | the help panel |
 | `v` / `V` | visual mode: a cursor, then a highlight by character / by line |
 | `y` / `Y` | copy the selection / copy its coordinate `<lt.block:a-b>!` |
@@ -477,9 +477,10 @@ run `figaro show` (full content above, cursor below).
 | `q` / `Esc` / `Ctrl-T` | exit the pager |
 
 A listing opens with the cursor on the aria you are attending, not on the top
-row. `x` and `:kill` ask before they kill, and the question holds the keyboard
-and the status bar until it is answered; `X` on a row does the same work with
-no question. Killing the aria on screen moves the pager to the row the cursor
+row. `x` and `:kill` ask before they kill. The question holds the keyboard and the
+bar, and nothing else: the sentence is the bar's alert, `[y/N]` is its command
+token, and the view underneath is untouched. `X` on a row does the same work
+with no question. Killing the aria on screen moves the pager to the row the cursor
 falls onto, else the jumplist's previous aria, else the parent, and ends the
 session only when there is none of the three.