From 484a6c7b88e6578dbe5dbdd74b6cc1753900a985 Mon Sep 17 00:00:00 2001
From: Richard Solomou <richard.s@posthog.com>
Date: Fri, 24 Jul 2026 19:17:22 +0300
Subject: [PATCH 1/9] refactor(shared): extract task contracts and model policy

Generated-By: PostHog Code
Task-Id: c1bbe3cf-742b-4b24-bf96-d11a18b4cf22
---
 .../agent/src/adapters/reasoning-effort.ts    |  45 +-
 packages/agent/src/gateway-models.test.ts     | 252 +-----------
 packages/agent/src/gateway-models.ts          | 274 ++-----------
 packages/agent/src/utils/gateway.ts           |  23 +-
 packages/api-client/src/posthog-client.ts     |   2 +-
 packages/shared/src/cloud-task-models.test.ts | 200 +++++++++
 packages/shared/src/cloud-task-models.ts      | 385 ++++++++++++++++++
 packages/shared/src/domain-types.test.ts      |  19 +-
 packages/shared/src/domain-types.ts           |  34 +-
 packages/shared/src/index.ts                  |  74 +++-
 packages/shared/src/reasoning-effort.test.ts  |  20 +
 packages/shared/src/reasoning-effort.ts       |  77 ++++
 packages/shared/src/sessions.ts               |   2 +-
 packages/shared/src/task-automation.test.ts   |  66 +++
 packages/shared/src/task-automation.ts        |  58 +++
 packages/shared/src/task.test.ts              |  53 +++
 packages/shared/src/task.ts                   | 103 +----
 .../src/services/agent/agent.ts               | 117 +-----
 18 files changed, 1035 insertions(+), 769 deletions(-)
 create mode 100644 packages/shared/src/cloud-task-models.test.ts
 create mode 100644 packages/shared/src/cloud-task-models.ts
 create mode 100644 packages/shared/src/reasoning-effort.test.ts
 create mode 100644 packages/shared/src/reasoning-effort.ts
 create mode 100644 packages/shared/src/task-automation.test.ts
 create mode 100644 packages/shared/src/task-automation.ts
 create mode 100644 packages/shared/src/task.test.ts

diff --git a/packages/agent/src/adapters/reasoning-effort.ts b/packages/agent/src/adapters/reasoning-effort.ts
index 590bb3be86..2cc1da50f8 100644
--- a/packages/agent/src/adapters/reasoning-effort.ts
+++ b/packages/agent/src/adapters/reasoning-effort.ts
@@ -1,39 +1,6 @@
-import type { Adapter } from "@posthog/shared";
-import { getEffortOptions as getClaudeEffortOptions } from "./claude/session/models";
-import { getReasoningEffortOptions as getCodexReasoningEffortOptions } from "./codex-app-server/models";
-
-export type SupportedReasoningEffort =
-  | "low"
-  | "medium"
-  | "high"
-  | "xhigh"
-  | "max";
-
-export interface ReasoningEffortOption {
-  value: SupportedReasoningEffort;
-  name: string;
-}
-
-export function getReasoningEffortOptions(
-  adapter: Adapter,
-  modelId: string,
-): ReasoningEffortOption[] | null {
-  const options =
-    adapter === "codex"
-      ? getCodexReasoningEffortOptions(modelId)
-      : getClaudeEffortOptions(modelId);
-
-  return options as ReasoningEffortOption[] | null;
-}
-
-export function isSupportedReasoningEffort(
-  adapter: Adapter,
-  modelId: string,
-  value: string,
-): value is SupportedReasoningEffort {
-  return (
-    getReasoningEffortOptions(adapter, modelId)?.some(
-      (option) => option.value === value,
-    ) ?? false
-  );
-}
+export {
+  getReasoningEffortOptions,
+  isSupportedReasoningEffort,
+  type ReasoningEffortOption,
+  type SupportedReasoningEffort,
+} from "@posthog/shared";
diff --git a/packages/agent/src/gateway-models.test.ts b/packages/agent/src/gateway-models.test.ts
index 5aa7438a8d..8c988ec1e9 100644
--- a/packages/agent/src/gateway-models.test.ts
+++ b/packages/agent/src/gateway-models.test.ts
@@ -1,163 +1,5 @@
 import { afterEach, describe, expect, it, vi } from "vitest";
-import {
-  compareModelsForPicker,
-  fetchGatewayModels,
-  fetchModelsList,
-  formatGatewayModelName,
-  type GatewayModel,
-  getClaudeModelRecency,
-  isAnthropicModel,
-  isBlockedModelId,
-  isCloudflareModel,
-  pickAllowedModel,
-} from "./gateway-models";
-
-const model = (id: string, owned_by = ""): GatewayModel => ({
-  id,
-  owned_by,
-  context_window: 128000,
-  supports_streaming: true,
-  supports_vision: false,
-  allowed: true,
-});
-
-describe("formatGatewayModelName", () => {
-  it("keeps Claude models in friendly title case", () => {
-    expect(
-      formatGatewayModelName({
-        id: "claude-opus-4-8",
-        owned_by: "anthropic",
-        context_window: 200000,
-        supports_streaming: true,
-        supports_vision: true,
-        allowed: true,
-      }),
-    ).toBe("Claude Opus 4.8");
-  });
-
-  it("uppercases the GPT acronym in OpenAI model ids", () => {
-    expect(
-      formatGatewayModelName({
-        id: "GPT-5.5",
-        owned_by: "openai",
-        context_window: 200000,
-        supports_streaming: true,
-        supports_vision: true,
-        allowed: true,
-      }),
-    ).toBe("GPT-5.5");
-  });
-
-  it("strips the openai/ prefix, uppercases GPT, and title-cases the suffix", () => {
-    expect(
-      formatGatewayModelName({
-        id: "openai/gpt-5.6-sol",
-        owned_by: "openai",
-        context_window: 200000,
-        supports_streaming: true,
-        supports_vision: true,
-        allowed: true,
-      }),
-    ).toBe("GPT-5.6 Sol");
-  });
-
-  it("formats Cloudflare models as the final path segment with GLM uppercased", () => {
-    expect(
-      formatGatewayModelName({
-        id: "@cf/zai-org/glm-5.2",
-        owned_by: "cloudflare",
-        context_window: 128000,
-        supports_streaming: true,
-        supports_vision: false,
-        allowed: true,
-      }),
-    ).toBe("GLM-5.2");
-  });
-
-  it("leaves non-acronym Cloudflare models lowercase", () => {
-    expect(
-      formatGatewayModelName({
-        id: "@cf/meta/llama-3.1-8b-instruct",
-        owned_by: "cloudflare",
-        context_window: 128000,
-        supports_streaming: true,
-        supports_vision: false,
-        allowed: true,
-      }),
-    ).toBe("llama-3.1-8b-instruct");
-  });
-
-  it("blocks deprecated Claude gateway models", () => {
-    expect(isBlockedModelId("claude-opus-4-5")).toBe(true);
-    expect(isBlockedModelId("claude-opus-4-6")).toBe(true);
-    expect(isBlockedModelId("claude-sonnet-4-5")).toBe(true);
-    expect(isBlockedModelId("claude-haiku-4-5")).toBe(true);
-    expect(isBlockedModelId("ANTHROPIC/CLAUDE-HAIKU-4-5")).toBe(true);
-  });
-
-  it("blocks deprecated Codex gateway models", () => {
-    expect(isBlockedModelId("gpt-5.2")).toBe(true);
-    expect(isBlockedModelId("gpt-5.3")).toBe(true);
-    expect(isBlockedModelId("gpt-5.3-codex")).toBe(true);
-    expect(isBlockedModelId("openai/gpt-5.2")).toBe(true);
-    expect(isBlockedModelId("OPENAI/GPT-5.3")).toBe(true);
-    expect(isBlockedModelId("OPENAI/GPT-5.3-CODEX")).toBe(true);
-  });
-});
-
-describe("getClaudeModelRecency", () => {
-  it.each([
-    ["claude-haiku-4-5", 4005],
-    ["claude-sonnet-4-6", 4006],
-    ["claude-opus-4-7", 4007],
-    ["claude-opus-4-8", 4008],
-    ["claude-opus-5", 5000],
-    ["claude-sonnet-5", 5000],
-    ["claude-fable-5", 5000],
-  ])("ranks %s by its embedded version (%i)", (modelId, rank) => {
-    expect(getClaudeModelRecency(modelId)).toBe(rank);
-  });
-
-  it("ignores a trailing date suffix when reading the version", () => {
-    expect(getClaudeModelRecency("claude-haiku-4-5-20251001")).toBe(4005);
-  });
-
-  it("ranks a model with no recognisable version as newest", () => {
-    expect(getClaudeModelRecency("claude-mystery")).toBe(
-      Number.MAX_SAFE_INTEGER,
-    );
-    expect(getClaudeModelRecency("claude-mystery")).toBeGreaterThan(
-      getClaudeModelRecency("claude-fable-5"),
-    );
-  });
-});
-
-describe("compareModelsForPicker", () => {
-  it("groups models by family least capable first, newest version first", () => {
-    // The picker opens upward, so least-capable-first DOM order puts the most
-    // capable family (Fable) nearest the trigger — the visual top of the menu.
-    // Models as the gateway might return them — arbitrary order.
-    const gatewayOrder = [
-      "claude-fable-5",
-      "claude-opus-4-7",
-      "claude-mystery",
-      "claude-sonnet-5",
-      "claude-haiku-4-5",
-      "claude-sonnet-4-6",
-      "claude-opus-4-8",
-    ];
-    const displayed = [...gatewayOrder].sort(compareModelsForPicker);
-    expect(displayed).toEqual([
-      "claude-haiku-4-5",
-      "claude-sonnet-5",
-      "claude-sonnet-4-6",
-      "claude-opus-4-8",
-      "claude-opus-4-7",
-      "claude-fable-5",
-      "claude-mystery",
-    ]);
-  });
-});
+import { fetchGatewayModels, fetchModelsList } from "./gateway-models";
 
 describe("gateway model fetch timeout", () => {
   afterEach(() => {
@@ -242,96 +84,4 @@ describe("gateway models cache", () => {
     expect(fetchMock).toHaveBeenCalledTimes(1);
     expect(cached[0]?.allowed).toBe(false);
   });
-
-  it("corrects stale GLM 5.2 context-window metadata", async () => {
-    vi.spyOn(globalThis, "fetch").mockResolvedValue(
-      new Response(
-        JSON.stringify({
-          object: "list",
-          data: [
-            {
-              id: "@cf/zai-org/glm-5.2",
-              owned_by: "cloudflare",
-              context_window: 128_000,
-              supports_streaming: true,
-              supports_vision: false,
-            },
-          ],
-        }),
-        { status: 200, headers: { "Content-Type": "application/json" } },
-      ),
-    );
-
-    const models = await fetchGatewayModels({
-      gatewayUrl: "https://gateway.glm-context-test",
-    });
-
-    expect(models[0]?.context_window).toBe(1_000_000);
-  });
-});
-
-describe("isCloudflareModel", () => {
-  it.each([
-    { id: "@cf/zai-org/glm-5.2", owned_by: "cloudflare", expected: true },
-    { id: "claude-opus-4-8", owned_by: "anthropic", expected: false },
-    { id: "@cf/zai-org/glm-5.2", owned_by: "", expected: true },
-    { id: "gpt-5.5", owned_by: "", expected: false },
-    // A Cloudflare-served model can report an upstream owner; the `@cf/` prefix still wins.
-    { id: "@cf/openai/gpt-oss", owned_by: "openai", expected: true },
-  ])(
-    "isCloudflareModel($id, owned_by=$owned_by) → $expected",
-    ({ id, owned_by, expected }) => {
-      expect(isCloudflareModel(model(id, owned_by))).toBe(expected);
-    },
-  );
-
-  it("does not classify Cloudflare models as Anthropic", () => {
-    // The Claude adapter accepts both, but they must stay distinguishable.
-    const glm = model("@cf/zai-org/glm-5.2", "cloudflare");
-    expect(isCloudflareModel(glm)).toBe(true);
-    expect(isAnthropicModel(glm)).toBe(false);
-  });
-});
-
-describe("pickAllowedModel", () => {
-  const entry = (id: string, allowed: boolean) => ({ id, allowed });
-
-  it.each([
-    [
-      "keeps an allowed preferred model",
-      [entry("claude-opus-4-8", true)],
-      "claude-opus-4-8",
-      "claude-opus-4-8",
-    ],
-    [
-      "keeps a preferred model absent from the list",
-      [entry("claude-opus-4-8", true)],
-      "claude-sonnet-5",
-      "claude-sonnet-5",
-    ],
-    [
-      "moves a restricted preferred model to the newest allowed one",
-      [
-        entry("claude-opus-4-8", false),
-        entry("claude-sonnet-4-6", true),
-        entry("@cf/zai-org/glm-5.2", true),
-      ],
-      "claude-opus-4-8",
-      "@cf/zai-org/glm-5.2",
-    ],
-    [
-      "keeps the preferred model when everything is restricted",
-      [entry("claude-opus-4-8", false)],
-      "claude-opus-4-8",
-      "claude-opus-4-8",
-    ],
-    [
-      "keeps the preferred model when the list is empty",
-      [],
-      "claude-opus-4-8",
-      "claude-opus-4-8",
-    ],
-  ] as const)("%s", (_name, models, preferred, expected) => {
-    expect(pickAllowedModel(models, preferred)).toBe(expected);
-  });
 });
diff --git a/packages/agent/src/gateway-models.ts b/packages/agent/src/gateway-models.ts
index 116d9bd7d1..35ae10df5a 100644
--- a/packages/agent/src/gateway-models.ts
+++ b/packages/agent/src/gateway-models.ts
@@ -1,20 +1,28 @@
-export interface GatewayModel {
-  id: string;
-  owned_by: string;
-  context_window: number;
-  supports_streaming: boolean;
-  supports_vision: boolean;
-  // Free-tier model gate: authenticated fetches mark models outside the
-  // caller's plan `allowed: false`. Anonymous fetches and older gateways
-  // don't mark, so absence means allowed.
-  allowed: boolean;
-  restriction_reason?: string | null;
-}
-
-interface GatewayModelsResponse {
-  object: "list";
-  data: Array<Omit<GatewayModel, "allowed"> & { allowed?: boolean }>;
-}
+import {
+  type GatewayModel,
+  normalizeGatewayModelsResponse,
+} from "@posthog/shared";
+
+export {
+  BLOCKED_GATEWAY_MODEL_IDS,
+  buildCloudTaskConfigOptions,
+  type CloudTaskConfigOption,
+  type CloudTaskConfigSelectOption,
+  compareModelsForPicker,
+  DEFAULT_CODEX_MODEL,
+  DEFAULT_GATEWAY_MODEL,
+  formatGatewayModelName,
+  formatModelId,
+  type GatewayModel,
+  getClaudeModelRecency,
+  getProviderName,
+  isAnthropicModel,
+  isBlockedModelId,
+  isCloudflareModel,
+  isCloudflareModelId,
+  isOpenAIModel,
+  pickAllowedModel,
+} from "@posthog/shared";
 
 export interface FetchGatewayModelsOptions {
   gatewayUrl: string;
@@ -22,47 +30,6 @@ export interface FetchGatewayModelsOptions {
   authToken?: string;
 }
 
-export const DEFAULT_GATEWAY_MODEL = "claude-opus-4-8";
-
-export const DEFAULT_CODEX_MODEL = "gpt-5.5";
-
-const BLOCKED_MODELS = new Set([
-  "gpt-5-mini",
-  "openai/gpt-5-mini",
-  "gpt-5.2",
-  "openai/gpt-5.2",
-  "gpt-5.3",
-  "openai/gpt-5.3",
-  "gpt-5.3-codex",
-  "openai/gpt-5.3-codex",
-  "claude-opus-4-5",
-  "anthropic/claude-opus-4-5",
-  "claude-opus-4-6",
-  "anthropic/claude-opus-4-6",
-  "claude-sonnet-4-5",
-  "anthropic/claude-sonnet-4-5",
-  "claude-haiku-4-5",
-  "anthropic/claude-haiku-4-5",
-]);
-
-export function isBlockedModelId(modelId: string): boolean {
-  return BLOCKED_MODELS.has(modelId.toLowerCase());
-}
-
-interface ModelsListEntry {
-  id?: string;
-  owned_by?: string;
-  allowed?: boolean;
-  restriction_reason?: string | null;
-}
-
-type ModelsListResponse =
-  | {
-      data?: ModelsListEntry[];
-      models?: ModelsListEntry[];
-    }
-  | ModelsListEntry[];
-
 const CACHE_TTL = 10 * 60 * 1000; // 10 minutes
 
 // Bound the gateway /v1/models request so a stalled connection cannot hold up
@@ -71,10 +38,6 @@ const CACHE_TTL = 10 * 60 * 1000; // 10 minutes
 // the callers fall through to `return []`.
 const GATEWAY_FETCH_TIMEOUT_MS = 10_000;
 
-const MODEL_CONTEXT_WINDOW_OVERRIDES: Readonly<Record<string, number>> = {
-  "@cf/zai-org/glm-5.2": 1_000_000,
-};
-
 // Restriction marks are identity-scoped (free-tier marks are authed-only and
 // differ per org), so cache entries are keyed on the exact token — an org
 // switch in the same process must never be served the old org's marks. A
@@ -125,17 +88,7 @@ export async function fetchGatewayModels(
       return [];
     }
 
-    const data = (await response.json()) as GatewayModelsResponse;
-    const models = (data.data ?? [])
-      .filter((m) => !isBlockedModelId(m.id))
-      .map((m) => ({
-        ...m,
-        context_window: Math.max(
-          m.context_window,
-          MODEL_CONTEXT_WINDOW_OVERRIDES[m.id] ?? 0,
-        ),
-        allowed: m.allowed !== false,
-      }));
+    const models = normalizeGatewayModelsResponse(await response.json());
     gatewayModelsCache = {
       models,
       expiry: Date.now() + CACHE_TTL,
@@ -148,36 +101,6 @@ export async function fetchGatewayModels(
   }
 }
 
-export function isAnthropicModel(model: GatewayModel): boolean {
-  if (model.owned_by) {
-    return model.owned_by === "anthropic";
-  }
-  return model.id.startsWith("claude-") || model.id.startsWith("anthropic/");
-}
-
-export function isOpenAIModel(model: GatewayModel): boolean {
-  if (model.owned_by) {
-    return model.owned_by === "openai";
-  }
-  return model.id.startsWith("gpt-") || model.id.startsWith("openai/");
-}
-
-// Cloudflare Workers AI model ids carry the `@cf/` path prefix (e.g. `@cf/zai-org/glm-5.2`). Kept as
-// a standalone id-only check so callers that only have a model id (not a full GatewayModel) — like the
-// Claude adapter's desync guard — share one source of truth with `isCloudflareModel`.
-export function isCloudflareModelId(modelId: string): boolean {
-  return modelId.startsWith("@cf/");
-}
-
-// Cloudflare Workers AI models (e.g. `@cf/zai-org/glm-5.2`). The gateway serves these over both its
-// OpenAI and Anthropic-Messages surfaces (it translates the `@cf/` path), so the Claude adapter can
-// drive them just like an Anthropic model. The `@cf/` path prefix is the structural, always-present
-// signal, so honour it regardless of `owned_by` — a Cloudflare-served model can report an upstream
-// owner (e.g. `@cf/openai/...` with `owned_by: "openai"`) and must still classify as Cloudflare.
-export function isCloudflareModel(model: GatewayModel): boolean {
-  return isCloudflareModelId(model.id) || model.owned_by === "cloudflare";
-}
-
 export interface ModelInfo {
   id: string;
   owned_by?: string;
@@ -208,22 +131,14 @@ export async function fetchModelsList(
     if (!response.ok) {
       return [];
     }
-    const data = (await response.json()) as ModelsListResponse;
-    const models = Array.isArray(data)
-      ? data
-      : (data.data ?? data.models ?? []);
-    const results: ModelInfo[] = [];
-    for (const model of models) {
-      const id = model?.id ? String(model.id) : "";
-      if (!id) continue;
-      if (isBlockedModelId(id)) continue;
-      results.push({
-        id,
-        owned_by: model?.owned_by,
-        allowed: model?.allowed !== false,
-        restriction_reason: model?.restriction_reason ?? null,
-      });
-    }
+    const results = normalizeGatewayModelsResponse(await response.json()).map(
+      (model) => ({
+        id: model.id,
+        owned_by: model.owned_by || undefined,
+        allowed: model.allowed,
+        restriction_reason: model.restriction_reason,
+      }),
+    );
     modelsListCache = {
       models: results,
       expiry: Date.now() + CACHE_TTL,
@@ -235,124 +150,3 @@ export async function fetchModelsList(
     return [];
   }
 }
-
-/**
- * The model a session should start on: the preferred id when present and
- * allowed, else the newest allowed model — a free-tier org must not default
- * onto a model that 403s its first message. Falls back to the preferred id
- * when the list is empty (fetch failed) or nothing is allowed (all locked —
- * the picker gate communicates that state better than a silent swap).
- */
-export function pickAllowedModel(
-  models: ReadonlyArray<Pick<GatewayModel, "id" | "allowed">>,
-  preferred: string,
-): string {
-  if (models.length === 0) return preferred;
-  const preferredEntry = models.find((m) => m.id === preferred);
-  if (!preferredEntry || preferredEntry.allowed) return preferred;
-  const allowed = models.filter((m) => m.allowed);
-  if (allowed.length === 0) return preferred;
-  return allowed.reduce((best, candidate) =>
-    getClaudeModelRecency(candidate.id) >= getClaudeModelRecency(best.id)
-      ? candidate
-      : best,
-  ).id;
-}
-
-const PROVIDER_NAMES: Record<string, string> = {
-  anthropic: "Anthropic",
-  openai: "OpenAI",
-  "google-vertex": "Gemini",
-};
-
-export function getProviderName(ownedBy: string): string {
-  return PROVIDER_NAMES[ownedBy] ?? ownedBy;
-}
-
-// Version embedded in the model id, e.g. "claude-opus-4-8" -> 4008. Ids with no
-// recognisable version rank newest. A trailing date suffix is ignored.
-export function getClaudeModelRecency(modelId: string): number {
-  const match = modelId.toLowerCase().match(/-(\d+)(?:[-.](\d+))?/);
-  if (!match) return Number.MAX_SAFE_INTEGER;
-  const major = Number(match[1]);
-  const minor = match[2] ? Number(match[2]) : 0;
-  return major * 1000 + minor;
-}
-
-// Families ordered least-capable first. The picker opens upward (side="top")
-// from the composer, so items later in this list render nearer the trigger and
-// read as the top of the menu — this puts the most-capable family (Fable) on
-// top. Unknown families sort after all known ones.
-const MODEL_FAMILY_ORDER = ["haiku", "sonnet", "opus", "fable"];
-
-function getModelFamilyRank(modelId: string): number {
-  const id = modelId.toLowerCase();
-  const index = MODEL_FAMILY_ORDER.findIndex((family) => id.includes(family));
-  return index === -1 ? MODEL_FAMILY_ORDER.length : index;
-}
-
-// Group by family, then newest version first within each family.
-export function compareModelsForPicker(a: string, b: string): number {
-  const familyDiff = getModelFamilyRank(a) - getModelFamilyRank(b);
-  if (familyDiff !== 0) return familyDiff;
-  return getClaudeModelRecency(b) - getClaudeModelRecency(a);
-}
-
-const PROVIDER_PREFIXES = ["anthropic/", "openai/", "google-vertex/"];
-
-const KNOWN_ACRONYMS = new Set(["gpt", "glm"]);
-
-// For a known acronym, uppercase it, keep the version attached, and title-case
-// any suffix: "gpt-5.6-sol" -> "GPT-5.6 Sol", "glm-5.2" -> "GLM-5.2". Other ids
-// stay lowercase to avoid mangling ordinary names (e.g. "llama-3.1-8b").
-function formatProviderModelName(modelId: string): string {
-  const [acronym, version, ...suffix] = modelId.split("-");
-  if (!KNOWN_ACRONYMS.has(acronym.toLowerCase())) return modelId.toLowerCase();
-  const head = version
-    ? `${acronym.toUpperCase()}-${version}`
-    : acronym.toUpperCase();
-  const tail = suffix.map(
-    (word) => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase(),
-  );
-  return [head, ...tail].join(" ");
-}
-
-export function formatGatewayModelName(model: GatewayModel): string {
-  if (isCloudflareModel(model)) {
-    return formatProviderModelName(model.id.split("/").pop() ?? model.id);
-  }
-
-  if (isOpenAIModel(model)) {
-    return formatProviderModelName(stripProviderPrefix(model.id));
-  }
-
-  return formatModelId(model.id);
-}
-
-function stripProviderPrefix(modelId: string): string {
-  for (const prefix of PROVIDER_PREFIXES) {
-    if (modelId.startsWith(prefix)) {
-      return modelId.slice(prefix.length);
-    }
-  }
-  return modelId;
-}
-
-export function formatModelId(modelId: string): string {
-  let cleanId = modelId;
-  for (const prefix of PROVIDER_PREFIXES) {
-    if (cleanId.startsWith(prefix)) {
-      cleanId = cleanId.slice(prefix.length);
-      break;
-    }
-  }
-
-  cleanId = cleanId.replace(/(\d)-(\d)/g, "$1.$2");
-
-  const words = cleanId.split(/[-_]/).map((word) => {
-    if (word.match(/^[0-9.]+$/)) return word;
-    return word.charAt(0).toUpperCase() + word.slice(1).toLowerCase();
-  });
-
-  return words.join(" ");
-}
diff --git a/packages/agent/src/utils/gateway.ts b/packages/agent/src/utils/gateway.ts
index b258086070..5e97841742 100644
--- a/packages/agent/src/utils/gateway.ts
+++ b/packages/agent/src/utils/gateway.ts
@@ -1,3 +1,5 @@
+import { getCloudTaskGatewayUrl } from "@posthog/shared";
+
 export type GatewayProduct =
   | "posthog_code"
   | "background_agents"
@@ -37,26 +39,7 @@ export {
 } from "@posthog/shared/posthog-property-headers";
 
 function getGatewayBaseUrl(posthogHost: string): string {
-  const url = new URL(posthogHost);
-  const hostname = url.hostname;
-
-  if (hostname === "localhost" || hostname === "127.0.0.1") {
-    return `${url.protocol}//localhost:3308`;
-  }
-
-  if (hostname === "host.docker.internal") {
-    return `${url.protocol}//host.docker.internal:3308`;
-  }
-
-  // The hosted dev environment runs its own LLM gateway with its own auth DB,
-  // so a dev-minted `pha_` token can't be routed to the US gateway — that's
-  // a different DB and returns 401 Authentication required.
-  if (hostname === "app.dev.posthog.dev") {
-    return "https://gateway.dev.posthog.dev";
-  }
-
-  const region = hostname.match(/^(us|eu)\.posthog\.com$/)?.[1] ?? "us";
-  return `https://gateway.${region}.posthog.com`;
+  return getCloudTaskGatewayUrl(posthogHost).replace(/\/posthog_code$/, "");
 }
 
 export function getLlmGatewayUrl(
diff --git a/packages/api-client/src/posthog-client.ts b/packages/api-client/src/posthog-client.ts
index 00bbbc7700..906e77f290 100644
--- a/packages/api-client/src/posthog-client.ts
+++ b/packages/api-client/src/posthog-client.ts
@@ -1,5 +1,4 @@
 import "./generated.augment";
-import { isSupportedReasoningEffort } from "@posthog/agent/adapters/reasoning-effort";
 import type {
   Adapter,
   CloudMcpServerImport,
@@ -15,6 +14,7 @@ import type {
 import {
   DISMISSAL_REASON_OPTIONS,
   type DismissalReasonOptionValue,
+  isSupportedReasoningEffort,
   resolveCloudInitialPermissionMode,
 } from "@posthog/shared";
 import type {
diff --git a/packages/shared/src/cloud-task-models.test.ts b/packages/shared/src/cloud-task-models.test.ts
new file mode 100644
index 0000000000..31418a7775
--- /dev/null
+++ b/packages/shared/src/cloud-task-models.test.ts
@@ -0,0 +1,200 @@
+import { describe, expect, it } from "vitest";
+import {
+  buildCloudTaskConfigOptions,
+  compareModelsForPicker,
+  formatGatewayModelName,
+  type GatewayModel,
+  getClaudeModelRecency,
+  isAnthropicModel,
+  isBlockedModelId,
+  isCloudflareModel,
+  normalizeGatewayModelsResponse,
+  pickAllowedModel,
+} from "./cloud-task-models";
+
+const model = (
+  id: string,
+  owned_by = "anthropic",
+  allowed = true,
+): GatewayModel => ({
+  id,
+  owned_by,
+  context_window: 128000,
+  supports_streaming: true,
+  supports_vision: false,
+  allowed,
+});
+
+describe("formatGatewayModelName", () => {
+  it.each([
+    [model("claude-opus-4-8"), "Claude Opus 4.8"],
+    [model("GPT-5.5", "openai"), "GPT-5.5"],
+    [model("openai/gpt-5.6-sol", "openai"), "GPT-5.6 Sol"],
+    [model("@cf/zai-org/glm-5.2", "cloudflare"), "GLM-5.2"],
+    [
+      model("@cf/meta/llama-3.1-8b-instruct", "cloudflare"),
+      "llama-3.1-8b-instruct",
+    ],
+  ])("formats $id", (gatewayModel, expected) => {
+    expect(formatGatewayModelName(gatewayModel)).toBe(expected);
+  });
+});
+
+describe("normalizeGatewayModelsResponse", () => {
+  it("corrects stale GLM 5.2 context-window metadata", () => {
+    const models = normalizeGatewayModelsResponse([
+      model("@cf/zai-org/glm-5.2", "cloudflare"),
+    ]);
+
+    expect(models[0]?.context_window).toBe(1_000_000);
+  });
+});
+
+describe("isBlockedModelId", () => {
+  it.each([
+    "claude-opus-4-5",
+    "claude-opus-4-6",
+    "claude-sonnet-4-5",
+    "ANTHROPIC/CLAUDE-HAIKU-4-5",
+    "gpt-5.2",
+    "gpt-5.3",
+    "gpt-5.3-codex",
+    "OPENAI/GPT-5.3-CODEX",
+  ])("blocks %s", (modelId) => {
+    expect(isBlockedModelId(modelId)).toBe(true);
+  });
+});
+
+describe("getClaudeModelRecency", () => {
+  it.each([
+    ["claude-haiku-4-5", 4005],
+    ["claude-sonnet-4-6", 4006],
+    ["claude-opus-4-7", 4007],
+    ["claude-opus-4-8", 4008],
+    ["claude-sonnet-5", 5000],
+  ])("ranks %s", (modelId, expected) => {
+    expect(getClaudeModelRecency(modelId)).toBe(expected);
+  });
+
+  it("ignores trailing dates and ranks unknown versions newest", () => {
+    expect(getClaudeModelRecency("claude-haiku-4-5-20251001")).toBe(4005);
+    expect(getClaudeModelRecency("claude-mystery")).toBe(
+      Number.MAX_SAFE_INTEGER,
+    );
+  });
+});
+
+describe("compareModelsForPicker", () => {
+  it("groups by capability and sorts newest first", () => {
+    const displayed = [
+      "claude-fable-5",
+      "claude-opus-4-7",
+      "claude-mystery",
+      "claude-sonnet-5",
+      "claude-haiku-4-5",
+      "claude-sonnet-4-6",
+      "claude-opus-4-8",
+    ].sort(compareModelsForPicker);
+
+    expect(displayed).toEqual([
+      "claude-fable-5",
+      "claude-opus-4-8",
+      "claude-opus-4-7",
+      "claude-sonnet-5",
+      "claude-sonnet-4-6",
+      "claude-haiku-4-5",
+      "claude-mystery",
+    ]);
+  });
+});
+
+describe("model classification", () => {
+  it("keeps Cloudflare models distinct from Anthropic", () => {
+    const gatewayModel = model("@cf/openai/gpt-oss", "openai");
+    expect(isCloudflareModel(gatewayModel)).toBe(true);
+    expect(isAnthropicModel(gatewayModel)).toBe(false);
+  });
+});
+
+describe("pickAllowedModel", () => {
+  const entry = (id: string, allowed: boolean) => ({ id, allowed });
+
+  it.each([
+    [[entry("claude-opus-4-8", true)], "claude-opus-4-8", "claude-opus-4-8"],
+    [[entry("claude-opus-4-8", true)], "claude-sonnet-5", "claude-sonnet-5"],
+    [
+      [
+        entry("claude-opus-4-8", false),
+        entry("claude-sonnet-4-6", true),
+        entry("@cf/zai-org/glm-5.2", true),
+      ],
+      "claude-opus-4-8",
+      "@cf/zai-org/glm-5.2",
+    ],
+    [[entry("claude-opus-4-8", false)], "claude-opus-4-8", "claude-opus-4-8"],
+    [[], "claude-opus-4-8", "claude-opus-4-8"],
+  ] as const)("selects an allowed default", (models, preferred, expected) => {
+    expect(pickAllowedModel(models, preferred)).toBe(expected);
+  });
+});
+
+describe("buildCloudTaskConfigOptions", () => {
+  it("builds Claude options with restrictions and reasoning policy", () => {
+    const options = buildCloudTaskConfigOptions(
+      [
+        model("gpt-5.5", "openai"),
+        model("claude-opus-4-7", "anthropic"),
+        model("claude-opus-4-8", "anthropic", false),
+        model("@cf/zai-org/glm-5.2", "cloudflare"),
+      ],
+      "claude",
+    );
+
+    expect(options).toMatchObject([
+      { id: "mode", currentValue: "plan" },
+      {
+        id: "model",
+        currentValue: "@cf/zai-org/glm-5.2",
+        options: [
+          { value: "claude-opus-4-7" },
+          {
+            value: "claude-opus-4-8",
+            _meta: { "posthog.code/restrictedModel": true },
+          },
+          { value: "@cf/zai-org/glm-5.2" },
+        ],
+      },
+    ]);
+    expect(options.map((option) => option.id)).toEqual(["mode", "model"]);
+  });
+
+  it("builds Codex options with the shared default and reasoning levels", () => {
+    const options = buildCloudTaskConfigOptions(
+      [
+        model("claude-opus-4-8"),
+        model("gpt-5.6", "openai"),
+        model("gpt-5.5", "openai"),
+      ],
+      "codex",
+    );
+
+    expect(options).toMatchObject([
+      { id: "mode", currentValue: "auto" },
+      {
+        id: "model",
+        currentValue: "gpt-5.5",
+        options: [{ value: "gpt-5.6" }, { value: "gpt-5.5" }],
+      },
+      {
+        id: "reasoning_effort",
+        currentValue: "high",
+        options: [
+          { value: "low" },
+          { value: "medium" },
+          { value: "high" },
+          { value: "xhigh" },
+        ],
+      },
+    ]);
+  });
+});
diff --git a/packages/shared/src/cloud-task-models.ts b/packages/shared/src/cloud-task-models.ts
new file mode 100644
index 0000000000..a0fc5f4477
--- /dev/null
+++ b/packages/shared/src/cloud-task-models.ts
@@ -0,0 +1,385 @@
+import type { Adapter } from "./adapter";
+import { CODEX_MODE_PRESETS } from "./execution-modes";
+import { restrictedModelMeta } from "./models";
+import { getReasoningEffortOptions } from "./reasoning-effort";
+
+export interface GatewayModel {
+  id: string;
+  owned_by: string;
+  context_window: number;
+  supports_streaming: boolean;
+  supports_vision: boolean;
+  allowed: boolean;
+  restriction_reason?: string | null;
+}
+
+interface GatewayModelsResponse {
+  data?: unknown[];
+  models?: unknown[];
+}
+
+export interface CloudTaskConfigSelectOption {
+  value: string;
+  name: string;
+  description?: string;
+  _meta?: Record<string, unknown>;
+}
+
+export interface CloudTaskConfigOption {
+  id: string;
+  name: string;
+  type: "select";
+  currentValue: string;
+  options: CloudTaskConfigSelectOption[];
+  category: "mode" | "model" | "thought_level";
+  description: string;
+}
+
+export interface CloudTaskModePreset {
+  id: string;
+  name: string;
+  description: string;
+}
+
+export const DEFAULT_GATEWAY_MODEL = "claude-opus-4-8";
+
+export const DEFAULT_CODEX_MODEL = "gpt-5.5";
+
+export const BLOCKED_GATEWAY_MODEL_IDS = [
+  "gpt-5-mini",
+  "openai/gpt-5-mini",
+  "gpt-5.2",
+  "openai/gpt-5.2",
+  "gpt-5.3",
+  "openai/gpt-5.3",
+  "gpt-5.3-codex",
+  "openai/gpt-5.3-codex",
+  "claude-opus-4-5",
+  "anthropic/claude-opus-4-5",
+  "claude-opus-4-6",
+  "anthropic/claude-opus-4-6",
+  "claude-sonnet-4-5",
+  "anthropic/claude-sonnet-4-5",
+  "claude-haiku-4-5",
+  "anthropic/claude-haiku-4-5",
+] as const;
+
+const BLOCKED_GATEWAY_MODELS = new Set<string>(BLOCKED_GATEWAY_MODEL_IDS);
+
+const CLAUDE_MODE_PRESETS: readonly CloudTaskModePreset[] = [
+  {
+    id: "default",
+    name: "Default",
+    description: "Standard behavior, prompts for dangerous operations",
+  },
+  {
+    id: "acceptEdits",
+    name: "Accept Edits",
+    description: "Auto-accept file edit operations",
+  },
+  {
+    id: "plan",
+    name: "Plan Mode",
+    description: "Planning mode, no actual tool execution",
+  },
+  {
+    id: "bypassPermissions",
+    name: "Bypass Permissions",
+    description: "Auto-accept all permission requests",
+  },
+  {
+    id: "auto",
+    name: "Auto Mode",
+    description: "Auto-approve file edits and shell commands",
+  },
+];
+
+const PROVIDER_NAMES: Record<string, string> = {
+  anthropic: "Anthropic",
+  openai: "OpenAI",
+  "google-vertex": "Gemini",
+};
+
+const MODEL_FAMILY_ORDER = ["fable", "opus", "sonnet", "haiku"];
+const PROVIDER_PREFIXES = ["anthropic/", "openai/", "google-vertex/"];
+const KNOWN_ACRONYMS = new Set(["gpt", "glm"]);
+const MODEL_CONTEXT_WINDOW_OVERRIDES: Readonly<Record<string, number>> = {
+  "@cf/zai-org/glm-5.2": 1_000_000,
+};
+
+export function getCloudTaskGatewayUrl(posthogHost: string): string {
+  const url = new URL(posthogHost);
+  let gatewayBaseUrl: string;
+
+  if (url.hostname === "localhost" || url.hostname === "127.0.0.1") {
+    gatewayBaseUrl = `${url.protocol}//localhost:3308`;
+  } else if (url.hostname === "host.docker.internal") {
+    gatewayBaseUrl = `${url.protocol}//host.docker.internal:3308`;
+  } else if (url.hostname === "app.dev.posthog.dev") {
+    gatewayBaseUrl = "https://gateway.dev.posthog.dev";
+  } else {
+    const region = url.hostname.match(/^(us|eu)\.posthog\.com$/)?.[1] ?? "us";
+    gatewayBaseUrl = `https://gateway.${region}.posthog.com`;
+  }
+
+  return `${gatewayBaseUrl}/posthog_code`;
+}
+
+function isGatewayModel(value: unknown): value is Partial<GatewayModel> & {
+  id: string;
+} {
+  return (
+    typeof value === "object" &&
+    value !== null &&
+    typeof (value as { id?: unknown }).id === "string"
+  );
+}
+
+export function normalizeGatewayModelsResponse(value: unknown): GatewayModel[] {
+  const response = value as GatewayModelsResponse;
+  const entries = Array.isArray(value)
+    ? value
+    : Array.isArray(response?.data)
+      ? response.data
+      : Array.isArray(response?.models)
+        ? response.models
+        : [];
+
+  return entries
+    .filter(isGatewayModel)
+    .filter((model) => !isBlockedModelId(model.id))
+    .map((model) => ({
+      id: model.id,
+      owned_by: model.owned_by ?? "",
+      context_window: Math.max(
+        model.context_window ?? 0,
+        MODEL_CONTEXT_WINDOW_OVERRIDES[model.id] ?? 0,
+      ),
+      supports_streaming: model.supports_streaming ?? false,
+      supports_vision: model.supports_vision ?? false,
+      allowed: model.allowed !== false,
+      restriction_reason: model.restriction_reason ?? null,
+    }));
+}
+
+export function isBlockedModelId(modelId: string): boolean {
+  return BLOCKED_GATEWAY_MODELS.has(modelId.toLowerCase());
+}
+
+export function isAnthropicModel(model: GatewayModel): boolean {
+  if (model.owned_by) {
+    return model.owned_by === "anthropic";
+  }
+  return model.id.startsWith("claude-") || model.id.startsWith("anthropic/");
+}
+
+export function isOpenAIModel(model: GatewayModel): boolean {
+  if (model.owned_by) {
+    return model.owned_by === "openai";
+  }
+  return model.id.startsWith("gpt-") || model.id.startsWith("openai/");
+}
+
+export function isCloudflareModelId(modelId: string): boolean {
+  return modelId.startsWith("@cf/");
+}
+
+export function isGlmModelId(modelId: string): boolean {
+  return modelId.toLowerCase().includes("glm");
+}
+
+export function isCloudflareModel(model: GatewayModel): boolean {
+  return isCloudflareModelId(model.id) || model.owned_by === "cloudflare";
+}
+
+export function pickAllowedModel(
+  models: ReadonlyArray<Pick<GatewayModel, "id" | "allowed">>,
+  preferred: string,
+): string {
+  if (models.length === 0) return preferred;
+  const preferredEntry = models.find((model) => model.id === preferred);
+  if (!preferredEntry || preferredEntry.allowed) return preferred;
+  const allowed = models.filter((model) => model.allowed);
+  if (allowed.length === 0) return preferred;
+  return allowed.reduce((best, candidate) =>
+    getClaudeModelRecency(candidate.id) >= getClaudeModelRecency(best.id)
+      ? candidate
+      : best,
+  ).id;
+}
+
+export function getProviderName(ownedBy: string): string {
+  return PROVIDER_NAMES[ownedBy] ?? ownedBy;
+}
+
+export function getClaudeModelRecency(modelId: string): number {
+  const match = modelId.toLowerCase().match(/-(\d+)(?:[-.](\d+))?/);
+  if (!match) return Number.MAX_SAFE_INTEGER;
+  const major = Number(match[1]);
+  const minor = match[2] ? Number(match[2]) : 0;
+  return major * 1000 + minor;
+}
+
+function getModelFamilyRank(modelId: string): number {
+  const normalizedModelId = modelId.toLowerCase();
+  const index = MODEL_FAMILY_ORDER.findIndex((family) =>
+    normalizedModelId.includes(family),
+  );
+  return index === -1 ? MODEL_FAMILY_ORDER.length : index;
+}
+
+export function compareModelsForPicker(a: string, b: string): number {
+  const familyDiff = getModelFamilyRank(a) - getModelFamilyRank(b);
+  if (familyDiff !== 0) return familyDiff;
+  return getClaudeModelRecency(b) - getClaudeModelRecency(a);
+}
+
+function stripProviderPrefix(modelId: string): string {
+  for (const prefix of PROVIDER_PREFIXES) {
+    if (modelId.startsWith(prefix)) {
+      return modelId.slice(prefix.length);
+    }
+  }
+  return modelId;
+}
+
+function formatProviderModelName(modelId: string): string {
+  const [acronym, version, ...suffix] = modelId.split("-");
+  if (!KNOWN_ACRONYMS.has(acronym.toLowerCase())) return modelId.toLowerCase();
+  const head = version
+    ? `${acronym.toUpperCase()}-${version}`
+    : acronym.toUpperCase();
+  const tail = suffix.map(
+    (word) => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase(),
+  );
+  return [head, ...tail].join(" ");
+}
+
+export function formatGatewayModelName(model: GatewayModel): string {
+  if (isCloudflareModel(model)) {
+    return formatProviderModelName(model.id.split("/").pop() ?? model.id);
+  }
+  if (isOpenAIModel(model)) {
+    return formatProviderModelName(stripProviderPrefix(model.id));
+  }
+  return formatModelId(model.id);
+}
+
+export function formatModelId(modelId: string): string {
+  const cleanId = stripProviderPrefix(modelId).replace(/(\d)-(\d)/g, "$1.$2");
+  return cleanId
+    .split(/[-_]/)
+    .map((word) => {
+      if (/^[0-9.]+$/.test(word)) return word;
+      return word.charAt(0).toUpperCase() + word.slice(1).toLowerCase();
+    })
+    .join(" ");
+}
+
+function getAdapterModels(
+  models: readonly GatewayModel[],
+  adapter: Adapter,
+): GatewayModel[] {
+  return models.filter((model) =>
+    adapter === "codex"
+      ? isOpenAIModel(model)
+      : isAnthropicModel(model) || isCloudflareModel(model),
+  );
+}
+
+function getModeOptions(
+  adapter: Adapter,
+  modePresets?: readonly CloudTaskModePreset[],
+): CloudTaskConfigSelectOption[] {
+  const modes =
+    modePresets ??
+    (adapter === "codex" ? CODEX_MODE_PRESETS : CLAUDE_MODE_PRESETS);
+  return modes.map((mode) => ({
+    value: mode.id,
+    name: mode.name,
+    description: mode.description,
+  }));
+}
+
+export function buildCloudTaskConfigOptions(
+  models: readonly GatewayModel[],
+  adapter: Adapter,
+  modePresets?: readonly CloudTaskModePreset[],
+): CloudTaskConfigOption[] {
+  const adapterModels = getAdapterModels(models, adapter);
+  const modelOptions: CloudTaskConfigSelectOption[] = adapterModels.map(
+    (model) => ({
+      value: model.id,
+      name: formatGatewayModelName(model),
+      description: `Context: ${model.context_window.toLocaleString()} tokens`,
+      ...(model.allowed ? {} : { _meta: restrictedModelMeta() }),
+    }),
+  );
+
+  if (adapter === "claude") {
+    modelOptions.sort(
+      (a, b) => getClaudeModelRecency(a.value) - getClaudeModelRecency(b.value),
+    );
+  }
+
+  const defaultModel =
+    adapter === "codex"
+      ? (modelOptions.find((option) => option.value === DEFAULT_CODEX_MODEL)
+          ?.value ??
+        modelOptions[0]?.value ??
+        "")
+      : DEFAULT_GATEWAY_MODEL;
+  const preferredModelId = modelOptions.some(
+    (option) => option.value === defaultModel,
+  )
+    ? defaultModel
+    : (modelOptions[0]?.value ?? defaultModel);
+  const resolvedModelId = pickAllowedModel(adapterModels, preferredModelId);
+
+  if (!modelOptions.some((option) => option.value === resolvedModelId)) {
+    modelOptions.unshift({
+      value: resolvedModelId,
+      name: resolvedModelId,
+      description: "Custom model",
+    });
+  }
+
+  const configOptions: CloudTaskConfigOption[] = [
+    {
+      id: "mode",
+      name: "Approval Preset",
+      type: "select",
+      currentValue: adapter === "codex" ? "auto" : "plan",
+      options: getModeOptions(adapter, modePresets),
+      category: "mode",
+      description: "Choose an approval and sandboxing preset for your session",
+    },
+    {
+      id: "model",
+      name: "Model",
+      type: "select",
+      currentValue: resolvedModelId,
+      options: modelOptions,
+      category: "model",
+      description: "Choose which model the agent should use",
+    },
+  ];
+
+  const reasoningOptions = getReasoningEffortOptions(adapter, resolvedModelId);
+  if (reasoningOptions) {
+    configOptions.push({
+      id: adapter === "codex" ? "reasoning_effort" : "effort",
+      name: adapter === "codex" ? "Reasoning Level" : "Effort",
+      type: "select",
+      currentValue: "high",
+      options: reasoningOptions,
+      category: "thought_level",
+      description:
+        adapter === "codex"
+          ? "Controls how much reasoning effort the model uses"
+          : "Controls how much effort Claude puts into its response",
+    });
+  }
+
+  return configOptions;
+}
diff --git a/packages/shared/src/domain-types.test.ts b/packages/shared/src/domain-types.test.ts
index f9b060cbed..1264ae0462 100644
--- a/packages/shared/src/domain-types.test.ts
+++ b/packages/shared/src/domain-types.test.ts
@@ -1,5 +1,22 @@
 import { describe, expect, it } from "vitest";
-import { isContentlessTask } from "./domain-types";
+import {
+  isContentlessTask,
+  isTerminalStatus,
+  TERMINAL_STATUSES,
+} from "./domain-types";
+
+describe("task run statuses", () => {
+  it.each(TERMINAL_STATUSES)("identifies %s as terminal", (status) => {
+    expect(isTerminalStatus(status)).toBe(true);
+  });
+
+  it.each(["not_started", "queued", "in_progress", "unknown", null, undefined])(
+    "identifies %s as non-terminal",
+    (status) => {
+      expect(isTerminalStatus(status)).toBe(false);
+    },
+  );
+});
 
 describe("isContentlessTask", () => {
   it.each([
diff --git a/packages/shared/src/domain-types.ts b/packages/shared/src/domain-types.ts
index 4aa90fd2c7..3600423dae 100644
--- a/packages/shared/src/domain-types.ts
+++ b/packages/shared/src/domain-types.ts
@@ -4,6 +4,7 @@ import type { AgentRuntime } from "./agent-runtime";
 import type { DismissalReasonOptionValue } from "./dismissal-reasons";
 import type { StoredLogEntry } from "./session-events";
 import type { TaskRunArtifact } from "./task";
+import type { UploadableSkillSource } from "./skills";
 
 // Execution mode schema and type - shared between main and renderer
 export const executionModeSchema = z.enum([
@@ -192,6 +193,37 @@ export type TaskRunStatus =
   | "failed"
   | "cancelled";
 
+export type TaskRunEnvironment = "local" | "cloud";
+
+export type ArtifactType =
+  | "plan"
+  | "context"
+  | "reference"
+  | "output"
+  | "artifact"
+  | "user_attachment"
+  | "skill_bundle";
+
+export interface TaskRunArtifactMetadata {
+  skill_name: string;
+  skill_source: UploadableSkillSource;
+  content_sha256: string;
+  bundle_format: "zip";
+  schema_version: number;
+}
+
+export interface TaskRunArtifact {
+  id?: string;
+  name: string;
+  type: ArtifactType;
+  source?: string;
+  size?: number;
+  content_type?: string;
+  metadata?: TaskRunArtifactMetadata;
+  storage_path?: string;
+  uploaded_at?: string;
+}
+
 export const TERMINAL_STATUSES = ["completed", "failed", "cancelled"] as const;
 
 export function isTerminalStatus(
@@ -220,7 +252,7 @@ export interface TaskRun {
   model?: string | null;
   reasoning_effort?: "low" | "medium" | "high" | "xhigh" | "max" | null;
   stage?: string | null; // Current stage (e.g., 'research', 'plan', 'build')
-  environment?: "local" | "cloud";
+  environment?: TaskRunEnvironment;
   status: TaskRunStatus;
   log_url: string;
   error_message: string | null;
diff --git a/packages/shared/src/index.ts b/packages/shared/src/index.ts
index ff03602e7e..5809830aba 100644
--- a/packages/shared/src/index.ts
+++ b/packages/shared/src/index.ts
@@ -71,6 +71,30 @@ export {
   promptBlocksToText,
   serializeCloudPrompt,
 } from "./cloud-prompt";
+export {
+  BLOCKED_GATEWAY_MODEL_IDS,
+  buildCloudTaskConfigOptions,
+  type CloudTaskConfigOption,
+  type CloudTaskConfigSelectOption,
+  type CloudTaskModePreset,
+  compareModelsForPicker,
+  DEFAULT_CODEX_MODEL,
+  DEFAULT_GATEWAY_MODEL,
+  formatGatewayModelName,
+  formatModelId,
+  type GatewayModel,
+  getClaudeModelRecency,
+  getCloudTaskGatewayUrl,
+  getProviderName,
+  isAnthropicModel,
+  isBlockedModelId,
+  isCloudflareModel,
+  isCloudflareModelId,
+  isGlmModelId,
+  isOpenAIModel,
+  normalizeGatewayModelsResponse,
+  pickAllowedModel,
+} from "./cloud-task-models";
 export {
   buildInboxDeeplink,
   buildScoutDeeplink,
@@ -87,9 +111,28 @@ export {
 export {
   DISMISSAL_REASON_OPTIONS,
   type DismissalReasonOptionValue,
+  dismissalReasonLabel,
   isDismissalReasonSnooze,
 } from "./dismissal-reasons";
-export type { SignalReportPriority, Task } from "./domain-types";
+export {
+  type ArtifactType,
+  type CloudPermissionOption,
+  type CloudTaskErrorUpdate,
+  type CloudTaskLogsUpdate,
+  type CloudTaskPermissionRequestUpdate,
+  type CloudTaskSnapshotUpdate,
+  type CloudTaskStatusUpdate,
+  type CloudTaskUpdatePayload,
+  isTerminalStatus,
+  type SignalReportPriority,
+  type Task,
+  type TaskRun,
+  type TaskRunArtifact,
+  type TaskRunArtifactMetadata,
+  type TaskRunEnvironment,
+  type TaskRunStatus,
+  TERMINAL_STATUSES,
+} from "./domain-types";
 export * from "./enrichment";
 export {
   classifyGatewayLimitError,
@@ -213,6 +256,13 @@ export {
   isPrivateIpv4Octets,
   isPrivateIpv6Literal,
 } from "./private-network";
+export {
+  DEFAULT_REASONING_EFFORT,
+  getReasoningEffortOptions,
+  isSupportedReasoningEffort,
+  type ReasoningEffortOption,
+  type SupportedReasoningEffort,
+} from "./reasoning-effort";
 export {
   type CloudRegion,
   formatRegionBadge,
@@ -276,15 +326,19 @@ export {
   serializeSkillMarkdown,
   stripFrontmatter,
 } from "./skills";
-export type {
-  ArtifactType,
-  PostHogAPIConfig,
-  TaskRun,
-  TaskRunArtifact,
-  TaskRunArtifactMetadata,
-  TaskRunEnvironment,
-  TaskRunStatus,
-} from "./task";
+export type { PostHogAPIConfig } from "./task";
+export {
+  type CreateTaskAutomationOptions,
+  createTaskAutomationSchema,
+  type TaskAutomation,
+  type TaskAutomationList,
+  type TaskAutomationValidationErrorDetails,
+  taskAutomationListSchema,
+  taskAutomationSchema,
+  taskAutomationValidationErrorSchema,
+  type UpdateTaskAutomationOptions,
+  updateTaskAutomationSchema,
+} from "./task-automation";
 export type {
   TaskCreationInput,
   TaskCreationOutput,
diff --git a/packages/shared/src/reasoning-effort.test.ts b/packages/shared/src/reasoning-effort.test.ts
new file mode 100644
index 0000000000..5b1e301dd3
--- /dev/null
+++ b/packages/shared/src/reasoning-effort.test.ts
@@ -0,0 +1,20 @@
+import { describe, expect, it } from "vitest";
+import { isSupportedReasoningEffort } from "./reasoning-effort";
+
+describe("isSupportedReasoningEffort", () => {
+  it.each([
+    ["codex", "gpt-5.5", "xhigh", true],
+    ["codex", "gpt-5.6-sol", "max", true],
+    ["codex", "gpt-5.4", "max", false],
+    ["claude", "claude-opus-4-8", "xhigh", true],
+    ["claude", "claude-sonnet-4-6", "xhigh", false],
+    ["claude", "claude-opus-4-8", "minimal", false],
+  ] as const)(
+    "validates %s %s effort %s",
+    (adapter, modelId, effort, expected) => {
+      expect(isSupportedReasoningEffort(adapter, modelId, effort)).toBe(
+        expected,
+      );
+    },
+  );
+});
diff --git a/packages/shared/src/reasoning-effort.ts b/packages/shared/src/reasoning-effort.ts
new file mode 100644
index 0000000000..15f534a612
--- /dev/null
+++ b/packages/shared/src/reasoning-effort.ts
@@ -0,0 +1,77 @@
+import type { Adapter } from "./adapter";
+
+export type SupportedReasoningEffort =
+  | "low"
+  | "medium"
+  | "high"
+  | "xhigh"
+  | "max";
+
+export const DEFAULT_REASONING_EFFORT: SupportedReasoningEffort = "high";
+
+export interface ReasoningEffortOption {
+  value: SupportedReasoningEffort;
+  name: string;
+}
+
+const BASE_OPTIONS: ReasoningEffortOption[] = [
+  { value: "low", name: "Low" },
+  { value: "medium", name: "Medium" },
+  { value: "high", name: "High" },
+];
+
+const CLAUDE_MODELS_WITH_EFFORT = new Set([
+  "claude-opus-4-7",
+  "claude-opus-4-8",
+  "claude-sonnet-4-6",
+  "claude-sonnet-5",
+  "claude-fable-5",
+]);
+
+const CLAUDE_MODELS_WITH_XHIGH_EFFORT = new Set([
+  "claude-opus-4-7",
+  "claude-opus-4-8",
+  "claude-sonnet-5",
+  "claude-fable-5",
+]);
+
+export function getReasoningEffortOptions(
+  adapter: Adapter,
+  modelId: string,
+): ReasoningEffortOption[] | null {
+  if (adapter === "claude" && !CLAUDE_MODELS_WITH_EFFORT.has(modelId)) {
+    return null;
+  }
+
+  const options = [...BASE_OPTIONS];
+  const normalizedModelId = modelId.toLowerCase();
+  const supportsXhigh =
+    adapter === "claude"
+      ? CLAUDE_MODELS_WITH_XHIGH_EFFORT.has(modelId)
+      : normalizedModelId.includes("gpt-5.5") ||
+        normalizedModelId.includes("gpt-5.6");
+
+  if (supportsXhigh) {
+    options.push({ value: "xhigh", name: "Extra High" });
+  }
+  if (
+    (adapter === "claude" && supportsXhigh) ||
+    (adapter === "codex" && normalizedModelId.includes("gpt-5.6"))
+  ) {
+    options.push({ value: "max", name: "Max" });
+  }
+
+  return options;
+}
+
+export function isSupportedReasoningEffort(
+  adapter: Adapter,
+  modelId: string,
+  value: string,
+): value is SupportedReasoningEffort {
+  return (
+    getReasoningEffortOptions(adapter, modelId)?.some(
+      (option) => option.value === value,
+    ) ?? false
+  );
+}
diff --git a/packages/shared/src/sessions.ts b/packages/shared/src/sessions.ts
index 76a49cd736..181ff36c20 100644
--- a/packages/shared/src/sessions.ts
+++ b/packages/shared/src/sessions.ts
@@ -8,9 +8,9 @@ import type {
 } from "@agentclientprotocol/sdk";
 import type { Adapter } from "./adapter";
 import type { SkillButtonId } from "./analytics-events";
+import type { TaskRunArtifact, TaskRunStatus } from "./domain-types";
 import type { ExecutionMode } from "./exec-types";
 import type { AcpMessage } from "./session-events";
-import type { TaskRunArtifact, TaskRunStatus } from "./task";
 
 export type { Adapter };
 
diff --git a/packages/shared/src/task-automation.test.ts b/packages/shared/src/task-automation.test.ts
new file mode 100644
index 0000000000..57e6fcaa97
--- /dev/null
+++ b/packages/shared/src/task-automation.test.ts
@@ -0,0 +1,66 @@
+import { describe, expect, expectTypeOf, it } from "vitest";
+import {
+  type CreateTaskAutomationOptions,
+  createTaskAutomationSchema,
+  taskAutomationSchema,
+  taskAutomationValidationErrorSchema,
+  type UpdateTaskAutomationOptions,
+  updateTaskAutomationSchema,
+} from "./task-automation";
+
+describe("task automation contracts", () => {
+  it("normalizes optional automation response fields", () => {
+    expect(
+      taskAutomationSchema.parse({
+        id: "automation-1",
+        name: "Daily PRs",
+        prompt: "Check PRs",
+        repository: "posthog/posthog",
+        cron_expression: "0 9 * * *",
+        last_run_at: null,
+        last_run_status: null,
+        last_task_id: null,
+        last_task_run_id: null,
+        last_error: null,
+        created_at: "2026-07-21T00:00:00Z",
+        updated_at: "2026-07-21T00:00:00Z",
+      }),
+    ).toMatchObject({
+      github_integration: null,
+      timezone: null,
+      template_id: null,
+      enabled: true,
+    });
+  });
+
+  it("keeps create fields required and update fields partial", () => {
+    const create = createTaskAutomationSchema.parse({
+      name: "Daily PRs",
+      prompt: "Check PRs",
+      repository: "posthog/posthog",
+      cron_expression: "0 9 * * *",
+      timezone: "Europe/London",
+    });
+    const update = updateTaskAutomationSchema.parse({ enabled: false });
+
+    expect(create.timezone).toBe("Europe/London");
+    expect(update).toEqual({ enabled: false });
+    expectTypeOf(create).toEqualTypeOf<CreateTaskAutomationOptions>();
+    expectTypeOf(update).toEqualTypeOf<UpdateTaskAutomationOptions>();
+  });
+
+  it("preserves backend validation field attribution", () => {
+    expect(
+      taskAutomationValidationErrorSchema.parse({
+        type: "validation_error",
+        detail: "Enter a valid cron expression.",
+        attr: "cron_expression",
+      }),
+    ).toEqual({
+      type: "validation_error",
+      code: "invalid_input",
+      detail: "Enter a valid cron expression.",
+      attr: "cron_expression",
+    });
+  });
+});
diff --git a/packages/shared/src/task-automation.ts b/packages/shared/src/task-automation.ts
new file mode 100644
index 0000000000..0f3e4a4bde
--- /dev/null
+++ b/packages/shared/src/task-automation.ts
@@ -0,0 +1,58 @@
+import { z } from "zod";
+
+export const taskAutomationSchema = z.object({
+  id: z.string(),
+  name: z.string(),
+  prompt: z.string(),
+  repository: z.string(),
+  github_integration: z.number().nullable().default(null),
+  cron_expression: z.string(),
+  timezone: z.string().nullable().default(null),
+  template_id: z.string().nullable().default(null),
+  enabled: z.boolean().default(true),
+  last_run_at: z.string().nullable(),
+  last_run_status: z.string().nullable(),
+  last_task_id: z.string().nullable(),
+  last_task_run_id: z.string().nullable(),
+  last_error: z.string().nullable(),
+  created_at: z.string(),
+  updated_at: z.string(),
+});
+export type TaskAutomation = z.infer<typeof taskAutomationSchema>;
+
+export const taskAutomationListSchema = z.object({
+  count: z.number(),
+  next: z.string().nullable().optional(),
+  previous: z.string().nullable().optional(),
+  results: z.array(taskAutomationSchema),
+});
+export type TaskAutomationList = z.infer<typeof taskAutomationListSchema>;
+
+export const createTaskAutomationSchema = z.object({
+  name: z.string(),
+  prompt: z.string(),
+  repository: z.string(),
+  github_integration: z.number().nullable().optional(),
+  cron_expression: z.string(),
+  timezone: z.string(),
+  template_id: z.string().nullable().optional(),
+  enabled: z.boolean().optional(),
+});
+export type CreateTaskAutomationOptions = z.infer<
+  typeof createTaskAutomationSchema
+>;
+
+export const updateTaskAutomationSchema = createTaskAutomationSchema.partial();
+export type UpdateTaskAutomationOptions = z.infer<
+  typeof updateTaskAutomationSchema
+>;
+
+export const taskAutomationValidationErrorSchema = z.object({
+  type: z.string().optional(),
+  code: z.string().default("invalid_input"),
+  detail: z.string(),
+  attr: z.string().nullable().default(null),
+});
+export type TaskAutomationValidationErrorDetails = z.infer<
+  typeof taskAutomationValidationErrorSchema
+>;
diff --git a/packages/shared/src/task.test.ts b/packages/shared/src/task.test.ts
new file mode 100644
index 0000000000..8d666f2b11
--- /dev/null
+++ b/packages/shared/src/task.test.ts
@@ -0,0 +1,53 @@
+import { describe, expect, expectTypeOf, it } from "vitest";
+import type {
+  Task,
+  TaskRun,
+  TaskRunArtifact,
+  TaskRunStatus,
+} from "./domain-types";
+import {
+  type CloudPermissionOption,
+  type CloudTaskUpdatePayload,
+  isTerminalStatus,
+  type Task as RootTask,
+  type TaskRun as RootTaskRun,
+  type TaskRunArtifact as RootTaskRunArtifact,
+  type TaskRunStatus as RootTaskRunStatus,
+  TERMINAL_STATUSES,
+} from "./index";
+import type {
+  Task as LegacyTask,
+  TaskRun as LegacyTaskRun,
+  TaskRunArtifact as LegacyTaskRunArtifact,
+  TaskRunStatus as LegacyTaskRunStatus,
+} from "./task";
+
+describe("cloud task contract exports", () => {
+  it("keeps legacy and root task exports canonical", () => {
+    expectTypeOf<LegacyTask>().toEqualTypeOf<Task>();
+    expectTypeOf<LegacyTaskRun>().toEqualTypeOf<TaskRun>();
+    expectTypeOf<LegacyTaskRunArtifact>().toEqualTypeOf<TaskRunArtifact>();
+    expectTypeOf<LegacyTaskRunStatus>().toEqualTypeOf<TaskRunStatus>();
+    expectTypeOf<RootTask>().toEqualTypeOf<Task>();
+    expectTypeOf<RootTaskRun>().toEqualTypeOf<TaskRun>();
+    expectTypeOf<RootTaskRunArtifact>().toEqualTypeOf<TaskRunArtifact>();
+    expectTypeOf<RootTaskRunStatus>().toEqualTypeOf<TaskRunStatus>();
+  });
+
+  it("exports cloud permission and update payload contracts from the root", () => {
+    expectTypeOf<CloudPermissionOption>().toMatchTypeOf<{
+      kind: string;
+      optionId: string;
+      name: string;
+    }>();
+    expectTypeOf<CloudTaskUpdatePayload["kind"]>().toEqualTypeOf<
+      "logs" | "status" | "snapshot" | "error" | "permission_request"
+    >();
+  });
+
+  it("exports terminal status helpers from the root", () => {
+    expect(TERMINAL_STATUSES).toEqual(["completed", "failed", "cancelled"]);
+    expect(isTerminalStatus("completed")).toBe(true);
+    expect(isTerminalStatus("in_progress")).toBe(false);
+  });
+});
diff --git a/packages/shared/src/task.ts b/packages/shared/src/task.ts
index b93c6e96d7..f6593d21bf 100644
--- a/packages/shared/src/task.ts
+++ b/packages/shared/src/task.ts
@@ -1,97 +1,12 @@
-// PostHog Task model (matches the desktop task API's OpenAPI schema)
-import type { AgentRuntime } from "./agent-runtime";
-import type { UploadableSkillSource } from "./skills";
-
-export interface Task {
-  id: string;
-  task_number?: number;
-  slug?: string;
-  title: string;
-  description: string;
-  origin_product:
-    | "error_tracking"
-    | "eval_clusters"
-    | "user_created"
-    | "support_queue"
-    | "session_summaries"
-    | "signal_report"
-    | "signals_scout"
-    | "slack";
-  signal_report?: string | null; // Inbox report UUID when origin_product is "signal_report"
-  github_integration?: number | null;
-  repository: string; // Format: "organization/repository" (e.g., "posthog/posthog-js")
-  json_schema?: Record<string, unknown> | null; // JSON schema for task output validation
-  internal?: boolean;
-  runtime?: AgentRuntime;
-  created_at: string;
-  updated_at: string;
-  created_by?: {
-    id: number;
-    uuid: string;
-    distinct_id: string;
-    first_name: string;
-    email: string;
-  };
-  latest_run?: TaskRun;
-}
-
-export type ArtifactType =
-  | "plan"
-  | "context"
-  | "reference"
-  | "output"
-  | "artifact"
-  | "user_attachment"
-  | "skill_bundle";
-
-export interface TaskRunArtifactMetadata {
-  skill_name: string;
-  skill_source: UploadableSkillSource;
-  content_sha256: string;
-  bundle_format: "zip";
-  schema_version: number;
-}
-
-export interface TaskRunArtifact {
-  id?: string;
-  name: string;
-  type: ArtifactType;
-  source?: string;
-  size?: number;
-  content_type?: string;
-  metadata?: TaskRunArtifactMetadata;
-  storage_path?: string;
-  uploaded_at?: string;
-}
-
-export type TaskRunStatus =
-  | "not_started"
-  | "queued"
-  | "in_progress"
-  | "completed"
-  | "failed"
-  | "cancelled";
-
-export type TaskRunEnvironment = "local" | "cloud";
-
-// TaskRun model - represents individual execution runs of tasks
-export interface TaskRun {
-  id: string;
-  task: string; // Task ID
-  team: number;
-  branch: string | null;
-  stage: string | null; // Current stage (e.g., 'research', 'plan', 'build')
-  environment: TaskRunEnvironment;
-  status: TaskRunStatus;
-  log_url: string;
-  error_message: string | null;
-  output: Record<string, unknown> | null; // Structured output (PR URL, commit SHA, etc.)
-  state: Record<string, unknown>; // Intermediate run state (defaults to {}, never null)
-  artifacts?: TaskRunArtifact[];
-  created_at: string;
-  updated_at: string;
-  completed_at: string | null;
-}
+export type {
+  ArtifactType,
+  Task,
+  TaskRun,
+  TaskRunArtifact,
+  TaskRunArtifactMetadata,
+  TaskRunEnvironment,
+  TaskRunStatus,
+} from "./domain-types";
 
 export interface PostHogAPIConfig {
   apiUrl: string;
diff --git a/packages/workspace-server/src/services/agent/agent.ts b/packages/workspace-server/src/services/agent/agent.ts
index 9654cb30b7..bd0821e254 100644
--- a/packages/workspace-server/src/services/agent/agent.ts
+++ b/packages/workspace-server/src/services/agent/agent.ts
@@ -20,24 +20,16 @@ import {
 } from "@posthog/agent";
 import type { McpToolApprovals } from "@posthog/agent/adapters/claude/mcp/tool-metadata";
 import { hydrateSessionJsonl } from "@posthog/agent/adapters/claude/session/jsonl-hydration";
-import { getReasoningEffortOptions } from "@posthog/agent/adapters/reasoning-effort";
 import { Agent } from "@posthog/agent/agent";
 import {
   getAvailableCodexModes,
   getAvailableModes,
 } from "@posthog/agent/execution-mode";
 import {
-  DEFAULT_CODEX_MODEL,
-  DEFAULT_GATEWAY_MODEL,
   fetchGatewayModels,
   formatGatewayModelName,
-  type GatewayModel,
   getClaudeModelRecency,
   getProviderName,
-  isAnthropicModel,
-  isCloudflareModel,
-  isOpenAIModel,
-  pickAllowedModel,
 } from "@posthog/agent/gateway-models";
 import { getLlmGatewayUrl } from "@posthog/agent/posthog-api";
 import {
@@ -72,10 +64,10 @@ import {
 import {
   type AcpMessage,
   type Adapter,
+  buildCloudTaskConfigOptions,
   type ExecutionMode,
   isAuthError,
   resolveCloudInitialPermissionMode,
-  restrictedModelMeta,
   serializeError,
   TypedEventEmitter,
 } from "@posthog/shared";
@@ -2395,111 +2387,14 @@ For git operations while detached:
     adapter: Adapter = "claude",
   ): Promise<SessionConfigOption[]> {
     const gatewayUrl = getLlmGatewayUrl(apiHost);
-    // Authenticated so the gateway can mark plan-restricted models; falls
-    // back to an anonymous fetch (everything allowed) without auth.
     const gatewayModels = await fetchGatewayModels({
       gatewayUrl,
       authToken: (await this.agentAuthAdapter.gatewayAuthToken()) ?? undefined,
     });
-
-    // The Claude adapter can also drive Cloudflare `@cf/` models the gateway serves over its
-    // Anthropic-Messages surface, so the preview/default-model path must offer them too — otherwise an
-    // advertised `@cf/*` model is dropped here and the pre-session run falls back to Opus.
-    const modelFilter =
-      adapter === "codex"
-        ? isOpenAIModel
-        : (model: GatewayModel) =>
-            isAnthropicModel(model) || isCloudflareModel(model);
-
-    const adapterModels = gatewayModels.filter((model) => modelFilter(model));
-    const modelOptions = adapterModels.map((model) => ({
-      value: model.id,
-      name: formatGatewayModelName(model),
-      description: `Context: ${model.context_window.toLocaleString()} tokens`,
-      // Locked models stay listed so the picker can gate them instead of
-      // silently dropping them.
-      ...(model.allowed ? {} : { _meta: restrictedModelMeta() }),
-    }));
-
-    // The gateway returns models in an arbitrary order. Sort Claude models
-    // oldest-to-newest so the picker is deterministic and the newest model
-    // lands at the end of the list, closest to the trigger.
-    if (adapter === "claude") {
-      modelOptions.sort(
-        (a, b) =>
-          getClaudeModelRecency(a.value) - getClaudeModelRecency(b.value),
-      );
-    }
-
-    const defaultModel =
-      adapter === "codex"
-        ? (modelOptions.find((o) => o.value === DEFAULT_CODEX_MODEL)?.value ??
-          modelOptions[0]?.value ??
-          "")
-        : DEFAULT_GATEWAY_MODEL;
-
-    const preferredModelId = modelOptions.some((o) => o.value === defaultModel)
-      ? defaultModel
-      : (modelOptions[0]?.value ?? defaultModel);
-    // Never preselect a model the org's plan can't use — it would 403 on the
-    // first message.
-    const resolvedModelId = pickAllowedModel(adapterModels, preferredModelId);
-
-    if (!modelOptions.some((o) => o.value === resolvedModelId)) {
-      modelOptions.unshift({
-        value: resolvedModelId,
-        name: resolvedModelId,
-        description: "Custom model",
-      });
-    }
-
-    const modes =
-      adapter === "codex" ? getAvailableCodexModes() : getAvailableModes();
-    const modeOptions = modes.map((mode) => ({
-      value: mode.id,
-      name: mode.name,
-      description: mode.description ?? undefined,
-    }));
-    const defaultMode = adapter === "codex" ? "auto" : "plan";
-
-    const configOptions: SessionConfigOption[] = [
-      {
-        id: "mode",
-        name: "Approval Preset",
-        type: "select",
-        currentValue: defaultMode,
-        options: modeOptions,
-        category: "mode",
-        description:
-          "Choose an approval and sandboxing preset for your session",
-      },
-      {
-        id: "model",
-        name: "Model",
-        type: "select",
-        currentValue: resolvedModelId,
-        options: modelOptions,
-        category: "model",
-        description: "Choose which model Claude should use",
-      },
-    ];
-
-    const effortOpts = getReasoningEffortOptions(adapter, resolvedModelId);
-    if (effortOpts) {
-      configOptions.push({
-        id: adapter === "codex" ? "reasoning_effort" : "effort",
-        name: adapter === "codex" ? "Reasoning Level" : "Effort",
-        type: "select",
-        currentValue: "high",
-        options: effortOpts,
-        category: "thought_level",
-        description:
-          adapter === "codex"
-            ? "Controls how much reasoning effort the model uses"
-            : "Controls how much effort Claude puts into its response",
-      });
-    }
-
-    return configOptions;
+    return buildCloudTaskConfigOptions(
+      gatewayModels,
+      adapter,
+      adapter === "codex" ? getAvailableCodexModes() : getAvailableModes(),
+    ) as SessionConfigOption[];
   }
 }

From ec5fb80c4e293a8a3f29a5bbfadb1559320cfb6c Mon Sep 17 00:00:00 2001
From: Richard Solomou <richard.s@posthog.com>
Date: Fri, 24 Jul 2026 19:45:36 +0300
Subject: [PATCH 2/9] fix(models): preserve GLM effort policy

Generated-By: PostHog Code
Task-Id: c1bbe3cf-742b-4b24-bf96-d11a18b4cf22
---
 packages/shared/src/cloud-task-models.test.ts | 11 ++++-
 packages/shared/src/reasoning-effort.test.ts  |  3 ++
 packages/shared/src/reasoning-effort.ts       | 48 ++++++++++---------
 3 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/packages/shared/src/cloud-task-models.test.ts b/packages/shared/src/cloud-task-models.test.ts
index 31418a7775..afbad989f8 100644
--- a/packages/shared/src/cloud-task-models.test.ts
+++ b/packages/shared/src/cloud-task-models.test.ts
@@ -164,8 +164,17 @@ describe("buildCloudTaskConfigOptions", () => {
           { value: "@cf/zai-org/glm-5.2" },
         ],
       },
+      {
+        id: "effort",
+        currentValue: "high",
+        options: [{ value: "high" }, { value: "max" }],
+      },
+    ]);
+    expect(options.map((option) => option.id)).toEqual([
+      "mode",
+      "model",
+      "effort",
     ]);
-    expect(options.map((option) => option.id)).toEqual(["mode", "model"]);
   });
 
   it("builds Codex options with the shared default and reasoning levels", () => {
diff --git a/packages/shared/src/reasoning-effort.test.ts b/packages/shared/src/reasoning-effort.test.ts
index 5b1e301dd3..2ac4a9bbff 100644
--- a/packages/shared/src/reasoning-effort.test.ts
+++ b/packages/shared/src/reasoning-effort.test.ts
@@ -8,6 +8,9 @@ describe("isSupportedReasoningEffort", () => {
     ["codex", "gpt-5.4", "max", false],
     ["claude", "claude-opus-4-8", "xhigh", true],
     ["claude", "claude-sonnet-4-6", "xhigh", false],
+    ["claude", "@cf/zai-org/glm-5.2", "high", true],
+    ["claude", "@cf/zai-org/glm-5.2", "max", true],
+    ["claude", "@cf/zai-org/glm-5.2", "medium", false],
     ["claude", "claude-opus-4-8", "minimal", false],
   ] as const)(
     "validates %s %s effort %s",
diff --git a/packages/shared/src/reasoning-effort.ts b/packages/shared/src/reasoning-effort.ts
index 15f534a612..2fe12b7232 100644
--- a/packages/shared/src/reasoning-effort.ts
+++ b/packages/shared/src/reasoning-effort.ts
@@ -20,44 +20,46 @@ const BASE_OPTIONS: ReasoningEffortOption[] = [
   { value: "high", name: "High" },
 ];
 
-const CLAUDE_MODELS_WITH_EFFORT = new Set([
-  "claude-opus-4-7",
-  "claude-opus-4-8",
-  "claude-sonnet-4-6",
-  "claude-sonnet-5",
-  "claude-fable-5",
-]);
+const CLAUDE_MODEL_EFFORTS: Readonly<
+  Record<string, readonly SupportedReasoningEffort[]>
+> = {
+  "claude-opus-4-7": ["low", "medium", "high", "xhigh", "max"],
+  "claude-opus-4-8": ["low", "medium", "high", "xhigh", "max"],
+  "claude-sonnet-4-6": ["low", "medium", "high"],
+  "claude-sonnet-5": ["low", "medium", "high", "xhigh", "max"],
+  "claude-fable-5": ["low", "medium", "high", "xhigh", "max"],
+  "@cf/zai-org/glm-5.2": ["high", "max"],
+};
 
-const CLAUDE_MODELS_WITH_XHIGH_EFFORT = new Set([
-  "claude-opus-4-7",
-  "claude-opus-4-8",
-  "claude-sonnet-5",
-  "claude-fable-5",
-]);
+const EFFORT_NAMES: Record<SupportedReasoningEffort, string> = {
+  low: "Low",
+  medium: "Medium",
+  high: "High",
+  xhigh: "Extra High",
+  max: "Max",
+};
 
 export function getReasoningEffortOptions(
   adapter: Adapter,
   modelId: string,
 ): ReasoningEffortOption[] | null {
-  if (adapter === "claude" && !CLAUDE_MODELS_WITH_EFFORT.has(modelId)) {
-    return null;
+  if (adapter === "claude") {
+    const efforts = CLAUDE_MODEL_EFFORTS[modelId];
+    return (
+      efforts?.map((value) => ({ value, name: EFFORT_NAMES[value] })) ?? null
+    );
   }
 
   const options = [...BASE_OPTIONS];
   const normalizedModelId = modelId.toLowerCase();
   const supportsXhigh =
-    adapter === "claude"
-      ? CLAUDE_MODELS_WITH_XHIGH_EFFORT.has(modelId)
-      : normalizedModelId.includes("gpt-5.5") ||
-        normalizedModelId.includes("gpt-5.6");
+    normalizedModelId.includes("gpt-5.5") ||
+    normalizedModelId.includes("gpt-5.6");
 
   if (supportsXhigh) {
     options.push({ value: "xhigh", name: "Extra High" });
   }
-  if (
-    (adapter === "claude" && supportsXhigh) ||
-    (adapter === "codex" && normalizedModelId.includes("gpt-5.6"))
-  ) {
+  if (adapter === "codex" && normalizedModelId.includes("gpt-5.6")) {
     options.push({ value: "max", name: "Max" });
   }
 

From fa2dda48da93a111d7ddca4081ce3763433da716 Mon Sep 17 00:00:00 2001
From: Richard Solomou <richard.s@posthog.com>
Date: Sat, 25 Jul 2026 01:55:53 +0300
Subject: [PATCH 3/9] test(ui): wait for async content

Generated-By: PostHog Code
Task-Id: c1bbe3cf-742b-4b24-bf96-d11a18b4cf22
---
 .../components/session-update/PlanApprovalView.test.tsx       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/ui/src/features/sessions/components/session-update/PlanApprovalView.test.tsx b/packages/ui/src/features/sessions/components/session-update/PlanApprovalView.test.tsx
index ef705ba77c..dd83ad5f6b 100644
--- a/packages/ui/src/features/sessions/components/session-update/PlanApprovalView.test.tsx
+++ b/packages/ui/src/features/sessions/components/session-update/PlanApprovalView.test.tsx
@@ -110,7 +110,7 @@ describe("PlanApprovalView", () => {
     ).toBeInTheDocument();
   });
 
-  it("uses updated content instead of stale raw input while streaming", () => {
+  it("uses updated content instead of stale raw input while streaming", async () => {
     renderView({
       toolCall: makeToolCall({
         status: "in_progress",
@@ -124,7 +124,7 @@ describe("PlanApprovalView", () => {
       }),
     });
 
-    expect(screen.getByText("Updated plan")).toBeInTheDocument();
+    expect(await screen.findByText("Updated plan")).toBeInTheDocument();
     expect(screen.queryByText("Initial plan")).not.toBeInTheDocument();
   });
 

From 0960bc378d53c5e5e3cdb261eb619953bb69f18a Mon Sep 17 00:00:00 2001
From: Richard Solomou <richard.s@posthog.com>
Date: Sat, 25 Jul 2026 02:06:34 +0300
Subject: [PATCH 4/9] test(ui): isolate plan approval presentation

Generated-By: PostHog Code
Task-Id: c1bbe3cf-742b-4b24-bf96-d11a18b4cf22
---
 .../components/session-update/PlanApprovalView.test.tsx   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/ui/src/features/sessions/components/session-update/PlanApprovalView.test.tsx b/packages/ui/src/features/sessions/components/session-update/PlanApprovalView.test.tsx
index dd83ad5f6b..3bd1add8e8 100644
--- a/packages/ui/src/features/sessions/components/session-update/PlanApprovalView.test.tsx
+++ b/packages/ui/src/features/sessions/components/session-update/PlanApprovalView.test.tsx
@@ -2,9 +2,13 @@ import type { ToolCall } from "@posthog/ui/features/sessions/types";
 import { Theme } from "@radix-ui/themes";
 import { render, screen } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
-import { describe, expect, it } from "vitest";
+import { describe, expect, it, vi } from "vitest";
 import { PlanApprovalView } from "./PlanApprovalView";
 
+vi.mock("../../../permissions/PlanContent", () => ({
+  PlanContent: ({ plan }: { plan: string }) => <div>{plan}</div>,
+}));
+
 const PLAN_MARKER = "Sentinel plan body for testing";
 
 function makeToolCall(overrides: Partial<ToolCall> = {}): ToolCall {
@@ -124,7 +128,7 @@ describe("PlanApprovalView", () => {
       }),
     });
 
-    expect(await screen.findByText("Updated plan")).toBeInTheDocument();
+    expect(screen.getByText("Updated plan")).toBeInTheDocument();
     expect(screen.queryByText("Initial plan")).not.toBeInTheDocument();
   });
 

From 3f608f21ce8b2a1cf0a4277ed6fd77832371ee8f Mon Sep 17 00:00:00 2001
From: Richard Solomou <richard.s@posthog.com>
Date: Tue, 28 Jul 2026 12:05:07 +0300
Subject: [PATCH 5/9] fix(shared): Preserve canonical task artifacts

Keep the extracted domain declaration as the single source after rebasing onto current main.

Generated-By: PostHog Code
Task-Id: c1bbe3cf-742b-4b24-bf96-d11a18b4cf22
---
 packages/shared/src/domain-types.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/shared/src/domain-types.ts b/packages/shared/src/domain-types.ts
index 3600423dae..8f1e8dc56d 100644
--- a/packages/shared/src/domain-types.ts
+++ b/packages/shared/src/domain-types.ts
@@ -3,7 +3,6 @@ import type { Adapter } from "./adapter";
 import type { AgentRuntime } from "./agent-runtime";
 import type { DismissalReasonOptionValue } from "./dismissal-reasons";
 import type { StoredLogEntry } from "./session-events";
-import type { TaskRunArtifact } from "./task";
 import type { UploadableSkillSource } from "./skills";
 
 // Execution mode schema and type - shared between main and renderer

From 9c4235c3f9f0b9ca26c0eb2aac4f547288b57029 Mon Sep 17 00:00:00 2001
From: Richard Solomou <richard.s@posthog.com>
Date: Tue, 28 Jul 2026 12:27:36 +0300
Subject: [PATCH 6/9] test(agent): match canonical model picker order

Generated-By: PostHog Code
Task-Id: c1bbe3cf-742b-4b24-bf96-d11a18b4cf22
---
 packages/agent/src/adapters/claude/session/model-config.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/agent/src/adapters/claude/session/model-config.test.ts b/packages/agent/src/adapters/claude/session/model-config.test.ts
index 22fd0bcf69..5561454baa 100644
--- a/packages/agent/src/adapters/claude/session/model-config.test.ts
+++ b/packages/agent/src/adapters/claude/session/model-config.test.ts
@@ -26,8 +26,8 @@ describe("applyAvailableModelsAllowlist", () => {
         "claude-opus-4-8",
       ]).options,
     ).toEqual([
-      { value: "claude-sonnet-4-6", name: "Claude Sonnet 4.6" },
       { value: "claude-opus-4-8", name: "Claude Opus 4.8" },
+      { value: "claude-sonnet-4-6", name: "Claude Sonnet 4.6" },
     ]);
   });
 

From 91612d27c5873d7bb98e8d97a717a2760d9e4281 Mon Sep 17 00:00:00 2001
From: Shy Alter <puemos@users.noreply.github.com>
Date: Tue, 28 Jul 2026 20:04:15 +0200
Subject: [PATCH 7/9] fix(spaces): keep inactive space data cached

Keep collaborative space collections warm across navigation while polling only the active space.

Generated-By: PostHog Code
Task-Id: 885a1205-07a8-4fd0-b625-a789b7035a20
---
 .../features/canvas/hooks/spaceQueryPolicy.ts |  5 +++++
 .../features/canvas/hooks/useChannelFeed.ts   |  6 ++++++
 .../features/canvas/hooks/useChannelTasks.ts  | 17 ++++++++++++++--
 .../features/canvas/hooks/useDashboards.ts    | 20 +++++++++++++++++--
 4 files changed, 44 insertions(+), 4 deletions(-)
 create mode 100644 packages/ui/src/features/canvas/hooks/spaceQueryPolicy.ts

diff --git a/packages/ui/src/features/canvas/hooks/spaceQueryPolicy.ts b/packages/ui/src/features/canvas/hooks/spaceQueryPolicy.ts
new file mode 100644
index 0000000000..22e3db234d
--- /dev/null
+++ b/packages/ui/src/features/canvas/hooks/spaceQueryPolicy.ts
@@ -0,0 +1,5 @@
+// Space collections stay visible while they revalidate. Only mounted (active)
+// space queries poll; inactive spaces remain cached for fast switching.
+export const SPACE_QUERY_STALE_TIME_MS = 15_000;
+export const SPACE_QUERY_GC_TIME_MS = 30 * 60_000;
+export const SPACE_QUERY_REFETCH_INTERVAL_MS = 15_000;
diff --git a/packages/ui/src/features/canvas/hooks/useChannelFeed.ts b/packages/ui/src/features/canvas/hooks/useChannelFeed.ts
index 07d4503026..e62fe07d4f 100644
--- a/packages/ui/src/features/canvas/hooks/useChannelFeed.ts
+++ b/packages/ui/src/features/canvas/hooks/useChannelFeed.ts
@@ -1,6 +1,10 @@
 import type { Task } from "@posthog/shared/domain-types";
 import { useAuthenticatedQuery } from "@posthog/ui/hooks/useAuthenticatedQuery";
 import { useMemo } from "react";
+import {
+  SPACE_QUERY_GC_TIME_MS,
+  SPACE_QUERY_STALE_TIME_MS,
+} from "./spaceQueryPolicy";
 
 // Feeds are multiplayer: poll fast enough that a teammate's new task card and
 // run-status flips feel live without a dedicated push channel.
@@ -24,7 +28,9 @@ export function useChannelFeed(channelId: string | undefined): {
       client.getTasks({ channel: channelId }) as unknown as Promise<Task[]>,
     {
       enabled: !!channelId,
+      gcTime: SPACE_QUERY_GC_TIME_MS,
       refetchInterval: CHANNEL_FEED_POLL_INTERVAL_MS,
+      staleTime: SPACE_QUERY_STALE_TIME_MS,
     },
   );
   const tasks = useMemo(
diff --git a/packages/ui/src/features/canvas/hooks/useChannelTasks.ts b/packages/ui/src/features/canvas/hooks/useChannelTasks.ts
index 7a33ce6645..46adbbd419 100644
--- a/packages/ui/src/features/canvas/hooks/useChannelTasks.ts
+++ b/packages/ui/src/features/canvas/hooks/useChannelTasks.ts
@@ -2,6 +2,11 @@ import type { ChannelTaskRecord } from "@posthog/core/canvas/channelTaskSchemas"
 import { useHostTRPC } from "@posthog/host-router/react";
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import { useCallback } from "react";
+import {
+  SPACE_QUERY_GC_TIME_MS,
+  SPACE_QUERY_REFETCH_INTERVAL_MS,
+  SPACE_QUERY_STALE_TIME_MS,
+} from "./spaceQueryPolicy";
 
 /** Tasks filed to a channel — backed by desktop_file_system rows. */
 export function useChannelTasks(channelId: string | undefined): {
@@ -12,7 +17,12 @@ export function useChannelTasks(channelId: string | undefined): {
   const { data, isLoading } = useQuery(
     trpc.channelTasks.list.queryOptions(
       { channelId: channelId ?? "" },
-      { enabled: !!channelId, staleTime: 5_000 },
+      {
+        enabled: !!channelId,
+        gcTime: SPACE_QUERY_GC_TIME_MS,
+        refetchInterval: SPACE_QUERY_REFETCH_INTERVAL_MS,
+        staleTime: SPACE_QUERY_STALE_TIME_MS,
+      },
     ),
   );
   return { tasks: data ?? [], isLoading };
@@ -31,7 +41,10 @@ export function usePrefetchChannelTasks(): (channelId: string) => void {
       void queryClient.prefetchQuery(
         trpc.channelTasks.list.queryOptions(
           { channelId },
-          { staleTime: 5_000 },
+          {
+            gcTime: SPACE_QUERY_GC_TIME_MS,
+            staleTime: SPACE_QUERY_STALE_TIME_MS,
+          },
         ),
       );
     },
diff --git a/packages/ui/src/features/canvas/hooks/useDashboards.ts b/packages/ui/src/features/canvas/hooks/useDashboards.ts
index af8267c501..a9f79ee83f 100644
--- a/packages/ui/src/features/canvas/hooks/useDashboards.ts
+++ b/packages/ui/src/features/canvas/hooks/useDashboards.ts
@@ -10,6 +10,11 @@ import { logger } from "@posthog/ui/shell/logger";
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import { useNavigate } from "@tanstack/react-router";
 import { useCallback } from "react";
+import {
+  SPACE_QUERY_GC_TIME_MS,
+  SPACE_QUERY_REFETCH_INTERVAL_MS,
+  SPACE_QUERY_STALE_TIME_MS,
+} from "./spaceQueryPolicy";
 
 const log = logger.scope("dashboards");
 
@@ -33,7 +38,12 @@ export function useDashboards(channelId: string | undefined): {
   const { data, isLoading } = useQuery(
     trpc.dashboards.list.queryOptions(
       { channelId: channelId ?? "" },
-      { enabled: !!channelId, staleTime: 5_000 },
+      {
+        enabled: !!channelId,
+        gcTime: SPACE_QUERY_GC_TIME_MS,
+        refetchInterval: SPACE_QUERY_REFETCH_INTERVAL_MS,
+        staleTime: SPACE_QUERY_STALE_TIME_MS,
+      },
     ),
   );
   return { dashboards: data ?? [], isLoading };
@@ -50,7 +60,13 @@ export function usePrefetchDashboards(): (channelId: string) => void {
   return useCallback(
     (channelId: string) => {
       void queryClient.prefetchQuery(
-        trpc.dashboards.list.queryOptions({ channelId }, { staleTime: 5_000 }),
+        trpc.dashboards.list.queryOptions(
+          { channelId },
+          {
+            gcTime: SPACE_QUERY_GC_TIME_MS,
+            staleTime: SPACE_QUERY_STALE_TIME_MS,
+          },
+        ),
       );
     },
     [trpc, queryClient],

From 8f10949f775559aa1b2760647eb836df907f86f3 Mon Sep 17 00:00:00 2001
From: Shy Alter <puemos@users.noreply.github.com>
Date: Wed, 29 Jul 2026 08:00:34 +0200
Subject: [PATCH 8/9] fix(spaces): limit dashboard polling to space views

Generated-By: PostHog Code
Task-Id: 885a1205-07a8-4fd0-b625-a789b7035a20
---
 packages/ui/src/features/canvas/hooks/useDashboards.ts    | 8 ++++++--
 .../src/features/loops/components/LoopContextFields.tsx   | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/ui/src/features/canvas/hooks/useDashboards.ts b/packages/ui/src/features/canvas/hooks/useDashboards.ts
index a9f79ee83f..b7f70d5f61 100644
--- a/packages/ui/src/features/canvas/hooks/useDashboards.ts
+++ b/packages/ui/src/features/canvas/hooks/useDashboards.ts
@@ -30,7 +30,10 @@ export function isPlaceholderCanvasName(name: string): boolean {
 }
 
 /** Saved canvases for a channel (file-backed freeform React apps). */
-export function useDashboards(channelId: string | undefined): {
+export function useDashboards(
+  channelId: string | undefined,
+  options?: { poll?: boolean },
+): {
   dashboards: DashboardSummary[];
   isLoading: boolean;
 } {
@@ -41,7 +44,8 @@ export function useDashboards(channelId: string | undefined): {
       {
         enabled: !!channelId,
         gcTime: SPACE_QUERY_GC_TIME_MS,
-        refetchInterval: SPACE_QUERY_REFETCH_INTERVAL_MS,
+        refetchInterval:
+          options?.poll === false ? false : SPACE_QUERY_REFETCH_INTERVAL_MS,
         staleTime: SPACE_QUERY_STALE_TIME_MS,
       },
     ),
diff --git a/packages/ui/src/features/loops/components/LoopContextFields.tsx b/packages/ui/src/features/loops/components/LoopContextFields.tsx
index 58ee13e311..062f6b58f7 100644
--- a/packages/ui/src/features/loops/components/LoopContextFields.tsx
+++ b/packages/ui/src/features/loops/components/LoopContextFields.tsx
@@ -23,7 +23,7 @@ export function LoopContextFields({
   disabled,
 }: LoopContextFieldsProps) {
   const { channels } = useChannels();
-  const { dashboards } = useDashboards(value?.folderId);
+  const { dashboards } = useDashboards(value?.folderId, { poll: false });
   const hasCanvases = dashboards.length > 0;
 
   const selectContext = (folderId: string) => {

From 1f5171f9d727305d772fce1e74953a0dada581f5 Mon Sep 17 00:00:00 2001
From: Shy Alter <puemos@users.noreply.github.com>
Date: Wed, 29 Jul 2026 10:31:26 +0200
Subject: [PATCH 9/9] fix(spaces): clear cached data across auth boundaries

Generated-By: PostHog Code
Task-Id: 885a1205-07a8-4fd0-b625-a789b7035a20
---
 packages/ui/src/features/canvas/hooks/useChannelTasks.ts | 3 +++
 packages/ui/src/features/canvas/hooks/useDashboards.ts   | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/packages/ui/src/features/canvas/hooks/useChannelTasks.ts b/packages/ui/src/features/canvas/hooks/useChannelTasks.ts
index 46adbbd419..711e991ed8 100644
--- a/packages/ui/src/features/canvas/hooks/useChannelTasks.ts
+++ b/packages/ui/src/features/canvas/hooks/useChannelTasks.ts
@@ -1,5 +1,6 @@
 import type { ChannelTaskRecord } from "@posthog/core/canvas/channelTaskSchemas";
 import { useHostTRPC } from "@posthog/host-router/react";
+import { AUTH_SCOPED_QUERY_META } from "@posthog/ui/features/auth/useCurrentUser";
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import { useCallback } from "react";
 import {
@@ -20,6 +21,7 @@ export function useChannelTasks(channelId: string | undefined): {
       {
         enabled: !!channelId,
         gcTime: SPACE_QUERY_GC_TIME_MS,
+        meta: AUTH_SCOPED_QUERY_META,
         refetchInterval: SPACE_QUERY_REFETCH_INTERVAL_MS,
         staleTime: SPACE_QUERY_STALE_TIME_MS,
       },
@@ -43,6 +45,7 @@ export function usePrefetchChannelTasks(): (channelId: string) => void {
           { channelId },
           {
             gcTime: SPACE_QUERY_GC_TIME_MS,
+            meta: AUTH_SCOPED_QUERY_META,
             staleTime: SPACE_QUERY_STALE_TIME_MS,
           },
         ),
diff --git a/packages/ui/src/features/canvas/hooks/useDashboards.ts b/packages/ui/src/features/canvas/hooks/useDashboards.ts
index b7f70d5f61..e04e981523 100644
--- a/packages/ui/src/features/canvas/hooks/useDashboards.ts
+++ b/packages/ui/src/features/canvas/hooks/useDashboards.ts
@@ -4,6 +4,7 @@ import type {
 } from "@posthog/core/canvas/dashboardSchemas";
 import type { FreeformVersion } from "@posthog/core/canvas/freeformSchemas";
 import { useHostTRPC } from "@posthog/host-router/react";
+import { AUTH_SCOPED_QUERY_META } from "@posthog/ui/features/auth/useCurrentUser";
 import { useDashboardEditStore } from "@posthog/ui/features/canvas/stores/dashboardEditStore";
 import { toast } from "@posthog/ui/primitives/toast";
 import { logger } from "@posthog/ui/shell/logger";
@@ -44,6 +45,7 @@ export function useDashboards(
       {
         enabled: !!channelId,
         gcTime: SPACE_QUERY_GC_TIME_MS,
+        meta: AUTH_SCOPED_QUERY_META,
         refetchInterval:
           options?.poll === false ? false : SPACE_QUERY_REFETCH_INTERVAL_MS,
         staleTime: SPACE_QUERY_STALE_TIME_MS,
@@ -68,6 +70,7 @@ export function usePrefetchDashboards(): (channelId: string) => void {
           { channelId },
           {
             gcTime: SPACE_QUERY_GC_TIME_MS,
+            meta: AUTH_SCOPED_QUERY_META,
             staleTime: SPACE_QUERY_STALE_TIME_MS,
           },
         ),