git-coco 0.41.2 → 0.42.0

package/dist/index.esm.mjs

@@ -17,6 +17,8 @@ import prettyMilliseconds from 'pretty-ms';
 import { ChatAnthropic } from '@langchain/anthropic';
 import { ChatOllama } from '@langchain/ollama';
 import { ChatOpenAI } from '@langchain/openai';
+import * as fs$1 from 'node:fs';
+import * as path$1 from 'node:path';
 import { StructuredOutputParser, BaseOutputParser, StringOutputParser } from '@langchain/core/output_parsers';
 import { minimatch } from 'minimatch';
 import { simpleGit, GitError } from 'simple-git';
@@ -38,9 +40,7 @@ import '@langchain/core/utils/async_caller';
 import { encoding_for_model } from 'tiktoken';
 import { spawn, exec, execFile } from 'child_process';
 import { spawnSync } from 'node:child_process';
-import * as fs$1 from 'node:fs';
 import * as os$1 from 'node:os';
-import * as path$1 from 'node:path';
 import * as crypto from 'node:crypto';
 import * as readline from 'readline';
 import readline__default from 'readline';
@@ -53,7 +53,7 @@ import { pathToFileURL } from 'url';
 /**
  * Current build version from package.json
  */
-const BUILD_VERSION = "0.41.2";
+const BUILD_VERSION = "0.42.0";
 
 const isInteractive = (config) => {
     return config?.mode === 'interactive' || !!config?.interactive;
@@ -6343,6 +6343,7 @@ function resolveDynamicService(config, task) {
     };
 }
 
+const benchCalls = [];
 const telemetryByCommand = new Map();
 function estimatePromptTokens(tokenizer, renderedPrompt) {
     if (!tokenizer)
@@ -6354,10 +6355,28 @@ function estimatePromptTokens(tokenizer, renderedPrompt) {
         return undefined;
     }
 }
+function isBenchModeActive() {
+    return Boolean(process.env.COCO_BENCH && process.env.COCO_BENCH !== '0');
+}
+function recordBenchCall(metadata) {
+    if (!isBenchModeActive())
+        return;
+    benchCalls.push({
+        task: metadata.task,
+        command: metadata.command,
+        provider: metadata.provider,
+        model: metadata.model,
+        promptTokens: metadata.promptTokens,
+        elapsedMs: metadata.elapsedMs,
+        inputDocuments: metadata.inputDocuments,
+        inputChunks: metadata.inputChunks,
+    });
+}
 function logLlmCall(logger, metadata) {
     if (!logger)
         return;
     recordLlmTelemetry(metadata);
+    recordBenchCall(metadata);
     const fields = [
         `task=${metadata.task}`,
         metadata.command ? `command=${metadata.command}` : undefined,
@@ -15369,6 +15388,13 @@ const LOG_INK_KEY_BINDINGS = [
         description: 'Push the dedicated pull-request action panel for the current branch.',
         contexts: ['normal'],
     },
+    {
+        id: 'navigateConflicts',
+        keys: ['gx'],
+        label: 'conflicts',
+        description: 'Push the conflict resolution helper view (available during merge/rebase/cherry-pick/revert).',
+        contexts: ['normal'],
+    },
     {
         id: 'navigateBack',
         keys: ['<', 'esc'],
@@ -15498,6 +15524,7 @@ const GLOBAL_BINDING_IDS = [
     'navigateStash',
     'navigateWorktrees',
     'navigatePullRequest',
+    'navigateConflicts',
     'navigateBack',
 ];
 const NORMAL_GLOBAL_HINTS = ['g jump', '< back', '? help', ': cmds', 'q quit'];
@@ -15670,6 +15697,12 @@ function getLogInkFooterHints(options) {
             global: NORMAL_GLOBAL_HINTS,
         };
     }
+    if (options.activeView === 'conflicts') {
+        return {
+            contextual: ['↑/↓ files', 'enter diff', 's stage', 'u theirs', 'U ours', 'o edit', 'C continue*', 'esc back'],
+            global: NORMAL_GLOBAL_HINTS,
+        };
+    }
     return {
         // History view default hints. Mutating ops (`c` cherry-pick, `R`
         // revert, `Z` reset, `i` interactive-rebase) all route through a
@@ -16416,6 +16449,7 @@ function createLogInkState(rows, options = {}) {
         selectedTagIndex: 0,
         selectedStashIndex: 0,
         selectedWorktreeListIndex: 0,
+        selectedConflictFileIndex: 0,
         branchSort: DEFAULT_BRANCH_SORT_MODE,
         tagSort: DEFAULT_TAG_SORT_MODE,
         paletteFilter: '',
@@ -16669,6 +16703,12 @@ function applyLogInkAction(state, action) {
                 selectedWorktreeListIndex: clampIndex$1(state.selectedWorktreeListIndex + action.delta, action.count),
                 pendingKey: undefined,
             };
+        case 'moveConflictFile':
+            return {
+                ...state,
+                selectedConflictFileIndex: clampIndex$1(state.selectedConflictFileIndex + action.delta, action.count),
+                pendingKey: undefined,
+            };
         case 'cycleBranchSort':
             return {
                 ...state,
@@ -17337,6 +17377,8 @@ function getLogInkPaletteExecuteEvents(command, state) {
             return [action({ type: 'pushView', value: 'worktrees' })];
         case 'navigatePullRequest':
             return [action({ type: 'pushView', value: 'pull-request' })];
+        case 'navigateConflicts':
+            return [action({ type: 'pushView', value: 'conflicts' })];
         case 'navigateBack':
             return [action({ type: 'popView' })];
         case 'openSelected': {
@@ -17808,6 +17850,12 @@ function getLogInkInputEvents(state, inputValue, key = {}, context = {}) {
             action({ type: 'setStatus', value: 'jumped to pull request' }),
         ];
     }
+    if (state.pendingKey === 'g' && inputValue === 'x') {
+        return [
+            action({ type: 'pushView', value: 'conflicts' }),
+            action({ type: 'setStatus', value: 'jumped to conflicts' }),
+        ];
+    }
     // `gH` chord: apply the cursored hunk to the index (`git apply
     // --cached`). Sibling of bare `H` which targets the worktree.
     // Discoverable via the footer hint on diff views and the help
@@ -18117,6 +18165,9 @@ function getLogInkInputEvents(state, inputValue, key = {}, context = {}) {
         if (isWorktreeActionTarget(state) && context.worktreeListCount) {
             return [action({ type: 'moveWorktreeListEntry', delta: -1, count: context.worktreeListCount })];
         }
+        if (state.activeView === 'conflicts' && context.conflictFileCount) {
+            return [action({ type: 'moveConflictFile', delta: -1, count: context.conflictFileCount })];
+        }
         if (state.activeView === 'history' &&
             state.focus === 'commits' &&
             state.selectedIndex === 0 &&
@@ -18195,6 +18246,9 @@ function getLogInkInputEvents(state, inputValue, key = {}, context = {}) {
         if (isWorktreeActionTarget(state) && context.worktreeListCount) {
             return [action({ type: 'moveWorktreeListEntry', delta: 1, count: context.worktreeListCount })];
         }
+        if (state.activeView === 'conflicts' && context.conflictFileCount) {
+            return [action({ type: 'moveConflictFile', delta: 1, count: context.conflictFileCount })];
+        }
         return [
             action(state.focus === 'sidebar'
                 ? { type: 'nextSidebarTab' }
@@ -18380,6 +18434,11 @@ function getLogInkInputEvents(state, inputValue, key = {}, context = {}) {
                 fileIndex: state.selectedWorktreeFileIndex,
             })];
     }
+    // Enter on a conflict file opens the worktree diff for that file so
+    // the user can inspect the conflict markers in context.
+    if (key.return && state.activeView === 'conflicts' && context.conflictFileCount && context.conflictSelectedPath) {
+        return [{ type: 'runWorkflowAction', id: 'resolve-conflict-open-diff', payload: context.conflictSelectedPath }];
+    }
     // Enter on a branch row checks the branch out. Non-destructive workflow
     // action — no confirmation prompt. Fires from either the dedicated
     // branches view or from the sidebar when the branches tab is focused
@@ -18521,6 +18580,32 @@ function getLogInkInputEvents(state, inputValue, key = {}, context = {}) {
     if (inputValue === 'o' && state.activeView === 'diff' && state.diffSource === 'stash' && context.stashDiffSelectedPath) {
         return [{ type: 'openFileInEditor', path: context.stashDiffSelectedPath }];
     }
+    // --- Conflicts view per-row handlers ---
+    // `o` opens the conflicted file in $EDITOR for manual resolution.
+    if (inputValue === 'o' && state.activeView === 'conflicts' && context.conflictFileCount && context.conflictSelectedPath) {
+        return [{ type: 'openFileInEditor', path: context.conflictSelectedPath }];
+    }
+    // `s` stages the conflicted file (marks it resolved).
+    if (inputValue === 's' && state.activeView === 'conflicts' && context.conflictFileCount && context.conflictSelectedPath) {
+        return [{ type: 'runWorkflowAction', id: 'resolve-conflict-stage', payload: context.conflictSelectedPath }];
+    }
+    // `u` resolves by keeping theirs (incoming changes).
+    if (inputValue === 'u' && state.activeView === 'conflicts' && context.conflictFileCount && context.conflictSelectedPath) {
+        return [{ type: 'runWorkflowAction', id: 'resolve-conflict-theirs', payload: context.conflictSelectedPath }];
+    }
+    // `U` resolves by keeping ours (current branch).
+    if (inputValue === 'U' && state.activeView === 'conflicts' && context.conflictFileCount && context.conflictSelectedPath) {
+        return [{ type: 'runWorkflowAction', id: 'resolve-conflict-ours', payload: context.conflictSelectedPath }];
+    }
+    // `C` continues the in-progress operation (available when no conflicts remain).
+    if (inputValue === 'C' && state.activeView === 'conflicts' && context.conflictFileCount === 0) {
+        return [{ type: 'runWorkflowAction', id: 'continue-operation' }];
+    }
+    // Always intercept `C` on the conflicts view to prevent fallthrough to
+    // the global `C` (Create PR) binding when conflicts remain.
+    if (inputValue === 'C' && state.activeView === 'conflicts') {
+        return [action({ type: 'setStatus', value: 'Resolve all conflicts before continuing' })];
+    }
     // `c` on a stash diff cherry-picks the file under the cursor —
     // materializes that single path from the stash into the working tree
     // (`git checkout <stashRef> -- <path>`). Routed through the y-confirm
@@ -21817,6 +21902,21 @@ function skipOperation(git, operation) {
     }
     return runAction(() => git.raw(command.args), command.successMessage);
 }
+function resolveConflictOurs(git, path) {
+    return runAction(async () => {
+        await git.raw(['checkout', '--ours', '--', path]);
+        await git.raw(['add', '--', path]);
+    }, `Resolved ${path} (kept ours)`);
+}
+function resolveConflictTheirs(git, path) {
+    return runAction(async () => {
+        await git.raw(['checkout', '--theirs', '--', path]);
+        await git.raw(['add', '--', path]);
+    }, `Resolved ${path} (kept theirs)`);
+}
+function stageConflictResolved(git, path) {
+    return runAction(() => git.raw(['add', '--', path]), `Staged ${path} (marked resolved)`);
+}
 
 function openProviderUrl(repository, target, openUrl = defaultOpenUrlRunner) {
     const url = repository ? buildProviderUrl(repository, target) : undefined;
@@ -25199,6 +25299,51 @@ function LogInkApp(deps) {
                 }
                 return abortOperation(git, operation);
             },
+            'resolve-conflict-ours': async () => {
+                const path = payload?.trim();
+                if (!path)
+                    return { ok: false, message: 'No conflict file selected' };
+                return resolveConflictOurs(git, path);
+            },
+            'resolve-conflict-theirs': async () => {
+                const path = payload?.trim();
+                if (!path)
+                    return { ok: false, message: 'No conflict file selected' };
+                return resolveConflictTheirs(git, path);
+            },
+            'resolve-conflict-stage': async () => {
+                const path = payload?.trim();
+                if (!path)
+                    return { ok: false, message: 'No conflict file selected' };
+                return stageConflictResolved(git, path);
+            },
+            'resolve-conflict-open-diff': async () => {
+                // Push the diff view for the conflicted file so the user can
+                // inspect conflict markers in context. We find the file's index
+                // in the worktree file list and navigate to its diff.
+                const path = payload?.trim();
+                if (!path)
+                    return { ok: false, message: 'No conflict file selected' };
+                const worktreeFiles = context.worktree?.files || [];
+                const fileIndex = worktreeFiles.findIndex((f) => f.path === path);
+                if (fileIndex >= 0) {
+                    dispatch({ type: 'navigateOpenDiffForWorktreeFile', fileIndex });
+                    return { ok: true, message: `Viewing diff for ${path}` };
+                }
+                // File not in worktree list (e.g. deleted-by-us) — open in
+                // editor as fallback so the user can still inspect it.
+                return { ok: true, message: `${path} not in worktree diff list` };
+            },
+            'continue-operation': async () => {
+                const operation = context.operation?.operation;
+                if (!operation || operation === 'none') {
+                    return { ok: false, message: 'No git operation in progress' };
+                }
+                if ((context.operation?.conflictedFiles.length ?? 0) > 0) {
+                    return { ok: false, message: 'Resolve all conflicts before continuing' };
+                }
+                return continueOperation(git, operation);
+            },
             'open-pr': async () => {
                 const repo = context.provider?.repository;
                 if (!repo || repo.provider !== 'github' || !repo.owner || !repo.name) {
@@ -25722,6 +25867,14 @@ function LogInkApp(deps) {
                 ? selected?.hash
                 : undefined,
             worktreeDirty,
+            conflictFileCount: context.operation?.conflictedFiles.length,
+            conflictSelectedPath: (() => {
+                const files = context.operation?.conflictedFiles;
+                if (!files || files.length === 0)
+                    return undefined;
+                const clamped = Math.min(state.selectedConflictFileIndex, files.length - 1);
+                return files[clamped]?.path;
+            })(),
             // H / gH need the actual diff text (not just hunk offsets) to
             // slice the cursored hunk into a `git apply` patch. Stash uses
             // the full `git stash show -p` output; commit-diff uses the
@@ -26086,6 +26239,9 @@ function renderMainPanel(h, components, state, context, contextStatus, worktreeD
     if (state.activeView === 'pull-request') {
         return renderPullRequestSurface(h, components, state, context, contextStatus, bodyRows, width, theme);
     }
+    if (state.activeView === 'conflicts') {
+        return renderConflictsSurface(h, components, state, context, contextStatus, bodyRows, width, theme);
+    }
     return renderHistoryPanel(h, components, state, context, bodyRows, width, theme, hasMoreCommits, loadingMoreCommits);
 }
 function renderHistoryPanel(h, components, state, context, bodyRows, width, theme, hasMoreCommits, loadingMoreCommits) {
@@ -26269,6 +26425,79 @@ function buildStatusSurfaceRows(groups) {
     }
     return rows;
 }
+function renderConflictsSurface(h, components, state, context, contextStatus, bodyRows, width, theme) {
+    const { Box, Text } = components;
+    const focused = state.focus === 'commits';
+    const loading = isLogInkContextKeyLoading(contextStatus, 'operation');
+    const operation = context.operation;
+    const conflictedFiles = operation?.conflictedFiles || [];
+    const operationType = operation?.operation || 'none';
+    // If no operation is in progress, show a fallback message.
+    if (!loading && operationType === 'none') {
+        return h(Box, {
+            borderColor: focusBorderColor(theme, focused),
+            borderStyle: theme.borderStyle,
+            flexDirection: 'column',
+            flexShrink: 0,
+            paddingX: 1,
+            width,
+        }, h(Box, { justifyContent: 'space-between' }, h(Text, { bold: true }, panelTitle('Conflicts', focused)), h(Text, { dimColor: true }, 'no operation in progress')), h(Text, { key: 'conflicts-empty', dimColor: true }, 'No merge, rebase, cherry-pick, or revert in progress.'));
+    }
+    // All conflicts resolved — show the "continue" hint.
+    if (!loading && conflictedFiles.length === 0 && operationType !== 'none') {
+        return h(Box, {
+            borderColor: focusBorderColor(theme, focused),
+            borderStyle: theme.borderStyle,
+            flexDirection: 'column',
+            flexShrink: 0,
+            paddingX: 1,
+            width,
+        }, h(Box, { justifyContent: 'space-between' }, h(Text, { bold: true }, panelTitle('Conflicts', focused)), h(Text, { dimColor: true }, `${operationType} — all conflicts resolved`)), h(Text, { key: 'conflicts-hint', dimColor: true }, `All conflicts resolved. Press C to continue the ${operationType}, or < to go back.`));
+    }
+    const selected = Math.max(0, Math.min(state.selectedConflictFileIndex, Math.max(0, conflictedFiles.length - 1)));
+    const listRows = Math.max(4, bodyRows - 4);
+    const startIndex = Math.max(0, selected - Math.floor(listRows / 2));
+    const visible = conflictedFiles.slice(startIndex, startIndex + listRows);
+    const remaining = conflictedFiles.length;
+    const headerRight = loading
+        ? 'loading conflicts'
+        : `${operationType} — ${remaining} ${remaining === 1 ? 'conflict' : 'conflicts'} remaining`;
+    const statusLabel = (file) => {
+        const code = `${file.indexStatus}${file.worktreeStatus}`;
+        switch (code) {
+            case 'UU': return 'both modified';
+            case 'AA': return 'added by both';
+            case 'DD': return 'both deleted';
+            case 'AU':
+            case 'UA': return 'added by one';
+            case 'DU': return 'deleted by us';
+            case 'UD': return 'deleted by them';
+            default: return code;
+        }
+    };
+    const lines = loading
+        ? [h(Text, { key: 'conflicts-loading', dimColor: true }, formatLogInkLoading({ resource: 'conflicts' }))]
+        : visible.map((file, offset) => {
+            const index = startIndex + offset;
+            const isSelected = index === selected;
+            const cursor = isSelected ? '>' : ' ';
+            const code = `${file.indexStatus}${file.worktreeStatus}`;
+            const label = statusLabel(file);
+            return h(Text, {
+                key: `conflict-${index}`,
+                bold: isSelected,
+                dimColor: !isSelected,
+            }, truncate$1(`${cursor} ${code} ${file.path}  (${label})`, width - 4));
+        });
+    return h(Box, {
+        borderColor: focusBorderColor(theme, focused),
+        borderStyle: theme.borderStyle,
+        flexDirection: 'column',
+        flexShrink: 0,
+        paddingX: 1,
+        width,
+    }, h(Box, { justifyContent: 'space-between' }, h(Text, { bold: true }, panelTitle('Conflicts', focused)), h(Text, { dimColor: true }, headerRight)), ...lines);
+}
 function renderStatusSurface(h, components, state, context, contextStatus, bodyRows, width, theme) {
     const { Box, Text } = components;
     const focused = state.focus === 'commits';

package/dist/index.js

@@ -16,6 +16,8 @@ var prettyMilliseconds = require('pretty-ms');
 var anthropic = require('@langchain/anthropic');
 var ollama = require('@langchain/ollama');
 var openai = require('@langchain/openai');
+var fs$1 = require('node:fs');
+var path$1 = require('node:path');
 var output_parsers = require('@langchain/core/output_parsers');
 var minimatch = require('minimatch');
 var simpleGit = require('simple-git');
@@ -37,9 +39,7 @@ require('@langchain/core/utils/async_caller');
 var tiktoken = require('tiktoken');
 var child_process = require('child_process');
 var node_child_process = require('node:child_process');
-var fs$1 = require('node:fs');
 var os$1 = require('node:os');
-var path$1 = require('node:path');
 var crypto = require('node:crypto');
 var readline = require('readline');
 var util$1 = require('util');
@@ -68,8 +68,8 @@ var ini__namespace = /*#__PURE__*/_interopNamespaceDefault(ini);
 var os__namespace = /*#__PURE__*/_interopNamespaceDefault(os);
 var path__namespace = /*#__PURE__*/_interopNamespaceDefault(path);
 var fs__namespace$1 = /*#__PURE__*/_interopNamespaceDefault(fs$1);
-var os__namespace$1 = /*#__PURE__*/_interopNamespaceDefault(os$1);
 var path__namespace$1 = /*#__PURE__*/_interopNamespaceDefault(path$1);
+var os__namespace$1 = /*#__PURE__*/_interopNamespaceDefault(os$1);
 var crypto__namespace = /*#__PURE__*/_interopNamespaceDefault(crypto);
 var readline__namespace = /*#__PURE__*/_interopNamespaceDefault(readline);
 
@@ -78,7 +78,7 @@ var readline__namespace = /*#__PURE__*/_interopNamespaceDefault(readline);
 /**
  * Current build version from package.json
  */
-const BUILD_VERSION = "0.41.2";
+const BUILD_VERSION = "0.42.0";
 
 const isInteractive = (config) => {
     return config?.mode === 'interactive' || !!config?.interactive;
@@ -6368,6 +6368,7 @@ function resolveDynamicService(config, task) {
     };
 }
 
+const benchCalls = [];
 const telemetryByCommand = new Map();
 function estimatePromptTokens(tokenizer, renderedPrompt) {
     if (!tokenizer)
@@ -6379,10 +6380,28 @@ function estimatePromptTokens(tokenizer, renderedPrompt) {
         return undefined;
     }
 }
+function isBenchModeActive() {
+    return Boolean(process.env.COCO_BENCH && process.env.COCO_BENCH !== '0');
+}
+function recordBenchCall(metadata) {
+    if (!isBenchModeActive())
+        return;
+    benchCalls.push({
+        task: metadata.task,
+        command: metadata.command,
+        provider: metadata.provider,
+        model: metadata.model,
+        promptTokens: metadata.promptTokens,
+        elapsedMs: metadata.elapsedMs,
+        inputDocuments: metadata.inputDocuments,
+        inputChunks: metadata.inputChunks,
+    });
+}
 function logLlmCall(logger, metadata) {
     if (!logger)
         return;
     recordLlmTelemetry(metadata);
+    recordBenchCall(metadata);
     const fields = [
         `task=${metadata.task}`,
         metadata.command ? `command=${metadata.command}` : undefined,
@@ -15394,6 +15413,13 @@ const LOG_INK_KEY_BINDINGS = [
         description: 'Push the dedicated pull-request action panel for the current branch.',
         contexts: ['normal'],
     },
+    {
+        id: 'navigateConflicts',
+        keys: ['gx'],
+        label: 'conflicts',
+        description: 'Push the conflict resolution helper view (available during merge/rebase/cherry-pick/revert).',
+        contexts: ['normal'],
+    },
     {
         id: 'navigateBack',
         keys: ['<', 'esc'],
@@ -15523,6 +15549,7 @@ const GLOBAL_BINDING_IDS = [
     'navigateStash',
     'navigateWorktrees',
     'navigatePullRequest',
+    'navigateConflicts',
     'navigateBack',
 ];
 const NORMAL_GLOBAL_HINTS = ['g jump', '< back', '? help', ': cmds', 'q quit'];
@@ -15695,6 +15722,12 @@ function getLogInkFooterHints(options) {
             global: NORMAL_GLOBAL_HINTS,
         };
     }
+    if (options.activeView === 'conflicts') {
+        return {
+            contextual: ['↑/↓ files', 'enter diff', 's stage', 'u theirs', 'U ours', 'o edit', 'C continue*', 'esc back'],
+            global: NORMAL_GLOBAL_HINTS,
+        };
+    }
     return {
         // History view default hints. Mutating ops (`c` cherry-pick, `R`
         // revert, `Z` reset, `i` interactive-rebase) all route through a
@@ -16441,6 +16474,7 @@ function createLogInkState(rows, options = {}) {
         selectedTagIndex: 0,
         selectedStashIndex: 0,
         selectedWorktreeListIndex: 0,
+        selectedConflictFileIndex: 0,
         branchSort: DEFAULT_BRANCH_SORT_MODE,
         tagSort: DEFAULT_TAG_SORT_MODE,
         paletteFilter: '',
@@ -16694,6 +16728,12 @@ function applyLogInkAction(state, action) {
                 selectedWorktreeListIndex: clampIndex$1(state.selectedWorktreeListIndex + action.delta, action.count),
                 pendingKey: undefined,
             };
+        case 'moveConflictFile':
+            return {
+                ...state,
+                selectedConflictFileIndex: clampIndex$1(state.selectedConflictFileIndex + action.delta, action.count),
+                pendingKey: undefined,
+            };
         case 'cycleBranchSort':
             return {
                 ...state,
@@ -17362,6 +17402,8 @@ function getLogInkPaletteExecuteEvents(command, state) {
             return [action({ type: 'pushView', value: 'worktrees' })];
         case 'navigatePullRequest':
             return [action({ type: 'pushView', value: 'pull-request' })];
+        case 'navigateConflicts':
+            return [action({ type: 'pushView', value: 'conflicts' })];
         case 'navigateBack':
             return [action({ type: 'popView' })];
         case 'openSelected': {
@@ -17833,6 +17875,12 @@ function getLogInkInputEvents(state, inputValue, key = {}, context = {}) {
             action({ type: 'setStatus', value: 'jumped to pull request' }),
         ];
     }
+    if (state.pendingKey === 'g' && inputValue === 'x') {
+        return [
+            action({ type: 'pushView', value: 'conflicts' }),
+            action({ type: 'setStatus', value: 'jumped to conflicts' }),
+        ];
+    }
     // `gH` chord: apply the cursored hunk to the index (`git apply
     // --cached`). Sibling of bare `H` which targets the worktree.
     // Discoverable via the footer hint on diff views and the help
@@ -18142,6 +18190,9 @@ function getLogInkInputEvents(state, inputValue, key = {}, context = {}) {
         if (isWorktreeActionTarget(state) && context.worktreeListCount) {
             return [action({ type: 'moveWorktreeListEntry', delta: -1, count: context.worktreeListCount })];
         }
+        if (state.activeView === 'conflicts' && context.conflictFileCount) {
+            return [action({ type: 'moveConflictFile', delta: -1, count: context.conflictFileCount })];
+        }
         if (state.activeView === 'history' &&
             state.focus === 'commits' &&
             state.selectedIndex === 0 &&
@@ -18220,6 +18271,9 @@ function getLogInkInputEvents(state, inputValue, key = {}, context = {}) {
         if (isWorktreeActionTarget(state) && context.worktreeListCount) {
             return [action({ type: 'moveWorktreeListEntry', delta: 1, count: context.worktreeListCount })];
         }
+        if (state.activeView === 'conflicts' && context.conflictFileCount) {
+            return [action({ type: 'moveConflictFile', delta: 1, count: context.conflictFileCount })];
+        }
         return [
             action(state.focus === 'sidebar'
                 ? { type: 'nextSidebarTab' }
@@ -18405,6 +18459,11 @@ function getLogInkInputEvents(state, inputValue, key = {}, context = {}) {
                 fileIndex: state.selectedWorktreeFileIndex,
             })];
     }
+    // Enter on a conflict file opens the worktree diff for that file so
+    // the user can inspect the conflict markers in context.
+    if (key.return && state.activeView === 'conflicts' && context.conflictFileCount && context.conflictSelectedPath) {
+        return [{ type: 'runWorkflowAction', id: 'resolve-conflict-open-diff', payload: context.conflictSelectedPath }];
+    }
     // Enter on a branch row checks the branch out. Non-destructive workflow
     // action — no confirmation prompt. Fires from either the dedicated
     // branches view or from the sidebar when the branches tab is focused
@@ -18546,6 +18605,32 @@ function getLogInkInputEvents(state, inputValue, key = {}, context = {}) {
     if (inputValue === 'o' && state.activeView === 'diff' && state.diffSource === 'stash' && context.stashDiffSelectedPath) {
         return [{ type: 'openFileInEditor', path: context.stashDiffSelectedPath }];
     }
+    // --- Conflicts view per-row handlers ---
+    // `o` opens the conflicted file in $EDITOR for manual resolution.
+    if (inputValue === 'o' && state.activeView === 'conflicts' && context.conflictFileCount && context.conflictSelectedPath) {
+        return [{ type: 'openFileInEditor', path: context.conflictSelectedPath }];
+    }
+    // `s` stages the conflicted file (marks it resolved).
+    if (inputValue === 's' && state.activeView === 'conflicts' && context.conflictFileCount && context.conflictSelectedPath) {
+        return [{ type: 'runWorkflowAction', id: 'resolve-conflict-stage', payload: context.conflictSelectedPath }];
+    }
+    // `u` resolves by keeping theirs (incoming changes).
+    if (inputValue === 'u' && state.activeView === 'conflicts' && context.conflictFileCount && context.conflictSelectedPath) {
+        return [{ type: 'runWorkflowAction', id: 'resolve-conflict-theirs', payload: context.conflictSelectedPath }];
+    }
+    // `U` resolves by keeping ours (current branch).
+    if (inputValue === 'U' && state.activeView === 'conflicts' && context.conflictFileCount && context.conflictSelectedPath) {
+        return [{ type: 'runWorkflowAction', id: 'resolve-conflict-ours', payload: context.conflictSelectedPath }];
+    }
+    // `C` continues the in-progress operation (available when no conflicts remain).
+    if (inputValue === 'C' && state.activeView === 'conflicts' && context.conflictFileCount === 0) {
+        return [{ type: 'runWorkflowAction', id: 'continue-operation' }];
+    }
+    // Always intercept `C` on the conflicts view to prevent fallthrough to
+    // the global `C` (Create PR) binding when conflicts remain.
+    if (inputValue === 'C' && state.activeView === 'conflicts') {
+        return [action({ type: 'setStatus', value: 'Resolve all conflicts before continuing' })];
+    }
     // `c` on a stash diff cherry-picks the file under the cursor —
     // materializes that single path from the stash into the working tree
     // (`git checkout <stashRef> -- <path>`). Routed through the y-confirm
@@ -21842,6 +21927,21 @@ function skipOperation(git, operation) {
     }
     return runAction(() => git.raw(command.args), command.successMessage);
 }
+function resolveConflictOurs(git, path) {
+    return runAction(async () => {
+        await git.raw(['checkout', '--ours', '--', path]);
+        await git.raw(['add', '--', path]);
+    }, `Resolved ${path} (kept ours)`);
+}
+function resolveConflictTheirs(git, path) {
+    return runAction(async () => {
+        await git.raw(['checkout', '--theirs', '--', path]);
+        await git.raw(['add', '--', path]);
+    }, `Resolved ${path} (kept theirs)`);
+}
+function stageConflictResolved(git, path) {
+    return runAction(() => git.raw(['add', '--', path]), `Staged ${path} (marked resolved)`);
+}
 
 function openProviderUrl(repository, target, openUrl = defaultOpenUrlRunner) {
     const url = repository ? buildProviderUrl(repository, target) : undefined;
@@ -25224,6 +25324,51 @@ function LogInkApp(deps) {
                 }
                 return abortOperation(git, operation);
             },
+            'resolve-conflict-ours': async () => {
+                const path = payload?.trim();
+                if (!path)
+                    return { ok: false, message: 'No conflict file selected' };
+                return resolveConflictOurs(git, path);
+            },
+            'resolve-conflict-theirs': async () => {
+                const path = payload?.trim();
+                if (!path)
+                    return { ok: false, message: 'No conflict file selected' };
+                return resolveConflictTheirs(git, path);
+            },
+            'resolve-conflict-stage': async () => {
+                const path = payload?.trim();
+                if (!path)
+                    return { ok: false, message: 'No conflict file selected' };
+                return stageConflictResolved(git, path);
+            },
+            'resolve-conflict-open-diff': async () => {
+                // Push the diff view for the conflicted file so the user can
+                // inspect conflict markers in context. We find the file's index
+                // in the worktree file list and navigate to its diff.
+                const path = payload?.trim();
+                if (!path)
+                    return { ok: false, message: 'No conflict file selected' };
+                const worktreeFiles = context.worktree?.files || [];
+                const fileIndex = worktreeFiles.findIndex((f) => f.path === path);
+                if (fileIndex >= 0) {
+                    dispatch({ type: 'navigateOpenDiffForWorktreeFile', fileIndex });
+                    return { ok: true, message: `Viewing diff for ${path}` };
+                }
+                // File not in worktree list (e.g. deleted-by-us) — open in
+                // editor as fallback so the user can still inspect it.
+                return { ok: true, message: `${path} not in worktree diff list` };
+            },
+            'continue-operation': async () => {
+                const operation = context.operation?.operation;
+                if (!operation || operation === 'none') {
+                    return { ok: false, message: 'No git operation in progress' };
+                }
+                if ((context.operation?.conflictedFiles.length ?? 0) > 0) {
+                    return { ok: false, message: 'Resolve all conflicts before continuing' };
+                }
+                return continueOperation(git, operation);
+            },
             'open-pr': async () => {
                 const repo = context.provider?.repository;
                 if (!repo || repo.provider !== 'github' || !repo.owner || !repo.name) {
@@ -25747,6 +25892,14 @@ function LogInkApp(deps) {
                 ? selected?.hash
                 : undefined,
             worktreeDirty,
+            conflictFileCount: context.operation?.conflictedFiles.length,
+            conflictSelectedPath: (() => {
+                const files = context.operation?.conflictedFiles;
+                if (!files || files.length === 0)
+                    return undefined;
+                const clamped = Math.min(state.selectedConflictFileIndex, files.length - 1);
+                return files[clamped]?.path;
+            })(),
             // H / gH need the actual diff text (not just hunk offsets) to
             // slice the cursored hunk into a `git apply` patch. Stash uses
             // the full `git stash show -p` output; commit-diff uses the
@@ -26111,6 +26264,9 @@ function renderMainPanel(h, components, state, context, contextStatus, worktreeD
     if (state.activeView === 'pull-request') {
         return renderPullRequestSurface(h, components, state, context, contextStatus, bodyRows, width, theme);
     }
+    if (state.activeView === 'conflicts') {
+        return renderConflictsSurface(h, components, state, context, contextStatus, bodyRows, width, theme);
+    }
     return renderHistoryPanel(h, components, state, context, bodyRows, width, theme, hasMoreCommits, loadingMoreCommits);
 }
 function renderHistoryPanel(h, components, state, context, bodyRows, width, theme, hasMoreCommits, loadingMoreCommits) {
@@ -26294,6 +26450,79 @@ function buildStatusSurfaceRows(groups) {
     }
     return rows;
 }
+function renderConflictsSurface(h, components, state, context, contextStatus, bodyRows, width, theme) {
+    const { Box, Text } = components;
+    const focused = state.focus === 'commits';
+    const loading = isLogInkContextKeyLoading(contextStatus, 'operation');
+    const operation = context.operation;
+    const conflictedFiles = operation?.conflictedFiles || [];
+    const operationType = operation?.operation || 'none';
+    // If no operation is in progress, show a fallback message.
+    if (!loading && operationType === 'none') {
+        return h(Box, {
+            borderColor: focusBorderColor(theme, focused),
+            borderStyle: theme.borderStyle,
+            flexDirection: 'column',
+            flexShrink: 0,
+            paddingX: 1,
+            width,
+        }, h(Box, { justifyContent: 'space-between' }, h(Text, { bold: true }, panelTitle('Conflicts', focused)), h(Text, { dimColor: true }, 'no operation in progress')), h(Text, { key: 'conflicts-empty', dimColor: true }, 'No merge, rebase, cherry-pick, or revert in progress.'));
+    }
+    // All conflicts resolved — show the "continue" hint.
+    if (!loading && conflictedFiles.length === 0 && operationType !== 'none') {
+        return h(Box, {
+            borderColor: focusBorderColor(theme, focused),
+            borderStyle: theme.borderStyle,
+            flexDirection: 'column',
+            flexShrink: 0,
+            paddingX: 1,
+            width,
+        }, h(Box, { justifyContent: 'space-between' }, h(Text, { bold: true }, panelTitle('Conflicts', focused)), h(Text, { dimColor: true }, `${operationType} — all conflicts resolved`)), h(Text, { key: 'conflicts-hint', dimColor: true }, `All conflicts resolved. Press C to continue the ${operationType}, or < to go back.`));
+    }
+    const selected = Math.max(0, Math.min(state.selectedConflictFileIndex, Math.max(0, conflictedFiles.length - 1)));
+    const listRows = Math.max(4, bodyRows - 4);
+    const startIndex = Math.max(0, selected - Math.floor(listRows / 2));
+    const visible = conflictedFiles.slice(startIndex, startIndex + listRows);
+    const remaining = conflictedFiles.length;
+    const headerRight = loading
+        ? 'loading conflicts'
+        : `${operationType} — ${remaining} ${remaining === 1 ? 'conflict' : 'conflicts'} remaining`;
+    const statusLabel = (file) => {
+        const code = `${file.indexStatus}${file.worktreeStatus}`;
+        switch (code) {
+            case 'UU': return 'both modified';
+            case 'AA': return 'added by both';
+            case 'DD': return 'both deleted';
+            case 'AU':
+            case 'UA': return 'added by one';
+            case 'DU': return 'deleted by us';
+            case 'UD': return 'deleted by them';
+            default: return code;
+        }
+    };
+    const lines = loading
+        ? [h(Text, { key: 'conflicts-loading', dimColor: true }, formatLogInkLoading({ resource: 'conflicts' }))]
+        : visible.map((file, offset) => {
+            const index = startIndex + offset;
+            const isSelected = index === selected;
+            const cursor = isSelected ? '>' : ' ';
+            const code = `${file.indexStatus}${file.worktreeStatus}`;
+            const label = statusLabel(file);
+            return h(Text, {
+                key: `conflict-${index}`,
+                bold: isSelected,
+                dimColor: !isSelected,
+            }, truncate$1(`${cursor} ${code} ${file.path}  (${label})`, width - 4));
+        });
+    return h(Box, {
+        borderColor: focusBorderColor(theme, focused),
+        borderStyle: theme.borderStyle,
+        flexDirection: 'column',
+        flexShrink: 0,
+        paddingX: 1,
+        width,
+    }, h(Box, { justifyContent: 'space-between' }, h(Text, { bold: true }, panelTitle('Conflicts', focused)), h(Text, { dimColor: true }, headerRight)), ...lines);
+}
 function renderStatusSurface(h, components, state, context, contextStatus, bodyRows, width, theme) {
     const { Box, Text } = components;
     const focused = state.focus === 'commits';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-coco",
-  "version": "0.41.2",
+  "version": "0.42.0",
   "description": "zero-effort git commits with coco.",
   "author": "gfargo <ghfargo@gmail.com>",
   "license": "MIT",
@@ -39,6 +39,7 @@
     "test": "npm run test:jest && npm run test:publish",
     "test:publish": "npm run lint && npm run build && npm run test:cli && npm pack --dry-run",
     "test:cli": "tsx bin/smokeCli.ts",
+    "bench": "tsx bin/benchmark.ts",
     "pretest:jest": "npm run build:info",
     "test:jest": "jest",
     "test:jest:watch": "jest --watch",