Merge remote swift-sdk and main

Author: ochafik

.prettierignore

@@ -9,8 +9,8 @@ examples/basic-server-vanillajs/**/*.tsx
 sdk/swift/.build/
 examples/basic-host-swift/.build/
 examples/basic-host-swift/build/
-examples/basic-host-kotlin/.gradle/
-examples/basic-host-kotlin/build/
 
 # Swift build artifacts
 swift/.build/
+swift/.build
+examples/basic-host-swift/.build

examples/basic-host-swift/Sources/BasicHostApp/ContentView.swift

@@ -24,7 +24,7 @@ struct ContentView: View {
                             ForEach(viewModel.activeToolCalls) { toolCall in
                                 ToolCallCard(
                                     toolCallInfo: toolCall,
-                                    onRemove: { viewModel.removeToolCall(toolCall) }
+                                    onRemove: { Task { await viewModel.removeToolCall(toolCall) } }
                                 )
                                 .id(toolCall.id)
                             }
@@ -47,6 +47,20 @@ struct ContentView: View {
             }
             .navigationTitle("MCP Host")
             .navigationBarTitleDisplayMode(.inline)
+            .overlay(alignment: .bottom) {
+                if let toast = viewModel.toastMessage {
+                    Text(toast)
+                        .font(.footnote)
+                        .foregroundColor(.white)
+                        .padding(.horizontal, 16)
+                        .padding(.vertical, 10)
+                        .background(Color.red.opacity(0.9))
+                        .cornerRadius(8)
+                        .padding(.bottom, 80) // Above toolbar
+                        .transition(.move(edge: .bottom).combined(with: .opacity))
+                        .animation(.easeInOut, value: viewModel.toastMessage)
+                }
+            }
         }
     }
 
@@ -188,30 +202,44 @@ struct ToolCallCard: View {
         VStack(alignment: .leading, spacing: 8) {
             // Header
             HStack {
-                Text(toolCallInfo.tool.name)
-                    .font(.subheadline.bold())
-                    .foregroundColor(.primary)
+                VStack(alignment: .leading, spacing: 2) {
+                    Text(toolCallInfo.serverName)
+                        .font(.caption)
+                        .foregroundColor(.secondary)
+                    Text(toolCallInfo.tool.name)
+                        .font(.subheadline.bold())
+                        .foregroundColor(.primary)
+                }
 
                 Spacer()
 
-                Text(toolCallInfo.state.description)
-                    .font(.caption2)
-                    .padding(.horizontal, 6)
-                    .padding(.vertical, 2)
-                    .background(stateColor.opacity(0.15))
-                    .foregroundColor(stateColor)
-                    .cornerRadius(4)
+                if toolCallInfo.isTearingDown {
+                    HStack(spacing: 4) {
+                        ProgressView().scaleEffect(0.6)
+                        Text("Closing...")
+                            .font(.caption2)
+                    }
+                    .foregroundColor(.secondary)
+                } else {
+                    Text(toolCallInfo.state.description)
+                        .font(.caption2)
+                        .padding(.horizontal, 6)
+                        .padding(.vertical, 2)
+                        .background(stateColor.opacity(0.15))
+                        .foregroundColor(stateColor)
+                        .cornerRadius(4)
 
-                Button { withAnimation { isInputExpanded.toggle() } } label: {
-                    Image(systemName: isInputExpanded ? "chevron.up" : "chevron.down")
-                        .font(.caption)
-                        .foregroundColor(.secondary)
-                }
+                    Button { withAnimation { isInputExpanded.toggle() } } label: {
+                        Image(systemName: isInputExpanded ? "chevron.up" : "chevron.down")
+                            .font(.caption)
+                            .foregroundColor(.secondary)
+                    }
 
-                Button(action: onRemove) {
-                    Image(systemName: "xmark")
-                        .font(.caption)
-                        .foregroundColor(.secondary)
+                    Button(action: onRemove) {
+                        Image(systemName: "xmark")
+                            .font(.caption)
+                            .foregroundColor(.secondary)
+                    }
                 }
             }
 
@@ -272,6 +300,8 @@ struct ToolCallCard: View {
         .padding(10)
         .background(Color(UIColor.secondarySystemBackground))
         .cornerRadius(10)
+        .opacity(toolCallInfo.isTearingDown ? 0.5 : 1.0)
+        .animation(.easeInOut(duration: 0.2), value: toolCallInfo.isTearingDown)
     }
 
     private var stateColor: Color {

examples/basic-host-swift/Sources/BasicHostApp/McpHostViewModel.swift

@@ -2,6 +2,9 @@ import Foundation
 import SwiftUI
 import MCP
 import McpApps
+import os.log
+
+private let logger = Logger(subsystem: "com.example.BasicHostSwift", category: "ToolCall")
 
 /// View model managing MCP server connection and tool execution.
 @MainActor
@@ -22,6 +25,15 @@ class McpHostViewModel: ObservableObject {
     }
     @Published var activeToolCalls: [ToolCallInfo] = []
     @Published var errorMessage: String?
+    @Published var toastMessage: String?
+
+    func showToast(_ message: String, duration: TimeInterval = 3.0) {
+        toastMessage = message
+        Task {
+            try? await Task.sleep(nanoseconds: UInt64(duration * 1_000_000_000))
+            await MainActor.run { self.toastMessage = nil }
+        }
+    }
 
     /// Known MCP servers (matches examples/servers.json)
     static let knownServers = [
@@ -134,7 +146,12 @@ class McpHostViewModel: ObservableObject {
                 throw ToolCallError.invalidJson
             }
 
+            let serverName = selectedServerIndex >= 0 && selectedServerIndex < Self.knownServers.count
+                ? Self.knownServers[selectedServerIndex].0
+                : "Custom Server"
+
             let toolCallInfo = ToolCallInfo(
+                serverName: serverName,
                 tool: tool,
                 input: inputDict,
                 client: client,
@@ -234,7 +251,10 @@ class McpHostViewModel: ObservableObject {
         }
     }
 
-    func removeToolCall(_ toolCall: ToolCallInfo) {
+    func removeToolCall(_ toolCall: ToolCallInfo) async {
+        if let error = await toolCall.teardown() {
+            showToast(error)
+        }
         activeToolCalls.removeAll { $0.id == toolCall.id }
     }
 }
@@ -268,6 +288,7 @@ struct ToolResult {
 @MainActor
 class ToolCallInfo: ObservableObject, Identifiable {
     let id = UUID()
+    let serverName: String
     let tool: Tool
     let input: [String: Any]
     let client: Client
@@ -281,14 +302,17 @@ class ToolCallInfo: ObservableObject, Identifiable {
     @Published var result: ToolResult?
     @Published var state: ExecutionState = .calling
     @Published var error: String?
+    @Published var isTearingDown = false
 
     init(
+        serverName: String,
         tool: Tool,
         input: [String: Any],
         client: Client,
         hostInfo: Implementation,
         hostCapabilities: McpUiHostCapabilities
     ) {
+        self.serverName = serverName
         self.tool = tool
         self.input = input
         self.client = client
@@ -374,37 +398,38 @@ class ToolCallInfo: ObservableObject, Identifiable {
         bridge.onInitialized = { [weak self] in
             Task { @MainActor in
                 guard let self = self else { return }
-                try? await bridge.sendToolInput(
+                let params = McpUiToolInputParams(
                     arguments: self.input.mapValues { AnyCodable($0) }
                 )
+                try? await bridge.sendToolInput(params)
                 if let result = self.result {
                     try? await self.sendToolResult(result, to: bridge)
                 }
             }
         }
 
-        bridge.onMessage = { role, content in
-            print("[Host] Message from Guest UI: \(role)")
+        bridge.onMessage = { params in
+            print("[Host] Message from Guest UI: \(params.role)")
             return McpUiMessageResult(isError: false)
         }
 
-        bridge.onOpenLink = { url in
-            print("[Host] Open link request: \(url)")
-            if let urlObj = URL(string: url) {
+        bridge.onOpenLink = { params in
+            print("[Host] Open link request: \(params.url)")
+            if let urlObj = URL(string: params.url) {
                 await MainActor.run {
                     UIApplication.shared.open(urlObj)
                 }
             }
             return McpUiOpenLinkResult(isError: false)
         }
 
-        bridge.onLoggingMessage = { level, data, logger in
-            print("[Host] Guest UI log [\(level)]: \(data.value)")
+        bridge.onLoggingMessage = { params in
+            print("[Host] Guest UI log [\(params.level)]: \(params.data.value)")
         }
 
-        bridge.onSizeChange = { [weak self] width, height in
-            print("[Host] Size change: \(width ?? 0) x \(height ?? 0)")
-            if let height = height {
+        bridge.onSizeChange = { [weak self] params in
+            print("[Host] Size change: \(params.width ?? 0) x \(params.height ?? 0)")
+            if let height = params.height {
                 Task { @MainActor in
                     self?.preferredHeight = CGFloat(height)
                 }
@@ -455,24 +480,66 @@ class ToolCallInfo: ObservableObject, Identifiable {
             ]
         }
 
+        logger.info("Connecting bridge to transport...")
         try await bridge.connect(transport)
         self.appBridge = bridge
+        logger.info("AppBridge is now set and ready")
     }
 
     private func sendToolResult(_ result: ToolResult, to bridge: AppBridge) async throws {
-        try await bridge.sendToolResult([
-            "content": AnyCodable(result.content.map { c -> [String: Any] in
-                switch c {
-                case .text(let text):
-                    return ["type": "text", "text": text]
-                case .image(let data, let mimeType, _):
-                    return ["type": "image", "data": data, "mimeType": mimeType]
-                default:
-                    return ["type": "text", "text": ""]
+        let contentItems: [McpUiToolResultNotificationParamsContentItem] = result.content.compactMap { c in
+            switch c {
+            case .text(let text):
+                return .text(McpUiToolResultNotificationParamsContentItemText(type: "text", text: text))
+            case .image(let data, let mimeType, _):
+                return .image(McpUiToolResultNotificationParamsContentItemImage(type: "image", data: data, mimeType: mimeType))
+            default:
+                return nil
+            }
+        }
+        let params = McpUiToolResultParams(content: contentItems, isError: result.isError)
+        try await bridge.sendToolResult(params)
+    }
+
+    /// Teardown the app bridge before removing the tool call
+    /// Returns an error message if teardown failed, nil on success
+    func teardown() async -> String? {
+        // Prevent double-tap
+        guard !isTearingDown else {
+            logger.info("Teardown already in progress, skipping")
+            return nil
+        }
+        isTearingDown = true
+        logger.info("Starting teardown, appBridge exists: \(self.appBridge != nil)")
+
+        var errorMessage: String?
+
+        if let bridge = appBridge {
+            // Only send teardown if the bridge is initialized
+            // If not initialized, the app hasn't done anything worth saving
+            let isReady = await bridge.isReady()
+            if isReady {
+                logger.info("Sending teardown request...")
+                do {
+                    _ = try await bridge.sendResourceTeardown()
+                    logger.info("Teardown request completed successfully")
+                } catch {
+                    logger.error("Teardown request failed: \(String(describing: error))")
+                    errorMessage = "Teardown failed: app may not have saved data"
                 }
-            }),
-            "isError": AnyCodable(result.isError ?? false)
-        ])
+            } else {
+                logger.info("Skipping teardown - bridge not yet initialized")
+            }
+
+            logger.info("Closing bridge...")
+            await bridge.close()
+            logger.info("Bridge closed")
+        } else {
+            logger.warning("No bridge to teardown (appBridge is nil)")
+        }
+        appBridge = nil
+        logger.info("Teardown complete, will remove card from list")
+        return errorMessage
     }
 }
 

examples/basic-host-swift/scripts/logs.sh

@@ -9,10 +9,8 @@ echo "📋 Streaming logs from $BUNDLE_ID on '$SIMULATOR'..."
 echo "   Press Ctrl+C to stop"
 echo ""
 
-# Stream logs, filtering for our app
+# Stream logs, filtering for our app (both OSLog and print statements)
 xcrun simctl spawn "$SIMULATOR" log stream \
     --predicate "subsystem == '$BUNDLE_ID' OR process == 'BasicHostSwift'" \
-    --style compact 2>/dev/null || \
-xcrun simctl spawn "$SIMULATOR" log stream \
-    --predicate "process == 'BasicHostSwift'" \
+    --level debug \
     --style compact

examples/basic-host/src/implementation.ts

@@ -207,12 +207,19 @@ function hookInitializedCallback(appBridge: AppBridge): Promise<void> {
 }
 
 
-export function newAppBridge(serverInfo: ServerInfo, iframe: HTMLIFrameElement): AppBridge {
+export function newAppBridge(serverInfo: ServerInfo, toolCallInfo: ToolCallInfo, iframe: HTMLIFrameElement): AppBridge {
   const serverCapabilities = serverInfo.client.getServerCapabilities();
   const appBridge = new AppBridge(serverInfo.client, IMPLEMENTATION, {
     openLinks: {},
     serverTools: serverCapabilities?.tools,
     serverResources: serverCapabilities?.resources,
+  }, {
+    hostContext: {
+      toolInfo: {
+        id: crypto.randomUUID(),  // We don't have the actual request ID, use a random one
+        tool: toolCallInfo.tool,
+      },
+    },
   });
 
   // Register all handlers before calling connect(). The Guest UI can start

examples/basic-host/src/index.tsx

@@ -269,7 +269,7 @@ function AppIFramePanel({ toolCallInfo, isDestroying, onTeardownComplete }: AppI
       // Outside of Strict Mode, this `useEffect` runs only once per
       // `toolCallInfo`.
       if (firstTime) {
-        const appBridge = newAppBridge(toolCallInfo.serverInfo, iframe);
+        const appBridge = newAppBridge(toolCallInfo.serverInfo, toolCallInfo, iframe);
         appBridgeRef.current = appBridge;
         initializeApp(iframe, appBridge, toolCallInfo);
       }