feat: add skills for AEM Cloud Service, AEM 6.5 LTS and App Builder (merge beta branch to main)

.claude-plugin/marketplace.json

@@ -12,10 +12,25 @@
       "source": "./skills/aem/edge-delivery-services",
       "description": "Skills for AEM Edge Delivery Services development"
     },
+    {
+      "name": "aem-cloud-service",
+      "source": "./skills/aem/cloud-service",
+      "description": "All AEM as a Cloud Service skills: component development and Dispatcher, workflows"
+    },
+    {
+      "name": "aem-6-5-lts",
+      "source": "./skills/aem/6.5-lts",
+      "description": "All AEM 6.5 LTS skills: Dispatcher, workflows for AEM 6.5 LTS and AMS environment"
+    },
     {
       "name": "aem-project-management",
       "source": "./skills/aem/project-management",
       "description": "Project lifecycle management for AEM Edge Delivery Services"
+    },
+    {
+      "name": "app-builder",
+      "source": "./skills/app-builder",
+      "description": "Development, customization, testing, and deployment skills for Adobe App Builder projects"
     }
   ]
-}
+}

.github/CODEOWNERS

@@ -24,3 +24,6 @@
 
 # AEM 6.5 LTS (in-flight, contributors: abhishekgarg18, akankshajain18, rombert)
 /skills/aem/6.5-lts/                                  @abhishekgarg18 @akankshajain18 @rombert
+
+# Adobe App Builder
+/skills/app-builder/skills                            @pkumargaddam

README.md

@@ -10,6 +10,9 @@ Repository of Adobe skills for AI coding agents.
 /plugin marketplace add adobe/skills
 /plugin install aem-edge-delivery-services@adobe-skills
 /plugin install aem-project-management@adobe-skills
+/plugin install app-builder@adobe-skills
+/plugin install aem-cloud-service@adobe-skills
+/plugin install aem-6-5-lts@adobe-skills
 ```
 
 ### Vercel Skills (npx skills)
@@ -63,6 +66,95 @@ gh upskill adobe/skills --all
 | `generate-import-html` | Generate structured HTML |
 | `preview-import` | Preview imported content |
 
+### AEM as a Cloud Service — Create Component
+
+The `create-component` skill creates complete AEM components following Adobe best practices for AEM Cloud Service and AEM 6.5. It covers:
+
+- Component definition, dialog XML, and HTL template
+- Sling Model and optional child item model (multifield)
+- Unit tests for models and servlets
+- Clientlibs (component and dialog)
+- Optional Sling Servlet for dynamic content
+
+See `skills/aem/cloud-service/skills/create-component/` for the skill and its reference files.
+
+### AEM as a Cloud Service — Ensure AGENTS.md (bootstrap)
+
+The `ensure-agents-md` skill is a **bootstrap skill** that runs first, before any other work. When a
+customer opens their AEM Cloud Service project and asks the agent anything, this skill checks whether
+`AGENTS.md` exists at the repo root. If missing, it:
+
+- Reads root `pom.xml` to resolve the project name and discover actual modules
+- Detects add-ons (CIF, Forms, SPA type, precompiled scripts)
+- Generates a tailored `AGENTS.md` with only the modules that exist, correct frontend variant, conditional
+  Dispatcher MCP section, and the right resource links
+- Creates `CLAUDE.md` (`@AGENTS.md`) so Claude-based tools also discover the guidance
+
+If `AGENTS.md` already exists it is never overwritten.
+
+See `skills/aem/cloud-service/skills/ensure-agents-md/` for the skill, template, and module catalog.
+
+### AEM Workflow
+
+Workflow skills cover the full AEM Granite Workflow Engine lifecycle — from designing and implementing workflows to production debugging and incident triaging. Like Dispatcher, they are split by runtime flavor:
+
+- `skills/aem/cloud-service/skills/aem-workflow` — Cloud Service variant (no JMX, Cloud Manager logs, pipeline deploy)
+- `skills/aem/6.5-lts/skills/aem-workflow` — 6.5 LTS / AMS variant (JMX, Felix Console, direct log access)
+
+Each flavor contains the same specialist sub-skills:
+
+| Sub-Skill | Purpose |
+|---|---|
+| `workflow-model-design` | Design workflow models, step types, OR/AND splits, variables |
+| `workflow-development` | Implement WorkflowProcess steps, ParticipantStepChooser, OSGi services |
+| `workflow-triggering` | Start workflows from UI, code, HTTP API, or Manage Publication |
+| `workflow-launchers` | Configure automatic workflow launchers on JCR events |
+| `workflow-debugging` | Debug stuck, failed, or stale workflows in production |
+| `workflow-triaging` | Classify incidents, determine log patterns, Splunk queries |
+| `workflow-orchestrator` | Full lifecycle orchestration across all sub-skills |
+
+### AEM Dispatcher
+
+Dispatcher skills are split by runtime flavor to avoid mode auto-detection and keep installation explicit.
+Install only one dispatcher flavor in a workspace (`cloud-service` or `6.5-lts`).
+
+Current dispatcher flavors:
+- `skills/aem/cloud-service/skills/dispatcher`
+- `skills/aem/6.5-lts/skills/dispatcher`
+
+Each flavor contains parallel capability groups (workflow orchestration, config authoring, technical advisory, incident response, performance tuning, and security hardening).
+Shared advisory logic is centralized under each flavor's `dispatcher/shared/references/` to reduce duplication and drift.
+
+### AEM Replication
+
+Replication skills for AEM 6.5 LTS cover the full content distribution lifecycle from agent configuration to troubleshooting.
+
+**Location:** `skills/aem/6.5-lts/skills/aem-replication`
+
+The aem-replication skill contains four specialist sub-skills:
+
+| Sub-Skill | Purpose |
+|---|---|
+| `configure-replication-agent` | Configure replication agents for publishing, dispatcher flush, and reverse replication |
+| `replicate-content` | Activate and deactivate content using UI, workflows, and package manager |
+| `replication-api` | Use the Replication API programmatically in custom code with complete Java examples |
+| `troubleshoot-replication` | Diagnose and fix blocked queues, connectivity failures, and distribution problems |
+
+**Key features:**
+- All skills based on official AEM 6.5 LTS documentation
+- Complete coverage of public Replication API (Replicator, ReplicationOptions, AgentManager, ReplicationQueue, etc.)
+- 49 Java code examples for OSGi services, servlets, and workflow steps
+- 12+ troubleshooting scenarios with step-by-step resolution
+- 3,575 lines of comprehensive documentation
+
+### AEM as a Cloud Service — Best Practices & Migration
+
+Under `skills/aem/cloud-service/skills/`, **`best-practices/`** is the **general-purpose** Cloud Service skill: pattern modules, Java baseline references (SCR→OSGi DS, resolver/logging, and related refs), and day-to-day Cloud Service alignment. Use it **without** loading **migration** for greenfield or maintainability work. **`migration/`** (BPA/CAM orchestration) is **scoped to legacy AEM → AEM as a Cloud Service** (not Edge Delivery or 6.5 LTS); it **delegates** concrete refactors to **`best-practices`** (`references/`). **Installing the AEM as a Cloud Service plugin** (`aem-cloud-service`, or the `skills/aem/cloud-service` path with `npx skills` / `gh upskill`) **includes both**; the agent should load the appropriate `SKILL.md` for the task. Use **`gh upskill` / `npx skills` with `--skill`** when you need a specific bundled skill (see **Installation** above).
+
+**Key features:**
+- **Best practices:** one skill for patterns, SCR→OSGi DS, and resolver/logging — applicable to Cloud Service projects generally, not only migration
+- **Migration:** orchestration-only; pattern and transformation content lives in **`best-practices`**
+
 ##### Managing Projects
 
 Handover documentation and PDF generation for AEM Edge Delivery Services projects.
@@ -76,6 +168,24 @@ Handover documentation and PDF generation for AEM Edge Delivery Services project
 | `whitepaper` | Create professional PDF whitepapers from Markdown |
 | `auth` | Authenticate with AEM Config Service API |
 
+### App Builder
+
+Development, customization, testing, and deployment skills for Adobe App Builder projects.
+
+**Skill chaining:**
+- **Actions path:** `appbuilder-project-init` → `appbuilder-action-scaffolder` → `appbuilder-testing` → `appbuilder-cicd-pipeline`
+- **UI path:** `appbuilder-project-init` → `appbuilder-ui-scaffolder` → `appbuilder-testing` → `appbuilder-cicd-pipeline`
+- **E2E path:** `appbuilder-ui-scaffolder` or `appbuilder-testing` → `appbuilder-e2e-testing` → `appbuilder-cicd-pipeline`
+
+| Skill | Description |
+|-------|-------------|
+| `appbuilder-project-init` | Initialize new Adobe App Builder projects and choose the right bootstrap path |
+| `appbuilder-action-scaffolder` | Scaffold, implement, deploy, and debug Adobe Runtime actions |
+| `appbuilder-ui-scaffolder` | Generate React Spectrum UI components for ExC Shell SPAs and AEM UI Extensions |
+| `appbuilder-testing` | Generate and run Jest unit, integration, and contract tests for actions and UI components |
+| `appbuilder-e2e-testing` | Playwright browser E2E tests for ExC Shell SPAs and AEM extensions |
+| `appbuilder-cicd-pipeline` | Set up CI/CD pipelines for GitHub Actions, Azure DevOps, and GitLab CI |
+
 ### Creativity & Design
 
 _Coming soon._
@@ -84,13 +194,108 @@ _Coming soon._
 
 ```
 skills/
-└── aem/
-    ├── edge-delivery-services/
-    │   ├── .claude-plugin/
-    │   └── skills/
-    └── project-management/
-        ├── .claude-plugin/
-        └── skills/
+├── aem/
+│   ├── edge-delivery-services/
+│   │   ├── .claude-plugin/
+│   │   │   └── plugin.json
+│   │   └── skills/
+│   │       ├── content-driven-development/
+│   │       ├── building-blocks/
+│   │       └── ...
+│   ├── project-management/
+│   │   ├── .claude-plugin/
+│   │   │   └── plugin.json
+│   │   ├── fonts/
+│   │   ├── hooks/
+│   │   │   └── pdf-lifecycle.js
+│   │   ├── templates/
+│   │   │   └── whitepaper.typ
+│   │   └── skills/
+│   │       ├── handover/
+│   │       ├── authoring/
+│   │       ├── development/
+│   │       ├── admin/
+│   │       ├── whitepaper/
+│   │       └── auth/
+│   ├── cloud-service/
+│   │   ├── .claude-plugin/
+│   │   │   └── plugin.json
+│   │   └── skills/
+│   │       ├── best-practices/
+│   │       │   ├── README.md
+│   │       │   ├── SKILL.md
+│   │       │   └── references/
+│   │       ├── migration/
+│   │       │   ├── README.md
+│   │       │   ├── SKILL.md
+│   │       │   ├── references/
+│   │       │   └── scripts/
+│   │       ├── ensure-agents-md/
+│   │       │   ├── SKILL.md
+│   │       │   └── references/
+│   │       │       ├── AGENTS.md.template
+│   │       │       └── module-catalog.md
+│   │       ├── create-component/
+│   │       │   ├── SKILL.md
+│   │       │   ├── assets/
+│   │       │   └── references/
+│   │       ├── aem-workflow/
+│   │       │   ├── SKILL.md
+│   │       │   ├── workflow-model-design/
+│   │       │   ├── workflow-development/
+│   │       │   ├── workflow-triggering/
+│   │       │   ├── workflow-launchers/
+│   │       │   ├── workflow-debugging/
+│   │       │   ├── workflow-triaging/
+│   │       │   └── workflow-orchestrator/
+│   │       └── dispatcher/
+│   │           ├── SKILL.md
+│   │           ├── config-authoring/
+│   │           ├── technical-advisory/
+│   │           ├── incident-response/
+│   │           ├── performance-tuning/
+│   │           ├── security-hardening/
+│   │           └── workflow-orchestrator/
+│   └── 6.5-lts/
+│       ├── .claude-plugin/
+│       │   └── plugin.json
+│       └── skills/
+│           ├── aem-workflow/
+│           │   ├── SKILL.md
+│           │   ├── workflow-model-design/
+│           │   ├── workflow-development/
+│           │   ├── workflow-triggering/
+│           │   ├── workflow-launchers/
+│           │   ├── workflow-debugging/
+│           │   ├── workflow-triaging/
+│           │   └── workflow-orchestrator/
+│           ├── aem-replication/
+│           │   ├── README.md
+│           │   ├── SKILL.md
+│           │   ├── configure-replication-agent/
+│           │   ├── replicate-content/
+│           │   ├── replication-api/
+│           │   └── troubleshoot-replication/
+│           ├── ensure-agents-md/
+│           └── dispatcher/
+│               ├── SKILL.md
+│               ├── config-authoring/
+│               ├── technical-advisory/
+│               ├── incident-response/
+│               ├── performance-tuning/
+│               ├── security-hardening/
+│               └── workflow-orchestrator/
+└── app-builder/
+    ├── .claude-plugin/
+    │   └── plugin.json
+    └── skills/
+        ├── _shared/
+        ├── appbuilder-project-init/
+        ├── appbuilder-action-scaffolder/
+        ├── appbuilder-ui-scaffolder/
+        ├── appbuilder-testing/
+        ├── appbuilder-e2e-testing/
+        └── appbuilder-cicd-pipeline/
 ```
 
 ## Contributing
@@ -102,7 +307,7 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for guidelines on adding or updating skil
 - [agentskills.io Specification](https://agentskills.io)
 - [Claude Code Plugins](https://code.claude.com/docs/en/discover-plugins)
 - [Vercel Skills](https://github.com/vercel-labs/skills)
-- [upskill GitHub Extension](https://github.com/trieloff/gh-upskill)
+- [upskill GitHub Extension](https://github.com/ai-ecoverse/gh-upskill)
 - [#agentskills Slack Channel](https://adobe.enterprise.slack.com/archives/C0APTKDNPEY)
 
 ## License

skills/aem/6.5-lts/.claude-plugin/plugin.json

@@ -0,0 +1,11 @@
+{
+  "name": "aem-6-5-lts",
+  "description": "All AEM 6.5 LTS skills: Workflow model design, development, triggering, launchers, debugging, and triaging; Dispatcher config authoring, advisory, incident response, performance tuning, and security hardening; and Replication agent configuration, content activation, API usage, and troubleshooting for AEM 6.5 LTS and AMS environments.",
+  "version": "1.0.0",
+  "author": {
+    "name": "Adobe"
+  },
+  "repository": "https://github.com/adobe/skills",
+  "license": "Apache-2.0",
+  "keywords": ["aem", "aem6.5", "6.5-lts", "ams", "dispatcher", "httpd", "apache", "workflow", "replication", "adobe"]
+}

skills/aem/6.5-lts/CLAUDE.md

@@ -0,0 +1,21 @@
+# Conventions for this skill tree
+
+## Beta skills
+
+Skills that are not yet production-ready are marked with beta status using three mechanisms.
+All three must be applied together. To check whether a skill is beta, look for `status: beta`
+in its SKILL.md frontmatter.
+
+1. **Frontmatter `status: beta`** -- machine-readable field for tooling
+2. **`[BETA]` prefix in `description`** -- visible to the LLM during skill selection,
+   followed by a caveat line: "This skill is in beta. Verify all outputs before
+   applying them to production projects."
+3. **Blockquote in body** -- visible to the LLM during skill execution:
+   ```
+   > **Beta Skill**: This skill is in beta and under active development.
+   > Results should be reviewed carefully before use in production.
+   > Report issues at https://github.com/adobe/skills/issues
+   ```
+
+When creating or modifying skills, preserve these markers. Do not remove beta
+status without explicit instruction.