farming-code 2.2.19 → 2.2.20

package/backend/server.js

@@ -744,8 +744,12 @@ app.get(routePath(BASE_PATH, '/api/claude/settings'), (req, res) => {
 app.get(routePath(BASE_PATH, '/api/usage'), async (req, res) => {
   try {
     const fresh = req.query.fresh === '1';
+    const live = req.query.live === '1';
     if (fresh) usageMonitor.invalidateDailyCache();
-    const usage = await usageSummaryCache.get('summary', fresh ? { force: true } : {});
+    const usage = await usageSummaryCache.get(
+      'summary',
+      fresh ? { force: true } : live ? { maxAgeMs: 15_000 } : {},
+    );
     res.json({ usage });
   } catch (error) {
     res.status(500).json({ error: error.message || 'Failed to read usage information' });

package/backend/terminal-screen-worker-pool.js

@@ -23,6 +23,7 @@ class TerminalScreenWorkerPool {
     this.waiters = [];
     this.readyWaiters = [];
     this.pendingStarts = 0;
+    this.startTasks = new Set();
     this.consecutiveStartFailures = 0;
     this.retryDelayMs = Number.isFinite(options.retryDelayMs)
       ? Math.max(0, Number(options.retryDelayMs))
@@ -91,13 +92,12 @@ class TerminalScreenWorkerPool {
   startWorker() {
     this.pendingStarts += 1;
     let failed = false;
-    this.createReadyWorker()
+    const startTask = this.createReadyWorker()
       .then((worker) => {
         this.pendingStarts -= 1;
         this.consecutiveStartFailures = 0;
         if (this.disposed) {
-          worker.dispose().catch(() => {});
-          return;
+          return worker.dispose().catch(() => {});
         }
         this.deliverWorker(worker);
       })
@@ -122,6 +122,11 @@ class TerminalScreenWorkerPool {
           this.ensureCapacity();
         }
       });
+    this.startTasks.add(startTask);
+    startTask.then(
+      () => this.startTasks.delete(startTask),
+      () => this.startTasks.delete(startTask),
+    );
   }
 
   scheduleCapacityRetry() {
@@ -197,8 +202,8 @@ class TerminalScreenWorkerPool {
   }
 
   async dispose() {
-    if (this.disposed) {
-      return;
+    if (this.disposePromise) {
+      return this.disposePromise;
     }
 
     this.disposed = true;
@@ -210,7 +215,11 @@ class TerminalScreenWorkerPool {
     this.waiters.splice(0).forEach(({ reject }) => reject(error));
     this.readyWaiters.splice(0).forEach(({ reject }) => reject(error));
     const workers = this.idle.splice(0);
-    await Promise.allSettled(workers.map(worker => worker.dispose()));
+    this.disposePromise = Promise.allSettled([
+      ...workers.map(worker => worker.dispose()),
+      ...this.startTasks,
+    ]).then(() => undefined);
+    return this.disposePromise;
   }
 }
 

package/backend/usage-monitor.js

@@ -10,6 +10,8 @@ const execFileAsync = promisify(execFile);
 const USAGE_WINDOW_MS = 5 * 60 * 1000;
 const USAGE_TIMELINE_WINDOW_MS = 24 * 60 * 60 * 1000;
 const USAGE_TIMELINE_BUCKET_COUNT = 24;
+const USAGE_LIVE_TIMELINE_WINDOW_MS = 60 * 60 * 1000;
+const USAGE_LIVE_TIMELINE_BUCKET_COUNT = 60;
 const USAGE_DAILY_DAYS = 52 * 7;
 const USAGE_DAILY_CACHE_MS = 5 * 60 * 1000;
 const USAGE_LIVE_DAY_CACHE_MS = 5 * 1000;
@@ -1020,6 +1022,12 @@ class UsageMonitor {
       windowMs: historyWindowMs,
       alignToBucket: true,
     });
+    const liveTimeline = buildUsageTimeline(history.providerEvents, {
+      now,
+      windowMs: USAGE_LIVE_TIMELINE_WINDOW_MS,
+      bucketCount: USAGE_LIVE_TIMELINE_BUCKET_COUNT,
+      alignToBucket: true,
+    });
     const openCodeCoverage = history.coverage.find(entry => entry.provider === 'opencode');
     const qoderCoverage = history.coverage.find(entry => entry.provider === 'qoder');
 
@@ -1027,6 +1035,7 @@ class UsageMonitor {
       sampledAt: now,
       windowMs,
       timeline,
+      liveTimeline,
       daily: history.daily,
       providers: [
         {
@@ -1099,6 +1108,8 @@ module.exports = {
   USAGE_WINDOW_MS,
   USAGE_TIMELINE_WINDOW_MS,
   USAGE_TIMELINE_BUCKET_COUNT,
+  USAGE_LIVE_TIMELINE_WINDOW_MS,
+  USAGE_LIVE_TIMELINE_BUCKET_COUNT,
   USAGE_DAILY_DAYS,
   USAGE_DAILY_CACHE_MS,
   USAGE_LIVE_DAY_CACHE_MS,