Merge remote-tracking branch 'origin/main' into feature/scaffolding-framework

Author: clavery

.changeset/add-update-warning.md

@@ -0,0 +1,5 @@
+---
+'@salesforce/b2c-cli': patch
+---
+
+Add update notifications that warn users when a newer version of the CLI is available

.claude-plugin/marketplace.json

@@ -14,7 +14,7 @@
         "name": "Salesforce"
       },
       "license": "Apache-2.0",
-      "source": "./plugins/b2c-cli",
+      "source": "./skills/b2c-cli",
       "category": "productivity",
       "strict": false
     },
@@ -25,7 +25,7 @@
         "name": "Salesforce"
       },
       "license": "Apache-2.0",
-      "source": "./plugins/b2c",
+      "source": "./skills/b2c",
       "category": "productivity",
       "strict": false
     }

.claude/skills/api-client-development/SKILL.md

@@ -1,6 +1,8 @@
 ---
 name: api-client-development
 description: Creating API clients with OpenAPI specs, authentication, and OAuth scopes for SCAPI and similar APIs
+metadata:
+  internal: true
 ---
 
 # API Client Development

.claude/skills/cli-command-development/SKILL.md

@@ -1,6 +1,8 @@
 ---
 name: cli-command-development
 description: Creating new CLI commands and topics for the B2C CLI using oclif
+metadata:
+  internal: true
 ---
 
 # CLI Command Development
@@ -330,6 +332,6 @@ See [API Client Development](../api-client-development/SKILL.md#error-handling)
 5. Implement `run()` method with proper return type
 6. Add topic to `package.json` if new
 7. Add i18n keys for all user-facing strings
-8. Update skill in `plugins/b2c-cli/skills/b2c-<topic>/SKILL.md` if exists
+8. Update skill in `skills/b2c-cli/skills/b2c-<topic>/SKILL.md` if exists
 9. Update CLI reference docs in `docs/cli/<topic>.md`
 10. Build and test: `pnpm run build && pnpm --filter @salesforce/b2c-cli run test`

.claude/skills/documentation/SKILL.md

@@ -1,6 +1,8 @@
 ---
 name: documentation
 description: Updating user guides, CLI reference, and API documentation for the B2C CLI project
+metadata:
+  internal: true
 ---
 
 # Documentation
@@ -323,7 +325,7 @@ When adding new CLI commands or guide pages, update the sidebar config.
 
 ## Claude Code Skills (Plugin)
 
-The `plugins/b2c-cli/skills/` directory contains skills that teach Claude about using the CLI commands. These are distributed via the plugin.
+The `skills/b2c-cli/skills/` directory contains skills that teach Claude about using the CLI commands. These are distributed via the plugin.
 
 When to update:
 - New CLI commands added
@@ -364,7 +366,7 @@ b2c <topic> <command> --flag value
 
 1. Update `docs/cli/<topic>.md` with command documentation
 2. Update `docs/.vitepress/config.mts` sidebar if new topic
-3. Update `plugins/b2c-cli/skills/b2c-<topic>/SKILL.md` with examples
+3. Update `skills/b2c-cli/skills/b2c-<topic>/SKILL.md` with examples
 
 ### When Adding an SDK Module
 
@@ -376,7 +378,7 @@ b2c <topic> <command> --flag value
 ### When Changing CLI Behavior
 
 1. Update affected examples in `docs/cli/*.md`
-2. Update affected examples in `plugins/b2c-cli/skills/*/SKILL.md`
+2. Update affected examples in `skills/b2c-cli/skills/*/SKILL.md`
 3. Update guide pages if conceptual changes
 
 ### When Adding Configuration Options

.claude/skills/sdk-module-development/SKILL.md

@@ -1,6 +1,8 @@
 ---
 name: sdk-module-development
 description: Adding new modules and exports to the @salesforce/b2c-tooling-sdk package
+metadata:
+  internal: true
 ---
 
 # SDK Module Development

.claude/skills/skill-authoring/SKILL.md

@@ -1,6 +1,8 @@
 ---
 name: skill-authoring
 description: Guide for creating and maintaining user-facing agent skills
+metadata:
+  internal: true
 ---
 
 # Skill Authoring Guide

.claude/skills/testing/SKILL.md

@@ -1,6 +1,8 @@
 ---
 name: testing
 description: Writing tests for the B2C CLI project using Mocha, Chai, and MSW
+metadata:
+  internal: true
 ---
 
 # Testing

.github/workflows/e2e-tests.yml

@@ -38,7 +38,7 @@ jobs:
         node-version: [22.x]
     runs-on: ubuntu-latest
     environment: e2e-dev
-    timeout-minutes: 25
+    timeout-minutes: 40
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
@@ -110,8 +110,8 @@ jobs:
           echo "Running E2E tests with realm: ${TEST_REALM}"
           echo "Node version: $(node --version)"
           
-          # Run E2E tests with JSON reporter for test results
-          pnpm run test:e2e && pnpm run lint
+          # Run E2E tests with CI reporter (outputs test-results.json)
+          pnpm run test:e2e:ci && pnpm run lint
 
       - name: E2E Test Report
         uses: dorny/test-reporter@fe45e9537387dac839af0d33ba56eed8e24189e8  # v2.3.0

.github/workflows/publish.yml

@@ -142,11 +142,11 @@ jobs:
       - name: Package skills artifacts
         if: steps.release-type.outputs.type == 'stable'
         run: |
-          # Create b2c-skills.zip containing plugins/b2c/skills/
-          cd plugins/b2c && zip -r ../../b2c-skills.zip skills/
+          # Create b2c-skills.zip containing skills/b2c/skills/
+          cd skills/b2c && zip -r ../../b2c-skills.zip skills/
           cd ../..
-          # Create b2c-cli-skills.zip containing plugins/b2c-cli/skills/
-          cd plugins/b2c-cli && zip -r ../../b2c-cli-skills.zip skills/
+          # Create b2c-cli-skills.zip containing skills/b2c-cli/skills/
+          cd skills/b2c-cli && zip -r ../../b2c-cli-skills.zip skills/
           cd ../..
           echo "Created skills artifacts:"
           ls -la *.zip