@codemem/server 0.36.1 → 0.37.1

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,KAAK,eAAe,EAAiB,OAAO,EAAE,MAAM,eAAe,CAAC;AAE1F,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,OAAO,EAEN,KAAK,0BAA0B,EAC/B,MAAM,yBAAyB,CAAC;AAQjC,OAAO,EAAE,OAAO,EAAE,CAAC;AAKnB,uFAAuF;AACvF,wBAAgB,QAAQ,IAAI,WAAW,CAKtC;AAED,mDAAmD;AACnD,wBAAgB,UAAU,IAAI,IAAI,CAGjC;AAED;;;GAGG;AACH,MAAM,WAAW,UAAU;IAC1B,YAAY,CAAC,EAAE,MAAM,WAAW,CAAC;IACjC,OAAO,CAAC,EAAE,eAAe,GAAG,IAAI,CAAC;IACjC,QAAQ,CAAC,EAAE,cAAc,GAAG,IAAI,CAAC;IACjC,oBAAoB,CAAC,EAAE;QACtB,OAAO,CAAC,EAAE,0BAA0B,CAAC;QACrC,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,wBAAwB,CAAC,EAAE,MAAM,CAAC;QAClC,4BAA4B,CAAC,EAAE,MAAM,CAAC;KACtC,CAAC;IACF,oBAAoB,CAAC,EAAE,MAAM;QAC5B,KAAK,EACF,UAAU,GACV,SAAS,GACT,UAAU,GACV,OAAO,GACP,UAAU,GACV,iBAAiB,GACjB,iBAAiB,GACjB,IAAI,CAAC;QACR,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;KACvB,GAAG,IAAI,CAAC;CACT;AAED,wBAAgB,SAAS,CAAC,IAAI,CAAC,EAAE,UAAU,8EA6D1C;AAED;;;;;;;;;GASG;AACH,wBAAgB,aAAa,CAAC,IAAI,CAAC,EAAE,UAAU,8EA8B9C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,KAAK,eAAe,EAAiB,OAAO,EAAE,MAAM,eAAe,CAAC;AAE1F,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,OAAO,EAEN,KAAK,0BAA0B,EAC/B,MAAM,yBAAyB,CAAC;AAQjC,OAAO,EAAE,OAAO,EAAE,CAAC;AAKnB,uFAAuF;AACvF,wBAAgB,QAAQ,IAAI,WAAW,CAKtC;AAED,mDAAmD;AACnD,wBAAgB,UAAU,IAAI,IAAI,CAGjC;AAED;;;GAGG;AACH,MAAM,WAAW,UAAU;IAC1B,YAAY,CAAC,EAAE,MAAM,WAAW,CAAC;IACjC,OAAO,CAAC,EAAE,eAAe,GAAG,IAAI,CAAC;IACjC,QAAQ,CAAC,EAAE,cAAc,GAAG,IAAI,CAAC;IACjC,oBAAoB,CAAC,EAAE;QACtB,OAAO,CAAC,EAAE,0BAA0B,CAAC;QACrC,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,wBAAwB,CAAC,EAAE,MAAM,CAAC;QAClC,4BAA4B,CAAC,EAAE,MAAM,CAAC;KACtC,CAAC;IACF,oBAAoB,CAAC,EAAE,MAAM;QAC5B,KAAK,EACF,UAAU,GACV,SAAS,GACT,UAAU,GACV,OAAO,GACP,UAAU,GACV,iBAAiB,GACjB,iBAAiB,GACjB,IAAI,CAAC;QACR,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;KACvB,GAAG,IAAI,CAAC;CACT;AAED,wBAAgB,SAAS,CAAC,IAAI,CAAC,EAAE,UAAU,8EA8D1C;AAED;;;;;;;;;GASG;AACH,wBAAgB,aAAa,CAAC,IAAI,CAAC,EAAE,UAAU,8EA8B9C"}

package/dist/index.js

@@ -1,14 +1,14 @@
 import { existsSync, readFileSync } from "node:fs";
 import { dirname, join } from "node:path";
-import { ACCESS_CLEANUP_OP_TYPE, CODEMEM_CONFIG_ENV_OVERRIDES, DEFAULT_TIME_WINDOW_S, LEGACY_SHARED_REVIEW_SCOPE_ID, LOCAL_DEFAULT_SCOPE_ID, LOCAL_SYNC_CAPABILITY, MemoryStore, SYNC_CAPABILITY_HEADER, SYNC_SCOPE_QUERY_PARAM, VERSION, VERSION as VERSION$1, addSyncScopeToBoundary, analyzeProjectScopeMappingChangeGuardrails, applyReplicationOps, buildBaseUrl, buildFilterClausesWithContext, buildRawEventEnvelopeFromCodexHook, buildRawEventEnvelopeFromHook, canonicalMemoryKind, canonicalWorkspaceIdentity, cleanupNonces, coordinatorArchiveGroupAction, coordinatorCreateGroupAction, coordinatorCreateInviteAction, coordinatorCreateScopeAction, coordinatorDisableDeviceAction, coordinatorEnableDeviceAction, coordinatorGrantScopeMembershipAction, coordinatorImportInviteAction, coordinatorListBootstrapGrantsAction, coordinatorListDevicesAction, coordinatorListGroupsAction, coordinatorListJoinRequestsAction, coordinatorListScopeMembershipsAction, coordinatorListScopesAction, coordinatorRemoveDeviceAction, coordinatorRenameDeviceAction, coordinatorRenameGroupAction, coordinatorReviewJoinRequestAction, coordinatorRevokeBootstrapGrantAction, coordinatorRevokeScopeMembershipAction, coordinatorStatusSnapshot, coordinatorUnarchiveGroupAction, coordinatorUpdateScopeAction, createCoordinatorReciprocalApproval, defaultSpaceScopeIdForGroup, deleteProjectScopeSettingsMapping, diagnoseStalePeerReceivedRows, ensureDeviceIdentity, extractReplicationOps, filterReplicationOpsForSyncWithStatus, fingerprintPublicKey, formatHostPort, fromJson, getCodememConfigPath, getCodememEnvOverrides, getCoordinatorGroupPreference, getSemanticIndexDiagnostics, getSyncResetState, isScopedSyncCapability, isSummaryLikeMemory, listAuthorizedScopesForPeer, listCoordinatorJoinRequests, listInboundScopeRejections, listMaintenanceJobs, listObserverProviderOptions, listPerPeerScopeSyncState, listProjectScopeCandidates, listProjectScopeInventory, listProjectScopeSettingsMappings, listSharingDomainSettingsScopes, loadMemorySnapshotPageForPeer, loadReplicationOpsForPeer, lookupCoordinatorPeers, mergeAddresses, negotiateSyncCapability, normalizeAddress, normalizeSyncCapability, parseStrictInteger, parseSyncScopeRequest, personalScopeGrantStatusForPeer, probeAvailableCredentials, readCodememConfigFile, readCoordinatorSyncConfig, reassignProjectScopeInventoryProject, recordNonce, rejectInboundScopeFailures, requestJson, resolveDbPath, runSyncPass, schema, stripJsonComments, stripPrivateObj, stripTrailingCommas, summarizeInboundScopeRejections, syncScopeResetRequiredPayload, updatePeerAddresses, upsertCoordinatorGroupPreference, upsertProjectScopeSettingsMapping, verifySignature, writeCodememConfigFile } from "@codemem/core";
+import { ACCESS_CLEANUP_OP_TYPE, CODEMEM_CONFIG_ENV_OVERRIDES, DEFAULT_TIME_WINDOW_S, LEGACY_SHARED_REVIEW_SCOPE_ID, LOCAL_DEFAULT_SCOPE_ID, LOCAL_SYNC_CAPABILITY, MemoryStore, SYNC_CAPABILITY_HEADER, SYNC_SCOPE_QUERY_PARAM, VERSION, VERSION as VERSION$1, addSyncScopeToBoundary, analyzeProjectScopeMappingChangeGuardrails, applyReplicationOps, buildBaseUrl, buildFilterClausesWithContext, buildRawEventEnvelopeFromCodexHook, buildRawEventEnvelopeFromHook, canonicalMemoryKind, canonicalWorkspaceIdentity, cleanupNonces, coordinatorArchiveGroupAction, coordinatorCreateGroupAction, coordinatorCreateInviteAction, coordinatorCreateScopeAction, coordinatorDisableDeviceAction, coordinatorEnableDeviceAction, coordinatorGrantScopeMembershipAction, coordinatorImportInviteAction, coordinatorListBootstrapGrantsAction, coordinatorListDevicesAction, coordinatorListGroupsAction, coordinatorListJoinRequestsAction, coordinatorListScopeMembershipsAction, coordinatorListScopesAction, coordinatorRemoveDeviceAction, coordinatorRenameDeviceAction, coordinatorRenameGroupAction, coordinatorReviewJoinRequestAction, coordinatorRevokeBootstrapGrantAction, coordinatorRevokeScopeMembershipAction, coordinatorStatusSnapshot, coordinatorUnarchiveGroupAction, coordinatorUpdateScopeAction, createCoordinatorReciprocalApproval, defaultSpaceScopeIdForGroup, deleteProjectScopeSettingsMapping, diagnoseStalePeerReceivedRows, ensureDeviceIdentity, extractReplicationOps, filterReplicationOpsForSyncWithStatus, fingerprintPublicKey, formatHostPort, fromJson, getCodememConfigPath, getCodememEnvOverrides, getCoordinatorGroupPreference, getSemanticIndexDiagnostics, getSyncResetState, isScopedSyncCapability, isSummaryLikeMemory, listAuthorizedScopesForPeer, listCoordinatorJoinRequests, listInboundScopeRejections, listMaintenanceJobs, listObserverProviderOptions, listPerPeerScopeSyncState, listProjectScopeCandidates, listProjectScopeInventory, listProjectScopeSettingsMappings, listSharingDomainSettingsScopes, loadMemorySnapshotPageForPeer, loadReplicationOpsForPeer, lookupCoordinatorPeers, mergeAddresses, negotiateSyncCapability, normalizeAddress, normalizeSyncCapability, parseStrictInteger, parseSyncScopeRequest, personalScopeGrantStatusForPeer, probeAvailableCredentials, readCodememConfigFile, readCoordinatorSyncConfig, reassignProjectScopeInventoryProject, recordNonce, rejectInboundScopeFailures, requestJson, resolveDbPath, runSyncPass, schema, stripPrivateObj, summarizeInboundScopeRejections, syncScopeResetRequiredPayload, updatePeerAddresses, upsertCoordinatorGroupPreference, upsertProjectScopeSettingsMapping, verifySignature, writeCodememConfigFile } from "@codemem/core";
 import { serveStatic } from "@hono/node-server/serve-static";
 import { Hono } from "hono";
 import { createMiddleware } from "hono/factory";
 import { RateLimiter } from "limiter";
-import { homedir, networkInterfaces } from "node:os";
 import { and, count, desc, eq, inArray, max, ne } from "drizzle-orm";
 import { drizzle } from "drizzle-orm/better-sqlite3";
 import { createHash, randomUUID } from "node:crypto";
+import { networkInterfaces } from "node:os";
 //#region src/middleware.ts
 var LOOPBACK_HOSTS = new Set([
 	"127.0.0.1",
@@ -252,27 +252,6 @@ var DEFAULTS = {
 function loadProviderOptions() {
 	return listObserverProviderOptions();
 }
-function getConfigPath() {
-	const envPath = process.env.CODEMEM_CONFIG;
-	if (envPath) return envPath.replace(/^~/, homedir());
-	const configDir = join(homedir(), ".config", "codemem");
-	return [join(configDir, "config.json"), join(configDir, "config.jsonc")].find((p) => existsSync(p)) ?? join(configDir, "config.json");
-}
-function readConfigFile(configPath) {
-	if (!existsSync(configPath)) return {};
-	try {
-		let text = readFileSync(configPath, "utf-8").trim();
-		if (!text) return {};
-		try {
-			return JSON.parse(text);
-		} catch {
-			text = stripTrailingCommas(stripJsonComments(text));
-			return JSON.parse(text);
-		}
-	} catch {
-		return {};
-	}
-}
 function withoutRemovedConfigKeys(configData) {
 	const next = { ...configData };
 	for (const key of REMOVED_CONFIG_KEYS) delete next[key];
@@ -448,8 +427,8 @@ function applyRuntimeEffects(changedKeys, opts) {
 function configRoutes(opts = {}) {
 	const app = new Hono();
 	app.get("/api/config", (c) => {
-		const configPath = getConfigPath();
-		const configData = withoutRemovedConfigKeys(readConfigFile(configPath));
+		const configPath = getCodememConfigPath();
+		const configData = withoutRemovedConfigKeys(readCodememConfigFile());
 		const effective = getEffectiveConfig(configData);
 		return c.json({
 			path: configPath,
@@ -1509,30 +1488,29 @@ function sanitizePackUsageMetadata(metadata, visibility) {
 	for (const key of MEMORY_ID_METADATA_KEYS) if (Array.isArray(sanitized[key])) sanitized[key] = metadataMemoryIds(sanitized[key]).filter((memoryId) => visibility.visibleMemoryIds.has(memoryId));
 	return sanitized;
 }
-function summarizeUsageEvents(rows) {
-	const byEvent = /* @__PURE__ */ new Map();
-	for (const row of rows) {
-		const summary = byEvent.get(row.event) ?? {
-			event: row.event,
-			total_tokens_read: 0,
-			total_tokens_written: 0,
-			total_tokens_saved: 0,
-			count: 0
-		};
-		summary.total_tokens_read += row.tokens_read;
-		summary.total_tokens_written += row.tokens_written;
-		summary.total_tokens_saved += row.tokens_saved;
-		summary.count += 1;
-		byEvent.set(row.event, summary);
-	}
-	return [...byEvent.values()].sort((a, b) => a.event.localeCompare(b.event));
+/**
+* Convert the neutral core aggregate rows into the wire shape for /api/usage
+* (ApiUsageEventSummary: total_tokens_* names), sorted by event name ASC to
+* match the route's historical ordering.
+*/
+function mapAggregateEvents(rows) {
+	return rows.map((row) => ({
+		event: row.event,
+		total_tokens_read: row.tokens_read,
+		total_tokens_written: row.tokens_written,
+		total_tokens_saved: row.tokens_saved,
+		count: row.count
+	})).sort((a, b) => a.event.localeCompare(b.event));
 }
-function totalUsageEvents(rows) {
+/**
+* Sum the neutral core aggregate rows into the ApiUsageTotals wire shape.
+*/
+function totalsFromAggregate(rows) {
 	return rows.reduce((acc, row) => ({
-		tokens_read: Number(acc.tokens_read) + row.tokens_read,
-		tokens_written: Number(acc.tokens_written) + row.tokens_written,
-		tokens_saved: Number(acc.tokens_saved) + row.tokens_saved,
-		count: Number(acc.count) + 1
+		tokens_read: acc.tokens_read + row.tokens_read,
+		tokens_written: acc.tokens_written + row.tokens_written,
+		tokens_saved: acc.tokens_saved + row.tokens_saved,
+		count: acc.count + row.count
 	}), {
 		tokens_read: 0,
 		tokens_written: 0,
@@ -1544,16 +1522,48 @@ function totalUsageEvents(rows) {
 * Short-lived cache for the computed /api/usage payload.
 *
 * The health dot polls /api/usage on every 5s refresh regardless of the
-* active tab, and the computation scans the full usage_events table to apply
-* scope visibility before aggregating. The resulting token totals are
-* cumulative dashboard figures, so a few seconds of staleness is acceptable
-* in exchange for collapsing the repeated full-table scan on the polling
-* loop. Keyed by db path + scope identity + project filter so distinct
-* stores/projects never share an entry.
+* active tab. The token/event totals come from indexed SQL aggregates and the
+* recent-pack window runs scope-visibility resolution over its bounded set, so
+* each miss is cheap — but the totals are cumulative dashboard figures where a
+* few seconds of staleness is acceptable, so caching still collapses the
+* repeated recompute on the polling loop. Keyed by db path + scope identity +
+* project filter so distinct stores/projects never share an entry.
 */
 var usagePayloadCache = /* @__PURE__ */ new Map();
 var USAGE_PAYLOAD_CACHE_MS = 1e4;
 /**
+* Hard cap on cached usage payloads. The cache key folds in the arbitrary
+* `?project=` filter and a scope-visibility fingerprint that becomes
+* per-request-unique on the error/bypass path, so without a bound the map
+* would grow without limit in a long-running viewer. The cap is far above the
+* realistic working set (a handful of projects times one or two scope
+* generations), so legitimate hits are never evicted under normal load.
+*/
+var USAGE_PAYLOAD_CACHE_MAX_ENTRIES = 256;
+/**
+* Sweep expired entries and enforce the size cap before inserting a new one.
+*
+* Mirrors the lazy-sweep approach in request-rate-limit.ts: eviction is
+* piggybacked on writes rather than run on a timer, so an idle viewer does no
+* background work. Expired entries (those past `expiresAtMs`) are always
+* dropped; if the map is still at capacity afterward — e.g. a burst of
+* distinct, still-live bypass keys — the oldest-expiring entries are evicted
+* to make room. This never changes hit/miss semantics for a live entry: the
+* caller still re-checks `expiresAtMs` on read, and only already-expired or
+* over-cap entries are removed here.
+*/
+function sweepUsagePayloadCache(cache, nowMs) {
+	for (const [key, entry] of cache) if (entry.expiresAtMs <= nowMs) cache.delete(key);
+	if (cache.size < USAGE_PAYLOAD_CACHE_MAX_ENTRIES) return;
+	const byExpiry = [...cache.entries()].sort((a, b) => a[1].expiresAtMs - b[1].expiresAtMs);
+	let overflow = cache.size - USAGE_PAYLOAD_CACHE_MAX_ENTRIES + 1;
+	for (const [key] of byExpiry) {
+		if (overflow <= 0) break;
+		cache.delete(key);
+		overflow -= 1;
+	}
+}
+/**
 * Cheap fingerprint of the state that drives scope visibility
 * (`scope_memberships` / `replication_scopes`). Folding this into the usage
 * cache key ensures a membership/scope status change — e.g. a revocation —
@@ -1643,30 +1653,31 @@ function statsRoutes(getStore) {
 			const nowMs = Date.now();
 			const cached = usagePayloadCache.get(cacheKey);
 			if (cached && nowMs < cached.expiresAtMs) return c.json(cached.payload);
-			const loadUsageRows = (project) => {
+			const globalAggregate = store.usageAggregate();
+			const eventsGlobal = mapAggregateEvents(globalAggregate);
+			const totalsGlobal = totalsFromAggregate(globalAggregate);
+			const filteredAggregate = projectFilter ? store.usageAggregate(projectFilter) : null;
+			const eventsFiltered = filteredAggregate ? mapAggregateEvents(filteredAggregate) : null;
+			const totalsFiltered = filteredAggregate ? totalsFromAggregate(filteredAggregate) : null;
+			const RECENT_PACK_SCAN_LIMIT = 200;
+			const loadRecentPackWindow = (project) => {
 				return (project ? store.db.prepare(`SELECT usage_events.id, usage_events.session_id, usage_events.event,
 									usage_events.tokens_read, usage_events.tokens_written, usage_events.tokens_saved,
 									usage_events.created_at, usage_events.metadata_json
 								 FROM usage_events
 								 JOIN sessions ON sessions.id = usage_events.session_id
-								 WHERE sessions.project = ?
-								 ORDER BY usage_events.created_at DESC`).all(project) : store.db.prepare(`SELECT id, session_id, event, tokens_read, tokens_written, tokens_saved,
+								 WHERE sessions.project = ? AND usage_events.event = 'pack'
+								 ORDER BY usage_events.created_at DESC
+								 LIMIT ?`).all(project, RECENT_PACK_SCAN_LIMIT) : store.db.prepare(`SELECT id, session_id, event, tokens_read, tokens_written, tokens_saved,
 									created_at, metadata_json
 								 FROM usage_events
-								 ORDER BY created_at DESC`).all()).map((row) => toUsageRow(row, parseMetadataJson(row.metadata_json)));
+								 WHERE event = 'pack'
+								 ORDER BY created_at DESC
+								 LIMIT ?`).all(RECENT_PACK_SCAN_LIMIT)).map((row) => toUsageRow(row, parseMetadataJson(row.metadata_json)));
 			};
-			const loadedGlobalRows = loadUsageRows();
-			const globalVisibility = buildUsageVisibility(store, loadedGlobalRows);
-			const globalRows = loadedGlobalRows.filter((row) => usageRowVisible(row, globalVisibility));
-			const loadedFilteredRows = projectFilter ? loadUsageRows(projectFilter) : null;
-			const filteredVisibility = loadedFilteredRows ? buildUsageVisibility(store, loadedFilteredRows) : null;
-			const filteredRows = loadedFilteredRows ? loadedFilteredRows.filter((row) => usageRowVisible(row, filteredVisibility ?? globalVisibility)) : null;
-			const eventsGlobal = summarizeUsageEvents(globalRows);
-			const totalsGlobal = totalUsageEvents(globalRows);
-			const eventsFiltered = filteredRows ? summarizeUsageEvents(filteredRows) : null;
-			const totalsFiltered = filteredRows ? totalUsageEvents(filteredRows) : null;
-			const recentVisibility = filteredVisibility ?? globalVisibility;
-			const recentPacks = (filteredRows ?? globalRows).filter((row) => row.event === "pack").slice(0, 10).map((row) => ({
+			const recentWindow = loadRecentPackWindow(projectFilter);
+			const recentVisibility = buildUsageVisibility(store, recentWindow);
+			const recentPacks = recentWindow.filter((row) => usageRowVisible(row, recentVisibility)).slice(0, 10).map((row) => ({
 				...row,
 				metadata_json: sanitizePackUsageMetadata(row.metadata_json, recentVisibility)
 			}));
@@ -1680,9 +1691,11 @@ function statsRoutes(getStore) {
 				totals_filtered: totalsFiltered,
 				recent_packs: recentPacks
 			};
+			const setAtMs = Date.now();
+			sweepUsagePayloadCache(usagePayloadCache, setAtMs);
 			usagePayloadCache.set(cacheKey, {
 				payload,
-				expiresAtMs: Date.now() + USAGE_PAYLOAD_CACHE_MS
+				expiresAtMs: setAtMs + USAGE_PAYLOAD_CACHE_MS
 			});
 			return c.json(payload);
 		}
@@ -3650,7 +3663,12 @@ function syncRoutes(getStore, getSyncRuntimeStatus) {
 		const store = getStore();
 		{
 			const d = drizzle(store.db, { schema });
-			const body = await c.req.json();
+			let body;
+			try {
+				body = await c.req.json();
+			} catch {
+				return c.json({ error: "invalid json" }, 400);
+			}
 			const peerDeviceId = String(body.peer_device_id ?? "").trim();
 			const name = String(body.name ?? "").trim();
 			if (!peerDeviceId) return c.json({ error: "peer_device_id required" }, 400);
@@ -5460,7 +5478,8 @@ function createApp(opts) {
 	});
 	app.use("/assets/*", serveStatic({
 		root: staticRoot,
-		rewriteRequestPath: (path) => path.replace(/^\/assets/, "")
+		rewriteRequestPath: (path) => path.replace(/^\/assets/, ""),
+		precompressed: true
 	}));
 	const indexPath = join(staticRoot, "index.html");
 	if (!existsSync(indexPath)) throw new Error(`Viewer assets missing at ${indexPath}. Run \`pnpm build\` from the repo root before starting the viewer.`);