Fix up wrangler.json, add dev handler, and new createApiHandler for dealing with SSE + Streamable HTTP

Author: Maximo-Guk

apps/logpush/src/context.ts

@@ -6,10 +6,12 @@ export interface Env {
 	ENVIRONMENT: 'development' | 'staging' | 'production'
 	MCP_SERVER_NAME: string
 	MCP_SERVER_VERSION: string
-	CLOUDFLARE_ACCESS_TOKEN: string
 	CLOUDFLARE_CLIENT_ID: string
 	CLOUDFLARE_CLIENT_SECRET: string
 	MCP_OBJECT: DurableObjectNamespace<LogsMCP>
 	USER_DETAILS: DurableObjectNamespace<UserDetails>
 	MCP_METRICS: AnalyticsEngineDataset
+	DEV_DISABLE_OAUTH: string
+	DEV_CLOUDFLARE_API_TOKEN: string
+	DEV_CLOUDFLARE_EMAIL: string
 }

apps/logpush/src/index.ts

@@ -1,10 +1,12 @@
 import OAuthProvider from '@cloudflare/workers-oauth-provider'
 import { McpAgent } from 'agents/mcp'
 
+import { createApiHandler } from '@repo/mcp-common/src/api-handler'
 import {
 	createAuthHandlers,
 	handleTokenExchangeCallback,
 } from '@repo/mcp-common/src/cloudflare-oauth-handler'
+import { handleDevMode } from '@repo/mcp-common/src/dev-mode'
 import { getUserDetails, UserDetails } from '@repo/mcp-common/src/durable-objects/user_details'
 import { getEnv } from '@repo/mcp-common/src/env'
 import { RequiredScopes } from '@repo/mcp-common/src/scopes'
@@ -14,7 +16,7 @@ import { registerAccountTools } from '@repo/mcp-common/src/tools/account'
 import { MetricsTracker } from '../../../packages/mcp-observability/src'
 import { registerLogsTools } from './tools/logs'
 
-import type { AccountSchema, UserSchema } from '@repo/mcp-common/src/cloudflare-oauth-handler'
+import type { AuthProps } from '@repo/mcp-common/src/cloudflare-oauth-handler'
 import type { Env } from './context'
 
 const env = getEnv<Env>()
@@ -28,14 +30,8 @@ const metrics = new MetricsTracker(env.MCP_METRICS, {
 
 // Context from the auth process, encrypted & stored in the auth token
 // and provided to the DurableMCP as this.props
-export type Props = {
-	accessToken: string
-	apiToken: string
-	user: UserSchema['result']
-	accounts: AccountSchema['result']
-}
-
-export type State = { activeAccountId: string | null }
+type Props = AuthProps
+type State = { activeAccountId: string | null }
 
 export class LogsMCP extends McpAgent<Env, State, Props> {
 	_server: CloudflareMCPServer | undefined
@@ -67,7 +63,7 @@ export class LogsMCP extends McpAgent<Env, State, Props> {
 		registerAccountTools(this)
 
 		// Register Cloudflare Log Push tools
-		registerLogsTools(this, env.CLOUDFLARE_ACCESS_TOKEN)
+		registerLogsTools(this)
 	}
 
 	async getActiveAccountId() {
@@ -99,16 +95,28 @@ const LogPushScopes = {
 		'Grants read and write access to Logpull and Logpush, and read access to Instant Logs. Note that all Logpush API operations require Logs: Write permission because Logpush jobs contain sensitive information.',
 } as const
 
-export default new OAuthProvider({
-	apiRoute: '/sse',
-	apiHandler: LogsMCP.mount('/sse'),
-	// @ts-ignore
-	defaultHandler: createAuthHandlers({ scopes: LogPushScopes, metrics }),
-	authorizeEndpoint: '/oauth/authorize',
-	tokenEndpoint: '/token',
-	tokenExchangeCallback: (options) =>
-		handleTokenExchangeCallback(options, env.CLOUDFLARE_CLIENT_ID, env.CLOUDFLARE_CLIENT_SECRET),
-	// Cloudflare access token TTL
-	accessTokenTTL: 3600,
-	clientRegistrationEndpoint: '/register',
-})
+export default {
+	fetch: async (req: Request, env: Env, ctx: ExecutionContext) => {
+		if (env.ENVIRONMENT === 'development' && env.DEV_DISABLE_OAUTH === 'true') {
+			return await handleDevMode(LogsMCP, req, env, ctx)
+		}
+
+		return new OAuthProvider({
+			apiRoute: ['/mcp', '/sse'],
+			apiHandler: createApiHandler(LogsMCP),
+			// @ts-ignore
+			defaultHandler: createAuthHandlers({ scopes: LogPushScopes, metrics }),
+			authorizeEndpoint: '/oauth/authorize',
+			tokenEndpoint: '/token',
+			tokenExchangeCallback: (options) =>
+				handleTokenExchangeCallback(
+					options,
+					env.CLOUDFLARE_CLIENT_ID,
+					env.CLOUDFLARE_CLIENT_SECRET
+				),
+			// Cloudflare access token TTL
+			accessTokenTTL: 3600,
+			clientRegistrationEndpoint: '/register',
+		}).fetch(req, env, ctx)
+	},
+}

apps/logpush/src/tools/logs.ts

@@ -8,14 +8,14 @@ const zJobIdentifier = z.number().int().min(1).optional().describe('Unique id of
 const zEnabled = z.boolean().optional().describe('Flag that indicates if the job is enabled.')
 const zName = z
 	.string()
-	.regex(/^[a-zA-Z0-9\-\.]*$/)
+	.regex(/^[a-zA-Z0-9\-.]*$/)
 	.max(512)
 	.nullable()
 	.optional()
 	.describe('Optional human readable job name. Not unique.')
 const zDataset = z
 	.string()
-	.regex(/^[a-zA-Z0-9_\-]*$/)
+	.regex(/^[a-zA-Z0-9_-]*$/)
 	.max(256)
 	.nullable()
 	.optional()
@@ -90,7 +90,7 @@ export async function handleGetAccountLogPushJobs(
 	})
 
 	const res = data as z.infer<typeof zLogpushJobResponseCollection>
-	return res.result?.slice(0, 100) || []
+	return (res.result ?? []).slice(0, 100)
 }
 
 /**
@@ -99,7 +99,7 @@ export async function handleGetAccountLogPushJobs(
  * @param accountId Cloudflare account ID
  * @param apiToken Cloudflare API token
  */
-export function registerLogsTools(agent: LogsMCP, devToken: string) {
+export function registerLogsTools(agent: LogsMCP) {
 	// Register the worker logs analysis tool by worker name
 	agent.server.tool(
 		'logpush_jobs_by_account_id',
@@ -125,8 +125,7 @@ export function registerLogsTools(agent: LogsMCP, devToken: string) {
 				}
 			}
 			try {
-				const token = devToken.length > 0 ? devToken : agent.props.accessToken
-				const result = await handleGetAccountLogPushJobs(accountId, token)
+				const result = await handleGetAccountLogPushJobs(accountId, agent.props.accessToken)
 				return {
 					content: [
 						{

apps/logpush/wrangler.jsonc

@@ -10,7 +10,7 @@
 	"name": "mcp-cloudflare-logpush-dev",
 	"migrations": [
 		{
-			"new_sqlite_classes": ["UserDetails", "LogsMCP"],
+			"new_sqlite_classes": ["LogsMCP"],
 			"tag": "v1"
 		}
 	],
@@ -66,13 +66,14 @@
 					},
 					{
 						"class_name": "UserDetails",
-						"name": "USER_DETAILS"
+						"name": "USER_DETAILS",
+						"script_name": "mcp-cloudflare-workers-observability-staging"
 					}
 				]
 			},
 			"kv_namespaces": [
 				{
-					"binding": "OAUTH_KV_LOGPUSH_STAGING",
+					"binding": "OAUTH_KV",
 					"id": "3804747ed31344cca8e4ebecd255e417"
 				}
 			],
@@ -100,13 +101,14 @@
 					},
 					{
 						"class_name": "UserDetails",
-						"name": "USER_DETAILS"
+						"name": "USER_DETAILS",
+						"script_name": "mcp-cloudflare-workers-observability-production"
 					}
 				]
 			},
 			"kv_namespaces": [
 				{
-					"binding": "OAUTH_KV_LOGPUSH_PRODUCTION",
+					"binding": "OAUTH_KV",
 					"id": "400ff7a67c824f9698f9e5c25bf51a1c"
 				}
 			],