@@ -11,13 +11,15 @@ import * as Schema from "effect/Schema";
1111import * as Sink from "effect/Sink" ;
1212import * as Stream from "effect/Stream" ;
1313import type * as Types from "effect/Types" ;
14- import { McpProtocol , McpSchema , McpServer , Tool } from "effect/unstable/ai" ;
14+ import { McpProtocol , McpSchema , McpServer , Tool , type Toolkit } from "effect/unstable/ai" ;
1515import { HttpRouter , HttpServerRequest , HttpServerResponse } from "effect/unstable/http" ;
1616import { PreviewAutomationError } from "@t3tools/contracts" ;
1717
1818import packageJson from "../../package.json" with { type : "json" } ;
1919import * as ServerConfig from "../config.ts" ;
2020import * as DeviceService from "../device/DeviceService.ts" ;
21+ import * as ProviderRegistry from "../provider/Services/ProviderRegistry.ts" ;
22+ import * as AnalyticsService from "../telemetry/AnalyticsService.ts" ;
2123import * as McpInvocationContext from "./McpInvocationContext.ts" ;
2224import * as OrchestratorMcpService from "./OrchestratorMcpService.ts" ;
2325import { PreviewControlsToolkit } from "./toolkits/previewControls/tools.ts" ;
@@ -647,61 +649,101 @@ const registerDeviceScreenshot = Effect.fn("McpHttpServer.registerDeviceScreensh
647649 ) ;
648650} ) ;
649651
650- const PreviewStandardToolkitRegistrationLive = McpServer . toolkit ( PreviewStandardToolkit ) . pipe (
652+ /**
653+ * Runs a tool registration against a server that records one anonymous
654+ * `mcp.tool.invoked` event per call: the tool name and the calling agent's
655+ * driver kind. Arguments, results, and ids are never recorded.
656+ */
657+ const withToolAnalytics = < E , R > ( registration : Effect . Effect < void , E , R > ) =>
658+ Effect . gen ( function * ( ) {
659+ const server = yield * McpServer . McpServer ;
660+ const analytics = yield * Effect . serviceOption ( AnalyticsService . AnalyticsService ) ;
661+ if ( Option . isNone ( analytics ) ) return yield * registration ;
662+ const registry = yield * Effect . serviceOption ( ProviderRegistry . ProviderRegistry ) ;
663+ const record = ( tool : string ) =>
664+ Effect . gen ( function * ( ) {
665+ const invocation = yield * Effect . serviceOption ( McpInvocationContext . McpInvocationContext ) ;
666+ const providers = Option . isSome ( registry ) ? yield * registry . value . getProviders : [ ] ;
667+ const caller = Option . isSome ( invocation )
668+ ? providers . find (
669+ ( provider ) => provider . instanceId === invocation . value . providerInstanceId ,
670+ )
671+ : undefined ;
672+ yield * analytics . value . record ( "mcp.tool.invoked" , {
673+ tool,
674+ provider : caller ?. driver ?? "unknown" ,
675+ } ) ;
676+ } ) . pipe ( Effect . ignoreCause ) ;
677+ const recordingServer = McpServer . McpServer . of ( {
678+ ...server ,
679+ addTool : ( options ) =>
680+ server . addTool ( {
681+ ...options ,
682+ handle : ( payload ) =>
683+ record ( options . tool . name ) . pipe ( Effect . andThen ( options . handle ( payload ) ) ) ,
684+ } ) ,
685+ } ) ;
686+ return yield * registration . pipe ( Effect . provideService ( McpServer . McpServer , recordingServer ) ) ;
687+ } ) ;
688+
689+ const toolkit = < Tools extends Record < string , Tool . Any > > ( tools : Toolkit . Toolkit < Tools > ) =>
690+ Layer . effectDiscard ( withToolAnalytics ( McpServer . registerToolkit ( tools ) ) ) . pipe (
691+ Layer . provide ( McpServer . McpServer . layer ) ,
692+ ) ;
693+
694+ const PreviewStandardToolkitRegistrationLive = toolkit ( PreviewStandardToolkit ) . pipe (
651695 Layer . provide ( PreviewStandardToolkitHandlersLive ) ,
652696) ;
653697
654- const PreviewSnapshotRegistrationLive = Layer . effectDiscard ( registerPreviewSnapshot ( ) ) . pipe (
655- Layer . provide ( PreviewSnapshotToolkitHandlersLive ) ,
656- ) ;
698+ const PreviewSnapshotRegistrationLive = Layer . effectDiscard (
699+ withToolAnalytics ( registerPreviewSnapshot ( ) ) ,
700+ ) . pipe ( Layer . provide ( PreviewSnapshotToolkitHandlersLive ) ) ;
657701
658702export const PreviewToolkitRegistrationLive = Layer . mergeAll (
659703 PreviewStandardToolkitRegistrationLive ,
660704 PreviewSnapshotRegistrationLive ,
661705) ;
662706
663- export const OrchestratorToolkitRegistrationLive = McpServer . toolkit ( OrchestratorToolkit ) . pipe (
707+ export const OrchestratorToolkitRegistrationLive = toolkit ( OrchestratorToolkit ) . pipe (
664708 Layer . provide ( OrchestratorToolkitHandlersLive ) ,
665709 Layer . provide ( OrchestratorMcpService . layer ) ,
666710 Layer . provide ( ThreadMetadataMcpService . layer ) ,
667711) ;
668712
669- export const ThreadToolkitRegistrationLive = McpServer . toolkit ( ThreadToolkit ) . pipe (
713+ export const ThreadToolkitRegistrationLive = toolkit ( ThreadToolkit ) . pipe (
670714 Layer . provide ( ThreadToolkitHandlersLive ) ,
671715) ;
672716
673- const WorktreeToolkitRegistrationLive = McpServer . toolkit ( WorktreeToolkit ) . pipe (
717+ const WorktreeToolkitRegistrationLive = toolkit ( WorktreeToolkit ) . pipe (
674718 Layer . provide ( WorktreeToolkitHandlersLive ) ,
675719 Layer . provide ( WorktreeMcpService . layer ) ,
676720) ;
677721
678- const PreviewControlsRegistrationLive = McpServer . toolkit ( PreviewControlsToolkit ) . pipe (
722+ const PreviewControlsRegistrationLive = toolkit ( PreviewControlsToolkit ) . pipe (
679723 Layer . provide ( PreviewControlsHandlersLive ) ,
680724) ;
681725
682- const EnvironmentRegistrationLive = McpServer . toolkit ( EnvironmentToolkit ) . pipe (
726+ const EnvironmentRegistrationLive = toolkit ( EnvironmentToolkit ) . pipe (
683727 Layer . provide ( EnvironmentHandlersLive ) ,
684728) ;
685729
686- const ProjectRegistrationLive = McpServer . toolkit ( ProjectToolkit ) . pipe (
687- Layer . provide ( ProjectHandlersLive ) ,
688- ) ;
730+ const ProjectRegistrationLive = toolkit ( ProjectToolkit ) . pipe ( Layer . provide ( ProjectHandlersLive ) ) ;
689731
690- const AttachmentRegistrationLive = McpServer . toolkit ( AttachmentToolkit ) . pipe (
732+ const AttachmentRegistrationLive = toolkit ( AttachmentToolkit ) . pipe (
691733 Layer . provide ( AttachmentHandlersLive ) ,
692734) ;
693735
694- export const PullRequestsToolkitRegistrationLive = McpServer . toolkit ( PullRequestsToolkit ) . pipe (
736+ export const PullRequestsToolkitRegistrationLive = toolkit ( PullRequestsToolkit ) . pipe (
695737 Layer . provide ( PullRequestsToolkitHandlersLive ) ,
696738) ;
697739
698- const DeviceStandardToolkitRegistrationLive = McpServer . toolkit ( DeviceStandardToolkit ) . pipe (
740+ const DeviceStandardToolkitRegistrationLive = toolkit ( DeviceStandardToolkit ) . pipe (
699741 Layer . provide ( DeviceStandardToolkitHandlersLive ) ,
700742) ;
701743
702- const DeviceScreenshotRegistrationLive = Layer . effectDiscard ( registerDeviceScreenshot ( ) ) . pipe (
703- Layer . provide ( DeviceScreenshotToolkitHandlersLive ) ,
704- ) ;
744+ const DeviceScreenshotRegistrationLive = Layer . effectDiscard (
745+ withToolAnalytics ( registerDeviceScreenshot ( ) ) ,
746+ ) . pipe ( Layer . provide ( DeviceScreenshotToolkitHandlersLive ) ) ;
705747
706748export const DeviceToolkitRegistrationLive = Layer . mergeAll (
707749 DeviceStandardToolkitRegistrationLive ,
0 commit comments