herdr-plugin-amq 0.1.3 → 0.1.5

package/herdr-plugin.toml

@@ -1,6 +1,6 @@
 id = "cabra.amq"
 name = "Herdr AMQ"
-version = "0.1.3"
+version = "0.1.5"
 min_herdr_version = "0.7.0"
 description = "Agent Message Queue (AMQ) bridge daemon, mailbox monitor, and dashboard for Herdr"
 platforms = ["linux", "macos"]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "herdr-plugin-amq",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "Herdr plugin for AMQ (Agent Message Queue) autonomous bridge, status monitoring, and AGmail dashboard",
   "type": "module",
   "main": "src/index.mjs",

package/src/blobs.mjs

@@ -159,22 +159,97 @@ export function getBlob(sha256, amqRoot) {
 
 // ─── Option B: Git Commit & Object Pinning ────────────────────────────────────
 
+const gitRefCache = new Map();
+const headCommitCache = new Map();
+const timestampCommitCache = new Map();
+
+export function clearGitRefCache() {
+  gitRefCache.clear();
+  headCommitCache.clear();
+  timestampCommitCache.clear();
+}
+
 /**
- * Pin a repository file to a specific commit or HEAD.
- * Returns immutable git ref descriptor.
+ * Resolve the git commit active before or at a given ISO timestamp.
  */
-export function pinGitRef(repoRoot, relativePath, commit = "HEAD") {
-  if (!repoRoot || !relativePath) return null;
+export function getCommitAtTimestamp(repoRoot, timestamp) {
+  if (!repoRoot || !timestamp) return null;
+  const iso = typeof timestamp === "string" ? timestamp.trim() : new Date(timestamp).toISOString();
+  const cacheKey = `${repoRoot}:${iso}`;
+  if (timestampCommitCache.has(cacheKey)) {
+    return timestampCommitCache.get(cacheKey);
+  }
 
   try {
-    const cleanRel = relativePath.replace(/^[/\\]+/, "");
-    // Resolve commit SHA
-    const commitSha = execFileSync("git", ["rev-parse", commit], {
+    const commit = execFileSync("git", ["rev-list", "-n", "1", `--before=${iso}`, "HEAD"], {
       cwd: repoRoot,
       encoding: "utf8",
       stdio: ["ignore", "pipe", "ignore"],
     }).trim();
 
+    const result = commit && /^[a-f0-9]{7,40}$/i.test(commit) ? commit : null;
+    timestampCommitCache.set(cacheKey, result);
+    return result;
+  } catch {
+    timestampCommitCache.set(cacheKey, null);
+    return null;
+  }
+}
+
+/**
+ * Extract commit hashes explicitly mentioned in message text.
+ */
+export function extractMentionedCommits(text = "") {
+  if (!text || typeof text !== "string") return [];
+  const commits = [];
+  const regex = /\b(?:commit|commitado|commitada|fixado|merge|sha|rev)?[:\s*`"'(]*([0-9a-f]{7,40})\b/gi;
+  let match;
+  while ((match = regex.exec(text)) !== null) {
+    const hex = match[1].toLowerCase();
+    if (/^[0-9]+$/.test(hex) && hex.length < 40) continue;
+    if (!commits.includes(hex)) {
+      commits.push(hex);
+    }
+  }
+  return commits;
+}
+
+/**
+ * Pin a repository file to a specific commit or HEAD.
+ * Returns immutable git ref descriptor.
+ */
+export function pinGitRef(repoRoot, relativePath, commit = "HEAD") {
+  if (!repoRoot || !relativePath) return null;
+
+  const cleanRel = relativePath.replace(/^[/\\]+/, "");
+  const cacheKey = `${repoRoot}:${commit}:${cleanRel}`;
+  if (gitRefCache.has(cacheKey)) {
+    return gitRefCache.get(cacheKey);
+  }
+
+  try {
+    let commitSha;
+    if (commit === "HEAD") {
+      const cachedHead = headCommitCache.get(repoRoot);
+      const now = Date.now();
+      if (cachedHead && now - cachedHead.at < 5000) {
+        commitSha = cachedHead.sha;
+      } else {
+        commitSha = execFileSync("git", ["rev-parse", "HEAD"], {
+          cwd: repoRoot,
+          encoding: "utf8",
+          stdio: ["ignore", "pipe", "ignore"],
+        }).trim();
+        headCommitCache.set(repoRoot, { sha: commitSha, at: now });
+      }
+    } else {
+      commitSha = execFileSync("git", ["rev-parse", commit], {
+        cwd: repoRoot,
+        encoding: "utf8",
+        stdio: ["ignore", "pipe", "ignore"],
+      }).trim();
+    }
+
     // Resolve git blob hash
     const blobSha = execFileSync("git", ["rev-parse", `${commitSha}:${cleanRel}`], {
       cwd: repoRoot,
@@ -194,7 +269,7 @@ export function pinGitRef(repoRoot, relativePath, commit = "HEAD") {
     const isImage = [".png", ".jpg", ".jpeg", ".gif", ".webp", ".svg", ".bmp"].includes(ext);
     const isLog = [".log", ".txt", ".csv", ".json", ".out", ".diff", ".patch"].includes(ext);
 
-    return {
+    const ref = {
       type: "git",
       commit: commitSha,
       shortCommit: commitSha.slice(0, 10),
@@ -209,7 +284,10 @@ export function pinGitRef(repoRoot, relativePath, commit = "HEAD") {
       exists: true,
       url: `/api/git-file?commit=${commitSha}&path=${encodeURIComponent(cleanRel)}`,
     };
+    gitRefCache.set(cacheKey, ref);
+    return ref;
   } catch {
+    gitRefCache.set(cacheKey, null);
     return null;
   }
 }
@@ -259,7 +337,7 @@ export function readGitRef(repoRoot, commitSha, relativePath) {
  * - Committed files in repoRoot can be pinned to git HEAD.
  * - Already pinned/stored items retain their immutable URLs.
  */
-export function ingestAttachment(candidate, amqRoot, repoRoot) {
+export function ingestAttachment(candidate, amqRoot, repoRoot, { timestamp = null, text = "" } = {}) {
   if (!candidate) return null;
 
   // Already a structured descriptor
@@ -285,7 +363,7 @@ export function ingestAttachment(candidate, amqRoot, repoRoot) {
     }
 
     if (candidate.path) {
-      return ingestAttachment(candidate.path, amqRoot, repoRoot);
+      return ingestAttachment(candidate.path, amqRoot, repoRoot, { timestamp, text });
     }
   }
 
@@ -332,16 +410,47 @@ export function ingestAttachment(candidate, amqRoot, repoRoot) {
         return storeBlob(diskPath, amqRoot, path.basename(diskPath));
       }
 
-      // If it's inside repoRoot and git is present, try pinning to git
+      // If it's inside repoRoot and git is present, pin to commit at timestamp (or HEAD)
       if (repoRoot && diskPath.startsWith(repoRoot)) {
         const rel = path.relative(repoRoot, diskPath);
-        const gitRef = pinGitRef(repoRoot, rel, "HEAD");
+        const commit = (timestamp ? getCommitAtTimestamp(repoRoot, timestamp) : null) || "HEAD";
+        const gitRef = pinGitRef(repoRoot, rel, commit);
         if (gitRef) return gitRef;
       }
 
       // Default fallback for existing files: store into blobstore for guarantee
       return storeBlob(diskPath, amqRoot, path.basename(diskPath));
     }
+
+    // ─── Historical Git Pinning Fallback ───
+    // If the file does not exist on disk right now (e.g. deleted or renamed in subsequent commits),
+    // check if it existed in Git at the time the message was created or at a commit mentioned in the message!
+    if (!diskPath && repoRoot) {
+      const cleanRel = raw.startsWith(repoRoot) ? path.relative(repoRoot, raw) : raw.replace(/^[/\\]+/, "");
+      if (!cleanRel.includes("..") && !path.isAbsolute(cleanRel)) {
+        const candidateCommits = [];
+        if (text) {
+          candidateCommits.push(...extractMentionedCommits(text));
+        }
+        if (timestamp) {
+          const atTime = getCommitAtTimestamp(repoRoot, timestamp);
+          if (atTime && !candidateCommits.includes(atTime)) {
+            candidateCommits.push(atTime);
+          }
+        }
+        candidateCommits.push("HEAD");
+
+        for (const commitSha of candidateCommits) {
+          const gitRef = pinGitRef(repoRoot, cleanRel, commitSha);
+          if (gitRef && gitRef.exists) {
+            return {
+              ...gitRef,
+              pinnedAt: timestamp || null,
+            };
+          }
+        }
+      }
+    }
   }
 
   return null;

package/src/panes.mjs

@@ -18,11 +18,15 @@ export function launchDashboardPane() {
   const port = parseInt(process.env.AGMAIL_PORT || "8505", 10);
   const server = startWebServer({ port, amqRoot });
 
-  // Open browser in background if xdg-open exists
-  try {
-    const opener = process.platform === "darwin" ? "open" : "xdg-open";
-    spawn(opener, [`http://localhost:${port}`], { stdio: "ignore", detached: true }).unref();
-  } catch {}
+  // Open browser in background if display is available and not disabled
+  if (process.env.NO_OPEN !== "1" && process.env.DISPLAY) {
+    server.once("listening", () => {
+      try {
+        const opener = process.platform === "darwin" ? "open" : "xdg-open";
+        spawn(opener, [`http://127.0.0.1:${port}`], { stdio: "ignore", detached: true }).unref();
+      } catch {}
+    });
+  }
 
   console.log("\nPress Ctrl+C to stop the dashboard server.");
 }

package/src/server.mjs

@@ -180,7 +180,7 @@ export function startWebServer({
 
 
 
-  const server = http.createServer(async (req, res) => {
+  const requestHandler = async (req, res) => {
     // ─── Compliance: Strict Security Headers ───────────────────────────────
     res.setHeader("X-Content-Type-Options", "nosniff");
     res.setHeader("X-Frame-Options", "DENY");
@@ -191,12 +191,18 @@ export function startWebServer({
     res.setHeader("Referrer-Policy", "no-referrer");
 
     // ─── Compliance: Host Header & DNS Rebinding Protection ───────────────
-    const rawHost = req.headers.host || "";
-    const hostHeader = rawHost.split(":")[0].toLowerCase();
+    const rawHost = (req.headers.host || "").toLowerCase().trim();
+    let hostHeader = rawHost;
+    if (hostHeader.startsWith("[")) {
+      const closeBracket = hostHeader.indexOf("]");
+      hostHeader = closeBracket !== -1 ? hostHeader.slice(1, closeBracket) : hostHeader;
+    } else {
+      hostHeader = hostHeader.split(":")[0];
+    }
+
     const isLocalHost =
       hostHeader === "localhost" ||
       hostHeader === "127.0.0.1" ||
-      hostHeader === "[::1]" ||
       hostHeader === "::1" ||
       !rawHost; // In-memory or direct tests without host header
 
@@ -718,24 +724,60 @@ export function startWebServer({
       res.writeHead(404, { "Content-Type": "text/plain" });
       res.end("File not found");
     }
-  });
+  };
+
+  const server = http.createServer(requestHandler);
+  let server6 = null;
 
   server.listen(port, host, () => {
-    console.log(`\x1b[32m● AGmail Webmail Server running at:\x1b[0m \x1b[1mhttp://${host}:${port}\x1b[0m (local only)`);
+    const boundPort = server.address()?.port || port;
+    console.log(`\x1b[32m● AGmail Webmail Server running at:\x1b[0m \x1b[1mhttp://${host}:${boundPort}\x1b[0m (local only)`);
     console.log(`  Queue Root: \x1b[36m${amqRoot}\x1b[0m`);
     if (host !== "127.0.0.1" && host !== "localhost") {
       console.warn(`\x1b[33m⚠️  SECURITY WARNING: Server is listening on '${host}'. AGmail contains sensitive agent data and should strictly be local-only!\x1b[0m`);
     }
-    // Workspaces are the default: automatically isolate agents in worktrees silently
-    try {
-      const repoRoot = getRepoRootFromAmq(amqRoot);
-      const handles = getAgentHandles(amqRoot);
-      ensureAllWorktrees(repoRoot, handles);
-    } catch {}
+
+    // If host is loopback, also listen on ::1 so browser 'localhost' connects seamlessly in IPv6-first browsers (Firefox/Chrome)
+    if (host === "127.0.0.1" || host === "localhost") {
+      try {
+        server6 = http.createServer(requestHandler);
+        server6.listen(boundPort, "::1", () => {});
+        server6.on("error", () => {
+          // Graceful fallback if system does not support IPv6 loopback
+          server6 = null;
+        });
+      } catch {}
+    }
+
+    // Workspaces are the default: automatically isolate agents in worktrees in background
+    setImmediate(() => {
+      try {
+        const repoRoot = getRepoRootFromAmq(amqRoot);
+        const handles = getAgentHandles(amqRoot);
+        ensureAllWorktrees(repoRoot, handles);
+      } catch {}
+    });
   });
 
+  const originalCloseAll = server.closeAllConnections?.bind(server);
+  server.closeAllConnections = function () {
+    if (originalCloseAll) originalCloseAll();
+    if (server6 && typeof server6.closeAllConnections === "function") {
+      try { server6.closeAllConnections(); } catch {}
+    }
+  };
+
   server.on("close", () => {
     isClosing = true;
+    if (server6) {
+      try {
+        if (typeof server6.closeAllConnections === "function") {
+          server6.closeAllConnections();
+        }
+        server6.close();
+      } catch {}
+      server6 = null;
+    }
     if (herdrReconnectTimeout) clearTimeout(herdrReconnectTimeout);
     if (watchDebounce) clearTimeout(watchDebounce);
     if (herdrSubscription) {

package/src/store.mjs

@@ -34,30 +34,6 @@ export function formatAgentTitle(handle = "") {
 const filePathCache = new Map();
 let cacheTimestamp = 0;
 
-function findInTree(dir, targetName) {
-  const skip = new Set([".git", ".godot", "node_modules", ".agent-mail", "dist", "build"]);
-  const queue = [dir];
-  while (queue.length > 0) {
-    const current = queue.shift();
-    let entries;
-    try {
-      entries = fs.readdirSync(current, { withFileTypes: true });
-    } catch {
-      continue;
-    }
-    for (const ent of entries) {
-      if (ent.isDirectory()) {
-        if (!skip.has(ent.name)) {
-          queue.push(path.join(current, ent.name));
-        }
-      } else if (ent.name === targetName) {
-        return path.join(current, ent.name);
-      }
-    }
-  }
-  return null;
-}
-
 export function formatFileSize(bytes) {
   if (!bytes || bytes <= 0) return "0 B";
   if (bytes < 1024) return `${bytes} B`;
@@ -178,14 +154,7 @@ export function resolveAttachmentPath(ref, amqRoot) {
     if (candidate) return candidate;
   }
 
-  // 6. Fast tree walk in repoRoot for the basename
-  const found = findInTree(repoRoot, base);
-  if (found) {
-    const resolved = path.resolve(found);
-    filePathCache.set(cacheKey, resolved);
-    return resolved;
-  }
-
+  // 6. Not found in standard locations: cache null
   filePathCache.set(cacheKey, null);
   return null;
 }
@@ -194,7 +163,7 @@ export function resolveAttachmentPath(ref, amqRoot) {
  * Extract attachments and referenced images/logs from body or frontmatter,
  * verifying presence on disk and providing existence flags.
  */
-export function extractAttachments(body = "", metaAttachments = [], amqRoot = null) {
+export function extractAttachments(body = "", metaAttachments = [], amqRoot = null, meta = {}) {
   const attachments = [];
   const seen = new Set();
   const repoRoot = getRepoRootFromAmq(amqRoot);
@@ -215,10 +184,13 @@ export function extractAttachments(body = "", metaAttachments = [], amqRoot = nu
       return;
     }
 
-    // 1. Try hybrid CAS ingestion / Git pinning (Option A + B)
+    // 1. Try hybrid CAS ingestion / Git pinning (Option A + B) with timestamp
     if (amqRoot) {
       try {
-        const ingested = ingestAttachment(rawRef, amqRoot, repoRoot);
+        const ingested = ingestAttachment(rawRef, amqRoot, repoRoot, {
+          timestamp: meta?.created || null,
+          text: body,
+        });
         if (ingested && ingested.exists) {
           attachments.push({
             ...ingested,
@@ -264,8 +236,8 @@ export function extractAttachments(body = "", metaAttachments = [], amqRoot = nu
     }
   }
 
-  // Auto-scan body for referenced files (/tmp/..., /nix/..., or relative paths)
-  const regex = /(?:(?:\/(?:tmp|home|nix)[\w./-]+)|(?:[\w./-]+))\.(?:png|jpg|jpeg|gif|webp|svg|bmp|log|txt|csv|json|diff|patch|out|gd|tres|tscn|sh|md)\b/gi;
+  // Auto-scan body for referenced files (/tmp/..., paths with slashes, or image/log basenames)
+  const regex = /(?:(?:(?:\/|\.\/|[a-zA-Z0-9_.-]+\/)[a-zA-Z0-9_./-]+\.(?:png|jpg|jpeg|gif|webp|svg|bmp|log|txt|csv|json|diff|patch|out|gd|tres|tscn|sh|md))|(?:\b[a-zA-Z0-9_.-]+\.(?:png|jpg|jpeg|gif|webp|svg|bmp|log|diff|patch|out)\b))/gi;
   const matches = body.match(regex) || [];
 
   for (const m of matches) {
@@ -425,7 +397,7 @@ export function parseMessageFile(filePath, amqRoot = null) {
     if (isOutbox) folder = "sent";
 
     const root = amqRoot || (filePath.includes("/agents/") ? filePath.split(path.sep + "agents" + path.sep)[0] : null);
-    const attachments = extractAttachments(body, meta.attachments, root);
+    const attachments = extractAttachments(body, meta.attachments, root, meta);
     const hasImage = attachments.some((a) => a.isImage);
     const hasAttachment = attachments.length > 0;