Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/server/src/mcp/McpHttpServer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1321,7 +1321,7 @@ export const layerOrchestratorToolkit = toolkitRegistration(

export const layerThreadToolkit = toolkitRegistration(ThreadToolkit, ThreadHandlers.layer);

const layerMessageToolkit = toolkitRegistration(MessageToolkit, MessageHandlers.layer);
export const layerMessageToolkit = toolkitRegistration(MessageToolkit, MessageHandlers.layer);

const layerWorktreeToolkitRegistration = toolkitRegistration(
WorktreeToolkit,
Expand Down
25 changes: 22 additions & 3 deletions apps/server/src/mcp/toolkits/core.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ const declaredFailure = (result: McpSchema.CallToolResult) => {
const text = result.content[0];
return result.isError === true && text?.type === "text" ? JSON.parse(text.text) : undefined;
};
import { htmlRenderFromToolItem } from "@t3tools/shared/toolOutput";
import { htmlRenderFromToolItem, sentMessageFromToolItem } from "@t3tools/shared/toolOutput";

const decodeMcpAttachmentInput = Schema.decodeUnknownEffect(McpAttachmentInput);
const decodeThreadReadResult = Schema.decodeUnknownEffect(OrchestratorMcpThreadReadResult);
Expand Down Expand Up @@ -384,11 +384,30 @@ it.effect("returns an HTML render reference that Codex and Claude tool rows both
expect(yield* byPath(name, scope), name).toContain("only full-access threads");
expect(yield* byPath(name, fullAccess), name).toContain("not a readable HTML document");
}
const mcpSessions = yield* McpProviderSessions.McpProviderSessions;
const sent = yield* server
.callTool({
name: "send_to_user",
arguments: { message: "Draft:\n\n> Ready to merge." },
})
.pipe(
Effect.provideService(McpInvocationContext.McpInvocationContext, scope),
Effect.provideService(McpSchema.McpServerClient, client),
);
expect(
sentMessageFromToolItem({ toolName: "t3-code.send_to_user", output: sent.structuredContent }),
).toBe("Draft:\n\n> Ready to merge.");
expect(
yield* mcpSessions.takeSentMessage(scope.thread!.threadId, "Draft:\n\n> Ready to merge."),
).toBe("Draft:\n\n> Ready to merge.");
expect(
yield* mcpSessions.takeSentMessage(scope.thread!.threadId, "Draft:\n\n> Ready to merge."),
).toBeUndefined();
}).pipe(
Effect.provide(
McpHttpServer.layerHtmlToolkit.pipe(
Layer.mergeAll(McpHttpServer.layerHtmlToolkit, McpHttpServer.layerMessageToolkit).pipe(
Layer.provideMerge(McpHttpServer.layerInProcessMcpServer),
Layer.provide(McpProviderSessions.layer),
Layer.provideMerge(McpProviderSessions.layer),
Layer.provide(PreviewBrowser.layer),
Layer.provide(ServerConfig.layerTest(process.cwd(), { prefix: "t3-mcp-html-render-" })),
Layer.provide(
Expand Down
18 changes: 15 additions & 3 deletions apps/server/src/mcp/toolkits/message/handlers.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,25 @@
import * as McpProviderSessions from "@t3tools/provider-core/server/McpProviderSessions";
import { SEND_TO_USER_TOOL_NAME } from "@t3tools/shared/toolOutput";
import * as Effect from "effect/Effect";

import * as McpInvocationContext from "../../McpInvocationContext.ts";
import * as McpToolAccess from "../../McpToolAccess.ts";
import { MessageToolkit } from "./tools.ts";

const handlers = {
send_to_user: McpToolAccess.actsAsCaller((input) =>
Effect.succeed({
sentMessage: input.message,
message: "Shown to the user. Don't repeat it.",
Effect.gen(function* () {
const scope = yield* McpInvocationContext.McpInvocationContext;
const { thread } = yield* McpInvocationContext.requireThreadScope(
scope,
SEND_TO_USER_TOOL_NAME,
);
const mcpSessions = yield* McpProviderSessions.McpProviderSessions;
yield* mcpSessions.recordSentMessage(thread.threadId, input.message);
return {
sentMessage: input.message,
message: "Shown to the user. Don't repeat it.",
};
}),
),
} satisfies McpToolAccess.Handlers<typeof MessageToolkit.tools>;
Expand Down
2 changes: 2 additions & 0 deletions apps/server/src/mcp/toolkits/message/tools.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { OrchestratorMcpFailure } from "@t3tools/contracts";
import * as McpProviderSessions from "@t3tools/provider-core/server/McpProviderSessions";
import { SEND_TO_USER_MAX_LENGTH, SEND_TO_USER_TOOL_NAME } from "@t3tools/shared/toolOutput";
import * as Schema from "effect/Schema";
import { McpSchema, Tool, Toolkit } from "effect/ai";
Expand All @@ -25,6 +26,7 @@ const SendToUserTool = Tool.make(SEND_TO_USER_TOOL_NAME, {
failureMode: "return",
dependencies: [
McpInvocationContext.McpInvocationContext,
McpProviderSessions.McpProviderSessions,
ThreadManagementService.ThreadManagementService,
],
})
Expand Down
Loading
Loading