@chrysb/alphaclaw 0.9.24 → 0.9.26

package/lib/server/auth-profiles.js

@@ -1,5 +1,6 @@
 const fs = require("fs");
 const path = require("path");
+const { DatabaseSync } = require("node:sqlite");
 const { AUTH_PROFILES_PATH, CODEX_PROFILE_ID, OPENCLAW_DIR } = require("./constants");
 
 const kDefaultAgentId = "main";
@@ -54,6 +55,86 @@ const resolveAgentDir = (agentId = kDefaultAgentId) =>
 const resolveAuthProfilesPath = (agentId = kDefaultAgentId) =>
   path.join(resolveAgentDir(agentId), "auth-profiles.json");
 
+const resolveAuthDatabasePath = (agentId = kDefaultAgentId) =>
+  path.join(resolveAgentDir(agentId), "openclaw-agent.sqlite");
+
+const loadSqliteAuthStore = (agentId = kDefaultAgentId) => {
+  const databasePath = resolveAuthDatabasePath(agentId);
+  if (!fs.existsSync(databasePath)) return null;
+  let database;
+  try {
+    database = new DatabaseSync(databasePath, { readOnly: true });
+    const secretsRow = database
+      .prepare("SELECT store_json FROM auth_profile_store WHERE store_key = ?")
+      .get("primary");
+    if (!secretsRow?.store_json) return null;
+    const secrets = JSON.parse(secretsRow.store_json);
+    const stateRow = database
+      .prepare("SELECT state_json FROM auth_profile_state WHERE state_key = ?")
+      .get("primary");
+    const state = stateRow?.state_json ? JSON.parse(stateRow.state_json) : {};
+    return {
+      version: Number(secrets.version || state.version || 1),
+      profiles: secrets.profiles || {},
+      order: state.order,
+      lastGood: state.lastGood,
+      usageStats: state.usageStats,
+    };
+  } catch {
+    return null;
+  } finally {
+    database?.close();
+  }
+};
+
+const saveSqliteAuthStore = (agentId, store) => {
+  const databasePath = resolveAuthDatabasePath(agentId);
+  if (!fs.existsSync(databasePath)) return false;
+  let database;
+  try {
+    database = new DatabaseSync(databasePath);
+    const now = Date.now();
+    const secrets = {
+      version: Number(store.version || 1),
+      profiles: store.profiles || {},
+    };
+    const state = {
+      version: Number(store.version || 1),
+      ...(store.order !== undefined ? { order: store.order } : {}),
+      ...(store.lastGood !== undefined ? { lastGood: store.lastGood } : {}),
+      ...(store.usageStats !== undefined ? { usageStats: store.usageStats } : {}),
+    };
+    database.exec("BEGIN IMMEDIATE");
+    database
+      .prepare(
+        `INSERT INTO auth_profile_store (store_key, store_json, updated_at)
+         VALUES (?, ?, ?)
+         ON CONFLICT(store_key) DO UPDATE SET
+           store_json = excluded.store_json,
+           updated_at = excluded.updated_at`,
+      )
+      .run("primary", JSON.stringify(secrets), now);
+    database
+      .prepare(
+        `INSERT INTO auth_profile_state (state_key, state_json, updated_at)
+         VALUES (?, ?, ?)
+         ON CONFLICT(state_key) DO UPDATE SET
+           state_json = excluded.state_json,
+           updated_at = excluded.updated_at`,
+      )
+      .run("primary", JSON.stringify(state), now);
+    database.exec("COMMIT");
+    return true;
+  } catch {
+    try {
+      database?.exec("ROLLBACK");
+    } catch {}
+    return false;
+  } finally {
+    database?.close();
+  }
+};
+
 const resolveOpenclawConfigPath = () =>
   path.join(OPENCLAW_DIR, "openclaw.json");
 
@@ -61,6 +142,8 @@ const hasCompletedOnboardingConfig = (cfg) =>
   String(cfg?.agents?.defaults?.model?.primary || "").trim().includes("/");
 
 const loadAuthStore = (agentId = kDefaultAgentId) => {
+  const sqliteStore = loadSqliteAuthStore(agentId);
+  if (sqliteStore) return sqliteStore;
   const storePath = resolveAuthProfilesPath(agentId);
   let store = { version: 1, profiles: {} };
   try {
@@ -86,6 +169,7 @@ const loadAuthStore = (agentId = kDefaultAgentId) => {
 };
 
 const saveAuthStore = (agentId, store) => {
+  if (saveSqliteAuthStore(agentId, store)) return;
   const storePath = resolveAuthProfilesPath(agentId);
   fs.mkdirSync(path.dirname(storePath), { recursive: true });
   fs.writeFileSync(
@@ -256,12 +340,41 @@ const createAuthProfiles = () => {
 
   // ── Model config operations ──
 
+  const preserveCodexRuntimeModels = (configuredModels) => {
+    const models =
+      configuredModels && typeof configuredModels === "object"
+        ? configuredModels
+        : {};
+    if (!hasCodexOauthProfile()) return models;
+    return Object.fromEntries(
+      Object.entries(models).map(([modelKey, modelConfig]) => {
+        if (!modelKey.startsWith("openai/gpt-")) {
+          return [modelKey, modelConfig];
+        }
+        return [
+          modelKey,
+          {
+            ...(modelConfig && typeof modelConfig === "object"
+              ? modelConfig
+              : {}),
+            agentRuntime: { id: "codex" },
+          },
+        ];
+      }),
+    );
+  };
+
   const getModelConfig = () => {
     const cfg = loadOpenclawConfig();
     const defaults = cfg.agents?.defaults || {};
+    const configuredModels = preserveCodexRuntimeModels(defaults.models || {});
+    if (JSON.stringify(configuredModels) !== JSON.stringify(defaults.models || {})) {
+      cfg.agents.defaults.models = configuredModels;
+      saveOpenclawConfig(cfg);
+    }
     return {
       primary: defaults.model?.primary || null,
-      configuredModels: defaults.models || {},
+      configuredModels,
     };
   };
 
@@ -274,7 +387,7 @@ const createAuthProfiles = () => {
       cfg.agents.defaults.model.primary = primary;
     }
     if (configuredModels !== undefined) {
-      cfg.agents.defaults.models = configuredModels;
+      cfg.agents.defaults.models = preserveCodexRuntimeModels(configuredModels);
     }
     saveOpenclawConfig(cfg);
   };

package/lib/server/openclaw-codex-migration.js

@@ -1,6 +1,7 @@
 const fs = require("fs");
 const path = require("path");
 const { pathToFileURL } = require("url");
+const { DatabaseSync } = require("node:sqlite");
 
 const findOpenclawDistModule = (prefix) => {
   const entryPath = require.resolve("openclaw");
@@ -16,6 +17,53 @@ const writeConfig = (configPath, cfg) => {
   fs.writeFileSync(configPath, `${JSON.stringify(cfg, null, 2)}\n`, "utf8");
 };
 
+const hasCanonicalCodexOauthProfile = (configPath) => {
+  const databasePath = path.join(
+    path.dirname(configPath),
+    "agents",
+    "main",
+    "agent",
+    "openclaw-agent.sqlite",
+  );
+  if (!fs.existsSync(databasePath)) return false;
+  let database;
+  try {
+    database = new DatabaseSync(databasePath, { readOnly: true });
+    const row = database
+      .prepare("SELECT store_json FROM auth_profile_store WHERE store_key = ?")
+      .get("primary");
+    const store = row?.store_json ? JSON.parse(row.store_json) : {};
+    return Object.values(store.profiles || {}).some(
+      (profile) =>
+        profile?.type === "oauth" &&
+        profile?.provider === "openai" &&
+        profile?.access &&
+        profile?.refresh,
+    );
+  } catch {
+    return false;
+  } finally {
+    database?.close();
+  }
+};
+
+const restoreCanonicalCodexRuntimeModels = ({ configPath, cfg }) => {
+  if (!hasCanonicalCodexOauthProfile(configPath)) return false;
+  const configuredModels = cfg?.agents?.defaults?.models;
+  if (!configuredModels || typeof configuredModels !== "object") return false;
+  let changed = false;
+  for (const [modelKey, modelConfig] of Object.entries(configuredModels)) {
+    if (!modelKey.startsWith("openai/gpt-")) continue;
+    if (modelConfig?.agentRuntime?.id === "codex") continue;
+    configuredModels[modelKey] = {
+      ...(modelConfig && typeof modelConfig === "object" ? modelConfig : {}),
+      agentRuntime: { id: "codex" },
+    };
+    changed = true;
+  }
+  return changed;
+};
+
 const migrateLegacyCodexState = async ({
   configPath = process.env.OPENCLAW_CONFIG_PATH,
   env = process.env,
@@ -60,6 +108,11 @@ const migrateLegacyCodexState = async ({
   warnings.push(...sqliteMigration.warnings);
   if (sqliteMigration.configChanged) writeConfig(configPath, nextCfg);
 
+  if (restoreCanonicalCodexRuntimeModels({ configPath, cfg: nextCfg })) {
+    changes.push("Restored Codex runtime metadata for canonical OpenAI models.");
+    writeConfig(configPath, nextCfg);
+  }
+
   const sessionRepair = await routeModule.i({
     cfg: nextCfg,
     env,

package/package.json

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