@waron97/prbot 3.3.0 → 3.4.0

package/src/agrippa/commands/pull.js

@@ -1,6 +1,7 @@
 import { dirname } from 'path';
 import inquirer from 'inquirer';
 import { getToken } from '../../lib/auth.js';
+import { log, warn } from '../../lib/logger.js';
 import { describeWorkflow, getPhasesByIds, getPhasesByWorkflow, listMfas } from '../lib/api.js';
 import { computeChecksum } from '../lib/checksum.js';
 import { loadEffectiveEnv, readConfig, writeConfig } from '../lib/config.js';
@@ -18,7 +19,7 @@ import {
 import { pullLrpEntry } from './pullLrp.js';
 import { pullPbEntry } from './pullPb.js';
 
-async function pull() {
+async function pull(opts = {}) {
     const config = readConfig();
     loadEffectiveEnv(config);
 
@@ -29,19 +30,23 @@ async function pull() {
     // Stale-file check
     const stale = config.workspace.filter((e) => !fileExists(e.path));
     if (stale.length) {
-        console.log('\nThe following tracked files no longer exist on disk:');
-        stale.forEach((e) => console.log(`  - ${e.path}  (${e.name})`));
-        const { cleanup } = await inquirer.prompt([
-            {
-                type: 'confirm',
-                name: 'cleanup',
-                message: 'Remove these entries from the workspace config?',
-                default: true,
-            },
-        ]);
-        if (cleanup) {
-            config.workspace = config.workspace.filter((e) => fileExists(e.path));
-            writeConfig(config);
+        log('\nThe following tracked files no longer exist on disk:');
+        stale.forEach((e) => log(`  - ${e.path}  (${e.name})`));
+        if (opts.nonInteractive) {
+            log('  (non-interactive: leaving them tracked; run interactively to clean up)');
+        } else {
+            const { cleanup } = await inquirer.prompt([
+                {
+                    type: 'confirm',
+                    name: 'cleanup',
+                    message: 'Remove these entries from the workspace config?',
+                    default: true,
+                },
+            ]);
+            if (cleanup) {
+                config.workspace = config.workspace.filter((e) => fileExists(e.path));
+                writeConfig(config);
+            }
         }
     }
 
@@ -58,7 +63,7 @@ async function pull() {
         (e) => e.object_type !== 'process_builder' && e.object_type !== 'long_running_process'
     );
     if (pullable.length) {
-        console.log('Fetching remote code...');
+        log('Fetching remote code...');
         const remoteCodeMap = await fetchRemoteCode(token, ripUrl, pullable);
 
         const classified = pullable.map((entry) => {
@@ -85,12 +90,12 @@ async function pull() {
         const changed = classified.filter((e) => e.status !== 'unchanged');
 
         if (!changed.length) {
-            console.log('Everything is up to date.');
+            log('Everything is up to date.');
         } else {
-            const selected = await selectEntries(changed, 'pull (overwrites local files)');
+            const selected = await selectEntries(changed, 'pull (overwrites local files)', opts);
 
             if (!selected.length) {
-                console.log('Nothing selected. No changes made.');
+                log('Nothing selected. No changes made.');
             } else {
                 for (const entry of selected) {
                     writeCodeFile(entry.path, entry.remoteCode);
@@ -105,18 +110,18 @@ async function pull() {
                     }
                 }
                 writeConfig(config);
-                console.log(`\nPulled ${selected.length} record(s).`);
+                log(`\nPulled ${selected.length} record(s).`);
             }
         }
     } else {
-        console.log('No tracked resources. Run `agrippa clone` first.');
+        log('No tracked resources. Run `agrippa clone` first.');
     }
 
     // ── refresh tracked process-builder wizards ───────────────────────────────
-    await pullPbEntries(token, config);
+    await pullPbEntries(token, config, opts);
 
     // ── refresh tracked long-running processes ────────────────────────────────
-    await pullLrpEntries(token, config);
+    await pullLrpEntries(token, config, opts);
 
     // ── discover new phases on tracked workflows ──────────────────────────────
     await discoverNewPhases(token, ripUrl, config, changedWorkflowIds);
@@ -127,13 +132,13 @@ async function pull() {
 //   unchanged    local === remote semantically → nothing to do
 //   fast-forward remote changed, local untouched since pull → safe overwrite
 //   conflict     local diverged from checksum_at_pull → overwrite loses local work
-async function pullPbEntries(token, config) {
+async function pullPbEntries(token, config, opts = {}) {
     const entries = config.workspace.filter((e) => e.object_type === 'process_builder');
     if (!entries.length) return;
     if (!process.env.PB_URL)
         throw new Error('PB_URL is not configured. Run `prbot init` or set it in agrippa.yaml.');
 
-    console.log('Checking process-builder wizards...');
+    log('Checking process-builder wizards...');
     const classified = [];
     for (const entry of entries) {
         let upstream = null;
@@ -143,7 +148,7 @@ async function pullPbEntries(token, config) {
             upstream = null;
         }
         if (!upstream) {
-            console.warn(`  ${entry.name}: could not fetch upstream, skipping`);
+            warn(`  ${entry.name}: could not fetch upstream, skipping`);
             continue;
         }
         const localSemantic = localChecksum(projectReader(entry.path));
@@ -158,13 +163,13 @@ async function pullPbEntries(token, config) {
 
     const changed = classified.filter((e) => e.status !== 'unchanged');
     if (!changed.length) {
-        console.log('Wizards are up to date.');
+        log('Wizards are up to date.');
         return;
     }
 
-    const selected = await selectEntries(changed, 'pull (overwrites local wizard files)');
+    const selected = await selectEntries(changed, 'pull (overwrites local wizard files)', opts);
     if (!selected.length) {
-        console.log('No wizards selected.');
+        log('No wizards selected.');
         return;
     }
 
@@ -180,16 +185,16 @@ async function pullPbEntries(token, config) {
             if (res.newStatus) config.workspace[idx].status = res.newStatus;
         }
         const note = res.diffs.length ? ` (WARNING: ${res.diffs.length} round-trip diff(s))` : '';
-        console.log(`  ${entry.name} → refreshed${note}`);
+        log(`  ${entry.name} → refreshed${note}`);
     }
     writeConfig(config);
-    console.log(`\nPulled ${selected.length} wizard(s). Local backups in .backup/${backupTs}/`);
+    log(`\nPulled ${selected.length} wizard(s). Local backups in .backup/${backupTs}/`);
 }
 
 // Refresh tracked long-running processes from upstream. Same classification
 // concern as pullPbEntries, but entries are located by NAME (the tabulator id
 // changes on every save/version — never a stable key).
-async function pullLrpEntries(token, config) {
+async function pullLrpEntries(token, config, opts = {}) {
     const entries = config.workspace.filter((e) => e.object_type === 'long_running_process');
     if (!entries.length) return;
     if (!process.env.IMPORTEXPORT_URL)
@@ -197,7 +202,7 @@ async function pullLrpEntries(token, config) {
             'IMPORTEXPORT_URL is not configured. Run `prbot init` or set it in agrippa.yaml.'
         );
 
-    console.log('Checking long-running processes...');
+    log('Checking long-running processes...');
     const classified = [];
     for (const entry of entries) {
         let upstream = null;
@@ -207,7 +212,7 @@ async function pullLrpEntries(token, config) {
             upstream = null;
         }
         if (!upstream) {
-            console.warn(`  ${entry.name}: could not fetch upstream, skipping`);
+            warn(`  ${entry.name}: could not fetch upstream, skipping`);
             continue;
         }
         const localSemantic = localChecksum(projectReader(entry.path));
@@ -222,13 +227,13 @@ async function pullLrpEntries(token, config) {
 
     const changed = classified.filter((e) => e.status !== 'unchanged');
     if (!changed.length) {
-        console.log('Long-running processes are up to date.');
+        log('Long-running processes are up to date.');
         return;
     }
 
-    const selected = await selectEntries(changed, 'pull (overwrites local LRP files)');
+    const selected = await selectEntries(changed, 'pull (overwrites local LRP files)', opts);
     if (!selected.length) {
-        console.log('No long-running processes selected.');
+        log('No long-running processes selected.');
         return;
     }
 
@@ -247,10 +252,10 @@ async function pullLrpEntries(token, config) {
             config.workspace[idx].status = res.newRow.status;
         }
         const note = res.diffs.length ? ` (WARNING: ${res.diffs.length} round-trip diff(s))` : '';
-        console.log(`  ${entry.name} → refreshed${note}`);
+        log(`  ${entry.name} → refreshed${note}`);
     }
     writeConfig(config);
-    console.log(
+    log(
         `\nPulled ${selected.length} long-running process(es). Local backups in .backup/${backupTs}/`
     );
 }
@@ -294,7 +299,7 @@ async function discoverNewPhases(token, ripUrl, config, changedWorkflowIds = new
                 checksum_at_pull: computeChecksum(phase.code),
                 name: `${wfName} / ${phase.name}`,
             });
-            console.log(`  new phase: ${filePath}`);
+            log(`  new phase: ${filePath}`);
             newCount++;
             wfChanged = true;
         }
@@ -307,14 +312,14 @@ async function discoverNewPhases(token, ripUrl, config, changedWorkflowIds = new
                 const structure = await describeWorkflow(token, ripUrl, wfId);
                 writeWorkflowDoc(basePath, structure);
             } catch (err) {
-                console.warn(`  could not refresh workflow.yml for ${wfName}: ${err.message}`);
+                warn(`  could not refresh workflow.yml for ${wfName}: ${err.message}`);
             }
         }
     }
 
     if (newCount) {
         writeConfig(config);
-        console.log(`Added ${newCount} new phase(s) from tracked workflows.`);
+        log(`Added ${newCount} new phase(s) from tracked workflows.`);
     }
 }
 
@@ -343,18 +348,32 @@ async function fetchRemoteCode(token, ripUrl, workspace) {
     return map;
 }
 
-async function selectEntries(changed, verb, mode = 'pull') {
-    const badgeFor = (status) => {
-        if (mode === 'push') {
-            return status === 'fast-forward' ? '↑ safe' : '⚠ conflict';
+// `changed` only ever contains `fast-forward` and `conflict` entries (the
+// caller already filtered out `unchanged`). `conflict` means local and remote
+// have both diverged from the last-known-good baseline — applying it blindly
+// can silently lose either side's work, so it is never preselected and is
+// refused outright in `--non-interactive` mode instead of being silently
+// skipped or applied.
+async function selectEntries(changed, verb, opts = {}) {
+    const conflicts = changed.filter((e) => e.status === 'conflict');
+
+    if (opts.nonInteractive) {
+        if (conflicts.length) {
+            throw new Error(
+                `CONFLICT: refusing to ${verb} non-interactively — ${conflicts.length} resource(s) ` +
+                    `in conflict: ${conflicts.map((e) => e.name).join(', ')}. Resolve interactively ` +
+                    `or re-run once the conflicting side is reconciled.`
+            );
         }
-        return status === 'fast-forward' ? '↑ safe' : '⚠ conflict';
-    };
+        return changed;
+    }
+
+    const badgeFor = (status) => (status === 'fast-forward' ? '↑ safe' : '⚠ conflict');
 
     const choices = changed.map((e) => ({
         name: `${e.name}  [${badgeFor(e.status)}]`,
         value: e,
-        checked: true,
+        checked: e.status !== 'conflict',
     }));
 
     const { selected } = await inquirer.prompt([

package/src/agrippa/commands/pullLrp.js

@@ -1,8 +1,7 @@
 import { existsSync, mkdirSync, readdirSync, rmSync, writeFileSync } from 'fs';
 import { dirname, join } from 'path';
-import { computeChecksum } from '../lib/checksum.js';
 import { fetchUpstream } from '../lib/lrpApi.js';
-import { comparePayload, decompose, recompose, stableStringify } from '../lib/pbProject.js';
+import { checksumOfPayload, comparePayload, decompose, recompose } from '../lib/pbProject.js';
 import { projectReader, writeProject } from '../lib/pbWorkspace.js';
 
 // Delete files under <baseDir>/scripts that are not in the fresh decompose
@@ -46,7 +45,7 @@ async function pullLrpEntry(token, entry, backupDir, backupTs) {
     const diffs = comparePayload(upstream.payload, rebuilt).filter((d) => !d.startsWith('pages:'));
 
     return {
-        newChecksum: computeChecksum(stableStringify(rebuilt)),
+        newChecksum: checksumOfPayload(rebuilt),
         newRow: upstream.row,
         diffs,
     };

package/src/agrippa/commands/pullPb.js

@@ -1,8 +1,7 @@
 import { existsSync, mkdirSync, readdirSync, rmSync, writeFileSync } from 'fs';
 import { dirname, join } from 'path';
-import { computeChecksum } from '../lib/checksum.js';
 import { getProcess } from '../lib/pbApi.js';
-import { comparePayload, decompose, recompose, stableStringify } from '../lib/pbProject.js';
+import { checksumOfPayload, comparePayload, decompose, recompose } from '../lib/pbProject.js';
 import { projectReader, writeProject } from '../lib/pbWorkspace.js';
 
 // Delete files under <baseDir>/<sub> that are not in the fresh decompose map, so
@@ -44,7 +43,7 @@ async function pullPbEntry(token, entry, backupDir, backupTs) {
     const diffs = comparePayload(upstream, rebuilt);
 
     return {
-        newChecksum: computeChecksum(stableStringify(rebuilt)),
+        newChecksum: checksumOfPayload(rebuilt),
         newUpdatedDate: upstream.updated_date,
         newStatus: upstream.status,
         diffs,

package/src/agrippa/commands/push.js

@@ -2,6 +2,7 @@ import { mkdirSync, writeFileSync } from 'fs';
 import { dirname, join } from 'path';
 import inquirer from 'inquirer';
 import { getToken } from '../../lib/auth.js';
+import { log } from '../../lib/logger.js';
 import { updateMfa, updatePhase } from '../lib/api.js';
 import { computeChecksum } from '../lib/checksum.js';
 import { loadEffectiveEnv, readConfig, writeConfig } from '../lib/config.js';
@@ -23,24 +24,28 @@ async function push(opts = {}) {
     // Stale-entry check (a path may be a file for phase/mfa or a dir for pb).
     const stale = config.workspace.filter((e) => !fileExists(e.path));
     if (stale.length) {
-        console.log('\nThe following tracked resources no longer exist on disk:');
-        stale.forEach((e) => console.log(`  - ${e.path}  (${e.name})`));
-        const { cleanup } = await inquirer.prompt([
-            {
-                type: 'confirm',
-                name: 'cleanup',
-                message: 'Remove these entries from the workspace config?',
-                default: true,
-            },
-        ]);
-        if (cleanup) {
-            config.workspace = config.workspace.filter((e) => fileExists(e.path));
-            writeConfig(config);
+        log('\nThe following tracked resources no longer exist on disk:');
+        stale.forEach((e) => log(`  - ${e.path}  (${e.name})`));
+        if (opts.nonInteractive) {
+            log('  (non-interactive: leaving them tracked; run interactively to clean up)');
+        } else {
+            const { cleanup } = await inquirer.prompt([
+                {
+                    type: 'confirm',
+                    name: 'cleanup',
+                    message: 'Remove these entries from the workspace config?',
+                    default: true,
+                },
+            ]);
+            if (cleanup) {
+                config.workspace = config.workspace.filter((e) => fileExists(e.path));
+                writeConfig(config);
+            }
         }
     }
 
     if (!config.workspace.length) {
-        console.log('No tracked resources. Run `agrippa clone` first.');
+        log('No tracked resources. Run `agrippa clone` first.');
         return;
     }
 
@@ -59,7 +64,7 @@ async function push(opts = {}) {
             'IMPORTEXPORT_URL is not configured. Run `prbot init` or set it in agrippa.yaml.'
         );
 
-    console.log('Fetching remote state...');
+    log('Fetching remote state...');
     const token = await getToken();
 
     const remoteCodeMap = hasCode
@@ -123,13 +128,13 @@ async function push(opts = {}) {
 
     const changed = classified.filter((e) => e.status !== 'unchanged');
     if (!changed.length) {
-        console.log('Nothing to push — everything matches the last-pulled state.');
+        log('Nothing to push — everything matches the last-pulled state.');
         return;
     }
 
-    const selected = await selectEntries(changed, 'push (overwrites remote)', 'push');
+    const selected = await selectEntries(changed, 'push (overwrites remote)', opts);
     if (!selected.length) {
-        console.log('Nothing selected. No changes made.');
+        log('Nothing selected. No changes made.');
         return;
     }
 
@@ -168,7 +173,7 @@ async function push(opts = {}) {
             ]
                 .filter(Boolean)
                 .join(', ');
-            console.log(`  ${entry.name} → saved (draft)${note ? ` [${note}]` : ''}`);
+            log(`  ${entry.name} → saved (draft)${note ? ` [${note}]` : ''}`);
             if (idx !== -1) {
                 config.workspace[idx].checksum_at_pull = res.newChecksum;
                 if (res.newUpdatedDate) config.workspace[idx].updated_date = res.newUpdatedDate;
@@ -177,7 +182,7 @@ async function push(opts = {}) {
             pushedPb.push({ entry, idx });
         } else if (entry.object_type === 'long_running_process') {
             const res = await pushLrpEntry(token, entry, BACKUP_DIR, backupTs);
-            console.log(`  ${entry.name} → saved`);
+            log(`  ${entry.name} → saved`);
             if (idx !== -1) {
                 config.workspace[idx].checksum_at_pull = res.newChecksum;
                 config.workspace[idx].tenant_id = res.newRow.tenantId;
@@ -197,7 +202,7 @@ async function push(opts = {}) {
         pushed++;
     }
 
-    console.log(`\nRemote backups written to ${BACKUP_DIR}/${backupTs}/`);
+    log(`\nRemote backups written to ${BACKUP_DIR}/${backupTs}/`);
 
     // Publish/deploy step for pushed wizards and LRPs.
     if (pushedPb.length) {
@@ -208,7 +213,7 @@ async function push(opts = {}) {
     }
 
     writeConfig(config);
-    console.log(`\nPushed ${pushed} record(s).`);
+    log(`\nPushed ${pushed} record(s).`);
 }
 
 async function handlePublish(token, pushedPb, config, opts) {
@@ -216,6 +221,8 @@ async function handlePublish(token, pushedPb, config, opts) {
         let doPublish;
         if (opts.skipPublish) doPublish = false;
         else if (opts.publish) doPublish = true;
+        else if (opts.nonInteractive)
+            doPublish = false; // no stdin to prompt on; default to safe
         else {
             ({ doPublish } = await inquirer.prompt([
                 {
@@ -229,7 +236,7 @@ async function handlePublish(token, pushedPb, config, opts) {
         if (doPublish) {
             await publish(token, entry.guid);
             if (idx !== -1) config.workspace[idx].status = 'published';
-            console.log(`  published ${entry.name}`);
+            log(`  published ${entry.name}`);
         }
     }
 }
@@ -239,6 +246,8 @@ async function handleDeploy(token, pushedLrp, config, opts) {
         let doDeploy;
         if (opts.skipPublish) doDeploy = false;
         else if (opts.publish) doDeploy = true;
+        else if (opts.nonInteractive)
+            doDeploy = false; // no stdin to prompt on; default to safe
         else {
             ({ doDeploy } = await inquirer.prompt([
                 {
@@ -252,7 +261,7 @@ async function handleDeploy(token, pushedLrp, config, opts) {
         if (doDeploy) {
             await deploy(token, deployId);
             if (idx !== -1) config.workspace[idx].status = 'deployed';
-            console.log(`  deployed ${entry.name}`);
+            log(`  deployed ${entry.name}`);
         }
     }
 }

package/src/agrippa/commands/repair.js

@@ -1,3 +1,4 @@
+import { log } from '../../lib/logger.js';
 import { readConfig, writeConfig } from '../lib/config.js';
 import { fileExists } from '../lib/workspace.js';
 
@@ -9,16 +10,16 @@ async function repair() {
     config.workspace = config.workspace.filter((entry) => fileExists(entry.path));
 
     if (!stale.length) {
-        console.log('No stale entries found.');
+        log('No stale entries found.');
         return;
     }
 
     for (const entry of stale) {
-        console.log(`  removed: ${entry.path} (${entry.name})`);
+        log(`  removed: ${entry.path} (${entry.name})`);
     }
 
     writeConfig(config);
-    console.log(
+    log(
         `Removed ${stale.length} stale entr${stale.length === 1 ? 'y' : 'ies'} (${before} → ${config.workspace.length}).`
     );
 }

package/src/agrippa/index.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 import { createRequire } from 'module';
 import { program } from 'commander';
+import { error } from '../lib/logger.js';
 import { clone } from './commands/clone.js';
 import { diff } from './commands/diff.js';
 import { init } from './commands/init.js';
@@ -24,7 +25,7 @@ const require = createRequire(import.meta.url);
 const { version } = require('../../package.json');
 
 process.on('unhandledRejection', (err) => {
-    console.error(`Error: ${err.message}`);
+    error(`Error: ${err.message}`);
     process.exit(1);
 });
 
@@ -35,7 +36,7 @@ program
     .description('Create agrippa.yaml workspace config in the current directory')
     .action(() =>
         init().catch((err) => {
-            console.error(`Error: ${err.message}`);
+            error(`Error: ${err.message}`);
             process.exit(1);
         })
     );
@@ -54,7 +55,7 @@ program
     .option('--path <path>', 'Destination path (file for MFA, base dir for workflow/pb/lrp)')
     .action((opts) =>
         clone(opts).catch((err) => {
-            console.error(`Error: ${err.message}`);
+            error(`Error: ${err.message}`);
             process.exit(1);
         })
     );
@@ -62,9 +63,13 @@ program
 program
     .command('pull')
     .description('Pull remote changes into local files')
-    .action(() =>
-        pull().catch((err) => {
-            console.error(`Error: ${err.message}`);
+    .option(
+        '--non-interactive',
+        'No prompts; auto-select safe (fast-forward) entries and fail if any is in conflict'
+    )
+    .action((opts) =>
+        pull(opts).catch((err) => {
+            error(`Error: ${err.message}`);
             process.exit(1);
         })
     );
@@ -74,9 +79,13 @@ program
     .description('Push local changes to RIP / Process Builder / LRP (backs up remote first)')
     .option('--publish', 'Auto-publish pushed wizards and auto-deploy pushed LRPs')
     .option('--skip-publish', 'Skip publishing/deploying pushed wizards and LRPs (no prompt)')
+    .option(
+        '--non-interactive',
+        'No prompts; auto-select safe (fast-forward) entries and fail if any is in conflict'
+    )
     .action((opts) =>
         push(opts).catch((err) => {
-            console.error(`Error: ${err.message}`);
+            error(`Error: ${err.message}`);
             process.exit(1);
         })
     );
@@ -86,7 +95,7 @@ program
     .description('Show differences between local files and remote code')
     .action((path) =>
         diff(path).catch((err) => {
-            console.error(`Error: ${err.message}`);
+            error(`Error: ${err.message}`);
             process.exit(1);
         })
     );
@@ -96,7 +105,7 @@ program
     .description('Initialize a phase with default code template and result vars')
     .action(() =>
         initPhase().catch((err) => {
-            console.error(`Error: ${err.message}`);
+            error(`Error: ${err.message}`);
             process.exit(1);
         })
     );
@@ -106,14 +115,14 @@ program
     .description('Remove stale workspace entries where local file no longer exists')
     .action(() =>
         repair().catch((err) => {
-            console.error(`Error: ${err.message}`);
+            error(`Error: ${err.message}`);
             process.exit(1);
         })
     );
 
 // ---- pb: local editing helpers for a cloned process-builder wizard or LRP ----
 const die = (err) => {
-    console.error(`Error: ${err.message}`);
+    error(`Error: ${err.message}`);
     process.exit(1);
 };
 const pb = program

package/src/agrippa/lib/pbLayout.js

@@ -154,7 +154,14 @@ async function autoLayout(structure) {
                 targets: [e.target],
                 sourcePort,
                 labels: e.name
-                    ? [{ id: `${e.id}__lbl`, text: e.name, width: Math.min(e.name.length * 6, 140), height: 14 }]
+                    ? [
+                          {
+                              id: `${e.id}__lbl`,
+                              text: e.name,
+                              width: Math.min(e.name.length * 6, 140),
+                              height: 14,
+                          },
+                      ]
                     : [],
                 layoutOptions: {
                     'elk.layered.priority.straightness': isHappy ? '10' : 1,

package/src/agrippa/lib/pbModel.js

@@ -926,6 +926,7 @@ export {
     buildProcess,
     parseDiagram,
     normalizeProcessTree,
+    diagramGeometry,
     compareProcess,
     compareDiagram,
     diff,

package/src/agrippa/lib/pbPreview.js

@@ -92,8 +92,12 @@ function toSvg(structure) {
         );
         if (e.name) {
             const lp = e.labelPos;
-            const lx = lp ? lp.x + lp.width / 2 : e.waypoints[Math.floor(e.waypoints.length / 2)][0];
-            const ly = lp ? lp.y + lp.height / 2 : e.waypoints[Math.floor(e.waypoints.length / 2)][1] - 4;
+            const lx = lp
+                ? lp.x + lp.width / 2
+                : e.waypoints[Math.floor(e.waypoints.length / 2)][0];
+            const ly = lp
+                ? lp.y + lp.height / 2
+                : e.waypoints[Math.floor(e.waypoints.length / 2)][1] - 4;
             out.push(
                 `<text x="${lx + ox}" y="${ly + oy}" text-anchor="middle" fill="#666" font-size="9">${esc(e.name)}</text>`
             );