@codori/client 0.0.4 → 0.0.5

package/app/components/ChatWorkspace.vue

@@ -57,6 +57,7 @@ import {
   normalizeThreadTokenUsage,
   resolveContextWindowState,
   resolveEffortOptions,
+  shouldShowContextWindowIndicator,
   visibleModelOptions,
   type ReasoningEffort
 } from '~~/shared/chat-prompt-controls'
@@ -174,7 +175,6 @@ const starterPrompts = computed(() => {
   ]
 })
 
-const hasKnownThreadUsage = computed(() => !activeThreadId.value || tokenUsage.value !== null)
 const effectiveModelList = computed(() => {
   const withSelected = ensureModelOption(
     availableModels.value.length > 0 ? availableModels.value : FALLBACK_MODELS,
@@ -202,8 +202,9 @@ const effortSelectItems = computed(() =>
   }))
 )
 const contextWindowState = computed(() =>
-  resolveContextWindowState(tokenUsage.value, modelContextWindow.value, hasKnownThreadUsage.value)
+  resolveContextWindowState(tokenUsage.value, modelContextWindow.value)
 )
+const showContextIndicator = computed(() => shouldShowContextWindowIndicator(contextWindowState.value))
 const contextUsedPercent = computed(() => contextWindowState.value.usedPercent ?? 0)
 const contextIndicatorLabel = computed(() => {
   const remainingPercent = contextWindowState.value.remainingPercent
@@ -1708,6 +1709,7 @@ const sendMessage = async () => {
         input: buildTurnStartInput(text, uploadedAttachments),
         ...buildTurnOverrides(selectedModel.value, selectedEffort.value)
       })
+      tokenUsage.value = null
       return
     }
 
@@ -1725,6 +1727,7 @@ const sendMessage = async () => {
       ...buildTurnOverrides(selectedModel.value, selectedEffort.value)
     })
 
+    tokenUsage.value = null
     setLiveStreamTurnId(liveStream, turnStart.turn.id)
 
     for (const notification of liveStream.bufferedNotifications.splice(0, liveStream.bufferedNotifications.length)) {
@@ -2089,6 +2092,7 @@ watch([selectedModel, availableModels], () => {
 
                 <div class="ml-auto flex shrink-0 items-center">
                   <UPopover
+                    v-if="showContextIndicator"
                     :content="{ side: 'top', align: 'end' }"
                     arrow
                   >
@@ -2128,8 +2132,6 @@ watch([selectedModel, availableModels], () => {
                           {{ contextIndicatorLabel }}
                         </span>
                       </span>
-
-                      <span class="text-[11px] leading-none text-muted">context window</span>
                     </button>
 
                     <template #content>
@@ -2143,10 +2145,7 @@ watch([selectedModel, availableModels], () => {
                           </div>
                         </div>
 
-                        <div
-                          v-if="contextWindowState.contextWindow && contextWindowState.usedTokens !== null"
-                          class="grid grid-cols-2 gap-3 text-sm"
-                        >
+                        <div class="grid grid-cols-2 gap-3 text-sm">
                           <div class="rounded-2xl border border-default bg-elevated/35 px-3 py-2">
                             <div class="text-[11px] uppercase tracking-[0.18em] text-muted">
                               Remaining
@@ -2166,23 +2165,11 @@ watch([selectedModel, availableModels], () => {
                               {{ formatCompactTokenCount(contextWindowState.usedTokens ?? 0) }}
                             </div>
                             <div class="text-xs text-muted">
-                              of {{ formatCompactTokenCount(contextWindowState.contextWindow) }}
+                              of {{ formatCompactTokenCount(contextWindowState.contextWindow ?? 0) }}
                             </div>
                           </div>
                         </div>
 
-                        <div
-                          v-else
-                          class="rounded-2xl border border-default bg-elevated/35 px-3 py-2 text-sm text-muted"
-                        >
-                          <div v-if="contextWindowState.contextWindow">
-                            Live token usage will appear after the next turn completes.
-                          </div>
-                          <div v-else>
-                            Context window details are not available from the runtime yet.
-                          </div>
-                        </div>
-
                         <div class="grid grid-cols-2 gap-3 text-sm">
                           <div class="rounded-2xl border border-default bg-elevated/35 px-3 py-2">
                             <div class="text-[11px] uppercase tracking-[0.18em] text-muted">

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codori/client",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "private": false,
   "description": "Codori Nuxt dashboard for project browsing, Codex chat, and thread resume.",
   "type": "module",

package/shared/chat-prompt-controls.ts

@@ -20,15 +20,26 @@ export type ModelOption = {
 }
 
 export type TokenUsageSnapshot = {
+  totalTokens: number | null
   totalInputTokens: number
   totalCachedInputTokens: number
   totalOutputTokens: number
+  lastUsageKnown: boolean
+  lastTotalTokens: number | null
   lastInputTokens: number
   lastCachedInputTokens: number
   lastOutputTokens: number
   modelContextWindow: number | null
 }
 
+export type ContextWindowState = {
+  contextWindow: number | null
+  usedTokens: number | null
+  remainingTokens: number | null
+  usedPercent: number | null
+  remainingPercent: number | null
+}
+
 type ReasoningEffortOptionRecord = {
   reasoningEffort?: unknown
 }
@@ -250,15 +261,18 @@ export const normalizeThreadTokenUsage = (value: unknown): TokenUsageSnapshot |
   }
 
   const total = isObjectRecord(tokenUsage.total) ? tokenUsage.total : {}
-  const last = isObjectRecord(tokenUsage.last) ? tokenUsage.last : {}
+  const last = isObjectRecord(tokenUsage.last) ? tokenUsage.last : null
 
   return {
+    totalTokens: toFiniteNumber(total.totalTokens),
     totalInputTokens: toFiniteNumber(total.inputTokens) ?? 0,
     totalCachedInputTokens: toFiniteNumber(total.cachedInputTokens) ?? 0,
     totalOutputTokens: toFiniteNumber(total.outputTokens) ?? 0,
-    lastInputTokens: toFiniteNumber(last.inputTokens) ?? 0,
-    lastCachedInputTokens: toFiniteNumber(last.cachedInputTokens) ?? 0,
-    lastOutputTokens: toFiniteNumber(last.outputTokens) ?? 0,
+    lastUsageKnown: last !== null,
+    lastTotalTokens: toFiniteNumber(last?.totalTokens),
+    lastInputTokens: toFiniteNumber(last?.inputTokens) ?? 0,
+    lastCachedInputTokens: toFiniteNumber(last?.cachedInputTokens) ?? 0,
+    lastOutputTokens: toFiniteNumber(last?.outputTokens) ?? 0,
     modelContextWindow: toFiniteNumber(tokenUsage.modelContextWindow)
   }
 }
@@ -306,15 +320,16 @@ export const formatCompactTokenCount = (value: number) => {
 
 export const resolveContextWindowState = (
   tokenUsage: TokenUsageSnapshot | null,
-  fallbackContextWindow: number | null,
-  usageKnown = true
-) => {
+  fallbackContextWindow: number | null
+): ContextWindowState => {
   const contextWindow = tokenUsage?.modelContextWindow ?? fallbackContextWindow
+  // App-server exposes cumulative thread totals separately; the latest turn total
+  // is the closest match to current context occupancy.
   const usedTokens = tokenUsage
-    ? tokenUsage.totalInputTokens + tokenUsage.totalOutputTokens
-    : usageKnown
-      ? 0
-      : null
+    ? tokenUsage.lastTotalTokens ?? (tokenUsage.lastUsageKnown
+        ? tokenUsage.lastInputTokens + tokenUsage.lastOutputTokens
+        : null)
+    : null
 
   if (!contextWindow || usedTokens == null) {
     return {
@@ -337,3 +352,6 @@ export const resolveContextWindowState = (
     remainingPercent: Math.max(0, 100 - usedPercent)
   }
 }
+
+export const shouldShowContextWindowIndicator = (state: ContextWindowState) =>
+  state.contextWindow !== null && state.usedTokens !== null

package/shared/codori.ts

@@ -7,6 +7,10 @@ export type ProjectRecord = {
   pid: number | null
   port: number | null
   startedAt: number | null
+  lastActivityAt: number | null
+  activeSessionCount: number
+  idleTimeoutMs: number | null
+  idleDeadlineAt: number | null
   error: string | null
 }