fix: ecosystem health — compat matrix, lint, submodule sync (#10)

Patel230 · web-flow · commit 58ef2a73d300 · 2026-06-02T10:08:00.000+05:30
* fix: resolve compat matrix collision and sync ecosystem submodules

Rename root compatibility-matrix.json to platform-capabilities.json so
compat-test reads testdata/compatibility-matrix.json. Fix noctx across
codegraph, tools, and bench; use go work sync for tidy; bump external/*
submodules to latest main.

* style: gofumpt codegraph cgo files for CI format gate
diff --git a/COMPATIBILITY.md b/COMPATIBILITY.md
@@ -4,7 +4,9 @@ This eco uses **independent SemVer per repo** (see [VERSIONING.md](./VERSIONING.
 That gives each component its own release cadence, but raises an obvious
 question: *which combinations of versions are actually tested together?*
 
-The answer lives in [`compatibility-matrix.json`](./compatibility-matrix.json).
+The answer lives in [`testdata/compatibility-matrix.json`](./testdata/compatibility-matrix.json).
+
+Platform/provider capability metadata is separate: [`platform-capabilities.json`](./platform-capabilities.json).
 
 ## What it records
 
@@ -46,7 +48,7 @@ existing consumers.
 `.shared-templates/workflows/compatibility-test.yml.tmpl` is a reusable
 workflow that:
 
-1. Reads `compatibility-matrix.json` from the eco repo.
+1. Reads `testdata/compatibility-matrix.json` from the hawk repo.
 2. Checks out each component at the version listed in the named matrix.
 3. Builds + tests the cross-repo integration scenarios.
 
@@ -68,21 +70,14 @@ It runs on:
 
 ## Validating the file
 
-The file is validated against [`compatibility-matrix.schema.json`](./compatibility-matrix.schema.json)
+The file is validated against [`testdata/compatibility-matrix.schema.json`](./testdata/compatibility-matrix.schema.json)
 in CI. To validate locally:
 
 ```bash
-# Quick check using ajv (Node)
+make compat-check   # structural validation + version pins
+
+# Or with ajv (Node)
 npx ajv-cli validate \
-  -s compatibility-matrix.schema.json \
-  -d compatibility-matrix.json
-
-# Or with Python
-python3 -c "
-import json, jsonschema
-schema = json.load(open('compatibility-matrix.schema.json'))
-data   = json.load(open('compatibility-matrix.json'))
-jsonschema.validate(data, schema)
-print('ok')
-"
+  -s testdata/compatibility-matrix.schema.json \
+  -d testdata/compatibility-matrix.json
 ```
diff --git a/Makefile b/Makefile
@@ -106,8 +106,8 @@ security: ## Run govulncheck.
 	@command -v $(GOVULNCHECK) >/dev/null 2>&1 || (echo "install: go install golang.org/x/vuln/cmd/govulncheck@latest" && exit 1)
 	$(GOVULNCHECK) ./...
 
-tidy: ## Tidy go.mod / go.sum.
-	go mod tidy
+tidy: ## Sync workspace modules and verify checksums.
+	go work sync
 	go mod verify
 
 # ---------------------------------------------------------------------------
@@ -190,11 +190,11 @@ help: ## Show this help.
 # ---------------------------------------------------------------------------
 .PHONY: compat-test compat-check
 
-compat-test: ## Validate compatibility-matrix.json and report the 'next' matrix.
-	@go run ./cmd/compat-test -matrix=next
+compat-test: ## Validate testdata/compatibility-matrix.json and report the 'next' matrix.
+	@go run ./cmd/compat-test -matrix=next -file=testdata/compatibility-matrix.json
 
 compat-check: ## Strict validation — non-zero exit if any component lacks a version.
-	@go run ./cmd/compat-test -matrix=next -strict
+	@go run ./cmd/compat-test -matrix=next -strict -file=testdata/compatibility-matrix.json
 
 .PHONY: hooks
 hooks:
diff --git a/cmd/compat-test/main.go b/cmd/compat-test/main.go
@@ -160,17 +160,23 @@ func report(mf matrixFile, m matrix, strict bool) error {
 	return nil
 }
 
-// findMatrixFile looks for compatibility-matrix.json in the current dir, then
-// walks up looking for one. Returns "" if not found within 6 levels.
+// findMatrixFile locates the cross-repo compatibility matrix (testdata/compatibility-matrix.json).
+// It must not pick hawk/platform-capabilities.json, which is a different document.
 func findMatrixFile() string {
 	dir, err := os.Getwd()
 	if err != nil {
 		return ""
 	}
+	candidates := []string{
+		"testdata/compatibility-matrix.json",
+		"hawk/testdata/compatibility-matrix.json",
+	}
 	for i := 0; i < 6; i++ {
-		p := filepath.Join(dir, "compatibility-matrix.json")
-		if _, err := os.Stat(p); err == nil {
-			return p
+		for _, rel := range candidates {
+			p := filepath.Join(dir, rel)
+			if _, err := os.Stat(p); err == nil {
+				return p
+			}
 		}
 		parent := filepath.Dir(dir)
 		if parent == dir {
diff --git a/cmd/testfirst_workflow.go b/cmd/testfirst_workflow.go
@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"context"
 	"fmt"
 	"os"
 	"os/exec"
@@ -84,7 +85,7 @@ func RunTestFirstWorkflow(cfg TestFirstConfig, chatFn ReviewChatFn) TestFirstRes
 
 // runTests executes the test command and returns output + pass status.
 func runTests(testCmd string) (string, bool) {
-	cmd := exec.Command("sh", "-c", testCmd)
+	cmd := exec.CommandContext(context.Background(), "sh", "-c", testCmd)
 	cmd.Dir, _ = os.Getwd()
 	out, err := cmd.CombinedOutput()
 	output := strings.TrimSpace(string(out))
diff --git a/external/eyrie b/external/eyrie
@@ -1 +1 @@
-Subproject commit 5205d42c657fe4c397bfb49563bd64e27be59887
+Subproject commit d5c3b979fd0840410e0b506593fb346ede99a6e3
diff --git a/external/inspect b/external/inspect
@@ -1 +1 @@
-Subproject commit 086ceae69c87bb46064607dc8347ca7f5c8f7f68
+Subproject commit 426e77065fb4e7c5c6c85d7bc1a9c4ff8816d245
diff --git a/external/sight b/external/sight
@@ -1 +1 @@
-Subproject commit a552746c244583daefe68d84fe561ccea9013852
+Subproject commit 6d3b83ab628d552f3ae5794ccff412cc58c31cc3
diff --git a/external/tok b/external/tok
@@ -1 +1 @@
-Subproject commit ad094a67797d1e9ed9c0f860768fbb37fd3b7170
+Subproject commit fe25344fefec647fa93330e6b544d8d45a0e6366
diff --git a/external/trace b/external/trace
@@ -1 +1 @@
-Subproject commit d7a722ba285fb663a3a0518fee5318919bdac4d0
+Subproject commit 997be1b2a501428adc81bc927cc4ba6996457115
diff --git a/external/yaad b/external/yaad
@@ -1 +1 @@
-Subproject commit 03b6f005ddab51eba7a456548aac627becdc2796
+Subproject commit abb30043435488b2c12bf05a52190e8087e37235
diff --git a/internal/bench/suite.go b/internal/bench/suite.go
@@ -1,6 +1,7 @@
 package bench
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"os"
@@ -54,7 +55,7 @@ func runYaadBench(projectDir string) ([]BenchmarkResult, error) {
 	}
 
 	start := time.Now()
-	cmd := exec.Command("go", "test", "-bench=.", "-benchmem", "-count=1", "-timeout=60s", "./engine/...")
+	cmd := exec.CommandContext(context.Background(), "go", "test", "-bench=.", "-benchmem", "-count=1", "-timeout=60s", "./engine/...")
 	cmd.Dir = yaadDir
 	output, err := cmd.CombinedOutput()
 	duration := time.Since(start)
@@ -81,7 +82,7 @@ func runTokBench(projectDir string) ([]BenchmarkResult, error) {
 	}
 
 	start := time.Now()
-	cmd := exec.Command("go", "test", "-bench=.", "-benchmem", "-count=1", "-timeout=60s", "./...")
+	cmd := exec.CommandContext(context.Background(), "go", "test", "-bench=.", "-benchmem", "-count=1", "-timeout=60s", "./...")
 	cmd.Dir = tokDir
 	output, err := cmd.CombinedOutput()
 	duration := time.Since(start)
@@ -108,7 +109,7 @@ func runHawkBuildBench(projectDir string) (BenchmarkResult, error) {
 	}
 
 	start := time.Now()
-	cmd := exec.Command("go", "build", "-o", "/dev/null", ".")
+	cmd := exec.CommandContext(context.Background(), "go", "build", "-o", "/dev/null", ".")
 	cmd.Dir = hawkDir
 	err := cmd.Run()
 	duration := time.Since(start)
diff --git a/internal/codegraph/algorithms_cgo.go b/internal/codegraph/algorithms_cgo.go
@@ -3,6 +3,7 @@
 package codegraph
 
 import (
+	"context"
 	"fmt"
 	"sort"
 	"strings"
@@ -38,7 +39,7 @@ func (cg *CodeGraph) BetweennessCentrality(topN int) (*BetweennessResult, error)
 
 	// Build adjacency list from edges
 	adj := make(map[string][]string)
-	rows, err := cg.db.Query("SELECT source, target FROM edges WHERE kind IN ('calls', 'references', 'imports', 'extends', 'implements')")
+	rows, err := cg.db.QueryContext(context.Background(), "SELECT source, target FROM edges WHERE kind IN ('calls', 'references', 'imports', 'extends', 'implements')")
 	if err != nil {
 		return nil, err
 	}
@@ -150,7 +151,7 @@ func (cg *CodeGraph) BetweennessCentrality(topN int) (*BetweennessResult, error)
 		}
 		// Try to get node name and file
 		var name, filePath, kind string
-		err := cg.db.QueryRow("SELECT name, file_path, kind FROM nodes WHERE id = ?", s.id).Scan(&name, &filePath, &kind)
+		err := cg.db.QueryRowContext(context.Background(), "SELECT name, file_path, kind FROM nodes WHERE id = ?", s.id).Scan(&name, &filePath, &kind)
 		if err == nil {
 			nc.Name = name
 			nc.FilePath = filePath
@@ -194,7 +195,7 @@ func (cg *CodeGraph) CommunityDetection() (*CommunityDetectionResult, error) {
 	adj := make(map[string]map[string]float64)
 	var edges []edge
 
-	rows, err := cg.db.Query("SELECT source, target, kind FROM edges WHERE kind IN ('calls', 'references', 'imports', 'extends', 'implements', 'contains')")
+	rows, err := cg.db.QueryContext(context.Background(), "SELECT source, target, kind FROM edges WHERE kind IN ('calls', 'references', 'imports', 'extends', 'implements', 'contains')")
 	if err != nil {
 		return nil, err
 	}
@@ -349,7 +350,7 @@ func (cg *CodeGraph) ConnectedComponents() ([][]string, error) {
 
 	// Build adjacency list
 	adj := make(map[string][]string)
-	rows, err := cg.db.Query("SELECT source, target FROM edges WHERE kind IN ('calls', 'references', 'imports', 'extends', 'implements')")
+	rows, err := cg.db.QueryContext(context.Background(), "SELECT source, target FROM edges WHERE kind IN ('calls', 'references', 'imports', 'extends', 'implements')")
 	if err != nil {
 		return nil, err
 	}
@@ -426,7 +427,7 @@ func (cg *CodeGraph) DiffGraph(beforeNodes map[string]bool, beforeEdges map[stri
 
 	// Get current nodes
 	currentNodes := make(map[string]bool)
-	rows, _ := cg.db.Query("SELECT id, file_path FROM nodes")
+	rows, _ := cg.db.QueryContext(context.Background(), "SELECT id, file_path FROM nodes")
 	if rows != nil {
 		for rows.Next() {
 			var id, filePath string
@@ -450,7 +451,7 @@ func (cg *CodeGraph) DiffGraph(beforeNodes map[string]bool, beforeEdges map[stri
 
 	// Get current edges
 	currentEdges := make(map[string]bool)
-	rows, _ = cg.db.Query("SELECT source || '->' || target || ':' || kind FROM edges")
+	rows, _ = cg.db.QueryContext(context.Background(), "SELECT source || '->' || target || ':' || kind FROM edges")
 	if rows != nil {
 		for rows.Next() {
 			var edgeKey string
@@ -483,7 +484,7 @@ func (cg *CodeGraph) SnapshotGraph() (nodes map[string]bool, edges map[string]bo
 	nodes = make(map[string]bool)
 	edges = make(map[string]bool)
 
-	rows, err := cg.db.Query("SELECT id FROM nodes")
+	rows, err := cg.db.QueryContext(context.Background(), "SELECT id FROM nodes")
 	if err != nil {
 		return nil, nil, err
 	}
@@ -501,7 +502,7 @@ func (cg *CodeGraph) SnapshotGraph() (nodes map[string]bool, edges map[string]bo
 	}
 	rows.Close()
 
-	rows, err = cg.db.Query("SELECT source || '->' || target || ':' || kind FROM edges")
+	rows, err = cg.db.QueryContext(context.Background(), "SELECT source || '->' || target || ':' || kind FROM edges")
 	if err != nil {
 		return nil, nil, err
 	}
@@ -537,7 +538,7 @@ func (cg *CodeGraph) FindDeadCode() ([]DeadCodeEntry, error) {
 	defer cg.mu.RUnlock()
 
 	// Get all nodes
-	rows, err := cg.db.Query(
+	rows, err := cg.db.QueryContext(context.Background(),
 		`SELECT id, kind, name, qualified_name, file_path, language,
 		        start_line, end_line, signature, docstring, visibility, is_exported
 		 FROM nodes WHERE kind IN ('function', 'method', 'class', 'interface', 'struct')`,
@@ -551,7 +552,7 @@ func (cg *CodeGraph) FindDeadCode() ([]DeadCodeEntry, error) {
 
 	// Get all referenced node IDs
 	referenced := make(map[string]bool)
-	edgeRows, _ := cg.db.Query("SELECT DISTINCT target FROM edges WHERE kind IN ('calls', 'references', 'imports', 'extends', 'implements')")
+	edgeRows, _ := cg.db.QueryContext(context.Background(), "SELECT DISTINCT target FROM edges WHERE kind IN ('calls', 'references', 'imports', 'extends', 'implements')")
 	if edgeRows != nil {
 		for edgeRows.Next() {
 			var target string
@@ -565,7 +566,7 @@ func (cg *CodeGraph) FindDeadCode() ([]DeadCodeEntry, error) {
 	}
 
 	// Also mark source nodes as referenced (they're being used)
-	edgeRows, _ = cg.db.Query("SELECT DISTINCT source FROM edges")
+	edgeRows, _ = cg.db.QueryContext(context.Background(), "SELECT DISTINCT source FROM edges")
 	if edgeRows != nil {
 		for edgeRows.Next() {
 			var source string
@@ -677,7 +678,7 @@ func (cg *CodeGraph) PageRank(iterations int, damping float64) (map[string]float
 	inlinks := make(map[string][]string)
 	nodes := make(map[string]bool)
 
-	rows, err := cg.db.Query("SELECT source, target FROM edges WHERE kind IN ('calls', 'references', 'imports')")
+	rows, err := cg.db.QueryContext(context.Background(), "SELECT source, target FROM edges WHERE kind IN ('calls', 'references', 'imports')")
 	if err != nil {
 		return nil, err
 	}
@@ -768,7 +769,7 @@ func (cg *CodeGraph) ImpactAnalysis(nodeID string, maxDepth int) (*ImpactResult,
 		result.Impacted[s.id] = s.depth
 
 		// Get all nodes that depend on this one
-		rows, _ := cg.db.Query(
+		rows, _ := cg.db.QueryContext(context.Background(),
 			`SELECT source FROM edges WHERE target = ? AND kind IN ('calls', 'references', 'imports', 'extends', 'implements')`, s.id,
 		)
 		if rows != nil {
@@ -789,7 +790,7 @@ func (cg *CodeGraph) ImpactAnalysis(nodeID string, maxDepth int) (*ImpactResult,
 	// Load node details
 	for id, depth := range result.Impacted {
 		var n Node
-		err := cg.db.QueryRow(
+		err := cg.db.QueryRowContext(context.Background(),
 			`SELECT id, kind, name, qualified_name, file_path, language,
 			        start_line, end_line, signature, docstring, visibility, is_exported
 			 FROM nodes WHERE id = ?`, id,
@@ -840,7 +841,7 @@ func (cg *CodeGraph) AnalyzeCoupling(topN int) ([]CouplingMetric, error) {
 
 	// Build file -> set of referenced symbols
 	fileDeps := make(map[string]map[string]bool)
-	rows, err := cg.db.Query("SELECT file_path, target FROM edges e JOIN nodes n ON n.id = e.source WHERE e.kind IN ('calls', 'references', 'imports')")
+	rows, err := cg.db.QueryContext(context.Background(), "SELECT file_path, target FROM edges e JOIN nodes n ON n.id = e.source WHERE e.kind IN ('calls', 'references', 'imports')")
 	if err != nil {
 		return nil, err
 	}
@@ -975,7 +976,7 @@ func FindCrossRepoCalls(repos []string) ([]CrossRepoCall, error) {
 		repoNodes[repoRoot] = make(map[string]bool)
 
 		// Get all nodes
-		rows, err := cg.db.Query("SELECT id, kind, name, qualified_name, file_path, language, start_line, end_line, signature, docstring, visibility, is_exported FROM nodes")
+		rows, err := cg.db.QueryContext(context.Background(), "SELECT id, kind, name, qualified_name, file_path, language, start_line, end_line, signature, docstring, visibility, is_exported FROM nodes")
 		if err != nil {
 			cg.Close()
 			continue
@@ -1002,7 +1003,7 @@ func FindCrossRepoCalls(repos []string) ([]CrossRepoCall, error) {
 		}
 
 		// Get unresolved refs (calls to symbols not in this repo)
-		rows, err := cg.db.Query("SELECT from_node_id, reference_name, file_path, line FROM unresolved_refs")
+		rows, err := cg.db.QueryContext(context.Background(), "SELECT from_node_id, reference_name, file_path, line FROM unresolved_refs")
 		if err != nil {
 			cg.Close()
 			continue
diff --git a/internal/codegraph/codegraph_cgo.go b/internal/codegraph/codegraph_cgo.go
diff --git a/internal/codegraph/embeddings_cgo.go b/internal/codegraph/embeddings_cgo.go
diff --git a/internal/tool/git_history.go b/internal/tool/git_history.go
diff --git a/internal/tool/impact.go b/internal/tool/impact.go
diff --git a/platform-capabilities.json b/platform-capabilities.json
diff --git a/testdata/compatibility-matrix.json b/testdata/compatibility-matrix.json
