@chrysb/alphaclaw 0.5.5 → 0.5.7-beta.0

package/lib/server/topic-registry.js

@@ -2,6 +2,14 @@ const fs = require("fs");
 const { WORKSPACE_DIR } = require("./constants");
 
 const kRegistryPath = `${WORKSPACE_DIR}/topic-registry.json`;
+const kDefaultAccountId = "default";
+const kDefaultAgentId = "default";
+
+const normalizeAccountId = (value) =>
+  String(value || "").trim() || kDefaultAccountId;
+
+const normalizeGroupAgentId = (value) =>
+  String(value || "").trim() || kDefaultAgentId;
 
 const readRegistry = () => {
   try {
@@ -36,6 +44,20 @@ const setGroup = (groupId, groupData) => {
   return registry;
 };
 
+const getGroupsForAccount = (accountId) => {
+  const registry = readRegistry();
+  const normalizedAccountId = normalizeAccountId(accountId);
+  const groups = registry.groups && typeof registry.groups === "object"
+    ? registry.groups
+    : {};
+  return Object.fromEntries(
+    Object.entries(groups).filter(([, group]) => {
+      const groupAccountId = normalizeAccountId(group?.accountId);
+      return groupAccountId === normalizedAccountId;
+    }),
+  );
+};
+
 const addTopic = (groupId, threadId, topicData) => {
   const registry = readRegistry();
   if (!registry.groups[groupId]) {
@@ -90,21 +112,56 @@ const getTotalTopicCount = () => {
   return count;
 };
 
-// Render the topic registry as a markdown section for TOOLS.md
-const renderTopicRegistryMarkdown = ({ includeSyncGuidance = false } = {}) => {
+const getTopicsForAgent = (agentId) => {
   const registry = readRegistry();
+  const groups = registry.groups && typeof registry.groups === "object"
+    ? registry.groups
+    : {};
+  const normalizedAgentId = normalizeGroupAgentId(agentId);
   const rows = [];
-  for (const [groupId, group] of Object.entries(registry.groups)) {
-    for (const [threadId, topic] of Object.entries(group.topics || {})) {
+  for (const [groupId, group] of Object.entries(groups)) {
+    const groupAgentId = normalizeGroupAgentId(group?.agentId);
+    const groupName = String(group?.name || "").trim() || groupId;
+    const topics = group?.topics && typeof group.topics === "object"
+      ? group.topics
+      : {};
+    const isGroupOwner = groupAgentId === normalizedAgentId;
+    for (const [threadId, topic] of Object.entries(topics)) {
+      const topicAgentId = String(topic?.agentId || "").trim();
+      if (!isGroupOwner && topicAgentId !== normalizedAgentId) continue;
       rows.push({
-        groupName: group.name || groupId,
+        groupName,
         groupId,
-        topicName: topic.name,
+        topicName: topic?.name,
         threadId,
+        groupAgentId,
+        topicAgentId,
       });
     }
   }
-  if (rows.length === 0 && !includeSyncGuidance) return "";
+  return rows;
+};
+
+// Render the topic registry as a markdown section for TOOLS.md
+const renderTopicRegistryMarkdown = ({
+  includeSyncGuidance = false,
+  agentId = "",
+} = {}) => {
+  const registry = readRegistry();
+  const groups = registry.groups && typeof registry.groups === "object"
+    ? registry.groups
+    : {};
+  const normalizedAgentId = String(agentId || "").trim();
+  const rows = normalizedAgentId
+    ? getTopicsForAgent(normalizedAgentId)
+    : Object.entries(groups).flatMap(([groupId, group]) =>
+      Object.entries(group.topics || {}).map(([threadId, topic]) => ({
+        groupName: group.name || groupId,
+        groupId,
+        topicName: topic.name,
+        threadId,
+      })));
+  if (rows.length === 0) return "";
 
   const lines = [
     "",
@@ -144,9 +201,11 @@ module.exports = {
   writeRegistry,
   getGroup,
   setGroup,
+  getGroupsForAccount,
   addTopic,
   updateTopic,
   removeTopic,
   getTotalTopicCount,
+  getTopicsForAgent,
   renderTopicRegistryMarkdown,
 };

package/lib/server/watchdog.js

@@ -12,10 +12,15 @@ const kBootstrapHealthCheckMs = 5 * 1000;
 const kExpectedRestartWindowMs = 15 * 1000;
 
 const isTruthy = (value) =>
-  ["1", "true", "yes", "on"].includes(String(value || "").trim().toLowerCase());
+  ["1", "true", "yes", "on"].includes(
+    String(value || "")
+      .trim()
+      .toLowerCase(),
+  );
 
 const parseHealthResult = (result) => {
-  if (!result?.ok) return { ok: false, reason: result?.stderr || "health command failed" };
+  if (!result?.ok)
+    return { ok: false, reason: result?.stderr || "health command failed" };
   const raw = String(result.stdout || "").trim();
   if (!raw) return { ok: true };
   try {
@@ -39,6 +44,18 @@ const parseHealthResult = (result) => {
   }
   return { ok: true };
 };
+const isDuplicateGatewayLaunchExit = ({ code, stderrTail = [] } = {}) => {
+  if (code !== 1) return false;
+  const stderrText = (Array.isArray(stderrTail) ? stderrTail : [])
+    .map((entry) => String(entry || ""))
+    .join("\n")
+    .toLowerCase();
+  if (!stderrText) return false;
+  return (
+    stderrText.includes("another gateway instance is already listening") ||
+    (stderrText.includes("port") && stderrText.includes("already in use"))
+  );
+};
 
 const createWatchdog = ({
   clawCmd,
@@ -58,7 +75,9 @@ const createWatchdog = ({
     repairAttempts: 0,
     crashTimestamps: [],
     autoRepair: isTruthy(process.env.WATCHDOG_AUTO_REPAIR),
-    notificationsDisabled: isTruthy(process.env.WATCHDOG_NOTIFICATIONS_DISABLED),
+    notificationsDisabled: isTruthy(
+      process.env.WATCHDOG_NOTIFICATIONS_DISABLED,
+    ),
     operationInProgress: false,
     gatewayStartedAt: null,
     gatewayPid: null,
@@ -92,7 +111,8 @@ const createWatchdog = ({
         scheduleDegradedHealthCheck();
       }
     }, kWatchdogDegradedCheckIntervalMs);
-    if (typeof degradedHealthTimer.unref === "function") degradedHealthTimer.unref();
+    if (typeof degradedHealthTimer.unref === "function")
+      degradedHealthTimer.unref();
   };
 
   const clearExpectedRestartWindow = () => {
@@ -101,7 +121,10 @@ const createWatchdog = ({
   };
 
   const markExpectedRestartWindow = (durationMs = kExpectedRestartWindowMs) => {
-    const safeDuration = Math.max(5000, Number(durationMs) || kExpectedRestartWindowMs);
+    const safeDuration = Math.max(
+      5000,
+      Number(durationMs) || kExpectedRestartWindowMs,
+    );
     state.expectedRestartInProgress = true;
     state.expectedRestartUntilMs = Date.now() + safeDuration;
   };
@@ -142,13 +165,21 @@ const createWatchdog = ({
 
   const trimCrashWindow = () => {
     const threshold = Date.now() - kWatchdogCrashLoopWindowMs;
-    state.crashTimestamps = state.crashTimestamps.filter((ts) => ts >= threshold);
+    state.crashTimestamps = state.crashTimestamps.filter(
+      (ts) => ts >= threshold,
+    );
   };
 
   const createCorrelationId = () =>
     `${Date.now()}-${Math.random().toString(36).slice(2, 10)}`;
 
-  const logEvent = (eventType, source, status, details = null, correlationId = "") => {
+  const logEvent = (
+    eventType,
+    source,
+    status,
+    details = null,
+    correlationId = "",
+  ) => {
     try {
       insertWatchdogEvent({
         eventType,
@@ -168,16 +199,25 @@ const createWatchdog = ({
     }
     if (!notifier?.notify) return { ok: false, reason: "notifier_unavailable" };
     const result = await notifier.notify(message);
-    logEvent("notification", "watchdog", result.ok ? "ok" : "failed", result, correlationId);
+    logEvent(
+      "notification",
+      "watchdog",
+      result.ok ? "ok" : "failed",
+      result,
+      correlationId,
+    );
     return result;
   };
 
   const getWatchdogSetupUrl = () => {
     try {
       const base =
-        typeof resolveSetupUrl === "function" ? String(resolveSetupUrl() || "") : "";
+        typeof resolveSetupUrl === "function"
+          ? String(resolveSetupUrl() || "")
+          : "";
       if (base) return `${base.replace(/\/+$/, "")}/#/watchdog`;
-      const fallbackPort = Number.parseInt(String(process.env.PORT || "3000"), 10) || 3000;
+      const fallbackPort =
+        Number.parseInt(String(process.env.PORT || "3000"), 10) || 3000;
       return `http://localhost:${fallbackPort}/#/watchdog`;
     } catch {
       return "";
@@ -190,7 +230,8 @@ const createWatchdog = ({
     return `${line} - [View logs](${setupUrl})`;
   };
 
-  const asInlineCode = (value) => `\`${String(value || "").replace(/`/g, "")}\``;
+  const asInlineCode = (value) =>
+    `\`${String(value || "").replace(/`/g, "")}\``;
 
   const notifyAutoRepairOutcome = async ({
     source,
@@ -225,11 +266,15 @@ const createWatchdog = ({
     const hasAutoRepair = typeof autoRepair === "boolean";
     const hasNotificationsEnabled = typeof notificationsEnabled === "boolean";
     if (!hasAutoRepair && !hasNotificationsEnabled) {
-      throw new Error("Expected autoRepair and/or notificationsEnabled boolean");
+      throw new Error(
+        "Expected autoRepair and/or notificationsEnabled boolean",
+      );
     }
     const envVars = readEnvFile();
     if (hasAutoRepair) {
-      const existingIdx = envVars.findIndex((item) => item.key === "WATCHDOG_AUTO_REPAIR");
+      const existingIdx = envVars.findIndex(
+        (item) => item.key === "WATCHDOG_AUTO_REPAIR",
+      );
       const nextValue = autoRepair ? "true" : "false";
       if (existingIdx >= 0) {
         envVars[existingIdx] = { ...envVars[existingIdx], value: nextValue };
@@ -254,7 +299,9 @@ const createWatchdog = ({
     writeEnvFile(envVars);
     reloadEnv();
     state.autoRepair = isTruthy(process.env.WATCHDOG_AUTO_REPAIR);
-    state.notificationsDisabled = isTruthy(process.env.WATCHDOG_NOTIFICATIONS_DISABLED);
+    state.notificationsDisabled = isTruthy(
+      process.env.WATCHDOG_NOTIFICATIONS_DISABLED,
+    );
     return getSettings();
   };
 
@@ -277,7 +324,13 @@ const createWatchdog = ({
           const child = launchGatewayProcess();
           launchedGateway = !!child;
           if (launchedGateway) {
-            logEvent("restart", "repair", "ok", { pid: child.pid }, correlationId);
+            logEvent(
+              "restart",
+              "repair",
+              "ok",
+              { pid: child.pid },
+              correlationId,
+            );
           } else {
             logEvent(
               "restart",
@@ -288,7 +341,13 @@ const createWatchdog = ({
             );
           }
         } catch (err) {
-          logEvent("restart", "repair", "failed", { error: err.message }, correlationId);
+          logEvent(
+            "restart",
+            "repair",
+            "failed",
+            { error: err.message },
+            correlationId,
+          );
         }
         state.health = "unknown";
         state.lifecycle = "running";
@@ -344,7 +403,10 @@ const createWatchdog = ({
     source = "health_timer",
     allowAutoRepair = true,
   } = {}) => {
-    if (state.expectedRestartInProgress && Date.now() >= state.expectedRestartUntilMs) {
+    if (
+      state.expectedRestartInProgress &&
+      Date.now() >= state.expectedRestartUntilMs
+    ) {
       clearExpectedRestartWindow();
     }
     if (state.operationInProgress && !allowDuringOperation) return false;
@@ -358,7 +420,8 @@ const createWatchdog = ({
       state.gatewayStartedAt != null &&
       state.gatewayStartedAt !== gatewayStartedAtAtStart;
     const restartWindowActive =
-      state.expectedRestartInProgress && Date.now() < state.expectedRestartUntilMs;
+      state.expectedRestartInProgress &&
+      Date.now() < state.expectedRestartUntilMs;
     if (staleAfterRestart) {
       return false;
     }
@@ -370,7 +433,8 @@ const createWatchdog = ({
       clearExpectedRestartWindow();
       state.health = "healthy";
       state.lifecycle = "running";
-      if (!state.uptimeStartedAt || wasUnhealthy) state.uptimeStartedAt = Date.now();
+      if (!state.uptimeStartedAt || wasUnhealthy)
+        state.uptimeStartedAt = Date.now();
       state.repairAttempts = 0;
       state.crashRecoveryActive = false;
       if (recoveredFromCrashLoop) {
@@ -384,6 +448,13 @@ const createWatchdog = ({
           },
           correlationId,
         );
+        await notify(
+          [
+            "🐺 *AlphaClaw Watchdog*",
+            withViewLogsSuffix("🟢 Gateway healthy again"),
+          ].join("\n"),
+          correlationId,
+        );
       }
       if (state.pendingRecoveryNoticeSource) {
         const recoverySource = state.pendingRecoveryNoticeSource;
@@ -392,12 +463,17 @@ const createWatchdog = ({
           [
             "🐺 *AlphaClaw Watchdog*",
             withViewLogsSuffix("🟢 Gateway healthy again"),
-            `Trigger: ${asInlineCode(recoverySource)}`,
           ].join("\n"),
           correlationId,
         );
       }
-      logEvent("health_check", source, "ok", parsed.details || result, correlationId);
+      logEvent(
+        "health_check",
+        source,
+        "ok",
+        parsed.details || result,
+        correlationId,
+      );
       return true;
     }
     if (restartWindowActive) {
@@ -445,7 +521,10 @@ const createWatchdog = ({
 
     if (state.health === "unknown" && state.lifecycle === "running") {
       state.startupConsecutiveHealthFailures += 1;
-      if (state.startupConsecutiveHealthFailures < kWatchdogStartupFailureThreshold) {
+      if (
+        state.startupConsecutiveHealthFailures <
+        kWatchdogStartupFailureThreshold
+      ) {
         logEvent(
           "health_check",
           source,
@@ -486,7 +565,13 @@ const createWatchdog = ({
     try {
       const child = launchGatewayProcess();
       if (child) {
-        logEvent("restart", "exit_event", "ok", { pid: child.pid }, correlationId);
+        logEvent(
+          "restart",
+          "exit_event",
+          "ok",
+          { pid: child.pid },
+          correlationId,
+        );
       } else {
         logEvent(
           "restart",
@@ -497,18 +582,30 @@ const createWatchdog = ({
         );
       }
     } catch (err) {
-      logEvent("restart", "exit_event", "failed", { error: err.message }, correlationId);
+      logEvent(
+        "restart",
+        "exit_event",
+        "failed",
+        { error: err.message },
+        correlationId,
+      );
     } finally {
       state.operationInProgress = false;
     }
   };
 
-  const onGatewayExit = ({ code, signal, expectedExit = false, stderrTail = [] } = {}) => {
+  const onGatewayExit = ({
+    code,
+    signal,
+    expectedExit = false,
+    stderrTail = [],
+  } = {}) => {
     const correlationId = createCorrelationId();
     clearDegradedHealthCheckTimer();
     if (expectedExit && (code == null || code === 0)) {
       state.lifecycle = "restarting";
       state.health = "unknown";
+      state.uptimeStartedAt = null;
       state.crashRecoveryActive = false;
       markExpectedRestartWindow();
       startBootstrapHealthChecks();
@@ -521,9 +618,33 @@ const createWatchdog = ({
       );
       return;
     }
+    if (isDuplicateGatewayLaunchExit({ code, stderrTail })) {
+      state.lifecycle = "running";
+      state.health = "unknown";
+      state.crashRecoveryActive = false;
+      state.startupConsecutiveHealthFailures = 0;
+      if (!state.uptimeStartedAt) {
+        state.uptimeStartedAt = Date.now();
+      }
+      startBootstrapHealthChecks();
+      logEvent(
+        "restart",
+        "exit_event",
+        "ok",
+        {
+          duplicateLaunch: true,
+          code: code ?? null,
+          signal: signal ?? null,
+          stderrTail,
+        },
+        correlationId,
+      );
+      return;
+    }
 
     state.lifecycle = "crashed";
     state.health = "unhealthy";
+    state.uptimeStartedAt = null;
     state.crashRecoveryActive = true;
     state.crashTimestamps.push(Date.now());
     trimCrashWindow();
@@ -557,7 +678,9 @@ const createWatchdog = ({
           ),
           `Crashes: ${state.crashTimestamps.length} in the last ${Math.floor(kWatchdogCrashLoopWindowMs / 1000)}s`,
           `Last exit code: ${code ?? "unknown"}`,
-          ...(state.autoRepair ? [] : ["Auto-restart paused; manual action required."]),
+          ...(state.autoRepair
+            ? []
+            : ["Auto-restart paused; manual action required."]),
         ].join("\n"),
         correlationId,
       );
@@ -591,6 +714,7 @@ const createWatchdog = ({
     clearDegradedHealthCheckTimer();
     state.lifecycle = "restarting";
     state.health = "unknown";
+    state.uptimeStartedAt = null;
     state.startupConsecutiveHealthFailures = 0;
     state.crashRecoveryActive = false;
     markExpectedRestartWindow();
@@ -612,7 +736,6 @@ const createWatchdog = ({
     state.lifecycle = "running";
     state.health = "unknown";
     state.startupConsecutiveHealthFailures = 0;
-    state.uptimeStartedAt = Date.now();
     state.gatewayStartedAt = Date.now();
     startBootstrapHealthChecks();
   };
@@ -628,6 +751,7 @@ const createWatchdog = ({
       healthTimer = null;
     }
     state.lifecycle = "stopped";
+    state.uptimeStartedAt = null;
     state.startupConsecutiveHealthFailures = 0;
   };
 

package/lib/server/webhooks.js

@@ -99,11 +99,16 @@ const normalizeDestination = (destination = null) => {
   if (!destination || typeof destination !== "object") return null;
   const channel = String(destination?.channel || "").trim();
   const to = String(destination?.to || "").trim();
+  const agentId = String(destination?.agentId || "").trim();
   if (!channel && !to) return null;
   if (!channel || !to) {
     throw new Error("destination.channel and destination.to are required");
   }
-  return { channel, to };
+  return {
+    channel,
+    to,
+    ...(agentId ? { agentId } : {}),
+  };
 };
 
 const resolveTransformPathFromMapping = (name, mapping) => {
@@ -137,8 +142,7 @@ const normalizeMappingTransformModules = (mappings) => {
   return changed;
 };
 
-const buildDefaultTransformSource = (name, destination = null) => {
-  const normalizedDestination = normalizeDestination(destination);
+const buildDefaultTransformSource = (name) => {
   return [
     "export default async function transform(payload, context) {",
     "  const data = payload.payload || payload;",
@@ -146,12 +150,6 @@ const buildDefaultTransformSource = (name, destination = null) => {
     "    message: data.message,",
     `    name: data.name || "${name}",`,
     '    wakeMode: data.wakeMode || "now",',
-    ...(normalizedDestination
-      ? [
-          `    channel: ${JSON.stringify(normalizedDestination.channel)},`,
-          `    to: ${JSON.stringify(normalizedDestination.to)},`,
-        ]
-      : []),
     "  };",
     "}",
     "",
@@ -164,6 +162,7 @@ const ensureWebhookTransform = ({
   name,
   source = "",
   destination = null,
+  forceWrite = false,
 }) => {
   const webhookName = validateWebhookName(name);
   const transformAbsolutePath = getTransformAbsolutePath(
@@ -171,14 +170,14 @@ const ensureWebhookTransform = ({
     webhookName,
   );
   fs.mkdirSync(path.dirname(transformAbsolutePath), { recursive: true });
-  if (fs.existsSync(transformAbsolutePath)) {
+  if (fs.existsSync(transformAbsolutePath) && !forceWrite) {
     return { changed: false, path: transformAbsolutePath };
   }
   fs.writeFileSync(
     transformAbsolutePath,
     String(source || "").trim()
       ? `${String(source).replace(/\s+$/, "")}\n`
-      : buildDefaultTransformSource(webhookName, destination),
+      : buildDefaultTransformSource(webhookName),
   );
   return { changed: true, path: transformAbsolutePath };
 };
@@ -235,6 +234,27 @@ const ensureWebhookMapping = ({ cfg, name, mapping = {} }) => {
   };
 };
 
+const resolveDefaultAgentId = (cfg) => {
+  const agents = Array.isArray(cfg?.agents?.list) ? cfg.agents.list : [];
+  const explicitDefault = agents.find((entry) => !!entry?.default);
+  const defaultId = String(explicitDefault?.id || "").trim();
+  if (defaultId) return defaultId;
+  const firstId = String(agents[0]?.id || "").trim();
+  return firstId || "main";
+};
+
+const resolveWebhookAgentId = ({ cfg, requestedAgentId = "" }) => {
+  const normalizedRequested = String(requestedAgentId || "").trim();
+  const agents = Array.isArray(cfg?.agents?.list) ? cfg.agents.list : [];
+  if (
+    normalizedRequested &&
+    agents.some((entry) => String(entry?.id || "").trim() === normalizedRequested)
+  ) {
+    return normalizedRequested;
+  }
+  return resolveDefaultAgentId(cfg);
+};
+
 const listManagedWebhooksFromConfig = ({ cfg }) => {
   const presets = Array.isArray(cfg?.hooks?.presets) ? cfg.hooks.presets : [];
   return kManagedWebhookConfigs
@@ -289,6 +309,10 @@ const listWebhooks = ({ fs, constants }) => {
       path: `/hooks/${name}`,
       transformPath,
       transformExists: fs.existsSync(transformAbsolutePath),
+      deliver: Boolean(mapping?.deliver),
+      channel: String(mapping?.channel || "").trim(),
+      to: String(mapping?.to || "").trim(),
+      agentId: String(mapping?.agentId || "").trim(),
       managed: Boolean(managed),
       managedReason: managed?.managedReason || "",
     };
@@ -332,6 +356,7 @@ const createWebhook = ({
   mapping = {},
   transformSource = "",
   destination = null,
+  overwriteTransform = false,
 }) => {
   const webhookName = validateWebhookName(name);
   const normalizedDestination = normalizeDestination(destination);
@@ -346,10 +371,32 @@ const createWebhook = ({
   if (exists && !upsert) {
     throw new Error(`Webhook "${webhookName}" already exists`);
   }
+  const agentId = resolveWebhookAgentId({
+    cfg,
+    requestedAgentId:
+      String(mapping?.agentId || "").trim() ||
+      String(normalizedDestination?.agentId || "").trim(),
+  });
+  const resolvedMapping = {
+    ...mapping,
+    deliver: true,
+    channel:
+      String(mapping?.channel || "").trim() ||
+      String(normalizedDestination?.channel || "").trim() ||
+      "last",
+    ...(String(mapping?.to || "").trim() || String(normalizedDestination?.to || "").trim()
+      ? {
+          to:
+            String(mapping?.to || "").trim() ||
+            String(normalizedDestination?.to || "").trim(),
+        }
+      : {}),
+    agentId,
+  };
   const ensuredMapping = ensureWebhookMapping({
     cfg,
     name: webhookName,
-    mapping,
+    mapping: resolvedMapping,
   });
   const ensuredTransform = ensureWebhookTransform({
     fs,
@@ -357,6 +404,7 @@ const createWebhook = ({
     name: webhookName,
     source: transformSource,
     destination: normalizedDestination,
+    forceWrite: overwriteTransform,
   });
   if (ensuredMapping.changed || ensuredTransform.changed || !exists) {
     writeConfig({ fs, configPath, cfg });