three_way_conflict_resolution__h8B4rcJ

2026-03-19 08:21:17.825	DEBUG	native:1	Pochi	pochi v0.6.1
2026-03-19 08:21:18.075	DEBUG	/$bunfs/root/pochi:503183	loadAgents	Loaded 5 custom agents (5 valid, 0 invalid)
2026-03-19 08:21:18.076	DEBUG	/$bunfs/root/pochi:503184	loadSkills	Loaded 2 skills (2 valid, 0 invalid)
2026-03-19 08:21:18.119	DEBUG	/$bunfs/root/pochi:439420	PochiVendor	JWT is expiring or missing, fetching a new one
2026-03-19 08:21:20.089	DEBUG	/$bunfs/root/pochi:415701	MCPHub	MCP servers configuration changed via signal:
2026-03-19 08:21:20.090	DEBUG	/$bunfs/root/pochi:415813	MCPHub	Build MCPHub Status
2026-03-19 08:21:20.211	DEBUG	/$bunfs/root/pochi:502609	TaskRunner	Starting TaskRunner...
2026-03-19 08:21:20.294	DEBUG	/$bunfs/root/pochi:454339	listFiles	Listing workspace files from /home/user/repo with maxItems 500
2026-03-19 08:21:20.404	DEBUG	/$bunfs/root/pochi:496641	generateTaskTitle	Generating task title, old: null, new: The repository at `/home/user/repo` has a merge commit `merge-ab` that merges two branches (`branch-a` and `branch-b`) which both modified `src/config.py` from a common base. The merge has conflicts.
2026-03-19 08:22:08.655	DEBUG		TaskRunner	Failed:

 TypeError  undefined is not an object (evaluating 'getErrorTrace(error40).map'), 417706, 47, 417706, 47, /$bunfs/root/pochi
error stack:
  • pochi	prettyFormatErrorObj
	/$bunfs/root/pochi:417706
  • pochi	<anonymous>
	/$bunfs/root/pochi:417701
  • native	reduce
	native:1
  • pochi	log
	/$bunfs/root/pochi:417840
  • pochi	onError
	/$bunfs/root/pochi:500813
  • pochi	makeRequest
	/$bunfs/root/pochi:432009
  • 	
	
  • 	
	
  • 	
	
  • 	
	
  • native	processTicksAndRejections
	native:7
undefined is not an object (evaluating 'getErrorTrace(error40).map')

Hit:1 http://security.ubuntu.com/ubuntu noble-security InRelease
Hit:2 http://archive.ubuntu.com/ubuntu noble InRelease
Hit:3 http://archive.ubuntu.com/ubuntu noble-updates InRelease
Hit:4 http://archive.ubuntu.com/ubuntu noble-backports InRelease
Reading package lists...
Reading package lists...
Building dependency tree...
Reading state information...
curl is already the newest version (8.5.0-2ubuntu10.8).
0 upgraded, 0 newly installed, 0 to remove and 13 not upgraded.
downloading uv 0.9.7 x86_64-unknown-linux-gnu
no checksums to verify
installing to /home/user/.local/bin
  uv
  uvx
everything's installed!

To add $HOME/.local/bin to your PATH, either restart your shell or run:

    source $HOME/.local/bin/env (sh, bash, zsh)
    source $HOME/.local/bin/env.fish (fish)
Downloading pygments (1.2MiB)
 Downloading pygments
Installed 6 packages in 16ms
============================= test session starts ==============================
platform linux -- Python 3.12.3, pytest-8.4.1, pluggy-1.6.0
rootdir: /tests
plugins: json-ctrf-0.3.5
collected 9 items

../../../tests/test_outputs.py F......FF                                 [100%]

=================================== FAILURES ===================================
___________________________ test_no_conflicts_remain ___________________________

    def test_no_conflicts_remain():
        result = jj("resolve", "--list", "-r", "merge-ab")
>       assert result.returncode != 0 or result.stdout.strip() == "", \
            "No conflicts should remain in merge-ab"
E       AssertionError: No conflicts should remain in merge-ab
E       assert (0 != 0 or 'src/config.p...ided conflict' == ''
E        +  where 0 = CompletedProcess(args=['jj', 'resolve', '--list', '-r', 'merge-ab'], returncode=0, stdout='src/config.py    2-sided conflict\n', stderr='').returncode
E         
E         + src/config.py    2-sided conflict)

/tests/test_outputs.py:23: AssertionError
________________________ test_resolution_summary_exists ________________________

    def test_resolution_summary_exists():
        summary_path = "/home/user/resolution_summary.md"
>       assert os.path.isfile(summary_path), \
            "Resolution summary file should exist at /home/user/resolution_summary.md"
E       AssertionError: Resolution summary file should exist at /home/user/resolution_summary.md
E       assert False
E        +  where False = <function isfile at 0x7e4ace3c8220>('/home/user/resolution_summary.md')
E        +    where <function isfile at 0x7e4ace3c8220> = <module 'posixpath' (frozen)>.isfile
E        +      where <module 'posixpath' (frozen)> = os.path

/tests/test_outputs.py:71: AssertionError
___________________________ test_working_copy_clean ____________________________

    def test_working_copy_clean():
        result = jj("resolve", "--list")
>       assert result.returncode != 0 or result.stdout.strip() == "", \
            "Working copy should have no conflicts"
E       AssertionError: Working copy should have no conflicts
E       assert (0 != 0 or 'src/config.p...ided conflict' == ''
E        +  where 0 = CompletedProcess(args=['jj', 'resolve', '--list'], returncode=0, stdout='src/config.py    2-sided conflict\n', stderr='').returncode
E         
E         + src/config.py    2-sided conflict)

/tests/test_outputs.py:80: AssertionError
==================================== PASSES ====================================
=========================== short test summary info ============================
PASSED ../../../tests/test_outputs.py::test_config_has_production_host
PASSED ../../../tests/test_outputs.py::test_config_has_production_port
PASSED ../../../tests/test_outputs.py::test_config_has_prod_db_name
PASSED ../../../tests/test_outputs.py::test_config_has_debug_log_level
PASSED ../../../tests/test_outputs.py::test_config_has_max_connections_50
PASSED ../../../tests/test_outputs.py::test_config_has_timeout_60
FAILED ../../../tests/test_outputs.py::test_no_conflicts_remain - AssertionEr...
FAILED ../../../tests/test_outputs.py::test_resolution_summary_exists - Asser...
FAILED ../../../tests/test_outputs.py::test_working_copy_clean - AssertionErr...
========================= 3 failed, 6 passed in 0.17s ==========================