comfyui-mcp 0.52.206-beta.5 → 0.52.206

package/dist/orchestrator/index.js

@@ -109,7 +109,7 @@ import { AntigravityBackend } from "./antigravity-backend.js";
 import { PiBackend } from "./pi-backend.js";
 import { GrokBackend, GROK_DEFAULT_MODEL } from "./grok-backend.js";
 import { QwenBackend, QWEN_DEFAULT_MODEL } from "./qwen-backend.js";
-import { OllamaBackend, OLLAMA_SYSTEM_PROMPT } from "./ollama-backend.js";
+import { OllamaBackend, OLLAMA_SYSTEM_PROMPT, parseOllamaContextSetting, } from "./ollama-backend.js";
 import { ChatGptOAuthBackend, CHATGPT_DEFAULT_MODEL, resolveChatGptDefaultModel } from "./chatgpt-oauth-backend.js";
 import { pickTopClaudeModel } from "./model-defaults.js";
 import { KimiBackend } from "./kimi-backend.js";
@@ -126,7 +126,7 @@ import { handleOAuthBegin, handleOAuthStatus, handleOAuthSignout } from "./oauth
 // prompts, ack `message` fields, log lines — is read by a machine and stays English.
 import { trFor } from "../i18n/index.js";
 import { buildStartFailureNotice, startFailureSay } from "./start-failure-notice.js";
-import { readyBannerText, bannerCorrection } from "./ready-banner.js";
+import { readyBannerText, bannerCorrection, greetingLabel } from "./ready-banner.js";
 import { OAUTH_PROVIDERS } from "../services/oauth-flow.js";
 import { startPanelMcpHttpServer } from "./panel-mcp-http.js";
 import { resolveHttpLaneComfyToolMode } from "./http-backend-tools.js";
@@ -1380,9 +1380,15 @@ export async function runPanelOrchestrator() {
         ? "openai"
         : "ollama";
     let ollamaBaseUrl = process.env.COMFYUI_MCP_OLLAMA_BASE_URL ?? persistedAgent.ollama?.baseUrl;
+    // Panel Settings › Ollama › Context window. Unlike the fields above, an
+    // explicit panel choice beats COMFYUI_MCP_OLLAMA_NUM_CTX: the env var is the
+    // fallback for "auto", so a stale .env line can't lock the panel control.
+    // Read through a getter so a change applies to live sessions on the next turn.
+    let ollamaNumCtx = parseOllamaContextSetting(persistedAgent.ollama?.numCtx) ?? "auto";
     const ollamaApiKey = process.env.COMFYUI_MCP_OLLAMA_API_KEY || process.env.OPENROUTER_API_KEY;
     const ollamaDeps = () => ({
         api: ollamaApi,
+        contextSetting: () => ollamaNumCtx,
         ...(ollamaBaseUrl ? { host: ollamaBaseUrl } : {}),
         ...(ollamaApi === "openai" && ollamaApiKey ? { apiKey: ollamaApiKey } : {}),
     });
@@ -1486,6 +1492,7 @@ export async function runPanelOrchestrator() {
     // The SDK-resolved model per tab, learned from the session/init event. Kept so a
     // greeting emitted AFTER the model is already known (the onSession-before-greeting
     // race) can label itself correctly instead of showing the pre-init default.
+    // Tagged with the backend that resolved it: the entry survives a backend switch.
     const resolvedModelByTab = new Map();
     const headlessTabs = new Set(); // tabs with no ComfyUI canvas (mobile/remote) — deliver renders in-turn
     // The UUID stamped on the NEXT panel command for a tab — the per-workflow
@@ -2497,7 +2504,7 @@ export async function runPanelOrchestrator() {
             // Banner corrections are "say" frames (mirror-safe) — viewers via mirror.
             for (const panelTab of conversationDeliveryTabs(key, "say")) {
                 if (typeof model === "string" && model.trim())
-                    resolvedModelByTab.set(panelTab, model);
+                    resolvedModelByTab.set(panelTab, { backend: backendForTab(panelTab), model });
                 const corrected = bannerCorrection({
                     backend: backendForTab(panelTab),
                     advertisedLabel: advertisedBannerModel.get(panelTab),
@@ -4277,7 +4284,7 @@ export async function runPanelOrchestrator() {
                         // greeting (#376) — otherwise the pre-init label. Remember what we
                         // advertised so the onSession correction re-sends only on a real
                         // mismatch.
-                        const bannerLabel = resolvedModelByTab.get(panelTab) ?? agentLabel;
+                        const bannerLabel = greetingLabel(resolvedModelByTab.get(panelTab), backend, agentLabel);
                         advertisedBannerModel.set(panelTab, bannerLabel);
                         bridge.push({ type: "say", text: readyBannerText(backend, bannerLabel, customBaseUrl) }, panelTab);
                     }
@@ -4560,6 +4567,14 @@ export async function runPanelOrchestrator() {
                         ollamaBaseUrl = nb;
                     }
                 }
+                const nc = parseOllamaContextSetting(o.num_ctx);
+                if (nc !== undefined) {
+                    patch.numCtx = nc;
+                    if (nc !== ollamaNumCtx) {
+                        changed = true;
+                        ollamaNumCtx = nc;
+                    }
+                }
                 if (Object.keys(patch).length && changed) {
                     setAgentSettings({ ollama: patch });
                     ollamaChanged = true;
@@ -4569,7 +4584,7 @@ export async function runPanelOrchestrator() {
                     if (pb?.close)
                         void pb.close().catch(() => { });
                     probeBackends.delete("ollama");
-                    logger.info(`[panel-orchestrator] ollama config → model=${ollamaModel} api=${ollamaApi} host=${ollamaBaseUrl ?? "(default)"}`);
+                    logger.info(`[panel-orchestrator] ollama config → model=${ollamaModel} api=${ollamaApi} host=${ollamaBaseUrl ?? "(default)"} num_ctx=${ollamaNumCtx}`);
                 }
             }
             const lccfg = event.llamacpp;