@pikaa-ai/pikaa 0.2.4 → 0.2.5

package/dist/cli.js

@@ -475,6 +475,7 @@ function buildSystemPrompt(params) {
     "- NEVER create temporary scripts, scratch files, or chunk files (e.g. `_tmp_*.ps1`, `_tmp_*.txt`, `split_*.py`) in the workspace to manipulate, split, or read files.",
     "- NEVER execute shell or PowerShell scripts as a workaround for reading, writing, or editing text files.",
     "- Use the `shell` tool ONLY for running tests, build targets, package installations, or checking environment/git status.",
+    "- When user requirements are ambiguous or require architectural decisions, use `request_user_input` or `ask_question` to present 2-4 clear options. Prefix your recommended choice with `(Recommended)` (e.g. `['(Recommended) Option A', 'Option B']`).",
     "- You may be in a dirty git worktree. NEVER revert existing changes made by the user.",
     "- NEVER use destructive commands like `git reset --hard` or `git checkout --`.",
     "- Be concise, direct, and act surgically. Write clean, correct code with minimal necessary modifications."
@@ -644,6 +645,15 @@ async function runTurn(session, turnContext, input) {
                 description,
                 command
               });
+            },
+            requestInput: async (question, options) => {
+              const questionId = `quest_${Date.now()}_${Math.random().toString(36).slice(2, 6)}`;
+              return session.requestUserQuestion({
+                questionId,
+                turnId,
+                question,
+                options
+              });
             }
           });
           const functionOutputItem = {
@@ -815,6 +825,7 @@ class Session {
   status = "idle";
   eventListeners = [];
   pendingApprovals = new Map;
+  pendingUserQuestions = new Map;
   submissionResolvers = [];
   submissionQueue = [];
   isTerminated = false;
@@ -930,6 +941,35 @@ class Session {
       resolver(approved);
     }
   }
+  requestUserQuestion(params) {
+    this.emitEvent({
+      type: "UserQuestionRequired",
+      questionId: params.questionId,
+      turnId: params.turnId,
+      question: params.question,
+      options: params.options
+    });
+    this.emitEvent({
+      type: "StatusChanged",
+      status: "waiting_user_input"
+    });
+    return new Promise((resolve2) => {
+      this.pendingUserQuestions.set(params.questionId, (answer) => {
+        this.emitEvent({
+          type: "StatusChanged",
+          status: "running"
+        });
+        resolve2(answer);
+      });
+    });
+  }
+  resolveUserQuestion(questionId, answer) {
+    const resolver = this.pendingUserQuestions.get(questionId);
+    if (resolver) {
+      this.pendingUserQuestions.delete(questionId);
+      resolver(answer);
+    }
+  }
   async submit(op) {
     const subId = `sub_${Date.now()}_${Math.random().toString(36).slice(2, 6)}`;
     const submission = {
@@ -1256,14 +1296,14 @@ var writeFileTool = {
 // src/tools/handlers/request-user-input.ts
 var requestUserInputTool = {
   name: "request_user_input",
-  description: "Ask the user a clarifying question or present options when instructions are ambiguous.",
+  description: "Ask the user a clarifying question or present multiple-choice options when instructions are ambiguous. You can include recommendations prefixing choices with '(Recommended)'.",
   parameters: {
     type: "object",
     properties: {
       question: { type: "string", description: "The specific question to ask the user." },
       options: {
         type: "array",
-        description: "Optional list of choices for the user to select from.",
+        description: "Optional list of choices for the user to select from (e.g. ['(Recommended) Option A', 'Option B']).",
         items: { type: "string", description: "Choice text" }
       }
     },
@@ -1272,19 +1312,31 @@ var requestUserInputTool = {
   async execute(args, ctx) {
     const question = String(args.question || "");
     const options = Array.isArray(args.options) ? args.options : [];
+    if (ctx.requestInput) {
+      const answer = await ctx.requestInput(question, options);
+      return {
+        output: `User responded: "${answer}"`
+      };
+    }
     if (ctx.requestApproval) {
       const description = options.length > 0 ? `${question}
-Options: ${options.map((o, idx) => `${idx + 1}. ${o}`).join(", ")}` : question;
+Options:
+${options.map((o, idx) => `  [${idx + 1}] ${o}`).join(`
+`)}` : question;
       const answered = await ctx.requestApproval(description);
       return {
         output: answered ? "User confirmed to proceed." : "User declined or requested alternative."
       };
     }
     return {
-      output: `Question sent to user: '${question}'. Waiting for input.`
+      output: `Question presented to user: '${question}' with options [${options.join(", ")}].`
     };
   }
 };
+var askQuestionTool = {
+  ...requestUserInputTool,
+  name: "ask_question"
+};
 // src/search/engine.ts
 import { readdirSync as readdirSync2, readFileSync as readFileSync4, statSync as statSync2, existsSync as existsSync4 } from "fs";
 import { resolve as resolve4, relative, join, extname } from "path";
@@ -1943,6 +1995,7 @@ function createDefaultTools(options = {}) {
   router2.register(writeFileTool);
   router2.register(listDirTool);
   router2.register(requestUserInputTool);
+  router2.register(askQuestionTool);
   for (const tool of createFileSearchTools()) {
     router2.register(tool);
   }
@@ -5399,6 +5452,72 @@ async function promptToolApproval(params) {
   });
   return decision;
 }
+async function promptUserQuestion(params) {
+  const { question, options = [] } = params;
+  const boxWidth = Math.min(process.stdout.columns ?? 80, 75);
+  const border = "\u2500".repeat(Math.max(10, boxWidth - 20));
+  console.log(`
+  ${style.cyan("\u250C\u2500\u2500")} ${style.bold("AI Question")} ${style.cyan(border)}`);
+  const qLines = question.split(`
+`);
+  for (const line of qLines) {
+    console.log(`  ${style.cyan("\u2502")}  ${style.bold(line)}`);
+  }
+  if (options.length > 0) {
+    console.log(`  ${style.cyan("\u2502")}`);
+    options.forEach((opt, idx) => {
+      const numTag = style.cyan(`[${idx + 1}]`);
+      const isRec = opt.includes("(Recommended)") || opt.includes("(recommended)");
+      const optText = isRec ? opt.replace(/\(Recommended\)/i, style.green("(Recommended)")) : opt;
+      console.log(`  ${style.cyan("\u2502")}  ${numTag} ${optText}`);
+    });
+  }
+  console.log(`  ${style.cyan("\u2514" + "\u2500".repeat(Math.max(10, boxWidth - 4)))}
+`);
+  if (!process.stdin.isTTY || false || !process.stdin.readable) {
+    return options[0] || "yes";
+  }
+  return new Promise((resolve13) => {
+    const rl = readline2.createInterface({ input: process.stdin, output: process.stdout });
+    const promptLabel = options.length > 0 ? `Select [1-${options.length}] or type custom response: ` : `Your response: `;
+    rl.question(`  ${style.bold(promptLabel)}`, (answer) => {
+      rl.close();
+      const trimmed = answer.trim();
+      if (!trimmed) {
+        const fallback = options[0] || "";
+        console.log(style.dim(`  \u21B3 Default: ${fallback || "(empty)"}
+`));
+        resolve13(fallback);
+        return;
+      }
+      const num = parseInt(trimmed, 10);
+      if (!isNaN(num) && num >= 1 && num <= options.length) {
+        const picked = options[num - 1];
+        console.log(style.green(`  \u2714 Selected: ${picked}
+`));
+        resolve13(picked);
+        return;
+      }
+      if (options.length === 2) {
+        if (/^(y|yes)$/i.test(trimmed)) {
+          console.log(style.green(`  \u2714 Selected: ${options[0]}
+`));
+          resolve13(options[0]);
+          return;
+        }
+        if (/^(n|no)$/i.test(trimmed)) {
+          console.log(style.green(`  \u2714 Selected: ${options[1]}
+`));
+          resolve13(options[1]);
+          return;
+        }
+      }
+      console.log(style.green(`  \u2714 Answer: ${trimmed}
+`));
+      resolve13(trimmed);
+    });
+  });
+}
 
 // src/cli/ui/markdown.ts
 class MarkdownHighlighter {
@@ -5750,6 +5869,10 @@ class CliRepl {
           this.spinner.stop();
           await this.handleInteractiveApproval(msg);
           break;
+        case "UserQuestionRequired":
+          this.spinner.stop();
+          await this.handleInteractiveUserQuestion(msg);
+          break;
         case "TurnCompleted":
           if (this.reasoningStarted) {
             console.log(style.dim(`
@@ -5828,6 +5951,18 @@ class CliRepl {
       this.session.resolveApproval(msg.approvalId, false);
     }
   }
+  async handleInteractiveUserQuestion(msg) {
+    try {
+      const answer = await promptUserQuestion({
+        question: msg.question,
+        options: msg.options
+      });
+      this.session.resolveUserQuestion(msg.questionId, answer);
+      this.spinner.start(`Processing response and continuing...`);
+    } catch {
+      this.session.resolveUserQuestion(msg.questionId, "");
+    }
+  }
   async start() {
     const creds = new CredentialsStore().load();
     const accountUser = creds?.user?.username || creds?.user?.email || (creds?.accessToken ? "Authenticated" : undefined);
@@ -5967,7 +6102,7 @@ async function main() {
     } else if (arg === "--mcp") {
       mcpConfigFile = args[++i];
     } else if (arg === "--version" || arg === "-v" || arg === "version") {
-      console.log(`pikaa v0.2.4`);
+      console.log(`pikaa v0.2.5`);
       process.exit(0);
     } else if (arg === "--help" || arg === "-h") {
       printCliHelp();

package/dist/index.js

@@ -658,14 +658,14 @@ var writeFileTool = {
 // src/tools/handlers/request-user-input.ts
 var requestUserInputTool = {
   name: "request_user_input",
-  description: "Ask the user a clarifying question or present options when instructions are ambiguous.",
+  description: "Ask the user a clarifying question or present multiple-choice options when instructions are ambiguous. You can include recommendations prefixing choices with '(Recommended)'.",
   parameters: {
     type: "object",
     properties: {
       question: { type: "string", description: "The specific question to ask the user." },
       options: {
         type: "array",
-        description: "Optional list of choices for the user to select from.",
+        description: "Optional list of choices for the user to select from (e.g. ['(Recommended) Option A', 'Option B']).",
         items: { type: "string", description: "Choice text" }
       }
     },
@@ -674,19 +674,31 @@ var requestUserInputTool = {
   async execute(args, ctx) {
     const question = String(args.question || "");
     const options = Array.isArray(args.options) ? args.options : [];
+    if (ctx.requestInput) {
+      const answer = await ctx.requestInput(question, options);
+      return {
+        output: `User responded: "${answer}"`
+      };
+    }
     if (ctx.requestApproval) {
       const description = options.length > 0 ? `${question}
-Options: ${options.map((o, idx) => `${idx + 1}. ${o}`).join(", ")}` : question;
+Options:
+${options.map((o, idx) => `  [${idx + 1}] ${o}`).join(`
+`)}` : question;
       const answered = await ctx.requestApproval(description);
       return {
         output: answered ? "User confirmed to proceed." : "User declined or requested alternative."
       };
     }
     return {
-      output: `Question sent to user: '${question}'. Waiting for input.`
+      output: `Question presented to user: '${question}' with options [${options.join(", ")}].`
     };
   }
 };
+var askQuestionTool = {
+  ...requestUserInputTool,
+  name: "ask_question"
+};
 // src/search/engine.ts
 import { readdirSync as readdirSync2, readFileSync as readFileSync4, statSync as statSync2, existsSync as existsSync4 } from "fs";
 import { resolve as resolve4, relative, join, extname } from "path";
@@ -1345,6 +1357,7 @@ function createDefaultTools(options = {}) {
   router2.register(writeFileTool);
   router2.register(listDirTool);
   router2.register(requestUserInputTool);
+  router2.register(askQuestionTool);
   for (const tool of createFileSearchTools()) {
     router2.register(tool);
   }
@@ -1445,6 +1458,7 @@ function buildSystemPrompt(params) {
     "- NEVER create temporary scripts, scratch files, or chunk files (e.g. `_tmp_*.ps1`, `_tmp_*.txt`, `split_*.py`) in the workspace to manipulate, split, or read files.",
     "- NEVER execute shell or PowerShell scripts as a workaround for reading, writing, or editing text files.",
     "- Use the `shell` tool ONLY for running tests, build targets, package installations, or checking environment/git status.",
+    "- When user requirements are ambiguous or require architectural decisions, use `request_user_input` or `ask_question` to present 2-4 clear options. Prefix your recommended choice with `(Recommended)` (e.g. `['(Recommended) Option A', 'Option B']`).",
     "- You may be in a dirty git worktree. NEVER revert existing changes made by the user.",
     "- NEVER use destructive commands like `git reset --hard` or `git checkout --`.",
     "- Be concise, direct, and act surgically. Write clean, correct code with minimal necessary modifications."
@@ -1672,6 +1686,15 @@ async function runTurn(session, turnContext, input) {
                 description,
                 command
               });
+            },
+            requestInput: async (question, options) => {
+              const questionId = `quest_${Date.now()}_${Math.random().toString(36).slice(2, 6)}`;
+              return session.requestUserQuestion({
+                questionId,
+                turnId,
+                question,
+                options
+              });
             }
           });
           const functionOutputItem = {
@@ -1809,6 +1832,7 @@ class Session {
   status = "idle";
   eventListeners = [];
   pendingApprovals = new Map;
+  pendingUserQuestions = new Map;
   submissionResolvers = [];
   submissionQueue = [];
   isTerminated = false;
@@ -1924,6 +1948,35 @@ class Session {
       resolver(approved);
     }
   }
+  requestUserQuestion(params) {
+    this.emitEvent({
+      type: "UserQuestionRequired",
+      questionId: params.questionId,
+      turnId: params.turnId,
+      question: params.question,
+      options: params.options
+    });
+    this.emitEvent({
+      type: "StatusChanged",
+      status: "waiting_user_input"
+    });
+    return new Promise((resolve6) => {
+      this.pendingUserQuestions.set(params.questionId, (answer) => {
+        this.emitEvent({
+          type: "StatusChanged",
+          status: "running"
+        });
+        resolve6(answer);
+      });
+    });
+  }
+  resolveUserQuestion(questionId, answer) {
+    const resolver = this.pendingUserQuestions.get(questionId);
+    if (resolver) {
+      this.pendingUserQuestions.delete(questionId);
+      resolver(answer);
+    }
+  }
   async submit(op) {
     const subId = `sub_${Date.now()}_${Math.random().toString(36).slice(2, 6)}`;
     const submission = {
@@ -4127,6 +4180,7 @@ export {
   TurnContext,
   WorktreeManager,
   applyPatchTool,
+  askQuestionTool,
   buildSystemPrompt,
   captureWorldState,
   compactHistory,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pikaa-ai/pikaa",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "description": "PIKAA CLI - AI coding agent that runs locally in your terminal.",
   "main": "./dist/index.js",
   "module": "./dist/index.js",