pmPaulis · Jul 28, 2026 · Aug 28, 2026 · Aug 28, 2026 · Aug 28, 2026 · Sep 2, 2026
diff --git a/ProcessMaker/Http/Controllers/Api/ProcessController.php b/ProcessMaker/Http/Controllers/Api/ProcessController.php
@@ -129,17 +129,21 @@ public function index(Request $request)
         $user = Auth::user();
 
         $orderBy = $this->getRequestSortBy($request, 'name');
+        if (!str_contains($orderBy[0], '.')) {
+            $orderBy[0] = 'processes.' . $orderBy[0];
+        }
         $perPage = $this->getPerPage($request);
         $include = $this->getRequestInclude($request);
+        $relationships = array_values(array_diff($include, ['events']));
         $status = $request->input('status');
         $pmql = $request->input('pmql', '');
 
-        $processes = Process::nonSystem()->notArchived()->with($include);
+        $processes = Process::nonSystem()->notArchived()->with($relationships);
         if ($status === 'archived') {
-            $processes = Process::archived()->with($include);
+            $processes = Process::archived()->with($relationships);
         }
         if ($status === 'all') {
-            $processes = Process::active()->with($include);
+            $processes = Process::active()->with($relationships);
         }
 
         $filter = $request->input('filter', '');
@@ -188,60 +192,29 @@ public function index(Request $request)
         // Get with launchpad
         $launchpad = $request->input('launchpad', false);
 
-        $processes = $processes->with('events')
-            ->select('processes.*')
+        $processes = $processes
+            ->with('notification_settings')
+            ->exclude(['bpmn', 'svg'])
             ->leftJoin(\DB::raw('(select id, uuid, name from process_categories) as category'), 'processes.process_category_id', '=', 'category.id')
             ->leftJoin(\DB::raw('(select id, uuid, username, lastname, firstname from users) as user'), 'processes.user_id', '=', 'user.id')
             ->orderBy(...$orderBy)
-            ->get()
-            ->collect();
-
-        foreach ($processes as $key => $process) {
-            // filter the start events that can be used manually (no timer start events);
-            // TODO: startEvents is not a real property on Process.
-            // Move below to $process->getManualStartEvents();
-            $process->startEvents = $process->events->filter(function ($event) {
-                $eventIsTimerStart = collect($event['eventDefinitions'])
-                        ->filter(function ($eventDefinition) {
-                            return $eventDefinition['$type'] == 'timerEventDefinition';
-                        })->count() > 0;
-
-                // Filter out web entry start events and email start events
-                $eventIsWebEntry = false;
-                $eventIsEmailStart = false;
-                if (isset($event['config'])) {
-                    $config = json_decode($event['config'], true);
-                    if (isset($config['web_entry']) && $config['web_entry'] !== null) {
-                        $eventIsWebEntry = true;
-                    } elseif (isset($config['email_start']) && $config['email_start'] !== null) {
-                        $eventIsEmailStart = true;
-                    }
-                }
+            ->paginate($perPage);
 
-                return !$eventIsTimerStart && !$eventIsWebEntry && !$eventIsEmailStart;
-            })->values();
+        foreach ($processes as $process) {
+            $process->setAppends(array_values(array_diff($process->getAppends(), ['projects'])));
+            $process->makeHidden('notification_settings');
 
-            // Get the id bookmark related
-            $process->bookmark_id = Bookmark::getBookmarked($bookmark, $process->id, $user->id);
-            // Get the launchpad configuration
-            $process->launchpad = ProcessLaunchpad::getLaunchpad($launchpad, $process->id);
+            $process->bookmark_id = $bookmark
+                ? Bookmark::getBookmarked($bookmark, $process->id, $user->id)
+                : 0;
+            $process->launchpad = $launchpad
+                ? ProcessLaunchpad::getLaunchpad($launchpad, $process->id)
+                : null;
 
             $process->case_retention_tier_adjustment_notice = false;
             if ($user->is_administrator && config('app.case_retention_policy_enabled')) {
                 $process->case_retention_tier_adjustment_notice = CaseRetentionTierService::adjustmentNoticeIsActive($process);
             }
-
-            // Filter all processes that have event definitions (start events like message event, conditional event, signal event, timer event)
-            if ($request->has('without_event_definitions') && $request->input('without_event_definitions') == 'true') {
-                $startEvents = $process->events->filter(function ($event) {
-                    return collect($event['eventDefinitions'])->isEmpty();
-                });
-            }
-
-            // filter only valid executable processes
-            if (!$process->isValidForExecution()) {
-                $processes->startEvents = [];
-            }
         }
 
         return new ProcessCollection($processes);

diff --git a/ProcessMaker/Http/Controllers/Api/ProcessRequestController.php b/ProcessMaker/Http/Controllers/Api/ProcessRequestController.php
@@ -37,7 +37,7 @@
 use ProcessMaker\Nayra\Contracts\Bpmn\CatchEventInterface;
 use ProcessMaker\Notifications\ProcessCanceledNotification;
 use ProcessMaker\Query\SyntaxError;
-use ProcessMaker\RetryProcessRequest;
+use ProcessMaker\Repositories\ProcessRequestListingRawRepository;
 use ProcessMaker\Traits\ProcessMapTrait;
 use Symfony\Component\HttpFoundation\IpUtils;
 use Throwable;
@@ -117,7 +117,7 @@ public function index(Request $request, $getTotal = false, User $user = null)
         $query = ProcessRequest::forUser($user);
         $includes = $request->input('include', '');
         foreach (array_filter(explode(',', $includes)) as $include) {
-            if (in_array($include, ProcessRequest::$allowedIncludes)) {
+            if (in_array($include, ProcessRequest::$allowedIncludes) && $include !== 'process') {
                 $query->with($include);
             }
         }
@@ -176,6 +176,7 @@ public function index(Request $request, $getTotal = false, User $user = null)
                     ->withAggregate('processVersion', 'alternative')
                     ->paginate($request->input('per_page', 10));
                 $total = $response->total();
+                app(ProcessRequestListingRawRepository::class)->hydrate($response, $includes);
             }
         } catch (QueryException $e) {
             throw $e;
@@ -900,7 +901,14 @@ public function getRequestsByCase(Request $request, User $user = null)
 
         // Apply ordering only if a valid order_by field is provided
         $query->applyOrdering($request);
-        $response = $query->applyPagination($request);
+        $response = $query
+            ->select('process_requests.*')
+            ->withAggregate('processVersion', 'alternative')
+            ->applyPagination($request);
+        app(ProcessRequestListingRawRepository::class)->hydrate(
+            $response,
+            $request->input('include', '')
+        );
 
         // Get activeTasks and participants
         $response = $response->map(function ($processRequest) use ($request) {

diff --git a/ProcessMaker/Http/Controllers/Api/V1_1/TaskController.php b/ProcessMaker/Http/Controllers/Api/V1_1/TaskController.php
@@ -15,9 +15,16 @@
 use ProcessMaker\Models\ProcessRequest;
 use ProcessMaker\Models\ProcessRequestToken;
 use ProcessMaker\ProcessTranslations\TranslationManager;
+use ProcessMaker\Services\TaskCompletionRawService;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 class TaskController extends Controller
 {
+    public function __construct(
+        private readonly TaskCompletionRawService $taskCompletionRawService,
+    ) {
+    }
+
     protected $defaultFields = [
         'id',
         'element_id',
@@ -151,4 +158,26 @@ public function showInterstitial($taskId)
 
         return $response;
     }
+
+    /**
+     * Complete a task using the raw-query optimized path.
+     */
+    public function update(Request $request, int $taskId)
+    {
+        if ($request->input('status') !== 'COMPLETED') {
+            abort(422, __('Only task completion is supported on this endpoint. Use PUT /api/1.0/tasks/{id} for other updates.'));
+        }
+
+        try {
+            $task = $this->taskCompletionRawService->completeTask(
+                $taskId,
+                json_optimize_decode($request->getContent(), true) ?: [],
+                $request->user(),
+            );
+        } catch (NotFoundHttpException $exception) {
+            return response()->json(['message' => $exception->getMessage()], 404);
+        }
+
+        return response()->json($task);
+    }
 }
diff --git a/ProcessMaker/Http/Resources/ProcessRequests.php b/ProcessMaker/Http/Resources/ProcessRequests.php
@@ -22,11 +22,13 @@ public function toArray($request)
             $array['participants'] = $this->participants;
         }
         if (in_array('activeTasks', $include)) {
-            $array['active_tasks'] = $this->tokens()
-                ->select(['id', 'element_name', 'status', 'user_id'])
-                ->where('status', 'ACTIVE')
-                ->where('element_type', 'task')
-                ->get();
+            $array['active_tasks'] = $this->relationLoaded('activeTasks')
+                ? $this->activeTasks
+                : $this->tokens()
+                    ->select(['id', 'element_name', 'status', 'user_id'])
+                    ->where('status', 'ACTIVE')
+                    ->where('element_type', 'task')
+                    ->get();
         }
         if (in_array('user', $include)) {
             $array['user'] = new Users($this->user);

diff --git a/ProcessMaker/Jobs/BpmnAction.php b/ProcessMaker/Jobs/BpmnAction.php
@@ -123,7 +123,7 @@ public function handle()
         return $response;
     }
 
-    public function transferInternalContext(BpmnAction $action): void
+    public function transferInternalContext(self $action): void
     {
         $action->engine = $this->engine;
         $action->instance = $this->instance;

diff --git a/ProcessMaker/Jobs/GenerateUserRecommendations.php b/ProcessMaker/Jobs/GenerateUserRecommendations.php
@@ -3,6 +3,7 @@
 namespace ProcessMaker\Jobs;
 
 use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeUnique;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
@@ -12,17 +13,27 @@
 use ProcessMaker\Models\User;
 use ProcessMaker\RecommendationEngine;
 
-class GenerateUserRecommendations implements ShouldQueue
+class GenerateUserRecommendations implements ShouldQueue, ShouldBeUnique
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
+    /**
+     * Seconds the unique lock is held so duplicate dispatches for the same user are dropped.
+     */
+    public int $uniqueFor = 60;
+
     /**
      * Create a new job instance.
      */
     public function __construct(public int $user_id)
     {
     }
 
+    public function uniqueId(): string
+    {
+        return (string) $this->user_id;
+    }
+
     public function middleware(): array
     {
         return [(new WithoutOverlapping($this->user_id))->dontRelease()];

diff --git a/ProcessMaker/Listeners/BpmnSubscriber.php b/ProcessMaker/Listeners/BpmnSubscriber.php
@@ -146,22 +146,25 @@ public function onActivityCompleted(ActivityCompletedEvent $event)
         Log::info('Activity completed: ' . json_encode($token->getProperties()));
 
         // Prometheus Metric: Activity Execution Time
-        $startTime = $token->created_at_ms;
-        $completedTime = $token->completed_at_ms;
-        $executionTime = $completedTime->diffInMilliseconds($startTime);
-        Metrics::histogramObserve(
-            'activity_execution_time_seconds',
-            'Activity Execution Time',
-            [
-                'activity_id' => $token->element_id,
-                'activity_name' => $token->element_name,
-                'element_type' => $token->element_type,
-                'process_id' => $token->process_id,
-                'request_id' => $token->process_request_id,
-            ],
-            [1, 10, 3600, 86400],
-            $executionTime,
-        );
+        $startTime = $token->created_at_ms ?? $token->created_at;
+        $completedTime = $token->completed_at_ms ?? $token->completed_at;
+
+        if ($startTime && $completedTime) {
+            $executionTime = $completedTime->diffInMilliseconds($startTime);
+            Metrics::histogramObserve(
+                'activity_execution_time_seconds',
+                'Activity Execution Time',
+                [
+                    'activity_id' => $token->element_id,
+                    'activity_name' => $token->element_name,
+                    'element_type' => $token->element_type,
+                    'process_id' => $token->process_id,
+                    'request_id' => $token->process_request_id,
+                ],
+                [1, 10, 3600, 86400],
+                $executionTime,
+            );
+        }
 
         if ($token->element_type == 'task') {
             $notifiables = $token->getNotifiables('completed');

diff --git a/ProcessMaker/Models/Process.php b/ProcessMaker/Models/Process.php
@@ -342,13 +342,13 @@ public function embed()
     public function getNotificationsAttribute()
     {
         $array = [];
+        $settings = $this->notification_settings->whereNull('element_id');
 
         foreach ($this->requestNotifiableTypes as $notifiable) {
             foreach ($this->requestNotificationTypes as $notification) {
-                $setting = $this->notification_settings()
-                    ->whereNull('element_id')
+                $setting = $settings
                     ->where('notifiable_type', $notifiable)
-                    ->where('notification_type', $notification)->get();
+                    ->where('notification_type', $notification);
 
                 if ($setting->count()) {
                     $value = true;
@@ -372,9 +372,7 @@ public function getTaskNotificationsAttribute()
     {
         $array = [];
 
-        $elements = $this->notification_settings()
-            ->whereNotNull('element_id')
-            ->get();
+        $elements = $this->notification_settings->whereNotNull('element_id');
 
         foreach ($elements->groupBy('element_id') as $group) {
             $elementId = $group->first()->element_id;
@@ -1613,6 +1611,10 @@ public function setProcessCategoryIdAttribute($value)
      */
     public function getProcessCategoryIdAttribute($value)
     {
+        if ($this->relationLoaded('categories')) {
+            return implode(',', $this->categories->pluck('pivot.category_id')->toArray()) ?: $value;
+        }
+
         return implode(',', $this->categories()->pluck('category_id')->toArray()) ?: $value;
     }
 

diff --git a/ProcessMaker/Models/ProcessMakerModel.php b/ProcessMaker/Models/ProcessMakerModel.php
@@ -36,7 +36,7 @@ public function scopeExclude($query, array $columns)
 
         $columnsToShow = array_diff($this->getTableColumns(), $columns);
         $columnsToShow = array_map(function ($column) {
-            return $this->table . '.' . $column;
+            return $this->getTable() . '.' . $column;
         }, $columnsToShow);
 
         return $query->select($columnsToShow);

diff --git a/ProcessMaker/Models/ProcessRequest.php b/ProcessMaker/Models/ProcessRequest.php
@@ -184,6 +184,28 @@ public function shouldBeSearchable()
         }
     }
 
+    /**
+     * Determine if the model existed in the search index prior to an update.
+     * Prevents unnecessary RemoveFromSearch jobs when indexed search is disabled.
+     *
+     * @return bool
+     */
+    public function wasSearchableBeforeUpdate()
+    {
+        return $this->shouldBeSearchable();
+    }
+
+    /**
+     * Determine if the model existed in the search index prior to deletion.
+     * Prevents unnecessary RemoveFromSearch jobs when indexed search is disabled.
+     *
+     * @return bool
+     */
+    public function wasSearchableBeforeDelete()
+    {
+        return $this->shouldBeSearchable();
+    }
+
     /**
      * Get the indexable data array for the model.
      *
@@ -403,6 +425,17 @@ public function tokens()
         return $this->hasMany(ProcessRequestToken::class);
     }
 
+    /**
+     * Active task tokens for this request.
+     */
+    public function activeTasks()
+    {
+        return $this->hasMany(ProcessRequestToken::class)
+            ->select(['id', 'element_name', 'status', 'user_id', 'process_request_id'])
+            ->where('status', 'ACTIVE')
+            ->where('element_type', 'task');
+    }
+
     /**
      * Get the creator/author of this request.
      */
@@ -1088,6 +1121,10 @@ public function isSystem()
 
     public function getProcessVersionAlternativeAttribute(): string | null
     {
+        if (array_key_exists('process_version_alternative', $this->attributes)) {
+            return $this->attributes['process_version_alternative'] ?? 'A';
+        }
+
         return $this->processVersion?->alternative ?? 'A';
     }