fix: route document naming through the canonical namer; sanitize LLM-chosen names

Stop self-naming in the document generators and defer to NetworkStorageIntegration's
single namer (rule N1):
- FreeDocumentGenerator and GenericTemplateGenerator no longer bake in a date prefix,
  em-dash or contact name. They set the clean subject, upload explicitly to the case
  folder (the AfterSave hook fires before the Case link exists), then realign the
  Document + Attachment names to the canonical stored name returned by the upload.
- CaseFolderManager sanitizes every model-chosen name server-side: writeFile splits
  dir/basename and de-duplicates via buildStoredFileName; createFolder, renameItem and
  moveItem sanitize their final segment. The LLM can no longer pick a raw filename.

Refs Task Master #7

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

.taskmaster/config.json

@@ -0,0 +1,46 @@
+{
+  "models": {
+    "main": {
+      "provider": "claude-code",
+      "modelId": "sonnet",
+      "maxTokens": 64000,
+      "temperature": 0.2,
+      "id": "sonnet"
+    },
+    "research": {
+      "provider": "claude-code",
+      "modelId": "sonnet",
+      "maxTokens": 8700,
+      "temperature": 0.1,
+      "id": "claude-sonnet-4-20250514"
+    },
+    "fallback": {
+      "provider": "claude-code",
+      "modelId": "sonnet",
+      "maxTokens": 120000,
+      "temperature": 0.2
+    }
+  },
+  "global": {
+    "logLevel": "info",
+    "debug": false,
+    "defaultNumTasks": 10,
+    "defaultSubtasks": 5,
+    "defaultPriority": "medium",
+    "projectName": "Task Master",
+    "ollamaBaseURL": "http://localhost:11434/api",
+    "bedrockBaseURL": "https://bedrock.us-east-1.amazonaws.com",
+    "responseLanguage": "English",
+    "enableCodebaseAnalysis": true,
+    "enableProxy": false,
+    "anonymousTelemetry": true,
+    "userId": "1234567890"
+  },
+  "claudeCode": {},
+  "codexCli": {},
+  "grokCli": {
+    "timeout": 120000,
+    "workingDirectory": null,
+    "defaultModel": "grok-4-latest"
+  }
+}

.taskmaster/state.json

@@ -0,0 +1,6 @@
+{
+  "currentTag": "master",
+  "lastSwitched": "2026-04-14T06:05:06.044Z",
+  "branchTagMapping": {},
+  "migrationNoticeShown": true
+}

README.md

@@ -1,6 +1,6 @@
 # SmartAssistant - עוזר חכם
 
-**גרסה:** 2.7.0 | **מחבר:** klear | **EspoCRM:** >= 8.0.0
+**גרסה:** 2.8.0 | **מחבר:** klear | **EspoCRM:** >= 8.0.0
 
 ## תיאור
 עוזר AI מאוחד למשרד עורכי דין. מספק ממשק צ'אט צף עם שני מצבי עבודה: **מצב משרד** (סקירה כללית, התראות, סטטיסטיקות) ו**מצב תיק** (סיוע מעמיק בתיק ספציפי). כולל מערכת זיכרון תיק מובנית, ביצוע פעולות באישור המשתמש, ואינטגרציה עם Stream של EspoCRM.

files/client/custom/modules/smart-assistant/src/views/fields/prompt-editor.js

@@ -0,0 +1,32 @@
+/**
+ * Prompt editor field for AssistantPrompt.content, AssistantSkill.content,
+ * UserProfile.content. Inherits from the standard text field — adds:
+ *  - monospace font (mixed Hebrew + English + JSON snippets read better)
+ *  - dir="auto" so RTL/LTR works without a manual toggle
+ *  - taller textarea (min 500px) — these prompts run to thousands of chars
+ */
+define('smart-assistant:views/fields/prompt-editor', ['views/fields/text'], function (Dep) {
+
+    return Dep.extend({
+
+        rowsDefault: 20,
+
+        afterRender: function () {
+            Dep.prototype.afterRender.call(this);
+
+            if (this.isEditMode() || this.isDetailMode()) {
+                var $area = this.$element;
+                if ($area && $area.length) {
+                    $area.attr('dir', 'auto');
+                    $area.css({
+                        'font-family': "'Menlo','Consolas','DejaVu Sans Mono',monospace",
+                        'font-size': '13px',
+                        'line-height': '1.45',
+                        'min-height': '500px',
+                        'tab-size': '4',
+                    });
+                }
+            }
+        },
+    });
+});

files/client/custom/modules/smart-assistant/src/views/floating-chat.js

@@ -457,14 +457,23 @@ define('modules/smart-assistant/views/floating-chat', ['view'], function (View)
             var $btn = this.$el.find('.sa-chat-send');
 
             $messages.append('<div class="sa-msg sa-msg-user">' + this.escapeHtml(message) + '</div>');
+            var thinkingText = this.translate('Thinking', 'labels', 'SmartAssistant') || 'חושבת...';
             var $loading = $('<div class="sa-msg sa-msg-loading"><span class="fas fa-spinner fa-spin" style="margin-left: 5px;"></span> ' +
-                this.escapeHtml(this.translate('Thinking', 'labels', 'SmartAssistant') || 'חושבת...') + '</div>');
+                '<span class="sa-thinking-text">' + this.escapeHtml(thinkingText) + '</span></div>');
             $messages.append($loading);
             this.scrollToBottom();
 
             $btn.prop('disabled', true);
             $input.prop('disabled', true).val('').css('height', 'auto');
 
+            // After 60s, swap the spinner text to a "still working" hint so users
+            // know the longer requests (multi-tool flows) haven't stalled.
+            var slowHintText = this.translate('SlowHint', 'labels', 'SmartAssistant') ||
+                'חושבת... זה לוקח קצת יותר זמן כי אני מעבדת כמה מקורות במקביל';
+            var slowHintTimer = setTimeout(function () {
+                $loading.find('.sa-thinking-text').text(slowHintText);
+            }, 60000);
+
             var payload = {
                 message: message,
                 mode: this.currentMode,
@@ -474,7 +483,8 @@ define('modules/smart-assistant/views/floating-chat', ['view'], function (View)
                 payload.caseId = this.currentCaseId;
             }
 
-            Espo.Ajax.postRequest('SmartAssistant/action/chat', payload, {timeout: 180000}).then(function (response) {
+            Espo.Ajax.postRequest('SmartAssistant/action/chat', payload, {timeout: 600000}).then(function (response) {
+                clearTimeout(slowHintTimer);
                 self.conversationId = response.conversationId;
                 $loading.remove();
 
@@ -492,6 +502,7 @@ define('modules/smart-assistant/views/floating-chat', ['view'], function (View)
                 self.scrollToBottom();
                 $input.prop('disabled', false).focus();
             }).catch(function () {
+                clearTimeout(slowHintTimer);
                 $loading.remove();
                 $messages.append('<div class="sa-msg sa-msg-error">' +
                     self.escapeHtml(self.translate('Error', 'labels', 'SmartAssistant') || 'שגיאה בתקשורת') + '</div>');

files/custom/Espo/Modules/SmartAssistant/Controllers/AssistantPrompt.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Espo\Modules\SmartAssistant\Controllers;
+
+/**
+ * Standard CRUD over /api/v1/AssistantPrompt. Pattern matches AssistantRule.
+ */
+class AssistantPrompt extends \Espo\Core\Controllers\Record
+{
+}

files/custom/Espo/Modules/SmartAssistant/Controllers/AssistantRule.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Espo\Modules\SmartAssistant\Controllers;
+
+/**
+ * Exposes the AssistantRule entity over the standard REST API
+ * (GET/POST/PUT/DELETE /api/v1/AssistantRule).
+ *
+ * Without this controller class EspoCRM responds 404 "Controller does not exist"
+ * even when the entity, object, and acl flags in scopes/AssistantRule.json are
+ * set. Inheriting from Record gives us the full CRUD surface — list/search,
+ * read, create, update, delete — with ACL enforcement.
+ */
+class AssistantRule extends \Espo\Core\Controllers\Record
+{
+}

files/custom/Espo/Modules/SmartAssistant/Controllers/AssistantSkill.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Espo\Modules\SmartAssistant\Controllers;
+
+/**
+ * Standard CRUD over /api/v1/AssistantSkill. Pattern matches AssistantRule.
+ */
+class AssistantSkill extends \Espo\Core\Controllers\Record
+{
+}

files/custom/Espo/Modules/SmartAssistant/Controllers/CaseMemory.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace Espo\Modules\SmartAssistant\Controllers;
+
+/**
+ * Standard CRUD over /api/v1/CaseMemory.
+ *
+ * Until SmartAssistant 2.10.0 the CaseMemory entity was created via
+ * CaseMemoryService::createMemory and listed via Case relation panels —
+ * never via the bare REST endpoint. Flipping `tab: true` exposes the
+ * navbar list view, which uses GET /api/v1/CaseMemory and needs this
+ * Controller class to exist (otherwise EspoCRM returns 404 "Controller
+ * does not exist"). Same pattern as the AssistantRule fix shipped in 2.9.2.
+ */
+class CaseMemory extends \Espo\Core\Controllers\Record
+{
+}

files/custom/Espo/Modules/SmartAssistant/Controllers/SmartAssistant.php

@@ -13,6 +13,8 @@ use Espo\Modules\SmartAssistant\Services\ActionExecutor;
 use Espo\Modules\SmartAssistant\Services\CaseMemoryService;
 use Espo\Modules\SmartAssistant\Services\DocumentAnalyzer;
 use Espo\Modules\SmartAssistant\Services\GenericTemplateGenerator;
+use Espo\Modules\SmartAssistant\Services\FreeDocumentGenerator;
+use Espo\Modules\SmartAssistant\Services\CaseFolderManager;
 use Espo\Entities\User;
 
 class SmartAssistant
@@ -186,7 +188,7 @@ class SmartAssistant
         }
 
         $tool = $data->tool;
-        $params = (array) ($data->params ?? []);
+        $params = json_decode(json_encode($data->params ?? []), true) ?? [];
         $caseId = $data->caseId ?? null;
 
         $executor = $this->injectableFactory->create(ActionExecutor::class);
@@ -217,6 +219,20 @@ class SmartAssistant
         ];
     }
 
+    public function postActionGetDocumentBytes(Request $request, Response $response): array
+    {
+        $this->checkAccess();
+        $data = $request->getParsedBody();
+
+        $filePath = $data->filePath ?? null;
+        if (empty($filePath)) {
+            throw new BadRequest('filePath is required.');
+        }
+
+        $analyzer = $this->injectableFactory->create(DocumentAnalyzer::class);
+        return $analyzer->getDocumentBytes($filePath);
+    }
+
     public function postActionReadMultipleDocuments(Request $request, Response $response): array
     {
         $this->checkAccess();
@@ -279,6 +295,75 @@ class SmartAssistant
         ];
     }
 
+    public function postActionListDocuments(Request $request, Response $response): array
+    {
+        $this->checkAccess();
+        $data = $request->getParsedBody();
+
+        $caseId = $data->caseId ?? null;
+        if (empty($caseId)) {
+            throw new BadRequest('caseId is required.');
+        }
+
+        $analyzer = $this->injectableFactory->create(DocumentAnalyzer::class);
+        return $analyzer->listDocumentsRecursive($caseId);
+    }
+
+    public function postActionBrowseFolder(Request $request, Response $response): array
+    {
+        $this->checkAccess();
+        $data = $request->getParsedBody();
+
+        $path = $data->path ?? null;
+        if ($path === null) {
+            throw new BadRequest('path is required.');
+        }
+
+        $analyzer = $this->injectableFactory->create(DocumentAnalyzer::class);
+        return [
+            'path' => $path,
+            'entries' => $analyzer->browseFolder((string) $path),
+        ];
+    }
+
+    public function postActionFindCaseFolder(Request $request, Response $response): array
+    {
+        $this->checkAccess();
+        $data = $request->getParsedBody();
+
+        $query = $data->query ?? null;
+        if (empty($query)) {
+            throw new BadRequest('query is required.');
+        }
+
+        $limit = isset($data->limit) ? max(1, min((int) $data->limit, 50)) : 20;
+
+        $analyzer = $this->injectableFactory->create(DocumentAnalyzer::class);
+        return [
+            'query' => $query,
+            'matches' => $analyzer->findCaseFolder((string) $query, $limit),
+        ];
+    }
+
+    public function postActionSetCaseFolderPath(Request $request, Response $response): array
+    {
+        $this->checkAccess();
+        if (!$this->acl->checkScope('Case', 'edit')) {
+            throw new Forbidden('No edit access to Case.');
+        }
+
+        $data = $request->getParsedBody();
+        $caseId = $data->caseId ?? null;
+        $path = $data->path ?? null;
+
+        if (empty($caseId) || empty($path)) {
+            throw new BadRequest('caseId and path are required.');
+        }
+
+        $analyzer = $this->injectableFactory->create(DocumentAnalyzer::class);
+        return $analyzer->setCaseFolderPath((string) $caseId, (string) $path);
+    }
+
     public function postActionGenerateFromTemplate(Request $request, Response $response): array
     {
         $this->checkAccess();
@@ -301,4 +386,117 @@ class SmartAssistant
 
         return $generator->generate($templateId, $caseId, $documentSubject, $customPlaceholders);
     }
+
+    public function postActionCreateDocument(Request $request, Response $response): array
+    {
+        $this->checkAccess();
+        $data = $request->getParsedBody();
+
+        $caseId = $data->caseId ?? null;
+        $title = $data->title ?? null;
+        $body = $data->body ?? null;
+
+        if (empty($caseId)) {
+            throw new BadRequest('caseId is required.');
+        }
+        if (empty($title)) {
+            throw new BadRequest('title is required.');
+        }
+        if (empty($body)) {
+            throw new BadRequest('body is required.');
+        }
+
+        $documentType = $data->documentType ?? 'letter';
+        $recipient = $data->recipient ?? null;
+
+        $generator = $this->injectableFactory->create(FreeDocumentGenerator::class);
+
+        return $generator->generate($caseId, $title, $body, $documentType, $recipient);
+    }
+
+    public function postActionWriteToFolder(Request $request, Response $response): array
+    {
+        $this->checkAccess();
+        $data = $request->getParsedBody();
+
+        $caseId = $data->caseId ?? null;
+        $relPath = $data->relPath ?? null;
+        $contentBase64 = $data->contentBase64 ?? null;
+
+        if (empty($caseId)) throw new BadRequest('caseId is required.');
+        if (empty($relPath)) throw new BadRequest('relPath is required.');
+        if (!isset($contentBase64)) throw new BadRequest('contentBase64 is required.');
+
+        $content = base64_decode((string) $contentBase64, true);
+        if ($content === false) {
+            throw new BadRequest('contentBase64 is not valid base64.');
+        }
+
+        $manager = $this->injectableFactory->create(CaseFolderManager::class);
+        return $manager->writeFile($caseId, $relPath, $content);
+    }
+
+    public function postActionCreateFolder(Request $request, Response $response): array
+    {
+        $this->checkAccess();
+        $data = $request->getParsedBody();
+
+        $caseId = $data->caseId ?? null;
+        $relPath = $data->relPath ?? null;
+
+        if (empty($caseId)) throw new BadRequest('caseId is required.');
+        if (empty($relPath)) throw new BadRequest('relPath is required.');
+
+        $manager = $this->injectableFactory->create(CaseFolderManager::class);
+        return $manager->createFolder($caseId, $relPath);
+    }
+
+    public function postActionRenameItem(Request $request, Response $response): array
+    {
+        $this->checkAccess();
+        $data = $request->getParsedBody();
+
+        $caseId = $data->caseId ?? null;
+        $currentRelPath = $data->currentRelPath ?? null;
+        $newName = $data->newName ?? null;
+
+        if (empty($caseId)) throw new BadRequest('caseId is required.');
+        if (empty($currentRelPath)) throw new BadRequest('currentRelPath is required.');
+        if (empty($newName)) throw new BadRequest('newName is required.');
+
+        $manager = $this->injectableFactory->create(CaseFolderManager::class);
+        return $manager->renameItem($caseId, $currentRelPath, $newName);
+    }
+
+    public function postActionMoveItem(Request $request, Response $response): array
+    {
+        $this->checkAccess();
+        $data = $request->getParsedBody();
+
+        $caseId = $data->caseId ?? null;
+        $sourceRelPath = $data->sourceRelPath ?? null;
+        $targetRelPath = $data->targetRelPath ?? null;
+
+        if (empty($caseId)) throw new BadRequest('caseId is required.');
+        if (empty($sourceRelPath)) throw new BadRequest('sourceRelPath is required.');
+        if (empty($targetRelPath)) throw new BadRequest('targetRelPath is required.');
+
+        $manager = $this->injectableFactory->create(CaseFolderManager::class);
+        return $manager->moveItem($caseId, $sourceRelPath, $targetRelPath);
+    }
+
+    public function postActionMarkForDeletion(Request $request, Response $response): array
+    {
+        $this->checkAccess();
+        $data = $request->getParsedBody();
+
+        $caseId = $data->caseId ?? null;
+        $fileRelPath = $data->fileRelPath ?? null;
+
+        if (empty($caseId)) throw new BadRequest('caseId is required.');
+        if (empty($fileRelPath)) throw new BadRequest('fileRelPath is required.');
+
+        $manager = $this->injectableFactory->create(CaseFolderManager::class);
+        return $manager->markForDeletion($caseId, $fileRelPath);
+    }
 }

files/custom/Espo/Modules/SmartAssistant/Controllers/UserProfile.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Espo\Modules\SmartAssistant\Controllers;
+
+/**
+ * Standard CRUD over /api/v1/UserProfile.
+ *
+ * Pattern matches AssistantRule.php — without this class EspoCRM returns
+ * 404 "Controller does not exist" even when the entity is fully defined.
+ */
+class UserProfile extends \Espo\Core\Controllers\Record
+{
+}

files/custom/Espo/Modules/SmartAssistant/Resources/i18n/en_US/SmartAssistant.json

@@ -11,6 +11,7 @@
         "No previous conversations": "No previous conversations",
         "Ask the assistant...": "Ask the assistant...",
         "Thinking": "Thinking...",
+        "SlowHint": "Still thinking… this one is taking a bit longer because I'm processing multiple sources",
         "Error": "Communication error",
         "Back": "Back",
         "Chat with the assistant": "Chat with the assistant",

files/custom/Espo/Modules/SmartAssistant/Resources/i18n/fa_IR/AssistantPrompt.json

@@ -0,0 +1,30 @@
+{
+    "labels": {
+        "Create AssistantPrompt": "צור פרומפט חדש"
+    },
+    "fields": {
+        "name": "שם תיאורי",
+        "key": "מפתח (key)",
+        "description": "תיאור — מה הסעיף הזה עושה",
+        "mode": "מצב",
+        "displayOrder": "סדר הצגה",
+        "content": "תוכן הפרומפט",
+        "isActive": "פעיל",
+        "createdAt": "נוצר",
+        "modifiedAt": "עודכן"
+    },
+    "options": {
+        "mode": {
+            "both": "תיק + משרד",
+            "case": "תיק בלבד",
+            "office": "משרד בלבד"
+        }
+    },
+    "tooltips": {
+        "key": "המפתח שדרכו shira-hermes שולפת את הסעיף הזה. שמות מוכרים: tool_rules, legal_assistance, personality_case, personality_office, writing_style, other_rules_case, other_rules_office. שינוי שם המפתח של סעיף קיים יגרום לכך ש-fallback ל-default יחזור.",
+        "mode": "אם 'both' — מופיע בכל סשן. 'case' — רק כשנפתח תיק. 'office' — רק במסך המשרד הכללי.",
+        "displayOrder": "מספר נמוך = מופיע מוקדם יותר ב-prompt. ברירת מחדל 100.",
+        "content": "הטקסט שיוזרק ל-system prompt. תמיכה ב-RTL אוטומטית. שורה ריקה מסמנת default — קוד ה-Python יחזור לערך המקורי.",
+        "isActive": "כיבוי = הסעיף מתעלם, fallback ל-default מהקוד."
+    }
+}

files/custom/Espo/Modules/SmartAssistant/Resources/i18n/fa_IR/AssistantSkill.json

@@ -0,0 +1,21 @@
+{
+    "labels": {
+        "Create AssistantSkill": "צור מיומנות חדשה"
+    },
+    "fields": {
+        "name": "שם",
+        "description": "תיאור קצר",
+        "triggers": "מילות הפעלה",
+        "content": "תוכן המיומנות (Markdown)",
+        "version": "גרסה",
+        "isActive": "פעיל",
+        "createdAt": "נוצר",
+        "modifiedAt": "עודכן"
+    },
+    "tooltips": {
+        "name": "שם ייחודי (snake-case או kebab-case). למשל direct-access-report-flow.",
+        "description": "משפט קצר: מתי כדאי לשירה להפעיל את המיומנות.",
+        "triggers": "מילים/ביטויים שבהם המיומנות צריכה להופיע — מופרדים בפסיק.",
+        "content": "ה-Markdown המלא של המיומנות. שירה תקרא אותו דרך read_skill כשהיא צריכה אותו."
+    }
+}

files/custom/Espo/Modules/SmartAssistant/Resources/i18n/fa_IR/Document.json

@@ -0,0 +1,9 @@
+{
+    "fields": {
+        "markedForDeletionAt": "סומן למחיקה בתאריך",
+        "markedForDeletionBy": "סומן למחיקה על ידי"
+    },
+    "tooltips": {
+        "markedForDeletionAt": "מסמך זה סומן למחיקה על ידי שירה ומחכה לאישור ידני של עו\"ד למחיקה הפיזית."
+    }
+}

files/custom/Espo/Modules/SmartAssistant/Resources/i18n/fa_IR/Global.json

@@ -2,11 +2,17 @@
     "scopeNames": {
         "CaseMemory": "זיכרון תיק",
         "AssistantRule": "כלל התנהגות",
+        "UserProfile": "פרופיל משתמש",
+        "AssistantSkill": "מיומנות שירה",
+        "AssistantPrompt": "פרומפט שירה",
         "SmartAssistant": "עוזר חכם"
     },
     "scopeNamesPlural": {
         "CaseMemory": "זיכרונות תיקים",
         "AssistantRule": "כללי התנהגות",
+        "UserProfile": "פרופילי משתמשים",
+        "AssistantSkill": "מיומנויות שירה",
+        "AssistantPrompt": "פרומפטים של שירה",
         "SmartAssistant": "עוזר חכם"
     }
 }

files/custom/Espo/Modules/SmartAssistant/Resources/i18n/fa_IR/SmartAssistant.json

@@ -11,6 +11,7 @@
         "No previous conversations": "אין שיחות קודמות",
         "Ask the assistant...": "שאל/י את שירה...",
         "Thinking": "חושבת...",
+        "SlowHint": "חושבת... זה לוקח קצת יותר זמן כי אני מעבדת כמה מקורות במקביל",
         "Error": "שגיאה בתקשורת",
         "Back": "חזרה",
         "Chat with the assistant": "שוחח/י עם שירה",

files/custom/Espo/Modules/SmartAssistant/Resources/i18n/fa_IR/UserProfile.json

@@ -0,0 +1,18 @@
+{
+    "labels": {
+        "Create UserProfile": "צור פרופיל משתמש"
+    },
+    "fields": {
+        "name": "שם",
+        "user": "משתמש",
+        "content": "תוכן הפרופיל",
+        "isActive": "פעיל",
+        "createdAt": "נוצר",
+        "modifiedAt": "עודכן",
+        "createdBy": "נוצר על ידי",
+        "modifiedBy": "עודכן על ידי"
+    },
+    "tooltips": {
+        "content": "טקסט חופשי שמוזרק ל-prompt של שירה תחת '=== ABOUT THIS USER ===' לכל שיחה של המשתמש הזה. שמור עובדות מפתח: תפקיד, תחומי התמחות, העדפות תקשורת, נושאי טיק שמטופלים."
+    }
+}

files/custom/Espo/Modules/SmartAssistant/Resources/layouts/AssistantPrompt/detail.json

@@ -0,0 +1,17 @@
+[
+    {
+        "label": "Overview",
+        "rows": [
+            [{"name": "name"}, {"name": "key"}],
+            [{"name": "mode"}, {"name": "displayOrder"}],
+            [{"name": "isActive"}, false],
+            [{"name": "description", "fullWidth": true}]
+        ]
+    },
+    {
+        "label": "Prompt",
+        "rows": [
+            [{"name": "content", "fullWidth": true}]
+        ]
+    }
+]

files/custom/Espo/Modules/SmartAssistant/Resources/layouts/AssistantPrompt/list.json

@@ -0,0 +1,8 @@
+[
+    {"name": "name", "link": true},
+    {"name": "key"},
+    {"name": "mode"},
+    {"name": "displayOrder"},
+    {"name": "isActive"},
+    {"name": "modifiedAt"}
+]

files/custom/Espo/Modules/SmartAssistant/Resources/layouts/AssistantSkill/detail.json

@@ -0,0 +1,17 @@
+[
+    {
+        "label": "Overview",
+        "rows": [
+            [{"name": "name"}, {"name": "version"}],
+            [{"name": "description", "fullWidth": true}],
+            [{"name": "triggers", "fullWidth": true}],
+            [{"name": "isActive"}, false]
+        ]
+    },
+    {
+        "label": "Skill",
+        "rows": [
+            [{"name": "content", "fullWidth": true}]
+        ]
+    }
+]

files/custom/Espo/Modules/SmartAssistant/Resources/layouts/AssistantSkill/list.json

@@ -0,0 +1,7 @@
+[
+    {"name": "name", "link": true},
+    {"name": "description"},
+    {"name": "isActive"},
+    {"name": "version"},
+    {"name": "modifiedAt"}
+]

files/custom/Espo/Modules/SmartAssistant/Resources/layouts/UserProfile/detail.json

@@ -0,0 +1,15 @@
+[
+    {
+        "label": "Overview",
+        "rows": [
+            [{"name": "name"}, {"name": "user"}],
+            [{"name": "isActive"}, false]
+        ]
+    },
+    {
+        "label": "Profile",
+        "rows": [
+            [{"name": "content", "fullWidth": true}]
+        ]
+    }
+]

files/custom/Espo/Modules/SmartAssistant/Resources/layouts/UserProfile/list.json

@@ -0,0 +1,6 @@
+[
+    {"name": "name", "link": true},
+    {"name": "user", "link": true},
+    {"name": "isActive"},
+    {"name": "modifiedAt"}
+]

files/custom/Espo/Modules/SmartAssistant/Resources/metadata/app/adminPanel.json

@@ -0,0 +1,37 @@
+{
+    "shiraManagement": {
+        "label": "ניהול שירה",
+        "itemList": [
+            {
+                "url": "#AssistantPrompt",
+                "label": "פרומפטים",
+                "iconClass": "fas fa-file-code",
+                "description": "שינוי הסעיפים שמוזרקים ל-system prompt של שירה. עריכה כאן מחליפה את ברירות-המחדל בקוד."
+            },
+            {
+                "url": "#AssistantRule",
+                "label": "כללי התנהגות",
+                "iconClass": "fas fa-list-check",
+                "description": "כללים גלובליים/לפי מצב שיופיעו תחת '=== BEHAVIORAL RULES (MUST FOLLOW) ===' של ה-system prompt."
+            },
+            {
+                "url": "#AssistantSkill",
+                "label": "מיומנויות (Skills)",
+                "iconClass": "fas fa-magic",
+                "description": "תהליכי עבודה מוכנים שהמודל יכול להפעיל. כל מיומנות פעילה מופיעה ב-context."
+            },
+            {
+                "url": "#UserProfile",
+                "label": "פרופילי משתמשים",
+                "iconClass": "fas fa-user-cog",
+                "description": "פרופיל אישי לכל עורך/ת דין. מופיע ב-system prompt תחת '=== ABOUT THIS USER ==='."
+            },
+            {
+                "url": "#CaseMemory",
+                "label": "זיכרון תיקים",
+                "iconClass": "fas fa-brain",
+                "description": "כל רשומות הזיכרון מכל התיקים. גישה ישירה לחיפוש/עריכה — לצד כניסה רגילה מתוך כל תיק."
+            }
+        ]
+    }
+}

files/custom/Espo/Modules/SmartAssistant/Resources/metadata/clientDefs/AssistantPrompt.json

@@ -0,0 +1,5 @@
+{
+    "controller": "controllers/record",
+    "color": "#d99848",
+    "iconClass": "fas fa-file-code"
+}

files/custom/Espo/Modules/SmartAssistant/Resources/metadata/clientDefs/AssistantRule.json

@@ -0,0 +1,10 @@
+{
+    "controller": "controllers/record",
+    "color": "#5e8c61",
+    "iconClass": "fas fa-list-check",
+    "boolFilterList": ["onlyMy"],
+    "filterList": [
+        {"name": "active"},
+        {"name": "inactive"}
+    ]
+}

files/custom/Espo/Modules/SmartAssistant/Resources/metadata/clientDefs/AssistantSkill.json

@@ -0,0 +1,5 @@
+{
+    "controller": "controllers/record",
+    "color": "#aa72b3",
+    "iconClass": "fas fa-magic"
+}

files/custom/Espo/Modules/SmartAssistant/Resources/metadata/clientDefs/CaseMemory.json

@@ -0,0 +1,10 @@
+{
+    "controller": "controllers/record",
+    "color": "#9b59b6",
+    "iconClass": "fas fa-brain",
+    "boolFilterList": ["onlyMy"],
+    "filterList": [
+        {"name": "pinned"},
+        {"name": "byCategory"}
+    ]
+}

files/custom/Espo/Modules/SmartAssistant/Resources/metadata/clientDefs/UserProfile.json

@@ -0,0 +1,7 @@
+{
+    "controller": "controllers/record",
+    "boolFilterList": ["onlyMy"],
+    "filterList": [{"name": "active"}, {"name": "inactive"}],
+    "color": "#7c8caf",
+    "iconClass": "fas fa-user-cog"
+}

files/custom/Espo/Modules/SmartAssistant/Resources/metadata/entityDefs/AssistantPrompt.json

@@ -0,0 +1,76 @@
+{
+    "fields": {
+        "name": {
+            "type": "varchar",
+            "maxLength": 200,
+            "required": true,
+            "trim": true
+        },
+        "key": {
+            "type": "varchar",
+            "maxLength": 100,
+            "required": true,
+            "trim": true,
+            "lowerCase": true
+        },
+        "description": {
+            "type": "varchar",
+            "maxLength": 500
+        },
+        "mode": {
+            "type": "enum",
+            "options": ["both", "case", "office"],
+            "default": "both",
+            "required": true,
+            "style": {
+                "both": "primary",
+                "case": "info",
+                "office": "warning"
+            }
+        },
+        "displayOrder": {
+            "type": "int",
+            "default": 100,
+            "min": 0
+        },
+        "content": {
+            "type": "text",
+            "required": true,
+            "view": "smart-assistant:views/fields/prompt-editor",
+            "lengthOfMaxDisplay": 600
+        },
+        "isActive": {
+            "type": "bool",
+            "default": true
+        },
+        "createdAt": {
+            "type": "datetime",
+            "readOnly": true
+        },
+        "modifiedAt": {
+            "type": "datetime",
+            "readOnly": true
+        },
+        "createdBy": {
+            "type": "link",
+            "readOnly": true
+        },
+        "modifiedBy": {
+            "type": "link",
+            "readOnly": true
+        }
+    },
+    "links": {
+        "createdBy": {"type": "belongsTo", "entity": "User"},
+        "modifiedBy": {"type": "belongsTo", "entity": "User"}
+    },
+    "collection": {
+        "orderBy": "displayOrder",
+        "order": "asc",
+        "textFilterFields": ["name", "key", "description", "content"]
+    },
+    "indexes": {
+        "key": {"columns": ["key", "deleted"], "unique": true},
+        "modeActive": {"columns": ["mode", "isActive", "deleted"]}
+    }
+}

files/custom/Espo/Modules/SmartAssistant/Resources/metadata/entityDefs/AssistantSkill.json

@@ -0,0 +1,62 @@
+{
+    "fields": {
+        "name": {
+            "type": "varchar",
+            "maxLength": 100,
+            "required": true,
+            "trim": true
+        },
+        "description": {
+            "type": "varchar",
+            "maxLength": 500
+        },
+        "triggers": {
+            "type": "text",
+            "lengthOfMaxDisplay": 200
+        },
+        "content": {
+            "type": "text",
+            "required": true,
+            "view": "smart-assistant:views/fields/prompt-editor",
+            "lengthOfMaxDisplay": 400
+        },
+        "version": {
+            "type": "varchar",
+            "maxLength": 20,
+            "default": "1.0"
+        },
+        "isActive": {
+            "type": "bool",
+            "default": true
+        },
+        "createdAt": {
+            "type": "datetime",
+            "readOnly": true
+        },
+        "modifiedAt": {
+            "type": "datetime",
+            "readOnly": true
+        },
+        "createdBy": {
+            "type": "link",
+            "readOnly": true
+        },
+        "modifiedBy": {
+            "type": "link",
+            "readOnly": true
+        }
+    },
+    "links": {
+        "createdBy": {"type": "belongsTo", "entity": "User"},
+        "modifiedBy": {"type": "belongsTo", "entity": "User"}
+    },
+    "collection": {
+        "orderBy": "name",
+        "order": "asc",
+        "textFilterFields": ["name", "description", "triggers", "content"]
+    },
+    "indexes": {
+        "name": {"columns": ["name", "deleted"], "unique": true},
+        "isActive": {"columns": ["isActive", "deleted"]}
+    }
+}

files/custom/Espo/Modules/SmartAssistant/Resources/metadata/entityDefs/Document.json

@@ -0,0 +1,19 @@
+{
+    "fields": {
+        "markedForDeletionAt": {
+            "type": "datetime",
+            "readOnly": true,
+            "tooltip": true
+        },
+        "markedForDeletionBy": {
+            "type": "link",
+            "readOnly": true
+        }
+    },
+    "links": {
+        "markedForDeletionBy": {
+            "type": "belongsTo",
+            "entity": "User"
+        }
+    }
+}

files/custom/Espo/Modules/SmartAssistant/Resources/metadata/entityDefs/UserProfile.json

@@ -0,0 +1,63 @@
+{
+    "fields": {
+        "name": {
+            "type": "varchar",
+            "maxLength": 255,
+            "required": true
+        },
+        "user": {
+            "type": "link",
+            "required": true
+        },
+        "content": {
+            "type": "text",
+            "view": "smart-assistant:views/fields/prompt-editor",
+            "lengthOfMaxDisplay": 400
+        },
+        "isActive": {
+            "type": "bool",
+            "default": true
+        },
+        "createdAt": {
+            "type": "datetime",
+            "readOnly": true
+        },
+        "modifiedAt": {
+            "type": "datetime",
+            "readOnly": true
+        },
+        "createdBy": {
+            "type": "link",
+            "readOnly": true
+        },
+        "modifiedBy": {
+            "type": "link",
+            "readOnly": true
+        }
+    },
+    "links": {
+        "user": {
+            "type": "belongsTo",
+            "entity": "User"
+        },
+        "createdBy": {
+            "type": "belongsTo",
+            "entity": "User"
+        },
+        "modifiedBy": {
+            "type": "belongsTo",
+            "entity": "User"
+        }
+    },
+    "collection": {
+        "orderBy": "modifiedAt",
+        "order": "desc",
+        "textFilterFields": ["name", "content"]
+    },
+    "indexes": {
+        "userId": {
+            "columns": ["userId", "deleted"],
+            "unique": true
+        }
+    }
+}

files/custom/Espo/Modules/SmartAssistant/Resources/metadata/scopes/AssistantPrompt.json

@@ -0,0 +1,13 @@
+{
+    "entity": true,
+    "object": true,
+    "module": "SmartAssistant",
+    "acl": true,
+    "aclActionList": ["create", "read", "edit", "delete"],
+    "aclLevelList": ["all", "no"],
+    "tab": true,
+    "stream": false,
+    "disabled": false,
+    "importable": false,
+    "customizable": true
+}

files/custom/Espo/Modules/SmartAssistant/Resources/metadata/scopes/AssistantRule.json

@@ -6,6 +6,8 @@
     "aclActionList": ["create", "read", "edit", "delete"],
     "aclLevelList": ["all", "team", "own", "no"],
     "stream": false,
-    "tab": false,
-    "disabled": false
+    "tab": true,
+    "disabled": false,
+    "importable": false,
+    "customizable": true
 }

files/custom/Espo/Modules/SmartAssistant/Resources/metadata/scopes/AssistantSkill.json

@@ -0,0 +1,13 @@
+{
+    "entity": true,
+    "object": true,
+    "module": "SmartAssistant",
+    "acl": true,
+    "aclActionList": ["create", "read", "edit", "delete"],
+    "aclLevelList": ["all", "no"],
+    "tab": true,
+    "stream": false,
+    "disabled": false,
+    "importable": false,
+    "customizable": true
+}

files/custom/Espo/Modules/SmartAssistant/Resources/metadata/scopes/CaseMemory.json

@@ -5,7 +5,7 @@
     "acl": true,
     "aclActionList": ["create", "read", "edit", "delete"],
     "aclLevelList": ["all", "team", "own", "no"],
-    "tab": false,
+    "tab": true,
     "stream": false,
     "disabled": false,
     "importable": false,

files/custom/Espo/Modules/SmartAssistant/Resources/metadata/scopes/UserProfile.json

@@ -0,0 +1,13 @@
+{
+    "entity": true,
+    "object": true,
+    "module": "SmartAssistant",
+    "acl": true,
+    "aclActionList": ["create", "read", "edit", "delete"],
+    "aclLevelList": ["all", "own", "no"],
+    "tab": true,
+    "stream": false,
+    "disabled": false,
+    "importable": false,
+    "customizable": true
+}

files/custom/Espo/Modules/SmartAssistant/Services/AlertCalculator.php

@@ -46,7 +46,7 @@ class AlertCalculator
             ->where(['status!=' => self::CLOSED_STATUSES, 'deleted' => false])->count();
 
         $totalOverdueTasks = $this->entityManager->getRDBRepository('Task')
-            ->where(['status!=' => ['Completed', 'Canceled', 'Deferred'], 'dateEnd<' => $today, 'dateEnd!=' => null, 'deleted' => false, 'parentType' => 'Case'])->count();
+            ->where(['status!=' => ['Completed', 'Canceled', 'Deferred'], 'dateEnd<' => $today, 'dateEnd!=' => null, 'deleted' => false, 'parentType' => ['Case', 'Contact']])->count();
 
         $upcomingHearings = $this->entityManager->getRDBRepository('Case')
             ->where(['cNextHearing>=' => $today, 'cNextHearing<=' => $weekEnd, 'status!=' => self::CLOSED_STATUSES, 'deleted' => false])->count();
@@ -69,11 +69,12 @@ class AlertCalculator
     {
         $alerts = [];
         $now = new \DateTime();
+        $today = $now->format('Y-m-d');
         $warningThreshold = (new \DateTime())->modify("-{$warningDays} days")->format('Y-m-d H:i:s');
         $criticalThreshold = (new \DateTime())->modify("-{$criticalDays} days")->format('Y-m-d H:i:s');
 
         $cases = $this->entityManager->getRDBRepository('Case')
-            ->select(['id', 'name', 'status', 'assignedUserName', 'cLastActivityAt', 'createdAt'])
+            ->select(['id', 'name', 'status', 'assignedUserName', 'cLastActivityAt', 'createdAt', 'cNextHearing'])
             ->where([
                 'status!=' => self::CLOSED_STATUSES, 'deleted' => false,
                 'OR' => [
@@ -83,6 +84,17 @@ class AlertCalculator
             ])->order('cLastActivityAt', 'ASC')->limit(0, 50)->find();
 
         foreach ($cases as $case) {
+            $status = $case->get('status');
+
+            // Suppress inactivity alerts for cases legitimately awaiting court action.
+            // PendingDecision: nothing the lawyer can do until the court rules.
+            // PendingHearing: nothing to do if a future hearing is already scheduled.
+            if ($status === 'PendingDecision') continue;
+            if ($status === 'PendingHearing') {
+                $nextHearing = $case->get('cNextHearing');
+                if ($nextHearing && $nextHearing >= $today) continue;
+            }
+
             $lastActivity = $case->get('cLastActivityAt') ?? $case->get('createdAt');
             if (!$lastActivity) continue;
             $daysSince = $now->diff(new \DateTime($lastActivity))->days;
@@ -106,7 +118,7 @@ class AlertCalculator
 
         $tasks = $this->entityManager->getRDBRepository('Task')
             ->select(['id', 'name', 'dateEnd', 'status', 'parentId', 'parentType', 'parentName', 'assignedUserName'])
-            ->where(['status!=' => ['Completed', 'Canceled', 'Deferred'], 'dateEnd<' => $today, 'dateEnd!=' => null, 'deleted' => false, 'parentType' => 'Case'])
+            ->where(['status!=' => ['Completed', 'Canceled', 'Deferred'], 'dateEnd<' => $today, 'dateEnd!=' => null, 'deleted' => false, 'parentType' => ['Case', 'Contact']])
             ->order('dateEnd', 'ASC')->limit(0, 50)->find();
 
         foreach ($tasks as $task) {
@@ -132,7 +144,7 @@ class AlertCalculator
         $recentTaskThreshold = date('Y-m-d H:i:s', strtotime('-7 days'));
 
         $cases = $this->entityManager->getRDBRepository('Case')
-            ->select(['id', 'name', 'cNextHearing', 'assignedUserName', 'cLastActivityAt'])
+            ->select(['id', 'name', 'cNextHearing', 'assignedUserName', 'cLastActivityAt', 'contactId'])
             ->where(['cNextHearing>=' => $today, 'cNextHearing<=' => $threshold, 'status!=' => self::CLOSED_STATUSES, 'deleted' => false])
             ->order('cNextHearing', 'ASC')->find();
 
@@ -140,13 +152,7 @@ class AlertCalculator
             $lastActivity = $case->get('cLastActivityAt');
             if ($lastActivity && $lastActivity >= $recentActivityThreshold) continue;
 
-            $openTaskCount = $this->entityManager->getRDBRepository('Task')
-                ->where(['parentId' => $case->get('id'), 'parentType' => 'Case', 'status!=' => ['Completed', 'Canceled', 'Deferred'], 'deleted' => false])->count();
-            if ($openTaskCount > 0) continue;
-
-            $recentCompleted = $this->entityManager->getRDBRepository('Task')
-                ->where(['parentId' => $case->get('id'), 'parentType' => 'Case', 'status' => 'Completed', 'modifiedAt>=' => $recentTaskThreshold, 'deleted' => false])->count();
-            if ($recentCompleted > 0) continue;
+            if ($this->caseHasPreparation($case, $recentTaskThreshold)) continue;
 
             $daysUntil = (new \DateTime())->diff(new \DateTime($case->get('cNextHearing')))->days;
             $severity = ($daysUntil <= 1) ? 'critical' : 'warning';
@@ -162,6 +168,104 @@ class AlertCalculator
         return $alerts;
     }
 
+    /**
+     * Check if a case has any evidence of hearing preparation:
+     * 1. Tasks linked directly to the case (parentType='Case')
+     * 2. Tasks linked to the case's contacts (parentType='Contact')
+     * 3. Tasks linked through NhActivity records for this case
+     */
+    private function caseHasPreparation(\Espo\ORM\Entity $case, string $recentTaskThreshold): bool
+    {
+        $caseId = $case->get('id');
+
+        // Collect all parentId+parentType pairs that relate to this case
+        $parentConditions = [
+            ['parentType' => 'Case', 'parentId' => $caseId],
+        ];
+
+        // Also check tasks linked to the case's contacts
+        $contactIds = $this->getCaseContactIds($case);
+        if (!empty($contactIds)) {
+            $parentConditions[] = ['parentType' => 'Contact', 'parentId' => $contactIds];
+        }
+
+        // Check 1: Any open tasks linked to the case or its contacts
+        $openTaskCount = $this->entityManager->getRDBRepository('Task')
+            ->where([
+                'OR' => $parentConditions,
+                'status!=' => ['Completed', 'Canceled', 'Deferred'],
+                'deleted' => false,
+            ])->count();
+        if ($openTaskCount > 0) return true;
+
+        // Check 2: Any recently completed tasks linked to the case or its contacts
+        $recentCompleted = $this->entityManager->getRDBRepository('Task')
+            ->where([
+                'OR' => $parentConditions,
+                'status' => 'Completed',
+                'modifiedAt>=' => $recentTaskThreshold,
+                'deleted' => false,
+            ])->count();
+        if ($recentCompleted > 0) return true;
+
+        // Check 3: Tasks linked through NhActivity records for this case
+        $nhActivityTaskCount = $this->entityManager->getRDBRepository('NhActivity')
+            ->where([
+                'caseId' => $caseId,
+                'taskId!=' => null,
+                'deleted' => false,
+            ])->count();
+
+        if ($nhActivityTaskCount > 0) {
+            $nhActivities = $this->entityManager->getRDBRepository('NhActivity')
+                ->select(['taskId'])
+                ->where([
+                    'caseId' => $caseId,
+                    'taskId!=' => null,
+                    'deleted' => false,
+                ])->find();
+
+            $taskIds = [];
+            foreach ($nhActivities as $nha) {
+                $taskIds[] = $nha->get('taskId');
+            }
+
+            $activeNhTasks = $this->entityManager->getRDBRepository('Task')
+                ->where([
+                    'id' => $taskIds,
+                    'status!=' => ['Canceled'],
+                    'deleted' => false,
+                ])->count();
+            if ($activeNhTasks > 0) return true;
+        }
+
+        return false;
+    }
+
+    private function getCaseContactIds(\Espo\ORM\Entity $case): array
+    {
+        $contactIds = [];
+
+        $primaryContactId = $case->get('contactId');
+        if ($primaryContactId) {
+            $contactIds[] = $primaryContactId;
+        }
+
+        $contacts = $this->entityManager->getRDBRepository('Case')
+            ->getRelation($case, 'contacts')
+            ->select(['id'])
+            ->find();
+
+        foreach ($contacts as $contact) {
+            $id = $contact->get('id');
+            if (!in_array($id, $contactIds)) {
+                $contactIds[] = $id;
+            }
+        }
+
+        return $contactIds;
+    }
+
     private function findUnassignedNewCases(): array
     {
         $alerts = [];
@@ -191,7 +295,7 @@ class AlertCalculator
 
         $tasks = $this->entityManager->getRDBRepository('Task')
             ->select(['id', 'name', 'dateEnd', 'parentId', 'parentType', 'parentName', 'assignedUserName'])
-            ->where(['status!=' => ['Completed', 'Canceled', 'Deferred'], 'dateEnd>=' => $today, 'dateEnd<=' => $threshold, 'deleted' => false, 'parentType' => 'Case'])
+            ->where(['status!=' => ['Completed', 'Canceled', 'Deferred'], 'dateEnd>=' => $today, 'dateEnd<=' => $threshold, 'deleted' => false, 'parentType' => ['Case', 'Contact']])
             ->order('dateEnd', 'ASC')->limit(0, 30)->find();
 
         foreach ($tasks as $task) {
@@ -237,7 +341,7 @@ class AlertCalculator
 
         foreach (array_keys($userCounts) as $uid) {
             $userCounts[$uid]['openTasks'] = $this->entityManager->getRDBRepository('Task')
-                ->where(['assignedUserId' => $uid, 'status!=' => ['Completed', 'Canceled', 'Deferred'], 'deleted' => false, 'parentType' => 'Case'])->count();
+                ->where(['assignedUserId' => $uid, 'status!=' => ['Completed', 'Canceled', 'Deferred'], 'deleted' => false, 'parentType' => ['Case', 'Contact']])->count();
         }
 
         return array_values($userCounts);

files/custom/Espo/Modules/SmartAssistant/Services/AssistantPromptContextProvider.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace Espo\Modules\SmartAssistant\Services;
+
+use Espo\ORM\EntityManager;
+use Espo\Core\Utils\Log;
+
+/**
+ * Loads active prompt sections keyed by their `key` field, filtered by mode.
+ *
+ * Returned shape: `["tool_rules" => "...", "writing_style" => "...", ...]`.
+ * The Python prompt_builder treats a missing key (or empty string) as
+ * "use the in-code default" — so this provider is purely additive.
+ */
+class AssistantPromptContextProvider
+{
+    private EntityManager $entityManager;
+    private Log $log;
+
+    public function __construct(EntityManager $entityManager, Log $log)
+    {
+        $this->entityManager = $entityManager;
+        $this->log = $log;
+    }
+
+    /**
+     * @return array<string, string>  key => content
+     */
+    public function getPromptsForMode(string $mode): array
+    {
+        $entries = $this->entityManager->getRDBRepository('AssistantPrompt')
+            ->where([
+                'isActive' => true,
+                'deleted' => false,
+                'mode' => ['both', $mode],
+            ])
+            ->order('displayOrder', 'ASC')
+            ->find();
+
+        $out = [];
+        foreach ($entries as $entry) {
+            $key = (string) $entry->get('key');
+            $content = (string) ($entry->get('content') ?? '');
+            if ($key === '' || $content === '') {
+                continue;
+            }
+            $out[$key] = $content;
+        }
+
+        return $out;
+    }
+}

files/custom/Espo/Modules/SmartAssistant/Services/AssistantSkillContextProvider.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace Espo\Modules\SmartAssistant\Services;
+
+use Espo\ORM\EntityManager;
+use Espo\Core\Utils\Log;
+
+/**
+ * Lists active skills (metadata only — name/description/triggers) for the
+ * system prompt's "=== SKILLS (learned workflows) ===" hint. The full body
+ * is fetched on demand by shira-hermes' read_skill tool via REST.
+ */
+class AssistantSkillContextProvider
+{
+    private EntityManager $entityManager;
+    private Log $log;
+
+    public function __construct(EntityManager $entityManager, Log $log)
+    {
+        $this->entityManager = $entityManager;
+        $this->log = $log;
+    }
+
+    /**
+     * @return array<int, array{name: string, description: string, triggers: string}>
+     */
+    public function listSkills(): array
+    {
+        $entries = $this->entityManager->getRDBRepository('AssistantSkill')
+            ->where(['isActive' => true, 'deleted' => false])
+            ->order('name', 'ASC')
+            ->find();
+
+        $skills = [];
+        foreach ($entries as $entry) {
+            $skills[] = [
+                'name' => (string) $entry->get('name'),
+                'description' => (string) ($entry->get('description') ?? ''),
+                'triggers' => (string) ($entry->get('triggers') ?? ''),
+            ];
+        }
+
+        return $skills;
+    }
+}

files/custom/Espo/Modules/SmartAssistant/Services/CaseContextBuilder.php

@@ -33,6 +33,7 @@ class CaseContextBuilder
             'recentNotes' => $this->getRecentNotes($caseId),
             'availableTemplates' => $this->getAvailableTemplates(),
             'documents' => $this->getDocumentListing($caseId),
+            'signatureRequests' => $this->getSignatureRequests($caseId),
             'currentUser' => $this->getUserData($userId),
             'validStatuses' => ActionExecutor::VALID_STATUSES,
         ];
@@ -82,9 +83,18 @@ class CaseContextBuilder
 
     private function getOpenTasks(string $caseId): array
     {
+        $parentConditions = [
+            ['parentType' => 'Case', 'parentId' => $caseId],
+        ];
+
+        $contactIds = $this->getCaseContactIds($caseId);
+        if (!empty($contactIds)) {
+            $parentConditions[] = ['parentType' => 'Contact', 'parentId' => $contactIds];
+        }
+
         $tasks = [];
         $collection = $this->entityManager->getRDBRepository('Task')
-            ->where(['parentType' => 'Case', 'parentId' => $caseId, 'status!=' => ['Completed', 'Canceled']])
+            ->where(['OR' => $parentConditions, 'status!=' => ['Completed', 'Canceled']])
             ->order('dateEnd', 'ASC')->limit(0, 10)->find();
 
         foreach ($collection as $t) {
@@ -97,6 +107,32 @@ class CaseContextBuilder
         return $tasks;
     }
 
+    private function getCaseContactIds(string $caseId): array
+    {
+        $case = $this->entityManager->getEntityById('Case', $caseId);
+        if (!$case) return [];
+
+        $contactIds = [];
+        $primaryContactId = $case->get('contactId');
+        if ($primaryContactId) {
+            $contactIds[] = $primaryContactId;
+        }
+
+        $contacts = $this->entityManager->getRDBRepository('Case')
+            ->getRelation($case, 'contacts')
+            ->select(['id'])
+            ->find();
+
+        foreach ($contacts as $contact) {
+            $id = $contact->get('id');
+            if (!in_array($id, $contactIds)) {
+                $contactIds[] = $id;
+            }
+        }
+
+        return $contactIds;
+    }
+
     private function getUpcomingMeetings(string $caseId): array
     {
         $meetings = [];
@@ -152,10 +188,20 @@ class CaseContextBuilder
     {
         $templates = [];
         $collection = $this->entityManager->getRDBRepository('DocumentTemplate')
-            ->where(['entityType' => 'Case'])->order('name', 'ASC')->find();
+            ->where([
+                'targetEntityType' => 'Case',
+                'isActive' => true,
+            ])
+            ->order('name', 'ASC')
+            ->find();
 
         foreach ($collection as $t) {
-            $templates[] = ['id' => $t->get('id'), 'name' => $t->get('name')];
+            $templates[] = [
+                'id' => $t->get('id'),
+                'name' => $t->get('name'),
+                'category' => $t->get('category'),
+                'description' => $t->get('description'),
+            ];
         }
         return $templates;
     }
@@ -167,13 +213,51 @@ class CaseContextBuilder
         return ['id' => $user->get('id'), 'name' => $user->get('name')];
     }
 
+    private function getSignatureRequests(string $caseId): array
+    {
+        try {
+            $collection = $this->entityManager->getRDBRepository('SignatureRequest')
+                ->where([
+                    'caseId' => $caseId,
+                    'status!=' => ['Completed', 'Voided'],
+                ])
+                ->order('createdAt', 'DESC')
+                ->limit(0, 10)
+                ->find();
+
+            $requests = [];
+
+            foreach ($collection as $sr) {
+                $requests[] = [
+                    'id' => $sr->get('id'),
+                    'name' => $sr->get('name'),
+                    'status' => $sr->get('status'),
+                    'sentAt' => $sr->get('sentAt'),
+                ];
+            }
+
+            return $requests;
+        } catch (\Exception $e) {
+            // SignatureRequest entity might not exist if DigitalSignature not installed
+            return [];
+        }
+    }
+
     private function getDocumentListing(string $caseId): array
     {
         try {
             $analyzer = $this->injectableFactory->create(DocumentAnalyzer::class);
             $result = $analyzer->listDocumentsRecursive($caseId);
 
-            $simplified = ['totalFiles' => $result['totalFiles'], 'folders' => [], 'rootFiles' => []];
+            $simplified = [
+                'totalFiles' => $result['totalFiles'],
+                'folders' => [],
+                'rootFiles' => [],
+                'resolvedPath' => $result['resolvedPath'] ?? null,
+                'pathSource' => $result['pathSource'] ?? null,
+                'folderExists' => $result['folderExists'] ?? null,
+                'diagnostic' => $result['reason'] ?? null,
+            ];
 
             foreach ($result['folders'] as $folder) {
                 $files = [];

files/custom/Espo/Modules/SmartAssistant/Services/CaseFolderManager.php

@@ -0,0 +1,388 @@
+<?php
+
+namespace Espo\Modules\SmartAssistant\Services;
+
+use Espo\Core\Exceptions\BadRequest;
+use Espo\Core\Exceptions\Error;
+use Espo\Core\Exceptions\Forbidden;
+use Espo\Core\Exceptions\NotFound;
+use Espo\Core\InjectableFactory;
+use Espo\Core\Utils\Log;
+use Espo\ORM\EntityManager;
+use Espo\Entities\User;
+use Espo\Modules\NetworkStorageIntegration\Services\NetworkDocumentService;
+use Espo\Modules\NetworkStorageIntegration\Classes\LocalFilesystemClient;
+
+/**
+ * Wraps NetworkDocumentService and constrains every operation to the case's
+ * own folder. Never exposes a physical delete — only soft-delete via
+ * markForDeletion().
+ */
+class CaseFolderManager
+{
+    private const DELETION_FOLDER_NAME = 'מסמכים למחיקה';
+    private const DELETION_PREFIX = 'למחיקה - ';
+
+    public function __construct(
+        private EntityManager $entityManager,
+        private InjectableFactory $injectableFactory,
+        private Log $log,
+        private User $user
+    ) {}
+
+    /**
+     * @return array{success: bool, path: string, size: int}
+     */
+    public function writeFile(string $caseId, string $relPath, string $content): array
+    {
+        $client = $this->getNds()->getClient();
+
+        // Split the (LLM-provided) relPath into folder + filename. Subfolders
+        // are allowed, but the final filename is sanitized and de-duplicated by
+        // the canonical namer (rule N1) — never trust the model to name files.
+        $normalized = $this->normalize($relPath);
+        if ($normalized === '') {
+            throw new BadRequest('Path is required.');
+        }
+
+        $slash = strrpos($normalized, '/');
+        $dirRel = $slash === false ? '' : substr($normalized, 0, $slash);
+        $baseName = $slash === false ? $normalized : substr($normalized, $slash + 1);
+
+        $ext = pathinfo($baseName, PATHINFO_EXTENSION) ?: 'bin';
+        $subject = pathinfo($baseName, PATHINFO_FILENAME);
+
+        $parentAbs = $dirRel === ''
+            ? $this->getCaseRoot($caseId)
+            : $this->resolveSafePath($caseId, $this->sanitizeRelSegments($dirRel), requireExists: false);
+
+        $client->createFolderRecursive($parentAbs);
+
+        $storedName = LocalFilesystemClient::buildStoredFileName($client, $parentAbs, $subject, $ext);
+        $absInsideStorage = $parentAbs . '/' . $storedName;
+
+        $ok = $client->uploadFile($absInsideStorage, $content);
+        if (!$ok) {
+            throw new Error("Failed to write file: {$absInsideStorage}");
+        }
+
+        $this->log->info("CaseFolderManager: wrote '{$absInsideStorage}' (case {$caseId})");
+
+        return [
+            'success' => true,
+            'path' => $absInsideStorage,
+            'size' => strlen($content),
+        ];
+    }
+
+    /**
+     * @return array{success: bool, path: string, alreadyExisted: bool}
+     */
+    public function createFolder(string $caseId, string $relPath): array
+    {
+        $cleanRel = $this->sanitizeRelSegments($this->normalize($relPath));
+        if ($cleanRel === '') {
+            throw new BadRequest('A valid folder name is required.');
+        }
+
+        $abs = $this->resolveSafePath($caseId, $cleanRel, requireExists: false);
+        $client = $this->getNds()->getClient();
+
+        $alreadyExisted = $client->exists($abs);
+        if (!$alreadyExisted) {
+            $ok = $client->createFolderRecursive($abs);
+            if (!$ok) {
+                throw new Error("Failed to create folder: {$abs}");
+            }
+        }
+
+        $this->log->info("CaseFolderManager: created folder '{$abs}' (case {$caseId})");
+
+        return [
+            'success' => true,
+            'path' => $abs,
+            'alreadyExisted' => $alreadyExisted,
+        ];
+    }
+
+    /**
+     * @return array{success: bool, oldPath: string, newPath: string}
+     */
+    public function renameItem(string $caseId, string $currentRelPath, string $newName): array
+    {
+        $newName = trim($newName);
+        if ($newName === '' || str_contains($newName, '/') || str_contains($newName, '\\')) {
+            throw new BadRequest('newName must be a plain file/folder name without slashes.');
+        }
+
+        // Sanitize the model-chosen name (rule N1).
+        $newName = LocalFilesystemClient::sanitizeFileName($newName);
+        if ($newName === '') {
+            throw new BadRequest('newName is empty after sanitization.');
+        }
+
+        $absCurrent = $this->resolveSafePath($caseId, $currentRelPath, requireExists: true);
+
+        $parent = $this->dirnameRel($absCurrent);
+        $absNew = $parent === '' ? $newName : ($parent . '/' . $newName);
+
+        // Confirm the new path is still inside the case folder.
+        $this->assertWithinCaseRoot($caseId, $absNew);
+
+        $client = $this->getNds()->getClient();
+        if ($client->exists($absNew)) {
+            throw new Error("Target already exists: {$absNew}");
+        }
+
+        $ok = $client->move($absCurrent, $absNew);
+        if (!$ok) {
+            throw new Error("Failed to rename: {$absCurrent} -> {$absNew}");
+        }
+
+        $this->log->info("CaseFolderManager: renamed '{$absCurrent}' -> '{$absNew}' (case {$caseId})");
+
+        return [
+            'success' => true,
+            'oldPath' => $absCurrent,
+            'newPath' => $absNew,
+        ];
+    }
+
+    /**
+     * @return array{success: bool, oldPath: string, newPath: string}
+     */
+    public function moveItem(string $caseId, string $sourceRelPath, string $targetRelPath): array
+    {
+        $absSource = $this->resolveSafePath($caseId, $sourceRelPath, requireExists: true);
+        $absTarget = $this->resolveSafePath(
+            $caseId,
+            $this->sanitizeRelSegments($this->normalize($targetRelPath)),
+            requireExists: false
+        );
+
+        $client = $this->getNds()->getClient();
+
+        $parent = $this->dirnameRel($absTarget);
+        if ($parent !== '' && !$client->exists($parent)) {
+            $client->createFolderRecursive($parent);
+        }
+
+        if ($client->exists($absTarget)) {
+            throw new Error("Target already exists: {$absTarget}");
+        }
+
+        $ok = $client->move($absSource, $absTarget);
+        if (!$ok) {
+            throw new Error("Failed to move: {$absSource} -> {$absTarget}");
+        }
+
+        $this->log->info("CaseFolderManager: moved '{$absSource}' -> '{$absTarget}' (case {$caseId})");
+
+        return [
+            'success' => true,
+            'oldPath' => $absSource,
+            'newPath' => $absTarget,
+        ];
+    }
+
+    /**
+     * Soft-delete: move file into the case's "מסמכים למחיקה" folder with a
+     * "למחיקה - " prefix. Never physically deletes. Also updates the linked
+     * Document entity (if any) so admins can audit pending deletions.
+     *
+     * @return array{success: bool, originalPath: string, newPath: string, deletionFolder: string}
+     */
+    public function markForDeletion(string $caseId, string $fileRelPath): array
+    {
+        $absSource = $this->resolveSafePath($caseId, $fileRelPath, requireExists: true);
+        $caseRoot = $this->getCaseRoot($caseId);
+
+        $deletionFolder = $caseRoot . '/' . self::DELETION_FOLDER_NAME;
+        $client = $this->getNds()->getClient();
+
+        if (!$client->exists($deletionFolder)) {
+            $client->createFolderRecursive($deletionFolder);
+        }
+
+        $baseName = basename($absSource);
+        $targetName = self::DELETION_PREFIX . $baseName;
+        $absTarget = $deletionFolder . '/' . $targetName;
+
+        // Avoid name collisions with already-marked files.
+        if ($client->exists($absTarget)) {
+            $stamp = date('Y-m-d_H-i-s');
+            $targetName = self::DELETION_PREFIX . $stamp . ' - ' . $baseName;
+            $absTarget = $deletionFolder . '/' . $targetName;
+        }
+
+        $ok = $client->move($absSource, $absTarget);
+        if (!$ok) {
+            throw new Error("Failed to mark for deletion: {$absSource}");
+        }
+
+        // Best-effort: update Document entity if we can find one pointing to this file.
+        $this->touchDocumentForDeletion($absSource, $absTarget);
+
+        $this->log->info(
+            "CaseFolderManager: marked for deletion '{$absSource}' -> '{$absTarget}' " .
+            "(case {$caseId}, by user {$this->user->getId()})"
+        );
+
+        return [
+            'success' => true,
+            'originalPath' => $absSource,
+            'newPath' => $absTarget,
+            'deletionFolder' => $deletionFolder,
+        ];
+    }
+
+    // --- internals ---------------------------------------------------------
+
+    private function getNds(): NetworkDocumentService
+    {
+        return $this->injectableFactory->create(NetworkDocumentService::class);
+    }
+
+    /**
+     * Return the storage-relative root folder of the case.
+     */
+    private function getCaseRoot(string $caseId): string
+    {
+        $root = $this->getNds()->getEntityFolderPath('Case', $caseId);
+        if (!$root) {
+            throw new NotFound("No folder is configured for Case {$caseId}.");
+        }
+        $root = $this->normalize($root);
+        if ($root === '') {
+            throw new Error("Case {$caseId} resolved to an empty folder path; refusing.");
+        }
+        return $root;
+    }
+
+    /**
+     * Normalize + reject traversal, return storage-relative path inside the case folder.
+     * If $requireExists, ensures the resolved path exists in storage.
+     */
+    private function resolveSafePath(string $caseId, string $relPath, bool $requireExists): string
+    {
+        $relPath = trim((string) $relPath);
+        if ($relPath === '') {
+            throw new BadRequest('Path is required.');
+        }
+        if (str_starts_with($relPath, '/') || str_starts_with($relPath, '\\')) {
+            throw new BadRequest('Absolute paths are not allowed.');
+        }
+
+        $caseRoot = $this->getCaseRoot($caseId);
+
+        // Allow the caller to either pass a path relative to the case root, OR a
+        // full storage-relative path that already includes the case root.
+        $normalizedRel = $this->normalize($relPath);
+        $candidate = str_starts_with($normalizedRel, $caseRoot . '/') || $normalizedRel === $caseRoot
+            ? $normalizedRel
+            : $this->normalize($caseRoot . '/' . $normalizedRel);
+
+        $this->assertWithinCaseRoot($caseId, $candidate);
+
+        if ($requireExists) {
+            $client = $this->getNds()->getClient();
+            if (!$client->exists($candidate)) {
+                throw new NotFound("Path not found: {$candidate}");
+            }
+        }
+
+        return $candidate;
+    }
+
+    private function assertWithinCaseRoot(string $caseId, string $absInStorage): void
+    {
+        $caseRoot = $this->getCaseRoot($caseId);
+        if ($absInStorage !== $caseRoot && !str_starts_with($absInStorage, $caseRoot . '/')) {
+            throw new Forbidden("Path '{$absInStorage}' is outside the case folder '{$caseRoot}'.");
+        }
+    }
+
+    /**
+     * Canonicalize a storage-relative path:
+     *   - convert '\' to '/'
+     *   - collapse repeated '/'
+     *   - resolve '.' segments
+     *   - reject '..' segments (refuses traversal)
+     *   - strip trailing '/'
+     */
+    private function normalize(string $path): string
+    {
+        $path = str_replace('\\', '/', $path);
+        $segments = explode('/', $path);
+        $out = [];
+        foreach ($segments as $seg) {
+            if ($seg === '' || $seg === '.') {
+                continue;
+            }
+            if ($seg === '..') {
+                throw new Forbidden('Parent-directory traversal is not allowed.');
+            }
+            // Block null bytes and other suspicious characters.
+            if (preg_match('/[\x00-\x1F]/', $seg)) {
+                throw new BadRequest('Path contains invalid control characters.');
+            }
+            $out[] = $seg;
+        }
+        return implode('/', $out);
+    }
+
+    /**
+     * Sanitize every segment of an already-normalized storage-relative path
+     * with the canonical file-name rules (rule N1). Empty segments are dropped.
+     */
+    private function sanitizeRelSegments(string $normalizedPath): string
+    {
+        if ($normalizedPath === '') {
+            return '';
+        }
+
+        $segments = array_map(
+            static fn (string $seg): string => LocalFilesystemClient::sanitizeFileName($seg),
+            explode('/', $normalizedPath)
+        );
+
+        $segments = array_filter($segments, static fn (string $seg): bool => $seg !== '');
+
+        return implode('/', $segments);
+    }
+
+    private function dirnameRel(string $path): string
+    {
+        $pos = strrpos($path, '/');
+        if ($pos === false) {
+            return '';
+        }
+        return substr($path, 0, $pos);
+    }
+
+    /**
+     * Update the Document entity (if any) that pointed to this file, so the
+     * CRM reflects the soft-delete state.
+     */
+    private function touchDocumentForDeletion(string $oldPath, string $newPath): void
+    {
+        try {
+            $doc = $this->entityManager->getRDBRepository('Document')
+                ->where(['networkStoragePath' => $oldPath])
+                ->findOne();
+            if (!$doc) {
+                return;
+            }
+            $doc->set([
+                'networkStoragePath' => $newPath,
+                'markedForDeletionAt' => date('Y-m-d H:i:s'),
+                'markedForDeletionById' => $this->user->getId(),
+            ]);
+            $this->entityManager->saveEntity($doc);
+        } catch (\Throwable $e) {
+            $this->log->warning(
+                "CaseFolderManager: could not update Document entity for '{$oldPath}': " . $e->getMessage()
+            );
+        }
+    }
+}

files/custom/Espo/Modules/SmartAssistant/Services/DocumentAnalyzer.php

@@ -41,11 +41,67 @@ class DocumentAnalyzer
 
     public function listDocumentsRecursive(string $caseId): array
     {
-        $casePath = $this->getCaseFolderPath($caseId);
-        if (!$casePath) return ['casePath' => null, 'totalFiles' => 0, 'folders' => [], 'rootFiles' => []];
+        $description = $this->describeCaseFolderPath($caseId);
+        $casePath = $description['path'];
+
+        if (!$casePath) {
+            return [
+                'casePath' => null,
+                'totalFiles' => 0,
+                'folders' => [],
+                'rootFiles' => [],
+                'resolvedPath' => null,
+                'pathSource' => $description['source'],
+                'folderExists' => false,
+                'reason' => $description['error'] ?? 'Case has no networkStorageFolderPath and no default could be computed.',
+            ];
+        }
 
         $client = $this->getStorageClient();
-        $topLevel = $client->listFolder($casePath);
+
+        try {
+            $folderExists = $client->exists($casePath);
+        } catch (\Exception $e) {
+            return [
+                'casePath' => $casePath,
+                'totalFiles' => 0,
+                'folders' => [],
+                'rootFiles' => [],
+                'resolvedPath' => $casePath,
+                'pathSource' => $description['source'],
+                'folderExists' => false,
+                'reason' => "Storage client failed while checking '{$casePath}': " . $e->getMessage(),
+            ];
+        }
+
+        if (!$folderExists) {
+            return [
+                'casePath' => $casePath,
+                'totalFiles' => 0,
+                'folders' => [],
+                'rootFiles' => [],
+                'resolvedPath' => $casePath,
+                'pathSource' => $description['source'],
+                'folderExists' => false,
+                'reason' => "Folder '{$casePath}' (source: {$description['source']}) does not exist on storage.",
+            ];
+        }
+
+        try {
+            $topLevel = $client->listFolder($casePath);
+        } catch (\Exception $e) {
+            return [
+                'casePath' => $casePath,
+                'totalFiles' => 0,
+                'folders' => [],
+                'rootFiles' => [],
+                'resolvedPath' => $casePath,
+                'pathSource' => $description['source'],
+                'folderExists' => true,
+                'reason' => "Failed to list folder '{$casePath}': " . $e->getMessage(),
+            ];
+        }
+
         $folders = []; $rootFiles = []; $totalFiles = 0;
 
         foreach ($topLevel as $item) {
@@ -70,7 +126,16 @@ class DocumentAnalyzer
             }
         }
 
-        return ['casePath' => $casePath, 'totalFiles' => $totalFiles, 'folders' => $folders, 'rootFiles' => $rootFiles];
+        return [
+            'casePath' => $casePath,
+            'totalFiles' => $totalFiles,
+            'folders' => $folders,
+            'rootFiles' => $rootFiles,
+            'resolvedPath' => $casePath,
+            'pathSource' => $description['source'],
+            'folderExists' => true,
+            'reason' => $totalFiles === 0 ? "Folder '{$casePath}' exists but is empty." : null,
+        ];
     }
 
     public function extractTextContent(string $filePath): ?string
@@ -115,6 +180,85 @@ class DocumentAnalyzer
         return $text;
     }
 
+    /**
+     * Fetch raw file bytes + metadata for OCR/vision fallback.
+     *
+     * @return array{success: bool, fileName: string, mimeType: string, sizeBytes: int, base64: ?string, error: ?string}
+     */
+    public function getDocumentBytes(string $filePath): array
+    {
+        $fileName = basename($filePath);
+        $client = $this->getStorageClient();
+
+        try {
+            $content = $client->downloadFile($filePath);
+        } catch (\Exception $e) {
+            return [
+                'success' => false,
+                'fileName' => $fileName,
+                'mimeType' => '',
+                'sizeBytes' => 0,
+                'base64' => null,
+                'error' => 'Failed to download: ' . $e->getMessage(),
+            ];
+        }
+
+        $sizeBytes = strlen($content);
+        if ($sizeBytes > self::MAX_FILE_SIZE) {
+            return [
+                'success' => false,
+                'fileName' => $fileName,
+                'mimeType' => '',
+                'sizeBytes' => $sizeBytes,
+                'base64' => null,
+                'error' => 'File too large (max 10MB).',
+            ];
+        }
+
+        $mimeType = $this->guessMimeType($fileName, $content);
+
+        return [
+            'success' => true,
+            'fileName' => $fileName,
+            'mimeType' => $mimeType,
+            'sizeBytes' => $sizeBytes,
+            'base64' => base64_encode($content),
+            'error' => null,
+        ];
+    }
+
+    private function guessMimeType(string $fileName, string $content): string
+    {
+        $ext = strtolower(pathinfo($fileName, PATHINFO_EXTENSION));
+        $map = [
+            'pdf' => 'application/pdf',
+            'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+            'doc' => 'application/msword',
+            'txt' => 'text/plain',
+            'csv' => 'text/csv',
+            'log' => 'text/plain',
+            'png' => 'image/png',
+            'jpg' => 'image/jpeg',
+            'jpeg' => 'image/jpeg',
+            'gif' => 'image/gif',
+            'bmp' => 'image/bmp',
+            'tiff' => 'image/tiff',
+            'tif' => 'image/tiff',
+            'webp' => 'image/webp',
+        ];
+        if (isset($map[$ext])) {
+            return $map[$ext];
+        }
+        // Fallback: finfo
+        if (function_exists('finfo_buffer')) {
+            $finfo = finfo_open(FILEINFO_MIME_TYPE);
+            $mime = finfo_buffer($finfo, $content);
+            finfo_close($finfo);
+            if ($mime) return $mime;
+        }
+        return 'application/octet-stream';
+    }
+
     public function extractMultipleDocuments(array $filePaths, int $maxPerFile = 50000): array
     {
         $results = [];
@@ -192,24 +336,160 @@ class DocumentAnalyzer
     }
 
     public function getCaseFolderPath(string $caseId): ?string
+    {
+        return $this->describeCaseFolderPath($caseId)['path'];
+    }
+
+    /**
+     * Resolve the case folder path with diagnostic metadata.
+     *
+     * @return array{path: ?string, source: string, error: ?string, caseExists: bool}
+     *   source: 'stored' | 'computed' | 'none'
+     */
+    public function describeCaseFolderPath(string $caseId): array
     {
         $case = $this->entityManager->getEntityById('Case', $caseId);
-        if (!$case) return null;
+        if (!$case) {
+            return ['path' => null, 'source' => 'none', 'error' => "Case '{$caseId}' not found.", 'caseExists' => false];
+        }
 
-        // Try stored path first
         $storedPath = $case->get('networkStorageFolderPath') ?: null;
-        if ($storedPath) return $storedPath;
+        if ($storedPath) {
+            return ['path' => $storedPath, 'source' => 'stored', 'error' => null, 'caseExists' => true];
+        }
 
-        // Fall back to computed path from NetworkDocumentService
         try {
             $nds = $this->getNetworkDocumentService();
-            return $nds->getEntityFolderPath('Case', $caseId);
+            $computed = $nds->getEntityFolderPath('Case', $caseId);
+            if ($computed) {
+                return ['path' => $computed, 'source' => 'computed', 'error' => null, 'caseExists' => true];
+            }
+            return ['path' => null, 'source' => 'none', 'error' => 'No stored path, and default path computation returned null.', 'caseExists' => true];
         } catch (\Exception $e) {
-            $this->log->warning("SmartAssistant: Failed to get case folder path: " . $e->getMessage());
-            return null;
+            $this->log->warning("SmartAssistant: Failed to compute case folder path: " . $e->getMessage());
+            return ['path' => null, 'source' => 'none', 'error' => $e->getMessage(), 'caseExists' => true];
         }
     }
 
+    /**
+     * List the immediate contents of an arbitrary folder path on network storage.
+     * Manual override for when auto-resolution of a case folder fails.
+     *
+     * @return array<int, array{name: string, path: string, type: string, size: ?int, mimeType: ?string, modified: ?string}>
+     */
+    public function browseFolder(string $path): array
+    {
+        $client = $this->getStorageClient();
+        $entries = [];
+        foreach ($client->listFolder($path) as $item) {
+            $isFolder = ($item['type'] ?? null) === 'folder' || !empty($item['isFolder']);
+            $entries[] = [
+                'name' => $item['name'] ?? '',
+                'path' => $item['path'] ?? '',
+                'type' => $isFolder ? 'folder' : 'file',
+                'size' => $item['size'] ?? null,
+                'mimeType' => $item['mimeType'] ?? null,
+                'modified' => $item['modified'] ?? null,
+            ];
+        }
+        return $entries;
+    }
+
+    /**
+     * Search the storage for folders matching a query (case-insensitive substring).
+     * Scans root and one level deep. Returns sorted matches.
+     *
+     * @return array<int, array{path: string, name: string, level: int, score: int}>
+     */
+    public function findCaseFolder(string $query, int $limit = 20): array
+    {
+        $normalized = trim($query);
+        if ($normalized === '') return [];
+
+        $client = $this->getStorageClient();
+        $needle = mb_strtolower($normalized);
+        $matches = [];
+
+        try {
+            $roots = $client->listFolder('');
+        } catch (\Exception $e) {
+            $this->log->warning("SmartAssistant: findCaseFolder root listing failed: " . $e->getMessage());
+            return [];
+        }
+
+        foreach ($roots as $item) {
+            $isFolder = ($item['type'] ?? null) === 'folder' || !empty($item['isFolder']);
+            if (!$isFolder) continue;
+
+            $name = (string) ($item['name'] ?? '');
+            $path = (string) ($item['path'] ?? $name);
+
+            $score = $this->fuzzyScore($name, $needle);
+            if ($score > 0) {
+                $matches[] = ['path' => $path, 'name' => $name, 'level' => 0, 'score' => $score];
+            }
+
+            // One level deeper, but only inspect folder names — don't list files to keep it cheap.
+            try {
+                foreach ($client->listFolder($path) as $sub) {
+                    $subIsFolder = ($sub['type'] ?? null) === 'folder' || !empty($sub['isFolder']);
+                    if (!$subIsFolder) continue;
+                    $subName = (string) ($sub['name'] ?? '');
+                    $subPath = (string) ($sub['path'] ?? ($path . '/' . $subName));
+                    $subScore = $this->fuzzyScore($subName, $needle);
+                    if ($subScore > 0) {
+                        $matches[] = ['path' => $subPath, 'name' => $subName, 'level' => 1, 'score' => $subScore];
+                    }
+                }
+            } catch (\Exception $e) {
+                // Non-fatal: skip unreadable subfolders silently.
+            }
+        }
+
+        usort($matches, fn($a, $b) => $b['score'] <=> $a['score']);
+        return array_slice($matches, 0, $limit);
+    }
+
+    /**
+     * Persist the resolved folder path on the Case so future calls skip discovery.
+     */
+    public function setCaseFolderPath(string $caseId, string $path): array
+    {
+        $case = $this->entityManager->getEntityById('Case', $caseId);
+        if (!$case) {
+            throw new Error("Case '{$caseId}' not found.");
+        }
+
+        $client = $this->getStorageClient();
+        if (!$client->exists($path)) {
+            throw new Error("Path '{$path}' does not exist on storage.");
+        }
+
+        $case->set('networkStorageFolderPath', $path);
+        $this->entityManager->saveEntity($case);
+
+        return ['success' => true, 'caseId' => $caseId, 'path' => $path];
+    }
+
+    private function fuzzyScore(string $haystack, string $needleLower): int
+    {
+        $hay = mb_strtolower($haystack);
+        if ($hay === $needleLower) return 100;
+        if (mb_strpos($hay, $needleLower) !== false) return 80;
+
+        // Token overlap (whitespace/dash/underscore).
+        $hayTokens = preg_split('/[\s\-_]+/u', $hay) ?: [];
+        $needleTokens = preg_split('/[\s\-_]+/u', $needleLower) ?: [];
+        $hits = 0;
+        foreach ($needleTokens as $nt) {
+            if ($nt === '') continue;
+            foreach ($hayTokens as $ht) {
+                if ($ht !== '' && mb_strpos($ht, $nt) !== false) { $hits++; break; }
+            }
+        }
+        return $hits > 0 ? 40 + $hits * 5 : 0;
+    }
+
     private function getMaxTextLength(): int
     {
         if ($this->maxTextLength !== null) {
@@ -253,20 +533,37 @@ class DocumentAnalyzer
 
     private function extractFromDocx(string $tmpFile): ?string
     {
-        if (!class_exists(\PhpOffice\PhpWord\IOFactory::class)) return null;
-        $phpWord = \PhpOffice\PhpWord\IOFactory::load($tmpFile);
-        $text = '';
-        foreach ($phpWord->getSections() as $section) {
-            foreach ($section->getElements() as $element) {
-                if (method_exists($element, 'getText')) $text .= $element->getText() . "\n";
-                elseif (method_exists($element, 'getElements')) {
-                    foreach ($element->getElements() as $child) {
-                        if (method_exists($child, 'getText')) $text .= $child->getText() . "\n";
-                    }
+        // PHPWord (vendor/phpoffice/phpword) ships with the EspoCRM image but
+        // is NOT in the composer PSR-4 autoload map — class_exists silently
+        // returns false. Rather than fix the autoloader (rebuild of the image)
+        // we parse word/document.xml directly. This is also more robust:
+        // PHPWord's element walker only goes one level deep, missing text in
+        // tables, hyperlinks, and footnotes.
+        $zip = new \ZipArchive();
+        if ($zip->open($tmpFile) !== true) {
+            $this->log->warning("SmartAssistant: extractFromDocx: not a valid zip: $tmpFile");
+            return null;
+        }
+        $xml = $zip->getFromName('word/document.xml');
+        $zip->close();
+        if ($xml === false || $xml === '') {
+            $this->log->warning("SmartAssistant: extractFromDocx: word/document.xml missing in $tmpFile");
+            return null;
+        }
+
+        // Each <w:p> is a paragraph; concatenate <w:t> runs inside it.
+        // `(?:\s[^>]*)?` keeps us from also matching <w:tab> / <w:tbl>.
+        $paragraphs = [];
+        if (preg_match_all('#<w:p(?:\s[^>]*)?>(.*?)</w:p>#s', $xml, $pMatches)) {
+            foreach ($pMatches[1] as $block) {
+                if (preg_match_all('#<w:t(?:\s[^>]*)?>(.*?)</w:t>#s', $block, $tMatches)) {
+                    $line = trim(implode('', $tMatches[1]));
+                    if ($line !== '') $paragraphs[] = html_entity_decode($line, ENT_XML1 | ENT_QUOTES, 'UTF-8');
                 }
             }
         }
-        return $text ?: null;
+        $text = trim(implode("\n", $paragraphs));
+        return $text !== '' ? $text : null;
     }
 
     private function updateDocumentEntity(string $oldPath, string $newPath): void

files/custom/Espo/Modules/SmartAssistant/Services/FreeDocumentGenerator.php

@@ -0,0 +1,311 @@
+<?php
+
+namespace Espo\Modules\SmartAssistant\Services;
+
+use Espo\Core\Exceptions\BadRequest;
+use Espo\Core\Exceptions\NotFound;
+use Espo\Core\InjectableFactory;
+use Espo\Core\Utils\Log;
+use Espo\ORM\EntityManager;
+use Espo\Entities\User;
+use Espo\Modules\NetworkStorageIntegration\Services\NetworkDocumentService;
+use Espo\Modules\NetworkStorageIntegration\Classes\LocalFilesystemClient;
+use PhpOffice\PhpWord\PhpWord;
+use PhpOffice\PhpWord\IOFactory;
+
+class FreeDocumentGenerator
+{
+    private const TEMP_DIR = 'data/tmp/';
+    private const FONT_NAME = 'David';
+    private const FONT_SIZE = 12;
+
+    public function __construct(
+        private EntityManager $entityManager,
+        private InjectableFactory $injectableFactory,
+        private Log $log,
+        private User $user
+    ) {}
+
+    /**
+     * @return array{success: bool, documentId: string, documentName: string, fileName: string, networkPath: ?string, message: string}
+     */
+    public function generate(
+        string $caseId,
+        string $title,
+        string $body,
+        string $documentType = 'letter',
+        ?string $recipient = null
+    ): array {
+        $title = trim($title);
+        if ($title === '') {
+            throw new BadRequest('title is required.');
+        }
+        if (trim($body) === '') {
+            throw new BadRequest('body is required.');
+        }
+
+        $case = $this->entityManager->getEntityById('Case', $caseId);
+        if (!$case) {
+            throw new NotFound("Case {$caseId} not found.");
+        }
+
+        $docxBinary = $this->buildDocx($title, $body, $recipient);
+
+        // Subject-only naming (rule N1): no date prefix. The canonical stored
+        // name (+ "-{NNN}" on collision) is produced by NetworkDocumentService
+        // on upload; we then align the Espo Document/Attachment to it so the
+        // CRM, the attachment and the file on disk never disagree.
+        $baseName = LocalFilesystemClient::sanitizeFileName($title);
+        if ($baseName === '') {
+            $baseName = 'document';
+        }
+        $fileName = $baseName . '.docx';
+        $documentName = $title;
+
+        $attachment = $this->entityManager->getNewEntity('Attachment');
+        $attachment->set([
+            'name' => $fileName,
+            'type' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+            'role' => 'Attachment',
+            'size' => strlen($docxBinary),
+            'relatedType' => 'Document',
+        ]);
+        $this->entityManager->saveEntity($attachment);
+        file_put_contents('data/upload/' . $attachment->getId(), $docxBinary);
+
+        $document = $this->entityManager->getNewEntity('Document');
+        $document->set([
+            'name' => $documentName,
+            'fileId' => $attachment->getId(),
+            'fileName' => $fileName,
+            'assignedUserId' => $this->user->getId(),
+        ]);
+        // Suppress the NSI upload hook: it fires on this save, before the Case
+        // link below exists, so it would file the document in the fallback
+        // folder. We upload explicitly (with the Case) right after.
+        $this->entityManager->saveEntity($document, ['skipNetworkUpload' => true]);
+
+        $this->entityManager->getRDBRepository('Case')
+            ->getRelation($case, 'documents')
+            ->relate($document);
+
+        $networkPath = null;
+        try {
+            $nds = $this->injectableFactory->create(NetworkDocumentService::class);
+            if ($nds->isEnabled()) {
+                $result = $nds->uploadDocument($document, $attachment, 'Case', $caseId);
+
+                if (!empty($result['success'])) {
+                    $networkPath = $result['path'] ?? null;
+                    $storedName = $result['fileName'] ?? $fileName;
+                    $storedBase = pathinfo($storedName, PATHINFO_FILENAME) ?: $documentName;
+
+                    // Align DB names to the canonical stored name.
+                    $document->set([
+                        'name' => $storedBase,
+                        'fileName' => $storedName,
+                        'storageType' => 'network',
+                        'networkStoragePath' => $networkPath,
+                        'networkStorageFileName' => $storedName,
+                        'networkStorageSize' => $result['size'] ?? strlen($docxBinary),
+                        'networkStorageModifiedAt' => date('Y-m-d H:i:s'),
+                    ]);
+                    $this->entityManager->saveEntity($document, [
+                        'skipNetworkUpload' => true,
+                        'silent' => true,
+                    ]);
+
+                    $attachment->set('name', $storedName);
+                    $this->entityManager->saveEntity($attachment, ['silent' => true]);
+
+                    // The file now lives in network storage; drop the local copy.
+                    $sourcePath = 'data/upload/' . $attachment->getSourceId();
+                    if (file_exists($sourcePath)) {
+                        @unlink($sourcePath);
+                    }
+
+                    $fileName = $storedName;
+                    $documentName = $storedBase;
+                }
+            }
+        } catch (\Throwable $e) {
+            // Document is safely persisted in Espo; the network-storage copy is best-effort.
+            $this->log->warning(
+                "FreeDocumentGenerator: failed to copy to network storage for Case {$caseId}: " .
+                $e->getMessage()
+            );
+        }
+
+        $this->log->info(
+            "FreeDocumentGenerator: Created '{$documentName}' (type={$documentType}) for Case {$caseId}"
+        );
+
+        $message = "✅ המסמך \"{$documentName}\" נוצר בהצלחה וצורף לתיק";
+        if ($networkPath) {
+            $message .= " ולתיקיית הרשת";
+        }
+        $message .= ".";
+
+        return [
+            'success' => true,
+            'documentId' => $document->getId(),
+            'documentName' => $documentName,
+            'fileName' => $fileName,
+            'networkPath' => $networkPath,
+            'message' => $message,
+        ];
+    }
+
+    private function buildDocx(string $title, string $body, ?string $recipient): string
+    {
+        $phpWord = new PhpWord();
+        $phpWord->setDefaultFontName(self::FONT_NAME);
+        $phpWord->setDefaultFontSize(self::FONT_SIZE);
+
+        $section = $phpWord->addSection([
+            'marginLeft' => 1440,
+            'marginRight' => 1440,
+            'marginTop' => 1440,
+            'marginBottom' => 1440,
+        ]);
+
+        $rtlPara = ['bidi' => true, 'alignment' => 'right'];
+        $centerPara = ['bidi' => true, 'alignment' => 'center'];
+        $titleFont = ['name' => self::FONT_NAME, 'size' => 16, 'bold' => true, 'rtl' => true];
+        $boldFont = ['name' => self::FONT_NAME, 'size' => self::FONT_SIZE, 'bold' => true, 'rtl' => true];
+        $normalFont = ['name' => self::FONT_NAME, 'size' => self::FONT_SIZE, 'rtl' => true];
+
+        $section->addText($this->formatHebrewDate(new \DateTime()), $normalFont, $rtlPara);
+        $section->addTextBreak(1);
+
+        if ($recipient !== null && trim($recipient) !== '') {
+            $section->addText('אל: ' . trim($recipient), $boldFont, $rtlPara);
+            $section->addTextBreak(1);
+        }
+
+        $section->addText($title, $titleFont, $centerPara);
+        $section->addTextBreak(1);
+
+        $this->renderMarkdown($section, $body);
+
+        if (!is_dir(self::TEMP_DIR)) {
+            mkdir(self::TEMP_DIR, 0775, true);
+        }
+        $tmpPath = self::TEMP_DIR . 'free_' . uniqid() . '.docx';
+        $writer = IOFactory::createWriter($phpWord, 'Word2007');
+        $writer->save($tmpPath);
+        $content = file_get_contents($tmpPath);
+        @unlink($tmpPath);
+
+        return $content;
+    }
+
+    private function renderMarkdown($section, string $body): void
+    {
+        $rtlPara = ['bidi' => true, 'alignment' => 'right'];
+        $bulletStyle = ['listType' => \PhpOffice\PhpWord\Style\ListItem::TYPE_BULLET_FILLED];
+        $bulletFont = ['name' => self::FONT_NAME, 'size' => self::FONT_SIZE, 'rtl' => true];
+        $h1Size = 16; $h2Size = 14; $h3Size = 13;
+
+        $body = str_replace(["\r\n", "\r"], "\n", $body);
+        $lines = explode("\n", $body);
+
+        $i = 0;
+        $n = count($lines);
+        while ($i < $n) {
+            $line = $lines[$i];
+            $trimmed = ltrim($line);
+
+            if (trim($line) === '') {
+                $section->addTextBreak(1);
+                $i++;
+                continue;
+            }
+
+            if (preg_match('/^(#{1,3})\s+(.+)$/u', $trimmed, $m)) {
+                $level = strlen($m[1]);
+                $size = match ($level) { 1 => $h1Size, 2 => $h2Size, default => $h3Size };
+                $section->addText(
+                    $m[2],
+                    ['name' => self::FONT_NAME, 'size' => $size, 'bold' => true, 'rtl' => true],
+                    $rtlPara
+                );
+                $i++;
+                continue;
+            }
+
+            if (preg_match('/^[\-\*]\s+(.+)$/u', $trimmed)) {
+                while ($i < $n && preg_match('/^[\-\*]\s+(.+)$/u', ltrim($lines[$i]), $m2)) {
+                    $plain = preg_replace('/(\*\*|\*)/u', '', $m2[1]);
+                    $section->addListItem($plain, 0, $bulletFont, $bulletStyle, $rtlPara);
+                    $i++;
+                }
+                continue;
+            }
+
+            $textRun = $section->addTextRun($rtlPara);
+            $this->addInlineRuns($textRun, $trimmed);
+            $i++;
+        }
+    }
+
+    /**
+     * Parse **bold** and *italic* into multiple PhpWord runs.
+     */
+    private function addInlineRuns($textRun, string $text): void
+    {
+        $base = ['name' => self::FONT_NAME, 'size' => self::FONT_SIZE, 'rtl' => true];
+        $i = 0;
+        $len = mb_strlen($text);
+        $buffer = '';
+
+        $flush = function () use (&$buffer, $textRun, $base) {
+            if ($buffer !== '') {
+                $textRun->addText($buffer, $base);
+                $buffer = '';
+            }
+        };
+
+        while ($i < $len) {
+            $two = mb_substr($text, $i, 2);
+            $one = mb_substr($text, $i, 1);
+
+            if ($two === '**') {
+                $end = mb_strpos($text, '**', $i + 2);
+                if ($end !== false) {
+                    $flush();
+                    $inner = mb_substr($text, $i + 2, $end - $i - 2);
+                    $textRun->addText($inner, array_merge($base, ['bold' => true]));
+                    $i = $end + 2;
+                    continue;
+                }
+            } elseif ($one === '*') {
+                $end = mb_strpos($text, '*', $i + 1);
+                if ($end !== false) {
+                    $flush();
+                    $inner = mb_substr($text, $i + 1, $end - $i - 1);
+                    $textRun->addText($inner, array_merge($base, ['italic' => true]));
+                    $i = $end + 1;
+                    continue;
+                }
+            }
+
+            $buffer .= $one;
+            $i++;
+        }
+        $flush();
+    }
+
+    private function formatHebrewDate(\DateTime $dt): string
+    {
+        $months = [
+            1 => 'ינואר', 2 => 'פברואר', 3 => 'מרץ', 4 => 'אפריל',
+            5 => 'מאי', 6 => 'יוני', 7 => 'יולי', 8 => 'אוגוסט',
+            9 => 'ספטמבר', 10 => 'אוקטובר', 11 => 'נובמבר', 12 => 'דצמבר',
+        ];
+        $day = (int) $dt->format('j');
+        $month = $months[(int) $dt->format('n')];
+        $year = $dt->format('Y');
+        return "{$day} ב{$month} {$year}";
+    }
+}

files/custom/Espo/Modules/SmartAssistant/Services/GenericTemplateGenerator.php

@@ -10,6 +10,7 @@ use Espo\ORM\EntityManager;
 use Espo\Entities\User;
 use Espo\Modules\NetworkStorageIntegration\Services\DocumentTemplateService;
 use Espo\Modules\NetworkStorageIntegration\Services\NetworkDocumentService;
+use Espo\Modules\NetworkStorageIntegration\Classes\LocalFilesystemClient;
 use PhpOffice\PhpWord\TemplateProcessor;
 
 class GenericTemplateGenerator
@@ -72,14 +73,23 @@ class GenericTemplateGenerator
             @unlink($outputPath);
             @unlink($localTemplatePath);
 
-            // Step 6: Build document name
-            $contactName = $this->getContactName($case);
-            $docName = $documentSubject ?? "{$templateName} — {$contactName}";
+            // Step 6: Build subject-only document name (rule N1) — no contact,
+            // no em-dash. Defaults to the template name when no subject given.
+            $subject = trim((string) ($documentSubject ?? ''));
+            if ($subject === '') {
+                $subject = (string) $templateName;
+            }
+            $docName = $subject;
+            $baseName = LocalFilesystemClient::sanitizeFileName($subject);
+            if ($baseName === '') {
+                $baseName = 'document';
+            }
+            $fileName = $baseName . '.docx';
 
             // Step 7: Create Attachment + Document
             $attachment = $this->entityManager->getNewEntity('Attachment');
             $attachment->set([
-                'name' => $docName . '.docx',
+                'name' => $fileName,
                 'type' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
                 'role' => 'Attachment',
                 'size' => strlen($content),
@@ -92,16 +102,61 @@ class GenericTemplateGenerator
             $document->set([
                 'name' => $docName,
                 'fileId' => $attachment->getId(),
-                'fileName' => $docName . '.docx',
+                'fileName' => $fileName,
                 'assignedUserId' => $this->user->getId(),
             ]);
-            $this->entityManager->saveEntity($document);
+            // Suppress the NSI upload hook (fires before the Case link below);
+            // we upload explicitly with the Case so it lands in the case folder.
+            $this->entityManager->saveEntity($document, ['skipNetworkUpload' => true]);
 
             // Link to Case
             $this->entityManager->getRDBRepository('Case')
                 ->getRelation($case, 'documents')
                 ->relate($document);
 
+            // Upload to the case folder; align DB names to the canonical stored name.
+            try {
+                $nds = $this->injectableFactory->create(NetworkDocumentService::class);
+                if ($nds->isEnabled()) {
+                    $result = $nds->uploadDocument($document, $attachment, 'Case', $caseId);
+
+                    if (!empty($result['success'])) {
+                        $storedName = $result['fileName'] ?? $fileName;
+                        $storedBase = pathinfo($storedName, PATHINFO_FILENAME) ?: $docName;
+
+                        $document->set([
+                            'name' => $storedBase,
+                            'fileName' => $storedName,
+                            'storageType' => 'network',
+                            'networkStoragePath' => $result['path'] ?? null,
+                            'networkStorageFileName' => $storedName,
+                            'networkStorageSize' => $result['size'] ?? strlen($content),
+                            'networkStorageModifiedAt' => date('Y-m-d H:i:s'),
+                        ]);
+                        $this->entityManager->saveEntity($document, [
+                            'skipNetworkUpload' => true,
+                            'silent' => true,
+                        ]);
+
+                        $attachment->set('name', $storedName);
+                        $this->entityManager->saveEntity($attachment, ['silent' => true]);
+
+                        $sourcePath = 'data/upload/' . $attachment->getSourceId();
+                        if (file_exists($sourcePath)) {
+                            @unlink($sourcePath);
+                        }
+
+                        $docName = $storedBase;
+                    }
+                }
+            } catch (\Throwable $e) {
+                // Document is safely persisted in Espo; the network copy is best-effort.
+                $this->log->warning(
+                    "GenericTemplateGenerator: failed to copy to network storage for Case {$caseId}: " .
+                    $e->getMessage()
+                );
+            }
+
             $this->log->info("GenericTemplateGenerator: Created '{$docName}' from template '{$templateName}' for Case {$caseId}");
 
             return [
@@ -190,24 +245,4 @@ class GenericTemplateGenerator
 
         $processor->saveAs($outputPath);
     }
-
-    private function getContactName($case): string
-    {
-        $contactId = $case->get('contactId');
-        if (!$contactId) {
-            $ids = $case->getLinkMultipleIdList('contacts');
-            if (!empty($ids)) {
-                $contactId = $ids[0];
-            }
-        }
-
-        if ($contactId) {
-            $contact = $this->entityManager->getEntityById('Contact', $contactId);
-            if ($contact) {
-                return trim($contact->get('firstName') . ' ' . $contact->get('lastName'));
-            }
-        }
-
-        return $case->get('name') ?? '';
-    }
 }

files/custom/Espo/Modules/SmartAssistant/Services/OfficeContextBuilder.php

@@ -58,10 +58,18 @@ class OfficeContextBuilder
             $contacts[] = ['name' => $c->get('name'), 'phone' => $c->get('phoneNumber'), 'email' => $c->get('emailAddress')];
         }
 
+        $parentConditions = [
+            ['parentType' => 'Case', 'parentId' => $caseId],
+        ];
+        $contactIds = $this->getCaseContactIds($case);
+        if (!empty($contactIds)) {
+            $parentConditions[] = ['parentType' => 'Contact', 'parentId' => $contactIds];
+        }
+
         $tasks = [];
         foreach ($this->entityManager->getRDBRepository('Task')
             ->select(['id', 'name', 'status', 'dateEnd', 'assignedUserName'])
-            ->where(['parentId' => $caseId, 'parentType' => 'Case', 'status!=' => ['Completed', 'Canceled'], 'deleted' => false])
+            ->where(['OR' => $parentConditions, 'status!=' => ['Completed', 'Canceled'], 'deleted' => false])
             ->order('dateEnd', 'ASC')->limit(0, 20)->find() as $t) {
             $tasks[] = ['name' => $t->get('name'), 'status' => $t->get('status'), 'dateEnd' => $t->get('dateEnd'), 'assignedUser' => $t->get('assignedUserName')];
         }
@@ -76,4 +84,27 @@ class OfficeContextBuilder
 
         return ['case' => $caseData, 'contacts' => $contacts, 'openTasks' => $tasks, 'recentNotes' => $notes];
     }
+
+    private function getCaseContactIds(\Espo\ORM\Entity $case): array
+    {
+        $contactIds = [];
+        $primaryContactId = $case->get('contactId');
+        if ($primaryContactId) {
+            $contactIds[] = $primaryContactId;
+        }
+
+        $contacts = $this->entityManager->getRDBRepository('Case')
+            ->getRelation($case, 'contacts')
+            ->select(['id'])
+            ->find();
+
+        foreach ($contacts as $contact) {
+            $id = $contact->get('id');
+            if (!in_array($id, $contactIds)) {
+                $contactIds[] = $id;
+            }
+        }
+
+        return $contactIds;
+    }
 }

files/custom/Espo/Modules/SmartAssistant/Services/SmartAssistantService.php

@@ -85,6 +85,18 @@ class SmartAssistantService
         $ruleProvider = $this->injectableFactory->create(AssistantRuleContextProvider::class);
         $context['assistantRules'] = $ruleProvider->getRulesForMode($mode === 'case' ? 'case' : 'office');
 
+        // Load editable prompt sections (DB overrides for the Python defaults).
+        $promptProvider = $this->injectableFactory->create(AssistantPromptContextProvider::class);
+        $context['assistantPrompts'] = $promptProvider->getPromptsForMode($mode === 'case' ? 'case' : 'office');
+
+        // Load per-user profile (replaces /opt/data/profiles/{uid}.md).
+        $profileProvider = $this->injectableFactory->create(UserProfileContextProvider::class);
+        $context['userProfile'] = $profileProvider->getProfileForUser($userId);
+
+        // Load active skills (metadata only; full body fetched via REST when needed).
+        $skillProvider = $this->injectableFactory->create(AssistantSkillContextProvider::class);
+        $context['availableSkills'] = $skillProvider->listSkills();
+
         // Generate conversation ID
         if (!$conversationId) {
             $prefix = $mode === 'case' ? 'conv_' : 'oconv_';
@@ -518,7 +530,7 @@ class SmartAssistantService
             CURLOPT_POSTFIELDS => $payload,
             CURLOPT_RETURNTRANSFER => true,
             CURLOPT_HTTPHEADER => $headers,
-            CURLOPT_TIMEOUT => 180,
+            CURLOPT_TIMEOUT => 600,
             CURLOPT_CONNECTTIMEOUT => 10,
         ]);
 

files/custom/Espo/Modules/SmartAssistant/Services/UserProfileContextProvider.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace Espo\Modules\SmartAssistant\Services;
+
+use Espo\ORM\EntityManager;
+use Espo\Core\Utils\Log;
+
+/**
+ * Loads the active UserProfile row for a given user into Shira's context.
+ *
+ * Returns the markdown body that becomes the "=== ABOUT THIS USER ===" block
+ * in the system prompt. Returns "" when no profile exists; the Python prompt
+ * builder treats empty string as "skip this section".
+ */
+class UserProfileContextProvider
+{
+    private EntityManager $entityManager;
+    private Log $log;
+
+    public function __construct(EntityManager $entityManager, Log $log)
+    {
+        $this->entityManager = $entityManager;
+        $this->log = $log;
+    }
+
+    public function getProfileForUser(string $userId): string
+    {
+        if (!$userId) {
+            return '';
+        }
+
+        $entity = $this->entityManager->getRDBRepository('UserProfile')
+            ->where([
+                'userId' => $userId,
+                'isActive' => true,
+                'deleted' => false,
+            ])
+            ->findOne();
+
+        if (!$entity) {
+            return '';
+        }
+
+        return (string) ($entity->get('content') ?? '');
+    }
+}

manifest.json

@@ -3,11 +3,11 @@
     "module": "SmartAssistant",
     "description": "Unified AI Assistant for Legal CRM — floating chat with case memory, office alerts, and AI Gateway integration",
     "author": "klear",
-    "version": "2.7.1",
+    "version": "2.10.5",
     "acceptableVersions": [
         ">=8.0.0"
     ],
-    "releaseDate": "2026-04-09",
+    "releaseDate": "2026-06-03",
     "php": [
         ">=8.1"
     ]

scripts/AfterInstall.php

@@ -0,0 +1,77 @@
+<?php
+/**
+ * AfterInstall script for SmartAssistant extension 2.10.x.
+ *
+ * Idempotently seeds the AssistantPrompt entity with 7 default prompt
+ * sections (tool_rules, writing_style, legal_assistance, personality_case,
+ * personality_office, other_rules_case, other_rules_office). If a row with
+ * the same `key` already exists it is left alone — admin edits win.
+ *
+ * Class must be named `AfterInstall` with NO namespace — that's what the
+ * EspoCRM extension installer looks for in scripts/AfterInstall.php.
+ * See application/Espo/Core/Upgrades/ExtensionManager.php scriptNames map.
+ */
+
+use Espo\Core\Container;
+
+class AfterInstall
+{
+    public function run(Container $container, $params = null): void
+    {
+        $entityManager = $container->get('entityManager');
+        $log = $container->get('log');
+
+        // The JSON file lives inside the installed module resources at runtime.
+        $resourceFile = 'custom/Espo/Modules/SmartAssistant/Resources/data/default-prompts.json';
+
+        if (!is_file($resourceFile)) {
+            $log->warning("[SmartAssistant] AfterInstall: $resourceFile not found, skipping seed");
+            return;
+        }
+
+        $json = file_get_contents($resourceFile);
+        $defaults = json_decode($json, true);
+
+        if (!is_array($defaults)) {
+            $log->warning("[SmartAssistant] AfterInstall: invalid JSON in $resourceFile");
+            return;
+        }
+
+        $created = 0;
+        $skipped = 0;
+
+        foreach ($defaults as $row) {
+            $key = $row['key'] ?? null;
+            if (!$key) {
+                continue;
+            }
+
+            $existing = $entityManager->getRDBRepository('AssistantPrompt')
+                ->where(['key' => $key, 'deleted' => false])
+                ->findOne();
+
+            if ($existing) {
+                $skipped++;
+                continue;
+            }
+
+            $entity = $entityManager->getNewEntity('AssistantPrompt');
+            $entity->set([
+                'key' => $key,
+                'name' => $row['name'] ?? $key,
+                'description' => $row['description'] ?? null,
+                'mode' => $row['mode'] ?? 'both',
+                'displayOrder' => $row['displayOrder'] ?? 100,
+                'content' => $row['content'] ?? '',
+                'isActive' => true,
+            ]);
+            // skipAll bypasses beforeSave hooks that require a logged-in user
+            // service (installer runs without an HTTP session) and ACL checks
+            // (we're seeding firm-wide defaults; no user is implicated).
+            $entityManager->saveEntity($entity, ['skipAll' => true]);
+            $created++;
+        }
+
+        $log->info("[SmartAssistant] AfterInstall: seeded $created AssistantPrompt rows, $skipped already existed");
+    }
+}