Skip to content

Disable no-op strategy switch actions #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Pigbibi merged 1 commit into from
Jun 9, 2026
Merged

Disable no-op strategy switch actions #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions tests/strategy_switch_worker_validation.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,15 @@ assert.ok(indexHtml.includes('id="min-reserved-cash-input"'));
assert.ok(indexHtml.includes('id="reserved-cash-ratio-input"'));
assert.ok(indexHtml.includes('function selectedCashCurrency('));
assert.ok(indexHtml.includes('function currentReservedCashPolicyText('));
assert.ok(indexHtml.includes('function hasPendingChanges('));
assert.ok(indexHtml.includes('function pendingChangeState('));
assert.ok(indexHtml.includes('reservedCashTouched: false'));
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('!hasPendingChange'));
assert.ok(indexHtml.includes('noChangesNote'));
assert.equal(indexHtml.includes('placeholder="150"'), false);
assert.equal(indexHtml.includes('placeholder="0.03"'), false);
assert.equal(indexHtml.includes("ibkr-primary"), false);
Expand Down
86 changes: 72 additions & 14 deletions web/strategy-switch-console/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -884,11 +884,13 @@ <h2 data-i18n="summary">切换摘要</h2>
loadingConfig: "读取配置中",
configureAccounts: "配置账号后切换",
runSwitch: "一键切换",
noChanges: "无变更",
readonlyNote: "登录后才可执行切换。",
publicReadonly: "登录后查看账号配置。",
loadingConfigNote: "正在读取账号配置和当前状态。",
missingConfigNote: "账号配置未加载，暂时不能执行。",
readyNote: "点击后会触发 workflow，并同步目标平台服务。",
noChangesNote: "当前选择与已读取配置一致。",
invalidStrategyNote: "当前账号没有可执行策略，暂时不能切换。",
noAccount: "没有账号选项",
noStrategy: "没有支持的策略",
Expand All @@ -897,6 +899,7 @@ <h2 data-i18n="summary">切换摘要</h2>
selectedMarket: "市场",
reservedCashPolicy: "当前预留现金",
pendingReservedCashPolicy: "待提交预留现金",
pendingMode: "待提交模式",
unchanged: "不变",
copied: "已复制状态",
dispatching: "正在触发 workflow...",
Expand Down Expand Up @@ -939,11 +942,13 @@ <h2 data-i18n="summary">切换摘要</h2>
loadingConfig: "Loading config",
configureAccounts: "Configure accounts",
runSwitch: "Switch now",
noChanges: "No changes",
readonlyNote: "Sign in to switch.",
publicReadonly: "Sign in to view account config.",
loadingConfigNote: "Reading account config and current state.",
missingConfigNote: "Account config is not loaded, so switching is disabled.",
readyNote: "This dispatches the workflow and syncs the target platform service.",
noChangesNote: "The current selection matches the readable config.",
invalidStrategyNote: "This account has no runnable strategy, so switching is disabled.",
noAccount: "No accounts",
noStrategy: "No supported strategies",
Expand All @@ -952,6 +957,7 @@ <h2 data-i18n="summary">切换摘要</h2>
selectedMarket: "Market",
reservedCashPolicy: "Current reserved cash",
pendingReservedCashPolicy: "Pending reserved cash",
pendingMode: "Pending mode",
unchanged: "Unchanged",
copied: "State copied",
dispatching: "Dispatching workflow...",
Expand Down Expand Up @@ -1304,8 +1310,10 @@ <h2 data-i18n="summary">切换摘要</h2>
]) {
if (account[field]) inputs[field] = account[field];
}
if (form.reservedCashRatio) inputs.reserved_cash_ratio = form.reservedCashRatio;
if (form.minReservedCashUsd) inputs.min_reserved_cash_usd = form.minReservedCashUsd;
if (form.reservedCashTouched) {
if (form.reservedCashRatio) inputs.reserved_cash_ratio = form.reservedCashRatio;
if (form.minReservedCashUsd) inputs.min_reserved_cash_usd = form.minReservedCashUsd;
}
return inputs;
}

Expand Down Expand Up @@ -1333,7 +1341,46 @@ <h2 data-i18n="summary">切换摘要</h2>
}

function pendingReservedCashPolicyText(inputs, platform = state.selected, account = selectedAccount(platform)) {
return reservedCashPolicyText(inputs, platform, account, t("unchanged"));
return reservedCashPolicyText(pendingReservePolicy(inputs, platform, account).inputs, platform, account, t("unchanged"));
}

function pendingReservePolicy(inputs, platform = state.selected, account = selectedAccount(platform)) {
const current = currentReservePolicyForAccount(platform, account);
const floorOverride = cleanDisplayNumber(inputs.min_reserved_cash_usd);
const ratioOverride = cleanDisplayRatio(inputs.reserved_cash_ratio);
const changed = Boolean(
(floorOverride && floorOverride !== current.minReservedCashUsd) ||
(ratioOverride && ratioOverride !== current.reservedCashRatio),
);
return {
changed,
inputs: {
min_reserved_cash_usd: floorOverride || current.minReservedCashUsd,
reserved_cash_ratio: ratioOverride || current.reservedCashRatio,
},
};
}

function pendingChangeState(inputs, platform = state.selected, account = selectedAccount(platform)) {
const currentProfile = currentStrategyForAccount(platform, account);
const nextProfile = cleanStrategyProfile(inputs.strategy_profile);
const currentEntry = currentEntryForAccount(platform, account);
const currentMode = normalizeExecutionMode(currentEntry?.execution_mode, currentEntry?.dry_run_only);
const reserve = pendingReservePolicy(inputs, platform, account);
return {
currentProfile,
nextProfile,
currentMode,
strategyChanged: Boolean(nextProfile && (!currentProfile || currentProfile !== nextProfile)),
modeChanged: Boolean(currentMode && inputs.execution_mode && currentMode !== inputs.execution_mode),

@chatgpt-codex-connector chatgpt-codex-connector Bot Jun 9, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Allow mode-only switches when current mode is unread

When /api/config can read the current strategy but not an execution mode (for example the legacy STRATEGY_PROFILE fallback in worker.js returns strategy_profile without execution_mode for non-paper targets), currentMode is an empty string. In that state selecting Paper with the same strategy is a real mode change, but this condition keeps modeChanged false, so hasPendingChanges() disables the dispatch button unless the user also changes strategy or cash settings.

Useful? React with 👍 / 👎.

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);
}

function formatRatioPercent(value) {
Expand All @@ -1344,20 +1391,23 @@ <h2 data-i18n="summary">切换摘要</h2>

function summaryRows(inputs) {
const account = selectedAccount();
const currentProfile = currentStrategyForAccount(state.selected, account);
const nextProfile = cleanStrategyProfile(inputs.strategy_profile);
const currentStrategyText = currentProfile ? strategyLabel(currentProfile) : t("notRead");
const nextStrategyChanged = !currentProfile || currentProfile !== nextProfile;
const changes = pendingChangeState(inputs, state.selected, account);
const currentStrategyText = changes.currentProfile ? strategyLabel(changes.currentProfile) : t("notRead");
const rows = [
[t("repository"), state.repositories[state.selected] || defaultRepositories[state.selected]],
[t("selectedAccount"), account.label],
[t("currentStrategy"), currentStrategyText],
[t("selectedMarket"), supportedDomainLabel(state.selected, account)],
[t("reservedCashPolicy"), currentReservedCashPolicyText(state.selected, account)],
[t("pendingReservedCashPolicy"), pendingReservedCashPolicyText(inputs, state.selected, account), "pending"],
];
if (nextStrategyChanged && nextProfile) {
rows.push([t("nextStrategy"), strategyLabel(nextProfile), "pending"]);
if (changes.reserveCashChanged) {
rows.push([t("pendingReservedCashPolicy"), pendingReservedCashPolicyText(inputs, state.selected, account), "pending"]);
}
if (changes.modeChanged) {
rows.push([t("pendingMode"), modeLabel(inputs.execution_mode), "pending"]);
}
if (changes.strategyChanged && changes.nextProfile) {
rows.push([t("nextStrategy"), strategyLabel(changes.nextProfile), "pending"]);
}
return rows;
}
Expand Down Expand Up @@ -1519,17 +1569,25 @@ <h2 data-i18n="summary">切换摘要</h2>
const hasPrivateAccounts = state.configSource === "private";
const loadingConfig = state.configSource === "loading";
const hasValidStrategy = hasValidStrategySelection();
dispatch.disabled = !state.auth.allowed || loadingConfig || !hasPrivateAccounts || !hasValidStrategy;
const hasPendingChange = hasPrivateAccounts && hasValidStrategy && hasPendingChanges(buildInputs());
dispatch.disabled = !state.auth.allowed || loadingConfig || !hasPrivateAccounts || !hasValidStrategy || !hasPendingChange;
dispatch.textContent = state.auth.allowed
? (loadingConfig ? t("loadingConfig") : (hasPrivateAccounts ? t("runSwitch") : t("configureAccounts")))
? (loadingConfig
? t("loadingConfig")
: (hasPrivateAccounts ? (hasValidStrategy ? (hasPendingChange ? t("runSwitch") : t("noChanges")) : t("configureAccounts")) : t("configureAccounts")))
: t("loginToRun");
const note = el("action-note");
note.textContent = state.auth.allowed
? (loadingConfig
? t("loadingConfigNote")
: (hasPrivateAccounts ? (hasValidStrategy ? t("readyNote") : t("invalidStrategyNote")) : t("missingConfigNote")))
: (hasPrivateAccounts
? (hasValidStrategy ? (hasPendingChange ? t("readyNote") : t("noChangesNote")) : t("invalidStrategyNote"))
: t("missingConfigNote")))
: t("readonlyNote");
note.classList.toggle("warning", state.auth.allowed && !loadingConfig && (!hasPrivateAccounts || !hasValidStrategy));
note.classList.toggle(
"warning",
state.auth.allowed && !loadingConfig && (!hasPrivateAccounts || !hasValidStrategy || !hasPendingChange),
);
}

function renderAppVisibility() {
Expand Down
2 changes: 1 addition & 1 deletion web/strategy-switch-console/page_asset.js
View file
Open in desktop

Large diffs are not rendered by default.