@chrysb/alphaclaw 0.9.28 → 0.9.29

package/lib/public/js/components/onboarding/welcome-config.js

@@ -53,12 +53,16 @@ const getAiGroupError = (vals, ctx = {}) => {
   if (!hasValue(vals.MODEL_KEY) || !String(vals.MODEL_KEY).includes("/")) {
     return "Choose a model to continue.";
   }
-  if (ctx.selectedProvider === "openai-codex" && ctx.codexLoading) {
+  if (
+    ctx.selectedProvider === "openai-codex" &&
+    ctx.codexLoading &&
+    !ctx.hasAi
+  ) {
     return "Checking Codex OAuth status. Try Next again in a moment.";
   }
   if (!ctx.hasAi) {
     return ctx.selectedProvider === "openai-codex"
-      ? "Connect Codex OAuth to continue."
+      ? "Connect Codex OAuth or enter an OpenAI API key to continue."
       : "Add credentials for the selected model provider to continue.";
   }
   return "";

package/lib/public/js/components/onboarding/welcome-setup-step.js

@@ -2,6 +2,7 @@ import { h } from "preact";
 import { useEffect, useState } from "preact/hooks";
 import htm from "htm";
 import { LoadingSpinner } from "../loading-spinner.js";
+import { fetchOnboardProgress } from "../../lib/api.js";
 
 const html = htm.bind(h);
 const kSetupTips = [
@@ -30,9 +31,24 @@ const kSetupTips = [
     text: "Be incredibly careful installing skills from the internet - they may contain malicious code.",
   },
 ];
+const kDefaultProgress = {
+  stage: "creating_repo",
+  message: "Creating repo...",
+};
+const kProgressStepNumbers = {
+  creating_repo: 1,
+  running_openclaw_onboard: 2,
+  initial_git_push: 3,
+  starting_gateway: 4,
+};
+const kProgressPollIntervalMs = 500;
+const kProgressDotsIntervalMs = 450;
+const kProgressDotSlots = [1, 2, 3];
 
 export const WelcomeSetupStep = ({ error, loading, onRetry, onBack }) => {
   const [tipIndex, setTipIndex] = useState(0);
+  const [progress, setProgress] = useState(kDefaultProgress);
+  const [progressDotCount, setProgressDotCount] = useState(1);
 
   useEffect(() => {
     if (error || !loading) return;
@@ -42,6 +58,35 @@ export const WelcomeSetupStep = ({ error, loading, onRetry, onBack }) => {
     return () => clearInterval(timer);
   }, [error, loading]);
 
+  useEffect(() => {
+    if (error || !loading) return;
+    let cancelled = false;
+    const refreshProgress = async () => {
+      try {
+        const progress = await fetchOnboardProgress();
+        if (!cancelled && progress?.message) {
+          setProgress(progress);
+        }
+      } catch {}
+    };
+    setProgress(kDefaultProgress);
+    refreshProgress();
+    const timer = setInterval(refreshProgress, kProgressPollIntervalMs);
+    return () => {
+      cancelled = true;
+      clearInterval(timer);
+    };
+  }, [error, loading]);
+
+  useEffect(() => {
+    if (error || !loading) return;
+    setProgressDotCount(1);
+    const timer = setInterval(() => {
+      setProgressDotCount((count) => (count % 3) + 1);
+    }, kProgressDotsIntervalMs);
+    return () => clearInterval(timer);
+  }, [error, loading]);
+
   if (error) {
     return html`
       <div class="py-4 flex flex-col items-center text-center gap-3">
@@ -77,6 +122,8 @@ export const WelcomeSetupStep = ({ error, loading, onRetry, onBack }) => {
   }
 
   const currentTip = kSetupTips[tipIndex];
+  const progressStep = kProgressStepNumbers[progress.stage] || 1;
+  const progressLabel = (progress.message || kDefaultProgress.message).replace(/\.{1,3}$/, "");
 
   return html`
     <div class="relative min-h-[320px] pt-4 pb-20 flex">
@@ -84,10 +131,17 @@ export const WelcomeSetupStep = ({ error, loading, onRetry, onBack }) => {
         class="flex-1 flex flex-col items-center justify-center text-center gap-4"
       >
         <${LoadingSpinner} className="h-8 w-8 text-body" />
-        <h3 class="text-lg font-semibold text-body">
-          Initializing OpenClaw...
-        </h3>
-        <p class="text-sm text-fg-muted">This could take 10-15 seconds</p>
+        <h3 class="text-lg font-semibold text-body">Initializing AlphaClaw...</h3>
+        <p class="text-sm text-fg-muted">
+          ${progressStep} / 4: ${progressLabel}<span class="inline-flex" aria-hidden="true"
+            >${kProgressDotSlots.map(
+              (slot) => html`<span style=${{ visibility: slot <= progressDotCount ? "visible" : "hidden" }}
+                >.</span
+              >`,
+            )}</span
+          >
+        </p>
+        <p class="text-xs text-fg-muted">This could take up to 30 seconds</p>
       </div>
       <div
         class="absolute bottom-3 left-3 right-3 bg-field border border-border rounded-lg px-3 py-2 text-xs text-fg-muted"

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

@@ -9,9 +9,11 @@ import {
 import { useCachedFetch } from "../../hooks/use-cached-fetch.js";
 import { usePolling } from "../../hooks/usePolling.js";
 import {
-  getModelProvider,
   getAuthProviderFromModelProvider,
   getFeaturedModels,
+  getOnboardingModelProvider,
+  getOnboardingModels,
+  isDeprecatedOnboardingModelKey,
   getVisibleAiFieldKeys,
   kProviderAuthFields,
 } from "../../lib/model-config.js";
@@ -167,7 +169,7 @@ export const useWelcome = ({ onComplete }) => {
   };
 
   const applyModelCatalog = useCallback((payload) => {
-    const list = getModelCatalogModels(payload);
+    const list = getOnboardingModels(getModelCatalogModels(payload));
     if (!payload) return;
     const isRefreshing = isModelCatalogRefreshing(payload);
     const isFallbackRefresh =
@@ -181,11 +183,14 @@ export const useWelcome = ({ onComplete }) => {
           : null
         : "No models found",
     );
+    const currentModelIsDeprecated = isDeprecatedOnboardingModelKey(
+      vals.MODEL_KEY,
+    );
     const defaultModelKey = getInitialOnboardingModelKey({
       catalog: list,
-      currentModelKey: vals.MODEL_KEY,
+      currentModelKey: currentModelIsDeprecated ? "" : vals.MODEL_KEY,
     });
-    if (!vals.MODEL_KEY && defaultModelKey) {
+    if ((!vals.MODEL_KEY || currentModelIsDeprecated) && defaultModelKey) {
       setVals((prev) => ({ ...prev, MODEL_KEY: defaultModelKey }));
     }
   }, [setVals, vals.MODEL_KEY]);
@@ -212,16 +217,18 @@ export const useWelcome = ({ onComplete }) => {
   }, [modelsFetchState.error]);
 
   const getValidationContext = (currentVals = {}) => {
-    const currentSelectedProvider = getModelProvider(
-      String(currentVals.MODEL_KEY || "").trim(),
-    );
+    const currentSelectedProvider = getOnboardingModelProvider({
+      modelKey: currentVals.MODEL_KEY,
+      models,
+    });
     const currentSelectedAuthProvider =
       getAuthProviderFromModelProvider(currentSelectedProvider);
     const currentProviderAuthFields =
       kProviderAuthFields[currentSelectedAuthProvider] || [];
     const currentHasAi =
       currentSelectedProvider === "openai-codex"
-        ? !!codexStatus.connected
+        ? !!codexStatus.connected ||
+          !!String(currentVals.OPENAI_API_KEY || "").trim()
         : currentProviderAuthFields.some((field) =>
             !!String(currentVals[field.key] || "").trim(),
           );

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

@@ -818,6 +818,11 @@ export async function fetchOnboardStatus() {
   return res.json();
 }
 
+export async function fetchOnboardProgress() {
+  const res = await authFetch("/api/onboard/progress");
+  return res.json();
+}
+
 export async function runOnboard(vars, modelKey, { importMode = false } = {}) {
   const res = await authFetch("/api/onboard", {
     method: "POST",

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

@@ -25,13 +25,6 @@ export const kFeaturedModelDefs = [
     label: "Sonnet 4.6",
     preferredKeys: ["anthropic/claude-sonnet-4-6"],
   },
-  {
-    label: "Codex 5.3",
-    preferredKeys: [
-      "openai/gpt-5.3-codex",
-      "openai-codex/gpt-5.3-codex",
-    ],
-  },
   {
     label: "GPT-5.5",
     preferredKeys: ["openai/gpt-5.5", "openai-codex/gpt-5.5"],
@@ -42,6 +35,36 @@ export const kFeaturedModelDefs = [
   },
 ];
 
+const kDeprecatedOnboardingModelKeys = new Set([
+  "openai/gpt-5.3-codex",
+  "openai-codex/gpt-5.3-codex",
+]);
+const kCanonicalCodexOauthModelKeys = new Set([
+  "openai/gpt-5.4-mini",
+  "openai/gpt-5.5",
+]);
+
+export const isDeprecatedOnboardingModelKey = (modelKey) =>
+  kDeprecatedOnboardingModelKeys.has(String(modelKey || "").trim());
+
+export const getOnboardingModels = (models = []) =>
+  models.filter(
+    (model) => !isDeprecatedOnboardingModelKey(model?.key),
+  );
+
+export const getOnboardingModelProvider = ({ modelKey, models = [] } = {}) => {
+  const normalizedKey = String(modelKey || "").trim();
+  const model = models.find((candidate) => candidate?.key === normalizedKey);
+  if (
+    getModelProvider(normalizedKey) === "openai-codex" ||
+    kCanonicalCodexOauthModelKeys.has(normalizedKey) ||
+    model?.agentRuntime?.id === "codex"
+  ) {
+    return "openai-codex";
+  }
+  return getModelProvider(normalizedKey);
+};
+
 export const kAlwaysAvailableModelDefs = [
   {
     key: "openai/gpt-5.4-mini",
@@ -345,7 +368,6 @@ export const kFeatureDefs = [
 ];
 
 export const getVisibleAiFieldKeys = (provider) => {
-  if (provider === "openai-codex") return new Set();
   const authProvider = getAuthProviderFromModelProvider(provider);
   const fields = kProviderAuthFields[authProvider] || [];
   return new Set(fields.map((field) => field.key));

package/lib/server/onboarding/index.js

@@ -369,7 +369,14 @@ const createOnboardingService = ({
     vars,
     modelKey,
     importMode = false,
+    onProgress,
   }) => {
+    const reportProgress = (stage) => {
+      if (typeof onProgress !== "function") return;
+      try {
+        onProgress(stage);
+      } catch {}
+    };
     const validation = validateOnboardingInput({
       vars,
       modelKey,
@@ -425,6 +432,7 @@ const createOnboardingService = ({
     syncApiKeyAuthProfilesFromEnvVars(authProfiles, varsToSave);
 
     const [, repoName] = repoUrl.split("/");
+    reportProgress("creating_repo");
     const repoCheck = await ensureGithubRepoAccessible({
       repoUrl,
       repoName,
@@ -481,6 +489,7 @@ const createOnboardingService = ({
       );
     }
 
+    reportProgress("running_openclaw_onboard");
     if (!existingConfigPresent) {
       const onboardArgs = buildOnboardArgs({
         varMap,
@@ -551,6 +560,7 @@ const createOnboardingService = ({
 
     ensureGatewayProxyConfig(getBaseUrl(req));
 
+    reportProgress("initial_git_push");
     try {
       const commitMsg = importMode
         ? "imported existing setup via AlphaClaw"
@@ -567,6 +577,7 @@ const createOnboardingService = ({
       console.error("[onboard] Git push error:", e.message);
     }
 
+    reportProgress("starting_gateway");
     runOnboardedBootSequence();
     return { status: 200, body: { ok: true } };
   };

package/lib/server/onboarding/validation.js

@@ -2,6 +2,14 @@ const { getEnvVarForApiKeyProvider } = require("../auth-profiles");
 
 const kAnthropicSetupTokenPrefix = "sk-ant-oat01-";
 const kAnthropicApiKeyPrefix = "sk-ant-api";
+const kCanonicalCodexOauthModelKeys = new Set([
+  "openai/gpt-5.4-mini",
+  "openai/gpt-5.5",
+]);
+
+const usesCodexOauth = (modelKey, provider) =>
+  provider === "openai-codex" ||
+  kCanonicalCodexOauthModelKeys.has(String(modelKey || "").trim());
 
 const validateAnthropicCredentialShape = (varMap) => {
   const anthropicToken = String(varMap.ANTHROPIC_TOKEN || "").trim();
@@ -71,7 +79,10 @@ const validateOnboardingInput = ({ vars, modelKey, resolveModelProvider, hasCode
   if (!anthropicValidation.ok) return anthropicValidation;
   const githubToken = String(varMap.GITHUB_TOKEN || "");
   const githubRepoInput = String(varMap.GITHUB_WORKSPACE_REPO || "").trim();
-  const selectedProvider = resolveModelProvider(modelKey);
+  const resolvedProvider = resolveModelProvider(modelKey);
+  const selectedProvider = usesCodexOauth(modelKey, resolvedProvider)
+    ? "openai-codex"
+    : resolvedProvider;
   const hasCodexOauth = hasCodexOauthProfile();
   const hasAnyAi = !!(
     varMap.ANTHROPIC_API_KEY ||
@@ -82,7 +93,7 @@ const validateOnboardingInput = ({ vars, modelKey, resolveModelProvider, hasCode
   );
   const hasAi = (() => {
     if (selectedProvider === "openai-codex") {
-      return hasCodexOauth;
+      return hasCodexOauth || !!String(varMap.OPENAI_API_KEY || "").trim();
     }
     if (selectedProvider === "anthropic") {
       return !!(varMap.ANTHROPIC_API_KEY || varMap.ANTHROPIC_TOKEN);
@@ -101,7 +112,7 @@ const validateOnboardingInput = ({ vars, modelKey, resolveModelProvider, hasCode
       return {
         ok: false,
         status: 400,
-        error: "Connect OpenAI Codex OAuth before continuing",
+        error: "Connect OpenAI Codex OAuth or add an OpenAI API key before continuing",
       };
     }
     return {

package/lib/server/routes/onboarding.js

@@ -95,6 +95,28 @@ const registerOnboardingRoutes = ({
   getBaseUrl,
   runOnboardedBootSequence,
 }) => {
+  const kOnboardingProgressMessages = {
+    creating_repo: "Creating repo...",
+    running_openclaw_onboard: "Running openclaw onboard...",
+    initial_git_push: "Initial git commit/push...",
+    starting_gateway: "Starting gateway...",
+  };
+  let onboardingProgress = {
+    active: false,
+    stage: "idle",
+    message: "",
+    updatedAt: null,
+  };
+  const setOnboardingProgress = (stage, { active = true } = {}) => {
+    const normalizedStage = String(stage || "").trim();
+    onboardingProgress = {
+      active,
+      stage: normalizedStage,
+      message: kOnboardingProgressMessages[normalizedStage] || "",
+      updatedAt: new Date().toISOString(),
+    };
+  };
+
   // Keep mutating onboarding routes marker-gated so in-progress imports
   // can promote files before the final completion marker is written.
   const hasExplicitOnboardingMarker = () =>
@@ -157,21 +179,32 @@ const registerOnboardingRoutes = ({
     res.json({ onboarded: hasExplicitOnboardingMarker() });
   });
 
+  app.get("/api/onboard/progress", (req, res) => {
+    res.json(onboardingProgress);
+  });
+
   app.post("/api/onboard", async (req, res) => {
     if (hasExplicitOnboardingMarker())
       return res.json({ ok: false, error: "Already onboarded" });
 
     try {
+      setOnboardingProgress("creating_repo");
       const { vars, modelKey, importMode } = req.body;
       const result = await onboardingService.completeOnboarding({
         req,
         vars,
         modelKey,
         importMode: !!importMode,
+        onProgress: (stage) => setOnboardingProgress(stage),
       });
+      setOnboardingProgress(
+        result.body?.ok ? "starting_gateway" : "failed",
+        { active: false },
+      );
       res.status(result.status).json(result.body);
     } catch (err) {
       console.error("[onboard] Error:", err);
+      setOnboardingProgress("failed", { active: false });
       res.status(500).json({ ok: false, error: sanitizeOnboardingError(err) });
     }
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chrysb/alphaclaw",
-  "version": "0.9.28",
+  "version": "0.9.29",
   "publishConfig": {
     "access": "public"
   },