${ACCOUNT_POOL_SORT_COLUMNS.map(renderCodexAccountPoolGuideCell).join("")}
@@ -8103,62 +8099,10 @@
Run History
return renderRunMetaLine(run);
}
- function codexAccountPoolAccounts(snapshot) {
- const accountsByIdentity = new Map();
- const configuredAccounts = configuredDashboardAccounts(snapshot);
- const runs = [
- ...(snapshot?.current_lanes ?? []).map((run) => [run, true]),
- ...(snapshot?.recent_runs ?? []).map((run) => [run, false]),
- ];
-
- for (const account of configuredAccounts) {
- const identity = codexAccountIdentity(account);
- if (!identity) {
- continue;
- }
-
- const existing = accountsByIdentity.get(identity);
- accountsByIdentity.set(identity, existing ? { ...existing, ...account } : account);
- }
-
- for (const [run, isCurrentLane] of runs) {
- const selected = codexAccount(run);
- for (const account of codexAccounts(run)) {
- const identity = codexAccountIdentity(account);
- if (!account?.account_fingerprint) {
- continue;
- }
-
- const selectedForRun =
- selected && codexAccountIdentity(account) === codexAccountIdentity(selected);
- const accountStatus = String(account.status || "").toLowerCase();
- const existing = accountsByIdentity.get(identity);
- const candidate = {
- ...existing,
- ...account,
- status:
- isCurrentLane && selectedForRun
- ? "selected"
- : accountStatus === "selected"
- ? "available"
- : account.status,
- };
- if (
- !existing ||
- codexAccountPoolMergeRank(candidate) >= codexAccountPoolMergeRank(existing)
- ) {
- accountsByIdentity.set(identity, candidate);
- }
- }
- }
-
- return sortCodexAccountPoolAccounts([...accountsByIdentity.values()]);
- }
-
- function codexAccountPoolMergeRank(account) {
- const status = String(account?.status || "").toLowerCase();
-
- return status === "selected" ? 1 : 0;
+ function codexAccountPoolAccounts() {
+ return sortCodexAccountPoolAccounts(
+ accountApiAccounts().map((account) => ({ ...account })),
+ );
}
function codexAccountCreditsSortValue(account) {
@@ -11191,6 +11135,7 @@ ${escapeHtml(worktree.branch_name)}
return;
}
+ refreshAccountApiSnapshot();
renderDashboardState(lastDashboardRender, { refreshAccounts: false });
}
@@ -11398,9 +11343,6 @@ ${escapeHtml(worktree.branch_name)}
};
})
: snapshot.projects;
- const accounts = Array.isArray(activityPayload.accounts)
- ? activityPayload.accounts.filter(Boolean).map((account) => ({ ...account }))
- : snapshot.accounts;
const accountControl =
activityPayload.accountControl && typeof activityPayload.accountControl === "object"
? { ...(snapshot.account_control || {}), ...activityPayload.accountControl }
@@ -11409,7 +11351,6 @@ ${escapeHtml(worktree.branch_name)}
return {
...snapshot,
account_control: accountControl,
- accounts,
current_lanes: mergedCurrentLanes,
recent_runs: recentRuns,
projects,
@@ -11436,7 +11377,6 @@ ${escapeHtml(worktree.branch_name)}
dashboardLiveRunActivitySeen = false;
dashboardLiveCurrentLanes = [];
dashboardLiveCurrentLanesComplete = true;
- dashboardLiveAccounts = null;
dashboardLiveAccountControl = null;
}
}
@@ -11452,7 +11392,6 @@ ${escapeHtml(worktree.branch_name)}
return mergeDashboardRunActivity(snapshot, dashboardLiveCurrentLanes, {
accountControl: dashboardLiveAccountControl,
- accounts: dashboardLiveAccounts,
currentLanesComplete: dashboardLiveCurrentLanesComplete,
});
}
@@ -11474,9 +11413,6 @@ ${escapeHtml(worktree.branch_name)}
dashboardLiveRunActivitySeen = true;
dashboardLiveCurrentLanesComplete =
payload.currentLanesComplete !== false && payload.currentLaneScope !== "filtered";
- dashboardLiveAccounts = Array.isArray(payload.accounts) && payload.accounts.length
- ? payload.accounts.filter(Boolean).map((account) => ({ ...account }))
- : null;
dashboardLiveAccountControl =
payload.accountControl && typeof payload.accountControl === "object"
? { ...payload.accountControl }
@@ -11640,7 +11576,6 @@ ${escapeHtml(worktree.branch_name)}
dashboardLiveCurrentLanes = [];
dashboardLiveRunActivitySeen = false;
dashboardLiveCurrentLanesComplete = true;
- dashboardLiveAccounts = null;
dashboardLiveAccountControl = null;
updateDashboardStreamState({
connected: false,
@@ -11652,7 +11587,6 @@ ${escapeHtml(worktree.branch_name)}
dashboardLiveCurrentLanes = [];
dashboardLiveRunActivitySeen = false;
dashboardLiveCurrentLanesComplete = true;
- dashboardLiveAccounts = null;
dashboardLiveAccountControl = null;
updateDashboardStreamState({
connected: false,
diff --git a/apps/decodex/src/orchestrator/operator_http.rs b/apps/decodex/src/orchestrator/operator_http.rs
index 4cdd5e0a4..7fbdd423b 100644
--- a/apps/decodex/src/orchestrator/operator_http.rs
+++ b/apps/decodex/src/orchestrator/operator_http.rs
@@ -565,7 +565,6 @@ fn build_operator_run_activity_event(
) -> Result {
let now_unix_epoch = OffsetDateTime::now_utc().unix_timestamp();
let account_control = global_codex_account_control_status();
- let mut accounts = Vec::new();
let mut current_lanes = Vec::new();
for registration in state_store.list_projects()? {
@@ -606,20 +605,15 @@ fn build_operator_run_activity_event(
continue;
}
- accounts.extend(project_snapshot.accounts);
current_lanes.extend(project_snapshot.current_lanes);
}
- let fingerprint_payload = dashboard_run_activity_fingerprint_payload(
- &account_control,
- &accounts,
- ¤t_lanes,
- );
+ let fingerprint_payload =
+ dashboard_run_activity_fingerprint_payload(&account_control, ¤t_lanes);
let fingerprint = serde_json::to_vec(&fingerprint_payload)?;
let payload = json!({
"emittedAtUnixEpoch": now_unix_epoch,
"accountControl": &account_control,
- "accounts": &accounts,
"currentLanes": ¤t_lanes,
"currentLanesComplete": true,
"currentLaneScope": "complete",
@@ -633,12 +627,10 @@ fn build_operator_run_activity_event(
fn dashboard_run_activity_fingerprint_payload(
account_control: &OperatorCodexAccountControlStatus,
- accounts: &[CodexAccountActivitySummary],
current_lanes: &[OperatorRunStatus],
) -> Value {
let mut fingerprint_payload = json!({
"accountControl": account_control,
- "accounts": accounts,
"currentLanes": current_lanes,
"currentLanesComplete": true,
"currentLaneScope": "complete",
diff --git a/apps/decodex/src/orchestrator/tests/operator/status/dashboard.rs b/apps/decodex/src/orchestrator/tests/operator/status/dashboard.rs
index 873683b9e..af77619c3 100644
--- a/apps/decodex/src/orchestrator/tests/operator/status/dashboard.rs
+++ b/apps/decodex/src/orchestrator/tests/operator/status/dashboard.rs
@@ -654,9 +654,10 @@ fn operator_dashboard_renders_account_usage_controls() {
assert!(response.contains("function codexAccountTokenLabel(refreshStatus)"));
assert!(response.contains("function codexAccountWindowLabel(seconds)"));
assert!(response.contains("function codexAccountStatusTone(account)"));
- assert!(response.contains("function renderCodexAccountPoolUsageSummary(accounts, snapshot)"));
+ assert!(response.contains("function renderCodexAccountPoolUsageSummary(accounts)"));
assert!(response.contains("function accountPoolDayDeltaPercentagePoints(accounts, estimate)"));
assert!(response.contains("accountApiSnapshot?.usage_estimate"));
+ assert!(!response.contains("snapshot?.usage_estimate"));
assert!(response.contains("Pool used"));
assert!(response.contains("Day Δ"));
assert!(response.contains("Daily avg"));
@@ -668,8 +669,10 @@ fn operator_dashboard_renders_account_usage_controls() {
assert!(response.contains("function renderAccountModeControl(snapshot)"));
assert!(response.contains("nodes.accountModeMeta.innerHTML = `${escapeHtml(title)}`;"));
assert!(response.contains("nodes.accountModeMeta.title = title;"));
- assert!(response.contains("function codexAccountPoolAccounts(snapshot)"));
- assert!(response.contains("function codexAccountPoolMergeRank(account)"));
+ assert!(response.contains("function codexAccountPoolAccounts()"));
+ assert!(response.contains("accountApiAccounts().map((account) => ({ ...account }))"));
+ assert!(!response.contains("function configuredDashboardAccounts(snapshot)"));
+ assert!(!response.contains("function codexAccountPoolMergeRank(account)"));
assert!(response.contains("function renderCodexAccountPool(accounts, snapshot)"));
assert!(!response.contains("function renderCodexAccountPoolHeader(accounts)"));
assert!(response.contains(
@@ -697,7 +700,7 @@ fn operator_dashboard_renders_account_usage_controls() {
assert!(!response.contains("function codexAccountPoolDebugSummary(accounts)"));
assert!(response.contains("return \"not captured\";"));
assert!(response.contains("function codexAccountHistorySummary(account)"));
- assert!(response.contains("snapshot?.accounts"));
+ assert!(!response.contains("snapshot?.accounts"));
assert!(response.contains("account?.account_email || account?.email"));
assert!(response.contains("run?.account || run?.codex_account || null"));
assert!(response.contains("run?.accounts"));
@@ -771,7 +774,7 @@ fn operator_dashboard_account_privacy_controls_use_compact_identities() {
assert!(!response.contains("function loadAccountNameOffsets()"));
assert!(response.contains("function persistAccountPrivacy(hidden)"));
assert!(!response.contains("function persistAccountNameOffsets()"));
- assert!(response.contains("function configuredDashboardAccounts(snapshot)"));
+ assert!(!response.contains("function configuredDashboardAccounts(snapshot)"));
assert!(response.contains("function renderAccountPrivacyToggle()"));
assert!(response.contains("function codexAccountRandomNameKey(account)"));
assert!(response.contains("function codexAccountRandomNameOffset(account)"));
@@ -806,7 +809,6 @@ fn operator_dashboard_account_privacy_controls_use_compact_identities() {
assert!(response.contains("\"Alex\""));
assert!(response.contains("return `${local.slice(0, 3)}...${local.slice(-3)}${domain}`;"));
assert!(response.contains("return ACCOUNT_RANDOM_NAMES[index];"));
- assert!(response.contains("return status === \"selected\" ? 1 : 0;"));
assert!(response.contains("return accounts;"));
assert!(!response.contains("function codexAccountPoolSortKey(account)"));
assert!(!response.contains("return codexAccountPoolSortKey(left).localeCompare(codexAccountPoolSortKey(right));"));
@@ -1865,7 +1867,7 @@ fn operator_dashboard_run_activity_preserves_snapshot_detail_fields() {
assert!(response.contains("let dashboardLiveCurrentLanes = [];"));
assert!(response.contains("let dashboardLiveRunActivitySeen = false;"));
assert!(response.contains("let dashboardLiveCurrentLanesComplete = true;"));
- assert!(response.contains("let dashboardLiveAccounts = null;"));
+ assert!(!response.contains("let dashboardLiveAccounts = null;"));
assert!(response.contains("let dashboardLiveAccountControl = null;"));
assert!(response
.contains("function dashboardLiveRunActivityHasOverlay({ includeCompletedEmpty = false } = {})"));
@@ -1878,7 +1880,9 @@ fn operator_dashboard_run_activity_preserves_snapshot_detail_fields() {
assert!(!response.contains("field(\"Author\","));
assert!(!response.contains("\"author\",\n"));
assert!(response.contains("activityPayload.accountControl"));
- assert!(response.contains("dashboardLiveAccounts = Array.isArray(payload.accounts)"));
+ assert!(!response.contains("activityPayload.accounts"));
+ assert!(!response.contains("payload.accounts"));
+ assert!(!response.contains("dashboardLiveAccounts"));
assert!(response.contains("dashboardLiveAccountControl ="));
assert!(response.contains("\"child_agent_activity\""));
assert!(response.contains("\"protocol_activity\""));
@@ -1901,7 +1905,7 @@ fn operator_dashboard_run_activity_preserves_snapshot_detail_fields() {
));
assert!(response.contains("clearDashboardLiveRunActivityOverlayIfCompleteEmpty();"));
assert!(response.contains("account_control: accountControl,"));
- assert!(response.contains("accounts,"));
+ assert!(!response.contains("accounts: dashboardLiveAccounts"));
assert!(response.contains("current_lanes: mergedCurrentLanes,"));
assert!(!response.contains("current_lanes: currentLaneRows,"));
}
@@ -1917,6 +1921,10 @@ fn operator_dashboard_uses_websocket_without_http_state_fallback() {
assert!(response.contains("if (document.hidden) {\n\t\t\t\t\treturn;\n\t\t\t\t}"));
assert!(response.contains("if (!dashboardSocketIsOpen()) {\n\t\t\t\t\tconnectDashboardSocket();"));
assert!(response.contains("function renderDashboardLocalClockTick()"));
+ assert!(response.contains("const ACCOUNT_API_REFRESH_INTERVAL_MS = 15_000;"));
+ assert!(response.contains("now - accountApiRefreshedAt < ACCOUNT_API_REFRESH_INTERVAL_MS"));
+ assert!(response.contains("const response = await fetch(\"/api/accounts?refresh=1\""));
+ assert!(response.contains("refreshAccountApiSnapshot();"));
assert!(response.contains("renderDashboardState(lastDashboardRender, { refreshAccounts: false });"));
assert!(response.contains("const shouldRefreshAccounts = options.refreshAccounts !== false;"));
assert!(!response.contains("function scheduleDashboardHttpFallback"));
diff --git a/apps/decodex/src/orchestrator/tests/operator/status/http.rs b/apps/decodex/src/orchestrator/tests/operator/status/http.rs
index 587120c7b..73f09b3d8 100644
--- a/apps/decodex/src/orchestrator/tests/operator/status/http.rs
+++ b/apps/decodex/src/orchestrator/tests/operator/status/http.rs
@@ -1084,12 +1084,12 @@ fn operator_dashboard_run_activity_event_summarizes_current_lanes() {
assert_eq!(data["accountControl"]["mode"], "balanced");
assert_eq!(data["currentLanesComplete"], true);
assert_eq!(data["currentLaneScope"], "complete");
- assert!(data["accounts"].is_array());
+ assert!(data.get("accounts").is_none());
assert!(fingerprint.get("emittedAtUnixEpoch").is_none());
assert_eq!(fingerprint["accountControl"]["mode"], "balanced");
assert_eq!(fingerprint["currentLanesComplete"], true);
assert_eq!(fingerprint["currentLaneScope"], "complete");
- assert!(fingerprint["accounts"].is_array());
+ assert!(fingerprint.get("accounts").is_none());
assert_eq!(fingerprint["currentLanes"][0]["run_id"], "run-1");
assert_eq!(
fingerprint["currentLanes"][0]["project_display_name"],