Split sweetpad-lib into a lib/core/cli workspace + vscode native addon

Author: hyzyla

.github/workflows/catalyst-oracle.yaml

@@ -5,10 +5,18 @@ on:
     branches: [main]
     paths:
       - "sweetpad-lib/**"
+      - "sweetpad-core/**"
+      - "sweetpad-cli/**"
+      - "Cargo.toml"
+      - "Cargo.lock"
       - ".github/workflows/catalyst-oracle.yaml"
   pull_request:
     paths:
       - "sweetpad-lib/**"
+      - "sweetpad-core/**"
+      - "sweetpad-cli/**"
+      - "Cargo.toml"
+      - "Cargo.lock"
       - ".github/workflows/catalyst-oracle.yaml"
   workflow_dispatch:
 
@@ -37,7 +45,7 @@ jobs:
       - name: Cache cargo build
         uses: Swatinem/rust-cache@v2
         with:
-          workspaces: sweetpad-lib
+          workspaces: .
 
       - name: Tooling versions
         run: |
@@ -56,5 +64,5 @@ jobs:
 
       - name: Catalyst misdetection oracle
         env:
-          SWEETPAD_BIN: ${{ github.workspace }}/sweetpad-lib/target/debug/sweetpad
+          SWEETPAD_BIN: ${{ github.workspace }}/target/debug/sweetpad
         run: bash ci/catalyst-oracle.sh

.github/workflows/ci.yaml

@@ -23,8 +23,7 @@ jobs:
         with:
           node-version: 24
       - name: Install Rust toolchain
-        working-directory: sweetpad-lib
-        # Installs the channel + Apple targets pinned in sweetpad-lib/rust-toolchain.toml
+        # Installs the channel + Apple targets pinned in rust-toolchain.toml
         run: rustup show
       - name: Install Dependencies
         run: npm ci

.github/workflows/cli-release.yaml

@@ -22,8 +22,7 @@ jobs:
         with:
           node-version: 24
       - name: Install Rust toolchain
-        working-directory: sweetpad-lib
-        # Installs the channel + Apple targets pinned in sweetpad-lib/rust-toolchain.toml
+        # Installs the channel + Apple targets pinned in rust-toolchain.toml
         run: rustup show
 
       - name: Resolve version
@@ -34,16 +33,24 @@ jobs:
           if [[ "${GITHUB_REF:-}" == refs/tags/cli-v* ]]; then
             VERSION="${GITHUB_REF_NAME#cli-v}"
           else
-            VERSION="$(grep -m1 '^version' sweetpad-lib/Cargo.toml | cut -d'"' -f2)-dryrun"
+            VERSION="$(grep -m1 '^version' Cargo.toml | cut -d'"' -f2)-dryrun"
           fi
           echo "VERSION=$VERSION" >> "$GITHUB_ENV"
           echo "TARBALL=sweetpad-cli-$VERSION-macos-universal.tar.gz" >> "$GITHUB_ENV"
           echo "Building sweetpad CLI $VERSION"
 
       - name: Build universal CLI
-        # Builds the bundled injection client + the universal sweetpad binary into
-        # sweetpad-lib/sweetpad-cli.
-        run: npm run build:cli:universal -w @sweetpad/lib
+        # Build the bundled injection client, then the universal `sweetpad` binary.
+        run: |
+          set -euo pipefail
+          bash sweetpad-cli/vendor/injection-client/build.sh
+          cargo build --release --bin sweetpad --target aarch64-apple-darwin
+          cargo build --release --bin sweetpad --target x86_64-apple-darwin
+          mkdir -p dist
+          lipo -create -output dist/sweetpad \
+            target/aarch64-apple-darwin/release/sweetpad \
+            target/x86_64-apple-darwin/release/sweetpad
+          chmod +x dist/sweetpad
 
       - name: Import Developer ID certificate
         env:
@@ -70,8 +77,8 @@ jobs:
           set -euo pipefail
           IDENTITY="$(security find-identity -v -p codesigning "$KEYCHAIN" | awk -F'"' '/Developer ID Application/ { print $2; exit }')"
           test -n "$IDENTITY"
-          codesign --force --options runtime --timestamp --sign "$IDENTITY" sweetpad-lib/sweetpad-cli
-          codesign --verify --strict --verbose=2 sweetpad-lib/sweetpad-cli
+          codesign --force --options runtime --timestamp --sign "$IDENTITY" dist/sweetpad
+          codesign --verify --strict --verbose=2 dist/sweetpad
 
       - name: Notarize the CLI
         env:
@@ -82,16 +89,13 @@ jobs:
           set -euo pipefail
           KEY_PATH="$RUNNER_TEMP/notary_key.p8"
           echo "$MACOS_NOTARY_KEY_P8" | base64 --decode > "$KEY_PATH"
-          /usr/bin/zip -j "$RUNNER_TEMP/notarize.zip" sweetpad-lib/sweetpad-cli
+          /usr/bin/zip -j "$RUNNER_TEMP/notarize.zip" dist/sweetpad
           xcrun notarytool submit "$RUNNER_TEMP/notarize.zip" --key "$KEY_PATH" --key-id "$MACOS_NOTARY_KEY_ID" --issuer "$MACOS_NOTARY_ISSUER_ID" --wait
           rm -f "$KEY_PATH"
 
       - name: Package tarball
         run: |
           set -euo pipefail
-          mkdir -p dist
-          cp sweetpad-lib/sweetpad-cli dist/sweetpad
-          chmod +x dist/sweetpad
           tar -C dist -czf "$TARBALL" sweetpad
           echo "SHA256=$(shasum -a 256 "$TARBALL" | cut -d' ' -f1)" >> "$GITHUB_ENV"
           shasum -a 256 "$TARBALL"

.github/workflows/cli-smoke.yaml

@@ -5,10 +5,18 @@ on:
     branches: [main]
     paths:
       - "sweetpad-lib/**"
+      - "sweetpad-core/**"
+      - "sweetpad-cli/**"
+      - "Cargo.toml"
+      - "Cargo.lock"
       - ".github/workflows/cli-smoke.yaml"
   pull_request:
     paths:
       - "sweetpad-lib/**"
+      - "sweetpad-core/**"
+      - "sweetpad-cli/**"
+      - "Cargo.toml"
+      - "Cargo.lock"
       - ".github/workflows/cli-smoke.yaml"
   workflow_dispatch:
 
@@ -33,7 +41,7 @@ jobs:
       - name: Cache cargo build
         uses: Swatinem/rust-cache@v2
         with:
-          workspaces: sweetpad-lib
+          workspaces: .
 
       - name: Tooling versions
         run: |
@@ -52,6 +60,6 @@ jobs:
 
       - name: End-to-end CLI coverage (app + Swift package)
         env:
-          SWEETPAD_BIN: ${{ github.workspace }}/sweetpad-lib/target/debug/sweetpad
+          SWEETPAD_BIN: ${{ github.workspace }}/target/debug/sweetpad
         # Steps inherit `working-directory: sweetpad-lib`, so the path is relative to it.
         run: bash ci/smoke.sh

.github/workflows/sweetpad-lib.yaml

@@ -5,46 +5,53 @@ on:
     branches: [main]
     paths:
       - "sweetpad-lib/**"
+      - "sweetpad-core/**"
+      - "sweetpad-cli/**"
+      - "sweetpad-vscode/native/**"
+      - "Cargo.toml"
+      - "Cargo.lock"
+      - "rust-toolchain.toml"
       - ".github/workflows/sweetpad-lib.yaml"
   pull_request:
     paths:
       - "sweetpad-lib/**"
+      - "sweetpad-core/**"
+      - "sweetpad-cli/**"
+      - "sweetpad-vscode/native/**"
+      - "Cargo.toml"
+      - "Cargo.lock"
+      - "rust-toolchain.toml"
       - ".github/workflows/sweetpad-lib.yaml"
 
-# The fast nets resolve against the committed `xcspec-cache/`, so they need no
-# Xcode and form the always-on regression gate — including the BSP arg-invariant
-# linter (the SDKROOT=auto class) and the compiler-args/settings oracles.
+# The fast nets resolve against the committed `sweetpad-lib/xcspec-cache/`, so
+# they need no Xcode and form the always-on regression gate — the BSP
+# arg-invariant linter, the compiler-args/settings oracles, and the parsers.
 #
 # The heavy tiers are NOT run here: they need a real Xcode 26.5 plus the
 # gitignored OSS corpus, so they're run locally / nightly off-CI —
-#   BSP_CORPUS=1            cargo test --test bsp_corpus_completion   (e2e clean-rate)
-#   BSP_LIVE_DIFF=1         cargo test --test showbuildsettings_live_diff
-#   python3 scripts/21_mutation_audit.py [--e2e]                     (coverage audit)
+#   BSP_CORPUS=1     cargo test -p sweetpad-core --test bsp_corpus_completion
+#   BSP_LIVE_DIFF=1  cargo test -p sweetpad-core --test showbuildsettings_live_diff
+#   python3 sweetpad-lib/scripts/21_mutation_audit.py [--e2e]
 
 jobs:
   check:
     name: fmt · clippy · test
     runs-on: macos-latest
-    defaults:
-      run:
-        working-directory: sweetpad-lib
     steps:
       - uses: actions/checkout@v7
 
       - name: Install Rust toolchain
-        # Installs the channel + components pinned in sweetpad-lib/rust-toolchain.toml.
+        # Installs the channel + components pinned in rust-toolchain.toml.
         run: rustup show
 
       - name: Cache cargo build
         uses: Swatinem/rust-cache@v2
-        with:
-          workspaces: sweetpad-lib
 
       - name: Format
-        run: cargo fmt --check
+        run: cargo fmt --all --check
 
       - name: Clippy
-        run: cargo clippy -- -D warnings
+        run: cargo clippy --workspace --all-targets -- -D warnings
 
       - name: Test
-        run: cargo test
+        run: cargo test --workspace

.github/workflows/xcode-tests.yaml

@@ -13,10 +13,18 @@ on:
     branches: [main, claude/cli-hot-reloading-c52yf2]
     paths:
       - "sweetpad-lib/**"
+      - "sweetpad-core/**"
+      - "sweetpad-cli/**"
+      - "Cargo.toml"
+      - "Cargo.lock"
       - ".github/workflows/xcode-tests.yaml"
   pull_request:
     paths:
       - "sweetpad-lib/**"
+      - "sweetpad-core/**"
+      - "sweetpad-cli/**"
+      - "Cargo.toml"
+      - "Cargo.lock"
       - ".github/workflows/xcode-tests.yaml"
   workflow_dispatch:
   schedule:
@@ -60,20 +68,20 @@ jobs:
       - name: Cache cargo build
         uses: Swatinem/rust-cache@v2
         with:
-          workspaces: sweetpad-lib
+          workspaces: .
           shared-key: xcode-tests
       - name: Build the sweetpad CLI
         run: cargo build --bin sweetpad
       - name: Unit tests
-        run: cargo test
+        run: cargo test --workspace
       - name: Install XcodeGen
         run: brew install xcodegen
       - name: Generate the fixture project
         working-directory: sweetpad-lib/ci/fixture-app
         run: xcodegen generate
       - name: End-to-end CLI coverage
         env:
-          SWEETPAD_BIN: ${{ github.workspace }}/sweetpad-lib/target/debug/sweetpad
+          SWEETPAD_BIN: ${{ github.workspace }}/target/debug/sweetpad
         run: bash ci/smoke.sh
 
   # Build the injection client from source against the active Xcode (no
@@ -111,13 +119,13 @@ jobs:
       - name: Cache cargo build
         uses: Swatinem/rust-cache@v2
         with:
-          workspaces: sweetpad-lib
+          workspaces: .
           shared-key: xcode-tests
       # Build the injection client (XCTest-free, from the pinned InjectionNext SPM
       # product — vendor/injection-client) *before* cargo build, so build.rs embeds
       # it into the CLI. This is the same step the release scripts run.
       - name: Build the bundled injection client
-        run: bash vendor/injection-client/build.sh
+        run: bash ../sweetpad-cli/vendor/injection-client/build.sh
       - name: Build the sweetpad CLI
         run: cargo build --bin sweetpad
       - name: Install XcodeGen
@@ -129,5 +137,5 @@ jobs:
       # build time, so this exercises the real shipping path on this Xcode.
       - name: Hot-reload / injection e2e (embedded client)
         env:
-          SWEETPAD_BIN: ${{ github.workspace }}/sweetpad-lib/target/debug/sweetpad
+          SWEETPAD_BIN: ${{ github.workspace }}/target/debug/sweetpad
         run: bash ci/hot-reload-e2e.sh

.gitignore

@@ -4,6 +4,14 @@ node_modules
 .vscode-test/
 *.vsix
 
+# Rust workspace build output
+/target
+
+# N-API addon build outputs (regenerated by build:native:*)
+sweetpad-vscode/native/*.node
+sweetpad-vscode/native/index.js
+sweetpad-vscode/native/index.d.ts
+
 
 # Ensure .vscode is not ignored in this project
 !sweetpad-vscode/.vscode/

sweetpad-lib/Cargo.lock Cargo.locksweetpad-lib/Cargo.lock renamed to Cargo.lock

@@ -0,0 +1,47 @@
+[workspace]
+resolver = "2"
+members = [
+    "sweetpad-lib",
+    "sweetpad-core",
+    "sweetpad-cli",
+    "sweetpad-vscode/native",
+]
+
+[workspace.package]
+version = "0.1.0"
+edition = "2024"
+rust-version = "1.94"
+license = "MIT OR Apache-2.0"
+authors = ["Yevhenii Hyzyla <hyzyla@gmail.com>"]
+
+[workspace.dependencies]
+sweetpad-lib = { path = "sweetpad-lib" }
+sweetpad-core = { path = "sweetpad-core" }
+# JSON is a well-known standard format, not worth reinventing; hand-rolled
+# parsing is reserved for Apple's project-domain formats (DOCS.md §3.1).
+serde_json = "1"
+# Unicode NFD for the DerivedData path hash (xcode_hash); UAX #15 with a
+# de-facto crate — not worth hand-rolling the decomposition tables.
+unicode-normalization = "0.1"
+# CLI-only: clap derives the resource-first command tree, help, completions;
+# serde+toml read/write the XDG config & state files; dialoguer is the TTY
+# picker; libc flips raw-input flags for the interactive rebuild session.
+clap = { version = "4", features = ["derive", "env"] }
+clap_complete = "4"
+dialoguer = { version = "0.11", default-features = false, features = ["fuzzy-select"] }
+serde = { version = "1", features = ["derive"] }
+toml = "0.8"
+libc = "0.2"
+# N-API addon only (sweetpad-vscode/native).
+napi = { version = "3", default-features = false, features = ["napi8"] }
+napi-derive = "3"
+napi-build = "2"
+
+[workspace.lints.clippy]
+pedantic = { level = "warn", priority = -1 }
+missing_errors_doc = "allow"
+missing_panics_doc = "allow"
+module_name_repetitions = "allow"
+# Apple identifiers (ProductType, OpenStep, BuildSystem, etc.) appear in doc
+# comments in their natural casing; backtick-wrapping all of them is noise.
+doc_markdown = "allow"