@chrysb/alphaclaw 0.9.19 → 0.9.20

package/bin/alphaclaw.js

@@ -4,7 +4,7 @@
 const fs = require("fs");
 const os = require("os");
 const path = require("path");
-const { execSync } = require("child_process");
+const { execFileSync, execSync } = require("child_process");
 const {
   shouldSkipSystemCronInstall,
   resolveGitAskPassPath,
@@ -733,6 +733,20 @@ if (fs.existsSync(path.join(openclawDir, ".git"))) {
   }
 }
 
+if (fs.existsSync(configPath)) {
+  try {
+    execFileSync(process.execPath, [
+      path.join(__dirname, "..", "lib", "scripts", "migrate-openclaw-codex.js"),
+    ], {
+      env: process.env,
+      stdio: "inherit",
+      timeout: 60_000,
+    });
+  } catch (error) {
+    console.error(`[alphaclaw] Codex migration process failed: ${error.message}`);
+  }
+}
+
 if (fs.existsSync(configPath)) {
   console.log("[alphaclaw] Config exists, reconciling channels...");
 

package/lib/scripts/migrate-openclaw-codex.js

@@ -0,0 +1,17 @@
+#!/usr/bin/env node
+
+const { migrateLegacyCodexState } = require("../server/openclaw-codex-migration");
+
+migrateLegacyCodexState()
+  .then((result) => {
+    if (result.changed) {
+      console.log("[alphaclaw] Migrated legacy OpenAI Codex model and auth state");
+    }
+    for (const warning of result.warnings) {
+      console.warn(`[alphaclaw] Codex migration warning: ${warning}`);
+    }
+  })
+  .catch((error) => {
+    console.error(`[alphaclaw] Codex migration failed: ${error.message}`);
+    process.exitCode = 1;
+  });

package/lib/server/auth-profiles.js

@@ -281,7 +281,12 @@ const createAuthProfiles = () => {
 
   // ── Legacy Codex-specific wrappers ──
 
-  const listCodexProfiles = () => listProfilesByProvider("openai-codex");
+  const listCodexProfiles = () =>
+    listProfiles().filter(
+      (profile) =>
+        profile.type === "oauth" &&
+        (profile.provider === "openai" || profile.provider === "openai-codex"),
+    );
 
   const getCodexProfile = () => {
     const profiles = listCodexProfiles();
@@ -299,7 +304,7 @@ const createAuthProfiles = () => {
   const upsertCodexProfile = ({ access, refresh, expires, accountId }) => {
     upsertProfile(CODEX_PROFILE_ID, {
       type: "oauth",
-      provider: "openai-codex",
+      provider: "openai",
       access,
       refresh,
       expires,
@@ -311,7 +316,10 @@ const createAuthProfiles = () => {
     const store = loadAuthStore();
     let changed = false;
     for (const [id, cred] of Object.entries(store.profiles || {})) {
-      if (cred?.provider === "openai-codex") {
+      if (
+        cred?.type === "oauth" &&
+        (cred.provider === "openai" || cred.provider === "openai-codex")
+      ) {
         delete store.profiles[id];
         changed = true;
       }
@@ -321,7 +329,10 @@ const createAuthProfiles = () => {
       if (!canSyncOpenclawAuthReferences()) return changed;
       let cfg = loadOpenclawConfig();
       for (const [id, cred] of Object.entries(cfg.auth?.profiles || {})) {
-        if (cred?.provider === "openai-codex") {
+        if (
+          cred?.mode === "oauth" &&
+          (cred.provider === "openai" || cred.provider === "openai-codex")
+        ) {
           cfg = removeConfigAuthReference(cfg, id);
         }
       }

package/lib/server/constants.js

@@ -28,7 +28,7 @@ const AUTH_PROFILES_PATH = path.join(
   "agent",
   "auth-profiles.json",
 );
-const CODEX_PROFILE_ID = "openai-codex:codex-cli";
+const CODEX_PROFILE_ID = "openai:codex-cli";
 const CODEX_OAUTH_CLIENT_ID = "app_EMoamEEZ73f0CkXaXp7hrann";
 const CODEX_OAUTH_AUTHORIZE_URL = "https://auth.openai.com/oauth/authorize";
 const CODEX_OAUTH_TOKEN_URL = "https://auth.openai.com/oauth/token";

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

@@ -0,0 +1,78 @@
+const fs = require("fs");
+const path = require("path");
+const { pathToFileURL } = require("url");
+
+const findOpenclawDistModule = (prefix) => {
+  const entryPath = require.resolve("openclaw");
+  const distDir = path.dirname(entryPath);
+  const filename = fs
+    .readdirSync(distDir)
+    .find((name) => name.startsWith(`${prefix}-`) && name.endsWith(".js"));
+  if (!filename) throw new Error(`OpenClaw migration module not found: ${prefix}`);
+  return path.join(distDir, filename);
+};
+
+const writeConfig = (configPath, cfg) => {
+  fs.writeFileSync(configPath, `${JSON.stringify(cfg, null, 2)}\n`, "utf8");
+};
+
+const migrateLegacyCodexState = async ({
+  configPath = process.env.OPENCLAW_CONFIG_PATH,
+  env = process.env,
+} = {}) => {
+  if (!configPath || !fs.existsSync(configPath)) {
+    return { changed: false, changes: [], warnings: [] };
+  }
+
+  const cfg = JSON.parse(fs.readFileSync(configPath, "utf8"));
+  const routeModule = await import(
+    pathToFileURL(findOpenclawDistModule("codex-route-warnings")).href
+  );
+  const authModule = await import(
+    pathToFileURL(findOpenclawDistModule("doctor-auth-flat-profiles")).href
+  );
+
+  const changes = [];
+  const warnings = [];
+  const routeRepair = routeModule.r({ cfg, env, shouldRepair: true });
+  let nextCfg = routeRepair.cfg;
+  changes.push(...routeRepair.changes);
+  warnings.push(...routeRepair.warnings);
+
+  const profileIdMap = authModule.t({ cfg: nextCfg, env });
+  const configAuthRepair = authModule.a(nextCfg, { profileIdMap });
+  nextCfg = configAuthRepair.config;
+  changes.push(...configAuthRepair.changes);
+  warnings.push(...configAuthRepair.warnings);
+
+  if (changes.length > 0) writeConfig(configPath, nextCfg);
+
+  const storeRepair = await authModule.o({ cfg: nextCfg, env });
+  changes.push(...storeRepair.changes);
+  warnings.push(...storeRepair.warnings);
+
+  const sqliteMigration = await authModule.n({
+    cfg: nextCfg,
+    env,
+    prompter: { confirmAutoFix: async () => true },
+  });
+  changes.push(...sqliteMigration.changes);
+  warnings.push(...sqliteMigration.warnings);
+  if (sqliteMigration.configChanged) writeConfig(configPath, nextCfg);
+
+  const sessionRepair = await routeModule.i({
+    cfg: nextCfg,
+    env,
+    shouldRepair: true,
+  });
+  changes.push(...sessionRepair.changes);
+  warnings.push(...sessionRepair.warnings);
+
+  return {
+    changed: changes.length > 0,
+    changes,
+    warnings,
+  };
+};
+
+module.exports = { migrateLegacyCodexState };

package/package.json

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