fix(framework): detect installed tool drift (#1194) #1195

Merged
Mos merged 5 commits from fix/1194-framework-drift-detection into main 2026-08-13 10:43:12 +00:00
4 changed files with 46 additions and 4 deletions
Showing only changes of commit 3d7953671c - Show all commits
@@ -69,7 +69,7 @@ _manifest_glob_to_ere() {
out="$out.*"
fi
else
out="$out[^/]*"
out="${out}[^/]*"
fi
else
case "$c" in
@@ -87,7 +87,8 @@ _manifest_compile_one() {
local norm; norm="$(_manifest_norm "$1")"
[[ -n "$norm" ]] || return 0
if [[ "$norm" == *"*"* ]]; then
local re="^$(_manifest_glob_to_ere "$norm")\$"
local re
re="^$(_manifest_glob_to_ere "$norm")\$"
if [[ "$2" == F ]]; then
_MF_KIND+=(re); _MF_EXACT+=(""); _MF_RE+=("$re")
else
@@ -183,7 +184,10 @@ _mo_matches() {
for (( i = 0; i < n; i++ )); do
if [[ "${_MO_KIND[i]}" == exact ]]; then
pat="${_MO_EXACT[i]}"
[[ "$path" == "$pat" || "$path" == "$pat/"* ]] && return 0
# Operator exact entries are file carve-outs, not implicit directory
# prefixes. Subtree ownership must be declared explicitly as `dir/**`;
# otherwise one bare directory entry can hide all drift beneath it.
[[ "$path" == "$pat" ]] && return 0
else
re="${_MO_RE[i]}"
[[ "$path" =~ $re ]] && return 0
@@ -65,6 +65,16 @@ class FrameworkDriftCheckTests(unittest.TestCase):
self.assertEqual(result.returncode, 0, result.stderr)
self.assertIn("stale=0 not-installed=0 unsafe-alias=0", result.stdout)
def test_exact_operator_directory_does_not_hide_framework_drift_beneath_it(self) -> None:
self.install_matching()
(self.installed / "git" / "guard.sh").write_text("drift-hidden-by-directory-entry\n")
self.write_manifest("tools/git\n")
result = self.run_check()
self.assertEqual(result.returncode, 1, result.stdout + result.stderr)
self.assertIn("STALE git/guard.sh", result.stdout)
def test_manifest_is_required_and_policy_changes_take_effect(self) -> None:
self.install_matching()
(self.installed / "git" / "guard.sh").write_text("operator-divergence\n")
@@ -146,6 +146,21 @@ describe('resolveOwnership (deny-wins + fail-safe)', () => {
expect(resolveOwnership(m, 'tools/git/pr-create.sh')).toBe('framework');
});
it('limits an exact operator carve-out to that path while requiring /** for subtrees', () => {
const exact: FrameworkManifest = {
framework: ['tools/**'],
operator: ['tools/git'],
};
expect(resolveOwnership(exact, 'tools/git')).toBe('operator');
expect(resolveOwnership(exact, 'tools/git/guard.sh')).toBe('framework');
const subtree: FrameworkManifest = {
framework: ['tools/**'],
operator: ['tools/git/**'],
};
expect(resolveOwnership(subtree, 'tools/git/guard.sh')).toBe('operator');
});
it('framework-declared paths resolve to framework', () => {
expect(resolveOwnership(m, 'guides/E2E-DELIVERY.md')).toBe('framework');
expect(resolveOwnership(m, 'CONSTITUTION.md')).toBe('framework');
+14 -1
View File
@@ -154,12 +154,25 @@ export function matchesAny(globs: readonly string[], relPath: string): boolean {
return globs.some((g) => matchGlob(g, relPath));
}
/**
* Operator entries without wildcards are exact file carve-outs. Treating them
* as directory prefixes would let one bare entry hide an entire framework
* subtree from reconciliation and drift detection. Operator subtree ownership
* remains explicit through `dir/**`.
*/
function matchesOperatorGlob(glob: string, relPath: string): boolean {
const pattern = normalizeRel(glob);
if (pattern === '') return false;
if (!pattern.includes('*')) return normalizeRel(relPath) === pattern;
return matchGlob(pattern, relPath);
}
/**
* Resolve ownership of a mosaic-home-relative path (deny-wins / fail-safe):
* operator globs win, then framework globs, else operator by default.
*/
export function resolveOwnership(manifest: FrameworkManifest, relPath: string): Ownership {
if (matchesAny(manifest.operator, relPath)) return 'operator';
if (manifest.operator.some((glob) => matchesOperatorGlob(glob, relPath))) return 'operator';
if (matchesAny(manifest.framework, relPath)) return 'framework';
return 'operator';
}