@agentvault/claude-bridge 0.5.3 → 0.5.5

package/dist/index.js

@@ -10,10 +10,19 @@ var __export = (target, all) => {
 };
 
 // src/config.ts
-import { existsSync } from "node:fs";
+import { existsSync, readFileSync as readFileSync2 } from "node:fs";
 import { join as join5 } from "node:path";
+function hasRecoverableBackup(dataDir) {
+  try {
+    const parsed = JSON.parse(readFileSync2(join5(dataDir, BACKUP_FILE), "utf-8"));
+    return !!(parsed && parsed.deviceId && parsed.deviceJwt && parsed.sessions && Object.keys(parsed.sessions).length > 0);
+  } catch {
+    return false;
+  }
+}
 function hasPersistedCreds(dataDir) {
-  return CRED_FILES.some((f7) => existsSync(join5(dataDir, f7)));
+  if (CRED_FILES.some((f7) => existsSync(join5(dataDir, f7)))) return true;
+  return hasRecoverableBackup(dataDir);
 }
 function slugify2(name) {
   return name.toLowerCase().replace(/[^a-z0-9-]/g, "-");
@@ -78,11 +87,12 @@ function loadConfig(env, argv = []) {
     armRoom
   };
 }
-var CRED_FILES;
+var CRED_FILES, BACKUP_FILE;
 var init_config = __esm({
   "src/config.ts"() {
     "use strict";
     CRED_FILES = ["agentvault.json", "secure-channel.json"];
+    BACKUP_FILE = "agentvault.json.bak";
   }
 });
 
@@ -64550,6 +64560,11 @@ function migratePersistedState(raw) {
     messageHistory: []
   };
 }
+function _isSelfHubAddress(ownHubAddress, target) {
+  const own = (ownHubAddress ?? "").trim().toLowerCase();
+  const tgt = (target ?? "").trim().toLowerCase();
+  return own.length > 0 && own === tgt;
+}
 var ROOM_AGENT_TYPES;
 var CREDENTIAL_MESSAGE_TYPES;
 var CATCHUP_MESSAGE_TYPES;
@@ -64621,6 +64636,15 @@ var init_channel = __esm2({
       _ackTimer = null;
       _stopped = false;
       _persisted = null;
+      // AgentVault display_name, resolved from GET /hub/identities (#499, A1).
+      // hub_address alone isn't enough — its random suffix (wren-8789ee6d…) differs
+      // from what the owner types (Wren). Empty until resolved; the DM preamble is
+      // then omitted rather than asserting a wrong name. Re-resolved on every
+      // connect (picks up renames; retries after a failed fetch).
+      _ownDisplayName = "";
+      // Dedupes concurrent resolves (connect-trigger + lazy DM-trigger) so a burst
+      // of DMs can't stampede /hub/identities.
+      _resolvingOwnDisplayName = null;
       _httpServer = null;
       _mcpServer = null;
       _pollFallbackTimer = null;
@@ -64652,7 +64676,7 @@ var init_channel = __esm2({
       _pendingMlsKpBundle;
       /**
        * Pool of pending KeyPackage bundles this device has published but not yet
-       * consumed by a Welcome. The backend now consumes published KeyPackages FIFO,
+       * consumed by a Welcome. The backend consumes published KeyPackages newest-first (#508),
        * so a given room's creator may have been served ANY of these — `_handleMlsWelcome`
        * trial-decrypts the incoming Welcome against every bundle in the pool (plus the
        * connect KP and the persisted per-group bundle). Capped at `_KP_POOL_TARGET`;
@@ -64890,6 +64914,50 @@ var init_channel = __esm2({
       get deviceId() {
         return this._deviceId;
       }
+      /** This agent's AgentVault display_name (#499, A1). "" until resolved. */
+      get ownDisplayName() {
+        return this._ownDisplayName;
+      }
+      /** This agent's AgentVault hub_address (#499, A1). "" until known. */
+      get ownHubAddress() {
+        return this._persisted?.hubAddress ?? "";
+      }
+      /** Public best-effort trigger to (re)resolve this agent's display_name.
+       * Called lazily from the 1:1 DM path when the name is still unknown, so a
+       * resolve that failed at connect (or a fresh agent that hadn't registered
+       * yet) is retried without waiting for the next WS reconnect (#499, A1). */
+      ensureOwnIdentityResolved() {
+        return this._resolveOwnDisplayName();
+      }
+      /** Resolve this agent's own display_name from GET /api/v1/hub/identities
+       * (matches its own device_id). Deduped — concurrent callers share one
+       * in-flight fetch. Refreshes the cached value on success (picks up a rename);
+       * on failure leaves the prior value intact. Best-effort — never throws.
+       * Mirrors Hermes RestClient.get_own_identity (#499, Component 0). */
+      _resolveOwnDisplayName() {
+        if (this._resolvingOwnDisplayName) return this._resolvingOwnDisplayName;
+        const p2 = (async () => {
+          const jwt22 = this._persisted?.deviceJwt ?? this._deviceJwt;
+          const deviceId = this._persisted?.deviceId ?? this._deviceId;
+          if (!jwt22 || !deviceId) return;
+          try {
+            const res = await fetch(`${this.config.apiUrl}/api/v1/hub/identities`, {
+              headers: { Authorization: `Bearer ${jwt22}` }
+            });
+            if (!res.ok) return;
+            const list = await res.json();
+            if (!Array.isArray(list)) return;
+            const mine = list.find((x22) => x22?.device_id === deviceId);
+            if (mine?.display_name) this._ownDisplayName = String(mine.display_name);
+          } catch {
+          }
+        })();
+        this._resolvingOwnDisplayName = p2;
+        void p2.finally(() => {
+          if (this._resolvingOwnDisplayName === p2) this._resolvingOwnDisplayName = null;
+        });
+        return p2;
+      }
       get fingerprint() {
         return this._fingerprint;
       }
@@ -65434,7 +65502,7 @@ var init_channel = __esm2({
        */
       sendActivitySpan(spanData) {
         if (!this._ws || this._ws.readyState !== WebSocket2.OPEN) return;
-        const pluginVersion = true ? "0.23.0" : "0.0.0-dev";
+        const pluginVersion = true ? "0.23.2" : "0.0.0-dev";
         const agentName = this.config.agentName ?? "Agent";
         const resource = {
           "service.name": "agentvault-agent",
@@ -66413,6 +66481,11 @@ var init_channel = __esm2({
         if (!this._persisted?.hubAddress) {
           throw new Error("This agent does not have a hub address assigned");
         }
+        if (_isSelfHubAddress(this._persisted.hubAddress, responderHubAddress)) {
+          throw new Error(
+            "Refusing to open an A2A channel to this agent's own hub address (self-reference). The owner is addressing you by your own name \u2014 reply to them directly instead of opening a channel to yourself."
+          );
+        }
         if (!this._deviceJwt) {
           throw new Error("Channel not authenticated");
         }
@@ -66493,6 +66566,11 @@ var init_channel = __esm2({
        * Falls back to plaintext for channels without a session (legacy/pre-encryption).
        */
       async sendToAgent(hubAddress, text, opts) {
+        if (_isSelfHubAddress(this._persisted?.hubAddress ?? "", hubAddress)) {
+          throw new Error(
+            "Refusing to send an A2A message to this agent's own hub address (self-reference) \u2014 reply to the owner directly."
+          );
+        }
         if (!this._persisted?.a2aChannels) {
           try {
             await this.listA2AChannels();
@@ -67041,7 +67119,7 @@ var init_channel = __esm2({
                 agentVersion: this.config.agentVersion ?? "0.0.0",
                 // __AV_VERSION__ is injected by esbuild from package.json at build time.
                 // Falls back to "0.0.0-dev" in non-bundled contexts (tests).
-                pluginVersion: true ? "0.23.0" : "0.0.0-dev"
+                pluginVersion: true ? "0.23.2" : "0.0.0-dev"
               });
               this._telemetryReporter.startAutoFlush(3e4);
             }
@@ -67117,8 +67195,7 @@ var init_channel = __esm2({
               return;
             }
             if (data.event === "device_revoked") {
-              await clearState(this.config.dataDir);
-              this._handleError(new Error("Device was revoked"));
+              await this._handleDeviceRevoked();
               return;
             }
             if (data.event === "device_linked") {
@@ -67342,6 +67419,7 @@ var init_channel = __esm2({
                 this._persisted.agentHubId = data.data.hub_id;
                 this._persisted.agentRole = data.data.agent_role ?? "peer";
                 if (changed) this._persistState();
+                void this._resolveOwnDisplayName();
                 if (!this._telemetryReporter && this._persisted.deviceJwt && this._persisted.hubId) {
                   this._telemetryReporter = new TelemetryReporter({
                     apiBase: this.config.apiUrl,
@@ -67351,7 +67429,7 @@ var init_channel = __esm2({
                     agentVersion: this.config.agentVersion ?? "0.0.0",
                     // __AV_VERSION__ is injected by esbuild from package.json at build time.
                     // Falls back to "0.0.0-dev" in non-bundled contexts (tests).
-                    pluginVersion: true ? "0.23.0" : "0.0.0-dev"
+                    pluginVersion: true ? "0.23.2" : "0.0.0-dev"
                   });
                   this._telemetryReporter.startAutoFlush(3e4);
                 }
@@ -70516,6 +70594,76 @@ ${messageText}`;
         this._setState("error");
         this.emit("error", err);
       }
+      // Phase 2 — rolling-window timestamps of device_revoked self-heal reconnects,
+      // used as a war cap so a takeover war or a server status/WS inconsistency can't
+      // thrash forever.
+      _revokeRecoveries = [];
+      static REVOKE_RECOVERY_MAX = 3;
+      static REVOKE_RECOVERY_WINDOW_MS = 12e4;
+      /**
+       * Handle a WS `device_revoked` event.
+       *
+       * The signal is ambiguous: the server sends it both for a genuine owner revoke
+       * AND for a transient/racy session-takeover of a device that is still ACTIVE
+       * (the error text even reads "or another session has taken over" — loopita's
+       * case, where the device stayed ACTIVE on the server). So we do NOT terminate
+       * blindly. We ask the PUBLIC /devices/{id}/status endpoint (no JWT needed, so
+       * it answers even when our device JWT is being rejected):
+       *   - ACTIVE          -> reconnect in place (transient); stay online.
+       *   - non-ACTIVE      -> terminal (genuinely revoked; operator must re-enroll).
+       *   - unreachable/429  -> reconnect (inconclusive; a network blip shouldn't
+       *                         permanently kill a healthy agent — the WS is down too,
+       *                         so normal backoff handles it, and the war cap bounds
+       *                         thrash if the device really is dead).
+       *
+       * A rolling-window cap (REVOKE_RECOVERY_MAX self-heals per WINDOW_MS) gives up
+       * (terminal) on a repeating loop. Never clears credentials in any branch —
+       * re-enrollment, which SHOULD wipe creds, goes through setup --force /
+       * _forceReEnroll in start().
+       */
+      async _handleDeviceRevoked() {
+        const now = Date.now();
+        this._revokeRecoveries = this._revokeRecoveries.filter(
+          (t22) => now - t22 < _SecureChannel.REVOKE_RECOVERY_WINDOW_MS
+        );
+        if (this._revokeRecoveries.length >= _SecureChannel.REVOKE_RECOVERY_MAX) {
+          console.warn(
+            "[SecureChannel] device_revoked self-healed too many times in a short window \u2014 giving up (terminal)"
+          );
+          this._handleError(new Error("Device was revoked"));
+          return;
+        }
+        const deviceId = this._deviceId ?? this._persisted?.deviceId;
+        if (!deviceId) {
+          this._handleError(new Error("Device was revoked"));
+          return;
+        }
+        let reconnect;
+        try {
+          const status = await pollDeviceStatus(this.config.apiUrl, deviceId);
+          reconnect = status.rateLimited === true || status.status === "ACTIVE";
+          if (!reconnect) {
+            console.warn(
+              `[SecureChannel] device_revoked confirmed by server (status=${status.status}) \u2014 terminal`
+            );
+          }
+        } catch (err) {
+          console.warn(
+            "[SecureChannel] device_revoked status check failed; reconnecting (inconclusive):",
+            err
+          );
+          reconnect = true;
+        }
+        if (reconnect) {
+          this._revokeRecoveries.push(now);
+          console.log(
+            "[SecureChannel] device_revoked but device not confirmed dead \u2014 reconnecting (self-heal)"
+          );
+          this._scheduleReconnect();
+          return;
+        }
+        this._handleError(new Error("Device was revoked"));
+      }
       /**
        * Persist all ratchet session states to disk.
        * Syncs live ratchet states back into the persisted sessions map.
@@ -97028,7 +97176,7 @@ var init_index = __esm2({
     init_skill_invoker();
     await init_skill_telemetry();
     await init_policy_enforcer();
-    VERSION = true ? "0.23.0" : "0.0.0-dev";
+    VERSION = true ? "0.23.2" : "0.0.0-dev";
   }
 });
 await init_index();
@@ -132488,7 +132636,7 @@ var ArmingState = class {
 };
 
 // src/approve-cli.ts
-import { mkdirSync as mkdirSync2, writeFileSync, readFileSync as readFileSync3, readdirSync as readdirSync2, rmSync as rmSync2, existsSync as existsSync3 } from "node:fs";
+import { mkdirSync as mkdirSync2, writeFileSync, readFileSync as readFileSync4, readdirSync as readdirSync2, rmSync as rmSync2, existsSync as existsSync3 } from "node:fs";
 import { join as join6 } from "node:path";
 var APPROVALS_SUBDIR = "arm-approvals";
 var ID_RE = /^[A-Za-z0-9_-]{1,128}$/;
@@ -132521,7 +132669,7 @@ function drainApprovals(dataDir) {
     if (!ID_RE.test(name)) continue;
     let roomId = "";
     try {
-      roomId = readFileSync3(join6(dir, name), "utf8").trim();
+      roomId = readFileSync4(join6(dir, name), "utf8").trim();
     } catch {
     }
     out.push({ requestId: name, roomId: ID_RE.test(roomId) ? roomId : "" });
@@ -132770,7 +132918,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"
     );
   }
-  console.error(`[bridge] version: ${true ? "0.5.3" : "dev"}`);
+  console.error(`[bridge] version: ${true ? "0.5.5" : "dev"}`);
   console.error(`[bridge] data dir: ${cfg.dataDir} (${cfg.dataDirSource})`);
   if (cfg.worker) {
     console.error(`[bridge] WORKER MODE \u2014 workspace: ${cfg.workspaceDir} \xB7 permissions: ${cfg.permissionMode} \xB7 enclave dir fenced`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentvault/claude-bridge",
-  "version": "0.5.3",
+  "version": "0.5.5",
   "type": "module",
   "description": "AgentVault Claude Bridge — daemon for bridging a Claude agent into secure E2E-encrypted AgentVault 1:1 direct messages and rooms.",
   "main": "dist/index.js",