pi-ask-tool-extension 0.1.4 → 0.2.2

package/README.md

@@ -68,7 +68,17 @@ ask({
 Result example:
 
 ```txt
-User selected: Session
+User answers:
+auth: Session
+
+Answer context:
+Question 1 (auth)
+Prompt: Which auth approach?
+Options:
+  1. JWT
+  2. Session
+Response:
+  Selected: Session
 ```
 
 ### Single question (multi-select)
@@ -89,7 +99,18 @@ ask({
 Result example:
 
 ```txt
-User selected: Logging, Metrics
+User answers:
+features: [Logging, Metrics]
+
+Answer context:
+Question 1 (features)
+Prompt: Which features should be enabled?
+Options:
+  1. Logging
+  2. Metrics
+  3. Tracing
+Response:
+  Selected: [Logging, Metrics]
 ```
 
 ### Multi-question (tab flow)
@@ -117,6 +138,23 @@ Result example:
 User answers:
 auth: Session
 cache: Redis
+
+Answer context:
+Question 1 (auth)
+Prompt: Which auth approach?
+Options:
+  1. JWT
+  2. Session
+Response:
+  Selected: Session
+
+Question 2 (cache)
+Prompt: Which cache strategy?
+Options:
+  1. Redis
+  2. None
+Response:
+  Selected: Redis
 ```
 
 ## Interaction Model
@@ -168,10 +206,22 @@ For `Other`, a note is required to become valid.
 
 ```bash
 npm install
-npm test
-npm run typecheck
+npm run check
 ```
 
+`npm run check` runs:
+
+- TypeScript checks (`npm run typecheck`)
+- Test suite with coverage (`npm run test:coverage`)
+- Coverage gate (`npm run coverage:check`)
+
+Coverage gate defaults (override via env vars in CI if needed):
+
+- Overall: lines >= 38%, functions >= 80%
+- `src/index.ts`: lines >= 95%, functions >= 100%
+- `src/ask-logic.ts`: lines >= 95%, functions >= 100%
+- `src/ask-inline-note.ts`: lines >= 80%, functions >= 70%
+
 ## Project Structure
 
 - `src/index.ts` - extension entrypoint, tool registration, and orchestration

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-ask-tool-extension",
-  "version": "0.1.4",
+  "version": "0.2.2",
   "description": "Ask tool extension for pi with tabbed questioning and inline note editing",
   "repository": {
     "type": "git",
@@ -25,7 +25,10 @@
   ],
   "scripts": {
     "test": "bun test",
-    "typecheck": "tsc --noEmit"
+    "test:coverage": "bun test --coverage --coverage-reporter=lcov --coverage-reporter=text",
+    "coverage:check": "node ./scripts/check-coverage.mjs",
+    "typecheck": "tsc --noEmit",
+    "check": "npm run typecheck && npm run test:coverage && npm run coverage:check"
   },
   "peerDependencies": {
     "@mariozechner/pi-coding-agent": "*",

package/src/ask-inline-note.ts

@@ -1,6 +1,10 @@
+import { wrapTextWithAnsi } from "@mariozechner/pi-tui";
+
 const INLINE_NOTE_SEPARATOR = " — note: ";
 const INLINE_EDIT_CURSOR = "▍";
 
+export const INLINE_NOTE_WRAP_PADDING = 2;
+
 function sanitizeNoteForInlineDisplay(rawNote: string): string {
 	return rawNote.replace(/[\r\n\t]/g, " ").replace(/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]/g, "");
 }
@@ -31,14 +35,31 @@ export function buildOptionLabelWithInlineNote(
 	}
 
 	const labelPrefix = `${baseOptionLabel}${INLINE_NOTE_SEPARATOR}`;
-	const rawInlineNote = isEditingNote ? `${sanitizedNote}${INLINE_EDIT_CURSOR}` : sanitizedNote.trim();
-	const fullInlineLabel = `${labelPrefix}${rawInlineNote}`;
+	const inlineNote = isEditingNote ? `${sanitizedNote}${INLINE_EDIT_CURSOR}` : sanitizedNote.trim();
+	const inlineLabel = `${labelPrefix}${inlineNote}`;
 
 	if (maxInlineLabelLength == null) {
-		return fullInlineLabel;
+		return inlineLabel;
 	}
 
 	return isEditingNote
-		? truncateTextKeepingTail(fullInlineLabel, maxInlineLabelLength)
-		: truncateTextKeepingHead(fullInlineLabel, maxInlineLabelLength);
+		? truncateTextKeepingTail(inlineLabel, maxInlineLabelLength)
+		: truncateTextKeepingHead(inlineLabel, maxInlineLabelLength);
+}
+
+export function buildWrappedOptionLabelWithInlineNote(
+	baseOptionLabel: string,
+	rawNote: string,
+	isEditingNote: boolean,
+	maxInlineLabelLength: number,
+	wrapPadding = INLINE_NOTE_WRAP_PADDING,
+): string[] {
+	const inlineLabel = buildOptionLabelWithInlineNote(baseOptionLabel, rawNote, isEditingNote);
+	const sanitizedWrapPadding = Number.isFinite(wrapPadding) ? Math.max(0, Math.floor(wrapPadding)) : 0;
+	const sanitizedMaxInlineLabelLength = Number.isFinite(maxInlineLabelLength)
+		? Math.max(1, Math.floor(maxInlineLabelLength))
+		: 1;
+	const wrapWidth = Math.max(1, sanitizedMaxInlineLabelLength - sanitizedWrapPadding);
+	const wrappedLines = wrapTextWithAnsi(inlineLabel, wrapWidth);
+	return wrappedLines.length > 0 ? wrappedLines : [""];
 }

package/src/ask-inline-ui.ts

@@ -1,5 +1,5 @@
 import type { ExtensionUIContext } from "@mariozechner/pi-coding-agent";
-import { Editor, type EditorTheme, Key, matchesKey, truncateToWidth } from "@mariozechner/pi-tui";
+import { Editor, type EditorTheme, Key, matchesKey, truncateToWidth, visibleWidth } from "@mariozechner/pi-tui";
 import {
 	OTHER_OPTION,
 	appendRecommendedTagToOptionLabels,
@@ -7,7 +7,7 @@ import {
 	type AskOption,
 	type AskSelection,
 } from "./ask-logic";
-import { buildOptionLabelWithInlineNote } from "./ask-inline-note";
+import { INLINE_NOTE_WRAP_PADDING, buildWrappedOptionLabelWithInlineNote } from "./ask-inline-note";
 
 interface SingleQuestionInput {
 	question: string;
@@ -115,21 +115,28 @@ export async function askSingleQuestionWithInlineNote(
 			addLine(theme.fg("text", ` ${questionInput.question}`));
 			renderedLines.push("");
 
-			const maxInlineLabelLength = Math.max(12, width - 6);
 			for (let optionIndex = 0; optionIndex < selectableOptionLabels.length; optionIndex++) {
 				const optionLabel = selectableOptionLabels[optionIndex];
 				const isCursorOption = optionIndex === cursorOptionIndex;
 				const isEditingThisOption = isNoteEditorOpen && isCursorOption;
-				const optionLabelWithInlineNote = buildOptionLabelWithInlineNote(
+				const cursorPrefixText = isCursorOption ? "→ " : "  ";
+				const cursorPrefix = isCursorOption ? theme.fg("accent", cursorPrefixText) : cursorPrefixText;
+				const bullet = isCursorOption ? "●" : "○";
+				const markerText = `${bullet} `;
+				const optionColor = isCursorOption ? "accent" : "text";
+				const prefixWidth = visibleWidth(cursorPrefixText) + visibleWidth(markerText);
+				const wrappedInlineLabelLines = buildWrappedOptionLabelWithInlineNote(
 					optionLabel,
 					getRawNoteForOption(optionIndex),
 					isEditingThisOption,
-					maxInlineLabelLength,
+					Math.max(1, width - prefixWidth),
+					INLINE_NOTE_WRAP_PADDING,
 				);
-				const cursorPrefix = isCursorOption ? theme.fg("accent", "→ ") : "  ";
-				const bullet = isCursorOption ? "●" : "○";
-				const optionColor = isCursorOption ? "accent" : "text";
-				addLine(`${cursorPrefix}${theme.fg(optionColor, `${bullet} ${optionLabelWithInlineNote}`)}`);
+				const continuationPrefix = " ".repeat(prefixWidth);
+				addLine(`${cursorPrefix}${theme.fg(optionColor, `${markerText}${wrappedInlineLabelLines[0] ?? ""}`)}`);
+				for (const wrappedLine of wrappedInlineLabelLines.slice(1)) {
+					addLine(`${continuationPrefix}${theme.fg(optionColor, wrappedLine)}`);
+				}
 			}
 
 			renderedLines.push("");

package/src/ask-tabs-ui.ts

@@ -1,5 +1,5 @@
 import type { ExtensionUIContext } from "@mariozechner/pi-coding-agent";
-import { Editor, type EditorTheme, Key, matchesKey, truncateToWidth } from "@mariozechner/pi-tui";
+import { Editor, type EditorTheme, Key, matchesKey, truncateToWidth, visibleWidth } from "@mariozechner/pi-tui";
 import {
 	OTHER_OPTION,
 	appendRecommendedTagToOptionLabels,
@@ -8,7 +8,7 @@ import {
 	type AskQuestion,
 	type AskSelection,
 } from "./ask-logic";
-import { buildOptionLabelWithInlineNote } from "./ask-inline-note";
+import { INLINE_NOTE_WRAP_PADDING, buildWrappedOptionLabelWithInlineNote } from "./ask-inline-note";
 
 interface PreparedQuestion {
 	id: string;
@@ -317,27 +317,29 @@ export async function askQuestionsWithTabs(
 			addLine(theme.fg("text", ` ${preparedQuestion.question}`));
 			renderedLines.push("");
 
-			const maxInlineLabelLength = Math.max(12, width - 8);
 			for (let optionIndex = 0; optionIndex < preparedQuestion.options.length; optionIndex++) {
 				const optionLabel = preparedQuestion.options[optionIndex];
 				const isCursorOption = optionIndex === cursorOptionIndex;
 				const isOptionSelected = selectedOptionIndexes.includes(optionIndex);
 				const isEditingThisOption = isNoteEditorOpen && isCursorOption;
-				const optionLabelWithInlineNote = buildOptionLabelWithInlineNote(
+				const cursorPrefixText = isCursorOption ? "→ " : "  ";
+				const cursorPrefix = isCursorOption ? theme.fg("accent", cursorPrefixText) : cursorPrefixText;
+				const markerText = preparedQuestion.multi
+					? `${isOptionSelected ? "[x]" : "[ ]"} `
+					: `${isOptionSelected ? "●" : "○"} `;
+				const optionColor = isCursorOption ? "accent" : isOptionSelected ? "success" : "text";
+				const prefixWidth = visibleWidth(cursorPrefixText) + visibleWidth(markerText);
+				const wrappedInlineLabelLines = buildWrappedOptionLabelWithInlineNote(
 					optionLabel,
 					getQuestionNote(questionIndex, optionIndex),
 					isEditingThisOption,
-					maxInlineLabelLength,
+					Math.max(1, width - prefixWidth),
+					INLINE_NOTE_WRAP_PADDING,
 				);
-				const cursorPrefix = isCursorOption ? theme.fg("accent", "→ ") : "  ";
-				if (preparedQuestion.multi) {
-					const checkbox = isOptionSelected ? "[x]" : "[ ]";
-					const optionColor = isCursorOption ? "accent" : isOptionSelected ? "success" : "text";
-					addLine(`${cursorPrefix}${theme.fg(optionColor, `${checkbox} ${optionLabelWithInlineNote}`)}`);
-				} else {
-					const bullet = isOptionSelected ? "●" : "○";
-					const optionColor = isCursorOption ? "accent" : isOptionSelected ? "success" : "text";
-					addLine(`${cursorPrefix}${theme.fg(optionColor, `${bullet} ${optionLabelWithInlineNote}`)}`);
+				const continuationPrefix = " ".repeat(prefixWidth);
+				addLine(`${cursorPrefix}${theme.fg(optionColor, `${markerText}${wrappedInlineLabelLines[0] ?? ""}`)}`);
+				for (const wrappedLine of wrappedInlineLabelLines.slice(1)) {
+					addLine(`${continuationPrefix}${theme.fg(optionColor, wrappedLine)}`);
 				}
 			}
 

package/src/index.ts

@@ -1,6 +1,6 @@
 import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
 import { Type, type Static } from "@sinclair/typebox";
-import type { AskQuestion } from "./ask-logic";
+import { OTHER_OPTION, type AskQuestion } from "./ask-logic";
 import { askSingleQuestionWithInlineNote } from "./ask-inline-ui";
 import { askQuestionsWithTabs } from "./ask-tabs-ui";
 
@@ -37,6 +37,7 @@ interface QuestionResult {
 }
 
 interface AskToolDetails {
+	id?: string;
 	question?: string;
 	options?: string[];
 	multi?: boolean;
@@ -45,16 +46,106 @@ interface AskToolDetails {
 	results?: QuestionResult[];
 }
 
+function sanitizeForSessionText(value: string): string {
+	return value
+		.replace(/[\r\n\t]/g, " ")
+		.replace(/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]/g, "")
+		.replace(/\s{2,}/g, " ")
+		.trim();
+}
+
+function sanitizeOptionForSessionText(option: string): string {
+	const sanitizedOption = sanitizeForSessionText(option);
+	return sanitizedOption.length > 0 ? sanitizedOption : "(empty option)";
+}
+
+function toSessionSafeQuestionResult(result: QuestionResult): QuestionResult {
+	const selectedOptions = result.selectedOptions
+		.map((selectedOption) => sanitizeForSessionText(selectedOption))
+		.filter((selectedOption) => selectedOption.length > 0);
+
+	const rawCustomInput = result.customInput;
+	const customInput = rawCustomInput == null ? undefined : sanitizeForSessionText(rawCustomInput);
+
+	return {
+		id: sanitizeForSessionText(result.id) || "(unknown)",
+		question: sanitizeForSessionText(result.question) || "(empty question)",
+		options: result.options.map(sanitizeOptionForSessionText),
+		multi: result.multi,
+		selectedOptions,
+		customInput: customInput && customInput.length > 0 ? customInput : undefined,
+	};
+}
+
+function formatSelectionForSummary(result: QuestionResult): string {
+	const hasSelectedOptions = result.selectedOptions.length > 0;
+	const hasCustomInput = Boolean(result.customInput);
+
+	if (!hasSelectedOptions && !hasCustomInput) {
+		return "(cancelled)";
+	}
+
+	if (hasSelectedOptions && hasCustomInput) {
+		const selectedPart = result.multi
+			? `[${result.selectedOptions.join(", ")}]`
+			: result.selectedOptions[0];
+		return `${selectedPart} + Other: "${result.customInput}"`;
+	}
+
+	if (hasCustomInput) {
+		return `"${result.customInput}"`;
+	}
+
+	if (result.multi) {
+		return `[${result.selectedOptions.join(", ")}]`;
+	}
+
+	return result.selectedOptions[0];
+}
+
 function formatQuestionResult(result: QuestionResult): string {
-	if (result.customInput) {
-		return `${result.id}: \"${result.customInput}\"`;
+	return `${result.id}: ${formatSelectionForSummary(result)}`;
+}
+
+function formatQuestionContext(result: QuestionResult, questionIndex: number): string {
+	const lines: string[] = [
+		`Question ${questionIndex + 1} (${result.id})`,
+		`Prompt: ${result.question}`,
+		"Options:",
+		...result.options.map((option, optionIndex) => `  ${optionIndex + 1}. ${option}`),
+		"Response:",
+	];
+
+	const hasSelectedOptions = result.selectedOptions.length > 0;
+	const hasCustomInput = Boolean(result.customInput);
+
+	if (!hasSelectedOptions && !hasCustomInput) {
+		lines.push("  Selected: (cancelled)");
+		return lines.join("\n");
 	}
-	if (result.selectedOptions.length > 0) {
-		return result.multi
-			? `${result.id}: [${result.selectedOptions.join(", ")}]`
-			: `${result.id}: ${result.selectedOptions[0]}`;
+
+	if (hasSelectedOptions) {
+		const selectedText = result.multi
+			? `[${result.selectedOptions.join(", ")}]`
+			: result.selectedOptions[0];
+		lines.push(`  Selected: ${selectedText}`);
+	}
+
+	if (hasCustomInput) {
+		if (!hasSelectedOptions) {
+			lines.push(`  Selected: ${OTHER_OPTION}`);
+		}
+		lines.push(`  Custom input: ${result.customInput}`);
 	}
-	return `${result.id}: (cancelled)`;
+
+	return lines.join("\n");
+}
+
+function buildAskSessionContent(results: QuestionResult[]): string {
+	const safeResults = results.map(toSessionSafeQuestionResult);
+	const summaryLines = safeResults.map(formatQuestionResult).join("\n");
+	const contextBlocks = safeResults.map((result, index) => formatQuestionContext(result, index)).join("\n\n");
+	return `User answers:\n${summaryLines}\n\nAnswer context:\n${contextBlocks}`;
 }
 
 const ASK_TOOL_DESCRIPTION = `
@@ -96,7 +187,9 @@ export default function askExtension(pi: ExtensionAPI) {
 					? (await askQuestionsWithTabs(ctx.ui, [q as AskQuestion])).selections[0] ?? { selectedOptions: [] }
 					: await askSingleQuestionWithInlineNote(ctx.ui, q as AskQuestion);
 				const optionLabels = q.options.map((option) => option.label);
-				const details: AskToolDetails = {
+
+				const result: QuestionResult = {
+					id: q.id,
 					question: q.question,
 					options: optionLabels,
 					multi: q.multi ?? false,
@@ -104,22 +197,18 @@ export default function askExtension(pi: ExtensionAPI) {
 					customInput: selection.customInput,
 				};
 
-				if (selection.customInput) {
-					return {
-						content: [{ type: "text", text: `User provided custom input: ${selection.customInput}` }],
-						details,
-					};
-				}
-
-				if (selection.selectedOptions.length > 0) {
-					return {
-						content: [{ type: "text", text: `User selected: ${selection.selectedOptions.join(", ")}` }],
-						details,
-					};
-				}
+				const details: AskToolDetails = {
+					id: q.id,
+					question: q.question,
+					options: optionLabels,
+					multi: q.multi ?? false,
+					selectedOptions: selection.selectedOptions,
+					customInput: selection.customInput,
+					results: [result],
+				};
 
 				return {
-					content: [{ type: "text", text: "User cancelled the selection" }],
+					content: [{ type: "text", text: buildAskSessionContent([result]) }],
 					details,
 				};
 			}
@@ -140,7 +229,7 @@ export default function askExtension(pi: ExtensionAPI) {
 			}
 
 			return {
-				content: [{ type: "text", text: `User answers:\n${results.map(formatQuestionResult).join("\n")}` }],
+				content: [{ type: "text", text: buildAskSessionContent(results) }],
 				details: { results } satisfies AskToolDetails,
 			};
 		},