johns-harness 2026.9.34 → 2026.9.35

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 2026.9.35
+
+- Family 81 (session store memory, 2026-09-28): the gateway no longer runs out of memory every few days. `sessions.json` stops storing `skillsSnapshot` and `systemPromptReport` in every entry (they are rebuilt in memory on demand); existing stores shrink on the first write after the update (the live main store: 27 MB to 0.3 MB). Writes are compact JSON with one fewer full clone per load: 347 ms to 5 ms per session update on the live store copy.
+- Session maintenance now defaults to `enforce` (prune after 30 days, 500 entries, rotate at 10 MB) and never removes the active session, main sessions, or anything updated in the last 24 hours. Set `session.maintenance.mode: "warn"` to keep the old behavior.
+- The gateway starts with `--max-old-space-size=min(8192, RAM/2)` MB (only when that raises the limit); override with `JOHNNESS_GATEWAY_MAX_OLD_SPACE_MB=<MB>` or disable with `off`. Existing service installs pick it up on the next restart.
+- Exact replay `scripts/patch-session-store-memory-81.py` (11 files); verifier checks 81.1-81.7. Roll back with `npm i -g johns-harness@2026.9.34`.
+
 ## 2026.9.34
 
 - Family 80 (daily model integration, 2026-09-24): GPT-6 Sol (`gpt-6-sol`) and GPT-6 Luna (`gpt-6-luna`) ship on `openai` and `openai-codex`, and xAI Grok 4.7 (`grok-4.7`) on `xai`. Card data from the official model pages checked 2026-09-24: GPT-6 Sol $2/$10 per MTok, Luna $0.10/$0.50, both 1.05M native context and 128K max output (272K harness window, like every GPT entry), efforts none through max; Grok 4.7 $2/$6, 500K native context (200K harness window and 64K max output, like Grok 4.6), efforts low through xhigh. All three allow `/think xhigh`. GPT-6 Sol/Luna drop `temperature` unless reasoning effort is `none` (the API rejects it otherwise, verified live).

package/dist/entry.js

@@ -104,6 +104,7 @@ function applyCliProfileEnv(params) {
 	if (profile === "dev" && !env.JOHNNESS_GATEWAY_PORT?.trim()) env.JOHNNESS_GATEWAY_PORT = "19001";
 }
 //#endregion
+import v8 from "node:v8"; // JOHNNESS_PATCH_SESSION_STORE_MEMORY_81
 //#region src/cli/respawn-policy.ts
 function shouldSkipRespawnForArgv(argv) {
 	return hasHelpOrVersion(argv);
@@ -326,14 +327,32 @@ if (!isMainModule({
 		for (const arg of process$1.execArgv) if (arg === EXPERIMENTAL_WARNING_FLAG || arg === "--no-warnings") return true;
 		return false;
 	}
+	// JOHNNESS_PATCH_SESSION_STORE_MEMORY_81: gateway heap. Node's default old-space limit (~4 GB) was the OOM ceiling. The
+	// gateway runs with --max-old-space-size=min(8192, RAM/2) MB, only when that raises the limit.
+	// JOHNNESS_GATEWAY_MAX_OLD_SPACE_MB=<MB> sets it explicitly; 0/off disables. A heap flag already
+	// in NODE_OPTIONS or execArgv wins. Applied at launch, so existing service installs get it.
+	function resolveGatewayHeapArgs() {
+		if (!process$1.argv.slice(2).includes("gateway")) return [];
+		const nodeOptions = process$1.env.NODE_OPTIONS ?? "";
+		if (nodeOptions.includes("--max-old-space-size") || process$1.execArgv.some((arg) => arg.startsWith("--max-old-space-size"))) return [];
+		const raw = (process$1.env.JOHNNESS_GATEWAY_MAX_OLD_SPACE_MB ?? "").trim();
+		if (/^(0|off|false|no|none)$/i.test(raw)) return [];
+		const explicit = /^[1-9][0-9]*$/.test(raw) ? Number(raw) : void 0;
+		const mb = explicit ?? Math.min(8192, Math.floor(os.totalmem() / 1048576 / 2));
+		const currentMb = v8.getHeapStatistics().heap_size_limit / 1048576;
+		if (explicit === void 0 && !(mb > currentMb)) return [];
+		return [`--max-old-space-size=${mb}`];
+	}
 	function ensureExperimentalWarningSuppressed() {
 		if (shouldSkipRespawnForArgv(process$1.argv)) return false;
 		if (isTruthyEnvValue(process$1.env.JOHNNESS_NO_RESPAWN)) return false;
 		if (isTruthyEnvValue(process$1.env.JOHNNESS_NODE_OPTIONS_READY)) return false;
-		if (hasExperimentalWarningSuppressed()) return false;
+		const gatewayHeapArgs = resolveGatewayHeapArgs();
+		if (hasExperimentalWarningSuppressed() && gatewayHeapArgs.length === 0) return false;
 		process$1.env.JOHNNESS_NODE_OPTIONS_READY = "1";
 		const child = spawn(process$1.execPath, [
 			EXPERIMENTAL_WARNING_FLAG,
+			...gatewayHeapArgs,
 			...process$1.execArgv,
 			...process$1.argv.slice(1)
 		], {

package/dist/pi-embedded-helpers-CkWXaNFn.js

@@ -7467,7 +7467,15 @@ const log$2 = createSubsystemLogger("sessions/store");
 const DEFAULT_SESSION_PRUNE_AFTER_MS = 720 * 60 * 60 * 1e3;
 const DEFAULT_SESSION_MAX_ENTRIES = 500;
 const DEFAULT_SESSION_ROTATE_BYTES = 10485760;
-const DEFAULT_SESSION_MAINTENANCE_MODE = "warn";
+const DEFAULT_SESSION_MAINTENANCE_MODE = "enforce"; // JOHNNESS_PATCH_SESSION_STORE_MEMORY_81: was "warn" (never pruned)
+const SESSION_MAINTENANCE_PROTECT_RECENT_MS = 24 * 60 * 60 * 1e3;
+function isProtectedSessionEntry(key, entry, opts = {}) {
+	const active = typeof opts.activeSessionKey === "string" ? opts.activeSessionKey.trim() : "";
+	if (active && key === active) return true;
+	if (key === "main" || key === "global" || key.endsWith(":main")) return true;
+	const updatedAt = entry?.updatedAt;
+	return typeof updatedAt === "number" && Date.now() - updatedAt < SESSION_MAINTENANCE_PROTECT_RECENT_MS;
+}
 const DEFAULT_SESSION_DISK_BUDGET_HIGH_WATER_RATIO = .8;
 function resolvePruneAfterMs(maintenance) {
 	const raw = maintenance?.pruneAfter ?? maintenance?.pruneDays;
@@ -7552,7 +7560,7 @@ function pruneStaleEntries(store, overrideMaxAgeMs, opts = {}) {
 	const maxAgeMs = overrideMaxAgeMs ?? resolveMaintenanceConfig().pruneAfterMs;
 	const cutoffMs = Date.now() - maxAgeMs;
 	let pruned = 0;
-	for (const [key, entry] of Object.entries(store)) if (entry?.updatedAt != null && entry.updatedAt < cutoffMs) {
+	for (const [key, entry] of Object.entries(store)) if (entry?.updatedAt != null && entry.updatedAt < cutoffMs && !isProtectedSessionEntry(key, entry, opts)) {
 		opts.onPruned?.({
 			key,
 			entry
@@ -7601,7 +7609,7 @@ function capEntryCount(store, overrideMax, opts = {}) {
 	const toRemove = keys.toSorted((a, b) => {
 		const aTime = getEntryUpdatedAt(store[a]);
 		return getEntryUpdatedAt(store[b]) - aTime;
-	}).slice(maxEntries);
+	}).slice(maxEntries).filter((key) => !isProtectedSessionEntry(key, store[key], opts));
 	for (const key of toRemove) {
 		const entry = store[key];
 		if (entry) opts.onCapped?.({
@@ -7753,6 +7761,59 @@ function normalizeSessionStore(store) {
 		if (normalized !== entry) store[key] = normalized;
 	}
 }
+// JOHNNESS_PATCH_SESSION_STORE_MEMORY_81: skillsSnapshot and systemPromptReport are rebuilt per process
+// (ensureSkillSnapshot, resolveCronSkillsSnapshot, resolveContextReport) and were 80%+ of
+// sessions.json. They live here, keyed by store path + session key + sessionId, never on disk.
+const SESSION_RUNTIME_FIELD_NAMES = ["skillsSnapshot", "systemPromptReport"];
+const SESSION_RUNTIME_FIELDS_KEEP_MS = 24 * 60 * 60 * 1e3;
+const SESSION_RUNTIME_FIELDS = /* @__PURE__ */ new Map();
+function stripSessionRuntimeFields(store) {
+	let stripped = 0;
+	for (const entry of Object.values(store)) {
+		if (!entry || typeof entry !== "object") continue;
+		for (const field of SESSION_RUNTIME_FIELD_NAMES) if (field in entry) {
+			delete entry[field];
+			stripped++;
+		}
+	}
+	return stripped;
+}
+function attachSessionRuntimeFields(storePath, store) {
+	const side = SESSION_RUNTIME_FIELDS.get(storePath);
+	if (!side || side.size === 0) return store;
+	for (const [key, kept] of side) {
+		const entry = store[key];
+		if (!entry || typeof entry !== "object" || entry.sessionId !== kept.sessionId) continue;
+		for (const field of SESSION_RUNTIME_FIELD_NAMES) if (kept[field] !== void 0 && entry[field] === void 0) entry[field] = kept[field];
+	}
+	return store;
+}
+function persistableSessionStore(storePath, store) {
+	const side = SESSION_RUNTIME_FIELDS.get(storePath) ?? /* @__PURE__ */ new Map();
+	const cutoff = Date.now() - SESSION_RUNTIME_FIELDS_KEEP_MS;
+	let out = store;
+	for (const [key, entry] of Object.entries(store)) {
+		if (!entry || typeof entry !== "object") continue;
+		if (!SESSION_RUNTIME_FIELD_NAMES.some((field) => entry[field] !== void 0)) {
+			side.delete(key);
+			continue;
+		}
+		if (out === store) out = { ...store };
+		const copy = { ...entry };
+		const kept = { sessionId: entry.sessionId };
+		for (const field of SESSION_RUNTIME_FIELD_NAMES) {
+			if (copy[field] !== void 0) kept[field] = copy[field];
+			delete copy[field];
+		}
+		out[key] = copy;
+		if (typeof entry.updatedAt === "number" && entry.updatedAt < cutoff) side.delete(key);
+		else side.set(key, kept);
+	}
+	for (const key of side.keys()) if (!store[key]) side.delete(key);
+	if (side.size > 0) SESSION_RUNTIME_FIELDS.set(storePath, side);
+	else SESSION_RUNTIME_FIELDS.delete(storePath);
+	return out;
+}
 function loadSessionStore(storePath, opts = {}) {
 	if (!opts.skipCache && isSessionStoreCacheEnabled()) {
 		const currentFileStat = getFileStatSnapshot(storePath);
@@ -7762,7 +7823,7 @@ function loadSessionStore(storePath, opts = {}) {
 			mtimeMs: currentFileStat?.mtimeMs,
 			sizeBytes: currentFileStat?.sizeBytes
 		});
-		if (cached) return cached;
+		if (cached) return attachSessionRuntimeFields(storePath, cached);
 	}
 	let store = {};
 	let fileStat = getFileStatSnapshot(storePath);
@@ -7793,6 +7854,7 @@ function loadSessionStore(storePath, opts = {}) {
 	if (serializedFromDisk !== void 0) setSerializedSessionStore(storePath, serializedFromDisk);
 	else setSerializedSessionStore(storePath, void 0);
 	applySessionStoreMigrations(store);
+	stripSessionRuntimeFields(store);
 	if (!opts.skipCache && isSessionStoreCacheEnabled()) writeSessionStoreCache({
 		storePath,
 		store,
@@ -7800,7 +7862,8 @@ function loadSessionStore(storePath, opts = {}) {
 		sizeBytes: fileStat?.sizeBytes,
 		serialized: serializedFromDisk
 	});
-	return structuredClone(store);
+	// JOHNNESS_PATCH_SESSION_STORE_MEMORY_81: `store` was parsed just now and the cache holds its own clone.
+	return attachSessionRuntimeFields(storePath, store);
 }
 function readSessionUpdatedAt(params) {
 	try {
@@ -7874,10 +7937,10 @@ async function saveSessionStoreUnlocked(storePath, store, opts) {
 			});
 		} else {
 			const removedSessionFiles = /* @__PURE__ */ new Map();
-			const pruned = pruneStaleEntries(store, maintenance.pruneAfterMs, { onPruned: ({ entry }) => {
+			const pruned = pruneStaleEntries(store, maintenance.pruneAfterMs, { activeSessionKey: opts?.activeSessionKey, onPruned: ({ entry }) => {
 				rememberRemovedSessionFile(removedSessionFiles, entry);
 			} });
-			const capped = capEntryCount(store, maintenance.maxEntries, { onCapped: ({ entry }) => {
+			const capped = capEntryCount(store, maintenance.maxEntries, { activeSessionKey: opts?.activeSessionKey, onCapped: ({ entry }) => {
 				rememberRemovedSessionFile(removedSessionFiles, entry);
 			} });
 			const archivedDirs = /* @__PURE__ */ new Set();
@@ -7922,7 +7985,9 @@ async function saveSessionStoreUnlocked(storePath, store, opts) {
 		}
 	}
 	await fs$1.promises.mkdir(path.dirname(storePath), { recursive: true });
-	const json = JSON.stringify(store, null, 2);
+	// JOHNNESS_PATCH_SESSION_STORE_MEMORY_81: persist without runtime fields, compact (was 2-space indent).
+	store = persistableSessionStore(storePath, store);
+	const json = JSON.stringify(store);
 	if (getSerializedSessionStore(storePath) === json) {
 		updateSessionStoreWriteCaches({
 			storePath,
@@ -7974,6 +8039,9 @@ async function saveSessionStoreUnlocked(storePath, store, opts) {
 }
 async function updateSessionStore(storePath, mutator, opts) {
 	return await withSessionStoreLock(storePath, async () => {
+		// JOHNNESS_PATCH_SESSION_STORE_MEMORY_81: skipCache stays. This runs under the cross-process file lock and the cache is
+		// validated only by mtime + size, so a same-size write by another process could be missed.
+		// The re-read is ~3 MB now that runtime fields are not persisted.
 		const store = loadSessionStore(storePath, { skipCache: true });
 		const result = await mutator(store);
 		await saveSessionStoreUnlocked(storePath, store, opts);

package/dist/pi-embedded-helpers-DLLQ3MsR.js

@@ -7464,7 +7464,15 @@ const log$2 = createSubsystemLogger("sessions/store");
 const DEFAULT_SESSION_PRUNE_AFTER_MS = 720 * 60 * 60 * 1e3;
 const DEFAULT_SESSION_MAX_ENTRIES = 500;
 const DEFAULT_SESSION_ROTATE_BYTES = 10485760;
-const DEFAULT_SESSION_MAINTENANCE_MODE = "warn";
+const DEFAULT_SESSION_MAINTENANCE_MODE = "enforce"; // JOHNNESS_PATCH_SESSION_STORE_MEMORY_81: was "warn" (never pruned)
+const SESSION_MAINTENANCE_PROTECT_RECENT_MS = 24 * 60 * 60 * 1e3;
+function isProtectedSessionEntry(key, entry, opts = {}) {
+	const active = typeof opts.activeSessionKey === "string" ? opts.activeSessionKey.trim() : "";
+	if (active && key === active) return true;
+	if (key === "main" || key === "global" || key.endsWith(":main")) return true;
+	const updatedAt = entry?.updatedAt;
+	return typeof updatedAt === "number" && Date.now() - updatedAt < SESSION_MAINTENANCE_PROTECT_RECENT_MS;
+}
 const DEFAULT_SESSION_DISK_BUDGET_HIGH_WATER_RATIO = .8;
 function resolvePruneAfterMs(maintenance) {
 	const raw = maintenance?.pruneAfter ?? maintenance?.pruneDays;
@@ -7549,7 +7557,7 @@ function pruneStaleEntries(store, overrideMaxAgeMs, opts = {}) {
 	const maxAgeMs = overrideMaxAgeMs ?? resolveMaintenanceConfig().pruneAfterMs;
 	const cutoffMs = Date.now() - maxAgeMs;
 	let pruned = 0;
-	for (const [key, entry] of Object.entries(store)) if (entry?.updatedAt != null && entry.updatedAt < cutoffMs) {
+	for (const [key, entry] of Object.entries(store)) if (entry?.updatedAt != null && entry.updatedAt < cutoffMs && !isProtectedSessionEntry(key, entry, opts)) {
 		opts.onPruned?.({
 			key,
 			entry
@@ -7598,7 +7606,7 @@ function capEntryCount(store, overrideMax, opts = {}) {
 	const toRemove = keys.toSorted((a, b) => {
 		const aTime = getEntryUpdatedAt(store[a]);
 		return getEntryUpdatedAt(store[b]) - aTime;
-	}).slice(maxEntries);
+	}).slice(maxEntries).filter((key) => !isProtectedSessionEntry(key, store[key], opts));
 	for (const key of toRemove) {
 		const entry = store[key];
 		if (entry) opts.onCapped?.({
@@ -7750,6 +7758,59 @@ function normalizeSessionStore(store) {
 		if (normalized !== entry) store[key] = normalized;
 	}
 }
+// JOHNNESS_PATCH_SESSION_STORE_MEMORY_81: skillsSnapshot and systemPromptReport are rebuilt per process
+// (ensureSkillSnapshot, resolveCronSkillsSnapshot, resolveContextReport) and were 80%+ of
+// sessions.json. They live here, keyed by store path + session key + sessionId, never on disk.
+const SESSION_RUNTIME_FIELD_NAMES = ["skillsSnapshot", "systemPromptReport"];
+const SESSION_RUNTIME_FIELDS_KEEP_MS = 24 * 60 * 60 * 1e3;
+const SESSION_RUNTIME_FIELDS = /* @__PURE__ */ new Map();
+function stripSessionRuntimeFields(store) {
+	let stripped = 0;
+	for (const entry of Object.values(store)) {
+		if (!entry || typeof entry !== "object") continue;
+		for (const field of SESSION_RUNTIME_FIELD_NAMES) if (field in entry) {
+			delete entry[field];
+			stripped++;
+		}
+	}
+	return stripped;
+}
+function attachSessionRuntimeFields(storePath, store) {
+	const side = SESSION_RUNTIME_FIELDS.get(storePath);
+	if (!side || side.size === 0) return store;
+	for (const [key, kept] of side) {
+		const entry = store[key];
+		if (!entry || typeof entry !== "object" || entry.sessionId !== kept.sessionId) continue;
+		for (const field of SESSION_RUNTIME_FIELD_NAMES) if (kept[field] !== void 0 && entry[field] === void 0) entry[field] = kept[field];
+	}
+	return store;
+}
+function persistableSessionStore(storePath, store) {
+	const side = SESSION_RUNTIME_FIELDS.get(storePath) ?? /* @__PURE__ */ new Map();
+	const cutoff = Date.now() - SESSION_RUNTIME_FIELDS_KEEP_MS;
+	let out = store;
+	for (const [key, entry] of Object.entries(store)) {
+		if (!entry || typeof entry !== "object") continue;
+		if (!SESSION_RUNTIME_FIELD_NAMES.some((field) => entry[field] !== void 0)) {
+			side.delete(key);
+			continue;
+		}
+		if (out === store) out = { ...store };
+		const copy = { ...entry };
+		const kept = { sessionId: entry.sessionId };
+		for (const field of SESSION_RUNTIME_FIELD_NAMES) {
+			if (copy[field] !== void 0) kept[field] = copy[field];
+			delete copy[field];
+		}
+		out[key] = copy;
+		if (typeof entry.updatedAt === "number" && entry.updatedAt < cutoff) side.delete(key);
+		else side.set(key, kept);
+	}
+	for (const key of side.keys()) if (!store[key]) side.delete(key);
+	if (side.size > 0) SESSION_RUNTIME_FIELDS.set(storePath, side);
+	else SESSION_RUNTIME_FIELDS.delete(storePath);
+	return out;
+}
 function loadSessionStore(storePath, opts = {}) {
 	if (!opts.skipCache && isSessionStoreCacheEnabled()) {
 		const currentFileStat = getFileStatSnapshot(storePath);
@@ -7759,7 +7820,7 @@ function loadSessionStore(storePath, opts = {}) {
 			mtimeMs: currentFileStat?.mtimeMs,
 			sizeBytes: currentFileStat?.sizeBytes
 		});
-		if (cached) return cached;
+		if (cached) return attachSessionRuntimeFields(storePath, cached);
 	}
 	let store = {};
 	let fileStat = getFileStatSnapshot(storePath);
@@ -7790,6 +7851,7 @@ function loadSessionStore(storePath, opts = {}) {
 	if (serializedFromDisk !== void 0) setSerializedSessionStore(storePath, serializedFromDisk);
 	else setSerializedSessionStore(storePath, void 0);
 	applySessionStoreMigrations(store);
+	stripSessionRuntimeFields(store);
 	if (!opts.skipCache && isSessionStoreCacheEnabled()) writeSessionStoreCache({
 		storePath,
 		store,
@@ -7797,7 +7859,8 @@ function loadSessionStore(storePath, opts = {}) {
 		sizeBytes: fileStat?.sizeBytes,
 		serialized: serializedFromDisk
 	});
-	return structuredClone(store);
+	// JOHNNESS_PATCH_SESSION_STORE_MEMORY_81: `store` was parsed just now and the cache holds its own clone.
+	return attachSessionRuntimeFields(storePath, store);
 }
 function readSessionUpdatedAt(params) {
 	try {
@@ -7871,10 +7934,10 @@ async function saveSessionStoreUnlocked(storePath, store, opts) {
 			});
 		} else {
 			const removedSessionFiles = /* @__PURE__ */ new Map();
-			const pruned = pruneStaleEntries(store, maintenance.pruneAfterMs, { onPruned: ({ entry }) => {
+			const pruned = pruneStaleEntries(store, maintenance.pruneAfterMs, { activeSessionKey: opts?.activeSessionKey, onPruned: ({ entry }) => {
 				rememberRemovedSessionFile(removedSessionFiles, entry);
 			} });
-			const capped = capEntryCount(store, maintenance.maxEntries, { onCapped: ({ entry }) => {
+			const capped = capEntryCount(store, maintenance.maxEntries, { activeSessionKey: opts?.activeSessionKey, onCapped: ({ entry }) => {
 				rememberRemovedSessionFile(removedSessionFiles, entry);
 			} });
 			const archivedDirs = /* @__PURE__ */ new Set();
@@ -7919,7 +7982,9 @@ async function saveSessionStoreUnlocked(storePath, store, opts) {
 		}
 	}
 	await syncFs.promises.mkdir(path.dirname(storePath), { recursive: true });
-	const json = JSON.stringify(store, null, 2);
+	// JOHNNESS_PATCH_SESSION_STORE_MEMORY_81: persist without runtime fields, compact (was 2-space indent).
+	store = persistableSessionStore(storePath, store);
+	const json = JSON.stringify(store);
 	if (getSerializedSessionStore(storePath) === json) {
 		updateSessionStoreWriteCaches({
 			storePath,
@@ -7976,6 +8041,9 @@ async function saveSessionStore(storePath, store, opts) {
 }
 async function updateSessionStore(storePath, mutator, opts) {
 	return await withSessionStoreLock(storePath, async () => {
+		// JOHNNESS_PATCH_SESSION_STORE_MEMORY_81: skipCache stays. This runs under the cross-process file lock and the cache is
+		// validated only by mtime + size, so a same-size write by another process could be missed.
+		// The re-read is ~3 MB now that runtime fields are not persisted.
 		const store = loadSessionStore(storePath, { skipCache: true });
 		const result = await mutator(store);
 		await saveSessionStoreUnlocked(storePath, store, opts);

package/dist/plugin-sdk/pi-embedded-helpers-B89Z8pGU.js

@@ -1469,7 +1469,15 @@ const log$3 = createSubsystemLogger("sessions/store");
 const DEFAULT_SESSION_PRUNE_AFTER_MS = 720 * 60 * 60 * 1e3;
 const DEFAULT_SESSION_MAX_ENTRIES = 500;
 const DEFAULT_SESSION_ROTATE_BYTES = 10485760;
-const DEFAULT_SESSION_MAINTENANCE_MODE = "warn";
+const DEFAULT_SESSION_MAINTENANCE_MODE = "enforce"; // JOHNNESS_PATCH_SESSION_STORE_MEMORY_81: was "warn" (never pruned)
+const SESSION_MAINTENANCE_PROTECT_RECENT_MS = 24 * 60 * 60 * 1e3;
+function isProtectedSessionEntry(key, entry, opts = {}) {
+	const active = typeof opts.activeSessionKey === "string" ? opts.activeSessionKey.trim() : "";
+	if (active && key === active) return true;
+	if (key === "main" || key === "global" || key.endsWith(":main")) return true;
+	const updatedAt = entry?.updatedAt;
+	return typeof updatedAt === "number" && Date.now() - updatedAt < SESSION_MAINTENANCE_PROTECT_RECENT_MS;
+}
 const DEFAULT_SESSION_DISK_BUDGET_HIGH_WATER_RATIO = .8;
 function resolvePruneAfterMs(maintenance) {
 	const raw = maintenance?.pruneAfter ?? maintenance?.pruneDays;
@@ -1554,7 +1562,7 @@ function pruneStaleEntries(store, overrideMaxAgeMs, opts = {}) {
 	const maxAgeMs = overrideMaxAgeMs ?? resolveMaintenanceConfig().pruneAfterMs;
 	const cutoffMs = Date.now() - maxAgeMs;
 	let pruned = 0;
-	for (const [key, entry] of Object.entries(store)) if (entry?.updatedAt != null && entry.updatedAt < cutoffMs) {
+	for (const [key, entry] of Object.entries(store)) if (entry?.updatedAt != null && entry.updatedAt < cutoffMs && !isProtectedSessionEntry(key, entry, opts)) {
 		opts.onPruned?.({
 			key,
 			entry
@@ -1603,7 +1611,7 @@ function capEntryCount(store, overrideMax, opts = {}) {
 	const toRemove = keys.toSorted((a, b) => {
 		const aTime = getEntryUpdatedAt(store[a]);
 		return getEntryUpdatedAt(store[b]) - aTime;
-	}).slice(maxEntries);
+	}).slice(maxEntries).filter((key) => !isProtectedSessionEntry(key, store[key], opts));
 	for (const key of toRemove) {
 		const entry = store[key];
 		if (entry) opts.onCapped?.({
@@ -1755,6 +1763,59 @@ function normalizeSessionStore(store) {
 		if (normalized !== entry) store[key] = normalized;
 	}
 }
+// JOHNNESS_PATCH_SESSION_STORE_MEMORY_81: skillsSnapshot and systemPromptReport are rebuilt per process
+// (ensureSkillSnapshot, resolveCronSkillsSnapshot, resolveContextReport) and were 80%+ of
+// sessions.json. They live here, keyed by store path + session key + sessionId, never on disk.
+const SESSION_RUNTIME_FIELD_NAMES = ["skillsSnapshot", "systemPromptReport"];
+const SESSION_RUNTIME_FIELDS_KEEP_MS = 24 * 60 * 60 * 1e3;
+const SESSION_RUNTIME_FIELDS = /* @__PURE__ */ new Map();
+function stripSessionRuntimeFields(store) {
+	let stripped = 0;
+	for (const entry of Object.values(store)) {
+		if (!entry || typeof entry !== "object") continue;
+		for (const field of SESSION_RUNTIME_FIELD_NAMES) if (field in entry) {
+			delete entry[field];
+			stripped++;
+		}
+	}
+	return stripped;
+}
+function attachSessionRuntimeFields(storePath, store) {
+	const side = SESSION_RUNTIME_FIELDS.get(storePath);
+	if (!side || side.size === 0) return store;
+	for (const [key, kept] of side) {
+		const entry = store[key];
+		if (!entry || typeof entry !== "object" || entry.sessionId !== kept.sessionId) continue;
+		for (const field of SESSION_RUNTIME_FIELD_NAMES) if (kept[field] !== void 0 && entry[field] === void 0) entry[field] = kept[field];
+	}
+	return store;
+}
+function persistableSessionStore(storePath, store) {
+	const side = SESSION_RUNTIME_FIELDS.get(storePath) ?? /* @__PURE__ */ new Map();
+	const cutoff = Date.now() - SESSION_RUNTIME_FIELDS_KEEP_MS;
+	let out = store;
+	for (const [key, entry] of Object.entries(store)) {
+		if (!entry || typeof entry !== "object") continue;
+		if (!SESSION_RUNTIME_FIELD_NAMES.some((field) => entry[field] !== void 0)) {
+			side.delete(key);
+			continue;
+		}
+		if (out === store) out = { ...store };
+		const copy = { ...entry };
+		const kept = { sessionId: entry.sessionId };
+		for (const field of SESSION_RUNTIME_FIELD_NAMES) {
+			if (copy[field] !== void 0) kept[field] = copy[field];
+			delete copy[field];
+		}
+		out[key] = copy;
+		if (typeof entry.updatedAt === "number" && entry.updatedAt < cutoff) side.delete(key);
+		else side.set(key, kept);
+	}
+	for (const key of side.keys()) if (!store[key]) side.delete(key);
+	if (side.size > 0) SESSION_RUNTIME_FIELDS.set(storePath, side);
+	else SESSION_RUNTIME_FIELDS.delete(storePath);
+	return out;
+}
 function loadSessionStore(storePath, opts = {}) {
 	if (!opts.skipCache && isSessionStoreCacheEnabled()) {
 		const currentFileStat = getFileStatSnapshot(storePath);
@@ -1764,7 +1825,7 @@ function loadSessionStore(storePath, opts = {}) {
 			mtimeMs: currentFileStat?.mtimeMs,
 			sizeBytes: currentFileStat?.sizeBytes
 		});
-		if (cached) return cached;
+		if (cached) return attachSessionRuntimeFields(storePath, cached);
 	}
 	let store = {};
 	let fileStat = getFileStatSnapshot(storePath);
@@ -1795,6 +1856,7 @@ function loadSessionStore(storePath, opts = {}) {
 	if (serializedFromDisk !== void 0) setSerializedSessionStore(storePath, serializedFromDisk);
 	else setSerializedSessionStore(storePath, void 0);
 	applySessionStoreMigrations(store);
+	stripSessionRuntimeFields(store);
 	if (!opts.skipCache && isSessionStoreCacheEnabled()) writeSessionStoreCache({
 		storePath,
 		store,
@@ -1802,7 +1864,8 @@ function loadSessionStore(storePath, opts = {}) {
 		sizeBytes: fileStat?.sizeBytes,
 		serialized: serializedFromDisk
 	});
-	return structuredClone(store);
+	// JOHNNESS_PATCH_SESSION_STORE_MEMORY_81: `store` was parsed just now and the cache holds its own clone.
+	return attachSessionRuntimeFields(storePath, store);
 }
 function readSessionUpdatedAt(params) {
 	try {
@@ -1876,10 +1939,10 @@ async function saveSessionStoreUnlocked(storePath, store, opts) {
 			});
 		} else {
 			const removedSessionFiles = /* @__PURE__ */ new Map();
-			const pruned = pruneStaleEntries(store, maintenance.pruneAfterMs, { onPruned: ({ entry }) => {
+			const pruned = pruneStaleEntries(store, maintenance.pruneAfterMs, { activeSessionKey: opts?.activeSessionKey, onPruned: ({ entry }) => {
 				rememberRemovedSessionFile(removedSessionFiles, entry);
 			} });
-			const capped = capEntryCount(store, maintenance.maxEntries, { onCapped: ({ entry }) => {
+			const capped = capEntryCount(store, maintenance.maxEntries, { activeSessionKey: opts?.activeSessionKey, onCapped: ({ entry }) => {
 				rememberRemovedSessionFile(removedSessionFiles, entry);
 			} });
 			const archivedDirs = /* @__PURE__ */ new Set();
@@ -1924,7 +1987,9 @@ async function saveSessionStoreUnlocked(storePath, store, opts) {
 		}
 	}
 	await fs.promises.mkdir(path.dirname(storePath), { recursive: true });
-	const json = JSON.stringify(store, null, 2);
+	// JOHNNESS_PATCH_SESSION_STORE_MEMORY_81: persist without runtime fields, compact (was 2-space indent).
+	store = persistableSessionStore(storePath, store);
+	const json = JSON.stringify(store);
 	if (getSerializedSessionStore(storePath) === json) {
 		updateSessionStoreWriteCaches({
 			storePath,
@@ -1976,6 +2041,9 @@ async function saveSessionStoreUnlocked(storePath, store, opts) {
 }
 async function updateSessionStore(storePath, mutator, opts) {
 	return await withSessionStoreLock(storePath, async () => {
+		// JOHNNESS_PATCH_SESSION_STORE_MEMORY_81: skipCache stays. This runs under the cross-process file lock and the cache is
+		// validated only by mtime + size, so a same-size write by another process could be missed.
+		// The re-read is ~3 MB now that runtime fields are not persisted.
 		const store = loadSessionStore(storePath, { skipCache: true });
 		const result = await mutator(store);
 		await saveSessionStoreUnlocked(storePath, store, opts);