chore: fix type issues and PR feedback

Author: deloreyj

apps/workers-bindings/package.json

@@ -1,5 +1,5 @@
 {
-	"name": "remote-mcp-server",
+	"name": "workers-bindings",
 	"version": "0.0.0",
 	"private": true,
 	"scripts": {
@@ -18,7 +18,6 @@
 		"marked": "15.0.7",
 		"typescript": "5.5.4",
 		"vitest": "3.0.9",
-		"workers-mcp": "^0.1.0-3",
 		"wrangler": "4.10.0"
 	},
 	"dependencies": {

apps/workers-bindings/src/index.ts

@@ -1,6 +1,7 @@
 import OAuthProvider from '@cloudflare/workers-oauth-provider'
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js'
 import { McpAgent } from 'agents/mcp'
+import { env } from 'cloudflare:workers'
 
 import {
 	CloudflareAuthHandler,
@@ -68,7 +69,8 @@ export default new OAuthProvider({
 	defaultHandler: CloudflareAuthHandler,
 	authorizeEndpoint: '/oauth/authorize',
 	tokenEndpoint: '/token',
-	tokenExchangeCallback: handleTokenExchangeCallback,
+	tokenExchangeCallback: (options) =>
+		handleTokenExchangeCallback(options, env.CLOUDFLARE_CLIENT_ID, env.CLOUDFLARE_CLIENT_SECRET),
 	// Cloudflare access token TTL
 	accessTokenTTL: 3600,
 	clientRegistrationEndpoint: '/register',

apps/workers-bindings/worker-configuration.d.ts

@@ -1,11 +1,11 @@
-// Generated by Wrangler by running `wrangler types` (hash: bcea92b4b34ff43daede463c6e9dfc75)
+// Generated by Wrangler by running `wrangler types` (hash: 83b65e4226fcf5092146edc626681982)
 // Runtime types generated with [email protected] 2025-03-10 nodejs_compat
 declare namespace Cloudflare {
 	interface Env {
 		OAUTH_KV: KVNamespace;
-        // eslint-disable-next-line @typescript-eslint/consistent-type-imports
+		CLOUDFLARE_CLIENT_ID: string;
+		CLOUDFLARE_CLIENT_SECRET: string;
 		MCP_OBJECT: DurableObjectNamespace<import("./src/index").WorkersBindingsMCP>;
-		ASSETS: Fetcher;
 	}
 }
 interface Env extends Cloudflare.Env {}

apps/workers-observability/src/index.ts

@@ -1,6 +1,7 @@
 import OAuthProvider from '@cloudflare/workers-oauth-provider'
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js'
 import { McpAgent } from 'agents/mcp'
+import { env } from 'cloudflare:workers'
 
 import {
 	CloudflareAuthHandler,
@@ -12,7 +13,6 @@ import { registerWorkersTools } from '@repo/mcp-common/src/tools/worker'
 import { registerLogsTools } from './tools/logs'
 
 import type { AccountSchema, UserSchema } from '@repo/mcp-common/src/cloudflare-oauth-handler'
-import type { Env } from '../worker-configuration'
 
 // Context from the auth process, encrypted & stored in the auth token
 // and provided to the DurableMCP as this.props
@@ -29,9 +29,6 @@ export class MyMCP extends McpAgent<Env, State, Props> {
 		name: 'Remote MCP Server with Workers Observability',
 		version: '1.0.0',
 	})
-	// TOOO: Why does this type need to be declared again on MyMCP?
-	// @ts-ignore
-	env!: Env
 
 	initialState: State = {
 		activeAccountId: null,
@@ -77,7 +74,8 @@ export default new OAuthProvider({
 	defaultHandler: CloudflareAuthHandler,
 	authorizeEndpoint: '/oauth/authorize',
 	tokenEndpoint: '/token',
-	tokenExchangeCallback: handleTokenExchangeCallback,
+	tokenExchangeCallback: (options) =>
+		handleTokenExchangeCallback(options, env.CLOUDFLARE_CLIENT_ID, env.CLOUDFLARE_CLIENT_SECRET),
 	// Cloudflare access token TTL
 	accessTokenTTL: 3600,
 	clientRegistrationEndpoint: '/register',

apps/workers-observability/vitest.config.ts

@@ -1,7 +1,5 @@
 import { defineWorkersConfig } from '@cloudflare/vitest-pool-workers/config'
 
-import type { Env } from './worker-configuration'
-
 export interface TestEnv extends Env {
 	CLOUDFLARE_MOCK_ACCOUNT_ID: string
 	CLOUDFLARE_MOCK_API_TOKEN: string