claude-spotter 1.1.3 → 1.1.4

package/CHANGELOG.md

@@ -1,5 +1,32 @@
 # Changelog
 
+## 1.1.4
+
+**MCP 投資ロジックの 2 件の穴を修正**。どちらも「名乗っているスコープ」と「実際に参照されるスコープ」が一致していない silent mismatch。前者は projectRoot 引数が効かない経路、後者は baseline が現実を無視して常に 25 件投入される経路。
+
+### 変更点
+
+- **編集 [src/tool-db/investigate-mcp.mjs](src/tool-db/investigate-mcp.mjs)**: `listMcpServers` / `getStdioConfig` が projectRoot を受け取っておきながら `execClaude(claude mcp list / mcp get)` に `cwd` を渡していなかったため、`.mcp.json` 読み込みと claude CLI の walk-up が別プロジェクトを見る可能性があった。`cwd: projectRoot` を付与し、`listMcpToolsOne` を通じて projectRoot を伝搬するシグネチャに変更。通常は `process.cwd() === projectRoot` で表面化しないが、API の意味論を実装に揃える
+- **編集 [src/tool-db/claude-ai-baseline.mjs](src/tool-db/claude-ai-baseline.mjs)**: flat な `listClaudeAiNames` / `getClaudeAiDescription` を削除、server 単位の `getClaudeAiBaselineByServer()` に再編。Gmail / Calendar / Drive を個別集合として保持し、呼び出し側で現実に存在するサーバーのみ注入できるようにした
+- **編集 [src/tool-db/refresh.mjs](src/tool-db/refresh.mjs)**: `buildInvestigationSnapshot` で `listMcpServers` の結果に基づき baseline を filter。`claude mcp list` に `claude.ai Gmail` / `claude.ai Google Calendar` / `claude.ai Google Drive` が存在しない環境 (隔離 `CLAUDE_CONFIG_DIR`, claude.ai OAuth 未連携, 部分連携) では該当 baseline は投入されない。純粋関数 `filterClaudeAiBaseline` を named export として切り出しテスト可能にした
+- **編集 [test/tool-db.test.mjs](test/tool-db.test.mjs)**: `filterClaudeAiBaseline` の回帰テスト 3 件追加 — 全 3 サーバー存在 / Gmail のみ存在 / 全不在
+
+### 背景
+
+#### projectRoot の silent mismatch
+
+v0.10.0 で `.mcp.json` の project scope 対応を入れた際、`readMcpServers({projectRoot})` は projectRoot を尊重するようにしたが、同じ関数内で spawn している `claude mcp list` / `claude mcp get` には `cwd` を渡し忘れていた。claude CLI は cwd から親方向に walk-up して `.mcp.json` を探すため、Spotter が引数で指定した projectRoot と claude CLI が勝手に見つけた project scope が乖離する可能性が残っていた。
+
+#### claude.ai baseline の無条件注入
+
+v0.8.0 で claude.ai OAuth 系 MCP (Gmail / Calendar / Drive) を手書き baseline として導入した際、「live HTTP investigate が成功した場合 override される」という想定で無条件注入ロジックを置いていた。しかし claude.ai 系は `.mcp.json` に載らず OAuth proxy 経由のため、`listMcpToolsAll` の investigate 対象にそもそも入らない = override 経路は発動不能。結果、claude.ai 未連携 / 部分連携環境 (隔離 `CLAUDE_CONFIG_DIR` での bellbot 等) で最大 25 件の幻ツールが catalog に残り、Bell が呼べないツールを Spotter が推奨する誤検出源になっていた。
+
+### 設計判断
+
+- **`listMcpToolsAll` のシグネチャは触らない**: baseline filter 用に `listMcpServers` を buildInvestigationSnapshot で先に呼ぶと、内部で listMcpToolsAll がもう一度 CLI spawn する。pre-resolved servers 引数で避けられるが、API 表面を増やすコストに対し `claude mcp list` は 0.5-2s の 1 度だけなので受容
+- **診断ログ追加**: baseline 注入時に `claude.ai baseline injected: N tools from <server list>` を logFn に出力。どの環境で何件入ったか後から追えるようにした
+- **後方互換 export は削除**: `listClaudeAiNames` / `getClaudeAiDescription` は [src/index.mjs](src/index.mjs) に re-export されておらず、外部利用の形跡なし。残しても drift 源になるため削除
+
 ## 1.1.3
 
 **v1.1.x の実装進展にドキュメントを追従させる docs-only リリース**。コード変更なし。npm package tarball 同梱の README が古い手順を指していたため再 publish。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-spotter",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "Audit agent running alongside Claude Code that catches missed tool calls — 気づく役と実行する役の分離",
   "type": "module",
   "bin": {

package/src/tool-db/claude-ai-baseline.mjs

@@ -75,12 +75,19 @@ const DRIVE = {
     'List who has access to a Drive file and their role (reader/commenter/writer/owner). Use when the user asks who can see or edit a file.',
 };
 
-const ALL = { ...GMAIL, ...CALENDAR, ...DRIVE };
-
-export function listClaudeAiNames() {
-  return Object.keys(ALL);
-}
+// Server-level structure. Keys are the literal server names as reported by
+// `claude mcp list` — the callers in refresh.mjs filter by this name so that the
+// baseline is only injected for servers actually visible in the current session.
+// Without this filter, 25 phantom tools leak into the catalog in any environment
+// where Claude.ai OAuth is not connected (isolated CLAUDE_CONFIG_DIR, Max plan
+// users without Desktop integration, or partial Gmail-only / Calendar-only setups).
+const BY_SERVER = {
+  'claude.ai Gmail': GMAIL,
+  'claude.ai Google Calendar': CALENDAR,
+  'claude.ai Google Drive': DRIVE,
+};
 
-export function getClaudeAiDescription(name) {
-  return ALL[name] ?? null;
+// Returns Map<serverName, {toolName: description}>.
+export function getClaudeAiBaselineByServer() {
+  return new Map(Object.entries(BY_SERVER));
 }

package/src/tool-db/investigate-mcp.mjs

@@ -45,7 +45,7 @@ export async function listMcpToolsAll({ logFn = () => {}, claudeBin = 'claude',
   const out = new Map();
   for (const server of servers) {
     try {
-      const tools = await listMcpToolsOne({ server, logFn });
+      const tools = await listMcpToolsOne({ server, logFn, claudeBin, projectRoot });
       out.set(server.name, tools);
     } catch (err) {
       logFn(`mcp investigate failed for "${server.name}": ${err.message}`);
@@ -64,9 +64,15 @@ export async function listMcpToolsAll({ logFn = () => {}, claudeBin = 'claude',
 // full descriptor (with env/headers). Otherwise we fall back to the parsed CLI line,
 // which at minimum gives us name + transport + url (or triggers `claude mcp get` for
 // stdio command tokenisation).
+//
+// We pass `cwd: projectRoot` to the CLI so its project-scope walk-up lands in the same
+// directory we read `.mcp.json` from. Without this, `claude` walks up from the parent
+// process's cwd and can resolve a different project than `readMcpServers` does.
 export async function listMcpServers({ claudeBin = 'claude', projectRoot } = {}) {
+  const execOpts = { encoding: 'utf8' };
+  if (projectRoot) execOpts.cwd = projectRoot;
   const [{ stdout }, mcpServers] = await Promise.all([
-    execClaude(claudeBin, ['mcp', 'list'], { encoding: 'utf8' }),
+    execClaude(claudeBin, ['mcp', 'list'], execOpts),
     readMcpServers({ projectRoot }),
   ]);
   const cliList = parseMcpListOutput(stdout);
@@ -115,12 +121,12 @@ export function parseMcpListOutput(text) {
 // Fetch tools/list from a single MCP server. The `server` descriptor either came
 // from `.mcp.json` (carries env / headers) or from CLI output (bare). For stdio
 // entries without full config we fall back to `claude mcp get`.
-export async function listMcpToolsOne({ server, logFn = () => {}, claudeBin = 'claude' }) {
+export async function listMcpToolsOne({ server, logFn = () => {}, claudeBin = 'claude', projectRoot }) {
   if (server.transport === 'stdio') {
     const hasFullConfig = server.command !== undefined;
     const config = hasFullConfig
       ? { command: server.command, args: server.args ?? [], env: server.env ?? {} }
-      : await getStdioConfig({ name: server.name, claudeBin });
+      : await getStdioConfig({ name: server.name, claudeBin, projectRoot });
     return spawnAndQuery(config, server.name);
   }
   if (server.transport === 'http' || server.transport === 'sse') {
@@ -135,8 +141,12 @@ export async function listMcpToolsOne({ server, logFn = () => {}, claudeBin = 'c
 }
 
 // Parse `claude mcp get <name>` to extract Command + Args for stdio servers.
-async function getStdioConfig({ name, claudeBin }) {
-  const { stdout } = await execClaude(claudeBin, ['mcp', 'get', name], { encoding: 'utf8' });
+// `cwd: projectRoot` pins the CLI's scope walk-up to the same directory used for
+// `.mcp.json` reading — see listMcpServers for the rationale.
+async function getStdioConfig({ name, claudeBin, projectRoot }) {
+  const execOpts = { encoding: 'utf8' };
+  if (projectRoot) execOpts.cwd = projectRoot;
+  const { stdout } = await execClaude(claudeBin, ['mcp', 'get', name], execOpts);
   let command = null;
   let argsRaw = null;
   for (const rawLine of stdout.split('\n')) {

package/src/tool-db/refresh.mjs

@@ -11,12 +11,26 @@
 // sub-agents.
 
 import { resolveAll } from './lookup.mjs';
-import { listMcpToolsAll, bellVisibleName } from './investigate-mcp.mjs';
-import { getClaudeAiDescription, listClaudeAiNames } from './claude-ai-baseline.mjs';
+import { listMcpToolsAll, listMcpServers, bellVisibleName } from './investigate-mcp.mjs';
+import { getClaudeAiBaselineByServer } from './claude-ai-baseline.mjs';
 import { listSkillsAll } from './investigate-skills.mjs';
 import { listAgentsAll } from './investigate-agents.mjs';
 import { localDbPath, globalDbPath } from './loader.mjs';
 
+// Pure filter: returns the subset of the claude.ai baseline whose server name is
+// present in `presentServerNames`. Accepts a Set for O(1) membership. Extracted as
+// a named export so it can be unit-tested without a live `claude` CLI.
+export function filterClaudeAiBaseline(presentServerNames) {
+  const out = new Map();
+  for (const [serverName, tools] of getClaudeAiBaselineByServer()) {
+    if (!presentServerNames.has(serverName)) continue;
+    for (const [toolName, description] of Object.entries(tools)) {
+      out.set(toolName, description);
+    }
+  }
+  return out;
+}
+
 // Build the (name → description) map for an investigation pass across all sources:
 //   - claude.ai MCP baseline (Gmail / Calendar / Drive — OAuth, not locally introspectable)
 //   - MCP servers via stdio + HTTP/SSE (user + project .mcp.json, live fetched)
@@ -27,11 +41,19 @@ import { localDbPath, globalDbPath } from './loader.mjs';
 export async function buildInvestigationSnapshot({ logFn = () => {}, claudeBin = 'claude', projectRoot } = {}) {
   const snapshot = new Map();
 
-  // Anthropic-provided `claude.ai ...` MCP servers — hardcoded because the OAuth proxy
+  // Anthropic-provided `claude.ai ...` MCP servers. Hardcoded because the OAuth proxy
   // is not reachable without reading ~/.claude/.credentials.json (deliberately avoided).
-  // If a live HTTP investigate for the same name later succeeds below, it overrides.
-  for (const name of listClaudeAiNames()) {
-    snapshot.set(name, getClaudeAiDescription(name));
+  // Injected only for servers actually present in `claude mcp list` — otherwise phantom
+  // tools (Gmail/Calendar/Drive) leak into environments where those servers are not
+  // connected. See filterClaudeAiBaseline above.
+  const servers = await listMcpServers({ claudeBin, projectRoot });
+  const presentServerNames = new Set(servers.map((s) => s.name));
+  const baseline = filterClaudeAiBaseline(presentServerNames);
+  for (const [name, description] of baseline) {
+    snapshot.set(name, description);
+  }
+  if (baseline.size > 0) {
+    logFn(`claude.ai baseline injected: ${baseline.size} tools from ${[...presentServerNames].filter((n) => n.startsWith('claude.ai ')).join(', ')}`);
   }
 
   // MCP servers (stdio + user-registered HTTP/SSE). projectRoot forwards for