@andrian.yablonskyy/thub-coordinator 1.0.37 → 1.0.39

package/public/js/resource-card.js

@@ -21,18 +21,19 @@
     }
   }
 
-  document.querySelectorAll('[data-resource-card]').forEach((el) => {
-    el.addEventListener('click', (e) => {
-      // The Resources table's own action buttons stay plain actions.
-      if (!e.target.closest('form, button, a, input')){
-        open(el);
-      }
-    });
-    el.addEventListener('keydown', (e) => {
-      if ((e.key === 'Enter' || e.key === ' ') && e.target === el){
-        e.preventDefault();
-        open(el);
-      }
-    });
+  // Delegated, so rows and cards swapped in by live updates (live.js) work.
+  document.addEventListener('click', (e) => {
+    const el = e.target.closest('[data-resource-card]');
+    // The Resources table's own action buttons stay plain actions.
+    if (el && !e.target.closest('form, button, a, input')){
+      open(el);
+    }
+  });
+  document.addEventListener('keydown', (e) => {
+    const el = e.target.closest?.('[data-resource-card]');
+    if (el && (e.key === 'Enter' || e.key === ' ') && e.target === el){
+      e.preventDefault();
+      open(el);
+    }
   });
 })();

package/public/js/tooltips.js

@@ -13,6 +13,8 @@
 
 'use strict';
 
+// Delegated (one instance per element, created on first hover/focus), so
+// content swapped in by live updates (public/js/live.js) gets tooltips too.
 (function (){
-  document.querySelectorAll('[data-bs-toggle="tooltip"]').forEach((el) => new bootstrap.Tooltip(el));
+  new bootstrap.Tooltip(document.body, { selector: '[data-bs-toggle="tooltip"]' });
 })();

package/scripts/install-default-config.js

@@ -1,7 +1,7 @@
 /**
  * @file        scripts/install-default-config.js
  * @description npm postinstall: on a real global install, creates the Coordinator's directory layout
- *              (~/.config/thub, ~/.thub and its artifacts/avatars/work subdirs) and, if it
+ *              (~/.config/thub, ~/.thub and its avatars/work subdirs) and, if it
  *              doesn't already exist, ~/.config/thub/coordinator.json with every default option and
  *              a freshly generated sessionSecret (README §12, §13)
  *

package/scripts/install-target.js

@@ -52,7 +52,7 @@ function resolveTargetUser(){
 }
 
 // Default layout (README §13): config under ~/.config/thub, runtime data
-// (SQLite DB, uploaded artifacts, avatars, work files) under ~/.thub.
+// (SQLite DB, avatars, work files) under ~/.thub.
 // An existing coordinator.json's own dataDir wins over the default, so a
 // re-install prepares (and the systemd unit allows writes to) the
 // directory the Coordinator will really use.
@@ -69,7 +69,7 @@ function targetPaths(user){
     // Written by the dashboard's "Update app" button, watched by
     // thub-coordinator-update.path (README §10.2).
     updateRequestFile: path.join(dataDir, 'update-request.json'),
-    dataSubdirs: ['artifacts', 'avatars', 'work'].map((d) => path.join(dataDir, d))
+    dataSubdirs: ['avatars', 'work'].map((d) => path.join(dataDir, d))
   };
 }
 

package/src/api/admin.js

@@ -134,7 +134,7 @@ function createAdminRouter({ services }){
     res.json({ canceled });
   });
 
-  // Permanently deletes finished jobs and their logs/artifacts (§13.1).
+  // Permanently deletes finished jobs and their logs (§13.1).
   // Database cleanup (§9): optional `before` (ISO 8601; default now) —
   // finished jobs that ended before it, older history, then VACUUM.
   router.post('/jobs/clean-history', (req, res) => {

package/src/api/agent.js

@@ -80,19 +80,13 @@ function createAgentRouter({ services, config }){
   });
 
   router.get('/jobs/:id/logs/stream', auth, (req, res) => {
-    attachJobStream(req, res, { jobId: req.params.id, services, config });
+    attachJobStream(req, res, { jobId: req.params.id, services });
   });
 
+  // No artifacts are stored any more (README §9); an Agent older than that
+  // still asks after a finished job's `thub status`, so answer "none".
   router.get('/jobs/:id/artifacts', auth, (req, res) => {
-    const artifacts = services.artifacts.listForJob(req.params.id).map((a) => ({
-      id: a.id,
-      name: a.name,
-      size: a.size,
-      sha256: a.sha256,
-      contentType: a.content_type,
-      url: services.artifacts.signedUrl(a)
-    }));
-    res.json({ artifacts });
+    res.json({ artifacts: [] });
   });
 
   router.get('/resources', auth, (req, res) => {

package/src/api/resource.js

@@ -14,12 +14,9 @@
 'use strict';
 
 const express = require('express'),
-  multer = require('multer'),
   { requireRole, requireJoinKey, appVersion } = require('../auth'),
   { JOB_STATES } = require('@andrian.yablonskyy/thub-common');
 
-const upload = multer({ dest: require('node:os').tmpdir() });
-
 function requireOwnResource(req, res, next){
   if (req.resource.id !== req.params.id){
     return res.status(403).json({ error: 'Token does not match resource' });
@@ -211,14 +208,12 @@ function createResourceRouter({ services, config }){
     }
   });
 
-  router.post('/jobs/:id/artifacts', auth, requireOwnJob(services), upload.any(), (req, res, next) => {
-    try {
-      const stored = services.artifacts.storeUploaded(req.params.id, req.files || []);
-      res.status(201).json({ artifacts: stored.map((a) => ({ id: a.id, name: a.name, size: a.size })) });
-    }
-    catch (err){
-      next(err);
-    }
+  // Artifacts are no longer stored on the Coordinator (README §9). A Client
+  // older than that still uploads its results after each job and would end
+  // the job as ERROR on a 404, so accept the upload and discard it unread.
+  router.post('/jobs/:id/artifacts', auth, requireOwnJob(services), (req, res) => {
+    req.resume();
+    req.on('end', () => res.status(201).json({ artifacts: [] }));
   });
 
   router.post('/jobs/:id/result', auth, requireOwnJob(services), (req, res, next) => {

package/src/api/sse.js

@@ -15,11 +15,12 @@
 
 const { TERMINAL_JOB_STATES, JOB_STATES } = require('@andrian.yablonskyy/thub-common');
 
-const WAITING_CHECK_MS = 15_000;
+const WAITING_CHECK_MS = 15_000,
+  REPLAY_PAGE = 2000;
 
 // §6.4: log / state / end events, resumable via Last-Event-ID (§7: "the
 // Agent reconnects with exponential backoff and resumes from the last seq").
-function attachJobStream(req, res, { jobId, services, config }){
+function attachJobStream(req, res, { jobId, services }){
   const { jobs, logs, registry, bus } = services,
 
     job = jobs.get(jobId);
@@ -47,17 +48,19 @@ function attachJobStream(req, res, { jobId, services, config }){
     res.write(`data: ${JSON.stringify(data)}\n\n`);
   }
 
-  for (const line of logs.listSince(jobId, afterSeq)){
-    writeEvent('log', { ts: line.ts, stream: line.stream, line: line.line }, line.seq);
-  }
-
-  function artifactsUrl(){
-    return `${config.publicUrl}/jobs/${jobId}#artifacts`;
+  // Replay everything after `afterSeq`, in pages (listSince stops at 500 a
+  // call — replaying one page used to skip lines 501.. of a longer log). All
+  // synchronous, so no live line can slip in between replay and subscribing.
+  for (let seq = afterSeq, page; (page = logs.listSince(jobId, seq, REPLAY_PAGE)).length;){
+    for (const line of page){
+      writeEvent('log', { ts: line.ts, stream: line.stream, line: line.line }, line.seq);
+    }
+    seq = page.at(-1).seq;
   }
 
   const current = jobs.get(jobId);
   if (TERMINAL_JOB_STATES.has(current.state)){
-    writeEvent('end', { state: current.state, artifactsUrl: artifactsUrl() });
+    writeEvent('end', { state: current.state });
     return res.end();
   }
 
@@ -97,7 +100,7 @@ function attachJobStream(req, res, { jobId, services, config }){
       if (evt.jobId !== jobId){
         return;
       }
-      writeEvent('end', { state: evt.state, artifactsUrl: artifactsUrl() });
+      writeEvent('end', { state: evt.state });
       cleanup();
       res.end();
     };

package/src/config.js

@@ -28,6 +28,12 @@ const DEFAULTS = {
   trustProxy: 'loopback',
   dataDir: path.join(process.cwd(), '.data'),
   sessionSecret: 'dev-only-change-me',
+  session: {
+    // The dashboard session cookie's Secure flag (server.js cookieSecure):
+    // "auto" = Secure whenever publicUrl is https:// (else per request:
+    // Secure only on a connection that is itself HTTPS); true / false force it.
+    secureCookie: 'auto'
+  },
   // Shared secret Clients present to self-register (see api/resource.js).
   // null disables auto-registration entirely — set it explicitly to turn it on.
   clientJoinKey: null,
@@ -46,19 +52,16 @@ const DEFAULTS = {
     defaultTimeoutSec: 1800,
     maxTimeoutSec: 14400
   },
+  // logRetentionDays, artifactRetentionDays and the `artifacts` section of
+  // older configs are no longer read: a job's log lines live as long as the
+  // job, and the Coordinator stores no artifacts (README §9).
   retention: {
-    logRetentionDays: 14,
-    artifactRetentionDays: 30,
-    // How long a finished job (with its logs, artifacts and events) is kept
+    // How long a finished job (with its logs and events) is kept
     // before the hourly retention task wipes it (services/cleanup.js):
     // 1w | 2w | 1m | 3m | 6m | forever. `forever` keeps everything until a
     // manual cleanup (dashboard Clean up database / thub-admin jobs clean).
     jobRetention: 'forever'
   },
-  artifacts: {
-    maxUploadMb: 512,
-    linkTtlHours: 168
-  },
   // New-version check of the Coordinator/Agent/Client packages (README
   // §10.2), every 15 minutes so a new Coordinator's "Update app" button
   // shows up promptly. 0 disables the periodic check; registry null = the
@@ -122,6 +125,12 @@ function loadConfig(configPath = process.env.THUB_COORDINATOR_CONFIG){
     config.clientJoinKey = process.env.THUB_CLIENT_JOIN_KEY;
   }
 
+  if (![true, false, 'auto'].includes(config.session.secureCookie)){
+    throw new Error(
+      `session.secureCookie must be "auto", true or false (got ${JSON.stringify(config.session.secureCookie)}) in ${candidate || 'the config'}`
+    );
+  }
+
   if (!Object.hasOwn(JOB_RETENTION, config.retention.jobRetention)){
     throw new Error(
       `retention.jobRetention must be one of: ${Object.keys(JOB_RETENTION).join(', ')} ` +
@@ -136,12 +145,10 @@ function loadConfig(configPath = process.env.THUB_COORDINATOR_CONFIG){
   config.host = host;
   config.port = Number(port);
   config.dbPath = path.join(config.dataDir, 'thub.db');
-  config.artifactsDir = path.join(config.dataDir, 'artifacts');
   config.workDir = path.join(config.dataDir, 'work');
   config.avatarsDir = path.join(config.dataDir, 'avatars');
 
   ensureWritableDir(config.dataDir, config.configPath);
-  ensureWritableDir(config.artifactsDir, config.configPath);
   ensureWritableDir(config.avatarsDir, config.configPath);
 
   return config;

package/src/db/migrations/022_add_sessions.sql

@@ -0,0 +1,10 @@
+-- Dashboard sessions (services/session-store.js), instead of express-session's
+-- in-memory store: they survive a restart, and expired ones are pruned.
+-- `expires` is epoch milliseconds (the session cookie's own expiry).
+CREATE TABLE sessions (
+  sid TEXT PRIMARY KEY,
+  sess TEXT NOT NULL,
+  expires INTEGER NOT NULL
+);
+
+CREATE INDEX idx_sessions_expires ON sessions(expires);

package/src/db/migrations/023_drop_artifacts.sql

@@ -0,0 +1,4 @@
+-- Job artifacts are no longer uploaded to or stored on the Coordinator
+-- (README §9): Clients keep a job's files only in its workspace, which they
+-- delete when the job ends. server.js removes <dataDir>/artifacts on startup.
+DROP TABLE IF EXISTS artifacts;

package/src/dev/virtual.js

@@ -170,7 +170,7 @@ function seedHistory(services, agentId, resourceIds){
 // stay IDLE instead of going OUT_OF_SERVICE) and play out any job the
 // scheduler assigns them — accept, PREPARING, RUNNING with streamed log
 // lines, then a PASSED (mostly) or FAILED result — through the same
-// services the Client API uses, so SSE, durations and artifacts all work.
+// services the Client API uses, so SSE and durations all work.
 function startVirtualClients(services, config){
   const { registry, jobs, logs, bus } = services,
     intervalMs = config.heartbeat.intervalSec * 1000,

package/src/server.js

@@ -15,7 +15,8 @@
 
 'use strict';
 
-const path = require('node:path'),
+const fs = require('node:fs'),
+  path = require('node:path'),
   express = require('express'),
   session = require('express-session'),
 
@@ -31,19 +32,31 @@ const path = require('node:path'),
   { createScheduler } = require('./services/scheduler'),
   { createHeartbeatMonitor } = require('./services/heartbeat'),
   { createLogsService } = require('./services/logs'),
-  { createArtifactsService } = require('./services/artifacts'),
   { createCommandsService } = require('./services/commands'),
   { createRetentionService } = require('./services/retention'),
   { createCleanupService } = require('./services/cleanup'),
   { startDevMode } = require('./dev/virtual'),
   { createUpdatesService } = require('./services/updates'),
+  { createLiveService } = require('./services/live'),
+  { SqliteSessionStore } = require('./services/session-store'),
 
   { createAgentRouter } = require('./api/agent'),
   { createResourceRouter } = require('./api/resource'),
   { createAdminRouter } = require('./api/admin'),
   { createWebRouter } = require('./web/routes');
 
+// Artifacts are no longer stored on the Coordinator (README §9): an
+// upgraded one frees the space the old <dataDir>/artifacts took, once.
+function removeLegacyArtifacts(config){
+  const dir = path.join(config.dataDir, 'artifacts');
+  if (fs.existsSync(dir)){
+    fs.rmSync(dir, { recursive: true, force: true });
+    console.log(`Removed ${dir}: the Coordinator no longer stores job artifacts`);
+  }
+}
+
 function buildServices(config){
+  removeLegacyArtifacts(config);
   const db = openDb(config.dbPath),
     events = createEventsService(db),
     registry = createRegistryService(db, { bus, events }),
@@ -52,13 +65,14 @@ function buildServices(config){
     adminUsers = createAdminUsersService(db),
     commands = createCommandsService({ bus }),
     logs = createLogsService(db, { bus }),
-    artifacts = createArtifactsService(db, { config }),
-    jobs = createJobsService(db, { bus, events, registry, artifacts, config }),
+    jobs = createJobsService(db, { bus, events, registry, config }),
     scheduler = createScheduler(db, { bus, events, registry, config }),
     heartbeatMonitor = createHeartbeatMonitor(db, { bus, events, registry, jobs, config }),
-    retention = createRetentionService(db, { bus, logs, artifacts, config }),
+    retention = createRetentionService(db, { config }),
     cleanup = createCleanupService(db, { jobs, config }),
-    updates = createUpdatesService({ config });
+    updates = createUpdatesService({ config }),
+    live = createLiveService(db, { bus, updates }),
+    sessionStore = new SqliteSessionStore(db);
 
   jobs.reconcileOnStartup();
   updates.start();
@@ -81,12 +95,13 @@ function buildServices(config){
     commands,
     jobs,
     logs,
-    artifacts,
     scheduler,
     heartbeatMonitor,
     retention,
     cleanup,
-    updates
+    updates,
+    live,
+    sessionStore
   };
 }
 
@@ -98,6 +113,18 @@ function commonVersion(){
   return require('@andrian.yablonskyy/thub-common/package.json').version;
 }
 
+// The session cookie's Secure flag (config session.secureCookie, §12).
+// "auto": always Secure for an https:// publicUrl — the cookie must never
+// travel over plain HTTP there — else express-session's per-request 'auto'
+// (Secure on HTTPS connections), so plain-HTTP development still works.
+function cookieSecure(config){
+  const setting = config.session?.secureCookie ?? 'auto';
+  if (setting === true || setting === false){
+    return setting;
+  }
+  return /^https:\/\//i.test(config.publicUrl || '') ? true : 'auto';
+}
+
 function createApp(config, services){
   const app = express();
   app.set('view engine', 'pug');
@@ -116,6 +143,9 @@ function createApp(config, services){
   app.use(
     session({
       secret: config.sessionSecret,
+      // In the SQLite database (services/session-store.js), not in memory:
+      // survives restarts, and expired sessions are pruned.
+      store: services.sessionStore,
       resave: false,
       saveUninitialized: false,
       // Idle timeout, not a fixed one (§10.1): `rolling` re-sends a fresh
@@ -124,9 +154,24 @@ function createApp(config, services){
       // (routes.js) after their *last* request. Each user's own preference
       // is applied per-request in web/routes.js, since it isn't known here.
       rolling: true,
-      cookie: { httpOnly: true, sameSite: 'lax' }
+      cookie: { httpOnly: true, sameSite: 'lax', secure: cookieSecure(config) }
     })
   );
+  // Background requests of the dashboard's live updates (public/js/live.js):
+  // the GET /live stream and the page re-fetches it triggers (header
+  // X-Thub-Live: 1). They must not count as activity — otherwise an open
+  // tab would keep the session alive forever and the idle timeout (§10.1)
+  // would never fire — so they don't extend it (`touch` is what `rolling`
+  // uses to push the expiry out) and web/routes.js leaves the session alone.
+  app.use((req, res, next) => {
+    if (req.session && (req.path === '/live' || req.get('X-Thub-Live') === '1')){
+      req.thubPassive = true;
+      req.session.touch = function (){
+        return this;
+      };
+    }
+    next();
+  });
   app.use(express.static(path.join(__dirname, '..', 'public')));
   app.use('/avatars', express.static(config.avatarsDir));
 
@@ -134,17 +179,6 @@ function createApp(config, services){
   app.use('/api/v1', createResourceRouter({ services, config }));
   app.use('/api/v1/admin', createAdminRouter({ services }));
 
-  // HMAC-signed artifact downloads (§3.1, §12) — no session or bearer token.
-  app.get('/artifacts/download/:token', (req, res, next) => {
-    try {
-      const artifact = services.artifacts.verify(req.params.token);
-      res.download(artifact.path, artifact.name);
-    }
-    catch (err){
-      next(err);
-    }
-  });
-
   app.use('/', createWebRouter({ services, config }));
 
   app.use((err, req, res, next) => {
@@ -207,4 +241,4 @@ if (require.main === module){
   start();
 }
 
-module.exports = { start, buildServices, createApp };
+module.exports = { start, buildServices, createApp, cookieSecure };

package/src/services/cleanup.js

@@ -1,6 +1,6 @@
 /**
  * @file        packages/coordinator/src/services/cleanup.js
- * @description Database cleanup: wipe finished jobs (logs, artifacts, events) and old events before a cutoff, then
+ * @description Database cleanup: wipe finished jobs (logs, events) and old events before a cutoff, then
  *              VACUUM to shrink the file — on demand from the dashboard, and hourly per retention.jobRetention (README §9)
  *
  * @author      Andrian Yablonskyy
@@ -81,7 +81,7 @@ function createCleanupService(db, { jobs, config, now = () => new Date() }){
   }
 
   // Wipe everything older than `before` (a Date; default now): finished
-  // jobs that ended before it, with their logs, artifacts and events, and
+  // jobs that ended before it, with their logs and events, and
   // the other audit events (resource/agent/group) logged before it. Events
   // of jobs that stay (still active, or newer) are kept. `vacuum`: true,
   // false, or 'auto' (only if something was deleted and the last VACUUM is

package/src/services/jobs.js

@@ -15,6 +15,7 @@
 
 const { validateJobSpec, maskEnv, JOB_STATES, ACTIVE_JOB_STATES, TERMINAL_JOB_STATES, RESOURCE_STATES } = require('@andrian.yablonskyy/thub-common'),
   { paginate } = require('./list-prefs'),
+  { parseTerms, likeClause } = require('./search'),
   // Named in spec errors: a field the Agent sends but this thub-common
   // doesn't know means the Coordinator needs an update.
   VERSIONS = `Coordinator v${require('../../package.json').version}, ` +
@@ -55,7 +56,7 @@ function nextJobId(db, source){
   return `${prefix}-${String(n).padStart(5, '0')}`;
 }
 
-function createJobsService(db, { bus, events, registry, artifacts, config }){
+function createJobsService(db, { bus, events, registry, config }){
   function get(id){
     return rowToJob(db.prepare('SELECT * FROM jobs WHERE id = ?').get(id));
   }
@@ -87,16 +88,26 @@ function createJobsService(db, { bus, events, registry, artifacts, config }){
   // Dashboard /jobs (§10): one sorted page plus the total, both in SQL so a
   // long history never has to be loaded whole. `sort` is a list-prefs key.
   const PAGE_SORT_SQL = {
-    id: 'jobs.id',
-    source: 'jobs.source',
-    user: 'json_extract(jobs.spec, \'$.user\')',
-    state: 'jobs.state',
-    resource: 'COALESCE(r.name, jobs.resource_name)',
-    created: 'jobs.created_at',
-    duration: 'jobs.duration_sec'
-  };
-
-  function page({ state, source, sort = 'created', dir = 'desc', size = 25, page: pageNo = 1 } = {}){
+      id: 'jobs.id',
+      source: 'jobs.source',
+      user: 'json_extract(jobs.spec, \'$.user\')',
+      state: 'jobs.state',
+      resource: 'COALESCE(r.name, jobs.resource_name)',
+      created: 'jobs.created_at',
+      duration: 'jobs.duration_sec'
+    },
+
+    // What the Jobs page's search box (?q=) looks in. Named spec fields
+    // only — never the whole spec: while a job is active its `env` still
+    // holds the real --env values (§7.2), and a LIKE over them would let
+    // anyone who can see the list guess a secret one character at a time.
+    SEARCH_SQL = [
+      'jobs.id', 'jobs.state', 'jobs.source', 'jobs.message', 'r.name', 'jobs.resource_name', 'a.name',
+      ...['user', 'command', 'suite', 'image', 'git.url', 'git.ref', 'target.group', 'target.labels', 'downloads', 'args', 'meta']
+        .map((path) => `json_extract(jobs.spec, '$.${path}')`)
+    ];
+
+  function page({ state, source, q, sort = 'created', dir = 'desc', size = 25, page: pageNo = 1 } = {}){
     const where = [],
       params = [];
     if (state){
@@ -107,15 +118,21 @@ function createJobsService(db, { bus, events, registry, artifacts, config }){
       where.push('jobs.source = ?');
       params.push(source);
     }
+    const search = likeClause(SEARCH_SQL, parseTerms(q));
+    if (search.sql){
+      where.push(search.sql);
+      params.push(...search.params);
+    }
     const whereSql = where.length ? `WHERE ${where.join(' AND ')}` : '',
+      fromSql = 'FROM jobs LEFT JOIN resources r ON r.id = jobs.resource_id LEFT JOIN agents a ON a.id = jobs.agent_id',
       column = PAGE_SORT_SQL[sort] || PAGE_SORT_SQL.created,
       order = dir === 'asc' ? 'ASC' : 'DESC',
-      total = db.prepare(`SELECT COUNT(*) AS n FROM jobs ${whereSql}`).get(...params).n,
+      total = db.prepare(`SELECT COUNT(*) AS n ${fromSql} ${whereSql}`).get(...params).n,
       pagination = paginate(total, size, pageNo),
       // Empty values (no user, never ran, …) last either way; created_at
       // breaks ties so paging is stable.
       rows = db.prepare(
-        `SELECT jobs.* FROM jobs LEFT JOIN resources r ON r.id = jobs.resource_id ${whereSql}
+        `SELECT jobs.* ${fromSql} ${whereSql}
          ORDER BY ${column} IS NULL, ${column} ${order}, jobs.created_at DESC
          LIMIT ? OFFSET ?`
       ).all(...params, pagination.limit, pagination.offset);
@@ -466,7 +483,7 @@ function createJobsService(db, { bus, events, registry, artifacts, config }){
   }
 
   // Admin: "clean the queue" — permanently delete finished jobs (and their
-  // logs/artifacts, on disk and in the DB), for when the history itself,
+  // logs, in the DB), for when the history itself,
   // not just active work, needs clearing out. Unlike the nightly retention
   // sweep (§9), this runs on demand and isn't limited to old jobs.
   function cleanHistory(){
@@ -474,7 +491,7 @@ function createJobsService(db, { bus, events, registry, artifacts, config }){
   }
 
   // Finished jobs that ended before `beforeIso` (null: all of them), with
-  // their logs, artifacts (files too) and events — manual cleanup and the
+  // their logs and events — manual cleanup and the
   // job retention task (services/cleanup.js). Active jobs are never touched.
   function purgeFinishedBefore(beforeIso){
     const placeholders = [...TERMINAL_JOB_STATES].map(() => '?').join(','),
@@ -487,14 +504,11 @@ function createJobsService(db, { bus, events, registry, artifacts, config }){
       return 0;
     }
 
-    const deleteArtifacts = db.prepare('DELETE FROM artifacts WHERE job_id = ?'),
-      deleteLogs = db.prepare('DELETE FROM job_logs WHERE job_id = ?'),
+    const deleteLogs = db.prepare('DELETE FROM job_logs WHERE job_id = ?'),
       deleteEvents = db.prepare('DELETE FROM events WHERE entity = \'job\' AND entity_id = ?'),
       deleteJob = db.prepare('DELETE FROM jobs WHERE id = ?'),
       tx = db.transaction(() => {
         for (const id of ids){
-          artifacts.deleteJobArtifacts(id);
-          deleteArtifacts.run(id);
           deleteLogs.run(id);
           deleteEvents.run(id);
           deleteJob.run(id);

package/src/services/list-prefs.js

@@ -30,6 +30,10 @@ const PAGE_SIZES = [10, 25, 50, 100, 'all'],
     resources: {
       sorts: ['name', 'type', 'version', 'status', 'heartbeat'],
       defaults: { size: DEFAULT_PAGE_SIZE, sort: 'name', dir: 'asc' }
+    },
+    agents: {
+      sorts: ['name', 'kind', 'version', 'created', 'used', 'status'],
+      defaults: { size: DEFAULT_PAGE_SIZE, sort: 'created', dir: 'desc' }
     }
   };