Merge branch 'main' into bugfix_1010

# Conflicts:
#	dist/copilot_web/App-BAhsLA_k.js
#	dist/copilot_web/App-CuMdgNo-.js
#	dist/copilot_web/App-D20OCP3V.js
#	dist/copilot_web/DebugResult-BeEv9QOc.js
#	dist/copilot_web/DebugResult-CJvu9_Eq.js
#	dist/copilot_web/DebugResult-CMLMZ1Zj.js
#	dist/copilot_web/WorkflowOption-BwjPcrmI.js
#	dist/copilot_web/WorkflowOption-CLWpJzah.js
#	dist/copilot_web/WorkflowOption-ChQrrvK_.js
#	dist/copilot_web/input.js
#	dist/copilot_web/workflowChat-B_fMY0j3.js
#	ui/src/components/chat/ApiKeyModal.tsx

Author: li

backend/controller/conversation_api.py

@@ -245,6 +245,7 @@ async def invoke_chat(request):
         # Workflow LLM settings (optional, used by tools/agents that need a different LLM)
         "workflow_llm_api_key": request.headers.get('Workflow-LLM-Api-Key'),
         "workflow_llm_base_url": request.headers.get('Workflow-LLM-Base-Url'),
+        "workflow_llm_model": request.headers.get('Workflow-LLM-Model'),
         "model_select": next((x['data'][0] for x in ext if x['type'] == 'model_select' and x.get('data')), None)
     }
 
@@ -514,6 +515,7 @@ async def invoke_debug(request):
         # Workflow LLM settings (optional)
         "workflow_llm_api_key": request.headers.get('Workflow-LLM-Api-Key'),
         "workflow_llm_base_url": request.headers.get('Workflow-LLM-Base-Url'),
+        "workflow_llm_model": request.headers.get('Workflow-LLM-Model'),
     }
 
     # 获取当前语言

backend/controller/llm_api.py

@@ -1,8 +1,8 @@
 '''
 Author: ai-business-hql [email protected]
 Date: 2025-07-14 16:46:20
-LastEditors: ai-business-hql qingli.hql@alibaba-inc.com
-LastEditTime: 2025-08-11 16:08:07
+LastEditors: ai-business-hql ai.bussiness.hql@gmail.com
+LastEditTime: 2025-10-15 17:17:28
 FilePath: /comfyui_copilot/backend/controller/llm_api.py
 Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 '''

backend/service/mcp_client.py

@@ -29,8 +29,7 @@
         "Detected incorrect or missing 'agents' package while loading MCP components. "
         "Please install 'openai-agents' and ensure this plugin prefers it. Commands:\n"
         "  python -m pip uninstall -y agents gym tensorflow\n"
-        "  python -m pip install -U openai-agents\n\n"
-        "Or set COMFYUI_COPILOT_PREFER_OPENAI_AGENTS=1 to prefer openai-agents without uninstalling."
+        "  python -m pip install -U openai-agents"
     )
 
 from ..agent_factory import create_agent

backend/service/workflow_rewrite_tools.py

@@ -15,8 +15,7 @@
         "Detected incorrect or missing 'agents' package while loading tools. "
         "Please install 'openai-agents' and ensure this plugin prefers it. Commands:\n"
         "  python -m pip uninstall -y agents gym tensorflow\n"
-        "  python -m pip install -U openai-agents\n\n"
-        "Or set COMFYUI_COPILOT_PREFER_OPENAI_AGENTS=1 to prefer openai-agents without uninstalling."
+        "  python -m pip install -U openai-agents\n"
     )
 from .workflow_rewrite_agent_simple import rewrite_workflow_simple
 

backend/utils/key_utils.py

@@ -1,3 +1,11 @@
+'''
+Author: ai-business-hql [email protected]
+Date: 2025-10-11 16:46:10
+LastEditors: ai-business-hql [email protected]
+LastEditTime: 2025-10-15 14:35:41
+FilePath: /ComfyUI-Copilot/backend/utils/key_utils.py
+Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+'''
 from copy import deepcopy
 
 def workflow_config_adapt(config: dict) -> dict:
@@ -17,5 +25,10 @@ def workflow_config_adapt(config: dict) -> dict:
     if new_config.get("workflow_llm_base_url"):
         new_config["openai_base_url"] = new_config.get("workflow_llm_base_url")
         new_config["workflow_llm_base_url"] = None
+    if new_config.get("workflow_llm_model"):
+        new_config["model_select"] = new_config.get("workflow_llm_model")
+        new_config["workflow_llm_model"] = None
+    else:
+        new_config["model_select"] = None
 
     return new_config

pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "ComfyUI-Copilot"
 description = "Your Intelligent Assistant for Comfy-UI."
-version = "2.0.18"
+version = "2.0.19"
 license = {file = "LICENSE"}
 
 [project.urls]

ui/src/apis/workflowChatApi.ts

@@ -2,7 +2,7 @@
  * @Author: ai-business-hql [email protected]
  * @Date: 2025-06-24 16:29:05
  * @LastEditors: ai-business-hql [email protected]
- * @LastEditTime: 2025-09-29 17:43:30
+ * @LastEditTime: 2025-10-15 14:49:15
  * @FilePath: /comfyui_copilot/ui/src/apis/workflowChatApi.ts
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -38,13 +38,15 @@ const getOpenAiConfig = () => {
     const rsaPublicKey = localStorage.getItem('rsaPublicKey');
     const workflowLLMApiKey = localStorage.getItem('workflowLLMApiKey');
     const workflowLLMBaseUrl = localStorage.getItem('workflowLLMBaseUrl');
+    const workflowLLMModel = localStorage.getItem('workflowLLMModel');
 
     return { 
         openaiApiKey: openaiApiKey || '', 
         openaiBaseUrl: openaiBaseUrl || '', 
         rsaPublicKey,
         workflowLLMApiKey: workflowLLMApiKey || '',
         workflowLLMBaseUrl: workflowLLMBaseUrl || '',
+        workflowLLMModel: workflowLLMModel || '',
     };
 };
 
@@ -145,7 +147,7 @@ export namespace WorkflowChatAPI {
     try {
       const apiKey = getApiKey();
       const browserLanguage = app.extensionManager.setting.get('Comfy.Locale');
-      const { openaiApiKey, openaiBaseUrl, rsaPublicKey, workflowLLMApiKey, workflowLLMBaseUrl } = getOpenAiConfig();
+      const { openaiApiKey, openaiBaseUrl, rsaPublicKey, workflowLLMApiKey, workflowLLMBaseUrl, workflowLLMModel } = getOpenAiConfig();
       // Generate a unique message ID for this chat request
       const messageId = generateUUID();
 
@@ -269,6 +271,9 @@ export namespace WorkflowChatAPI {
       if (workflowLLMApiKey) {
         headers['Workflow-LLM-Api-Key'] = workflowLLMApiKey;
       }
+      if (workflowLLMModel) {
+        headers['Workflow-LLM-Model'] = workflowLLMModel;
+      }
 
       // Create controller and combine with external signal if provided
       const controller = new AbortController();
@@ -600,12 +605,68 @@ export namespace WorkflowChatAPI {
     return result as { models: { label: string; name: string; image_enable: boolean }[] };
   }
 
+  // Fetch models directly from an OpenAI-compatible LLM server via its /models endpoint
+  export async function listModelsFromLLM(
+    baseUrl: string,
+    apiKey?: string
+  ): Promise<string[]> {
+    const headers: Record<string, string> = {
+      'accept': 'application/json',
+    };
+
+    if (apiKey && apiKey.trim() !== '') {
+      headers['Authorization'] = `Bearer ${apiKey}`;
+    }
+
+    // Normalize base URL to avoid double slashes
+    const normalizedBase = baseUrl.replace(/\/$/, '');
+    const url = `${normalizedBase}/models`;
+
+    const response = await fetch(url, {
+      method: 'GET',
+      headers,
+    });
+
+    if (!response.ok) {
+      throw new Error(`Failed to fetch models from LLM: ${response.status} ${response.statusText}`);
+    }
+
+    const result = await response.json();
+
+    // Attempt to support multiple possible shapes
+    // OpenAI style: { data: [{ id: string }, ...] }
+    if (Array.isArray(result?.data)) {
+      const ids = result.data
+        .map((m: any) => (typeof m === 'string' ? m : (m?.id || m?.name)))
+        .filter((v: any) => typeof v === 'string' && v.trim() !== '');
+      return Array.from(new Set(ids));
+    }
+
+    // Alternate style: { models: [{ id/name }, ...] } or [ ... ]
+    const modelsField = result?.models ?? result;
+    if (Array.isArray(modelsField)) {
+      const ids = modelsField
+        .map((m: any) => (typeof m === 'string' ? m : (m?.id || m?.name)))
+        .filter((v: any) => typeof v === 'string' && v.trim() !== '');
+      return Array.from(new Set(ids));
+    }
+
+    // Single object with id/name
+    const single = result?.id || result?.name;
+    if (typeof single === 'string' && single.trim() !== '') {
+      return [single];
+    }
+
+    // Fallback to empty list if shape is unrecognized
+    return [];
+  }
+
   export async function* streamDebugAgent(
     workflowData: any, 
     abortSignal?: AbortSignal
   ): AsyncGenerator<ChatResponse> {
     try {
-      const { openaiApiKey, openaiBaseUrl, workflowLLMApiKey, workflowLLMBaseUrl } = getOpenAiConfig();
+      const { openaiApiKey, openaiBaseUrl, workflowLLMApiKey, workflowLLMBaseUrl, workflowLLMModel } = getOpenAiConfig();
       const browserLanguage = app.extensionManager.setting.get('Comfy.Locale');
       const session_id = localStorage.getItem("sessionId") || null;
       const apiKey = getApiKey();
@@ -631,7 +692,9 @@ export namespace WorkflowChatAPI {
       if (workflowLLMApiKey) {
         headers['Workflow-LLM-Api-Key'] = workflowLLMApiKey;
       }
-      
+      if (workflowLLMModel) {
+        headers['Workflow-LLM-Model'] = workflowLLMModel;
+      }
       // Create controller and combine with external signal if provided
       const controller = new AbortController();
       const timeoutId = setTimeout(() => controller.abort(), 120000); // 2 minutes timeout