@leo000001/opencode-quota-sidebar 3.0.5 → 3.0.9

package/dist/events.d.ts

@@ -9,5 +9,5 @@ export declare function createEventDispatcher(handlers: {
         sessionID: string;
         messageID?: string;
     }) => Promise<void>;
-    onAssistantMessageCompleted: (message: AssistantMessage) => Promise<void>;
+    onAssistantMessageUpdated: (message: AssistantMessage) => Promise<void>;
 }): (event: Event) => Promise<void>;

package/dist/events.js

@@ -16,7 +16,8 @@ export function createEventDispatcher(handlers) {
             await handlers.onSessionDeleted(event.properties.info);
             return;
         }
-        if (tui.type === 'tui.prompt.append' || tui.type === 'tui.command.execute') {
+        if (tui.type === 'tui.prompt.append' ||
+            tui.type === 'tui.command.execute') {
             await handlers.onTuiActivity();
             return;
         }
@@ -39,9 +40,6 @@ export function createEventDispatcher(handlers) {
             return;
         if (!isAssistantMessage(event.properties.info))
             return;
-        const completed = event.properties.info.time.completed;
-        if (typeof completed !== 'number' || !Number.isFinite(completed))
-            return;
-        await handlers.onAssistantMessageCompleted(event.properties.info);
+        await handlers.onAssistantMessageUpdated(event.properties.info);
     };
 }

package/dist/index.js

@@ -13,6 +13,7 @@ import { createUsageService } from './usage_service.js';
 import { createTitleApplicator } from './title_apply.js';
 const SHUTDOWN_HOOK_KEY = Symbol.for('opencode-quota-sidebar.shutdown-hook');
 const SHUTDOWN_CALLBACKS_KEY = Symbol.for('opencode-quota-sidebar.shutdown-callbacks');
+const SESSION_ACTIVE_GRACE_MS = 15_000;
 export async function QuotaSidebarPlugin(input) {
     const quotaRuntime = createQuotaRuntime();
     const config = await loadConfig(quotaConfigPaths(input.worktree, input.directory));
@@ -116,11 +117,33 @@ export async function QuotaSidebarPlugin(input) {
     });
     const summarizeSessionUsageForDisplay = usageService.summarizeSessionUsageForDisplay;
     const summarizeForTool = usageService.summarizeForTool;
+    const activeSessionUntil = new Map();
+    const markSessionActive = (sessionID, now = Date.now()) => {
+        activeSessionUntil.set(sessionID, now + SESSION_ACTIVE_GRACE_MS);
+    };
+    const clearSessionActivity = (sessionID) => {
+        activeSessionUntil.delete(sessionID);
+    };
+    const isSessionActive = (sessionID, now = Date.now()) => {
+        const expiresAt = activeSessionUntil.get(sessionID);
+        if (expiresAt === undefined)
+            return false;
+        if (expiresAt > now)
+            return true;
+        activeSessionUntil.delete(sessionID);
+        return false;
+    };
     // title apply / refresh lifecycle
     let scheduleTitleRefresh = (sessionID, delay = 250) => {
         void sessionID;
         void delay;
     };
+    const scheduleActiveTitleRefresh = (sessionID, delay = 250) => {
+        if (!isSessionActive(sessionID))
+            return false;
+        scheduleTitleRefresh(sessionID, delay);
+        return true;
+    };
     const scheduleParentRefreshIfSafe = (sessionID, parentID) => {
         if (!config.sidebar.includeChildren)
             return;
@@ -140,7 +163,7 @@ export async function QuotaSidebarPlugin(input) {
             seen.add(current);
             current = state.sessions[current]?.parentID;
         }
-        scheduleTitleRefresh(parentID, 0);
+        scheduleActiveTitleRefresh(parentID, 0);
     };
     const titleApplicator = createTitleApplicator({
         state,
@@ -155,42 +178,19 @@ export async function QuotaSidebarPlugin(input) {
         getQuotaSnapshots,
         summarizeSessionUsageForDisplay,
         scheduleParentRefreshIfSafe,
+        isSessionActive,
         restoreConcurrency: RESTORE_TITLE_CONCURRENCY,
     });
     const titleRefresh = createTitleRefreshScheduler({
         apply: async (sessionID) => {
+            if (!isSessionActive(sessionID))
+                return;
             await titleApplicator.applyTitle(sessionID);
         },
         onError: swallow('titleRefresh'),
     });
     scheduleTitleRefresh = titleRefresh.schedule;
-    const restoreAllVisibleTitles = titleApplicator.restoreAllVisibleTitles;
-    const refreshAllTouchedTitles = titleApplicator.refreshAllTouchedTitles;
-    const refreshAllVisibleTitles = titleApplicator.refreshAllVisibleTitles;
-    let startupTitleWork = Promise.resolve();
-    const runStartupRestore = async (attempt = 0) => {
-        const result = await restoreAllVisibleTitles({
-            abortIfEnabled: config.sidebar.enabled,
-        });
-        if (result.restored === result.attempted)
-            return;
-        debug(`startup restore incomplete: restored ${result.restored}/${result.attempted} touched titles while display mode remains OFF`);
-        if (state.titleEnabled || config.sidebar.enabled === false)
-            return;
-        if (attempt >= 2)
-            return;
-        await new Promise((resolve) => setTimeout(resolve, 1_000));
-        await runStartupRestore(attempt + 1);
-    };
-    if (!state.titleEnabled || !config.sidebar.enabled) {
-        startupTitleWork = runStartupRestore().catch(swallow('startup:restoreAllVisibleTitles'));
-    }
-    else {
-        startupTitleWork = Promise.allSettled([
-            refreshAllVisibleTitles().catch(swallow('startup:refreshAllVisibleTitles')),
-            refreshAllTouchedTitles().catch(swallow('startup:refreshAllTouchedTitles')),
-        ]).then(() => undefined);
-    }
+    const startupTitleWork = Promise.resolve();
     const shutdown = async () => {
         await Promise.race([
             startupTitleWork,
@@ -318,7 +318,7 @@ export async function QuotaSidebarPlugin(input) {
                 sessionID: session.id,
                 incomingTitle: session.title,
                 sessionState,
-                scheduleRefresh: titleRefresh.schedule,
+                scheduleRefresh: scheduleActiveTitleRefresh,
             });
         },
         onSessionDeleted: async (session) => {
@@ -328,6 +328,7 @@ export async function QuotaSidebarPlugin(input) {
             usageService.forgetSession(session.id);
             titleApplicator.forgetSession(session.id);
             titleRefresh.cancel(session.id);
+            clearSessionActivity(session.id);
             const dateKey = state.sessionDateMap[session.id] ||
                 dateKeyFromTimestamp(session.time.created);
             state.deletedSessionDateMap[session.id] = dateKey;
@@ -341,23 +342,34 @@ export async function QuotaSidebarPlugin(input) {
                 scheduleSave();
             }
             if (config.sidebar.includeChildren && session.parentID) {
-                titleRefresh.schedule(session.parentID, 0);
+                scheduleActiveTitleRefresh(session.parentID, 0);
             }
         },
         onTuiActivity: async () => {
             return;
         },
         onTuiSessionSelect: async (sessionID) => {
-            titleRefresh.schedule(sessionID, 0);
+            scheduleActiveTitleRefresh(sessionID, 0);
         },
         onMessageRemoved: async (info) => {
             usageService.markForceRescan(info.sessionID);
-            titleRefresh.schedule(info.sessionID, 0);
+            scheduleActiveTitleRefresh(info.sessionID, 0);
             scheduleParentRefreshIfSafe(info.sessionID, state.sessions[info.sessionID]?.parentID);
         },
-        onAssistantMessageCompleted: async (message) => {
+        onAssistantMessageUpdated: async (message) => {
+            const now = Date.now();
+            const completed = message.time.completed;
+            if (typeof completed !== 'number' || !Number.isFinite(completed)) {
+                markSessionActive(message.sessionID, now);
+                return;
+            }
+            const wasActive = isSessionActive(message.sessionID, now);
+            if (!wasActive) {
+                return;
+            }
+            markSessionActive(message.sessionID, now);
             usageService.markSessionDirty(message.sessionID);
-            titleRefresh.schedule(message.sessionID);
+            scheduleActiveTitleRefresh(message.sessionID);
             void maybeShowExpiryToast(message.sessionID);
         },
     });
@@ -378,14 +390,13 @@ export async function QuotaSidebarPlugin(input) {
             scheduleSave,
             flushSave,
             waitForStartupTitleWork: () => startupTitleWork,
-            refreshSessionTitle: (sessionID, delay) => titleRefresh.schedule(sessionID, delay ?? 250),
+            markSessionActive,
+            refreshSessionTitle: (sessionID, delay) => scheduleActiveTitleRefresh(sessionID, delay ?? 250),
             cancelAllTitleRefreshes: () => titleRefresh.cancelAll(),
             flushScheduledTitleRefreshes: () => titleRefresh.flushScheduled(),
             waitForTitleRefreshIdle: () => titleRefresh.waitForIdle(),
             waitForTitleRefreshQuiescence: () => titleRefresh.waitForQuiescence(),
-            restoreAllVisibleTitles,
-            refreshAllTouchedTitles,
-            refreshAllVisibleTitles,
+            restoreSessionTitle: (sessionID) => titleApplicator.restoreSessionTitle(sessionID),
             showToast,
             summarizeForTool,
             getQuotaSnapshots,

package/dist/title_apply.d.ts

@@ -17,6 +17,7 @@ export declare function createTitleApplicator(deps: {
     }) => Promise<QuotaSnapshot[]>;
     summarizeSessionUsageForDisplay: (sessionID: string, includeChildren: boolean) => Promise<UsageSummary>;
     scheduleParentRefreshIfSafe: (sessionID: string, parentID?: string) => void;
+    isSessionActive?: (sessionID: string) => boolean;
     restoreConcurrency: number;
 }): {
     applyTitle: (sessionID: string) => Promise<boolean>;

package/dist/title_apply.js

@@ -28,6 +28,10 @@ export function createTitleApplicator(deps) {
     const applyTitle = async (sessionID) => {
         if (!deps.config.sidebar.enabled)
             return false;
+        if (deps.isSessionActive && !deps.isSessionActive(sessionID)) {
+            debug(`applyTitle skipped inactive session ${sessionID}`);
+            return false;
+        }
         let stateMutated = false;
         const session = await deps.client.session
             .get({

package/dist/tools.d.ts

@@ -10,26 +10,13 @@ export declare function createQuotaSidebarTools(deps: {
     scheduleSave: () => void;
     flushSave: () => Promise<void>;
     waitForStartupTitleWork: () => Promise<void>;
+    markSessionActive?: (sessionID: string) => void;
     refreshSessionTitle: (sessionID: string, delay?: number) => void;
     cancelAllTitleRefreshes: () => void;
     flushScheduledTitleRefreshes: () => Promise<void>;
     waitForTitleRefreshIdle: () => Promise<void>;
     waitForTitleRefreshQuiescence: () => Promise<void>;
-    restoreAllVisibleTitles: () => Promise<{
-        attempted: number;
-        restored: number;
-        listFailed: boolean;
-    }>;
-    refreshAllTouchedTitles: () => Promise<{
-        attempted: number;
-        refreshed: number;
-        listFailed: boolean;
-    }>;
-    refreshAllVisibleTitles: () => Promise<{
-        attempted: number;
-        refreshed: number;
-        listFailed: boolean;
-    }>;
+    restoreSessionTitle?: (sessionID: string) => Promise<boolean>;
     showToast: (period: 'session' | 'day' | 'week' | 'month' | 'toggle', message: string) => Promise<void>;
     summarizeForTool: (period: 'session' | 'day' | 'week' | 'month', sessionID: string, includeChildren: boolean) => Promise<UsageSummary>;
     getQuotaSnapshots: (providerIDs: string[], options?: {

package/dist/tools.js

@@ -63,41 +63,35 @@ export function createQuotaSidebarTools(deps) {
                         deps.setTitleEnabled(true);
                         deps.scheduleSave();
                         await deps.flushSave();
-                        const visible = await deps.refreshAllVisibleTitles();
-                        const touched = await deps.refreshAllTouchedTitles();
+                        deps.markSessionActive?.(context.sessionID);
                         deps.refreshSessionTitle(context.sessionID, 0);
                         if (startupTimedOut) {
                             void deps.waitForStartupTitleWork().then(() => {
                                 if (!deps.getTitleEnabled())
                                     return;
-                                void deps.refreshAllVisibleTitles();
-                                void deps.refreshAllTouchedTitles();
+                                deps.markSessionActive?.(context.sessionID);
                                 deps.refreshSessionTitle(context.sessionID, 0);
                             });
                         }
                         await deps.showToast('toggle', 'Sidebar usage display: ON');
-                        if (visible.listFailed ||
-                            visible.refreshed < visible.attempted ||
-                            touched.refreshed < touched.attempted) {
-                            return 'Sidebar usage display is now ON. Visible-session refresh failed, so only touched/current session titles are guaranteed to refresh immediately.';
-                        }
-                        return 'Sidebar usage display is now ON. Visible session titles are refreshing to show token usage and quota.';
+                        return 'Sidebar usage display is now ON. Only assistant-active sessions will refresh shared titles.';
                     }
                     deps.setTitleEnabled(false);
                     deps.scheduleSave();
                     await deps.flushSave();
                     deps.cancelAllTitleRefreshes();
                     await deps.waitForTitleRefreshQuiescence();
-                    const restore = await deps.restoreAllVisibleTitles();
-                    if (restore.restored === restore.attempted) {
+                    const restoredCurrent = await (deps.restoreSessionTitle
+                        ? deps.restoreSessionTitle(context.sessionID)
+                        : Promise.resolve(false));
+                    if (restoredCurrent) {
                         await deps.showToast('toggle', 'Sidebar usage display: OFF');
-                        return 'Sidebar usage display is now OFF. Touched session titles were restored to base titles.';
+                        return 'Sidebar usage display is now OFF. The current session title was restored to its base title.';
                     }
                     deps.setTitleEnabled(true);
                     deps.scheduleSave();
                     await deps.flushSave();
-                    await deps.refreshAllVisibleTitles();
-                    await deps.refreshAllTouchedTitles();
+                    deps.markSessionActive?.(context.sessionID);
                     deps.refreshSessionTitle(context.sessionID, 0);
                     await deps.showToast('toggle', 'Sidebar usage display: OFF failed');
                     return 'Sidebar usage display remains ON because some touched session titles could not be restored. Try again after the session service recovers.';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leo000001/opencode-quota-sidebar",
-  "version": "3.0.5",
+  "version": "3.0.9",
   "description": "OpenCode plugin that shows quota and token usage in TUI sidebar panels and compact session titles",
   "type": "module",
   "main": "dist/index.js",