Merge remote-tracking branch 'upstream/main' into fix/coalesce-channel-restart-status

Author: Siri-Ray

apps/controller/src/lib/openclaw-config-compiler.ts

@@ -431,11 +431,19 @@ function compilePlugins(
     ...(hasMiniMaxOauth ? ["minimax-portal-auth"] : []),
   ];
 
+  // Sort and dedup defensively so `plugins.allow` is fully deterministic.
+  // Without this, channel reorderings or brief status flaps change the
+  // output order, which OpenClaw treats as a config change and triggers
+  // a SIGUSR1 restart + 11s gateway drain per reload.
+  const allow = Array.from(
+    new Set([...connectedPluginIds, ...platformPluginIds]),
+  ).sort();
+
   return {
     load: {
       paths: [env.openclawExtensionsDir],
     },
-    allow: [...connectedPluginIds, ...platformPluginIds],
+    allow,
     entries: {
       feishu: {
         enabled: true,

apps/controller/src/services/openclaw-sync-service.ts

@@ -31,24 +31,30 @@ function resolvePrimaryModelRef(
   oauthState: OAuthConnectionState,
 ): string {
   const availableRuntimeModels = collectRuntimeModelRefs(compiled);
+  const configuredProviderKeys = new Set(
+    Object.keys(compiled.models?.providers ?? {}),
+  );
 
   if (typeof model === "string") {
     return resolveAvailableRuntimeModel(
       resolveModelId(config, env, model, oauthState),
       availableRuntimeModels,
+      configuredProviderKeys,
     );
   }
 
   if (model && typeof model.primary === "string") {
     return resolveAvailableRuntimeModel(
       resolveModelId(config, env, model.primary, oauthState),
       availableRuntimeModels,
+      configuredProviderKeys,
     );
   }
 
   return resolveAvailableRuntimeModel(
     resolveModelId(config, env, env.defaultModelId, oauthState),
     availableRuntimeModels,
+    configuredProviderKeys,
   );
 }
 
@@ -71,6 +77,7 @@ const OAUTH_PROVIDER_PREFIXES = ["openai-codex/"];
 function resolveAvailableRuntimeModel(
   desiredRef: string,
   availableRuntimeModels: Array<{ id: string; name: string }>,
+  configuredProviderKeys: ReadonlySet<string>,
 ): string {
   if (availableRuntimeModels.some((model) => model.id === desiredRef)) {
     return desiredRef;
@@ -82,6 +89,19 @@ function resolveAvailableRuntimeModel(
     return desiredRef;
   }
 
+  // Trust any model ref whose provider is configured in compiled.models.providers,
+  // even if the provider's explicit `models` list is empty. This covers BYOK
+  // flows where the user enabled a provider (e.g. Anthropic) with their own
+  // API key but never added models to its allowlist — OpenClaw's
+  // resolveModelWithRegistry has a generic-fallback path that builds a
+  // synthetic model entry when providerConfig is present, so the request
+  // still goes through. Without this, the user's explicit selection is
+  // silently overridden with the link default.
+  const providerKey = desiredRef.split("/", 1)[0];
+  if (providerKey && configuredProviderKeys.has(providerKey)) {
+    return desiredRef;
+  }
+
   return selectPreferredModel(availableRuntimeModels)?.id ?? desiredRef;
 }
 

apps/controller/src/store/nexu-config-store.ts

@@ -11,6 +11,7 @@ import type {
   ConnectWecomInput,
   DesktopRewardClaimProof,
   DesktopRewardsStatus,
+  RewardTask,
   RewardTaskId,
 } from "@nexu/shared";
 import {
@@ -23,6 +24,7 @@ import {
   type refreshIntegrationSchema,
   rewardGroupSchema,
   rewardTaskIdSchema,
+  rewardTasks,
   type updateAuthSourceSchema,
   type updateUserProfileSchema,
   type upsertProviderBodySchema,
@@ -94,6 +96,10 @@ const defaultCloudProfile: CloudProfileEntry = {
   linkUrl: "https://link.nexu.io",
 };
 
+const rewardTaskTemplateById = new Map<RewardTaskId, RewardTask>(
+  rewardTasks.map((task) => [task.id, task]),
+);
+
 export type DesktopCloudStateChange = {
   hadCloudInventory: boolean;
   hasCloudInventory: boolean;
@@ -312,6 +318,29 @@ function convertCloudStatusToDesktop(
   },
 ): DesktopRewardsStatus {
   const { cloudConnected, activeModelId, activeManagedModel } = viewer;
+  const tasks = cloudStatus.tasks.flatMap((task) => {
+    const parsedTaskId = rewardTaskIdSchema.safeParse(task.id);
+    const parsedGroupId = rewardGroupSchema.safeParse(task.groupId);
+    if (!parsedTaskId.success || !parsedGroupId.success) {
+      return [];
+    }
+
+    return {
+      id: parsedTaskId.data as RewardTaskId,
+      group: parsedGroupId.data,
+      icon: task.icon ?? "gift",
+      reward: task.rewardPoints,
+      shareMode: task.shareMode as "link" | "tweet" | "image",
+      repeatMode: task.repeatMode as "once" | "daily" | "weekly",
+      requiresScreenshot: task.shareMode === "image",
+      actionUrl:
+        rewardTaskTemplateById.get(parsedTaskId.data)?.actionUrl ?? null,
+      isClaimed: task.isClaimed,
+      lastClaimedAt: task.lastClaimedAt,
+      claimCount: task.claimCount,
+    };
+  });
+
   return {
     viewer: {
       cloudConnected,
@@ -321,28 +350,12 @@ function convertCloudStatusToDesktop(
         (activeManagedModel ? "nexu" : (activeModelId?.split("/")[0] ?? null)),
       usingManagedModel: activeManagedModel != null,
     },
-    progress: cloudStatus.progress,
-    tasks: cloudStatus.tasks.flatMap((task) => {
-      const parsedTaskId = rewardTaskIdSchema.safeParse(task.id);
-      const parsedGroupId = rewardGroupSchema.safeParse(task.groupId);
-      if (!parsedTaskId.success || !parsedGroupId.success) {
-        return [];
-      }
-
-      return {
-        id: parsedTaskId.data as RewardTaskId,
-        group: parsedGroupId.data,
-        icon: task.icon ?? "gift",
-        reward: task.rewardPoints,
-        shareMode: task.shareMode as "link" | "tweet" | "image",
-        repeatMode: task.repeatMode as "once" | "daily" | "weekly",
-        requiresScreenshot: task.shareMode === "image",
-        actionUrl: task.url,
-        isClaimed: task.isClaimed,
-        lastClaimedAt: task.lastClaimedAt,
-        claimCount: task.claimCount,
-      };
-    }),
+    progress: {
+      ...cloudStatus.progress,
+      claimedCount: tasks.filter((task) => task.isClaimed).length,
+      totalCount: tasks.length,
+    },
+    tasks,
     cloudBalance: cloudStatus.cloudBalance
       ? {
           totalBalance: cloudStatus.cloudBalance.totalBalance,
@@ -538,6 +551,15 @@ export class NexuConfigStore {
     });
   }
 
+  private isCurrentPollingSignal(signal: AbortSignal): boolean {
+    // The polling loop may still be processing a response when a newer
+    // connectDesktopCloud() call has already aborted it and installed a fresh
+    // pollingState. Identifying the active poll by AbortSignal identity lets
+    // any final-state write from a stale loop become a no-op instead of
+    // clobbering the new flow's pollingState or persisted credentials.
+    return this.pollingState?.abortController.signal === signal;
+  }
+
   private async pollDesktopCloudAuthorization(
     cloudApiUrl: string,
     deviceId: string,
@@ -584,6 +606,9 @@ export class NexuConfigStore {
               : ((await this.fetchDesktopCloudModels(linkUrl, data.apiKey)) ??
                 []);
 
+          if (signal.aborted || !this.isCurrentPollingSignal(signal)) {
+            return;
+          }
           this.pollingState = null;
           await this.setDesktopCloudState({
             connected: true,
@@ -605,6 +630,9 @@ export class NexuConfigStore {
         }
 
         if (data.status === "expired") {
+          if (signal.aborted || !this.isCurrentPollingSignal(signal)) {
+            return;
+          }
           this.pollingState = null;
           await this.setDesktopCloudState({
             connected: false,
@@ -626,6 +654,9 @@ export class NexuConfigStore {
       }
     }
 
+    if (signal.aborted || !this.isCurrentPollingSignal(signal)) {
+      return;
+    }
     this.pollingState = null;
     await this.setDesktopCloudState({
       connected: false,
@@ -1815,17 +1846,38 @@ export class NexuConfigStore {
     });
   }
 
+  private abortDesktopCloudPolling(): void {
+    if (this.pollingState) {
+      this.pollingState.abortController.abort();
+      this.pollingState = null;
+    }
+  }
+
   async connectDesktopCloud(options?: { source?: string | null }) {
     const config = await this.getConfig();
     const current = readDesktopCloud(config);
     const { activeProfile } =
       await this.readConfiguredDesktopCloudProfile(config);
-    if (this.pollingState || current.polling) {
-      return { error: "Connection attempt already in progress" };
-    }
     if (current.connected && current.apiKey) {
       return { error: "Already connected. Disconnect first." };
     }
+    // If a previous connect attempt is still polling (e.g. the user closed the
+    // authorization tab without completing the flow), cancel it and clear the
+    // persisted polling flag so this call can start a fresh browser login.
+    if (this.pollingState || current.polling) {
+      this.abortDesktopCloudPolling();
+      await this.setDesktopCloudState({
+        connected: false,
+        polling: false,
+        userId: null,
+        userName: null,
+        userEmail: null,
+        connectedAt: null,
+        linkUrl: null,
+        apiKey: null,
+        models: [],
+      });
+    }
     const trimmedSource = options?.source?.trim();
     const sourceQuery =
       trimmedSource && trimmedSource.length > 0
@@ -2040,10 +2092,7 @@ export class NexuConfigStore {
 
     const previousCloud = readDesktopCloud(await this.getConfig());
 
-    if (this.pollingState) {
-      this.pollingState.abortController.abort();
-      this.pollingState = null;
-    }
+    this.abortDesktopCloudPolling();
 
     await this.store.update((config) => {
       const currentProfile = readLocalProfile(config);
@@ -2107,10 +2156,7 @@ export class NexuConfigStore {
       throw new Error(`Unknown cloud profile: ${name}`);
     }
 
-    if (this.pollingState) {
-      this.pollingState.abortController.abort();
-      this.pollingState = null;
-    }
+    this.abortDesktopCloudPolling();
 
     await this.store.update((currentConfig) => {
       const sessions = readDesktopCloudSessions(currentConfig);
@@ -2252,10 +2298,7 @@ export class NexuConfigStore {
 
   async disconnectDesktopCloud() {
     const previousCloud = readDesktopCloud(await this.getConfig());
-    if (this.pollingState) {
-      this.pollingState.abortController.abort();
-      this.pollingState = null;
-    }
+    this.abortDesktopCloudPolling();
 
     await this.setDesktopCloudState({
       connected: false,

apps/controller/tests/nexu-config-store.test.ts

@@ -464,9 +464,9 @@ describe("NexuConfigStore", () => {
                   shareMode: "link",
                   icon: "calendar",
                   url: null,
-                  isClaimed: false,
-                  claimCount: 0,
-                  lastClaimedAt: null,
+                  isClaimed: true,
+                  claimCount: 1,
+                  lastClaimedAt: "2026-04-08T00:00:00.000Z",
                 },
                 {
                   id: "xiaohongshu",
@@ -483,7 +483,7 @@ describe("NexuConfigStore", () => {
                 },
               ],
               progress: {
-                claimedCount: 0,
+                claimedCount: 1,
                 totalCount: 2,
                 earnedCredits: 0,
               },
@@ -505,6 +505,8 @@ describe("NexuConfigStore", () => {
       expect(status.cloudBalance?.totalBalance).toBe(1);
       expect(status.tasks).toHaveLength(1);
       expect(status.tasks[0]?.id).toBe("daily_checkin");
+      expect(status.progress.claimedCount).toBe(1);
+      expect(status.progress.totalCount).toBe(1);
     } finally {
       vi.unstubAllGlobals();
     }

apps/desktop/main/services/launchd-manager.ts

@@ -45,6 +45,20 @@ export class LaunchdManager {
     const plistPath = path.join(this.plistDir, `${label}.plist`);
     await fs.mkdir(this.plistDir, { recursive: true });
 
+    // Always clear any persistent "disabled" override left by legacy
+    // `launchctl unload -w`. `launchctl enable` is idempotent (no-op when
+    // not disabled), so this is safe to run on every boot. Without this,
+    // upgrades that leave the plist unchanged hit the early-return below
+    // and leak the disabled flag, causing OpenClaw's SIGUSR1 self-restart
+    // to fail with "Bootstrap failed: 5".
+    const disabled = await this.isServiceDisabled(label);
+    if (disabled) {
+      this.log(
+        `installService: ${label} has disabled override, clearing with launchctl enable`,
+      );
+      await this.enableService(label);
+    }
+
     const isRegistered = await this.isServiceRegistered(label);
 
     if (isRegistered) {
@@ -74,16 +88,6 @@ export class LaunchdManager {
 
     await fs.writeFile(plistPath, plistContent, "utf8");
 
-    // Clear any persistent "disabled" override left by legacy `launchctl unload -w`.
-    // Without this, bootstrap fails with error 5 (Input/output error).
-    const disabled = await this.isServiceDisabled(label);
-    if (disabled) {
-      this.log(
-        `installService: ${label} has disabled override, clearing with launchctl enable`,
-      );
-      await this.enableService(label);
-    }
-
     // Bootstrap with retry: "Input/output error" (code 5) means launchd
     // has stale state for this label. Bootout to clear it, then retry.
     for (let attempt = 0; attempt < 2; attempt++) {