From acc42d09ee45194e51f4f694d2cc235c244421ee Mon Sep 17 00:00:00 2001
From: Sebastian Krupinski <krupinski01@gmail.com>
Date: Thu, 23 Apr 2026 22:04:36 -0400
Subject: [PATCH] refactor: bunch of improvements

Signed-off-by: Sebastian Krupinski <krupinski01@gmail.com>
---
 lib/Providers/Mail/Service.php                |  74 ++++-
 lib/Service/Remote/RemoteMailService.php      |  43 ++-
 lib/Service/Remote/RemoteService.php          |   6 +-
 src/components/JmapAuthPanel.vue              | 212 ++++++++----
 ...pConfigPanel.vue => JmapProtocolPanel.vue} | 307 ++++++++----------
 src/integrations.ts                           |   9 +-
 src/models/JmapServiceObject.ts               |   8 +
 src/types/auxiliary.ts                        |   6 +
 8 files changed, 406 insertions(+), 259 deletions(-)
 rename src/components/{JmapConfigPanel.vue => JmapProtocolPanel.vue} (64%)

diff --git a/lib/Providers/Mail/Service.php b/lib/Providers/Mail/Service.php
index 39db91f..5d5a683 100644
--- a/lib/Providers/Mail/Service.php
+++ b/lib/Providers/Mail/Service.php
@@ -11,6 +11,7 @@ namespace KTXM\ProviderJmapc\Providers\Mail;
 
 use Generator;
 use KTXF\Mail\Collection\CollectionBaseInterface;
+use KTXF\Mail\Collection\CollectionRoles;
 use KTXF\Mail\Collection\CollectionMutableInterface;
 use KTXF\Mail\Object\Address;
 use KTXF\Mail\Object\AddressInterface;
@@ -24,6 +25,8 @@ use KTXF\Resource\Provider\ResourceServiceLocationInterface;
 use KTXF\Resource\Delta\Delta;
 use KTXF\Resource\Filter\Filter;
 use KTXF\Resource\Filter\IFilter;
+use KTXF\Resource\Identifier\CollectionIdentifier;
+use KTXF\Resource\Identifier\EntityIdentifier;
 use KTXF\Resource\Range\IRange;
 use KTXF\Resource\Range\Range;
 use KTXF\Resource\Range\RangeType;
@@ -95,6 +98,8 @@ class Service implements ServiceBaseInterface, ServiceMutableInterface, ServiceC
 		self::CAPABILITY_ENTITY_DELTA => true,
 		self::CAPABILITY_ENTITY_EXTANT => true,
 		self::CAPABILITY_ENTITY_FETCH => true,
+        //self::CAPABILITY_ENTITY_DELETE => true,
+        //self::CAPABILITY_ENTITY_MOVE => true,
 	];
 
     private readonly RemoteMailService $mailService;
@@ -535,12 +540,75 @@ class Service implements ServiceBaseInterface, ServiceMutableInterface, ServiceC
         return $entities;
     }
 
-    public function entityMove(string|int $target, array $sources): array
+    public function entityDelete(EntityIdentifier ...$identifiers): array
     {
+        // validate identifiers and construct ID list
+        $ids = [];
+        foreach ($identifiers as $identifier) {
+            if ($identifier->provider() !== $this->provider() || $identifier->service() !== (string)$this->identifier()) {
+                throw new \InvalidArgumentException('Entity identifier does not belong to this service: ' . (string)$identifier);
+            }
+            $ids[] = $identifier->entity();
+        }
+
         $this->initialize();
 
-        $result = $this->mailService->entityMove($target, $sources);
+        $deleteMode = strtolower(trim((string) ($this->getAuxiliary()['deleteMode'] ?? 'soft')));
+        if ($deleteMode === 'soft') {
+            $deleteDestination = $this->getAuxiliary()['deleteDestination'] ?? null;
+            if (is_string($deleteDestination) || is_int($deleteDestination)) {
+                $deleteDestination = trim((string) $deleteDestination);
+                if ($deleteDestination === '') {
+                    $deleteDestination = null;
+                }
+            } else {
+                $deleteDestination = null;
+            }
 
-        return $result;
+            if ($deleteDestination === null) {
+                $filter = $this->collectionListFilter();
+                $filter->condition(self::CAPABILITY_COLLECTION_FILTER_ROLE, CollectionRoles::Trash->value);
+
+                foreach ($this->collectionList(null, $filter) as $collection) {
+                    if (!$collection instanceof CollectionBaseInterface) {
+                        continue;
+                    }
+
+                    if ($collection->getProperties()->getRole() === CollectionRoles::Trash) {
+                        $deleteDestination = (string) $collection->identifier();
+                        break;
+                    }
+                }
+            }
+
+            if ($deleteDestination === null) {
+                throw new \RuntimeException('Soft delete is enabled but no trash collection could be resolved.');
+            }
+
+            return $this->mailService->entityMove($deleteDestination, ...$ids);
+        }
+
+        return $this->mailService->entityDelete(...$ids);
+    }
+
+    public function entityMove(CollectionIdentifier $target, EntityIdentifier ...$identifiers): array
+    {
+        // validate target belongs to this service
+        if ($target->provider() !== $this->provider() || $target->service() !== (string)$this->identifier()) {
+            throw new \InvalidArgumentException('Target collection does not belong to this service');
+        }
+
+        // validate identifiers and construct ID list
+        $ids = [];
+        foreach ($identifiers as $identifier) {
+            if ($identifier->provider() !== $this->provider() || $identifier->service() !== (string)$this->identifier()) {
+                throw new \InvalidArgumentException('Entity identifier does not belong to this service: ' . (string)$identifier);
+            }
+            $ids[] = $identifier->entity();
+        }
+
+        $this->initialize();
+
+        return $this->mailService->entityMove($target->collection(), ...$ids);
     }
 }
diff --git a/lib/Service/Remote/RemoteMailService.php b/lib/Service/Remote/RemoteMailService.php
index 51e396c..e2d30a1 100644
--- a/lib/Service/Remote/RemoteMailService.php
+++ b/lib/Service/Remote/RemoteMailService.php
@@ -725,24 +725,40 @@ class RemoteMailService {
 	}
 
 	/**
-	 * delete entity from remote storage
+	 * delete entities from remote storage
 	 *
 	 * @since Release 1.0.0
 	 */
-	public function entityDelete(string $id): ?string {
+	public function entityDelete(string ...$identifiers): array {
 		// construct set request
 		$r0 = new MailSet($this->dataAccount, null, $this->resourceNamespace, $this->resourceEntityLabel);
-		// construct object
-		$r0->delete($id);
+		foreach ($identifiers as $id) {
+			$r0->delete($id);
+		}
 		// transceive
 		$bundle = $this->dataStore->perform([$r0]);
 		// extract response
 		$response = $bundle->response(0);
-		// determine if command succeeded
-		if (array_search($id, $response->deleted()) !== false) {
-			return $response->stateNew();
+		// check for command error
+		if ($response instanceof ResponseException) {
+			if ($response->type() === 'unknownMethod') {
+				throw new JmapUnknownMethod($response->description(), 1);
+			} else {
+				throw new Exception($response->type() . ': ' . $response->description(), 1);
+			}
 		}
-		return null;
+
+		$results = [];
+		// check for success
+		foreach ($response->deleteSuccesses() as $id) {
+			$results[$id] = true;
+		}
+		// check for failure
+		foreach ($response->deleteFailures() as $id => $data) {
+			$results[$id] = $data['type'] ?? 'unknownError';
+		}
+
+		return $results;
 	}
 
 	/**
@@ -751,7 +767,7 @@ class RemoteMailService {
 	 * @since Release 1.0.0
 	 *
 	 */
-	public function entityCopy(string $target, array $sources): array {
+	public function entityCopy(string $target, string ...$identifiers): array {
 		return [];
 	}
 
@@ -759,15 +775,8 @@ class RemoteMailService {
 	 * move entity in remote storage
 	 *
 	 * @since Release 1.0.0
-	 *
 	 */
-	public function entityMove(string $target, array $sources): array {
-
-		// extract identifiers from sources
-		$identifiers = [];
-		foreach ($sources as $source) {
-			$identifiers = array_merge($identifiers, $source);
-		}
+	public function entityMove(string $target, string ...$identifiers): array {
 		// construct request
 		$r0 = new MailSet($this->dataAccount, null, $this->resourceNamespace, $this->resourceEntityLabel);
 		foreach ($identifiers as $id) {
diff --git a/lib/Service/Remote/RemoteService.php b/lib/Service/Remote/RemoteService.php
index 48d1360..f762e8a 100644
--- a/lib/Service/Remote/RemoteService.php
+++ b/lib/Service/Remote/RemoteService.php
@@ -69,10 +69,10 @@ class RemoteService {
 		}
 		// debugging
 		if ($service->getDebug()) {
+			$logDir = Server::getInstance()?->logDir();
+			$logDir .= '/jmap/' . $service->identifier() . '.json';
 			$client->configureTransportLogState(true);
-			$client->configureTransportLogLocation(
-				sys_get_temp_dir() . '/' . $location->getHost() . '-' . $identity->getIdentity() . '.log'
-			);
+			$client->configureTransportLogLocation($logDir);
 		}
 		// return
 		return $client;
diff --git a/src/components/JmapAuthPanel.vue b/src/components/JmapAuthPanel.vue
index e15546d..742c898 100644
--- a/src/components/JmapAuthPanel.vue
+++ b/src/components/JmapAuthPanel.vue
@@ -1,33 +1,31 @@
 <script setup lang="ts">
-import { ref, computed, watch } from 'vue'
+import { computed, ref, watch } from 'vue'
+import {
+  IdentityBasic,
+  IdentityOAuth,
+  IdentityToken,
+} from '@KTXM/MailManager/models/identity'
+import type { ServiceObject } from '@KTXM/MailManager/models/service'
 import type { ServiceIdentity } from '@KTXM/MailManager/types/service'
 import type { ProviderAuthPanelProps, ProviderAuthPanelEmits } from '@KTXM/MailManager/types/integration'
+import { JmapServiceObject } from '@/models/JmapServiceObject'
 
 const props = defineProps<ProviderAuthPanelProps>()
 const emit = defineEmits<ProviderAuthPanelEmits>()
 
-// Auth method selection
 const authType = ref<'BA' | 'TA' | 'OA'>('BA')
-
-// Basic auth state
-const basicIdentity = ref(props.prefilledIdentity || props.emailAddress || '')
-const basicSecret = ref(props.prefilledSecret || '')
-
-// Token auth state
+const basicIdentity = ref('')
+const basicSecret = ref('')
 const bearerToken = ref('')
-
-// OAuth state
 const oauthLoading = ref(false)
 const oauthSuccess = ref(false)
 const oauthAccessToken = ref('')
 const oauthRefreshToken = ref('')
 
-// Validation rules
 const rules = {
-  required: (value: any) => !!value || 'This field is required'
+  required: (value: unknown) => !!value || 'This field is required'
 }
 
-// Validation
 const isValid = computed(() => {
   switch (authType.value) {
     case 'BA':
@@ -35,105 +33,183 @@ const isValid = computed(() => {
     case 'TA':
       return !!bearerToken.value
     case 'OA':
-      return oauthSuccess.value
+      return oauthSuccess.value && !!oauthAccessToken.value
     default:
       return false
   }
 })
 
-// Build ServiceIdentity object
 const currentIdentity = computed((): ServiceIdentity | null => {
-  if (!isValid.value) return null
-  
+  if (!isValid.value) {
+    return null
+  }
+
   switch (authType.value) {
     case 'BA':
       return {
         type: 'BA',
         identity: basicIdentity.value,
-        secret: basicSecret.value
+        secret: basicSecret.value,
       }
     case 'TA':
       return {
         type: 'TA',
-        token: bearerToken.value
+        token: bearerToken.value,
       }
     case 'OA':
       return {
         type: 'OA',
         accessToken: oauthAccessToken.value,
-        refreshToken: oauthRefreshToken.value,
+        refreshToken: oauthRefreshToken.value || undefined,
         accessScope: ['mail'],
-        accessExpiry: Date.now() + 3600000
+        accessExpiry: Math.floor(Date.now() / 1000) + 3600,
       }
     default:
       return null
   }
 })
 
-// Watch and emit changes
 watch(
-  currentIdentity,
-  (identity) => {
-    if (identity) {
-      emit('update:modelValue', identity)
-    }
-  },
-  { immediate: true, deep: true }
-)
-
-watch(
-  isValid,
-  (valid) => {
-    emit('valid', valid)
+  () => props.service,
+  service => {
+    syncFromService(service)
   },
   { immediate: true }
 )
 
-// Update local state if modelValue changes externally
-watch(
-  () => props.modelValue,
-  (newValue) => {
-    if (newValue) {
-      authType.value = newValue.type as 'BA' | 'TA' | 'OA'
-      
-      switch (newValue.type) {
-        case 'BA':
-          basicIdentity.value = newValue.identity || ''
-          basicSecret.value = newValue.secret || ''
-          break
-        case 'TA':
-          bearerToken.value = newValue.token || ''
-          break
-        case 'OA':
-          oauthAccessToken.value = newValue.accessToken || ''
-          oauthRefreshToken.value = newValue.refreshToken || ''
-          oauthSuccess.value = !!newValue.accessToken
-          break
-      }
-    }
-  }
-)
-
-// Prefill identity when email address is provided
 watch(
   () => props.emailAddress,
-  (email) => {
-    if (email && !basicIdentity.value) {
+  email => {
+    if (authType.value === 'BA' && email && !basicIdentity.value) {
       basicIdentity.value = email
     }
   },
   { immediate: true }
 )
 
-// OAuth flow (stub for now)
+watch(
+  currentIdentity,
+  identity => {
+    const existingIdentity = props.service?.identity?.toJson() ?? null
+    if (sameIdentity(existingIdentity, identity)) {
+      return
+    }
+
+    const nextService = createServiceObject(props.service)
+    nextService.identity = createIdentityModel(identity)
+    emit('update:service', nextService)
+  },
+  { immediate: true, deep: true }
+)
+
+function syncFromService(service?: ServiceObject) {
+  const identity = service?.identity?.toJson() ?? null
+
+  if (!identity) {
+    authType.value = 'BA'
+    basicIdentity.value = props.prefilledIdentity || props.emailAddress || ''
+    basicSecret.value = props.prefilledSecret || ''
+    bearerToken.value = ''
+    oauthAccessToken.value = ''
+    oauthRefreshToken.value = ''
+    oauthSuccess.value = false
+    return
+  }
+
+  authType.value = identity.type as 'BA' | 'TA' | 'OA'
+
+  switch (identity.type) {
+    case 'BA':
+      basicIdentity.value = identity.identity || props.prefilledIdentity || props.emailAddress || ''
+      basicSecret.value = identity.secret || props.prefilledSecret || ''
+      bearerToken.value = ''
+      oauthAccessToken.value = ''
+      oauthRefreshToken.value = ''
+      oauthSuccess.value = false
+      break
+    case 'TA':
+      basicIdentity.value = props.prefilledIdentity || props.emailAddress || ''
+      basicSecret.value = props.prefilledSecret || ''
+      bearerToken.value = identity.token || ''
+      oauthAccessToken.value = ''
+      oauthRefreshToken.value = ''
+      oauthSuccess.value = false
+      break
+    case 'OA':
+      basicIdentity.value = props.prefilledIdentity || props.emailAddress || ''
+      basicSecret.value = props.prefilledSecret || ''
+      bearerToken.value = ''
+      oauthAccessToken.value = identity.accessToken || ''
+      oauthRefreshToken.value = identity.refreshToken || ''
+      oauthSuccess.value = !!identity.accessToken
+      break
+  }
+}
+
+function createServiceObject(service?: ServiceObject): JmapServiceObject {
+  const nextService = new JmapServiceObject()
+
+  if (service) {
+    nextService.fromJson(service.toJson())
+  }
+
+  return nextService
+}
+
+function createIdentityModel(identity: ServiceIdentity | null) {
+  if (identity === null) {
+    return null
+  }
+
+  switch (identity.type) {
+    case 'BA':
+      return new IdentityBasic(identity.identity, identity.secret)
+    case 'TA':
+      return new IdentityToken(identity.token)
+    case 'OA':
+      return new IdentityOAuth(
+        identity.accessToken,
+        identity.accessScope,
+        identity.accessExpiry,
+        identity.refreshToken,
+        identity.refreshLocation
+      )
+  }
+}
+
+function sameIdentity(a: ServiceIdentity | null, b: ServiceIdentity | null): boolean {
+  if (a === null || b === null) {
+    return a === b
+  }
+
+  if (a.type !== b.type) {
+    return false
+  }
+
+  switch (a.type) {
+    case 'BA':
+      return b.type === 'BA'
+        && a.identity === b.identity
+        && a.secret === b.secret
+    case 'TA':
+      return b.type === 'TA'
+        && a.token === b.token
+    case 'OA':
+      return b.type === 'OA'
+        && a.accessToken === b.accessToken
+        && a.refreshToken === b.refreshToken
+    default:
+      return false
+  }
+}
+
 async function initiateOAuth() {
   oauthLoading.value = true
+
   try {
-    // TODO: Implement OAuth flow when backend is ready
-    emit('error', 'OAuth implementation pending')
     throw new Error('OAuth implementation pending')
-  } catch (error: any) {
-    emit('error', error.message)
+  } catch (error) {
+    console.warn('[JMAP Auth Panel] OAuth implementation pending', error)
   } finally {
     oauthLoading.value = false
   }
diff --git a/src/components/JmapConfigPanel.vue b/src/components/JmapProtocolPanel.vue
similarity index 64%
rename from src/components/JmapConfigPanel.vue
rename to src/components/JmapProtocolPanel.vue
index a723fff..17c9149 100644
--- a/src/components/JmapConfigPanel.vue
+++ b/src/components/JmapProtocolPanel.vue
@@ -1,13 +1,141 @@
 <script setup lang="ts">
-import { ref, watch, computed } from 'vue'
+import { computed, ref, watch } from 'vue'
+import { LocationUri } from '@KTXM/MailManager/models/location'
+import type { ServiceObject } from '@KTXM/MailManager/models/service'
 import type { ServiceLocationUri, ServiceLocation } from '@KTXM/MailManager/types/service'
-import type { ProviderConfigPanelProps, ProviderConfigPanelEmits } from '@KTXM/MailManager/types/integration'
+import type { ProviderProtocolPanelProps, ProviderProtocolPanelEmits } from '@KTXM/MailManager/types/integration'
+import { JmapServiceObject } from '@/models/JmapServiceObject'
 
-const props = defineProps<ProviderConfigPanelProps>()
-const emit = defineEmits<ProviderConfigPanelEmits>()
+const props = defineProps<ProviderProtocolPanelProps>()
+const emit = defineEmits<ProviderProtocolPanelEmits>()
+
+const serviceLocationUrl = ref('')
+const verifyPeer = ref(true)
+const verifyHost = ref(true)
+
+// Manual configuration toggle and fields
+const configureManually = ref(false)
+const serviceHost = ref('')
+const serviceProtocol = ref<'http' | 'https'>('https')
+const servicePort = ref('')
+const servicePath = ref('')
+
+// Validation rules
+const rules = {
+  required: (value: any) => !!value || 'This field is required',
+  url: (value: string) => {
+    try {
+      new URL(value)
+      return true
+    } catch {
+      return 'Please enter a valid URL'
+    }
+  }
+}
+
+// Build location from current state
+const currentLocation = computed((): ServiceLocationUri | null => {
+  if (configureManually.value) {
+    // Build from manual fields
+    if (!serviceHost.value) return null
+    
+    const port = servicePort.value 
+      ? parseInt(servicePort.value) 
+      : (serviceProtocol.value === 'https' ? 443 : 80)
+    
+    return {
+      type: 'URI',
+      scheme: serviceProtocol.value,
+      host: serviceHost.value,
+      port,
+      path: servicePath.value || '/.well-known/jmap',
+      verifyPeer: verifyPeer.value,
+      verifyHost: verifyHost.value
+    }
+  } else {
+    // Build from session URL
+    if (!serviceLocationUrl.value) return null
+    return parseSessionUrl(serviceLocationUrl.value)
+  }
+})
+
+watch(
+  () => [props.service, props.discoveredLocation] as const,
+  ([service, discoveredLocation]) => {
+    syncFromLocation(service?.location?.toJson() ?? discoveredLocation ?? null)
+  },
+  { immediate: true }
+)
+
+watch(
+  currentLocation,
+  (location) => {
+    const existingLocation = props.service?.location?.toJson() ?? null
+    if (sameLocation(existingLocation, location)) {
+      return
+    }
+
+    const nextService = createServiceObject(props.service)
+    nextService.location = location ? LocationUri.fromJson(location) : null
+    emit('update:service', nextService)
+  },
+  { immediate: true }
+)
+
+function syncFromLocation(location: ServiceLocation | null) {
+  const uriLocation = getUriLocation(location)
+
+  serviceLocationUrl.value = buildSessionUrl(uriLocation)
+  verifyPeer.value = getUriVerifyPeer(uriLocation)
+  verifyHost.value = getUriVerifyHost(uriLocation)
+  serviceProtocol.value = uriLocation?.scheme === 'http' ? 'http' : 'https'
+  serviceHost.value = uriLocation?.host ?? ''
+  servicePort.value = normalizePort(uriLocation)
+  servicePath.value = uriLocation?.path ?? ''
+}
+
+function createServiceObject(service?: ServiceObject): JmapServiceObject {
+  const nextService = new JmapServiceObject()
+
+  if (service) {
+    nextService.fromJson(service.toJson())
+  }
+
+  return nextService
+}
+
+function sameLocation(a: ServiceLocation | null, b: ServiceLocation | null): boolean {
+  if (a === null || b === null) {
+    return a === b
+  }
+
+  if (a.type !== 'URI' || b.type !== 'URI') {
+    return false
+  }
+
+  return a.scheme === b.scheme
+    && a.host === b.host
+    && a.port === b.port
+    && (a.path ?? '') === (b.path ?? '')
+    && getUriVerifyPeer(a) === getUriVerifyPeer(b)
+    && getUriVerifyHost(a) === getUriVerifyHost(b)
+}
+
+function getUriLocation(location?: ServiceLocation | null): ServiceLocationUri | null {
+  return location?.type === 'URI' ? location : null
+}
+
+function normalizePort(location: ServiceLocationUri | null): string {
+  if (!location) {
+    return ''
+  }
+
+  const defaultPort = location.scheme === 'http' ? 80 : 443
+  return location.port === defaultPort ? '' : String(location.port)
+}
 
 // Helper to build session URL from location
-function buildSessionUrl(location?: ServiceLocation): string {
+function buildSessionUrl(location?: ServiceLocation | null): string {
   if (!location || location.type !== 'URI') return ''
   
   const protocol = location.scheme || 'https'
@@ -50,127 +178,13 @@ function parseSessionUrl(url: string): ServiceLocationUri {
 }
 
 // Helper to extract URI properties safely
-function getUriVerifyPeer(location?: ServiceLocation): boolean {
+function getUriVerifyPeer(location?: ServiceLocation | null): boolean {
   return (location?.type === 'URI' ? location.verifyPeer : undefined) ?? true
 }
 
-function getUriVerifyHost(location?: ServiceLocation): boolean {
+function getUriVerifyHost(location?: ServiceLocation | null): boolean {
   return (location?.type === 'URI' ? location.verifyHost : undefined) ?? true
 }
-
-// Manual configuration toggle and fields
-const configureManually = ref(false)
-const serviceHost = ref('')
-const serviceProtocol = ref<'http' | 'https'>('https')
-const servicePort = ref('')
-const servicePath = ref('')
-
-// Local state - protocol settings only
-const sessionUrl = ref(buildSessionUrl(props.modelValue || props.discoveredLocation))
-const capabilities = ref<string[]>(['urn:ietf:params:jmap:mail'])
-const timeout = ref(30)
-const verifyPeer = ref(getUriVerifyPeer(props.modelValue || props.discoveredLocation))
-const verifyHost = ref(getUriVerifyHost(props.modelValue || props.discoveredLocation))
-
-// Validation rules
-const rules = {
-  required: (value: any) => !!value || 'This field is required',
-  url: (value: string) => {
-    try {
-      new URL(value)
-      return true
-    } catch {
-      return 'Please enter a valid URL'
-    }
-  }
-}
-
-// Build location from current state
-const currentLocation = computed((): ServiceLocationUri | null => {
-  if (configureManually.value) {
-    // Build from manual fields
-    if (!serviceHost.value) return null
-    
-    const port = servicePort.value 
-      ? parseInt(servicePort.value) 
-      : (serviceProtocol.value === 'https' ? 443 : 80)
-    
-    return {
-      type: 'URI',
-      scheme: serviceProtocol.value,
-      host: serviceHost.value,
-      port,
-      path: servicePath.value || '/.well-known/jmap',
-      verifyPeer: verifyPeer.value,
-      verifyHost: verifyHost.value
-    }
-  } else {
-    // Build from session URL
-    if (!sessionUrl.value) return null
-    return parseSessionUrl(sessionUrl.value)
-  }
-})
-
-// Validation state
-const isValid = computed(() => {
-  if (configureManually.value) {
-    return !!serviceHost.value
-  } else {
-    return !!sessionUrl.value && rules.url(sessionUrl.value) === true
-  }
-})
-
-// Emit location whenever it changes
-watch(
-  currentLocation,
-  (newLocation) => {
-    if (newLocation) {
-      emit('update:modelValue', newLocation)
-    }
-  },
-  { immediate: true, deep: true }
-)
-
-// Emit validation state
-watch(
-  isValid,
-  (valid) => {
-    emit('valid', valid)
-  },
-  { immediate: true }
-)
-
-// Update local state when props change
-watch(
-  () => props.modelValue,
-  (newValue) => {
-    if (newValue && newValue.type === 'URI') {
-      sessionUrl.value = buildSessionUrl(newValue)
-      verifyPeer.value = newValue.verifyPeer ?? true
-      verifyHost.value = newValue.verifyHost ?? true
-    }
-  }
-)
-
-watch(
-  () => props.discoveredLocation,
-  (newValue) => {
-    if (newValue && newValue.type === 'URI' && !props.modelValue) {
-      sessionUrl.value = buildSessionUrl(newValue)
-      verifyPeer.value = newValue.verifyPeer ?? true
-      verifyHost.value = newValue.verifyHost ?? true
-    }
-  },
-  { immediate: true }
-)
-
-const jmapCapabilities = [
-  { title: 'Mail', value: 'urn:ietf:params:jmap:mail' },
-  { title: 'Contacts', value: 'urn:ietf:params:jmap:contacts' },
-  { title: 'Calendars', value: 'urn:ietf:params:jmap:calendars' },
-  { title: 'Tasks', value: 'urn:ietf:params:jmap:tasks' },
-  { title: 'Notes', value: 'urn:ietf:params:jmap:notes' },
-]
 </script>
 
 <template>
@@ -189,7 +203,7 @@ const jmapCapabilities = [
     <!-- Session URL (Simple Mode) -->
     <template v-if="!configureManually">
       <v-text-field
-        v-model="sessionUrl"
+        v-model="serviceLocationUrl"
         label="JMAP Session URL"
         hint="e.g., https://jmap.example.com/.well-known/jmap"
         persistent-hint
@@ -266,47 +280,14 @@ const jmapCapabilities = [
       />
     </template>
 
-    <!-- Advanced Settings -->
-    <v-expansion-panels class="mt-4">
-      <v-expansion-panel>
-        <v-expansion-panel-title>
-          <v-icon start>mdi-cog</v-icon>
-          Advanced Settings
-        </v-expansion-panel-title>
-        <v-expansion-panel-text>
-          <v-select
-            v-model="capabilities"
-            :items="jmapCapabilities"
-            label="Enabled Capabilities"
-            multiple
-            chips
-            variant="outlined"
-            hint="Select which JMAP capabilities to enable"
-            persistent-hint
-          />
-
-          <v-text-field
-            v-model.number="timeout"
-            type="number"
-            label="Timeout (seconds)"
-            variant="outlined"
-            class="mt-4"
-            hint="Connection timeout in seconds"
-            persistent-hint
-            :min="5"
-            :max="300"
-          />
-
-          <v-switch
-            v-model="verifyHost"
-            label="Verify SSL Hostname"
-            color="primary"
-            hint="Verify the certificate matches the hostname"
-            persistent-hint
-          />
-        </v-expansion-panel-text>
-      </v-expansion-panel>
-    </v-expansion-panels>
+    <v-switch
+      v-model="verifyHost"
+      label="Verify SSL Hostname"
+      color="primary"
+      class="mt-4"
+      hint="Verify the certificate matches the hostname"
+      persistent-hint
+    />
 
     <!-- Info Alert -->
     <v-alert
diff --git a/src/integrations.ts b/src/integrations.ts
index 93cc0fc..51c673f 100644
--- a/src/integrations.ts
+++ b/src/integrations.ts
@@ -3,19 +3,18 @@ import type { ServiceInterface } from "@KTXM/MailManager/types/service";
 import { JmapServiceObject } from './models/JmapServiceObject'
 
 const integrations: ModuleIntegrations = {
-  mail_account_config_panels: [
+  mail_account_protocol_panels: [
     {
       id: 'jmap',
-      label: 'JMAP',
-      icon: 'mdi-api',
-      caption: 'Modern JSON-based mail protocol',
-      component: () => import('@/components/JmapConfigPanel.vue'),
+      label: 'JMAP Protocol Panel',
+      component: () => import('@/components/JmapProtocolPanel.vue'),
       priority: 10,
     }
   ],
   mail_account_auth_panels: [
     {
       id: 'jmap',
+      label: 'JMAP Authentication Panel',
       component: () => import('@/components/JmapAuthPanel.vue'),
     }
   ],
diff --git a/src/models/JmapServiceObject.ts b/src/models/JmapServiceObject.ts
index 9956831..651b643 100644
--- a/src/models/JmapServiceObject.ts
+++ b/src/models/JmapServiceObject.ts
@@ -51,5 +51,13 @@ export class JmapServiceObject extends ServiceObject {
   get accountId(): string | undefined {
     return this.jmapAuxiliary.accountId
   }
+
+  get deleteMode(): 'soft' | 'hard' {
+    return this.jmapAuxiliary.deleteMode === 'hard' ? 'hard' : 'soft'
+  }
+
+  get deleteDestination(): string | undefined {
+    return this.jmapAuxiliary.deleteDestination
+  }
   
 }
diff --git a/src/types/auxiliary.ts b/src/types/auxiliary.ts
index 94c06fd..58f3e9f 100644
--- a/src/types/auxiliary.ts
+++ b/src/types/auxiliary.ts
@@ -22,6 +22,12 @@ export interface JmapAuxiliary {
   
   /** JMAP account ID */
   accountId?: string;
+
+  /** Message delete behavior */
+  deleteMode?: 'soft' | 'hard';
+
+  /** Optional destination mailbox identifier for soft delete */
+  deleteDestination?: string;
   
   /** Allow additional custom fields */
   [key: string]: any;