From 3b1a0631ddc2056ec3eee5eef56ca300d600862c Mon Sep 17 00:00:00 2001
From: CxAI Agent <agent@cxai-studio.com>
Date: Sat, 16 May 2026 14:25:40 -0500
Subject: [PATCH] fix: rename CxAWS/CxGit umbrella targets to _Re to
 disambiguate

CxLLM-Drive already defines targets named CxAWS and CxGit; SPM requires
unique target names across the whole package graph. Suffix the umbrella
wrapper targets with _Re; products keep the clean CxAWS / CxGit names.
---
 Package.swift                                     | 15 ++++++++-------
 .../CxAWS.swift => CxAWS_Re/CxAWS_Re.swift}       |  0
 .../CxGit.swift => CxGit_Re/CxGit_Re.swift}       |  0
 3 files changed, 8 insertions(+), 7 deletions(-)
 rename Sources/{CxAWS/CxAWS.swift => CxAWS_Re/CxAWS_Re.swift} (100%)
 rename Sources/{CxGit/CxGit.swift => CxGit_Re/CxGit_Re.swift} (100%)

diff --git a/Package.swift b/Package.swift
index 69501a8..a69f70c 100644
--- a/Package.swift
+++ b/Package.swift
@@ -17,8 +17,8 @@ let package = Package(
     platforms: [.macOS(.v13), .iOS(.v17)],
     products: [
         .library(name: "CxCode",        targets: ["CxCode"]),
-        .library(name: "CxAWS",         targets: ["CxAWS"]),
-        .library(name: "CxGit",         targets: ["CxGit"]),
+        .library(name: "CxAWS",         targets: ["CxAWS_Re"]),
+        .library(name: "CxGit",         targets: ["CxGit_Re"]),
         .library(name: "CxAgent",       targets: ["CxAgent"]),
         .library(name: "CxMCP",         targets: ["CxMCP"]),
         .library(name: "CxModels",      targets: ["CxModels"]),
@@ -46,13 +46,14 @@ let package = Package(
             .product(name: "CxPlugin", package: "CxLLM-PLG"),
         ], path: "Sources/CxCode"),
 
-        // CxAWS, CxGit, CxDrive umbrella products all live in CxLLM-Drive
-        .target(name: "CxAWS", dependencies: [
+        // CxAWS / CxGit umbrella products live in CxLLM-Drive; use _Re suffix
+        // on the umbrella target to avoid colliding with Drive's target names.
+        .target(name: "CxAWS_Re", dependencies: [
             .product(name: "CxAWS", package: "CxLLM-Drive"),
-        ], path: "Sources/CxAWS"),
-        .target(name: "CxGit", dependencies: [
+        ], path: "Sources/CxAWS_Re"),
+        .target(name: "CxGit_Re", dependencies: [
             .product(name: "CxGit", package: "CxLLM-Drive"),
-        ], path: "Sources/CxGit"),
+        ], path: "Sources/CxGit_Re"),
 
         // CxAgent / CxMCP / CxModels / CxChat are app-layer modules in CxLLM-IOS
         // today. Phase 3 will move them into their own sibling packages; for now
diff --git a/Sources/CxAWS/CxAWS.swift b/Sources/CxAWS_Re/CxAWS_Re.swift
similarity index 100%
rename from Sources/CxAWS/CxAWS.swift
rename to Sources/CxAWS_Re/CxAWS_Re.swift
diff --git a/Sources/CxGit/CxGit.swift b/Sources/CxGit_Re/CxGit_Re.swift
similarity index 100%
rename from Sources/CxGit/CxGit.swift
rename to Sources/CxGit_Re/CxGit_Re.swift