github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-04-30 01:38:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(macos): dedupe UI, pairing, and runtime helpers

Browse Source
This commit is contained in:
Peter Steinberger
2026-03-02 11:32:04 +00:00
parent cd011897d0
commit cf67e374c0
92 changed files with 1769 additions and 1802 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
apps/macos/Sources/OpenClawMacCLI/WizardCommand.swift
View File

@@ -23,17 +23,17 @@ struct WizardCliOptions {
case "--json":
opts.json = true
case "--url":
opts.url = self.nextValue(args, index: &i)
opts.url = CLIArgParsingSupport.nextValue(args, index: &i)
case "--token":
opts.token = self.nextValue(args, index: &i)
opts.token = CLIArgParsingSupport.nextValue(args, index: &i)
case "--password":
opts.password = self.nextValue(args, index: &i)
opts.password = CLIArgParsingSupport.nextValue(args, index: &i)
case "--mode":
if let value = nextValue(args, index: &i) {
if let value = CLIArgParsingSupport.nextValue(args, index: &i) {
opts.mode = value
}
case "--workspace":
opts.workspace = self.nextValue(args, index: &i)
opts.workspace = CLIArgParsingSupport.nextValue(args, index: &i)
default:
break
}
@@ -41,12 +41,6 @@ struct WizardCliOptions {
}
return opts
}
private static func nextValue(_ args: [String], index: inout Int) -> String? {
guard index + 1 < args.count else { return nil }
index += 1
return args[index].trimmingCharacters(in: .whitespacesAndNewlines)
}
}
enum WizardCliError: Error, CustomStringConvertible {
@@ -338,8 +332,7 @@ actor GatewayWizardClient {
let frame = try await self.decodeFrame(message)
if case let .event(evt) = frame, evt.event == "connect.challenge",
let payload = evt.payload?.value as? [String: ProtoAnyCodable],
let nonce = payload["nonce"]?.value as? String,
nonce.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == false
let nonce = GatewayConnectChallengeSupport.nonce(from: payload)
{
return nonce
}