chore: align develop with main — backport #86 content + version#106
Merged
Conversation
release: bring main up to develop (every harness ticket)
release: sync main with develop (Vite proxy fix + README screenshots)
release: bring main up to develop (Teller v1.4 → v1.10.3 backport)
release: bring main up to develop (Teller v1.12.0 backports + audit follow-up)
* chore: add optional Beads issue queue guidance * chore: address PR-86 review feedback (BEADS doc + template + CI-script compile gate) Applies the actionable items from the PR-86 review: - docs/BEADS.md: lead with a one-sentence "what Beads is" + upstream link; state the stance explicitly (optional/additive, recommended for agent-driven flows, GitHub remains authoritative); add a YAML example block under Recommended Bead fields; replace the duplicated Closure checklist with a Bead-specific narrowing that cites the PR template + CONTRIBUTING; call out that .beads/ is wiped by git clean -fdx. - .github/pull_request_template.md: collapse the "Local Beads" section into an HTML-commented opt-in block so it is invisible in the rendered preview until a Beads-using team uncomments it. - CONTRIBUTING.md: document the one-shot git renormalisation step for Windows clones after the .gitattributes change lands. - tests/test_scripts_compile.py: regression gate that py_compiles every .github/scripts/*.py. The "scripts unparseable" review finding was based on an older local Python — PEP 758 (3.14) makes the unparenthesised except clauses valid, so the scripts ARE fine on the project pin. The test guards against an actual syntax error landing in future. * chore: bump version to 0.2.11 --------- Co-authored-by: const.koutsakis@aurecongroup.com <constantinos.koutsakis@gmail.com>
…sed post-#103/#104) main moved ahead of develop on 2026-05-25 when PR #86 was merged directly to main rather than via develop -> release flow. The divergence is one squash commit (eff5b1c) carrying: - docs/BEADS.md (optional Beads issue-queue guidance) - .github/pull_request_template.md (Beads PR-template block) - .github/scripts/check_aspirational_tickets.py (PEP 758 reformat) - .github/scripts/check_pin_freshness.py / check_tests_present.py / check_version_bump.py (touch-ups) - .gitattributes / .gitignore (.beads/ ignore, Windows renormalise) - CONTRIBUTING.md (line-ending normalisation) - tests/test_scripts_compile.py (new CI-script compile gate) - docs/DEVELOPMENT.md / docs/HARNESS.md / docs/HARNESS_PRIMER.md cross-refs - pyproject.toml + uv.lock self-version 0.2.10 -> 0.2.11 This PR was rebased after #103 (CVE fix, develop -> 0.2.11) and #104 (eval pattern examples, develop -> 0.2.12) merged. The version on main (0.2.11) is now behind develop (0.2.12); the conflict is resolved by bumping develop -> 0.2.13. After this lands, develop is at 0.2.13 and contains everything main has. Remaining in-flight PRs (#99, #100, #101, #105) need to rebase to bump 0.2.13 -> 0.2.14 (and onward sequentially as they merge). No behaviour change beyond what #86 already added to main. # Conflicts: # pyproject.toml # uv.lock
constk
force-pushed
the
chore/sync-develop-with-main
branch
from
a0c0b4d to
15fca3e
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What & why
mainis currently ahead ofdevelopby one squash commit (eff5b1c) — PR #86 was merged directly tomainon 2026-05-25 rather than via the standarddevelop → releaseflow. The resulting divergence is real and not just cosmetic:tests/test_scripts_compile.pyCI-script compile gate,.gitattributes, the PR-template Beads block,.gitignore.beads/entry, the CONTRIBUTING.md line-ending normalisation, and minor touch-ups across the.github/scripts/check_*.pyfiles.0.2.11; develop is at0.2.10. Every in-flight PR against develop has been bumping0.2.10 → 0.2.11, which all then collide with each other.release: bring main up to developPR would otherwise show main ahead in content and develop ahead in version — confusing the audit trail at exactly the moment a release should be tidy.This PR brings the missing commit forward via
git merge --no-ff origin/main. Conflicts inpyproject.tomlanduv.lock(on theversionline only) resolved in favour of main's0.2.11. No other conflicts.Why a merge commit, not a cherry-pick
The merge preserves the audit trail (
eff5b1cremains attributable to PR #86; the merge commit records when it crossed back over to develop). Cherry-picking would create a duplicate commit with no link back to #86.Knock-on effect on in-flight PRs
After this lands, every other open release-blocker PR needs a one-line rebase to bump
0.2.11 → 0.2.12(and sequentially onward as they merge). Affected PRs: #99, #100, #101, #103, #104, #105. I'll handle the rebases.Test plan
git merge --no-ff origin/mainsucceeded with two expected conflicts (pyproject.toml,uv.lock); resolved in favour of0.2.11uv sync --frozen --extra devsucceeds on the merged treeuv run --frozen pytest tests/ -q→ 202 passed (the +10 vs develop's 192 are chore: add optional Beads issue queue guidance #86'stests/test_scripts_compile.pycases)uv run --frozen mypy --strict src/ tests/→ clean on 41 source filesuv run --frozen ruff check .→ All checks passedInvariants affected
None. This PR moves develop forward; the harness rules themselves are unchanged.
New deps / actions / external surface
None new beyond what #86 already brought to main. No new GitHub Actions; no new external endpoints.
Linked issue
None — this is a coordination/divergence fix surfaced by the in-flight release-blockers review.