@chrysb/alphaclaw 0.9.9 → 0.9.11

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

@@ -9,6 +9,10 @@ export const getAuthProviderFromModelProvider = (provider) => {
 };
 
 export const kFeaturedModelDefs = [
+  {
+    label: "Opus 4.7",
+    preferredKeys: ["anthropic/claude-opus-4-7"],
+  },
   {
     label: "Opus 4.6",
     preferredKeys: ["anthropic/claude-opus-4-6"],
@@ -22,8 +26,8 @@ export const kFeaturedModelDefs = [
     preferredKeys: ["openai-codex/gpt-5.3-codex"],
   },
   {
-    label: "GPT-5.4",
-    preferredKeys: ["openai-codex/gpt-5.4"],
+    label: "GPT-5.5",
+    preferredKeys: ["openai-codex/gpt-5.5"],
   },
   {
     label: "Gemini 3.1 Pro",

package/lib/server/agents/channels.js

@@ -38,6 +38,41 @@ const createChannelsDomain = ({
 }) => {
   let createChannelAccountInProgress = false;
 
+  const formatClawResultOutput = (result) =>
+    [result?.stderr, result?.stdout].filter(Boolean).join("\n").trim();
+
+  const isConfigMutationConflictResult = (result) =>
+    /ConfigMutationConflictError|config changed since last load/i.test(
+      formatClawResultOutput(result),
+    );
+
+  const waitForRetry = (delayMs) =>
+    new Promise((resolve) => setTimeout(resolve, delayMs));
+
+  const clawCmdWithConfigConflictRetry = async (
+    command,
+    options,
+    { label = "command", delaysMs = [250, 750] } = {},
+  ) => {
+    for (let attempt = 0; attempt <= delaysMs.length; attempt += 1) {
+      const result = await clawCmd(command, options);
+      if (result?.ok || !isConfigMutationConflictResult(result)) {
+        return result;
+      }
+      if (attempt >= delaysMs.length) {
+        return result;
+      }
+      const delayMs = Number(delaysMs[attempt] || 0);
+      console.warn(
+        `[alphaclaw] Retrying openclaw ${label} after config mutation conflict`,
+      );
+      if (delayMs > 0) {
+        await waitForRetry(delayMs);
+      }
+    }
+    return { ok: false, stdout: "", stderr: "Command retry exhausted" };
+  };
+
   const getChannelAccountToken = ({
     provider: rawProvider,
     accountId: rawAccountId,
@@ -266,10 +301,14 @@ const createChannelsDomain = ({
             ? `--app-token ${shellEscapeArg(appToken)}`
             : "",
         ].filter(Boolean);
-        const addResult = await clawCmd(addArgs.join(" "), {
-          quiet: true,
-          timeoutMs: 30000,
-        });
+        const addResult = await clawCmdWithConfigConflictRetry(
+          addArgs.join(" "),
+          {
+            quiet: true,
+            timeoutMs: 30000,
+          },
+          { label: "channels add" },
+        );
         if (!addResult?.ok) {
           throw new Error(
             addResult?.stderr ||
@@ -323,9 +362,10 @@ const createChannelsDomain = ({
         saveConfig({ fsImpl, OPENCLAW_DIR, config: nextCfg });
         onProgress({ phase: "binding", label: "Binding agent..." });
         const bindSpec = buildBindingSpec({ provider, accountId });
-        const bindResult = await clawCmd(
+        const bindResult = await clawCmdWithConfigConflictRetry(
           `agents bind --agent ${shellEscapeArg(agentId)} --bind ${shellEscapeArg(bindSpec)}`,
           { quiet: true, timeoutMs: 30000 },
+          { label: "agents bind" },
         );
         if (!bindResult?.ok) {
           throw new Error(
@@ -885,10 +925,14 @@ const createChannelsDomain = ({
         name ? `--name ${shellEscapeArg(name)}` : "",
         `--token ${shellEscapeArg(ownerNumber)}`,
       ].filter(Boolean);
-      const addResult = await clawCmd(addArgs.join(" "), {
-        quiet: true,
-        timeoutMs: 30000,
-      });
+      const addResult = await clawCmdWithConfigConflictRetry(
+        addArgs.join(" "),
+        {
+          quiet: true,
+          timeoutMs: 30000,
+        },
+        { label: "channels add" },
+      );
       if (!addResult?.ok) {
         throw new Error(
           addResult?.stderr ||

package/lib/server/commands.js

@@ -20,8 +20,11 @@ const createCommands = ({ gatewayEnv }) => {
       );
       exec(cmd, { timeout: timeoutMs, ...execOpts }, (err, stdout, stderr) => {
         if (err) {
+          err.stdout = String(stdout || "").trim();
+          err.stderr = String(stderr || "").trim();
+          err.cmd = cmd;
           console.error(
-            `[onboard] Error: ${(stderr || err.message).slice(0, 300)}`,
+            `[onboard] Error: ${String(stderr || err.message || "").slice(0, 300)}`,
           );
           return reject(err);
         }

package/lib/server/constants.js

@@ -1,6 +1,7 @@
 const os = require("os");
 const path = require("path");
 const kBrowseFilePolicies = require("../public/shared/browse-file-policies.json");
+const kBootstrapModelCatalog = require("./model-catalog-bootstrap.json");
 const { parsePositiveInt } = require("./utils/number");
 
 // Portable root directory: --root-dir flag sets ALPHACLAW_ROOT_DIR before require
@@ -90,7 +91,12 @@ const kOnboardingModelProviders = new Set([
   "groq",
   "vllm",
 ]);
-const kFallbackOnboardingModels = [
+const kMinimalFallbackOnboardingModels = [
+  {
+    key: "anthropic/claude-opus-4-7",
+    provider: "anthropic",
+    label: "Claude Opus 4.7",
+  },
   {
     key: "anthropic/claude-opus-4-6",
     provider: "anthropic",
@@ -107,9 +113,9 @@ const kFallbackOnboardingModels = [
     label: "Claude Haiku 4.6",
   },
   {
-    key: "openai-codex/gpt-5.4",
+    key: "openai-codex/gpt-5.5",
     provider: "openai-codex",
-    label: "GPT-5.4",
+    label: "GPT-5.5",
   },
   {
     key: "openai-codex/gpt-5.3-codex",
@@ -132,6 +138,11 @@ const kFallbackOnboardingModels = [
     label: "Gemini 3 Flash Preview",
   },
 ];
+const kFallbackOnboardingModels =
+  Array.isArray(kBootstrapModelCatalog.models) &&
+  kBootstrapModelCatalog.models.length > 0
+    ? kBootstrapModelCatalog.models
+    : kMinimalFallbackOnboardingModels;
 
 const kVersionCacheTtlMs = 60 * 1000;
 const kLatestVersionCacheTtlMs = 10 * 60 * 1000;

package/lib/server/cost-utils.js

@@ -5,7 +5,16 @@ const kTokensPerMillion = 1_000_000;
 const kLongContextThresholdTokens = 200_000;
 const kNodeModulesPricingCacheTtlMs = 60_000;
 
+const kClaudeOpus47Pricing = {
+  input: 5.0,
+  output: 25.0,
+  cacheRead: 0.5,
+  cacheWrite: 6.25,
+};
+
 const kGlobalModelPricing = {
+  "claude-opus-4-7": kClaudeOpus47Pricing,
+  "claude-opus-4.7": kClaudeOpus47Pricing,
   "claude-opus-4-6": {
     input: (tokens) => (tokens > kLongContextThresholdTokens ? 10.0 : 5.0),
     output: (tokens) => (tokens > kLongContextThresholdTokens ? 37.5 : 25.0),

package/lib/server/cron-service.js

@@ -485,6 +485,16 @@ const parseCommandJson = (rawOutput) => {
   return null;
 };
 
+const resolvePromptEditFlag = ({ cronDir, jobId }) => {
+  const store = readCronStore({ cronDir });
+  const job = store.jobs.find((entry) => String(entry?.id || "") === jobId);
+  if (!job) throw new Error(`unknown cron job id: ${jobId}`);
+  const payloadKind = String(job?.payload?.kind || "").trim();
+  if (payloadKind === "systemEvent") return "--system-event";
+  if (payloadKind === "agentTurn") return "--message";
+  throw new Error(`unsupported cron payload kind: ${payloadKind || "unknown"}`);
+};
+
 const createCronService = ({
   clawCmd,
   OPENCLAW_DIR,
@@ -548,7 +558,8 @@ const createCronService = ({
 
   const updateJobPrompt = async ({ jobId, message }) => {
     const safeJobId = sanitizeCronJobId(jobId);
-    const command = `cron edit ${shellEscapeArg(safeJobId)} --message ${shellEscapeArg(message || "")}`;
+    const promptFlag = resolvePromptEditFlag({ cronDir, jobId: safeJobId });
+    const command = `cron edit ${shellEscapeArg(safeJobId)} ${promptFlag} ${shellEscapeArg(message || "")}`;
     return runCommand(command, { timeoutMs: 60000 });
   };
 

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

@@ -18,6 +18,13 @@ const ensureDb = () => {
   return db;
 };
 
+const closeDoctorDb = () => {
+  if (!db) return;
+  const database = db;
+  db = null;
+  database.close();
+};
+
 const parseJsonText = (value, fallbackValue) => {
   if (typeof value !== "string" || !value) return fallbackValue;
   try {
@@ -171,6 +178,7 @@ const toRunModel = (row) => {
 };
 
 const initDoctorDb = ({ rootDir }) => {
+  closeDoctorDb();
   const dbDir = path.join(rootDir, "db");
   fs.mkdirSync(dbDir, { recursive: true });
   const dbPath = path.join(dbDir, "doctor.db");
@@ -511,6 +519,7 @@ const updateDoctorCardStatus = ({ id, status }) => {
 
 module.exports = {
   initDoctorDb,
+  closeDoctorDb,
   markIncompleteRunsFailed,
   getDoctorMeta,
   setDoctorMeta,

package/lib/server/db/usage/index.js

@@ -15,7 +15,19 @@ const ensureDb = () => {
   return db;
 };
 
+const closeUsageDb = () => {
+  if (!db) {
+    usageDbPath = "";
+    return;
+  }
+  const database = db;
+  db = null;
+  usageDbPath = "";
+  database.close();
+};
+
 const initUsageDb = ({ rootDir }) => {
+  closeUsageDb();
   const dbDir = path.join(rootDir, "db");
   fs.mkdirSync(dbDir, { recursive: true });
   usageDbPath = path.join(dbDir, "usage.db");
@@ -155,6 +167,7 @@ const getSessionUsageByKeyPattern = ({ keyPattern = "", sinceMs = 0 } = {}) => {
 
 module.exports = {
   initUsageDb,
+  closeUsageDb,
   getDailySummary: (options = {}) => getDailySummary({ database: ensureDb(), ...options }),
   getSessionsList: (options = {}) => getSessionsList({ database: ensureDb(), ...options }),
   getSessionDetail: (options = {}) => getSessionDetail({ database: ensureDb(), ...options }),

package/lib/server/db/watchdog/index.js

@@ -15,14 +15,25 @@ const ensureDb = () => {
   return db;
 };
 
+const closeWatchdogDb = () => {
+  if (pruneTimer) {
+    clearInterval(pruneTimer);
+    pruneTimer = null;
+  }
+  if (!db) return;
+  const database = db;
+  db = null;
+  database.close();
+};
+
 const initWatchdogDb = ({ rootDir, pruneDays = 30 }) => {
+  closeWatchdogDb();
   const dbDir = path.join(rootDir, "db");
   fs.mkdirSync(dbDir, { recursive: true });
   const dbPath = path.join(dbDir, "watchdog.db");
   db = new DatabaseSync(dbPath);
   createSchema(db);
   pruneWatchdogEvents(pruneDays);
-  if (pruneTimer) clearInterval(pruneTimer);
   pruneTimer = setInterval(() => {
     try {
       pruneWatchdogEvents(pruneDays);
@@ -125,6 +136,7 @@ const pruneWatchdogEvents = (days = 30) => {
 
 module.exports = {
   initWatchdogDb,
+  closeWatchdogDb,
   insertWatchdogEvent,
   getRecentEvents,
   pruneWatchdogEvents,

package/lib/server/db/webhooks/index.js

@@ -17,14 +17,25 @@ const ensureDb = () => {
   return db;
 };
 
+const closeWebhooksDb = () => {
+  if (pruneTimer) {
+    clearInterval(pruneTimer);
+    pruneTimer = null;
+  }
+  if (!db) return;
+  const database = db;
+  db = null;
+  database.close();
+};
+
 const initWebhooksDb = ({ rootDir, pruneDays = 30 }) => {
+  closeWebhooksDb();
   const dbDir = path.join(rootDir, "db");
   fs.mkdirSync(dbDir, { recursive: true });
   const dbPath = path.join(dbDir, "webhooks.db");
   db = new DatabaseSync(dbPath);
   createSchema(db);
   pruneOldEntries(pruneDays);
-  if (pruneTimer) clearInterval(pruneTimer);
   pruneTimer = setInterval(() => {
     try {
       pruneOldEntries(pruneDays);
@@ -413,6 +424,7 @@ const pruneOldEntries = (days = 30) => {
 
 module.exports = {
   initWebhooksDb,
+  closeWebhooksDb,
   insertRequest,
   getRequests,
   getRequestById,

package/lib/server/gateway.js

@@ -11,11 +11,13 @@ const {
   kOnboardingMarkerPath,
   kRootDir,
 } = require("./constants");
+const { withOpenclawStartupEnv } = require("./openclaw-runtime-env");
 
 let gatewayChild = null;
 let gatewayExitHandler = null;
 let gatewayLaunchHandler = null;
 const kGatewayStderrTailLines = 50;
+const kPluginRuntimeDepsPreflightTimeoutMs = 120 * 1000;
 let gatewayStderrTail = [];
 const expectedExitPids = new Set();
 
@@ -41,14 +43,117 @@ const setGatewayLaunchHandler = (handler) => {
   gatewayLaunchHandler = typeof handler === "function" ? handler : null;
 };
 
-const gatewayEnv = () => ({
-  ...process.env,
-  HOME: kRootDir,
-  OPENCLAW_HOME: kRootDir,
-  OPENCLAW_CONFIG_PATH: `${OPENCLAW_DIR}/openclaw.json`,
-  OPENCLAW_STATE_DIR: OPENCLAW_DIR,
-  XDG_CONFIG_HOME: OPENCLAW_DIR,
-});
+const gatewayEnv = () =>
+  withOpenclawStartupEnv({
+    ...process.env,
+    HOME: kRootDir,
+    OPENCLAW_HOME: kRootDir,
+    OPENCLAW_CONFIG_PATH: `${OPENCLAW_DIR}/openclaw.json`,
+    OPENCLAW_STATE_DIR: OPENCLAW_DIR,
+    XDG_CONFIG_HOME: OPENCLAW_DIR,
+  });
+
+const resolveOpenclawExtensionsDir = () => {
+  try {
+    const entryPath = require.resolve("openclaw");
+    const entryDir = path.dirname(entryPath);
+    const distDir =
+      path.basename(entryDir) === "dist" ? entryDir : path.join(entryDir, "dist");
+    return path.join(distDir, "extensions");
+  } catch {
+    return "";
+  }
+};
+
+const isOpenclawInstallStageDir = (name) =>
+  name === ".openclaw-install-stage" ||
+  String(name || "").startsWith(".openclaw-install-stage-");
+
+const cleanupOpenclawPluginInstallStages = ({
+  extensionsDir = resolveOpenclawExtensionsDir(),
+} = {}) => {
+  if (!extensionsDir) return 0;
+  let removed = 0;
+  try {
+    for (const entry of fs.readdirSync(extensionsDir, { withFileTypes: true })) {
+      if (!entry?.isDirectory?.()) continue;
+      const pluginDir = path.join(extensionsDir, entry.name);
+      for (const child of fs.readdirSync(pluginDir, { withFileTypes: true })) {
+        if (!child?.isDirectory?.() || !isOpenclawInstallStageDir(child.name)) {
+          continue;
+        }
+        const stageDir = path.join(pluginDir, child.name);
+        fs.rmSync(stageDir, {
+          recursive: true,
+          force: true,
+          maxRetries: 3,
+          retryDelay: 100,
+        });
+        removed += 1;
+        console.log(`[alphaclaw] Removed stale OpenClaw plugin install stage: ${stageDir}`);
+      }
+    }
+  } catch (err) {
+    console.warn(
+      `[alphaclaw] Could not clean OpenClaw plugin install stages: ${err.message}`,
+    );
+  }
+  return removed;
+};
+
+const hasEnabledChannelConfig = () => {
+  try {
+    const configPath = `${OPENCLAW_DIR}/openclaw.json`;
+    if (!fs.existsSync(configPath)) return false;
+    const cfg = JSON.parse(fs.readFileSync(configPath, "utf8"));
+    const channels = cfg?.channels && typeof cfg.channels === "object" ? cfg.channels : {};
+    return Object.keys(kChannelDefs).some((channel) => channels?.[channel]?.enabled === true);
+  } catch {
+    return false;
+  }
+};
+
+const isInstallStageFailure = (err) =>
+  /ENOTEMPTY|openclaw-install-stage/i.test(
+    [
+      err?.message,
+      err?.stdout?.toString?.(),
+      err?.stderr?.toString?.(),
+    ]
+      .filter(Boolean)
+      .join("\n"),
+  );
+
+const runPluginRuntimeDepsPreflight = () =>
+  execSync("openclaw plugins list --json", {
+    env: gatewayEnv(),
+    timeout: kPluginRuntimeDepsPreflightTimeoutMs,
+    encoding: "utf8",
+  });
+
+const prepareOpenclawChannelPlugins = () => {
+  if (!hasEnabledChannelConfig()) return;
+  cleanupOpenclawPluginInstallStages();
+  try {
+    runPluginRuntimeDepsPreflight();
+  } catch (err) {
+    if (!isInstallStageFailure(err)) {
+      console.warn(
+        `[alphaclaw] OpenClaw plugin preflight failed: ${(err.stderr || err.message || "").toString().trim().slice(0, 300)}`,
+      );
+      return;
+    }
+    cleanupOpenclawPluginInstallStages();
+    try {
+      runPluginRuntimeDepsPreflight();
+      console.log("[alphaclaw] OpenClaw plugin preflight recovered after cleaning install stage");
+    } catch (retryErr) {
+      console.warn(
+        `[alphaclaw] OpenClaw plugin preflight retry failed: ${(retryErr.stderr || retryErr.message || "").toString().trim().slice(0, 300)}`,
+      );
+    }
+  }
+};
 
 const writeOnboardingMarker = (reason) => {
   fs.mkdirSync(ALPHACLAW_DIR, { recursive: true });
@@ -123,6 +228,9 @@ const isGatewayRunning = () =>
 const runGatewayCmd = (cmd) => {
   console.log(`[alphaclaw] Running: openclaw gateway ${cmd}`);
   try {
+    if (cmd === "--force" || cmd === "restart") {
+      prepareOpenclawChannelPlugins();
+    }
     const out = execSync(`openclaw gateway ${cmd}`, {
       env: gatewayEnv(),
       timeout: 15000,
@@ -147,6 +255,7 @@ const launchGatewayProcess = () => {
     );
     return gatewayChild;
   }
+  prepareOpenclawChannelPlugins();
   gatewayStderrTail = [];
   const child = spawn("openclaw", ["gateway", "run"], {
     env: gatewayEnv(),
@@ -505,6 +614,8 @@ module.exports = {
   isOnboarded,
   isGatewayRunning,
   launchGatewayProcess,
+  cleanupOpenclawPluginInstallStages,
+  prepareOpenclawChannelPlugins,
   setGatewayExitHandler,
   setGatewayLaunchHandler,
   runGatewayCmd,

package/lib/server/init/register-server-routes.js

@@ -97,6 +97,9 @@ const registerServerRoutes = ({
     gatewayEnv,
     parseJsonFromNoisyOutput,
     normalizeOnboardingModels,
+    readOpenclawVersion: (options) =>
+      openclawVersionService?.readOpenclawVersion(options),
+    isOnboarded,
     authProfiles,
     readEnvFile,
     writeEnvFile,

package/lib/server/init/runtime-init.js

@@ -1,11 +1,13 @@
 const initializeServerRuntime = ({
   fs,
   constants,
+  ensureOpenclawStartupEnv,
   startEnvWatcher,
   attachGatewaySignalHandlers,
   cleanupStaleImportTempDirs,
   migrateManagedInternalFiles,
 }) => {
+  ensureOpenclawStartupEnv?.({ fsModule: fs });
   startEnvWatcher();
   attachGatewaySignalHandlers();
   cleanupStaleImportTempDirs();

package/lib/server/internal-files-migration.js

@@ -9,6 +9,16 @@ const kOpenclawGitignoreHookEntries = [
   "!hooks/transforms/**",
 ];
 
+const kOpenclawGitignoreCronRuntimeEntries = [
+  "# OpenClaw cron runtime state (local only; job definitions stay in cron/jobs.json)",
+  "cron/jobs-state.json",
+];
+
+const kOpenclawGitignoreAppendEntries = [
+  ...kOpenclawGitignoreHookEntries,
+  ...kOpenclawGitignoreCronRuntimeEntries,
+];
+
 const buildManagedPaths = ({ openclawDir, pathModule = path }) => {
   const internalDir = pathModule.join(openclawDir, kInternalDirName);
   return {
@@ -89,7 +99,7 @@ const migrateManagedInternalFiles = ({
       const raw = String(fs.readFileSync(gitignorePath, "utf8") || "");
       const existingLines = raw.split(/\r?\n/);
       const existingSet = new Set(existingLines.map((line) => line.trim()));
-      const missing = kOpenclawGitignoreHookEntries.filter(
+      const missing = kOpenclawGitignoreAppendEntries.filter(
         (line) => !existingSet.has(line),
       );
       if (missing.length) {