Show zero platform reserve defaults in switch console

Author: Pigbibi

tests/strategy_switch_worker_validation.mjs

@@ -27,11 +27,18 @@ assert.ok(indexHtml.includes('id="reserved-cash-ratio-input"'));
 assert.ok(indexHtml.includes('id="reserve-policy-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));"));
+assert.ok(indexHtml.includes("grid-column: 1 / span 2;"));
+assert.ok(indexHtml.includes("grid-column: 3 / span 2;"));
 assert.ok(indexHtml.includes('reservePolicyNone'));
 assert.ok(indexHtml.includes('reservePolicyRatio'));
 assert.ok(indexHtml.includes('reservePolicyFloor'));
 assert.ok(indexHtml.includes('reservePolicyMax'));
 assert.ok(indexHtml.includes('reservedCashDefault'));
+assert.ok(indexHtml.includes('平台默认：0 {currency} / 0%'));
+assert.equal(indexHtml.includes('比例沿用策略默认，通常 3%'), false);
+assert.equal(indexHtml.includes('平台默认：max(0 {currency}, 3%)'), false);
+assert.ok(indexHtml.includes('function platformReservedCashDefaultText('));
 assert.ok(indexHtml.includes('platformMinReservedCashVariables'));
 assert.ok(indexHtml.includes('platformReservedCashRatioVariables'));
 assert.ok(indexHtml.includes('extra_variables_json'));

web/strategy-switch-console/README.md

@@ -118,7 +118,7 @@ The Worker validates dispatch inputs against this config, including whether the
 
 For signed-in users, `/api/config` also reads the target repositories' current GitHub Variables. It prefers account-specific `CLOUD_RUN_SERVICE_TARGETS_JSON`, then matching `RUNTIME_TARGET_JSON.strategy_profile`, then `STRATEGY_PROFILE`; if none can be read safely, the page falls back to `default_strategy_profile`.
 
-The switch form also accepts optional reserved-cash overrides: minimum reserved cash in the selected account currency and reserved-cash ratio. Set `cash_currency` to `USD` or `HKD` in account config when the account has a fixed cash currency; otherwise the page infers HKD for HK-equity strategy selections and USD for US-equity selections. Leave reserved-cash fields blank to keep the platform's existing defaults. When set, the Worker passes them to `manual-strategy-switch.yml`, which writes the platform-specific variables such as `IBKR_MIN_RESERVED_CASH_USD` and `IBKR_RESERVED_CASH_RATIO`.
+The switch form also accepts optional reserved-cash overrides: minimum reserved cash in the selected account currency and reserved-cash ratio. Set `cash_currency` to `USD` or `HKD` in account config when the account has a fixed cash currency; otherwise the page infers HKD for HK-equity strategy selections and USD for US-equity selections. Keeping the current policy leaves existing platform variables unchanged; when no explicit platform variables are configured, the platform source default is no extra reserve (`0` in the account currency and `0%`). When set, the Worker passes the values to `manual-strategy-switch.yml`, which writes the platform-specific variables such as `IBKR_MIN_RESERVED_CASH_USD` and `IBKR_RESERVED_CASH_RATIO`.
 
 Successful strategy switches also sync the selected account's `default_strategy_profile` back to the KV `account_options` key. The web endpoint does this immediately after dispatching the workflow, and the manual GitHub workflow calls the Worker's internal sync endpoint after applying platform variables when the `runtime-strategy-switch` environment variable `STRATEGY_SWITCH_CONSOLE_URL` is set. For that workflow callback, set the GitHub environment secret `STRATEGY_SWITCH_SYNC_TOKEN` to the same value as the Worker secret with that name.
 

web/strategy-switch-console/README.zh-CN.md

@@ -125,7 +125,7 @@ Worker 会校验 dispatch 参数必须匹配这里的某个账号项，也会校
 
 登录用户访问 `/api/config` 时，Worker 还会读取目标平台仓库的当前 GitHub Variables。读取优先级是账号匹配的 `CLOUD_RUN_SERVICE_TARGETS_JSON`、匹配的 `RUNTIME_TARGET_JSON.strategy_profile`、`STRATEGY_PROFILE`；都读不到时，页面才回退到 `default_strategy_profile`。
 
-切换表单也支持可选的预留现金覆盖项：所选账号币种下的最小预留现金和预留现金比例。如果账号现金币种固定，可以在账号配置里把 `cash_currency` 设为 `USD` 或 `HKD`；否则页面会按所选策略推断，港股策略显示 HKD，美股策略显示 USD。预留现金字段留空表示沿用平台现有默认值。填写后，Worker 会把它们传给 `manual-strategy-switch.yml`，由 workflow 写入平台对应变量，例如 `IBKR_MIN_RESERVED_CASH_USD` 和 `IBKR_RESERVED_CASH_RATIO`。
+切换表单也支持可选的预留现金覆盖项：所选账号币种下的最小预留现金和预留现金比例。如果账号现金币种固定，可以在账号配置里把 `cash_currency` 设为 `USD` 或 `HKD`；否则页面会按所选策略推断，港股策略显示 HKD，美股策略显示 USD。沿用当前策略会保留平台现有变量；如果平台没有显式配置预留现金变量，源码默认是不额外预留（账号币种 `0`、比例 `0%`）。填写后，Worker 会把它们传给 `manual-strategy-switch.yml`，由 workflow 写入平台对应变量，例如 `IBKR_MIN_RESERVED_CASH_USD` 和 `IBKR_RESERVED_CASH_RATIO`。
 
 策略切换成功后也会把当前账号的 `default_strategy_profile` 同步回 KV 的 `account_options` key。网页接口会在触发 workflow 成功后立即同步；如果 `runtime-strategy-switch` 环境变量里配置了 `STRATEGY_SWITCH_CONSOLE_URL`，手动 GitHub workflow 在写入平台变量后也会回调 Worker 内部接口同步。这个 workflow 回调需要 GitHub 环境 secret `STRATEGY_SWITCH_SYNC_TOKEN`，值要和 Worker 里同名 secret 保持一致。
 

web/strategy-switch-console/index.html

@@ -406,7 +406,7 @@
 
     .quick-form {
       display: grid;
-      grid-template-columns: minmax(0, 1.2fr) repeat(2, minmax(0, 0.5fr));
+      grid-template-columns: repeat(4, minmax(0, 1fr));
       align-items: start;
       gap: 14px;
     }
@@ -424,20 +424,20 @@
 
     .account-block,
     .mode-block {
-      grid-column: 1;
+      grid-column: 1 / span 2;
     }
 
     .strategy-block,
     .reserve-policy-block {
-      grid-column: 2 / span 2;
+      grid-column: 3 / span 2;
     }
 
     .min-reserve-block {
-      grid-column: 2;
+      grid-column: 1 / span 2;
     }
 
     .reserve-ratio-block {
-      grid-column: 3;
+      grid-column: 3 / span 2;
     }
 
     select,
@@ -916,7 +916,7 @@ <h2 data-i18n="summary">切换摘要</h2>
         reservePolicyMax: "固定金额和比例取较大值",
         reservedCashModeMeta: "选择是否沿用、清空或覆盖平台预留现金。",
         reservedCashNone: "不设置",
-        reservedCashDefault: "未配置（使用平台内置默认）",
+        reservedCashDefault: "未配置（平台默认：0 {currency} / 0%）",
         reservedCashMeta: "固定金额下限，可单独设置或与比例取较大值。",
         reservedCashRatioMeta: "例如 0.03 表示 3%。",
         summary: "当前 / 待提交",
@@ -984,7 +984,7 @@ <h2 data-i18n="summary">切换摘要</h2>
         reservePolicyMax: "Max of amount and ratio",
         reservedCashModeMeta: "Choose whether to keep, clear, or override platform reserved cash.",
         reservedCashNone: "None",
-        reservedCashDefault: "Not configured (uses platform built-in default)",
+        reservedCashDefault: "Not configured (platform default: 0 {currency} / 0%)",
         reservedCashMeta: "Fixed cash floor. Use alone or with a ratio.",
         reservedCashRatioMeta: "Use 0.03 for 3%.",
         summary: "Current / Pending",
@@ -1431,6 +1431,10 @@ <h2 data-i18n="summary">切换摘要</h2>
       return formatRatioPercent(ratio);
     }
 
+    function platformReservedCashDefaultText(platform = state.selected, account = selectedAccount(platform)) {
+      return t("reservedCashDefault").replace("{currency}", selectedCashCurrency(platform, account));
+    }
+
     function currentReservedCashPolicyText(platform = state.selected, account = selectedAccount(platform)) {
       const entry = currentEntryForAccount(platform, account);
       const policy = currentReservePolicyForAccount(platform, account);
@@ -1441,7 +1445,7 @@ <h2 data-i18n="summary">切换摘要</h2>
         },
         platform,
         account,
-        entry ? t("reservedCashDefault") : t("notRead"),
+        entry ? platformReservedCashDefaultText(platform, account) : t("notRead"),
       );
     }