@ekkos/cli 1.3.0 → 1.3.1

package/dist/commands/dashboard.js

@@ -1089,14 +1089,15 @@ async function launchDashboard(initialSessionName, initialJsonlPath, refreshMs,
             let header = '';
             let separator = '';
             let rows = [];
-            // Always show all 7 columns: Turn, Model, Context, Cache Rd, Cache Wr, Output, Cost
+            // Always show all 8 columns: Turn, Time, Model, Context, Cache Rd, Cache Wr, Output, Cost
             // Shrink flex columns to fit narrow panes instead of dropping them.
             const colNum = 4;
+            const colTime = 8; // "HH:MM:SS" or "H:MM AM"
             const colM = 7;
             const colCtx = 7;
             const colCost = 8;
-            const nDividers = 6;
-            const fixedW = colNum + colM + colCtx + colCost;
+            const nDividers = 7;
+            const fixedW = colNum + colTime + colM + colCtx + colCost;
             const flexTotal = Math.max(0, w - fixedW - nDividers);
             let rdW = Math.max(5, Math.floor(flexTotal * 0.35));
             let wrW = Math.max(5, Math.floor(flexTotal * 0.30));
@@ -1118,14 +1119,30 @@ async function launchDashboard(initialSessionName, initialJsonlPath, refreshMs,
                     rdW -= trimRd;
                 }
             }
-            header = `{bold}${pad('Turn', colNum)}${div}${pad('Model', colM)}${div}${pad('Context', colCtx)}${div}${rpad('Cache Rd', rdW)}${div}${rpad('Cache Wr', wrW)}${div}${rpad('Output', outW)}${div}${rpad('Cost', colCost)}{/bold}`;
-            separator = `{gray-fg}${'─'.repeat(colNum)}┼${'─'.repeat(colM)}┼${'─'.repeat(colCtx)}┼${'─'.repeat(rdW)}┼${'─'.repeat(wrW)}┼${'─'.repeat(outW)}┼${'─'.repeat(colCost)}{/gray-fg}`;
+            // Format turn timestamp to short time string
+            const fmtTime = (iso) => {
+                if (!iso)
+                    return '--:--';
+                try {
+                    const d = new Date(iso);
+                    const h = d.getHours();
+                    const m = d.getMinutes().toString().padStart(2, '0');
+                    const s = d.getSeconds().toString().padStart(2, '0');
+                    return `${h}:${m}:${s}`;
+                }
+                catch {
+                    return '--:--';
+                }
+            };
+            header = `{bold}${pad('Turn', colNum)}${div}${pad('Time', colTime)}${div}${pad('Model', colM)}${div}${pad('Context', colCtx)}${div}${rpad('Cache Rd', rdW)}${div}${rpad('Cache Wr', wrW)}${div}${rpad('Output', outW)}${div}${rpad('Cost', colCost)}{/bold}`;
+            separator = `{gray-fg}${'─'.repeat(colNum)}┼${'─'.repeat(colTime)}┼${'─'.repeat(colM)}┼${'─'.repeat(colCtx)}┼${'─'.repeat(rdW)}┼${'─'.repeat(wrW)}┼${'─'.repeat(outW)}┼${'─'.repeat(colCost)}{/gray-fg}`;
             rows = turns.map(t => {
                 const mTag = modelTag(t.routedModel);
                 const mColor = t.routedModel.includes('haiku') ? 'green' : t.routedModel.includes('sonnet') ? 'blue' : 'magenta';
                 const costFlag = t.cost > 1.0 ? '{red-fg}' : t.cost > 0.5 ? '{yellow-fg}' : '{white-fg}';
                 const costEnd = t.cost > 1.0 ? '{/red-fg}' : t.cost > 0.5 ? '{/yellow-fg}' : '{/white-fg}';
                 return (pad(String(t.turn), colNum) + div +
+                    `{gray-fg}${pad(fmtTime(t.timestamp), colTime)}{/gray-fg}` + div +
                     `{${mColor}-fg}${pad(mTag, colM)}{/${mColor}-fg}` + div +
                     pad(`${t.contextPct.toFixed(0)}%`, colCtx) + div +
                     `{green-fg}${rpad(fmtK(t.cacheRead), rdW)}{/green-fg}` + div +
@@ -1220,9 +1237,22 @@ async function launchDashboard(initialSessionName, initialJsonlPath, refreshMs,
             return null;
         }
     }
-    async function updateWindowBox() {
+    // Cache last fetched usage data so the countdown can tick every second
+    let cachedUsage = null;
+    // Fetch fresh usage data from API (called every 15s)
+    async function fetchAndCacheUsage() {
+        try {
+            cachedUsage = await fetchAnthropicUsage();
+        }
+        catch (err) {
+            dlog(`Window fetch: ${err.message}`);
+        }
+        renderWindowBox();
+    }
+    // Render countdown from cached data (called every 1s)
+    function renderWindowBox() {
         try {
-            const usage = await fetchAnthropicUsage();
+            const usage = cachedUsage;
             let line1 = ' {gray-fg}No usage data{/gray-fg}';
             let line2 = '';
             // ── 5h Window (from Anthropic OAuth API) ──
@@ -1230,26 +1260,38 @@ async function launchDashboard(initialSessionName, initialJsonlPath, refreshMs,
                 const pct = usage.five_hour.utilization;
                 const resetAt = new Date(usage.five_hour.resets_at).getTime();
                 const remainMs = Math.max(0, resetAt - Date.now());
-                const remainMin = Math.round(remainMs / 60000);
-                const rH = Math.floor(remainMin / 60);
-                const rM = remainMin % 60;
+                const remainSec = Math.round(remainMs / 1000);
+                const rH = Math.floor(remainSec / 3600);
+                const rM = Math.floor((remainSec % 3600) / 60);
+                const rS = remainSec % 60;
                 const pctColor = pct < 50 ? 'green' : pct < 80 ? 'yellow' : 'red';
-                const timeColor = remainMin > 120 ? 'green' : remainMin > 60 ? 'yellow' : 'red';
+                const countdown = `${rH}h${rM.toString().padStart(2, '0')}m${rS.toString().padStart(2, '0')}s`;
+                const resetDate = new Date(resetAt);
+                const resetTime = resetDate.toLocaleString('en-US', { month: 'short', day: 'numeric', year: 'numeric', hour: 'numeric', minute: '2-digit' });
                 line1 = ` {bold}5h:{/bold}` +
                     ` {${pctColor}-fg}${pct.toFixed(0)}% used{/${pctColor}-fg}` +
-                    `  {${timeColor}-fg}${rH}h${rM}m left{/${timeColor}-fg}`;
+                    `  {${pctColor}-fg}⏱ ${countdown}{/${pctColor}-fg}` +
+                    `  resets ${resetTime}`;
             }
             // ── Weekly (from Anthropic OAuth API) ──
             if (usage?.seven_day) {
                 const pct = usage.seven_day.utilization;
                 const resetAt = new Date(usage.seven_day.resets_at);
-                const dayNames = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
-                const resetDay = dayNames[resetAt.getDay()];
-                const resetHour = resetAt.toLocaleTimeString('en-US', { hour: 'numeric', minute: '2-digit' });
+                const remainMs = Math.max(0, resetAt.getTime() - Date.now());
+                const remainSec = Math.round(remainMs / 1000);
+                const rD = Math.floor(remainSec / 86400);
+                const rH = Math.floor((remainSec % 86400) / 3600);
+                const rM = Math.floor((remainSec % 3600) / 60);
+                const rS = remainSec % 60;
                 const pctColor = pct < 50 ? 'green' : pct < 80 ? 'yellow' : 'red';
+                const countdown = rD > 0
+                    ? `${rD}d${rH}h${rM.toString().padStart(2, '0')}m`
+                    : `${rH}h${rM.toString().padStart(2, '0')}m${rS.toString().padStart(2, '0')}s`;
+                const resetTime = resetAt.toLocaleString('en-US', { weekday: 'short', month: 'short', day: 'numeric', year: 'numeric', hour: 'numeric', minute: '2-digit' });
                 line2 = ` {bold}Week:{/bold}` +
                     ` {${pctColor}-fg}${pct.toFixed(0)}% used{/${pctColor}-fg}` +
-                    `  resets ${resetDay} ${resetHour}`;
+                    `  {${pctColor}-fg}⏱ ${countdown}{/${pctColor}-fg}` +
+                    `  resets ${resetTime}`;
             }
             windowBox.setContent(line1 + (line2 ? '\n' + line2 : ''));
         }
@@ -1262,6 +1304,8 @@ async function launchDashboard(initialSessionName, initialJsonlPath, refreshMs,
         }
         catch { }
     }
+    // Legacy wrapper for backward compat
+    async function updateWindowBox() { await fetchAndCacheUsage(); }
     // ── Handle terminal resize ──
     // Recalculate all widget positions from new screen.height
     screen.on('resize', () => {
@@ -1292,6 +1336,7 @@ async function launchDashboard(initialSessionName, initialJsonlPath, refreshMs,
     screen.key(['C-c'], () => {
         clearInterval(pollInterval);
         clearInterval(windowPollInterval);
+        clearInterval(countdownInterval);
         clearInterval(headerAnimInterval);
         clearInterval(fortuneInterval);
         screen.destroy();
@@ -1301,6 +1346,7 @@ async function launchDashboard(initialSessionName, initialJsonlPath, refreshMs,
         screen.key(['q'], () => {
             clearInterval(pollInterval);
             clearInterval(windowPollInterval);
+            clearInterval(countdownInterval);
             clearInterval(headerAnimInterval);
             clearInterval(fortuneInterval);
             screen.destroy();
@@ -1408,7 +1454,8 @@ async function launchDashboard(initialSessionName, initialJsonlPath, refreshMs,
         fortuneText = activeFortunes[fortuneIdx];
         renderHeader();
     }, 30000);
-    const windowPollInterval = setInterval(updateWindowBox, 15000); // every 15s
+    const windowPollInterval = setInterval(fetchAndCacheUsage, 15000); // fetch fresh data every 15s
+    const countdownInterval = setInterval(renderWindowBox, 1000); // tick countdown every 1s
 }
 // ── Helpers ──
 function fmtK(n) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ekkos/cli",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "Setup ekkOS memory for AI coding assistants (Claude Code, Cursor, Windsurf)",
   "main": "dist/index.js",
   "bin": {