Skip to content

Reduce duplicate native helpers #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
snbafana wants to merge 2 commits into
base: codex/cued-quality-03-no-op-api-cleanup
Choose a base branch
from
Open

Reduce duplicate native helpers #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee78e2b
Reduce duplicate native helpers
snbafana May 24, 2026
818b473
Reuse CLI JSON decoder for skill install
snbafana May 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 2 additions & 15 deletions native/macos/CuedNative/Sources/CuedNative/RootWindowController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -466,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()
Expand Down Expand Up @@ -872,10 +863,6 @@ final class RootWindowController: NSWindowController {
return !pendingLivePermissionKeys.isDisjoint(with: liveRefreshPermissionKeys)
}

private func trackLivePermissionRequests(flags: [String]) {
trackLivePermissionKeys(permissionKeys(for: flags))
}

private func trackLivePermissionKeys(_ keys: Set<String>) {
pendingLivePermissionKeys.formUnion(
keys.filter { liveRefreshPermissionKeys.contains($0) }
Expand Down
9 changes: 3 additions & 6 deletions native/macos/CuedNative/Sources/CuedNative/main.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
}
Expand Down
8 changes: 1 addition & 7 deletions native/macos/CuedNative/Sources/Interface/Root/RootDisplayHelpers.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,6 @@ let permissionOrder = [
"diagnostics",
]

let defaultPermissionOrder = [
"contacts",
"full_disk_access",
"diagnostics",
]

let platformOrder = [
"contacts",
"phone_calls",
Expand All @@ -27,7 +21,7 @@ let platformOrder = [
]

func defaultPermissionStatuses() -> [PermissionStatus] {
defaultPermissionOrder.compactMap { defaultPermissionStatus(for: $0) }
permissionOrder.compactMap { defaultPermissionStatus(for: $0) }
}

func defaultSkillStatus() -> SkillStatus {
Expand Down