diff --git a/desktop/src/stores/settingsStore.test.ts b/desktop/src/stores/settingsStore.test.ts
index d57a27d7..aae26472 100644
--- a/desktop/src/stores/settingsStore.test.ts
+++ b/desktop/src/stores/settingsStore.test.ts
@@ -63,6 +63,109 @@ describe('settingsStore UI zoom', () => {
})
})
+describe('settingsStore update proxy persistence', () => {
+ beforeEach(() => {
+ vi.resetModules()
+ vi.clearAllMocks()
+ window.localStorage.clear()
+ })
+
+ it('defaults old user settings to automatic system proxy mode', async () => {
+ vi.doMock('../api/settings', () => ({
+ settingsApi: {
+ getUser: vi.fn().mockResolvedValue({}),
+ updateUser: vi.fn(),
+ getPermissionMode: vi.fn().mockResolvedValue({ mode: 'default' }),
+ setPermissionMode: vi.fn(),
+ getCliLauncherStatus: vi.fn(),
+ },
+ }))
+ vi.doMock('../api/models', () => ({
+ modelsApi: {
+ list: vi.fn().mockResolvedValue({ models: [] }),
+ getCurrent: vi.fn().mockResolvedValue({ model: null }),
+ setCurrent: vi.fn(),
+ getEffort: vi.fn().mockResolvedValue({ level: 'medium' }),
+ setEffort: vi.fn(),
+ },
+ }))
+ vi.doMock('../api/h5Access', () => ({
+ h5AccessApi: {
+ get: vi.fn().mockResolvedValue({
+ settings: {
+ enabled: false,
+ tokenPreview: null,
+ allowedOrigins: [],
+ publicBaseUrl: null,
+ },
+ }),
+ enable: vi.fn(),
+ disable: vi.fn(),
+ regenerate: vi.fn(),
+ update: vi.fn(),
+ },
+ }))
+
+ const { useSettingsStore } = await import('./settingsStore')
+
+ await useSettingsStore.getState().fetchAll()
+
+ expect(useSettingsStore.getState().updateProxy).toEqual({
+ mode: 'system',
+ url: '',
+ })
+ })
+
+ it('persists manual update proxy settings trimmed', async () => {
+ const updateUser = vi.fn().mockResolvedValue({})
+ vi.doMock('../api/settings', () => ({
+ settingsApi: {
+ getUser: vi.fn(),
+ updateUser,
+ getPermissionMode: vi.fn(),
+ setPermissionMode: vi.fn(),
+ getCliLauncherStatus: vi.fn(),
+ },
+ }))
+ vi.doMock('../api/models', () => ({
+ modelsApi: {
+ list: vi.fn(),
+ getCurrent: vi.fn(),
+ setCurrent: vi.fn(),
+ getEffort: vi.fn(),
+ setEffort: vi.fn(),
+ },
+ }))
+ vi.doMock('../api/h5Access', () => ({
+ h5AccessApi: {
+ get: vi.fn(),
+ enable: vi.fn(),
+ disable: vi.fn(),
+ regenerate: vi.fn(),
+ update: vi.fn(),
+ },
+ }))
+
+ const { useSettingsStore } = await import('./settingsStore')
+
+ await useSettingsStore.getState().setUpdateProxy({
+ mode: 'manual',
+ url: ' http://127.0.0.1:7890 ',
+ })
+
+ expect(useSettingsStore.getState().updateProxy).toEqual({
+ mode: 'manual',
+ url: 'http://127.0.0.1:7890',
+ })
+ expect(updateUser).toHaveBeenCalledWith({
+ updateProxy: {
+ mode: 'manual',
+ url: 'http://127.0.0.1:7890',
+ },
+ })
+ })
+})
+
describe('settingsStore desktop notification persistence', () => {
beforeEach(() => {
vi.resetModules()
diff --git a/desktop/src/stores/settingsStore.ts b/desktop/src/stores/settingsStore.ts
index e0d10d99..f2a24a2a 100644
--- a/desktop/src/stores/settingsStore.ts
+++ b/desktop/src/stores/settingsStore.ts
@@ -12,6 +12,8 @@ import {
type EffortLevel,
type ModelInfo,
type ThemeMode,
+ type UpdateProxyMode,
+ type UpdateProxySettings,
type WebSearchSettings,
} from '../types/settings'
import type { Locale } from '../i18n'
@@ -54,6 +56,7 @@ type SettingsStore = {
desktopNotificationsEnabled: boolean
desktopTerminal: DesktopTerminalSettings
webSearch: WebSearchSettings
+ updateProxy: UpdateProxySettings
h5Access: H5AccessSettings
h5AccessError: string | null
responseLanguage: string
@@ -73,6 +76,7 @@ type SettingsStore = {
setDesktopNotificationsEnabled: (enabled: boolean) => Promise
setDesktopTerminal: (settings: DesktopTerminalSettings) => Promise
setWebSearch: (settings: WebSearchSettings) => Promise
+ setUpdateProxy: (settings: UpdateProxySettings) => Promise
enableH5Access: () => Promise
disableH5Access: () => Promise
regenerateH5AccessToken: () => Promise
@@ -96,6 +100,11 @@ const DEFAULT_DESKTOP_TERMINAL_SETTINGS: DesktopTerminalSettings = {
customShellPath: '',
}
+const DEFAULT_UPDATE_PROXY_SETTINGS: UpdateProxySettings = {
+ mode: 'system',
+ url: '',
+}
+
export const useSettingsStore = create((set, get) => ({
permissionMode: 'default',
currentModel: null,
@@ -109,6 +118,7 @@ export const useSettingsStore = create((set, get) => ({
desktopNotificationsEnabled: false,
desktopTerminal: DEFAULT_DESKTOP_TERMINAL_SETTINGS,
webSearch: { mode: 'auto', tavilyApiKey: '', braveApiKey: '' },
+ updateProxy: DEFAULT_UPDATE_PROXY_SETTINGS,
h5Access: DEFAULT_H5_ACCESS_SETTINGS,
h5AccessError: null,
responseLanguage: '',
@@ -148,6 +158,7 @@ export const useSettingsStore = create((set, get) => ({
desktopNotificationsEnabled: userSettings.desktopNotificationsEnabled === true,
desktopTerminal: normalizeDesktopTerminalSettings(userSettings.desktopTerminal),
webSearch: normalizeWebSearchSettings(userSettings.webSearch),
+ updateProxy: normalizeUpdateProxySettings(userSettings.updateProxy),
h5Access: h5AccessResult.settings,
h5AccessError: h5AccessResult.error,
responseLanguage: typeof userSettings.language === 'string' ? userSettings.language : '',
@@ -274,6 +285,18 @@ export const useSettingsStore = create((set, get) => ({
}
},
+ setUpdateProxy: async (settings) => {
+ const prev = get().updateProxy
+ const next = normalizeUpdateProxySettings(settings)
+ set({ updateProxy: next })
+ try {
+ await settingsApi.updateUser({ updateProxy: next })
+ } catch (error) {
+ set({ updateProxy: prev })
+ throw error
+ }
+ },
+
enableH5Access: async () => {
set({ h5AccessError: null })
try {
@@ -351,6 +374,22 @@ function normalizeWebSearchSettings(settings: WebSearchSettings | undefined): We
}
}
+function isUpdateProxyMode(value: unknown): value is UpdateProxyMode {
+ return value === 'system' || value === 'manual'
+}
+
+function normalizeUpdateProxySettings(
+ settings: Partial | undefined,
+): UpdateProxySettings {
+ const mode = isUpdateProxyMode(settings?.mode)
+ ? settings.mode
+ : DEFAULT_UPDATE_PROXY_SETTINGS.mode
+ return {
+ mode,
+ url: typeof settings?.url === 'string' ? settings.url.trim() : '',
+ }
+}
+
function normalizeDesktopTerminalSettings(
settings: Partial | undefined,
): DesktopTerminalSettings {
diff --git a/desktop/src/stores/updateStore.test.ts b/desktop/src/stores/updateStore.test.ts
index 2d9cbf37..fad6532f 100644
--- a/desktop/src/stores/updateStore.test.ts
+++ b/desktop/src/stores/updateStore.test.ts
@@ -48,6 +48,29 @@ describe('updateStore', () => {
expect(useUpdateStore.getState().shouldPrompt).toBe(true)
})
+ it('passes the configured manual update proxy to update checks', async () => {
+ const update = {
+ version: '0.2.0',
+ body: 'Bug fixes and performance improvements',
+ close: vi.fn().mockResolvedValue(undefined),
+ }
+ check.mockResolvedValue(update)
+
+ vi.resetModules()
+ const { useSettingsStore } = await import('./settingsStore')
+ useSettingsStore.setState({
+ updateProxy: {
+ mode: 'manual',
+ url: 'http://127.0.0.1:7890',
+ },
+ })
+ const { useUpdateStore } = await import('./updateStore')
+
+ await useUpdateStore.getState().checkForUpdates()
+
+ expect(check).toHaveBeenCalledWith({ proxy: 'http://127.0.0.1:7890' })
+ })
+
it('does not re-prompt for the same version after dismissing once', async () => {
check.mockResolvedValue({
version: '0.2.0',
@@ -133,6 +156,50 @@ describe('updateStore', () => {
expect(relaunch).toHaveBeenCalledTimes(1)
})
+ it('refreshes the pending update when the proxy changes before install', async () => {
+ const staleClose = vi.fn().mockResolvedValue(undefined)
+ const freshDownload = vi.fn(async (onEvent?: (event: unknown) => void) => {
+ onEvent?.({ event: 'Started', data: { contentLength: 100 } })
+ onEvent?.({ event: 'Progress', data: { chunkLength: 100 } })
+ onEvent?.({ event: 'Finished' })
+ })
+ const freshInstall = vi.fn().mockResolvedValue(undefined)
+
+ check
+ .mockResolvedValueOnce({
+ version: '0.2.0',
+ body: 'Notes',
+ close: staleClose,
+ })
+ .mockResolvedValueOnce({
+ version: '0.2.0',
+ body: 'Notes',
+ download: freshDownload,
+ install: freshInstall,
+ close: vi.fn().mockResolvedValue(undefined),
+ })
+ invoke.mockResolvedValue(undefined)
+ relaunch.mockResolvedValue(undefined)
+
+ vi.resetModules()
+ const { useSettingsStore } = await import('./settingsStore')
+ const { useUpdateStore } = await import('./updateStore')
+
+ await useUpdateStore.getState().checkForUpdates()
+ useSettingsStore.setState({
+ updateProxy: {
+ mode: 'manual',
+ url: 'http://127.0.0.1:7890',
+ },
+ })
+ await useUpdateStore.getState().installUpdate()
+
+ expect(staleClose).toHaveBeenCalledTimes(1)
+ expect(check).toHaveBeenNthCalledWith(2, { proxy: 'http://127.0.0.1:7890' })
+ expect(freshDownload).toHaveBeenCalledTimes(1)
+ expect(freshInstall).toHaveBeenCalledTimes(1)
+ })
+
it('clears the native exit guard when install fails after sidecars stop', async () => {
const download = vi.fn(async (onEvent?: (event: unknown) => void) => {
onEvent?.({ event: 'Started', data: { contentLength: 100 } })
diff --git a/desktop/src/stores/updateStore.ts b/desktop/src/stores/updateStore.ts
index 1feaa5cd..b345cf3f 100644
--- a/desktop/src/stores/updateStore.ts
+++ b/desktop/src/stores/updateStore.ts
@@ -1,6 +1,8 @@
import { create } from 'zustand'
import type { Update } from '@tauri-apps/plugin-updater'
import { isTauriRuntime } from '../lib/desktopRuntime'
+import type { UpdateProxySettings } from '../types/settings'
+import { useSettingsStore } from './settingsStore'
export type UpdateStatus =
| 'idle'
@@ -34,6 +36,7 @@ type UpdateStore = {
}
let pendingUpdate: Update | null = null
+let pendingUpdateProxyKey: string | null = null
let startupCheckPromise: Promise | null = null
function readDismissedUpdateVersion(): string | null {
@@ -60,9 +63,26 @@ function writeDismissedUpdateVersion(version: string | null) {
}
}
-async function setPendingUpdate(next: Update | null) {
+function getUpdateProxyUrl(settings: UpdateProxySettings = useSettingsStore.getState().updateProxy) {
+ if (settings.mode !== 'manual') return null
+ const proxy = settings.url.trim()
+ return proxy || null
+}
+
+function getUpdateProxyKey(settings: UpdateProxySettings = useSettingsStore.getState().updateProxy) {
+ const proxy = getUpdateProxyUrl(settings)
+ return proxy ? `manual:${proxy}` : 'system'
+}
+
+function getUpdateCheckOptions() {
+ const proxy = getUpdateProxyUrl()
+ return proxy ? { proxy } : undefined
+}
+
+async function setPendingUpdate(next: Update | null, proxyKey: string | null) {
const previous = pendingUpdate
pendingUpdate = next
+ pendingUpdateProxyKey = next ? proxyKey : null
if (previous && previous !== next) {
try {
@@ -113,8 +133,9 @@ export const useUpdateStore = create((set, get) => ({
try {
const { check } = await import('@tauri-apps/plugin-updater')
- const update = await check()
- await setPendingUpdate(update)
+ const updateProxyKey = getUpdateProxyKey()
+ const update = await check(getUpdateCheckOptions())
+ await setPendingUpdate(update, updateProxyKey)
const checkedAt = Date.now()
@@ -174,6 +195,10 @@ export const useUpdateStore = create((set, get) => ({
if (!isTauriRuntime()) return
let update = pendingUpdate
+ if (update && pendingUpdateProxyKey !== getUpdateProxyKey()) {
+ await setPendingUpdate(null, null)
+ update = null
+ }
if (!update) {
update = await get().checkForUpdates()
if (!update) return
diff --git a/desktop/src/types/settings.ts b/desktop/src/types/settings.ts
index 4b1d985b..24c5e213 100644
--- a/desktop/src/types/settings.ts
+++ b/desktop/src/types/settings.ts
@@ -18,6 +18,13 @@ export type WebSearchSettings = {
braveApiKey?: string
}
+export type UpdateProxyMode = 'system' | 'manual'
+
+export type UpdateProxySettings = {
+ mode: UpdateProxyMode
+ url: string
+}
+
export type H5AccessSettings = {
enabled: boolean
tokenPreview: string | null
@@ -54,6 +61,7 @@ export type UserSettings = {
skipWebFetchPreflight?: boolean
desktopNotificationsEnabled?: boolean
webSearch?: WebSearchSettings
+ updateProxy?: Partial
language?: string
desktopTerminal?: Partial
[key: string]: unknown