diff --git a/src/websocket/listener/turn.ts b/src/websocket/listener/turn.ts
index 17612b5..3530e61 100644
--- a/src/websocket/listener/turn.ts
+++ b/src/websocket/listener/turn.ts
@@ -9,6 +9,7 @@ import type { ApprovalResult } from "../../agent/approval-execution";
 import { fetchRunErrorDetail } from "../../agent/approval-recovery";
 import { getResumeData } from "../../agent/check-approval";
 import { getClient } from "../../agent/client";
+import { setConversationId, setCurrentAgentId } from "../../agent/context";
 import {
   getStreamToolContextId,
   type sendMessageStream,
@@ -152,6 +153,10 @@ export async function handleIncomingMessage(
       return;
     }
 
+    // Set agent context for tools that need it (e.g., Skill tool)
+    setCurrentAgentId(agentId);
+    setConversationId(conversationId);
+
     if (isDebugEnabled()) {
       console.log(
         `[Listen] Handling message: agentId=${agentId}, requestedConversationId=${requestedConversationId}, conversationId=${conversationId}`,