@agentvault/claude-bridge 0.5.2 → 0.5.4

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";
   }
 });
 
@@ -332,7 +342,7 @@ var init_systemd = __esm({
 });
 
 // src/service/backend.ts
-import { execFileSync } from "node:child_process";
+import { spawnSync } from "node:child_process";
 import { mkdirSync as mkdirSync3, writeFileSync as writeFileSync2, rmSync as rmSync3, existsSync as existsSync4, chmodSync } from "node:fs";
 import { userInfo } from "node:os";
 function defaultDeps() {
@@ -341,13 +351,8 @@ function defaultDeps() {
     uid: userInfo().uid,
     user: userInfo().username,
     exec: (cmd, args) => {
-      try {
-        const stdout = execFileSync(cmd, args, { encoding: "utf8" });
-        return { code: 0, stdout };
-      } catch (e7) {
-        const err = e7;
-        return { code: err.status ?? 1, stdout: String(err.stdout ?? "") };
-      }
+      const r7 = spawnSync(cmd, args, { encoding: "utf8" });
+      return { code: r7.status ?? 1, stdout: r7.stdout ?? "" };
     },
     writeFile: (p2, d10) => writeFileSync2(p2, d10),
     mkdir: (p2) => mkdirSync3(p2, { recursive: true }),
@@ -64555,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;
@@ -64626,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;
@@ -64657,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`;
@@ -64895,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;
       }
@@ -66418,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");
         }
@@ -66498,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();
@@ -67122,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"));
+              this._handleDeviceRevoked();
               return;
             }
             if (data.event === "device_linked") {
@@ -67347,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,
@@ -70521,6 +70594,24 @@ ${messageText}`;
         this._setState("error");
         this.emit("error", err);
       }
+      /**
+       * Handle a WS `device_revoked` event. Surfaces a terminal error so
+       * attachLifecycle stops the channel — but does NOT delete credentials.
+       *
+       * This signal fires both for a genuine owner revoke AND for a transient
+       * session-takeover of a device that is still ACTIVE on the server (the error
+       * text even reads "or another session has taken over"). Deleting
+       * agentvault.json here — as this path used to via clearState() — strands a
+       * still-valid identity: the primary creds vanish, only the .bak survives, and
+       * the bridge's token-gate then demands a fresh invite token to restart.
+       * Keeping the creds means a restart reconnects via restoreState() when the
+       * device is still valid, and fails cleanly (device_revoked again, no data
+       * lost) when it isn't. Re-enrollment, which SHOULD wipe creds, goes through
+       * the explicit setup --force / _forceReEnroll path in start().
+       */
+      _handleDeviceRevoked() {
+        this._handleError(new Error("Device was revoked"));
+      }
       /**
        * Persist all ratchet session states to disk.
        * Syncs live ratchet states back into the persisted sessions map.
@@ -132493,7 +132584,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}$/;
@@ -132526,7 +132617,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 : "" });
@@ -132775,7 +132866,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.2" : "dev"}`);
+  console.error(`[bridge] version: ${true ? "0.5.4" : "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.2",
+  "version": "0.5.4",
   "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",