@waron97/prbot 3.0.1 → 3.0.3

package/package.json

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

package/src/agrippa/commands/init.js

@@ -74,16 +74,20 @@ async function init() {
             },
         ]);
         if (!overwrite) {
-            console.log('Aborted.');
-            return;
+            console.log('Skipped workspace file.');
+        } else {
+            writeFileSync(WORKSPACE_FILE, TEMPLATE, 'utf-8');
+            console.log(`Created ${WORKSPACE_FILE}`);
+            console.log(`Run 'agrippa clone' to add resources to this workspace.`);
+            console.log(`Add ${WORKSPACE_FILE} to .gitignore if it contains credentials.`);
         }
+    } else {
+        writeFileSync(WORKSPACE_FILE, TEMPLATE, 'utf-8');
+        console.log(`Created ${WORKSPACE_FILE}`);
+        console.log(`Run 'agrippa clone' to add resources to this workspace.`);
+        console.log(`Add ${WORKSPACE_FILE} to .gitignore if it contains credentials.`);
     }
 
-    writeFileSync(WORKSPACE_FILE, TEMPLATE, 'utf-8');
-    console.log(`Created ${WORKSPACE_FILE}`);
-    console.log(`Run 'agrippa clone' to add resources to this workspace.`);
-    console.log(`Add ${WORKSPACE_FILE} to .gitignore if it contains credentials.`);
-
     if (!existsSync('pyproject.toml')) {
         writeFileSync('pyproject.toml', PYPROJECT_TOML, 'utf-8');
         console.log('Created pyproject.toml (ruff builtins)');

package/src/agrippa/commands/pull.js

@@ -162,55 +162,25 @@ async function fetchRemoteCode(token, ripUrl, workspace) {
 }
 
 async function selectEntries(changed, verb, mode = 'pull') {
-    // Group by parent folder for folder-level pre-selection
-    const folderMap = new Map();
-    for (const entry of changed) {
-        const folder = dirname(entry.path) || '.';
-        if (!folderMap.has(folder)) folderMap.set(folder, []);
-        folderMap.get(folder).push(entry);
-    }
-
-    const folders = [...folderMap.keys()];
-
-    // Folder-level pre-selection (only shown when there are multiple folders)
-    let includedFolders = new Set(folders);
-    if (folders.length > 1) {
-        const { selectedFolders } = await inquirer.prompt([
-            {
-                type: 'checkbox',
-                name: 'selectedFolders',
-                message: `Select workflows/folders to ${verb}:`,
-                choices: folders.map((f) => ({
-                    name: `${f}/  (${folderMap.get(f).length} changed)`,
-                    value: f,
-                    checked: true,
-                })),
-            },
-        ]);
-        includedFolders = new Set(selectedFolders);
-    }
-
-    const candidates = changed.filter((e) => includedFolders.has(dirname(e.path) || '.'));
-
-    if (!candidates.length) return [];
-
     const badgeFor = (status) => {
         if (mode === 'push') {
-            return status === 'fast-forward' ? '↑ local updated' : '⚠ remote changes will be overwritten';
+            return status === 'fast-forward' ? '↑ safe' : '⚠ conflict';
         }
-        return status === 'fast-forward' ? '↑ remote updated' : '⚠ local changes will be lost';
+        return status === 'fast-forward' ? '↑ safe' : '⚠ conflict';
     };
 
+    const choices = changed.map((e) => ({
+        name: `${e.name}  [${badgeFor(e.status)}]`,
+        value: e,
+        checked: true,
+    }));
+
     const { selected } = await inquirer.prompt([
         {
             type: 'checkbox',
             name: 'selected',
-            message: `Fine-tune records to ${verb}: (space to toggle, a to toggle all)`,
-            choices: candidates.map((e) => ({
-                name: `[${dirname(e.path) || '.'}]  ${e.name}  [${badgeFor(e.status)}]`,
-                value: e,
-                checked: true,
-            })),
+            message: `Select records to ${verb}:`,
+            choices,
             pageSize: 20,
         },
     ]);

package/src/agrippa/lib/config.js

@@ -19,7 +19,7 @@ function writeConfig(config) {
 function loadEffectiveEnv(localConfig) {
     // Load global prbot config as the base (KC_URL, KC_USER, RIP_URL, etc. live here)
     if (existsSync(CONFIG_FILE)) {
-        configDotenv({ path: CONFIG_FILE });
+        configDotenv({ path: CONFIG_FILE, quiet: true });
     }
 
     // Overlay workspace-level overrides from agrippa.yaml's agrippa: section

package/src/commands/exportEmailTemplates.js

@@ -55,7 +55,7 @@ function escapeXml(str) {
 function generateXml(templates) {
     const records = templates
         .map((t) => {
-            const id = toXmlId(t.name);
+            const id = `mail_template_${toXmlId(t.template_code)}`;
             const modelRef = Object.values(t.model_id)[0];
             return `        <record id="${id}" model="mail.template">
             <field name="name">${escapeXml(t.name)}</field>
@@ -93,28 +93,41 @@ async function exportEmailTemplates(opts) {
     const token = await getToken();
 
     const moduleChoices = await getModuleChoices();
-    const module = await search({
-        message: 'Select module:',
-        source: async (input) => {
-            if (!input) return moduleChoices;
-            return moduleChoices.filter((c) => fuzzyMatch(c.name, input));
-        },
-    });
+    const moduleMatch = opts.module ? moduleChoices.find((c) => c.name === opts.module) : null;
+    const module = moduleMatch
+        ? moduleMatch.value
+        : await search({
+              message: 'Select module:',
+              source: async (input) => {
+                  if (!input) return moduleChoices;
+                  return moduleChoices.filter((c) => fuzzyMatch(c.name, input));
+              },
+          });
 
     console.log('Fetching workflows...');
     const workflows = await getWorkflows(token);
     const choices = workflows.map((w) => ({ name: w.name, value: w.id }));
 
-    const workflowId = await search({
-        message: 'Select workflow:',
-        source: async (input) => {
-            if (!input) return choices;
-            return choices.filter((c) => fuzzyMatch(c.name, input));
-        },
-    });
+    const workflowMatch = opts.workflow
+        ? workflows.find((w) => w.name === opts.workflow || String(w.id) === opts.workflow)
+        : null;
+    const workflowId = workflowMatch
+        ? workflowMatch.id
+        : await search({
+              message: 'Select workflow:',
+              source: async (input) => {
+                  if (!input) return choices;
+                  return choices.filter((c) => fuzzyMatch(c.name, input));
+              },
+          });
 
     console.log(`Fetching email templates for workflow ${workflowId}...`);
-    const templates = await getEmailTemplates(workflowId, token);
+    const excludes = opts.exclude ?? [];
+    const templates = (await getEmailTemplates(workflowId, token))
+        .filter((t) => t.template_code)
+        .filter((t) => {
+            return !excludes.some((ex) => ex === String(t.id) || ex === t.name || ex === t.template_code);
+        });
 
     if (!templates.length) {
         console.log('No email templates found for this workflow.');

package/src/index.js

@@ -11,7 +11,7 @@ import { main as prMain } from './commands/pr.js';
 import { verbot } from './commands/ver.js';
 import { CONFIG_FILE } from './config.js';
 
-configDotenv({ path: CONFIG_FILE });
+configDotenv({ path: CONFIG_FILE, quiet: true });
 
 program
     .command('pr <module>')
@@ -112,6 +112,9 @@ exportCmd
 exportCmd
     .command('email-templates')
     .option('--no-commit')
+    .option('-e, --exclude <value...>', 'exclude templates matching id, name, or template_code')
+    .option('-m, --module <name>', 'module directory name (skip prompt)')
+    .option('-w, --workflow <value>', 'workflow name or id (skip prompt)')
     .action((opts) => {
         exportEmailTemplates(opts).catch((err) => {
             throw err;