Skip to content

Commit 7b644f9

Browse files
authored
Merge branch 'main' into jesselumarie/test-SEP-974
2 parents a114db8 + bb3a2a1 commit 7b644f9

File tree

9 files changed

+272
-100
lines changed

9 files changed

+272
-100
lines changed

.github/workflows/claude.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434

3535
- name: Run Claude Code
3636
id: claude
37-
uses: anthropics/claude-code-action@beta
37+
uses: anthropics/claude-code-action@v1
3838
with:
3939
anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
4040

@@ -45,9 +45,6 @@ jobs:
4545
# Trigger when assigned to an issue
4646
assignee_trigger: "claude"
4747

48-
# Allow Claude to run bash
49-
# This should be safe given the repo is already public
50-
allowed_tools: "Bash"
51-
52-
custom_instructions: |
53-
If posting a comment to GitHub, give a concise summary of the comment at the top and put all the details in a <details> block.
48+
claude_args: |
49+
--allowedTools Bash
50+
--system-prompt "If posting a comment to GitHub, give a concise summary of the comment at the top and put all the details in a <details> block."

client/src/App.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ import {
1818
LoggingLevel,
1919
} from "@modelcontextprotocol/sdk/types.js";
2020
import { OAuthTokensSchema } from "@modelcontextprotocol/sdk/shared/auth.js";
21+
import type {
22+
AnySchema,
23+
SchemaOutput,
24+
} from "@modelcontextprotocol/sdk/server/zod-compat.js";
2125
import { SESSION_KEYS, getServerSpecificKey } from "./lib/constants";
2226
import {
2327
hasValidMetaName,
@@ -688,11 +692,11 @@ const App = () => {
688692
setErrors((prev) => ({ ...prev, [tabKey]: null }));
689693
};
690694

691-
const sendMCPRequest = async <T extends z.ZodType>(
695+
const sendMCPRequest = async <T extends AnySchema>(
692696
request: ClientRequest,
693697
schema: T,
694698
tabKey?: keyof typeof errors,
695-
) => {
699+
): Promise<SchemaOutput<T>> => {
696700
try {
697701
const response = await makeRequest(request, schema);
698702
if (tabKey !== undefined) {

client/src/components/ToolResults.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ const ToolResults = ({
8080
<h4 className="font-semibold mb-2">Invalid Tool Result:</h4>
8181
<JsonView data={toolResult} />
8282
<h4 className="font-semibold mb-2">Errors:</h4>
83-
{parsedResult.error.errors.map((error, idx) => (
84-
<JsonView data={error} key={idx} />
83+
{parsedResult.error.issues.map((issue, idx) => (
84+
<JsonView data={issue} key={idx} />
8585
))}
8686
</>
8787
);

client/src/components/ui/button.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ const buttonVariants = cva(
3535
);
3636

3737
export interface ButtonProps
38-
extends React.ButtonHTMLAttributes<HTMLButtonElement>,
38+
extends
39+
React.ButtonHTMLAttributes<HTMLButtonElement>,
3940
VariantProps<typeof buttonVariants> {
4041
asChild?: boolean;
4142
}

client/src/lib/hooks/useConnection.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,13 @@ import {
3232
ElicitRequestSchema,
3333
Implementation,
3434
} from "@modelcontextprotocol/sdk/types.js";
35+
import type {
36+
AnySchema,
37+
SchemaOutput,
38+
} from "@modelcontextprotocol/sdk/server/zod-compat.js";
3539
import { RequestOptions } from "@modelcontextprotocol/sdk/shared/protocol.js";
3640
import { useEffect, useState } from "react";
3741
import { useToast } from "@/lib/hooks/useToast";
38-
import { z } from "zod";
3942
import { ConnectionStatus, CLIENT_IDENTITY } from "../constants";
4043
import { Notification } from "../notificationTypes";
4144
import {
@@ -170,11 +173,11 @@ export function useConnection({
170173
]);
171174
};
172175

173-
const makeRequest = async <T extends z.ZodType>(
176+
const makeRequest = async <T extends AnySchema>(
174177
request: ClientRequest,
175178
schema: T,
176179
options?: RequestOptions & { suppressToast?: boolean },
177-
): Promise<z.output<T>> => {
180+
): Promise<SchemaOutput<T>> => {
178181
if (!mcpClient) {
179182
throw new Error("MCP client not connected");
180183
}

client/src/lib/notificationTypes.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ import {
33
ClientNotificationSchema,
44
ServerNotificationSchema,
55
} from "@modelcontextprotocol/sdk/types.js";
6-
import { z } from "zod";
6+
import type { SchemaOutput } from "@modelcontextprotocol/sdk/server/zod-compat.js";
77

88
export const NotificationSchema = ClientNotificationSchema.or(
99
ServerNotificationSchema,
1010
).or(BaseNotificationSchema);
1111

12-
export type Notification = z.infer<typeof NotificationSchema>;
12+
export type Notification = SchemaOutput<typeof NotificationSchema>;

0 commit comments

Comments
 (0)