@chrysb/alphaclaw 0.5.6 → 0.6.0-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

@@ -44,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,
@@ -593,6 +605,7 @@ const createWatchdog = ({
     if (expectedExit && (code == null || code === 0)) {
       state.lifecycle = "restarting";
       state.health = "unknown";
+      state.uptimeStartedAt = null;
       state.crashRecoveryActive = false;
       markExpectedRestartWindow();
       startBootstrapHealthChecks();
@@ -605,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();
@@ -677,6 +714,7 @@ const createWatchdog = ({
     clearDegradedHealthCheckTimer();
     state.lifecycle = "restarting";
     state.health = "unknown";
+    state.uptimeStartedAt = null;
     state.startupConsecutiveHealthFailures = 0;
     state.crashRecoveryActive = false;
     markExpectedRestartWindow();
@@ -698,7 +736,6 @@ const createWatchdog = ({
     state.lifecycle = "running";
     state.health = "unknown";
     state.startupConsecutiveHealthFailures = 0;
-    state.uptimeStartedAt = Date.now();
     state.gatewayStartedAt = Date.now();
     startBootstrapHealthChecks();
   };
@@ -714,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 });

package/lib/server.js

@@ -72,6 +72,7 @@ const {
   isGatewayRunning,
   startGateway,
   restartGateway: restartGatewayWithReload,
+  restartGatewayLight: restartGatewayLightWithReload,
   attachGatewaySignalHandlers,
   ensureGatewayProxyConfig,
   syncChannelConfig,
@@ -90,7 +91,6 @@ const {
 } = require("./server/restart-required-state");
 const {
   ensureOpenclawRuntimeArtifacts,
-  installControlUiSkill,
   resolveSetupUiUrl,
   syncBootstrapPromptFiles,
 } = require("./server/onboarding/workspace");
@@ -106,6 +106,8 @@ const { createDiscordApi } = require("./server/discord-api");
 const { createWatchdogNotifier } = require("./server/watchdog-notify");
 const { createWatchdog } = require("./server/watchdog");
 const { createDoctorService } = require("./server/doctor/service");
+const { createAgentsService } = require("./server/agents/service");
+const { createOperationEventsService } = require("./server/operation-events");
 const { runOnboardedBootSequence } = require("./server/startup");
 
 const { registerAuthRoutes } = require("./server/routes/auth");
@@ -124,6 +126,7 @@ const { registerWatchdogRoutes } = require("./server/routes/watchdog");
 const { registerUsageRoutes } = require("./server/routes/usage");
 const { registerGmailRoutes } = require("./server/routes/gmail");
 const { registerDoctorRoutes } = require("./server/routes/doctor");
+const { registerAgentRoutes } = require("./server/routes/agents");
 
 const { PORT, kTrustProxyHops, SETUP_API_PREFIXES } = constants;
 
@@ -154,8 +157,17 @@ proxy.on("error", (err, req, res) => {
 });
 
 const authProfiles = createAuthProfiles();
-const loginThrottle = { ...createLoginThrottle(), getClientKey };
 const { shellCmd, clawCmd, gogCmd } = createCommands({ gatewayEnv });
+const agentsService = createAgentsService({
+  fs,
+  OPENCLAW_DIR: constants.OPENCLAW_DIR,
+  readEnvFile,
+  writeEnvFile,
+  reloadEnv,
+  restartGateway: () => restartGatewayWithReload(reloadEnv),
+  clawCmd,
+});
+const loginThrottle = { ...createLoginThrottle(), getClientKey };
 const resolveSetupUrl = () =>
   resolveSetupUiUrl(
     process.env.ALPHACLAW_SETUP_URL ||
@@ -171,6 +183,7 @@ const openclawVersionService = createOpenclawVersionService({
 });
 const alphaclawVersionService = createAlphaclawVersionService();
 const restartRequiredState = createRestartRequiredState({ isGatewayRunning });
+const operationEvents = createOperationEventsService();
 
 const { requireAuth, isAuthorizedRequest } = registerAuthRoutes({
   app,
@@ -328,11 +341,6 @@ const doSyncPromptFiles = () => {
     workspaceDir: constants.WORKSPACE_DIR,
     baseUrl: setupUiUrl,
   });
-  installControlUiSkill({
-    fs,
-    openclawDir: constants.OPENCLAW_DIR,
-    baseUrl: setupUiUrl,
-  });
   installGogCliSkill({ fs, openclawDir: constants.OPENCLAW_DIR });
 };
 registerTelegramRoutes({
@@ -375,6 +383,12 @@ registerDoctorRoutes({
   requireAuth,
   doctorService,
 });
+registerAgentRoutes({
+  app,
+  agentsService,
+  restartRequiredState,
+  operationEvents,
+});
 registerProxyRoutes({
   app,
   proxy,

package/lib/setup/core-prompts/AGENTS.md

@@ -21,14 +21,15 @@ Before diving into implementation, share your plan when the work is **significan
 
 If any of these apply, outline your approach first — what you intend to do, in what order, and any trade-offs you see — then **wait for the user's sign-off** before proceeding. For straightforward, low-risk tasks, just get it done.
 
-### Show Your Work (IMPORTANT)
+### Save and Show Your Work (IMPORTANT)
 
-Mandatory: Anytime you add, edit, or remove files/resources, end your message with a **Changes committed** summary.
+Your `.openclaw` directory is version-controlled and this is how work survives container restarts.
 
-Use workspace-relative paths only for local files (no absolute paths). Include all internal resources (files, config, cron jobs, skills) and external resources (third-party pages, databases, integrations) that were created, modified, or removed.
+Anytime you add, edit, or remove workspace files, openclaw.json, cron.json, skills, or external resources (third-party pages, databases, integrations), **commit and push your changes to git**. Never force push; always pull first if there might be remote changes.
+
+Whenever you do this, end your message with a **Changes committed** summary. Use workspace-relative paths for local files.
 
 ```
-Changes committed ([abc1234](commit url)): <-- linked commit hash
+Changes committed ([abc1234](commit url)): <-- linked abbreviated hash, no backticks
 • path/or/resource (new|edit|delete) — brief description
 ```
-

package/lib/setup/core-prompts/TOOLS.md

@@ -23,14 +23,7 @@ Changes to env vars are made through the **Envars** tab (`{{SETUP_UI_URL}}#envar
 
 ### Google Workspace
 
-Google Workspace is connected via the **General** tab (`{{SETUP_UI_URL}}#general`). The user provides OAuth client credentials from Google Cloud Console, then authorizes access to the services they need (Gmail, Calendar, Drive, Sheets, Docs, Tasks, Contacts, Meet).
-
-## Git Discipline
-
-**Commit and push after every set of changes.** Your entire .openclaw directory (config, cron, workspace) is version controlled. This is how your work survives container restarts.
-
-Never force push. Always pull before pushing if there might be remote changes.
-After pushing, include a link to the commit using the abbreviated hash: [abc1234](https://github.com/owner/repo/commit/abc1234) format. No backticks.
+Google Workspace is connected via the **General** tab (`{{SETUP_UI_URL}}#general`). The user provides OAuth client credentials from Google Cloud Console, then authorizes access to the services they need (Gmail, Calendar, Drive, Sheets, Docs, Tasks, Contacts, Meet). Connected accounts and `gog` CLI usage are covered by the gog-cli skill.
 
 ## Telegram Formatting
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chrysb/alphaclaw",
-  "version": "0.5.6",
+  "version": "0.6.0-beta.0",
   "publishConfig": {
     "access": "public"
   },

package/lib/setup/skills/control-ui/SKILL.md

@@ -1,62 +0,0 @@
----
-name: alphaclaw
-description: Know when and how to direct the user to the AlphaClaw UI for configuration tasks.
----
-
-# AlphaClaw UI
-
-There is a web-based Setup UI at `{{BASE_URL}}`. The **user** manages runtime configuration through it. You should NOT call these API endpoints yourself or write config files directly — instead, tell the user what they need to do and where to do it.
-
-## When to direct the user to the UI
-
-### Adding or changing environment variables
-
-When the user needs to add a new API key, token, or any env var:
-
-> You can add that in your Setup UI → **Envars** tab: {{BASE_URL}}#envars
-
-### Connecting a new channel (Telegram, Discord)
-
-> Add your bot token in the Setup UI → **Envars** tab ({{BASE_URL}}#envars), then approve the pairing request in the **General** tab ({{BASE_URL}}#general).
-
-### Approving or rejecting pairings
-
-When a user asks about pairing their Telegram or Discord account:
-
-> Open the Setup UI → **General** tab ({{BASE_URL}}#general). Pending pairing requests appear automatically — click **Approve** or **Reject**.
-
-### Connecting OpenAI Codex OAuth
-
-> Connect or reconnect Codex OAuth from the Setup UI → **Providers** tab ({{BASE_URL}}#providers). Click **Connect Codex OAuth** and follow the popup flow.
-
-### Connecting Google Workspace
-
-> Set up Google Workspace from the Setup UI → **General** tab ({{BASE_URL}}#general, Google section). You'll need your OAuth client credentials from Google Cloud Console.
-
-Supported Google services (user selects which to enable during OAuth):
-
-| Service  | Read            | Write            | Google API                     |
-| -------- | --------------- | ---------------- | ------------------------------ |
-| Gmail    | `gmail:read`    | `gmail:write`    | `gmail.googleapis.com`         |
-| Calendar | `calendar:read` | `calendar:write` | `calendar-json.googleapis.com` |
-| Drive    | `drive:read`    | `drive:write`    | `drive.googleapis.com`         |
-| Sheets   | `sheets:read`   | `sheets:write`   | `sheets.googleapis.com`        |
-| Docs     | `docs:read`     | `docs:write`     | `docs.googleapis.com`          |
-| Tasks    | `tasks:read`    | `tasks:write`    | `tasks.googleapis.com`         |
-| Contacts | `contacts:read` | `contacts:write` | `people.googleapis.com`        |
-| Meet     | `meet:read`     | `meet:write`     | `meet.googleapis.com`          |
-
-Default enabled: Gmail (read), Calendar (read+write), Drive (read), Sheets (read), Docs (read).
-
-The `gog` CLI is available to verify Google API access:
-
-```bash
-gog auth list --plain
-gog gmail labels list --account user@gmail.com
-gog calendar calendars --account user@gmail.com
-gog drive ls --account user@gmail.com
-gog sheets metadata SPREADSHEET_ID --account user@gmail.com
-gog contacts list --account user@gmail.com
-```
-
-Config lives at `/data/.openclaw/gogcli/`.