@chrysb/alphaclaw 0.8.1-beta.4 → 0.8.1-beta.6

package/lib/public/js/hooks/useAgentSessions.js

@@ -4,7 +4,11 @@ import {
   kAgentSessionsCacheKey,
   kAgentLastSessionKey,
 } from "../lib/storage-keys.js";
-import { getSessionRowKey, isDestinationSessionKey } from "../lib/session-keys.js";
+import {
+  getSessionRowKey,
+  isDestinationSessionKey,
+  sortSessionsByPriority,
+} from "../lib/session-keys.js";
 
 const readCachedSessions = () => {
   try {
@@ -115,7 +119,7 @@ export const useAgentSessions = ({ enabled = false, filter } = {}) => {
   }, [enabled]);
 
   const sessions = useMemo(
-    () => (filter ? allSessions.filter(filter) : allSessions),
+    () => sortSessionsByPriority(filter ? allSessions.filter(filter) : allSessions),
     [allSessions, filter],
   );
 

package/lib/public/js/lib/session-keys.js

@@ -24,6 +24,26 @@ export const kDestinationSessionFilter = (sessionRow) =>
     String(sessionRow?.replyTo || "").trim()
   ) || isDestinationSessionKey(getSessionRowKey(sessionRow));
 
+const kSessionPriority = {
+  destination: 0,
+  other: 1,
+};
+
+export const getSessionPriority = (sessionRow = null) =>
+  isDestinationSessionKey(getSessionRowKey(sessionRow))
+    ? kSessionPriority.destination
+    : kSessionPriority.other;
+
+export const sortSessionsByPriority = (sessions = []) =>
+  [...(Array.isArray(sessions) ? sessions : [])].sort((leftRow, rightRow) => {
+    const priorityDiff = getSessionPriority(leftRow) - getSessionPriority(rightRow);
+    if (priorityDiff !== 0) return priorityDiff;
+    const updatedAtDiff =
+      Number(rightRow?.updatedAt || 0) - Number(leftRow?.updatedAt || 0);
+    if (updatedAtDiff !== 0) return updatedAtDiff;
+    return getSessionRowKey(leftRow).localeCompare(getSessionRowKey(rightRow));
+  });
+
 export const getDestinationFromSession = (sessionRow = null) => {
   const channel = String(sessionRow?.replyChannel || "").trim();
   const to = String(sessionRow?.replyTo || "").trim();

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

@@ -3,6 +3,7 @@ const startServerLifecycle = ({
   PORT,
   isOnboarded,
   runOnboardedBootSequence,
+  ensureUsageTrackerPluginConfig,
   doSyncPromptFiles,
   reloadEnv,
   syncChannelConfig,
@@ -17,6 +18,7 @@ const startServerLifecycle = ({
     console.log(`[alphaclaw] Express listening on :${PORT}`);
     if (isOnboarded()) {
       runOnboardedBootSequence({
+        ensureUsageTrackerPluginConfig,
         doSyncPromptFiles,
         reloadEnv,
         syncChannelConfig,

package/lib/server/onboarding/openclaw.js

@@ -1,13 +1,10 @@
-const path = require("path");
 const { buildSecretReplacements } = require("../helpers");
+const {
+  ensurePluginsShell,
+  ensurePluginAllowed,
+  ensureUsageTrackerPluginEntry,
+} = require("../usage-tracker-config");
 
-const kUsageTrackerPluginPath = path.resolve(
-  __dirname,
-  "..",
-  "..",
-  "plugin",
-  "usage-tracker",
-);
 const kDefaultToolsProfile = "full";
 const kBootstrapExtraFiles = [
   "hooks/bootstrap/AGENTS.md",
@@ -136,19 +133,9 @@ const buildOnboardArgs = ({
   return onboardArgs;
 };
 
-const ensurePluginAllowed = (cfg, pluginKey) => {
-  if (!cfg.plugins.allow.includes(pluginKey)) {
-    cfg.plugins.allow.push(pluginKey);
-  }
-};
-
 const ensureManagedConfigShell = (cfg) => {
   if (!cfg.channels) cfg.channels = {};
-  if (!cfg.plugins) cfg.plugins = {};
-  if (!Array.isArray(cfg.plugins.allow)) cfg.plugins.allow = [];
-  if (!cfg.plugins.load) cfg.plugins.load = {};
-  if (!Array.isArray(cfg.plugins.load.paths)) cfg.plugins.load.paths = [];
-  if (!cfg.plugins.entries) cfg.plugins.entries = {};
+  ensurePluginsShell(cfg);
   if (!cfg.commands) cfg.commands = {};
   if (!cfg.tools) cfg.tools = {};
   if (!cfg.hooks) cfg.hooks = {};
@@ -184,7 +171,7 @@ const applyFreshOnboardingChannels = ({ cfg, varMap }) => {
       groupPolicy: "allowlist",
     };
     cfg.plugins.entries.telegram = { enabled: true };
-    ensurePluginAllowed(cfg, "telegram");
+    ensurePluginAllowed({ cfg, pluginKey: "telegram" });
     console.log("[onboard] Telegram configured");
   }
   if (varMap.DISCORD_BOT_TOKEN) {
@@ -195,7 +182,7 @@ const applyFreshOnboardingChannels = ({ cfg, varMap }) => {
       groupPolicy: "allowlist",
     };
     cfg.plugins.entries.discord = { enabled: true };
-    ensurePluginAllowed(cfg, "discord");
+    ensurePluginAllowed({ cfg, pluginKey: "discord" });
     console.log("[onboard] Discord configured");
   }
   if (varMap.SLACK_BOT_TOKEN && varMap.SLACK_APP_TOKEN) {
@@ -208,14 +195,10 @@ const applyFreshOnboardingChannels = ({ cfg, varMap }) => {
       groupPolicy: "open",
     };
     cfg.plugins.entries.slack = { enabled: true };
-    ensurePluginAllowed(cfg, "slack");
+    ensurePluginAllowed({ cfg, pluginKey: "slack" });
     console.log("[onboard] Slack configured");
   }
-  if (!cfg.plugins.load.paths.includes(kUsageTrackerPluginPath)) {
-    cfg.plugins.load.paths.push(kUsageTrackerPluginPath);
-  }
-  ensurePluginAllowed(cfg, "usage-tracker");
-  cfg.plugins.entries["usage-tracker"] = { enabled: true };
+  ensureUsageTrackerPluginEntry(cfg);
 };
 
 const writeSanitizedOpenclawConfig = ({ fs, openclawDir, varMap }) => {
@@ -248,14 +231,7 @@ const writeManagedImportOpenclawConfig = ({ fs, openclawDir, varMap }) => {
   const cfg = JSON.parse(fs.readFileSync(configPath, "utf8"));
   ensureManagedConfigShell(cfg);
 
-  if (!cfg.plugins.load.paths.includes(kUsageTrackerPluginPath)) {
-    cfg.plugins.load.paths.push(kUsageTrackerPluginPath);
-  }
-  ensurePluginAllowed(cfg, "usage-tracker");
-  cfg.plugins.entries["usage-tracker"] = {
-    ...(cfg.plugins.entries["usage-tracker"] || {}),
-    enabled: true,
-  };
+  ensureUsageTrackerPluginEntry(cfg);
 
   if (varMap.TELEGRAM_BOT_TOKEN) {
     cfg.channels.telegram = {
@@ -269,7 +245,7 @@ const writeManagedImportOpenclawConfig = ({ fs, openclawDir, varMap }) => {
       ...(cfg.plugins.entries.telegram || {}),
       enabled: true,
     };
-    ensurePluginAllowed(cfg, "telegram");
+    ensurePluginAllowed({ cfg, pluginKey: "telegram" });
   }
 
   if (varMap.DISCORD_BOT_TOKEN) {
@@ -284,7 +260,7 @@ const writeManagedImportOpenclawConfig = ({ fs, openclawDir, varMap }) => {
       ...(cfg.plugins.entries.discord || {}),
       enabled: true,
     };
-    ensurePluginAllowed(cfg, "discord");
+    ensurePluginAllowed({ cfg, pluginKey: "discord" });
   }
 
   if (varMap.SLACK_BOT_TOKEN && varMap.SLACK_APP_TOKEN) {
@@ -301,7 +277,7 @@ const writeManagedImportOpenclawConfig = ({ fs, openclawDir, varMap }) => {
       ...(cfg.plugins.entries.slack || {}),
       enabled: true,
     };
-    ensurePluginAllowed(cfg, "slack");
+    ensurePluginAllowed({ cfg, pluginKey: "slack" });
   }
 
   fs.writeFileSync(configPath, JSON.stringify(cfg, null, 2));

package/lib/server/startup.js

@@ -1,4 +1,5 @@
 const runOnboardedBootSequence = ({
+  ensureUsageTrackerPluginConfig,
   doSyncPromptFiles,
   reloadEnv,
   syncChannelConfig,
@@ -9,6 +10,13 @@ const runOnboardedBootSequence = ({
   watchdog,
   gmailWatchService,
 }) => {
+  try {
+    ensureUsageTrackerPluginConfig();
+  } catch (error) {
+    console.error(
+      `[alphaclaw] Failed to ensure usage-tracker plugin config on boot: ${error.message}`,
+    );
+  }
   doSyncPromptFiles();
   reloadEnv();
   syncChannelConfig(readEnvFile());

package/lib/server/usage-tracker-config.js

@@ -0,0 +1,71 @@
+const path = require("path");
+const { readOpenclawConfig, writeOpenclawConfig } = require("./openclaw-config");
+
+const kUsageTrackerPluginPath = path.resolve(
+  __dirname,
+  "..",
+  "plugin",
+  "usage-tracker",
+);
+
+const ensurePluginsShell = (cfg = {}) => {
+  if (!cfg.plugins || typeof cfg.plugins !== "object") cfg.plugins = {};
+  if (!Array.isArray(cfg.plugins.allow)) cfg.plugins.allow = [];
+  if (!cfg.plugins.load || typeof cfg.plugins.load !== "object") {
+    cfg.plugins.load = {};
+  }
+  if (!Array.isArray(cfg.plugins.load.paths)) cfg.plugins.load.paths = [];
+  if (!cfg.plugins.entries || typeof cfg.plugins.entries !== "object") {
+    cfg.plugins.entries = {};
+  }
+};
+
+const ensurePluginAllowed = ({ cfg = {}, pluginKey = "" }) => {
+  const normalizedPluginKey = String(pluginKey || "").trim();
+  if (!normalizedPluginKey) return;
+  ensurePluginsShell(cfg);
+  if (!cfg.plugins.allow.includes(normalizedPluginKey)) {
+    cfg.plugins.allow.push(normalizedPluginKey);
+  }
+};
+
+const ensureUsageTrackerPluginEntry = (cfg = {}) => {
+  const before = JSON.stringify(cfg);
+  ensurePluginAllowed({ cfg, pluginKey: "usage-tracker" });
+  if (!cfg.plugins.load.paths.includes(kUsageTrackerPluginPath)) {
+    cfg.plugins.load.paths.push(kUsageTrackerPluginPath);
+  }
+  cfg.plugins.entries["usage-tracker"] = {
+    ...(cfg.plugins.entries["usage-tracker"] &&
+    typeof cfg.plugins.entries["usage-tracker"] === "object"
+      ? cfg.plugins.entries["usage-tracker"]
+      : {}),
+    enabled: true,
+  };
+  return JSON.stringify(cfg) !== before;
+};
+
+const ensureUsageTrackerPluginConfig = ({ fsModule, openclawDir }) => {
+  const cfg = readOpenclawConfig({
+    fsModule,
+    openclawDir,
+    fallback: {},
+  });
+  const changed = ensureUsageTrackerPluginEntry(cfg);
+  if (!changed) return false;
+  writeOpenclawConfig({
+    fsModule,
+    openclawDir,
+    config: cfg,
+    spacing: 2,
+  });
+  return true;
+};
+
+module.exports = {
+  kUsageTrackerPluginPath,
+  ensurePluginsShell,
+  ensurePluginAllowed,
+  ensureUsageTrackerPluginEntry,
+  ensureUsageTrackerPluginConfig,
+};

package/lib/server.js

@@ -133,6 +133,9 @@ const {
   startServerLifecycle,
   registerServerShutdown,
 } = require("./server/init/server-lifecycle");
+const {
+  ensureUsageTrackerPluginConfig,
+} = require("./server/usage-tracker-config");
 
 const { PORT, kTrustProxyHops, SETUP_API_PREFIXES } = constants;
 
@@ -338,6 +341,11 @@ startServerLifecycle({
   PORT,
   isOnboarded,
   runOnboardedBootSequence,
+  ensureUsageTrackerPluginConfig: () =>
+    ensureUsageTrackerPluginConfig({
+      fsModule: fs,
+      openclawDir: constants.OPENCLAW_DIR,
+    }),
   doSyncPromptFiles,
   reloadEnv,
   syncChannelConfig,

package/package.json

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