Sprint 5: route audio through in-process plugin for SAFE plugins

NEXT PUSH:
TASK: Pro-Q 4 spectrum analyzer fix — audio now flows through in-process instance
FILES CHANGING:
- PluginBridgeProcessor.cpp (processBlock routing + prepareToPlay in loadInProcessPlugin)
FILES NOT TOUCHING:
- PluginBridgeEditor.mm ✅
- PluginPickerComponent.mm ✅
- HelperPluginHost.mm ✅
- HelperConnection.cpp ✅
NEW FILES: none
APIS USED:
- inProcessPlugin->processBlock() — verified (AudioProcessor inheritance)
- inProcessPlugin->prepareToPlay() — verified safe (only SAFE plugins reach here)

Changes:
1. loadInProcessPlugin(): added prepareToPlay(currentSampleRate, currentBlockSize)
after setBusesLayout(), before state restore + addListener()
2. processBlock(): named MidiBuffer param, added in-process audio path:
if inProcessPlugin exists → processBlock directly (skips Helper shm)
else → existing Helper shm path unchanged
3. AudioAnalyser runs on the output regardless of which path is used"

Source/Plugin/PluginBridgeProcessor.cpp

@@ -31,8 +31,6 @@ PluginBridgeProcessor::PluginBridgeProcessor()
     {
         PBLOG("Processor", "⚠️  Helper crashed — clearing plugin state");
 
-        // Mark the crashing plugin as unsafe so it loads audio-only next time
-        // instead of respawning a Helper that will crash again.
         if (pluginPath.isNotEmpty())
         {
             PBLOG("Processor", "⚠️  Marking \"" + pluginName + "\" as UNSAFE (Helper crash)");
@@ -62,7 +60,6 @@ PluginBridgeProcessor::PluginBridgeProcessor()
         });
     };
 
-    // Wire audio analysis to MCP get_analysis tool
     mcpServer->getAnalysisCallback = [this]() { return analyser.getCompactAnalysis(); };
 
     mcpServer->start();
@@ -86,6 +83,13 @@ void PluginBridgeProcessor::prepareToPlay(double sampleRate, int samplesPerBlock
 
     analyser.prepareToPlay(sampleRate, samplesPerBlock);
 
+    // If in-process plugin is already loaded, update its sample rate/block size too
+    if (inProcessPlugin)
+    {
+        inProcessPlugin->releaseResources();
+        inProcessPlugin->prepareToPlay(sampleRate, samplesPerBlock);
+    }
+
     if (helper.isHelperRunning())
     {
         json cmd = {{"cmd", "configure"},
@@ -106,14 +110,25 @@ void PluginBridgeProcessor::prepareToPlay(double sampleRate, int samplesPerBlock
 
 void PluginBridgeProcessor::releaseResources() {}
 
-void PluginBridgeProcessor::processBlock(juce::AudioBuffer<float>& buffer, juce::MidiBuffer&)
+void PluginBridgeProcessor::processBlock(juce::AudioBuffer<float>& buffer, juce::MidiBuffer& midiMessages)
 {
     juce::ScopedNoDenormals noDenormals;
 
     for (auto i = getTotalNumInputChannels(); i < getTotalNumOutputChannels(); ++i)
         buffer.clear(i, 0, buffer.getNumSamples());
 
-    if (!pluginLoaded || !helper.isHelperRunning()) return;
+    if (!pluginLoaded) return;
+
+    // ── SAFE plugin path: audio goes through in-process instance ──────────────
+    if (inProcessPlugin != nullptr)
+    {
+        inProcessPlugin->processBlock(buffer, midiMessages);
+        analyser.processBlock(buffer);
+        return;
+    }
+
+    // ── UNSAFE plugin path: audio goes through Helper via shared memory ───────
+    if (!helper.isHelperRunning()) return;
 
     auto& shm = helper.getSharedAudio();
     if (!shm.isValid()) return;
@@ -151,7 +166,7 @@ juce::AudioProcessorEditor* PluginBridgeProcessor::createEditor()
     return new PluginBridgeEditor(*this);
 }
 
-// ── In-process plugin (GUI instance) ─────────────────────────────────────────
+// ── In-process plugin (now handles BOTH audio + GUI for SAFE plugins) ─────────
 
 void PluginBridgeProcessor::loadInProcessPlugin(const juce::String& path)
 {
@@ -195,11 +210,7 @@ void PluginBridgeProcessor::loadInProcessPlugin(const juce::String& path)
         return;
     }
 
-    // Bus layout — needed so the plugin knows its I/O configuration for GUI display.
-    // We do NOT call prepareToPlay() — the in-process plugin is GUI-only and never
-    // processes audio. Calling prepareToPlay() causes some plugins (iZotope Neutron,
-    // inter-plugin comms plugins) to spin up internal audio threads that then race
-    // with unloadInProcessPlugin() and crash the audio thread.
+    // Configure buses
     inProcessPlugin->enableAllBuses();
     auto layout = juce::AudioProcessor::BusesLayout();
     layout.inputBuses.add(juce::AudioChannelSet::stereo());
@@ -207,6 +218,11 @@ void PluginBridgeProcessor::loadInProcessPlugin(const juce::String& path)
     if (inProcessPlugin->checkBusesLayoutSupported(layout))
         inProcessPlugin->setBusesLayout(layout);
 
+    // Prepare for audio processing — safe for SAFE plugins (unsafe ones never reach here)
+    if (currentSampleRate > 0 && currentBlockSize > 0)
+        inProcessPlugin->prepareToPlay(currentSampleRate, currentBlockSize);
+
+    // Sync state from Helper (if it has state loaded already)
     auto response = helper.sendCommand("{\"cmd\":\"get_state\"}");
     try {
         auto j = json::parse(response);
@@ -223,8 +239,8 @@ void PluginBridgeProcessor::loadInProcessPlugin(const juce::String& path)
     } catch (...) {}
 
     inProcessPlugin->addListener(this);
-    PBLOG("Processor", "loadInProcessPlugin: SUCCESS — \"" + inProcessPlugin->getName() + "\"");
-    DBG("PluginBridgeProcessor: in-process plugin loaded for GUI: " + inProcessPlugin->getName());
+    PBLOG("Processor", "loadInProcessPlugin: SUCCESS — \"" + inProcessPlugin->getName() + "\" (audio+GUI)");
+    DBG("PluginBridgeProcessor: in-process plugin loaded: " + inProcessPlugin->getName());
 }
 
 void PluginBridgeProcessor::unloadInProcessPlugin()
@@ -266,7 +282,6 @@ void PluginBridgeProcessor::loadPlugin(const juce::String& path)
         return;
     }
 
-    // ── Safety check ──────────────────────────────────────────────────────────
     auto safety = safetyDB.getSafety(path);
     PBLOG("Processor", juce::String("loadPlugin: safety = ")
           + (safety == PluginSafetyDB::Safety::Safe    ? "SAFE"
@@ -286,15 +301,12 @@ void PluginBridgeProcessor::loadPlugin(const juce::String& path)
         return;
     }
 
-    // ── Notify editor to detach BEFORE we tear down the old plugin ────────────
-    // This prevents use-after-free when switching between plugins.
     if (onPluginWillLoad)
     {
         PBLOG("Processor", "loadPlugin: firing onPluginWillLoad → editor will detach old GUI");
         onPluginWillLoad();
     }
 
-    // ── Start Helper ──────────────────────────────────────────────────────────
     if (!helper.isHelperRunning())
     {
         PBLOG("Processor", "loadPlugin: Helper not running — spawning");
@@ -353,7 +365,7 @@ void PluginBridgeProcessor::loadPlugin(const juce::String& path)
             PBLOG("Processor", "loadPlugin: ❌ Helper refused load: "
                   + juce::String(j.value("error", "unknown")));
             pluginLoaded = false;
-            pluginPath.clear();   // prevent onHelperCrashed stamping the wrong plugin
+            pluginPath.clear();
             blocklist.addBlocked(path);
             if (onLoadFailed)
                 onLoadFailed("Not compatible: " + juce::String(j.value("error", "unknown")));
@@ -363,7 +375,7 @@ void PluginBridgeProcessor::loadPlugin(const juce::String& path)
     {
         PBLOG("Processor", "loadPlugin: ❌ exception parsing Helper response");
         pluginLoaded = false;
-        pluginPath.clear();       // prevent onHelperCrashed stamping the wrong plugin
+        pluginPath.clear();
         blocklist.addBlocked(path);
         if (onLoadFailed) onLoadFailed("Helper communication error");
     }
@@ -389,9 +401,6 @@ void PluginBridgeProcessor::unloadPlugin()
 }
 
 // ── Plugin Scanner ────────────────────────────────────────────────────────────
-// Spawns Helper with --scan <path> in an isolated subprocess.
-// stderr is piped back so we capture every step the scanner logged.
-// If the plugin crashes the subprocess, waitpid() catches WTERMSIG. Ableton is safe.
 
 static juce::String signalName(int sig)
 {
@@ -407,14 +416,11 @@ static juce::String signalName(int sig)
     }
 }
 
-static void writeScanLog(const juce::String& pluginPath,
-                         bool safe,
-                         const juce::String& reason,
-                         const juce::String& captured)
+static void writeScanLog(const juce::String& pluginPath, bool safe,
+                         const juce::String& reason, const juce::String& captured)
 {
     auto logFile = juce::File::getSpecialLocation(juce::File::userApplicationDataDirectory)
-                       .getChildFile("PluginBridge")
-                       .getChildFile("scan.log");
+                       .getChildFile("PluginBridge").getChildFile("scan.log");
     logFile.getParentDirectory().createDirectory();
 
     auto ts   = juce::Time::getCurrentTime().formatted("%Y-%m-%d %H:%M:%S");
@@ -425,39 +431,29 @@ static void writeScanLog(const juce::String& pluginPath,
           << ts << "  " << name << "\n"
           << "Path   : " << pluginPath << "\n"
           << "Result : " << (safe ? "SAFE ✓" : "UNSAFE ✗") << "\n";
-
-    if (!reason.isEmpty())
-        entry << "Reason : " << reason << "\n";
-
+    if (!reason.isEmpty()) entry << "Reason : " << reason << "\n";
     if (captured.isNotEmpty())
     {
         entry << "Scanner output:\n";
         for (auto& line : juce::StringArray::fromLines(captured))
-            if (line.isNotEmpty())
-                entry << "  " << line << "\n";
+            if (line.isNotEmpty()) entry << "  " << line << "\n";
     }
-
     entry << "\n";
     logFile.appendText(entry);
 }
 
 bool PluginBridgeProcessor::runPluginScan(const juce::String& path)
 {
-    // Resolve Helper binary (same logic as HelperConnection::spawnHelper)
     auto helperApp = juce::File::getSpecialLocation(juce::File::currentExecutableFile)
-                         .getParentDirectory()
-                         .getParentDirectory()
-                         .getChildFile("Resources")
-                         .getChildFile("PluginBridgeHelper.app")
-                         .getChildFile("Contents")
-                         .getChildFile("MacOS")
+                         .getParentDirectory().getParentDirectory()
+                         .getChildFile("Resources").getChildFile("PluginBridgeHelper.app")
+                         .getChildFile("Contents").getChildFile("MacOS")
                          .getChildFile(PluginBridgeConstants::kHelperBinaryName);
 
     if (!helperApp.exists())
     {
         helperApp = juce::File::getSpecialLocation(juce::File::currentExecutableFile)
-                        .getParentDirectory()
-                        .getParentDirectory()
+                        .getParentDirectory().getParentDirectory()
                         .getChildFile("Resources")
                         .getChildFile(PluginBridgeConstants::kHelperBinaryName);
     }
@@ -468,36 +464,25 @@ bool PluginBridgeProcessor::runPluginScan(const juce::String& path)
         return false;
     }
 
-    // Create pipe to capture scanner's stderr
     int pipeFd[2];
-    if (pipe(pipeFd) != 0)
-    {
-        writeScanLog(path, false, "pipe() failed", {});
-        return false;
-    }
-    // Make read end non-blocking so we can drain it safely
+    if (pipe(pipeFd) != 0) { writeScanLog(path, false, "pipe() failed", {}); return false; }
     fcntl(pipeFd[0], F_SETFL, O_NONBLOCK);
 
     auto helperPathStr = helperApp.getFullPathName().toStdString();
     auto pluginPathStr = path.toStdString();
 
-    // Redirect child stderr → pipe write end
     posix_spawn_file_actions_t actions;
     posix_spawn_file_actions_init(&actions);
     posix_spawn_file_actions_adddup2(&actions, pipeFd[1], STDERR_FILENO);
     posix_spawn_file_actions_addclose(&actions, pipeFd[0]);
 
     pid_t pid;
-    char* argv[] = {
-        (char*)helperPathStr.c_str(),
-        (char*)"--scan",
-        (char*)pluginPathStr.c_str(),
-        nullptr
-    };
+    char* argv[] = { (char*)helperPathStr.c_str(), (char*)"--scan",
+                     (char*)pluginPathStr.c_str(), nullptr };
 
     int spawnResult = posix_spawn(&pid, helperPathStr.c_str(), &actions, nullptr, argv, environ);
     posix_spawn_file_actions_destroy(&actions);
-    close(pipeFd[1]); // Parent never writes
+    close(pipeFd[1]);
 
     if (spawnResult != 0)
     {
@@ -506,10 +491,8 @@ bool PluginBridgeProcessor::runPluginScan(const juce::String& path)
         return false;
     }
 
-    // Poll with 10s timeout
     bool timedOut = true;
-    int  finalStatus = 0;
-
+    int finalStatus = 0;
     auto deadline = std::chrono::steady_clock::now() + std::chrono::seconds(10);
     while (std::chrono::steady_clock::now() < deadline)
     {
@@ -518,54 +501,25 @@ bool PluginBridgeProcessor::runPluginScan(const juce::String& path)
         std::this_thread::sleep_for(std::chrono::milliseconds(100));
     }
 
-    if (timedOut)
-    {
-        kill(pid, SIGKILL);
-        waitpid(pid, &finalStatus, 0);
-    }
+    if (timedOut) { kill(pid, SIGKILL); waitpid(pid, &finalStatus, 0); }
 
-    // Drain pipe — read whatever the scanner managed to write before dying
     juce::String captured;
-    {
-        char buf[8192];
-        ssize_t n;
-        while ((n = read(pipeFd[0], buf, sizeof(buf) - 1)) > 0)
-        {
-            buf[n] = '\0';
-            captured += buf;
-        }
-    }
+    { char buf[8192]; ssize_t n;
+      while ((n = read(pipeFd[0], buf, sizeof(buf)-1)) > 0) { buf[n]='\0'; captured += buf; } }
     close(pipeFd[0]);
 
-    // Interpret result
     bool safe = false;
     juce::String reason;
-
-    if (timedOut)
-    {
-        reason = "Timed out after 10s (hung on load or init)";
-    }
-    else if (WIFEXITED(finalStatus))
-    {
-        int code = WEXITSTATUS(finalStatus);
-        safe   = (code == 0);
-        reason = safe ? "" : "Exited with code " + juce::String(code);
-    }
-    else if (WIFSIGNALED(finalStatus))
-    {
-        reason = "Crashed: " + signalName(WTERMSIG(finalStatus));
-    }
+    if (timedOut) reason = "Timed out after 10s";
+    else if (WIFEXITED(finalStatus)) { int code = WEXITSTATUS(finalStatus); safe = (code==0);
+        reason = safe ? "" : "Exited with code " + juce::String(code); }
+    else if (WIFSIGNALED(finalStatus)) reason = "Crashed: " + signalName(WTERMSIG(finalStatus));
 
     writeScanLog(path, safe, reason, captured);
-    DBG("runPluginScan: " + juce::File(path).getFileName()
-        + (safe ? " → SAFE" : " → UNSAFE") + (reason.isEmpty() ? "" : " (" + reason + ")"));
-
     return safe;
 }
 
 // ── Background Scanner ────────────────────────────────────────────────────────
-// Scans all installed plugins whose safety is Unknown, one at a time.
-// Results are stored in safetyDB and broadcast via onScanProgress.
 
 void PluginBridgeProcessor::startBackgroundScan()
 {
@@ -575,45 +529,30 @@ void PluginBridgeProcessor::startBackgroundScan()
     scanThread = std::thread([this]()
     {
         auto files = getInstalledPluginFiles();
-
         for (int i = 0; i < files.size() && scanRunning.load(); ++i)
         {
             auto path = files[i].getFullPathName();
-            if (safetyDB.getSafety(path) != PluginSafetyDB::Safety::Unknown)
-                continue;
+            if (safetyDB.getSafety(path) != PluginSafetyDB::Safety::Unknown) continue;
 
-            // CRITICAL: wait while the Helper is actively running a plugin.
-            // The scan subprocess and the live Helper share the same shared-memory
-            // name. Running both simultaneously causes the scan to crash →
-            // valid plugins get wrongly stamped UNSAFE.
             while (helper.isHelperRunning() && scanRunning.load())
                 std::this_thread::sleep_for(std::chrono::milliseconds(500));
-
             if (!scanRunning.load()) break;
 
             bool safe = runPluginScan(path);
             safetyDB.setSafety(path, safe ? PluginSafetyDB::Safety::Safe
                                           : PluginSafetyDB::Safety::Unsafe);
-
             if (onScanProgress)
-            {
                 juce::MessageManager::callAsync([this, path, safe]()
-                {
-                    if (onScanProgress) onScanProgress(path, safe);
-                });
-            }
+                    { if (onScanProgress) onScanProgress(path, safe); });
         }
-
         scanRunning.store(false);
-        DBG("PluginBridgeProcessor: background scan complete");
     });
 }
 
 void PluginBridgeProcessor::stopBackgroundScan()
 {
     scanRunning.store(false);
-    if (scanThread.joinable())
-        scanThread.join();
+    if (scanThread.joinable()) scanThread.join();
 }
 
 // ── Plugin List ───────────────────────────────────────────────────────────────
@@ -621,19 +560,16 @@ void PluginBridgeProcessor::stopBackgroundScan()
 juce::Array<juce::File> PluginBridgeProcessor::getInstalledPluginFiles() const
 {
     juce::Array<juce::File> results;
-    std::set<std::string> seen; // deduplicate by stem name — VST3 wins over AU
+    std::set<std::string> seen;
 
-    // Priority order: system VST3 → user VST3 → system AU → user AU.
-    // System paths match the existing safety DB entries, so VST3 is preferred
-    // and same-named AU duplicates are automatically skipped.
     struct DirSpec { juce::File dir; const char* pattern; };
     std::vector<DirSpec> specs = {
-        { juce::File("/Library/Audio/Plug-Ins/VST3"),              "*.vst3"      },
+        { juce::File("/Library/Audio/Plug-Ins/VST3"), "*.vst3" },
         { juce::File::getSpecialLocation(juce::File::userHomeDirectory)
-              .getChildFile("Library/Audio/Plug-Ins/VST3"),       "*.vst3"      },
-        { juce::File("/Library/Audio/Plug-Ins/Components"),        "*.component" },
+              .getChildFile("Library/Audio/Plug-Ins/VST3"), "*.vst3" },
+        { juce::File("/Library/Audio/Plug-Ins/Components"), "*.component" },
         { juce::File::getSpecialLocation(juce::File::userHomeDirectory)
-              .getChildFile("Library/Audio/Plug-Ins/Components"),  "*.component" }
+              .getChildFile("Library/Audio/Plug-Ins/Components"), "*.component" }
     };
 
     for (auto& spec : specs)
@@ -643,8 +579,7 @@ juce::Array<juce::File> PluginBridgeProcessor::getInstalledPluginFiles() const
         for (auto& f : files)
         {
             auto stem = f.getFileNameWithoutExtension().toStdString();
-            if (seen.insert(stem).second)   // first time we see this name → keep it
-                results.add(f);
+            if (seen.insert(stem).second) results.add(f);
         }
     }
 
@@ -652,149 +587,102 @@ juce::Array<juce::File> PluginBridgeProcessor::getInstalledPluginFiles() const
     return results;
 }
 
-bool PluginBridgeProcessor::isBlocked(const juce::String& path) const
-{
-    return blocklist.isBlocked(path);
-}
+bool PluginBridgeProcessor::isBlocked(const juce::String& path) const { return blocklist.isBlocked(path); }
 
 // ── Manufacturer name ─────────────────────────────────────────────────────────
-// Fast: reads VST3 Info.plist (no plugin loading). Cached after first call.
 
-// Strip copyright preamble and return the actual company name.
-// Handles: "Copyright © 2002-2025 FabFilter"  → "FabFilter"
-//          "Copyright (C) 2017-2021 Soundtheory" → "Soundtheory"
-//          "16.7.33.200" (version as vendor)    → "" (trigger fallback)
 static juce::String cleanManufacturer(const juce::String& raw)
 {
     auto s = raw.trim();
     if (s.isEmpty()) return {};
-
-    // Pure version number used as vendor (e.g. "16.7.33.200") → reject
     if (s.containsOnly("0123456789.")) return {};
 
     auto lower = s.toLowerCase();
     if (lower.startsWith("copyright"))
     {
-        // Skip the word "Copyright"
         auto rest = s.substring(9).trim();
-        // Skip "(C)", "(c)"
-        if (rest.startsWithIgnoreCase("(c)"))
-            rest = rest.substring(3).trim();
-        // Skip "©" (UTF-8 0xC2 0xA9, or the Unicode character directly)
+        if (rest.startsWithIgnoreCase("(c)")) rest = rest.substring(3).trim();
         else if (rest.startsWith(juce::String::fromUTF8("\xc2\xa9")))
             rest = rest.substring(juce::String::fromUTF8("\xc2\xa9").length()).trim();
         else if (rest.startsWith(juce::CharPointer_UTF8("\xc2\xa9")))
             rest = rest.substring(1).trim();
-        // Skip year token(s): "2025" or "2002-2025"
         auto spacePos = rest.indexOfChar(' ');
-        if (spacePos > 0)
-            rest = rest.substring(spacePos + 1).trim();
+        if (spacePos > 0) rest = rest.substring(spacePos + 1).trim();
         if (rest.isNotEmpty()) return rest;
         return {};
     }
-
     return s;
 }
 
-// Extract the plist <string> value for a given key from raw plist XML text.
 static juce::String plistValue(const juce::String& text, const juce::String& key)
 {
     auto pos = text.fromFirstOccurrenceOf(key, false, true);
     if (pos.isEmpty()) return {};
     return pos.fromFirstOccurrenceOf("<string>", false, false)
-              .upToFirstOccurrenceOf("</string>", false, false)
-              .trim();
+              .upToFirstOccurrenceOf("</string>", false, false).trim();
 }
 
 juce::String PluginBridgeProcessor::getPluginManufacturer(const juce::File& f) const
 {
     auto pathKey = f.getFullPathName().toStdString();
-
-    {
-        std::lock_guard<std::mutex> lock(manufacturerCacheMutex);
-        auto it = manufacturerCache.find(pathKey);
-        if (it != manufacturerCache.end())
-            return juce::String(it->second);
-    }
+    { std::lock_guard<std::mutex> lock(manufacturerCacheMutex);
+      auto it = manufacturerCache.find(pathKey);
+      if (it != manufacturerCache.end()) return juce::String(it->second); }
 
     juce::String mfr;
 
-    // ── VST3: Info.plist fields (no plugin loading needed) ───────────────────
     if (f.getFileExtension().toLowerCase() == ".vst3")
     {
         auto infoPlist = f.getChildFile("Contents").getChildFile("Info.plist");
         if (infoPlist.existsAsFile())
         {
             auto text = infoPlist.loadFileAsString();
-
-            // 1) NSHumanReadableCopyright  → "Copyright © 2002-2025 FabFilter" → "FabFilter"
             auto copyright = plistValue(text, "NSHumanReadableCopyright");
             mfr = cleanManufacturer(copyright);
 
-            // 2) CFBundleGetInfoString → "FabFilter Pro-Q 4.02, Copyright © …"
-            //    Take the part before the comma (= "FabFilter Pro-Q 4.02"),
-            //    then its first space-delimited word (= "FabFilter")
             if (mfr.isEmpty())
             {
                 auto infoStr = plistValue(text, "CFBundleGetInfoString");
                 if (infoStr.contains(","))
                 {
                     auto beforeComma = infoStr.upToFirstOccurrenceOf(",", false, false).trim();
-                    // First word of "FabFilter Pro-Q 4.02" is "FabFilter"
                     auto first = beforeComma.upToFirstOccurrenceOf(" ", false, false).trim();
-                    if (first.isNotEmpty() && !first.containsOnly("0123456789."))
-                        mfr = first;
+                    if (first.isNotEmpty() && !first.containsOnly("0123456789.")) mfr = first;
                 }
-                if (mfr.isEmpty())
-                    mfr = cleanManufacturer(infoStr);
+                if (mfr.isEmpty()) mfr = cleanManufacturer(infoStr);
             }
 
-            // 3) CFBundleIdentifier → "com.fabfilter.Pro-Q.4" → second segment
             if (mfr.isEmpty())
             {
                 auto bid = plistValue(text, "CFBundleIdentifier");
-                // "com.fabfilter.Pro-Q.4" → segments: com | fabfilter | …
                 auto segs = juce::StringArray::fromTokens(bid, ".", "");
                 if (segs.size() >= 2)
                 {
-                    // segment[1] is usually the company slug — capitalise it
                     auto slug = segs[1].trim();
                     if (slug.isNotEmpty() && slug != "apple" && slug != "com")
-                    {
-                        slug = slug.substring(0, 1).toUpperCase() + slug.substring(1);
-                        mfr = slug;
-                    }
+                    { slug = slug.substring(0,1).toUpperCase() + slug.substring(1); mfr = slug; }
                 }
             }
         }
 
-        // 4) moduleinfo.json "vendor" (VST3 SDK 3.7+) — clean copyright if needed
         if (mfr.isEmpty())
         {
             auto moduleInfo = f.getChildFile("Contents").getChildFile("moduleinfo.json");
             if (moduleInfo.existsAsFile())
             {
-                try
-                {
-                    auto j = json::parse(moduleInfo.loadFileAsString().toStdString());
-                    auto vendor = cleanManufacturer(juce::String(j.value("vendor", "")));
-                    if (vendor.isNotEmpty()) mfr = vendor;
-                }
-                catch (...) {}
+                try { auto j = json::parse(moduleInfo.loadFileAsString().toStdString());
+                      auto vendor = cleanManufacturer(juce::String(j.value("vendor",""))); 
+                      if (vendor.isNotEmpty()) mfr = vendor; } catch (...) {}
             }
         }
     }
 
-    // ── Filename heuristic (AU or VST3 fallback) ──────────────────────────────
-    // "FabFilter Pro-Q 4" → "FabFilter",  "ValhallaDelay" → "ValhallaDelay"
     if (mfr.isEmpty())
     {
         auto name = f.getFileNameWithoutExtension();
         auto first = name.upToFirstOccurrenceOf(" ", false, false);
-        if (first.isNotEmpty() && !first.containsOnly("0123456789."))
-            mfr = first;
-        else
-            mfr = name;
+        if (first.isNotEmpty() && !first.containsOnly("0123456789.")) mfr = first;
+        else mfr = name;
     }
 
     if (mfr.isEmpty()) mfr = "Other";
@@ -814,11 +702,9 @@ void PluginBridgeProcessor::getStateInformation(juce::MemoryBlock& destData)
     if (pluginLoaded && helper.isHelperRunning())
     {
         auto response = helper.sendCommand("{\"cmd\":\"get_state\"}");
-        try {
-            auto j = json::parse(response);
-            if (j.value("ok", false))
-                state.setProperty("pluginState",
-                    juce::String(j["state"].get<std::string>()), nullptr);
+        try { auto j = json::parse(response);
+              if (j.value("ok",false))
+                  state.setProperty("pluginState", juce::String(j["state"].get<std::string>()), nullptr);
         } catch (...) {}
     }