npm - sfdx-hardis - Versions diffs - 7.17.0 → 7.18.0 - Mend

sfdx-hardis 7.17.0 → 7.18.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (25) hide show

package/defaults/ci/.github/workflows/check-deploy.yml +1 -1
package/defaults/ci/.github/workflows/process-deploy.yml +1 -1
package/defaults/ci/azure-pipelines-checks.yml +1 -1
package/defaults/ci/azure-pipelines-deployment.yml +1 -1
package/lib/commands/hardis/org/monitor/errors.js +2 -2
package/lib/commands/hardis/org/retrieve/sources/retrofit.js +2 -1
package/lib/commands/hardis/org/retrieve/sources/retrofit.js.map +1 -1
package/lib/commands/hardis/work/new.js +7 -9
package/lib/commands/hardis/work/new.js.map +1 -1
package/lib/common/utils/gitUtils.js +14 -2
package/lib/common/utils/gitUtils.js.map +1 -1
package/lib/common/utils/index.d.ts +19 -0
package/lib/common/utils/index.js +117 -1
package/lib/common/utils/index.js.map +1 -1
package/lib/i18n/de.json +3 -0
package/lib/i18n/en.json +3 -0
package/lib/i18n/es.json +3 -0
package/lib/i18n/fr.json +3 -0
package/lib/i18n/it.json +3 -0
package/lib/i18n/ja.json +3 -0
package/lib/i18n/nl.json +3 -0
package/lib/i18n/pl.json +3 -0
package/lib/i18n/pt-BR.json +3 -0
package/oclif.manifest.json +3563 -3563
package/package.json +1 -1

package/defaults/ci/.github/workflows/check-deploy.yml CHANGED Viewed

@@ -81,7 +81,7 @@ jobs:
           JIRA_HOST: ${{ secrets.JIRA_HOST }}
           JIRA_EMAIL: ${{ secrets.JIRA_EMAIL }}
           JIRA_TOKEN: ${{ secrets.JIRA_TOKEN }}
-          JIRA_PAT: ${{ secrets.JIRA_HOST }}
+          JIRA_PAT: ${{ secrets.JIRA_PAT }}
           JIRA_TICKET_REGEX: ${{ secrets.JIRA_TICKET_REGEX }}
           OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
           # Uncomment to provide API keys for coding agent auto-fix of deployment errors

package/defaults/ci/.github/workflows/process-deploy.yml CHANGED Viewed

@@ -82,7 +82,7 @@ jobs:
           JIRA_HOST: ${{ secrets.JIRA_HOST }}
           JIRA_EMAIL: ${{ secrets.JIRA_EMAIL }}
           JIRA_TOKEN: ${{ secrets.JIRA_TOKEN }}
-          JIRA_PAT: ${{ secrets.JIRA_HOST }}
+          JIRA_PAT: ${{ secrets.JIRA_PAT }}
           # Uncomment to provide API keys for coding agent auto-fix of deployment errors
           # ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
           # OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}

package/defaults/ci/azure-pipelines-checks.yml CHANGED Viewed

@@ -98,7 +98,7 @@ jobs:
           JIRA_HOST: $(JIRA_HOST)
           JIRA_EMAIL: $(JIRA_EMAIL)
           JIRA_TOKEN: $(JIRA_TOKEN)
-          JIRA_PAT: $(JIRA_HOST)
+          JIRA_PAT: $(JIRA_PAT)
           JIRA_TICKET_REGEX: $(JIRA_TICKET_REGEX)
           OPENAI_API_KEY: $(OPENAI_API_KEY)
           # Uncomment to provide API keys for coding agent auto-fix of deployment errors

package/defaults/ci/azure-pipelines-deployment.yml CHANGED Viewed

@@ -90,7 +90,7 @@ jobs:
           JIRA_HOST: $(JIRA_HOST)
           JIRA_EMAIL: $(JIRA_EMAIL)
           JIRA_TOKEN: $(JIRA_TOKEN)
-          JIRA_PAT: $(JIRA_HOST)
+          JIRA_PAT: $(JIRA_PAT)
           JIRA_TICKET_REGEX: $(JIRA_TICKET_REGEX)
           SFDX_DEPLOY_WAIT_MINUTES: $(SFDX_DEPLOY_WAIT_MINUTES)
           SFDX_AUTH_URL_TECHNICAL_ORG: $(SFDX_AUTH_URL_TECHNICAL_ORG)

package/lib/commands/hardis/org/monitor/errors.js CHANGED Viewed

@@ -503,7 +503,7 @@ In agent mode:
             ? t('monitorErrorsApexDetected', { org: orgMarkdown, count, days: this.days })
             : t('monitorErrorsApexNone', { org: orgMarkdown, days: this.days });
         return {
-            type: 'FLOW_ERROR',
+            type: 'APEX_ERROR',
             text: notifText,
             buttons: notifButtons,
             attachments: this.buildApexAttachments(),
@@ -526,7 +526,7 @@ In agent mode:
             ? t('monitorErrorsFlowDetected', { org: orgMarkdown, count, days: this.days })
             : t('monitorErrorsFlowNone', { org: orgMarkdown, days: this.days });
         return {
-            type: 'APEX_ERROR',
+            type: 'FLOW_ERROR',
             text: notifText,
             buttons: notifButtons,
             attachments: this.buildFlowAttachments(),

package/lib/commands/hardis/org/retrieve/sources/retrofit.js CHANGED Viewed

@@ -4,7 +4,7 @@ import { Messages, SfError } from '@salesforce/core';
 import { getConfig } from '../../../../../config/index.js';
 import c from 'chalk';
 // import * as path from "path";
-import { ensureGitRepository, gitHasLocalUpdates, execCommand, git, gitFetch, uxLog, isCI, } from '../../../../../common/utils/index.js';
+import { assertBranchNotInOtherWorktree, ensureGitRepository, gitHasLocalUpdates, execCommand, git, gitFetch, uxLog, isCI, } from '../../../../../common/utils/index.js';
 import { CleanOptions } from 'simple-git';
 import CleanReferences from '../../../project/clean/references.js';
 import SaveTask from '../../../work/save.js';
@@ -166,6 +166,7 @@ In agent mode, all interactive prompts are skipped and default values are used.
                 throw new SfError(`You must delete local and remote branch ${c.yellow(retrofitWorkBranch)} before running this command`);
             }
             uxLog("action", this, c.cyan(t('checkoutToExistingBranch', { retrofitWorkBranch })));
+            await assertBranchNotInOtherWorktree(retrofitWorkBranch);
             await git().checkout(retrofitWorkBranch, ['--force']);
         }
         else {

package/lib/commands/hardis/org/retrieve/sources/retrofit.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"retrofit.js","sourceRoot":"","sources":["../../../../../../src/commands/hardis/org/retrieve/sources/retrofit.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"retrofit.js","sourceRoot":"","sources":["../../../../../../src/commands/hardis/org/retrieve/sources/retrofit.ts"],"names":[],"mappings":"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"}

package/lib/commands/hardis/work/new.js CHANGED Viewed

@@ -4,7 +4,7 @@ import { Messages, SfError } from '@salesforce/core';
 import c from 'chalk';
 import * as path from 'path';
 import { MetadataUtils } from '../../../common/metadata-utils/index.js';
-import { checkGitClean, ensureGitBranch, execCommand, execSfdxJson, getGitRepoUrl, gitCheckOutRemote, gitPull, uxLog, } from '../../../common/utils/index.js';
+import { checkGitClean, createWorkBranchFromTarget, execCommand, execSfdxJson, getGitRepoUrl, uxLog, } from '../../../common/utils/index.js';
 import { buildAvailableTargetBranches, selectTargetBranch } from '../../../common/utils/gitUtils.js';
 import { initApexScripts, initOrgData, initOrgMetadatas, initPermissionSetAssignments, installPackages, makeSureOrgIsConnected, promptOrg, } from '../../../common/utils/orgUtils.js';
 import { prompts } from '../../../common/utils/prompts.js';
@@ -28,7 +28,7 @@ This command guides you through the process of preparing your local environment
 Key features include:
-- **Git Branch Management:** Ensures your local Git repository is up-to-date with the target branch and creates a new Git branch with a formatted name based on your User Story details. Branch naming conventions can be customized via the \`branchPrefixChoices\` property in \`.sfdx-hardis.yml\`.
+- **Git Branch Management:** Creates a new Git branch with a formatted name based on your User Story details, based on the latest version of the target branch. The new branch is created from \`origin/<target>\` instead of checking out the target branch locally, so it works even when the target branch is already checked out in another git worktree. Branch naming conventions can be customized via the \`branchPrefixChoices\` property in \`.sfdx-hardis.yml\`.
 - **Org Provisioning & Initialization:** Facilitates the creation and initialization of either a scratch org or a source-tracked sandbox. The configuration for org initialization (e.g., package installation, source push, permission set assignments, Apex script execution, data loading) can be defined in \`config/.sfdx-hardis.yml\
@@ -80,7 +80,7 @@ Advanced instructions are available in the [Create New User Story documentation]
 The command's logic orchestrates various underlying processes:
-- **Git Operations:** Utilizes \`checkGitClean\`, \`ensureGitBranch\`, \`gitCheckOutRemote\`, and \`git().pull()\` to manage Git repository state and branches.
+- **Git Operations:** Utilizes \`checkGitClean\` and \`createWorkBranchFromTarget\` to manage Git repository state and branches. \`createWorkBranchFromTarget\` fetches \`origin/<target>\` and creates the new branch from it (falling back to the local target ref), checks out the branch if it already exists, and fails with a clear message if it is checked out in another git worktree.
 - **Interactive Prompts:** Leverages the \`prompts\` library to gather user input for User Story type, source types, and User Story names.
 - **Configuration Management:** Reads and applies project-specific configurations from \`.sfdx-hardis.yml\` using \`getConfig\` and \`setConfig\
 - **Org Initialization Utilities:** Calls a suite of utility functions for org setup, including \`initApexScripts\`, \`initOrgData\`, \`initOrgMetadatas\`, \`initPermissionSetAssignments\`, \`installPackages\`, and \`makeSureOrgIsConnected\
@@ -212,16 +212,14 @@ The command's logic orchestrates various underlying processes:
                 ? this.normalizeTaskName(flags['task-name'])
                 : await this.promptTaskName(config.newTaskNameRegex || null, config.newTaskNameRegexExample || null);
         this.validateTaskNameOrThrow(taskName, config.newTaskNameRegex || null, config.newTaskNameRegexExample || null);
-        // Checkout development main branch
+        // Create the new branch from the latest version of the target branch.
+        // We branch from origin/<target> instead of checking out <target>, so this works even
+        // when the target branch is checked out in another git worktree.
         const branchName = `${projectBranchPart}${response.branch || 'feature'}/${taskName}`;
         const repoUrl = await getGitRepoUrl();
         uxLog("action", this, c.cyan(t('checkingOutLatestVersionOfBranch', { branch: c.bold(this.targetBranch), repoUrl })));
-        await gitCheckOutRemote(this.targetBranch);
-        // Pull latest version of target branch
-        await gitPull();
-        // Create new branch
         uxLog("action", this, c.cyan(t('creatingNewBranch', { branchName: c.green(branchName) })));
-        await ensureGitBranch(branchName);
+        await createWorkBranchFromTarget(branchName, this.targetBranch);
         // Update config if necessary
         if (config.developmentBranch !== this.targetBranch && (config.availableTargetBranches || null) == null) {
             let shouldUpdateDefaultTargetBranch = false;

package/lib/commands/hardis/work/new.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"new.js","sourceRoot":"","sources":["../../../../src/commands/hardis/work/new.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"new.js","sourceRoot":"","sources":["../../../../src/commands/hardis/work/new.ts"],"names":[],"mappings":"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"}

package/lib/common/utils/gitUtils.js CHANGED Viewed

@@ -90,12 +90,24 @@ export async function selectTargetBranch(options = {}) {
     return targetBranch;
 }
 export async function getGitDeltaScope(currentBranch, targetBranch) {
+    // Ref used to compute the delta against the target branch. Defaults to the local <target> ref.
+    let targetRef = targetBranch;
     try {
         await gitFetch(['origin', `${targetBranch}:${targetBranch}`]);
     }
     catch (e) {
         uxLog("other", this, `[Warning] Unable to fetch target branch ${targetBranch} to prepare call to sfdx-git-delta\n` +
             JSON.stringify(e));
+        // Fallback (e.g. when the target branch is checked out in another git worktree, so the local
+        // ref cannot be updated): refresh the remote-tracking ref and compute the delta against origin/<target>.
+        try {
+            await gitFetch(['origin', targetBranch]);
+            targetRef = `origin/${targetBranch}`;
+        }
+        catch (e2) {
+            uxLog("other", this, `[Warning] Unable to fetch origin/${targetBranch} to prepare call to sfdx-git-delta\n` +
+                JSON.stringify(e2));
+        }
     }
     try {
         await gitFetch(['origin', `${currentBranch}:${currentBranch}`]);
@@ -104,9 +116,9 @@ export async function getGitDeltaScope(currentBranch, targetBranch) {
         uxLog("other", this, `[Warning] Unable to fetch current branch ${currentBranch} to prepare call to sfdx-git-delta\n` +
             JSON.stringify(e));
     }
-    const logResult = await git().log([`${targetBranch}..${currentBranch}`]);
+    const logResult = await git().log([`${targetRef}..${currentBranch}`]);
     const toCommit = logResult.latest;
-    const mergeBaseCommand = `git merge-base ${targetBranch} ${currentBranch}`;
+    const mergeBaseCommand = `git merge-base ${targetRef} ${currentBranch}`;
     const mergeBaseCommandResult = await execCommand(mergeBaseCommand, this, {
         fail: true,
     });

package/lib/common/utils/gitUtils.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"gitUtils.js","sourceRoot":"","sources":["../../../src/common/utils/gitUtils.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"gitUtils.js","sourceRoot":"","sources":["../../../src/common/utils/gitUtils.ts"],"names":[],"mappings":"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"}

package/lib/common/utils/index.d.ts CHANGED Viewed

@@ -31,6 +31,25 @@ export declare function gitFetch(argsOrOptions?: string[] | any, argsIfOptionsFi
 export declare function gitPull(argsOrOptions?: string[] | any, argsIfOptionsFirst?: string[]): Promise<any>;
 export declare function gitPush(argsOrOptions?: string[] | any, argsIfOptionsFirst?: string[]): Promise<any>;
 export declare function ensureGitBranch(branchName: string, options?: any): Promise<boolean>;
+export interface GitWorktreeInfo {
+    path: string;
+    head?: string;
+    branch?: string;
+}
+export declare function listGitWorktrees(): Promise<GitWorktreeInfo[]>;
+export declare function getBranchWorktreePath(branchName: string): Promise<string | null>;
+export declare function assertBranchNotInOtherWorktree(branchName: string): Promise<void>;
+/**
+ * Create (or check out) a work branch based on the latest state of a target branch, in a way that
+ * is safe when the target branch is checked out in another git worktree.
+ *
+ * - Never checks out the target branch in the current worktree (so it cannot fail with
+ *   "<target> is already checked out at <path>").
+ * - Fetches origin/<target> and creates the new branch from it, falling back to the local <target> ref.
+ * - If the branch already exists and is free, checks it out (resume work).
+ * - If the branch is checked out in another worktree, throws a clear error.
+ */
+export declare function createWorkBranchFromTarget(branchName: string, targetBranch: string): Promise<void>;
 export declare function checkGitClean(options: any): Promise<void>;
 export declare function gitAddCommitPush(options?: any): Promise<void>;
 export declare function normalizeFileStatusPath(fileStatusPath: string, config: any): string;

package/lib/common/utils/index.js CHANGED Viewed

@@ -350,6 +350,8 @@ export async function selectGitBranch(options = { remote: true, checkOutPull: fa
     return branch;
 }
 export async function gitCheckOutRemote(branchName) {
+    // Fail early with a clear message if the branch is checked out in another git worktree
+    await assertBranchNotInOtherWorktree(branchName);
     await git().checkout(branchName);
     try {
         await gitPull();
@@ -576,7 +578,8 @@ export async function ensureGitBranch(branchName, options = { init: false, paren
     const localBranches = await git().branchLocal();
     if (localBranches.current !== branchName) {
         if (branches.all.includes(branchName)) {
-            // Existing branch: checkout & pull
+            // Existing branch: checkout & pull (fail early if it is checked out in another worktree)
+            await assertBranchNotInOtherWorktree(branchName);
             await git().checkout(branchName);
             if (options.logAsAction) {
                 uxLog("action", this, c.green(t('checkedOutGitBranch', { branchName: c.bold(branchName) })));
@@ -607,6 +610,119 @@ export async function ensureGitBranch(branchName, options = { init: false, paren
     }
     return true;
 }
+// List all git worktrees attached to the current repository
+export async function listGitWorktrees() {
+    let raw = '';
+    try {
+        raw = await git().raw(['worktree', 'list', '--porcelain']);
+    }
+    catch {
+        // git worktree may be unavailable on very old git versions: assume a single worktree
+        return [];
+    }
+    const blocks = raw
+        .split(/\r?\n\r?\n/)
+        .map((block) => block.trim())
+        .filter((block) => block.length > 0);
+    return blocks
+        .map((block) => {
+        const info = { path: '' };
+        for (const line of block.split(/\r?\n/)) {
+            if (line.startsWith('worktree ')) {
+                info.path = line.substring('worktree '.length).trim();
+            }
+            else if (line.startsWith('HEAD ')) {
+                info.head = line.substring('HEAD '.length).trim();
+            }
+            else if (line.startsWith('branch ')) {
+                info.branch = line.substring('branch '.length).trim().replace(/^refs\/heads\//, '');
+            }
+        }
+        return info;
+    })
+        .filter((info) => info.path !== '');
+}
+// Returns the path of another worktree where branchName is checked out, or null if free
+export async function getBranchWorktreePath(branchName) {
+    const worktrees = await listGitWorktrees();
+    if (worktrees.length === 0) {
+        return null;
+    }
+    let currentRoot = null;
+    try {
+        currentRoot = path.resolve(await getGitRepoRoot());
+    }
+    catch {
+        currentRoot = null;
+    }
+    for (const worktree of worktrees) {
+        if (worktree.branch === branchName && (currentRoot === null || path.resolve(worktree.path) !== currentRoot)) {
+            return worktree.path;
+        }
+    }
+    return null;
+}
+// Throws a clear error when branchName is checked out in another git worktree, so callers fail with
+// an actionable message instead of a cryptic "'<branch>' is already used by worktree at <path>" git error.
+export async function assertBranchNotInOtherWorktree(branchName) {
+    const branchWorktree = await getBranchWorktreePath(branchName);
+    if (branchWorktree) {
+        throw new SfError(t('branchAlreadyCheckedOutInWorktree', { branch: branchName, worktreePath: branchWorktree }));
+    }
+}
+/**
+ * Create (or check out) a work branch based on the latest state of a target branch, in a way that
+ * is safe when the target branch is checked out in another git worktree.
+ *
+ * - Never checks out the target branch in the current worktree (so it cannot fail with
+ *   "<target> is already checked out at <path>").
+ * - Fetches origin/<target> and creates the new branch from it, falling back to the local <target> ref.
+ * - If the branch already exists and is free, checks it out (resume work).
+ * - If the branch is checked out in another worktree, throws a clear error.
+ */
+export async function createWorkBranchFromTarget(branchName, targetBranch) {
+    if (!isGitRepo()) {
+        throw new SfError('[sfdx-hardis] You must be within a git repository');
+    }
+    // Refuse if the work branch is already checked out in another worktree
+    await assertBranchNotInOtherWorktree(branchName);
+    // Fetch the latest state of the target branch into its remote-tracking ref origin/<target>
+    try {
+        await gitFetch(['origin', targetBranch]);
+    }
+    catch (e) {
+        uxLog("warning", this, c.yellow(t('unableToFetchTargetBranch', { branch: targetBranch, message: e.message })));
+    }
+    const localBranches = await git().branchLocal();
+    // Resume an existing local branch
+    if (localBranches.all.includes(branchName)) {
+        await git().checkout(branchName);
+        uxLog("action", this, c.green(t('checkedOutGitBranch', { branchName: c.bold(branchName) })));
+        return;
+    }
+    // Resume a branch that exists only on origin (git creates the local tracking branch)
+    const remoteBranches = await git().branch(['-r']);
+    if (remoteBranches.all.includes(`origin/${branchName}`)) {
+        await git().checkout(branchName);
+        uxLog("action", this, c.green(t('checkedOutGitBranch', { branchName: c.bold(branchName) })));
+        return;
+    }
+    // Determine the start point: prefer origin/<target>, fall back to the local <target> ref
+    let startPoint = null;
+    if (remoteBranches.all.includes(`origin/${targetBranch}`)) {
+        startPoint = `origin/${targetBranch}`;
+    }
+    else if (localBranches.all.includes(targetBranch)) {
+        startPoint = targetBranch;
+    }
+    if (startPoint === null) {
+        throw new SfError(t('unableToFindTargetBranchToBranchFrom', { branch: targetBranch }));
+    }
+    // Create the work branch from the start point. --no-track keeps it upstream-less until
+    // hardis:work:save pushes it with -u (matching the behavior of branching from a local ref).
+    await git().checkout(['-b', branchName, '--no-track', startPoint]);
+    uxLog("action", this, c.green(t('createdAndCheckedOutGitBranch', { branchName: c.bold(branchName) })));
+}
 // Checks that current git status is clean.
 export async function checkGitClean(options) {
     if (!isGitRepo()) {