Merge monorepo into spotlightjs spotlight

.cursor/rules/general-guidelines.mdc

@@ -352,7 +352,6 @@ pnpm clean            # Clean all dist folders
 {
   "dev": "vite build --watch",
   "build": "vite build && tsc",
-  "clean": "rimraf dist",
   "test": "vitest"
 }
 ```

.cursorrules

@@ -36,9 +36,9 @@ This project uses **pnpm** exclusively for package management.
 pnpm install
 
 # Run development servers
-pnpm dev                    # overlay + sidecar
-pnpm dev:overlay           # overlay only
-pnpm dev:sidecar           # sidecar only
+pnpm dev                    # spotlight UI + sidecar
+pnpm dev:ui                # spotlight UI only
+pnpm dev:sidecar           # spotlight sidecar only
 pnpm dev:website           # website only
 pnpm dev:electron          # electron app
 
@@ -47,7 +47,7 @@ pnpm build
 
 # Run tests
 pnpm test                  # all package tests
-pnpm test:e2e             # e2e tests
+pnpm test:e2e             # e2e tests (electron)
 
 # Linting and formatting
 pnpm lint                  # check code
@@ -63,10 +63,11 @@ pnpm clean:all            # clean everything and reinstall
 ## Workspace Structure
 
 This is a monorepo using pnpm workspaces with the following packages:
-- `@spotlightjs/electron` - Electron application
-- `@spotlightjs/overlay` - Overlay UI components
-- `@spotlightjs/sidecar` - Core sidecar functionality
-- `@spotlightjs/spotlight` - Main spotlight package
+- `@spotlightjs/spotlight` - Main spotlight package containing:
+  - `src/ui/` - UI components
+  - `src/sidecar/` - Core sidecar functionality
+  - `src/electron/` - Electron application code
+  - CLI binary and exports for all three components
 - `@spotlightjs/tsconfig` - Shared TypeScript configuration
 - `@spotlightjs/website` - Documentation website
 

.github/workflows/build.yml

@@ -18,6 +18,7 @@ env:
   CACHED_BUILD_PATHS: |
     ${{ github.workspace }}/packages/*/dist
     ${{ github.workspace }}/packages/*/dist-bin
+    ${{ github.workspace }}/packages/*/dist-electron
 
 jobs:
   build:
@@ -112,7 +113,7 @@ jobs:
           if-no-files-found: error
           path: |
             packages/spotlight/dist/spotlight.cjs
-            packages/spotlight/dist/overlay/
+            packages/spotlight/dist/ui/
 
       - name: Store standalone spotlight binaries
         uses: actions/upload-artifact@v4
@@ -121,6 +122,13 @@ jobs:
           if-no-files-found: error
           path: packages/spotlight/dist-bin/spotlight-*
 
+      - name: Store Electron build
+        uses: actions/upload-artifact@v4
+        with:
+          name: electron-build
+          if-no-files-found: error
+          path: packages/spotlight/dist-electron/
+
       - name: Update build cache
         uses: actions/cache/save@v4
         with:
@@ -132,7 +140,7 @@ jobs:
       # which depends on the build job, hence why we do this here
       - name: Playwright Version
         id: playwright-version
-        working-directory: packages/electron
+        working-directory: packages/spotlight
         run: |
           # Playwright outputs something like `Version 1.54.2` so we cut the "crap" at the beginning
           echo "version=$(pnpm exec playwright --version | cut -c 9-)" >> $GITHUB_OUTPUT
@@ -221,6 +229,12 @@ jobs:
       - name: Setup dependencies
         run: pnpm install
 
+      - name: Download Electron build
+        uses: actions/download-artifact@v4
+        with:
+          name: electron-build
+          path: packages/spotlight/dist-electron/
+
       - name: Cache turbo build setup
         uses: actions/cache@v4
         with:

.gitignore

@@ -11,6 +11,7 @@ node_modules
 out
 dist
 dist-bin
+dist-electron
 node
 dist-ssr
 *.local

package.json

@@ -2,11 +2,9 @@
   "private": true,
   "type": "module",
   "scripts": {
-    "dev": "turbo dev --filter=@spotlightjs/overlay --filter=@spotlightjs/sidecar",
-    "dev:overlay": "turbo dev --filter=@spotlightjs/overlay",
-    "dev:sidecar": "pnpm run --filter=@spotlightjs/sidecar start",
+    "dev": "turbo dev --filter=@spotlightjs/spotlight",
     "dev:website": "turbo dev --filter=@spotlightjs/website",
-    "dev:electron": "turbo dev --filter=@spotlightjs/electron",
+    "dev:electron": "pnpm run --filter=@spotlightjs/spotlight dev:electron",
     "build": "turbo build",
     "preview": "turbo preview",
     "lint": "biome check .",