chore: add swift helper

.npmrc

@@ -0,0 +1,3 @@
+# Standard hoisting configuration
+node-linker=hoisted
+shamefully-hoist=true

.vscode/launch.json

@@ -0,0 +1,40 @@
+{
+  "configurations": [
+    {
+      "type": "swift",
+      "request": "launch",
+      "args": [],
+      "cwd": "${workspaceFolder:amical}/packages/native-helpers/swift-helper",
+      "name": "Debug KeyTapHelper (packages/native-helpers/swift-helper)",
+      "program": "${workspaceFolder:amical}/packages/native-helpers/swift-helper/.build/debug/KeyTapHelper",
+      "preLaunchTask": "swift: Build Debug KeyTapHelper (packages/native-helpers/swift-helper)"
+    },
+    {
+      "type": "swift",
+      "request": "launch",
+      "args": [],
+      "cwd": "${workspaceFolder:amical}/packages/native-helpers/swift-helper",
+      "name": "Release KeyTapHelper (packages/native-helpers/swift-helper)",
+      "program": "${workspaceFolder:amical}/packages/native-helpers/swift-helper/.build/release/KeyTapHelper",
+      "preLaunchTask": "swift: Build Release KeyTapHelper (packages/native-helpers/swift-helper)"
+    },
+    {
+      "type": "swift",
+      "request": "launch",
+      "args": [],
+      "cwd": "${workspaceFolder:amical}/packages/native-helpers/swift-helper",
+      "name": "Debug SwiftHelper (packages/native-helpers/swift-helper)",
+      "program": "${workspaceFolder:amical}/packages/native-helpers/swift-helper/.build/debug/SwiftHelper",
+      "preLaunchTask": "swift: Build Debug SwiftHelper (packages/native-helpers/swift-helper)"
+    },
+    {
+      "type": "swift",
+      "request": "launch",
+      "args": [],
+      "cwd": "${workspaceFolder:amical}/packages/native-helpers/swift-helper",
+      "name": "Release SwiftHelper (packages/native-helpers/swift-helper)",
+      "program": "${workspaceFolder:amical}/packages/native-helpers/swift-helper/.build/release/SwiftHelper",
+      "preLaunchTask": "swift: Build Release SwiftHelper (packages/native-helpers/swift-helper)"
+    }
+  ]
+}

apps/electron/forge.config.ts

@@ -11,7 +11,7 @@ import { FuseV1Options, FuseVersion } from '@electron/fuses';
 const config: ForgeConfig = {
   packagerConfig: {
     asar: true,
-    extraResource: ['src/helper/bin'],
+    extraResource: ['../../packages/native-helpers/swift-helper/bin'],
     extendInfo: {
       NSMicrophoneUsageDescription: "This app needs access to your microphone to record audio for transcription.",
     },

apps/electron/package.json

@@ -5,9 +5,9 @@
   "description": "My Electron application description",
   "main": ".vite/build/main.js",
   "scripts": {
-    "start": "electron-forge start",
-    "package": "electron-forge package",
-    "make": "electron-forge make",
+    "start": "pnpm build:swift-helper && electron-forge start",
+    "package": "pnpm build:swift-helper && electron-forge package",
+    "make": "pnpm build:swift-helper && electron-forge make",
     "publish": "electron-forge publish",
     "lint": "eslint --ext .ts,.tsx .",
     "format": "prettier --write \"**/*.{js,jsx,ts,tsx,json,md}\"",
@@ -16,7 +16,9 @@
     "schema:generate-json": "tsx scripts/generate-json-schema.ts",
     "schema:generate-swift": "tsx scripts/generate-swift-models.js",
     "schema:generate-all": "pnpm schema:generate-json && pnpm schema:generate-swift",
-    "build:swift-helper": "pnpm schema:generate-all && swift build --package-path src/helper/swift/KeyTapHelper --configuration release && mkdir -p src/helper/bin && cp src/helper/swift/KeyTapHelper/.build/release/KeyTapHelper src/helper/bin/"
+    "build:swift-helper": "pnpm schema:generate-all && pnpm --filter @amical/swift-helper build",
+    "dev": "pnpm start",
+    "prepare": "pnpm build:swift-helper"
   },
   "keywords": [],
   "license": "MIT",
@@ -47,7 +49,7 @@
     "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-prettier": "^5.4.0",
     "prettier": "^3.5.3",
-    "quicktype": "^23.1.4",
+    "quicktype": "23.1.4",
     "tailwindcss": "^4.1.6",
     "tsx": "^4.19.4",
     "typescript": "~5.8.3",

apps/electron/scripts/generate-swift-models.ts

@@ -2,7 +2,7 @@ const { execSync } = require('child_process');
 const fs = require('fs');
 const path = require('path');
 
-const generatedDir = 'src/helper/swift/KeyTapHelper/Sources/KeyTapHelper/models/generated';
+const generatedDir = '../../packages/native-helpers/swift-helper/Sources/SwiftHelper/models/generated';
 
 try {
   // Remove existing generated models and create the directory
@@ -16,7 +16,7 @@ try {
   // Generate Swift models from JSON schemas using quicktype
   const commands = [
     'quicktype --src-lang schema --lang swift ' +
-      '-o src/helper/swift/KeyTapHelper/Sources/KeyTapHelper/models/generated/models.swift ' +
+      '-o ../../packages/native-helpers/swift-helper/Sources/SwiftHelper/models/generated/models.swift ' +
       'generated/schemas/helper-envelopes/rpc-request.schema.json ' +
       'generated/schemas/helper-envelopes/rpc-response.schema.json ' +
       'generated/schemas/helper-requests/get-accessibility-tree-details-params.schema.json ' +

apps/electron/src/main/swift-io-bridge.ts

@@ -71,18 +71,18 @@ export class SwiftIOBridge extends EventEmitter {
   }
 
   private determineHelperPath(): string {
-    const helperName = 'KeyTapHelper'; // Or your Swift executable name
+    const helperName = 'SwiftHelper'; // Swift native helper executable
     return electronApp.isPackaged
       ? path.join(process.resourcesPath, 'bin', helperName)
-      : path.join(electronApp.getAppPath(), 'src', 'helper', 'bin', helperName);
+      : path.join(electronApp.getAppPath(), '..', '..', 'packages', 'native-helpers', 'swift-helper', 'bin', helperName);
   }
 
   private startHelperProcess(): void {
     try {
       fs.accessSync(this.helperPath, fs.constants.X_OK);
     } catch (err) {
       console.error(
-        `SwiftIOBridge: KeyTapHelper executable not found or not executable at ${this.helperPath}.`
+        `SwiftIOBridge: SwiftHelper executable not found or not executable at ${this.helperPath}.`
       );
       this.emit(
         'error',
@@ -94,7 +94,7 @@ export class SwiftIOBridge extends EventEmitter {
       return;
     }
 
-    console.log(`SwiftIOBridge: Spawning KeyTapHelper from: ${this.helperPath}`);
+    console.log(`SwiftIOBridge: Spawning SwiftHelper from: ${this.helperPath}`);
     this.proc = spawn(this.helperPath, [], { stdio: ['pipe', 'pipe', 'pipe'] });
 
     this.proc.stdout.pipe(split2()).on('data', (line: string) => {
@@ -132,19 +132,19 @@ export class SwiftIOBridge extends EventEmitter {
 
     this.proc.stderr.on('data', (data: Buffer) => {
       const errorMsg = data.toString();
-      console.error(`SwiftIOBridge: KeyTapHelper stderr: ${errorMsg}`);
+      console.error(`SwiftIOBridge: SwiftHelper stderr: ${errorMsg}`);
       this.emit('error', new Error(`Helper stderr: ${errorMsg}`));
     });
 
     this.proc.on('error', (err) => {
-      console.error('SwiftIOBridge: Failed to start KeyTapHelper process:', err);
+      console.error('SwiftIOBridge: Failed to start SwiftHelper process:', err);
       this.emit('error', err);
       this.proc = null;
     });
 
     this.proc.on('close', (code, signal) => {
       console.log(
-        `SwiftIOBridge: KeyTapHelper process exited with code ${code} and signal ${signal}`
+        `SwiftIOBridge: SwiftHelper process exited with code ${code} and signal ${signal}`
       );
       this.emit('close', code, signal);
       this.proc = null;
@@ -236,7 +236,7 @@ export class SwiftIOBridge extends EventEmitter {
 
   public stopHelper(): void {
     if (this.proc) {
-      console.log('SwiftIOBridge: Stopping KeyTapHelper process...');
+      console.log('SwiftIOBridge: Stopping SwiftHelper process...');
       this.proc.kill();
       this.proc = null;
     }

package.json

@@ -13,8 +13,21 @@
     "turbo": "^2.5.3",
     "typescript": "5.8.2"
   },
-  "packageManager": "pnpm@9.0.0",
+  "packageManager": "pnpm@10.4.0",
   "engines": {
-    "node": ">=18"
+    "node": ">=24"
+  },
+  "pnpm": {
+    "ignoredBuiltDependencies": [
+      "@tailwindcss/oxide",
+      "better-sqlite3",
+      "core-js-pure",
+      "electron",
+      "electron-winstaller",
+      "esbuild",
+      "keytar",
+      "protobufjs",
+      "sharp"
+    ]
   }
 }

packages/native-helpers/swift-helper/.gitignore

@@ -0,0 +1,79 @@
+# Swift Package Manager
+.build/
+.swiftpm/
+Package.resolved
+
+# Built executables
+bin/
+*.app/
+*.ipa
+
+# Xcode
+*.xcodeproj/
+*.xcworkspace/
+*.xcuserdata/
+*.xccheckout
+*.moved-aside
+DerivedData/
+*.hmap
+*.ipa
+*.dSYM.zip
+*.dSYM
+
+# macOS
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+# Swift specific
+*.swiftdoc
+*.swiftmodule
+*.swiftsourceinfo
+
+# SPM Dependencies
+.swift-version
+
+# Turbo cache (for monorepo)
+.turbo/
+
+# IDE files
+.vscode/
+.idea/
+*.swp
+*.swo
+*~
+
+# Logs
+*.log
+
+# Coverage reports
+*.profdata
+*.profraw
+
+# Swift testing
+.coverage/
+
+# Generated files
+Sources/*/models/generated/ 

packages/native-helpers/swift-helper/Package.swift

@@ -0,0 +1,26 @@
+// swift-tools-version:5.3
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "SwiftHelper",
+    platforms: [
+        .macOS(.v10_15) // Set a deployment target, e.g., macOS 10.15 or later
+    ],
+    dependencies: [
+        // Dependencies declare other packages that this package depends on.
+        // .package(url: /* package url */, from: "1.0.0"),
+    ],
+    targets: [
+        // Targets are the basic building blocks of a package. A target can define a module or a test suite.
+        // Targets can depend on other targets in this package, and on products in packages this package depends on.
+        .target(
+            name: "SwiftHelper",
+            dependencies: [],
+            resources: [
+                .process("Resources") // This line tells SPM to copy the Resources folder
+            ]
+        )
+    ]
+)