@coworker-jp/aidr 0.1.144 → 0.1.271

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coworker-jp/aidr",
-  "version": "0.1.144",
+  "version": "0.1.271",
   "description": "AIDR setup CLI - installs ai-scanner hooks for 19+ AI coding agents",
   "type": "module",
   "bin": {

package/src/claude-desktop.mjs

@@ -0,0 +1,258 @@
+// Register an MCP server with **Claude Desktop** by editing its configuration
+// file, for the servers that have no other route into it.
+//
+// Why this exists at all: `claude mcp add` only knows Claude Code, and the
+// `.mcpb` bundle format only carries servers we build and ship ourselves. The
+// browser-control companion is neither — it is the upstream Apache-2.0 package
+// run through `npx`, which we deliberately do not redistribute (`red-team.mjs`,
+// `kind: "npx"`). That left the Claude Desktop user with one option: open
+// `claude_desktop_config.json` and hand-edit JSON.
+//
+// Hand-editing is the wrong ask for the audience. A mistake there is not
+// "the new server didn't start" — a malformed configuration file takes down
+// EVERY MCP server in Claude Desktop, including the scanner `.mcpb` the user
+// installed one step earlier. The failure is also silent from the user's point
+// of view: Claude Desktop simply comes back with no tools.
+//
+// So the work moves here, where it can be done correctly once: parse, merge,
+// back up, write atomically — all of which `fs-utils.mjs` already implements
+// for the agent settings files.
+//
+// The other thing this buys, and the reason a `.mcpb` could not replace it:
+// **the absolute path of `npx` is resolved on the machine being configured.**
+// A bundle is static, so it would have to hard-code either `npx` (which relies
+// on whatever PATH Claude Desktop hands its child processes — Claude Desktop
+// ships no Node runtime of its own) or one absolute path (which differs per
+// install: Homebrew, nvm, Volta, system). Running on the endpoint removes that
+// guess entirely.
+
+import fsp from "node:fs/promises";
+import path from "node:path";
+import { execFile } from "node:child_process";
+import { promisify } from "node:util";
+
+import { writeJsonMerge } from "./fs-utils.mjs";
+
+const execFileP = promisify(execFile);
+
+/**
+ * Where Claude Desktop keeps its configuration.
+ *
+ * Returns null where Claude Desktop does not exist, so callers can say so
+ * instead of writing a file nothing will ever read. There is no official Linux
+ * build; inventing a path for it would produce a silent no-op that looks like
+ * a successful install.
+ */
+export function desktopConfigPath(home, { platform = process.platform, env = process.env } = {}) {
+  const p = pathFor(platform);
+  if (platform === "darwin") {
+    return p.join(home, "Library", "Application Support", "Claude", "claude_desktop_config.json");
+  }
+  if (platform === "win32") {
+    const appData = env.APPDATA || p.join(home, "AppData", "Roaming");
+    return p.join(appData, "Claude", "claude_desktop_config.json");
+  }
+  return null;
+}
+
+/**
+ * Path semantics for the platform being configured, not for the host.
+ *
+ * `platform` is injectable so the Windows layout can be tested from CI (which
+ * runs Linux). Leaving `path` host-native would make that injection a half
+ * measure: the binary NAME would follow the argument while joining and
+ * `dirname` still used POSIX rules, so `dirname("C:\\…\\node.exe")` returns "."
+ * and the resolved command silently becomes a relative path. On a real Windows
+ * machine `process.platform` selects win32 here, so behaviour is unchanged.
+ */
+function pathFor(platform) {
+  return platform === "win32" ? path.win32 : path.posix;
+}
+
+/**
+ * Absolute path to `npx` on this machine.
+ *
+ * Order: the sibling of the Node binary currently running (we were started by
+ * `npx` itself, so that directory is where npm's shims live on every standard
+ * install), then the platform's own lookup.
+ *
+ * Deliberately has NO fallback to the bare string `"npx"`. Writing that would
+ * hand the user back the exact failure this function exists to remove, and it
+ * would fail later — at Claude Desktop startup, with the server simply absent
+ * — rather than here, where we can still say what went wrong.
+ */
+export async function resolveNpxPath({
+  platform = process.platform,
+  execPath = process.execPath,
+  lookup = defaultLookup,
+  exists = defaultExists,
+} = {}) {
+  const p = pathFor(platform);
+  const binName = platform === "win32" ? "npx.cmd" : "npx";
+  const sibling = p.join(p.dirname(execPath), binName);
+  if (await exists(sibling)) return sibling;
+
+  const found = await lookup(binName, platform);
+  if (found && (await exists(found))) return found;
+
+  throw new Error(
+    "could not locate npx on this machine. " +
+    "Claude Desktop needs an absolute path because it does not inherit your shell's PATH. " +
+    "Install Node.js (which ships npx), then re-run this command.",
+  );
+}
+
+async function defaultLookup(binName, platform) {
+  const cmd = platform === "win32" ? "where" : "which";
+  try {
+    const { stdout } = await execFileP(cmd, [binName]);
+    // `where` can return several lines; take the first.
+    return (stdout || "").split(/\r?\n/).map((s) => s.trim()).find(Boolean) || null;
+  } catch {
+    return null;
+  }
+}
+
+async function defaultExists(p) {
+  try {
+    await fsp.access(p);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+/**
+ * Merge our server entry into an existing parsed configuration.
+ *
+ * Pure so it can be tested without touching a filesystem, and because every
+ * interesting case here is a shape the user's file might already be in:
+ *
+ *  - `mcpServers` absent            → create it
+ *  - `mcpServers` an object         → add / replace one member, keep the rest
+ *  - `mcpServers` NOT an object     → replace it
+ *
+ * That last case is not hypothetical: a real installation was observed with
+ * `"mcpServers": []` (an empty ARRAY). Spreading an array into an object would
+ * produce `{"0": …}`-shaped garbage, and leaving it alone would make the
+ * install silently do nothing. Every unrelated top-level key is preserved
+ * untouched — real files carry app state next to `mcpServers`.
+ */
+export function mergeDesktopServers(existing, ours) {
+  const base = existing && typeof existing === "object" && !Array.isArray(existing) ? existing : {};
+  const servers =
+    base.mcpServers && typeof base.mcpServers === "object" && !Array.isArray(base.mcpServers)
+      ? base.mcpServers
+      : {};
+  return { ...base, mcpServers: { ...servers, ...ours } };
+}
+
+/** True when `name` already has an entry we did not write. */
+export function hasServer(existing, name) {
+  const servers = existing && typeof existing === "object" ? existing.mcpServers : null;
+  if (!servers || typeof servers !== "object" || Array.isArray(servers)) return false;
+  return Object.prototype.hasOwnProperty.call(servers, name);
+}
+
+/**
+ * Install an `npx`-kind MCP server into Claude Desktop.
+ *
+ * `meta` is a `RED_TEAM_PRODUCTS` entry (`kind: "npx"`). Binary products are
+ * rejected by the caller: those ship as `.mcpb` bundles, which is the route
+ * Claude Desktop already has for them.
+ */
+export async function installDesktopCompanion({
+  meta,
+  home,
+  dryRun = false,
+  force = false,
+  platform = process.platform,
+  env = process.env,
+  stdout = console.log,
+  stderr = console.error,
+  npxPath = null,
+  readConfig = defaultReadConfig,
+} = {}) {
+  const target = desktopConfigPath(home, { platform, env });
+  if (!target) {
+    throw new Error(
+      `Claude Desktop is not available on this platform (${platform}). ` +
+      "Use --agent claude to install into Claude Code instead.",
+    );
+  }
+
+  // Read before writing so we can refuse to take over a name the user already
+  // configured. Same rule as the Claude Code path: the upstream server names
+  // are generic, and a customer may well have registered `playwright`
+  // themselves with a different version or different flags.
+  const existing = await readConfig(target);
+  if (!force && hasServer(existing, meta.mcpServerName)) {
+    stderr(`'${meta.mcpServerName}' is already configured in ${target} — leaving it as is.`);
+    stderr(`Re-run with --force to replace it with: npx -y ${meta.npmSpec} ${meta.serverArgs.join(" ")}`);
+    return { installed: false, skipped: true, path: target };
+  }
+
+  const command = npxPath || (await resolveNpxPath({ platform }));
+  const ours = {
+    [meta.mcpServerName]: {
+      command,
+      args: ["-y", meta.npmSpec, ...meta.serverArgs],
+    },
+  };
+
+  const res = await writeJsonMerge(target, ours, mergeDesktopServers, { dryRun });
+  if (res.written) {
+    stdout(`claude desktop: registered '${meta.mcpServerName}' in ${target}`);
+    stdout(`  command: ${command}`);
+  } else if (res.unchanged) {
+    stdout(`claude desktop: '${meta.mcpServerName}' already up to date in ${target}`);
+  }
+  return { installed: Boolean(res.written), path: target, backupPath: res.backupPath, command };
+}
+
+/** Remove our server entry from the Claude Desktop configuration. */
+export async function uninstallDesktopCompanion({
+  meta,
+  home,
+  dryRun = false,
+  platform = process.platform,
+  env = process.env,
+  stdout = console.log,
+  readConfig = defaultReadConfig,
+} = {}) {
+  const target = desktopConfigPath(home, { platform, env });
+  if (!target) return { removed: false };
+
+  const existing = await readConfig(target);
+  if (!hasServer(existing, meta.mcpServerName)) {
+    // Say so. Returning quietly here made "there was nothing to remove" and
+    // "the removal worked" look identical from the terminal — both were exit 0
+    // with no output, and the user has no way to tell which one happened.
+    stdout(`claude desktop: '${meta.mcpServerName}' is not registered in ${target} — nothing to remove.`);
+    return { removed: false, path: target };
+  }
+
+  // Rebuild without our entry rather than deleting the file: everything else in
+  // it belongs to the user.
+  const kept = { ...existing.mcpServers };
+  delete kept[meta.mcpServerName];
+  const res = await writeJsonMerge(
+    target,
+    {},
+    (base) => ({ ...(base || {}), mcpServers: kept }),
+    { dryRun },
+  );
+  if (res.written) stdout(`claude desktop: removed '${meta.mcpServerName}' from ${target}`);
+  return { removed: Boolean(res.written), path: target };
+}
+
+async function defaultReadConfig(target) {
+  try {
+    const text = await fsp.readFile(target, "utf8");
+    return JSON.parse(text.replace(/^\uFEFF/, ""));
+  } catch {
+    // Missing is the common first-install case. Malformed is caught (and
+    // refused) by writeJsonMerge, which is the only thing that writes.
+    return null;
+  }
+}

package/src/cli.mjs

@@ -549,12 +549,52 @@ aidr now installs agent hooks only:
 // install/uninstall の --agent 複数指定・--all の枠組みには乗せず、独立した
 // サブコマンドにしている。実装は red-team.mjs に分離 (scheduled/sentinel と
 // 同じ遅延 import パターン)。
+// `claude` は Claude Code (`claude mcp add`)、`claude-desktop` は Claude Desktop
+// (設定ファイルへのマージ)。後者を足したのは、Claude Desktop に入る唯一の手段が
+// 「`claude_desktop_config.json` を手で編集する」だったため — 失敗すると設定
+// ファイル全体が読めなくなり、その端末の MCP サーバーが全滅する (直前に入れた
+// スキャナの `.mcpb` ごと)。実装は claude-desktop.mjs。
+const RED_TEAM_AGENTS = new Set(["claude", "claude-desktop"]);
+
+/**
+ * Which directory the install resolves its target against.
+ *
+ * Exported as a pure function so it can be tested on any platform. The same
+ * property asserted through the CLI would only ever run on macOS or Windows —
+ * `installDesktopCompanion` rejects Linux before it gets here — and CI runs on
+ * Linux, so a CLI-level test of this would be a test that never executes
+ * (CLAUDE.md: テストは「あること」ではなく「Linux CI で走ること」).
+ *
+ * Claude Desktop has exactly one configuration file, in the user's profile;
+ * there is no project-scoped variant. Honouring `--scope project` for it would
+ * write a file Claude Desktop never reads and report success either way.
+ */
+export function redTeamInstallBase({ agent, scope, home, cwd }) {
+  if (agent === "claude-desktop") return home;
+  return scope === "user" ? home : cwd;
+}
+
+/**
+ * Reject an `--agent` this CLI does not know, for whichever subcommand asked.
+ *
+ * Shared by install and uninstall on purpose. When only install validated,
+ * `red-team uninstall --agent <typo>` did not fail — it fell through to the
+ * default branch and removed the **Claude Code** registration, reporting
+ * success. A typo silently doing the wrong removal is worse than the same typo
+ * on install, because there is nothing left on screen to say what happened.
+ */
+function requireSupportedAgent(subcommand, agent) {
+  if (RED_TEAM_AGENTS.has(agent)) return;
+  console.error(
+    `red-team ${subcommand}: unsupported agent '${agent}' ` +
+    `(expected ${[...RED_TEAM_AGENTS].join(" | ")})`,
+  );
+  process.exit(1);
+}
+
 async function cmdRedTeamInstall(opts) {
   const agent = opts.agent || "claude";
-  if (agent !== "claude") {
-    console.error(`red-team install: unsupported agent '${agent}' (only 'claude' is supported)`);
-    process.exit(1);
-  }
+  requireSupportedAgent("install", agent);
 
   const home = resolveCallerHome();
   const scope = opts.scope || "user";
@@ -576,12 +616,22 @@ async function cmdRedTeamInstall(opts) {
       accessKey: opts.key,
       env,
       scope,
-      home: scope === "user" ? home : process.cwd(),
+      home: redTeamInstallBase({ agent, scope, home, cwd: process.cwd() }),
       dryRun: opts.dryRun,
+      force: opts.force,
+      product: opts.product || "network-scanner",
+      agent,
     });
     if (res.installed) {
       console.log("");
-      console.log("Next: restart Claude Code so the MCP server is picked up.");
+      // Claude Desktop keeps running with the configuration it read at launch,
+      // and closing the window does not end the process — so "restart" has to
+      // say *quit*, or the user sees no new tools and concludes it failed.
+      console.log(
+        agent === "claude-desktop"
+          ? "Next: quit Claude Desktop completely (Cmd+Q on macOS / quit from the notification area on Windows) and start it again."
+          : "Next: restart Claude Code so the MCP server is picked up.",
+      );
     }
   } catch (e) {
     // 403 red_team_requires_10_seats は「Pro/Trial かつ契約シート 10 以上」の
@@ -593,14 +643,24 @@ async function cmdRedTeamInstall(opts) {
 }
 
 async function cmdRedTeamUninstall(opts) {
+  const agent = opts.agent || "claude";
+  requireSupportedAgent("uninstall", agent);
+
   const home = resolveCallerHome();
   const scope = opts.scope || "user";
   const { uninstallRedTeam } = await import("./red-team.mjs");
-  await uninstallRedTeam({
-    scope,
-    home: scope === "user" ? home : process.cwd(),
-    dryRun: opts.dryRun,
-  });
+  try {
+    await uninstallRedTeam({
+      scope,
+      home: redTeamInstallBase({ agent, scope, home, cwd: process.cwd() }),
+      dryRun: opts.dryRun,
+      product: opts.product || "network-scanner",
+      agent,
+    });
+  } catch (e) {
+    console.error(`red-team uninstall failed: ${e.message}`);
+    process.exit(1);
+  }
 }
 
 function rejectRemovedFlags(argv) {
@@ -658,17 +718,21 @@ export async function run(argv) {
   redTeam
     .command("install")
     .description("Download the scanner and register it as an MCP server")
-    .option("--agent <name>", "target agent (only 'claude' is supported)", "claude")
+    .option("--agent <name>", "target: claude (Claude Code) | claude-desktop (Claude Desktop)", "claude")
     .requiredOption("--key <ak_xxx>", "access key (ak_<43-char>)")
     .option("--env <env>", "target environment: dev|prod (default: auto-detected from package name)")
+    .option("--product <name>", "red team product: network-scanner|web-scanner|playwright", "network-scanner")
     .option("--scope <project|user>", "installation scope: user ($HOME) or project (cwd)", "user")
     .option("--no-verify", "skip /verify call")
+    .option("--force", "replace an existing MCP server registration of the same name", false)
     .option("--dry-run", "print planned actions, do not touch disk", false)
     .action(cmdRedTeamInstall);
 
   redTeam
     .command("uninstall")
     .description("Remove the MCP server registration and the downloaded scanner")
+    .option("--agent <name>", "target: claude (Claude Code) | claude-desktop (Claude Desktop)", "claude")
+    .option("--product <name>", "red team product: network-scanner|web-scanner|playwright", "network-scanner")
     .option("--scope <project|user>", "scope: user ($HOME) or project (cwd)", "user")
     .option("--dry-run", "print what would be removed without touching disk", false)
     .action(cmdRedTeamUninstall);

package/src/red-team.mjs

@@ -21,22 +21,84 @@ import { downloadBase } from "./verify.mjs";
 
 const execFileP = promisify(execFile);
 
-/** MCP サーバー名。`claude mcp remove network-scanner` で消せる。 */
-export const MCP_SERVER_NAME = "network-scanner";
+// Playwright MCP の固定バージョン。顧客端末で `npx` が解決する = 実質そこが
+// 依存ツリーの決定者なので、`@latest` ではなくピン留めする (公開直後の版を顧客
+// 端末に降ろさない = 7 日ルールの趣旨。docs/scanner/SUPPLY_CHAIN.md)。
+// 更新時は公開から 7 日以上経った stable を選ぶこと。
+export const PLAYWRIGHT_MCP_VERSION = "0.0.78";
+
+// RedTeam プロダクト。`kind` が配布方式を決める:
+//   binary — 我々がビルドして S3 で配る Rust バイナリ (ゲート付き)。
+//   npx    — 上流の公開 npm パッケージをそのまま登録する (再配布しない)。
+// network スキャナと web スキャナが別々なのは MCPB が 1 バンドル=1 サーバーで
+// 同居できないため。`product` 省略時は network-scanner なので既存呼び出しは不変。
+export const RED_TEAM_PRODUCTS = {
+  "network-scanner": {
+    kind: "binary",
+    mcpServerName: "network-scanner",
+    binName: "network-scanner",
+  },
+  "web-scanner": {
+    kind: "binary",
+    mcpServerName: "web-scanner",
+    binName: "web-scanner",
+  },
+  // web-scanner の相棒。エージェントがブラウザを操作できるようになるので、
+  // ログインが要る画面や SPA を診断できる (web-scanner 自身は HTTP と
+  // ヘッドレス DOM までで、ログイン操作の手段を持たない)。
+  // Apache-2.0 の公開パッケージなので再配布せず npx で直接叩く =
+  // 実行時のアクセスキーゲートは無い (掛けても意味がないため)。
+  // `--browser chrome` は端末にインストール済みの Chrome を使う指定
+  // (chromium を DL しない / 企業 CA・プロキシ設定をそのまま使える)。
+  playwright: {
+    kind: "npx",
+    mcpServerName: "playwright",
+    npmSpec: `@playwright/mcp@${PLAYWRIGHT_MCP_VERSION}`,
+    serverArgs: ["--browser", "chrome", "--ignore-https-errors"],
+  },
+};
+export const DEFAULT_RED_TEAM_PRODUCT = "network-scanner";
+
+/** 後方互換: network-scanner の MCP サーバー名。 */
+export const MCP_SERVER_NAME = RED_TEAM_PRODUCTS[DEFAULT_RED_TEAM_PRODUCT].mcpServerName;
+
+/** product 名 → メタ。未知なら throw (呼び出し側でメッセージ表示)。 */
+function productMeta(product) {
+  const meta = RED_TEAM_PRODUCTS[product];
+  if (!meta) {
+    throw new Error(
+      `unknown red-team product '${product}' (expected ${Object.keys(RED_TEAM_PRODUCTS).join(" | ")})`,
+    );
+  }
+  return meta;
+}
+
+/** OS に応じた実ファイル名 (Windows は .exe)。 */
+function binFileName(meta) {
+  return process.platform === "win32" ? `${meta.binName}.exe` : meta.binName;
+}
 
 /**
  * Red Team の生バイナリを取得する。
  *
- * verify Lambda の `GET /download/red-team/<platform>` はアクセスキー認証に
- * 加えて Red Team エンタイトルメント (pro/trial かつ契約シート >= 10) を要求し、
- * 不適格なら 403 を返す。fetchAsset は非 2xx で throw するため、ここでは
- * 特別扱いせず呼び出し側にメッセージを見せる。
+ * verify Lambda の `GET /download/red-team/[<product>/]<platform>` はアクセス
+ * キー認証に加えて Red Team エンタイトルメント (pro/trial かつ契約シート >= 10)
+ * を要求し、不適格なら 403 を返す。fetchAsset は非 2xx で throw するため、
+ * ここでは特別扱いせず呼び出し側にメッセージを見せる。
+ *
+ * network-scanner は従来どおり 1 セグメント (`/red-team/<platform>`) を使う
+ * (配信済みルートとバイト等価)。他 product は `/red-team/<product>/<platform>`。
  */
-export async function fetchRedTeamBinary(destPath, { env = "prod", accessKey } = {}) {
+export async function fetchRedTeamBinary(
+  destPath,
+  { env = "prod", accessKey, product = DEFAULT_RED_TEAM_PRODUCT } = {},
+) {
+  productMeta(product); // validate early
   const platform = detectPlatform();
-  const binUrl = `${downloadBase(env)}/red-team/${platform}`;
+  const rel = product === DEFAULT_RED_TEAM_PRODUCT ? platform : `${product}/${platform}`;
+  const binUrl = `${downloadBase(env)}/red-team/${rel}`;
   const result = await fetchAsset(binUrl, destPath, { accessKey });
-  return { ...result, platform };
+  return { ...result, platform, product };
 }
 
 /**
@@ -52,6 +114,21 @@ function claudeScopeFor(scope) {
   return scope === "user" ? "user" : "local";
 }
 
+/**
+ * 同名の MCP サーバーが既に登録されているか (スコープ問わず)。
+ *
+ * `claude mcp get <name>` は見つからなければ非ゼロで終わる。登録済みなら
+ * 表示テキストをそのまま返して、呼び出し側が「何が登録済みか」を人間に見せる。
+ */
+async function mcpServerExists(name) {
+  try {
+    const { stdout } = await execFileP("claude", ["mcp", "get", name]);
+    return { exists: true, detail: (stdout || "").trim() };
+  } catch {
+    return { exists: false, detail: "" };
+  }
+}
+
 /** `claude` CLI が PATH にあるか。 */
 async function claudeCliAvailable() {
   try {
@@ -66,11 +143,11 @@ async function claudeCliAvailable() {
  * 手作業に落とす場合のコマンドを組み立てる（`claude` が PATH に無いとき、
  * および --dry-run のときに表示する）。
  */
-export function buildMcpAddArgs(binPath, accessKey, scope) {
+export function buildMcpAddArgs(binPath, accessKey, scope, mcpServerName = MCP_SERVER_NAME) {
   return [
     "mcp",
     "add",
-    MCP_SERVER_NAME,
+    mcpServerName,
     "-s",
     claudeScopeFor(scope),
     "-e",
@@ -80,6 +157,27 @@ export function buildMcpAddArgs(binPath, accessKey, scope) {
   ];
 }
 
+/**
+ * `kind: "npx"` の product を登録する引数を組み立てる。
+ *
+ * 我々のバイナリではなく上流の公開パッケージを起動するだけなので、アクセス
+ * キーは渡さない (受け取らないし、実行時ゲートも無い)。
+ */
+export function buildNpxMcpAddArgs(meta, scope) {
+  return [
+    "mcp",
+    "add",
+    meta.mcpServerName,
+    "-s",
+    claudeScopeFor(scope),
+    "--",
+    "npx",
+    "-y",
+    meta.npmSpec,
+    ...meta.serverArgs,
+  ];
+}
+
 /**
  * Red Team バイナリを取得し、Claude Code に MCP サーバーとして登録する。
  *
@@ -92,29 +190,103 @@ export async function installRedTeam({
   scope = "user",
   home,
   dryRun = false,
+  force = false,
+  product = DEFAULT_RED_TEAM_PRODUCT,
+  // どちらの Claude に入れるか。`claude` = Claude Code (`claude mcp add`)、
+  // `claude-desktop` = Claude Desktop (設定ファイルへのマージ)。後者は
+  // `kind: "npx"` の product 専用 — バイナリ product は `.mcpb` という
+  // 専用の経路を既に持っており、そちらはアクセスキーの刻印も伴うため。
+  agent = "claude",
   stdout = console.log,
   stderr = console.error,
+  serverExists = mcpServerExists,
+  // `claude` の実在判定も注入できるようにする。ここが注入できないと、テストは
+  // 「実行マシンに claude が入っているか」に暗黙依存する — 実際 #754 のガード
+  // テストは開発機では緑・CI (claude 不在) では赤になり、その差が PR では
+  // 見えなかった (aidr スイートは main push でしか走っていなかった)。
+  claudeAvailable = claudeCliAvailable,
 }) {
+  const meta = productMeta(product);
+
+  // Claude Desktop はコマンドを受け付けないので、設定ファイルへ直接マージする。
+  // バイナリ product をここへ流さないのは意図的 — `.mcpb` がその経路であり、
+  // バンドルにはアクセスキーが刻印される。設定ファイルに同じことをすると
+  // 平文の鍵をユーザーの config に置くことになる。
+  if (agent === "claude-desktop") {
+    if (meta.kind !== "npx") {
+      throw new Error(
+        `--agent claude-desktop does not install '${product}'. ` +
+        "Download its .mcpb bundle from the portal and double-click it instead.",
+      );
+    }
+    const { installDesktopCompanion } = await import("./claude-desktop.mjs");
+    const res = await installDesktopCompanion({ meta, home, dryRun, force, stdout, stderr });
+    return { installed: res.installed, registered: res.installed, path: res.path };
+  }
+
+  // kind: "npx" — 我々は何も配らない。上流の公開パッケージを `claude mcp add`
+  // で登録するだけなので、ダウンロードも sha256 検証もアクセスキーも無い。
+  if (meta.kind === "npx") {
+    const npxArgs = buildNpxMcpAddArgs(meta, scope);
+    if (dryRun) {
+      stdout(`[dry-run] would register ${product} via npx (no download)`);
+      stdout(`[dry-run] would run: claude ${npxArgs.join(" ")}`);
+      return { installed: false, dryRun: true, registered: false };
+    }
+    if (!(await claudeAvailable())) {
+      stderr("`claude` CLI not found on PATH — nothing was registered.");
+      stderr("Run this once Claude Code is available:");
+      stderr(`  claude ${npxArgs.join(" ")}`);
+      return { installed: false, registered: false };
+    }
+
+    // 上流パッケージのサーバー名 (`playwright` 等) は汎用的で、顧客が自分で
+    // 登録済みのことがある。install は同スコープで remove → add するため、
+    // 黙って進めると顧客自身の設定 (別バージョン・別フラグ・別プロファイル) を
+    // 上書きしてしまう。我々が所有していない名前は勝手に奪わない。
+    // 上書きしたいときだけ --force。
+    if (!force) {
+      const { exists, detail } = await serverExists(meta.mcpServerName);
+      if (exists) {
+        stderr(`'${meta.mcpServerName}' is already registered — leaving it as is.`);
+        if (detail) stderr(detail);
+        stderr(`Re-run with --force to replace it with: npx -y ${meta.npmSpec} ${meta.serverArgs.join(" ")}`);
+        return { installed: false, registered: false, skipped: true };
+      }
+    }
+    // 再実行を許すため、既存エントリがあれば先に外す。未登録なら失敗するので無視。
+    try {
+      await execFileP("claude", ["mcp", "remove", meta.mcpServerName, "-s", claudeScopeFor(scope)]);
+    } catch {
+      // not registered yet — expected on first install
+    }
+    await execFileP("claude", npxArgs);
+    stdout(`mcp: registered '${meta.mcpServerName}' (scope=${claudeScopeFor(scope)}, via npx)`);
+    return { installed: true, registered: true };
+  }
+
   // 既存の install と同じ配置規約: <base>/.claude/bin/ に置く。
   const binDir = path.join(home, ".claude", "bin");
-  const binName = process.platform === "win32" ? "network-scanner.exe" : "network-scanner";
+  const binName = binFileName(meta);
   const binPath = path.join(binDir, binName);
 
   if (dryRun) {
-    stdout(`[dry-run] would download red-team binary -> ${binPath}`);
-    stdout(`[dry-run] would run: claude ${buildMcpAddArgs(binPath, "<key>", scope).join(" ")}`);
+    stdout(`[dry-run] would download red-team binary (${product}) -> ${binPath}`);
+    stdout(
+      `[dry-run] would run: claude ${buildMcpAddArgs(binPath, "<key>", scope, meta.mcpServerName).join(" ")}`,
+    );
     return { installed: false, dryRun: true, path: binPath };
   }
 
   await fs.mkdir(binDir, { recursive: true });
-  const res = await fetchRedTeamBinary(binPath, { env, accessKey });
+  const res = await fetchRedTeamBinary(binPath, { env, accessKey, product });
   stdout(
     `binary: ${res.path} (${res.platform}${res.verified ? ", sha256 verified" : ""})`,
   );
 
-  const args = buildMcpAddArgs(binPath, accessKey, scope);
+  const args = buildMcpAddArgs(binPath, accessKey, scope, meta.mcpServerName);
 
-  if (!(await claudeCliAvailable())) {
+  if (!(await claudeAvailable())) {
     stderr("`claude` CLI not found on PATH — the binary is installed but not registered.");
     stderr("Run this once Claude Code is available:");
     stderr(`  claude ${args.join(" ")}`);
@@ -123,13 +295,13 @@ export async function installRedTeam({
 
   // 再実行を許すため、既存エントリがあれば先に外す。未登録なら失敗するので無視。
   try {
-    await execFileP("claude", ["mcp", "remove", MCP_SERVER_NAME, "-s", claudeScopeFor(scope)]);
+    await execFileP("claude", ["mcp", "remove", meta.mcpServerName, "-s", claudeScopeFor(scope)]);
   } catch {
     // not registered yet — expected on first install
   }
 
   await execFileP("claude", args);
-  stdout(`mcp: registered '${MCP_SERVER_NAME}' (scope=${claudeScopeFor(scope)})`);
+  stdout(`mcp: registered '${meta.mcpServerName}' (scope=${claudeScopeFor(scope)})`);
 
   return { installed: true, registered: true, path: binPath };
 }
@@ -139,30 +311,51 @@ export async function uninstallRedTeam({
   scope = "user",
   home,
   dryRun = false,
+  product = DEFAULT_RED_TEAM_PRODUCT,
+  agent = "claude",
   stdout = console.log,
+  claudeAvailable = claudeCliAvailable,
 }) {
-  const binPath = path.join(
-    home,
-    ".claude",
-    "bin",
-    process.platform === "win32" ? "network-scanner.exe" : "network-scanner",
-  );
+  const meta = productMeta(product);
+
+  if (agent === "claude-desktop") {
+    // install と同じ範囲でしか外せない。ここに guard が無いと、`--product` を
+    // 省いた既定 (`network-scanner` = `.mcpb` product) がこの分岐へ流れ、
+    // `claude_desktop_config.json` に一度も書かれていないものを探して
+    // `{removed:false}` を**何も出力せず** exit 0 で返していた。利用者からは
+    // 「消えたのか、そもそも入っていなかったのか」が区別できない。
+    if (meta.kind !== "npx") {
+      throw new Error(
+        `--agent claude-desktop does not manage '${product}'. ` +
+        "It is a .mcpb bundle: remove it from Claude Desktop's extension list instead.",
+      );
+    }
+    const { uninstallDesktopCompanion } = await import("./claude-desktop.mjs");
+    return uninstallDesktopCompanion({ meta, home, dryRun, stdout });
+  }
+  // kind: "npx" は我々がディスクに置いたものが無いので、消すのは MCP 登録だけ。
+  const binPath =
+    meta.kind === "npx" ? null : path.join(home, ".claude", "bin", binFileName(meta));
 
   if (dryRun) {
-    stdout(`[dry-run] would run: claude mcp remove ${MCP_SERVER_NAME} -s ${claudeScopeFor(scope)}`);
-    stdout(`[dry-run] would remove ${binPath}`);
+    stdout(`[dry-run] would run: claude mcp remove ${meta.mcpServerName} -s ${claudeScopeFor(scope)}`);
+    if (binPath) stdout(`[dry-run] would remove ${binPath}`);
     return { removed: false, dryRun: true };
   }
 
-  if (await claudeCliAvailable()) {
+  if (await claudeAvailable()) {
     try {
-      await execFileP("claude", ["mcp", "remove", MCP_SERVER_NAME, "-s", claudeScopeFor(scope)]);
-      stdout(`mcp: removed '${MCP_SERVER_NAME}'`);
+      await execFileP("claude", ["mcp", "remove", meta.mcpServerName, "-s", claudeScopeFor(scope)]);
+      stdout(`mcp: removed '${meta.mcpServerName}'`);
     } catch {
       // already absent
     }
   }
 
+  if (!binPath) {
+    return { removed: true };
+  }
+
   await fs.rm(binPath, { force: true });
   stdout(`removed ${binPath}`);
   return { removed: true };