Refactor Skills

.agents/plugins/marketplace.json

@@ -0,0 +1,20 @@
+{
+  "name": "cloudflare-skills",
+  "interface": {
+    "displayName": "Cloudflare Skills"
+  },
+  "plugins": [
+    {
+      "name": "cloudflare",
+      "source": {
+        "source": "local",
+        "path": "./"
+      },
+      "policy": {
+        "installation": "AVAILABLE",
+        "authentication": "ON_INSTALL"
+      },
+      "category": "Developer Tools"
+    }
+  ]
+}

.claude-plugin/marketplace.json

@@ -1,9 +1,9 @@
 {
-  "$schema": "https://code.claude.com/schemas/marketplace.json",
+  "$schema": "https://json.schemastore.org/claude-code-marketplace.json",
   "name": "cloudflare",
   "owner": {
     "name": "Cloudflare",
-    "url": "https://workers.cloudflare.com"
+    "url": "https://www.cloudflare.com/products/workers/"
   },
   "plugins": [
     {

.claude-plugin/plugin.json

@@ -1,7 +1,8 @@
 {
   "name": "cloudflare",
-  "description": "Skills for the Cloudflare developer platform: Workers, Durable Objects, Agents SDK, MCP servers, Wrangler CLI, and web performance",
+  "description": "Skills for the Cloudflare developer platform: Workers, Durable Objects, Browser Run, Dynamic Workers, Workflows, Agents SDK, the Cloudflare API MCP server, Wrangler CLI, and web performance",
   "version": "1.0.0",
+  "mcpServers": "./.mcp.json",
   "author": {
     "name": "Cloudflare"
   }

.codex-plugin/plugin.json

@@ -0,0 +1,50 @@
+{
+  "name": "cloudflare",
+  "version": "1.0.0",
+  "description": "Skills for the Cloudflare developer platform: Workers, Durable Objects, Browser Run, Dynamic Workers, Workflows, Agents SDK, the Cloudflare API MCP server, Wrangler CLI, and web performance.",
+  "author": {
+    "name": "Cloudflare",
+    "email": "support@cloudflare.com",
+    "url": "https://www.cloudflare.com/products/workers/"
+  },
+  "homepage": "https://developers.cloudflare.com/",
+  "repository": "https://github.com/cloudflare/skills",
+  "license": "Apache-2.0",
+  "keywords": [
+    "cloudflare",
+    "workers",
+    "durable-objects",
+    "agents",
+    "mcp",
+    "wrangler",
+    "serverless",
+    "compute",
+    "storage",
+    "applications"
+  ],
+  "skills": "./skills/",
+  "mcpServers": "./.mcp.json",
+  "interface": {
+    "displayName": "Cloudflare",
+    "shortDescription": "Cloudflare developer platform skills and MCP",
+    "longDescription": "Bring Cloudflare platform guidance into Codex with skills for Workers, Durable Objects, Browser Run, Dynamic Workers, Workflows, Agents SDK, Cloudflare One, Wrangler, web performance, and Turnstile, plus the Cloudflare API Code Mode MCP server for live account and API workflows.",
+    "developerName": "Cloudflare",
+    "category": "Developer Tools",
+    "capabilities": [
+      "Interactive",
+      "Write"
+    ],
+    "websiteURL": "https://developers.cloudflare.com/",
+    "privacyPolicyURL": "https://www.cloudflare.com/privacypolicy/",
+    "termsOfServiceURL": "https://www.cloudflare.com/website-terms/",
+    "defaultPrompt": [
+      "Build a Cloudflare Worker or agent with the right SDK and Wrangler setup",
+      "Review this Cloudflare project for production Workers best practices",
+      "Use Cloudflare docs and MCP to inspect or deploy this project"
+    ],
+    "brandColor": "#F6821F",
+    "composerIcon": "./assets/cloudflare.svg",
+    "logo": "./assets/cloudflare.svg",
+    "screenshots": []
+  }
+}

.cursor-plugin/plugin.json

@@ -1,11 +1,11 @@
 {
   "name": "cloudflare",
   "version": "1.0.0",
-  "description": "Skills for the Cloudflare developer platform: Workers, Durable Objects, Agents SDK, MCP servers, Wrangler CLI, and web performance",
+  "description": "Skills for the Cloudflare developer platform: Workers, Durable Objects, Browser Run, Dynamic Workers, Workflows, Agents SDK, the Cloudflare API MCP server, Wrangler CLI, and web performance",
   "author": {
     "name": "Cloudflare",
     "email": "support@cloudflare.com",
-    "url": "https://workers.cloudflare.com"
+    "url": "https://www.cloudflare.com/products/workers/"
   },
   "keywords": ["cloudflare", "workers", "durable-objects", "agents", "mcp", "wrangler", "serverless", "compute", "storage", "applications"],
   "logo": "logo.svg"

.mcp.json

@@ -3,22 +3,6 @@
     "cloudflare-api": {
       "type": "http",
       "url": "https://mcp.cloudflare.com/mcp"
-    },
-    "cloudflare-docs": {
-      "type": "http",
-      "url": "https://docs.mcp.cloudflare.com/mcp"
-    },
-    "cloudflare-bindings": {
-      "type": "http",
-      "url": "https://bindings.mcp.cloudflare.com/mcp"
-    },
-    "cloudflare-builds": {
-      "type": "http",
-      "url": "https://builds.mcp.cloudflare.com/mcp"
-    },
-    "cloudflare-observability": {
-      "type": "http",
-      "url": "https://observability.mcp.cloudflare.com/mcp"
     }
   }
 }

README.md

@@ -21,7 +21,7 @@ Install from the Cursor Marketplace or add manually via **Settings > Rules > Add
 
 ### npx skills
 
-Install using the [`npx skills`](https://skills.sh) CLI:
+Install using the [`npx skills`](https://www.skills.sh/) CLI:
 
 ```
 npx skills add https://github.com/cloudflare/skills
@@ -34,10 +34,10 @@ Clone this repo and copy the skill folders into the appropriate directory for yo
 | Agent | Skill Directory | Docs |
 |-------|-----------------|------|
 | Claude Code | `~/.claude/skills/` | [docs](https://code.claude.com/docs/en/skills) |
-| Cursor | `~/.cursor/skills/` | [docs](https://cursor.com/docs/context/skills) |
+| Cursor | `~/.cursor/skills/` | [docs](https://cursor.com/docs/skills) |
 | OpenCode | `~/.config/opencode/skills/` | [docs](https://opencode.ai/docs/skills/) |
-| OpenAI Codex | `~/.codex/skills/` | [docs](https://developers.openai.com/codex/skills/) |
-| Pi | `~/.pi/agent/skills/` | [docs](https://github.com/badlogic/pi-mono/tree/main/packages/coding-agent#skills) |
+| OpenAI Codex | `~/.codex/skills/` | [docs](https://developers.openai.com/codex/skills) |
+| Pi | `~/.pi/agent/skills/` | [docs](https://github.com/earendil-works/pi/tree/main/packages/coding-agent#skills) |
 
 ## Commands
 
@@ -54,14 +54,19 @@ Skills are contextual and auto-loaded based on your conversation. When a request
 
 | Skill | Useful for |
 |-------|------------|
-| cloudflare | Comprehensive platform skill covering Workers, Pages, storage (KV, D1, R2), AI (Workers AI, Vectorize, Agents SDK), networking (Tunnel, Spectrum), security (WAF, DDoS), and IaC (Terraform, Pulumi) |
+| cloudflare | Retrieval-first platform router for broad Cloudflare tasks, product selection, current docs, MCP tools, and focused skills |
 | agents-sdk | Building stateful AI agents with state, scheduling, RPC, MCP servers, email, and streaming chat |
+| browser-run | Browser automation on Cloudflare with screenshots, PDFs, crawlers, CDP, Playwright, Puppeteer, Live View, and WebMCP |
+| cloudflare-email-service | Transactional email sending, Email Routing, Workers email bindings, REST email API, and deliverability |
+| dynamic-workers | Runtime-loaded Workers, Worker Loader bindings, generated-code execution, egress control, and dynamic sandboxing |
 | durable-objects | Stateful coordination (chat rooms, games, booking), RPC, SQLite, alarms, WebSockets |
+| flagship | Cloudflare feature flags, typed values, targeting rules, percentage rollouts, Workers evaluation, and API automation |
 | sandbox-sdk | Secure code execution for AI code execution, code interpreters, CI/CD systems, and interactive dev environments |
-| wrangler | Deploying and managing Workers, KV, R2, D1, Vectorize, Queues, Workflows |
+| workflows | Durable multi-step Workers applications with retries, sleeps, events, rollback, and instance management |
+| wrangler | Deploying and managing Workers, KV, R2, D1, Vectorize, Queues, Workflows, Browser Run, AI Search, and related resources |
 | web-perf | Auditing Core Web Vitals (FCP, LCP, TBT, CLS), render-blocking resources, network chains |
-| building-mcp-server-on-cloudflare | Building remote MCP servers with tools, OAuth, and deployment |
-| building-ai-agent-on-cloudflare | Building AI agents with state, WebSockets, and tool integration |
+| workers-best-practices | Reviewing and authoring production Workers code, bindings, generated types, streaming, secrets, and observability |
+| turnstile-spin | End-to-end Turnstile setup, CAPTCHA migration, managed siteverify Worker deployment, snippets, and validation |
 
 ## Cloudflare One
 
@@ -74,15 +79,13 @@ Short, retrieval-first skills for [Cloudflare One](https://developers.cloudflare
 
 ## MCP Servers
 
-This plugin includes [Cloudflare's remote MCP servers](https://developers.cloudflare.com/agents/model-context-protocol/mcp-servers-for-cloudflare/) for enhanced functionality:
+This plugin includes Cloudflare's main [remote MCP server](https://developers.cloudflare.com/agents/model-context-protocol/cloudflare/servers-for-cloudflare/) for enhanced functionality:
 
 | Server | Purpose |
 |--------|---------|
-| cloudflare-api | Manage Cloudflare account resources, zones, and settings |
-| cloudflare-docs | Up-to-date Cloudflare documentation and reference |
-| cloudflare-bindings | Build Workers applications with storage, AI, and compute primitives |
-| cloudflare-builds | Manage and get insights into Workers builds |
-| cloudflare-observability | Debug and analyze application logs and analytics |
+| cloudflare-api | Access the Cloudflare API through the Code Mode MCP server |
+
+Cloudflare also publishes product-specific MCP servers for docs, Workers bindings, builds, observability, Radar, Browser Run, and more. This plugin intentionally bundles only the main `cloudflare-api` server.
 
 ## Resources
 

commands/build-agent.md

@@ -14,8 +14,8 @@ The user invoked this command with: $ARGUMENTS
 
 When this command is invoked:
 
-1. Read the skill file at `agents-sdk/SKILL.md` for core SDK guidance, APIs, and wrangler config
-2. Based on what the user wants to build, read the relevant references from `agents-sdk/references/`:
+1. Read the skill file at `skills/agents-sdk/SKILL.md` for core SDK guidance, APIs, and wrangler config
+2. Based on what the user wants to build, read the relevant references from `skills/agents-sdk/references/`:
    - For chat/AI agents: `streaming-chat.md`, `client-sdk.md`
    - For state management: `state-scheduling.md`
    - For RPC methods: `callable.md`
@@ -25,10 +25,11 @@ When this command is invoked:
    - For webhooks/push: `webhooks-push.md`
    - For approval flows: `human-in-the-loop.md`
    - For voice: `voice.md`
-   - For browser tools: `browse-the-web.md`
+   - For browser tools: `browse-the-web.md` and `skills/browser-run/SKILL.md`
+   - For Code Mode or Worker Loader execution: `codemode.md` and `skills/dynamic-workers/SKILL.md`
    - For higher-level chat: `think.md`
-3. Fetch the relevant pages from https://developers.cloudflare.com/agents/ for the latest API details
-4. Always start with `configuration.md` and `routing.md` for project setup
+3. Fetch the relevant pages from https://developers.cloudflare.com/agents/ for the latest API details; also fetch Browser Run or Dynamic Workers docs when those products are involved
+4. Always start with `skills/agents-sdk/references/configuration.md` and `skills/agents-sdk/references/routing.md` for project setup
 
 ## Scaffold Steps
 

commands/build-mcp.md

@@ -14,11 +14,11 @@ The user invoked this command with: $ARGUMENTS
 
 When this command is invoked:
 
-1. Read the skill file at `agents-sdk/SKILL.md` for core SDK guidance
-2. Read `agents-sdk/references/mcp.md` for MCP client and server APIs, transports, and securing
-3. Read `agents-sdk/references/configuration.md` for wrangler setup
-4. Fetch https://developers.cloudflare.com/agents/api-reference/mcp-agent-api/ for the latest McpAgent API
-5. For OAuth/security, fetch https://developers.cloudflare.com/agents/api-reference/securing-mcp-servers/
+1. Read the skill file at `skills/agents-sdk/SKILL.md` for core SDK guidance
+2. Read `skills/agents-sdk/references/mcp.md` for MCP client and server APIs, transports, and securing
+3. Read `skills/agents-sdk/references/configuration.md` for wrangler setup
+4. Fetch https://developers.cloudflare.com/agents/model-context-protocol/apis/agent-api/ for the latest McpAgent API
+5. For OAuth/security, fetch https://developers.cloudflare.com/agents/model-context-protocol/guides/securing-mcp-server/
 
 ## Scaffold Steps
 

rules/workers.mdc

@@ -17,7 +17,7 @@ globs:
 
 # Cloudflare Workers
 
-STOP. Your knowledge of Cloudflare Workers APIs and limits may be outdated. Always retrieve current documentation before any Workers, KV, R2, D1, Durable Objects, Queues, Vectorize, AI, or Agents SDK task.
+STOP. Your knowledge of Cloudflare Workers APIs and limits may be outdated. Always retrieve current documentation before any Workers, bindings, KV, R2, D1, Durable Objects, Queues, Workflows, Browser Run, Dynamic Workers, Vectorize, AI, or Agents SDK task.
 
 ## Docs
 
@@ -57,4 +57,4 @@ Docs: https://developers.cloudflare.com/workers/runtime-apis/nodejs/
 ## Product Docs
 
 Retrieve API references and limits from:
-`/kv/` · `/r2/` · `/d1/` · `/durable-objects/` · `/queues/` · `/vectorize/` · `/workers-ai/` · `/agents/`
+`/kv/` · `/r2/` · `/d1/` · `/durable-objects/` · `/queues/` · `/workflows/` · `/browser-run/` · `/dynamic-workers/` · `/vectorize/` · `/workers-ai/` · `/agents/`