@waron97/prbot 3.3.0 → 3.5.0

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,19 +79,26 @@ 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);
         })
     );
 
 program
-    .command('diff [path]')
-    .description('Show differences between local files and remote code')
+    .command('diff [target]')
+    .description(
+        'Show differences between local files and remote code. [target] = file, folder, ' +
+            'project dir, document_id or name; omit for the whole workspace'
+    )
     .action((path) =>
         diff(path).catch((err) => {
-            console.error(`Error: ${err.message}`);
+            error(`Error: ${err.message}`);
             process.exit(1);
         })
     );
@@ -96,7 +108,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 +118,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/pbEdit.js

@@ -317,7 +317,13 @@ function removeNode(structure, manifest, { id }) {
         );
     }
 
-    return { writes: {}, deletes, result: { removed: [...victimIds], removedEdges } };
+    const clearedDefaults = clearDanglingDefaults(structure);
+
+    return {
+        writes: {},
+        deletes,
+        result: { removed: [...victimIds], removedEdges, clearedDefaults },
+    };
 }
 
 // ---------- connect / disconnect ----------
@@ -492,15 +498,55 @@ function lintIncomingEdges(structure) {
     return issues;
 }
 
+// Flag `attrs.default` values that don't name an outgoing edge of their own
+// node. lintGateways only covers the inverse (a gateway that needs a default
+// and hasn't got a valid one), so a node left with a single outgoing flow and a
+// default pointing at a deleted one used to pass clean — and then fail at
+// publish with Activiti's null-reference NPE. The edits that delete edges now
+// clear these themselves (clearDanglingDefaults); this rule is the net for
+// hand-edited structure.yaml and for projects predating that fix.
+function lintDanglingDefaults(structure) {
+    const issues = [];
+    eachNode(structure.nodes, null, (n) => {
+        const def = n.attrs?.default;
+        if (!def) return;
+        if ((n.edges || []).some((e) => e.id === def)) return;
+        issues.push(
+            `${n.id} (${n.name || n.type}): default flow ${def} does not exist on this node — ` +
+                `Activiti fails the deploy on the dangling reference.`
+        );
+    });
+    return issues;
+}
+
 // Run all lint rules and return combined issues.
 function lintAll(structure) {
     return [
         ...lintGateways(structure),
+        ...lintDanglingDefaults(structure),
         ...lintEdgeNames(structure),
         ...lintIncomingEdges(structure),
     ];
 }
 
+// Drop every `attrs.default` that no longer names an outgoing edge of its own
+// node. Must run after any edit that deletes edges: a default referencing a
+// removed flow recomposes fine and passes the other lint rules, but Activiti
+// resolves the reference at deploy time, gets null, and the publish fails with
+// an unattributed `Could not deploy the XML: null. Error: null`. Returns the
+// cleared [nodeId, edgeId] pairs so callers can report them.
+function clearDanglingDefaults(structure) {
+    const cleared = [];
+    eachNode(structure.nodes, null, (n) => {
+        const def = n.attrs?.default;
+        if (!def) return;
+        if ((n.edges || []).some((e) => e.id === def)) return;
+        delete n.attrs.default;
+        cleared.push({ node: n.id, edge: def });
+    });
+    return cleared;
+}
+
 // Remove an edge by id, or by --from/--to pair.
 function disconnect(structure, { id, from, to }) {
     let removed = 0;
@@ -516,7 +562,8 @@ function disconnect(structure, { id, from, to }) {
         removed += before - n.edges.length;
     });
     if (!removed) throw new Error(id ? `edge not found: ${id}` : `no edge from ${from} to ${to}`);
-    return { writes: {}, deletes: [], result: { removed, id: removedId } };
+    const clearedDefaults = clearDanglingDefaults(structure);
+    return { writes: {}, deletes: [], result: { removed, id: removedId, clearedDefaults } };
 }
 
 // ---------- list ----------

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>`
             );

package/src/agrippa/lib/pbProject.js

@@ -18,7 +18,15 @@
 import slugify from 'slugify';
 import { Document, visit, parse as yamlParse, stringify as yamlStringify } from 'yaml';
 import { computeChecksum } from './checksum.js';
-import { buildProcess, compareDiagram, compareProcess, diff, parseProcess } from './pbModel.js';
+import {
+    buildProcess,
+    compareDiagram,
+    compareProcess,
+    diagramGeometry,
+    diff,
+    normalizeProcessTree,
+    parseProcess,
+} from './pbModel.js';
 
 const MANIFEST_FILE = '.agrippa-pb.json';
 const STRUCTURE_FILE = 'structure.yaml';
@@ -355,10 +363,89 @@ function stableStringify(value) {
     return JSON.stringify(value ?? null);
 }
 
+// Canonical form of a recomposed payload used ONLY for change-detection
+// checksums — never for the actual push payload (recompose() itself, and
+// what gets sent on push, are untouched). Routes built_page through the same
+// formatting/order-insensitive canonicalization already used by
+// comparePayload()'s 0-loss round-trip verification:
+//   - normalizeProcessTree drops insignificant whitespace text nodes (incl.
+//     the extraDefs `#text` padding between <definitions>-root siblings) and
+//     sorts declarations by id, so cosmetic reformatting doesn't count;
+//   - diagramGeometry keeps only x/y/width/height/isExpanded/waypoints, so
+//     `format`-only artifacts like labelPos never enter the comparison.
+// Without this, a push followed by an unmodified re-fetch could classify as
+// a phantom `conflict` instead of `unchanged` — see
+// ai_tasks/2026-07-16-lrp-clone/deferred_work.md items 1, 3, 4.
+//
+// `updated_date`/`modified_by` are server-managed bookkeeping, not process
+// content — Odoo/Symple bump them on any touch of the record, including ones
+// with no semantic effect (observed live: an integration service account
+// re-saving the wizard moved `updated_date`/`modified_by` on both the
+// top-level payload and a page wrapper with zero content diff otherwise, via
+// comparePayload). They exist at two levels: the top-level payload scalars,
+// and per-entry inside `payload.pages` (each page's audit wrapper, distinct
+// from the page *content* under `.page`, which is left untouched). Left in,
+// they permanently pin the object to `conflict` the moment anything server-
+// side touches it, regardless of actual content — worse than the cosmetic
+// built_page diffs above, since nothing local or an agrippa push causes them
+// to resync.
+const VOLATILE_AUDIT_FIELDS = ['updated_date', 'modified_by'];
+
+// `status`/`version` are the server's publication lifecycle, not content —
+// excluded for the same reason as the audit fields above, but only at the top
+// level (page wrappers carry neither). They surface in process.yaml via
+// EDITABLE_SCALARS and are still sent on push; they just don't count as a
+// change. Every PATCH flips the wizard server-side to draft/modified while
+// process.yaml keeps whatever status was recorded at the last clone/pull, and
+// push stores the *local* checksum as the new baseline — so a push not
+// followed by a publish guaranteed a phantom `conflict` on the next push,
+// with zero content difference on either side (observed live 2026-07-21 on
+// ml_voltura_fibra_data_input: upstream came back `modified` against a
+// `published` process.yaml, shifting the remote checksum off the baseline on
+// its own). `version` is worse still: a publish that bumps it server-side
+// pins the object to `conflict` permanently, since nothing local resyncs it.
+const VOLATILE_LIFECYCLE_FIELDS = ['status', 'version'];
+
+function canonicalForChecksum(payload) {
+    const { process, decls } = normalizeProcessTree(payload.built_page);
+    const rest = omit(payload, [
+        'built_page',
+        'pages',
+        ...VOLATILE_AUDIT_FIELDS,
+        ...VOLATILE_LIFECYCLE_FIELDS,
+    ]);
+    // Page order is not a stable identity — locally it's whatever order the
+    // manifest happened to record at last decompose, while a live upstream
+    // fetch can return the same set of pages in a different order (observed
+    // live: a fresh fetch came back with pages 1-3 cyclically rotated versus
+    // the local manifest, same guids, zero content difference). Sort by the
+    // page's own guid — stable, unlike array position — before hashing, the
+    // same trick normalizeProcessTree already uses for extraDefs decls.
+    const pages = [...(payload.pages || [])]
+        .sort((a, b) => (a.guid ?? '').localeCompare(b.guid ?? ''))
+        .map((p) => omit(p, VOLATILE_AUDIT_FIELDS));
+    return {
+        ...rest,
+        pages,
+        built_page_process: process,
+        built_page_decls: decls,
+        built_page_diagram: diagramGeometry(payload.built_page),
+    };
+}
+
+// Checksum of a recomposed payload, canonicalized so cosmetic round-trip
+// differences don't register as a change. Used for checksum_at_pull baselines
+// (clone/pull) and for the push/pull classifier (localChecksum/
+// remoteChecksumPb below) — keep every PB/LRP checksum call site on this one
+// function so baselines and comparisons stay on the same normalization.
+function checksumOfPayload(payload) {
+    return computeChecksum(stableStringify(canonicalForChecksum(payload)));
+}
+
 // Checksum of the recomposed payload — stable across runs, changes only when the
 // local files change. clonePb stores this as checksum_at_pull; push recomputes it.
 function localChecksum(read) {
-    return computeChecksum(stableStringify(recompose(read)));
+    return checksumOfPayload(recompose(read));
 }
 
 // Semantic checksum of a remote payload. Decompose → recompose normalises field
@@ -367,7 +454,7 @@ function localChecksum(read) {
 function remoteChecksumPb(payload) {
     const { files } = decompose(payload);
     const read = (p) => files[p] ?? '';
-    return computeChecksum(stableStringify(recompose(read)));
+    return checksumOfPayload(recompose(read));
 }
 
 // Enumerate the wizard's pages from the pages/*.yml files (the authoritative
@@ -406,6 +493,7 @@ export {
     comparePayload,
     verifyRoundTrip,
     stableStringify,
+    checksumOfPayload,
     localChecksum,
     remoteChecksumPb,
     enumeratePages,

package/src/commands/autopr.js

@@ -6,6 +6,7 @@ import fetch from 'node-fetch';
 import { resolveAddonsPath } from '../lib/addons.js';
 import { fuzzyMatch } from '../lib/fuzzy.js';
 import { execGit } from '../lib/git.js';
+import { log } from '../lib/logger.js';
 import {
     appendPrToLine,
     appendRefsToLine,
@@ -120,7 +121,7 @@ async function createDevopsPR(branch, title, description) {
     return { id: data.pullRequestId, url: prUrl };
 }
 
-async function appendChecklistPrLink(taskId, currentChecklist, prUrl, prNumber) {
+async function appendChecklistPrLink(taskId, currentChecklist, prUrl) {
     const link = `<a href="${prUrl}">${prUrl}</a><br/>`;
     const updated = currentChecklist ? `${currentChecklist}\n${link}` : link;
     const url = `${process.env.TRIDENT_URL}/jsonrpc`;
@@ -191,8 +192,8 @@ async function selectSection(sections, candidates) {
     const scored = candidates.length > 0 ? scoreSections(sections, candidates) : [];
 
     if (candidates.length > 0) {
-        console.log(`\nTask fields: ${candidates.join(' | ')}`);
-        if (scored.length === 0) console.log('No matching sections found.');
+        log(`\nTask fields: ${candidates.join(' | ')}`);
+        if (scored.length === 0) log('No matching sections found.');
     }
 
     const scoredHeadings = new Set(scored.map((s) => s.heading));
@@ -224,13 +225,13 @@ async function autoprAmend(options) {
     const pr = await fetchActivePr(branch);
     const prNumber = pr.pullRequestId;
     const prUrl = `https://dev.azure.com/${DEVOPS_ORG}/${DEVOPS_PROJECT}/_git/${DEVOPS_REPO}/pullrequest/${prNumber}`;
-    console.log(`Found PR #${prNumber}: ${prUrl}`);
+    log(`Found PR #${prNumber}: ${prUrl}`);
 
     const ids = options.trident ?? [];
     const jiras = options.jira ?? [];
 
     const tasks = ids.length > 0 ? await Promise.all(ids.map(fetchTask)) : [];
-    tasks.forEach((t) => console.log(`Task: ${t.name}`));
+    tasks.forEach((t) => log(`Task: ${t.name}`));
 
     const newLinks = [
         ...ids.map((id) => `${process.env.TRIDENT_URL}/odoo/my-tasks/${id}`),
@@ -241,20 +242,18 @@ async function autoprAmend(options) {
             ? `${pr.description}\n${newLinks.join('\n')}`
             : newLinks.join('\n');
         await patchDevopsPrDescription(prNumber, updatedDescription);
-        console.log('PR description updated');
+        log('PR description updated');
     }
 
     for (let i = 0; i < ids.length; i++) {
-        await appendChecklistPrLink(ids[i], tasks[i].x_release_checklist, prUrl, prNumber);
+        await appendChecklistPrLink(ids[i], tasks[i].x_release_checklist, prUrl);
     }
-    if (ids.length > 0) console.log('Checklist updated');
+    if (ids.length > 0) log('Checklist updated');
 
     const content = readFileSync(changelogPath, 'utf-8');
     const existing = findLineByPrNumber(content, prNumber);
     if (!existing) {
-        console.log(
-            `Warning: no changelog line found for PR #${prNumber} — skipping changelog update`
-        );
+        log(`Warning: no changelog line found for PR #${prNumber} — skipping changelog update`);
         return;
     }
     const lines = content.split('\n');
@@ -264,8 +263,8 @@ async function autoprAmend(options) {
     await execGit(['add', 'CHANGELOG.md'], ADDONS_PATH);
     await execGit(['commit', '-m', '[DOC][CHANGELOG] Changelog'], ADDONS_PATH);
     await execGit(['push'], ADDONS_PATH);
-    console.log('Changelog updated and pushed');
-    console.log('\nReminder: squash the two changelog commits before merging the PR.');
+    log('Changelog updated and pushed');
+    log('\nReminder: squash the two changelog commits before merging the PR.');
 }
 
 async function autopr(options) {
@@ -278,7 +277,7 @@ async function autopr(options) {
     const hasTridents = ids.length > 0;
 
     const tasks = hasTridents ? await Promise.all(ids.map((id) => fetchTask(id))) : [];
-    tasks.forEach((t) => console.log(`Task: ${t.name}`));
+    tasks.forEach((t) => log(`Task: ${t.name}`));
 
     const content = readFileSync(changelogPath, 'utf-8');
 
@@ -286,7 +285,7 @@ async function autopr(options) {
 
     let appendMode = false;
     if (duplicate) {
-        console.log(`\nExisting entry (line ${duplicate.lineNumber + 1}):\n  ${duplicate.line}`);
+        log(`\nExisting entry (line ${duplicate.lineNumber + 1}):\n  ${duplicate.line}`);
         const { confirm } = await inquirer.prompt([
             {
                 type: 'confirm',
@@ -315,19 +314,19 @@ async function autopr(options) {
     }
 
     await execGit(['checkout', '-b', branch], ADDONS_PATH);
-    console.log(`Branch created: ${branch}`);
+    log(`Branch created: ${branch}`);
     await execGit(['push', '-u', 'origin', branch], ADDONS_PATH);
 
     const prTitle = options.name ?? tasks[0]?.name ?? branch;
     const prDescription = buildPrDescription(ids, options.jira ?? []);
     const { id: prNumber, url: prUrl } = await createDevopsPR(branch, prTitle, prDescription);
-    console.log(`PR opened: #${prNumber} — ${prUrl}`);
+    log(`PR opened: #${prNumber} — ${prUrl}`);
 
     if (hasTridents) {
         for (let i = 0; i < ids.length; i++) {
-            await appendChecklistPrLink(ids[i], tasks[i].x_release_checklist, prUrl, prNumber);
+            await appendChecklistPrLink(ids[i], tasks[i].x_release_checklist, prUrl);
         }
-        console.log('Checklist updated');
+        log('Checklist updated');
     }
 
     const lines = content.split('\n');
@@ -365,12 +364,12 @@ async function autopr(options) {
     }
 
     await fs.writeFile(changelogPath, lines.join('\n'));
-    console.log('Changelog entry written');
+    log('Changelog entry written');
 
     await execGit(['add', 'CHANGELOG.md'], ADDONS_PATH);
     await execGit(['commit', '-m', '[DOC][CHANGELOG] Changelog'], ADDONS_PATH);
     await execGit(['push'], ADDONS_PATH);
-    console.log('Changelog committed and pushed');
+    log('Changelog committed and pushed');
 }
 
 export { autopr };