@copado/agentia-cli 0.115.0-alpha.0 → 0.117.0-alpha.0

package/dist/lib/work-apex-test.js

@@ -0,0 +1,265 @@
+import { execFile } from 'node:child_process';
+import { promisify } from 'node:util';
+import { getMcpRequestSignal } from './mcp/request-context.js';
+const execFileAsync = promisify(execFile);
+export const DEFAULT_APEX_TEST_WAIT_MINUTES = 60;
+const APEX_TEST_MAX_BUFFER_BYTES = 32 * 1024 * 1024;
+const APEX_TEST_TIMEOUT_BUFFER_MS = 60_000;
+const APEX_CLASS_NAME_PATTERN = /^[A-Za-z][A-Za-z0-9_]*(\.[A-Za-z][A-Za-z0-9_]*)?$/;
+const ORG_ID_PATTERN = /\b00D[A-Za-z0-9]{12,15}\b/g;
+const USER_ID_PATTERN = /\b005[A-Za-z0-9]{12,15}\b/g;
+const FAILED_OUTCOMES = new Set(['compilefail', 'fail']);
+export class WorkApexTestError extends Error {
+    result;
+    constructor(result) {
+        const failing = result.summary.failing ?? result.tests.filter((test) => isFailedOutcome(test.outcome)).length;
+        super(`Apex tests failed (${failing} failing).`);
+        this.name = 'WorkApexTestError';
+        this.result = result;
+    }
+}
+let sfApexTestExecFn = defaultSfApexTestExec;
+export function buildSfApexTestArgs(classNames, waitMinutes) {
+    return ['apex', 'run', 'test', '--class-names', ...classNames, '-c', '--json', '--wait', String(waitMinutes)];
+}
+export function parseApexTestClassNames(value) {
+    const names = value
+        .split(/[,\s]+/)
+        .map((name) => name.trim())
+        .filter((name) => name.length > 0);
+    if (names.length === 0) {
+        throw new Error('Requires `--apex-test-classes`.');
+    }
+    const unique = [];
+    const seen = new Set();
+    for (const name of names) {
+        if (!APEX_CLASS_NAME_PATTERN.test(name)) {
+            throw new Error(`Invalid Apex test class name '${name}'. Use identifiers such as MyTest or Namespace.MyTest.`);
+        }
+        if (seen.has(name)) {
+            continue;
+        }
+        seen.add(name);
+        unique.push(name);
+    }
+    return unique;
+}
+export function validateApexTestWaitMinutes(waitMinutes) {
+    if (!Number.isInteger(waitMinutes) || waitMinutes < 1) {
+        throw new Error('`--wait` must be a positive integer number of minutes.');
+    }
+    return waitMinutes;
+}
+export function formatWorkApexTestHuman(result) {
+    const failedTests = result.tests.filter((test) => isFailedOutcome(test.outcome));
+    const lines = [
+        `Apex tests: ${result.summary.outcome ?? (failedTests.length === 0 ? 'Passed' : 'Failed')}`,
+        ...summaryLines(result.summary),
+    ];
+    if (failedTests.length === 0) {
+        return lines.join('\n');
+    }
+    return [
+        ...lines,
+        '',
+        'Failed tests:',
+        ...failedTests.flatMap((test) => [
+            '',
+            testLabel(test),
+            ...(test.outcome === undefined ? [] : [`  Outcome: ${test.outcome}`]),
+            ...(test.message === undefined ? [] : [`  Message: ${test.message}`]),
+            ...(test.stackTrace === undefined ? [] : [`  StackTrace: ${test.stackTrace}`]),
+        ]),
+    ].join('\n');
+}
+export async function runWorkApexTests({ classNames, waitMinutes: requestedWaitMinutes, }) {
+    const waitMinutes = validateApexTestWaitMinutes(requestedWaitMinutes);
+    const args = buildSfApexTestArgs(classNames, waitMinutes);
+    let stdout;
+    try {
+        const executed = await sfApexTestExecFn(args, {
+            maxBuffer: APEX_TEST_MAX_BUFFER_BYTES,
+            signal: getMcpRequestSignal(),
+            timeout: waitMinutes * 60 * 1000 + APEX_TEST_TIMEOUT_BUFFER_MS,
+        });
+        stdout = executed.stdout;
+    }
+    catch (error) {
+        throw new Error(sanitizeApexTestError(error));
+    }
+    const parsed = extractJsonObject(stdout);
+    if (parsed.result === undefined) {
+        throw new Error(sanitizeApexTestError(parsed.message ?? parsed.name ?? 'Salesforce CLI Apex test run failed.'));
+    }
+    const result = parseSfApexTestJson(stdout, classNames, waitMinutes);
+    if (isTestRunFailed(result)) {
+        throw new WorkApexTestError(result);
+    }
+    if (typeof parsed.status === 'number' && parsed.status !== 0) {
+        throw new Error(sanitizeApexTestError(parsed.message ?? parsed.name ?? 'Salesforce CLI Apex test run failed.'));
+    }
+    return result;
+}
+export function parseSfApexTestJson(raw, classNames, waitMinutes) {
+    const parsed = extractJsonObject(raw);
+    if (parsed.result === undefined) {
+        throw new Error(sanitizeApexTestError(parsed.message ?? parsed.name ?? 'Salesforce CLI Apex test run failed.'));
+    }
+    const tests = (parsed.result.tests ?? []).flatMap((item) => {
+        const mapped = mapTestMethod(item);
+        return mapped === undefined ? [] : [mapped];
+    });
+    const summary = mapSummary(parsed.result.summary ?? {});
+    return {
+        classNames,
+        summary,
+        tests,
+        waitMinutes,
+    };
+}
+export function setSfApexTestExecForTests(fn) {
+    sfApexTestExecFn = fn;
+}
+export function resetSfApexTestExecForTests() {
+    sfApexTestExecFn = defaultSfApexTestExec;
+}
+async function defaultSfApexTestExec(args, options) {
+    try {
+        const { stderr, stdout } = await execFileAsync('sf', args, {
+            encoding: 'utf8',
+            maxBuffer: options.maxBuffer,
+            signal: options.signal,
+            timeout: options.timeout,
+        });
+        return { stderr: stderr.toString(), stdout: stdout.toString() };
+    }
+    catch (error) {
+        if (isExecFileError(error) && typeof error.stdout === 'string' && error.stdout.trim().length > 0) {
+            return {
+                stderr: typeof error.stderr === 'string' ? error.stderr : '',
+                stdout: error.stdout,
+            };
+        }
+        throw error;
+    }
+}
+function extractJsonObject(raw) {
+    const start = raw.indexOf('{');
+    if (start === -1) {
+        throw new Error('Salesforce CLI returned non-JSON output.');
+    }
+    return JSON.parse(raw.slice(start));
+}
+function mapSummary(summary) {
+    return {
+        ...(optionalString(summary.commandTime) === undefined ? {} : { commandTime: optionalString(summary.commandTime) }),
+        ...(optionalString(summary.failRate) === undefined ? {} : { failRate: optionalString(summary.failRate) }),
+        ...(optionalNumber(summary.failing) === undefined ? {} : { failing: optionalNumber(summary.failing) }),
+        ...(optionalString(summary.orgWideCoverage) === undefined
+            ? {}
+            : { orgWideCoverage: optionalString(summary.orgWideCoverage) }),
+        ...(optionalString(summary.outcome) === undefined ? {} : { outcome: optionalString(summary.outcome) }),
+        ...(optionalString(summary.passRate) === undefined ? {} : { passRate: optionalString(summary.passRate) }),
+        ...(optionalNumber(summary.passing) === undefined ? {} : { passing: optionalNumber(summary.passing) }),
+        ...(optionalNumber(summary.skipped) === undefined ? {} : { skipped: optionalNumber(summary.skipped) }),
+        ...(optionalString(summary.testExecutionTime) === undefined
+            ? {}
+            : { testExecutionTime: optionalString(summary.testExecutionTime) }),
+        ...(optionalString(summary.testRunCoverage) === undefined
+            ? {}
+            : { testRunCoverage: optionalString(summary.testRunCoverage) }),
+        ...(optionalString(summary.testRunId) === undefined ? {} : { testRunId: optionalString(summary.testRunId) }),
+        ...(optionalString(summary.testStartTime) === undefined
+            ? {}
+            : { testStartTime: optionalString(summary.testStartTime) }),
+        ...(optionalString(summary.testTotalTime) === undefined ? {} : { testTotalTime: optionalString(summary.testTotalTime) }),
+        ...(optionalNumber(summary.testsRan) === undefined ? {} : { testsRan: optionalNumber(summary.testsRan) }),
+    };
+}
+function mapTestMethod(value) {
+    if (value === null || typeof value !== 'object' || Array.isArray(value)) {
+        return undefined;
+    }
+    const record = value;
+    const apexClass = record.ApexClass !== null && typeof record.ApexClass === 'object' && !Array.isArray(record.ApexClass)
+        ? record.ApexClass
+        : undefined;
+    const mapped = {
+        ...(optionalString(apexClass?.Name) === undefined ? {} : { className: optionalString(apexClass?.Name) }),
+        ...(optionalString(record.FullName) === undefined ? {} : { fullName: optionalString(record.FullName) }),
+        ...(optionalString(record.Message) === undefined ? {} : { message: optionalString(record.Message) }),
+        ...(optionalString(record.MethodName) === undefined ? {} : { methodName: optionalString(record.MethodName) }),
+        ...(optionalString(record.Outcome) === undefined ? {} : { outcome: optionalString(record.Outcome) }),
+        ...(optionalString(record.StackTrace) === undefined ? {} : { stackTrace: optionalString(record.StackTrace) }),
+    };
+    return Object.keys(mapped).length === 0 ? undefined : mapped;
+}
+function isTestRunFailed(result) {
+    if (result.tests.some((test) => isFailedOutcome(test.outcome))) {
+        return true;
+    }
+    const outcome = result.summary.outcome?.trim().toLowerCase();
+    return outcome === 'failed' || (result.summary.failing ?? 0) > 0;
+}
+function isFailedOutcome(outcome) {
+    return outcome !== undefined && FAILED_OUTCOMES.has(outcome.trim().toLowerCase());
+}
+function testLabel(test) {
+    if (test.fullName !== undefined && test.fullName.length > 0) {
+        return test.fullName;
+    }
+    const joined = [test.className, test.methodName]
+        .filter((part) => part !== undefined && part.length > 0)
+        .join('.');
+    return joined.length > 0 ? joined : 'unknown test';
+}
+function summaryLines(summary) {
+    const lines = [];
+    pushLine(lines, 'Tests ran', summary.testsRan);
+    pushLine(lines, 'Passing', summary.passing);
+    pushLine(lines, 'Failing', summary.failing);
+    pushLine(lines, 'Skipped', summary.skipped);
+    pushLine(lines, 'Pass rate', summary.passRate);
+    pushLine(lines, 'Fail rate', summary.failRate);
+    pushLine(lines, 'Test run coverage', summary.testRunCoverage);
+    pushLine(lines, 'Org-wide coverage', summary.orgWideCoverage);
+    pushLine(lines, 'Test execution time', summary.testExecutionTime);
+    return lines;
+}
+function pushLine(lines, label, value) {
+    if (value === undefined || value === '') {
+        return;
+    }
+    lines.push(`${label}: ${value}`);
+}
+function optionalString(value) {
+    if (typeof value !== 'string') {
+        return undefined;
+    }
+    const sanitized = sanitizeIdentity(value).trim();
+    return sanitized.length === 0 ? undefined : sanitized;
+}
+function optionalNumber(value) {
+    return typeof value === 'number' && Number.isFinite(value) ? value : undefined;
+}
+function sanitizeApexTestError(error) {
+    if (isExecFileError(error) && error.code === 'ENOENT') {
+        return 'Salesforce CLI (`sf`) is not installed or is not on PATH.';
+    }
+    if (error instanceof Error && error.name === 'AbortError') {
+        return 'Apex test run was cancelled.';
+    }
+    const message = error instanceof Error ? error.message : String(error);
+    const cleaned = sanitizeIdentity(message).trim();
+    if (cleaned.length === 0) {
+        return 'Salesforce CLI Apex test run failed.';
+    }
+    return `Salesforce CLI Apex test run failed: ${cleaned}`;
+}
+function sanitizeIdentity(value) {
+    return value.replaceAll(ORG_ID_PATTERN, '<org-id>').replaceAll(USER_ID_PATTERN, '<user-id>');
+}
+function isExecFileError(error) {
+    return error instanceof Error;
+}
+//# sourceMappingURL=work-apex-test.js.map

package/dist/lib/work-apex-test.js.map

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

package/dist/lib/work-branch-metadata.d.ts

@@ -9,3 +9,5 @@ export type WorkBranchMetadataResult = {
     metadataList: WorkBranchMetadataItem[];
 };
 export declare function resolveWorkBranchMetadata(baseRef: string, moduleType?: ModuleType): Promise<WorkBranchMetadataResult>;
+/** Local branch metadata when `work set` recorded lastBaseBranch; otherwise undefined. */
+export declare function resolveRecordedWorkBranchMetadata(moduleType?: ModuleType): Promise<undefined | WorkBranchMetadataResult>;

package/dist/lib/work-branch-metadata.js

@@ -1,3 +1,4 @@
+import { readLastBaseBranch } from './defaults-store.js';
 import { resolvedSelectionsFromChangedFiles } from './dependency-from-changes.js';
 const NO_METADATA_MESSAGES = [
     'No changed files were found',
@@ -28,4 +29,12 @@ export async function resolveWorkBranchMetadata(baseRef, moduleType) {
         return { baseRef, metadataList: [] };
     }
 }
+/** Local branch metadata when `work set` recorded lastBaseBranch; otherwise undefined. */
+export async function resolveRecordedWorkBranchMetadata(moduleType) {
+    const baseRef = (await readLastBaseBranch())?.trim();
+    if (!baseRef) {
+        return undefined;
+    }
+    return resolveWorkBranchMetadata(baseRef, moduleType);
+}
 //# sourceMappingURL=work-branch-metadata.js.map

package/dist/lib/work-branch-metadata.js.map

@@ -1 +1 @@
-{"version":3,"file":"work-branch-metadata.js","sourceRoot":"","sources":["../../src/lib/work-branch-metadata.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,kCAAkC,EAAC,MAAM,8BAA8B,CAAA;AAc/E,MAAM,oBAAoB,GAAG;IAC3B,6BAA6B;IAC7B,8CAA8C;CAC/C,CAAA;AAED,SAAS,iBAAiB,CAAC,KAAc;IACvC,IAAI,CAAC,CAAC,KAAK,YAAY,KAAK,CAAC,EAAE,CAAC;QAC9B,OAAO,KAAK,CAAA;IACd,CAAC;IAED,OAAO,oBAAoB,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAA;AAClF,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,OAAe,EACf,UAAuB;IAEvB,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,MAAM,kCAAkC,CAAC,OAAO,EAAE,UAAU,CAAC,CAAA;QAEhF,OAAO;YACL,OAAO;YACP,YAAY,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,EAAC,UAAU,EAAE,SAAS,EAAC,EAAE,EAAE,CAAC,CAAC;gBACzD,UAAU;gBACV,IAAI,EAAE,SAAS,CAAC,IAAI;gBACpB,IAAI,EAAE,SAAS,CAAC,IAAI;aACrB,CAAC,CAAC;SACJ,CAAA;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,EAAE,CAAC;YAC9B,MAAM,KAAK,CAAA;QACb,CAAC;QAED,OAAO,EAAC,OAAO,EAAE,YAAY,EAAE,EAAE,EAAC,CAAA;IACpC,CAAC;AACH,CAAC"}
+{"version":3,"file":"work-branch-metadata.js","sourceRoot":"","sources":["../../src/lib/work-branch-metadata.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,kBAAkB,EAAC,MAAM,qBAAqB,CAAA;AACtD,OAAO,EAAC,kCAAkC,EAAC,MAAM,8BAA8B,CAAA;AAc/E,MAAM,oBAAoB,GAAG;IAC3B,6BAA6B;IAC7B,8CAA8C;CAC/C,CAAA;AAED,SAAS,iBAAiB,CAAC,KAAc;IACvC,IAAI,CAAC,CAAC,KAAK,YAAY,KAAK,CAAC,EAAE,CAAC;QAC9B,OAAO,KAAK,CAAA;IACd,CAAC;IAED,OAAO,oBAAoB,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAA;AAClF,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,OAAe,EACf,UAAuB;IAEvB,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,MAAM,kCAAkC,CAAC,OAAO,EAAE,UAAU,CAAC,CAAA;QAEhF,OAAO;YACL,OAAO;YACP,YAAY,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,EAAC,UAAU,EAAE,SAAS,EAAC,EAAE,EAAE,CAAC,CAAC;gBACzD,UAAU;gBACV,IAAI,EAAE,SAAS,CAAC,IAAI;gBACpB,IAAI,EAAE,SAAS,CAAC,IAAI;aACrB,CAAC,CAAC;SACJ,CAAA;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,EAAE,CAAC;YAC9B,MAAM,KAAK,CAAA;QACb,CAAC;QAED,OAAO,EAAC,OAAO,EAAE,YAAY,EAAE,EAAE,EAAC,CAAA;IACpC,CAAC;AACH,CAAC;AAED,0FAA0F;AAC1F,MAAM,CAAC,KAAK,UAAU,iCAAiC,CACrD,UAAuB;IAEvB,MAAM,OAAO,GAAG,CAAC,MAAM,kBAAkB,EAAE,CAAC,EAAE,IAAI,EAAE,CAAA;IACpD,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,SAAS,CAAA;IAClB,CAAC;IAED,OAAO,yBAAyB,CAAC,OAAO,EAAE,UAAU,CAAC,CAAA;AACvD,CAAC"}

package/dist/lib/work-local-commit.d.ts

@@ -35,7 +35,7 @@ export declare function resolveWorkLocalCommitMessage(explicitMessage?: string):
     workItem?: string;
 }>;
 /**
- * Runs a plain `git commit` and records the Copado selections consumed later by `cicd work push`.
+ * Runs a plain `git commit` and records the Copado selections consumed later by `cicd work publish`.
  * No gateway call is made.
  */
 export declare function performWorkLocalCommit(input: WorkLocalCommitInput): Promise<WorkLocalCommitResult>;

package/dist/lib/work-local-commit.js

@@ -83,7 +83,7 @@ function gitFailureMessage(error) {
     return detail.length > 0 ? detail : error instanceof Error ? error.message : String(error);
 }
 /**
- * Runs a plain `git commit` and records the Copado selections consumed later by `cicd work push`.
+ * Runs a plain `git commit` and records the Copado selections consumed later by `cicd work publish`.
  * No gateway call is made.
  */
 export async function performWorkLocalCommit(input) {

package/dist/lib/work-publish-command.d.ts

@@ -0,0 +1,26 @@
+import { type WorkPushResult } from './work-types.js';
+export declare const WORK_PUBLISH_DESCRIPTION: string;
+export declare const workPublishFlags: {
+    readonly 'full-metadata': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+    readonly permissions: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+    readonly 'skip-nested-metadata-detection': import("@oclif/core/interfaces").BooleanFlag<boolean>;
+};
+export type WorkPublishFlagValues = {
+    'full-metadata'?: string;
+    permissions?: string;
+    'skip-nested-metadata-detection'?: boolean;
+};
+export type WorkPublishHost = {
+    config: {
+        bin: string;
+    };
+    display(render: () => void): void;
+    error(input: Error | string, options?: {
+        exit?: false | number;
+        suggestions?: string[];
+    }): never;
+    log(message?: string, ...args: string[]): void;
+    logElapsed(startedAtMs: number): void;
+    withSpinner<T>(message: string, action: () => Promise<T>): Promise<T>;
+};
+export declare function runWorkPublish(command: WorkPublishHost, flags: WorkPublishFlagValues): Promise<WorkPushResult>;

package/dist/lib/work-publish-command.js

@@ -0,0 +1,88 @@
+import { Flags } from '@oclif/core';
+import { listPendingChanges } from './git-worktree.js';
+import { performWorkPush, resolveWorkPushContext, WorkPushValidationError } from './work-push.js';
+export const WORK_PUBLISH_DESCRIPTION = [
+    'Publish the current feature/<lastWorkItem> branch and register commits with Copado.',
+    'Requires a clean working tree, base branch, and dev org branch from `.agentia/config.user.json`.',
+    'Fetches origin/<lastBaseBranch>, then registers only commits in origin/<lastBaseBranch>..HEAD and diffs nested parent XML at merge-base(origin/<lastBaseBranch>, HEAD) versus HEAD, so origin/base-only history is ignored.',
+    'When there are no commits since origin/<lastBaseBranch>, or origin already has HEAD, fails with "No changes to publish" unless `--permissions` and/or `--full-metadata` is set, in which case it creates an empty commit so a tip commit id exists.',
+    'Applies Copado environment-variable then yaml replacements when needed, commits both as a single follow-up commit, locks the tip commit, runs `git push origin <branch>`,',
+    'reports the nested metadata changed across the branch, such as the CustomField behind a profile field-permission edit, plus the parent components it would ignore,',
+    'calls headless work/push with one changeListUpdate list of Action:MetadataType:MetadataName corrections: lastPermissionSelected and --permissions plus the nested metadata of the changed profiles and permission sets as RetrieveOnly, lastFullMetadataSelected and --full-metadata plus brand-new nested parent files as fullMetadata, the ignored parents as unchanged, the nested metadata deleted on the branch as Del, and the remaining nested metadata as Add, then merges the feature branch into the recorded dev org branch.',
+    'The changed profiles and permission sets themselves are never sent as corrections, so they stay in the change list and deploy only the permissions their RetrieveOnly entries select. Brand-new nested parent files are an exception: they are sent as fullMetadata so the complete file travels.',
+    '`cicd work push` is a compatibility alias of this command.',
+].join(' ');
+export const workPublishFlags = {
+    'full-metadata': Flags.string({
+        description: 'Comma-separated type-prefixed metadata such as Profile:Sales_User,PermissionSet:Sales_Onboarding, added for this publish and sent as headless push fullMetadata corrections. The named metadata is committed as a complete file, so it is never decomposed into nested metadata. Not stored.',
+    }),
+    permissions: Flags.string({
+        description: 'Comma-separated type-prefixed metadata such as CustomField:Account.SLA__c,ApexClass:AccountService, added for this publish and sent as headless push RetrieveOnly corrections. Not stored.',
+    }),
+    'skip-nested-metadata-detection': Flags.boolean({
+        default: false,
+        description: 'Do not detect the nested metadata changed across the branch (also configurable via skipNestedMetadataDetection in .agentia/config.json or .agentia/config.user.json)',
+    }),
+};
+export async function runWorkPublish(command, flags) {
+    const startedAt = Date.now();
+    let context;
+    try {
+        context = await resolveWorkPushContext();
+    }
+    catch (error) {
+        if (error instanceof WorkPushValidationError) {
+            command.error(error.message, {
+                exit: error.exit,
+                suggestions: error.suggestions,
+            });
+        }
+        throw error;
+    }
+    const { baseBranch, branch, devOrgBranch, workItem, workItemId } = context;
+    const pendingFiles = await listPendingChanges();
+    if (pendingFiles.length > 0) {
+        command.error([
+            'Uncommitted tracked changes present. Commit them, then try again:',
+            ...pendingFiles.map((file) => `  ${file}`),
+        ].join('\n'), {
+            exit: 2,
+            suggestions: ['git add -A && git commit', `${command.config.bin} cicd work publish`],
+        });
+    }
+    command.display(() => {
+        command.log(`Branch: ${branch}`);
+        command.log(`Work item: ${workItem}`);
+        command.log(`Base branch: ${baseBranch}`);
+        command.log(`Dev org branch: ${devOrgBranch}`);
+    });
+    try {
+        const result = await performWorkPush({
+            baseBranch,
+            branch,
+            devOrgBranch,
+            ...(flags['full-metadata'] === undefined ? {} : { fullMetadata: flags['full-metadata'] }),
+            hooks: {
+                display: (render) => command.display(render),
+                log: (message) => command.log(message),
+                withSpinner: (message, action) => command.withSpinner(message, action),
+            },
+            ...(flags.permissions === undefined ? {} : { permissions: flags.permissions }),
+            skipNestedMetadataDetection: flags['skip-nested-metadata-detection'],
+            workItem,
+            workItemId,
+        });
+        command.logElapsed(startedAt);
+        return result;
+    }
+    catch (error) {
+        if (error instanceof WorkPushValidationError) {
+            command.error(error.message, {
+                exit: error.exit,
+                suggestions: error.suggestions,
+            });
+        }
+        throw error;
+    }
+}
+//# sourceMappingURL=work-publish-command.js.map

package/dist/lib/work-publish-command.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"work-publish-command.js","sourceRoot":"","sources":["../../src/lib/work-publish-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,EAAC,MAAM,aAAa,CAAA;AAEjC,OAAO,EAAC,kBAAkB,EAAC,MAAM,mBAAmB,CAAA;AACpD,OAAO,EAAC,eAAe,EAAE,sBAAsB,EAAE,uBAAuB,EAAC,MAAM,gBAAgB,CAAA;AAG/F,MAAM,CAAC,MAAM,wBAAwB,GAAG;IACtC,qFAAqF;IACrF,kGAAkG;IAClG,6NAA6N;IAC7N,qPAAqP;IACrP,2KAA2K;IAC3K,oKAAoK;IACpK,ygBAAygB;IACzgB,mSAAmS;IACnS,4DAA4D;CAC7D,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAEX,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,eAAe,EAAE,KAAK,CAAC,MAAM,CAAC;QAC5B,WAAW,EACT,8RAA8R;KACjS,CAAC;IACF,WAAW,EAAE,KAAK,CAAC,MAAM,CAAC;QACxB,WAAW,EACT,4LAA4L;KAC/L,CAAC;IACF,gCAAgC,EAAE,KAAK,CAAC,OAAO,CAAC;QAC9C,OAAO,EAAE,KAAK;QACd,WAAW,EACT,sKAAsK;KACzK,CAAC;CACM,CAAA;AAiBV,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,OAAwB,EACxB,KAA4B;IAE5B,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;IAE5B,IAAI,OAAO,CAAA;IACX,IAAI,CAAC;QACH,OAAO,GAAG,MAAM,sBAAsB,EAAE,CAAA;IAC1C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,KAAK,YAAY,uBAAuB,EAAE,CAAC;YAC7C,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE;gBAC3B,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,WAAW,EAAE,KAAK,CAAC,WAAW;aAC/B,CAAC,CAAA;QACJ,CAAC;QAED,MAAM,KAAK,CAAA;IACb,CAAC;IAED,MAAM,EAAC,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,UAAU,EAAC,GAAG,OAAO,CAAA;IAExE,MAAM,YAAY,GAAG,MAAM,kBAAkB,EAAE,CAAA;IAC/C,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC5B,OAAO,CAAC,KAAK,CACX;YACE,mEAAmE;YACnE,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC;SAC3C,CAAC,IAAI,CAAC,IAAI,CAAC,EACZ;YACE,IAAI,EAAE,CAAC;YACP,WAAW,EAAE,CAAC,0BAA0B,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,oBAAoB,CAAC;SACrF,CACF,CAAA;IACH,CAAC;IAED,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE;QACnB,OAAO,CAAC,GAAG,CAAC,WAAW,MAAM,EAAE,CAAC,CAAA;QAChC,OAAO,CAAC,GAAG,CAAC,cAAc,QAAQ,EAAE,CAAC,CAAA;QACrC,OAAO,CAAC,GAAG,CAAC,gBAAgB,UAAU,EAAE,CAAC,CAAA;QACzC,OAAO,CAAC,GAAG,CAAC,mBAAmB,YAAY,EAAE,CAAC,CAAA;IAChD,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC;YACnC,UAAU;YACV,MAAM;YACN,YAAY;YACZ,GAAG,CAAC,KAAK,CAAC,eAAe,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAC,YAAY,EAAE,KAAK,CAAC,eAAe,CAAC,EAAC,CAAC;YACvF,KAAK,EAAE;gBACL,OAAO,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC;gBAC5C,GAAG,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC;gBACtC,WAAW,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC;aACvE;YACD,GAAG,CAAC,KAAK,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAC,WAAW,EAAE,KAAK,CAAC,WAAW,EAAC,CAAC;YAC5E,2BAA2B,EAAE,KAAK,CAAC,gCAAgC,CAAC;YACpE,QAAQ;YACR,UAAU;SACX,CAAC,CAAA;QACF,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,CAAA;QAC7B,OAAO,MAAM,CAAA;IACf,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,KAAK,YAAY,uBAAuB,EAAE,CAAC;YAC7C,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE;gBAC3B,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,WAAW,EAAE,KAAK,CAAC,WAAW;aAC/B,CAAC,CAAA;QACJ,CAAC;QAED,MAAM,KAAK,CAAA;IACb,CAAC;AACH,CAAC"}

package/dist/lib/work-push.d.ts

@@ -35,11 +35,12 @@ export type WorkPushNeed = {
  * Decide whether done/submit should push.
  *
  * Salesforce Data Set / Data Template steps only waive the empty-history error.
- * When HEAD has commits beyond the base branch, those steps must not skip push
- * or any other git validation.
+ * When HEAD has commits beyond origin/<lastBaseBranch>, those steps must not skip
+ * push or any other git validation. The local base ref is ignored: a stale local
+ * main must not count origin/base history as feature work.
  */
 export declare function resolveWorkPushNeed(branch: string): Promise<WorkPushNeed>;
-/** Resolve lastWorkItem / branch / lastBaseBranch / lastDevOrgBranch for work push. */
+/** Resolve lastWorkItem / branch / lastBaseBranch / lastDevOrgBranch for work publish. */
 export declare function resolveWorkPushContext(): Promise<ResolvedWorkPushContext>;
 export type SleepFn = (ms: number) => Promise<void>;
 export declare function setSleepForTests(nextSleep: SleepFn): void;
@@ -56,8 +57,8 @@ export declare function readWorkPushRetrieveOnly(): Promise<string[]>;
 /** Metadata recorded by `cicd work commit --full-metadata`, pushed as `fullMetadata` corrections. */
 export declare function readWorkPushFullMetadata(): Promise<string[]>;
 /**
- * Selections recorded at commit time plus the ones passed to this push, in that order and without
- * duplicates. `cicd work push` never stores its own flag values, so a flag adds to the recorded
+ * Selections recorded at commit time plus the ones passed to this publish, in that order and without
+ * duplicates. `cicd work publish` never stores its own flag values, so a flag adds to the recorded
  * selection for the current invocation only.
  */
 export declare function mergeWorkPushSelections(storedSelections: readonly string[], requestedSelections: readonly string[]): string[];

package/dist/lib/work-push.js

@@ -1,7 +1,7 @@
 import { CicdGateway, CicdGatewayError } from './cicd-gateway.js';
 import { DEFAULT_WORK_PUSH_RETRY_TIMEOUT_SECONDS, readLastBaseBranch, readLastDevOrgBranch, readLastFullMetadataSelected, readLastPermissionSelected, readLastWorkItem, readSkipNestedMetadataDetection, readWorkPushRetryTimeoutSeconds, } from './defaults-store.js';
 import { hasSalesforceDataDeploymentStep, normalizeDeploymentSteps, userStoryDeploymentStepsEndpoint, } from './deployment-step-types.js';
-import { checkoutBranch, commitAllowEmpty, commitAllTrackedChanges, countCommitsSince, getCommitsNameStatus, getCurrentBranch, getFileAtRef, getGitRepoRoot, getMergeBase, hasUnpushedCommits, listPendingChanges, mergeTheirsIgnoreSpaceChange, pullOriginBranch, pushOriginBranch, restoreFeatureBranch, } from './git-worktree.js';
+import { checkoutBranch, commitAllowEmpty, commitAllTrackedChanges, countCommitsSince, fetchOriginBranch, getCommitsNameStatus, getCurrentBranch, getFileAtRef, getGitRepoRoot, getMergeBase, hasUnpushedCommits, listPendingChanges, mergeTheirsIgnoreSpaceChange, originBranchRef, pullOriginBranch, pushOriginBranch, restoreFeatureBranch, } from './git-worktree.js';
 import { detectNestedMetadataChanges, formatNestedMetadataSelection, listDeletableNestedChildren, listNestedParentCandidates, } from './nested-metadata-changes.js';
 import { buildVarReplacementEntries, runVarReplacement } from './var-replacement.js';
 import { resolveWorkItemId, WorkActiveResolutionError } from './work-active.js';
@@ -41,16 +41,23 @@ export async function resolveRecordedBaseBranch() {
     }
     return baseBranch;
 }
+/** Fetch `origin/<baseBranch>` and return that remote-tracking ref. */
+async function fetchOriginBaseRef(baseBranch) {
+    await fetchOriginBranch(baseBranch);
+    return originBranchRef(baseBranch);
+}
 /**
  * Decide whether done/submit should push.
  *
  * Salesforce Data Set / Data Template steps only waive the empty-history error.
- * When HEAD has commits beyond the base branch, those steps must not skip push
- * or any other git validation.
+ * When HEAD has commits beyond origin/<lastBaseBranch>, those steps must not skip
+ * push or any other git validation. The local base ref is ignored: a stale local
+ * main must not count origin/base history as feature work.
  */
 export async function resolveWorkPushNeed(branch) {
     const baseBranch = await resolveRecordedBaseBranch();
-    const count = await countCommitsSince(baseBranch);
+    const originBase = await fetchOriginBaseRef(baseBranch);
+    const count = await countCommitsSince(originBase);
     if (count > 0) {
         return {
             needsPush: await hasUnpushedCommits(branch),
@@ -74,18 +81,18 @@ export async function resolveWorkPushNeed(branch) {
     if (hasSalesforceDataDeploymentStep(steps)) {
         return { needsPush: false, skippedForDataSteps: true };
     }
-    throw new WorkPushValidationError(`No commits found between ${baseBranch} and HEAD.`, {
+    throw new WorkPushValidationError(`No commits found between ${originBase} and HEAD.`, {
         exit: 1,
         suggestions: ['Make at least one commit on the feature branch.'],
     });
 }
-/** Resolve lastWorkItem / branch / lastBaseBranch / lastDevOrgBranch for work push. */
+/** Resolve lastWorkItem / branch / lastBaseBranch / lastDevOrgBranch for work publish. */
 export async function resolveWorkPushContext() {
     const { branch, workItem } = await resolveActiveFeatureWorkItem();
     const baseBranch = await resolveRecordedBaseBranch();
     const devOrgBranch = (await readLastDevOrgBranch())?.trim();
     if (devOrgBranch === undefined || devOrgBranch.length === 0) {
-        throw new WorkPushValidationError('No lastDevOrgBranch recorded in `.agentia/config.user.json`. Set it before pushing.');
+        throw new WorkPushValidationError('No lastDevOrgBranch recorded in `.agentia/config.user.json`. Set it before publishing.');
     }
     let workItemId;
     try {
@@ -176,7 +183,7 @@ export async function registerHeadlessPush(pushBody, hooks, timeoutSeconds = DEF
             }
             const delaySeconds = resolveWorkPushRetryDelaySeconds(retryAfterSeconds, waitedSeconds);
             if (waitedSeconds + delaySeconds > timeoutSeconds) {
-                throw new CicdGatewayError(`CICD Gateway rate limited the work push request and the retry timeout of ${timeoutSeconds}s was exceeded.`, {
+                throw new CicdGatewayError(`CICD Gateway rate limited the work publish request and the retry timeout of ${timeoutSeconds}s was exceeded.`, {
                     categories: error.categories,
                     code: error.code,
                     jobId: error.jobId,
@@ -190,9 +197,9 @@ export async function registerHeadlessPush(pushBody, hooks, timeoutSeconds = DEF
             }
             hooks.display(() => {
                 hooks.log(error.jobId === undefined
-                    ? `Rate limited (429). Retrying work push in ${delaySeconds}s` +
+                    ? `Rate limited (429). Retrying work publish in ${delaySeconds}s` +
                         ` (${waitedSeconds + delaySeconds}s / ${timeoutSeconds}s waited).`
-                    : `waiting for job id ${error.jobId}, Retrying work push in ${delaySeconds}s` +
+                    : `waiting for job id ${error.jobId}, Retrying work publish in ${delaySeconds}s` +
                         ` (${waitedSeconds + delaySeconds}s / ${timeoutSeconds}s waited).`);
             });
             // eslint-disable-next-line no-await-in-loop -- wait before the next retry
@@ -212,8 +219,8 @@ export async function readWorkPushFullMetadata() {
     return stored === undefined ? [] : parseCommaSeparatedList(stored);
 }
 /**
- * Selections recorded at commit time plus the ones passed to this push, in that order and without
- * duplicates. `cicd work push` never stores its own flag values, so a flag adds to the recorded
+ * Selections recorded at commit time plus the ones passed to this publish, in that order and without
+ * duplicates. `cicd work publish` never stores its own flag values, so a flag adds to the recorded
  * selection for the current invocation only.
  */
 export function mergeWorkPushSelections(storedSelections, requestedSelections) {
@@ -364,7 +371,7 @@ async function applyCopadoReplacements(options) {
 export const SKIP_NESTED_METADATA_DETECTION_CONFIG_MESSAGE = 'Nested metadata detection skipped (skipNestedMetadataDetection in .agentia/config.json or .agentia/config.user.json).';
 export const SKIP_NESTED_METADATA_DETECTION_REQUEST_MESSAGE = 'Nested metadata detection skipped by request.';
 /**
- * Nested metadata changed across every commit not in the base branch: the parent components whose
+ * Nested metadata changed across every commit not in origin/<base>: the parent components whose
  * XML changed only in nested blocks, and the child components carrying the real change.
  *
  * Children of a Profile or PermissionSet parent are sent as `RetrieveOnly` and the parent itself is
@@ -469,23 +476,24 @@ function logSelectionEntries(log, header, entries) {
 export async function performWorkPush(options) {
     const { baseBranch, branch, devOrgBranch, hooks, workItem } = options;
     const { display, log, withSpinner } = hooks;
-    let logStdout = await withSpinner(`Collecting commits since ${baseBranch}`, () => getCommitsNameStatus(baseBranch));
+    const originBase = await withSpinner(`Fetching origin/${baseBranch}`, () => fetchOriginBaseRef(baseBranch));
+    let logStdout = await withSpinner(`Collecting commits since origin/${baseBranch}`, () => getCommitsNameStatus(originBase));
     let commits = parseNameStatusLog(logStdout, workItem);
     const hasSelectionFlags = options.fullMetadata !== undefined || options.permissions !== undefined;
     const needsEmptyCommit = commits.length === 0 || !(await hasUnpushedCommits(branch));
     if (needsEmptyCommit) {
         if (!hasSelectionFlags) {
-            throw new WorkPushValidationError('No changes to push.', {
+            throw new WorkPushValidationError('No changes to publish.', {
                 exit: 1,
                 suggestions: [
-                    'Make at least one commit on the feature branch before pushing.',
-                    'Or pass --permissions and/or --full-metadata to push selection corrections with an empty commit.',
+                    'Make at least one commit on the feature branch before publishing.',
+                    'Or pass --permissions and/or --full-metadata to publish selection corrections with an empty commit.',
                 ],
             });
         }
-        const emptyCommitMessage = `${workItem}: empty commit for work push selections`;
-        await withSpinner('Creating empty commit for selection push', () => commitAllowEmpty(emptyCommitMessage));
-        logStdout = await withSpinner(`Collecting commits since ${baseBranch}`, () => getCommitsNameStatus(baseBranch));
+        const emptyCommitMessage = `${workItem}: empty commit for work publish selections`;
+        await withSpinner('Creating empty commit for selection publish', () => commitAllowEmpty(emptyCommitMessage));
+        logStdout = await withSpinner(`Collecting commits since origin/${baseBranch}`, () => getCommitsNameStatus(originBase));
         commits = parseNameStatusLog(logStdout, workItem);
         if (commits.length === 0) {
             throw new WorkPushValidationError('Unable to determine tip commit id after empty commit.', {
@@ -512,7 +520,7 @@ export async function performWorkPush(options) {
     let tipCommitToLock = tipCommitId;
     try {
         const replacementResult = await applyCopadoReplacements({
-            baseBranch,
+            baseBranch: originBase,
             changedFiles,
             commits,
             devOrgBranch,
@@ -530,7 +538,7 @@ export async function performWorkPush(options) {
         const selectedPermissions = mergeWorkPushSelections(storedRetrieveOnly, options.permissions === undefined ? [] : parseCommaSeparatedList(options.permissions));
         const selectedFullMetadata = mergeWorkPushSelections(storedFullMetadata, options.fullMetadata === undefined ? [] : parseCommaSeparatedList(options.fullMetadata));
         const nestedMetadata = await reportNestedMetadataChanges({
-            baseBranch,
+            baseBranch: originBase,
             commits: commitsToRegister,
             fullMetadata: selectedFullMetadata,
             hooks: { display, log, withSpinner },