commandmate 0.2.2 → 0.2.3

package/README.md

@@ -1,152 +1,154 @@
 # CommandMate
 
-> 「入力待ちを見逃さない、開発の相棒。」
-> 「軽量。その場で完結。Claude Codeを、どこからでも動かす。」
+[English](./README.md) | [日本語](./docs/ja/README.md)
 
-![PC表示](./docs/images/screenshot-desktop.png)
+> "Never miss a prompt — your development companion."
+> "Lightweight. Self-contained. Run Claude Code from anywhere."
 
-## これは何か
+![Desktop view](./docs/images/screenshot-desktop.png)
 
-Git worktree ごとに Claude Code セッションを管理し、ブラウザから指示を送れる開発コンパニオンツールです。
+## What is this?
 
-通勤中・育児中・昼休み――メールに返信する感覚で「次の指示」を出し、個人開発を前に進められます。
+A development companion tool that manages Claude Code sessions per Git worktree and lets you send instructions from your browser.
 
-## 何ではないか
+During your commute, childcare breaks, or lunch — send the next instruction as easily as replying to an email, and keep your side projects moving forward.
 
-- ターミナルの代替ではありません。Claude Code を**補完**するツールです
-- CLI の全機能を再現するものではなく、「入力待ち/未確認を見逃さず、すぐ指示を出す」ことに特化しています
+## What it is NOT
 
-## 想定ユーザー
+- It is not a terminal replacement. It **complements** Claude Code
+- It does not replicate all CLI features — it specializes in "never missing a prompt/confirmation and responding immediately"
 
-Claude Code での開発経験があり、本業の傍らで個人開発を続けたい方。
+## Target Users
 
-## 主な機能
+Developers with Claude Code experience who want to continue personal projects alongside their day job.
 
-- **入力待ち/未確認検知** — サイドバーでリアルタイムにステータス表示（idle/ready/running/waiting）
-- **ブラウザから指示送信** — スマホ・PCどちらからでもメッセージUIで操作
-- **実行履歴・メモ** — ブランチごとの会話履歴を保持、メモ機能付き
-- **Markdownログビューア** — Claude の詳細出力をMarkdownで閲覧
-- **ファイルビュー** — ワークツリー内のファイルをブラウザから確認
-- **Auto Yes モード** — 確認ダイアログ付きで自動承認を制御
-- **リポジトリ削除** — 不要になったリポジトリをアプリ管理から解除（実ファイルは削除しません）
-- **クローンURL登録** — HTTPS/SSH URLを指定してリポジトリをクローン・登録
-- **Claude Code 特化** — Claude Code セッションの管理に最適化
-- **レスポンシブUI** — デスクトップは2カラム、モバイルはタブベースで最適表示
+## Key Features
 
-### ワークツリー詳細画面（Message / Console / History）
+- **Prompt/confirmation detection** — Real-time status display in the sidebar (idle/ready/running/waiting)
+- **Send instructions from browser** — Operate via message UI from both mobile and desktop
+- **Execution history & notes** — Retains conversation history per branch with note-taking support
+- **Markdown log viewer** — View Claude's detailed output in Markdown format
+- **File viewer** — Browse worktree files from the browser
+- **Auto Yes mode** — Control automatic approval with a confirmation dialog
+- **Repository removal** — Remove repositories from app management (actual files are not deleted)
+- **Clone URL registration** — Clone and register repositories by specifying HTTPS/SSH URLs
+- **Claude Code optimized** — Optimized for Claude Code session management
+- **Responsive UI** — Two-column layout on desktop, tab-based layout on mobile
 
-| PC表示 | スマホ（History） | スマホ（Terminal） |
-|--------|-------------------|-------------------|
-| ![PC - ワークツリー詳細](./docs/images/screenshot-worktree-desktop.png) | ![スマホ - History](./docs/images/screenshot-worktree-mobile.png) | ![スマホ - Terminal](./docs/images/screenshot-worktree-mobile-terminal.png) |
+### Worktree Detail View (Message / Console / History)
 
-### トップ画面（スマホ）
+| Desktop | Mobile (History) | Mobile (Terminal) |
+|---------|-----------------|-------------------|
+| ![Desktop - Worktree detail](./docs/images/screenshot-worktree-desktop.png) | ![Mobile - History](./docs/images/screenshot-worktree-mobile.png) | ![Mobile - Terminal](./docs/images/screenshot-worktree-mobile-terminal.png) |
 
-![スマホ表示](./docs/images/screenshot-mobile.png)
+### Top Page (Mobile)
+
+![Mobile view](./docs/images/screenshot-mobile.png)
 
 ## Quick Start
 
-### 前提条件
+### Prerequisites
 
-- macOS / Linux（tmux 依存のため Windows は非対応）
-- Node.js v20+、npm、git、tmux、openssl
-- Claude CLI（オプション）
+- macOS / Linux (Windows not supported due to tmux dependency)
+- Node.js v20+, npm, git, tmux, openssl
+- Claude CLI (optional)
 
-### インストール
+### Installation
 
 ```bash
 npm install -g commandmate
 ```
 
-### セットアップと起動
+### Setup and Launch
 
 ```bash
-commandmate init              # 依存チェック、環境設定、DB初期化
-commandmate start --daemon    # バックグラウンドで起動
+commandmate init              # Dependency check, environment setup, DB initialization
+commandmate start --daemon    # Start in background
 ```
 
-ブラウザで http://localhost:3000 にアクセスしてください。
+Open http://localhost:3000 in your browser.
 
-### CLI コマンド
+### CLI Commands
 
-| コマンド | 説明 |
-|---------|------|
-| `commandmate init` | 初期設定（対話形式） |
-| `commandmate init --defaults` | 初期設定（デフォルト値） |
-| `commandmate start --daemon` | バックグラウンド起動 |
-| `commandmate start -p 3001` | ポート指定で起動 |
-| `commandmate stop` | サーバー停止 |
-| `commandmate status` | 状態確認 |
+| Command | Description |
+|---------|-------------|
+| `commandmate init` | Initial setup (interactive) |
+| `commandmate init --defaults` | Initial setup (default values) |
+| `commandmate start --daemon` | Start in background |
+| `commandmate start -p 3001` | Start on a specific port |
+| `commandmate stop` | Stop the server |
+| `commandmate status` | Check status |
 
-詳しくは [CLI セットアップガイド](./docs/user-guide/cli-setup-guide.md) を参照してください。
+See the [CLI Setup Guide](./docs/en/user-guide/cli-setup-guide.md) for details.
 
-### モバイルからのアクセス
+### Mobile Access
 
-`commandmate init` で外部アクセスを有効にすると、`CM_BIND=0.0.0.0` が設定されます。同一LAN内から `http://<PCのIP>:3000` にアクセスします。外部公開時はリバースプロキシでの認証を推奨します。詳細は [セキュリティガイド](./docs/security-guide.md) を参照してください。
+Enabling external access via `commandmate init` sets `CM_BIND=0.0.0.0`. Access from the same LAN at `http://<your PC's IP>:3000`. For external access, we recommend authentication via a reverse proxy. See the [Security Guide](./docs/en/security-guide.md) for details.
 
-## 開発者向けセットアップ
+## Developer Setup
 
-コントリビューターや開発環境を構築する場合は、git clone を使用してください。
+For contributors or those building a development environment, use git clone.
 
 ```bash
 git clone https://github.com/Kewton/CommandMate.git
 cd CommandMate
-./scripts/setup.sh  # 依存チェック、環境設定、ビルド、起動まで自動実行
+./scripts/setup.sh  # Auto-runs dependency check, env setup, build, and launch
 ```
 
-### 手動セットアップ（カスタマイズしたい場合）
+### Manual Setup (for customization)
 
 ```bash
 git clone https://github.com/Kewton/CommandMate.git
 cd CommandMate
-./scripts/preflight-check.sh          # 依存チェック
+./scripts/preflight-check.sh          # Dependency check
 npm install
-./scripts/setup-env.sh                # 対話式で .env を生成
+./scripts/setup-env.sh                # Interactive .env generation
 npm run db:init
 npm run build
 npm start
 ```
 
-> **Note**: `./scripts/*` スクリプトは開発環境でのみ使用可能です。グローバルインストール（`npm install -g`）では `commandmate` CLI を使用してください。
+> **Note**: `./scripts/*` scripts are only available in the development environment. For global installs (`npm install -g`), use the `commandmate` CLI.
 
-> **Note**: 旧名称の環境変数（`MCBD_*`）も後方互換性のためサポートされていますが、新名称（`CM_*`）の使用を推奨します。
+> **Note**: Legacy environment variable names (`MCBD_*`) are still supported for backward compatibility, but using the new names (`CM_*`) is recommended.
 
 ## FAQ
 
-**Q: どこまでローカルで動く？**
-A: アプリ本体・DB・セッションはすべてローカルで完結します。外部通信は Claude CLI 自体の API 呼び出しのみです。
+**Q: Does everything run locally?**
+A: The app, database, and sessions all run entirely locally. The only external communication is the Claude CLI's own API calls.
 
-**Q: 外出先からスマホでアクセスするには？**
-A: Cloudflare Tunnel などのトンネリングサービスを活用することで利用できます。室内であればローカル PC と同じ Wi-Fi に接続するだけでスマホから利用可能です。
+**Q: How do I access it from my phone outside the house?**
+A: You can use tunneling services like Cloudflare Tunnel. Within your home, simply connect your phone to the same Wi-Fi as your PC.
 
-**Q: Claude Code の権限はどうなる？**
-A: Claude Code 自体の権限設定がそのまま適用されます。本ツールが権限を拡張することはありません。詳しくは [Trust & Safety](./docs/TRUST_AND_SAFETY.md) を参照してください。
+**Q: What about Claude Code's permissions?**
+A: Claude Code's own permission settings apply as-is. This tool does not expand permissions. See [Trust & Safety](./docs/en/TRUST_AND_SAFETY.md) for details.
 
-**Q: Windows で使える？**
-A: 現時点では非対応です。tmux に依存しているため macOS / Linux が必要です。WSL2 上での動作は未検証です。
+**Q: Does it work on Windows?**
+A: Not currently supported. macOS / Linux is required due to the tmux dependency. WSL2 has not been tested.
 
-**Q: Claude Code 以外の CLI ツールに対応している？**
-A: Claude Code と Codex CLI に対応しています。Strategy パターンによる拡張可能な設計のため、今後他のツールも追加可能です。
+**Q: Does it support CLI tools other than Claude Code?**
+A: It supports Claude Code and Codex CLI. Thanks to the extensible Strategy pattern design, additional tools can be added in the future.
 
-**Q: 複数人で使える？**
-A: 現時点では個人利用を想定しています。複数人での同時利用は未対応です。
+**Q: Can multiple people use it?**
+A: Currently designed for individual use. Simultaneous multi-user access is not supported.
 
-## ドキュメント
+## Documentation
 
-| ドキュメント | 説明 |
-|-------------|------|
-| [CLI セットアップガイド](./docs/user-guide/cli-setup-guide.md) | インストールと初期設定 |
-| [Webアプリ操作ガイド](./docs/user-guide/webapp-guide.md) | Webアプリの基本操作 |
-| [クイックスタート](./docs/user-guide/quick-start.md) | Claude Codeコマンドの使い方 |
-| [コンセプト](./docs/concept.md) | ビジョンと解決する課題 |
-| [アーキテクチャ](./docs/architecture.md) | システム設計 |
-| [デプロイガイド](./docs/DEPLOYMENT.md) | 本番環境構築手順 |
-| [移行ガイド](./docs/migration-to-commandmate.md) | MyCodeBranchDesk からの移行手順 |
-| [UI/UXガイド](./docs/UI_UX_GUIDE.md) | UI実装の詳細 |
-| [Trust & Safety](./docs/TRUST_AND_SAFETY.md) | セキュリティと権限の考え方 |
+| Document | Description |
+|----------|-------------|
+| [CLI Setup Guide](./docs/en/user-guide/cli-setup-guide.md) | Installation and initial setup |
+| [Web App Guide](./docs/en/user-guide/webapp-guide.md) | Basic web app operations |
+| [Quick Start](./docs/en/user-guide/quick-start.md) | Using Claude Code commands |
+| [Concept](./docs/en/concept.md) | Vision and problems solved |
+| [Architecture](./docs/en/architecture.md) | System design |
+| [Deployment Guide](./docs/en/DEPLOYMENT.md) | Production environment setup |
+| [Migration Guide](./docs/en/migration-to-commandmate.md) | Migrating from MyCodeBranchDesk |
+| [UI/UX Guide](./docs/en/UI_UX_GUIDE.md) | UI implementation details |
+| [Trust & Safety](./docs/en/TRUST_AND_SAFETY.md) | Security and permissions |
 
 ## Contributing
 
-バグ報告・機能提案・ドキュメント改善を歓迎します。詳しくは [CONTRIBUTING.md](./CONTRIBUTING.md) を参照してください。
+Bug reports, feature suggestions, and documentation improvements are welcome. See [CONTRIBUTING.md](./CONTRIBUTING.md) for details.
 
 ## License
 

package/dist/server/src/config/auto-yes-config.js

@@ -16,11 +16,11 @@ exports.formatTimeRemaining = formatTimeRemaining;
 exports.ALLOWED_DURATIONS = [3600000, 10800000, 28800000];
 /** Default Auto-Yes duration (1 hour = 3600000ms) */
 exports.DEFAULT_AUTO_YES_DURATION = 3600000;
-/** UI display labels for each duration value */
+/** i18n translation keys for each duration value */
 exports.DURATION_LABELS = {
-    3600000: '1時間',
-    10800000: '3時間',
-    28800000: '8時間',
+    3600000: 'autoYes.durations.1h',
+    10800000: 'autoYes.durations.3h',
+    28800000: 'autoYes.durations.8h',
 };
 /**
  * Type guard: check whether a value is a valid AutoYesDuration.

package/dist/server/src/config/log-config.js

@@ -0,0 +1,41 @@
+"use strict";
+/**
+ * Log Directory Configuration
+ * Issue #11: Centralized LOG_DIR constant
+ *
+ * Eliminates duplicate LOG_DIR definitions previously found in:
+ * - src/lib/log-manager.ts
+ * - src/app/api/worktrees/[id]/logs/[filename]/route.ts
+ *
+ * Dependency chain: log-config.ts -> env.ts -> db-path-resolver.ts (no circular dependency)
+ *
+ * @module log-config
+ */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getLogDir = getLogDir;
+const path_1 = __importDefault(require("path"));
+const env_1 = require("../lib/env");
+/**
+ * Get the log directory path.
+ *
+ * Resolution order:
+ * 1. CM_LOG_DIR environment variable (with MCBD_LOG_DIR fallback via getEnvByKey)
+ * 2. Default: `${process.cwd()}/data/logs`
+ *
+ * @returns Absolute path to the log directory
+ *
+ * @example
+ * ```typescript
+ * import { getLogDir } from '../config/log-config';
+ *
+ * const logDir = getLogDir();
+ * // => '/path/to/project/data/logs' (default)
+ * // => '/custom/log/dir' (when CM_LOG_DIR is set)
+ * ```
+ */
+function getLogDir() {
+    return (0, env_1.getEnvByKey)('CM_LOG_DIR') || path_1.default.join(process.cwd(), 'data', 'logs');
+}

package/dist/server/src/lib/cli-tools/manager.js

@@ -9,7 +9,6 @@ const claude_1 = require("./claude");
 const codex_1 = require("./codex");
 const gemini_1 = require("./gemini");
 const response_poller_1 = require("../response-poller");
-const claude_poller_1 = require("../claude-poller");
 /**
  * CLI Tool Manager (Singleton)
  * Provides centralized access to all CLI tools
@@ -160,11 +159,6 @@ class CLIToolManager {
     stopPollers(worktreeId, cliToolId) {
         // Stop response-poller for all tools
         (0, response_poller_1.stopPolling)(worktreeId, cliToolId);
-        // claude-poller is Claude-specific
-        if (cliToolId === 'claude') {
-            (0, claude_poller_1.stopPolling)(worktreeId);
-        }
-        // Future: Add other tool-specific pollers here if needed
     }
 }
 exports.CLIToolManager = CLIToolManager;

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 });
@@ -272,7 +315,7 @@ function isContinuationLine(rawLine, line) {
     // the question line would be misclassified as a continuation line, causing
     // questionEndIndex to remain -1 and Layer 5 SEC-001 to block detection.
     const endsWithQuestion = line.endsWith('?') || line.endsWith('\uff1f');
-    const hasLeadingSpaces = rawLine.match(/^\s{2,}[^\d]/) && !rawLine.match(/^\s*\d+\./) && !endsWithQuestion;
+    const hasLeadingSpaces = /^\s{2,}[^\d]/.test(rawLine) && !/^\s*\d+\./.test(rawLine) && !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)
@@ -414,6 +457,18 @@ function detectMultipleChoicePrompt(output, options) {
         // No clear question found - use a generic one
         question = 'Please select an option:';
     }
+    // Extract instruction text: full prompt block (context before question through all options/descriptions)
+    // Captures the complete AskUserQuestion block including option descriptions and navigation hints.
+    let instructionText;
+    if (questionEndIndex >= 0) {
+        const contextStart = Math.max(0, questionEndIndex - 19);
+        const blockLines = lines.slice(contextStart, effectiveEnd)
+            .map(l => l.trimEnd());
+        const joined = blockLines.join('\n').trim();
+        if (joined.length > 0) {
+            instructionText = joined;
+        }
+    }
     return {
         isPrompt: true,
         promptData: {
@@ -430,8 +485,10 @@ function detectMultipleChoicePrompt(output, options) {
                 };
             }),
             status: 'pending',
+            instructionText,
         },
         cleanContent: question.trim(),
+        rawContent: truncateRawContent(output.trim()), // Issue #235: complete prompt output (truncated) [MF-001]
     };
 }
 /**

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.3",
   "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",