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

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,56 @@ const gatewayEnv = () => ({
   XDG_CONFIG_HOME: OPENCLAW_DIR,
 });
 
-const isOnboarded = () => fs.existsSync(`${OPENCLAW_DIR}/openclaw.json`);
+const hasOnboardingModelConfig = () => {
+  const configPath = `${OPENCLAW_DIR}/openclaw.json`;
+  if (!fs.existsSync(configPath)) return false;
+  try {
+    const config = JSON.parse(fs.readFileSync(configPath, "utf8"));
+    const primaryModel = String(
+      config?.agents?.defaults?.model?.primary || "",
+    ).trim();
+    return primaryModel.includes("/");
+  } catch {
+    return false;
+  }
+};
+
+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) => {
@@ -133,6 +185,19 @@ const launchGatewayProcess = () => {
   return child;
 };
 
+const markManagedGatewayExitExpected = () => {
+  if (
+    !gatewayChild ||
+    gatewayChild.exitCode !== null ||
+    gatewayChild.killed ||
+    !gatewayChild.pid
+  ) {
+    return false;
+  }
+  expectedExitPids.add(gatewayChild.pid);
+  return true;
+};
+
 const startGateway = async () => {
   if (!isOnboarded()) {
     console.log("[alphaclaw] Not onboarded yet — skipping gateway start");
@@ -148,34 +213,8 @@ const startGateway = async () => {
 
 const restartGateway = (reloadEnv) => {
   reloadEnv();
-  if (gatewayChild && gatewayChild.exitCode === null && !gatewayChild.killed) {
-    console.log("[alphaclaw] Stopping managed gateway process...");
-    try {
-      expectedExitPids.add(gatewayChild.pid);
-      gatewayChild.kill("SIGTERM");
-      gatewayChild = null;
-    } catch (e) {
-      console.log(
-        `[alphaclaw] Failed to stop managed gateway process: ${e.message}`,
-      );
-      runGatewayCmd("stop");
-    }
-  } else {
-    runGatewayCmd("stop");
-  }
-  runGatewayCmd("start");
-  const launchWhenReady = async () => {
-    const waitUntil = Date.now() + 8000;
-    while (Date.now() < waitUntil) {
-      if (!(await isGatewayRunning())) break;
-      await new Promise((resolve) => setTimeout(resolve, 250));
-    }
-    console.log(
-      "[alphaclaw] Starting openclaw gateway with refreshed environment...",
-    );
-    launchGatewayProcess();
-  };
-  void launchWhenReady();
+  markManagedGatewayExitExpected();
+  runGatewayCmd("--force");
 };
 
 const attachGatewaySignalHandlers = () => {

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

@@ -29,11 +29,12 @@ const createOnboardingService = ({
   resolveGithubRepoUrl,
   resolveModelProvider,
   hasCodexOauthProfile,
+  authProfiles,
   ensureGatewayProxyConfig,
   getBaseUrl,
   startGateway,
 }) => {
-  const { OPENCLAW_DIR, WORKSPACE_DIR } = constants;
+  const { OPENCLAW_DIR, WORKSPACE_DIR, kOnboardingMarkerPath } = constants;
 
   const verifyGithubSetup = async ({
     githubRepoInput,
@@ -148,6 +149,7 @@ const createOnboardingService = ({
     } catch {}
 
     writeSanitizedOpenclawConfig({ fs, openclawDir: OPENCLAW_DIR, varMap });
+    authProfiles?.syncConfigAuthReferencesForAgent?.();
     ensureGatewayProxyConfig(getBaseUrl(req));
 
     installControlUiSkill({
@@ -158,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/onboarding/validation.js

@@ -46,7 +46,7 @@ const validateOnboardingInput = ({ vars, modelKey, resolveModelProvider, hasCode
   const hasAiByProvider = {
     anthropic: !!(varMap.ANTHROPIC_API_KEY || varMap.ANTHROPIC_TOKEN),
     openai: !!varMap.OPENAI_API_KEY,
-    "openai-codex": !!(hasCodexOauth || varMap.OPENAI_API_KEY),
+    "openai-codex": !!hasCodexOauth,
     google: !!varMap.GEMINI_API_KEY,
   };
   const hasAnyAi = !!(
@@ -68,7 +68,7 @@ const validateOnboardingInput = ({ vars, modelKey, resolveModelProvider, hasCode
       return {
         ok: false,
         status: 400,
-        error: "Connect OpenAI Codex OAuth or provide OPENAI_API_KEY before continuing",
+        error: "Connect OpenAI Codex OAuth before continuing",
       };
     }
     return {

package/lib/server/routes/models.js

@@ -19,7 +19,49 @@ const registerModelRoutes = ({
   parseJsonFromNoisyOutput,
   normalizeOnboardingModels,
   authProfiles,
+  readEnvFile,
+  writeEnvFile,
+  reloadEnv,
 }) => {
+  const upsertEnvVar = (items, key, value) => {
+    const next = Array.isArray(items) ? [...items] : [];
+    const existing = next.find((entry) => entry.key === key);
+    if (existing) {
+      existing.value = value;
+      return next;
+    }
+    next.push({ key, value });
+    return next;
+  };
+
+  const syncEnvVarsForProfiles = (profiles) => {
+    if (
+      !Array.isArray(profiles) ||
+      typeof readEnvFile !== "function" ||
+      typeof writeEnvFile !== "function" ||
+      typeof reloadEnv !== "function"
+    ) {
+      return;
+    }
+    let nextEnvVars = readEnvFile();
+    let changed = false;
+    for (const profile of profiles) {
+      if (profile?.type !== "api_key") continue;
+      const envKey = authProfiles.getEnvVarForApiKeyProvider?.(profile.provider);
+      const envValue = String(profile?.key || "").trim();
+      if (!envKey || !envValue) continue;
+      const prevValue = String(
+        nextEnvVars.find((entry) => entry.key === envKey)?.value || "",
+      );
+      if (prevValue === envValue) continue;
+      nextEnvVars = upsertEnvVar(nextEnvVars, envKey, envValue);
+      changed = true;
+    }
+    if (!changed) return;
+    writeEnvFile(nextEnvVars);
+    reloadEnv();
+  };
+
   // ── Existing CLI-backed catalog/status routes ──
 
   app.get("/api/models", async (req, res) => {
@@ -134,6 +176,7 @@ const registerModelRoutes = ({
             authProfiles.upsertProfile(profileId, credential, agentId);
           }
         }
+        syncEnvVarsForProfiles(profiles);
       }
 
       if (authOrder && typeof authOrder === "object") {
@@ -200,6 +243,7 @@ const registerModelRoutes = ({
     try {
       const agentId = req.query.agentId || undefined;
       authProfiles.upsertProfile(profileId, credential, agentId);
+      syncEnvVarsForProfiles([{ id: profileId, ...credential }]);
       res.json({ ok: true });
     } catch (err) {
       res

package/lib/server/routes/onboarding.js

@@ -71,6 +71,7 @@ const registerOnboardingRoutes = ({
   resolveGithubRepoUrl,
   resolveModelProvider,
   hasCodexOauthProfile,
+  authProfiles,
   ensureGatewayProxyConfig,
   getBaseUrl,
   startGateway,
@@ -85,6 +86,7 @@ const registerOnboardingRoutes = ({
     resolveGithubRepoUrl,
     resolveModelProvider,
     hasCodexOauthProfile,
+    authProfiles,
     ensureGatewayProxyConfig,
     getBaseUrl,
     startGateway,

package/lib/server/routes/system.js

@@ -17,10 +17,10 @@ const registerSystemRoutes = ({
   alphaclawVersionService,
   clawCmd,
   restartGateway,
-  onExpectedGatewayRestart,
   OPENCLAW_DIR,
   restartRequiredState,
   topicRegistry,
+  authProfiles,
 }) => {
   let envRestartPending = false;
   const kEnvVarsReservedForUserInput = new Set([
@@ -58,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 {
@@ -74,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;
@@ -82,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}`;
@@ -93,6 +99,34 @@ const registerSystemRoutes = ({
     }
     return key || "Session";
   };
+  const syncApiKeyAuthProfilesFromEnvVars = (nextEnvVars) => {
+    if (!authProfiles) return;
+    const envMap = new Map(
+      (nextEnvVars || []).map((entry) => [
+        String(entry?.key || "").trim(),
+        String(entry?.value || ""),
+      ]),
+    );
+    const providers = [
+      "anthropic",
+      "openai",
+      "google",
+      "mistral",
+      "voyage",
+      "groq",
+      "deepgram",
+    ];
+    for (const provider of providers) {
+      const envKey = authProfiles.getEnvVarForApiKeyProvider?.(provider);
+      if (!envKey) continue;
+      const value = envMap.get(envKey) || "";
+      if (!value.trim()) {
+        authProfiles.removeApiKeyProfileForEnvVar?.(provider);
+        continue;
+      }
+      authProfiles.upsertApiKeyProfileForEnvVar(provider, value);
+    }
+  };
   const listSendableAgentSessions = async () => {
     const result = await clawCmd("sessions --json", { quiet: true });
     if (!result.ok) {
@@ -168,6 +202,7 @@ const registerSystemRoutes = ({
     }
     return getSystemCronStatus();
   };
+  const isVisibleInEnvars = (def) => def?.visibleInEnvars !== false;
 
   app.get("/api/env", (req, res) => {
     const fileVars = readEnvFile();
@@ -175,6 +210,7 @@ const registerSystemRoutes = ({
 
     for (const def of kKnownVars) {
       if (isReservedUserEnvVar(def.key)) continue;
+      if (!isVisibleInEnvars(def)) continue;
       const fileEntry = fileVars.find((v) => v.key === def.key);
       const value = fileEntry?.value || "";
       merged.push({
@@ -183,6 +219,7 @@ const registerSystemRoutes = ({
         label: def.label,
         group: def.group,
         hint: def.hint,
+        features: def.features,
         source: fileEntry?.value ? "env_file" : "unset",
         editable: true,
       });
@@ -232,10 +269,25 @@ const registerSystemRoutes = ({
     const existingLockedVars = readEnvFile().filter((v) =>
       isReservedUserEnvVar(v.key),
     );
-    const nextEnvVars = [...filtered, ...existingLockedVars];
+    const hiddenKnownVarKeys = new Set(
+      kKnownVars
+        .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,
+    ];
     syncChannelConfig(nextEnvVars, "remove");
     writeEnvFile(nextEnvVars);
     const changed = reloadEnv();
+    syncApiKeyAuthProfilesFromEnvVars(nextEnvVars);
     if (changed && isOnboarded()) {
       envRestartPending = true;
     }
@@ -361,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 +=
@@ -380,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 || "" });
   });
@@ -417,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

@@ -204,6 +204,9 @@ registerModelRoutes({
   parseJsonFromNoisyOutput,
   normalizeOnboardingModels,
   authProfiles,
+  readEnvFile,
+  writeEnvFile,
+  reloadEnv,
 });
 registerOnboardingRoutes({
   app,
@@ -217,6 +220,7 @@ registerOnboardingRoutes({
   resolveGithubRepoUrl,
   resolveModelProvider,
   hasCodexOauthProfile: authProfiles.hasCodexOauthProfile,
+  authProfiles,
   ensureGatewayProxyConfig,
   getBaseUrl,
   startGateway,
@@ -238,10 +242,10 @@ registerSystemRoutes({
   alphaclawVersionService,
   clawCmd,
   restartGateway,
-  onExpectedGatewayRestart: () => watchdog.onExpectedRestart(),
   OPENCLAW_DIR: constants.OPENCLAW_DIR,
   restartRequiredState,
   topicRegistry,
+  authProfiles,
 });
 registerBrowseRoutes({
   app,

package/lib/setup/env.template

@@ -6,6 +6,7 @@ ANTHROPIC_API_KEY=
 ANTHROPIC_TOKEN=
 OPENAI_API_KEY=
 GEMINI_API_KEY=
+ELEVENLABS_API_KEY=
 
 # --- GitHub (required) ---
 GITHUB_TOKEN=

package/package.json

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