fix: subject-only report naming (tight hyphen) and correct case-folder upload

The direct-access report now follows rule N1 canonical naming:
- The document name uses a tight ASCII hyphen ("דוח גישה ישירה-{contact}") instead of
  an em-dash, and is sanitized via NetworkStorageIntegration's shared sanitizer.
- The report is now uploaded explicitly to the case folder after the Case link is set
  (the AfterSave hook fired before the link existed, so reports previously landed in the
  generic fallback folder). The Document and Attachment names are realigned to the
  canonical stored name.

Adds build.sh (was missing) so the package can be built locally if needed.

Refs Task Master #1

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

.env.example

@@ -0,0 +1,12 @@
+# API Keys (Required to enable respective provider)
+ANTHROPIC_API_KEY="your_anthropic_api_key_here"       # Required: Format: sk-ant-api03-...
+PERPLEXITY_API_KEY="your_perplexity_api_key_here"     # Optional: Format: pplx-...
+OPENAI_API_KEY="your_openai_api_key_here"             # Optional, for OpenAI models. Format: sk-proj-...
+GOOGLE_API_KEY="your_google_api_key_here"             # Optional, for Google Gemini models.
+MISTRAL_API_KEY="your_mistral_key_here"               # Optional, for Mistral AI models.
+XAI_API_KEY="YOUR_XAI_KEY_HERE"                       # Optional, for xAI AI models.
+GROQ_API_KEY="YOUR_GROQ_KEY_HERE"                     # Optional, for Groq models.
+OPENROUTER_API_KEY="YOUR_OPENROUTER_KEY_HERE"         # Optional, for OpenRouter models.
+AZURE_OPENAI_API_KEY="your_azure_key_here"            # Optional, for Azure OpenAI models (requires endpoint in .taskmaster/config.json).
+OLLAMA_API_KEY="your_ollama_api_key_here"             # Optional: For remote Ollama servers that require authentication.
+GITHUB_API_KEY="your_github_api_key_here"             # Optional: For GitHub import/export features. Format: ghp_... or github_pat_...

.gitignore

@@ -1,3 +1,29 @@
 *.bak
 *.tmp
 /legal-docx-v3-fixed/
+
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+dev-debug.log
+# Dependency directories
+node_modules/
+# Environment variables
+.env
+# Editor directories and files
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
+# OS specific
+.DS_Store
+
+# Task files
+# tasks.json
+# tasks/ 

.taskmaster/config.json

@@ -0,0 +1,44 @@
+{
+  "models": {
+    "main": {
+      "provider": "claude-code",
+      "modelId": "opus",
+      "maxTokens": 32000,
+      "temperature": 0.2
+    },
+    "research": {
+      "provider": "claude-code",
+      "modelId": "opus",
+      "maxTokens": 32000,
+      "temperature": 0.1
+    },
+    "fallback": {
+      "provider": "claude-code",
+      "modelId": "sonnet",
+      "maxTokens": 64000,
+      "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": "Hebrew",
+    "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-06-03T07:25:36.666Z",
+  "branchTagMapping": {},
+  "migrationNoticeShown": true
+}

.taskmaster/tasks/tasks.json

@@ -0,0 +1,27 @@
+{
+  "master": {
+    "tasks": [
+      {
+        "id": "1",
+        "title": "fix: subject-only direct-access report naming (tight hyphen) + case-folder upload",
+        "description": "Report file uses subject-only canonical naming and is uploaded to the case folder correctly.",
+        "details": "DirectAccessReportGenerator: em-dash -> tight hyphen; sanitize via LocalFilesystemClient::sanitizeFileName; save Document with skipNetworkUpload, relate to Case, explicit uploadDocument + DB realign to canonical stored name.",
+        "testStrategy": "",
+        "status": "in-progress",
+        "dependencies": [],
+        "priority": "high",
+        "subtasks": [],
+        "updatedAt": "2026-06-03T07:30:42.898Z"
+      }
+    ],
+    "metadata": {
+      "version": "1.0.0",
+      "lastModified": "2026-06-03T07:30:42.899Z",
+      "taskCount": 1,
+      "completedCount": 0,
+      "tags": [
+        "master"
+      ]
+    }
+  }
+}

.taskmaster/templates/example_prd.txt

@@ -0,0 +1,47 @@
+<context>
+# Overview  
+[Provide a high-level overview of your product here. Explain what problem it solves, who it's for, and why it's valuable.]
+
+# Core Features  
+[List and describe the main features of your product. For each feature, include:
+- What it does
+- Why it's important
+- How it works at a high level]
+
+# User Experience  
+[Describe the user journey and experience. Include:
+- User personas
+- Key user flows
+- UI/UX considerations]
+</context>
+<PRD>
+# Technical Architecture  
+[Outline the technical implementation details:
+- System components
+- Data models
+- APIs and integrations
+- Infrastructure requirements]
+
+# Development Roadmap  
+[Break down the development process into phases:
+- MVP requirements
+- Future enhancements
+- Do not think about timelines whatsoever -- all that matters is scope and detailing exactly what needs to be build in each phase so it can later be cut up into tasks]
+
+# Logical Dependency Chain
+[Define the logical order of development:
+- Which features need to be built first (foundation)
+- Getting as quickly as possible to something usable/visible front end that works
+- Properly pacing and scoping each feature so it is atomic but can also be built upon and improved as development approaches]
+
+# Risks and Mitigations  
+[Identify potential risks and how they'll be addressed:
+- Technical challenges
+- Figuring out the MVP that we can build upon
+- Resource constraints]
+
+# Appendix  
+[Include any additional information:
+- Research findings
+- Technical specifications]
+</PRD>

.taskmaster/templates/example_prd_rpg.txt

@@ -0,0 +1,511 @@
+<rpg-method>
+# Repository Planning Graph (RPG) Method - PRD Template
+
+This template teaches you (AI or human) how to create structured, dependency-aware PRDs using the RPG methodology from Microsoft Research. The key insight: separate WHAT (functional) from HOW (structural), then connect them with explicit dependencies.
+
+## Core Principles
+
+1. **Dual-Semantics**: Think functional (capabilities) AND structural (code organization) separately, then map them
+2. **Explicit Dependencies**: Never assume - always state what depends on what
+3. **Topological Order**: Build foundation first, then layers on top
+4. **Progressive Refinement**: Start broad, refine iteratively
+
+## How to Use This Template
+
+- Follow the instructions in each `<instruction>` block
+- Look at `<example>` blocks to see good vs bad patterns
+- Fill in the content sections with your project details
+- The AI reading this will learn the RPG method by following along
+- Task Master will parse the resulting PRD into dependency-aware tasks
+
+## Recommended Tools for Creating PRDs
+
+When using this template to **create** a PRD (not parse it), use **code-context-aware AI assistants** for best results:
+
+**Why?** The AI needs to understand your existing codebase to make good architectural decisions about modules, dependencies, and integration points.
+
+**Recommended tools:**
+- **Claude Code** (claude-code CLI) - Best for structured reasoning and large contexts
+- **Cursor/Windsurf** - IDE integration with full codebase context
+- **Gemini CLI** (gemini-cli) - Massive context window for large codebases
+- **Codex/Grok CLI** - Strong code generation with context awareness
+
+**Note:** Once your PRD is created, `task-master parse-prd` works with any configured AI model - it just needs to read the PRD text itself, not your codebase.
+</rpg-method>
+
+---
+
+<overview>
+<instruction>
+Start with the problem, not the solution. Be specific about:
+- What pain point exists?
+- Who experiences it?
+- Why existing solutions don't work?
+- What success looks like (measurable outcomes)?
+
+Keep this section focused - don't jump into implementation details yet.
+</instruction>
+
+## Problem Statement
+[Describe the core problem. Be concrete about user pain points.]
+
+## Target Users
+[Define personas, their workflows, and what they're trying to achieve.]
+
+## Success Metrics
+[Quantifiable outcomes. Examples: "80% task completion via autopilot", "< 5% manual intervention rate"]
+
+</overview>
+
+---
+
+<functional-decomposition>
+<instruction>
+Now think about CAPABILITIES (what the system DOES), not code structure yet.
+
+Step 1: Identify high-level capability domains
+- Think: "What major things does this system do?"
+- Examples: Data Management, Core Processing, Presentation Layer
+
+Step 2: For each capability, enumerate specific features
+- Use explore-exploit strategy:
+  * Exploit: What features are REQUIRED for core value?
+  * Explore: What features make this domain COMPLETE?
+
+Step 3: For each feature, define:
+- Description: What it does in one sentence
+- Inputs: What data/context it needs
+- Outputs: What it produces/returns
+- Behavior: Key logic or transformations
+
+<example type="good">
+Capability: Data Validation
+  Feature: Schema validation
+    - Description: Validate JSON payloads against defined schemas
+    - Inputs: JSON object, schema definition
+    - Outputs: Validation result (pass/fail) + error details
+    - Behavior: Iterate fields, check types, enforce constraints
+
+  Feature: Business rule validation
+    - Description: Apply domain-specific validation rules
+    - Inputs: Validated data object, rule set
+    - Outputs: Boolean + list of violated rules
+    - Behavior: Execute rules sequentially, short-circuit on failure
+</example>
+
+<example type="bad">
+Capability: validation.js
+  (Problem: This is a FILE, not a CAPABILITY. Mixing structure into functional thinking.)
+
+Capability: Validation
+  Feature: Make sure data is good
+  (Problem: Too vague. No inputs/outputs. Not actionable.)
+</example>
+</instruction>
+
+## Capability Tree
+
+### Capability: [Name]
+[Brief description of what this capability domain covers]
+
+#### Feature: [Name]
+- **Description**: [One sentence]
+- **Inputs**: [What it needs]
+- **Outputs**: [What it produces]
+- **Behavior**: [Key logic]
+
+#### Feature: [Name]
+- **Description**:
+- **Inputs**:
+- **Outputs**:
+- **Behavior**:
+
+### Capability: [Name]
+...
+
+</functional-decomposition>
+
+---
+
+<structural-decomposition>
+<instruction>
+NOW think about code organization. Map capabilities to actual file/folder structure.
+
+Rules:
+1. Each capability maps to a module (folder or file)
+2. Features within a capability map to functions/classes
+3. Use clear module boundaries - each module has ONE responsibility
+4. Define what each module exports (public interface)
+
+The goal: Create a clear mapping between "what it does" (functional) and "where it lives" (structural).
+
+<example type="good">
+Capability: Data Validation
+  → Maps to: src/validation/
+    ├── schema-validator.js      (Schema validation feature)
+    ├── rule-validator.js         (Business rule validation feature)
+    └── index.js                  (Public exports)
+
+Exports:
+  - validateSchema(data, schema)
+  - validateRules(data, rules)
+</example>
+
+<example type="bad">
+Capability: Data Validation
+  → Maps to: src/utils.js
+  (Problem: "utils" is not a clear module boundary. Where do I find validation logic?)
+
+Capability: Data Validation
+  → Maps to: src/validation/everything.js
+  (Problem: One giant file. Features should map to separate files for maintainability.)
+</example>
+</instruction>
+
+## Repository Structure
+
+```
+project-root/
+├── src/
+│   ├── [module-name]/       # Maps to: [Capability Name]
+│   │   ├── [file].js        # Maps to: [Feature Name]
+│   │   └── index.js         # Public exports
+│   └── [module-name]/
+├── tests/
+└── docs/
+```
+
+## Module Definitions
+
+### Module: [Name]
+- **Maps to capability**: [Capability from functional decomposition]
+- **Responsibility**: [Single clear purpose]
+- **File structure**:
+  ```
+  module-name/
+  ├── feature1.js
+  ├── feature2.js
+  └── index.js
+  ```
+- **Exports**:
+  - `functionName()` - [what it does]
+  - `ClassName` - [what it does]
+
+</structural-decomposition>
+
+---
+
+<dependency-graph>
+<instruction>
+This is THE CRITICAL SECTION for Task Master parsing.
+
+Define explicit dependencies between modules. This creates the topological order for task execution.
+
+Rules:
+1. List modules in dependency order (foundation first)
+2. For each module, state what it depends on
+3. Foundation modules should have NO dependencies
+4. Every non-foundation module should depend on at least one other module
+5. Think: "What must EXIST before I can build this module?"
+
+<example type="good">
+Foundation Layer (no dependencies):
+  - error-handling: No dependencies
+  - config-manager: No dependencies
+  - base-types: No dependencies
+
+Data Layer:
+  - schema-validator: Depends on [base-types, error-handling]
+  - data-ingestion: Depends on [schema-validator, config-manager]
+
+Core Layer:
+  - algorithm-engine: Depends on [base-types, error-handling]
+  - pipeline-orchestrator: Depends on [algorithm-engine, data-ingestion]
+</example>
+
+<example type="bad">
+- validation: Depends on API
+- API: Depends on validation
+(Problem: Circular dependency. This will cause build/runtime issues.)
+
+- user-auth: Depends on everything
+(Problem: Too many dependencies. Should be more focused.)
+</example>
+</instruction>
+
+## Dependency Chain
+
+### Foundation Layer (Phase 0)
+No dependencies - these are built first.
+
+- **[Module Name]**: [What it provides]
+- **[Module Name]**: [What it provides]
+
+### [Layer Name] (Phase 1)
+- **[Module Name]**: Depends on [[module-from-phase-0], [module-from-phase-0]]
+- **[Module Name]**: Depends on [[module-from-phase-0]]
+
+### [Layer Name] (Phase 2)
+- **[Module Name]**: Depends on [[module-from-phase-1], [module-from-foundation]]
+
+[Continue building up layers...]
+
+</dependency-graph>
+
+---
+
+<implementation-roadmap>
+<instruction>
+Turn the dependency graph into concrete development phases.
+
+Each phase should:
+1. Have clear entry criteria (what must exist before starting)
+2. Contain tasks that can be parallelized (no inter-dependencies within phase)
+3. Have clear exit criteria (how do we know phase is complete?)
+4. Build toward something USABLE (not just infrastructure)
+
+Phase ordering follows topological sort of dependency graph.
+
+<example type="good">
+Phase 0: Foundation
+  Entry: Clean repository
+  Tasks:
+    - Implement error handling utilities
+    - Create base type definitions
+    - Setup configuration system
+  Exit: Other modules can import foundation without errors
+
+Phase 1: Data Layer
+  Entry: Phase 0 complete
+  Tasks:
+    - Implement schema validator (uses: base types, error handling)
+    - Build data ingestion pipeline (uses: validator, config)
+  Exit: End-to-end data flow from input to validated output
+</example>
+
+<example type="bad">
+Phase 1: Build Everything
+  Tasks:
+    - API
+    - Database
+    - UI
+    - Tests
+  (Problem: No clear focus. Too broad. Dependencies not considered.)
+</example>
+</instruction>
+
+## Development Phases
+
+### Phase 0: [Foundation Name]
+**Goal**: [What foundational capability this establishes]
+
+**Entry Criteria**: [What must be true before starting]
+
+**Tasks**:
+- [ ] [Task name] (depends on: [none or list])
+  - Acceptance criteria: [How we know it's done]
+  - Test strategy: [What tests prove it works]
+
+- [ ] [Task name] (depends on: [none or list])
+
+**Exit Criteria**: [Observable outcome that proves phase complete]
+
+**Delivers**: [What can users/developers do after this phase?]
+
+---
+
+### Phase 1: [Layer Name]
+**Goal**:
+
+**Entry Criteria**: Phase 0 complete
+
+**Tasks**:
+- [ ] [Task name] (depends on: [[tasks-from-phase-0]])
+- [ ] [Task name] (depends on: [[tasks-from-phase-0]])
+
+**Exit Criteria**:
+
+**Delivers**:
+
+---
+
+[Continue with more phases...]
+
+</implementation-roadmap>
+
+---
+
+<test-strategy>
+<instruction>
+Define how testing will be integrated throughout development (TDD approach).
+
+Specify:
+1. Test pyramid ratios (unit vs integration vs e2e)
+2. Coverage requirements
+3. Critical test scenarios
+4. Test generation guidelines for Surgical Test Generator
+
+This section guides the AI when generating tests during the RED phase of TDD.
+
+<example type="good">
+Critical Test Scenarios for Data Validation module:
+  - Happy path: Valid data passes all checks
+  - Edge cases: Empty strings, null values, boundary numbers
+  - Error cases: Invalid types, missing required fields
+  - Integration: Validator works with ingestion pipeline
+</example>
+</instruction>
+
+## Test Pyramid
+
+```
+        /\
+       /E2E\       ← [X]% (End-to-end, slow, comprehensive)
+      /------\
+     /Integration\ ← [Y]% (Module interactions)
+    /------------\
+   /  Unit Tests  \ ← [Z]% (Fast, isolated, deterministic)
+  /----------------\
+```
+
+## Coverage Requirements
+- Line coverage: [X]% minimum
+- Branch coverage: [X]% minimum
+- Function coverage: [X]% minimum
+- Statement coverage: [X]% minimum
+
+## Critical Test Scenarios
+
+### [Module/Feature Name]
+**Happy path**:
+- [Scenario description]
+- Expected: [What should happen]
+
+**Edge cases**:
+- [Scenario description]
+- Expected: [What should happen]
+
+**Error cases**:
+- [Scenario description]
+- Expected: [How system handles failure]
+
+**Integration points**:
+- [What interactions to test]
+- Expected: [End-to-end behavior]
+
+## Test Generation Guidelines
+[Specific instructions for Surgical Test Generator about what to focus on, what patterns to follow, project-specific test conventions]
+
+</test-strategy>
+
+---
+
+<architecture>
+<instruction>
+Describe technical architecture, data models, and key design decisions.
+
+Keep this section AFTER functional/structural decomposition - implementation details come after understanding structure.
+</instruction>
+
+## System Components
+[Major architectural pieces and their responsibilities]
+
+## Data Models
+[Core data structures, schemas, database design]
+
+## Technology Stack
+[Languages, frameworks, key libraries]
+
+**Decision: [Technology/Pattern]**
+- **Rationale**: [Why chosen]
+- **Trade-offs**: [What we're giving up]
+- **Alternatives considered**: [What else we looked at]
+
+</architecture>
+
+---
+
+<risks>
+<instruction>
+Identify risks that could derail development and how to mitigate them.
+
+Categories:
+- Technical risks (complexity, unknowns)
+- Dependency risks (blocking issues)
+- Scope risks (creep, underestimation)
+</instruction>
+
+## Technical Risks
+**Risk**: [Description]
+- **Impact**: [High/Medium/Low - effect on project]
+- **Likelihood**: [High/Medium/Low]
+- **Mitigation**: [How to address]
+- **Fallback**: [Plan B if mitigation fails]
+
+## Dependency Risks
+[External dependencies, blocking issues]
+
+## Scope Risks
+[Scope creep, underestimation, unclear requirements]
+
+</risks>
+
+---
+
+<appendix>
+## References
+[Papers, documentation, similar systems]
+
+## Glossary
+[Domain-specific terms]
+
+## Open Questions
+[Things to resolve during development]
+</appendix>
+
+---
+
+<task-master-integration>
+# How Task Master Uses This PRD
+
+When you run `task-master parse-prd <file>.txt`, the parser:
+
+1. **Extracts capabilities** → Main tasks
+   - Each `### Capability:` becomes a top-level task
+
+2. **Extracts features** → Subtasks
+   - Each `#### Feature:` becomes a subtask under its capability
+
+3. **Parses dependencies** → Task dependencies
+   - `Depends on: [X, Y]` sets task.dependencies = ["X", "Y"]
+
+4. **Orders by phases** → Task priorities
+   - Phase 0 tasks = highest priority
+   - Phase N tasks = lower priority, properly sequenced
+
+5. **Uses test strategy** → Test generation context
+   - Feeds test scenarios to Surgical Test Generator during implementation
+
+**Result**: A dependency-aware task graph that can be executed in topological order.
+
+## Why RPG Structure Matters
+
+Traditional flat PRDs lead to:
+- ❌ Unclear task dependencies
+- ❌ Arbitrary task ordering
+- ❌ Circular dependencies discovered late
+- ❌ Poorly scoped tasks
+
+RPG-structured PRDs provide:
+- ✅ Explicit dependency chains
+- ✅ Topological execution order
+- ✅ Clear module boundaries
+- ✅ Validated task graph before implementation
+
+## Tips for Best Results
+
+1. **Spend time on dependency graph** - This is the most valuable section for Task Master
+2. **Keep features atomic** - Each feature should be independently testable
+3. **Progressive refinement** - Start broad, use `task-master expand` to break down complex tasks
+4. **Use research mode** - `task-master parse-prd --research` leverages AI for better task generation
+</task-master-integration>

build.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+set -euo pipefail
+
+VERSION=$(python3 -c "import json; print(json.load(open('manifest.json'))['version'])")
+MODULE=$(python3 -c "import json; m=json.load(open('manifest.json')); print(m.get('module', m['name']))")
+ZIPNAME="${MODULE}-${VERSION}.zip"
+
+if [[ -f README.md ]]; then
+  sed -i "s/\*\*גרסה:\*\* [^ |]*/\*\*גרסה:\*\* ${VERSION}/" README.md
+fi
+
+echo "Building $ZIPNAME..."
+rm -f "$ZIPNAME"
+zip -r "$ZIPNAME" manifest.json files/ scripts/ \
+  -x "*.DS_Store" "*__MACOSX*" "*.zip" 2>/dev/null || \
+zip -r "$ZIPNAME" manifest.json files/ \
+  -x "*.DS_Store" "*__MACOSX*" "*.zip"
+
+echo "✓ Built: $ZIPNAME ($(du -h "$ZIPNAME" | cut -f1))"

files/custom/Espo/Modules/LegalAssistance/SmartAssistant/Tools/DirectAccessReportGenerator.php

@@ -14,6 +14,8 @@ use Espo\Core\InjectableFactory;
 use Espo\ORM\EntityManager;
 use Espo\Core\Utils\Log;
 use Espo\Entities\User;
+use Espo\Modules\NetworkStorageIntegration\Services\NetworkDocumentService;
+use Espo\Modules\NetworkStorageIntegration\Classes\LocalFilesystemClient;
 use PhpOffice\PhpWord\TemplateProcessor;
 
 class DirectAccessReportGenerator
@@ -87,9 +89,14 @@ class DirectAccessReportGenerator
         // Add checkbox mappings
         $this->addCheckboxData($data, $params);
 
-        // Find template and generate DOCX
+        // Find template and generate DOCX. Subject-only, tight hyphen (rule N1).
         $templatePath = $this->resolveTemplatePath();
-        $documentName = "דוח גישה ישירה — {$contactName}";
+        $documentName = "דוח גישה ישירה-{$contactName}";
+        $baseName = LocalFilesystemClient::sanitizeFileName($documentName);
+        if ($baseName === '') {
+            $baseName = 'דוח גישה ישירה';
+        }
+        $fileName = $baseName . '.docx';
         $outputPath = self::TEMP_DIR . uniqid('report_') . '.docx';
 
         if (!is_dir(self::TEMP_DIR)) {
@@ -110,7 +117,7 @@ class DirectAccessReportGenerator
         // Create Attachment
         $attachment = $this->entityManager->getNewEntity('Attachment');
         $attachment->set([
-            'name' => $documentName . '.docx',
+            'name' => $fileName,
             'type' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
             'role' => 'Attachment',
             'size' => strlen($content),
@@ -124,17 +131,62 @@ class DirectAccessReportGenerator
         $document->set([
             'name' => $documentName,
             'fileId' => $attachment->getId(),
-            'fileName' => $documentName . '.docx',
+            'fileName' => $fileName,
             'assignedUserId' => $userId,
             'type' => 'דוח',
         ]);
-        $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 Document to Case (via Case side of relationship)
         $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) ?: $documentName;
+
+                    $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);
+                    }
+
+                    $documentName = $storedBase;
+                }
+            }
+        } catch (\Throwable $e) {
+            // Document is safely persisted in Espo; the network copy is best-effort.
+            $this->log->warning(
+                "LegalAssistance: failed to copy report to network storage for Case {$caseId}: " .
+                $e->getMessage()
+            );
+        }
+
         $this->log->info("LegalAssistance: Report generated — Document {$document->getId()} attached to Case {$caseId}");
 
         return [
@@ -216,8 +268,8 @@ class DirectAccessReportGenerator
 
     private function addCheckboxData(array &$data, array $params): void
     {
-        $CHK = '☑';
+        $CHK = "☑\u{00A0}";
-        $UNCHK = '☐';
+        $UNCHK = "☐\u{00A0}";
 
         $urgency = $params['urgencyLevel'] ?? '';
         $data['chk_urgency_regular'] = ($urgency === 'רגיל') ? $CHK : $UNCHK;
@@ -374,6 +426,16 @@ class DirectAccessReportGenerator
         }
 
         $processor->saveAs($outputPath);
+
+        // Fix space preservation: PHPWord strips whitespace from <w:t> elements
+        // that lack xml:space="preserve", causing words to stick together in RTL docs.
+        $zip = new \ZipArchive();
+        if ($zip->open($outputPath) === true) {
+            $xml = $zip->getFromName('word/document.xml');
+            $xml = preg_replace('/<w:t(?=[ >\/])(?![^>]*xml:space)/', '<w:t xml:space="preserve"', $xml);
+            $zip->addFromString('word/document.xml', $xml);
+            $zip->close();
+        }
     }
 
     private function normalizeDate(?string $value): ?string
@@ -392,7 +454,7 @@ class DirectAccessReportGenerator
     {
         if (!$date) return '';
         if (preg_match('/^(\d{4})-(\d{2})-(\d{2})$/', $date, $m)) {
-            return "{$m[3]}/{$m[2]}/{$m[1]}";
+            return "{$m[3]}.{$m[2]}.{$m[1]}";
         }
         return $date;
     }

manifest.json

@@ -1,9 +1,9 @@
 {
     "name": "LegalAssistance",
-    "version": "2.0.5",
+    "version": "2.0.10",
     "acceptableVersions": [">=8.0.0"],
     "php": [">=8.1"],
-    "releaseDate": "2026-04-09",
+    "releaseDate": "2026-06-03",
     "author": "Marcus-Law",
     "description": "סיוע משפטי — יצירת דוח גישה ישירה (JSON ישירות ל-DOCX), אינטגרציה עם שירה",
     "scripts": {

scripts/AfterInstall.php

@@ -2,9 +2,11 @@
 /************************************************************************
  * LegalAssistance Extension — AfterInstall
  *
- * 1. Deploy plugin files to ai-gateway plugins/ directory
+ * 1. Create DocumentTemplate for the direct access report
- * 2. Create DocumentTemplate for the direct access report
+ * 2. Clear cache
- * 3. Clear cache
+ *
+ * Note: ai-gateway plugin deployment removed — legal tools are now
+ * built into shira-hermes (api/services/legal_tools.py) since Phase 3.
  ************************************************************************/
 
 use Espo\Core\Container;
@@ -28,13 +30,10 @@ class AfterInstall
         $config = $container->getByClass(Config::class);
         $this->ensureI18nDirectories($config, $log);
 
-        // 1. Deploy ai-gateway plugin files
+        // 1. Create DocumentTemplate
-        $this->deployPluginFiles($log);
-
-        // 2. Create DocumentTemplate
         $this->createDocumentTemplate($entityManager, $log);
 
-        // 3. Clear cache
+        // 2. Clear cache
         try {
             $dataManager = $container->getByClass(DataManager::class);
             $dataManager->clearCache();
@@ -67,52 +66,6 @@ class AfterInstall
         }
     }
 
-    private function deployPluginFiles(Log $log): void
-    {
-        // Source: extension's plugins/ directory (relative to EspoCRM root after install)
-        $sourceDir = 'custom/Espo/Modules/LegalAssistance/../../../../../../plugins/legal-assistance';
-
-        // Try common ai-gateway locations
-        $gatewayPaths = [
-            '/home/chaim/ai-gateway/plugins/legal-assistance',
-            '/opt/ai-gateway/plugins/legal-assistance',
-        ];
-
-        // Find actual source files within the extension package
-        $extPluginDir = __DIR__ . '/../plugins/legal-assistance';
-
-        if (!is_dir($extPluginDir)) {
-            $log->warning("LegalAssistance: Plugin source directory not found at {$extPluginDir}");
-            return;
-        }
-
-        foreach ($gatewayPaths as $targetDir) {
-            $parentDir = dirname($targetDir);
-            if (!is_dir($parentDir)) {
-                continue;
-            }
-
-            if (!is_dir($targetDir)) {
-                mkdir($targetDir, 0755, true);
-            }
-
-            $files = ['tools.json', 'prompts.json'];
-            foreach ($files as $file) {
-                $src = $extPluginDir . '/' . $file;
-                $dst = $targetDir . '/' . $file;
-                if (file_exists($src)) {
-                    copy($src, $dst);
-                    $log->info("LegalAssistance: Deployed {$file} to {$targetDir}");
-                }
-            }
-
-            $log->info("LegalAssistance: Plugin files deployed to {$targetDir}");
-            return;
-        }
-
-        $log->warning('LegalAssistance: Could not find ai-gateway plugins directory. Deploy manually.');
-    }
-
     private function createDocumentTemplate(EntityManager $entityManager, Log $log): void
     {
         // Check if template already exists

scripts/AfterUninstall.php

@@ -2,11 +2,13 @@
 /************************************************************************
  * LegalAssistance Extension — AfterUninstall
  *
- * 1. Remove plugin files from ai-gateway
+ * 1. Drop LegalAid and DirectAccessReport DB tables (with warning log)
- * 2. Drop LegalAid and DirectAccessReport DB tables (with warning log)
+ * 2. Remove LegalAssistance-specific columns from Case table
- * 3. Remove LegalAssistance-specific columns from Case table
+ * 3. Remove DocumentTemplate records created by this extension
- * 4. Remove DocumentTemplate records created by this extension
+ * 4. Clear cache
- * 5. Clear cache
+ *
+ * Note: ai-gateway plugin cleanup removed — legal tools are now
+ * built into shira-hermes since Phase 3.
  ************************************************************************/
 
 use Espo\Core\Container;
@@ -25,22 +27,19 @@ class AfterUninstall
 
         $log->info('LegalAssistance: Running AfterUninstall...');
 
-        // 1. Remove ai-gateway plugin files
+        // 1. Drop tables created by this extension
-        $this->removePluginFiles($log);
-
-        // 2. Drop tables created by this extension
         $this->dropTables($entityManager, $log);
 
-        // 3. Remove LegalAssistance-specific columns from Case
+        // 2. Remove LegalAssistance-specific columns from Case
         $this->cleanCaseColumns($entityManager, $log);
 
-        // 4. Remove DocumentTemplate records
+        // 3. Remove DocumentTemplate records
         $this->removeDocumentTemplates($entityManager, $log);
 
-        // 5. Remove custom i18n files
+        // 4. Remove custom i18n files
         $this->removeCustomI18n($log);
 
-        // 6. Clear cache
+        // 5. Clear cache
         try {
             $dataManager = $container->getByClass(DataManager::class);
             $dataManager->clearCache();
@@ -52,27 +51,6 @@ class AfterUninstall
         $log->info('LegalAssistance: AfterUninstall completed.');
     }
 
-    private function removePluginFiles(Log $log): void
-    {
-        $gatewayPaths = [
-            '/home/chaim/ai-gateway/plugins/legal-assistance',
-            '/opt/ai-gateway/plugins/legal-assistance',
-        ];
-
-        foreach ($gatewayPaths as $dir) {
-            if (is_dir($dir)) {
-                $files = glob($dir . '/*');
-                foreach ($files as $file) {
-                    if (is_file($file)) {
-                        unlink($file);
-                    }
-                }
-                rmdir($dir);
-                $log->info("LegalAssistance: Removed plugin files from {$dir}");
-            }
-        }
-    }
-
     private function dropTables(EntityManager $entityManager, Log $log): void
     {
         $pdo = $entityManager->getPDO();