resolve_merge_conflicts_16__yTXD4Uf

Status: Passed

Started: 3/19 17:05

Execution: 1m 5.3s

Test: 9.7s

Status: PassedStarted: 3/19/2026, 5:05:16 PMExecution: 1m 5.3sTest: 9.7s

[37m2026-03-19 09:07:54.224[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 09:07:54.228[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 09:07:54.331[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 09:07:54.332[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 09:07:54.416[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 09:07:56.035[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 09:07:56.035[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 09:07:56.167[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 09:07:56.237[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 09:07:56.435[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 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:
[37m2026-03-19 09:08:05.857[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 09:08:08.457[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 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 feature-a and feature-b and move bookmark
[37m2026-03-19 09:08:08.742[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 09:08:11.089[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 09:08:15.050[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 09:08:17.614[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 09:08:20.550[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 09:08:23.809[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/pochi:454315[39m[0m[0m[1m[37m	listFiles[39m[22m[0m[0m	handling listFile with dirPath /home/user/repo and recursive [33mtrue[39m
[37m2026-03-19 09:08:23.820[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 09:08:26.926[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 09:08:29.531[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 09:08:33.315[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 09:08:36.420[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 09:08:41.332[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 09:08:43.824[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 09:08:46.493[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 09:08:49.965[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 09:08:52.516[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 09:08:54.526[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://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 29ms
============================= 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 ===============================