@@ -34,13 +34,21 @@
 use ProcessMaker\Models\UserResourceView;
 use ProcessMaker\Notifications\TaskReassignmentNotification;
 use ProcessMaker\Query\SyntaxError;
+use ProcessMaker\Repositories\ProcessExecutionRawRepository;
 use ProcessMaker\SanitizeHelper;
 use ProcessMaker\Traits\TaskControllerIndexMethods;
 
 class TaskController extends Controller
 {
     use TaskControllerIndexMethods;
 
+    private ?ProcessExecutionRawRepository $processExecutionRaw = null;
+
+    private function processExecutionRaw(): ProcessExecutionRawRepository
+    {
+        return $this->processExecutionRaw ??= app(ProcessExecutionRawRepository::class);
+    }
+
     /**
      * A whitelist of attributes that should not be
      * sanitized by our SanitizeInput middleware.
@@ -354,28 +362,48 @@ public function show(ProcessRequestToken $task)
      */
     public function update(Request $request, ProcessRequestToken $task)
     {
+        if (!$task->relationLoaded('process')) {
+            $task->setRelation('process', $this->processExecutionRaw()->getProcessForAuthorizeRaw($task->process_id));
+        }
         $this->authorize('update', $task);
         if ($request->input('status') === 'COMPLETED') {
             if ($task->status === 'CLOSED') {
                 return abort(422, __('Task already closed'));
             }
             // Skip ConvertEmptyStringsToNull and TrimStrings middlewares
             $data = json_optimize_decode($request->getContent(), true);
-            $data = SanitizeHelper::sanitizeData($data['data'], null, $task->processRequest->do_not_sanitize ?? []);
+            $instance = $this->processExecutionRaw()->getProcessRequestForCompleteRaw($task->process_request_id);
+            $data = SanitizeHelper::sanitizeData($data['data'], null, $instance->do_not_sanitize ?? []);
+
             //Call the manager to trigger the start event
-            $process = $task->process;
-            $instance = $task->processRequest;
-            TaskDraft::moveDraftFiles($task);
+            $process = $this->processExecutionRaw()->getProcessForCompleteRaw($task->process_id);
+            $instance->setRelation('process', $process);
+            if ($processVersion = $this->processExecutionRaw()->getProcessVersionForCompleteRaw($instance->process_version_id)) {
+                $instance->setRelation('processVersion', $processVersion);
+            }
+            $task->setRelation('processRequest', $instance);
+            $task->setRelation('process', $process);
+
+            if ($this->processExecutionRaw()->taskHasDraftRaw($task->id)) {
+                TaskDraft::moveDraftFiles($task);
+            }
+
             WorkflowManager::completeTask($process, $instance, $task, $data);
 
-            return new Resource($task->refresh());
+            $responseInstance = $this->processExecutionRaw()->getProcessRequestForResponseRaw($task->process_request_id);
+            $responseInstance->setRelation('process', $process);
+            $taskRefreshed = $this->processExecutionRaw()->refreshTaskRaw($task, $process, $responseInstance);
+
+            return new Resource($taskRefreshed);
         } elseif (!empty($request->input('user_id'))) {
+            $process = $this->processExecutionRaw()->getProcessForReassignRaw($task->process_id);
+            $task->setRelation('process', $process);
+
             $userToAssign = $request->input('user_id');
             $comments = $request->input('comments');
             $task->reassign($userToAssign, $request->user(), $comments);
 
-            $taskRefreshed = $task->refresh();
-
+            $taskRefreshed = $this->processExecutionRaw()->refreshTaskRaw($task, $process, $task->processRequest);
             CaseUpdate::dispatchSync($task->processRequest, $taskRefreshed);
 
             return new Resource($taskRefreshed);
 
@@ -338,7 +338,8 @@ private function findInstanceWithRetry($instanceId, bool $lightweight = false)
     }
 
     /**
-     * Load only lock and revision metadata when validating the fast path.
+     * Load ProcessRequest for BPMN actions. In lightweight mode, only lock and
+     * revision metadata are loaded when validating the fast path.
      */
     private function findInstance($instanceId, bool $lightweight): ProcessRequest
     {
@@ -349,6 +350,12 @@ private function findInstance($instanceId, bool $lightweight): ProcessRequest
                 'process_collaboration_id',
                 'execution_revision',
             ]);
+        } else {
+            $query->with([
+                'process',
+                'processVersion',
+                'collaboration',
+            ]);
         }
 
         return $query->findOrFail($instanceId);
 
@@ -32,6 +32,7 @@
 use ProcessMaker\Nayra\Managers\WorkflowManagerDefault;
 use ProcessMaker\Nayra\Storage\BpmnDocument;
 use ProcessMaker\Package\WebEntry\Models\WebentryRoute;
+use ProcessMaker\Repositories\ProcessExecutionRawRepository;
 use ProcessMaker\Rules\BPMNValidation;
 use ProcessMaker\Traits\Exportable;
 use ProcessMaker\Traits\ExtendedPMQL;
@@ -668,6 +669,14 @@ public function getNextUser(ActivityInterface $activity, ProcessRequestToken $to
         return $this->checkAssignment($token->getInstance(), $activity, $assignmentType, $escalateToManager, $user ? User::where('id', $user)->first() : null, $token);
     }
 
+    /**
+     * @deprecated Use ProcessExecutionRawRepository::getNextUserRaw()
+     */
+    public function getNextUserRaw(ActivityInterface $activity, ProcessRequestToken $token)
+    {
+        return app(ProcessExecutionRawRepository::class)->getNextUserRaw($this, $activity, $token);
+    }
+
     /**
      * If user assignment is not valid reassign to Process Manager
      *
@@ -708,7 +717,7 @@ private function checkAssignment(ProcessRequest $request, ActivityInterface $act
         return $user;
     }
 
-    private function scalateToManagerIfEnabled($user, $activity, $token, $assignmentType)
+    public function scalateToManagerIfEnabled($user, $activity, $token, $assignmentType)
     {
         if ($user) {
             $assignmentProcess = self::where('name', self::ASSIGNMENT_PROCESS)->first();
 
@@ -850,8 +850,13 @@ public function updateCatchEvents()
     public function mergeLatestStoredData()
     {
         $store = $this->getDataStore();
-        $latest = self::select('data')->find($this->getId());
-        $this->data = $store->updateArray($latest->data);
+        // Load only the data column (Eloquent cast applies) without hydrating the full row.
+        $latest = static::query()->whereKey($this->getKey())->first(['data']);
+        $latestData = $latest?->data ?? [];
+        if (!is_array($latestData)) {
+            $latestData = [];
+        }
+        $this->data = $store->updateArray($latestData);
 
         return $this->data;
     }