depository-deploy 1.0.23 → 1.0.24

package/install/install-unix.sh

@@ -191,7 +191,7 @@ fi
 
 # ---- Create directories ----
 info "Creating directories..."
-mkdir -p "$INSTALL_DIR"/{api,auth,worker,gatherer,digestor,ui,logs}
+mkdir -p "$INSTALL_DIR"/{api,auth,worker,gatherer,digestor,setup,ui,logs}
 mkdir -p "$DATA_DIR"
 chown -R depository:depository "$INSTALL_DIR" "$DATA_DIR"
 
@@ -223,6 +223,9 @@ cp -r "$RELEASE_DIR/auth/"*    "$INSTALL_DIR/auth/"
 cp -r "$RELEASE_DIR/worker/"*  "$INSTALL_DIR/worker/"
 cp -r "$RELEASE_DIR/gatherer/"* "$INSTALL_DIR/gatherer/"
 cp -r "$RELEASE_DIR/digestor/"* "$INSTALL_DIR/digestor/"
+if [ -d "$RELEASE_DIR/setup" ]; then
+    cp -r "$RELEASE_DIR/setup/"* "$INSTALL_DIR/setup/"
+fi
 # UI is platform-independent — may be at $RELEASE_DIR/ui or one level up (release/ui)
 UI_SRC="$RELEASE_DIR/ui"
 if [ ! -d "$UI_SRC" ]; then
@@ -238,52 +241,33 @@ chmod +x "$INSTALL_DIR/auth/DEPOSITORY.API.OATH"
 chmod +x "$INSTALL_DIR/worker/DEPOSITORY.CORE.WORKER"
 chmod +x "$INSTALL_DIR/gatherer/DEPOSITORY.CORE.GATHERER"
 chmod +x "$INSTALL_DIR/digestor/DEPOSITORY.CORE.DIGESTOR"
+if [ -f "$INSTALL_DIR/setup/DEPOSITORY.TOOLS.SETUP" ]; then
+    chmod +x "$INSTALL_DIR/setup/DEPOSITORY.TOOLS.SETUP"
+fi
 chown -R depository:depository "$INSTALL_DIR"
 
-# ---- Generate appsettings.json files ----
-info "Generating configuration files..."
-apply_template "$TEMPLATE_DIR/appsettings-api.json"      "$INSTALL_DIR/api/appsettings.json"
-apply_template "$TEMPLATE_DIR/appsettings-auth.json"     "$INSTALL_DIR/auth/appsettings.json"
-apply_template "$TEMPLATE_DIR/appsettings-worker.json"   "$INSTALL_DIR/worker/appsettings.json"
-apply_template "$TEMPLATE_DIR/appsettings-gatherer.json" "$INSTALL_DIR/gatherer/appsettings.json"
-apply_template "$TEMPLATE_DIR/appsettings-digestor.json" "$INSTALL_DIR/digestor/appsettings.json"
-
-# ---- Clean database (if requested) ----
-if [ "${CLEAN_DB:-false}" = "true" ]; then
-    warn "CLEAN_DB=true — database will be wiped on first service start."
-    if [ "$DB_PROVIDER" = "Oracle" ]; then
-        # Set OracleForceRecreate=true in api appsettings so the REST service drops all tables
-        if command -v python3 &>/dev/null; then
-            python3 -c "
-import json, sys
-p='$INSTALL_DIR/api/appsettings.json'
-with open(p) as f: d=json.load(f)
-d.setdefault('DatabaseConfiguration',{})['OracleForceRecreate']=True
-with open(p,'w') as f: json.dump(d,f,indent=2)
-print('  OracleForceRecreate set to true in api/appsettings.json')
-"
-        else
-            sed -i 's/"OracleForceRecreate": false/"OracleForceRecreate": true/' "$INSTALL_DIR/api/appsettings.json"
-            info "  OracleForceRecreate set to true in api/appsettings.json"
-        fi
-    elif [ "$DB_PROVIDER" = "SqlServer" ]; then
-        # Drop and recreate both SQL Server databases so EF migrations start fresh
-        info "  Dropping SQL Server databases: ${SQLSERVER_DATABASE}, DEPOSITORY_Users ..."
-        SQLCMD=""
-        if command -v sqlcmd &>/dev/null; then SQLCMD="sqlcmd"; fi
-        if [ -z "$SQLCMD" ] && [ -f /opt/mssql-tools18/bin/sqlcmd ]; then SQLCMD="/opt/mssql-tools18/bin/sqlcmd"; fi
-        if [ -z "$SQLCMD" ] && [ -f /opt/mssql-tools/bin/sqlcmd ]; then SQLCMD="/opt/mssql-tools/bin/sqlcmd"; fi
-        if [ -n "$SQLCMD" ]; then
-            for DBNAME in "$SQLSERVER_DATABASE" "DEPOSITORY_Users"; do
-                "$SQLCMD" -S "${SQLSERVER_HOST},${SQLSERVER_PORT}" -U "$SQLSERVER_USER" -P "$SQLSERVER_PASSWORD" \
-                    -C -Q "IF DB_ID('${DBNAME}') IS NOT NULL BEGIN ALTER DATABASE [${DBNAME}] SET SINGLE_USER WITH ROLLBACK IMMEDIATE; DROP DATABASE [${DBNAME}]; END" \
-                    2>/dev/null && info "  Dropped database: ${DBNAME}" || warn "  Could not drop ${DBNAME} (may not exist yet)"
-            done
-        else
-            warn "  sqlcmd not found — cannot drop SQL Server databases automatically."
-            warn "  The services will create fresh databases via EF migrations on first start."
-        fi
+# ---- Run centralised database setup & config generation ----
+SETUP_EXE="$INSTALL_DIR/setup/DEPOSITORY.TOOLS.SETUP"
+if [ -f "$SETUP_EXE" ]; then
+    info "Running database setup & configuration generation..."
+    SETUP_ARGS="--config $CONF_FILE --install-dir $INSTALL_DIR --verbose"
+    if [ "${CLEAN_DB:-false}" = "true" ]; then
+        SETUP_ARGS="$SETUP_ARGS --force-recreate"
+        warn "CLEAN_DB=true — database will be wiped and recreated."
     fi
+    "$SETUP_EXE" $SETUP_ARGS
+    if [ $? -ne 0 ]; then
+        error "Database setup failed. Check the output above."
+    fi
+    info "Database setup completed successfully."
+else
+    warn "Setup tool not found at $SETUP_EXE — falling back to template-based configuration."
+    info "Generating configuration files from templates..."
+    apply_template "$TEMPLATE_DIR/appsettings-api.json"      "$INSTALL_DIR/api/appsettings.json"
+    apply_template "$TEMPLATE_DIR/appsettings-auth.json"     "$INSTALL_DIR/auth/appsettings.json"
+    apply_template "$TEMPLATE_DIR/appsettings-worker.json"   "$INSTALL_DIR/worker/appsettings.json"
+    apply_template "$TEMPLATE_DIR/appsettings-gatherer.json" "$INSTALL_DIR/gatherer/appsettings.json"
+    apply_template "$TEMPLATE_DIR/appsettings-digestor.json" "$INSTALL_DIR/digestor/appsettings.json"
 fi
 
 # ---- Install systemd services ----

package/install/install-windows.ps1

@@ -195,7 +195,7 @@ Start-Sleep -Seconds 2
 
 # ---- Create directories ----
 Write-Info "Creating directories..."
-foreach ($sub in @("api","auth","worker","gatherer","digestor","ui","logs")) {
+foreach ($sub in @("api","auth","worker","gatherer","digestor","setup","ui","logs")) {
     $p = Join-Path $INSTALL_DIR $sub
     if (-not (Test-Path $p)) { New-Item -ItemType Directory -Path $p -Force | Out-Null }
 }
@@ -223,47 +223,28 @@ if (-not (Test-Path $uiSrc)) {
 if (-not (Test-Path $uiSrc)) { Write-Fail "UI folder not found at $ReleaseDir\ui or $(Split-Path -Parent $ReleaseDir)\ui" }
 Copy-Item "$uiSrc\*" (Join-Path $INSTALL_DIR "ui") -Recurse -Force
 
-# ---- Generate appsettings.json ----
-Write-Info "Generating configuration files..."
-Apply-Template "$TemplateDir\appsettings-api.json"      "$INSTALL_DIR\api\appsettings.json"
-Apply-Template "$TemplateDir\appsettings-auth.json"     "$INSTALL_DIR\auth\appsettings.json"
-Apply-Template "$TemplateDir\appsettings-worker.json"   "$INSTALL_DIR\worker\appsettings.json"
-Apply-Template "$TemplateDir\appsettings-gatherer.json" "$INSTALL_DIR\gatherer\appsettings.json"
-Apply-Template "$TemplateDir\appsettings-digestor.json" "$INSTALL_DIR\digestor\appsettings.json"
-
-# ---- Clean database (if requested) ----
-if ($conf.CLEAN_DB -eq "true") {
-    Write-Warn "CLEAN_DB=true -- database will be wiped."
-    if ($conf.DB_PROVIDER -eq "Oracle") {
-        # Set OracleForceRecreate=true in api appsettings
-        $apiSettings = Join-Path $INSTALL_DIR "api\appsettings.json"
-        $json = Get-Content $apiSettings -Raw | ConvertFrom-Json
-        $json.DatabaseConfiguration.OracleForceRecreate = $true
-        $json | ConvertTo-Json -Depth 10 | Set-Content $apiSettings -Encoding UTF8
-        Write-Info "  OracleForceRecreate set to true in api/appsettings.json"
+# ---- Run centralised database setup & config generation ----
+$SetupExe = Join-Path $INSTALL_DIR "setup\DEPOSITORY.TOOLS.SETUP.exe"
+if (Test-Path $SetupExe) {
+    Write-Info "Running database setup & configuration generation..."
+    $setupArgs = @("--config", $ConfFile, "--install-dir", $INSTALL_DIR, "--verbose")
+    if ($conf.CLEAN_DB -eq "true") {
+        $setupArgs += "--force-recreate"
+        Write-Warn "CLEAN_DB=true -- database will be wiped and recreated."
     }
-    elseif ($conf.DB_PROVIDER -eq "SqlServer") {
-        # Drop and recreate SQL Server databases
-        Write-Info "  Dropping SQL Server databases..."
-        $sqlHost = "$($conf.SQLSERVER_HOST),$($conf.SQLSERVER_PORT)"
-        $sqlUser = $conf.SQLSERVER_USER
-        $sqlPass = $conf.SQLSERVER_PASSWORD
-        foreach ($dbName in @($conf.SQLSERVER_DATABASE, "DEPOSITORY_Users")) {
-            $dropSql = "IF DB_ID('$dbName') IS NOT NULL BEGIN ALTER DATABASE [$dbName] SET SINGLE_USER WITH ROLLBACK IMMEDIATE; DROP DATABASE [$dbName]; END"
-            try {
-                $connStr = "Server=$sqlHost;User ID=$sqlUser;Password=$sqlPass;TrustServerCertificate=true;"
-                $conn = New-Object System.Data.SqlClient.SqlConnection($connStr)
-                $conn.Open()
-                $cmd = $conn.CreateCommand()
-                $cmd.CommandText = $dropSql
-                $cmd.ExecuteNonQuery() | Out-Null
-                $conn.Close()
-                Write-Info "  Dropped database: $dbName"
-            } catch {
-                Write-Warn "  Could not drop ${dbName}: $($_.Exception.Message)"
-            }
-        }
+    & $SetupExe @setupArgs
+    if ($LASTEXITCODE -ne 0) {
+        Write-Fail "Database setup failed. Check the output above."
     }
+    Write-OK "Database setup completed successfully."
+} else {
+    Write-Warn "Setup tool not found at $SetupExe -- falling back to template-based configuration."
+    Write-Info "Generating configuration files from templates..."
+    Apply-Template "$TemplateDir\appsettings-api.json"      "$INSTALL_DIR\api\appsettings.json"
+    Apply-Template "$TemplateDir\appsettings-auth.json"     "$INSTALL_DIR\auth\appsettings.json"
+    Apply-Template "$TemplateDir\appsettings-worker.json"   "$INSTALL_DIR\worker\appsettings.json"
+    Apply-Template "$TemplateDir\appsettings-gatherer.json" "$INSTALL_DIR\gatherer\appsettings.json"
+    Apply-Template "$TemplateDir\appsettings-digestor.json" "$INSTALL_DIR\digestor\appsettings.json"
 }
 
 # ---- Register Windows Services ----

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "depository-deploy",
-  "version": "1.0.23",
+  "version": "1.0.24",
   "description": "Depository document management system – deployment wizard and installers",
   "license": "UNLICENSED",
   "publishConfig": {
@@ -25,9 +25,9 @@
     "scripts/publish.mjs"
   ],
   "optionalDependencies": {
-    "depository-deploy-linux": "1.0.23",
-    "depository-deploy-macos": "1.0.23",
-    "depository-deploy-windows": "1.0.23"
+    "depository-deploy-linux": "1.0.24",
+    "depository-deploy-macos": "1.0.24",
+    "depository-deploy-windows": "1.0.24"
   },
   "scripts": {
     "start": "node wizard-server.mjs"

package/wizard.html

@@ -435,20 +435,103 @@ input.err { border-color: var(--err) !important; box-shadow: 0 0 0 3px rgba(220,
 @keyframes blink {
   0%, 100% { opacity: 1; } 50% { opacity: .3; }
 }
-.log-pane {
-  background: #0f172a; border-radius: 8px;
-  padding: 12px 14px; font-family: ui-monospace, "Consolas", monospace;
-  font-size: 11.5px; line-height: 1.7; max-height: 280px; overflow-y: auto;
-  margin-top: 12px; display: none;
-  border: 1px solid rgba(255,255,255,.05);
+/* ── Terminal popup ─────────────────────────────────────── */
+.terminal-overlay {
+  display: none; position: fixed; inset: 0;
+  background: rgba(0,0,0,.55); z-index: 1000;
+  align-items: center; justify-content: center; padding: 16px;
+}
+.terminal-overlay.open { display: flex; }
+.terminal-modal {
+  width: min(800px, 100%); height: min(520px, 90vh);
+  background: #0f172a; border-radius: 10px;
+  display: flex; flex-direction: column;
+  border: 1px solid rgba(255,255,255,.12);
+  box-shadow: 0 20px 60px rgba(0,0,0,.6);
+  overflow: hidden; flex-shrink: 0;
+}
+.terminal-titlebar {
+  display: flex; align-items: center;
+  padding: 9px 12px; background: #1e293b;
+  border-bottom: 1px solid rgba(255,255,255,.07);
+  gap: 8px; flex-shrink: 0;
+}
+.terminal-dots { display: flex; gap: 6px; align-items: center; width: 54px; }
+.terminal-dot {
+  width: 12px; height: 12px; border-radius: 50%; cursor: pointer;
+  transition: filter .12s;
+}
+.terminal-dot:hover { filter: brightness(1.3); }
+.td-red    { background: #ef4444; }
+.td-yellow { background: #f59e0b; }
+.td-green  { background: #22c55e; }
+.terminal-title {
+  flex: 1; font-size: 11.5px;
+  font-family: ui-monospace, "Consolas", monospace;
+  color: rgba(255,255,255,.45); text-align: center; letter-spacing: .3px;
+}
+.terminal-body {
+  flex: 1; overflow-y: auto; padding: 12px 14px;
+  font-family: ui-monospace, "Consolas", monospace;
+  font-size: 11.5px; line-height: 1.7;
 }
-.log-pane.visible { display: block; }
 .log-line          { color: #94a3b8; white-space: pre-wrap; word-break: break-all; }
 .log-line.ok       { color: #86efac; }
 .log-line.err      { color: #fca5a5; }
 .log-line.warn     { color: #fcd34d; }
 .log-line.sect     { color: #93c5fd; font-weight: 600; }
 .log-line.dim      { color: rgba(148,163,184,.35); }
+/* ── Terminal filter tabs ───────────────────────────────── */
+.terminal-tabs {
+  display: flex; border-top: 1px solid rgba(255,255,255,.07);
+  background: #1e293b; flex-shrink: 0;
+}
+.terminal-tab {
+  flex: 1; padding: 8px 6px; border: none; background: none;
+  font-family: ui-monospace, "Consolas", monospace; font-size: 11.5px;
+  color: rgba(255,255,255,.38); cursor: pointer;
+  border-top: 2px solid transparent;
+  transition: color .12s, border-color .12s, background .12s;
+  display: flex; align-items: center; justify-content: center; gap: 6px;
+  white-space: nowrap;
+}
+.terminal-tab:hover { color: rgba(255,255,255,.7); background: rgba(255,255,255,.04); }
+.terminal-tab.active          { color: #fff; }
+.terminal-tab.active.tab-all  { border-top-color: var(--accent); }
+.terminal-tab.active.tab-info { border-top-color: #94a3b8; }
+.terminal-tab.active.tab-warn { border-top-color: #fcd34d; }
+.terminal-tab.active.tab-err  { border-top-color: #fca5a5; }
+.tab-badge {
+  font-size: 10.5px; padding: 1px 6px; border-radius: var(--r-pill);
+  background: rgba(255,255,255,.1); min-width: 20px; text-align: center;
+  line-height: 1.6;
+}
+.terminal-tab.tab-warn.has-items .tab-badge { background: rgba(252,211,77,.18); color: #fcd34d; }
+.terminal-tab.tab-err.has-items  .tab-badge { background: rgba(252,165,165,.18); color: #fca5a5; }
+/* ── Inline log pane (download progress only) ──────────────── */
+.log-pane {
+  background: #0f172a; border-radius: 8px;
+  padding: 10px 12px; font-family: ui-monospace, "Consolas", monospace;
+  font-size: 11px; line-height: 1.65; max-height: 140px; overflow-y: auto;
+  margin-top: 10px; display: none;
+  border: 1px solid rgba(255,255,255,.06);
+}
+.log-pane.visible { display: block; }
+/* ── View-logs button ───────────────────────────────────── */
+.btn-view-logs {
+  display: none; align-items: center; gap: 7px;
+  margin-top: 12px; padding: 6px 14px; border-radius: var(--r-pill);
+  border: 1px solid rgba(37,99,235,.4); background: rgba(37,99,235,.08);
+  color: #93c5fd; font-size: 12px; font-weight: 600;
+  cursor: pointer; font-family: inherit;
+  transition: background .12s, border-color .12s;
+}
+.btn-view-logs.visible { display: inline-flex; }
+.btn-view-logs:hover { background: rgba(37,99,235,.16); border-color: rgba(37,99,235,.7); }
+.term-err-pill {
+  display: none; background: rgba(252,165,165,.2); color: #fca5a5;
+  border-radius: var(--r-pill); padding: 1px 7px; font-size: 10.5px;
+}
 .run-result {
   display: none; margin-top: 12px; padding: 10px 14px; border-radius: 8px;
   font-size: 12.5px; font-weight: 600; border-left: 3px solid transparent;
@@ -860,7 +943,10 @@ input.err { border-color: var(--err) !important; box-shadow: 0 0 0 3px rgba(220,
               <div class="run-status-dot" id="runDot"></div>
               <span id="runStatusText"></span>
             </div>
-            <div class="log-pane" id="logPane"></div>
+            <button class="btn-view-logs" id="btnViewLogs" onclick="openTerminal()">
+              ⬛ View Logs
+              <span class="term-err-pill" id="terminalErrPill"></span>
+            </button>
             <div class="run-result" id="runResult"></div>
           </div>
         </div>
@@ -2160,23 +2246,83 @@ async function downloadBinaries() {
 function classifyLine(raw) {
   const s = raw.replace(/\x1b\[[0-9;]*m/g, '').trim();
   if (!s) return null;
-  if (/✓|OK\b|\[OK\]|Success|complete/i.test(s))               return 'ok';
-  if (/✗|error|failed|fail\b|ERR:/i.test(s))                    return 'err';
-  if (/⚠|warn/i.test(s))                                        return 'warn';
-  if (/^[─═]{5}|^\s*[┌└│]|^={5}/.test(s))                      return 'sect';
-  if (/^\s*#/.test(s))                                           return 'dim';
+  if (/✓|OK\b|\[OK\]|SETUP COMPLETED|success/i.test(s))                                                              return 'ok';
+  // Errors must be checked BEFORE warnings so they are never misclassified
+  if (/✗|\[ERROR\]|error:|^crit:|^fail:|\bERR:|\bfailed\b|\bexception\b|\bunhandled\b|SETUP FAILED/i.test(s))        return 'err';
+  if (/⚠|\[WARN\]|^warn:|warning/i.test(s))                                                                          return 'warn';
+  if (/^[─═]{5}|^\s*[┌└│]|^={5}/.test(s))                                                                           return 'sect';
+  if (/^\s*#/.test(s))                                                                                                return 'dim';
   return 'info';
 }
 
+// ── Log counts & filter state ─────────────────────────────────
+let _logCounts  = { all: 0, info: 0, warn: 0, err: 0 };
+let _activeFilter = 'all';
+
+function _updateTabCounts() {
+  document.getElementById('cntAll').textContent  = _logCounts.all;
+  document.getElementById('cntInfo').textContent = _logCounts.info;
+  document.getElementById('cntWarn').textContent = _logCounts.warn;
+  document.getElementById('cntErr').textContent  = _logCounts.err;
+  document.getElementById('tabWarn').classList.toggle('has-items', _logCounts.warn > 0);
+  document.getElementById('tabErr').classList.toggle('has-items',  _logCounts.err  > 0);
+  const pill = document.getElementById('terminalErrPill');
+  if (_logCounts.err > 0) {
+    pill.style.display = '';
+    pill.textContent   = _logCounts.err + ' error' + (_logCounts.err !== 1 ? 's' : '');
+  } else {
+    pill.style.display = 'none';
+  }
+}
+
 function appendLog(raw) {
   const pane = document.getElementById('logPane');
   const cls  = classifyLine(raw);
   if (cls === null) return;
   const div  = document.createElement('div');
-  div.className = 'log-line' + (cls !== 'info' ? ' ' + cls : '');
-  div.textContent = raw.replace(/\x1b\[[0-9;]*m/g, '');
+  div.className    = 'log-line' + (cls !== 'info' ? ' ' + cls : '');
+  div.dataset.logCls = cls;
+  div.textContent  = raw.replace(/\x1b\[[0-9;]*m/g, '');
+  // hide line when active filter doesn't match
+  if (_activeFilter !== 'all') {
+    const show = (_activeFilter === 'warn' &&  cls === 'warn')
+              || (_activeFilter === 'err'  &&  cls === 'err')
+              || (_activeFilter === 'info' &&  cls !== 'warn' && cls !== 'err');
+    if (!show) div.style.display = 'none';
+  }
   pane.appendChild(div);
   pane.scrollTop = pane.scrollHeight;
+  _logCounts.all++;
+  if      (cls === 'err')  _logCounts.err++;
+  else if (cls === 'warn') _logCounts.warn++;
+  else                     _logCounts.info++;
+  _updateTabCounts();
+}
+
+// ── Terminal open / close / filter ───────────────────────────
+function openTerminal() {
+  document.getElementById('terminalOverlay').classList.add('open');
+  document.getElementById('logPane').scrollTop = document.getElementById('logPane').scrollHeight;
+}
+function closeTerminal() {
+  document.getElementById('terminalOverlay').classList.remove('open');
+}
+function terminalOverlayClick(e) {
+  if (e.target === document.getElementById('terminalOverlay')) closeTerminal();
+}
+function filterLog(type) {
+  _activeFilter = type;
+  document.querySelectorAll('.terminal-tab').forEach(tab => tab.classList.remove('active'));
+  document.getElementById('tab' + type.charAt(0).toUpperCase() + type.slice(1)).classList.add('active');
+  document.getElementById('logPane').querySelectorAll('.log-line').forEach(line => {
+    const cls = line.dataset.logCls || 'info';
+    let show;
+    if      (type === 'all')  show = true;
+    else if (type === 'warn') show = cls === 'warn';
+    else if (type === 'err')  show = cls === 'err';
+    else                      show = cls !== 'warn' && cls !== 'err';
+    line.style.display = show ? '' : 'none';
+  });
 }
 
 function setRunStatus(dotClass, textKey) {
@@ -2196,7 +2342,14 @@ async function runInstall() {
 
   btn.disabled = true;
   pane.innerHTML = '';
-  pane.classList.add('visible');
+  _logCounts = { all: 0, info: 0, warn: 0, err: 0 };
+  _activeFilter = 'all';
+  document.querySelectorAll('.terminal-tab').forEach(t => t.classList.remove('active','has-items'));
+  document.getElementById('tabAll').classList.add('active');
+  _updateTabCounts();
+  document.getElementById('terminalTitle').textContent = 'Installation Log — Running…';
+  document.getElementById('btnViewLogs').classList.add('visible');
+  openTerminal();
   result.style.display = 'none';
   document.getElementById('retryBtn').style.display = 'none';
   setRunStatus('spinning', 'run_running');
@@ -2224,10 +2377,12 @@ async function runInstall() {
       es.close(); _evtSource = null;
       const { ok } = JSON.parse(e.data);
       if (ok) {
+        document.getElementById('terminalTitle').textContent = 'Installation Log — Completed';
         setRunStatus('ok',  'run_success');
         result.className = 'run-result ok';
         result.textContent = t('run_success');
       } else {
+        document.getElementById('terminalTitle').textContent = 'Installation Log — Failed';
         setRunStatus('err', 'run_failed');
         result.className = 'run-result err';
         result.textContent = t('run_failed');
@@ -2239,6 +2394,7 @@ async function runInstall() {
 
     es.onerror = () => {
       es.close(); _evtSource = null;
+      document.getElementById('terminalTitle').textContent = 'Installation Log — Failed';
       setRunStatus('err', 'run_failed');
       result.className   = 'run-result err';
       result.textContent = t('run_failed');
@@ -2249,6 +2405,7 @@ async function runInstall() {
 
   } catch (e) {
     appendLog('Error: ' + e.message);
+    document.getElementById('terminalTitle').textContent = 'Installation Log — Failed';
     setRunStatus('err', 'run_failed');
     result.className   = 'run-result err';
     result.textContent = t('run_failed');
@@ -2260,9 +2417,15 @@ async function runInstall() {
 
 function resetRun() {
   if (_evtSource) { _evtSource.close(); _evtSource = null; }
-  const pane = document.getElementById('logPane');
-  pane.innerHTML = '';
-  pane.classList.remove('visible');
+  document.getElementById('logPane').innerHTML = '';
+  _logCounts = { all: 0, info: 0, warn: 0, err: 0 };
+  _activeFilter = 'all';
+  document.querySelectorAll('.terminal-tab').forEach(t => t.classList.remove('active','has-items'));
+  document.getElementById('tabAll').classList.add('active');
+  _updateTabCounts();
+  document.getElementById('terminalTitle').textContent = 'Installation Log';
+  document.getElementById('btnViewLogs').classList.remove('visible');
+  closeTerminal();
   document.getElementById('runResult').style.display  = 'none';
   document.getElementById('runStatus').style.display  = 'none';
   document.getElementById('retryBtn').style.display   = 'none';
@@ -2362,5 +2525,27 @@ checkServerMode();
 const restored = restoreWizardState();
 if (!restored) applyOSDefaults();
 </script>
+
+<!-- ── Terminal popup ─────────────────────────────────────── -->
+<div class="terminal-overlay" id="terminalOverlay" onclick="terminalOverlayClick(event)">
+  <div class="terminal-modal" id="terminalModal">
+    <div class="terminal-titlebar">
+      <div class="terminal-dots">
+        <div class="terminal-dot td-red"    onclick="closeTerminal()" title="Close"></div>
+        <div class="terminal-dot td-yellow" title="Minimise" onclick="closeTerminal()"></div>
+        <div class="terminal-dot td-green"  title="Expand"></div>
+      </div>
+      <span class="terminal-title" id="terminalTitle">Installation Log</span>
+      <div style="width:54px"></div>
+    </div>
+    <div class="terminal-body" id="logPane"></div>
+    <div class="terminal-tabs">
+      <button class="terminal-tab tab-all active" id="tabAll"  onclick="filterLog('all')">All <span class="tab-badge" id="cntAll">0</span></button>
+      <button class="terminal-tab tab-info"        id="tabInfo" onclick="filterLog('info')">Info <span class="tab-badge" id="cntInfo">0</span></button>
+      <button class="terminal-tab tab-warn"        id="tabWarn" onclick="filterLog('warn')">Warnings <span class="tab-badge" id="cntWarn">0</span></button>
+      <button class="terminal-tab tab-err"         id="tabErr"  onclick="filterLog('err')">Errors <span class="tab-badge" id="cntErr">0</span></button>
+    </div>
+  </div>
+</div>
 </body>
 </html>