sidekick-shared 0.18.3 → 0.18.4

package/dist/codexQuota.js

@@ -46,6 +46,36 @@ const codex_1 = require("./providers/codex");
 const DEFAULT_TAIL_BYTES = 2 * 1024 * 1024;
 const DEFAULT_MAX_SESSION_FILES = 50;
 const CHATGPT_USAGE_URL = 'https://chatgpt.com/backend-api/wham/usage';
+function timestampMs(value, fallbackMs = 0) {
+    if (!value)
+        return fallbackMs;
+    const ms = Date.parse(value);
+    return Number.isFinite(ms) ? ms : fallbackMs;
+}
+// Codex can report slightly different percentages for the same reset window
+// across recent sessions. Prefer newer reset windows, then the highest observed
+// same-window utilization so local fallbacks do not under-report quota usage.
+function isPreferredQuotaHit(candidate, current) {
+    if (!current)
+        return true;
+    const candidatePrimaryReset = timestampMs(candidate.quota.fiveHour.resetsAt);
+    const currentPrimaryReset = timestampMs(current.quota.fiveHour.resetsAt);
+    if (candidatePrimaryReset !== currentPrimaryReset)
+        return candidatePrimaryReset > currentPrimaryReset;
+    const candidateSecondaryReset = timestampMs(candidate.quota.sevenDay.resetsAt);
+    const currentSecondaryReset = timestampMs(current.quota.sevenDay.resetsAt);
+    if (candidateSecondaryReset !== currentSecondaryReset)
+        return candidateSecondaryReset > currentSecondaryReset;
+    const candidateUtilization = candidate.quota.fiveHour.utilization + candidate.quota.sevenDay.utilization;
+    const currentUtilization = current.quota.fiveHour.utilization + current.quota.sevenDay.utilization;
+    if (candidateUtilization !== currentUtilization)
+        return candidateUtilization > currentUtilization;
+    const candidateMs = timestampMs(candidate.quota.capturedAt, candidate.mtimeMs);
+    const currentMs = timestampMs(current.quota.capturedAt, current.mtimeMs);
+    if (candidateMs !== currentMs)
+        return candidateMs > currentMs;
+    return candidate.mtimeMs > current.mtimeMs;
+}
 function normalizePercent(value) {
     return typeof value === 'number' && Number.isFinite(value) ? value : 0;
 }
@@ -175,14 +205,53 @@ function quotaFromCodexRateLimits(rateLimits, source = 'session', capturedAt = n
     };
 }
 function readLatestCodexQuotaFromRollouts(sessionPaths, options = {}) {
+    return readLatestCodexQuotaHitFromRollouts(sessionPaths, options)?.quota ?? null;
+}
+function readLatestCodexQuotaHitFromRollouts(sessionPaths, options = {}) {
     const maxSessionFiles = options.maxSessionFiles ?? DEFAULT_MAX_SESSION_FILES;
     const maxTailBytes = options.maxTailBytes ?? DEFAULT_TAIL_BYTES;
+    let latest = null;
     for (const sessionPath of sessionPaths.slice(0, maxSessionFiles)) {
         const hit = readLatestQuotaFromRollout(sessionPath, maxTailBytes, options.source ?? 'session');
-        if (hit)
-            return hit.quota;
+        if (hit && isPreferredQuotaHit(hit, latest)) {
+            latest = hit;
+        }
     }
-    return null;
+    return latest;
+}
+function dedupePaths(paths) {
+    const seen = new Set();
+    const unique = [];
+    for (const filePath of paths) {
+        if (seen.has(filePath))
+            continue;
+        seen.add(filePath);
+        unique.push(filePath);
+    }
+    return unique;
+}
+function sortPathsByMtimeDesc(paths) {
+    return [...paths].sort((a, b) => {
+        const aMtime = safeMtimeMs(a);
+        const bMtime = safeMtimeMs(b);
+        return bMtime - aMtime;
+    });
+}
+function safeMtimeMs(filePath) {
+    try {
+        return fs.statSync(filePath).mtime.getTime();
+    }
+    catch {
+        return 0;
+    }
+}
+function findAccountRolloutFiles(codexHome) {
+    const homes = codexHome ? [codexHome] : (0, codexProfiles_1.getCodexMonitoringHomes)();
+    const files = [];
+    for (const home of homes) {
+        files.push(...findRolloutFiles(path.join(home, 'sessions')));
+    }
+    return sortPathsByMtimeDesc(dedupePaths(files));
 }
 function resolveCodexQuotaFromLocalSources(options = {}) {
     const account = options.activeAccount !== undefined ? options.activeAccount : (0, codexProfiles_1.getActiveCodexAccount)();
@@ -196,20 +265,22 @@ function resolveCodexQuotaFromLocalSources(options = {}) {
         return new codex_1.CodexProvider();
     })();
     try {
-        const workspaceSessions = options.workspacePath ? provider.findAllSessions(options.workspacePath) : [];
-        const workspaceQuota = readLatestCodexQuotaFromRollouts(workspaceSessions, { maxTailBytes, maxSessionFiles });
-        if (workspaceQuota) {
-            if (account)
-                writeSnapshot('codex', account.id, workspaceQuota);
-            return enrichCodexQuota(workspaceQuota, account);
+        const candidates = [];
+        if (options.workspacePath) {
+            const workspaceSessions = provider.findAllSessions(options.workspacePath);
+            const workspaceHit = readLatestCodexQuotaHitFromRollouts(workspaceSessions, { maxTailBytes, maxSessionFiles });
+            if (workspaceHit)
+                candidates.push(workspaceHit);
         }
-        const codexHome = options.codexHome ?? (0, codexProfiles_1.resolveSidekickCodexHome)();
-        const accountSessions = findRolloutFiles(path.join(codexHome, 'sessions'));
-        const accountQuota = readLatestCodexQuotaFromRollouts(accountSessions, { maxTailBytes, maxSessionFiles });
-        if (accountQuota) {
+        const accountSessions = findAccountRolloutFiles(options.codexHome);
+        const accountHit = readLatestCodexQuotaHitFromRollouts(accountSessions, { maxTailBytes, maxSessionFiles });
+        if (accountHit)
+            candidates.push(accountHit);
+        const latestHit = candidates.reduce((latest, candidate) => isPreferredQuotaHit(candidate, latest) ? candidate : latest, null);
+        if (latestHit) {
             if (account)
-                writeSnapshot('codex', account.id, accountQuota);
-            return enrichCodexQuota(accountQuota, account);
+                writeSnapshot('codex', account.id, latestHit.quota);
+            return enrichCodexQuota(latestHit.quota, account);
         }
         const cached = account ? readSnapshot('codex', account.id) : null;
         if (cached) {
@@ -378,7 +449,7 @@ function readLatestQuotaFromRollout(sessionPath, maxTailBytes, source) {
                     continue;
                 const quota = quotaFromCodexRateLimits(parsed.payload.rate_limits, source, parsed.timestamp ?? new Date(stat.mtime).toISOString());
                 if (quota)
-                    return { quota, filePath: sessionPath };
+                    return { quota, filePath: sessionPath, mtimeMs: stat.mtime.getTime() };
             }
             catch {
                 // Ignore malformed or partial lines.

package/dist/index.d.ts

@@ -123,5 +123,5 @@ export { extractToolCall, extractToolCalls } from './extractors/toolCall';
 export { messageUsageSchema, sessionMessageSchema, sessionEventSchema, permissionModeSchema, } from './schemas/sessionEvent';
 export { fetchProviderStatus, fetchOpenAIStatus } from './providerStatus';
 export type { ProviderStatusState } from './providerStatus';
-export { fetchPeakHoursStatus } from './peakHours';
+export { createPeakHoursNotApplicableState, fetchPeakHoursStatus, isClaudeCodeSessionProvider, scopePeakHoursToSessionProvider, } from './peakHours';
 export type { PeakHoursState } from './peakHours';

package/dist/index.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.findActiveClaudeSession = exports.discoverSessionDirectory = exports.getClaudeSessionDirectory = exports.encodeClaudeWorkspacePath = exports.detectSessionActivity = exports.extractTaskInfo = exports.scanSubagentDir = exports.normalizeCodexToolInput = exports.normalizeCodexToolName = exports.extractPatchFilePaths = exports.CodexRolloutParser = exports.parseDbPartData = exports.parseDbMessageData = exports.convertOpenCodeMessage = exports.detectPlanModeFromText = exports.normalizeToolInput = exports.normalizeToolName = exports.TRUNCATION_PATTERNS = exports.JsonlParser = exports.CodexProvider = exports.OpenCodeProvider = exports.ClaudeCodeProvider = exports.getAllDetectedProviders = exports.detectProvider = exports.readClaudeCodePlanFiles = exports.getPlanAnalytics = exports.writePlans = exports.getLatestPlan = exports.readPlans = exports.readLatestHandoff = exports.readHistory = exports.readNotes = exports.readDecisions = exports.readTasks = exports.getProjectSlugRaw = exports.getProjectSlug = exports.encodeWorkspacePath = exports.getGlobalDataPath = exports.getProjectDataPath = exports.getConfigDir = exports.MAX_PLANS_PER_PROJECT = exports.PLAN_SCHEMA_VERSION = exports.createEmptyTokenTotals = exports.HISTORICAL_DATA_SCHEMA_VERSION = exports.STALENESS_THRESHOLDS = exports.IMPORTANCE_DECAY_FACTORS = exports.KNOWLEDGE_NOTE_SCHEMA_VERSION = exports.DECISION_LOG_SCHEMA_VERSION = exports.normalizeTaskStatus = exports.TASK_PERSISTENCE_SCHEMA_VERSION = void 0;
 exports.deleteSnapshot = exports.loadSnapshot = exports.saveSnapshot = exports.parseTodoDependencies = exports.EventAggregator = exports.getRandomPhrase = exports.PHRASE_CATEGORIES = exports.ALL_PHRASES = exports.HIGHLIGHT_CSS = exports.clearHighlightCache = exports.highlightEvent = exports.formatSessionJson = exports.formatSessionMarkdown = exports.formatSessionText = exports.classifyNoise = exports.shouldMergeWithPrevious = exports.classifyFollowEvent = exports.classifyMessage = exports.getSoftNoiseReason = exports.isHardNoiseFollowEvent = exports.isHardNoise = exports.formatToolSummary = exports.formatTokenCount = exports.formatDurationMs = exports.createJsonlTail = exports.toFollowEvents = exports.createWatcher = exports.parseChangelog = exports.extractProposedPlanShared = exports.parsePlanMarkdownShared = exports.PlanExtractor = exports.composeContext = exports.FilterEngine = exports.searchSessions = exports.CodexDatabase = exports.OpenCodeDatabase = exports.discoverDebugLogs = exports.collapseDuplicates = exports.filterByLevel = exports.parseDebugLog = exports.scanSubagentTraces = exports.findAllSessionsWithWorktrees = exports.discoverWorktreeSiblings = exports.resolveWorktreeMainRepo = exports.getAllClaudeProjectFolders = exports.decodeEncodedPath = exports.getMostRecentlyActiveSessionDir = exports.findSubdirectorySessionDirs = exports.findSessionsInDirectory = exports.findAllClaudeSessions = void 0;
 exports.appendQuotaHistorySample = exports.writeQuotaSnapshot = exports.readQuotaSnapshot = exports.QuotaPoller = exports.describeQuotaFailure = exports.fetchQuota = exports.removeCodexAccount = exports.switchToCodexAccount = exports.finalizeCodexAccount = exports.prepareCodexAccount = exports.getCodexExecutionEnv = exports.resolveSidekickCodexHome = exports.getActiveCodexAccount = exports.listCodexAccounts = exports.getSystemCodexHome = exports.getCodexMonitoringHomes = exports.getCodexProfileHome = exports.getCodexProfilesDir = exports.getActiveAccountStatus = exports.removeSavedAccountProfile = exports.replaceSavedAccountProfiles = exports.setActiveSavedAccount = exports.upsertSavedAccountProfile = exports.getActiveSavedAccount = exports.listSavedAccountProfiles = exports.writeSavedAccountRegistry = exports.readSavedAccountRegistry = exports.getAccountsDir = exports.isMultiAccountEnabled = exports.getActiveAccount = exports.listAccounts = exports.removeAccount = exports.switchToAccount = exports.addCurrentAccount = exports.readActiveClaudeAccount = exports.writeAccountRegistry = exports.readAccountRegistry = exports.ensureDefaultAccounts = exports.readClaudeMaxAccessTokenSync = exports.readClaudeMaxCredentials = exports.writeActiveCredentials = exports.readActiveCredentials = exports.openInBrowser = exports.parseTranscript = exports.generateHtmlReport = exports.PatternExtractor = exports.HeatmapTracker = exports.FrequencyTracker = exports.getSnapshotPath = exports.isSnapshotValid = void 0;
-exports.fetchPeakHoursStatus = exports.fetchOpenAIStatus = exports.fetchProviderStatus = exports.permissionModeSchema = exports.sessionEventSchema = exports.sessionMessageSchema = exports.messageUsageSchema = exports.extractToolCalls = exports.extractToolCall = exports.extractTokenUsage = exports.LITELLM_CATALOG_URL = exports.normalizeLiteLlmCatalog = exports.hydratePricingCatalog = exports.formatCost = exports.sortModelIds = exports.compareModelIds = exports.getModelDisplayInfo = exports.shortModelName = exports.mergeCostSources = exports.calculateCostWithProvenance = exports.calculateCostWithPricing = exports.calculateCost = exports.getModelInfo = exports.getModelPricing = exports.parseModelId = exports.DEFAULT_CONTEXT_WINDOW = exports.getModelContextWindowSize = exports.MultiProviderQuotaService = exports.CodexQuotaWatcher = exports.resolveCodexQuotaFromLocalSources = exports.resolveCodexQuota = exports.readLatestCodexQuotaFromRollouts = exports.quotaFromCodexRateLimits = exports.fetchCodexQuotaFromApi = exports.getWorkspaceIdFromPath = exports.pruneQuotaHistory = exports.readQuotaHistoryDailyBuckets = exports.readQuotaHistoryRange = void 0;
+exports.scopePeakHoursToSessionProvider = exports.isClaudeCodeSessionProvider = exports.fetchPeakHoursStatus = exports.createPeakHoursNotApplicableState = exports.fetchOpenAIStatus = exports.fetchProviderStatus = exports.permissionModeSchema = exports.sessionEventSchema = exports.sessionMessageSchema = exports.messageUsageSchema = exports.extractToolCalls = exports.extractToolCall = exports.extractTokenUsage = exports.LITELLM_CATALOG_URL = exports.normalizeLiteLlmCatalog = exports.hydratePricingCatalog = exports.formatCost = exports.sortModelIds = exports.compareModelIds = exports.getModelDisplayInfo = exports.shortModelName = exports.mergeCostSources = exports.calculateCostWithProvenance = exports.calculateCostWithPricing = exports.calculateCost = exports.getModelInfo = exports.getModelPricing = exports.parseModelId = exports.DEFAULT_CONTEXT_WINDOW = exports.getModelContextWindowSize = exports.MultiProviderQuotaService = exports.CodexQuotaWatcher = exports.resolveCodexQuotaFromLocalSources = exports.resolveCodexQuota = exports.readLatestCodexQuotaFromRollouts = exports.quotaFromCodexRateLimits = exports.fetchCodexQuotaFromApi = exports.getWorkspaceIdFromPath = exports.pruneQuotaHistory = exports.readQuotaHistoryDailyBuckets = exports.readQuotaHistoryRange = void 0;
 var taskPersistence_1 = require("./types/taskPersistence");
 Object.defineProperty(exports, "TASK_PERSISTENCE_SCHEMA_VERSION", { enumerable: true, get: function () { return taskPersistence_1.TASK_PERSISTENCE_SCHEMA_VERSION; } });
 Object.defineProperty(exports, "normalizeTaskStatus", { enumerable: true, get: function () { return taskPersistence_1.normalizeTaskStatus; } });
@@ -295,4 +295,7 @@ Object.defineProperty(exports, "fetchProviderStatus", { enumerable: true, get: f
 Object.defineProperty(exports, "fetchOpenAIStatus", { enumerable: true, get: function () { return providerStatus_1.fetchOpenAIStatus; } });
 // Peak Hours (PromoClock — third-party)
 var peakHours_1 = require("./peakHours");
+Object.defineProperty(exports, "createPeakHoursNotApplicableState", { enumerable: true, get: function () { return peakHours_1.createPeakHoursNotApplicableState; } });
 Object.defineProperty(exports, "fetchPeakHoursStatus", { enumerable: true, get: function () { return peakHours_1.fetchPeakHoursStatus; } });
+Object.defineProperty(exports, "isClaudeCodeSessionProvider", { enumerable: true, get: function () { return peakHours_1.isClaudeCodeSessionProvider; } });
+Object.defineProperty(exports, "scopePeakHoursToSessionProvider", { enumerable: true, get: function () { return peakHours_1.scopePeakHoursToSessionProvider; } });

package/dist/peakHours.d.ts

@@ -9,6 +9,7 @@
  *
  * Polling / eventing is the caller's responsibility.
  */
+import type { ProviderId } from './providers/types';
 export interface PeakHoursState {
     status: 'peak' | 'off_peak' | 'unknown';
     isPeak: boolean;
@@ -20,7 +21,11 @@ export interface PeakHoursState {
     note: string;
     updatedAt: string;
     unavailable: boolean;
+    notApplicable?: boolean;
 }
+export declare function isClaudeCodeSessionProvider(providerId: ProviderId): boolean;
+export declare function createPeakHoursNotApplicableState(providerId: ProviderId): PeakHoursState;
+export declare function scopePeakHoursToSessionProvider(providerId: ProviderId, status: PeakHoursState | null | undefined): PeakHoursState | null;
 /**
  * Fetch current Claude peak-hours state from promoclock.co.
  *

package/dist/peakHours.js

@@ -11,6 +11,9 @@
  * Polling / eventing is the caller's responsibility.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.isClaudeCodeSessionProvider = isClaudeCodeSessionProvider;
+exports.createPeakHoursNotApplicableState = createPeakHoursNotApplicableState;
+exports.scopePeakHoursToSessionProvider = scopePeakHoursToSessionProvider;
 exports.fetchPeakHoursStatus = fetchPeakHoursStatus;
 const PROMOCLOCK_ENDPOINT = 'https://promoclock.co/api/status';
 function unavailableState() {
@@ -27,6 +30,35 @@ function unavailableState() {
         unavailable: true,
     };
 }
+const PROVIDER_DISPLAY_NAMES = {
+    'claude-code': 'Claude Code',
+    opencode: 'OpenCode',
+    codex: 'Codex CLI',
+};
+function isClaudeCodeSessionProvider(providerId) {
+    return providerId === 'claude-code';
+}
+function createPeakHoursNotApplicableState(providerId) {
+    const providerName = PROVIDER_DISPLAY_NAMES[providerId] ?? providerId;
+    return {
+        status: 'unknown',
+        isPeak: false,
+        sessionLimitSpeed: 'unknown',
+        label: 'Claude peak hours not applicable',
+        peakHoursDescription: '',
+        nextChange: null,
+        minutesUntilChange: null,
+        note: `Claude peak hours apply only to Claude Code sessions, not ${providerName}.`,
+        updatedAt: new Date().toISOString(),
+        unavailable: true,
+        notApplicable: true,
+    };
+}
+function scopePeakHoursToSessionProvider(providerId, status) {
+    if (!isClaudeCodeSessionProvider(providerId))
+        return null;
+    return status ?? null;
+}
 function normalizeStatus(raw) {
     if (raw === 'peak' || raw === 'off_peak')
         return raw;

package/dist/quotaSnapshots.js

@@ -83,6 +83,31 @@ function writeStore(store) {
     ensureConfigDir();
     atomicWriteJson(getQuotaSnapshotPath(), store);
 }
+function snapshotTimeMs(quota) {
+    const capturedAt = quota.capturedAt ? Date.parse(quota.capturedAt) : NaN;
+    return Number.isFinite(capturedAt) ? capturedAt : 0;
+}
+function windowResetMs(value) {
+    const ms = Date.parse(value);
+    return Number.isFinite(ms) ? ms : 0;
+}
+// Preserve the best-known same-window snapshot while still allowing lower
+// utilization after Codex advances to a newer reset window.
+function shouldKeepExistingSnapshot(existing, next) {
+    const existingPrimaryReset = windowResetMs(existing.fiveHour.resetsAt);
+    const nextPrimaryReset = windowResetMs(next.fiveHour.resetsAt);
+    if (existingPrimaryReset !== nextPrimaryReset)
+        return existingPrimaryReset > nextPrimaryReset;
+    const existingSecondaryReset = windowResetMs(existing.sevenDay.resetsAt);
+    const nextSecondaryReset = windowResetMs(next.sevenDay.resetsAt);
+    if (existingSecondaryReset !== nextSecondaryReset)
+        return existingSecondaryReset > nextSecondaryReset;
+    const existingUtilization = existing.fiveHour.utilization + existing.sevenDay.utilization;
+    const nextUtilization = next.fiveHour.utilization + next.sevenDay.utilization;
+    if (existingUtilization !== nextUtilization)
+        return existingUtilization > nextUtilization;
+    return snapshotTimeMs(existing) > snapshotTimeMs(next);
+}
 function writeQuotaSnapshot(providerId, accountId, quota) {
     const store = readStore();
     const snapshot = {
@@ -93,6 +118,9 @@ function writeQuotaSnapshot(providerId, accountId, quota) {
         stale: false,
     };
     const index = store.snapshots.findIndex(item => item.providerId === providerId && item.accountId === accountId);
+    if (index >= 0 && shouldKeepExistingSnapshot(store.snapshots[index].quota, snapshot)) {
+        return;
+    }
     const record = {
         providerId,
         accountId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sidekick-shared",
-  "version": "0.18.3",
+  "version": "0.18.4",
   "description": "Shared data access layer for Sidekick — readers, types, providers, credentials, quota",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",