Suggested changes. by johnno1962 · Pull Request #144 · johnno1962/InjectionNext

johnno1962 · 2026-04-21T08:43:17Z

Hi @maatheusgois-dd, These are some changes I'd like to make to the new code.

Copilot

Pull request overview

This PR extends InjectionNext’s client/server command protocol to support pushing configuration via environment variables at runtime, and updates the macOS app UI/behavior around Xcode launching, status display, and settings tooltips.

Changes:

Add a new InjectionSetenv command and implement handling to setenv/unsetenv in the Swift package client.
Send selected config values to connected clients (on connect and when settings change).
UI/UX tweaks across Settings + status menu (tooltips, labels), plus some Xcode monitoring and minor safety tweaks.

Reviewed changes

Copilot reviewed 22 out of 22 changed files in this pull request and generated 13 comments.

Show a summary per file

File	Description
Sources/InjectionNextC/include/SimpleSocket.h	Exposes `fdopenForMode:` on `SimpleSocket` for FILE stream creation.
Sources/InjectionNextC/include/InjectionClient.h	Adds `InjectionSetenv` to the shared command enum.
Sources/InjectionNextC/SimpleSocket.mm	Implements `fdopenForMode:`.
Sources/InjectionNext/InjectionNext.swift	Handles new `.setenv` command and improves unknown-command error text.
README.md	Clarifies linker flag is for `Debug`.
App/feedcommands/main.mm	Switches to `fdopenForMode:` helper for stream creation.
App/InjectionNext/Views/XcodeSettingsView.swift	Adds tooltips and updates “Xcode running” status presentation.
App/InjectionNext/Views/StatusMenuView.swift	Reorders menu items, adds tooltips, adjusts actions, removes selected-project UI.
App/InjectionNext/Views/InjectionSettingsView.swift	Removes the “Project Path” selection section from this view.
App/InjectionNext/Views/GeneralSettingsView.swift	Adds tooltips and switches status fields to “Launched Xcode”.
App/InjectionNext/Views/FileWatcherSettingsView.swift	Adds tooltips for pattern/latency controls.
App/InjectionNext/Views/DevicesSettingsView.swift	Adds tooltips and renames “Device Testing” section.
App/InjectionNext/Views/CompilerSettingsView.swift	Adds tooltip to compiler settings form.
App/InjectionNext/Views/BuildSystemSettingsView.swift	Adds tooltips to Bazel/xcrun controls.
App/InjectionNext/Views/AdvancedSettingsView.swift	Adds tooltip for verbose logging section.
App/InjectionNext/MonitorXcode.swift	Tracks “launched Xcode” state, blocks launching if Xcode already running, updates save hook.
App/InjectionNext/InjectionServer.swift	Sends env vars to newly connected clients.
App/InjectionNext/InjectionHybrid.swift	Uses configurable injectable regex; adjusts hybrid compiler behavior.
App/InjectionNext/Info.plist	Bumps build number.
App/InjectionNext/FrontendServer.swift	Makes `patchCompilerItem` update nil-safe.
App/InjectionNext/ConfigStore.swift	Adds env var propagation on setting changes; switches to “haveLaunchedXocde” flag; thread-handling tweak.
App/InjectionNext/AppDelegate.swift	Starts FrontendServer earlier when patched; changes log capture behavior; updates connection/UI state bridging.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-04-21T12:28:36Z

            Button {
-                selectProject()
+                AppDelegate.ui?.runXcode(self)
            } label: {


This change removes the only call site for selectProject() in this view, leaving the selectProject() helper unused (and potentially producing an "unused private function" warning depending on build settings). Either remove the dead code or reintroduce a UI action that uses it.

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Adds seven concrete backlog items under three new subsections in TODO.md's Next list. All discovered while running a maatheusgois-dd fork of 2.0_overhaul against real iOS / Bazel codebases. Hybrid / file-watcher - Allow file-watcher injection while Xcode is running (drop the MonitorXcode.runningXcode early-return in InjectionHybrid). - Skip SDK filter in log-parsing Recompiler when no client is connected (avoids grep SDKs/MacOSX misses for iOS projects edited before first device/sim connect). - Replace DispatchQueue.main.sync on pendingFilesChanged with an NSLock to avoid main-queue deadlocks during compile I/O. Developer tooling - Reuse already-running Xcode in AppDelegate.runXcode instead of Popen-launching a duplicate Xcode process (macOS single-instances Xcode.app, leaving runningXcode pointed at a dead pipe). - Top-level Makefile for local dev. - CI release workflow (.github/workflows/release.yml). Integrations / observability - Injection event tracker emitting structured events over the existing ControlServer for MCP / AI agent consumers. No source changes.

Copilot

Pull request overview

Copilot reviewed 25 out of 25 changed files in this pull request and generated 6 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot

Pull request overview

Copilot reviewed 25 out of 25 changed files in this pull request and generated 7 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-04-22T10:26:00Z

-                detail("SwiftTracing \(name)")
-                return autoBitCast(SwiftTrace.trace(name: name, original: injected)) ?? injected
+          + #"|InjectionBundle.|fast_dl"#
+        for name in [INJECTION_TRACE_LOOKUP, INJECTION_TRACE_LOOKUP, INJECTION_TRACE_FILTER,


tracingOptions() iterates over a list of env var names, but INJECTION_TRACE_LOOKUP appears twice. This is redundant and makes it easier to miss a variable that should be included.

Suggested change

for name in [INJECTION_TRACE_LOOKUP, INJECTION_TRACE_LOOKUP, INJECTION_TRACE_FILTER,

for name in [INJECTION_TRACE_LOOKUP, INJECTION_TRACE_FILTER,

Copilot · 2026-04-22T10:26:01Z

+                LabeledContent("Launched Xcode") {
                    HStack {
                        Circle()
-                            .fill(config.isXcodeRunning ? .green : .gray)
+                            .fill(config.haveLaunchedXcode ? .green : .gray)
                            .frame(width: 8, height: 8)
-                        Text(config.isXcodeRunning ? "Running" : "Not Running")
+                        Text(config.haveLaunchedXcode ? "Running" : "Not Running")
                    }
                }
+                .help("Was Xcode launched by this app")
                Button("Launch Xcode Now") {
                    AppDelegate.ui?.runXcode(self)
                }
-                .disabled(config.isXcodeRunning)
+                .disabled(config.haveLaunchedXcode)
+                .help("Launch Xcode if it isn’t already running")


The UI is using haveLaunchedXcode to display “Running/Not Running” and to disable the “Launch Xcode Now” button. haveLaunchedXcode is updated from MonitorXcode.runningXcode (i.e., only when Xcode was launched/monitored by this app), so if Xcode is already running externally MonitorXcode() will fail but this view will still show “Not Running” and keep the button enabled. Consider either (a) reflecting external Xcode state (e.g. MonitorXcode.externalXcode != nil) for the running indicator/disabled state, or (b) changing the text to avoid implying a process-running status.

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

johnno1962 · 2026-04-22T11:09:08Z

OK, after a flurry of last minute changes implementing the tracing options I've merged this PR and prepared a release candidate 2.0.0RC1. Over to you! You have control.

johnno1962 added 5 commits April 21, 2026 10:40

Suggested changes.

152aaf8

Debug only.

8ae418d

To discuss.

f31c17d

Compatibility.

ec3d144

Tweak titles.

d42ac3d

johnno1962 force-pushed the suggested-changes branch from e997eba to 3322218 Compare April 21, 2026 09:35

Tooltips, more environment vars.

6156955

johnno1962 force-pushed the suggested-changes branch from 3322218 to 6156955 Compare April 21, 2026 09:41

johnno1962 added 4 commits April 21, 2026 12:32

More Tooltips.

8b72919

Overdue for reuse.

f4eec93

Missed the boat reconstructing PR.

d64e83b

Is client Connected?

6e980c9

johnno1962 mentioned this pull request Apr 21, 2026

fix(launch): bail with error when another Xcode is already running #141

Closed

3 tasks

Disarm bear trap, FrontendServer needs to start first.

068bbfc

johnno1962 force-pushed the suggested-changes branch from a3c2df4 to 975b7c3 Compare April 21, 2026 12:06

Capturing logs was inhibiting my debug prints.

735801f

johnno1962 force-pushed the suggested-changes branch from 975b7c3 to 735801f Compare April 21, 2026 12:13

johnno1962 requested a review from Copilot April 21, 2026 12:19

Copilot started reviewing on behalf of johnno1962 April 21, 2026 12:19 View session

Copilot AI reviewed Apr 21, 2026

View reviewed changes

johnno1962 and others added 6 commits April 21, 2026 14:40

Update App/InjectionNext/Views/FileWatcherSettingsView.swift

c88f585

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Update App/InjectionNext/Views/BuildSystemSettingsView.swift

130f273

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Update App/InjectionNext/ConfigStore.swift

a7c60c2

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

D'oh

ff21627

Update App/InjectionNext/Views/XcodeSettingsView.swift

8e92360

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Change default arguments text.

d7282fa

johnno1962 force-pushed the suggested-changes branch from 469ace0 to d7282fa Compare April 21, 2026 12:50

johnno1962 and others added 3 commits April 21, 2026 15:07

Update App/InjectionNext/Views/StatusMenuView.swift

46641f0

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Update App/InjectionNext/Views/XcodeSettingsView.swift

5bb066f

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Update App/InjectionNext/AppDelegate.swift

fd973bd

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

More env vars, connected status.

5714dbf

johnno1962 force-pushed the suggested-changes branch 2 times, most recently from 642a800 to ef32835 Compare April 21, 2026 20:31

Tracing preferences.

9295705

johnno1962 force-pushed the suggested-changes branch from ef32835 to 9295705 Compare April 21, 2026 21:19

johnno1962 requested a review from Copilot April 22, 2026 07:04

Copilot started reviewing on behalf of johnno1962 April 22, 2026 07:04 View session

Copilot AI reviewed Apr 22, 2026

View reviewed changes

johnno1962 and others added 5 commits April 22, 2026 09:39

Update App/InjectionNext/Defaults.swift

985e359

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Update App/InjectionNext/Views/XcodeSettingsView.swift

ac7559a

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Update App/InjectionNext/Views/XcodeSettingsView.swift

982d7f6

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Update App/InjectionNext/ConfigStore.swift

821d6d4

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

For rellease

765220e

johnno1962 force-pushed the suggested-changes branch from 1cc5159 to 765220e Compare April 22, 2026 07:55

johnno1962 added 2 commits April 22, 2026 10:03

Reinstate project path further down pane.

8af79c5

UNSETENV_VALUE

f74a900

johnno1962 force-pushed the suggested-changes branch 4 times, most recently from 4027400 to 01694a5 Compare April 22, 2026 10:16

Consolidate.

1028341

johnno1962 force-pushed the suggested-changes branch from 01694a5 to 1028341 Compare April 22, 2026 10:16

johnno1962 requested a review from Copilot April 22, 2026 10:17

Copilot started reviewing on behalf of johnno1962 April 22, 2026 10:18 View session

Copilot AI reviewed Apr 22, 2026

View reviewed changes

johnno1962 and others added 2 commits April 22, 2026 12:28

Update App/InjectionNext/InjectionHybrid.swift

e4e358b

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Enough already.

941e3ea

johnno1962 merged commit b5eb2c6 into 2.0_overhaul Apr 22, 2026

	for name in [INJECTION_TRACE_LOOKUP, INJECTION_TRACE_LOOKUP, INJECTION_TRACE_FILTER,
	for name in [INJECTION_TRACE_LOOKUP, INJECTION_TRACE_FILTER,

Uh oh!

Conversation

johnno1962 commented Apr 21, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI Apr 21, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Copilot AI Apr 22, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Copilot AI Apr 22, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

johnno1962 commented Apr 22, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

johnno1962 commented Apr 22, 2026 •

edited

Loading