@chrysb/alphaclaw 0.9.10 → 0.9.12

package/lib/public/js/components/welcome/use-welcome.js

@@ -1,4 +1,4 @@
-import { useEffect, useState } from "preact/hooks";
+import { useCallback, useEffect, useState } from "preact/hooks";
 import {
   runOnboard,
   verifyGithubOnboardingRepo,
@@ -7,6 +7,7 @@ import {
   fetchModels,
 } from "../../lib/api.js";
 import { useCachedFetch } from "../../hooks/use-cached-fetch.js";
+import { usePolling } from "../../hooks/usePolling.js";
 import {
   getModelProvider,
   getAuthProviderFromModelProvider,
@@ -17,7 +18,9 @@ import {
 import {
   getInitialOnboardingModelKey,
   getModelCatalogModels,
+  isModelCatalogRefreshing,
   kModelCatalogCacheKey,
+  kModelCatalogPollIntervalMs,
   preloadModelCatalog,
 } from "../../lib/model-catalog.js";
 import {
@@ -100,6 +103,7 @@ export const useWelcome = ({ onComplete }) => {
   const [models, setModels] = useState([]);
   const [modelsLoading, setModelsLoading] = useState(true);
   const [modelsError, setModelsError] = useState(null);
+  const [modelsRefreshing, setModelsRefreshing] = useState(false);
   const [showAllModels, setShowAllModels] = useState(false);
   const [loading, setLoading] = useState(false);
   const [githubStepLoading, setGithubStepLoading] = useState(false);
@@ -129,6 +133,11 @@ export const useWelcome = ({ onComplete }) => {
   const modelsFetchState = useCachedFetch(kModelCatalogCacheKey, fetchModels, {
     maxAgeMs: 30000,
   });
+  const modelsPoll = usePolling(fetchModels, kModelCatalogPollIntervalMs, {
+    enabled: modelsRefreshing,
+    pauseWhenHidden: true,
+    cacheKey: kModelCatalogCacheKey,
+  });
 
   useEffect(() => {
     // Warm the real catalog immediately so the AI step usually opens ready.
@@ -157,11 +166,21 @@ export const useWelcome = ({ onComplete }) => {
     }));
   };
 
-  useEffect(() => {
-    const list = getModelCatalogModels(modelsFetchState.data);
-    if (!modelsFetchState.data) return;
+  const applyModelCatalog = useCallback((payload) => {
+    const list = getModelCatalogModels(payload);
+    if (!payload) return;
+    const isRefreshing = isModelCatalogRefreshing(payload);
+    const isFallbackRefresh =
+      String(payload?.source || "") === "fallback" && isRefreshing;
     setModels(list);
-    setModelsError(list.length > 0 ? null : "No models found");
+    setModelsRefreshing(isRefreshing);
+    setModelsError(
+      list.length > 0
+        ? isFallbackRefresh
+          ? "Loading full model catalog..."
+          : null
+        : "No models found",
+    );
     const defaultModelKey = getInitialOnboardingModelKey({
       catalog: list,
       currentModelKey: vals.MODEL_KEY,
@@ -169,12 +188,22 @@ export const useWelcome = ({ onComplete }) => {
     if (!vals.MODEL_KEY && defaultModelKey) {
       setVals((prev) => ({ ...prev, MODEL_KEY: defaultModelKey }));
     }
-  }, [modelsFetchState.data, setVals, vals.MODEL_KEY]);
+  }, [setVals, vals.MODEL_KEY]);
+
+  useEffect(() => {
+    applyModelCatalog(modelsFetchState.data);
+  }, [applyModelCatalog, modelsFetchState.data]);
+
+  useEffect(() => {
+    applyModelCatalog(modelsPoll.data);
+  }, [applyModelCatalog, modelsPoll.data]);
 
   useEffect(() => {
     const hasModels = getModelCatalogModels(modelsFetchState.data).length > 0;
-    setModelsLoading(modelsFetchState.loading && !hasModels);
-  }, [modelsFetchState.data, modelsFetchState.loading]);
+    setModelsLoading(
+      (modelsFetchState.loading || modelsPoll.isPolling) && !hasModels,
+    );
+  }, [modelsFetchState.data, modelsFetchState.loading, modelsPoll.isPolling]);
 
   useEffect(() => {
     if (!modelsFetchState.error) return;

package/lib/public/js/lib/model-config.js

@@ -26,8 +26,8 @@ export const kFeaturedModelDefs = [
     preferredKeys: ["openai-codex/gpt-5.3-codex"],
   },
   {
-    label: "GPT-5.4",
-    preferredKeys: ["openai-codex/gpt-5.4"],
+    label: "GPT-5.5",
+    preferredKeys: ["openai-codex/gpt-5.5"],
   },
   {
     label: "Gemini 3.1 Pro",

package/lib/server/constants.js

@@ -1,6 +1,7 @@
 const os = require("os");
 const path = require("path");
 const kBrowseFilePolicies = require("../public/shared/browse-file-policies.json");
+const kBootstrapModelCatalog = require("./model-catalog-bootstrap.json");
 const { parsePositiveInt } = require("./utils/number");
 
 // Portable root directory: --root-dir flag sets ALPHACLAW_ROOT_DIR before require
@@ -90,7 +91,7 @@ const kOnboardingModelProviders = new Set([
   "groq",
   "vllm",
 ]);
-const kFallbackOnboardingModels = [
+const kMinimalFallbackOnboardingModels = [
   {
     key: "anthropic/claude-opus-4-7",
     provider: "anthropic",
@@ -112,9 +113,9 @@ const kFallbackOnboardingModels = [
     label: "Claude Haiku 4.6",
   },
   {
-    key: "openai-codex/gpt-5.4",
+    key: "openai-codex/gpt-5.5",
     provider: "openai-codex",
-    label: "GPT-5.4",
+    label: "GPT-5.5",
   },
   {
     key: "openai-codex/gpt-5.3-codex",
@@ -137,6 +138,11 @@ const kFallbackOnboardingModels = [
     label: "Gemini 3 Flash Preview",
   },
 ];
+const kFallbackOnboardingModels =
+  Array.isArray(kBootstrapModelCatalog.models) &&
+  kBootstrapModelCatalog.models.length > 0
+    ? kBootstrapModelCatalog.models
+    : kMinimalFallbackOnboardingModels;
 
 const kVersionCacheTtlMs = 60 * 1000;
 const kLatestVersionCacheTtlMs = 10 * 60 * 1000;

package/lib/server/gateway.js

@@ -11,11 +11,13 @@ const {
   kOnboardingMarkerPath,
   kRootDir,
 } = require("./constants");
+const { withOpenclawStartupEnv } = require("./openclaw-runtime-env");
 
 let gatewayChild = null;
 let gatewayExitHandler = null;
 let gatewayLaunchHandler = null;
 const kGatewayStderrTailLines = 50;
+const kPluginRuntimeDepsPreflightTimeoutMs = 120 * 1000;
 let gatewayStderrTail = [];
 const expectedExitPids = new Set();
 
@@ -41,14 +43,117 @@ const setGatewayLaunchHandler = (handler) => {
   gatewayLaunchHandler = typeof handler === "function" ? handler : null;
 };
 
-const gatewayEnv = () => ({
-  ...process.env,
-  HOME: kRootDir,
-  OPENCLAW_HOME: kRootDir,
-  OPENCLAW_CONFIG_PATH: `${OPENCLAW_DIR}/openclaw.json`,
-  OPENCLAW_STATE_DIR: OPENCLAW_DIR,
-  XDG_CONFIG_HOME: OPENCLAW_DIR,
-});
+const gatewayEnv = () =>
+  withOpenclawStartupEnv({
+    ...process.env,
+    HOME: kRootDir,
+    OPENCLAW_HOME: kRootDir,
+    OPENCLAW_CONFIG_PATH: `${OPENCLAW_DIR}/openclaw.json`,
+    OPENCLAW_STATE_DIR: OPENCLAW_DIR,
+    XDG_CONFIG_HOME: OPENCLAW_DIR,
+  });
+
+const resolveOpenclawExtensionsDir = () => {
+  try {
+    const entryPath = require.resolve("openclaw");
+    const entryDir = path.dirname(entryPath);
+    const distDir =
+      path.basename(entryDir) === "dist" ? entryDir : path.join(entryDir, "dist");
+    return path.join(distDir, "extensions");
+  } catch {
+    return "";
+  }
+};
+
+const isOpenclawInstallStageDir = (name) =>
+  name === ".openclaw-install-stage" ||
+  String(name || "").startsWith(".openclaw-install-stage-");
+
+const cleanupOpenclawPluginInstallStages = ({
+  extensionsDir = resolveOpenclawExtensionsDir(),
+} = {}) => {
+  if (!extensionsDir) return 0;
+  let removed = 0;
+  try {
+    for (const entry of fs.readdirSync(extensionsDir, { withFileTypes: true })) {
+      if (!entry?.isDirectory?.()) continue;
+      const pluginDir = path.join(extensionsDir, entry.name);
+      for (const child of fs.readdirSync(pluginDir, { withFileTypes: true })) {
+        if (!child?.isDirectory?.() || !isOpenclawInstallStageDir(child.name)) {
+          continue;
+        }
+        const stageDir = path.join(pluginDir, child.name);
+        fs.rmSync(stageDir, {
+          recursive: true,
+          force: true,
+          maxRetries: 3,
+          retryDelay: 100,
+        });
+        removed += 1;
+        console.log(`[alphaclaw] Removed stale OpenClaw plugin install stage: ${stageDir}`);
+      }
+    }
+  } catch (err) {
+    console.warn(
+      `[alphaclaw] Could not clean OpenClaw plugin install stages: ${err.message}`,
+    );
+  }
+  return removed;
+};
+
+const hasEnabledChannelConfig = () => {
+  try {
+    const configPath = `${OPENCLAW_DIR}/openclaw.json`;
+    if (!fs.existsSync(configPath)) return false;
+    const cfg = JSON.parse(fs.readFileSync(configPath, "utf8"));
+    const channels = cfg?.channels && typeof cfg.channels === "object" ? cfg.channels : {};
+    return Object.keys(kChannelDefs).some((channel) => channels?.[channel]?.enabled === true);
+  } catch {
+    return false;
+  }
+};
+
+const isInstallStageFailure = (err) =>
+  /ENOTEMPTY|openclaw-install-stage/i.test(
+    [
+      err?.message,
+      err?.stdout?.toString?.(),
+      err?.stderr?.toString?.(),
+    ]
+      .filter(Boolean)
+      .join("\n"),
+  );
+
+const runPluginRuntimeDepsPreflight = () =>
+  execSync("openclaw plugins list --json", {
+    env: gatewayEnv(),
+    timeout: kPluginRuntimeDepsPreflightTimeoutMs,
+    encoding: "utf8",
+  });
+
+const prepareOpenclawChannelPlugins = () => {
+  if (!hasEnabledChannelConfig()) return;
+  cleanupOpenclawPluginInstallStages();
+  try {
+    runPluginRuntimeDepsPreflight();
+  } catch (err) {
+    if (!isInstallStageFailure(err)) {
+      console.warn(
+        `[alphaclaw] OpenClaw plugin preflight failed: ${(err.stderr || err.message || "").toString().trim().slice(0, 300)}`,
+      );
+      return;
+    }
+    cleanupOpenclawPluginInstallStages();
+    try {
+      runPluginRuntimeDepsPreflight();
+      console.log("[alphaclaw] OpenClaw plugin preflight recovered after cleaning install stage");
+    } catch (retryErr) {
+      console.warn(
+        `[alphaclaw] OpenClaw plugin preflight retry failed: ${(retryErr.stderr || retryErr.message || "").toString().trim().slice(0, 300)}`,
+      );
+    }
+  }
+};
 
 const writeOnboardingMarker = (reason) => {
   fs.mkdirSync(ALPHACLAW_DIR, { recursive: true });
@@ -123,6 +228,9 @@ const isGatewayRunning = () =>
 const runGatewayCmd = (cmd) => {
   console.log(`[alphaclaw] Running: openclaw gateway ${cmd}`);
   try {
+    if (cmd === "--force" || cmd === "restart") {
+      prepareOpenclawChannelPlugins();
+    }
     const out = execSync(`openclaw gateway ${cmd}`, {
       env: gatewayEnv(),
       timeout: 15000,
@@ -147,6 +255,7 @@ const launchGatewayProcess = () => {
     );
     return gatewayChild;
   }
+  prepareOpenclawChannelPlugins();
   gatewayStderrTail = [];
   const child = spawn("openclaw", ["gateway", "run"], {
     env: gatewayEnv(),
@@ -505,6 +614,8 @@ module.exports = {
   isOnboarded,
   isGatewayRunning,
   launchGatewayProcess,
+  cleanupOpenclawPluginInstallStages,
+  prepareOpenclawChannelPlugins,
   setGatewayExitHandler,
   setGatewayLaunchHandler,
   runGatewayCmd,

package/lib/server/init/register-server-routes.js

@@ -99,6 +99,7 @@ const registerServerRoutes = ({
     normalizeOnboardingModels,
     readOpenclawVersion: (options) =>
       openclawVersionService?.readOpenclawVersion(options),
+    isOnboarded,
     authProfiles,
     readEnvFile,
     writeEnvFile,

package/lib/server/init/runtime-init.js

@@ -1,11 +1,13 @@
 const initializeServerRuntime = ({
   fs,
   constants,
+  ensureOpenclawStartupEnv,
   startEnvWatcher,
   attachGatewaySignalHandlers,
   cleanupStaleImportTempDirs,
   migrateManagedInternalFiles,
 }) => {
+  ensureOpenclawStartupEnv?.({ fsModule: fs });
   startEnvWatcher();
   attachGatewaySignalHandlers();
   cleanupStaleImportTempDirs();