feat: Optimize the Ollama configuration workflow (#12063)

Author: zhengkunwang223

agent/app/service/agents.go

@@ -1755,6 +1755,7 @@ func writeOpenclawConfig(confDir, provider, modelName, apiType string, maxTokens
 	} else if provider == "ollama" {
 		cfg.Agents.Defaults.Model.Primary = modelName
 		useAPIType, _, _ := resolveRuntimeParams(provider, apiType, maxTokens, contextWindow)
+		reasoning := useAPIType != "openai-completions"
 		cfg.Models = &modelsConfig{
 			Mode: "merge",
 			Providers: map[string]modelProvider{
@@ -1766,7 +1767,7 @@ func writeOpenclawConfig(confDir, provider, modelName, apiType string, maxTokens
 						{
 							ID:            modelID,
 							Name:          modelID,
-							Reasoning:     true,
+							Reasoning:     reasoning,
 							Input:         []string{"text"},
 							ContextWindow: 160000,
 							MaxTokens:     8192,

frontend/src/views/ai/agents/agent/config/tabs/model.vue

@@ -11,7 +11,10 @@
             </el-checkbox>
         </el-form-item>
         <el-form-item :label="t('aiTools.model.model')" prop="model">
-            <el-input v-if="form.manualModel" v-model="form.model" />
+            <el-input v-if="form.manualModel && isOllamaProvider" v-model="ollamaModelSuffix">
+                <template #prepend>ollama/</template>
+            </el-input>
+            <el-input v-else-if="form.manualModel" v-model="form.model" />
             <el-select v-else v-model="form.model" filterable>
                 <el-option v-for="item in modelOptions" :key="item.id" :label="item.name" :value="item.id" />
             </el-select>
@@ -25,7 +28,7 @@
 </template>
 
 <script setup lang="ts">
-import { reactive, ref } from 'vue';
+import { computed, reactive, ref } from 'vue';
 import type { FormInstance } from 'element-plus';
 import { useI18n } from 'vue-i18n';
 import { AI } from '@/api/interface/ai';
@@ -52,6 +55,21 @@ const form = reactive({
     model: '',
 });
 
+const isOllamaProvider = computed(() => provdier.value === 'ollama');
+
+const ollamaModelSuffix = computed({
+    get: () => {
+        const model = form.model || '';
+        if (model.startsWith('ollama/')) {
+            return model.slice('ollama/'.length);
+        }
+        return model;
+    },
+    set: (value: string) => {
+        form.model = `ollama/${value || ''}`;
+    },
+});
+
 const rules = reactive({
     accountId: [Rules.requiredSelect],
     model: [Rules.requiredInput],
@@ -97,6 +115,14 @@ const handleAccountChange = () => {
         modelOptions.value = [];
         return;
     }
+    if (selected.provider === 'ollama') {
+        form.manualModel = true;
+        if (!form.model.startsWith('ollama/')) {
+            form.model = 'ollama/';
+        }
+        setModelsByProvider(selected.provider);
+        return;
+    }
     setModelsByProvider(selected.provider);
     if (!form.manualModel && (!form.model || !form.model.startsWith(`${selected.provider}/`))) {
         form.model = modelOptions.value.length > 0 ? modelOptions.value[0].id : '';
@@ -109,6 +135,9 @@ const handleManualModelChange = (val: unknown) => {
         form.manualModel = true;
         return;
     }
+    if (selected?.provider === 'ollama' && Boolean(val) && !form.model.startsWith('ollama/')) {
+        form.model = 'ollama/';
+    }
     if (Boolean(val)) {
         return;
     }
@@ -136,9 +165,11 @@ const load = async (agent: AI.AgentItem) => {
         const currentAccount =
             accountOptions.value.find((item) => item.id === agent.accountId) || accountOptions.value[0];
         form.accountId = currentAccount.id;
+        provdier.value = currentAccount.provider;
         setModelsByProvider(currentAccount.provider);
         const inProviderModels = modelOptions.value.some((item) => item.id === agent.model);
-        form.manualModel = currentAccount.provider === 'custom' || !inProviderModels;
+        form.manualModel =
+            currentAccount.provider === 'custom' || currentAccount.provider === 'ollama' || !inProviderModels;
         if (agent.model && (form.manualModel || agent.model.startsWith(`${currentAccount.provider}/`))) {
             form.model = agent.model;
         } else {
@@ -147,6 +178,9 @@ const load = async (agent: AI.AgentItem) => {
         if (currentAccount.provider === 'custom' && currentAccount.model && !form.model) {
             form.model = currentAccount.model;
         }
+        if (currentAccount.provider === 'ollama' && !form.model.startsWith('ollama/')) {
+            form.model = 'ollama/';
+        }
     } finally {
         loading.value = false;
     }