@chrysb/alphaclaw 0.9.30 → 0.9.31

package/lib/server/init/register-server-routes.js

@@ -14,6 +14,7 @@ const { registerWebhookRoutes } = require("../routes/webhooks");
 const { registerWatchdogRoutes } = require("../routes/watchdog");
 const { registerUsageRoutes } = require("../routes/usage");
 const { registerGmailRoutes } = require("../routes/gmail");
+const { ensureWebhookMappingIds } = require("../webhooks");
 const { registerDoctorRoutes } = require("../routes/doctor");
 const { registerAgentRoutes } = require("../routes/agents");
 const { registerCronRoutes } = require("../routes/cron");
@@ -178,6 +179,7 @@ const registerServerRoutes = ({
     runOnboardedBootSequence({
       ensureManagedExecDefaults,
       ensureUsageTrackerPluginConfig,
+      ensureWebhookMappingIds: () => ensureWebhookMappingIds({ fs, constants }),
       doSyncPromptFiles,
       reloadEnv,
       syncChannelConfig,

package/lib/server/startup.js

@@ -1,6 +1,7 @@
 const runOnboardedBootSequence = ({
   ensureManagedExecDefaults,
   ensureUsageTrackerPluginConfig,
+  ensureWebhookMappingIds,
   doSyncPromptFiles,
   reloadEnv,
   syncChannelConfig,
@@ -25,6 +26,18 @@ const runOnboardedBootSequence = ({
       `[alphaclaw] Failed to ensure usage-tracker plugin config on boot: ${error.message}`,
     );
   }
+  try {
+    const result = ensureWebhookMappingIds();
+    if (result?.changed) {
+      console.log(
+        `[alphaclaw] Added IDs to webhook mappings: ${result.updatedIds.join(", ")}`,
+      );
+    }
+  } catch (error) {
+    console.error(
+      `[alphaclaw] Failed to ensure webhook mapping IDs on boot: ${error.message}`,
+    );
+  }
   doSyncPromptFiles();
   reloadEnv();
   syncChannelConfig(readEnvFile());

package/lib/server/webhooks.js

@@ -1,4 +1,8 @@
 const path = require("path");
+const {
+  readOpenclawConfig,
+  resolveOpenclawConfigPath,
+} = require("./openclaw-config");
 
 const kNamePattern = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
 const kTransformsDir = "hooks/transforms";
@@ -12,11 +16,16 @@ const kManagedWebhookConfigs = [
 ];
 
 const getConfigPath = ({ OPENCLAW_DIR }) =>
-  path.join(OPENCLAW_DIR, "openclaw.json");
+  resolveOpenclawConfigPath({ openclawDir: OPENCLAW_DIR });
 
 const readConfig = ({ fs, constants }) => {
   const configPath = getConfigPath(constants);
-  const cfg = JSON.parse(fs.readFileSync(configPath, "utf8"));
+  const cfg = readOpenclawConfig({
+    fsModule: fs,
+    openclawDir: constants.OPENCLAW_DIR,
+    fallback: null,
+  });
+  if (!cfg) throw new Error("Could not read openclaw.json");
   return { cfg, configPath };
 };
 
@@ -78,6 +87,32 @@ const ensureHooksRoot = (cfg) => {
 
 const getMappingHookName = (mapping) =>
   String(mapping?.match?.path || "").trim();
+const normalizeMappingIdPart = (value) =>
+  String(value || "")
+    .trim()
+    .toLowerCase()
+    .replace(/[^a-z0-9]+/g, "-")
+    .replace(/-+/g, "-")
+    .replace(/^-|-$/g, "");
+const getMappingIdBase = (mapping, index) => {
+  const hookPath = normalizeMappingIdPart(getMappingHookName(mapping));
+  if (hookPath) return hookPath;
+  const name = normalizeMappingIdPart(mapping?.name);
+  if (name) return name;
+  const source = normalizeMappingIdPart(mapping?.match?.source);
+  if (source) return `source-${source}`;
+  return `mapping-${index + 1}`;
+};
+const reserveUniqueMappingId = (baseId, usedIds) => {
+  let candidate = baseId;
+  let suffix = 2;
+  while (usedIds.has(candidate)) {
+    candidate = `${baseId}-${suffix}`;
+    suffix += 1;
+  }
+  usedIds.add(candidate);
+  return candidate;
+};
 const isWebhookMapping = (mapping) => !!getMappingHookName(mapping);
 const findMappingIndexByName = (mappings, name) =>
   mappings.findIndex((mapping) => getMappingHookName(mapping) === name);
@@ -142,6 +177,35 @@ const normalizeMappingTransformModules = (mappings) => {
   return changed;
 };
 
+const ensureWebhookMappingIds = ({ fs, constants }) => {
+  const { cfg, configPath } = readConfig({ fs, constants });
+  const mappings = Array.isArray(cfg?.hooks?.mappings)
+    ? cfg.hooks.mappings
+    : [];
+  const usedIds = new Set(
+    mappings
+      .map((mapping) => String(mapping?.id || "").trim())
+      .filter(Boolean),
+  );
+  const updatedIds = [];
+  for (const [index, mapping] of mappings.entries()) {
+    if (!mapping || typeof mapping !== "object" || Array.isArray(mapping)) {
+      continue;
+    }
+    if (String(mapping?.id || "").trim()) continue;
+    const id = reserveUniqueMappingId(
+      getMappingIdBase(mapping, index),
+      usedIds,
+    );
+    mapping.id = id;
+    updatedIds.push(id);
+  }
+  if (updatedIds.length > 0) {
+    writeConfig({ fs, configPath, cfg });
+  }
+  return { changed: updatedIds.length > 0, updatedIds };
+};
+
 const buildDefaultTransformSource = (name) => {
   return [
     "export default async function transform(payload, context) {",
@@ -188,6 +252,7 @@ const ensureWebhookMapping = ({ cfg, name, mapping = {} }) => {
   const normalizedModulesChanged = normalizeMappingTransformModules(mappings);
   const index = findMappingIndexByName(mappings, webhookName);
   const defaults = {
+    id: webhookName,
     match: { path: webhookName },
     action: "agent",
     name: webhookName,
@@ -198,6 +263,7 @@ const ensureWebhookMapping = ({ cfg, name, mapping = {} }) => {
     mappings.push({
       ...defaults,
       ...mapping,
+      id: webhookName,
       match: { ...defaults.match, ...(mapping.match || {}) },
       transform: { ...defaults.transform, ...(mapping.transform || {}) },
     });
@@ -207,6 +273,7 @@ const ensureWebhookMapping = ({ cfg, name, mapping = {} }) => {
   const next = {
     ...current,
     ...mapping,
+    id: webhookName,
     match: {
       ...(current.match || {}),
       ...(mapping.match || {}),
@@ -436,6 +503,7 @@ const updateWebhookDestination = ({ fs, constants, name, destination = null }) =
   });
   const next = {
     ...current,
+    id: webhookName,
     deliver: true,
     channel:
       String(normalizedDestination?.channel || "").trim() ||
@@ -499,6 +567,7 @@ const deleteWebhook = ({ fs, constants, name, deleteTransformDir = false }) => {
 };
 
 module.exports = {
+  ensureWebhookMappingIds,
   listWebhooks,
   getWebhookDetail,
   createWebhook,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chrysb/alphaclaw",
-  "version": "0.9.30",
+  "version": "0.9.31",
   "publishConfig": {
     "access": "public"
   },