pi-soly 2.1.2 → 2.1.4

package/ask/picker.ts

@@ -141,6 +141,11 @@ export class AskProComponent extends Container {
 	private selectedIndex = 0;
 	/** answers[questionIdx] = AskAnswer (single) or AskMultiAnswer (multi). */
 	private answers = new Map<number, AskAnswer | AskMultiAnswer>();
+	/** "questions" = tabbed flow; "summary" = read-only recap before submit.
+	 *  After the last question is answered, the picker transitions to "summary"
+	 *  so the user can review all answers before committing. Enter submits,
+	 *  Esc cancels. */
+	private viewMode: "questions" | "summary" = "questions";
 	/** notes[questionIdx] = free-text note added by user (via `n` key). */
 	private notes = new Map<number, string>();
 	/** Set true once `done` is called — further input is ignored. */
@@ -251,8 +256,21 @@ export class AskProComponent extends Container {
 
 	private repaint(): void {
 		this.tabsText.setText(this.renderTabs());
-		this.renderQuestionBody();
-		this.footerText.setText(this.renderFooter());
+		if (this.viewMode === "summary") {
+			this.renderSummaryBody();
+			this.footerText.setText(this.renderSummaryFooter());
+		} else {
+			this.renderQuestionBody();
+			this.footerText.setText(this.renderFooter());
+		}
+	}
+
+	/** Switch to the read-only recap view. Triggered when the user completes
+	 *  the last question and all answers are present. The actual submit() only
+	 *  fires when Enter is pressed in summary mode. */
+	private showSummary(): void {
+		this.viewMode = "summary";
+		this.repaint();
 	}
 
 	private renderTabs(): string {
@@ -602,6 +620,85 @@ export class AskProComponent extends Container {
 		return parts.join("   ");
 	}
 
+	// -------------------------------------------------------------------------
+	// Summary view rendering — read-only recap shown after the last question.
+	// One line per question: "<header>: <answer>". Skipped questions show a
+	// strike-through-like marker. Notes are shown indented below.
+	// -------------------------------------------------------------------------
+
+	/** Render the recap body into bodyContainer. Replaces renderQuestionBody
+	 *  while in summary mode. */
+	private renderSummaryBody(): void {
+		this.bodyContainer.clear();
+		this.bodyContainer.addChild(
+			new Text(
+				this.theme.bold("Review your answers") +
+					this.theme.fg("dim", " — press Enter to submit, Esc to cancel"),
+				1,
+				0,
+			),
+		);
+		this.bodyContainer.addChild(new Spacer(1));
+		for (let i = 0; i < this.questions.length; i++) {
+			const q = this.questions[i]!;
+			const answerText = this.formatAnswerForSummary(i);
+			const header = this.theme.bold(q.header);
+			const marker = this.theme.fg("accent", `Q${i + 1}:`);
+			this.bodyContainer.addChild(
+				new Text(`  ${marker} ${header}  →  ${answerText}`, 1, 0),
+			);
+			const note = this.notes.get(i);
+			if (note) {
+				this.bodyContainer.addChild(
+					new Text(this.theme.fg("dim", `      note: ${note}`), 1, 0),
+				);
+			}
+		}
+	}
+
+	/** Format a single question's answer for the recap line. Skipped
+	 *  questions show a strikethrough-style marker; free-text shows the
+	 *  typed string (or "—" if blank); option picks show the label. */
+	private formatAnswerForSummary(qIdx: number): string {
+		if (this.skipped.has(qIdx)) {
+			return this.theme.fg("dim", "— skipped —");
+		}
+		const q = this.questions[qIdx]!;
+		if (q.freeText) {
+			const v = this.answers.get(qIdx);
+			const text = typeof v === "string" && v.length > 0 ? v : "—";
+			return this.theme.fg("text", text);
+		}
+		const ans = this.answers.get(qIdx);
+		if (ans === undefined) {
+			return this.theme.fg("dim", "— no answer —");
+		}
+		if (q.multiSelect) {
+			const arr = ans as AskMultiAnswer;
+			if (arr.length === 0) return this.theme.fg("dim", "— none —");
+			const labels = arr.map((a) => this.formatOptionLabel(q, a));
+			return this.theme.fg("text", labels.join(", "));
+		}
+		return this.theme.fg("text", this.formatOptionLabel(q, ans as AskAnswer));
+	}
+
+	/** Resolve a single answer value (index or custom string) to a label. */
+	private formatOptionLabel(q: AskQuestion, ans: AskAnswer): string {
+		if (typeof ans === "string") {
+			return `Other: ${ans}`;
+		}
+		const opt = q.options[ans];
+		return opt ? opt.label : `option ${ans}`;
+	}
+
+	/** Footer for the summary view. */
+	private renderSummaryFooter(): string {
+		return [
+			this.theme.fg("accent", "⏎ submit"),
+			this.theme.fg("dim", "esc cancel"),
+		].join("   ");
+	}
+
 	private isAnswered(qIdx: number): boolean {
 		// Explicitly skipped questions never block submission.
 		if (this.skipped.has(qIdx)) return true;
@@ -633,6 +730,27 @@ export class AskProComponent extends Container {
 	handleInput(keyData: string): void {
 		if (this.completed) return;
 
+		// --- Summary view (read-only recap before submit) ------------------
+		// After the last question is answered, the picker shows a recap of
+		// all answers. Enter commits, Esc cancels. All other keys are
+		// ignored (no per-question editing in summary mode).
+		if (this.viewMode === "summary") {
+			if (keyData === KEY_ESC) {
+				this.completed = true;
+				this.done({ cancelled: true });
+				return;
+			}
+			if (
+				this.keybindings.matches(keyData, "tui.select.confirm") ||
+				keyData === KEY_ENTER ||
+				keyData === KEY_ENTER_CR
+			) {
+				this.submit();
+				return;
+			}
+			return;
+		}
+
 		// --- Inline text-input mode (note / Other…) --------------------------
 		// When active, all keys route to the embedded Input except the
 		// confirm/cancel gestures, which we intercept to commit or abort.
@@ -775,13 +893,14 @@ export class AskProComponent extends Container {
 
 			if (isMulti) {
 				// On the LAST question, if all questions are answered, Enter
-				// submits. Otherwise it advances (if not last) or stays put
+				// transitions to the summary view (where another Enter actually
+				// submits). Otherwise it advances (if not last) or stays put
 				// (on last + not all answered — user must finish first).
 				if (
 					this.currentIndex === this.questions.length - 1 &&
 					this.allAnswered()
 				) {
-					this.submit();
+					this.showSummary();
 					return;
 				}
 				if (this.currentIndex < this.questions.length - 1) {
@@ -790,14 +909,15 @@ export class AskProComponent extends Container {
 				}
 				this.repaint();
 			} else {
-				// Single-select: set current as answer, then advance or submit
+				// Single-select: set current as answer, then advance or transition
+				// to summary. The final submit happens after Enter in summary mode.
 				this.answers.set(this.currentIndex, this.selectedIndex);
 				if (this.currentIndex < this.questions.length - 1) {
 					this.currentIndex++;
 					this.selectedIndex = this.defaultIndexFor(this.currentIndex);
 					this.repaint();
 				} else if (this.allAnswered()) {
-					this.submit();
+					this.showSummary();
 				} else {
 					this.repaint();
 				}
@@ -846,8 +966,8 @@ export class AskProComponent extends Container {
 				this.selectedIndex = this.defaultIndexFor(this.currentIndex);
 				this.repaint();
 			} else if (this.allAnswered()) {
-				// Last question + all answered → submit
-				this.submit();
+				// Last question + all answered → summary view (Enter there submits)
+				this.showSummary();
 			} else {
 				this.repaint();
 			}
@@ -876,7 +996,7 @@ export class AskProComponent extends Container {
 			this.selectedIndex = this.defaultIndexFor(this.currentIndex);
 			this.repaint();
 		} else if (this.allAnswered()) {
-			this.submit();
+			this.showSummary();
 		} else {
 			this.repaint();
 		}

package/ask/tests/picker.test.ts

@@ -107,10 +107,13 @@ describe("AskProComponent — single-select (number keys)", () => {
 		expect(picker.getCurrentIndex()).toBe(1);
 	});
 
-	test("on last question, '1' picks AND submits", () => {
+	test("on last question, '1' picks AND transitions to summary view (Enter there submits)", () => {
 		const { picker, getDone } = setup();
 		picker.handleInput("1"); // Q1 → JWT cookie (recommended), advance
-		picker.handleInput("2"); // Q2 → Bearer header, submit (last)
+		picker.handleInput("2"); // Q2 → Bearer header, transitions to summary
+		// Now in summary view — Enter actually submits.
+		expect(getDone()).toBeNull();
+		picker.handleInput("\n"); // confirm summary
 		expect(getDone()).toEqual({ answers: { 0: 0, 1: 1 } });
 	});
 });
@@ -146,14 +149,16 @@ describe("AskProComponent — single-select (arrows + enter)", () => {
 		expect(picker.getSelectedIndex()).toBe(2);
 	});
 
-	test("Enter confirms current selection, advances or submits", () => {
+	test("Enter confirms current selection, advances or transitions to summary", () => {
 		const { picker, getDone } = setup();
 		picker.handleInput("j"); // selectedIndex = 1 (JWT localStorage)
 		picker.handleInput("\n"); // confirm
 		expect(picker.getAnswers().get(0)).toBe(1);
 		expect(picker.getCurrentIndex()).toBe(1); // advanced
 		expect(getDone()).toBeNull();
-		picker.handleInput("\n"); // confirm Q2 default (index 0)
+		picker.handleInput("\n"); // confirm Q2 default (index 0) → summary
+		expect(getDone()).toBeNull();
+		picker.handleInput("\n"); // confirm summary
 		expect(getDone()).toEqual({ answers: { 0: 1, 1: 0 } });
 	});
 });
@@ -275,17 +280,19 @@ describe("AskProComponent — multi-select", () => {
 		expect(picker.getAnswers().size).toBe(0); // nothing toggled
 	});
 
-	test("Submit only when all questions answered (multi on last)", () => {
+	test("Submit only when all questions answered (multi on last) — Enter there confirms summary", () => {
 		const { picker, getDone } = setup(multiQuestions);
 		picker.handleInput("1"); // Q1 multi: pick Auth
 		picker.handleInput("\t"); // → Q2
-		picker.handleInput("\n"); // Q2 single: confirm default (High)
+		picker.handleInput("\n"); // Q2 single: confirm default (High) → summary
+		expect(getDone()).toBeNull();
+		picker.handleInput("\n"); // confirm summary
 		expect(getDone()).toEqual({ answers: { 0: [0], 1: 0 } });
 	});
 
-	test("Enter on LAST multi question + all answered → submit (universal confirm)", () => {
+	test("Enter on LAST multi question + all answered → summary view (Enter there confirms)", () => {
 		// Multi-select LAST question: Enter is the universal confirm gesture.
-		// If all questions are answered, Enter submits.
+		// It transitions to the summary view; another Enter actually submits.
 		const TWO_MULTI: AskQuestion[] = [
 			{ header: "Tasks", question: "?", options: [{ label: "A" }, { label: "B" }], multiSelect: true },
 			{ header: "Priority", question: "?", options: [{ label: "H" }, { label: "L" }], multiSelect: true },
@@ -294,7 +301,10 @@ describe("AskProComponent — multi-select", () => {
 		picker.handleInput(" "); // Q1 multi: Space → toggle A
 		picker.handleInput("\t"); // → Q2
 		picker.handleInput(" "); // Q2 multi: Space → toggle H
-		// Now all answered, on last question, Enter should submit
+		// Now all answered, on last question, Enter transitions to summary.
+		picker.handleInput("\n");
+		expect(getDone()).toBeNull();
+		// Enter in summary view actually submits.
 		picker.handleInput("\n");
 		expect(getDone()).toEqual({ answers: { 0: [0], 1: [0] } });
 	});
@@ -662,8 +672,11 @@ describe("AskProComponent — notes (n key)", () => {
 		picker.handleInput("n");
 		for (const ch of "rotate keys monthly") picker.handleInput(ch);
 		picker.handleInput("\n"); // commit
-		// Submit Q2 (last question, all answered)
+		// Pick Q2 (last question, all answered) → summary view
 		picker.handleInput("1");
+		expect(doneResult).toBeNull();
+		// Enter in summary view actually submits.
+		picker.handleInput("\n");
 		expect(doneResult).not.toBeNull();
 		const result = doneResult as AskProResult | null;
 		expect(result?.notes).toBeDefined();
@@ -697,9 +710,12 @@ describe("AskProComponent — notes (n key)", () => {
 		picker.handleInput("n");
 		picker.handleInput("\x15"); // ^U — delete to line start
 		picker.handleInput("\n"); // commit empty → note cleared
-		// Pick Q1 → Q2 → submit; result must NOT carry notes
+		// Pick Q1 → Q2 → summary; Enter there actually submits. Result must
+		// NOT carry notes.
 		picker.handleInput("1");
 		picker.handleInput("1");
+		expect(doneResult).toBeNull();
+		picker.handleInput("\n");
 		expect(doneResult as AskProResult | null).toEqual({ answers: { 0: 0, 1: 0 } });
 	});
 
@@ -710,6 +726,97 @@ describe("AskProComponent — notes (n key)", () => {
 	});
 });
 
+// ---------------------------------------------------------------------------
+// Summary view: read-only recap shown after the last question is answered.
+// Enter there commits the answers; Esc cancels. Other keys are ignored.
+// ---------------------------------------------------------------------------
+
+describe("AskProComponent — summary view (post-last-question recap)", () => {
+	test("single-select last question transitions to summary (Enter submits)", () => {
+		const { picker, getDone } = setup();
+		picker.handleInput("1"); // Q1 → advance
+		picker.handleInput("2"); // Q2 → summary view
+		expect(getDone()).toBeNull();
+		picker.handleInput("\n"); // confirm summary
+		expect(getDone()).toEqual({ answers: { 0: 0, 1: 1 } });
+	});
+
+	test("Esc in summary view cancels the whole picker", () => {
+		const { picker, getDone } = setup();
+		picker.handleInput("1");
+		picker.handleInput("2"); // → summary
+		picker.handleInput("\x1b"); // Esc
+		expect(getDone()).toEqual({ cancelled: true });
+	});
+
+	test("multi-select last question transitions to summary", () => {
+		const TWO_MULTI: AskQuestion[] = [
+			{ header: "Tasks", question: "?", options: [{ label: "A" }, { label: "B" }], multiSelect: true },
+			{ header: "Priority", question: "?", options: [{ label: "H" }, { label: "L" }], multiSelect: true },
+		];
+		const { picker, getDone } = setup(TWO_MULTI);
+		picker.handleInput(" "); // Q1: toggle A
+		picker.handleInput("\t"); // → Q2
+		picker.handleInput(" "); // Q2: toggle H
+		picker.handleInput("\n"); // Enter on last multi → summary
+		expect(getDone()).toBeNull();
+		picker.handleInput("\n"); // confirm
+		expect(getDone()).toEqual({ answers: { 0: [0], 1: [0] } });
+	});
+
+	test("summary view ignores non-Enter/non-Esc keys", () => {
+		const { picker, getDone } = setup();
+		picker.handleInput("1");
+		picker.handleInput("2"); // → summary
+		// Junk keys: should NOT submit or cancel.
+		picker.handleInput("a");
+		picker.handleInput("\t");
+		picker.handleInput(" ");
+		expect(getDone()).toBeNull();
+		// Enter still works.
+		picker.handleInput("\n");
+		expect(getDone()).toEqual({ answers: { 0: 0, 1: 1 } });
+	});
+
+	test("summary view shows all answers in render()", () => {
+		const { picker } = setup();
+		picker.handleInput("1"); // Q1: JWT cookie (label index 0)
+		picker.handleInput("2"); // Q2: Bearer header (label index 1) → summary
+		const out = picker.render(80).join("\n");
+		// Recap shows both questions with their labels.
+		expect(out).toContain("JWT cookie");
+		expect(out).toContain("Bearer header");
+		// Header hint for the recap itself.
+		expect(out).toContain("Review your answers");
+	});
+
+	test("skipped questions render as '— skipped —' in summary", () => {
+		const { picker } = setup();
+		picker.handleInput("1"); // Q1 → advance
+		picker.handleInput("s"); // Q2: skip → advance (but already last; → summary)
+		// Q1 answered, Q2 skipped → allAnswered() returns true (skipped counts as answered).
+		const { getDone } = setup(); // re-setup for clarity
+		void getDone; // silence unused
+		// The above setup didn't help; let me assert against the original flow:
+		expect(picker.render(80).join("\n")).toContain("skipped");
+	});
+
+	test("free-text typed answer renders verbatim in summary", () => {
+		const FT: AskQuestion[] = [
+			{ header: "Title", question: "?", options: [{ label: "A" }] },
+			{ header: "Note", question: "?", options: [], freeText: true },
+		];
+		const { picker, getDone } = setup(FT);
+		picker.handleInput("1"); // Q1 → advance
+		picker.handleInput("hello world"); // free-text typing
+		picker.handleInput("\n"); // commit
+		// Q1 answered, Q2 answered → summary
+		expect(getDone()).toBeNull();
+		const out = picker.render(80).join("\n");
+		expect(out).toContain("hello world");
+	});
+});
+
 // ---------------------------------------------------------------------------
 // Regression: render() must NEVER emit a line wider than `width`.
 // Previously the side-by-side preview layout measured width with a regex

package/core.ts

@@ -16,6 +16,7 @@
 import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
+import { fileURLToPath } from "node:url";
 
 // Shared leaf utilities now live in util.ts; re-exported here so existing
 // `import { ... } from "./core.ts"` call sites keep working unchanged.
@@ -58,7 +59,8 @@ export type RuleSource =
   | "phase-soly"
   | "project-agents"
   | "global-agents"
-  | "phase-agents";
+  | "phase-agents"
+  | "built-in";
 
 export interface RuleFrontmatter {
   description?: string;
@@ -259,6 +261,40 @@ function loadRulesFromSource(spec: SourceSpec): RuleFile[] {
   return rules;
 }
 
+/**
+ * Resolve the path to the extension's `built-in-rules/` directory. Lives
+ * at `<package>/built-in-rules/` relative to the compiled module. We use
+ * `fileURLToPath(import.meta.url)` so this works whether the package is
+ * loaded directly from source (Bun, tsx) or from compiled output.
+ *
+ * `here` is the directory containing this core.ts file (i.e. the package
+ * root for source, the package root for compiled output too — both files
+ * live alongside package.json), so we don't need to traverse up.
+ */
+export function builtInRulesDir(): string {
+	const here = path.dirname(fileURLToPath(import.meta.url));
+	return path.resolve(here, "built-in-rules");
+}
+
+/**
+ * Load every markdown rule from the extension's `built-in-rules/` directory.
+ * These rules ship with the soly extension and are always present in the
+ * system prompt. Source spec uses priority=10 (highest), so a user rule at
+ * the same relPath is silently dropped into `overridden[]` — built-in
+ * rules win by design. `sourceLabel: "soly"` makes them visible in
+ * `/rules list` so users know which rules come from the package itself.
+ */
+export function loadBuiltInRules(): RuleFile[] {
+	const dir = builtInRulesDir();
+	if (!fs.existsSync(dir)) return [];
+	return loadRulesFromSource({
+		dir,
+		source: "built-in",
+		sourceLabel: "soly",
+		priority: 10,
+	});
+}
+
 export function loadAllRules(sources: SourceSpec[]): {
   rules: RuleFile[];
   overridden: string[];

package/index.ts

@@ -34,6 +34,8 @@ import {
 	extractFilePathsFromPrompt,
 	formatTok,
 	loadAllRules,
+	builtInRulesDir,
+	loadBuiltInRules,
 	loadPhaseRules,
 	loadProjectState,
 	matchesGlob,
@@ -441,10 +443,14 @@ export default function solyExtension(pi: ExtensionAPI) {
 		// Project rules always beat global rules. `.agents/rules.local/` is
 		// gitignored — for personal overrides on top of the project's rules.
 		// `.agents/rules/` is the vendor-neutral project-level convention.
+		// Built-in rules ship with the extension (priority=10 — highest) and
+		// can't be overridden: a user rule at the same relPath is dropped
+		// silently into the `overridden[]` list (see loadAllRules).
 		ruleSources = [
-			{ dir: path.join(ctx.cwd, ".agents", "rules.local"), source: "project-agents", sourceLabel: "local", priority: 5 },
-			{ dir: path.join(ctx.cwd, ".agents", "rules"), source: "project-agents", sourceLabel: "agents", priority: 3 },
+			{ dir: builtInRulesDir(), source: "built-in", sourceLabel: "soly", priority: 10 },
 			{ dir: path.join(os.homedir(), ".agents", "rules"), source: "global-agents", sourceLabel: "agents", priority: 1 },
+			{ dir: path.join(ctx.cwd, ".agents", "rules"), source: "project-agents", sourceLabel: "agents", priority: 3 },
+			{ dir: path.join(ctx.cwd, ".agents", "rules.local"), source: "project-agents", sourceLabel: "local", priority: 5 },
 		];
 		refreshRules();
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-soly",
-  "version": "2.1.2",
+  "version": "2.1.4",
   "description": "Project management + workflow framework for pi-coding-agent. Plans, state, MANDATORY rules, self-review, multi-question picker, native footer + welcome chrome — one npm install, zero config. The LLM drives the workflow inline via the soly_workflow tool — no external subagent plugin.",
   "type": "module",
   "main": "index.ts",