diff --git a/src/agents/pi-tools.test.ts b/src/agents/pi-tools.test.ts
index 0dde36e2e..51c366a55 100644
--- a/src/agents/pi-tools.test.ts
+++ b/src/agents/pi-tools.test.ts
@@ -74,7 +74,7 @@ describe("createClawdisCodingTools", () => {
 
   it("keeps anyOf variants for non-Gemini providers", () => {
     const tools = createClawdisCodingTools({ provider: "openai" });
-    const browser = tools.find((tool) => tool.name === "browser");
+    const browser = tools.find((tool) => tool.name === "clawdis_browser");
     expect(browser).toBeDefined();
     const parameters = browser?.parameters as {
       anyOf?: Array<{ properties?: Record<string, unknown> }>;
@@ -92,7 +92,7 @@ describe("createClawdisCodingTools", () => {
 
   it("strips anyOf for google-gemini-cli tools", () => {
     const tools = createClawdisCodingTools({ provider: "google-gemini-cli" });
-    const browser = tools.find((tool) => tool.name === "browser");
+    const browser = tools.find((tool) => tool.name === "clawdis_browser");
     expect(browser).toBeDefined();
     const parameters = browser?.parameters as {
       anyOf?: unknown;
@@ -106,7 +106,7 @@ describe("createClawdisCodingTools", () => {
 
   it("strips anyOf for google-antigravity tools", () => {
     const tools = createClawdisCodingTools({ provider: "google-antigravity" });
-    const browser = tools.find((tool) => tool.name === "browser");
+    const browser = tools.find((tool) => tool.name === "clawdis_browser");
     expect(browser).toBeDefined();
     const parameters = browser?.parameters as {
       anyOf?: unknown;
diff --git a/src/agents/pi-tools.ts b/src/agents/pi-tools.ts
index f80abc639..7a428b4a7 100644
--- a/src/agents/pi-tools.ts
+++ b/src/agents/pi-tools.ts
@@ -365,6 +365,17 @@ function createClawdisReadTool(base: AnyAgentTool): AnyAgentTool {
   };
 }
 
+function normalizeSurface(surface?: string): string | undefined {
+  const trimmed = surface?.trim().toLowerCase();
+  return trimmed ? trimmed : undefined;
+}
+
+function shouldIncludeDiscordTool(surface?: string): boolean {
+  const normalized = normalizeSurface(surface);
+  if (!normalized) return false;
+  return normalized === "discord" || normalized.startsWith("discord:");
+}
+
 export function createClawdisCodingTools(options?: {
   bash?: BashToolDefaults & ProcessToolDefaults;
   surface?: string;