@waron97/prbot 3.3.0 → 3.5.0

package/src/agrippa/commands/initPhase.js

@@ -2,6 +2,7 @@ import search from '@inquirer/search';
 import inquirer from 'inquirer';
 import { getToken } from '../../lib/auth.js';
 import { fuzzyMatch } from '../../lib/fuzzy.js';
+import { log } from '../../lib/logger.js';
 import {
     createConfigurator,
     deleteConfigurator,
@@ -75,12 +76,12 @@ async function initPhase() {
     if (!ripUrl)
         throw new Error('RIP_URL is not configured. Run `prbot init` or set it in agrippa.yaml.');
 
-    console.log('Fetching workflows...');
+    log('Fetching workflows...');
     const token = await getToken();
     const workflows = await listWorkflows(token, ripUrl);
 
     if (!workflows.length) {
-        console.log('No workflows found.');
+        log('No workflows found.');
         return;
     }
 
@@ -92,11 +93,11 @@ async function initPhase() {
         },
     });
 
-    console.log(`Fetching phases for "${workflow.name}"...`);
+    log(`Fetching phases for "${workflow.name}"...`);
     const phases = await getPhasesByWorkflow(token, ripUrl, workflow.id);
 
     if (!phases.length) {
-        console.log('No phases found for this workflow.');
+        log('No phases found for this workflow.');
         return;
     }
 
@@ -111,7 +112,7 @@ async function initPhase() {
     ]);
 
     if (!selectedPhases.length) {
-        console.log('No phases selected. Aborted.');
+        log('No phases selected. Aborted.');
         return;
     }
 
@@ -125,7 +126,7 @@ async function initPhase() {
     ]);
 
     if (!confirm) {
-        console.log('Aborted.');
+        log('Aborted.');
         return;
     }
 
@@ -157,15 +158,13 @@ async function initPhase() {
             });
         }
 
-        console.log(`Initialized phase "${phase.name}".`);
+        log(`Initialized phase "${phase.name}".`);
         if (results.length > 0) {
-            console.log(`  ${results.length} configurator(s) created: ${vars.join(', ')}`);
+            log(`  ${results.length} configurator(s) created: ${vars.join(', ')}`);
         }
     }
 
-    console.log(
-        `Run 'agrippa pull' in workspaces that track this workflow to fetch the updated code.`
-    );
+    log(`Run 'agrippa pull' in workspaces that track this workflow to fetch the updated code.`);
 }
 
 export { initPhase };

package/src/agrippa/commands/pb.js

@@ -18,6 +18,7 @@ import { dirname, join } from 'path';
 import search from '@inquirer/search';
 import { parse as yamlParse } from 'yaml';
 import { fuzzyMatch } from '../../lib/fuzzy.js';
+import { log, warn } from '../../lib/logger.js';
 import { readConfig } from '../lib/config.js';
 import {
     addNode,
@@ -120,7 +121,7 @@ function validate(dir) {
     try {
         recompose(projectReader(dir));
     } catch (e) {
-        console.warn(`WARNING: project no longer recomposes cleanly: ${e.message}`);
+        warn(`WARNING: project no longer recomposes cleanly: ${e.message}`);
     }
 }
 
@@ -139,13 +140,13 @@ async function pbFormat(opts) {
         if (!n.layout) missing++;
     });
     validate(dir);
-    console.log(
+    log(
         `Formatted ${dir} (${nodes} node(s) laid out${missing ? `, ${missing} without layout` : ''}).`
     );
     const issues = lintAll(structure);
     if (issues.length) {
-        console.warn('Diagram issues:');
-        for (const w of issues) console.warn(`  ! ${w}`);
+        warn('Diagram issues:');
+        for (const w of issues) warn(`  ! ${w}`);
     }
 }
 
@@ -180,13 +181,13 @@ async function pbAdd(opts) {
         saveStructure(dir, structure);
         saveManifest(dir, manifest);
         validate(dir);
-        console.log(
+        log(
             `Added ${result.type} ${result.id}${result.file ? ` (${result.file})` : ''} between ${opts.from} → ${opts.to}.`
         );
-        console.log(`  ${opts.from} → ${result.id}  (${result.edgeId}, retargeted)`);
-        console.log(`  ${result.id} → ${opts.to}  (${result.newEdgeId})`);
-        for (const w of result.warnings || []) console.warn(`  ! ${w}`);
-        console.log('Run `agrippa pb format` to lay it out.');
+        log(`  ${opts.from} → ${result.id}  (${result.edgeId}, retargeted)`);
+        log(`  ${result.id} → ${opts.to}  (${result.newEdgeId})`);
+        for (const w of result.warnings || []) warn(`  ! ${w}`);
+        log('Run `agrippa pb format` to lay it out.');
         return;
     }
 
@@ -200,10 +201,8 @@ async function pbAdd(opts) {
     saveStructure(dir, structure);
     saveManifest(dir, manifest);
     validate(dir);
-    console.log(`Added ${result.type} ${result.id}${result.file ? ` (${result.file})` : ''}.`);
-    console.log(
-        'Connect it with `agrippa pb connect`, then run `agrippa pb format` to lay it out.'
-    );
+    log(`Added ${result.type} ${result.id}${result.file ? ` (${result.file})` : ''}.`);
+    log('Connect it with `agrippa pb connect`, then run `agrippa pb format` to lay it out.');
 }
 
 async function pbRemove(opts) {
@@ -215,10 +214,12 @@ async function pbRemove(opts) {
     saveStructure(dir, structure);
     saveManifest(dir, manifest);
     validate(dir);
-    console.log(
+    log(
         `Removed ${result.removed.length} node(s) [${result.removed.join(', ')}], ` +
             `${result.removedEdges} dangling edge(s), ${deletes.length} file(s).`
     );
+    for (const c of result.clearedDefaults || [])
+        log(`  cleared dangling default ${c.edge} on ${c.node}.`);
 }
 
 async function pbConnect(opts) {
@@ -235,11 +236,11 @@ async function pbConnect(opts) {
     });
     saveStructure(dir, structure);
     validate(dir);
-    console.log(
+    log(
         `Connected ${result.from} → ${result.to} (${result.id})${opts.default ? ' [default]' : ''}.`
     );
-    for (const w of result.warnings || []) console.warn(`  ! ${w}`);
-    console.log('Run `agrippa pb format` to route it.');
+    for (const w of result.warnings || []) warn(`  ! ${w}`);
+    log('Run `agrippa pb format` to route it.');
 }
 
 async function pbDisconnect(opts) {
@@ -250,7 +251,9 @@ async function pbDisconnect(opts) {
     const { result } = disconnect(structure, { id: opts.id, from: opts.from, to: opts.to });
     saveStructure(dir, structure);
     validate(dir);
-    console.log(`Removed ${result.removed} edge(s)${result.id ? ` (${result.id})` : ''}.`);
+    log(`Removed ${result.removed} edge(s)${result.id ? ` (${result.id})` : ''}.`);
+    for (const c of result.clearedDefaults || [])
+        log(`  cleared dangling default ${c.edge} on ${c.node}.`);
 }
 
 async function pbSetDefault(opts) {
@@ -261,11 +264,11 @@ async function pbSetDefault(opts) {
     const { result } = setDefault(structure, { id: opts.id, from: opts.from, to: opts.to });
     saveStructure(dir, structure);
     validate(dir);
-    console.log(
+    log(
         `Default flow on ${result.from} is now ${result.id} (→ ${result.to})` +
             `${result.prev && result.prev !== result.id ? `, was ${result.prev}` : ''}.`
     );
-    for (const w of result.warnings || []) console.warn(`  ! ${w}`);
+    for (const w of result.warnings || []) warn(`  ! ${w}`);
 }
 
 async function pbList(opts) {
@@ -275,7 +278,7 @@ async function pbList(opts) {
     for (const r of rows) {
         const where = r.parent ? `  [in ${r.parent}]` : '';
         const label = r.name ? `  "${r.name}"` : '';
-        console.log(`${r.id}  (${r.type})${label}${where}`);
+        log(`${r.id}  (${r.type})${label}${where}`);
         for (const e of r.edges) {
             const tag = [
                 e.isDefault && '[default]',
@@ -284,10 +287,10 @@ async function pbList(opts) {
             ]
                 .filter(Boolean)
                 .join(' ');
-            console.log(`    → ${e.target}  (${e.id})${tag ? `  ${tag}` : ''}`);
+            log(`    → ${e.target}  (${e.id})${tag ? `  ${tag}` : ''}`);
         }
     }
-    console.log(`\n${rows.length} node(s).`);
+    log(`\n${rows.length} node(s).`);
 }
 
 async function pbPreview(opts) {
@@ -296,7 +299,7 @@ async function pbPreview(opts) {
     const svg = toSvg(structure);
     const out = opts.out || join(dir, 'preview.svg');
     writeFileSync(out, svg, 'utf-8');
-    console.log(`Wrote ${out} (${svg.length} bytes).`);
+    log(`Wrote ${out} (${svg.length} bytes).`);
 }
 
 async function pbLint(opts) {
@@ -304,9 +307,9 @@ async function pbLint(opts) {
     const { structure } = loadProject(dir);
     const issues = lintAll(structure);
     if (!issues.length) {
-        console.log('No issues.');
+        log('No issues.');
     } else {
-        for (const w of issues) console.warn(`  ! ${w}`);
+        for (const w of issues) warn(`  ! ${w}`);
         process.exitCode = 1;
     }
 }

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,