@chrysb/alphaclaw 0.4.6-beta.6 → 0.4.6-beta.8

package/lib/server/routes/system.js

@@ -17,7 +17,6 @@ const registerSystemRoutes = ({
   alphaclawVersionService,
   clawCmd,
   restartGateway,
-  onExpectedGatewayRestart,
   OPENCLAW_DIR,
   restartRequiredState,
   topicRegistry,
@@ -59,7 +58,9 @@ const registerSystemRoutes = ({
   const parseJsonFromStdout = (stdout) => {
     const raw = String(stdout || "").trim();
     if (!raw) return null;
-    const candidateStarts = [raw.indexOf("{"), raw.indexOf("[")].filter((idx) => idx >= 0);
+    const candidateStarts = [raw.indexOf("{"), raw.indexOf("[")].filter(
+      (idx) => idx >= 0,
+    );
     for (const start of candidateStarts) {
       const candidate = raw.slice(start);
       try {
@@ -75,7 +76,9 @@ const registerSystemRoutes = ({
     if (telegramMatch) {
       return `Telegram ${telegramMatch[1]}`;
     }
-    const telegramTopicMatch = key.match(/:telegram:group:([^:]+):topic:([^:]+)$/);
+    const telegramTopicMatch = key.match(
+      /:telegram:group:([^:]+):topic:([^:]+)$/,
+    );
     if (telegramTopicMatch) {
       const [, groupId, topicId] = telegramTopicMatch;
       let groupEntry = null;
@@ -83,7 +86,9 @@ const registerSystemRoutes = ({
         groupEntry = topicRegistry?.getGroup?.(groupId) || null;
       } catch {}
       const groupName = String(groupEntry?.name || "").trim();
-      const topicName = String(groupEntry?.topics?.[topicId]?.name || "").trim();
+      const topicName = String(
+        groupEntry?.topics?.[topicId]?.name || "",
+      ).trim();
       if (groupName && topicName) return `Telegram ${groupName} · ${topicName}`;
       if (topicName) return `Telegram Topic ${topicName}`;
       return `Telegram Topic ${topicId}`;
@@ -266,13 +271,19 @@ const registerSystemRoutes = ({
     );
     const hiddenKnownVarKeys = new Set(
       kKnownVars
-        .filter((def) => !isReservedUserEnvVar(def.key) && !isVisibleInEnvars(def))
+        .filter(
+          (def) => !isReservedUserEnvVar(def.key) && !isVisibleInEnvars(def),
+        )
         .map((def) => def.key),
     );
     const existingHiddenKnownVars = readEnvFile().filter((v) =>
       hiddenKnownVarKeys.has(v.key),
     );
-    const nextEnvVars = [...filtered, ...existingHiddenKnownVars, ...existingLockedVars];
+    const nextEnvVars = [
+      ...filtered,
+      ...existingHiddenKnownVars,
+      ...existingLockedVars,
+    ];
     syncChannelConfig(nextEnvVars, "remove");
     writeEnvFile(nextEnvVars);
     const changed = reloadEnv();
@@ -402,12 +413,15 @@ const registerSystemRoutes = ({
       let selectedSession = null;
       try {
         const sessions = await listSendableAgentSessions();
-        selectedSession = sessions.find((sessionRow) => sessionRow.key === sessionKey) || null;
+        selectedSession =
+          sessions.find((sessionRow) => sessionRow.key === sessionKey) || null;
       } catch (err) {
         return res.status(502).json({ ok: false, error: err.message });
       }
       if (!selectedSession) {
-        return res.status(400).json({ ok: false, error: "Selected session was not found" });
+        return res
+          .status(400)
+          .json({ ok: false, error: "Selected session was not found" });
       }
       if (selectedSession.replyChannel && selectedSession.replyTo) {
         command +=
@@ -421,7 +435,10 @@ const registerSystemRoutes = ({
     if (!result.ok) {
       return res
         .status(502)
-        .json({ ok: false, error: result.stderr || "Could not send message to agent" });
+        .json({
+          ok: false,
+          error: result.stderr || "Could not send message to agent",
+        });
     }
     return res.json({ ok: true, stdout: result.stdout || "" });
   });
@@ -458,9 +475,6 @@ const registerSystemRoutes = ({
     }
     restartRequiredState.markRestartInProgress();
     try {
-      if (typeof onExpectedGatewayRestart === "function") {
-        onExpectedGatewayRestart();
-      }
       restartGateway();
       envRestartPending = false;
       restartRequiredState.clearRequired();

package/lib/server/watchdog.js

@@ -9,7 +9,7 @@ const {
 
 const kHealthStartupGraceMs = 30 * 1000;
 const kBootstrapHealthCheckMs = 5 * 1000;
-const kExpectedRestartWindowMs = 45 * 1000;
+const kExpectedRestartWindowMs = 15 * 1000;
 
 const isTruthy = (value) =>
   ["1", "true", "yes", "on"].includes(String(value || "").trim().toLowerCase());
@@ -506,7 +506,7 @@ const createWatchdog = ({
   const onGatewayExit = ({ code, signal, expectedExit = false, stderrTail = [] } = {}) => {
     const correlationId = createCorrelationId();
     clearDegradedHealthCheckTimer();
-    if (expectedExit) {
+    if (expectedExit && (code == null || code === 0)) {
       state.lifecycle = "restarting";
       state.health = "unknown";
       state.crashRecoveryActive = false;

package/lib/server.js

@@ -131,7 +131,7 @@ const app = express();
 app.set("trust proxy", kTrustProxyHops);
 app.use(["/webhook", "/hooks"], express.raw({ type: "*/*", limit: "5mb" }));
 app.use("/gmail-pubsub", express.raw({ type: "*/*", limit: "5mb" }));
-app.use(express.json());
+app.use(express.json({ limit: "5mb" }));
 
 const proxy = httpProxy.createProxyServer({
   target: GATEWAY_URL,
@@ -242,7 +242,6 @@ registerSystemRoutes({
   alphaclawVersionService,
   clawCmd,
   restartGateway,
-  onExpectedGatewayRestart: () => watchdog.onExpectedRestart(),
   OPENCLAW_DIR: constants.OPENCLAW_DIR,
   restartRequiredState,
   topicRegistry,

package/package.json

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