diff --git a/client/src/components/ToolsTab.tsx b/client/src/components/ToolsTab.tsx
index 6f823615..ac898235 100644
--- a/client/src/components/ToolsTab.tsx
+++ b/client/src/components/ToolsTab.tsx
@@ -51,12 +51,12 @@ import {
   hasValidMetaName,
   hasValidMetaPrefix,
   isReservedMetaKey,
-} from "../utils/metaUtils";
+} from "@/utils/metaUtils";
 
 /**
  * Extended Tool type that includes optional fields used by the inspector.
  */
-interface ExtendedTool extends Tool, WithIcons {
+export interface ExtendedTool extends Tool, WithIcons {
   _meta?: Record<string, unknown>;
   execution?: {
     taskSupport?: "forbidden" | "required" | "optional";
@@ -69,7 +69,7 @@ const hasMeta = (
 ): tool is ExtendedTool & { _meta: Record<string, unknown> } =>
   typeof (tool as ExtendedTool)._meta !== "undefined";
 
-// Type guard to detect execution.taskSupport
+// Returns the execution.taskSupport value for a tool, defaulting to "forbidden" per MCP spec
 const getTaskSupport = (
   tool: Tool | null,
 ): "forbidden" | "required" | "optional" => {
@@ -83,7 +83,7 @@ const getTaskSupport = (
   ) {
     return taskSupport;
   }
-  return "optional";
+  return "forbidden";
 };
 
 // Type guard to safely detect the optional annotations field
@@ -264,6 +264,8 @@ const ToolsTab = ({
     return trimmedKey !== "" && !hasValidMetaName(trimmedKey);
   });
 
+  const taskSupport = getTaskSupport(selectedTool);
+
   return (
     <TabsContent value="tools">
       <div className="grid grid-cols-2 gap-4">
@@ -777,7 +779,7 @@ const ToolsTab = ({
                       </div>
                     </div>
                   )}
-                {getTaskSupport(selectedTool) !== "forbidden" && (
+                {taskSupport !== "forbidden" && (
                   <div className="flex items-center space-x-2">
                     <Checkbox
                       id="run-as-task"
@@ -785,7 +787,7 @@ const ToolsTab = ({
                       onCheckedChange={(checked: boolean) =>
                         setRunAsTask(checked)
                       }
-                      disabled={getTaskSupport(selectedTool) === "required"}
+                      disabled={taskSupport === "required"}
                     />
                     <Label
                       htmlFor="run-as-task"
diff --git a/client/src/components/__tests__/ToolsTab.test.tsx b/client/src/components/__tests__/ToolsTab.test.tsx
index d2e5499a..9978aba1 100644
--- a/client/src/components/__tests__/ToolsTab.test.tsx
+++ b/client/src/components/__tests__/ToolsTab.test.tsx
@@ -1,7 +1,7 @@
 import { render, screen, fireEvent, act } from "@testing-library/react";
 import "@testing-library/jest-dom";
 import { describe, it, jest, beforeEach } from "@jest/globals";
-import ToolsTab from "../ToolsTab";
+import ToolsTab, { ExtendedTool } from "../ToolsTab";
 import { Tool } from "@modelcontextprotocol/sdk/types.js";
 import { Tabs } from "../ui/tabs";
 import { cacheToolOutputSchemas } from "../../utils/schemaUtils";
@@ -12,13 +12,6 @@ import {
   RESERVED_NAMESPACE_MESSAGE,
 } from "../../utils/metaUtils";
 
-interface ExtendedTool extends Tool {
-  _meta?: Record<string, unknown>;
-  execution?: {
-    taskSupport?: "forbidden" | "required" | "optional";
-  };
-}
-
 describe("ToolsTab", () => {
   beforeEach(() => {
     // Clear the output schema cache before each test