public void putAll(String values) {
        if (values == null || values.isEmpty()) return;
        String[] parts = values.split(" ");
        for (String part : parts) {
            int index = part.indexOf("=");
            if (part.isEmpty() || index < 1) continue;
            String name = part.substring(0, index);
            String value = part.substring(index+1);
            data.put(name, value);
        }

Verify each finding against the current code and only fix it if needed.

Outside diff comments:
In `@app/src/main/java/com/winlator/core/envvars/EnvVars.java`:
- Around line 21-29: The current putAll method in EnvVars.java corrupts values
containing spaces because it splits on plain spaces; update the parser to match
a safe serializer used by EnvironmentTab.kt (do not split on spaces inside
quoted values or escaped spaces) or switch to a structured format (e.g., JSON,
Properties, or newline-separated key=value) and parse that instead;
specifically, change putAll(String values) so it decodes the same escaped/quoted
format that the corresponding envVars.toString() produces and then call
data.put(name, value) with the correctly unescaped full value for each parsed
token.

Check if these issues are valid — if so, understand the root cause of each and fix them. If appropriate, use sub-agents to investigate and fix each issue separately.


<file name="app/src/main/java/app/gamenative/ui/component/dialog/EnvironmentTab.kt">

<violation number="1" location="app/src/main/java/app/gamenative/ui/component/dialog/EnvironmentTab.kt:163">
P2: Value field trims on every keystroke, causing incorrect/unnatural entry of spaced env var values.</violation>
</file>

<file name="app/src/main/java/com/winlator/core/envvars/EnvVars.java">

<violation number="1" location="app/src/main/java/com/winlator/core/envvars/EnvVars.java:26">
P2: The new guard prevents crashes on space-containing values but introduces silent data corruption: `putAll` splits on `" "`, so a value like `DXVK_HUD=fps, frametimes` becomes tokens `DXVK_HUD=fps,` and `frametimes`. The second token has no `=` and is now silently skipped, truncating the stored value. The `.trim()` calls in the UI prevent users from *typing* spaces, but `putAll` can still receive space-containing strings from previously-persisted data or programmatic callers. Consider using an escape-aware delimiter (e.g., storing/splitting on a character that doesn't appear in values, or escaping spaces) so round-tripping is lossless.</violation>
</file>

Verify each finding against the current code and only fix it if needed.

Inline comments:
In `@app/src/main/java/app/gamenative/utils/ContainerUtils.kt`:
- Around line 1326-1337: The code claims to "prepend" auto-detected overrides
but builds the env value as "$existing;$toPrepend" which appends; change the
construction to place the new entries before existing (i.e.
"$toPrepend;$existing") when calling containerEnvVars.put("WINEDLLOVERRIDES",
...), and optionally rename `toPrepend` or update the inline comment near the
`containerEnvVars.put` usage so the variable name, comment and behavior match;
keep the filtering via `existingEntries` and still set `updated = true` as
currently done.
- Around line 991-995: getOrCreateContainer currently calls
autoApplyInputDllOverrides every time, causing auto-added WINEDLLOVERRIDES to be
re-applied after a user deletes them; change the flow to make this a one-time
migration by persisting a container extra flag (e.g.,
"inputDllOverridesAutoApplied") on the Container object: before calling
autoApplyInputDllOverrides in getOrCreateContainer check
container.getExtra("inputDllOverridesAutoApplied") and skip if true; after
autoApplyInputDllOverrides completes successfully set
container.setExtra("inputDllOverridesAutoApplied", true) and persist the
container; keep the existing dedup logic (the DLL-name match) but ensure the
flag prevents re-running the migration.

---

Nitpick comments:
In `@app/src/main/java/app/gamenative/utils/ContainerUtils.kt`:
- Around line 1351-1367: The function scanForInputDlls currently descends into
directories without skipping symlinks which can cause redundant I/O and
duplicate discovery; update the directory-branch to skip symlinked directories
by checking FileUtils.isSymlink(file) (same approach as scanExecutablesInADrive)
before recursing into scanForInputDlls(file, targetNames, found, maxDepth,
currentDepth + 1), ensuring symlinked directories are ignored and preserving the
existing maxDepth and found behavior.

Check if these issues are valid — if so, understand the root cause of each and fix them. If appropriate, use sub-agents to investigate and fix each issue separately.


<file name="app/src/main/java/app/gamenative/utils/ContainerUtils.kt">

<violation number="1" location="app/src/main/java/app/gamenative/utils/ContainerUtils.kt:993">
P2: This function runs unconditionally on every container creation/launch. If a user manually removes an auto-detected DLL override (e.g., because `dinput8=n,b` breaks their game), it will be silently re-added on the next launch with no way to opt out. Consider persisting a flag (e.g., `inputDllOverridesAutoApplied`) after the first successful apply so this behaves as a one-time migration rather than a recurring forced override.</violation>

<violation number="2" location="app/src/main/java/app/gamenative/utils/ContainerUtils.kt:1334">
P3: The variable name `toPrepend` and the comment say "prepend auto-detected overrides in front", but `"$existing;$toPrepend"` actually appends the new entries after existing ones. Either rename to `toAppend` and fix the comment, or swap the order to match the stated intent.</violation>

<violation number="3" location="app/src/main/java/app/gamenative/utils/ContainerUtils.kt:1363">
P2: Recursive DLL scanning recurses into directories without skipping symlinks, unlike the existing executable scan, which can cause unintended traversal/performance regressions in linked game folders.</violation>
</file>