@clagentic/console 1.0.2 → 1.0.3-beta.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/lib/public/index.html
CHANGED
|
@@ -290,9 +290,8 @@
|
|
|
290
290
|
<div class="usage-divider"></div>
|
|
291
291
|
<div class="usage-section-label">Session</div>
|
|
292
292
|
<div class="usage-row"><span class="usage-label">Cost</span><span id="usage-cost" class="usage-value">$0.0000</span></div>
|
|
293
|
-
<div class="usage-row"><span class="usage-label">
|
|
293
|
+
<div class="usage-row"><span class="usage-label">Context</span><span id="usage-context" class="usage-value">-</span></div>
|
|
294
294
|
<div class="usage-row"><span class="usage-label">Output tokens</span><span id="usage-output" class="usage-value">0</span></div>
|
|
295
|
-
<div class="usage-row"><span class="usage-label">Cache read</span><span id="usage-cache-read" class="usage-value">0</span></div>
|
|
296
295
|
<div class="usage-row"><span class="usage-label">Cache write</span><span id="usage-cache-write" class="usage-value">0</span></div>
|
|
297
296
|
<div class="usage-row"><span class="usage-label">Turns</span><span id="usage-turns" class="usage-value">0</span></div>
|
|
298
297
|
</div>
|
|
@@ -36,7 +36,7 @@ import { handleLoopRegistryUpdated, handleScheduleRunStarted, handleScheduleRunF
|
|
|
36
36
|
import { scrollToBottom, addToMessages, addUserMessage, addSystemMessage, appendDelta, finalizeAssistantBlock, addConflictMessage, addContextOverflowMessage, showSuggestionChips, armStickyBottom, disarmStickyBottom, removePreThinking } from './app-rendering.js';
|
|
37
37
|
import { setActivity, startUrgentBlink, stopUrgentBlink, blinkSessionDot, updateCrossProjectBlink } from './app-favicon.js';
|
|
38
38
|
import { setStatus } from './app-connection.js';
|
|
39
|
-
import { getModelEffortLevels, accumulateUsage, setSessionUsage, updateUsagePanel, accumulateContext, updateContextPanel, renderCtxPopover, updateStatusPanel } from './app-panels.js';
|
|
39
|
+
import { getModelEffortLevels, accumulateUsage, getSessionUsage, setSessionUsage, updateUsagePanel, accumulateContext, updateContextPanel, renderCtxPopover, updateStatusPanel } from './app-panels.js';
|
|
40
40
|
import { updateProjectList, resetClientState, showUpdateAvailable, handleRemoveProjectCheckResult, handleRemoveProjectResult, handleBrowseDirResult, handleAddProjectResult, handleCloneProgress } from './app-projects.js';
|
|
41
41
|
import { updateHistorySentinel, prependOlderHistory } from './app-header.js';
|
|
42
42
|
import { hideHomeHub, handleHubSchedules } from './app-home-hub.js';
|
|
@@ -126,21 +126,20 @@ export function processMessage(msg) {
|
|
|
126
126
|
if (msg.contextUsage) {
|
|
127
127
|
store.set({ richContextUsage: msg.contextUsage });
|
|
128
128
|
}
|
|
129
|
-
// Restore accurate context data from the last result in full history
|
|
129
|
+
// Restore accurate context data from the last result in full history.
|
|
130
|
+
// accumulateContext handles context bar fill; accumulateUsage restores the
|
|
131
|
+
// usage panel's context/cost values. Both assign (not sum) so replay
|
|
132
|
+
// accumulation during history messages is correctly overwritten here.
|
|
130
133
|
if (msg.lastUsage || msg.lastModelUsage) {
|
|
131
134
|
accumulateContext(msg.lastCost, msg.lastUsage, msg.lastModelUsage, msg.lastStreamInputTokens);
|
|
132
135
|
}
|
|
133
|
-
// Restore
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
cacheRead: cu.cacheRead || 0,
|
|
141
|
-
cacheWrite: cu.cacheWrite || 0,
|
|
142
|
-
turns: cu.turns || 0,
|
|
143
|
-
});
|
|
136
|
+
// Restore usage panel from the last result in history.
|
|
137
|
+
// output/cacheWrite are cumulative sums that were accumulated during replay above;
|
|
138
|
+
// we keep them. cost and context come from the last result directly.
|
|
139
|
+
if (msg.lastCost != null) {
|
|
140
|
+
var su = getSessionUsage();
|
|
141
|
+
su.cost = msg.lastCost;
|
|
142
|
+
if (msg.lastStreamInputTokens) su.context = msg.lastStreamInputTokens;
|
|
144
143
|
}
|
|
145
144
|
updateContextPanel();
|
|
146
145
|
updateUsagePanel();
|
|
@@ -813,7 +812,7 @@ export function processMessage(msg) {
|
|
|
813
812
|
closeToolGroup();
|
|
814
813
|
finalizeAssistantBlock();
|
|
815
814
|
addTurnMeta(msg.cost, msg.duration);
|
|
816
|
-
accumulateUsage(msg.cost, msg.usage);
|
|
815
|
+
accumulateUsage(msg.cost, msg.usage, msg.lastStreamInputTokens);
|
|
817
816
|
accumulateContext(msg.cost, msg.usage, msg.modelUsage, msg.lastStreamInputTokens);
|
|
818
817
|
break;
|
|
819
818
|
|
|
@@ -8,7 +8,9 @@ import { getWs } from './ws-ref.js';
|
|
|
8
8
|
import { VENDOR_NAMES } from './app-rendering.js';
|
|
9
9
|
|
|
10
10
|
// --- Module-owned state (not in store) ---
|
|
11
|
-
|
|
11
|
+
// sessionUsage.context = last-turn context fill (lastStreamInputTokens) — not cumulative,
|
|
12
|
+
// just the most recent value. Correct for display without any accumulation issues.
|
|
13
|
+
var sessionUsage = { cost: 0, context: 0, output: 0, cacheWrite: 0, turns: 0 };
|
|
12
14
|
var contextData = { contextWindow: 0, maxOutputTokens: 0, model: "-", cost: 0, input: 0, output: 0, cacheRead: 0, cacheWrite: 0, turns: 0 };
|
|
13
15
|
var ctxPopoverEl = null;
|
|
14
16
|
var ctxHoverTimer = null;
|
|
@@ -39,9 +41,8 @@ var configWebsearchBar = null;
|
|
|
39
41
|
var usagePanel = null;
|
|
40
42
|
var usagePanelClose = null;
|
|
41
43
|
var usageCostEl = null;
|
|
42
|
-
var
|
|
44
|
+
var usageContextEl = null;
|
|
43
45
|
var usageOutputEl = null;
|
|
44
|
-
var usageCacheReadEl = null;
|
|
45
46
|
var usageCacheWriteEl = null;
|
|
46
47
|
var usageTurnsEl = null;
|
|
47
48
|
|
|
@@ -467,9 +468,8 @@ export function initPanels() {
|
|
|
467
468
|
usagePanel = $("usage-panel");
|
|
468
469
|
usagePanelClose = $("usage-panel-close");
|
|
469
470
|
usageCostEl = $("usage-cost");
|
|
470
|
-
|
|
471
|
+
usageContextEl = $("usage-context");
|
|
471
472
|
usageOutputEl = $("usage-output");
|
|
472
|
-
usageCacheReadEl = $("usage-cache-read");
|
|
473
473
|
usageCacheWriteEl = $("usage-cache-write");
|
|
474
474
|
usageTurnsEl = $("usage-turns");
|
|
475
475
|
|
|
@@ -665,29 +665,44 @@ export function updateUsagePanel() {
|
|
|
665
665
|
usageCostEl.textContent = (vendor === 'codex' || sessionUsage.cost == null)
|
|
666
666
|
? 'N/A'
|
|
667
667
|
: '$' + sessionUsage.cost.toFixed(4);
|
|
668
|
-
|
|
668
|
+
if (usageContextEl) {
|
|
669
|
+
// Show current context fill (same source as the context bar) alongside window size
|
|
670
|
+
var ctxWin = (contextData && contextData.contextWindow) ? contextData.contextWindow : 0;
|
|
671
|
+
usageContextEl.textContent = sessionUsage.context > 0
|
|
672
|
+
? formatTokens(sessionUsage.context) + (ctxWin > 0 ? ' / ' + formatTokens(ctxWin) : '')
|
|
673
|
+
: '-';
|
|
674
|
+
}
|
|
669
675
|
usageOutputEl.textContent = formatTokens(sessionUsage.output);
|
|
670
|
-
usageCacheReadEl.textContent = formatTokens(sessionUsage.cacheRead);
|
|
671
676
|
usageCacheWriteEl.textContent = formatTokens(sessionUsage.cacheWrite);
|
|
672
677
|
usageTurnsEl.textContent = String(sessionUsage.turns);
|
|
673
678
|
}
|
|
674
679
|
|
|
675
|
-
export function accumulateUsage(cost, usage) {
|
|
676
|
-
// cost
|
|
677
|
-
// Assign directly instead of summing to avoid overcounting.
|
|
680
|
+
export function accumulateUsage(cost, usage, lastStreamInputTokens) {
|
|
681
|
+
// cost: SDK total_cost_usd — cumulative running total; assign, never sum.
|
|
678
682
|
if (cost != null) sessionUsage.cost = cost;
|
|
679
683
|
if (usage) {
|
|
680
|
-
|
|
684
|
+
// output_tokens: per-turn output — sum correctly.
|
|
681
685
|
sessionUsage.output += usage.output_tokens || usage.outputTokens || 0;
|
|
682
|
-
|
|
686
|
+
// cache_creation_input_tokens: new cache written this turn — sum correctly.
|
|
683
687
|
sessionUsage.cacheWrite += usage.cache_creation_input_tokens || usage.cacheCreationInputTokens || 0;
|
|
684
688
|
}
|
|
689
|
+
// context: current context window fill from the last message_start event.
|
|
690
|
+
// This is the same value used by the context bar. Assign (not sum) — it represents
|
|
691
|
+
// the current state of the context window, not a cumulative total.
|
|
692
|
+
// Prefer lastStreamInputTokens (accurate per-call); fall back to input+cache_read.
|
|
693
|
+
if (lastStreamInputTokens) {
|
|
694
|
+
sessionUsage.context = lastStreamInputTokens;
|
|
695
|
+
} else if (usage) {
|
|
696
|
+
var directIn = usage.input_tokens || usage.inputTokens || 0;
|
|
697
|
+
var cacheIn = usage.cache_read_input_tokens || usage.cacheReadInputTokens || 0;
|
|
698
|
+
if (directIn + cacheIn > 0) sessionUsage.context = directIn + cacheIn;
|
|
699
|
+
}
|
|
685
700
|
sessionUsage.turns++;
|
|
686
701
|
if (!store.get('replayingHistory')) updateUsagePanel();
|
|
687
702
|
}
|
|
688
703
|
|
|
689
704
|
export function resetUsage() {
|
|
690
|
-
sessionUsage = { cost: 0,
|
|
705
|
+
sessionUsage = { cost: 0, context: 0, output: 0, cacheWrite: 0, turns: 0 };
|
|
691
706
|
updateUsagePanel();
|
|
692
707
|
if (usagePanel) usagePanel.classList.add("hidden");
|
|
693
708
|
}
|
|
@@ -453,17 +453,6 @@ function attachMessageProcessor(ctx) {
|
|
|
453
453
|
sessionId: parsed.sessionId,
|
|
454
454
|
lastStreamInputTokens: lastStreamInput,
|
|
455
455
|
});
|
|
456
|
-
// Accumulate server-side cumulative usage for accurate history_done replay
|
|
457
|
-
if (!session.cumulativeUsage) {
|
|
458
|
-
session.cumulativeUsage = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, turns: 0 };
|
|
459
|
-
}
|
|
460
|
-
if (parsed.usage) {
|
|
461
|
-
session.cumulativeUsage.input += parsed.usage.input_tokens || parsed.usage.inputTokens || 0;
|
|
462
|
-
session.cumulativeUsage.output += parsed.usage.output_tokens || parsed.usage.outputTokens || 0;
|
|
463
|
-
session.cumulativeUsage.cacheRead += parsed.usage.cache_read_input_tokens || parsed.usage.cacheReadInputTokens || 0;
|
|
464
|
-
session.cumulativeUsage.cacheWrite += parsed.usage.cache_creation_input_tokens || parsed.usage.cacheCreationInputTokens || 0;
|
|
465
|
-
}
|
|
466
|
-
session.cumulativeUsage.turns++;
|
|
467
456
|
if (parsed.fastModeState) {
|
|
468
457
|
sendAndRecord(session, { type: "fast_mode_state", state: parsed.fastModeState });
|
|
469
458
|
}
|
package/lib/sessions.js
CHANGED
|
@@ -264,7 +264,6 @@ function createSessionManager(opts) {
|
|
|
264
264
|
favoriteOrder: null,
|
|
265
265
|
vendor: (sessionOpts && sessionOpts.vendor) || null,
|
|
266
266
|
agentName: (sessionOpts && sessionOpts.agentName) || null,
|
|
267
|
-
cumulativeUsage: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, turns: 0 },
|
|
268
267
|
};
|
|
269
268
|
sessions.set(localId, session);
|
|
270
269
|
switchSession(localId, targetWs);
|
|
@@ -298,7 +297,6 @@ function createSessionManager(opts) {
|
|
|
298
297
|
favoriteOrder: null,
|
|
299
298
|
vendor: (sessionOpts && sessionOpts.vendor) || null,
|
|
300
299
|
agentName: (sessionOpts && sessionOpts.agentName) || null,
|
|
301
|
-
cumulativeUsage: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, turns: 0 },
|
|
302
300
|
};
|
|
303
301
|
sessions.set(localId, session);
|
|
304
302
|
return session;
|
|
@@ -355,7 +353,7 @@ function createSessionManager(opts) {
|
|
|
355
353
|
}
|
|
356
354
|
}
|
|
357
355
|
|
|
358
|
-
_send({ type: "history_done", lastUsage: lastUsage, lastModelUsage: lastModelUsage, lastCost: lastCost, lastStreamInputTokens: lastStreamInputTokens, contextUsage: session.lastContextUsage || null
|
|
356
|
+
_send({ type: "history_done", lastUsage: lastUsage, lastModelUsage: lastModelUsage, lastCost: lastCost, lastStreamInputTokens: lastStreamInputTokens, contextUsage: session.lastContextUsage || null });
|
|
359
357
|
}
|
|
360
358
|
|
|
361
359
|
function switchSession(localId, targetWs, transform) {
|
package/package.json
CHANGED