feat(session): add force flag to delete attached sessions

Author: Mochxd

src/tools/session/delete-session.ts

@@ -1,18 +1,21 @@
 import { getSessionOwnership, safeDeleteSession } from '../../session-store.js';
 import { errorResult, textResult, toolErrorMessage } from '../tool-response.js';
 
-export async function deleteSessionAction(sessionId?: string): Promise<any> {
+export async function deleteSessionAction(
+  sessionId?: string,
+  force?: boolean
+): Promise<any> {
   const ownership = getSessionOwnership(sessionId);
   if (!ownership) {
     return errorResult(
       sessionId ? `Session ${sessionId} not found.` : 'No active session found.'
     );
   }
-  if (ownership === 'attached') {
+  if (ownership === 'attached' && !force) {
     return errorResult(
       sessionId
-        ? `Session ${sessionId} is attached from a remote server. Use action=detach to remove it from MCP without deleting the remote session.`
-        : 'Active session is attached from a remote server. Use action=detach to remove it from MCP without deleting the remote session.'
+        ? `Session ${sessionId} is attached from a remote server. Use action=detach to remove it from MCP without deleting the remote session, or pass force=true to delete the remote session.`
+        : 'Active session is attached from a remote server. Use action=detach to remove it from MCP without deleting the remote session, or pass force=true to delete the remote session.'
     );
   }
 

src/tools/session/session.ts

@@ -44,7 +44,7 @@ const schema = z.object({
         `create: ${CREATE_SESSION_DESCRIPTION}` +
         'attach: Attach MCP Appium to an existing remote Appium session without taking ownership of its lifecycle. Requires remoteServerUrl and sessionId. Always pass capabilities with at least platformName (e.g. \'{"platformName":"iOS"}\' or \'{"platformName":"Android"}\') so the client is configured with the correct protocol commands.' +
         'detach: Remove an attached Appium session from MCP Appium without deleting the real remote session. Defaults to the active session.' +
-        'delete: Delete an MCP-owned mobile session and clean up resources. Does not delete attached remote sessions; use detach for those. If sessionId is omitted, deletes the active session.' +
+        'delete: Delete an MCP-owned mobile session and clean up resources. Attached remote sessions are rejected unless force=true; use detach to drop attached sessions from MCP without terminating the remote session. If sessionId is omitted, deletes the active session.' +
         'list: List all active Appium sessions managed by this MCP server, including active flag, ownership, and current context.' +
         'select: Set an existing Appium session as the active session for subsequent tool calls (requires sessionId).'
     ),
@@ -77,6 +77,12 @@ const schema = z.object({
     .describe(
       'For attach: existing session to connect to. For delete: session to remove (defaults to active). For detach: attached session to remove from MCP (defaults to active). For select: session to activate. Required for attach and select.'
     ),
+  force: z
+    .boolean()
+    .optional()
+    .describe(
+      'For delete only: when true, also terminate an attached remote Appium session. Defaults to false.'
+    ),
 });
 
 export default function session(server: FastMCP): void {
@@ -139,7 +145,7 @@ export default function session(server: FastMCP): void {
         }
 
         if (args.action === 'delete') {
-          return deleteSessionAction(args.sessionId);
+          return deleteSessionAction(args.sessionId, args.force);
         }
 
         if (args.action === 'list') {