fix: stabilize consistency make wrappers

2026-06-07 19:49:17 +02:00
parent 54b867192d
commit e9e9168921
4 changed files with 169 additions and 37 deletions
--- a/58
+++ b/58
@@ -2,6 +2,8 @@

 COMPOSE = docker compose -f infra/docker-compose.yml --env-file .env
 PYTHON ?= python3
+# Codex/WSL non-login shells may not source ~/.profile; keep uv discoverable.
+UV ?= $(shell command -v uv 2>/dev/null || if [ -x "$$HOME/.local/bin/uv" ]; then printf "%s" "$$HOME/.local/bin/uv"; else printf "%s" "uv"; fi)

 start:
 	@echo "# run in different terminals" 
@@ -12,7 +14,7 @@ start:
 	@echo "make bridges      # Set up ssh bridges for cross machines access"

 install:
-	uv sync
+	$(UV) sync

 dashboard/node_modules/.bin/observable: dashboard/package.json dashboard/package-lock.json
 	cd dashboard && npm ci
@@ -39,17 +41,17 @@ db-tools:
 	$(COMPOSE) --profile tools up -d

 migrate:
-	uv run alembic upgrade head
+	$(UV) run alembic upgrade head

 seed:
-	uv run python scripts/seed.py
+	$(UV) run python scripts/seed.py

 ## Start (or restart) the MCP SSE server on :8001 — primary transport for Claude Code.
 ## Remote clients (e.g. COULOMBCORE) connect via the ops-bridge tunnel (port 18001).
 ## Registration: claude mcp add-json -s user state-hub '{"type":"sse","url":"http://127.0.0.1:8001/sse"}'
 mcp-http:
 	@fuser -k 8001/tcp 2>/dev/null && echo "Stopped running MCP server" || true
-	MCP_TRANSPORT=sse MCP_PORT=8001 uv run python mcp_server/server.py
+	MCP_TRANSPORT=sse MCP_PORT=8001 $(UV) run python mcp_server/server.py

 dashboard:
 	@fuser -k 3000/tcp 2>/dev/null && echo "Stopped running dashboard" || true
@@ -63,7 +65,7 @@ test: test-python dashboard-check

 test-python:
 	TEST_DATABASE_URL=postgresql+asyncpg://custodian:changeme@127.0.0.1:5432/custodian_test \
-	uv run pytest -x -q
+	$(UV) run pytest -x -q

 ## ops-bridge managed tunnels
 ## Requires ops-bridge: bridge is at /home/worsch/.local/bin/bridge
@@ -100,7 +102,7 @@ api: db
 	done
 	$(MAKE) migrate
 	@fuser -k 8000/tcp 2>/dev/null && echo "Stopped running API" || true
-	uv run uvicorn api.main:app --reload --reload-dir api --reload-dir mcp_server --reload-dir task_flow_engine --host 127.0.0.1 --port 8000
+	$(UV) run uvicorn api.main:app --reload --reload-dir api --reload-dir mcp_server --reload-dir task_flow_engine --host 127.0.0.1 --port 8000

 ## Register a project (Claude Code): make register-project DOMAIN=railiance PROJECT_PATH=/home/worsch/railiance
 register-project:
@@ -168,7 +170,7 @@ list-repos:
 ## Tip: run capture-tools first for repos with system-level tool dependencies.
 ingest-sbom:
 	@test -n "$(REPO)" || (echo "ERROR: REPO is required."; exit 1)
-	uv run python scripts/ingest_sbom.py --repo "$(REPO)" \
+	$(UV) run python scripts/ingest_sbom.py --repo "$(REPO)" \
 		$(if $(LOCKFILE),--lockfile "$(LOCKFILE)") \
 		$(if $(REPO_PATH),--repo-path "$(REPO_PATH)") \
 		$(if $(DRY_RUN),--dry-run)
@@ -179,12 +181,12 @@ ingest-sbom:
 ## Add DRY_RUN=1 to preview without writing.
 ingest-capabilities:
 	@test -n "$(REPO)" || (echo "ERROR: REPO is required."; exit 1)
-	uv run python scripts/ingest_capabilities.py --repo "$(REPO)" \
+	$(UV) run python scripts/ingest_capabilities.py --repo "$(REPO)" \
 		$(if $(REPO_PATH),--repo-path "$(REPO_PATH)") \
 		$(if $(DRY_RUN),--dry-run)

 ingest-capabilities-all:
-	uv run python scripts/ingest_capabilities.py --all \
+	$(UV) run python scripts/ingest_capabilities.py --all \
 		$(if $(DRY_RUN),--dry-run)

 ## Check Repository Definition of Integrated (DoI) criteria for a repo.
@@ -193,10 +195,10 @@ ingest-capabilities-all:
 ## Add JSON=1 for machine-readable output.
 check-doi:
 	@test -n "$(REPO)" || (echo "ERROR: REPO is required."; exit 1)
-	uv run python scripts/check_doi.py --repo "$(REPO)" $(if $(JSON),--json)
+	$(UV) run python scripts/check_doi.py --repo "$(REPO)" $(if $(JSON),--json)

 check-doi-all:
-	uv run python scripts/check_doi.py --all $(if $(JSON),--json)
+	$(UV) run python scripts/check_doi.py --all $(if $(JSON),--json)

 ## Ingest tpsc.yaml service declarations from a repo into the TPSC catalog.
 ## Usage: make ingest-tpsc REPO=llm-connect
@@ -204,11 +206,11 @@ check-doi-all:
 ## Add DRY_RUN=1 to preview without writing.
 ingest-tpsc:
 	@test -n "$(REPO)" || (echo "ERROR: REPO is required."; exit 1)
-	uv run python scripts/ingest_tpsc.py --repo "$(REPO)" \
+	$(UV) run python scripts/ingest_tpsc.py --repo "$(REPO)" \
 		$(if $(DRY_RUN),--dry-run)

 ingest-tpsc-all:
-	uv run python scripts/ingest_tpsc.py --all \
+	$(UV) run python scripts/ingest_tpsc.py --all \
 		$(if $(DRY_RUN),--dry-run)

 ## Run SBOM capture agent for a repo — generates/updates sbom-tools.yaml.
@@ -216,29 +218,33 @@ ingest-tpsc-all:
 ## Add DRY_RUN=1 to preview without writing.
 capture-tools:
 	@test -n "$(REPO)" || (echo "ERROR: REPO is required."; exit 1)
-	uv run python scripts/capture_sbom_tools.py --repo "$(REPO)" \
+	$(UV) run python scripts/capture_sbom_tools.py --repo "$(REPO)" \
 		$(if $(REPO_PATH),--repo-path "$(REPO_PATH)") \
 		$(if $(DRY_RUN),--dry-run)

 ## Check a repo for ADR-001 compliance: make validate-adr REPO=/path/to/repo [DOMAIN=custodian]
 validate-adr:
 	@test -n "$(REPO)" || (echo "ERROR: REPO is required. Usage: make validate-adr REPO=<path> [DOMAIN=<slug>]"; exit 1)
-	uv run python scripts/validate_repo_adr.py "$(REPO)" $(if $(DOMAIN),--domain "$(DOMAIN)",)
+	$(UV) run python scripts/validate_repo_adr.py "$(REPO)" $(if $(DOMAIN),--domain "$(DOMAIN)",)

+## Consistency exit contract:
+## - Direct scripts/consistency_check.py: 0 clean, 2 warnings-only, 1 failures.
+## - Agent/operator Make wrappers below normalize warning-only 2 to shell success
+##   while preserving visible WARN output and keeping real failures non-zero.
 ## Check a single repo for ADR-001 consistency: make check-consistency REPO=the-custodian [REPO_PATH=/override]
-## Exit 0 = clean, exit 2 = warnings only (treated as success), exit 1 = failures
+## Exit 0 = clean or warnings-only (warnings stay visible), exit 1 = failures
 check-consistency:
 	@test -n "$(REPO)" || (echo "ERROR: REPO is required. Usage: make check-consistency REPO=<slug>"; exit 1)
-	uv run python scripts/consistency_check.py --repo "$(REPO)" \
+	$(UV) run python scripts/consistency_check.py --repo "$(REPO)" \
 	  $(if $(API_BASE),--api-base "$(API_BASE)",) \
 	  $(if $(REPO_PATH),--repo-path "$(REPO_PATH)",); \
 	  e=$$?; [ $$e -eq 2 ] && exit 0 || exit $$e

 ## Check and auto-fix a single repo: make fix-consistency REPO=the-custodian [REPO_PATH=/override]
-## Exit 0 = clean, exit 2 = warnings only (treated as success), exit 1 = failures
+## Exit 0 = clean or warnings-only (warnings stay visible), exit 1 = failures
 fix-consistency:
 	@test -n "$(REPO)" || (echo "ERROR: REPO is required. Usage: make fix-consistency REPO=<slug>"; exit 1)
-	uv run python scripts/consistency_check.py --repo "$(REPO)" --fix \
+	$(UV) run python scripts/consistency_check.py --repo "$(REPO)" --fix \
 	  $(if $(API_BASE),--api-base "$(API_BASE)",) \
 	  $(if $(REPO_PATH),--repo-path "$(REPO_PATH)",); \
 	  e=$$?; [ $$e -eq 2 ] && exit 0 || exit $$e
@@ -258,7 +264,7 @@ token-reconcile:
 ## make fix-consistency-remote           — smart pull+fix all repos that need it
 ## make fix-consistency-remote REPO=slug — pull+fix one repo
 fix-consistency-remote:
-	uv run python scripts/consistency_check.py \
+	$(UV) run python scripts/consistency_check.py \
 	  $(if $(REPO),--repo "$(REPO)",--all) \
 	  --remote \
 	  $(if $(API_BASE),--api-base "$(API_BASE)",) \
@@ -268,14 +274,14 @@ fix-consistency-remote:
 ## Infer repo slug from git remote URL and check: make check-consistency-here [REPO_PATH=/path/to/repo]
 ## Omit REPO_PATH to use the Python script's CWD (i.e. pass an empty --here flag).
 check-consistency-here:
-	uv run python scripts/consistency_check.py \
+	$(UV) run python scripts/consistency_check.py \
 	  --here $(if $(REPO_PATH),"$(REPO_PATH)",) \
 	  $(if $(API_BASE),--api-base "$(API_BASE)",); \
 	  e=$$?; [ $$e -eq 2 ] && exit 0 || exit $$e

 ## Infer repo slug from git remote URL and fix: make fix-consistency-here [REPO_PATH=/path/to/repo]
 fix-consistency-here:
-	uv run python scripts/consistency_check.py \
+	$(UV) run python scripts/consistency_check.py \
 	  --here $(if $(REPO_PATH),"$(REPO_PATH)",) \
 	  --fix \
 	  $(if $(API_BASE),--api-base "$(API_BASE)",); \
@@ -283,19 +289,19 @@ fix-consistency-here:

 ## Check all registered repos for ADR-001 consistency
 check-consistency-all:
-	uv run python scripts/consistency_check.py --all $(if $(API_BASE),--api-base "$(API_BASE)",); \
+	$(UV) run python scripts/consistency_check.py --all $(if $(API_BASE),--api-base "$(API_BASE)",); \
 	  e=$$?; [ $$e -eq 2 ] && exit 0 || exit $$e

 ## Check and auto-fix all registered repos
 fix-consistency-all:
-	uv run python scripts/consistency_check.py --all --fix $(if $(API_BASE),--api-base "$(API_BASE)",); \
+	$(UV) run python scripts/consistency_check.py --all --fix $(if $(API_BASE),--api-base "$(API_BASE)",); \
 	  e=$$?; [ $$e -eq 2 ] && exit 0 || exit $$e

 ## Cancel open tasks belonging to completed/archived workstreams.
 ## Safe to run at any time; also suitable for a daily cron job.
 ## Cron example: 0 3 * * * cd ~/state-hub && make cleanup-stale
 cleanup-stale:
-	uv run python scripts/cleanup_stale_tasks.py
+	$(UV) run python scripts/cleanup_stale_tasks.py

 ## Install custodian post-commit sync hook into one repo: make install-hooks REPO=marki-docx
 install-hooks:
@@ -314,7 +320,7 @@ remove-hooks:
 ## Compare Gitea coulomb org repos against state-hub registered repos
 ## Requires GITEA_TOKEN in env or .env: make gitea-inventory GITEA_TOKEN=<token>
 gitea-inventory:
-	uv run python scripts/gitea_inventory.py $(if $(JSON),--json)
+	$(UV) run python scripts/gitea_inventory.py $(if $(JSON),--json)

 clean:
 	$(COMPOSE) down -v