Fix strategy switch KV sync timing and account matching edge cases. (#78)

Defer console KV updates until workflow success, normalize variable_scope matching, extract IBKR DCA controls from service targets for workflow sync, and default option overlay UI to current instead of enabled.

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: Pigbibi

.github/workflows/manual-strategy-switch.yml

@@ -369,6 +369,10 @@ jobs:
           import urllib.error
           import urllib.request
 
+          root = os.environ.get("GITHUB_WORKSPACE") or os.getcwd()
+          sys.path.insert(0, os.path.join(root, "scripts"))
+          import runtime_settings
+
           base_url = os.environ["STRATEGY_SWITCH_CONSOLE_URL"].rstrip("/")
           token = os.environ["STRATEGY_SWITCH_SYNC_TOKEN"]
           if not token:
@@ -383,19 +387,15 @@ jobs:
               "target_name": target["target_id"].split("/", 1)[1],
               "strategy_profile": runtime_target["strategy_profile"],
               "execution_mode": runtime_target["execution_mode"],
-              "variable_scope": github["variable_scope"],
+              "variable_scope": "default",
               "plugin_mode": os.environ["PLUGIN_MODE"],
               "option_overlay_mode": os.environ.get("OPTION_OVERLAY_MODE", "current"),
               "deployment_selector": runtime_target["deployment_selector"],
               "account_selector": ",".join(runtime_target["account_selector"]),
               "account_scope": runtime_target["account_scope"],
               "service_name": runtime_target["service_name"],
           }
-          extra_variables = target.get("extra_variables") or {}
-          if extra_variables.get("DCA_MODE"):
-              payload["dca_mode"] = extra_variables["DCA_MODE"]
-          if extra_variables.get("DCA_BASE_INVESTMENT_USD"):
-              payload["dca_base_investment_usd"] = extra_variables["DCA_BASE_INVESTMENT_USD"]
+          payload.update(runtime_settings.extract_account_sync_controls(target))
           if github.get("environment"):
               payload["github_environment"] = github["environment"]
 

scripts/runtime_settings.py

@@ -724,6 +724,63 @@ def command_repository(args: argparse.Namespace) -> int:
     return 0
 
 
+ACCOUNT_SYNC_CONTROL_FIELDS = {
+    "DCA_MODE": "dca_mode",
+    "DCA_BASE_INVESTMENT_USD": "dca_base_investment_usd",
+    "IBIT_ZSCORE_EXIT_MODE": "ibit_zscore_exit_mode",
+}
+
+
+def _service_target_entry_matches(runtime_target: dict[str, Any], entry: dict[str, Any]) -> bool:
+    service_name = str(runtime_target.get("service_name") or "").strip()
+    account_scope = str(runtime_target.get("account_scope") or "").strip()
+    entry_runtime = entry.get("runtime_target") if isinstance(entry.get("runtime_target"), dict) else {}
+    candidates = {
+        str(entry.get("service") or "").strip(),
+        str(entry.get("service_name") or "").strip(),
+        str(entry_runtime.get("service_name") or "").strip(),
+        str(entry_runtime.get("account_scope") or "").strip(),
+        str(entry.get("ACCOUNT_GROUP") or "").strip(),
+    }
+    return service_name in candidates or account_scope in candidates
+
+
+def extract_account_sync_controls(target: dict[str, Any]) -> dict[str, str]:
+    extra_variables = dict(target.get("extra_variables") or {})
+    controls: dict[str, str] = {}
+    for source_key, payload_key in ACCOUNT_SYNC_CONTROL_FIELDS.items():
+        value = extra_variables.get(source_key)
+        if value not in (None, ""):
+            controls[payload_key] = str(value).strip()
+
+    service_targets = extra_variables.get("CLOUD_RUN_SERVICE_TARGETS_JSON")
+    if isinstance(service_targets, str):
+        try:
+            service_targets = json.loads(service_targets)
+        except json.JSONDecodeError:
+            service_targets = None
+
+    runtime_target = target.get("runtime_target") if isinstance(target.get("runtime_target"), dict) else {}
+    if isinstance(service_targets, dict):
+        entries = service_targets.get("targets") if isinstance(service_targets.get("targets"), list) else []
+        matched = next(
+            (
+                entry
+                for entry in entries
+                if isinstance(entry, dict) and _service_target_entry_matches(runtime_target, entry)
+            ),
+            None,
+        )
+        if matched:
+            for source_key, payload_key in ACCOUNT_SYNC_CONTROL_FIELDS.items():
+                if payload_key in controls:
+                    continue
+                value = matched.get(source_key)
+                if value not in (None, ""):
+                    controls[payload_key] = str(value).strip()
+    return controls
+
+
 def build_parser() -> argparse.ArgumentParser:
     parser = argparse.ArgumentParser(description=__doc__)
     subparsers = parser.add_subparsers(dest="command", required=True)

tests/strategy_switch_worker_validation.mjs

@@ -610,6 +610,24 @@ const updatedAccountOptions = __test.updateAccountOptionsDefaultStrategy(
 assert.equal(updatedAccountOptions.changed, true);
 assert.equal(updatedAccountOptions.options.longbridge[1].default_strategy_profile, "soxl_soxx_trend_income");
 
+assert.equal(
+  __test.accountOptionMatchesInputs(
+    { target_name: "sg", variable_scope: "default" },
+    {
+      target_name: "sg",
+      platform: "longbridge",
+      variable_scope: "environment",
+      github_environment: "longbridge-sg",
+    },
+  ),
+  true,
+);
+
+assert.equal(
+  __test.resolvedVariableScope("default", { platform: "longbridge", target_name: "sg" }),
+  "environment",
+);
+
 const updatedPluginModeOptions = __test.updateAccountOptionsDefaultStrategy(
   accountOptions,
   {

tests/test_runtime_settings.py

@@ -172,6 +172,63 @@ def test_manual_switch_account_default_sync_is_warning_only(self):
         self.assertIn("Strategy switch account default sync failed", workflow)
         self.assertIn("::warning::", workflow)
         self.assertIn("raise SystemExit(0)", workflow)
+        self.assertIn('"variable_scope": "default"', workflow)
+        self.assertIn("runtime_settings.extract_account_sync_controls(target)", workflow)
+
+    def test_extract_account_sync_controls_reads_ibkr_service_targets(self):
+        target = {
+            "target_id": "ibkr/demo-ibkr-dca",
+            "runtime_target": {
+                "platform_id": "ibkr",
+                "strategy_profile": "nasdaq_sp500_smart_dca",
+                "service_name": "interactive-brokers-demo-ibkr-dca-service",
+                "account_scope": "demo-ibkr-dca",
+            },
+            "extra_variables": {
+                "CLOUD_RUN_SERVICE_TARGETS_JSON": {
+                    "targets": [
+                        {
+                            "service": "interactive-brokers-demo-ibkr-dca-service",
+                            "ACCOUNT_GROUP": "demo-ibkr-dca",
+                            "DCA_MODE": "smart",
+                            "DCA_BASE_INVESTMENT_USD": "500",
+                            "IBIT_ZSCORE_EXIT_MODE": "paper",
+                        }
+                    ]
+                }
+            },
+        }
+
+        controls = runtime_settings.extract_account_sync_controls(target)
+
+        self.assertEqual(
+            controls,
+            {
+                "dca_mode": "smart",
+                "dca_base_investment_usd": "500",
+                "ibit_zscore_exit_mode": "paper",
+            },
+        )
+
+    def test_extract_account_sync_controls_prefers_top_level_extra_variables(self):
+        target = {
+            "target_id": "firstrade/default",
+            "runtime_target": {
+                "platform_id": "firstrade",
+                "strategy_profile": "ibit_smart_dca",
+                "service_name": "firstrade-quant-service",
+                "account_scope": "US",
+            },
+            "extra_variables": {
+                "DCA_MODE": "fixed",
+                "DCA_BASE_INVESTMENT_USD": "50",
+            },
+        }
+
+        self.assertEqual(
+            runtime_settings.extract_account_sync_controls(target),
+            {"dca_mode": "fixed", "dca_base_investment_usd": "50"},
+        )
 
     def test_strategy_switch_console_deploy_workflow_syncs_bundled_profiles(self):
         workflow = (ROOT / ".github" / "workflows" / "deploy-strategy-switch-console.yml").read_text(

web/strategy-switch-console/index.html

@@ -2512,7 +2512,7 @@ <h2 data-i18n="summary">切换摘要</h2>
         form.optionOverlayMode = configured;
         return;
       }
-      form.optionOverlayMode = optionOverlaySupported(form.strategy) ? "enabled" : "disabled";
+      form.optionOverlayMode = optionOverlaySupported(form.strategy) ? "current" : "disabled";
     }
 
     function syncDcaForAccount(platform) {
@@ -3069,8 +3069,8 @@ <h2 data-i18n="summary">切换摘要</h2>
         currentPluginMode,
         nextPluginMode,
         strategyChanged: Boolean(nextProfile && (!currentProfile || currentProfile !== nextProfile)),
-        modeChanged: Boolean(currentMode && inputs.execution_mode && currentMode !== inputs.execution_mode),
-        pluginModeChanged: Boolean(currentPluginMode && nextPluginMode && currentPluginMode !== nextPluginMode),
+        modeChanged: Boolean(inputs.execution_mode && (!currentMode || currentMode !== inputs.execution_mode)),
+        pluginModeChanged: Boolean(nextPluginMode && (!currentPluginMode || currentPluginMode !== nextPluginMode)),
         runtimeTargetChanged: runtimeTarget.changed,
         reserveCashChanged: reserve.changed,
         incomeLayerChanged: income.changed,
@@ -3766,6 +3766,7 @@ <h2 data-i18n="summary">切换摘要</h2>
         if (!response.ok || !payload.ok) throw new Error(payload.error || t("dispatchFailed"));
         showToast(t("dispatched"), { duration: 4000 });
         if (payload.actions_url) window.open(payload.actions_url, "_blank", "noopener,noreferrer");
+        await refreshConfig();
       } catch (error) {
         showToast(`${t("dispatchFailed")}: ${error.message}`, { duration: 12000 });
       }

web/strategy-switch-console/page_asset.js

@@ -830,14 +830,16 @@ async function dispatchSwitch(request, env) {
     return json({ ok: false, error: `GitHub dispatch failed: ${text.slice(0, 600)}` }, 502);
   }
 
-  const accountOptionsSync = await syncDefaultStrategyForAccount(env, accountConfig.options, inputs, session);
   return json({
     ok: true,
     repository,
     workflow,
     actions_url: `https://github.com/${repository}/actions/workflows/${workflow}`,
-    account_options_synced: accountOptionsSync.synced,
-    account_options_sync: accountOptionsSync,
+    account_options_sync: {
+      synced: false,
+      deferred: true,
+      reason: "workflow_success_required",
+    },
     inputs,
   });
 }
@@ -1146,6 +1148,12 @@ function assertStrategyAllowedForAccount(inputs, accountOption, strategyProfiles
   }
 }
 
+function resolvedVariableScope(value, inputs) {
+  const text = String(value || "").trim();
+  if (!text || text === "default") return defaultInputValue("variable_scope", inputs);
+  return text;
+}
+
 function accountOptionMatchesInputs(option, inputs) {
   if (option.target_name !== inputs.target_name) return false;
   const fields = [
@@ -1157,6 +1165,12 @@ function accountOptionMatchesInputs(option, inputs) {
     "variable_scope",
   ];
   for (const field of fields) {
+    if (field === "variable_scope") {
+      if (resolvedVariableScope(option[field], inputs) !== resolvedVariableScope(inputs[field], inputs)) {
+        return false;
+      }
+      continue;
+    }
     const expected = option[field] || "";
     const actual = inputs[field] || "";
     if (expected && actual !== expected) return false;
@@ -2453,6 +2467,8 @@ function escapeHtml(value) {
 
 export const __test = {
   assertConfiguredAccount,
+  accountOptionMatchesInputs,
+  resolvedVariableScope,
   currentStrategiesTimeoutMs: CURRENT_STRATEGIES_TIMEOUT_MS,
   assertStrategyAllowedForAccount,
   inferAccountSupportedDomains,