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

package/lib/public/js/components/agent-send-modal.js

@@ -0,0 +1,142 @@
+import { h } from "https://esm.sh/preact";
+import { useEffect, useState } from "https://esm.sh/preact/hooks";
+import htm from "https://esm.sh/htm";
+import { ModalShell } from "./modal-shell.js";
+import { ActionButton } from "./action-button.js";
+import { PageHeader } from "./page-header.js";
+import { CloseIcon } from "./icons.js";
+import { useAgentSessions } from "../hooks/useAgentSessions.js";
+
+const html = htm.bind(h);
+
+export const AgentSendModal = ({
+  visible = false,
+  title = "Send to agent",
+  messageLabel = "Message",
+  messageRows = 8,
+  initialMessage = "",
+  resetKey = "",
+  submitLabel = "Send message",
+  loadingLabel = "Sending...",
+  cancelLabel = "Cancel",
+  onClose = () => {},
+  onSubmit = async () => true,
+  sessionFilter = undefined,
+}) => {
+  const {
+    sessions,
+    selectedSessionKey,
+    setSelectedSessionKey,
+    selectedSession,
+    loading: loadingSessions,
+    error: loadError,
+  } = useAgentSessions({ enabled: visible, filter: sessionFilter });
+  const [messageText, setMessageText] = useState("");
+  const [sending, setSending] = useState(false);
+
+  useEffect(() => {
+    if (!visible) return;
+    setMessageText(String(initialMessage || ""));
+  }, [visible, initialMessage, resetKey]);
+
+  const handleSend = async () => {
+    if (!selectedSession || sending) return;
+    const trimmedMessage = String(messageText || "").trim();
+    if (!trimmedMessage) return;
+    setSending(true);
+    try {
+      const shouldClose = await onSubmit({
+        selectedSession,
+        selectedSessionKey,
+        message: trimmedMessage,
+      });
+      if (shouldClose !== false) {
+        onClose();
+      }
+    } finally {
+      setSending(false);
+    }
+  };
+
+  return html`
+    <${ModalShell}
+      visible=${visible}
+      onClose=${() => {
+        if (sending) return;
+        onClose();
+      }}
+      panelClassName="bg-modal border border-border rounded-xl p-5 max-w-lg w-full space-y-4"
+    >
+      <${PageHeader}
+        title=${title}
+        actions=${html`
+          <button
+            type="button"
+            onclick=${() => {
+              if (sending) return;
+              onClose();
+            }}
+            class="h-8 w-8 inline-flex items-center justify-center rounded-lg ac-btn-secondary"
+            aria-label="Close modal"
+          >
+            <${CloseIcon} className="w-3.5 h-3.5 text-gray-300" />
+          </button>
+        `}
+      />
+      <div class="space-y-2">
+        <label class="text-xs text-gray-500">Send to session</label>
+        <select
+          value=${selectedSessionKey}
+          onChange=${(event) =>
+            setSelectedSessionKey(String(event.currentTarget?.value || ""))}
+          disabled=${loadingSessions || sending}
+          class="w-full bg-black/30 border border-border rounded-lg px-3 py-2 text-xs text-gray-200 focus:border-gray-500"
+        >
+          ${sessions.length === 0
+            ? html`<option value="">No sessions available</option>`
+            : null}
+          ${sessions.map(
+            (sessionRow) => html`
+              <option value=${String(sessionRow?.key || "")}>
+                ${String(sessionRow?.label || sessionRow?.key || "Session")}
+              </option>
+            `,
+          )}
+        </select>
+        ${loadingSessions
+          ? html`<div class="text-xs text-gray-500">Loading sessions...</div>`
+          : null}
+        ${loadError ? html`<div class="text-xs text-red-400">${loadError}</div>` : null}
+      </div>
+      <div class="space-y-2">
+        <label class="text-xs text-gray-500">${messageLabel}</label>
+        <textarea
+          value=${messageText}
+          onInput=${(event) =>
+            setMessageText(String(event.currentTarget?.value || ""))}
+          disabled=${sending}
+          rows=${messageRows}
+          class="w-full bg-black/30 border border-border rounded-lg px-3 py-2 text-xs text-gray-200 focus:border-gray-500 font-mono leading-5"
+        ></textarea>
+      </div>
+      <div class="flex items-center justify-end gap-2">
+        <${ActionButton}
+          onClick=${onClose}
+          disabled=${sending}
+          tone="secondary"
+          size="md"
+          idleLabel=${cancelLabel}
+        />
+        <${ActionButton}
+          onClick=${handleSend}
+          disabled=${!selectedSession || loadingSessions || !!loadError || !String(messageText || "").trim()}
+          loading=${sending}
+          tone="primary"
+          size="md"
+          idleLabel=${submitLabel}
+          loadingLabel=${loadingLabel}
+        />
+      </div>
+    </${ModalShell}>
+  `;
+};

package/lib/public/js/components/doctor/fix-card-modal.js

@@ -1,11 +1,8 @@
 import { h } from "https://esm.sh/preact";
-import { useEffect, useState } from "https://esm.sh/preact/hooks";
 import htm from "https://esm.sh/htm";
-import { ModalShell } from "../modal-shell.js";
-import { ActionButton } from "../action-button.js";
 import { sendDoctorCardFix, updateDoctorCardStatus } from "../../lib/api.js";
 import { showToast } from "../toast.js";
-import { useAgentSessions } from "../../hooks/useAgentSessions.js";
+import { AgentSendModal } from "../agent-send-modal.js";
 
 const html = htm.bind(h);
 
@@ -15,33 +12,15 @@ export const DoctorFixCardModal = ({
   onClose = () => {},
   onComplete = () => {},
 }) => {
-  const {
-    sessions,
-    selectedSessionKey,
-    setSelectedSessionKey,
-    selectedSession,
-    loading: loadingSessions,
-    error: loadError,
-  } = useAgentSessions({ enabled: visible });
-
-  const [sending, setSending] = useState(false);
-  const [promptText, setPromptText] = useState("");
-
-  useEffect(() => {
-    if (!visible) return;
-    setPromptText(String(card?.fixPrompt || ""));
-  }, [visible, card?.fixPrompt, card?.id]);
-
-  const handleSend = async () => {
-    if (!card?.id || sending) return;
+  const handleSend = async ({ selectedSession, message }) => {
+    if (!card?.id) return false;
     try {
-      setSending(true);
       await sendDoctorCardFix({
         cardId: card.id,
         sessionId: selectedSession?.sessionId || "",
         replyChannel: selectedSession?.replyChannel || "",
         replyTo: selectedSession?.replyTo || "",
-        prompt: promptText,
+        prompt: message,
       });
       try {
         await updateDoctorCardStatus({ cardId: card.id, status: "fixed" });
@@ -57,77 +36,24 @@ export const DoctorFixCardModal = ({
         );
       }
       await onComplete();
-      onClose();
+      return true;
     } catch (error) {
       showToast(error.message || "Could not send Doctor fix request", "error");
-    } finally {
-      setSending(false);
+      return false;
     }
   };
 
   return html`
-    <${ModalShell}
+    <${AgentSendModal}
       visible=${visible}
+      title="Ask agent to fix"
+      messageLabel="Instructions"
+      initialMessage=${String(card?.fixPrompt || "")}
+      resetKey=${String(card?.id || "")}
+      submitLabel="Send fix request"
+      loadingLabel="Sending..."
       onClose=${onClose}
-      panelClassName="bg-modal border border-border rounded-xl p-5 max-w-lg w-full space-y-4"
-    >
-      <div class="space-y-1">
-        <h2 class="text-base font-semibold">Ask agent to fix</h2>
-        <p class="text-xs text-gray-400">
-          Send this Doctor finding to one of your agent sessions as a focused fix request.
-        </p>
-      </div>
-      <div class="space-y-2">
-        <label class="text-xs text-gray-500">Send to session</label>
-        <select
-          value=${selectedSessionKey}
-          onChange=${(event) => setSelectedSessionKey(String(event.currentTarget?.value || ""))}
-          disabled=${loadingSessions || sending}
-          class="w-full bg-black/30 border border-border rounded-lg px-3 py-2 text-xs text-gray-200 focus:border-gray-500"
-        >
-          ${sessions.map(
-            (sessionRow) => html`
-              <option value=${String(sessionRow?.key || "")}>
-                ${String(sessionRow?.label || sessionRow?.key || "Session")}
-              </option>
-            `,
-          )}
-        </select>
-        ${
-          loadingSessions
-            ? html`<div class="text-xs text-gray-500">Loading sessions...</div>`
-            : null
-        }
-        ${loadError ? html`<div class="text-xs text-red-400">${loadError}</div>` : null}
-      </div>
-      <div class="space-y-2">
-        <label class="text-xs text-gray-500">Instructions</label>
-        <textarea
-          value=${promptText}
-          onInput=${(event) => setPromptText(String(event.currentTarget?.value || ""))}
-          disabled=${sending}
-          rows="8"
-          class="w-full bg-black/30 border border-border rounded-lg px-3 py-2 text-xs text-gray-200 focus:border-gray-500 font-mono leading-5"
-        ></textarea>
-      </div>
-      <div class="flex items-center justify-end gap-2">
-        <${ActionButton}
-          onClick=${onClose}
-          disabled=${sending}
-          tone="secondary"
-          size="md"
-          idleLabel="Cancel"
-        />
-        <${ActionButton}
-          onClick=${handleSend}
-          disabled=${!selectedSession || loadingSessions || !!loadError || !String(promptText || "").trim()}
-          loading=${sending}
-          tone="primary"
-          size="md"
-          idleLabel="Send fix request"
-          loadingLabel="Sending..."
-        />
-      </div>
-    </${ModalShell}>
+      onSubmit=${handleSend}
+    />
   `;
 };

package/lib/public/js/components/gateway.js

@@ -326,6 +326,7 @@ export const Gateway = ({
   const showInspectButton = watchdogHealth === "degraded" && !!onOpenWatchdog;
   const showRepairButton =
     isRepairInProgress ||
+    (watchdogStatus?.health === "degraded" && !onOpenWatchdog) ||
     watchdogStatus?.lifecycle === "crash_loop" ||
     watchdogStatus?.health === "unhealthy" ||
     watchdogStatus?.health === "crashed";

package/lib/public/js/components/google/gmail-setup-wizard.js

@@ -81,6 +81,7 @@ export const GmailSetupWizard = ({
 }) => {
   const [step, setStep] = useState(0);
   const [projectIdInput, setProjectIdInput] = useState("");
+  const [editingProjectId, setEditingProjectId] = useState(false);
   const [localError, setLocalError] = useState("");
   const [projectIdResolved, setProjectIdResolved] = useState(false);
   const [watchEnabled, setWatchEnabled] = useState(false);
@@ -100,6 +101,7 @@ export const GmailSetupWizard = ({
     setStep(0);
     setLocalError("");
     setProjectIdInput("");
+    setEditingProjectId(false);
     setProjectIdResolved(false);
     setWatchEnabled(false);
     setSendingToAgent(false);
@@ -110,10 +112,11 @@ export const GmailSetupWizard = ({
   const hasProjectIdFromConfig = Boolean(
     String(clientConfig?.projectId || "").trim() || commands,
   );
-  const needsProjectId = !hasProjectIdFromConfig && !projectIdResolved;
+  const needsProjectId =
+    editingProjectId || (!hasProjectIdFromConfig && !projectIdResolved);
   const detectedProjectId =
-    String(clientConfig?.projectId || "").trim() ||
     String(projectIdInput || "").trim() ||
+    String(clientConfig?.projectId || "").trim() ||
     "<project-id>";
   const client =
     String(account?.client || clientConfig?.client || "default").trim() ||
@@ -135,6 +138,13 @@ export const GmailSetupWizard = ({
     showToast("Could not copy text", "error");
   }, []);
 
+  const handleChangeProjectId = useCallback(() => {
+    setLocalError("");
+    setProjectIdInput(String(clientConfig?.projectId || "").trim());
+    setProjectIdResolved(false);
+    setEditingProjectId(true);
+  }, [clientConfig?.projectId]);
+
   const handleFinish = async () => {
     try {
       setLocalError("");
@@ -159,6 +169,7 @@ export const GmailSetupWizard = ({
           client,
           projectId: String(projectIdInput || "").trim(),
         });
+        setEditingProjectId(false);
         setProjectIdResolved(true);
       } catch (err) {
         setLocalError(err.message || "Could not save project id");
@@ -230,7 +241,9 @@ export const GmailSetupWizard = ({
               <div
                 class="rounded-lg border border-border bg-black/20 p-3 space-y-2"
               >
-                <div class="text-sm">Project ID required</div>
+                <div class="text-sm">
+                  ${editingProjectId ? "Change project ID" : "Project ID required"}
+                </div>
                 <div class="text-xs text-gray-500">
                   Find it in the${" "}
                   <a
@@ -257,6 +270,9 @@ export const GmailSetupWizard = ({
         !needsProjectId && step === 0
           ? html`
               <div class="space-y-1">
+                <div class="text-xs text-gray-500">
+                  Using project <code>${detectedProjectId}</code>.
+                </div>
                 <div class="text-xs text-gray-500">
                   If <code>gcloud</code> is not installed on your computer,
                   follow the official install guide:${" "}
@@ -372,7 +388,15 @@ export const GmailSetupWizard = ({
       }
       <div class="grid grid-cols-2 gap-2 pt-2">
         ${step === 0
-          ? html`<div></div>`
+          ? html`${!needsProjectId
+              ? html`<button
+                  type="button"
+                  onclick=${handleChangeProjectId}
+                  class="justify-self-start text-xs px-2 py-1 rounded-lg ac-btn-ghost"
+                >
+                  Change project ID
+                </button>`
+              : html`<div></div>`}`
           : html`<${ActionButton}
               onClick=${() => setStep((prev) => Math.max(prev - 1, 0))}
               disabled=${saving}

package/lib/public/js/components/webhooks.js

@@ -6,8 +6,10 @@ import {
   createWebhook,
   deleteWebhook,
   fetchWebhookDetail,
+  fetchWebhookRequest,
   fetchWebhookRequests,
   fetchWebhooks,
+  sendAgentMessage,
 } from "../lib/api.js";
 import {
   formatLocaleDateTime,
@@ -17,6 +19,7 @@ import { showToast } from "./toast.js";
 import { PageHeader } from "./page-header.js";
 import { ConfirmDialog } from "./confirm-dialog.js";
 import { ActionButton } from "./action-button.js";
+import { AgentSendModal } from "./agent-send-modal.js";
 import { ModalShell } from "./modal-shell.js";
 import { Badge } from "./badge.js";
 import { CloseIcon } from "./icons.js";
@@ -82,6 +85,40 @@ const jsonPretty = (value) => {
   }
 };
 
+const buildWebhookDebugMessage = ({
+  hookName = "",
+  webhook = null,
+  request = null,
+}) => {
+  const hookPath =
+    String(webhook?.path || "").trim() ||
+    (hookName ? `/hooks/${hookName}` : "/hooks/unknown");
+  const gatewayStatus =
+    request?.gatewayStatus == null ? "n/a" : String(request.gatewayStatus);
+  return [
+    "Investigate this failed webhook request and share findings before fixing anything.",
+    "Reply with your diagnosis first, including the likely root cause, any relevant risks, and what you would change if I approve a fix.",
+    "",
+    `Webhook: ${hookPath}`,
+    `Request ID: ${String(request?.id || "unknown")}`,
+    `Time: ${String(request?.createdAt || "unknown")}`,
+    `Method: ${String(request?.method || "unknown")}`,
+    `Source IP: ${String(request?.sourceIp || "unknown")}`,
+    `Gateway status: ${gatewayStatus}`,
+    `Transform path: ${String(webhook?.transformPath || "unknown")}`,
+    `Payload truncated: ${request?.payloadTruncated ? "yes" : "no"}`,
+    "",
+    "Headers:",
+    jsonPretty(request?.headers),
+    "",
+    "Payload:",
+    jsonPretty(request?.payload),
+    "",
+    "Gateway response:",
+    jsonPretty(request?.gatewayBody),
+  ].join("\n");
+};
+
 const CreateWebhookModal = ({
   visible,
   name,
@@ -197,6 +234,8 @@ export const Webhooks = ({
   const [expandedRows, setExpandedRows] = useState(() => new Set());
   const [sendingTestWebhook, setSendingTestWebhook] = useState(false);
   const [replayingRequestId, setReplayingRequestId] = useState(null);
+  const [debugLoadingRequestId, setDebugLoadingRequestId] = useState(null);
+  const [debugRequest, setDebugRequest] = useState(null);
 
   const listPoll = usePolling(fetchWebhooks, 15000);
   const webhooks = listPoll.data?.webhooks || [];
@@ -496,6 +535,31 @@ export const Webhooks = ({
   }, []);
 
   const isListLoading = !listPoll.data && !listPoll.error;
+  const debugAgentMessage = useMemo(
+    () =>
+      buildWebhookDebugMessage({
+        hookName: selectedHookName,
+        webhook: selectedWebhook,
+        request: debugRequest,
+      }),
+    [debugRequest, selectedHookName, selectedWebhook],
+  );
+
+  const handleAskAgentToDebug = useCallback(
+    async (item) => {
+      if (!selectedHookName || !item?.id || debugLoadingRequestId === item.id) return;
+      try {
+        setDebugLoadingRequestId(item.id);
+        const data = await fetchWebhookRequest(selectedHookName, item.id);
+        setDebugRequest(data?.request || item);
+      } catch (err) {
+        showToast(err.message || "Could not load webhook request details", "error");
+      } finally {
+        setDebugLoadingRequestId(null);
+      }
+    },
+    [debugLoadingRequestId, selectedHookName],
+  );
 
   return html`
     <div class="space-y-4">
@@ -841,7 +905,7 @@ export const Webhooks = ({
                                       >
 ${jsonPretty(item.headers)}</pre
                                       >
-                                      <div class="mt-2 flex justify-start">
+                                      <div class="mt-2 flex justify-start gap-2">
                                         <button
                                           class="h-7 text-xs px-2.5 rounded-lg ac-btn-secondary"
                                           onclick=${() =>
@@ -905,7 +969,7 @@ ${jsonPretty(item.payload)}</pre
                                       >
 ${jsonPretty(item.gatewayBody)}</pre
                                       >
-                                      <div class="mt-2 flex justify-start">
+                                      <div class="mt-2 flex justify-start gap-2">
                                         <button
                                           class="h-7 text-xs px-2.5 rounded-lg ac-btn-secondary"
                                           onclick=${() =>
@@ -916,6 +980,19 @@ ${jsonPretty(item.gatewayBody)}</pre
                                         >
                                           Copy
                                         </button>
+                                        ${item.status === "error"
+                                          ? html`<${ActionButton}
+                                              onClick=${() =>
+                                                handleAskAgentToDebug(item)}
+                                              loading=${debugLoadingRequestId ===
+                                              item.id}
+                                              tone="primary"
+                                              size="sm"
+                                              idleLabel="Ask agent to debug"
+                                              loadingLabel="Loading..."
+                                              className="h-7 px-2.5"
+                                            />`
+                                          : null}
                                       </div>
                                     </div>
                                   </div>
@@ -1058,6 +1135,30 @@ ${jsonPretty(item.gatewayBody)}</pre
         }}
         onConfirm=${handleDeleteConfirmed}
       />
+      <${AgentSendModal}
+        visible=${!!debugRequest}
+        title="Ask agent to debug"
+        messageLabel="Debug request"
+        messageRows=${12}
+        initialMessage=${debugAgentMessage}
+        resetKey=${String(debugRequest?.id || "")}
+        submitLabel="Send debug request"
+        loadingLabel="Sending..."
+        onClose=${() => setDebugRequest(null)}
+        onSubmit=${async ({ selectedSessionKey, message }) => {
+          try {
+            await sendAgentMessage({
+              message,
+              sessionKey: selectedSessionKey,
+            });
+            showToast("Debug request sent to agent", "success");
+            return true;
+          } catch (err) {
+            showToast(err.message || "Could not send debug request", "error");
+            return false;
+          }
+        }}
+      />
     </div>
   `;
 };

package/lib/server/constants.js

@@ -6,6 +6,7 @@ const { parsePositiveInt } = require("./utils/number");
 // Portable root directory: --root-dir flag sets ALPHACLAW_ROOT_DIR before require
 const kRootDir =
   process.env.ALPHACLAW_ROOT_DIR || path.join(os.homedir(), ".alphaclaw");
+const ALPHACLAW_DIR = kRootDir;
 const kPackageRoot = path.resolve(__dirname, "..");
 const kNpmPackageRoot = path.resolve(kPackageRoot, "..");
 const kSetupDir = path.join(kPackageRoot, "setup");
@@ -18,6 +19,8 @@ const OPENCLAW_DIR = path.join(kRootDir, ".openclaw");
 const GATEWAY_TOKEN = process.env.OPENCLAW_GATEWAY_TOKEN || "";
 const ENV_FILE_PATH = path.join(kRootDir, ".env");
 const WORKSPACE_DIR = path.join(OPENCLAW_DIR, "workspace");
+const kOnboardingMarkerPath = path.join(ALPHACLAW_DIR, "onboarded.json");
+const kControlUiSkillPath = path.join(OPENCLAW_DIR, "skills", "control-ui", "SKILL.md");
 const AUTH_PROFILES_PATH = path.join(
   OPENCLAW_DIR,
   "agents",
@@ -346,6 +349,7 @@ const SETUP_API_PREFIXES = [
 ];
 
 module.exports = {
+  ALPHACLAW_DIR,
   kRootDir,
   kPackageRoot,
   kNpmPackageRoot,
@@ -358,6 +362,8 @@ module.exports = {
   GATEWAY_TOKEN,
   ENV_FILE_PATH,
   WORKSPACE_DIR,
+  kOnboardingMarkerPath,
+  kControlUiSkillPath,
   AUTH_PROFILES_PATH,
   CODEX_PROFILE_ID,
   CODEX_OAUTH_CLIENT_ID,

package/lib/server/gateway.js

@@ -1,3 +1,4 @@
+const path = require("path");
 const { spawn, execSync } = require("child_process");
 const fs = require("fs");
 const net = require("net");
@@ -5,7 +6,9 @@ const {
   OPENCLAW_DIR,
   GATEWAY_HOST,
   GATEWAY_PORT,
+  kControlUiSkillPath,
   kChannelDefs,
+  kOnboardingMarkerPath,
   kRootDir,
 } = require("./constants");
 
@@ -45,7 +48,7 @@ const gatewayEnv = () => ({
   XDG_CONFIG_HOME: OPENCLAW_DIR,
 });
 
-const isOnboarded = () => {
+const hasOnboardingModelConfig = () => {
   const configPath = `${OPENCLAW_DIR}/openclaw.json`;
   if (!fs.existsSync(configPath)) return false;
   try {
@@ -59,6 +62,43 @@ const isOnboarded = () => {
   }
 };
 
+const hasLegacyOnboardingArtifacts = () => fs.existsSync(kControlUiSkillPath);
+
+const writeOnboardingMarker = (reason) => {
+  try {
+    fs.mkdirSync(path.dirname(kOnboardingMarkerPath), { recursive: true });
+    fs.writeFileSync(
+      kOnboardingMarkerPath,
+      JSON.stringify(
+        {
+          onboarded: true,
+          reason: String(reason || "unknown"),
+          markedAt: new Date().toISOString(),
+        },
+        null,
+        2,
+      ),
+    );
+    return true;
+  } catch (err) {
+    console.error(`[alphaclaw] Failed to write onboarding marker: ${err.message}`);
+    return false;
+  }
+};
+
+const isOnboarded = () => {
+  if (fs.existsSync(kOnboardingMarkerPath)) return true;
+  if (hasOnboardingModelConfig()) {
+    writeOnboardingMarker("config_primary_model");
+    return true;
+  }
+  if (hasLegacyOnboardingArtifacts()) {
+    writeOnboardingMarker("legacy_artifact_backfill");
+    return true;
+  }
+  return false;
+};
+
 const isGatewayRunning = () =>
   new Promise((resolve) => {
     const sock = net.createConnection(GATEWAY_PORT, GATEWAY_HOST);

package/lib/server/gmail-watch.js

@@ -70,19 +70,22 @@ const ensureTopicPathForClient = ({
   const normalizedClient = String(client || "default").trim() || "default";
   const push = getGmailPushConfig(state);
   const existingTopic = String(push.topics?.[normalizedClient] || "").trim();
-  if (existingTopic) {
+  const requestedProjectId = String(projectIdOverride || "").trim();
+  const existingProjectId = parseProjectIdFromTopicPath(existingTopic);
+  if (existingTopic && (!requestedProjectId || requestedProjectId === existingProjectId)) {
     return { state, topicPath: existingTopic };
   }
   const credentials = readGoogleCredentials(normalizedClient);
   const projectId =
-    String(projectIdOverride || "").trim() ||
+    requestedProjectId ||
     String(credentials?.projectId || "").trim();
   if (!projectId) {
     throw new Error(
       `Could not detect GCP project_id for client "${normalizedClient}". Save Google credentials first.`,
     );
   }
-  const topicName = createTopicNameForClient(normalizedClient);
+  const topicName =
+    parseTopicName(existingTopic) || createTopicNameForClient(normalizedClient);
   const topicPath = `projects/${projectId}/topics/${topicName}`;
   const updated = setGmailPushConfig({
     state,

package/lib/server/onboarding/index.js

@@ -34,7 +34,7 @@ const createOnboardingService = ({
   getBaseUrl,
   startGateway,
 }) => {
-  const { OPENCLAW_DIR, WORKSPACE_DIR } = constants;
+  const { OPENCLAW_DIR, WORKSPACE_DIR, kOnboardingMarkerPath } = constants;
 
   const verifyGithubSetup = async ({
     githubRepoInput,
@@ -160,6 +160,19 @@ const createOnboardingService = ({
 
     installHourlyGitSyncScript({ fs, openclawDir: OPENCLAW_DIR });
     await installHourlyGitSyncCron({ fs, openclawDir: OPENCLAW_DIR });
+    fs.mkdirSync(path.dirname(kOnboardingMarkerPath), { recursive: true });
+    fs.writeFileSync(
+      kOnboardingMarkerPath,
+      JSON.stringify(
+        {
+          onboarded: true,
+          reason: "onboarding_complete",
+          markedAt: new Date().toISOString(),
+        },
+        null,
+        2,
+      ),
+    );
 
     try {
       await shellCmd(`alphaclaw git-sync -m "initial setup"`, {

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

@@ -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.7",
   "publishConfig": {
     "access": "public"
   },