@waron97/prbot 3.6.0 → 3.7.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@waron97/prbot",
-    "version": "3.6.0",
+    "version": "3.7.0",
     "description": "",
     "main": "index.js",
     "engines": {

package/src/commands/autopr.js

@@ -1,5 +1,6 @@
 import { readFileSync } from 'fs';
 import fs from 'fs/promises';
+import path from 'path';
 import search from '@inquirer/search';
 import inquirer from 'inquirer';
 import fetch from 'node-fetch';
@@ -218,6 +219,11 @@ async function autoprAmend(options) {
 }
 
 async function autopr(options) {
+    if (options.worktree && options.amend) {
+        throw new Error(
+            '--worktree cannot be combined with --amend (amend operates on the already-checked-out branch)'
+        );
+    }
     if (options.amend) return autoprAmend(options);
 
     const ADDONS_PATH = resolveAddonsPath(process.env.ADDONS_PATH);
@@ -263,9 +269,20 @@ async function autopr(options) {
         }
     }
 
-    await execGit(['checkout', '-b', branch], ADDONS_PATH);
-    log(`Branch created: ${branch}`);
-    await execGit(['push', '-u', 'origin', branch], ADDONS_PATH);
+    let repoRoot = ADDONS_PATH;
+    if (options.worktree) {
+        const worktreePath =
+            typeof options.worktree === 'string'
+                ? path.resolve(options.worktree)
+                : path.join(path.dirname(ADDONS_PATH), `${path.basename(ADDONS_PATH)}-${branch}`);
+        await execGit(['worktree', 'add', worktreePath, '-b', branch], ADDONS_PATH);
+        log(`Worktree created: ${worktreePath}`);
+        repoRoot = worktreePath;
+    } else {
+        await execGit(['checkout', '-b', branch], ADDONS_PATH);
+        log(`Branch created: ${branch}`);
+    }
+    await execGit(['push', '-u', 'origin', branch], repoRoot);
 
     const prTitle = options.name ?? tasks[0]?.name ?? branch;
     const prDescription = buildPrDescription(ids, options.jira ?? []);
@@ -313,13 +330,17 @@ async function autopr(options) {
         lines.splice(endLine + 1, 0, newEntry);
     }
 
-    await fs.writeFile(changelogPath, lines.join('\n'));
+    await fs.writeFile(`${repoRoot}/CHANGELOG.md`, lines.join('\n'));
     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);
+    await execGit(['add', 'CHANGELOG.md'], repoRoot);
+    await execGit(['commit', '-m', '[DOC][CHANGELOG] Changelog'], repoRoot);
+    await execGit(['push'], repoRoot);
     log('Changelog committed and pushed');
+
+    if (repoRoot !== ADDONS_PATH) {
+        log(`\nContinue working in: ${repoRoot}`);
+    }
 }
 
 export { autopr };

package/src/commands/exportEmailTemplates.js

@@ -73,6 +73,7 @@ function generateXml(templates) {
             <field name="subject">${escapeXml(t.subject)}</field>
             <field name="email_from">${escapeXml(t.email_from)}</field>
             <field name="email_to">${escapeXml(t.email_to)}</field>
+            <field name="lang">${escapeXml(t.lang)}</field>
             <field name="body_html" type="html">
                 ${sanitizeBodyHtml(t.body_html)}
             </field>

package/src/commands/init.js

@@ -23,7 +23,8 @@ async function init() {
         {
             type: 'input',
             name: 'ADDONS_PATH',
-            message: 'Addons path:',
+            message:
+                "Addons path ('.' or blank = use the repo in the current directory, e.g. a worktree):",
             default: existing.ADDONS_PATH ?? '~/codebase/sorgenia/addons',
         },
         {

package/src/index.js

@@ -136,6 +136,10 @@ program
     .option('-b, --branch <name>', 'Branch name (default: autopr_<taskId>)')
     .option('-n, --name <text>', 'PR title (default: task name from Odoo)')
     .option('--amend', 'Amend existing PR on current branch with new trident/jira refs')
+    .option(
+        '--worktree [path]',
+        'Create the branch in a new git worktree instead of switching the current checkout; optional path overrides the default sibling directory'
+    )
     .action(async (opts) => {
         await autopr(opts);
     });

package/src/lib/addons.js

@@ -1,8 +1,15 @@
-function resolveAddonsPath(addonsPath) {
-    if (addonsPath.startsWith('~')) {
-        return addonsPath.replace('~', process.env.HOME);
+function resolveAddonsPath(addonsPath = process.env.ADDONS_PATH) {
+    const value = (addonsPath ?? '').trim();
+    // Unset, empty, or the explicit "." sentinel => operate on the repo in
+    // the current working directory (e.g. a git worktree), instead of a
+    // fixed global checkout.
+    if (value === '' || value === '.') {
+        return process.cwd();
     }
-    return addonsPath;
+    if (value.startsWith('~')) {
+        return value.replace('~', process.env.HOME);
+    }
+    return value;
 }
 
 export { resolveAddonsPath };