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

package/lib/server/routes/models.js

@@ -1,6 +1,27 @@
 const { kFallbackOnboardingModels } = require("../constants");
 
-const registerModelRoutes = ({ app, shellCmd, gatewayEnv, parseJsonFromNoisyOutput, normalizeOnboardingModels }) => {
+const runModelsGitSync = async (shellCmd) => {
+  if (typeof shellCmd !== "function") return null;
+  try {
+    await shellCmd('alphaclaw git-sync -m "models: update config" -f "openclaw.json"', {
+      timeout: 30000,
+    });
+    return null;
+  } catch (err) {
+    return err?.message || "alphaclaw git-sync failed";
+  }
+};
+
+const registerModelRoutes = ({
+  app,
+  shellCmd,
+  gatewayEnv,
+  parseJsonFromNoisyOutput,
+  normalizeOnboardingModels,
+  authProfiles,
+}) => {
+  // ── Existing CLI-backed catalog/status routes ──
+
   app.get("/api/models", async (req, res) => {
     try {
       const output = await shellCmd("openclaw models list --all --json", {
@@ -60,7 +81,154 @@ const registerModelRoutes = ({ app, shellCmd, gatewayEnv, parseJsonFromNoisyOutp
       });
       res.json({ ok: true });
     } catch (err) {
-      res.status(400).json({ ok: false, error: err.message || "Failed to set model" });
+      res
+        .status(400)
+        .json({ ok: false, error: err.message || "Failed to set model" });
+    }
+  });
+
+  // ── Model config (direct JSON) ──
+
+  app.get("/api/models/config", (req, res) => {
+    try {
+      const { primary, configuredModels } = authProfiles.getModelConfig();
+      const agentId = req.query.agentId || undefined;
+      const profiles = authProfiles.listProfiles(agentId);
+      const store = authProfiles.loadAuthStore(agentId);
+      res.json({
+        ok: true,
+        primary,
+        configuredModels,
+        authProfiles: profiles,
+        authOrder: store.order || {},
+      });
+    } catch (err) {
+      res
+        .status(500)
+        .json({ ok: false, error: err.message || "Failed to read config" });
+    }
+  });
+
+  app.put("/api/models/config", async (req, res) => {
+    const { primary, configuredModels, profiles, authOrder } = req.body || {};
+    const agentId = req.query.agentId || undefined;
+    if (primary !== undefined && (typeof primary !== "string" || !primary.includes("/"))) {
+      return res
+        .status(400)
+        .json({ ok: false, error: "Invalid primary model key" });
+    }
+    if (
+      configuredModels !== undefined &&
+      (typeof configuredModels !== "object" || configuredModels === null)
+    ) {
+      return res
+        .status(400)
+        .json({ ok: false, error: "Invalid configuredModels" });
+    }
+    try {
+      authProfiles.setModelConfig({ primary, configuredModels });
+
+      if (Array.isArray(profiles)) {
+        for (const { id: profileId, ...credential } of profiles) {
+          if (profileId && credential.type && credential.provider) {
+            authProfiles.upsertProfile(profileId, credential, agentId);
+          }
+        }
+      }
+
+      if (authOrder && typeof authOrder === "object") {
+        for (const [provider, order] of Object.entries(authOrder)) {
+          if (Array.isArray(order)) {
+            authProfiles.setAuthOrder(provider, order, agentId);
+          }
+        }
+      }
+
+      // `auth-profiles.json` is the durable source of truth. Re-sync
+      // `openclaw.json.auth.profiles` on save so model re-adds restore refs.
+      authProfiles.syncConfigAuthReferencesForAgent(agentId);
+
+      const syncWarning = await runModelsGitSync(shellCmd);
+      res.json({
+        ok: true,
+        ...(syncWarning ? { syncWarning } : {}),
+      });
+    } catch (err) {
+      res
+        .status(500)
+        .json({ ok: false, error: err.message || "Failed to save config" });
+    }
+  });
+
+  // ── Auth profiles (direct JSON) ──
+
+  app.get("/api/models/auth", (req, res) => {
+    try {
+      const agentId = req.query.agentId || undefined;
+      const profiles = authProfiles.listProfiles(agentId);
+      const store = authProfiles.loadAuthStore(agentId);
+      res.json({ ok: true, profiles, order: store.order || {} });
+    } catch (err) {
+      res
+        .status(500)
+        .json({
+          ok: false,
+          error: err.message || "Failed to read auth profiles",
+        });
+    }
+  });
+
+  app.put("/api/models/auth/:profileId", (req, res) => {
+    const { profileId } = req.params;
+    const credential = req.body;
+    if (
+      !profileId ||
+      !credential?.type ||
+      !credential?.provider
+    ) {
+      return res
+        .status(400)
+        .json({ ok: false, error: "Missing profileId, type, or provider" });
+    }
+    const validTypes = new Set(["api_key", "token", "oauth"]);
+    if (!validTypes.has(credential.type)) {
+      return res.status(400).json({
+        ok: false,
+        error: `Invalid credential type: ${credential.type}`,
+      });
+    }
+    try {
+      const agentId = req.query.agentId || undefined;
+      authProfiles.upsertProfile(profileId, credential, agentId);
+      res.json({ ok: true });
+    } catch (err) {
+      res
+        .status(500)
+        .json({
+          ok: false,
+          error: err.message || "Failed to save auth profile",
+        });
+    }
+  });
+
+  app.delete("/api/models/auth/:profileId", (req, res) => {
+    const { profileId } = req.params;
+    if (!profileId) {
+      return res
+        .status(400)
+        .json({ ok: false, error: "Missing profileId" });
+    }
+    try {
+      const agentId = req.query.agentId || undefined;
+      const removed = authProfiles.removeProfile(profileId, agentId);
+      res.json({ ok: true, removed });
+    } catch (err) {
+      res
+        .status(500)
+        .json({
+          ok: false,
+          error: err.message || "Failed to remove auth profile",
+        });
     }
   });
 };

package/lib/server/watchdog.js

@@ -364,14 +364,27 @@ const createWatchdog = ({
     }
     if (parsed.ok) {
       const wasUnhealthy = state.health !== "healthy";
+      const recoveredFromCrashLoop = state.lifecycle === "crash_loop";
       state.startupConsecutiveHealthFailures = 0;
       clearDegradedHealthCheckTimer();
       clearExpectedRestartWindow();
       state.health = "healthy";
-      if (state.lifecycle !== "crash_loop") state.lifecycle = "running";
+      state.lifecycle = "running";
       if (!state.uptimeStartedAt || wasUnhealthy) state.uptimeStartedAt = Date.now();
       state.repairAttempts = 0;
       state.crashRecoveryActive = false;
+      if (recoveredFromCrashLoop) {
+        logEvent(
+          "recovery",
+          source,
+          "ok",
+          {
+            previousLifecycle: "crash_loop",
+            health: "healthy",
+          },
+          correlationId,
+        );
+      }
       if (state.pendingRecoveryNoticeSource) {
         const recoverySource = state.pendingRecoveryNoticeSource;
         state.pendingRecoveryNoticeSource = "";

package/lib/server.js

@@ -203,6 +203,7 @@ registerModelRoutes({
   gatewayEnv,
   parseJsonFromNoisyOutput,
   normalizeOnboardingModels,
+  authProfiles,
 });
 registerOnboardingRoutes({
   app,

package/package.json

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