@backtest-kit/ollama 14.1.0 → 15.0.0

package/build/index.cjs

@@ -297,7 +297,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;
@@ -317,7 +319,7 @@ Prompt.isPrompt = (value) => {
 };
 
 const require$1 = module$1.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index.cjs', document.baseURI).href)));
-const REQUIRE_MODULE_FN = functoolsKit.memoize(([module]) => module, (module) => {
+const REQUIRE_MODULE_FN = functoolsKit.memoize(([module]) => path.join(module.baseDir, module.path), (module) => {
     const modulePath = require$1.resolve(path.join(module.baseDir, module.path));
     return require$1(modulePath);
 });
@@ -337,7 +339,8 @@ class PromptCacheService {
                 module,
             });
             if (module) {
-                REQUIRE_MODULE_FN.clear(module);
+                REQUIRE_MODULE_FN.clear(path.join(module.baseDir, module.path));
+                return;
             }
             REQUIRE_MODULE_FN.clear();
         };
@@ -898,6 +901,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",
@@ -926,7 +936,7 @@ const toPlainString = async (content) => {
             em: "",
             p: () => "",
             ul: () => "",
-            li: () => "• ",
+            li: () => "",
             ol: () => "",
             hr: () => "\n",
             br: () => "\n",
@@ -1195,6 +1205,10 @@ class OptimizerTemplateService {
                 ``,
                 `        await dumpJson(resultId, messages, result);`,
                 ``,
+                `        if (result.position === "wait") {`,
+                `            return null;`,
+                `        }`,
+                ``,
                 `        result.id = resultId;`,
                 ``,
                 `        return result;`,
@@ -1881,8 +1895,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({
@@ -1910,6 +1925,7 @@ const GET_STRATEGY_DATA_FN = async (symbol, self) => {
                     role: "assistant",
                     content: assistantContent,
                 });
+                sourceNames.push(DEFAULT_SOURCE_NAME);
                 processedSources++;
             }
             else {
@@ -1931,18 +1947,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({
@@ -2048,7 +2065,7 @@ const GET_STRATEGY_CODE_FN = async (symbol, self) => {
 const GET_STRATEGY_DUMP_FN = async (symbol, path$1, self) => {
     const report = await self.getCode(symbol);
     try {
-        const dir = path.join(process.cwd(), path$1);
+        const dir = path.isAbsolute(path$1) ? path$1 : path.join(process.cwd(), path$1);
         await fs.mkdir(dir, { recursive: true });
         const filename = `${self.params.optimizerName}_${symbol}.mjs`;
         const filepath = path.join(dir, filename);
@@ -2438,17 +2455,17 @@ var InferenceName$1 = InferenceName;
  * });
  * ```
  */
-const getGrok = functoolsKit.singleshot(() => {
+const GET_CLIENT_FN$9 = functoolsKit.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.
@@ -2584,7 +2601,7 @@ class GrokProvider {
             },
         });
         const result = {
-            content: content,
+            content: content ?? "",
             mode,
             agentName,
             role,
@@ -2744,8 +2761,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,
             }),
@@ -3131,7 +3148,12 @@ class HfProvider {
                         continue;
                     }
                     lodashEs.set(validation.data, "_thinking", reasoning_content);
-                    lodashEs.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;
+                        lodashEs.set(validation.data, "_context", { inference, model });
+                    }
                     const result = {
                         role: "assistant",
                         content: JSON.stringify(validation.data),
@@ -3166,10 +3188,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 = agentSwarmKit.RoundRobin.create(engine$1.contextService.context.apiKey, (token) => {
+        if (!apiKeys?.length) {
+            throw new Error("OllamaRotate required apiKey[] to process token rotation");
+        }
+        this._chatFn = agentSwarmKit.RoundRobin.create(apiKeys, (token) => {
             const ollama = new ollama$1.Ollama({
                 ...this._config,
                 headers: {
@@ -3185,9 +3209,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.
@@ -3220,10 +3241,28 @@ class OllamaWrapper {
  * // Next request will use a different API key
  * ```
  */
-const getOllamaRotate = functoolsKit.singleshot(() => new OllamaWrapper({
+const GET_WRAPPER_FN = functoolsKit.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 = functoolsKit.memoize(([apiKey]) => `${apiKey ?? ""}`, (apiKey) => {
+    if (!apiKey) {
+        return new ollama$1.Ollama();
+    }
+    return new ollama$1.Ollama({
+        host: "https://ollama.com",
+        headers: {
+            Authorization: `Bearer ${apiKey}`,
+        },
+    });
+});
 /**
  * Creates and caches an Ollama client with flexible configuration.
  *
@@ -3269,21 +3308,13 @@ const getOllamaRotate = functoolsKit.singleshot(() => new OllamaWrapper({
  * });
  * ```
  */
-const getOllama = functoolsKit.singleshot(() => {
+const getOllama = () => {
     const apiKey = engine$1.contextService.context.apiKey;
     if (Array.isArray(apiKey)) {
         return getOllamaRotate();
     }
-    if (!apiKey) {
-        return new ollama$1.Ollama();
-    }
-    return new ollama$1.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.
@@ -3617,7 +3648,12 @@ class OllamaProvider {
                         attempt++;
                         continue;
                     }
-                    lodashEs.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;
+                        lodashEs.set(validation.data, "_context", { inference, model });
+                    }
                     const result = {
                         role: "assistant",
                         content: JSON.stringify(validation.data),
@@ -3636,6 +3672,10 @@ class OllamaProvider {
     }
 }
 
+const GET_CLIENT_FN$7 = functoolsKit.memoize(([apiKey]) => `${apiKey}`, (apiKey) => new OpenAI({
+    baseURL: "https://api.anthropic.com/v1/",
+    apiKey,
+}));
 /**
  * Creates and caches an OpenAI-compatible client for Claude (Anthropic) API.
  *
@@ -3663,17 +3703,13 @@ class OllamaProvider {
  * });
  * ```
  */
-const getClaude = functoolsKit.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.
@@ -3776,7 +3812,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,
@@ -3857,7 +3893,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;
     }
@@ -3960,7 +3996,12 @@ class ClaudeProvider {
                         attempt++;
                         continue;
                     }
-                    lodashEs.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;
+                        lodashEs.set(validation.data, "_context", { inference, model });
+                    }
                     const result = {
                         role: "assistant",
                         content: JSON.stringify(validation.data),
@@ -3979,6 +4020,9 @@ class ClaudeProvider {
     }
 }
 
+const GET_CLIENT_FN$6 = functoolsKit.memoize(([apiKey]) => `${apiKey}`, (apiKey) => new OpenAI({
+    apiKey,
+}));
 /**
  * Creates and caches an OpenAI client for OpenAI API.
  *
@@ -4006,16 +4050,13 @@ class ClaudeProvider {
  * });
  * ```
  */
-const getOpenAi = functoolsKit.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.).
@@ -4132,7 +4173,7 @@ class GPT5Provider {
             tools: tools,
         });
         const result = {
-            content: content,
+            content: content ?? "",
             mode,
             agentName,
             role,
@@ -4357,17 +4398,17 @@ class GPT5Provider {
  * });
  * ```
  */
-const getDeepseek = functoolsKit.singleshot(() => {
+const GET_CLIENT_FN$5 = functoolsKit.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.
@@ -4450,7 +4491,7 @@ class DeepseekProvider {
             tools: formattedTools?.length ? formattedTools : undefined,
         });
         const result = {
-            content: content,
+            content: content ?? "",
             mode,
             agentName,
             role,
@@ -4633,7 +4674,12 @@ class DeepseekProvider {
                         attempt++;
                         continue;
                     }
-                    lodashEs.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;
+                        lodashEs.set(validation.data, "_context", { inference, model });
+                    }
                     const result = {
                         role: "assistant",
                         content: JSON.stringify(validation.data),
@@ -4679,17 +4725,17 @@ class DeepseekProvider {
  * });
  * ```
  */
-const getMistral = functoolsKit.singleshot(() => {
+const GET_CLIENT_FN$4 = functoolsKit.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.
@@ -4772,7 +4818,7 @@ class MistralProvider {
             tools: formattedTools?.length ? formattedTools : undefined,
         });
         const result = {
-            content: content,
+            content: content ?? "",
             mode,
             agentName,
             role,
@@ -4955,7 +5001,12 @@ class MistralProvider {
                         attempt++;
                         continue;
                     }
-                    lodashEs.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;
+                        lodashEs.set(validation.data, "_context", { inference, model });
+                    }
                     const result = {
                         role: "assistant",
                         content: JSON.stringify(validation.data),
@@ -5001,17 +5052,17 @@ class MistralProvider {
  * });
  * ```
  */
-const getPerplexity = functoolsKit.singleshot(() => {
+const GET_CLIENT_FN$3 = functoolsKit.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.
@@ -5127,7 +5178,7 @@ class PerplexityProvider {
         });
         const { choices: [{ message: { content, role, tool_calls }, },], } = result;
         const finalResult = {
-            content: content,
+            content: content ?? "",
             mode,
             agentName,
             role,
@@ -5254,6 +5305,10 @@ class PerplexityProvider {
     }
 }
 
+const GET_CLIENT_FN$2 = functoolsKit.memoize(([apiKey]) => `${apiKey}`, (apiKey) => new OpenAI({
+    baseURL: "https://api.cohere.ai/compatibility/v1",
+    apiKey,
+}));
 /**
  * Creates and caches an OpenAI-compatible client for Cohere API.
  *
@@ -5281,17 +5336,13 @@ class PerplexityProvider {
  * });
  * ```
  */
-const getCohere = functoolsKit.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.
@@ -5401,7 +5452,7 @@ class CohereProvider {
         });
         const { choices: [{ message: { content, role, tool_calls }, },], } = result;
         const finalResult = {
-            content: content,
+            content: content ?? "",
             mode,
             agentName,
             role,
@@ -5681,7 +5732,7 @@ class AlibabaProvider {
         });
         const { choices: [{ message: { content, role, tool_calls }, },], } = responseData;
         const result = {
-            content: content,
+            content: content ?? "",
             mode,
             agentName,
             role,
@@ -5762,7 +5813,7 @@ class AlibabaProvider {
             });
         }
         const result = {
-            content: content,
+            content: content ?? "",
             mode,
             agentName,
             role,
@@ -5890,7 +5941,12 @@ class AlibabaProvider {
                         attempt++;
                         continue;
                     }
-                    lodashEs.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;
+                        lodashEs.set(validation.data, "_context", { inference, model });
+                    }
                     const result = {
                         role: "assistant",
                         content: JSON.stringify(validation.data),
@@ -5909,6 +5965,10 @@ class AlibabaProvider {
     }
 }
 
+const GET_CLIENT_FN$1 = functoolsKit.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.
  *
@@ -5951,17 +6011,13 @@ class AlibabaProvider {
  * });
  * ```
  */
-const getZAi = functoolsKit.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.
@@ -6093,7 +6149,7 @@ class GLM4Provider {
             tools: tools,
         });
         const result = {
-            content: content,
+            content: content ?? "",
             mode,
             agentName,
             role,
@@ -6327,16 +6383,16 @@ class GLM4Provider {
  * });
  * ```
  */
-const getGroq = functoolsKit.singleshot(() => {
+const GET_CLIENT_FN = functoolsKit.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.
@@ -6419,7 +6475,7 @@ class GroqProvider {
             tools: formattedTools?.length ? formattedTools : undefined,
         });
         const result = {
-            content: content,
+            content: content ?? "",
             mode,
             agentName,
             role,
@@ -6597,7 +6653,12 @@ class GroqProvider {
                         attempt++;
                         continue;
                     }
-                    lodashEs.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;
+                        lodashEs.set(validation.data, "_context", { inference, model });
+                    }
                     const result = {
                         role: "assistant",
                         content: JSON.stringify(validation.data),
@@ -6817,7 +6878,7 @@ agentSwarmKit.addCompletion({
     getCompletion: async (params) => {
         const result = await LOCAL_RUNNER_FN$1(params);
         if (typeof result === "symbol") {
-            throw new Error(`${exports.CompletionName.RunnerCompletion} inference timeout`);
+            throw new Error(`${exports.CompletionName.RunnerStreamCompletion} inference timeout`);
         }
         return result;
     },
@@ -6885,7 +6946,7 @@ agentSwarmKit.addCompletion({
  * ```
  */
 const ollama = (fn, model, apiKey) => {
-    const wrappedFn = async (args) => {
+    const wrappedFn = async (...args) => {
         return await ContextService.runInContext(async () => {
             return await fn(...args);
         }, {
@@ -6917,7 +6978,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);
         }, {
@@ -6949,7 +7010,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);
         }, {
@@ -6981,7 +7042,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);
         }, {
@@ -7013,7 +7074,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);
         }, {
@@ -7045,7 +7106,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);
         }, {
@@ -7077,7 +7138,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);
         }, {
@@ -7109,7 +7170,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);
         }, {
@@ -7141,7 +7202,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);
         }, {
@@ -7173,7 +7234,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);
         }, {
@@ -7184,26 +7245,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.
  *
@@ -7225,7 +7266,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);
         }, {
@@ -7236,8 +7277,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);
         }, {
@@ -7290,7 +7351,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({
@@ -7437,7 +7499,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;
@@ -7498,15 +7562,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({
@@ -7686,7 +7750,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",