@chrysb/alphaclaw 0.9.27 → 0.9.29

package/lib/public/js/components/doctor/findings-list.js

@@ -202,6 +202,9 @@ export const DoctorFindingsList = ({
                             <${Badge} tone=${getDoctorCategoryTone(card.category)}>
                               ${formatDoctorCategory(card.category)}
                             </${Badge}>
+                            ${card.status === "working"
+                              ? html`<${Badge} tone="info">Working</${Badge}>`
+                              : null}
                             ${
                               showRunMeta
                                 ? html`
@@ -314,8 +317,13 @@ export const DoctorFindingsList = ({
                       <${ActionButton}
                         onClick=${() => onAskAgentFix(card)}
                         loading=${busyCardId === card.id}
+                        disabled=${card.status !== "open"}
                         tone="primary"
-                        idleLabel="Ask agent to fix"
+                        idleLabel=${card.status === "working"
+                          ? "Agent working..."
+                          : card.status === "open"
+                            ? "Ask agent to fix"
+                            : "Reopen to send"}
                         loadingLabel="Sending..."
                       />
                       ${
@@ -335,6 +343,15 @@ export const DoctorFindingsList = ({
                               />
                             `
                       }
+                      ${card.status === "working"
+                        ? html`
+                            <${ActionButton}
+                              onClick=${() => onUpdateStatus(card, "open")}
+                              tone="secondary"
+                              idleLabel="Reopen"
+                            />
+                          `
+                        : null}
                       ${
                         card.status !== "dismissed"
                           ? html`

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

@@ -1,6 +1,6 @@
 import { h } from "preact";
 import htm from "htm";
-import { sendDoctorCardFix, updateDoctorCardStatus } from "../../lib/api.js";
+import { sendDoctorCardFix } from "../../lib/api.js";
 import { showToast } from "../toast.js";
 import { AgentSendModal } from "../agent-send-modal.js";
 
@@ -12,29 +12,20 @@ export const DoctorFixCardModal = ({
   onClose = () => {},
   onComplete = () => {},
 }) => {
-  const handleSend = async ({ selectedSession, message }) => {
+  const handleSend = async ({ selectedSession, selectedSessionKey, message }) => {
     if (!card?.id) return false;
     try {
       await sendDoctorCardFix({
         cardId: card.id,
-        sessionId: selectedSession?.sessionId || "",
+        sessionKey: selectedSessionKey,
         replyChannel: selectedSession?.replyChannel || "",
         replyTo: selectedSession?.replyTo || "",
         prompt: message,
       });
-      try {
-        await updateDoctorCardStatus({ cardId: card.id, status: "fixed" });
-        showToast(
-          "Doctor fix request sent and finding marked fixed",
-          "success",
-        );
-      } catch (statusError) {
-        showToast(
-          statusError.message ||
-            "Doctor fix request sent, but could not mark the finding fixed",
-          "warning",
-        );
-      }
+      showToast(
+        "Doctor fix queued. The agent will mark it fixed after applying and verifying the change.",
+        "success",
+      );
       await onComplete();
       return true;
     } catch (error) {
@@ -51,7 +42,7 @@ export const DoctorFixCardModal = ({
       initialMessage=${String(card?.fixPrompt || "")}
       resetKey=${String(card?.id || "")}
       submitLabel="Send fix request"
-      loadingLabel="Sending..."
+      loadingLabel="Queuing..."
       onClose=${onClose}
       onSubmit=${handleSend}
     />

package/lib/public/js/components/doctor/helpers.js

@@ -12,6 +12,7 @@ export const getDoctorStatusTone = (status = "") => {
     .trim()
     .toLowerCase();
   if (normalized === "fixed") return "success";
+  if (normalized === "working") return "info";
   if (normalized === "dismissed") return "neutral";
   return "warning";
 };
@@ -60,6 +61,10 @@ export const groupDoctorCardsByStatus = (cards = []) =>
         groups.fixed.push(card);
         return groups;
       }
+      if (status === "working") {
+        groups.working.push(card);
+        return groups;
+      }
       if (status === "dismissed") {
         groups.dismissed.push(card);
         return groups;
@@ -67,7 +72,7 @@ export const groupDoctorCardsByStatus = (cards = []) =>
       groups.open.push(card);
       return groups;
     },
-    { open: [], dismissed: [], fixed: [] },
+    { open: [], working: [], dismissed: [], fixed: [] },
   );
 
 export const shouldShowDoctorWarning = (
@@ -185,6 +190,7 @@ export const buildDoctorRunMarkers = (run = null) => {
 
 export const buildDoctorStatusFilterOptions = () => [
   { value: "open", label: "Open" },
+  { value: "working", label: "Working" },
   { value: "dismissed", label: "Dismissed" },
   { value: "fixed", label: "Fixed" },
 ];

package/lib/public/js/components/doctor/index.js

@@ -78,7 +78,7 @@ export const DoctorTab = ({ isActive = false, onOpenFile = () => {} }) => {
         status: "running",
         summary: "",
         priorityCounts: { P0: 0, P1: 0, P2: 0 },
-        statusCounts: { open: 0, dismissed: 0, fixed: 0 },
+        statusCounts: { open: 0, working: 0, dismissed: 0, fixed: 0 },
       }
     : null;
   const displayRuns = pendingRun ? [pendingRun, ...runs] : runs;

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

@@ -300,7 +300,7 @@ export const updateDoctorCardStatus = async ({ cardId, status }) => {
 
 export const sendDoctorCardFix = async ({
   cardId,
-  sessionId = "",
+  sessionKey = "",
   replyChannel = "",
   replyTo = "",
   prompt = "",
@@ -311,7 +311,7 @@ export const sendDoctorCardFix = async ({
       method: "POST",
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify({
-        sessionId: String(sessionId || ""),
+        sessionKey: String(sessionKey || ""),
         replyChannel: String(replyChannel || ""),
         replyTo: String(replyTo || ""),
         prompt: String(prompt || ""),
@@ -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/db/doctor/index.js

@@ -42,6 +42,7 @@ const buildPriorityCounts = (cards = []) => ({
 
 const buildStatusCounts = (cards = []) => ({
   open: cards.filter((card) => card.status === kDoctorCardStatus.open).length,
+  working: cards.filter((card) => card.status === kDoctorCardStatus.working).length,
   dismissed: cards.filter((card) => card.status === kDoctorCardStatus.dismissed).length,
   fixed: cards.filter((card) => card.status === kDoctorCardStatus.fixed).length,
 });
@@ -138,9 +139,10 @@ const listDoctorCards = ({ runId } = {}) => {
       ${hasRunFilter ? "WHERE c.run_id = $run_id" : ""}
       ORDER BY
         CASE c.status
-          WHEN 'open' THEN 0
-          WHEN 'dismissed' THEN 1
-          ELSE 2
+          WHEN 'working' THEN 0
+          WHEN 'open' THEN 1
+          WHEN 'dismissed' THEN 2
+          ELSE 3
         END ASC,
         CASE c.priority
           WHEN 'P0' THEN 0
@@ -177,14 +179,15 @@ const toRunModel = (row) => {
   };
 };
 
-const initDoctorDb = ({ rootDir }) => {
+const initDoctorDb = ({ rootDir, markInterruptedRuns = true }) => {
   closeDoctorDb();
   const dbDir = path.join(rootDir, "db");
   fs.mkdirSync(dbDir, { recursive: true });
   const dbPath = path.join(dbDir, "doctor.db");
   db = new DatabaseSync(dbPath);
+  db.exec("PRAGMA busy_timeout = 5000;");
   createSchema(db);
-  markIncompleteRunsFailed();
+  if (markInterruptedRuns) markIncompleteRunsFailed();
   return { path: dbPath };
 };
 
@@ -507,12 +510,95 @@ const updateDoctorCardStatus = ({ id, status }) => {
       UPDATE doctor_cards
       SET
         status = $status,
+        fix_run_id = NULL,
+        fix_token_hash = NULL,
+        fix_started_at = NULL,
+        fix_completed_at = CASE WHEN $status = $fixed_status
+          THEN strftime('%Y-%m-%dT%H:%M:%fZ','now')
+          ELSE NULL
+        END,
         updated_at = strftime('%Y-%m-%dT%H:%M:%fZ','now')
       WHERE id = $id
     `)
     .run({
       $id: Number(id || 0),
       $status: nextStatus,
+      $fixed_status: kDoctorCardStatus.fixed,
+    });
+  return Number(result.changes || 0) > 0 ? getDoctorCard(id) : null;
+};
+
+const startDoctorCardFix = ({ id, runId, tokenHash }) => {
+  const database = ensureDb();
+  const result = database
+    .prepare(`
+      UPDATE doctor_cards
+      SET
+        status = $status,
+        fix_run_id = $run_id,
+        fix_token_hash = $token_hash,
+        fix_started_at = strftime('%Y-%m-%dT%H:%M:%fZ','now'),
+        fix_completed_at = NULL,
+        updated_at = strftime('%Y-%m-%dT%H:%M:%fZ','now')
+      WHERE id = $id
+        AND status = $open_status
+    `)
+    .run({
+      $id: Number(id || 0),
+      $status: kDoctorCardStatus.working,
+      $open_status: kDoctorCardStatus.open,
+      $run_id: String(runId || ""),
+      $token_hash: String(tokenHash || ""),
+    });
+  return Number(result.changes || 0) > 0 ? getDoctorCard(id) : null;
+};
+
+const cancelDoctorCardFix = ({ id, runId }) => {
+  const database = ensureDb();
+  const result = database
+    .prepare(`
+      UPDATE doctor_cards
+      SET
+        status = $status,
+        fix_run_id = NULL,
+        fix_token_hash = NULL,
+        fix_started_at = NULL,
+        fix_completed_at = NULL,
+        updated_at = strftime('%Y-%m-%dT%H:%M:%fZ','now')
+      WHERE id = $id
+        AND status = $working_status
+        AND fix_run_id = $run_id
+    `)
+    .run({
+      $id: Number(id || 0),
+      $status: kDoctorCardStatus.open,
+      $working_status: kDoctorCardStatus.working,
+      $run_id: String(runId || ""),
+    });
+  return Number(result.changes || 0) > 0 ? getDoctorCard(id) : null;
+};
+
+const completeDoctorCardFix = ({ id, runId, tokenHash }) => {
+  const database = ensureDb();
+  const result = database
+    .prepare(`
+      UPDATE doctor_cards
+      SET
+        status = $status,
+        fix_token_hash = NULL,
+        fix_completed_at = strftime('%Y-%m-%dT%H:%M:%fZ','now'),
+        updated_at = strftime('%Y-%m-%dT%H:%M:%fZ','now')
+      WHERE id = $id
+        AND status = $working_status
+        AND fix_run_id = $run_id
+        AND fix_token_hash = $token_hash
+    `)
+    .run({
+      $id: Number(id || 0),
+      $status: kDoctorCardStatus.fixed,
+      $working_status: kDoctorCardStatus.working,
+      $run_id: String(runId || ""),
+      $token_hash: String(tokenHash || ""),
     });
   return Number(result.changes || 0) > 0 ? getDoctorCard(id) : null;
 };
@@ -535,4 +621,7 @@ module.exports = {
   getDoctorCardsByRunId: getCardsByRunId,
   getDoctorCard,
   updateDoctorCardStatus,
+  startDoctorCardFix,
+  cancelDoctorCardFix,
+  completeDoctorCardFix,
 };

package/lib/server/db/doctor/schema.js

@@ -58,6 +58,10 @@ const createSchema = (database) => {
   ensureColumn(database, "doctor_runs", "workspace_fingerprint", "TEXT");
   ensureColumn(database, "doctor_runs", "workspace_manifest_json", "TEXT");
   ensureColumn(database, "doctor_runs", "reused_from_run_id", "INTEGER");
+  ensureColumn(database, "doctor_cards", "fix_run_id", "TEXT");
+  ensureColumn(database, "doctor_cards", "fix_token_hash", "TEXT");
+  ensureColumn(database, "doctor_cards", "fix_started_at", "TEXT");
+  ensureColumn(database, "doctor_cards", "fix_completed_at", "TEXT");
   database.exec(`
     CREATE INDEX IF NOT EXISTS idx_doctor_cards_run_id
     ON doctor_cards(run_id, created_at DESC);

package/lib/server/doctor/constants.js

@@ -6,6 +6,7 @@ const kDoctorRunStatus = {
 };
 const kDoctorCardStatus = {
   open: "open",
+  working: "working",
   dismissed: "dismissed",
   fixed: "fixed",
 };

package/lib/server/doctor/fix-completion.js

@@ -0,0 +1,6 @@
+const crypto = require("crypto");
+
+const hashDoctorFixToken = (token) =>
+  crypto.createHash("sha256").update(String(token || "")).digest("hex");
+
+module.exports = { hashDoctorFixToken };