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

apps/macos/Sources/OpenClaw/ExecSystemRunCommandValidator.swift

@@ -39,30 +39,6 @@ enum ExecSystemRunCommandValidator {
     private static let posixInlineCommandFlags = Set(["-lc", "-c", "--command"])
     private static let powershellInlineCommandFlags = Set(["-c", "-command", "--command"])
 
-    private static let envOptionsWithValue = Set([
-        "-u",
-        "--unset",
-        "-c",
-        "--chdir",
-        "-s",
-        "--split-string",
-        "--default-signal",
-        "--ignore-signal",
-        "--block-signal",
-    ])
-    private static let envFlagOptions = Set(["-i", "--ignore-environment", "-0", "--null"])
-    private static let envInlineValuePrefixes = [
-        "-u",
-        "-c",
-        "-s",
-        "--unset=",
-        "--chdir=",
-        "--split-string=",
-        "--default-signal=",
-        "--ignore-signal=",
-        "--block-signal=",
-    ]
-
     private struct EnvUnwrapResult {
         let argv: [String]
         let usesModifiers: Bool
@@ -113,7 +89,7 @@ enum ExecSystemRunCommandValidator {
     }
 
     private static func hasEnvInlineValuePrefix(_ lowerToken: String) -> Bool {
-        self.envInlineValuePrefixes.contains { lowerToken.hasPrefix($0) }
+        ExecEnvOptions.inlineValuePrefixes.contains { lowerToken.hasPrefix($0) }
     }
 
     private static func unwrapEnvInvocationWithMetadata(_ argv: [String]) -> EnvUnwrapResult? {
@@ -148,12 +124,12 @@ enum ExecSystemRunCommandValidator {
 
             let lower = token.lowercased()
             let flag = lower.split(separator: "=", maxSplits: 1).first.map(String.init) ?? lower
-            if self.envFlagOptions.contains(flag) {
+                if ExecEnvOptions.flagOnly.contains(flag) {
                 usesModifiers = true
                 idx += 1
                 continue
             }
-            if self.envOptionsWithValue.contains(flag) {
+                if ExecEnvOptions.withValue.contains(flag) {
                 usesModifiers = true
                 if !lower.contains("=") {
                     expectsOptionValue = true
@@ -301,10 +277,15 @@ enum ExecSystemRunCommandValidator {
         return current
     }
 
-    private static func resolveInlineCommandTokenIndex(
+    private struct InlineCommandTokenMatch {
+        var tokenIndex: Int
+        var inlineCommand: String?
+    }
+
+    private static func findInlineCommandTokenMatch(
         _ argv: [String],
         flags: Set<String>,
-        allowCombinedC: Bool) -> Int?
+        allowCombinedC: Bool) -> InlineCommandTokenMatch?
     {
         var idx = 1
         while idx < argv.count {
@@ -318,21 +299,35 @@ enum ExecSystemRunCommandValidator {
                 break
             }
             if flags.contains(lower) {
-                return idx + 1 < argv.count ? idx + 1 : nil
+                return InlineCommandTokenMatch(tokenIndex: idx, inlineCommand: nil)
             }
             if allowCombinedC, let inlineOffset = self.combinedCommandInlineOffset(token) {
                 let inline = String(token.dropFirst(inlineOffset))
                     .trimmingCharacters(in: .whitespacesAndNewlines)
-                if !inline.isEmpty {
-                    return idx
-                }
-                return idx + 1 < argv.count ? idx + 1 : nil
+                return InlineCommandTokenMatch(
+                    tokenIndex: idx,
+                    inlineCommand: inline.isEmpty ? nil : inline)
             }
             idx += 1
         }
         return nil
     }
 
+    private static func resolveInlineCommandTokenIndex(
+        _ argv: [String],
+        flags: Set<String>,
+        allowCombinedC: Bool) -> Int?
+    {
+        guard let match = self.findInlineCommandTokenMatch(argv, flags: flags, allowCombinedC: allowCombinedC) else {
+            return nil
+        }
+        if match.inlineCommand != nil {
+            return match.tokenIndex
+        }
+        let nextIndex = match.tokenIndex + 1
+        return nextIndex < argv.count ? nextIndex : nil
+    }
+
     private static func combinedCommandInlineOffset(_ token: String) -> Int? {
         let chars = Array(token.lowercased())
         guard chars.count >= 2, chars[0] == "-", chars[1] != "-" else {
@@ -371,30 +366,14 @@ enum ExecSystemRunCommandValidator {
         flags: Set<String>,
         allowCombinedC: Bool) -> String?
     {
-        var idx = 1
-        while idx < argv.count {
-            let token = argv[idx].trimmingCharacters(in: .whitespacesAndNewlines)
-            if token.isEmpty {
-                idx += 1
-                continue
-            }
-            let lower = token.lowercased()
-            if lower == "--" {
-                break
-            }
-            if flags.contains(lower) {
-                return self.trimmedNonEmpty(idx + 1 < argv.count ? argv[idx + 1] : nil)
-            }
-            if allowCombinedC, let inlineOffset = self.combinedCommandInlineOffset(token) {
-                let inline = String(token.dropFirst(inlineOffset))
-                if let inlineValue = self.trimmedNonEmpty(inline) {
-                    return inlineValue
-                }
-                return self.trimmedNonEmpty(idx + 1 < argv.count ? argv[idx + 1] : nil)
-            }
-            idx += 1
+        guard let match = self.findInlineCommandTokenMatch(argv, flags: flags, allowCombinedC: allowCombinedC) else {
+            return nil
         }
-        return nil
+        if let inlineCommand = match.inlineCommand {
+            return inlineCommand
+        }
+        let nextIndex = match.tokenIndex + 1
+        return self.trimmedNonEmpty(nextIndex < argv.count ? argv[nextIndex] : nil)
     }
 
     private static func extractCmdInlineCommand(_ argv: [String]) -> String? {