Add plugin mode to strategy switch

Author: Pigbibi

tests/strategy_switch_worker_validation.mjs

@@ -25,6 +25,7 @@ assert.equal(indexHtml.includes("loginLink.hidden = !state.auth.available || sig
 assert.ok(indexHtml.includes('id="min-reserved-cash-input"'));
 assert.ok(indexHtml.includes('id="reserved-cash-ratio-input"'));
 assert.ok(indexHtml.includes('id="reserve-policy-mode-select"'));
+assert.ok(indexHtml.includes('id="plugin-mode-select"'));
 assert.ok(indexHtml.includes("account-block"));
 assert.ok(indexHtml.includes("strategy-block"));
 assert.ok(indexHtml.includes("grid-template-columns: repeat(4, minmax(0, 1fr));"));
@@ -34,6 +35,8 @@ assert.ok(indexHtml.includes('reservePolicyNone'));
 assert.ok(indexHtml.includes('reservePolicyRatio'));
 assert.ok(indexHtml.includes('reservePolicyFloor'));
 assert.ok(indexHtml.includes('reservePolicyMax'));
+assert.ok(indexHtml.includes('pluginModeAuto'));
+assert.ok(indexHtml.includes('pluginModeNone'));
 assert.ok(indexHtml.includes('reservedCashDefault'));
 assert.ok(indexHtml.includes('paper: "模拟"'));
 assert.ok(indexHtml.includes('paper: "Dry run"'));
@@ -53,6 +56,7 @@ assert.ok(indexHtml.includes('.reserve-ratio-block'));
 assert.ok(indexHtml.includes('.summary-row.pending'));
 assert.ok(indexHtml.includes('function currentEntryHasState('));
 assert.ok(indexHtml.includes('changes.reserveCashChanged'));
+assert.ok(indexHtml.includes('changes.pluginModeChanged'));
 assert.ok(indexHtml.includes('!hasPendingChange'));
 assert.ok(indexHtml.includes('hasPendingChange ? t("readyNote") : ""'));
 assert.equal(indexHtml.includes('hasPendingChange ? t("readyNote") : t("noChangesNote")'), false);
@@ -300,6 +304,14 @@ const normalizedReservedCashInputs = __test.normalizeSwitchInputs({
 });
 assert.equal(normalizedReservedCashInputs.reserved_cash_ratio, "0.03");
 assert.equal(normalizedReservedCashInputs.min_reserved_cash_usd, "150");
+const normalizedPluginInputs = __test.normalizeSwitchInputs({
+  platform: "ibkr",
+  target_name: "ibkr-primary",
+  strategy_profile: "tqqq_growth_income",
+  execution_mode: "live",
+  plugin_mode: "none",
+});
+assert.equal(normalizedPluginInputs.plugin_mode, "none");
 const normalizedReserveClearInputs = __test.normalizeSwitchInputs({
   platform: "ibkr",
   target_name: "ibkr-primary",
@@ -346,6 +358,21 @@ const updatedAccountOptions = __test.updateAccountOptionsDefaultStrategy(
 assert.equal(updatedAccountOptions.changed, true);
 assert.equal(updatedAccountOptions.options.longbridge[1].default_strategy_profile, "soxl_soxx_trend_income");
 
+const updatedPluginModeOptions = __test.updateAccountOptionsDefaultStrategy(
+  accountOptions,
+  {
+    platform: "longbridge",
+    target_name: "sg",
+    account_selector: "SG",
+    strategy_profile: "tqqq_growth_income",
+    execution_mode: "live",
+    variable_scope: "default",
+    plugin_mode: "none",
+  },
+);
+assert.equal(updatedPluginModeOptions.changed, true);
+assert.equal(updatedPluginModeOptions.options.longbridge[1].plugin_mode, "none");
+
 const kvWrites = new Map();
 const syncResult = await __test.syncDefaultStrategyForAccount(
   {

web/strategy-switch-console/index.html

@@ -423,20 +423,15 @@
     }
 
     .account-block,
-    .mode-block {
+    .mode-block,
+    .reserve-policy-block,
+    .reserve-ratio-block {
       grid-column: 1 / span 2;
     }
 
     .strategy-block,
-    .reserve-policy-block {
-      grid-column: 3 / span 2;
-    }
-
+    .plugin-mode-block,
     .min-reserve-block {
-      grid-column: 1 / span 2;
-    }
-
-    .reserve-ratio-block {
       grid-column: 3 / span 2;
     }
 
@@ -671,6 +666,7 @@
       .account-block,
       .strategy-block,
       .mode-block,
+      .plugin-mode-block,
       .reserve-policy-block,
       .min-reserve-block,
       .reserve-ratio-block {
@@ -786,6 +782,12 @@ <h2 id="platform-title">LongBridge</h2>
             </div>
           </div>
 
+          <label class="control-block plugin-mode-block">
+            <span data-i18n="pluginMode">策略插件</span>
+            <select id="plugin-mode-select"></select>
+            <span class="selection-meta" data-i18n="pluginModeMeta">控制本次切换是否启用策略插件。</span>
+          </label>
+
           <label class="control-block reserve-policy-block">
             <span data-i18n="reservedCashMode">预留现金策略</span>
             <select id="reserve-policy-mode-select"></select>
@@ -841,6 +843,7 @@ <h2 data-i18n="summary">切换摘要</h2>
     };
 
     const reservePolicyModes = ["current", "none", "ratio", "floor", "max"];
+    const pluginModes = ["auto", "none"];
     const platformMinReservedCashVariables = {
       longbridge: "LONGBRIDGE_MIN_RESERVED_CASH_USD",
       ibkr: "IBKR_MIN_RESERVED_CASH_USD",
@@ -906,6 +909,10 @@ <h2 data-i18n="summary">切换摘要</h2>
         mode: "模式",
         live: "实盘",
         paper: "模拟",
+        pluginMode: "策略插件",
+        pluginModeAuto: "按策略配置启用",
+        pluginModeNone: "禁用插件",
+        pluginModeMeta: "控制本次切换是否启用策略插件。",
         minReservedCash: "最小预留现金 ({currency})",
         reservedCashRatio: "预留现金比例",
         reservedCashMode: "预留现金策略",
@@ -942,6 +949,8 @@ <h2 data-i18n="summary">切换摘要</h2>
         reservedCashPolicy: "当前预留现金",
         pendingReservedCashPolicy: "待提交预留现金",
         pendingMode: "待提交模式",
+        currentPluginMode: "当前插件",
+        pendingPluginMode: "待提交插件",
         unchanged: "不变",
         copied: "已复制状态",
         dispatching: "正在触发 workflow...",
@@ -974,6 +983,10 @@ <h2 data-i18n="summary">切换摘要</h2>
         mode: "Mode",
         live: "Live",
         paper: "Dry run",
+        pluginMode: "Strategy plugins",
+        pluginModeAuto: "Use strategy default",
+        pluginModeNone: "Disable plugins",
+        pluginModeMeta: "Controls whether this switch enables strategy plugins.",
         minReservedCash: "Minimum reserved cash ({currency})",
         reservedCashRatio: "Reserved cash ratio",
         reservedCashMode: "Reserved cash policy",
@@ -1010,6 +1023,8 @@ <h2 data-i18n="summary">切换摘要</h2>
         reservedCashPolicy: "Current reserved cash",
         pendingReservedCashPolicy: "Pending reserved cash",
         pendingMode: "Pending mode",
+        currentPluginMode: "Current plugins",
+        pendingPluginMode: "Pending plugins",
         unchanged: "Unchanged",
         copied: "State copied",
         dispatching: "Dispatching workflow...",
@@ -1048,10 +1063,10 @@ <h2 data-i18n="summary">切换摘要</h2>
       configSource: "default",
       repositories: clone(defaultRepositories),
       forms: {
-        longbridge: { accountKey: "preview", strategy: "", executionMode: "live", ...defaultReserveForm() },
-        ibkr: { accountKey: "preview", strategy: "", executionMode: "live", ...defaultReserveForm() },
-        schwab: { accountKey: "preview", strategy: "", executionMode: "live", ...defaultReserveForm() },
-        firstrade: { accountKey: "preview", strategy: "", executionMode: "live", ...defaultReserveForm() },
+        longbridge: { accountKey: "preview", strategy: "", executionMode: "live", pluginMode: "auto", ...defaultReserveForm() },
+        ibkr: { accountKey: "preview", strategy: "", executionMode: "live", pluginMode: "auto", ...defaultReserveForm() },
+        schwab: { accountKey: "preview", strategy: "", executionMode: "live", pluginMode: "auto", ...defaultReserveForm() },
+        firstrade: { accountKey: "preview", strategy: "", executionMode: "live", pluginMode: "auto", ...defaultReserveForm() },
       },
     };
 
@@ -1179,6 +1194,14 @@ <h2 data-i18n="summary">切换摘要</h2>
       return mode === "paper" ? t("paper") : t("live");
     }
 
+    function normalizePluginMode(value) {
+      return pluginModes.includes(value) ? value : "auto";
+    }
+
+    function pluginModeLabel(mode) {
+      return mode === "none" ? t("pluginModeNone") : t("pluginModeAuto");
+    }
+
     function currentEntryForAccount(platform, account) {
       const byPlatform = state.currentStrategies[platform] || {};
       const keys = [account?.key, account?.target_name, account?.label]
@@ -1212,6 +1235,11 @@ <h2 data-i18n="summary">切换摘要</h2>
       return reservePolicyFromEntry(entry);
     }
 
+    function currentPluginModeForAccount(platform, account) {
+      void platform;
+      return normalizePluginMode(account?.plugin_mode);
+    }
+
     function reservePolicyFromEntry(entry) {
       return {
         minReservedCashUsd: cleanDisplayNumber(entry?.min_reserved_cash_usd ?? entry?.reserved_cash_floor_usd),
@@ -1291,6 +1319,7 @@ <h2 data-i18n="summary">切换摘要</h2>
         platform,
         account,
       );
+      state.forms[platform].pluginMode = currentPluginModeForAccount(platform, account);
       syncReservePolicyForAccount(platform);
     }
 
@@ -1310,6 +1339,7 @@ <h2 data-i18n="summary">切换摘要</h2>
         state.forms[platform].accountKey = options[0].key;
         state.forms[platform].reservedCashTouched = false;
         state.forms[platform].strategy = defaultStrategyForAccount(platform, options[0], state.forms[platform].strategy);
+        state.forms[platform].pluginMode = currentPluginModeForAccount(platform, options[0]);
         syncReservePolicyForAccount(platform);
       }
     }
@@ -1391,7 +1421,7 @@ <h2 data-i18n="summary">切换摘要</h2>
         strategy_profile: form.strategy,
         execution_mode: form.executionMode,
         variable_scope: account.variable_scope || "default",
-        plugin_mode: account.plugin_mode || "auto",
+        plugin_mode: normalizePluginMode(form.pluginMode),
         service_targets_mode: "auto",
         apply: "true",
         trigger_platform_sync: "true",
@@ -1488,21 +1518,26 @@ <h2 data-i18n="summary">切换摘要</h2>
       const nextProfile = cleanStrategyProfile(inputs.strategy_profile);
       const currentEntry = currentEntryForAccount(platform, account);
       const currentMode = normalizeExecutionMode(currentEntry?.execution_mode, currentEntry?.dry_run_only);
+      const currentPluginMode = currentPluginModeForAccount(platform, account);
+      const nextPluginMode = normalizePluginMode(inputs.plugin_mode);
       const reserve = pendingReservePolicy(inputs, platform, account);
       return {
         currentProfile,
         nextProfile,
         currentMode,
+        currentPluginMode,
+        nextPluginMode,
         strategyChanged: Boolean(nextProfile && (!currentProfile || currentProfile !== nextProfile)),
         modeChanged: Boolean(currentMode && inputs.execution_mode && currentMode !== inputs.execution_mode),
+        pluginModeChanged: Boolean(currentPluginMode && nextPluginMode && currentPluginMode !== nextPluginMode),
         reserveCashChanged: reserve.changed,
         reserve,
       };
     }
 
     function hasPendingChanges(inputs, platform = state.selected, account = selectedAccount(platform)) {
       const changes = pendingChangeState(inputs, platform, account);
-      return Boolean(changes.strategyChanged || changes.modeChanged || changes.reserveCashChanged);
+      return Boolean(changes.strategyChanged || changes.modeChanged || changes.pluginModeChanged || changes.reserveCashChanged);
     }
 
     function formatRatioPercent(value) {
@@ -1520,6 +1555,7 @@ <h2 data-i18n="summary">切换摘要</h2>
         [t("selectedAccount"), account.label],
         [t("currentStrategy"), currentStrategyText],
         [t("selectedMarket"), supportedDomainLabel(state.selected, account)],
+        [t("currentPluginMode"), pluginModeLabel(changes.currentPluginMode)],
         [t("reservedCashPolicy"), currentReservedCashPolicyText(state.selected, account)],
       ];
       if (changes.reserveCashChanged) {
@@ -1528,6 +1564,9 @@ <h2 data-i18n="summary">切换摘要</h2>
       if (changes.modeChanged) {
         rows.push([t("pendingMode"), modeLabel(inputs.execution_mode), "pending"]);
       }
+      if (changes.pluginModeChanged) {
+        rows.push([t("pendingPluginMode"), pluginModeLabel(changes.nextPluginMode), "pending"]);
+      }
       if (changes.strategyChanged && changes.nextProfile) {
         rows.push([t("nextStrategy"), strategyLabel(changes.nextProfile), "pending"]);
       }
@@ -1585,6 +1624,7 @@ <h2 data-i18n="summary">切换摘要</h2>
       const choices = strategyChoicesForAccount(platform, account);
       const accountSelect = el("account-select");
       const strategySelect = el("strategy-select");
+      const pluginModeSelect = el("plugin-mode-select");
       const reservePolicyModeSelect = el("reserve-policy-mode-select");
       const minReservedCashInput = el("min-reserved-cash-input");
       const reservedCashRatioInput = el("reserved-cash-ratio-input");
@@ -1600,6 +1640,7 @@ <h2 data-i18n="summary">切换摘要</h2>
       if (!showPrivateControls) {
         accountSelect.replaceChildren();
         strategySelect.replaceChildren();
+        pluginModeSelect.replaceChildren();
         reservePolicyModeSelect.replaceChildren();
         minReservedCashInput.value = "";
         reservedCashRatioInput.value = "";
@@ -1633,6 +1674,10 @@ <h2 data-i18n="summary">切换摘要</h2>
       el("strategy-meta").textContent = account
         ? t("strategyMeta").replace("{domains}", supportedDomainLabel(platform, account))
         : "";
+      pluginModeSelect.replaceChildren();
+      for (const mode of pluginModes) {
+        pluginModeSelect.append(new Option(pluginModeLabel(mode), mode, false, mode === normalizePluginMode(form.pluginMode)));
+      }
       reservePolicyModeSelect.replaceChildren();
       for (const mode of reservePolicyModes) {
         reservePolicyModeSelect.append(new Option(t(`reservePolicy${mode[0].toUpperCase()}${mode.slice(1)}`), mode, false, mode === normalizeReservePolicyMode(form.reservePolicyMode)));
@@ -1937,6 +1982,11 @@ <h2 data-i18n="summary">切换摘要</h2>
       render();
     });
 
+    el("plugin-mode-select").addEventListener("change", () => {
+      state.forms[state.selected].pluginMode = normalizePluginMode(el("plugin-mode-select").value);
+      render();
+    });
+
     el("reserve-policy-mode-select").addEventListener("change", () => {
       const form = state.forms[state.selected];
       form.reservePolicyMode = normalizeReservePolicyMode(el("reserve-policy-mode-select").value);

web/strategy-switch-console/page_asset.js

@@ -764,9 +764,22 @@ function updateAccountOptionsDefaultStrategy(accountOptions, inputs) {
   const updatedPlatformOptions = platformOptions.map((option) => {
     if (!accountOptionMatchesInputs(option, inputs)) return option;
     matched = true;
-    if (option.default_strategy_profile === inputs.strategy_profile) return option;
-    changed = true;
-    return { ...option, default_strategy_profile: inputs.strategy_profile };
+    const nextOption = { ...option };
+    let optionChanged = false;
+    if (nextOption.default_strategy_profile !== inputs.strategy_profile) {
+      nextOption.default_strategy_profile = inputs.strategy_profile;
+      optionChanged = true;
+    }
+    if (inputs.plugin_mode === "auto" || inputs.plugin_mode === "none") {
+      const currentPluginMode = nextOption.plugin_mode || "auto";
+      if (currentPluginMode !== inputs.plugin_mode) {
+        nextOption.plugin_mode = inputs.plugin_mode;
+        optionChanged = true;
+      }
+    }
+    changed = changed || optionChanged;
+    if (!optionChanged) return option;
+    return nextOption;
   });
   if (!matched) throw new Error("switch inputs do not match configured account options");
   return {
@@ -857,7 +870,6 @@ function accountOptionMatchesInputs(option, inputs) {
     "service_name",
     "github_environment",
     "variable_scope",
-    "plugin_mode",
   ];
   for (const field of fields) {
     const expected = option[field] || "";