Merge pull request #34 from MxIris-Reverse-Engineering/fix/ci-release-workflow

Author: Mx-Iris

.github/workflows/release.yml

@@ -1,17 +1,25 @@
-name: Release
+name: Build & Release
 
 on:
   push:
     tags: ['v*']
   workflow_dispatch:
     inputs:
+      tag:
+        description: 'Tag to release (e.g. v2.0.0-RC.3)'
+        required: true
+        type: string
       runner:
         description: 'Runner to use'
         type: choice
         default: 'macos-latest'
         options:
           - macos-latest
           - self-hosted
+      create_release:
+        description: 'Create GitHub Release'
+        type: boolean
+        default: true
 
 # Required GitHub Secrets:
 #   DEVELOPER_ID_P12          - Base64-encoded Developer ID Application certificate (.p12)
@@ -29,12 +37,14 @@ jobs:
       contents: write
 
     env:
-      WORKSPACE: RuntimeViewer.xcworkspace
+      WORKSPACE: RuntimeViewer-arm64e.xcworkspace
       BUILD_PATH: ./Products/Archives
 
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.tag || github.ref }}
 
       - name: Clone sibling dependencies
         run: |
@@ -80,12 +90,13 @@ jobs:
             -k "$KEYCHAIN_PATH"
 
           # Import Apple intermediate certificates (required on self-hosted runners)
+          # Use || true because these may already exist on GitHub-hosted runners
           for cert_url in \
             https://www.apple.com/certificateauthority/AppleWWDRCAG3.cer \
             https://www.apple.com/certificateauthority/DeveloperIDG2CA.cer; do
             cert_file="$RUNNER_TEMP/$(basename "$cert_url")"
             curl -sL "$cert_url" -o "$cert_file"
-            security import "$cert_file" -k "$KEYCHAIN_PATH" -T /usr/bin/codesign
+            security import "$cert_file" -k "$KEYCHAIN_PATH" -T /usr/bin/codesign || true
           done
 
           security list-keychain -d user -s \
@@ -213,7 +224,7 @@ jobs:
             -skipMacroValidation \
             CODE_SIGNING_ALLOWED=NO
 
-      # ── Package & Release ──
+      # ── Package ──
 
       - name: Package artifacts
         run: |
@@ -226,11 +237,22 @@ jobs:
           /usr/bin/ditto -c -k --keepParent RuntimeViewer.app \
             "$GITHUB_WORKSPACE/RuntimeViewer-iOS-Simulator.zip"
 
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: release-artifacts
+          path: |
+            RuntimeViewer-macOS.zip
+            RuntimeViewer-iOS-Simulator.zip
+
+      # ── Release (manual only) ──
+
       - name: Create Release
+        if: ${{ github.event_name == 'workflow_dispatch' && inputs.create_release }}
         env:
           GH_TOKEN: ${{ github.token }}
         run: |
-          TAG="${{ github.ref_name }}"
+          TAG="${{ inputs.tag }}"
           CHANGELOG_FILE="Changelogs/${TAG}.md"
 
           NOTES_ARGS=()

RuntimeViewerMCP/Sources/RuntimeViewerMCPBridge/MCPService.swift

@@ -42,6 +42,8 @@ public final class MCPService {
 
     private var transport: HTTPSSETransport?
 
+    private var transportTask: Task<Void, Never>?
+
     private var startTask: Task<Void, Never>?
 
     private var observeToken: ObserveToken?
@@ -61,7 +63,11 @@ public final class MCPService {
     private init() {
         let appSupportURL = FileManager.default.urls(for: .applicationSupportDirectory, in: .userDomainMask).first!
         let runtimeViewerDir = appSupportURL.appendingPathComponent("RuntimeViewer")
-        try? FileManager.default.createDirectory(at: runtimeViewerDir, withIntermediateDirectories: true)
+        do {
+            try FileManager.default.createDirectory(at: runtimeViewerDir, withIntermediateDirectories: true)
+        } catch {
+            logger.error("Failed to create app support directory: \(error)")
+        }
         self.portFilePath = runtimeViewerDir.appendingPathComponent(Settings.MCP.portFileName).path
     }
 
@@ -70,9 +76,17 @@ public final class MCPService {
     }
 
     public func start(for documentProvider: some MCPBridgeDocumentProvider) {
-        let mcpSettings = settings.mcp
-        guard mcpSettings.isEnabled else {
+        self.documentProvider = documentProvider
+
+        // Initialize previous values before observing to avoid a spurious restart
+        let currentMCP = settings.mcp
+        previousMCPEnabled = currentMCP.isEnabled
+        previousMCPUsesFixedPort = currentMCP.useFixedPort
+        previousMCPFixedPort = currentMCP.fixedPort
+
+        guard currentMCP.isEnabled else {
             serverState = .disabled
+            observe()
             return
         }
         startTask = Task {
@@ -82,10 +96,9 @@ public final class MCPService {
                 let mcpServer = MCPBridgeServer(documentProvider: documentProvider)
                 let transport = HTTPSSETransport(server: mcpServer, host: "127.0.0.1", port: Int(port))
                 self.transport = transport
-                self.documentProvider = documentProvider
 
                 // Run transport in a detached task (run() blocks on the NIO event loop)
-                Task.detached {
+                self.transportTask = Task.detached {
                     do {
                         try await transport.run()
                     } catch {
@@ -103,11 +116,6 @@ public final class MCPService {
                 logger.error("Failed to start MCP server: \(error)")
                 self.serverState = .stopped
             }
-            // Initialize previous values before observing to avoid a spurious restart
-            let currentMCP = settings.mcp
-            previousMCPEnabled = currentMCP.isEnabled
-            previousMCPUsesFixedPort = currentMCP.useFixedPort
-            previousMCPFixedPort = currentMCP.fixedPort
             observe()
         }
     }
@@ -117,6 +125,13 @@ public final class MCPService {
         startTask = nil
         restartTask?.cancel()
         restartTask = nil
+        transportTask?.cancel()
+        transportTask = nil
+        if let transport {
+            Task.detached {
+                try? await transport.stop()
+            }
+        }
         transport = nil
         let isEnabled = settings.mcp.isEnabled
         serverState = isEnabled ? .stopped : .disabled
@@ -178,6 +193,12 @@ public final class MCPService {
     }
 
     private nonisolated func removePortFile() {
-        try? FileManager.default.removeItem(atPath: portFilePath)
+        do {
+            try FileManager.default.removeItem(atPath: portFilePath)
+        } catch let error as NSError where error.domain == NSCocoaErrorDomain && error.code == NSFileNoSuchFileError {
+            // File already removed, ignore
+        } catch {
+            logger.error("Failed to remove port file: \(error)")
+        }
     }
 }

RuntimeViewerPackages/Sources/RuntimeViewerService/RuntimeViewerService.swift

@@ -91,10 +91,12 @@ public final class RuntimeViewerService {
 
                         guard let app = notification.userInfo?[NSWorkspace.applicationUserInfoKey] as? NSRunningApplication,
                               let bundleID = app.bundleIdentifier,
-                              let launchedApps = service.launchedApplicationsByCallerBundleID.removeValue(forKey: bundleID) else { continue }
+                              let launchedApps = service.launchedApplicationsByCallerBundleID[bundleID] else { continue }
 
                         // Check if there's still another instance of the caller app running
-                        if NSWorkspace.shared.runningApplications.contains(where: { $0.bundleIdentifier == bundleID }) { continue }
+                        if NSWorkspace.shared.runningApplications.contains(where: { $0.bundleIdentifier == bundleID && $0 != app }) { continue }
+
+                        service.launchedApplicationsByCallerBundleID.removeValue(forKey: bundleID)
 
                         for launchedApp in launchedApps {
                             if !launchedApp.isTerminated {

RuntimeViewerUsingAppKit/RuntimeViewerUsingAppKit/MCP/MCPStatusPopoverViewController.swift

@@ -168,6 +168,8 @@ final class MCPStatusPopoverViewController: AppKitViewController<MCPStatusPopove
             portValueLabel.stringValue = "\(port)"
             actionButton.title = "Stop Server"
         }
+
+        preferredContentSize = view.fittingSize
     }
 
     // MARK: - Bindings