aimeat 1.23.2 → 1.23.3

package/dist/static/app-catalog.html

@@ -1074,8 +1074,107 @@
 
     /* ── Publish Modal ──────────────────────────────── */
 
+    /* ── Backup menu + import modal ─────────────────── */
+
+    .backup-menu-wrap { position: relative; }
+
+    .backup-menu {
+      position: absolute;
+      top: calc(100% + 6px);
+      right: 0;
+      z-index: 600;
+      min-width: 220px;
+      background: var(--surface);
+      border: 1px solid var(--border-subtle);
+      border-radius: var(--radius-sm);
+      box-shadow: 0 8px 32px rgba(0, 0, 0, .18);
+      padding: 6px;
+      display: flex;
+      flex-direction: column;
+      gap: 2px;
+    }
+
+    .backup-menu[hidden] { display: none; }
+
+    .backup-menu button {
+      background: none;
+      border: none;
+      color: var(--text);
+      text-align: left;
+      padding: 8px 10px;
+      border-radius: 6px;
+      cursor: pointer;
+      font-size: .85rem;
+      white-space: nowrap;
+    }
+
+    .backup-menu button:hover { background: var(--hover); }
+
+    #backup-modal { max-height: 84vh; display: flex; flex-direction: column; }
+    #backup-import-body { overflow-y: auto; flex: 1; min-height: 0; }
+
+    .backup-table { width: 100%; border-collapse: collapse; font-size: .85rem; }
+    .backup-table th {
+      text-align: left; font-size: .72rem; text-transform: uppercase; letter-spacing: .04em;
+      color: var(--text-muted); padding: 6px 8px; border-bottom: 1px solid var(--border-subtle);
+    }
+    .backup-table td { padding: 6px 8px; border-bottom: 1px solid var(--border-subtle); vertical-align: top; }
+    .backup-table .mono-cell { font-family: monospace; font-size: .78rem; color: var(--text-muted); }
+
+    .backup-versions-toggle {
+      background: none; border: none; color: var(--accent); cursor: pointer;
+      font-size: .78rem; padding: 0; text-decoration: underline;
+    }
+    .backup-version-list { margin-top: 6px; display: flex; flex-direction: column; gap: 2px; }
+    .backup-version-list label { font-size: .78rem; color: var(--text-muted); display: flex; gap: 6px; align-items: center; }
+
+    .backup-conflict-select {
+      background: var(--bg-subtle); color: var(--text); border: 1px solid var(--border-subtle);
+      border-radius: 6px; padding: 4px 6px; font-size: .78rem;
+    }
+
+    .backup-status-badge {
+      display: inline-block; font-size: .62rem; font-weight: 600; text-transform: uppercase;
+      padding: 2px 6px; border-radius: 4px;
+    }
+    .backup-status-new { background: rgba(52, 211, 153, .12); color: #34d399; border: 1px solid rgba(52, 211, 153, .3); }
+    .backup-status-exists { background: rgba(245, 158, 11, .10); color: #d97706; border: 1px solid rgba(245, 158, 11, .25); }
+
+    .backup-toolbar-row {
+      display: flex; justify-content: space-between; align-items: center;
+      gap: 8px; margin: 8px 0; flex-wrap: wrap;
+    }
+    .backup-summary-line { font-size: .82rem; color: var(--text-muted); }
+    .backup-link-btn {
+      background: none; border: none; color: var(--accent); cursor: pointer;
+      font-size: .8rem; padding: 0 4px; text-decoration: underline;
+    }
+    .backup-result-list { font-size: .82rem; margin: 4px 0 10px; padding-left: 18px; }
+    .backup-result-errors { color: #ef4444; }
+
+    .server-import-banner {
+      margin: 0 24px 1rem;
+      padding: 10px 14px;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      gap: 12px;
+      flex-wrap: wrap;
+      background: var(--surface-glass);
+      border: 1px solid var(--border-subtle);
+      border-radius: var(--radius-sm);
+      font-size: .85rem;
+      position: relative;
+      z-index: 1;
+    }
+    .server-import-banner-actions { display: flex; gap: 8px; }
+
     #publish-overlay,
-    #versions-overlay {
+    #versions-overlay,
+    #subdomain-overlay,
+    #backup-overlay,
+    #server-import-overlay,
+    #json-import-overlay {
       position: fixed;
       inset: 0;
       z-index: 560;
@@ -1089,7 +1188,11 @@
     }
 
     #publish-overlay[hidden],
-    #versions-overlay[hidden] {
+    #versions-overlay[hidden],
+    #subdomain-overlay[hidden],
+    #backup-overlay[hidden],
+    #server-import-overlay[hidden],
+    #json-import-overlay[hidden] {
       display: none;
     }
 
@@ -1272,6 +1375,43 @@
       border: 1px solid rgba(245, 158, 11, .25);
     }
 
+    /* Operator-only subdomain chip on own published cards */
+    .subdomain-chip {
+      display: inline-flex;
+      align-items: center;
+      gap: 4px;
+      font-size: .7rem;
+      font-weight: 600;
+      padding: 2px 8px;
+      border-radius: 999px;
+      cursor: pointer;
+      background: rgba(99, 102, 241, .10);
+      color: #6366f1;
+      border: 1px solid rgba(99, 102, 241, .25);
+      margin-top: 4px;
+      max-width: 100%;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+    .subdomain-chip:hover { background: rgba(99, 102, 241, .2); }
+
+    /* AI-published origin badge on local grid cards */
+    .ai-origin-badge {
+      display: inline-block;
+      font-size: .6rem;
+      font-weight: 700;
+      text-transform: uppercase;
+      letter-spacing: .04em;
+      padding: 1px 5px;
+      border-radius: 4px;
+      vertical-align: middle;
+      margin-left: 4px;
+      background: rgba(99, 102, 241, .10);
+      color: #6366f1;
+      border: 1px solid rgba(99, 102, 241, .25);
+    }
+
     /* ── Cortex Extensions Bar ──────────────────────── */
 
     .cortex-mini-card{background:var(--surface);border:1px solid var(--border-subtle);border-radius:10px;padding:.75rem 1rem;cursor:pointer;min-width:160px;flex-shrink:0;transition:all .15s}
@@ -1342,6 +1482,14 @@
       <button class="icon-btn" id="add-btn" data-i18n-title="action.add" title="Add app">+</button>
       <button class="icon-btn" id="generate-btn" data-i18n-title="action.generate" title="Generate with AI">&#x2728;</button>
       <button class="icon-btn" id="homepage-btn" data-i18n-title="action.homepage" title="Generate Homepage">&#x1F3E0;</button>
+      <div class="backup-menu-wrap">
+        <button class="icon-btn" id="backup-btn" data-i18n-title="backup.menu" title="Backup" onclick="window._launcher.toggleBackupMenu(event)">&#x1F4BE;</button>
+        <div id="backup-menu" class="backup-menu" hidden>
+          <button onclick="window._launcher.exportBackupZip()" data-i18n="backup.exportAll">&#x1F4E6; Export all (.zip)</button>
+          <button onclick="window._launcher.importBackupPick()" data-i18n="backup.importFrom">&#x1F4E5; Import from backup...</button>
+        </div>
+      </div>
+      <input type="file" id="backup-file-input" accept=".zip,application/zip,application/x-zip-compressed" hidden />
       <div class="lang-toggle" id="lang-toggle" title="Language / Kieli">
         <button class="lang-btn" data-lang="en" onclick="window._launcher.setLanguage('en')">EN</button>
         <button class="lang-btn" data-lang="fi" onclick="window._launcher.setLanguage('fi')">FI</button>
@@ -1353,6 +1501,15 @@
 
   <nav id="tag-bar"></nav>
 
+  <!-- Server-published apps missing locally — import is ALWAYS user-selected -->
+  <div id="server-import-banner" class="server-import-banner" style="display:none">
+    <span>&#x1F4E5; <strong id="server-import-count">0</strong> <span data-i18n="srvImport.bannerText">published apps from your account are not in this catalog.</span></span>
+    <div class="server-import-banner-actions">
+      <button class="modal-btn primary" onclick="window._launcher.showServerImportModal()" data-i18n="srvImport.review">Review &amp; import...</button>
+      <button class="modal-btn secondary" onclick="window._launcher.dismissServerImportBanner()" data-i18n="srvImport.dismiss">Not now</button>
+    </div>
+  </div>
+
   <!-- Active Extensions Bar -->
   <div id="cortex-bar" style="display:none;margin:0 24px 1.5rem;position:relative;z-index:1">
     <div style="display:flex;justify-content:space-between;align-items:center;margin-bottom:.75rem">
@@ -1577,6 +1734,7 @@
         <div class="settings-backup-actions">
           <button type="button" class="modal-btn secondary" onclick="window._launcher.exportBackup()" data-i18n="settings.exportJson">Export JSON</button>
           <button type="button" class="modal-btn secondary" onclick="document.getElementById('import-file-input').click()" data-i18n="settings.importJson">Import JSON</button>
+          <button type="button" class="modal-btn secondary" onclick="window._launcher.removeDuplicateApps()" data-i18n="dedup.btn">&#x1F9F9; Remove duplicate apps</button>
           <input type="file" id="import-file-input" accept=".json" hidden/>
         </div>
       </div>
@@ -1641,6 +1799,64 @@
     </div>
   </div>
 
+  <!-- JSON Backup Import Modal (user-selected, duplicate-aware) -->
+  <div id="json-import-overlay" hidden>
+    <div class="modal" id="json-import-modal">
+      <h2 data-i18n="jsonImport.title">&#x1F4E5; Import JSON backup</h2>
+      <div id="json-import-status" style="margin:4px 0;font-size:.85rem;min-height:1.1em"></div>
+      <div id="json-import-body" style="overflow-y:auto;max-height:55vh"></div>
+      <div class="modal-actions">
+        <button type="button" class="modal-btn secondary" onclick="document.getElementById('json-import-overlay').hidden = true" data-i18n="common.cancel">Cancel</button>
+        <button type="button" class="modal-btn primary" id="json-import-btn" onclick="window._launcher.submitJsonImport()" data-i18n="srvImport.import">Import selected</button>
+      </div>
+    </div>
+  </div>
+
+  <!-- Server Apps Import Modal (user-selected) -->
+  <div id="server-import-overlay" hidden>
+    <div class="modal" id="server-import-modal">
+      <h2 data-i18n="srvImport.title">&#x1F4E5; Import published apps</h2>
+      <div id="server-import-status" style="margin:4px 0;font-size:.85rem;min-height:1.1em"></div>
+      <div id="server-import-body" style="overflow-y:auto;max-height:55vh"></div>
+      <div class="modal-actions">
+        <button type="button" class="modal-btn secondary" onclick="document.getElementById('server-import-overlay').hidden = true" data-i18n="common.cancel">Cancel</button>
+        <button type="button" class="modal-btn primary" onclick="window._launcher.submitServerImport()" data-i18n="srvImport.import">Import selected</button>
+      </div>
+    </div>
+  </div>
+
+  <!-- Backup Import Modal -->
+  <div id="backup-overlay" hidden>
+    <div class="modal" id="backup-modal">
+      <h2 data-i18n="backup.title">&#x1F4E5; Import from backup</h2>
+      <div id="backup-status" style="margin:4px 0;font-size:.85rem;min-height:1.1em"></div>
+      <div id="backup-import-body"></div>
+      <div class="modal-actions">
+        <button type="button" class="modal-btn secondary" onclick="document.getElementById('backup-overlay').hidden = true" data-i18n="common.close">Close</button>
+        <button type="button" class="modal-btn primary" id="backup-restore-btn" onclick="window._launcher.submitBackupRestore()" data-i18n="backup.restore" style="display:none">Restore selected</button>
+      </div>
+    </div>
+  </div>
+
+  <!-- Subdomain Assign Modal (operator only) -->
+  <div id="subdomain-overlay" hidden>
+    <div class="modal" id="subdomain-modal">
+      <h2 data-i18n="subModal.title">&#x1F310; Assign Subdomain</h2>
+      <div style="font-size:.8rem;color:var(--text-muted);margin-bottom:8px" id="subdomain-app-label"></div>
+      <div class="form-group">
+        <label for="subdomain-input" data-i18n="subModal.label">Subdomain</label>
+        <input type="text" id="subdomain-input" class="modal-input" placeholder="sanomat" autocomplete="off"/>
+        <div style="font-size:.75rem;color:var(--text-muted);margin-top:4px" data-i18n="subModal.hint">Lowercase letters, numbers and hyphens (2-63 chars). The app is served at the subdomain root.</div>
+      </div>
+      <div id="subdomain-status" style="margin-top:8px;font-size:.85rem;min-height:1.1em"></div>
+      <div class="modal-actions">
+        <button type="button" class="modal-btn secondary" onclick="document.getElementById('subdomain-overlay').hidden = true" data-i18n="common.cancel">Cancel</button>
+        <button type="button" class="modal-btn secondary" id="subdomain-unassign-btn" onclick="window._launcher.unassignSubdomain()" data-i18n="subModal.unassign">Unassign</button>
+        <button type="button" class="modal-btn primary" id="subdomain-save-btn" onclick="window._launcher.submitSubdomainAssign()" data-i18n="common.save">Save</button>
+      </div>
+    </div>
+  </div>
+
   <!-- Versions Modal -->
   <div id="versions-overlay" hidden>
     <div class="modal" id="versions-modal">
@@ -1790,6 +2006,63 @@
       'card.versions': '🕑 Versions',
       'card.fork': '⑂ Fork',
       'card.restore': '↺ Restore',
+      'card.subdomain': '🌐 Subdomain',
+      'jsonImport.title': '📥 Import JSON backup',
+      'jsonImport.desc': 'Choose which apps to import. Apps already in this catalog are marked as duplicates and unchecked — nothing is imported without your selection.',
+      'jsonImport.statusDup': 'duplicate',
+      'jsonImport.config': 'Also import settings (theme, language, server URL)',
+      'jsonImport.done': 'Imported',
+      'dedup.btn': '🧹 Remove duplicate apps',
+      'dedup.none': 'No duplicate apps found.',
+      'dedup.confirm': 'Delete duplicate copies (favorites and oldest copies are kept)? Copies to delete:',
+      'dedup.done': 'Duplicates removed',
+      'srvImport.bannerText': 'published apps from your account are not in this catalog.',
+      'srvImport.review': '📥 Review & import...',
+      'srvImport.dismiss': 'Not now',
+      'srvImport.title': '📥 Import published apps',
+      'srvImport.desc': 'These apps are published under your account on the server but missing from this local catalog. Choose which ones to import — nothing is imported automatically.',
+      'srvImport.import': 'Import selected',
+      'srvImport.importing': 'Importing...',
+      'backup.menu': 'Backup',
+      'backup.exportAll': '📦 Export all (.zip)',
+      'backup.importFrom': '📥 Import from backup...',
+      'backup.title': '📥 Import from backup',
+      'backup.inspecting': 'Reading backup...',
+      'backup.exporting': 'Building backup...',
+      'backup.from': 'Backup from',
+      'backup.selectAll': 'Select all',
+      'backup.selectNone': 'Select none',
+      'backup.restoring': 'Restoring',
+      'backup.sumApps': 'apps',
+      'backup.sumVersions': 'versions',
+      'backup.sumExts': 'extensions',
+      'backup.colApp': 'App',
+      'backup.colVersions': 'Versions',
+      'backup.colStatus': 'Status',
+      'backup.statusNew': 'new',
+      'backup.statusExists': 'exists',
+      'backup.conflictSkip': 'Skip',
+      'backup.conflictAppend': 'Append versions',
+      'backup.conflictCopy': 'Import as copy',
+      'backup.extensions': '🔌 Extensions',
+      'backup.restore': 'Restore selected',
+      'backup.resultTitle': 'Restore complete',
+      'backup.resCreated': 'Created',
+      'backup.resAppended': 'Versions appended to',
+      'backup.resCopied': 'Imported as copy',
+      'backup.resSkipped': 'Skipped',
+      'backup.resVersions': 'Versions restored',
+      'backup.resErrors': 'Errors',
+      'backup.loginRequired': 'Sign in first to use backups.',
+      'backup.nothingSelected': 'Nothing selected.',
+      'backup.empty': 'The backup contains no apps or extensions.',
+      'subModal.title': '🌐 Assign Subdomain',
+      'subModal.label': 'Subdomain',
+      'subModal.hint': 'Lowercase letters, numbers and hyphens (2-63 chars). The app is served at the subdomain root.',
+      'subModal.unassign': 'Unassign',
+      'subModal.assigned': 'Subdomain assigned',
+      'subModal.unassigned': 'Subdomain unassigned',
+      'subModal.saving': 'Saving...',
       'tag.all': 'All',
       'tag.favorites': '⭐ Favorites',
       'empty.noApps': 'No apps yet',
@@ -1902,6 +2175,63 @@
       'card.versions': '🕑 Versiot',
       'card.fork': '⑂ Haaroita',
       'card.restore': '↺ Palauta',
+      'card.subdomain': '🌐 Alidomain',
+      'jsonImport.title': '📥 Tuo JSON-varmuuskopio',
+      'jsonImport.desc': 'Valitse mitkä appit tuodaan. Katalogissa jo olevat on merkitty duplikaateiksi ja jätetty valitsematta — mitään ei tuoda ilman valintaasi.',
+      'jsonImport.statusDup': 'duplikaatti',
+      'jsonImport.config': 'Tuo myös asetukset (teema, kieli, palvelimen osoite)',
+      'jsonImport.done': 'Tuotu',
+      'dedup.btn': '🧹 Poista duplikaattiappit',
+      'dedup.none': 'Duplikaattiappeja ei löytynyt.',
+      'dedup.confirm': 'Poistetaanko duplikaattikopiot (suosikit ja vanhimmat kopiot säilytetään)? Poistettavia kopioita:',
+      'dedup.done': 'Duplikaatit poistettu',
+      'srvImport.bannerText': 'tilisi julkaistua appia puuttuu tästä katalogista.',
+      'srvImport.review': '📥 Katso ja tuo...',
+      'srvImport.dismiss': 'Ei nyt',
+      'srvImport.title': '📥 Tuo julkaistut appit',
+      'srvImport.desc': 'Nämä appit on julkaistu tililläsi palvelimella mutta puuttuvat paikallisesta katalogista. Valitse mitkä tuodaan — mitään ei tuoda automaattisesti.',
+      'srvImport.import': 'Tuo valitut',
+      'srvImport.importing': 'Tuodaan...',
+      'backup.menu': 'Varmuuskopio',
+      'backup.exportAll': '📦 Vie kaikki (.zip)',
+      'backup.importFrom': '📥 Tuo varmuuskopiosta...',
+      'backup.title': '📥 Tuo varmuuskopiosta',
+      'backup.inspecting': 'Luetaan varmuuskopiota...',
+      'backup.exporting': 'Kootaan varmuuskopiota...',
+      'backup.from': 'Varmuuskopio lähteestä',
+      'backup.selectAll': 'Valitse kaikki',
+      'backup.selectNone': 'Tyhjennä valinta',
+      'backup.restoring': 'Palautetaan',
+      'backup.sumApps': 'appia',
+      'backup.sumVersions': 'versiota',
+      'backup.sumExts': 'laajennusta',
+      'backup.colApp': 'Appi',
+      'backup.colVersions': 'Versiot',
+      'backup.colStatus': 'Tila',
+      'backup.statusNew': 'uusi',
+      'backup.statusExists': 'olemassa',
+      'backup.conflictSkip': 'Ohita',
+      'backup.conflictAppend': 'Lisää versiot päälle',
+      'backup.conflictCopy': 'Tuo kopiona',
+      'backup.extensions': '🔌 Laajennukset',
+      'backup.restore': 'Palauta valitut',
+      'backup.resultTitle': 'Palautus valmis',
+      'backup.resCreated': 'Luotiin',
+      'backup.resAppended': 'Versiot lisätty päälle',
+      'backup.resCopied': 'Tuotu kopiona',
+      'backup.resSkipped': 'Ohitettiin',
+      'backup.resVersions': 'Versioita palautettu',
+      'backup.resErrors': 'Virheet',
+      'backup.loginRequired': 'Kirjaudu ensin sisään käyttääksesi varmuuskopioita.',
+      'backup.nothingSelected': 'Mitään ei ole valittu.',
+      'backup.empty': 'Varmuuskopiossa ei ole appeja eikä laajennuksia.',
+      'subModal.title': '🌐 Liitä alidomain',
+      'subModal.label': 'Alidomain',
+      'subModal.hint': 'Pienet kirjaimet, numerot ja viivat (2-63 merkkiä). Appi tarjoillaan alidomainin juuresta.',
+      'subModal.unassign': 'Poista liitos',
+      'subModal.assigned': 'Alidomain liitetty',
+      'subModal.unassigned': 'Liitos poistettu',
+      'subModal.saving': 'Tallennetaan...',
       'tag.all': 'Kaikki',
       'tag.favorites': '⭐ Suosikit',
       'empty.noApps': 'Ei vielä sovelluksia',
@@ -2813,7 +3143,8 @@
               '<button class="card-menu-btn" onclick="event.stopPropagation(); window._launcher.showContextMenu(event, \'' + escapeHtml(app.id) + '\')" title="Menu">\u22EE</button>' +
               '<div class="app-icon">' + escapeHtml(iconDisplay) + '</div>' +
               '<div class="app-name">' + escapeHtml(app.name) + '</div>' +
-              '<div class="app-source">' + sourceLabel(app.source) + '</div>' +
+              '<div class="app-source">' + sourceLabel(app.source) +
+                (app.origin === 'ai-published' ? ' <span class="ai-origin-badge">AI</span>' : '') + '</div>' +
               '<div class="app-actions">' +
                 '<button onclick="event.stopPropagation(); window._launcher.launchApp(\'' + escapeHtml(app.id) + '\', \'tab\')" title="Open in tab">\u25B6 Tab</button>' +
                 '<button onclick="event.stopPropagation(); window._launcher.launchApp(\'' + escapeHtml(app.id) + '\', \'iframe\')" title="Open in iframe">\u25FB</button>' +
@@ -2995,6 +3326,9 @@
 
       case 'delete':
         if (confirm('Delete "' + (app.name || 'this app') + '"?')) {
+          // Tombstone published apps so the server copy isn't re-imported as a
+          // "new" AI-published app on the next load.
+          if (app.publishedFilename) addImportIgnore(app.publishedFilename);
           deleteApp(appId).then(function () {
             renderApps();
             loadPublishedApps();
@@ -3284,41 +3618,147 @@
     });
   }
 
+  // Identity key for duplicate detection: a published app is the same app
+  // regardless of its local id; unpublished ones match by name + content size.
+  function localAppKey(a) {
+    if (a.publishedFilename) return 'pf:' + a.publishedFilename;
+    return 'nm:' + (a.name || '') + '|' + (a.blob ? a.blob.length : (a.url || ''));
+  }
+
+  // Parsed JSON backup awaiting user selection: { backup, rows: [{app, isDup}] }
+  var jsonImportState = null;
+
   function handleImportBackup(file) {
     if (!file) return;
     var reader = new FileReader();
     reader.onload = function () {
+      var backup;
       try {
-        var backup = JSON.parse(reader.result);
-        if (!backup.apps || !Array.isArray(backup.apps)) {
-          alert('Invalid backup file: missing apps array');
-          return;
-        }
-        // Import config if present
-        if (backup.config && typeof backup.config === 'object') {
-          var currentConfig = loadConfig();
-          var merged = Object.assign({}, currentConfig, backup.config);
-          saveConfig(merged);
-          applyTheme(merged.theme);
-        }
-        // Import apps with new IDs to avoid conflicts
-        var promises = [];
-        for (var i = 0; i < backup.apps.length; i++) {
-          var app = Object.assign({}, backup.apps[i]);
-          app.id = generateId(); // New ID to avoid conflicts
-          promises.push(saveApp(app));
-        }
-        Promise.all(promises).then(function () {
-          alert('Imported ' + backup.apps.length + ' app(s) successfully');
-          renderApps();
-        });
+        backup = JSON.parse(reader.result);
       } catch (e) {
         alert('Failed to parse backup file: ' + (e.message || e));
+        return;
+      }
+      if (!backup.apps || !Array.isArray(backup.apps)) {
+        alert('Invalid backup file: missing apps array');
+        return;
       }
+      // Inspect-before-write: compare against the current catalog and let the
+      // user choose. Duplicates default to unchecked — nothing is imported
+      // (and no setting is changed) without an explicit selection.
+      getAllApps().then(function (existing) {
+        var existingKeys = {};
+        existing.forEach(function (a) { existingKeys[localAppKey(a)] = true; });
+        jsonImportState = {
+          backup: backup,
+          rows: backup.apps.map(function (a) {
+            return { app: a, isDup: !!existingKeys[localAppKey(a)] };
+          }),
+        };
+        renderJsonImportModal();
+      });
     };
     reader.readAsText(file);
   }
 
+  function renderJsonImportModal() {
+    var rows = jsonImportState.rows;
+    var body = document.getElementById('json-import-body');
+    var html = '<p style="font-size:.8rem;color:var(--text-muted);margin:4px 0 8px">' + t('jsonImport.desc') + '</p>' +
+      '<div class="backup-toolbar-row"><div>' +
+        '<button class="backup-link-btn" onclick="window._launcher.jsonImportSelectAll(true)">' + t('backup.selectAll') + '</button> / ' +
+        '<button class="backup-link-btn" onclick="window._launcher.jsonImportSelectAll(false)">' + t('backup.selectNone') + '</button>' +
+      '</div></div>' +
+      '<table class="backup-table"><tbody>';
+    for (var i = 0; i < rows.length; i++) {
+      var a = rows[i].app;
+      html +=
+        '<tr>' +
+          '<td><input type="checkbox" class="json-import-cb" data-i="' + i + '"' + (rows[i].isDup ? '' : ' checked') + '/></td>' +
+          '<td>' + escapeHtml(a.name || a.publishedFilename || 'Untitled') +
+            (a.publishedFilename ? '<div class="mono-cell">' + escapeHtml(a.publishedFilename) + '</div>' : '') + '</td>' +
+          '<td>' + sourceLabel(a.source) + '</td>' +
+          '<td>' + (rows[i].isDup
+            ? '<span class="backup-status-badge backup-status-exists">' + t('jsonImport.statusDup') + '</span>'
+            : '<span class="backup-status-badge backup-status-new">' + t('backup.statusNew') + '</span>') + '</td>' +
+        '</tr>';
+    }
+    html += '</tbody></table>';
+    if (jsonImportState.backup.config && typeof jsonImportState.backup.config === 'object') {
+      html += '<label style="display:flex;align-items:center;gap:8px;margin-top:10px;font-size:.85rem">' +
+        '<input type="checkbox" id="json-import-config"/> ' + t('jsonImport.config') + '</label>';
+    }
+    body.innerHTML = html;
+    document.getElementById('json-import-status').textContent = '';
+    document.getElementById('json-import-btn').style.display = '';
+    document.getElementById('json-import-overlay').hidden = false;
+  }
+
+  function jsonImportSelectAll(checked) {
+    document.querySelectorAll('.json-import-cb').forEach(function (b) { b.checked = checked; });
+  }
+
+  function submitJsonImport() {
+    var statusEl = document.getElementById('json-import-status');
+    var selected = [];
+    document.querySelectorAll('.json-import-cb').forEach(function (b) {
+      if (b.checked) selected.push(jsonImportState.rows[parseInt(b.getAttribute('data-i'), 10)].app);
+    });
+    var configCb = document.getElementById('json-import-config');
+    var importConfig = !!(configCb && configCb.checked);
+    if (selected.length === 0 && !importConfig) {
+      statusEl.style.color = '#ef4444';
+      statusEl.textContent = t('backup.nothingSelected');
+      return;
+    }
+    if (importConfig) {
+      var merged = Object.assign({}, loadConfig(), jsonImportState.backup.config);
+      saveConfig(merged);
+      applyTheme(merged.theme);
+    }
+    Promise.all(selected.map(function (a) {
+      var app = Object.assign({}, a);
+      app.id = generateId(); // new id — the source backup may collide with existing ids
+      return saveApp(app);
+    })).then(function () {
+      statusEl.style.color = '#34d399';
+      statusEl.textContent = '✔ ' + t('jsonImport.done') + ': ' + selected.length;
+      document.getElementById('json-import-btn').style.display = 'none';
+      renderApps();
+      loadPublishedApps();
+    });
+  }
+
+  // ── Remove duplicate apps (cleanup after legacy blind imports) ──
+
+  function removeDuplicateApps() {
+    getAllApps().then(function (apps) {
+      var groups = {};
+      apps.forEach(function (a) {
+        var k = localAppKey(a);
+        (groups[k] = groups[k] || []).push(a);
+      });
+      var toDelete = [];
+      Object.keys(groups).forEach(function (k) {
+        var g = groups[k];
+        if (g.length < 2) return;
+        // Keep the best copy: favorites first, then the earliest added
+        g.sort(function (x, y) {
+          if (!!y.favorite !== !!x.favorite) return (y.favorite ? 1 : 0) - (x.favorite ? 1 : 0);
+          return (x.addedAt || '') < (y.addedAt || '') ? -1 : 1;
+        });
+        toDelete = toDelete.concat(g.slice(1));
+      });
+      if (toDelete.length === 0) { alert(t('dedup.none')); return; }
+      if (!confirm(t('dedup.confirm') + ' ' + toDelete.length)) return;
+      Promise.all(toDelete.map(function (a) { return deleteApp(a.id); })).then(function () {
+        renderApps();
+        loadPublishedApps();
+        alert(t('dedup.done') + ': ' + toDelete.length);
+      });
+    });
+  }
+
   // ── Clear All Data ──────────────────────────────
 
   function clearAllData() {
@@ -3663,6 +4103,591 @@
     return !!a && a === bareOwnerName(sessionOwner);
   }
 
+  // ── Operator subdomain mappings ─────────────────
+  // Operators can map a subdomain to a published app (served at the subdomain
+  // root). Mappings are loaded only for operator sessions; everyone else never
+  // sees the controls and the admin API returns 403 anyway.
+
+  function getSessionRoles() {
+    try {
+      var token = getCortexOwnerToken();
+      if (!token) return [];
+      var payload = JSON.parse(atob(token.split('.')[1].replace(/-/g, '+').replace(/_/g, '/')));
+      return payload.roles || [];
+    } catch (e) { return []; }
+  }
+
+  function isOperatorSession() {
+    return getSessionRoles().indexOf('operator') !== -1;
+  }
+
+  // target ("owner/filename") → site record; null until loaded
+  var subdomainsByTarget = null;
+
+  function loadSubdomainSites() {
+    if (!isOperatorSession()) {
+      subdomainsByTarget = null;
+      return Promise.resolve();
+    }
+    var config = loadConfig();
+    var aimeatUrl = config.aimeatUrl ? config.aimeatUrl.replace(/\/+$/, '') : '';
+    if (!aimeatUrl) { subdomainsByTarget = null; return Promise.resolve(); }
+    return fetch(aimeatUrl + '/v1/admin/subdomains', {
+      headers: { 'Authorization': 'Bearer ' + getCortexOwnerToken() }
+    })
+      .then(function (resp) { if (!resp.ok) throw new Error('HTTP ' + resp.status); return resp.json(); })
+      .then(function (json) {
+        subdomainsByTarget = {};
+        var sites = (json.data && json.data.sites) || [];
+        for (var i = 0; i < sites.length; i++) {
+          if (sites[i].kind === 'app') subdomainsByTarget[sites[i].target] = sites[i];
+        }
+      })
+      .catch(function () { subdomainsByTarget = null; });
+  }
+
+  function apexHostLabel() {
+    try {
+      var config = loadConfig();
+      return new URL(config.aimeatUrl || window.location.origin).host;
+    } catch (e) { return window.location.host; }
+  }
+
+  // The app target currently open in the subdomain modal: { target, existingSub }
+  var subdomainModalState = null;
+
+  function showSubdomainModal(owner, filename) {
+    var target = bareOwnerName(owner) + '/' + filename;
+    var existing = (subdomainsByTarget && subdomainsByTarget[target]) || null;
+    subdomainModalState = { target: target, existingSub: existing ? existing.subdomain : null };
+    document.getElementById('subdomain-app-label').textContent = target;
+    document.getElementById('subdomain-input').value = existing ? existing.subdomain : '';
+    document.getElementById('subdomain-status').textContent = '';
+    document.getElementById('subdomain-unassign-btn').style.display = existing ? '' : 'none';
+    document.getElementById('subdomain-overlay').hidden = false;
+  }
+
+  function subdomainApiCall(method, path, body) {
+    var config = loadConfig();
+    var aimeatUrl = config.aimeatUrl.replace(/\/+$/, '');
+    return fetch(aimeatUrl + path, {
+      method: method,
+      headers: {
+        'Authorization': 'Bearer ' + getCortexOwnerToken(),
+        'Content-Type': 'application/json'
+      },
+      body: body ? JSON.stringify(body) : undefined
+    }).then(function (resp) {
+      return resp.json().then(function (json) {
+        if (!json.ok) {
+          var msg = (json.error && (json.error.message || json.error.code)) || ('HTTP ' + resp.status);
+          throw new Error(msg);
+        }
+        return json;
+      });
+    });
+  }
+
+  function submitSubdomainAssign() {
+    if (!subdomainModalState) return;
+    var sub = document.getElementById('subdomain-input').value.trim().toLowerCase();
+    var statusEl = document.getElementById('subdomain-status');
+    if (!sub) return;
+    if (sub === subdomainModalState.existingSub) {
+      document.getElementById('subdomain-overlay').hidden = true;
+      return;
+    }
+    statusEl.style.color = 'var(--text-muted)';
+    statusEl.textContent = t('subModal.saving');
+    var oldSub = subdomainModalState.existingSub;
+    subdomainApiCall('POST', '/v1/admin/subdomains', {
+      subdomain: sub, kind: 'app', target: subdomainModalState.target
+    })
+      .then(function () {
+        // Re-pointing to a new subdomain: drop the old mapping after the new
+        // one exists, so the app is never left unmapped on failure.
+        if (oldSub) return subdomainApiCall('DELETE', '/v1/admin/subdomains/' + encodeURIComponent(oldSub));
+      })
+      .then(function () {
+        statusEl.style.color = '#34d399';
+        statusEl.textContent = '✔ ' + t('subModal.assigned') + ' — ' + sub + '.' + apexHostLabel();
+        return loadSubdomainSites();
+      })
+      .then(function () { loadPublishedApps(); })
+      .catch(function (err) {
+        statusEl.style.color = '#ef4444';
+        statusEl.textContent = err.message || String(err);
+      });
+  }
+
+  function unassignSubdomain() {
+    if (!subdomainModalState || !subdomainModalState.existingSub) return;
+    var statusEl = document.getElementById('subdomain-status');
+    statusEl.style.color = 'var(--text-muted)';
+    statusEl.textContent = t('subModal.saving');
+    subdomainApiCall('DELETE', '/v1/admin/subdomains/' + encodeURIComponent(subdomainModalState.existingSub))
+      .then(function () {
+        statusEl.style.color = '#34d399';
+        statusEl.textContent = '✔ ' + t('subModal.unassigned');
+        document.getElementById('subdomain-unassign-btn').style.display = 'none';
+        subdomainModalState.existingSub = null;
+        return loadSubdomainSites();
+      })
+      .then(function () { loadPublishedApps(); })
+      .catch(function (err) {
+        statusEl.style.color = '#ef4444';
+        statusEl.textContent = err.message || String(err);
+      });
+  }
+
+  // ── Backup: export all + selective import ────────
+  // Follows the organism-export bundle model: one ZIP, manifest + per-item
+  // folders, inspect-before-write, explicit conflict modes — never a silent
+  // overwrite.
+
+  function toggleBackupMenu(event) {
+    if (event && event.stopPropagation) event.stopPropagation();
+    var menu = document.getElementById('backup-menu');
+    menu.hidden = !menu.hidden;
+  }
+
+  function backupApiBase() {
+    var config = loadConfig();
+    return (config.aimeatUrl || window.location.origin).replace(/\/+$/, '');
+  }
+
+  function exportBackupZip() {
+    document.getElementById('backup-menu').hidden = true;
+    var token = getCortexOwnerToken();
+    if (!token) { alert(t('backup.loginRequired')); return; }
+    var btn = document.getElementById('backup-btn');
+    btn.disabled = true;
+    fetch(backupApiBase() + '/v1/apps/backup', { headers: { 'Authorization': 'Bearer ' + token } })
+      .then(function (r) {
+        if (!r.ok) throw new Error('HTTP ' + r.status);
+        var cd = r.headers.get('Content-Disposition') || '';
+        var m = cd.match(/filename="([^"]+)"/);
+        return r.blob().then(function (b) { return { blob: b, name: m ? m[1] : 'aimeat-apps-backup.zip' }; });
+      })
+      .then(function (o) {
+        var a = document.createElement('a');
+        a.href = URL.createObjectURL(o.blob);
+        a.download = o.name;
+        a.click();
+        setTimeout(function () { URL.revokeObjectURL(a.href); }, 5000);
+      })
+      .catch(function (e) { alert('Export failed: ' + (e.message || e)); })
+      .finally(function () { btn.disabled = false; });
+  }
+
+  var backupInspectData = null;   // inspect response (apps, extensions, backup_token)
+
+  function importBackupPick() {
+    document.getElementById('backup-menu').hidden = true;
+    var token = getCortexOwnerToken();
+    if (!token) { alert(t('backup.loginRequired')); return; }
+    document.getElementById('backup-file-input').click();
+  }
+
+  function importBackupFile(file) {
+    var overlay = document.getElementById('backup-overlay');
+    var statusEl = document.getElementById('backup-status');
+    var body = document.getElementById('backup-import-body');
+    document.getElementById('backup-restore-btn').style.display = 'none';
+    body.innerHTML = '';
+    statusEl.style.color = 'var(--text-muted)';
+    statusEl.textContent = t('backup.inspecting');
+    overlay.hidden = false;
+
+    file.arrayBuffer()
+      .then(function (buf) {
+        return fetch(backupApiBase() + '/v1/apps/backup/inspect', {
+          method: 'POST',
+          headers: {
+            'Authorization': 'Bearer ' + getCortexOwnerToken(),
+            'Content-Type': 'application/zip'
+          },
+          body: buf
+        });
+      })
+      .then(function (r) { return r.json().then(function (j) { return { status: r.status, json: j }; }); })
+      .then(function (o) {
+        if (!o.json.ok) {
+          var msg = (o.json.error && (o.json.error.message || o.json.error.code)) || ('HTTP ' + o.status);
+          throw new Error(msg);
+        }
+        backupInspectData = o.json.data;
+        statusEl.textContent = '';
+        renderBackupSelection();
+      })
+      .catch(function (e) {
+        statusEl.style.color = '#ef4444';
+        statusEl.textContent = e.message || String(e);
+      });
+  }
+
+  function renderBackupSelection() {
+    var d = backupInspectData;
+    var body = document.getElementById('backup-import-body');
+    if (!d || (d.apps.length === 0 && d.extensions.length === 0)) {
+      body.innerHTML = '<p style="color:var(--text-muted)">' + t('backup.empty') + '</p>';
+      return;
+    }
+
+    var conflictOptions =
+      '<option value="skip">' + t('backup.conflictSkip') + '</option>' +
+      '<option value="append">' + t('backup.conflictAppend') + '</option>' +
+      '<option value="copy">' + t('backup.conflictCopy') + '</option>';
+
+    var html =
+      '<div style="font-size:.8rem;color:var(--text-muted)">' + t('backup.from') + ': <span style="font-family:monospace">' +
+        escapeHtml((d.source.owner || '?') + '@' + (d.source.nodeId || '?')) + '</span>' +
+        (d.exported_at ? ' · ' + new Date(d.exported_at).toLocaleString() : '') +
+      '</div>' +
+      '<div class="backup-toolbar-row">' +
+        '<div>' +
+          '<button class="backup-link-btn" onclick="window._launcher.backupSelectAll(true)">' + t('backup.selectAll') + '</button> / ' +
+          '<button class="backup-link-btn" onclick="window._launcher.backupSelectAll(false)">' + t('backup.selectNone') + '</button>' +
+        '</div>' +
+        '<div class="backup-summary-line" id="backup-summary"></div>' +
+      '</div>' +
+      '<table class="backup-table"><thead><tr>' +
+        '<th></th><th>' + t('backup.colApp') + '</th><th>' + t('backup.colVersions') + '</th><th>' + t('backup.colStatus') + '</th>' +
+      '</tr></thead><tbody>';
+
+    for (var i = 0; i < d.apps.length; i++) {
+      var app = d.apps[i];
+      var versionList = '';
+      for (var v = 0; v < app.versions.length; v++) {
+        var ver = app.versions[v];
+        versionList +=
+          '<label><input type="checkbox" class="backup-ver" data-app="' + i + '" data-v="' + ver.version + '" checked ' +
+            'onchange="window._launcher.backupUpdateSummary()"/> v' + ver.version +
+            (ver.semver ? ' (' + escapeHtml(ver.semver) + ')' : '') +
+            ' · ' + (ver.size < 1024 ? ver.size + ' B' : (ver.size / 1024).toFixed(1) + ' KB') +
+            (ver.created_at ? ' · ' + new Date(ver.created_at).toLocaleDateString() : '') +
+          '</label>';
+      }
+      html +=
+        '<tr>' +
+          '<td><input type="checkbox" id="backup-app-' + i + '" checked onchange="window._launcher.backupUpdateSummary()"/></td>' +
+          '<td>' + escapeHtml(app.name || app.filename) +
+            '<div class="mono-cell">' + escapeHtml(app.filename) + '</div></td>' +
+          '<td>' + app.versions.length + ' ' +
+            '<button class="backup-versions-toggle" onclick="var el=document.getElementById(\'backup-app-' + i + '-versions\');el.style.display=el.style.display===\'none\'?\'\':\'none\'">' + t('backup.colVersions').toLowerCase() + ' ▾</button>' +
+            '<div class="backup-version-list" id="backup-app-' + i + '-versions" style="display:none">' + versionList + '</div></td>' +
+          '<td>' +
+            (app.exists
+              ? '<span class="backup-status-badge backup-status-exists">' + t('backup.statusExists') + '</span><br/>' +
+                '<select class="backup-conflict-select" id="backup-app-' + i + '-conflict">' + conflictOptions + '</select>'
+              : '<span class="backup-status-badge backup-status-new">' + t('backup.statusNew') + '</span>') +
+          '</td>' +
+        '</tr>';
+    }
+    html += '</tbody></table>';
+
+    if (d.extensions.length > 0) {
+      html += '<h3 style="font-size:.9rem;margin:14px 0 6px">' + t('backup.extensions') + '</h3>';
+      for (var e = 0; e < d.extensions.length; e++) {
+        var ext = d.extensions[e];
+        html +=
+          '<div style="display:flex;align-items:center;gap:8px;padding:4px 8px;font-size:.85rem">' +
+            '<input type="checkbox" id="backup-ext-' + e + '" checked onchange="window._launcher.backupUpdateSummary()"/>' +
+            '<span style="font-family:monospace">' + escapeHtml(ext.name) + '</span>' +
+            (ext.exists
+              ? '<span class="backup-status-badge backup-status-exists">' + t('backup.statusExists') + '</span>' +
+                '<select class="backup-conflict-select" id="backup-ext-' + e + '-conflict">' +
+                  '<option value="skip">' + t('backup.conflictSkip') + '</option>' +
+                  '<option value="copy">' + t('backup.conflictCopy') + '</option>' +
+                '</select>'
+              : '<span class="backup-status-badge backup-status-new">' + t('backup.statusNew') + '</span>') +
+          '</div>';
+      }
+    }
+
+    body.innerHTML = html;
+    document.getElementById('backup-restore-btn').style.display = '';
+    backupUpdateSummary();
+  }
+
+  // Reads the current selection straight from the DOM — no parallel state to drift.
+  function backupCollectSelections() {
+    var d = backupInspectData;
+    var selections = [];
+    var extensions = [];
+    if (!d) return { selections: selections, extensions: extensions, versionTotal: 0 };
+    var versionTotal = 0;
+    for (var i = 0; i < d.apps.length; i++) {
+      var cb = document.getElementById('backup-app-' + i);
+      if (!cb || !cb.checked) continue;
+      var app = d.apps[i];
+      var checkedVers = [];
+      var verBoxes = document.querySelectorAll('.backup-ver[data-app="' + i + '"]');
+      verBoxes.forEach(function (b) { if (b.checked) checkedVers.push(parseInt(b.getAttribute('data-v'), 10)); });
+      if (checkedVers.length === 0) continue;
+      var sel = { filename: app.filename };
+      if (checkedVers.length !== app.versions.length) sel.versions = checkedVers;
+      if (app.exists) {
+        var conflictEl = document.getElementById('backup-app-' + i + '-conflict');
+        sel.conflict = conflictEl ? conflictEl.value : 'skip';
+      }
+      versionTotal += checkedVers.length;
+      selections.push(sel);
+    }
+    for (var e = 0; e < d.extensions.length; e++) {
+      var ecb = document.getElementById('backup-ext-' + e);
+      if (!ecb || !ecb.checked) continue;
+      var ext = { name: d.extensions[e].name };
+      if (d.extensions[e].exists) {
+        var ecEl = document.getElementById('backup-ext-' + e + '-conflict');
+        ext.conflict = ecEl ? ecEl.value : 'skip';
+      }
+      extensions.push(ext);
+    }
+    return { selections: selections, extensions: extensions, versionTotal: versionTotal };
+  }
+
+  function backupUpdateSummary() {
+    var sel = backupCollectSelections();
+    var el = document.getElementById('backup-summary');
+    if (!el) return;
+    el.textContent = t('backup.restoring') + ': ' + sel.selections.length + ' ' + t('backup.sumApps') +
+      ', ' + sel.versionTotal + ' ' + t('backup.sumVersions') +
+      (sel.extensions.length ? ', ' + sel.extensions.length + ' ' + t('backup.sumExts') : '');
+  }
+
+  function backupSelectAll(checked) {
+    var d = backupInspectData;
+    if (!d) return;
+    for (var i = 0; i < d.apps.length; i++) {
+      var cb = document.getElementById('backup-app-' + i);
+      if (cb) cb.checked = checked;
+      document.querySelectorAll('.backup-ver[data-app="' + i + '"]').forEach(function (b) { b.checked = checked; });
+    }
+    for (var e = 0; e < d.extensions.length; e++) {
+      var ecb = document.getElementById('backup-ext-' + e);
+      if (ecb) ecb.checked = checked;
+    }
+    backupUpdateSummary();
+  }
+
+  function submitBackupRestore() {
+    var sel = backupCollectSelections();
+    var statusEl = document.getElementById('backup-status');
+    if (sel.selections.length === 0 && sel.extensions.length === 0) {
+      statusEl.style.color = '#ef4444';
+      statusEl.textContent = t('backup.nothingSelected');
+      return;
+    }
+    statusEl.style.color = 'var(--text-muted)';
+    statusEl.textContent = t('backup.restoring') + '...';
+    var btn = document.getElementById('backup-restore-btn');
+    btn.disabled = true;
+    fetch(backupApiBase() + '/v1/apps/backup/restore', {
+      method: 'POST',
+      headers: {
+        'Authorization': 'Bearer ' + getCortexOwnerToken(),
+        'Content-Type': 'application/json'
+      },
+      body: JSON.stringify({
+        backup_token: backupInspectData.backup_token,
+        selections: sel.selections,
+        extensions: sel.extensions
+      })
+    })
+      .then(function (r) { return r.json(); })
+      .then(function (json) {
+        if (!json.ok) {
+          var msg = (json.error && (json.error.message || json.error.code)) || 'Restore failed';
+          throw new Error(msg);
+        }
+        statusEl.textContent = '';
+        renderBackupResult(json.data);
+        refreshAll();
+      })
+      .catch(function (e) {
+        statusEl.style.color = '#ef4444';
+        statusEl.textContent = e.message || String(e);
+      })
+      .finally(function () { btn.disabled = false; });
+  }
+
+  function renderBackupResult(s) {
+    var body = document.getElementById('backup-import-body');
+    document.getElementById('backup-restore-btn').style.display = 'none';
+    var section = function (label, items) {
+      if (!items || items.length === 0) return '';
+      var rendered = items.map(function (x) {
+        if (typeof x === 'string') return escapeHtml(x);
+        if (x && x.from && x.to) return escapeHtml(x.from) + ' → ' + escapeHtml(x.to);
+        if (x && x.item) return escapeHtml(x.item) + ': ' + escapeHtml(x.message || '');
+        return escapeHtml(JSON.stringify(x));
+      });
+      return '<div style="font-size:.85rem;font-weight:600;margin-top:8px">' + label + ' (' + items.length + ')</div>' +
+        '<ul class="backup-result-list">' + rendered.map(function (r) { return '<li>' + r + '</li>'; }).join('') + '</ul>';
+    };
+    body.innerHTML =
+      '<h3 style="font-size:.95rem;margin:6px 0">✔ ' + t('backup.resultTitle') + '</h3>' +
+      '<div style="font-size:.85rem">' + t('backup.resVersions') + ': ' + s.versions_restored + '</div>' +
+      section(t('backup.resCreated'), s.apps_created.concat(s.extensions_created)) +
+      section(t('backup.resAppended'), s.apps_appended) +
+      section(t('backup.resCopied'), s.apps_copied.concat(s.extensions_copied)) +
+      section(t('backup.resSkipped'), s.apps_skipped.concat(s.extensions_skipped)) +
+      (s.errors.length ? '<div class="backup-result-errors">' + section(t('backup.resErrors'), s.errors) + '</div>' : '');
+  }
+
+  // ── Server → local import (user-selected, NEVER automatic) ────
+  // Apps published under this owner's account (e.g. via MCP) may exist only on
+  // the server. Importing one into the local catalog gives it the exact same
+  // management actions (edit, rename, tags, versions, delete) as locally
+  // created apps. The import is ALWAYS user-initiated: a banner reports how
+  // many published apps are missing locally, and a review modal lets the user
+  // pick exactly which ones to import. The tombstone list marks apps the user
+  // deleted locally so the banner doesn't nag about them (they stay reachable
+  // in the modal, unchecked).
+
+  var IMPORT_IGNORE_KEY = 'appCatalogImportIgnore';
+
+  function getImportIgnore() {
+    try { return JSON.parse(localStorage.getItem(IMPORT_IGNORE_KEY) || '[]'); } catch (e) { return []; }
+  }
+
+  function addImportIgnore(filename) {
+    var list = getImportIgnore();
+    if (list.indexOf(filename) === -1) {
+      list.push(filename);
+      localStorage.setItem(IMPORT_IGNORE_KEY, JSON.stringify(list));
+    }
+  }
+
+  function removeImportIgnore(filename) {
+    var list = getImportIgnore().filter(function (f) { return f !== filename; });
+    localStorage.setItem(IMPORT_IGNORE_KEY, JSON.stringify(list));
+  }
+
+  // State for the review modal: own server apps with no local copy.
+  var serverImportState = { missing: [], aimeatUrl: '' };
+
+  function updateServerImportState(ownApps, localByFilename, aimeatUrl) {
+    serverImportState.missing = ownApps.filter(function (sa) {
+      return sa.filename && !localByFilename[sa.filename];
+    });
+    serverImportState.aimeatUrl = aimeatUrl;
+    renderServerImportBanner();
+  }
+
+  function renderServerImportBanner() {
+    var banner = document.getElementById('server-import-banner');
+    if (!banner) return;
+    var ignore = getImportIgnore();
+    // Tombstoned apps (deleted locally on purpose) don't count toward the nag
+    var fresh = serverImportState.missing.filter(function (sa) { return ignore.indexOf(sa.filename) === -1; });
+    if (fresh.length === 0 || sessionStorage.getItem('aimeatServerImportDismissed') === '1') {
+      banner.style.display = 'none';
+      return;
+    }
+    document.getElementById('server-import-count').textContent = fresh.length;
+    banner.style.display = '';
+  }
+
+  function dismissServerImportBanner() {
+    sessionStorage.setItem('aimeatServerImportDismissed', '1');
+    renderServerImportBanner();
+  }
+
+  function showServerImportModal() {
+    var missing = serverImportState.missing;
+    var body = document.getElementById('server-import-body');
+    var ignore = getImportIgnore();
+    var html = '<p style="font-size:.8rem;color:var(--text-muted);margin:4px 0 8px">' + t('srvImport.desc') + '</p>' +
+      '<div class="backup-toolbar-row"><div>' +
+        '<button class="backup-link-btn" onclick="window._launcher.serverImportSelectAll(true)">' + t('backup.selectAll') + '</button> / ' +
+        '<button class="backup-link-btn" onclick="window._launcher.serverImportSelectAll(false)">' + t('backup.selectNone') + '</button>' +
+      '</div></div>' +
+      '<table class="backup-table"><tbody>';
+    for (var i = 0; i < missing.length; i++) {
+      var sa = missing[i];
+      var name = (sa.manifest && sa.manifest.name) ? sa.manifest.name : sa.filename;
+      // Locally deleted (tombstoned) apps stay reachable here but default to unchecked
+      var checked = ignore.indexOf(sa.filename) === -1 ? ' checked' : '';
+      html +=
+        '<tr>' +
+          '<td><input type="checkbox" class="server-import-cb" data-i="' + i + '"' + checked + '/></td>' +
+          '<td>' + escapeHtml(name) + '<div class="mono-cell">' + escapeHtml(sa.filename) + '</div></td>' +
+          '<td>' + (sa.version_number ? 'v' + sa.version_number : '') + '</td>' +
+          '<td>' + (sa.created_at ? new Date(sa.created_at).toLocaleDateString() : '') + '</td>' +
+        '</tr>';
+    }
+    html += '</tbody></table>';
+    body.innerHTML = html;
+    document.getElementById('server-import-status').textContent = '';
+    document.getElementById('server-import-overlay').hidden = false;
+  }
+
+  function serverImportSelectAll(checked) {
+    document.querySelectorAll('.server-import-cb').forEach(function (b) { b.checked = checked; });
+  }
+
+  function submitServerImport() {
+    var selected = [];
+    document.querySelectorAll('.server-import-cb').forEach(function (b) {
+      if (b.checked) selected.push(serverImportState.missing[parseInt(b.getAttribute('data-i'), 10)]);
+    });
+    var statusEl = document.getElementById('server-import-status');
+    if (selected.length === 0) {
+      statusEl.style.color = '#ef4444';
+      statusEl.textContent = t('backup.nothingSelected');
+      return;
+    }
+    statusEl.style.color = 'var(--text-muted)';
+    statusEl.textContent = t('srvImport.importing');
+    importServerApps(selected, serverImportState.aimeatUrl).then(function () {
+      // Importing an app the user once deleted is an explicit re-opt-in
+      selected.forEach(function (sa) { removeImportIgnore(sa.filename); });
+      document.getElementById('server-import-overlay').hidden = true;
+      renderApps();
+      loadPublishedApps();
+    }).catch(function (e) {
+      statusEl.style.color = '#ef4444';
+      statusEl.textContent = e.message || String(e);
+    });
+  }
+
+  function importServerApps(toImport, aimeatUrl) {
+    if (toImport.length === 0) return Promise.resolve(false);
+    return Promise.all(toImport.map(function (sa) {
+      var url = aimeatUrl + '/v1/apps/' + encodeURIComponent(sa.owner || '') + '/' + encodeURIComponent(sa.filename) + '?mode=inline';
+      return fetch(url)
+        .then(function (r) { if (!r.ok) throw new Error('HTTP ' + r.status); return r.text(); })
+        .then(function (source) {
+          var manifest = sa.manifest || {};
+          var app = {
+            id: generateId(),
+            name: manifest.name || sa.filename,
+            description: manifest.description || '',
+            source: 'aimeat',
+            origin: 'ai-published',
+            url: null,
+            blob: btoa(unescape(encodeURIComponent(source))),
+            tags: manifest.tags || [],
+            openMode: 'tab',
+            icon: manifest.icon || '\u{1F916}',
+            screenshot: null,
+            favorite: false,
+            addedAt: sa.created_at || new Date().toISOString(),
+            lastOpenedAt: null,
+            published: true,
+            publishedFilename: sa.filename,
+            publishedAt: sa.created_at || new Date().toISOString(),
+            publishedUrl: '/v1/apps/' + encodeURIComponent(sa.owner || '') + '/' + encodeURIComponent(sa.filename),
+            publishedVersionNumber: sa.version_number || 1
+          };
+          return saveApp(app);
+        })
+        .catch(function () { return null; }); // protected/unreachable app — skip silently
+    })).then(function () { return true; });
+  }
+
   // Manifest cache keyed by "owner\nfilename" — lets Restore/Fork reuse the
   // app's metadata (name, description, category, tags, icon) without a re-fetch.
   var serverAppManifests = {};
@@ -3729,8 +4754,14 @@
             ? serverApps.filter(function(a) { return !sameOwner(a.owner, currentOwner); })
             : serverApps;
 
-          renderPublishedApps(localPublished, ownApps, localByFilename, aimeatUrl, section, grid, countEl);
-          renderCommunityApps(communityApps, aimeatUrl, communitySection, communityGrid, communityCountEl, currentOwner);
+          return loadSubdomainSites().then(function () {
+            renderPublishedApps(localPublished, ownApps, localByFilename, aimeatUrl, section, grid, countEl);
+            renderCommunityApps(communityApps, aimeatUrl, communitySection, communityGrid, communityCountEl, currentOwner);
+            // Server-published own apps missing from the local catalog are
+            // NEVER imported automatically — the banner offers a review modal
+            // where the user picks exactly which ones to import.
+            updateServerImportState(ownApps, localByFilename, aimeatUrl);
+          });
         })
         .catch(function() {
           renderPublishedApps(localPublished, [], localByFilename, aimeatUrl, section, grid, countEl);
@@ -3829,11 +4860,29 @@
     section.style.display = '';
     countEl.textContent = '(' + merged.length + ')';
 
+    // Operator-only: subdomain chip/assign controls on own server-published cards
+    var showSubdomainControls = !!subdomainsByTarget && isOperatorSession();
+
     var html = '';
     for (var i = 0; i < merged.length; i++) {
       var app = merged[i];
       var badgeClass = app.source === 'both' ? 'both' : (app.source === 'server' ? 'server' : 'local');
       var badgeLabel = app.source === 'both' ? 'PORTAL + MCP' : (app.source === 'server' ? 'MCP' : 'PORTAL');
+
+      var subChipHtml = '';
+      var subBtnHtml = '';
+      if (showSubdomainControls && app.isOwn && app.filename) {
+        var targetKey = bareOwnerName(app.owner) + '/' + app.filename;
+        var mapping = subdomainsByTarget[targetKey] || null;
+        var openModal = 'window._launcher.showSubdomainModal(\'' + escapeHtml(app.owner || '') + '\', \'' + escapeHtml(app.filename) + '\')';
+        if (mapping) {
+          subChipHtml = '<div><span class="subdomain-chip" onclick="' + openModal + '" title="' + t('subModal.title') + '">&#x1F310; ' +
+            escapeHtml(mapping.subdomain + '.' + apexHostLabel()) + '</span></div>';
+        } else {
+          subBtnHtml = '<button onclick="' + openModal + '">' + t('card.subdomain') + '</button>';
+        }
+      }
+
       html +=
         '<div class="published-card">' +
           '<div class="published-card-name">' + escapeHtml(app.name) + (app.version ? ' <span style="opacity:.5;font-size:.85em">' + escapeHtml(app.version) + '</span>' : '') +
@@ -3843,9 +4892,11 @@
             '<span>' + escapeHtml(app.filename) + '</span>' +
             '<span>' + app.date + '</span>' +
           '</div>' +
+          subChipHtml +
           '<div class="published-card-actions">' +
             (app.viewUrl ? '<button onclick="window.open(\'' + escapeHtml(app.viewUrl) + '?mode=inline\', \'_blank\')">' + t('card.view') + '</button>' : '') +
             (app.isOwn && app.filename ? '<button onclick="window._launcher.showVersionsModal(\'' + escapeHtml(app.owner || '') + '\', \'' + escapeHtml(app.filename) + '\')">' + t('card.versions') + '</button>' : '') +
+            subBtnHtml +
             (app.localId ? '<button onclick="window._launcher.unpublishApp(\'' + escapeHtml(app.localId) + '\')" class="danger">' + t('card.remove') + '</button>' :
              app.isOwn ? '<button onclick="window._launcher.deleteServerApp(\'' + escapeHtml(app.filename) + '\')" class="danger">' + t('card.remove') + '</button>' : '') +
           '</div>' +
@@ -3875,6 +4926,7 @@
       .then(function(resp) { return resp.json(); })
       .then(function(json) {
         if (json.ok) {
+          removeImportIgnore(app.publishedFilename);
           app.published = false;
           delete app.publishedFilename;
           delete app.publishedAt;
@@ -3906,6 +4958,7 @@
       .then(function(resp) { return resp.json(); })
       .then(function(json) {
         if (json.ok) {
+          removeImportIgnore(filename); // a future republish should import again
           loadPublishedApps();
         } else {
           alert('Failed to delete: ' + (json.error && json.error.message ? json.error.message : 'Unknown error'));
@@ -4886,6 +5939,22 @@
     switchDbMode: switchDbMode,
     unpublishApp: unpublishApp,
     deleteServerApp: deleteServerApp,
+    showSubdomainModal: showSubdomainModal,
+    submitSubdomainAssign: submitSubdomainAssign,
+    unassignSubdomain: unassignSubdomain,
+    jsonImportSelectAll: jsonImportSelectAll,
+    submitJsonImport: submitJsonImport,
+    removeDuplicateApps: removeDuplicateApps,
+    showServerImportModal: showServerImportModal,
+    dismissServerImportBanner: dismissServerImportBanner,
+    serverImportSelectAll: serverImportSelectAll,
+    submitServerImport: submitServerImport,
+    toggleBackupMenu: toggleBackupMenu,
+    exportBackupZip: exportBackupZip,
+    importBackupPick: importBackupPick,
+    backupSelectAll: backupSelectAll,
+    backupUpdateSummary: backupUpdateSummary,
+    submitBackupRestore: submitBackupRestore,
     showVersionsModal: showVersionsModal,
     restoreVersion: restoreVersion,
     forkVersion: forkVersion,
@@ -5002,6 +6071,40 @@
       }
     });
 
+    // ── Click subdomain overlay to close ────────────
+    document.getElementById('subdomain-overlay').addEventListener('click', function (e) {
+      if (e.target === this) {
+        this.hidden = true;
+      }
+    });
+
+    // ── Backup: file picker + overlay/menu close ────
+    document.getElementById('backup-file-input').addEventListener('change', function () {
+      if (this.files && this.files[0]) importBackupFile(this.files[0]);
+      this.value = '';
+    });
+    document.getElementById('backup-overlay').addEventListener('click', function (e) {
+      if (e.target === this) {
+        this.hidden = true;
+      }
+    });
+    document.getElementById('server-import-overlay').addEventListener('click', function (e) {
+      if (e.target === this) {
+        this.hidden = true;
+      }
+    });
+    document.getElementById('json-import-overlay').addEventListener('click', function (e) {
+      if (e.target === this) {
+        this.hidden = true;
+      }
+    });
+    document.addEventListener('click', function (e) {
+      var menu = document.getElementById('backup-menu');
+      if (!menu.hidden && !menu.contains(e.target) && e.target.id !== 'backup-btn') {
+        menu.hidden = true;
+      }
+    });
+
     // ── Click cortex popup overlay to close ─────────
     document.getElementById('cortex-popup-overlay').addEventListener('click', function (e) {
       if (e.target === this) {
@@ -5142,6 +6245,14 @@
           document.getElementById('aimeat-import-overlay').hidden = true;
         } else if (!document.getElementById('publish-overlay').hidden) {
           document.getElementById('publish-overlay').hidden = true;
+        } else if (!document.getElementById('subdomain-overlay').hidden) {
+          document.getElementById('subdomain-overlay').hidden = true;
+        } else if (!document.getElementById('backup-overlay').hidden) {
+          document.getElementById('backup-overlay').hidden = true;
+        } else if (!document.getElementById('server-import-overlay').hidden) {
+          document.getElementById('server-import-overlay').hidden = true;
+        } else if (!document.getElementById('json-import-overlay').hidden) {
+          document.getElementById('json-import-overlay').hidden = true;
         } else if (!document.getElementById('settings-overlay').hidden) {
           closeSettings();
         } else if (!document.getElementById('modal-overlay').hidden) {