multi_parent_octopus_merge_9__TYne7pc

Status: Passed

Started: 3/19 10:48

Execution: 1m 25.8s

Test: 12.4s

Status: PassedStarted: 3/19/2026, 10:48:11 AMExecution: 1m 25.8sTest: 12.4s

[37m2026-03-19 02:48:36.386[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37mnative:1[39m[0m[0m[1m[37m	Pochi[39m[22m[0m[0m	pochi v0.6.0
[37m2026-03-19 02:48:36.391[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37mnative:7[39m[0m[0m[1m[37m	PochiConfigManager[39m[22m[0m[0m	add workspace config: /root/.pochi/config.jsonc
[37m2026-03-19 02:48:36.655[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/pochi:503027[39m[0m[0m[1m[37m	loadAgents[39m[22m[0m[0m	Loaded 4 custom agents (4 valid, 0 invalid)
[37m2026-03-19 02:48:36.659[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/pochi:503028[39m[0m[0m[1m[37m	loadSkills[39m[22m[0m[0m	Loaded 2 skills (2 valid, 0 invalid)
[37m2026-03-19 02:48:36.694[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/pochi:439288[39m[0m[0m[1m[37m	PochiVendor[39m[22m[0m[0m	JWT is expiring or missing, fetching a new one
[37m2026-03-19 02:48:38.088[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/pochi:415701[39m[0m[0m[1m[37m	MCPHub[39m[22m[0m[0m	MCP servers configuration changed via signal:
[37m2026-03-19 02:48:38.089[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/pochi:415813[39m[0m[0m[1m[37m	MCPHub[39m[22m[0m[0m	Build MCPHub Status
[37m2026-03-19 02:48:38.182[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/pochi:502453[39m[0m[0m[1m[37m	TaskRunner[39m[22m[0m[0m	Starting TaskRunner...
[37m2026-03-19 02:48:38.278[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/pochi:454195[39m[0m[0m[1m[37m	listFiles[39m[22m[0m[0m	Listing workspace files from /root with maxItems [33m500[39m
[37m2026-03-19 02:48:38.478[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/pochi:496495[39m[0m[0m[1m[37m	generateTaskTitle[39m[22m[0m[0m	Generating task title, old: null, new: You are a developer exploring `jj`'s ability to handle multi-parent merges (octopus merges). A repository already exists at `/home/user/octopus_repo` with a base commit containing a file `base.txt`. Your task is to create 3 concurrent bookmarks named `branch_a`, `branch_b`, and `branch_c` from the base commit. In each bookmark, add a new file (`a.txt`, `b.txt`, `c.txt` respectively) with some content. Finally, create a new commit that has all 3 bookmarks as parents, and bookmark it as `octopus_merge`. Verify the merge by checking the parents of `octopus_merge` and ensuring all files are present in the working copy.
[37m2026-03-19 02:48:48.960[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/pochi:454195[39m[0m[0m[1m[37m	listFiles[39m[22m[0m[0m	Listing workspace files from /root with maxItems [33m500[39m
[37m2026-03-19 02:48:50.390[39m[0m[0m	[33m[1mWARN[22m[39m[0m[0m	[37m[39m[0m[0m[1m[37m	GitStatus[39m[22m[0m[0m	readGitStatus timed out after 12000ms, returning undefined
[37m2026-03-19 02:48:52.797[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/pochi:496495[39m[0m[0m[1m[37m	generateTaskTitle[39m[22m[0m[0m	Generating task title, old: You are a developer exploring `jj`'s ability to handle multi-parent merges (octopus merges). A repository already exists at `/home/user/octopus_repo` with a base commit containing a file `base.txt`. Your task is to create 3 concurrent bookmarks named `branch_a`, `branch_b`, and `branch_c` from the base commit. In each bookmark, add a new file (`a.txt`, `b.txt`, `c.txt` respectively) with some content. Finally, create a new commit that has all 3 bookmarks as parents, and bookmark it as `octopus_merge`. Verify the merge by checking the parents of `octopus_merge` and ensuring all files are present in the working copy., new: Perform an octopus merge using jj bookmarks
[37m2026-03-19 02:48:53.085[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/pochi:454195[39m[0m[0m[1m[37m	listFiles[39m[22m[0m[0m	Listing workspace files from /root with maxItems [33m500[39m
[37m2026-03-19 02:48:55.771[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/pochi:454195[39m[0m[0m[1m[37m	listFiles[39m[22m[0m[0m	Listing workspace files from /root with maxItems [33m500[39m
[37m2026-03-19 02:49:00.973[39m[0m[0m	[33m[1mWARN[22m[39m[0m[0m	[37m[39m[0m[0m[1m[37m	GitStatus[39m[22m[0m[0m	readGitStatus timed out after 12000ms, returning undefined
[37m2026-03-19 02:49:01.023[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/pochi:454195[39m[0m[0m[1m[37m	listFiles[39m[22m[0m[0m	Listing workspace files from /root with maxItems [33m500[39m
[37m2026-03-19 02:49:04.245[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/pochi:454195[39m[0m[0m[1m[37m	listFiles[39m[22m[0m[0m	Listing workspace files from /root with maxItems [33m500[39m
[37m2026-03-19 02:49:05.099[39m[0m[0m	[33m[1mWARN[22m[39m[0m[0m	[37m[39m[0m[0m[1m[37m	GitStatus[39m[22m[0m[0m	readGitStatus timed out after 12000ms, returning undefined
[37m2026-03-19 02:49:07.296[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/pochi:454195[39m[0m[0m[1m[37m	listFiles[39m[22m[0m[0m	Listing workspace files from /root with maxItems [33m500[39m
[37m2026-03-19 02:49:07.784[39m[0m[0m	[33m[1mWARN[22m[39m[0m[0m	[37m[39m[0m[0m[1m[37m	GitStatus[39m[22m[0m[0m	readGitStatus timed out after 12000ms, returning undefined
[37m2026-03-19 02:49:11.191[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/pochi:454195[39m[0m[0m[1m[37m	listFiles[39m[22m[0m[0m	Listing workspace files from /root with maxItems [33m500[39m
[37m2026-03-19 02:49:13.087[39m[0m[0m	[33m[1mWARN[22m[39m[0m[0m	[37m[39m[0m[0m[1m[37m	GitStatus[39m[22m[0m[0m	readGitStatus timed out after 12000ms, returning undefined
[37m2026-03-19 02:49:16.017[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/pochi:454195[39m[0m[0m[1m[37m	listFiles[39m[22m[0m[0m	Listing workspace files from /root with maxItems [33m500[39m
[37m2026-03-19 02:49:16.257[39m[0m[0m	[33m[1mWARN[22m[39m[0m[0m	[37m[39m[0m[0m[1m[37m	GitStatus[39m[22m[0m[0m	readGitStatus timed out after 12000ms, returning undefined
[37m2026-03-19 02:49:19.308[39m[0m[0m	[33m[1mWARN[22m[39m[0m[0m	[37m[39m[0m[0m[1m[37m	GitStatus[39m[22m[0m[0m	readGitStatus timed out after 12000ms, returning undefined
[37m2026-03-19 02:49:20.169[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/pochi:454195[39m[0m[0m[1m[37m	listFiles[39m[22m[0m[0m	Listing workspace files from /root with maxItems [33m500[39m
[37m2026-03-19 02:49:23.198[39m[0m[0m	[33m[1mWARN[22m[39m[0m[0m	[37m[39m[0m[0m[1m[37m	GitStatus[39m[22m[0m[0m	readGitStatus timed out after 12000ms, returning undefined
[37m2026-03-19 02:49:23.274[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/pochi:454195[39m[0m[0m[1m[37m	listFiles[39m[22m[0m[0m	Listing workspace files from /root with maxItems [33m500[39m
[37m2026-03-19 02:49:26.941[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/pochi:454195[39m[0m[0m[1m[37m	listFiles[39m[22m[0m[0m	Listing workspace files from /root with maxItems [33m500[39m
[37m2026-03-19 02:49:28.025[39m[0m[0m	[33m[1mWARN[22m[39m[0m[0m	[37m[39m[0m[0m[1m[37m	GitStatus[39m[22m[0m[0m	readGitStatus timed out after 12000ms, returning undefined
[37m2026-03-19 02:49:30.395[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/pochi:454195[39m[0m[0m[1m[37m	listFiles[39m[22m[0m[0m	Listing workspace files from /root with maxItems [33m500[39m
[37m2026-03-19 02:49:32.187[39m[0m[0m	[33m[1mWARN[22m[39m[0m[0m	[37m[39m[0m[0m[1m[37m	GitStatus[39m[22m[0m[0m	readGitStatus timed out after 12000ms, returning undefined
[37m2026-03-19 02:49:33.181[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/pochi:454195[39m[0m[0m[1m[37m	listFiles[39m[22m[0m[0m	Listing workspace files from /root with maxItems [33m500[39m
[37m2026-03-19 02:49:35.285[39m[0m[0m	[33m[1mWARN[22m[39m[0m[0m	[37m[39m[0m[0m[1m[37m	GitStatus[39m[22m[0m[0m	readGitStatus timed out after 12000ms, returning undefined
[37m2026-03-19 02:49:37.521[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/pochi:454195[39m[0m[0m[1m[37m	listFiles[39m[22m[0m[0m	Listing workspace files from /root with maxItems [33m500[39m
[37m2026-03-19 02:49:38.956[39m[0m[0m	[33m[1mWARN[22m[39m[0m[0m	[37m[39m[0m[0m[1m[37m	GitStatus[39m[22m[0m[0m	readGitStatus timed out after 12000ms, returning undefined
[37m2026-03-19 02:49:40.223[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/pochi:454195[39m[0m[0m[1m[37m	listFiles[39m[22m[0m[0m	Listing workspace files from /root with maxItems [33m500[39m
[37m2026-03-19 02:49:42.405[39m[0m[0m	[33m[1mWARN[22m[39m[0m[0m	[37m[39m[0m[0m[1m[37m	GitStatus[39m[22m[0m[0m	readGitStatus timed out after 12000ms, returning undefined
[37m2026-03-19 02:49:44.159[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/pochi:454195[39m[0m[0m[1m[37m	listFiles[39m[22m[0m[0m	Listing workspace files from /root with maxItems [33m500[39m
[37m2026-03-19 02:49:45.194[39m[0m[0m	[33m[1mWARN[22m[39m[0m[0m	[37m[39m[0m[0m[1m[37m	GitStatus[39m[22m[0m[0m	readGitStatus timed out after 12000ms, returning undefined
[37m2026-03-19 02:49:46.797[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/pochi:454195[39m[0m[0m[1m[37m	listFiles[39m[22m[0m[0m	Listing workspace files from /root with maxItems [33m500[39m
[37m2026-03-19 02:49:49.535[39m[0m[0m	[33m[1mWARN[22m[39m[0m[0m	[37m[39m[0m[0m[1m[37m	GitStatus[39m[22m[0m[0m	readGitStatus timed out after 12000ms, returning undefined
[37m2026-03-19 02:49:50.559[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/pochi:454195[39m[0m[0m[1m[37m	listFiles[39m[22m[0m[0m	Listing workspace files from /root with maxItems [33m500[39m
[37m2026-03-19 02:49:52.236[39m[0m[0m	[33m[1mWARN[22m[39m[0m[0m	[37m[39m[0m[0m[1m[37m	GitStatus[39m[22m[0m[0m	readGitStatus timed out after 12000ms, returning undefined
[37m2026-03-19 02:49:54.324[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/pochi:454195[39m[0m[0m[1m[37m	listFiles[39m[22m[0m[0m	Listing workspace files from /root with maxItems [33m500[39m
[37m2026-03-19 02:49:56.175[39m[0m[0m	[33m[1mWARN[22m[39m[0m[0m	[37m[39m[0m[0m[1m[37m	GitStatus[39m[22m[0m[0m	readGitStatus timed out after 12000ms, returning undefined
[37m2026-03-19 02:49:58.814[39m[0m[0m	[33m[1mWARN[22m[39m[0m[0m	[37m[39m[0m[0m[1m[37m	GitStatus[39m[22m[0m[0m	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.5 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 5 packages in 18ms
============================= test session starts ==============================
platform linux -- Python 3.12.3, pytest-8.4.1, pluggy-1.6.0 -- /root/.cache/uv/archive-v0/OajPkg-D5nrL9HuWicKTN/bin/python
cachedir: .pytest_cache
rootdir: /tests
collecting ... collected 3 items

../../tests/test_final_state.py::test_octopus_merge_bookmark_exists PASSED [ 33%]
../../tests/test_final_state.py::test_octopus_merge_has_three_parents PASSED [ 66%]
../../tests/test_final_state.py::test_files_exist_in_octopus_merge PASSED [100%]

============================== 3 passed in 0.06s ===============================