Skip to content

Commit 09e06b3

Browse files
lynnswaplynnswap
committed
refactor(proxy-cli): normalize PID naming
1 parent 739dada commit 09e06b3

8 files changed

Lines changed: 29 additions & 29 deletions

‎Sources/ProxyCLI/ProxyCLIInvocationScanner.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ package struct ProxyCLIServerScan {
1414
package var hasListenFlag = false
1515
package var hasHostFlag = false
1616
package var hasPortFlag = false
17-
package var hasXcodePidFlag = false
17+
package var hasXcodePIDFlag = false
1818
package var hasLazyInitFlag = false
1919
package var forceRestart = false
2020
package var dryRun = false
@@ -146,7 +146,7 @@ package enum ProxyCLIInvocationScanner {
146146
case "--port":
147147
scan.hasPortFlag = true
148148
case "--xcode-pid":
149-
scan.hasXcodePidFlag = true
149+
scan.hasXcodePIDFlag = true
150150
default:
151151
break
152152
}

‎Sources/ProxyCLI/ProxyServerCommandRuntime.swift‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ package struct ProxyServerCommandRuntime {
1515
dependencies.stdout(XcodeMCPProxyServerCommand.serverUsage())
1616
return 0
1717
}
18-
XcodeMCPProxyServerCommand.applyDefaults(
19-
from: environment,
20-
to: &options,
21-
resolveXcodePid: dependencies.resolveXcodePid,
22-
stderr: dependencies.stderr
23-
)
18+
XcodeMCPProxyServerCommand.applyDefaults(
19+
from: environment,
20+
to: &options,
21+
resolveXcodePID: dependencies.resolveXcodePID,
22+
stderr: dependencies.stderr
23+
)
2424

2525
let isDryRun = options.dryRun || XcodeMCPProxyServerCommand.isTruthy(environment["DRY_RUN"])
2626
if isDryRun {

‎Sources/ProxyCLI/XcodeMCPProxyServerCommand+Parsing.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ extension XcodeMCPProxyServerCommand {
1010
hasListenFlag: scan.hasListenFlag,
1111
hasHostFlag: scan.hasHostFlag,
1212
hasPortFlag: scan.hasPortFlag,
13-
hasXcodePidFlag: scan.hasXcodePidFlag,
13+
hasXcodePIDFlag: scan.hasXcodePIDFlag,
1414
hasLazyInitFlag: scan.hasLazyInitFlag,
1515
forceRestart: scan.forceRestart,
1616
dryRun: scan.dryRun
@@ -20,7 +20,7 @@ extension XcodeMCPProxyServerCommand {
2020
package static func applyDefaults(
2121
from environment: [String: String],
2222
to options: inout ProxyServerOptions,
23-
resolveXcodePid: () -> String?,
23+
resolveXcodePID: () -> String?,
2424
stderr: (String) -> Void
2525
) {
2626
if !options.hasListenFlag && !options.hasHostFlag && !options.hasPortFlag {
@@ -43,10 +43,10 @@ extension XcodeMCPProxyServerCommand {
4343
options.forwardedArgs += ["--port", "8765"]
4444
}
4545

46-
if !options.hasXcodePidFlag {
46+
if !options.hasXcodePIDFlag {
4747
if let explicit = nonEmpty(environment["XCODE_PID"]) ?? nonEmpty(environment["MCP_XCODE_PID"]) {
4848
options.forwardedArgs += ["--xcode-pid", explicit]
49-
} else if let resolved = resolveXcodePid() {
49+
} else if let resolved = resolveXcodePID() {
5050
options.forwardedArgs += ["--xcode-pid", resolved]
5151
} else {
5252
stderr("warning: Xcode PID not found; running without --xcode-pid.")

‎Sources/ProxyCLI/XcodeMCPProxyServerCommand+ProcessControl.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ extension XcodeMCPProxyServerCommand {
2020
return requested == actual
2121
}
2222

23-
static func resolveXcodePid() -> String? {
23+
static func resolveXcodePID() -> String? {
2424
if let pid = firstLine(runCommand("/usr/bin/pgrep", ["-x", "Xcode"])) {
2525
return pid
2626
}

‎Sources/ProxyCLI/XcodeMCPProxyServerCommand.swift‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ package struct ProxyServerOptions {
1010
package var hasListenFlag: Bool
1111
package var hasHostFlag: Bool
1212
package var hasPortFlag: Bool
13-
package var hasXcodePidFlag: Bool
13+
package var hasXcodePIDFlag: Bool
1414
package var hasLazyInitFlag: Bool
1515
package var forceRestart: Bool
1616
package var dryRun: Bool
@@ -21,7 +21,7 @@ package struct ProxyServerOptions {
2121
hasListenFlag: Bool,
2222
hasHostFlag: Bool,
2323
hasPortFlag: Bool,
24-
hasXcodePidFlag: Bool,
24+
hasXcodePIDFlag: Bool,
2525
hasLazyInitFlag: Bool,
2626
forceRestart: Bool,
2727
dryRun: Bool
@@ -31,7 +31,7 @@ package struct ProxyServerOptions {
3131
self.hasListenFlag = hasListenFlag
3232
self.hasHostFlag = hasHostFlag
3333
self.hasPortFlag = hasPortFlag
34-
self.hasXcodePidFlag = hasXcodePidFlag
34+
self.hasXcodePIDFlag = hasXcodePIDFlag
3535
self.hasLazyInitFlag = hasLazyInitFlag
3636
self.forceRestart = forceRestart
3737
self.dryRun = dryRun
@@ -54,7 +54,7 @@ package struct XcodeMCPProxyServerCommand {
5454
package var bootstrapLogging: ([String: String]) -> Void
5555
package var stdout: (String) -> Void
5656
package var stderr: (String) -> Void
57-
package var resolveXcodePid: () -> String?
57+
package var resolveXcodePID: () -> String?
5858
package var terminateExistingServer: (String, Int) -> Bool
5959
package var makeServer: (ProxyConfig) -> any ProxyServerCommandServer
6060
package var isAddressAlreadyInUse: (Error) -> Bool
@@ -64,7 +64,7 @@ package struct XcodeMCPProxyServerCommand {
6464
bootstrapLogging: @escaping ([String: String]) -> Void,
6565
stdout: @escaping (String) -> Void,
6666
stderr: @escaping (String) -> Void,
67-
resolveXcodePid: @escaping () -> String?,
67+
resolveXcodePID: @escaping () -> String?,
6868
terminateExistingServer: @escaping (String, Int) -> Bool,
6969
makeServer: @escaping (ProxyConfig) -> any ProxyServerCommandServer,
7070
isAddressAlreadyInUse: @escaping (Error) -> Bool,
@@ -73,7 +73,7 @@ package struct XcodeMCPProxyServerCommand {
7373
self.bootstrapLogging = bootstrapLogging
7474
self.stdout = stdout
7575
self.stderr = stderr
76-
self.resolveXcodePid = resolveXcodePid
76+
self.resolveXcodePID = resolveXcodePID
7777
self.terminateExistingServer = terminateExistingServer
7878
self.makeServer = makeServer
7979
self.isAddressAlreadyInUse = isAddressAlreadyInUse
@@ -85,7 +85,7 @@ package struct XcodeMCPProxyServerCommand {
8585
bootstrapLogging: ProxyLogging.bootstrap,
8686
stdout: { print($0) },
8787
stderr: { FileHandle.writeLine($0, to: .standardError) },
88-
resolveXcodePid: XcodeMCPProxyServerCommand.resolveXcodePid,
88+
resolveXcodePID: XcodeMCPProxyServerCommand.resolveXcodePID,
8989
terminateExistingServer: XcodeMCPProxyServerCommand.terminateExistingProxyServerIfNeeded,
9090
makeServer: { ProxyServer(config: $0) },
9191
isAddressAlreadyInUse: XcodeMCPProxyServerCommand.isAddressAlreadyInUse,

‎Tests/ProxyCLITests/ServerCommandIntegrationTests.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ struct ServerCommandIntegrationTests {
1212
bootstrapLogging: { _ in },
1313
stdout: { output.append($0) },
1414
stderr: { output.append($0) },
15-
resolveXcodePid: { "4321" },
15+
resolveXcodePID: { "4321" },
1616
terminateExistingServer: { _, _ in false },
1717
makeServer: { _ in IntegrationRecordingProxyServer() },
1818
isAddressAlreadyInUse: { _ in false },
@@ -41,7 +41,7 @@ struct ServerCommandIntegrationTests {
4141
bootstrapLogging: { _ in },
4242
stdout: { _ in },
4343
stderr: { _ in },
44-
resolveXcodePid: { "1234" },
44+
resolveXcodePID: { "1234" },
4545
terminateExistingServer: { host, port in
4646
restarted.append("\(host):\(port)")
4747
return true

‎Tests/ProxyCLITests/ServerCommandTests.swift‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ struct ServerCommandTests {
2828
hasListenFlag: false,
2929
hasHostFlag: false,
3030
hasPortFlag: false,
31-
hasXcodePidFlag: false,
31+
hasXcodePIDFlag: false,
3232
hasLazyInitFlag: false,
3333
forceRestart: false,
3434
dryRun: false
@@ -41,7 +41,7 @@ struct ServerCommandTests {
4141
"LAZY_INIT": "1",
4242
],
4343
to: &options,
44-
resolveXcodePid: { "4242" },
44+
resolveXcodePID: { "4242" },
4545
stderr: { _ in }
4646
)
4747

@@ -93,7 +93,7 @@ struct ServerCommandTests {
9393
bootstrapLogging: { _ in },
9494
stdout: { _ in },
9595
stderr: { _ in },
96-
resolveXcodePid: { "1234" },
96+
resolveXcodePID: { "1234" },
9797
terminateExistingServer: { host, port in
9898
restarted.append("\(host):\(port)")
9999
return true
@@ -132,7 +132,7 @@ struct ServerCommandTests {
132132
bootstrapLogging: { _ in },
133133
stdout: { output.append($0) },
134134
stderr: { output.append($0) },
135-
resolveXcodePid: { "5678" },
135+
resolveXcodePID: { "5678" },
136136
terminateExistingServer: { _, _ in false },
137137
makeServer: { _ in RecordingProxyServer() },
138138
isAddressAlreadyInUse: { _ in false },
@@ -164,7 +164,7 @@ struct ServerCommandTests {
164164
bootstrapLogging: { _ in },
165165
stdout: { output.append($0) },
166166
stderr: { errors.append($0) },
167-
resolveXcodePid: { "7777" },
167+
resolveXcodePID: { "7777" },
168168
terminateExistingServer: { _, _ in false },
169169
makeServer: { _ in RecordingProxyServer() },
170170
isAddressAlreadyInUse: { _ in false },
@@ -197,7 +197,7 @@ struct ServerCommandTests {
197197
bootstrapLogging: { _ in },
198198
stdout: { output.append($0) },
199199
stderr: { errors.append($0) },
200-
resolveXcodePid: { "7777" },
200+
resolveXcodePID: { "7777" },
201201
terminateExistingServer: { _, _ in false },
202202
makeServer: { _ in RecordingProxyServer() },
203203
isAddressAlreadyInUse: { _ in false },

‎Tests/ProxyIntegrationTests/DiscoveryTests.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ struct DiscoveryTests {
4343
#expect(Discovery.read(overrideURL: url) == nil)
4444
}
4545

46-
@Test func discoveryRejectsDeadPid() async throws {
46+
@Test func discoveryRejectsDeadPID() async throws {
4747
let url = makeTempDiscoveryURL()
4848
defer { cleanupTempDiscoveryURL(url) }
4949
let record = DiscoveryRecord(

0 commit comments

Comments
 (0)