@rol1n/ask-u-questions 0.1.0 → 0.1.1

package/README.md

@@ -8,12 +8,10 @@ Interactive single-choice, multiple-choice, and free-text questions for Pi. Regi
 pi install npm:@rol1n/ask-u-questions
 ```
 
-Also included in `@rol1n/pi-kit`. Enable one copy of the extension.
+Also included in `@rol1n/pi-kit`.
 
 ## Use
 
-The agent calls the tool with a question and optional choices:
-
 ```json
 {
   "question": "Which output format should I use?",
@@ -25,8 +23,4 @@ The agent calls the tool with a question and optional choices:
 }
 ```
 
-Omit `options` or supply an empty array for free-text input. Set `multiSelect` only when several choices are expected. `details` adds supporting context; an Other choice is supplied automatically for choice questions.
-
-## Requirements and behavior
-
-Use an interactive Pi terminal session for dialogs. Results distinguish answered, cancelled, and unavailable states, so a cancelled dialog is not an approval. No API credentials or package-specific settings are required.
+Omit `options` or pass `[]` for free-text input. Set `multiSelect: true` only when multiple choices are expected. `details` adds supporting context, and an `Other` option is provided automatically for choice questions.

package/{extensions/ask-u-questions/dialog-ui.ts → dialog-ui.ts}

@@ -55,3 +55,26 @@ export function addWrapped(
   }
 }
 
+const SHARED_UI_LOCK_KEY = "__piSharedUiLock";
+function getSharedUiLock(): { withLock<T>(fn: () => T | Promise<T>): Promise<T> } {
+  const g = globalThis as any;
+  if (!g[SHARED_UI_LOCK_KEY]) {
+    let chain: Promise<void> = Promise.resolve();
+    g[SHARED_UI_LOCK_KEY] = {
+      withLock<T>(fn: () => T | Promise<T>): Promise<T> {
+        const prev = chain;
+        let release: () => void;
+        chain = new Promise<void>((r) => {
+          release = r;
+        });
+        return prev.then(fn).finally(() => release!());
+      },
+    };
+  }
+  return g[SHARED_UI_LOCK_KEY];
+}
+const sharedUiLock = getSharedUiLock();
+
+export function withUILock<T>(fn: () => Promise<T>): Promise<T> {
+  return sharedUiLock.withLock(fn);
+}

package/{extensions/ask-u-questions/index.ts → index.ts}

@@ -1,12 +1,16 @@
 /** Interactive questions, serialized through the shared dialog lock. */
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import type { AskUserQuestionMode } from "./types.ts";
-import { AskUserQuestionParams } from "./schema.ts";
-import { normalizeOptions } from "./answers.ts";
-import { buildResult, cancelledResult, unavailableResult } from "./results.ts";
+import {
+  AskUserQuestionParams,
+  buildResult,
+  cancelledResult,
+  normalizeOptions,
+  unavailableResult,
+  type AskUserQuestionMode,
+} from "./types.ts";
+import { withUILock } from "./dialog-ui.ts";
 import { askSingleChoice } from "./single-choice.ts";
 import { askMultiChoice } from "./multi-choice.ts";
-import { withUILock } from "./ui-lock.ts";
 import { questionRenderers } from "./tool-renderers.ts";
 
 export type { AskOption, TextAnswer, OptionAnswer, OtherAnswer, AskAnswer, AskUserQuestionStatus, AskUserQuestionMode, AskUserQuestionResultDetails } from "./types.ts";

package/{extensions/ask-u-questions/multi-choice.ts → multi-choice.ts}

@@ -1,7 +1,6 @@
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { Editor, Key, matchesKey, truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
-import type { AskAnswer, AskOption, DisplayOption } from "./types.ts";
-import { getOtherLabel, isChineseContext, sortAnswers } from "./answers.ts";
+import { getOtherLabel, isChineseContext, sortAnswers, type AskAnswer, type AskOption, type DisplayOption } from "./types.ts";
 import { addWrapped, createEditorTheme } from "./dialog-ui.ts";
 
 export async function askMultiChoice(
@@ -257,4 +256,3 @@ export async function askMultiChoice(
     },
   );
 }
-

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rol1n/ask-u-questions",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "type": "module",
   "description": "ask-u-questions extension from pi-kit",
   "keywords": [
@@ -8,8 +8,8 @@
   ],
   "repository": {
     "type": "git",
-    "url": "git+ssh://git@github.com/RolinShmily/pi-kit.git",
-    "directory": "extensions/ask-u-questions"
+    "url": "git+https://github.com/RolinShmily/pi-kit.git",
+    "directory": "ask-u-questions"
   },
   "homepage": "https://github.com/RolinShmily/pi-kit#readme",
   "bugs": {
@@ -21,10 +21,6 @@
   "publishConfig": {
     "access": "public"
   },
-  "files": [
-    "extensions/ask-u-questions",
-    "extensions/ask-u-questions/README.md"
-  ],
   "peerDependencies": {
     "@earendil-works/pi-ai": "*",
     "@earendil-works/pi-agent-core": "*",
@@ -34,7 +30,7 @@
   },
   "pi": {
     "extensions": [
-      "./extensions/ask-u-questions/index.ts"
+      "./index.ts"
     ],
     "skills": [],
     "prompts": [],

package/{extensions/ask-u-questions/single-choice.ts → single-choice.ts}

@@ -1,7 +1,6 @@
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { Editor, Key, matchesKey, truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
-import type { AskAnswer, AskOption, DisplayOption } from "./types.ts";
-import { getOtherLabel, isChineseContext } from "./answers.ts";
+import { getOtherLabel, isChineseContext, type AskAnswer, type AskOption, type DisplayOption } from "./types.ts";
 import { addWrapped, createEditorTheme } from "./dialog-ui.ts";
 
 export async function askSingleChoice(
@@ -179,4 +178,3 @@ export async function askSingleChoice(
     },
   );
 }
-

package/{extensions/ask-u-questions/tool-renderers.ts → tool-renderers.ts}

@@ -1,8 +1,6 @@
 import type { ToolDefinition } from "@earendil-works/pi-coding-agent";
 import { Text } from "@earendil-works/pi-tui";
-import type { AskUserQuestionParams } from "./schema.ts";
-import type { AskUserQuestionResultDetails } from "./types.ts";
-import { getOtherLabel, isChineseContext, normalizeOptions } from "./answers.ts";
+import { AskUserQuestionParams, getOtherLabel, isChineseContext, normalizeOptions, type AskUserQuestionResultDetails } from "./types.ts";
 
 export const questionRenderers: Pick<ToolDefinition<typeof AskUserQuestionParams, AskUserQuestionResultDetails>, "renderCall" | "renderResult"> = {
   renderCall(args, theme, context) {

package/types.ts

@@ -0,0 +1,192 @@
+import { Type } from "typebox";
+
+const OptionSchema = Type.Object({
+  label: Type.String({ description: 'Option label. Put a recommended option first and append "(Recommended)".' }),
+  value: Type.Optional(Type.String({ description: "Machine-readable value; defaults to the label." })),
+  description: Type.Optional(Type.String({ description: "Additional context shown below the option." })),
+});
+
+export const AskUserQuestionParams = Type.Object({
+  question: Type.String({ description: "The question to ask. Ask only one question per call." }),
+  details: Type.Optional(Type.String({ description: "Background or instructions shown below the question." })),
+  options: Type.Optional(Type.Array(OptionSchema, {
+    description: "Choices for selection. Omit or pass an empty array for free-text input. An Other choice is always available.",
+  })),
+  multiSelect: Type.Optional(Type.Boolean({ description: "Allow selecting multiple options when true." })),
+});
+
+export interface AskOption {
+  label: string;
+  value: string;
+  description?: string;
+}
+
+export interface DisplayOption extends AskOption {
+  id: string;
+  index?: number;
+  isOther?: boolean;
+  isSubmit?: boolean;
+}
+
+export interface TextAnswer {
+  type: "text";
+  label: string;
+  value: string;
+}
+
+export interface OptionAnswer {
+  type: "option";
+  label: string;
+  value: string;
+  index: number;
+}
+
+export interface OtherAnswer {
+  type: "other";
+  label: string;
+  value: string;
+}
+
+export type AskAnswer = TextAnswer | OptionAnswer | OtherAnswer;
+export type AskUserQuestionStatus = "answered" | "cancelled" | "unavailable";
+export type AskUserQuestionMode = "text" | "single-select" | "multi-select";
+
+export interface AskUserQuestionResultDetails {
+  status: AskUserQuestionStatus;
+  question: string;
+  context?: string;
+  mode: AskUserQuestionMode;
+  answers: AskAnswer[];
+  message?: string;
+}
+
+export function normalizeOptions(
+  options: Array<{ label: string; value?: string; description?: string }> | undefined,
+): AskOption[] {
+  return (options || [])
+    .map((option) => ({
+      label: option.label.trim(),
+      value: option.value?.trim() || option.label.trim(),
+      description: option.description?.trim() || undefined,
+    }))
+    .filter((option) => option.label.length > 0);
+}
+
+export function isChineseContext(
+  question: string,
+  options?: Array<{ label?: string; description?: string }>,
+  context?: string,
+): boolean {
+  if (/[\u4e00-\u9fa5]/.test(question)) return true;
+  if (context && /[\u4e00-\u9fa5]/.test(context)) return true;
+  if (options && options.some((o) => (o.label && /[\u4e00-\u9fa5]/.test(o.label)) || (o.description && /[\u4e00-\u9fa5]/.test(o.description)))) {
+    return true;
+  }
+  return false;
+}
+
+export function getOtherLabel(options: AskOption[], isZh = false): string {
+  if (isZh) {
+    return options.some((option) => option.label === "其他（自定义输入）")
+      ? "自定义输入"
+      : "其他（自定义输入）";
+  }
+  return options.some((option) => option.label === "Other (custom input)")
+    ? "Custom input"
+    : "Other (custom input)";
+}
+
+function answerSortRank(answer: AskAnswer): number {
+  switch (answer.type) {
+    case "option":
+      return answer.index;
+    case "other":
+      return Number.MAX_SAFE_INTEGER - 1;
+    case "text":
+      return Number.MAX_SAFE_INTEGER;
+  }
+}
+
+export function sortAnswers(answers: AskAnswer[]): AskAnswer[] {
+  return [...answers].sort((a, b) => answerSortRank(a) - answerSortRank(b));
+}
+
+function formatAnswerForModel(answer: AskAnswer): string {
+  switch (answer.type) {
+    case "text":
+      return answer.label;
+    case "other":
+      return `Other: ${answer.label}`;
+    case "option":
+      return `${answer.index}. ${answer.label}`;
+  }
+}
+
+function buildStructuredResult(
+  status: AskUserQuestionStatus,
+  question: string,
+  mode: AskUserQuestionMode,
+  answers: AskAnswer[],
+  context?: string,
+  message?: string,
+): AskUserQuestionResultDetails {
+  return {
+    status,
+    question,
+    context,
+    mode,
+    answers,
+    message,
+  };
+}
+
+export function cancelledResult(question: string, mode: AskUserQuestionMode, context?: string) {
+  const isZh = isChineseContext(question, undefined, context);
+  const message = isZh ? "用户取消了本次提问" : "User cancelled the question.";
+  return {
+    content: [{ type: "text" as const, text: message }],
+    details: buildStructuredResult("cancelled", question, mode, [], context, message),
+  };
+}
+
+export function unavailableResult(question: string, mode: AskUserQuestionMode, message: string, context?: string) {
+  return {
+    content: [{ type: "text" as const, text: message }],
+    details: buildStructuredResult("unavailable", question, mode, [], context, message),
+  };
+}
+
+export function buildResult(
+  question: string,
+  context: string | undefined,
+  mode: AskUserQuestionMode,
+  answers: AskAnswer[],
+) {
+  const isZh = isChineseContext(question, answers, context);
+  let text: string;
+  if (mode === "text") {
+    const answer = answers[0];
+    if (isZh) {
+      text = answer.label.trim().length > 0
+        ? `用户输入回答: ${answer.label}`
+        : "用户提交了空回答";
+    } else {
+      text = answer.label.trim().length > 0
+        ? `User answered: ${answer.label}`
+        : "User submitted an empty answer";
+    }
+  } else if (mode === "single-select") {
+    text = isZh
+      ? `用户选择项: ${formatAnswerForModel(answers[0])}`
+      : `User selected: ${formatAnswerForModel(answers[0])}`;
+  } else {
+    text = isZh
+      ? `用户选择多项:\n${answers.map((answer) => `- ${formatAnswerForModel(answer)}`).join("\n")}`
+      : `User selected multiple:\n${answers.map((answer) => `- ${formatAnswerForModel(answer)}`).join("\n")}`;
+  }
+
+  return {
+    content: [{ type: "text" as const, text }],
+    details: buildStructuredResult("answered", question, mode, answers, context),
+  };
+}

package/extensions/ask-u-questions/README.md

@@ -1,32 +0,0 @@
-# ask-u-questions
-
-Interactive single-choice, multiple-choice, and free-text questions for Pi. Registers the `ask_user_question` tool and serializes dialogs through a shared UI lock.
-
-## Install
-
-```sh
-pi install npm:@rol1n/ask-u-questions
-```
-
-Also included in `@rol1n/pi-kit`. Enable one copy of the extension.
-
-## Use
-
-The agent calls the tool with a question and optional choices:
-
-```json
-{
-  "question": "Which output format should I use?",
-  "options": [
-    { "label": "Markdown (Recommended)", "value": "markdown" },
-    { "label": "JSON", "value": "json" }
-  ],
-  "multiSelect": false
-}
-```
-
-Omit `options` or supply an empty array for free-text input. Set `multiSelect` only when several choices are expected. `details` adds supporting context; an Other choice is supplied automatically for choice questions.
-
-## Requirements and behavior
-
-Use an interactive Pi terminal session for dialogs. Results distinguish answered, cancelled, and unavailable states, so a cancelled dialog is not an approval. No API credentials or package-specific settings are required.

package/extensions/ask-u-questions/answers.ts

@@ -1,53 +0,0 @@
-import type { AskAnswer, AskOption } from "./types.ts";
-
-export function normalizeOptions(
-  options: Array<{ label: string; value?: string; description?: string }> | undefined,
-): AskOption[] {
-  return (options || [])
-    .map((option) => ({
-      label: option.label.trim(),
-      value: option.value?.trim() || option.label.trim(),
-      description: option.description?.trim() || undefined,
-    }))
-    .filter((option) => option.label.length > 0);
-}
-
-export function isChineseContext(
-  question: string,
-  options?: Array<{ label?: string; description?: string }>,
-  context?: string,
-): boolean {
-  if (/[\u4e00-\u9fa5]/.test(question)) return true;
-  if (context && /[\u4e00-\u9fa5]/.test(context)) return true;
-  if (options && options.some((o) => (o.label && /[\u4e00-\u9fa5]/.test(o.label)) || (o.description && /[\u4e00-\u9fa5]/.test(o.description)))) {
-    return true;
-  }
-  return false;
-}
-
-export function getOtherLabel(options: AskOption[], isZh = false): string {
-  if (isZh) {
-    return options.some((option) => option.label === "其他（自定义输入）")
-      ? "自定义输入"
-      : "其他（自定义输入）";
-  }
-  return options.some((option) => option.label === "Other (custom input)")
-    ? "Custom input"
-    : "Other (custom input)";
-}
-
-function answerSortRank(answer: AskAnswer): number {
-  switch (answer.type) {
-    case "option":
-      return answer.index;
-    case "other":
-      return Number.MAX_SAFE_INTEGER - 1;
-    case "text":
-      return Number.MAX_SAFE_INTEGER;
-  }
-}
-
-export function sortAnswers(answers: AskAnswer[]): AskAnswer[] {
-  return [...answers].sort((a, b) => answerSortRank(a) - answerSortRank(b));
-}
-

package/extensions/ask-u-questions/results.ts

@@ -1,83 +0,0 @@
-import type { AskAnswer, AskUserQuestionMode, AskUserQuestionResultDetails, AskUserQuestionStatus } from "./types.ts";
-import { isChineseContext } from "./answers.ts";
-
-function formatAnswerForModel(answer: AskAnswer): string {
-  switch (answer.type) {
-    case "text":
-      return answer.label;
-    case "other":
-      return `Other: ${answer.label}`;
-    case "option":
-      return `${answer.index}. ${answer.label}`;
-  }
-}
-
-function buildStructuredResult(
-  status: AskUserQuestionStatus,
-  question: string,
-  mode: AskUserQuestionMode,
-  answers: AskAnswer[],
-  context?: string,
-  message?: string,
-): AskUserQuestionResultDetails {
-  return {
-    status,
-    question,
-    context,
-    mode,
-    answers,
-    message,
-  };
-}
-
-export function cancelledResult(question: string, mode: AskUserQuestionMode, context?: string) {
-  const isZh = isChineseContext(question, undefined, context);
-  const message = isZh ? "用户取消了本次提问" : "User cancelled the question.";
-  return {
-    content: [{ type: "text" as const, text: message }],
-    details: buildStructuredResult("cancelled", question, mode, [], context, message),
-  };
-}
-
-export function unavailableResult(question: string, mode: AskUserQuestionMode, message: string, context?: string) {
-  return {
-    content: [{ type: "text" as const, text: message }],
-    details: buildStructuredResult("unavailable", question, mode, [], context, message),
-  };
-}
-
-export function buildResult(
-  question: string,
-  context: string | undefined,
-  mode: AskUserQuestionMode,
-  answers: AskAnswer[],
-) {
-  const isZh = isChineseContext(question, answers, context);
-  let text: string;
-  if (mode === "text") {
-    const answer = answers[0];
-    if (isZh) {
-      text = answer.label.trim().length > 0
-        ? `用户输入回答: ${answer.label}`
-        : "用户提交了空回答";
-    } else {
-      text = answer.label.trim().length > 0
-        ? `User answered: ${answer.label}`
-        : "User submitted an empty answer";
-    }
-  } else if (mode === "single-select") {
-    text = isZh
-      ? `用户选择项: ${formatAnswerForModel(answers[0])}`
-      : `User selected: ${formatAnswerForModel(answers[0])}`;
-  } else {
-    text = isZh
-      ? `用户选择多项:\n${answers.map((answer) => `- ${formatAnswerForModel(answer)}`).join("\n")}`
-      : `User selected multiple:\n${answers.map((answer) => `- ${formatAnswerForModel(answer)}`).join("\n")}`;
-  }
-
-  return {
-    content: [{ type: "text" as const, text }],
-    details: buildStructuredResult("answered", question, mode, answers, context),
-  };
-}
-

package/extensions/ask-u-questions/schema.ts

@@ -1,17 +0,0 @@
-import { Type } from "typebox";
-
-const OptionSchema = Type.Object({
-  label: Type.String({ description: 'Option label. Put a recommended option first and append "(Recommended)".' }),
-  value: Type.Optional(Type.String({ description: "Machine-readable value; defaults to the label." })),
-  description: Type.Optional(Type.String({ description: "Additional context shown below the option." })),
-});
-
-export const AskUserQuestionParams = Type.Object({
-  question: Type.String({ description: "The question to ask. Ask only one question per call." }),
-  details: Type.Optional(Type.String({ description: "Background or instructions shown below the question." })),
-  options: Type.Optional(Type.Array(OptionSchema, {
-    description: "Choices for selection. Omit or pass an empty array for free-text input. An Other choice is always available.",
-  })),
-  multiSelect: Type.Optional(Type.Boolean({ description: "Allow selecting multiple options when true." })),
-});
-

package/extensions/ask-u-questions/types.ts

@@ -1,45 +0,0 @@
-export interface AskOption {
-  label: string;
-  value: string;
-  description?: string;
-}
-
-export interface DisplayOption extends AskOption {
-  id: string;
-  index?: number;
-  isOther?: boolean;
-  isSubmit?: boolean;
-}
-
-export interface TextAnswer {
-  type: "text";
-  label: string;
-  value: string;
-}
-
-export interface OptionAnswer {
-  type: "option";
-  label: string;
-  value: string;
-  index: number;
-}
-
-export interface OtherAnswer {
-  type: "other";
-  label: string;
-  value: string;
-}
-
-export type AskAnswer = TextAnswer | OptionAnswer | OtherAnswer;
-export type AskUserQuestionStatus = "answered" | "cancelled" | "unavailable";
-export type AskUserQuestionMode = "text" | "single-select" | "multi-select";
-
-export interface AskUserQuestionResultDetails {
-  status: AskUserQuestionStatus;
-  question: string;
-  context?: string;
-  mode: AskUserQuestionMode;
-  answers: AskAnswer[];
-  message?: string;
-}
-

package/extensions/ask-u-questions/ui-lock.ts

@@ -1,24 +0,0 @@
-const SHARED_UI_LOCK_KEY = "__piSharedUiLock";
-function getSharedUiLock(): { withLock<T>(fn: () => T | Promise<T>): Promise<T> } {
-  const g = globalThis as any;
-  if (!g[SHARED_UI_LOCK_KEY]) {
-    let chain: Promise<void> = Promise.resolve();
-    g[SHARED_UI_LOCK_KEY] = {
-      withLock<T>(fn: () => T | Promise<T>): Promise<T> {
-        const prev = chain;
-        let release: () => void;
-        chain = new Promise<void>((r) => {
-          release = r;
-        });
-        return prev.then(fn).finally(() => release!());
-      },
-    };
-  }
-  return g[SHARED_UI_LOCK_KEY];
-}
-const sharedUiLock = getSharedUiLock();
-
-export function withUILock<T>(fn: () => Promise<T>): Promise<T> {
-  return sharedUiLock.withLock(fn);
-}
-