@backtest-kit/ollama 14.1.0 → 15.1.0

package/build/index.mjs

@@ -1,9 +1,9 @@
 import { event, validateToolArguments, RoundRobin, addCompletion } from 'agent-swarm-kit';
 import { scoped } from 'di-scoped';
-import path, { join } from 'path';
+import path, { join, isAbsolute } from 'path';
 import { createRequire } from 'module';
 import { createActivator } from 'di-kit';
-import { memoize, ToolRegistry, Subject, trycatch, errorData, getErrorMessage, iterateDocuments, distinctDocuments, resolveDocuments, singleshot, randomString, fetchApi, str, timeout } from 'functools-kit';
+import { memoize, ToolRegistry, Subject, trycatch, errorData, getErrorMessage, iterateDocuments, distinctDocuments, resolveDocuments, randomString, fetchApi, singleshot, str, timeout } from 'functools-kit';
 import { MarkdownWriter, getSymbol, getContext, getMode } from 'backtest-kit';
 import MarkdownIt from 'markdown-it';
 import sanitizeHtml from 'sanitize-html';
@@ -294,7 +294,9 @@ const TYPES = {
     ...publicServices$1,
 };
 
-const PROMPT_TYPE_SYMBOL = Symbol("prompt-type");
+// Symbol.for keeps the brand check working when CJS and ESM copies of the
+// package end up in the same process (dual-package hazard).
+const PROMPT_TYPE_SYMBOL = Symbol.for("backtest-kit.ollama.prompt-type");
 class Prompt {
     constructor(source) {
         this.source = source;
@@ -314,7 +316,7 @@ Prompt.isPrompt = (value) => {
 };
 
 const require = createRequire(import.meta.url);
-const REQUIRE_MODULE_FN = memoize(([module]) => module, (module) => {
+const REQUIRE_MODULE_FN = memoize(([module]) => join(module.baseDir, module.path), (module) => {
     const modulePath = require.resolve(join(module.baseDir, module.path));
     return require(modulePath);
 });
@@ -334,7 +336,8 @@ class PromptCacheService {
                 module,
             });
             if (module) {
-                REQUIRE_MODULE_FN.clear(module);
+                REQUIRE_MODULE_FN.clear(join(module.baseDir, module.path));
+                return;
             }
             REQUIRE_MODULE_FN.clear();
         };
@@ -895,6 +898,13 @@ const toPlainString = async (content) => {
         typographer: true,
     });
     let telegramHtml = md.render(markdown);
+    // sanitize-html transformTags cannot insert text content, so list markers
+    // are injected into the HTML as text before sanitizing.
+    telegramHtml = telegramHtml.replace(/<ol[^>]*>[\s\S]*?<\/ol>/g, (block) => {
+        let counter = 0;
+        return block.replace(/<li>/g, () => `<li>${++counter}. `);
+    });
+    telegramHtml = telegramHtml.replace(/<li>(?!\d+\. )/g, "<li>• ");
     telegramHtml = sanitizeHtml(telegramHtml, {
         allowedTags: [
             "b",
@@ -923,7 +933,7 @@ const toPlainString = async (content) => {
             em: "",
             p: () => "",
             ul: () => "",
-            li: () => "• ",
+            li: () => "",
             ol: () => "",
             hr: () => "\n",
             br: () => "\n",
@@ -1192,6 +1202,10 @@ class OptimizerTemplateService {
                 ``,
                 `        await dumpJson(resultId, messages, result);`,
                 ``,
+                `        if (result.position === "wait") {`,
+                `            return null;`,
+                `        }`,
+                ``,
                 `        result.id = resultId;`,
                 ``,
                 `        return result;`,
@@ -1878,8 +1892,9 @@ const GET_STRATEGY_DATA_FN = async (symbol, self) => {
     const strategyList = [];
     const totalSources = self.params.rangeTrain.length * self.params.source.length;
     let processedSources = 0;
-    for (const { startDate, endDate } of self.params.rangeTrain) {
+    for (const { note, startDate, endDate } of self.params.rangeTrain) {
         const messageList = [];
+        const sourceNames = [];
         for (const source of self.params.source) {
             // Emit progress event at the start of processing each source
             await self.onProgress({
@@ -1907,6 +1922,7 @@ const GET_STRATEGY_DATA_FN = async (symbol, self) => {
                     role: "assistant",
                     content: assistantContent,
                 });
+                sourceNames.push(DEFAULT_SOURCE_NAME);
                 processedSources++;
             }
             else {
@@ -1928,18 +1944,19 @@ const GET_STRATEGY_DATA_FN = async (symbol, self) => {
                     role: "assistant",
                     content: assistantContent,
                 });
+                sourceNames.push(name || DEFAULT_SOURCE_NAME);
                 processedSources++;
             }
-            const name = "name" in source
-                ? source.name || DEFAULT_SOURCE_NAME
-                : DEFAULT_SOURCE_NAME;
-            strategyList.push({
-                symbol,
-                name,
-                messages: messageList,
-                strategy: await self.params.getPrompt(symbol, messageList),
-            });
         }
+        // One strategy per training range: getPrompt receives the complete
+        // conversation history with all sources (see IOptimizerSchema.getPrompt).
+        // Messages are snapshotted so later ranges cannot mutate this strategy.
+        strategyList.push({
+            symbol,
+            name: note || sourceNames.join("+") || DEFAULT_SOURCE_NAME,
+            messages: [...messageList],
+            strategy: await self.params.getPrompt(symbol, messageList),
+        });
     }
     // Emit final progress event (100%)
     await self.onProgress({
@@ -2045,7 +2062,7 @@ const GET_STRATEGY_CODE_FN = async (symbol, self) => {
 const GET_STRATEGY_DUMP_FN = async (symbol, path, self) => {
     const report = await self.getCode(symbol);
     try {
-        const dir = join(process.cwd(), path);
+        const dir = isAbsolute(path) ? path : join(process.cwd(), path);
         await mkdir(dir, { recursive: true });
         const filename = `${self.params.optimizerName}_${symbol}.mjs`;
         const filepath = join(dir, filename);
@@ -2435,17 +2452,17 @@ var InferenceName$1 = InferenceName;
  * });
  * ```
  */
-const getGrok = singleshot(() => {
+const GET_CLIENT_FN$9 = memoize(([apiKey]) => `${apiKey}`, (apiKey) => new OpenAI({
+    baseURL: "https://api.x.ai/v1",
+    apiKey,
+}));
+const getGrok = () => {
     const apiKey = engine$1.contextService.context.apiKey;
     if (Array.isArray(apiKey)) {
-        getGrok.clear();
         throw new Error("Grok provider does not support token rotation");
     }
-    return new OpenAI({
-        baseURL: "https://api.x.ai/v1",
-        apiKey: apiKey,
-    });
-});
+    return GET_CLIENT_FN$9(apiKey);
+};
 
 /**
  * Global configuration parameters for the Ollama package.
@@ -2581,7 +2598,7 @@ class GrokProvider {
             },
         });
         const result = {
-            content: content,
+            content: content ?? "",
             mode,
             agentName,
             role,
@@ -2741,8 +2758,8 @@ class GrokProvider {
                 Authorization: `Bearer ${this.contextService.context.apiKey}`,
             },
             body: JSON.stringify({
+                model: this.contextService.context.model,
                 messages,
-                context: this.contextService.context,
                 max_tokens: 5000,
                 response_format: format,
             }),
@@ -3128,7 +3145,12 @@ class HfProvider {
                         continue;
                     }
                     set(validation.data, "_thinking", reasoning_content);
-                    set(validation.data, "_context", this.contextService.context);
+                    {
+                        // apiKey must never reach the outline result: it gets dumped to
+                        // markdown files and forwarded to downstream consumers.
+                        const { inference, model } = this.contextService.context;
+                        set(validation.data, "_context", { inference, model });
+                    }
                     const result = {
                         role: "assistant",
                         content: JSON.stringify(validation.data),
@@ -3163,10 +3185,12 @@ class HfProvider {
  * @throws Error if no API keys are provided in context
  */
 class OllamaWrapper {
-    constructor(_config) {
+    constructor(_config, apiKeys) {
         this._config = _config;
-        /** Round-robin chat function factory */
-        this._chatFn = RoundRobin.create(engine$1.contextService.context.apiKey, (token) => {
+        if (!apiKeys?.length) {
+            throw new Error("OllamaRotate required apiKey[] to process token rotation");
+        }
+        this._chatFn = RoundRobin.create(apiKeys, (token) => {
             const ollama = new Ollama({
                 ...this._config,
                 headers: {
@@ -3182,9 +3206,6 @@ class OllamaWrapper {
                 }
             };
         });
-        if (!engine$1.contextService.context.apiKey) {
-            throw new Error("OllamaRotate required apiKey[] to process token rotation");
-        }
     }
     /**
      * Executes a chat request with automatic token rotation.
@@ -3217,10 +3238,28 @@ class OllamaWrapper {
  * // Next request will use a different API key
  * ```
  */
-const getOllamaRotate = singleshot(() => new OllamaWrapper({
+const GET_WRAPPER_FN = memoize(([apiKeys]) => apiKeys.join(","), (apiKeys) => new OllamaWrapper({
     host: "https://ollama.com",
-}));
+}, apiKeys));
+const getOllamaRotate = () => {
+    const apiKey = engine$1.contextService.context.apiKey;
+    if (!Array.isArray(apiKey)) {
+        throw new Error("OllamaRotate required apiKey[] to process token rotation");
+    }
+    return GET_WRAPPER_FN(apiKey);
+};
 
+const GET_CLIENT_FN$8 = memoize(([apiKey]) => `${apiKey ?? ""}`, (apiKey) => {
+    if (!apiKey) {
+        return new Ollama();
+    }
+    return new Ollama({
+        host: "https://ollama.com",
+        headers: {
+            Authorization: `Bearer ${apiKey}`,
+        },
+    });
+});
 /**
  * Creates and caches an Ollama client with flexible configuration.
  *
@@ -3266,21 +3305,13 @@ const getOllamaRotate = singleshot(() => new OllamaWrapper({
  * });
  * ```
  */
-const getOllama = singleshot(() => {
+const getOllama = () => {
     const apiKey = engine$1.contextService.context.apiKey;
     if (Array.isArray(apiKey)) {
         return getOllamaRotate();
     }
-    if (!apiKey) {
-        return new Ollama();
-    }
-    return new Ollama({
-        host: "https://ollama.com",
-        headers: {
-            Authorization: `Bearer ${apiKey}`,
-        },
-    });
-});
+    return GET_CLIENT_FN$8(apiKey);
+};
 
 /**
  * Maximum number of retry attempts for outline completion when model fails to use tools correctly.
@@ -3614,7 +3645,12 @@ class OllamaProvider {
                         attempt++;
                         continue;
                     }
-                    set(validation.data, "_context", this.contextService.context);
+                    {
+                        // apiKey must never reach the outline result: it gets dumped to
+                        // markdown files and forwarded to downstream consumers.
+                        const { inference, model } = this.contextService.context;
+                        set(validation.data, "_context", { inference, model });
+                    }
                     const result = {
                         role: "assistant",
                         content: JSON.stringify(validation.data),
@@ -3633,6 +3669,10 @@ class OllamaProvider {
     }
 }
 
+const GET_CLIENT_FN$7 = memoize(([apiKey]) => `${apiKey}`, (apiKey) => new OpenAI({
+    baseURL: "https://api.anthropic.com/v1/",
+    apiKey,
+}));
 /**
  * Creates and caches an OpenAI-compatible client for Claude (Anthropic) API.
  *
@@ -3660,17 +3700,13 @@ class OllamaProvider {
  * });
  * ```
  */
-const getClaude = singleshot(() => {
+const getClaude = () => {
     const apiKey = engine$1.contextService.context.apiKey;
     if (Array.isArray(apiKey)) {
-        getClaude.clear();
         throw new Error("Claude provider does not support token rotation");
     }
-    return new OpenAI({
-        baseURL: "https://api.anthropic.com/v1/",
-        apiKey,
-    });
-});
+    return GET_CLIENT_FN$7(apiKey);
+};
 
 /**
  * Maximum number of retry attempts for outline completion when model fails to use tools correctly.
@@ -3773,7 +3809,7 @@ class ClaudeProvider {
         }
         const { choices: [{ message: { content, role, tool_calls }, },], } = await claude.chat.completions.create(requestOptions);
         const result = {
-            content: content,
+            content: content ?? "",
             mode,
             agentName,
             role,
@@ -3854,7 +3890,7 @@ class ClaudeProvider {
         };
         // Debug logging
         if (GLOBAL_CONFIG.CC_ENABLE_DEBUG) {
-            await fs.appendFile("./debug_gpt5_provider_stream.txt", JSON.stringify({ params, answer: result }, null, 2) + "\n\n");
+            await fs.appendFile("./debug_claude_provider_stream.txt", JSON.stringify({ params, answer: result }, null, 2) + "\n\n");
         }
         return result;
     }
@@ -3957,7 +3993,12 @@ class ClaudeProvider {
                         attempt++;
                         continue;
                     }
-                    set(validation.data, "_context", this.contextService.context);
+                    {
+                        // apiKey must never reach the outline result: it gets dumped to
+                        // markdown files and forwarded to downstream consumers.
+                        const { inference, model } = this.contextService.context;
+                        set(validation.data, "_context", { inference, model });
+                    }
                     const result = {
                         role: "assistant",
                         content: JSON.stringify(validation.data),
@@ -3976,6 +4017,9 @@ class ClaudeProvider {
     }
 }
 
+const GET_CLIENT_FN$6 = memoize(([apiKey]) => `${apiKey}`, (apiKey) => new OpenAI({
+    apiKey,
+}));
 /**
  * Creates and caches an OpenAI client for OpenAI API.
  *
@@ -4003,16 +4047,13 @@ class ClaudeProvider {
  * });
  * ```
  */
-const getOpenAi = singleshot(() => {
+const getOpenAi = () => {
     const apiKey = engine$1.contextService.context.apiKey;
     if (Array.isArray(apiKey)) {
-        getOpenAi.clear();
         throw new Error("OpenAI provider does not support token rotation");
     }
-    return new OpenAI({
-        apiKey: apiKey,
-    });
-});
+    return GET_CLIENT_FN$6(apiKey);
+};
 
 /**
  * Provider for OpenAI GPT models (GPT-4, GPT-4 Turbo, GPT-3.5, etc.).
@@ -4129,7 +4170,7 @@ class GPT5Provider {
             tools: tools,
         });
         const result = {
-            content: content,
+            content: content ?? "",
             mode,
             agentName,
             role,
@@ -4354,17 +4395,17 @@ class GPT5Provider {
  * });
  * ```
  */
-const getDeepseek = singleshot(() => {
+const GET_CLIENT_FN$5 = memoize(([apiKey]) => `${apiKey}`, (apiKey) => new OpenAI({
+    baseURL: "https://api.deepseek.com",
+    apiKey,
+}));
+const getDeepseek = () => {
     const apiKey = engine$1.contextService.context.apiKey;
     if (Array.isArray(apiKey)) {
-        getDeepseek.clear();
         throw new Error("Deepseek provider does not support token rotation");
     }
-    return new OpenAI({
-        baseURL: "https://api.deepseek.com",
-        apiKey: apiKey,
-    });
-});
+    return GET_CLIENT_FN$5(apiKey);
+};
 
 /**
  * Maximum number of retry attempts for outline completion.
@@ -4447,7 +4488,7 @@ class DeepseekProvider {
             tools: formattedTools?.length ? formattedTools : undefined,
         });
         const result = {
-            content: content,
+            content: content ?? "",
             mode,
             agentName,
             role,
@@ -4630,7 +4671,12 @@ class DeepseekProvider {
                         attempt++;
                         continue;
                     }
-                    set(validation.data, "_context", this.contextService.context);
+                    {
+                        // apiKey must never reach the outline result: it gets dumped to
+                        // markdown files and forwarded to downstream consumers.
+                        const { inference, model } = this.contextService.context;
+                        set(validation.data, "_context", { inference, model });
+                    }
                     const result = {
                         role: "assistant",
                         content: JSON.stringify(validation.data),
@@ -4676,17 +4722,17 @@ class DeepseekProvider {
  * });
  * ```
  */
-const getMistral = singleshot(() => {
+const GET_CLIENT_FN$4 = memoize(([apiKey]) => `${apiKey}`, (apiKey) => new OpenAI({
+    baseURL: "https://api.mistral.ai/v1",
+    apiKey,
+}));
+const getMistral = () => {
     const apiKey = engine$1.contextService.context.apiKey;
     if (Array.isArray(apiKey)) {
-        getMistral.clear();
         throw new Error("Mistral provider does not support token rotation");
     }
-    return new OpenAI({
-        baseURL: "https://api.mistral.ai/v1",
-        apiKey: apiKey,
-    });
-});
+    return GET_CLIENT_FN$4(apiKey);
+};
 
 /**
  * Maximum number of retry attempts for outline completion.
@@ -4769,7 +4815,7 @@ class MistralProvider {
             tools: formattedTools?.length ? formattedTools : undefined,
         });
         const result = {
-            content: content,
+            content: content ?? "",
             mode,
             agentName,
             role,
@@ -4952,7 +4998,12 @@ class MistralProvider {
                         attempt++;
                         continue;
                     }
-                    set(validation.data, "_context", this.contextService.context);
+                    {
+                        // apiKey must never reach the outline result: it gets dumped to
+                        // markdown files and forwarded to downstream consumers.
+                        const { inference, model } = this.contextService.context;
+                        set(validation.data, "_context", { inference, model });
+                    }
                     const result = {
                         role: "assistant",
                         content: JSON.stringify(validation.data),
@@ -4998,17 +5049,17 @@ class MistralProvider {
  * });
  * ```
  */
-const getPerplexity = singleshot(() => {
+const GET_CLIENT_FN$3 = memoize(([apiKey]) => `${apiKey}`, (apiKey) => new OpenAI({
+    baseURL: "https://api.perplexity.ai",
+    apiKey,
+}));
+const getPerplexity = () => {
     const apiKey = engine$1.contextService.context.apiKey;
     if (Array.isArray(apiKey)) {
-        getPerplexity.clear();
         throw new Error("Perplexity provider does not support token rotation");
     }
-    return new OpenAI({
-        baseURL: "https://api.perplexity.ai",
-        apiKey: apiKey,
-    });
-});
+    return GET_CLIENT_FN$3(apiKey);
+};
 
 /**
  * Provider for Perplexity AI models via OpenAI-compatible API.
@@ -5124,7 +5175,7 @@ class PerplexityProvider {
         });
         const { choices: [{ message: { content, role, tool_calls }, },], } = result;
         const finalResult = {
-            content: content,
+            content: content ?? "",
             mode,
             agentName,
             role,
@@ -5251,6 +5302,10 @@ class PerplexityProvider {
     }
 }
 
+const GET_CLIENT_FN$2 = memoize(([apiKey]) => `${apiKey}`, (apiKey) => new OpenAI({
+    baseURL: "https://api.cohere.ai/compatibility/v1",
+    apiKey,
+}));
 /**
  * Creates and caches an OpenAI-compatible client for Cohere API.
  *
@@ -5278,17 +5333,13 @@ class PerplexityProvider {
  * });
  * ```
  */
-const getCohere = singleshot(() => {
+const getCohere = () => {
     const apiKey = engine$1.contextService.context.apiKey;
     if (Array.isArray(apiKey)) {
-        getCohere.clear();
         throw new Error("Cohere provider does not support token rotation");
     }
-    return new OpenAI({
-        baseURL: "https://api.cohere.ai/compatibility/v1",
-        apiKey: apiKey,
-    });
-});
+    return GET_CLIENT_FN$2(apiKey);
+};
 
 /**
  * Provider for Cohere AI models via OpenAI-compatible API.
@@ -5398,7 +5449,7 @@ class CohereProvider {
         });
         const { choices: [{ message: { content, role, tool_calls }, },], } = result;
         const finalResult = {
-            content: content,
+            content: content ?? "",
             mode,
             agentName,
             role,
@@ -5678,7 +5729,7 @@ class AlibabaProvider {
         });
         const { choices: [{ message: { content, role, tool_calls }, },], } = responseData;
         const result = {
-            content: content,
+            content: content ?? "",
             mode,
             agentName,
             role,
@@ -5759,7 +5810,7 @@ class AlibabaProvider {
             });
         }
         const result = {
-            content: content,
+            content: content ?? "",
             mode,
             agentName,
             role,
@@ -5887,7 +5938,12 @@ class AlibabaProvider {
                         attempt++;
                         continue;
                     }
-                    set(validation.data, "_context", this.contextService.context);
+                    {
+                        // apiKey must never reach the outline result: it gets dumped to
+                        // markdown files and forwarded to downstream consumers.
+                        const { inference, model } = this.contextService.context;
+                        set(validation.data, "_context", { inference, model });
+                    }
                     const result = {
                         role: "assistant",
                         content: JSON.stringify(validation.data),
@@ -5906,6 +5962,10 @@ class AlibabaProvider {
     }
 }
 
+const GET_CLIENT_FN$1 = memoize(([apiKey]) => `${apiKey}`, (apiKey) => new OpenAI({
+    apiKey,
+    baseURL: "https://api.z.ai/api/paas/v4/",
+}));
 /**
  * Creates and caches an OpenAI-compatible client for Z.ai GLM-4 API.
  *
@@ -5948,17 +6008,13 @@ class AlibabaProvider {
  * });
  * ```
  */
-const getZAi = singleshot(() => {
+const getZAi = () => {
     const apiKey = engine$1.contextService.context.apiKey;
     if (Array.isArray(apiKey)) {
-        getZAi.clear();
         throw new Error("Z.ai provider does not support token rotation");
     }
-    return new OpenAI({
-        apiKey,
-        baseURL: "https://api.z.ai/api/paas/v4/"
-    });
-});
+    return GET_CLIENT_FN$1(apiKey);
+};
 
 /**
  * GLM-4 provider implementation for Z.ai API integration.
@@ -6090,7 +6146,7 @@ class GLM4Provider {
             tools: tools,
         });
         const result = {
-            content: content,
+            content: content ?? "",
             mode,
             agentName,
             role,
@@ -6324,16 +6380,16 @@ class GLM4Provider {
  * });
  * ```
  */
-const getGroq = singleshot(() => {
+const GET_CLIENT_FN = memoize(([apiKey]) => `${apiKey}`, (apiKey) => new Groq({
+    apiKey,
+}));
+const getGroq = () => {
     const apiKey = engine$1.contextService.context.apiKey;
     if (Array.isArray(apiKey)) {
-        getGroq.clear();
         throw new Error("Groq provider does not support token rotation");
     }
-    return new Groq({
-        apiKey: apiKey,
-    });
-});
+    return GET_CLIENT_FN(apiKey);
+};
 
 /**
  * Maximum number of retry attempts for outline completion.
@@ -6416,7 +6472,7 @@ class GroqProvider {
             tools: formattedTools?.length ? formattedTools : undefined,
         });
         const result = {
-            content: content,
+            content: content ?? "",
             mode,
             agentName,
             role,
@@ -6594,7 +6650,12 @@ class GroqProvider {
                         attempt++;
                         continue;
                     }
-                    set(validation.data, "_context", this.contextService.context);
+                    {
+                        // apiKey must never reach the outline result: it gets dumped to
+                        // markdown files and forwarded to downstream consumers.
+                        const { inference, model } = this.contextService.context;
+                        set(validation.data, "_context", { inference, model });
+                    }
                     const result = {
                         role: "assistant",
                         content: JSON.stringify(validation.data),
@@ -6814,7 +6875,7 @@ addCompletion({
     getCompletion: async (params) => {
         const result = await LOCAL_RUNNER_FN$1(params);
         if (typeof result === "symbol") {
-            throw new Error(`${CompletionName.RunnerCompletion} inference timeout`);
+            throw new Error(`${CompletionName.RunnerStreamCompletion} inference timeout`);
         }
         return result;
     },
@@ -6882,7 +6943,7 @@ addCompletion({
  * ```
  */
 const ollama = (fn, model, apiKey) => {
-    const wrappedFn = async (args) => {
+    const wrappedFn = async (...args) => {
         return await ContextService.runInContext(async () => {
             return await fn(...args);
         }, {
@@ -6914,7 +6975,7 @@ const ollama = (fn, model, apiKey) => {
  * ```
  */
 const grok = (fn, model, apiKey) => {
-    const wrappedFn = async (args) => {
+    const wrappedFn = async (...args) => {
         return await ContextService.runInContext(async () => {
             return await fn(...args);
         }, {
@@ -6946,7 +7007,7 @@ const grok = (fn, model, apiKey) => {
  * ```
  */
 const hf = (fn, model, apiKey) => {
-    const wrappedFn = async (args) => {
+    const wrappedFn = async (...args) => {
         return await ContextService.runInContext(async () => {
             return await fn(...args);
         }, {
@@ -6978,7 +7039,7 @@ const hf = (fn, model, apiKey) => {
  * ```
  */
 const claude = (fn, model, apiKey) => {
-    const wrappedFn = async (args) => {
+    const wrappedFn = async (...args) => {
         return await ContextService.runInContext(async () => {
             return await fn(...args);
         }, {
@@ -7010,7 +7071,7 @@ const claude = (fn, model, apiKey) => {
  * ```
  */
 const gpt5 = (fn, model, apiKey) => {
-    const wrappedFn = async (args) => {
+    const wrappedFn = async (...args) => {
         return await ContextService.runInContext(async () => {
             return await fn(...args);
         }, {
@@ -7042,7 +7103,7 @@ const gpt5 = (fn, model, apiKey) => {
  * ```
  */
 const deepseek = (fn, model, apiKey) => {
-    const wrappedFn = async (args) => {
+    const wrappedFn = async (...args) => {
         return await ContextService.runInContext(async () => {
             return await fn(...args);
         }, {
@@ -7074,7 +7135,7 @@ const deepseek = (fn, model, apiKey) => {
  * ```
  */
 const mistral = (fn, model, apiKey) => {
-    const wrappedFn = async (args) => {
+    const wrappedFn = async (...args) => {
         return await ContextService.runInContext(async () => {
             return await fn(...args);
         }, {
@@ -7106,7 +7167,7 @@ const mistral = (fn, model, apiKey) => {
  * ```
  */
 const perplexity = (fn, model, apiKey) => {
-    const wrappedFn = async (args) => {
+    const wrappedFn = async (...args) => {
         return await ContextService.runInContext(async () => {
             return await fn(...args);
         }, {
@@ -7138,7 +7199,7 @@ const perplexity = (fn, model, apiKey) => {
  * ```
  */
 const cohere = (fn, model, apiKey) => {
-    const wrappedFn = async (args) => {
+    const wrappedFn = async (...args) => {
         return await ContextService.runInContext(async () => {
             return await fn(...args);
         }, {
@@ -7170,7 +7231,7 @@ const cohere = (fn, model, apiKey) => {
  * ```
  */
 const alibaba = (fn, model, apiKey) => {
-    const wrappedFn = async (args) => {
+    const wrappedFn = async (...args) => {
         return await ContextService.runInContext(async () => {
             return await fn(...args);
         }, {
@@ -7181,26 +7242,6 @@ const alibaba = (fn, model, apiKey) => {
     };
     return wrappedFn;
 };
-/**
- * Wrap async function with Zhipu AI GLM-4 inference context.
- *
- * Creates a higher-order function that executes the provided async function
- * within a Zhipu AI GLM-4 inference context via OpenAI-compatible Z.ai API.
- *
- * @template T - Async function type
- * @param fn - Async function to wrap
- * @param model - GLM-4 model name (e.g., "glm-4-plus", "glm-4-air")
- * @param apiKey - Single API key or array of keys
- * @returns Wrapped function with same signature as input
- *
- * @example
- * ```typescript
- * import { glm4 } from '@backtest-kit/ollama';
- *
- * const wrappedFn = glm4(myAsyncFn, 'glm-4-plus', process.env.ZAI_API_KEY);
- * const result = await wrappedFn(args);
- * ```
- */
 /**
  * Wrap async function with Groq inference context.
  *
@@ -7222,7 +7263,7 @@ const alibaba = (fn, model, apiKey) => {
  * ```
  */
 const groq = (fn, model, apiKey) => {
-    const wrappedFn = async (args) => {
+    const wrappedFn = async (...args) => {
         return await ContextService.runInContext(async () => {
             return await fn(...args);
         }, {
@@ -7233,8 +7274,28 @@ const groq = (fn, model, apiKey) => {
     };
     return wrappedFn;
 };
+/**
+ * Wrap async function with Zhipu AI GLM-4 inference context.
+ *
+ * Creates a higher-order function that executes the provided async function
+ * within a Zhipu AI GLM-4 inference context via OpenAI-compatible Z.ai API.
+ *
+ * @template T - Async function type
+ * @param fn - Async function to wrap
+ * @param model - GLM-4 model name (e.g., "glm-4-plus", "glm-4-air")
+ * @param apiKey - Single API key or array of keys
+ * @returns Wrapped function with same signature as input
+ *
+ * @example
+ * ```typescript
+ * import { glm4 } from '@backtest-kit/ollama';
+ *
+ * const wrappedFn = glm4(myAsyncFn, 'glm-4-plus', process.env.ZAI_API_KEY);
+ * const result = await wrappedFn(args);
+ * ```
+ */
 const glm4 = (fn, model, apiKey) => {
-    const wrappedFn = async (args) => {
+    const wrappedFn = async (...args) => {
         return await ContextService.runInContext(async () => {
             return await fn(...args);
         }, {
@@ -7287,7 +7348,8 @@ const DUMP_SIGNAL_METHOD_NAME = "dump.dumpSignal";
  *
  * @example
  * ```typescript
- * import { dumpSignal, getCandles } from "backtest-kit";
+ * import { getCandles } from "backtest-kit";
+ * import { dumpSignal } from "@backtest-kit/ollama";
  * import { v4 as uuid } from "uuid";
  *
  * addStrategy({
@@ -7434,7 +7496,9 @@ async function validate(args = {}) {
     return await validateInternal(args);
 }
 
-const MODULE_TYPE_SYMBOL = Symbol("module-type");
+// Symbol.for keeps the brand check working when CJS and ESM copies of the
+// package end up in the same process (dual-package hazard).
+const MODULE_TYPE_SYMBOL = Symbol.for("backtest-kit.ollama.module-type");
 class Module {
     constructor(path, baseDir) {
         this.path = path;
@@ -7495,15 +7559,15 @@ async function commitPrompt(source, history) {
     const systemPrompts = await engine$1.resolvePromptService.getSystemPrompt(prompt, symbol, strategyName, exchangeName, frameName, isBacktest);
     const userPrompt = await engine$1.resolvePromptService.getUserPrompt(prompt, symbol, strategyName, exchangeName, frameName, isBacktest);
     if (systemPrompts.length > 0) {
-        for (const content of systemPrompts) {
-            if (!content.trim()) {
-                continue;
-            }
-            history.unshift({
-                role: "system",
-                content,
-            });
-        }
+        // Single unshift with spread: per-item unshift in a loop would REVERSE
+        // the system prompt order at the head of the history.
+        const systemMessages = systemPrompts
+            .filter((content) => content.trim())
+            .map((content) => ({
+            role: "system",
+            content,
+        }));
+        history.unshift(...systemMessages);
     }
     if (userPrompt && userPrompt.trim()) {
         history.push({
@@ -7683,7 +7747,7 @@ const LIST_OPTIMIZERS_METHOD_NAME = "list.listOptimizerSchema";
  *
  * @example
  * ```typescript
- * import { listOptimizers, addOptimizer } from "backtest-kit";
+ * import { listOptimizers, addOptimizer } from "@backtest-kit/ollama";
  *
  * addOptimizer({
  *   optimizerName: "llm-strategy-generator",