@waron97/prbot 3.1.0 → 3.1.2

package/agrippa_typings/__builtins__.pyi

@@ -75,6 +75,8 @@ FirstArg = TypeVar("FirstArg")
 
 def first(recordset: FirstArg) -> FirstArg: ...
 def format_exc() -> str: ...
+def b64encode(s: bytes) -> bytes: ...
+def b64decode(s: Union[str, bytes]) -> bytes: ...
 
 # --- Exceptions ---
 

package/agrippa_typings/odoo_environment.pyi

@@ -134,9 +134,9 @@ from odoo_records import _UomCategory, _UomUom, _UpdateCadastreData, _UtmCampaig
 from odoo_records import _UtmSource, _UtmStage, _UtmTag, _ValidateAccountMove, _VulnerabilityDashboard, _VulnerabilityDashboardLine
 from odoo_records import _VulnerabilityHistory, _VulnerabilityNotifyAdmissibility, _VulnerabilityNotifyAdmissibilityLine, _VulnerabilityNotifyOutgoing, _WalletImportWizard, _WalletManagementLine
 from odoo_records import _WatchlistAddWizard, _WatchlistDownloadWizard, _WatchlistRemoveWizard, _WebEditorAssets, _WebEditorConverterTest, _WebEditorConverterTestSub
-from odoo_records import _WebTourTour, _WelcomeAttachmentTable, _WelcomeLetterAttachmentMixin, _WizardIrModelMenuCreate, _WizardUploadVulnerability, _X
-from odoo_records import _XCcq, _XMktCom, _XPod, _XPrecheck, _XTopny, _XmlgeneratorDataAggregator
-from odoo_records import _XmlgeneratorDataField, _XmlgeneratorDataModel
+from odoo_records import _WebTourTour, _WelcomeAttachmentTable, _WizardIrModelMenuCreate, _WizardUploadVulnerability, _X, _XCcq
+from odoo_records import _XMktCom, _XPod, _XPrecheck, _XTopny, _XmlgeneratorDataAggregator, _XmlgeneratorDataField
+from odoo_records import _XmlgeneratorDataModel
 
 
 class OdooEnvironment:
@@ -1914,10 +1914,6 @@ class OdooEnvironment:
     @overload
     def __getitem__(self, model_name: Literal["welcome.attachment.table"]) -> _WelcomeAttachmentTable: ...
     @overload
-    def __getitem__(
-        self, model_name: Literal["welcome.letter.attachment.mixin"]
-    ) -> _WelcomeLetterAttachmentMixin: ...
-    @overload
     def __getitem__(self, model_name: Literal["wizard.ir.model.menu.create"]) -> _WizardIrModelMenuCreate: ...
     @overload
     def __getitem__(self, model_name: Literal["wizard.upload.vulnerability"]) -> _WizardUploadVulnerability: ...

package/agrippa_typings/odoo_records.pyi

@@ -7253,6 +7253,7 @@ class _CorrectionInvoice(Recordset):
     def _compute_code_supply_point(self): ...
     def _compute_currency(self): ...
     def _get_symphonie_url(self): ...
+    def download_invoice_data(self): ...
     def download_invoice_pdf(self): ...
 
 # --- create.case ---
@@ -9613,7 +9614,7 @@ class _HelpdeskTicket(Recordset):
     disconnect_date: Optional[_dt.date]
     distributor_charge: float
     distributor_code: str
-    distributor_id: str
+    distributor_id: "_ResPartner"
     distributor_name: str
     distributor_notes: str
     distributor_outcome_reception_date: Optional[_dt.date]
@@ -9790,6 +9791,7 @@ class _HelpdeskTicket(Recordset):
     meter_reading_message: str
     meter_reading_result: str
     meter_readings: str
+    meter_relocation_note: str
     migrated: bool
     mkt_comm_atti_autorizzativi: str
     mkt_comm_causal_code: str
@@ -10262,6 +10264,7 @@ class _HelpdeskTicket(Recordset):
     def ir_cron_registry_change_customer_privacy(self, triplet_code, days_delta, privacy_flag): ...
     def ir_cron_vulnerable_clients_missing_documentation(self): ...
     def kv_store(self) -> "_SymplePbProcessData": ...
+    def last_staging(self, process_name) -> "_SymplePbProcessData": ...
     def launch_cancel_case_wizard(self): ...
     def launch_connect_case_wizard(self): ...
     def launch_connect_parent_wizard(self): ...
@@ -12161,9 +12164,9 @@ class _IrConfigParameter(Recordset):
     def group_by_contract(self, service_point_array): ...
     def imperex_get_values(self): ...
     def patch_asset(self, asset_id, payload, additional_headers=False): ...
-    def prepare_m2c_passthrough_payload(self, case_id, triplet, is_client=True, is_get_client_extended=False, is_validity_date=False, is_split_payment=False, is_contratti_mandato=False, service_points=False, service_points_billing_profile_array=False, is_associazioneContrattoFornitura=False, is_domiciliazione=False, is_ccr=False, is_dpay=False, contatti_array=False, extra_contract_info=False, extra_forniture_info=False, causale_attivazione=False, contrattiDettaglio_array=False, forn_contatti_array=False, contrattiMandatoDettaglio_array=False, is_cCodiceDestinatario=False, is_cCodiceUfficioPA=False, is_cigCup=False, is_contratti=False, is_prodotti=False, causale_cessazione=False, fine_contratto=False, fine_contratto_fornitura=False, is_oneri=False, charge=False, charge_type=False, charge_description=False, cma_array=False, is_codice_offerta=False, garanzia=False, is_contratti_mandato_dInizioValidita=False, protocollo=False, is_rcu=False, oneri_case_type=False, mask=None, is_storno=False, data_storno=False, storno_case_type=False): ...
-    def prepare_m2c_passthrough_payload__nightly(self, case_id, triplet, is_client=True, is_get_client_extended=False, is_validity_date=False, is_split_payment=False, is_contratti_mandato=False, service_points=False, service_points_billing_profile_array=False, is_associazioneContrattoFornitura=False, is_domiciliazione=False, is_ccr=False, is_dpay=False, contatti_array=False, extra_contract_info=False, extra_forniture_info=False, causale_attivazione=False, contrattiDettaglio_array=False, forn_contatti_array=False, contrattiMandatoDettaglio_array=False, is_cCodiceDestinatario=False, is_cCodiceUfficioPA=False, is_cigCup=False, is_contratti=False, is_prodotti=False, causale_cessazione=False, fine_contratto=False, fine_contratto_fornitura=False, is_oneri=False, charge=False, charge_type=False, charge_description=False, cma_array=False, is_codice_offerta=False, garanzia=False, is_contratti_mandato_dInizioValidita=False, protocollo=False, is_rcu=False, oneri_case_type=False, mask=None, is_storno=False, data_storno=False, storno_case_type=False): ...
-    def prepare_m2c_payload(self, case_id, triplet, is_client=True, is_get_client_extended=False, is_validity_date=False, is_split_payment=False, is_contratti_mandato=False, service_points=False, service_points_billing_profile_array=False, is_associazioneContrattoFornitura=False, is_domiciliazione=False, is_ccr=False, is_dpay=False, contatti_array=False, extra_contract_info=False, extra_forniture_info=False, causale_attivazione=False, contrattiDettaglio_array=False, forn_contatti_array=False, contrattiMandatoDettaglio_array=False, is_cCodiceDestinatario=False, is_cCodiceUfficioPA=False, is_cigCup=False, is_contratti=False, is_prodotti=False, causale_cessazione=False, is_oneri=False, charge=False, charge_type=False, charge_description=False, fine_contratto=False, fine_contratto_fornitura=False, cma_array=False, is_codice_offerta=False, garanzia=False, is_contratti_mandato_dInizioValidita=False, protocollo=False, is_rcu=False, oneri_case_type=False, isContrattiOLDAsset=False, is_storno=False, storno_case_type=False, data_storno=False, mask=None): ...
+    def prepare_m2c_passthrough_payload(self, case_id, triplet, is_client=True, is_get_client_extended=False, is_validity_date=False, is_split_payment=False, is_contratti_mandato=False, service_points=False, service_points_billing_profile_array=False, is_associazioneContrattoFornitura=False, is_domiciliazione=False, is_ccr=False, is_dpay=False, contatti_array=False, extra_contract_info=False, extra_forniture_info=False, causale_attivazione=False, contrattiDettaglio_array=False, forn_contatti_array=False, contrattiMandatoDettaglio_array=False, is_cCodiceDestinatario=False, is_cCodiceUfficioPA=False, is_cigCup=False, is_contratti=False, is_prodotti=False, causale_cessazione=False, fine_contratto=False, fine_contratto_fornitura=False, is_oneri=False, charge=False, charge_type=False, charge_description=False, cma_array=False, is_codice_offerta=False, garanzia=False, is_contratti_mandato_dInizioValidita=False, protocollo=False, is_rcu=False, oneri_case_type=False, mask=None, is_storno=False, data_storno=False, storno_case_type=False, service_cell_index=False): ...
+    def prepare_m2c_passthrough_payload__nightly(self, case_id, triplet, is_client=True, is_get_client_extended=False, is_validity_date=False, is_split_payment=False, is_contratti_mandato=False, service_points=False, service_points_billing_profile_array=False, is_associazioneContrattoFornitura=False, is_domiciliazione=False, is_ccr=False, is_dpay=False, contatti_array=False, extra_contract_info=False, extra_forniture_info=False, causale_attivazione=False, contrattiDettaglio_array=False, forn_contatti_array=False, contrattiMandatoDettaglio_array=False, is_cCodiceDestinatario=False, is_cCodiceUfficioPA=False, is_cigCup=False, is_contratti=False, is_prodotti=False, causale_cessazione=False, fine_contratto=False, fine_contratto_fornitura=False, is_oneri=False, charge=False, charge_type=False, charge_description=False, cma_array=False, is_codice_offerta=False, garanzia=False, is_contratti_mandato_dInizioValidita=False, protocollo=False, is_rcu=False, oneri_case_type=False, mask=None, is_storno=False, data_storno=False, storno_case_type=False, service_cell_index=False): ...
+    def prepare_m2c_payload(self, case_id, triplet, is_client=True, is_get_client_extended=False, is_validity_date=False, is_split_payment=False, is_contratti_mandato=False, service_points=False, service_points_billing_profile_array=False, is_associazioneContrattoFornitura=False, is_domiciliazione=False, is_ccr=False, is_dpay=False, contatti_array=False, extra_contract_info=False, extra_forniture_info=False, causale_attivazione=False, contrattiDettaglio_array=False, forn_contatti_array=False, contrattiMandatoDettaglio_array=False, is_cCodiceDestinatario=False, is_cCodiceUfficioPA=False, is_cigCup=False, is_contratti=False, is_prodotti=False, causale_cessazione=False, is_oneri=False, charge=False, charge_type=False, charge_description=False, fine_contratto=False, fine_contratto_fornitura=False, cma_array=False, is_codice_offerta=False, garanzia=False, is_contratti_mandato_dInizioValidita=False, protocollo=False, is_rcu=False, oneri_case_type=False, isContrattiOLDAsset=False, is_storno=False, storno_case_type=False, data_storno=False, mask=None, cella=False): ...
     def process_attributes(self, family, supply_start_date, fonteprezzo): ...
     def process_child_products(self, components, supply_start_date): ...
     def process_family_attributes(self, families, supply_start_date, fonteprezzo): ...
@@ -14565,7 +14568,7 @@ class _M2cActivationDeactivationPayload(Recordset):
     def _M2CActivationDeactivationPayload__smart_patch(self, payload, key, value, on_missing='error'): ...
     def _check_valid_json(self): ...
     def get_payload_with_patch(self, patches=None, on_missing='error'): ...
-    def last(self, cod_pod, payload_type=None): ...
+    def last(self, cod_pod, payload_type=None) -> "_M2cActivationDeactivationPayload": ...
 
 # --- mail.activity ---
 
@@ -16924,7 +16927,7 @@ class _MarketCommEventLog(Recordset):
     def exists(self) -> "_MarketCommEventLog": ...
     def sudo(self) -> "_MarketCommEventLog": ...
     def with_context(self, ctx: Dict[str, Any] = ..., **kwargs: Any) -> "_MarketCommEventLog": ...
-    def last(self, flow_code=None, service_code=None): ...
+    def last(self, flow_code=None, service_code=None) -> "_MarketCommEventLog": ...
 
 # --- market.comm.event.log.cp.utente.filter ---
 
@@ -22540,7 +22543,7 @@ class _ResPartner(Recordset):
     def _avatar_get_placeholder_path(self): ...
     def _build_vat_error_message(self, country_code, wrong_vat, record_label): ...
     def _build_vcard(self): ...
-    def _calculate_service_cell(self): ...
+    def _calculate_service_cell(self, trigger_type='all'): ...
     def _cf_check_birth_data(self, fiscal_code, gender, birth_date): ...
     def _cf_check_city(self, fiscal_code, birth_city): ...
     def _cf_check_name(self, fiscal_code, surname, firstname): ...
@@ -22652,7 +22655,10 @@ class _ResPartner(Recordset):
     def _display_address(self, without_company=False): ...
     def _display_address_depends(self): ...
     def _email_send(self, email_from, subject, body, on_error=None): ...
-    def _evaluate_service_cell_rules(self, target_cell, old_cell, sixty_days, thirteen_months): ...
+    def _eval_cell_monthly_cron(self, target_cell, old_cell, thirteen_months): ...
+    def _eval_cell_realtime(self, target_cell, old_cell): ...
+    def _eval_cell_weekly_cron(self, target_cell, old_cell, sixty_days): ...
+    def _evaluate_service_cell_rules(self, target_cell, old_cell, sixty_days, thirteen_months, trigger_type='all'): ...
     def _fields_sync(self, values): ...
     def _fields_view_get_address(self, arch): ...
     def _find_accounting_partner(self, partner): ...
@@ -22719,6 +22725,7 @@ class _ResPartner(Recordset):
     def _run_vat_test(self, vat_number, default_country, partner_is_company=True): ...
     def _send_to_m2c_passthrough(self): ...
     def _set_calendar_last_notif_ack(self): ...
+    def _should_clear_mm(self, old_cell): ...
     def _signup_retrieve_partner(self, token, check_validity=False, raise_exception=False): ...
     def _sms_get_default_partners(self): ...
     def _split_vat(self, vat): ...
@@ -22804,6 +22811,7 @@ class _ResPartner(Recordset):
     def get_iva_rates(self): ...
     def get_mention_suggestions(self, search, limit=8, channel_id=None): ...
     def get_most_recent_termination_date(self): ...
+    def get_order_sending_date(self, apply_filter=True): ...
     def get_pod_ids_from_service_point_ids(self): ...
     def get_selection_name_value(self, _lang_='it_IT'): ...
     def get_update_client_payload(self, new_status): ...
@@ -30217,6 +30225,7 @@ class _SympleInteraction(Recordset):
     def exists(self) -> "_SympleInteraction": ...
     def sudo(self) -> "_SympleInteraction": ...
     def with_context(self, ctx: Dict[str, Any] = ..., **kwargs: Any) -> "_SympleInteraction": ...
+    def _check_complaint_start_date(self): ...
     def _check_multiple_contacts(self): ...
     def _check_tickets_before_close_interaction(self): ...
     def _checks_before_close_interaction(self): ...
@@ -30605,6 +30614,7 @@ class _SymplePbLauncher(Recordset):
     def _get_elements_eval_context(self, data, model, process, record, user): ...
     def get_event_html(self, res_model_name, res_id, process_key, instance_key): ...
     def get_html(self, model_name, record_id, data, user_id): ...
+    def get_process_elements(self, process_name, model_name, record_id, data, user_id): ...
     def initialize_process(self, process_key, payload): ...
     def which(self, model_name): ...
 
@@ -31311,7 +31321,8 @@ class _SympleRcuLine(Recordset):
     def _inverse_cod_pdr(self): ...
     def _inverse_cod_pod(self): ...
     def action_change_state(self): ...
-    def action_check_cases(self): ...
+    def action_check_activation_cases(self): ...
+    def action_check_deactivation_cases(self): ...
     def action_create_case_when_no_deactivation_cases(self): ...
     def action_refresh_activation(self): ...
     def action_refresh_deactivation(self): ...
@@ -33806,12 +33817,14 @@ class _WelcomeAttachmentTable(Recordset):
     client_type: str
     commodity: str
     dms_attachment_code: str
+    end_date: Optional[_dt.date]
     has_bit2publish_template: bool
     is_placet: bool
     is_unreachable: bool
     request_type: str
     sending_via: str
     show_bit2publish_button: bool
+    start_date: Optional[_dt.date]
     table_type: str
     tension: str
     def browse(self, ids: Union[int, List[int]]) -> "_WelcomeAttachmentTable": ...
@@ -33829,31 +33842,6 @@ class _WelcomeAttachmentTable(Recordset):
     def sudo(self) -> "_WelcomeAttachmentTable": ...
     def with_context(self, ctx: Dict[str, Any] = ..., **kwargs: Any) -> "_WelcomeAttachmentTable": ...
 
-# --- welcome.letter.attachment.mixin ---
-
-class _WelcomeLetterAttachmentMixin(Recordset):
-    bit2publish_template_ids: "_Bit2publishTemplate"
-    has_bit2publish_template: bool
-    show_bit2publish_button: bool
-    def browse(self, ids: Union[int, List[int]]) -> "_WelcomeLetterAttachmentMixin": ...
-    def search(
-        self,
-        domain: List[Any],
-        limit: Optional[int] = None,
-        order: Optional[str] = None,
-        offset: int = 0,
-    ) -> "_WelcomeLetterAttachmentMixin": ...
-    def create(self, vals: Dict[str, Any]) -> "_WelcomeLetterAttachmentMixin": ...
-    def filtered(self, func: Any) -> "_WelcomeLetterAttachmentMixin": ...
-    def sorted(self, key: Any = None, reverse: bool = False) -> "_WelcomeLetterAttachmentMixin": ...
-    def exists(self) -> "_WelcomeLetterAttachmentMixin": ...
-    def sudo(self) -> "_WelcomeLetterAttachmentMixin": ...
-    def with_context(self, ctx: Dict[str, Any] = ..., **kwargs: Any) -> "_WelcomeLetterAttachmentMixin": ...
-    def add_welcome_letter_attachment(self, attachment_codes): ...
-    def get_attachment_id_from_dms(self, path, attachment_name, b2w_url, b2w_token): ...
-    def get_welcome_letter_attachment_codes(self, event_id): ...
-    def welcome_letter_attachments(self, event_id): ...
-
 # --- wizard.ir.model.menu.create ---
 
 class _WizardIrModelMenuCreate(Recordset):

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@waron97/prbot",
-    "version": "3.1.0",
+    "version": "3.1.2",
     "description": "",
     "main": "index.js",
     "scripts": {

package/src/commands/autopr.js

@@ -8,10 +8,12 @@ import { fuzzyMatch } from '../lib/fuzzy.js';
 import { execGit } from '../lib/git.js';
 import {
     appendPrToLine,
+    appendRefsToLine,
     buildRefString,
     detectIndentation,
     extractSections,
     findDuplicateLine,
+    findLineByPrNumber,
     findSectionEndLine,
 } from './changelog.js';
 
@@ -70,6 +72,28 @@ function buildPrDescription(taskIds, jiras) {
     return lines.join('\n');
 }
 
+async function fetchActivePr(branch) {
+    const { DEVOPS_ORG, DEVOPS_PROJECT, DEVOPS_REPO } = process.env;
+    const apiUrl = `https://dev.azure.com/${DEVOPS_ORG}/${DEVOPS_PROJECT}/_apis/git/repositories/${DEVOPS_REPO}/pullrequests?searchCriteria.sourceRefName=refs/heads/${branch}&searchCriteria.status=active&api-version=7.0`;
+    const res = await fetch(apiUrl, { headers: devopsHeaders() });
+    const data = await res.json();
+    if (!res.ok) throw new Error(`DevOps PR fetch failed: ${JSON.stringify(data)}`);
+    if (!data.value || data.value.length === 0) throw new Error(`No active PR found for branch: ${branch}`);
+    return data.value[0];
+}
+
+async function patchDevopsPrDescription(prId, description) {
+    const { DEVOPS_ORG, DEVOPS_PROJECT, DEVOPS_REPO } = process.env;
+    const apiUrl = `https://dev.azure.com/${DEVOPS_ORG}/${DEVOPS_PROJECT}/_apis/git/repositories/${DEVOPS_REPO}/pullrequests/${prId}?api-version=7.0`;
+    const res = await fetch(apiUrl, {
+        method: 'PATCH',
+        headers: devopsHeaders(),
+        body: JSON.stringify({ description }),
+    });
+    const data = await res.json();
+    if (!res.ok) throw new Error(`DevOps PR patch failed: ${JSON.stringify(data)}`);
+}
+
 async function createDevopsPR(branch, title, description) {
     const { DEVOPS_ORG, DEVOPS_PROJECT, DEVOPS_REPO, AUTOPR_TARGET_BRANCH } = process.env;
     const apiUrl = `https://dev.azure.com/${DEVOPS_ORG}/${DEVOPS_PROJECT}/_apis/git/repositories/${DEVOPS_REPO}/pullrequests?api-version=7.0`;
@@ -190,7 +214,60 @@ async function selectSection(sections, candidates) {
     return sections.find((s) => s.heading === selected);
 }
 
+async function autoprAmend(options) {
+    const ADDONS_PATH = resolveAddonsPath(process.env.ADDONS_PATH);
+    const changelogPath = `${ADDONS_PATH}/CHANGELOG.md`;
+    const { DEVOPS_ORG, DEVOPS_PROJECT, DEVOPS_REPO } = process.env;
+
+    const branch = (await execGit(['rev-parse', '--abbrev-ref', 'HEAD'], ADDONS_PATH)).trim();
+    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}`);
+
+    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}`));
+
+    const newLinks = [
+        ...ids.map((id) => `${process.env.TRIDENT_URL}/odoo/my-tasks/${id}`),
+        ...jiras.map((j) => `https://sorgenia.atlassian.net/browse/${j}`),
+    ];
+    if (newLinks.length > 0) {
+        const updatedDescription = pr.description
+            ? `${pr.description}\n${newLinks.join('\n')}`
+            : newLinks.join('\n');
+        await patchDevopsPrDescription(prNumber, updatedDescription);
+        console.log('PR description updated');
+    }
+
+    for (let i = 0; i < ids.length; i++) {
+        await appendChecklistPrLink(ids[i], tasks[i].x_release_checklist, prUrl, prNumber);
+    }
+    if (ids.length > 0) console.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`);
+        return;
+    }
+    const lines = content.split('\n');
+    lines[existing.lineNumber] = appendRefsToLine(existing.line, ids, jiras);
+    await fs.writeFile(changelogPath, lines.join('\n'));
+
+    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.');
+}
+
 async function autopr(options) {
+    if (options.amend) return autoprAmend(options);
+
     const ADDONS_PATH = resolveAddonsPath(process.env.ADDONS_PATH);
     const changelogPath = `${ADDONS_PATH}/CHANGELOG.md`;
 

package/src/commands/changelog.js

@@ -179,6 +179,54 @@ async function changelog(prNumber, options) {
     console.log('Changelog entry added');
 }
 
+function findLineByPrNumber(content, prNumber) {
+    const lines = content.split('\n');
+    for (let i = 0; i < lines.length; i++) {
+        if (lines[i].includes(`#${prNumber}ADO`)) {
+            return { lineNumber: i, line: lines[i] };
+        }
+    }
+    return null;
+}
+
+function appendRefsToLine(line, tridentIds, jiras) {
+    let result = line;
+
+    if (tridentIds && tridentIds.length > 0) {
+        const suffix = tridentIds.map((id) => `#${id}`).join(', ');
+        const tridentMatch = result.match(/Trident (#[\d, #]+)/);
+        if (tridentMatch) {
+            result = result.replace(/Trident (#[\d, #]+)/, `Trident ${tridentMatch[1]}, ${suffix}`);
+        } else {
+            const parenMatch = result.match(/\(([^)]*)\)\s*$/);
+            if (parenMatch) {
+                result = result.replace(/\(([^)]*)\)\s*$/, `(Trident ${suffix}, ${parenMatch[1]})`);
+            } else {
+                result = `${result.trimEnd()} (Trident ${suffix})`;
+            }
+        }
+    }
+
+    if (jiras && jiras.length > 0) {
+        const suffix = jiras.join(', ');
+        const jiraMatch = result.match(/JIRA ([^,)]+)/);
+        if (jiraMatch) {
+            result = result.replace(/JIRA ([^,)]+)/, `JIRA ${jiraMatch[1].trimEnd()}, ${suffix}`);
+        } else if (result.includes('PR sorgenia_addons')) {
+            result = result.replace(/(PR sorgenia_addons)/, `JIRA ${suffix}, $1`);
+        } else {
+            const parenMatch = result.match(/\(([^)]*)\)\s*$/);
+            if (parenMatch) {
+                result = result.replace(/\(([^)]*)\)\s*$/, `(${parenMatch[1]}, JIRA ${suffix})`);
+            } else {
+                result = `${result.trimEnd()} (JIRA ${suffix})`;
+            }
+        }
+    }
+
+    return result;
+}
+
 export {
     changelog,
     extractSections,
@@ -187,4 +235,6 @@ export {
     buildRefString,
     findDuplicateLine,
     appendPrToLine,
+    findLineByPrNumber,
+    appendRefsToLine,
 };

package/src/commands/exportEmailTemplates.js

@@ -2,10 +2,19 @@ import fs from 'fs/promises';
 import path from 'path';
 import fetch from 'node-fetch';
 import search from '@inquirer/search';
+import { select, confirm } from '@inquirer/prompts';
 import { getToken } from '../lib/auth.js';
 import { execGit } from '../lib/git.js';
 import { resolveAddonsPath } from '../lib/addons.js';
 import { fuzzyMatch } from '../lib/fuzzy.js';
+import { log, isSilent } from '../lib/logger.js';
+import { verbot } from './ver.js';
+import {
+    readEmailTemplateMappings,
+    detectEmailRenames,
+    computeMigrationVersion,
+    generateEmailPreMigrateScript,
+} from '../lib/premigrate.js';
 
 async function getWorkflows(token) {
     const url = `${process.env.RIP_URL}/symple.workflow/*`;
@@ -89,6 +98,21 @@ async function getModuleChoices() {
         .map((e) => ({ name: e.name, value: e.name }));
 }
 
+async function resolveManifestPath(module, ADDONS_PATH) {
+    for (const candidate of [
+        path.join(ADDONS_PATH, module, '__manifest__.py'),
+        path.join(ADDONS_PATH, 'config', module, '__manifest__.py'),
+    ]) {
+        try {
+            await fs.access(candidate);
+            return candidate;
+        } catch {
+            // try next
+        }
+    }
+    return null;
+}
+
 async function exportEmailTemplates(opts) {
     const token = await getToken();
 
@@ -104,7 +128,7 @@ async function exportEmailTemplates(opts) {
               },
           });
 
-    console.log('Fetching workflows...');
+    log('Fetching workflows...');
     const workflows = await getWorkflows(token);
     const choices = workflows.map((w) => ({ name: w.name, value: w.id }));
 
@@ -121,7 +145,7 @@ async function exportEmailTemplates(opts) {
               },
           });
 
-    console.log(`Fetching email templates for workflow ${workflowId}...`);
+    log(`Fetching email templates for workflow ${workflowId}...`);
     const excludes = opts.exclude ?? [];
     const templates = (await getEmailTemplates(workflowId, token))
         .filter((t) => t.template_code)
@@ -130,7 +154,7 @@ async function exportEmailTemplates(opts) {
         });
 
     if (!templates.length) {
-        console.log('No email templates found for this workflow.');
+        log('No email templates found for this workflow.');
         return;
     }
 
@@ -138,17 +162,75 @@ async function exportEmailTemplates(opts) {
     const dataDir = path.join(ADDONS_PATH, 'config', module, 'data');
     await fs.mkdir(dataDir, { recursive: true });
 
+    const oldMappings = await readEmailTemplateMappings(dataDir);
+
     const outPath = path.join(dataDir, 'mail_template.xml');
     await fs.writeFile(outPath, generateXml(templates), 'utf-8');
-    console.log(`Written: ${outPath}`);
-
-    if (opts.commit !== false) {
-        await execGit(['add', outPath], ADDONS_PATH);
-        await execGit(
-            ['commit', '-m', `[IMP][${module}] Export email templates`],
-            ADDONS_PATH,
-        );
-        console.log('Committed.');
+    log(`Written: ${outPath}`);
+
+    const newMappings = await readEmailTemplateMappings(dataDir);
+    const renames = detectEmailRenames(oldMappings, newMappings);
+
+    let bumpLevel = opts.bump;
+    if (!bumpLevel) {
+        bumpLevel = await select({
+            message: 'Bump version?',
+            choices: [
+                { name: 'No bump', value: 'none' },
+                { name: 'Patch', value: 'patch' },
+                { name: 'Minor', value: 'minor' },
+                { name: 'Major', value: 'major' },
+            ],
+        });
+    }
+
+    let preMigratePath = null;
+
+    if (renames.length > 0) {
+        log(`Renamed XML IDs (${renames.length}): ${renames.map((r) => `${r.oldXmlId} → ${r.newXmlId}`).join(', ')}`);
+
+        let shouldGenerate = opts.autoPremigrate;
+        if (!shouldGenerate && !isSilent()) {
+            shouldGenerate = await confirm({
+                message: `Detected ${renames.length} renamed template_code(s). Generate pre-migrate script?`,
+                default: true,
+            });
+        }
+
+        if (shouldGenerate) {
+            const manifestPath = await resolveManifestPath(module, ADDONS_PATH);
+            if (!manifestPath) {
+                log(`Warning: __manifest__.py not found for ${module}, skipping pre-migrate generation`);
+            } else {
+                const version = await computeMigrationVersion(manifestPath, bumpLevel);
+                const migrationDir = path.join(ADDONS_PATH, 'config', module, 'migrations', version);
+                preMigratePath = path.join(migrationDir, 'pre-migrate.py');
+                await fs.mkdir(migrationDir, { recursive: true });
+                await fs.writeFile(preMigratePath, generateEmailPreMigrateScript(renames));
+                log(`Wrote pre-migrate: ${preMigratePath}`);
+            }
+        }
+    }
+
+    if (opts.commit === false) {
+        if (bumpLevel && bumpLevel !== 'none') {
+            await verbot(module, bumpLevel, { ...opts, commit: false });
+        }
+        return;
+    }
+
+    const filesToAdd = [outPath];
+    if (preMigratePath) filesToAdd.push(preMigratePath);
+
+    for (const filePath of filesToAdd) {
+        await execGit(['add', filePath], ADDONS_PATH);
+    }
+
+    await execGit(['commit', '-m', `[IMP][${module}] Export email templates`], ADDONS_PATH);
+    log('Committed.');
+
+    if (bumpLevel && bumpLevel !== 'none') {
+        await verbot(module, bumpLevel, opts);
     }
 }
 

package/src/commands/exportImperex.js

@@ -6,6 +6,7 @@ import { getToken } from '../lib/auth.js';
 import { execGit } from '../lib/git.js';
 import { resolveAddonsPath } from '../lib/addons.js';
 import { fuzzyMatch } from '../lib/fuzzy.js';
+import { log } from '../lib/logger.js';
 
 const IMPEREX_REL = 'sorgenia_imperex_metadata/migrations/0.0.0/imperex';
 
@@ -56,7 +57,7 @@ async function exportImperex(opts) {
         },
     });
 
-    console.log(`Fetching records for ${model}...`);
+    log(`Fetching records for ${model}...`);
     const records = await listRecords(model, token);
     const recChoices = records.map((r) => ({ name: String(r.name ?? r.id), value: r.id }));
     const recordId = await search({
@@ -67,7 +68,7 @@ async function exportImperex(opts) {
         },
     });
 
-    console.log(`Exporting record ${recordId}...`);
+    log(`Exporting record ${recordId}...`);
     const { attachments } = await exportRecord(model, recordId, token);
 
     const modelDir = path.join(ADDONS_PATH, IMPEREX_REL, model);
@@ -78,7 +79,7 @@ async function exportImperex(opts) {
         if (att.name === '__manifest__.yaml') continue;
         const destPath = path.join(modelDir, path.basename(att.name));
         await fs.writeFile(destPath, att.content, 'utf-8');
-        console.log(`Written: ${destPath}`);
+        log(`Written: ${destPath}`);
         saved.push(destPath);
     }
 
@@ -90,7 +91,7 @@ async function exportImperex(opts) {
             ['commit', '-m', `[IMP][sorgenia_imperex_metadata] update ${model} record`],
             ADDONS_PATH,
         );
-        console.log('Committed.');
+        log('Committed.');
     }
 }