resolve_merge_conflicts_16__EBjHehQ

Status: Passed
Started: 3/19 10:48
Execution: 2m 59.2s
Test: 10.0s
2026-03-19 02:49:50.282	DEBUG	native:1	Pochi	pochi v0.6.0
2026-03-19 02:49:50.288	DEBUG	native:7	PochiConfigManager	add workspace config: /root/.pochi/config.jsonc
2026-03-19 02:49:50.380	DEBUG	/$bunfs/pochi:503027	loadAgents	Loaded 4 custom agents (4 valid, 0 invalid)
2026-03-19 02:49:50.381	DEBUG	/$bunfs/pochi:503028	loadSkills	Loaded 2 skills (2 valid, 0 invalid)
2026-03-19 02:49:50.461	DEBUG	/$bunfs/pochi:439288	PochiVendor	JWT is expiring or missing, fetching a new one
2026-03-19 02:49:51.967	DEBUG	/$bunfs/pochi:415701	MCPHub	MCP servers configuration changed via signal:
2026-03-19 02:49:51.968	DEBUG	/$bunfs/pochi:415813	MCPHub	Build MCPHub Status
2026-03-19 02:49:52.099	DEBUG	/$bunfs/pochi:502453	TaskRunner	Starting TaskRunner...
2026-03-19 02:49:52.178	DEBUG	/$bunfs/pochi:454195	listFiles	Listing workspace files from /root with maxItems 500
2026-03-19 02:49:52.375	DEBUG	/$bunfs/pochi:496495	generateTaskTitle	Generating task title, old: null, new: You are a developer migrating from Git to jj. You have a repository at `/home/user/repo`. There are two bookmarks, `feature-a` and `feature-b`, which modify the same line in `app.py` in conflicting ways. Your task is to:
2026-03-19 02:50:02.123	DEBUG	/$bunfs/pochi:454171	listFiles	handling listFile with dirPath /home/user/repo and recursive undefined
2026-03-19 02:50:02.125	DEBUG	/$bunfs/pochi:454195	listFiles	Listing workspace files from /root with maxItems 500
2026-03-19 02:50:04.273	WARN		GitStatus	readGitStatus timed out after 12000ms, returning undefined
2026-03-19 02:50:06.033	DEBUG	/$bunfs/pochi:454195	listFiles	Listing workspace files from /root with maxItems 500
2026-03-19 02:50:06.919	DEBUG	/$bunfs/pochi:496495	generateTaskTitle	Generating task title, old: You are a developer migrating from Git to jj. You have a repository at `/home/user/repo`. There are two bookmarks, `feature-a` and `feature-b`, which modify the same line in `app.py` in conflicting ways. Your task is to:, new: Merge conflicting bookmarks and resolve file conflicts in jj
2026-03-19 02:50:08.879	DEBUG	/$bunfs/pochi:454195	listFiles	Listing workspace files from /root with maxItems 500
2026-03-19 02:50:12.675	DEBUG	/$bunfs/pochi:454195	listFiles	Listing workspace files from /root with maxItems 500
2026-03-19 02:50:14.133	WARN		GitStatus	readGitStatus timed out after 12000ms, returning undefined
2026-03-19 02:50:15.358	DEBUG	/$bunfs/pochi:454195	listFiles	Listing workspace files from /root with maxItems 500
2026-03-19 02:50:18.057	WARN		GitStatus	readGitStatus timed out after 12000ms, returning undefined
2026-03-19 02:50:18.672	DEBUG	/$bunfs/pochi:454195	listFiles	Listing workspace files from /root with maxItems 500
2026-03-19 02:50:20.892	WARN		GitStatus	readGitStatus timed out after 12000ms, returning undefined
2026-03-19 02:50:24.071	DEBUG	/$bunfs/pochi:454195	listFiles	Listing workspace files from /root with maxItems 500
2026-03-19 02:50:24.687	WARN		GitStatus	readGitStatus timed out after 12000ms, returning undefined
2026-03-19 02:50:26.899	DEBUG	/$bunfs/pochi:454195	listFiles	Listing workspace files from /root with maxItems 500
2026-03-19 02:50:27.372	WARN		GitStatus	readGitStatus timed out after 12000ms, returning undefined
2026-03-19 02:50:29.968	DEBUG	/$bunfs/pochi:454195	listFiles	Listing workspace files from /root with maxItems 500
2026-03-19 02:50:30.686	WARN		GitStatus	readGitStatus timed out after 12000ms, returning undefined
2026-03-19 02:50:32.830	DEBUG	/$bunfs/pochi:454195	listFiles	Listing workspace files from /root with maxItems 500
2026-03-19 02:50:35.672	DEBUG	/$bunfs/pochi:454171	listFiles	handling listFile with dirPath /home/user/repo and recursive undefined
2026-03-19 02:50:35.692	DEBUG	/$bunfs/pochi:454195	listFiles	Listing workspace files from /root with maxItems 500
2026-03-19 02:50:36.086	WARN		GitStatus	readGitStatus timed out after 12000ms, returning undefined
2026-03-19 02:50:38.731	DEBUG	/$bunfs/pochi:454195	listFiles	Listing workspace files from /root with maxItems 500
2026-03-19 02:50:38.912	WARN		GitStatus	readGitStatus timed out after 12000ms, returning undefined
2026-03-19 02:50:41.983	WARN		GitStatus	readGitStatus timed out after 12000ms, returning undefined
2026-03-19 02:50:44.848	WARN		GitStatus	readGitStatus timed out after 12000ms, returning undefined
2026-03-19 02:50:46.139	DEBUG	/$bunfs/pochi:454195	listFiles	Listing workspace files from /root with maxItems 500
2026-03-19 02:50:47.769	WARN		GitStatus	readGitStatus timed out after 12000ms, returning undefined
2026-03-19 02:50:50.220	DEBUG	/$bunfs/pochi:454195	listFiles	Listing workspace files from /root with maxItems 500
2026-03-19 02:50:50.757	WARN		GitStatus	readGitStatus timed out after 12000ms, returning undefined
2026-03-19 02:50:53.167	DEBUG	/$bunfs/pochi:454195	listFiles	Listing workspace files from /root with maxItems 500
2026-03-19 02:50:57.475	DEBUG	/$bunfs/pochi:454195	listFiles	Listing workspace files from /root with maxItems 500
2026-03-19 02:50:58.152	WARN		GitStatus	readGitStatus timed out after 12000ms, returning undefined
2026-03-19 02:51:01.172	DEBUG	/$bunfs/pochi:454195	listFiles	Listing workspace files from /root with maxItems 500
2026-03-19 02:51:02.236	WARN		GitStatus	readGitStatus timed out after 12000ms, returning undefined
2026-03-19 02:51:05.181	WARN		GitStatus	readGitStatus timed out after 12000ms, returning undefined
2026-03-19 02:51:05.678	DEBUG	/$bunfs/pochi:454195	listFiles	Listing workspace files from /root with maxItems 500
2026-03-19 02:51:08.591	DEBUG	/$bunfs/pochi:454195	listFiles	Listing workspace files from /root with maxItems 500
2026-03-19 02:51:09.490	WARN		GitStatus	readGitStatus timed out after 12000ms, returning undefined
2026-03-19 02:51:11.537	DEBUG	/$bunfs/pochi:454195	listFiles	Listing workspace files from /root with maxItems 500
2026-03-19 02:51:13.187	WARN		GitStatus	readGitStatus timed out after 12000ms, returning undefined
2026-03-19 02:51:14.387	DEBUG	/$bunfs/pochi:454195	listFiles	Listing workspace files from /root with maxItems 500
2026-03-19 02:51:17.696	WARN		GitStatus	readGitStatus timed out after 12000ms, returning undefined
2026-03-19 02:51:18.339	DEBUG	/$bunfs/pochi:454195	listFiles	Listing workspace files from /root with maxItems 500
2026-03-19 02:51:20.608	WARN		GitStatus	readGitStatus timed out after 12000ms, returning undefined
2026-03-19 02:51:21.410	DEBUG	/$bunfs/pochi:454195	listFiles	Listing workspace files from /root with maxItems 500
2026-03-19 02:51:23.554	WARN		GitStatus	readGitStatus timed out after 12000ms, returning undefined
2026-03-19 02:51:24.600	DEBUG	/$bunfs/pochi:454195	listFiles	Listing workspace files from /root with maxItems 500
2026-03-19 02:51:26.405	WARN		GitStatus	readGitStatus timed out after 12000ms, returning undefined
2026-03-19 02:51:29.753	DEBUG	/$bunfs/pochi:454171	listFiles	handling listFile with dirPath /home/user/repo and recursive undefined
2026-03-19 02:51:29.757	DEBUG	/$bunfs/pochi:454195	listFiles	Listing workspace files from /root with maxItems 500
2026-03-19 02:51:30.365	WARN		GitStatus	readGitStatus timed out after 12000ms, returning undefined
2026-03-19 02:51:33.425	WARN		GitStatus	readGitStatus timed out after 12000ms, returning undefined
2026-03-19 02:51:34.605	DEBUG	/$bunfs/pochi:454195	listFiles	Listing workspace files from /root with maxItems 500
2026-03-19 02:51:36.612	WARN		GitStatus	readGitStatus timed out after 12000ms, returning undefined
2026-03-19 02:51:40.016	DEBUG	/$bunfs/pochi:454171	listFiles	handling listFile with dirPath /home/user and recursive undefined
2026-03-19 02:51:40.021	DEBUG	/$bunfs/pochi:454195	listFiles	Listing workspace files from /root with maxItems 500
2026-03-19 02:51:41.769	WARN		GitStatus	readGitStatus timed out after 12000ms, returning undefined
2026-03-19 02:51:43.199	DEBUG	/$bunfs/pochi:454195	listFiles	Listing workspace files from /root with maxItems 500
2026-03-19 02:51:46.660	WARN		GitStatus	readGitStatus timed out after 12000ms, returning undefined
2026-03-19 02:51:47.383	DEBUG	/$bunfs/pochi:454195	listFiles	Listing workspace files from /root with maxItems 500
2026-03-19 02:51:51.859	DEBUG	/$bunfs/pochi:454195	listFiles	Listing workspace files from /root with maxItems 500
2026-03-19 02:51:52.034	WARN		GitStatus	readGitStatus timed out after 12000ms, returning undefined
2026-03-19 02:51:55.260	WARN		GitStatus	readGitStatus timed out after 12000ms, returning undefined
2026-03-19 02:51:55.699	DEBUG	/$bunfs/pochi:454195	listFiles	Listing workspace files from /root with maxItems 500
2026-03-19 02:51:59.395	WARN		GitStatus	readGitStatus timed out after 12000ms, returning undefined
2026-03-19 02:52:03.875	WARN		GitStatus	readGitStatus timed out after 12000ms, returning undefined
2026-03-19 02:52:04.442	DEBUG	/$bunfs/pochi:454171	listFiles	handling listFile with dirPath /home/user/repo/.jj and recursive undefined
2026-03-19 02:52:04.455	DEBUG	/$bunfs/pochi:454195	listFiles	Listing workspace files from /root with maxItems 500
2026-03-19 02:52:07.762	WARN		GitStatus	readGitStatus timed out after 12000ms, returning undefined
2026-03-19 02:52:09.849	DEBUG	/$bunfs/pochi:454195	listFiles	Listing workspace files from /root with maxItems 500
2026-03-19 02:52:12.849	DEBUG	/$bunfs/pochi:454195	listFiles	Listing workspace files from /root with maxItems 500
2026-03-19 02:52:16.063	DEBUG	/$bunfs/pochi:454195	listFiles	Listing workspace files from /root with maxItems 500
2026-03-19 02:52:16.472	WARN		GitStatus	readGitStatus timed out after 12000ms, returning undefined
2026-03-19 02:52:18.860	DEBUG	/$bunfs/pochi:454195	listFiles	Listing workspace files from /root with maxItems 500
2026-03-19 02:52:21.867	WARN		GitStatus	readGitStatus timed out after 12000ms, returning undefined
2026-03-19 02:52:21.957	DEBUG	/$bunfs/pochi:454195	listFiles	Listing workspace files from /root with maxItems 500
2026-03-19 02:52:24.866	WARN		GitStatus	readGitStatus timed out after 12000ms, returning undefined
2026-03-19 02:52:25.133	DEBUG	/$bunfs/pochi:454195	listFiles	Listing workspace files from /root with maxItems 500
2026-03-19 02:52:28.082	WARN		GitStatus	readGitStatus timed out after 12000ms, returning undefined
2026-03-19 02:52:28.352	DEBUG	/$bunfs/pochi:454195	listFiles	Listing workspace files from /root with maxItems 500
2026-03-19 02:52:30.870	WARN		GitStatus	readGitStatus timed out after 12000ms, returning undefined
2026-03-19 02:52:32.561	DEBUG	/$bunfs/pochi:454195	listFiles	Listing workspace files from /root with maxItems 500
2026-03-19 02:52:33.974	WARN		GitStatus	readGitStatus timed out after 12000ms, returning undefined
2026-03-19 02:52:37.161	WARN		GitStatus	readGitStatus timed out after 12000ms, returning undefined
2026-03-19 02:52:37.710	DEBUG	/$bunfs/pochi:454195	listFiles	Listing workspace files from /root with maxItems 500
2026-03-19 02:52:40.368	WARN		GitStatus	readGitStatus timed out after 12000ms, returning undefined
2026-03-19 02:52:43.251	DEBUG	/$bunfs/pochi:454195	listFiles	Listing workspace files from /root with maxItems 500
2026-03-19 02:52:44.575	WARN		GitStatus	readGitStatus timed out after 12000ms, returning undefined
Hit:1 http://archive.ubuntu.com/ubuntu noble InRelease
Hit:2 http://archive.ubuntu.com/ubuntu noble-updates InRelease
Hit:3 http://archive.ubuntu.com/ubuntu noble-backports InRelease
Hit:4 http://security.ubuntu.com/ubuntu noble-security 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 /root/.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 38ms
============================= 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 1 item

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

==================================== PASSES ====================================
=========================== short test summary info ============================
PASSED ../tests/test_outputs.py::test_outputs
============================== 1 passed in 0.00s ===============================