Skip to content

[#237] Move file path derivation into SyncStrategy #245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bguidolim merged 2 commits into from
Mar 6, 2026
+29 −27
Merged

[#237] Move file path derivation into SyncStrategy #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5575872
Move file path derivation for copyPackFile into SyncStrategy
bguidolim Mar 6, 2026
fdaa924
Use existing destinationURL helper in GlobalSyncStrategy.fileRelative…
bguidolim Mar 6, 2026
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
22 changes: 1 addition & 21 deletions Sources/mcs/Install/Configurator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ struct Configurator {
}

case let .copyPackFile(_, destination, fileType):
let relativePath = deriveFileRelativePath(
let relativePath = strategy.fileRelativePath(
destination: destination, fileType: fileType
)
if removeFileArtifactItem(relativePath: relativePath) {
Expand Down Expand Up @@ -519,26 +519,6 @@ struct Configurator {
}
}

/// Derive the relative file path that `installArtifacts` would have recorded for a `copyPackFile` component.
private func deriveFileRelativePath(destination: String, fileType: CopyFileType) -> String {
if scope.isGlobalScope {
let baseDir = fileType.baseDirectory(in: environment)
let destURL = baseDir.appendingPathComponent(destination)
return PathContainment.relativePath(
of: destURL.path,
within: environment.claudeDirectory.path
)
} else {
let projectPath = scope.targetPath.deletingLastPathComponent()
let baseDir = fileType.projectBaseDirectory(projectPath: projectPath)
let destURL = baseDir.appendingPathComponent(destination)
return PathContainment.relativePath(
of: destURL.path,
within: projectPath.path
)
}
}

/// Resolve all template/placeholder values upfront (single pass).
///
/// Resolves built-in values (e.g. REPO_NAME), shared cross-pack prompts,
Expand Down
17 changes: 11 additions & 6 deletions Sources/mcs/Install/GlobalSyncStrategy.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,7 @@ struct GlobalSyncStrategy: SyncStrategy {
resolvedValues: resolvedValues
)
if result.success {
let baseDir = fileType.baseDirectory(in: environment)
let destURL = baseDir.appendingPathComponent(destination)
let relativePath = PathContainment.relativePath(
of: destURL.path,
within: environment.claudeDirectory.path
)
let relativePath = fileRelativePath(destination: destination, fileType: fileType)
artifacts.files.append(relativePath)
artifacts.fileHashes.merge(result.hashes) { _, new in new }
if component.type == .hookFile,
Expand Down Expand Up @@ -301,6 +296,16 @@ struct GlobalSyncStrategy: SyncStrategy {
return Set(allContributions.map(\.sectionIdentifier))
}

// MARK: - File Path Derivation

func fileRelativePath(destination: String, fileType: CopyFileType) -> String {
let destURL = fileType.destinationURL(in: environment, destination: destination)
return PathContainment.relativePath(
of: destURL.path,
within: environment.claudeDirectory.path
)
}

// MARK: - File Removal

func removeFileArtifact(relativePath: String, output: CLIOutput) -> Bool {
Expand Down
11 changes: 11 additions & 0 deletions Sources/mcs/Install/ProjectSyncStrategy.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,17 @@ struct ProjectSyncStrategy: SyncStrategy {
return Set(allContributions.map(\.sectionIdentifier))
}

// MARK: - File Path Derivation

func fileRelativePath(destination: String, fileType: CopyFileType) -> String {
let baseDir = fileType.projectBaseDirectory(projectPath: projectPath)
let destURL = baseDir.appendingPathComponent(destination)
return PathContainment.relativePath(
of: destURL.path,
within: projectPath.path
)
}

// MARK: - File Removal

func removeFileArtifact(relativePath: String, output: CLIOutput) -> Bool {
Expand Down
6 changes: 6 additions & 0 deletions Sources/mcs/Install/SyncStrategy.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,12 @@ protocol SyncStrategy {
output: CLIOutput
) throws -> Set<String>?

/// Derive the relative file path that artifact tracking records for a `copyPackFile` component.
///
/// Global scope computes relative to `~/.claude/`.
/// Project scope computes relative to the project root.
func fileRelativePath(destination: String, fileType: CopyFileType) -> String

/// Remove a file artifact during pack unconfiguration.
///
/// Project scope uses `ComponentExecutor.removeProjectFile`.
Expand Down
Loading