@chrysb/alphaclaw 0.8.1-beta.7 → 0.8.1-beta.8

package/lib/public/css/shell.css

@@ -44,6 +44,26 @@
   flex-shrink: 0;
 }
 
+.global-restart-banner__actions {
+  display: inline-flex;
+  align-items: center;
+  gap: 8px;
+  flex-shrink: 0;
+}
+
+.global-restart-banner__dismiss {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  padding: 2px;
+  color: #fde68a;
+  opacity: 0.85;
+}
+
+.global-restart-banner__dismiss:hover {
+  opacity: 1;
+}
+
 .app-content {
   grid-column: 3;
   grid-row: 2;
@@ -392,6 +412,10 @@
     position: static;
     transform: none;
   }
+  .global-restart-banner__actions {
+    width: 100%;
+    justify-content: flex-end;
+  }
   .app-content {
     grid-column: 1;
     grid-row: 2;

package/lib/public/js/app.js

@@ -169,6 +169,7 @@ const App = () => {
         visible=${controllerState.isAnyRestartRequired}
         restarting=${controllerState.restartingGateway}
         onRestart=${controllerActions.handleGatewayRestart}
+        onDismiss=${controllerActions.dismissRestartBanner}
       />
       <${AppSidebar}
         mobileSidebarOpen=${shellState.mobileSidebarOpen}

package/lib/public/js/components/envars.js

@@ -333,7 +333,9 @@ export const Envars = ({ onRestartRequired = () => {} }) => {
       setVars(nextVars);
       setPendingCustomKeys([]);
       setReservedKeys(new Set(data.reservedKeys || []));
-      onRestartRequired(!!data.restartRequired);
+      if (data.restartRequired) {
+        onRestartRequired(true);
+      }
     },
     [onRestartRequired],
   );
@@ -389,11 +391,11 @@ export const Envars = ({ onRestartRequired = () => {} }) => {
           : "Environment variables saved",
         "success",
       );
-      const sortedVars = sortCustomVarsAlphabetically(vars);
-      setVars(sortedVars);
-      setPendingCustomKeys([]);
+      // Force-refresh /api/env so stale cached payload cannot overwrite newly
+      // saved values with older state right after save.
+      const latestPayload = await refreshEnvPayload({ force: true });
+      applyEnvPayload(latestPayload);
       setSecretMaskEpoch((prev) => prev + 1);
-      baselineSignatureRef.current = getVarsSignature(sortedVars);
       setDirty(false);
     } catch (err) {
       showToast("Failed to save: " + err.message, "error");

package/lib/public/js/components/global-restart-banner.js

@@ -1,6 +1,7 @@
 import { h } from "https://esm.sh/preact";
 import htm from "https://esm.sh/htm";
 import { UpdateActionButton } from "./update-action-button.js";
+import { CloseIcon } from "./icons.js";
 
 const html = htm.bind(h);
 
@@ -8,6 +9,7 @@ export const GlobalRestartBanner = ({
   visible = false,
   restarting = false,
   onRestart,
+  onDismiss = () => {},
 }) => {
   if (!visible) return null;
   return html`
@@ -16,15 +18,26 @@ export const GlobalRestartBanner = ({
         <p class="global-restart-banner__text">
           Gateway restart required to apply pending configuration changes.
         </p>
-        <${UpdateActionButton}
-          onClick=${onRestart}
-          disabled=${restarting}
-          loading=${restarting}
-          warning=${true}
-          idleLabel="Restart Gateway"
-          loadingLabel="Restarting..."
-          className="global-restart-banner__button"
-        />
+        <div class="global-restart-banner__actions">
+          <${UpdateActionButton}
+            onClick=${onRestart}
+            disabled=${restarting}
+            loading=${restarting}
+            warning=${true}
+            idleLabel="Restart Gateway"
+            loadingLabel="Restarting..."
+            className="global-restart-banner__button"
+          />
+          <button
+            type="button"
+            onclick=${onDismiss}
+            class="global-restart-banner__dismiss ac-btn-ghost"
+            aria-label="Dismiss restart banner"
+            title="Dismiss"
+          >
+            <${CloseIcon} className="h-3.5 w-3.5" />
+          </button>
+        </div>
       </div>
     </div>
   `;

package/lib/public/js/hooks/use-app-shell-controller.js

@@ -6,6 +6,7 @@ import {
   fetchAlphaclawVersion,
   updateAlphaclaw,
   fetchRestartStatus,
+  dismissRestartStatus,
   restartGateway,
   fetchWatchdogStatus,
   fetchDoctorStatus,
@@ -261,6 +262,18 @@ export const useAppShellController = ({ location = "" } = {}) => {
     }
   }, [acUpdating]);
 
+  const dismissRestartBanner = useCallback(async () => {
+    setRestartRequired(false);
+    setBrowseRestartRequired(false);
+    try {
+      await dismissRestartStatus();
+      await refreshRestartStatus();
+    } catch (err) {
+      showToast(err.message || "Could not dismiss restart banner", "error");
+      await refreshRestartStatus();
+    }
+  }, [refreshRestartStatus]);
+
   return {
     state: {
       acHasUpdate,
@@ -284,6 +297,7 @@ export const useAppShellController = ({ location = "" } = {}) => {
       handleOpenclawUpdate,
       handleOpenclawVersionActionComplete,
       refreshSharedStatuses,
+      dismissRestartBanner,
       setRestartRequired,
     },
   };

package/lib/public/js/lib/api.js

@@ -346,6 +346,13 @@ export async function fetchRestartStatus() {
   return parseJsonOrThrow(res, "Could not load restart status");
 }
 
+export async function dismissRestartStatus() {
+  const res = await authFetch("/api/restart-status/dismiss", {
+    method: "POST",
+  });
+  return parseJsonOrThrow(res, "Could not dismiss restart status");
+}
+
 export async function fetchWatchdogStatus() {
   const res = await authFetch("/api/watchdog/status");
   return parseJsonOrThrow(res, "Could not load watchdog status");

package/lib/server/agents/agents.js

@@ -14,18 +14,40 @@ const {
   ensureAgentScaffold,
 } = require("./shared");
 
+const toTitleWords = (value = "") =>
+  String(value || "")
+    .trim()
+    .split(/[-_\s]+/)
+    .filter(Boolean)
+    .map((part) => part.charAt(0).toUpperCase() + part.slice(1))
+    .join(" ");
+
+const getFallbackAgentName = (agentId = "") => {
+  const normalizedAgentId = String(agentId || "").trim();
+  if (!normalizedAgentId) return "Agent";
+  const title = toTitleWords(normalizedAgentId) || normalizedAgentId;
+  return `${title} Agent`;
+};
+
+const getAgentDisplayName = (agent = {}) =>
+  String(agent?.identity?.name || "").trim() ||
+  String(agent?.name || "").trim() ||
+  getFallbackAgentName(agent?.id || "");
+
+const toReadableAgent = (agent = {}) => ({
+  ...agent,
+  id: String(agent.id || "").trim(),
+  name: getAgentDisplayName(agent),
+  default: !!agent.default,
+});
+
 const createAgentsDomain = ({ fsImpl, OPENCLAW_DIR }) => {
   const listAgents = () => {
     const cfg = withNormalizedAgentsConfig({
       OPENCLAW_DIR,
       cfg: loadConfig({ fsImpl, OPENCLAW_DIR }),
     });
-    return (cfg.agents?.list || []).map((entry) => ({
-      ...entry,
-      id: String(entry.id || "").trim(),
-      name: String(entry.name || "").trim() || String(entry.id || "").trim(),
-      default: !!entry.default,
-    }));
+    return (cfg.agents?.list || []).map((entry) => toReadableAgent(entry));
   };
 
   const getAgent = (agentId) => {
@@ -84,20 +106,29 @@ const createAgentsDomain = ({ fsImpl, OPENCLAW_DIR }) => {
         OPENCLAW_DIR,
         agentId,
       });
+    const requestedIdentity =
+      input.identity && typeof input.identity === "object"
+        ? { ...input.identity }
+        : {};
+    const requestedName = String(input.name || "").trim();
+    const identityName =
+      requestedName ||
+      String(requestedIdentity.name || "").trim() ||
+      getFallbackAgentName(agentId);
     const nextAgent = {
       id: agentId,
-      name: String(input.name || "").trim() || agentId,
       default: false,
       workspace: scaffoldWorkspacePath,
       agentDir: agentDirPath,
+      identity: {
+        ...requestedIdentity,
+        name: identityName,
+      },
       ...(input.model ? { model: input.model } : {}),
-      ...(input.identity && typeof input.identity === "object"
-        ? { identity: { ...input.identity } }
-        : {}),
     };
     cfg.agents.list = [...cfg.agents.list, nextAgent];
     saveConfig({ fsImpl, OPENCLAW_DIR, config: cfg });
-    return nextAgent;
+    return toReadableAgent(nextAgent);
   };
 
   const updateAgent = (agentId, patch = {}) => {
@@ -109,20 +140,29 @@ const createAgentsDomain = ({ fsImpl, OPENCLAW_DIR }) => {
     const index = cfg.agents.list.findIndex((entry) => entry.id === normalized);
     if (index < 0) throw new Error(`Agent "${normalized}" not found`);
     const current = cfg.agents.list[index];
-    const next = {
-      ...current,
-      ...(patch.name !== undefined
-        ? { name: String(patch.name || "").trim() }
-        : {}),
-      ...(patch.identity !== undefined
-        ? {
-            identity:
-              patch.identity && typeof patch.identity === "object"
-                ? { ...patch.identity }
-                : {},
-          }
-        : {}),
-    };
+    const next = { ...current };
+    const identityPatched =
+      patch.identity !== undefined || patch.name !== undefined;
+    if (identityPatched) {
+      const baseIdentity =
+        patch.identity !== undefined
+          ? patch.identity && typeof patch.identity === "object"
+            ? { ...patch.identity }
+            : {}
+          : current.identity && typeof current.identity === "object"
+            ? { ...current.identity }
+            : {};
+      const requestedName =
+        patch.name !== undefined
+          ? String(patch.name || "").trim()
+          : String(baseIdentity.name || "").trim();
+      const fallbackLegacyName = String(current.name || "").trim();
+      baseIdentity.name =
+        requestedName || fallbackLegacyName || getFallbackAgentName(normalized);
+      next.identity = baseIdentity;
+      // Only remove legacy top-level name once identity.name is persisted.
+      delete next.name;
+    }
     if (patch.model !== undefined) {
       if (patch.model === null) {
         delete next.model;
@@ -134,7 +174,10 @@ const createAgentsDomain = ({ fsImpl, OPENCLAW_DIR }) => {
       if (patch.tools && typeof patch.tools === "object") {
         const toolsCfg = {};
         if (patch.tools.profile) toolsCfg.profile = String(patch.tools.profile);
-        if (Array.isArray(patch.tools.alsoAllow) && patch.tools.alsoAllow.length) {
+        if (
+          Array.isArray(patch.tools.alsoAllow) &&
+          patch.tools.alsoAllow.length
+        ) {
           toolsCfg.alsoAllow = patch.tools.alsoAllow.map(String);
         }
         if (Array.isArray(patch.tools.deny) && patch.tools.deny.length) {
@@ -145,10 +188,9 @@ const createAgentsDomain = ({ fsImpl, OPENCLAW_DIR }) => {
         delete next.tools;
       }
     }
-    if (!String(next.name || "").trim()) next.name = normalized;
     cfg.agents.list[index] = next;
     saveConfig({ fsImpl, OPENCLAW_DIR, config: cfg });
-    return next;
+    return toReadableAgent(next);
   };
 
   const setDefaultAgent = (agentId) => {

package/lib/server/routes/system.js

@@ -151,16 +151,40 @@ const registerSystemRoutes = ({
     }
     return "Telegram";
   };
-  const getAgentLabelFromSessionKey = (key = "") => {
+  const getDefaultAgentLabel = (config = {}) => {
+    return "Main Agent";
+  };
+  const getFallbackAgentLabel = (agentId = "") => {
+    const normalizedAgentId = String(agentId || "").trim();
+    if (!normalizedAgentId) return "Agent";
+    const titledAgentId = toTitleWords(normalizedAgentId) || normalizedAgentId;
+    return `${titledAgentId} Agent`;
+  };
+  const getConfiguredAgentLabel = (config = {}, agentId = "") => {
+    const normalizedAgentId = String(agentId || "").trim();
+    if (!normalizedAgentId) return "Agent";
+    const configuredAgents = Array.isArray(config?.agents?.list)
+      ? config.agents.list
+      : [];
+    const configuredAgent = configuredAgents.find(
+      (entry) => String(entry?.id || "").trim() === normalizedAgentId,
+    );
+    const configuredName =
+      String(configuredAgent?.name || "").trim() ||
+      String(configuredAgent?.identity?.name || "").trim();
+    if (configuredName) return configuredName;
+    if (normalizedAgentId === "main") return getDefaultAgentLabel(config);
+    return getFallbackAgentLabel(normalizedAgentId);
+  };
+  const getAgentLabelFromSessionKey = (key = "", config = {}) => {
     const match = String(key || "").match(/^agent:([^:]+):/);
     const agentId = String(match?.[1] || "").trim();
     if (!agentId) return "Agent";
-    if (agentId === "main") return "Main Agent";
-    return toTitleWords(agentId);
+    return getConfiguredAgentLabel(config, agentId);
   };
   const buildSessionLabel = (sessionRow = {}, config = {}) => {
     const key = String(sessionRow?.key || "");
-    const agentLabel = getAgentLabelFromSessionKey(key);
+    const agentLabel = getAgentLabelFromSessionKey(key, config);
     const agentKeyMatch = key.match(/^agent:([^:]+):/);
     const agentId = String(agentKeyMatch?.[1] || "").trim();
     const telegramChannelName = resolveTelegramChannelNameForAgent({
@@ -749,6 +773,22 @@ const registerSystemRoutes = ({
     }
   });
 
+  app.post("/api/restart-status/dismiss", async (req, res) => {
+    try {
+      envRestartPending = false;
+      restartRequiredState.clearRequired();
+      const snapshot = await restartRequiredState.getSnapshot();
+      res.json({
+        ok: true,
+        restartRequired: snapshot.restartRequired || envRestartPending,
+        restartInProgress: snapshot.restartInProgress,
+        gatewayRunning: snapshot.gatewayRunning,
+      });
+    } catch (err) {
+      res.status(500).json({ ok: false, error: err.message });
+    }
+  });
+
   app.post("/api/gateway/restart", async (req, res) => {
     if (!isOnboarded()) {
       return res.status(400).json({ ok: false, error: "Not onboarded" });

package/package.json

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