@haven_ai/connect 0.0.0-dev.202609211447.213b411 → 0.0.0-dev.202609231741.b88d644

package/README.md

@@ -159,7 +159,9 @@ minutes. Two rules follow:
    This replaces the directory's signer wrapper with a diagnostic that logs the
    retirement (agent id, date, reason, restart guidance) to the host's MCP
    stderr log on every probe, and records it in `TOMBSTONE.json` for
-   `--doctor`. It touches no key material and revokes nothing — revoke the
+   `--doctor` — with a copy in `~/.haven/tombstones/` (or `.tombstones/` inside
+   a custom credentials root), so the retirement stays visible after the
+   directory is deleted. It touches no key material and revokes nothing — revoke the
    agent on the Haven agent page yourself. Delete the tombstone only once every
    long-lived host has been restarted.
 

package/dist/cli.cjs

@@ -619,9 +619,9 @@ var init_runtime_manifest = __esm({
       mcpPackage: "@haven_ai/mcp",
       mcpVersion: mcp.MCP_VERSION,
       sdkPackage: "@haven_ai/sdk",
-      sdkVersion: "0.0.0-dev.202609211447.213b411",
+      sdkVersion: "0.0.0-dev.202609231741.b88d644",
       signerPackage: "@haven_ai/signer",
-      signerVersion: "0.0.0-dev.202609211447.213b411",
+      signerVersion: "0.0.0-dev.202609231741.b88d644",
       // Sourced from the SDK, never a literal (#1161). This field read '20.0.0'
       // while every package's `engines` said `>=24` and the docs said `>=24.0.0`,
       // so the guard that was supposed to enforce the floor waved Node v23 through
@@ -1590,7 +1590,7 @@ async function probeLocalSignerCredential(signerPath) {
   }
 }
 async function probeLocalMcpTools(command, args, requiredTools, timeoutMs = 1e4) {
-  return new Promise((resolve10) => {
+  return new Promise((resolve11) => {
     const child = child_process.spawn(command, args, { stdio: ["pipe", "pipe", "ignore"] });
     let stdout = "";
     let settled = false;
@@ -1602,7 +1602,7 @@ async function probeLocalMcpTools(command, args, requiredTools, timeoutMs = 1e4)
       settled = true;
       clearTimeout(timeout);
       child.kill();
-      resolve10(result);
+      resolve11(result);
     };
     const timeout = setTimeout(() => finish({ status: "timeout" }), timeoutMs);
     child.on("error", () => finish({ status: "process_error" }));
@@ -3000,16 +3000,28 @@ var init_runtime_install = __esm({
 // src/tombstone.ts
 var tombstone_exports = {};
 __export(tombstone_exports, {
+  ROOT_TOMBSTONES_DIRNAME: () => ROOT_TOMBSTONES_DIRNAME,
   TOMBSTONE_FILENAME: () => TOMBSTONE_FILENAME,
   TOMBSTONE_MARKER: () => TOMBSTONE_MARKER,
   defaultTombstonesDir: () => defaultTombstonesDir,
   readAgentTombstone: () => readAgentTombstone,
   readTombstoneRecords: () => readTombstoneRecords,
+  tombstonesDirForAgentDirectory: () => tombstonesDirForAgentDirectory,
+  tombstonesDirForCredentialRoot: () => tombstonesDirForCredentialRoot,
   writeAgentTombstone: () => writeAgentTombstone
 });
 function defaultTombstonesDir(baseDir) {
   return path.join(baseDir ?? path.join(os.homedir(), ".haven"), "tombstones");
 }
+function tombstonesDirForCredentialRoot(credentialRoot, homeDir = os.homedir()) {
+  if (!credentialRoot) return defaultTombstonesDir(path.join(homeDir, ".haven"));
+  const root = path.resolve(credentialRoot);
+  if (root === path.resolve(homeDir, ".haven", "agents")) return defaultTombstonesDir(path.join(homeDir, ".haven"));
+  return path.join(root, ROOT_TOMBSTONES_DIRNAME);
+}
+function tombstonesDirForAgentDirectory(directory, homeDir = os.homedir()) {
+  return tombstonesDirForCredentialRoot(path.dirname(path.resolve(directory)), homeDir);
+}
 async function readTombstoneRecords(tombstonesDir) {
   const root = tombstonesDir ?? defaultTombstonesDir();
   let entries = [];
@@ -3100,12 +3112,13 @@ async function readAgentTombstone(directory) {
     return null;
   }
 }
-var TOMBSTONE_FILENAME, MIRROR_MODE, TOMBSTONE_MARKER;
+var TOMBSTONE_FILENAME, ROOT_TOMBSTONES_DIRNAME, MIRROR_MODE, TOMBSTONE_MARKER;
 var init_tombstone = __esm({
   "src/tombstone.ts"() {
     init_redact();
     init_connect_error();
     TOMBSTONE_FILENAME = "TOMBSTONE.json";
+    ROOT_TOMBSTONES_DIRNAME = ".tombstones";
     MIRROR_MODE = 384;
     TOMBSTONE_MARKER = "HAVEN-TOMBSTONE";
   }
@@ -4330,7 +4343,8 @@ async function runDoctor(input, deps = {}) {
     if (retired.length > 0) parts.push(`tombstoned (keys removed): ${retired.join(", ")}`);
     if (unverifiable.length > 0) parts.push(`could not verify: ${unverifiable.join(", ")}`);
     const knownIds = new Set([...inventory].map((e) => e.agentId ?? path.basename(e.directory)));
-    const ghostRecords = (await readTombstoneRecords(path.join(homeDir, ".haven", "tombstones"))).filter(
+    const ledgerDir = input.credentialsDir ? tombstonesDirForAgentDirectory(input.credentialsDir, homeDir) : path.join(homeDir, ".haven", "tombstones");
+    const ghostRecords = (await readTombstoneRecords(ledgerDir)).filter(
       (rec) => !knownIds.has(rec.agent_id)
     );
     if (ghostRecords.length > 0) {
@@ -4828,9 +4842,10 @@ async function pathExists2(path) {
 
 // src/runtime.ts
 init_unwire();
+init_tombstone();
 init_local_mcp_runtime();
 init_runtime_manifest();
-var CONNECTOR_VERSION = "0.0.0-dev.202609211447.213b411";
+var CONNECTOR_VERSION = "0.0.0-dev.202609231741.b88d644";
 var CONNECT_OUTCOME_SCHEMA_VERSION = 1;
 var failureOutcomesByError = /* @__PURE__ */ new WeakMap();
 function failureOutcomeFor(runtimeHint, error) {
@@ -5132,7 +5147,10 @@ async function executeConnect(options, deps, trace) {
             directory: entry.directory,
             agentId: entry.agentId,
             reason: "replaced by a new setup (--replace)",
-            replacedBy: registration.agent_id
+            replacedBy: registration.agent_id,
+            // #3251: the ledger follows this run's credential root (default
+            // root → ~/.haven/tombstones, as before; any other → <root>/.tombstones).
+            tombstonesDir: tombstonesDirForCredentialRoot(options.credentialsDir)
           });
           await teardownLocalKeyMaterial(entry.directory, await readIdentityFile(entry.directory));
           await clearMcpServerBinding(entry.directory);
@@ -5459,7 +5477,7 @@ function describeWaitBound(timeoutMs) {
 async function waitForBudgetApproval(api, setupId, apiKey, log, options = {}) {
   const intervalMs = options.intervalMs ?? 5e3;
   const timeoutMs = options.timeoutMs ?? 18e4;
-  const sleep = options.sleep ?? ((ms) => new Promise((resolve10) => setTimeout(resolve10, ms)));
+  const sleep = options.sleep ?? ((ms) => new Promise((resolve11) => setTimeout(resolve11, ms)));
   const maxPolls = Math.max(1, Math.floor(timeoutMs / intervalMs));
   const remindEvery = Math.max(1, Math.floor(3e4 / intervalMs));
   let waitingAnnounced = false;
@@ -5932,7 +5950,7 @@ async function runCli(argv, io = {
     return 0;
   }
   if (parsed.tombstone) {
-    const { writeAgentTombstone: writeAgentTombstone2 } = await Promise.resolve().then(() => (init_tombstone(), tombstone_exports));
+    const { writeAgentTombstone: writeAgentTombstone2, tombstonesDirForAgentDirectory: tombstonesDirForAgentDirectory2 } = await Promise.resolve().then(() => (init_tombstone(), tombstone_exports));
     const { readFile: readFile15 } = await import('fs/promises');
     const { join: join13 } = await import('path');
     try {
@@ -5948,7 +5966,11 @@ async function runCli(argv, io = {
         directory: parsed.tombstone.directory,
         agentId,
         reason: parsed.tombstone.reason ?? "retired by operator via --tombstone",
-        replacedBy: parsed.tombstone.replacedBy
+        replacedBy: parsed.tombstone.replacedBy,
+        // #3251: the ledger of the root that holds the retired directory —
+        // ~/.haven/agents/<x> → ~/.haven/tombstones, exactly as before; a
+        // directory under any other root → <root>/.tombstones.
+        tombstonesDir: tombstonesDirForAgentDirectory2(parsed.tombstone.directory)
       });
       if (parsed.json) {
         io.stdout(`${redactSecrets(JSON.stringify({ tombstoned: true, ...info }))}
@@ -5977,6 +5999,7 @@ async function runCli(argv, io = {
   }
   if (parsed.unwire) {
     const { unwireAgent: unwireAgent2 } = await Promise.resolve().then(() => (init_unwire(), unwire_exports));
+    const { tombstonesDirForAgentDirectory: tombstonesDirForAgentDirectory2 } = await Promise.resolve().then(() => (init_tombstone(), tombstone_exports));
     const { homedir: homedir11 } = await import('os');
     const { join: join13 } = await import('path');
     const homeDir = homedir11();
@@ -5989,7 +6012,14 @@ async function runCli(argv, io = {
         reason: parsed.unwire.reason,
         replacedBy: parsed.unwire.replacedBy,
         destroyKeyMaterial: parsed.unwire.destroyKeyMaterial,
-        homeDir
+        homeDir,
+        // #3251: the ledger of the root that holds the directory being
+        // retired. Derived from the RESOLVED directory, not from
+        // --credentials-dir: `--unwire --credentials-dir <path>` names the agent
+        // directory itself, not a root. ~/.haven/agents/<slug> →
+        // ~/.haven/tombstones, exactly as before; any other root →
+        // <root>/.tombstones.
+        tombstonesDir: tombstonesDirForAgentDirectory2(directory, homeDir)
       });
       const failures = result.runtimes.filter((r) => r.status === "refused" || r.status === "unreadable");
       const retained = result.teardown.status === "retained";