From ee78e2bfd2175c6d49f7bedd7111a68c13bfa65c Mon Sep 17 00:00:00 2001 From: Soham Bafana Date: Sun, 24 May 2026 13:12:31 -0400 Subject: [PATCH 1/2] Reduce duplicate native helpers --- .../Sources/CuedNative/RootWindowController.swift | 10 +--------- native/macos/CuedNative/Sources/CuedNative/main.swift | 9 +++------ .../Sources/Interface/Root/RootDisplayHelpers.swift | 8 +------- 3 files changed, 5 insertions(+), 22 deletions(-) diff --git a/native/macos/CuedNative/Sources/CuedNative/RootWindowController.swift b/native/macos/CuedNative/Sources/CuedNative/RootWindowController.swift index 2d73e3d4..790cdc1b 100644 --- a/native/macos/CuedNative/Sources/CuedNative/RootWindowController.swift +++ b/native/macos/CuedNative/Sources/CuedNative/RootWindowController.swift @@ -278,11 +278,7 @@ final class RootWindowController: NSWindowController { guard let result = daemonSupervisor.runCLI(arguments: arguments) else { return nil } - guard result.status == 0, - let data = result.stdout.data(using: .utf8) else { - return nil - } - return try? JSONDecoder().decode(type, from: data) + return decodeCLIJSON(type, status: result.status, stdout: result.stdout) } private nonisolated static func fastRootSnapshot( @@ -872,10 +868,6 @@ final class RootWindowController: NSWindowController { return !pendingLivePermissionKeys.isDisjoint(with: liveRefreshPermissionKeys) } - private func trackLivePermissionRequests(flags: [String]) { - trackLivePermissionKeys(permissionKeys(for: flags)) - } - private func trackLivePermissionKeys(_ keys: Set) { pendingLivePermissionKeys.formUnion( keys.filter { liveRefreshPermissionKeys.contains($0) } diff --git a/native/macos/CuedNative/Sources/CuedNative/main.swift b/native/macos/CuedNative/Sources/CuedNative/main.swift index f87cb64d..a17196c1 100644 --- a/native/macos/CuedNative/Sources/CuedNative/main.swift +++ b/native/macos/CuedNative/Sources/CuedNative/main.swift @@ -8,9 +8,6 @@ import WebKit private let appleEpochOffset = 978_307_200 nonisolated(unsafe) private let sqliteTransient = unsafeBitCast(-1, to: sqlite3_destructor_type.self) -private let defaultMessagesDBPath = - FileManager.default.homeDirectoryForCurrentUser - .appendingPathComponent("Library/Messages/chat.db").path private let defaultCallHistoryDBPath = FileManager.default.homeDirectoryForCurrentUser .appendingPathComponent("Library/Application Support/CallHistoryDB/CallHistory.storedata").path @@ -84,18 +81,18 @@ struct IMessageSyncBatch: Encodable { } struct IMessageDumpOptions { - var dbPath: String = defaultMessagesDBPath + var dbPath: String = appMessagesDBPath var afterRowID = 0 var limit = 500 } struct IMessageWatchOptions { - var dbPath: String = defaultMessagesDBPath + var dbPath: String = appMessagesDBPath } struct CallHistoryDumpOptions { var dbPath: String = defaultCallHistoryDBPath - var chatDBPath: String = defaultMessagesDBPath + var chatDBPath: String = appMessagesDBPath var afterPK = 0 var limit = 500 } diff --git a/native/macos/CuedNative/Sources/Interface/Root/RootDisplayHelpers.swift b/native/macos/CuedNative/Sources/Interface/Root/RootDisplayHelpers.swift index 17864672..4b60a088 100644 --- a/native/macos/CuedNative/Sources/Interface/Root/RootDisplayHelpers.swift +++ b/native/macos/CuedNative/Sources/Interface/Root/RootDisplayHelpers.swift @@ -8,12 +8,6 @@ let permissionOrder = [ "diagnostics", ] -let defaultPermissionOrder = [ - "contacts", - "full_disk_access", - "diagnostics", -] - let platformOrder = [ "contacts", "phone_calls", @@ -27,7 +21,7 @@ let platformOrder = [ ] func defaultPermissionStatuses() -> [PermissionStatus] { - defaultPermissionOrder.compactMap { defaultPermissionStatus(for: $0) } + permissionOrder.compactMap { defaultPermissionStatus(for: $0) } } func defaultSkillStatus() -> SkillStatus { From 818b473cafc2434068aeb6747d72ee9ed41d6d06 Mon Sep 17 00:00:00 2001 From: Soham Bafana Date: Mon, 25 May 2026 20:26:47 -0400 Subject: [PATCH 2/2] Reuse CLI JSON decoder for skill install --- .../Sources/CuedNative/RootWindowController.swift | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/native/macos/CuedNative/Sources/CuedNative/RootWindowController.swift b/native/macos/CuedNative/Sources/CuedNative/RootWindowController.swift index 790cdc1b..d0548ce9 100644 --- a/native/macos/CuedNative/Sources/CuedNative/RootWindowController.swift +++ b/native/macos/CuedNative/Sources/CuedNative/RootWindowController.swift @@ -462,12 +462,7 @@ final class RootWindowController: NSWindowController { daemonSupervisor.runCLI(arguments: ["skill", "install-global"]) }.value let installResult: SkillInstallResponse? = - installCommandResult.flatMap { result in - guard result.status == 0, let data = result.stdout.data(using: .utf8) else { - return nil - } - return try? JSONDecoder().decode(SkillInstallResponse.self, from: data) - } + installCommandResult.flatMap { decodeCLIJSON(SkillInstallResponse.self, status: $0.status, stdout: $0.stdout) } let installFailed = ((installCommandResult?.status ?? 1) != 0 || installResult?.ok == false) refresh()