Rebuild of the Starbase sync, rebased onto the current heads of both `origin/main` (`fe67242`) and `starbase/main` (`1104bc6`). History was rewritten — see the comment below. ## What changed since the previous revision **Pulled from `starbase/main` (5 commits):** | Commit | Change | |---|---| | `1104bc6` | `style: drop mypy, pyright (#624)` — removes `[tool.mypy]`, `[tool.pyright]`, the `mypy` dependency-group entries, and the `lint-mypy`/`lint-pyright`/`install-pyright` targets from `common.mk` | | `cb4cb54` | `build(deps): lock file maintenance (#622)` | | `26946d1` | `build(deps): update github actions (#618)` | | `3a6537c` | `build(deps): update dependency mypy to ~=2.4.0 (#619)` — superseded by `#624` | | `e71c218` | `build(deps): update astral-sh/setup-uv action to v10 (#620)` | **Pulled from `origin/main`:** all commits since the previous revision, including the now-merged prep PRs #435 (tombi format) and #437 (Vale guards). ## Regression fixes from the previous revision The previous revision of this PR was broken; all three are fixed here: 1. **`uv.lock` no longer breaks the build.** Previously Starbase's lockfile was taken wholesale, so `craft-store` was not a workspace member and `make test-fast` failed with `` The lockfile at `uv.lock` needs to be updated, but `UV_FROZEN=1` was provided: Missing workspace member `craft-store`. ``. `uv.lock` is a child-owned file; it is now kept from the child and regenerated with `uv lock` from the merged dependency set. `make test-fast` passes (266 passed). 2. **`Makefile` `PROJECT` is no longer `starcraft`.** It now stays `craft_store`, so `make format` no longer fails with `Failed to format starcraft: No such file or directory`. 3. **`pyproject.toml` no longer drops two build sections.** `[tool.setuptools]` `package-data` (the `py.typed` marker) and `[tool.setuptools.packages.find]` are preserved, and the stale `[tool.mypy]`/`[tool.pyright]` sections are gone (Starbase dropped them in #624). ## Conflict resolution Resolved per `references/file_ownership.md`: - **Kept child (`--ours`):** `.github/workflows/qa.yaml`, `.pre-commit-config.yaml`, `CONTRIBUTING.md`, `docs/conf.py`, `docs/explanation/documentation.rst`, and `uv.lock` (regenerated). - **Took from `starbase/main`:** `.github/workflows/check-renovate.yaml`, `.github/workflows/release-publish.yaml`, `common.mk`. - **`tics.yaml`** — kept the reusable-workflow call from Starbase but restored the required `with.project` input to `craft-store`. The ownership map explicitly forbids leaving this input commented out, and Copilot flagged the commented-out version separately. - **`Makefile`** (mixed ownership) — kept the child-owned `PROJECT=craft_store`, took Starbase's new `format-tombi`/`lint-tombi` targets, and dropped the `pack-snap` target because this library has no `snap/snapcraft.yaml` prerequisite so the target can never run (also flagged by Copilot). - **`pyproject.toml`** — kept the child's `[project]`, `[dependency-groups]`, `[build-system]`, `[tool.setuptools]`, `[tool.setuptools_scm]`; merged `tool.uv.constraint-dependencies` by taking the higher version from each side ordered alphabetically; kept Starbase's `tool.ruff` block except `tool.ruff.src` and `tool.ruff.target-version`, adding the child's entries to `tool.ruff.extend-exclude` and `tool.ruff.lint.ignore`. ## Library-repo deletions (rule 1b) These never raise a conflict, so they are applied explicitly: - `AGENTS.app.md` - `.github/README.md` (Starbase ships this scaffold; it never appears as a conflict) - `docs/release-notes/` - `starcraft/__init__.py` and `tests/*/starbase/test_init.py` (Starbase scaffold) ## Validation status | Command | Result | |---|---| | `make test-fast` | **PASS** — 266 passed, 34 deselected | | `make format` | **FAIL** — 24 ruff findings. See the pending prep PR below. | | `make lint` | **FAIL** — same ruff findings | | `make docs` | **FAIL** — pre-existing and environmental; fails identically on `main` (`find: '../.venv/lib/python*/site-packages/vale/vale_bin': No such file or directory`), so it is not introduced by this merge | `make format` / `make lint` fail because Starbase has substantially expanded `tool.ruff.lint.select` since the last sync (adding `ASYNC`, `S*`, `FBT`, `COM`, `PIE*`, `SLF`, `TID`, `TC001`–`TC003`, `FIX`, `FLY`, `PERF`, `B035`, `RUF001`–`RUF013`, `RUF100`, `RUF200`). Taking that list is the correct resolution per the ownership map — the child adds nothing to it — but it surfaces new findings in this repository's source. Those findings are being fixed in a separate preparation PR rather than bundled here. Per the preparation-PR rules, this PR stays in draft until that prep PR is merged. ## Pending preparation PR See the comment below for the prep PR that addresses the ruff findings surfaced by Starbase's expanded `tool.ruff.lint.select`.