@agentmemory/agentmemory 0.9.23 → 0.9.25

package/dist/index.mjs

@@ -4,6 +4,7 @@ import { TriggerAction, registerWorker } from "iii-sdk";
 import { constants, existsSync, mkdirSync, readFileSync, unlinkSync, writeFileSync } from "node:fs";
 import { basename, dirname, extname, join, resolve, sep } from "node:path";
 import { homedir } from "node:os";
+import { AsyncLocalStorage } from "node:async_hooks";
 import Anthropic from "@anthropic-ai/sdk";
 import { lstat, mkdir, open, readFile, readdir, stat, unlink, utimes, writeFile } from "node:fs/promises";
 import { createHash, createHmac, randomBytes, timingSafeEqual } from "node:crypto";
@@ -14,23 +15,17 @@ import { lookup } from "node:dns/promises";
 import { isIP } from "node:net";
 import { fileURLToPath } from "node:url";
 import { createServer } from "node:http";
-
 //#region \0rolldown/runtime.js
 var __defProp = Object.defineProperty;
 var __exportAll = (all, no_symbols) => {
 	let target = {};
-	for (var name in all) {
-		__defProp(target, name, {
-			get: all[name],
-			enumerable: true
-		});
-	}
-	if (!no_symbols) {
-		__defProp(target, Symbol.toStringTag, { value: "Module" });
-	}
+	for (var name in all) __defProp(target, name, {
+		get: all[name],
+		enumerable: true
+	});
+	if (!no_symbols) __defProp(target, Symbol.toStringTag, { value: "Module" });
 	return target;
 };
-
 //#endregion
 //#region src/config.ts
 function safeParseInt(value, fallback) {
@@ -232,6 +227,10 @@ function loadSnapshotConfig() {
 function isGraphExtractionEnabled() {
 	return getMergedEnv()["GRAPH_EXTRACTION_ENABLED"] === "true";
 }
+const FOLLOWUP_WINDOW_DEFAULT_SECONDS = 30;
+function getFollowupWindowSeconds() {
+	return safeParseInt(getMergedEnv()["AGENTMEMORY_FOLLOWUP_WINDOW_SECONDS"], FOLLOWUP_WINDOW_DEFAULT_SECONDS);
+}
 function isConsolidationEnabled() {
 	const env = getMergedEnv();
 	const explicit = env["CONSOLIDATION_ENABLED"];
@@ -274,11 +273,18 @@ function loadFallbackConfig() {
 		return true;
 	}) };
 }
-
 //#endregion
 //#region src/providers/agent-sdk.ts
+const sdkChildContext = new AsyncLocalStorage();
+let sdkActiveCount = 0;
+let sdkOriginalEnv;
 var AgentSDKProvider = class {
 	name = "agent-sdk";
+	sdkPromise = null;
+	loadSdk() {
+		if (!this.sdkPromise) this.sdkPromise = import("@anthropic-ai/claude-agent-sdk");
+		return this.sdkPromise;
+	}
 	async compress(systemPrompt, userPrompt) {
 		return this.query(systemPrompt, userPrompt);
 	}
@@ -286,29 +292,37 @@ var AgentSDKProvider = class {
 		return this.query(systemPrompt, userPrompt);
 	}
 	async query(systemPrompt, userPrompt) {
-		if (process.env.AGENTMEMORY_SDK_CHILD === "1") return "";
-		const prev = process.env.AGENTMEMORY_SDK_CHILD;
-		process.env.AGENTMEMORY_SDK_CHILD = "1";
-		try {
-			const { query } = await import("@anthropic-ai/claude-agent-sdk");
-			const messages = query({
-				prompt: userPrompt,
-				options: {
-					systemPrompt,
-					maxTurns: 1,
-					allowedTools: []
+		if (sdkChildContext.getStore()) return "";
+		return sdkChildContext.run(true, async () => {
+			if (sdkActiveCount === 0) {
+				sdkOriginalEnv = process.env.AGENTMEMORY_SDK_CHILD;
+				process.env.AGENTMEMORY_SDK_CHILD = "1";
+			}
+			sdkActiveCount++;
+			try {
+				const { query } = await this.loadSdk();
+				const messages = query({
+					prompt: userPrompt,
+					options: {
+						systemPrompt,
+						maxTurns: 1,
+						allowedTools: []
+					}
+				});
+				let result = "";
+				for await (const msg of messages) if (msg.type === "result") result = msg.result ?? "";
+				return result;
+			} finally {
+				sdkActiveCount--;
+				if (sdkActiveCount === 0) {
+					if (sdkOriginalEnv === void 0) delete process.env.AGENTMEMORY_SDK_CHILD;
+					else process.env.AGENTMEMORY_SDK_CHILD = sdkOriginalEnv;
+					sdkOriginalEnv = void 0;
 				}
-			});
-			let result = "";
-			for await (const msg of messages) if (msg.type === "result") result = msg.result ?? "";
-			return result;
-		} finally {
-			if (prev === void 0) delete process.env.AGENTMEMORY_SDK_CHILD;
-			else process.env.AGENTMEMORY_SDK_CHILD = prev;
-		}
+			}
+		});
 	}
 };
-
 //#endregion
 //#region src/providers/anthropic.ts
 var AnthropicProvider = class {
@@ -362,7 +376,6 @@ var AnthropicProvider = class {
 		})).content.find((b) => b.type === "text")?.text ?? "";
 	}
 };
-
 //#endregion
 //#region src/providers/_fetch.ts
 function fetchWithTimeout(url, init, timeoutMs) {
@@ -376,7 +389,6 @@ function fetchWithTimeout(url, init, timeoutMs) {
 		signal
 	}).finally(() => clearTimeout(t));
 }
-
 //#endregion
 //#region src/providers/minimax.ts
 /**
@@ -436,7 +448,6 @@ var MinimaxProvider = class {
 		return ((await response.json()).content?.find((b) => b.type === "text"))?.text ?? "";
 	}
 };
-
 //#endregion
 //#region src/providers/noop.ts
 /**
@@ -455,11 +466,6 @@ var NoopProvider = class {
 		return "";
 	}
 };
-
-//#endregion
-//#region src/providers/_openai-shared.ts
-const DEFAULT_OPENAI_BASE_URL = "https://api.openai.com";
-const DEFAULT_AZURE_API_VERSION = "2024-08-01-preview";
 function detectAzure(baseUrl) {
 	try {
 		return new URL(baseUrl).hostname.endsWith(".openai.azure.com");
@@ -519,9 +525,8 @@ function buildAuthHeaders(apiKey, isAzure) {
 	};
 }
 function normalizeBaseUrl(raw) {
-	return (raw || DEFAULT_OPENAI_BASE_URL).replace(/\/+$/, "");
+	return (raw || "https://api.openai.com").replace(/\/+$/, "");
 }
-
 //#endregion
 //#region src/providers/openai.ts
 const DEFAULT_TIMEOUT_MS = 6e4;
@@ -574,7 +579,7 @@ var OpenAIProvider = class {
 		this.baseUrl = normalizeBaseUrl(baseURL || getEnvVar("OPENAI_BASE_URL"));
 		this.reasoningEffort = getEnvVar("OPENAI_REASONING_EFFORT") || void 0;
 		this.timeoutMs = resolveTimeout();
-		this.azureApiVersion = getEnvVar("OPENAI_API_VERSION") || DEFAULT_AZURE_API_VERSION;
+		this.azureApiVersion = getEnvVar("OPENAI_API_VERSION") || "2024-08-01-preview";
 		this.isAzure = detectAzure(this.baseUrl);
 	}
 	async compress(systemPrompt, userPrompt) {
@@ -636,7 +641,6 @@ function parsePositiveInt(raw) {
 	const n = Number(trimmed);
 	return Number.isFinite(n) && n > 0 ? n : void 0;
 }
-
 //#endregion
 //#region src/providers/openrouter.ts
 var OpenRouterProvider = class {
@@ -688,7 +692,6 @@ var OpenRouterProvider = class {
 		return content;
 	}
 };
-
 //#endregion
 //#region src/providers/circuit-breaker.ts
 function positiveFinite(val, fallback) {
@@ -750,7 +753,6 @@ var CircuitBreaker = class {
 		};
 	}
 };
-
 //#endregion
 //#region src/providers/resilient.ts
 var ResilientProvider = class {
@@ -781,7 +783,6 @@ var ResilientProvider = class {
 		return this.breaker.getState();
 	}
 };
-
 //#endregion
 //#region src/providers/fallback-chain.ts
 var FallbackChainProvider = class {
@@ -806,7 +807,6 @@ var FallbackChainProvider = class {
 		throw lastError || /* @__PURE__ */ new Error("No providers available");
 	}
 };
-
 //#endregion
 //#region src/providers/embedding/gemini.ts
 const BATCH_LIMIT = 100;
@@ -862,7 +862,6 @@ function l2Normalize(vec) {
 	for (let i = 0; i < vec.length; i++) vec[i] = vec[i] / norm;
 	return vec;
 }
-
 //#endregion
 //#region src/providers/embedding/openai.ts
 const DEFAULT_MODEL$1 = "text-embedding-3-small";
@@ -936,7 +935,7 @@ var OpenAIEmbeddingProvider = class {
 		this.model = getEnvVar("OPENAI_EMBEDDING_MODEL") || DEFAULT_MODEL$1;
 		this.dimensions = resolveDimensions(this.model, getEnvVar("OPENAI_EMBEDDING_DIMENSIONS"));
 		this.isAzure = detectAzure(this.baseUrl);
-		this.azureApiVersion = getEnvVar("OPENAI_API_VERSION") || DEFAULT_AZURE_API_VERSION;
+		this.azureApiVersion = getEnvVar("OPENAI_API_VERSION") || "2024-08-01-preview";
 	}
 	async embed(text) {
 		const [result] = await this.embedBatch([text]);
@@ -958,7 +957,6 @@ var OpenAIEmbeddingProvider = class {
 		return (await response.json()).data.map((d) => new Float32Array(d.embedding));
 	}
 };
-
 //#endregion
 //#region src/providers/embedding/voyage.ts
 const API_URL$2 = "https://api.voyageai.com/v1/embeddings";
@@ -994,7 +992,6 @@ var VoyageEmbeddingProvider = class {
 		return (await response.json()).data.map((d) => new Float32Array(d.embedding));
 	}
 };
-
 //#endregion
 //#region src/providers/embedding/cohere.ts
 const API_URL$1 = "https://api.cohere.ai/v1/embed";
@@ -1030,7 +1027,6 @@ var CohereEmbeddingProvider = class {
 		return (await response.json()).embeddings.map((e) => new Float32Array(e));
 	}
 };
-
 //#endregion
 //#region src/providers/embedding/openrouter.ts
 const API_URL = "https://openrouter.ai/api/v1/embeddings";
@@ -1067,7 +1063,6 @@ var OpenRouterEmbeddingProvider = class {
 		return (await response.json()).data.map((d) => new Float32Array(d.embedding));
 	}
 };
-
 //#endregion
 //#region src/providers/embedding/local.ts
 var LocalEmbeddingProvider = class {
@@ -1096,7 +1091,6 @@ var LocalEmbeddingProvider = class {
 		return this.extractor;
 	}
 };
-
 //#endregion
 //#region src/providers/embedding/clip.ts
 const DEFAULT_MODEL = "Xenova/clip-vit-base-patch32";
@@ -1137,12 +1131,14 @@ var ClipEmbeddingProvider = class {
 	}
 	async getTextExtractor() {
 		if (this.textExtractor) return this.textExtractor;
-		this.textExtractor = await (await this.getTransformers()).pipeline("feature-extraction", this.modelId);
+		const t = await this.getTransformers();
+		this.textExtractor = await t.pipeline("feature-extraction", this.modelId);
 		return this.textExtractor;
 	}
 	async getImageExtractor() {
 		if (this.imageExtractor) return this.imageExtractor;
-		this.imageExtractor = await (await this.getTransformers()).pipeline("image-feature-extraction", this.modelId);
+		const t = await this.getTransformers();
+		this.imageExtractor = await t.pipeline("image-feature-extraction", this.modelId);
 		return this.imageExtractor;
 	}
 };
@@ -1167,7 +1163,6 @@ function normalize(vec) {
 	for (let i = 0; i < vec.length; i++) out[i] = vec[i] / norm;
 	return out;
 }
-
 //#endregion
 //#region src/providers/embedding/index.ts
 let imageEmbeddingProvider = null;
@@ -1206,7 +1201,6 @@ function withDimensionGuard(provider) {
 	if (provider.embedImage) wrapped.embedImage = async (s) => check(await provider.embedImage(s), "embedImage");
 	return wrapped;
 }
-
 //#endregion
 //#region src/providers/index.ts
 function requireEnvVar(key) {
@@ -1214,6 +1208,17 @@ function requireEnvVar(key) {
 	if (!value) throw new Error(`Missing required environment variable: ${key}. Set it in ~/.agentmemory/.env or as an environment variable.`);
 	return value;
 }
+function defaultModelFor(providerType) {
+	switch (providerType) {
+		case "openai": return getEnvVar("OPENAI_MODEL") || "gpt-4o-mini";
+		case "anthropic": return getEnvVar("ANTHROPIC_MODEL") || "claude-sonnet-4-20250514";
+		case "gemini": return getEnvVar("GEMINI_MODEL") || "gemini-2.5-flash";
+		case "openrouter": return getEnvVar("OPENROUTER_MODEL") || "anthropic/claude-sonnet-4-20250514";
+		case "minimax": return getEnvVar("MINIMAX_MODEL") || "MiniMax-M2.7";
+		case "agent-sdk": return "claude-sonnet-4-20250514";
+		default: return "noop";
+	}
+}
 function createProvider(config) {
 	return new ResilientProvider(createBaseProvider(config));
 }
@@ -1225,7 +1230,7 @@ function createFallbackProvider(config, fallbackConfig) {
 		try {
 			const fbConfig = {
 				provider: providerType,
-				model: config.model,
+				model: defaultModelFor(providerType),
 				maxTokens: config.maxTokens
 			};
 			providers.push(createBaseProvider(fbConfig));
@@ -1253,7 +1258,6 @@ function createBaseProvider(config) {
 		default: return new AgentSDKProvider();
 	}
 }
-
 //#endregion
 //#region src/state/kv.ts
 var StateKV = class {
@@ -1305,7 +1309,6 @@ var StateKV = class {
 		});
 	}
 };
-
 //#endregion
 //#region src/state/schema.ts
 const KV = {
@@ -1353,7 +1356,8 @@ const KV = {
 	slots: "mem:slots",
 	globalSlots: "mem:slots:global",
 	state: "mem:state",
-	commits: "mem:commits"
+	commits: "mem:commits",
+	recentSearches: "mem:recent-searches"
 };
 const STREAM = {
 	name: "mem-live",
@@ -1375,7 +1379,6 @@ function jaccardSimilarity(a, b) {
 	for (const word of setA) if (setB.has(word)) intersection++;
 	return intersection / (setA.size + setB.size - intersection);
 }
-
 //#endregion
 //#region src/state/vector-index.ts
 function float32ToBase64(arr) {
@@ -1498,7 +1501,6 @@ var VectorIndex = class VectorIndex {
 		return idx;
 	}
 };
-
 //#endregion
 //#region src/state/memory-utils.ts
 function memoryToObservation(memory) {
@@ -1515,7 +1517,6 @@ function memoryToObservation(memory) {
 		importance: memory.strength
 	};
 }
-
 //#endregion
 //#region src/functions/graph-retrieval.ts
 function buildGraphContext(path) {
@@ -1760,7 +1761,6 @@ var MinHeap = class {
 		}
 	}
 };
-
 //#endregion
 //#region src/logger.ts
 function fmt(level, msg, fields) {
@@ -1798,7 +1798,6 @@ function bootLog(msg) {
 	}
 	if (bootBuffer.length < 500) bootBuffer.push(msg);
 }
-
 //#endregion
 //#region src/functions/query-expansion.ts
 const QUERY_EXPANSION_SYSTEM = `You are a query expansion engine for a memory retrieval system. Given a user query, generate diverse reformulations to maximize recall.
@@ -1955,7 +1954,6 @@ function extractEntitiesFromQuery(query) {
 	}
 	return [...new Set(entities)];
 }
-
 //#endregion
 //#region src/state/reranker.ts
 let pipeline = null;
@@ -2009,7 +2007,6 @@ async function rerank(query, results, topK = 20) {
 		rerankPosition: i + 1
 	}));
 }
-
 //#endregion
 //#region src/state/hybrid-search.ts
 const RRF_K = 60;
@@ -2180,7 +2177,6 @@ var HybridSearch = class {
 		return enriched;
 	}
 };
-
 //#endregion
 //#region src/state/stemmer.ts
 const step2map = {
@@ -2276,7 +2272,6 @@ function stem(word) {
 	if (endsDoubleConsonant(w) && w.endsWith("l") && measure(w.slice(0, -1)) > 1) w = w.slice(0, -1);
 	return w;
 }
-
 //#endregion
 //#region src/state/synonyms.ts
 const SYNONYM_GROUPS = [
@@ -2438,7 +2433,6 @@ function getSynonyms(stemmedTerm) {
 	const syns = synonymMap.get(stemmedTerm);
 	return syns ? [...syns] : [];
 }
-
 //#endregion
 //#region src/state/cjk-segmenter.ts
 const cjkRequire = createRequire(import.meta.url);
@@ -2542,7 +2536,6 @@ function segmentCjk(text) {
 	}
 	return out;
 }
-
 //#endregion
 //#region src/state/search-index.ts
 var SearchIndex = class SearchIndex {
@@ -2742,18 +2735,92 @@ var SearchIndex = class SearchIndex {
 		return lo;
 	}
 };
-
+//#endregion
+//#region src/functions/audit.ts
+async function recordAudit(kv, operation, functionId, targetIds, details = {}, qualityScore, userId) {
+	const entry = {
+		id: generateId("aud"),
+		timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+		operation,
+		userId,
+		functionId,
+		targetIds,
+		details,
+		qualityScore
+	};
+	await kv.set(KV.audit, entry.id, entry);
+	return entry;
+}
+async function safeAudit(kv, operation, functionId, targetIds, details = {}, qualityScore, userId) {
+	try {
+		await recordAudit(kv, operation, functionId, targetIds, details, qualityScore, userId);
+	} catch (err) {
+		try {
+			logger.warn("audit write failed", {
+				functionId,
+				operation,
+				targetIds,
+				error: err instanceof Error ? err.message : String(err)
+			});
+		} catch {}
+	}
+}
+async function queryAudit(kv, filter) {
+	let entries = [...await kv.list(KV.audit)].sort((a, b) => new Date(b.timestamp).getTime() - new Date(a.timestamp).getTime());
+	if (filter?.operation) entries = entries.filter((e) => e.operation === filter.operation);
+	if (filter?.dateFrom) {
+		const from = new Date(filter.dateFrom).getTime();
+		if (Number.isNaN(from)) throw new Error(`Invalid dateFrom: ${filter.dateFrom}`);
+		entries = entries.filter((e) => new Date(e.timestamp).getTime() >= from);
+	}
+	if (filter?.dateTo) {
+		const to = new Date(filter.dateTo).getTime();
+		if (Number.isNaN(to)) throw new Error(`Invalid dateTo: ${filter.dateTo}`);
+		entries = entries.filter((e) => new Date(e.timestamp).getTime() <= to);
+	}
+	return entries.slice(0, filter?.limit || 100);
+}
 //#endregion
 //#region src/state/index-persistence.ts
 const DEBOUNCE_MS = 5e3;
 const FAILURE_LOG_THROTTLE_MS = 6e4;
+const INDEX_PERSISTENCE_FUNCTION_ID = "mem::index-persistence";
+const BM25_KEY = "data";
+const BM25_MANIFEST_KEY = "data:manifest";
+const BM25_SHARD_SCOPE_PREFIX = `${KV.bm25Index}:bm25:`;
+const VECTOR_KEY = "vectors";
+const VECTOR_MANIFEST_KEY = "vectors:manifest";
+const VECTOR_SHARD_SCOPE_PREFIX = `${KV.bm25Index}:vectors:`;
+const INDEX_SHARD_KEY = "data";
+const DEFAULT_INDEX_SHARD_CHARS = 2e6;
+function shardChars(options) {
+	const configured = options.shardChars;
+	if (typeof configured !== "number" || !Number.isFinite(configured)) return DEFAULT_INDEX_SHARD_CHARS;
+	const wholeChars = Math.floor(configured);
+	return wholeChars >= 1 ? wholeChars : DEFAULT_INDEX_SHARD_CHARS;
+}
+function createIndexGeneration() {
+	return generateId("idx");
+}
+function statePath(scope, key) {
+	return `${scope}/${key}`;
+}
+function errorMessage(err) {
+	return err instanceof Error ? err.message : String(err);
+}
+function isValidShardDescriptor(shard) {
+	if (!shard || typeof shard !== "object") return false;
+	const candidate = shard;
+	return typeof candidate.scope === "string" && candidate.scope.length > 0 && typeof candidate.key === "string" && candidate.key.length > 0 && Number.isInteger(candidate.chars) && candidate.chars >= 0;
+}
 var IndexPersistence = class {
 	timer = null;
 	lastFailureLogAt = 0;
-	constructor(kv, bm25, vector) {
+	constructor(kv, bm25, vector, options = {}) {
 		this.kv = kv;
 		this.bm25 = bm25;
 		this.vector = vector;
+		this.options = options;
 	}
 	scheduleSave() {
 		if (this.timer) clearTimeout(this.timer);
@@ -2767,8 +2834,8 @@ var IndexPersistence = class {
 			this.timer = null;
 		}
 		try {
-			await this.kv.set(KV.bm25Index, "data", this.bm25.serialize());
-			if (this.vector && this.vector.size > 0) await this.kv.set(KV.bm25Index, "vectors", this.vector.serialize());
+			await this.saveBm25Index(this.bm25.serialize());
+			if (this.vector) await this.saveVectorIndex(this.vector.serialize());
 		} catch (err) {
 			this.logFailure(err);
 		}
@@ -2776,9 +2843,9 @@ var IndexPersistence = class {
 	async load() {
 		let bm25 = null;
 		let vector = null;
-		const bm25Data = await this.kv.get(KV.bm25Index, "data").catch(() => null);
+		const bm25Data = await this.loadBm25Data();
 		if (bm25Data && typeof bm25Data === "string") bm25 = SearchIndex.deserialize(bm25Data);
-		const vecData = await this.kv.get(KV.bm25Index, "vectors").catch(() => null);
+		const vecData = await this.loadVectorData();
 		if (vecData && typeof vecData === "string") vector = VectorIndex.deserialize(vecData);
 		return {
 			bm25,
@@ -2803,8 +2870,190 @@ var IndexPersistence = class {
 			hint: code === "TIMEOUT" ? "iii-engine state::set timed out; recent index updates remain in memory and will retry on the next debounce flush" : void 0
 		});
 	}
+	async saveBm25Index(serialized) {
+		await this.saveShardedIndex(serialized, BM25_MANIFEST_KEY, BM25_KEY, BM25_SHARD_SCOPE_PREFIX);
+	}
+	async saveVectorIndex(serialized) {
+		await this.saveShardedIndex(serialized, VECTOR_MANIFEST_KEY, VECTOR_KEY, VECTOR_SHARD_SCOPE_PREFIX);
+	}
+	async saveShardedIndex(serialized, manifestKey, legacyKey, scopePrefix) {
+		const previous = await this.kv.get(KV.bm25Index, manifestKey).catch(() => null);
+		const generation = this.options.createGeneration?.() ?? createIndexGeneration();
+		const chunkChars = shardChars(this.options);
+		const shards = [];
+		const chunks = [];
+		for (let offset = 0; offset < serialized.length; offset += chunkChars) {
+			const shardIndex = shards.length;
+			const scope = `${scopePrefix}${generation}:${String(shardIndex).padStart(5, "0")}`;
+			const chunk = serialized.slice(offset, offset + chunkChars);
+			shards.push({
+				scope,
+				key: INDEX_SHARD_KEY,
+				chars: chunk.length
+			});
+			chunks.push(chunk);
+		}
+		const failedWrite = (await Promise.allSettled(shards.map(async (shard, index) => {
+			const chunk = chunks[index] ?? "";
+			await this.kv.set(shard.scope, shard.key, chunk);
+			await this.auditIndexPersistence("shard_write", [statePath(shard.scope, shard.key)], {
+				scope: shard.scope,
+				key: shard.key,
+				manifestKey,
+				generation,
+				chars: chunk.length
+			});
+		}))).find((result) => result.status === "rejected");
+		if (failedWrite) {
+			await this.deleteShards(shards, "shard_write_rollback");
+			throw failedWrite.reason;
+		}
+		const nextManifest = {
+			v: 1,
+			generation,
+			shards,
+			chars: serialized.length
+		};
+		try {
+			await this.kv.set(KV.bm25Index, manifestKey, nextManifest);
+			await this.auditIndexPersistence("manifest_publish", [statePath(KV.bm25Index, manifestKey)], {
+				manifestKey,
+				generation,
+				chars: serialized.length,
+				shards: shards.length,
+				result: "committed"
+			});
+		} catch (err) {
+			if (await this.isManifestPublished(manifestKey, nextManifest)) await this.auditIndexPersistence("manifest_publish", [statePath(KV.bm25Index, manifestKey)], {
+				manifestKey,
+				generation,
+				chars: serialized.length,
+				shards: shards.length,
+				result: "committed_after_error",
+				error: errorMessage(err)
+			});
+			else await this.deleteShards(shards, "manifest_publish_rollback");
+			throw err;
+		}
+		await this.deleteKey(KV.bm25Index, legacyKey, "legacy_cleanup");
+		if (previous?.v === 1 && Array.isArray(previous.shards)) {
+			const currentShardIds = new Set(shards.map((shard) => `${shard.scope}\0${shard.key}`));
+			for (const shard of previous.shards) {
+				if (currentShardIds.has(`${shard.scope}\0${shard.key}`)) continue;
+				await this.deleteShards([shard], "previous_generation_cleanup");
+			}
+		}
+	}
+	async auditIndexPersistence(action, targetIds, details) {
+		await safeAudit(this.kv, "index_persist", INDEX_PERSISTENCE_FUNCTION_ID, targetIds, {
+			action,
+			...details
+		});
+	}
+	async deleteKey(scope, key, reason) {
+		let result = "deleted";
+		let error;
+		try {
+			await this.kv.delete(scope, key);
+		} catch (err) {
+			result = "failed";
+			error = errorMessage(err);
+		}
+		await this.auditIndexPersistence("delete", [statePath(scope, key)], {
+			scope,
+			key,
+			reason,
+			result,
+			error
+		});
+	}
+	async deleteShards(shards, reason) {
+		for (const shard of shards) await this.deleteKey(shard.scope, shard.key, reason);
+	}
+	async isManifestPublished(manifestKey, expected) {
+		const published = await this.kv.get(KV.bm25Index, manifestKey).catch(() => null);
+		if (published?.v !== 1 || published.generation !== expected.generation || published.chars !== expected.chars || !Array.isArray(published.shards) || published.shards.length !== expected.shards.length) return false;
+		return published.shards.every((shard, index) => {
+			const expectedShard = expected.shards[index];
+			if (!expectedShard) return false;
+			return shard.scope === expectedShard.scope && shard.key === expectedShard.key && shard.chars === expectedShard.chars;
+		});
+	}
+	async loadBm25Data() {
+		return this.loadShardedData(BM25_KEY, BM25_MANIFEST_KEY, "BM25");
+	}
+	async loadVectorData() {
+		return this.loadShardedData(VECTOR_KEY, VECTOR_MANIFEST_KEY, "vector");
+	}
+	async loadShardedData(legacyKey, manifestKey, label) {
+		const manifest = await this.readIndexValue(KV.bm25Index, manifestKey, label, "manifest");
+		if (!manifest.ok) return null;
+		if (manifest.value !== null) return this.loadManifestData(manifest.value, label);
+		const legacy = await this.readIndexValue(KV.bm25Index, legacyKey, label, "legacy");
+		if (!legacy.ok) return null;
+		if (legacy.value && typeof legacy.value === "string") return legacy.value;
+		return null;
+	}
+	async readIndexValue(scope, key, label, source) {
+		try {
+			return {
+				ok: true,
+				value: await this.kv.get(scope, key)
+			};
+		} catch (err) {
+			logger.warn(`index persistence: ${label} ${source} read failed`, {
+				scope,
+				key,
+				message: errorMessage(err)
+			});
+			return { ok: false };
+		}
+	}
+	async loadManifestData(manifest, label) {
+		if (manifest.v !== 1 || !Array.isArray(manifest.shards) || manifest.shards.length === 0 || !Number.isInteger(manifest.chars) || manifest.chars < 0) {
+			logger.warn(`index persistence: ${label} shard manifest invalid`);
+			return null;
+		}
+		for (const shard of manifest.shards) if (!isValidShardDescriptor(shard)) {
+			logger.warn(`index persistence: ${label} shard manifest invalid`);
+			return null;
+		}
+		const loadedShards = await Promise.all(manifest.shards.map(async (shard) => ({
+			shard,
+			chunk: await this.kv.get(shard.scope, shard.key).catch(() => null)
+		})));
+		const chunks = [];
+		let chars = 0;
+		for (const { shard, chunk } of loadedShards) {
+			if (typeof chunk !== "string") {
+				logger.warn(`index persistence: ${label} shard missing`, {
+					scope: shard.scope,
+					key: shard.key
+				});
+				return null;
+			}
+			if (chunk.length !== shard.chars) {
+				logger.warn(`index persistence: ${label} shard length mismatch`, {
+					scope: shard.scope,
+					key: shard.key,
+					expected: shard.chars,
+					actual: chunk.length
+				});
+				return null;
+			}
+			chunks.push(chunk);
+			chars += chunk.length;
+		}
+		if (chars !== manifest.chars) {
+			logger.warn(`index persistence: ${label} total length mismatch`, {
+				expected: manifest.chars,
+				actual: chars
+			});
+			return null;
+		}
+		return chunks.join("");
+	}
 };
-
 //#endregion
 //#region src/functions/privacy.ts
 const PRIVATE_TAG_RE = /<private>[\s\S]*?<\/private>/gi;
@@ -2841,7 +3090,6 @@ function registerPrivacyFunction(sdk) {
 		return { output: stripPrivateData(data.input) };
 	});
 }
-
 //#endregion
 //#region src/state/keyed-mutex.ts
 const locks = /* @__PURE__ */ new Map();
@@ -2854,7 +3102,6 @@ function withKeyedLock(key, fn) {
 	});
 	return next;
 }
-
 //#endregion
 //#region src/functions/compress-synthetic.ts
 function inferType(toolName, hookType) {
@@ -2950,7 +3197,6 @@ function buildSyntheticCompression(raw) {
 	if (raw.agentId) result.agentId = raw.agentId;
 	return result;
 }
-
 //#endregion
 //#region src/functions/access-tracker.ts
 const RECENT_CAP = 20;
@@ -3021,7 +3267,6 @@ async function deleteAccessLog(kv, memoryId) {
 		});
 	} catch {}
 }
-
 //#endregion
 //#region src/functions/search.ts
 let index = null;
@@ -3377,7 +3622,6 @@ function registerSearchFunction(sdk, kv) {
 		};
 	});
 }
-
 //#endregion
 //#region src/functions/observe.ts
 function extractImage(d) {
@@ -3461,11 +3705,19 @@ function registerObserveFunction(sdk, kv, dedupMap, maxObservationsPerSession) {
 				raw.imageData = filePath;
 				const { incrementImageRef } = await Promise.resolve().then(() => image_refs_exports);
 				await incrementImageRef(kv, filePath);
-				sdk.triggerVoid("mem::disk-size-delta", { deltaBytes: bytesWritten });
-				if (process.env["AGENTMEMORY_IMAGE_EMBEDDINGS"] === "true") sdk.triggerVoid("mem::vision-embed", {
-					imageRef: filePath,
-					sessionId: payload.sessionId,
-					observationId: obsId
+				sdk.trigger({
+					function_id: "mem::disk-size-delta",
+					payload: { deltaBytes: bytesWritten },
+					action: TriggerAction.Void()
+				});
+				if (process.env["AGENTMEMORY_IMAGE_EMBEDDINGS"] === "true") sdk.trigger({
+					function_id: "mem::vision-embed",
+					payload: {
+						imageRef: filePath,
+						sessionId: payload.sessionId,
+						observationId: obsId
+					},
+					action: TriggerAction.Void()
 				});
 			}
 			try {
@@ -3474,7 +3726,11 @@ function registerObserveFunction(sdk, kv, dedupMap, maxObservationsPerSession) {
 				if (raw.imageData) {
 					const { deleteImage } = await Promise.resolve().then(() => image_store_exports);
 					const { deletedBytes } = await deleteImage(raw.imageData);
-					if (deletedBytes > 0) sdk.triggerVoid("mem::disk-size-delta", { deltaBytes: -deletedBytes });
+					if (deletedBytes > 0) sdk.trigger({
+						function_id: "mem::disk-size-delta",
+						payload: { deltaBytes: -deletedBytes },
+						action: TriggerAction.Void()
+					});
 				}
 				throw error;
 			}
@@ -3594,7 +3850,6 @@ function registerObserveFunction(sdk, kv, dedupMap, maxObservationsPerSession) {
 		});
 	});
 }
-
 //#endregion
 //#region src/utils/image-store.ts
 var image_store_exports = /* @__PURE__ */ __exportAll({
@@ -3671,7 +3926,6 @@ async function touchImage(filePath) {
 		}
 	} catch (err) {}
 }
-
 //#endregion
 //#region src/functions/image-refs.ts
 var image_refs_exports = /* @__PURE__ */ __exportAll({
@@ -3697,11 +3951,14 @@ async function decrementImageRef(kv, sdk, filePath) {
 			await kv.delete(KV.imageEmbeddings, filePath);
 			await kv.delete(KV.imageRefs, filePath);
 			const { deletedBytes } = await deleteImage(filePath);
-			if (deletedBytes > 0) sdk.triggerVoid("mem::disk-size-delta", { deltaBytes: -deletedBytes });
+			if (deletedBytes > 0) sdk.trigger({
+				function_id: "mem::disk-size-delta",
+				payload: { deltaBytes: -deletedBytes },
+				action: TriggerAction.Void()
+			});
 		} else await kv.set(KV.imageRefs, filePath, current - 1);
 	});
 }
-
 //#endregion
 //#region src/functions/image-quota-cleanup.ts
 const GRACE_PERIOD_MS = 3e4;
@@ -3761,7 +4018,11 @@ function registerImageQuotaCleanup(sdk, kv) {
 					if (refCount > 0) return;
 					const { deletedBytes } = await deleteImage(f.filePath);
 					if (deletedBytes > 0) {
-						sdk.triggerVoid("mem::disk-size-delta", { deltaBytes: -deletedBytes });
+						sdk.trigger({
+							function_id: "mem::disk-size-delta",
+							payload: { deltaBytes: -deletedBytes },
+							action: TriggerAction.Void()
+						});
 						totalToFree -= deletedBytes;
 						freedBytes += deletedBytes;
 						evicted++;
@@ -3783,53 +4044,6 @@ function registerImageQuotaCleanup(sdk, kv) {
 		});
 	});
 }
-
-//#endregion
-//#region src/functions/audit.ts
-async function recordAudit(kv, operation, functionId, targetIds, details = {}, qualityScore, userId) {
-	const entry = {
-		id: generateId("aud"),
-		timestamp: (/* @__PURE__ */ new Date()).toISOString(),
-		operation,
-		userId,
-		functionId,
-		targetIds,
-		details,
-		qualityScore
-	};
-	await kv.set(KV.audit, entry.id, entry);
-	return entry;
-}
-async function safeAudit(kv, operation, functionId, targetIds, details = {}, qualityScore, userId) {
-	try {
-		await recordAudit(kv, operation, functionId, targetIds, details, qualityScore, userId);
-	} catch (err) {
-		try {
-			logger.warn("audit write failed", {
-				functionId,
-				operation,
-				targetIds,
-				error: err instanceof Error ? err.message : String(err)
-			});
-		} catch {}
-	}
-}
-async function queryAudit(kv, filter) {
-	let entries = [...await kv.list(KV.audit)].sort((a, b) => new Date(b.timestamp).getTime() - new Date(a.timestamp).getTime());
-	if (filter?.operation) entries = entries.filter((e) => e.operation === filter.operation);
-	if (filter?.dateFrom) {
-		const from = new Date(filter.dateFrom).getTime();
-		if (Number.isNaN(from)) throw new Error(`Invalid dateFrom: ${filter.dateFrom}`);
-		entries = entries.filter((e) => new Date(e.timestamp).getTime() >= from);
-	}
-	if (filter?.dateTo) {
-		const to = new Date(filter.dateTo).getTime();
-		if (Number.isNaN(to)) throw new Error(`Invalid dateTo: ${filter.dateTo}`);
-		entries = entries.filter((e) => new Date(e.timestamp).getTime() <= to);
-	}
-	return entries.slice(0, filter?.limit || 100);
-}
-
 //#endregion
 //#region src/functions/vision-search.ts
 function registerVisionSearchFunctions(sdk, kv, imageProvider) {
@@ -3953,7 +4167,6 @@ function cosine(a, b) {
 	const denom = Math.sqrt(normA) * Math.sqrt(normB);
 	return denom === 0 ? 0 : dot / denom;
 }
-
 //#endregion
 //#region src/functions/slots.ts
 const DEFAULT_SIZE_LIMIT = 2e3;
@@ -4392,7 +4605,6 @@ function registerSlotsFunctions(sdk, kv) {
 		};
 	});
 }
-
 //#endregion
 //#region src/functions/disk-size-manager.ts
 const DISK_SIZE_KEY = "system:currentDiskSize";
@@ -4407,7 +4619,11 @@ function registerDiskSizeManager(sdk, kv) {
 			if (newTotal < 0) newTotal = 0;
 			await kv.set(KV.state, DISK_SIZE_KEY, newTotal);
 			if (data.deltaBytes > 0 && newTotal > getMaxBytes()) {
-				sdk.triggerVoid("mem::image-quota-cleanup", {});
+				sdk.trigger({
+					function_id: "mem::image-quota-cleanup",
+					payload: {},
+					action: TriggerAction.Void()
+				});
 				logger.info("Disk quota exceeded, cleanup triggered", {
 					currentBytes: newTotal,
 					maxBytes: getMaxBytes()
@@ -4420,7 +4636,6 @@ function registerDiskSizeManager(sdk, kv) {
 		});
 	});
 }
-
 //#endregion
 //#region src/prompts/compression.ts
 const COMPRESSION_SYSTEM = `You are a memory compression engine for an AI coding agent. Your job is to extract the essential information from a tool usage observation and compress it into structured data.
@@ -4468,7 +4683,6 @@ function buildCompressionPrompt(observation) {
 function truncate$1(s, max) {
 	return s.length > max ? s.slice(0, max) + "\n[...truncated]" : s;
 }
-
 //#endregion
 //#region src/prompts/vision.ts
 const VISION_DESCRIPTION_PROMPT = `Describe what this image shows in the context of software development. Extract:
@@ -4479,7 +4693,6 @@ const VISION_DESCRIPTION_PROMPT = `Describe what this image shows in the context
 - Text content visible in the image
 
 Be concise but preserve all technically relevant details. Output plain text, no XML.`;
-
 //#endregion
 //#region src/prompts/xml.ts
 const VALID_TAG = /^[a-zA-Z_][a-zA-Z0-9_-]*$/;
@@ -4498,7 +4711,6 @@ function getXmlChildren(xml, parentTag, childTag) {
 	while ((m = re.exec(parentMatch[1])) !== null) items.push(m[1].trim());
 	return items;
 }
-
 //#endregion
 //#region src/eval/schemas.ts
 const HookTypeEnum = z.enum([
@@ -4531,7 +4743,7 @@ const ObservationTypeEnum = z.enum([
 	"task",
 	"other"
 ]);
-const ObserveInputSchema = z.object({
+z.object({
 	hookType: HookTypeEnum,
 	sessionId: z.string().min(1),
 	project: z.string().min(1),
@@ -4556,16 +4768,16 @@ const SummaryOutputSchema = z.object({
 	filesModified: z.array(z.string()),
 	concepts: z.array(z.string())
 });
-const SearchInputSchema = z.object({
+z.object({
 	query: z.string().min(1),
 	limit: z.number().int().positive().optional()
 });
-const ContextInputSchema = z.object({
+z.object({
 	sessionId: z.string().min(1),
 	project: z.string().min(1),
 	budget: z.number().positive().optional()
 });
-const RememberInputSchema = z.object({
+z.object({
 	content: z.string().min(1),
 	type: z.enum([
 		"pattern",
@@ -4578,22 +4790,22 @@ const RememberInputSchema = z.object({
 	concepts: z.array(z.string()).optional(),
 	files: z.array(z.string()).optional()
 });
-const SmartSearchInputSchema = z.object({
+z.object({
 	query: z.string().optional(),
 	expandIds: z.array(z.string()).optional(),
 	limit: z.number().int().positive().optional()
 });
-const TimelineInputSchema = z.object({
+z.object({
 	anchor: z.string().min(1),
 	project: z.string().optional(),
 	before: z.number().int().nonnegative().optional(),
 	after: z.number().int().nonnegative().optional()
 });
-const ProfileInputSchema = z.object({
+z.object({
 	project: z.string().min(1),
 	refresh: z.boolean().optional()
 });
-const RelateInputSchema = z.object({
+z.object({
 	sourceId: z.string().min(1),
 	targetId: z.string().min(1),
 	type: z.enum([
@@ -4604,12 +4816,12 @@ const RelateInputSchema = z.object({
 		"related"
 	])
 });
-const EvolveInputSchema = z.object({
+z.object({
 	memoryId: z.string().min(1),
 	newContent: z.string().min(1),
 	newTitle: z.string().optional()
 });
-const ExportImportInputSchema = z.object({
+z.object({
 	exportData: z.object({
 		version: z.union([z.literal("0.3.0"), z.literal("0.4.0")]),
 		exportedAt: z.string(),
@@ -4625,7 +4837,6 @@ const ExportImportInputSchema = z.object({
 		"skip"
 	]).optional()
 });
-
 //#endregion
 //#region src/eval/validator.ts
 function validateInput(schema, data, functionId) {
@@ -4648,7 +4859,6 @@ function validateInput(schema, data, functionId) {
 function validateOutput(schema, data, functionId) {
 	return validateInput(schema, data, functionId);
 }
-
 //#endregion
 //#region src/eval/quality.ts
 function scoreCompression(obs) {
@@ -4672,7 +4882,6 @@ function scoreSummary(summary) {
 	if (summary.concepts && summary.concepts.length > 0) score += 15;
 	return Math.min(100, score);
 }
-
 //#endregion
 //#region src/eval/self-correct.ts
 const STRICTER_SUFFIX = `
@@ -4696,7 +4905,6 @@ async function compressWithRetry(provider, systemPrompt, userPrompt, validator,
 		retried: true
 	};
 }
-
 //#endregion
 //#region src/functions/compress.ts
 const VALID_TYPES$1 = new Set([
@@ -4877,7 +5085,6 @@ function registerCompressFunction(sdk, kv, provider, metricsStore) {
 		}
 	});
 }
-
 //#endregion
 //#region src/functions/context.ts
 function estimateTokens$1(text) {
@@ -5002,7 +5209,6 @@ function registerContextFunction(sdk, kv, tokenBudget) {
 		};
 	});
 }
-
 //#endregion
 //#region src/prompts/summary.ts
 const SUMMARY_SYSTEM = `You are a session summarizer for an AI coding agent's memory system. Given all compressed observations from a coding session, produce a concise session summary.
@@ -5074,7 +5280,6 @@ Concepts: ${concepts}`;
 	});
 	return `Partial summaries (${partials.length} chunks of one session, chronological):\n\n${sections.join("\n\n---\n\n")}`;
 }
-
 //#endregion
 //#region src/functions/summarize.ts
 const CHUNK_SIZE_DEFAULT = 400;
@@ -5163,18 +5368,29 @@ async function produceSummaryXml(provider, compressed, sessionId, project) {
 		skipped
 	};
 }
+function stripXmlWrappers(raw) {
+	if (!raw) return "";
+	let cleaned = raw.trim();
+	cleaned = cleaned.replace(/```\s*xml\s*\n?/gi, "");
+	cleaned = cleaned.replace(/```/g, "");
+	cleaned = cleaned.trim();
+	const rootMatch = cleaned.match(/(<[a-zA-Z_][a-zA-Z0-9_-]*>[\s\S]*<\/[a-zA-Z_][a-zA-Z0-9_-]*>)/);
+	if (rootMatch && rootMatch[1]) return rootMatch[1].trim();
+	return cleaned;
+}
 function parseSummaryXml(xml, sessionId, project, obsCount) {
-	const title = getXmlTag(xml, "title");
+	const cleaned = stripXmlWrappers(xml);
+	const title = getXmlTag(cleaned, "title");
 	if (!title) return null;
 	return {
 		sessionId,
 		project,
 		createdAt: (/* @__PURE__ */ new Date()).toISOString(),
 		title,
-		narrative: getXmlTag(xml, "narrative"),
-		keyDecisions: getXmlChildren(xml, "decisions", "decision"),
-		filesModified: getXmlChildren(xml, "files", "file"),
-		concepts: getXmlChildren(xml, "concepts", "concept"),
+		narrative: getXmlTag(cleaned, "narrative"),
+		keyDecisions: getXmlChildren(cleaned, "decisions", "decision"),
+		filesModified: getXmlChildren(cleaned, "files", "file"),
+		concepts: getXmlChildren(cleaned, "concepts", "concept"),
 		observationCount: obsCount
 	};
 }
@@ -5211,27 +5427,44 @@ function registerSummarizeFunction(sdk, kv, provider, metricsStore) {
 			};
 		}
 		try {
-			const { response, mode, chunks } = await produceSummaryXml(provider, compressed, sessionId, session.project);
+			let summary = null;
+			let response = "";
+			let mode = "single";
+			let chunks = 1;
+			for (let attempt = 1; attempt <= 2; attempt++) {
+				const produced = await produceSummaryXml(provider, compressed, sessionId, session.project);
+				response = produced.response;
+				mode = produced.mode;
+				chunks = produced.chunks;
+				if (!response || !response.trim()) {
+					logger.warn("Empty provider response on summarize", {
+						sessionId,
+						provider: provider.name,
+						mode,
+						chunks,
+						observationCount: compressed.length,
+						attempt
+					});
+					continue;
+				}
+				summary = parseSummaryXml(response, sessionId, session.project, compressed.length);
+				if (summary) break;
+				logger.warn("Failed to parse summary XML", {
+					sessionId,
+					attempt
+				});
+			}
 			if (!response || !response.trim()) {
 				const latencyMs = Date.now() - startMs;
 				if (metricsStore) await metricsStore.record("mem::summarize", latencyMs, false);
-				logger.warn("Empty provider response on summarize", {
-					sessionId,
-					provider: provider.name,
-					mode,
-					chunks,
-					observationCount: compressed.length
-				});
 				return {
 					success: false,
 					error: "empty_provider_response"
 				};
 			}
-			const summary = parseSummaryXml(response, sessionId, session.project, compressed.length);
 			if (!summary) {
 				const latencyMs = Date.now() - startMs;
 				if (metricsStore) await metricsStore.record("mem::summarize", latencyMs, false);
-				logger.warn("Failed to parse summary XML", { sessionId });
 				return {
 					success: false,
 					error: "parse_failed"
@@ -5292,7 +5525,6 @@ function registerSummarizeFunction(sdk, kv, provider, metricsStore) {
 		}
 	});
 }
-
 //#endregion
 //#region src/functions/migrate.ts
 const ALLOWED_DIRS = [resolve(homedir(), ".agentmemory")];
@@ -5493,7 +5725,6 @@ function safeJsonParse(value, fallback) {
 	}
 	return fallback;
 }
-
 //#endregion
 //#region src/functions/file-index.ts
 function registerFileIndexFunction(sdk, kv) {
@@ -5563,7 +5794,6 @@ function registerFileIndexFunction(sdk, kv) {
 		return { context };
 	});
 }
-
 //#endregion
 //#region src/functions/consolidate.ts
 const CONSOLIDATION_SYSTEM = `You are a memory consolidation engine. Given a set of related observations from coding sessions, synthesize them into a single long-term memory.
@@ -5715,7 +5945,6 @@ function registerConsolidateFunction(sdk, kv, provider) {
 		};
 	});
 }
-
 //#endregion
 //#region src/functions/patterns.ts
 function registerPatternsFunction(sdk, kv) {
@@ -5799,7 +6028,6 @@ function registerPatternsFunction(sdk, kv) {
 		return { rules };
 	});
 }
-
 //#endregion
 //#region src/functions/remember.ts
 function registerRememberFunction(sdk, kv) {
@@ -5960,7 +6188,6 @@ function registerRememberFunction(sdk, kv) {
 		};
 	});
 }
-
 //#endregion
 //#region src/functions/evict.ts
 const MS_PER_DAY$1 = 1440 * 60 * 1e3;
@@ -6191,7 +6418,6 @@ function registerEvictFunction(sdk, kv) {
 		return stats;
 	});
 }
-
 //#endregion
 //#region src/functions/relations.ts
 function computeConfidence(source, target, relationType) {
@@ -6379,7 +6605,6 @@ function registerRelationsFunction(sdk, kv) {
 		return { results: result };
 	});
 }
-
 //#endregion
 //#region src/functions/timeline.ts
 function registerTimelineFunction(sdk, kv) {
@@ -6461,9 +6686,78 @@ async function findByKeyword(kv, keyword, project) {
 	}
 	return matches.sort((a, b) => new Date(b.timestamp).getTime() - new Date(a.timestamp).getTime());
 }
-
+//#endregion
+//#region src/version.ts
+const VERSION = "0.9.25";
+//#endregion
+//#region src/telemetry/setup.ts
+const OTEL_CONFIG = {
+	serviceName: "agentmemory",
+	serviceVersion: VERSION,
+	metricsExportIntervalMs: 3e4
+};
+let counters = null;
+let histograms = null;
+const NOOP_COUNTER = { add: () => {} };
+const NOOP_HISTOGRAM = { record: () => {} };
+const COUNTER_NAMES = [
+	["observationsTotal", "observations.total"],
+	["compressionSuccess", "compression.success"],
+	["compressionFailure", "compression.failure"],
+	["searchTotal", "search.total"],
+	["dedupSkipped", "dedup.skipped"],
+	["evictionTotal", "eviction.total"],
+	["circuitBreakerOpen", "circuit_breaker.open"],
+	["embeddingSuccess", "embedding.success"],
+	["embeddingFailure", "embedding.failure"],
+	["vectorSearchTotal", "vector_search.total"],
+	["autoForgetTotal", "auto_forget.total"],
+	["profileGenerated", "profile.generated"],
+	["claudeBridgeSync", "claude_bridge.sync"],
+	["graphExtraction", "graph.extraction"],
+	["consolidationRun", "consolidation.run"],
+	["teamShare", "team.share"],
+	["auditLog", "audit.log"],
+	["snapshotCreate", "snapshot.create"],
+	["governanceDelete", "governance.delete"],
+	["smartSearchFollowupWithinWindow", "smart_search.followup_within_window_total"],
+	["readerFailureWithEvidence", "reader_failure_with_evidence_total"]
+];
+const HISTOGRAM_NAMES = [
+	["compressionLatency", "compression.latency_ms"],
+	["searchLatency", "search.latency_ms"],
+	["contextTokens", "context.tokens"],
+	["qualityScore", "quality.score"],
+	["embeddingLatency", "embedding.latency_ms"],
+	["vectorSearchLatency", "vector_search.latency_ms"]
+];
+function getCounters() {
+	if (counters) return counters;
+	return Object.fromEntries(COUNTER_NAMES.map(([key]) => [key, NOOP_COUNTER]));
+}
+function initMetrics(getMeter) {
+	const meter = getMeter?.("agentmemory");
+	counters = Object.fromEntries(COUNTER_NAMES.map(([key, name]) => [key, meter ? meter.createCounter(name) : NOOP_COUNTER]));
+	histograms = Object.fromEntries(HISTOGRAM_NAMES.map(([key, name]) => [key, meter ? meter.createHistogram(name) : NOOP_HISTOGRAM]));
+	return {
+		counters,
+		histograms
+	};
+}
 //#endregion
 //#region src/functions/smart-search.ts
+const followupStats = {
+	followupWithinWindow: 0,
+	agentInitiatedSearches: 0
+};
+const pendingFollowups = /* @__PURE__ */ new Set();
+function getFollowupStats() {
+	const total = followupStats.agentInitiatedSearches;
+	return {
+		...followupStats,
+		rate: total > 0 ? followupStats.followupWithinWindow / total : 0
+	};
+}
 const LESSON_CONTENT_PREVIEW_CHARS = 240;
 function registerSmartSearchFunction(sdk, kv, searchFn) {
 	sdk.registerFunction("mem::smart-search", async (data) => {
@@ -6525,6 +6819,21 @@ function registerSmartSearchFunction(sdk, kv, searchFn) {
 			timestamp: r.observation.timestamp
 		}));
 		recordAccessBatch(kv, compact.map((r) => r.obsId));
+		if (data.sessionId && typeof data.sessionId === "string" && data.source !== "viewer" && compact.length > 0) {
+			followupStats.agentInitiatedSearches++;
+			const sessionIdForFollowup = data.sessionId;
+			const queryForFollowup = data.query;
+			const compactForFollowup = compact;
+			const detection = withKeyedLock(`recent-searches:${sessionIdForFollowup}`, () => detectFollowup(kv, sessionIdForFollowup, queryForFollowup, compactForFollowup)).catch((err) => {
+				logger.warn("Smart search followup detection failed", {
+					sessionId: sessionIdForFollowup,
+					error: err instanceof Error ? err.message : String(err)
+				});
+			}).finally(() => {
+				pendingFollowups.delete(detection);
+			});
+			pendingFollowups.add(detection);
+		}
 		logger.info("Smart search compact", {
 			query: data.query,
 			results: compact.length,
@@ -6563,6 +6872,35 @@ async function recallLessons(sdk, query, limit, project) {
 		return [];
 	}
 }
+async function detectFollowup(kv, sessionId, query, compact) {
+	const now = Date.now();
+	const windowMs = Math.max(1, getFollowupWindowSeconds()) * 1e3;
+	const currentIds = compact.map((r) => r.obsId);
+	const current = {
+		sessionId,
+		query,
+		resultIds: currentIds,
+		at: now
+	};
+	const prior = await kv.get(KV.recentSearches, sessionId).catch(() => null);
+	await kv.set(KV.recentSearches, sessionId, current);
+	if (!prior || typeof prior.at !== "number") return;
+	if (now - prior.at > windowMs) return;
+	if (typeof prior.query === "string" && prior.query === query) return;
+	const priorIds = Array.isArray(prior.resultIds) ? prior.resultIds : [];
+	const priorSet = new Set(priorIds);
+	if (currentIds.some((id) => priorSet.has(id))) return;
+	getCounters().smartSearchFollowupWithinWindow.add(1);
+	followupStats.followupWithinWindow++;
+	logger.info("Smart search followup detected", {
+		sessionId,
+		windowSeconds: Math.round(windowMs / 1e3),
+		priorQuery: prior.query,
+		nextQuery: query,
+		priorResultCount: priorIds.length,
+		nextResultCount: currentIds.length
+	});
+}
 async function findObservation$1(kv, obsId, sessionIdHint) {
 	if (sessionIdHint) {
 		const obs = await kv.get(KV.observations(sessionIdHint), obsId).catch(() => null);
@@ -6576,7 +6914,52 @@ async function findObservation$1(kv, obsId, sessionIdHint) {
 	}
 	return null;
 }
-
+//#endregion
+//#region src/functions/recent-searches-sweep.ts
+const RETENTION_MS = 1440 * 60 * 1e3;
+function registerRecentSearchesSweepFunction(sdk, kv) {
+	sdk.registerFunction("mem::diagnostic::recent-searches-sweep", async () => {
+		const cutoff = Date.now() - RETENTION_MS;
+		const rows = await kv.list(KV.recentSearches).catch(() => []);
+		let swept = 0;
+		let skipped = 0;
+		for (const row of rows) {
+			if (!row || typeof row.sessionId !== "string" || !row.sessionId) {
+				skipped++;
+				continue;
+			}
+			if ((typeof row.at === "number" ? row.at : 0) >= cutoff) continue;
+			try {
+				await kv.delete(KV.recentSearches, row.sessionId);
+				swept++;
+			} catch (err) {
+				logger.warn("recent-searches sweep delete failed", {
+					sessionId: row.sessionId,
+					error: err instanceof Error ? err.message : String(err)
+				});
+			}
+		}
+		if (swept > 0 || skipped > 0) logger.info("Recent-searches sweep complete", {
+			swept,
+			skipped
+		});
+		return {
+			success: true,
+			swept,
+			skipped
+		};
+	});
+	sdk.registerFunction("mem::diagnostic::followup-stats", async () => {
+		const stats = getFollowupStats();
+		return {
+			success: true,
+			windowSeconds: getFollowupWindowSeconds(),
+			agentInitiatedSearches: stats.agentInitiatedSearches,
+			followupWithinWindow: stats.followupWithinWindow,
+			rate: stats.rate
+		};
+	});
+}
 //#endregion
 //#region src/functions/profile.ts
 function registerProfileFunction(sdk, kv) {
@@ -6664,7 +7047,6 @@ function extractConventions(concepts, files) {
 	for (const { concept, frequency } of concepts.slice(0, 5)) if (frequency >= 3) conventions.push(`Frequently uses: ${concept}`);
 	return conventions;
 }
-
 //#endregion
 //#region src/functions/auto-forget.ts
 const MS_PER_DAY = 1440 * 60 * 1e3;
@@ -6790,11 +7172,6 @@ function registerAutoForgetFunction(sdk, kv) {
 		return result;
 	});
 }
-
-//#endregion
-//#region src/version.ts
-const VERSION = "0.9.23";
-
 //#endregion
 //#region src/functions/export-import.ts
 function registerExportImportFunction(sdk, kv) {
@@ -6934,7 +7311,9 @@ function registerExportImportFunction(sdk, kv) {
 			"0.9.20",
 			"0.9.21",
 			"0.9.22",
-			"0.9.23"
+			"0.9.23",
+			"0.9.24",
+			"0.9.25"
 		]).has(importData.version)) return {
 			success: false,
 			error: `Unsupported export version: ${importData.version}`
@@ -7252,7 +7631,6 @@ function registerExportImportFunction(sdk, kv) {
 		};
 	});
 }
-
 //#endregion
 //#region src/functions/enrich.ts
 const MAX_CONTEXT_LENGTH = 4e3;
@@ -7313,7 +7691,6 @@ function registerEnrichFunction(sdk, kv) {
 		};
 	});
 }
-
 //#endregion
 //#region src/functions/claude-bridge.ts
 function parseMemoryMd(content) {
@@ -7434,7 +7811,6 @@ function registerClaudeBridgeFunction(sdk, kv, config) {
 		}
 	});
 }
-
 //#endregion
 //#region src/prompts/graph-extraction.ts
 const GRAPH_EXTRACTION_SYSTEM = `You are a knowledge graph extraction engine. Given a compressed observation from a coding session, extract entities and relationships.
@@ -7457,9 +7833,41 @@ Rules:
 function buildGraphExtractionPrompt(observations) {
 	return `Extract entities and relationships from these observations:\n\n${observations.map((o, i) => `[${i + 1}] Type: ${o.type}\nTitle: ${o.title}\nNarrative: ${o.narrative}\nConcepts: ${(o.concepts ?? []).join(", ")}\nFiles: ${(o.files ?? []).join(", ")}`).join("\n\n")}`;
 }
-
 //#endregion
 //#region src/functions/graph.ts
+const DEFAULT_GRAPH_QUERY_LIMIT = 500;
+const MAX_GRAPH_QUERY_LIMIT = 5e3;
+function resolvePagination(rawLimit, rawOffset) {
+	return {
+		limit: Math.max(1, Math.min(typeof rawLimit === "number" && Number.isFinite(rawLimit) ? Math.floor(rawLimit) : DEFAULT_GRAPH_QUERY_LIMIT, MAX_GRAPH_QUERY_LIMIT)),
+		offset: Math.max(0, typeof rawOffset === "number" && Number.isFinite(rawOffset) ? Math.floor(rawOffset) : 0)
+	};
+}
+function rankByDegree(nodes, edges) {
+	const degree = /* @__PURE__ */ new Map();
+	for (const edge of edges) {
+		degree.set(edge.sourceNodeId, (degree.get(edge.sourceNodeId) ?? 0) + 1);
+		degree.set(edge.targetNodeId, (degree.get(edge.targetNodeId) ?? 0) + 1);
+	}
+	return [...nodes].sort((a, b) => (degree.get(b.id) ?? 0) - (degree.get(a.id) ?? 0));
+}
+function paginate(nodes, allEdges, depth, limit, offset) {
+	const totalNodes = nodes.length;
+	const pageNodes = nodes.slice(offset, offset + limit);
+	const pageNodeIds = new Set(pageNodes.map((n) => n.id));
+	const pageEdges = allEdges.filter((e) => pageNodeIds.has(e.sourceNodeId) && pageNodeIds.has(e.targetNodeId));
+	const universeIds = new Set(nodes.map((n) => n.id));
+	return {
+		nodes: pageNodes,
+		edges: pageEdges,
+		depth,
+		totalNodes,
+		totalEdges: allEdges.reduce((count, e) => universeIds.has(e.sourceNodeId) && universeIds.has(e.targetNodeId) ? count + 1 : count, 0),
+		truncated: totalNodes > pageNodes.length,
+		limit,
+		offset
+	};
+}
 function parseAttrs(raw) {
 	const attrs = {};
 	const attrRegex = /([A-Za-z_][\w:-]*)="([^"]*)"/g;
@@ -7596,15 +8004,10 @@ function registerGraphFunction(sdk, kv, provider) {
 		const allNodes = (await kv.list(KV.graphNodes)).filter((n) => !n.stale);
 		const allEdges = (await kv.list(KV.graphEdges)).filter((e) => !e.stale);
 		const maxDepth = Math.min(data.maxDepth || 3, 5);
+		const { limit, offset } = resolvePagination(data.limit, data.offset);
 		if (data.query) {
 			const lower = data.query.toLowerCase();
-			const matchingNodes = allNodes.filter((n) => n.name.toLowerCase().includes(lower) || Object.values(n.properties).some((v) => typeof v === "string" && v.toLowerCase().includes(lower)));
-			const nodeIds = new Set(matchingNodes.map((n) => n.id));
-			return {
-				nodes: matchingNodes,
-				edges: allEdges.filter((e) => nodeIds.has(e.sourceNodeId) || nodeIds.has(e.targetNodeId)),
-				depth: 0
-			};
+			return paginate(allNodes.filter((n) => n.name.toLowerCase().includes(lower) || Object.values(n.properties).some((v) => typeof v === "string" && v.toLowerCase().includes(lower))), allEdges, 0, limit, offset);
 		}
 		if (data.startNodeId) {
 			const visited = /* @__PURE__ */ new Set();
@@ -7636,19 +8039,11 @@ function registerGraphFunction(sdk, kv, provider) {
 					});
 				}
 			}
-			return {
-				nodes: resultNodes,
-				edges: resultEdges,
-				depth: maxDepth
-			};
+			return paginate(resultNodes, resultEdges, maxDepth, limit, offset);
 		}
 		let filtered = allNodes;
 		if (data.nodeType) filtered = allNodes.filter((n) => n.type === data.nodeType);
-		return {
-			nodes: filtered,
-			edges: allEdges,
-			depth: 0
-		};
+		return paginate(rankByDegree(filtered, allEdges), allEdges, 0, limit, offset);
 	});
 	sdk.registerFunction("mem::graph-stats", async () => {
 		const nodes = await kv.list(KV.graphNodes);
@@ -7665,7 +8060,6 @@ function registerGraphFunction(sdk, kv, provider) {
 		};
 	});
 }
-
 //#endregion
 //#region src/prompts/consolidation.ts
 const SEMANTIC_MERGE_SYSTEM = `You are a memory consolidation engine. Given overlapping episodic memories (session summaries), extract stable factual knowledge.
@@ -7700,7 +8094,6 @@ Rules:
 function buildProceduralExtractionPrompt(patterns) {
 	return `Extract reusable procedures from these recurring patterns:\n\n${patterns.map((p, i) => `[Pattern ${i + 1}] (seen ${p.frequency}x)\n${p.content}`).join("\n\n")}`;
 }
-
 //#endregion
 //#region src/functions/consolidation-pipeline.ts
 function applyDecay(items, decayDays) {
@@ -7894,7 +8287,6 @@ function registerConsolidationPipelineFunction(sdk, kv, provider) {
 		};
 	});
 }
-
 //#endregion
 //#region src/functions/team.ts
 const VALID_ITEM_TYPES = new Set([
@@ -7998,7 +8390,6 @@ function registerTeamFunction(sdk, kv, config) {
 		return profile;
 	});
 }
-
 //#endregion
 //#region src/functions/governance.ts
 function registerGovernanceFunction(sdk, kv) {
@@ -8107,7 +8498,6 @@ function registerGovernanceFunction(sdk, kv) {
 		return queryAudit(kv, data);
 	});
 }
-
 //#endregion
 //#region src/functions/snapshot.ts
 const COMMIT_HASH_RE = /^[0-9a-f]{7,40}$/i;
@@ -8272,7 +8662,6 @@ function registerSnapshotFunction(sdk, kv, snapshotDir) {
 		}
 	});
 }
-
 //#endregion
 //#region src/functions/actions.ts
 function registerActionsFunction(sdk, kv) {
@@ -8474,7 +8863,6 @@ async function propagateCompletion(kv, completedActionId) {
 		});
 	}
 }
-
 //#endregion
 //#region src/functions/frontier.ts
 function registerFrontierFunction(sdk, kv) {
@@ -8579,7 +8967,6 @@ function computeScore(action, edges, now) {
 	if (action.status === "active") score += 15;
 	return Math.round(score * 100) / 100;
 }
-
 //#endregion
 //#region src/functions/leases.ts
 const DEFAULT_LEASE_TTL_MS = 600 * 1e3;
@@ -8760,7 +9147,6 @@ function registerLeasesFunction(sdk, kv) {
 		};
 	});
 }
-
 //#endregion
 //#region src/functions/routines.ts
 function registerRoutinesFunction(sdk, kv) {
@@ -9007,7 +9393,6 @@ function registerRoutinesFunction(sdk, kv) {
 		});
 	});
 }
-
 //#endregion
 //#region src/functions/signals.ts
 function registerSignalsFunction(sdk, kv) {
@@ -9139,7 +9524,6 @@ function registerSignalsFunction(sdk, kv) {
 		};
 	});
 }
-
 //#endregion
 //#region src/functions/checkpoints.ts
 function registerCheckpointsFunction(sdk, kv) {
@@ -9312,7 +9696,6 @@ function registerCheckpointsFunction(sdk, kv) {
 		};
 	});
 }
-
 //#endregion
 //#region src/functions/flow-compress.ts
 const FLOW_COMPRESS_SYSTEM = `You are a workflow summarizer. Given a completed action chain, produce a concise summary capturing:
@@ -9457,7 +9840,6 @@ function extractFiles(actions) {
 	}
 	return Array.from(files);
 }
-
 //#endregion
 //#region src/functions/mesh.ts
 function isPrivateIP(ip) {
@@ -9774,7 +10156,6 @@ async function applySyncData(kv, data, scopes) {
 	if (scopes.includes("graph:edges")) applied += await lwwMergeList(kv, KV.graphEdges, data.graphEdges, "mem:gedge", "createdAt");
 	return applied;
 }
-
 //#endregion
 //#region src/functions/branch-aware.ts
 function execAsync(cmd, args, cwd) {
@@ -9889,7 +10270,6 @@ function registerBranchAwareFunction(sdk, kv) {
 		};
 	});
 }
-
 //#endregion
 //#region src/functions/sentinels.ts
 const VALID_TYPES = [
@@ -10210,7 +10590,6 @@ async function unblockLinkedActions(kv, sentinel) {
 	});
 	return unblockedCount;
 }
-
 //#endregion
 //#region src/functions/sketches.ts
 function registerSketchesFunction(sdk, kv) {
@@ -10452,7 +10831,6 @@ function registerSketchesFunction(sdk, kv) {
 		};
 	});
 }
-
 //#endregion
 //#region src/functions/crystallize.ts
 const CRYSTALLIZE_SYSTEM = `You are summarizing a completed chain of agent actions into a compact digest.
@@ -10649,7 +11027,6 @@ function parseDigest(response) {
 		};
 	}
 }
-
 //#endregion
 //#region src/functions/diagnostics.ts
 const ALL_CATEGORIES = [
@@ -11363,7 +11740,6 @@ function registerDiagnosticsFunction(sdk, kv) {
 		};
 	});
 }
-
 //#endregion
 //#region src/functions/facets.ts
 function registerFacetsFunction(sdk, kv) {
@@ -11535,7 +11911,6 @@ function registerFacetsFunction(sdk, kv) {
 		};
 	});
 }
-
 //#endregion
 //#region src/functions/verify.ts
 function registerVerifyFunction(sdk, kv) {
@@ -11630,7 +12005,6 @@ async function findObservation(kv, obsId, hintSessionIds) {
 	}
 	return null;
 }
-
 //#endregion
 //#region src/functions/cascade.ts
 function registerCascadeFunction(sdk, kv) {
@@ -11700,7 +12074,6 @@ function registerCascadeFunction(sdk, kv) {
 		};
 	});
 }
-
 //#endregion
 //#region src/functions/lessons.ts
 function reinforceLesson(lesson) {
@@ -11886,7 +12259,6 @@ function registerLessonsFunctions(sdk, kv) {
 		};
 	});
 }
-
 //#endregion
 //#region src/functions/obsidian-export.ts
 const DEFAULT_EXPORT_ROOT = join(homedir(), ".agentmemory");
@@ -11902,6 +12274,20 @@ function resolveVaultDir(vaultDir) {
 function sanitize(name) {
 	return name.replace(/[<>:"/\\|?*\x00-\x1f]/g, "_").slice(0, 100);
 }
+function hasExportId(item) {
+	return !!item && typeof item.id === "string" && item.id.length > 0;
+}
+function safeArray(value) {
+	return Array.isArray(value) ? value : [];
+}
+function safeString(value, fallback = "") {
+	return typeof value === "string" ? value : fallback;
+}
+function safeTimestamp(value) {
+	if (typeof value !== "string") return 0;
+	const time = new Date(value).getTime();
+	return Number.isFinite(time) ? time : 0;
+}
 function toFrontmatter(obj) {
 	const lines = ["---"];
 	for (const [key, value] of Object.entries(obj)) {
@@ -11913,6 +12299,11 @@ function toFrontmatter(obj) {
 	return lines.join("\n");
 }
 function memoryToMd(m) {
+	const concepts = safeArray(m.concepts);
+	const files = safeArray(m.files);
+	const relatedIds = safeArray(m.relatedIds);
+	const supersedes = safeArray(m.supersedes);
+	const title = safeString(m.title, m.id);
 	const fm = toFrontmatter({
 		id: m.id,
 		type: m.type,
@@ -11920,24 +12311,28 @@ function memoryToMd(m) {
 		updated: m.updatedAt,
 		strength: m.strength,
 		version: m.version,
-		concepts: m.concepts,
-		files: m.files
+		concepts,
+		files
 	});
-	const related = (m.relatedIds || []).map((id) => `- [[${id}]]`).join("\n");
-	const supersedes = (m.supersedes || []).map((id) => `- [[${id}]] (superseded)`).join("\n");
+	const relatedLines = relatedIds.map((id) => `- [[${id}]]`).join("\n");
+	const supersedesLines = supersedes.map((id) => `- [[${id}]] (superseded)`).join("\n");
 	const sections = [
 		fm,
 		"",
-		`# ${m.title}`,
+		`# ${title}`,
 		"",
-		m.content
+		safeString(m.content)
 	];
-	if (m.concepts.length > 0) sections.push("", "## Concepts", m.concepts.map((c) => `#${c.replace(/\s+/g, "-")}`).join(" "));
-	if (related) sections.push("", "## Related", related);
-	if (supersedes) sections.push("", "## Supersedes", supersedes);
+	if (concepts.length > 0) sections.push("", "## Concepts", concepts.map((c) => `#${c.replace(/\s+/g, "-")}`).join(" "));
+	if (relatedLines) sections.push("", "## Related", relatedLines);
+	if (supersedesLines) sections.push("", "## Supersedes", supersedesLines);
 	return sections.join("\n");
 }
 function lessonToMd(l) {
+	const tags = safeArray(l.tags);
+	const sourceIds = safeArray(l.sourceIds);
+	const content = safeString(l.content);
+	const headline = content ? content.slice(0, 80) : l.id;
 	const fm = toFrontmatter({
 		id: l.id,
 		type: "lesson",
@@ -11947,66 +12342,76 @@ function lessonToMd(l) {
 		created: l.createdAt,
 		updated: l.updatedAt,
 		project: l.project,
-		tags: l.tags,
+		tags,
 		decayRate: l.decayRate
 	});
-	const sourceLinks = l.sourceIds.map((id) => `- [[${id}]]`).join("\n");
+	const sourceLinks = sourceIds.map((id) => `- [[${id}]]`).join("\n");
 	const sections = [
 		fm,
 		"",
-		`# Lesson: ${l.content.slice(0, 80)}`,
+		`# Lesson: ${headline}`,
 		"",
-		l.content
+		content
 	];
 	if (l.context) sections.push("", "## Context", l.context);
-	if (l.tags.length > 0) sections.push("", "## Tags", l.tags.map((t) => `#${t.replace(/\s+/g, "-")}`).join(" "));
+	if (tags.length > 0) sections.push("", "## Tags", tags.map((t) => `#${t.replace(/\s+/g, "-")}`).join(" "));
 	if (sourceLinks) sections.push("", "## Sources", sourceLinks);
 	return sections.join("\n");
 }
 function crystalToMd(c) {
+	const keyOutcomes = safeArray(c.keyOutcomes);
+	const lessons = safeArray(c.lessons);
+	const filesAffected = safeArray(c.filesAffected);
+	const sourceActionIds = safeArray(c.sourceActionIds);
+	const narrative = safeString(c.narrative);
+	const headline = narrative ? narrative.slice(0, 80) : c.id;
 	const fm = toFrontmatter({
 		id: c.id,
 		type: "crystal",
 		created: c.createdAt,
 		project: c.project,
 		sessionId: c.sessionId,
-		filesAffected: c.filesAffected
+		filesAffected
 	});
-	const actionLinks = c.sourceActionIds.map((id) => `- [[${id}]]`).join("\n");
+	const actionLinks = sourceActionIds.map((id) => `- [[${id}]]`).join("\n");
 	const sections = [
 		fm,
 		"",
-		`# Crystal: ${c.narrative.slice(0, 80)}`,
+		`# Crystal: ${headline}`,
 		"",
-		c.narrative,
+		narrative,
 		"",
 		"## Key Outcomes",
-		...c.keyOutcomes.map((o) => `- ${o}`)
+		...keyOutcomes.map((o) => `- ${o}`)
 	];
-	if (c.lessons.length > 0) sections.push("", "## Lessons", ...c.lessons.map((l) => `- ${l}`));
-	if (c.filesAffected.length > 0) sections.push("", "## Files", ...c.filesAffected.map((f) => `- \`${f}\``));
+	if (lessons.length > 0) sections.push("", "## Lessons", ...lessons.map((l) => `- ${l}`));
+	if (filesAffected.length > 0) sections.push("", "## Files", ...filesAffected.map((f) => `- \`${f}\``));
 	if (actionLinks) sections.push("", "## Source Actions", actionLinks);
 	return sections.join("\n");
 }
 function sessionToMd(s) {
+	const project = safeString(s.project, "unknown");
+	const status = safeString(s.status, "unknown");
+	const startedAt = safeString(s.startedAt, "");
+	const cwd = safeString(s.cwd, "");
 	return [
 		toFrontmatter({
 			id: s.id,
 			type: "session",
-			project: s.project,
-			status: s.status,
-			started: s.startedAt,
+			project,
+			status,
+			started: startedAt || void 0,
 			ended: s.endedAt,
 			observations: s.observationCount
 		}),
 		"",
-		`# Session: ${s.project}`,
+		`# Session: ${project}`,
 		"",
-		`**Status:** ${s.status}`,
-		`**Started:** ${s.startedAt}`,
+		`**Status:** ${status}`,
+		startedAt ? `**Started:** ${startedAt}` : "",
 		s.endedAt ? `**Ended:** ${s.endedAt}` : "",
-		`**Observations:** ${s.observationCount}`,
-		`**CWD:** \`${s.cwd}\``
+		`**Observations:** ${s.observationCount ?? 0}`,
+		cwd ? `**CWD:** \`${cwd}\`` : ""
 	].filter(Boolean).join("\n");
 }
 function registerObsidianExportFunction(sdk, kv) {
@@ -12042,122 +12447,131 @@ function registerObsidianExportFunction(sdk, kv) {
 			crystals: join(vaultDir, "crystals"),
 			sessions: join(vaultDir, "sessions")
 		};
-		await Promise.all(Object.values(dirs).map((dir) => mkdir(dir, { recursive: true })));
-		const stats = {
-			memories: 0,
-			lessons: 0,
-			crystals: 0,
-			sessions: 0
-		};
-		const errors = [];
-		const memoryMoc = [];
-		const lessonMoc = [];
-		const crystalMoc = [];
-		const sessionMoc = [];
-		const [memories, lessons, crystals, sessions] = await Promise.all([
-			exportTypes.has("memories") ? kv.list(KV.memories) : Promise.resolve([]),
-			exportTypes.has("lessons") ? kv.list(KV.lessons) : Promise.resolve([]),
-			exportTypes.has("crystals") ? kv.list(KV.crystals) : Promise.resolve([]),
-			exportTypes.has("sessions") ? kv.list(KV.sessions) : Promise.resolve([])
-		]);
-		for (const m of memories.filter((m) => m.isLatest)) {
-			const filename = `${sanitize(m.id)}.md`;
-			const filepath = join(dirs.memories, filename);
-			try {
-				await writeFile(filepath, memoryToMd(m));
-				stats.memories++;
-				memoryMoc.push(`- [[memories/${sanitize(m.id)}|${m.title}]] (${m.type}, strength: ${m.strength})`);
-			} catch (err) {
-				errors.push({
-					id: m.id,
-					path: filepath,
-					error: err instanceof Error ? err.message : String(err)
-				});
+		try {
+			await Promise.all(Object.values(dirs).map((dir) => mkdir(dir, { recursive: true })));
+			const stats = {
+				memories: 0,
+				lessons: 0,
+				crystals: 0,
+				sessions: 0
+			};
+			const errors = [];
+			const memoryMoc = [];
+			const lessonMoc = [];
+			const crystalMoc = [];
+			const sessionMoc = [];
+			const [memories, lessons, crystals, sessions] = await Promise.all([
+				exportTypes.has("memories") ? kv.list(KV.memories) : Promise.resolve([]),
+				exportTypes.has("lessons") ? kv.list(KV.lessons) : Promise.resolve([]),
+				exportTypes.has("crystals") ? kv.list(KV.crystals) : Promise.resolve([]),
+				exportTypes.has("sessions") ? kv.list(KV.sessions) : Promise.resolve([])
+			]);
+			for (const m of memories.filter((m) => hasExportId(m) && m.isLatest === true)) {
+				const filename = `${sanitize(m.id)}.md`;
+				const filepath = join(dirs.memories, filename);
+				try {
+					await writeFile(filepath, memoryToMd(m));
+					stats.memories++;
+					memoryMoc.push(`- [[memories/${sanitize(m.id)}|${safeString(m.title, m.id)}]] (${m.type}, strength: ${m.strength ?? 0})`);
+				} catch (err) {
+					errors.push({
+						id: m.id,
+						path: filepath,
+						error: err instanceof Error ? err.message : String(err)
+					});
+				}
 			}
-		}
-		for (const l of lessons.filter((l) => !l.deleted)) {
-			const filename = `${sanitize(l.id)}.md`;
-			const filepath = join(dirs.lessons, filename);
-			try {
-				await writeFile(filepath, lessonToMd(l));
-				stats.lessons++;
-				lessonMoc.push(`- [[lessons/${sanitize(l.id)}|${l.content.slice(0, 60)}]] (confidence: ${l.confidence})`);
-			} catch (err) {
-				errors.push({
-					id: l.id,
-					path: filepath,
-					error: err instanceof Error ? err.message : String(err)
-				});
+			for (const l of lessons.filter((l) => hasExportId(l) && !l.deleted)) {
+				const filename = `${sanitize(l.id)}.md`;
+				const filepath = join(dirs.lessons, filename);
+				try {
+					await writeFile(filepath, lessonToMd(l));
+					stats.lessons++;
+					const headline = safeString(l.content).slice(0, 60) || l.id;
+					lessonMoc.push(`- [[lessons/${sanitize(l.id)}|${headline}]] (confidence: ${l.confidence ?? 0})`);
+				} catch (err) {
+					errors.push({
+						id: l.id,
+						path: filepath,
+						error: err instanceof Error ? err.message : String(err)
+					});
+				}
 			}
-		}
-		for (const c of crystals) {
-			const filename = `${sanitize(c.id)}.md`;
-			const filepath = join(dirs.crystals, filename);
-			try {
-				await writeFile(filepath, crystalToMd(c));
-				stats.crystals++;
-				crystalMoc.push(`- [[crystals/${sanitize(c.id)}|${c.narrative.slice(0, 60)}]]`);
-			} catch (err) {
-				errors.push({
-					id: c.id,
-					path: filepath,
-					error: err instanceof Error ? err.message : String(err)
-				});
+			for (const c of crystals.filter(hasExportId)) {
+				const filename = `${sanitize(c.id)}.md`;
+				const filepath = join(dirs.crystals, filename);
+				try {
+					await writeFile(filepath, crystalToMd(c));
+					stats.crystals++;
+					const headline = safeString(c.narrative).slice(0, 60) || c.id;
+					crystalMoc.push(`- [[crystals/${sanitize(c.id)}|${headline}]]`);
+				} catch (err) {
+					errors.push({
+						id: c.id,
+						path: filepath,
+						error: err instanceof Error ? err.message : String(err)
+					});
+				}
 			}
-		}
-		const recent = sessions.sort((a, b) => new Date(b.startedAt).getTime() - new Date(a.startedAt).getTime()).slice(0, 50);
-		for (const s of recent) {
-			const filename = `${sanitize(s.id)}.md`;
-			const filepath = join(dirs.sessions, filename);
-			try {
-				await writeFile(filepath, sessionToMd(s));
-				stats.sessions++;
-				sessionMoc.push(`- [[sessions/${sanitize(s.id)}|${s.project} (${s.status})]]`);
-			} catch (err) {
-				errors.push({
-					id: s.id,
-					path: filepath,
-					error: err instanceof Error ? err.message : String(err)
-				});
+			const recent = sessions.filter(hasExportId).sort((a, b) => safeTimestamp(b.startedAt) - safeTimestamp(a.startedAt)).slice(0, 50);
+			for (const s of recent) {
+				const filename = `${sanitize(s.id)}.md`;
+				const filepath = join(dirs.sessions, filename);
+				try {
+					await writeFile(filepath, sessionToMd(s));
+					stats.sessions++;
+					sessionMoc.push(`- [[sessions/${sanitize(s.id)}|${safeString(s.project, "unknown")} (${safeString(s.status, "unknown")})]]`);
+				} catch (err) {
+					errors.push({
+						id: s.id,
+						path: filepath,
+						error: err instanceof Error ? err.message : String(err)
+					});
+				}
 			}
+			const exportedAt = (/* @__PURE__ */ new Date()).toISOString();
+			const moc = [
+				"---",
+				"type: moc",
+				`exported: ${exportedAt}`,
+				"---",
+				"",
+				"# agentmemory vault",
+				"",
+				`Exported: ${exportedAt}`,
+				"",
+				`## Memories (${stats.memories})`,
+				...memoryMoc,
+				"",
+				`## Lessons (${stats.lessons})`,
+				...lessonMoc,
+				"",
+				`## Crystals (${stats.crystals})`,
+				...crystalMoc,
+				"",
+				`## Sessions (${stats.sessions})`,
+				...sessionMoc
+			].join("\n");
+			await writeFile(join(vaultDir, "MOC.md"), moc);
+			await recordAudit(kv, "obsidian_export", "mem::obsidian-export", [], {
+				vaultDir,
+				stats
+			});
+			return {
+				success: true,
+				exported: stats,
+				errors: errors.length > 0 ? errors : void 0,
+				vaultDir
+			};
+		} catch (err) {
+			return {
+				success: false,
+				error: err instanceof Error ? err.message : String(err),
+				vaultDir
+			};
 		}
-		const exportedAt = (/* @__PURE__ */ new Date()).toISOString();
-		const moc = [
-			"---",
-			"type: moc",
-			`exported: ${exportedAt}`,
-			"---",
-			"",
-			"# agentmemory vault",
-			"",
-			`Exported: ${exportedAt}`,
-			"",
-			`## Memories (${stats.memories})`,
-			...memoryMoc,
-			"",
-			`## Lessons (${stats.lessons})`,
-			...lessonMoc,
-			"",
-			`## Crystals (${stats.crystals})`,
-			...crystalMoc,
-			"",
-			`## Sessions (${stats.sessions})`,
-			...sessionMoc
-		].join("\n");
-		await writeFile(join(vaultDir, "MOC.md"), moc);
-		await recordAudit(kv, "obsidian_export", "mem::obsidian-export", [], {
-			vaultDir,
-			stats
-		});
-		return {
-			success: true,
-			exported: stats,
-			errors: errors.length > 0 ? errors : void 0,
-			vaultDir
-		};
 	});
 }
-
 //#endregion
 //#region src/prompts/reflect.ts
 const REFLECT_SYSTEM = `You are a higher-order reasoning engine. Given a cluster of related concepts, facts, lessons, and action outcomes, synthesize cross-cutting insights that span multiple individual memories.
@@ -12185,7 +12599,6 @@ function buildReflectPrompt(cluster) {
 	if (cluster.crystalNarratives.length > 0) sections.push("\n## Completed Work Summaries", ...cluster.crystalNarratives.map((n) => `- ${n}`));
 	return `Synthesize higher-order insights from this cluster of related memories:\n\n${sections.join("\n")}`;
 }
-
 //#endregion
 //#region src/functions/reflect.ts
 function reinforceInsight(insight) {
@@ -12478,7 +12891,6 @@ function registerReflectFunctions(sdk, kv, provider) {
 		};
 	});
 }
-
 //#endregion
 //#region src/functions/working-memory.ts
 const CORE_SCOPE = "mem:core-memory";
@@ -12653,7 +13065,6 @@ function registerWorkingMemoryFunctions(sdk, kv, tokenBudget) {
 		};
 	});
 }
-
 //#endregion
 //#region src/functions/skill-extract.ts
 const SKILL_EXTRACT_SYSTEM = `You are a skill extraction engine. Given a completed multi-step task session, extract a reusable procedural skill document.
@@ -12856,7 +13267,6 @@ function registerSkillExtractFunctions(sdk, kv, provider) {
 		};
 	});
 }
-
 //#endregion
 //#region src/functions/sliding-window.ts
 const SLIDING_WINDOW_SYSTEM = `You are a contextual enrichment engine. Given a primary observation and its surrounding context window (previous and next observations from the same session), produce an enriched version.
@@ -13043,7 +13453,6 @@ function registerSlidingWindowFunction(sdk, kv, provider) {
 		};
 	});
 }
-
 //#endregion
 //#region src/functions/temporal-graph.ts
 const TEMPORAL_EXTRACTION_SYSTEM = `You are a temporal knowledge extraction engine. Given observations, extract entities AND their temporal relationships with full context metadata.
@@ -13307,7 +13716,6 @@ function buildTimeline(edges) {
 		context: e.context
 	}));
 }
-
 //#endregion
 //#region src/functions/retention.ts
 const DEFAULT_DECAY = {
@@ -13541,7 +13949,6 @@ function registerRetentionFunctions(sdk, kv) {
 		};
 	});
 }
-
 //#endregion
 //#region src/functions/compress-file.ts
 const SENSITIVE_PATH_TERMS = [
@@ -13683,7 +14090,6 @@ function registerCompressFileFunction(sdk, kv, provider) {
 		};
 	});
 }
-
 //#endregion
 //#region src/replay/jsonl-parser.ts
 function deriveProject(cwd) {
@@ -13810,7 +14216,6 @@ function parseJsonlText(text, fallbackSessionId) {
 		observations
 	};
 }
-
 //#endregion
 //#region src/replay/timeline.ts
 const DEFAULT_CHARS_PER_SEC = 40;
@@ -13905,10 +14310,6 @@ function projectTimeline(observations) {
 		events
 	};
 }
-
-//#endregion
-//#region src/functions/replay.ts
-const MAX_FILES_DEFAULT = 200;
 const MAX_FILES_UPPER_BOUND = 1e3;
 const SENSITIVE_PATH_PATTERNS = [
 	/(^|[\\/_.-])secret([\\/_.-]|s?$)/i,
@@ -14128,7 +14529,7 @@ function registerReplayFunctions(sdk, kv) {
 				error: "path not found"
 			};
 		}
-		const maxFiles = Number.isInteger(data.maxFiles) && data.maxFiles > 0 ? Math.min(data.maxFiles, MAX_FILES_UPPER_BOUND) : MAX_FILES_DEFAULT;
+		const maxFiles = Number.isInteger(data.maxFiles) && data.maxFiles > 0 ? Math.min(data.maxFiles, MAX_FILES_UPPER_BOUND) : 200;
 		let files = [];
 		let truncated = false;
 		let discovered = 0;
@@ -14184,7 +14585,8 @@ function registerReplayFunctions(sdk, kv) {
 				const existingTags = existing.tags || [];
 				if (!existingTags.includes("jsonl-import")) existing.tags = [...existingTags, "jsonl-import"];
 				if (!existing.firstPrompt && firstPrompt) existing.firstPrompt = firstPrompt;
-				await kv.set(KV.sessions, existing.id, existing);
+				if (!existing.id) existing.id = parsed.sessionId;
+				await kv.set(KV.sessions, parsed.sessionId, existing);
 			} else {
 				const session = {
 					id: parsed.sessionId,
@@ -14230,7 +14632,6 @@ function registerReplayFunctions(sdk, kv) {
 		};
 	});
 }
-
 //#endregion
 //#region src/health/thresholds.ts
 const DEFAULTS = {
@@ -14289,7 +14690,6 @@ function evaluateHealth(snapshot, config = {}) {
 		notes
 	};
 }
-
 //#endregion
 //#region src/health/monitor.ts
 function registerHealthMonitor(sdk, kv) {
@@ -14377,7 +14777,6 @@ function registerHealthMonitor(sdk, kv) {
 async function getLatestHealth(kv) {
 	return kv.get(KV.health, "latest");
 }
-
 //#endregion
 //#region src/auth.ts
 const hmacKey = randomBytes(32);
@@ -14403,7 +14802,6 @@ function buildViewerCsp(nonce) {
 		"font-src 'self'"
 	].join("; ");
 }
-
 //#endregion
 //#region src/viewer/document.ts
 const VIEWER_VERSION_PLACEHOLDER = "__AGENTMEMORY_VERSION__";
@@ -14429,7 +14827,6 @@ function renderViewerDocument() {
 		csp: buildViewerCsp(nonce)
 	};
 }
-
 //#endregion
 //#region src/viewer/server.ts
 function loadViewerFavicon() {
@@ -14444,18 +14841,30 @@ function loadViewerFavicon() {
 	} catch {}
 	return null;
 }
+const VIEWER_FAVICON = loadViewerFavicon();
 const ALLOWED_ORIGINS = (process.env.VIEWER_ALLOWED_ORIGINS || "http://localhost:3111,http://localhost:3113,http://127.0.0.1:3111,http://127.0.0.1:3113").split(",").map((o) => o.trim());
-const ALLOWED_HOSTS_OVERRIDE = (process.env.VIEWER_ALLOWED_HOSTS || "").split(",").map((h) => h.trim().toLowerCase()).filter(Boolean);
-function buildAllowedHosts(origins, listenPort) {
+function readAllowedHostsOverride() {
+	return (process.env.VIEWER_ALLOWED_HOSTS || "").split(",").map((h) => h.trim().toLowerCase()).filter(Boolean);
+}
+function resolveViewerHost() {
+	return process.env.AGENTMEMORY_VIEWER_HOST?.trim() || "127.0.0.1";
+}
+function isLoopbackHost(host) {
+	const h = host.trim().toLowerCase();
+	return h === "127.0.0.1" || h === "::1" || h === "localhost";
+}
+function buildAllowedHosts(origins, listenPort, bindHost = "127.0.0.1") {
 	const hosts = /* @__PURE__ */ new Set();
-	for (const o of origins) try {
-		const parsed = new URL(o);
-		if (parsed.host) hosts.add(parsed.host.toLowerCase());
-	} catch {}
-	hosts.add(`localhost:${listenPort}`);
-	hosts.add(`127.0.0.1:${listenPort}`);
-	hosts.add(`[::1]:${listenPort}`);
-	for (const h of ALLOWED_HOSTS_OVERRIDE) hosts.add(h);
+	if (isLoopbackHost(bindHost)) {
+		for (const o of origins) try {
+			const parsed = new URL(o);
+			if (parsed.host) hosts.add(parsed.host.toLowerCase());
+		} catch {}
+		hosts.add(`localhost:${listenPort}`);
+		hosts.add(`127.0.0.1:${listenPort}`);
+		hosts.add(`[::1]:${listenPort}`);
+	}
+	for (const h of readAllowedHostsOverride()) hosts.add(h);
 	return hosts;
 }
 function isHostAllowed(headerHost, allowed) {
@@ -14464,11 +14873,16 @@ function isHostAllowed(headerHost, allowed) {
 	if (!lower) return false;
 	return allowed.has(lower);
 }
+function requireInboundBearer(authHeader, secret) {
+	if (typeof authHeader !== "string") return false;
+	const match = /^Bearer\s+(\S+)\s*$/i.exec(authHeader);
+	if (!match) return false;
+	return timingSafeCompare(match[1], secret);
+}
 function corsHeaders(req) {
 	const origin = req.headers.origin || "";
-	const allowed = ALLOWED_ORIGINS.includes(origin) ? origin : ALLOWED_ORIGINS[0];
 	return {
-		"Access-Control-Allow-Origin": allowed,
+		"Access-Control-Allow-Origin": ALLOWED_ORIGINS.includes(origin) ? origin : ALLOWED_ORIGINS[0],
 		"Access-Control-Allow-Methods": "GET, POST, DELETE, OPTIONS",
 		"Access-Control-Allow-Headers": "Content-Type, Authorization",
 		Vary: "Origin"
@@ -14512,16 +14926,29 @@ function getBoundViewerPort() {
 function getViewerSkipped() {
 	return viewerSkipped;
 }
+var ViewerConfigError = class extends Error {
+	constructor(message) {
+		super(message);
+		this.name = "ViewerConfigError";
+	}
+};
 function startViewerServer(port, _kv, _sdk, secret, restPort) {
 	boundViewerPort = null;
 	viewerSkipped = false;
 	const resolvedRestPort = restPort ?? port - 2;
 	const requestedPort = port;
+	const host = resolveViewerHost();
+	let inboundSecret = null;
+	if (!isLoopbackHost(host)) {
+		if (!secret) throw new ViewerConfigError(`AGENTMEMORY_VIEWER_HOST=${host} requires AGENTMEMORY_SECRET to be set so the viewer can validate inbound bearer tokens. To fix: unset AGENTMEMORY_VIEWER_HOST to keep the safe loopback bind, or set AGENTMEMORY_SECRET. For Fly images, it is printed on first boot; see deploy/fly/README.md.`);
+		if (readAllowedHostsOverride().length === 0) throw new ViewerConfigError(`AGENTMEMORY_VIEWER_HOST=${host} requires VIEWER_ALLOWED_HOSTS because non-loopback viewer binds only trust explicit Host headers. To fix: set VIEWER_ALLOWED_HOSTS to a comma-separated list of trusted Host header values (e.g. "localhost:3113" for fly proxy), or unset AGENTMEMORY_VIEWER_HOST to keep the safe loopback bind.`);
+		inboundSecret = secret;
+	}
 	let allowedHosts = null;
 	const server = createServer(async (req, res) => {
 		if (!allowedHosts) {
 			const addr = server.address();
-			allowedHosts = buildAllowedHosts(ALLOWED_ORIGINS, addr && typeof addr === "object" && "port" in addr ? addr.port : port);
+			allowedHosts = buildAllowedHosts(ALLOWED_ORIGINS, addr && typeof addr === "object" && "port" in addr ? addr.port : port, host);
 		}
 		if (!isHostAllowed(req.headers.host, allowedHosts)) {
 			res.writeHead(403, { "Content-Type": "text/plain" });
@@ -14557,19 +14984,26 @@ function startViewerServer(port, _kv, _sdk, secret, restPort) {
 			return;
 		}
 		if (method === "GET" && pathname === "/favicon.svg") {
-			const favicon = loadViewerFavicon();
-			if (favicon) {
+			if (VIEWER_FAVICON) {
 				res.writeHead(200, {
 					"Content-Type": "image/svg+xml",
 					"Cache-Control": "public, max-age=3600"
 				});
-				res.end(favicon);
+				res.end(VIEWER_FAVICON);
 				return;
 			}
 			res.writeHead(404, { "Content-Type": "text/plain" });
 			res.end("favicon not found");
 			return;
 		}
+		if (inboundSecret !== null && !requireInboundBearer(req.headers.authorization, inboundSecret)) {
+			res.writeHead(401, {
+				"Content-Type": "text/plain",
+				"WWW-Authenticate": "Bearer realm=\"agentmemory-viewer\""
+			});
+			res.end("unauthorized");
+			return;
+		}
 		try {
 			await proxyToRestApi(resolvedRestPort, pathname, qs, method, req, res, secret);
 		} catch (err) {
@@ -14580,17 +15014,23 @@ function startViewerServer(port, _kv, _sdk, secret, restPort) {
 	let attempt = 0;
 	let currentPort = requestedPort;
 	const tryListen = () => {
-		server.listen(currentPort, "127.0.0.1");
+		server.listen(currentPort, host);
 	};
 	server.on("listening", () => {
 		const addr = server.address();
-		boundViewerPort = addr && typeof addr === "object" && "port" in addr ? addr.port : currentPort;
+		const actualPort = addr && typeof addr === "object" && "port" in addr ? addr.port : currentPort;
+		boundViewerPort = actualPort;
 		viewerSkipped = false;
-		if (currentPort === requestedPort) console.log(`[agentmemory] Viewer: http://localhost:${currentPort}`);
-		else console.log(`[agentmemory] Viewer started on http://localhost:${currentPort} (fallback from ${requestedPort})`);
+		if (inboundSecret !== null) {
+			const allowedHosts = readAllowedHostsOverride().join(", ");
+			console.log(`[agentmemory] Viewer: http://localhost:${actualPort} (bound to ${host}; inbound Bearer required; allowed Host headers: ${allowedHosts})`);
+			return;
+		}
+		if (actualPort === requestedPort) console.log(`[agentmemory] Viewer: http://localhost:${actualPort}`);
+		else console.log(`[agentmemory] Viewer started on http://localhost:${actualPort} (fallback from ${requestedPort})`);
 	});
 	server.on("error", (err) => {
-		if (err.code === "EADDRINUSE" && attempt < MAX_VIEWER_PORT_RETRIES) {
+		if (err.code === "EADDRINUSE" && inboundSecret === null && attempt < MAX_VIEWER_PORT_RETRIES) {
 			attempt++;
 			currentPort = requestedPort + attempt;
 			setImmediate(tryListen);
@@ -14599,7 +15039,8 @@ function startViewerServer(port, _kv, _sdk, secret, restPort) {
 		if (err.code === "EADDRINUSE") {
 			boundViewerPort = null;
 			viewerSkipped = true;
-			console.warn(`[agentmemory] Viewer ports ${requestedPort}-${requestedPort + MAX_VIEWER_PORT_RETRIES} all in use, skipping viewer.`);
+			if (inboundSecret !== null) console.warn(`[agentmemory] Viewer port ${requestedPort} is in use while bound to ${host}; not retrying because non-loopback viewer binds require VIEWER_ALLOWED_HOSTS to match the exact port. Free the port, choose another viewer port, or unset AGENTMEMORY_VIEWER_HOST to keep the safe loopback bind.`);
+			else console.warn(`[agentmemory] Viewer ports ${requestedPort}-${requestedPort + MAX_VIEWER_PORT_RETRIES} all in use, skipping viewer.`);
 		} else {
 			boundViewerPort = null;
 			viewerSkipped = true;
@@ -14644,7 +15085,6 @@ async function proxyToRestApi(restPort, pathname, qs, method, req, res, secret)
 	res.writeHead(upstream.status, responseHeaders);
 	res.end(responseBody);
 }
-
 //#endregion
 //#region src/triggers/api.ts
 function parseOptionalInt(raw) {
@@ -15067,7 +15507,7 @@ function registerApiTriggers(sdk, kv, secret, metricsStore, provider) {
 		}
 		if (body.maxFiles !== void 0) {
 			const n = body.maxFiles;
-			if (!Number.isInteger(n) || n < 1 || n > MAX_FILES_UPPER_BOUND) return {
+			if (!Number.isInteger(n) || n < 1 || n > 1e3) return {
 				status_code: 400,
 				body: { error: `maxFiles must be an integer between 1 and ${MAX_FILES_UPPER_BOUND}` }
 			};
@@ -15151,9 +15591,13 @@ function registerApiTriggers(sdk, kv, secret, metricsStore, provider) {
 			value: "completed"
 		}]);
 		try {
-			sdk.triggerVoid("event::session::stopped", { sessionId });
+			sdk.trigger({
+				function_id: "event::session::stopped",
+				payload: { sessionId },
+				action: TriggerAction.Void()
+			});
 		} catch (err) {
-			logger.warn("event::session::stopped triggerVoid failed", {
+			logger.warn("event::session::stopped trigger failed", {
 				sessionId,
 				error: err instanceof Error ? err.message : String(err)
 			});
@@ -15573,11 +16017,24 @@ function registerApiTriggers(sdk, kv, secret, metricsStore, provider) {
 			status_code: 400,
 			body: { error: "query or expandIds is required" }
 		};
+		const headers = req.headers || {};
+		const sourceHeader = headers["x-agentmemory-source"] ?? headers["X-Agentmemory-Source"];
+		const sourceFromHeader = Array.isArray(sourceHeader) ? sourceHeader[0] : sourceHeader;
+		const payload = {
+			query: req.body?.query,
+			expandIds: req.body?.expandIds,
+			limit: req.body?.limit,
+			project: req.body?.project,
+			includeLessons: req.body?.includeLessons,
+			agentId: req.body?.agentId,
+			sessionId: req.body?.sessionId,
+			source: req.body?.source ?? sourceFromHeader
+		};
 		return {
 			status_code: 200,
 			body: await sdk.trigger({
 				function_id: "mem::smart-search",
-				payload: req.body
+				payload
 			})
 		};
 	});
@@ -15589,6 +16046,29 @@ function registerApiTriggers(sdk, kv, secret, metricsStore, provider) {
 			http_method: "POST"
 		}
 	});
+	sdk.registerFunction("api::diagnostic-followup", async (req) => {
+		const authErr = checkAuth(req, secret);
+		if (authErr) return authErr;
+		return {
+			status_code: 200,
+			body: {
+				...await sdk.trigger({
+					function_id: "mem::diagnostic::followup-stats",
+					payload: {}
+				}),
+				caveat: "Directional signal: overcounts on legitimate query refinement. Tune via AGENTMEMORY_FOLLOWUP_WINDOW_SECONDS."
+			}
+		};
+	});
+	sdk.registerTrigger({
+		type: "http",
+		function_id: "api::diagnostic-followup",
+		config: {
+			api_path: "/agentmemory/diagnostics/followup",
+			http_method: "GET",
+			middleware_function_ids: ["middleware::api-auth"]
+		}
+	});
 	sdk.registerFunction("api::timeline", async (req) => {
 		const authErr = checkAuth(req, secret);
 		if (authErr) return authErr;
@@ -15810,12 +16290,20 @@ function registerApiTriggers(sdk, kv, secret, metricsStore, provider) {
 	sdk.registerFunction("api::graph-query", async (req) => {
 		const authErr = checkAuth(req, secret);
 		if (authErr) return authErr;
+		const payload = {
+			startNodeId: req.body?.startNodeId,
+			nodeType: req.body?.nodeType,
+			maxDepth: req.body?.maxDepth,
+			query: req.body?.query,
+			limit: req.body?.limit,
+			offset: req.body?.offset
+		};
 		try {
 			return {
 				status_code: 200,
 				body: await sdk.trigger({
 					function_id: "mem::graph-query",
-					payload: req.body || {}
+					payload
 				})
 			};
 		} catch {
@@ -18096,7 +18584,6 @@ function registerApiTriggers(sdk, kv, secret, metricsStore, provider) {
 		}
 	});
 }
-
 //#endregion
 //#region src/triggers/events.ts
 function registerEventTriggers(sdk, kv) {
@@ -18141,18 +18628,26 @@ function registerEventTriggers(sdk, kv) {
 			payload: data
 		});
 		if (isReflectEnabled()) try {
-			sdk.triggerVoid("mem::slot-reflect", { sessionId: data.sessionId });
+			sdk.trigger({
+				function_id: "mem::slot-reflect",
+				payload: { sessionId: data.sessionId },
+				action: TriggerAction.Void()
+			});
 		} catch (err) {
-			logger.warn("slot-reflect triggerVoid failed", {
+			logger.warn("slot-reflect trigger failed", {
 				sessionId: data.sessionId,
 				error: err instanceof Error ? err.message : String(err)
 			});
 		}
 		if (isGraphExtractionEnabled()) try {
 			const compressed = (await kv.list(KV.observations(data.sessionId))).filter((o) => o.title);
-			if (compressed.length > 0) sdk.triggerVoid("mem::graph-extract", { observations: compressed });
+			if (compressed.length > 0) sdk.trigger({
+				function_id: "mem::graph-extract",
+				payload: { observations: compressed },
+				action: TriggerAction.Void()
+			});
 		} catch (err) {
-			logger.warn("graph-extract triggerVoid failed", {
+			logger.warn("graph-extract trigger failed", {
 				sessionId: data.sessionId,
 				error: err instanceof Error ? err.message : String(err)
 			});
@@ -18210,7 +18705,6 @@ function registerEventTriggers(sdk, kv) {
 		config: { scope: KV.sessions }
 	});
 }
-
 //#endregion
 //#region src/mcp/tools-registry.ts
 const CORE_TOOLS = [
@@ -19320,7 +19814,6 @@ function getVisibleTools() {
 	if ((process.env["AGENTMEMORY_TOOLS"] || "all") === "core") return getAllTools().filter((t) => ESSENTIAL_TOOLS.has(t.name));
 	return getAllTools();
 }
-
 //#endregion
 //#region src/mcp/server.ts
 function asNonEmptyString(value) {
@@ -20957,7 +21450,6 @@ function registerMcpEndpoints(sdk, kv, secret) {
 		}
 	});
 }
-
 //#endregion
 //#region src/eval/metrics-store.ts
 var MetricsStore = class {
@@ -21000,7 +21492,6 @@ var MetricsStore = class {
 		return Array.from(merged.values());
 	}
 };
-
 //#endregion
 //#region src/functions/dedup.ts
 const TTL_MS = 300 * 1e3;
@@ -21042,57 +21533,6 @@ var DedupMap = class {
 		return this.entries.size;
 	}
 };
-
-//#endregion
-//#region src/telemetry/setup.ts
-const OTEL_CONFIG = {
-	serviceName: "agentmemory",
-	serviceVersion: VERSION,
-	metricsExportIntervalMs: 3e4
-};
-let counters = null;
-let histograms = null;
-const NOOP_COUNTER = { add: () => {} };
-const NOOP_HISTOGRAM = { record: () => {} };
-const COUNTER_NAMES = [
-	["observationsTotal", "observations.total"],
-	["compressionSuccess", "compression.success"],
-	["compressionFailure", "compression.failure"],
-	["searchTotal", "search.total"],
-	["dedupSkipped", "dedup.skipped"],
-	["evictionTotal", "eviction.total"],
-	["circuitBreakerOpen", "circuit_breaker.open"],
-	["embeddingSuccess", "embedding.success"],
-	["embeddingFailure", "embedding.failure"],
-	["vectorSearchTotal", "vector_search.total"],
-	["autoForgetTotal", "auto_forget.total"],
-	["profileGenerated", "profile.generated"],
-	["claudeBridgeSync", "claude_bridge.sync"],
-	["graphExtraction", "graph.extraction"],
-	["consolidationRun", "consolidation.run"],
-	["teamShare", "team.share"],
-	["auditLog", "audit.log"],
-	["snapshotCreate", "snapshot.create"],
-	["governanceDelete", "governance.delete"]
-];
-const HISTOGRAM_NAMES = [
-	["compressionLatency", "compression.latency_ms"],
-	["searchLatency", "search.latency_ms"],
-	["contextTokens", "context.tokens"],
-	["qualityScore", "quality.score"],
-	["embeddingLatency", "embedding.latency_ms"],
-	["vectorSearchLatency", "vector_search.latency_ms"]
-];
-function initMetrics(getMeter) {
-	const meter = getMeter?.("agentmemory");
-	counters = Object.fromEntries(COUNTER_NAMES.map(([key, name]) => [key, meter ? meter.createCounter(name) : NOOP_COUNTER]));
-	histograms = Object.fromEntries(HISTOGRAM_NAMES.map(([key, name]) => [key, meter ? meter.createHistogram(name) : NOOP_HISTOGRAM]));
-	return {
-		counters,
-		histograms
-	};
-}
-
 //#endregion
 //#region src/index.ts
 function workerPidfilePath() {
@@ -21241,6 +21681,7 @@ async function main() {
 	const graphWeight = parseFloat(getEnvVar("AGENTMEMORY_GRAPH_WEIGHT") || "0.3");
 	const hybridSearch = new HybridSearch(bm25Index, vectorIndex, embeddingProvider, kv, embeddingConfig.bm25Weight, embeddingConfig.vectorWeight, graphWeight);
 	registerSmartSearchFunction(sdk, kv, (query, limit) => hybridSearch.search(query, limit));
+	registerRecentSearchesSweepFunction(sdk, kv);
 	registerApiTriggers(sdk, kv, secret, metricsStore, provider);
 	registerEventTriggers(sdk, kv);
 	registerMcpEndpoints(sdk, kv, secret);
@@ -21308,7 +21749,7 @@ async function main() {
 		console.warn(`[agentmemory] Failed to backfill memories into BM25:`, err);
 	}
 	bootLog(`Ready. ${embeddingProvider ? "Triple-stream (BM25+Vector+Graph)" : "BM25+Graph"} search active.`);
-	bootLog(`REST API: 125 endpoints at http://localhost:${config.restPort}/agentmemory/*`);
+	bootLog(`REST API: 126 endpoints at http://localhost:${config.restPort}/agentmemory/*`);
 	bootLog(`MCP surface (opt-in via \`npx @agentmemory/mcp\`): ${getAllTools().length} tools · 6 resources · 3 prompts`);
 	const viewerServer = startViewerServer(config.restPort + 2, kv, sdk, secret, config.restPort);
 	const autoForgetIntervalMs = parseInt(process.env.AUTO_FORGET_INTERVAL_MS || "3600000", 10);
@@ -21343,6 +21784,14 @@ async function main() {
 			});
 		} catch {}
 	}, 864e5).unref();
+	setInterval(async () => {
+		try {
+			await sdk.trigger({
+				function_id: "mem::diagnostic::recent-searches-sweep",
+				payload: {}
+			});
+		} catch {}
+	}, 3600 * 1e3).unref();
 	if (isConsolidationEnabled()) {
 		setInterval(async () => {
 			try {
@@ -21374,7 +21823,7 @@ main().catch((err) => {
 	console.error(`[agentmemory] Fatal:`, err);
 	process.exit(1);
 });
-
 //#endregion
-export {  };
+export {};
+
 //# sourceMappingURL=index.mjs.map