initial impl

Author: jahooma

.agents/base2/base2.ts

@@ -52,6 +52,7 @@ export function createBase2(
       !isFast && 'write_todos',
       'str_replace',
       'write_file',
+      'ask_user',
     ),
     spawnableAgents: buildArray(
       'file-picker',

.agents/types/tools.ts

@@ -3,6 +3,7 @@
  */
 export type ToolName =
   | 'add_message'
+  | 'ask_user'
   | 'code_search'
   | 'end_turn'
   | 'find_files'
@@ -29,6 +30,7 @@ export type ToolName =
  */
 export interface ToolParamsMap {
   add_message: AddMessageParams
+  ask_user: AskUserParams
   code_search: CodeSearchParams
   end_turn: EndTurnParams
   find_files: FindFilesParams
@@ -59,6 +61,19 @@ export interface AddMessageParams {
   content: string
 }
 
+/**
+ * Ask the user multiple choice questions and pause execution until they respond.
+ */
+export interface AskUserParams {
+  /** List of multiple choice questions to ask the user */
+  questions: {
+    /** The question to ask the user */
+    question: string
+    /** Array of answer options for the question (minimum 2) */
+    options: string[]
+  }[]
+}
+
 /**
  * Search for string patterns in the project's files. This tool uses ripgrep (rg), a fast line-oriented search tool. Use this tool only when read_files is not sufficient to find the files you need.
  */
@@ -248,10 +263,10 @@ export interface WriteFileParams {
 }
 
 /**
- * Write a todo list to track tasks. Use this frequently to maintain a step-by-step plan.
+ * Write a todo list to track tasks for multi-step implementations. Use this frequently to maintain an updated step-by-step plan.
  */
 export interface WriteTodosParams {
-  /** List of todos with their completion status. Try to order the todos the same way you will complete them. Do not mark todos as completed if you have not completed them yet! */
+  /** List of todos with their completion status. Add ALL of the applicable tasks to the list, so you don't forget to do anything. Try to order the todos the same way you will complete them. Do not mark todos as completed if you have not completed them yet! */
   todos: {
     /** Description of the task */
     task: string

cli/src/chat.tsx

@@ -19,6 +19,7 @@ import { StatusBar } from './components/status-bar'
 import { SLASH_COMMANDS } from './data/slash-commands'
 import { useAgentValidation } from './hooks/use-agent-validation'
 import { authQueryKeys } from './hooks/use-auth-query'
+import { useAskUserBridge } from './hooks/use-ask-user-bridge'
 import { useChatInput } from './hooks/use-chat-input'
 import { useClipboard } from './hooks/use-clipboard'
 import { useConnectionStatus } from './hooks/use-connection-status'
@@ -113,6 +114,9 @@ export const Chat = ({
 
   const { validate: validateAgents } = useAgentValidation(validationErrors)
 
+  // Subscribe to ask_user bridge to trigger form display
+  useAskUserBridge()
+
   const {
     inputValue,
     cursorPosition,

cli/src/components/blocks/ask-user-branch.tsx

@@ -0,0 +1,63 @@
+import React from 'react'
+import { TextAttributes } from '@opentui/core'
+import { useTheme } from '../../hooks/use-theme'
+import { BORDER_CHARS } from '../../utils/ui-constants'
+import type { AskUserContentBlock } from '../../types/chat'
+
+interface AskUserBranchProps {
+  block: AskUserContentBlock
+  availableWidth: number
+}
+
+export const AskUserBranch = ({ block, availableWidth }: AskUserBranchProps) => {
+  const theme = useTheme()
+
+  return (
+    <box
+      style={{
+        flexDirection: 'column',
+        gap: 0,
+        width: availableWidth,
+        borderStyle: 'single',
+        borderColor: theme.secondary,
+        customBorderChars: BORDER_CHARS,
+        padding: 1,
+        marginTop: 1,
+        marginBottom: 1,
+      }}
+    >
+      {block.skipped ? (
+        <text style={{ fg: theme.muted, attributes: TextAttributes.ITALIC }}>
+          User skipped the questions.
+        </text>
+      ) : (
+        <box style={{ flexDirection: 'column', gap: 1 }}>
+          <text style={{ fg: theme.secondary, attributes: TextAttributes.BOLD }}>
+            User Answers:
+          </text>
+          {block.questions.map((q, idx) => {
+            const answer = block.answers?.find((a) => a.questionIndex === idx)
+            const displayAnswer = answer?.otherText
+              ? `"${answer.otherText}"`
+              : answer?.selectedOption || 'No answer'
+            const isCustomAnswer = !!answer?.otherText
+            return (
+              <box key={idx} style={{ flexDirection: 'column', gap: 0 }}>
+                <text style={{ fg: theme.foreground }}>
+                  {idx + 1}. {q.question}
+                </text>
+                <text style={{
+                  fg: theme.primary,
+                  marginLeft: 2,
+                  attributes: isCustomAnswer ? TextAttributes.ITALIC : undefined,
+                }}>
+                  ↳ {displayAnswer}
+                </text>
+              </box>
+            )
+          })}
+        </box>
+      )}
+    </box>
+  )
+}

cli/src/components/blocks/tool-branch.tsx

@@ -36,6 +36,9 @@ export const ToolBranch = memo(
     if (toolBlock.toolName === 'end_turn') {
       return null
     }
+    if (toolBlock.toolName === 'ask_user') {
+      return null
+    }
     if ('includeToolCall' in toolBlock && toolBlock.includeToolCall === false) {
       return null
     }

cli/src/components/chat-input-bar.tsx

@@ -1,12 +1,14 @@
 import React from 'react'
 import { AgentModeToggle } from './agent-mode-toggle'
 import { FeedbackContainer } from './feedback-container'
+import { MultipleChoiceForm } from './multiple-choice-form'
 import { MultilineInput, type MultilineInputHandle } from './multiline-input'
 import { SuggestionMenu, type SuggestionItem } from './suggestion-menu'
 import { UsageBanner } from './usage-banner'
 import { BORDER_CHARS } from '../utils/ui-constants'
 import { useTheme } from '../hooks/use-theme'
 import { useChatStore } from '../state/chat-store'
+import { useAskUserBridge } from '../hooks/use-ask-user-bridge'
 import type { AgentMode } from '../utils/constants'
 import type { InputValue } from '../state/chat-store'
 
@@ -84,6 +86,11 @@ export const ChatInputBar = ({
 }: ChatInputBarProps) => {
   const isBashMode = useChatStore((state) => state.isBashMode)
   const setBashMode = useChatStore((state) => state.setBashMode)
+  const askUserState = useChatStore((state) => state.askUserState)
+  const updateAskUserAnswer = useChatStore((state) => state.updateAskUserAnswer)
+  const updateAskUserOtherText = useChatStore((state) => state.updateAskUserOtherText)
+  const { submitAnswers, skip } = useAskUserBridge()
+
   if (feedbackMode) {
     return (
       <FeedbackContainer
@@ -115,12 +122,66 @@ export const ChatInputBar = ({
     setInputValue(value)
   }
 
+  const handleFormSubmit = (finalAnswers?: number[], finalOtherTexts?: string[]) => {
+    console.log('[ChatInputBar] handleFormSubmit called', { askUserState, finalAnswers, finalOtherTexts })
+    if (!askUserState) return
+
+    // Use final values if provided (for immediate submission), otherwise use current state
+    const answersToUse = finalAnswers || askUserState.selectedAnswers
+    const otherTextsToUse = finalOtherTexts || askUserState.otherTexts
+
+    const answers = askUserState.questions.map((q, idx) => {
+      const otherText = otherTextsToUse[idx]?.trim()
+      if (otherText) {
+        // User provided custom text
+        return {
+          questionIndex: idx,
+          otherText,
+        }
+      } else {
+        // User selected an option
+        return {
+          questionIndex: idx,
+          selectedOption: q.options[answersToUse[idx]],
+        }
+      }
+    })
+    console.log('[ChatInputBar] Submitting answers', { answers })
+    submitAnswers(answers)
+  }
+
   // Adjust input width for bash mode (subtract 2 for '!' column)
   const adjustedInputWidth = isBashMode ? inputWidth - 2 : inputWidth
   const effectivePlaceholder = isBashMode
     ? 'Enter bash command...'
     : inputPlaceholder
 
+  if (askUserState) {
+    return (
+      <box
+        title=" Action Required "
+        titleAlignment="center"
+        style={{
+          width: '100%',
+          borderStyle: 'single',
+          borderColor: theme.primary,
+          customBorderChars: BORDER_CHARS,
+        }}
+      >
+        <MultipleChoiceForm
+          questions={askUserState.questions}
+          selectedAnswers={askUserState.selectedAnswers}
+          otherTexts={askUserState.otherTexts}
+          onSelectAnswer={updateAskUserAnswer}
+          onOtherTextChange={updateAskUserOtherText}
+          onSubmit={handleFormSubmit}
+          onSkip={skip}
+          width={inputWidth}
+        />
+      </box>
+    )
+  }
+
   return (
     <>
       <box

cli/src/components/message-block.tsx

@@ -16,7 +16,7 @@ import {
   selectHasSubmittedFeedback,
   selectMessageFeedbackCategory,
 } from '../state/feedback-store'
-import { isTextBlock, isToolBlock } from '../types/chat'
+import { isTextBlock } from '../types/chat'
 import { shouldRenderAsSimpleText } from '../utils/constants'
 import {
   isImplementorAgent,
@@ -28,6 +28,7 @@ import { AgentListBranch } from './blocks/agent-list-branch'
 import { ContentWithMarkdown } from './blocks/content-with-markdown'
 import { ThinkingBlock } from './blocks/thinking-block'
 import { ToolBranch } from './blocks/tool-branch'
+import { AskUserBranch } from './blocks/ask-user-branch'
 import { PlanBox } from './renderers/plan-box'
 
 import type {
@@ -36,6 +37,7 @@ import type {
   HtmlContentBlock,
   AgentContentBlock,
 } from '../types/chat'
+import { isAskUserBlock, isToolBlock } from '../types/chat'
 import type { ThemeColor } from '../types/theme-system'
 
 interface MessageBlockProps {
@@ -434,6 +436,7 @@ const isRenderableTimelineBlock = (
     case 'agent-list':
     case 'plan':
     case 'mode-divider':
+    case 'ask-user':
       return true
     default:
       return false
@@ -1050,6 +1053,16 @@ const SingleBlock = memo(
         return null
       }
 
+      case 'ask-user': {
+        return (
+          <AskUserBranch
+            key={`${messageId}-ask-user-${idx}`}
+            block={block}
+            availableWidth={availableWidth}
+          />
+        )
+      }
+
       case 'agent': {
         return (
           <AgentBranchWrapper