pi-goal-x 0.26.0 → 0.26.1

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;
+	}
+	// 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 };
+	return { tasksStart, tasksEnd, tailStart: effectiveTail };
 }
 
 /**
@@ -127,12 +159,13 @@ export function fitDialogLines(
 }
 
 /**
- * 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 +183,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];
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-goal-x",
-  "version": "0.26.0",
+  "version": "0.26.1",
   "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",