diff --git a/src/components/AddWorker/ToolSelect.tsx b/src/components/AddWorker/ToolSelect.tsx
index 24e45502a..727aa6bf9 100644
--- a/src/components/AddWorker/ToolSelect.tsx
+++ b/src/components/AddWorker/ToolSelect.tsx
@@ -630,7 +630,7 @@ const ToolSelect = forwardRef<
 					key={item.id + item.key + (item.isLocal + "")}
 					className="h-5 bg-button-tertiery-fill-default flex items-center gap-1 w-auto flex-shrink-0 px-xs"
 				>
-					{item.name || item.mcp_name}
+					{item.name || item.mcp_name || item.key || `tool_${item.id}`}
 					<div className="flex items-center justify-center bg-button-secondary-fill-disabled rounded-sm">
 						<X
 							className="w-4 h-4 cursor-pointer text-button-secondary-icon-disabled"
diff --git a/src/components/AddWorker/index.tsx b/src/components/AddWorker/index.tsx
index c06d8cd76..d53214244 100644
--- a/src/components/AddWorker/index.tsx
+++ b/src/components/AddWorker/index.tsx
@@ -282,7 +282,7 @@ export function AddWorker({
 						name: workerName,
 						type: workerName as AgentNameType,
 						log: [],
-						tools: [...selectedTools.map((tool) => tool.name)],
+						tools: [...selectedTools.map((tool) => tool.name || tool.mcp_name || tool.key || `tool_${tool.id}`)],
 						activeWebviewIds: [],
 						workerInfo: {
 							name: workerName,
@@ -310,7 +310,7 @@ export function AddWorker({
 				type: workerName as AgentNameType,
 				log: [],
 				tools: [
-					...selectedTools.map((tool) => tool?.key || tool?.mcp_name || ""),
+					...selectedTools.map((tool) => tool.name || tool.mcp_name || tool.key || `tool_${tool.id}`),
 				],
 				activeWebviewIds: [],
 				workerInfo: {
diff --git a/src/components/WorkFlow/node.tsx b/src/components/WorkFlow/node.tsx
index 0f5a5e8ff..a897f6a51 100644
--- a/src/components/WorkFlow/node.tsx
+++ b/src/components/WorkFlow/node.tsx
@@ -420,7 +420,7 @@ export function Node({ id, data }: NodeProps) {
 					</div>
 					<div
 						ref={toolsRef}
-						className="flex-shrink-0 text-text-label text-xs leading-tight min-h-4 font-normal mb-sm pr-3 text-"
+						className="flex-shrink-0 text-text-label text-xs leading-tight min-h-4 font-normal mb-sm pr-3"
 					>
 						{/* {JSON.stringify(data.agent)} */}
 						{agentToolkits[