commandmate 0.2.2 → 0.2.4

package/dist/server/src/lib/log-manager.js

@@ -16,11 +16,7 @@ exports.cleanupOldLogs = cleanupOldLogs;
 const promises_1 = __importDefault(require("fs/promises"));
 const path_1 = __importDefault(require("path"));
 const date_fns_1 = require("date-fns");
-const env_1 = require("./env");
-/**
- * Log directory configuration (with fallback support - Issue #76)
- */
-const LOG_DIR = (0, env_1.getEnvByKey)('CM_LOG_DIR') || path_1.default.join(process.cwd(), 'data', 'logs');
+const log_config_1 = require("../config/log-config");
 /**
  * Get log directory for a CLI tool
  *
@@ -28,7 +24,7 @@ const LOG_DIR = (0, env_1.getEnvByKey)('CM_LOG_DIR') || path_1.default.join(proc
  * @returns Log directory path
  */
 function getCliToolLogDir(cliToolId = 'claude') {
-    return path_1.default.join(LOG_DIR, cliToolId);
+    return path_1.default.join((0, log_config_1.getLogDir)(), cliToolId);
 }
 /**
  * Ensure log directory exists

package/dist/server/src/lib/prompt-detector.js

@@ -8,6 +8,40 @@ exports.detectPrompt = detectPrompt;
 exports.getAnswerInput = getAnswerInput;
 const logger_1 = require("./logger");
 const logger = (0, logger_1.createLogger)('prompt-detector');
+/**
+ * Maximum number of lines to retain in rawContent.
+ * Tail lines are preserved (instruction text typically appears just before the prompt).
+ * @see truncateRawContent
+ */
+const RAW_CONTENT_MAX_LINES = 200;
+/**
+ * Maximum number of characters to retain in rawContent.
+ * Tail characters are preserved.
+ * @see truncateRawContent
+ */
+const RAW_CONTENT_MAX_CHARS = 5000;
+/**
+ * Truncate raw content to fit within size limits.
+ * Preserves the tail (end) of the content since instruction text
+ * typically appears just before the prompt at the end of output.
+ *
+ * Security: No regular expressions used -- no ReDoS risk. [SF-S4-002]
+ * String.split('\n') and String.slice() are literal string operations only.
+ *
+ * @param content - The content to truncate
+ * @returns Truncated content (last RAW_CONTENT_MAX_LINES lines, max RAW_CONTENT_MAX_CHARS characters)
+ */
+function truncateRawContent(content) {
+    const lines = content.split('\n');
+    const truncatedLines = lines.length > RAW_CONTENT_MAX_LINES
+        ? lines.slice(-RAW_CONTENT_MAX_LINES)
+        : lines;
+    let result = truncatedLines.join('\n');
+    if (result.length > RAW_CONTENT_MAX_CHARS) {
+        result = result.slice(-RAW_CONTENT_MAX_CHARS);
+    }
+    return result;
+}
 /**
  * Yes/no pattern definitions for data-driven matching.
  * Each entry defines a regex pattern and its associated default option.
@@ -27,6 +61,32 @@ const YES_NO_PATTERNS = [
     // (yes/no) - no default
     { regex: /^(.+)\s+\(yes\/no\)\s*$/m },
 ];
+/**
+ * Creates a yes/no prompt detection result.
+ * Centralizes the repeated construction of yes_no PromptDetectionResult objects
+ * used by both YES_NO_PATTERNS matching and Approve pattern matching.
+ *
+ * @param question - The question text
+ * @param cleanContent - The clean content string
+ * @param rawContent - The raw content string (last 20 lines, trimmed)
+ * @param defaultOption - Optional default option ('yes' or 'no')
+ * @returns PromptDetectionResult with isPrompt: true and yes_no prompt data
+ */
+function yesNoPromptResult(question, cleanContent, rawContent, defaultOption) {
+    return {
+        isPrompt: true,
+        promptData: {
+            type: 'yes_no',
+            question,
+            options: ['yes', 'no'],
+            status: 'pending',
+            ...(defaultOption !== undefined && { defaultOption }),
+            instructionText: rawContent,
+        },
+        cleanContent,
+        rawContent,
+    };
+}
 /**
  * Detect if output contains an interactive prompt
  *
@@ -51,7 +111,8 @@ const YES_NO_PATTERNS = [
 function detectPrompt(output, options) {
     logger.debug('detectPrompt:start', { outputLength: output.length });
     const lines = output.split('\n');
-    const lastLines = lines.slice(-10).join('\n');
+    // [SF-003] [MF-S2-001] Expanded from 10 to 20 lines for rawContent coverage
+    const lastLines = lines.slice(-20).join('\n');
     // Pattern 0: Multiple choice (numbered options with ❯ indicator)
     // Example:
     // Do you want to proceed?
@@ -68,21 +129,12 @@ function detectPrompt(output, options) {
         return multipleChoiceResult;
     }
     // Patterns 1-4: Yes/no patterns (data-driven matching)
+    const trimmedLastLines = lastLines.trim();
     for (const pattern of YES_NO_PATTERNS) {
         const match = lastLines.match(pattern.regex);
         if (match) {
             const question = match[1].trim();
-            return {
-                isPrompt: true,
-                promptData: {
-                    type: 'yes_no',
-                    question,
-                    options: ['yes', 'no'],
-                    status: 'pending',
-                    ...(pattern.defaultOption !== undefined && { defaultOption: pattern.defaultOption }),
-                },
-                cleanContent: question,
-            };
+            return yesNoPromptResult(question, question, trimmedLastLines, pattern.defaultOption);
         }
     }
     // Pattern 5: Approve?
@@ -93,16 +145,7 @@ function detectPrompt(output, options) {
         const content = approveMatch[1].trim();
         // If there's content before "Approve?", include it in the question
         const question = content ? `${content} Approve?` : 'Approve?';
-        return {
-            isPrompt: true,
-            promptData: {
-                type: 'yes_no',
-                question: question,
-                options: ['yes', 'no'],
-                status: 'pending',
-            },
-            cleanContent: content || 'Approve?',
-        };
+        return yesNoPromptResult(question, content || 'Approve?', trimmedLastLines);
     }
     // No prompt detected
     logger.debug('detectPrompt:complete', { isPrompt: false });
@@ -141,6 +184,28 @@ const NORMAL_OPTION_PATTERN = /^\s*(\d+)\.\s*(.+)$/;
  * Anchored at both ends -- ReDoS safe (S4-001).
  */
 const SEPARATOR_LINE_PATTERN = /^[-─]+$/;
+/**
+ * Maximum number of lines to scan upward from questionEndIndex
+ * when the questionEndIndex line itself is not a question-like line.
+ *
+ * Design rationale (IC-256-001):
+ * - model selection prompts have 1-2 lines between "Select model" and first option
+ * - multi-line question wrapping typically produces 2-3 continuation lines
+ * - value of 3 covers these cases while minimizing False Positive surface
+ *
+ * [SF-002] Change guidelines:
+ * - Increase this value ONLY if real-world prompts are discovered where
+ *   the question line is more than 3 lines above questionEndIndex
+ * - Before increasing, verify that the new value does not cause
+ *   T11h-T11m False Positive tests to fail
+ * - Consider that larger values increase the False Positive surface area
+ * - If increasing beyond 5, consider whether the detection approach
+ *   itself needs to be redesigned (e.g., pattern-based instead of scan-based)
+ * - Document the specific prompt pattern that necessitated the change
+ *
+ * @see Issue #256: multiple_choice prompt detection improvement
+ */
+const QUESTION_SCAN_RANGE = 3;
 /**
  * Creates a "no prompt detected" result.
  * Centralizes the repeated pattern of returning isPrompt: false with trimmed content.
@@ -201,17 +266,75 @@ function isQuestionLikeLine(line) {
     // Empty lines are not questions
     if (line.length === 0)
         return false;
-    // Pattern 1: Lines ending with question mark (English or full-width Japanese)
+    // Pattern 1: Lines containing question mark anywhere (English '?' or full-width U+FF1F).
+    // This covers both:
+    //   - Lines ending with '?' (standard question format)
+    //   - Lines with '?' mid-line (Issue #256: multi-line question wrapping where '?'
+    //     appears mid-line due to terminal width causing the question text to wrap)
+    //
     // Full-width question mark (U+FF1F) support is a defensive measure: Claude Code/CLI
     // displays questions in English, but this covers future multi-language support
     // and third-party tool integration.
-    if (line.endsWith('?') || line.endsWith('\uff1f'))
+    //
+    // [SF-001] Scope constraints:
+    // - The mid-line '?' detection is effective without False Positive risk only within
+    //   SEC-001b guard context (questionEndIndex vicinity and upward scan range).
+    // - isQuestionLikeLine() is currently module-private (no export).
+    // - If this function is exported for external use in the future, consider:
+    //   (a) Providing a stricter variant (e.g., isStrictQuestionLikeLine()) without mid-line match
+    //   (b) Separating mid-line match into a SEC-001b-specific helper function
+    //   (c) Adding URL exclusion logic (/[?&]\w+=/.test(line) to exclude)
+    if (line.includes('?') || line.includes('\uff1f'))
         return true;
-    // Pattern 2: Lines ending with colon that contain a selection/input keyword
-    // Examples: "Select an option:", "Choose a mode:", "Pick one:"
-    if (line.endsWith(':')) {
-        if (QUESTION_KEYWORD_PATTERN.test(line))
+    // Pattern 2: Lines containing a selection/input keyword.
+    // Detects both colon-terminated (e.g., "Select an option:", "Choose a mode:") and
+    // non-colon forms (e.g., "Select model") used by CLI prompts (Issue #256).
+    //
+    // [SF-001] Scope constraints apply:
+    // - Effective without False Positive risk only within SEC-001b guard context.
+    // - T11h-T11m False Positive lines do not contain QUESTION_KEYWORD_PATTERN keywords.
+    // - If this function is exported, consider restricting this pattern to SEC-001b context.
+    if (QUESTION_KEYWORD_PATTERN.test(line))
+        return true;
+    return false;
+}
+/**
+ * Search upward from a given line index to find a question-like line.
+ * Skips empty lines and separator lines (horizontal rules).
+ *
+ * This function is used by SEC-001b guard to find a question line above
+ * questionEndIndex when the questionEndIndex line itself is not a question-like line.
+ * This handles cases where the question text wraps across multiple lines or
+ * where description lines appear between the question and the numbered options.
+ *
+ * @param lines - Array of output lines
+ * @param startIndex - Starting line index (exclusive, searches startIndex-1 and above)
+ * @param scanRange - Maximum number of lines to scan upward (must be >= 0, clamped to MAX_SCAN_RANGE=10)
+ * @param lowerBound - Minimum line index (inclusive, scan will not go below this)
+ * @returns true if a question-like line is found within the scan range
+ *
+ * @see IC-256-002: SEC-001b upward scan implementation
+ * @see SF-003: Function extraction for readability
+ * @see SF-S4-001: scanRange input validation (defensive clamping)
+ *
+ * ReDoS safe: Uses SEPARATOR_LINE_PATTERN (existing ReDoS safe pattern) and
+ * isQuestionLikeLine() (literal character checks + simple alternation pattern).
+ * No new regex patterns introduced. (C-S4-001)
+ */
+function findQuestionLineInRange(lines, startIndex, scanRange, lowerBound) {
+    // [SF-S4-001] Defensive input validation: clamp scanRange to safe bounds.
+    // Currently only called with QUESTION_SCAN_RANGE=3, but guards against
+    // future misuse if the function is refactored or exported.
+    const safeScanRange = Math.min(Math.max(scanRange, 0), 10);
+    const scanLimit = Math.max(lowerBound, startIndex - safeScanRange);
+    for (let i = startIndex - 1; i >= scanLimit; i--) {
+        const candidateLine = lines[i]?.trim() ?? '';
+        // Skip empty lines and separator lines (horizontal rules)
+        if (!candidateLine || SEPARATOR_LINE_PATTERN.test(candidateLine))
+            continue;
+        if (isQuestionLikeLine(candidateLine)) {
             return true;
+        }
     }
     return false;
 }
@@ -265,19 +388,103 @@ function isConsecutiveFromOne(numbers) {
  * @returns true if the line should be treated as a continuation of a previous option
  */
 function isContinuationLine(rawLine, line) {
-    // Indented non-option line.
-    // Excludes lines ending with '?' or '？' (U+FF1F) because those are typically question lines
+    // Lines ending with '?' or full-width '？' (U+FF1F) are typically question lines
     // (e.g., "  Do you want to proceed?", "  コピーしたい対象はどれですか？") from CLI tool output
-    // where both the question and options are 2-space indented. Without this exclusion,
-    // the question line would be misclassified as a continuation line, causing
-    // questionEndIndex to remain -1 and Layer 5 SEC-001 to block detection.
+    // where both the question and options are 2-space indented. These must NOT be
+    // treated as continuation lines, otherwise questionEndIndex remains -1 and
+    // Layer 5 SEC-001 blocks detection.
     const endsWithQuestion = line.endsWith('?') || line.endsWith('\uff1f');
-    const hasLeadingSpaces = rawLine.match(/^\s{2,}[^\d]/) && !rawLine.match(/^\s*\d+\./) && !endsWithQuestion;
-    // Short fragment (< 5 chars, excluding question-ending lines)
-    const isShortFragment = line.length < 5 && !endsWithQuestion;
-    // Path string continuation: lines starting with / or ~, or alphanumeric-only fragments (2+ chars)
-    const isPathContinuation = /^[\/~]/.test(line) || (line.length >= 2 && /^[a-zA-Z0-9_-]+$/.test(line));
-    return !!hasLeadingSpaces || isShortFragment || isPathContinuation;
+    // Check 1: Indented non-option line (label text wrapping with indentation).
+    // Must have 2+ leading spaces, not start with a number (option line), and not end with '?'.
+    if (!endsWithQuestion && /^\s{2,}[^\d]/.test(rawLine) && !/^\s*\d+\./.test(rawLine)) {
+        return true;
+    }
+    // Check 2: Short fragment (< 5 chars, e.g., filename tail).
+    // Excludes question-ending lines to prevent misclassifying short questions.
+    if (line.length < 5 && !endsWithQuestion) {
+        return true;
+    }
+    // Check 3: Path string continuation (Issue #181).
+    // Lines starting with / or ~, or alphanumeric-only fragments (2+ chars).
+    if (/^[\/~]/.test(line) || (line.length >= 2 && /^[a-zA-Z0-9_-]+$/.test(line))) {
+        return true;
+    }
+    return false;
+}
+/**
+ * Extract question text from the lines around questionEndIndex.
+ * Collects non-empty, non-separator lines from up to 5 lines before questionEndIndex
+ * through questionEndIndex itself, joining them with spaces.
+ *
+ * @param lines - Array of output lines
+ * @param questionEndIndex - Index of the last line before options, or -1 if not found
+ * @returns Extracted question text, or generic fallback if questionEndIndex is -1
+ */
+function extractQuestionText(lines, questionEndIndex) {
+    if (questionEndIndex < 0) {
+        return 'Please select an option:';
+    }
+    const questionLines = [];
+    for (let i = Math.max(0, questionEndIndex - 5); i <= questionEndIndex; i++) {
+        const line = lines[i].trim();
+        if (line && !SEPARATOR_LINE_PATTERN.test(line)) {
+            questionLines.push(line);
+        }
+    }
+    return questionLines.join(' ');
+}
+/**
+ * Extract instruction text for the prompt block.
+ * Captures the complete AskUserQuestion block including context before the question,
+ * option descriptions, and navigation hints.
+ *
+ * @param lines - Array of output lines
+ * @param questionEndIndex - Index of the last line before options, or -1 if not found
+ * @param effectiveEnd - End index of non-trailing-empty lines
+ * @returns Instruction text string, or undefined if no question line found
+ */
+function extractInstructionText(lines, questionEndIndex, effectiveEnd) {
+    if (questionEndIndex < 0) {
+        return undefined;
+    }
+    const contextStart = Math.max(0, questionEndIndex - 19);
+    const blockLines = lines.slice(contextStart, effectiveEnd)
+        .map(l => l.trimEnd());
+    const joined = blockLines.join('\n').trim();
+    return joined.length > 0 ? joined : undefined;
+}
+/**
+ * Build the final PromptDetectionResult for a multiple choice prompt.
+ * Maps collected options to the output format, checking each option for
+ * text input requirements using TEXT_INPUT_PATTERNS.
+ *
+ * @param question - Extracted question text
+ * @param collectedOptions - Options collected during Pass 2 scanning
+ * @param instructionText - Instruction text for the prompt block
+ * @param output - Original output text (used for rawContent truncation)
+ * @returns PromptDetectionResult with isPrompt: true and multiple_choice data
+ */
+function buildMultipleChoiceResult(question, collectedOptions, instructionText, output) {
+    return {
+        isPrompt: true,
+        promptData: {
+            type: 'multiple_choice',
+            question: question.trim(),
+            options: collectedOptions.map(opt => {
+                const requiresTextInput = TEXT_INPUT_PATTERNS.some(pattern => pattern.test(opt.label));
+                return {
+                    number: opt.number,
+                    label: opt.label,
+                    isDefault: opt.isDefault,
+                    requiresTextInput,
+                };
+            }),
+            status: 'pending',
+            instructionText,
+        },
+        cleanContent: question.trim(),
+        rawContent: truncateRawContent(output.trim()), // Issue #235: complete prompt output (truncated) [MF-001]
+    };
 }
 /**
  * Detect multiple choice prompts (numbered list with ❯ indicator)
@@ -356,6 +563,20 @@ function detectMultipleChoicePrompt(output, options) {
         }
         // Non-option line handling
         if (collectedOptions.length > 0 && line && !SEPARATOR_LINE_PATTERN.test(line)) {
+            // [MF-001 / Issue #256] Check if line is a question-like line BEFORE
+            // continuation check. This preserves isContinuationLine()'s SRP by not
+            // mixing question detection into it. Without this pre-check, indented
+            // question lines (e.g., "  Select model") could be misclassified as
+            // continuation lines by isContinuationLine()'s hasLeadingSpaces check.
+            //
+            // [SF-S4-003] Both this pre-check and SEC-001b upward scan use the same
+            // isQuestionLikeLine() function intentionally (DRY). If a question line is
+            // caught here, SEC-001b upward scan is not needed (questionEndIndex line
+            // itself passes isQuestionLikeLine()).
+            if (isQuestionLikeLine(line)) {
+                questionEndIndex = i;
+                break;
+            }
             // Check if this is a continuation line (indented line between options,
             // or path/filename fragments from terminal width wrapping - Issue #181)
             const rawLine = lines[i]; // Original line with indentation preserved
@@ -392,47 +613,23 @@ function detectMultipleChoicePrompt(output, options) {
         // SEC-001b: Question line exists but is not actually a question/selection request.
         // Validates that the question line contains a question mark or a selection keyword
         // with colon, distinguishing "Select an option:" from "Recommendations:".
+        //
+        // [Issue #256] Enhanced with upward scan via findQuestionLineInRange() (SF-003).
+        // When questionEndIndex line itself is not a question-like line, scan upward
+        // within QUESTION_SCAN_RANGE to find a question line above it. This handles:
+        // - Multi-line question wrapping where ? is on a line above questionEndIndex
+        // - Model selection prompts where "Select model" is above description lines
         const questionLine = lines[questionEndIndex]?.trim() ?? '';
         if (!isQuestionLikeLine(questionLine)) {
-            return noPromptResult(output);
-        }
-    }
-    // Extract question text
-    let question = '';
-    if (questionEndIndex >= 0) {
-        // Get all non-empty lines from questionEndIndex up to (but not including) first option
-        const questionLines = [];
-        for (let i = Math.max(0, questionEndIndex - 5); i <= questionEndIndex; i++) {
-            const line = lines[i].trim();
-            if (line && !SEPARATOR_LINE_PATTERN.test(line)) {
-                questionLines.push(line);
+            // Upward scan: look for a question-like line above questionEndIndex
+            if (!findQuestionLineInRange(lines, questionEndIndex, QUESTION_SCAN_RANGE, scanStart)) {
+                return noPromptResult(output);
             }
         }
-        question = questionLines.join(' ');
     }
-    else {
-        // No clear question found - use a generic one
-        question = 'Please select an option:';
-    }
-    return {
-        isPrompt: true,
-        promptData: {
-            type: 'multiple_choice',
-            question: question.trim(),
-            options: collectedOptions.map(opt => {
-                // Check if this option requires text input using module-level patterns
-                const requiresTextInput = TEXT_INPUT_PATTERNS.some(pattern => pattern.test(opt.label));
-                return {
-                    number: opt.number,
-                    label: opt.label,
-                    isDefault: opt.isDefault,
-                    requiresTextInput,
-                };
-            }),
-            status: 'pending',
-        },
-        cleanContent: question.trim(),
-    };
+    const question = extractQuestionText(lines, questionEndIndex);
+    const instructionText = extractInstructionText(lines, questionEndIndex, effectiveEnd);
+    return buildMultipleChoiceResult(question, collectedOptions, instructionText, output);
 }
 /**
  * Get tmux input string for an answer

package/dist/server/src/lib/response-poller.js

@@ -53,6 +53,25 @@ const MAX_POLLING_DURATION = 5 * 60 * 1000;
  * @constant
  */
 const RESPONSE_THINKING_TAIL_LINE_COUNT = 5;
+/**
+ * Gemini auth/loading state indicators that should not be treated as complete responses.
+ * Braille spinner characters are shared with CLAUDE_SPINNER_CHARS in cli-patterns.ts.
+ * Extracted to module level for clarity and to avoid re-creation on each call.
+ */
+const GEMINI_LOADING_INDICATORS = [
+    'Waiting for auth',
+    '\u280b', '\u2819', '\u2839', '\u2838', '\u283c', '\u2834', '\u2826', '\u2827', '\u2807', '\u280f',
+];
+/**
+ * Creates an incomplete extraction result with empty response.
+ * Centralizes the repeated pattern of returning an in-progress/incomplete state.
+ *
+ * @param lineCount - Current line count for state tracking
+ * @returns ExtractionResult with empty response and isComplete: false
+ */
+function incompleteResult(lineCount) {
+    return { response: '', isComplete: false, lineCount };
+}
 /**
  * Active pollers map: "worktreeId:cliToolId" -> NodeJS.Timeout
  */
@@ -335,11 +354,7 @@ function extractResponse(output, lastCapturedLine, cliToolId) {
         // Prevents false blocking when completed thinking summaries appear in the response body.
         const responseTailLines = response.split('\n').slice(-RESPONSE_THINKING_TAIL_LINE_COUNT).join('\n');
         if (thinkingPattern.test(responseTailLines)) {
-            return {
-                response: '',
-                isComplete: false,
-                lineCount: totalLines,
-            };
+            return incompleteResult(totalLines);
         }
         // CRITICAL FIX: Detect and skip Claude Code startup banner/screen
         // The startup screen contains: ASCII art logo, version info, prompt, separator
@@ -366,20 +381,12 @@ function extractResponse(output, lastCapturedLine, cliToolId) {
                         !/^─+$/.test(trimmed);
                 });
                 if (contentLines.length === 0) {
-                    return {
-                        response: '',
-                        isComplete: false,
-                        lineCount: totalLines,
-                    };
+                    return incompleteResult(totalLines);
                 }
             }
             else if ((hasBannerArt || hasVersionInfo || hasStartupTips || hasProjectInit) && response.length < 2000) {
                 // No user prompt found, but has banner characteristics - likely initial startup
-                return {
-                    response: '',
-                    isComplete: false,
-                    lineCount: totalLines,
-                };
+                return incompleteResult(totalLines);
             }
         }
         // Gemini-specific check: ensure response contains actual content (✦ marker)
@@ -388,31 +395,13 @@ function extractResponse(output, lastCapturedLine, cliToolId) {
             const bannerCharCount = (response.match(/[░███]/g) || []).length;
             const totalChars = response.length;
             if (bannerCharCount > totalChars * 0.3) {
-                return {
-                    response: '',
-                    isComplete: false,
-                    lineCount: totalLines,
-                };
+                return incompleteResult(totalLines);
             }
-            // Check for auth/loading states that should not be treated as complete responses.
-            // Braille spinner characters are shared with CLAUDE_SPINNER_CHARS in cli-patterns.ts.
-            const LOADING_INDICATORS = [
-                'Waiting for auth',
-                '⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏',
-            ];
-            if (LOADING_INDICATORS.some(indicator => response.includes(indicator))) {
-                return {
-                    response: '',
-                    isComplete: false,
-                    lineCount: totalLines,
-                };
+            if (GEMINI_LOADING_INDICATORS.some(indicator => response.includes(indicator))) {
+                return incompleteResult(totalLines);
             }
             if (!response.includes('✦') && response.length < 10) {
-                return {
-                    response: '',
-                    isComplete: false,
-                    lineCount: totalLines,
-                };
+                return incompleteResult(totalLines);
             }
         }
         return {
@@ -460,11 +449,7 @@ function extractResponse(output, lastCapturedLine, cliToolId) {
         };
     }
     // Response not yet complete (or is in thinking state)
-    return {
-        response: '',
-        isComplete: false,
-        lineCount: totalLines,
-    };
+    return incompleteResult(totalLines);
 }
 /**
  * Check for CLI tool response once
@@ -533,7 +518,8 @@ async function checkForResponse(worktreeId, cliToolId) {
             const message = (0, db_1.createMessage)(db, {
                 worktreeId,
                 role: 'assistant',
-                content: promptDetection.cleanContent,
+                // Issue #235: rawContent優先でDB保存 (rawContent contains complete prompt output)
+                content: promptDetection.rawContent || promptDetection.cleanContent,
                 messageType: 'prompt',
                 promptData: promptDetection.promptData,
                 timestamp: new Date(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "commandmate",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "description": "Git worktree management with Claude CLI and tmux sessions",
   "repository": {
     "type": "git",
@@ -48,6 +48,7 @@
     "lucide-react": "^0.554.0",
     "mermaid": "^11.12.2",
     "next": "^14.2.35",
+    "next-intl": "^4.8.2",
     "postcss": "^8.5.6",
     "react": "^18.3.0",
     "react-dom": "^18.3.0",

package/.next/server/app/_not-found.html

@@ -1 +0,0 @@
-<!DOCTYPE html><html lang="ja"><head><meta charSet="utf-8"/><meta name="viewport" content="width=device-width, initial-scale=1"/><link rel="stylesheet" href="/_next/static/css/d4b58a1129eff6af.css" data-precedence="next"/><link rel="preload" as="script" fetchPriority="low" href="/_next/static/chunks/webpack-4f85dcef6279c6ee.js"/><script src="/_next/static/chunks/fd9d1056-bbe86e4ae099d5cd.js" async=""></script><script src="/_next/static/chunks/2117-d845c2cd62e344a6.js" async=""></script><script src="/_next/static/chunks/main-app-420d93e43682fee5.js" async=""></script><script src="/_next/static/chunks/816-c254f4e2406e696a.js" async=""></script><script src="/_next/static/chunks/app/layout-4804cfba519283cf.js" async=""></script><meta name="robots" content="noindex"/><title>404: This page could not be found.</title><title>CommandMate</title><meta name="description" content="Git worktree management with Claude CLI and tmux sessions"/><script src="/_next/static/chunks/polyfills-42372ed130431b0a.js" noModule=""></script></head><body class="min-h-screen bg-gray-50"><div style="font-family:system-ui,&quot;Segoe UI&quot;,Roboto,Helvetica,Arial,sans-serif,&quot;Apple Color Emoji&quot;,&quot;Segoe UI Emoji&quot;;height:100vh;text-align:center;display:flex;flex-direction:column;align-items:center;justify-content:center"><div><style>body{color:#000;background:#fff;margin:0}.next-error-h1{border-right:1px solid rgba(0,0,0,.3)}@media (prefers-color-scheme:dark){body{color:#fff;background:#000}.next-error-h1{border-right:1px solid rgba(255,255,255,.3)}}</style><h1 class="next-error-h1" style="display:inline-block;margin:0 20px 0 0;padding:0 23px 0 0;font-size:24px;font-weight:500;vertical-align:top;line-height:49px">404</h1><div style="display:inline-block"><h2 style="font-size:14px;font-weight:400;line-height:49px;margin:0">This page could not be found.</h2></div></div></div><script src="/_next/static/chunks/webpack-4f85dcef6279c6ee.js" async=""></script><script>(self.__next_f=self.__next_f||[]).push([0]);self.__next_f.push([2,null])</script><script>self.__next_f.push([1,"1:HL[\"/_next/static/css/d4b58a1129eff6af.css\",\"style\"]\n"])</script><script>self.__next_f.push([1,"2:I[12846,[],\"\"]\n4:I[4707,[],\"\"]\n5:I[36423,[],\"\"]\n6:I[91795,[\"816\",\"static/chunks/816-c254f4e2406e696a.js\",\"3185\",\"static/chunks/app/layout-4804cfba519283cf.js\"],\"AppProviders\"]\nc:I[61060,[],\"\"]\n7:{\"fontFamily\":\"system-ui,\\\"Segoe UI\\\",Roboto,Helvetica,Arial,sans-serif,\\\"Apple Color Emoji\\\",\\\"Segoe UI Emoji\\\"\",\"height\":\"100vh\",\"textAlign\":\"center\",\"display\":\"flex\",\"flexDirection\":\"column\",\"alignItems\":\"center\",\"justifyContent\":\"center\"}\n8:{\"display\":\"inline-block\",\"margin\":\"0 20px 0 0\",\"padding\":\"0 23px 0 0\",\"fontSize\":24,\"fontWeight\":500,\"verticalAlign\":\"top\",\"lineHeight\":\"49px\"}\n9:{\"display\":\"inline-block\"}\na:{\"fontSize\":14,\"fontWeight\":400,\"lineHeight\":\"49px\",\"margin\":0}\nd:[]\n"])</script><script>self.__next_f.push([1,"0:[\"$\",\"$L2\",null,{\"buildId\":\"HhG0EHeG9E4wTJ4sqnLdv\",\"assetPrefix\":\"\",\"urlParts\":[\"\",\"_not-found\"],\"initialTree\":[\"\",{\"children\":[\"/_not-found\",{\"children\":[\"__PAGE__\",{}]}]},\"$undefined\",\"$undefined\",true],\"initialSeedData\":[\"\",{\"children\":[\"/_not-found\",{\"children\":[\"__PAGE__\",{},[[\"$L3\",[[\"$\",\"title\",null,{\"children\":\"404: This page could not be found.\"}],[\"$\",\"div\",null,{\"style\":{\"fontFamily\":\"system-ui,\\\"Segoe UI\\\",Roboto,Helvetica,Arial,sans-serif,\\\"Apple Color Emoji\\\",\\\"Segoe UI Emoji\\\"\",\"height\":\"100vh\",\"textAlign\":\"center\",\"display\":\"flex\",\"flexDirection\":\"column\",\"alignItems\":\"center\",\"justifyContent\":\"center\"},\"children\":[\"$\",\"div\",null,{\"children\":[[\"$\",\"style\",null,{\"dangerouslySetInnerHTML\":{\"__html\":\"body{color:#000;background:#fff;margin:0}.next-error-h1{border-right:1px solid rgba(0,0,0,.3)}@media (prefers-color-scheme:dark){body{color:#fff;background:#000}.next-error-h1{border-right:1px solid rgba(255,255,255,.3)}}\"}}],[\"$\",\"h1\",null,{\"className\":\"next-error-h1\",\"style\":{\"display\":\"inline-block\",\"margin\":\"0 20px 0 0\",\"padding\":\"0 23px 0 0\",\"fontSize\":24,\"fontWeight\":500,\"verticalAlign\":\"top\",\"lineHeight\":\"49px\"},\"children\":\"404\"}],[\"$\",\"div\",null,{\"style\":{\"display\":\"inline-block\"},\"children\":[\"$\",\"h2\",null,{\"style\":{\"fontSize\":14,\"fontWeight\":400,\"lineHeight\":\"49px\",\"margin\":0},\"children\":\"This page could not be found.\"}]}]]}]}]],null],null],null]},[null,[\"$\",\"$L4\",null,{\"parallelRouterKey\":\"children\",\"segmentPath\":[\"children\",\"/_not-found\",\"children\"],\"error\":\"$undefined\",\"errorStyles\":\"$undefined\",\"errorScripts\":\"$undefined\",\"template\":[\"$\",\"$L5\",null,{}],\"templateStyles\":\"$undefined\",\"templateScripts\":\"$undefined\",\"notFound\":\"$undefined\",\"notFoundStyles\":\"$undefined\"}]],null]},[[[[\"$\",\"link\",\"0\",{\"rel\":\"stylesheet\",\"href\":\"/_next/static/css/d4b58a1129eff6af.css\",\"precedence\":\"next\",\"crossOrigin\":\"$undefined\"}]],[\"$\",\"html\",null,{\"lang\":\"ja\",\"children\":[\"$\",\"body\",null,{\"className\":\"min-h-screen bg-gray-50\",\"children\":[\"$\",\"$L6\",null,{\"children\":[\"$\",\"$L4\",null,{\"parallelRouterKey\":\"children\",\"segmentPath\":[\"children\"],\"error\":\"$undefined\",\"errorStyles\":\"$undefined\",\"errorScripts\":\"$undefined\",\"template\":[\"$\",\"$L5\",null,{}],\"templateStyles\":\"$undefined\",\"templateScripts\":\"$undefined\",\"notFound\":[[\"$\",\"title\",null,{\"children\":\"404: This page could not be found.\"}],[\"$\",\"div\",null,{\"style\":\"$7\",\"children\":[\"$\",\"div\",null,{\"children\":[[\"$\",\"style\",null,{\"dangerouslySetInnerHTML\":{\"__html\":\"body{color:#000;background:#fff;margin:0}.next-error-h1{border-right:1px solid rgba(0,0,0,.3)}@media (prefers-color-scheme:dark){body{color:#fff;background:#000}.next-error-h1{border-right:1px solid rgba(255,255,255,.3)}}\"}}],[\"$\",\"h1\",null,{\"className\":\"next-error-h1\",\"style\":\"$8\",\"children\":\"404\"}],[\"$\",\"div\",null,{\"style\":\"$9\",\"children\":[\"$\",\"h2\",null,{\"style\":\"$a\",\"children\":\"This page could not be found.\"}]}]]}]}]],\"notFoundStyles\":[]}]}]}]}]],null],null],\"couldBeIntercepted\":false,\"initialHead\":[[\"$\",\"meta\",null,{\"name\":\"robots\",\"content\":\"noindex\"}],\"$Lb\"],\"globalErrorComponent\":\"$c\",\"missingSlots\":\"$Wd\"}]\n"])</script><script>self.__next_f.push([1,"b:[[\"$\",\"meta\",\"0\",{\"name\":\"viewport\",\"content\":\"width=device-width, initial-scale=1\"}],[\"$\",\"meta\",\"1\",{\"charSet\":\"utf-8\"}],[\"$\",\"title\",\"2\",{\"children\":\"CommandMate\"}],[\"$\",\"meta\",\"3\",{\"name\":\"description\",\"content\":\"Git worktree management with Claude CLI and tmux sessions\"}]]\n3:null\n"])</script></body></html>

package/.next/server/app/_not-found.meta

@@ -1,6 +0,0 @@
-{
-  "status": 404,
-  "headers": {
-    "x-next-cache-tags": "_N_T_/layout,_N_T_/_not-found/layout,_N_T_/_not-found/page,_N_T_/_not-found"
-  }
-}

package/.next/server/app/_not-found.rsc

@@ -1,10 +0,0 @@
-2:I[4707,[],""]
-3:I[36423,[],""]
-4:I[91795,["816","static/chunks/816-c254f4e2406e696a.js","3185","static/chunks/app/layout-4804cfba519283cf.js"],"AppProviders"]
-5:{"fontFamily":"system-ui,\"Segoe UI\",Roboto,Helvetica,Arial,sans-serif,\"Apple Color Emoji\",\"Segoe UI Emoji\"","height":"100vh","textAlign":"center","display":"flex","flexDirection":"column","alignItems":"center","justifyContent":"center"}
-6:{"display":"inline-block","margin":"0 20px 0 0","padding":"0 23px 0 0","fontSize":24,"fontWeight":500,"verticalAlign":"top","lineHeight":"49px"}
-7:{"display":"inline-block"}
-8:{"fontSize":14,"fontWeight":400,"lineHeight":"49px","margin":0}
-0:["HhG0EHeG9E4wTJ4sqnLdv",[[["",{"children":["/_not-found",{"children":["__PAGE__",{}]}]},"$undefined","$undefined",true],["",{"children":["/_not-found",{"children":["__PAGE__",{},[["$L1",[["$","title",null,{"children":"404: This page could not be found."}],["$","div",null,{"style":{"fontFamily":"system-ui,\"Segoe UI\",Roboto,Helvetica,Arial,sans-serif,\"Apple Color Emoji\",\"Segoe UI Emoji\"","height":"100vh","textAlign":"center","display":"flex","flexDirection":"column","alignItems":"center","justifyContent":"center"},"children":["$","div",null,{"children":[["$","style",null,{"dangerouslySetInnerHTML":{"__html":"body{color:#000;background:#fff;margin:0}.next-error-h1{border-right:1px solid rgba(0,0,0,.3)}@media (prefers-color-scheme:dark){body{color:#fff;background:#000}.next-error-h1{border-right:1px solid rgba(255,255,255,.3)}}"}}],["$","h1",null,{"className":"next-error-h1","style":{"display":"inline-block","margin":"0 20px 0 0","padding":"0 23px 0 0","fontSize":24,"fontWeight":500,"verticalAlign":"top","lineHeight":"49px"},"children":"404"}],["$","div",null,{"style":{"display":"inline-block"},"children":["$","h2",null,{"style":{"fontSize":14,"fontWeight":400,"lineHeight":"49px","margin":0},"children":"This page could not be found."}]}]]}]}]],null],null],null]},[null,["$","$L2",null,{"parallelRouterKey":"children","segmentPath":["children","/_not-found","children"],"error":"$undefined","errorStyles":"$undefined","errorScripts":"$undefined","template":["$","$L3",null,{}],"templateStyles":"$undefined","templateScripts":"$undefined","notFound":"$undefined","notFoundStyles":"$undefined"}]],null]},[[[["$","link","0",{"rel":"stylesheet","href":"/_next/static/css/d4b58a1129eff6af.css","precedence":"next","crossOrigin":"$undefined"}]],["$","html",null,{"lang":"ja","children":["$","body",null,{"className":"min-h-screen bg-gray-50","children":["$","$L4",null,{"children":["$","$L2",null,{"parallelRouterKey":"children","segmentPath":["children"],"error":"$undefined","errorStyles":"$undefined","errorScripts":"$undefined","template":["$","$L3",null,{}],"templateStyles":"$undefined","templateScripts":"$undefined","notFound":[["$","title",null,{"children":"404: This page could not be found."}],["$","div",null,{"style":"$5","children":["$","div",null,{"children":[["$","style",null,{"dangerouslySetInnerHTML":{"__html":"body{color:#000;background:#fff;margin:0}.next-error-h1{border-right:1px solid rgba(0,0,0,.3)}@media (prefers-color-scheme:dark){body{color:#fff;background:#000}.next-error-h1{border-right:1px solid rgba(255,255,255,.3)}}"}}],["$","h1",null,{"className":"next-error-h1","style":"$6","children":"404"}],["$","div",null,{"style":"$7","children":["$","h2",null,{"style":"$8","children":"This page could not be found."}]}]]}]}]],"notFoundStyles":[]}]}]}]}]],null],null],["$L9",["$","meta",null,{"name":"robots","content":"noindex"}]]]]]
-9:[["$","meta","0",{"name":"viewport","content":"width=device-width, initial-scale=1"}],["$","meta","1",{"charSet":"utf-8"}],["$","title","2",{"children":"CommandMate"}],["$","meta","3",{"name":"description","content":"Git worktree management with Claude CLI and tmux sessions"}]]
-1:null