Merge branch 'main' into dependabot/npm_and_yarn/src/Elastic.Documentation.Site/tailwindcss-f9011fdf4b

Author: reakaleek

.github/copilot-instructions.md

@@ -3,8 +3,7 @@
 **ALWAYS reference these instructions first and fallback to search or bash commands only when you encounter unexpected information that does not match the info here.**
 
 Elastic's distributed documentation tooling system built on .NET 9, consisting of:
-- **docs-builder**: CLI tool for building single documentation sets
-- **docs-assembler**: CLI tool for assembling multiple doc sets
+- **docs-builder**: CLI tool for building single documentation sets or assembling or assembling multiple documentation sets
 - Written in C# and F# with extensive Markdown processing capabilities
 
 ## Working Effectively
@@ -77,10 +76,10 @@ dotnet run --project src/tooling/docs-builder -- serve
 dotnet run --project src/tooling/docs-builder -- --help
 
 # Get help for docs-assembler
-dotnet run --project src/tooling/docs-assembler -- --help
+dotnet run --project src/tooling/docs-builder -- assemble --help
 
 # Validate assembler configuration - takes 15 seconds
-dotnet run --project src/tooling/docs-assembler -c release -- navigation validate
+dotnet run --project src/tooling/docs-builder -c release -- assembler navigation validate
 ```
 
 ### Local Development Orchestration
@@ -126,7 +125,6 @@ src/
   ├── Elastic.Markdown/              # Core Markdown processing engine
   ├── tooling/
   │   ├── docs-builder/               # Main CLI application
-  │   └── docs-assembler/             # Assembly tool
   ├── Elastic.Documentation.Site/    # Web rendering components (TypeScript/CSS)
   └── Elastic.Documentation.Configuration/  # Configuration handling
 
@@ -142,7 +140,7 @@ config/                               # YAML configuration files
 
 ### Adding New Features
 - **Markdown Extensions**: Add to `src/Elastic.Markdown/Myst/`
-- **CLI Commands**: Extend `src/tooling/docs-builder/Cli/` or `docs-assembler/Cli/`
+- **CLI Commands**: Extend `src/tooling/docs-builder/Commands/` 
 - **Web Components**: Add to `src/Elastic.Documentation.Site/`
 - **Configuration**: Modify `src/Elastic.Documentation.Configuration/`
 

.github/workflows/ci.yml

@@ -27,10 +27,10 @@ jobs:
         uses: ./.github/actions/bootstrap
 
       - name: Validate Navigation
-        run: dotnet run --project src/tooling/docs-assembler -c release -- navigation validate
+        run: dotnet run --project src/tooling/docs-builder -c release -- assembler navigation validate
 
       - name: Validate Content Sources
-        run: dotnet run --project src/tooling/docs-assembler -c release -- content-source validate
+        run: dotnet run --project src/tooling/docs-builder -c release -- assembler content-source validate
 
   build-link-index-updater-lambda:
     uses: ./.github/workflows/build-link-index-updater-lambda.yml

.github/workflows/preview-build.yml

@@ -456,7 +456,7 @@ jobs:
             )
           )
         run: |
-          dotnet run --project src/tooling/docs-assembler -- navigation validate-link-reference
+          dotnet run --project src/tooling/docs-builder -- assembler navigation validate-link-reference
 
       - uses: elastic/docs-builder/.github/actions/aws-auth@main
         if: >

.github/workflows/release.yml

@@ -167,14 +167,12 @@ jobs:
         with:
           subject-path: |
             .artifacts/publish/docs-builder/release/*.zip
-            .artifacts/publish/docs-assembler/release/*.zip
 
       - name: Attach Distribution to release
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           gh release upload ${{ needs.release-drafter.outputs.tag_name }} .artifacts/publish/docs-builder/release/*.zip
-          gh release upload ${{ needs.release-drafter.outputs.tag_name }} .artifacts/publish/docs-assembler/release/*.zip
         shell: bash
 
   publish-release:

AGENTS.md

@@ -6,8 +6,7 @@ This file contains instructions and guidance for AIs when working with the docs-
 
 This is Elastic's distributed documentation tooling system built on .NET 9, consisting of:
 
-- **docs-builder**: CLI tool for building single documentation sets
-- **docs-assembler**: CLI tool for assembling multiple doc sets
+- **docs-builder**: CLI tool for building documentation sets (either individual or assembled)
 - Written in C# and F# with extensive Markdown processing capabilities
 
 ## Essential commands
@@ -50,7 +49,6 @@ dotnet test --logger "console;verbosity=detailed"
 
 - `src/Elastic.Markdown/` - Core Markdown processing engine
 - `src/tooling/docs-builder/` - Main CLI application
-- `src/tooling/docs-assembler/` - Assembly tool
 - `src/Elastic.Documentation.Site/` - Web rendering components
 
 ### Testing Structure
@@ -70,7 +68,7 @@ dotnet test --logger "console;verbosity=detailed"
 ### Adding New Features
 
 1. **Markdown Extensions**: Add to `src/Elastic.Markdown/Myst/`
-2. **CLI Commands**: Extend `src/tooling/docs-builder/Cli/` or `docs-assembler/Cli/`
+2. **CLI Commands**: Extend `src/tooling/docs-builder/Commands/` 
 3. **Web Components**: Add to `src/Elastic.Documentation.Site/`
 4. **Configuration**: Modify `src/Elastic.Documentation.Configuration/`
 
@@ -99,7 +97,7 @@ You MUST update the documentation when there are changes in the markdown syntax
 
 ## Useful file locations
 
-- Entry points: `src/tooling/docs-builder/Program.cs`, `src/tooling/docs-assembler/Program.cs`
+- Entry points: `src/tooling/docs-builder/Program.cs`
 - Markdown processing: `src/Elastic.Markdown/Myst/`
 - Web assets: `src/Elastic.Documentation.Site/Assets/`
 - Configuration schemas: `src/Elastic.Documentation.Configuration/`

Directory.Packages.props

@@ -21,8 +21,8 @@
     <PackageVersion Include="Amazon.Lambda.SQSEvents" Version="2.2.0" />
     <PackageVersion Include="Aspire.Hosting" Version="9.5.2" />
     <PackageVersion Include="Aspire.Hosting.Testing" Version="9.4.2" />
-    <PackageVersion Include="AWSSDK.Core" Version="4.0.1.2" />
-    <PackageVersion Include="AWSSDK.SQS" Version="4.0.0.1" />
+    <PackageVersion Include="AWSSDK.Core" Version="4.0.1.3" />
+    <PackageVersion Include="AWSSDK.SQS" Version="4.0.2" />
     <PackageVersion Include="AWSSDK.S3" Version="4.0.7.14" />
     <PackageVersion Include="Elastic.OpenTelemetry" Version="1.1.0" />
     <PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.12.0" />
@@ -42,14 +42,14 @@
   <!-- Build -->
   <ItemGroup>
     <PackageVersion Include="Argu" Version="6.2.5" />
-    <PackageVersion Include="Bullseye" Version="5.0.0" />
+    <PackageVersion Include="Bullseye" Version="6.0.0" />
     <PackageVersion Include="Proc.Fs" Version="0.9.1" />
     <PackageVersion Include="Fake.Tools.Git" Version="6.1.3" />
     <PackageVersion Include="Fake.IO.Zip" Version="6.1.3" />
     <PackageVersion Include="FSharp.Core" Version="9.0.202" />
   </ItemGroup>
   <ItemGroup>
-    <PackageVersion Include="ConsoleAppFramework" Version="5.4.1" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
+    <PackageVersion Include="ConsoleAppFramework" Version="5.6.2" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
     <PackageVersion Include="ConsoleAppFramework.Abstractions" Version="5.4.1" />
     <PackageVersion Include="Crayon" Version="2.0.69" />
     <PackageVersion Include="DotNet.Glob" Version="3.1.3" />

README.md

@@ -4,12 +4,9 @@
 
 Distributed documentation tooling for a distributed company.
 
-This repository is host to:
-
 * *`docs-builder`* command line tool to generate single doc-sets
-* *`docs-assembler`* command line tool to assemble all the doc sets.
 
-Both get distributed [as native OSX, Linux and Windows binaries for several CPU architectures.](#installation)
+Distributed [as native OSX, Linux and Windows binaries for several CPU architectures.](#installation)
 
 The documentation files:
 * are written in common Markdown with [Additional syntax extensions](https://docs-v3-preview.elastic.dev/elastic/docs-builder/tree/main/syntax/) to produce a richer writing and reading experience. 
@@ -23,7 +20,7 @@ This tool builds each repository in isolation and in addition produces a full ma
 Each time a repository successfully builds on its respective main integration branch, our automation will publish its links.json file.
 For example, [Elasticsearch's links.json](https://elastic-docs-link-index.s3.us-east-2.amazonaws.com/elastic/elasticsearch/main/links.json) representing all linkable resources in the Elasticsearch repository.
 
-The `docs-assembler` tool then assembles all the repositories in the [link-registry](https://elastic-docs-link-index.s3.us-east-2.amazonaws.com/link-index.json) using their last known good commit.
+The `docs-builder assemble` command then assembles all the repositories in the [link-registry](https://elastic-docs-link-index.s3.us-east-2.amazonaws.com/link-index.json) using their last known good commit.
 
 This allows us to:
 
@@ -58,8 +55,7 @@ Install [.NET 9.0](https://dotnet.microsoft.com/en-us/download/dotnet/9.0), then
 After which the locally built binaries will be available at:
 
 * **docs-builder**: `./.artifacts/publish/docs-builder/release/docs-builder`
-* **docs-assembler**: `./.artifacts/publish/docs-assembler/release/docs-assembler`
- 
+
 ## Getting Started
 
 Our [Documentation](https://docs-v3-preview.elastic.dev/elastic/docs-builder/tree/main/contribute/locally) is the best place to learn how to start using the tool locally.

actions/assembler-config-validate/action.yml

@@ -27,6 +27,8 @@ outputs:
 
 runs:
   using: 'docker'
-  image: "docker://ghcr.io/elastic/docs-assembler:edge"
-  env:
-    INPUT_COMMAND: "content-source match"
+  image: "docker://ghcr.io/elastic/docs-builder:edge"
+  args:
+    - "assembler"
+    - "content-source"
+    - "match"