Unify build tool plugins with prebuilt artifact bundle and Linux support by dfed · Pull Request #231 · dfed/SafeDI

dfed · 2026-04-09T07:41:34Z

Summary

Replace dual-plugin architecture (SafeDIGenerator + SafeDIPrebuiltGenerator) with a single SafeDIGenerator plugin
Add scan and generate subcommands to SafeDITool (generate is the default for backward compatibility)
SPM plugin shells out to SafeDITool scan via Process during createBuildCommands, then returns a .buildCommand for code generation
Xcode plugin uses lightweight in-process PluginScanner to discover output files, then returns a .buildCommand with --output-directory for combined scan+generate at build time
Add Package Traits: prebuilt (default, uses artifact bundle) and sourceBuild (compiles from source), with mutual exclusivity guard
Delete SafeDIScannerCore, SafeDIScanner, SafeDIPrebuiltGenerator, InstallSafeDITool, ExamplePrebuiltPackageIntegration
All example projects use sourceBuild trait with comments explaining it's for local dev
Update documentation (README, Manual, CLAUDE.md) for new architecture
Remove version duplication: currentVersion is "0.0.0-development" in source, stamped at build time by publish workflow
Publish workflow: per-arch macOS binaries (no lipo), stripped, -Osize, codesigned+notarized, Linux with --static-swift-stdlib
Publish workflow: workflow_dispatch with version/prerelease/dry-run inputs, artifact bundle always uploaded as workflow artifact

Motivation

The in-process SafeDIScanner runs in debug mode inside the plugin process (~15s) because SPM provides no way to build plugin code in release mode. Shelling out to a prebuilt SafeDITool binary eliminates this bottleneck entirely.

Test plan

All 742 tests pass (swift test --traits sourceBuild)
Zero uncovered lines in new code
swift build --traits sourceBuild succeeds
swift build (default prebuilt trait) succeeds when artifact bundle exists
swift build --traits sourceBuild,prebuilt errors with mutual exclusivity message
All example projects build locally (SPM + both Xcode projects)
./CLI/lint.sh passes
CI passes (blocked on artifact bundle publish with working codesigning)

🤖 Generated with Claude Code

…ndle support Replace the dual-plugin architecture (SafeDIGenerator + SafeDIPrebuiltGenerator) with a single SafeDIGenerator plugin that shells out to SafeDITool for scanning and generation. - Add `scan` and `generate` subcommands to SafeDITool (`generate` is default for backward compatibility) - Plugin calls `SafeDITool scan` via Process during createBuildCommands to build the manifest, then returns a `.buildCommand` for `SafeDITool generate` - Add `usePrebuiltBinary` flag in Package.swift to switch between artifact bundle (prebuilt) and source-built SafeDITool - Add artifact bundle binary target (placeholder checksum, updated by publish workflow) - Move output file naming and relative path utilities from SafeDIScannerCore to SafeDICore - Add `additionalInputFiles` field to SafeDIToolManifest for build input tracking - Delete SafeDIScannerCore, SafeDIScanner, SafeDIPrebuiltGenerator, InstallSafeDITool - Update publish workflow: workflow_dispatch with version/branch/dry-run inputs, Linux builds, artifact bundle assembly, auto-update Package.swift - Update documentation, examples, and CI Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

codecov · 2026-04-09T07:51:12Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 100.00%. Comparing base (4192b93) to head (43baa11).
⚠️ Report is 1 commits behind head on main.

Additional details and impacted files

@@            Coverage Diff             @@
##              main      #231    +/-   ##
==========================================
  Coverage   100.00%   100.00%            
==========================================
  Files           39        41     +2     
  Lines         6122      5752   -370     
==========================================
- Hits          6122      5752   -370

Files with missing lines	Coverage Δ
Sources/SafeDICore/Models/SafeDIToolManifest.swift	`100.00% <100.00%> (ø)`
...ources/SafeDICore/Utilities/OutputFileNaming.swift	`100.00% <100.00%> (ø)`
Sources/SafeDICore/Utilities/RelativePath.swift	`100.00% <100.00%> (ø)`
Sources/SafeDITool/GenerateCommand.swift	`100.00% <100.00%> (ø)`
Sources/SafeDITool/SafeDITool.swift	`100.00% <100.00%> (ø)`
Sources/SafeDITool/ScanCommand.swift	`100.00% <100.00%> (ø)`
Sources/SafeDITool/SwiftFileParsing.swift	`100.00% <100.00%> (ø)`

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

… Xcode - Bump swift-argument-parser minimum from 1.2.0 to 1.4.0 (1.3.1+ has CommandConfiguration: Sendable, needed for Swift 6 concurrency) - Delete stale Package.resolved in example projects - Use .prebuildCommand for Xcode plugin context since context.tool(named:) returns paths with unresolved build variables (${BUILD_DIR}) that can't be used with Process during createBuildCommands - Add --output-directory and --mock-scoped-files to Generate command so it can self-scan when invoked without --swift-manifest Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

@option

- Extract scan logic into free `performScan(...)` function callable by both `Scan.run()` and `Generate.run()` — avoids ArgumentParser's uninitialized property issue when creating ParsableCommand structs directly - Update all test code to use `Generate.parse([...])` instead of `Generate()` which leaves @option properties uninitialized - Fix test function signatures to propagate throws from parse calls Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Cover the duplicate-basename disambiguation logic in OutputFileNaming.swift by testing through the full scan pipeline with files in subdirectories. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Xcode's plugin context returns tool paths with unresolved build variables (${BUILD_DIR}/${CONFIGURATION}) that can't be used with Process during createBuildCommands. Prebuild commands also don't work with source-built executables in Xcode. Solution: add a lightweight PluginScanner that determines output files in-process (text-based, no SwiftSyntax), then return a .buildCommand with --output-directory so SafeDITool does scan+generate at build time. Verified all example projects build: - Example Package Integration (SPM) - ExampleProjectIntegration (Xcode) - ExampleMultiProjectIntegration (Xcode) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

@INSTANTIABLE

…ate, regex matching - Scan additional directory files for roots (P1: roots from additionalDirectoriesToInclude were missing from declared outputs) - Extract and declare outputs for additionalMocksToGenerate from #SafeDIConfiguration (P1: cross-module mock outputs were missing) - Use regex patterns instead of raw substring matching to reduce false positives from comments/strings (P2: @INSTANTIABLE in a comment could declare phantom outputs) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

… branch) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Replace `usePrebuiltBinary` boolean with proper Package Traits: - `prebuilt` (default): uses artifact bundle binary target - `sourceBuild`: compiles SafeDITool from source The binaryTarget now always exists in the targets array, pointing to the alpha-10 release artifact bundle. This proves the trait plumbing works (SPM resolves the artifact, plugin uses it). The old binary doesn't have the new `scan` subcommand, so Xcode projects will get argument errors until a proper release with the new SafeDITool is published. Example Package Integration uses `traits: ["sourceBuild"]` since it's a local path dependency that needs the source-built tool. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>