@copado/agentia-cli 0.71.0-alpha.0 → 0.72.0-alpha.0

package/dist/lib/var-replacement.js

@@ -0,0 +1,150 @@
+import { spawn } from 'node:child_process';
+import { access, mkdtemp, rm, writeFile } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import { dirname, join, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { logVerboseDebug } from './debug.js';
+const packageRoot = resolve(dirname(fileURLToPath(import.meta.url)), '../..');
+export const VAR_REPLACE_COMMAND_JAR_NAME = 'var-replace-command.jar';
+function defaultRunProcess(command, args, options) {
+    return new Promise((resolvePromise, reject) => {
+        const child = spawn(command, args, {
+            cwd: options.cwd,
+            env: process.env,
+        });
+        let stdout = '';
+        let stderr = '';
+        child.stdout.on('data', (chunk) => {
+            stdout += String(chunk);
+        });
+        child.stderr.on('data', (chunk) => {
+            stderr += String(chunk);
+        });
+        child.on('error', (error) => {
+            reject(error);
+        });
+        child.on('close', (code) => {
+            resolvePromise({ exitCode: code, stderr, stdout });
+        });
+    });
+}
+export function resolveVarReplaceCommandJar() {
+    const override = process.env.AGENTIA_VAR_REPLACE_COMMAND_JAR?.trim();
+    if (override !== undefined && override.length > 0) {
+        return override;
+    }
+    return join(packageRoot, 'vendor/java', VAR_REPLACE_COMMAND_JAR_NAME);
+}
+export function resolveVarReplacementJavaCommand() {
+    const override = process.env.AGENTIA_JAVA?.trim();
+    return override !== undefined && override.length > 0 ? override : 'java';
+}
+export function formatVarReplacementCommand(command, args) {
+    return [command, ...args].join(' ');
+}
+/** JSON path list consumed by var-replace-command `-c` / `--include`. */
+export function buildFilesInScopeJson(changedFiles) {
+    return `${JSON.stringify(changedFiles, null, 0)}\n`;
+}
+/** JSON consumed by var-replace-command `<replacements>`. */
+export function buildVarReplacementEntries(variables) {
+    const entries = [];
+    for (const variable of variables) {
+        const name = variable.name?.trim();
+        if (name === undefined || name.length === 0 || typeof variable.value !== 'string') {
+            continue;
+        }
+        const scope = variable.scope?.trim();
+        entries.push({
+            name,
+            scope: scope !== undefined && scope.length > 0 ? scope : '*',
+            value: variable.value,
+        });
+    }
+    return entries;
+}
+export function buildVarReplacementsJson(variables) {
+    return `${JSON.stringify(buildVarReplacementEntries(variables))}\n`;
+}
+function redactVarReplacementsForDebug(variables) {
+    return JSON.stringify(buildVarReplacementEntries(variables).map((entry) => ({
+        name: entry.name,
+        scope: entry.scope,
+        value: '[redacted]',
+    })), null, 2);
+}
+function logVarReplacementVerboseInput(options) {
+    logVerboseDebug('Var replacement command', formatVarReplacementCommand(options.command, options.args));
+    logVerboseDebug('Var replacement rules', redactVarReplacementsForDebug(options.environmentVariables));
+    logVerboseDebug('Var replacement files in scope', options.changedFiles.length > 0 ? options.changedFiles.join('\n') : '(empty)');
+}
+/** Emit var-replace-command process streams for normal CLI output. */
+export function emitVarReplacementProcessOutput(result) {
+    for (const stream of [result.stdout, result.stderr]) {
+        const trimmed = stream.trimEnd();
+        if (trimmed.length > 0) {
+            process.stderr.write(`${trimmed}\n`);
+        }
+    }
+}
+export async function runVarReplacement(options) {
+    const jarPath = resolveVarReplaceCommandJar();
+    try {
+        await access(jarPath);
+    }
+    catch {
+        throw new Error(`Variable replacement JAR not found at ${jarPath}. Run \`npm run build-java-dependencies\` or set AGENTIA_VAR_REPLACE_COMMAND_JAR.`);
+    }
+    const tempDir = await mkdtemp(join(tmpdir(), 'agentia-var-replace-'));
+    const replacementsPath = join(tempDir, 'replacements.json');
+    const includePath = join(tempDir, 'files-in-scope.json');
+    try {
+        await writeFile(replacementsPath, buildVarReplacementsJson(options.environmentVariables), 'utf8');
+        await writeFile(includePath, buildFilesInScopeJson(options.changedFiles), 'utf8');
+        const javaCommand = resolveVarReplacementJavaCommand();
+        // `-v` replaces environment values with `{!Environment.NAME}` placeholders (commit direction).
+        // `-d` allows the same variable name to appear for multiple environments.
+        const args = [
+            '-jar',
+            jarPath,
+            replacementsPath,
+            options.targetFolder,
+            '-v',
+            '-d',
+            '-c',
+            includePath,
+        ];
+        logVarReplacementVerboseInput({
+            args,
+            changedFiles: options.changedFiles,
+            command: javaCommand,
+            environmentVariables: options.environmentVariables,
+        });
+        const runProcess = options.runProcess ?? varReplacementProcessForTests() ?? defaultRunProcess;
+        const result = await runProcess(javaCommand, args, { cwd: options.cwd });
+        emitVarReplacementProcessOutput(result);
+        return {
+            args,
+            command: javaCommand,
+            exitCode: result.exitCode,
+            stderr: result.stderr,
+            stdout: result.stdout,
+        };
+    }
+    finally {
+        await rm(tempDir, { force: true, recursive: true });
+    }
+}
+let runProcessForTests;
+/** Test-only hook */
+export function setVarReplacementProcessForTests(runner) {
+    runProcessForTests = runner;
+}
+/** Test-only hook */
+export function resetVarReplacementProcessForTests() {
+    runProcessForTests = undefined;
+}
+export function varReplacementProcessForTests() {
+    return runProcessForTests;
+}
+//# sourceMappingURL=var-replacement.js.map

package/dist/lib/var-replacement.js.map

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

package/dist/lib/work-get-selection.d.ts

@@ -0,0 +1,6 @@
+import type { WorkGetResponse } from './work-types.js';
+/**
+ * When headless work/get returns `devOrgBranch` for the active work item,
+ * persist it (and refresh base/PR URLs when present) into config.user.json.
+ */
+export declare function persistActiveDevOrgBranchFromGet(getResponse: WorkGetResponse): Promise<void>;

package/dist/lib/work-get-selection.js

@@ -0,0 +1,44 @@
+import { readLastBaseBranch, readLastPullRequestBaseUrl, readLastWorkItem, readLastWorkItemId, writeLastWorkSelection, } from './defaults-store.js';
+function nonEmpty(value) {
+    const trimmed = value?.trim();
+    return trimmed !== undefined && trimmed.length > 0 ? trimmed : undefined;
+}
+function isActiveWorkItem(responseId, responseName, lastWorkItemId, lastWorkItem) {
+    if (responseId !== undefined && lastWorkItemId !== undefined && responseId === lastWorkItemId) {
+        return true;
+    }
+    return (responseName !== undefined &&
+        lastWorkItem !== undefined &&
+        responseName.toUpperCase() === lastWorkItem.toUpperCase());
+}
+/**
+ * When headless work/get returns `devOrgBranch` for the active work item,
+ * persist it (and refresh base/PR URLs when present) into config.user.json.
+ */
+export async function persistActiveDevOrgBranchFromGet(getResponse) {
+    const devOrgBranch = nonEmpty(getResponse.devOrgBranch);
+    if (devOrgBranch === undefined) {
+        return;
+    }
+    const lastWorkItemId = nonEmpty(await readLastWorkItemId());
+    const lastWorkItem = nonEmpty(await readLastWorkItem());
+    if (lastWorkItem === undefined || lastWorkItemId === undefined) {
+        return;
+    }
+    if (!isActiveWorkItem(nonEmpty(getResponse.workItem.id), nonEmpty(getResponse.workItem.name), lastWorkItemId, lastWorkItem)) {
+        return;
+    }
+    const baseBranch = nonEmpty(getResponse.baseBranch) ?? nonEmpty(await readLastBaseBranch());
+    if (baseBranch === undefined) {
+        return;
+    }
+    const pullRequestBaseUrl = nonEmpty(getResponse.pullRequestBaseUrl) ?? nonEmpty(await readLastPullRequestBaseUrl());
+    await writeLastWorkSelection({
+        lastBaseBranch: baseBranch,
+        lastDevOrgBranch: devOrgBranch,
+        ...(pullRequestBaseUrl === undefined ? {} : { lastPullRequestBaseUrl: pullRequestBaseUrl }),
+        lastWorkItem,
+        lastWorkItemId,
+    });
+}
+//# sourceMappingURL=work-get-selection.js.map

package/dist/lib/work-get-selection.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"work-get-selection.js","sourceRoot":"","sources":["../../src/lib/work-get-selection.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,kBAAkB,EAClB,0BAA0B,EAC1B,gBAAgB,EAChB,kBAAkB,EAClB,sBAAsB,GACvB,MAAM,qBAAqB,CAAA;AAE5B,SAAS,QAAQ,CAAC,KAAgC;IAChD,MAAM,OAAO,GAAG,KAAK,EAAE,IAAI,EAAE,CAAA;IAC7B,OAAO,OAAO,KAAK,SAAS,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAA;AAC1E,CAAC;AAED,SAAS,gBAAgB,CACvB,UAA8B,EAC9B,YAAgC,EAChC,cAAkC,EAClC,YAAgC;IAEhC,IAAI,UAAU,KAAK,SAAS,IAAI,cAAc,KAAK,SAAS,IAAI,UAAU,KAAK,cAAc,EAAE,CAAC;QAC9F,OAAO,IAAI,CAAA;IACb,CAAC;IAED,OAAO,CACL,YAAY,KAAK,SAAS;QAC1B,YAAY,KAAK,SAAS;QAC1B,YAAY,CAAC,WAAW,EAAE,KAAK,YAAY,CAAC,WAAW,EAAE,CAC1D,CAAA;AACH,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,gCAAgC,CACpD,WAA4B;IAE5B,MAAM,YAAY,GAAG,QAAQ,CAAC,WAAW,CAAC,YAAY,CAAC,CAAA;IACvD,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;QAC/B,OAAM;IACR,CAAC;IAED,MAAM,cAAc,GAAG,QAAQ,CAAC,MAAM,kBAAkB,EAAE,CAAC,CAAA;IAC3D,MAAM,YAAY,GAAG,QAAQ,CAAC,MAAM,gBAAgB,EAAE,CAAC,CAAA;IACvD,IAAI,YAAY,KAAK,SAAS,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;QAC/D,OAAM;IACR,CAAC;IAED,IACE,CAAC,gBAAgB,CACf,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,CAAC,EACjC,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,EACnC,cAAc,EACd,YAAY,CACb,EACD,CAAC;QACD,OAAM;IACR,CAAC;IAED,MAAM,UAAU,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,IAAI,QAAQ,CAAC,MAAM,kBAAkB,EAAE,CAAC,CAAA;IAC3F,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;QAC7B,OAAM;IACR,CAAC;IAED,MAAM,kBAAkB,GACtB,QAAQ,CAAC,WAAW,CAAC,kBAAkB,CAAC,IAAI,QAAQ,CAAC,MAAM,0BAA0B,EAAE,CAAC,CAAA;IAE1F,MAAM,sBAAsB,CAAC;QAC3B,cAAc,EAAE,UAAU;QAC1B,gBAAgB,EAAE,YAAY;QAC9B,GAAG,CAAC,kBAAkB,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAC,sBAAsB,EAAE,kBAAkB,EAAC,CAAC;QACzF,YAAY;QACZ,cAAc;KACf,CAAC,CAAA;AACJ,CAAC"}

package/dist/lib/work-local-run-tests.d.ts

@@ -2,6 +2,7 @@ import { type LocalQualityGatesError, type LocalQualityGatesRunResult } from './
 import { type LocalRunTestsStatus } from './work-types.js';
 export type ReportLocalRunTestsOptions = {
     logs?: string;
+    onLog?: (message: string) => void;
     onWarning?: (message: string) => void;
     status: LocalRunTestsStatus;
     workItem: string;
@@ -10,6 +11,7 @@ export type ReportLocalRunTestsOptions = {
 export declare function reportLocalRunTests(options: ReportLocalRunTestsOptions): Promise<void>;
 /** Reports success or skipped when local quality gates were available; no-ops otherwise. */
 export declare function reportLocalQualityGatesOutcome(options: {
+    onLog?: (message: string) => void;
     onWarning?: (message: string) => void;
     qualityGates: LocalQualityGatesRunResult;
     workItem: string;
@@ -17,6 +19,7 @@ export declare function reportLocalQualityGatesOutcome(options: {
 /** Reports failure for a local quality-gates script error. */
 export declare function reportLocalQualityGatesFailure(options: {
     error: LocalQualityGatesError;
+    onLog?: (message: string) => void;
     onWarning?: (message: string) => void;
     workItem: string;
 }): Promise<void>;

package/dist/lib/work-local-run-tests.js

@@ -10,6 +10,7 @@ export async function reportLocalRunTests(options) {
     if (options.logs !== undefined && options.logs.length > 0) {
         body.logs = options.logs;
     }
+    options.onLog?.('Uploading local quality gates results...');
     try {
         await CicdGateway.call({
             body,
@@ -19,6 +20,7 @@ export async function reportLocalRunTests(options) {
             },
             method: 'POST',
         });
+        options.onLog?.('Done.');
     }
     catch (error) {
         const message = error instanceof Error ? error.message : String(error);
@@ -30,6 +32,7 @@ export async function reportLocalQualityGatesOutcome(options) {
     if (options.qualityGates.ran) {
         await reportLocalRunTests({
             logs: options.qualityGates.output,
+            onLog: options.onLog,
             onWarning: options.onWarning,
             status: 'success',
             workItem: options.workItem,
@@ -38,6 +41,7 @@ export async function reportLocalQualityGatesOutcome(options) {
     }
     if (options.qualityGates.skipped) {
         await reportLocalRunTests({
+            onLog: options.onLog,
             onWarning: options.onWarning,
             status: 'skipped',
             workItem: options.workItem,
@@ -48,6 +52,7 @@ export async function reportLocalQualityGatesOutcome(options) {
 export async function reportLocalQualityGatesFailure(options) {
     await reportLocalRunTests({
         logs: options.error.output,
+        onLog: options.onLog,
         onWarning: options.onWarning,
         status: 'failure',
         workItem: options.workItem,

package/dist/lib/work-local-run-tests.js.map

@@ -1 +1 @@
-{"version":3,"file":"work-local-run-tests.js","sourceRoot":"","sources":["../../src/lib/work-local-run-tests.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAE7C,OAAO,EAIL,yBAAyB,GAC1B,MAAM,iBAAiB,CAAA;AASxB,+GAA+G;AAC/G,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,OAAmC;IAC3E,MAAM,IAAI,GAAiC;QACzC,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,QAAQ,EAAE,OAAO,CAAC,QAAQ;KAC3B,CAAA;IACD,mFAAmF;IACnF,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC1D,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAA;IAC1B,CAAC;IAED,IAAI,CAAC;QACH,MAAM,WAAW,CAAC,IAAI,CAAwB;YAC5C,IAAI;YACJ,QAAQ,EAAE,yBAAyB,EAAE;YACrC,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;aACnC;YACD,MAAM,EAAE,MAAM;SACf,CAAC,CAAA;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QACtE,OAAO,CAAC,SAAS,EAAE,CAAC,gDAAgD,OAAO,CAAC,MAAM,MAAM,OAAO,EAAE,CAAC,CAAA;IACpG,CAAC;AACH,CAAC;AAED,4FAA4F;AAC5F,MAAM,CAAC,KAAK,UAAU,8BAA8B,CAAC,OAIpD;IACC,IAAI,OAAO,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC;QAC7B,MAAM,mBAAmB,CAAC;YACxB,IAAI,EAAE,OAAO,CAAC,YAAY,CAAC,MAAM;YACjC,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,MAAM,EAAE,SAAS;YACjB,QAAQ,EAAE,OAAO,CAAC,QAAQ;SAC3B,CAAC,CAAA;QACF,OAAM;IACR,CAAC;IAED,IAAI,OAAO,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;QACjC,MAAM,mBAAmB,CAAC;YACxB,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,MAAM,EAAE,SAAS;YACjB,QAAQ,EAAE,OAAO,CAAC,QAAQ;SAC3B,CAAC,CAAA;IACJ,CAAC;AACH,CAAC;AAED,8DAA8D;AAC9D,MAAM,CAAC,KAAK,UAAU,8BAA8B,CAAC,OAIpD;IACC,MAAM,mBAAmB,CAAC;QACxB,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC,MAAM;QAC1B,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,MAAM,EAAE,SAAS;QACjB,QAAQ,EAAE,OAAO,CAAC,QAAQ;KAC3B,CAAC,CAAA;AACJ,CAAC"}
+{"version":3,"file":"work-local-run-tests.js","sourceRoot":"","sources":["../../src/lib/work-local-run-tests.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAE7C,OAAO,EAIL,yBAAyB,GAC1B,MAAM,iBAAiB,CAAA;AAUxB,+GAA+G;AAC/G,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,OAAmC;IAC3E,MAAM,IAAI,GAAiC;QACzC,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,QAAQ,EAAE,OAAO,CAAC,QAAQ;KAC3B,CAAA;IACD,mFAAmF;IACnF,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC1D,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAA;IAC1B,CAAC;IAED,OAAO,CAAC,KAAK,EAAE,CAAC,0CAA0C,CAAC,CAAA;IAC3D,IAAI,CAAC;QACH,MAAM,WAAW,CAAC,IAAI,CAAwB;YAC5C,IAAI;YACJ,QAAQ,EAAE,yBAAyB,EAAE;YACrC,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;aACnC;YACD,MAAM,EAAE,MAAM;SACf,CAAC,CAAA;QACF,OAAO,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC,CAAA;IAC1B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QACtE,OAAO,CAAC,SAAS,EAAE,CAAC,gDAAgD,OAAO,CAAC,MAAM,MAAM,OAAO,EAAE,CAAC,CAAA;IACpG,CAAC;AACH,CAAC;AAED,4FAA4F;AAC5F,MAAM,CAAC,KAAK,UAAU,8BAA8B,CAAC,OAKpD;IACC,IAAI,OAAO,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC;QAC7B,MAAM,mBAAmB,CAAC;YACxB,IAAI,EAAE,OAAO,CAAC,YAAY,CAAC,MAAM;YACjC,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,MAAM,EAAE,SAAS;YACjB,QAAQ,EAAE,OAAO,CAAC,QAAQ;SAC3B,CAAC,CAAA;QACF,OAAM;IACR,CAAC;IAED,IAAI,OAAO,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;QACjC,MAAM,mBAAmB,CAAC;YACxB,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,MAAM,EAAE,SAAS;YACjB,QAAQ,EAAE,OAAO,CAAC,QAAQ;SAC3B,CAAC,CAAA;IACJ,CAAC;AACH,CAAC;AAED,8DAA8D;AAC9D,MAAM,CAAC,KAAK,UAAU,8BAA8B,CAAC,OAKpD;IACC,MAAM,mBAAmB,CAAC;QACxB,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC,MAAM;QAC1B,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,MAAM,EAAE,SAAS;QACjB,QAAQ,EAAE,OAAO,CAAC,QAAQ;KAC3B,CAAC,CAAA;AACJ,CAAC"}

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

@@ -1,4 +1,4 @@
-import { type HeadlessCommandResult, type HeadlessPushRequest, type WorkPushResult } from './work-types.js';
+import { type HeadlessCommandResult, type HeadlessPushCommit, type HeadlessPushRequest, type WorkPushResult } from './work-types.js';
 export declare const WORK_PUSH_RETRY_DOUBLE_AFTER_SECONDS: number;
 export type WorkPushHooks = {
     display: (render: () => void) => void;
@@ -13,14 +13,34 @@ export declare class WorkPushValidationError extends Error {
         suggestions?: string[];
     });
 }
+export type ResolvedWorkPushContext = {
+    baseBranch: string;
+    branch: string;
+    devOrgBranch: string;
+    workItem: string;
+    workItemId: string;
+};
+export declare function resolveActiveFeatureWorkItem(): Promise<{
+    branch: string;
+    workItem: string;
+}>;
+/** Resolve lastWorkItem / branch / lastBaseBranch / lastDevOrgBranch for work push. */
+export declare function resolveWorkPushContext(): Promise<ResolvedWorkPushContext>;
 export type SleepFn = (ms: number) => Promise<void>;
 export declare function setSleepForTests(nextSleep: SleepFn): void;
 export declare function resetSleepForTests(): void;
+export type WorkPushChangedFiles = {
+    addedOrModified: string[];
+    deleted: string[];
+};
+export declare function listChangedFilesFromCommits(commits: HeadlessPushCommit[]): WorkPushChangedFiles;
 export declare function resolveWorkPushRetryDelaySeconds(retryAfterSeconds: number, waitedSeconds: number): number;
 export declare function registerHeadlessPush(pushBody: HeadlessPushRequest, hooks: Pick<WorkPushHooks, 'display' | 'log'>, timeoutSeconds?: number): Promise<HeadlessCommandResult>;
 export declare function performWorkPush(options: {
     baseBranch: string;
     branch: string;
+    devOrgBranch: string;
     hooks: WorkPushHooks;
     workItem: string;
+    workItemId: string;
 }): Promise<WorkPushResult>;

package/dist/lib/work-push.js

@@ -1,7 +1,10 @@
 import { CicdGateway, CicdGatewayError } from './cicd-gateway.js';
-import { DEFAULT_WORK_PUSH_RETRY_TIMEOUT_SECONDS, readWorkPushRetryTimeoutSeconds } from './defaults-store.js';
-import { getCommitsNameStatus, pushOriginBranch } from './git-worktree.js';
-import { parseNameStatusLog, workPushEndpoint, workPushLockEndpoint, } from './work-types.js';
+import { DEFAULT_WORK_PUSH_RETRY_TIMEOUT_SECONDS, readLastBaseBranch, readLastDevOrgBranch, readLastWorkItem, readWorkPushRetryTimeoutSeconds, } from './defaults-store.js';
+import { checkoutBranch, commitAllTrackedChanges, getCommitsNameStatus, getCurrentBranch, getGitRepoRoot, listPendingChanges, mergeTheirsIgnoreSpaceChange, pullOriginBranch, pushOriginBranch, restoreFeatureBranch, } from './git-worktree.js';
+import { buildVarReplacementEntries, runVarReplacement } from './var-replacement.js';
+import { resolveWorkItemId, WorkActiveResolutionError } from './work-active.js';
+import { featureBranchName, formatWorkCommandMessage, parseNameStatusLog, workPushEndpoint, workPushLockEndpoint, } from './work-types.js';
+import { fetchWorkPushReplacementRules, runYamlReplacement, } from './yaml-replacement.js';
 export const WORK_PUSH_RETRY_DOUBLE_AFTER_SECONDS = 5 * 60;
 export class WorkPushValidationError extends Error {
     exit;
@@ -13,6 +16,43 @@ export class WorkPushValidationError extends Error {
         this.suggestions = options.suggestions;
     }
 }
+export async function resolveActiveFeatureWorkItem() {
+    const workItem = (await readLastWorkItem())?.trim();
+    if (workItem === undefined || workItem.length === 0) {
+        throw new WorkPushValidationError('No work item recorded. Run `agentia cicd work set <work-item>` first.');
+    }
+    const expectedBranch = featureBranchName(workItem);
+    const branch = await getCurrentBranch();
+    if (branch !== expectedBranch) {
+        throw new WorkPushValidationError(`Current branch '${branch}' must be '${expectedBranch}'.`, {
+            suggestions: [`Checkout ${expectedBranch} (from \`agentia cicd work set\`).`],
+        });
+    }
+    return { branch, workItem };
+}
+/** Resolve lastWorkItem / branch / lastBaseBranch / lastDevOrgBranch for work push. */
+export async function resolveWorkPushContext() {
+    const { branch, workItem } = await resolveActiveFeatureWorkItem();
+    const baseBranch = (await readLastBaseBranch())?.trim();
+    if (baseBranch === undefined || baseBranch.length === 0) {
+        throw new WorkPushValidationError('No base branch recorded. Run `agentia cicd work set <work-item>` first.');
+    }
+    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.');
+    }
+    let workItemId;
+    try {
+        workItemId = await resolveWorkItemId();
+    }
+    catch (error) {
+        if (error instanceof WorkActiveResolutionError) {
+            throw new WorkPushValidationError(error.message);
+        }
+        throw error;
+    }
+    return { baseBranch, branch, devOrgBranch, workItem, workItemId };
+}
 const defaultSleep = async (ms) => new Promise((resolve) => {
     setTimeout(resolve, ms);
 });
@@ -25,20 +65,40 @@ export function setSleepForTests(nextSleep) {
 export function resetSleepForTests() {
     sleepFn = defaultSleep;
 }
-function listChangedFiles(commits) {
-    const files = new Set();
+export function listChangedFilesFromCommits(commits) {
+    const addedOrModified = new Set();
+    const deleted = new Set();
     for (const commit of commits) {
         for (const file of commit.added) {
-            files.add(file);
+            addedOrModified.add(file);
+            deleted.delete(file);
         }
         for (const file of commit.modified) {
-            files.add(file);
+            addedOrModified.add(file);
+            deleted.delete(file);
         }
         for (const file of commit.removed) {
-            files.add(file);
+            deleted.add(file);
+            addedOrModified.delete(file);
         }
     }
-    return [...files].sort((a, b) => a.localeCompare(b));
+    return {
+        addedOrModified: [...addedOrModified].sort((a, b) => a.localeCompare(b)),
+        deleted: [...deleted].sort((a, b) => a.localeCompare(b)),
+    };
+}
+function listChangedFiles(commits) {
+    const { addedOrModified, deleted } = listChangedFilesFromCommits(commits);
+    return [...addedOrModified, ...deleted].sort((a, b) => a.localeCompare(b));
+}
+function assertReplacementSucceeded(kind, result) {
+    if (result.exitCode === 0) {
+        return;
+    }
+    const detail = result.stderr.trim() || result.stdout.trim();
+    throw new WorkPushValidationError(detail.length > 0
+        ? `Copado ${kind} replacement failed (exit ${result.exitCode ?? 'unknown'}): ${detail}`
+        : `Copado ${kind} replacement failed with exit code ${result.exitCode ?? 'unknown'}.`);
 }
 export function resolveWorkPushRetryDelaySeconds(retryAfterSeconds, waitedSeconds) {
     if (waitedSeconds >= WORK_PUSH_RETRY_DOUBLE_AFTER_SECONDS) {
@@ -95,8 +155,87 @@ export async function registerHeadlessPush(pushBody, hooks, timeoutSeconds = DEF
         }
     }
 }
+async function applyCopadoReplacements(options) {
+    const { baseBranch, changedFiles, commits, devOrgBranch, hooks, tipCommitId, workItem, workItemId } = options;
+    const { display, log, withSpinner } = hooks;
+    const { addedOrModified } = listChangedFilesFromCommits(commits);
+    if (addedOrModified.length === 0) {
+        return { commits, tipCommitId };
+    }
+    display(() => {
+        log(`Added/modified files for replacements: ${addedOrModified.length}`);
+    });
+    const rules = await withSpinner('Fetching Copado replacements', () => fetchWorkPushReplacementRules(workItemId));
+    const environmentVariables = rules.environmentVariables ?? [];
+    const varReplacements = buildVarReplacementEntries(environmentVariables);
+    const replacementRulesYml = rules.replacementRulesYml?.trim() ?? '';
+    if (varReplacements.length === 0 && replacementRulesYml.length === 0) {
+        display(() => {
+            log('No Copado environment variables or yaml replacement rules linked to the work item.');
+        });
+        return { commits, tipCommitId };
+    }
+    const repoRoot = await getGitRepoRoot();
+    if (varReplacements.length > 0) {
+        const replacement = await withSpinner('Applying Copado environment variable replacements', () => runVarReplacement({
+            changedFiles: addedOrModified,
+            cwd: repoRoot,
+            environmentVariables,
+            targetFolder: repoRoot,
+        }));
+        assertReplacementSucceeded('environment variable', replacement);
+    }
+    else {
+        display(() => {
+            log('No Copado environment variables linked to the work item.');
+        });
+    }
+    if (replacementRulesYml.length > 0) {
+        const replacement = await withSpinner('Applying Copado yaml replacements', () => runYamlReplacement({
+            branchName: devOrgBranch,
+            changedFiles,
+            cwd: repoRoot,
+            replacementRulesYml,
+            targetFolder: repoRoot,
+        }));
+        assertReplacementSucceeded('yaml', replacement);
+    }
+    else {
+        display(() => {
+            log('No Copado yaml replacement rules linked to the work item pipeline.');
+        });
+    }
+    const pendingAfterReplacement = await listPendingChanges();
+    if (pendingAfterReplacement.length === 0) {
+        return { commits, tipCommitId };
+    }
+    const tipMessage = commits.at(-1)?.message;
+    if (tipMessage === undefined || tipMessage.length === 0) {
+        throw new WorkPushValidationError('Unable to determine tip commit message for replacement commit.');
+    }
+    // Env-var and yaml edits share one follow-up commit when either changed tracked files.
+    await withSpinner('Committing Copado replacements', () => commitAllTrackedChanges(`${tipMessage} copado replacements`));
+    const logStdout = await getCommitsNameStatus(baseBranch);
+    const refreshedCommits = parseNameStatusLog(logStdout, workItem);
+    const refreshedTipCommitId = refreshedCommits.at(-1)?.id;
+    if (refreshedTipCommitId === undefined) {
+        throw new WorkPushValidationError('Unable to determine tip commit id after Copado replacements.', {
+            exit: 1,
+        });
+    }
+    return { commits: refreshedCommits, tipCommitId: refreshedTipCommitId };
+}
+async function syncDevOrgBranch(options) {
+    const { branch, devOrgBranch, hooks } = options;
+    const { withSpinner } = hooks;
+    await withSpinner(`Checking out ${devOrgBranch}`, () => checkoutBranch(devOrgBranch));
+    await withSpinner(`Pulling origin/${devOrgBranch}`, () => pullOriginBranch(devOrgBranch));
+    await withSpinner(`Merging ${branch} into ${devOrgBranch}`, () => mergeTheirsIgnoreSpaceChange(branch));
+    await withSpinner(`Pushing origin/${devOrgBranch}`, () => pushOriginBranch(devOrgBranch));
+    await withSpinner(`Checking out ${branch}`, () => checkoutBranch(branch));
+}
 export async function performWorkPush(options) {
-    const { baseBranch, branch, hooks, workItem } = options;
+    const { baseBranch, branch, devOrgBranch, hooks, workItem } = options;
     const { display, log, withSpinner } = hooks;
     const logStdout = await withSpinner(`Collecting commits since ${baseBranch}`, () => getCommitsNameStatus(baseBranch));
     const commits = parseNameStatusLog(logStdout, workItem);
@@ -121,35 +260,59 @@ export async function performWorkPush(options) {
             }
         }
     });
-    const lockBody = {
-        commitId: tipCommitId,
-        workItem,
-    };
-    const lock = await withSpinner('Notifying headless push', () => CicdGateway.call({
-        body: lockBody,
-        endpoint: workPushLockEndpoint(),
-        headers: {
-            'Content-Type': 'application/json',
-        },
-        method: 'POST',
-    }));
-    await withSpinner(`Pushing origin/${branch}`, () => pushOriginBranch(branch));
-    display(() => {
-        log(`Pushed origin/${branch}.`);
-    });
-    const pushBody = { commits };
-    const timeoutSeconds = await readWorkPushRetryTimeoutSeconds();
-    const push = await withSpinner('Registering headless push', () => registerHeadlessPush(pushBody, { display, log }, timeoutSeconds));
-    display(() => {
-        log(push.message);
-    });
-    return {
-        baseBranch,
-        branch,
-        commits,
-        lock,
-        push,
-        workItem,
-    };
+    let commitsToRegister = commits;
+    let tipCommitToLock = tipCommitId;
+    try {
+        const replacementResult = await applyCopadoReplacements({
+            baseBranch,
+            changedFiles,
+            commits,
+            devOrgBranch,
+            hooks: { display, log, withSpinner },
+            tipCommitId,
+            workItem,
+            workItemId: options.workItemId,
+        });
+        commitsToRegister = replacementResult.commits;
+        tipCommitToLock = replacementResult.tipCommitId;
+        const lockBody = {
+            commitId: tipCommitToLock,
+            workItem,
+        };
+        const lock = await withSpinner('Notifying headless push', () => CicdGateway.call({
+            body: lockBody,
+            endpoint: workPushLockEndpoint(),
+            headers: {
+                'Content-Type': 'application/json',
+            },
+            method: 'POST',
+        }));
+        await withSpinner(`Pushing origin/${branch}`, () => pushOriginBranch(branch));
+        const pushBody = { commits: commitsToRegister };
+        const timeoutSeconds = await readWorkPushRetryTimeoutSeconds();
+        const push = await withSpinner('Registering headless push', () => registerHeadlessPush(pushBody, { display, log }, timeoutSeconds));
+        display(() => {
+            log(formatWorkCommandMessage(push.message));
+        });
+        await syncDevOrgBranch({ branch, devOrgBranch, hooks });
+        return {
+            baseBranch,
+            branch,
+            commits: commitsToRegister,
+            devOrgBranch,
+            lock,
+            push,
+            workItem,
+        };
+    }
+    catch (error) {
+        try {
+            await restoreFeatureBranch(branch);
+        }
+        catch {
+            // Prefer the original failure; restoration is best-effort.
+        }
+        throw error;
+    }
 }
 //# sourceMappingURL=work-push.js.map