Fix income layer controls

Author: Pigbibi

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

@@ -82,6 +82,14 @@ on:
         description: "Optional platform minimum reserved cash override."
         required: false
         type: string
+      income_layer_start_usd:
+        description: "Optional income layer activation asset amount."
+        required: false
+        type: string
+      income_layer_max_ratio:
+        description: "Optional income layer maximum allocation ratio."
+        required: false
+        type: string
       income_threshold_usd:
         description: "Optional TQQQ income threshold override."
         required: false
@@ -147,6 +155,8 @@ jobs:
       EXTRA_VARIABLES_JSON: ${{ inputs.extra_variables_json }}
       RESERVED_CASH_RATIO: ${{ inputs.reserved_cash_ratio }}
       MIN_RESERVED_CASH_USD: ${{ inputs.min_reserved_cash_usd }}
+      INCOME_LAYER_START_USD: ${{ inputs.income_layer_start_usd }}
+      INCOME_LAYER_MAX_RATIO: ${{ inputs.income_layer_max_ratio }}
       INCOME_THRESHOLD_USD: ${{ inputs.income_threshold_usd }}
       QQQI_INCOME_RATIO: ${{ inputs.qqqi_income_ratio }}
       SERVICE_TARGETS_MODE: ${{ inputs.service_targets_mode }}
@@ -281,6 +291,12 @@ jobs:
           if [ -n "${MIN_RESERVED_CASH_USD:-}" ]; then
             args+=(--min-reserved-cash-usd "${MIN_RESERVED_CASH_USD}")
           fi
+          if [ -n "${INCOME_LAYER_START_USD:-}" ]; then
+            args+=(--income-layer-start-usd "${INCOME_LAYER_START_USD}")
+          fi
+          if [ -n "${INCOME_LAYER_MAX_RATIO:-}" ]; then
+            args+=(--income-layer-max-ratio "${INCOME_LAYER_MAX_RATIO}")
+          fi
           if [ -n "${INCOME_THRESHOLD_USD:-}" ]; then
             args+=(--income-threshold-usd "${INCOME_THRESHOLD_USD}")
           fi

scripts/build_runtime_switch.py

@@ -52,6 +52,7 @@
 }
 INCOME_LAYER_VARIABLES = (
     "INCOME_LAYER_ENABLED",
+    "INCOME_LAYER_START_USD",
     "INCOME_LAYER_MAX_RATIO",
 )
 RUNTIME_TARGET_VARIABLES = (
@@ -353,6 +354,10 @@ def build_switch_target(args: argparse.Namespace) -> dict[str, Any]:
         extra_variables[PLATFORM_RESERVED_CASH_RATIO_VARIABLES[platform]] = args.reserved_cash_ratio
     if args.min_reserved_cash_usd:
         extra_variables[PLATFORM_MIN_RESERVED_CASH_VARIABLES[platform]] = args.min_reserved_cash_usd
+    if args.income_layer_start_usd:
+        extra_variables["INCOME_LAYER_START_USD"] = args.income_layer_start_usd
+    if args.income_layer_max_ratio:
+        extra_variables["INCOME_LAYER_MAX_RATIO"] = args.income_layer_max_ratio
     if args.income_threshold_usd:
         extra_variables["INCOME_THRESHOLD_USD"] = args.income_threshold_usd
     if args.qqqi_income_ratio:
@@ -418,6 +423,8 @@ def build_parser() -> argparse.ArgumentParser:
     parser.add_argument("--extra-variable", action="append", default=[], help="NAME=VALUE non-secret extra variable")
     parser.add_argument("--reserved-cash-ratio", default="")
     parser.add_argument("--min-reserved-cash-usd", default="")
+    parser.add_argument("--income-layer-start-usd", default="")
+    parser.add_argument("--income-layer-max-ratio", default="")
     parser.add_argument("--income-threshold-usd", default="")
     parser.add_argument("--qqqi-income-ratio", default="")
     parser.add_argument("--existing-service-targets-json-file", default="")

tests/strategy_switch_worker_validation.mjs

@@ -27,6 +27,13 @@ assert.ok(indexHtml.includes('id="reserved-cash-ratio-input"'));
 assert.ok(indexHtml.includes('id="reserve-policy-mode-select"'));
 assert.ok(indexHtml.includes('id="runtime-target-enabled-select"'));
 assert.ok(indexHtml.includes('id="plugin-mode-select"'));
+assert.ok(indexHtml.includes('id="income-layer-start-usd-input"'));
+assert.ok(indexHtml.includes('incomeLayerStartUsd: "收入层起始金额"'));
+assert.ok(indexHtml.includes('incomeLayerStartUsd: "Income layer start amount"'));
+assert.ok(indexHtml.includes('incomeLayerStartUsdVariable = "INCOME_LAYER_START_USD"'));
+assert.ok(indexHtml.includes('el("income-layer-mode-select").addEventListener("change"'));
+assert.ok(indexHtml.includes('el("income-layer-start-usd-input").addEventListener("input"'));
+assert.ok(indexHtml.includes('el("income-layer-max-ratio-input").addEventListener("input"'));
 assert.ok(indexHtml.includes("account-block"));
 assert.ok(indexHtml.includes("strategy-block"));
 assert.ok(indexHtml.includes("grid-template-columns: repeat(4, minmax(0, 1fr));"));
@@ -312,9 +319,13 @@ const normalizedReservedCashInputs = __test.normalizeSwitchInputs({
   trigger_platform_sync: "true",
   reserved_cash_ratio: "0.03",
   min_reserved_cash_usd: "150",
+  income_layer_start_usd: "250000",
+  income_layer_max_ratio: "0.55",
 });
 assert.equal(normalizedReservedCashInputs.reserved_cash_ratio, "0.03");
 assert.equal(normalizedReservedCashInputs.min_reserved_cash_usd, "150");
+assert.equal(normalizedReservedCashInputs.income_layer_start_usd, "250000");
+assert.equal(normalizedReservedCashInputs.income_layer_max_ratio, "0.55");
 const normalizedPluginInputs = __test.normalizeSwitchInputs({
   platform: "ibkr",
   target_name: "ibkr-primary",
@@ -426,6 +437,18 @@ globalThis.fetch = async (url) => {
       headers: { "Content-Type": "application/json" },
     });
   }
+  if (requestUrl.endsWith("/INCOME_LAYER_START_USD")) {
+    return new Response(JSON.stringify({ value: "150000" }), {
+      status: 200,
+      headers: { "Content-Type": "application/json" },
+    });
+  }
+  if (requestUrl.endsWith("/INCOME_LAYER_MAX_RATIO")) {
+    return new Response(JSON.stringify({ value: "0.95" }), {
+      status: 200,
+      headers: { "Content-Type": "application/json" },
+    });
+  }
   if (requestUrl.endsWith("/RUNTIME_TARGET_ENABLED")) {
     return new Response(JSON.stringify({ value: "false" }), {
       status: 200,
@@ -455,6 +478,8 @@ try {
   assert.equal(currentStrategies.schwab.default.execution_mode, "live");
   assert.equal(currentStrategies.schwab.default.min_reserved_cash_usd, "150");
   assert.equal(currentStrategies.schwab.default.reserved_cash_ratio, "0.03");
+  assert.equal(currentStrategies.schwab.default.income_layer_start_usd, "150000");
+  assert.equal(currentStrategies.schwab.default.income_layer_max_ratio, "0.95");
   assert.equal(currentStrategies.schwab.default.runtime_target_enabled, false);
   assert.equal(currentStrategies.schwab.default.source, "RUNTIME_TARGET_JSON");
 } finally {
@@ -472,6 +497,8 @@ globalThis.fetch = async (url) => {
             ACCOUNT_GROUP: "demo-ibkr-tqqq",
             IBKR_MIN_RESERVED_CASH_USD: "150",
             IBKR_RESERVED_CASH_RATIO: "0.03",
+            INCOME_LAYER_START_USD: "250000",
+            INCOME_LAYER_MAX_RATIO: "0.55",
             RUNTIME_TARGET_ENABLED: "false",
             runtime_target: {
               platform_id: "ibkr",
@@ -496,6 +523,8 @@ try {
   assert.equal(currentStrategies.ibkr["ibkr-primary"].strategy_profile, "tqqq_growth_income");
   assert.equal(currentStrategies.ibkr["ibkr-primary"].min_reserved_cash_usd, "150");
   assert.equal(currentStrategies.ibkr["ibkr-primary"].reserved_cash_ratio, "0.03");
+  assert.equal(currentStrategies.ibkr["ibkr-primary"].income_layer_start_usd, "250000");
+  assert.equal(currentStrategies.ibkr["ibkr-primary"].income_layer_max_ratio, "0.55");
   assert.equal(currentStrategies.ibkr["ibkr-primary"].runtime_target_enabled, false);
   assert.equal(currentStrategies.ibkr["ibkr-primary"].source, "CLOUD_RUN_SERVICE_TARGETS_JSON");
 } finally {

tests/test_runtime_settings.py

@@ -313,6 +313,7 @@ def test_build_switch_target_patches_ibkr_service_targets_json(self):
                     "IBKR_MIN_RESERVED_CASH_USD": "150",
                     "IBKR_RESERVED_CASH_RATIO": "0.03",
                     "INCOME_LAYER_ENABLED": "true",
+                    "INCOME_LAYER_START_USD": "250000",
                     "INCOME_LAYER_MAX_RATIO": "0.55",
                     "RUNTIME_TARGET_ENABLED": "false",
                     "runtime_target": {
@@ -376,6 +377,7 @@ def test_build_switch_target_patches_ibkr_service_targets_json(self):
         self.assertEqual(selected["IBKR_MIN_RESERVED_CASH_USD"], "150")
         self.assertEqual(selected["IBKR_RESERVED_CASH_RATIO"], "0.03")
         self.assertEqual(selected["INCOME_LAYER_ENABLED"], "true")
+        self.assertEqual(selected["INCOME_LAYER_START_USD"], "250000")
         self.assertEqual(selected["INCOME_LAYER_MAX_RATIO"], "0.55")
         self.assertEqual(selected["RUNTIME_TARGET_ENABLED"], "false")
         self.assertEqual(