openclaw-cortex-memory 0.1.0-Alpha.2 → 0.1.0-Alpha.21

package/dist/src/engine/ts_engine.js

@@ -36,7 +36,40 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createTsEngine = createTsEngine;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
+const ontology_1 = require("../graph/ontology");
+const llm_output_validator_1 = require("../quality/llm_output_validator");
+const PROMPT_VERSIONS = {
+    write_gate: "write-gate.v1.2.0",
+    session_end_write: "session-end-write.v1.2.0",
+    read_fusion: "read-fusion.v1.2.0",
+};
 function createTsEngine(deps) {
+    const graphSchema = (0, ontology_1.loadGraphSchema)(deps.projectRoot);
+    const sessionMessageBuffer = new Map();
+    const maxMessagesPerSession = 500;
+    const maxBufferedSessions = 500;
+    function pushSessionMessage(sessionId, message) {
+        const current = sessionMessageBuffer.get(sessionId) || [];
+        current.push({
+            id: `msg_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 8)}`,
+            session_id: sessionId,
+            role: message.role,
+            content: message.text,
+            timestamp: new Date().toISOString(),
+        });
+        if (current.length > maxMessagesPerSession) {
+            sessionMessageBuffer.set(sessionId, current.slice(current.length - maxMessagesPerSession));
+        }
+        else {
+            sessionMessageBuffer.set(sessionId, current);
+        }
+        if (sessionMessageBuffer.size > maxBufferedSessions) {
+            const first = sessionMessageBuffer.keys().next().value;
+            if (first) {
+                sessionMessageBuffer.delete(first);
+            }
+        }
+    }
     function asRecord(value) {
         if (typeof value === "object" && value !== null) {
             return value;
@@ -71,25 +104,454 @@ function createTsEngine(deps) {
             archivePath: path.join(deps.memoryRoot, "sessions", "archive", "sessions.jsonl"),
         };
     }
+    function parseJsonFile(filePath) {
+        try {
+            if (!fs.existsSync(filePath)) {
+                return null;
+            }
+            const raw = fs.readFileSync(filePath, "utf-8").trim();
+            if (!raw) {
+                return null;
+            }
+            return JSON.parse(raw);
+        }
+        catch {
+            return null;
+        }
+    }
+    function embeddingStats(records) {
+        let ok = 0;
+        let failed = 0;
+        let pending = 0;
+        for (const record of records) {
+            const explicit = typeof record.embedding_status === "string" ? record.embedding_status.trim() : "";
+            const hasEmbedding = Array.isArray(record.embedding) && record.embedding.length > 0;
+            if (explicit === "ok" || hasEmbedding) {
+                ok += 1;
+            }
+            else if (explicit === "failed") {
+                failed += 1;
+            }
+            else {
+                pending += 1;
+            }
+        }
+        const total = records.length;
+        const coverage = total > 0 ? Number((ok / total).toFixed(4)) : 0;
+        return { total, ok, failed, pending, coverage };
+    }
+    function normalizeBaseUrl(value) {
+        if (!value)
+            return "";
+        return value.endsWith("/") ? value.slice(0, -1) : value;
+    }
+    function estimateTokenCount(text) {
+        const parts = text
+            .split(/[\s,.;:!?，。；：！？、()（）[\]{}"'`~]+/)
+            .map(part => part.trim())
+            .filter(Boolean);
+        return parts.length;
+    }
+    function buildVectorSourceText(record, layer) {
+        if (layer === "active") {
+            const content = typeof record.content === "string" && record.content.trim()
+                ? record.content.trim()
+                : (typeof record.text === "string" ? record.text.trim() : "");
+            return content;
+        }
+        const summary = typeof record.summary === "string" ? record.summary.trim() : "";
+        const eventType = typeof record.event_type === "string" ? record.event_type.trim() : "insight";
+        const outcome = typeof record.outcome === "string" ? record.outcome.trim() : "";
+        const sourceFile = typeof record.source_file === "string" ? record.source_file.trim() : "";
+        const actor = typeof record.actor === "string" ? record.actor.trim() : "";
+        const entities = Array.isArray(record.entities)
+            ? record.entities.filter(v => typeof v === "string").map(v => String(v).trim()).filter(Boolean)
+            : [];
+        const relations = Array.isArray(record.relations)
+            ? record.relations
+                .map(v => {
+                if (!v || typeof v !== "object")
+                    return "";
+                const relation = v;
+                const source = typeof relation.source === "string" ? relation.source.trim() : "";
+                const target = typeof relation.target === "string" ? relation.target.trim() : "";
+                const type = typeof relation.type === "string" ? relation.type.trim() : "related_to";
+                if (!source || !target)
+                    return "";
+                return `${source} -[${type}]-> ${target}`;
+            })
+                .filter(Boolean)
+            : [];
+        const lines = [
+            `event_type: ${eventType}`,
+            `summary: ${summary}`,
+            `outcome: ${outcome}`,
+            `entities: ${entities.join(", ")}`,
+            `source_file: ${sourceFile}`,
+            `actor: ${actor}`,
+            relations.length > 0 ? `relations: ${relations.join(" ; ")}` : "",
+        ].filter(Boolean);
+        return lines.join("\n").trim();
+    }
+    function splitTextChunks(text, chunkSize, chunkOverlap) {
+        const normalizedSize = Number.isFinite(chunkSize) && chunkSize >= 200 ? Math.floor(chunkSize) : 600;
+        const normalizedOverlap = Number.isFinite(chunkOverlap) && chunkOverlap >= 0
+            ? Math.floor(chunkOverlap)
+            : 100;
+        const overlap = Math.min(normalizedOverlap, Math.max(0, normalizedSize - 50));
+        const output = [];
+        let cursor = 0;
+        let index = 0;
+        const punctuationSet = new Set(["。", "！", "？", ".", "!", "?", "\n", "；", ";"]);
+        while (cursor < text.length) {
+            const rawEnd = Math.min(text.length, cursor + normalizedSize);
+            let end = rawEnd;
+            if (rawEnd < text.length) {
+                const backwardStart = Math.max(cursor + Math.floor(normalizedSize * 0.45), cursor + 1);
+                let found = -1;
+                for (let i = rawEnd - 1; i >= backwardStart; i -= 1) {
+                    if (punctuationSet.has(text[i])) {
+                        found = i + 1;
+                        break;
+                    }
+                }
+                if (found < 0) {
+                    const forwardEnd = Math.min(text.length, rawEnd + Math.floor(normalizedSize * 0.2));
+                    for (let i = rawEnd; i < forwardEnd; i += 1) {
+                        if (punctuationSet.has(text[i])) {
+                            found = i + 1;
+                            break;
+                        }
+                    }
+                }
+                if (found > cursor) {
+                    end = found;
+                }
+            }
+            if (end <= cursor) {
+                end = Math.min(text.length, cursor + normalizedSize);
+            }
+            const chunkText = text.slice(cursor, end).trim();
+            if (chunkText) {
+                output.push({ index, start: cursor, end, text: chunkText });
+                index += 1;
+            }
+            if (end >= text.length) {
+                break;
+            }
+            const nextCursor = Math.max(cursor + 1, end - overlap);
+            cursor = nextCursor <= cursor ? end : nextCursor;
+        }
+        return output;
+    }
+    function upsertJsonFile(filePath, patch) {
+        const current = parseJsonFile(filePath) || {};
+        const next = { ...current, ...patch };
+        const dir = path.dirname(filePath);
+        if (!fs.existsSync(dir)) {
+            fs.mkdirSync(dir, { recursive: true });
+        }
+        fs.writeFileSync(filePath, JSON.stringify(next, null, 2), "utf-8");
+    }
+    async function probeModelConnection(args) {
+        const defaultTimeoutMs = args.kind === "llm" ? 30000 : 15000;
+        const timeoutMs = typeof args.timeoutMs === "number" && Number.isFinite(args.timeoutMs) && args.timeoutMs >= 1000
+            ? Math.floor(args.timeoutMs)
+            : defaultTimeoutMs;
+        if (!args.model || !args.apiKey || !args.baseUrl) {
+            return {
+                configured: false,
+                connected: false,
+                model: args.model || "",
+                base_url: args.baseUrl || "",
+                error: "not_configured",
+            };
+        }
+        let endpoint = args.baseUrl;
+        let payload = {};
+        if (args.kind === "embedding") {
+            endpoint = args.baseUrl.endsWith("/embeddings") ? args.baseUrl : `${args.baseUrl}/embeddings`;
+            payload = {
+                model: args.model,
+                input: "diagnostics connectivity probe",
+            };
+        }
+        else if (args.kind === "llm") {
+            endpoint = args.baseUrl.endsWith("/chat/completions") ? args.baseUrl : `${args.baseUrl}/chat/completions`;
+            payload = {
+                model: args.model,
+                messages: [{ role: "user", content: "ping" }],
+                max_tokens: 4,
+                temperature: 0,
+                stream: false,
+            };
+        }
+        else {
+            endpoint = args.baseUrl.endsWith("/rerank") ? args.baseUrl : `${args.baseUrl}/rerank`;
+            payload = {
+                model: args.model,
+                query: "diagnostics",
+                documents: ["diagnostics connectivity probe"],
+                top_n: 1,
+            };
+        }
+        let lastError = "unknown_error";
+        const maxAttempts = args.kind === "llm" ? 3 : 1;
+        for (let attempt = 0; attempt < maxAttempts; attempt += 1) {
+            const controller = new AbortController();
+            const timeoutId = setTimeout(() => controller.abort(), timeoutMs);
+            try {
+                const response = await fetch(endpoint, {
+                    method: "POST",
+                    headers: {
+                        accept: "application/json",
+                        "content-type": "application/json",
+                        authorization: `Bearer ${args.apiKey}`,
+                    },
+                    body: JSON.stringify(payload),
+                    signal: controller.signal,
+                });
+                clearTimeout(timeoutId);
+                if (response.ok) {
+                    return {
+                        configured: true,
+                        connected: true,
+                        model: args.model,
+                        base_url: args.baseUrl,
+                        error: "",
+                    };
+                }
+                let details = "";
+                try {
+                    const text = (await response.text()).trim();
+                    if (text) {
+                        details = text.slice(0, 180);
+                    }
+                }
+                catch {
+                    details = "";
+                }
+                lastError = details ? `http_${response.status}:${details}` : `http_${response.status}`;
+            }
+            catch (error) {
+                const raw = error instanceof Error ? error.message : String(error);
+                if (error?.name === "AbortError" || /aborted/i.test(raw)) {
+                    lastError = `timeout_${timeoutMs}ms`;
+                }
+                else {
+                    lastError = raw;
+                }
+            }
+            finally {
+                clearTimeout(timeoutId);
+            }
+        }
+        return {
+            configured: true,
+            connected: false,
+            model: args.model,
+            base_url: args.baseUrl,
+            error: lastError,
+        };
+    }
+    async function requestEmbedding(args) {
+        const endpoint = args.baseUrl.endsWith("/embeddings") ? args.baseUrl : `${args.baseUrl}/embeddings`;
+        const body = {
+            input: args.text,
+            model: args.model,
+        };
+        if (typeof args.dimensions === "number" && Number.isFinite(args.dimensions) && args.dimensions > 0) {
+            body.dimensions = args.dimensions;
+        }
+        const timeoutMs = typeof args.timeoutMs === "number" && Number.isFinite(args.timeoutMs) && args.timeoutMs >= 1000
+            ? Math.floor(args.timeoutMs)
+            : 20000;
+        const maxRetries = typeof args.maxRetries === "number" && Number.isFinite(args.maxRetries) && args.maxRetries >= 1
+            ? Math.min(8, Math.floor(args.maxRetries))
+            : 4;
+        let lastError = null;
+        for (let attempt = 0; attempt < maxRetries; attempt += 1) {
+            const controller = new AbortController();
+            const timeoutId = setTimeout(() => controller.abort(), timeoutMs);
+            try {
+                const response = await fetch(endpoint, {
+                    method: "POST",
+                    headers: {
+                        "content-type": "application/json",
+                        authorization: `Bearer ${args.apiKey}`,
+                    },
+                    body: JSON.stringify(body),
+                    signal: controller.signal,
+                });
+                clearTimeout(timeoutId);
+                if (!response.ok) {
+                    lastError = new Error(`embedding_http_${response.status}`);
+                    continue;
+                }
+                const json = await response.json();
+                const embedding = json?.data?.[0]?.embedding;
+                if (Array.isArray(embedding) && embedding.length > 0) {
+                    return embedding.filter(item => Number.isFinite(item));
+                }
+                lastError = new Error("embedding_empty");
+            }
+            catch (error) {
+                clearTimeout(timeoutId);
+                lastError = error;
+            }
+            if (attempt < maxRetries - 1) {
+                await new Promise(resolve => setTimeout(resolve, 300 * Math.pow(2, attempt)));
+            }
+        }
+        throw lastError instanceof Error ? lastError : new Error(String(lastError || "embedding_failed"));
+    }
     async function storeEvent(args, _context) {
         try {
-            if (!args.summary?.trim()) {
+            const rawArgs = args;
+            const summaryCandidate = typeof rawArgs?.summary === "string"
+                ? rawArgs.summary
+                : typeof rawArgs?.input?.summary === "string"
+                    ? String(rawArgs.input.summary)
+                    : typeof rawArgs?.event?.summary === "string"
+                        ? String(rawArgs.event.summary)
+                        : "";
+            const normalizedSummary = summaryCandidate.trim();
+            if (!normalizedSummary) {
                 return { success: false, error: "Invalid input provided. Missing 'summary' parameter." };
             }
-            const { archivePath } = memoryFiles();
-            const records = readJsonl(archivePath);
-            const id = `evt_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 8)}`;
-            records.push({
-                id,
-                timestamp: new Date().toISOString(),
-                summary: args.summary.trim(),
-                entities: args.entities ?? [],
-                outcome: args.outcome ?? "",
-                relations: args.relations ?? [],
-                source_file: "ts_store_event",
-            });
-            writeJsonl(archivePath, records);
-            return { success: true, data: { event_id: id } };
+            const entityInput = Array.isArray(rawArgs.entities)
+                ? rawArgs.entities
+                : Array.isArray(rawArgs.input?.entities)
+                    ? rawArgs.input.entities
+                    : Array.isArray(rawArgs.event?.entities)
+                        ? rawArgs.event.entities
+                        : [];
+            const entities = Array.isArray(entityInput)
+                ? entityInput.map(item => {
+                    if (typeof item === "string") {
+                        return item.trim();
+                    }
+                    if (item && typeof item === "object") {
+                        const value = (item.name || item.id || "");
+                        return typeof value === "string" ? value.trim() : "";
+                    }
+                    return "";
+                }).filter(Boolean)
+                : [];
+            const entityTypesFromEntities = {};
+            if (Array.isArray(entityInput)) {
+                for (const item of entityInput) {
+                    if (!item || typeof item !== "object") {
+                        continue;
+                    }
+                    const entityObj = item;
+                    const entityName = typeof entityObj.name === "string" && entityObj.name.trim()
+                        ? entityObj.name.trim()
+                        : (typeof entityObj.id === "string" ? entityObj.id.trim() : "");
+                    const entityType = typeof entityObj.type === "string" ? entityObj.type.trim() : "";
+                    if (entityName && entityType) {
+                        entityTypesFromEntities[entityName] = entityType;
+                    }
+                }
+            }
+            const relationInput = Array.isArray(rawArgs.relations)
+                ? rawArgs.relations
+                : Array.isArray(rawArgs.input?.relations)
+                    ? rawArgs.input.relations
+                    : Array.isArray(rawArgs.event?.relations)
+                        ? rawArgs.event.relations
+                        : [];
+            const relations = Array.isArray(relationInput)
+                ? relationInput
+                    .map(item => {
+                    if (typeof item === "string") {
+                        const [sourceRaw, typeRaw, targetRaw] = item.split("|");
+                        const source = (sourceRaw || "").trim();
+                        const target = (targetRaw || "").trim();
+                        const type = (0, ontology_1.normalizeRelationType)((typeRaw || "related_to").trim(), graphSchema);
+                        if (!source || !target)
+                            return null;
+                        return { source, target, type };
+                    }
+                    if (!item || typeof item !== "object")
+                        return null;
+                    const relation = item;
+                    if (!relation.source || !relation.target)
+                        return null;
+                    return {
+                        source: relation.source.trim(),
+                        target: relation.target.trim(),
+                        type: (0, ontology_1.normalizeRelationType)(relation.type || "related_to", graphSchema),
+                        evidence_span: typeof relation.evidence_span === "string" ? relation.evidence_span.trim() : undefined,
+                        confidence: typeof relation.confidence === "number" ? Math.max(0, Math.min(1, relation.confidence)) : undefined,
+                    };
+                })
+                    .filter((item) => Boolean(item))
+                : [];
+            const outcomeValue = typeof rawArgs.outcome === "string"
+                ? rawArgs.outcome
+                : typeof rawArgs.input?.outcome === "string"
+                    ? String(rawArgs.input.outcome)
+                    : typeof rawArgs.event?.outcome === "string"
+                        ? String(rawArgs.event.outcome)
+                        : "";
+            const entityTypesInput = typeof rawArgs.entity_types === "object" && rawArgs.entity_types !== null
+                ? rawArgs.entity_types
+                : typeof rawArgs.input?.entity_types === "object"
+                    ? rawArgs.input.entity_types
+                    : typeof rawArgs.event?.entity_types === "object"
+                        ? rawArgs.event.entity_types
+                        : {};
+            const entityTypes = {};
+            for (const [key, value] of Object.entries(entityTypesInput)) {
+                if (typeof value === "string") {
+                    entityTypes[key.trim()] = value.trim();
+                }
+            }
+            for (const [key, value] of Object.entries(entityTypesFromEntities)) {
+                if (!entityTypes[key] && value) {
+                    entityTypes[key] = value;
+                }
+            }
+            const result = await deps.archiveStore.storeEvents([
+                {
+                    event_type: "manual_event",
+                    summary: normalizedSummary,
+                    entities,
+                    relations,
+                    entity_types: entityTypes,
+                    outcome: outcomeValue,
+                    session_id: "manual",
+                    source_file: "ts_store_event",
+                    confidence: 1,
+                    source_event_id: `manual:${Date.now().toString(36)}`,
+                    actor: "manual_tool",
+                },
+            ]);
+            if (result.stored.length === 0) {
+                return { success: false, error: result.skipped[0]?.reason || "store_event_skipped" };
+            }
+            const storedId = result.stored[0].id;
+            if (deps.graphMemoryStore && entities.length > 0 && Object.keys(entityTypes).length > 0 && relations.length > 0) {
+                const graphResult = await deps.graphMemoryStore.append({
+                    sourceEventId: storedId,
+                    sourceLayer: "archive_event",
+                    archiveEventId: storedId,
+                    sessionId: "manual",
+                    sourceFile: "ts_store_event",
+                    eventType: "manual_event",
+                    entities,
+                    entity_types: entityTypes,
+                    relations,
+                    gateSource: "manual",
+                    confidence: 1,
+                    sourceText: normalizedSummary,
+                });
+                if (!graphResult.success) {
+                    deps.logger.info(`store_event graph_skip_reason=${graphResult.reason} source_event_id=${storedId}`);
+                }
+            }
+            return { success: true, data: { event_id: storedId } };
         }
         catch (error) {
             return { success: false, error: String(error) };
@@ -100,13 +562,95 @@ function createTsEngine(deps) {
         if (!entity) {
             return { success: false, error: "Invalid input provided. Missing 'entity' parameter." };
         }
-        const { archivePath } = memoryFiles();
-        const records = readJsonl(archivePath);
+        const relFilter = typeof args.rel === "string" && args.rel.trim()
+            ? (0, ontology_1.normalizeRelationType)(args.rel, graphSchema)
+            : "";
+        const direction = args.dir === "incoming" || args.dir === "outgoing" || args.dir === "both"
+            ? args.dir
+            : "both";
+        const pathTo = typeof args.path_to === "string" && args.path_to.trim() ? args.path_to.trim() : "";
+        const maxDepth = Math.max(2, Math.min(4, typeof args.max_depth === "number" ? Math.floor(args.max_depth) : 3));
+        const graphMemoryPath = path.join(deps.memoryRoot, "graph", "memory.jsonl");
         const nodes = new Map();
         const edges = [];
-        for (const record of records) {
+        const adjacency = new Map();
+        const pathAdjacency = new Map();
+        const relationTypeDistribution = new Map();
+        const edgeKeySet = new Set();
+        function pushEdge(source, target, type) {
+            const key = `${source}|${type}|${target}`;
+            if (edgeKeySet.has(key)) {
+                return;
+            }
+            edgeKeySet.add(key);
+            edges.push({ source, target, type });
+            relationTypeDistribution.set(type, (relationTypeDistribution.get(type) || 0) + 1);
+            if (!adjacency.has(source)) {
+                adjacency.set(source, []);
+            }
+            adjacency.get(source)?.push({ next: target, edge: { source, target, type } });
+            if (!adjacency.has(target)) {
+                adjacency.set(target, []);
+            }
+            adjacency.get(target)?.push({ next: source, edge: { source, target, type } });
+        }
+        function pushPathEdge(source, target, type) {
+            if (!pathAdjacency.has(source)) {
+                pathAdjacency.set(source, []);
+            }
+            if (!pathAdjacency.has(target)) {
+                pathAdjacency.set(target, []);
+            }
+            if (direction === "incoming") {
+                pathAdjacency.get(target)?.push({ next: source, edge: { source, target, type } });
+            }
+            else if (direction === "outgoing") {
+                pathAdjacency.get(source)?.push({ next: target, edge: { source, target, type } });
+            }
+            else {
+                pathAdjacency.get(source)?.push({ next: target, edge: { source, target, type } });
+                pathAdjacency.get(target)?.push({ next: source, edge: { source, target, type } });
+            }
+        }
+        const graphRecords = fs.existsSync(graphMemoryPath) ? readJsonl(graphMemoryPath) : [];
+        for (const record of graphRecords) {
             const entities = Array.isArray(record.entities) ? record.entities : [];
-            const named = entities.map(e => (typeof e === "string" ? e.trim() : "")).filter(Boolean);
+            const named = entities.map((e) => (typeof e === "string" ? e.trim() : "")).filter(Boolean);
+            const relations = Array.isArray(record.relations) ? record.relations : [];
+            let explicitMatched = false;
+            for (const relationRaw of relations) {
+                if (typeof relationRaw !== "object" || relationRaw === null) {
+                    continue;
+                }
+                const relation = relationRaw;
+                const source = typeof relation.source === "string" ? relation.source.trim() : "";
+                const target = typeof relation.target === "string" ? relation.target.trim() : "";
+                const type = (0, ontology_1.normalizeRelationType)(typeof relation.type === "string" && relation.type.trim() ? relation.type.trim() : "related_to", graphSchema);
+                if (!source || !target) {
+                    continue;
+                }
+                if (relFilter && type !== relFilter) {
+                    continue;
+                }
+                pushPathEdge(source, target, type);
+                const outgoingMatch = source === entity;
+                const incomingMatch = target === entity;
+                const directionMatched = direction === "both" ? (outgoingMatch || incomingMatch)
+                    : direction === "outgoing" ? outgoingMatch
+                        : incomingMatch;
+                if (!directionMatched) {
+                    continue;
+                }
+                explicitMatched = true;
+                if (!nodes.has(source))
+                    nodes.set(source, { id: source, type: "entity" });
+                if (!nodes.has(target))
+                    nodes.set(target, { id: target, type: "entity" });
+                pushEdge(source, target, type);
+            }
+            if (explicitMatched) {
+                continue;
+            }
             if (!named.includes(entity)) {
                 continue;
             }
@@ -117,7 +661,40 @@ function createTsEngine(deps) {
             }
             for (const name of named) {
                 if (name !== entity) {
-                    edges.push({ source: entity, target: name, type: "co_occurrence" });
+                    if (!relFilter || relFilter === "co_occurrence") {
+                        pushEdge(entity, name, "co_occurrence");
+                    }
+                }
+            }
+        }
+        let graphPath = [];
+        if (pathTo) {
+            const visited = new Set();
+            const queue = [
+                { node: entity, depth: 0, pathEdges: [] },
+            ];
+            while (queue.length > 0) {
+                const current = queue.shift();
+                if (!current)
+                    break;
+                if (current.node === pathTo) {
+                    graphPath = current.pathEdges;
+                    break;
+                }
+                if (current.depth >= maxDepth) {
+                    continue;
+                }
+                const visitKey = `${current.node}:${current.depth}`;
+                if (visited.has(visitKey)) {
+                    continue;
+                }
+                visited.add(visitKey);
+                for (const next of pathAdjacency.get(current.node) || []) {
+                    queue.push({
+                        node: next.next,
+                        depth: current.depth + 1,
+                        pathEdges: [...current.pathEdges, next.edge],
+                    });
                 }
             }
         }
@@ -125,8 +702,14 @@ function createTsEngine(deps) {
             success: true,
             data: {
                 entity,
+                rel: relFilter || "",
+                dir: direction,
                 nodes: [...nodes.values()],
                 edges,
+                path_to: pathTo || "",
+                max_depth: maxDepth,
+                path: graphPath,
+                relation_type_distribution: [...relationTypeDistribution.entries()].map(([type, count]) => ({ type, count })),
             },
         };
     }
@@ -216,33 +799,580 @@ function createTsEngine(deps) {
         }
         return { success: true, data: { deletedCount } };
     }
+    async function backfillEmbeddings(args, _context) {
+        const layer = args.layer === "active" || args.layer === "archive" || args.layer === "all" ? args.layer : "all";
+        const rebuildMode = args.rebuild_mode === "vector_only" || args.rebuild_mode === "full"
+            ? args.rebuild_mode
+            : "incremental";
+        const batchSize = typeof args.batch_size === "number" && Number.isFinite(args.batch_size) && args.batch_size > 0
+            ? Math.min(500, Math.floor(args.batch_size))
+            : 100;
+        const maxRetries = typeof args.max_retries === "number" && Number.isFinite(args.max_retries) && args.max_retries >= 1
+            ? Math.min(10, Math.floor(args.max_retries))
+            : 3;
+        const retryFailedOnly = args.retry_failed_only === true;
+        const forceRebuild = rebuildMode === "vector_only" || rebuildMode === "full";
+        const model = deps.embedding?.model || "";
+        const apiKey = deps.embedding?.apiKey || "";
+        const baseUrl = normalizeBaseUrl(deps.embedding?.baseURL || deps.embedding?.baseUrl);
+        if (!model || !apiKey || !baseUrl) {
+            return { success: false, error: "Embedding config missing for backfill tool." };
+        }
+        const statePath = path.join(deps.memoryRoot, ".vector_backfill_state.json");
+        const syncStatePath = path.join(deps.memoryRoot, ".sync_state.json");
+        const previousState = parseJsonFile(statePath) || {};
+        const failureCountState = (typeof previousState.failureCounts === "object" && previousState.failureCounts !== null)
+            ? previousState.failureCounts
+            : {};
+        let fullSyncResult = null;
+        if (rebuildMode === "full") {
+            try {
+                fullSyncResult = await deps.sessionSync.syncMemory();
+            }
+            catch (error) {
+                deps.logger.warn(`backfill_full_rebuild_sync_failed error=${error}`);
+            }
+        }
+        const { activePath, archivePath } = memoryFiles();
+        const targetFiles = [];
+        if (layer === "all" || layer === "active") {
+            targetFiles.push({ layer: "active", filePath: activePath });
+        }
+        if (layer === "all" || layer === "archive") {
+            targetFiles.push({ layer: "archive", filePath: archivePath });
+        }
+        const queue = [];
+        const recordsByFile = new Map();
+        for (const target of targetFiles) {
+            const records = readJsonl(target.filePath);
+            recordsByFile.set(target.filePath, records);
+            for (let i = 0; i < records.length; i += 1) {
+                const record = records[i];
+                const id = typeof record.id === "string" ? record.id : "";
+                if (!id) {
+                    continue;
+                }
+                const status = typeof record.embedding_status === "string" ? record.embedding_status.trim() : "";
+                const hasEmbedding = Array.isArray(record.embedding) && record.embedding.length > 0;
+                if (forceRebuild) {
+                    queue.push({ layer: target.layer, filePath: target.filePath, index: i });
+                    continue;
+                }
+                if (retryFailedOnly) {
+                    if (status !== "failed") {
+                        continue;
+                    }
+                }
+                else if (status === "ok" || hasEmbedding) {
+                    continue;
+                }
+                const failCountRaw = failureCountState[id];
+                const failCount = typeof failCountRaw === "number" ? failCountRaw : 0;
+                if (failCount >= maxRetries && status === "failed") {
+                    continue;
+                }
+                queue.push({ layer: target.layer, filePath: target.filePath, index: i });
+            }
+        }
+        const totalCandidates = queue.length;
+        let success = 0;
+        let failed = 0;
+        let skipped = 0;
+        let processed = 0;
+        const failureCounts = {};
+        for (const [key, value] of Object.entries(failureCountState)) {
+            if (typeof value === "number" && Number.isFinite(value)) {
+                failureCounts[key] = value;
+            }
+        }
+        for (let start = 0; start < queue.length; start += batchSize) {
+            const batch = queue.slice(start, start + batchSize);
+            for (const item of batch) {
+                processed += 1;
+                const records = recordsByFile.get(item.filePath) || [];
+                const record = records[item.index];
+                if (!record) {
+                    skipped += 1;
+                    continue;
+                }
+                const id = typeof record.id === "string" ? record.id : "";
+                if (!id) {
+                    skipped += 1;
+                    continue;
+                }
+                const text = buildVectorSourceText(record, item.layer);
+                if (!text) {
+                    record.embedding_status = "failed";
+                    failed += 1;
+                    failureCounts[id] = (failureCounts[id] || 0) + 1;
+                    continue;
+                }
+                const chunkSize = deps.vectorChunking?.chunkSize ?? 600;
+                const chunkOverlap = deps.vectorChunking?.chunkOverlap ?? 100;
+                const chunks = splitTextChunks(text, chunkSize, chunkOverlap);
+                if (chunks.length === 0) {
+                    record.embedding_status = "failed";
+                    failed += 1;
+                    failureCounts[id] = (failureCounts[id] || 0) + 1;
+                    continue;
+                }
+                try {
+                    if (forceRebuild) {
+                        record.embedding_status = "pending";
+                    }
+                    await deps.vectorStore.deleteBySourceMemory({ layer: item.layer, sourceMemoryId: id });
+                    let chunkOk = 0;
+                    for (const chunk of chunks) {
+                        const embedding = await requestEmbedding({
+                            text: chunk.text,
+                            model,
+                            apiKey,
+                            baseUrl,
+                            dimensions: deps.embedding?.dimensions,
+                            timeoutMs: deps.embedding?.timeoutMs,
+                            maxRetries: deps.embedding?.maxRetries,
+                        });
+                        if (!embedding || embedding.length === 0) {
+                            continue;
+                        }
+                        if (!record.embedding) {
+                            record.embedding = embedding;
+                        }
+                        await deps.vectorStore.upsert({
+                            id: `${id}_c${chunk.index}`,
+                            session_id: typeof record.session_id === "string" ? record.session_id : "unknown",
+                            event_type: typeof record.event_type === "string" ? record.event_type : (item.layer === "active" ? "message" : "insight"),
+                            summary: chunk.text,
+                            timestamp: typeof record.timestamp === "string" ? record.timestamp : new Date().toISOString(),
+                            layer: item.layer,
+                            source_memory_id: id,
+                            source_memory_canonical_id: typeof record.canonical_id === "string" ? record.canonical_id : id,
+                            outcome: typeof record.outcome === "string" ? record.outcome : "",
+                            entities: Array.isArray(record.entities) ? record.entities.filter(v => typeof v === "string") : [],
+                            relations: Array.isArray(record.relations)
+                                ? record.relations
+                                    .map(v => {
+                                    if (!v || typeof v !== "object")
+                                        return null;
+                                    const relation = v;
+                                    const source = typeof relation.source === "string" ? relation.source : "";
+                                    const target = typeof relation.target === "string" ? relation.target : "";
+                                    const type = typeof relation.type === "string" ? relation.type : "related_to";
+                                    if (!source || !target)
+                                        return null;
+                                    return { source, target, type };
+                                })
+                                    .filter((v) => Boolean(v))
+                                : [],
+                            embedding,
+                            quality_score: typeof record.quality_score === "number" ? record.quality_score : 0.5,
+                            char_count: chunk.text.length,
+                            token_count: estimateTokenCount(chunk.text),
+                            chunk_index: chunk.index,
+                            chunk_total: chunks.length,
+                            chunk_start: chunk.start,
+                            chunk_end: chunk.end,
+                        });
+                        chunkOk += 1;
+                    }
+                    record.vector_chunks_total = chunks.length;
+                    record.vector_chunks_ok = chunkOk;
+                    record.embedding_status = chunkOk === chunks.length ? "ok" : "failed";
+                    if (!record.layer) {
+                        record.layer = item.layer;
+                    }
+                    if (typeof record.char_count !== "number") {
+                        record.char_count = text.length;
+                    }
+                    if (typeof record.token_count !== "number") {
+                        record.token_count = estimateTokenCount(text);
+                    }
+                    if (chunkOk === chunks.length) {
+                        success += 1;
+                        failureCounts[id] = 0;
+                    }
+                    else {
+                        failed += 1;
+                        failureCounts[id] = (failureCounts[id] || 0) + 1;
+                    }
+                }
+                catch (error) {
+                    record.embedding_status = "failed";
+                    failed += 1;
+                    failureCounts[id] = (failureCounts[id] || 0) + 1;
+                    deps.logger.warn(`backfill_embedding_failed id=${id} layer=${item.layer} error=${error}`);
+                }
+            }
+            deps.logger.info(`backfill_progress processed=${processed}/${totalCandidates} success=${success} failed=${failed} skipped=${skipped}`);
+        }
+        for (const target of targetFiles) {
+            const records = recordsByFile.get(target.filePath);
+            if (records) {
+                writeJsonl(target.filePath, records);
+            }
+        }
+        const summary = {
+            runAt: new Date().toISOString(),
+            layer,
+            rebuild_mode: rebuildMode,
+            candidates: totalCandidates,
+            success,
+            failed,
+            skipped,
+            batch_size: batchSize,
+            max_retries: maxRetries,
+            retry_failed_only: retryFailedOnly,
+            full_sync_result: fullSyncResult,
+        };
+        upsertJsonFile(statePath, {
+            version: "1",
+            lastRun: summary,
+            failureCounts,
+        });
+        upsertJsonFile(syncStatePath, {
+            version: "2",
+            lastVectorBackfill: {
+                runAt: summary.runAt,
+                success,
+                failed,
+                skipped,
+            },
+        });
+        return { success: true, data: summary };
+    }
     async function runDiagnostics(_args, _context) {
         const { activePath, archivePath } = memoryFiles();
+        const activeRecords = readJsonl(activePath);
+        const archiveRecords = readJsonl(archivePath);
+        const activeVector = embeddingStats(activeRecords);
+        const archiveVector = embeddingStats(archiveRecords);
+        const vectorJsonlPath = path.join(deps.memoryRoot, "vector", "lancedb_events.jsonl");
+        const vectorJsonlRecords = readJsonl(vectorJsonlPath);
+        const activeVectorRecords = vectorJsonlRecords.filter(record => (record.layer === "active"));
+        const archiveVectorRecords = vectorJsonlRecords.filter(record => (record.layer === "archive"));
+        const lancedbDir = path.join(deps.memoryRoot, "vector", "lancedb");
+        const lancedbExists = fs.existsSync(lancedbDir);
+        let lancedbRecordCount = 0;
+        if (lancedbExists) {
+            try {
+                const lancedbFiles = fs.readdirSync(lancedbDir).filter(f => f.endsWith(".lance") || f.endsWith(".manifest"));
+                lancedbRecordCount = lancedbFiles.length > 0 ? -1 : 0;
+            }
+            catch {
+                lancedbRecordCount = 0;
+            }
+        }
+        const totalVectorRecords = vectorJsonlRecords.length > 0 ? vectorJsonlRecords.length : (lancedbRecordCount === -1 ? -1 : 0);
+        const vectorStorageType = lancedbExists && lancedbRecordCount === -1 ? "lancedb" : (vectorJsonlRecords.length > 0 ? "jsonl" : "none");
+        const syncState = parseJsonFile(path.join(deps.memoryRoot, ".sync_state.json"));
+        const backfillState = parseJsonFile(path.join(deps.memoryRoot, ".vector_backfill_state.json"));
+        const failureCounts = backfillState && typeof backfillState.failureCounts === "object" && backfillState.failureCounts !== null
+            ? backfillState.failureCounts
+            : {};
+        const pendingRetry = Object.values(failureCounts).filter(value => typeof value === "number" && Number.isFinite(value) && value > 0).length;
+        const lastVectorBackfill = syncState && typeof syncState.lastVectorBackfill === "object" && syncState.lastVectorBackfill !== null
+            ? syncState.lastVectorBackfill
+            : null;
+        const embeddingConnectivity = await probeModelConnection({
+            kind: "embedding",
+            model: deps.embedding?.model || "",
+            apiKey: deps.embedding?.apiKey || "",
+            baseUrl: normalizeBaseUrl(deps.embedding?.baseURL || deps.embedding?.baseUrl),
+            timeoutMs: deps.embedding?.timeoutMs,
+        });
+        const llmConnectivity = await probeModelConnection({
+            kind: "llm",
+            model: deps.llm?.model || "",
+            apiKey: deps.llm?.apiKey || "",
+            baseUrl: normalizeBaseUrl(deps.llm?.baseURL || deps.llm?.baseUrl),
+            timeoutMs: 8000,
+        });
+        const rerankerConnectivity = await probeModelConnection({
+            kind: "reranker",
+            model: deps.reranker?.model || "",
+            apiKey: deps.reranker?.apiKey || "",
+            baseUrl: normalizeBaseUrl(deps.reranker?.baseURL || deps.reranker?.baseUrl),
+            timeoutMs: 8000,
+        });
         const checks = [
             { name: "Engine mode", passed: true, message: "TS engine active" },
             { name: "Active sessions store", passed: fs.existsSync(activePath), message: activePath },
             { name: "Archive sessions store", passed: fs.existsSync(archivePath), message: archivePath },
             { name: "Core rules store", passed: fs.existsSync(path.join(deps.memoryRoot, "CORTEX_RULES.md")), message: "CORTEX_RULES.md checked" },
+            { name: "Embedding model connectivity", passed: embeddingConnectivity.connected, message: embeddingConnectivity.error || "ok" },
+            { name: "LLM model connectivity", passed: llmConnectivity.connected, message: llmConnectivity.error || "ok" },
+            { name: "Reranker model connectivity", passed: rerankerConnectivity.connected, message: rerankerConnectivity.error || "ok" },
         ];
+        const qualityCheck = {
+            active: { total: 0, valid: 0, invalid: 0, issues: [] },
+            archive: { total: 0, valid: 0, invalid: 0, issues: [] },
+        };
+        if (fs.existsSync(activePath)) {
+            const content = fs.readFileSync(activePath, "utf-8");
+            const lines = content.split(/\r?\n/).filter(l => l.trim());
+            qualityCheck.active.total = lines.length;
+            for (let i = 0; i < lines.length; i++) {
+                const validation = (0, llm_output_validator_1.validateJsonlLine)(lines[i]);
+                if (validation.valid) {
+                    qualityCheck.active.valid++;
+                }
+                else {
+                    qualityCheck.active.invalid++;
+                    if (qualityCheck.active.issues.length < 5) {
+                        qualityCheck.active.issues.push({ line: i + 1, errors: validation.errors });
+                    }
+                }
+            }
+        }
+        if (fs.existsSync(archivePath)) {
+            const content = fs.readFileSync(archivePath, "utf-8");
+            const lines = content.split(/\r?\n/).filter(l => l.trim());
+            qualityCheck.archive.total = lines.length;
+            for (let i = 0; i < lines.length; i++) {
+                const validation = (0, llm_output_validator_1.validateJsonlLine)(lines[i]);
+                if (validation.valid) {
+                    qualityCheck.archive.valid++;
+                }
+                else {
+                    qualityCheck.archive.invalid++;
+                    if (qualityCheck.archive.issues.length < 5) {
+                        qualityCheck.archive.issues.push({ line: i + 1, errors: validation.errors });
+                    }
+                }
+            }
+        }
+        const totalInvalid = qualityCheck.active.invalid + qualityCheck.archive.invalid;
+        if (totalInvalid > 0) {
+            checks.push({ name: "Data integrity", passed: false, message: `${totalInvalid} invalid records found` });
+        }
+        else {
+            checks.push({ name: "Data integrity", passed: true, message: "All records valid" });
+        }
+        const graphMemoryPath = path.join(deps.memoryRoot, "graph", "memory.jsonl");
+        const graphRecords = readJsonl(graphMemoryPath);
+        function stringField(record, key) {
+            const value = record[key];
+            return typeof value === "string" ? value.trim() : "";
+        }
+        const activeFieldIssues = {
+            missing_id: 0,
+            missing_timestamp: 0,
+            missing_layer: 0,
+            missing_text_payload: 0,
+        };
+        for (const record of activeRecords) {
+            if (!stringField(record, "id"))
+                activeFieldIssues.missing_id += 1;
+            if (!stringField(record, "timestamp"))
+                activeFieldIssues.missing_timestamp += 1;
+            if (stringField(record, "layer") !== "active")
+                activeFieldIssues.missing_layer += 1;
+            const hasPayload = [
+                stringField(record, "content"),
+                stringField(record, "summary"),
+                stringField(record, "text"),
+                stringField(record, "message"),
+            ].some(Boolean);
+            if (!hasPayload)
+                activeFieldIssues.missing_text_payload += 1;
+        }
+        const archiveFieldIssues = {
+            missing_id: 0,
+            missing_timestamp: 0,
+            missing_layer: 0,
+            missing_summary: 0,
+            missing_source_memory_id: 0,
+        };
+        for (const record of archiveRecords) {
+            if (!stringField(record, "id"))
+                archiveFieldIssues.missing_id += 1;
+            if (!stringField(record, "timestamp"))
+                archiveFieldIssues.missing_timestamp += 1;
+            if (stringField(record, "layer") !== "archive")
+                archiveFieldIssues.missing_layer += 1;
+            if (!stringField(record, "summary"))
+                archiveFieldIssues.missing_summary += 1;
+            if (!stringField(record, "source_memory_id") && !stringField(record, "canonical_id")) {
+                archiveFieldIssues.missing_source_memory_id += 1;
+            }
+        }
+        const vectorFieldIssues = {
+            missing_id: 0,
+            missing_layer: 0,
+            missing_summary: 0,
+            missing_source_memory_id: 0,
+            missing_embedding: 0,
+        };
+        for (const record of vectorJsonlRecords) {
+            if (!stringField(record, "id"))
+                vectorFieldIssues.missing_id += 1;
+            const layer = stringField(record, "layer");
+            if (layer !== "active" && layer !== "archive")
+                vectorFieldIssues.missing_layer += 1;
+            if (!stringField(record, "summary"))
+                vectorFieldIssues.missing_summary += 1;
+            if (!stringField(record, "source_memory_id"))
+                vectorFieldIssues.missing_source_memory_id += 1;
+            const embedding = record.embedding;
+            const vector = record.vector;
+            const hasEmbedding = Array.isArray(embedding) ? embedding.length > 0 : (Array.isArray(vector) ? vector.length > 0 : false);
+            if (!hasEmbedding)
+                vectorFieldIssues.missing_embedding += 1;
+        }
+        const graphFieldIssues = {
+            missing_id: 0,
+            missing_event_ref: 0,
+            missing_layer: 0,
+            malformed_relations: 0,
+        };
+        for (const record of graphRecords) {
+            if (!stringField(record, "id"))
+                graphFieldIssues.missing_id += 1;
+            if (!stringField(record, "source_event_id") && !stringField(record, "archive_event_id")) {
+                graphFieldIssues.missing_event_ref += 1;
+            }
+            const layer = stringField(record, "source_layer");
+            if (layer !== "archive_event" && layer !== "active_only")
+                graphFieldIssues.missing_layer += 1;
+            if (!Array.isArray(record.relations))
+                graphFieldIssues.malformed_relations += 1;
+        }
+        const archiveIdSet = new Set(archiveRecords
+            .map(record => stringField(record, "id"))
+            .filter(Boolean));
+        const vectorLinkedToArchive = vectorJsonlRecords.filter(record => {
+            const sourceMemoryId = stringField(record, "source_memory_id");
+            return !!sourceMemoryId && archiveIdSet.has(sourceMemoryId);
+        }).length;
+        const graphLinkedToArchive = graphRecords.filter(record => {
+            const sourceLayer = stringField(record, "source_layer");
+            const refId = stringField(record, "source_event_id") || stringField(record, "archive_event_id");
+            return sourceLayer === "archive_event" && !!refId && archiveIdSet.has(refId);
+        }).length;
+        const schemaIssueTotal = Object.values(activeFieldIssues).reduce((sum, n) => sum + n, 0)
+            + Object.values(archiveFieldIssues).reduce((sum, n) => sum + n, 0)
+            + Object.values(vectorFieldIssues).reduce((sum, n) => sum + n, 0)
+            + Object.values(graphFieldIssues).reduce((sum, n) => sum + n, 0);
+        checks.push({
+            name: "Field mapping alignment",
+            passed: schemaIssueTotal === 0,
+            message: schemaIssueTotal === 0
+                ? "active/archive/vector/graph field mapping aligned with read path"
+                : `${schemaIssueTotal} field mapping issues detected across four memory stores`,
+        });
         return {
             success: true,
             data: {
                 status: "ok",
+                prompt_versions: PROMPT_VERSIONS,
                 checks,
-                recommendations: [],
+                layers: {
+                    active: {
+                        records: activeRecords.length,
+                        path: activePath,
+                    },
+                    archive: {
+                        records: archiveRecords.length,
+                        path: archivePath,
+                    },
+                    vector: {
+                        storage_type: vectorStorageType,
+                        lancedb_exists: lancedbExists,
+                        active_coverage: activeVector.coverage,
+                        archive_coverage: archiveVector.coverage,
+                        active_unembedded: activeVector.pending + activeVector.failed,
+                        archive_unembedded: archiveVector.pending + archiveVector.failed,
+                        chunking: {
+                            chunk_size: deps.vectorChunking?.chunkSize ?? 600,
+                            chunk_overlap: deps.vectorChunking?.chunkOverlap ?? 100,
+                        },
+                        vector_jsonl_records: vectorJsonlRecords.length,
+                        vector_jsonl_by_layer: {
+                            active: activeVectorRecords.length,
+                            archive: archiveVectorRecords.length,
+                        },
+                        total_vector_records: totalVectorRecords,
+                        last_backfill_summary: lastVectorBackfill,
+                        backfill_state: {
+                            pending_retry_records: pendingRetry,
+                            has_state_file: fs.existsSync(path.join(deps.memoryRoot, ".vector_backfill_state.json")),
+                        },
+                    },
+                    graph_rules: {
+                        graph_mutation_log_exists: fs.existsSync(path.join(deps.memoryRoot, "graph", "mutation_log.jsonl")),
+                        rules_exists: fs.existsSync(path.join(deps.memoryRoot, "CORTEX_RULES.md")),
+                    },
+                },
+                model_connectivity: {
+                    embedding: embeddingConnectivity,
+                    llm: llmConnectivity,
+                    reranker: rerankerConnectivity,
+                },
+                quality_check: qualityCheck,
+                schema_alignment: {
+                    active: {
+                        records: activeRecords.length,
+                        issues: activeFieldIssues,
+                    },
+                    archive: {
+                        records: archiveRecords.length,
+                        issues: archiveFieldIssues,
+                    },
+                    vector: {
+                        records: vectorJsonlRecords.length,
+                        issues: vectorFieldIssues,
+                        linked_to_archive: vectorLinkedToArchive,
+                    },
+                    graph: {
+                        records: graphRecords.length,
+                        issues: graphFieldIssues,
+                        linked_archive_events: graphLinkedToArchive,
+                    },
+                    cross_layer_links: {
+                        archive_records: archiveIdSet.size,
+                        vector_archive_link_coverage: archiveIdSet.size > 0
+                            ? Number((vectorLinkedToArchive / archiveIdSet.size).toFixed(4))
+                            : 0,
+                        graph_archive_link_coverage: archiveIdSet.size > 0
+                            ? Number((graphLinkedToArchive / archiveIdSet.size).toFixed(4))
+                            : 0,
+                    },
+                },
+                recommendations: [
+                    ...(totalInvalid > 0 ? ["Run repair-memory --fix to clean invalid records"] : []),
+                    ...(schemaIssueTotal > 0 ? ["Run diagnostics output schema_alignment and repair missing cross-layer fields"] : []),
+                ],
             },
         };
     }
     async function searchMemory(args, context) {
-        if (!args || !args.query) {
+        const argsRecord = asRecord(args) || {};
+        const argsInput = asRecord(argsRecord.input);
+        const queryCandidate = [
+            typeof args.query === "string" ? args.query : "",
+            typeof argsRecord.query === "string" ? String(argsRecord.query) : "",
+            typeof argsRecord.q === "string" ? String(argsRecord.q) : "",
+            typeof argsRecord.keyword === "string" ? String(argsRecord.keyword) : "",
+            typeof argsInput?.query === "string" ? String(argsInput.query) : "",
+            typeof argsInput?.q === "string" ? String(argsInput.q) : "",
+        ].find(item => item.trim());
+        const query = queryCandidate ? queryCandidate.trim() : "";
+        if (!query) {
             return {
                 success: false,
                 error: "Invalid input provided. Missing 'query' parameter.",
             };
         }
+        const topKRaw = [
+            typeof args.top_k === "number" ? args.top_k : undefined,
+            typeof argsRecord.top_k === "number" ? Number(argsRecord.top_k) : undefined,
+            typeof argsRecord.topK === "number" ? Number(argsRecord.topK) : undefined,
+            typeof argsInput?.top_k === "number" ? Number(argsInput.top_k) : undefined,
+            typeof argsInput?.topK === "number" ? Number(argsInput.topK) : undefined,
+        ].find(value => typeof value === "number" && Number.isFinite(value));
         const result = await deps.readStore.searchMemory({
-            query: args.query,
-            topK: typeof args.top_k === "number" && args.top_k > 0 ? Math.floor(args.top_k) : 3,
+            query,
+            topK: typeof topKRaw === "number" && topKRaw > 0 ? Math.floor(topKRaw) : 3,
         });
         return { success: true, data: result.results };
     }
@@ -252,10 +1382,19 @@ function createTsEngine(deps) {
         return { success: true, data: result.context };
     }
     async function getAutoContext(args, context) {
-        const sessionId = deps.resolveSessionId(context);
+        const argsRecord = asRecord(args) || {};
+        const argsInput = asRecord(argsRecord.input);
+        const includeHotRaw = [
+            typeof args.include_hot === "boolean" ? args.include_hot : undefined,
+            typeof argsRecord.include_hot === "boolean" ? Boolean(argsRecord.include_hot) : undefined,
+            typeof argsRecord.includeHot === "boolean" ? Boolean(argsRecord.includeHot) : undefined,
+            typeof argsInput?.include_hot === "boolean" ? Boolean(argsInput.include_hot) : undefined,
+            typeof argsInput?.includeHot === "boolean" ? Boolean(argsInput.includeHot) : undefined,
+        ].find(value => typeof value === "boolean");
+        const sessionId = deps.resolveSessionId((context || {}));
         const cached = deps.getCachedAutoSearch(sessionId);
         const result = await deps.readStore.getAutoContext({
-            includeHot: args.include_hot !== false,
+            includeHot: includeHotRaw !== false,
             sessionId,
             cachedAutoSearch: cached ?? undefined,
         });
@@ -305,12 +1444,15 @@ function createTsEngine(deps) {
         const sessionId = deps.resolveSessionId(context, payload);
         const syncRecordsRaw = payloadObj?.sync_records;
         const syncRecords = typeof syncRecordsRaw === "boolean" ? syncRecordsRaw : deps.defaultAutoSync;
+        const bufferedMessages = sessionMessageBuffer.get(sessionId) || [];
         try {
             const result = await deps.sessionEnd.onSessionEnd({
                 sessionId,
                 syncRecords,
+                messages: bufferedMessages,
             });
             deps.logger.info(`TS session_end completed for ${sessionId}, events=${result.events_generated}`);
+            sessionMessageBuffer.delete(sessionId);
         }
         catch (error) {
             deps.logger.warn(`TS session_end failed for ${sessionId}: ${error}`);
@@ -323,26 +1465,11 @@ function createTsEngine(deps) {
         }
         const { text, role, source } = normalized;
         const sessionId = deps.resolveSessionId(context, payload);
-        try {
-            const writeResult = await deps.writeStore.writeMemory({
-                text,
-                role,
-                source,
-                sessionId,
-            });
-            if (writeResult.status === "ok") {
-                deps.logger.info(`TS write stored ${role} message for session ${sessionId}`);
-            }
-            else {
-                deps.logger.debug(`TS write skipped for session ${sessionId}: ${writeResult.reason || "unknown"}`);
-            }
-        }
-        catch (error) {
-            deps.logger.warn(`TS write failed for session ${sessionId}: ${error}`);
-        }
+        pushSessionMessage(sessionId, { role, text });
+        deps.logger.debug(`TS buffered ${role} message for session ${sessionId} source=${source}`);
         if (role === "user" && text.length > 5) {
             try {
-                const searchResult = await deps.readStore.searchMemory({ query: text, topK: 3 });
+                const searchResult = await deps.readStore.searchMemory({ query: text, topK: 3, mode: "lightweight" });
                 if (searchResult.results.length > 0) {
                     deps.setSessionAutoSearchCache(sessionId, text, searchResult.results);
                     deps.logger.info(`TS auto-search cached ${searchResult.results.length} results for context`);
@@ -381,6 +1508,7 @@ function createTsEngine(deps) {
         deleteMemory,
         updateMemory,
         cleanupMemories,
+        backfillEmbeddings,
         runDiagnostics,
         onMessage,
         onSessionEnd,