pi-goal-x 0.26.0 → 0.26.2

package/README.md

@@ -129,6 +129,8 @@ Start a guided regular goal:
 
 The agent can ask questions and propose a complete objective and task plan. Confirm the proposal to create the goal and begin work.
 
+The questionnaire dialog never truncates the question; when it is taller than the terminal it stays within the height and scrolls — `PgUp`/`PgDn` page and `Ctrl+↑/↓` line-scroll without moving the selection, `↑/↓` selection auto-follows into view, and a `▲`/`… +N more` edge indicator shows what is clipped.
+
 Start a guided Sisyphus goal:
 
 ```text

package/extensions/goal-drafting.ts

@@ -211,7 +211,10 @@ export function proposalText(draft: ActiveGoalDraft, objective: string, autoCont
 	} else if (taskList && taskList.tasks.length > 0) {
 		tasksText = "\n\nTasks proposed for confirmation:\n" + renderConfirmationTasks(taskList.tasks, 0).join("\n");
 	} else {
-		const derived = deriveTasksFromObjective(objective);
+		// §single-task-set: the derived preview must derive from the SAME
+		// objective text the apply path persists (extracted — the Verification
+		// contract line removed), so shown == persisted.
+		const derived = deriveTasksFromObjective(extractVerificationContract(objective).objective);
 		if (derived && derived.length > 0) {
 			tasksText = "\n\nTasks derived from the objective (confirm or ask the agent to adjust):\n" + renderConfirmationTasks(derived, 0).join("\n");
 		}
@@ -465,12 +468,26 @@ export function registerDraftingTools(core: GoalCore): void {
 			const objective = String(args?.objective ?? "");
 			let text = theme.fg("toolTitle", "propose_goal_draft ") + theme.fg("muted", objective);
 			const flatTasks = Array.isArray(args?.tasks) ? (args.tasks as FlatTaskInput[]) : [];
-			const derived = flatTasks.length === 0 ? (deriveTasksFromObjective(objective) ?? []) : [];
-			const taskBlock = flatTasks.length > 0
-				? { header: "Tasks proposed for confirmation:", lines: flatTasks.map((t) => `[ ] ${t.id}: ${t.title}`) }
-				: derived.length > 0
-					? { header: "Tasks derived from the objective (confirm or ask the agent to adjust):", lines: renderConfirmationTasks(derived, 0) }
-					: null;
+			// §single-task-set: a proposal shows exactly ONE task set — the set
+			// that will actually be persisted. Explicit tasks are that set; a
+			// tweak without explicit tasks retains the current list (mirror
+			// proposalText — never a derived-from-objective phantom); a new
+			// draft without explicit tasks shows the F2-derived preview derived
+			// from the SAME objective text the apply path persists (extracted).
+			let taskBlock: { header: string; lines: string[] } | null = null;
+			if (flatTasks.length > 0) {
+				taskBlock = { header: "Tasks proposed for confirmation:", lines: flatTasks.map((t) => `[ ] ${t.id}: ${t.title}`) };
+			} else if (activeDraft(core)?.mode === "tweak") {
+				const retained = core.state.goal?.taskList?.tasks;
+				if (retained && retained.length > 0) {
+					taskBlock = { header: "Current task list (retained unchanged):", lines: renderConfirmationTasks(retained, 0) };
+				}
+			} else {
+				const derived = deriveTasksFromObjective(extractVerificationContract(objective).objective) ?? [];
+				if (derived.length > 0) {
+					taskBlock = { header: "Tasks derived from the objective (confirm or ask the agent to adjust):", lines: renderConfirmationTasks(derived, 0) };
+				}
+			}
 			if (taskBlock) {
 				text += "\n\n" + theme.fg("toolTitle", theme.bold(taskBlock.header)) + "\n" + theme.fg("toolOutput", taskBlock.lines.join("\n"));
 			}

package/extensions/goal-questionnaire.ts

@@ -54,10 +54,27 @@ export interface ProposalPresentationSegments {
 	tailStart: number;
 }
 
+/** Strip ANSI SGR sequences so structural scans see the plain text. */
+function stripAnsiCodes(value: string): string {
+	return value.replace(/\x1b\[[0-9;]*m/g, "");
+}
+
 /**
  * Locate the proposal tasks segment and the options tail in a rendered dialog.
  * Returns null when the dialog is not a proposal-style confirmation (no
  * "Tasks proposed for confirmation:" header / "┌─ TASKS ─" box).
+ *
+ * The scan is ANSI-aware: every rendered line carries `theme.fg(...)` escape
+ * sequences in the real TUI (the mock theme does not), so plain-text regexes
+ * must be run against the stripped line or the tasks section collapses to its
+ * header and every styled task line is sliced out of the bounded frame. The
+ * box-drawn bottom border (`└───┘`) after the last task line is kept so the
+ * `┌─ TASKS ─┐` box renders complete.
+ *
+ * The interactive auditor toggle line ("press 'a' to toggle") renders between
+ * the context and the options; `tailStart` is pulled back to it so the bounded
+ * fit always keeps the auditor status visible (its status text is the only
+ * visible toggle feedback in the dialog).
  */
 export function findProposalPresentationSegments(lines: string[], tailStart: number): ProposalPresentationSegments | null {
 	if (tailStart < 0) return null;
@@ -65,10 +82,25 @@ export function findProposalPresentationSegments(lines: string[], tailStart: num
 	if (tasksStart < 0 || tasksStart >= tailStart) return null;
 	let tasksEnd = tasksStart;
 	for (let i = tasksStart + 1; i < tailStart; i++) {
-		if (/^\s*\[[ x~]\]/.test(lines[i])) tasksEnd = i;
-		else break;
+		const plain = stripAnsiCodes(lines[i]);
+		if (/^\s*\[[ x~]\]/.test(plain)) {
+			tasksEnd = i;
+			continue;
+		}
+		// Box-drawn TASKS section bottom border after the last task line.
+		if (tasksEnd > tasksStart && /^[└┐┤┘─]/.test(plain.trim())) tasksEnd = i;
+		break;
 	}
-	return { tasksStart, tasksEnd, tailStart };
+	// Protect the auditor toggle line: it renders between context and options,
+	// so pull the tail start back to it when present.
+	let effectiveTail = tailStart;
+	for (let i = tailStart - 1; i > tasksEnd; i--) {
+		if (lines[i].includes("press 'a' to toggle")) {
+			effectiveTail = i;
+			break;
+		}
+	}
+	return { tasksStart, tasksEnd, tailStart: effectiveTail };
 }
 
 /**
@@ -76,63 +108,118 @@ export function findProposalPresentationSegments(lines: string[], tailStart: num
  * question. The protected head (top border + tabs + question line) is always
  * kept; the remaining budget is spent on the tail — options/footer/bottom
  * border — so long context blocks (proposal confirmations) are sliced from
- * their head exactly as the pre-fix tail-slice did (383ae52 surface). When the
- * options block starts immediately after the head (plain agent questions with
- * no context block), the TOP options are kept instead of the tail so the
- * recommended/first option stays visible; the footer hint and bottom border
- * are always the last rendered lines. Never returns more than maxDialogLines.
+ * their head exactly as the pre-fix tail-slice did (383ae52 surface). The
+ * footer hint and bottom border are always the last rendered lines. Never
+ * returns more than maxDialogLines.
  *
  * Proposal confirmations (proposal segments given) keep the head, the tasks
  * section (header + every task line), and the options/footer/bottom border in
  * frame; only the objective-box middle is sacrificed in-frame — the full
  * objective is always present in the scrollable transcript presentation
  * (propose_goal_draft renderCall), so nothing of the goal is ever omitted.
+ *
+ * §options-scroll: when a `scroll` state is given (select-mode question tabs
+ * and the submit summary), the dialog becomes a `less`-style viewport over the
+ * FULL content — nothing is truncated, nothing is sliced away — and the
+ * options are always reachable by scrolling (PageUp/PageDown, Ctrl+↑/↓, and
+ * ↑/↓ selection auto-follow). See fitDialogViewport.
  */
+export interface DialogScrollState {
+	/** Current viewport offset over the full content lines. */
+	scrollTop: number;
+	/** When true, the fitter nudges scrollTop so the selection range is visible. */
+	needsFollow: boolean;
+	/** Line ranges [start, end] of each selectable option in the full content. */
+	optionRanges: Array<[number, number]>;
+	/** Index of the current selection in optionRanges. */
+	followIndex: number;
+}
+
 export function fitDialogLines(
 	lines: string[],
 	maxDialogLines: number,
 	protectedHead: number,
-	optionsImmediatelyAfterHead = false,
 	proposal: ProposalPresentationSegments | null = null,
+	scroll: DialogScrollState | null = null,
+	dimStyle: (s: string) => string = (s) => s,
 ): string[] {
 	if (maxDialogLines <= 0 || lines.length <= maxDialogLines) return lines;
 	const keepHead = Math.min(protectedHead, maxDialogLines);
+	if (proposal) {
+		return fitProposalPresentation(lines, maxDialogLines, keepHead, proposal);
+	}
+	if (scroll) {
+		return fitDialogViewport(lines, maxDialogLines, scroll, dimStyle);
+	}
+	// Context-heavy / input / submit dialogs without a scroll state: keep the
+	// head and the tail (options/footer/bottom border) exactly as the pre-fix
+	// tail-slice did.
 	const budget = maxDialogLines - keepHead;
 	if (budget <= 0) return lines.slice(0, keepHead);
 	const rest = lines.slice(protectedHead);
 	if (rest.length <= budget) return [...lines.slice(0, keepHead), ...rest];
-	if (proposal) {
-		return fitProposalPresentation(lines, maxDialogLines, keepHead, proposal);
+	return [...lines.slice(0, keepHead), ...rest.slice(rest.length - budget)];
+}
+
+/**
+ * §options-scroll viewport fit: never truncate or drop content — window the
+ * full dialog lines with a scrollTop offset so every line (question, context,
+ * options, footer, border) stays reachable. The last viewport row is reserved
+ * as the bottom edge: the bottom border when the end is reached, otherwise a
+ * themed `… +N more · PgUp/PgDn scroll` indicator (mirrors the dashboard's
+ * `… +N more task` rows). A themed `▲ N more` indicator replaces the first
+ * content row when scrolled down. Selection auto-follow (needsFollow) nudges
+ * the window so the selected option's line range is inside it. Output length
+ * is exactly maxDialogLines when clipped, never more (churn-guard invariant).
+ */
+function fitDialogViewport(
+	lines: string[],
+	maxDialogLines: number,
+	scroll: DialogScrollState,
+	dimStyle: (s: string) => string,
+): string[] {
+	const contentWindow = Math.max(0, maxDialogLines - 1);
+	const contentEnd = Math.max(0, lines.length - 1);
+	// Selection auto-follow: nudge scrollTop so the selected option's range is
+	// inside the content window (minimal scroll; clamp below).
+	if (scroll.needsFollow && scroll.optionRanges[scroll.followIndex]) {
+		const [os, oe] = scroll.optionRanges[scroll.followIndex];
+		if (os < scroll.scrollTop || oe >= scroll.scrollTop + contentWindow) {
+			scroll.scrollTop = oe >= scroll.scrollTop + contentWindow
+				? Math.min(os, Math.max(0, oe - contentWindow + 1))
+				: os;
+		}
+		scroll.needsFollow = false;
 	}
-	if (optionsImmediatelyAfterHead) {
-		// Plain select-mode question: keep the footer hint + bottom border (as
-		// many as fit), then spend the remaining room on the TOP options so the
-		// recommended/first option stays visible; leading blank separators are
-		// dropped first when room is short. Never exceeds maxDialogLines.
-		const headLines = lines.slice(0, keepHead);
-		const firstContent = rest.findIndex((l) => l.trim().length > 0);
-		const lead = firstContent > 0 ? rest.slice(0, firstContent) : [];
-		const contentStart = firstContent > 0 ? firstContent : 0;
-		const tailBudget = Math.min(2, budget); // footer hint + bottom border
-		const tail = rest.slice(-tailBudget);
-		const room = budget - tailBudget;
-		const keepContent = Math.max(0, Math.min(rest.length - contentStart, room));
-		const keepLead = Math.max(0, Math.min(lead.length, room - keepContent));
-		const content = rest.slice(contentStart, contentStart + keepContent);
-		return [...headLines, ...lead.slice(0, keepLead), ...content, ...tail];
+	scroll.scrollTop = Math.max(0, Math.min(scroll.scrollTop, Math.max(0, contentEnd - contentWindow)));
+	const s = scroll.scrollTop;
+	const hiddenAbove = s;
+	const hiddenBelow = contentEnd - (s + contentWindow);
+	const viewport = lines.slice(s, s + contentWindow);
+	if (hiddenAbove > 0 && viewport.length > 0) {
+		viewport[0] = dimStyle(`▲ ${hiddenAbove} more`);
 	}
-	// Context-heavy / input / submit dialogs: keep the head and the tail
-	// (options, footer, bottom border) exactly as the pre-fix tail-slice did.
-	return [...lines.slice(0, keepHead), ...rest.slice(rest.length - budget)];
+	if (hiddenBelow > 0) {
+		// The reserved bottom edge row advertises the scroll affordance — it
+		// replaces the border while content is clipped below (mirrors the
+		// dashboard's `… +N more task` rows) and gives way to the border at the
+		// end. The footer hint sits directly above the border, so it is only
+		// visible when the end is reached (never while clipped — geometry).
+		viewport.push(dimStyle(`… +${hiddenBelow} more · PgUp/PgDn scroll`));
+	} else {
+		viewport.push(lines[lines.length - 1]);
+	}
+	return viewport;
 }
 
 /**
- * Proposal confirmation fit: keep the protected head, the tasks section, and
- * the options/footer/bottom border; the objective-box middle is sacrificed
- * in-frame (it stays fully readable in the scrollback presentation). Interior
- * blank spacing lines are dropped first when room is short; task lines are
- * only dropped after that, from the end, when the bound is exhausted (those
- * lines remain in the scrollback presentation). Never exceeds maxDialogLines.
+ * Proposal confirmation fit: keep the protected head, the tasks section, the
+ * interactive auditor toggle line (when present), and the options/footer/
+ * bottom border; the objective-box middle is sacrificed in-frame (it stays
+ * fully readable in the scrollback presentation). Interior blank spacing lines
+ * are dropped first when room is short; task lines are only dropped after
+ * that, from the end, when the bound is exhausted (those lines remain in the
+ * scrollback presentation). Never exceeds maxDialogLines.
  */
 function fitProposalPresentation(
 	lines: string[],
@@ -150,15 +237,18 @@ function fitProposalPresentation(
 	// the options and the footer hint) before touching any content line.
 	const stripped = candidate.filter((l, i) => i < keepHead || l.trim() !== "");
 	if (stripped.length <= maxDialogLines) return stripped;
-	// Bound still exhausted: keep the head, then spend the room on the tail
-	// first (options/footer/bottom border — the actionable decision surface —
-	// kept from its end so the border and footer never drop), then on the
-	// tasks from the start. The dropped task lines remain fully readable in
+	// Bound still exhausted: keep the head, then the auditor toggle line (the
+	// actionable status control — its feedback must stay visible), then spend
+	// the room on the tail (options/footer/bottom border — the decision
+	// surface — kept from its end so the border and footer never drop), then on
+	// the tasks from the start. The dropped task lines remain fully readable in
 	// the scrollback presentation. Never exceeds maxDialogLines.
 	const tailNoBlanks = tail.filter((l) => l.trim() !== "");
-	const keepTail = Math.min(tailNoBlanks.length, Math.max(0, maxDialogLines - keepHead));
-	const tailKept = tailNoBlanks.slice(tailNoBlanks.length - keepTail);
-	const keepTasks = Math.min(tasks.length, Math.max(0, maxDialogLines - keepHead - keepTail));
+	const hasAuditor = tail.length > 0 && tail[0].includes("press 'a' to toggle");
+	const restTail = hasAuditor ? tailNoBlanks.slice(1) : tailNoBlanks;
+	const keepRest = Math.min(restTail.length, Math.max(0, maxDialogLines - keepHead - (hasAuditor ? 1 : 0)));
+	const tailKept = [...(hasAuditor ? [tail[0]] : []), ...restTail.slice(restTail.length - keepRest)];
+	const keepTasks = Math.min(tasks.length, Math.max(0, maxDialogLines - keepHead - tailKept.length));
 	return [...head, ...tasks.slice(0, keepTasks), ...tailKept];
 }
 
@@ -255,6 +345,10 @@ export async function runGoalQuestionnaire(ctx: ExtensionContext, rawQuestions:
 		let inputQuestionId: string | null = null;
 		let cachedLines: string[] | undefined;
 		let optionsStartIndex = -1;
+		// §options-scroll viewport state (select-mode + submit tabs only).
+		let scrollTop = 0;
+		let needsFollow = false;
+		let optionRanges: Array<[number, number]> = [];
 		let auditorEnabled = auditorToggleInit?.defaultEnabled ?? true;
 		const answers = new Map<string, GoalQuestionnaireAnswer>();
 		const drafts = new Map<string, string>();
@@ -304,6 +398,9 @@ export async function runGoalQuestionnaire(ctx: ExtensionContext, rawQuestions:
 		function enterQuestion(q: GoalQuestionnaireQuestion) {
 			const existing = answers.get(q.id);
 			const draft = drafts.get(q.id);
+			// §options-scroll: start each question tab from the top.
+			scrollTop = 0;
+			needsFollow = false;
 			if (q.options.length === 0) {
 				inputMode = true;
 				inputQuestionId = q.id;
@@ -318,7 +415,14 @@ export async function runGoalQuestionnaire(ctx: ExtensionContext, rawQuestions:
 			}
 		}
 
-		function advanceAfterAnswer() {
+		function enterSubmitTab() {
+	// §options-scroll: the submit summary also opens from the top.
+	optionIndex = 0;
+	scrollTop = 0;
+	needsFollow = false;
+}
+
+function advanceAfterAnswer() {
 			if (!isMulti) {
 				submit(false);
 				return;
@@ -327,7 +431,7 @@ export async function runGoalQuestionnaire(ctx: ExtensionContext, rawQuestions:
 			else currentTab = questions.length;
 			const nextQ = currentQuestion();
 			if (nextQ) enterQuestion(nextQ);
-			else optionIndex = 0;
+			else enterSubmitTab();
 			refresh();
 		}
 
@@ -380,7 +484,7 @@ export async function runGoalQuestionnaire(ctx: ExtensionContext, rawQuestions:
 					currentTab = matchesKey(data, Key.tab) ? (currentTab + 1) % totalTabs : (currentTab - 1 + totalTabs) % totalTabs;
 					const nextQ = currentQuestion();
 					if (nextQ) enterQuestion(nextQ);
-					else optionIndex = 0;
+					else enterSubmitTab();
 					refresh();
 					return;
 				}
@@ -397,7 +501,7 @@ export async function runGoalQuestionnaire(ctx: ExtensionContext, rawQuestions:
 					currentTab = (currentTab + 1) % totalTabs;
 					const nextQ = currentQuestion();
 					if (nextQ) enterQuestion(nextQ);
-					else optionIndex = 0;
+					else enterSubmitTab();
 					refresh();
 					return;
 				}
@@ -405,12 +509,41 @@ export async function runGoalQuestionnaire(ctx: ExtensionContext, rawQuestions:
 					currentTab = (currentTab - 1 + totalTabs) % totalTabs;
 					const nextQ = currentQuestion();
 					if (nextQ) enterQuestion(nextQ);
-					else optionIndex = 0;
+					else enterSubmitTab();
 					refresh();
 					return;
 				}
 			}
 
+			// §options-scroll viewport keys (select-mode question tabs AND the
+			// submit summary): page and line scroll without moving the selection.
+			// Handled before the submit-tab early return so the summary scrolls
+			// too. ↑/↓ still select and auto-follow into view on the next render.
+			if (matchesKey(data, Key.pageUp)) {
+				scrollTop -= Math.max(1, (maxDialogLines ?? 10) - 1);
+				needsFollow = false;
+				refresh();
+				return;
+			}
+			if (matchesKey(data, Key.pageDown)) {
+				scrollTop += Math.max(1, (maxDialogLines ?? 10) - 1);
+				needsFollow = false;
+				refresh();
+				return;
+			}
+			if (matchesKey(data, Key.ctrl("up"))) {
+				scrollTop -= 1;
+				needsFollow = false;
+				refresh();
+				return;
+			}
+			if (matchesKey(data, Key.ctrl("down"))) {
+				scrollTop += 1;
+				needsFollow = false;
+				refresh();
+				return;
+			}
+
 			if (currentTab === questions.length) {
 				if (matchesKey(data, Key.enter) && allAnswered()) submit(false);
 				else if (matchesKey(data, Key.escape)) submit(true);
@@ -419,11 +552,13 @@ export async function runGoalQuestionnaire(ctx: ExtensionContext, rawQuestions:
 
 			if (matchesKey(data, Key.up)) {
 				optionIndex = Math.max(0, optionIndex - 1);
+				needsFollow = true; // §options-scroll: keep the selection visible
 				refresh();
 				return;
 			}
 			if (matchesKey(data, Key.down)) {
 				optionIndex = Math.min(opts.length - 1, optionIndex + 1);
+				needsFollow = true;
 				refresh();
 				return;
 			}
@@ -597,11 +732,13 @@ export async function runGoalQuestionnaire(ctx: ExtensionContext, rawQuestions:
 			function renderOptions() {
 				optionsStartIndex = lines.length;
 				for (let i = 0; i < opts.length; i++) {
+					const start = lines.length;
 					const opt = opts[i];
 					const selected = i === optionIndex;
 					const prefix = selected ? theme.fg("accent", "> ") : "  ";
 					const recTag = !opt.isCustom && q?.recommended === i ? theme.fg("success", " ★") : "";
 					addWrapped(prefix + theme.fg(selected ? "accent" : "text", `${i + 1}. ${opt.label}`) + recTag);
+					optionRanges[i] = [start, lines.length - 1];
 				}
 			}
 
@@ -669,11 +806,21 @@ export async function runGoalQuestionnaire(ctx: ExtensionContext, rawQuestions:
 			// objective-box middle is sacrificed there because the full objective
 			// is always in the scrollable transcript presentation (renderCall).
 			if (maxDialogLines !== undefined && lines.length > maxDialogLines) {
-				const optionsImmediatelyAfterHead = !inputMode && currentTab !== questions.length && !!q && !q.context && opts.length > 0;
 				const proposalSegments = !inputMode && currentTab !== questions.length && !!q && q.context
 					? findProposalPresentationSegments(lines, optionsStartIndex)
 					: null;
-				lines = fitDialogLines(lines, maxDialogLines, protectedCount, optionsImmediatelyAfterHead, proposalSegments);
+				// §options-scroll: select-mode question tabs and the submit summary
+				// are a viewport over the full content (never truncated); input
+				// mode keeps the legacy tail-keep so the editor stays the priority.
+				let scrollState: DialogScrollState | null = null;
+				if (!inputMode) {
+					scrollState = { scrollTop, needsFollow, optionRanges, followIndex: optionIndex };
+				}
+				lines = fitDialogLines(lines, maxDialogLines, protectedCount, proposalSegments, scrollState, (s) => theme.fg("dim", s));
+				if (scrollState) {
+					scrollTop = scrollState.scrollTop;
+					needsFollow = scrollState.needsFollow;
+				}
 			}
 			cachedLines = lines;
 			return lines;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-goal-x",
-  "version": "0.26.0",
+  "version": "0.26.2",
   "description": "Goal mode extension for pi: durable long-running objectives, five model tools, structured tasks, independent completion audit, Sisyphus mode, auto-continue, and a status overlay.",
   "license": "MIT",
   "author": "pi-goal-x contributors",