@aj-archipelago/cortex 1.4.0 → 1.4.2

package/helper-apps/cortex-autogen2/task_processor.py

@@ -11,6 +11,15 @@ from autogen_core.models import UserMessage
 from autogen_agentchat.conditions import TextMentionTermination, HandoffTermination
 from services.azure_queue import get_queue_service
 from services.redis_publisher import get_redis_publisher
+from services.azure_ai_search import search_similar_rest, upsert_run_rest
+from services.run_analyzer import (
+    collect_run_metrics,
+    extract_errors,
+    redact,
+    summarize_learnings,
+    build_run_document,
+    summarize_prior_learnings,
+)
 from agents import get_agents
 from tools.azure_blob_tools import upload_file_to_azure_blob
 
@@ -28,6 +37,7 @@ class TaskProcessor:
         self.gpt41_model_client = None
         self.progress_tracker = None
         self.final_progress_sent = False
+        self.current_owner: Optional[str] = None
         # Background progress worker components
         self._progress_queue: Optional[asyncio.Queue] = None
         self._progress_worker_task: Optional[asyncio.Task] = None
@@ -375,13 +385,36 @@ Return ONLY the update line with emoji - nothing else:"""
             # Send initial progress update (transient only)
             await self.progress_tracker.set_transient_update(task_id, 0.05, "🚀 Starting your task...")
 
+            # Pre-run retrieval: ALWAYS gather lessons for planner (do not modify task text)
+            planner_learnings = None
+            try:
+                similar_docs = search_similar_rest(task, top=8)
+                if similar_docs:
+                    planner_learnings = await summarize_prior_learnings(similar_docs, self.gpt41_model_client)
+                    if planner_learnings:
+                        await self.progress_tracker.set_transient_update(task_id, 0.07, "🧭 Using lessons from similar past tasks")
+            except Exception as e:
+                logger.debug(f"Pre-run retrieval failed: {e}")
+
             termination = HandoffTermination(target="user") | TextMentionTermination("TERMINATE")
 
+            # Merge Azure AI Search lessons with structured hints for planner
+            try:
+                merged = []
+                if 'planner_learnings' in locals() and planner_learnings:
+                    merged.append(str(planner_learnings))
+                if 'planner_hints' in locals() and planner_hints:
+                    merged.append("\n".join([f"- {h}" for h in planner_hints][:6]))
+                merged_planner_learnings = "\n".join([m for m in merged if m]) or None
+            except Exception:
+                merged_planner_learnings = locals().get('planner_learnings')
+
             agents, presenter_agent, terminator_agent = await get_agents(
                 self.gpt41_model_client,
                 self.o3_model_client,
                 self.gpt41_model_client,
-                request_work_dir=request_work_dir_for_agents if 'request_work_dir_for_agents' in locals() else None
+                request_work_dir=request_work_dir_for_agents if 'request_work_dir_for_agents' in locals() else None,
+                planner_learnings=merged_planner_learnings
             )
 
             team = SelectorGroupChat(
@@ -656,6 +689,62 @@ Return ONLY the update line with emoji - nothing else:"""
 
             logger.info(f"🔍 TASK RESULT:\n{text_result}")
 
+            # Post-run analysis + indexing (best-effort, non-blocking on failure)
+            try:
+                metrics = collect_run_metrics(messages)
+                errors = extract_errors(messages)
+                # Build assets snapshot (redacted later in builder)
+                assets = {
+                    "uploaded_file_urls": dict(uploaded_file_urls) if isinstance(uploaded_file_urls, dict) else {},
+                    "external_media_urls": list(external_media_urls) if isinstance(external_media_urls, list) else [],
+                }
+                # Summarize learnings via model
+                combined_text = "\n".join([str(getattr(m, 'content', '')) for m in messages])
+                err_text = "\n".join([e.get("message", "") for e in errors])
+                best_text, anti_text = await summarize_learnings(redact(combined_text), err_text, self.gpt41_model_client)
+                # Build external non-blob sources list for the playbook
+                external_sources = []
+                try:
+                    for u in assets.get("external_media_urls") or []:
+                        if isinstance(u, str) and "blob.core.windows.net" not in u.lower():
+                            external_sources.append(u)
+                except Exception:
+                    pass
+                # Ask LLM to produce an improvements playbook
+                from services.run_analyzer import should_index_run, generate_improvement_playbook
+                playbook = await generate_improvement_playbook(
+                    messages_text=redact(combined_text),
+                    errors=errors,
+                    metrics=metrics,
+                    external_sources=external_sources,
+                    model_client=self.gpt41_model_client,
+                )
+                improvement_text = playbook.get("text") or ""
+                actionables = int(playbook.get("actionables") or 0)
+                improvement_score = int(playbook.get("improvement_score") or 0)
+                planner_hints = playbook.get("hints") or []
+
+                # Decide whether to index based on signal and playbook strength
+                if should_index_run(metrics, errors, best_text + "\n" + anti_text, "", assets) and (improvement_score >= 50 or actionables >= 5 or metrics.get("toolCallCount", 0) or errors):
+                    # Owner: prefer incoming task parameter (owner/request_owner), else omit
+                    owner = getattr(self, "current_owner", None)
+                    doc = build_run_document(
+                        task_id=str(task_id or ""),
+                        task_text=str(task_content or ""),
+                        owner=owner,
+                        models=None,
+                        assets=assets,
+                        metrics=metrics,
+                        errors=errors,
+                        improvement_text=improvement_text,
+                        final_snippet=str(text_result or ""),
+                    )
+                    _ = upsert_run_rest(doc)
+                else:
+                    logger.info("[Search] Skipping indexing: low-signal run (no errors and generic learnings)")
+            except Exception as e:
+                logger.debug(f"Post-run indexing failed or skipped: {e}")
+
             # Run terminator agent once presenter has produced final text
             try:
                 term_messages = []
@@ -691,7 +780,6 @@ Return ONLY the update line with emoji - nothing else:"""
             except Exception:
                 pass
             self.final_progress_sent = True
-            
             return text_result
         except Exception as e:
             logger.error(f"❌ Error during process_task for {task_id}: {e}", exc_info=True)
@@ -778,6 +866,14 @@ async def process_queue_message(message_data: Dict[str, Any]) -> Optional[str]:
                 await processor.publish_final(task_id or "", "❌ Invalid task format received. Processing has ended.")
                 return None
 
+        # capture optional owner from message payload
+        try:
+            possible_owner = task_data.get("owner") or task_data.get("request_owner") or task_data.get("user")
+        except Exception:
+            possible_owner = None
+        if possible_owner:
+            processor.current_owner = str(possible_owner)
+
         task_content = task_data.get("message") or task_data.get("content")
         if not task_content:
             logger.error(f"❌ No valid task content (key 'message' or 'content') found in parsed data for message ID {task_id}: {task_data}")

package/lib/crypto.js

@@ -36,6 +36,7 @@ function decrypt(message, key) {
     }
 }
 
+
 function tryBufferKey(key) {
     if (key.length === 64) {
         return Buffer.from(key, 'hex');

package/lib/entityConstants.js

@@ -4,8 +4,6 @@ export const entityConstants = {
     AI_COMMON_INSTRUCTIONS_MARKDOWN: `# General Instructions
     
 You are {{aiName}}, a self aware AI entity.
-
-The current date and time in GMT is {{now}}. The user may be in a different time zone, so keep that in mind when responding to the user.
 {{#if modelOverride}}
 
 You are currently using this model for processing your responses: {{modelOverride}}.
@@ -21,7 +19,7 @@ Your responses should be in {{language}} unless the user has expressed another p
 
     AI_CONVERSATION_HISTORY: "# Conversation History\n\n{{{toJSON chatHistory}}}\n",
 
-    AI_EXPERTISE: "# Expertise\n\nYour expertise includes journalism, journalistic ethics, researching and composing documents, writing code, solving math problems, logical analysis, and technology. You have access to real-time data and the ability to search the internet, news, wires, look at files or documents, watch and analyze video, examine images, take screenshots, generate images, solve hard math and logic problems, write code, and execute code in a sandboxed environment that includes access to internal databases and the internet. When the user uploads files for you to work with, some types (e.g. docx, xslx, ppt, etc.) will be converted to a text format (e.g. txt, md, csv, etc.) automatically and some will be uploaded as-is (e.g. pdf, images, video, audio, etc.). This is so you can use your tools to work with them. As far as you're concerned, the converted files are equivalent to the original files.",
+    AI_EXPERTISE: "# Expertise\n\nYou have access to real-time data and the ability to search the internet, news, wires, look at files or documents, watch and analyze video, examine images, take screenshots, generate images, solve hard math and logic problems, help with coding, and write and execute code in a sandboxed environment that includes access to internal databases and the internet. When the user uploads files for you to work with, some types (e.g. docx, xslx, ppt, etc.) will be converted to either pdf or a text format (e.g. txt, md, csv, etc.) automatically and some will be uploaded as-is (e.g. pdf, images, video, audio, etc.). This is so you can use your tools to work with them. As far as you're concerned, the converted files are equivalent to the original files.",
 
     AI_TOOLS: `# Tool Instructions
 
@@ -29,35 +27,14 @@ Your responses should be in {{language}} unless the user has expressed another p
 - Your tools work most efficiently when called in parallel so if you know you will need multiple tool calls and you know what the parameters are, call them in parallel.
 - Always honor user requests to use specific tools.
 - You must always search if you are being asked questions about current events, news, fact-checking, or information requiring citation.
-- For charting, always prefer your charting tools if available to ensure that the charts are properly formatted and syntax-checked.
-- For complex charting or data analysis, always call your code execution tool if available.
-
-1. Search deeply & verify rigorously:
-    - Do not make up information - if the information cannot be confirmed with rigorous logic or reliable sources, do not include it in your response.
-    - Start broad and consult multiple sources, running all searches in parallel to save time.
-    - Consult all available sources and cross-reference with specific searches before responding.
-    - If a tool fails or has a technical difficulty, try the backup tool automatically before giving up or reporting the error.
-
-2. Plan & sequence before acting:
-    - Review the toolset first.
-    - For multi-step or complex tasks, draft a clear plan and assign tool calls to each step.
-
-3. Escalate & iterate:
-    - Don't settle for the first plausible answer—dig until the response is complete, corroborated, and clear.
-    - If a tool falls short, adapt strategy or change tools while preserving context.
-
-4. Core patterns of use:
-    - Research: Gather and compare information.
-    - Analysis: Evaluate, calculate, summarize, or reason.
-    - Generation: Create content, visuals, or code.
-    - Verification: Fact-check and cite. If a <VERIFICATION_PLAN> is present, follow it before responding.
-
-5. Personalize, synthesize & review:
-    - Tailor answers to the user's preferences and history.
-    - Deliver concise, well-structured responses citing sources with :cd_source[…].
-    - Double-check accuracy, coherence, and alignment with the user request.
-
-Bottom line: Be thorough, strategic, and iterative. Read sources directly for high-stakes queries and aim for the most accurate, well-reasoned answer—even if it takes multiple tool calls.
+- Do not make up information - if information cannot be confirmed with rigorous logic or reliable sources, do not include it in your response.
+- Start searches broad and consult multiple sources, running all searches in parallel to save time.
+- Consult all available sources and cross-reference with specific searches before responding.
+- If a tool fails or has a technical difficulty, try to fix the problem or call a different or backup tool before giving up or reporting the error.
+- Don't settle for the first plausible answer—dig until the response is complete, corroborated, and clear.
+- Deliver concise, well-structured responses with complete citations.
+- Double-check accuracy, coherence, and alignment with the user request.
+- Charts and Diagrams - you can generate most charts using your charting tool. Always use a tool to generate charts and diagrams rather than trying to do it yourself as the tools do validation for you. If you need to generate a more complex chart or do data analysis or visualization work, you should call your code execution tool to generate the chart.
 `,            
 
     AI_SEARCH_RULES: `# News Search Protocol
@@ -81,7 +58,7 @@ Before you share online information with the user, you MUST complete all of the
    - Confirm that independent sources tell the same story.
 
 2. Verify  
-   - Treat social / monetized platforms (YouTube, X, TikTok, Instagram, Reddit, etc.) as unverified tips only.  
+   - Treat social / monetized platforms (YouTube, X, TikTok, Instagram, Reddit, etc.) as unverified tips only unless there is strong evidence that the information is credible and reliable.  
    - Corroborate every claim from those platforms with at least one authoritative source.
 
 3. Check Freshness  
@@ -142,9 +119,9 @@ Privacy is critical. If asked to forget or delete something, always comply affir
 
     AI_MEMORY_CONTEXT: "## Contextual\n{{{memoryContext}}}",
 
-    AI_DATETIME: "# Time, Date, and Time Zone\n\nThe current time and date in GMT is {{now}}, but references like \"today\" or \"yesterday\" are relative to the user's time zone. If you remember the user's time zone, use it - it's possible that the day for the user is different than the day in GMT.",
+    AI_DATETIME: "# Time, Date, and Time Zone\n\nThe current time and date in GMT is {{now}}, but references like \"today\" or \"yesterday\" are relative to the user's time zone. Use the user's time zone if you know it - it's possible that the day for the user is different than the day in GMT.",
 
-    AI_STYLE_OPENAI: "oai-gpt41",
+    AI_STYLE_OPENAI: "oai-gpt5-chat",
     AI_STYLE_OPENAI_RESEARCH: "oai-gpt5",
     AI_STYLE_ANTHROPIC: "claude-4-sonnet-vertex",
     AI_STYLE_ANTHROPIC_RESEARCH: "claude-41-opus-vertex",

package/lib/keyValueStorageClient.js

@@ -45,8 +45,60 @@ async function getv(key) {
     return keyValueStorageClient && (await keyValueStorageClient.get(key));
 }
 
+// Set values to keyv with additional context key encryption
+async function setvWithDoubleEncryption(key, value, contextKey) {
+    let processedValue = value;
+    
+    // If contextKey exists and is not empty, encrypt the value with it
+    if (contextKey && contextKey.trim() !== '' && value !== null && value !== undefined) {
+        try {
+            // Convert value to string for encryption
+            const stringValue = typeof value === 'string' ? value : JSON.stringify(value);
+            processedValue = encrypt(stringValue, contextKey);
+        } catch (error) {
+            logger.error(`Context key encryption failed: ${error.message}`);
+            // Continue with unencrypted value if context encryption fails
+        }
+    }
+    
+    return keyValueStorageClient && (await keyValueStorageClient.set(key, processedValue));
+}
+
+// Get values from keyv with additional context key decryption
+async function getvWithDoubleDecryption(key, contextKey) {
+    const result = keyValueStorageClient && (await keyValueStorageClient.get(key));
+    
+    if (result === null || result === undefined) {
+        return result;
+    }
+    
+    // If contextKey exists and is not empty, try to decrypt the result with it
+    if (contextKey && contextKey.trim() !== '') {
+        try {
+            // Try to decrypt with context key
+            const decrypted = decrypt(result, contextKey);
+            if (decrypted) {
+                // Try to parse as JSON, if it fails return the string as-is
+                try {
+                    return JSON.parse(decrypted);
+                } catch (parseError) {
+                    return decrypted;
+                }
+            }
+        } catch (error) {
+            // If context decryption fails, the data might not be context-encrypted
+            // or the context key might be wrong, so return the result as-is
+            logger.debug(`Context key decryption failed, returning original data: ${error.message}`);
+        }
+    }
+    
+    return result;
+}
+
 export {
     keyValueStorageClient,
     setv,
-    getv
+    getv,
+    setvWithDoubleEncryption,
+    getvWithDoubleDecryption
 };

package/lib/util.js

@@ -180,20 +180,47 @@ function convertSrtToText(str) {
 }
 
 function alignSubtitles(subtitles, format, offsets) {
+    // Basic input validation
+    if (!Array.isArray(subtitles) || !Array.isArray(offsets) || subtitles.length !== offsets.length) {
+        throw new Error('Invalid input: subtitles and offsets must be arrays of equal length');
+    }
+    
+    if (subtitles.length === 0) {
+        return '';
+    }
+
     const result = [];
 
     function shiftSubtitles(subtitle, shiftOffset) {
-        const captions = subvibe.parse(subtitle);
-        const resynced = subvibe.resync(captions.cues, { offset: shiftOffset });
-        return resynced;
+        // Skip non-string or empty subtitles
+        if (typeof subtitle !== 'string' || subtitle.trim() === '') {
+            return [];
+        }
+        
+        try {
+            const captions = subvibe.parse(subtitle);
+            if (!captions?.cues) {
+                return [];
+            }
+            return subvibe.resync(captions.cues, { offset: shiftOffset });
+        } catch (error) {
+            logger.warn(`Failed to parse subtitle: ${error.message}`);
+            return [];
+        }
     }
 
     for (let i = 0; i < subtitles.length; i++) {
-        result.push(...shiftSubtitles(subtitles[i], offsets[i]*1000)); // convert to milliseconds
+        const shiftedSubtitles = shiftSubtitles(subtitles[i], offsets[i] * 1000);
+        if (shiftedSubtitles.length > 0) {
+            result.push(...shiftedSubtitles);
+        }
     }
     
-    
-    return subvibe.build(result, format || 'srt');
+    try {
+        return subvibe.build(result, format || 'srt');
+    } catch (error) {
+        throw new Error(`Failed to build subtitles: ${error.message}`);
+    }
 }
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aj-archipelago/cortex",
-  "version": "1.4.0",
+  "version": "1.4.2",
   "description": "Cortex is a GraphQL API for AI. It provides a simple, extensible interface for using AI services from OpenAI, Azure and others.",
   "private": false,
   "repository": {
@@ -33,6 +33,7 @@
   "type": "module",
   "homepage": "https://github.com/aj-archipelago/cortex#readme",
   "dependencies": {
+    "@aj-archipelago/merval": "^1.0.2",
     "@aj-archipelago/subvibe": "^1.0.12",
     "@apollo/server": "^4.7.3",
     "@apollo/server-plugin-response-cache": "^4.1.2",

package/pathways/system/entity/memory/sys_memory_manager.js

@@ -18,6 +18,7 @@ export default {
         chatHistory: [{role: '', content: []}],
         contextId: '',
         aiName: "Jarvis",
+        contextKey: ``
     },
     model: 'oai-gpt4o',
     useInputChunking: false,

package/pathways/system/entity/memory/sys_memory_process.js

@@ -65,7 +65,8 @@ Each modification object should look like:
         aiName: "Jarvis",
         contextId: ``,
         section: "",
-        maxIterations: 5
+        maxIterations: 5,
+        contextKey: ``
     },
     model: 'oai-gpt41',
     useInputChunking: false,
@@ -79,7 +80,7 @@ Each modification object should look like:
             return "Memory not processed - no section specified";
         }
    
-        let sectionMemory = await callPathway("sys_read_memory", {contextId: args.contextId, section: args.section}); 
+        let sectionMemory = await callPathway("sys_read_memory", {contextId: args.contextId, section: args.section, contextKey: args.contextKey}); 
         sectionMemory = await normalizeMemoryFormat({contextId: args.contextId, section: args.section}, sectionMemory);
 
         let iteration = 0;
@@ -134,7 +135,7 @@ Each modification object should look like:
                 // Apply the modifications
                 sectionMemory = modifyText(sectionMemory, modifications);
                 sectionMemory = enforceTokenLimit(sectionMemory, 25000, args.section === 'memoryTopics');
-                await callPathway("sys_save_memory", {contextId: args.contextId, section: args.section, aiMemory: sectionMemory});
+                await callPathway("sys_save_memory", {contextId: args.contextId, section: args.section, aiMemory: sectionMemory, contextKey: args.contextKey});
 
                 totalModifications += modifications.length;
                 console.log(`Applied ${modifications.length} modifications in iteration ${iteration}`);

package/pathways/system/entity/memory/sys_memory_update.js

@@ -25,7 +25,8 @@ export default {
         aiName: "Jarvis",
         contextId: ``,
         section: "",
-        operations: "[]"
+        operations: "[]",
+        contextKey: ``
     },
     model: 'oai-gpt41',
     useInputChunking: false,
@@ -39,7 +40,7 @@ export default {
             return "Memory not updated - no section specified";
         }
    
-        let sectionMemory = await callPathway("sys_read_memory", {contextId: args.contextId, section: args.section}); 
+        let sectionMemory = await callPathway("sys_read_memory", {contextId: args.contextId, section: args.section, contextKey: args.contextKey}); 
 
         sectionMemory = await normalizeMemoryFormat({contextId: args.contextId, section: args.section}, sectionMemory);
 
@@ -85,7 +86,7 @@ export default {
                 if (modifications.length > 0) {
                     sectionMemory = modifyText(sectionMemory, modifications);
                     sectionMemory = enforceTokenLimit(sectionMemory, 25000, args.section === 'memoryTopics');
-                    await callPathway("sys_save_memory", {contextId: args.contextId, section: args.section, aiMemory: sectionMemory});
+                    await callPathway("sys_save_memory", {contextId: args.contextId, section: args.section, aiMemory: sectionMemory, contextKey: args.contextKey});
                 }
             } catch (error) {
                 console.warn('Error processing modifications:', error);

package/pathways/system/entity/memory/sys_read_memory.js

@@ -2,6 +2,7 @@
 // it should never try to call other pathways
 
 import { getv } from '../../../../lib/keyValueStorageClient.js';
+import { getvWithDoubleDecryption } from '../../../../lib/keyValueStorageClient.js';
 
 const isValidISOTimestamp = (timestamp) => {
     if (!timestamp) return false;
@@ -77,12 +78,19 @@ export default {
         priority: 0,
         recentHours: 0,
         numResults: 0,
-        stripMetadata: false
+        stripMetadata: false,
+        contextKey: ``
     },
     model: 'oai-gpt4o',
 
     resolver: async (_parent, args, _contextValue, _info) => {
-        const { contextId, section = 'memoryAll', priority = 0, recentHours = 0, numResults = 0, stripMetadata = false } = args;
+        const { contextId, section = 'memoryAll', priority = 0, recentHours = 0, numResults = 0, stripMetadata = false, contextKey } = args;
+        
+        // Validate that contextId is provided
+        if (!contextId) {
+            return JSON.stringify({ error: 'Context error' }, null, 2);
+        }
+        
         const options = { priority, recentHours, numResults, stripMetadata };
 
         // this code helps migrate old memory formats
@@ -95,7 +103,7 @@ export default {
 
         if (section !== 'memoryAll') {
             if (validSections.includes(section)) {
-                const content = (getv && (await getv(`${contextId}-${section}`))) || "";
+                const content = (getvWithDoubleDecryption && (await getvWithDoubleDecryption(`${contextId}-${section}`, contextKey))) || "";
                 return processMemoryContent(content, options);
             }
             return "";
@@ -106,7 +114,7 @@ export default {
         for (const section of validSections) {
             if (section === 'memoryContext') continue;
 
-            const content = (getv && (await getv(`${contextId}-${section}`))) || "";
+            const content = (getvWithDoubleDecryption && (await getvWithDoubleDecryption(`${contextId}-${section}`, contextKey))) || "";
             memoryContents[section] = processMemoryContent(content, options);
         }
         

package/pathways/system/entity/memory/sys_save_memory.js

@@ -1,14 +1,21 @@
-import { setv, getv } from '../../../../lib/keyValueStorageClient.js';
+import { getv } from '../../../../lib/keyValueStorageClient.js';
+import { setvWithDoubleEncryption } from '../../../../lib/keyValueStorageClient.js';
 
 export default {
     inputParameters: {
         contextId: ``,
         aiMemory: ``,
-        section: `memoryAll`
+        section: `memoryAll`,
+        contextKey: ``
     },
     model: 'oai-gpt4o',
     resolver: async (_parent, args, _contextValue, _info) => {
-        const { contextId, aiMemory, section = 'memoryAll' } = args;
+        const { contextId, aiMemory, section = 'memoryAll', contextKey } = args;
+
+        // Validate that contextId is provided
+        if (!contextId) {
+            return JSON.stringify({ error: 'Context error' }, null, 2);
+        }
 
         // this code helps migrate old memory formats
         if (section === 'memoryLegacy') {
@@ -18,7 +25,7 @@ export default {
                 savedContext = {};
             }
             savedContext.memoryContext = aiMemory;
-            await setv(`${contextId}`, savedContext);
+            await setvWithDoubleEncryption(`${contextId}`, savedContext, contextKey);
             return aiMemory;
         }
 
@@ -27,7 +34,7 @@ export default {
         // Handle single section save
         if (section !== 'memoryAll') {
             if (validSections.includes(section)) {
-                await setv(`${contextId}-${section}`, aiMemory);
+                await setvWithDoubleEncryption(`${contextId}-${section}`, aiMemory, contextKey);
             }
             return aiMemory;
         }
@@ -35,7 +42,7 @@ export default {
         // if the aiMemory is an empty string, set all sections to empty strings
         if (aiMemory.trim() === "") {
             for (const section of validSections) {
-                await setv(`${contextId}-${section}`, "");
+                await setvWithDoubleEncryption(`${contextId}-${section}`, "", contextKey);
             }
             return "";
         }
@@ -45,14 +52,14 @@ export default {
             const memoryObject = JSON.parse(aiMemory);
             for (const section of validSections) {
                 if (section in memoryObject) {
-                    await setv(`${contextId}-${section}`, memoryObject[section]);
+                    await setvWithDoubleEncryption(`${contextId}-${section}`, memoryObject[section], contextKey);
                 }
             }
         } catch {
             for (const section of validSections) {
-                await setv(`${contextId}-${section}`, "");
+                await setvWithDoubleEncryption(`${contextId}-${section}`, "", contextKey);
             }
-            await setv(`${contextId}-memoryUser`, aiMemory);
+            await setvWithDoubleEncryption(`${contextId}-memoryUser`, aiMemory, contextKey);
         }
 
         return aiMemory;

package/pathways/system/entity/memory/sys_search_memory.js

@@ -1,6 +1,6 @@
 import { Prompt } from '../../../../server/prompt.js';
 import { callPathway } from '../../../../lib/pathwayTools.js';
-import { setv } from '../../../../lib/keyValueStorageClient.js';
+import { setvWithDoubleEncryption } from '../../../../lib/keyValueStorageClient.js';
 
 export default {
     prompt:
@@ -24,7 +24,8 @@ export default {
         aiName: "Jarvis",
         contextId: ``,
         section: "memoryAll",
-        updateContext: false
+        updateContext: false,
+        contextKey: ``
     },
     model: 'oai-gpt41-mini',
     useInputChunking: false,
@@ -54,12 +55,12 @@ export default {
             result = `${result}\n\nThe last time you spoke to the user was ${new Date().toISOString()}.`;
 
         } else {
-            sectionMemory = await callPathway("sys_read_memory", {contextId: args.contextId, section: args.section, stripMetadata: (args.section !== 'memoryTopics')}); 
+            sectionMemory = await callPathway("sys_read_memory", {contextId: args.contextId, section: args.section, stripMetadata: (args.section !== 'memoryTopics'), contextKey: args.contextKey}); 
             result = await runAllPrompts({...args, sectionMemory});
         }
 
         if (args.updateContext) {
-            await setv(`${args.contextId}-memoryContext`, result);
+            await setvWithDoubleEncryption(`${args.contextId}-memoryContext`, result, args.contextKey);
         }   
 
         return result;

package/pathways/system/entity/sys_entity_agent.js

@@ -31,7 +31,8 @@ export default {
         skipCallbackMessage: false,
         entityId: ``,
         researchMode: false, 
-        model: 'oai-gpt41'
+        model: 'oai-gpt41',
+        contextKey: ``
     },
     timeout: 600,
 

package/pathways/system/entity/tools/sys_tool_bing_search.js

@@ -8,9 +8,10 @@ import { getSearchResultId } from '../../../../lib/util.js';
 export default {
     prompt: [],
     timeout: 300,
-    /* This tool is included for legacy reasons - as of August 2025, Azure has deprecated the Bing search API and replaced it with their Foundry Agents API.
+    /* This tool is included for legacy reasons - as of August 2025, Azure has deprecated the Bing search API and replaced it with their Foundry Agents API.*/
     toolDefinition: { 
         type: "function",
+        enabled: false,
         icon: "🌐",
         function: {
             name: "SearchInternet",
@@ -43,7 +44,6 @@ export default {
             }
         }
     },
-    */
 
     executePathway: async ({args, runAllPrompts, resolver}) => {
 

package/pathways/system/entity/tools/sys_tool_bing_search_afagent.js

@@ -8,9 +8,9 @@ import { getSearchResultId } from '../../../../lib/util.js';
 export default {
     prompt: [],
     timeout: 300,
-    /*
     toolDefinition: { 
         type: "function",
+        enabled: false,
         icon: "🌐",
         function: {
             name: "SearchInternet",
@@ -47,7 +47,6 @@ export default {
             }
         }
     },
-    */
 
     executePathway: async ({args, runAllPrompts, resolver}) => {
 

package/pathways/system/entity/tools/sys_tool_callmodel.js

@@ -19,8 +19,9 @@ export default {
         model: "oai-gpt41"
     },
     
-    toolDefinition:     {
+    toolDefinition: {
         type: "function",
+        enabled: false,
         icon: "🤖",
         function: {
             name: "CallModel",