Why

next had diverged from main, leaving release PR #382 (release: 0.11.6) with merge conflicts. main carries the 0.11.5 + 0.11.6 releases (where #362's span-queue linger change landed as a squashed commit), while next carries the original #362 plus bounded-concurrency export (#374) stacked on the same span_queue.py region — so git saw two unrelated commits editing the same lines and couldn't auto-merge.

This back-merges main into next to realign the histories. Once merged, release-please regenerates #382 conflict-free.

Conflict resolution

• Version bookkeeping (.release-please-manifest.json, pyproject.toml, _version.py): took main's 0.11.6 — the released version wins in next.
• CHANGELOG.md: kept main's released ## 0.11.6 section above the existing 0.11.5 block.
• span_queue.py / tests/.../test_span_queue.py: kept next's version, which carries bounded-concurrency export (perf(tracing): bounded-concurrency span export #374) on top of the linger change (perf(tracing): span queue linger + per-loop httpx keepalive #362) that main only has as the squashed 0.11.5 commit. Verified byte-identical to origin/next — no regression of perf(tracing): bounded-concurrency span export #374.

Verification

• No conflict markers remain.
• tests/lib/core/tracing/ → 52 passed, 2 skipped; ruff clean.
• Branch merges into main cleanly, confirming this clears release: 0.11.7 #382's conflicts.

Greptile Summary

This PR back-merges main (carrying the 0.11.5 and 0.11.6 releases) into next to resolve the merge conflict that was blocking release PR #382. Only version bookkeeping files are touched — no functional code changed.

• Version bump: 0.11.5 → 0.11.6 applied consistently across .release-please-manifest.json, pyproject.toml, and src/agentex/_version.py.
• Changelog: The ## 0.11.6 section (features, bug fixes, perf improvements, chores) is prepended above the existing ## 0.11.5 block, accurately reflecting the released content from main.
• span_queue.py / tests (not in this diff): per the description, those files were kept at origin/next to preserve the bounded-concurrency export from perf(tracing): bounded-concurrency span export #374 on top of the linger change from perf(tracing): span queue linger + per-loop httpx keepalive #362 — verified byte-identical.

Confidence Score: 5/5

Safe to merge — all changes are pure version bookkeeping with no functional code touched.

All four changed files do exactly what the description says: bump the version string from 0.11.5 to 0.11.6 in lockstep across the manifest, pyproject, and generated version file, and prepend the correct 0.11.6 changelog section. The version numbers are consistent across every file, no conflict markers remain, and the functional code (span_queue.py and its tests) is untouched by this diff.

No files require special attention.

Important Files Changed

Sequence Diagram

sequenceDiagram
    participant main
    participant next
    participant release_please as release-please

    note over main: v0.11.5 squash-merged (#362 linger change)
    note over main: v0.11.6 released (features, bug fixes)
    note over next: #362 original commit
    note over next: #374 bounded-concurrency export stacked on top

    main->>next: "back-merge (this PR #384)"
    note over next: Version files → 0.11.6 (from main)
    note over next: span_queue.py → kept from next (preserves #374)
    next->>release_please: "trigger #382 regeneration"
    release_please-->>next: conflict-free release PR

Reviews (1): Last reviewed commit: "chore: back-merge release 0.11.6 into ne..." | Re-trigger Greptile