@origintrail-official/dkg-node-ui 10.0.12 → 10.0.14

package/dist/chat-memory.js

@@ -20,8 +20,11 @@ const IMPORT_SOURCES = ['claude', 'chatgpt', 'gemini', 'other'];
  * extraction). v1 of the openclaw-dkg-primary-memory work intentionally
  * defers that migration; follow-up work tracks it.
  */
-const AGENT_CONTEXT_GRAPH = 'agent-context';
-const CHAT_TURNS_ASSERTION = 'chat-turns';
+// Exported so the daemon's MemoryToolContext implementation can key
+// chat-specific ensure behavior (the legacy-WM migration for exactly this
+// assertion, #2149) off the same identifiers the manager writes with.
+export const AGENT_CONTEXT_GRAPH = 'agent-context';
+export const CHAT_TURNS_ASSERTION = 'chat-turns';
 const OPENCLAW_LOCAL_SESSION_ID = 'openclaw:dkg-ui';
 const CHAT_NS = 'urn:dkg:chat:';
 const MEMORY_NS = 'urn:dkg:memory:';
@@ -183,102 +186,102 @@ function buildSessionRootPattern(sessionUri) {
     const clauses = [
         `{ <${sessionUri}> ?sessionP ?sessionO . BIND(<${sessionUri}> AS ?s) }`,
         `{ ?s <${SCHEMA}isPartOf> <${sessionUri}> }`,
-        `{
-      ?msg <${SCHEMA}isPartOf> <${sessionUri}> .
-      ?msg <${DKG_ONT}usedTool> ?s .
+        `{
+      ?msg <${SCHEMA}isPartOf> <${sessionUri}> .
+      ?msg <${DKG_ONT}usedTool> ?s .
     }`,
-        `{
-      ?msg <${SCHEMA}isPartOf> <${sessionUri}> .
-      ?s <${DKG_ONT}mentionedIn> ?msg .
+        `{
+      ?msg <${SCHEMA}isPartOf> <${sessionUri}> .
+      ?s <${DKG_ONT}mentionedIn> ?msg .
     }`,
         `{ ?s <${DKG_ONT}extractedFrom> <${sessionUri}> }`,
     ];
-    return `{
-    ${clauses.join('\n    UNION ')}
+    return `{
+    ${clauses.join('\n    UNION ')}
   }`;
 }
-const MENTION_EXTRACTION_PROMPT = `Extract named entities mentioned in the following text. Output ONLY a JSON array of objects with "name" and "type" fields.
-
-Rules:
-- "name" is the canonical label (proper casing, e.g. "Porsche", "Bitcoin", "Berlin")
-- "type" is one of: Person, Organization, Place, Product, Event, Technology, Concept
-- Only extract concrete, specific entities — skip vague words like "car", "company", "city"
-- If no entities found, output: []
-- Do NOT wrap in markdown code fences
-
-Example output:
-[{"name":"Porsche","type":"Organization"},{"name":"Berlin","type":"Place"}]
-
+const MENTION_EXTRACTION_PROMPT = `Extract named entities mentioned in the following text. Output ONLY a JSON array of objects with "name" and "type" fields.
+
+Rules:
+- "name" is the canonical label (proper casing, e.g. "Porsche", "Bitcoin", "Berlin")
+- "type" is one of: Person, Organization, Place, Product, Event, Technology, Concept
+- Only extract concrete, specific entities — skip vague words like "car", "company", "city"
+- If no entities found, output: []
+- Do NOT wrap in markdown code fences
+
+Example output:
+[{"name":"Porsche","type":"Organization"},{"name":"Berlin","type":"Place"}]
+
 Text:`;
-const KG_EXTRACTION_PROMPT = `Extract structured knowledge from the following conversation exchange. Output ONLY valid N-Triples (one per line, no blank lines). Use URIs for subjects/predicates and proper RDF syntax.
-
-Rules:
-- Subject URIs: use urn:dkg:entity:{slug} where slug is a lowercase-kebab-case identifier for the entity
-- Use schema.org predicates where possible (e.g. <http://schema.org/name>, <http://schema.org/description>, <http://schema.org/knows>, <http://schema.org/about>)
-- Use <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> for types
-- String literals use "value" syntax; typed literals use "value"^^<datatype>
-- Each triple must end with " ."
-- Only extract factual, meaningful entities and relationships — skip conversational filler
-- If no meaningful knowledge can be extracted, output exactly: NONE
-
-Example output:
-<urn:dkg:entity:alice> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://schema.org/Person> .
-<urn:dkg:entity:alice> <http://schema.org/name> "Alice Johnson" .
-<urn:dkg:entity:alice> <http://schema.org/worksFor> <urn:dkg:entity:acme-corp> .
-
+const KG_EXTRACTION_PROMPT = `Extract structured knowledge from the following conversation exchange. Output ONLY valid N-Triples (one per line, no blank lines). Use URIs for subjects/predicates and proper RDF syntax.
+
+Rules:
+- Subject URIs: use urn:dkg:entity:{slug} where slug is a lowercase-kebab-case identifier for the entity
+- Use schema.org predicates where possible (e.g. <http://schema.org/name>, <http://schema.org/description>, <http://schema.org/knows>, <http://schema.org/about>)
+- Use <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> for types
+- String literals use "value" syntax; typed literals use "value"^^<datatype>
+- Each triple must end with " ."
+- Only extract factual, meaningful entities and relationships — skip conversational filler
+- If no meaningful knowledge can be extracted, output exactly: NONE
+
+Example output:
+<urn:dkg:entity:alice> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://schema.org/Person> .
+<urn:dkg:entity:alice> <http://schema.org/name> "Alice Johnson" .
+<urn:dkg:entity:alice> <http://schema.org/worksFor> <urn:dkg:entity:acme-corp> .
+
 Conversation:`;
-const MEMORY_PARSE_PROMPT = `Parse the following exported AI memories into individual structured items. Each memory is a discrete fact, preference, or piece of context the user previously shared with an AI assistant.
-
-Output ONLY a valid JSON array. Each item should have:
-- "text": the memory content as a clear sentence
-- "category": one of "preference", "fact", "context", "instruction", "relationship"
-
-Rules:
-- Split compound memories into separate items when they contain distinct facts
-- Normalize formatting: remove bullet markers, numbering, markdown artifacts
-- Preserve the original meaning faithfully
-- Skip metadata lines like "Here are your memories:" or "Last updated:"
-- If no valid memories can be extracted, output: []
-- Do NOT wrap in markdown code fences
-
-Example input:
-"- Prefers dark mode in all apps
-- Works at Acme Corp as a senior engineer
-- Has a dog named Max"
-
-Example output:
-[{"text":"Prefers dark mode in all apps","category":"preference"},{"text":"Works at Acme Corp as a senior engineer","category":"fact"},{"text":"Has a dog named Max","category":"fact"}]
-
+const MEMORY_PARSE_PROMPT = `Parse the following exported AI memories into individual structured items. Each memory is a discrete fact, preference, or piece of context the user previously shared with an AI assistant.
+
+Output ONLY a valid JSON array. Each item should have:
+- "text": the memory content as a clear sentence
+- "category": one of "preference", "fact", "context", "instruction", "relationship"
+
+Rules:
+- Split compound memories into separate items when they contain distinct facts
+- Normalize formatting: remove bullet markers, numbering, markdown artifacts
+- Preserve the original meaning faithfully
+- Skip metadata lines like "Here are your memories:" or "Last updated:"
+- If no valid memories can be extracted, output: []
+- Do NOT wrap in markdown code fences
+
+Example input:
+"- Prefers dark mode in all apps
+- Works at Acme Corp as a senior engineer
+- Has a dog named Max"
+
+Example output:
+[{"text":"Prefers dark mode in all apps","category":"preference"},{"text":"Works at Acme Corp as a senior engineer","category":"fact"},{"text":"Has a dog named Max","category":"fact"}]
+
 Memories to parse:`;
-const MEMORY_KG_PROMPT = `Extract structured knowledge from the following personal memory items. These are facts/preferences a user previously stored with an AI assistant. Output ONLY valid N-Triples (one per line).
-
-Rules:
-- Subject URIs: use urn:dkg:entity:{slug} where slug is a lowercase-kebab-case identifier
-- Use schema.org predicates where possible (e.g. <http://schema.org/name>, <http://schema.org/description>, <http://schema.org/knows>)
-- Use <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> for types
-- String literals use "value" syntax
-- Each triple must end with " ."
-- Focus on extracting entities (people, organizations, tools, places) and their relationships
-- If no meaningful knowledge can be extracted, output exactly: NONE
-
+const MEMORY_KG_PROMPT = `Extract structured knowledge from the following personal memory items. These are facts/preferences a user previously stored with an AI assistant. Output ONLY valid N-Triples (one per line).
+
+Rules:
+- Subject URIs: use urn:dkg:entity:{slug} where slug is a lowercase-kebab-case identifier
+- Use schema.org predicates where possible (e.g. <http://schema.org/name>, <http://schema.org/description>, <http://schema.org/knows>)
+- Use <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> for types
+- String literals use "value" syntax
+- Each triple must end with " ."
+- Focus on extracting entities (people, organizations, tools, places) and their relationships
+- If no meaningful knowledge can be extracted, output exactly: NONE
+
 Memory items:`;
-const SEMANTIC_RECALL_SYSTEM = `You are a SPARQL query generator. Output ONLY a valid SPARQL SELECT query.
-
-IMPORTANT: Always use full URI syntax with angle brackets — NEVER use prefix shortcuts.
-
-Available patterns:
-- Sessions: ?s <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://schema.org/Conversation>
-- Messages: ?m <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://schema.org/Message>
-  - ?m <http://schema.org/text> ?text
-  - ?m <http://schema.org/author> <urn:dkg:chat:actor:user> or <urn:dkg:chat:actor:agent>
-  - ?m <http://schema.org/isPartOf> ?session
-  - ?m <http://schema.org/dateCreated> ?ts
-- Entities: ?e <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> ?type . FILTER(STRSTARTS(STR(?e), "urn:dkg:entity:"))
-  - ?e <http://schema.org/name> ?name
-  - ?e <http://schema.org/worksFor> ?org
-- Memory links: ?m <http://dkg.io/ontology/contains> ?entity
-- Entity mentions: ?entity <http://dkg.io/ontology/mentionedIn> ?message
-
+const SEMANTIC_RECALL_SYSTEM = `You are a SPARQL query generator. Output ONLY a valid SPARQL SELECT query.
+
+IMPORTANT: Always use full URI syntax with angle brackets — NEVER use prefix shortcuts.
+
+Available patterns:
+- Sessions: ?s <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://schema.org/Conversation>
+- Messages: ?m <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://schema.org/Message>
+  - ?m <http://schema.org/text> ?text
+  - ?m <http://schema.org/author> <urn:dkg:chat:actor:user> or <urn:dkg:chat:actor:agent>
+  - ?m <http://schema.org/isPartOf> ?session
+  - ?m <http://schema.org/dateCreated> ?ts
+- Entities: ?e <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> ?type . FILTER(STRSTARTS(STR(?e), "urn:dkg:entity:"))
+  - ?e <http://schema.org/name> ?name
+  - ?e <http://schema.org/worksFor> ?org
+- Memory links: ?m <http://dkg.io/ontology/contains> ?entity
+- Entity mentions: ?entity <http://dkg.io/ontology/mentionedIn> ?message
+
 Always include LIMIT (default 50). Use FILTER with regex or CONTAINS for text search.`;
 export class ChatMemoryManager {
     tools;
@@ -300,6 +303,15 @@ export class ChatMemoryManager {
     get contextGraphId() {
         return this.agentContextGraph;
     }
+    /**
+     * The chat-turns assertion this manager writes to. Exposed so a caller
+     * wiring a storage-upgrade policy can assert it covers the assertion the
+     * manager ACTUALLY uses, rather than comparing its own configuration to
+     * itself (#2149).
+     */
+    get assertionName() {
+        return this.chatTurnsAssertion;
+    }
     updateConfig(llmConfig) {
         this.llmConfig = llmConfig;
     }
@@ -316,6 +328,18 @@ export class ChatMemoryManager {
             assertionName: overrides?.assertionName ?? this.chatTurnsAssertion,
         };
     }
+    wmMutationOpts() {
+        return { agentAddress: this.agentAddress };
+    }
+    /**
+     * The ONE route every chat-turn mutation takes. Target graph, assertion
+     * name, and the resolved-agent mutation options are owned here, so a new
+     * write path cannot silently land in a different graph or skip the
+     * agentAddress that reads resolve under (#277, #2149).
+     */
+    async writeChatTurns(quads) {
+        await this.tools.writeAssertion(this.agentContextGraph, this.chatTurnsAssertion, quads, this.wmMutationOpts());
+    }
     /**
      * Lazy creation of the chat-turn context graph + assertion. Runs on the
      * first `storeChatExchange` / `ensureInitialized` call and is idempotent
@@ -348,7 +372,7 @@ export class ChatMemoryManager {
         const assertionKey = `${this.agentContextGraph}::${this.chatTurnsAssertion}`;
         if (!this.assertionEnsured.has(assertionKey)) {
             try {
-                await this.tools.createAssertion(this.agentContextGraph, this.chatTurnsAssertion);
+                await this.tools.createAssertion(this.agentContextGraph, this.chatTurnsAssertion, this.wmMutationOpts());
                 this.assertionEnsured.add(assertionKey);
             }
             catch (err) {
@@ -417,7 +441,7 @@ export class ChatMemoryManager {
                 quads.push({ subject: tcUri, predicate: RDF_TYPE, object: `${DKG_ONT}ToolInvocation`, graph: '' }, { subject: tcUri, predicate: `${DKG_ONT}toolName`, object: `"${tc.name}"`, graph: '' }, { subject: tcUri, predicate: `${DKG_ONT}toolArgs`, object: JSON.stringify(JSON.stringify(tc.args)), graph: '' }, { subject: assistantMsgUri, predicate: `${DKG_ONT}usedTool`, object: tcUri, graph: '' });
             }
         }
-        await this.tools.writeAssertion(this.agentContextGraph, this.chatTurnsAssertion, quads);
+        await this.writeChatTurns(quads);
         this.knownSessions.add(sessionId);
         // Fire-and-forget: extract entity mentions and write them as separate triples
         if (this.llmConfig?.apiKey) {
@@ -431,10 +455,10 @@ export class ChatMemoryManager {
         if (!trimmedTurnId)
             return false;
         const sessionUri = `${CHAT_NS}session:${sessionId}`;
-        const result = await this.tools.query(`SELECT ?turn WHERE {
-        ?turn <${RDF_TYPE}> <${DKG_ONT}ChatTurn> .
-        ?turn <${SCHEMA}isPartOf> <${sessionUri}> .
-        ?turn <${DKG_ONT}turnId> ${JSON.stringify(trimmedTurnId)} .
+        const result = await this.tools.query(`SELECT ?turn WHERE {
+        ?turn <${RDF_TYPE}> <${DKG_ONT}ChatTurn> .
+        ?turn <${SCHEMA}isPartOf> <${sessionUri}> .
+        ?turn <${DKG_ONT}turnId> ${JSON.stringify(trimmedTurnId)} .
       } LIMIT 1`, this.wmReadOpts());
         return (result.bindings ?? []).length > 0;
     }
@@ -444,16 +468,16 @@ export class ChatMemoryManager {
         if (!trimmedTurnId)
             return null;
         const sessionUri = `${CHAT_NS}session:${sessionId}`;
-        const result = await this.tools.query(`SELECT ?persistenceState ?transitionState WHERE {
-        ?turn <${RDF_TYPE}> <${DKG_ONT}ChatTurn> .
-        ?turn <${SCHEMA}isPartOf> <${sessionUri}> .
-        ?turn <${DKG_ONT}turnId> ${JSON.stringify(trimmedTurnId)} .
-        OPTIONAL { ?turn <${DKG_ONT}persistenceState> ?persistenceState }
-        OPTIONAL {
-          ?transition <${RDF_TYPE}> <${CHAT_TURN_PERSISTENCE_TRANSITION_TYPE}> .
-          ?transition <${CHAT_TURN_PERSISTENCE_TRANSITION_PREDICATE}> ?turn .
-          ?transition <${DKG_ONT}persistenceState> ?transitionState .
-        }
+        const result = await this.tools.query(`SELECT ?persistenceState ?transitionState WHERE {
+        ?turn <${RDF_TYPE}> <${DKG_ONT}ChatTurn> .
+        ?turn <${SCHEMA}isPartOf> <${sessionUri}> .
+        ?turn <${DKG_ONT}turnId> ${JSON.stringify(trimmedTurnId)} .
+        OPTIONAL { ?turn <${DKG_ONT}persistenceState> ?persistenceState }
+        OPTIONAL {
+          ?transition <${RDF_TYPE}> <${CHAT_TURN_PERSISTENCE_TRANSITION_TYPE}> .
+          ?transition <${CHAT_TURN_PERSISTENCE_TRANSITION_PREDICATE}> ?turn .
+          ?transition <${DKG_ONT}persistenceState> ?transitionState .
+        }
       }`, this.wmReadOpts());
         const states = (result.bindings ?? [])
             .flatMap((binding) => [
@@ -520,7 +544,7 @@ export class ChatMemoryManager {
                 graph: '',
             });
         }
-        await this.tools.writeAssertion(this.agentContextGraph, this.chatTurnsAssertion, quads);
+        await this.writeChatTurns(quads);
     }
     async extractAndWriteMentions(userMsgUri, userMessage, assistantMsgUri, assistantReply) {
         const allText = `User: ${userMessage}\nAssistant: ${assistantReply}`;
@@ -554,7 +578,7 @@ export class ChatMemoryManager {
             }
         }
         if (quads.length > 0) {
-            await this.tools.writeAssertion(this.agentContextGraph, this.chatTurnsAssertion, quads);
+            await this.writeChatTurns(quads);
         }
     }
     async callMentionExtraction(text) {
@@ -623,7 +647,7 @@ export class ChatMemoryManager {
             const memUri = `${MEMORY_NS}${crypto.randomUUID().slice(0, 8)}`;
             quads.push({ subject: memUri, predicate: RDF_TYPE, object: `${DKG_ONT}Memory`, graph: '' }, { subject: memUri, predicate: `${DKG_ONT}extractedFrom`, object: sessionUri, graph: '' }, { subject: memUri, predicate: `${DKG_ONT}contains`, object: entity, graph: '' }, { subject: memUri, predicate: `${SCHEMA}dateCreated`, object: `"${new Date().toISOString()}"^^<${XSD_DATETIME}>`, graph: '' });
         }
-        await this.tools.writeAssertion(this.agentContextGraph, this.chatTurnsAssertion, quads);
+        await this.writeChatTurns(quads);
         return triples.length;
     }
     async recall(sparql) {
@@ -668,12 +692,12 @@ export class ChatMemoryManager {
             base.sessionCount = sumBindingValues(sessions.bindings, 'c');
             const msgs = await this.tools.query(`SELECT (COUNT(*) AS ?c) WHERE { ?s <${RDF_TYPE}> <${SCHEMA}Message> }`, this.wmReadOpts());
             base.messageCount = sumBindingValues(msgs.bindings, 'c');
-            const chatRelatedTriples = await this.tools.query(`SELECT (COUNT(*) AS ?c) WHERE {
-          { ?s <${RDF_TYPE}> <${SCHEMA}Message> . ?s ?p ?o }
-          UNION
-          { ?s <${RDF_TYPE}> <${SCHEMA}Conversation> . ?s ?p ?o }
-          UNION
-          { ?s <${RDF_TYPE}> <${DKG_ONT}ToolInvocation> . ?s ?p ?o }
+            const chatRelatedTriples = await this.tools.query(`SELECT (COUNT(*) AS ?c) WHERE {
+          { ?s <${RDF_TYPE}> <${SCHEMA}Message> . ?s ?p ?o }
+          UNION
+          { ?s <${RDF_TYPE}> <${SCHEMA}Conversation> . ?s ?p ?o }
+          UNION
+          { ?s <${RDF_TYPE}> <${DKG_ONT}ToolInvocation> . ?s ?p ?o }
         }`, this.wmReadOpts());
             const chatTripleCount = sumBindingValues(chatRelatedTriples.bindings, 'c');
             const entities = await this.tools.query(`SELECT (COUNT(DISTINCT ?e) AS ?c) WHERE { ?e <${RDF_TYPE}> ?t . FILTER(STRSTARTS(STR(?e), "urn:dkg:entity:")) }`, this.wmReadOpts());
@@ -686,10 +710,10 @@ export class ChatMemoryManager {
     async getEntities(limit = 50) {
         await this.ensureInitialized();
         try {
-            const result = await this.tools.query(`SELECT DISTINCT ?e ?type ?label WHERE {
-          ?e <${RDF_TYPE}> ?type .
-          OPTIONAL { ?e <${SCHEMA}name> ?label }
-          FILTER(STRSTARTS(STR(?e), "urn:dkg:entity:"))
+            const result = await this.tools.query(`SELECT DISTINCT ?e ?type ?label WHERE {
+          ?e <${RDF_TYPE}> ?type .
+          OPTIONAL { ?e <${SCHEMA}name> ?label }
+          FILTER(STRSTARTS(STR(?e), "urn:dkg:entity:"))
         } LIMIT ${limit}`, this.wmReadOpts());
             const entities = [];
             for (const b of result.bindings ?? []) {
@@ -722,35 +746,35 @@ export class ChatMemoryManager {
                 : 500;
             const order = opts.order === 'desc' ? 'DESC' : 'ASC';
             const sessionUri = `${CHAT_NS}session:${sessionId}`;
-            const msgsResult = await this.tools.query(`SELECT ?m ?author ?text ?ts ?turnId ?persistenceState ?transitionState ?attachmentRefs ?failureReason ?transitionFailureReason ?transitionAssistantReply ?transitionAttachmentRefs ?transitionToolCalls WHERE {
-          {
-            SELECT ?m ?ts WHERE {
-              ?m <${SCHEMA}isPartOf> <${sessionUri}> .
-              ?m <${SCHEMA}dateCreated> ?ts
-            } ORDER BY ${order}(?ts) LIMIT ${limit}
-          }
-          ?m <${SCHEMA}isPartOf> <${sessionUri}> .
-          ?m <${SCHEMA}author> ?author .
-          ?m <${SCHEMA}text> ?text .
-          ?m <${SCHEMA}dateCreated> ?ts
-          OPTIONAL { ?m <${DKG_ONT}turnId> ?turnId }
-          OPTIONAL { ?m <${CHAT_ATTACHMENT_REFS_PREDICATE}> ?attachmentRefs }
-          OPTIONAL {
-            ?turn <${RDF_TYPE}> <${DKG_ONT}ChatTurn> .
-            ?turn <${SCHEMA}isPartOf> <${sessionUri}> .
-            ?turn <${DKG_ONT}turnId> ?turnId .
-            OPTIONAL { ?turn <${DKG_ONT}persistenceState> ?persistenceState }
-            OPTIONAL { ?turn <${DKG_ONT}failureReason> ?failureReason }
-            OPTIONAL {
-              ?transition <${RDF_TYPE}> <${CHAT_TURN_PERSISTENCE_TRANSITION_TYPE}> .
-              ?transition <${CHAT_TURN_PERSISTENCE_TRANSITION_PREDICATE}> ?turn .
-              ?transition <${DKG_ONT}persistenceState> ?transitionState .
-              OPTIONAL { ?transition <${DKG_ONT}failureReason> ?transitionFailureReason }
-              OPTIONAL { ?transition <${DKG_ONT}assistantReply> ?transitionAssistantReply }
-              OPTIONAL { ?transition <${CHAT_ATTACHMENT_REFS_PREDICATE}> ?transitionAttachmentRefs }
-              OPTIONAL { ?transition <${DKG_ONT}toolCalls> ?transitionToolCalls }
-            }
-          }
+            const msgsResult = await this.tools.query(`SELECT ?m ?author ?text ?ts ?turnId ?persistenceState ?transitionState ?attachmentRefs ?failureReason ?transitionFailureReason ?transitionAssistantReply ?transitionAttachmentRefs ?transitionToolCalls WHERE {
+          {
+            SELECT ?m ?ts WHERE {
+              ?m <${SCHEMA}isPartOf> <${sessionUri}> .
+              ?m <${SCHEMA}dateCreated> ?ts
+            } ORDER BY ${order}(?ts) LIMIT ${limit}
+          }
+          ?m <${SCHEMA}isPartOf> <${sessionUri}> .
+          ?m <${SCHEMA}author> ?author .
+          ?m <${SCHEMA}text> ?text .
+          ?m <${SCHEMA}dateCreated> ?ts
+          OPTIONAL { ?m <${DKG_ONT}turnId> ?turnId }
+          OPTIONAL { ?m <${CHAT_ATTACHMENT_REFS_PREDICATE}> ?attachmentRefs }
+          OPTIONAL {
+            ?turn <${RDF_TYPE}> <${DKG_ONT}ChatTurn> .
+            ?turn <${SCHEMA}isPartOf> <${sessionUri}> .
+            ?turn <${DKG_ONT}turnId> ?turnId .
+            OPTIONAL { ?turn <${DKG_ONT}persistenceState> ?persistenceState }
+            OPTIONAL { ?turn <${DKG_ONT}failureReason> ?failureReason }
+            OPTIONAL {
+              ?transition <${RDF_TYPE}> <${CHAT_TURN_PERSISTENCE_TRANSITION_TYPE}> .
+              ?transition <${CHAT_TURN_PERSISTENCE_TRANSITION_PREDICATE}> ?turn .
+              ?transition <${DKG_ONT}persistenceState> ?transitionState .
+              OPTIONAL { ?transition <${DKG_ONT}failureReason> ?transitionFailureReason }
+              OPTIONAL { ?transition <${DKG_ONT}assistantReply> ?transitionAssistantReply }
+              OPTIONAL { ?transition <${CHAT_ATTACHMENT_REFS_PREDICATE}> ?transitionAttachmentRefs }
+              OPTIONAL { ?transition <${DKG_ONT}toolCalls> ?transitionToolCalls }
+            }
+          }
         } ORDER BY ${order}(?ts)`, this.wmReadOpts());
             const bindings = msgsResult.bindings ?? [];
             if (bindings.length === 0)
@@ -812,10 +836,10 @@ export class ChatMemoryManager {
         await this.ensureInitialized();
         try {
             const expandedLimit = Math.max(limit, Math.min(limit * 4, 400));
-            const sessionsResult = await this.tools.query(`SELECT ?s ?sid (MAX(?mts) AS ?latest) WHERE {
-          ?s <${RDF_TYPE}> <${SCHEMA}Conversation> .
-          ?s <${DKG_ONT}sessionId> ?sid .
-          OPTIONAL { ?m <${SCHEMA}isPartOf> ?s . ?m <${SCHEMA}dateCreated> ?mts }
+            const sessionsResult = await this.tools.query(`SELECT ?s ?sid (MAX(?mts) AS ?latest) WHERE {
+          ?s <${RDF_TYPE}> <${SCHEMA}Conversation> .
+          ?s <${DKG_ONT}sessionId> ?sid .
+          OPTIONAL { ?m <${SCHEMA}isPartOf> ?s . ?m <${SCHEMA}dateCreated> ?mts }
         } GROUP BY ?s ?sid ORDER BY DESC(?latest) LIMIT ${expandedLimit}`, this.wmReadOpts());
             const sessionBindings = sessionsResult.bindings ?? [];
             if (sessionBindings.length === 0)
@@ -842,12 +866,12 @@ export class ChatMemoryManager {
             const values = sessionEntries
                 .map((entry) => `<${entry.sessionUri}>`)
                 .join(' ');
-            const allMsgs = await this.tools.query(`SELECT ?session ?author ?text ?ts WHERE {
-          VALUES ?session { ${values} }
-          ?m <${SCHEMA}isPartOf> ?session .
-          ?m <${SCHEMA}author> ?author .
-          ?m <${SCHEMA}text> ?text .
-          ?m <${SCHEMA}dateCreated> ?ts
+            const allMsgs = await this.tools.query(`SELECT ?session ?author ?text ?ts WHERE {
+          VALUES ?session { ${values} }
+          ?m <${SCHEMA}isPartOf> ?session .
+          ?m <${SCHEMA}author> ?author .
+          ?m <${SCHEMA}text> ?text .
+          ?m <${SCHEMA}dateCreated> ?ts
         } ORDER BY ?session ?ts`, this.wmReadOpts());
             const bySession = new Map();
             for (const row of allMsgs.bindings ?? []) {
@@ -878,9 +902,9 @@ export class ChatMemoryManager {
         await this.ensureInitialized();
         const sessionUri = `${CHAT_NS}session:${sessionId}`;
         const baseTurnId = opts?.baseTurnId?.trim() || null;
-        const countResult = await this.tools.query(`SELECT (COUNT(*) AS ?c) WHERE {
-        ?turn <${RDF_TYPE}> <${DKG_ONT}ChatTurn> .
-        ?turn <${SCHEMA}isPartOf> <${sessionUri}> .
+        const countResult = await this.tools.query(`SELECT (COUNT(*) AS ?c) WHERE {
+        ?turn <${RDF_TYPE}> <${DKG_ONT}ChatTurn> .
+        ?turn <${SCHEMA}isPartOf> <${sessionUri}> .
       }`, this.wmReadOpts());
         const turnCount = sumBindingValues(countResult.bindings, 'c');
         if (turnCount === 0) {
@@ -901,20 +925,20 @@ export class ChatMemoryManager {
             };
         }
         const turnUri = `${CHAT_NS}turn:${turnId}`;
-        const currentTurnResult = await this.tools.query(`SELECT ?tid ?ts WHERE {
-        <${turnUri}> <${RDF_TYPE}> <${DKG_ONT}ChatTurn> .
-        <${turnUri}> <${SCHEMA}isPartOf> <${sessionUri}> .
-        <${turnUri}> <${DKG_ONT}turnId> ?tid .
-        OPTIONAL { <${turnUri}> <${SCHEMA}dateCreated> ?ts }
+        const currentTurnResult = await this.tools.query(`SELECT ?tid ?ts WHERE {
+        <${turnUri}> <${RDF_TYPE}> <${DKG_ONT}ChatTurn> .
+        <${turnUri}> <${SCHEMA}isPartOf> <${sessionUri}> .
+        <${turnUri}> <${DKG_ONT}turnId> ?tid .
+        OPTIONAL { <${turnUri}> <${SCHEMA}dateCreated> ?ts }
       } LIMIT 1`, this.wmReadOpts());
         const currentTurn = (currentTurnResult.bindings ?? [])[0];
         const currentTurnId = stripRdfLiteral(currentTurn?.tid ?? '').trim();
         const currentTurnTs = stripRdfLiteral(currentTurn?.ts ?? '').trim();
-        const latestTurnResult = await this.tools.query(`SELECT ?latestTurnId ?latestTs WHERE {
-        ?latestTurn <${RDF_TYPE}> <${DKG_ONT}ChatTurn> .
-        ?latestTurn <${SCHEMA}isPartOf> <${sessionUri}> .
-        ?latestTurn <${DKG_ONT}turnId> ?latestTurnId .
-        OPTIONAL { ?latestTurn <${SCHEMA}dateCreated> ?latestTs }
+        const latestTurnResult = await this.tools.query(`SELECT ?latestTurnId ?latestTs WHERE {
+        ?latestTurn <${RDF_TYPE}> <${DKG_ONT}ChatTurn> .
+        ?latestTurn <${SCHEMA}isPartOf> <${sessionUri}> .
+        ?latestTurn <${DKG_ONT}turnId> ?latestTurnId .
+        OPTIONAL { ?latestTurn <${SCHEMA}dateCreated> ?latestTs }
       } ORDER BY DESC(?latestTs) DESC(?latestTurnId) LIMIT 1`, this.wmReadOpts());
         const latestTurnId = stripRdfLiteral((latestTurnResult.bindings ?? [])[0]?.latestTurnId ?? '').trim() || null;
         if (!currentTurnId || currentTurnId !== turnId) {
@@ -939,34 +963,34 @@ export class ChatMemoryManager {
             ? `"${currentTurnTs}"^^<${XSD_DATETIME}>`
             : null;
         const previousTurnQuery = currentTsLiteral
-            ? `SELECT ?previousTurnId WHERE {
-          ?previousTurn <${RDF_TYPE}> <${DKG_ONT}ChatTurn> .
-          ?previousTurn <${SCHEMA}isPartOf> <${sessionUri}> .
-          ?previousTurn <${DKG_ONT}turnId> ?previousTurnId .
-          ?previousTurn <${SCHEMA}dateCreated> ?previousTs .
-          FILTER(
-            ?previousTs < ${currentTsLiteral}
-            || (?previousTs = ${currentTsLiteral} && ?previousTurnId < ${currentTurnIdLiteral})
-          )
+            ? `SELECT ?previousTurnId WHERE {
+          ?previousTurn <${RDF_TYPE}> <${DKG_ONT}ChatTurn> .
+          ?previousTurn <${SCHEMA}isPartOf> <${sessionUri}> .
+          ?previousTurn <${DKG_ONT}turnId> ?previousTurnId .
+          ?previousTurn <${SCHEMA}dateCreated> ?previousTs .
+          FILTER(
+            ?previousTs < ${currentTsLiteral}
+            || (?previousTs = ${currentTsLiteral} && ?previousTurnId < ${currentTurnIdLiteral})
+          )
         } ORDER BY DESC(?previousTs) DESC(?previousTurnId) LIMIT 1`
-            : `SELECT ?previousTurnId WHERE {
-          ?previousTurn <${RDF_TYPE}> <${DKG_ONT}ChatTurn> .
-          ?previousTurn <${SCHEMA}isPartOf> <${sessionUri}> .
-          ?previousTurn <${DKG_ONT}turnId> ?previousTurnId .
-          FILTER(?previousTurnId < ${currentTurnIdLiteral})
+            : `SELECT ?previousTurnId WHERE {
+          ?previousTurn <${RDF_TYPE}> <${DKG_ONT}ChatTurn> .
+          ?previousTurn <${SCHEMA}isPartOf> <${sessionUri}> .
+          ?previousTurn <${DKG_ONT}turnId> ?previousTurnId .
+          FILTER(?previousTurnId < ${currentTurnIdLiteral})
         } ORDER BY DESC(?previousTurnId) LIMIT 1`;
         const previousTurnResult = await this.tools.query(previousTurnQuery, this.wmReadOpts());
         const previousTurnId = stripRdfLiteral((previousTurnResult.bindings ?? [])[0]?.previousTurnId ?? '').trim() || null;
         const turnIndexResult = currentTsLiteral
-            ? await this.tools.query(`SELECT (COUNT(*) AS ?c) WHERE {
-            ?turn <${RDF_TYPE}> <${DKG_ONT}ChatTurn> .
-            ?turn <${SCHEMA}isPartOf> <${sessionUri}> .
-            ?turn <${DKG_ONT}turnId> ?tid .
-            ?turn <${SCHEMA}dateCreated> ?ts .
-            FILTER(
-              ?ts < ${currentTsLiteral}
-              || (?ts = ${currentTsLiteral} && ?tid <= ${currentTurnIdLiteral})
-            )
+            ? await this.tools.query(`SELECT (COUNT(*) AS ?c) WHERE {
+            ?turn <${RDF_TYPE}> <${DKG_ONT}ChatTurn> .
+            ?turn <${SCHEMA}isPartOf> <${sessionUri}> .
+            ?turn <${DKG_ONT}turnId> ?tid .
+            ?turn <${SCHEMA}dateCreated> ?ts .
+            FILTER(
+              ?ts < ${currentTsLiteral}
+              || (?ts = ${currentTsLiteral} && ?tid <= ${currentTurnIdLiteral})
+            )
           }`, this.wmReadOpts())
             : { bindings: [{ c: String(previousTurnId ? 2 : 1) }] };
         const turnIndex = Math.max(0, sumBindingValues(turnIndexResult.bindings, 'c'));
@@ -1005,10 +1029,10 @@ export class ChatMemoryManager {
                 triples: [],
             };
         }
-        const turnMessagesResult = await this.tools.query(`SELECT ?user ?assistant WHERE {
-        <${turnUri}> <${SCHEMA}isPartOf> <${sessionUri}> .
-        <${turnUri}> <${DKG_ONT}hasUserMessage> ?user .
-        <${turnUri}> <${DKG_ONT}hasAssistantMessage> ?assistant .
+        const turnMessagesResult = await this.tools.query(`SELECT ?user ?assistant WHERE {
+        <${turnUri}> <${SCHEMA}isPartOf> <${sessionUri}> .
+        <${turnUri}> <${DKG_ONT}hasUserMessage> ?user .
+        <${turnUri}> <${DKG_ONT}hasAssistantMessage> ?assistant .
       } LIMIT 1`, this.wmReadOpts());
         const turnMessages = (turnMessagesResult.bindings ?? [])[0];
         const userMsgUri = String(turnMessages?.user ?? '').replace(/[<>]/g, '');
@@ -1030,18 +1054,18 @@ export class ChatMemoryManager {
                 triples: [],
             };
         }
-        const relatedSubjectsResult = await this.tools.query(`SELECT DISTINCT ?s WHERE {
-        VALUES ?msg { <${userMsgUri}> <${assistantMsgUri}> }
-        { BIND(<${sessionUri}> AS ?s) }
-        UNION { BIND(<${turnUri}> AS ?s) }
-        UNION { BIND(?msg AS ?s) }
-        UNION { <${assistantMsgUri}> <${DKG_ONT}usedTool> ?s }
-        UNION { ?s <${DKG_ONT}mentionedIn> ?msg }
-        UNION {
-          ?entity <${DKG_ONT}mentionedIn> ?msg .
-          ?s <${DKG_ONT}contains> ?entity .
-          ?s <${DKG_ONT}extractedFrom> <${sessionUri}> .
-        }
+        const relatedSubjectsResult = await this.tools.query(`SELECT DISTINCT ?s WHERE {
+        VALUES ?msg { <${userMsgUri}> <${assistantMsgUri}> }
+        { BIND(<${sessionUri}> AS ?s) }
+        UNION { BIND(<${turnUri}> AS ?s) }
+        UNION { BIND(?msg AS ?s) }
+        UNION { <${assistantMsgUri}> <${DKG_ONT}usedTool> ?s }
+        UNION { ?s <${DKG_ONT}mentionedIn> ?msg }
+        UNION {
+          ?entity <${DKG_ONT}mentionedIn> ?msg .
+          ?s <${DKG_ONT}contains> ?entity .
+          ?s <${DKG_ONT}extractedFrom> <${sessionUri}> .
+        }
       } LIMIT 5000`, this.wmReadOpts());
         const subjectSet = new Set([sessionUri, turnUri, userMsgUri, assistantMsgUri]);
         for (const b of relatedSubjectsResult.bindings ?? []) {
@@ -1053,9 +1077,9 @@ export class ChatMemoryManager {
         const values = [...subjectSet]
             .map((iri) => `<${iri}>`)
             .join(' ');
-        const deltaResult = await this.tools.query(`CONSTRUCT { ?s ?p ?o } WHERE {
-        VALUES ?s { ${values} }
-        ?s ?p ?o .
+        const deltaResult = await this.tools.query(`CONSTRUCT { ?s ?p ?o } WHERE {
+        VALUES ?s { ${values} }
+        ?s ?p ?o .
       }`, this.wmReadOpts());
         const quads = Array.isArray(deltaResult?.quads) ? deltaResult.quads : [];
         const triples = quads.map((q) => ({
@@ -1089,11 +1113,11 @@ export class ChatMemoryManager {
         await this.ensureInitialized();
         const sessionUri = `${CHAT_NS}session:${sessionId}`;
         const rootPattern = buildSessionRootPattern(sessionUri);
-        const countQuery = `SELECT (COUNT(*) AS ?c) WHERE {
-      {
-        SELECT DISTINCT ?s WHERE ${rootPattern} LIMIT 5000
-      }
-      ?s ?p ?o
+        const countQuery = `SELECT (COUNT(*) AS ?c) WHERE {
+      {
+        SELECT DISTINCT ?s WHERE ${rootPattern} LIMIT 5000
+      }
+      ?s ?p ?o
     }`;
         const swmCountResult = await this.tools.query(countQuery, {
             contextGraphId: this.agentContextGraph,