gate the cloud default on settled signals

Author: charlesvien

packages/ui/src/features/canvas/components/ChannelHomeComposer.tsx

@@ -8,6 +8,7 @@ import {
   useState,
 } from "react";
 import { useConnectivity } from "../../../hooks/useConnectivity";
+import { useUserRepositoryIntegration } from "../../integrations/useIntegrations";
 import { PromptInput } from "../../message-editor/components/PromptInput";
 import { useDraftStore } from "../../message-editor/draftStore";
 import type { EditorHandle } from "../../message-editor/types";
@@ -22,8 +23,10 @@ import {
   type WorkspaceMode,
   WorkspaceModeSelect,
 } from "../../task-detail/components/WorkspaceModeSelect";
+import { useCloudModeEnabled } from "../../task-detail/hooks/useCloudModeEnabled";
 import { usePreviewConfig } from "../../task-detail/hooks/usePreviewConfig";
 import { useTaskCreation } from "../../task-detail/hooks/useTaskCreation";
+import { resolveWorkspaceModePreference } from "../../task-detail/hooks/workspaceModePreference";
 
 export interface ChannelHomeComposerHandle {
   /** Drop a starter prompt into the editor and apply its mode, if any. */
@@ -77,10 +80,18 @@ export const ChannelHomeComposer = forwardRef<
     [setLastUsedAdapter],
   );
 
+  const cloudModeEnabled = useCloudModeEnabled();
+  const { hasGithubIntegration } = useUserRepositoryIntegration();
+
   // Repo-less channel tasks only run local or cloud (worktree needs a repo), so
   // collapse any lingering worktree preference down to local for the initial pick.
-  const [workspaceMode, setWorkspaceModeState] = useState<WorkspaceMode>(
-    lastUsedWorkspaceMode === "cloud" ? "cloud" : "local",
+  const [workspaceMode, setWorkspaceModeState] = useState<WorkspaceMode>(() =>
+    resolveWorkspaceModePreference({
+      preferredMode: lastUsedWorkspaceMode === "cloud" ? "cloud" : "local",
+      cloudModeEnabled,
+      hasGithubIntegration,
+      lastUsedLocalWorkspaceMode: "local",
+    }),
   );
   const [selectedCloudEnvId, setSelectedCloudEnvId] = useState<string | null>(
     null,

packages/ui/src/features/feature-flags/useFeatureFlagsLoaded.ts

@@ -0,0 +1,12 @@
+import { useService } from "@posthog/di/react";
+import { useEffect, useState } from "react";
+import { FEATURE_FLAGS, type FeatureFlags } from "./identifiers";
+
+export function useFeatureFlagsLoaded(): boolean {
+  const flags = useService<FeatureFlags>(FEATURE_FLAGS);
+  const [loaded, setLoaded] = useState(false);
+
+  useEffect(() => flags.onFlagsLoaded(() => setLoaded(true)), [flags]);
+
+  return loaded;
+}

packages/ui/src/features/settings/settingsStore.test.ts

@@ -1,13 +1,29 @@
 import { registerRendererStateStorage } from "@posthog/ui/shell/rendererStorage";
 import { beforeEach, describe, expect, it, vi } from "vitest";
-import { type CompletionSound, useSettingsStore } from "./settingsStore";
+import {
+  type CompletionSound,
+  DEFAULT_WORKSPACE_MODE,
+  useSettingsStore,
+} from "./settingsStore";
 
 const getItem = vi.fn();
 const setItem = vi.fn();
 const removeItem = vi.fn();
 
 registerRendererStateStorage({ getItem, setItem, removeItem });
 
+// Runs before any test mutates the store singleton, so getState() still
+// reflects the initial values.
+describe("feature settingsStore defaults", () => {
+  it("defaults the workspace mode to cloud with a local fallback", () => {
+    expect(DEFAULT_WORKSPACE_MODE).toBe("cloud");
+    expect(useSettingsStore.getState().lastUsedWorkspaceMode).toBe("cloud");
+    expect(useSettingsStore.getState().lastUsedLocalWorkspaceMode).toBe(
+      "local",
+    );
+  });
+});
+
 describe("feature settingsStore cloud selections", () => {
   beforeEach(() => {
     getItem.mockReset();

packages/ui/src/features/settings/settingsStore.ts

@@ -12,6 +12,8 @@ import { persist } from "zustand/middleware";
 
 export type DefaultRunMode = "local" | "cloud" | "last_used";
 export type LocalWorkspaceMode = "worktree" | "local";
+
+export const DEFAULT_WORKSPACE_MODE: WorkspaceMode = "cloud";
 export type AgentAdapter = Adapter;
 export type DefaultInitialTaskMode = "plan" | "last_used";
 export type DefaultMessagingMode = "queue" | "steer";
@@ -221,7 +223,7 @@ export const useSettingsStore = create<SettingsStore>()(
       defaultRunMode: "last_used",
       lastUsedRunMode: "local",
       lastUsedLocalWorkspaceMode: "local",
-      lastUsedWorkspaceMode: "cloud",
+      lastUsedWorkspaceMode: DEFAULT_WORKSPACE_MODE,
       lastUsedAdapter: "claude",
       lastUsedModel: null,
       lastUsedReasoningEffort: null,

packages/ui/src/features/task-detail/components/TaskInput.tsx

@@ -37,6 +37,7 @@ import { useAutoresearchEnabled } from "../../autoresearch/useAutoresearchEnable
 import { useFileSearchStore } from "../../command/fileSearchStore";
 import { NewTaskFilePreview } from "../../command/NewTaskFilePreview";
 import { EnvironmentSelector } from "../../environments/EnvironmentSelector";
+import { useFeatureFlagsLoaded } from "../../feature-flags/useFeatureFlagsLoaded";
 import { AdditionalDirectoriesButton } from "../../folder-picker/AdditionalDirectoriesButton";
 import { FolderPicker } from "../../folder-picker/FolderPicker";
 import { GitHubRepoPicker } from "../../folder-picker/GitHubRepoPicker";
@@ -72,6 +73,7 @@ import { UnifiedModelSelector } from "../../sessions/components/UnifiedModelSele
 import { getCurrentModeFromConfigOptions } from "../../sessions/sessionStore";
 import {
   type AgentAdapter,
+  DEFAULT_WORKSPACE_MODE,
   useSettingsStore,
 } from "../../settings/settingsStore";
 import { useSkills } from "../../skills/useSkills";
@@ -83,6 +85,7 @@ import {
 import { usePreviewConfig } from "../hooks/usePreviewConfig";
 import { useTaskCreation } from "../hooks/useTaskCreation";
 import { useWarmTask } from "../hooks/useWarmTask";
+import { resolveWorkspaceModePreference } from "../hooks/workspaceModePreference";
 import { CloudGithubMissingNotice } from "./CloudGithubMissingNotice";
 import { NewTaskSuggestions } from "./ContinueCliSessions";
 import {
@@ -315,43 +318,57 @@ export function TaskInput({
   } = useUserRepositoryIntegration();
 
   const cloudModeEnabled = useCloudModeEnabled();
+  const flagsLoaded = useFeatureFlagsLoaded();
   const reposReady = areReposReady({
     isLoadingRepos,
     repositoriesCount: repositories.length,
     hasGithubIntegration,
   });
 
-  // Cloud is the default, but only when it works out of the box: with the flag
-  // off or GitHub not connected, fall back to the last local mode instead of
-  // stranding the user behind a connect-GitHub prompt.
-  const resolveWorkspaceModePreference = useCallback(
-    (mode: WorkspaceMode): WorkspaceMode =>
-      mode === "cloud" && (!cloudModeEnabled || !hasGithubIntegration)
-        ? lastUsedLocalWorkspaceMode
-        : mode,
-    [cloudModeEnabled, hasGithubIntegration, lastUsedLocalWorkspaceMode],
-  );
-
   const [workspaceMode, setWorkspaceModeState] = useState<WorkspaceMode>(() => {
     if (initialCloudRepository) return "cloud";
-    return resolveWorkspaceModePreference(lastUsedWorkspaceMode || "cloud");
+    return resolveWorkspaceModePreference({
+      preferredMode: lastUsedWorkspaceMode || DEFAULT_WORKSPACE_MODE,
+      cloudModeEnabled,
+      hasGithubIntegration,
+      lastUsedLocalWorkspaceMode,
+    });
   });
 
+  // A positive flag or integration signal is final, but a negative one may
+  // just mean the async flag fetch or integrations query hasn't landed yet, so
+  // a cloud preference only resolves once each negative signal is settled.
+  const cloudSignalsSettled =
+    (cloudModeEnabled || flagsLoaded) &&
+    (hasGithubIntegration || !isLoadingRepos);
+
   const didResolveWorkspaceModeRef = useRef(false);
   useEffect(() => {
     if (didResolveWorkspaceModeRef.current) return;
-    if (!settingsHydrated || !reposReady) return;
+    if (!settingsHydrated) return;
+    if (initialCloudRepository) {
+      didResolveWorkspaceModeRef.current = true;
+      return;
+    }
+    const preferredMode = lastUsedWorkspaceMode || DEFAULT_WORKSPACE_MODE;
+    if (preferredMode === "cloud" && !cloudSignalsSettled) return;
     didResolveWorkspaceModeRef.current = true;
-    if (initialCloudRepository) return;
     setWorkspaceModeState(
-      resolveWorkspaceModePreference(lastUsedWorkspaceMode || "cloud"),
+      resolveWorkspaceModePreference({
+        preferredMode,
+        cloudModeEnabled,
+        hasGithubIntegration,
+        lastUsedLocalWorkspaceMode,
+      }),
     );
   }, [
     settingsHydrated,
-    reposReady,
     lastUsedWorkspaceMode,
     initialCloudRepository,
-    resolveWorkspaceModePreference,
+    cloudSignalsSettled,
+    cloudModeEnabled,
+    hasGithubIntegration,
+    lastUsedLocalWorkspaceMode,
   ]);
 
   const setWorkspaceMode = (mode: WorkspaceMode) => {

packages/ui/src/features/task-detail/hooks/workspaceModePreference.test.ts

@@ -0,0 +1,50 @@
+import { describe, expect, it } from "vitest";
+import { resolveWorkspaceModePreference } from "./workspaceModePreference";
+
+describe("resolveWorkspaceModePreference", () => {
+  it.each([
+    ["cloud", true, true, "local", "cloud"],
+    ["cloud", false, true, "local", "local"],
+    ["cloud", true, false, "local", "local"],
+    ["cloud", false, false, "local", "local"],
+    ["cloud", false, true, "worktree", "worktree"],
+    ["cloud", true, false, "worktree", "worktree"],
+  ] as const)(
+    "resolves %s (flag %s, integration %s, local fallback %s) to %s",
+    (
+      preferredMode,
+      cloudModeEnabled,
+      hasGithubIntegration,
+      lastUsedLocalWorkspaceMode,
+      expected,
+    ) => {
+      expect(
+        resolveWorkspaceModePreference({
+          preferredMode,
+          cloudModeEnabled,
+          hasGithubIntegration,
+          lastUsedLocalWorkspaceMode,
+        }),
+      ).toBe(expected);
+    },
+  );
+
+  it.each([
+    ["local", true, true],
+    ["local", false, false],
+    ["worktree", true, false],
+    ["worktree", false, true],
+  ] as const)(
+    "passes %s through untouched (flag %s, integration %s)",
+    (preferredMode, cloudModeEnabled, hasGithubIntegration) => {
+      expect(
+        resolveWorkspaceModePreference({
+          preferredMode,
+          cloudModeEnabled,
+          hasGithubIntegration,
+          lastUsedLocalWorkspaceMode: "worktree",
+        }),
+      ).toBe(preferredMode);
+    },
+  );
+});

packages/ui/src/features/task-detail/hooks/workspaceModePreference.ts

@@ -0,0 +1,25 @@
+import type { WorkspaceMode } from "@posthog/shared";
+import type { LocalWorkspaceMode } from "../../settings/settingsStore";
+
+export interface WorkspaceModePreferenceInput {
+  preferredMode: WorkspaceMode;
+  cloudModeEnabled: boolean;
+  hasGithubIntegration: boolean;
+  lastUsedLocalWorkspaceMode: LocalWorkspaceMode;
+}
+
+// Cloud is only honoured when it works out of the box (flag on + GitHub
+// connected); otherwise the preference falls back to the last local mode so
+// users never start behind a connect-GitHub prompt.
+export function resolveWorkspaceModePreference({
+  preferredMode,
+  cloudModeEnabled,
+  hasGithubIntegration,
+  lastUsedLocalWorkspaceMode,
+}: WorkspaceModePreferenceInput): WorkspaceMode {
+  if (preferredMode !== "cloud") return preferredMode;
+  if (!cloudModeEnabled || !hasGithubIntegration) {
+    return lastUsedLocalWorkspaceMode;
+  }
+  return "cloud";
+}