diff --git a/src/resources/extensions/sf/bootstrap/register-hooks.ts b/src/resources/extensions/sf/bootstrap/register-hooks.ts
index c34ba78e4..935dff567 100644
--- a/src/resources/extensions/sf/bootstrap/register-hooks.ts
+++ b/src/resources/extensions/sf/bootstrap/register-hooks.ts
@@ -463,6 +463,10 @@ export function registerHooks(pi: ExtensionAPI): void {
     return payload;
   });
 
+  pi.on("tool_call", async (event, ctx: ExtensionContext) => {
+    setVibeForTool(ctx, event.toolName, event.input);
+  });
+
   // Capability-aware model routing hook (ADR-004)
   // Extensions can override model selection by returning { modelId: "..." }
   // Return undefined to let the built-in capability scoring proceed.