fix: 修复打包后 Logo 图标路径错误并回归 electron-builder 直接发布

- 主进程用 process.resourcesPath 读打包资源（dev 仍用 __dirname/resources）
  修复 ipc.ts resolveAppIconPath / SAVE_RESOURCE_FILE_AS、tray.ts 托盘图标
  打包产物 app/dist/ 下无 resources 子目录（被 electron-builder files 规则排除），
  旧路径导致外观设置换图标、品牌 Logo 下载、托盘图标全部 404
- 补 resources/proma-logos/proma-transparent.png（UI 列 14 项但源目录缺 1）
- 恢复 electron-builder.yml 的 publish.provider: github
- release.yml 回归三平台 --publish always 直接上传，移除 publish 汇总 job
  latest.yml / latest-mac.yml 由 electron-builder 在 tag 构建时自动生成与合并

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

Author: ErlichLiu

.github/workflows/release.yml

@@ -90,94 +90,20 @@ jobs:
         run: bun run electron:build
         working-directory: .
 
-      # 打包（不上传发布，避免并行竞态）
-      - name: 打包 (macOS)
+      # 打包并发布到 GitHub Releases
+      - name: 打包并发布 (macOS)
         if: matrix.platform == 'mac'
         env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           APPLE_ID: ${{ secrets.APPLE_ID }}
           APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_APP_SPECIFIC_PASSWORD }}
           APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
-        run: npx electron-builder --mac ${{ matrix.builder_arg }}
+        run: npx electron-builder --mac ${{ matrix.builder_arg }} --publish always
         working-directory: apps/electron
 
-      - name: 打包 (Windows)
+      - name: 打包并发布 (Windows)
         if: matrix.platform == 'win'
-        run: npx electron-builder --win ${{ matrix.builder_arg }}
-        working-directory: apps/electron
-
-      # 上传产物为 workflow artifact
-      - name: 上传产物
-        uses: actions/upload-artifact@v4
-        with:
-          name: build-${{ matrix.platform }}-${{ matrix.arch }}
-          path: apps/electron/out/*
-          retention-days: 1
-
-  publish:
-    needs: build
-    runs-on: ubuntu-latest
-    steps:
-      - name: 下载 macOS ARM64 产物
-        uses: actions/download-artifact@v4
-        with:
-          name: build-mac-arm64
-          path: artifacts/mac-arm64
-
-      - name: 下载 macOS x64 产物
-        uses: actions/download-artifact@v4
-        with:
-          name: build-mac-x64
-          path: artifacts/mac-x64
-
-      - name: 下载 Windows x64 产物
-        uses: actions/download-artifact@v4
-        with:
-          name: build-win-x64
-          path: artifacts/win-x64
-
-      - name: 汇总产物并合并 latest-mac.yml
-        run: |
-          mkdir -p release
-
-          # 拷贝 Windows 产物（排除 win-unpacked 中间目录）
-          cp artifacts/win-x64/*.exe artifacts/win-x64/*.exe.blockmap artifacts/win-x64/latest.yml release/
-
-          # 拷贝 macOS 产物（排除 latest-mac.yml，稍后合并）
-          cp artifacts/mac-x64/*.dmg artifacts/mac-x64/*.zip artifacts/mac-x64/*.zip.blockmap release/ 2>/dev/null || true
-          cp artifacts/mac-arm64/*.dmg artifacts/mac-arm64/*.zip artifacts/mac-arm64/*.zip.blockmap release/ 2>/dev/null || true
-
-          # 合并两份 latest-mac.yml
-          pip install pyyaml -q
-          python3 << 'PYEOF'
-          import yaml
-
-          with open('artifacts/mac-x64/latest-mac.yml') as f:
-              x64 = yaml.safe_load(f)
-          with open('artifacts/mac-arm64/latest-mac.yml') as f:
-              arm64 = yaml.safe_load(f)
-
-          files = []
-          if 'files' in x64:
-              files.extend(x64['files'])
-          if 'files' in arm64:
-              files.extend(arm64['files'])
-
-          merged = dict(x64)
-          merged['files'] = files
-
-          with open('release/latest-mac.yml', 'w') as f:
-              yaml.dump(merged, f, default_flow_style=False, allow_unicode=True)
-          PYEOF
-
-          echo "=== release/ 文件列表 ==="
-          ls -la release/
-
-      - name: 创建 GitHub Release
-        uses: softprops/action-gh-release@v2
-        with:
-          name: ${{ github.ref_name }}
-          files: release/*
-          draft: false
-          prerelease: false
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: npx electron-builder --win ${{ matrix.builder_arg }} --publish always
+        working-directory: apps/electron

apps/electron/electron-builder.yml

@@ -106,10 +106,10 @@ nsis:
 
 # ============================================
 # 发布配置
-# 发布已由 CI workflow (release.yml) 的 publish job 接管，
-# 此处注释掉避免 electron-builder 在 tag 构建时自动触发发布。
+# 每个平台的 build job 通过 --publish always 直接上传到 GitHub Release。
+# electron-builder 会自动创建/复用 Release，并在多架构并行上传时合并 latest-mac.yml。
 # ============================================
-# publish:
-#   provider: github
-#   owner: ErlichLiu
-#   repo: Proma
+publish:
+  provider: github
+  owner: ErlichLiu
+  repo: Proma

apps/electron/resources/proma-logos/proma-transparent.png

@@ -211,17 +211,24 @@ const HIDDEN_FS_ENTRIES = new Set(['.DS_Store', 'Thumbs.db'])
  * - channel:*: 渠道管理相关
  * - chat:*: 对话管理 + 消息发送 + 流式事件
  */
+/**
+ * 打包内置资源目录
+ * dev: __dirname/resources（build:resources 阶段拷贝）
+ * prod: process.resourcesPath（electron-builder extraResources 产物）
+ */
+function getBundledResourcesDir(): string {
+  return app.isPackaged ? process.resourcesPath : join(__dirname, 'resources')
+}
+
 /**
  * 解析应用图标变体的文件路径
- * dev 模式: __dirname/resources/proma-logos/proma-{id}.png
- * 生产模式: __dirname/resources/proma-logos/proma-{id}.png（build:resources 阶段已复制）
  */
 export function resolveAppIconPath(variantId: string): string | null {
+  const resourcesDir = getBundledResourcesDir()
   if (!variantId || variantId === 'default') {
-    // 默认图标
-    return join(__dirname, 'resources/icon.png')
+    return join(resourcesDir, 'icon.png')
   }
-  return join(__dirname, 'resources/proma-logos', `proma-${variantId}.png`)
+  return join(resourcesDir, 'proma-logos', `proma-${variantId}.png`)
 }
 
 export function registerIpcHandlers(): void {
@@ -562,8 +569,8 @@ export function registerIpcHandlers(): void {
       const { writeFileSync, readFileSync, existsSync } = await import('node:fs')
       const { join, normalize, sep, extname: pathExtname } = await import('node:path')
 
-      // 解析到应用内置 resources 目录
-      const resourcesDir = normalize(join(__dirname, 'resources'))
+      // 解析到应用内置 resources 目录（dev 用 __dirname/resources，prod 用 process.resourcesPath）
+      const resourcesDir = normalize(getBundledResourcesDir())
       const fullPath = normalize(join(resourcesDir, resourceRelativePath))
 
       // 安全校验：防止路径穿越（追加 sep 防止 resources-evil 绕过）

apps/electron/src/main/ipc.ts

@@ -9,8 +9,11 @@ let tray: Tray | null = null
  * 所有平台统一使用 Template 图标
  */
 function getTrayIconPath(): string {
-  // resources 在 build:resources 阶段被复制到 dist/ 下，与 main.cjs 同级
-  const resourcesDir = join(__dirname, 'resources/proma-logos')
+  // dev: __dirname/resources（build:resources 拷贝产物）
+  // prod: process.resourcesPath（electron-builder extraResources 产物）
+  const resourcesDir = app.isPackaged
+    ? join(process.resourcesPath, 'proma-logos')
+    : join(__dirname, 'resources/proma-logos')
   return join(resourcesDir, 'iconTemplate.png')
 }