resolve conflicts

Author: yugo-ibuki

README.ja.md

@@ -69,6 +69,7 @@ brew install --cask yugo-ibuki/tap/unitmux
 | `Ctrl+D`                    | セッション詳細ポップアップを表示（キーは設定で変更可能）                          |
 | `Ctrl+C`                    | セッションを終了（詳細パネル表示中、確認ダイアログあり）                          |
 | `Ctrl+G`                    | git操作ポップアップを表示（キーは設定で変更可能）                                 |
+| `Ctrl+F`                    | git diffビューアーを表示（キーは設定で変更可能）                                  |
 | `Ctrl+S`                    | セッションの実行を停止 — Escapeを送信して中断（キーは設定で変更可能）             |
 | `Ctrl+W`                    | コンパクトモード切り替え — タブバーだけの細い表示に（キーは設定で変更可能）       |
 | `Ctrl+N`                    | 新しいセッションを作成（tmuxセッションとコマンドを選択）                          |
@@ -114,6 +115,7 @@ brew install --cask yugo-ibuki/tap/unitmux
 - **Preview Key** — プレビュー表示のキーを変更（`Ctrl+<キー>`）
 - **Detail Key** — セッション詳細のキーを変更（`Ctrl+<キー>`）
 - **Git Key** — git操作のキーを変更（`Ctrl+<キー>`）
+- **Diff Key** — git diffビューアーのキーを変更（`Ctrl+<キー>`）
 - **Focus Key** — unitmuxにフォーカスするグローバルショートカットを変更（`Cmd+Shift+<キー>`）
 - **Slash Commands** — スラッシュコマンドの追加・編集・削除
 

README.md

@@ -71,6 +71,7 @@ When `claude` or `codex` presents numbered choices (e.g. "1. Yes / 2. No"), clic
 | `Ctrl+D`                    | Open session detail popup (key configurable)                            |
 | `Ctrl+C`                    | Close session with confirmation (when detail panel is open)             |
 | `Ctrl+G`                    | Open git operations popup (key configurable)                            |
+| `Ctrl+F`                    | Open git diff viewer (key configurable)                                 |
 | `Ctrl+S`                    | Stop the running session — sends Escape to interrupt (key configurable) |
 | `Ctrl+W`                    | Toggle compact mode — shrinks window to tab bar only (key configurable) |
 | `Ctrl+N`                    | Create a new session (select target tmux session and command)           |
@@ -116,6 +117,7 @@ Click the gear icon to access settings:
 - **Preview Key** — change the key for pane content preview (`Ctrl+<key>`)
 - **Detail Key** — change the key for session detail popup (`Ctrl+<key>`)
 - **Git Key** — change the key for git operations popup (`Ctrl+<key>`)
+- **Diff Key** — change the key for git diff viewer (`Ctrl+<key>`)
 - **Focus Key** — change the global shortcut to focus unitmux (`Cmd+Shift+<key>`)
 - **Slash Commands** — add, edit, and delete reusable slash commands
 

package-lock.json

@@ -19,7 +19,6 @@ import {
   gitDiff,
   getConversationLog
 } from './tmux'
-import type { ChatMessage } from './tmux'
 
 interface SkillEntry {
   name: string
@@ -79,12 +78,19 @@ function startStream(win: BrowserWindow, target: string, mode: 'raw' | 'chat'):
     if (!streamTarget) return
     try {
       if (streamMode === 'chat') {
-        const messages: ChatMessage[] = await getConversationLog(streamTarget)
+        const [messages, content] = await Promise.all([
+          getConversationLog(streamTarget),
+          capturePane(streamTarget)
+        ])
         const json = JSON.stringify(messages)
         if (json !== lastChatJson) {
           lastChatJson = json
           win.webContents.send('tmux:chat-data', messages)
         }
+        if (content !== lastStreamContent) {
+          lastStreamContent = content
+          win.webContents.send('tmux:stream-data', content)
+        }
       } else {
         const content = await capturePane(streamTarget)
         if (content !== lastStreamContent) {

src/main/index.ts

@@ -19,6 +19,7 @@ export interface TmuxPane {
   status: PaneStatus
   choices: TmuxChoice[]
   prompt: string
+  activityLine: string
 }
 
 // Strip ANSI escape sequences from captured pane content.
@@ -515,26 +516,49 @@ const CODEX_IDLE_INDICATORS = [
   /\bsend\b.*\bnewline\b.*\bquit\b/ // legacy format (backward compat)
 ]
 
+// Extract activity indicator line from pane content (e.g. "✻ Imagining… (17s · ↑ 107 tokens)")
+// These lines appear when Claude is actively processing.
+function parseActivityLine(content: string): string {
+  const lines = content.split('\n')
+  for (let i = lines.length - 1; i >= Math.max(0, lines.length - 20); i--) {
+    const line = lines[i].trim()
+    if (!line) continue
+    // Match lines starting with activity indicator characters (✻, ⏺, braille spinners)
+    // followed by text containing ellipsis (…)
+    if (/^[✻⏺\u2800-\u28FF]/.test(line) && /…/.test(line)) {
+      return line
+    }
+  }
+  return ''
+}
+
 function detectStatusClaude(
   title: string,
   content: string
-): { status: PaneStatus; choices: TmuxChoice[]; prompt: string } {
+): { status: PaneStatus; choices: TmuxChoice[]; prompt: string; activityLine: string } {
   // Always check for choices first — permission prompts (e.g. "Do you want to proceed?
   // ❯ 1. Yes  2. No") can appear while the title still shows ⠂ (busy).
   const choices = parseChoices(content)
   if (choices.length > 0) {
-    return { status: 'waiting', choices, prompt: parsePrompt(content) }
+    return { status: 'waiting', choices, prompt: parsePrompt(content), activityLine: '' }
   }
 
-  if (!title.includes('✳')) return { status: 'busy', choices: [], prompt: '' }
+  if (!title.includes('✳')) {
+    return {
+      status: 'busy',
+      choices: [],
+      prompt: '',
+      activityLine: parseActivityLine(content)
+    }
+  }
 
   const lines = content.split('\n').slice(-10)
   for (const pattern of WAITING_PATTERNS) {
     if (lines.some((line) => pattern.test(line))) {
-      return { status: 'waiting', choices: [], prompt: parsePrompt(content) }
+      return { status: 'waiting', choices: [], prompt: parsePrompt(content), activityLine: '' }
     }
   }
-  return { status: 'idle', choices: [], prompt: '' }
+  return { status: 'idle', choices: [], prompt: '', activityLine: '' }
 }
 
 // Codex presents options as indented "- " list items
@@ -546,14 +570,15 @@ function detectStatusCodex(content: string): {
   status: PaneStatus
   choices: TmuxChoice[]
   prompt: string
+  activityLine: string
 } {
   const lines = content.split('\n').slice(-15)
   const tail = lines.join('\n')
 
   // 1. Check for explicit busy signals (-ing words or "esc to interrupt")
   const isBusy = CODEX_BUSY_PATTERNS.some((p) => p.test(tail))
   if (isBusy) {
-    return { status: 'busy', choices: [], prompt: '' }
+    return { status: 'busy', choices: [], prompt: '', activityLine: parseActivityLine(content) }
   }
 
   // 2. Check for explicit idle signals (footer hints)
@@ -562,22 +587,22 @@ function detectStatusCodex(content: string): {
     const hasQuestion = lines.some((line) => CODEX_QUESTION_PATTERN.test(line))
     const optionCount = lines.filter((line) => CODEX_OPTION_PATTERN.test(line)).length
     if (hasQuestion || optionCount >= 2) {
-      return { status: 'waiting', choices: [], prompt: '' }
+      return { status: 'waiting', choices: [], prompt: '', activityLine: '' }
     }
-    return { status: 'idle', choices: [], prompt: '' }
+    return { status: 'idle', choices: [], prompt: '', activityLine: '' }
   }
 
   // 3. No busy signal detected → default to idle (not busy).
   // If Codex is NOT showing "Working"/"Thinking"/etc,
   // it is most likely at the input prompt waiting for user input.
-  return { status: 'idle', choices: [], prompt: '' }
+  return { status: 'idle', choices: [], prompt: '', activityLine: '' }
 }
 
 function detectStatus(
   title: string,
   content: string,
   command: string
-): { status: PaneStatus; choices: TmuxChoice[]; prompt: string } {
+): { status: PaneStatus; choices: TmuxChoice[]; prompt: string; activityLine: string } {
   if (command === 'codex') return detectStatusCodex(content)
   return detectStatusClaude(title, content)
 }
@@ -600,7 +625,8 @@ export async function listPanes(): Promise<TmuxPane[]> {
         title,
         status: 'busy' as PaneStatus,
         choices: [] as TmuxChoice[],
-        prompt: ''
+        prompt: '',
+        activityLine: ''
       }
     })
     // Support popular wrappers like `ai` in addition to `claude` and `codex`.
@@ -639,6 +665,7 @@ export async function listPanes(): Promise<TmuxPane[]> {
       pane.status = result.status
       pane.choices = result.choices
       pane.prompt = result.prompt
+      pane.activityLine = result.activityLine
     })
   )
 

src/main/tmux.ts

@@ -18,6 +18,7 @@ interface TmuxPane {
   status: 'idle' | 'busy' | 'waiting'
   choices: TmuxChoice[]
   prompt: string
+  activityLine: string
 }
 
 interface PaneDetail {

src/preload/index.d.ts

@@ -16,6 +16,7 @@ export interface TmuxPane {
   pid: string
   command: string
   title: string
+  activityLine: string
 }
 
 export interface PaneDetail {