@chrysb/alphaclaw 0.8.1-beta.5 → 0.8.1-beta.7

package/lib/public/js/components/google/gmail-setup-wizard.js

@@ -93,6 +93,7 @@ export const GmailSetupWizard = ({
   const [watchEnabled, setWatchEnabled] = useState(false);
   const [sendingToAgent, setSendingToAgent] = useState(false);
   const [agentMessageSent, setAgentMessageSent] = useState(false);
+  const [existingWebhookAtOpen, setExistingWebhookAtOpen] = useState(false);
 
   const {
     selectedSessionKey,
@@ -123,6 +124,7 @@ export const GmailSetupWizard = ({
     setWatchEnabled(false);
     setSendingToAgent(false);
     setAgentMessageSent(false);
+    setExistingWebhookAtOpen(Boolean(clientConfig?.webhookExists));
   }, [visible, account?.id]);
 
   const commands = clientConfig?.commands || null;
@@ -135,7 +137,7 @@ export const GmailSetupWizard = ({
     String(projectIdInput || "").trim() ||
     String(clientConfig?.projectId || "").trim() ||
     "<project-id>";
-  const hasExistingWebhookSetup = Boolean(clientConfig?.webhookExists);
+  const hasExistingWebhookSetup = existingWebhookAtOpen;
   const stepTitles = hasExistingWebhookSetup ? kTutorialStepTitles : kSetupStepTitles;
   const totalSteps = stepTitles.length;
   const client =

package/lib/public/js/components/session-select-field.js

@@ -26,40 +26,43 @@ export const SessionSelectField = ({
   statusClassName = "text-xs text-gray-500",
   errorClassName = "text-xs text-red-400",
 }) => {
+  const resolvedValue = selectedSessionKey || (allowNone ? noneValue : "");
+  const isDisabled = disabled || loading;
   return html`
     <div class=${containerClassName}>
       ${label
         ? html`<label class=${labelClassName}>${label}</label>`
         : null}
       <select
-        value=${selectedSessionKey || (allowNone ? noneValue : "")}
+        value=${resolvedValue}
         onInput=${(event) => {
           const nextValue = String(event.currentTarget?.value || "");
           onChangeSessionKey(allowNone && nextValue === noneValue ? "" : nextValue);
         }}
-        disabled=${disabled}
+        disabled=${isDisabled}
         class=${selectClassName}
       >
-        ${allowNone
-          ? html`<option value=${noneValue}>${noneLabel}</option>`
-          : null}
-        ${!allowNone && sessions.length === 0
-          ? html`<option value="">${emptyOptionLabel}</option>`
-          : null}
-        ${sessions.map(
-          (sessionRow) => html`
-            <option value=${getSessionRowKey(sessionRow)}>
-              ${String(sessionRow?.label || getSessionRowKey(sessionRow) || "Session")}
-            </option>
-          `,
-        )}
+        ${loading
+          ? html`<option value=${resolvedValue || ""}>${loadingLabel}</option>`
+          : html`
+              ${allowNone
+                ? html`<option value=${noneValue}>${noneLabel}</option>`
+                : null}
+              ${!allowNone && sessions.length === 0
+                ? html`<option value="">${emptyOptionLabel}</option>`
+                : null}
+              ${sessions.map(
+                (sessionRow) => html`
+                  <option value=${getSessionRowKey(sessionRow)}>
+                    ${String(sessionRow?.label || getSessionRowKey(sessionRow) || "Session")}
+                  </option>
+                `,
+              )}
+            `}
       </select>
       ${helperText
         ? html`<div class=${helperClassName}>${helperText}</div>`
         : null}
-      ${loading
-        ? html`<div class=${statusClassName}>${loadingLabel}</div>`
-        : null}
       ${error
         ? html`<div class=${errorClassName}>${error}</div>`
         : null}

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/github.js

@@ -16,9 +16,17 @@ const buildGithubHeaders = (githubToken) => ({
 const parseGithubErrorMessage = async (response) => {
   try {
     const payload = await response.json();
-    if (typeof payload?.message === "string" && payload.message.trim()) {
-      return payload.message.trim();
-    }
+    const base =
+      typeof payload?.message === "string" ? payload.message.trim() : "";
+    const detail = Array.isArray(payload?.errors)
+      ? payload.errors
+          .map((e) => (typeof e?.message === "string" ? e.message.trim() : ""))
+          .filter(Boolean)
+          .join("; ")
+      : "";
+    if (base && detail) return `${base} (${detail})`;
+    if (base) return base;
+    if (detail) return detail;
   } catch {}
   return response.statusText || `HTTP ${response.status}`;
 };
@@ -165,7 +173,7 @@ const ensureGithubRepoAccessible = async ({
       return {
         ok: false,
         status: 400,
-        error: `Failed to create repo: ${details}.${hint}`,
+        error: `Failed to create repo: ${details.replace(/\.$/, "")}${hint ? `. ${hint.trim()}` : ""}`,
       };
     }
     console.log(`[onboard] Repo ${repoUrl} created`);

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.5",
+  "version": "0.8.1-beta.7",
   "publishConfig": {
     "access": "public"
   },