Merge pull request 'v1.4.0' (#44) from dev into main

Reviewed-on: #44

.gitea/workflows/release.yml

@@ -79,7 +79,29 @@ jobs:
 
       - name: Create Gitea release
         run: |
-          python3 -c "import json,os; v=os.environ['VERSION']; img=os.environ['IMAGE']; notes=open('/tmp/release_notes.txt').read(); open('/tmp/release_body.json','w').write(json.dumps({'tag_name':'v'+v,'name':'Catalyst v'+v,'body':'### Changes\n\n'+notes+'\n\n### Image\n\n'+img+':'+v,'draft':False,'prerelease':False}))"
+          cat > /tmp/make_release.py << 'PYEOF'
+          import json, os
+          v   = os.environ['VERSION']
+          img = os.environ['IMAGE']
+          raw = open('/tmp/release_notes.txt').read().strip()
+          feats, fixes = [], []
+          for line in raw.splitlines():
+              msg = line.lstrip('- ').strip()
+              if msg.startswith('feat:'):
+                  feats.append('- ' + msg[5:].strip())
+              elif msg.startswith('fix:'):
+                  fixes.append('- ' + msg[4:].strip())
+          sections = []
+          if feats:
+              sections.append('### New Features\n\n' + '\n'.join(feats))
+          if fixes:
+              sections.append('### Bug Fixes\n\n' + '\n'.join(fixes))
+          notes = '\n\n'.join(sections) or '_No changes_'
+          body  = notes + '\n\n### Image\n\n`' + img + ':' + v + '`'
+          payload = {'tag_name': 'v'+v, 'name': 'Catalyst v'+v, 'body': body, 'draft': False, 'prerelease': False}
+          open('/tmp/release_body.json', 'w').write(json.dumps(payload))
+          PYEOF
+          python3 /tmp/make_release.py
           curl -sf -X POST \
             -H "Authorization: token ${{ secrets.TOKEN }}" \
             -H "Content-Type: application/json" \

.gitignore

@@ -1,5 +1,4 @@
 node_modules/
-js/version.js
 data/*.db
 data/*.db-shm
 data/*.db-wal

css/app.css

@@ -25,6 +25,10 @@
   --mono: 'JetBrains Mono', 'IBM Plex Mono', monospace;
 }
 
+html {
+  zoom: 1.1;
+}
+
 html, body {
   height: 100%;
   background: var(--bg);
@@ -374,16 +378,25 @@ select:focus { border-color: var(--accent); }
 }
 
 .detail-sub {
-  font-size: 12px;
+  font-size: 13px;
-  color: var(--text3);
+  margin-top: 8px;
-  margin-top: 6px;
   display: flex;
-  gap: 16px;
+  align-items: center;
+  gap: 0;
 }
 
-.detail-sub span { display: flex; gap: 4px; }
+.detail-sub > span {
-.detail-sub .lbl { color: var(--text3); }
+  display: flex;
-.detail-sub .val { color: var(--text2); }
+  align-items: center;
+  gap: 6px;
+}
+.detail-sub > span + span {
+  margin-left: 12px;
+  padding-left: 12px;
+  border-left: 1px solid var(--border);
+}
+.detail-sub .lbl { color: var(--text3); font-size: 11px; }
+.detail-sub .val { color: var(--text); }
 
 .detail-actions { display: flex; gap: 8px; }
 
@@ -630,26 +643,25 @@ select:focus { border-color: var(--accent); }
 
 /* ── HISTORY TIMELINE ── */
 .tl-item {
-  display: grid;
+  display: flex;
-  grid-template-columns: 160px 140px 1fr;
+  align-items: center;
-  gap: 0 12px;
+  justify-content: space-between;
-  padding: 7px 0;
+  gap: 24px;
+  padding: 9px 0;
   border-bottom: 1px solid var(--border);
-  font-size: 12px;
-  align-items: baseline;
 }
 .tl-item:last-child { border-bottom: none; }
-.tl-time   { color: var(--text3); font-size: 11px; white-space: nowrap; }
+.tl-event  { display: flex; align-items: center; gap: 7px; font-size: 13px; min-width: 0; }
-.tl-field  { color: var(--text2); }
+.tl-label  { color: var(--text2); }
-.tl-change { display: flex; align-items: baseline; gap: 6px; }
+.tl-sep    { color: var(--text3); user-select: none; }
-.tl-old    { color: var(--text3); text-decoration: line-through; }
+.tl-old    { color: var(--text3); text-decoration: line-through; font-size: 12px; }
-.tl-arrow  { color: var(--text3); }
+.tl-arrow  { color: var(--text3); font-size: 11px; }
-.tl-new    { color: var(--text); }
+.tl-new    { color: var(--text); font-weight: 500; }
+.tl-time   { color: var(--text3); font-size: 11px; white-space: nowrap; flex-shrink: 0; }
 .tl-deployed { color: var(--accent); }
 .tl-testing  { color: var(--amber); }
 .tl-degraded { color: var(--red); }
-.tl-created .tl-field  { color: var(--accent); }
+.tl-created .tl-event { color: var(--accent); font-weight: 500; }
-.tl-created .tl-change { color: var(--text3); }
 .tl-empty  { color: var(--text3); font-size: 12px; padding: 8px 0; }
 
 /* ── SETTINGS MODAL ── */
@@ -700,3 +712,55 @@ select:focus { border-color: var(--accent); }
   0%, 100% { opacity: 1; }
   50%       { opacity: 0; }
 }
+
+/* ── MOBILE ── */
+@media (max-width: 640px) {
+  /* Reset desktop zoom — mobile browsers handle scaling themselves */
+  html { zoom: 1; }
+
+  /* Nav */
+  nav { padding: 0 16px; }
+
+  /* Dashboard header */
+  .dash-header { padding: 18px 16px 14px; }
+
+  /* Stats bar */
+  .stat-cell { padding: 10px 16px; }
+
+  /* Toolbar — search full-width on first row, filters + button below */
+  .toolbar    { flex-wrap: wrap; padding: 10px 16px; gap: 8px; }
+  .search-wrap { max-width: 100%; }
+  .toolbar-right { margin-left: 0; width: 100%; justify-content: flex-end; }
+
+  /* Instance grid — single column */
+  .instance-grid {
+    grid-template-columns: 1fr;
+    padding: 12px 16px;
+    gap: 8px;
+  }
+
+  /* Detail page */
+  .detail-page { padding: 16px; }
+
+  /* Detail header — stack title block above actions */
+  .detail-header { flex-direction: column; align-items: flex-start; gap: 14px; }
+
+  /* Detail sub — wrap items when they don't fit */
+  .detail-sub { flex-wrap: wrap; row-gap: 4px; }
+
+  /* Detail grid — single column */
+  .detail-grid { grid-template-columns: 1fr; }
+
+  /* Toggle grid — 2 columns instead of 3 */
+  .toggle-grid { grid-template-columns: 1fr 1fr; }
+
+  /* Confirm box — no fixed width on mobile */
+  .confirm-box { width: auto; max-width: calc(100vw - 32px); padding: 18px; }
+
+  /* History timeline — stack timestamp above event */
+  .tl-item  { flex-direction: column; align-items: flex-start; gap: 3px; }
+  .tl-time  { order: -1; }
+
+  /* Toast — stretch across bottom */
+  .toast { right: 16px; left: 16px; bottom: 16px; }
+}

js/ui.js

@@ -39,17 +39,25 @@ function esc(str) {
   return d.innerHTML;
 }
 
+// SQLite datetime('now') → 'YYYY-MM-DD HH:MM:SS' (UTC, no timezone marker).
+// Appending 'Z' tells JS to parse it as UTC rather than local time.
+function parseUtc(d) {
+  if (typeof d !== 'string') return new Date(d);
+  const hasZone = d.endsWith('Z') || /[+-]\d{2}:\d{2}$/.test(d);
+  return new Date(hasZone ? d : d.replace(' ', 'T') + 'Z');
+}
+
 function fmtDate(d) {
   if (!d) return '—';
   try {
-    return new Date(d).toLocaleDateString('en-US', { year: 'numeric', month: 'short', day: 'numeric', timeZone: getTimezone() });
+    return parseUtc(d).toLocaleDateString('en-US', { year: 'numeric', month: 'short', day: 'numeric', timeZone: getTimezone() });
   } catch (e) { return d; }
 }
 
 function fmtDateFull(d) {
   if (!d) return '—';
   try {
-    return new Date(d).toLocaleString('en-US', { year: 'numeric', month: 'short', day: 'numeric', hour: '2-digit', minute: '2-digit', timeZone: getTimezone(), timeZoneName: 'short' });
+    return parseUtc(d).toLocaleString('en-US', { year: 'numeric', month: 'short', day: 'numeric', hour: '2-digit', minute: '2-digit', timeZone: getTimezone(), timeZoneName: 'short' });
   } catch (e) { return d; }
 }
 
@@ -129,6 +137,21 @@ async function filterInstances() {
 
 const BOOL_FIELDS = ['atlas','argus','semaphore','patchmon','tailscale','andromeda','hardware_acceleration'];
 
+const FIELD_LABELS = {
+  name:                  'name',
+  state:                 'state',
+  stack:                 'stack',
+  vmid:                  'vmid',
+  tailscale_ip:          'tailscale ip',
+  atlas:                 'atlas',
+  argus:                 'argus',
+  semaphore:             'semaphore',
+  patchmon:              'patchmon',
+  tailscale:             'tailscale',
+  andromeda:             'andromeda',
+  hardware_acceleration: 'hw acceleration',
+};
+
 function stateClass(field, val) {
   if (field !== 'state') return '';
   return { deployed: 'tl-deployed', testing: 'tl-testing', degraded: 'tl-degraded' }[val] ?? '';
@@ -141,9 +164,10 @@ function fmtHistVal(field, val) {
 }
 
 async function renderDetailPage(vmid) {
-  const [inst, history] = await Promise.all([getInstance(vmid), getInstanceHistory(vmid)]);
+  const [inst, history, all] = await Promise.all([getInstance(vmid), getInstanceHistory(vmid), getInstances()]);
   if (!inst) { navigate('dashboard'); return; }
   currentVmid = vmid;
+  document.getElementById('nav-count').textContent = `${all.length} instance${all.length !== 1 ? 's' : ''}`;
 
   document.getElementById('detail-vmid-crumb').textContent  = vmid;
   document.getElementById('detail-name').textContent        = inst.name;
@@ -154,7 +178,7 @@ async function renderDetailPage(vmid) {
   document.getElementById('detail-identity').innerHTML = `
     <div class="kv-row"><span class="kv-key">name</span><span class="kv-val highlight">${esc(inst.name)}</span></div>
     <div class="kv-row"><span class="kv-key">state</span><span class="kv-val"><span class="badge ${esc(inst.state)}">${esc(inst.state)}</span></span></div>
-    <div class="kv-row"><span class="kv-key">stack</span><span class="kv-val highlight">${esc(inst.stack) || '—'}</span></div>
+    <div class="kv-row"><span class="kv-key">stack</span><span class="kv-val"><span class="badge ${esc(inst.stack)}">${esc(inst.stack) || '—'}</span></span></div>
     <div class="kv-row"><span class="kv-key">vmid</span><span class="kv-val highlight">${inst.vmid}</span></div>
     <div class="kv-row"><span class="kv-key">internal id</span><span class="kv-val">${inst.id}</span></div>
   `;
@@ -178,19 +202,23 @@ async function renderDetailPage(vmid) {
     ? history.map(e => {
         if (e.field === 'created') return `
           <div class="tl-item tl-created">
+            <span class="tl-event">instance created</span>
             <span class="tl-time">${fmtDateFull(e.changed_at)}</span>
-            <span class="tl-field">created</span>
-            <span class="tl-change">—</span>
           </div>`;
+        const label = FIELD_LABELS[e.field] ?? esc(e.field);
+        const newCls = (e.field === 'state' || e.field === 'stack')
+          ? `badge ${esc(e.new_value)}`
+          : `tl-new ${stateClass(e.field, e.new_value)}`;
         return `
           <div class="tl-item">
-            <span class="tl-time">${fmtDateFull(e.changed_at)}</span>
+            <div class="tl-event">
-            <span class="tl-field">${esc(e.field)}</span>
+              <span class="tl-label">${label}</span>
-            <span class="tl-change">
+              <span class="tl-sep">·</span>
               <span class="tl-old">${fmtHistVal(e.field, e.old_value)}</span>
               <span class="tl-arrow">→</span>
-              <span class="tl-new ${stateClass(e.field, e.new_value)}">${fmtHistVal(e.field, e.new_value)}</span>
+              <span class="${newCls}">${fmtHistVal(e.field, e.new_value)}</span>
-            </span>
+            </div>
+            <span class="tl-time">${fmtDateFull(e.changed_at)}</span>
           </div>`;
       }).join('')
     : '<div class="tl-empty">no history yet</div>';
@@ -356,11 +384,11 @@ async function importDB() {
   document.getElementById('confirm-ok').onclick = async () => {
     closeConfirm();
     try {
-      const { instances } = JSON.parse(await file.text());
+      const { instances, history = [] } = JSON.parse(await file.text());
       const res = await fetch('/api/import', {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({ instances }),
+        body: JSON.stringify({ instances, history }),
       });
       const data = await res.json();
       if (!res.ok) { showToast(data.error ?? 'Import failed', 'error'); return; }

js/version.js

@@ -0,0 +1 @@
+const VERSION = "1.4.0";

package.json

@@ -1,6 +1,6 @@
 {
   "name": "catalyst",
-  "version": "1.2.2",
+  "version": "1.4.0",
   "type": "module",
   "scripts": {
     "start": "node server/server.js",

server/db.js

@@ -151,11 +151,13 @@ export function updateInstance(vmid, data) {
 }
 
 export function deleteInstance(vmid) {
-  return db.prepare('DELETE FROM instances WHERE vmid = ?').run(vmid);
+  db.prepare('DELETE FROM instance_history WHERE vmid = ?').run(vmid);
+  db.prepare('DELETE FROM instances WHERE vmid = ?').run(vmid);
 }
 
-export function importInstances(rows) {
+export function importInstances(rows, historyRows = []) {
   db.exec('BEGIN');
+  db.exec('DELETE FROM instance_history');
   db.exec('DELETE FROM instances');
   const insert = db.prepare(`
     INSERT INTO instances
@@ -166,6 +168,12 @@ export function importInstances(rows) {
        @tailscale, @andromeda, @tailscale_ip, @hardware_acceleration)
   `);
   for (const row of rows) insert.run(row);
+  if (historyRows.length) {
+    const insertHist = db.prepare(
+      `INSERT INTO instance_history (vmid, field, old_value, new_value, changed_at) VALUES (?, ?, ?, ?, ?)`
+    );
+    for (const h of historyRows) insertHist.run(h.vmid, h.field, h.old_value ?? null, h.new_value ?? null, h.changed_at);
+  }
   db.exec('COMMIT');
 }
 
@@ -175,6 +183,10 @@ export function getInstanceHistory(vmid) {
   ).all(vmid);
 }
 
+export function getAllHistory() {
+  return db.prepare('SELECT * FROM instance_history ORDER BY vmid, changed_at').all();
+}
+
 // ── Test helpers ──────────────────────────────────────────────────────────────
 
 export function _resetForTest() {

server/routes.js

@@ -1,7 +1,7 @@
 import { Router } from 'express';
 import {
   getInstances, getInstance, getDistinctStacks,
-  createInstance, updateInstance, deleteInstance, importInstances, getInstanceHistory,
+  createInstance, updateInstance, deleteInstance, importInstances, getInstanceHistory, getAllHistory,
 } from './db.js';
 
 export const router = Router();
@@ -116,14 +116,15 @@ router.put('/instances/:vmid', (req, res) => {
 // GET /api/export
 router.get('/export', (_req, res) => {
   const instances = getInstances();
+  const history = getAllHistory();
   const date = new Date().toISOString().slice(0, 10);
   res.setHeader('Content-Disposition', `attachment; filename="catalyst-backup-${date}.json"`);
-  res.json({ version: 1, exported_at: new Date().toISOString(), instances });
+  res.json({ version: 2, exported_at: new Date().toISOString(), instances, history });
 });
 
 // POST /api/import
 router.post('/import', (req, res) => {
-  const { instances } = req.body ?? {};
+  const { instances, history = [] } = req.body ?? {};
   if (!Array.isArray(instances)) {
     return res.status(400).json({ error: 'body must contain an instances array' });
   }
@@ -134,7 +135,7 @@ router.post('/import', (req, res) => {
   }
   if (errors.length) return res.status(400).json({ errors });
   try {
-    importInstances(instances.map(normalise));
+    importInstances(instances.map(normalise), Array.isArray(history) ? history : []);
     res.json({ imported: instances.length });
   } catch (e) {
     console.error('POST /api/import', e);

tests/api.test.js

@@ -275,6 +275,18 @@ describe('GET /api/export', () => {
     const res = await request(app).get('/api/export')
     expect(res.body.instances).toEqual([])
   })
+
+  it('returns version 2', async () => {
+    const res = await request(app).get('/api/export')
+    expect(res.body.version).toBe(2)
+  })
+
+  it('includes a history array', async () => {
+    await request(app).post('/api/instances').send(base)
+    const res = await request(app).get('/api/export')
+    expect(res.body.history).toBeInstanceOf(Array)
+    expect(res.body.history.some(e => e.field === 'created')).toBe(true)
+  })
 })
 
 // ── POST /api/import ──────────────────────────────────────────────────────────
@@ -309,6 +321,26 @@ describe('POST /api/import', () => {
       .send({ instances: [{ ...base, name: undefined, vmid: 1 }] })
     expect(res.status).toBe(400)
   })
+
+  it('restores history when history array is provided', async () => {
+    await request(app).post('/api/instances').send(base)
+    const exp = await request(app).get('/api/export')
+    await request(app).post('/api/instances').send({ ...base, vmid: 999, name: 'other' })
+    const res = await request(app).post('/api/import').send({
+      instances: exp.body.instances,
+      history: exp.body.history,
+    })
+    expect(res.status).toBe(200)
+    const hist = await request(app).get('/api/instances/100/history')
+    expect(hist.body.some(e => e.field === 'created')).toBe(true)
+  })
+
+  it('succeeds with a v1 backup that has no history key', async () => {
+    const res = await request(app).post('/api/import')
+      .send({ instances: [{ ...base, vmid: 1, name: 'legacy' }] })
+    expect(res.status).toBe(200)
+    expect(res.body.imported).toBe(1)
+  })
 })
 
 // ── Static assets & SPA routing ───────────────────────────────────────────────

tests/db.test.js

@@ -164,6 +164,19 @@ describe('deleteInstance', () => {
     expect(getInstance(1)).toBeNull();
     expect(getInstance(2)).not.toBeNull();
   });
+
+  it('clears history for the deleted instance', () => {
+    createInstance({ ...base, name: 'a', vmid: 1 });
+    deleteInstance(1);
+    expect(getInstanceHistory(1)).toHaveLength(0);
+  });
+
+  it('does not clear history for other instances', () => {
+    createInstance({ ...base, name: 'a', vmid: 1 });
+    createInstance({ ...base, name: 'b', vmid: 2 });
+    deleteInstance(1);
+    expect(getInstanceHistory(2).length).toBeGreaterThan(0);
+  });
 });
 
 // ── importInstances ───────────────────────────────────────────────────────────
@@ -183,6 +196,21 @@ describe('importInstances', () => {
     importInstances([]);
     expect(getInstances()).toEqual([]);
   });
+
+  it('clears history for all replaced instances', () => {
+    createInstance({ ...base, name: 'old', vmid: 1 });
+    importInstances([{ ...base, name: 'new', vmid: 2 }]);
+    expect(getInstanceHistory(1)).toHaveLength(0);
+  });
+
+  it('restores history rows when provided', () => {
+    importInstances(
+      [{ ...base, name: 'a', vmid: 1 }],
+      [{ vmid: 1, field: 'created', old_value: null, new_value: null, changed_at: '2026-01-01 00:00:00' }]
+    );
+    const h = getInstanceHistory(1);
+    expect(h.some(e => e.field === 'created')).toBe(true);
+  });
 });
 
 // ── instance history ─────────────────────────────────────────────────────────

tests/helpers.test.js

@@ -58,16 +58,22 @@ describe('esc', () => {
 
 // ── fmtDate() ─────────────────────────────────────────────────────────────────
 
-function fmtDate(d) {
+function parseUtc(d) {
+  if (typeof d !== 'string') return new Date(d)
+  const hasZone = d.endsWith('Z') || /[+-]\d{2}:\d{2}$/.test(d)
+  return new Date(hasZone ? d : d.replace(' ', 'T') + 'Z')
+}
+
+function fmtDate(d, tz = 'UTC') {
   if (!d) return '—'
   try {
-    return new Date(d).toLocaleDateString('en-US', { year: 'numeric', month: 'short', day: 'numeric' })
+    return parseUtc(d).toLocaleDateString('en-US', { year: 'numeric', month: 'short', day: 'numeric', timeZone: tz })
   } catch (e) { return d }
 }
 
 describe('fmtDate', () => {
   it('formats a valid ISO date string', () => {
-    const result = fmtDate('2024-03-15T00:00:00')
+    const result = fmtDate('2024-03-15T12:00:00Z')
     expect(result).toMatch(/Mar/)
     expect(result).toMatch(/15/)
     expect(result).toMatch(/2024/)
@@ -91,7 +97,7 @@ describe('fmtDate', () => {
 function fmtDateFull(d, tz = 'UTC') {
   if (!d) return '—'
   try {
-    return new Date(d).toLocaleString('en-US', {
+    return parseUtc(d).toLocaleString('en-US', {
       year: 'numeric', month: 'short', day: 'numeric',
       hour: '2-digit', minute: '2-digit',
       timeZone: tz, timeZoneName: 'short',
@@ -118,6 +124,12 @@ describe('fmtDateFull', () => {
     expect(result).toMatch(/EDT/)
   })
 
+  it('treats SQLite-format timestamps (space, no Z) as UTC', () => {
+    // SQLite datetime('now') → 'YYYY-MM-DD HH:MM:SS', no timezone marker.
+    // Must parse identically to the same moment expressed as ISO UTC.
+    expect(fmtDateFull('2024-03-15 18:30:00', 'UTC')).toBe(fmtDateFull('2024-03-15T18:30:00Z', 'UTC'))
+  })
+
   it('returns — for null', () => {
     expect(fmtDateFull(null)).toBe('—')
   })