@tradejs/node 3.0.1 → 3.1.0

package/dist/cli.js

@@ -78,11 +78,8 @@ var import_logger5 = require("@tradejs/infra/logger");
 var import_candles = require("@tradejs/infra/timescale/candles");
 
 // src/ai.ts
-var import_aiLanguages = require("@tradejs/core/aiLanguages");
-var import_aiEndpoints = require("@tradejs/core/aiEndpoints");
-var import_aiModels = require("@tradejs/core/aiModels");
+var import_aiLanguages2 = require("@tradejs/core/aiLanguages");
 var import_redis = require("@tradejs/infra/redis");
-var import_userSettings = require("@tradejs/infra/userSettings");
 
 // src/aiShared.ts
 var MAX_AI_SERIES_POINTS = 5;
@@ -1207,6 +1204,139 @@ var postProcessAiAnalysisByStrategy = (signal, analysis, payload = buildAiPayloa
   analysis
 }) ?? analysis;
 
+// src/aiProvider.ts
+var import_aiEndpoints = require("@tradejs/core/aiEndpoints");
+var import_aiModels = require("@tradejs/core/aiModels");
+var import_aiLanguages = require("@tradejs/core/aiLanguages");
+var import_userSettings = require("@tradejs/infra/userSettings");
+var DEFAULT_AI_MODEL = "openai/gpt-5-mini";
+var userSettingsCache = /* @__PURE__ */ new Map();
+var aiModelCache = /* @__PURE__ */ new Map();
+var normalizeResponseContent = (content) => {
+  if (typeof content === "string") return content;
+  if (content && typeof content === "object" && !Array.isArray(content)) {
+    return content;
+  }
+  if (Array.isArray(content)) {
+    return content.map(
+      (part) => typeof part?.text === "string" ? part.text : ""
+    ).join("\n").trim();
+  }
+  return String(content ?? "");
+};
+var getAiInvocationError = (error) => {
+  const details = error instanceof Error && error.message.trim() ? error.message.trim() : String(error);
+  const isEmptyCompletion = error instanceof TypeError && /Cannot read properties of undefined \(reading ['"]message['"]\)/.test(
+    details
+  );
+  const wrapped = new Error(
+    isEmptyCompletion ? "AI provider returned an empty chat completion" : `AI model invocation failed: ${details}`
+  );
+  wrapped.cause = error;
+  return wrapped;
+};
+var isEmptyResponseContent = (content) => typeof content === "string" ? content.trim().length === 0 : Object.keys(content).length === 0;
+var getAiModelCacheKey = (userName, modelName, temperature) => `${userName}::${modelName}::${temperature}`;
+var resolveAiModelName = (settings, requestedModelName) => {
+  const explicitModelName = requestedModelName?.trim() ?? "";
+  if (explicitModelName) return explicitModelName;
+  return settings.AI_MODEL?.trim() || DEFAULT_AI_MODEL;
+};
+var getOpenRouterModelKwargs = (apiEndpoint) => {
+  const endpoint = String(apiEndpoint ?? "").trim();
+  if (!endpoint) return {};
+  let hostname = "";
+  try {
+    hostname = new URL(endpoint).hostname;
+  } catch {
+    hostname = endpoint;
+  }
+  return hostname.toLowerCase().includes("openrouter") ? { provider: { ignore: ["azure"] } } : {};
+};
+var getAiUserSettings = async (userName = "root") => {
+  let settingsPromise = userSettingsCache.get(userName);
+  if (!settingsPromise) {
+    settingsPromise = (0, import_userSettings.getUserSettings)(userName).then((settings2) => {
+      const endpoint = (0, import_aiEndpoints.normalizeAiEndpoint)(settings2.AI_API_ENDPOINT);
+      return {
+        ...settings2,
+        AI_API_ENDPOINT: endpoint,
+        AI_MODEL: (0, import_aiModels.normalizeAiModel)(settings2.AI_MODEL, endpoint),
+        AI_RESPONSE_LANGUAGE: (0, import_aiLanguages.normalizeAiResponseLanguage)(
+          settings2.AI_RESPONSE_LANGUAGE
+        )
+      };
+    });
+    settingsPromise.catch(() => userSettingsCache.delete(userName));
+    userSettingsCache.set(userName, settingsPromise);
+  }
+  const settings = await settingsPromise;
+  if (!settings.AI_API_KEY || !settings.AI_API_ENDPOINT) {
+    throw new Error(`AI settings are incomplete for user ${userName}`);
+  }
+  return settings;
+};
+var getAiModel = async (userName = "root", requestedModelName, temperature = 0.2) => {
+  const settings = await getAiUserSettings(userName);
+  const modelName = resolveAiModelName(settings, requestedModelName);
+  const cacheKey = getAiModelCacheKey(userName, modelName, temperature);
+  let modelPromise = aiModelCache.get(cacheKey);
+  if (!modelPromise) {
+    modelPromise = import("@langchain/openai").then(({ ChatOpenAI }) => {
+      const modelKwargs = getOpenRouterModelKwargs(settings.AI_API_ENDPOINT);
+      return new ChatOpenAI({
+        temperature,
+        modelName,
+        apiKey: settings.AI_API_KEY,
+        ...Object.keys(modelKwargs).length ? { modelKwargs } : {},
+        configuration: {
+          baseURL: settings.AI_API_ENDPOINT,
+          defaultHeaders: {
+            "HTTP-Referer": "https://tradejs.dev",
+            "X-Title": "Inv"
+          }
+        }
+      });
+    });
+    modelPromise.catch(() => aiModelCache.delete(cacheKey));
+    aiModelCache.set(cacheKey, modelPromise);
+  }
+  try {
+    return await modelPromise;
+  } catch (error) {
+    aiModelCache.delete(cacheKey);
+    userSettingsCache.delete(userName);
+    throw error;
+  }
+};
+var invokeAiChatWithUserMessageEncoding = async ({
+  messages,
+  userName = "root",
+  model,
+  temperature = 0.2
+}, resolveUserMessageEncoding) => {
+  const [{ HumanMessage, SystemMessage }, aiModel] = await Promise.all([
+    import("@langchain/core/messages"),
+    getAiModel(userName, model, temperature)
+  ]);
+  const providerMessages = messages.map(
+    (message) => message.role === "system" ? new SystemMessage(message.content) : new HumanMessage(
+      resolveUserMessageEncoding(message) === "text-block" ? { content: [{ type: "text", text: message.content }] } : message.content
+    )
+  );
+  try {
+    const response = await aiModel.invoke(providerMessages);
+    const content = normalizeResponseContent(response?.content);
+    if (isEmptyResponseContent(content)) {
+      throw new Error("AI provider returned an empty chat completion");
+    }
+    return { content };
+  } catch (error) {
+    throw getAiInvocationError(error);
+  }
+};
+var invokeAiPromptChat = (options) => invokeAiChatWithUserMessageEncoding(options, () => "text-block");
+
 // src/ai.ts
 var parseAIResponse = (input) => {
   try {
@@ -1220,18 +1350,6 @@ var parseAIResponse = (input) => {
     return {};
   }
 };
-var normalizeResponseContent = (content) => {
-  if (typeof content === "string" || content && typeof content === "object") {
-    if (typeof content !== "object" || !Array.isArray(content)) {
-      return content;
-    }
-  }
-  if (Array.isArray(content)) {
-    const text = content.map((part) => typeof part?.text === "string" ? part.text : "").join("\n").trim();
-    return text;
-  }
-  return String(content ?? "");
-};
 var normalizeAnalysis = (raw) => {
   const direction = raw?.direction === "LONG" || raw?.direction === "SHORT" ? raw.direction : null;
   const qualityNum = typeof raw?.quality === "number" ? Math.max(1, Math.min(5, Math.round(raw.quality))) : void 0;
@@ -1437,153 +1555,24 @@ Trade payload:
 ${JSON.stringify(payload)}
 ${buildAiHumanPromptAddonByStrategy(signal, payload)}
 `;
-var getAiInvocationError = (error) => {
-  const details = error instanceof Error && error.message.trim() ? error.message.trim() : String(error);
-  const isEmptyCompletion = error instanceof TypeError && /Cannot read properties of undefined \(reading ['"]message['"]\)/.test(
-    details
-  );
-  const wrapped = new Error(
-    isEmptyCompletion ? "AI provider returned an empty chat completion" : `AI model invocation failed: ${details}`
-  );
-  wrapped.cause = error;
-  return wrapped;
-};
-var isEmptyResponseContent = (content) => typeof content === "string" ? content.trim().length === 0 : Object.keys(content).length === 0;
-var DEFAULT_AI_MODEL = "openai/gpt-5-mini";
-var userSettingsCache = /* @__PURE__ */ new Map();
-var aiModelCache = /* @__PURE__ */ new Map();
-var getAiModelCacheKey = (userName, modelName) => `${userName}::${modelName}`;
-var resolveAiModelName = (settings, requestedModelName) => {
-  const explicitModelName = typeof requestedModelName === "string" ? requestedModelName.trim() : "";
-  if (explicitModelName) {
-    return explicitModelName;
-  }
-  const settingsModelName = typeof settings.AI_MODEL === "string" ? settings.AI_MODEL.trim() : "";
-  return settingsModelName || DEFAULT_AI_MODEL;
-};
-var getOpenRouterModelKwargs = (apiEndpoint) => {
-  const endpoint = String(apiEndpoint ?? "").trim();
-  if (!endpoint) {
-    return {};
-  }
-  let hostname = "";
-  try {
-    hostname = new URL(endpoint).hostname;
-  } catch {
-    hostname = endpoint;
-  }
-  if (!hostname.toLowerCase().includes("openrouter")) {
-    return {};
-  }
-  return {
-    provider: {
-      ignore: ["azure"]
-    }
-  };
-};
-var getAiSettings = async (userName = "root") => {
-  let settingsPromise = userSettingsCache.get(userName);
-  if (!settingsPromise) {
-    settingsPromise = (0, import_userSettings.getUserSettings)(userName).then((settings2) => {
-      const endpoint = (0, import_aiEndpoints.normalizeAiEndpoint)(settings2.AI_API_ENDPOINT);
-      return {
-        ...settings2,
-        AI_API_ENDPOINT: endpoint,
-        AI_MODEL: (0, import_aiModels.normalizeAiModel)(settings2.AI_MODEL, endpoint),
-        AI_RESPONSE_LANGUAGE: (0, import_aiLanguages.normalizeAiResponseLanguage)(
-          settings2.AI_RESPONSE_LANGUAGE
-        )
-      };
-    });
-    settingsPromise.catch(() => {
-      userSettingsCache.delete(userName);
-    });
-    userSettingsCache.set(userName, settingsPromise);
-  }
-  const settings = await settingsPromise;
-  if (!settings.AI_API_KEY || !settings.AI_API_ENDPOINT) {
-    throw new Error(`AI settings are incomplete for user ${userName}`);
-  }
-  return settings;
-};
-var createAiModel = async (userName = "root", requestedModelName) => {
-  const settings = await getAiSettings(userName);
-  const modelName = resolveAiModelName(settings, requestedModelName);
-  const cacheKey = getAiModelCacheKey(userName, modelName);
-  let modelPromise = aiModelCache.get(cacheKey);
-  if (!modelPromise) {
-    modelPromise = (async () => {
-      const { ChatOpenAI } = await import("@langchain/openai");
-      const modelKwargs = getOpenRouterModelKwargs(settings.AI_API_ENDPOINT);
-      return new ChatOpenAI({
-        temperature: 0.2,
-        modelName,
-        apiKey: settings.AI_API_KEY,
-        ...Object.keys(modelKwargs).length ? { modelKwargs } : {},
-        configuration: {
-          baseURL: settings.AI_API_ENDPOINT,
-          defaultHeaders: {
-            "HTTP-Referer": "https://tradejs.dev",
-            "X-Title": "Inv"
-          }
-        }
-      });
-    })();
-    modelPromise.catch(() => {
-      aiModelCache.delete(cacheKey);
-    });
-    aiModelCache.set(cacheKey, modelPromise);
-  }
-  return modelPromise;
-};
-var getAiModel = async (userName = "root", requestedModelName) => {
-  const settings = await getAiSettings(userName);
-  const resolvedModelName = resolveAiModelName(settings, requestedModelName);
-  try {
-    return await createAiModel(userName, resolvedModelName);
-  } catch (error) {
-    aiModelCache.delete(getAiModelCacheKey(userName, resolvedModelName));
-    userSettingsCache.delete(userName);
-    throw error;
-  }
-};
 var runAiPrompt = async ({ systemPrompt, humanPrompt }, options = {}) => {
-  const [{ HumanMessage, SystemMessage }, model, settings] = await Promise.all([
-    import("@langchain/core/messages"),
-    getAiModel(options.userName, options.model),
-    getAiSettings(options.userName)
-  ]);
-  const messages = [];
-  const responseLanguage = (0, import_aiLanguages.getAiResponseLanguagePromptName)(
-    settings.AI_RESPONSE_LANGUAGE || import_aiLanguages.DEFAULT_AI_RESPONSE_LANGUAGE
+  const settings = await getAiUserSettings(options.userName);
+  const responseLanguage = (0, import_aiLanguages2.getAiResponseLanguagePromptName)(
+    settings.AI_RESPONSE_LANGUAGE || import_aiLanguages2.DEFAULT_AI_RESPONSE_LANGUAGE
   );
-  messages.push(new SystemMessage(systemPrompt));
-  messages.push(
-    new SystemMessage(
-      `Write all user-visible text fields in ${responseLanguage}. Keep field names and JSON syntax unchanged.`
-    )
-  );
-  messages.push(
-    new HumanMessage({
-      content: [
-        {
-          type: "text",
-          text: humanPrompt
-        }
-      ]
-    })
-  );
-  let response;
-  try {
-    response = await model.invoke(messages);
-  } catch (error) {
-    throw getAiInvocationError(error);
-  }
-  const responseContent = normalizeResponseContent(response?.content);
-  if (isEmptyResponseContent(responseContent)) {
-    throw new Error("AI provider returned an empty chat completion");
-  }
-  const parsed = parseAIResponse(responseContent);
+  const response = await invokeAiPromptChat({
+    userName: options.userName,
+    model: options.model,
+    messages: [
+      { role: "system", content: systemPrompt },
+      {
+        role: "system",
+        content: `Write all user-visible text fields in ${responseLanguage}. Keep field names and JSON syntax unchanged.`
+      },
+      { role: "user", content: humanPrompt }
+    ]
+  });
+  const parsed = parseAIResponse(response.content);
   const normalized = normalizeAnalysis(parsed);
   if (!options.signal) {
     return normalized;

package/dist/cli.mjs

@@ -6,7 +6,7 @@ import {
 import {
   askAI,
   ensureStrategyPluginsLoaded
-} from "./chunk-VRXU4E4O.mjs";
+} from "./chunk-KOQSLFT2.mjs";
 import {
   getTradejsProjectCwd,
   loadTradejsConfig

package/dist/connectors.d.mts

@@ -1,4 +1,4 @@
-import { ConnectorCreator, ConnectorRegistryEntry } from '@tradejs/types';
+import { ConnectorCreator, ConnectorRegistryEntry, ConnectorRuntime } from '@tradejs/types';
 
 declare const BUILTIN_CONNECTOR_NAMES: {
     readonly ByBit: "ByBit";
@@ -17,4 +17,7 @@ declare const registerConnectorEntries: (entries: readonly ConnectorRegistryEntr
 declare const resetConnectorRegistryCache: (cwd?: string) => void;
 declare const DEFAULT_CONNECTOR_NAME: "ByBit";
 
-export { BUILTIN_CONNECTOR_NAMES, DEFAULT_CONNECTOR_NAME, ensureConnectorPluginsLoaded, getAvailableConnectorNames, getAvailableConnectorProviders, getConnectorCreatorByName, getConnectorCreatorByProvider, getConnectorNameByProvider, registerConnectorEntries, resetConnectorRegistryCache, resolveConnectorName };
+declare const connectorRuntime: ConnectorRuntime;
+declare const bindConnectorRuntime: (creator: ConnectorCreator, runtime?: ConnectorRuntime) => ConnectorCreator;
+
+export { BUILTIN_CONNECTOR_NAMES, DEFAULT_CONNECTOR_NAME, bindConnectorRuntime, connectorRuntime, ensureConnectorPluginsLoaded, getAvailableConnectorNames, getAvailableConnectorProviders, getConnectorCreatorByName, getConnectorCreatorByProvider, getConnectorNameByProvider, registerConnectorEntries, resetConnectorRegistryCache, resolveConnectorName };

package/dist/connectors.d.ts

@@ -1,4 +1,4 @@
-import { ConnectorCreator, ConnectorRegistryEntry } from '@tradejs/types';
+import { ConnectorCreator, ConnectorRegistryEntry, ConnectorRuntime } from '@tradejs/types';
 
 declare const BUILTIN_CONNECTOR_NAMES: {
     readonly ByBit: "ByBit";
@@ -17,4 +17,7 @@ declare const registerConnectorEntries: (entries: readonly ConnectorRegistryEntr
 declare const resetConnectorRegistryCache: (cwd?: string) => void;
 declare const DEFAULT_CONNECTOR_NAME: "ByBit";
 
-export { BUILTIN_CONNECTOR_NAMES, DEFAULT_CONNECTOR_NAME, ensureConnectorPluginsLoaded, getAvailableConnectorNames, getAvailableConnectorProviders, getConnectorCreatorByName, getConnectorCreatorByProvider, getConnectorNameByProvider, registerConnectorEntries, resetConnectorRegistryCache, resolveConnectorName };
+declare const connectorRuntime: ConnectorRuntime;
+declare const bindConnectorRuntime: (creator: ConnectorCreator, runtime?: ConnectorRuntime) => ConnectorCreator;
+
+export { BUILTIN_CONNECTOR_NAMES, DEFAULT_CONNECTOR_NAME, bindConnectorRuntime, connectorRuntime, ensureConnectorPluginsLoaded, getAvailableConnectorNames, getAvailableConnectorProviders, getConnectorCreatorByName, getConnectorCreatorByProvider, getConnectorNameByProvider, registerConnectorEntries, resetConnectorRegistryCache, resolveConnectorName };