From 74cc4a8ab66e6e26eca6b16be0fb11dcb51f4725 Mon Sep 17 00:00:00 2001
From: weishao <xweimvp@gmail.com>
Date: Tue, 21 Oct 2025 16:58:25 +0800
Subject: [PATCH 1/2] feat: remove function deleteOllamaModel

---
 .../presenter/llmProviderPresenter/index.ts   |  8 ---
 .../providers/ollamaProvider.ts               | 12 ----
 .../OllamaProviderSettingsDetail.vue          | 61 -------------------
 src/renderer/src/stores/settings.ts           | 17 ------
 .../types/presenters/legacy.presenters.d.ts   |  1 -
 .../presenters/llmprovider.presenter.d.ts     |  1 -
 6 files changed, 100 deletions(-)

diff --git a/src/main/presenter/llmProviderPresenter/index.ts b/src/main/presenter/llmProviderPresenter/index.ts
index 5a84d001c..90022e8ea 100644
--- a/src/main/presenter/llmProviderPresenter/index.ts
+++ b/src/main/presenter/llmProviderPresenter/index.ts
@@ -1674,14 +1674,6 @@ export class LLMProviderPresenter implements ILlmProviderPresenter {
       })
     })
   }
-  deleteOllamaModel(modelName: string): Promise<boolean> {
-    const provider = this.getOllamaProviderInstance()
-    if (!provider) {
-      throw new Error('Ollama provider not found')
-    }
-    return provider.deleteModel(modelName)
-  }
-
   /**
    * 获取文本的 embedding 表示
    * @param providerId 提供商ID
diff --git a/src/main/presenter/llmProviderPresenter/providers/ollamaProvider.ts b/src/main/presenter/llmProviderPresenter/providers/ollamaProvider.ts
index aba551c73..d5acbb63b 100644
--- a/src/main/presenter/llmProviderPresenter/providers/ollamaProvider.ts
+++ b/src/main/presenter/llmProviderPresenter/providers/ollamaProvider.ts
@@ -380,18 +380,6 @@ export class OllamaProvider extends BaseLLMProvider {
     }
   }
 
-  public async deleteModel(modelName: string): Promise<boolean> {
-    try {
-      await this.ollama.delete({
-        model: modelName
-      })
-      return true
-    } catch (error) {
-      console.error(`Failed to delete Ollama model ${modelName}:`, (error as Error).message)
-      return false
-    }
-  }
-
   public async showModelInfo(modelName: string): Promise<ShowResponse> {
     try {
       const response = await this.ollama.show({
diff --git a/src/renderer/settings/components/OllamaProviderSettingsDetail.vue b/src/renderer/settings/components/OllamaProviderSettingsDetail.vue
index 019d5ddad..b66c4f3d3 100644
--- a/src/renderer/settings/components/OllamaProviderSettingsDetail.vue
+++ b/src/renderer/settings/components/OllamaProviderSettingsDetail.vue
@@ -131,7 +131,6 @@
                   :model-name="model.name"
                   :model-id="model.meta?.id ?? model.name"
                   :provider-id="provider.id"
-                  :is-custom-model="true"
                   :type="model.type"
                   :enabled="model.enabled"
                   :vision="model.vision"
@@ -140,7 +139,6 @@
                   :enable-search="model.enableSearch"
                   @enabled-change="handleModelEnabledChange(model.name, $event)"
                   @config-changed="refreshModels"
-                  @delete-model="showDeleteModelConfirm(model.name)"
                 />
               </template>
               <template v-else>
@@ -208,26 +206,6 @@
       </DialogContent>
     </Dialog>
 
-    <!-- 删除模型确认对话框 -->
-    <Dialog v-model:open="showDeleteModelDialog">
-      <DialogContent>
-        <DialogHeader>
-          <DialogTitle>{{ t('settings.provider.dialog.deleteModel.title') }}</DialogTitle>
-          <DialogDescription>
-            {{ t('settings.provider.dialog.deleteModel.content', { name: modelToDelete }) }}
-          </DialogDescription>
-        </DialogHeader>
-        <DialogFooter>
-          <Button variant="outline" @click="showDeleteModelDialog = false">
-            {{ t('dialog.cancel') }}
-          </Button>
-          <Button variant="destructive" @click="confirmDeleteModel">
-            {{ t('settings.provider.dialog.deleteModel.confirm') }}
-          </Button>
-        </DialogFooter>
-      </DialogContent>
-    </Dialog>
-
     <!-- 检查模型对话框 -->
     <Dialog v-model:open="showCheckModelDialog">
       <DialogContent>
@@ -281,11 +259,9 @@ import { useSettingsStore } from '@/stores/settings'
 import { useModelCheckStore } from '@/stores/modelCheck'
 import type { LLM_PROVIDER, RENDERER_MODEL_META } from '@shared/presenter'
 import ModelConfigItem from '@/components/settings/ModelConfigItem.vue'
-import { useToast } from '@/components/use-toast'
 import { ModelType } from '@shared/model'
 
 const { t } = useI18n()
-const { toast } = useToast()
 
 const props = defineProps<{
   provider: LLM_PROVIDER
@@ -297,8 +273,6 @@ const apiHost = ref(props.provider.baseUrl || '')
 const apiKey = ref(props.provider.apiKey || '')
 const showApiKey = ref(false)
 const showPullModelDialog = ref(false)
-const showDeleteModelDialog = ref(false)
-const modelToDelete = ref('')
 const showCheckModelDialog = ref(false)
 const checkResult = ref<boolean>(false)
 
@@ -856,21 +830,6 @@ const pullModel = async (modelName: string) => {
   }
 }
 
-// 显示删除模型确认对话框
-const showDeleteModelConfirm = (modelName: string) => {
-  if (isModelRunning(modelName)) {
-    toast({
-      title: t('settings.provider.toast.modelRunning'),
-      description: t('settings.provider.toast.modelRunningDesc', { model: modelName }),
-      variant: 'destructive',
-      duration: 3000
-    })
-    return
-  }
-  modelToDelete.value = modelName
-  showDeleteModelDialog.value = true
-}
-
 const handleModelEnabledChange = async (modelName: string, enabled: boolean) => {
   try {
     await settingsStore.updateModelStatus(props.provider.id, modelName, enabled)
@@ -879,22 +838,6 @@ const handleModelEnabledChange = async (modelName: string, enabled: boolean) =>
   }
 }
 
-// 确认删除模型 - 使用 settings store
-const confirmDeleteModel = async () => {
-  if (!modelToDelete.value) return
-
-  try {
-    const success = await settingsStore.deleteOllamaModel(modelToDelete.value)
-    if (success) {
-      // 删除成功后模型列表会自动刷新，无需额外调用 refreshModels
-    }
-    showDeleteModelDialog.value = false
-    modelToDelete.value = ''
-  } catch (error) {
-    console.error(`Failed to delete model ${modelToDelete.value}:`, error)
-  }
-}
-
 // 工具函数
 const formatModelSize = (sizeInBytes: number): string => {
   if (!sizeInBytes) return ''
@@ -914,10 +857,6 @@ const formatModelSize = (sizeInBytes: number): string => {
 }
 
 // 使用 settings store 的辅助函数
-const isModelRunning = (modelName: string): boolean => {
-  return settingsStore.isOllamaModelRunning(modelName)
-}
-
 const isModelLocal = (modelName: string): boolean => {
   return settingsStore.isOllamaModelLocal(modelName)
 }
diff --git a/src/renderer/src/stores/settings.ts b/src/renderer/src/stores/settings.ts
index 96570c8b2..325345c73 100644
--- a/src/renderer/src/stores/settings.ts
+++ b/src/renderer/src/stores/settings.ts
@@ -1335,22 +1335,6 @@ export const useSettingsStore = defineStore('settings', () => {
     }
   }
 
-  /**
-   * 删除 Ollama 模型
-   */
-  const deleteOllamaModel = async (modelName: string): Promise<boolean> => {
-    try {
-      const success = await llmP.deleteOllamaModel(modelName)
-      if (success) {
-        await refreshOllamaModels()
-      }
-      return success
-    } catch (error) {
-      console.error(`Failed to delete Ollama model ${modelName}:`, error)
-      return false
-    }
-  }
-
   /**
    * 处理 Ollama 模型拉取事件
    */
@@ -1792,7 +1776,6 @@ export const useSettingsStore = defineStore('settings', () => {
     ollamaPullingModels,
     refreshOllamaModels,
     pullOllamaModel,
-    deleteOllamaModel,
     isOllamaModelRunning,
     isOllamaModelLocal,
     getOllamaPullingModels,
diff --git a/src/shared/types/presenters/legacy.presenters.d.ts b/src/shared/types/presenters/legacy.presenters.d.ts
index b18ef014a..2e3a2b5ec 100644
--- a/src/shared/types/presenters/legacy.presenters.d.ts
+++ b/src/shared/types/presenters/legacy.presenters.d.ts
@@ -682,7 +682,6 @@ export interface ILlmProviderPresenter {
   showOllamaModelInfo(modelName: string): Promise<ShowResponse>
   listOllamaRunningModels(): Promise<OllamaModel[]>
   pullOllamaModels(modelName: string): Promise<boolean>
-  deleteOllamaModel(modelName: string): Promise<boolean>
   getEmbeddings(providerId: string, modelId: string, texts: string[]): Promise<number[][]>
   getDimensions(
     providerId: string,
diff --git a/src/shared/types/presenters/llmprovider.presenter.d.ts b/src/shared/types/presenters/llmprovider.presenter.d.ts
index 84aed6d5e..fe919c987 100644
--- a/src/shared/types/presenters/llmprovider.presenter.d.ts
+++ b/src/shared/types/presenters/llmprovider.presenter.d.ts
@@ -178,7 +178,6 @@ export interface ILlmProviderPresenter {
   showOllamaModelInfo(modelName: string): Promise<ShowResponse>
   listOllamaRunningModels(): Promise<OllamaModel[]>
   pullOllamaModels(modelName: string): Promise<boolean>
-  deleteOllamaModel(modelName: string): Promise<boolean>
   getEmbeddings(providerId: string, modelId: string, texts: string[]): Promise<number[][]>
   getDimensions(
     providerId: string,

From 2bda14b7ed1a09cb7007ac3159cbe6e9a8c2df0d Mon Sep 17 00:00:00 2001
From: duskzhen <zerob13@gmail.com>
Date: Tue, 21 Oct 2025 03:43:36 -0700
Subject: [PATCH 2/2] fix(build): use es module worker format (#1037)

---
 electron.vite.config.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/electron.vite.config.ts b/electron.vite.config.ts
index 1d848bd73..2689efa7f 100644
--- a/electron.vite.config.ts
+++ b/electron.vite.config.ts
@@ -83,6 +83,9 @@ export default defineConfig({
       svgLoader(),
       vueDevTools()
     ],
+    worker: {
+      format: 'es'
+    },
     build: {
       minify: 'esbuild',
       // Ensure CSS order in build matches import order in dev