wiggum-cli 0.14.0 → 0.15.0

package/dist/templates/scripts/feature-loop.sh.tmpl

@@ -6,8 +6,8 @@
 # Options:
 #   --worktree           Use git worktree for isolation (enables parallel execution)
 #   --resume             Resume an interrupted loop (reuses existing branch/worktree)
-#   --model MODEL        Claude model to use (e.g., opus, sonnet, claude-sonnet-4-5-20250514)
-#   --review-mode MODE   Review mode: 'manual' (stop at PR) or 'auto' (review + merge). Default: 'manual'
+#   --model MODEL        Claude model to use (e.g., opus, sonnet, claude-sonnet-4-5-20250929)
+#   --review-mode MODE   Review mode: 'manual' (stop at PR), 'auto' (review, no merge), or 'merge' (review + merge). Default: 'manual'
 
 set -e
 set -o pipefail
@@ -91,8 +91,8 @@ if [ -z "$REVIEW_MODE" ]; then
 fi
 
 # Validate review mode
-if [ "$REVIEW_MODE" != "manual" ] && [ "$REVIEW_MODE" != "auto" ]; then
-    echo "ERROR: Invalid review mode: '$REVIEW_MODE'. Allowed values are 'manual' or 'auto'." >&2
+if [ "$REVIEW_MODE" != "manual" ] && [ "$REVIEW_MODE" != "auto" ] && [ "$REVIEW_MODE" != "merge" ]; then
+    echo "ERROR: Invalid review mode: '$REVIEW_MODE'. Allowed values are 'manual', 'auto', or 'merge'." >&2
     exit 1
 fi
 
@@ -138,6 +138,68 @@ parse_and_accumulate_tokens() {
     echo "${new_input}|${new_output}" > "$TOKENS_FILE"
 }
 
+# Action inbox: write request file if not already present
+write_action_request() {
+    local action_file="/tmp/ralph-loop-${FEATURE}.action.json"
+    if [ -f "$action_file" ]; then
+        echo "WARNING: Action request file already exists, skipping write: $action_file" >&2
+        return 0
+    fi
+    cat > "$action_file" << 'EOF'
+{
+  "id": "post_pr_choice",
+  "prompt": "Loop complete. What would you like to do?",
+  "choices": [
+    {"id": "done", "label": "Done — end loop"},
+    {"id": "merge_local", "label": "Merge back to main locally"},
+    {"id": "keep_branch", "label": "Keep branch as-is"},
+    {"id": "discard", "label": "Discard this work"}
+  ],
+  "default": "done"
+}
+EOF
+    echo "Action request written: $action_file"
+}
+
+# Action inbox: poll for reply file, fallback to default after 15 minutes
+poll_action_reply() {
+    local action_file="/tmp/ralph-loop-${FEATURE}.action.json"
+    local reply_file="/tmp/ralph-loop-${FEATURE}.action.reply.json"
+    local default_choice="keep_branch"
+    local timeout=900  # 15 minutes in seconds
+    local elapsed=0
+
+    # Read default from action file if present
+    if [ -f "$action_file" ]; then
+        local parsed_default
+        parsed_default=$(node -e "try { const d=require('fs').readFileSync(process.argv[1],'utf8'); console.log(JSON.parse(d).default||'keep_branch'); } catch(e) { console.log('keep_branch'); }" "$action_file" 2>/dev/null || echo "keep_branch")
+        if [ -n "$parsed_default" ]; then
+            default_choice="$parsed_default"
+        fi
+    fi
+
+    while [ $elapsed -lt $timeout ]; do
+        if [ -f "$reply_file" ]; then
+            local choice
+            choice=$(node -e "try { const d=require('fs').readFileSync(process.argv[1],'utf8'); console.log(JSON.parse(d).choice||''); } catch(e) { console.log(''); }" "$reply_file" 2>/dev/null || echo "")
+            if [ -n "$choice" ]; then
+                echo "User selected: $choice" >&2
+                # Cleanup both files
+                rm -f "$action_file" "$reply_file" 2>/dev/null || true
+                echo "$choice"
+                return 0
+            fi
+        fi
+        sleep 1
+        elapsed=$((elapsed + 1))
+    done
+
+    # Timeout: use default
+    echo "Action reply timeout after ${timeout}s, using default: $default_choice" >&2
+    rm -f "$action_file" "$reply_file" 2>/dev/null || true
+    echo "$default_choice"
+}
+
 # Initialize tokens
 init_tokens
 
@@ -343,18 +405,106 @@ echo "======================== PR & REVIEW PHASE ========================"
 write_phase_start "pr_review"
 export FEATURE APP_DIR SPEC_DIR PROMPTS_DIR
 PR_STATUS="success"
+MAX_REVIEW_ATTEMPTS=3
+
 if [ "$REVIEW_MODE" = "manual" ]; then
     if ! cat "$PROMPTS_DIR/PROMPT_review_manual.md" | envsubst | $CLAUDE_CMD_OPUS 2>&1 | tee "$CLAUDE_OUTPUT"; then
         PR_STATUS="failed"
     fi
-else
-    if ! cat "$PROMPTS_DIR/PROMPT_review_auto.md" | envsubst | $CLAUDE_CMD_OPUS 2>&1 | tee "$CLAUDE_OUTPUT"; then
+    parse_and_accumulate_tokens "$CLAUDE_OUTPUT"
+
+elif [ "$REVIEW_MODE" = "merge" ]; then
+    # Merge mode: create PR, iterate review+fixes until approved, then merge
+    REVIEW_ATTEMPT=0
+    REVIEW_APPROVED=false
+    while [ $REVIEW_ATTEMPT -lt $MAX_REVIEW_ATTEMPTS ]; do
+        REVIEW_ATTEMPT=$((REVIEW_ATTEMPT + 1))
+        echo "--- Review attempt $REVIEW_ATTEMPT of $MAX_REVIEW_ATTEMPTS ---"
+        cat "$PROMPTS_DIR/PROMPT_review_merge.md" | envsubst | $CLAUDE_CMD_OPUS 2>&1 | tee "$CLAUDE_OUTPUT" || true
+        parse_and_accumulate_tokens "$CLAUDE_OUTPUT"
+
+        # Check if output contains APPROVED
+        if grep -qi "APPROVED" "$CLAUDE_OUTPUT" 2>/dev/null; then
+            echo "Review approved!"
+            REVIEW_APPROVED=true
+            break
+        fi
+
+        if [ $REVIEW_ATTEMPT -lt $MAX_REVIEW_ATTEMPTS ]; then
+            echo "Review found issues. Running fix iteration..."
+            echo "Fix the issues found in the code review above. Run git diff main to see the current changes, then:
+1. Fix each issue referenced in the review
+2. Run tests: npm test
+3. Commit and push the fixes
+Do NOT propose completion options or ask interactive questions. Just fix, test, commit, push." | $CLAUDE_CMD_IMPL 2>&1 | tee "$CLAUDE_OUTPUT" || true
+            parse_and_accumulate_tokens "$CLAUDE_OUTPUT"
+        fi
+    done
+    if [ "$REVIEW_APPROVED" != true ]; then
+        echo "Review not approved after $MAX_REVIEW_ATTEMPTS attempts."
         PR_STATUS="failed"
     fi
+
+else
+    # Auto mode: create PR, iterate review+fixes until approved (no merge)
+    REVIEW_ATTEMPT=0
+    REVIEW_APPROVED=false
+    while [ $REVIEW_ATTEMPT -lt $MAX_REVIEW_ATTEMPTS ]; do
+        REVIEW_ATTEMPT=$((REVIEW_ATTEMPT + 1))
+        echo "--- Review attempt $REVIEW_ATTEMPT of $MAX_REVIEW_ATTEMPTS ---"
+        cat "$PROMPTS_DIR/PROMPT_review_auto.md" | envsubst | $CLAUDE_CMD_OPUS 2>&1 | tee "$CLAUDE_OUTPUT" || true
+        parse_and_accumulate_tokens "$CLAUDE_OUTPUT"
+
+        # Check if output contains APPROVED
+        if grep -qi "APPROVED" "$CLAUDE_OUTPUT" 2>/dev/null; then
+            echo "Review approved!"
+            REVIEW_APPROVED=true
+            break
+        fi
+
+        if [ $REVIEW_ATTEMPT -lt $MAX_REVIEW_ATTEMPTS ]; then
+            echo "Review found issues. Running fix iteration..."
+            echo "Fix the issues found in the code review above. Run git diff main to see the current changes, then:
+1. Fix each issue referenced in the review
+2. Run tests: npm test
+3. Commit and push the fixes
+Do NOT propose completion options or ask interactive questions. Just fix, test, commit, push." | $CLAUDE_CMD_IMPL 2>&1 | tee "$CLAUDE_OUTPUT" || true
+            parse_and_accumulate_tokens "$CLAUDE_OUTPUT"
+        fi
+    done
+    if [ "$REVIEW_APPROVED" != true ]; then
+        echo "Review not approved after $MAX_REVIEW_ATTEMPTS attempts. PR ready for manual review."
+    fi
 fi
-parse_and_accumulate_tokens "$CLAUDE_OUTPUT"
 write_phase_end "pr_review" "$PR_STATUS"
 
+# Phase 7.5: Post-completion action request
+echo "======================== ACTION REQUEST PHASE ========================"
+write_action_request
+CHOSEN_ACTION=$(poll_action_reply)
+echo "User chose: $CHOSEN_ACTION"
+
+# Dispatch based on user choice
+case "$CHOSEN_ACTION" in
+    done)
+        echo "Loop complete. Exiting."
+        ;;
+    merge_local)
+        echo "Merging back to main locally..."
+        git checkout main 2>/dev/null || git checkout master
+        git merge --squash "$BRANCH" && git commit -m "feat($FEATURE): squash merge from $BRANCH"
+        echo "Merged. You can delete the branch with: git branch -D $BRANCH"
+        ;;
+    discard)
+        echo "Discarding work on branch $BRANCH..."
+        git checkout main 2>/dev/null || git checkout master
+        git branch -D "$BRANCH" 2>/dev/null || echo "Branch $BRANCH not found locally."
+        ;;
+    keep_branch|*)
+        echo "Keeping branch $BRANCH as-is."
+        ;;
+esac
+
 # Persist final status for TUI summaries
 if ! echo "$ITERATION|$MAX_ITERATIONS|$(date +%s)|done" > "$FINAL_STATUS_FILE"; then
     echo "WARNING: Failed to write final status file: $FINAL_STATUS_FILE" >&2

package/dist/tui/app.js

@@ -14,6 +14,7 @@ import { Box, Text, render, useStdout } from 'ink';
 import { existsSync, mkdirSync, writeFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { loadConfigWithDefaults } from '../utils/config.js';
+import { listSpecNames } from '../utils/spec-names.js';
 import { logger } from '../utils/logger.js';
 import { InterviewScreen } from './screens/InterviewScreen.js';
 import { InitScreen } from './screens/InitScreen.js';
@@ -65,6 +66,14 @@ interviewProps, onComplete, onExit, }) {
                     }
                     savedPath = join(specsDir, `${featureName}.md`);
                     writeFileSync(savedPath, spec, 'utf-8');
+                    // Refresh spec name cache so the new spec shows in /run autocomplete
+                    try {
+                        const updatedSpecNames = await listSpecNames(specsDir);
+                        setSessionState((prev) => ({ ...prev, specNames: updatedSpecNames }));
+                    }
+                    catch {
+                        // Non-critical: autocomplete will update on next restart
+                    }
                     onComplete?.(savedPath);
                 }
                 catch (err) {
@@ -117,8 +126,17 @@ interviewProps, onComplete, onExit, }) {
     /**
      * Handle init completion - update state and navigate to shell
      */
-    const handleInitComplete = useCallback((newState, generatedFiles) => {
-        setSessionState(newState);
+    const handleInitComplete = useCallback(async (newState, generatedFiles) => {
+        // Refresh spec names after init (config may have changed)
+        let specNames = [];
+        try {
+            const specsDir = join(newState.projectRoot, newState.config?.paths.specs ?? '.ralph/specs');
+            specNames = await listSpecNames(specsDir);
+        }
+        catch {
+            // Non-critical: autocomplete will work without spec names
+        }
+        setSessionState({ ...newState, specNames });
         const fileCount = generatedFiles?.length ?? 0;
         const msg = fileCount > 0
             ? `\u2713 Initialization complete. Generated ${fileCount} configuration file${fileCount === 1 ? '' : 's'}.`

package/dist/tui/components/ChatInput.d.ts

@@ -30,6 +30,8 @@ export interface ChatInputProps {
     commands?: Command[];
     /** Called when a slash command is selected */
     onCommand?: (command: string) => void;
+    /** Spec suggestions for /run argument autocomplete */
+    specSuggestions?: Command[];
 }
 /**
  * ChatInput component
@@ -61,4 +63,4 @@ export interface ChatInputProps {
  * // Renders: › Type your message...
  * ```
  */
-export declare function ChatInput({ onSubmit, placeholder, disabled, allowEmpty, commands, onCommand, }: ChatInputProps): React.ReactElement;
+export declare function ChatInput({ onSubmit, placeholder, disabled, allowEmpty, commands, onCommand, specSuggestions, }: ChatInputProps): React.ReactElement;

package/dist/tui/components/ChatInput.js

@@ -19,6 +19,7 @@ import { theme } from '../theme.js';
 import { CommandDropdown, DEFAULT_COMMANDS } from './CommandDropdown.js';
 import { useCommandHistory } from '../hooks/useCommandHistory.js';
 import { normalizePastedText, insertTextAtCursor, deleteCharBefore, deleteWordBefore, moveCursorByWordLeft, moveCursorByWordRight, } from '../utils/input-utils.js';
+const RUN_PREFIX = '/run ';
 /**
  * ChatInput component
  *
@@ -49,7 +50,7 @@ import { normalizePastedText, insertTextAtCursor, deleteCharBefore, deleteWordBe
  * // Renders: › Type your message...
  * ```
  */
-export function ChatInput({ onSubmit, placeholder = 'Type your message...', disabled = false, allowEmpty = false, commands = DEFAULT_COMMANDS, onCommand, }) {
+export function ChatInput({ onSubmit, placeholder = 'Type your message...', disabled = false, allowEmpty = false, commands = DEFAULT_COMMANDS, onCommand, specSuggestions, }) {
     const [value, setValue] = useState('');
     const [cursorOffset, setCursorOffset] = useState(0);
     const [showDropdown, setShowDropdown] = useState(false);
@@ -61,6 +62,12 @@ export function ChatInput({ onSubmit, placeholder = 'Type your message...', disa
     const hasSpace = value.includes(' ');
     // Only filter on the command name part (before the first space)
     const commandFilter = isSlashCommand ? value.slice(1).split(' ')[0] : '';
+    // Detect "/run " argument autocomplete mode
+    const isRunArgMode = specSuggestions !== undefined &&
+        specSuggestions.length > 0 &&
+        value.startsWith(RUN_PREFIX);
+    // The text the user has typed after "/run "
+    const runArgFilter = isRunArgMode ? value.slice(RUN_PREFIX.length) : '';
     // Store draft input when starting history navigation
     const draftRef = useRef('');
     const clampCursor = useCallback((nextValue, nextCursor) => {
@@ -77,13 +84,17 @@ export function ChatInput({ onSubmit, placeholder = 'Type your message...', disa
         if (!fromHistory) {
             resetNavigation();
         }
-        if (nextValue.startsWith('/') && !nextValue.includes(' ')) {
+        const isCommandMode = nextValue.startsWith('/') && !nextValue.includes(' ');
+        const isRunArgModeNext = specSuggestions !== undefined &&
+            specSuggestions.length > 0 &&
+            nextValue.startsWith('/run ');
+        if (isCommandMode || isRunArgModeNext) {
             setShowDropdown(true);
         }
         else {
             setShowDropdown(false);
         }
-    }, [clampCursor, resetNavigation]);
+    }, [clampCursor, resetNavigation, specSuggestions]);
     const handleEscapeSequence = useCallback((input) => {
         const seq = input;
         if (seq === '\u001bb' || seq === '\u001b[1;3D') {
@@ -254,6 +265,14 @@ export function ChatInput({ onSubmit, placeholder = 'Type your message...', disa
         updateValue('', 0, true);
         setShowDropdown(false);
     }, [onCommand, onSubmit, addToHistory, updateValue]);
+    /**
+     * Handle spec selection from /run argument dropdown
+     */
+    const handleSpecSelect = useCallback((specName) => {
+        const newValue = `/run ${specName}`;
+        updateValue(newValue, newValue.length, true);
+        setShowDropdown(false);
+    }, [updateValue]);
     /**
      * Handle dropdown cancel
      */
@@ -268,5 +287,5 @@ export function ChatInput({ onSubmit, placeholder = 'Type your message...', disa
     const rightText = value.slice(cursorOffset);
     const cursorChar = rightText ? rightText[0] : ' ';
     const remainder = rightText ? rightText.slice(1) : '';
-    return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { flexDirection: "row", children: [_jsxs(Text, { color: theme.colors.prompt, bold: true, children: [theme.chars.prompt, ' '] }), value.length === 0 ? (_jsxs(Box, { flexDirection: "row", children: [_jsx(Text, { inverse: true, children: ' ' }), _jsx(Text, { dimColor: true, children: placeholder })] })) : (_jsxs(Box, { flexDirection: "row", children: [_jsx(Text, { children: leftText }), _jsx(Text, { inverse: true, children: cursorChar }), _jsx(Text, { children: remainder })] }))] }), showDropdown && isSlashCommand && !hasSpace && (_jsx(CommandDropdown, { commands: commands, filter: commandFilter, onSelect: handleCommandSelect, onCancel: handleDropdownCancel }))] }));
+    return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { flexDirection: "row", children: [_jsxs(Text, { color: theme.colors.prompt, bold: true, children: [theme.chars.prompt, ' '] }), value.length === 0 ? (_jsxs(Box, { flexDirection: "row", children: [_jsx(Text, { inverse: true, children: ' ' }), _jsx(Text, { dimColor: true, children: placeholder })] })) : (_jsxs(Box, { flexDirection: "row", children: [_jsx(Text, { children: leftText }), _jsx(Text, { inverse: true, children: cursorChar }), _jsx(Text, { children: remainder })] }))] }), showDropdown && isRunArgMode && specSuggestions && (_jsx(CommandDropdown, { commands: specSuggestions, filter: runArgFilter, onSelect: handleSpecSelect, onCancel: handleDropdownCancel, itemPrefix: "" })), showDropdown && isSlashCommand && !hasSpace && !isRunArgMode && (_jsx(CommandDropdown, { commands: commands, filter: commandFilter, onSelect: handleCommandSelect, onCancel: handleDropdownCancel }))] }));
 }

package/dist/tui/components/CommandDropdown.d.ts

@@ -27,6 +27,8 @@ export interface CommandDropdownProps {
     onSelect: (command: string) => void;
     /** Called when dropdown is dismissed (Escape) */
     onCancel: () => void;
+    /** Prefix displayed before each item name (default: '/') */
+    itemPrefix?: string;
 }
 /**
  * CommandDropdown component
@@ -47,7 +49,7 @@ export interface CommandDropdownProps {
  * />
  * ```
  */
-export declare function CommandDropdown({ commands, filter, onSelect, onCancel, }: CommandDropdownProps): React.ReactElement;
+export declare function CommandDropdown({ commands, filter, onSelect, onCancel, itemPrefix, }: CommandDropdownProps): React.ReactElement;
 /**
  * Default commands available in wiggum
  */

package/dist/tui/components/CommandDropdown.js

@@ -9,11 +9,14 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React, { useState } from 'react';
 import { Box, Text, useInput } from 'ink';
 import { colors, box } from '../theme.js';
+import { fuzzyMatch } from '../../utils/fuzzy-match.js';
 /**
  * Calculate the max width needed for command names
  */
-function getMaxCommandWidth(commands) {
-    return Math.max(...commands.map((cmd) => cmd.name.length + 1)); // +1 for the /
+function getMaxCommandWidth(commands, prefix) {
+    if (commands.length === 0)
+        return 0;
+    return Math.max(...commands.map((cmd) => cmd.name.length + prefix.length));
 }
 /**
  * CommandDropdown component
@@ -34,12 +37,12 @@ function getMaxCommandWidth(commands) {
  * />
  * ```
  */
-export function CommandDropdown({ commands, filter, onSelect, onCancel, }) {
+export function CommandDropdown({ commands, filter, onSelect, onCancel, itemPrefix = '/', }) {
     const [selectedIndex, setSelectedIndex] = useState(0);
-    // Filter commands based on input
-    const filteredCommands = commands.filter((cmd) => cmd.name.toLowerCase().includes(filter.toLowerCase()));
+    // Filter commands based on input using fuzzy matching
+    const filteredCommands = commands.filter((cmd) => fuzzyMatch(filter, cmd.name));
     // Calculate column widths for alignment
-    const maxCmdWidth = getMaxCommandWidth(filteredCommands);
+    const maxCmdWidth = getMaxCommandWidth(filteredCommands, itemPrefix);
     // Handle keyboard input
     useInput((input, key) => {
         if (key.escape) {
@@ -72,7 +75,7 @@ export function CommandDropdown({ commands, filter, onSelect, onCancel, }) {
     const bottomBorder = box.bottomLeft + box.horizontal.repeat(contentWidth) + box.bottomRight;
     return (_jsxs(Box, { flexDirection: "column", marginLeft: 2, marginTop: 1, children: [_jsx(Text, { dimColor: true, children: topBorder }), filteredCommands.map((cmd, index) => {
                 const isSelected = index === selectedIndex;
-                const cmdText = `/${cmd.name}`;
+                const cmdText = `${itemPrefix}${cmd.name}`;
                 const padding = ' '.repeat(Math.max(0, maxCmdWidth - cmdText.length + 2));
                 return (_jsxs(Box, { flexDirection: "row", children: [_jsx(Text, { dimColor: true, children: box.vertical }), _jsxs(Text, { backgroundColor: isSelected ? colors.yellow : undefined, color: isSelected ? colors.brown : colors.yellow, children: [' ', cmdText] }), _jsx(Text, { children: padding }), _jsx(Text, { backgroundColor: isSelected ? colors.yellow : undefined, color: isSelected ? colors.brown : undefined, dimColor: !isSelected, children: cmd.description }), _jsx(Text, { children: ' '.repeat(Math.max(0, contentWidth - cmdText.length - padding.length - cmd.description.length - 1)) }), _jsx(Text, { dimColor: true, children: box.vertical })] }, cmd.name));
             }), _jsx(Text, { dimColor: true, children: bottomBorder })] }));

package/dist/tui/components/SpecCompletionSummary.d.ts

@@ -20,7 +20,7 @@ export interface SpecCompletionSummaryProps {
     /** Conversation messages from the interview */
     messages: Message[];
 }
-/** Strip filler prefixes ('you want', 'understood', 'got it') from AI recap text and capitalize. */
+/** Strip filler prefixes from AI recap text and capitalize. */
 export declare function normalizeRecap(text: string): string;
 /** Strip user speech filler and normalize decision text: add trailing period if missing, capitalize. */
 export declare function normalizeUserDecision(text: string): string;
@@ -31,7 +31,8 @@ export declare function isUsefulDecision(entry: string): boolean;
 /**
  * Extract goal and key decisions from conversation messages.
  *
- * @returns `goalCandidate` — a one-line summary of the feature goal, and
+ * @returns `goalCandidate` — a one-line summary of the feature goal (polished
+ *          via selectGoalSource + polishGoalSentence), and
  *          `decisions` — up to 4 key decisions extracted from the conversation.
  */
 export declare function extractRecap(messages: Message[], featureName: string): {

package/dist/tui/components/SpecCompletionSummary.js

@@ -3,14 +3,26 @@ import { Box, Text } from 'ink';
 import { StatusLine } from './StatusLine.js';
 import { colors, theme } from '../theme.js';
 import { PHASE_CONFIGS } from '../hooks/useSpecGenerator.js';
+import { selectGoalSource, polishGoalSentence } from '../utils/polishGoal.js';
 const MAX_RECAP_SOURCE_LENGTH = 1200;
-/** Strip filler prefixes ('you want', 'understood', 'got it') from AI recap text and capitalize. */
+/** Strip filler prefixes from AI recap text and capitalize. */
 export function normalizeRecap(text) {
     let result = text.trim();
     result = result.replace(/^[^a-z0-9]+/i, '');
     result = result.replace(/^you want\s*/i, '');
+    result = result.replace(/^you're\s+\w+ing\s+to\s*/i, '');
+    result = result.replace(/^you'd like to\s*/i, '');
+    result = result.replace(/^you need to\s*/i, '');
+    result = result.replace(/^you would like to\s*/i, '');
     result = result.replace(/^understood[:,]?\s*/i, '');
     result = result.replace(/^got it[-\u2014:]*\s*/i, '');
+    result = result.replace(/^i understand\s*(that\s*)?/i, '');
+    result = result.replace(/^so you\s*/i, '');
+    result = result.replace(/^to summarize[:,]?\s*/i, '');
+    result = result.replace(/^in summary[:,]?\s*/i, '');
+    result = result.replace(/^here'?s what I understand[:,]?\s*/i, '');
+    if (!result)
+        return text.trim();
     return result.charAt(0).toUpperCase() + result.slice(1);
 }
 /** Strip user speech filler and normalize decision text: add trailing period if missing, capitalize. */
@@ -48,7 +60,8 @@ export function isUsefulDecision(entry) {
 /**
  * Extract goal and key decisions from conversation messages.
  *
- * @returns `goalCandidate` — a one-line summary of the feature goal, and
+ * @returns `goalCandidate` — a one-line summary of the feature goal (polished
+ *          via selectGoalSource + polishGoalSentence), and
  *          `decisions` — up to 4 key decisions extracted from the conversation.
  */
 export function extractRecap(messages, featureName) {
@@ -64,14 +77,18 @@ export function extractRecap(messages, featureName) {
         .filter((para) => para.length > 0 && para.length <= 320);
     const recapCandidates = assistantParagraphs
         .map((para) => para.replace(/^[^a-z0-9]+/i, '').trim())
-        .filter((para) => /^(you want|understood|got it)/i.test(para))
+        .filter((para) => /^(you want|you're\s+\w+ing\s+to|you'd like|you need|you would like|understood|got it|i understand|so you|to summarize|in summary|here'?s what)/i.test(para))
         .map((para) => para.split(/next question:/i)[0].trim())
         .filter((para) => para.length > 0);
-    const goalCandidate = recapCandidates.length > 0
-        ? normalizeRecap(recapCandidates[0])
-        : (nonUrlUserMessages.find((content) => content.length > 20)
-            ? normalizeUserDecision(nonUrlUserMessages.find((content) => content.length > 20))
-            : (nonUrlUserMessages[0] ? normalizeUserDecision(nonUrlUserMessages[0]) : `Define "${featureName}"`));
+    // Build structured inputs for the goal-source selector
+    const aiRecap = recapCandidates.length > 0 ? normalizeRecap(recapCandidates[0]) : '';
+    const keyDecisions = recapCandidates.length > 1
+        ? recapCandidates.slice(1).map((c) => normalizeRecap(c)).filter(isUsefulDecision)
+        : [];
+    const firstSubstantialUserMessage = nonUrlUserMessages.find((content) => content.length > 20) ?? nonUrlUserMessages[0] ?? `Define "${featureName}"`;
+    const userRequest = normalizeUserDecision(firstSubstantialUserMessage);
+    const { text: goalSourceText } = selectGoalSource({ aiRecap, keyDecisions, userRequest });
+    const goalCandidate = polishGoalSentence(goalSourceText);
     const decisions = [];
     const seen = new Set();
     if (recapCandidates.length > 1) {
@@ -120,5 +137,5 @@ export function SpecCompletionSummary({ featureName, spec, specPath, messages, }
     const previewLines = specLines.slice(0, 5);
     const remainingLines = Math.max(0, totalLines - 5);
     const { goalCandidate, decisions } = extractRecap(messages, featureName);
-    return (_jsxs(Box, { flexDirection: "column", marginY: 1, children: [_jsx(StatusLine, { action: "New Spec", phase: `Complete (${PHASE_CONFIGS.complete.number}/${PHASE_CONFIGS.complete.number})`, path: featureName }), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsx(Text, { bold: true, children: "Summary" }), _jsxs(Text, { children: ["- Goal: ", summarizeText(goalCandidate)] }), _jsxs(Text, { children: ["- Outcome: Spec written to ", specPath || `${featureName}.md`, " (", totalLines, " lines)"] })] }), decisions.length > 0 && (_jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsx(Text, { bold: true, children: "Key decisions" }), decisions.map((decision, idx) => (_jsxs(Text, { children: [idx + 1, ". ", summarizeText(decision, 120)] }, `${decision}-${idx}`)))] })), _jsxs(Box, { marginTop: 1, flexDirection: "row", children: [_jsxs(Text, { color: colors.green, children: [theme.chars.bullet, " "] }), _jsx(Text, { bold: true, children: "Write" }), _jsxs(Text, { dimColor: true, children: ["(", specPath || `${featureName}.md`, ")"] })] }), _jsx(Box, { marginLeft: 2, children: _jsxs(Text, { dimColor: true, children: [theme.chars.lineEnd, " Wrote ", totalLines, " lines"] }) }), _jsxs(Box, { marginLeft: 4, flexDirection: "column", children: [previewLines.map((line, i) => (_jsxs(Box, { flexDirection: "row", children: [_jsxs(Text, { dimColor: true, children: [String(i + 1).padStart(4), " "] }), _jsx(Text, { dimColor: true, children: line })] }, i))), remainingLines > 0 && (_jsxs(Text, { dimColor: true, children: ['\u2026', " +", remainingLines, " lines"] }))] }), _jsxs(Box, { marginTop: 1, flexDirection: "row", children: [_jsxs(Text, { color: colors.green, children: [theme.chars.bullet, " "] }), _jsx(Text, { children: "Done. Specification generated successfully." })] }), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsx(Text, { bold: true, children: "What's next:" }), _jsxs(Box, { flexDirection: "row", gap: 1, children: [_jsx(Text, { color: colors.green, children: theme.chars.prompt }), _jsx(Text, { dimColor: true, children: "Review the spec in your editor" })] }), _jsxs(Box, { flexDirection: "row", gap: 1, children: [_jsx(Text, { color: colors.green, children: theme.chars.prompt }), _jsx(Text, { color: colors.blue, children: "/help" }), _jsx(Text, { dimColor: true, children: "See all commands" })] })] }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: "Press Enter or Esc to return to shell" }) })] }));
+    return (_jsxs(Box, { flexDirection: "column", marginY: 1, children: [_jsx(StatusLine, { action: "New Spec", phase: `Complete (${PHASE_CONFIGS.complete.number}/${PHASE_CONFIGS.complete.number})`, path: featureName }), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsx(Text, { bold: true, children: "Summary" }), _jsxs(Text, { children: ["- Goal: ", goalCandidate] }), _jsxs(Text, { children: ["- Outcome: Spec written to ", specPath || `${featureName}.md`, " (", totalLines, " lines)"] })] }), decisions.length > 0 && (_jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsx(Text, { bold: true, children: "Key decisions" }), decisions.map((decision, idx) => (_jsxs(Text, { children: [idx + 1, ". ", summarizeText(decision, 120)] }, `${decision}-${idx}`)))] })), _jsxs(Box, { marginTop: 1, flexDirection: "row", children: [_jsxs(Text, { color: colors.green, children: [theme.chars.bullet, " "] }), _jsx(Text, { bold: true, children: "Write" }), _jsxs(Text, { dimColor: true, children: ["(", specPath || `${featureName}.md`, ")"] })] }), _jsx(Box, { marginLeft: 2, children: _jsxs(Text, { dimColor: true, children: [theme.chars.lineEnd, " Wrote ", totalLines, " lines"] }) }), _jsxs(Box, { marginLeft: 4, flexDirection: "column", children: [previewLines.map((line, i) => (_jsxs(Box, { flexDirection: "row", children: [_jsxs(Text, { dimColor: true, children: [String(i + 1).padStart(4), " "] }), _jsx(Text, { dimColor: true, children: line })] }, i))), remainingLines > 0 && (_jsxs(Text, { dimColor: true, children: ['\u2026', " +", remainingLines, " lines"] }))] }), _jsxs(Box, { marginTop: 1, flexDirection: "row", children: [_jsxs(Text, { color: colors.green, children: [theme.chars.bullet, " "] }), _jsx(Text, { children: "Done. Specification generated successfully." })] }), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsx(Text, { bold: true, children: "What's next:" }), _jsxs(Box, { flexDirection: "row", gap: 1, children: [_jsx(Text, { color: colors.green, children: theme.chars.prompt }), _jsx(Text, { dimColor: true, children: "Review the spec in your editor" })] }), _jsxs(Box, { flexDirection: "row", gap: 1, children: [_jsx(Text, { color: colors.green, children: theme.chars.prompt }), _jsx(Text, { color: colors.blue, children: "/help" }), _jsx(Text, { dimColor: true, children: "See all commands" })] })] }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: "Press Enter or Esc to return to shell" }) })] }));
 }

package/dist/tui/components/SummaryBox.d.ts

@@ -5,9 +5,6 @@
  * terminal width. Provides section separators and content padding.
  */
 import React from 'react';
-/**
- * Props for SummaryBox component
- */
 export interface SummaryBoxProps {
     /** Child content to render inside the box */
     children: React.ReactNode;

package/dist/tui/components/SummaryBox.js

@@ -8,6 +8,8 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 import React from 'react';
 import { Box, Text, useStdout } from 'ink';
 import { box, colors } from '../theme.js';
+/** Maximum box width to prevent layout conflicts with other components */
+const MAX_BOX_WIDTH = 80;
 /**
  * SummaryBox component
  *
@@ -27,8 +29,8 @@ import { box, colors } from '../theme.js';
 export function SummaryBox({ children, minWidth = 60, }) {
     const { stdout } = useStdout();
     const terminalWidth = stdout?.columns ?? 80;
-    // Use terminal width, but respect minimum width
-    const boxWidth = Math.max(minWidth, terminalWidth);
+    // Use terminal width, clamped between minWidth and MAX_BOX_WIDTH
+    const boxWidth = Math.min(Math.max(minWidth, terminalWidth), MAX_BOX_WIDTH);
     const contentWidth = boxWidth - 4; // Account for borders and padding
     // Top border: ┌─────┐
     const topBorder = box.topLeft + box.horizontal.repeat(boxWidth - 2) + box.topRight;

package/dist/tui/orchestration/interview-orchestrator.js

@@ -179,9 +179,27 @@ When generating the spec, use this format:
  * @internal Exported for testing
  */
 export function parseInterviewResponse(response) {
-    // Look for the ```options fenced block
-    const optionsBlockRegex = /```options\s*\n([\s\S]*?)\n```/;
-    const match = response.match(optionsBlockRegex);
+    // Try multiple fenced block formats: ```options, ```json, or plain ```
+    const fencedPatterns = [
+        /```options\s*\n([\s\S]*?)\n```/,
+        /```json\s*\n(\[[\s\S]*?\])\n```/,
+        /```\s*\n(\[[\s\S]*?\])\n```/,
+    ];
+    let match = null;
+    for (const pattern of fencedPatterns) {
+        match = response.match(pattern);
+        if (match)
+            break;
+    }
+    // Last resort: look for a bare JSON array containing "id" and "label" keys
+    if (!match) {
+        const bareArrayRegex = /(\[\s*\n\s*\{[^]*?"id"[^]*?"label"[^]*?\}\s*\n\s*\])/;
+        const bareMatch = response.match(bareArrayRegex);
+        if (bareMatch) {
+            // Synthesize a match-like result with index
+            match = bareMatch;
+        }
+    }
     if (!match) {
         return null;
     }
@@ -477,7 +495,12 @@ Respond with a VERY brief (1-2 sentence) summary of what you found relevant to t
             this.onWorkingChange(true, 'Formulating first question based on analysis...');
             const interviewPrompt = `Based on what you learned about the project, briefly acknowledge the user's goals for "${this.featureName}" and ask your FIRST clarifying question.
 Ask only ONE question. Be concise.`;
-            const response = await this.conversation.chat(interviewPrompt);
+            let response = await this.conversation.chat(interviewPrompt);
+            // If the AI responded with only tool calls and no question text, retry once
+            if (!response || !response.trim() || !parseInterviewResponse(response)) {
+                const retryPrompt = `You explored the project but didn't ask a question yet. Please ask your FIRST clarifying question about "${this.featureName}" now. Ask only ONE question. Include an options block.`;
+                response = await this.conversation.chat(retryPrompt);
+            }
             this.emitParsedResponse(response);
             // Transition to interview phase
             this.phase = 'interview';
@@ -556,7 +579,14 @@ Ask only ONE question. Be concise.`;
         else {
             this.currentQuestion = null;
             this.onQuestion?.(null);
-            this.onMessage('assistant', response);
+            // Strip any JSON-like option blocks from the displayed message to avoid
+            // showing raw JSON when structured parsing fails
+            const cleaned = response
+                .replace(/```(?:options|json)?\s*\n[\s\S]*?\n```/g, '')
+                .replace(/\[\s*\n\s*\{[^]*?"id"[^]*?"label"[^]*?\}\s*\n\s*\]/g, '')
+                .replace(/\n{3,}/g, '\n\n')
+                .trim();
+            this.onMessage('assistant', cleaned || response);
         }
     }
     /**

package/dist/tui/screens/MainShell.js

@@ -266,7 +266,8 @@ export function MainShell({ header, sessionState, onNavigate, backgroundRuns, in
     const tips = sessionState.initialized
         ? 'Tip: /new <feature> to create spec, /help for commands'
         : 'Tip: /init to set up, /help for commands';
-    const inputElement = (_jsx(ChatInput, { onSubmit: handleSubmit, disabled: false, placeholder: "Enter command or type /help...", onCommand: (cmd) => handleSubmit(`/${cmd}`) }));
+    const specSuggestions = useMemo(() => sessionState.specNames?.map((name) => ({ name, description: '' })), [sessionState.specNames]);
+    const inputElement = (_jsx(ChatInput, { onSubmit: handleSubmit, disabled: false, placeholder: "Enter command or type /help...", onCommand: (cmd) => handleSubmit(`/${cmd}`), specSuggestions: specSuggestions }));
     return (_jsxs(AppShell, { header: header, tips: tips, isWorking: syncStatus === 'running', workingStatus: syncStatus === 'running' ? 'Syncing project context\u2026' : undefined, input: inputElement, footerStatus: {
             action: projectLabel || 'Main Shell',
             phase: sessionState.provider ? `${sessionState.provider}/${sessionState.model}` : 'No provider',