@coworker-jp/aidr 0.1.11 → 0.1.75

package/src/sentinel.mjs

@@ -1,27 +1,34 @@
 /**
- * coworker-sentinel install/uninstall helpers.
+ * LEGACY coworker-sentinel cleanup helpers.
  *
- * Requires root (sudo -E) because the daemon runs as a LaunchDaemon (macOS)
- * or systemd service (Linux) to monitor OS-level events system-wide.
+ * aidr no longer installs coworker-sentinel (the `--with-sentinel` flag is
+ * retired). Sentinel now ships via OS-native installers:
+ *   Windows: coworker-sentinel-setup.exe (Inno Setup, own uninstaller)
+ *   macOS:   CoworkerSentinel.dmg (the app self-installs/uninstalls)
+ *   Linux:   coworker-sentinel.deb (dpkg postrm owns the cleanup;
+ *            unit lives at /lib/systemd/system/coworker-sentinel.service)
  *
- * Install paths (shared with scheduled.mjs):
- *   Binary:  /opt/coworker/aidr/bin/coworker-sentinel
- *   macOS:   /Library/LaunchDaemons/jp.coworker.sentinel.plist
- *   Linux:   /etc/systemd/system/coworker-sentinel.service
- *   Env:     /etc/aidr/aidr.env  (shared with scheduler)
+ * What remains here is uninstall-only: `aidr uninstall` sweeps the artifacts
+ * an old npx-era `aidr install --with-sentinel` wrote on Linux —
+ *   /etc/systemd/system/coworker-sentinel.service
+ *   /opt/coworker/aidr/bin/coworker-sentinel (+ ai-scanner)
+ *   /etc/aidr/sentinel-settings.json, /etc/aidr/aidr.env
+ *   /var/log/coworker/sentinel.log (+ logrotate config)
+ *
+ * It must NEVER touch a deb-owned install: the deb's systemd unit is under
+ * /lib/systemd/system (not /etc/systemd/system), and when a deb install is
+ * present the shared files under /etc/aidr and the OS-trusted root CA are
+ * left alone (the deb daemon keeps using them; dpkg purge removes them).
  */
 import fs from "node:fs/promises";
 import path from "node:path";
 import { execFile, spawnSync } from "node:child_process";
-import { resolveInvokerUser } from "./invoker-resolve.mjs";
 import { promisify } from "node:util";
-import { fetchSentinel, detectPlatform } from "./binary-fetcher.mjs";
 import {
   SYSTEM_BIN_DIR,
+  SYSTEM_BIN,
   SYSTEM_ENV_FILE,
   SENTINEL_LOG_FILE,
-  ensureSystemLogDir,
-  writeLogrotateConfig,
   removeSystemLog,
 } from "./scheduled.mjs";
 
@@ -29,13 +36,30 @@ const execFileP = promisify(execFile);
 
 const ROOT_PREFIX = process.env.AIDR_SCHEDULED_ROOT || "";
 
+// Legacy npx-era binary location (never used by the deb / setup.exe / DMG).
 export const SENTINEL_BIN = path.join(
   SYSTEM_BIN_DIR,
   process.platform === "win32" ? "coworker-sentinel.exe" : "coworker-sentinel",
 );
+// Daemon-owned settings file (endpoint-info collection toggle etc.). Shared
+// between the legacy npx daemon and a deb-installed daemon — only removed
+// when no deb install is present.
+export const SENTINEL_SETTINGS_FILE = path.join(
+  path.dirname(SYSTEM_ENV_FILE),
+  "sentinel-settings.json",
+);
 export const SENTINEL_PLIST = ROOT_PREFIX + "/Library/LaunchDaemons/jp.coworker.sentinel.plist";
+// Legacy npx-written unit. The deb ships its unit at DEB_SENTINEL_SERVICE —
+// the two paths are how we tell the layouts apart.
 export const SENTINEL_SERVICE = ROOT_PREFIX + "/etc/systemd/system/coworker-sentinel.service";
-export const SENTINEL_WIN_SERVICE = "CoworkerSentinel";
+export const DEB_SENTINEL_SERVICE = ROOT_PREFIX + "/lib/systemd/system/coworker-sentinel.service";
+
+export const MACOS_DMG_HINT =
+  "[sentinel] macOS の coworker-sentinel は DMG (CoworkerSentinel.app) から導入します。\n" +
+  "[sentinel] ユーザーポータルの Download ページ、または GET /download/setup/macos から\n" +
+  "[sentinel] CoworkerSentinel.dmg をダウンロードし、Applications にドラッグ → 起動 →\n" +
+  "[sentinel] アクセスキーを入力 → 管理者パスワードを入力してください。npx 経由の\n" +
+  "[sentinel] インストール/アンインストールは macOS では行われません。";
 
 function isRoot() {
   if (process.env.AI_SCANNER_FAKE_ROOT === "1") return true;
@@ -54,270 +78,109 @@ async function exists(p) {
   try { await fs.access(p); return true; } catch { return false; }
 }
 
+/**
+ * True only for the LEGACY npx-installed layout that aidr itself once wrote
+ * (Linux systemd unit under /etc/systemd/system). A deb install (unit under
+ * /lib/systemd/system) must NOT match — its cleanup belongs to dpkg postrm.
+ * macOS (DMG-owned) and Windows (setup.exe-owned, and indistinguishable from
+ * the npx-era layout — same %ProgramFiles%\coworker\aidr\bin + service name)
+ * always report false: aidr never uninstalls sentinel there.
+ */
 export async function isSentinelInstalled() {
-  if (process.platform === "win32") {
-    try {
-      return spawnSync("sc", ["query", SENTINEL_WIN_SERVICE], { stdio: "ignore" }).status === 0;
-    } catch {
-      return false;
-    }
-  }
-  return (
-    (await exists(SENTINEL_PLIST)) ||
-    (await exists(SENTINEL_SERVICE))
-  );
-}
-
-function buildLaunchdPlist(envFile) {
-  return `<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN"
-  "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-  <key>Label</key>
-  <string>jp.coworker.sentinel</string>
-  <key>ProgramArguments</key>
-  <array>
-    <string>/bin/sh</string>
-    <string>-c</string>
-    <string>set -a; . ${envFile}; set +a; exec ${SENTINEL_BIN}</string>
-  </array>
-  <key>RunAtLoad</key>
-  <true/>
-  <key>KeepAlive</key>
-  <true/>
-  <key>StandardOutPath</key>
-  <string>${SENTINEL_LOG_FILE}</string>
-  <key>StandardErrorPath</key>
-  <string>${SENTINEL_LOG_FILE}</string>
-  <key>ThrottleInterval</key>
-  <integer>10</integer>
-</dict>
-</plist>
-`;
-}
-
-function buildSystemdService(envFile) {
-  return `[Unit]
-Description=coworker-sentinel Host EDR Daemon
-After=network.target
-StartLimitIntervalSec=60
-StartLimitBurst=5
-
-[Service]
-Type=simple
-EnvironmentFile=${envFile}
-ExecStart=${SENTINEL_BIN}
-Restart=on-failure
-RestartSec=5
-StandardOutput=append:${SENTINEL_LOG_FILE}
-StandardError=append:${SENTINEL_LOG_FILE}
-SyslogIdentifier=coworker-sentinel
-
-[Install]
-WantedBy=multi-user.target
-`;
+  if (process.platform === "darwin" || process.platform === "win32") return false;
+  return exists(SENTINEL_SERVICE);
 }
 
 /**
- * Install the sentinel daemon.
+ * Remove a LEGACY npx-installed sentinel daemon (Linux only).
  *
- * opts:
- *   accessKey    — ak_xxx  (written to env file if not already present)
- *   dryRun       — log actions without executing
- *   noActivate   — skip launchctl/systemctl activation
- *   presignedUrl — presigned S3 URL from verify response (optional)
- *   env          — "dev" | "prod"
+ * Deb coexistence rules:
+ *   - the deb unit (/lib/systemd/system) and deb-owned files are never touched;
+ *   - when a deb install is present, the shared /etc/aidr files, the system
+ *     ai-scanner copy, the root CA, and the log file are all preserved
+ *     (the deb daemon still uses them) — only the stale legacy unit and the
+ *     legacy /opt binary are swept;
+ *   - `systemctl disable --now` is only issued when no deb unit exists, so a
+ *     running deb service is never stopped.
  */
-export async function installSentinel(opts = {}) {
-  const { accessKey, dryRun = false, skipBinary = false, noActivate = false, presignedUrl, dllPresignedUrl, env = "prod" } = opts;
-
-  if (!isRoot()) {
-    throw new Error(
-      process.platform === "win32"
-        ? "installSentinel requires an elevated (Administrator) shell.\n" +
-          "Re-run from an Administrator PowerShell/cmd: npx @coworker-jp/aidr install --key <key> --with-sentinel"
-        : "installSentinel requires root privileges.\n" +
-          "Re-run with: sudo -E npx @coworker-jp/aidr install --key <key> --with-sentinel",
+export async function uninstallSentinel({ dryRun = false } = {}) {
+  // macOS: DMG-based. Uninstall is done from the CoworkerSentinel.app's
+  // Uninstall button (which unloads the daemon, runs uninstall-ca, and
+  // deactivates the system extension behind one admin prompt). No-op + hint.
+  if (process.platform === "darwin") {
+    console.error(MACOS_DMG_HINT);
+    console.error(
+      "[sentinel] アンインストールは CoworkerSentinel.app の「Uninstall」ボタンから行ってください。",
     );
+    return;
   }
 
-  const platform = detectPlatform();
-  console.error(`[sentinel] Installing coworker-sentinel for ${platform}…`);
-
-  // 1. Download binary
-  if (!dryRun && !skipBinary) {
-    await fs.mkdir(SYSTEM_BIN_DIR, { recursive: true });
-    console.error(`[sentinel] Downloading binary → ${SENTINEL_BIN}`);
-    await fetchSentinel(SENTINEL_BIN, { accessKey, presignedUrl, dllPresignedUrl, env });
-  } else if (skipBinary) {
-    console.error(`[sentinel] Skipping binary download (--skip-binary)`);
-  } else {
-    console.error(`[sentinel] DRY-RUN: would download → ${SENTINEL_BIN}`);
-  }
-
-  // 2. Create the world-readable log dir + touch sentinel.log + drop the
-  //    shared logrotate config (covering both daemons; idempotent).
-  await ensureSystemLogDir(SENTINEL_LOG_FILE, { dryRun });
-  await writeLogrotateConfig({ dryRun });
-
-  // 3. Write env file (append AI_SCANNER_ACCESS_KEY + AI_SCANNER_INVOKER_USER
-  //    if missing). When --with-sentinel runs alongside --scheduled,
-  //    scheduled.mjs's writeEnvFile has already written both lines and
-  //    we no-op. When --with-sentinel runs standalone (no --scheduled),
-  //    we are the only writer of aidr.env and must capture SUDO_USER
-  //    ourselves; otherwise the daemon (running as root with no useful
-  //    git/Apple/USER) reports `unknown`. Identity resolution itself
-  //    (Apple ID / git email / username) happens at scan time inside
-  //    the Rust binary using `sudo -u <invoker>`.
-  if (accessKey && !dryRun) {
-    let content = "";
-    try { content = await fs.readFile(SYSTEM_ENV_FILE, "utf8"); } catch { /* first run */ }
-    let appended = "";
-    if (!content.includes("AI_SCANNER_ACCESS_KEY")) {
-      appended += `\nAI_SCANNER_ACCESS_KEY=${accessKey}\n`;
-    }
-    if (!content.includes("AI_SCANNER_INVOKER_USER")) {
-      const invoker = resolveInvokerUser();
-      if (invoker) {
-        appended += `AI_SCANNER_INVOKER_USER=${invoker}\n`;
-      }
-    }
-    if (appended) {
-      await fs.mkdir(path.dirname(SYSTEM_ENV_FILE), { recursive: true });
-      await fs.appendFile(SYSTEM_ENV_FILE, appended);
-      await fs.chmod(SYSTEM_ENV_FILE, 0o600);
-    }
-  }
-
-  // 4. Write service/plist (or register the Windows service)
+  // Windows: setup.exe-based. Its uninstaller (Add/Remove Programs) runs
+  // uninstall-service + uninstall-ca itself; the npx-era layout is identical
+  // (same bin dir + service name), so touching it here would corrupt a
+  // setup.exe install. No-op + hint.
   if (process.platform === "win32") {
-    await _installWindows(dryRun, noActivate);
-  } else if (process.platform === "darwin") {
-    await _installMacos(dryRun, noActivate);
-  } else {
-    await _installLinux(dryRun, noActivate);
-  }
-
-  console.error("[sentinel] Installation complete.");
-}
-
-async function _installWindows(dryRun, noActivate) {
-  if (dryRun) {
-    console.error(`[sentinel] DRY-RUN: would run \`${SENTINEL_BIN} install-ca\` + install-service`);
+    console.error(
+      "[sentinel] Windows の coworker-sentinel は setup.exe で管理されます。\n" +
+      "[sentinel] アンインストールは「設定 > アプリ」(Add/Remove Programs) から行ってください。",
+    );
     return;
   }
-  // The service (LocalSystem) reads AI_SCANNER_ACCESS_KEY etc. from
-  // %ProgramData%\coworker\aidr.env, written by installSentinel step 3.
-  // install-ca adds the DLP root to the OS trust store; install-service
-  // registers the auto-start service and starts it immediately.
-  await execFileP(SENTINEL_BIN, ["install-ca"]);
-  console.error("[sentinel] Root CA installed into the Windows trust store");
-  if (!noActivate && process.env.AI_SCANNER_NO_SCHEDULED_ACTIVATE !== "1") {
-    await execFileP(SENTINEL_BIN, ["install-service"]);
-    console.error(`[sentinel] Service registered and started (${SENTINEL_WIN_SERVICE})`);
-  } else {
-    console.error("[sentinel] --no-activate: skipping service registration");
-  }
-}
 
-async function _uninstallWindows(dryRun) {
-  if (dryRun) {
-    console.error("[sentinel] DRY-RUN: would run uninstall-service + uninstall-ca");
-    return;
-  }
-  // Order mirrors the CLI dispatch: stop/remove the service (so the exe isn't
-  // in use), then drop the MITM root CA so no dangling trust anchor remains.
-  try {
-    await execFileP(SENTINEL_BIN, ["uninstall-service"]);
-  } catch (e) {
-    console.warn("[sentinel] uninstall-service:", e.message);
-  }
-  try {
-    await execFileP(SENTINEL_BIN, ["uninstall-ca"]);
-  } catch (e) {
-    console.warn("[sentinel] uninstall-ca:", e.message);
+  if (!isRoot()) {
+    throw new Error("uninstallSentinel requires root privileges.");
   }
-}
 
-async function _installMacos(dryRun, noActivate) {
-  const plistContent = buildLaunchdPlist(SYSTEM_ENV_FILE);
-  if (!dryRun) {
-    await fs.mkdir(path.dirname(SENTINEL_PLIST), { recursive: true });
-    await fs.writeFile(SENTINEL_PLIST, plistContent, { mode: 0o644 });
-    console.error(`[sentinel] Written: ${SENTINEL_PLIST}`);
+  console.error("[sentinel] Removing legacy npx-installed coworker-sentinel…");
 
-    if (!noActivate && process.env.AI_SCANNER_NO_SCHEDULED_ACTIVATE !== "1") {
-      // Modern launchctl API (bootstrap/bootout). Mirrors scheduled.mjs so
-      // both daemons share one mental model. Idempotent: bootout-before-
-      // bootstrap absorbs prior loads regardless of which API installed them.
-      try { await execFileP("launchctl", ["bootout", "system", SENTINEL_PLIST]); } catch { /* not loaded */ }
-      try {
-        await execFileP("launchctl", ["bootstrap", "system", SENTINEL_PLIST]);
-        console.error("[sentinel] Daemon loaded via launchctl");
-      } catch (e) {
-        console.warn("[sentinel] launchctl bootstrap failed — daemon may need manual start:", e.message);
-      }
-    }
-  } else {
-    console.error(`[sentinel] DRY-RUN: would write ${SENTINEL_PLIST}`);
+  const debInstalled = await exists(DEB_SENTINEL_SERVICE);
+  if (debInstalled) {
+    console.error(
+      `[sentinel] deb install detected (${DEB_SENTINEL_SERVICE}) — removing only the stale legacy unit/binary; deb-owned files are untouched.`,
+    );
   }
-}
-
-async function _installLinux(dryRun, noActivate) {
-  const serviceContent = buildSystemdService(SYSTEM_ENV_FILE);
-  const serviceDir = path.dirname(SENTINEL_SERVICE);
-  if (!dryRun) {
-    await fs.mkdir(serviceDir, { recursive: true });
-    await fs.writeFile(SENTINEL_SERVICE, serviceContent, { mode: 0o644 });
-    console.error(`[sentinel] Written: ${SENTINEL_SERVICE}`);
 
-    if (!noActivate && process.env.AI_SCANNER_NO_SCHEDULED_ACTIVATE !== "1") {
+  if (await exists(SENTINEL_SERVICE)) {
+    if (!dryRun) {
+      // Only stop/disable when no deb unit exists: `disable --now` acts on
+      // the service name and would stop a running deb daemon.
+      if (!debInstalled) {
+        spawnSync("systemctl", ["disable", "--now", "coworker-sentinel"], { stdio: "ignore" });
+      }
+      await fs.unlink(SENTINEL_SERVICE);
       spawnSync("systemctl", ["daemon-reload"], { stdio: "ignore" });
-      spawnSync("systemctl", ["enable", "--now", "coworker-sentinel"], { stdio: "ignore" });
-      console.error("[sentinel] Enabled and started via systemctl");
+      console.error(`[sentinel] Removed: ${SENTINEL_SERVICE}`);
+    } else {
+      console.error(`[sentinel] DRY-RUN: would remove ${SENTINEL_SERVICE}`);
     }
-  } else {
-    console.error(`[sentinel] DRY-RUN: would write ${SENTINEL_SERVICE}`);
   }
-}
 
-/**
- * Uninstall the sentinel daemon.
- */
-export async function uninstallSentinel({ dryRun = false } = {}) {
-  if (!isRoot()) {
-    throw new Error("uninstallSentinel requires root privileges.");
-  }
-
-  console.error("[sentinel] Uninstalling coworker-sentinel…");
-
-  if (process.platform === "win32") {
-    await _uninstallWindows(dryRun);
-  } else if (process.platform === "darwin") {
-    if (await exists(SENTINEL_PLIST)) {
-      if (!dryRun) {
-        // Modern launchctl API; mirrors scheduled.mjs's uninstallScheduled.
-        try { await execFileP("launchctl", ["bootout", "system", SENTINEL_PLIST]); } catch { /* not loaded */ }
-        await fs.unlink(SENTINEL_PLIST);
-        console.error(`[sentinel] Removed: ${SENTINEL_PLIST}`);
-      } else {
-        console.error(`[sentinel] DRY-RUN: would remove ${SENTINEL_PLIST}`);
-      }
-    }
-  } else {
-    if (await exists(SENTINEL_SERVICE)) {
-      if (!dryRun) {
-        spawnSync("systemctl", ["disable", "--now", "coworker-sentinel"], { stdio: "ignore" });
-        await fs.unlink(SENTINEL_SERVICE);
-        spawnSync("systemctl", ["daemon-reload"], { stdio: "ignore" });
-        console.error(`[sentinel] Removed: ${SENTINEL_SERVICE}`);
-      } else {
-        console.error(`[sentinel] DRY-RUN: would remove ${SENTINEL_SERVICE}`);
+  // The legacy daemon auto-installed the DLP root CA into the OS trust store
+  // at startup, so uninstall must drop that trust anchor too — otherwise a
+  // MITM-capable root stays trusted after the daemon is gone. Must run
+  // BEFORE the binary is deleted (the binary is the uninstaller), and
+  // best-effort: a never-elevated install has no CA, and a pre-DLP binary
+  // doesn't know the subcommand and would start the daemon instead — the
+  // timeout kills that instead of hanging the uninstall. Skipped when a deb
+  // install is present: the deb daemon relies on that same trust anchor.
+  if (!debInstalled && (await exists(SENTINEL_BIN))) {
+    if (!dryRun) {
+      try {
+        await execFileP(SENTINEL_BIN, ["uninstall-ca"], {
+          timeout: 15_000,
+          killSignal: "SIGKILL",
+        });
+        console.error("[sentinel] Root CA removed from the OS trust store");
+      } catch (e) {
+        console.warn("[sentinel] uninstall-ca:", e.message);
       }
+    } else {
+      console.error(`[sentinel] DRY-RUN: would run \`${SENTINEL_BIN} uninstall-ca\``);
     }
   }
 
+  // The legacy binary itself is npx-owned — always removed (the deb installs
+  // its binary elsewhere).
   if (await exists(SENTINEL_BIN)) {
     if (!dryRun) {
       await fs.unlink(SENTINEL_BIN);
@@ -327,23 +190,37 @@ export async function uninstallSentinel({ dryRun = false } = {}) {
     }
   }
 
-  // Windows ships a sibling WinDivert.dll next to the exe — remove it too.
-  if (process.platform === "win32") {
-    const dll = path.join(path.dirname(SENTINEL_BIN), "WinDivert.dll");
-    if (await exists(dll)) {
-      if (!dryRun) {
-        await fs.unlink(dll);
-        console.error(`[sentinel] Removed: ${dll}`);
-      } else {
-        console.error(`[sentinel] DRY-RUN: would remove ${dll}`);
+  // Shared artifacts the legacy daemon owned: its settings file
+  // (sentinel-settings.json — endpoint-info collection toggle), the
+  // ai-scanner binary in SYSTEM_BIN_DIR that it either self-downloaded or
+  // that the old `aidr install --with-sentinel` placed for it, and the shared
+  // env file /etc/aidr/aidr.env (root-owned 0600 access key). With no daemon
+  // left, nothing consumes them — leaving the key behind is worse hygiene
+  // than re-entering it on reinstall. With a deb install present they are
+  // still live (the deb daemon reads them) and must be preserved; dpkg purge
+  // removes them when the deb goes. Best-effort removal.
+  if (!debInstalled) {
+    for (const f of [SENTINEL_SETTINGS_FILE, SYSTEM_BIN, SYSTEM_ENV_FILE]) {
+      if (await exists(f)) {
+        if (!dryRun) {
+          try {
+            await fs.unlink(f);
+            console.error(`[sentinel] Removed: ${f}`);
+          } catch (e) {
+            console.warn(`[sentinel] could not remove ${f}: ${e.message}`);
+          }
+        } else {
+          console.error(`[sentinel] DRY-RUN: would remove ${f}`);
+        }
       }
     }
-  }
 
-  // Drop the sentinel log file. removeSystemLog also rmdirs SYSTEM_LOG_DIR
-  // and deletes /etc/logrotate.d/coworker if scheduled.log is also gone
-  // (i.e. the other daemon is uninstalled).
-  await removeSystemLog(SENTINEL_LOG_FILE, { dryRun });
+    // Drop the sentinel log file. removeSystemLog also rmdirs SYSTEM_LOG_DIR
+    // and deletes /etc/logrotate.d/coworker if scheduled.log is also gone
+    // (i.e. the other legacy daemon is uninstalled). A deb daemon may still
+    // be appending to the log, so this too is deb-gated.
+    await removeSystemLog(SENTINEL_LOG_FILE, { dryRun });
+  }
 
-  console.error("[sentinel] Uninstall complete.");
+  console.error("[sentinel] Legacy cleanup complete.");
 }

package/src/templates.mjs

@@ -18,7 +18,7 @@ export function getStartScannerSh(downloadBase = "https://pytd2jd5p7.execute-api
   return `#!/bin/bash
 # SessionStart hook: Setup ai-scanner for the current platform
 # - Linux (x86_64 / aarch64): download native binary from S3
-# - macOS (arm64 / Apple Silicon): download native binary from S3 (ad-hoc signed)
+# - macOS (arm64 + x86_64): download the universal native binary from S3 (ad-hoc signed)
 # - Binary is unsigned by 3rd party dev cert — quarantine xattr is stripped after download
 # - Fail-open: never block Claude Code startup
 BIN="\${AI_SCANNER_BIN:-$HOME/.claude/bin/ai-scanner}"
@@ -84,11 +84,12 @@ case "$OS" in
         ;;
     Darwin)
         case "$ARCH" in
-            arm64) PLATFORM_SLUG="darwin-aarch64" ;;
-            x86_64)
-                echo "Warning: ai-scanner does not support Intel Mac (x86_64). Apple Silicon required." >&2
-                exit 0
-                ;;
+            # Both arches map to the SAME slug on purpose: the object under
+            # darwin-aarch64 is a universal (fat) Mach-O with an arm64 and an
+            # x86_64 slice, so one download serves Apple Silicon and Intel. The
+            # slug is a wire contract with the verify Lambda's SCANNER_PLATFORMS
+            # — only its contents became universal, never its name.
+            arm64|x86_64) PLATFORM_SLUG="darwin-aarch64" ;;
             *)
                 echo "Warning: Unsupported macOS architecture: $ARCH" >&2
                 exit 0

package/src/verify.mjs

@@ -38,14 +38,13 @@ export async function verifyKey(accessKey, env = "prod") {
   if (body.status !== "active") {
     throw new Error(`access key status is '${body.status || "unknown"}' (expected 'active')`);
   }
+  // The server may also return sentinel-related fields (edr_enabled,
+  // sentinel_download_urls, …) for the OS-native installers; aidr is
+  // hooks-only and ignores them (tolerant parsing — unknown fields are fine).
   return {
     status: body.status,
     plan: body.plan || "standard",
     expires_at: body.expires_at || null,
-    edr_enabled: body.edr_enabled || false,
-    latest_sentinel_version: body.latest_sentinel_version || null,
-    sentinel_download_urls: body.sentinel_download_urls || {},
-    sentinel_sha256: body.sentinel_sha256 || {},
   };
 }
 

package/src/browser-extension.mjs

@@ -1,83 +0,0 @@
-import { writeFileSync, mkdirSync, readFileSync, chmodSync } from "fs";
-import { join } from "path";
-
-// Extension ID will be determined after Chrome Web Store publication.
-// For now use a placeholder that operators can override via AIDR_EXTENSION_ID env var.
-const DEFAULT_EXTENSION_ID = "AIDR_EXTENSION_ID_PLACEHOLDER";
-
-export async function installBrowserExtension(homeDir, binaryPath) {
-  const extensionId = process.env.AIDR_EXTENSION_ID || DEFAULT_EXTENSION_ID;
-  const platform = process.platform;
-
-  // 1. Write Native Messaging Host manifests for Chrome/Edge/Brave/Chromium
-
-  // Generate a wrapper script so the binary is invoked in native-messaging-host mode
-  const binDir = join(homeDir, ".claude", "bin");
-  mkdirSync(binDir, { recursive: true });
-  const wrapperPath = join(binDir, "ai-scanner-nativehost.sh");
-  const wrapperContent = `#!/bin/sh\nexec "${binaryPath}" native-messaging-host "$@"\n`;
-  try {
-    writeFileSync(wrapperPath, wrapperContent, { mode: 0o755 });
-  } catch (_e) {
-    // fall back to binary path directly
-  }
-
-  const nativeManifest = {
-    name: "jp.coworker.aidr.browser",
-    description: "AIDR Shadow IT Monitor bridge",
-    path: wrapperPath,
-    type: "stdio",
-    allowed_origins: [`chrome-extension://${extensionId}/`],
-  };
-
-  const chromePaths = getNativeMessagingPaths(platform, homeDir);
-  for (const dir of chromePaths) {
-    try {
-      mkdirSync(dir, { recursive: true });
-      writeFileSync(
-        join(dir, "jp.coworker.aidr.browser.json"),
-        JSON.stringify(nativeManifest, null, 2)
-      );
-    } catch (_e) {
-      // fail-open: skip paths we can't write
-    }
-  }
-
-  // 2. Record in ~/.claude/ai-scanner-config.json
-  const configPath = join(homeDir, ".claude", "ai-scanner-config.json");
-  let config = {};
-  try {
-    config = JSON.parse(readFileSync(configPath, "utf8"));
-  } catch (_e) {
-    // file doesn't exist yet or is unreadable; start fresh
-  }
-  config.browser_extension = true;
-  config.extension_id = extensionId;
-  try {
-    writeFileSync(configPath, JSON.stringify(config, null, 2));
-  } catch (_e) {
-    // fail-open: config write is best-effort
-  }
-
-  console.log("✓ Browser extension native messaging host installed");
-  console.log(`  Extension ID: ${extensionId}`);
-  console.log("  Open Chrome and install the AIDR Shadow IT Monitor extension to complete setup.");
-}
-
-function getNativeMessagingPaths(platform, homeDir) {
-  if (platform === "darwin") {
-    return [
-      join(homeDir, "Library/Application Support/Google/Chrome/NativeMessagingHosts"),
-      join(homeDir, "Library/Application Support/Microsoft Edge/NativeMessagingHosts"),
-      join(homeDir, "Library/Application Support/BraveSoftware/Brave-Browser/NativeMessagingHosts"),
-      join(homeDir, "Library/Application Support/Chromium/NativeMessagingHosts"),
-    ];
-  } else {
-    return [
-      join(homeDir, ".config/google-chrome/NativeMessagingHosts"),
-      join(homeDir, ".config/microsoft-edge/NativeMessagingHosts"),
-      join(homeDir, ".config/BraveSoftware/Brave-Browser/NativeMessagingHosts"),
-      join(homeDir, ".config/chromium/NativeMessagingHosts"),
-    ];
-  }
-}