Sync ruff pin to v0.15.12 (uv.lock + pre-commit) and apply formatter sweep

[jwbron]

Summary

The pre-commit ruff-format pin (v0.15.0) and the venv-installed ruff (v0.14.14 from uv.lock) had drifted across a major formatter change: ruff 0.15 added support for PEP 758 (Python 3.14's relaxed except A, B: syntax without parens). The repo moved to Python 3.14 in #2279, so ruff 0.15 correctly drops the now-unnecessary tuple parens — but the older venv ruff (0.14.14) didn't, so make lint looked clean locally while the pre-commit hook flagged 85+ files. That mismatch silently bit #2296 (and would bite anyone whose .venv was provisioned before this fix).

Changes

• pyproject.toml: tighten the dev ruff specifier from >=0.1.0 to >=0.15.12,<0.16 so the floor matches the pre-commit minor and the ceiling prevents a future 0.16 from drifting again.
• .pre-commit-config.yaml: bump the ruff pin from v0.15.0 to v0.15.12 (latest 0.15.x).
• uv.lock: regenerated via uv lock --upgrade-package ruff; installs ruff==0.15.12 on the next uv sync.
• 86 files reformatted by the new ruff (mostly PEP 758 paren drops on except (A, B):).

Why bundle the format sweep

Splitting the pin bump from the format sweep would leave main red on the very next commit — pre-commit would then enforce a format the bumped ruff produces, but the codebase wouldn't yet be in that shape. Bundling them is the cleanest landing.

Test plan

• uv sync --extra dev installs ruff 0.15.12
• make lint — all checks passed
• .venv/bin/pytest sandbox/tests/test_egg_orch_overseer_consult_advisor.py shared/tests/test_overseer_advisor.py — 71 passed
• pre-commit run --all-files — clean (executed via the commit hook)

Follow-up

After this lands, all 17 open PRs need to merge main (or rebase) and run .venv/bin/ruff format to absorb the same paren drops on any sites their changes touch. Most should be conflict-free.

[egg-reviewer]

Review (post-merge)

The PR is mechanically correct: PEP 758 is a real, accepted Python 3.14 feature; target-version = "py314" + requires-python = ">=3.14" makes the unparenthesized form valid; CI is on 3.14; uv.lock pins mypy==1.19.1, ruff==0.15.12, bandit==1.9.3 — all of which parse the new syntax (verified locally). Bundling the pin bump and the format sweep is the right call — splitting them would leave main red between commits.

A few non-blocking observations the formatter sweep surfaced but didn't address:

1. Pre-existing redundant exception classes in catch lists (non-blocking)

The mechanical paren-drop touched 13 sites where the original except (A, B): listed two exception classes in a subclass relationship — i.e., the more-specific class is dead code in the catch list and the handler is functionally except <base>:. Since the PR rewrote every one of these lines, this was the natural moment to clean them up.

except <X>, Exception: (5 sites) — JSONDecodeError, TypeError, ValueError, etc. are all subclasses of Exception, so the leading specific class is dead:

• gateway/commit_registry_client.py:86 — except json.JSONDecodeError, Exception:

• sandbox/egg_agent_tools/handlers/_gateway.py:128 — except json.JSONDecodeError, Exception:

• sandbox/egg_lib/contract_cli.py:306 — except json.JSONDecodeError, Exception:

• shared/egg_contracts/checkpoint_cli.py:354 — except json.JSONDecodeError, Exception:

• shared/egg_contracts/checkpoint_cli.py:368 — except json.JSONDecodeError, Exception:

  These should be except Exception: (and ideally narrowed further — catching all of Exception to set parsed = None after a failed JSON parse is too broad and will swallow programming errors like AttributeError on a None exc.read()).

except ImportError, ModuleNotFoundError: (5 sites) — ModuleNotFoundError extends ImportError, so the second class is dead:

• orchestrator/tests/test_infra_error_escalation.py:673 and :678

• orchestrator/tests/test_overseer_issue_filing_integration.py:47

• orchestrator/tests/test_two_tier_integration.py:65 (×2)

  These should be except ImportError:.

except subprocess.TimeoutExpired, subprocess.SubprocessError: (2 sites) — TimeoutExpired extends SubprocessError:

• shared/egg_contracts/agent_recovery.py:298

• shared/egg_git/default_branch.py:36

  Should be except subprocess.SubprocessError:.

except FileNotFoundError, OSError: (1 site) — FileNotFoundError extends OSError:

• sandbox/egg_lib/sdlc_hitl.py:324

  Should be except OSError:.

Note that ruff's B014 rule flags exact duplicates but does not catch subclass redundancy, which is why the lint stayed clean. Worth a follow-up sweep — doesn't need to block this PR or carry its own.

2. Readability cost of the unparenthesized form

Every except A, B: site now visually mirrors the deprecated Python 2 except A, name: binding syntax (removed in 3.0 by PEP 3110). PEP 758's as-only binding rule prevents semantic ambiguity, but for anyone with Python-2-era muscle memory the eye still has to translate "this is not a name binding" on every read. This is a tooling-imposed cost (ruff's UP rules), not something this PR can opt out of without fighting the formatter — flagging it for visibility, not as a fix request.

If the team finds this confusing in practice, the escape hatch is to drop UP from select in pyproject.toml (or lint.ignore = ["UP024"] for just the parenless except rule — verify the exact code) and reformat back to parens. Cheap to revisit later.

3. Floor pin is good

ruff>=0.15.12,<0.16 matching the pre-commit minor is exactly the right defensive shape — prevents the same drift that bit #2296. The only nit is that the <0.16 ceiling will require a manual bump when 0.16 ships; that's intentional and consistent with how the pre-commit rev: is pinned to a specific tag, so no objection.

4. uv.lock change is clean

Single-package upgrade (ruff only); transitive deps unchanged; sha256 hashes match upstream wheels; dates are within the 0.15.12 release window (2026-04-24). No surprises.

— Authored by egg

[james-in-a-box]

egg review completed. View run logs