@invarn/cibuild 1.4.0 → 1.4.2

package/dist/src/shared/detect-project.js

@@ -0,0 +1,53 @@
+import { existsSync, readdirSync, statSync } from "node:fs";
+import { resolve } from "node:path";
+/**
+ * Detects whether the given directory is the root of an Android, iOS, or
+ * KMM project. Returns the detected project type, or null if none match.
+ *
+ * KMM is checked before Android because both have Gradle files; KMM is
+ * distinguished by the presence of an `iosApp/`, `shared/`, or
+ * `composeApp/` directory alongside the Gradle files.
+ */
+export function detectMobileProjectRoot(dir) {
+    const androidIndicators = [
+        "build.gradle",
+        "build.gradle.kts",
+        "settings.gradle",
+        "settings.gradle.kts",
+        "gradlew",
+    ];
+    const hasAndroidIndicator = androidIndicators.some((f) => existsSync(resolve(dir, f)));
+    if (hasAndroidIndicator) {
+        const kmmIndicators = ["iosApp", "shared", "composeApp"];
+        const hasKmmIndicator = kmmIndicators.some((d) => {
+            const fullPath = resolve(dir, d);
+            try {
+                return existsSync(fullPath) && statSync(fullPath).isDirectory();
+            }
+            catch {
+                return false;
+            }
+        });
+        if (hasKmmIndicator)
+            return "kmm";
+        return "android";
+    }
+    const iosFileIndicators = ["Podfile"];
+    const hasIosFile = iosFileIndicators.some((f) => existsSync(resolve(dir, f)));
+    if (!hasIosFile) {
+        try {
+            const entries = readdirSync(dir);
+            const hasXcodeDir = entries.some((e) => e.endsWith(".xcodeproj") || e.endsWith(".xcworkspace"));
+            if (hasXcodeDir)
+                return "ios";
+        }
+        catch {
+            // Unreadable directory — fall through.
+        }
+    }
+    else {
+        return "ios";
+    }
+    return null;
+}
+//# sourceMappingURL=detect-project.js.map

package/dist/src/shared/gitignore.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Ensures CI Build runtime files are listed in .gitignore. Safe to call
+ * repeatedly — only appends entries that are missing.
+ */
+export declare function ensureCiBuildGitignoreEntries(cwd: string): void;
+//# sourceMappingURL=gitignore.d.ts.map

package/dist/src/shared/gitignore.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"gitignore.d.ts","sourceRoot":"","sources":["../../../src/shared/gitignore.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,wBAAgB,6BAA6B,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAiB/D"}

package/dist/src/shared/gitignore.js

@@ -0,0 +1,26 @@
+import { appendFileSync, existsSync, readFileSync, writeFileSync } from "node:fs";
+import { resolve } from "node:path";
+/**
+ * Ensures CI Build runtime files are listed in .gitignore. Safe to call
+ * repeatedly — only appends entries that are missing.
+ */
+export function ensureCiBuildGitignoreEntries(cwd) {
+    const gitignorePath = resolve(cwd, ".gitignore");
+    const gitignoreEntries = [".cibuild-secrets.json", ".ci/.envstore.json", ".ci/keys/", "build/"];
+    if (existsSync(gitignorePath)) {
+        const contents = readFileSync(gitignorePath, "utf-8");
+        const lines = contents.split("\n").map((l) => l.trim());
+        const toAdd = gitignoreEntries.filter((e) => !lines.includes(e));
+        if (toAdd.length > 0) {
+            appendFileSync(gitignorePath, `\n${toAdd.join("\n")}\n`);
+            for (const entry of toAdd) {
+                console.log(`✅ Added ${entry} to .gitignore`);
+            }
+        }
+    }
+    else {
+        writeFileSync(gitignorePath, `${gitignoreEntries.join("\n")}\n`);
+        console.log(`✅ Created .gitignore with CI Build entries`);
+    }
+}
+//# sourceMappingURL=gitignore.js.map

package/dist/src/shared/prompts.d.ts

@@ -0,0 +1,18 @@
+import type { YAMLPipeline } from "../yaml/types.js";
+import type { CIConfig } from "../types.js";
+/**
+ * Shows an interactive workflow picker. If exactly one workflow exists,
+ * returns it without prompting. Returns `undefined` when the user cancels
+ * or no workflows are defined.
+ */
+export declare function promptForWorkflow(workflows: string[]): Promise<string | undefined>;
+/**
+ * Runs pre-execution validation, separates issues into user-fillable
+ * (missing env vars) vs hard-blocking, and collects all missing values
+ * upfront in a single form-like pass before execution begins.
+ *
+ * @returns true if it's safe to proceed, false if the user cancelled or
+ *   hard errors exist.
+ */
+export declare function promptForMissingVariables(yamlPipeline: YAMLPipeline, workflowName: string, config: CIConfig, yamlFilePath: string): Promise<boolean>;
+//# sourceMappingURL=prompts.d.ts.map

package/dist/src/shared/prompts.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"prompts.d.ts","sourceRoot":"","sources":["../../../src/shared/prompts.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAE5C;;;;GAIG;AACH,wBAAsB,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CA0BxF;AAED;;;;;;;GAOG;AACH,wBAAsB,yBAAyB,CAC7C,YAAY,EAAE,YAAY,EAC1B,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,QAAQ,EAChB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,OAAO,CAAC,CAgFlB"}

package/dist/src/shared/prompts.js

@@ -0,0 +1,96 @@
+import prompts from "prompts";
+import { StepValidator, formatValidationResult } from "../yaml/step-validator.js";
+import { MissingEnvHandler } from "../yaml/missing-env-handler.js";
+import { MissingEnvironmentVariableError } from "../yaml/env-resolver.js";
+/**
+ * Shows an interactive workflow picker. If exactly one workflow exists,
+ * returns it without prompting. Returns `undefined` when the user cancels
+ * or no workflows are defined.
+ */
+export async function promptForWorkflow(workflows) {
+    if (workflows.length === 0) {
+        console.error("Error: No workflows found in pipeline file");
+        return undefined;
+    }
+    if (workflows.length === 1) {
+        console.log(`Using workflow: ${workflows[0]}\n`);
+        return workflows[0];
+    }
+    const response = await prompts({
+        type: "select",
+        name: "workflow",
+        message: "Select a workflow to run:",
+        choices: workflows.map((name) => ({ title: name, value: name })),
+        initial: 0,
+    });
+    if (!response.workflow) {
+        console.log("\nWorkflow selection cancelled");
+        return undefined;
+    }
+    console.log();
+    return response.workflow;
+}
+/**
+ * Runs pre-execution validation, separates issues into user-fillable
+ * (missing env vars) vs hard-blocking, and collects all missing values
+ * upfront in a single form-like pass before execution begins.
+ *
+ * @returns true if it's safe to proceed, false if the user cancelled or
+ *   hard errors exist.
+ */
+export async function promptForMissingVariables(yamlPipeline, workflowName, config, yamlFilePath) {
+    console.log(`\n🔍 Running pre-execution validation...`);
+    const validator = new StepValidator(yamlPipeline, workflowName, config, yamlFilePath);
+    const result = await validator.validateWorkflow();
+    const errorIssues = result.issues.filter((i) => i.requirement.severity === "error" && i.result && !i.result.passed);
+    const fillable = errorIssues.filter((i) => i.requirement.timing === "pre-execution" &&
+        (i.requirement.category === "environment" || i.requirement.category === "input"));
+    const blocking = errorIssues.filter((i) => !(i.requirement.timing === "pre-execution" &&
+        (i.requirement.category === "environment" || i.requirement.category === "input")));
+    if (blocking.length > 0) {
+        console.log(formatValidationResult(result));
+        return false;
+    }
+    if (fillable.length === 0) {
+        if (result.counts.warnings > 0 || result.counts.info > 0) {
+            console.log(formatValidationResult(result));
+        }
+        else {
+            console.log("✅ Pre-execution validation passed\n");
+        }
+        return true;
+    }
+    console.log(`\n${fillable.length} required value(s) missing — provide them to continue:\n`);
+    for (const issue of fillable) {
+        const stepInfo = issue.stepName ? `  needed by: ${issue.stepName}` : "";
+        console.log(`  • ${issue.requirement.name.padEnd(30)}${stepInfo}`);
+    }
+    console.log();
+    const handler = new MissingEnvHandler({
+        interactive: true,
+        workflow: workflowName,
+    });
+    for (let i = 0; i < fillable.length; i++) {
+        const issue = fillable[i];
+        const error = new MissingEnvironmentVariableError(issue.requirement.name, issue.stepName, issue.requirement.hint);
+        const original = console.log;
+        const label = `(${i + 1} of ${fillable.length})`;
+        let patched = false;
+        console.log = (...args) => {
+            if (!patched && typeof args[0] === "string" && args[0].includes("MISSING REQUIRED")) {
+                original(`║  MISSING REQUIRED ENVIRONMENT VARIABLE ${label.padEnd(28)}║`);
+                patched = true;
+                return;
+            }
+            original(...args);
+        };
+        const handleResult = await handler.handleMissingVariable(error);
+        console.log = original;
+        if (handleResult.cancelled) {
+            return false;
+        }
+    }
+    handler.close();
+    return true;
+}
+//# sourceMappingURL=prompts.js.map

package/dist/src/yaml/converter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"converter.d.ts","sourceRoot":"","sources":["../../../src/yaml/converter.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAW,QAAQ,EAAE,MAAM,aAAa,CAAC;AAClE,OAAO,KAAK,EAAE,YAAY,EAA4B,MAAM,YAAY,CAAC;AAKzE,qBAAa,mBAAoB,SAAQ,KAAK;gBAChC,OAAO,EAAE,MAAM;CAI5B;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,WAAW,CAAC;IACtB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;CACtB;AAkCD;;;;;;;GAOG;AACH,wBAAsB,wBAAwB,CAC5C,QAAQ,EAAE,YAAY,EACtB,MAAM,EAAE,QAAQ,EAChB,YAAY,CAAC,EAAE,MAAM,EACrB,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,gBAAgB,CAAC,CAgH3B;AAwGD;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,YAAY,GAAG,MAAM,EAAE,CAEtE"}
+{"version":3,"file":"converter.d.ts","sourceRoot":"","sources":["../../../src/yaml/converter.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAW,QAAQ,EAAE,MAAM,aAAa,CAAC;AAClE,OAAO,KAAK,EAAE,YAAY,EAA4B,MAAM,YAAY,CAAC;AAKzE,qBAAa,mBAAoB,SAAQ,KAAK;gBAChC,OAAO,EAAE,MAAM;CAI5B;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,WAAW,CAAC;IACtB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;CACtB;AAkCD;;;;;;;GAOG;AACH,wBAAsB,wBAAwB,CAC5C,QAAQ,EAAE,YAAY,EACtB,MAAM,EAAE,QAAQ,EAChB,YAAY,CAAC,EAAE,MAAM,EACrB,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,gBAAgB,CAAC,CA0I3B;AAwGD;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,YAAY,GAAG,MAAM,EAAE,CAEtE"}

package/dist/src/yaml/converter.js

@@ -60,11 +60,35 @@ export async function convertYAMLToPipelineDef(pipeline, config, workflowName, y
     const platformInfo = detectPlatformInfo(pipeline, selectedWorkflowName);
     // Step 3: Environment variable resolution
     const envResolver = new EnvResolver(pipeline, selectedWorkflow, selectedWorkflowName, platformInfo.platform, platformInfo.stack, yamlFilePath);
+    // Step 3.5: Auto-inject cache steps if cachedBuild is enabled
+    const cibuildMeta = pipeline.meta?.['cibuild.io'];
+    const cachedBuild = cibuildMeta?.cachedBuild === true;
+    let workflowSteps = [...selectedWorkflow.steps];
+    if (cachedBuild && cibuildMeta?.platform) {
+        const platformToCacheTechnology = {
+            ios: 'ios',
+            android: 'gradle',
+            kmm: 'kmm',
+        };
+        const technology = platformToCacheTechnology[cibuildMeta.platform];
+        if (technology) {
+            // Remove any manually written cache-pull/cache-push steps
+            workflowSteps = workflowSteps.filter(step => {
+                const stepKey = Object.keys(step)[0];
+                const stepName = stepKey.split('@')[0];
+                return stepName !== 'cache-pull' && stepName !== 'cache-push';
+            });
+            const cachePullStep = { 'cache-pull@1.0.0': { inputs: { technology } } };
+            const cachePushStep = { 'cache-push@1.0.0': { inputs: { technology } } };
+            workflowSteps.unshift(cachePullStep);
+            workflowSteps.push(cachePushStep);
+        }
+    }
     // Step 4: Parse and convert steps
     const steps = [];
     const stepsOrder = [];
     let stepCounter = 0;
-    for (const yamlStep of selectedWorkflow.steps) {
+    for (const yamlStep of workflowSteps) {
         // Parse step (sub-task 3.8)
         const parsedStep = parseStep(yamlStep, stepCounter);
         stepCounter++;

package/dist/src/yaml/converter.test.js

@@ -6,6 +6,7 @@ import { convertYAMLToPipelineDef, YAMLConversionError } from './converter.js';
 import { clearRegistry, registerStep } from './steps/registry.js';
 import { ScriptStepExecutor } from './steps/script.js';
 import { CocoapodsInstallStepExecutor } from './steps/ios-deps.js';
+import { CachePullStepExecutor, CachePushStepExecutor } from './steps/cache.js';
 describe('convertYAMLToPipelineDef - Warning System', () => {
     let mockConfig;
     beforeEach(() => {
@@ -344,5 +345,153 @@ describe('convertYAMLToPipelineDef - Warning System', () => {
             expect(result.skippedSteps).toBeGreaterThan(0);
         });
     });
+    describe('cachedBuild auto-injection', () => {
+        beforeEach(() => {
+            registerStep('cache-pull', new CachePullStepExecutor());
+            registerStep('cache-push', new CachePushStepExecutor());
+        });
+        test('should inject cache-pull and cache-push when cachedBuild is true', async () => {
+            const pipeline = {
+                format_version: '1',
+                meta: {
+                    'cibuild.io': {
+                        stack: 'macos-xcode-26.4',
+                        platform: 'kmm',
+                        cachedBuild: true,
+                    },
+                },
+                workflows: {
+                    build: {
+                        steps: [
+                            { 'script@1.0.0': { inputs: { content: 'echo "building"' } } },
+                        ],
+                    },
+                },
+            };
+            const result = await convertYAMLToPipelineDef(pipeline, mockConfig, 'build');
+            expect(result.pipeline.steps.length).toBe(3);
+            expect(result.pipeline.steps[0].name).toBe('cache-pull');
+            expect(result.pipeline.steps[0].script).toContain('kmm-');
+            expect(result.pipeline.steps[1].name).toBe('script');
+            expect(result.pipeline.steps[2].name).toBe('cache-push');
+            expect(result.pipeline.steps[2].script).toContain('kmm-');
+        });
+        test('should not inject cache steps when cachedBuild is false', async () => {
+            const pipeline = {
+                format_version: '1',
+                meta: {
+                    'cibuild.io': {
+                        stack: 'macos-xcode-26.4',
+                        platform: 'kmm',
+                        cachedBuild: false,
+                    },
+                },
+                workflows: {
+                    build: {
+                        steps: [
+                            { 'script@1.0.0': { inputs: { content: 'echo "building"' } } },
+                        ],
+                    },
+                },
+            };
+            const result = await convertYAMLToPipelineDef(pipeline, mockConfig, 'build');
+            expect(result.pipeline.steps.length).toBe(1);
+            expect(result.pipeline.steps[0].name).toBe('script');
+        });
+        test('should not inject cache steps when cachedBuild is absent', async () => {
+            const pipeline = {
+                format_version: '1',
+                meta: {
+                    'cibuild.io': {
+                        stack: 'macos-xcode-26.4',
+                        platform: 'kmm',
+                    },
+                },
+                workflows: {
+                    build: {
+                        steps: [
+                            { 'script@1.0.0': { inputs: { content: 'echo "building"' } } },
+                        ],
+                    },
+                },
+            };
+            const result = await convertYAMLToPipelineDef(pipeline, mockConfig, 'build');
+            expect(result.pipeline.steps.length).toBe(1);
+        });
+        test('should use correct technology for android platform', async () => {
+            const pipeline = {
+                format_version: '1',
+                meta: {
+                    'cibuild.io': {
+                        stack: 'linux-docker-android-22.04',
+                        platform: 'android',
+                        cachedBuild: true,
+                    },
+                },
+                workflows: {
+                    build: {
+                        steps: [
+                            { 'script@1.0.0': { inputs: { content: 'echo "building"' } } },
+                        ],
+                    },
+                },
+            };
+            const result = await convertYAMLToPipelineDef(pipeline, mockConfig, 'build');
+            expect(result.pipeline.steps[0].script).toContain('gradle-');
+            expect(result.pipeline.steps[2].script).toContain('gradle-');
+        });
+        test('should use cocoapods technology for ios platform', async () => {
+            const pipeline = {
+                format_version: '1',
+                meta: {
+                    'cibuild.io': {
+                        stack: 'macos-xcode-26.4',
+                        platform: 'ios',
+                        cachedBuild: true,
+                    },
+                },
+                workflows: {
+                    build: {
+                        steps: [
+                            { 'script@1.0.0': { inputs: { content: 'echo "building"' } } },
+                        ],
+                    },
+                },
+            };
+            const result = await convertYAMLToPipelineDef(pipeline, mockConfig, 'build');
+            expect(result.pipeline.steps[0].script).toContain('pods-');
+            expect(result.pipeline.steps[2].script).toContain('pods-');
+        });
+        test('should strip manual cache steps when cachedBuild is true', async () => {
+            const pipeline = {
+                format_version: '1',
+                meta: {
+                    'cibuild.io': {
+                        stack: 'macos-xcode-26.4',
+                        platform: 'kmm',
+                        cachedBuild: true,
+                    },
+                },
+                workflows: {
+                    build: {
+                        steps: [
+                            { 'cache-pull@1.0.0': { inputs: { technology: 'gradle' } } },
+                            { 'script@1.0.0': { inputs: { content: 'echo "building"' } } },
+                            { 'cache-push@1.0.0': { inputs: { technology: 'gradle' } } },
+                        ],
+                    },
+                },
+            };
+            const result = await convertYAMLToPipelineDef(pipeline, mockConfig, 'build');
+            // Should have 3 steps: auto-injected pull, script, auto-injected push
+            // The manual cache steps should be replaced, not duplicated
+            expect(result.pipeline.steps.length).toBe(3);
+            expect(result.pipeline.steps[0].name).toBe('cache-pull');
+            expect(result.pipeline.steps[0].script).toContain('kmm-'); // auto uses kmm, not gradle
+            expect(result.pipeline.steps[1].name).toBe('script');
+            expect(result.pipeline.steps[2].name).toBe('cache-push');
+            expect(result.pipeline.steps[2].script).toContain('kmm-');
+        });
+    });
 });
 //# sourceMappingURL=converter.test.js.map

package/dist/src/yaml/steps/cache.d.ts

@@ -12,6 +12,8 @@ export interface CachePreset {
     lockfile: string;
     keyPrefix: string;
     paths: string[];
+    /** Optional fallback preset name: if primary lockfile not found, use this preset's lockfile/key/paths */
+    fallback?: string;
 }
 export declare const CACHE_PRESETS: Record<string, CachePreset>;
 /**

package/dist/src/yaml/steps/cache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../../../../src/yaml/steps/cache.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAExD;;;;GAIG;AACH,MAAM,WAAW,WAAW;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB;AAED,eAAO,MAAM,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CASrD,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,qBAAqB,CAAC,EAAE,OAAO,CAAC;CACjC;AAED;;;GAGG;AACH,qBAAa,qBAAsB,SAAQ,gBAAgB;IACnD,OAAO,CAAC,MAAM,EAAE,eAAe,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;YAoGzF,iBAAiB;CAoEhC;AAED;;;GAGG;AACH,qBAAa,qBAAsB,SAAQ,gBAAgB;IACnD,OAAO,CAAC,MAAM,EAAE,eAAe,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;YAwJzF,iBAAiB;CA0EhC"}
+{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../../../../src/yaml/steps/cache.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAExD;;;;GAIG;AACH,MAAM,WAAW,WAAW;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,yGAAyG;IACzG,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,eAAO,MAAM,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAUrD,CAAC;AAoBF;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,qBAAqB,CAAC,EAAE,OAAO,CAAC;CACjC;AAED;;;GAGG;AACH,qBAAa,qBAAsB,SAAQ,gBAAgB;IACnD,OAAO,CAAC,MAAM,EAAE,eAAe,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;YAoGzF,iBAAiB;CA2FhC;AAED;;;GAGG;AACH,qBAAa,qBAAsB,SAAQ,gBAAgB;IACnD,OAAO,CAAC,MAAM,EAAE,eAAe,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;YAwJzF,iBAAiB;CA6FhC"}

package/dist/src/yaml/steps/cache.js

@@ -3,6 +3,7 @@
  */
 import { BaseStepExecutor } from './base.js';
 export const CACHE_PRESETS = {
+    ios: { lockfile: 'Podfile.lock', keyPrefix: 'pods', paths: ['Pods'], fallback: 'spm' },
     cocoapods: { lockfile: 'Podfile.lock', keyPrefix: 'pods', paths: ['Pods'] },
     carthage: { lockfile: 'Cartfile.resolved', keyPrefix: 'carthage', paths: ['Carthage'] },
     spm: { lockfile: 'Package.resolved', keyPrefix: 'spm', paths: ['~/Library/Developer/Xcode/DerivedData/*/SourcePackages'] },
@@ -12,6 +13,24 @@ export const CACHE_PRESETS = {
     yarn: { lockfile: 'yarn.lock', keyPrefix: 'yarn', paths: ['node_modules'] },
     dart: { lockfile: 'pubspec.lock', keyPrefix: 'dart', paths: ['.dart_tool', '.pub-cache'] },
 };
+/**
+ * Resolves a preset with its fallback chain into a flat list of
+ * {lockfile, keyPrefix, paths} entries to try in order at runtime.
+ */
+function resolvePresetChain(technology) {
+    const chain = [];
+    let current = technology;
+    const visited = new Set();
+    while (current && !visited.has(current)) {
+        visited.add(current);
+        const preset = CACHE_PRESETS[current];
+        if (!preset)
+            break;
+        chain.push(preset);
+        current = preset.fallback;
+    }
+    return chain;
+}
 /**
  * Cache pull step executor
  * Restores cached files from cache directory
@@ -97,8 +116,8 @@ export class CachePullStepExecutor extends BaseStepExecutor {
     }
     async executeWithPreset(technology, inputs, config) {
         const stepName = 'cache-pull';
-        const preset = CACHE_PRESETS[technology];
-        if (!preset) {
+        const chain = resolvePresetChain(technology);
+        if (chain.length === 0) {
             const supported = Object.keys(CACHE_PRESETS).join(', ');
             throw new Error(`Unknown cache technology '${technology}'. Supported: ${supported}`);
         }
@@ -108,17 +127,39 @@ export class CachePullStepExecutor extends BaseStepExecutor {
         commands.push(`echo "Restoring ${technology} cache..."`);
         commands.push('');
         // Compute cache key from lockfile checksum at runtime
+        // If technology has a fallback chain, try each lockfile in order
         commands.push(`CACHE_DIR="${this.escapeBash(config.paths.cacheDir)}"`);
         commands.push('mkdir -p "$CACHE_DIR"');
         commands.push('');
-        commands.push(`LOCKFILE="${this.escapeBash(preset.lockfile)}"`);
-        commands.push('if [ -f "$LOCKFILE" ]; then');
-        commands.push(`  CHECKSUM=$(shasum -a 256 "$LOCKFILE" | cut -d ' ' -f1 | head -c 16)`);
-        commands.push(`  CACHE_KEY="${this.escapeBash(preset.keyPrefix)}-\${CHECKSUM}"`);
-        commands.push('else');
-        commands.push(`  echo "Warning: $LOCKFILE not found, using fallback cache key"`);
-        commands.push(`  CACHE_KEY="${this.escapeBash(preset.keyPrefix)}-no-lockfile"`);
-        commands.push('fi');
+        if (chain.length === 1) {
+            const preset = chain[0];
+            commands.push(`LOCKFILE="${this.escapeBash(preset.lockfile)}"`);
+            commands.push('if [ -f "$LOCKFILE" ]; then');
+            commands.push(`  CHECKSUM=$(shasum -a 256 "$LOCKFILE" | cut -d ' ' -f1 | head -c 16)`);
+            commands.push(`  CACHE_KEY="${this.escapeBash(preset.keyPrefix)}-\${CHECKSUM}"`);
+            commands.push('else');
+            commands.push(`  echo "Warning: $LOCKFILE not found, using fallback cache key"`);
+            commands.push(`  CACHE_KEY="${this.escapeBash(preset.keyPrefix)}-no-lockfile"`);
+            commands.push('fi');
+        }
+        else {
+            // Fallback chain: try each lockfile in order, use the first one found
+            for (let i = 0; i < chain.length; i++) {
+                const preset = chain[i];
+                const cond = i === 0 ? 'if' : 'elif';
+                commands.push(`${cond} [ -f "${this.escapeBash(preset.lockfile)}" ]; then`);
+                commands.push(`  LOCKFILE="${this.escapeBash(preset.lockfile)}"`);
+                commands.push(`  CHECKSUM=$(shasum -a 256 "$LOCKFILE" | cut -d ' ' -f1 | head -c 16)`);
+                commands.push(`  CACHE_KEY="${this.escapeBash(preset.keyPrefix)}-\${CHECKSUM}"`);
+                if (isDebugMode) {
+                    commands.push(`  echo "Detected: ${this.escapeBash(preset.keyPrefix)} (lockfile: $LOCKFILE)"`);
+                }
+            }
+            commands.push('else');
+            commands.push(`  echo "Warning: no lockfile found, using fallback cache key"`);
+            commands.push(`  CACHE_KEY="${this.escapeBash(chain[0].keyPrefix)}-no-lockfile"`);
+            commands.push('fi');
+        }
         commands.push('');
         if (isDebugMode) {
             commands.push('echo "Lockfile: $LOCKFILE"');
@@ -135,7 +176,8 @@ export class CachePullStepExecutor extends BaseStepExecutor {
         commands.push('  echo "Cache restored successfully"');
         if (isDebugMode) {
             commands.push('  echo "Restored paths:"');
-            for (const p of preset.paths) {
+            const allPaths = [...new Set(chain.flatMap(p => p.paths))];
+            for (const p of allPaths) {
                 commands.push(`  EXPANDED="${this.escapeBash(p)}"`);
                 commands.push('  EXPANDED="${EXPANDED/#~/${CIBUILD_USER_HOME:-$HOME}}"');
                 commands.push('  if [ -e "$EXPANDED" ]; then');
@@ -285,8 +327,8 @@ export class CachePushStepExecutor extends BaseStepExecutor {
     }
     async executeWithPreset(technology, inputs, config) {
         const stepName = 'cache-push';
-        const preset = CACHE_PRESETS[technology];
-        if (!preset) {
+        const chain = resolvePresetChain(technology);
+        if (chain.length === 0) {
             const supported = Object.keys(CACHE_PRESETS).join(', ');
             throw new Error(`Unknown cache technology '${technology}'. Supported: ${supported}`);
         }
@@ -299,14 +341,31 @@ export class CachePushStepExecutor extends BaseStepExecutor {
         commands.push(`CACHE_DIR="${this.escapeBash(config.paths.cacheDir)}"`);
         commands.push('mkdir -p "$CACHE_DIR"');
         commands.push('');
-        commands.push(`LOCKFILE="${this.escapeBash(preset.lockfile)}"`);
-        commands.push('if [ -f "$LOCKFILE" ]; then');
-        commands.push(`  CHECKSUM=$(shasum -a 256 "$LOCKFILE" | cut -d ' ' -f1 | head -c 16)`);
-        commands.push(`  CACHE_KEY="${this.escapeBash(preset.keyPrefix)}-\${CHECKSUM}"`);
-        commands.push('else');
-        commands.push(`  echo "Warning: $LOCKFILE not found, using fallback cache key"`);
-        commands.push(`  CACHE_KEY="${this.escapeBash(preset.keyPrefix)}-no-lockfile"`);
-        commands.push('fi');
+        if (chain.length === 1) {
+            const preset = chain[0];
+            commands.push(`LOCKFILE="${this.escapeBash(preset.lockfile)}"`);
+            commands.push('if [ -f "$LOCKFILE" ]; then');
+            commands.push(`  CHECKSUM=$(shasum -a 256 "$LOCKFILE" | cut -d ' ' -f1 | head -c 16)`);
+            commands.push(`  CACHE_KEY="${this.escapeBash(preset.keyPrefix)}-\${CHECKSUM}"`);
+            commands.push('else');
+            commands.push(`  echo "Warning: $LOCKFILE not found, using fallback cache key"`);
+            commands.push(`  CACHE_KEY="${this.escapeBash(preset.keyPrefix)}-no-lockfile"`);
+            commands.push('fi');
+        }
+        else {
+            for (let i = 0; i < chain.length; i++) {
+                const preset = chain[i];
+                const cond = i === 0 ? 'if' : 'elif';
+                commands.push(`${cond} [ -f "${this.escapeBash(preset.lockfile)}" ]; then`);
+                commands.push(`  LOCKFILE="${this.escapeBash(preset.lockfile)}"`);
+                commands.push(`  CHECKSUM=$(shasum -a 256 "$LOCKFILE" | cut -d ' ' -f1 | head -c 16)`);
+                commands.push(`  CACHE_KEY="${this.escapeBash(preset.keyPrefix)}-\${CHECKSUM}"`);
+            }
+            commands.push('else');
+            commands.push(`  echo "Warning: no lockfile found, using fallback cache key"`);
+            commands.push(`  CACHE_KEY="${this.escapeBash(chain[0].keyPrefix)}-no-lockfile"`);
+            commands.push('fi');
+        }
         commands.push('');
         if (isDebugMode) {
             commands.push('echo "Lockfile: $LOCKFILE"');
@@ -314,10 +373,12 @@ export class CachePushStepExecutor extends BaseStepExecutor {
         }
         commands.push('CACHE_FILE="$CACHE_DIR/$CACHE_KEY.tar.zst"');
         commands.push('');
-        // Collect paths to cache
+        // Collect paths to cache — use all paths from all presets in the chain,
+        // only archiving the ones that actually exist on disk
         commands.push('# Collect paths to cache');
         commands.push('PATHS_TO_CACHE=()');
-        for (const p of preset.paths) {
+        const allPaths = [...new Set(chain.flatMap(p => p.paths))];
+        for (const p of allPaths) {
             commands.push(`EXPANDED="${this.escapeBash(p)}"`);
             commands.push('EXPANDED="${EXPANDED/#~/${CIBUILD_USER_HOME:-$HOME}}"');
             commands.push('if [ -e "$EXPANDED" ]; then');

package/dist/src/yaml/types.d.ts

@@ -11,6 +11,7 @@ export interface YAMLCIBuildMeta {
     machine_type?: MachineType;
     machine_type_id?: string;
     platform?: 'ios' | 'android' | 'kmm';
+    cachedBuild?: boolean;
 }
 export interface YAMLMeta {
     'cibuild.io'?: YAMLCIBuildMeta;

package/dist/src/yaml/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/yaml/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,MAAM,MAAM,QAAQ,GAAG,OAAO,GAAG,OAAO,CAAC;AACzC,MAAM,MAAM,WAAW,GAAG,UAAU,GAAG,aAAa,CAAC;AAGrD,MAAM,WAAW,UAAU;IACzB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;CACvB;AAGD,MAAM,WAAW,eAAe;IAC9B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,WAAW,CAAC;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,EAAE,KAAK,GAAG,SAAS,GAAG,KAAK,CAAC;CACtC;AAED,MAAM,WAAW,QAAQ;IACvB,YAAY,CAAC,EAAE,eAAe,CAAC;IAC/B,YAAY,CAAC,EAAE,eAAe,CAAC;IAC/B,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB;AAGD,MAAM,WAAW,cAAc;IAC7B,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAGD,MAAM,WAAW,QAAQ;IACvB,CAAC,mBAAmB,EAAE,MAAM,GAAG;QAC7B,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,cAAc,CAAC;QACxB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,aAAa,CAAC,EAAE,OAAO,CAAC;QACxB,YAAY,CAAC,EAAE,OAAO,CAAC;KACxB,CAAC;CACH;AAGD,MAAM,WAAW,YAAY;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,UAAU,EAAE,CAAC;IACpB,KAAK,EAAE,QAAQ,EAAE,CAAC;CACnB;AAGD,MAAM,WAAW,OAAO;IACtB,IAAI,CAAC,EAAE,UAAU,EAAE,CAAC;CACrB;AAGD,MAAM,WAAW,WAAW;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,0BAA0B,CAAC,EAAE,MAAM,CAAC;IACpC,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAGD,MAAM,WAAW,YAAY;IAC3B,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,CAAC,EAAE,QAAQ,CAAC;IAChB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,SAAS,EAAE;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,CAAA;KAAE,CAAC;IAC5C,WAAW,CAAC,EAAE,WAAW,EAAE,CAAC;CAC7B;AAGD,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,cAAc,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAGD,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,QAAQ,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/yaml/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,MAAM,MAAM,QAAQ,GAAG,OAAO,GAAG,OAAO,CAAC;AACzC,MAAM,MAAM,WAAW,GAAG,UAAU,GAAG,aAAa,CAAC;AAGrD,MAAM,WAAW,UAAU;IACzB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;CACvB;AAGD,MAAM,WAAW,eAAe;IAC9B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,WAAW,CAAC;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,EAAE,KAAK,GAAG,SAAS,GAAG,KAAK,CAAC;IACrC,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,MAAM,WAAW,QAAQ;IACvB,YAAY,CAAC,EAAE,eAAe,CAAC;IAC/B,YAAY,CAAC,EAAE,eAAe,CAAC;IAC/B,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB;AAGD,MAAM,WAAW,cAAc;IAC7B,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAGD,MAAM,WAAW,QAAQ;IACvB,CAAC,mBAAmB,EAAE,MAAM,GAAG;QAC7B,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,cAAc,CAAC;QACxB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,aAAa,CAAC,EAAE,OAAO,CAAC;QACxB,YAAY,CAAC,EAAE,OAAO,CAAC;KACxB,CAAC;CACH;AAGD,MAAM,WAAW,YAAY;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,UAAU,EAAE,CAAC;IACpB,KAAK,EAAE,QAAQ,EAAE,CAAC;CACnB;AAGD,MAAM,WAAW,OAAO;IACtB,IAAI,CAAC,EAAE,UAAU,EAAE,CAAC;CACrB;AAGD,MAAM,WAAW,WAAW;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,0BAA0B,CAAC,EAAE,MAAM,CAAC;IACpC,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAGD,MAAM,WAAW,YAAY;IAC3B,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,CAAC,EAAE,QAAQ,CAAC;IAChB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,SAAS,EAAE;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,CAAA;KAAE,CAAC;IAC5C,WAAW,CAAC,EAAE,WAAW,EAAE,CAAC;CAC7B;AAGD,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,cAAc,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAGD,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,QAAQ,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B"}