fix(infra): revert broken merge and stabilize beads integration codex - #445
Closed
marlon-costa-dc wants to merge 101 commits into
Closed
fix(infra): revert broken merge and stabilize beads integration codex#445marlon-costa-dc wants to merge 101 commits into
marlon-costa-dc wants to merge 101 commits into
Conversation
# Conflicts: # config/beads.yaml # config/codegen.yaml # docs/guides/topology-conform.md # src/flext_infra/_constants/codegen_project.py # src/flext_infra/_models/config.py # src/flext_infra/_protocols/base.py # src/flext_infra/_utilities/discovery.py # src/flext_infra/_utilities/docs_scope.py # src/flext_infra/_utilities/pyproject_conform.py # src/flext_infra/codegen/_lazy_init_planner_public_root.py # src/flext_infra/codegen/conform.py # src/flext_infra/codegen/project_new.py # src/flext_infra/deps/_modernizer_document.py # src/flext_infra/deps/_modernizer_run.py # src/flext_infra/deps/phases/ensure_pyright.py # src/flext_infra/deps/phases/ensure_ruff.py # src/flext_infra/release/orchestrator_phases.py # src/flext_infra/services/_codegen/vscode.py # src/flext_infra/templates/project/base/Makefile.j2 # src/flext_infra/templates/project/base/beads-config.yaml.j2 # src/flext_infra/templates/project/base/config/beads.yaml.j2 # src/flext_infra/templates/project/base/pyproject.toml.j2 # src/flext_infra/templates/project/base/tests/fixtures/ci/docker/alpine.Dockerfile.j2 # src/flext_infra/templates/project/base/tests/fixtures/ci/docker/fedora.Dockerfile.j2 # src/flext_infra/workspace/_governance.py # src/flext_infra/workspace/detector.py # src/flext_infra/workspace/flext_binding.py # tests/unit/codegen/lazy_init_helpers_tests.py # tests/unit/codegen/test_codegen_beads_projection.py # tests/unit/codegen/test_codegen_catalog_extensions.py # tests/unit/codegen/test_codegen_ci_matrix.py # tests/unit/codegen/test_codegen_conform.py # tests/unit/codegen/test_codegen_conform_progress.py # tests/unit/codegen/test_codegen_hook_conformance.py # tests/unit/codegen/test_codegen_linked_worktree_manifest.py # tests/unit/codegen/test_codegen_make_environment.py # tests/unit/codegen/test_codegen_uv_exclude_newer_overlay.py # tests/unit/codegen/test_codegen_workspace_root_fanout.py # tests/unit/codegen/test_root_artifact_ownership.py # tests/unit/codegen/toolchain_beads_distribution_tests.py # tests/unit/codegen/toolchain_go_backend_tests.py # tests/unit/workspace/test_detector_owns_no_project_registry.py # tests/unit/workspace/test_environment_provenance.py # tests/unit/workspace/test_flext_worktree_binding.py # tests/unit/workspace/test_main.py # tests/unit/workspace/test_vscode.py # tests/unit/workspace/test_workspace_root_make_contract.py # tests/utilities.py
# Conflicts: # config/codegen.yaml # tests/unit/codegen/test_codegen_catalog_extensions.py # tests/unit/codegen/toolchain_beads_distribution_tests.py
# Conflicts: # .beads/config.yaml # .github/workflows/ci-matrix.yml # Makefile # mise.lock # src/flext_infra/__init__.py # src/flext_infra/codegen/__init__.py # src/flext_infra/detectors/__init__.py # src/flext_infra/refactor/__init__.py # tests/unit/__init__.py # tests/unit/_utilities/test_discovery_consolidated.py # tests/unit/basemk/__init__.py # tests/unit/codegen/__init__.py # tests/unit/codegen/test_codegen_catalog_extensions.py # tests/unit/codegen/test_codegen_ci_matrix.py # tests/unit/codegen/test_codegen_gitignore_profile_aware.py # tests/unit/codegen/test_codegen_linked_worktree_manifest.py # tests/unit/codegen/test_codegen_pyproject_conform.py # tests/unit/codegen/test_workspace_root_setup_submodules.py # tests/unit/discovery/test_infra_discovery.py # tests/unit/docs/__init__.py # tests/unit/refactor/__init__.py # tests/unit/test_gitignore_is_generated_from_ssot.py # tests/unit/test_infra_maintenance_main.py # tests/unit/test_pyproject_conform_topology_sources.py # tests/unit/validate/__init__.py # tests/unit/workspace/__init__.py
added 28 commits
August 28, 2026 12:51
|
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
1 participant
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.
Reverts broken merge 39eb8a8 (merge: adopt canonical Mise and Beads cutover) and applies beads integration codex generation runtime fixes:
Summary by cubic
Reverts the broken merge that adopted the canonical Mise and Beads cutover, then re-applies it with the generation-runtime, submodule setup, and linked worktree manifest fixes that were missing.
Breaking changes
config/beads.yaml; the generated.beads/config.yamlno longer resolves the ledger..codex/hooks.json) and the Beads git-hook installer.mro-*toflext-*.Dependencies
mise.lockand portablebin/mise/bin/mise.cmdbootstrap wrappers; CI and local setup now use mise instead of setup-python/setup-uv.workspace-membertostandalone, with topology derived from.gitmodulespresence.ci-matrix.ymlfor multi-distro bootstrap coverage;ci.ymlanddocs.ymlnow consume the mise toolchain.Written for commit 2eb678b. Summary will update on new commits.