Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Sources/mcs/Install/Configurator.swift
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,10 @@ struct Configurator {
removedFiles.insert(path)
}
remaining.files.removeAll { removedFiles.contains($0) }
// Purge fileHashes: remove hashes for deleted files and any orphaned entries
// (entries whose key has no corresponding files entry, e.g. from past state inconsistencies)
let trackedFiles = Set(remaining.files)
remaining.fileHashes = remaining.fileHashes.filter { trackedFiles.contains($0.key) }

// Remove auto-derived hook commands and contributed settings keys
let hasHooksToRemove = !artifacts.hookCommands.isEmpty
Expand Down
28 changes: 28 additions & 0 deletions Tests/MCSTests/GlobalConfiguratorTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -899,6 +899,34 @@ struct GlobalUnconfigurePackTests {
#expect(state.configuredPacks.contains("pack-b"))
#expect(!state.configuredPacks.contains("pack-a"))
}

@Test("unconfigurePack clears orphaned fileHashes and fully removes pack from state")
func unconfigureClearsOrphanedFileHashes() throws {
let tmpDir = try makeGlobalTmpDir()
defer { try? FileManager.default.removeItem(at: tmpDir) }

// Seed state with a pack that has orphaned fileHashes (entries without
// corresponding files entries) — reproduces the bug where unconfigure
// could never clear such packs because PackArtifactRecord.isEmpty
// checks fileHashes.isEmpty.
let env = Environment(home: tmpDir)
var state = try ProjectState(stateFile: env.globalStateFile)
state.recordPack("orphan-pack")
var record = PackArtifactRecord()
record.fileHashes = [
"hooks/orphan-pack/hook.sh": "abc123",
"skills/orphan-skill/SKILL.md": "def456",
]
state.setArtifacts(record, for: "orphan-pack")
try state.save()

let configurator = makeGlobalConfigurator(home: tmpDir)
try configurator.configure(packs: [], confirmRemovals: false)

let after = try ProjectState(stateFile: env.globalStateFile)
#expect(!after.configuredPacks.contains("orphan-pack"))
#expect(after.artifacts(for: "orphan-pack") == nil)
}
}

// MARK: - Global Dry Run Tests
Expand Down
Loading