[37m2026-03-19 11:13:25.883[39m[0m[0m [32m[1mDEBUG[22m[39m[0m[0m [37mnative:1[39m[0m[0m[1m[37m Pochi[39m[22m[0m[0m pochi v0.6.1 [37m2026-03-19 11:13:25.887[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 11:13:26.152[39m[0m[0m [32m[1mDEBUG[22m[39m[0m[0m [37m/$bunfs/pochi:503183[39m[0m[0m[1m[37m loadAgents[39m[22m[0m[0m Loaded 5 custom agents (5 valid, 0 invalid) [37m2026-03-19 11:13:26.153[39m[0m[0m [32m[1mDEBUG[22m[39m[0m[0m [37m/$bunfs/pochi:503184[39m[0m[0m[1m[37m loadSkills[39m[22m[0m[0m Loaded 2 skills (2 valid, 0 invalid) [37m2026-03-19 11:13:26.188[39m[0m[0m [32m[1mDEBUG[22m[39m[0m[0m [37m/$bunfs/pochi:439420[39m[0m[0m[1m[37m PochiVendor[39m[22m[0m[0m JWT is expiring or missing, fetching a new one [37m2026-03-19 11:13:27.369[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 11:13:27.370[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 11:13:27.408[39m[0m[0m [32m[1mDEBUG[22m[39m[0m[0m [37m/$bunfs/pochi:502609[39m[0m[0m[1m[37m TaskRunner[39m[22m[0m[0m Starting TaskRunner... [37m2026-03-19 11:13:27.469[39m[0m[0m [32m[1mDEBUG[22m[39m[0m[0m [37m/$bunfs/pochi:454339[39m[0m[0m[1m[37m listFiles[39m[22m[0m[0m Listing workspace files from /root with maxItems [33m500[39m [37m2026-03-19 11:13:27.665[39m[0m[0m [32m[1mDEBUG[22m[39m[0m[0m [37m/$bunfs/pochi:496641[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 11:13:42.053[39m[0m[0m [32m[1mDEBUG[22m[39m[0m[0m [37m/$bunfs/pochi:454339[39m[0m[0m[1m[37m listFiles[39m[22m[0m[0m Listing workspace files from /root with maxItems [33m500[39m [37m2026-03-19 11:13:43.489[39m[0m[0m [32m[1mDEBUG[22m[39m[0m[0m [37m/$bunfs/pochi:454339[39m[0m[0m[1m[37m listFiles[39m[22m[0m[0m Listing workspace files from /root with maxItems [33m500[39m [37m2026-03-19 11:13:44.304[39m[0m[0m [32m[1mDEBUG[22m[39m[0m[0m [37m/$bunfs/pochi:496641[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: Create and verify an octopus merge in jj [37m2026-03-19 11:13:45.623[39m[0m[0m [32m[1mDEBUG[22m[39m[0m[0m [37m/$bunfs/pochi:454339[39m[0m[0m[1m[37m listFiles[39m[22m[0m[0m Listing workspace files from /root with maxItems [33m500[39m [37m2026-03-19 11:13:48.485[39m[0m[0m [32m[1mDEBUG[22m[39m[0m[0m [37m/$bunfs/pochi:454339[39m[0m[0m[1m[37m listFiles[39m[22m[0m[0m Listing workspace files from /root with maxItems [33m500[39m [37m2026-03-19 11:13:50.596[39m[0m[0m [32m[1mDEBUG[22m[39m[0m[0m [37m/$bunfs/pochi:454339[39m[0m[0m[1m[37m listFiles[39m[22m[0m[0m Listing workspace files from /root with maxItems [33m500[39m [37m2026-03-19 11:13:51.903[39m[0m[0m [32m[1mDEBUG[22m[39m[0m[0m [37m/$bunfs/pochi:454339[39m[0m[0m[1m[37m listFiles[39m[22m[0m[0m Listing workspace files from /root with maxItems [33m500[39m [37m2026-03-19 11:13:54.368[39m[0m[0m [32m[1mDEBUG[22m[39m[0m[0m [37m/$bunfs/pochi:454339[39m[0m[0m[1m[37m listFiles[39m[22m[0m[0m Listing workspace files from /root with maxItems [33m500[39m [37m2026-03-19 11:13:57.366[39m[0m[0m [32m[1mDEBUG[22m[39m[0m[0m [37m/$bunfs/pochi:454339[39m[0m[0m[1m[37m listFiles[39m[22m[0m[0m Listing workspace files from /root with maxItems [33m500[39m [37m2026-03-19 11:13:59.418[39m[0m[0m [32m[1mDEBUG[22m[39m[0m[0m [37m/$bunfs/pochi:454339[39m[0m[0m[1m[37m listFiles[39m[22m[0m[0m Listing workspace files from /root with maxItems [33m500[39m [37m2026-03-19 11:14:00.578[39m[0m[0m [32m[1mDEBUG[22m[39m[0m[0m [37m/$bunfs/pochi:454339[39m[0m[0m[1m[37m listFiles[39m[22m[0m[0m Listing workspace files from /root with maxItems [33m500[39m [37m2026-03-19 11:14:01.666[39m[0m[0m [32m[1mDEBUG[22m[39m[0m[0m [37m/$bunfs/pochi:454339[39m[0m[0m[1m[37m listFiles[39m[22m[0m[0m Listing workspace files from /root with maxItems [33m500[39m [37m2026-03-19 11:14:02.879[39m[0m[0m [32m[1mDEBUG[22m[39m[0m[0m [37m/$bunfs/pochi:454339[39m[0m[0m[1m[37m listFiles[39m[22m[0m[0m Listing workspace files from /root with maxItems [33m500[39m [37m2026-03-19 11:14:04.226[39m[0m[0m [32m[1mDEBUG[22m[39m[0m[0m [37m/$bunfs/pochi:454339[39m[0m[0m[1m[37m listFiles[39m[22m[0m[0m Listing workspace files from /root with maxItems [33m500[39m [37m2026-03-19 11:14:05.475[39m[0m[0m [32m[1mDEBUG[22m[39m[0m[0m [37m/$bunfs/pochi:454339[39m[0m[0m[1m[37m listFiles[39m[22m[0m[0m Listing workspace files from /root with maxItems [33m500[39m [37m2026-03-19 11:14:08.219[39m[0m[0m [32m[1mDEBUG[22m[39m[0m[0m [37m/$bunfs/pochi:454339[39m[0m[0m[1m[37m listFiles[39m[22m[0m[0m Listing workspace files from /root with maxItems [33m500[39m [37m2026-03-19 11:14:09.321[39m[0m[0m [32m[1mDEBUG[22m[39m[0m[0m [37m/$bunfs/pochi:454339[39m[0m[0m[1m[37m listFiles[39m[22m[0m[0m Listing workspace files from /root with maxItems [33m500[39m [37m2026-03-19 11:14:10.678[39m[0m[0m [32m[1mDEBUG[22m[39m[0m[0m [37m/$bunfs/pochi:454339[39m[0m[0m[1m[37m listFiles[39m[22m[0m[0m Listing workspace files from /root with maxItems [33m500[39m [37m2026-03-19 11:14:13.200[39m[0m[0m [32m[1mDEBUG[22m[39m[0m[0m [37m/$bunfs/pochi:454339[39m[0m[0m[1m[37m listFiles[39m[22m[0m[0m Listing workspace files from /root with maxItems [33m500[39m [37m2026-03-19 11:14:14.234[39m[0m[0m [32m[1mDEBUG[22m[39m[0m[0m [37m/$bunfs/pochi:454339[39m[0m[0m[1m[37m listFiles[39m[22m[0m[0m Listing workspace files from /root with maxItems [33m500[39m [37m2026-03-19 11:14:17.295[39m[0m[0m [32m[1mDEBUG[22m[39m[0m[0m [37m/$bunfs/pochi:454339[39m[0m[0m[1m[37m listFiles[39m[22m[0m[0m Listing workspace files from /root with maxItems [33m500[39m [37m2026-03-19 11:14:19.023[39m[0m[0m [32m[1mDEBUG[22m[39m[0m[0m [37m/$bunfs/pochi:454339[39m[0m[0m[1m[37m listFiles[39m[22m[0m[0m Listing workspace files from /root with maxItems [33m500[39m [37m2026-03-19 11:14:20.435[39m[0m[0m [32m[1mDEBUG[22m[39m[0m[0m [37m/$bunfs/pochi:454339[39m[0m[0m[1m[37m listFiles[39m[22m[0m[0m Listing workspace files from /root with maxItems [33m500[39m [37m2026-03-19 11:14:21.546[39m[0m[0m [32m[1mDEBUG[22m[39m[0m[0m [37m/$bunfs/pochi:454339[39m[0m[0m[1m[37m listFiles[39m[22m[0m[0m Listing workspace files from /root with maxItems [33m500[39m [37m2026-03-19 11:14:23.789[39m[0m[0m [32m[1mDEBUG[22m[39m[0m[0m [37m/$bunfs/pochi:454339[39m[0m[0m[1m[37m listFiles[39m[22m[0m[0m Listing workspace files from /root with maxItems [33m500[39m [37m2026-03-19 11:14:29.298[39m[0m[0m [32m[1mDEBUG[22m[39m[0m[0m [37m/$bunfs/pochi:454339[39m[0m[0m[1m[37m listFiles[39m[22m[0m[0m Listing workspace files from /root with maxItems [33m500[39m [37m2026-03-19 11:14:31.525[39m[0m[0m [32m[1mDEBUG[22m[39m[0m[0m [37m/$bunfs/pochi:454339[39m[0m[0m[1m[37m listFiles[39m[22m[0m[0m Listing workspace files from /root with maxItems [33m500[39m
Hit:1 http://archive.ubuntu.com/ubuntu noble InRelease
Hit:2 http://security.ubuntu.com/ubuntu noble-security 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.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 15ms
============================= test session starts ==============================
platform linux -- Python 3.12.3, pytest-8.4.1, pluggy-1.6.0 -- /root/.cache/uv/archive-v0/69iEihYPtZ4EWSXFZ9njt/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 FAILED [ 66%]
../../tests/test_final_state.py::test_files_exist_in_octopus_merge FAILED [100%]
=================================== FAILURES ===================================
_____________________ test_octopus_merge_has_three_parents _____________________
def test_octopus_merge_has_three_parents():
result = run_jj(["log", "--no-graph", "-r", "octopus_merge", "-T", "parents.map(|c| c.commit_id()).join(' ')"])
assert result.returncode == 0, f"jj log failed: {result.stderr}"
parents = result.stdout.strip().split()
> assert len(parents) == 3, f"Expected 'octopus_merge' to have exactly 3 parents, found {len(parents)}: {parents}"
E AssertionError: Expected 'octopus_merge' to have exactly 3 parents, found 1: ['ca97ab953b226d35fc06831dd1be1276e76b8cf7']
E assert 1 == 3
E + where 1 = len(['ca97ab953b226d35fc06831dd1be1276e76b8cf7'])
/tests/test_final_state.py:19: AssertionError
______________________ test_files_exist_in_octopus_merge _______________________
def test_files_exist_in_octopus_merge():
result = run_jj(["file", "list", "-r", "octopus_merge"])
assert result.returncode == 0, f"jj file list failed: {result.stderr}"
files = result.stdout.splitlines()
expected_files = ["base.txt", "a.txt", "b.txt", "c.txt"]
for f in expected_files:
> assert f in files, f"Expected file '{f}' not found in the 'octopus_merge' commit."
E AssertionError: Expected file 'a.txt' not found in the 'octopus_merge' commit.
E assert 'a.txt' in ['base.txt', 'c.txt']
/tests/test_final_state.py:28: AssertionError
=========================== short test summary info ============================
FAILED ../../tests/test_final_state.py::test_octopus_merge_has_three_parents
FAILED ../../tests/test_final_state.py::test_files_exist_in_octopus_merge - A...
========================= 2 failed, 1 passed in 0.07s ==========================