pdurlej/platform

Fork 0

DRAFT: fix(platformctl): block auto-apply for missing compose services #288

Closed

codex wants to merge 1 commit from codex/269/meerkat-compose-guard into main

codex commented

2026-05-15 18:56:41 +02:00

Collaborator

Canary status: missing — fire canary 3+3 manually before merge

DRAFT — prepared for post-#260 morning push. This PR is safe to review now, but should land before retrying np-meerkat-frontend F2.

Canary Context Pack

Product story

A module that exists in module.yaml but is absent from canonical compose should not enter the auto-apply lane and produce confusing runtime failures. Agents need an explicit blocker instead of rediscovering the Meerkat gap through failed smokes.

What changed

auto_apply_scope.py now parses the module's canonical compose file and repo-local include: graph, then blocks modules whose spec.runtime.compose_service is absent from that graph.

Why it changed

np-meerkat-frontend is marked as a stateless F2 candidate, but its service is not present in compose/apps/compose.yaml or included compose files. F2 already found this as a data gap. This PR turns that class of gap into a deterministic pre-apply blocker.

Files touched

control-plane/platformctl/ci/auto_apply_scope.py
control-plane/platformctl/tests/test_forgejo_ci_scripts_contract.py

Relevant context

#269 Meerkat follow-up.
#142 F2 ramp thread.
ADR-0018: fix root causes and prevent recurring agent-visible false fire.

Runtime evidence

No runtime mutation. Local classifier proof:

{
  "status": "blocked",
  "allowed_modules": [],
  "blockers": [
    "np-meerkat-frontend: compose_service 'np-meerkat-frontend' is missing from canonical compose graph 'compose/apps/compose.yaml'"
  ]
}

Known constraints

This does not import Meerkat into canonical compose. It only prevents auto-apply from treating missing canonical service data as deployable.

Explicit out-of-scope

No Meerkat compose import.
No route/auth decision for meerkat.pdurlej.com.
No production smoke.

Requested decision

Merge before retrying Meerkat F2. Then decide separately whether to import Meerkat into canonical compose, retire it, or keep it blocked.

Merge blockers

Any existing valid F2 candidate becomes blocked incorrectly.
The compose parser ignores include: and therefore sees an incomplete graph.
The blocker is warning-only rather than fail-closed.

Spec sources read

control-plane/platformctl/ci/auto_apply_scope.py — auto-apply classifier.
control-plane/platformctl/tests/test_forgejo_ci_scripts_contract.py — workflow/auto-apply contract tests.
modules/np-meerkat-frontend/module.yaml — failing module manifest.
compose/apps/compose.yaml, compose/base/compose.yaml, compose/core/compose.yaml — canonical compose graph.
prompts/codex-f2-ramp-continuation-2026-05-14.md — F2 context and #269 deferral.

Test plan

python3 -m venv /tmp/platformctl-test-venv
. /tmp/platformctl-test-venv/bin/activate
python -m pip install -q jsonschema PyYAML click httpx pytest
PYTHONPATH=control-plane pytest control-plane/platformctl/tests/test_forgejo_ci_scripts_contract.py -q
# 26 passed

PYTHONPATH=control-plane python control-plane/platformctl/ci/auto_apply_scope.py \
  --module np-meerkat-frontend \
  --json /tmp/meerkat-scope.json \
  --markdown /tmp/meerkat-scope.md \
  --fail-on-blocked
# exits 4 with missing canonical compose service blocker

Refs #269

Canary status: missing — fire canary 3+3 manually before merge DRAFT — prepared for post-#260 morning push. This PR is safe to review now, but should land before retrying `np-meerkat-frontend` F2. ## Canary Context Pack ### Product story A module that exists in `module.yaml` but is absent from canonical compose should not enter the auto-apply lane and produce confusing runtime failures. Agents need an explicit blocker instead of rediscovering the Meerkat gap through failed smokes. ### What changed `auto_apply_scope.py` now parses the module's canonical compose file and repo-local `include:` graph, then blocks modules whose `spec.runtime.compose_service` is absent from that graph. ### Why it changed `np-meerkat-frontend` is marked as a stateless F2 candidate, but its service is not present in `compose/apps/compose.yaml` or included compose files. F2 already found this as a data gap. This PR turns that class of gap into a deterministic pre-apply blocker. ### Files touched - `control-plane/platformctl/ci/auto_apply_scope.py` - `control-plane/platformctl/tests/test_forgejo_ci_scripts_contract.py` ### Relevant context - #269 Meerkat follow-up. - #142 F2 ramp thread. - ADR-0018: fix root causes and prevent recurring agent-visible false fire. ### Runtime evidence No runtime mutation. Local classifier proof: ```json { "status": "blocked", "allowed_modules": [], "blockers": [ "np-meerkat-frontend: compose_service 'np-meerkat-frontend' is missing from canonical compose graph 'compose/apps/compose.yaml'" ] } ``` ### Known constraints This does not import Meerkat into canonical compose. It only prevents auto-apply from treating missing canonical service data as deployable. ### Explicit out-of-scope - No Meerkat compose import. - No route/auth decision for `meerkat.pdurlej.com`. - No production smoke. ### Requested decision Merge before retrying Meerkat F2. Then decide separately whether to import Meerkat into canonical compose, retire it, or keep it blocked. ### Merge blockers - Any existing valid F2 candidate becomes blocked incorrectly. - The compose parser ignores `include:` and therefore sees an incomplete graph. - The blocker is warning-only rather than fail-closed. ## Spec sources read - `control-plane/platformctl/ci/auto_apply_scope.py` — auto-apply classifier. - `control-plane/platformctl/tests/test_forgejo_ci_scripts_contract.py` — workflow/auto-apply contract tests. - `modules/np-meerkat-frontend/module.yaml` — failing module manifest. - `compose/apps/compose.yaml`, `compose/base/compose.yaml`, `compose/core/compose.yaml` — canonical compose graph. - `prompts/codex-f2-ramp-continuation-2026-05-14.md` — F2 context and #269 deferral. ## Test plan ```bash python3 -m venv /tmp/platformctl-test-venv . /tmp/platformctl-test-venv/bin/activate python -m pip install -q jsonschema PyYAML click httpx pytest PYTHONPATH=control-plane pytest control-plane/platformctl/tests/test_forgejo_ci_scripts_contract.py -q # 26 passed PYTHONPATH=control-plane python control-plane/platformctl/ci/auto_apply_scope.py \ --module np-meerkat-frontend \ --json /tmp/meerkat-scope.json \ --markdown /tmp/meerkat-scope.md \ --fail-on-blocked # exits 4 with missing canonical compose service blocker ``` Refs #269

codex added the

labels

2026-05-15 18:56:41 +02:00

codex added 1 commit

2026-05-15 18:56:41 +02:00

fix(platformctl): block auto-apply for missing compose services

canary-required / collect-diff (pull_request) Successful in 3s

Details

infra-docs-drift / docs-drift (pull_request) Successful in 3s

Details

platformctl plan / auto-apply scope (pull_request) Successful in 19s

Details

pyfallow / Pyfallow gate (control-plane) (pull_request) Successful in 17s

Details

python-ci / Python 3.11 (pull_request) Successful in 36s

Details

python-ci / Python 3.12 (pull_request) Successful in 37s

Details

python-ci / Python 3.13 (pull_request) Successful in 36s

Details

workflow-lint / lint (pull_request) Successful in 4s

Details

base-is-main / guard (pull_request) Successful in 1s

Details

canary-required / canary (pull_request) Successful in 12s

Details

c6a7003a7b

codex referenced this pull request

2026-05-15 18:59:37 +02:00

[coordination-lane] Cutover Flight Phase 2: v2 catalog to gate #142

codex referenced this pull request

2026-05-15 19:05:35 +02:00

[coordination-lane] Cutover Flight Phase 2: v2 catalog to gate #142

codex commented

2026-05-24 08:00:00 +02:00

Author

Collaborator

Fork D triage — closing superseded

Role: executor
Decision: close, no rewrite.

The original idea is valid, but it is already represented on current main: control-plane/platformctl/ci/auto_apply_scope.py now checks canonical compose membership via compose_service_exists(...), including compose includes, and the test suite covers the missing-canonical-compose-service blocker.

This branch is stale/non-mergeable and would regress newer F3/stateful backup override logic if merged. A fresh PR is not needed for the Meerkat/missing-compose guard.

No production mutation performed. Closing as superseded.

## Fork D triage — closing superseded **Role:** executor **Decision:** close, no rewrite. The original idea is valid, but it is already represented on current `main`: `control-plane/platformctl/ci/auto_apply_scope.py` now checks canonical compose membership via `compose_service_exists(...)`, including compose includes, and the test suite covers the missing-canonical-compose-service blocker. This branch is stale/non-mergeable and would regress newer F3/stateful backup override logic if merged. A fresh PR is not needed for the Meerkat/missing-compose guard. No production mutation performed. Closing as superseded.

codex closed this pull request

2026-05-24 08:00:00 +02:00