switchroom 0.13.61 → 0.13.63

package/dist/cli/switchroom.js

@@ -23466,6 +23466,15 @@ function emitAgentService(lines, a, imageTag, buildMode, buildContext, homePrefi
     } catch {}
     lines.push(`      - ${homePrefix}/.switchroom-config/agents/${a.name}/personal-skills:${homePrefix}/.switchroom-config/agents/${a.name}/personal-skills:rw`);
   }
+  if (existsSync12(`${hostHomeForChecks}/.switchroom/bin/webkite`)) {
+    lines.push(`      - ${homePrefix}/.switchroom/bin/webkite:/usr/local/bin/webkite:ro`);
+  }
+  if (existsSync12(`${hostHomeForChecks}/.cloakbrowser`)) {
+    lines.push(`      - ${homePrefix}/.cloakbrowser:/state/agent/home/.cloakbrowser:ro`);
+  }
+  if (existsSync12(`${hostHomeForChecks}/.switchroom/webkite/config.toml`)) {
+    lines.push(`      - ${homePrefix}/.switchroom/webkite/config.toml:/state/agent/home/.config/webkite/config.toml:ro`);
+  }
   if (bundledSkillsPoolDir && existsSync12(bundledSkillsPoolDir) && !bundledSkillsPoolDir.startsWith(`${hostHomeForChecks}/.switchroom/skills`)) {
     lines.push(`      - ${bundledSkillsPoolDir}:${bundledSkillsPoolDir}:ro`);
   }
@@ -27779,6 +27788,13 @@ var init_via_claude = __esm(() => {
 });
 
 // src/vault/broker/acl.ts
+function isWebkiteCredentialKeyForAgent(agentConfig, key) {
+  if (!WEBKITE_VAULT_KEYS.has(key))
+    return false;
+  if ((agentConfig?.mcp_servers ?? {})["webkite"] === false)
+    return false;
+  return true;
+}
 function parseCronUnit(unitName) {
   const m = unitName.match(/^switchroom-([a-zA-Z0-9_-]+)-cron-(\d+)\.service$/);
   if (!m)
@@ -27868,6 +27884,9 @@ function checkAclByAgent(config, agentName, key) {
   if (isGoogleClientCredentialKeyForAgent(config, agentName, key)) {
     return { allow: true };
   }
+  if (isWebkiteCredentialKeyForAgent(agentConfig, key)) {
+    return { allow: true };
+  }
   const agentBot = agentConfig.bot_token;
   const botRef = agentBot && agentBot.length > 0 ? agentBot : config.telegram?.bot_token;
   if (typeof botRef === "string" && botRef.startsWith("vault:")) {
@@ -27941,7 +27960,14 @@ function checkGoogleAccountAcl(config, agentName, account, key) {
   }
   return { allow: true };
 }
-var init_acl = () => {};
+var WEBKITE_VAULT_KEYS;
+var init_acl = __esm(() => {
+  WEBKITE_VAULT_KEYS = new Set([
+    "webkite/cloudflare-account-id",
+    "webkite/cloudflare-api-token",
+    "webkite/firecrawl-api-key"
+  ]);
+});
 
 // src/util/audit-hashchain.ts
 import { createHash as createHash7 } from "node:crypto";
@@ -49057,8 +49083,8 @@ var {
 } = import__.default;
 
 // src/build-info.ts
-var VERSION = "0.13.61";
-var COMMIT_SHA = "43241ade";
+var VERSION = "0.13.63";
+var COMMIT_SHA = "9aaa5939";
 
 // src/cli/agent.ts
 init_source();
@@ -49695,6 +49721,42 @@ When the user asks you to forget something ("forget that", "delete X", "drop wha
 When the user asks "what do you know about X / me", "what do you remember about Y", or any memory audit, use \`reflect\` to synthesize an answer across the bank. Return it as honest prose, not a raw dump. If the bank has little on the topic, say so.
 
 Don't wait for a slash command. Don't ask permission. Memory work is table stakes, like a colleague who takes notes and remembers.`;
+var WEB_FETCH_GUIDANCE = `## Fetching from the web
+
+The native \`WebFetch\` and \`WebSearch\` tools are disabled in this
+fleet. Use the \`webkite_*\` MCP tools instead \u2014 they're already
+wired up and authenticated.
+
+The 12 tools webkite exposes cover what you actually need:
+
+- \`webkite_read\` \u2014 fetch a URL and get clean article text or
+  markdown. The everyday "read this page" tool. Pass several URLs
+  to read them in one call.
+- \`webkite_search\` \u2014 web search; returns URLs + snippets. Use
+  before \`webkite_read\` when you don't already have the URL.
+- \`webkite_extract\` \u2014 pull specific fields from one page via a
+  JSON Schema you supply. Use when you want structured data, not
+  prose.
+- \`webkite_crawl\` \u2014 walk a site from a seed URL. Higher-cost than
+  \`read\` or \`map\` \u2014 reserve for "harvest everything under this
+  section."
+- \`webkite_map\` \u2014 list a site's URLs from its sitemap, no page
+  content. Cheap. Use when you only need URLs.
+- \`webkite_clip\` \u2014 save a page snapshot (Obsidian, file, or
+  screenshot).
+- session / cookie / diagnostics helpers.
+
+**Why this exists:** the fleet ships with a stealth Chromium
+(cloakbrowser) baked in for bot-gated sites the native fetcher can't
+touch, plus Cloudflare/Firecrawl fallback when local render fails.
+\`webkite_*\` Just Works \u2014 don't try to shell out to \`curl\` or
+\`wget\` as a fallback; if webkite can't fetch a URL, neither can
+they.
+
+If you genuinely need WebFetch back for one agent (e.g. a workflow
+that depends on its specific output shape), set \`mcp_servers.webkite:
+false\` in that agent's switchroom.yaml block \u2014 webkite goes away
+and the native tools come back together.`;
 function renderFleetInvariants() {
   return [
     "<!--",
@@ -49717,6 +49779,8 @@ function renderFleetInvariants() {
     TELEGRAM_GUIDANCE,
     "",
     MEMORY_GUIDANCE,
+    "",
+    WEB_FETCH_GUIDANCE,
     ""
   ].join(`
 `);
@@ -49888,6 +49952,22 @@ var DEFAULT_READ_ONLY_PREAPPROVED_TOOLS = [
   "ExitPlanMode",
   "Skill"
 ];
+var WEBKITE_FLEET_DENY_TOOLS = ["WebFetch", "WebSearch"];
+var WEBKITE_BINARY_CONTAINER_PATH = "/usr/local/bin/webkite";
+function webkiteBinaryAvailable() {
+  const override = process.env.SWITCHROOM_WEBKITE_BINARY;
+  if (override !== undefined && override !== "") {
+    return existsSync11(override);
+  }
+  return existsSync11(join8(homedir4(), ".switchroom", "bin", "webkite")) || existsSync11(WEBKITE_BINARY_CONTAINER_PATH);
+}
+function webkiteDenyForAgent(agentConfig) {
+  if (agentConfig.mcp_servers?.["webkite"] === false)
+    return [];
+  if (!webkiteBinaryAvailable())
+    return [];
+  return WEBKITE_FLEET_DENY_TOOLS;
+}
 var SWITCHROOM_DEFAULT_MAIN_MODEL = "claude-sonnet-4-6";
 var SWITCHROOM_DEFAULT_THINKING_EFFORT = "low";
 function dedupe2(items) {
@@ -50455,7 +50535,10 @@ function buildWorkspaceContext(args) {
     user: agentConfig.user,
     agentConfig,
     tools,
-    toolsDeny: tools.deny ?? [],
+    toolsDeny: dedupe2([
+      ...tools.deny ?? [],
+      ...webkiteDenyForAgent(agentConfig)
+    ]),
     permissionAllow,
     defaultModeAcceptEdits: hasAllWildcard,
     memory: agentConfig.memory,
@@ -50602,6 +50685,17 @@ function resolveNotionMcpEntry(agentName, agentConfig, switchroomConfig) {
   };
   return entry;
 }
+function resolveWebkiteMcpEntry(_agentName, agentConfig, _switchroomConfig) {
+  if ((agentConfig.mcp_servers ?? {})["webkite"] === false)
+    return null;
+  return {
+    key: "webkite",
+    value: {
+      command: "webkite",
+      args: ["mcp"]
+    }
+  };
+}
 var INTEGRATION_MCP_RESOLVERS = [
   {
     label: "Google Workspace",
@@ -50620,6 +50714,12 @@ var INTEGRATION_MCP_RESOLVERS = [
     emitKey: "notion",
     retractionKey: "notion",
     resolve: resolveNotionMcpEntry
+  },
+  {
+    label: "Webkite",
+    emitKey: "webkite",
+    retractionKey: "webkite",
+    resolve: resolveWebkiteMcpEntry
   }
 ];
 function scaffoldAgent(name, agentConfigRaw, agentsDir, telegramConfig, switchroomConfig, userIdOverride, switchroomConfigPath) {
@@ -51443,7 +51543,10 @@ function reconcileAgent(name, agentConfigRaw, agentsDir, telegramConfig, switchr
     ...AGENT_CONFIG_MCP_TOOLS,
     ...HOSTD_MCP_TOOLS
   ]);
-  const desiredDeny = tools.deny ?? [];
+  const desiredDeny = dedupe2([
+    ...tools.deny ?? [],
+    ...webkiteDenyForAgent(agentConfig)
+  ]);
   let topicId = agentConfig.topic_id;
   if (topicId === undefined) {
     try {

package/dist/vault/broker/server.js

@@ -13133,6 +13133,18 @@ function isGoogleClientCredentialKeyForAgent(config, agentName, key) {
 }
 
 // src/vault/broker/acl.ts
+var WEBKITE_VAULT_KEYS = new Set([
+  "webkite/cloudflare-account-id",
+  "webkite/cloudflare-api-token",
+  "webkite/firecrawl-api-key"
+]);
+function isWebkiteCredentialKeyForAgent(agentConfig, key) {
+  if (!WEBKITE_VAULT_KEYS.has(key))
+    return false;
+  if ((agentConfig?.mcp_servers ?? {})["webkite"] === false)
+    return false;
+  return true;
+}
 function parseCronUnit(unitName) {
   const m = unitName.match(/^switchroom-([a-zA-Z0-9_-]+)-cron-(\d+)\.service$/);
   if (!m)
@@ -13222,6 +13234,9 @@ function checkAclByAgent(config, agentName, key) {
   if (isGoogleClientCredentialKeyForAgent(config, agentName, key)) {
     return { allow: true };
   }
+  if (isWebkiteCredentialKeyForAgent(agentConfig, key)) {
+    return { allow: true };
+  }
   const agentBot = agentConfig.bot_token;
   const botRef = agentBot && agentBot.length > 0 ? agentBot : config.telegram?.bot_token;
   if (typeof botRef === "string" && botRef.startsWith("vault:")) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "switchroom",
-  "version": "0.13.61",
+  "version": "0.13.63",
   "description": "Run Claude Code 24/7 on your Claude Pro/Max subscription over Telegram. Open-source alternative to OpenClaw and NanoClaw — no API keys.",
   "type": "module",
   "bin": {

package/profiles/_base/start.sh.hbs

@@ -598,6 +598,29 @@ if [ -d "$SR_FLEET_DIR" ]; then
   SR_FLEET_ARG="--add-dir $SR_FLEET_DIR"
 fi
 
+# Webkite credential pre-auth — fetch Cloudflare + Firecrawl creds from
+# the vault-broker at boot and export into the agent process env so
+# `webkite mcp` (spawned by claude with sanitized env per .mcp.json)
+# inherits them via the agent's env on `exec claude`. Best-effort: a
+# missing key falls webkite back to cloakbrowser-only (no cloud render),
+# which still works for most sites. The broker enforces the per-key
+# ACL — if the operator hasn't `--allow`ed this agent on the key, the
+# get returns empty and webkite stays cloakbrowser-only.
+if command -v switchroom >/dev/null 2>&1; then
+  for sr_wk_pair in \
+    "CLOUDFLARE_ACCOUNT_ID:webkite/cloudflare-account-id" \
+    "CLOUDFLARE_API_TOKEN:webkite/cloudflare-api-token" \
+    "FIRECRAWL_API_KEY:webkite/firecrawl-api-key"; do
+    sr_wk_env="${sr_wk_pair%%:*}"
+    sr_wk_key="${sr_wk_pair##*:}"
+    sr_wk_val="$(switchroom vault get "$sr_wk_key" 2>/dev/null || true)"
+    if [ -n "$sr_wk_val" ]; then
+      export "$sr_wk_env=$sr_wk_val"
+    fi
+  done
+  unset sr_wk_pair sr_wk_env sr_wk_key sr_wk_val
+fi
+
 {{#if useSwitchroomPlugin}}
 if [ -n "$APPEND_PROMPT" ]; then
   exec claude $CONTINUE_FLAG --dangerously-load-development-channels server:switchroom-telegram --plugin-dir "{{securityPluginDir}}"{{#if hindsightEnabled}} --plugin-dir "{{agentDir}}/.claude/plugins/hindsight-memory"{{/if}} $SR_FLEET_ARG{{#if modelQ}} --model {{{modelQ}}}{{/if}}{{#if thinkingEffort}} --effort {{thinkingEffort}}{{/if}}{{#if permissionMode}} --permission-mode {{permissionMode}}{{/if}}{{#if fallbackModelQ}} --fallback-model {{{fallbackModelQ}}}{{/if}} --append-system-prompt "$APPEND_PROMPT"{{#if dangerousMode}} --dangerously-skip-permissions{{/if}}{{#if extraCliArgs}}{{{extraCliArgs}}}{{/if}}

package/telegram-plugin/answer-stream.ts

@@ -82,7 +82,7 @@ export interface AnswerStreamConfig {
     chatId: string,
     draftId: number,
     text: string,
-    params?: { message_thread_id?: number },
+    params?: { message_thread_id?: number; parse_mode?: 'HTML' },
   ) => Promise<unknown>
   sendMessage: (
     chatId: string,

package/telegram-plugin/dist/gateway/gateway.js

@@ -31585,9 +31585,32 @@ function makeEmptyActivityState() {
 function verbForTool(toolName) {
   if (!toolName)
     return null;
-  const mcpMatch = /^mcp__([^_]+)__(.+)$/.exec(toolName);
+  const mcpMatch = /^mcp__(.+?)__(.+)$/.exec(toolName);
   if (mcpMatch && mcpMatch[1] === "switchroom-telegram")
     return null;
+  if (mcpMatch) {
+    const server = mcpMatch[1].toLowerCase();
+    const mcpTool = mcpMatch[2].toLowerCase();
+    if (server === "hindsight") {
+      if (mcpTool === "recall" || mcpTool === "reflect")
+        return "searched";
+      if (mcpTool === "retain" || mcpTool === "update_memory" || mcpTool === "sync_retain")
+        return "saved";
+    }
+    if (server === "google-workspace" || server === "claude_ai_google_drive" || server === "claude_ai_gmail" || server === "claude_ai_google_calendar") {
+      if (/^(search|list|query|read|get|fetch|download)/i.test(mcpTool))
+        return "searched";
+      if (/^(create|update|write|send|move|copy|duplicate)/i.test(mcpTool))
+        return "edited";
+    }
+    if (server === "notion" || server === "claude_ai_notion") {
+      const action = mcpTool.replace(/^notion-/, "");
+      if (/^(search|fetch|query|get|read)/i.test(action))
+        return "searched";
+      if (/^(create|update|move|duplicate|comment)/i.test(action))
+        return "edited";
+    }
+  }
   const suffix = (mcpMatch ? mcpMatch[2] : toolName).toLowerCase();
   switch (suffix) {
     case "read":
@@ -31639,6 +31662,7 @@ var VERB_PHRASE = {
   fetched: { singular: "fetched a URL", plural: "fetched $N URLs" },
   dispatched: { singular: "dispatched a sub-agent", plural: "dispatched $N sub-agents" },
   noted: { singular: "updated the todo list", plural: "updated the todo list ($N edits)" },
+  saved: { singular: "saved a memory", plural: "saved $N memories" },
   used: { singular: "used a tool", plural: "used $N tools" }
 };
 function formatSummary(state) {
@@ -37961,6 +37985,10 @@ function formatFrameworkFallbackText(fallbackKind, silenceMs, inFlightTools = []
     const dur = formatDurationShort(longest.durationMs);
     const labelTail = longest.label && longest.label.length > 0 ? ` ${truncateLabel(longest.label)}` : "";
     const more = inFlightTools.length > 1 ? ` + ${inFlightTools.length - 1} more` : "";
+    const isMcpRawName = /^mcp__/.test(longest.name);
+    if (isMcpRawName && labelTail !== "") {
+      return `${truncateLabel(longest.label)}${more} for ${dur} ${suffix}`;
+    }
     return `running ${longest.name}${labelTail}${more} for ${dur} ${suffix}`;
   }
   return fallbackKind === "thinking" ? `still thinking\u2026 ${suffix}` : `still working\u2026 ${suffix}`;
@@ -49688,10 +49716,10 @@ function sweepStaleTurnActiveMarker(stateDir, opts) {
 }
 
 // ../src/build-info.ts
-var VERSION = "0.13.61";
-var COMMIT_SHA = "43241ade";
-var COMMIT_DATE = "2026-05-28T01:27:29Z";
-var LATEST_PR = 1940;
+var VERSION = "0.13.63";
+var COMMIT_SHA = "9aaa5939";
+var COMMIT_DATE = "2026-05-28T03:28:57Z";
+var LATEST_PR = 1945;
 var COMMITS_AHEAD_OF_TAG = 0;
 
 // gateway/boot-version.ts
@@ -53669,7 +53697,7 @@ async function drainActivitySummary(turn) {
             turn.activityDraftId = allocateDraftId();
           }
           const draftId = turn.activityDraftId;
-          await sendMessageDraftFn(chat, draftId, html, undefined);
+          await sendMessageDraftFn(chat, draftId, html, { parse_mode: "HTML" });
         } else if (turn.activityMessageId == null) {
           const sent = await robustApiCall(() => bot.api.sendMessage(chat, html, {
             ...thread != null ? { message_thread_id: thread } : {},

package/telegram-plugin/gateway/gateway.ts

@@ -638,7 +638,7 @@ const GRAMMY_VERSION: string = (() => {
   }
 })()
 const sendMessageDraftFn: (
-  (chatId: string, draftId: number, text: string, params?: { message_thread_id?: number }) => Promise<unknown>
+  (chatId: string, draftId: number, text: string, params?: { message_thread_id?: number; parse_mode?: 'HTML' }) => Promise<unknown>
 ) | undefined =
   typeof _rawSendMessageDraft === 'function'
     ? (chatId, draftId, text, params) =>
@@ -6828,7 +6828,7 @@ async function drainActivitySummary(turn: CurrentTurn): Promise<void> {
             turn.activityDraftId = allocateDraftId()
           }
           const draftId = turn.activityDraftId
-          await sendMessageDraftFn!(chat, draftId, html, undefined)
+          await sendMessageDraftFn!(chat, draftId, html, { parse_mode: 'HTML' })
         } else if (turn.activityMessageId == null) {
           const sent = await robustApiCall(
             () => bot.api.sendMessage(chat, html, {

package/telegram-plugin/silence-poke.ts

@@ -433,6 +433,15 @@ export function formatFrameworkFallbackText(
   //   running Grep "foo" for 4m (no update from agent in 5 min)
   //   running Grep "foo" + 2 more (4m) (no update from agent in 5 min)
   //   running Grep (no label) for 4m (no update from agent in 5 min)
+  //
+  // Raw MCP tool names (`mcp__server__tool`) are technical identifiers
+  // and look like a leak when surfaced to a user. When the tool name
+  // matches that shape AND a human-friendly label is available, drop
+  // the raw name and lead with the label instead:
+  //   Searching memory for 4m (no update from agent in 5 min)
+  // Built-in tool names (Grep, Read, Bash) stay as-is — they ARE
+  // human-readable, and the label is supplementary detail (e.g. the
+  // search pattern) that reads naturally after the verb.
   if (inFlightTools.length > 0) {
     const longest = inFlightTools[0]!
     const dur = formatDurationShort(longest.durationMs)
@@ -442,6 +451,13 @@ export function formatFrameworkFallbackText(
     const more = inFlightTools.length > 1
       ? ` + ${inFlightTools.length - 1} more`
       : ''
+    const isMcpRawName = /^mcp__/.test(longest.name)
+    if (isMcpRawName && labelTail !== '') {
+      // Label-only: "Searching memory for 4m (…)". Drop the raw
+      // `mcp__server__tool` and the leading "running" because the
+      // label already reads as a gerund phrase.
+      return `${truncateLabel(longest.label!)}${more} for ${dur} ${suffix}`
+    }
     return `running ${longest.name}${labelTail}${more} for ${dur} ${suffix}`
   }
   return fallbackKind === 'thinking'

package/telegram-plugin/tests/silence-poke.test.ts

@@ -533,6 +533,43 @@ describe('silence-poke — #1292 tool-aware framework fallback', () => {
     )
   })
 
+  it('raw mcp__ tool name with a human label drops the technical name and leads with the label', () => {
+    // mcp__hindsight__reflect is the internal MCP identifier — looks
+    // like a leak when surfaced to a user. The label table emits
+    // "Searching memory" for it (see hooks/tool-label-pretool.mjs);
+    // the fallback message should lead with the label, not concatenate
+    // both.
+    const text = formatFrameworkFallbackText('working', 305_000, [
+      { name: 'mcp__hindsight__reflect', label: 'Searching memory', durationMs: 305_000 },
+    ])
+    expect(text).toBe(
+      'Searching memory for 5m (no update from agent in 5 min)',
+    )
+  })
+
+  it('raw mcp__ tool name with NO label falls back to the bare name (no leak-but-no-better-option)', () => {
+    // If the label table doesn't recognise an MCP tool, we have nothing
+    // better to show than the raw name. Better honest-ugly than silent.
+    const text = formatFrameworkFallbackText('working', 305_000, [
+      { name: 'mcp__some-third-party__do_thing', label: null, durationMs: 305_000 },
+    ])
+    expect(text).toBe(
+      'running mcp__some-third-party__do_thing for 5m (no update from agent in 5 min)',
+    )
+  })
+
+  it('built-in tool (Grep) with a label keeps the prior "running Name label" shape — name is already human-readable', () => {
+    // Regression guard: don't accidentally drop the built-in tool name
+    // when generalising the MCP rule. "Grep" is human-readable; the
+    // label ("foo") is supplementary detail like the search pattern.
+    const text = formatFrameworkFallbackText('working', 305_000, [
+      { name: 'Grep', label: 'foo', durationMs: 305_000 },
+    ])
+    expect(text).toBe(
+      'running Grep foo for 5m (no update from agent in 5 min)',
+    )
+  })
+
   it('empty inFlightTools falls back to the base "still working" wording', () => {
     expect(
       formatFrameworkFallbackText('working', 305_000, []),

package/telegram-plugin/tests/tool-activity-summary.test.ts

@@ -32,9 +32,25 @@ describe("verbForTool — tool name → past-tense verb", () => {
     expect(verbForTool("mcp__switchroom-telegram__react")).toBeNull();
   });
 
-  it("returns 'used' for unknown / non-switchroom MCP tools", () => {
-    expect(verbForTool("mcp__google-workspace__list_files")).toBe("used");
-    expect(verbForTool("mcp__notion__query_database")).toBe("used");
+  it("maps recognised MCP tools (hindsight, google-workspace, notion) to specific verbs", () => {
+    // hindsight: recall/reflect → searched, retain/update_memory → saved
+    expect(verbForTool("mcp__hindsight__reflect")).toBe("searched");
+    expect(verbForTool("mcp__hindsight__recall")).toBe("searched");
+    expect(verbForTool("mcp__hindsight__retain")).toBe("saved");
+    expect(verbForTool("mcp__hindsight__update_memory")).toBe("saved");
+    // google-workspace / claude.ai variants: read-shaped → searched, write-shaped → edited
+    expect(verbForTool("mcp__google-workspace__list_files")).toBe("searched");
+    expect(verbForTool("mcp__claude_ai_Gmail__search_messages")).toBe("searched");
+    expect(verbForTool("mcp__google-workspace__create_file")).toBe("edited");
+    expect(verbForTool("mcp__claude_ai_Google_Drive__download_file_content")).toBe("searched");
+    // notion: query/get → searched, create/update → edited
+    expect(verbForTool("mcp__notion__query_database")).toBe("searched");
+    expect(verbForTool("mcp__claude_ai_Notion__notion-search")).toBe("searched");
+    expect(verbForTool("mcp__claude_ai_Notion__notion-update-page")).toBe("edited");
+  });
+
+  it("returns 'used' for genuinely unknown MCP / future tools (generic fallback)", () => {
+    expect(verbForTool("mcp__random-third-party__do_thing")).toBe("used");
     expect(verbForTool("SomeFutureUnknownTool")).toBe("used");
   });
 
@@ -112,14 +128,26 @@ describe("register + formatSummary — Claude Code-style summary", () => {
     expect(formatSummary(s)).toBeNull(); // nothing tracked
   });
 
-  it("includes generic 'used' for unknown MCP tools", () => {
+  it("includes generic 'used' for genuinely-unknown MCP tools (fallback)", () => {
     const s = makeEmptyActivityState();
-    register(s, "mcp__google-workspace__list_files");
+    register(s, "mcp__random-third-party__do_thing");
     expect(formatSummary(s)).toBe("Used a tool");
-    register(s, "mcp__google-workspace__create_file");
+    register(s, "mcp__another-unknown-server__something_else");
     expect(formatSummary(s)).toBe("Used 2 tools");
   });
 
+  it("maps recognised MCP tools to natural-language summaries (no generic 'Used N tools')", () => {
+    // hindsight search shows up as 'searched' (memory)
+    const s = makeEmptyActivityState();
+    register(s, "mcp__hindsight__reflect");
+    expect(formatSummary(s)).toBe("Ran a search");
+    register(s, "mcp__hindsight__reflect");
+    expect(formatSummary(s)).toBe("Ran 2 searches");
+    // hindsight retain shows up as 'saved a memory'
+    register(s, "mcp__hindsight__retain");
+    expect(formatSummary(s)).toBe("Ran 2 searches, saved a memory");
+  });
+
   it("tracks firstToolName for forensic / telemetry use", () => {
     const s = makeEmptyActivityState();
     register(s, "Read");

package/telegram-plugin/tool-activity-summary.ts

@@ -40,6 +40,7 @@ export type ActivityVerb =
   | "fetched"
   | "dispatched"
   | "noted"
+  | "saved" // memory-retain class (hindsight, etc.) — distinct from "noted" (TodoWrite)
   | "used"; // generic fallback
 
 /** Object form so `register()` can mutate; pure functions inside the
@@ -66,10 +67,44 @@ export function makeEmptyActivityState(): ActivityState {
  *  like reply/stream_reply) return null — the caller skips them. */
 export function verbForTool(toolName: string): ActivityVerb | null {
   if (!toolName) return null;
-  const mcpMatch = /^mcp__([^_]+)__(.+)$/.exec(toolName);
+  // Lazy match on the server segment so names containing underscores
+  // (e.g. `mcp__claude_ai_Gmail__search`) parse as
+  //   server="claude_ai_Gmail", tool="search"
+  // instead of the prior `[^_]+` which stopped at the first inner `_`.
+  const mcpMatch = /^mcp__(.+?)__(.+)$/.exec(toolName);
   // Skip user-facing Telegram-plugin tools entirely — those ARE the
   // surface, never to be summarised.
   if (mcpMatch && mcpMatch[1] === "switchroom-telegram") return null;
+
+  // MCP allowlist — map common MCP tools to specific verbs so the summary
+  // reads as "Searched memory" or "Read 2 files" instead of the generic
+  // fallback "Used 2 tools". Tools NOT on this list fall through to the
+  // generic "used" verb, which is still better than nothing for one-offs
+  // but hurts on heavy MCP turns. Mirrors the label table in
+  // `telegram-plugin/hooks/tool-label-pretool.mjs` — keep them in sync.
+  if (mcpMatch) {
+    // Case-insensitive match — claude.ai prefixes use mixed-case
+    // server names ("claude_ai_Gmail", "claude_ai_Google_Drive") so we
+    // lowercase both sides before comparing.
+    const server = mcpMatch[1].toLowerCase();
+    const mcpTool = mcpMatch[2].toLowerCase();
+    if (server === "hindsight") {
+      if (mcpTool === "recall" || mcpTool === "reflect") return "searched";
+      if (mcpTool === "retain" || mcpTool === "update_memory" || mcpTool === "sync_retain") return "saved";
+    }
+    if (server === "google-workspace" || server === "claude_ai_google_drive" || server === "claude_ai_gmail" || server === "claude_ai_google_calendar") {
+      if (/^(search|list|query|read|get|fetch|download)/i.test(mcpTool)) return "searched";
+      if (/^(create|update|write|send|move|copy|duplicate)/i.test(mcpTool)) return "edited";
+    }
+    if (server === "notion" || server === "claude_ai_notion") {
+      // claude.ai Notion exposes tools as `notion-search`, `notion-update-page`,
+      // etc. Strip the redundant `notion-` prefix before matching the verb.
+      const action = mcpTool.replace(/^notion-/, "");
+      if (/^(search|fetch|query|get|read)/i.test(action)) return "searched";
+      if (/^(create|update|move|duplicate|comment)/i.test(action)) return "edited";
+    }
+  }
+
   const suffix = (mcpMatch ? mcpMatch[2] : toolName).toLowerCase();
   switch (suffix) {
     case "read":
@@ -128,6 +163,7 @@ const VERB_PHRASE: Record<ActivityVerb, VerbPhrase> = {
   fetched: { singular: "fetched a URL", plural: "fetched $N URLs" },
   dispatched: { singular: "dispatched a sub-agent", plural: "dispatched $N sub-agents" },
   noted: { singular: "updated the todo list", plural: "updated the todo list ($N edits)" },
+  saved: { singular: "saved a memory", plural: "saved $N memories" },
   used: { singular: "used a tool", plural: "used $N tools" },
 };