merge conflicts

Author: yaqi-lyu

.github/workflows/automated-release-electron-app.yml

@@ -3,7 +3,11 @@ name: Automated Electron App Release
 on:
   push:
     branches:
+<<<<<<< HEAD
       - test/release-trigger
+=======
+      - main
+>>>>>>> main
 
 permissions:
   contents: write
@@ -22,7 +26,11 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v6
         with:
+<<<<<<< HEAD
           ref: test/release-trigger
+=======
+          ref: main
+>>>>>>> main
           fetch-depth: 0
           token: ${{ secrets.GITHUB_TOKEN }}
 
@@ -45,7 +53,7 @@ jobs:
 
           echo "Generated version: $VERSION"
           echo "version=${VERSION}" >> $GITHUB_OUTPUT
-          echo "tag_name=v${VERSION}" >> $GITHUB_OUTPUT
+          echo "tag_name=${VERSION}" >> $GITHUB_OUTPUT
 
       - name: Create and publish GitHub Release
         env:
@@ -55,9 +63,9 @@ jobs:
           VERSION="${{ steps.get_version.outputs.version }}"
 
           gh release create "$TAG_NAME" \
-            --title "v$VERSION" \
+            --title "$VERSION" \
             --generate-notes \
-            --target test/release-trigger \
+            --target main \
             --draft=false
 
           echo "Release created and published"
@@ -99,5 +107,5 @@ jobs:
     uses: ./.github/workflows/release-electron-app.yml
     with:
       tag_name: ${{ needs.auto-release.outputs.tag_name }}
-      target: test/release-trigger
+      target: main
     secrets: inherit

.github/workflows/release-electron-app.yml

@@ -1,12 +1,17 @@
 name: Release Electron App
 
+# Keep the `release` trigger option to allow manual publishing of releases if needed.
 on:
   release:
     types: [published]
   workflow_call:
     inputs:
       tag_name:
+<<<<<<< HEAD
         description: "The release tag name (e.g., v1.0.0)"
+=======
+        description: "The release tag name"
+>>>>>>> main
         required: true
         type: string
       target:
@@ -41,7 +46,7 @@ jobs:
             TARGET="${{ github.event.release.target_commitish }}"
           fi
 
-          echo "version=${TAG#v}" >> $GITHUB_OUTPUT
+          echo "version=$TAG" >> $GITHUB_OUTPUT
           echo "target=$TARGET" >> $GITHUB_OUTPUT
 
   build-windows:

README.md

@@ -1,12 +1,17 @@
 # Desktop Electron App
 
+## Prerequisites
+
+- [Node JS](https://nodejs.org/en/download)
+
 ## Setup
 
 1. Copy `.env.example` → `.env`
 2. Copy environment from keeper: **SSW.Yakshaver Desktop .env** (just copy YouTube client id and secret values. LLM values should be set via app itself)
 
 ## Run
-
+In the root folder, run
+1. `npm install -g concurrently`, which will install the [`concurrently` package](https://www.npmjs.com/package/concurrently)
 1. `npm run setup` – install dependencies
 2. `npm run dev` – start the app
 
@@ -20,6 +25,13 @@
 
 ## Configuration
 
+- Keys are stored securely on your device using the operating system's encryption (Electron safeStorage) in the app's user data directory
+
+- **Windows**: `%APPDATA%\SSW.YakShaver\yakshaver-tokens\*.enc`
+- **macOS**: `~/Library/Application Support/SSW.YakShaver/yakshaver-tokens/*.enc`
+- **Linux**: `~/.config/SSW.YakShaver/yakshaver-tokens/*.enc`
+
+
 ### OpenAI API Key (User-provided)
 
 You can now set your own OpenAI API key directly in the app:
@@ -30,17 +42,10 @@ You can now set your own OpenAI API key directly in the app:
 
 Notes:
 
-- The key is stored securely on your device using the operating system's encryption (Electron safeStorage) in the app's user data directory.
 - You can clear the stored key anytime from the same dialog.
 
 ### MCP Server Configuration
 
-The MCP server configuration is automatically stored in the platform-appropriate user data directory:
-
-- **Windows**: `%APPDATA%\SSW.YakShaver\mcp-servers.json`
-- **macOS**: `~/Library/Application Support/SSW.YakShaver/mcp-servers.json`
-- **Linux**: `~/.config/SSW.YakShaver/mcp-servers.json`
-
 The configuration file is automatically created when you add your first MCP server through the Settings UI. The configuration persists across app restarts and updates.
 
 ## Running macOS Compiled App (`YakShaver.app`)

electron-builder.config.js

@@ -16,7 +16,11 @@ module.exports = {
   ],
   extraResources: [".env", "src/ui/public/**"],
   asar: true,
-  asarUnpack: ["src/ui/dist/**", "**/@ffmpeg-installer/**"],
+  asarUnpack: [
+    "src/ui/dist/**",
+    "**/@ffmpeg-installer/**",
+    "**/youtube-dl-exec/**",
+  ],
   afterPack: "./afterPack.js",
   win: {
     icon: "src/ui/public/icons/icon.ico",