farming-code 2.2.19 → 2.2.20

package/dist/index.html

@@ -15,7 +15,7 @@
     <link rel="apple-touch-icon" sizes="180x180" href="/farming/farming-2/app-icon-v2-180.png" />
     <link rel="manifest" href="/farming/farming-2/site.webmanifest" />
     <title>Farming 2</title>
-    <script type="module" crossorigin src="/farming/assets/index-DQdtPfCk.js"></script>
+    <script type="module" crossorigin src="/farming/assets/index-DuMjesL2.js"></script>
     <link rel="modulepreload" crossorigin href="/farming/assets/chunk-DECur_0Z.js">
     <link rel="modulepreload" crossorigin href="/farming/assets/preload-helper-mJowh_hw.js">
     <link rel="modulepreload" crossorigin href="/farming/assets/jsx-runtime-BthL93pI.js">

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 = '';
@@ -116,8 +119,10 @@ 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;
@@ -3159,6 +3164,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 +4012,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 +4044,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 +4186,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 +4268,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 +4375,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 +4453,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 +4463,7 @@ function renderCrtBilling() {
       : billingLoading
         ? (billingSummary ? 'REFRESHING' : 'SCANNING LOGS')
         : billingSummary
-          ? (billingMode === 'days' ? 'HISTORY READY' : 'SIGNAL LOCKED')
+          ? crtBillingStatusText()
           : 'STANDBY';
   }
   if (refresh) refresh.disabled = billingLoading;
@@ -4449,13 +4510,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 +4529,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 +4548,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);
@@ -5485,7 +5604,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 +5651,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 +5665,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 +5675,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 +5721,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 +5753,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);
@@ -7952,13 +8087,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 +8288,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 +8465,9 @@ if (typeof module !== 'undefined' && module.exports) {
     crtAgentSessionKey,
     crtResumedSessionFromSource,
     crtDashboardStateSignature,
+    crtBillingDayArrowTargetIndex,
     crtBillingTimelineLabels,
+    crtBillingTimeline,
     crtBillingCurrentRate,
     findDefaultNewAgentIndex,
     findDirectionalNavigationIndex,
@@ -8354,6 +8492,7 @@ if (typeof module !== 'undefined' && module.exports) {
     getCrtAgentVerticalPageTarget,
     getCrtLiveAgents,
     getCrtRegularAgents,
+    getCrtMainAgentDialogAction,
     getCrtAgentRemovalFallback,
     getAgentDisplayText,
     getCrtPreviewCellStyle,
@@ -8398,5 +8537,6 @@ if (typeof module !== 'undefined' && module.exports) {
   });
   window.addEventListener('pagehide', suspendCrtPageConnection);
   window.addEventListener('pageshow', resumeCrtPageConnection);
+  startCrtTopBarTokenRateRefresh();
   connect();
 }

package/frontend/skins/crt/index.html

@@ -1475,7 +1475,7 @@
     <div class="top-bar">
         <div class="top-bar-item">AGENTS: <span id="active-agents">0</span>/<span id="total-agents">0</span></div>
         <div class="top-bar-item" id="agent-page-item" hidden>PAGE: <span id="agent-page-status">1/1</span></div>
-        <div class="top-bar-item" title="Estimated terminal output tokens per minute over the last 5 minutes">TOK/MIN: <span id="tokens-per-minute">--</span></div>
+        <div class="top-bar-item" title="Provider-reported tokens per minute over the last 5 minutes">TOK/MIN: <span id="tokens-per-minute">--</span></div>
         <div class="top-bar-item">CPU: <span id="cpu-usage">--</span>%</div>
         <div class="top-bar-item">MEM: <span id="mem-percentage">--</span>%</div>
         <div class="top-bar-item" id="focus-region" style="display: none;">Focus: <span id="focus-region-name">--</span></div>
@@ -1545,8 +1545,8 @@
                 <h2>Billing</h2>
                 <div class="billing-header-actions">
                     <div class="billing-view-switch" role="tablist" aria-label="Billing view">
-                        <button type="button" id="billing-days-tab" class="active" role="tab" aria-selected="true" data-crt-nav-key="billing:days" tabindex="-1" onclick="setCrtBillingMode('days')">[D] DAYS</button>
-                        <button type="button" id="billing-live-tab" role="tab" aria-selected="false" data-crt-nav-key="billing:live" tabindex="-1" onclick="setCrtBillingMode('live')">[L] LIVE</button>
+                        <button type="button" id="billing-days-tab" class="active" role="tab" aria-selected="true" data-crt-nav-key="billing:days" tabindex="-1" onclick="selectCrtBillingMode('days')">[D] DAYS</button>
+                        <button type="button" id="billing-live-tab" role="tab" aria-selected="false" data-crt-nav-key="billing:live" tabindex="-1" onclick="selectCrtBillingMode('live')">[L] LIVE</button>
                     </div>
                     <span class="billing-status" id="billing-status">STANDBY</span>
                 </div>
@@ -1960,13 +1960,8 @@
                     </div>
                 </div>
 
-                <h3 style="margin: 30px 0 15px; color: #00ff00;">Session Engine</h3>
-                <div id="session-engine-settings">
-                    <div class="settings-panel">
-                        <label style="display: block; color: #00ff00; margin-bottom: 10px;">Coding Agent Engine</label>
-                        <div class="settings-static-value">built-in</div>
-                        <div style="color: #888; font-size: 12px; margin-top: 8px;">Uses Farming's built-in local session runtime.</div>
-                    </div>
+                <h3 style="margin: 30px 0 15px; color: #00ff00;">Agent Permissions</h3>
+                <div id="agent-permission-settings">
                     <div class="settings-panel">
                         <label class="crt-checkbox-label" tabindex="-1" data-crt-nav-key="settings:skip-permissions">
                             <input type="checkbox" id="skip-permission-check-by-default" class="crt-checkbox danger">

package/frontend/skins/crt/styles/billing.css

@@ -50,7 +50,12 @@
 
 #farming-crt .billing-view-switch button:hover,
 #farming-crt .billing-view-switch button:focus-visible,
-#farming-crt .billing-view-switch button.crt-nav-selected,
+#farming-crt .billing-view-switch button.crt-nav-selected {
+    color: var(--crt-phosphor-bright);
+    border-color: rgba(85, 245, 155, 0.72);
+    outline: none;
+}
+
 #farming-crt .billing-view-switch button.active {
     color: var(--crt-background);
     background: var(--crt-phosphor-bright);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "farming-code",
-  "version": "2.2.19",
+  "version": "2.2.20",
   "description": "Remote browser workspace for supervising AI coding agents",
   "main": "backend/server.js",
   "bin": {