diff --git a/src/tools.ts b/src/tools.ts
index 1790f87..a5aa146 100644
--- a/src/tools.ts
+++ b/src/tools.ts
@@ -787,7 +787,7 @@ export function registerMemoryForgetTool(
         };
 
         try {
-          const agentId = resolveRuntimeAgentId(runtimeContext.agentId, runtimeCtx);
+          const agentId = runtimeContext.agentId;
           // Determine accessible scopes
           let scopeFilter = resolveScopeFilter(runtimeContext.scopeManager, agentId);
           if (scope) {
@@ -963,7 +963,7 @@ export function registerMemoryUpdateTool(
           }
 
           // Determine accessible scopes
-          const agentId = resolveRuntimeAgentId(runtimeContext.agentId, runtimeCtx);
+          const agentId = runtimeContext.agentId;
           const scopeFilter = resolveScopeFilter(context.scopeManager, agentId);
 
           // Resolve memoryId: if it doesn't look like a UUID, try search
@@ -1200,7 +1200,7 @@ export function registerMemoryStatsTool(
         const { scope } = params as { scope?: string };
 
         try {
-          const agentId = resolveRuntimeAgentId(runtimeContext.agentId, runtimeCtx);
+          const agentId = runtimeContext.agentId;
           // Determine accessible scopes
           let scopeFilter = resolveScopeFilter(context.scopeManager, agentId);
           if (scope) {
@@ -1315,7 +1315,7 @@ export function registerMemoryListTool(
         try {
           const safeLimit = clampInt(limit, 1, 50);
           const safeOffset = clampInt(offset, 0, 1000);
-          const agentId = resolveRuntimeAgentId(runtimeContext.agentId, runtimeCtx);
+          const agentId = runtimeContext.agentId;
 
           // Determine accessible scopes
           let scopeFilter = resolveScopeFilter(context.scopeManager, agentId);