@xynogen/pix-ask 0.2.19 → 0.2.21

package/README.md

@@ -6,6 +6,8 @@ Pi tool — structured questionnaire UI (`ask_user`).
 
 Registers the `ask_user` tool in Pi. When the agent needs to resolve ambiguous requirements, it presents up to 4 structured multiple-choice questions in a TUI dialog. Each question requires 2–4 options with labels and descriptions; supports multi-select and markdown side-by-side previews for richer context. Single-select questions (without a preview) auto-append a "Type something." row for free-form input; multi-select questions append a "Next" row to advance. Single-select questions with a `preview` skip the free-form row to make room for the side-by-side layout. In non-interactive (RPC/JSON) mode, falls back to text-based prompts. The agent uses this tool before proceeding rather than guessing at intent.
 
+While the dialog is open, `ask_user` holds the shared **agent-state** coordinator in the `blocked` state (via `withAgentBlock` from [`@xynogen/pix-runtime`](https://www.npmjs.com/package/@xynogen/pix-runtime)). Inside a herdr pane that transition fires a "needs attention" notification, so a user away from the terminal is pinged when a question is waiting.
+
 ## Install
 
 ```bash

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@xynogen/pix-ask",
-	"version": "0.2.19",
+	"version": "0.2.21",
 	"description": "Pi tool — structured questionnaire UI (ask_user)",
 	"type": "module",
 	"main": "src/index.ts",
@@ -36,7 +36,7 @@
 	},
 	"dependencies": {
 		"@xynogen/pix-pretty": "^1.11.2",
-		"@xynogen/pix-runtime": "^0.5.3",
+		"@xynogen/pix-runtime": "^0.7.0",
 		"typebox": "^1.1.38"
 	},
 	"peerDependencies": {

package/src/index.ts

@@ -1,5 +1,14 @@
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { Text } from "@earendil-works/pi-tui";
+import { modalOverlayOptions } from "@xynogen/pix-pretty/modal-frame";
+import {
+	dotJoin,
+	formatCollapsedToolRow,
+	hideCollapsedToolCall,
+	pluralize,
+} from "@xynogen/pix-pretty/utils";
+import { withAgentBlock } from "@xynogen/pix-runtime";
+import { type CollapseState, tickCollapse } from "@xynogen/pix-runtime/collapse";
 import { once } from "@xynogen/pix-runtime/once";
 import { buildResponseText } from "./helpers.js";
 import { AskQuestionnaire } from "./questionnaire.js";
@@ -30,6 +39,7 @@ export default function registerAsk(pi: ExtensionAPI): void {
 		pi.registerTool({
 			name: "ask_user",
 			label: "Ask",
+			renderShell: "self",
 			description: `Ask the user up to ${MAX_QUESTIONS} structured questions (${MIN_OPTIONS}-${MAX_OPTIONS} options each) when requirements are ambiguous.`,
 			promptSnippet: `Ask the user up to ${MAX_QUESTIONS} structured questions (${MIN_OPTIONS}-${MAX_OPTIONS} options each) when requirements are ambiguous`,
 			promptGuidelines: [
@@ -65,16 +75,18 @@ export default function registerAsk(pi: ExtensionAPI): void {
 					return { content: [{ type: "text", text }], details: result };
 				}
 
-				const result = await ctx.ui.custom<QuestionnaireResult | null>(
-					(tui, theme, keybindings, done) => {
-						if (signal) {
-							signal.addEventListener("abort", () => done({ answers: [], cancelled: true }), {
-								once: true,
-							});
-						}
-						return new AskQuestionnaire(typed, tui, theme, keybindings, done);
-					},
-					{ overlay: true },
+				const result = await withAgentBlock(pi.events, "ask_user", "Waiting for user answer", () =>
+					ctx.ui.custom<QuestionnaireResult | null>(
+						(tui, theme, keybindings, done) => {
+							if (signal) {
+								signal.addEventListener("abort", () => done({ answers: [], cancelled: true }), {
+									once: true,
+								});
+							}
+							return new AskQuestionnaire(typed, tui, theme, keybindings, done);
+						},
+						{ overlay: true, overlayOptions: modalOverlayOptions() },
+					),
 				);
 
 				if (!result || result.cancelled) {
@@ -88,31 +100,71 @@ export default function registerAsk(pi: ExtensionAPI): void {
 				return { content: [{ type: "text", text }], details: result };
 			},
 
-			renderCall(args, theme) {
+			renderCall(args, theme, renderCtx) {
+				const text =
+					renderCtx?.lastComponent instanceof Text ? renderCtx.lastComponent : new Text("", 0, 0);
+				if (
+					renderCtx &&
+					hideCollapsedToolCall(renderCtx.state as CollapseState, renderCtx.expanded, (value) =>
+						text.setText(value),
+					)
+				)
+					return text;
 				const questions = Array.isArray(args.questions) ? args.questions : [];
 				const count = questions.length;
 				const firstQ = questions[0]?.question ?? "";
-				let text = theme.fg("toolTitle", theme.bold(`ask (${count}) `));
-				text += theme.fg("muted", firstQ);
-				if (count > 1) text += theme.fg("dim", ` +${count - 1} more`);
-				return new Text(text, 0, 0);
+				const head = `${theme.fg("toolTitle", theme.bold("ask_user"))} ${theme.fg("muted", firstQ)}`;
+				text.setText(
+					dotJoin([head, theme.fg("dim", pluralize(count, "question"))], (s) => theme.fg("dim", s)),
+				);
+				return text;
 			},
 
-			renderResult(result, options, theme) {
+			renderResult(result, options, theme, renderCtx) {
+				const text =
+					renderCtx?.lastComponent instanceof Text ? renderCtx.lastComponent : new Text("", 0, 0);
 				const details = result.details as
 					| { answers?: QuestionAnswer[]; cancelled?: boolean }
 					| undefined;
 				if (options.isPartial) {
-					return new Text(theme.fg("muted", "Waiting for user input..."), 0, 0);
+					text.setText(theme.fg("muted", "Waiting for user input…"));
+					return text;
 				}
 				if (!details || details.cancelled || !details.answers?.length) {
-					return new Text(theme.fg("warning", "Cancelled"), 0, 0);
+					// Cancellation is a warning outcome, not success — shared row keeps the
+					// tool identity and a text label (never color alone) for accessibility.
+					text.setText(formatCollapsedToolRow(theme, "ask_user", "", "cancelled", "warning"));
+					return text;
+				}
+				const values = details.answers.map((a) =>
+					a.kind === "multi" ? (a.selected ?? []).join(", ") : (a.answer ?? ""),
+				);
+				const collapsed =
+					!!renderCtx &&
+					tickCollapse(
+						"ask_user",
+						renderCtx.state as CollapseState,
+						renderCtx.invalidate,
+						renderCtx.expanded,
+					);
+				if (collapsed) {
+					text.setText(
+						formatCollapsedToolRow(
+							theme,
+							"ask_user",
+							values.join(", "),
+							pluralize(details.answers.length, "answer"),
+						),
+					);
+					return text;
 				}
-				const texts = details.answers.map((a) => {
-					const v = a.kind === "multi" ? (a.selected ?? []).join(", ") : (a.answer ?? "");
-					return `${a.questionIndex + 1}: ${v}`;
-				});
-				return new Text(theme.fg("success", `✓ ${texts.join(" • ")}`), 0, 0);
+				const lines = details.answers.map(
+					(a, i) =>
+						`${theme.fg("muted", `${a.questionIndex + 1}:`)} ${theme.fg("success", values[i] ?? "")}`,
+				);
+				const header = `${theme.fg("success", "✓")} ${theme.fg("toolTitle", theme.bold("ask_user"))}`;
+				text.setText([header, ...lines].join("\n"));
+				return text;
 			},
 		});
 	});

package/src/questionnaire.ts

@@ -15,7 +15,6 @@ import {
 	frameModal,
 	MIN_MODAL_HEIGHT,
 	ModalPager,
-	modalWidth,
 	terminalModalHeight,
 } from "@xynogen/pix-pretty/modal-frame";
 import { ChipEditor } from "./chip-editor.js";
@@ -511,9 +510,8 @@ export class AskQuestionnaire extends Container {
 	}
 
 	override render(termWidth: number): string[] {
-		// Cap to a fixed-width floating modal; render content at the inner width
-		// and frame it with a rounded border (see frameLines).
-		const mw = modalWidth(termWidth);
+		// Overlay owns configured bounds; fill them so background cannot bleed through.
+		const mw = Math.max(1, Math.floor(termWidth));
 		const width = mw - 4; // border (2) + padding (2)
 		const inner = Math.max(20, width);
 		const t = this.theme;