Merge branch 'main' into convert-to-bot

Author: whoiskatrin

.changeset/all-books-doubt.md

@@ -0,0 +1,5 @@
+---
+"agents": patch
+---
+
+Add default JSON schema validator to MCP client

.changeset/hip-spoons-laugh.md

@@ -0,0 +1,7 @@
+---
+"agents": patch
+---
+
+Refactor MCP server table management in Agent class
+
+Moved creation and deletion of the cf_agents_mcp_servers table from AgentMCPClientStorage to the Agent class. Removed redundant create and destroy methods from AgentMCPClientStorage and updated MCPClientManager to reflect these changes. Added comments to clarify usage in demo and test code.

.changeset/hungry-turtles-shout.md

@@ -0,0 +1,7 @@
+---
+"agents": patch
+---
+
+Allow `this.destroy` inside a schedule by including a `destroyed` flag and yielding `ctx.abort` instead of calling it directly
+Fix issue where schedules would not be able to run for more 30 seconds due to `blockConccurencyWhile`. `alarm()` isn't manually called anymore, getting rid of the bCW.
+Fix an issue where immediate schedules (e.g. `this.schedule(0, "foo"))`) would not get immediately scheduled.

.changeset/neat-beds-cheat.md

@@ -0,0 +1,24 @@
+---
+"agents": minor
+---
+
+### Breaking Changes
+
+- **`getMcpServers()` is now async**: Changed from synchronous to asynchronous method to support storage operations
+- **`DurableObjectOAuthClientProvider` constructor**: Now accepts `OAuthClientStorage` interface instead of `DurableObjectStorage`
+
+### New Features
+
+- **`MCPClientManager` API changes**:
+  - New `registerServer()` method to register servers (replaces part of `connect()`)
+  - New `connectToServer()` method to establish connection (replaces part of `connect()`)
+  - `connect()` method deprecated (still works for backward compatibility)
+  - Requires `MCPClientStorage` interface implementation (provided via `AgentMCPClientStorage`)
+- **Storage abstraction layer**: New `MCPClientStorage` and `OAuthClientStorage` interfaces enable custom storage implementations beyond Durable Objects
+- **Connection state observability**: New `onServerStateChanged()` event for tracking all server state changes
+- **Improved reconnect logic**: `restoreConnectionsFromStorage()` handles failed connections
+
+### Bug Fixes
+
+- Fixed failed connections not being recreated on restore
+- Fixed redundant storage operations during connection restoration

.changeset/plenty-friends-hope.md

@@ -0,0 +1,5 @@
+---
+"agents": patch
+---
+
+When handling MCP server requests use relatedRequestId in TransportOptions to send the response down a POST stream if supported (streamable-http)

.changeset/smooth-showers-hug.md

@@ -148,30 +148,29 @@ jobs:
 
           8. **CRITICAL - Comment on original PR:**
              ⚠️ **IMPORTANT**: Execute this ENTIRE script as ONE command. Do not split into multiple executions.
-
+             
              Copy and run this complete bash script:
              ```bash
              #!/bin/bash
              set -e
-
+             
              echo "=== Step 8: Managing PR comment ==="
-
+             
              # Get the docs PR URL
              DOCS_PR_URL=$(gh pr list --repo cloudflare/cloudflare-docs --head sync-docs-pr-${PR_NUMBER} --json url --jq '.[0].url')
              echo "Docs PR URL: $DOCS_PR_URL"
-
-             # Find existing comment with our unique marker (searches for both hidden marker and visible footer)
+             
+             # Find existing comment with our unique marker
              EXISTING_COMMENT_ID=$(gh api "repos/cloudflare/agents/issues/${PR_NUMBER}/comments" \
-               --jq '.[] | select(.body | contains("<!-- DOCS-SYNC-AUTOMATION -->") or contains("Generated by Claude for Cloudflare Agents team")) | .id' \
+               --jq '.[] | select(.body | contains("<!-- DOCS-SYNC-AUTOMATION -->")) | .id' \
                | head -n 1)
-
+             
              # Prepare comment body (note the unique marker at the start)
-             COMMENT_BODY=\$(printf '%s\n\n%s\n\n%s\n\n---\n\n%s' \\
+             COMMENT_BODY=\$(printf '%s\n\n%s\n\n%s' \\
                '<!-- DOCS-SYNC-AUTOMATION -->' \\
                "📚 **Documentation sync PR:** \$DOCS_PR_URL" \\
-               '_This comment is automatically updated when the PR changes._' \\
-               '_Generated by Claude for Cloudflare Agents team_')
-
+               '_This comment is automatically updated when the PR changes._')
+             
              # Update existing or create new comment
              if [ -n "$EXISTING_COMMENT_ID" ] && [ "$EXISTING_COMMENT_ID" != "null" ]; then
                echo "Found existing comment ID: $EXISTING_COMMENT_ID - updating it"
@@ -186,13 +185,13 @@ jobs:
                  --body "$COMMENT_BODY"
                echo "✅ Created new comment"
              fi
-
+             
              # Cleanup any duplicate comments (keep only the newest)
              ALL_COMMENT_IDS=$(gh api "repos/cloudflare/agents/issues/${PR_NUMBER}/comments" \
-               --jq '.[] | select(.body | contains("<!-- DOCS-SYNC-AUTOMATION -->") or contains("Generated by Claude for Cloudflare Agents team")) | .id')
-
+               --jq '.[] | select(.body | contains("<!-- DOCS-SYNC-AUTOMATION -->")) | .id')
+             
              COMMENT_COUNT=$(echo "$ALL_COMMENT_IDS" | wc -l | tr -d ' ')
-
+             
              if [ "$COMMENT_COUNT" -gt 1 ]; then
                echo "⚠️ Found $COMMENT_COUNT duplicate comments - cleaning up"
                # Keep the last one (newest), delete others
@@ -206,7 +205,7 @@ jobs:
              else
                echo "✅ Only one comment exists - no cleanup needed"
              fi
-
+             
              echo "=== Step 8 complete ==="
              ```
 
@@ -238,6 +237,38 @@ jobs:
           - Keep reference neutral and factual
           - Don't overexplain simple functions
 
+          ## Cloudflare Docs Style Requirements
+
+          **CRITICAL**: Follow all rules from the [Cloudflare Style Guide](https://developers.cloudflare.com/style-guide/) and these specific requirements:
+
+          **Grammar & Formatting:**
+          - Do not use contractions, exclamation marks, or non-standard quotes like \`''""\`
+          - Fix common spelling errors, specifically misspellings of "wrangler"
+          - Remove whitespace characters from the end of lines
+          - Remove duplicate words
+          - Do not use HTML for ordered lists
+
+          **Links:**
+          - Use full relative links (\`/agents/configuration/\`) instead of full URLs, local dev links, or dot notation
+          - Always use trailing slashes for links without anchors
+          - Use meaningful link words (page titles) - avoid "here", "this page", "read more"
+          - Add cross-links to relevant documentation pages where appropriate
+
+          **Components (MUST USE):**
+          - All components need to be imported below frontmatter: \`import { ComponentName } from "~/components";\`
+          - **WranglerConfig component**: Replace \`toml\` or \`json\` code blocks showing Wrangler configuration with the [\`WranglerConfig\` component](https://developers.cloudflare.com/style-guide/components/wrangler-config/). This is CRITICAL - always use this component for wrangler.toml/wrangler.jsonc examples.
+          - **DashButton component**: Replace \`https://dash.cloudflare.com\` in steps with the [\`DashButton\` component](https://developers.cloudflare.com/style-guide/components/dash-button/)
+          - **APIRequest component**: Replace \`sh\` code blocks with API requests to \`https://api.cloudflare.com\` with the [\`APIRequest\` component](https://developers.cloudflare.com/style-guide/components/api-request/)
+          - **FileTree component**: Replace \`txt\` blocks showing file trees with the [\`FileTree\` component](https://developers.cloudflare.com/style-guide/components/file-tree/)
+          - **PackageManagers component**: Replace \`sh\` blocks with npm commands using the [\`PackageManagers\` component](https://developers.cloudflare.com/style-guide/components/package-managers/)
+          - **TypeScriptExample component**: Replace \`ts\`/\`typescript\` code blocks with the [\`TypeScriptExample\` component](https://developers.cloudflare.com/style-guide/components/typescript-example/) (except in step-by-step TypeScript-specific tutorials)
+
+          **JSX & Partials:**
+          - When using JSX fragments for conditional rendering, use props variable to account for reusability
+          - Only use \`<Markdown />\` component in JSX conditionals, and only if needed
+          - Do not duplicate content in ternary/binary conditions
+          - For variables in links, use HTML instead of Markdown
+
           **Step 3: Provide Clear Output**
 
           Clearly state your decision:

.changeset/spotty-crabs-allow.md

@@ -93,6 +93,37 @@ function App() {
     );
   };
 
+  const handleGetTools = async (serverId: string) => {
+    try {
+      const response = await agentFetch(
+        {
+          agent: "my-agent",
+          host: agent.host,
+          name: sessionId!,
+          path: "get-tools"
+        },
+        {
+          body: JSON.stringify({ serverId }),
+          method: "POST"
+        }
+      );
+      // biome-ignore lint/suspicious/noExplicitAny: just a demo
+      const data = (await response.json()) as { tools: any[]; error?: string };
+
+      if (data.error) {
+        throw new Error(data.error);
+      }
+
+      console.log("Server tools:", data.tools);
+      alert(`Server Tools:\n\n${JSON.stringify(data.tools, null, 2)}`);
+    } catch (error) {
+      console.error("Failed to get tools:", error);
+      alert(
+        `Failed to get tools: ${error instanceof Error ? error.message : String(error)}`
+      );
+    }
+  };
+
   return (
     <div className="container">
       <div className="status-indicator">
@@ -140,6 +171,11 @@ function App() {
                   Authorize
                 </button>
               )}
+              {server.state === "ready" && (
+                <button type="button" onClick={() => handleGetTools(id)}>
+                  List Tools
+                </button>
+              )}
               <button type="button" onClick={() => handleDisconnect(id)}>
                 Disconnect
               </button>

.github/workflows/sync-docs.yml

@@ -47,6 +47,28 @@ export class MyAgent extends Agent<Env, never> {
       return new Response("Ok", { status: 200 });
     }
 
+    if (reqUrl.pathname.endsWith("get-tools") && request.method === "POST") {
+      try {
+        const { serverId } = (await request.json()) as { serverId: string };
+        const allTools = this.mcp.listTools();
+        const tools = allTools.filter((tool) => tool.serverId === serverId);
+        return new Response(JSON.stringify({ tools }), {
+          headers: { "Content-Type": "application/json" },
+          status: 200
+        });
+      } catch (error) {
+        return new Response(
+          JSON.stringify({
+            error: error instanceof Error ? error.message : String(error)
+          }),
+          {
+            headers: { "Content-Type": "application/json" },
+            status: 500
+          }
+        );
+      }
+    }
+
     return new Response("Not found", { status: 404 });
   }
 }