Merge pull request #3 from beautyfree/migration/electron-vite

Migrate from Electrobun to electron-vite

Author: beautyfree

.github/workflows/release.yml

@@ -1,10 +1,11 @@
 name: Release
 
-# Triggered by pushing a tag like v0.1.0. Builds the desktop app natively on
-# each OS (Electrobun does not cross-compile) and uploads every build straight
-# to the GitHub Release — bypassing actions/upload-artifact so the workflow
-# keeps working even when the account-wide Actions artifact storage quota is
-# full.
+# Triggered by pushing a tag like v0.2.0. Builds the Electron app natively on
+# each OS (electron-builder + node-gyp native modules don't cross-compile
+# cleanly) and uploads every artifact to the GitHub Release directly so the
+# workflow keeps working even if the account-wide Actions artifact quota is
+# full. electron-updater reads `latest-{mac,linux,win}.yml` from the same
+# release to drive auto-updates in production.
 
 on:
   push:
@@ -19,7 +20,6 @@ concurrency:
   cancel-in-progress: false
 
 jobs:
-  # 1. Create a draft release up front so every platform job can append to it.
   prepare-release:
     name: Prepare draft release
     runs-on: ubuntu-latest
@@ -34,14 +34,13 @@ jobs:
           body: |
             Desktop installers — download the one that matches your OS:
 
-            - **macOS (Apple Silicon):** `stable-macos-arm64-Skiller.dmg` (signed + notarized — drag to Applications)
-            - **Windows (x64):** `stable-win-x64-Skiller-Setup.zip` (extract and run `Skiller.exe`)
-            - **Linux (x64):** `stable-linux-x64-Skiller-Setup.tar.gz` (extract and run `bin/launcher`)
+            - **macOS (Apple Silicon):** `Skiller-<version>-macos-arm64.dmg` (signed + notarized — drag to Applications)
+            - **Windows (x64):** `Skiller-<version>-win-x64.exe` (NSIS installer)
+            - **Linux (x64):** `Skiller-<version>-linux-x86_64.AppImage` or `.deb`
 
             After the first install, Skiller checks this release on launch and
-            via **Settings → App Updates**. Updates are downloaded in the
-            background (delta patches when available) and applied on next
-            restart — no manual re-install required.
+            via **Settings → App Updates**. Updates are downloaded on demand
+            and applied on next restart — powered by `electron-updater`.
           draft: true
           prerelease: false
           generate_release_notes: true
@@ -61,38 +60,43 @@ jobs:
             script: dist:mac
           - label: windows-x64
             runner: windows-latest
-            script: build:win
+            script: dist:win
           - label: linux-x64
             runner: ubuntu-latest
-            script: build:linux
+            script: dist:linux
     steps:
       - uses: actions/checkout@v5
 
       - uses: oven-sh/setup-bun@v2
         with:
           bun-version: latest
 
-      # create-dmg produces the styled, drag-to-Applications DMG that
-      # replaces Electrobun's default.
+      # create-dmg builds the styled drag-to-Applications DMG that
+      # scripts/repack-dmg.sh wraps around electron-builder's signed .app.
       - name: Install create-dmg (macOS)
         if: runner.os == 'macOS'
         run: brew install create-dmg
 
-      # Linux deps needed by Electrobun's WebKitGTK webview + system tooling.
+      # Native module build toolchain for better-sqlite3 under Electron's ABI.
       - name: Install Linux deps
         if: runner.os == 'Linux'
         run: |
           sudo apt-get update
           sudo apt-get install -y --no-install-recommends \
-            build-essential pkg-config cmake \
-            libgtk-3-dev libwebkit2gtk-4.1-dev \
-            libayatana-appindicator3-dev librsvg2-dev
+            build-essential pkg-config python3 \
+            libxss1 libnss3 libasound2t64 \
+            fakeroot dpkg
 
       - run: bun install --frozen-lockfile
 
-      # Import the Developer ID signing cert into a temporary keychain. The
-      # macOS runner has no signing identity by default; without this,
-      # `codesign --sign "$ELECTROBUN_DEVELOPER_ID" …` fails with
+      # Rebuild native modules (better-sqlite3) against the Electron ABI
+      # bundled by electron-builder. Runs on every OS — electron-builder
+      # handles the platform-specific node-gyp invocation.
+      - name: Rebuild native modules
+        run: bunx electron-builder install-app-deps
+
+      # Import the Developer ID signing cert into a temporary keychain.
+      # Without this, electron-builder's codesign step fails with
       # "The specified item could not be found in the keychain."
       - name: Import Developer ID certificate (macOS)
         if: runner.os == 'macOS'
@@ -114,43 +118,51 @@ jobs:
             -P "$MACOS_CERT_P12_PASSWORD" \
             -A -t cert -f pkcs12 \
             -k "$KEYCHAIN_PATH"
-          # Allow codesign to use the key without a UI prompt.
           security set-key-partition-list -S apple-tool:,apple:,codesign: \
             -s -k "$MACOS_KEYCHAIN_PASSWORD" "$KEYCHAIN_PATH"
-          # Put our keychain first in the search list so codesign finds it.
           security list-keychain -d user -s "$KEYCHAIN_PATH" login.keychain
 
           rm -f "$CERT_PATH"
 
-      # Write the App Store Connect API .p8 key from a secret so notarytool can
-      # use it. Secret contents should be the raw contents of AuthKey_XXXX.p8.
+      # notarytool / @electron/notarize needs the .p8 file on disk. Secret
+      # should be the raw contents of AuthKey_XXXX.p8 (multiline).
       - name: Write notarization API key (macOS)
-        if: runner.os == 'macOS' && env.ELECTROBUN_APPLEAPIKEY_P8 != ''
+        if: runner.os == 'macOS' && env.APPLE_API_KEY_P8 != ''
         env:
-          ELECTROBUN_APPLEAPIKEY_P8: ${{ secrets.ELECTROBUN_APPLEAPIKEY_P8 }}
+          APPLE_API_KEY_P8: ${{ secrets.APPLE_API_KEY_P8 }}
         run: |
           KEY_PATH="$RUNNER_TEMP/AuthKey.p8"
-          printf '%s' "$ELECTROBUN_APPLEAPIKEY_P8" > "$KEY_PATH"
+          printf '%s' "$APPLE_API_KEY_P8" > "$KEY_PATH"
           chmod 600 "$KEY_PATH"
-          echo "ELECTROBUN_APPLEAPIKEYPATH=$KEY_PATH" >> "$GITHUB_ENV"
+          echo "APPLE_API_KEY=$KEY_PATH" >> "$GITHUB_ENV"
 
       - name: Build app
         env:
-          # macOS signing + notarization (no-op on other OSes)
-          ELECTROBUN_DEVELOPER_ID: ${{ secrets.ELECTROBUN_DEVELOPER_ID }}
-          ELECTROBUN_APPLEAPIISSUER: ${{ secrets.ELECTROBUN_APPLEAPIISSUER }}
-          ELECTROBUN_APPLEAPIKEY: ${{ secrets.ELECTROBUN_APPLEAPIKEY }}
+          # electron-builder reads GH_TOKEN for its publish step; we publish
+          # via softprops below instead but the var being set also unlocks
+          # electron-builder's release-draft verification.
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          # macOS signing + notarization (renamed from ELECTROBUN_* in Phase 5).
+          CSC_NAME: ${{ secrets.CSC_NAME }}
+          APPLE_API_KEY_ISSUER: ${{ secrets.APPLE_API_KEY_ISSUER }}
+          APPLE_API_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }}
         run: bun run ${{ matrix.script }}
 
-      # Upload every artifact directly to the draft Release. This avoids
-      # actions/upload-artifact entirely — no Actions storage quota involved.
+      # Upload every artifact (including latest-*.yml and .blockmap files —
+      # electron-updater needs them alongside the binaries).
       - name: Upload build outputs to Release
         uses: softprops/action-gh-release@v2
         with:
           tag_name: ${{ github.ref_name }}
           draft: true
-          files: artifacts/*
-          fail_on_unmatched_files: true
+          files: |
+            artifacts/*.dmg
+            artifacts/*.exe
+            artifacts/*.AppImage
+            artifacts/*.deb
+            artifacts/*.yml
+            artifacts/*.blockmap
+          fail_on_unmatched_files: false
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -161,7 +173,6 @@ jobs:
     steps:
       - uses: actions/checkout@v5
 
-      # Flip the draft to published once every platform job succeeded.
       - name: Publish release
         uses: softprops/action-gh-release@v2
         with:

.gitignore

@@ -11,7 +11,16 @@ node_modules
 dist
 dist-ssr
 build
+out
 artifacts
+
+# TypeScript project references incremental build output
+*.tsbuildinfo
+# Emitted by `tsc --build` for root config files (kept as side-effects)
+/vite.config.d.ts
+/vite.config.js
+/electron.vite.config.d.ts
+/electron.vite.config.js
 *.local
 .playwright-mcp
 
@@ -37,5 +46,3 @@ artifacts
 # OS files
 Thumbs.db
 
-# Built on macOS (bun run build:native-effects)
-src/bun/libMacWindowEffects.dylib

CLAUDE.md

@@ -1,28 +1,31 @@
 # Skiller — agent guidance
 
-Skiller is a **cross-platform desktop app** (Electrobun) for installing, syncing, and editing **AI agent skills** across many agents (Claude Code, Cursor, Copilot CLI, etc.). Bundle ID: `com.beautyfree.skiller`.
+Skiller is a **cross-platform desktop app** (Electron) for installing, syncing, and editing **AI agent skills** across many agents (Claude Code, Cursor, Copilot CLI, etc.). Bundle ID: `com.beautyfree.skiller`.
 
 ## Stack
 
 | Layer | Tech |
 | --- | --- |
-| Main / native | **Bun** + **Electrobun** (`src/bun/index.ts`) |
+| Main / native | **Electron** (`src/electron-main/index.ts`), Node 20 |
 | UI | **React 19**, **Vite 7** (root `src/mainview`), **Tailwind CSS 4**, **react-router-dom** |
-| API | **tRPC** (`@trpc/server` in Bun, `@trpc/client` + TanStack Query in the webview) |
-| Config | `electrobun.config.ts` (loads `.env` for signing vars) |
+| API | **tRPC** over HTTP on 127.0.0.1 + `ipcMain` push channel for main→renderer events |
+| Build | **electron-vite** (dev + bundling) + **electron-builder** (packaging, signing, auto-updates) |
+| Updater | **electron-updater** (GitHub Releases, `latest-*.yml` + blockmaps) |
 
 ## Repository layout
 
 | Path | Role |
 | --- | --- |
-| `src/bun/` | Electrobun main process: `BrowserWindow`, tray, updater wiring, tRPC HTTP server, skill watcher |
+| `src/electron-main/` | Electron main process: `BrowserWindow`, tray, tRPC server, macOS vibrancy, platform adapter |
+| `src/preload/` | `contextBridge` — exposes `window.api.{invoke,on,platform}` to the renderer |
+| `src/main/` | Platform-agnostic main-side code: skill watcher, tRPC router, marketplace cache, app-updater wrapper, settings, scanner |
 | `src/mainview/` | Vite app: `App.tsx`, pages, components, `index.html`, CSS tokens |
-| `src/shared/` | Types / RPC schema shared between Bun and webview (import from both sides as needed) |
-| `src/main/` | Node-agnostic skill watcher and related main-side helpers |
-| `agents/` | Bundled agent metadata (copied into app via `electrobun.config.ts` `copy`) |
+| `src/shared/` | Types / RPC schema shared between main and renderer (including `AppPlatform` interface) |
+| `agents/` | Bundled agent metadata (copied into the app via `electron-builder.yml` `extraResources`) |
 | `assets/icons/` | **Runtime icons**: `AppIcon.iconset/`, `app.icns`, `app.ico`, `app/icon-512.png` |
 | `assets/icons/Skiller.icon/` | **Source only** (Icon Composer): `scripts/build-app-icons.py` reads `Assets/Image.png` via `icon.json` |
-| `scripts/` | `build-app-icons.py`, `normalize-skiller-icon-layer.py`, `repack-dmg.sh`, native build helpers |
+| `build-resources/` | `entitlements.mac.plist` for Hardened Runtime |
+| `scripts/` | `build-app-icons.py`, `normalize-skiller-icon-layer.py`, `repack-dmg.sh`, `notarize.mjs` |
 | `docs/DEVELOPMENT.md` | Setup, HMR, signing, CI, DMG repack — **read before changing release/signing** |
 | `DESIGN.md` | UI tokens and product design notes |
 
@@ -36,21 +39,24 @@ bun install
 
 **Development**
 
-- `bun run dev` — Electrobun dev + watch (runs `build:native-effects` first on macOS).
-- `bun run dev:hmr` — Concurrent Vite (port **5180**) + `electrobun dev` for UI hot reload.
-- `bun run dev:debug` — Same as HMR path with webview DevTools (`AGENTSKILLS_DEVTOOLS=1`).
+- `bun run dev` — electron-vite dev: watches main + preload, spawns Vite on port **5180** for the renderer with HMR. Opens an Electron window loading the Vite URL.
+- `bun run dev:debug` — Same as `dev` with `AGENTSKILLS_DEVTOOLS=1` (renderer DevTools on-open).
 
 **Checks**
 
-- `bunx tsc --noEmit` — typecheck (also part of `bun run build`).
+- `bun run typecheck` — `tsc --noEmit` for renderer + `tsc -p tsconfig.node.json --noEmit` for main/preload.
 
-**Production web bundle**
+**Production bundle (web + main + preload)**
 
-- `bun run build` — `build:native-effects` + `tsc` + `vite build` → `dist/` (then copied into the app bundle per `electrobun.config.ts`).
+- `bun run build` — `electron-vite build` → `out/{main,preload,renderer}/`. Consumed by `electron-builder`.
 
-**Platform installers** (run **on the target OS**; Electrobun does not cross-compile)
+**Platform installers** (run **on the target OS**; electron-builder doesn't cross-compile native modules)
 
-- `bun run dist:mac` / `dist:win` / `dist:linux` — see `docs/DEVELOPMENT.md` for artifacts and secrets.
+- `bun run dist:mac` — `electron-vite build && electron-builder --mac && bash scripts/repack-dmg.sh`
+- `bun run dist:win` — `electron-vite build && electron-builder --win`
+- `bun run dist:linux` — `electron-vite build && electron-builder --linux`
+
+See `docs/DEVELOPMENT.md` for signing env vars and artifact locations.
 
 ## Icons
 
@@ -61,19 +67,21 @@ bun install
 
 ## Conventions for agents
 
-- Prefer **Bun** for scripts and local runs (`bun`, `bunx`).
+- Prefer **Bun** for scripts and local runs (`bun`, `bunx`). Electron main itself runs on Node (Electron's bundled Node 20) — use Node-compatible APIs only.
 - **UI strings** for user-facing copy: add keys under `src/mainview/i18n/` (English in `en.ts`); keep code comments in **English**.
-- Match existing patterns: `@/` imports from `src/mainview` (see `vite.config.ts` / `tsconfig.json`).
+- Match existing patterns: `@/` imports from `src/mainview` (see `electron.vite.config.ts` / `tsconfig.json`).
 - Avoid scope creep: do not change `node_modules/` or unrelated marketing-only paths unless the task requires it.
-- After RPC or shared-type changes, ensure **both** Bun handlers and webview callers stay aligned (`src/shared/` or local schema modules).
+- After RPC or shared-type changes, ensure **both** main handlers (`src/main/rpc-handlers.ts`) and renderer callers stay aligned (`src/shared/` or local schema modules).
+- Native Node modules (`better-sqlite3`) need `electron-builder install-app-deps` to rebuild against Electron's ABI. `bun install` on its own won't do it.
 
 ## Environment variables (non-exhaustive)
 
 | Variable | Purpose |
 | --- | --- |
-| `AGENTSKILLS_TRPC_PORT` | tRPC HTTP port (default `17888`) |
-| `AGENTSKILLS_DEVTOOLS` / `ELECTROBUN_OPEN_DEVTOOLS` | Open webview DevTools |
-| `ELECTROBUN_*` | Signing, notarization, update base URL — see `docs/DEVELOPMENT.md` and `electrobun.config.ts` |
+| `AGENTSKILLS_TRPC_PORT` | tRPC HTTP port (default `17888`; falls through to +48 on conflict) |
+| `AGENTSKILLS_DEVTOOLS` | Auto-open renderer DevTools on launch (dev only) |
+| `AGENTSKILLS_DISABLE_WINDOW_BLUR` | `1` → force vibrancy off on macOS even if settings say on |
+| `CSC_NAME`, `APPLE_API_KEY_*`, `APPLE_ID`, `APPLE_APP_SPECIFIC_PASSWORD`, `APPLE_TEAM_ID` | macOS signing + notarization. See `docs/DEVELOPMENT.md`. |
 
 ## Further reading
 

README.md

@@ -79,21 +79,23 @@ Grab the installer for your OS from the [**latest release**](https://github.com/
 
 | OS | File | Notes |
 | --- | --- | --- |
-| macOS (Apple Silicon) | `stable-macos-arm64-Skiller.dmg` | Signed + notarized — opens with no Gatekeeper warnings. Open the DMG and drag Skiller to Applications. |
-| Windows (x64) | `stable-win-x64-Skiller-Setup.zip` | Extract and run `Skiller.exe`. SmartScreen may show a one-time warning — click "More info" → "Run anyway". |
-| Linux (x64) | `stable-linux-x64-Skiller-Setup.tar.gz` | Extract and run `bin/launcher` from the resulting folder. |
+| macOS (Apple Silicon) | `Skiller-<version>-macos-arm64.dmg` | Signed + notarized. Open the DMG and drag Skiller to Applications. |
+| Windows (x64) | `Skiller-<version>-win-x64.exe` | NSIS installer. SmartScreen may show a one-time warning — click "More info" → "Run anyway". |
+| Linux (x64) | `Skiller-<version>-linux-x86_64.AppImage` or `.deb` | AppImage is self-contained (`chmod +x`, run). Deb for Ubuntu/Debian package managers. |
 
 Every release is built and published by the CI matrix in `.github/workflows/release.yml` — tagging `vX.Y.Z` produces all three platforms automatically.
 
+> **If you had an older `stable-*-Skiller.*` build:** those were produced by a previous Electrobun-based packaging pipeline and can't auto-update to the current Electron-based builds. Grab the new installer above; your local data in `~/Library/Application Support/com.beautyfree.skiller/` (or the Windows/Linux equivalent) stays intact.
+
 ## Auto-updates
 
 Once installed, Skiller keeps itself current:
 
 - Checks for new versions on launch, then every 6 hours in the background.
-- Downloads delta patches (~14 KB typical) when available; falls back to the full bundle if the patch chain breaks.
-- Shows status and a one-click **Restart & install** button in **Settings → App Updates**.
+- Downloads the full updated bundle on demand (click **Download update** in Settings → App Updates).
+- Shows status and a one-click **Restart & install** button once ready.
 
-The updater points at `github.com/.../releases/latest/download`, so every tagged release on GitHub automatically becomes the next update for existing installs.
+Powered by [`electron-updater`](https://www.electron.build/auto-update) reading from this repo's GitHub Releases.
 
 ## For Developers
 

build-resources/entitlements.mac.plist

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <!--
+    Hardened Runtime + notarization minimum entitlements for an Electron app.
+    - allow-jit: Chromium V8 JIT
+    - allow-unsigned-executable-memory: Chromium/V8 writes executable pages
+    - disable-library-validation: loads better-sqlite3.node at runtime
+    - cs.allow-dyld-environment-variables: Electron's helper process needs
+      DYLD_* env vars under hardened runtime
+
+    Do not add entitlements beyond what's listed unless the feature explicitly
+    needs them — every addition widens the notarization attack surface.
+  -->
+  <key>com.apple.security.cs.allow-jit</key>
+  <true/>
+  <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+  <true/>
+  <key>com.apple.security.cs.disable-library-validation</key>
+  <true/>
+  <key>com.apple.security.cs.allow-dyld-environment-variables</key>
+  <true/>
+</dict>
+</plist>