@fjall/deploy-core 0.89.4 → 0.89.6

package/dist/src/services/application/index.d.ts

@@ -1 +1,2 @@
 export { ApplicationStackService } from "./ApplicationStackService.js";
+export { destroyAllStacks, convertDestroyResultIfNotExists, handleDestroyError } from "./applicationStackHelpers.js";

package/dist/src/services/application/index.js

@@ -1 +1 @@
-export { ApplicationStackService } from "./ApplicationStackService.js";
+import{ApplicationStackService as o}from"./ApplicationStackService.js";import{destroyAllStacks as s,convertDestroyResultIfNotExists as c,handleDestroyError as l}from"./applicationStackHelpers.js";export{o as ApplicationStackService,c as convertDestroyResultIfNotExists,s as destroyAllStacks,l as handleDestroyError};

package/dist/src/services/index.d.ts

@@ -0,0 +1,6 @@
+export { CdkService, CdkArgumentBuilder, CdkProcessManager, CdkEventMonitor, startStackMonitoring, DEFAULT_DEPLOY_TIMEOUT_MS, isCdkError, formatInfrastructureError, getStructuralHint, getSourceContext, hasCdkDifferences, parseDiffOutput, CloudFormationService, CloudFormationError } from "./infrastructure/index.js";
+export type { CdkContext, CdkOptions, CdkOutput, CheckDifferencesResult, CdkServiceOptions, ICdkProcessManager, DiffDetails, CloudFormationCallbacks } from "./infrastructure/index.js";
+export { TemplateHashService, TemplateHashError, type TemplateComparisonResult } from "./supporting/index.js";
+export { CdkContextBuilder } from "./supporting/index.js";
+export { emitProgress, PROGRESS_MESSAGES, parseBuildPhase, buildStepContextBuildConfig, convertCloudFormationOutputsToRecord, type CloudFormationOutput } from "./supporting/index.js";
+export { ApplicationStackService } from "./application/index.js";

package/dist/src/services/index.js

@@ -0,0 +1 @@
+import{CdkService as t,CdkArgumentBuilder as o,CdkProcessManager as i,CdkEventMonitor as a,startStackMonitoring as n,DEFAULT_DEPLOY_TIMEOUT_MS as u,isCdkError as d,formatInfrastructureError as s,getStructuralHint as S,getSourceContext as c,hasCdkDifferences as p,parseDiffOutput as C,CloudFormationService as m,CloudFormationError as f}from"./infrastructure/index.js";import{TemplateHashService as E,TemplateHashError as k}from"./supporting/index.js";import{CdkContextBuilder as g}from"./supporting/index.js";import{emitProgress as M,PROGRESS_MESSAGES as T,parseBuildPhase as O,buildStepContextBuildConfig as P,convertCloudFormationOutputsToRecord as h}from"./supporting/index.js";import{ApplicationStackService as B}from"./application/index.js";export{B as ApplicationStackService,o as CdkArgumentBuilder,g as CdkContextBuilder,a as CdkEventMonitor,i as CdkProcessManager,t as CdkService,f as CloudFormationError,m as CloudFormationService,u as DEFAULT_DEPLOY_TIMEOUT_MS,T as PROGRESS_MESSAGES,k as TemplateHashError,E as TemplateHashService,P as buildStepContextBuildConfig,h as convertCloudFormationOutputsToRecord,M as emitProgress,s as formatInfrastructureError,c as getSourceContext,S as getStructuralHint,p as hasCdkDifferences,d as isCdkError,O as parseBuildPhase,C as parseDiffOutput,n as startStackMonitoring};

package/dist/src/services/infrastructure/CdkArgumentBuilder.js

@@ -1,67 +1 @@
-import { filterDangerousEnvVars } from "../../util/securityHelpers.js";
-export class CdkArgumentBuilder {
-    buildContextArgs(context) {
-        const args = [];
-        if (context?.accountId) {
-            args.push("-c", `accountId=${context.accountId}`);
-        }
-        if (context?.environment) {
-            args.push("-c", `environment=${context.environment}`);
-        }
-        if (context?.managedAccount) {
-            args.push("-c", "managedAccount=true");
-        }
-        if (context?.accountName) {
-            args.push("-c", `accountName=${context.accountName}`);
-        }
-        if (context?.imageVersion) {
-            args.push("-c", `imageVersion=${context.imageVersion}`);
-        }
-        if (context?.orgId) {
-            args.push("-c", `orgId=${context.orgId}`);
-        }
-        if (context?.rootId) {
-            args.push("-c", `rootId=${context.rootId}`);
-        }
-        if (context?.managementAccountId) {
-            args.push("-c", `managementAccountId=${context.managementAccountId}`);
-        }
-        if (context?.ipamPoolId) {
-            args.push("-c", `ipamPoolId=${context.ipamPoolId}`);
-        }
-        if (context?.fjallOrgId) {
-            args.push("-c", `fjallOrgId=${context.fjallOrgId}`);
-        }
-        if (context?.orgConfig) {
-            args.push("-c", `orgConfig=${context.orgConfig}`);
-        }
-        return args;
-    }
-    injectCascadeCredentials(env, credentials) {
-        if (credentials) {
-            env.AWS_ACCESS_KEY_ID = credentials.accessKeyId;
-            env.AWS_SECRET_ACCESS_KEY = credentials.secretAccessKey;
-            if (credentials.sessionToken) {
-                env.AWS_SESSION_TOKEN = credentials.sessionToken;
-            }
-        }
-    }
-    buildCdkEnv(options) {
-        const env = {
-            ...filterDangerousEnvVars(process.env),
-            CI: "true",
-            FORCE_COLOR: "0",
-            CDK_DISABLE_VERSION_CHECK: "1"
-        };
-        if (options?.context?.region) {
-            env.AWS_REGION = options.context.region;
-            env.AWS_DEFAULT_REGION = options.context.region;
-            env.CDK_DEFAULT_REGION = options.context.region;
-        }
-        if (options?.context?.accountId) {
-            env.CDK_DEFAULT_ACCOUNT = options.context.accountId;
-        }
-        this.injectCascadeCredentials(env, options?.credentials);
-        return env;
-    }
-}
+import{filterDangerousEnvVars as a}from"@fjall/util";class c{buildContextArgs(i){const r=[];return i?.accountId&&r.push("-c",`accountId=${i.accountId}`),i?.environment&&r.push("-c",`environment=${i.environment}`),i?.managedAccount&&r.push("-c","managedAccount=true"),i?.accountName&&r.push("-c",`accountName=${i.accountName}`),i?.imageVersion&&r.push("-c",`imageVersion=${i.imageVersion}`),i?.orgId&&r.push("-c",`orgId=${i.orgId}`),i?.rootId&&r.push("-c",`rootId=${i.rootId}`),i?.managementAccountId&&r.push("-c",`managementAccountId=${i.managementAccountId}`),i?.ipamPoolId&&r.push("-c",`ipamPoolId=${i.ipamPoolId}`),i?.fjallOrgId&&r.push("-c",`fjallOrgId=${i.fjallOrgId}`),i?.fjallOidcConfigured&&r.push("-c",`fjallOidcConfigured=${i.fjallOidcConfigured}`),i?.orgConfig&&r.push("-c",`orgConfig=${i.orgConfig}`),r}injectCascadeCredentials(i,r){r&&(i.AWS_ACCESS_KEY_ID=r.accessKeyId,i.AWS_SECRET_ACCESS_KEY=r.secretAccessKey,r.sessionToken&&(i.AWS_SESSION_TOKEN=r.sessionToken))}buildCdkEnv(i){const r={...a(process.env),CI:"true",FORCE_COLOR:"0",CDK_DISABLE_VERSION_CHECK:"1"};return i?.context?.region&&(r.AWS_REGION=i.context.region,r.AWS_DEFAULT_REGION=i.context.region,r.CDK_DEFAULT_REGION=i.context.region),i?.context?.accountId&&(r.CDK_DEFAULT_ACCOUNT=i.context.accountId),this.injectCascadeCredentials(r,i?.credentials),r}}export{c as CdkArgumentBuilder};

package/dist/src/services/infrastructure/CdkCommandRunner.d.ts

@@ -1,7 +1,14 @@
 import type { Result } from "@fjall/generator";
 import { CdkError } from "../../types/errors/CdkError.js";
 import { type DiffDetails } from "./CdkOutputParser.js";
+import type { ICdkProcessManager } from "./ICdkProcessManager.js";
 import type { CdkOptions, CdkOutput } from "./CdkService.js";
+/** Synth is CPU-bound template generation — 5 minutes is generous */
+export declare const SYNTH_TIMEOUT_MS = 300000;
+/** Bootstrap creates a single stack with a handful of resources */
+export declare const BOOTSTRAP_TIMEOUT_MS = 180000;
+/** Import maps existing resources into CDK state — slower than deploy due to resource lookup */
+export declare const IMPORT_TIMEOUT_MS = 1200000;
 export interface CheckDifferencesResult {
     hasDifferences: boolean;
     output?: string;
@@ -9,11 +16,12 @@ export interface CheckDifferencesResult {
 }
 /**
  * Runs low-level CDK CLI commands (synth, deploy, destroy, diff, bootstrap, import).
- * Delegates process management to CdkProcessManager.
+ * Delegates process management to CdkProcessManager (or any ICdkProcessManager).
  */
 export declare class CdkCommandRunner {
     private processManager;
-    constructor();
+    constructor(processManager: ICdkProcessManager);
+    dispose(): void;
     checkDifferences(path: string, stackName?: string, options?: CdkOptions): Promise<Result<CheckDifferencesResult, CdkError>>;
     deploy(path: string, stackName?: string, options?: CdkOptions): Promise<Result<CdkOutput, string>>;
     destroy(path: string, stackName?: string, options?: CdkOptions): Promise<Result<CdkOutput, string>>;

package/dist/src/services/infrastructure/CdkCommandRunner.js

@@ -1,22 +1,21 @@
 import { tmpdir } from "os";
-import { logger } from "@fjall/util";
+import { logger } from "@fjall/util/logger";
 import { success, failure } from "@fjall/generator";
 import { CdkError } from "../../types/errors/CdkError.js";
 import { DEFAULT_REGION } from "../../aws/utils/regions.js";
 import { isCdkError, formatInfrastructureError } from "./CdkErrorFormatter.js";
 import { hasCdkDifferences, parseDiffOutput } from "./CdkOutputParser.js";
-import { CdkArgumentBuilder } from "./CdkArgumentBuilder.js";
-import { CdkProcessManager } from "./CdkProcessManager.js";
 import { DEFAULT_DEPLOY_TIMEOUT_MS } from "./CdkEventMonitoring.js";
 import { analyseBootstrapError } from "./CdkOutputAnalyser.js";
 /** Synth is CPU-bound template generation — 5 minutes is generous */
-const SYNTH_TIMEOUT_MS = 300_000;
+export const SYNTH_TIMEOUT_MS = 300_000;
 /** Bootstrap creates a single stack with a handful of resources */
-const BOOTSTRAP_TIMEOUT_MS = 180_000;
+export const BOOTSTRAP_TIMEOUT_MS = 180_000;
 /** Import maps existing resources into CDK state — slower than deploy due to resource lookup */
-const IMPORT_TIMEOUT_MS = 1_200_000;
+export const IMPORT_TIMEOUT_MS = 1_200_000;
 /** CDK flags used across multiple commands */
 const CDK_FLAGS = Object.freeze({
+    APP: "--app",
     CI: "--ci",
     REQUIRE_APPROVAL: "--require-approval",
     APPROVAL_NEVER: "never",
@@ -26,13 +25,15 @@ const CDK_FLAGS = Object.freeze({
 });
 /**
  * Runs low-level CDK CLI commands (synth, deploy, destroy, diff, bootstrap, import).
- * Delegates process management to CdkProcessManager.
+ * Delegates process management to CdkProcessManager (or any ICdkProcessManager).
  */
 export class CdkCommandRunner {
     processManager;
-    constructor() {
-        const argBuilder = new CdkArgumentBuilder();
-        this.processManager = new CdkProcessManager(argBuilder);
+    constructor(processManager) {
+        this.processManager = processManager;
+    }
+    dispose() {
+        this.processManager.dispose();
     }
     async checkDifferences(path, stackName, options) {
         const args = ["diff"];
@@ -50,7 +51,9 @@ export class CdkCommandRunner {
         const result = await this.processManager.runCdkCommand(path, args, {
             ...options,
             // Diff command returns non-zero if differences exist
-            ignoreExitCode: true
+            ignoreExitCode: true,
+            // Diff output includes stderr (CDK writes errors there)
+            combineOutput: true
         });
         if (!result.success) {
             return failure(new CdkError(formatInfrastructureError(result.error, path), "diff_failed", undefined, undefined, result.error, undefined, false));
@@ -71,10 +74,10 @@ export class CdkCommandRunner {
     async deploy(path, stackName, options) {
         const args = ["deploy"];
         if (options?.appDir) {
-            args.push("--app", options.appDir);
+            args.push(CDK_FLAGS.APP, options.appDir);
         }
         else if (options?.useCdkOut) {
-            args.push("--app", "cdk.out");
+            args.push(CDK_FLAGS.APP, "cdk.out");
         }
         if (stackName) {
             args.push(stackName);
@@ -107,10 +110,10 @@ export class CdkCommandRunner {
     async destroy(path, stackName, options) {
         const args = ["destroy"];
         if (options?.appDir) {
-            args.push("--app", options.appDir);
+            args.push(CDK_FLAGS.APP, options.appDir);
         }
         else if (options?.useCdkOut) {
-            args.push("--app", "cdk.out");
+            args.push(CDK_FLAGS.APP, "cdk.out");
         }
         if (stackName) {
             args.push(stackName);

package/dist/src/services/infrastructure/CdkErrorFormatter.js

@@ -1,194 +1,16 @@
-import { readFileSync } from "fs";
-import { join } from "path";
-const CDK_ERROR_PATTERNS = [
-    // Authentication and credentials errors
-    /Unable to locate credentials/i,
-    /ExpiredToken/i,
-    /InvalidUserPool/i,
-    /AccessDenied/i,
-    /UnauthorizedAccess/i,
-    /AssumeRoleUnauthorizedAccess/i,
-    /The security token included in the request is invalid/i,
-    /Could not assume role/i,
-    // Bootstrap errors
-    /This stack uses assets, so the toolkit stack must be deployed/i,
-    /Has the environment been bootstrapped/i,
-    /Please run 'cdk bootstrap'/i,
-    /requires a newer version of the CDK CLI/i,
-    // Stack not found errors
-    /Stack .* does not exist/i,
-    /Unable to resolve AWS account/i,
-    // General CDK errors
-    /ENOENT.*cdk\.json/i,
-    /Cannot find module/i,
-    /SyntaxError:/i,
-    /TypeError:/i,
-    /ReferenceError:/i,
-    /Error: /i,
-    // Common failure messages
-    /❌ .*failed/i,
-    /\[ERROR\]/i,
-    /fatal:/i
-];
-const STRUCTURAL_HINTS = {
-    TS1005: "Check for missing or extra brackets, braces, or commas",
-    TS1135: "Check for mismatched brackets or braces — a common cause is extra `},` or `]` characters",
-    TS1136: "Check for mismatched braces in object literals",
-    TS1109: "Check for extra commas or mismatched delimiters",
-    TS1003: "Check for syntax errors near the indicated position"
-};
-export function isCdkError(output) {
-    if (!output)
-        return false;
-    return CDK_ERROR_PATTERNS.some((pattern) => pattern.test(output));
-}
-export function getStructuralHint(tsCode) {
-    return STRUCTURAL_HINTS[tsCode] ?? null;
-}
-export function getSourceContext(filePath, lineNumber, contextLines = 1) {
-    try {
-        const content = readFileSync(filePath, "utf-8");
-        const lines = content.split("\n");
-        const start = Math.max(0, lineNumber - 1 - contextLines);
-        const end = Math.min(lines.length, lineNumber + contextLines);
-        const gutterWidth = String(end).length;
-        const formatted = [];
-        for (let i = start; i < end; i++) {
-            const num = String(i + 1).padStart(gutterWidth);
-            const marker = i === lineNumber - 1 ? ">" : " ";
-            formatted.push(`${marker} ${num} | ${lines[i]}`);
-        }
-        return formatted.join("\n");
-    }
-    catch {
-        // File not readable — skip source context display
-        return null;
-    }
-}
-export function formatInfrastructureError(output, appPath) {
-    const lines = output.split("\n");
-    // Handle TypeScript compilation errors
-    if (output.includes("error TS")) {
-        const tsErrorRegex = /([\w./-]+\.ts)\((\d+),(\d+)\): error (TS\d+): (.+)/;
-        const parsed = [];
-        for (const line of lines) {
-            const match = line.match(tsErrorRegex);
-            if (match) {
-                parsed.push({
-                    file: match[1],
-                    line: parseInt(match[2], 10),
-                    col: parseInt(match[3], 10),
-                    code: match[4],
-                    message: match[5]
-                });
-            }
-        }
-        if (parsed.length > 0) {
-            const seen = new Set();
-            const unique = parsed.filter((e) => {
-                const key = `${e.file}:${e.line}`;
-                if (seen.has(key))
-                    return false;
-                seen.add(key);
-                return true;
-            });
-            const errors = unique.slice(0, 3);
-            const firstError = errors[0];
-            const parts = [];
-            parts.push(`TypeScript compilation failed in ${firstError.file}:\n`);
-            if (appPath) {
-                const resolvedPath = join(appPath, firstError.file);
-                const context = getSourceContext(resolvedPath, firstError.line);
-                if (context) {
-                    parts.push(context);
-                    parts.push("");
-                }
-            }
-            for (const err of errors) {
-                parts.push(`Error on line ${err.line}: ${err.message} (${err.code})`);
-                const hint = getStructuralHint(err.code);
-                if (hint) {
-                    parts.push(`Hint: ${hint}`);
-                }
-            }
-            return parts.join("\n");
-        }
-    }
-    // Handle multi-line CDK validation errors
-    const multiLineValidationMatch = output.match(/Validation failed with the following errors:([\s\S]*?)(?=\n\s*at\s|\n\n|$)/);
-    if (multiLineValidationMatch) {
-        const errorLines = multiLineValidationMatch[1]
-            .split("\n")
-            .map((l) => l.trim())
-            .filter((l) => l.length > 0);
-        return `Validation failed with the following errors:\n${errorLines.map((l) => `  ${l}`).join("\n")}`;
-    }
-    // Handle CDK ValidationError (e.g., missing asset directories)
-    const validationMatch = output.match(/ValidationError:\s*(.+?)(?:\n|$)/);
-    if (validationMatch) {
-        const detail = validationMatch[1];
-        const constructMatch = output.match(/at path \[([^\]]+)\] in ([\w.-]+)/);
-        let formatted = `${detail}`;
-        if (constructMatch) {
-            formatted += `\nConstruct: ${constructMatch[1]}`;
-        }
-        if (detail.includes("Cannot find asset")) {
-            const assetPath = detail.match(/at (.+)/)?.[1];
-            if (assetPath) {
-                formatted += `\nHint: The build output directory does not exist. Make sure the build step has completed before deploying`;
-            }
-        }
-        return formatted;
-    }
-    // Try to extract: file path, code snippet, error type/message
-    let fileLine = "";
-    let codeSnippet = "";
-    let pointer = "";
-    let errorMessage = "";
-    for (let i = 0; i < lines.length; i++) {
-        const line = lines[i];
-        const fileMatch = line.match(/^(\/[^:]+\.ts):(\d+)/);
-        if (fileMatch && !fileLine) {
-            const fullPath = fileMatch[1];
-            const lineNum = fileMatch[2];
-            const fileName = fullPath.split("/").pop() || fullPath;
-            fileLine = `${fileName}:${lineNum}`;
-            if (i + 1 < lines.length) {
-                codeSnippet = lines[i + 1];
-            }
-            if (i + 2 < lines.length && lines[i + 2].includes("^")) {
-                pointer = lines[i + 2];
-            }
-        }
-        const errorMatch = line.match(/^(\w*Error):\s*(.+)/);
-        if (errorMatch && !errorMessage) {
-            errorMessage = `${errorMatch[1]}: ${errorMatch[2]}`;
-        }
-    }
-    if (fileLine && errorMessage) {
-        let formatted = `Error in ${fileLine}\n`;
-        if (codeSnippet) {
-            formatted += `${codeSnippet}\n`;
-        }
-        if (pointer) {
-            formatted += `${pointer}\n`;
-        }
-        formatted += `\n${errorMessage}`;
-        return formatted;
-    }
-    if (errorMessage) {
-        return errorMessage;
-    }
-    // Fallback: return first few meaningful lines, filtering out noise
-    const meaningfulLines = lines
-        .filter((l) => l.trim() &&
-        l.length < 500 &&
-        !l.includes("at Module.") &&
-        !l.includes("at Object.") &&
-        !l.includes("at Function.") &&
-        !l.includes("node:internal") &&
-        !l.includes("node_modules/ts-node") &&
-        !l.includes("node_modules/aws-cdk"))
-        .slice(0, 5);
-    return meaningfulLines.join("\n") || output;
-}
+import{readFileSync as k}from"fs";import{join as T}from"path";const E=[/Unable to locate credentials/i,/ExpiredToken/i,/InvalidUserPool/i,/AccessDenied/i,/UnauthorizedAccess/i,/AssumeRoleUnauthorizedAccess/i,/The security token included in the request is invalid/i,/Could not assume role/i,/This stack uses assets, so the toolkit stack must be deployed/i,/Has the environment been bootstrapped/i,/Please run 'cdk bootstrap'/i,/requires a newer version of the CDK CLI/i,/Stack .* does not exist/i,/Unable to resolve AWS account/i,/ENOENT.*cdk\.json/i,/Cannot find module/i,/SyntaxError:/i,/TypeError:/i,/ReferenceError:/i,/Error: /i,/❌ .*failed/i,/\[ERROR\]/i,/fatal:/i],x={TS1005:"Check for missing or extra brackets, braces, or commas",TS1135:"Check for mismatched brackets or braces \u2014 a common cause is extra `},` or `]` characters",TS1136:"Check for mismatched braces in object literals",TS1109:"Check for extra commas or mismatched delimiters",TS1003:"Check for syntax errors near the indicated position"};function w(n){return n?E.some(a=>a.test(n)):!1}function C(n){return x[n]??null}function b(n,a,r=1){try{const m=k(n,"utf-8").split(`
+`),f=Math.max(0,a-1-r),u=Math.min(m.length,a+r),p=String(u).length,s=[];for(let h=f;h<u;h++){const e=String(h+1).padStart(p),t=h===a-1?">":" ";s.push(`${t} ${e} | ${m[h]}`)}return s.join(`
+`)}catch{return null}}function M(n,a){const r=n.split(`
+`);if(n.includes("error TS")){const e=/([\w./-]+\.ts)\((\d+),(\d+)\): error (TS\d+): (.+)/,t=[];for(const i of r){const o=i.match(e);o&&t.push({file:o[1],line:parseInt(o[2],10),col:parseInt(o[3],10),code:o[4],message:o[5]})}if(t.length>0){const i=new Set,$=t.filter(c=>{const l=`${c.file}:${c.line}`;return i.has(l)?!1:(i.add(l),!0)}).slice(0,3),g=$[0],d=[];if(d.push(`TypeScript compilation failed in ${g.file}:
+`),a){const c=T(a,g.file),l=b(c,g.line);l&&(d.push(l),d.push(""))}for(const c of $){d.push(`Error on line ${c.line}: ${c.message} (${c.code})`);const l=C(c.code);l&&d.push(`Hint: ${l}`)}return d.join(`
+`)}}const S=n.match(/Validation failed with the following errors:([\s\S]*?)(?=\n\s*at\s|\n\n|$)/);if(S)return`Validation failed with the following errors:
+${S[1].split(`
+`).map(t=>t.trim()).filter(t=>t.length>0).map(t=>`  ${t}`).join(`
+`)}`;const m=n.match(/ValidationError:\s*(.+?)(?:\n|$)/);if(m){const e=m[1],t=n.match(/at path \[([^\]]+)\] in ([\w.-]+)/);let i=`${e}`;return t&&(i+=`
+Construct: ${t[1]}`),e.includes("Cannot find asset")&&e.match(/at (.+)/)?.[1]&&(i+=`
+Hint: The build output directory does not exist. Make sure the build step has completed before deploying`),i}let f="",u="",p="",s="";for(let e=0;e<r.length;e++){const t=r[e],i=t.match(/^(\/[^:]+\.ts):(\d+)/);if(i&&!f){const $=i[1],g=i[2];f=`${$.split("/").pop()||$}:${g}`,e+1<r.length&&(u=r[e+1]),e+2<r.length&&r[e+2].includes("^")&&(p=r[e+2])}const o=t.match(/^(\w*Error):\s*(.+)/);o&&!s&&(s=`${o[1]}: ${o[2]}`)}if(f&&s){let e=`Error in ${f}
+`;return u&&(e+=`${u}
+`),p&&(e+=`${p}
+`),e+=`
+${s}`,e}return s||r.filter(e=>e.trim()&&e.length<500&&!e.includes("at Module.")&&!e.includes("at Object.")&&!e.includes("at Function.")&&!e.includes("node:internal")&&!e.includes("node_modules/ts-node")&&!e.includes("node_modules/aws-cdk")).slice(0,5).join(`
+`)||n}export{M as formatInfrastructureError,b as getSourceContext,C as getStructuralHint,w as isCdkError};

package/dist/src/services/infrastructure/CdkEventMonitoring.js

@@ -1,41 +1 @@
-import { logger, getErrorMessage } from "@fjall/util";
-import { CloudFormationFailureAnalyser } from "../../aws/utils/CloudFormationFailureAnalyser.js";
-/** Deploy/destroy default — CloudFormation stacks can take up to 30 minutes */
-export const DEFAULT_DEPLOY_TIMEOUT_MS = 1_800_000;
-export function startStackMonitoring(monitor, stackName, onResourceProgress) {
-    return monitor
-        .waitForStackComplete(stackName, {
-        timeout: DEFAULT_DEPLOY_TIMEOUT_MS,
-        pollInterval: 2000,
-        onResourceUpdate: onResourceProgress,
-        onStackComplete: (_success, _message) => {
-            // Stack deployment completed — no console output per architecture
-        }
-    })
-        .catch((err) => {
-        logger.debug("CdkService", "Stack monitoring failed", {
-            error: getErrorMessage(err)
-        });
-        return {
-            success: false,
-            failureReason: "Monitoring failed"
-        };
-    });
-}
-export class CdkEventMonitor {
-    eventLogWriterFactory;
-    constructor(options) {
-        this.eventLogWriterFactory = options?.eventLogWriterFactory;
-    }
-    async createEventMonitor(operation, stackName, region, context, aws) {
-        const cloudFormationEventsModule = await import("../../aws/utils/cloudformationEvents.js");
-        const monitor = new cloudFormationEventsModule.CloudFormationEventMonitor(aws, {
-            failureAnalyser: new CloudFormationFailureAnalyser(),
-            eventLogWriterFactory: this.eventLogWriterFactory
-        });
-        const deploymentId = `${operation}-${Date.now()}`;
-        const deploymentName = context.target || context.deployType || "deployment";
-        monitor.enableLogging(deploymentId, stackName, region, deploymentName);
-        return monitor;
-    }
-}
+import{logger as m}from"@fjall/util/logger";import{getErrorMessage as g}from"@fjall/util";import{CloudFormationFailureAnalyser as u}from"@fjall/util/aws";const p=18e5;function F(n,e,o){return n.waitForStackComplete(e,{timeout:p,pollInterval:2e3,onResourceUpdate:o,onStackComplete:(t,r)=>{}}).catch(t=>(m.debug("CdkService","Stack monitoring failed",{error:g(t)}),{success:!1,failureReason:"Monitoring failed"}))}class f{eventLogWriterFactory;constructor(e){this.eventLogWriterFactory=e?.eventLogWriterFactory}async createEventMonitor(e,o,t,r,i){const c=await import("../../aws/utils/cloudformationEvents.js"),a=new c.CloudFormationEventMonitor(i,{failureAnalyser:new u,eventLogWriterFactory:this.eventLogWriterFactory}),s=`${e}-${Date.now()}`,l=r.target||r.deployType||"deployment";return a.enableLogging(s,o,t,l),a}}export{f as CdkEventMonitor,p as DEFAULT_DEPLOY_TIMEOUT_MS,F as startStackMonitoring};

package/dist/src/services/infrastructure/CdkOutputAnalyser.js

@@ -1,4 +1,4 @@
-import { logger } from "@fjall/util";
+import { logger } from "@fjall/util/logger";
 import { STACK_NOT_FOUND_PATTERN, CDK_NO_STACKS_MATCH } from "../../aws/utils/cloudformationEvents.js";
 import { success, failure } from "@fjall/generator";
 import { formatInfrastructureError } from "./CdkErrorFormatter.js";

package/dist/src/services/infrastructure/CdkOutputParser.js

@@ -1,33 +1,2 @@
-export function hasCdkDifferences(output) {
-    if (!output)
-        return false;
-    // Prefer the summary line: "Number of stacks with differences: 2"
-    const summaryRegex = /Number of stacks with differences:\s*(\d+)/;
-    const summaryMatch = output.match(summaryRegex);
-    if (summaryMatch && summaryMatch[1]) {
-        const diffCount = parseInt(summaryMatch[1], 10);
-        if (!isNaN(diffCount)) {
-            return diffCount > 0;
-        }
-    }
-    // Fallback: if all stacks report "There were no differences" then no changes
-    const allNoDiff = output
-        .split("\n")
-        .filter((l) => l.trim().startsWith("Stack"))
-        .every((l) => l.includes("There were no differences"));
-    return !allNoDiff;
-}
-export function parseDiffOutput(output) {
-    const details = {
-        hasSecurityChanges: output.includes("(requires replacement)") ||
-            output.includes("IAM Statement Changes"),
-        resourceChanges: 0,
-        outputChanges: 0,
-        resources: []
-    };
-    const resourceMatches = output.match(/\[\+\]|\[-\]|\[~\]/g);
-    if (resourceMatches) {
-        details.resourceChanges = resourceMatches.length;
-    }
-    return details;
-}
+function c(e){if(!e)return!1;const n=/Number of stacks with differences:\s*(\d+)/,s=e.match(n);if(s&&s[1]){const r=parseInt(s[1],10);if(!isNaN(r))return r>0}return!e.split(`
+`).filter(r=>r.trim().startsWith("Stack")).every(r=>r.includes("There were no differences"))}function a(e){const n={hasSecurityChanges:e.includes("(requires replacement)")||e.includes("IAM Statement Changes"),resourceChanges:0,outputChanges:0,resources:[]},s=e.match(/\[\+\]|\[-\]|\[~\]/g);return s&&(n.resourceChanges=s.length),n}export{c as hasCdkDifferences,a as parseDiffOutput};

package/dist/src/services/infrastructure/CdkProcessManager.d.ts

@@ -6,9 +6,13 @@ export declare class CdkProcessManager {
     private runningProcesses;
     private processCounter;
     private argBuilder;
+    private exitHandler;
+    private sigintHandler;
+    private sigtermHandler;
     constructor(argBuilder: CdkArgumentBuilder);
     forceKillProcess(child: ChildProcess): void;
     cleanup(): void;
+    dispose(): void;
     runCdkCommandPassthrough(workingDir: string, args: string[], options?: CdkOptions & {
         ignoreExitCode?: boolean;
     }): Promise<Result<CdkOutput, string>>;
@@ -16,5 +20,6 @@ export declare class CdkProcessManager {
         ignoreExitCode?: boolean;
         skipProjectCheck?: boolean;
         extraEnv?: Record<string, string>;
+        combineOutput?: boolean;
     }): Promise<Result<CdkOutput, string>>;
 }