@leo000001/opencode-quota-sidebar 2.0.0 → 2.0.1

package/README.md

@@ -12,9 +12,9 @@ OpenCode plugin: show token usage and subscription quota in the session sidebar
 Add the package name to `plugin` in your `opencode.json`. OpenCode uses Bun to install it automatically on startup:
 
 ```json
-{
-  "plugin": ["@leo000001/opencode-quota-sidebar@1.13.2"]
-}
+{
+  "plugin": ["@leo000001/opencode-quota-sidebar@2.0.0"]
+}
 ```
 
 Note for OpenCode `>=1.2.15`: TUI settings (`theme`/`keybinds`/`tui`) moved to `tui.json`, but plugin loading still stays in `opencode.json` (`plugin: []`).
@@ -55,9 +55,10 @@ Want to add support for another provider (Google Antigravity, Zhipu AI, Firmware
 
 - Session title becomes multiline in sidebar:
   - line 1: original session title
-  - line 2: Input/Output tokens
-  - line 3: Cache Read tokens (only if non-zero)
-  - line 4: Cache Write tokens (only if non-zero)
+  - line 2: blank separator
+  - line 3: Input/Output tokens
+  - line 4: Cache Read tokens (only if non-zero)
+  - line 5: Cache Write tokens (only if non-zero)
   - next lines: `Cache Coverage` (read/write cache models) and `Cache Read Coverage` (read-only cache models) when enough cache telemetry is available; mixed sessions can show both
   - next line: `$X.XX as API cost` (equivalent API billing for subscription-auth providers)
   - quota lines: quota text like `OpenAI 5h 80% Rst 16:20`; short windows (`5h`, `1d`, `Daily`) show `HH:MM` on same-day resets and `MM-DD HH:MM` when crossing days, while longer windows continue to show `MM-DD`
@@ -68,7 +69,8 @@ Want to add support for another provider (Google Antigravity, Zhipu AI, Firmware
 - Quota snapshots are de-duplicated before rendering to avoid repeated provider lines
 - Custom tools:
   - `quota_summary` — generate usage report for session/day/week/month (markdown + toast)
-  - `quota_show` — toggle sidebar title display on/off (state persists across sessions)
+- `quota_show` — toggle sidebar title display on/off (state persists across sessions)
+- After startup, titles refresh on the next relevant session/message event or when `quota_show` is toggled
 - Quota connectors:
   - OpenAI Codex OAuth (`/backend-api/wham/usage`)
   - GitHub Copilot OAuth (`/copilot_internal/user`)
@@ -296,7 +298,7 @@ Other defaults:
 - When OpenCode exposes a long-context tier like `context_over_200k`, the plugin uses that premium rate for the whole request once `input > 200000`, matching OpenCode's current pricing schema.
 - `quota.providers` is the extensible per-adapter switch map.
 - If API Cost is `$0.00`, it usually means the model/provider has no pricing mapping in OpenCode at the moment, so equivalent API cost cannot be estimated.
-- Usage chunks cache both measured `cost` and computed `apiCost`. `quota_summary` (`/qday`, `/qweek`, `/qmonth`) usually reads those cached aggregates first, but a billing-cache version bump or missing/legacy API-cost data will trigger a rescan and persist refreshed values.
+- Usage chunks cache both measured `cost` and computed `apiCost`. `quota_summary` (`/qday`, `/qweek`, `/qmonth`) recomputes range totals from session messages so period filtering follows message completion time; refreshed full-session usage may then be persisted back into day chunks when billing-cache refresh is needed.
 
 ### Buzz provider example
 
@@ -319,7 +321,7 @@ The adapter also tolerates `https://buzzai.cc/v1`, but `https://buzzai.cc` is th
 With that setup, the sidebar/toast quota line will look like:
 
 ```text
-Buzz Balance CNY 10.17
+Buzz Balance ￥10.17
 ```
 
 ## Rendering examples
@@ -382,7 +384,7 @@ OpenAI
   5h 78% Rst 05:05
 Copilot
   Monthly 78% Rst 04-01
-Buzz Balance CNY 10.2
+Buzz Balance ￥10.2
 ```
 
 Balance-style quota:
@@ -394,7 +396,7 @@ RC Balance $260
 Buzz balance quota:
 
 ```text
-Buzz Balance CNY 10.17
+Buzz Balance ￥10.17
 ```
 
 Multi-detail quota (window + balance):
@@ -424,7 +426,7 @@ Quota is rendered inline as part of a single-line title:
 Mixed with Buzz balance:
 
 ```text
-<base> | Input ... | Output ... | OpenAI 5h 78%+ | Copilot Monthly 78% | Buzz Balance CNY 10.2
+<base> | Input ... | Output ... | OpenAI 5h 78%+ | Copilot Monthly 78% | Buzz Balance ￥10.2
 ```
 
 `quota_summary` also supports an optional `includeChildren` flag (only effective for `period=session`) to override the config per call. For `day`/`week`/`month` periods, children are never merged — each session is counted independently.

package/dist/cost.js

@@ -88,7 +88,8 @@ export function cacheCoverageModeFromRates(rates) {
     return 'none';
 }
 export function calcEquivalentApiCostForMessage(message, rates) {
-    const effectiveRates = message.tokens.input > 200_000 && rates.contextOver200k
+    const effectiveRates = message.tokens.input + message.tokens.cache.read > 200_000 &&
+        rates.contextOver200k
         ? rates.contextOver200k
         : rates;
     // For providers that expose reasoning tokens separately, they are still

package/dist/format.js

@@ -129,10 +129,18 @@ function fitLine(value, width) {
     return `${head}~`;
 }
 function formatCurrency(value, currency) {
-    const safe = Number.isFinite(value) && value > 0 ? value : 0;
+    const safe = Number.isFinite(value) ? value : 0;
     const prefix = typeof currency === 'string' && currency ? currency : '$';
     if (safe === 0)
         return `${prefix}0.00`;
+    if (safe < 0) {
+        const abs = Math.abs(safe);
+        if (abs < 10)
+            return `-${prefix}${abs.toFixed(2)}`;
+        const one = abs.toFixed(1);
+        const trimmed = one.endsWith('.0') ? one.slice(0, -2) : one;
+        return `-${prefix}${trimmed}`;
+    }
     if (safe < 10)
         return `${prefix}${safe.toFixed(2)}`;
     const one = safe.toFixed(1);
@@ -170,8 +178,11 @@ function alignPairs(pairs, indent = '  ') {
 }
 function compactQuotaInline(quota) {
     const label = sanitizeLine(quotaDisplayLabel(quota));
-    if (quota.status !== 'ok')
-        return label;
+    if (quota.status !== 'ok') {
+        if (quota.status === 'error')
+            return `${label} Remaining ?`;
+        return `${label} ${sanitizeLine(quota.status)}`;
+    }
     if (quota.windows && quota.windows.length > 0) {
         const first = quota.windows[0];
         const showPercent = first.showPercent !== false;
@@ -238,13 +249,16 @@ function renderSingleLineTitle(baseTitle, usage, quotas, config, width) {
  */
 export function renderSidebarTitle(baseTitle, usage, quotas, config) {
     const width = Math.max(8, Math.floor(config.sidebar.width || 36));
-    const safeBaseTitle = stripAnsi(baseTitle || 'Session').split(/\r?\n/, 1)[0] || 'Session';
+    const safeBaseTitle = stripAnsi(baseTitle || 'Session') || 'Session';
     if (config.sidebar.multilineTitle !== true) {
-        return renderSingleLineTitle(safeBaseTitle, usage, quotas, config, width);
+        const singleLineBase = safeBaseTitle.split(/\r?\n/, 1)[0] || 'Session';
+        return renderSingleLineTitle(singleLineBase, usage, quotas, config, width);
     }
     const cacheMetrics = getCacheCoverageMetrics(usage);
     const lines = [];
-    lines.push(fitLine(safeBaseTitle, width));
+    for (const line of safeBaseTitle.split(/\r?\n/)) {
+        lines.push(fitLine(line || 'Session', width));
+    }
     lines.push('');
     // Input / Output line
     const io = `Input ${sidebarNumber(usage.input)}  Output ${sidebarNumber(usage.output)}`;
@@ -409,9 +423,6 @@ function compactReset(iso, resetLabel, windowLabel) {
             return hhmm;
         return `${two(value.getMonth() + 1)}-${two(value.getDate())} ${hhmm}`;
     }
-    if (sameDay) {
-        return `${two(value.getHours())}:${two(value.getMinutes())}`;
-    }
     return `${two(value.getMonth() + 1)}-${two(value.getDate())}`;
 }
 function dateLine(iso) {
@@ -450,6 +461,7 @@ export function renderMarkdownReport(period, usage, quotas, options) {
     const measuredCostCell = (providerID, cost) => {
         const canonical = canonicalProviderID(providerID);
         const isSubscription = canonical === 'openai' ||
+            canonical === 'anthropic' ||
             canonical === 'github-copilot' ||
             rightCodeSubscriptionProviderIDs.has(providerID);
         if (isSubscription)
@@ -459,6 +471,7 @@ export function renderMarkdownReport(period, usage, quotas, options) {
     const isSubscriptionMeasuredProvider = (providerID) => {
         const canonical = canonicalProviderID(providerID);
         return (canonical === 'openai' ||
+            canonical === 'anthropic' ||
             canonical === 'github-copilot' ||
             rightCodeSubscriptionProviderIDs.has(providerID));
     };
@@ -495,30 +508,40 @@ export function renderMarkdownReport(period, usage, quotas, options) {
             : `| ${providerID} | ${shortNumber(provider.input)} | ${shortNumber(provider.output)} | ${shortNumber(provider.cacheRead + provider.cacheWrite)} | ${shortNumber(provider.total)} |`;
     });
     const quotaLines = collapseQuotaSnapshots(quotas).flatMap((quota) => {
+        const displayLabel = quotaDisplayLabel(quota);
         // Multi-window detail
         if (quota.windows && quota.windows.length > 0 && quota.status === 'ok') {
-            return quota.windows.map((win) => {
+            const windowLines = quota.windows.map((win) => {
                 if (win.showPercent === false) {
                     const winLabel = win.label ? ` (${win.label})` : '';
-                    return mdCell(`- ${quota.label}${winLabel}: ${quota.status} | reset ${reportResetLine(win.resetAt, win.resetLabel, win.label)}`);
+                    return mdCell(`- ${displayLabel}${winLabel}: ${quota.status} | reset ${reportResetLine(win.resetAt, win.resetLabel, win.label)}`);
                 }
                 const remaining = win.remainingPercent === undefined
                     ? '-'
                     : `${win.remainingPercent.toFixed(1)}%`;
                 const winLabel = win.label ? ` (${win.label})` : '';
-                return mdCell(`- ${quota.label}${winLabel}: ${quota.status} | remaining ${remaining} | reset ${reportResetLine(win.resetAt, win.resetLabel, win.label)}`);
+                return mdCell(`- ${displayLabel}${winLabel}: ${quota.status} | remaining ${remaining} | reset ${reportResetLine(win.resetAt, win.resetLabel, win.label)}`);
             });
+            if (quota.balance) {
+                windowLines.push(mdCell(`- ${displayLabel}: ${quota.status} | balance ${formatCurrency(quota.balance.amount, quota.balance.currency)}`));
+            }
+            return windowLines;
         }
         if (quota.status === 'ok' && quota.balance) {
             return [
-                mdCell(`- ${quota.label}: ${quota.status} | balance ${formatCurrency(quota.balance.amount, quota.balance.currency)}`),
+                mdCell(`- ${displayLabel}: ${quota.status} | balance ${formatCurrency(quota.balance.amount, quota.balance.currency)}`),
+            ];
+        }
+        if (quota.status !== 'ok') {
+            return [
+                mdCell(`- ${displayLabel}: ${quota.status}${quota.note ? ` | ${quota.note}` : ''}`),
             ];
         }
         const remaining = quota.remainingPercent === undefined
             ? '-'
             : `${quota.remainingPercent.toFixed(1)}%`;
         return [
-            mdCell(`- ${quota.label}: ${quota.status} | remaining ${remaining} | reset ${reportResetLine(quota.resetAt)}${quota.note ? ` | ${quota.note}` : ''}`),
+            mdCell(`- ${displayLabel}: ${quota.status} | remaining ${remaining} | reset ${reportResetLine(quota.resetAt)}${quota.note ? ` | ${quota.note}` : ''}`),
         ];
     });
     return [
@@ -595,14 +618,6 @@ export function renderToastMessage(period, usage, quotas, options) {
             value: formatPercent(cacheMetrics.cacheReadCoverage, 1),
         });
     }
-    if (showCost) {
-        if (usage.apiCost > 0) {
-            tokenPairs.push({
-                label: 'API Cost',
-                value: formatApiCostValue(usage.apiCost),
-            });
-        }
-    }
     lines.push(...alignPairs(tokenPairs).map((line) => fitLine(line, width)));
     if (showCost) {
         const costPairs = Object.values(usage.providers)

package/dist/index.js

@@ -29,7 +29,7 @@ export async function QuotaSidebarPlugin(input) {
     const authPath = authFilePath(dataDir);
     const state = await loadState(statePath);
     // M2: evict old sessions on startup
-    evictOldSessions(state, config.retentionDays);
+    const evictedOnStartup = evictOldSessions(state, config.retentionDays);
     const persistence = createPersistenceScheduler({
         statePath,
         state,
@@ -38,6 +38,9 @@ export async function QuotaSidebarPlugin(input) {
     const markDirty = persistence.markDirty;
     const scheduleSave = persistence.scheduleSave;
     const flushSave = persistence.flushSave;
+    if (evictedOnStartup > 0) {
+        scheduleSave();
+    }
     const RESTORE_TITLE_CONCURRENCY = 5;
     const quotaService = createQuotaService({
         quotaRuntime,
@@ -166,6 +169,14 @@ export async function QuotaSidebarPlugin(input) {
     });
     scheduleTitleRefresh = titleRefresh.schedule;
     const restoreAllVisibleTitles = titleApplicator.restoreAllVisibleTitles;
+    const refreshAllTouchedTitles = titleApplicator.refreshAllTouchedTitles;
+    const refreshAllVisibleTitles = titleApplicator.refreshAllVisibleTitles;
+    if (!state.titleEnabled || !config.sidebar.enabled) {
+        void restoreAllVisibleTitles().catch(swallow('startup:restoreAllVisibleTitles'));
+    }
+    else {
+        void refreshAllTouchedTitles().catch(swallow('startup:refreshAllTouchedTitles'));
+    }
     const showToast = async (period, message) => {
         await input.client.tui
             .showToast({
@@ -217,10 +228,16 @@ export async function QuotaSidebarPlugin(input) {
             titleRefresh.cancel(session.id);
             const dateKey = state.sessionDateMap[session.id] ||
                 dateKeyFromTimestamp(session.time.created);
+            state.deletedSessionDateMap[session.id] = dateKey;
             delete state.sessions[session.id];
             delete state.sessionDateMap[session.id];
+            markDirty(dateKey);
             scheduleSave();
-            await deleteSessionFromDayChunk(statePath, session.id, dateKey).catch(swallow('deleteSessionFromDayChunk'));
+            const deletedFromChunk = await deleteSessionFromDayChunk(statePath, session.id, dateKey).catch(swallow('deleteSessionFromDayChunk'));
+            if (deletedFromChunk) {
+                delete state.deletedSessionDateMap[session.id];
+                scheduleSave();
+            }
             if (config.sidebar.includeChildren && session.parentID) {
                 titleRefresh.schedule(session.parentID, 0);
             }
@@ -250,8 +267,13 @@ export async function QuotaSidebarPlugin(input) {
                 state.titleEnabled = enabled;
             },
             scheduleSave,
+            flushSave,
             refreshSessionTitle: (sessionID, delay) => titleRefresh.schedule(sessionID, delay ?? 250),
+            cancelAllTitleRefreshes: () => titleRefresh.cancelAll(),
+            waitForTitleRefreshIdle: () => titleRefresh.waitForIdle(),
             restoreAllVisibleTitles,
+            refreshAllTouchedTitles,
+            refreshAllVisibleTitles,
             showToast,
             summarizeForTool,
             getQuotaSnapshots,

package/dist/quota.js

@@ -6,14 +6,12 @@ function resolveContext(providerID, providerOptions) {
     return { providerID, providerOptions };
 }
 function authCandidates(providerID, normalizedProviderID, adapterID) {
-    const candidates = new Set([
-        providerID,
-        normalizedProviderID,
-        adapterID,
-    ]);
+    const candidates = new Set([providerID]);
     if (adapterID === 'github-copilot') {
         candidates.add('github-copilot-enterprise');
     }
+    candidates.add(normalizedProviderID);
+    candidates.add(adapterID);
     return [...candidates];
 }
 function pickAuth(providerID, normalizedProviderID, adapterID, authMap) {

package/dist/quota_service.js

@@ -1,3 +1,4 @@
+import { createHash } from 'node:crypto';
 import { TtlValueCache } from './cache.js';
 import { isRecord, swallow } from './helpers.js';
 import { listDefaultQuotaProviderIDs, loadAuthMap, quotaSort } from './quota.js';
@@ -10,6 +11,36 @@ export function createQuotaService(deps) {
     const authCache = new TtlValueCache();
     const providerOptionsCache = new TtlValueCache();
     const inFlight = new Map();
+    const authFingerprint = (auth) => {
+        if (!auth || typeof auth !== 'object')
+            return undefined;
+        const stable = JSON.stringify(Object.keys(auth)
+            .sort()
+            .reduce((acc, key) => {
+            const value = auth[key];
+            if (value !== undefined)
+                acc[key] = value;
+            return acc;
+        }, {}));
+        return createHash('sha256').update(stable).digest('hex').slice(0, 12);
+    };
+    const providerOptionsFingerprint = (providerOptions) => {
+        if (!providerOptions)
+            return undefined;
+        const stable = JSON.stringify(Object.keys(providerOptions)
+            .sort()
+            .reduce((acc, key) => {
+            if (key === 'baseURL')
+                return acc;
+            const value = providerOptions[key];
+            if (value !== undefined)
+                acc[key] = value;
+            return acc;
+        }, {}));
+        if (stable === '{}')
+            return undefined;
+        return createHash('sha256').update(stable).digest('hex').slice(0, 12);
+    };
     const getAuthMap = async () => {
         const cached = authCache.get();
         if (cached)
@@ -23,7 +54,7 @@ export function createQuotaService(deps) {
             return cached;
         const client = deps.client;
         if (!client.config?.providers && !client.provider?.list) {
-            return providerOptionsCache.set({}, 30_000);
+            return providerOptionsCache.set({}, 5_000);
         }
         // Newer runtimes expose config.providers; older clients may only expose
         // provider.list with a slightly different response shape.
@@ -63,7 +94,7 @@ export function createQuotaService(deps) {
                 return acc;
             }, {})
             : {};
-        return providerOptionsCache.set(map, 30_000);
+        return providerOptionsCache.set(map, 5_000);
     };
     const isValidQuotaCache = (snapshot) => {
         // Guard against stale RightCode cache entries from pre-daily format.
@@ -166,14 +197,6 @@ export function createQuotaService(deps) {
             ? directCandidates
             : defaultCandidates;
         const matchedCandidates = rawCandidates.filter((candidate) => Boolean(deps.quotaRuntime.resolveQuotaAdapter(candidate.providerID, candidate.providerOptions)));
-        const dedupedCandidates = Array.from(matchedCandidates
-            .reduce((acc, candidate) => {
-            const key = deps.quotaRuntime.quotaCacheKey(candidate.providerID, candidate.providerOptions);
-            if (!acc.has(key))
-                acc.set(key, candidate);
-            return acc;
-        }, new Map())
-            .values());
         function authScopeFor(providerID, providerOptions) {
             const adapter = deps.quotaRuntime.resolveQuotaAdapter(providerID, providerOptions);
             const normalized = deps.quotaRuntime.normalizeProviderID(providerID);
@@ -186,24 +209,48 @@ export function createQuotaService(deps) {
                     candidates.push(value);
             };
             push(providerID);
-            push(normalized);
-            push(adapterID);
             if (adapterID === 'github-copilot')
                 push('github-copilot-enterprise');
+            push(normalized);
+            push(adapterID);
+            const optionsFingerprint = providerOptionsFingerprint(providerOptions);
             for (const key of candidates) {
                 const auth = authMap[key];
                 if (!auth)
                     continue;
-                if (key === 'openai' &&
-                    auth.type === 'oauth' &&
-                    typeof auth.accountId === 'string' &&
-                    auth.accountId) {
-                    return `${key}@${auth.accountId}`;
+                if (auth.type === 'oauth') {
+                    const authRecord = auth;
+                    const identity = (typeof auth.accountId === 'string' && auth.accountId) ||
+                        (typeof authRecord.login === 'string' && authRecord.login) ||
+                        (typeof authRecord.userId === 'string' && authRecord.userId);
+                    if (identity) {
+                        return optionsFingerprint
+                            ? `${key}@${identity}|options@${optionsFingerprint}`
+                            : `${key}@${identity}`;
+                    }
+                }
+                const fingerprint = authFingerprint(auth);
+                if (fingerprint) {
+                    return optionsFingerprint
+                        ? `${key}@${fingerprint}|options@${optionsFingerprint}`
+                        : `${key}@${fingerprint}`;
                 }
-                return key;
+                return optionsFingerprint ? `${key}|options@${optionsFingerprint}` : key;
+            }
+            if (optionsFingerprint) {
+                return `options@${optionsFingerprint}`;
             }
             return 'none';
         }
+        const dedupedCandidates = Array.from(matchedCandidates
+            .reduce((acc, candidate) => {
+            const baseKey = deps.quotaRuntime.quotaCacheKey(candidate.providerID, candidate.providerOptions);
+            const key = `${baseKey}#${authScopeFor(candidate.providerID, candidate.providerOptions)}`;
+            if (!acc.has(key))
+                acc.set(key, candidate);
+            return acc;
+        }, new Map())
+            .values());
         let cacheChanged = false;
         const fetchSnapshot = (providerID, providerOptions) => {
             const baseKey = deps.quotaRuntime.quotaCacheKey(providerID, providerOptions);

package/dist/storage.d.ts

@@ -30,6 +30,11 @@ export declare function scanSessionsByCreatedRange(statePath: string, startAt: n
     dateKey: string;
     state: SessionState;
 }[]>;
+export declare function scanAllSessions(statePath: string, memoryState?: QuotaSidebarState): Promise<{
+    sessionID: string;
+    dateKey: string;
+    state: SessionState;
+}[]>;
 /** Best-effort: remove a session entry from its day chunk (if present). */
 export declare function deleteSessionFromDayChunk(statePath: string, sessionID: string, dateKey: string): Promise<boolean>;
 /** Best-effort: persist recomputed usage/cursor for sessions loaded from disk-only chunks. */

package/dist/storage.js

@@ -40,6 +40,7 @@ export function defaultState() {
         titleEnabled: true,
         sessionDateMap: {},
         sessions: {},
+        deletedSessionDateMap: {},
         quotaCache: {},
     };
 }
@@ -128,6 +129,17 @@ async function loadVersion2State(raw, statePath) {
         acc[sessionID] = value;
         return acc;
     }, {});
+    const deletedSessionDateMapRaw = isRecord(raw.deletedSessionDateMap)
+        ? raw.deletedSessionDateMap
+        : {};
+    const deletedSessionDateMap = Object.entries(deletedSessionDateMapRaw).reduce((acc, [sessionID, value]) => {
+        if (typeof value !== 'string')
+            return acc;
+        if (!isDateKey(value))
+            return acc;
+        acc[sessionID] = value;
+        return acc;
+    }, {});
     const hadRawSessionDateMapEntries = isRecord(raw.sessionDateMap) && Object.keys(raw.sessionDateMap).length > 0;
     const explicitDateKeys = Array.from(new Set(Object.values(sessionDateMap)));
     // Only discover chunks when sessionDateMap is missing from state.
@@ -150,6 +162,8 @@ async function loadVersion2State(raw, statePath) {
     const sessions = {};
     for (const [dateKey, chunkSessions] of chunks) {
         for (const [sessionID, session] of Object.entries(chunkSessions)) {
+            if (deletedSessionDateMap[sessionID])
+                continue;
             sessions[sessionID] = session;
             if (!sessionDateMap[sessionID])
                 sessionDateMap[sessionID] = dateKey;
@@ -160,6 +174,7 @@ async function loadVersion2State(raw, statePath) {
         titleEnabled,
         sessionDateMap,
         sessions,
+        deletedSessionDateMap,
         quotaCache,
     };
 }
@@ -237,22 +252,31 @@ export async function saveState(statePath, state, options) {
     await fs.mkdir(path.dirname(statePath), { recursive: true });
     if (!skipChunks) {
         const keysToWrite = writeAll
-            ? Object.keys(sessionsByDate)
+            ? Array.from(new Set([
+                ...Object.keys(sessionsByDate),
+                ...Object.values(state.deletedSessionDateMap),
+            ]))
             : Array.from(dirtySet ?? []);
         await Promise.all(keysToWrite
             .map((dateKey) => {
-            if (!Object.prototype.hasOwnProperty.call(sessionsByDate, dateKey)) {
-                return undefined;
-            }
             return withDayChunkWriteLock(dateKey, async () => {
                 const memorySessions = sessionsByDate[dateKey] || {};
+                const tombstonedIDs = Object.entries(state.deletedSessionDateMap)
+                    .filter(([, tombstoneDateKey]) => tombstoneDateKey === dateKey)
+                    .map(([sessionID]) => sessionID);
                 const next = writeAll
                     ? memorySessions
                     : {
                         ...(await readDayChunk(rootPath, dateKey)),
                         ...memorySessions,
                     };
+                for (const sessionID of tombstonedIDs) {
+                    delete next[sessionID];
+                }
                 await writeDayChunk(rootPath, dateKey, next);
+                for (const sessionID of tombstonedIDs) {
+                    delete state.deletedSessionDateMap[sessionID];
+                }
             });
         })
             .filter((promise) => Boolean(promise)));
@@ -262,6 +286,7 @@ export async function saveState(statePath, state, options) {
         version: 2,
         titleEnabled: state.titleEnabled,
         sessionDateMap: state.sessionDateMap,
+        deletedSessionDateMap: state.deletedSessionDateMap,
         quotaCache: state.quotaCache,
     }, null, 2)}\n`);
 }
@@ -292,6 +317,7 @@ export function evictOldSessions(state, retentionDays) {
  */
 export async function scanSessionsByCreatedRange(statePath, startAt, endAt = Date.now(), memoryState) {
     const rootPath = chunkRootPathFromStateFile(statePath);
+    const deletedSessionIDs = new Set(Object.keys(memoryState?.deletedSessionDateMap || {}));
     const dateKeys = dateKeysInRange(startAt, endAt);
     if (!dateKeys.length) {
         return [];
@@ -302,6 +328,8 @@ export async function scanSessionsByCreatedRange(statePath, startAt, endAt = Dat
     if (memoryState) {
         const dateKeySet = new Set(dateKeys);
         for (const [sessionID, session] of Object.entries(memoryState.sessions)) {
+            if (deletedSessionIDs.has(sessionID))
+                continue;
             const dk = memoryState.sessionDateMap[sessionID];
             if (!dk || !dateKeySet.has(dk))
                 continue;
@@ -314,11 +342,9 @@ export async function scanSessionsByCreatedRange(statePath, startAt, endAt = Dat
             }
         }
     }
-    // Second pass: read disk chunks for date keys that may have sessions not in memory
-    const memoryDateKeys = memoryState
-        ? new Set(Object.values(memoryState.sessionDateMap))
-        : new Set();
-    const diskDateKeys = dateKeys.filter((dk) => !memoryDateKeys.has(dk));
+    // Second pass: read disk chunks for all date keys in range, then de-dupe by sessionID.
+    // A date can have a mix of in-memory and disk-only sessions.
+    const diskDateKeys = [...dateKeys];
     if (diskDateKeys.length > 0) {
         const RANGE_SCAN_CONCURRENCY = 5;
         const chunkEntries = await mapConcurrent(diskDateKeys, RANGE_SCAN_CONCURRENCY, async (dateKey) => {
@@ -332,6 +358,8 @@ export async function scanSessionsByCreatedRange(statePath, startAt, endAt = Dat
         for (const entry of chunkEntries.flat()) {
             if (seenSessionIDs.has(entry.sessionID))
                 continue;
+            if (deletedSessionIDs.has(entry.sessionID))
+                continue;
             const createdAt = Number.isFinite(entry.state.createdAt) && entry.state.createdAt > 0
                 ? entry.state.createdAt
                 : dateStartFromKey(entry.dateKey);
@@ -343,6 +371,43 @@ export async function scanSessionsByCreatedRange(statePath, startAt, endAt = Dat
     }
     return results;
 }
+export async function scanAllSessions(statePath, memoryState) {
+    const rootPath = chunkRootPathFromStateFile(statePath);
+    const deletedSessionIDs = new Set(Object.keys(memoryState?.deletedSessionDateMap || {}));
+    const results = [];
+    const seenSessionIDs = new Set();
+    if (memoryState) {
+        for (const [sessionID, sessionState] of Object.entries(memoryState.sessions)) {
+            if (deletedSessionIDs.has(sessionID))
+                continue;
+            const dateKey = memoryState.sessionDateMap[sessionID] ||
+                dateKeyFromTimestamp(sessionState.createdAt);
+            results.push({ sessionID, dateKey, state: sessionState });
+            seenSessionIDs.add(sessionID);
+        }
+    }
+    const dateKeys = await discoverChunks(rootPath);
+    if (dateKeys.length === 0)
+        return results;
+    const RANGE_SCAN_CONCURRENCY = 5;
+    const chunkEntries = await mapConcurrent(dateKeys, RANGE_SCAN_CONCURRENCY, async (dateKey) => {
+        const sessions = await readDayChunk(rootPath, dateKey);
+        return Object.entries(sessions).map(([sessionID, state]) => ({
+            sessionID,
+            dateKey,
+            state,
+        }));
+    });
+    for (const entry of chunkEntries.flat()) {
+        if (seenSessionIDs.has(entry.sessionID))
+            continue;
+        if (deletedSessionIDs.has(entry.sessionID))
+            continue;
+        results.push(entry);
+        seenSessionIDs.add(entry.sessionID);
+    }
+    return results;
+}
 /** Best-effort: remove a session entry from its day chunk (if present). */
 export async function deleteSessionFromDayChunk(statePath, sessionID, dateKey) {
     const rootPath = chunkRootPathFromStateFile(statePath);