Merge remote-tracking branch 'origin/feature/generic-artifact-system' into release/lts-2.0.0

# Conflicts:
#	dist/index.js
#	dist/index.js.map
#	src/index.ts
#	src/model/build-parameters.ts

src/index.ts

@@ -8,6 +8,9 @@ import { BuildReliabilityService } from './model/orchestrator/services/reliabili
 import { TestWorkflowService } from './model/orchestrator/services/test-workflow';
 import { HotRunnerService } from './model/orchestrator/services/hot-runner';
 import { HotRunnerConfig } from './model/orchestrator/services/hot-runner/hot-runner-types';
+import { OutputService } from './model/orchestrator/services/output/output-service';
+import { OutputTypeRegistry } from './model/orchestrator/services/output/output-type-registry';
+import { ArtifactUploadHandler } from './model/orchestrator/services/output/artifact-upload-handler';
 
 async function runMain() {
   try {
@@ -250,6 +253,64 @@ async function runMain() {
     await Output.setAndroidVersionCode(buildParameters.androidVersionCode);
     await Output.setEngineExitCode(exitCode);
 
+    // Artifact collection and upload (runs on both success and failure)
+    try {
+      // Register custom output types if provided
+      if (buildParameters.artifactCustomTypes) {
+        try {
+          const customTypes = JSON.parse(buildParameters.artifactCustomTypes);
+          if (Array.isArray(customTypes)) {
+            for (const ct of customTypes) {
+              OutputTypeRegistry.registerType({
+                name: ct.name,
+                defaultPath: ct.defaultPath || ct.pattern || `./${ct.name}/`,
+                description: ct.description || `Custom output type: ${ct.name}`,
+                builtIn: false,
+              });
+            }
+          }
+        } catch (parseError) {
+          core.warning(`Failed to parse artifactCustomTypes: ${(parseError as Error).message}`);
+        }
+      }
+
+      // Collect outputs and generate manifest
+      const manifestPath = path.join(buildParameters.projectPath, 'output-manifest.json');
+      const manifest = await OutputService.collectOutputs(
+        buildParameters.projectPath,
+        buildParameters.buildGuid,
+        buildParameters.artifactOutputTypes,
+        manifestPath,
+      );
+
+      core.setOutput('artifactManifestPath', manifestPath);
+
+      // Upload artifacts
+      const uploadConfig = ArtifactUploadHandler.parseConfig(
+        buildParameters.artifactUploadTarget,
+        buildParameters.artifactUploadPath || undefined,
+        buildParameters.artifactCompression,
+        buildParameters.artifactRetentionDays,
+      );
+
+      const uploadResult = await ArtifactUploadHandler.uploadArtifacts(
+        manifest,
+        uploadConfig,
+        buildParameters.projectPath,
+      );
+
+      if (!uploadResult.success) {
+        core.warning(
+          `Artifact upload completed with errors: ${uploadResult.entries
+            .filter((e) => !e.success)
+            .map((e) => `${e.type}: ${e.error}`)
+            .join('; ')}`,
+        );
+      }
+    } catch (artifactError) {
+      core.warning(`Artifact collection/upload failed: ${(artifactError as Error).message}`);
+    }
+
     if (exitCode !== 0) {
       core.setFailed(`Build failed with exit code ${exitCode}`);
     }