@ryan_nookpi/pi-extension-ask-user-question 0.3.3 → 0.3.4

package/form-ui.test.ts

@@ -22,6 +22,50 @@ describe("ask-user-question/form-ui", () => {
 		expect(editorTheme.selectList.noMatch("e")).toBe("e");
 	});
 
+	it("prefers the native askUserQuestion bridge when available", async () => {
+		const questions = normalizeQuestions([
+			{ id: "choice", type: "radio", prompt: "Pick", options: [{ value: "a", label: "A" }] },
+			{ id: "items", type: "checkbox", prompt: "Items", options: [{ value: "x", label: "X" }] },
+			{ id: "note", type: "text", prompt: "Note" },
+		]);
+		const askUserQuestion = vi.fn(async () => ({ choice: "custom", items: ["x", "extra"], note: "ship it" }));
+		const custom = vi.fn();
+		const ctx = {
+			hasUI: true,
+			ui: { askUserQuestion, custom },
+		} as unknown as ExtensionContext;
+
+		const result = await runAskUserQuestionForm(ctx, { title: "Title", description: "Desc" }, questions);
+
+		expect(askUserQuestion).toHaveBeenCalledWith({ title: "Title", description: "Desc", questions });
+		expect(custom).not.toHaveBeenCalled();
+		expect(result).toEqual({
+			title: "Title",
+			questions,
+			answers: [
+				{ id: "choice", type: "radio", value: "custom", wasCustom: true },
+				{ id: "items", type: "checkbox", value: ["x", "extra"], wasCustom: true },
+				{ id: "note", type: "text", value: "ship it", wasCustom: true },
+			],
+			cancelled: false,
+		});
+	});
+
+	it("supports the snake_case bridge and maps undefined to cancellation", async () => {
+		const questions = normalizeQuestions([{ id: "text", type: "text", prompt: "Explain" }]);
+		const signal = new AbortController().signal;
+		const askUserQuestion = vi.fn(async () => undefined);
+		const ctx = {
+			hasUI: true,
+			ui: { ask_user_question: askUserQuestion },
+		} as unknown as ExtensionContext;
+
+		const result = await runAskUserQuestionForm(ctx, { title: "Title" }, questions, { signal });
+
+		expect(askUserQuestion).toHaveBeenCalledWith({ title: "Title", description: undefined, questions }, { signal });
+		expect(result).toEqual({ title: "Title", questions, answers: [], cancelled: true });
+	});
+
 	it("wires the custom UI factory to the controller", async () => {
 		const questions = normalizeQuestions([{ id: "text", type: "text", prompt: "Explain", default: "seed" }]);
 		let captured: FormResult | undefined;

package/form-ui.ts

@@ -3,7 +3,90 @@ import { Editor, type EditorTheme } from "@mariozechner/pi-tui";
 
 import { createFormController } from "./controller.ts";
 import { createAnswerState } from "./state.ts";
-import type { FormResult, NormalizedQuestion, RenderTheme } from "./types.ts";
+import type { Answer, FormResult, NormalizedQuestion, RenderTheme } from "./types.ts";
+
+interface AskUserQuestionBridgeRequest {
+	title?: string;
+	description?: string;
+	questions: NormalizedQuestion[];
+}
+
+type AskUserQuestionBridge = (
+	request: AskUserQuestionBridgeRequest,
+	options?: { signal?: AbortSignal },
+) => Promise<Record<string, unknown> | undefined>;
+
+interface AskUserQuestionBridgeUI {
+	askUserQuestion?: AskUserQuestionBridge;
+	ask_user_question?: AskUserQuestionBridge;
+}
+
+function getAskUserQuestionBridge(ctx: ExtensionContext): AskUserQuestionBridge | undefined {
+	const ui = ctx.ui as ExtensionContext["ui"] & AskUserQuestionBridgeUI;
+	if (typeof ui.askUserQuestion === "function") return ui.askUserQuestion.bind(ui);
+	if (typeof ui.ask_user_question === "function") return ui.ask_user_question.bind(ui);
+	return undefined;
+}
+
+function valueAsString(value: unknown): string {
+	return typeof value === "string" ? value : "";
+}
+
+function valueAsStringArray(value: unknown): string[] {
+	if (Array.isArray(value)) return value.filter((item): item is string => typeof item === "string");
+	return typeof value === "string" ? [value] : [];
+}
+
+function buildAnswersFromBridgeResult(questions: NormalizedQuestion[], result: Record<string, unknown>): Answer[] {
+	return questions.map((question) => {
+		const rawValue = result[question.id];
+		if (question.type === "radio") {
+			const value = valueAsString(rawValue);
+			const optionValues = new Set(question.options.map((option) => option.value));
+			return {
+				id: question.id,
+				type: "radio",
+				value,
+				wasCustom: value.length > 0 && !optionValues.has(value),
+			};
+		}
+
+		if (question.type === "checkbox") {
+			const value = valueAsStringArray(rawValue);
+			const optionValues = new Set(question.options.map((option) => option.value));
+			return {
+				id: question.id,
+				type: "checkbox",
+				value,
+				wasCustom: value.some((item) => !optionValues.has(item)),
+			};
+		}
+
+		return {
+			id: question.id,
+			type: "text",
+			value: valueAsString(rawValue),
+			wasCustom: true,
+		};
+	});
+}
+
+function buildFormResultFromBridgeResult(
+	params: { title?: string },
+	questions: NormalizedQuestion[],
+	result: Record<string, unknown> | undefined,
+): FormResult {
+	if (!result) {
+		return { title: params.title, questions, answers: [], cancelled: true };
+	}
+
+	return {
+		title: params.title,
+		questions,
+		answers: buildAnswersFromBridgeResult(questions, result),
+		cancelled: false,
+	};
+}
 
 export function createEditorTheme(theme: Pick<RenderTheme, "fg">): EditorTheme {
 	return {
@@ -22,7 +105,17 @@ export async function runAskUserQuestionForm(
 	ctx: ExtensionContext,
 	params: { title?: string; description?: string },
 	questions: NormalizedQuestion[],
+	options: { signal?: AbortSignal } = {},
 ): Promise<FormResult> {
+	const askUserQuestionBridge = getAskUserQuestionBridge(ctx);
+	if (askUserQuestionBridge) {
+		const request = { title: params.title, description: params.description, questions };
+		const result = options.signal
+			? await askUserQuestionBridge(request, { signal: options.signal })
+			: await askUserQuestionBridge(request);
+		return buildFormResultFromBridgeResult(params, questions, result);
+	}
+
 	return ctx.ui.custom<FormResult>((tui, theme, _keybindings, done) => {
 		return createFormController({
 			title: params.title,

package/index.ts

@@ -62,7 +62,7 @@ export default function askUserQuestion(pi: ExtensionAPI) {
 		promptSnippet: "radio, checkbox, text 입력을 사용하는 인터랙티브 질문 폼 열기",
 		promptGuidelines: PROMPT_GUIDELINES,
 		parameters: AskUserQuestionParams,
-		async execute(_toolCallId, rawParams, _signal, _onUpdate, ctx) {
+		async execute(_toolCallId, rawParams, signal, _onUpdate, ctx) {
 			if (!ctx.hasUI) {
 				return errorResult("오류: UI를 사용할 수 없습니다. 현재 비대화형 모드에서 실행 중입니다.");
 			}
@@ -77,6 +77,7 @@ export default function askUserQuestion(pi: ExtensionAPI) {
 				ctx,
 				{ title: params.title, description: params.description },
 				questions,
+				{ signal },
 			);
 			return result.cancelled ? buildCancelledResponse(result) : buildSuccessResponse(result);
 		},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ryan_nookpi/pi-extension-ask-user-question",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "description": "AskUserQuestion tool extension for pi.",
   "license": "MIT",
   "repository": {