@openfinclaw/openfinclaw-strategy 2026.3.310 → 2026.4.2

package/index.ts

@@ -20,10 +20,6 @@ import { setupOpenfinclawCronJobs } from "./src/scheduler/cron-setup.js";
 import { AggregatedNewsProvider, createNewsProviders } from "./src/scheduler/news-provider.js";
 import { registerSchedulerTools } from "./src/scheduler/tools.js";
 import { registerStrategyTools } from "./src/strategy/tools.js";
-import { setupTournamentCronJob } from "./src/tournament/cron-setup.js";
-import { TournamentDb } from "./src/tournament/db.js";
-import { buildOrchestratorPrompt } from "./src/tournament/prompts.js";
-import { registerTournamentTools } from "./src/tournament/tools.js";
 
 export default definePluginEntry({
   id: "openfinclaw-strategy",
@@ -72,14 +68,9 @@ export default definePluginEntry({
       handler: createOpenFinclawGatewayProxy({ port: config.httpPort, logger: api.logger }),
     });
 
-    // Register tournament tools (tournament_pick, tournament_leaderboard, tournament_result)
-    const getTournamentDb = () => new TournamentDb(getDb());
-    registerTournamentTools(api.registerTool.bind(api), getTournamentDb);
-
     // Inject agent system prompt: prioritise tool calls so data lands in SQLite
-    const tournamentPrompt = buildOrchestratorPrompt();
     api.on("before_prompt_build", async () => ({
-      prependSystemContext: `${OPENFINCLAW_AGENT_GUIDANCE}\n\n${tournamentPrompt}`,
+      prependSystemContext: OPENFINCLAW_AGENT_GUIDANCE,
     }));
 
     // ── Gateway Cron registration ──
@@ -90,9 +81,9 @@ export default definePluginEntry({
     if (config.schedulerEnabled) {
       setupOpenfinclawCronJobs(config)
         .then((result) => {
-          if (result.created > 0) {
+          if (result.created > 0 || result.migrated > 0) {
             api.logger.info(
-              `[OpenFinClaw] Cron jobs registered: ${result.created} created, ${result.existing} existing`,
+              `[OpenFinClaw] Cron jobs: ${result.created} created, ${result.migrated} migrated, ${result.existing} existing`,
             );
           }
         })
@@ -101,19 +92,6 @@ export default definePluginEntry({
             `[OpenFinClaw] Cron setup failed: ${err instanceof Error ? err.message : String(err)}`,
           );
         });
-
-      // Register tournament cron job
-      setupTournamentCronJob()
-        .then((result) => {
-          if (result.created) {
-            api.logger.info("[OpenFinClaw] Tournament cron job registered");
-          }
-        })
-        .catch((err) => {
-          api.logger.info(
-            `[OpenFinClaw] Tournament cron setup failed: ${err instanceof Error ? err.message : String(err)}`,
-          );
-        });
     }
   },
 });

package/openclaw.plugin.json

@@ -23,7 +23,7 @@
       "datahubGatewayUrl": {
         "type": "string",
         "description": "DataHub Gateway URL for market data",
-        "default": "http://43.134.61.136:9080"
+        "default": "https://datahub.openfinclaw.ai"
       },
       "requestTimeoutMs": {
         "type": "number",
@@ -69,6 +69,16 @@
         "default": "Asia/Shanghai",
         "description": "Timezone for scheduled tasks"
       },
+      "cronSessionTarget": {
+        "type": "string",
+        "default": "isolated",
+        "description": "Cron job session mode: 'isolated' (own session, won't block main chat) or 'main' (legacy, runs in main conversation)"
+      },
+      "cronDeliveryMode": {
+        "type": "string",
+        "default": "announce",
+        "description": "Cron result delivery: 'announce' (push to user's last active channel) or 'none' (silent)"
+      },
       "newsApiKey": {
         "type": "string",
         "description": "Optional API key for Finnhub or NewsAPI news provider",
@@ -101,7 +111,7 @@
     },
     "datahubGatewayUrl": {
       "label": "DataHub Gateway URL",
-      "placeholder": "http://43.134.61.136:9080"
+      "placeholder": "https://datahub.openfinclaw.ai"
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openfinclaw/openfinclaw-strategy",
-  "version": "2026.3.310",
+  "version": "2026.4.2",
   "description": "OpenFinClaw - Unified financial tools: market data (price/K-line/crypto/compare/search), strategy publishing, fork, and validation. Single API key for Hub and DataHub.",
   "keywords": [
     "backtest",

package/src/config.ts

@@ -6,7 +6,7 @@ import type { OpenClawPluginApi } from "openclaw/plugin-sdk/core";
 import type { NewsProviderType, UnifiedPluginConfig } from "./types.js";
 
 const DEFAULT_HUB_API_URL = "https://hub.openfinclaw.ai";
-const DEFAULT_DATAHUB_GATEWAY_URL = "http://43.134.61.136:9080";
+const DEFAULT_DATAHUB_GATEWAY_URL = "https://datahub.openfinclaw.ai";
 const DEFAULT_TIMEOUT_MS = 60_000;
 
 const DEFAULT_SCAN_CRON = "0 8 * * *";
@@ -92,6 +92,29 @@ export function resolvePluginConfig(api: OpenClawPluginApi): UnifiedPluginConfig
     readEnv(["OPENFINCLAW_SCAN_TZ"]) ??
     DEFAULT_SCAN_TZ;
 
+  const cronAgentIdRaw =
+    (typeof raw?.cronAgentId === "string" ? raw.cronAgentId : undefined) ??
+    readEnv(["OPENFINCLAW_CRON_AGENT_ID"]);
+  const cronAgentId = cronAgentIdRaw?.trim() || undefined;
+
+  const VALID_SESSION_TARGETS = new Set(["isolated", "main"]);
+  const cronSessionTargetRaw =
+    (typeof raw?.cronSessionTarget === "string" ? raw.cronSessionTarget : undefined) ??
+    readEnv(["OPENFINCLAW_CRON_SESSION_TARGET"]) ??
+    "isolated";
+  const cronSessionTarget = VALID_SESSION_TARGETS.has(cronSessionTargetRaw)
+    ? cronSessionTargetRaw
+    : "isolated";
+
+  const VALID_DELIVERY_MODES = new Set(["announce", "none"]);
+  const cronDeliveryModeRaw =
+    (typeof raw?.cronDeliveryMode === "string" ? raw.cronDeliveryMode : undefined) ??
+    readEnv(["OPENFINCLAW_CRON_DELIVERY_MODE"]) ??
+    "announce";
+  const cronDeliveryMode = VALID_DELIVERY_MODES.has(cronDeliveryModeRaw)
+    ? cronDeliveryModeRaw
+    : "announce";
+
   // ── News config ──
   const newsApiKey =
     (typeof raw?.newsApiKey === "string" ? raw.newsApiKey : undefined) ??
@@ -124,6 +147,9 @@ export function resolvePluginConfig(api: OpenClawPluginApi): UnifiedPluginConfig
     weeklyReportCronExpr,
     monthlyReportCronExpr,
     scanTimezone,
+    cronAgentId,
+    cronSessionTarget,
+    cronDeliveryMode,
     newsApiKey: newsApiKey && newsApiKey.length > 0 ? newsApiKey : undefined,
     newsProvider,
     priceAlertThreshold,

package/src/db/schema.ts

@@ -3,7 +3,6 @@
  * Based on ER diagram v0.3.
  */
 import type { DatabaseSync } from "node:sqlite";
-import { ensureTournamentSchema } from "../tournament/db.js";
 
 /**
  * Create (or migrate) all MVP tables.
@@ -135,9 +134,6 @@ export function ensureSchema(db: DatabaseSync): void {
   db.exec(`CREATE INDEX IF NOT EXISTS idx_price_alerts_created ON price_alerts(created_at);`);
   db.exec(`CREATE INDEX IF NOT EXISTS idx_price_alerts_strategy ON price_alerts(strategy_id);`);
 
-  // ── tournament tables ──────────────────────────────────────────────────
-  ensureTournamentSchema(db);
-
   // ── migrations (add columns to existing databases) ──────────────────────
 }
 

package/src/scheduler/cron-setup.ts

@@ -8,7 +8,9 @@
  * The running CronService watches the store file and picks up new jobs
  * on its next tick.
  *
- * Idempotent: safe to call multiple times (skips existing jobs by name).
+ * Idempotent: creates missing jobs and migrates legacy "main" session jobs
+ * to "isolated" so cron tasks run in their own session without blocking the
+ * user's active conversation.
  *
  * Jobs:
  * - openfinclaw:daily-scan      (0 8 * * *)       每日策略扫描
@@ -23,16 +25,21 @@ import type { UnifiedPluginConfig } from "../types.js";
 
 // ── Cron store types (mirrors src/cron/types.ts subset) ──────────────────
 
+type CronPayload =
+  | { kind: "systemEvent"; text: string }
+  | { kind: "agentTurn"; message: string };
+
 /** Minimal stored cron job shape. */
 interface StoredCronJob {
   id: string;
   name: string;
+  agentId?: string;
   enabled: boolean;
   schedule: { kind: "cron"; expr: string; tz?: string };
-  payload: { kind: "systemEvent"; text: string };
+  payload: CronPayload;
   sessionTarget: string;
   wakeMode: string;
-  delivery: { mode: string };
+  delivery: { mode: string; channel?: string; to?: string };
   createdAtMs: number;
   updatedAtMs: number;
   state: Record<string, unknown>;
@@ -43,6 +50,14 @@ interface CronStoreFile {
   jobs: StoredCronJob[];
 }
 
+/** Names managed by this plugin — used for migration detection. */
+const OPENFINCLAW_JOB_NAMES = new Set([
+  "openfinclaw:daily-scan",
+  "openfinclaw:price-monitor",
+  "openfinclaw:weekly-report",
+  "openfinclaw:monthly-report",
+]);
+
 // ── File I/O ──────────────────────────────────────────────────────────────
 
 /** Resolve default cron store path: ~/.openclaw/cron/jobs.json */
@@ -82,15 +97,26 @@ async function saveStore(storePath: string, store: CronStoreFile): Promise<void>
 function buildCronJobDefs(config: UnifiedPluginConfig): Array<{
   name: string;
   schedule: { kind: "cron"; expr: string; tz?: string };
-  payload: { kind: "systemEvent"; text: string };
+  payload: CronPayload;
+  sessionTarget: string;
+  delivery: { mode: string };
 }> {
+  const sessionTarget = config.cronSessionTarget;
+  const delivery = { mode: config.cronDeliveryMode };
+  const useAgentTurn = sessionTarget !== "main";
+
+  function makePayload(text: string): CronPayload {
+    return useAgentTurn ? { kind: "agentTurn", message: text } : { kind: "systemEvent", text };
+  }
+
   return [
     {
       name: "openfinclaw:daily-scan",
       schedule: { kind: "cron", expr: config.scanCronExpr, tz: config.scanTimezone },
-      payload: {
-        kind: "systemEvent",
-        text: [
+      sessionTarget,
+      delivery,
+      payload: makePayload(
+        [
           "[openfinclaw-strategy 每日扫描]",
           "1. 调用 strategy_daily_scan 获取策略扫描报告",
           "2. 分析每条新闻对策略的影响（利好/利空/中性）",
@@ -98,56 +124,94 @@ function buildCronJobDefs(config: UnifiedPluginConfig): Array<{
           "4. 用 skill_publish_verify 确认回测完成",
           "5. 将分析报告和建议操作发送给用户",
         ].join("\n"),
-      },
+      ),
     },
     {
       name: "openfinclaw:price-monitor",
       schedule: { kind: "cron", expr: config.monitorCronExpr, tz: config.scanTimezone },
-      payload: {
-        kind: "systemEvent",
-        text: [
+      sessionTarget,
+      delivery,
+      payload: makePayload(
+        [
           "[openfinclaw-strategy 价格监控]",
           "调用 strategy_price_monitor 检查所有策略标的的价格异动。",
           "如有告警（涨跌幅超阈值），分析可能的原因并通知用户。",
         ].join("\n"),
-      },
+      ),
     },
     {
       name: "openfinclaw:weekly-report",
       schedule: { kind: "cron", expr: config.weeklyReportCronExpr, tz: config.scanTimezone },
-      payload: {
-        kind: "systemEvent",
-        text: [
+      sessionTarget,
+      delivery,
+      payload: makePayload(
+        [
           "[openfinclaw-strategy 周报]",
           '调用 strategy_periodic_report(period="weekly") 生成策略绩效周报。',
           "汇总本周回测结果、价格告警和扫描记录，发送给用户。",
         ].join("\n"),
-      },
+      ),
     },
     {
       name: "openfinclaw:monthly-report",
       schedule: { kind: "cron", expr: config.monthlyReportCronExpr, tz: config.scanTimezone },
-      payload: {
-        kind: "systemEvent",
-        text: [
+      sessionTarget,
+      delivery,
+      payload: makePayload(
+        [
           "[openfinclaw-strategy 月报]",
           '调用 strategy_periodic_report(period="monthly") 生成策略绩效月报。',
           "汇总本月回测结果、价格告警和扫描记录，发送给用户。",
         ].join("\n"),
-      },
+      ),
     },
   ];
 }
 
+// ── Migration ─────────────────────────────────────────────────────────────
+
+/**
+ * Migrate legacy openfinclaw jobs that still use sessionTarget "main" +
+ * systemEvent payload to the new isolated agentTurn pattern.
+ * Returns the number of jobs migrated.
+ */
+function migrateLegacyJobs(
+  store: CronStoreFile,
+  defs: ReturnType<typeof buildCronJobDefs>,
+): number {
+  const defsByName = new Map(defs.map((d) => [d.name, d]));
+  let migrated = 0;
+
+  for (const job of store.jobs) {
+    if (!OPENFINCLAW_JOB_NAMES.has(job.name)) continue;
+    if (job.sessionTarget !== "main") continue;
+
+    const def = defsByName.get(job.name);
+    if (!def) continue;
+
+    job.payload = def.payload;
+    job.sessionTarget = def.sessionTarget;
+    job.delivery = def.delivery;
+    job.updatedAtMs = Date.now();
+    migrated++;
+  }
+
+  return migrated;
+}
+
 // ── Public API ────────────────────────────────────────────────────────────
 
 /**
- * Idempotently register openfinclaw cron jobs by writing to the
+ * Register and migrate openfinclaw cron jobs by writing to the
  * Gateway cron store file. Safe to call at plugin startup.
+ *
+ * - Creates missing jobs with the current config (isolated session by default).
+ * - Migrates existing legacy "main" session jobs to "isolated" + "agentTurn"
+ *   so cron tasks no longer block the user's active conversation.
  */
 export async function setupOpenfinclawCronJobs(
   config: UnifiedPluginConfig,
-): Promise<{ ok: boolean; created: number; existing: number }> {
+): Promise<{ ok: boolean; created: number; existing: number; migrated: number }> {
   const storePath = defaultStorePath();
   const store = await loadStore(storePath);
   const existingNames = new Set(store.jobs.map((j) => j.name));
@@ -160,12 +224,13 @@ export async function setupOpenfinclawCronJobs(
     store.jobs.push({
       id: randomUUID(),
       name: def.name,
+      agentId: config.cronAgentId,
       enabled: true,
       schedule: def.schedule,
       payload: def.payload,
-      sessionTarget: "main",
+      sessionTarget: def.sessionTarget,
       wakeMode: "now",
-      delivery: { mode: "none" },
+      delivery: def.delivery,
       createdAtMs: now,
       updatedAtMs: now,
       state: {},
@@ -173,9 +238,11 @@ export async function setupOpenfinclawCronJobs(
     created++;
   }
 
-  if (created > 0) {
+  const migrated = migrateLegacyJobs(store, defs);
+
+  if (created > 0 || migrated > 0) {
     await saveStore(storePath, store);
   }
 
-  return { ok: true, created, existing: existingNames.size };
+  return { ok: true, created, existing: existingNames.size, migrated };
 }

package/src/types.ts

@@ -552,6 +552,12 @@ export interface UnifiedPluginConfig {
   monthlyReportCronExpr: string;
   /** 调度时区 */
   scanTimezone: string;
+  /** 定时任务绑定的专用 agent id；未设置时沿用默认 agent */
+  cronAgentId: string | undefined;
+  /** Cron session 模式："isolated"（独立 session，不阻塞主对话）或 "main"（旧行为） */
+  cronSessionTarget: string;
+  /** Cron 投递模式："announce"（推送到用户最近活跃频道）或 "none" */
+  cronDeliveryMode: string;
 
   // ── 新闻源配置 ────────────────────────────────────────────
   /** 外部新闻 API Key（Finnhub 或 NewsAPI） */

package/src/tournament/cron-setup.ts

@@ -1,102 +0,0 @@
-/**
- * Tournament cron job registration.
- * Follows the same file-based pattern as scheduler/cron-setup.ts.
- * @module openfinclaw/tournament/cron-setup
- */
-import { randomUUID } from "node:crypto";
-import fs from "node:fs";
-import path from "node:path";
-
-const DEFAULT_TOURNAMENT_CRON = "0 9 * * 1-5"; // 9 AM weekdays
-const DEFAULT_TOURNAMENT_TZ = "Asia/Shanghai";
-
-interface StoredCronJob {
-  id: string;
-  name: string;
-  enabled: boolean;
-  schedule: { kind: "cron"; expr: string; tz?: string };
-  payload: { kind: "systemEvent"; text: string };
-  sessionTarget: string;
-  wakeMode: string;
-  delivery: { mode: string };
-  createdAtMs: number;
-  updatedAtMs: number;
-  state: Record<string, unknown>;
-}
-
-interface CronStoreFile {
-  version: 1;
-  jobs: StoredCronJob[];
-}
-
-function defaultStorePath(): string {
-  const home = process.env.HOME ?? process.env.USERPROFILE ?? "";
-  return path.join(home, ".openclaw", "cron", "jobs.json");
-}
-
-async function loadStore(storePath: string): Promise<CronStoreFile> {
-  try {
-    const raw = await fs.promises.readFile(storePath, "utf-8");
-    const parsed = JSON.parse(raw) as Record<string, unknown>;
-    const jobs = Array.isArray(parsed.jobs) ? (parsed.jobs as StoredCronJob[]) : [];
-    return { version: 1, jobs };
-  } catch (err) {
-    if ((err as { code?: string }).code === "ENOENT") {
-      return { version: 1, jobs: [] };
-    }
-    throw err;
-  }
-}
-
-async function saveStore(storePath: string, store: CronStoreFile): Promise<void> {
-  const dir = path.dirname(storePath);
-  await fs.promises.mkdir(dir, { recursive: true });
-  const json = JSON.stringify(store, null, 2);
-  const tmp = `${storePath}.${process.pid}.${Date.now()}.tmp`;
-  await fs.promises.writeFile(tmp, json, "utf-8");
-  await fs.promises.rename(tmp, storePath);
-}
-
-const TOURNAMENT_JOB_NAME = "openfinclaw:tournament";
-
-/**
- * Register the daily tournament cron job.
- * Idempotent: skips if job already exists by name.
- */
-export async function setupTournamentCronJob(config?: {
-  cronExpr?: string;
-  timezone?: string;
-}): Promise<{ ok: boolean; created: boolean }> {
-  const storePath = defaultStorePath();
-  const store = await loadStore(storePath);
-
-  const existingNames = new Set(store.jobs.map((j) => j.name));
-  if (existingNames.has(TOURNAMENT_JOB_NAME)) {
-    return { ok: true, created: false };
-  }
-
-  const cronExpr =
-    config?.cronExpr ?? process.env.OPENFINCLAW_TOURNAMENT_CRON ?? DEFAULT_TOURNAMENT_CRON;
-  const timezone = config?.timezone ?? DEFAULT_TOURNAMENT_TZ;
-
-  const now = Date.now();
-  store.jobs.push({
-    id: randomUUID(),
-    name: TOURNAMENT_JOB_NAME,
-    enabled: true,
-    schedule: { kind: "cron", expr: cronExpr, tz: timezone },
-    payload: {
-      kind: "systemEvent",
-      text: "[openfinclaw:tournament] 每日策略锦标赛触发。请执行今日锦标赛流程。",
-    },
-    sessionTarget: "main",
-    wakeMode: "now",
-    delivery: { mode: "none" },
-    createdAtMs: now,
-    updatedAtMs: now,
-    state: {},
-  });
-
-  await saveStore(storePath, store);
-  return { ok: true, created: true };
-}