@agentvault/claude-bridge 0.7.16 → 0.8.0

package/dist/index.js

@@ -9,36 +9,138 @@ var __export = (target, all) => {
     __defProp(target, name, { get: all[name], enumerable: true });
 };
 
+// src/pending-invite.ts
+import { existsSync, mkdirSync, chmodSync, readFileSync as readFileSync2, writeFileSync, rmSync } from "node:fs";
+import { join as join5 } from "node:path";
+function pendingInvitePath(dataDir) {
+  return join5(dataDir, PENDING_INVITE_FILE);
+}
+function writePendingInvite(dataDir, token) {
+  mkdirSync(dataDir, { recursive: true, mode: DIR_MODE2 });
+  chmodSync(dataDir, DIR_MODE2);
+  const p2 = pendingInvitePath(dataDir);
+  writeFileSync(p2, token, { mode: FILE_MODE2 });
+  chmodSync(p2, FILE_MODE2);
+}
+function readPendingInvite(dataDir) {
+  const p2 = pendingInvitePath(dataDir);
+  if (!existsSync(p2)) return void 0;
+  try {
+    const raw = readFileSync2(p2, "utf-8").trim();
+    return raw.length > 0 ? raw : void 0;
+  } catch {
+    return void 0;
+  }
+}
+function clearPendingInvite(dataDir) {
+  try {
+    rmSync(pendingInvitePath(dataDir), { force: true });
+  } catch {
+  }
+}
+function clearPendingInviteIfConsumed(dataDir, credsExist) {
+  if (!existsSync(pendingInvitePath(dataDir))) return false;
+  if (!credsExist(dataDir)) return false;
+  clearPendingInvite(dataDir);
+  return true;
+}
+var DIR_MODE2, FILE_MODE2, PENDING_INVITE_FILE;
+var init_pending_invite = __esm({
+  "src/pending-invite.ts"() {
+    "use strict";
+    DIR_MODE2 = 448;
+    FILE_MODE2 = 384;
+    PENDING_INVITE_FILE = "pending-invite";
+  }
+});
+
+// src/log.ts
+import { format } from "node:util";
+function stamp(message) {
+  const ts2 = (/* @__PURE__ */ new Date()).toISOString();
+  return message.split("\n").map((line) => `${ts2} ${line}`).join("\n");
+}
+function logLine(...args) {
+  console.error(stamp(format(...args)));
+}
+function printLine(text) {
+  console.log(text);
+}
+var init_log = __esm({
+  "src/log.ts"() {
+    "use strict";
+  }
+});
+
 // src/config.ts
-import { existsSync, readFileSync as readFileSync2, mkdirSync, chmodSync } from "node:fs";
-import { join as join5, resolve as resolve2, sep, dirname } from "node:path";
+import { existsSync as existsSync2, readFileSync as readFileSync3, mkdirSync as mkdirSync2, chmodSync as chmodSync2 } from "node:fs";
+import { join as join6, resolve as resolve2, sep, dirname } from "node:path";
+import { tmpdir } from "node:os";
+function isEphemeralEntrypoint(entrypoint) {
+  return entrypoint.includes("/_npx/") || entrypoint.includes("/dlx-") || entrypoint.includes("/.bun/install/cache/") || entrypoint.startsWith(tmpdir() + sep);
+}
+function assertInstallableEntrypoint(entrypoint) {
+  if (isEphemeralEntrypoint(entrypoint)) {
+    throw new Error(
+      `cannot install a background service from an ephemeral package cache (${entrypoint}) \u2014 it is deleted on cleanup and the service would silently die later. Install globally first:
+  npm i -g @agentvault/claude-bridge && agentvault-claude-bridge install`
+    );
+  }
+}
 function hasRecoverableBackup(dataDir) {
   try {
-    const parsed = JSON.parse(readFileSync2(join5(dataDir, BACKUP_FILE), "utf-8"));
+    const parsed = JSON.parse(readFileSync3(join6(dataDir, BACKUP_FILE), "utf-8"));
     return !!(parsed && parsed.deviceId && parsed.deviceJwt && parsed.sessions && Object.keys(parsed.sessions).length > 0);
   } catch {
     return false;
   }
 }
+function readPersistedDeviceId(dataDir) {
+  for (const f7 of [...CRED_FILES, BACKUP_FILE]) {
+    try {
+      const parsed = JSON.parse(readFileSync3(join6(dataDir, f7), "utf-8"));
+      const id = parsed?.deviceId;
+      if (typeof id === "string" && id) return id;
+    } catch {
+    }
+  }
+  return null;
+}
 function hasPersistedCreds(dataDir) {
-  if (CRED_FILES.some((f7) => existsSync(join5(dataDir, f7)))) return true;
+  if (CRED_FILES.some((f7) => existsSync2(join6(dataDir, f7)))) return true;
   return hasRecoverableBackup(dataDir);
 }
 function slugify2(name) {
   return name.toLowerCase().replace(/[^a-z0-9-]/g, "-");
 }
 function resolveDataDir(env) {
-  if (env.AV_DATA_DIR) return { dataDir: env.AV_DATA_DIR, source: "explicit" };
-  const base = join5(env.HOME ?? "", ".agentvault", "claude-room-bridge");
-  const perAgent = join5(base, slugify2(env.AV_AGENT_NAME ?? "claude"));
-  if (hasPersistedCreds(perAgent)) return { dataDir: perAgent, source: "per-agent" };
-  if (hasPersistedCreds(base)) return { dataDir: base, source: "legacy" };
-  return { dataDir: perAgent, source: "per-agent" };
+  const supplied = env.AV_AGENT_NAME?.trim();
+  const agentName = supplied || LEGACY_DEFAULT_AGENT_NAME;
+  const agentNameSource = supplied ? "supplied" : "defaulted";
+  if (env.AV_DATA_DIR)
+    return { dataDir: env.AV_DATA_DIR, source: "explicit", agentName, agentNameSource };
+  const base = join6(env.HOME ?? "", ".agentvault", "claude-room-bridge");
+  const perAgent = join6(base, slugify2(agentName));
+  if (hasPersistedCreds(perAgent))
+    return { dataDir: perAgent, source: "per-agent", agentName, agentNameSource };
+  if (hasPersistedCreds(base))
+    return { dataDir: base, source: "legacy", agentName, agentNameSource };
+  if (!supplied) {
+    throw new Error(
+      `AV_AGENT_NAME is required \u2014 it names WHICH agent this bridge runs as, and therefore where its credentials live. No credentials were found at ${perAgent} or ${base}, so there is no existing install to infer a name from. Re-run with AV_AGENT_NAME=<agent-name> set.`
+    );
+  }
+  return { dataDir: perAgent, source: "per-agent", agentName, agentNameSource };
 }
 function loadConfig(env, argv = []) {
-  const { dataDir, source: dataDirSource } = resolveDataDir(env);
-  const inviteToken = (argv[0] && !argv[0].startsWith("-") ? argv[0] : "") || env.AV_INVITE_TOKEN || "";
-  const workspaceDir = env.AV_WORKSPACE_DIR || join5(dirname(dataDir), "workspaces", slugify2(env.AV_AGENT_NAME ?? "claude"));
+  const { dataDir, source: dataDirSource, agentName, agentNameSource } = resolveDataDir(env);
+  if (agentNameSource === "defaulted") {
+    logLine(
+      `[config] AV_AGENT_NAME was not set \u2014 running as "${agentName}" from the existing credentials at ${dataDir}. Set AV_AGENT_NAME to name this agent explicitly; a future install will require it.`
+    );
+  }
+  const inviteToken = (argv[0] && !argv[0].startsWith("-") ? argv[0] : "") || env.AV_INVITE_TOKEN || readPendingInvite(dataDir) || "";
+  const workspaceDir = env.AV_WORKSPACE_DIR || join6(dirname(dataDir), "workspaces", slugify2(agentName));
   const wsReal = resolve2(workspaceDir);
   const ddReal = resolve2(dataDir);
   if (wsReal === ddReal || wsReal.startsWith(ddReal + sep) || ddReal.startsWith(wsReal + sep)) {
@@ -47,8 +149,8 @@ function loadConfig(env, argv = []) {
     );
   }
   try {
-    mkdirSync(workspaceDir, { recursive: true, mode: 448 });
-    chmodSync(workspaceDir, 448);
+    mkdirSync2(workspaceDir, { recursive: true, mode: 448 });
+    chmodSync2(workspaceDir, 448);
   } catch (e7) {
     throw new Error(
       `Failed to create/secure the agent workspace at ${workspaceDir} (override with AV_WORKSPACE_DIR): ${e7.message}`
@@ -83,8 +185,10 @@ function loadConfig(env, argv = []) {
     apiUrl: env.AV_API_URL ?? "https://api.agentvault.chat",
     // Identity shown to the agent's own session. Set this to the agent's
     // AgentVault name via AV_AGENT_NAME (the native connect command passes it).
-    // The neutral default avoids impersonating any specific named agent when unset.
-    agentName: env.AV_AGENT_NAME ?? "Claude",
+    // Resolved in resolveDataDir so the name, the data dir and the workspace dir
+    // can never disagree about who this agent is (#921/#927).
+    agentName,
+    agentNameSource,
     roomFilter: env.AV_ROOM_ID || void 0,
     model: env.AV_CLAUDE_MODEL || void 0,
     systemPrompt: env.AV_SYSTEM_PROMPT || void 0,
@@ -94,12 +198,15 @@ function loadConfig(env, argv = []) {
     osIsolated
   };
 }
-var CRED_FILES, BACKUP_FILE;
+var CRED_FILES, BACKUP_FILE, LEGACY_DEFAULT_AGENT_NAME;
 var init_config = __esm({
   "src/config.ts"() {
     "use strict";
+    init_pending_invite();
+    init_log();
     CRED_FILES = ["agentvault.json", "secure-channel.json"];
     BACKUP_FILE = "agentvault.json.bak";
+    LEGACY_DEFAULT_AGENT_NAME = "Claude";
   }
 });
 
@@ -227,6 +334,37 @@ ${envEntries}
 </plist>
 `;
 }
+function parsePlistEnv(xml) {
+  const out = {};
+  const keyIdx = xml.indexOf("<key>EnvironmentVariables</key>");
+  if (keyIdx < 0) return out;
+  const open = xml.indexOf("<dict>", keyIdx);
+  if (open < 0) return out;
+  let depth = 0;
+  let i2 = open;
+  let close = -1;
+  const tag = /<(\/?)dict>/g;
+  tag.lastIndex = open;
+  let m6;
+  while (m6 = tag.exec(xml)) {
+    depth += m6[1] ? -1 : 1;
+    if (depth === 0) {
+      close = m6.index;
+      break;
+    }
+    i2 = m6.index;
+  }
+  void i2;
+  if (close < 0) return out;
+  const body = xml.slice(open, close);
+  const pair = /<key>([\s\S]*?)<\/key>\s*<string>([\s\S]*?)<\/string>/g;
+  let p2;
+  while (p2 = pair.exec(body)) out[unesc(p2[1])] = unesc(p2[2]);
+  return out;
+}
+function unesc(s10) {
+  return s10.replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&amp;/g, "&");
+}
 var LaunchdBackend;
 var init_launchd = __esm({
   "src/service/launchd.ts"() {
@@ -281,6 +419,26 @@ var init_launchd = __esm({
         const r7 = this.deps.exec("launchctl", ["print", `${this.domain()}/${label}`]);
         return { loaded: r7.code === 0, detail: r7.stdout };
       }
+      /** #913 item 3 — every installed service whose label starts with `prefix`.
+       *
+       *  Reads the plist directory rather than `launchctl list`, because an ORPHAN
+       *  is typically installed-but-not-loaded: the revoked device exits 0 and
+       *  KeepAlive leaves it down. `launchctl list` would not show the very thing
+       *  doctor exists to find. */
+      list(prefix) {
+        const dir = join9(this.deps.home, "Library", "LaunchAgents");
+        const out = [];
+        for (const name of this.deps.readdir(dir)) {
+          if (!name.startsWith(prefix) || !name.endsWith(".plist")) continue;
+          const path2 = join9(dir, name);
+          out.push({
+            label: name.slice(0, -".plist".length),
+            path: path2,
+            env: parsePlistEnv(this.deps.readFile(path2))
+          });
+        }
+        return out.sort((a2, b5) => a2.label.localeCompare(b5.label));
+      }
     };
   }
 });
@@ -312,6 +470,24 @@ StandardError=append:${spec.logErr}
 WantedBy=default.target
 `;
 }
+function parseUnitEnv(text) {
+  const out = {};
+  for (const line of text.split("\n")) {
+    const m6 = /^Environment="([\s\S]*)"\s*$/.exec(line.trim());
+    if (!m6) continue;
+    const eq2 = unq(m6[1]);
+    const at = eq2.indexOf("=");
+    if (at <= 0) continue;
+    out[eq2.slice(0, at)] = eq2.slice(at + 1);
+  }
+  return out;
+}
+function unq(s10) {
+  return s10.replace(/%%/g, "%").replace(
+    /\\([\s\S])/g,
+    (_4, c4) => c4 === "n" ? "\n" : c4 === "r" ? "\r" : c4 === "t" ? "	" : c4
+  );
+}
 var SystemdBackend;
 var init_systemd = __esm({
   "src/service/systemd.ts"() {
@@ -353,13 +529,33 @@ var init_systemd = __esm({
         const active = this.deps.exec("systemctl", ["--user", "is-active", `${label}.service`]);
         return { loaded: enabled.code === 0, detail: `${enabled.stdout.trim() || "?"} / ${active.stdout.trim() || "?"}` };
       }
+      /** #913 item 3 — every installed unit whose label starts with `prefix`.
+       *
+       *  Reads the unit directory rather than `systemctl list-units`, because an
+       *  ORPHAN is installed-but-inactive: the revoked device exits 0, which
+       *  SuccessExitStatus=0 treats as success, so it is never restarted. A
+       *  running-units listing would not show the thing doctor exists to find. */
+      list(prefix) {
+        const dir = join10(this.deps.home, ".config", "systemd", "user");
+        const out = [];
+        for (const name of this.deps.readdir(dir)) {
+          if (!name.startsWith(prefix) || !name.endsWith(".service")) continue;
+          const path2 = join10(dir, name);
+          out.push({
+            label: name.slice(0, -".service".length),
+            path: path2,
+            env: parseUnitEnv(this.deps.readFile(path2))
+          });
+        }
+        return out.sort((a2, b5) => a2.label.localeCompare(b5.label));
+      }
     };
   }
 });
 
 // src/service/backend.ts
 import { spawnSync } from "node:child_process";
-import { mkdirSync as mkdirSync5, writeFileSync as writeFileSync3, rmSync as rmSync4, existsSync as existsSync4, chmodSync as chmodSync3 } from "node:fs";
+import { mkdirSync as mkdirSync5, writeFileSync as writeFileSync3, rmSync as rmSync4, existsSync as existsSync4, chmodSync as chmodSync4, readdirSync as readdirSync3, readFileSync as readFileSync6 } from "node:fs";
 import { userInfo } from "node:os";
 function defaultDeps() {
   return {
@@ -372,9 +568,23 @@ function defaultDeps() {
     },
     writeFile: (p2, d10) => writeFileSync3(p2, d10),
     mkdir: (p2) => mkdirSync5(p2, { recursive: true }),
-    chmod: (p2, m6) => chmodSync3(p2, m6),
+    chmod: (p2, m6) => chmodSync4(p2, m6),
     rm: (p2) => rmSync4(p2, { force: true }),
-    exists: (p2) => existsSync4(p2)
+    exists: (p2) => existsSync4(p2),
+    readdir: (p2) => {
+      try {
+        return readdirSync3(p2);
+      } catch {
+        return [];
+      }
+    },
+    readFile: (p2) => {
+      try {
+        return readFileSync6(p2, "utf8");
+      } catch {
+        return "";
+      }
+    }
   };
 }
 function selectBackend(platform, deps) {
@@ -397,7 +607,8 @@ var init_backend = __esm({
 // src/service/subcommand.ts
 var subcommand_exports = {};
 __export(subcommand_exports, {
-  maybeRunServiceSubcommand: () => maybeRunServiceSubcommand
+  maybeRunServiceSubcommand: () => maybeRunServiceSubcommand,
+  resolveLabel: () => resolveLabel
 });
 function requireAgentName(env) {
   const name = env.AV_AGENT_NAME?.trim();
@@ -429,7 +640,9 @@ function maybeRunServiceSubcommand(argv, env, deps) {
     const looksLikeFlag = cmd.startsWith("-");
     if (!looksLikeToken && !looksLikeFlag) {
       throw new Error(
-        `unknown subcommand: ${cmd} \u2014 expected one of ${[...SERVICE_CMDS].join(", ")}, an invite token, or no argument at all`
+        // "doctor" is dispatched earlier, in index.ts, so it never reaches here.
+        // Named anyway: a customer who typed `doctr` should see it offered.
+        `unknown subcommand: ${cmd} \u2014 expected one of ${[...SERVICE_CMDS, "doctor"].join(", ")}, an invite token, or no argument at all`
       );
     }
     return false;
@@ -440,11 +653,11 @@ function maybeRunServiceSubcommand(argv, env, deps) {
   try {
     if (cmd === "install") {
       requireAgentName(env);
+      assertInstallableEntrypoint(entrypoint);
       const cfg = loadConfig(env, []);
-      if (!hasPersistedCreds(cfg.dataDir)) {
-        throw new Error(
-          "no credentials found \u2014 enroll first by running the bridge once (AV_INVITE_TOKEN=\u2026 npx @agentvault/claude-bridge), then re-run install"
-        );
+      const firstBoot = !hasPersistedCreds(cfg.dataDir) && !!cfg.inviteToken;
+      if (firstBoot) {
+        writePendingInvite(cfg.dataDir, cfg.inviteToken);
       }
       const spec = buildServiceSpec(cfg, {
         entrypoint,
@@ -455,7 +668,11 @@ function maybeRunServiceSubcommand(argv, env, deps) {
         path: env.PATH ?? ""
       });
       backend.install(spec);
-      log(`installed service ${spec.label} \u2014 logs: ${spec.logOut}`);
+      log(`installed service ${spec.label} \u2014 logs: ${spec.logErr}`);
+      if (firstBoot) {
+        log("now APPROVE the device in AgentVault \u2014 the service is waiting to enrol");
+        log("if it does not connect within a minute, the log above says why");
+      }
       log(
         `check it with: AV_AGENT_NAME=${cfg.agentName} agentvault-claude-bridge status`
       );
@@ -487,14 +704,324 @@ var init_subcommand = __esm({
     "use strict";
     init_config();
     init_spec();
+    init_pending_invite();
     init_backend();
     SERVICE_CMDS = /* @__PURE__ */ new Set(["install", "uninstall", "restart", "status", "logs"]);
   }
 });
 
+// src/service/doctor.ts
+import { basename as basename2 } from "node:path";
+async function buildDoctorReport(d10) {
+  const installed = d10.labelPrefixes.flatMap((p2) => d10.backend.list(p2));
+  const services = [];
+  for (const s10 of installed) services.push(await inspect(s10, d10));
+  const claimed = new Set(installed.map((s10) => s10.env.AV_DATA_DIR).filter(Boolean));
+  const unsupervised = [];
+  for (const dataDir of d10.credDirs()) {
+    if (claimed.has(dataDir)) continue;
+    unsupervised.push(await inspectUnsupervised(dataDir, d10));
+  }
+  return {
+    labelPrefixes: d10.labelPrefixes,
+    services,
+    unsupervised,
+    notChecked: d10.otherLabels()
+  };
+}
+async function inspect(s10, d10) {
+  const agentName = s10.env.AV_AGENT_NAME ?? "";
+  const dataDir = s10.env.AV_DATA_DIR ?? "";
+  let loaded = false;
+  try {
+    loaded = d10.backend.status(s10.label).loaded;
+  } catch {
+  }
+  const base = { label: s10.label, agentName, dataDir, loaded, deviceId: "" };
+  if (!dataDir) {
+    return {
+      ...base,
+      verdict: "WARN",
+      detail: "the service definition bakes no AV_DATA_DIR, so doctor cannot find its credentials and cannot check its device"
+    };
+  }
+  const creds = d10.readCreds(dataDir);
+  if (!creds?.deviceId) {
+    return {
+      ...base,
+      verdict: "WARN",
+      detail: `no credentials at ${dataDir} \u2014 installed, but this agent never enrolled`
+    };
+  }
+  const deviceId = creds.deviceId;
+  let probe;
+  try {
+    probe = await d10.fetchStatus(d10.apiUrl, deviceId);
+  } catch (e7) {
+    return { ...base, deviceId, verdict: "SKIP", detail: `could not check the device: ${e7.message}` };
+  }
+  if (probe.inconclusive) {
+    return { ...base, deviceId, verdict: "SKIP", detail: `could not check the device: ${probe.inconclusive}` };
+  }
+  if (probe.gone) {
+    return {
+      ...base,
+      deviceId,
+      verdict: "FAIL",
+      detail: "the device no longer exists \u2014 this service is an orphan",
+      fix: d10.uninstallCommand(agentName)
+    };
+  }
+  switch (probe.status) {
+    case "ACTIVE":
+      return { ...base, deviceId, verdict: "PASS", detail: "device ACTIVE" };
+    case "PENDING":
+      return {
+        ...base,
+        deviceId,
+        verdict: "WARN",
+        detail: "device PENDING \u2014 enrolled, but never approved in AgentVault"
+      };
+    case "REVOKED":
+      return {
+        ...base,
+        deviceId,
+        verdict: "FAIL",
+        detail: "the device was REVOKED \u2014 this service is an orphan",
+        fix: d10.uninstallCommand(agentName)
+      };
+    default:
+      return {
+        ...base,
+        deviceId,
+        verdict: "SKIP",
+        detail: `the server reported a status this build does not recognise (${probe.status || "none"})`
+      };
+  }
+}
+async function inspectUnsupervised(dataDir, d10) {
+  const agentName = basename2(dataDir);
+  const base = { dataDir, agentName, deviceId: "" };
+  const deviceId = d10.readCreds(dataDir)?.deviceId;
+  if (!deviceId) {
+    return { ...base, verdict: "WARN", detail: "credentials present but they hold no device id" };
+  }
+  let probe;
+  try {
+    probe = await d10.fetchStatus(d10.apiUrl, deviceId);
+  } catch (e7) {
+    return { ...base, deviceId, verdict: "SKIP", detail: `could not check the device: ${e7.message}` };
+  }
+  if (probe.inconclusive) {
+    return { ...base, deviceId, verdict: "SKIP", detail: `could not check the device: ${probe.inconclusive}` };
+  }
+  if (probe.gone) {
+    return {
+      ...base,
+      deviceId,
+      verdict: "WARN",
+      detail: "the device no longer exists \u2014 these are leftover credentials for a deleted agent"
+    };
+  }
+  if (probe.status === "ACTIVE") {
+    return {
+      ...base,
+      deviceId,
+      verdict: "WARN",
+      detail: "the device is ACTIVE but nothing supervises it \u2014 this agent is not running",
+      fix: d10.installCommand(agentName)
+    };
+  }
+  if (probe.status === "PENDING") {
+    return {
+      ...base,
+      deviceId,
+      verdict: "WARN",
+      detail: "device PENDING \u2014 enrolled, but never approved in AgentVault"
+    };
+  }
+  if (probe.status === "REVOKED") {
+    return {
+      ...base,
+      deviceId,
+      verdict: "WARN",
+      detail: "the device was REVOKED \u2014 these are leftover credentials"
+    };
+  }
+  return {
+    ...base,
+    deviceId,
+    verdict: "SKIP",
+    detail: `the server reported a status this build does not recognise (${probe.status || "none"})`
+  };
+}
+function formatDoctorReport(r7) {
+  const out = [];
+  out.push(`Services installed for this bridge (${r7.labelPrefixes.map((p2) => p2 + "*").join(", ")})`);
+  if (r7.services.length === 0) {
+    out.push(`  No services installed for this bridge on this machine.`);
+  }
+  for (const s10 of r7.services) {
+    out.push(
+      `  ${s10.verdict.padEnd(PAD)}${s10.label}  [${s10.agentName || "unnamed"}]  ${s10.loaded ? "loaded" : "not loaded"}  \u2014  ${s10.detail}`
+    );
+    if (s10.fix) out.push(`  ${"".padEnd(PAD)}fix: ${s10.fix}`);
+  }
+  if (r7.unsupervised.length) {
+    out.push("");
+    out.push("Credentials on disk that no installed service points at");
+    for (const u2 of r7.unsupervised) {
+      out.push(`  ${u2.verdict.padEnd(PAD)}${u2.agentName}  \u2014  ${u2.detail}`);
+      out.push(`  ${"".padEnd(PAD)}${u2.dataDir}`);
+      if (u2.fix) out.push(`  ${"".padEnd(PAD)}fix: ${u2.fix}`);
+    }
+  }
+  if (r7.notChecked.length) {
+    out.push("");
+    out.push("Found on this machine, NOT checked by this command");
+    for (const l10 of r7.notChecked) out.push(`  ${l10}`);
+    out.push(
+      "  These belong to other AgentVault agent families. This command can only read the credentials of its own, so it says nothing about their health."
+    );
+  }
+  const counts = { PASS: 0, WARN: 0, FAIL: 0, SKIP: 0 };
+  for (const s10 of r7.services) counts[s10.verdict]++;
+  for (const u2 of r7.unsupervised) counts[u2.verdict]++;
+  out.push("");
+  out.push(
+    `Summary: ${counts.PASS} PASS, ${counts.WARN} WARN, ${counts.FAIL} FAIL, ${counts.SKIP} SKIP` + (counts.SKIP ? " (SKIP = could not check, NOT a problem found)" : "")
+  );
+  if (counts.FAIL) {
+    out.push(
+      "`uninstall` removes the SERVICE only \u2014 your credentials stay on disk, so a mistake here costs a re-install, not an identity."
+    );
+  }
+  return out;
+}
+var PAD;
+var init_doctor = __esm({
+  "src/service/doctor.ts"() {
+    "use strict";
+    PAD = 6;
+  }
+});
+
+// src/service/doctor-cli.ts
+var doctor_cli_exports = {};
+__export(doctor_cli_exports, {
+  fetchDeviceStatus: () => fetchDeviceStatus,
+  maybeRunDoctorSubcommand: () => maybeRunDoctorSubcommand,
+  realDoctorDeps: () => realDoctorDeps
+});
+import { join as join12 } from "node:path";
+import { readdirSync as readdirSync5 } from "node:fs";
+async function fetchDeviceStatus(apiUrl, deviceId, doFetch = fetch) {
+  const res = await doFetch(`${apiUrl}/api/v1/devices/${deviceId}/status`, {
+    signal: AbortSignal.timeout(PROBE_TIMEOUT_MS)
+  });
+  if (res.status === 404) {
+    try {
+      await res.json();
+    } catch {
+      return {
+        inconclusive: `${apiUrl} answered 404 with a non-JSON body \u2014 check AV_API_URL points at the API`
+      };
+    }
+    return { gone: true };
+  }
+  if (res.status === 429) return { inconclusive: "rate limited by the API (429)" };
+  if (!res.ok) return { inconclusive: `the API answered ${res.status}` };
+  let body;
+  try {
+    body = await res.json();
+  } catch {
+    return { inconclusive: `${apiUrl} answered 200 with a non-JSON body \u2014 check AV_API_URL` };
+  }
+  return { status: body?.status };
+}
+function listCredDirs(base) {
+  const out = [];
+  if (hasPersistedCreds(base)) out.push(base);
+  let names;
+  try {
+    names = readdirSync5(base);
+  } catch {
+    return out;
+  }
+  for (const name of names) {
+    const dir = join12(base, name);
+    if (hasPersistedCreds(dir)) out.push(dir);
+  }
+  return out;
+}
+function otherFamilyLabels(backend) {
+  const out = [];
+  for (const p2 of OTHER_FAMILY_PREFIXES) {
+    try {
+      for (const s10 of backend.list(p2)) out.push(s10.label);
+    } catch {
+    }
+  }
+  return out.sort();
+}
+function realDoctorDeps(env) {
+  const backend = selectBackend(process.platform);
+  const base = join12(env.HOME ?? "", ".agentvault", "claude-room-bridge");
+  return {
+    backend,
+    labelPrefixes: [LABEL_PREFIX, LEGACY_LABEL_PREFIX],
+    base,
+    // Same default as config.ts. Read from the env directly rather than through
+    // loadConfig, which now REFUSES without AV_AGENT_NAME (#921) — and doctor's
+    // whole job is to run when you do not know which agents exist.
+    apiUrl: env.AV_API_URL ?? "https://api.agentvault.chat",
+    uninstallCommand: (n10) => `AV_AGENT_NAME=${n10 || "<agent-name>"} agentvault-claude-bridge uninstall`,
+    installCommand: (n10) => `AV_AGENT_NAME=${n10 || "<agent-name>"} agentvault-claude-bridge install`,
+    readCreds: (dir) => {
+      const deviceId = readPersistedDeviceId(dir);
+      return deviceId ? { deviceId } : null;
+    },
+    credDirs: () => listCredDirs(base),
+    fetchStatus: (apiUrl, deviceId) => fetchDeviceStatus(apiUrl, deviceId),
+    otherLabels: () => otherFamilyLabels(backend)
+  };
+}
+async function maybeRunDoctorSubcommand(argv, opts = {}) {
+  if (argv[2] !== "doctor") return false;
+  const log = opts.log ?? printLine;
+  try {
+    const report = await buildDoctorReport(opts.deps ?? realDoctorDeps(opts.env ?? process.env));
+    for (const line of formatDoctorReport(report)) log(line);
+    if (report.services.some((s10) => s10.verdict === "FAIL")) process.exitCode = 1;
+  } catch (e7) {
+    log(`doctor could not run: ${e7.message}`);
+    process.exitCode = 1;
+  }
+  return true;
+}
+var LABEL_PREFIX, LEGACY_LABEL_PREFIX, OTHER_FAMILY_PREFIXES, PROBE_TIMEOUT_MS;
+var init_doctor_cli = __esm({
+  "src/service/doctor-cli.ts"() {
+    "use strict";
+    init_backend();
+    init_config();
+    init_log();
+    init_doctor();
+    LABEL_PREFIX = "dev.agentvault.bridge-";
+    LEGACY_LABEL_PREFIX = "com.agentvault.claude-bridge.";
+    OTHER_FAMILY_PREFIXES = [
+      "dev.agentvault.grok-",
+      // grok bridge
+      "ai.hermes.gateway"
+      // hermes, one service per profile
+    ];
+    PROBE_TIMEOUT_MS = 8e3;
+  }
+});
+
 // src/index.ts
-import { appendFileSync as appendFileSync2, mkdirSync as mkdirSync6 } from "node:fs";
-import { join as join11 } from "node:path";
+import { appendFileSync as appendFileSync2, mkdirSync as mkdirSync7 } from "node:fs";
+import { join as join13 } from "node:path";
 
 // ../plugin/dist/index.js
 import * as nc from "node:crypto";
@@ -98151,6 +98678,7 @@ await init_index();
 
 // src/index.ts
 init_config();
+init_pending_invite();
 
 // ../../node_modules/@anthropic-ai/claude-agent-sdk/sdk.mjs
 import { createRequire as $S } from "node:module";
@@ -119451,18 +119979,18 @@ import { realpathSync as realpathSync2 } from "node:fs";
 import { resolve as resolve3, dirname as dirname2, basename, sep as sep2, isAbsolute } from "node:path";
 
 // src/host-trust.ts
-import { mkdirSync as mkdirSync3, writeFileSync, rmSync as rmSync2, readdirSync as readdirSync2, lstatSync as lstatSync2, readFileSync as readFileSync4, chmodSync as chmodSync2 } from "node:fs";
-import { join as join6 } from "node:path";
+import { mkdirSync as mkdirSync4, writeFileSync as writeFileSync2, rmSync as rmSync3, readdirSync as readdirSync2, lstatSync as lstatSync2, readFileSync as readFileSync5, chmodSync as chmodSync3 } from "node:fs";
+import { join as join7 } from "node:path";
 import { homedir, hostname as hostname3 } from "node:os";
 var TRUST_SUBDIR = "host-trust";
-var DIR_MODE2 = 448;
-var FILE_MODE2 = 384;
+var DIR_MODE3 = 448;
+var FILE_MODE3 = 384;
 var ID_RE = /^[A-Za-z0-9_-]{1,128}$/;
 var IDENTITY_FILES = ["agentvault.json", "secure-channel.json", "agentvault.json.bak"];
 var HostTrustError = class extends Error {
 };
 function trustDir(root3) {
-  return join6(root3 ?? join6(homedir(), ".agentvault"), TRUST_SUBDIR);
+  return join7(root3 ?? join7(homedir(), ".agentvault"), TRUST_SUBDIR);
 }
 function sanitize(deviceId) {
   if (typeof deviceId !== "string" || !ID_RE.test(deviceId)) {
@@ -119473,7 +120001,7 @@ function sanitize(deviceId) {
 function isTrusted(deviceId, root3) {
   try {
     if (typeof deviceId !== "string" || !ID_RE.test(deviceId)) return false;
-    const p2 = join6(trustDir(root3), deviceId);
+    const p2 = join7(trustDir(root3), deviceId);
     return lstatSync2(p2).isFile();
   } catch {
     return false;
@@ -119482,26 +120010,26 @@ function isTrusted(deviceId, root3) {
 function grant(deviceId, root3) {
   const id = sanitize(deviceId);
   const dir = trustDir(root3);
-  const p2 = join6(dir, id);
-  mkdirSync3(dir, { recursive: true, mode: DIR_MODE2 });
-  writeFileSync(
+  const p2 = join7(dir, id);
+  mkdirSync4(dir, { recursive: true, mode: DIR_MODE3 });
+  writeFileSync2(
     p2,
     `granted_at=${(/* @__PURE__ */ new Date()).toISOString()} host=${hostname3()}
 `,
-    { mode: FILE_MODE2 }
+    { mode: FILE_MODE3 }
   );
-  chmodSync2(dir, DIR_MODE2);
-  chmodSync2(p2, FILE_MODE2);
+  chmodSync3(dir, DIR_MODE3);
+  chmodSync3(p2, FILE_MODE3);
 }
 function revoke(deviceId, root3) {
   const id = sanitize(deviceId);
-  const p2 = join6(trustDir(root3), id);
+  const p2 = join7(trustDir(root3), id);
   try {
     if (!lstatSync2(p2).isFile()) return false;
   } catch {
     return false;
   }
-  rmSync2(p2, { force: true });
+  rmSync3(p2, { force: true });
   return true;
 }
 function listTrusted(root3) {
@@ -119516,7 +120044,7 @@ function listTrusted(root3) {
 function readDeviceId(dataDir) {
   for (const f7 of IDENTITY_FILES) {
     try {
-      const parsed = JSON.parse(readFileSync4(join6(dataDir, f7), "utf-8"));
+      const parsed = JSON.parse(readFileSync5(join7(dataDir, f7), "utf-8"));
       if (parsed?.deviceId && ID_RE.test(parsed.deviceId)) return parsed.deviceId;
     } catch {
     }
@@ -119526,17 +120054,8 @@ function readDeviceId(dataDir) {
   );
 }
 
-// src/log.ts
-import { format } from "node:util";
-function stamp(message) {
-  const ts2 = (/* @__PURE__ */ new Date()).toISOString();
-  return message.split("\n").map((line) => `${ts2} ${line}`).join("\n");
-}
-function logLine(...args) {
-  console.error(stamp(format(...args)));
-}
-
 // src/worker-permission.ts
+init_log();
 var PATH_FIELDS = ["file_path", "path", "notebook_path"];
 function canonical(p2) {
   const abs = resolve3(p2);
@@ -133462,6 +133981,7 @@ function date7(params) {
 config2(en_default3());
 
 // src/session.ts
+init_log();
 function makeRoomSayTool(onSay) {
   return bs(
     "say",
@@ -134072,9 +134592,36 @@ var ArmingState = class {
   }
 };
 
+// src/service/self-uninstall.ts
+init_subcommand();
+init_backend();
+init_log();
+var DEVICE_IS_GONE = "device_revoked";
+function selfUninstallOnTerminal(reason, env, deps = {}) {
+  if (reason !== DEVICE_IS_GONE) return false;
+  const log = deps.log ?? ((m6) => logLine("[bridge] " + m6));
+  let label = "";
+  try {
+    if (!deps.backend && process.platform !== "darwin" && process.platform !== "linux") return false;
+    const backend = deps.backend ?? selectBackend(process.platform);
+    label = resolveLabel(backend, env);
+    if (!backend.status(label).loaded) return false;
+    backend.uninstall(label);
+    log(
+      `device was revoked \u2014 removed the supervised service ${label} so it does not sit installed on this machine pointing at an agent that no longer exists. Your credentials are still on disk and were NOT touched; re-install with a fresh invite token from AgentVault to reconnect.`
+    );
+    return true;
+  } catch (e7) {
+    log(
+      `device was revoked, but the supervised service ${label || "for this agent"} could not be removed: ${e7.message}. Remove it by hand with: AV_AGENT_NAME=<agent-name> agentvault-claude-bridge uninstall`
+    );
+    return false;
+  }
+}
+
 // src/approve-cli.ts
-import { mkdirSync as mkdirSync4, writeFileSync as writeFileSync2, readFileSync as readFileSync5, readdirSync as readdirSync3, rmSync as rmSync3, existsSync as existsSync3 } from "node:fs";
-import { join as join7 } from "node:path";
+import { mkdirSync as mkdirSync6, writeFileSync as writeFileSync4, readFileSync as readFileSync7, readdirSync as readdirSync4, rmSync as rmSync5, existsSync as existsSync5 } from "node:fs";
+import { join as join11 } from "node:path";
 var APPROVALS_SUBDIR = "arm-approvals";
 var ID_RE2 = /^[A-Za-z0-9_-]{1,128}$/;
 var ApproveArmError = class extends Error {
@@ -134094,24 +134641,24 @@ function sanitizeRoomId(roomId) {
 function writeApproval(dataDir, requestId, roomId) {
   const id = sanitizeRequestId(requestId);
   const room = sanitizeRoomId(roomId);
-  const dir = join7(dataDir, APPROVALS_SUBDIR);
-  mkdirSync4(dir, { recursive: true });
-  writeFileSync2(join7(dir, id), room);
+  const dir = join11(dataDir, APPROVALS_SUBDIR);
+  mkdirSync6(dir, { recursive: true });
+  writeFileSync4(join11(dir, id), room);
 }
 function drainApprovals(dataDir) {
-  const dir = join7(dataDir, APPROVALS_SUBDIR);
-  if (!existsSync3(dir)) return [];
+  const dir = join11(dataDir, APPROVALS_SUBDIR);
+  if (!existsSync5(dir)) return [];
   const out = [];
-  for (const name of readdirSync3(dir)) {
+  for (const name of readdirSync4(dir)) {
     if (!ID_RE2.test(name)) continue;
     let roomId = "";
     try {
-      roomId = readFileSync5(join7(dir, name), "utf8").trim();
+      roomId = readFileSync7(join11(dir, name), "utf8").trim();
     } catch {
     }
     out.push({ requestId: name, roomId: ID_RE2.test(roomId) ? roomId : "" });
     try {
-      rmSync3(join7(dir, name), { force: true, recursive: true });
+      rmSync5(join11(dir, name), { force: true, recursive: true });
     } catch {
     }
   }
@@ -134252,11 +134799,13 @@ var ActiveTarget = class {
 function attachLifecycle2(channel, opts = {}) {
   const log = opts.log ?? (() => {
   });
+  const selfUninstall = opts.selfUninstall ?? selfUninstallOnTerminal;
   const onTerminal = opts.onTerminal ?? ((_reason, o10) => process.exit(o10.restart ? 1 : 0));
   const terminal = (reason, restart) => {
     log(
       `terminal condition (${reason}) \u2014 ${restart ? "gave up reconnecting; supervisor may respawn" : "this device must re-enroll or another session has taken over"}. Re-run/re-install with a fresh invite token from AgentVault if this persists.`
     );
+    selfUninstall(reason, process.env);
     onTerminal(reason, { restart });
   };
   channel.on("auth_failed", (e7) => terminal(e7.reason, false));
@@ -134479,7 +135028,12 @@ function wireBridge(channel, session, target, opts = {}) {
 }
 
 // src/index.ts
+init_log();
 async function main() {
+  const { maybeRunDoctorSubcommand: maybeRunDoctorSubcommand2 } = await Promise.resolve().then(() => (init_doctor_cli(), doctor_cli_exports));
+  if (await maybeRunDoctorSubcommand2(process.argv)) {
+    process.exit(process.exitCode ?? 0);
+  }
   const { dataDir: dataDirForSubcommand } = resolveDataDir(process.env);
   if (maybeRunApproveArmSubcommand(process.argv, dataDirForSubcommand)) {
     process.exit(process.exitCode ?? 0);
@@ -134498,7 +135052,7 @@ async function main() {
       "[bridge] warning: passing the invite token on the command line is visible to other local users via 'ps'. Prefer: AV_INVITE_TOKEN=\u2026 npx @agentvault/claude-bridge"
     );
   }
-  logLine(`[bridge] version: ${true ? "0.7.16" : "dev"}`);
+  logLine(`[bridge] version: ${true ? "0.8.0" : "dev"}`);
   logLine(`[bridge] data dir: ${cfg.dataDir} (${cfg.dataDirSource})`);
   logLine(`[bridge] workspace: ${cfg.workspaceDir} \xB7 permissions: ${cfg.permissionMode} \xB7 enclave dir fenced`);
   if (cfg.armRoom) {
@@ -134530,7 +135084,7 @@ async function main() {
     // its default would render "@agentvault/agentvault@0.7.x" — the wrong
     // package name attached to the bridge's version number, which is worse
     // than either alone.
-    clientVersion: `@agentvault/claude-bridge@${true ? "0.7.16" : "dev"}`
+    clientVersion: `@agentvault/claude-bridge@${true ? "0.8.0" : "dev"}`
   });
   const agentSystemPrompt = cfg.systemPrompt ?? `You are ${cfg.agentName}, an AI agent on AgentVault. You talk with your owner in 1:1 direct messages and collaborate with other agents in shared rooms. That is your identity \u2014 introduce yourself by that name and do not claim to be any other agent. To speak, call the say tool. In a 1:1 with your owner, reply to what they say. In a room you see every message \u2014 call say only when you have something worth adding, and otherwise stay silent. Keep messages concise.`;
   const deviceJwt = () => {
@@ -134594,9 +135148,9 @@ async function main() {
         `[worker-trap] ${rec.at} ${rec.outcome} after ${rec.ranMs}ms (waited ${rec.waitedMs}ms behind ${rec.queueDepthAtEnqueue}, ${rec.queueDepthAtStart} still queued) replyExpected=${rec.replyExpected}` + (rec.session ? ` composed=${rec.session.composedChars} result=${rec.session.sawResult} said=${rec.session.said}` : "")
       );
       try {
-        const dir = join11(cfg.dataDir, "logs");
-        mkdirSync6(dir, { recursive: true });
-        appendFileSync2(join11(dir, "worker-incidents.jsonl"), JSON.stringify(rec) + "\n");
+        const dir = join13(cfg.dataDir, "logs");
+        mkdirSync7(dir, { recursive: true });
+        appendFileSync2(join13(dir, "worker-incidents.jsonl"), JSON.stringify(rec) + "\n");
       } catch (err) {
         logLine(`[worker-trap] could not persist incident: ${err.message}`);
       }
@@ -134628,6 +135182,11 @@ async function main() {
   attachLifecycle2(channel, {
     log: (m6) => logLine("[bridge] " + m6)
   });
+  channel.on("ready", () => {
+    if (clearPendingInviteIfConsumed(cfg.dataDir, hasPersistedCreds)) {
+      logLine("[bridge] enrolled \u2014 pending invite consumed and removed");
+    }
+  });
   channel.on("state", (s10) => logLine(`[bridge] channel state: ${JSON.stringify(s10)}`));
   channel.on(
     "room_joined",