@andrian.yablonskyy/thub-coordinator 1.1.8 → 1.1.9

package/README.md

@@ -149,8 +149,8 @@ Server-rendered Pug templates styled with Bootstrap 5.3, with a little vanilla J
 
 | Page | Content |
 |---|---|
-| `/` | Resource cards by status, queue length, jobs in the last 24 h. Click a card for its resource card (below). |
-| `/resources` | Type, Client version, labels, groups, status, busy source/reason, last heartbeat age; admin maintenance/rotate-token actions. Click a row for its resource card (below). |
+| `/` | Runner cards by status, queue length, jobs in the last 24 h. Click a card for its runner card (below). |
+| `/runners` | **Runners** (formerly Resources; `/resources` redirects): Type, Client version, labels, groups, status, busy source/reason, last heartbeat age; admin maintenance/rotate-token actions. Click a row for its resource card (below). |
 | `/groups` | Resource groups — id/name/comment, member count; admin create/rename/delete. Membership itself is set per-resource in the Client's own config. |
 | `/jobs` | Filterable job list (state, source, resource), with the job's `user` label if set; admin **Reset queue** / **Clean history**. |
 | `/jobs/:id` | Spec, timeline, live log viewer with stream filter, artifact downloads, cancel button. |
@@ -159,7 +159,7 @@ Server-rendered Pug templates styled with Bootstrap 5.3, with a little vanilla J
 
 Notifications (results of dashboard actions, errors) appear as toasts in the top-right corner and close themselves by severity: **errors stay until closed**, warnings close after **30 s**, info and success after **10 s**. A one-time secret such as a rotated resource token never closes on its own.
 
-**Resource card.** Clicking a resource on `/` or `/resources` opens a card with its name, type, status, host uptime and current task/status with its duration (both from the Client's heartbeats, anchored to the Coordinator's clock; as of the last heartbeat for an OUT_OF_SERVICE resource), Client version, IP addresses, capabilities (reported at registration: HW udev devices with a **missing** flag for any whose device node doesn't exist; SW image, source and limits), labels, groups, busy source/reason, last heartbeat and (admins only) the maintenance/rotate-token actions. IP addresses are the Client host's interface addresses except loopback (reported at registration and on every heartbeat) plus the external address — the one the Coordinator last saw the Client connect from, taken from `X-Forwarded-For` when the request came through a proxy `trustProxy` trusts. Admins get a **Cancel** button on it, enabled only while the Client is doing something: it cancels its current job, releases a manual local lock, or aborts a self-update hold on its host (the last two delivered as `unlock` / `cancel-update` heartbeat commands).
+**Runner card.** Clicking a runner on `/` or `/runners` opens a card with its name, type, status, host uptime and current task/status with its duration (both from the Client's heartbeats, anchored to the Coordinator's clock; as of the last heartbeat for an OUT_OF_SERVICE resource), Client version, IP addresses, capabilities (reported at registration: HW udev devices with a **missing** flag for any whose device node doesn't exist; SW image, source and limits), labels, groups, busy source/reason, last heartbeat and (admins only) the maintenance/rotate-token actions. IP addresses are the Client host's interface addresses except loopback (reported at registration and on every heartbeat) plus the external address — the one the Coordinator last saw the Client connect from, taken from `X-Forwarded-For` when the request came through a proxy `trustProxy` trusts. Admins get a **Cancel** button on it, enabled only while the Client is doing something: it cancels its current job, releases a manual local lock, or aborts a self-update hold on its host (the last two delivered as `unlock` / `cancel-update` heartbeat commands).
 
 The Coordinator's own version (`ver. X.Y.Z`) is shown under the TestHub logo, top left of every page.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@andrian.yablonskyy/thub-coordinator",
-  "version": "1.1.8",
+  "version": "1.1.9",
   "description": "TestHub Coordinator — job queue, resource registry, scheduler, heartbeat monitor, log/artifact store and web dashboard",
   "main": "src/server.js",
   "engines": {

package/public/js/remove-resource.js

@@ -29,8 +29,8 @@
       field('job').textContent = job;
       field('job').href = `/jobs/${encodeURIComponent(job)}`;
       field('job-text').textContent = job;
-      field('form').action = `/resources/${encodeURIComponent(id)}/remove`;
-      field('return').value = returnTo || '/resources';
+      field('form').action = `/runners/${encodeURIComponent(id)}/remove`;
+      field('return').value = returnTo || '/runners';
 
       // Clicked from inside a resource card: close that first — Bootstrap
       // doesn't stack modals.

package/src/web/routes.js

@@ -292,6 +292,15 @@ function createWebRouter({ services, config }){
     req.session.destroy(() => res.redirect('/login'));
   });
 
+  // Resources were renamed Runners on the dashboard: old links and
+  // bookmarks (and a form from a page loaded before) still land.
+  router.use((req, res, next) => {
+    if (!/^\/resources(\/|$)/.test(req.path)){
+      return next();
+    }
+    res.redirect(req.method === 'GET' || req.method === 'HEAD' ? 301 : 308, req.originalUrl.replace(/^\/resources/, '/runners'));
+  });
+
   router.use(requireAdminSession);
   router.use((req, res, next) => {
     const u = req.session.user;
@@ -496,7 +505,7 @@ function createWebRouter({ services, config }){
     res.render('index', { title: 'Overview', active: 'overview', liveTopics: 'resources jobs', resources, queueLength, jobsLast24h, onlineCount, groupsById });
   });
 
-  router.get('/resources', (req, res) => {
+  router.get('/runners', (req, res) => {
     const groupsById = Object.fromEntries(services.groups.list().map((g) => [g.id, g])),
       q = search.normalizeQuery(req.query.q),
       terms = search.parseTerms(q),
@@ -518,7 +527,7 @@ function createWebRouter({ services, config }){
       pagination = listPrefs.paginate(sorted.length, size, req.query.page),
       pageUrl = (changes) => view.urlFor({ page: pagination.page, ...changes });
     res.render('resources/list', {
-      title: 'Resources',
+      title: 'Runners',
       active: 'resources',
       liveTopics: 'resources',
       resources: withActiveJobs(sorted.slice(pagination.offset, pagination.offset + pagination.limit)),
@@ -527,21 +536,21 @@ function createWebRouter({ services, config }){
     });
   });
 
-  router.post('/resources/:id/maintenance', (req, res) => {
+  router.post('/runners/:id/maintenance', (req, res) => {
     services.registry.setMaintenance(req.params.id, req.body.enabled === '1');
-    res.redirect(returnTo(req, '/resources'));
+    res.redirect(returnTo(req, '/runners'));
   });
 
   // Cancel whatever the Client is doing (resource card): its job, a manual
   // local lock, or a self-update hold (README §10). The Client applies the
   // lock/update ones via heartbeat commands; a job is canceled right here.
-  router.post('/resources/:id/cancel-activity', (req, res) => {
+  router.post('/runners/:id/cancel-activity', (req, res) => {
     const r = services.registry.get(req.params.id),
       job = r && services.jobs.activeForResource(r.id),
       activity = r?.activity?.state;
     try {
       if (!r){
-        throw Object.assign(new Error('Unknown resource'), { status: 404 });
+        throw Object.assign(new Error('Unknown runner'), { status: 404 });
       }
       if (job){
         services.jobs.cancel(job.id, { isAdmin: true });
@@ -572,10 +581,10 @@ function createWebRouter({ services, config }){
     catch (err){
       flash(req, 'danger', err.message);
     }
-    res.redirect(returnTo(req, '/resources'));
+    res.redirect(returnTo(req, '/runners'));
   });
 
-  router.post('/resources/:id/remove', (req, res) => {
+  router.post('/runners/:id/remove', (req, res) => {
     try {
       const { resource: r, pending, stoppedJob, canceledJobs } = services.jobs.removeResource(req.params.id, {
         by: req.session.user.username,
@@ -592,12 +601,12 @@ function createWebRouter({ services, config }){
     catch (err){
       flash(req, 'danger', err.message);
     }
-    res.redirect(returnTo(req, '/resources'));
+    res.redirect(returnTo(req, '/runners'));
   });
 
   // Reboot now (resource card footer): cancels a running job, then the
   // Client reboots its host on its next heartbeat (jobs.requestReboot).
-  router.post('/resources/:id/reboot', (req, res) => {
+  router.post('/runners/:id/reboot', (req, res) => {
     try {
       const { resource: r, canceledJob } = services.jobs.requestReboot(req.params.id, { by: req.session.user.username });
       flash(req, 'warning', `Rebooting ${r.name}'s host on its next heartbeat.` + (canceledJob ? `\nCanceled its running job ${canceledJob}.` : ''));
@@ -605,7 +614,7 @@ function createWebRouter({ services, config }){
     catch (err){
       flash(req, 'danger', err.message);
     }
-    res.redirect(returnTo(req, '/resources'));
+    res.redirect(returnTo(req, '/runners'));
   });
 
   // "Connected USB devices" tab (public/js/usb-scan.js): Refresh queues a
@@ -621,7 +630,7 @@ function createWebRouter({ services, config }){
     };
   }
 
-  router.post('/resources/:id/usb-scan', (req, res) => {
+  router.post('/runners/:id/usb-scan', (req, res) => {
     try {
       services.registry.requestUsbScan(req.params.id, { by: req.session.user.username });
       res.json(usbScanView(req, services.registry.get(req.params.id)));
@@ -631,16 +640,16 @@ function createWebRouter({ services, config }){
     }
   });
 
-  router.get('/resources/:id/usb-scan', (req, res) => {
+  router.get('/runners/:id/usb-scan', (req, res) => {
     const r = services.registry.get(req.params.id);
     if (!r){
-      return res.status(404).json({ error: 'Unknown resource' });
+      return res.status(404).json({ error: 'Unknown runner' });
     }
     res.set('Cache-Control', 'no-store').json(usbScanView(req, r));
   });
 
   // Rename (resource card, Name row); empty = back to the Client's own name.
-  router.post('/resources/:id/rename', (req, res) => {
+  router.post('/runners/:id/rename', (req, res) => {
     try {
       const before = services.registry.get(req.params.id)?.name,
         r = services.registry.rename(req.params.id, req.body.name, { by: req.session.user.username });
@@ -651,13 +660,13 @@ function createWebRouter({ services, config }){
     catch (err){
       flash(req, 'danger', err.message);
     }
-    res.redirect(returnTo(req, '/resources'));
+    res.redirect(returnTo(req, '/runners'));
   });
 
   // Capabilities (resource card, Config tab): public/js/client-config.js
   // sends the edited hw/sw section as JSON in `config`. Applied by the Client
   // on its next heartbeat, then it restarts once idle.
-  router.post('/resources/:id/config', (req, res) => {
+  router.post('/runners/:id/config', (req, res) => {
     try {
       let config;
       try {
@@ -673,12 +682,12 @@ function createWebRouter({ services, config }){
     catch (err){
       flash(req, 'danger', err.message);
     }
-    res.redirect(returnTo(req, '/resources'));
+    res.redirect(returnTo(req, '/runners'));
   });
 
   // Groups tab (resource card): the Client's group membership, as a config
   // revision the Client writes to its file (registry.setClientGroups).
-  router.post('/resources/:id/groups', (req, res) => {
+  router.post('/runners/:id/groups', (req, res) => {
     try {
       const ids = [].concat(req.body.groups || []).filter((g) => typeof g === 'string' && g),
         r = services.registry.setClientGroups(req.params.id, ids, {
@@ -691,12 +700,12 @@ function createWebRouter({ services, config }){
     catch (err){
       flash(req, 'danger', err.message);
     }
-    res.redirect(returnTo(req, '/resources'));
+    res.redirect(returnTo(req, '/runners'));
   });
 
   // Export (resource card, admins — the file holds the join key): the
   // Client's config file as JSON, secrets excluded.
-  router.get('/resources/:id/config/export', (req, res) => {
+  router.get('/runners/:id/config/export', (req, res) => {
     try {
       const r = services.registry.get(req.params.id),
         file = services.registry.exportClientConfig(req.params.id);
@@ -704,13 +713,13 @@ function createWebRouter({ services, config }){
     }
     catch (err){
       flash(req, 'danger', err.message);
-      res.redirect('/resources');
+      res.redirect('/runners');
     }
   });
 
   // Import (resource card, public/js/config-import.js): a config file, applied
   // by the Client on its next heartbeat like a Config tab Save.
-  router.post('/resources/:id/config/import', (req, res) => {
+  router.post('/runners/:id/config/import', (req, res) => {
     try {
       let file;
       try {
@@ -727,12 +736,12 @@ function createWebRouter({ services, config }){
     catch (err){
       flash(req, 'danger', err.message);
     }
-    res.redirect(returnTo(req, '/resources'));
+    res.redirect(returnTo(req, '/runners'));
   });
 
   // Scheduled host reboot (resource card): save a cron expression, or clear
   // it; the Client applies it on its next heartbeat.
-  router.post('/resources/:id/reboot-schedule', (req, res) => {
+  router.post('/runners/:id/reboot-schedule', (req, res) => {
     try {
       const cron = req.body.clear === '1' ? '' : req.body.cron,
         r = services.registry.setRebootSchedule(req.params.id, cron, { by: req.session.user.username });
@@ -743,17 +752,17 @@ function createWebRouter({ services, config }){
     catch (err){
       flash(req, 'danger', err.message);
     }
-    res.redirect(returnTo(req, '/resources'));
+    res.redirect(returnTo(req, '/runners'));
   });
 
-  router.post('/resources/:id/rotate-token', requireAdminRole, (req, res) => {
+  router.post('/runners/:id/rotate-token', requireAdminRole, (req, res) => {
     const { generateToken, hashToken } = require('../services/tokens');
     const token = generateToken('res');
     services.db.prepare('UPDATE resources SET token_hash = ? WHERE id = ?').run(hashToken(token), req.params.id);
     services.events.record('resource', req.params.id, 'resource.token_rotated', {});
     // Sticky: shown only once, so it mustn't close before it's copied.
-    flash(req, 'warning', `New resource token (copy it now):\n${token}`, { sticky: true });
-    res.redirect(returnTo(req, '/resources'));
+    flash(req, 'warning', `New runner token (copy it now):\n${token}`, { sticky: true });
+    res.redirect(returnTo(req, '/runners'));
   });
 
   // Self-update (README §10.2). Clients get a `self-update` heartbeat
@@ -797,13 +806,13 @@ function createWebRouter({ services, config }){
       parts.push('Latest Client version unknown.');
     }
     else if (!connected.length){
-      parts.push('No connected resources.');
+      parts.push('No connected runners.');
     }
     else if (outdated.length){
-      parts.push(`${outdated.length} of ${connected.length} connected resource(s) can update to Client v${s.latest.client}: ${names(outdated)}.`);
+      parts.push(`${outdated.length} of ${connected.length} connected runner(s) can update to Client v${s.latest.client}: ${names(outdated)}.`);
     }
     else {
-      parts.push(`All ${connected.length} connected resource(s) run the latest Client (v${s.latest.client}).`);
+      parts.push(`All ${connected.length} connected runner(s) run the latest Client (v${s.latest.client}).`);
     }
     if (unknown.length){
       parts.push(`Version unknown (Client too old to report it): ${names(unknown)}.`);
@@ -833,20 +842,20 @@ function createWebRouter({ services, config }){
     });
   });
 
-  router.post('/resources/update-all', updateAction(async () => {
+  router.post('/runners/update-all', updateAction(async () => {
     const version = await services.updates.targetVersion('client'),
       n = services.registry.requestUpdateAll(version);
-    return `Requested update to client v${version} on ${n} resource(s).`;
+    return `Requested update to client v${version} on ${n} runner(s).`;
   }));
 
-  router.post('/resources/:id/update', updateAction(async (req) => {
+  router.post('/runners/:id/update', updateAction(async (req) => {
     // Cancel (next to the version): withdraw the request and, if the host is
     // already holding for the update, abort that too (the Client's next
     // heartbeat) — the one control for canceling a Client update.
     if (req.body.cancel === '1'){
       const r = services.registry.get(req.params.id);
       if (!r){
-        throw Object.assign(new Error('Unknown resource'), { status: 404 });
+        throw Object.assign(new Error('Unknown runner'), { status: 404 });
       }
       services.registry.setUpdateTo(r.id, null);
       if (r.activity?.state === 'update-hold'){
@@ -1069,7 +1078,7 @@ function createWebRouter({ services, config }){
 
   router.post('/groups/:id/delete', (req, res) => {
     services.groups.remove(req.params.id);
-    flash(req, 'warning', 'Group deleted; any resource that listed it just stopped matching on it.');
+    flash(req, 'warning', 'Group deleted; any runner that listed it just stopped matching on it.');
     res.redirect('/groups');
   });
 
@@ -1469,7 +1478,7 @@ function createWebRouter({ services, config }){
       if (req.body.groupId !== undefined && (req.body.groupId || null) !== (before.group_id || null)){
         const group = req.body.groupId ? services.groups.get(req.body.groupId) : null;
         services.agents.setGroup(req.params.id, req.body.groupId);
-        flash(req, 'success', group ? `"${agent.name}" now runs its jobs in group ${group.name}.` : `"${agent.name}" now runs its jobs on any resource.`);
+        flash(req, 'success', group ? `"${agent.name}" now runs its jobs in group ${group.name}.` : `"${agent.name}" now runs its jobs on any runner.`);
       }
     }
     catch (err){

package/test/groups-tab.test.js

@@ -52,10 +52,10 @@ test('Groups tab: in effect at once, sent to the Client as its next config revis
     nightly = services.groups.create({ name: 'nightly' }),
     pr = services.groups.create({ name: 'pr-pool', comment: 'pull requests' }),
     id = register(services, 'lab-sw-01'),
-    save = (cookie, groups) => fetch(`${base}/resources/${id}/groups`, {
-      method: 'POST', headers: { cookie }, body: new URLSearchParams([...groups.map((g) => ['groups', g]), ['returnTo', '/resources']]), redirect: 'manual'
+    save = (cookie, groups) => fetch(`${base}/runners/${id}/groups`, {
+      method: 'POST', headers: { cookie }, body: new URLSearchParams([...groups.map((g) => ['groups', g]), ['returnTo', '/runners']]), redirect: 'manual'
     }),
-    page = async () => (await fetch(`${base}/resources`, { headers: { cookie: admin } })).text();
+    page = async () => (await fetch(`${base}/runners`, { headers: { cookie: admin } })).text();
 
   assert.equal((await save(viewer, [nightly.id])).status, 302); // a maintainer may (§10.3)
   assert.equal((await save(admin, [nightly.id, pr.id])).status, 302);
@@ -105,7 +105,7 @@ test('device tabs show what the Client runs — not an old saved revision; group
     }).resourceId,
     id = register('1.1'),
     devpaths = async () => {
-      const html = await (await fetch(`${base}/resources`, { headers: { cookie: admin } })).text(),
+      const html = await (await fetch(`${base}/runners`, { headers: { cookie: admin } })).text(),
         table = html.slice(html.indexOf(`id="cfg-${id}-stlinks"`), html.indexOf(`id="cfg-${id}-uarts"`));
       return [...table.matchAll(/data-f="devpath" value="([^"]*)"/g)].map((m) => m[1]).filter(Boolean); // not the blank add-row template
     };
@@ -134,7 +134,7 @@ test('ST-Link tab has no Serial field; a serial set in the config file is kept o
       clientId: 'hw2', name: 'lab-hw-02', type: 'hw', labels: [],
       config: { stlinks: [{ index: 1, serial: '066DFF48', devpath: '1.2' }] }, configFile: { name: 'lab-hw-02', type: 'hw' }
     }).resourceId,
-    html = await (await fetch(`${base}/resources`, { headers: { cookie: admin } })).text(),
+    html = await (await fetch(`${base}/runners`, { headers: { cookie: admin } })).text(),
     table = html.slice(html.indexOf(`id="cfg-${id}-stlinks"`), html.indexOf(`id="cfg-${id}-uarts"`));
   assert.doesNotMatch(table, /data-f="serial"|>Serial</);
   // Rides along in data-extra, which public/js/client-config.js spreads back into the row.
@@ -147,7 +147,7 @@ test('resource card: USB actions update live and every disabled button says why'
       clientId: 'hw3', name: 'lab-hw-03', type: 'hw', labels: [], config: { stlinks: [{ index: 1 }] }, configFile: { name: 'lab-hw-03', type: 'hw' }
     }),
     card = async () => {
-      const html = await (await fetch(`${base}/resources`, { headers: { cookie: admin } })).text();
+      const html = await (await fetch(`${base}/runners`, { headers: { cookie: admin } })).text();
       return html.slice(html.indexOf(`id="resource-card-${reg.resourceId}"`));
     };
   let html = await card();
@@ -169,7 +169,7 @@ test('Import and Export work for a Client that doesn\'t re-register (no joinKey)
   const { base, services, admin } = await start(t),
     { resourceId, resourceToken } = services.registry.registerAuto({ clientId: 'hw4', name: 'lab-hw-04', type: 'hw', labels: [] }),
     card = async () => {
-      const html = await (await fetch(`${base}/resources`, { headers: { cookie: admin } })).text();
+      const html = await (await fetch(`${base}/runners`, { headers: { cookie: admin } })).text();
       return html.slice(html.indexOf(`id="resource-card-${resourceId}"`));
     };
   assert.match(await card(), /Import unavailable: this Client is too old/); // nothing reported, no version known
@@ -188,7 +188,7 @@ test('Import and Export work for a Client that doesn\'t re-register (no joinKey)
   const html = await card();
   assert.match(html, /data-config-import-pick/); // Import enabled
   assert.doesNotMatch(html, /Import unavailable/);
-  const exported = await (await fetch(`${base}/resources/${resourceId}/config/export`, { headers: { cookie: admin } })).json();
+  const exported = await (await fetch(`${base}/runners/${resourceId}/config/export`, { headers: { cookie: admin } })).json();
   assert.equal(exported.joinKey, undefined);
   assert.deepEqual(exported['hw-devices'], { stlinks: [{ index: 1, devpath: '1.1' }] });
 
@@ -238,7 +238,7 @@ test('agent groups are set on the dashboard (Users, CI tokens) and shown by name
   assert.match(agents, /<span class="badge text-bg-info">nightly-pool<\/span>/);
   assert.match(groups, /data-bs-title="dev, ci-night"[^>]*>2</); // Agents column: users, then CI tokens
   // The id is never shown as text on a page (it's only in values and URLs).
-  for (const html of [users, agents, groups, await page(admin, '/resources'), await page(admin, `/jobs/${job.id}`)]){
+  for (const html of [users, agents, groups, await page(admin, '/runners'), await page(admin, `/jobs/${job.id}`)]){
     const text = html.replace(/<[^>]*>/g, ' ');
     assert.ok(!text.includes(g.id), 'a group id shows as text');
   }
@@ -275,3 +275,17 @@ test('CI tokens: the name opens Edit; a new token replaces the old one; delete k
   assert.match(await (await form(`/admin/agents/${agent.id}/token`)).headers.get('location'), /agents/); // can't come back
   assert.equal(services.agents.get(agent.id).revoked_at !== null, true);
 });
+
+test('Resources renamed Runners: the page is /runners; old /resources links and forms still land', async (t) => {
+  const { base, admin } = await start(t),
+    old = await fetch(`${base}/resources?q=lab`, { headers: { cookie: admin }, redirect: 'manual' });
+  assert.equal(old.status, 301);
+  assert.equal(old.headers.get('location'), '/runners?q=lab');
+  const post = await fetch(`${base}/resources/abc/rename`, { method: 'POST', headers: { cookie: admin }, redirect: 'manual' });
+  assert.equal(post.status, 308); // keeps the method and body
+  assert.equal(post.headers.get('location'), '/runners/abc/rename');
+  const html = await (await fetch(`${base}/runners`, { headers: { cookie: admin } })).text();
+  assert.match(html, /<title>Runners · TestHub<\/title>/);
+  assert.match(html, /href="\/runners"[^>]*>(<i [^>]*><\/i>)?Runners</);
+  assert.doesNotMatch(html.replace(/<[^>]*>/g, ' '), /\bResources?\b/); // no visible "Resource(s)" left on the page
+});

package/test/live.test.js

@@ -133,7 +133,7 @@ test('live: /live streams hello and changes; passive re-fetches keep the idle ti
   await new Promise((r) => setTimeout(r, 1100));
 
   // …survives a passive re-fetch, which also doesn't push the expiry out.
-  const passive = await fetch(`${base}/resources`, { headers: { cookie, 'X-Thub-Live': '1' } });
+  const passive = await fetch(`${base}/runners`, { headers: { cookie, 'X-Thub-Live': '1' } });
   assert.equal(passive.status, 200);
   assert.match(passive.headers.get('cache-control'), /no-store/);
   const passiveExpires = expiresOf(passive);
@@ -149,5 +149,5 @@ test('live: /live streams hello and changes; passive re-fetches keep the idle ti
   // passive re-fetch is redirected to the login page.
   await fetch(`${base}/logout`, { method: 'POST', headers: { cookie }, redirect: 'manual' });
   assert.equal((await fetch(`${base}/live`, { headers: { cookie, accept: 'text/event-stream' } })).status, 401);
-  assert.equal((await fetch(`${base}/resources`, { headers: { cookie, 'X-Thub-Live': '1' }, redirect: 'manual' })).status, 302);
+  assert.equal((await fetch(`${base}/runners`, { headers: { cookie, 'X-Thub-Live': '1' }, redirect: 'manual' })).status, 302);
 });

package/test/users.test.js

@@ -185,7 +185,7 @@ test('dashboard: only maintainers and admins sign in; security pages are admins\
   assert.match(dev.text, /no dashboard access/);
 
   const mo = await signIn('mo', 'pw');
-  assert.equal((await get(mo.cookie, '/resources')).status, 200);
+  assert.equal((await get(mo.cookie, '/runners')).status, 200);
   assert.equal((await get(mo.cookie, '/admin/settings')).status, 403); // admins' only
   for (const url of ['/admin/users', '/admin/agents']){
     assert.equal((await get(mo.cookie, url)).status, 200, url); // within limits — see below
@@ -195,7 +195,7 @@ test('dashboard: only maintainers and admins sign in; security pages are admins\
 
   // Blocked while signed in: the next click goes to the sign-in page.
   u.setBlocked(maint.id, true, { actorId: admin.id });
-  const after = await get(mo.cookie, '/resources');
+  const after = await get(mo.cookie, '/runners');
   assert.equal(after.status, 302);
   assert.equal(after.headers.get('location'), '/login');
   assert.match((await signIn('mo', 'pw')).text, /blocked/);

package/views/groups/list.pug

@@ -9,7 +9,7 @@ block content
 
   p.text-body-secondary.small: i.
     Give an agent a group — a user on #[a(href="/admin/users") Users], a CI token on #[a(href="/admin/agents") CI tokens] —
-    and its jobs run only on resources in that group (§13.1). Which groups a Client is in is set on its resource card (Groups tab).
+    and its jobs run only on runners in that group (§13.1). Which groups a Client is in is set on its runner card (Groups tab).
 
   if totalCount
     .d-flex.flex-wrap.align-items-center.gap-2.mb-2
@@ -25,7 +25,7 @@ block content
         tr
           th Name
           th Comment
-          th Resources
+          th Runners
           th Agents
           th Created
           if canManage
@@ -44,7 +44,7 @@ block content
                 form.d-inline.ms-1(
                   method="post"
                   action=`/groups/${g.id}/delete`
-                  data-confirm=`Delete group "${g.name}"? Resources listing it just stop matching on it, and its agents go back to running their jobs on any resource.`
+                  data-confirm=`Delete group "${g.name}"? Runners listing it just stop matching on it, and its agents go back to running their jobs on any runner.`
                   data-confirm-title="Delete group?"
                   data-confirm-ok="Delete group"
                 )

package/views/help/_agent-cli.pug

@@ -18,7 +18,7 @@
   -
     const groups = [
       { title: 'Where to run', rows: [
-        ['--type hw|sw', 'Required. Resource type.', '--type hw'],
+        ['--type hw|sw', 'Required. Runner type.', '--type hw'],
         ['--board <name>', 'Shorthand for --label board:<name>.', '--board nucleo-f401re'],
         ['--label <l>', 'Required label (repeatable). The Client must have all of them.', '--label uart --label stlink'],
         ['--client <name|id>', 'Only this Client; waits for it even if others are idle.', '--client lab-hw-01']

package/views/help/_agent-setup.pug

@@ -44,7 +44,7 @@
     thub config set key   thk_…
     thub config set user  "Your Name"      # optional: job owner label
   p.small.
-    These are saved in #[code ~/.config/thub/agent.json]. Which resource group your jobs run in isn't an Agent
+    These are saved in #[code ~/.config/thub/agent.json]. Which runner group your jobs run in isn't an Agent
     setting: an admin or maintainer sets it for your user on the dashboard (#[code thub whoami] shows it). Order of precedence: flags (#[code --url], #[code --key]) →
     environment → config file.
   table.table.table-sm.small

package/views/help/_client-machines.pug

@@ -40,14 +40,14 @@
         lsusb -t                                      # USB tree
         udevadm info -a -n /dev/ttyUSB0 | grep -m1 'ATTRS{devpath}'
         st-info --probe                               # ST-Link serials
-      | Or open the resource card → #[strong Connected USB devices] → #[strong Refresh], then #[strong Import to config].
+      | Or open the runner card → #[strong Connected USB devices] → #[strong Refresh], then #[strong Import to config].
     li
       | Put the devpaths into #[code hw-devices] and restart. On every start the Client writes
       | #[code /etc/udev/rules.d/99-thub-<instance>.rules], so the devices appear as #[code /dev/thub/dut<N>-stlink|uart|usb]:
       +code('HW machine').
         sudo systemctl restart thub-client@client
         ls -l /dev/thub/
-    li Check the resource card's #[strong Capabilities]: each configured device must be present (a missing one is flagged).
+    li Check the runner card's #[strong Capabilities]: each configured device must be present (a missing one is flagged).
     li Your job's #[code --command] flashes the board. The Client never flashes by itself; it passes the ST-Link serials and the downloaded files in the environment (#[a(href="#env") Environment variables]).
   +code('A typical HW job').
     thub run --type hw --board nucleo-f401re \
@@ -71,7 +71,7 @@
   p.small.
     To scale out, clone the VM template. In the clone, #[strong before its first start], run
     #[code rm -f ~/var/lib/thub/client/*/.client-id ~/var/lib/thub/client/*.token] and give it its own #[code name].
-    Otherwise both VMs register as the same resource.
+    Otherwise both VMs register as the same runner.
   +code('A typical SW job').
     thub run --type sw \
       --docker-image registry.lab.local:5000/dut-emulator:2026.08 \
@@ -84,4 +84,4 @@
     li Outbound HTTPS to the Coordinator; test it with #[code curl -sI #{coordinatorUrl}/login].
     li The Client's service user has SSH keys and git credentials for private repos (#[a(href="#git") Git repositories]) and Docker logins for private registries (#[a(href="#docker") Docker registry]).
     li Under systemd, the service can only write to its state directory. Jobs write to #[code $THUB_WORK_DIR], not to #[code ~].
-    li Optional: a nightly reboot from the resource card's #[strong Reboot] tab (cron, host-local time). It waits for running jobs.
+    li Optional: a nightly reboot from the runner card's #[strong Reboot] tab (cron, host-local time). It waits for running jobs.

package/views/help/_client-setup.pug

@@ -74,7 +74,7 @@
         tr
           td: code name
           td No
-          td Resource name. Under systemd, the instance name (#[code thub-client@dut1] → #[code dut1]) is used unless an admin renames it on the dashboard.
+          td Runner name. Under systemd, the instance name (#[code thub-client@dut1] → #[code dut1]) is used unless an admin renames it on the dashboard.
         tr
           td: code labels
           td No
@@ -82,7 +82,7 @@
         tr
           td: code groups
           td No
-          td The resource groups this Client belongs to. Set them on its resource card (Groups tab), which writes them here.
+          td The runner groups this Client belongs to. Set them on its runner card (Groups tab), which writes them here.
         tr
           td: code varDir
           td No
@@ -101,7 +101,7 @@
           td An explicit identity UUID (or #[code THUB_CLIENT_ID]). Normally generated once and kept in #[code .client-id].
   p.small.
     SW Clients have no settings of their own: they run whatever DUT image a job brings (#[code --docker-image]).
-    Admins can also edit an HW Client's devices from its resource card (#[strong ST-Link | UART | DUT USB]
+    Admins can also edit an HW Client's devices from its runner card (#[strong ST-Link | UART | DUT USB]
     tabs). The tabs show the config the Client runs, as it reported it at its last start, or a saved
     change it hasn't applied yet. #[strong Connected USB devices → Import to config] fills them from the host's #[code lsusb].
     The card's #[strong Export] and #[strong Import] icons download a Client's config file (never its

package/views/help/_coordinator.pug

@@ -63,13 +63,13 @@
           td The shared secret Clients self-register with. Unset or #[code null] turns registration off (#[code 503]).
         tr
           td: code heartbeat.*
-          td Clients heartbeat every #[code intervalSec] — the Coordinator tells them, so it's set here only (and on Settings). After #[code missedLimit] misses a resource goes #[code OUT_OF_SERVICE] and its job becomes #[code LOST]; #[code sweepIntervalSec] is how often that's checked.
+          td Clients heartbeat every #[code intervalSec] — the Coordinator tells them, so it's set here only (and on Settings). After #[code missedLimit] misses a runner goes #[code OUT_OF_SERVICE] and its job becomes #[code LOST]; #[code sweepIntervalSec] is how often that's checked.
         tr
           td: code scheduler.*
           td #[code assignAckTimeoutSec]: how long an assignment waits for the Client to accept. #[code requeueOnLost]: retry a #[code LOST] job once. #[code maxQueuedPerAgent]: queue limit per agent.
         tr
           td: code rateLimit.*
-          td Requests per minute per caller (agent/resource token, dashboard user, else IP; default 500), and sign-in attempts per IP (default 10). Past it: #[code 429] with #[code Retry-After]. #[code 0] turns a limit off.
+          td Requests per minute per caller (agent/runner token, dashboard user, else IP; default 500), and sign-in attempts per IP (default 10). Past it: #[code 429] with #[code Retry-After]. #[code 0] turns a limit off.
         tr
           td: code jobs.*
           td Default and maximum job timeout, in seconds.
@@ -152,5 +152,5 @@
   p.small.mb-0.
     The Coordinator checks npm for new Coordinator, Agent and Client versions. Admins update the Coordinator
     with #[strong Update app] in the navbar, and Agents and Clients from the #[a(href="/admin/agents") Agents]
-    and #[a(href="/resources") Resources] pages. Clients install an update only between jobs.
+    and #[a(href="/runners") Runners] pages. Clients install an update only between jobs.
     Manual alternatives: #[code thub-admin self-update], #[code thub self-update] and #[code thub-client self-update].

package/views/help/_docker.pug

@@ -121,4 +121,4 @@
         td Files written to #[code /work] stay owned by the Client user, so the workspace can be cleaned up.
   +note('info').
     Docker access is effectively root access on that host. The Client host must have Docker and the service user must be in the
-    #[code docker] group. The resource card's #[strong Capabilities] show whether a Client can use Docker, and why not.
+    #[code docker] group. The runner card's #[strong Capabilities] show whether a Client can use Docker, and why not.

package/views/help/_overview.pug

@@ -12,7 +12,7 @@
             i.bi.bi-hdd-network.me-1
             | Coordinator
           p.card-text.small.mb-0.
-            This service. It holds the job queue and the resource registry, and runs the scheduler and
+            This service. It holds the job queue and the runner registry, and runs the scheduler and
             the heartbeat monitor. It stores job state and logs in SQLite,
             and serves this dashboard. It's the only thing that needs a public HTTPS port.
     .col-md-4
@@ -51,13 +51,13 @@
     li #[strong The Coordinator is the single source of truth.] It assigns a job inside a single SQLite transaction, so a job can never be assigned twice.
     li #[strong A job is a command, not a script upload.] The Client runs your #[code --command] as its service user, never as root. Issue agent tokens only to trusted pipelines and people.
 
-  h3.h6 Resource and job states
+  h3.h6 Runner and job states
   .row.g-3.small
     .col-md-6
       table.table.table-sm.mb-0
         thead
           tr
-            th Resource
+            th Runner
             th Meaning
         tbody
           tr

package/views/help/_quick-start.pug

@@ -18,7 +18,7 @@
         sudo npm i -g @andrian.yablonskyy/thub-client
         nano ~/.config/thub/client.json               # coordinatorUrl, type, joinKey
         sudo systemctl enable --now thub-client@client
-      | It shows up on #[a(href="/resources") Resources] by itself, usually within 10 s.
+      | It shows up on #[a(href="/runners") Runners] by itself, usually within 10 s.
     li
       strong Create users and their access keys
       |  on #[a(href="/admin/users") Users] (admins and maintainers), or on the Coordinator host with

package/views/help/_troubleshooting.pug

@@ -3,9 +3,9 @@
   //- <code>, with everything else HTML-escaped first (so `<instance>` shows as text).
   -
     const faq = [
-      ['A Client doesn\'t appear on Resources', 'Check `journalctl -u thub-client@<instance> -f`. A `503` at registration means the Coordinator has no `clientJoinKey`; a `401` means the `joinKey` differs. Also check that `coordinatorUrl` is reachable from the lab (`curl -sI <url>/login`).'],
-      ['A Client flaps or two machines show as one resource', 'Both use the same `.client-id` (a cloned VM or a shared config file). Delete `<varDir>/<instance>/.client-id` on one of them and restart it, or set a distinct `clientId`.'],
-      ['Name already in use (`409`)', 'Another live Client holds that name. Rename one of them in its config or from the resource card. A name held by an `OUT_OF_SERVICE` resource is reclaimed automatically.'],
+      ['A Client doesn\'t appear on Runners', 'Check `journalctl -u thub-client@<instance> -f`. A `503` at registration means the Coordinator has no `clientJoinKey`; a `401` means the `joinKey` differs. Also check that `coordinatorUrl` is reachable from the lab (`curl -sI <url>/login`).'],
+      ['A Client flaps or two machines show as one runner', 'Both use the same `.client-id` (a cloned VM or a shared config file). Delete `<varDir>/<instance>/.client-id` on one of them and restart it, or set a distinct `clientId`.'],
+      ['Name already in use (`409`)', 'Another live Client holds that name. Rename one of them in its config or from the runner card. A name held by an `OUT_OF_SERVICE` runner is reclaimed automatically.'],
       ['The job is rejected with `422`', 'No registered Client can ever match its type, labels, group or client. Compare `thub resources` with your `--type` and `--board`/`--label`; your group (set on the dashboard, see `thub whoami`) must have a Client of that kind.'],
       ['The job stays `QUEUED`', 'Matching Clients are all `BUSY`, locked (`local`), in `MAINTENANCE` or offline, or the job is pinned with `--client`. It times out after `--timeout`.'],
       ['`ERROR` during prepare', 'The clone, download or DUT image pull failed; the job log names the reason. For git, check the Client user\'s keys and `known_hosts` (`ssh -T git@<host>` as that user). For images, check the Client user\'s `docker login`.'],
@@ -14,11 +14,11 @@
       ['Job `LOST`', 'The Client missed 3 heartbeats (network, reboot, crash). With `requeueOnLost` the job is retried once on another Client.'],
       ['A job can\'t write to `~` (read-only file system)', 'Under systemd the Client can only write to its state directory. Write to `$THUB_WORK_DIR`, and set `DOCKER_CONFIG` there for `docker login`.'],
       ['Live logs don\'t stream through the proxy', 'Turn off response buffering for the Coordinator (nginx: `proxy_buffering off;`, Caddy: `flush_interval -1`).'],
-      ['Finding a job, resource, group or agent', 'Use the search box on its list page (press `/` to jump to it). Every word must match, e.g. `lab-hw-01 FAILED` or a git ref. Job search covers ids, users, resources, agents, commands, repos and `--meta`, but not `--env` values (secrets). On a job page, search the log above the log viewer: `Enter`/`Shift+Enter` step through matches.'],
+      ['Finding a job, runner, group or agent', 'Use the search box on its list page (press `/` to jump to it). Every word must match, e.g. `lab-hw-01 FAILED` or a git ref. Job search covers ids, users, runners, agents, commands, repos and `--meta`, but not `--env` values (secrets). On a job page, search the log above the log viewer: `Enter`/`Shift+Enter` step through matches.'],
       ['Lists don\'t update by themselves (navbar shows Offline or Paused)', '`Paused`: you\'re editing something on the page (a field, the inline rename, a dialog); it resumes when you\'re done. `Offline`: the browser can\'t hold the `/live` stream open, often a proxy buffering it (nginx: `proxy_buffering off;`); reloading the page always shows current data. `Session ended`: sign in again. Background updates never extend the session\'s idle timeout.'],
       ['Sign-in says it needs HTTPS', 'The session cookie is HTTPS-only because `publicUrl` is `https://`, but the request arrived as plain HTTP. Open the dashboard through its https:// address; behind a reverse proxy, make it send `X-Forwarded-Proto: https` (nginx: `proxy_set_header X-Forwarded-Proto $scheme;`) and check `trustProxy`. To allow plain HTTP, set `session.secureCookie` to `false`.'],
       ['Where are a job\'s test reports and output files?', 'The Coordinator keeps only the log and the result (verdict, exit code, JUnit test counts). Files the job creates stay in its workspace on the Client and are deleted when the job ends. To keep them, publish them from `--command`, e.g. `curl -fsS -H "Authorization: Bearer $ART_TOKEN" -T results/report.xml "https://artifactory.example.com/qa/$THUB_JOB_ID/report.xml"` with `--env ART_TOKEN`. To show them on the job page and in `thub status`, list them in `$THUB_ARTIFACTS_FILE` as `[{"name", "size", "link", "timestamp"}]` — only that metadata is kept. The full log is always available from the job page\'s Raw button.'],
-      ['429 Too Many Requests', 'A caller went over `rateLimit.requestsPerMinute` (per agent or resource token, per dashboard user, else per IP; default 500). The Agent and Client wait for `Retry-After` and retry by themselves; a script calling the API should do the same. Raise the limit in the config file or on Settings if your normal traffic needs more (a Client streaming logs makes up to ~240 requests a minute). Too many sign-in attempts from one address: wait a minute (`rateLimit.loginPerMinute`).'],
+      ['429 Too Many Requests', 'A caller went over `rateLimit.requestsPerMinute` (per agent or runner token, per dashboard user, else per IP; default 500). The Agent and Client wait for `Retry-After` and retry by themselves; a script calling the API should do the same. Raise the limit in the config file or on Settings if your normal traffic needs more (a Client streaming logs makes up to ~240 requests a minute). Too many sign-in attempts from one address: wait a minute (`rateLimit.loginPerMinute`).'],
       ['Sign-in says “Too many failed sign-ins”', 'After repeated wrong passwords the Coordinator makes each further attempt wait, doubling each time: per address from the 5th failure (up to 15 min), per username from the 10th from any address (up to 5 min). Wait the time shown, or sign in from another address; a successful sign-in clears it, and an hour without failures forgets it. The Coordinator never tells whether a username exists.'],
       ['Agent says “Invalid or revoked access key” or “… is blocked”', 'The key was replaced (`thub key rotate`, an admin, your profile) or revoked, or your user is blocked. Ask an admin for a new key (Users), or create one on your profile if you can sign in. Then `thub config set key <key>`; `thub whoami` checks it.'],
       ['The Coordinator won\'t start after an upgrade: `SqliteError: disk I/O error` (`SQLITE_IOERR_GETTEMPPATH`)', 'Its systemd unit is older than 1.1.1: it has `ProtectSystem=strict` without `PrivateTmp=yes`, so SQLite has no writable temp directory for a large migration. The migration rolls back, so no data is lost. Install the latest version with `sudo npm i -g @andrian.yablonskyy/thub-coordinator` (the dashboard can\'t update a Coordinator that\'s down), or run `sudo systemctl edit thub-coordinator`, add `[Service]` and `PrivateTmp=yes`, then `sudo systemctl restart thub-coordinator`.'],

package/views/index.pug

@@ -21,7 +21,7 @@ block content
     .col-md-4
       .card
         .card-body
-          h6.card-subtitle.mb-2.text-body-secondary Resources online
+          h6.card-subtitle.mb-2.text-body-secondary Runners online
           p.display-6= `${onlineCount} / ${resources.length}`
 
   .row.g-3(data-live="overview-cards")

package/views/jobs/list.pug

@@ -13,7 +13,7 @@ block content
 
   form.row.g-2.mb-3(method="get" role="search")
     .col-12.col-md-5.col-lg-4
-      +searchBox(filters.q, 'Search jobs: id, user, resource, command, repo…', list.urlFor({ q: '' }))
+      +searchBox(filters.q, 'Search jobs: id, user, runner, command, repo…', list.urlFor({ q: '' }))
     .col-auto
       select.form-select.form-select-sm(name="state" data-autosubmit)
         option(value="") any state
@@ -37,7 +37,7 @@ block content
         +sortHeader(list, 'source', 'Source')
         +sortHeader(list, 'user', 'User')
         +sortHeader(list, 'state', 'State')
-        +sortHeader(list, 'resource', 'Resource')
+        +sortHeader(list, 'resource', 'Runner')
         +sortHeader(list, 'created', 'Created', 'desc')
         +sortHeader(list, 'duration', 'Duration', 'desc')
         if canManage
@@ -132,7 +132,7 @@ block content
             data-value=preset.value
           )= preset.label
       p
-        | Deletes finished jobs that ended before then, with their logs, and the resource, agent and group history logged before then — then compacts the database file.
+        | Deletes finished jobs that ended before then, with their logs, and the runner, agent and group history logged before then — then compacts the database file.
         |
         strong This cannot be undone.
         |  Active jobs are never touched.

package/views/jobs/show.pug

@@ -29,7 +29,7 @@ block content
     if job.spec.user
       dt.col-sm-2 User
       dd.col-sm-10= job.spec.user
-    dt.col-sm-2 Resource
+    dt.col-sm-2 Runner
     dd.col-sm-10= job.resource ? job.resource.name : job.resource_name ? `${job.resource_name} (removed)` : '—'
     dt.col-sm-2 Target
     dd.col-sm-10= `${job.spec.target.type} — ${(job.spec.target.labels || []).join(', ')}`

package/views/layout.pug

@@ -53,7 +53,7 @@ html(lang="en" data-bs-theme=(user && user.theme) || "auto")
           //- Below lg the menu drops down over the page (thub.css .thub-nav,
           //- closed by public/js/actions.js): pages as a two-column grid with
           //- icons, then the tools in a row, then the account row.
-          - const pages = user ? [['/', 'overview', 'Overview', 'speedometer2'], ['/resources', 'resources', 'Resources', 'hdd-rack'], ['/groups', 'groups', 'Groups', 'collection'], ['/jobs', 'jobs', 'Jobs', 'list-task'], ['/admin/users', 'users', 'Users', 'people'], ['/admin/agents', 'agents', 'CI tokens', 'key']].concat(user.role === 'admin' ? [['/admin/settings', 'settings', 'Settings', 'gear']] : []) : []
+          - const pages = user ? [['/', 'overview', 'Overview', 'speedometer2'], ['/runners', 'resources', 'Runners', 'hdd-rack'], ['/groups', 'groups', 'Groups', 'collection'], ['/jobs', 'jobs', 'Jobs', 'list-task'], ['/admin/users', 'users', 'Users', 'people'], ['/admin/agents', 'agents', 'CI tokens', 'key']].concat(user.role === 'admin' ? [['/admin/settings', 'settings', 'Settings', 'gear']] : []) : []
           ul.navbar-nav.me-auto.thub-nav-pages
             each pg in pages
               li.nav-item
@@ -88,7 +88,7 @@ html(lang="en" data-bs-theme=(user && user.theme) || "auto")
                     aria-label="Check for updates"
                     data-bs-toggle="tooltip"
                     data-bs-placement="bottom"
-                    data-bs-title=updates.checkedAt ? `Check for updates now — the Coordinator and connected resources (last checked ${fmtDate(updates.checkedAt)})` : 'Check for updates now — the Coordinator and connected resources'
+                    data-bs-title=updates.checkedAt ? `Check for updates now — the Coordinator and connected runners (last checked ${fmtDate(updates.checkedAt)})` : 'Check for updates now — the Coordinator and connected runners'
                   )
                     i.bi.bi-arrow-repeat
             if user && can.admin && updates.coordinatorUpdate

package/views/mixins/client-config.pug

@@ -129,7 +129,7 @@ mixin groupsPane(r, returnTo, groupsById)
     else
       form(
         method="post"
-        action=`/resources/${r.id}/groups`
+        action=`/runners/${r.id}/groups`
         data-confirm=`Save the groups of ${r.name}? They apply at once; the Client also writes them to its config file and restarts once it has no job running.`
         data-confirm-title="Save Client groups?"
         data-confirm-ok="Save"
@@ -173,7 +173,7 @@ mixin configPanes(r, returnTo, groupsById)
   else
     form(
       method="post"
-      action=`/resources/${r.id}/config`
+      action=`/runners/${r.id}/config`
       data-client-config="hw"
       data-confirm=`Apply these devices to ${r.name}? The Client writes them to its config file on its next heartbeat and restarts once it has no job running.`
       data-confirm-title="Save Client devices?"

package/views/mixins/group-select.pug

@@ -3,7 +3,7 @@
 //- --group. Groups by name; none = any resource.
 mixin groupSelect(id, selected, groups)
   select.form-select(id=id name="groupId")
-    option(value="" selected=!selected) Any resource (no group)
+    option(value="" selected=!selected) Any runner (no group)
     each g in groups
       option(value=g.id selected=g.id === selected)= g.name
-  .form-text Its jobs run only on resources in this group. Manage groups on #[a(href="/groups") Groups].
+  .form-text Its jobs run only on runners in this group. Manage groups on #[a(href="/groups") Groups].

package/views/mixins/resource.pug

@@ -6,7 +6,7 @@ include client-config
 
 //- Update isn't here: it sits next to the version (+versionWithUpdate).
 mixin resourceActions(r, returnTo)
-  form.d-inline(method="post" action=`/resources/${r.id}/maintenance`)
+  form.d-inline(method="post" action=`/runners/${r.id}/maintenance`)
     input(type="hidden" name="enabled" value=r.status === 'MAINTENANCE' ? '0' : '1')
     input(type="hidden" name="returnTo" value=returnTo)
     if r.status === 'MAINTENANCE'
@@ -14,7 +14,7 @@ mixin resourceActions(r, returnTo)
         type="submit"
         aria-label="Enable"
         data-bs-toggle="tooltip"
-        data-bs-title="Bring this resource back into rotation so the scheduler can assign it jobs again"
+        data-bs-title="Bring this runner back into rotation so the scheduler can assign it jobs again"
       )
         i.bi.bi-play-circle
     else
@@ -22,14 +22,14 @@ mixin resourceActions(r, returnTo)
         type="submit"
         aria-label="Disable"
         data-bs-toggle="tooltip"
-        data-bs-title="Take this resource out of rotation for maintenance — the scheduler will skip it"
+        data-bs-title="Take this runner out of rotation for maintenance — the scheduler will skip it"
       )
         i.bi.bi-tools
   //- Credentials: admins only (§10.3).
   if can.admin
     form.d-inline.ms-1(
       method="post"
-      action=`/resources/${r.id}/rotate-token`
+      action=`/runners/${r.id}/rotate-token`
       data-confirm=`Issue a new token for ${r.name}? Its current token stops working at once, and the Client won't reconnect until it has the new one.`
       data-confirm-title="Rotate resource token?"
       data-confirm-ok="Rotate token"
@@ -58,7 +58,7 @@ mixin removeResourceButton(r, returnTo)
       type="button"
       aria-label="Remove"
       data-bs-toggle="tooltip"
-      data-bs-title="Remove this resource from the list — it's running a job"
+      data-bs-title="Remove this runner from the list — it's running a job"
       data-remove-resource=r.id
       data-remove-name=r.name
       data-remove-job=r.activeJob.id
@@ -68,7 +68,7 @@ mixin removeResourceButton(r, returnTo)
   else
     form.d-inline.ms-1(
       method="post"
-      action=`/resources/${r.id}/remove`
+      action=`/runners/${r.id}/remove`
       data-confirm=`Remove ${r.name} from the list? Its job history is kept. A Client that's still running shows up again when it restarts and re-registers.`
       data-confirm-title=`Remove ${r.name}?`
       data-confirm-ok="Remove"
@@ -78,7 +78,7 @@ mixin removeResourceButton(r, returnTo)
         type="submit"
         aria-label="Remove"
         data-bs-toggle="tooltip"
-        data-bs-title="Remove this resource from the list"
+        data-bs-title="Remove this runner from the list"
       )
         i.bi.bi-trash
 
@@ -110,7 +110,7 @@ mixin removeResourceModal()
               |
               code CANCELED
               | ), then
-            li remove the resource as soon as its Client confirms the job stopped (at most about a minute if the Client doesn't answer).
+            li remove the runner as soon as its Client confirms the job stopped (at most about a minute if the Client doesn't answer).
           p.small.text-body-secondary.mb-0 Its job history is kept. A Client that's still running shows up again when it restarts and re-registers.
         .modal-footer
           button.btn.btn-secondary(type="button" data-bs-dismiss="modal") Keep it
@@ -231,7 +231,7 @@ mixin rebootScheduleRow(r, returnTo)
     if can.operate
       form.d-flex.gap-1.mt-1(
         method="post"
-        action=`/resources/${r.id}/reboot-schedule`
+        action=`/runners/${r.id}/reboot-schedule`
         data-confirm=`Reboot the host of ${r.name} on this schedule? It reboots the whole host — every Client instance on it. Running jobs finish first: new ones wait, for up to 2 h, and otherwise that time is skipped.`
         data-confirm-title="Schedule host reboots?"
         data-confirm-ok="Save schedule"
@@ -248,7 +248,7 @@ mixin rebootScheduleRow(r, returnTo)
         )
         button.btn.btn-sm.btn-outline-primary(type="submit" data-bs-toggle="tooltip" data-bs-title="Save this schedule — the Client applies it on its next heartbeat") Save
       if r.reboot_schedule
-        form.d-inline(method="post" action=`/resources/${r.id}/reboot-schedule`)
+        form.d-inline(method="post" action=`/runners/${r.id}/reboot-schedule`)
           input(type="hidden" name="returnTo" value=returnTo)
           input(type="hidden" name="clear" value="1")
           button.btn.btn-sm.btn-link.p-0.small(type="submit" data-bs-toggle="tooltip" data-bs-title="Remove the schedule — the host isn't rebooted on a schedule any more") Clear schedule
@@ -270,7 +270,7 @@ mixin cancelActivityButton(r, returnTo)
   if what
     form.d-inline.ms-2(
       method="post"
-      action=`/resources/${r.id}/cancel-activity`
+      action=`/runners/${r.id}/cancel-activity`
       data-confirm=`Cancel ${what} on ${r.name}?`
       data-confirm-title=`Cancel ${what}?`
       data-confirm-ok=`Cancel ${what}`
@@ -338,7 +338,7 @@ mixin usbScanPane(r)
   //- Import to config (public/js/usb-import.js): HW Clients that report
   //- their config only; enabled once there's a scan to import from.
   - const importWhy = r.type !== 'hw' ? 'Only HW Clients have USB device lists to import into' : !(r.config_desired || r.client_config) ? noConfigReport[0].toUpperCase() + noConfigReport.slice(1) : null
-  div(data-usb-scan=`/resources/${r.id}/usb-scan` data-pending=r.usb_scan_request_id ? '1' : null data-requested-at=r.usb_scan_requested_at)
+  div(data-usb-scan=`/runners/${r.id}/usb-scan` data-pending=r.usb_scan_request_id ? '1' : null data-requested-at=r.usb_scan_requested_at)
     .d-flex.align-items-center.gap-2.mb-2
       if can.operate
         //- Live (public/js/live.js): a Client that comes back online gets its
@@ -381,7 +381,7 @@ mixin rebootButton(r, returnTo)
   else
     form.d-inline.ms-1(
       method="post"
-      action=`/resources/${r.id}/reboot`
+      action=`/runners/${r.id}/reboot`
       data-confirm=r.activeJob
         ? `${r.name} is running job ${r.activeJob.id}. Rebooting cancels that job (reason: user reboot request), then reboots the host on the Client's next heartbeat. Every Client instance on that host goes down with it.`
         : `Reboot the host of ${r.name}? It reboots on the Client's next heartbeat, once nothing on the host is busy. Every Client instance on that host goes down with it.`
@@ -405,7 +405,7 @@ mixin rebootButton(r, returnTo)
 //- a whole file, or an older HW Client's devices only.
 mixin configTransferButtons(r, returnTo)
   a.btn.btn-sm.btn-outline-secondary.ms-1(
-    href=`/resources/${r.id}/config/export`
+    href=`/runners/${r.id}/config/export`
     download
     aria-label=`Export ${r.name}'s config`
     data-bs-toggle="tooltip"
@@ -419,7 +419,7 @@ mixin configTransferButtons(r, returnTo)
   else
     form.d-inline.ms-1(
       method="post"
-      action=`/resources/${r.id}/config/import`
+      action=`/runners/${r.id}/config/import`
       data-config-import
       data-resource-name=r.name
       data-confirm-title=`Import config into ${r.name}?`
@@ -461,7 +461,7 @@ mixin resourceDetails(r, groupsById, returnTo, local, external)
         )
           i.bi.bi-pencil(data-bs-toggle="tooltip" data-bs-title="Rename")
         .collapse(id=`rename-${r.id}`)
-          form.d-flex.gap-1.mt-1(method="post" action=`/resources/${r.id}/rename`)
+          form.d-flex.gap-1.mt-1(method="post" action=`/runners/${r.id}/rename`)
             input(type="hidden" name="returnTo" value=returnTo)
             input.form-control.form-control-sm(
               name="name"
@@ -479,7 +479,7 @@ mixin resourceDetails(r, groupsById, returnTo, local, external)
     dd.col-sm-8: +resourceBadge(r.status, r.remove_requested_at)
     +uptimeRows(r, returnTo)
     dt.col-sm-4 Client version
-    dd.col-sm-8: +versionWithUpdate(r.client_version, updates.latest.client, r.update_to, `/resources/${r.id}/update`, returnTo, true, r.activity && r.activity.state === 'update-hold')
+    dd.col-sm-8: +versionWithUpdate(r.client_version, updates.latest.client, r.update_to, `/runners/${r.id}/update`, returnTo, true, r.activity && r.activity.state === 'update-hold')
     dt.col-sm-4 IP addresses
     dd.col-sm-8
       if !local.length && !external

package/views/mixins/updates.pug

@@ -48,7 +48,7 @@ mixin updatesToolbar(app, label, returnTo)
           | Check for updates
       form.d-inline(
         method="post"
-        action=app === 'agent' ? '/admin/agents/update-all' : '/resources/update-all'
+        action=app === 'agent' ? '/admin/agents/update-all' : '/runners/update-all'
         data-confirm=`Request a self-update of every ${label} to the latest version${updates.latest[app] ? ` (v${updates.latest[app]})` : ''}?`
         data-confirm-title=`Update all ${label}?`
         data-confirm-ok="Request update"

package/views/resources/list.pug

@@ -5,19 +5,19 @@ include ../mixins/updates
 include ../mixins/list-controls
 
 block content
-  h1.h4.mb-3 Resources
+  h1.h4.mb-3 Runners
   .d-flex.flex-wrap.align-items-center.gap-2.mb-3
-    +updatesToolbar('client', 'clients', '/resources')
+    +updatesToolbar('client', 'clients', '/runners')
   p.text-body-secondary.small: i.
-    Resources register themselves — start a Client with the shared join key and it appears here. Click a resource for its details, including IP addresses.
+    Runners register themselves — start a Client with the shared join key and it appears here. Click a runner for its details, including IP addresses.
 
   .d-flex.flex-wrap.align-items-center.gap-2.mb-3
-    +searchForm(list.q, 'Search resources: name, label, group, status, IP…', list.urlFor({ q: '' }))
+    +searchForm(list.q, 'Search runners: name, label, group, status, IP…', list.urlFor({ q: '' }))
     .ms-auto
       +pageSizePicker(list)
 
   div(data-live="list-toolbar")
-    +listToolbar(list, 'resources')
+    +listToolbar(list, 'runners')
 
   table.table.table-hover.align-middle
     thead
@@ -37,7 +37,7 @@ block content
         tr(role="button" tabindex="0" data-resource-card=`resource-card-${r.id}`)
           td= r.name
           td.text-uppercase= r.type
-          td: +versionWithUpdate(r.client_version, updates.latest.client, r.update_to, `/resources/${r.id}/update`, list.pageUrl(), true, r.activity && r.activity.state === 'update-hold')
+          td: +versionWithUpdate(r.client_version, updates.latest.client, r.update_to, `/runners/${r.id}/update`, list.pageUrl(), true, r.activity && r.activity.state === 'update-hold')
           td: +resourceBadge(r.status, r.remove_requested_at)
           td
             each l in r.labels