Merge pull request #173 from wsp1911/release

fix(build): stabilize Windows desktop packaging flow

Author: wsp1911

.github/workflows/desktop-package.yml

@@ -1,10 +1,7 @@
 name: Desktop Package
 
 on:
-  # Triggered automatically when Release Please publishes a release
-  release:
-    types: [published]
-  # Manual trigger for ad-hoc builds
+  # Triggered explicitly by release workflows to avoid duplicate packaging.
   workflow_dispatch:
     inputs:
       tag_name:
@@ -41,11 +38,7 @@ jobs:
         run: |
           set -euo pipefail
 
-          if [[ "${{ github.event_name }}" == "release" ]]; then
-            TAG="${{ github.event.release.tag_name }}"
-            VERSION="${TAG#v}"
-            UPLOAD="true"
-          elif [[ -n "${INPUT_TAG_NAME}" ]]; then
+          if [[ -n "${INPUT_TAG_NAME}" ]]; then
             TAG="${INPUT_TAG_NAME}"
             VERSION="${TAG#v}"
             if [[ "${INPUT_UPLOAD_TO_RELEASE}" == "true" ]]; then

BitFun-Installer/src/i18n/locales/en.json

@@ -100,6 +100,14 @@
       "volcengine": {
         "name": "Volcano Engine",
         "description": "ByteDance Volcano Engine Doubao large language models"
+      },
+      "openbitfun": {
+        "name": "OpenBitFun",
+        "description": "OpenBitFun Model Service"
+      },
+      "gemini": {
+        "name": "Google Gemini",
+        "description": "Google Gemini 2.5 series multimodal models"
       }
     },
     "modelNameSelectPlaceholder": "Select a model...",

BitFun-Installer/src/i18n/locales/zh.json

@@ -45,7 +45,7 @@
     "selectProvider": "选择模型服务商...",
     "customProvider": "自定义",
     "getApiKey": "如何获取 API Key？",
-    "modelNamePlaceholder": "输入模型名称...",
+    "modelNamePlaceholder": "输入自定义模型名称...",
     "baseUrlPlaceholder": "示例：https://open.bigmodel.cn/api/paas/v4/chat/completions",
     "customRequestBodyPlaceholder": "{\n  \"temperature\": 0.8,\n  \"top_p\": 0.9\n}",
     "jsonValid": "JSON 格式有效",
@@ -100,6 +100,14 @@
       "volcengine": {
         "name": "火山引擎",
         "description": "字节跳动火山引擎豆包大模型"
+      },
+      "openbitfun": {
+        "name": "OpenBitFun",
+        "description": "OpenBitFun 模型服务"
+      },
+      "gemini": {
+        "name": "Google Gemini",
+        "description": "Google Gemini 2.5 系列多模态模型"
       }
     },
     "modelNameSelectPlaceholder": "选择模型...",

package.json

@@ -7,7 +7,7 @@
     "node": ">=18.0.0"
   },
   "scripts": {
-    "copy-monaco": "copyfiles -u 3 \"src/web-ui/node_modules/monaco-editor/min/vs/**/*\" src/web-ui/public/monaco-editor",
+    "copy-monaco": "copyfiles -u 5 \"src/web-ui/node_modules/monaco-editor/min/vs/**/*\" src/web-ui/public/monaco-editor",
     "copy-icons": "copyfiles -f \"src/apps/desktop/icons/Logo-ICON.png\" \"src/web-ui/public/\"",
     "copy-assets": "pnpm run copy-monaco && pnpm run copy-icons",
     "generate-version": "node scripts/generate-version.cjs",
@@ -19,19 +19,20 @@
     "prebuild:web": "pnpm run copy-assets --silent && pnpm run generate-all --silent",
     "type-check:web": "pnpm --dir src/web-ui run type-check",
     "build": "pnpm run build:web",
-    "build:web": "pnpm run type-check:web && pnpm --dir src/web-ui build",
+    "verify:monaco-assets": "node scripts/verify-monaco-assets.cjs",
+    "build:web": "pnpm run type-check:web && pnpm --dir src/web-ui build && pnpm run verify:monaco-assets",
     "build:mobile-web": "pnpm --dir src/mobile-web build",
     "prepare:mobile-web": "node scripts/mobile-web-build.cjs",
     "preview": "pnpm --dir src/web-ui preview",
     "desktop:dev": "node scripts/dev.cjs desktop",
-    "desktop:dev:raw": "cd src/apps/desktop && env CI=true npx tauri dev",
-    "desktop:build": "cd src/apps/desktop && env CI=true npx tauri build",
-    "desktop:build:fast": "cd src/apps/desktop && env CI=true npx tauri build --debug --no-bundle",
-    "desktop:build:release-fast": "cd src/apps/desktop && env CI=true npx tauri build --no-bundle -- --profile release-fast",
-    "desktop:build:exe": "cd src/apps/desktop && env CI=true npx tauri build --no-bundle",
-    "desktop:build:nsis": "cd src/apps/desktop && env CI=true npx tauri build --bundles nsis",
-    "desktop:build:arm64": "cd src/apps/desktop && env CI=true npx tauri build --target aarch64-apple-darwin --bundles dmg",
-    "desktop:build:x86_64": "cd src/apps/desktop && env CI=true npx tauri build --target x86_64-apple-darwin --bundles dmg",
+    "desktop:dev:raw": "cross-env-shell CI=true \"cd src/apps/desktop && tauri dev\"",
+    "desktop:build": "cross-env-shell CI=true \"cd src/apps/desktop && tauri build\"",
+    "desktop:build:fast": "cross-env-shell CI=true \"cd src/apps/desktop && tauri build --debug --no-bundle\"",
+    "desktop:build:release-fast": "cross-env-shell CI=true \"cd src/apps/desktop && tauri build --no-bundle -- --profile release-fast\"",
+    "desktop:build:exe": "cross-env-shell CI=true \"cd src/apps/desktop && tauri build --no-bundle\"",
+    "desktop:build:nsis": "cross-env-shell CI=true \"cd src/apps/desktop && tauri build --bundles nsis\"",
+    "desktop:build:arm64": "cross-env-shell CI=true \"cd src/apps/desktop && tauri build --target aarch64-apple-darwin --bundles dmg\"",
+    "desktop:build:x86_64": "cross-env-shell CI=true \"cd src/apps/desktop && tauri build --target x86_64-apple-darwin --bundles dmg\"",
     "installer:build": "pnpm --dir BitFun-Installer run installer:build",
     "installer:build:fast": "pnpm --dir BitFun-Installer run installer:build:fast",
     "installer:build:only": "pnpm --dir BitFun-Installer run installer:build:only",
@@ -61,6 +62,7 @@
     "@tauri-apps/cli": "^2.10.0",
     "@vitejs/plugin-react": "^4.6.0",
     "copyfiles": "^2.4.1",
+    "cross-env": "^10.1.0",
     "sass": "^1.93.2",
     "sharp": "^0.34.3",
     "typescript": "~5.8.3",

pnpm-lock.yaml

@@ -0,0 +1,33 @@
+#!/usr/bin/env node
+
+const fs = require('fs');
+const path = require('path');
+
+const ROOT_DIR = path.resolve(__dirname, '..');
+const DIST_DIR = path.join(ROOT_DIR, 'dist', 'monaco-editor', 'vs');
+
+const requiredFiles = [
+  'loader.js',
+  path.join('base', 'worker', 'workerMain.js'),
+  path.join('language', 'json', 'jsonWorker.js'),
+  path.join('language', 'html', 'htmlWorker.js'),
+  path.join('language', 'css', 'cssWorker.js'),
+  path.join('language', 'typescript', 'tsWorker.js'),
+];
+
+const missingFiles = requiredFiles.filter((relativePath) => {
+  return !fs.existsSync(path.join(DIST_DIR, relativePath));
+});
+
+if (missingFiles.length > 0) {
+  console.error('[verify-monaco-assets] Missing Monaco production assets:');
+  for (const relativePath of missingFiles) {
+    console.error(`  - dist/monaco-editor/vs/${relativePath.replace(/\\/g, '/')}`);
+  }
+  console.error(
+    '[verify-monaco-assets] Build output is incomplete. Check the copy-monaco script and Monaco public asset layout.'
+  );
+  process.exit(1);
+}
+
+console.log('[verify-monaco-assets] Monaco production assets verified.');