farming-code 2.2.19 → 2.2.22

package/frontend/skins/crt/app.js

@@ -55,6 +55,9 @@ let billingRequestSequence = 0;
 let billingAbortController = null;
 let billingRefreshTimer = null;
 let billingLiveDayRefreshTimer = null;
+let crtTokenRateRefreshTimer = null;
+let crtTokenRateFirstLoadTimer = null;
+let crtTokenRateAbortController = null;
 let billingCanvasFrame = null;
 let billingMode = 'days';
 let billingSelectedDate = '';
@@ -86,6 +89,7 @@ const crtStructuredPreviewTimers = new Map();
 let sessionRuntime = null;
 let structuredSessionPoller = null;
 let structuredSessionLoading = false;
+let structuredSessionGeneration = 0;
 let structuredSessionRenderedAt = '';
 let structuredSessionSnapshot = null;
 let structuredSessionControlsLoading = false;
@@ -104,6 +108,8 @@ let runtimeSwitchPending = false;
 let pendingRuntimeSwitchAgentId = '';
 let runtimeSwitchRequestSequence = 0;
 let crtTerminalReplication = null;
+const globalSettingsSaveRevisions = new Map();
+let globalSettingsSaveTail = Promise.resolve();
 const terminalPreviewSnapshots = new Map();
 const crtBrandPulseTimers = new Map();
 const SESSION_LINK_LIMIT = 6;
@@ -116,13 +122,16 @@ const CRT_AGENT_GRID_GAP = 15;
 const CRT_AGENT_GRID_PADDING = 20;
 const CRT_SEARCH_DEBOUNCE_MS = 180;
 const CRT_SEARCH_RESULT_LIMIT = 100;
-const CRT_BILLING_REFRESH_MS = 30_000;
+const CRT_BILLING_REFRESH_MS = 15_000;
 const CRT_BILLING_LIVE_DAY_REFRESH_MS = 5_000;
+const CRT_TOKEN_RATE_REFRESH_MS = 60_000;
+const CRT_TOKEN_RATE_FIRST_LOAD_MS = 1_500;
 const CRT_BILLING_DAY_DETAIL_CACHE_MS = 30_000;
 const CRT_BILLING_TOTAL_ANIMATION_MS = 900;
 const CRT_BILLING_DAY_DETAIL_RETRY_MS = 750;
 const CRT_BILLING_DAY_DETAIL_MAX_RETRIES = 4;
 const CRT_TERMINAL_CHECKPOINT_REQUEST_TIMEOUT_MS = 5_000;
+const CRT_SETTINGS_REQUEST_TIMEOUT_MS = 15_000;
 const CRT_TERMINAL_RESIZE_SETTLE_MS = 250;
 const CRT_TERMINAL_MIN_COLS = 40;
 const CRT_TERMINAL_MIN_ROWS = 10;
@@ -844,8 +853,14 @@ function fallbackCopyText(text) {
   return copied;
 }
 
-async function pasteTerminalText(text) {
-  if (!text || !focusedAgentId) {
+function isCurrentCrtSession(agentId, sessionToken = null) {
+  if (!agentId || focusedAgentId !== agentId) return false;
+  const runtime = getSessionRuntime();
+  return sessionToken === null || !runtime || runtime.isCurrentSession(agentId, sessionToken);
+}
+
+async function pasteTerminalText(text, agentId = focusedAgentId, sessionToken = null) {
+  if (!text || !isCurrentCrtSession(agentId, sessionToken)) {
     return false;
   }
 
@@ -872,9 +887,13 @@ async function pasteFromClipboard() {
     return false;
   }
 
+  const agentId = focusedAgentId;
+  const runtime = getSessionRuntime();
+  const sessionToken = runtime ? runtime.getSessionToken() : null;
+  if (!agentId) return false;
   try {
     const text = await navigator.clipboard.readText();
-    return pasteTerminalText(text);
+    return pasteTerminalText(text, agentId, sessionToken);
   } catch (error) {
     console.warn('Clipboard API paste failed:', error);
     return false;
@@ -2787,9 +2806,19 @@ async function loadThemes() {
   }
 }
 
+async function fetchCrtSettingsRequest(url, init) {
+  const controller = new window.AbortController();
+  const timeout = setTimeout(() => controller.abort(), CRT_SETTINGS_REQUEST_TIMEOUT_MS);
+  try {
+    return await fetch(url, { ...init, signal: controller.signal });
+  } finally {
+    clearTimeout(timeout);
+  }
+}
+
 async function loadGlobalSettings() {
   try {
-    const response = await fetch(farmingApiPath('/settings'));
+    const response = await fetchCrtSettingsRequest(farmingApiPath('/settings'));
     const data = await response.json();
     globalSettings = {
       ...globalSettings,
@@ -2808,31 +2837,48 @@ async function loadGlobalSettings() {
   }
 }
 
-async function saveGlobalSettings() {
-  try {
-    syncWorkspaceSettings();
-    const response = await fetch(farmingApiPath('/settings'), {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json'
-      },
-      body: JSON.stringify(globalSettings)
-    });
+async function saveGlobalSettings(settingsPatch) {
+  const patch = settingsPatch && typeof settingsPatch === 'object'
+    ? { ...settingsPatch }
+    : {};
+  const keys = Object.keys(patch);
+  if (keys.length === 0) return;
+  const revisions = new Map(keys.map((key) => {
+    const revision = (globalSettingsSaveRevisions.get(key) || 0) + 1;
+    globalSettingsSaveRevisions.set(key, revision);
+    return [key, revision];
+  }));
+  const save = globalSettingsSaveTail.catch(() => {}).then(async () => {
+    try {
+      const response = await fetchCrtSettingsRequest(farmingApiPath('/settings'), {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json'
+        },
+        body: JSON.stringify(patch)
+      });
 
-    const data = await response.json();
-    if (data.success) {
-      globalSettings = {
-        ...globalSettings,
-        ...(data.settings || {})
-      };
-      if (globalSettings.instanceName) {
-        document.title = `${globalSettings.instanceName} · Farming CRT`;
+      const data = await response.json();
+      if (data.success) {
+        const savedSettings = data.settings || {};
+        keys.forEach((key) => {
+          if (globalSettingsSaveRevisions.get(key) !== revisions.get(key)) return;
+          globalSettings[key] = Object.prototype.hasOwnProperty.call(savedSettings, key)
+            ? savedSettings[key]
+            : patch[key];
+        });
+        if (globalSettings.instanceName) {
+          document.title = `${globalSettings.instanceName} · Farming CRT`;
+        }
+        syncWorkspaceSettings();
       }
-      syncWorkspaceSettings();
+    } catch (error) {
+      console.error('Failed to save global settings:', error);
+      await loadGlobalSettings();
     }
-  } catch (error) {
-    console.error('Failed to save global settings:', error);
-  }
+  });
+  globalSettingsSaveTail = save;
+  return save;
 }
 
 async function setTheme(themeId) {
@@ -2936,7 +2982,7 @@ function scheduleCrtTerminalFontSizeSave() {
   if (crtTerminalFontSizeSaveTimer) clearTimeout(crtTerminalFontSizeSaveTimer);
   crtTerminalFontSizeSaveTimer = setTimeout(() => {
     crtTerminalFontSizeSaveTimer = null;
-    void saveGlobalSettings();
+    void saveGlobalSettings({ crtTerminalFontSize: globalSettings.crtTerminalFontSize });
   }, 150);
 }
 
@@ -2954,7 +3000,7 @@ function initDisplaySettings() {
         crtToggle.onchange = async () => {
           globalSettings.crtSkinEffectsEnabled = crtToggle.checked;
           applyCRTEffects(crtToggle.checked);
-          await saveGlobalSettings();
+          await saveGlobalSettings({ crtSkinEffectsEnabled: crtToggle.checked });
         };
       }
     } else {
@@ -2969,7 +3015,7 @@ function initDisplaySettings() {
     dynamicHeatToggle.onchange = async () => {
       globalSettings.crtDynamicHeatEnabled = dynamicHeatToggle.checked;
       renderState();
-      await saveGlobalSettings();
+      await saveGlobalSettings({ crtDynamicHeatEnabled: dynamicHeatToggle.checked });
     };
   }
 
@@ -2989,7 +3035,9 @@ function initSessionEngineSettings() {
   skipPermissionCheckToggle.checked = globalSettings.dangerouslySkipAgentPermissionsByDefault === true;
   skipPermissionCheckToggle.onchange = async () => {
     globalSettings.dangerouslySkipAgentPermissionsByDefault = skipPermissionCheckToggle.checked;
-    await saveGlobalSettings();
+    await saveGlobalSettings({
+      dangerouslySkipAgentPermissionsByDefault: skipPermissionCheckToggle.checked,
+    });
   };
 }
 
@@ -3159,6 +3207,7 @@ function setCrtMainView(view) {
   if (historySidebarItem) historySidebarItem.classList.toggle('active', crtMainView === 'history');
   if (searchSidebarItem) searchSidebarItem.classList.toggle('active', crtMainView === 'search');
   if (billingSidebarItem) billingSidebarItem.classList.toggle('active', crtMainView === 'billing');
+  if (previousView !== 'agents' && crtMainView === 'agents') checkMainAgentStatus();
 }
 
 function getCrtSearchResults() {
@@ -4006,6 +4055,30 @@ function scrollCrtBillingSelectedDayIntoView() {
   else if (right > scroll.scrollLeft + scroll.clientWidth) scroll.scrollLeft = right - scroll.clientWidth;
 }
 
+function crtBillingDayArrowTargetIndex(points, index, key) {
+  if (!Array.isArray(points) || index < 0 || index >= points.length) return -1;
+  const firstDate = parseCrtBillingDate(points[0] && points[0].date);
+  const leadingDays = firstDate ? (firstDate.getDay() + 6) % 7 : 0;
+  const position = leadingDays + index;
+  const weekdayRow = position % 7;
+  let targetPosition = position;
+  if (key === 'ArrowUp') {
+    if (weekdayRow === 0) return -1;
+    targetPosition -= 1;
+  } else if (key === 'ArrowDown') {
+    if (weekdayRow === 6) return -1;
+    targetPosition += 1;
+  } else if (key === 'ArrowLeft') {
+    targetPosition -= 7;
+  } else if (key === 'ArrowRight') {
+    targetPosition += 7;
+  } else {
+    return -1;
+  }
+  const targetIndex = targetPosition - leadingDays;
+  return targetIndex >= 0 && targetIndex < points.length ? targetIndex : -1;
+}
+
 function selectCrtBillingDayByArrow(key) {
   if (crtMainView !== 'billing' || billingMode !== 'days') return false;
   const points = billingSummary && billingSummary.daily && Array.isArray(billingSummary.daily.points)
@@ -4014,8 +4087,8 @@ function selectCrtBillingDayByArrow(key) {
   if (points.length === 0) return false;
   let index = points.findIndex(point => point.date === billingSelectedDate);
   if (index < 0) index = points.length - 1;
-  const delta = key === 'ArrowLeft' ? -1 : key === 'ArrowRight' ? 1 : key === 'ArrowUp' ? -7 : 7;
-  const nextIndex = Math.max(0, Math.min(points.length - 1, index + delta));
+  const nextIndex = crtBillingDayArrowTargetIndex(points, index, key);
+  if (nextIndex < 0) return false;
   return selectCrtBillingDay(points[nextIndex].date, { focus: true });
 }
 
@@ -4156,11 +4229,35 @@ function setCrtBillingMode(mode) {
   }
   const status = document.getElementById('billing-status');
   if (status && billingSummary && !billingLoading && !billingError) {
-    status.textContent = billingMode === 'days' ? 'HISTORY READY' : 'SIGNAL LOCKED';
+    status.textContent = crtBillingStatusText();
   }
   if (billingMode === 'live') window.requestAnimationFrame(() => drawCrtBillingScope());
 }
 
+function selectCrtBillingMode(mode) {
+  setCrtBillingMode(mode);
+  const selectedTab = document.getElementById(
+    billingMode === 'live' ? 'billing-live-tab' : 'billing-days-tab',
+  );
+  if (selectedTab) setCrtNavigationSelection(selectedTab);
+  if (billingMode === 'live' && !billingLoading) void loadCrtBilling();
+}
+
+function crtBillingTimeline(summary = billingSummary) {
+  return summary && summary.liveTimeline || summary && summary.timeline || null;
+}
+
+function crtBillingStatusText(summary = billingSummary) {
+  if (billingMode === 'days') return 'HISTORY READY';
+  const sampledAt = Number(summary && summary.sampledAt);
+  if (!Number.isFinite(sampledAt) || sampledAt <= 0) return 'LIVE';
+  const sampled = new Date(sampledAt);
+  const time = [sampled.getHours(), sampled.getMinutes(), sampled.getSeconds()]
+    .map(value => String(value).padStart(2, '0'))
+    .join(':');
+  return `LIVE ${time}`;
+}
+
 function formatCrtBillingWindow(windowMinutes) {
   const minutes = Number(windowMinutes);
   if (!Number.isFinite(minutes) || minutes <= 0) return 'WINDOW';
@@ -4214,6 +4311,13 @@ function crtBillingCurrentRate(summary = billingSummary) {
   return hasRate ? total : null;
 }
 
+function renderCrtTopBarTokenRate(summary = billingSummary) {
+  const tokensPerMinute = document.getElementById('tokens-per-minute');
+  if (tokensPerMinute) {
+    tokensPerMinute.textContent = formatCrtTokenRate(crtBillingCurrentRate(summary));
+  }
+}
+
 function appendCrtBillingMessage(container, text, isError = false) {
   const message = document.createElement('div');
   message.className = `billing-message${isError ? ' is-error' : ''}`;
@@ -4314,7 +4418,7 @@ function drawCrtBillingScope(summary = billingSummary) {
   context.setTransform(pixelRatio, 0, 0, pixelRatio, 0, 0);
   context.clearRect(0, 0, rect.width, rect.height);
 
-  const timeline = summary && summary.timeline;
+  const timeline = crtBillingTimeline(summary);
   const points = timeline && Array.isArray(timeline.points) ? timeline.points : [];
   const values = points.map(point => Math.max(0, Number(point.tokensPerMinute) || 0));
   const providerNames = points.length > 0 ? Object.keys(points[0].providers || {}) : [];
@@ -4392,7 +4496,7 @@ function renderCrtBilling() {
   const status = document.getElementById('billing-status');
   const refresh = document.getElementById('billing-refresh');
   const empty = document.getElementById('billing-scope-empty');
-  const timeline = billingSummary && billingSummary.timeline;
+  const timeline = crtBillingTimeline();
   const hasSignal = Boolean(timeline && Number(timeline.totalTokens) > 0);
   if (status) {
     status.classList.toggle('is-busy', billingLoading);
@@ -4402,7 +4506,7 @@ function renderCrtBilling() {
       : billingLoading
         ? (billingSummary ? 'REFRESHING' : 'SCANNING LOGS')
         : billingSummary
-          ? (billingMode === 'days' ? 'HISTORY READY' : 'SIGNAL LOCKED')
+          ? crtBillingStatusText()
           : 'STANDBY';
   }
   if (refresh) refresh.disabled = billingLoading;
@@ -4449,13 +4553,18 @@ async function loadCrtBilling({ fresh = false } = {}) {
   billingRequestSequence += 1;
   const requestSequence = billingRequestSequence;
   if (billingAbortController) billingAbortController.abort();
+  if (crtTokenRateAbortController) {
+    crtTokenRateAbortController.abort();
+    crtTokenRateAbortController = null;
+  }
   const controller = new window.AbortController();
   billingAbortController = controller;
   billingLoading = true;
   billingError = '';
   renderCrtBilling();
   try {
-    const response = await fetch(farmingApiPath(`/usage${fresh ? '?fresh=1' : ''}`), {
+    const query = fresh ? '?fresh=1' : billingMode === 'live' ? '?live=1' : '';
+    const response = await fetch(farmingApiPath(`/usage${query}`), {
       signal: controller.signal,
       cache: 'no-store',
     });
@@ -4463,6 +4572,7 @@ async function loadCrtBilling({ fresh = false } = {}) {
     if (!response.ok || !data || !data.usage) throw new Error(data && data.error ? data.error : `Usage request failed (${response.status})`);
     if (requestSequence !== billingRequestSequence) return;
     billingSummary = data.usage;
+    renderCrtTopBarTokenRate();
   } catch (error) {
     if (controller.signal.aborted || requestSequence !== billingRequestSequence) return;
     billingError = error instanceof Error ? error.message : 'Failed to load token telemetry';
@@ -4481,6 +4591,58 @@ async function loadCrtBilling({ fresh = false } = {}) {
   }
 }
 
+async function loadCrtTopBarTokenRate() {
+  if (billingLoading || crtTokenRateAbortController) return;
+  const controller = new window.AbortController();
+  crtTokenRateAbortController = controller;
+  try {
+    const response = await fetch(farmingApiPath('/usage'), {
+      signal: controller.signal,
+      cache: 'no-store',
+    });
+    const data = await response.json().catch(() => null);
+    if (controller.signal.aborted) return;
+    if (!response.ok || !data || !data.usage) {
+      throw new Error(data && data.error ? data.error : `Usage request failed (${response.status})`);
+    }
+    renderCrtTopBarTokenRate(data.usage);
+  } catch {
+    if (!controller.signal.aborted) renderCrtTopBarTokenRate(null);
+  } finally {
+    if (crtTokenRateAbortController === controller) crtTokenRateAbortController = null;
+  }
+}
+
+function stopCrtTopBarTokenRateRefresh({ abort = false } = {}) {
+  if (crtTokenRateFirstLoadTimer !== null) {
+    clearTimeout(crtTokenRateFirstLoadTimer);
+    crtTokenRateFirstLoadTimer = null;
+  }
+  if (crtTokenRateRefreshTimer !== null) {
+    clearInterval(crtTokenRateRefreshTimer);
+    crtTokenRateRefreshTimer = null;
+  }
+  if (abort && crtTokenRateAbortController) {
+    crtTokenRateAbortController.abort();
+    crtTokenRateAbortController = null;
+  }
+}
+
+function startCrtTopBarTokenRateRefresh({ immediate = false } = {}) {
+  stopCrtTopBarTokenRateRefresh();
+  if (immediate) {
+    void loadCrtTopBarTokenRate();
+  } else {
+    crtTokenRateFirstLoadTimer = setTimeout(() => {
+      crtTokenRateFirstLoadTimer = null;
+      if (document.visibilityState !== 'hidden') void loadCrtTopBarTokenRate();
+    }, CRT_TOKEN_RATE_FIRST_LOAD_MS);
+  }
+  crtTokenRateRefreshTimer = setInterval(() => {
+    if (document.visibilityState !== 'hidden') void loadCrtTopBarTokenRate();
+  }, CRT_TOKEN_RATE_REFRESH_MS);
+}
+
 function stopCrtBillingRefresh({ abort = false } = {}) {
   if (billingRefreshTimer !== null) {
     clearInterval(billingRefreshTimer);
@@ -5239,11 +5401,16 @@ async function startCrtAgent(agent, workspaceToUse, asMainAgent) {
   }
   if (JSON.stringify(getWorkspaceHistory()) !== previousHistory) {
     refreshWorkspaceMemoryUI();
-    await saveGlobalSettings();
+    syncWorkspaceSettings();
+    await saveGlobalSettings({
+      workspace: globalSettings.workspace,
+      workspaceHistory: globalSettings.workspaceHistory,
+    });
   }
 
   ws.send(JSON.stringify({
     type: 'start-agent',
+    requestId: globalThis.crypto?.randomUUID?.(),
     command: agent.name,
     workspace: workspaceToUse,
     asMain: asMainAgent,
@@ -5485,7 +5652,7 @@ function connect() {
         else scheduleCrtPreviewCardRender(agent);
       }
     } else if (data.type === 'system-stats') {
-      updateSystemStats(data.stats, data.uptime, data.usageRate);
+      updateSystemStats(data.stats, data.uptime);
     } else if (data.type === 'error') {
       waitingForAgent = false;
       if (workspaceDirectoryPrompt?.kind === 'creating') {
@@ -5532,6 +5699,7 @@ function connect() {
 function suspendCrtPageConnection() {
   document.body.classList.add('page-hidden');
   stopCrtBillingRefresh({ abort: true });
+  stopCrtTopBarTokenRateRefresh({ abort: true });
   if (wsReconnectTimer) {
     clearTimeout(wsReconnectTimer);
     wsReconnectTimer = null;
@@ -5545,6 +5713,7 @@ function resumeCrtPageConnection() {
   if (document.visibilityState === 'hidden') return;
   document.body.classList.remove('page-hidden');
   connect();
+  startCrtTopBarTokenRateRefresh({ immediate: true });
   if (crtMainView === 'billing') {
     startCrtBillingRefresh();
     void loadCrtBilling();
@@ -5554,15 +5723,33 @@ function resumeCrtPageConnection() {
 function checkMainAgentStatus() {
   if (!state) return;
 
-  const mainAgent = state.mainAgentId
-    ? state.agents.find(a => a.id === state.mainAgentId)
-    : null;
-
-  if (!state.mainAgentId || !isCrtLiveAgent(mainAgent)) {
+  const inputDialog = document.getElementById('input-dialog');
+  const action = getCrtMainAgentDialogAction({
+    currentState: state,
+    mainView: crtMainView,
+    dialogActive: Boolean(inputDialog && inputDialog.classList.contains('active')),
+    pendingMainAgent: pendingMainAgentLaunch,
+  });
+  if (action === 'hide') {
+    hideInputDialog();
+  } else if (action === 'show') {
     showInputDialog();
   }
 }
 
+function getCrtMainAgentDialogAction({
+  currentState,
+  mainView = 'agents',
+  dialogActive = false,
+  pendingMainAgent = false,
+} = {}) {
+  if (!needsMainAgent(currentState)) {
+    return dialogActive && pendingMainAgent ? 'hide' : 'none';
+  }
+  if (mainView !== 'agents' || dialogActive) return 'none';
+  return 'show';
+}
+
 function formatSystemClock(timestamp, timeZone) {
   if (!Number.isFinite(timestamp)) return '--';
   try {
@@ -5582,21 +5769,22 @@ function formatSystemClock(timestamp, timeZone) {
 }
 
 function formatCrtTokenRate(value) {
+  if (value === null || value === undefined || value === '') return '--';
   const rate = Number(value);
   if (!Number.isFinite(rate) || rate < 0) return '--';
   const rounded = rate < 10 ? Math.round(rate * 10) / 10 : Math.round(rate);
   if (rounded >= 1_000_000) {
     const compact = rounded / 1_000_000;
-    return `~${compact >= 10 ? Math.round(compact) : Math.round(compact * 10) / 10}M`;
+    return `${compact >= 10 ? Math.round(compact) : Math.round(compact * 10) / 10}M`;
   }
   if (rounded >= 1_000) {
     const compact = rounded / 1_000;
-    return `~${compact >= 10 ? Math.round(compact) : Math.round(compact * 10) / 10}K`;
+    return `${compact >= 10 ? Math.round(compact) : Math.round(compact * 10) / 10}K`;
   }
-  return `~${rounded}`;
+  return String(rounded);
 }
 
-function updateSystemStats(stats, uptime, usageRate) {
+function updateSystemStats(stats, uptime) {
   if (stats.cpu !== undefined) {
     document.getElementById('cpu-usage').textContent = stats.cpu;
   }
@@ -5613,11 +5801,6 @@ function updateSystemStats(stats, uptime, usageRate) {
     document.getElementById('system-time').textContent = formatSystemClock(stats.timestamp, stats.timeZone);
   }
 
-  const tokensPerMinute = document.getElementById('tokens-per-minute');
-  if (tokensPerMinute) {
-    tokensPerMinute.textContent = formatCrtTokenRate(usageRate && usageRate.estimatedTokensPerMinute);
-  }
-
   if (uptime !== undefined) {
     const hours = Math.floor(uptime / 3600);
     const minutes = Math.floor((uptime % 3600) / 60);
@@ -6168,7 +6351,8 @@ function flushStructuredComposerFollowUp(agent) {
     structuredComposerPendingFollowUps.set(agent.id, queue);
     return;
   }
-  setTimeout(() => void refreshStructuredSession(agent.id, true), 160);
+  const generation = structuredSessionGeneration;
+  setTimeout(() => void refreshStructuredSession(agent.id, true, generation), 160);
 }
 
 function structuredContextUsage(session) {
@@ -6243,6 +6427,14 @@ function structuredConfigValueLabel(option) {
   return selected && selected.name ? selected.name : String(option.currentValue || '');
 }
 
+function isCurrentStructuredSession(agentId, generation) {
+  return Boolean(
+    agentId
+    && agentId === focusedAgentId
+    && generation === structuredSessionGeneration
+  );
+}
+
 function resetStructuredSessionControls() {
   structuredSessionSnapshot = null;
   structuredSessionControlsLoading = false;
@@ -6367,19 +6559,28 @@ function backStructuredComposerMenu() {
   closeStructuredComposerMenu();
 }
 
-async function patchStructuredAcpSession(patch) {
-  if (!focusedAgentId) return;
+async function patchStructuredAcpSession(agentId, generation, patch) {
+  if (!isCurrentStructuredSession(agentId, generation)) return;
   const openerId = structuredComposerMenuOpenerId;
-  const response = await fetch(farmingApiPath(`/agents/${encodeURIComponent(focusedAgentId)}/acp-session`), {
-    method: 'PATCH',
-    headers: { 'Content-Type': 'application/json' },
-    body: JSON.stringify(patch)
-  });
-  const body = await response.json().catch(() => null);
+  let response;
+  let body;
+  try {
+    response = await fetch(farmingApiPath(`/agents/${encodeURIComponent(agentId)}/acp-session`), {
+      method: 'PATCH',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify(patch)
+    });
+    body = await response.json().catch(() => null);
+  } catch (error) {
+    if (!isCurrentStructuredSession(agentId, generation)) return;
+    throw error;
+  }
+  if (!isCurrentStructuredSession(agentId, generation)) return;
   if (!response.ok) throw new Error(body && body.error ? body.error : `Failed to update ACP session (${response.status})`);
   structuredComposerMenu = '';
   structuredComposerConfigId = '';
-  await refreshStructuredSessionControls(focusedAgentId, true);
+  await refreshStructuredSessionControls(agentId, true, generation);
+  if (!isCurrentStructuredSession(agentId, generation)) return;
   const opener = openerId ? document.getElementById(openerId) : null;
   if (opener && !opener.hidden && !opener.disabled) opener.focus();
 }
@@ -6407,6 +6608,8 @@ function renderStructuredComposerMenu() {
   const retainedFocus = captureStructuredComposerMenuFocus(menu);
   menu.replaceChildren();
   const session = structuredSessionSnapshot;
+  const agentId = focusedAgentId;
+  const generation = structuredSessionGeneration;
   if (!structuredComposerMenu || !session) {
     menu.hidden = true;
     return;
@@ -6448,7 +6651,7 @@ function renderStructuredComposerMenu() {
     const current = session.currentModeId || (session.modes && session.modes.currentModeId) || '';
     modes.forEach((mode) => {
       items.appendChild(structuredMenuButton(mode.name || mode.id, mode.description || '', mode.id === current, () => {
-        void patchStructuredAcpSession({ modeId: mode.id }).catch(showStructuredComposerError);
+        void patchStructuredAcpSession(agentId, generation, { modeId: mode.id }).catch(showStructuredComposerError);
       }, `mode:${mode.id}`));
     });
   } else if (!selectedConfig) {
@@ -6468,13 +6671,13 @@ function renderStructuredComposerMenu() {
   } else if (selectedConfig.type === 'boolean') {
     [false, true].forEach((value) => {
       items.appendChild(structuredMenuButton(value ? 'ON' : 'OFF', selectedConfig.description || '', selectedConfig.currentValue === value, () => {
-        void patchStructuredAcpSession({ configId: selectedConfig.id, value }).catch(showStructuredComposerError);
+        void patchStructuredAcpSession(agentId, generation, { configId: selectedConfig.id, value }).catch(showStructuredComposerError);
       }, `boolean:${value}`));
     });
   } else {
     structuredSelectOptions(selectedConfig).forEach((candidate) => {
       items.appendChild(structuredMenuButton(candidate.name || candidate.value, candidate.description || '', candidate.value === selectedConfig.currentValue, () => {
-        void patchStructuredAcpSession({ configId: selectedConfig.id, value: candidate.value }).catch(showStructuredComposerError);
+        void patchStructuredAcpSession(agentId, generation, { configId: selectedConfig.id, value: candidate.value }).catch(showStructuredComposerError);
       }, `option:${candidate.value}`));
     });
   }
@@ -6509,8 +6712,12 @@ function renderStructuredSessionControls() {
   renderStructuredComposerMenu();
 }
 
-async function refreshStructuredSessionControls(agentId = focusedAgentId, force = false) {
-  if (!agentId || structuredSessionControlsLoading) return;
+async function refreshStructuredSessionControls(
+  agentId = focusedAgentId,
+  force = false,
+  generation = structuredSessionGeneration
+) {
+  if (!isCurrentStructuredSession(agentId, generation) || structuredSessionControlsLoading) return;
   const agent = state && state.agents.find((candidate) => candidate.id === agentId);
   if (!agent || agent.runtimeBinding?.kind !== 'acp') {
     resetStructuredSessionControls();
@@ -6525,6 +6732,7 @@ async function refreshStructuredSessionControls(agentId = focusedAgentId, force
   try {
     const response = await fetch(farmingApiPath(`/agents/${encodeURIComponent(agentId)}/acp-session`));
     const body = await response.json().catch(() => null);
+    if (!isCurrentStructuredSession(agentId, generation)) return;
     if (!response.ok || !body || !body.session) {
       throw new Error(body && body.error ? body.error : `Failed to read ACP session (${response.status})`);
     }
@@ -6532,9 +6740,12 @@ async function refreshStructuredSessionControls(agentId = focusedAgentId, force
     structuredSessionControlsRevision = revision || String(body.session.updatedAt || Date.now());
     renderStructuredSessionControls();
   } catch (error) {
+    if (!isCurrentStructuredSession(agentId, generation)) return;
     showStructuredComposerError(error);
   } finally {
-    structuredSessionControlsLoading = false;
+    if (isCurrentStructuredSession(agentId, generation)) {
+      structuredSessionControlsLoading = false;
+    }
   }
 }
 
@@ -6606,7 +6817,7 @@ function setStructuredComposerActive(active) {
   }
 }
 
-function updateStructuredComposerState(agent) {
+function updateStructuredComposerState(agent, { refreshControls = true } = {}) {
   const input = document.getElementById('crt-structured-input');
   const sendButton = document.getElementById('crt-structured-send');
   const statusNode = document.getElementById('crt-structured-composer-status');
@@ -6632,7 +6843,9 @@ function updateStructuredComposerState(agent) {
   statusNode.textContent = error || `${kind} ${String(runtimeStatus || 'idle').toUpperCase()}`;
   statusNode.classList.toggle('error', Boolean(error));
   renderStructuredPermissions(agent);
-  if (agent && agent.runtimeBinding?.kind === 'acp') void refreshStructuredSessionControls(agent.id);
+  if (refreshControls && agent && agent.runtimeBinding?.kind === 'acp') {
+    void refreshStructuredSessionControls(agent.id);
+  }
 }
 
 function structuredAttachmentId(file) {
@@ -6791,6 +7004,8 @@ function renderStructuredPermissions(agent) {
   if (!container) return;
   container.replaceChildren();
   if (!agent || agent.runtimeBinding?.kind !== 'acp') return;
+  const agentId = agent.id;
+  const generation = structuredSessionGeneration;
   const runtime = agent.runtimeBinding;
   const requests = Array.isArray(runtime.pendingPermissions) && runtime.pendingPermissions.length
     ? runtime.pendingPermissions
@@ -6809,27 +7024,47 @@ function renderStructuredPermissions(agent) {
       const button = document.createElement('button');
       button.type = 'button';
       button.textContent = `[${option.name}]`;
-      button.onclick = () => void respondToStructuredPermission(request.requestId, option.optionId, false);
+      button.onclick = () => void respondToStructuredPermission(
+        agentId,
+        generation,
+        request.requestId,
+        option.optionId,
+        false,
+      );
       actions.appendChild(button);
     });
     const decline = document.createElement('button');
     decline.type = 'button';
     decline.textContent = '[DECLINE]';
-    decline.onclick = () => void respondToStructuredPermission(request.requestId, undefined, true);
+    decline.onclick = () => void respondToStructuredPermission(
+      agentId,
+      generation,
+      request.requestId,
+      undefined,
+      true,
+    );
     actions.appendChild(decline);
     panel.append(title, description, actions);
     container.appendChild(panel);
   });
 }
 
-async function respondToStructuredPermission(requestId, optionId, cancelled) {
-  if (!focusedAgentId) return;
-  const response = await fetch(farmingApiPath(`/agents/${encodeURIComponent(focusedAgentId)}/acp-permission`), {
-    method: 'POST',
-    headers: { 'Content-Type': 'application/json' },
-    body: JSON.stringify({ requestId, optionId, cancelled: cancelled === true })
-  });
-  const body = await response.json().catch(() => null);
+async function respondToStructuredPermission(agentId, generation, requestId, optionId, cancelled) {
+  if (!isCurrentStructuredSession(agentId, generation)) return;
+  let response;
+  let body;
+  try {
+    response = await fetch(farmingApiPath(`/agents/${encodeURIComponent(agentId)}/acp-permission`), {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({ requestId, optionId, cancelled: cancelled === true })
+    });
+    body = await response.json().catch(() => null);
+  } catch (error) {
+    if (isCurrentStructuredSession(agentId, generation)) showStructuredComposerError(error);
+    return;
+  }
+  if (!isCurrentStructuredSession(agentId, generation)) return;
   if (!response.ok) {
     showStructuredComposerError(new Error(body && body.error ? body.error : `Permission response failed (${response.status})`));
   }
@@ -7069,13 +7304,13 @@ async function refreshCrtStructuredPreview(agent) {
   }
 }
 
-function renderStructuredTranscript(transcript, force = false) {
+function renderStructuredTranscript(transcript, force = false, agentId = focusedAgentId) {
   const container = document.getElementById('terminal-output');
-  if (!container) return;
+  if (!container || agentId !== focusedAgentId) return;
   const updatedAt = String(transcript && transcript.updatedAt || '');
   if (!force && updatedAt && updatedAt === structuredSessionRenderedAt) return;
   const nearBottom = container.scrollHeight - container.scrollTop - container.clientHeight < 80;
-  if (!nearBottom && focusedAgentId) saveCrtStructuredReadingAnchor(focusedAgentId);
+  if (!nearBottom) saveCrtStructuredReadingAnchor(agentId);
   const turns = structuredTranscriptTurns(transcript);
 
   const markdownRenderer = typeof window !== 'undefined' ? window.FarmingCrtMarkdownRenderer : null;
@@ -7099,15 +7334,21 @@ function renderStructuredTranscript(transcript, force = false) {
     return;
   }
   structuredSessionRenderedAt = updatedAt;
-  if (!focusedAgentId || !restoreCrtStructuredReadingAnchor(focusedAgentId)) {
+  if (!restoreCrtStructuredReadingAnchor(agentId)) {
     if (force || nearBottom) container.scrollTop = container.scrollHeight;
   }
-  container.onscroll = () => saveCrtStructuredReadingAnchor(focusedAgentId);
+  container.onscroll = () => {
+    if (focusedAgentId === agentId) saveCrtStructuredReadingAnchor(agentId);
+  };
   requestAnimationFrame(updateStructuredTranscriptScrollState);
 }
 
-async function refreshStructuredSession(agentId = focusedAgentId, force = false) {
-  if (!agentId || structuredSessionLoading) return;
+async function refreshStructuredSession(
+  agentId = focusedAgentId,
+  force = false,
+  generation = structuredSessionGeneration
+) {
+  if (!isCurrentStructuredSession(agentId, generation) || structuredSessionLoading) return;
   const agent = state && state.agents.find((candidate) => candidate.id === agentId);
   if (!agent || !isStructuredRuntimeAgent(agent)) return;
   structuredSessionLoading = true;
@@ -7115,12 +7356,14 @@ async function refreshStructuredSession(agentId = focusedAgentId, force = false)
     const endpoint = structuredTranscriptEndpoint(agent);
     const response = await fetch(farmingApiPath(`/agents/${encodeURIComponent(agentId)}/${endpoint}?maxTurns=80`));
     const body = await response.json().catch(() => null);
+    if (!isCurrentStructuredSession(agentId, generation)) return;
     if (!response.ok || !body || !body.transcript) {
       throw new Error(body && body.error ? body.error : `Failed to read conversation (${response.status})`);
     }
-    renderStructuredTranscript(body.transcript, force);
+    renderStructuredTranscript(body.transcript, force, agentId);
     updateStructuredComposerState(agent);
   } catch (error) {
+    if (!isCurrentStructuredSession(agentId, generation)) return;
     const container = document.getElementById('terminal-output');
     if (container && !container.querySelector('.crt-structured-transcript')) {
       const message = document.createElement('div');
@@ -7130,23 +7373,28 @@ async function refreshStructuredSession(agentId = focusedAgentId, force = false)
     }
     updateStructuredComposerState(agent);
   } finally {
-    structuredSessionLoading = false;
+    if (isCurrentStructuredSession(agentId, generation)) {
+      structuredSessionLoading = false;
+    }
   }
 }
 
-function stopStructuredSessionPolling() {
+function stopStructuredSessionPolling(revokeOwnership = true) {
   if (structuredSessionPoller) {
     clearInterval(structuredSessionPoller);
     structuredSessionPoller = null;
   }
   structuredSessionLoading = false;
   structuredSessionRenderedAt = '';
+  if (revokeOwnership) structuredSessionGeneration += 1;
 }
 
-function startStructuredSessionPolling(agentId) {
-  stopStructuredSessionPolling();
+function startStructuredSessionPolling(agentId, generation) {
+  stopStructuredSessionPolling(false);
   structuredSessionPoller = setInterval(() => {
-    if (focusedAgentId === agentId) void refreshStructuredSession(agentId);
+    if (isCurrentStructuredSession(agentId, generation)) {
+      void refreshStructuredSession(agentId, false, generation);
+    }
   }, 1000);
 }
 
@@ -7317,9 +7565,11 @@ function setupStructuredSessionComposer() {
     const agent = state && state.agents.find((candidate) => candidate.id === focusedAgentId);
     const action = structuredComposerAction(agent, input.value);
     if (!agent || action === 'disabled') return;
+    const agentId = agent.id;
+    const generation = structuredSessionGeneration;
     if (action === 'interrupt') {
       structuredComposerRestoreFocusAfterInterrupt = true;
-      const interrupted = getSessionClient()?.interruptAgent(focusedAgentId);
+      const interrupted = getSessionClient()?.interruptAgent(agentId);
       if (!interrupted) {
         structuredComposerRestoreFocusAfterInterrupt = false;
         showStructuredComposerError(new Error('Connection unavailable'));
@@ -7333,7 +7583,7 @@ function setupStructuredSessionComposer() {
     if (!message && promptAttachments.length === 0) return;
     const statusNode = document.getElementById('crt-structured-composer-status');
     const completeSubmission = () => {
-      addStructuredComposerHistory(focusedAgentId, draft);
+      addStructuredComposerHistory(agentId, draft);
       input.value = '';
       structuredComposerAttachments = [];
       renderStructuredComposerAttachments();
@@ -7343,11 +7593,11 @@ function setupStructuredSessionComposer() {
         statusNode.classList.remove('error');
       }
       updateStructuredComposerState(agent);
-      setTimeout(() => void refreshStructuredSession(focusedAgentId, true), 160);
+      setTimeout(() => void refreshStructuredSession(agentId, true, generation), 160);
     };
     const sent = action === 'send' && structuredRuntimeStatus(agent) !== 'idle'
-      ? (queueStructuredComposerFollowUp(focusedAgentId, message, promptAttachments), true)
-      : getSessionClient()?.sendComposerMessage(focusedAgentId, message, promptAttachments);
+      ? (queueStructuredComposerFollowUp(agentId, message, promptAttachments), true)
+      : getSessionClient()?.sendComposerMessage(agentId, message, promptAttachments);
     if (!sent) {
       if (statusNode) {
         statusNode.textContent = 'Connection unavailable';
@@ -7363,14 +7613,17 @@ async function openStructuredSession(agent, sessionToken) {
   const runtime = getSessionRuntime();
   const container = document.getElementById('terminal-output');
   if (!container) return;
+  const generation = ++structuredSessionGeneration;
   container.classList.add('crt-structured-session');
   setStructuredComposerActive(true);
   setupStructuredSessionComposer();
-  updateStructuredComposerState(agent);
-  await refreshStructuredSessionControls(agent.id, true);
-  await refreshStructuredSession(agent.id, true);
+  updateStructuredComposerState(agent, { refreshControls: false });
+  await refreshStructuredSessionControls(agent.id, true, generation);
+  if (!isCurrentStructuredSession(agent.id, generation)) return;
+  await refreshStructuredSession(agent.id, true, generation);
+  if (!isCurrentStructuredSession(agent.id, generation)) return;
   if (runtime && !runtime.isCurrentSession(agent.id, sessionToken)) return;
-  startStructuredSessionPolling(agent.id);
+  startStructuredSessionPolling(agent.id, generation);
   const input = document.getElementById('crt-structured-input');
   if (input) {
     resizeStructuredComposerInput(input);
@@ -7952,13 +8205,14 @@ if (typeof document !== 'undefined') {
 
     if (
       crtMainView === 'billing'
+      && billingMode === 'days'
       && !sessionActive
       && !e.ctrlKey
       && !e.metaKey
       && !e.altKey
       && navigationArrow
-      && selectCrtBillingDayByArrow(e.key)
     ) {
+      selectCrtBillingDayByArrow(e.key);
       e.preventDefault();
       return;
     }
@@ -8152,13 +8406,13 @@ if (typeof document !== 'undefined') {
     }
 
     if ((e.key === 'd' || e.key === 'D') && crtMainView === 'billing') {
-      setCrtBillingMode('days');
+      selectCrtBillingMode('days');
       e.preventDefault();
       return;
     }
 
     if ((e.key === 'l' || e.key === 'L') && crtMainView === 'billing') {
-      setCrtBillingMode('live');
+      selectCrtBillingMode('live');
       e.preventDefault();
       return;
     }
@@ -8329,7 +8583,9 @@ if (typeof module !== 'undefined' && module.exports) {
     crtAgentSessionKey,
     crtResumedSessionFromSource,
     crtDashboardStateSignature,
+    crtBillingDayArrowTargetIndex,
     crtBillingTimelineLabels,
+    crtBillingTimeline,
     crtBillingCurrentRate,
     findDefaultNewAgentIndex,
     findDirectionalNavigationIndex,
@@ -8354,6 +8610,7 @@ if (typeof module !== 'undefined' && module.exports) {
     getCrtAgentVerticalPageTarget,
     getCrtLiveAgents,
     getCrtRegularAgents,
+    getCrtMainAgentDialogAction,
     getCrtAgentRemovalFallback,
     getAgentDisplayText,
     getCrtPreviewCellStyle,
@@ -8398,5 +8655,6 @@ if (typeof module !== 'undefined' && module.exports) {
   });
   window.addEventListener('pagehide', suspendCrtPageConnection);
   window.addEventListener('pageshow', resumeCrtPageConnection);
+  startCrtTopBarTokenRateRefresh();
   connect();
 }