feat(desktop): refine settings proxy panel and silent Windows updates.

joohw · joohw · commit edd82eb1fadd · 2026-06-01T17:00:06.000+08:00
Move proxy address and health actions under the core row, run NSIS upgrades with /S to the current install dir, and bump desktop to v0.2.3.
diff --git a/electron/desktop-update.js b/electron/desktop-update.js
@@ -221,12 +221,33 @@ async function verifyInstallerChecksum(installerPath, versionTag) {
   return true;
 }
 
+function resolveDesktopInstallDir() {
+  const execPath = process.execPath;
+  if (!execPath) return "";
+  if (process.platform === "darwin") {
+    // .../ClovAPI Switcher.app/Contents/MacOS/ClovAPI Switcher
+    const macOSDir = path.dirname(path.dirname(path.dirname(execPath)));
+    return macOSDir.endsWith(".app") ? macOSDir : "";
+  }
+  return path.dirname(execPath);
+}
+
+function installerLaunchArgs(installDir = resolveDesktopInstallDir()) {
+  if (process.platform === "win32") {
+    const dir = String(installDir || "").trim();
+    // NSIS silent upgrade: /S hides the wizard; /D= must be last and has no quotes.
+    if (dir) return ["/S", `/D=${dir}`];
+    return ["/S"];
+  }
+  return [];
+}
+
 function launchInstaller(installerPath) {
   if (process.platform === "win32") {
-    spawn(installerPath, [], {
+    spawn(installerPath, installerLaunchArgs(), {
       detached: true,
       stdio: "ignore",
-      windowsHide: false,
+      windowsHide: true,
     }).unref();
     return;
   }
@@ -270,4 +291,6 @@ module.exports = {
   fetchLatestDesktopVersion,
   checkDesktopUpdate,
   downloadAndLaunchDesktopUpdate,
+  resolveDesktopInstallDir,
+  installerLaunchArgs,
 };
diff --git a/electron/desktop-update.test.js b/electron/desktop-update.test.js
@@ -36,3 +36,16 @@ test("installerDownloadUrl uses versioned desktop path", () => {
     "https://downloads.clovapi.com/desktop/v0.1.5/clovapi-desktop-darwin-universal.dmg",
   );
 });
+
+test("installerLaunchArgs uses NSIS silent flags on Windows", () => {
+  const { installerLaunchArgs } = require("./desktop-update");
+  if (process.platform !== "win32") {
+    assert.deepEqual(installerLaunchArgs("C:\\Apps\\ClovAPI Switcher"), []);
+    return;
+  }
+  assert.deepEqual(installerLaunchArgs("C:\\Apps\\ClovAPI Switcher"), [
+    "/S",
+    "/D=C:\\Apps\\ClovAPI Switcher",
+  ]);
+  assert.deepEqual(installerLaunchArgs(""), ["/S"]);
+});
diff --git a/electron/package.json b/electron/package.json
@@ -1,7 +1,7 @@
 {
   "name": "clovapi-switcher",
   "private": true,
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "ClovAPI Switcher desktop app",
   "main": "main.js",
   "type": "commonjs",
@@ -93,6 +93,9 @@
     },
     "nsis": {
       "oneClick": false,
+      "allowToChangeInstallationDirectory": false,
+      "allowElevation": true,
+      "runAfterFinish": true,
       "shortcutName": "ClovAPI Switcher",
       "uninstallDisplayName": "ClovAPI Switcher"
     }
diff --git a/electron/ui/src/components/ListRow.svelte b/electron/ui/src/components/ListRow.svelte
@@ -28,7 +28,7 @@
     centerContent?: boolean;
     onOpen?: () => void;
     leading?: Snippet;
-    actions: Snippet;
+    actions?: Snippet;
   } = $props();
 
   const dotClass = $derived(
@@ -116,7 +116,9 @@
       {/each}
     </div>
   </div>
-  <div class="flex shrink-0 flex-wrap items-center gap-2 sm:justify-end">
-    {@render actions()}
-  </div>
+  {#if actions}
+    <div class="flex shrink-0 flex-wrap items-center gap-2 sm:justify-end">
+      {@render actions()}
+    </div>
+  {/if}
 </div>
diff --git a/electron/ui/src/components/ProxyPanel.svelte b/electron/ui/src/components/ProxyPanel.svelte
@@ -15,23 +15,23 @@
   import ListRow from "./ListRow.svelte";
   import SectionCard from "./SectionCard.svelte";
 
+  const electronDev = isElectronDev();
+
   const copy = $derived.by(() => {
     void i18n.locale;
     return {
       title: t("proxy.title"),
       description: t("proxy.description", { path: "/{providerId}/{modelId}/{apiStyle}/v1" }),
       service: t("proxy.service"),
-      statusLine: store.proxyRunning
-        ? t("proxy.running", { url: store.proxyBaseUrl })
-        : t("proxy.stopped"),
+      serviceLine: store.proxyRunning ? t("proxy.runningShort") : t("proxy.stopped"),
       appVersion: t("proxy.appVersion"),
       appVersionLine: store.appVersion
         ? t("proxy.appVersionLine", { version: store.appVersion })
         : t("proxy.appVersionUnknown"),
       coreVersion: t("proxy.coreVersion"),
-      coreVersionLine: store.coreVersion
-        ? t("proxy.coreVersionLine", { version: store.coreVersion })
-        : t("proxy.coreVersionUnknown"),
+      coreTitle: store.coreVersion
+        ? t("proxy.coreTitle", { version: store.coreVersion })
+        : t("proxy.coreVersion"),
       test: t("common.test"),
       testing: t("common.testing"),
       restart: t("proxy.restart"),
@@ -43,7 +43,19 @@
     };
   });
 
-  const electronDev = isElectronDev();
+  const coreLines = $derived.by(() => {
+    void i18n.locale;
+    const lines: string[] = [];
+    if (store.proxyRunning) {
+      lines.push(t("proxy.coreProxyAddress", { url: store.proxyBaseUrl }));
+    } else if (!store.coreVersion) {
+      lines.push(t("proxy.coreVersionUnknown"));
+    }
+    if (electronDev) {
+      lines.push(t("proxy.updateDisabledInDev"));
+    }
+    return lines;
+  });
 
   const proxyHealthTest = $derived(store.proxyHealthTest);
   const proxyHealthTesting = $derived(proxyHealthTest?.status === "testing");
@@ -53,6 +65,7 @@
   const coreUpdateCheck = $derived(store.coreUpdateCheck);
   const coreUpdateTesting = $derived(coreUpdateCheck?.status === "testing" || store.coreUpdating);
   const coreUpdateBusy = $derived(store.running || coreUpdateTesting);
+  const coreActionBusy = $derived(store.running || proxyHealthTesting);
 
   function rowTestStatus(value: string | undefined): "" | ModelTestStatus {
     if (value === "testing" || value === "pass" || value === "fail") return value;
@@ -61,27 +74,7 @@
 </script>
 
 <SectionCard title={copy.title} description={copy.description}>
-  <ListRow
-    title={copy.service}
-    lines={[copy.statusLine]}
-    showStatusDot={Boolean(proxyHealthTest?.status)}
-    testStatus={rowTestStatus(proxyHealthTest?.status)}
-    testSummary={proxyHealthTest?.summary || ""}
-  >
-    {#snippet actions()}
-      <Button
-        size="sm"
-        variant="outline"
-        disabled={store.running || proxyHealthTesting}
-        onclick={() => void runProxyHealthTest()}
-      >
-        {proxyHealthTesting ? copy.testing : copy.test}
-      </Button>
-      <Button size="sm" disabled={store.running || proxyHealthTesting} onclick={() => void restartLocalProxy()}>
-        {copy.restart}
-      </Button>
-    {/snippet}
-  </ListRow>
+  <ListRow title={copy.service} lines={[copy.serviceLine]} />
 
   <ListRow
     title={copy.appVersion}
@@ -109,12 +102,24 @@
   </ListRow>
 
   <ListRow
-    title={copy.coreVersion}
-    lines={electronDev ? [copy.coreVersionLine, copy.updateDisabledInDev] : [copy.coreVersionLine]}
-    testStatus={electronDev ? "" : rowTestStatus(coreUpdateCheck?.status)}
-    testSummary={electronDev ? "" : coreUpdateCheck?.summary || ""}
+    title={copy.coreTitle}
+    lines={coreLines}
+    showStatusDot={Boolean(proxyHealthTest?.status)}
+    testStatus={rowTestStatus(proxyHealthTest?.status)}
+    testSummary={proxyHealthTest?.summary || ""}
   >
     {#snippet actions()}
+      <Button
+        size="sm"
+        variant="outline"
+        disabled={coreActionBusy}
+        onclick={() => void runProxyHealthTest()}
+      >
+        {proxyHealthTesting ? copy.testing : copy.test}
+      </Button>
+      <Button size="sm" disabled={coreActionBusy} onclick={() => void restartLocalProxy()}>
+        {copy.restart}
+      </Button>
       {#if !electronDev}
         <Button
           size="sm"
diff --git a/electron/ui/src/lib/i18n/locales/en.ts b/electron/ui/src/lib/i18n/locales/en.ts
@@ -113,21 +113,23 @@ const en = {
     service: "Proxy service",
     appVersion: "Desktop app",
     coreVersion: "Core",
+    coreTitle: "Core v{version}",
     appVersionLine: "v{version}",
     coreVersionLine: "v{version}",
     appVersionUnknown: "Unknown",
     coreVersionUnknown: "Unknown — start the proxy or check for updates",
-    running: "Running · {url}",
-    stopped: "Stopped · starts when you apply a CLI, or restart manually",
+    runningShort: "Running",
+    coreProxyAddress: "Proxy address · {url}",
+    stopped: "Stopped · starts when you apply a CLI, or restart the core manually",
     description:
       "CLIs point base URL at {path}; the proxy routes by path. No upstream binding in active. Proxy is always enabled.",
-    restart: "Restart",
+    restart: "Restart core",
     checkUpdate: "Check for updates",
     installUpdate: "Install update",
     appInstallUpdate: "Install and restart",
     updating: "Installing update…",
     appDownloading: "Downloading update…",
-    appInstallLaunching: "Installer opened — quitting app…",
+    appInstallLaunching: "Installing silently — quitting app…",
     updateUpToDate: "Up to date",
     updateAvailable: "Update available · v{latest}",
     updateInstalled: "Updated to v{version}",
@@ -268,7 +270,7 @@ const en = {
     appUpdateUnsupported: "Desktop update is not available in this environment.",
     appUpdateCheckFailed: "Failed to check desktop update",
     appUpdateInstallFailed: "Failed to download or launch desktop update",
-    appUpdateLaunching: "Installer opened — the app will quit so you can finish installing",
+    appUpdateLaunching: "Installing silently — the app will quit",
     clovapiUnavailable: "clovapi CLI is not available",
     clovapiStartFailed: "Failed to start clovapi",
     clovapiMissing: "clovapi CLI not found — build core/clovapi or add to PATH",
diff --git a/electron/ui/src/lib/i18n/locales/zh.ts b/electron/ui/src/lib/i18n/locales/zh.ts
@@ -111,21 +111,23 @@ const zh = {
     service: "代理服务",
     appVersion: "桌面应用",
     coreVersion: "内核",
+    coreTitle: "内核 v{version}",
     appVersionLine: "v{version}",
     coreVersionLine: "v{version}",
     appVersionUnknown: "未知",
     coreVersionUnknown: "未知 — 启动代理或检查更新",
-    running: "运行中 · {url}",
-    stopped: "未运行 · 应用 CLI 时将自动启动，也可手动重启服务",
+    runningShort: "运行中",
+    coreProxyAddress: "代理地址 · {url}",
+    stopped: "未运行 · 应用 CLI 时将自动启动，也可手动重启内核",
     description:
       "CLI 将 base URL 指向 {path}；代理按路径转发，无需在 active 中绑定上游。代理始终启用。",
-    restart: "重启服务",
+    restart: "重启内核",
     checkUpdate: "检查更新",
     installUpdate: "安装更新",
     appInstallUpdate: "安装并重启",
     updating: "正在安装更新…",
     appDownloading: "正在下载更新…",
-    appInstallLaunching: "安装程序已启动，应用即将退出…",
+    appInstallLaunching: "正在静默安装，应用即将退出…",
     updateUpToDate: "已是最新版本",
     updateAvailable: "有可用更新 · v{latest}",
     updateInstalled: "已更新至 v{version}",
@@ -264,7 +266,7 @@ const zh = {
     appUpdateUnsupported: "当前环境不支持桌面应用更新",
     appUpdateCheckFailed: "检查桌面应用更新失败",
     appUpdateInstallFailed: "下载或启动桌面安装包失败",
-    appUpdateLaunching: "安装程序已打开，应用即将退出以完成安装",
+    appUpdateLaunching: "正在静默安装，应用即将退出",
     clovapiUnavailable: "当前环境无法调用 clovapi",
     clovapiStartFailed: "clovapi 启动失败",
     clovapiMissing: "未找到 clovapi CLI，请先构建 core/clovapi 或安装到 PATH",
