Support bundle and mutex app relationships globally

- dynamically detect bundle children from catalog descriptions

- hide children but keep parents visible and redirect detail view after install

- handle appimage mutex pairs and redirect to surviving app

- preserve install feedback during operations

- generalized parser improvements

Author: Shikakiben

main.js

@@ -261,7 +261,7 @@ function runSandboxTask(sender, { pm, action, args, stdinScript, appName }) {
     }
     let settled = false;
     let output = '';
-    const passwordRegex = /mot de passe.*:|password.*:/i;
+    const passwordRegex = /\[sudo\]|mot de passe.*:|password.*:/i;
     const send = (payload) => {
       if (!sender) return;
       try {
@@ -528,7 +528,7 @@ ipcMain.handle('am-action', async (event, action, software) => {
       });
       child.onData((txt) => {
         output += txt;
-        if (/mot de passe.*:|password.*:/i.test(txt)) {
+        if (/\[sudo\]|mot de passe.*:|password.*:/i.test(txt)) {
           // Demander le mot de passe au renderer via IPC
           if (event.sender) event.sender.send('password-prompt', { id });
         }
@@ -613,7 +613,7 @@ ipcMain.handle('install-start', async (event, name) => {
     const txt = chunk.toString();
     output += txt;
     // Détection du prompt mot de passe sudo
-    if (/mot de passe.*:|password.*:/i.test(txt)) {
+    if (/\[sudo\]|mot de passe.*:|password.*:/i.test(txt)) {
       // Demander le mot de passe au renderer via IPC
       wc.send('password-prompt', { id });
       // Attendre la réponse avant d'envoyer le mot de passe au process
@@ -770,7 +770,7 @@ ipcMain.handle('updates-start', async (event) => {
   child.onData((txt) => {
     output += txt;
     send({ kind: 'data', chunk: txt });
-    if (/mot de passe.*:|password.*:/i.test(txt)) {
+    if (/\[sudo\]|mot de passe.*:|password.*:/i.test(txt)) {
       try { wc.send('password-prompt', { id }); }
       catch(_) {}
     }
@@ -885,39 +885,61 @@ ipcMain.handle('list-apps-detailed', async () => {
           /^TOTAL/i,
           /^\*has/i
         ];
+        // curEntry tracks the current ◆ entry so continuation lines can be
+        // appended to its description (descriptions can span multiple lines).
+        let curName = null;
+        let curDesc = null;
+        let curInCatalog = false;
+        const flushEntry = () => {
+          if (!curName) return;
+          if (!curInCatalog) {
+            installedFromCatalog.add(curName);
+            if (curDesc) installedDesc.set(curName, curDesc);
+          } else {
+            catalogSet.add(curName);
+            if (curDesc) catalogDesc.set(curName, curDesc);
+          }
+          diamondSet.add(curName);
+          curName = null;
+          curDesc = null;
+        };
+
         for (const raw of lines) {
           const line = raw.trim();
           if (line === '') {
             // blank line: if we've already scanned at least one ◆ entry and
             // we're not yet in the catalog, switch to catalog mode. Subsequent
             // ◆ entries will then be catalog items.
             if (seenAppEntry && !inCatalog) {
+              flushEntry();
               inCatalog = true;
+            } else {
+              flushEntry();
             }
             continue;
           }
-          if (!line.startsWith('\u25c6')) continue; // ignore non-◆ lines
-          const rest = line.slice(1).trim();
-          const colonIdx = rest.indexOf(':');
-          let desc = null;
-          let left = rest;
-          if (colonIdx !== -1) {
-            left = rest.slice(0, colonIdx).trim();
-            desc = rest.slice(colonIdx + 1).trim();
-            if (desc === '') desc = null;
-          }
-          const name = left.split(/\s+/)[0].trim();
-          if (ignoreNamePatterns.some(re => re.test(name))) continue;
-          if (!inCatalog) {
-            installedFromCatalog.add(name);
-            if (desc) installedDesc.set(name, desc);
-          } else {
-            catalogSet.add(name);
-            if (desc) catalogDesc.set(name, desc);
+          if (line.startsWith('\u25c6')) {
+            flushEntry();
+            const rest = line.slice(1).trim();
+            const colonIdx = rest.indexOf(':');
+            let left = rest;
+            let desc = null;
+            if (colonIdx !== -1) {
+              left = rest.slice(0, colonIdx).trim();
+              desc = rest.slice(colonIdx + 1).trim() || null;
+            }
+            const name = left.split(/\s+/)[0].trim();
+            if (ignoreNamePatterns.some(re => re.test(name))) continue;
+            curName = name;
+            curDesc = desc;
+            curInCatalog = inCatalog;
+            seenAppEntry = true;
+          } else if (curName && curInCatalog) {
+            // continuation line: append to current catalog entry description
+            curDesc = curDesc ? curDesc + ' ' + line : line;
           }
-          diamondSet.add(name);
-          seenAppEntry = true;
         }
+        flushEntry(); // flush the last entry
       } catch (e) {
         // ignore parse errors from catalog
       }
@@ -982,6 +1004,16 @@ ipcMain.handle('list-apps-detailed', async () => {
         }
       }
 
+      // Build bundle-child map: apps whose description says
+      // "This script installs the full 'X' suite" are children of X.
+      // When X is installed the child should be hidden from the catalog.
+      const bundleChildOf = {};
+      const suitePattern = /installs the full "([^"]+)" suite/i;
+      for (const [name, desc] of catalogDesc) {
+        const m = suitePattern.exec(desc);
+        if (m) bundleChildOf[name] = m[1].toLowerCase();
+      }
+
       const allSet = new Set([...catalogSet, ...installedSet]);
       const all = Array.from(allSet).map(name => ({
         name,
@@ -997,7 +1029,7 @@ ipcMain.handle('list-apps-detailed', async () => {
         version: installedDesc.get(name) || null,
         desc: catalogDesc.get(name) || null
       }));
-      return resolve({ installed, all, pmFound: true });
+      return resolve({ installed, all, pmFound: true, bundleChildOf });
     } catch (e) {
       return resolve({ installed: [], all: [], pmFound: true, error: 'Erreur interne lors du parsing.' });
     }

src/renderer/features/search/index.js

@@ -174,7 +174,7 @@
       base = Array.isArray(override.apps) ? override.apps : [];
     } else if (activeCategory === 'installed') {
       resetSearchModeIfNeeded();
-      base = filterInstalled(allApps);
+      base = filterInstalled(allApps); // uses full allApps to include implied apps
     } else if (activeCategory !== 'all') {
       resetSearchModeIfNeeded();
       base = filterByCategory(allApps, activeCategory);

src/renderer/renderer.js

@@ -374,7 +374,8 @@ const state = {
   currentDetailsApp: null,
   renderVersion: 0,
   lastScrollY: 0,
-  installed: new Set() // ensemble des noms installés (lowercase)
+  installed: new Set(), // ensemble des noms installés (lowercase)
+  bundleChildOf: {}    // { childName: parentName } – populated after loadApps
 };
 
 let virtualListApi = null;
@@ -2220,6 +2221,53 @@ async function loadApps() {
     }
     state.installed = installedNames;
   } catch(_) { state.installed = new Set(); }
+  // Dynamic app group filtering:
+  // 1. Bundle children: mark as installed when parent suite is installed
+  //    (e.g. user installs "adb" → "platform-tools" is installed → adb stays
+  //    visible and is shown as installed, so the user gets clear feedback)
+  // 2. Appimage mutex pairs: X-appimage and X share the same binary/config;
+  //    hide only the uninstalled partner so the installed one stays visible.
+  function applyAppGroupFiltering(bundleChildOf) {
+    const toRemove = new Set();
+    // 1. Bundle children: remove from all views (parent stays visible, installed).
+    //    After installing a child (adb…) the details panel redirects to the parent.
+    for (const app of state.allApps) {
+      const name = String(app.name).toLowerCase();
+      const parent = (bundleChildOf || {})[name];
+      if (parent && state.installed.has(parent.toLowerCase())) {
+        state.installed.add(name);
+        toRemove.add(name);
+      }
+    }
+    // 2. Appimage mutex pairs (e.g. firefox ↔ firefox-appimage)
+    // Also build mutexRedirect: { 'firefox-appimage': 'firefox' } so that
+    // post-install can redirect to the surviving app.
+    const allNames = new Set(state.allApps.map(a => String(a.name).toLowerCase()));
+    const mutexRedirect = {};
+    for (const app of state.allApps) {
+      const name = String(app.name).toLowerCase();
+      if (name.endsWith('-appimage')) {
+        const base = name.slice(0, -'-appimage'.length);
+        if (allNames.has(base)) {
+          if (state.installed.has(base)) {
+            toRemove.add(name);
+            mutexRedirect[name] = base; // installing firefox-appimage → show firefox
+          } else if (state.installed.has(name)) {
+            toRemove.add(base);
+            mutexRedirect[base] = name; // installing firefox → show firefox-appimage
+          }
+        }
+      }
+    }
+    state.mutexRedirect = mutexRedirect;
+    if (toRemove.size > 0) {
+      state.allApps = state.allApps.filter(a => !toRemove.has(String(a.name).toLowerCase()));
+      state.filtered = state.filtered.filter(a => !toRemove.has(String(a.name).toLowerCase()));
+    }
+  }
+  state.bundleChildOf = detailed.bundleChildOf || {};
+  state.mutexRedirect = {};
+  applyAppGroupFiltering(detailed.bundleChildOf);
   if (installedCountEl) installedCountEl.textContent = String(state.allApps.filter(a => a.installed && a.hasDiamond).length);
   cleanupSandboxCache();
   rerenderActiveCategory();
@@ -3453,7 +3501,13 @@ if (window.electronAPI.onInstallProgress){
         // Plus de gestion du log ou du bouton log ici
         loadApps().then(()=> {
           if (msg.success) {
-            if (msg.name) showDetails(msg.name); else if (detailsInstallBtn?.getAttribute('data-name')) showDetails(detailsInstallBtn.getAttribute('data-name'));
+            // Redirect to the surviving app after install:
+            // - bundle child (adb) → parent (platform-tools)
+            // - mutex partner (firefox-appimage) → canonical (firefox), or vice-versa
+            const installedName = msg.name || detailsInstallBtn?.getAttribute('data-name');
+            const key = installedName && installedName.toLowerCase();
+            const targetName = (key && (state.bundleChildOf[key] || state.mutexRedirect[key])) || installedName;
+            if (targetName) showDetails(targetName);
           }
           if (msg.name) {
             const tile = document.querySelector(`.app-tile[data-app="${CSS.escape(msg.name)}"]`);